From 95cf462869d9105be4774e03b7d43f30331ba2f2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 27 Apr 2017 16:31:22 -0700
Subject: [PATCH 001/521] Signals and slots upgraded for C++11

---
 Library/Application/KTDataQueueProcessor.hh |   2 +-
 Library/Application/KTPrintDataStructure.hh |   6 +-
 Library/CMakeLists.txt                      |   1 -
 Library/Processor/KTProcessor.hh            |  51 +--
 Library/Processor/KTSignal.cc               |  52 ---
 Library/Processor/KTSignal.hh               | 145 ++-----
 Library/Processor/KTSignalWrapper.hh        |   2 +-
 Library/Processor/KTSlot.hh                 | 421 +++++++-------------
 Library/Processor/KTSlotWrapper.hh          |  14 +-
 9 files changed, 188 insertions(+), 506 deletions(-)
 delete mode 100644 Library/Processor/KTSignal.cc

diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index 05376e9..f07e92b 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -129,7 +129,7 @@ namespace Nymph
             // Signals
             //*********
         protected:
-            KTSignalOneArg< void > fQueueDoneSignal;
+            KTSignalDone fQueueDoneSignal;
 
     };
 
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index 72b7026..5d6eec4 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -72,9 +72,9 @@ namespace Nymph
             //***************
 
         private:
-            KTSlotOneArg< void (KTDataPtr) > fDataStructSlot;
-            KTSlotOneArg< void (KTDataPtr) > fCutStructSlot;
-            KTSlotOneArg< void (KTDataPtr) > fDataAndCutStructSlot;
+            KTSlotOneArg< void, KTDataPtr > fDataStructSlot;
+            KTSlotOneArg< void, KTDataPtr > fCutStructSlot;
+            KTSlotOneArg< void, KTDataPtr > fDataAndCutStructSlot;
 
     };
 }
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index c7d0c0d..ad41bec 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -64,7 +64,6 @@ set( NYMPH_SOURCEFILES
     ${DATA_DIR}/KTData.cc
     ${PROC_DIR}/KTPrimaryProcessor.cc
     ${PROC_DIR}/KTProcessor.cc
-    ${PROC_DIR}/KTSignal.cc
     ${PROC_DIR}/KTSignalWrapper.cc
     ${PROC_DIR}/KTSlotWrapper.cc
     ${IO_DIR}/KTReader.cc
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 7aa8e6c..21ba7ee 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -18,8 +18,6 @@
 
 #include "factory.hh"
 
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
 #include <boost/signals2.hpp>
 
 #include <exception>
@@ -61,14 +59,8 @@ namespace Nymph
             template< class XProcessor >
             void RegisterSignal(std::string name, XProcessor* signalPtr);
 
-            template< class XTarget, typename XReturn >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)());
-
-            template< class XTarget, typename XReturn, typename XArg1 >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1));
-
-            template< class XTarget, typename XReturn, typename XArg1, typename XArg2 >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1, XArg2));
+            template< class XTarget, typename XReturn, typename... XArgs >
+            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...));
 
             KTSignalWrapper* GetSignal(const std::string& name);
 
@@ -92,49 +84,18 @@ namespace Nymph
         return;
     }
 
-    template< class XTarget, typename XReturn >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)())
-    {
-        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
-
-        KTSignalConcept< XReturn () > signalConcept;
-
-        boost::function< XReturn () > *func = new boost::function< XReturn () >(boost::bind(funcPtr, target));
-
-        KTSlotWrapper* slot = new KTSlotWrapper(func, &signalConcept);
-        fSlotMap.insert(SlotMapVal(name, slot));
-        return;
-    }
-
-    template< class XTarget, typename XReturn, typename XArg1 >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1))
+    template< class XTarget, typename XReturn, typename... XArgs >
+    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...))
     {
         KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
 
-        KTSignalConcept< XReturn (XArg1) > signalConcept;
+        KTSignalConcept< XReturn (XArgs...) > signalConcept;
 
-        boost::function< XReturn (XArg1) > *func = new boost::function< XReturn (XArg1) >(boost::bind(funcPtr, target, _1));
-
-        KTSlotWrapper* slot = new KTSlotWrapper(func, &signalConcept);
+        KTSlotWrapper* slot = new KTSlotWrapper([funcPtr, target](XArgs... args){return (target->*funcPtr)(args...);}, &signalConcept);
         fSlotMap.insert(SlotMapVal(name, slot));
         return;
     }
 
-    template< class XTarget, typename XReturn, typename XArg1, typename XArg2 >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1, XArg2))
-    {
-        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
-
-        KTSignalConcept< XReturn (XArg1, XArg2) > signalConcept;
-
-        boost::function< XReturn (XArg1, XArg2) > *func = new boost::function< XReturn (XArg1, XArg2) >(boost::bind(funcPtr, target, _1, _2));
-
-        KTSlotWrapper* slot = new KTSlotWrapper(func, &signalConcept);
-        fSlotMap.insert(SlotMapVal(name, slot));
-        return;
-    }
-
-
 #define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::KTProcessor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
diff --git a/Library/Processor/KTSignal.cc b/Library/Processor/KTSignal.cc
deleted file mode 100644
index 535ab2d..0000000
--- a/Library/Processor/KTSignal.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * KTSignal.cc
- *
- *  Created on: Feb 25, 2013
- *      Author: nsoblath
- */
-
-#include "KTSignal.hh"
-
-namespace Nymph
-{
-
-    KTSignalOneArg< void >::KTSignalOneArg(const std::string& name, KTProcessor* proc) :
-            fSignal()
-    {
-        proc->RegisterSignal(name, &fSignal);
-    }
-
-    KTSignalOneArg< void >::KTSignalOneArg() :
-            fSignal()
-    {}
-
-    KTSignalOneArg< void >::KTSignalOneArg(const KTSignalOneArg&) :
-            fSignal()
-    {}
-
-    KTSignalOneArg< void >::~KTSignalOneArg()
-    {
-    }
-
-
-
-    KTSignalData::KTSignalData(const std::string& name, KTProcessor* proc) :
-            KTSignalOneArg(name, proc),
-            fRefSignal()
-    {
-        proc->RegisterSignal("ref-"+name, &fRefSignal);
-    }
-
-    KTSignalData::~KTSignalData()
-    {
-    }
-
-    KTSignalData::KTSignalData()
-    {
-    }
-
-    KTSignalData::KTSignalData(const KTSignalData&)
-    {
-    }
-
-}
diff --git a/Library/Processor/KTSignal.hh b/Library/Processor/KTSignal.hh
index 5a5b3cb..11130c9 100644
--- a/Library/Processor/KTSignal.hh
+++ b/Library/Processor/KTSignal.hh
@@ -19,83 +19,53 @@
 namespace Nymph
 {
     /*!
-     @class KTSignalOneArg
+     @class KTSignal
      @author N. S. Oblath
 
-     @brief Creates a signal that takes a single argument.
+     @brief Creates a signal that takes 0 or more arguments.
 
      @details
      The signal is emitted by calling operator().
-     If a KTDataSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+     If a KTSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
 
      Usage:
-     In your Processor's header add a member variable of type KTDataSignal< ArgumentType >.
+     In your Processor's header add a member variable of type KTSignal< ArgumentTypes >.
 
      Initialize the signal with the processor's 'this' pointer and the name of the signal.
 
      To use the signal, call it as: fSignalObject(arg);
     */
-    template< class XSignalArgument >
-    class KTSignalOneArg
-    {
-        public:
-            typedef void (signature)(XSignalArgument);
-            typedef boost::signals2::signal< signature > boost_signal;
-            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
-
-        public:
-            KTSignalOneArg();
-            KTSignalOneArg(const std::string& name, KTProcessor* proc);
-            virtual ~KTSignalOneArg();
-
-        protected:
-            KTSignalOneArg(const KTSignalOneArg&);
-
-        public:
-            void operator()(XSignalArgument arg);
-
-            boost_signal* Signal();
-
-        protected:
-            boost_signal fSignal;
-
-    };
-
-
-    template<>
-    class KTSignalOneArg< void >
+    template< class... XSignalArguments >
+    class KTSignal
     {
         public:
-            typedef void (signature)(void);
+            typedef void (signature)( XSignalArguments... );
             typedef boost::signals2::signal< signature > boost_signal;
-            // the following line is, technically, not valid C++03 code because the 'typename' keyword
-            // is appearing outside of a template (since the template here is fully specified, this counts).
-            // It should compiler with most new-ish compilers, even when compiling under C++03 mode.
-            // It has been tested successfully with GCC 4.6 and Clang 3.1
             typedef typename boost::signals2::signal< signature >::slot_type slot_type;
 
         public:
-            KTSignalOneArg();
-            KTSignalOneArg(const std::string& name, KTProcessor* proc);
-            virtual ~KTSignalOneArg();
+            KTSignal();
+            KTSignal( const std::string& name, KTProcessor* proc );
+            virtual ~KTSignal();
 
         protected:
-            KTSignalOneArg(const KTSignalOneArg&);
+            KTSignal( const KTSignal& );
 
         public:
-            void operator()();
+            void operator()( XSignalArguments... args );
 
             boost_signal* Signal();
 
         protected:
             boost_signal fSignal;
-
     };
 
-    // convenience typedef for KTSignalDone
-    typedef KTSignalOneArg<void> KTSignalDone;
-
+    /// Convenience typedef for done signals
+    typedef KTSignal<> KTSignalDone;
 
+    // Convenience typedef for backwards compatibility
+    template< typename XDataType >
+    using KTSignalOneArg = KTSignal< XDataType >;
 
     /*!
      @class KTSignalData
@@ -115,93 +85,46 @@ namespace Nymph
 
      That's it!
     */
+    typedef KTSignal< KTDataPtr > KTSignalData;
 
-    class KTSignalData : public KTSignalOneArg< KTDataPtr >
-    {
-        public:
-            typedef void (signature)(KTDataPtr);
-            typedef boost::signals2::signal< signature > boost_signal;
-            typedef boost::signals2::signal< signature >::slot_type slot_type;
-
-            typedef void (ref_signature)(KTDataPtr&);
-            typedef boost::signals2::signal< ref_signature > ref_boost_signal;
-            typedef boost::signals2::signal< ref_signature >::slot_type ref_slot_type;
 
-        public:
-            KTSignalData();
-            KTSignalData(const std::string& name, KTProcessor* proc);
-            virtual ~KTSignalData();
-
-        protected:
-            KTSignalData(const KTSignalData&);
+    //*******************
+    // Implementations
+    //*******************
 
-        public:
-            void operator()(KTDataPtr arg);
-
-            ref_boost_signal* RefSignal();
-
-        protected:
-            ref_boost_signal fRefSignal;
-    };
-
-
-
-    template< class XSignalArgument >
-    KTSignalOneArg< XSignalArgument >::KTSignalOneArg(const std::string& name, KTProcessor* proc) :
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::KTSignal( const std::string& name, KTProcessor* proc ) :
             fSignal()
     {
         proc->RegisterSignal(name, &fSignal);
     }
 
-    template< class XSignalArgument >
-    KTSignalOneArg< XSignalArgument >::KTSignalOneArg() :
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::KTSignal() :
             fSignal()
     {}
 
-    template< class XSignalArgument >
-    KTSignalOneArg< XSignalArgument >::KTSignalOneArg(const KTSignalOneArg&) :
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::KTSignal( const KTSignal& ) :
             fSignal()
     {}
 
-    template< class XSignalArgument >
-    KTSignalOneArg< XSignalArgument >::~KTSignalOneArg()
-    {
-    }
-
-    template< class XSignalArgument >
-    inline void KTSignalOneArg< XSignalArgument >::operator()(XSignalArgument arg)
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::~KTSignal()
     {
-        fSignal(arg);
     }
 
-    template< class XSignalArgument >
-    inline typename KTSignalOneArg< XSignalArgument >::boost_signal* KTSignalOneArg< XSignalArgument >::Signal()
+    template< class... XSignalArguments >
+    inline void KTSignal< XSignalArguments... >::operator()( XSignalArguments... args )
     {
-        return &fSignal;
+        fSignal( args... );
     }
 
-
-    inline void KTSignalOneArg< void >::operator()()
-    {
-        fSignal();
-    }
-
-    inline typename KTSignalOneArg< void >::boost_signal* KTSignalOneArg< void >::Signal()
+    template< class... XSignalArguments >
+    inline typename KTSignal< XSignalArguments... >::boost_signal* KTSignal< XSignalArguments... >::Signal()
     {
         return &fSignal;
     }
 
-
-    inline void KTSignalData::operator()(KTDataPtr arg)
-    {
-        fSignal(arg);
-        fRefSignal(arg);
-    }
-
-    inline typename KTSignalData::ref_boost_signal* KTSignalData::RefSignal()
-    {
-        return &fRefSignal;
-    }
-
 } /* namespace Nymph */
 #endif /* KTSIGNAL_HH_ */
diff --git a/Library/Processor/KTSignalWrapper.hh b/Library/Processor/KTSignalWrapper.hh
index 4b0382e..22ed542 100644
--- a/Library/Processor/KTSignalWrapper.hh
+++ b/Library/Processor/KTSignalWrapper.hh
@@ -55,7 +55,7 @@ namespace Nymph
                         return fSignal;
                     }
                 private:
-                    XSignature* fSignal; //not owned by this KTSignalWrapper
+                    XSignature* fSignal; //not owned by this KTSpecifiedInternalSignalWrapper
             };
 
         public:
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 116ec31..7dc21bd 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -12,212 +12,162 @@
 #include "KTLogger.hh"
 #include "KTSignal.hh"
 
-#include <boost/bind.hpp>
-#include <boost/function.hpp>
-
+#include <functional>
+#include <signal.h>
 #include <string>
 
 namespace Nymph
 {
     KTLOGGER(slotlog, "KTSlot");
 
-    template< typename Signature>
-    class KTSlotNoArg
-    {
-        public:
-            typedef boost::function< Signature > function_signature;
-            typedef typename function_signature::result_type return_type;
-
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotNoArg(const std::string& name, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)());
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotNoArg(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)());
-            virtual ~KTSlotNoArg();
-
-            return_type operator()();
-
-        protected:
-            boost::function< Signature > fFunc;
-
-    };
-
     /*!
-     @class KTSlotOneArg
+     @class KTSlot
      @author N. S. Oblath
 
-     @brief Creates a slot that calls a member function of the func_owner_type object, taking one argument.
+     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
 
      @details
      Usage:
      To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
-     The function should have the signature ReturnType (ArgumentType).
+     The function should have the signature ReturnType (Args).
 
-     In your Processor's header add a member variable of type KTSlotOneArg< ProcessorType, ArgumentType, ReturnType >.
+     In your Processor's header add a member variable of type KTSlot< ProcessorType, ReturnType, Args >.
      The variable may be private.
 
      Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
      Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
     */
-    template< typename Signature>
-    class KTSlotOneArg
+    template< typename ReturnType, typename... Args >
+    class KTSlot
     {
-        public:
-            typedef boost::function< Signature > function_signature;
-            typedef typename function_signature::result_type return_type;
-            typedef typename function_signature::argument_type argument_type;
-
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType >
-            KTSlotOneArg(const std::string& name, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(argument_type));
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotOneArg(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(argument_type));
-            virtual ~KTSlotOneArg();
-
-            return_type operator()(argument_type arg);
+            KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) );
 
-        protected:
-            boost::function< Signature > fFunc;
-
-    };
-
-    template< typename Signature>
-    class KTSlotTwoArg
-    {
-        public:
-            typedef boost::function< Signature > function_signature;
-            typedef typename function_signature::result_type return_type;
-            typedef typename function_signature::first_argument_type first_argument_type;
-            typedef typename function_signature::second_argument_type second_argument_type;
-
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotTwoArg(const std::string& name, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(first_argument_type, second_argument_type));
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType >
-            KTSlotTwoArg(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(first_argument_type, second_argument_type));
-            virtual ~KTSlotTwoArg();
-
-            return_type operator()(first_argument_type arg1, second_argument_type arg2);
+            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) );
 
-        protected:
-            boost::function< Signature > fFunc;
+            virtual ~KTSlot();
 
     };
 
+    // Typedefs for backwards compatibility
 
+    template < typename ReturnType >
+    using KTSlotNoArg = KTSlot< ReturnType >;
 
-    template< typename Signature>
-    template< class XFuncOwnerType >
-    KTSlotNoArg< Signature >::KTSlotNoArg(const std::string& name, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)()) :
-            fFunc(boost::bind(func, owner))
-    {
-        owner->RegisterSlot(name, this, &KTSlotNoArg::operator());
-    }
+    template < typename ReturnType, typename Arg1 >
+    using KTSlotOneArg = KTSlot< ReturnType, Arg1 >;
 
-    template< typename Signature>
-    template< class XFuncOwnerType >
-    KTSlotNoArg< Signature >::KTSlotNoArg(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)()) :
-            fFunc(boost::bind(func, owner))
-    {
-        proc->RegisterSlot(name, this, &KTSlotNoArg::operator());
-    }
+    template< typename ReturnType, typename Arg1, typename Arg2 >
+    using KTSlotTwoArg = KTSlot< ReturnType, Arg1, Arg2 >;
 
-    template< typename Signature>
-    KTSlotNoArg< Signature >::~KTSlotNoArg()
-    {
-    }
 
-    template< typename Signature>
-    typename KTSlotNoArg< Signature >::return_type KTSlotNoArg< Signature >::operator()()
-    {
-        return fFunc();
-    }
+    /*!
+     @class KTDataSlot
+     @author N. S. Oblath
 
+     @brief Creates a slot that takes a KTDataPtr object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
 
+     @details
+     Usage:
+     This slot type adds the slot function (signature void (KTDataPtr).
+     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
+     The slot function checks that the provided KTData object contains data of type DataType, and then calls the member function.
 
+     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
+     The variable may be private.
 
-    template< typename Signature>
-    template< class XFuncOwnerType >
-    KTSlotOneArg< Signature >::KTSlotOneArg(const std::string& name, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(argument_type)) :
-            fFunc(boost::bind(func, owner, _1))
-    {
-        owner->RegisterSlot(name, this, &KTSlotOneArg::operator());
-    }
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
 
-    template< typename Signature>
-    template< class XFuncOwnerType >
-    KTSlotOneArg< Signature >::KTSlotOneArg(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(argument_type)) :
-            fFunc(boost::bind(func, owner, _1))
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+    template< class... XDataTypes >
+    class KTSlotData
     {
-        proc->RegisterSlot(name, this, &KTSlotOneArg::operator());
-    }
+        //public:
+            //typedef XDataType data_type;
+            //typedef std::function< bool( KTDataPtr ) > function_signature;
+            //typedef typename function_signature::result_type return_type;
 
-    template< typename Signature>
-    KTSlotOneArg< Signature >::~KTSlotOneArg()
-    {
-    }
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr=nullptr );
 
-    template< typename Signature>
-    typename KTSlotOneArg< Signature >::return_type KTSlotOneArg< Signature >::operator()(argument_type arg)
-    {
-        return fFunc(arg);
-    }
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr=nullptr );
 
+            virtual ~KTSlotData();
 
+            void operator()( KTDataPtr data );
 
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataPtr data );
 
+            //template<  >
+            //bool DataPresent( KTDataPtr data );
+            //template< typename DataType, typename... DataTypes >
+            //bool DataPresent( KTDataPtr data );
 
-    template< typename Signature>
-    template< class XFuncOwnerType >
-    KTSlotTwoArg< Signature >::KTSlotTwoArg(const std::string& name, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(first_argument_type, second_argument_type)) :
-            fFunc(boost::bind(func, owner, _1, _2))
-    {
-        owner->RegisterSlot(name, this, &KTSlotTwoArg::operator());
-    }
+            //function_signature fFunc;
+            std::function< bool (XDataTypes&...) > fFunc;
 
-    template< typename Signature>
-    template< class XFuncOwnerType >
-    KTSlotTwoArg< Signature >::KTSlotTwoArg(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, return_type (XFuncOwnerType::*func)(first_argument_type, second_argument_type)) :
-            fFunc(boost::bind(func, owner, _1, _2))
-    {
-        proc->RegisterSlot(name, this, &KTSlotTwoArg::operator());
-    }
+            KTSignalData* fSignalPtr;
+    };
 
-    template< typename Signature>
-    KTSlotTwoArg< Signature >::~KTSlotTwoArg()
+    // helper structs (have to be defined outside the templated KTSlot class to use specialization
+    template< typename... DataTypes >
+    struct DataPresentHelper
     {
-    }
+        static bool DataPresent( KTDataPtr )
+        {
+            return true;
+        }
+    };
 
-    template< typename Signature>
-    typename KTSlotTwoArg< Signature >::return_type KTSlotTwoArg< Signature >::operator()(first_argument_type arg1, second_argument_type arg2)
+    template< typename DataType, typename... DataTypes >
+    struct DataPresentHelper< DataType, DataTypes... >
     {
-        return fFunc(arg1, arg2);
-    }
+        static bool DataPresent( KTDataPtr data )
+        {
+            if( ! data->Has< DataType >() )
+            {
+                KTERROR( slotlog, "Data not found with type <" << typeid( DataType ).name() << ">" );
+                return false;
+            }
+            return DataPresentHelper< DataTypes... >::DataPresent( data );
+        }
+    };
 
 
+    // Typedefs for backwards compatibility
 
+    template< typename XDataType1 >
+    using KTSlotDataOneType = KTSlotData< XDataType1 >;
 
+    template< typename XDataType1, typename XDataType2 >
+    using KTSlotDataTwoTypes = KTSlotData< XDataType1, XDataType2 >;
 
 
     /*!
-     @class KTDataSlotOneArg
+     @class KTSlotDone
      @author N. S. Oblath
 
-     @brief Creates a slot that takes a KTDataPtr object as the argument; the function that gets called should take DataType& as its argument.
+     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
 
      @details
      Usage:
-     This slot type adds the slot function (signature void (KTDataPtr).
-     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType&).
-     The slot function checks that the provided KTData object contains data of type DataType, and then calls the member function.
+     This slot type adds the slot function (signature void ()).
+     Your processor (or, optionally, a different object) must have a member function with the signature void ().
+     The slot calls the member function.
 
-     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
+     In your Processor's header add a member variable of type KTDoneSlot.
      The variable may be private.
 
      Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
@@ -225,155 +175,94 @@ namespace Nymph
 
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
-    template< class XDataType >
-    class KTSlotDataOneType
-    {
-        public:
-            typedef XDataType data_type;
-            typedef boost::function< void (KTDataPtr) > function_signature;
-            typedef typename function_signature::result_type return_type;
-            typedef typename function_signature::argument_type argument_type;
-
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotDataOneType(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(data_type&), KTSignalData* signalPtr=NULL);
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotDataOneType(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(data_type&), KTSignalData* signalPtr=NULL);
-            virtual ~KTSlotDataOneType();
-
-            void operator()(KTDataPtr data);
-
-        protected:
-            boost::function< bool (data_type&) > fFunc;
-
-            KTSignalData* fSignalPtr;
-    };
-
-
-    template< class XDataType1, class XDataType2 >
-    class KTSlotDataTwoTypes
+    class KTSlotDone
     {
-        public:
-            typedef XDataType1 first_data_type;
-            typedef XDataType2 second_data_type;
-            typedef boost::function< void (KTDataPtr) > function_signature;
-            typedef typename function_signature::result_type return_type;
-            typedef typename function_signature::argument_type argument_type;
-
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType >
-            KTSlotDataTwoTypes(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(first_data_type&, second_data_type&), KTSignalData* signalPtr=NULL);
+            KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=NULL);
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType >
-            KTSlotDataTwoTypes(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(first_data_type&, second_data_type&), KTSignalData* signalPtr=NULL);
-            virtual ~KTSlotDataTwoTypes();
+            KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=NULL);
+            virtual ~KTSlotDone();
 
-            void operator()(KTDataPtr data);
+            void operator()();
 
         protected:
-            boost::function< bool (first_data_type&, second_data_type&) > fFunc;
+            boost::function< void () > fFunc;
 
-            KTSignalData* fSignalPtr;
+            KTSignalDone* fSignalPtr;
     };
 
 
+    //*******************
+    // Implementations
+    //*******************
 
+    // KTSlot
 
-
-    template< class XDataType >
+    template< typename ReturnType, typename... Args >
     template< class XFuncOwnerType >
-    KTSlotDataOneType< XDataType >::KTSlotDataOneType(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(data_type&), KTSignalData* signalPtr) :
-            fFunc(boost::bind(func, owner, _1)),
-            fSignalPtr(signalPtr)
+    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) )
     {
-        owner->RegisterSlot(name, this, &KTSlotDataOneType::operator());
+        owner->RegisterSlot( name, owner, func );
     }
 
-    template< class XDataType >
+    template< typename ReturnType, typename... Args >
     template< class XFuncOwnerType >
-    KTSlotDataOneType< XDataType >::KTSlotDataOneType(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(data_type&), KTSignalData* signalPtr) :
-            fFunc(boost::bind(func, owner, _1)),
-            fSignalPtr(signalPtr)
+    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) )
     {
-        proc->RegisterSlot(name, this, &KTSlotDataOneType::operator());
+        proc->RegisterSlot( name, owner, func );
     }
 
-    template< class XDataType >
-    KTSlotDataOneType< XDataType >::~KTSlotDataOneType()
+    template< typename ReturnType, typename... Args >
+    KTSlot< ReturnType, Args... >::~KTSlot()
     {
     }
 
-    template< class XDataType >
-    void KTSlotDataOneType< XDataType >::operator()(KTDataPtr data)
-    {
-        // Standard data slot pattern:
-        // Check to ensure that the required data type is present
-        if (! data->Has< data_type >())
-        {
-            KTERROR(slotlog, "Data not found with type <" << typeid(data_type).name() << ">");
-            return;
-        }
-        // Call the function
-        if (! fFunc(data->Of< data_type >()))
-        {
-            KTERROR(slotlog, "Something went wrong while analyzing data with type <" << typeid(data_type).name() << ">");
-            return;
-        }
-        // If there's a signal pointer, emit the signal
-        if (fSignalPtr != NULL)
-        {
-            (*fSignalPtr)(data);
-        }
-        return;
-    }
-
 
+    // KTSlotData
 
-    template< class XDataType1, class XDataType2 >
+    template< class... XDataTypes >
     template< class XFuncOwnerType >
-    KTSlotDataTwoTypes< XDataType1, XDataType2 >::KTSlotDataTwoTypes(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(first_data_type&, second_data_type&), KTSignalData* signalPtr) :
-            fFunc(boost::bind(func, owner, _1, _2)),
+    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
+            fFunc([func, owner](XDataTypes... args){return (owner->*func)(args...);}),
             fSignalPtr(signalPtr)
     {
-        owner->RegisterSlot(name, this, &KTSlotDataTwoTypes::operator());
+        owner->RegisterSlot(name, this, &KTSlotData::operator());
     }
 
-    template< class XDataType1, class XDataType2 >
+    template< class... XDataTypes >
     template< class XFuncOwnerType >
-    KTSlotDataTwoTypes< XDataType1, XDataType2 >::KTSlotDataTwoTypes(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)(first_data_type&, second_data_type&), KTSignalData* signalPtr) :
-            fFunc(boost::bind(func, owner, _1, _2)),
+    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
+            fFunc([func, owner](XDataTypes... args){return (owner->*func)(args...);}),
             fSignalPtr(signalPtr)
     {
-        proc->RegisterSlot(name, this, &KTSlotDataTwoTypes::operator());
+        proc->RegisterSlot(name, this, &KTSlotData::operator());
     }
 
-    template< class XDataType1, class XDataType2 >
-    KTSlotDataTwoTypes< XDataType1, XDataType2 >::~KTSlotDataTwoTypes()
+    template< class... XDataTypes >
+    KTSlotData< XDataTypes... >::~KTSlotData()
     {
     }
 
-    template< class XDataType1, class XDataType2 >
-    void KTSlotDataTwoTypes< XDataType1, XDataType2 >::operator()(KTDataPtr data)
+    template< class... XDataTypes >
+    void KTSlotData< XDataTypes... >::operator()( KTDataPtr data )
     {
         // Standard data slot pattern:
         // Check to ensure that the required data type is present
-        if (! data->Has< first_data_type >())
-        {
-            KTERROR(slotlog, "Data not found with type <" << typeid(first_data_type).name() << ">");
-            return;
-        }
-        if (! data->Has< second_data_type >())
+
+        if (! DataPresent< XDataTypes... >( data ) )
         {
-            KTERROR(slotlog, "Data not found with type <" << typeid(second_data_type).name() << ">");
+            KTFATAL( slotlog, "Failed to find all of the necessary data types in the standard slot function. Aborting." );
+            raise(SIGINT);
             return;
         }
         // Call the function
-        if (! fFunc(data->Of< first_data_type >(), data->Of< second_data_type >()))
+        if ( ! fFunc(data->Of< XDataTypes >()...) )
         {
-            KTERROR(slotlog, "Something went wrong while analyzing data with types <" << typeid(first_data_type).name() << "> and <" << typeid(second_data_type).name() << ">");
+            KTFATAL( slotlog, "Something went wrong in the standard slot function. Aborting." );
+            raise(SIGINT);
             return;
         }
         // If there's a signal pointer, emit the signal
@@ -384,53 +273,19 @@ namespace Nymph
         return;
     }
 
-
-    /*!
-     @class KTDoneSlot
-     @author N. S. Oblath
-
-     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
-
-     @details
-     Usage:
-     This slot type adds the slot function (signature void ().
-     Your processor (or, optionally, a different object) must have a member function with the signature bool ().
-     The slot calls the member function.
-
-     In your Processor's header add a member variable of type KTDoneSlot.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-
-     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
-    */
-    class KTSlotDone
+    template< class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< XDataTypes... >::DataPresent( KTDataPtr data )
     {
-        public:
-            typedef boost::function< void () > function_signature;
-            typedef bool return_type;
-
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=NULL);
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=NULL);
-            virtual ~KTSlotDone();
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
 
-            void operator()();
 
-        protected:
-            boost::function< void () > fFunc;
-
-            KTSignalDone* fSignalPtr;
-    };
+    // KTSlotDone
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            fFunc(boost::bind(func, owner)),
+            fFunc([func, owner](){return (owner->*func)();}),
             fSignalPtr(signalPtr)
     {
         owner->RegisterSlot(name, this, &KTSlotDone::operator());
@@ -438,7 +293,7 @@ namespace Nymph
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            fFunc(boost::bind(func, owner)),
+            fFunc([func, owner](){return (owner->*func)();}),
             fSignalPtr(signalPtr)
     {
         proc->RegisterSlot(name, this, &KTSlotDone::operator());
@@ -461,7 +316,5 @@ namespace Nymph
         return;
     }
 
-
-
 } /* namespace Nymph */
 #endif /* KTSLOT_HH_ */
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index 3139143..6b7eed7 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -11,7 +11,6 @@
 #include "KTConnection.hh"
 #include "KTSignalWrapper.hh"
 
-#include <boost/function.hpp>
 #include <boost/signals2.hpp>
 
 namespace Nymph
@@ -38,14 +37,13 @@ namespace Nymph
             class KTSpecifiedInternalSlotWrapper : public KTInternalSlotWrapper, public boost::noncopyable
             {
                 public:
-                    KTSpecifiedInternalSlotWrapper(XSignature* funcPtr, XTypeContainer* typeCont=NULL) :
+                    KTSpecifiedInternalSlotWrapper(XSignature funcPtr, XTypeContainer* typeCont=NULL) :
                             fSlot(funcPtr)
                     {
                         (void)typeCont; // to suppress warnings
                     }
                     virtual ~KTSpecifiedInternalSlotWrapper()
                     {
-                        delete fSlot;
                     }
 
                     virtual KTConnection Connect(KTSignalWrapper* signalWrap, int groupNum=-1)
@@ -61,18 +59,18 @@ namespace Nymph
                         }
                         if (groupNum >= 0)
                         {
-                            return derivedSignalWrapper->GetSignal()->connect(groupNum, *fSlot);
+                            return derivedSignalWrapper->GetSignal()->connect(groupNum, fSlot);
                         }
-                        return derivedSignalWrapper->GetSignal()->connect(*fSlot);
+                        return derivedSignalWrapper->GetSignal()->connect(fSlot);
                     }
 
                 private:
-                    XSignature* fSlot; // is owned by this KTSlot
+                    XSignature fSlot;
             };
 
         public:
             template< typename XSignature, typename XTypeContainer >
-            KTSlotWrapper(XSignature* signalPtr, XTypeContainer* typeCont);
+            KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont);
             ~KTSlotWrapper();
 
         private:
@@ -91,7 +89,7 @@ namespace Nymph
     };
 
     template< typename XSignature, typename XTypeContainer >
-    KTSlotWrapper::KTSlotWrapper(XSignature* signalPtr, XTypeContainer* typeCont) :
+    KTSlotWrapper::KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont) :
             fSlotWrapper(new KTSpecifiedInternalSlotWrapper< XSignature, XTypeContainer >(signalPtr, typeCont)),
             fConnection()
     {}

From 0ea8f8038f5f43d67163c046fa6844150c489ea1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 28 Apr 2017 16:42:13 -0700
Subject: [PATCH 002/521] Slightly improved slots: now with inheritance!

---
 Library/Processor/KTSlot.hh | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 7dc21bd..9756266 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -86,7 +86,7 @@ namespace Nymph
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
     template< class... XDataTypes >
-    class KTSlotData
+    class KTSlotData : public KTSlot< void, KTDataPtr >
     {
         //public:
             //typedef XDataType data_type;
@@ -175,15 +175,15 @@ namespace Nymph
 
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
-    class KTSlotDone
+    class KTSlotDone : public KTSlot< void >
     {
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType >
-            KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=NULL);
+            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType >
-            KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=NULL);
+            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
             virtual ~KTSlotDone();
 
             void operator()();
@@ -226,19 +226,19 @@ namespace Nymph
     template< class... XDataTypes >
     template< class XFuncOwnerType >
     KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
-            fFunc([func, owner](XDataTypes... args){return (owner->*func)(args...);}),
-            fSignalPtr(signalPtr)
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
     {
-        owner->RegisterSlot(name, this, &KTSlotData::operator());
     }
 
     template< class... XDataTypes >
     template< class XFuncOwnerType >
     KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
             fFunc([func, owner](XDataTypes... args){return (owner->*func)(args...);}),
             fSignalPtr(signalPtr)
     {
-        proc->RegisterSlot(name, this, &KTSlotData::operator());
     }
 
     template< class... XDataTypes >
@@ -252,23 +252,23 @@ namespace Nymph
         // Standard data slot pattern:
         // Check to ensure that the required data type is present
 
-        if (! DataPresent< XDataTypes... >( data ) )
+        if( ! DataPresent< XDataTypes... >( data ) )
         {
             KTFATAL( slotlog, "Failed to find all of the necessary data types in the standard slot function. Aborting." );
-            raise(SIGINT);
+            raise( SIGINT );
             return;
         }
         // Call the function
-        if ( ! fFunc(data->Of< XDataTypes >()...) )
+        if( ! fFunc(data->Of< XDataTypes >()...) )
         {
             KTFATAL( slotlog, "Something went wrong in the standard slot function. Aborting." );
-            raise(SIGINT);
+            raise( SIGINT );
             return;
         }
         // If there's a signal pointer, emit the signal
-        if (fSignalPtr != NULL)
+        if( fSignalPtr != nullptr )
         {
-            (*fSignalPtr)(data);
+            (*fSignalPtr)( data );
         }
         return;
     }
@@ -285,18 +285,18 @@ namespace Nymph
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            fFunc([func, owner](){return (owner->*func)();}),
-            fSignalPtr(signalPtr)
+            KTSlot( name, owner, this, &KTSlotDone::operator() ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
     {
-        owner->RegisterSlot(name, this, &KTSlotDone::operator());
     }
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            fFunc([func, owner](){return (owner->*func)();}),
-            fSignalPtr(signalPtr)
+            KTSlot( name, proc, this, &KTSlotDone::operator() ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
     {
-        proc->RegisterSlot(name, this, &KTSlotDone::operator());
     }
 
     inline KTSlotDone::~KTSlotDone()
@@ -309,7 +309,7 @@ namespace Nymph
         fFunc();
 
         // If there's a signal pointer, emit the signal
-        if (fSignalPtr != NULL)
+        if( fSignalPtr != nullptr )
         {
             (*fSignalPtr)();
         }

From 3c0aa16951d5a0d8a23d65185f7944209ed833e6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 30 Apr 2017 16:22:15 -0700
Subject: [PATCH 003/521] Initial work at switching to two-argument data
 signal/slot standard

---
 Library/Application/KTDataQueueProcessor.hh |  4 +-
 Library/Application/KTProcessorToolbox.cc   | 25 ++++++++++---
 Library/Data/KTData.hh                      |  8 ++--
 Library/Processor/KTPrimaryProcessor.cc     | 10 ++++-
 Library/Processor/KTPrimaryProcessor.hh     |  8 ++--
 Library/Processor/KTSignal.hh               |  2 +-
 Library/Processor/KTSlot.hh                 | 41 +++++++++++++++------
 7 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index f07e92b..b550a7e 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -91,7 +91,7 @@ namespace Nymph
             //*********
         public:
             /// Begins processing of queue (switches status from kStopped to kRunning)
-            bool Run();
+            bool Run( std::promise< KTDataPtr >& promise );
 
             /// Stops processing of queue (switches status to kStopped)
             void Stop();
@@ -225,7 +225,7 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Run()
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Run( std::promise< KTDataPtr >& promise )
     {
         fStatus = kRunning;
         KTINFO(eqplog, "Queue started");
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 30d1b1e..54f6b1c 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -16,6 +16,8 @@
 #include <boost/thread.hpp>
 #endif
 
+#include <future>
+#include <thread>
 #include <vector>
 
 using std::deque;
@@ -250,15 +252,28 @@ namespace Nymph
 #endif
         for (RunQueue::const_iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
         {
-#ifdef SINGLETHREADED
+//#ifdef SINGLETHREADED
+            std::promise< KTDataPtr > promise;
             for (ThreadGroup::const_iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
             {
-                if (! tgIter->fProc->Run())
+                std::thread thread( tgIter->fProc, &KTPrimaryProcessor::operator(), promise );
+                std::future< KTDataPtr > future = promise.get_future();
+                thread.join();
+                try
                 {
-                    return false;
+                    future.get();
+                }
+                catch( std::exception& e )
+                {
+                    KTERROR( proclog, "An error occurred while running processor <" << tgIter->fProc->GetName() << ">: " << e.what() );
+                    break;
                 }
+                //if (! tgIter->fProc->Run())
+                //{
+                //    return false;
+                //}
             }
-#else
+//#else
             KTDEBUG(proclog, "Starting thread group " << iGroup);
             boost::thread_group parallelThreads;
             unsigned iThread = 0;
@@ -274,7 +289,7 @@ namespace Nymph
             // wait for execution to complete
             parallelThreads.join_all();
             iGroup++;
-#endif
+//#endif
         }
         KTPROG(proclog, ". . . processing complete.");
         return true;
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 7413acc..959756a 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -13,8 +13,8 @@
 #include "KTCutStatus.hh"
 #include "KTMemberVariable.hh"
 
-#include <boost/shared_ptr.hpp>
-
+#include <future>
+#include <memory>
 #include <string>
 
 namespace Nymph
@@ -71,7 +71,9 @@ namespace Nymph
         return fCutStatus;
     }
 
-    typedef boost::shared_ptr< KTData > KTDataPtr;
+    typedef std::shared_ptr< KTData > KTDataPtr;
+
+    typedef std::promise< KTDataPtr > KTDataPtrReturn;
 
 } /* namespace Nymph */
 #endif /* KTDATA_HH_ */
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index 6cb5749..aba5411 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -22,11 +22,17 @@ namespace Nymph
     {
     }
 
-    void KTPrimaryProcessor::operator ()()
+    void KTPrimaryProcessor::operator ()( std::promise< KTDataPtr >& promise )
     {
-        if (! Run())
+        if (! Run( promise ))
         {
             KTERROR(proclog, "An error occurred during processor running.");
+            //TODO: make sure we're using the exception pointer correctly
+            promise.set_exception( std::make_exception_ptr( std::exception( "An error occurred during processor running" ) ) );
+        }
+        else
+        {
+            promise.set_value( KTDataPtr() );
         }
         return;
     }
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index f9120c8..27150ed 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -12,22 +12,24 @@
 
 #include "KTLogger.hh"
 
+#include <future>
+
 namespace Nymph
 {
 
     class KTPrimaryProcessor : public KTProcessor
     {
         public:
-            KTPrimaryProcessor(const std::string& name = "default-primary-processor-name");
+            KTPrimaryProcessor( const std::string& name = "default-primary-processor-name" );
             virtual ~KTPrimaryProcessor();
 
         public:
             /// Callable function used by boost::thread
-            virtual void operator()();
+            virtual void operator()( std::promise< KTDataPtr >& promise );
 
         public:
             /// Starts the  main action of the processor
-            virtual bool Run() = 0;
+            virtual bool Run( std::promise< KTDataPtr >& promise ) = 0;
 
     };
 
diff --git a/Library/Processor/KTSignal.hh b/Library/Processor/KTSignal.hh
index 11130c9..5b69017 100644
--- a/Library/Processor/KTSignal.hh
+++ b/Library/Processor/KTSignal.hh
@@ -85,7 +85,7 @@ namespace Nymph
 
      That's it!
     */
-    typedef KTSignal< KTDataPtr > KTSignalData;
+    typedef KTSignal< KTDataPtr, KTDataPtrReturn& > KTSignalData;
 
 
     //*******************
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 9756266..5e3010e 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -9,6 +9,7 @@
 #define KTSLOT_HH_
 
 #include "KTData.hh"
+#include "KTException.hh"
 #include "KTLogger.hh"
 #include "KTSignal.hh"
 
@@ -51,6 +52,10 @@ namespace Nymph
 
             virtual ~KTSlot();
 
+            const std::string& GetName() const;
+
+        protected:
+            std::string fName;
     };
 
     // Typedefs for backwards compatibility
@@ -66,7 +71,7 @@ namespace Nymph
 
 
     /*!
-     @class KTDataSlot
+     @class KTSlotData
      @author N. S. Oblath
 
      @brief Creates a slot that takes a KTDataPtr object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
@@ -86,7 +91,7 @@ namespace Nymph
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
     template< class... XDataTypes >
-    class KTSlotData : public KTSlot< void, KTDataPtr >
+    class KTSlotData : public KTSlot< void, KTDataPtr,  KTDataPtrReturn&  >
     {
         //public:
             //typedef XDataType data_type;
@@ -104,7 +109,7 @@ namespace Nymph
 
             virtual ~KTSlotData();
 
-            void operator()( KTDataPtr data );
+            void operator()( KTDataPtr data, KTDataPtrReturn& ret );
 
         protected:
             template< typename... DataTypes >
@@ -203,14 +208,16 @@ namespace Nymph
 
     template< typename ReturnType, typename... Args >
     template< class XFuncOwnerType >
-    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) )
+    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) ):
+            fName( name )
     {
         owner->RegisterSlot( name, owner, func );
     }
 
     template< typename ReturnType, typename... Args >
     template< class XFuncOwnerType >
-    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) )
+    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) ) :
+            fName( name )
     {
         proc->RegisterSlot( name, owner, func );
     }
@@ -220,6 +227,11 @@ namespace Nymph
     {
     }
 
+    template< typename ReturnType, typename... Args >
+    const std::string& KTSlot< ReturnType, Args... >::GetName() const
+    {
+        return fName;
+    }
 
     // KTSlotData
 
@@ -247,28 +259,33 @@ namespace Nymph
     }
 
     template< class... XDataTypes >
-    void KTSlotData< XDataTypes... >::operator()( KTDataPtr data )
+    void KTSlotData< XDataTypes... >::operator()( KTDataPtr data, KTDataPtrReturn& ret )
     {
         // Standard data slot pattern:
-        // Check to ensure that the required data type is present
 
+        // Check to ensure that the required data type is present
         if( ! DataPresent< XDataTypes... >( data ) )
         {
-            KTFATAL( slotlog, "Failed to find all of the necessary data types in the standard slot function. Aborting." );
-            raise( SIGINT );
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            ret.set_exception( std::make_exception_ptr( KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." ) );
             return;
         }
+
         // Call the function
         if( ! fFunc(data->Of< XDataTypes >()...) )
         {
-            KTFATAL( slotlog, "Something went wrong in the standard slot function. Aborting." );
-            raise( SIGINT );
+            KTERROR( slotlog, "Something went wrong in slot <" << fName << ">. Aborting." );
+            ret.set_exception( std::make_exception_ptr( KTException() << "Something went wrong in slot <" << fName << ">. Aborting." ) );
             return;
         }
+
+        // Set the return
+        ret.set_value( data );
+
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
         {
-            (*fSignalPtr)( data );
+            (*fSignalPtr)( data, ret );
         }
         return;
     }

From f3bf136d68f31ebbfbf7ed118b7884ac1153a67d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 30 Apr 2017 22:44:11 -0700
Subject: [PATCH 004/521] Nymph compiles now with most of the changes required
 to use KTDataPtrReturn; parallel-thread running in KTProcessorToolbox has not
 been implemented yet.

---
 Library/Application/KTDataQueueProcessor.cc |  8 +++---
 Library/Application/KTDataQueueProcessor.hh | 30 +++++++++++----------
 Library/Application/KTPrintDataStructure.cc | 24 ++++++++---------
 Library/Application/KTPrintDataStructure.hh | 16 +++++------
 Library/Application/KTProcessorToolbox.cc   | 16 ++++++-----
 Library/Application/KTProcessorToolbox.hh   |  2 +-
 Library/Application/KTThroughputProfiler.cc |  4 +--
 Library/Application/KTThroughputProfiler.hh |  4 +--
 Library/Data/KTApplyCut.cc                  | 10 +++----
 Library/Data/KTApplyCut.hh                  |  2 +-
 Library/Data/KTCutFilter.cc                 |  8 +++---
 Library/Data/KTCutFilter.hh                 |  2 +-
 Library/Data/KTData.hh                      |  3 +++
 Library/Processor/KTPrimaryProcessor.cc     | 10 +++----
 Library/Processor/KTPrimaryProcessor.hh     |  5 ++--
 Library/Processor/KTSlot.hh                 |  2 +-
 16 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index 64e766a..b45adf0 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -31,15 +31,15 @@ namespace Nymph
         return true;
     }
 
-    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data)
+    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret)
     {
-        fDataSignal(data);
+        fDataSignal(data, ret);
         return;
     }
 
-    void KTDataQueueProcessor::QueueData(KTDataPtr& data)
+    void KTDataQueueProcessor::QueueData(KTDataPtr& data, KTDataPtrReturn& ret)
     {
-        return DoQueueData(data, &KTDataQueueProcessor::EmitDataSignal);
+        return DoQueueData(data, ret, &KTDataQueueProcessor::EmitDataSignal);
     }
 /*
     void KTDataQueueProcessor::QueueDataList(list< KTDataPtr >* dataList)
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index b550a7e..6a37c2f 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -49,7 +49,7 @@ namespace Nymph
             struct DataAndFunc
             {
                 KTDataPtr fData;
-                void (XProcessorType::*fFuncPtr)(KTDataPtr);
+                void (XProcessorType::*fFuncPtr)(KTDataPtr, KTDataPtrReturn&);
             };
 
             typedef KTConcurrentQueue< DataAndFunc > Queue;
@@ -80,10 +80,10 @@ namespace Nymph
             // Derived Processor function pointer
             //**************************************
         public:
-            void SetFuncPtr(void (XProcessorType::*ptr)(KTDataPtr));
+            void SetFuncPtr(void (XProcessorType::*ptr)(KTDataPtr, KTDataPtrReturn&));
 
         protected:
-            void (XProcessorType::*fFuncPtr)(KTDataPtr);
+            void (XProcessorType::*fFuncPtr)(KTDataPtr, KTDataPtrReturn&);
 
 
             //*********
@@ -91,13 +91,13 @@ namespace Nymph
             //*********
         public:
             /// Begins processing of queue (switches status from kStopped to kRunning)
-            bool Run( std::promise< KTDataPtr >& promise );
+            bool Run( KTDataPtrReturn& ret );
 
             /// Stops processing of queue (switches status to kStopped)
             void Stop();
 
             /// Begins processing of queue if status is already kRunning; otherwise does nothing.
-            bool ProcessQueue();
+            bool ProcessQueue( KTDataPtrReturn& ret );
 
             void ClearQueue();
 
@@ -111,7 +111,7 @@ namespace Nymph
         protected:
             /// Queue an data object
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataPtr& data, void (XProcessorType::*func)(KTDataPtr));
+            void DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, void (XProcessorType::*func)(KTDataPtr, KTDataPtrReturn&));
 
             /// Queue a list of data objects
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
@@ -145,6 +145,8 @@ namespace Nymph
      @brief Generic data queue for asynchronous processing
 
      @details
+     Asynchronously emits a signal for each data object it receives.
+     Allows the user to start an asynchronous chain of processors.
 
      Configuration name: "data-queue"
 
@@ -166,7 +168,7 @@ namespace Nymph
             bool ConfigureSubClass(const scarab::param_node* node);
 
         public:
-            void EmitDataSignal(KTDataPtr data);
+            void EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret);
 
             //***************
             // Signals
@@ -181,7 +183,7 @@ namespace Nymph
         public:
             /// Queue an data object; will emit data signal
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void QueueData(KTDataPtr& data);
+            void QueueData(KTDataPtr& data, KTDataPtrReturn& ret);
 
             /// Queue a list of data objects; will emit data signal
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
@@ -225,11 +227,11 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Run( std::promise< KTDataPtr >& promise )
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Run( std::promise< KTDataPtr >& ret )
     {
         fStatus = kRunning;
         KTINFO(eqplog, "Queue started");
-        return ProcessQueue();
+        return ProcessQueue( ret );
     }
 
     template< class XProcessorType >
@@ -242,7 +244,7 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::SetFuncPtr(void (XProcessorType::*ptr)(KTDataPtr))
+    void KTDataQueueProcessorTemplate< XProcessorType >::SetFuncPtr(void (XProcessorType::*ptr)(KTDataPtr, KTDataPtrReturn&))
     {
         fFuncPtr = ptr;
         return;
@@ -250,7 +252,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue()
+    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue( KTDataPtrReturn& ret )
     {
         KTINFO(eqplog, "Beginning to process queue");
         while (fStatus != kStopped)
@@ -260,7 +262,7 @@ namespace Nymph
             if ((fQueue.*fPopFromQueue)(daf))
             {
                 KTDEBUG(eqplog, "Data acquired for processing");
-                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData);
+                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData, ret);
                 if (daf.fData->GetLastData()) fStatus = kStopped;
             }
             else
@@ -294,7 +296,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, void (XProcessorType::*func)(KTDataPtr))
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, void (XProcessorType::*func)(KTDataPtr, KTDataPtrReturn&))
     {
         KTDEBUG(eqplog, "Queueing data");
         DataAndFunc daf;
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index de30bbc..df922e4 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -38,36 +38,36 @@ namespace Nymph
         return true;
     }
 
-    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret)
     {
-        DoPrintDataStructure(dataPtr);
+        DoPrintDataStructure(dataPtr, ret);
 
-        fDataSignal(dataPtr);
+        fDataSignal(dataPtr, ret);
 
         return;
     }
 
-    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret)
     {
-        DoPrintCutStructure(dataPtr);
+        DoPrintCutStructure(dataPtr, ret);
 
-        fDataSignal(dataPtr);
+        fDataSignal(dataPtr, ret);
 
         return;
     }
 
 
-    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret)
     {
-        DoPrintDataStructure(dataPtr);
-        DoPrintCutStructure(dataPtr);
+        DoPrintDataStructure(dataPtr, ret);
+        DoPrintCutStructure(dataPtr, ret);
 
-        fDataSignal(dataPtr);
+        fDataSignal(dataPtr, ret);
 
         return;
     }
 
-    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn&)
     {
         std::stringstream printbuf;
 
@@ -87,7 +87,7 @@ namespace Nymph
         return;
     }
 
-    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn&)
     {
         std::stringstream printbuf;
 
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index 5d6eec4..e37f3cd 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -52,13 +52,13 @@ namespace Nymph
             bool Configure(const scarab::param_node* node);
 
         public:
-            void PrintDataStructure(KTDataPtr dataPtr);
-            void PrintCutStructure(KTDataPtr dataPtr);
-            void PrintDataAndCutStructure(KTDataPtr dataPtr);
+            void PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
 
         private:
-            void DoPrintDataStructure(KTDataPtr dataPtr);
-            void DoPrintCutStructure(KTDataPtr dataPtr);
+            void DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
 
             //***************
             // Signals
@@ -72,9 +72,9 @@ namespace Nymph
             //***************
 
         private:
-            KTSlotOneArg< void, KTDataPtr > fDataStructSlot;
-            KTSlotOneArg< void, KTDataPtr > fCutStructSlot;
-            KTSlotOneArg< void, KTDataPtr > fDataAndCutStructSlot;
+            KTSlot< void, KTDataPtr, KTDataPtrReturn& > fDataStructSlot;
+            KTSlot< void, KTDataPtr, KTDataPtrReturn& > fCutStructSlot;
+            KTSlot< void, KTDataPtr, KTDataPtrReturn& > fDataAndCutStructSlot;
 
     };
 }
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 54f6b1c..9cd0173 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -250,30 +250,32 @@ namespace Nymph
 #ifndef SINGLETHREADED
         unsigned iGroup = 0;
 #endif
-        for (RunQueue::const_iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+        for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
         {
 //#ifdef SINGLETHREADED
-            std::promise< KTDataPtr > promise;
-            for (ThreadGroup::const_iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+            for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
             {
-                std::thread thread( tgIter->fProc, &KTPrimaryProcessor::operator(), promise );
+                std::promise< KTDataPtr > promise;
+                std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( promise ) );
                 std::future< KTDataPtr > future = promise.get_future();
-                thread.join();
                 try
                 {
                     future.get();
                 }
                 catch( std::exception& e )
                 {
-                    KTERROR( proclog, "An error occurred while running processor <" << tgIter->fProc->GetName() << ">: " << e.what() );
+                    KTERROR( proclog, "An error occurred while running processor <" << tgIter->fName << ">: " << e.what() );
                     break;
                 }
+                thread.join();
                 //if (! tgIter->fProc->Run())
                 //{
                 //    return false;
                 //}
             }
 //#else
+// for now, don't do this seciton of code
+#if 0
             KTDEBUG(proclog, "Starting thread group " << iGroup);
             boost::thread_group parallelThreads;
             unsigned iThread = 0;
@@ -289,7 +291,7 @@ namespace Nymph
             // wait for execution to complete
             parallelThreads.join_all();
             iGroup++;
-//#endif
+#endif // this endif was here before i put in the temporary #if 0
         }
         KTPROG(proclog, ". . . processing complete.");
         return true;
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 4a7c287..1e891ba 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -173,7 +173,7 @@ namespace Nymph
             {
                 bool operator() (const Thread& lhs, const Thread& rhs)
                 {
-                    return lhs.fName < rhs.fName;
+                    return lhs.fProc < rhs.fProc;
                 }
             };
             typedef std::set< Thread, CompareThread > ThreadGroup;
diff --git a/Library/Application/KTThroughputProfiler.cc b/Library/Application/KTThroughputProfiler.cc
index 547d38f..f7ee624 100644
--- a/Library/Application/KTThroughputProfiler.cc
+++ b/Library/Application/KTThroughputProfiler.cc
@@ -64,7 +64,7 @@ namespace Nymph
         return Diff(fTimeStart, fTimeEnd);
     }
 
-    void KTThroughputProfiler::StartProfiling(KTDataPtr header)
+    void KTThroughputProfiler::StartProfiling(KTDataPtr header, KTDataPtrReturn&)
     {
         KTINFO(proflog, "Profiling started");
         fNDataProcessed = 0;
@@ -72,7 +72,7 @@ namespace Nymph
         return;
     }
 
-    void KTThroughputProfiler::Data(KTDataPtr data)
+    void KTThroughputProfiler::Data(KTDataPtr data, KTDataPtrReturn&)
     {
         (void)data;
         fNDataProcessed++;
diff --git a/Library/Application/KTThroughputProfiler.hh b/Library/Application/KTThroughputProfiler.hh
index afd4ea5..1098f19 100644
--- a/Library/Application/KTThroughputProfiler.hh
+++ b/Library/Application/KTThroughputProfiler.hh
@@ -86,9 +86,9 @@ namespace Nymph
             void Start();
             void Stop();
 
-            void StartProfiling(KTDataPtr data);
+            void StartProfiling(KTDataPtr data, KTDataPtrReturn& ret);
 
-            void Data(KTDataPtr data);
+            void Data(KTDataPtr data, KTDataPtrReturn& ret);
 
             void Finish();
 
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 6677451..8c29b86 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -83,11 +83,11 @@ namespace Nymph
     }
 
 
-    void KTApplyCut::ApplyCut(KTDataPtr dataPtr)
+    void KTApplyCut::ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn& ret)
     {
         if (fCut == NULL)
         {
-            KTERROR(cutlog, "No cut was specified");
+            ret.set_exception( std::make_exception_ptr( KTException() << "No cut was specified" ) );
             return;
         }
 
@@ -95,13 +95,13 @@ namespace Nymph
 
         if (cutFailed)
         {
-            fAfterCutFailSignal(dataPtr);
+            fAfterCutFailSignal(dataPtr, ret);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr);
+            fAfterCutPassSignal(dataPtr, ret);
         }
-        fAfterCutSignal(dataPtr);
+        fAfterCutSignal(dataPtr, ret);
         return;
     }
 
diff --git a/Library/Data/KTApplyCut.hh b/Library/Data/KTApplyCut.hh
index e678a29..dc93853 100644
--- a/Library/Data/KTApplyCut.hh
+++ b/Library/Data/KTApplyCut.hh
@@ -67,7 +67,7 @@ namespace Nymph
             KTCut* fCut;
 
         public:
-            void ApplyCut(KTDataPtr);
+            void ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn& ret);
 
 
             //***************
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 0b54852..397c266 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -74,18 +74,18 @@ namespace Nymph
         return cutStatus.IsCut(fCutMask);
     }
 
-    void KTCutFilter::FilterData(KTDataPtr dataPtr)
+    void KTCutFilter::FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret)
     {
         // all KTDataPtr's have KTData, so we won't bother checking
         if (Filter(dataPtr->Of< KTData >()))
         {
-            fAfterCutFailSignal(dataPtr);
+            fAfterCutFailSignal(dataPtr, ret);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr);
+            fAfterCutPassSignal(dataPtr, ret);
         }
-        fAfterCutSignal(dataPtr);
+        fAfterCutSignal(dataPtr, ret);
 
         return;
     }
diff --git a/Library/Data/KTCutFilter.hh b/Library/Data/KTCutFilter.hh
index 289ddc2..d4e1dde 100644
--- a/Library/Data/KTCutFilter.hh
+++ b/Library/Data/KTCutFilter.hh
@@ -80,7 +80,7 @@ namespace Nymph
         public:
             bool Filter(KTData& data);
 
-            void FilterData(KTDataPtr);
+            void FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret);
 
 
             //***************
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 959756a..7e3293f 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -75,5 +75,8 @@ namespace Nymph
 
     typedef std::promise< KTDataPtr > KTDataPtrReturn;
 
+#define THROW_RETURN_EXCEPTION( ret_promise, exception ) \
+    ret_promise.set_exception( std::make_exception_ptr( exception ) );
+
 } /* namespace Nymph */
 #endif /* KTDATA_HH_ */
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index aba5411..36d993d 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -7,6 +7,7 @@
 
 #include "KTPrimaryProcessor.hh"
 
+#include "KTException.hh"
 #include "KTLogger.hh"
 
 namespace Nymph
@@ -22,17 +23,16 @@ namespace Nymph
     {
     }
 
-    void KTPrimaryProcessor::operator ()( std::promise< KTDataPtr >& promise )
+    void KTPrimaryProcessor::operator ()( KTDataPtrReturn ret )
     {
-        if (! Run( promise ))
+        if (! Run( ret ))
         {
             KTERROR(proclog, "An error occurred during processor running.");
-            //TODO: make sure we're using the exception pointer correctly
-            promise.set_exception( std::make_exception_ptr( std::exception( "An error occurred during processor running" ) ) );
+            THROW_RETURN_EXCEPTION( ret, KTException() << "An error occurred during processor running" );
         }
         else
         {
-            promise.set_value( KTDataPtr() );
+            ret.set_value( KTDataPtr() );
         }
         return;
     }
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 27150ed..24812de 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -10,6 +10,7 @@
 
 #include "KTProcessor.hh"
 
+#include "KTData.hh"
 #include "KTLogger.hh"
 
 #include <future>
@@ -25,11 +26,11 @@ namespace Nymph
 
         public:
             /// Callable function used by boost::thread
-            virtual void operator()( std::promise< KTDataPtr >& promise );
+            virtual void operator()( KTDataPtrReturn ret );
 
         public:
             /// Starts the  main action of the processor
-            virtual bool Run( std::promise< KTDataPtr >& promise ) = 0;
+            virtual bool Run( KTDataPtrReturn& ret ) = 0;
 
     };
 
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 5e3010e..a0e6271 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -275,7 +275,7 @@ namespace Nymph
         if( ! fFunc(data->Of< XDataTypes >()...) )
         {
             KTERROR( slotlog, "Something went wrong in slot <" << fName << ">. Aborting." );
-            ret.set_exception( std::make_exception_ptr( KTException() << "Something went wrong in slot <" << fName << ">. Aborting." ) );
+            THROW_RETURN_EXCEPTION( ret, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
             return;
         }
 

From f09b4a5735380ba31dba255126be38e4cdfcfd1c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 3 May 2017 14:39:20 -0700
Subject: [PATCH 005/521] =?UTF-8?q?Mid-edit=20update.=20=20Won=E2=80=99t?=
 =?UTF-8?q?=20build.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Application/KTDataQueueProcessor.cc |   9 +-
 Library/Application/KTDataQueueProcessor.hh |  49 ++-
 Library/Application/KTPrintDataStructure.cc |  24 +-
 Library/Application/KTPrintDataStructure.hh |  10 +-
 Library/Application/KTProcessorToolbox.cc   | 368 +++++++++++++++++---
 Library/Application/KTProcessorToolbox.hh   |  81 ++++-
 Library/Application/KTThroughputProfiler.cc |   4 +-
 Library/Application/KTThroughputProfiler.hh |   4 +-
 Library/Data/KTApplyCut.cc                  |   8 +-
 Library/Data/KTApplyCut.hh                  |   2 +-
 Library/Data/KTCutFilter.cc                 |   8 +-
 Library/Data/KTCutFilter.hh                 |   2 +-
 Library/Processor/KTPrimaryProcessor.cc     |  17 +-
 Library/Processor/KTPrimaryProcessor.hh     |  21 +-
 Library/Processor/KTProcessor.cc            |  49 +--
 Library/Processor/KTProcessor.hh            |  44 ++-
 Library/Processor/KTSignal.hh               |  23 +-
 Library/Processor/KTSlot.hh                 |  49 +--
 Library/Processor/KTSlotWrapper.hh          |  22 +-
 Library/Processor/KTThreadReference.cc      |  44 +++
 Library/Processor/KTThreadReference.hh      |  32 ++
 21 files changed, 685 insertions(+), 185 deletions(-)
 create mode 100644 Library/Processor/KTThreadReference.cc
 create mode 100644 Library/Processor/KTThreadReference.hh

diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index b45adf0..0719f15 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -17,6 +17,7 @@ namespace Nymph
         KTDataQueueProcessorTemplate< KTDataQueueProcessor >(name),
         fDataSignal("data", this)
     {
+        SetFuncPtr(&KTDataQueueProcessor::EmitDataSignal);
         RegisterSlot("data", this, &KTDataQueueProcessor::QueueData);
         //RegisterSlot("data-list", this, &KTDataQueueProcessor::QueueDataList);
     }
@@ -31,15 +32,15 @@ namespace Nymph
         return true;
     }
 
-    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret)
+    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
-        fDataSignal(data, ret);
+        fDataSignal(data, ret, threadPacket);
         return;
     }
 
-    void KTDataQueueProcessor::QueueData(KTDataPtr& data, KTDataPtrReturn& ret)
+    void KTDataQueueProcessor::QueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
-        return DoQueueData(data, ret, &KTDataQueueProcessor::EmitDataSignal);
+        return DoQueueData(data, ret, threadPacket);
     }
 /*
     void KTDataQueueProcessor::QueueDataList(list< KTDataPtr >* dataList)
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index 6a37c2f..7e89616 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -46,10 +46,12 @@ namespace Nymph
     class KTDataQueueProcessorTemplate : public KTPrimaryProcessor
     {
         public:
+            typedef void (XProcessorType::*FuncPtrType)(KTDataPtr, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket&);
+
             struct DataAndFunc
             {
                 KTDataPtr fData;
-                void (XProcessorType::*fFuncPtr)(KTDataPtr, KTDataPtrReturn&);
+                FuncPtrType fFuncPtr;
             };
 
             typedef KTConcurrentQueue< DataAndFunc > Queue;
@@ -76,14 +78,14 @@ namespace Nymph
         protected:
             Status fStatus;
 
-            //**************************************
-            // Derived Processor function pointer
-            //**************************************
+            //**********************************************
+            // Derived Processor function pointer (optional)
+            //**********************************************
         public:
-            void SetFuncPtr(void (XProcessorType::*ptr)(KTDataPtr, KTDataPtrReturn&));
+            void SetFuncPtr(FuncPtrType ptr);
 
         protected:
-            void (XProcessorType::*fFuncPtr)(KTDataPtr, KTDataPtrReturn&);
+            FuncPtrType fFuncPtr;
 
 
             //*********
@@ -91,13 +93,13 @@ namespace Nymph
             //*********
         public:
             /// Begins processing of queue (switches status from kStopped to kRunning)
-            bool Run( KTDataPtrReturn& ret );
+            bool Run( KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket );
 
             /// Stops processing of queue (switches status to kStopped)
             void Stop();
 
             /// Begins processing of queue if status is already kRunning; otherwise does nothing.
-            bool ProcessQueue( KTDataPtrReturn& ret );
+            bool ProcessQueue( KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket );
 
             void ClearQueue();
 
@@ -109,9 +111,13 @@ namespace Nymph
             // Queueing functions for slots
             //*********
         protected:
-            /// Queue an data object
+            /// Queue an data object with a provided function
+            /// Assumes ownership of the data; original shared pointer will be nullified
+            void DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket, FuncPtrType func);
+
+            /// Queue an data object with fFuncPtr
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, void (XProcessorType::*func)(KTDataPtr, KTDataPtrReturn&));
+            void DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
             /// Queue a list of data objects
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
@@ -168,7 +174,7 @@ namespace Nymph
             bool ConfigureSubClass(const scarab::param_node* node);
 
         public:
-            void EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret);
+            void EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
             //***************
             // Signals
@@ -183,7 +189,7 @@ namespace Nymph
         public:
             /// Queue an data object; will emit data signal
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void QueueData(KTDataPtr& data, KTDataPtrReturn& ret);
+            void QueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
             /// Queue a list of data objects; will emit data signal
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
@@ -227,11 +233,11 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Run( std::promise< KTDataPtr >& ret )
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Run( std::promise< KTDataPtr >& ret, KTProcessorToolbox::ThreadPacket& threadPacket )
     {
         fStatus = kRunning;
         KTINFO(eqplog, "Queue started");
-        return ProcessQueue( ret );
+        return ProcessQueue( ret, threadPacket );
     }
 
     template< class XProcessorType >
@@ -244,7 +250,7 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::SetFuncPtr(void (XProcessorType::*ptr)(KTDataPtr, KTDataPtrReturn&))
+    void KTDataQueueProcessorTemplate< XProcessorType >::SetFuncPtr(FuncPtrType ptr)
     {
         fFuncPtr = ptr;
         return;
@@ -252,7 +258,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue( KTDataPtrReturn& ret )
+    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue( KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket )
     {
         KTINFO(eqplog, "Beginning to process queue");
         while (fStatus != kStopped)
@@ -262,7 +268,7 @@ namespace Nymph
             if ((fQueue.*fPopFromQueue)(daf))
             {
                 KTDEBUG(eqplog, "Data acquired for processing");
-                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData, ret);
+                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData, ret, threadPacket);
                 if (daf.fData->GetLastData()) fStatus = kStopped;
             }
             else
@@ -296,7 +302,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, void (XProcessorType::*func)(KTDataPtr, KTDataPtrReturn&))
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket, FuncPtrType func)
     {
         KTDEBUG(eqplog, "Queueing data");
         DataAndFunc daf;
@@ -306,6 +312,13 @@ namespace Nymph
         fQueue.push(daf);
         return;
     }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    {
+        DoQueueData(data, ret, threadPacket, &fFuncPtr);
+        return;
+    }
 /*
     template< class XProcessorType >
     void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueDataList(std::list< KTDataPtr& >* dataList, void (XProcessorType::*func)(KTDataPtr))
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index df922e4..ec19d62 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -38,36 +38,36 @@ namespace Nymph
         return true;
     }
 
-    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret)
+    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
-        DoPrintDataStructure(dataPtr, ret);
+        DoPrintDataStructure(dataPtr, ret, threadPacket);
 
-        fDataSignal(dataPtr, ret);
+        fDataSignal(dataPtr, ret, threadPacket);
 
         return;
     }
 
-    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret)
+    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
-        DoPrintCutStructure(dataPtr, ret);
+        DoPrintCutStructure(dataPtr, ret, threadPacket);
 
-        fDataSignal(dataPtr, ret);
+        fDataSignal(dataPtr, ret, threadPacket);
 
         return;
     }
 
 
-    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret)
+    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
-        DoPrintDataStructure(dataPtr, ret);
-        DoPrintCutStructure(dataPtr, ret);
+        DoPrintDataStructure(dataPtr, ret, threadPacket);
+        DoPrintCutStructure(dataPtr, ret, threadPacket);
 
-        fDataSignal(dataPtr, ret);
+        fDataSignal(dataPtr, ret, threadPacket);
 
         return;
     }
 
-    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn&)
+    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
         std::stringstream printbuf;
 
@@ -87,7 +87,7 @@ namespace Nymph
         return;
     }
 
-    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn&)
+    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
         std::stringstream printbuf;
 
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index e37f3cd..8928600 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -52,13 +52,13 @@ namespace Nymph
             bool Configure(const scarab::param_node* node);
 
         public:
-            void PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
-            void PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
-            void PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
         private:
-            void DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
-            void DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
             //***************
             // Signals
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 9cd0173..efae329 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -32,8 +32,17 @@ namespace Nymph
     KTProcessorToolbox::KTProcessorToolbox(const std::string& name) :
             KTConfigurable(name),
             fProcFactory(scarab::factory< KTProcessor, const std::string& >::get_instance()),
+            fRunSingleThreaded( true ), //TODO: switch this to false once multithreading is available
             fRunQueue(),
-            fProcMap()
+            fProcMap(),
+            fThreadFutures(),
+            fThreadPackets(),
+            fContinueSignaler(),
+            fMasterContSignal(),
+            fBreakContMutex(),
+            fDoRunThread( nullptr ),
+            fDoRunPromise(),
+            fDoRunBreakFlag( false )
     {
     }
 
@@ -45,7 +54,10 @@ namespace Nymph
     bool KTProcessorToolbox::Configure(const scarab::param_node* node)
     {
         KTPROG(proclog, "Configuring . . .");
-        // Deal with "processor" blocks first
+
+        SetRunSingleThreaded( node->get_value( "single-threaded", fRunSingleThreaded ) );
+
+        // Deal with "processor" blocks
         const scarab::param_array* procArray = node->array_at( "processors" );
         if (procArray == NULL)
         {
@@ -244,60 +256,6 @@ namespace Nymph
         return true;
     }
 
-    bool KTProcessorToolbox::Run()
-    {
-        KTPROG(proclog, "Beginning processing . . .");
-#ifndef SINGLETHREADED
-        unsigned iGroup = 0;
-#endif
-        for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-        {
-//#ifdef SINGLETHREADED
-            for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-            {
-                std::promise< KTDataPtr > promise;
-                std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( promise ) );
-                std::future< KTDataPtr > future = promise.get_future();
-                try
-                {
-                    future.get();
-                }
-                catch( std::exception& e )
-                {
-                    KTERROR( proclog, "An error occurred while running processor <" << tgIter->fName << ">: " << e.what() );
-                    break;
-                }
-                thread.join();
-                //if (! tgIter->fProc->Run())
-                //{
-                //    return false;
-                //}
-            }
-//#else
-// for now, don't do this seciton of code
-#if 0
-            KTDEBUG(proclog, "Starting thread group " << iGroup);
-            boost::thread_group parallelThreads;
-            unsigned iThread = 0;
-            for (ThreadGroup::const_iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-            {
-                // create a boost::thread object to launch the thread
-                // use boost::ref to avoid copying the processor
-                KTDEBUG(proclog, "Starting thread " << iThread << ": " << tgIter->fName);
-                parallelThreads.create_thread(boost::ref(*(tgIter->fProc)));
-                //parallelThreads.create_thread(boost::ref(**tgIter));
-                iThread++;
-            }
-            // wait for execution to complete
-            parallelThreads.join_all();
-            iGroup++;
-#endif // this endif was here before i put in the temporary #if 0
-        }
-        KTPROG(proclog, ". . . processing complete.");
-        return true;
-    }
-
-
     KTProcessor* KTProcessorToolbox::GetProcessor(const std::string& procName)
     {
         ProcMapIt it = fProcMap.find(procName);
@@ -508,4 +466,302 @@ namespace Nymph
         return true;
     }
 
+    void KTProcessorToolbox::AsyncRun()
+    {
+        if( fDoRunThread != nullptr )
+        {
+            KTERROR( proclog, "It appears that a run has already been started" );
+            return;
+        }
+
+        bool willRunSingleThreaded = fRunSingleThreaded;
+#ifdef SINGLETHREADED
+        willRunSingleThreaded = true;
+#endif
+
+        if( willRunSingleThreaded )
+        {
+            auto singleThreadRun = [&]()
+            {
+                try
+                {
+                    // reset the continue signaler
+                    fContinueSignaler = std::promise< void >();
+                    fMasterContSignal( fContinueSignaler.get_future() );
+                    if( ! fMasterContSignal.valid() )
+                    {
+                        KTERROR( proclog, "Invalid master continue-signal created" );
+                        throw std::future_error( std::future_errc::no_state );
+                    }
+                    // copy for use in this function
+                    std::shared_future< void > continueSignal = fMasterContSignal;
+
+                    KTPROG( proclog, "Starting single-threaded processing" );
+
+                    for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                    {
+                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        {
+                            std::string procName( tgIter->fName );
+                            KTINFO( proclog, "Starting processor <" << procName << ">" );
+
+                            KTDataPtrReturn dataRet;
+                            fThreadFutures.push_back( dataRet.get_future() );
+                            if( ! fThreadFutures.back().valid() )
+                            {
+                                KTERROR( proclog, "Invalid thread future created" );
+                                throw std::future_error( std::future_errc::no_state );
+                            }
+
+                            fThreadPackets.push_back( ThreadPacket() );
+                            fThreadPackets.back().fProcTB = this;
+                            fThreadPackets.back().fContinueSignal = fMasterContSignal;
+
+                            std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( dataRet ), fThreadPackets.back() );
+
+                            KTDEBUG( proclog, "Thread ID is <" << fThreadPackets.back().fThread->get_id() << ">" );
+
+                            bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                            do
+                            {
+                                std::future_status status;
+                                do
+                                {
+                                    status = fThreadFutures.back().wait_for(std::chrono::milliseconds(500));
+                                } while (status != std::future_status::ready);
+
+                                stillRunning = false;
+                                if( fThreadPackets.back().fBreakFlag )
+                                {
+                                    KTDEBUG( proclog, "Breakpoint reached" );
+                                    continueSignal.wait();
+                                    stillRunning = true;
+                                }
+                                else
+                                {
+                                    try
+                                    {
+                                        fThreadFutures.back().get();
+                                    }
+                                    catch( std::exception& e )
+                                    {
+                                        // this transfers an exception thrown by a processor to the outer catch block in this function
+                                        throw KTException() << "An error occurred while running processor <" << procName << ">: " << e.what();
+                                    }
+                                    stillRunning = false;
+                                }
+                            } while( stillRunning );
+
+                            KTINFO( proclog, "Processor <" << procName << "> has finished" );
+
+                            thread.join();
+                        } // end for loop over the thread group
+                    } // end for loop over the run-queue
+
+                    KTPROG( proclog, "Processing is complete (single-threaded)" );
+                }
+                catch( ... )
+                {
+                    // exceptions thrown in this function or from within processors will end up here
+                    fDoRunPromise.set_exception( std::current_exception() );
+                }
+                fDoRunPromise.set_value();
+                return;
+            };
+
+            fDoRunThread = new std::thread( singleThreadRun );
+        }
+        else
+        {
+            auto multiThreadRun = [&]()
+            {
+                try
+                {
+                    std::shared_future< void > fMasterContSignal( fContinueSignaler.get_future() );
+                    if( ! fMasterContSignal.valid() )
+                    {
+                        KTERROR( proclog, "Invalid master continue-signal created" );
+                        throw std::future_error( std::future_errc::no_state );
+                    }
+
+                    KTPROG( proclog, "Starting multi-threaded processing" );
+
+                    // TODO logic to start threads goes here
+
+                    KTPROG( proclog, "Processing is complete (multi-threaded)" );
+                }
+                catch( ... )
+                {
+                    fDoRunPromise.set_exception( std::current_exception() );
+                }
+                fDoRunPromise.set_value();
+                return;
+            };
+
+            fDoRunThread = new std::thread( multiThreadRun );
+        }
+
+        return;
+    }
+
+    bool KTProcessorToolbox::WaitForBreak()
+    {
+        std::future< void > doRunFuture = fDoRunPromise.get_future();
+
+        std::future_status doRunStatus;
+        do
+        {
+            doRunStatus = doRunFuture.wait_for( std::chrono::milliseconds( 500 ) );
+        } while( doRunStatus != std::future_status::ready );
+
+        if( fDoRunBreakFlag )
+        {
+            KTDEBUG( proclog, "Breakpoint reached" );
+            return true;
+        }
+
+        try
+        {
+            doRunFuture.get();
+            return false;
+        }
+        catch( std::exception& e )
+        {
+            // this transfers an exception thrown by a processor to the outer catch block in this function
+            throw;
+        }
+    }
+
+    void KTProcessorToolbox::Continue()
+    {
+        std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
+
+        // futures have been used; clear them to be replaced
+        fThreadFutures.clear();
+
+        // reset all break flags
+        fDoRunBreakFlag = false;
+        for( std::vector< ThreadPacket >::iterator tpIt = fThreadPackets.begin(); tpIt != fThreadPackets.end(); ++tpIt )
+        {
+            tpIt->fBreakFlag = false;
+        }
+
+        KTINFO( proclog, "Continuing from breakpoint" );
+        // signal everything to resume
+        fContinueSignaler.set_value();
+
+        // reset the signaler and all signals
+        // hopefull the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
+        fContinueSignaler = std::promise< void >();
+        for( std::vector< ThreadPacket >::iterator tpIt = fThreadPackets.begin(); tpIt != fThreadPackets(); ++tpIt )
+        {
+            tpIt->fContinueSignal = fContinueSignaler.get_future();
+        }
+
+        return;
+    }
+
+    void KTProcessorToolbox::InitiateBreak()
+    {
+        std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
+
+        // set all break flags
+        fDoRunBreakFlag = true;
+        for( std::vector< ThreadPacket >::iterator tpIt = fThreadPackets.begin(); tpIt != fThreadPackets.end(); ++tpIt )
+        {
+            tpIt->fBreakFlag = true;
+        }
+
+        return;
+    }
+
+    bool KTProcessorToolbox::Run()
+    {
+        AsyncRun();
+
+        std::future< void > doRunFuture = fDoRunPromise.get_future();
+
+        try
+        {
+            while( WaitForBreak() )
+            {
+                KTINFO( proclog, "Skipping breakpoint" );
+                Continue();
+            }
+        }
+        catch( std::exception& e )
+        {
+            KTERROR( proclog, "An error occurred: " << e.what() );
+            return false;
+        }
+
+        return true;
+
+        /*
+        KTPROG(proclog, "Beginning processing . . .");
+#ifndef SINGLETHREADED
+        unsigned iGroup = 0;
+#endif
+        try
+        {
+            for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+            {
+    //#ifdef SINGLETHREADED
+                for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                {
+                    std::promise< KTDataPtr > promise;
+                    std::future< KTDataPtr > future = promise.get_future();
+                    std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( promise ) );
+                    if( ! future.valid() )
+                    {
+                        throw std::future_error( std::future_errc::no_state );
+                    }
+                    std::future_status status;
+                    do
+                    {
+                        status = future.wait_for(std::chrono::milliseconds(500));
+                    } while (status != std::future_status::ready);
+
+                    try
+                    {
+                        future.get();
+                    }
+                    catch( std::exception& e )
+                    {
+                        throw KTException() << "An error occurred while running processor <" << tgIter->fName << ">: " << e.what();
+                    }
+                    thread.join();
+                }
+//#else
+// for now, don't do this section of code
+#if 0
+                KTDEBUG(proclog, "Starting thread group " << iGroup);
+                boost::thread_group parallelThreads;
+                unsigned iThread = 0;
+                for (ThreadGroup::const_iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                {
+                    // create a boost::thread object to launch the thread
+                    // use boost::ref to avoid copying the processor
+                    KTDEBUG(proclog, "Starting thread " << iThread << ": " << tgIter->fName);
+                    parallelThreads.create_thread(boost::ref(*(tgIter->fProc)));
+                    //parallelThreads.create_thread(boost::ref(**tgIter));
+                    iThread++;
+                }
+                // wait for execution to complete
+                parallelThreads.join_all();
+                iGroup++;
+#endif // this endif was here before i put in the temporary #if 0
+            }
+        }
+        catch( std::exception& e )
+        {
+            KTERROR( proclog, e.what() );
+            return false;
+        }
+        KTPROG(proclog, ". . . processing complete.");
+        return true;
+        */
+    }
+
+
 } /* namespace Nymph */
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 1e891ba..e29c15b 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -10,7 +10,7 @@
 #define KTPROCESSORTOOLBOX_HH_
 
 #include "KTConfigurable.hh"
-//#include "KTNOFactory.hh"
+#include "KTMemberVariable.hh"
 
 #include "factory.hh"
 
@@ -47,6 +47,7 @@ namespace Nymph
 
      Available (nested) configuration values:
      <ul>
+         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
          <li>processors (array of objects) -- create a processor; each object in the array should consist of:
              <ul>
                  <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
@@ -88,12 +89,7 @@ namespace Nymph
             /// Configure processors (only those specified in the toolbox)
             bool ConfigureProcessors(const scarab::param_node* node);
 
-
-        public:
-            /// Process the run queue.
-            /// This will call Run() on all of the processors in the queue.
-            bool Run();
-
+            MEMBERVARIABLE( bool, RunSingleThreaded );
 
         private:
             struct ProcessorInfo
@@ -182,6 +178,65 @@ namespace Nymph
 
             RunQueue fRunQueue;
 
+        public:
+            struct ThreadPacket
+            {
+                KTProcessorToolbox* fProcTB;
+                bool fBreakFlag; // only use outside of blocks protected by fBreakContMutex are reads, so we shouldn't need to make this an atomic
+                std::shared_future< void > fContinueSignal;
+                std::thread* fThread;
+
+                void Break( const KTDataPtr& dataPtr, KTDataPtrReturn& ret  )
+                {
+                    bool breakInititatedHere = false;
+                    if( /* breakpoint is set here */ false )
+                    {
+                        breakInititatedHere = true;
+                        fProcTB->InitiateBreak();
+                    }
+                    if( fBreakFlag || breakInititatedHere )
+                    {
+                        ret.set_value( dataPtr );
+                        fContinueSignal.wait();
+                        ret = KTDataPtrReturn();
+                        fProcTB->TakeFuture( ret.get_future() );
+                    }
+                    return;
+                }
+            };
+
+            /// Process the run queue.
+            /// This will call Run() on all of the processors in the queue.
+            bool Run();
+
+            void AsyncRun();
+
+            void WaitForContinue();
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// Throws an exception if an error occurred during processing
+            /// If the return is true, processing can continue after the break
+            bool WaitForBreak();
+
+            void Continue();
+
+        private:
+            // called from ThreadPacket::Break
+            void InitiateBreak();
+            // called from ThreadPacket::Break
+            void TakeFuture( std::future< KTDataPtr > future );
+
+            std::vector< std::future< KTDataPtr > > fThreadFutures;
+            std::vector< ThreadPacket > fThreadPackets;
+
+            std::promise< void > fContinueSignaler;
+            std::shared_future< void > fMasterContSignal;
+            std::mutex fBreakContMutex;
+
+            std::thread* fDoRunThread;
+            std::promise< void > fDoRunPromise;
+            bool fDoRunBreakFlag; // only use outside of blocks protected by fBreakContMutex is reads, so we shouldn't need to make this an atomic
+
     };
 
     inline void KTProcessorToolbox::PopBackOfRunQueue()
@@ -196,6 +251,18 @@ namespace Nymph
         return;
     }
 
+    inline void KTProcessorToolbox::WaitForContinue()
+    {
+        fMasterContSignal.wait();
+        return;
+    }
+
+    inline void KTProcessorToolbox::TakeFuture( std::future< KTDataPtr > future )
+    {
+        fThreadFutures.push_back( future );
+        return;
+    }
+
 
 
 } /* namespace Nymph */
diff --git a/Library/Application/KTThroughputProfiler.cc b/Library/Application/KTThroughputProfiler.cc
index f7ee624..94bd66b 100644
--- a/Library/Application/KTThroughputProfiler.cc
+++ b/Library/Application/KTThroughputProfiler.cc
@@ -64,7 +64,7 @@ namespace Nymph
         return Diff(fTimeStart, fTimeEnd);
     }
 
-    void KTThroughputProfiler::StartProfiling(KTDataPtr header, KTDataPtrReturn&)
+    void KTThroughputProfiler::StartProfiling(KTDataPtr header, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket&)
     {
         KTINFO(proflog, "Profiling started");
         fNDataProcessed = 0;
@@ -72,7 +72,7 @@ namespace Nymph
         return;
     }
 
-    void KTThroughputProfiler::Data(KTDataPtr data, KTDataPtrReturn&)
+    void KTThroughputProfiler::Data(KTDataPtr data, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket&)
     {
         (void)data;
         fNDataProcessed++;
diff --git a/Library/Application/KTThroughputProfiler.hh b/Library/Application/KTThroughputProfiler.hh
index 1098f19..216b3e8 100644
--- a/Library/Application/KTThroughputProfiler.hh
+++ b/Library/Application/KTThroughputProfiler.hh
@@ -86,9 +86,9 @@ namespace Nymph
             void Start();
             void Stop();
 
-            void StartProfiling(KTDataPtr data, KTDataPtrReturn& ret);
+            void StartProfiling(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
-            void Data(KTDataPtr data, KTDataPtrReturn& ret);
+            void Data(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
             void Finish();
 
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 8c29b86..b34f0a5 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -83,7 +83,7 @@ namespace Nymph
     }
 
 
-    void KTApplyCut::ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn& ret)
+    void KTApplyCut::ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
         if (fCut == NULL)
         {
@@ -95,13 +95,13 @@ namespace Nymph
 
         if (cutFailed)
         {
-            fAfterCutFailSignal(dataPtr, ret);
+            fAfterCutFailSignal(dataPtr, ret, threadPacket);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr, ret);
+            fAfterCutPassSignal(dataPtr, ret, threadPacket);
         }
-        fAfterCutSignal(dataPtr, ret);
+        fAfterCutSignal(dataPtr, ret, threadPacket);
         return;
     }
 
diff --git a/Library/Data/KTApplyCut.hh b/Library/Data/KTApplyCut.hh
index dc93853..235afcf 100644
--- a/Library/Data/KTApplyCut.hh
+++ b/Library/Data/KTApplyCut.hh
@@ -67,7 +67,7 @@ namespace Nymph
             KTCut* fCut;
 
         public:
-            void ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
 
             //***************
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 397c266..6e04137 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -74,18 +74,18 @@ namespace Nymph
         return cutStatus.IsCut(fCutMask);
     }
 
-    void KTCutFilter::FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret)
+    void KTCutFilter::FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
     {
         // all KTDataPtr's have KTData, so we won't bother checking
         if (Filter(dataPtr->Of< KTData >()))
         {
-            fAfterCutFailSignal(dataPtr, ret);
+            fAfterCutFailSignal(dataPtr, ret, threadPacket);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr, ret);
+            fAfterCutPassSignal(dataPtr, ret, threadPacket);
         }
-        fAfterCutSignal(dataPtr, ret);
+        fAfterCutSignal(dataPtr, ret, threadPacket);
 
         return;
     }
diff --git a/Library/Data/KTCutFilter.hh b/Library/Data/KTCutFilter.hh
index d4e1dde..74d94cc 100644
--- a/Library/Data/KTCutFilter.hh
+++ b/Library/Data/KTCutFilter.hh
@@ -80,7 +80,7 @@ namespace Nymph
         public:
             bool Filter(KTData& data);
 
-            void FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret);
+            void FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
 
 
             //***************
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index 36d993d..97a0c24 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -12,10 +12,11 @@
 
 namespace Nymph
 {
-    KTLOGGER(proclog, "KTPrimaryProcessor");
+    KTLOGGER( proclog, "KTPrimaryProcessor" );
 
-    KTPrimaryProcessor::KTPrimaryProcessor(const std::string& name) :
-            KTProcessor(name)
+    KTPrimaryProcessor::KTPrimaryProcessor( const std::string& name ) :
+            KTProcessor( name ),
+            fThreadRef()
     {
     }
 
@@ -23,16 +24,16 @@ namespace Nymph
     {
     }
 
-    void KTPrimaryProcessor::operator ()( KTDataPtrReturn ret )
+    void KTPrimaryProcessor::operator ()()
     {
-        if (! Run( ret ))
+        if( ! Run() )
         {
-            KTERROR(proclog, "An error occurred during processor running.");
-            THROW_RETURN_EXCEPTION( ret, KTException() << "An error occurred during processor running" );
+            KTERROR( proclog, "An error occurred during processor running." );
+            THROW_RETURN_EXCEPTION( fThreadRef.fDataPtrRet, KTException() << "An error occurred during processor running" );
         }
         else
         {
-            ret.set_value( KTDataPtr() );
+            fThreadRef.fDataPtrRet.set_value( KTDataPtr() );
         }
         return;
     }
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 24812de..596246c 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -11,7 +11,7 @@
 #include "KTProcessor.hh"
 
 #include "KTData.hh"
-#include "KTLogger.hh"
+#include "KTThreadReference.hh"
 
 #include <future>
 
@@ -25,14 +25,25 @@ namespace Nymph
             virtual ~KTPrimaryProcessor();
 
         public:
-            /// Callable function used by boost::thread
-            virtual void operator()( KTDataPtrReturn ret );
+            /// Callable function used by std::thread
+            void operator()();
 
-        public:
             /// Starts the  main action of the processor
-            virtual bool Run( KTDataPtrReturn& ret ) = 0;
+            virtual bool Run() = 0;
+
+            void SetThreadReference( KTThreadReference&& ref );
+
+        protected:
+            KTThreadReference fThreadRef;
+
 
     };
 
+    inline void KTPrimaryProcessor::SetThreadReference( KTThreadReference&& ref )
+    {
+        fThreadRef = ref;
+        return;
+    }
+
 } /* namespace Nymph */
 #endif /* KTPRIMARYPROCESSOR_HH_ */
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index 72a717d..4a62d9d 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -27,7 +27,9 @@ namespace Nymph
     KTProcessor::KTProcessor(const string& name) :
             KTConfigurable(name),
             fSignalMap(),
-            fSlotMap()
+            fSlotMap(),
+            fSlotToSigMap(),
+            fSigConnMap()
     {
     }
 
@@ -44,13 +46,35 @@ namespace Nymph
         }
     }
 
+    void KTProcessor::PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef)
+    {
+        // get the list of slot-to-signal connections for this slot
+        auto stsRange = fSlotToSigMap.equal_range(slotName);
+
+        // loop over signals called in the performance of slot slotName
+        for (SlotToSigMapCIt stsIt = stsRange.first; stsIt != stsRange.second; ++stsIt)
+        {
+            // loop over all processor:slots called by this signal
+            auto sigConnRange = fSigConnMap.equal_range(stsIt->second);
+            for (SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt)
+            {
+                // update the thread reference pointer for this connection
+                sigConnIt->second.fThreadRef = threadRef;
+                // pass the update on to the connected-to processor
+                sigConnIt->second.fProc->PassThreadRefUpdate(sigConnIt->second.fSlotName, threadRef);
+            }
+        }
+    }
+
     void KTProcessor::ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum)
     {
+        // get the signal and slot wrapper pointers
         KTSignalWrapper* signal = GetSignal(signalName);
         KTSlotWrapper* slot = processor->GetSlot(slotName);
 
         try
         {
+            // make the connection
             ConnectSignalToSlot(signal, slot, groupNum);
         }
         catch (std::exception& e)
@@ -62,28 +86,11 @@ namespace Nymph
                     string("\tIf the slot pointer is NULL, you may have the slot name wrong.");
             throw std::logic_error(errorMsg);
         }
-        KTDEBUG(processorlog, "Connected signal <" << signalName << "> to slot <" << slotName << ">");
 
-        return;
-    }
-
-    void KTProcessor::ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum)
-    {
-        KTSignalWrapper* signal = processor->GetSignal(signalName);
-        KTSlotWrapper* slot = GetSlot(slotName);
+        // record the connection in the signal-connection map
+        fSigConnMap.insert(SigConnMapVal(signalName, std::make_pair(processor, slotName)));
 
-        try
-        {
-            ConnectSignalToSlot(signal, slot, groupNum);
-        }
-        catch (std::exception& e)
-        {
-            string errorMsg = string("Exception caught in KTProcessor::ConnectASignal; signal: ") +
-                    signalName + string(", slot: ") + slotName + string("\n") + e.what() + string("\n") +
-                    string("Check that the signatures of the signal and slot match exactly.");
-            throw std::logic_error(errorMsg);
-        }
-        KTDEBUG(processorlog, "Connected slot <" << signalName << "> to signal <" << slotName << ">");
+        KTDEBUG(processorlog, "Connected signal <" << this->GetConfigName() << ":" << signalName << "> to slot <" << processor->GetConfigName() << ":" << slotName << ">");
 
         return;
     }
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 21ba7ee..b9a217b 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -21,6 +21,7 @@
 #include <boost/signals2.hpp>
 
 #include <exception>
+#include <initializer_list>
 #include <map>
 #include <sstream>
 #include <string>
@@ -35,6 +36,8 @@ namespace Nymph
             ProcessorException(std::string const& why);
     };
 
+    class KTThreadReference;
+
     class KTProcessor : public KTConfigurable
     {
         protected:
@@ -46,46 +49,62 @@ namespace Nymph
             typedef SlotMap::iterator SlotMapIt;
             typedef SlotMap::value_type SlotMapVal;
 
+            typedef std::multimap< std::string, std::string > SlotToSigMap;
+            typedef SlotToSigMap::iterator SlotToSigMapIt;
+            typedef SlotToSigMap::const_iterator SlotToSigMapCIt;
+            typedef SlotToSigMap::value_type SlotToSigMapVal;
+
+            typedef std::multimap< std::string, std::pair< KTProcessor*, std::string > > SigConnMap;
+            typedef SigConnMap::iterator SigConnMapIt;
+            typedef SigConnMap::const_iterator SigConnMapCIt;
+            typedef SigConnMap::value_type SigConnMapVal;
+
         public:
             KTProcessor(const std::string& name="default-proc-name");
             virtual ~KTProcessor();
 
         public:
+            void PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef);
 
             void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
             void ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum=-1);
-            void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
 
             template< class XProcessor >
-            void RegisterSignal(std::string name, XProcessor* signalPtr);
+            KTSignalWrapper* RegisterSignal(std::string name, XProcessor* signalPtr);
 
             template< class XTarget, typename XReturn, typename... XArgs >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...));
+            KTSlotWrapper* RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...), std::initializer_list< std::string > signals);
 
             KTSignalWrapper* GetSignal(const std::string& name);
 
             KTSlotWrapper* GetSlot(const std::string& name);
 
         protected:
+            void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
 
             SignalMap fSignalMap;
 
             SlotMap fSlotMap;
 
+            // maps which slots call which signals in this processor
+            SlotToSigMap fSlotToSigMap;
+
+            // maps which signals get connected to which slots in other processors
+            SigConnMap fSigConnMap;
     };
 
 
     template< typename XSignalSig >
-    void KTProcessor::RegisterSignal(std::string name, XSignalSig* signalPtr)
+    KTSignalWrapper* KTProcessor::RegisterSignal(std::string name, XSignalSig* signalPtr)
     {
         KTDEBUG(processorlog, "Registering signal <" << name << "> in processor <" << fConfigName << ">");
         KTSignalWrapper* sig = new KTSignalWrapper(signalPtr);
         fSignalMap.insert(SigMapVal(name, sig));
-        return;
+        return sig;
     }
 
     template< class XTarget, typename XReturn, typename... XArgs >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...))
+    KTSlotWrapper* KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...), std::initializer_list< std::string > signals)
     {
         KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
 
@@ -93,9 +112,22 @@ namespace Nymph
 
         KTSlotWrapper* slot = new KTSlotWrapper([funcPtr, target](XArgs... args){return (target->*funcPtr)(args...);}, &signalConcept);
         fSlotMap.insert(SlotMapVal(name, slot));
+
+        for (std::initializer_list< std::string >::const_iterator sigIt = signals.begin(); sigIt != signals.end(); ++sigIt)
+        {
+            fSlotToSigMap.insert(SlotToSigMapVal(name, *sigIt));
+            KTDEBUG(processorlog, "Slot-to-signal connection <" << name << "> --> <" << *sigIt << ">");
+        }
+        return slot;
+    }
+
+    inline void KTProcessor::ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum)
+    {
+        processor->ConnectASlot(signalName, this, slotName, groupNum);
         return;
     }
 
+
 #define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::KTProcessor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
diff --git a/Library/Processor/KTSignal.hh b/Library/Processor/KTSignal.hh
index 5b69017..cad637f 100644
--- a/Library/Processor/KTSignal.hh
+++ b/Library/Processor/KTSignal.hh
@@ -56,8 +56,12 @@ namespace Nymph
 
             boost_signal* Signal();
 
+            const std::string& GetName() const;
+
         protected:
             boost_signal fSignal;
+
+            std::string fName;
     };
 
     /// Convenience typedef for done signals
@@ -85,7 +89,7 @@ namespace Nymph
 
      That's it!
     */
-    typedef KTSignal< KTDataPtr, KTDataPtrReturn& > KTSignalData;
+    typedef KTSignal< KTDataPtr > KTSignalData;
 
 
     //*******************
@@ -94,19 +98,22 @@ namespace Nymph
 
     template< class... XSignalArguments >
     KTSignal< XSignalArguments... >::KTSignal( const std::string& name, KTProcessor* proc ) :
-            fSignal()
+            fSignal(),
+            fName( name )
     {
         proc->RegisterSignal(name, &fSignal);
     }
 
     template< class... XSignalArguments >
     KTSignal< XSignalArguments... >::KTSignal() :
-            fSignal()
+            fSignal(),
+            fName("none")
     {}
 
     template< class... XSignalArguments >
-    KTSignal< XSignalArguments... >::KTSignal( const KTSignal& ) :
-            fSignal()
+    KTSignal< XSignalArguments... >::KTSignal( const KTSignal& signal ) :
+            fSignal(),
+            fName( signal.fName )
     {}
 
     template< class... XSignalArguments >
@@ -126,5 +133,11 @@ namespace Nymph
         return &fSignal;
     }
 
+    template< class... XSignalArguments >
+    inline const std::string& KTSignal< XSignalArguments... >::GetName() const
+    {
+        return fName;
+    }
+
 } /* namespace Nymph */
 #endif /* KTSIGNAL_HH_ */
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index a0e6271..f547d4d 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -14,7 +14,6 @@
 #include "KTSignal.hh"
 
 #include <functional>
-#include <signal.h>
 #include <string>
 
 namespace Nymph
@@ -44,11 +43,11 @@ namespace Nymph
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType >
-            KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) );
+            KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType >
-            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) );
+            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
 
             virtual ~KTSlot();
 
@@ -56,6 +55,7 @@ namespace Nymph
 
         protected:
             std::string fName;
+            KTSlotWrapper* fSlotWrapper;
     };
 
     // Typedefs for backwards compatibility
@@ -91,7 +91,7 @@ namespace Nymph
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
     template< class... XDataTypes >
-    class KTSlotData : public KTSlot< void, KTDataPtr,  KTDataPtrReturn&  >
+    class KTSlotData : public KTSlot< void, KTDataPtr  >
     {
         //public:
             //typedef XDataType data_type;
@@ -109,7 +109,7 @@ namespace Nymph
 
             virtual ~KTSlotData();
 
-            void operator()( KTDataPtr data, KTDataPtrReturn& ret );
+            void operator()( KTDataPtr data );
 
         protected:
             template< typename... DataTypes >
@@ -208,18 +208,18 @@ namespace Nymph
 
     template< typename ReturnType, typename... Args >
     template< class XFuncOwnerType >
-    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) ):
+    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
             fName( name )
     {
-        owner->RegisterSlot( name, owner, func );
+        fSlotWrapper = owner->RegisterSlot( name, owner, func, signals );
     }
 
     template< typename ReturnType, typename... Args >
     template< class XFuncOwnerType >
-    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ) ) :
+    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
             fName( name )
     {
-        proc->RegisterSlot( name, owner, func );
+        fSlotWrapper = proc->RegisterSlot( name, owner, func, signals );
     }
 
     template< typename ReturnType, typename... Args >
@@ -238,7 +238,7 @@ namespace Nymph
     template< class... XDataTypes >
     template< class XFuncOwnerType >
     KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
     {
@@ -247,9 +247,9 @@ namespace Nymph
     template< class... XDataTypes >
     template< class XFuncOwnerType >
     KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc([func, owner](XDataTypes... args){return (owner->*func)(args...);}),
-            fSignalPtr(signalPtr)
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
+            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
     {
     }
 
@@ -259,33 +259,36 @@ namespace Nymph
     }
 
     template< class... XDataTypes >
-    void KTSlotData< XDataTypes... >::operator()( KTDataPtr data, KTDataPtrReturn& ret )
+    void KTSlotData< XDataTypes... >::operator()( KTDataPtr dataPtr )
     {
         // Standard data slot pattern:
 
+        KTThreadReference* ref = fSlotWrapper->GetThreadRef();
+
         // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( data ) )
+        if( ! DataPresent< XDataTypes... >( dataPtr ) )
         {
             KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            ret.set_exception( std::make_exception_ptr( KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." ) );
+            ref->fDataPtrRet.set_exception( std::make_exception_ptr( KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." ) );
             return;
         }
 
         // Call the function
-        if( ! fFunc(data->Of< XDataTypes >()...) )
+        if( ! fFunc( dataPtr->Of< XDataTypes >()... ) )
         {
             KTERROR( slotlog, "Something went wrong in slot <" << fName << ">. Aborting." );
-            THROW_RETURN_EXCEPTION( ret, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
+            THROW_RETURN_EXCEPTION( ref->fDataPtrRet, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
             return;
         }
 
-        // Set the return
-        ret.set_value( data );
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataPtr into the return
+        ref->Break( dataPtr );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
         {
-            (*fSignalPtr)( data, ret );
+            (*fSignalPtr)( dataPtr );
         }
         return;
     }
@@ -302,7 +305,7 @@ namespace Nymph
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotDone::operator() ),
+            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
             fFunc( [func, owner](){ return (owner->*func)(); } ),
             fSignalPtr( signalPtr )
     {
@@ -310,7 +313,7 @@ namespace Nymph
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotDone::operator() ),
+            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
             fFunc( [func, owner](){ return (owner->*func)(); } ),
             fSignalPtr( signalPtr )
     {
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index 6b7eed7..a020d11 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -10,6 +10,7 @@
 
 #include "KTConnection.hh"
 #include "KTSignalWrapper.hh"
+#include "KTThreadReference.hh"
 
 #include <boost/signals2.hpp>
 
@@ -86,12 +87,20 @@ namespace Nymph
         private:
             KTConnection fConnection;
 
+        public:
+            KTThreadReference* GetThreadRef();
+            void SetThreadRef(KTThreadReference* ref);
+
+        private:
+            KTThreadReference* fThreadRef;
+
     };
 
     template< typename XSignature, typename XTypeContainer >
     KTSlotWrapper::KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont) :
             fSlotWrapper(new KTSpecifiedInternalSlotWrapper< XSignature, XTypeContainer >(signalPtr, typeCont)),
-            fConnection()
+            fConnection(),
+            fThreadRef()
     {}
 
     inline void KTSlotWrapper::SetConnection(KTConnection conn)
@@ -112,5 +121,16 @@ namespace Nymph
         return;
     }
 
+    inline KTThreadReference* KTSlotWrapper::GetThreadRef()
+    {
+        return fThreadRef;
+    }
+
+    inline void KTSlotWrapper::SetThreadRef(KTThreadReference* ref)
+    {
+        fThreadRef = ref;
+        return;
+    }
+
 } /* namespace Nymph */
 #endif /* KTSLOTWRAPPER_HH_ */
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
new file mode 100644
index 0000000..c62a3a9
--- /dev/null
+++ b/Library/Processor/KTThreadReference.cc
@@ -0,0 +1,44 @@
+/*
+ * KTThreadReference.cc
+ *
+ *  Created on: May 2, 2017
+ *      Author: obla999
+ */
+
+#include "KTThreadReference.hh"
+
+namespace Nymph
+{
+
+    KTThreadReference::KTThreadReference() :
+            fDataPtrRet(),
+            fProcTB( nullptr ),
+            fBreakFlag( false ),
+            fContinueSignal(),
+            fThread( nullptr )
+    {
+    }
+
+    KTThreadReference::~KTThreadReference()
+    {
+    }
+
+    void KTThreadReference::Break( const KTDataPtr& dataPtr  )
+    {
+        bool breakInititatedHere = false;
+        if( /* breakpoint is set here */ false )
+        {
+            breakInititatedHere = true;
+            fProcTB->InitiateBreak();
+        }
+        if( fBreakFlag || breakInititatedHere )
+        {
+            fDataPtrRet.set_value( dataPtr );
+            fContinueSignal.wait();
+            fDataPtrRet = KTDataPtrReturn();
+            fProcTB->TakeFuture( fDataPtrRet.get_future() );
+        }
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
new file mode 100644
index 0000000..06d65ce
--- /dev/null
+++ b/Library/Processor/KTThreadReference.hh
@@ -0,0 +1,32 @@
+/*
+ * KTThreadReference.hh
+ *
+ *  Created on: May 2, 2017
+ *      Author: obla999
+ */
+
+#ifndef KTTHREADREFERENCE_HH_
+#define KTTHREADREFERENCE_HH_
+
+#include "KTData.hh"
+
+#include <thread>
+
+namespace Nymph
+{
+    class KTProcessorToolbox;
+
+    struct KTThreadReference
+    {
+        KTDataPtrReturn fDataPtrRet;
+        KTProcessorToolbox* fProcTB;
+        bool fBreakFlag; // only use outside of blocks protected by fBreakContMutex are reads, so we shouldn't need to make this an atomic
+        std::shared_future< void > fContinueSignal;
+        std::thread* fThread;
+
+        void Break( const KTDataPtr& dataPtr  );
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTTHREADREFERENCE_HH_ */

From 8a257b0ad707a429afb0db722821e5429b4a13de Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Wed, 3 May 2017 16:21:31 -0700
Subject: [PATCH 006/521] need to register processors

---
 Library/Processor/KTProcessor.hh   |  8 +++
 Library/Processor/KTProcessorPy.hh | 80 +-----------------------------
 2 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 7aa8e6c..5aec8d1 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -52,6 +52,9 @@ namespace Nymph
             KTProcessor(const std::string& name="default-proc-name");
             virtual ~KTProcessor();
 
+            template< class XDerivedProc >
+            static scarab::registrar< Nymph::KTProcessor, XDerivedProc, const std::string& >* RegisterProcessor( const std::string& name );
+
         public:
 
             void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
@@ -134,6 +137,11 @@ namespace Nymph
         return;
     }
 
+    template< class XDerivedProc >
+    scarab::registrar< KTProcessor, XDerivedProc, const std::string& >* KTProcessor::RegisterProcessor( const std::string& name )
+    {
+        return new scarab::registrar< KTProcessor, XDerivedProc, const std::string& >( name );
+    }
 
 #define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::KTProcessor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
diff --git a/Library/Processor/KTProcessorPy.hh b/Library/Processor/KTProcessorPy.hh
index 92677db..31a4b9b 100644
--- a/Library/Processor/KTProcessorPy.hh
+++ b/Library/Processor/KTProcessorPy.hh
@@ -24,86 +24,8 @@ void export_Processor()
         .def("ConnectASignal", &KTProcessor::ConnectASignal)
         .def("ConnectSignalToSlot", &KTProcessor::ConnectSignalToSlot)
         .def("Configure", Configure_JsonStr, "Configure from json encoded configuration")
-        //.def("GetSignal", KTProcessor::GetSignal)
-        //.def("RegisterSignal", &KTProcessor::RegisterSignal)
+        //.def("RegisterProcessor", &KTProcessor::RegisterProcessor, return_value_policy<manage_new_object>())
         ;
 }
 
-/*{
-    class KTProcessor : public KTConfigurable
-    {
-        public:
-
-            template< class XProcessor >
-            void RegisterSignal(std::string name, XProcessor* signalPtr);
-
-            template< class XTarget, typename XReturn >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)());
-
-            template< class XTarget, typename XReturn, typename XArg1 >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1));
-
-            template< class XTarget, typename XReturn, typename XArg1, typename XArg2 >
-            void RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1, XArg2));
-
-            KTSignalWrapper* GetSignal(const std::string& name);
-
-            KTSlotWrapper* GetSlot(const std::string& name);
-
-    };
-
-
-    template< typename XSignalSig >
-    void KTProcessor::RegisterSignal(std::string name, XSignalSig* signalPtr)
-    {
-        KTDEBUG(processorlog, "Registering signal <" << name << "> in processor <" << fConfigName << ">");
-        KTSignalWrapper* sig = new KTSignalWrapper(signalPtr);
-        fSignalMap.insert(SigMapVal(name, sig));
-        return;
-    }
-
-    template< class XTarget, typename XReturn >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)())
-    {
-        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
-
-        KTSignalConcept< XReturn () > signalConcept;
-
-        boost::function< XReturn () > *func = new boost::function< XReturn () >(boost::bind(funcPtr, target));
-
-        KTSlotWrapper* slot = new KTSlotWrapper(func, &signalConcept);
-        fSlotMap.insert(SlotMapVal(name, slot));
-        return;
-    }
-
-    template< class XTarget, typename XReturn, typename XArg1 >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1))
-    {
-        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
-
-        KTSignalConcept< XReturn (XArg1) > signalConcept;
-
-        boost::function< XReturn (XArg1) > *func = new boost::function< XReturn (XArg1) >(boost::bind(funcPtr, target, _1));
-
-        KTSlotWrapper* slot = new KTSlotWrapper(func, &signalConcept);
-        fSlotMap.insert(SlotMapVal(name, slot));
-        return;
-    }
-
-    template< class XTarget, typename XReturn, typename XArg1, typename XArg2 >
-    void KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArg1, XArg2))
-    {
-        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
-
-        KTSignalConcept< XReturn (XArg1, XArg2) > signalConcept;
-
-        boost::function< XReturn (XArg1, XArg2) > *func = new boost::function< XReturn (XArg1, XArg2) >(boost::bind(funcPtr, target, _1, _2));
-
-        KTSlotWrapper* slot = new KTSlotWrapper(func, &signalConcept);
-        fSlotMap.insert(SlotMapVal(name, slot));
-        return;
-    }
-
-
-}*/
 #endif /* KTPROCESSORPY_HH_ */

From 4bc996571b39747cce301cc0ae17b7f5069e3d2f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 3 May 2017 16:36:57 -0700
Subject: [PATCH 007/521] =?UTF-8?q?More=20partial=20work.=20=20Some=20thin?=
 =?UTF-8?q?gs=20compile,=20some=20don=E2=80=99t.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Application/KTDataQueueProcessor.cc | 11 +++---
 Library/Application/KTDataQueueProcessor.hh | 29 +++++++-------
 Library/Application/KTPrintDataStructure.cc | 36 ++++++++++-------
 Library/Application/KTPrintDataStructure.hh | 16 ++++----
 Library/Application/KTProcessorToolbox.cc   | 43 ++++++++++++++-------
 Library/Application/KTProcessorToolbox.hh   |  8 ++--
 Library/CMakeLists.txt                      |  2 +
 Library/Data/KTApplyCut.cc                  | 16 +++++---
 Library/Data/KTApplyCut.hh                  |  4 +-
 Library/Data/KTCutFilter.cc                 | 19 ++++++---
 Library/Data/KTCutFilter.hh                 |  4 +-
 Library/Processor/KTPrimaryProcessor.hh     | 10 ++++-
 Library/Processor/KTProcessor.cc            |  7 ++--
 Library/Processor/KTSlot.hh                 | 10 ++++-
 Library/Processor/KTSlotWrapper.hh          |  4 +-
 Library/Processor/KTThreadReference.cc      | 17 +-------
 Library/Processor/KTThreadReference.hh      |  9 ++++-
 Scarab                                      |  2 +-
 18 files changed, 147 insertions(+), 100 deletions(-)

diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index 0719f15..237f4b2 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -18,7 +18,7 @@ namespace Nymph
         fDataSignal("data", this)
     {
         SetFuncPtr(&KTDataQueueProcessor::EmitDataSignal);
-        RegisterSlot("data", this, &KTDataQueueProcessor::QueueData);
+        fQueueDataSW = RegisterSlot("data", this, &KTDataQueueProcessor::QueueData);
         //RegisterSlot("data-list", this, &KTDataQueueProcessor::QueueDataList);
     }
 
@@ -32,15 +32,16 @@ namespace Nymph
         return true;
     }
 
-    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data)
     {
-        fDataSignal(data, ret, threadPacket);
+        fDataSignal(data);
         return;
     }
 
-    void KTDataQueueProcessor::QueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTDataQueueProcessor::QueueData(KTDataPtr& data)
     {
-        return DoQueueData(data, ret, threadPacket);
+        fQueueDataSW->GetThreadRef()->Break(data);
+        return DoQueueData(data);
     }
 /*
     void KTDataQueueProcessor::QueueDataList(list< KTDataPtr >* dataList)
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index 7e89616..4ed2f35 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -46,7 +46,7 @@ namespace Nymph
     class KTDataQueueProcessorTemplate : public KTPrimaryProcessor
     {
         public:
-            typedef void (XProcessorType::*FuncPtrType)(KTDataPtr, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket&);
+            typedef void (XProcessorType::*FuncPtrType)(KTDataPtr);
 
             struct DataAndFunc
             {
@@ -93,13 +93,13 @@ namespace Nymph
             //*********
         public:
             /// Begins processing of queue (switches status from kStopped to kRunning)
-            bool Run( KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket );
+            bool Run();
 
             /// Stops processing of queue (switches status to kStopped)
             void Stop();
 
             /// Begins processing of queue if status is already kRunning; otherwise does nothing.
-            bool ProcessQueue( KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket );
+            bool ProcessQueue();
 
             void ClearQueue();
 
@@ -113,11 +113,11 @@ namespace Nymph
         protected:
             /// Queue an data object with a provided function
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket, FuncPtrType func);
+            void DoQueueData(KTDataPtr& data, FuncPtrType func);
 
             /// Queue an data object with fFuncPtr
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void DoQueueData(KTDataPtr& data);
 
             /// Queue a list of data objects
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
@@ -174,7 +174,7 @@ namespace Nymph
             bool ConfigureSubClass(const scarab::param_node* node);
 
         public:
-            void EmitDataSignal(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void EmitDataSignal(KTDataPtr data);
 
             //***************
             // Signals
@@ -189,7 +189,8 @@ namespace Nymph
         public:
             /// Queue an data object; will emit data signal
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void QueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void QueueData(KTDataPtr& data);
+            KTSlotWrapper* fQueueDataSW;
 
             /// Queue a list of data objects; will emit data signal
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
@@ -233,11 +234,11 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Run( std::promise< KTDataPtr >& ret, KTProcessorToolbox::ThreadPacket& threadPacket )
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Run()
     {
         fStatus = kRunning;
         KTINFO(eqplog, "Queue started");
-        return ProcessQueue( ret, threadPacket );
+        return ProcessQueue();
     }
 
     template< class XProcessorType >
@@ -258,7 +259,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue( KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket )
+    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue()
     {
         KTINFO(eqplog, "Beginning to process queue");
         while (fStatus != kStopped)
@@ -268,7 +269,7 @@ namespace Nymph
             if ((fQueue.*fPopFromQueue)(daf))
             {
                 KTDEBUG(eqplog, "Data acquired for processing");
-                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData, ret, threadPacket);
+                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData);
                 if (daf.fData->GetLastData()) fStatus = kStopped;
             }
             else
@@ -302,7 +303,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket, FuncPtrType func)
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, FuncPtrType func)
     {
         KTDEBUG(eqplog, "Queueing data");
         DataAndFunc daf;
@@ -314,9 +315,9 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data)
     {
-        DoQueueData(data, ret, threadPacket, &fFuncPtr);
+        DoQueueData(data, &fFuncPtr);
         return;
     }
 /*
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index ec19d62..438b6a2 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -23,9 +23,9 @@ namespace Nymph
     KTPrintDataStructure::KTPrintDataStructure(const std::string& name) :
             KTProcessor(name),
             fDataSignal("data", this),
-            fDataStructSlot("print-data", this, &KTPrintDataStructure::PrintDataStructure),
-            fCutStructSlot("print-cuts", this, &KTPrintDataStructure::PrintCutStructure),
-            fDataAndCutStructSlot("print-data-and-cuts", this, &KTPrintDataStructure::PrintDataAndCutStructure)
+            fDataStructSlot("print-data", this, &KTPrintDataStructure::PrintDataStructure, {"data"}),
+            fCutStructSlot("print-cuts", this, &KTPrintDataStructure::PrintCutStructure, {"data"}),
+            fDataAndCutStructSlot("print-data-and-cuts", this, &KTPrintDataStructure::PrintDataAndCutStructure, {"data"})
     {
     }
 
@@ -38,36 +38,42 @@ namespace Nymph
         return true;
     }
 
-    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr)
     {
-        DoPrintDataStructure(dataPtr, ret, threadPacket);
+        DoPrintDataStructure(dataPtr);
 
-        fDataSignal(dataPtr, ret, threadPacket);
+        fDataStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr );
+
+        fDataSignal(dataPtr);
 
         return;
     }
 
-    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr)
     {
-        DoPrintCutStructure(dataPtr, ret, threadPacket);
+        DoPrintCutStructure(dataPtr);
+
+        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr );
 
-        fDataSignal(dataPtr, ret, threadPacket);
+        fDataSignal(dataPtr);
 
         return;
     }
 
 
-    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr)
     {
-        DoPrintDataStructure(dataPtr, ret, threadPacket);
-        DoPrintCutStructure(dataPtr, ret, threadPacket);
+        DoPrintDataStructure(dataPtr);
+        DoPrintCutStructure(dataPtr);
+
+        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr );
 
-        fDataSignal(dataPtr, ret, threadPacket);
+        fDataSignal(dataPtr);
 
         return;
     }
 
-    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr)
     {
         std::stringstream printbuf;
 
@@ -87,7 +93,7 @@ namespace Nymph
         return;
     }
 
-    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr)
     {
         std::stringstream printbuf;
 
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index 8928600..77375fd 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -52,13 +52,13 @@ namespace Nymph
             bool Configure(const scarab::param_node* node);
 
         public:
-            void PrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
-            void PrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
-            void PrintDataAndCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void PrintDataStructure(KTDataPtr dataPtr);
+            void PrintCutStructure(KTDataPtr dataPtr);
+            void PrintDataAndCutStructure(KTDataPtr dataPtr);
 
         private:
-            void DoPrintDataStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
-            void DoPrintCutStructure(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void DoPrintDataStructure(KTDataPtr dataPtr);
+            void DoPrintCutStructure(KTDataPtr dataPtr);
 
             //***************
             // Signals
@@ -72,9 +72,9 @@ namespace Nymph
             //***************
 
         private:
-            KTSlot< void, KTDataPtr, KTDataPtrReturn& > fDataStructSlot;
-            KTSlot< void, KTDataPtr, KTDataPtrReturn& > fCutStructSlot;
-            KTSlot< void, KTDataPtr, KTDataPtrReturn& > fDataAndCutStructSlot;
+            KTSlot< void, KTDataPtr > fDataStructSlot;
+            KTSlot< void, KTDataPtr > fCutStructSlot;
+            KTSlot< void, KTDataPtr > fDataAndCutStructSlot;
 
     };
 }
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index efae329..e48014e 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -36,7 +36,7 @@ namespace Nymph
             fRunQueue(),
             fProcMap(),
             fThreadFutures(),
-            fThreadPackets(),
+            //fThreadPackets(),
             fContinueSignaler(),
             fMasterContSignal(),
             fBreakContMutex(),
@@ -504,7 +504,7 @@ namespace Nymph
                         {
                             std::string procName( tgIter->fName );
                             KTINFO( proclog, "Starting processor <" << procName << ">" );
-
+/*
                             KTDataPtrReturn dataRet;
                             fThreadFutures.push_back( dataRet.get_future() );
                             if( ! fThreadFutures.back().valid() )
@@ -512,14 +512,29 @@ namespace Nymph
                                 KTERROR( proclog, "Invalid thread future created" );
                                 throw std::future_error( std::future_errc::no_state );
                             }
+*/
+                            KTThreadReference thisThreadRef;
+
+                            fThreadFutures.push_back( thisThreadRef.fDataPtrRet.get_future() );
+                            if( ! fThreadFutures.back().valid() )
+                            {
+                                KTERROR( proclog, "Invalid thread future created" );
+                                throw std::future_error( std::future_errc::no_state );
+                            }
+
+                            fThreadIndicators.push_back( KTThreadIndicator() );
+                            fThreadIndicators.back().fBreakFlag = false;
+                            fThreadIndicators.back().fContinueSignal = fMasterContSignal;
 
-                            fThreadPackets.push_back( ThreadPacket() );
-                            fThreadPackets.back().fProcTB = this;
-                            fThreadPackets.back().fContinueSignal = fMasterContSignal;
+                            thisThreadRef.fThreadIndicator = &fThreadIndicators.back();
+                            thisThreadRef.fProcTB = this;
 
-                            std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( dataRet ), fThreadPackets.back() );
+                            //std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( dataRet ), fThreadPackets.back() );
+                            tgIter->fProc->SetThreadRef( std::move( thisThreadRef ) );
+                            std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc );
+                            tgIter->fProc->GetThreadRef()->fThread = &thread;
 
-                            KTDEBUG( proclog, "Thread ID is <" << fThreadPackets.back().fThread->get_id() << ">" );
+                            KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
 
                             bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                             do
@@ -531,7 +546,7 @@ namespace Nymph
                                 } while (status != std::future_status::ready);
 
                                 stillRunning = false;
-                                if( fThreadPackets.back().fBreakFlag )
+                                if( fThreadIndicators.back().fBreakFlag )
                                 {
                                     KTDEBUG( proclog, "Breakpoint reached" );
                                     continueSignal.wait();
@@ -641,9 +656,9 @@ namespace Nymph
 
         // reset all break flags
         fDoRunBreakFlag = false;
-        for( std::vector< ThreadPacket >::iterator tpIt = fThreadPackets.begin(); tpIt != fThreadPackets.end(); ++tpIt )
+        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
-            tpIt->fBreakFlag = false;
+            tiIt->fBreakFlag = false;
         }
 
         KTINFO( proclog, "Continuing from breakpoint" );
@@ -653,9 +668,9 @@ namespace Nymph
         // reset the signaler and all signals
         // hopefull the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
         fContinueSignaler = std::promise< void >();
-        for( std::vector< ThreadPacket >::iterator tpIt = fThreadPackets.begin(); tpIt != fThreadPackets(); ++tpIt )
+        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators(); ++tiIt )
         {
-            tpIt->fContinueSignal = fContinueSignaler.get_future();
+            tiIt->fContinueSignal = fContinueSignaler.get_future();
         }
 
         return;
@@ -667,9 +682,9 @@ namespace Nymph
 
         // set all break flags
         fDoRunBreakFlag = true;
-        for( std::vector< ThreadPacket >::iterator tpIt = fThreadPackets.begin(); tpIt != fThreadPackets.end(); ++tpIt )
+        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
-            tpIt->fBreakFlag = true;
+            tiIt->fBreakFlag = true;
         }
 
         return;
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index e29c15b..9c1cbb1 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -179,7 +179,7 @@ namespace Nymph
             RunQueue fRunQueue;
 
         public:
-            struct ThreadPacket
+/*            struct ThreadPacket
             {
                 KTProcessorToolbox* fProcTB;
                 bool fBreakFlag; // only use outside of blocks protected by fBreakContMutex are reads, so we shouldn't need to make this an atomic
@@ -189,7 +189,7 @@ namespace Nymph
                 void Break( const KTDataPtr& dataPtr, KTDataPtrReturn& ret  )
                 {
                     bool breakInititatedHere = false;
-                    if( /* breakpoint is set here */ false )
+                    if( /* breakpoint is set here *//* false )
                     {
                         breakInititatedHere = true;
                         fProcTB->InitiateBreak();
@@ -204,7 +204,7 @@ namespace Nymph
                     return;
                 }
             };
-
+*/
             /// Process the run queue.
             /// This will call Run() on all of the processors in the queue.
             bool Run();
@@ -227,7 +227,7 @@ namespace Nymph
             void TakeFuture( std::future< KTDataPtr > future );
 
             std::vector< std::future< KTDataPtr > > fThreadFutures;
-            std::vector< ThreadPacket > fThreadPackets;
+            std::vector< KTThreadIndicator > fThreadIndicators;
 
             std::promise< void > fContinueSignaler;
             std::shared_future< void > fMasterContSignal;
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index ad41bec..6ef9eee 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -35,6 +35,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/KTSignalWrapper.hh
     ${PROC_DIR}/KTSlot.hh
     ${PROC_DIR}/KTSlotWrapper.hh
+    ${PROC_DIR}/KTThreadReference.hh
     ${IO_DIR}/KTReader.hh
     ${IO_DIR}/KTWriter.hh
     ${APPL_DIR}/KTApplication.hh
@@ -66,6 +67,7 @@ set( NYMPH_SOURCEFILES
     ${PROC_DIR}/KTProcessor.cc
     ${PROC_DIR}/KTSignalWrapper.cc
     ${PROC_DIR}/KTSlotWrapper.cc
+    ${PROC_DIR}/KTThreadReference.cc
     ${IO_DIR}/KTReader.cc
     ${IO_DIR}/KTWriter.cc
     ${APPL_DIR}/KTApplication.cc
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index b34f0a5..8952288 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -25,7 +25,7 @@ namespace Nymph
             fAfterCutPassSignal("pass", this),
             fAfterCutFailSignal("fail", this)
     {
-        RegisterSlot("apply", this, &KTApplyCut::ApplyCut);
+        fApplyCutSW = RegisterSlot("apply", this, &KTApplyCut::ApplyCut, {"all", "pass", "fail"});
     }
 
     KTApplyCut::~KTApplyCut()
@@ -83,25 +83,29 @@ namespace Nymph
     }
 
 
-    void KTApplyCut::ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTApplyCut::ApplyCut(KTDataPtr dataPtr)
     {
+        KTThreadReference* ref = fApplyCutSW->GetThreadRef();
+
         if (fCut == NULL)
         {
-            ret.set_exception( std::make_exception_ptr( KTException() << "No cut was specified" ) );
+            ref->fDataPtrRet.set_exception( std::make_exception_ptr( KTException() << "No cut was specified" ) );
             return;
         }
 
         bool cutFailed = fCut->Apply(dataPtr);
 
+        ref->Break( dataPtr );
+
         if (cutFailed)
         {
-            fAfterCutFailSignal(dataPtr, ret, threadPacket);
+            fAfterCutFailSignal(dataPtr);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr, ret, threadPacket);
+            fAfterCutPassSignal(dataPtr);
         }
-        fAfterCutSignal(dataPtr, ret, threadPacket);
+        fAfterCutSignal(dataPtr);
         return;
     }
 
diff --git a/Library/Data/KTApplyCut.hh b/Library/Data/KTApplyCut.hh
index 235afcf..79be604 100644
--- a/Library/Data/KTApplyCut.hh
+++ b/Library/Data/KTApplyCut.hh
@@ -67,7 +67,7 @@ namespace Nymph
             KTCut* fCut;
 
         public:
-            void ApplyCut(KTDataPtr dataPtr, KTDataPtrReturn ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void ApplyCut(KTDataPtr dataPtr);
 
 
             //***************
@@ -83,6 +83,8 @@ namespace Nymph
             // Slots
             //***************
 
+            KTSlotWrapper* fApplyCutSW;
+
         private:
 
     };
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 6e04137..979e25d 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -28,7 +28,7 @@ namespace Nymph
             fAfterCutPassSignal("pass", this),
             fAfterCutFailSignal("fail", this)
     {
-        RegisterSlot("filter", this, &KTCutFilter::FilterData);
+        fFilterDataSW = RegisterSlot("filter", this, &KTCutFilter::FilterData, {"all", "pass", "fail"});
     }
 
     KTCutFilter::~KTCutFilter()
@@ -74,18 +74,25 @@ namespace Nymph
         return cutStatus.IsCut(fCutMask);
     }
 
-    void KTCutFilter::FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket)
+    void KTCutFilter::FilterData(KTDataPtr dataPtr)
     {
+        KTThreadReference* ref = fFilterDataSW->GetThreadRef();
+
         // all KTDataPtr's have KTData, so we won't bother checking
-        if (Filter(dataPtr->Of< KTData >()))
+
+        bool failCut = Filter(dataPtr->Of< KTData >());
+
+        ref->Break( dataPtr );
+
+        if (failCut)
         {
-            fAfterCutFailSignal(dataPtr, ret, threadPacket);
+            fAfterCutFailSignal(dataPtr);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr, ret, threadPacket);
+            fAfterCutPassSignal(dataPtr);
         }
-        fAfterCutSignal(dataPtr, ret, threadPacket);
+        fAfterCutSignal(dataPtr);
 
         return;
     }
diff --git a/Library/Data/KTCutFilter.hh b/Library/Data/KTCutFilter.hh
index 74d94cc..89522b4 100644
--- a/Library/Data/KTCutFilter.hh
+++ b/Library/Data/KTCutFilter.hh
@@ -80,7 +80,7 @@ namespace Nymph
         public:
             bool Filter(KTData& data);
 
-            void FilterData(KTDataPtr dataPtr, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void FilterData(KTDataPtr dataPtr);
 
 
             //***************
@@ -96,6 +96,8 @@ namespace Nymph
             // Slots
             //***************
 
+            KTSlotWrapper* fFilterDataSW;
+
         private:
 
     };
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 596246c..39e0364 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -31,7 +31,8 @@ namespace Nymph
             /// Starts the  main action of the processor
             virtual bool Run() = 0;
 
-            void SetThreadReference( KTThreadReference&& ref );
+            void SetThreadRef( KTThreadReference&& ref );
+            KTThreadReference* GetThreadRef();
 
         protected:
             KTThreadReference fThreadRef;
@@ -39,11 +40,16 @@ namespace Nymph
 
     };
 
-    inline void KTPrimaryProcessor::SetThreadReference( KTThreadReference&& ref )
+    inline void KTPrimaryProcessor::SetThreadRef( KTThreadReference&& ref )
     {
         fThreadRef = ref;
         return;
     }
 
+    inline KTThreadReference* KTPrimaryProcessor::GetThreadRef()
+    {
+        return &fThreadRef;
+    }
+
 } /* namespace Nymph */
 #endif /* KTPRIMARYPROCESSOR_HH_ */
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index 4a62d9d..c6a5a6a 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -48,6 +48,9 @@ namespace Nymph
 
     void KTProcessor::PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef)
     {
+        // update the thread reference pointer for this slot
+        GetSlot(slotName)->SetThreadRef(threadRef);
+
         // get the list of slot-to-signal connections for this slot
         auto stsRange = fSlotToSigMap.equal_range(slotName);
 
@@ -58,10 +61,8 @@ namespace Nymph
             auto sigConnRange = fSigConnMap.equal_range(stsIt->second);
             for (SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt)
             {
-                // update the thread reference pointer for this connection
-                sigConnIt->second.fThreadRef = threadRef;
                 // pass the update on to the connected-to processor
-                sigConnIt->second.fProc->PassThreadRefUpdate(sigConnIt->second.fSlotName, threadRef);
+                sigConnIt->second.first->PassThreadRefUpdate(sigConnIt->second.second, threadRef);
             }
         }
     }
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index f547d4d..ad6de31 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -53,6 +53,8 @@ namespace Nymph
 
             const std::string& GetName() const;
 
+            KTSlotWrapper* GetSlotWrapper();
+
         protected:
             std::string fName;
             KTSlotWrapper* fSlotWrapper;
@@ -228,11 +230,17 @@ namespace Nymph
     }
 
     template< typename ReturnType, typename... Args >
-    const std::string& KTSlot< ReturnType, Args... >::GetName() const
+    inline const std::string& KTSlot< ReturnType, Args... >::GetName() const
     {
         return fName;
     }
 
+    template< typename ReturnType, typename... Args >
+    inline KTSlotWrapper* KTSlot< ReturnType, Args... >::GetSlotWrapper()
+    {
+        return fSlotWrapper;
+    }
+
     // KTSlotData
 
     template< class... XDataTypes >
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index a020d11..675d570 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -88,7 +88,7 @@ namespace Nymph
             KTConnection fConnection;
 
         public:
-            KTThreadReference* GetThreadRef();
+            KTThreadReference* GetThreadRef() const;
             void SetThreadRef(KTThreadReference* ref);
 
         private:
@@ -121,7 +121,7 @@ namespace Nymph
         return;
     }
 
-    inline KTThreadReference* KTSlotWrapper::GetThreadRef()
+    inline KTThreadReference* KTSlotWrapper::GetThreadRef() const
     {
         return fThreadRef;
     }
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index c62a3a9..a05256e 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -10,19 +10,6 @@
 namespace Nymph
 {
 
-    KTThreadReference::KTThreadReference() :
-            fDataPtrRet(),
-            fProcTB( nullptr ),
-            fBreakFlag( false ),
-            fContinueSignal(),
-            fThread( nullptr )
-    {
-    }
-
-    KTThreadReference::~KTThreadReference()
-    {
-    }
-
     void KTThreadReference::Break( const KTDataPtr& dataPtr  )
     {
         bool breakInititatedHere = false;
@@ -31,10 +18,10 @@ namespace Nymph
             breakInititatedHere = true;
             fProcTB->InitiateBreak();
         }
-        if( fBreakFlag || breakInititatedHere )
+        if( fThreadIndicator->fBreakFlag || breakInititatedHere )
         {
             fDataPtrRet.set_value( dataPtr );
-            fContinueSignal.wait();
+            fThreadIndicator->fContinueSignal.wait();
             fDataPtrRet = KTDataPtrReturn();
             fProcTB->TakeFuture( fDataPtrRet.get_future() );
         }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 06d65ce..955544f 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -16,13 +16,18 @@ namespace Nymph
 {
     class KTProcessorToolbox;
 
+    struct KTThreadIndicator
+    {
+        bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
+        std::shared_future< void > fContinueSignal;
+    };
+
     struct KTThreadReference
     {
         KTDataPtrReturn fDataPtrRet;
         KTProcessorToolbox* fProcTB;
-        bool fBreakFlag; // only use outside of blocks protected by fBreakContMutex are reads, so we shouldn't need to make this an atomic
-        std::shared_future< void > fContinueSignal;
         std::thread* fThread;
+        KTThreadIndicator* fThreadIndicator;
 
         void Break( const KTDataPtr& dataPtr  );
     };
diff --git a/Scarab b/Scarab
index 1371810..7ee4812 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 137181089541410fd165a255765a833fce9688c9
+Subproject commit 7ee4812376649615f4cf97412c338201dd43e321

From 0cba7d25409e1d955569cdc25b7a77f51b5d4789 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 09:58:08 -0700
Subject: [PATCH 008/521] Minor fixes to get things compiling

---
 Library/Application/KTDataQueueProcessor.cc |  2 +-
 Library/Application/KTDataQueueProcessor.hh |  8 ++---
 Library/Application/KTProcessorToolbox.cc   |  9 +++---
 Library/Application/KTProcessorToolbox.hh   | 10 ++++--
 Library/Application/KTThroughputProfiler.cc | 10 +++---
 Library/Application/KTThroughputProfiler.hh |  4 +--
 Library/Processor/KTPrimaryProcessor.hh     |  2 +-
 Library/Processor/KTThreadReference.cc      | 35 +++++++++++++++++++++
 Library/Processor/KTThreadReference.hh      |  7 +++++
 9 files changed, 67 insertions(+), 20 deletions(-)

diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index 237f4b2..ceaaef0 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -18,7 +18,7 @@ namespace Nymph
         fDataSignal("data", this)
     {
         SetFuncPtr(&KTDataQueueProcessor::EmitDataSignal);
-        fQueueDataSW = RegisterSlot("data", this, &KTDataQueueProcessor::QueueData);
+        fQueueDataSW = RegisterSlot("data", this, &KTDataQueueProcessor::QueueData, {});
         //RegisterSlot("data-list", this, &KTDataQueueProcessor::QueueDataList);
     }
 
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index 4ed2f35..a0ef2b5 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -213,9 +213,9 @@ namespace Nymph
             fPopFromQueue(&KTConcurrentQueue< DataAndFunc >::wait_and_pop),
             fQueueDoneSignal("queue-done", this)
     {
-        RegisterSlot("use-timed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToTimedPop);
-        RegisterSlot("use-untimed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToUntimedPop);
-        RegisterSlot("use-single-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToSinglePop);
+        RegisterSlot("use-timed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToTimedPop, {});
+        RegisterSlot("use-untimed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToUntimedPop, {});
+        RegisterSlot("use-single-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToSinglePop, {});
     }
 
     template< class XProcessorType >
@@ -317,7 +317,7 @@ namespace Nymph
     template< class XProcessorType >
     void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data)
     {
-        DoQueueData(data, &fFuncPtr);
+        DoQueueData(data, fFuncPtr);
         return;
     }
 /*
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index e48014e..37d9150 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -7,6 +7,7 @@
 
 #include "KTProcessorToolbox.hh"
 
+#include "KTException.hh"
 #include "KTLogger.hh"
 #include "KTPrimaryProcessor.hh"
 
@@ -487,7 +488,7 @@ namespace Nymph
                 {
                     // reset the continue signaler
                     fContinueSignaler = std::promise< void >();
-                    fMasterContSignal( fContinueSignaler.get_future() );
+                    fMasterContSignal = fContinueSignaler.get_future();
                     if( ! fMasterContSignal.valid() )
                     {
                         KTERROR( proclog, "Invalid master continue-signal created" );
@@ -666,9 +667,9 @@ namespace Nymph
         fContinueSignaler.set_value();
 
         // reset the signaler and all signals
-        // hopefull the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
-        fContinueSignaler = std::promise< void >();
-        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators(); ++tiIt )
+        // hopefully the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
+        fContinueSignaler = std::move( std::promise< void >() );
+        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
             tiIt->fContinueSignal = fContinueSignaler.get_future();
         }
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 9c1cbb1..56623b7 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -11,10 +11,12 @@
 
 #include "KTConfigurable.hh"
 #include "KTMemberVariable.hh"
+#include "KTThreadReference.hh"
 
 #include "factory.hh"
 
 #include <deque>
+#include <future>
 #include <initializer_list>
 #include <limits>
 #include <set>
@@ -221,10 +223,12 @@ namespace Nymph
             void Continue();
 
         private:
+            friend class KTThreadReference;
+
             // called from ThreadPacket::Break
             void InitiateBreak();
             // called from ThreadPacket::Break
-            void TakeFuture( std::future< KTDataPtr > future );
+            void TakeFuture( std::future< KTDataPtr >&& future );
 
             std::vector< std::future< KTDataPtr > > fThreadFutures;
             std::vector< KTThreadIndicator > fThreadIndicators;
@@ -257,9 +261,9 @@ namespace Nymph
         return;
     }
 
-    inline void KTProcessorToolbox::TakeFuture( std::future< KTDataPtr > future )
+    inline void KTProcessorToolbox::TakeFuture( std::future< KTDataPtr >&& future )
     {
-        fThreadFutures.push_back( future );
+        fThreadFutures.push_back( std::move( future ) );
         return;
     }
 
diff --git a/Library/Application/KTThroughputProfiler.cc b/Library/Application/KTThroughputProfiler.cc
index 94bd66b..19e43fa 100644
--- a/Library/Application/KTThroughputProfiler.cc
+++ b/Library/Application/KTThroughputProfiler.cc
@@ -28,9 +28,9 @@ namespace Nymph
             fTimeEnd(),
             fNDataProcessed(0)
     {
-        RegisterSlot("start", this, &KTThroughputProfiler::StartProfiling);
-        RegisterSlot("data", this, &KTThroughputProfiler::Data);
-        RegisterSlot("stop", this, &KTThroughputProfiler::Finish);
+        RegisterSlot("start", this, &KTThroughputProfiler::StartProfiling, {});
+        RegisterSlot("data", this, &KTThroughputProfiler::Data, {});
+        RegisterSlot("stop", this, &KTThroughputProfiler::Finish, {});
     };
 
     KTThroughputProfiler::~KTThroughputProfiler()
@@ -64,7 +64,7 @@ namespace Nymph
         return Diff(fTimeStart, fTimeEnd);
     }
 
-    void KTThroughputProfiler::StartProfiling(KTDataPtr header, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket&)
+    void KTThroughputProfiler::StartProfiling(KTDataPtr header)
     {
         KTINFO(proflog, "Profiling started");
         fNDataProcessed = 0;
@@ -72,7 +72,7 @@ namespace Nymph
         return;
     }
 
-    void KTThroughputProfiler::Data(KTDataPtr data, KTDataPtrReturn&, KTProcessorToolbox::ThreadPacket&)
+    void KTThroughputProfiler::Data(KTDataPtr data)
     {
         (void)data;
         fNDataProcessed++;
diff --git a/Library/Application/KTThroughputProfiler.hh b/Library/Application/KTThroughputProfiler.hh
index 216b3e8..afd4ea5 100644
--- a/Library/Application/KTThroughputProfiler.hh
+++ b/Library/Application/KTThroughputProfiler.hh
@@ -86,9 +86,9 @@ namespace Nymph
             void Start();
             void Stop();
 
-            void StartProfiling(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void StartProfiling(KTDataPtr data);
 
-            void Data(KTDataPtr data, KTDataPtrReturn& ret, KTProcessorToolbox::ThreadPacket& threadPacket);
+            void Data(KTDataPtr data);
 
             void Finish();
 
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 39e0364..4c7764e 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -42,7 +42,7 @@ namespace Nymph
 
     inline void KTPrimaryProcessor::SetThreadRef( KTThreadReference&& ref )
     {
-        fThreadRef = ref;
+        fThreadRef = std::move( ref );
         return;
     }
 
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index a05256e..d98918f 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -7,9 +7,44 @@
 
 #include "KTThreadReference.hh"
 
+#include "KTProcessorToolbox.hh"
+
 namespace Nymph
 {
 
+    KTThreadReference::KTThreadReference() :
+            fDataPtrRet(),
+            fProcTB( nullptr ),
+            fThread( nullptr ),
+            fThreadIndicator( nullptr )
+    {}
+
+    KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
+            fDataPtrRet( std::move( orig.fDataPtrRet ) ),
+            fProcTB( orig.fProcTB ),
+            fThread( orig.fThread ),
+            fThreadIndicator( orig.fThreadIndicator )
+    {
+        orig.fProcTB = nullptr;
+        orig.fThread = nullptr;
+        orig.fThreadIndicator = nullptr;
+    }
+
+    KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
+    {
+        fDataPtrRet = std::move( orig.fDataPtrRet );
+        fProcTB = orig.fProcTB;
+        fThread = orig.fThread;
+        fThreadIndicator = orig.fThreadIndicator;
+
+        orig.fProcTB = nullptr;
+        orig.fThread = nullptr;
+        orig.fThreadIndicator = nullptr;
+
+        return *this;
+    }
+
+
     void KTThreadReference::Break( const KTDataPtr& dataPtr  )
     {
         bool breakInititatedHere = false;
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 955544f..a29c479 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -29,6 +29,13 @@ namespace Nymph
         std::thread* fThread;
         KTThreadIndicator* fThreadIndicator;
 
+        KTThreadReference();
+        KTThreadReference( const KTThreadReference& ) = delete;
+        KTThreadReference( KTThreadReference&& orig );
+
+        KTThreadReference& operator=( const KTThreadReference& ) = delete;
+        KTThreadReference& operator=( KTThreadReference&& );
+
         void Break( const KTDataPtr& dataPtr  );
     };
 

From 01c7752592fd798013df12c748530d18333ba695 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 10:30:37 -0700
Subject: [PATCH 009/521] Switched Nymph logger to use the Scarab logger

---
 Executables/Validation/TestLogger.cc |   3 +-
 Library/CMakeLists.txt               |   1 -
 Library/Utility/KTLogger.cc          | 195 --------------
 Library/Utility/KTLogger.hh          | 365 ++-------------------------
 4 files changed, 24 insertions(+), 540 deletions(-)
 delete mode 100644 Library/Utility/KTLogger.cc

diff --git a/Executables/Validation/TestLogger.cc b/Executables/Validation/TestLogger.cc
index 0a2e871..4190f03 100644
--- a/Executables/Validation/TestLogger.cc
+++ b/Executables/Validation/TestLogger.cc
@@ -10,14 +10,13 @@
 #include <exception>
 #include <iostream>
 
-using namespace Nymph;
-
 KTLOGGER(logger, "TestLogger")
 
 int main()
 {
     try
     {
+        KTTRACE(logger, "This is a TRACE message from Nymph");
         KTDEBUG(logger, "This is a DEBUG message from Nymph");
         KTINFO(logger, "This is an INFO message from Nymph");
         KTPROG(logger, "This is a PROG message from Nymph");
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 6ef9eee..28a7e8d 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -56,7 +56,6 @@ set( NYMPH_SOURCEFILES
     ${UTIL_DIR}/KTDirectory.cc
     ${UTIL_DIR}/KTEventLoop.cc
     ${UTIL_DIR}/KTException.cc
-    ${UTIL_DIR}/KTLogger.cc
     ${UTIL_DIR}/KTTime.cc
     ${DATA_DIR}/KTApplyCut.cc
     ${DATA_DIR}/KTCut.cc
diff --git a/Library/Utility/KTLogger.cc b/Library/Utility/KTLogger.cc
deleted file mode 100644
index 7cc8719..0000000
--- a/Library/Utility/KTLogger.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * KTLogger.cc
- *
- *  Created on: Jan 21, 2014
- *      Author: nsoblath
- */
-
-/*
- * KTLogger.cc
- * based on KLogger.cxx from KATRIN's Kasper
- *
- *  Created on: 18.11.2011
- *      Author: Marco Haag <marco.haag@kit.edu>
- */
-
-#include "KTLogger.hh"
-
-#include <algorithm>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <iomanip>
-#include <iterator>
-#include <sys/time.h>
-#include <time.h>
-
-using namespace std;
-
-namespace Nymph
-{
-    const string& EndColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_NORMAL KTCOLOR_SUFFIX); return *color;}
-    const string& FatalColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_RED    KTCOLOR_SUFFIX); return *color;}
-    const string& ErrorColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_RED    KTCOLOR_SUFFIX); return *color;}
-    const string& WarnColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_YELLOW KTCOLOR_SUFFIX); return *color;}
-    const string& ProgColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_BLUE   KTCOLOR_SUFFIX); return *color;}
-    const string& InfoColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_GREEN  KTCOLOR_SUFFIX); return *color;}
-    const string& DebugColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_CYAN   KTCOLOR_SUFFIX); return *color;}
-    const string& OtherColor() {static string* color = new string(KTCOLOR_PREFIX KTCOLOR_BRIGHT KTCOLOR_SEPARATOR KTCOLOR_FOREGROUND_WHITE  KTCOLOR_SUFFIX); return *color;}
-
-    struct KTLogger::Private
-    {
-        static char sDateTimeFormat[16];
-        static time_t sRawTime;
-        static tm* sProcessedTime;
-        static char sTimeBuff[512];
-        static size_t getTimeAbsoluteStr()
-        {
-            time(&KTLogger::Private::sRawTime);
-            sProcessedTime = localtime(&KTLogger::Private::sRawTime);
-            return strftime(KTLogger::Private::sTimeBuff, 512,
-                    KTLogger::Private::sDateTimeFormat,
-                    KTLogger::Private::sProcessedTime);
-        }
-
-        const char* fLogger;
-        bool fColored;
-        ELevel fThreshold;
-
-        static const char* level2Str(ELevel level)
-        {
-            switch(level)
-            {
-                case eTrace : return "TRACE"; break;
-                case eDebug : return "DEBUG"; break;
-                case eInfo  : return "INFO"; break;
-                case eProg  : return "PROG"; break;
-                case eWarn  : return "WARN"; break;
-                case eError : return "ERROR"; break;
-                case eFatal : return "FATAL"; break;
-                default     : return "XXX";
-            }
-        }
-
-        static string level2Color(ELevel level)
-        {
-            switch(level)
-            {
-                case eTrace : return DebugColor(); break;
-                case eDebug : return DebugColor(); break;
-                case eInfo  : return InfoColor(); break;
-                case eProg  : return ProgColor(); break;
-                case eWarn  : return WarnColor(); break;
-                case eError : return ErrorColor(); break;
-                case eFatal : return FatalColor(); break;
-                default     : return OtherColor();
-            }
-        }
-
-
-        void logCout(ELevel level, const string& message, const Location& loc)
-        {
-            getTimeAbsoluteStr();
-            if (fColored)
-            {
-                //cout << color << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << skKTEndColor << endl;
-                cout << Private::level2Color(level) << KTLogger::Private::sTimeBuff << " [" << setw(5) << Private::level2Str(level) << "] ";
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(cout));
-                cout << "(" << loc.fLineNumber  << "): ";
-                cout << message << EndColor() << endl;
-            }
-            else
-            {
-                //cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << endl;
-                cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] ";
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(cout));
-                cout << "(" << loc.fLineNumber  << "): ";
-                cout << message << endl;
-            }
-        }
-
-        void logCerr(ELevel level, const string& message, const Location& loc)
-        {
-            getTimeAbsoluteStr();
-            if (fColored)
-            {
-                //cout << color << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << skKTEndColor << endl;
-                cerr << Private::level2Color(level) << KTLogger::Private::sTimeBuff << " [" << setw(5) << Private::level2Str(level) << "] ";
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(cout));
-                cerr << "(" << loc.fLineNumber  << "): ";
-                cerr << message << EndColor() << endl;
-            }
-            else
-            {
-                //cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << endl;
-                cerr << KTLogger::Private::sTimeBuff << " [" << setw(5) << Private::level2Str(level) << "] ";
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(cout));
-                cerr << "(" << loc.fLineNumber  << "): ";
-                cerr << message << endl;
-            }
-        }
-    };
-
-    char KTLogger::Private::sDateTimeFormat[16];
-    time_t KTLogger::Private::sRawTime;
-    tm* KTLogger::Private::sProcessedTime;
-    char KTLogger::Private::sTimeBuff[512];
-
-    KTLogger::KTLogger(const char* name) : fPrivate(new Private())
-    {
-        if (name == 0)
-        {
-            fPrivate->fLogger = "root";
-        }
-        else
-        {
-            const char* logName = strrchr(name, '/') ? strrchr(name, '/') + 1 : name;
-            fPrivate->fLogger = logName;
-        }
-        fPrivate->fColored = true;
-        sprintf(KTLogger::Private::sDateTimeFormat,  "%%T");
-        SetLevel(eDebug);
-    }
-
-    KTLogger::KTLogger(const std::string& name) : fPrivate(new Private())
-    {
-        fPrivate->fLogger = name.c_str();
-        fPrivate->fColored = true;
-        sprintf(KTLogger::Private::sDateTimeFormat,  "%%T");
-        SetLevel(eDebug);
-    }
-
-    KTLogger::~KTLogger()
-    {
-        delete fPrivate;
-    }
-
-    bool KTLogger::IsLevelEnabled(ELevel level) const
-    {
-        return level >= fPrivate->fThreshold;
-    }
-
-    void KTLogger::SetLevel(ELevel level) const
-    {
-#if defined(NDEBUG) && defined(STANDARD)
-                fPrivate->fThreshold = level >= eInfo ? level : eInfo;
-#elif defined(NDEBUG)
-                fPrivate->fThreshold = level >= eProg ? level : eProg;
-#else
-                fPrivate->fThreshold = level;
-#endif
-    }
-
-    void KTLogger::Log(ELevel level, const string& message, const Location& loc)
-    {
-        if (level >= eWarn)
-        {
-            fPrivate->logCerr(level, message, loc);
-        }
-        else
-        {
-            fPrivate->logCout(level, message, loc);
-        }
-    }
-}
-
diff --git a/Library/Utility/KTLogger.hh b/Library/Utility/KTLogger.hh
index f1fec2f..1c38ae1 100644
--- a/Library/Utility/KTLogger.hh
+++ b/Library/Utility/KTLogger.hh
@@ -9,352 +9,33 @@
 #ifndef KTLOGGER_HH_
 #define KTLOGGER_HH_
 
-/**
- * @file
- * @brief Contains the logger class and macros, based on Kasper's KLogger class.
- * @date Created on: 18.11.2011
- * @author Marco Haag <marco.haag@kit.edu>
- *
- */
-
-// UTILITY MACROS
-
-#ifndef LOGGER_UTILITY_MACROS_
-#define LOGGER_UTILITY_MACROS_
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-#define __FILE_LINE__      __FILE__ "(" TOSTRING(__LINE__) ")"
-#define __FILENAME_LINE__  (strrchr(__FILE__, '/') ? strrchr(__FILE_LINE__, '/') + 1 : __FILE_LINE__)
-
-#if defined(_MSC_VER)
-#if _MSC_VER >= 1300
-#define __FUNC__ __FUNCSIG__
-#endif
-#else
-#if defined(__GNUC__)
-#define __FUNC__ __PRETTY_FUNCTION__
-#endif
-#endif
-#if !defined(__FUNC__)
-#define __FUNC__ ""
-#endif
-
-#define va_num_args(...) va_num_args_impl(__VA_ARGS__, 5,4,3,2,1)
-#define va_num_args_impl(_1,_2,_3,_4,_5,N,...) N
-
-#define macro_dispatcher(func, ...) macro_dispatcher_(func, va_num_args(__VA_ARGS__))
-#define macro_dispatcher_(func, nargs) macro_dispatcher__(func, nargs)
-#define macro_dispatcher__(func, nargs) func ## nargs
-
-#endif  /* LOGGER_UTILITY_MACROS_ */
-
-// COLOR DEFINITIONS
-#define KTCOLOR_NORMAL "0"
-#define KTCOLOR_BRIGHT "1"
-#define KTCOLOR_FOREGROUND_RED "31"
-#define KTCOLOR_FOREGROUND_GREEN "32"
-#define KTCOLOR_FOREGROUND_YELLOW "33"
-#define KTCOLOR_FOREGROUND_BLUE "34"
-#define KTCOLOR_FOREGROUND_CYAN "36"
-#define KTCOLOR_FOREGROUND_WHITE "37"
-#define KTCOLOR_PREFIX "\033["
-#define KTCOLOR_SUFFIX "m"
-#define KTCOLOR_SEPARATOR ";"
-
-// INCLUDES
-
-#include <string>
-#include <iostream>
-#include <sstream>
-
-// CLASS DEFINITIONS
+#include "logger.hh"
 
-/**
- * The standard Nymph namespace.
+/*
+ * The Nymph logger is now a simple rebranding of the Scarab logger
  */
-namespace Nymph
-{
-
-    /**
-     * The Nymph logger.
-     *
-     * The usage and syntax is inspired by log4j. logger itself uses the log4cxx library if it
-     * was available on the system during compiling, otherwise it falls back to std::stream.
-     *
-     * The logger output can be configured in a file specified with the environment variable
-     * @a LOGGER_CONFIGURATION (by default log4cxx.properties in the config directory).
-     *
-     * In most cases the following macro can be used
-     * to instantiate a Logger in your code:
-     * <pre>LOGGER(myLogger, "loggerName");</pre>
-     *
-     * This is equivalent to:
-     * <pre>static Nymph::logger myLogger("loggerName");</pre>
-     *
-     * For logging the following macros can be used. The source code location will then automatically
-     * included in the output:
-     *
-     * <pre>
-     * KTLOG(myLogger, level, "message");
-     * KTTRACE(myLogger, "message");
-     * KTDEBUG(myLogger, "message");
-     * KTINFO(myLogger, "message");
-     * KTPROG(myLogger, "message");
-     * KTWARN(myLogger, "message");
-     * KTERROR(myLogger, "message");
-     * KTFATAL(myLogger, "message");
-     *
-     * KTASSERT(myLogger, assertion, "message");
-     *
-     * KTLOG_ONCE(myLogger, level, "message");
-     * KTTRACE_ONCE(myLogger, "message");
-     * KTDEBUG_ONCE(myLogger, "message");
-     * KTINFO_ONCE(myLogger, "message");
-     * KTPROG_ONCE(myLogger, "message");
-     * KTWARN_ONCE(myLogger, "message");
-     * KTERROR_ONCE(myLogger, "message");
-     * KTFATAL_ONCE(myLogger, "message");
-     * </pre>
-     *
-     */
-    class KTLogger
-    {
-        public:
-            enum ELevel {
-                eTrace, eDebug, eInfo, eProg, eWarn, eError, eFatal
-            };
-
-        public:
-            /**
-             * A simple struct used by the Logger macros to pass information about the filename and line number.
-             * Not to be used directly by the user!
-             */
-            struct Location {
-                Location(const char* const fileName = "", const char* const functionName = "", int lineNumber = -1) :
-                    fLineNumber(lineNumber), fFileName(fileName), fFunctionName(functionName)
-                { }
-                int fLineNumber;
-                std::string fFileName;
-                std::string fFunctionName;
-            };
-
-        public:
-            static KTLogger& GetRootLogger() {
-                static KTLogger rootLogger;
-                return rootLogger;
-            }
-
-        public:
-            /**
-             * Standard constructor assigning a name to the logger instance.
-             * @param name The logger name.
-             */
-            KTLogger(const char* name = 0);
-            /// @overload
-            KTLogger(const std::string& name);
-
-            virtual ~KTLogger();
-
-            /**
-             * Check whether a certain log-level is enabled.
-             * @param level The log level as string representation.
-             * @return
-             */
-            bool IsLevelEnabled(ELevel level) const;
-
-            /**
-             * Set a loggers minimum logging level
-             * @param level string identifying the log level
-             */
-            void SetLevel(ELevel level) const;
-
-            /**
-             * Log a message with the specified level.
-             * Use the macro LOG(logger, level, message).
-             * @param level The log level.
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void Log(ELevel level, const std::string& message, const Location& loc = Location());
-
-            /**
-             * Log a message at TRACE level.
-             * Use the macro TRACE(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogTrace(const std::string& message, const Location& loc = Location())
-            {
-                Log(eTrace, message, loc);
-            }
-            /**
-             * Log a message at DEBUG level.
-             * Use the macro DEBUG(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogDebug(const std::string& message, const Location& loc = Location())
-            {
-                Log(eDebug, message, loc);
-            }
-            /**
-             * Log a message at INFO level.
-             * Use the macro INFO(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogInfo(const std::string& message, const Location& loc = Location())
-            {
-                Log(eInfo, message, loc);
-            }
-            /**
-             * Log a message at PROG level.
-             * Use the macro PROG(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogProg(const std::string& message, const Location& loc = Location())
-            {
-                Log(eProg, message, loc);
-            }
-            /**
-             * Log a message at WARN level.
-             * Use the macro WARN(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogWarn(const std::string& message, const Location& loc = Location())
-            {
-                Log(eWarn, message, loc);
-            }
-            /**
-             * Log a message at ERROR level.
-             * Use the macro ERROR(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogError(const std::string& message, const Location& loc = Location())
-            {
-                Log(eError, message, loc);
-            }
-            /**
-             * Log a message at FATAL level.
-             * Use the macro FATAL(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogFatal(const std::string& message, const Location& loc = Location())
-            {
-                Log(eFatal, message, loc);
-            }
-
-        private:
-            struct Private;
-            Private* fPrivate;
-    };
-
-}
-
-// PRIVATE MACROS
-
-#define __KTDEFAULT_LOGGER        ::Nymph::KTLogger::GetRootLogger()
-
-#define __KTLOG_LOCATION         ::Nymph::KTLogger::Location(__FILE__, __FUNC__, __LINE__)
-
-#define __KTLOG_LOG_4(I,L,M,O) \
-        { \
-    if (I.IsLevelEnabled(::Nymph::KTLogger::e##L)) { \
-        static bool _sLoggerMarker = false; \
-        if (!O || !_sLoggerMarker) { \
-            _sLoggerMarker = true; \
-            ::std::ostringstream stream; stream << M; \
-            I.Log(::Nymph::KTLogger::e##L, stream.str(), __KTLOG_LOCATION); \
-        } \
-    } \
-        }
-
-#define __KTLOG_LOG_3(I,L,M)     __KTLOG_LOG_4(I,L,M,false)
-#define __KTLOG_LOG_2(L,M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,L,M,false)
-#define __KTLOG_LOG_1(M)         __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Debug,M,false)
-
-#define __KTLOG_TRACE_2(I,M)     __KTLOG_LOG_4(I,Trace,M,false)
-#define __KTLOG_TRACE_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Trace,M,false)
-
-#ifndef NDEBUG
-#define __KTLOG_DEBUG_2(I,M)     __KTLOG_LOG_4(I,Debug,M,false)
-#define __KTLOG_DEBUG_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Debug,M,false)
-#else
-#define __KTLOG_DEBUG_2(I,M)     __KTLOG_LOG_4(I,Debug,"",false)
-#define __KTLOG_DEBUG_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Debug,"",false)
-#endif
-
-#define __KTLOG_INFO_2(I,M)      __KTLOG_LOG_4(I,Info,M,false)
-#define __KTLOG_INFO_1(M)        __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Info,M,false)
-
-#define __KTLOG_PROG_2(I,M)      __KTLOG_LOG_4(I,Prog,M,false)
-#define __KTLOG_PROG_1(M)        __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Prog,M,false)
-
-#define __KTLOG_WARN_2(I,M)      __KTLOG_LOG_4(I,Warn,M,false)
-#define __KTLOG_WARN_1(M)        __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Warn,M,false)
-
-#define __KTLOG_ERROR_2(I,M)     __KTLOG_LOG_4(I,Error,M,false)
-#define __KTLOG_ERROR_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Error,M,false)
-
-#define __KTLOG_FATAL_2(I,M)     __KTLOG_LOG_4(I,Fatal,M,false)
-#define __KTLOG_FATAL_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Fatal,M,false)
-
-#define __KTLOG_ASSERT_3(I,C,M)  if (!(C)) { __MTLOG_ERROR_2(I,M) }
-#define __KTLOG_ASSERT_2(C,M)    __KTLOG_ASSERT_3(__KTDEFAULT_LOGGER,C,M)
-
-
-#define __KTLOG_LOG_ONCE_3(I,L,M)     __KTLOG_LOG_4(I,L,M,true)
-#define __KTLOG_LOG_ONCE_2(L,M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,L,M,true)
-#define __KTLOG_LOG_ONCE_1(M)         __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Debug,M,true)
-
-#define __KTLOG_TRACE_ONCE_2(I,M)     __KTLOG_LOG_4(I,Trace,M,true)
-#define __KTLOG_TRACE_ONCE_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Trace,M,true)
-
-#define __KTLOG_DEBUG_ONCE_2(I,M)     __KTLOG_LOG_4(I,Debug,M,true)
-#define __KTLOG_DEBUG_ONCE_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Debug,M,true)
-
-#define __KTLOG_INFO_ONCE_2(I,M)      __KTLOG_LOG_4(I,Info,M,true)
-#define __KTLOG_INFO_ONCE_1(M)        __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Info,M,true)
-
-#define __KTLOG_PROG_ONCE_2(I,M)      __KTLOG_LOG_4(I,Prog,M,true)
-#define __KTLOG_PROG_ONCE_1(M)        __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Prog,M,true)
-
-#define __KTLOG_WARN_ONCE_2(I,M)      __KTLOG_LOG_4(I,Warn,M,true)
-#define __KTLOG_WARN_ONCE_1(M)        __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Warn,M,true)
-
-#define __KTLOG_ERROR_ONCE_2(I,M)     __KTLOG_LOG_4(I,Error,M,true)
-#define __KTLOG_ERROR_ONCE_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Error,M,true)
-
-#define __KTLOG_FATAL_ONCE_2(I,M)     __KTLOG_LOG_4(I,Fatal,M,true)
-#define __KTLOG_FATAL_ONCE_1(M)       __KTLOG_LOG_4(__KTDEFAULT_LOGGER,Fatal,M,true)
-
 
 // PUBLIC MACROS
 
-#define KTLOGGER(I,K)      static ::Nymph::KTLogger I(K);
-
-#define KTLOG(...)         macro_dispatcher(__KTLOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTTRACE(...)       macro_dispatcher(__KTLOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTDEBUG(...)       macro_dispatcher(__KTLOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTINFO(...)        macro_dispatcher(__KTLOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
-#define KTPROG(...)        macro_dispatcher(__KTLOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTWARN(...)        macro_dispatcher(__KTLOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
-#define KTERROR(...)       macro_dispatcher(__KTLOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
-#define KTFATAL(...)       macro_dispatcher(__KTLOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
-#define KTASSERT(...)      macro_dispatcher(__KTLOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
-
-#define KTLOG_ONCE(...)    macro_dispatcher(__KTLOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTTRACE_ONCE(...)  macro_dispatcher(__KTLOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTDEBUG_ONCE(...)  macro_dispatcher(__KTLOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTINFO_ONCE(...)   macro_dispatcher(__KTLOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTPROG_ONCE(...)   macro_dispatcher(__KTLOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTWARN_ONCE(...)   macro_dispatcher(__KTLOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTERROR_ONCE(...)  macro_dispatcher(__KTLOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTFATAL_ONCE(...)  macro_dispatcher(__KTLOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTLOGGER(I,K)      static ::scarab::logger I(K);
+
+#define KTLOG(...)         macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
+#define KTPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
+#define KTERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
+#define KTFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
+#define KTASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
+
+#define KTLOG_ONCE(...)    macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
 
 #endif /* KTLOGGER_HH_ */

From 6b2ce00085402ccf85fe4497f4cf73107622ccb0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 10:30:53 -0700
Subject: [PATCH 010/521] Minor fix to KTTestProcessor to get it to build

---
 Executables/Validation/KTTestProcessor.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index ad14cdf..8f1cc45 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -39,8 +39,8 @@ namespace Nymph
 
     KTTestProcessorB::KTTestProcessorB()
     {
-        RegisterSlot("first_slot", this, &KTTestProcessorB::Slot1);
-        RegisterSlot("second_slot", this, &KTTestProcessorB::Slot2);
+        RegisterSlot("first_slot", this, &KTTestProcessorB::Slot1, {});
+        RegisterSlot("second_slot", this, &KTTestProcessorB::Slot2, {});
     }
 
     KTTestProcessorB::~KTTestProcessorB()

From 084ff010d026619db21e3126ef7ebf42067ff125 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 10:51:05 -0700
Subject: [PATCH 011/521] Changed KTSlot to assume that the return type of the
 function is void (matching KTSignal)

---
 Executables/Validation/KTTestProcessor.cc     | 15 ++++---
 Executables/Validation/KTTestProcessor.hh     | 27 ++++++++----
 Executables/Validation/TestSignalsAndSlots.cc |  4 +-
 Library/Application/KTPrintDataStructure.hh   |  6 +--
 Library/Processor/KTSlot.hh                   | 42 +++++++++----------
 5 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 8f1cc45..101db06 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -14,9 +14,8 @@ namespace Nymph
     KTLOGGER(testsiglog, "KTTestProcessor")
 
     KTTestProcessorA::KTTestProcessorA() :
-            fTheSignal()
+            fTheSignal("the-signal", this)
     {
-        RegisterSignal("the_signal", &fTheSignal);
     }
 
     KTTestProcessorA::~KTTestProcessorA()
@@ -37,10 +36,10 @@ namespace Nymph
 
 
 
-    KTTestProcessorB::KTTestProcessorB()
+    KTTestProcessorB::KTTestProcessorB() :
+            fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1, {}),
+            fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2, {})
     {
-        RegisterSlot("first_slot", this, &KTTestProcessorB::Slot1, {});
-        RegisterSlot("second_slot", this, &KTTestProcessorB::Slot2, {});
     }
 
     KTTestProcessorB::~KTTestProcessorB()
@@ -52,15 +51,15 @@ namespace Nymph
         return true;
     }
 
-    void KTTestProcessorB::Slot1(int input)
+    void KTTestProcessorB::SlotFunc1(int input)
     {
         KTINFO(testsiglog, "Slot1: input is " << input);
         return;
     }
 
-    void KTTestProcessorB::Slot2(int input)
+    void KTTestProcessorB::SlotFunc2(int input)
     {
-        KTINFO(testsiglog, "Slot2: twice input is " << 2*input);
+        KTINFO(testsiglog, "Slot2: twice input is " << 2 * input);
         return;
     }
 
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 7756093..ed0bd93 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -10,14 +10,17 @@
 
 #include "KTProcessor.hh"
 
+#include "KTSignal.hh"
+#include "KTSlot.hh"
+
 namespace Nymph
 {
 
+    /*!
+     * A simple test processor that emits a signal with an integer argument
+     */
     class KTTestProcessorA : public KTProcessor
     {
-        public:
-            typedef KTSignalConcept< void (int) >::signal TheSignal;
-
         public:
             KTTestProcessorA();
             virtual ~KTTestProcessorA();
@@ -26,11 +29,13 @@ namespace Nymph
 
             void EmitSignals(int);
 
-        //private:
-            TheSignal fTheSignal;
+        private:
+            KTSignal< int > fTheSignal;
     };
 
-
+    /*!
+     * A simple test procesor that has two slots with integer arguments
+     */
     class KTTestProcessorB : public KTProcessor
     {
         public:
@@ -39,9 +44,13 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            void Slot1(int);
-            void Slot2(int);
-    };
+            void SlotFunc1(int);
+            void SlotFunc2(int);
+
+        private:
+            KTSlot< int > fSlot1;
+            KTSlot< int > fSlot2;
+};
 
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/TestSignalsAndSlots.cc b/Executables/Validation/TestSignalsAndSlots.cc
index f81b6bc..e1154c6 100644
--- a/Executables/Validation/TestSignalsAndSlots.cc
+++ b/Executables/Validation/TestSignalsAndSlots.cc
@@ -36,8 +36,8 @@ int main()
     KTINFO(testsiglog, "Connecting the_signal to first_slot and second_slot");
     try
     {
-        tpA.ConnectASlot("the_signal", &tpB, "first_slot", 20);
-        tpB.ConnectASignal(&tpA, "the_signal", "second_slot", 10);
+        tpA.ConnectASlot("the-signal", &tpB, "first-slot", 20);
+        tpB.ConnectASignal(&tpA, "the-signal", "second-slot", 10);
     }
     catch(std::exception& e)
     {
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index 77375fd..204ab09 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -72,9 +72,9 @@ namespace Nymph
             //***************
 
         private:
-            KTSlot< void, KTDataPtr > fDataStructSlot;
-            KTSlot< void, KTDataPtr > fCutStructSlot;
-            KTSlot< void, KTDataPtr > fDataAndCutStructSlot;
+            KTSlot< KTDataPtr > fDataStructSlot;
+            KTSlot< KTDataPtr > fCutStructSlot;
+            KTSlot< KTDataPtr > fDataAndCutStructSlot;
 
     };
 }
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index ad6de31..797282c 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -8,7 +8,6 @@
 #ifndef KTSLOT_HH_
 #define KTSLOT_HH_
 
-#include "KTData.hh"
 #include "KTException.hh"
 #include "KTLogger.hh"
 #include "KTSignal.hh"
@@ -37,17 +36,17 @@ namespace Nymph
      Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
      Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
     */
-    template< typename ReturnType, typename... Args >
+    template< typename... Args >
     class KTSlot
     {
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType >
-            KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
+            KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType >
-            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
+            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
 
             virtual ~KTSlot();
 
@@ -62,14 +61,13 @@ namespace Nymph
 
     // Typedefs for backwards compatibility
 
-    template < typename ReturnType >
-    using KTSlotNoArg = KTSlot< ReturnType >;
+    typedef KTSlot<> KTSlotNoArg;
 
-    template < typename ReturnType, typename Arg1 >
-    using KTSlotOneArg = KTSlot< ReturnType, Arg1 >;
+    template < typename Arg1 >
+    using KTSlotOneArg = KTSlot< Arg1 >;
 
-    template< typename ReturnType, typename Arg1, typename Arg2 >
-    using KTSlotTwoArg = KTSlot< ReturnType, Arg1, Arg2 >;
+    template< typename Arg1, typename Arg2 >
+    using KTSlotTwoArg = KTSlot< Arg1, Arg2 >;
 
 
     /*!
@@ -93,7 +91,7 @@ namespace Nymph
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
     template< class... XDataTypes >
-    class KTSlotData : public KTSlot< void, KTDataPtr  >
+    class KTSlotData : public KTSlot< KTDataPtr  >
     {
         //public:
             //typedef XDataType data_type;
@@ -182,7 +180,7 @@ namespace Nymph
 
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
-    class KTSlotDone : public KTSlot< void >
+    class KTSlotDone : public KTSlot<>
     {
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
@@ -208,35 +206,35 @@ namespace Nymph
 
     // KTSlot
 
-    template< typename ReturnType, typename... Args >
+    template< typename... Args >
     template< class XFuncOwnerType >
-    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
+    KTSlot< Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
             fName( name )
     {
         fSlotWrapper = owner->RegisterSlot( name, owner, func, signals );
     }
 
-    template< typename ReturnType, typename... Args >
+    template< typename... Args >
     template< class XFuncOwnerType >
-    KTSlot< ReturnType, Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, ReturnType (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
+    KTSlot< Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
             fName( name )
     {
         fSlotWrapper = proc->RegisterSlot( name, owner, func, signals );
     }
 
-    template< typename ReturnType, typename... Args >
-    KTSlot< ReturnType, Args... >::~KTSlot()
+    template< typename... Args >
+    KTSlot< Args... >::~KTSlot()
     {
     }
 
-    template< typename ReturnType, typename... Args >
-    inline const std::string& KTSlot< ReturnType, Args... >::GetName() const
+    template< typename... Args >
+    inline const std::string& KTSlot< Args... >::GetName() const
     {
         return fName;
     }
 
-    template< typename ReturnType, typename... Args >
-    inline KTSlotWrapper* KTSlot< ReturnType, Args... >::GetSlotWrapper()
+    template< typename... Args >
+    inline KTSlotWrapper* KTSlot< Args... >::GetSlotWrapper()
     {
         return fSlotWrapper;
     }

From 74556825d06b7b11795455157b1b4869009cd0b9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 12:51:43 -0700
Subject: [PATCH 012/521] Capture thread reference actions in function pointers
 to avoid the need to refer to the processor toolbox

---
 Library/Application/KTProcessorToolbox.cc |  4 +++-
 Library/Processor/KTSlot.hh               |  2 +-
 Library/Processor/KTThreadReference.cc    | 24 +++++++++++++++--------
 Library/Processor/KTThreadReference.hh    |  6 ++++--
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 37d9150..38bed17 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -528,7 +528,9 @@ namespace Nymph
                             fThreadIndicators.back().fContinueSignal = fMasterContSignal;
 
                             thisThreadRef.fThreadIndicator = &fThreadIndicators.back();
-                            thisThreadRef.fProcTB = this;
+                            //thisThreadRef.fProcTB = this;
+                            thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
+                            thisThreadRef.fRefreshFutureFunc = [&]( std::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
 
                             //std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( dataRet ), fThreadPackets.back() );
                             tgIter->fProc->SetThreadRef( std::move( thisThreadRef ) );
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 797282c..0d7ba13 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -275,7 +275,7 @@ namespace Nymph
         if( ! DataPresent< XDataTypes... >( dataPtr ) )
         {
             KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            ref->fDataPtrRet.set_exception( std::make_exception_ptr( KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." ) );
+            THROW_RETURN_EXCEPTION( ref->fDataPtrRet, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
             return;
         }
 
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index d98918f..2733fa3 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -7,25 +7,29 @@
 
 #include "KTThreadReference.hh"
 
-#include "KTProcessorToolbox.hh"
+//#include "KTProcessorToolbox.hh"
 
 namespace Nymph
 {
 
     KTThreadReference::KTThreadReference() :
             fDataPtrRet(),
-            fProcTB( nullptr ),
+            //fProcTB( nullptr ),
+            fInitiateBreakFunc(),
+            fRefreshFutureFunc(),
             fThread( nullptr ),
             fThreadIndicator( nullptr )
     {}
 
     KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
             fDataPtrRet( std::move( orig.fDataPtrRet ) ),
-            fProcTB( orig.fProcTB ),
+            //fProcTB( orig.fProcTB ),
+            fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
+            fRefreshFutureFunc( std::move( orig.fRefreshFutureFunc ) ),
             fThread( orig.fThread ),
             fThreadIndicator( orig.fThreadIndicator )
     {
-        orig.fProcTB = nullptr;
+        //orig.fProcTB = nullptr;
         orig.fThread = nullptr;
         orig.fThreadIndicator = nullptr;
     }
@@ -33,11 +37,13 @@ namespace Nymph
     KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
     {
         fDataPtrRet = std::move( orig.fDataPtrRet );
-        fProcTB = orig.fProcTB;
+        //fProcTB = orig.fProcTB;
+        fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
+        fRefreshFutureFunc = std::move( orig.fRefreshFutureFunc );
         fThread = orig.fThread;
         fThreadIndicator = orig.fThreadIndicator;
 
-        orig.fProcTB = nullptr;
+        //orig.fProcTB = nullptr;
         orig.fThread = nullptr;
         orig.fThreadIndicator = nullptr;
 
@@ -51,14 +57,16 @@ namespace Nymph
         if( /* breakpoint is set here */ false )
         {
             breakInititatedHere = true;
-            fProcTB->InitiateBreak();
+            fInitiateBreakFunc();
+            //fProcTB->InitiateBreak();
         }
         if( fThreadIndicator->fBreakFlag || breakInititatedHere )
         {
             fDataPtrRet.set_value( dataPtr );
             fThreadIndicator->fContinueSignal.wait();
             fDataPtrRet = KTDataPtrReturn();
-            fProcTB->TakeFuture( fDataPtrRet.get_future() );
+            //fProcTB->TakeFuture( fDataPtrRet.get_future() );
+            fRefreshFutureFunc( fDataPtrRet.get_future() );
         }
         return;
     }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index a29c479..9aa167f 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -14,7 +14,7 @@
 
 namespace Nymph
 {
-    class KTProcessorToolbox;
+    //class KTProcessorToolbox;
 
     struct KTThreadIndicator
     {
@@ -25,7 +25,9 @@ namespace Nymph
     struct KTThreadReference
     {
         KTDataPtrReturn fDataPtrRet;
-        KTProcessorToolbox* fProcTB;
+        //KTProcessorToolbox* fProcTB;
+        std::function< void() > fInitiateBreakFunc;
+        std::function< void(std::future< KTDataPtr >&&) > fRefreshFutureFunc;
         std::thread* fThread;
         KTThreadIndicator* fThreadIndicator;
 

From fafdafe22ff80b5bbcdaeb42831570a9b2ff0014 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 12:52:02 -0700
Subject: [PATCH 013/521] Added TestExceptionInSlot.cc validation program

---
 Executables/Validation/CMakeLists.txt         |  1 +
 Executables/Validation/KTTestProcessor.cc     | 34 +++++++-
 Executables/Validation/KTTestProcessor.hh     | 21 ++++-
 Executables/Validation/TestExceptionInSlot.cc | 85 +++++++++++++++++++
 Executables/Validation/TestSignalsAndSlots.cc |  2 +-
 5 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644 Executables/Validation/TestExceptionInSlot.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 5e5f9cf..004d75a 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -46,6 +46,7 @@ if (Nymph_ENABLE_TESTING)
         TestCacheDirectory
         TestCut
         TestCutFilter
+        TestExceptionInSlot
         TestLogger
         TestPrintData
         TestSignalsAndSlots
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 101db06..91481dd 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -7,6 +7,7 @@
 
 #include "KTTestProcessor.hh"
 
+#include "KTException.hh"
 #include "KTLogger.hh"
 
 namespace Nymph
@@ -34,8 +35,6 @@ namespace Nymph
     }
 
 
-
-
     KTTestProcessorB::KTTestProcessorB() :
             fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1, {}),
             fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2, {})
@@ -65,4 +64,35 @@ namespace Nymph
 
 
 
+    KTTestProcessorC::KTTestProcessorC() :
+            fSlot1("first-slot", this, &KTTestProcessorC::SlotFunc1, {})
+    {
+    }
+
+    KTTestProcessorC::~KTTestProcessorC()
+    {
+    }
+
+    bool KTTestProcessorC::Configure(const scarab::param_node*)
+    {
+        return true;
+    }
+
+    void KTTestProcessorC::SlotFunc1(int input)
+    {
+        KTThreadReference* ref = fSlot1.GetSlotWrapper()->GetThreadRef();
+
+        try
+        {
+            KTINFO(testsiglog, "Slot1: input is " << input);
+            throw KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)";
+        }
+        catch( ... )
+        {
+            ref->fDataPtrRet.set_exception( std::current_exception() );
+        }
+        return;
+    }
+
+
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index ed0bd93..02b9f80 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -34,7 +34,7 @@ namespace Nymph
     };
 
     /*!
-     * A simple test procesor that has two slots with integer arguments
+     * A simple test processor that has two slots with integer arguments
      */
     class KTTestProcessorB : public KTProcessor
     {
@@ -50,7 +50,24 @@ namespace Nymph
         private:
             KTSlot< int > fSlot1;
             KTSlot< int > fSlot2;
-};
+    };
+
+    /*!
+     * A simple test processor that has one slot that throws an exception
+     */
+    class KTTestProcessorC : public KTProcessor
+    {
+        public:
+            KTTestProcessorC();
+            virtual ~KTTestProcessorC();
+
+            bool Configure(const scarab::param_node* node);
+
+            void SlotFunc1(int);
+
+        private:
+            KTSlot< int > fSlot1;
+    };
 
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
new file mode 100644
index 0000000..4cf39bf
--- /dev/null
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -0,0 +1,85 @@
+/*
+ * TestExceptionInSlot.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N. Oblath
+ *
+ *  Intended outcome: Exception is thrown in first-slot when the first signal (5) is emitted; the second signal should not be emitted.
+ */
+
+#include "KTTestProcessor.hh"
+#include "KTLogger.hh"
+
+#include <thread>
+
+using namespace Nymph;
+
+KTLOGGER( testexclog, "TestExceptionInSlot" )
+
+int main()
+{
+
+    KTTestProcessorA tpA;
+    KTTestProcessorC tpC;
+
+    KTINFO( testexclog, "Connecting the-signal to first-slot" );
+    try
+    {
+        tpA.ConnectASlot( "the-signal", &tpC, "first-slot", 20 );
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( testexclog, "A problem occurred while connecting the signal and slots:\n" << e.what() );
+        return -1;
+    }
+
+    // setup to execute processors asynchronously
+    KTThreadReference exeThreadRef;
+    auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
+    tpC.GetSlot( "first-slot" )->SetThreadRef (&exeThreadRef );
+
+    std::atomic< bool > canceled( false );
+
+    auto exeFunc = [&]() {
+        std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
+
+        KTINFO( testexclog, "Emitting signals" );
+
+        if( canceled.load() ) return;
+        KTINFO( testexclog, "First test signal: 5" );
+        tpA.EmitSignals( 5 );
+
+        std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
+
+        if( canceled.load() ) return;
+        KTINFO( testexclog, "Second test signal: 18" );
+        tpA.EmitSignals( 18 );
+
+        return;
+    };
+
+    // run the thread
+    std::thread thread( exeFunc );
+
+    // wait for a result to be set
+    exeThreadFuture.wait();
+
+    try
+    {
+        exeThreadFuture.get();
+    }
+    catch( std::exception& e )
+    {
+        canceled = true;
+        KTERROR( testexclog, "An error occurred while running a processor: " << e.what() );
+    }
+
+    thread.join();
+
+    KTINFO( testexclog, "Tests complete" );
+
+    return 0;
+}
+
+
+
diff --git a/Executables/Validation/TestSignalsAndSlots.cc b/Executables/Validation/TestSignalsAndSlots.cc
index e1154c6..e026364 100644
--- a/Executables/Validation/TestSignalsAndSlots.cc
+++ b/Executables/Validation/TestSignalsAndSlots.cc
@@ -33,7 +33,7 @@ int main()
     */
 
     /* More Complicated Test */
-    KTINFO(testsiglog, "Connecting the_signal to first_slot and second_slot");
+    KTINFO(testsiglog, "Connecting the-signal to first-slot and second-slot");
     try
     {
         tpA.ConnectASlot("the-signal", &tpB, "first-slot", 20);

From 7e53b2970bac71ea464d2daf7dfcb46444470e8d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 16:40:09 -0700
Subject: [PATCH 014/521] Added KTTestPrimaryProcessor and
 TestPrimaryProcessor.  Added cancelation ability and passing of thread ref
 from the primary processor.

---
 Executables/Validation/CMakeLists.txt         |  3 +
 .../Validation/KTTestPrimaryProcessor.cc      | 47 ++++++++++++++
 .../Validation/KTTestPrimaryProcessor.hh      | 40 ++++++++++++
 Executables/Validation/KTTestProcessor.cc     | 12 +---
 Executables/Validation/TestExceptionInSlot.cc | 28 ++++----
 .../Validation/TestPrimaryProcessor.cc        | 64 +++++++++++++++++++
 Library/Application/KTDataQueueProcessor.cc   |  1 +
 Library/Application/KTDataQueueProcessor.hh   |  2 +-
 Library/Application/KTProcessorToolbox.cc     |  6 +-
 Library/IO/KTReader.cc                        |  2 +-
 Library/Processor/KTPrimaryProcessor.cc       | 38 +++++++++--
 Library/Processor/KTPrimaryProcessor.hh       | 13 ++--
 Library/Processor/KTProcessor.hh              |  1 +
 Library/Processor/KTThreadReference.cc        | 17 ++---
 Library/Processor/KTThreadReference.hh        |  6 +-
 15 files changed, 222 insertions(+), 58 deletions(-)
 create mode 100644 Executables/Validation/KTTestPrimaryProcessor.cc
 create mode 100644 Executables/Validation/KTTestPrimaryProcessor.hh
 create mode 100644 Executables/Validation/TestPrimaryProcessor.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 004d75a..58ceed9 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -15,12 +15,14 @@ if (Nymph_ENABLE_TESTING)
     set (VALIDATION_HEADERFILES
         KTTestConfigurable.hh
         KTTestCuts.hh
+        KTTestPrimaryProcessor.hh
         KTTestProcessor.hh
     )
     
     set (VALIDATION_SOURCEFILES
         KTTestConfigurable.cc
         KTTestCuts.cc
+        KTTestPrimaryProcessor.cc
         KTTestProcessor.cc
     )
     
@@ -48,6 +50,7 @@ if (Nymph_ENABLE_TESTING)
         TestCutFilter
         TestExceptionInSlot
         TestLogger
+        TestPrimaryProcessor
         TestPrintData
         TestSignalsAndSlots
         TestThroughputProfiler
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
new file mode 100644
index 0000000..2792158
--- /dev/null
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -0,0 +1,47 @@
+/*
+ * KTTestPrimaryProcessor.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+
+namespace Nymph
+{
+
+    KTTestPrimaryProcessor::KTTestPrimaryProcessor() :
+            KTPrimaryProcessor( {"the-signal"} ),
+            fIterations(10),
+            fTheSignal("the-signal", this)
+    {
+    }
+
+    KTTestPrimaryProcessor::~KTTestPrimaryProcessor()
+    {
+    }
+
+    bool KTTestPrimaryProcessor::Configure( const scarab::param_node* node )
+    {
+        if( node == nullptr ) return true;
+
+        SetIterations( node->get_value( "iterations", GetIterations() ) );
+
+        return true;
+    }
+
+    bool KTTestPrimaryProcessor::Run()
+    {
+        for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
+        {
+            // e.g. for a real processor, do some work here instead of sleeping
+            std::this_thread::sleep_for( std::chrono::milliseconds(1) );
+
+            if( fThreadRef.fThreadIndicator->fCanceled ) break;
+
+            fTheSignal( iIteration );
+        }
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Executables/Validation/KTTestPrimaryProcessor.hh b/Executables/Validation/KTTestPrimaryProcessor.hh
new file mode 100644
index 0000000..8b7f6c5
--- /dev/null
+++ b/Executables/Validation/KTTestPrimaryProcessor.hh
@@ -0,0 +1,40 @@
+/*
+ * KTTestPrimaryProcessor.hh
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#ifndef KTTESTPRIMARYPROCESSOR_HH_
+#define KTTESTPRIMARYPROCESSOR_HH_
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTMemberVariable.hh"
+#include "KTSignal.hh"
+
+namespace Nymph
+{
+
+    class KTTestPrimaryProcessor : public KTPrimaryProcessor
+    {
+        public:
+            KTTestPrimaryProcessor();
+            virtual ~KTTestPrimaryProcessor();
+
+        public:
+            bool Configure( const scarab::param_node* node );
+
+            MEMBERVARIABLE( unsigned, Iterations );
+
+        public:
+            virtual bool Run();
+
+        private:
+            KTSignal< int > fTheSignal;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTTESTPRIMARYPROCESSOR_HH_ */
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 91481dd..5be413e 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -82,15 +82,9 @@ namespace Nymph
     {
         KTThreadReference* ref = fSlot1.GetSlotWrapper()->GetThreadRef();
 
-        try
-        {
-            KTINFO(testsiglog, "Slot1: input is " << input);
-            throw KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)";
-        }
-        catch( ... )
-        {
-            ref->fDataPtrRet.set_exception( std::current_exception() );
-        }
+        KTINFO(testsiglog, "Slot1: input is " << input);
+        throw KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)";
+
         return;
     }
 
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 4cf39bf..033bd34 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -41,19 +41,26 @@ int main()
     std::atomic< bool > canceled( false );
 
     auto exeFunc = [&]() {
-        std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
+        try
+        {
+            std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
 
-        KTINFO( testexclog, "Emitting signals" );
+            KTINFO( testexclog, "Emitting signals" );
 
-        if( canceled.load() ) return;
-        KTINFO( testexclog, "First test signal: 5" );
-        tpA.EmitSignals( 5 );
+            if( canceled.load() ) return;
+            KTINFO( testexclog, "First test signal: 5" );
+            tpA.EmitSignals( 5 );
 
-        std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
+            std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
 
-        if( canceled.load() ) return;
-        KTINFO( testexclog, "Second test signal: 18" );
-        tpA.EmitSignals( 18 );
+            if( canceled.load() ) return;
+            KTINFO( testexclog, "Second test signal: 18" );
+            tpA.EmitSignals( 18 );
+        }
+        catch( ... )
+        {
+            exeThreadRef.fDataPtrRet.set_exception( std::current_exception() );
+        }
 
         return;
     };
@@ -80,6 +87,3 @@ int main()
 
     return 0;
 }
-
-
-
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
new file mode 100644
index 0000000..2050c3d
--- /dev/null
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -0,0 +1,64 @@
+/*
+ * TestPrimaryProcessor.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: obla999
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+#include "KTTestProcessor.hh"
+
+#include "KTLogger.hh"
+
+#include <thread>
+
+using namespace Nymph;
+
+KTLOGGER( testpplog, "TestPrimaryProcessor" )
+
+int main()
+{
+
+    KTTestPrimaryProcessor tpp;
+    KTTestProcessorB tp;
+
+    KTINFO( testpplog, "Connecting the-signal to first-slot" );
+    try
+    {
+        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( testpplog, "A problem occurred while connecting the signal and slots:\n" << e.what() );
+        return -1;
+    }
+
+    // setup to execute processors asynchronously
+    KTThreadReference exeThreadRef;
+    auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
+
+    KTThreadIndicator exeThreadInd;
+    exeThreadRef.fThreadIndicator = &exeThreadInd;
+
+    // run the thread
+    std::thread thread( &KTPrimaryProcessor::operator(), &tpp, std::move( exeThreadRef ) );
+
+    // wait for a result to be set
+    exeThreadFuture.wait();
+
+    try
+    {
+        exeThreadFuture.get();
+    }
+    catch( std::exception& e )
+    {
+        exeThreadInd.fCanceled = true;
+        KTERROR( testpplog, "An error occurred while running a processor: " << e.what() );
+    }
+
+    thread.join();
+
+    KTINFO( testpplog, "Tests complete" );
+
+    return 0;
+}
diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index ceaaef0..6b8599d 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -19,6 +19,7 @@ namespace Nymph
     {
         SetFuncPtr(&KTDataQueueProcessor::EmitDataSignal);
         fQueueDataSW = RegisterSlot("data", this, &KTDataQueueProcessor::QueueData, {});
+        fSignalsEmitted.push_back("data");
         //RegisterSlot("data-list", this, &KTDataQueueProcessor::QueueDataList);
     }
 
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index a0ef2b5..867efb8 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -206,7 +206,7 @@ namespace Nymph
 
     template< class XProcessorType >
     KTDataQueueProcessorTemplate< XProcessorType >::KTDataQueueProcessorTemplate(const std::string& name) :
-            KTPrimaryProcessor(name),
+            KTPrimaryProcessor({"queue-done"}, name),
             fStatus(kStopped),
             fFuncPtr(NULL),
             fQueue(),
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 38bed17..9003141 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -533,9 +533,9 @@ namespace Nymph
                             thisThreadRef.fRefreshFutureFunc = [&]( std::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
 
                             //std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( dataRet ), fThreadPackets.back() );
-                            tgIter->fProc->SetThreadRef( std::move( thisThreadRef ) );
-                            std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc );
-                            tgIter->fProc->GetThreadRef()->fThread = &thread;
+                            //tgIter->fProc->SetThreadRef( std::move( thisThreadRef ) );
+                            std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
+                            //tgIter->fProc->GetThreadRef()->fThread = &thread;
 
                             KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
 
diff --git a/Library/IO/KTReader.cc b/Library/IO/KTReader.cc
index b3ac907..0aa7b2d 100644
--- a/Library/IO/KTReader.cc
+++ b/Library/IO/KTReader.cc
@@ -11,7 +11,7 @@ namespace Nymph
 {
 
     KTReader::KTReader(const std::string& name) :
-            KTPrimaryProcessor(name)
+            KTPrimaryProcessor({}, name)
     {
     }
 
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index 97a0c24..437f498 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -14,26 +14,50 @@ namespace Nymph
 {
     KTLOGGER( proclog, "KTPrimaryProcessor" );
 
-    KTPrimaryProcessor::KTPrimaryProcessor( const std::string& name ) :
+    KTPrimaryProcessor::KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name ) :
             KTProcessor( name ),
+            fSignalsEmitted( signals ),
             fThreadRef()
     {
+
     }
 
     KTPrimaryProcessor::~KTPrimaryProcessor()
     {
     }
 
-    void KTPrimaryProcessor::operator ()()
+    void KTPrimaryProcessor::operator ()( KTThreadReference&& ref )
     {
-        if( ! Run() )
+        fThreadRef = std::move( ref );
+
+        // pass updated thread reference to downstream slots
+        for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
+        {
+            // loop over all processor:slots called by this signal
+            auto sigConnRange = fSigConnMap.equal_range( *sigIt );
+            for( SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt )
+            {
+                // pass the update on to the connected-to processor
+                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, &fThreadRef );
+            }
+        }
+
+        // go!
+        try
         {
-            KTERROR( proclog, "An error occurred during processor running." );
-            THROW_RETURN_EXCEPTION( fThreadRef.fDataPtrRet, KTException() << "An error occurred during processor running" );
+            if( ! Run() )
+            {
+                KTERROR( proclog, "An error occurred during processor running." );
+                THROW_RETURN_EXCEPTION( fThreadRef.fDataPtrRet, KTException() << "An error occurred during processor running" );
+            }
+            else
+            {
+                fThreadRef.fDataPtrRet.set_value( KTDataPtr() );
+            }
         }
-        else
+        catch( ... )
         {
-            fThreadRef.fDataPtrRet.set_value( KTDataPtr() );
+            fThreadRef.fDataPtrRet.set_exception( std::current_exception() );
         }
         return;
     }
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 4c7764e..9dd3b1f 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -21,31 +21,26 @@ namespace Nymph
     class KTPrimaryProcessor : public KTProcessor
     {
         public:
-            KTPrimaryProcessor( const std::string& name = "default-primary-processor-name" );
+            KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
             virtual ~KTPrimaryProcessor();
 
         public:
             /// Callable function used by std::thread
-            void operator()();
+            void operator()( KTThreadReference&& ref );
 
             /// Starts the  main action of the processor
             virtual bool Run() = 0;
 
-            void SetThreadRef( KTThreadReference&& ref );
             KTThreadReference* GetThreadRef();
 
         protected:
+            std::vector< std::string > fSignalsEmitted;
+
             KTThreadReference fThreadRef;
 
 
     };
 
-    inline void KTPrimaryProcessor::SetThreadRef( KTThreadReference&& ref )
-    {
-        fThreadRef = std::move( ref );
-        return;
-    }
-
     inline KTThreadReference* KTPrimaryProcessor::GetThreadRef()
     {
         return &fThreadRef;
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index b9a217b..f29a1c8 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -64,6 +64,7 @@ namespace Nymph
             virtual ~KTProcessor();
 
         public:
+            /// For a slot that is called, update the slot's ThreadRef, and pass the update to any slots that get called by signals emitted by this slot
             void PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef);
 
             void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index 2733fa3..745717b 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -11,40 +11,35 @@
 
 namespace Nymph
 {
+    KTThreadIndicator::KTThreadIndicator() :
+            fBreakFlag( false ),
+            fContinueSignal(),
+            fCanceled( false )
+    {}
 
     KTThreadReference::KTThreadReference() :
             fDataPtrRet(),
-            //fProcTB( nullptr ),
             fInitiateBreakFunc(),
             fRefreshFutureFunc(),
-            fThread( nullptr ),
             fThreadIndicator( nullptr )
     {}
 
     KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
             fDataPtrRet( std::move( orig.fDataPtrRet ) ),
-            //fProcTB( orig.fProcTB ),
             fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
             fRefreshFutureFunc( std::move( orig.fRefreshFutureFunc ) ),
-            fThread( orig.fThread ),
             fThreadIndicator( orig.fThreadIndicator )
     {
-        //orig.fProcTB = nullptr;
-        orig.fThread = nullptr;
         orig.fThreadIndicator = nullptr;
     }
 
     KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
     {
         fDataPtrRet = std::move( orig.fDataPtrRet );
-        //fProcTB = orig.fProcTB;
         fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
         fRefreshFutureFunc = std::move( orig.fRefreshFutureFunc );
-        fThread = orig.fThread;
         fThreadIndicator = orig.fThreadIndicator;
 
-        //orig.fProcTB = nullptr;
-        orig.fThread = nullptr;
         orig.fThreadIndicator = nullptr;
 
         return *this;
@@ -58,14 +53,12 @@ namespace Nymph
         {
             breakInititatedHere = true;
             fInitiateBreakFunc();
-            //fProcTB->InitiateBreak();
         }
         if( fThreadIndicator->fBreakFlag || breakInititatedHere )
         {
             fDataPtrRet.set_value( dataPtr );
             fThreadIndicator->fContinueSignal.wait();
             fDataPtrRet = KTDataPtrReturn();
-            //fProcTB->TakeFuture( fDataPtrRet.get_future() );
             fRefreshFutureFunc( fDataPtrRet.get_future() );
         }
         return;
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 9aa167f..a918210 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -14,21 +14,19 @@
 
 namespace Nymph
 {
-    //class KTProcessorToolbox;
-
     struct KTThreadIndicator
     {
         bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
         std::shared_future< void > fContinueSignal;
+        bool fCanceled;
+        KTThreadIndicator();
     };
 
     struct KTThreadReference
     {
         KTDataPtrReturn fDataPtrRet;
-        //KTProcessorToolbox* fProcTB;
         std::function< void() > fInitiateBreakFunc;
         std::function< void(std::future< KTDataPtr >&&) > fRefreshFutureFunc;
-        std::thread* fThread;
         KTThreadIndicator* fThreadIndicator;
 
         KTThreadReference();

From 983cc2510b452d62f8f9f4fbf6ad12c489105710 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 16:54:03 -0700
Subject: [PATCH 015/521] Cleanup in the processor toolbox

---
 Library/Application/KTProcessorToolbox.cc | 81 +----------------------
 Library/Application/KTProcessorToolbox.hh | 26 --------
 2 files changed, 1 insertion(+), 106 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 9003141..6467523 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -505,15 +505,7 @@ namespace Nymph
                         {
                             std::string procName( tgIter->fName );
                             KTINFO( proclog, "Starting processor <" << procName << ">" );
-/*
-                            KTDataPtrReturn dataRet;
-                            fThreadFutures.push_back( dataRet.get_future() );
-                            if( ! fThreadFutures.back().valid() )
-                            {
-                                KTERROR( proclog, "Invalid thread future created" );
-                                throw std::future_error( std::future_errc::no_state );
-                            }
-*/
+
                             KTThreadReference thisThreadRef;
 
                             fThreadFutures.push_back( thisThreadRef.fDataPtrRet.get_future() );
@@ -524,18 +516,13 @@ namespace Nymph
                             }
 
                             fThreadIndicators.push_back( KTThreadIndicator() );
-                            fThreadIndicators.back().fBreakFlag = false;
                             fThreadIndicators.back().fContinueSignal = fMasterContSignal;
 
                             thisThreadRef.fThreadIndicator = &fThreadIndicators.back();
-                            //thisThreadRef.fProcTB = this;
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
                             thisThreadRef.fRefreshFutureFunc = [&]( std::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
 
-                            //std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( dataRet ), fThreadPackets.back() );
-                            //tgIter->fProc->SetThreadRef( std::move( thisThreadRef ) );
                             std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
-                            //tgIter->fProc->GetThreadRef()->fThread = &thread;
 
                             KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
 
@@ -714,72 +701,6 @@ namespace Nymph
         }
 
         return true;
-
-        /*
-        KTPROG(proclog, "Beginning processing . . .");
-#ifndef SINGLETHREADED
-        unsigned iGroup = 0;
-#endif
-        try
-        {
-            for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-            {
-    //#ifdef SINGLETHREADED
-                for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                {
-                    std::promise< KTDataPtr > promise;
-                    std::future< KTDataPtr > future = promise.get_future();
-                    std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( promise ) );
-                    if( ! future.valid() )
-                    {
-                        throw std::future_error( std::future_errc::no_state );
-                    }
-                    std::future_status status;
-                    do
-                    {
-                        status = future.wait_for(std::chrono::milliseconds(500));
-                    } while (status != std::future_status::ready);
-
-                    try
-                    {
-                        future.get();
-                    }
-                    catch( std::exception& e )
-                    {
-                        throw KTException() << "An error occurred while running processor <" << tgIter->fName << ">: " << e.what();
-                    }
-                    thread.join();
-                }
-//#else
-// for now, don't do this section of code
-#if 0
-                KTDEBUG(proclog, "Starting thread group " << iGroup);
-                boost::thread_group parallelThreads;
-                unsigned iThread = 0;
-                for (ThreadGroup::const_iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                {
-                    // create a boost::thread object to launch the thread
-                    // use boost::ref to avoid copying the processor
-                    KTDEBUG(proclog, "Starting thread " << iThread << ": " << tgIter->fName);
-                    parallelThreads.create_thread(boost::ref(*(tgIter->fProc)));
-                    //parallelThreads.create_thread(boost::ref(**tgIter));
-                    iThread++;
-                }
-                // wait for execution to complete
-                parallelThreads.join_all();
-                iGroup++;
-#endif // this endif was here before i put in the temporary #if 0
-            }
-        }
-        catch( std::exception& e )
-        {
-            KTERROR( proclog, e.what() );
-            return false;
-        }
-        KTPROG(proclog, ". . . processing complete.");
-        return true;
-        */
     }
 
-
 } /* namespace Nymph */
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 56623b7..ca2725e 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -181,32 +181,6 @@ namespace Nymph
             RunQueue fRunQueue;
 
         public:
-/*            struct ThreadPacket
-            {
-                KTProcessorToolbox* fProcTB;
-                bool fBreakFlag; // only use outside of blocks protected by fBreakContMutex are reads, so we shouldn't need to make this an atomic
-                std::shared_future< void > fContinueSignal;
-                std::thread* fThread;
-
-                void Break( const KTDataPtr& dataPtr, KTDataPtrReturn& ret  )
-                {
-                    bool breakInititatedHere = false;
-                    if( /* breakpoint is set here *//* false )
-                    {
-                        breakInititatedHere = true;
-                        fProcTB->InitiateBreak();
-                    }
-                    if( fBreakFlag || breakInititatedHere )
-                    {
-                        ret.set_value( dataPtr );
-                        fContinueSignal.wait();
-                        ret = KTDataPtrReturn();
-                        fProcTB->TakeFuture( ret.get_future() );
-                    }
-                    return;
-                }
-            };
-*/
             /// Process the run queue.
             /// This will call Run() on all of the processors in the queue.
             bool Run();

From a165bd8b9aad99c4137a2c320f1166a54f3e2bbc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 4 May 2017 17:38:35 -0700
Subject: [PATCH 016/521] Added KTTestProcessorToolbox

---
 Executables/Validation/CMakeLists.txt         |  1 +
 .../Validation/KTTestPrimaryProcessor.cc      |  6 +-
 .../Validation/KTTestPrimaryProcessor.hh      |  4 +-
 Executables/Validation/KTTestProcessor.cc     | 14 ++++-
 Executables/Validation/KTTestProcessor.hh     |  6 +-
 .../Validation/TestProcessorToolbox.cc        | 62 +++++++++++++++++++
 6 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 Executables/Validation/TestProcessorToolbox.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 58ceed9..ed5d3f9 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -52,6 +52,7 @@ if (Nymph_ENABLE_TESTING)
         TestLogger
         TestPrimaryProcessor
         TestPrintData
+        TestProcessorToolbox
         TestSignalsAndSlots
         TestThroughputProfiler
     )
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
index 2792158..290ac9a 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -10,8 +10,10 @@
 namespace Nymph
 {
 
-    KTTestPrimaryProcessor::KTTestPrimaryProcessor() :
-            KTPrimaryProcessor( {"the-signal"} ),
+    KT_REGISTER_PROCESSOR(KTTestPrimaryProcessor, "test-p-proc");
+
+    KTTestPrimaryProcessor::KTTestPrimaryProcessor( const std::string& name ) :
+            KTPrimaryProcessor( {"the-signal"}, name ),
             fIterations(10),
             fTheSignal("the-signal", this)
     {
diff --git a/Executables/Validation/KTTestPrimaryProcessor.hh b/Executables/Validation/KTTestPrimaryProcessor.hh
index 8b7f6c5..6cc104a 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.hh
+++ b/Executables/Validation/KTTestPrimaryProcessor.hh
@@ -16,10 +16,10 @@
 namespace Nymph
 {
 
-    class KTTestPrimaryProcessor : public KTPrimaryProcessor
+   class KTTestPrimaryProcessor : public KTPrimaryProcessor
     {
         public:
-            KTTestPrimaryProcessor();
+            KTTestPrimaryProcessor( const std::string& name = "test-p-proc" );
             virtual ~KTTestPrimaryProcessor();
 
         public:
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 5be413e..8b5d38f 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -14,7 +14,10 @@ namespace Nymph
 {
     KTLOGGER(testsiglog, "KTTestProcessor")
 
-    KTTestProcessorA::KTTestProcessorA() :
+    KT_REGISTER_PROCESSOR(KTTestProcessorA, "test-proc-a");
+
+    KTTestProcessorA::KTTestProcessorA( const std::string& name ) :
+            KTProcessor( name ),
             fTheSignal("the-signal", this)
     {
     }
@@ -35,7 +38,10 @@ namespace Nymph
     }
 
 
-    KTTestProcessorB::KTTestProcessorB() :
+    KT_REGISTER_PROCESSOR(KTTestProcessorB, "test-proc-b");
+
+    KTTestProcessorB::KTTestProcessorB( const std::string& name ) :
+            KTProcessor( name ),
             fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1, {}),
             fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2, {})
     {
@@ -63,8 +69,10 @@ namespace Nymph
     }
 
 
+    KT_REGISTER_PROCESSOR(KTTestProcessorC, "test-proc-c");
 
-    KTTestProcessorC::KTTestProcessorC() :
+    KTTestProcessorC::KTTestProcessorC( const std::string& name ) :
+            KTProcessor( name ),
             fSlot1("first-slot", this, &KTTestProcessorC::SlotFunc1, {})
     {
     }
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 02b9f80..e444126 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -22,7 +22,7 @@ namespace Nymph
     class KTTestProcessorA : public KTProcessor
     {
         public:
-            KTTestProcessorA();
+            KTTestProcessorA( const std::string& name = "test-proc-a" );
             virtual ~KTTestProcessorA();
 
             bool Configure(const scarab::param_node* node);
@@ -39,7 +39,7 @@ namespace Nymph
     class KTTestProcessorB : public KTProcessor
     {
         public:
-            KTTestProcessorB();
+            KTTestProcessorB( const std::string& name = "test-proc-b" );
             virtual ~KTTestProcessorB();
 
             bool Configure(const scarab::param_node* node);
@@ -58,7 +58,7 @@ namespace Nymph
     class KTTestProcessorC : public KTProcessor
     {
         public:
-            KTTestProcessorC();
+            KTTestProcessorC( const std::string& name = "test-proc-c" );
             virtual ~KTTestProcessorC();
 
             bool Configure(const scarab::param_node* node);
diff --git a/Executables/Validation/TestProcessorToolbox.cc b/Executables/Validation/TestProcessorToolbox.cc
new file mode 100644
index 0000000..40645b6
--- /dev/null
+++ b/Executables/Validation/TestProcessorToolbox.cc
@@ -0,0 +1,62 @@
+/*
+ * TestProcessorToolbox.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+#include <thread>
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestProcessorToolbox" )
+
+int main()
+{
+    KTINFO( testptlog, "Preparing to run" );
+
+    KTProcessorToolbox ptb;
+
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+    {
+        KTERROR( testptlog, "Unable to create test primary processor" );
+        return -1;
+    }
+
+    if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+    {
+        KTERROR( testptlog, "Unable to create test processor b" );
+        return -1;
+    }
+
+    if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to connect tpp to tp" );
+        return -1;
+    }
+
+    if( ! ptb.PushBackToRunQueue( "tpp" ) )
+    {
+        KTERROR( testptlog, "Unable to add tpp to the run queue" );
+        return -1;
+    }
+
+    KTINFO( testptlog, "Starting asynchronous run" );
+    ptb.AsyncRun();
+
+    while( ptb.WaitForBreak() )
+    {
+        KTINFO( testptlog, "Reached breakpoint; continuing" );
+        ptb.Continue();
+    }
+
+    KTINFO( testptlog, "Processing complete" );
+
+    KTINFO( testptlog, "Tests complete" );
+
+    return 0;
+}

From c05aef03d4a737e331abc3194f30797bf2bb1da7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 5 May 2017 16:10:33 -0700
Subject: [PATCH 017/521] Added TestPrimaryProcessorNoThreading and
 TestUseBreakpoint. A bunch of debugging later, and breakpoints work!

---
 Executables/Validation/CMakeLists.txt         |  2 +
 Executables/Validation/KTTestProcessor.cc     |  4 +
 Executables/Validation/KTTestProcessor.hh     |  3 +
 .../Validation/TestPrimaryProcessor.cc        |  7 +-
 .../TestPrimaryProcessorNoThreading.cc        | 45 ++++++++++
 .../Validation/TestProcessorToolbox.cc        |  8 +-
 Executables/Validation/TestUseBreakpoint.cc   | 82 +++++++++++++++++++
 Library/Application/KTDataQueueProcessor.cc   |  2 +-
 Library/Application/KTPrintDataStructure.cc   |  9 +-
 Library/Application/KTProcessorToolbox.cc     | 65 +++++++++++----
 Library/Application/KTProcessorToolbox.hh     |  7 +-
 Library/Data/KTApplyCut.cc                    |  2 +-
 Library/Data/KTCutFilter.cc                   |  2 +-
 Library/Processor/KTPrimaryProcessor.cc       |  3 +-
 Library/Processor/KTPrimaryProcessor.hh       |  3 +-
 Library/Processor/KTProcessor.cc              | 20 +++++
 Library/Processor/KTProcessor.hh              |  4 +-
 Library/Processor/KTSlot.hh                   |  6 +-
 Library/Processor/KTSlotWrapper.hh            | 19 ++++-
 Library/Processor/KTThreadReference.cc        | 21 +++--
 Library/Processor/KTThreadReference.hh        |  5 +-
 21 files changed, 272 insertions(+), 47 deletions(-)
 create mode 100644 Executables/Validation/TestPrimaryProcessorNoThreading.cc
 create mode 100644 Executables/Validation/TestUseBreakpoint.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index ed5d3f9..a3e1dc2 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -51,10 +51,12 @@ if (Nymph_ENABLE_TESTING)
         TestExceptionInSlot
         TestLogger
         TestPrimaryProcessor
+        TestPrimaryProcessorNoThreading
         TestPrintData
         TestProcessorToolbox
         TestSignalsAndSlots
         TestThroughputProfiler
+        TestUseBreakpoint
     )
     
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 8b5d38f..826b673 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -45,6 +45,8 @@ namespace Nymph
             fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1, {}),
             fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2, {})
     {
+        fSlot1Wrapper = GetSlot( "first-slot" );
+        fSlot2Wrapper = GetSlot( "second-slot" );
     }
 
     KTTestProcessorB::~KTTestProcessorB()
@@ -59,12 +61,14 @@ namespace Nymph
     void KTTestProcessorB::SlotFunc1(int input)
     {
         KTINFO(testsiglog, "Slot1: input is " << input);
+        fSlot1Wrapper->GetThreadRef()->Break( KTDataPtr(), fSlot1Wrapper->GetDoBreakpoint());
         return;
     }
 
     void KTTestProcessorB::SlotFunc2(int input)
     {
         KTINFO(testsiglog, "Slot2: twice input is " << 2 * input);
+        fSlot2Wrapper->GetThreadRef()->Break( KTDataPtr(), fSlot2Wrapper->GetDoBreakpoint());
         return;
     }
 
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index e444126..689ccc0 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -50,6 +50,9 @@ namespace Nymph
         private:
             KTSlot< int > fSlot1;
             KTSlot< int > fSlot2;
+
+            KTSlotWrapper* fSlot1Wrapper;
+            KTSlotWrapper* fSlot2Wrapper;
     };
 
     /*!
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
index 2050c3d..6e543df 100644
--- a/Executables/Validation/TestPrimaryProcessor.cc
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -2,7 +2,7 @@
  * TestPrimaryProcessor.cc
  *
  *  Created on: May 4, 2017
- *      Author: obla999
+ *      Author: N.S. Oblath
  */
 
 #include "KTTestPrimaryProcessor.hh"
@@ -37,9 +37,6 @@ int main()
     KTThreadReference exeThreadRef;
     auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
 
-    KTThreadIndicator exeThreadInd;
-    exeThreadRef.fThreadIndicator = &exeThreadInd;
-
     // run the thread
     std::thread thread( &KTPrimaryProcessor::operator(), &tpp, std::move( exeThreadRef ) );
 
@@ -52,7 +49,7 @@ int main()
     }
     catch( std::exception& e )
     {
-        exeThreadInd.fCanceled = true;
+        exeThreadRef.fThreadIndicator->fCanceled = true;
         KTERROR( testpplog, "An error occurred while running a processor: " << e.what() );
     }
 
diff --git a/Executables/Validation/TestPrimaryProcessorNoThreading.cc b/Executables/Validation/TestPrimaryProcessorNoThreading.cc
new file mode 100644
index 0000000..d35a22f
--- /dev/null
+++ b/Executables/Validation/TestPrimaryProcessorNoThreading.cc
@@ -0,0 +1,45 @@
+/*
+ * TestPrimaryProcessorNoThreading.cc
+ *
+ *  Created on: May 5, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+#include "KTTestProcessor.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testpplog, "TestPrimaryProcessorNoThreading" )
+
+int main()
+{
+
+    KTTestPrimaryProcessor tpp;
+    KTTestProcessorB tp;
+
+    KTINFO( testpplog, "Connecting the-signal to first-slot" );
+    try
+    {
+        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( testpplog, "A problem occurred while connecting the signal and slots:\n" << e.what() );
+        return -1;
+    }
+
+    KTINFO( testpplog, "Running the primary processor" )
+
+    if( ! tpp.Run() )
+    {
+        KTERROR( testpplog, "Something went wrong while running the primary processor" );
+        return -1;
+    }
+
+    KTINFO( testpplog, "Tests complete" );
+
+    return 0;
+}
diff --git a/Executables/Validation/TestProcessorToolbox.cc b/Executables/Validation/TestProcessorToolbox.cc
index 40645b6..fbbf287 100644
--- a/Executables/Validation/TestProcessorToolbox.cc
+++ b/Executables/Validation/TestProcessorToolbox.cc
@@ -9,8 +9,6 @@
 
 #include "KTLogger.hh"
 
-#include <thread>
-
 using namespace Nymph;
 
 KTLOGGER( testptlog, "TestProcessorToolbox" )
@@ -21,33 +19,39 @@ int main()
 
     KTProcessorToolbox ptb;
 
+    // add the primary processor
     if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
     {
         KTERROR( testptlog, "Unable to create test primary processor" );
         return -1;
     }
 
+    // add processor b
     if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
     {
         KTERROR( testptlog, "Unable to create test processor b" );
         return -1;
     }
 
+    // make connections
     if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
     {
         KTERROR( testptlog, "Unable to connect tpp to tp" );
         return -1;
     }
 
+    // set the run queue
     if( ! ptb.PushBackToRunQueue( "tpp" ) )
     {
         KTERROR( testptlog, "Unable to add tpp to the run queue" );
         return -1;
     }
 
+    // go!
     KTINFO( testptlog, "Starting asynchronous run" );
     ptb.AsyncRun();
 
+    // wait for run completion, and ignore breakpoints
     while( ptb.WaitForBreak() )
     {
         KTINFO( testptlog, "Reached breakpoint; continuing" );
diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Executables/Validation/TestUseBreakpoint.cc
new file mode 100644
index 0000000..7e9040f
--- /dev/null
+++ b/Executables/Validation/TestUseBreakpoint.cc
@@ -0,0 +1,82 @@
+/*
+ * TestUseBreakpoint.cc
+ *
+ *  Created on: May 5, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTProcessor.hh" // temporary (todo below)
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestUseBreakpoint" )
+
+int main()
+{
+    KTINFO( testptlog, "Preparing to run" );
+
+    KTProcessorToolbox ptb;
+
+    // add the primary processor
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+    {
+        KTERROR( testptlog, "Unable to create test primary processor" );
+        return -1;
+    }
+
+    // add processor b
+    if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+    {
+        KTERROR( testptlog, "Unable to create test processor b" );
+        return -1;
+    }
+    // set breakpoint
+    // TODO: use configuration instead of manually setting
+    ptb.GetProcessor( "tp" )->SetDoBreakpoint( "first-slot", true );
+
+    // make connections
+    if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to connect tpp to tp" );
+        return -1;
+    }
+
+    // set the run queue
+    if( ! ptb.PushBackToRunQueue( "tpp" ) )
+    {
+        KTERROR( testptlog, "Unable to add tpp to the run queue" );
+        return -1;
+    }
+
+    // go!
+    KTINFO( testptlog, "Starting asynchronous run" );
+    ptb.AsyncRun();
+
+    KTINFO( testptlog, "Starting asynchronous breakpoint user" );
+    auto buFuture = std::async( std::launch::async, [&](){
+        KTINFO( testptlog, "In breakpoint user thread" );
+        while( ptb.WaitForBreak() )
+        {
+            KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
+            std::string temp;
+            KTPROG( testptlog, "Please press [return]" );
+            getline( std::cin, temp );
+            ptb.Continue();
+        }
+        KTINFO( testptlog, "Finished breakpoint user thread" );
+        return;
+    });
+
+    KTINFO( testptlog, "Waiting for the end of the run" );
+    ptb.WaitForEndOfRun();
+
+    KTINFO( testptlog, "Processing complete" );
+
+    KTINFO( testptlog, "Tests complete" );
+
+    return 0;
+}
diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index 6b8599d..bca51fd 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -41,7 +41,7 @@ namespace Nymph
 
     void KTDataQueueProcessor::QueueData(KTDataPtr& data)
     {
-        fQueueDataSW->GetThreadRef()->Break(data);
+        fQueueDataSW->GetThreadRef()->Break(data, fQueueDataSW->GetDoBreakpoint());
         return DoQueueData(data);
     }
 /*
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index 438b6a2..dd04708 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -42,7 +42,8 @@ namespace Nymph
     {
         DoPrintDataStructure(dataPtr);
 
-        fDataStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr );
+        KTSlotWrapper* slotWrap = fDataStructSlot.GetSlotWrapper();
+        slotWrap->GetThreadRef()->Break( dataPtr, slotWrap->GetDoBreakpoint() );
 
         fDataSignal(dataPtr);
 
@@ -53,7 +54,8 @@ namespace Nymph
     {
         DoPrintCutStructure(dataPtr);
 
-        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr );
+        KTSlotWrapper* slotWrap = fCutStructSlot.GetSlotWrapper();
+        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr, slotWrap->GetDoBreakpoint() );
 
         fDataSignal(dataPtr);
 
@@ -66,7 +68,8 @@ namespace Nymph
         DoPrintDataStructure(dataPtr);
         DoPrintCutStructure(dataPtr);
 
-        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr );
+        KTSlotWrapper* slotWrap = fDataAndCutStructSlot.GetSlotWrapper();
+        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr, slotWrap->GetDoBreakpoint() );
 
         fDataSignal(dataPtr);
 
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 965e808..9964547 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -39,10 +39,10 @@ namespace Nymph
             fRunQueue(),
             fProcMap(),
             fThreadFutures(),
-            //fThreadPackets(),
             fContinueSignaler(),
             fMasterContSignal(),
             fBreakContMutex(),
+            fWaitForBreakMutex(),
             fDoRunThread( nullptr ),
             fDoRunPromise(),
             fDoRunBreakFlag( false )
@@ -508,6 +508,9 @@ namespace Nymph
             return;
         }
 
+        fDoRunPromise = std::promise< void >();
+        fDoRunFuture = fDoRunPromise.get_future().share();
+
         bool willRunSingleThreaded = fRunSingleThreaded;
 #ifdef SINGLETHREADED
         willRunSingleThreaded = true;
@@ -521,7 +524,7 @@ namespace Nymph
                 {
                     // reset the continue signaler
                     fContinueSignaler = std::promise< void >();
-                    fMasterContSignal = fContinueSignaler.get_future();
+                    fMasterContSignal = fContinueSignaler.get_future().share();
                     if( ! fMasterContSignal.valid() )
                     {
                         KTERROR( proclog, "Invalid master continue-signal created" );
@@ -548,10 +551,10 @@ namespace Nymph
                                 throw std::future_error( std::future_errc::no_state );
                             }
 
-                            fThreadIndicators.push_back( KTThreadIndicator() );
-                            fThreadIndicators.back().fContinueSignal = fMasterContSignal;
+                            fThreadIndicators.emplace_back( new KTThreadIndicator() );
+                            fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
 
-                            thisThreadRef.fThreadIndicator = &fThreadIndicators.back();
+                            thisThreadRef.fThreadIndicator = fThreadIndicators.back();
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
                             thisThreadRef.fRefreshFutureFunc = [&]( std::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
 
@@ -569,11 +572,13 @@ namespace Nymph
                                 } while (status != std::future_status::ready);
 
                                 stillRunning = false;
-                                if( fThreadIndicators.back().fBreakFlag )
+                                if( fThreadIndicators.back()->fBreakFlag )
                                 {
                                     KTDEBUG( proclog, "Breakpoint reached" );
                                     continueSignal.wait();
+                                    KTDEBUG( proclog, "Breakpoint finished" );
                                     stillRunning = true;
+                                    continueSignal = fMasterContSignal; // refresh the local copy of the shared future
                                 }
                                 else
                                 {
@@ -593,6 +598,8 @@ namespace Nymph
                             KTINFO( proclog, "Processor <" << procName << "> has finished" );
 
                             thread.join();
+                            fThreadIndicators.pop_back();
+                            fThreadFutures.pop_back();
                         } // end for loop over the thread group
                     } // end for loop over the run-queue
 
@@ -644,7 +651,7 @@ namespace Nymph
 
     bool KTProcessorToolbox::WaitForBreak()
     {
-        std::future< void > doRunFuture = fDoRunPromise.get_future();
+        std::shared_future< void > doRunFuture = fDoRunFuture;
 
         std::future_status doRunStatus;
         do
@@ -654,22 +661,36 @@ namespace Nymph
 
         if( fDoRunBreakFlag )
         {
-            KTDEBUG( proclog, "Breakpoint reached" );
+            KTDEBUG( proclog, "Breakpoint reached (the wait is over)" );
             return true;
         }
 
         try
         {
             doRunFuture.get();
+            KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
             return false;
         }
         catch( std::exception& e )
         {
-            // this transfers an exception thrown by a processor to the outer catch block in this function
-            throw;
+            KTERROR( proclog, "An error occurred during processing: " << e.what() );
+            return false;
         }
     }
 
+    void KTProcessorToolbox::WaitForEndOfRun()
+    {
+        KTDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreak() )
+        {
+            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            WaitForContinue();
+            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+        }
+        KTDEBUG( proclog, "End-of-run reached" );
+        return;
+    }
+
     void KTProcessorToolbox::Continue()
     {
         std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
@@ -679,21 +700,26 @@ namespace Nymph
 
         // reset all break flags
         fDoRunBreakFlag = false;
-        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
-            tiIt->fBreakFlag = false;
+            (*tiIt)->fBreakFlag = false;
         }
 
+        // reset the do-run promise and future
+        fDoRunPromise = std::promise< void >();
+        fDoRunFuture = fDoRunPromise.get_future().share();
+
         KTINFO( proclog, "Continuing from breakpoint" );
         // signal everything to resume
         fContinueSignaler.set_value();
 
         // reset the signaler and all signals
         // hopefully the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
-        fContinueSignaler = std::move( std::promise< void >() );
-        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        fContinueSignaler = std::promise< void >();
+        fMasterContSignal = fContinueSignaler.get_future().share();
+        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
-            tiIt->fContinueSignal = fContinueSignaler.get_future();
+            (*tiIt)->fContinueSignal = fMasterContSignal;
         }
 
         return;
@@ -704,12 +730,17 @@ namespace Nymph
         std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
 
         // set all break flags
+        // master break flag
         fDoRunBreakFlag = true;
-        for( std::vector< KTThreadIndicator >::iterator tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        // thread break flags
+        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
-            tiIt->fBreakFlag = true;
+            (*tiIt)->fBreakFlag = true;
         }
 
+        // use the do-run promise to signal the break
+        fDoRunPromise.set_value();
+
         return;
     }
 
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 43b35e0..d8dfcd4 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -169,7 +169,6 @@ namespace Nymph
                     Thread(KTPrimaryProcessor* proc, const std::string& name) : fProc(proc), fName(name)
                     {}
             };
-            //typedef std::set< KTPrimaryProcessor* > ThreadGroup;
             struct CompareThread
             {
                 bool operator() (const Thread& lhs, const Thread& rhs)
@@ -197,6 +196,8 @@ namespace Nymph
             /// If the return is true, processing can continue after the break
             bool WaitForBreak();
 
+            void WaitForEndOfRun();
+
             void Continue();
 
         private:
@@ -208,14 +209,16 @@ namespace Nymph
             void TakeFuture( std::future< KTDataPtr >&& future );
 
             std::vector< std::future< KTDataPtr > > fThreadFutures;
-            std::vector< KTThreadIndicator > fThreadIndicators;
+            std::vector< std::shared_ptr< KTThreadIndicator > > fThreadIndicators;
 
             std::promise< void > fContinueSignaler;
             std::shared_future< void > fMasterContSignal;
             std::mutex fBreakContMutex;
+            std::mutex fWaitForBreakMutex;
 
             std::thread* fDoRunThread;
             std::promise< void > fDoRunPromise;
+            std::shared_future< void > fDoRunFuture;
             bool fDoRunBreakFlag; // only use outside of blocks protected by fBreakContMutex is reads, so we shouldn't need to make this an atomic
 
     };
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 8952288..3907a42 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -95,7 +95,7 @@ namespace Nymph
 
         bool cutFailed = fCut->Apply(dataPtr);
 
-        ref->Break( dataPtr );
+        ref->Break( dataPtr, fApplyCutSW->GetDoBreakpoint() );
 
         if (cutFailed)
         {
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 979e25d..7104a8b 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -82,7 +82,7 @@ namespace Nymph
 
         bool failCut = Filter(dataPtr->Of< KTData >());
 
-        ref->Break( dataPtr );
+        ref->Break( dataPtr, fFilterDataSW->GetDoBreakpoint() );
 
         if (failCut)
         {
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index 437f498..0d089b8 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -17,7 +17,8 @@ namespace Nymph
     KTPrimaryProcessor::KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name ) :
             KTProcessor( name ),
             fSignalsEmitted( signals ),
-            fThreadRef()
+            fThreadRef(),
+            fDoBreakpoint(false)
     {
 
     }
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 9dd3b1f..a7be18d 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -33,12 +33,13 @@ namespace Nymph
 
             KTThreadReference* GetThreadRef();
 
+            MEMBERVARIABLE( bool, DoBreakpoint );
+
         protected:
             std::vector< std::string > fSignalsEmitted;
 
             KTThreadReference fThreadRef;
 
-
     };
 
     inline KTThreadReference* KTPrimaryProcessor::GetThreadRef()
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index c6a5a6a..9db9633 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -132,6 +132,26 @@ namespace Nymph
         return iter->second;
     }
 
+    inline bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
+    {
+        KTSlotWrapper* slot = GetSlot(slotName);
+        if (slot != nullptr)
+        {
+            return slot->GetDoBreakpoint();
+        }
+        KTWARN(processorlog, "Slot <" << slotName << "> was not found");
+        return false;
+    }
 
+    void KTProcessor::SetDoBreakpoint(const std::string& slotName, bool flag)
+    {
+        KTSlotWrapper* slot = GetSlot(slotName);
+        if (slot != nullptr)
+        {
+            return slot->SetDoBreakpoint(flag);
+        }
+        KTWARN(processorlog, "Slot <" << slotName << "> was not found");
+        return;
+    }
 
 } /* namespace Nymph */
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index f29a1c8..ca2ef41 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -80,6 +80,9 @@ namespace Nymph
 
             KTSlotWrapper* GetSlot(const std::string& name);
 
+            bool GetDoBreakpoint(const std::string& slotName);
+            void SetDoBreakpoint(const std::string& slotName, bool flag);
+
         protected:
             void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
 
@@ -128,7 +131,6 @@ namespace Nymph
         return;
     }
 
-
 #define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::KTProcessor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 0d7ba13..ac43597 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -289,7 +289,7 @@ namespace Nymph
 
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
         // Sets the dataPtr into the return
-        ref->Break( dataPtr );
+        ref->Break( dataPtr, fSlotWrapper->GetDoBreakpoint() );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
@@ -334,6 +334,10 @@ namespace Nymph
         // Call the function
         fFunc();
 
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataPtr into the return
+        fSlotWrapper->GetThreadRef()->Break( KTDataPtr(), fSlotWrapper->GetDoBreakpoint() );
+
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
         {
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index 675d570..329619b 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -91,8 +91,12 @@ namespace Nymph
             KTThreadReference* GetThreadRef() const;
             void SetThreadRef(KTThreadReference* ref);
 
+            bool GetDoBreakpoint() const;
+            void SetDoBreakpoint(bool flag);
+
         private:
             KTThreadReference* fThreadRef;
+            bool fDoBreakpoint;
 
     };
 
@@ -100,7 +104,8 @@ namespace Nymph
     KTSlotWrapper::KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont) :
             fSlotWrapper(new KTSpecifiedInternalSlotWrapper< XSignature, XTypeContainer >(signalPtr, typeCont)),
             fConnection(),
-            fThreadRef()
+            fThreadRef(),
+            fDoBreakpoint(false)
     {}
 
     inline void KTSlotWrapper::SetConnection(KTConnection conn)
@@ -132,5 +137,17 @@ namespace Nymph
         return;
     }
 
+    inline bool KTSlotWrapper::GetDoBreakpoint() const
+    {
+        return fDoBreakpoint;
+    }
+
+    inline void KTSlotWrapper::SetDoBreakpoint(bool flag)
+    {
+        fDoBreakpoint = flag;
+        return;
+    }
+
+
 } /* namespace Nymph */
 #endif /* KTSLOTWRAPPER_HH_ */
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index 745717b..36ef20a 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -7,7 +7,9 @@
 
 #include "KTThreadReference.hh"
 
-//#include "KTProcessorToolbox.hh"
+#include "KTLogger.hh"
+
+KTLOGGER( trlog, "KTThreadReference" );
 
 namespace Nymph
 {
@@ -21,7 +23,7 @@ namespace Nymph
             fDataPtrRet(),
             fInitiateBreakFunc(),
             fRefreshFutureFunc(),
-            fThreadIndicator( nullptr )
+            fThreadIndicator( new KTThreadIndicator() )
     {}
 
     KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
@@ -45,20 +47,23 @@ namespace Nymph
         return *this;
     }
 
-
-    void KTThreadReference::Break( const KTDataPtr& dataPtr  )
+    void KTThreadReference::Break( const KTDataPtr& dataPtr, bool doBreakpoint )
     {
-        bool breakInititatedHere = false;
-        if( /* breakpoint is set here */ false )
+        if( doBreakpoint )
         {
-            breakInititatedHere = true;
+            KTDEBUG( trlog, "Initiating break" );
             fInitiateBreakFunc();
         }
-        if( fThreadIndicator->fBreakFlag || breakInititatedHere )
+        if( fThreadIndicator->fBreakFlag || doBreakpoint )
         {
+            KTDEBUG( trlog, "Reacting to break" );
+            // set the return for this thread
             fDataPtrRet.set_value( dataPtr );
+            // wait for continue signal
             fThreadIndicator->fContinueSignal.wait();
+            // reset the promise
             fDataPtrRet = KTDataPtrReturn();
+            // pass the future back to the processor toolbox (if it's in use)
             fRefreshFutureFunc( fDataPtrRet.get_future() );
         }
         return;
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index a918210..f317d62 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -10,6 +10,7 @@
 
 #include "KTData.hh"
 
+#include <memory>
 #include <thread>
 
 namespace Nymph
@@ -27,7 +28,7 @@ namespace Nymph
         KTDataPtrReturn fDataPtrRet;
         std::function< void() > fInitiateBreakFunc;
         std::function< void(std::future< KTDataPtr >&&) > fRefreshFutureFunc;
-        KTThreadIndicator* fThreadIndicator;
+        std::shared_ptr< KTThreadIndicator > fThreadIndicator;
 
         KTThreadReference();
         KTThreadReference( const KTThreadReference& ) = delete;
@@ -36,7 +37,7 @@ namespace Nymph
         KTThreadReference& operator=( const KTThreadReference& ) = delete;
         KTThreadReference& operator=( KTThreadReference&& );
 
-        void Break( const KTDataPtr& dataPtr  );
+        void Break( const KTDataPtr& dataPtr, bool doBreakpoint  );
     };
 
 } /* namespace Nymph */

From 5eadbb358ea74d771b95208e16ef0b3a7e4004a9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 5 May 2017 17:05:28 -0700
Subject: [PATCH 018/521] Adding breakpoints can now be done in a config file. 
 Some stability improvements.

---
 Executables/Validation/TestUseBreakpoint.cc |  11 +-
 Library/Application/KTProcessorToolbox.cc   | 106 +++++++++++++++++---
 Library/Application/KTProcessorToolbox.hh   |  27 ++++-
 Library/Processor/KTProcessor.cc            |   8 +-
 4 files changed, 125 insertions(+), 27 deletions(-)

diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Executables/Validation/TestUseBreakpoint.cc
index 7e9040f..42fc2ce 100644
--- a/Executables/Validation/TestUseBreakpoint.cc
+++ b/Executables/Validation/TestUseBreakpoint.cc
@@ -7,8 +7,6 @@
 
 #include "KTProcessorToolbox.hh"
 
-#include "KTProcessor.hh" // temporary (todo below)
-
 #include "KTLogger.hh"
 
 using namespace Nymph;
@@ -35,8 +33,11 @@ int main()
         return -1;
     }
     // set breakpoint
-    // TODO: use configuration instead of manually setting
-    ptb.GetProcessor( "tp" )->SetDoBreakpoint( "first-slot", true );
+    if( ! ptb.SetBreakpoint( "tp", "first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to set the breakpoint" );
+        return -1;
+    }
 
     // make connections
     if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
@@ -76,6 +77,8 @@ int main()
 
     KTINFO( testptlog, "Processing complete" );
 
+    ptb.JoinRunThread();
+
     KTINFO( testptlog, "Tests complete" );
 
     return 0;
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 9964547..ce198eb 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -42,7 +42,6 @@ namespace Nymph
             fContinueSignaler(),
             fMasterContSignal(),
             fBreakContMutex(),
-            fWaitForBreakMutex(),
             fDoRunThread( nullptr ),
             fDoRunPromise(),
             fDoRunBreakFlag( false )
@@ -51,6 +50,10 @@ namespace Nymph
 
     KTProcessorToolbox::~KTProcessorToolbox()
     {
+        CancelThreads();
+
+        JoinRunThread();
+
         ClearProcessors();
     }
 
@@ -166,6 +169,15 @@ namespace Nymph
                     return false;
                 }
 
+                if (connNode->has("breakpoint"))
+                {
+                    if (! SetBreakpoint(connNode->get_value("slot")))
+                    {
+                        KTERROR(proclog, "Unable to set breakpoint on <" << connNode->get_value("slot"));
+                        return false;
+                    }
+                }
+
                 KTINFO(proclog, "Signal <" << connNode->get_value("signal") << "> connected to slot <" << connNode->get_value("slot") << ">");
             }
         }
@@ -422,6 +434,72 @@ namespace Nymph
         return true;
     }
 
+    bool KTProcessorToolbox::SetBreakpoint(const std::string& slot)
+    {
+        string slotProcName, slotName;
+        if (! ParseSignalSlotName(slot, slotProcName, slotName))
+        {
+            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            return false;
+        }
+
+        return SetBreakpoint(slotProcName, slotName);
+    }
+
+    bool KTProcessorToolbox::SetBreakpoint(const std::string& slotProcName, const std::string& slotName)
+    {
+        KTProcessor* slotProc = GetProcessor(slotProcName);
+        if (slotProc == NULL)
+        {
+            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            slotProc->SetDoBreakpoint(slotName, true);
+            return true;
+        }
+        catch (std::exception& e)
+        {
+            KTERROR(proclog, "Unable to set breakpoint: " << e.what());
+            return false;
+        }
+    }
+
+    bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slot)
+    {
+        string slotProcName, slotName;
+        if (! ParseSignalSlotName(slot, slotProcName, slotName))
+        {
+            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            return false;
+        }
+
+        return RemoveBreakpoint(slotProcName, slotName);
+    }
+
+    bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName)
+    {
+        KTProcessor* slotProc = GetProcessor(slotProcName);
+        if (slotProc == NULL)
+        {
+            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            slotProc->SetDoBreakpoint(slotName, false);
+            return true;
+        }
+        catch (std::exception& e)
+        {
+            KTERROR(proclog, "Unable to set breakpoint: " << e.what());
+            return false;
+        }
+    }
+
     bool KTProcessorToolbox::ParseSignalSlotName(const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot) const
     {
         size_t sepPos = toParse.find_first_of(fSigSlotNameSep);
@@ -744,25 +822,23 @@ namespace Nymph
         return;
     }
 
+    void KTProcessorToolbox::CancelThreads()
+    {
+        std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
+        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        {
+            (*tiIt)->fCanceled = true;
+        }
+        return;
+    }
+
     bool KTProcessorToolbox::Run()
     {
         AsyncRun();
 
-        std::future< void > doRunFuture = fDoRunPromise.get_future();
+        WaitForEndOfRun();
 
-        try
-        {
-            while( WaitForBreak() )
-            {
-                KTINFO( proclog, "Skipping breakpoint" );
-                Continue();
-            }
-        }
-        catch( std::exception& e )
-        {
-            KTERROR( proclog, "An error occurred: " << e.what() );
-            return false;
-        }
+        JoinRunThread();
 
         return true;
     }
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index d8dfcd4..ef300d4 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -141,6 +141,18 @@ namespace Nymph
             /// Both processors should already have been added to the Toolbox
             bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order = std::numeric_limits< int >::min());
 
+            /// Set a breakpoint on a slot
+            /// Slot string should be formatted as: [processor name]:[slot name]
+            bool SetBreakpoint(const std::string& slot);
+            /// Set a breakpoint on a slot
+            bool SetBreakpoint(const std::string& slotProcName, const std::string& slotName);
+
+            /// Remove a breakpoint from a slot
+            /// Slot string should be formatted as: [processor name]:[slot name]
+            bool RemoveBreakpoint(const std::string& slot);
+            /// Remove a breakpoint from a slot
+            bool RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName);
+
         private:
             bool ParseSignalSlotName(const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot) const;
             static const char fSigSlotNameSep = ':';
@@ -200,6 +212,10 @@ namespace Nymph
 
             void Continue();
 
+            void CancelThreads();
+
+            void JoinRunThread();
+
         private:
             friend class KTThreadReference;
 
@@ -214,12 +230,11 @@ namespace Nymph
             std::promise< void > fContinueSignaler;
             std::shared_future< void > fMasterContSignal;
             std::mutex fBreakContMutex;
-            std::mutex fWaitForBreakMutex;
 
             std::thread* fDoRunThread;
             std::promise< void > fDoRunPromise;
             std::shared_future< void > fDoRunFuture;
-            bool fDoRunBreakFlag; // only use outside of blocks protected by fBreakContMutex is reads, so we shouldn't need to make this an atomic
+            bool fDoRunBreakFlag;
 
     };
 
@@ -247,7 +262,13 @@ namespace Nymph
         return;
     }
 
-
+    inline void KTProcessorToolbox::JoinRunThread()
+    {
+        if( fDoRunThread == nullptr ) return;
+        fDoRunThread->join();
+        delete fDoRunThread;
+        fDoRunThread = nullptr;
+    }
 
 } /* namespace Nymph */
 #endif /* KTPROCESSORTOOLBOX_HH_ */
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index 9db9633..06fc429 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -7,10 +7,9 @@
 
 #include "KTProcessor.hh"
 
+#include "KTException.hh"
 //#include "KTLogger.hh"
 
-#include <boost/foreach.hpp>
-
 #include <string>
 
 using std::string;
@@ -139,8 +138,7 @@ namespace Nymph
         {
             return slot->GetDoBreakpoint();
         }
-        KTWARN(processorlog, "Slot <" << slotName << "> was not found");
-        return false;
+        throw KTException() << "Slot <" << slotName << "> was not found";
     }
 
     void KTProcessor::SetDoBreakpoint(const std::string& slotName, bool flag)
@@ -150,7 +148,7 @@ namespace Nymph
         {
             return slot->SetDoBreakpoint(flag);
         }
-        KTWARN(processorlog, "Slot <" << slotName << "> was not found");
+        throw KTException() << "Slot <" << slotName << "> was not found";
         return;
     }
 

From 8f15788e2e3668461a8bcc83427892cdd91fa83d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 May 2017 13:22:24 -0700
Subject: [PATCH 019/521] Switched to boost::thread in KTProcessorToolbox

---
 CMakeLists.txt                            |   2 +-
 Library/Application/KTProcessorToolbox.cc | 129 +++++++++++++++++-----
 Library/Application/KTProcessorToolbox.hh |  17 +--
 Library/Processor/KTThreadReference.hh    |   5 +-
 4 files changed, 113 insertions(+), 40 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 102466c..69381f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 #######
 
 # Boost (1.46 required for filesystem version 3)
-list (APPEND Boost_COMPONENTS date_time filesystem program_options system thread)
+list (APPEND Boost_COMPONENTS chrono date_time filesystem program_options system thread)
 if (Nymph_ENABLE_PYTHON)
     list(APPEND Boost_COMPONENTS python)
 endif (Nymph_ENABLE_PYTHON)
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index ce198eb..3750a8e 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -12,16 +12,10 @@
 #include "KTPrimaryProcessor.hh"
 
 #include "factory.hh"
+#include "param_codec.hh"
 
-#ifndef SINGLETHREADED
+#include <boost/system/error_code.hpp>
 #include <boost/thread.hpp>
-#endif
-
-#include <future>
-#include <thread>
-#include <vector>
-
-#include "param_codec.hh"
 
 using std::deque;
 using std::set;
@@ -586,7 +580,7 @@ namespace Nymph
             return;
         }
 
-        fDoRunPromise = std::promise< void >();
+        fDoRunPromise = boost::promise< void >();
         fDoRunFuture = fDoRunPromise.get_future().share();
 
         bool willRunSingleThreaded = fRunSingleThreaded;
@@ -601,15 +595,15 @@ namespace Nymph
                 try
                 {
                     // reset the continue signaler
-                    fContinueSignaler = std::promise< void >();
+                    fContinueSignaler = boost::promise< void >();
                     fMasterContSignal = fContinueSignaler.get_future().share();
                     if( ! fMasterContSignal.valid() )
                     {
                         KTERROR( proclog, "Invalid master continue-signal created" );
-                        throw std::future_error( std::future_errc::no_state );
+                        throw KTException() << "Invalid master continue-signal created";
                     }
                     // copy for use in this function
-                    std::shared_future< void > continueSignal = fMasterContSignal;
+                    boost::shared_future< void > continueSignal = fMasterContSignal;
 
                     KTPROG( proclog, "Starting single-threaded processing" );
 
@@ -626,7 +620,7 @@ namespace Nymph
                             if( ! fThreadFutures.back().valid() )
                             {
                                 KTERROR( proclog, "Invalid thread future created" );
-                                throw std::future_error( std::future_errc::no_state );
+                                throw KTException() << "Invalid thread future created";
                             }
 
                             fThreadIndicators.emplace_back( new KTThreadIndicator() );
@@ -636,7 +630,8 @@ namespace Nymph
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
                             thisThreadRef.fRefreshFutureFunc = [&]( std::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
 
-                            std::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
+                            //boost::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
+                            boost::thread thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ) ); } );
 
                             KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
 
@@ -692,50 +687,124 @@ namespace Nymph
                 return;
             };
 
-            fDoRunThread = new std::thread( singleThreadRun );
+            fDoRunThread = new boost::thread( singleThreadRun );
         }
         else
-        {
+        {/*
             auto multiThreadRun = [&]()
             {
                 try
                 {
-                    std::shared_future< void > fMasterContSignal( fContinueSignaler.get_future() );
+                    // reset the continue signaler
+                    fContinueSignaler = boost::promise< void >();
+                    fMasterContSignal = fContinueSignaler.get_future().share();
                     if( ! fMasterContSignal.valid() )
                     {
                         KTERROR( proclog, "Invalid master continue-signal created" );
-                        throw std::future_error( std::future_errc::no_state );
+                        throw boost::future_error( boost::future_errc::no_state );
                     }
+                    // copy for use in this function
+                    boost::shared_future< void > continueSignal = fMasterContSignal;
 
                     KTPROG( proclog, "Starting multi-threaded processing" );
 
-                    // TODO logic to start threads goes here
+                    for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                    {
+                        vector< boost::thread > threads;
+
+                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        {
+                            std::string procName( tgIter->fName );
+                            KTINFO( proclog, "Starting processor <" << procName << ">" );
+
+                            KTThreadReference thisThreadRef;
+
+                            fThreadFutures.push_back( thisThreadRef.fDataPtrRet.get_future() );
+                            if( ! fThreadFutures.back().valid() )
+                            {
+                                KTERROR( proclog, "Invalid thread future created" );
+                                throw boost::future_error( boost::future_errc::no_state );
+                            }
+
+                            fThreadIndicators.emplace_back( new KTThreadIndicator() );
+                            fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
+
+                            thisThreadRef.fThreadIndicator = fThreadIndicators.back();
+                            thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
+                            thisThreadRef.fRefreshFutureFunc = [&]( boost::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
+
+                            threads.emplace_back( boost::thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) ) );
+
+                            KTDEBUG( proclog, "Thread ID is <" << threads.back().get_id() << ">" );
+                        }// end for loop over the thread group
+
+                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                        do
+                        {
+                            boost::future_status status;
+                            do
+                            {
+                                status = fThreadFutures.back().wait_for(boost::chrono::milliseconds(500));
+                            } while (status != boost::future_status::ready);
+
+                            stillRunning = false;
+                            if( fDoRunBreakFlag )
+                            {
+                                KTDEBUG( proclog, "Breakpoint reached" );
+                                continueSignal.wait();
+                                KTDEBUG( proclog, "Breakpoint finished" );
+                                stillRunning = true;
+                                continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                            }
+                            else
+                            {
+                                try
+                                {
+                                    fThreadFutures.back().get();
+                                }
+                                catch( std::exception& e )
+                                {
+                                    // this transfers an exception thrown by a processor to the outer catch block in this function
+                                    throw KTException() << "An error occurred while running processor <" << procName << ">: " << e.what();
+                                }
+                                stillRunning = false;
+                            }
+                        } while( stillRunning );
+
+                        KTINFO( proclog, "Processor <" << procName << "> has finished" );
+
+                        thread.join();
+                        fThreadIndicators.pop_back();
+                        fThreadFutures.pop_back();
+
+                    } // end for loop over the run-queue
 
                     KTPROG( proclog, "Processing is complete (multi-threaded)" );
                 }
                 catch( ... )
                 {
+                    // exceptions thrown in this function or from within processors will end up here
                     fDoRunPromise.set_exception( std::current_exception() );
                 }
                 fDoRunPromise.set_value();
                 return;
             };
 
-            fDoRunThread = new std::thread( multiThreadRun );
-        }
+            fDoRunThread = new boost::thread( multiThreadRun );
+        */}
 
         return;
     }
 
     bool KTProcessorToolbox::WaitForBreak()
     {
-        std::shared_future< void > doRunFuture = fDoRunFuture;
+        boost::shared_future< void > doRunFuture = fDoRunFuture;
 
-        std::future_status doRunStatus;
+        boost::future_status doRunStatus;
         do
         {
-            doRunStatus = doRunFuture.wait_for( std::chrono::milliseconds( 500 ) );
-        } while( doRunStatus != std::future_status::ready );
+            doRunStatus = doRunFuture.wait_for( boost::chrono::milliseconds( 500 ) );
+        } while( doRunStatus != boost::future_status::ready );
 
         if( fDoRunBreakFlag )
         {
@@ -771,7 +840,7 @@ namespace Nymph
 
     void KTProcessorToolbox::Continue()
     {
-        std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
+        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
 
         // futures have been used; clear them to be replaced
         fThreadFutures.clear();
@@ -784,7 +853,7 @@ namespace Nymph
         }
 
         // reset the do-run promise and future
-        fDoRunPromise = std::promise< void >();
+        fDoRunPromise = boost::promise< void >();
         fDoRunFuture = fDoRunPromise.get_future().share();
 
         KTINFO( proclog, "Continuing from breakpoint" );
@@ -793,7 +862,7 @@ namespace Nymph
 
         // reset the signaler and all signals
         // hopefully the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
-        fContinueSignaler = std::promise< void >();
+        fContinueSignaler = boost::promise< void >();
         fMasterContSignal = fContinueSignaler.get_future().share();
         for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
@@ -805,7 +874,7 @@ namespace Nymph
 
     void KTProcessorToolbox::InitiateBreak()
     {
-        std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
+        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
 
         // set all break flags
         // master break flag
@@ -824,7 +893,7 @@ namespace Nymph
 
     void KTProcessorToolbox::CancelThreads()
     {
-        std::unique_lock< std::mutex > breakContLock( fBreakContMutex );
+        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
         for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
         {
             (*tiIt)->fCanceled = true;
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index ef300d4..b07b9ed 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -15,8 +15,11 @@
 
 #include "factory.hh"
 
+#include <boost/thread/future.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+
 #include <deque>
-#include <future>
 #include <initializer_list>
 #include <limits>
 #include <set>
@@ -227,13 +230,13 @@ namespace Nymph
             std::vector< std::future< KTDataPtr > > fThreadFutures;
             std::vector< std::shared_ptr< KTThreadIndicator > > fThreadIndicators;
 
-            std::promise< void > fContinueSignaler;
-            std::shared_future< void > fMasterContSignal;
-            std::mutex fBreakContMutex;
+            boost::promise< void > fContinueSignaler;
+            boost::shared_future< void > fMasterContSignal;
+            boost::mutex fBreakContMutex;
 
-            std::thread* fDoRunThread;
-            std::promise< void > fDoRunPromise;
-            std::shared_future< void > fDoRunFuture;
+            boost::thread* fDoRunThread;
+            boost::promise< void > fDoRunPromise;
+            boost::shared_future< void > fDoRunFuture;
             bool fDoRunBreakFlag;
 
     };
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index f317d62..f149014 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -10,15 +10,16 @@
 
 #include "KTData.hh"
 
+#include <boost/thread/future.hpp>
+
 #include <memory>
-#include <thread>
 
 namespace Nymph
 {
     struct KTThreadIndicator
     {
         bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
-        std::shared_future< void > fContinueSignal;
+        boost::shared_future< void > fContinueSignal;
         bool fCanceled;
         KTThreadIndicator();
     };

From 190988990892994bbc0a8a1273d051ac231192d1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 May 2017 17:50:43 -0700
Subject: [PATCH 020/521] Multithreaded running complete and tested

---
 Executables/Validation/CMakeLists.txt         |   1 +
 .../TestProcessorToolboxMultithreaded.cc      |  87 +++++++++++++++
 Executables/Validation/TestUseBreakpoint.cc   |   3 +-
 Library/Application/KTProcessorToolbox.cc     | 101 ++++++++++++------
 Library/Application/KTProcessorToolbox.hh     |  44 +++++++-
 Library/Data/KTData.hh                        |   6 +-
 Library/Processor/KTThreadReference.cc        |   9 +-
 Library/Processor/KTThreadReference.hh        |   3 +-
 8 files changed, 208 insertions(+), 46 deletions(-)
 create mode 100644 Executables/Validation/TestProcessorToolboxMultithreaded.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index a3e1dc2..c8d1b48 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -54,6 +54,7 @@ if (Nymph_ENABLE_TESTING)
         TestPrimaryProcessorNoThreading
         TestPrintData
         TestProcessorToolbox
+        TestProcessorToolboxMultithreaded
         TestSignalsAndSlots
         TestThroughputProfiler
         TestUseBreakpoint
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
new file mode 100644
index 0000000..f9a348c
--- /dev/null
+++ b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
@@ -0,0 +1,87 @@
+/*
+ * TestProcessorToolboxMultithreaded.cc
+ *
+ *  Created on: May 8, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestProcessorToolbox" )
+
+int main()
+{
+    KTINFO( testptlog, "Preparing to run" );
+
+    KTProcessorToolbox ptb;
+
+    // add the primary processor, thread 1
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
+    {
+        KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
+        return -1;
+    }
+
+    // add processor b, thread 1
+    if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
+    {
+        KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
+        return -1;
+    }
+
+    // add the primary processor, thread 2
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
+    {
+        KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
+        return -1;
+    }
+
+    // add processor b, thread 2
+    if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
+    {
+        KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
+        return -1;
+    }
+
+    // make connections, thread 1
+    if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
+        return -1;
+    }
+
+    // make connections, thread 2
+    if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
+        return -1;
+    }
+
+    // set the run queue
+    if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
+    {
+        KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
+        return -1;
+    }
+
+    // go!
+    KTINFO( testptlog, "Starting asynchronous run" );
+    ptb.AsyncRun();
+
+    // wait for run completion, and ignore breakpoints
+    while( ptb.WaitForBreak() )
+    {
+        KTINFO( testptlog, "Reached breakpoint; continuing" );
+        ptb.Continue();
+    }
+
+    KTINFO( testptlog, "Processing complete" );
+
+    KTINFO( testptlog, "Tests complete" );
+
+    return 0;
+}
diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Executables/Validation/TestUseBreakpoint.cc
index 42fc2ce..466b814 100644
--- a/Executables/Validation/TestUseBreakpoint.cc
+++ b/Executables/Validation/TestUseBreakpoint.cc
@@ -9,6 +9,7 @@
 
 #include "KTLogger.hh"
 
+
 using namespace Nymph;
 
 KTLOGGER( testptlog, "TestUseBreakpoint" )
@@ -58,7 +59,7 @@ int main()
     ptb.AsyncRun();
 
     KTINFO( testptlog, "Starting asynchronous breakpoint user" );
-    auto buFuture = std::async( std::launch::async, [&](){
+    auto buFuture = boost::async( boost::launch::async, [&](){
         KTINFO( testptlog, "In breakpoint user thread" );
         while( ptb.WaitForBreak() )
         {
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 3750a8e..ae65d3d 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -14,7 +14,6 @@
 #include "factory.hh"
 #include "param_codec.hh"
 
-#include <boost/system/error_code.hpp>
 #include <boost/thread.hpp>
 
 using std::deque;
@@ -29,7 +28,7 @@ namespace Nymph
     KTProcessorToolbox::KTProcessorToolbox(const std::string& name) :
             KTConfigurable(name),
             fProcFactory(scarab::factory< KTProcessor, const std::string& >::get_instance()),
-            fRunSingleThreaded( true ), //TODO: switch this to false once multithreading is available
+            fRunSingleThreaded( false ),
             fRunQueue(),
             fProcMap(),
             fThreadFutures(),
@@ -616,7 +615,14 @@ namespace Nymph
 
                             KTThreadReference thisThreadRef;
 
-                            fThreadFutures.push_back( thisThreadRef.fDataPtrRet.get_future() );
+                            //fThreadFutures.get<1>().insert( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
+                            //fThreadFutures.push_back( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
+                            fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
+                            fThreadNames.push_back( procName );
+                            //auto& futureNameIndex = fThreadFutures.get<1>();
+
+                            //auto thisFuturePtr = futureNameIndex.find( procName );
+                            //if( ! thisFuturePtr->fFuture.valid() )
                             if( ! fThreadFutures.back().valid() )
                             {
                                 KTERROR( proclog, "Invalid thread future created" );
@@ -628,7 +634,7 @@ namespace Nymph
 
                             thisThreadRef.fThreadIndicator = fThreadIndicators.back();
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
-                            thisThreadRef.fRefreshFutureFunc = [&]( std::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
+                            thisThreadRef.fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
                             //boost::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
                             boost::thread thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ) ); } );
@@ -638,16 +644,17 @@ namespace Nymph
                             bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                             do
                             {
-                                std::future_status status;
+                                boost::future_status status;
                                 do
                                 {
-                                    status = fThreadFutures.back().wait_for(std::chrono::milliseconds(500));
-                                } while (status != std::future_status::ready);
+                                    //status = thisFuturePtr->fFuture.wait_for( std::chrono::milliseconds(500) );
+                                    status = fThreadFutures.back().wait_for( boost::chrono::milliseconds(500) );
+                                } while (status != boost::future_status::ready);
 
                                 stillRunning = false;
                                 if( fThreadIndicators.back()->fBreakFlag )
                                 {
-                                    KTDEBUG( proclog, "Breakpoint reached" );
+                                    KTDEBUG( proclog, "Breakpoint reached (originated in thread <" << fThreadNames.back() << ">)" );
                                     continueSignal.wait();
                                     KTDEBUG( proclog, "Breakpoint finished" );
                                     stillRunning = true;
@@ -657,10 +664,15 @@ namespace Nymph
                                 {
                                     try
                                     {
+                                        //futureNameIndex.modify( thisFuturePtr, [](LabeledFuture& lFuture){ lFuture.fFuture.get(); } );
                                         fThreadFutures.back().get();
+                                        KTINFO( proclog, "Thread <" << fThreadNames.back() << "> has finished" );
+                                        fThreadFutures.pop_back();
+                                        fThreadNames.pop_back();
                                     }
                                     catch( std::exception& e )
                                     {
+                                        KTERROR( proclog, "Thread <" << fThreadNames.back() << "> threw an error: " << e.what() );
                                         // this transfers an exception thrown by a processor to the outer catch block in this function
                                         throw KTException() << "An error occurred while running processor <" << procName << ">: " << e.what();
                                     }
@@ -671,8 +683,9 @@ namespace Nymph
                             KTINFO( proclog, "Processor <" << procName << "> has finished" );
 
                             thread.join();
-                            fThreadIndicators.pop_back();
-                            fThreadFutures.pop_back();
+                            fThreadIndicators.clear();
+                            fThreadFutures.clear();
+                            fThreadNames.clear();
                         } // end for loop over the thread group
                     } // end for loop over the run-queue
 
@@ -690,7 +703,7 @@ namespace Nymph
             fDoRunThread = new boost::thread( singleThreadRun );
         }
         else
-        {/*
+        {
             auto multiThreadRun = [&]()
             {
                 try
@@ -701,7 +714,7 @@ namespace Nymph
                     if( ! fMasterContSignal.valid() )
                     {
                         KTERROR( proclog, "Invalid master continue-signal created" );
-                        throw boost::future_error( boost::future_errc::no_state );
+                        throw KTException() << "Invalid master continue-signal created";
                     }
                     // copy for use in this function
                     boost::shared_future< void > continueSignal = fMasterContSignal;
@@ -710,7 +723,9 @@ namespace Nymph
 
                     for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                     {
-                        vector< boost::thread > threads;
+                        boost::thread_group threads;
+
+                        //auto& futureNameIndex = fThreadFutures.get<1>();
 
                         for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
@@ -719,11 +734,17 @@ namespace Nymph
 
                             KTThreadReference thisThreadRef;
 
-                            fThreadFutures.push_back( thisThreadRef.fDataPtrRet.get_future() );
+                            //futureNameIndex.insert( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
+                            //fThreadFutures.push_back( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
+                            fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
+                            fThreadNames.push_back( procName );
+
+                            //auto thisFuturePtr = futureNameIndex.find( procName );
+                            //if( ! thisFuturePtr->fFuture.valid() )
                             if( ! fThreadFutures.back().valid() )
                             {
                                 KTERROR( proclog, "Invalid thread future created" );
-                                throw boost::future_error( boost::future_errc::no_state );
+                                throw KTException() << "Invalid thread future created";
                             }
 
                             fThreadIndicators.emplace_back( new KTThreadIndicator() );
@@ -731,26 +752,31 @@ namespace Nymph
 
                             thisThreadRef.fThreadIndicator = fThreadIndicators.back();
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
-                            thisThreadRef.fRefreshFutureFunc = [&]( boost::future< KTDataPtr >&& ret ){ this->TakeFuture( std::move(ret) ); };
+                            thisThreadRef.fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
-                            threads.emplace_back( boost::thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) ) );
+                            //threads.emplace_back( boost::thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) ) );
+                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ) ); } );
+                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">" );
+
+                            threads.add_thread( thisThread );
 
-                            KTDEBUG( proclog, "Thread ID is <" << threads.back().get_id() << ">" );
                         }// end for loop over the thread group
 
+                        //auto& futureIndex = fThreadFutures.get<0>();
+
                         bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                         do
                         {
-                            boost::future_status status;
-                            do
-                            {
-                                status = fThreadFutures.back().wait_for(boost::chrono::milliseconds(500));
-                            } while (status != boost::future_status::ready);
+                            //auto finishedFuturePtr = boost::wait_for_any( futureIndex.begin(), futureIndex.end() );
+                            auto finishedFuturePtr = boost::wait_for_any( fThreadFutures.begin(), fThreadFutures.end() );
+                            size_t iThread = finishedFuturePtr - fThreadFutures.begin();
+                            std::string threadName( fThreadNames[iThread] );
 
                             stillRunning = false;
                             if( fDoRunBreakFlag )
                             {
-                                KTDEBUG( proclog, "Breakpoint reached" );
+                                // a breakpoint has been reached
+                                KTDEBUG( proclog, "Breakpoint reached (originated in thread <" << threadName << ">)" );
                                 continueSignal.wait();
                                 KTDEBUG( proclog, "Breakpoint finished" );
                                 stillRunning = true;
@@ -758,25 +784,32 @@ namespace Nymph
                             }
                             else
                             {
+                                // we're finished a thread; get its results
                                 try
                                 {
-                                    fThreadFutures.back().get();
+                                    //futureIndex.modify( finishedFuturePtr, [](LabeledFuture& lFuture){ lFuture.fFuture.get(); } );
+                                    finishedFuturePtr->get();
+                                    KTINFO( proclog, "Thread <" << threadName << "> has finished" );
+                                    fThreadFutures.erase( finishedFuturePtr );
+                                    fThreadNames.erase( fThreadNames.begin() + iThread );
                                 }
                                 catch( std::exception& e )
                                 {
+                                    KTERROR( proclog, "Thread <" << threadName << "> threw an error: " << e.what() );
                                     // this transfers an exception thrown by a processor to the outer catch block in this function
-                                    throw KTException() << "An error occurred while running processor <" << procName << ">: " << e.what();
+                                    throw KTException() << "An error occurred while running processor <" << threadName << ">: " << e.what();
                                 }
-                                stillRunning = false;
+
+                                fThreadFutures.erase( finishedFuturePtr );
+                                if( fThreadFutures.empty() ) stillRunning = false;
+                                else stillRunning = true;
                             }
                         } while( stillRunning );
 
-                        KTINFO( proclog, "Processor <" << procName << "> has finished" );
-
-                        thread.join();
-                        fThreadIndicators.pop_back();
-                        fThreadFutures.pop_back();
-
+                        threads.join_all();
+                        fThreadIndicators.clear();
+                        fThreadFutures.clear();
+                        fThreadNames.clear();
                     } // end for loop over the run-queue
 
                     KTPROG( proclog, "Processing is complete (multi-threaded)" );
@@ -791,7 +824,7 @@ namespace Nymph
             };
 
             fDoRunThread = new boost::thread( multiThreadRun );
-        */}
+        }
 
         return;
     }
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index b07b9ed..3cc488e 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -15,15 +15,23 @@
 
 #include "factory.hh"
 
+#define BOOST_THREAD_PROVIDES_FUTURE
 #include <boost/thread/future.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
+//#include <boost/multi_index_container.hpp>
+//#include <boost/multi_index/random_access_index.hpp>
+//#include <boost/multi_index/ordered_index.hpp>
+//#include <boost/multi_index/member.hpp>
+
 #include <deque>
 #include <initializer_list>
 #include <limits>
 #include <set>
 
+//namespace bmi = boost::multi_index;
+
 namespace Nymph
 {
     class KTPrimaryProcessor;
@@ -222,13 +230,36 @@ namespace Nymph
         private:
             friend class KTThreadReference;
 
+            typedef boost::unique_future< KTDataPtr > Future;
+            //typedef std::future< KTDataPtr > Future;
+
             // called from ThreadPacket::Break
             void InitiateBreak();
             // called from ThreadPacket::Break
-            void TakeFuture( std::future< KTDataPtr >&& future );
-
-            std::vector< std::future< KTDataPtr > > fThreadFutures;
-            std::vector< std::shared_ptr< KTThreadIndicator > > fThreadIndicators;
+            void TakeFuture( const std::string& name, Future&& future );
+
+            //struct LabeledFuture
+            //{
+            //    std::string fName;
+            //    std::future< KTDataPtr > fFuture;
+            //};
+            //typedef std::vector< LabeledFuture > ThreadFutures;
+            typedef std::vector< Future > ThreadFutures;
+            typedef std::vector< std::string > ThreadNames;
+            //typedef std::map< std::string, std::future< KTDataPtr > > ThreadFutures;
+            //typedef boost::multi_index_container<
+            //    LabeledFuture,
+            //    bmi::indexed_by<
+            //        bmi::random_access<>,
+            //        bmi::ordered_unique< bmi::member< KTProcessorToolbox::LabeledFuture, std::string, &KTProcessorToolbox::LabeledFuture::fName > >
+            //    >
+            //> ThreadFutures;
+
+            ThreadFutures fThreadFutures;
+            ThreadNames fThreadNames;
+
+            typedef std::vector< std::shared_ptr< KTThreadIndicator > > ThreadIndicators;
+            ThreadIndicators fThreadIndicators;
 
             boost::promise< void > fContinueSignaler;
             boost::shared_future< void > fMasterContSignal;
@@ -259,9 +290,12 @@ namespace Nymph
         return;
     }
 
-    inline void KTProcessorToolbox::TakeFuture( std::future< KTDataPtr >&& future )
+    inline void KTProcessorToolbox::TakeFuture( const std::string& name, Future&& future )
     {
+        //fThreadFutures.get<1>().insert( LabeledFuture{ name, std::move( future ) } );
+        //fThreadFutures.push_back( LabeledFuture{ name, std::move( future ) } );
         fThreadFutures.push_back( std::move( future ) );
+        fThreadNames.push_back( name );
         return;
     }
 
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 7e3293f..32838e9 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -13,7 +13,9 @@
 #include "KTCutStatus.hh"
 #include "KTMemberVariable.hh"
 
-#include <future>
+#include <boost/thread/future.hpp>
+
+//#include <future>
 #include <memory>
 #include <string>
 
@@ -73,7 +75,7 @@ namespace Nymph
 
     typedef std::shared_ptr< KTData > KTDataPtr;
 
-    typedef std::promise< KTDataPtr > KTDataPtrReturn;
+    typedef boost::promise< KTDataPtr > KTDataPtrReturn;
 
 #define THROW_RETURN_EXCEPTION( ret_promise, exception ) \
     ret_promise.set_exception( std::make_exception_ptr( exception ) );
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index 36ef20a..1309bf0 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -23,14 +23,16 @@ namespace Nymph
             fDataPtrRet(),
             fInitiateBreakFunc(),
             fRefreshFutureFunc(),
-            fThreadIndicator( new KTThreadIndicator() )
+            fThreadIndicator( new KTThreadIndicator() ),
+            fPrimaryProcName()
     {}
 
     KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
             fDataPtrRet( std::move( orig.fDataPtrRet ) ),
             fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
             fRefreshFutureFunc( std::move( orig.fRefreshFutureFunc ) ),
-            fThreadIndicator( orig.fThreadIndicator )
+            fThreadIndicator( orig.fThreadIndicator ),
+            fPrimaryProcName( std::move( orig.fPrimaryProcName ) )
     {
         orig.fThreadIndicator = nullptr;
     }
@@ -41,6 +43,7 @@ namespace Nymph
         fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
         fRefreshFutureFunc = std::move( orig.fRefreshFutureFunc );
         fThreadIndicator = orig.fThreadIndicator;
+        fPrimaryProcName = std::move( orig.fPrimaryProcName );
 
         orig.fThreadIndicator = nullptr;
 
@@ -64,7 +67,7 @@ namespace Nymph
             // reset the promise
             fDataPtrRet = KTDataPtrReturn();
             // pass the future back to the processor toolbox (if it's in use)
-            fRefreshFutureFunc( fDataPtrRet.get_future() );
+            fRefreshFutureFunc( fPrimaryProcName, std::move( fDataPtrRet.get_future() ) );
         }
         return;
     }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index f149014..3f90f74 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -28,8 +28,9 @@ namespace Nymph
     {
         KTDataPtrReturn fDataPtrRet;
         std::function< void() > fInitiateBreakFunc;
-        std::function< void(std::future< KTDataPtr >&&) > fRefreshFutureFunc;
+        std::function< void(const std::string&, boost::unique_future< KTDataPtr >&&) > fRefreshFutureFunc;
         std::shared_ptr< KTThreadIndicator > fThreadIndicator;
+        std::string fPrimaryProcName;
 
         KTThreadReference();
         KTThreadReference( const KTThreadReference& ) = delete;

From 0531df763bcb0a8973eb3a5b1f04b95be7f09737 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 11:14:27 -0700
Subject: [PATCH 021/521] Scarab logger updates

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 7ee4812..953b806 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 7ee4812376649615f4cf97412c338201dd43e321
+Subproject commit 953b806ee1e1c675e977e7285cc258f231eb88df

From 76c0ea5ba3197aba36ce5a5fd74c80ee5b0845e9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 11:36:23 -0700
Subject: [PATCH 022/521] Fixed logger macros for non-debug mode

---
 Library/Utility/KTLogger.hh | 46 ++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/Library/Utility/KTLogger.hh b/Library/Utility/KTLogger.hh
index 1c38ae1..5e1bf9c 100644
--- a/Library/Utility/KTLogger.hh
+++ b/Library/Utility/KTLogger.hh
@@ -19,23 +19,33 @@
 
 #define KTLOGGER(I,K)      static ::scarab::logger I(K);
 
-#define KTLOG(...)         macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
-#define KTPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
-#define KTERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
-#define KTFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
-#define KTASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
-
-#define KTLOG_ONCE(...)    macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
+#ifdef NDEBUG
+#define LTRACE(...)
+#define LDEBUG(...)
+#else
+#define LTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
+#define LDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
+#endif
+#define LINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
+#define LPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
+#define LWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
+#define LERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
+#define LFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
+#define LASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
+
+#define LOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#ifdef NDEBUG
+#define LTRACE_ONCE(...)
+#define LDEBUG_ONCE(...)
+#else
+#define LTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#endif
+#define LINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
 
 #endif /* KTLOGGER_HH_ */

From 992aba38c361c4dd7c2431f3d51b8e37af95ec76 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 11:43:57 -0700
Subject: [PATCH 023/521] =?UTF-8?q?This=20time,=20I=20swear=20it=E2=80=99s?=
 =?UTF-8?q?=20right?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Utility/KTLogger.hh | 44 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/Library/Utility/KTLogger.hh b/Library/Utility/KTLogger.hh
index 5e1bf9c..adeee63 100644
--- a/Library/Utility/KTLogger.hh
+++ b/Library/Utility/KTLogger.hh
@@ -19,33 +19,33 @@
 
 #define KTLOGGER(I,K)      static ::scarab::logger I(K);
 
-#define LOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTLOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
 #ifdef NDEBUG
-#define LTRACE(...)
-#define LDEBUG(...)
+#define KTTRACE(...)
+#define KTDEBUG(...)
 #else
-#define LTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
-#define LDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
 #endif
-#define LINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
-#define LPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
-#define LWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
-#define LERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
-#define LFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
-#define LASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
-
-#define LOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
+#define KTPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
+#define KTERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
+#define KTFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
+#define KTASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
+
+#define KTLOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
 #ifdef NDEBUG
-#define LTRACE_ONCE(...)
-#define LDEBUG_ONCE(...)
+#define KTTRACE_ONCE(...)
+#define KTDEBUG_ONCE(...)
 #else
-#define LTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
 #endif
-#define LINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
 
 #endif /* KTLOGGER_HH_ */

From 7bdd382f93a193a2bf7d7efb0ce706df5adbb1ba Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 12:14:58 -0700
Subject: [PATCH 024/521] Added wait-for-thread-to-start in KTProcessorToolbox.
 Some polishing. Adjusting test routines.

---
 Executables/Validation/CMakeLists.txt         |   3 +-
 .../Validation/KTTestPrimaryProcessor.cc      |   2 +-
 .../Validation/TestPrimaryProcessor.cc        |  15 ++-
 .../TestProcessorToolbox2Threads.cc           | 107 ++++++++++++++++++
 .../TestProcessorToolboxMultithreaded.cc      |  46 +++-----
 ... => TestProcessorToolboxSinglethreaded.cc} |   7 +-
 Library/Application/KTProcessorToolbox.cc     |  49 +++++---
 Library/Processor/KTPrimaryProcessor.cc       |   5 +-
 Library/Processor/KTPrimaryProcessor.hh       |   6 +-
 9 files changed, 186 insertions(+), 54 deletions(-)
 create mode 100644 Executables/Validation/TestProcessorToolbox2Threads.cc
 rename Executables/Validation/{TestProcessorToolbox.cc => TestProcessorToolboxSinglethreaded.cc} (88%)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index c8d1b48..4b43ee9 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -53,8 +53,9 @@ if (Nymph_ENABLE_TESTING)
         TestPrimaryProcessor
         TestPrimaryProcessorNoThreading
         TestPrintData
-        TestProcessorToolbox
+        TestProcessorToolbox2Threads
         TestProcessorToolboxMultithreaded
+        TestProcessorToolboxSinglethreaded
         TestSignalsAndSlots
         TestThroughputProfiler
         TestUseBreakpoint
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
index 290ac9a..39e6121 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -37,7 +37,7 @@ namespace Nymph
         for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
         {
             // e.g. for a real processor, do some work here instead of sleeping
-            std::this_thread::sleep_for( std::chrono::milliseconds(1) );
+            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
 
             if( fThreadRef.fThreadIndicator->fCanceled ) break;
 
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
index 6e543df..22d3c1e 100644
--- a/Executables/Validation/TestPrimaryProcessor.cc
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -10,7 +10,7 @@
 
 #include "KTLogger.hh"
 
-#include <thread>
+#include <boost/thread.hpp>
 
 using namespace Nymph;
 
@@ -38,7 +38,18 @@ int main()
     auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
 
     // run the thread
-    std::thread thread( &KTPrimaryProcessor::operator(), &tpp, std::move( exeThreadRef ) );
+    boost::condition_variable threadStartedCV;
+    boost::mutex threadStartedMutex;
+    bool threadStartedFlag = false;
+
+    boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+    boost::thread thread( [&](){ tpp( std::move( exeThreadRef ), threadStartedCV, threadStartedFlag ); } );
+
+    while( ! threadStartedFlag )
+    {
+        threadStartedCV.wait( threadStartedLock );
+    }
+    KTDEBUG( testpplog, "Thread has started" );
 
     // wait for a result to be set
     exeThreadFuture.wait();
diff --git a/Executables/Validation/TestProcessorToolbox2Threads.cc b/Executables/Validation/TestProcessorToolbox2Threads.cc
new file mode 100644
index 0000000..c45a573
--- /dev/null
+++ b/Executables/Validation/TestProcessorToolbox2Threads.cc
@@ -0,0 +1,107 @@
+/*
+ * TestProcessorToolboxMultithreaded.cc
+ *
+ *  Created on: May 8, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestProcessorToolbox" )
+
+int main()
+{
+    KTINFO( testptlog, "Preparing to run" );
+
+    KTProcessorToolbox ptb;
+
+    // add the primary processor, thread 1
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
+    {
+        KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
+        return -1;
+    }
+
+    // add processor b, thread 1
+    if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
+    {
+        KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
+        return -1;
+    }
+
+    // add the primary processor, thread 2
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
+    {
+        KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
+        return -1;
+    }
+
+    // add processor b, thread 2
+    if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
+    {
+        KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
+        return -1;
+    }
+
+    // set breakpoint, thread 1
+    if( ! ptb.SetBreakpoint( "tp1", "first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to set the breakpoint" );
+        return -1;
+    }
+
+    // no breakpoint, thread2
+
+    // make connections, thread 1
+    if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
+        return -1;
+    }
+
+    // make connections, thread 2
+    if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:second-slot" ) )
+    {
+        KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
+        return -1;
+    }
+
+    // set the run queue
+    if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
+    {
+        KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
+        return -1;
+    }
+
+    // go!
+    KTINFO( testptlog, "Starting asynchronous run" );
+    ptb.AsyncRun();
+
+    KTINFO( testptlog, "Starting asynchronous breakpoint user" );
+    auto buFuture = boost::async( boost::launch::async, [&](){
+        KTINFO( testptlog, "In breakpoint user thread" );
+        while( ptb.WaitForBreak() )
+        {
+            KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
+            std::string temp;
+            KTPROG( testptlog, "Please press [return]" );
+            getline( std::cin, temp );
+            ptb.Continue();
+        }
+        KTINFO( testptlog, "Finished breakpoint user thread" );
+        return;
+    });
+
+    KTINFO( testptlog, "Waiting for the end of the run" );
+    ptb.WaitForEndOfRun();
+
+    KTINFO( testptlog, "Processing complete" );
+
+    KTINFO( testptlog, "Tests complete" );
+
+    return 0;
+}
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
index f9a348c..29848fc 100644
--- a/Executables/Validation/TestProcessorToolboxMultithreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
@@ -11,7 +11,7 @@
 
 using namespace Nymph;
 
-KTLOGGER( testptlog, "TestProcessorToolbox" )
+KTLOGGER( testptlog, "TestProcessorToolboxMultithreaded" )
 
 int main()
 {
@@ -19,52 +19,34 @@ int main()
 
     KTProcessorToolbox ptb;
 
-    // add the primary processor, thread 1
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
-        return -1;
-    }
-
-    // add processor b, thread 1
-    if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
-    {
-        KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
-        return -1;
-    }
-
-    // add the primary processor, thread 2
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
-        return -1;
-    }
+    // set for multi-threaded running
+    ptb.SetRunSingleThreaded( false );
 
-    // add processor b, thread 2
-    if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
+    // add the primary processor
+    if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
     {
-        KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
+        KTERROR( testptlog, "Unable to create test primary processor" );
         return -1;
     }
 
-    // make connections, thread 1
-    if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
+    // add processor b
+    if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
     {
-        KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
+        KTERROR( testptlog, "Unable to create test processor b" );
         return -1;
     }
 
-    // make connections, thread 2
-    if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:first-slot" ) )
+    // make connections
+    if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
     {
-        KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
+        KTERROR( testptlog, "Unable to connect tpp to tp" );
         return -1;
     }
 
     // set the run queue
-    if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
+    if( ! ptb.PushBackToRunQueue( "tpp" ) )
     {
-        KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
+        KTERROR( testptlog, "Unable to add tpp to the run queue" );
         return -1;
     }
 
diff --git a/Executables/Validation/TestProcessorToolbox.cc b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 88%
rename from Executables/Validation/TestProcessorToolbox.cc
rename to Executables/Validation/TestProcessorToolboxSinglethreaded.cc
index fbbf287..b0c1ca7 100644
--- a/Executables/Validation/TestProcessorToolbox.cc
+++ b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
@@ -1,5 +1,5 @@
 /*
- * TestProcessorToolbox.cc
+ * TestProcessorToolboxSinglethreaded.cc
  *
  *  Created on: May 4, 2017
  *      Author: N.S. Oblath
@@ -11,7 +11,7 @@
 
 using namespace Nymph;
 
-KTLOGGER( testptlog, "TestProcessorToolbox" )
+KTLOGGER( testptlog, "TestProcessorToolboxSinglethreaded" )
 
 int main()
 {
@@ -19,6 +19,9 @@ int main()
 
     KTProcessorToolbox ptb;
 
+    // set for single-threaded running
+    ptb.SetRunSingleThreaded( true );
+
     // add the primary processor
     if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
     {
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index ae65d3d..ca988bb 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -636,8 +636,19 @@ namespace Nymph
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
                             thisThreadRef.fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
+                            boost::condition_variable threadStartedCV;
+                            boost::mutex threadStartedMutex;
+                            bool threadStartedFlag = false;
+
                             //boost::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
-                            boost::thread thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ) ); } );
+                            boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+                            boost::thread thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ), threadStartedCV, threadStartedFlag ); } );
+                            KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
+                            while( ! threadStartedFlag )
+                            {
+                                threadStartedCV.wait( threadStartedLock );
+                            }
+                            KTDEBUG( proclog, "Thread has started" );
 
                             KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
 
@@ -654,7 +665,7 @@ namespace Nymph
                                 stillRunning = false;
                                 if( fThreadIndicators.back()->fBreakFlag )
                                 {
-                                    KTDEBUG( proclog, "Breakpoint reached (originated in thread <" << fThreadNames.back() << ">)" );
+                                    KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << fThreadNames.back() << ">; may not be where breakpoint is set)" );
                                     continueSignal.wait();
                                     KTDEBUG( proclog, "Breakpoint finished" );
                                     stillRunning = true;
@@ -691,8 +702,9 @@ namespace Nymph
 
                     KTPROG( proclog, "Processing is complete (single-threaded)" );
                 }
-                catch( ... )
+                catch( std::exception& e )
                 {
+                    KTDEBUG( proclog, "Caught exception thrown in a processor or in the multi-threaded run function: " << e.what() );
                     // exceptions thrown in this function or from within processors will end up here
                     fDoRunPromise.set_exception( std::current_exception() );
                 }
@@ -754,9 +766,19 @@ namespace Nymph
                             thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
                             thisThreadRef.fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
+                            boost::condition_variable threadStartedCV;
+                            boost::mutex threadStartedMutex;
+                            bool threadStartedFlag = false;
+
                             //threads.emplace_back( boost::thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) ) );
-                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ) ); } );
-                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">" );
+                            boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ), threadStartedCV, threadStartedFlag ); } );
+                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
+                            while( ! threadStartedFlag )
+                            {
+                                threadStartedCV.wait( threadStartedLock );
+                            }
+                            KTDEBUG( proclog, "Thread has started" );
 
                             threads.add_thread( thisThread );
 
@@ -776,7 +798,7 @@ namespace Nymph
                             if( fDoRunBreakFlag )
                             {
                                 // a breakpoint has been reached
-                                KTDEBUG( proclog, "Breakpoint reached (originated in thread <" << threadName << ">)" );
+                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
                                 continueSignal.wait();
                                 KTDEBUG( proclog, "Breakpoint finished" );
                                 stillRunning = true;
@@ -800,7 +822,6 @@ namespace Nymph
                                     throw KTException() << "An error occurred while running processor <" << threadName << ">: " << e.what();
                                 }
 
-                                fThreadFutures.erase( finishedFuturePtr );
                                 if( fThreadFutures.empty() ) stillRunning = false;
                                 else stillRunning = true;
                             }
@@ -814,9 +835,10 @@ namespace Nymph
 
                     KTPROG( proclog, "Processing is complete (multi-threaded)" );
                 }
-                catch( ... )
+                catch( std::exception& e )
                 {
                     // exceptions thrown in this function or from within processors will end up here
+                    KTDEBUG( proclog, "Caught exception thrown in a processor or in the multi-threaded run function: " << e.what() );
                     fDoRunPromise.set_exception( std::current_exception() );
                 }
                 fDoRunPromise.set_value();
@@ -833,11 +855,12 @@ namespace Nymph
     {
         boost::shared_future< void > doRunFuture = fDoRunFuture;
 
-        boost::future_status doRunStatus;
-        do
-        {
-            doRunStatus = doRunFuture.wait_for( boost::chrono::milliseconds( 500 ) );
-        } while( doRunStatus != boost::future_status::ready );
+        doRunFuture.wait();
+        //boost::future_status doRunStatus;
+        //do
+        //{
+        //    doRunStatus = doRunFuture.wait_for( boost::chrono::milliseconds( 500 ) );
+        //} while( doRunStatus != boost::future_status::ready );
 
         if( fDoRunBreakFlag )
         {
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index 0d089b8..ce2e9f4 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -27,10 +27,13 @@ namespace Nymph
     {
     }
 
-    void KTPrimaryProcessor::operator ()( KTThreadReference&& ref )
+    void KTPrimaryProcessor::operator ()( KTThreadReference&& ref, boost::condition_variable& startedCV, bool& startedFlag )
     {
         fThreadRef = std::move( ref );
 
+        startedFlag = true;
+        startedCV.notify_all();
+
         // pass updated thread reference to downstream slots
         for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
         {
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index a7be18d..b470303 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -13,7 +13,9 @@
 #include "KTData.hh"
 #include "KTThreadReference.hh"
 
-#include <future>
+#include <boost/thread/condition_variable.hpp>
+
+#include <atomic>
 
 namespace Nymph
 {
@@ -26,7 +28,7 @@ namespace Nymph
 
         public:
             /// Callable function used by std::thread
-            void operator()( KTThreadReference&& ref );
+            void operator()( KTThreadReference&& ref, boost::condition_variable& startedCV, bool& startedFlag );
 
             /// Starts the  main action of the processor
             virtual bool Run() = 0;

From 80354c0bcf6c2c1b5974a0edb7dc420da3e4fbbc Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 12:19:27 -0700
Subject: [PATCH 025/521] processor structural changes

---
 Library/Processor/KTProcessorPy.hh | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Library/Processor/KTProcessorPy.hh b/Library/Processor/KTProcessorPy.hh
index 31a4b9b..f258310 100644
--- a/Library/Processor/KTProcessorPy.hh
+++ b/Library/Processor/KTProcessorPy.hh
@@ -20,11 +20,27 @@ void export_Processor()
 
     // KTProcessor base class
     class_<KTProcessor, boost::noncopyable>("KTProcessor", no_init)
+        //.def("RegisterProcessor", pure_virtual(&KTProcessor::RegisterProcessor), return_value_policy<manage_new_object>(), "register a processor")
+        
+        // PassThreadRefUpdate... needs KTThreadReference
+        //.def("PassThreadRefUpdate", &KTProcessor::PassThreadRefUpdate) 
         .def("ConnectASlot", &KTProcessor::ConnectASlot)
         .def("ConnectASignal", &KTProcessor::ConnectASignal)
-        .def("ConnectSignalToSlot", &KTProcessor::ConnectSignalToSlot)
+
+        // these next four need wrappers for return types (KT[Signal,Slot]Wrapper)
+        //.def("RegisterSignal", &KTProcessor::RegisterSignal)
+        //.def("RegisterSlot", &KTProcessor::RegisterSlot)
+        //.def("GetSignal", &KTProcessor::GetSignal)
+        //.def("GetSlot", &KTProcessor::GetSlot)
+
+        /* now protected */
+        //.def("ConnectSignalToSlot", &KTProcessor::ConnectSignalToSlot)
+
+        .def("GetDoBreakpoint", &KTProcessor::GetDoBreakpoint)
+        .def("SetDoBreakpoint", &KTProcessor::SetDoBreakpoint)
+
+        /* Inherited methods from unwrapped bases */
         .def("Configure", Configure_JsonStr, "Configure from json encoded configuration")
-        //.def("RegisterProcessor", &KTProcessor::RegisterProcessor, return_value_policy<manage_new_object>())
         ;
 }
 

From 7b63e69b90362228e1254c44da25f7e7a31be1b1 Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 12:42:28 -0700
Subject: [PATCH 026/521] update Processor Toolbox wrapper methods

---
 Library/Application/KTProcessorToolboxPy.hh | 29 ++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/Library/Application/KTProcessorToolboxPy.hh b/Library/Application/KTProcessorToolboxPy.hh
index 19404d5..f45e283 100644
--- a/Library/Application/KTProcessorToolboxPy.hh
+++ b/Library/Application/KTProcessorToolboxPy.hh
@@ -10,6 +10,7 @@
 #define KTPROCESSORTOOLBOXPY_HH_
 
 #include "KTProcessorToolbox.hh"
+#include "KTPythonMacros.hh"
 
 // Make connection overloads
    /* default values here? */
@@ -36,23 +37,29 @@ void export_ProcessorToolbox()
     using namespace Nymph;
     using namespace boost::python;
     class_<KTProcessorToolbox, boost::noncopyable>("KTProcessorToolbox", init<std::string>())
-        .def("Run", &KTProcessorToolbox::Run, "Call Run() on all processors in the run queue")
 
-        .def("GetProcessor", GetProcessor_wrap, return_value_policy<reference_existing_object>(), "Get a pointer to a processor in the toolbox")
+        // members related to configuration
         .def("ConfigureProcessors", ConfigureProcessors_JsonStr, "Configure processors from a json dictionary. Top-level keys are processor names, values are dictionaries with their configurations")
+        PROPERTYMEMBER(KTProcessorToolbox, RunSingleThreaded)
+
+
+        // Processor access
+        .def("GetProcessor", GetProcessor_wrap, return_value_policy<reference_existing_object>(), "Get a pointer to a processor in the toolbox")
         .def("AddProcessor", AddProcessor_Ref, "add a processor to the toolbox, toolbox takes ownership")
         .def("AddProcessor", AddProcessor_TypeStr, "add a processor to the toolbox, toolbox takes ownership")
         .def("RemoveProcessor", &KTProcessorToolbox::RemoveProcessor, "remove a processor from the toolbox")
-
-        //TODO: Not 100% certain that the reference count for this processor is now correct, given the return_value_policy
+        /* TODO: Not 100% certain that the reference count for this processor is now correct, given the return_value_policy */
         .def("ReleaseProcessor", &KTProcessorToolbox::ReleaseProcessor, return_value_policy<reference_existing_object>(), "Remove a processor from the toolbox and return it to the user, ownership is passed")
-
         .def("ClearProcessors", &KTProcessorToolbox::ClearProcessors, "Remove all processors and clear run queue")
 
-        // make signal-slot connection
+        // Processor connections
         .def("MakeConnection", MakeConnection_3args, "Make a signal-slot connection")
         .def("MakeConnection", MakeConnection_4args)
+        /* TODO use macro for arg counts?*/
+        //.def("SetBreakpoint", &KTProcessorToolbox::SetBreakpoint, "set breakpoint on a slot")
+        //.def("RemoveBreakpoint", &KTProcessorToolbox::RemoveBreakpoint, "remove breakpoint from a slot")
 
+        // Run Queue
         // Push new processor(s) to back of run queue
         .def("PushBackToRunQueue", PushBackToRunQueue_string, "Push processor(s) to the back of the run queue")
         .def("PushBackToRunQueue", PushBackToRunQueue_init_list)
@@ -61,6 +68,16 @@ void export_ProcessorToolbox()
         // Remove items from run queue
         .def("PopBackOfRunQueue", &KTProcessorToolbox::PopBackOfRunQueue, "Remove the last item in the run queue, whether it's a single processor or a group of processors")
         .def("ClearRunQueue", &KTProcessorToolbox::ClearRunQueue, "Clear the run queue")
+
+        // Run methods
+        .def("Run", &KTProcessorToolbox::Run, "Call Run() on all processors in the run queue")
+        .def("AsyncRun", &KTProcessorToolbox::AsyncRun, "Non-blocking call to Run()")
+        .def("WaitForContinue", &KTProcessorToolbox::WaitForContinue)
+        .def("WaitForBreak", &KTProcessorToolbox::WaitForBreak, "Resume execution until reaching next breakpoint")
+        .def("WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "Resume execution until reaching end of run, skipping breakpoints")
+        .def("Continue", &KTProcessorToolbox::Continue, "Resume runqueue execution")
+        .def("CancelThreads", &KTProcessorToolbox::CancelThreads)
+        .def("JoinRunThread", &KTProcessorToolbox::JoinRunThread)
         ;
 }
 

From f7b8b66fe818c4779eaacfc2adb36c18f172cd89 Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 14:32:11 -0700
Subject: [PATCH 027/521] new methods for breakpoints

---
 Library/Application/KTProcessorToolboxPy.hh | 26 +++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Library/Application/KTProcessorToolboxPy.hh b/Library/Application/KTProcessorToolboxPy.hh
index f45e283..20a260b 100644
--- a/Library/Application/KTProcessorToolboxPy.hh
+++ b/Library/Application/KTProcessorToolboxPy.hh
@@ -13,9 +13,19 @@
 #include "KTPythonMacros.hh"
 
 // Make connection overloads
-   /* default values here? */
-bool (Nymph::KTProcessorToolbox::*MakeConnection_3args)(const std::string&, const std::string&, int order) = &Nymph::KTProcessorToolbox::MakeConnection;
-bool (Nymph::KTProcessorToolbox::*MakeConnection_4args)(const std::string&, const std::string&, const std::string&, const std::string&, int order) = &Nymph::KTProcessorToolbox::MakeConnection;
+   /* need two macros to cover all signatures*/
+bool (Nymph::KTProcessorToolbox::*MakeConnection_2names)(const std::string&, const std::string&, int order) = &Nymph::KTProcessorToolbox::MakeConnection;
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(MakeConnection_2names_overloads, Nymph::KTProcessorToolbox::MakeConnection, 2, 3)
+bool (Nymph::KTProcessorToolbox::*MakeConnection_4names)(const std::string&, const std::string&, const std::string&, const std::string&, int order) = &Nymph::KTProcessorToolbox::MakeConnection;
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(MakeConnection_4names_overloads, Nymph::KTProcessorToolbox::MakeConnection, 4, 5)
+
+// Set and Remove breakpoint overloads
+bool (Nymph::KTProcessorToolbox::*SetBreakpoint_1arg)(const std::string&) = &Nymph::KTProcessorToolbox::SetBreakpoint;
+bool (Nymph::KTProcessorToolbox::*SetBreakpoint_2arg)(const std::string&, const std::string&) = &Nymph::KTProcessorToolbox::SetBreakpoint;
+bool (Nymph::KTProcessorToolbox::*RemoveBreakpoint_1arg)(const std::string&) = &Nymph::KTProcessorToolbox::RemoveBreakpoint;
+bool (Nymph::KTProcessorToolbox::*RemoveBreakpoint_2arg)(const std::string&, const std::string&) = &Nymph::KTProcessorToolbox::RemoveBreakpoint;
+//BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(SetBreakpoint_overloads, Nymph::KTProcessorToolbox::SetBreakpoint, 1, 2)
+//BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(RemoveBreakpoint_overloads, Nymph::KTProcessorToolbox::SetBreakpoint, 1, 2)
 
 // Run queue pushback overloads
 bool (Nymph::KTProcessorToolbox::*PushBackToRunQueue_string)(const std::string& name) = &Nymph::KTProcessorToolbox::PushBackToRunQueue;
@@ -53,11 +63,13 @@ void export_ProcessorToolbox()
         .def("ClearProcessors", &KTProcessorToolbox::ClearProcessors, "Remove all processors and clear run queue")
 
         // Processor connections
-        .def("MakeConnection", MakeConnection_3args, "Make a signal-slot connection")
-        .def("MakeConnection", MakeConnection_4args)
+        .def("MakeConnection", MakeConnection_2names, MakeConnection_2names_overloads())
+        .def("MakeConnection", MakeConnection_4names, MakeConnection_4names_overloads())
         /* TODO use macro for arg counts?*/
-        //.def("SetBreakpoint", &KTProcessorToolbox::SetBreakpoint, "set breakpoint on a slot")
-        //.def("RemoveBreakpoint", &KTProcessorToolbox::RemoveBreakpoint, "remove breakpoint from a slot")
+        .def("SetBreakpoint", SetBreakpoint_1arg, "add breakpoint to 'procName:slotName'")
+        .def("SetBreakpoint", SetBreakpoint_2arg, "add breakpoint to 'procName, slotName'")
+        .def("RemoveBreakpoint", RemoveBreakpoint_1arg, "add breakpoint to 'procName:slotName'")
+        .def("RemoveBreakpoint", RemoveBreakpoint_2arg, "add breakpoint to 'procName, slotName'")
 
         // Run Queue
         // Push new processor(s) to back of run queue

From 2cd822cd686d353d962e7aedb8fb31051e957aa2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 14:44:07 -0700
Subject: [PATCH 028/521] Attempts to improve parallel-running stability

---
 Library/Application/KTProcessorToolbox.cc | 6 ++++++
 Library/Application/KTProcessorToolbox.hh | 1 +
 Library/Processor/KTPrimaryProcessor.cc   | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index ca988bb..a6e6f52 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -789,6 +789,7 @@ namespace Nymph
                         bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                         do
                         {
+                            boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
                             //auto finishedFuturePtr = boost::wait_for_any( futureIndex.begin(), futureIndex.end() );
                             auto finishedFuturePtr = boost::wait_for_any( fThreadFutures.begin(), fThreadFutures.end() );
                             size_t iThread = finishedFuturePtr - fThreadFutures.begin();
@@ -798,9 +799,11 @@ namespace Nymph
                             if( fDoRunBreakFlag )
                             {
                                 // a breakpoint has been reached
+                                threadFuturesLock.unlock();
                                 KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
                                 continueSignal.wait();
                                 KTDEBUG( proclog, "Breakpoint finished" );
+                                boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
                                 stillRunning = true;
                                 continueSignal = fMasterContSignal; // refresh the local copy of the shared future
                             }
@@ -827,8 +830,10 @@ namespace Nymph
                             }
                         } while( stillRunning );
 
+                        KTDEBUG( proclog, "Joining threads" );
                         threads.join_all();
                         fThreadIndicators.clear();
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
                         fThreadFutures.clear();
                         fThreadNames.clear();
                     } // end for loop over the run-queue
@@ -897,6 +902,7 @@ namespace Nymph
     void KTProcessorToolbox::Continue()
     {
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
+        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
 
         // futures have been used; clear them to be replaced
         fThreadFutures.clear();
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 3cc488e..cb3c58f 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -257,6 +257,7 @@ namespace Nymph
 
             ThreadFutures fThreadFutures;
             ThreadNames fThreadNames;
+            boost::mutex fThreadFuturesMutex;
 
             typedef std::vector< std::shared_ptr< KTThreadIndicator > > ThreadIndicators;
             ThreadIndicators fThreadIndicators;
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index ce2e9f4..dda0ad4 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -31,9 +31,6 @@ namespace Nymph
     {
         fThreadRef = std::move( ref );
 
-        startedFlag = true;
-        startedCV.notify_all();
-
         // pass updated thread reference to downstream slots
         for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
         {
@@ -46,6 +43,9 @@ namespace Nymph
             }
         }
 
+        startedFlag = true;
+        startedCV.notify_all();
+
         // go!
         try
         {

From aff864efcc0dba75bba59172de9c4060db55342e Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 14:46:52 -0700
Subject: [PATCH 029/521] Cleanup

---
 Library/Application/KTProcessorToolbox.cc | 21 ---------------------
 Library/Application/KTProcessorToolbox.hh | 23 -----------------------
 2 files changed, 44 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index a6e6f52..9471780 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -615,14 +615,10 @@ namespace Nymph
 
                             KTThreadReference thisThreadRef;
 
-                            //fThreadFutures.get<1>().insert( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
-                            //fThreadFutures.push_back( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
                             fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
                             fThreadNames.push_back( procName );
                             //auto& futureNameIndex = fThreadFutures.get<1>();
 
-                            //auto thisFuturePtr = futureNameIndex.find( procName );
-                            //if( ! thisFuturePtr->fFuture.valid() )
                             if( ! fThreadFutures.back().valid() )
                             {
                                 KTERROR( proclog, "Invalid thread future created" );
@@ -640,7 +636,6 @@ namespace Nymph
                             boost::mutex threadStartedMutex;
                             bool threadStartedFlag = false;
 
-                            //boost::thread thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) );
                             boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
                             boost::thread thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ), threadStartedCV, threadStartedFlag ); } );
                             KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
@@ -658,7 +653,6 @@ namespace Nymph
                                 boost::future_status status;
                                 do
                                 {
-                                    //status = thisFuturePtr->fFuture.wait_for( std::chrono::milliseconds(500) );
                                     status = fThreadFutures.back().wait_for( boost::chrono::milliseconds(500) );
                                 } while (status != boost::future_status::ready);
 
@@ -675,7 +669,6 @@ namespace Nymph
                                 {
                                     try
                                     {
-                                        //futureNameIndex.modify( thisFuturePtr, [](LabeledFuture& lFuture){ lFuture.fFuture.get(); } );
                                         fThreadFutures.back().get();
                                         KTINFO( proclog, "Thread <" << fThreadNames.back() << "> has finished" );
                                         fThreadFutures.pop_back();
@@ -737,8 +730,6 @@ namespace Nymph
                     {
                         boost::thread_group threads;
 
-                        //auto& futureNameIndex = fThreadFutures.get<1>();
-
                         for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
                             std::string procName( tgIter->fName );
@@ -746,13 +737,9 @@ namespace Nymph
 
                             KTThreadReference thisThreadRef;
 
-                            //futureNameIndex.insert( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
-                            //fThreadFutures.push_back( LabeledFuture{ procName, thisThreadRef.fDataPtrRet.get_future() } );
                             fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
                             fThreadNames.push_back( procName );
 
-                            //auto thisFuturePtr = futureNameIndex.find( procName );
-                            //if( ! thisFuturePtr->fFuture.valid() )
                             if( ! fThreadFutures.back().valid() )
                             {
                                 KTERROR( proclog, "Invalid thread future created" );
@@ -770,7 +757,6 @@ namespace Nymph
                             boost::mutex threadStartedMutex;
                             bool threadStartedFlag = false;
 
-                            //threads.emplace_back( boost::thread( &KTPrimaryProcessor::operator(), tgIter->fProc, std::move( thisThreadRef ) ) );
                             boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
                             boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ), threadStartedCV, threadStartedFlag ); } );
                             KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
@@ -784,8 +770,6 @@ namespace Nymph
 
                         }// end for loop over the thread group
 
-                        //auto& futureIndex = fThreadFutures.get<0>();
-
                         bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                         do
                         {
@@ -861,11 +845,6 @@ namespace Nymph
         boost::shared_future< void > doRunFuture = fDoRunFuture;
 
         doRunFuture.wait();
-        //boost::future_status doRunStatus;
-        //do
-        //{
-        //    doRunStatus = doRunFuture.wait_for( boost::chrono::milliseconds( 500 ) );
-        //} while( doRunStatus != boost::future_status::ready );
 
         if( fDoRunBreakFlag )
         {
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index cb3c58f..3392a81 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -20,17 +20,11 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
-//#include <boost/multi_index_container.hpp>
-//#include <boost/multi_index/random_access_index.hpp>
-//#include <boost/multi_index/ordered_index.hpp>
-//#include <boost/multi_index/member.hpp>
-
 #include <deque>
 #include <initializer_list>
 #include <limits>
 #include <set>
 
-//namespace bmi = boost::multi_index;
 
 namespace Nymph
 {
@@ -231,29 +225,14 @@ namespace Nymph
             friend class KTThreadReference;
 
             typedef boost::unique_future< KTDataPtr > Future;
-            //typedef std::future< KTDataPtr > Future;
 
             // called from ThreadPacket::Break
             void InitiateBreak();
             // called from ThreadPacket::Break
             void TakeFuture( const std::string& name, Future&& future );
 
-            //struct LabeledFuture
-            //{
-            //    std::string fName;
-            //    std::future< KTDataPtr > fFuture;
-            //};
-            //typedef std::vector< LabeledFuture > ThreadFutures;
             typedef std::vector< Future > ThreadFutures;
             typedef std::vector< std::string > ThreadNames;
-            //typedef std::map< std::string, std::future< KTDataPtr > > ThreadFutures;
-            //typedef boost::multi_index_container<
-            //    LabeledFuture,
-            //    bmi::indexed_by<
-            //        bmi::random_access<>,
-            //        bmi::ordered_unique< bmi::member< KTProcessorToolbox::LabeledFuture, std::string, &KTProcessorToolbox::LabeledFuture::fName > >
-            //    >
-            //> ThreadFutures;
 
             ThreadFutures fThreadFutures;
             ThreadNames fThreadNames;
@@ -293,8 +272,6 @@ namespace Nymph
 
     inline void KTProcessorToolbox::TakeFuture( const std::string& name, Future&& future )
     {
-        //fThreadFutures.get<1>().insert( LabeledFuture{ name, std::move( future ) } );
-        //fThreadFutures.push_back( LabeledFuture{ name, std::move( future ) } );
         fThreadFutures.push_back( std::move( future ) );
         fThreadNames.push_back( name );
         return;

From 8f58f1b0bc27d92304b36dd79dbcae4291155b3f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 14:58:52 -0700
Subject: [PATCH 030/521] Added an interface to get data objects; compiles, but
 untested

---
 Library/Application/KTProcessorToolbox.cc | 25 +++++++++++++++++++++++
 Library/Application/KTProcessorToolbox.hh |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 9471780..199f1b8 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -913,6 +913,31 @@ namespace Nymph
         return;
     }
 
+    KTDataPtr KTProcessorToolbox::GetData( const std::string& threadName )
+    {
+        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+
+        auto tnIt = fThreadNames.begin();
+        for( ; tnIt != fThreadNames.end(); ++tnIt )
+        {
+            if( *tnIt == threadName ) break;
+        }
+        if( tnIt == fThreadNames.end() )
+        {
+            KTWARN( proclog, "Did not find thread <" << threadName << ">" );
+            throw KTException() << "Did not find thread <" << threadName << ">" ;
+        }
+
+        size_t iThread = tnIt - fThreadNames.begin();
+        if( iThread >= fThreadFutures.size() )
+        {
+            KTERROR( proclog, "Thread futures and thread names are unsynchronized" );
+            throw KTException() << "Thread futures and thread names are unsynchronized; found thread name <" << threadName << "> at position <" << iThread << ">, but there are only <" << fThreadFutures.size() << "> futures.";
+        }
+
+        return fThreadFutures[ iThread ].get();
+    }
+
     void KTProcessorToolbox::InitiateBreak()
     {
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 3392a81..14e57bc 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -221,6 +221,8 @@ namespace Nymph
 
             void JoinRunThread();
 
+            KTDataPtr GetData( const std::string& threadName );
+
         private:
             friend class KTThreadReference;
 

From d637af9f8617030bd337c34e9b49435ec9f7321c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 May 2017 15:43:25 -0700
Subject: [PATCH 031/521] Fixed mistaken inline marking

---
 Library/Processor/KTProcessor.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index 06fc429..b1ce746 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -131,7 +131,7 @@ namespace Nymph
         return iter->second;
     }
 
-    inline bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
+    bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
     {
         KTSlotWrapper* slot = GetSlot(slotName);
         if (slot != nullptr)

From 178d40b8cafcb82bae1619e5cccf8a03328c2233 Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 15:53:39 -0700
Subject: [PATCH 032/521] missing include (mac != linux)

---
 Executables/Validation/TestExceptionInSlot.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 033bd34..05b599a 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -11,6 +11,7 @@
 #include "KTLogger.hh"
 
 #include <thread>
+#include <atomic>
 
 using namespace Nymph;
 

From d5d2a2d4691505a42104e6da5f36510a35d80bf7 Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 16:39:12 -0700
Subject: [PATCH 033/521] update authors, toolbox interface update

---
 AUTHORS                                     |  2 ++
 Library/Application/KTProcessorToolboxPy.hh | 10 ++++++----
 Library/Processor/KTProcessor.cc            |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index e2b4c3e..9b85a75 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,8 +4,10 @@ Authors and Copyright Holders for Nymph
 Individuals
 -----------
 Noah S. Oblath [1]
+Benjamin H. LaRoque [2]
 
 
 Institutions
 ------------
 1. Pacific Northwest National Laboratory, Richland, WA
+2. University of California, Santa Barbara, CA
diff --git a/Library/Application/KTProcessorToolboxPy.hh b/Library/Application/KTProcessorToolboxPy.hh
index 20a260b..16dc109 100644
--- a/Library/Application/KTProcessorToolboxPy.hh
+++ b/Library/Application/KTProcessorToolboxPy.hh
@@ -85,11 +85,13 @@ void export_ProcessorToolbox()
         .def("Run", &KTProcessorToolbox::Run, "Call Run() on all processors in the run queue")
         .def("AsyncRun", &KTProcessorToolbox::AsyncRun, "Non-blocking call to Run()")
         .def("WaitForContinue", &KTProcessorToolbox::WaitForContinue)
-        .def("WaitForBreak", &KTProcessorToolbox::WaitForBreak, "Resume execution until reaching next breakpoint")
-        .def("WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "Resume execution until reaching end of run, skipping breakpoints")
-        .def("Continue", &KTProcessorToolbox::Continue, "Resume runqueue execution")
-        .def("CancelThreads", &KTProcessorToolbox::CancelThreads)
+        .def("WaitForBreak", &KTProcessorToolbox::WaitForBreak, "blocking call that waits until a breakpoint is reached, you must manually Continue()")
+        .def("WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "blocking call to Continue() execution until end of run is reached, you must manually Continue()")
+        .def("Continue", &KTProcessorToolbox::Continue, "non-blocking call to resume execution")
+        .def("CancelThreads", &KTProcessorToolbox::CancelThreads, "kill any running thread at the next breakpoint check")
         .def("JoinRunThread", &KTProcessorToolbox::JoinRunThread)
+
+        .def("GetData", &KTProcessorToolbox::GetData)
         ;
 }
 
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index 06fc429..b1ce746 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -131,7 +131,7 @@ namespace Nymph
         return iter->second;
     }
 
-    inline bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
+    bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
     {
         KTSlotWrapper* slot = GetSlot(slotName);
         if (slot != nullptr)

From 6bcf5f9419660eb5fb172df51bed71709bde6d77 Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 16:39:28 -0700
Subject: [PATCH 034/521] using boost in exception test program

---
 Executables/Validation/TestExceptionInSlot.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 05b599a..1fe808d 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -10,7 +10,7 @@
 #include "KTTestProcessor.hh"
 #include "KTLogger.hh"
 
-#include <thread>
+#include <boost/thread.hpp>
 #include <atomic>
 
 using namespace Nymph;
@@ -44,7 +44,7 @@ int main()
     auto exeFunc = [&]() {
         try
         {
-            std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
+            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
 
             KTINFO( testexclog, "Emitting signals" );
 
@@ -52,7 +52,7 @@ int main()
             KTINFO( testexclog, "First test signal: 5" );
             tpA.EmitSignals( 5 );
 
-            std::this_thread::sleep_for( std::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
+            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
 
             if( canceled.load() ) return;
             KTINFO( testexclog, "Second test signal: 18" );
@@ -67,7 +67,7 @@ int main()
     };
 
     // run the thread
-    std::thread thread( exeFunc );
+    boost::thread thread( exeFunc );
 
     // wait for a result to be set
     exeThreadFuture.wait();

From 1ec7c5460daa5ddd1685fd387e153c135c33e8ed Mon Sep 17 00:00:00 2001
From: Ben LaRoque <benjamin.laroque@gmail.com>
Date: Tue, 9 May 2017 16:40:10 -0700
Subject: [PATCH 035/521] Scarab changes

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 953b806..409659a 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 953b806ee1e1c675e977e7285cc258f231eb88df
+Subproject commit 409659a19eccd1e871e6b17b2af62e65a7e78c6c

From 8b15896d557ecf5951cf628348265ce5770ade67 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 10 May 2017 12:03:38 -0700
Subject: [PATCH 036/521] Protect KTProcessorToolbox::WaitForBreak() and
 Continue() against out-of-sequence calls. Handle exceptions that can now be
 thrown by WaitForBreak().

---
 .../TestProcessorToolbox2Threads.cc           | 155 +++++++++---------
 .../TestProcessorToolboxMultithreaded.cc      |  97 ++++++-----
 .../TestProcessorToolboxSinglethreaded.cc     |  96 ++++++-----
 Library/Application/KTProcessorToolbox.cc     |  43 +++--
 4 files changed, 218 insertions(+), 173 deletions(-)

diff --git a/Executables/Validation/TestProcessorToolbox2Threads.cc b/Executables/Validation/TestProcessorToolbox2Threads.cc
index c45a573..d92960f 100644
--- a/Executables/Validation/TestProcessorToolbox2Threads.cc
+++ b/Executables/Validation/TestProcessorToolbox2Threads.cc
@@ -15,93 +15,100 @@ KTLOGGER( testptlog, "TestProcessorToolbox" )
 
 int main()
 {
-    KTINFO( testptlog, "Preparing to run" );
-
-    KTProcessorToolbox ptb;
-
-    // add the primary processor, thread 1
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
-        return -1;
-    }
-
-    // add processor b, thread 1
-    if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
+    try
     {
-        KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
-        return -1;
-    }
+        KTINFO( testptlog, "Preparing to run" );
 
-    // add the primary processor, thread 2
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
-        return -1;
-    }
+        KTProcessorToolbox ptb;
 
-    // add processor b, thread 2
-    if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
-    {
-        KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
-        return -1;
-    }
-
-    // set breakpoint, thread 1
-    if( ! ptb.SetBreakpoint( "tp1", "first-slot" ) )
-    {
-        KTERROR( testptlog, "Unable to set the breakpoint" );
-        return -1;
-    }
+        // add the primary processor, thread 1
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
+            return -1;
+        }
 
-    // no breakpoint, thread2
+        // add processor b, thread 1
+        if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
+            return -1;
+        }
 
-    // make connections, thread 1
-    if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
-    {
-        KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
-        return -1;
-    }
+        // add the primary processor, thread 2
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
+            return -1;
+        }
 
-    // make connections, thread 2
-    if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:second-slot" ) )
-    {
-        KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
-        return -1;
-    }
+        // add processor b, thread 2
+        if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
+            return -1;
+        }
 
-    // set the run queue
-    if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
-    {
-        KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
-        return -1;
-    }
+        // set breakpoint, thread 1
+        if( ! ptb.SetBreakpoint( "tp1", "first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to set the breakpoint" );
+            return -1;
+        }
 
-    // go!
-    KTINFO( testptlog, "Starting asynchronous run" );
-    ptb.AsyncRun();
+        // no breakpoint, thread2
 
-    KTINFO( testptlog, "Starting asynchronous breakpoint user" );
-    auto buFuture = boost::async( boost::launch::async, [&](){
-        KTINFO( testptlog, "In breakpoint user thread" );
-        while( ptb.WaitForBreak() )
+        // make connections, thread 1
+        if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
         {
-            KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
-            std::string temp;
-            KTPROG( testptlog, "Please press [return]" );
-            getline( std::cin, temp );
-            ptb.Continue();
+            KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
+            return -1;
         }
-        KTINFO( testptlog, "Finished breakpoint user thread" );
-        return;
-    });
-
-    KTINFO( testptlog, "Waiting for the end of the run" );
-    ptb.WaitForEndOfRun();
 
-    KTINFO( testptlog, "Processing complete" );
+        // make connections, thread 2
+        if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:second-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
+            return -1;
+        }
 
-    KTINFO( testptlog, "Tests complete" );
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
+        {
+            KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
+            return -1;
+        }
 
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        KTINFO( testptlog, "Starting asynchronous breakpoint user" );
+        auto buFuture = boost::async( boost::launch::async, [&](){
+            KTINFO( testptlog, "In breakpoint user thread" );
+            while( ptb.WaitForBreak() )
+            {
+                KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
+                std::string temp;
+                KTPROG( testptlog, "Please press [return]" );
+                getline( std::cin, temp );
+                ptb.Continue();
+            }
+            KTINFO( testptlog, "Finished breakpoint user thread" );
+            return;
+        });
+
+        KTINFO( testptlog, "Waiting for the end of the run" );
+        ptb.WaitForEndOfRun();
+
+        KTINFO( testptlog, "Processing complete" );
+
+        KTINFO( testptlog, "Tests complete" );
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << e.what() );
+        return -1;
+    }
     return 0;
 }
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
index 29848fc..d71b5ab 100644
--- a/Executables/Validation/TestProcessorToolboxMultithreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
@@ -15,55 +15,62 @@ KTLOGGER( testptlog, "TestProcessorToolboxMultithreaded" )
 
 int main()
 {
-    KTINFO( testptlog, "Preparing to run" );
-
-    KTProcessorToolbox ptb;
-
-    // set for multi-threaded running
-    ptb.SetRunSingleThreaded( false );
-
-    // add the primary processor
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor" );
-        return -1;
-    }
-
-    // add processor b
-    if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
-    {
-        KTERROR( testptlog, "Unable to create test processor b" );
-        return -1;
-    }
-
-    // make connections
-    if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+    try
     {
-        KTERROR( testptlog, "Unable to connect tpp to tp" );
-        return -1;
+        KTINFO( testptlog, "Preparing to run" );
+
+        KTProcessorToolbox ptb;
+
+        // set for multi-threaded running
+        ptb.SetRunSingleThreaded( false );
+
+        // add the primary processor
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor" );
+            return -1;
+        }
+
+        // add processor b
+        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b" );
+            return -1;
+        }
+
+        // make connections
+        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp to tp" );
+            return -1;
+        }
+
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to add tpp to the run queue" );
+            return -1;
+        }
+
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        // wait for run completion, and ignore breakpoints
+        while( ptb.WaitForBreak() )
+        {
+            KTINFO( testptlog, "Reached breakpoint; continuing" );
+            ptb.Continue();
+        }
+
+        KTINFO( testptlog, "Processing complete" );
+
+        KTINFO( testptlog, "Tests complete" );
     }
-
-    // set the run queue
-    if( ! ptb.PushBackToRunQueue( "tpp" ) )
+    catch( std::exception& e )
     {
-        KTERROR( testptlog, "Unable to add tpp to the run queue" );
+        KTERROR( testptlog, "Exception caught: " << e.what() );
         return -1;
     }
-
-    // go!
-    KTINFO( testptlog, "Starting asynchronous run" );
-    ptb.AsyncRun();
-
-    // wait for run completion, and ignore breakpoints
-    while( ptb.WaitForBreak() )
-    {
-        KTINFO( testptlog, "Reached breakpoint; continuing" );
-        ptb.Continue();
-    }
-
-    KTINFO( testptlog, "Processing complete" );
-
-    KTINFO( testptlog, "Tests complete" );
-
     return 0;
 }
diff --git a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
index b0c1ca7..56a73db 100644
--- a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
@@ -15,55 +15,63 @@ KTLOGGER( testptlog, "TestProcessorToolboxSinglethreaded" )
 
 int main()
 {
-    KTINFO( testptlog, "Preparing to run" );
-
-    KTProcessorToolbox ptb;
-
-    // set for single-threaded running
-    ptb.SetRunSingleThreaded( true );
-
-    // add the primary processor
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor" );
-        return -1;
-    }
-
-    // add processor b
-    if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+    try
     {
-        KTERROR( testptlog, "Unable to create test processor b" );
-        return -1;
+        KTINFO( testptlog, "Preparing to run" );
+
+        KTProcessorToolbox ptb;
+
+        // set for single-threaded running
+        ptb.SetRunSingleThreaded( true );
+
+        // add the primary processor
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor" );
+            return -1;
+        }
+
+        // add processor b
+        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b" );
+            return -1;
+        }
+
+        // make connections
+        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp to tp" );
+            return -1;
+        }
+
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to add tpp to the run queue" );
+            return -1;
+        }
+
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        // wait for run completion, and ignore breakpoints
+        while( ptb.WaitForBreak() )
+        {
+            KTINFO( testptlog, "Reached breakpoint; continuing" );
+            ptb.Continue();
+        }
+
+        KTINFO( testptlog, "Processing complete" );
+
+        KTINFO( testptlog, "Tests complete" );
     }
-
-    // make connections
-    if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+    catch( std::exception& e )
     {
-        KTERROR( testptlog, "Unable to connect tpp to tp" );
+        KTERROR( testptlog, "Exception caught: " << e.what() );
         return -1;
     }
 
-    // set the run queue
-    if( ! ptb.PushBackToRunQueue( "tpp" ) )
-    {
-        KTERROR( testptlog, "Unable to add tpp to the run queue" );
-        return -1;
-    }
-
-    // go!
-    KTINFO( testptlog, "Starting asynchronous run" );
-    ptb.AsyncRun();
-
-    // wait for run completion, and ignore breakpoints
-    while( ptb.WaitForBreak() )
-    {
-        KTINFO( testptlog, "Reached breakpoint; continuing" );
-        ptb.Continue();
-    }
-
-    KTINFO( testptlog, "Processing complete" );
-
-    KTINFO( testptlog, "Tests complete" );
-
     return 0;
 }
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 199f1b8..6fc3973 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -843,6 +843,10 @@ namespace Nymph
     bool KTProcessorToolbox::WaitForBreak()
     {
         boost::shared_future< void > doRunFuture = fDoRunFuture;
+        if( ! doRunFuture.valid() )
+        {
+            throw KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)";
+        }
 
         doRunFuture.wait();
 
@@ -867,19 +871,32 @@ namespace Nymph
 
     void KTProcessorToolbox::WaitForEndOfRun()
     {
-        KTDEBUG( proclog, "Waiting for end-of-run" );
-        while( WaitForBreak() )
+        try
+        {
+            KTDEBUG( proclog, "Waiting for end-of-run" );
+            while( WaitForBreak() )
+            {
+                KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+                WaitForContinue();
+                KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+            }
+            KTDEBUG( proclog, "End-of-run reached" );
+        }
+        catch( std::exception& e )
         {
-            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            WaitForContinue();
-            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+            throw;
         }
-        KTDEBUG( proclog, "End-of-run reached" );
         return;
     }
 
     void KTProcessorToolbox::Continue()
     {
+        if( ! fDoRunBreakFlag )
+        {
+            KTWARN( proclog, "Not currently at a breakpoint" );
+            return;
+        }
+
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
         boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
 
@@ -969,12 +986,18 @@ namespace Nymph
 
     bool KTProcessorToolbox::Run()
     {
-        AsyncRun();
-
-        WaitForEndOfRun();
+        try
+        {
+            AsyncRun();
 
-        JoinRunThread();
+            WaitForEndOfRun();
 
+            JoinRunThread();
+        }
+        catch( std::exception& e )
+        {
+            throw;
+        }
         return true;
     }
 

From a0f9dc1d71c76398e9f768da407542524a285d67 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 10 May 2017 14:01:10 -0700
Subject: [PATCH 037/521] Function initializations fixed in KTThreadReference;
 Switch to using shared_futures everywhere (seems to improve stability a
 little); Added generic function to pass work amongst connected processors.

---
 Library/Application/KTProcessorToolbox.hh |  2 +-
 Library/Processor/KTProcessor.cc          | 20 +++--------------
 Library/Processor/KTProcessor.hh          | 26 +++++++++++++++++++++++
 Library/Processor/KTThreadReference.cc    |  6 +++---
 Library/Processor/KTThreadReference.hh    |  2 +-
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 14e57bc..f9bc967 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -226,7 +226,7 @@ namespace Nymph
         private:
             friend class KTThreadReference;
 
-            typedef boost::unique_future< KTDataPtr > Future;
+            typedef boost::shared_future< KTDataPtr > Future;
 
             // called from ThreadPacket::Break
             void InitiateBreak();
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index b1ce746..cee44ed 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -47,23 +47,9 @@ namespace Nymph
 
     void KTProcessor::PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef)
     {
-        // update the thread reference pointer for this slot
-        GetSlot(slotName)->SetThreadRef(threadRef);
-
-        // get the list of slot-to-signal connections for this slot
-        auto stsRange = fSlotToSigMap.equal_range(slotName);
-
-        // loop over signals called in the performance of slot slotName
-        for (SlotToSigMapCIt stsIt = stsRange.first; stsIt != stsRange.second; ++stsIt)
-        {
-            // loop over all processor:slots called by this signal
-            auto sigConnRange = fSigConnMap.equal_range(stsIt->second);
-            for (SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt)
-            {
-                // pass the update on to the connected-to processor
-                sigConnIt->second.first->PassThreadRefUpdate(sigConnIt->second.second, threadRef);
-            }
-        }
+        std::function< void(KTThreadReference*) > funcObj = [this, &slotName](KTThreadReference* ref){ GetSlot(slotName)->SetThreadRef(ref); };
+        PassToConnProcs(slotName, funcObj, threadRef);
+        return;
     }
 
     void KTProcessor::ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum)
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 49d1bd3..735c863 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -87,6 +87,9 @@ namespace Nymph
             void SetDoBreakpoint(const std::string& slotName, bool flag);
 
         protected:
+            template< typename XReturn, typename... XArgs >
+            void PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args);
+
             void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
 
             SignalMap fSignalMap;
@@ -134,6 +137,29 @@ namespace Nymph
         return;
     }
 
+    template< typename XReturn, typename... XArgs >
+    void KTProcessor::PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args)
+    {
+        // update this slot
+        function(args...);
+
+        // get the list of slot-to-signal connections for this slot
+        auto stsRange = fSlotToSigMap.equal_range(slotName);
+
+        // loop over signals called in the performance of slot slotName
+        for (SlotToSigMapCIt stsIt = stsRange.first; stsIt != stsRange.second; ++stsIt)
+        {
+            // loop over all processor:slots called by this signal
+            auto sigConnRange = fSigConnMap.equal_range(stsIt->second);
+            for (SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt)
+            {
+                // pass the update on to the connected-to processor
+                sigConnIt->second.first->PassToConnProcs(sigConnIt->second.second, function, args...);
+            }
+        }
+        return;
+    }
+
     template< class XDerivedProc >
     scarab::registrar< KTProcessor, XDerivedProc, const std::string& >* KTProcessor::RegisterProcessor( const std::string& name )
     {
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index 1309bf0..f439320 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -21,8 +21,8 @@ namespace Nymph
 
     KTThreadReference::KTThreadReference() :
             fDataPtrRet(),
-            fInitiateBreakFunc(),
-            fRefreshFutureFunc(),
+            fInitiateBreakFunc( [](){return;} ),
+            fRefreshFutureFunc( [](const std::string&, boost::shared_future< KTDataPtr >&&){return;} ),
             fThreadIndicator( new KTThreadIndicator() ),
             fPrimaryProcName()
     {}
@@ -67,7 +67,7 @@ namespace Nymph
             // reset the promise
             fDataPtrRet = KTDataPtrReturn();
             // pass the future back to the processor toolbox (if it's in use)
-            fRefreshFutureFunc( fPrimaryProcName, std::move( fDataPtrRet.get_future() ) );
+            fRefreshFutureFunc( fPrimaryProcName, std::move( fDataPtrRet.get_future().share() ) );
         }
         return;
     }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 3f90f74..c77a175 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -28,7 +28,7 @@ namespace Nymph
     {
         KTDataPtrReturn fDataPtrRet;
         std::function< void() > fInitiateBreakFunc;
-        std::function< void(const std::string&, boost::unique_future< KTDataPtr >&&) > fRefreshFutureFunc;
+        std::function< void(const std::string&, boost::shared_future< KTDataPtr >&&) > fRefreshFutureFunc;
         std::shared_ptr< KTThreadIndicator > fThreadIndicator;
         std::string fPrimaryProcName;
 

From c6e97253ef3ee590260a6cfd11d5755db641d886 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 May 2017 16:30:21 -0700
Subject: [PATCH 038/521] =?UTF-8?q?Adaptations=20for=20scarab2=E2=80=99s?=
 =?UTF-8?q?=20new=20param=20interface?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Executables/Validation/TestApplication.cc   |  8 +---
 Library/Application/KTApplication.cc        | 24 +++++------
 Library/Application/KTApplication.hh        |  2 +-
 Library/Application/KTCommandLineHandler.cc | 12 +++---
 Library/Application/KTConfigurator.cc       | 16 --------
 Library/Application/KTConfigurator.hh       | 42 ++++++++++++++++----
 Library/Application/KTProcessorToolbox.cc   | 44 +++++++++------------
 Library/Application/KTRunNymph.cc           | 12 +++---
 Library/Utility/KTConfigurable.cc           |  3 +-
 Scarab                                      |  2 +-
 10 files changed, 81 insertions(+), 84 deletions(-)

diff --git a/Executables/Validation/TestApplication.cc b/Executables/Validation/TestApplication.cc
index cd8759d..810fada 100644
--- a/Executables/Validation/TestApplication.cc
+++ b/Executables/Validation/TestApplication.cc
@@ -82,13 +82,9 @@ int main(int argc, char** argv)
 
     KTTestConfigurable* testObj = new KTTestConfigurable();
 
-    const scarab::param_node* topNode = app->GetConfigurator()->Config();
-    if (topNode == NULL)
-    {
-        KTWARN(testapplog, "Top-level node <" << testObj->GetConfigName() << "> was not found");
-    }
+    const scarab::param_node& topNode = app->GetConfigurator()->Config();
 
-    if (testObj->Configure(topNode->node_at(testObj->GetConfigName())))
+    if (testObj->Configure(&topNode.node_at(testObj->GetConfigName())))
     {
         KTINFO(testapplog, "Configuration complete:\n"
                 << "\tInt data: " << testObj->GetIntData() << '\n'
diff --git a/Library/Application/KTApplication.cc b/Library/Application/KTApplication.cc
index 3dff6d0..0dca130 100644
--- a/Library/Application/KTApplication.cc
+++ b/Library/Application/KTApplication.cc
@@ -99,7 +99,7 @@ namespace Nymph
             fConfigurator->Merge( *clConfigOverride );
         }
 
-        KTINFO( applog, "Final configuration:\n" << *(fConfigurator->Config()) );
+        KTINFO( applog, "Final configuration:\n" << fConfigurator->Config() );
 
         AddConfigOptionsToCLHandler(fConfigurator->Config(), "");
         fCLHandler->FinalizeNewOptionGroups();
@@ -122,37 +122,37 @@ namespace Nymph
         }
     }
 
-    void KTApplication::AddConfigOptionsToCLHandler(const scarab::param* param, const std::string& rootName)
+    void KTApplication::AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName)
     {
-    	if (param->is_null())
+    	if (param.is_null())
     	{
     		fCLHandler->AddOption("Config File Options", "Configuration flag: " + rootName, rootName, false);
     	}
-    	else if (param->is_value())
+    	else if (param.is_value())
     	{
     		fCLHandler->AddOption< string >("Config File Options", "Configuration value: " + rootName, rootName, false);
     	}
-    	else if (param->is_array())
+    	else if (param.is_array())
     	{
         	string nextRootName(rootName);
         	if (! rootName.empty() && rootName.back() != '.') nextRootName += ".";
 
-        	const scarab::param_array* paramArray = &param->as_array();
-    		unsigned arraySize = paramArray->size();
+        	const scarab::param_array& paramArray = param.as_array();
+    		unsigned arraySize = paramArray.size();
     		for (unsigned iParam = 0; iParam < arraySize; ++iParam)
     		{
-    			AddConfigOptionsToCLHandler(paramArray->at(iParam), nextRootName + std::to_string(iParam));
+    			AddConfigOptionsToCLHandler(paramArray.at(iParam), nextRootName + std::to_string(iParam));
     		}
     	}
-    	else if (param->is_node())
+    	else if (param.is_node())
     	{
         	string nextRootName(rootName);
         	if (! rootName.empty()) nextRootName += ".";
 
-        	const scarab::param_node* paramNode = &param->as_node();
-    		for (scarab::param_node::const_iterator nodeIt = paramNode->begin(); nodeIt != paramNode->end(); ++nodeIt)
+        	const scarab::param_node& paramNode = param.as_node();
+    		for (scarab::param_node::const_iterator nodeIt = paramNode.begin(); nodeIt != paramNode.end(); ++nodeIt)
     		{
-    			AddConfigOptionsToCLHandler(nodeIt->second, nextRootName + nodeIt->first);
+    			AddConfigOptionsToCLHandler(*nodeIt->second, nextRootName + nodeIt->first);
     		}
     	}
 
diff --git a/Library/Application/KTApplication.hh b/Library/Application/KTApplication.hh
index c0c2ddf..677bbbc 100644
--- a/Library/Application/KTApplication.hh
+++ b/Library/Application/KTApplication.hh
@@ -62,7 +62,7 @@ namespace Nymph
             virtual ~KTApplication();
 
         private:
-            void AddConfigOptionsToCLHandler(const scarab::param* param, const std::string& rootName);
+            void AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName);
 
         public:
             virtual bool Configure(const scarab::param_node* node);
diff --git a/Library/Application/KTCommandLineHandler.cc b/Library/Application/KTCommandLineHandler.cc
index 8f8b073..40ea9fc 100644
--- a/Library/Application/KTCommandLineHandler.cc
+++ b/Library/Application/KTCommandLineHandler.cc
@@ -273,19 +273,19 @@ namespace Nymph
 
                 size_t t_node_start_pos = 0;
                 size_t t_node_sep_pos = t_full_name.find_first_of( fNodeSeparator );
-                scarab::param_node* parentNode = &fConfigOverrideValues;
+                scarab::param_node& parentNode = fConfigOverrideValues;
                 while (t_node_sep_pos != string::npos)
                 {
                     string nodeName(t_full_name.substr(t_node_start_pos, t_node_sep_pos));
-                    if (parentNode->has(nodeName))
+                    if (parentNode.has(nodeName))
                     {
-                        parentNode = parentNode->node_at(nodeName);
+                        parentNode = parentNode.node_at(nodeName);
                     }
                     else
                     {
                         scarab::param_node* newChildNode = new scarab::param_node();
-                        parentNode->add(nodeName, newChildNode);
-                        parentNode = newChildNode;
+                        parentNode.add(nodeName, newChildNode);
+                        parentNode = *newChildNode;
                     }
                     t_node_start_pos = t_node_sep_pos + 1;
                     t_node_sep_pos = t_full_name.find_first_of(fNodeSeparator, t_node_start_pos);
@@ -298,7 +298,7 @@ namespace Nymph
 
                 //std::cout << "(parser) adding < " << t_name << "<" << t_type << "> > = <" << new_value.value() << ">" << std::endl;
 
-                parentNode->replace( valueName, new_value );
+                parentNode.replace( valueName, new_value );
 
                 continue;
             }
diff --git a/Library/Application/KTConfigurator.cc b/Library/Application/KTConfigurator.cc
index e1f8ba2..0c5ae12 100644
--- a/Library/Application/KTConfigurator.cc
+++ b/Library/Application/KTConfigurator.cc
@@ -27,20 +27,4 @@ namespace Nymph
         delete fMasterConfig;
     }
 
-    void KTConfigurator::Merge(const scarab::param_node& aNode)
-    {
-        fMasterConfig->merge(aNode);
-        return;
-    }
-
-    scarab::param_node* KTConfigurator::Config()
-    {
-        return fMasterConfig;
-    }
-
-    const scarab::param_node* KTConfigurator::Config() const
-    {
-        return fMasterConfig;
-    }
-
 } /* namespace Nymph */
diff --git a/Library/Application/KTConfigurator.hh b/Library/Application/KTConfigurator.hh
index 92d8ffa..d38872f 100644
--- a/Library/Application/KTConfigurator.hh
+++ b/Library/Application/KTConfigurator.hh
@@ -30,8 +30,8 @@ namespace Nymph
         public:
             void Merge(const scarab::param_node& aNode);
 
-            scarab::param_node* Config();
-            const scarab::param_node* Config() const;
+            scarab::param_node& Config();
+            const scarab::param_node& Config() const;
 
             template< typename XReturnType >
             XReturnType Get( const std::string& aName ) const;
@@ -50,26 +50,52 @@ namespace Nymph
     template< typename XReturnType >
     XReturnType KTConfigurator::Get( const std::string& aName ) const
     {
-        fParamBuffer = const_cast< scarab::param* >( fMasterConfig->at( aName ) );
-        if( fParamBuffer != NULL && fParamBuffer->is_value() )
+        try
         {
-            return fParamBuffer->as_value().get< XReturnType >();
+            fParamBuffer = &const_cast< scarab::param& >( fMasterConfig->at( aName ) );
+            if( fParamBuffer->is_value() )
+            {
+                return fParamBuffer->as_value().get< XReturnType >();
+            }
         }
+        catch( std::exception& e )
+        {}
         throw KTException() << "configurator does not have a value for <" << aName << ">";
     }
 
     template< typename XReturnType >
     XReturnType KTConfigurator::Get( const std::string& aName, XReturnType aDefault ) const
     {
-        fParamBuffer = const_cast< scarab::param* >( fMasterConfig->at( aName ) );
-        if( fParamBuffer != NULL && fParamBuffer->is_value() )
+        try
         {
-            return fParamBuffer->as_value().get< XReturnType >();
+            fParamBuffer = &const_cast< scarab::param& >( fMasterConfig->at( aName ) );
+            if( fParamBuffer->is_value() )
+            {
+                return fParamBuffer->as_value().get< XReturnType >();
+            }
         }
+        catch( std::exception& e )
+        {}
         return aDefault;
+    }
 
+    inline void KTConfigurator::Merge(const scarab::param_node& aNode)
+    {
+        fMasterConfig->merge(aNode);
+        return;
+    }
+
+    inline scarab::param_node& KTConfigurator::Config()
+    {
+        return *fMasterConfig;
     }
 
+    inline const scarab::param_node& KTConfigurator::Config() const
+    {
+        return *fMasterConfig;
+    }
+
+
 
 } /* namespace Nymph */
 #endif /* KTCONFIGURATOR_HH_ */
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 6fc3973..a29e8f6 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -57,14 +57,14 @@ namespace Nymph
         SetRunSingleThreaded( node->get_value( "single-threaded", fRunSingleThreaded ) );
 
         // Deal with "processor" blocks
-        const scarab::param_array* procArray = node->array_at( "processors" );
-        if (procArray == NULL)
+        if (! node->has("processors"))
         {
             KTWARN(proclog, "No processors were specified");
         }
         else
         {
-            for( scarab::param_array::const_iterator procIt = procArray->begin(); procIt != procArray->end(); ++procIt )
+            const scarab::param_array& procArray = node->array_at( "processors" );
+            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
             {
                 if( ! (*procIt)->is_node() )
                 {
@@ -108,14 +108,14 @@ namespace Nymph
 
 
         // Then deal with connections"
-        const scarab::param_array* connArray = node->array_at( "connections" );
-        if (connArray == NULL)
+        if (! node->has("connections"))
         {
             KTWARN(proclog, "No connections were specified");
         }
         else
         {
-            for( scarab::param_array::const_iterator connIt = connArray->begin(); connIt != connArray->end(); ++connIt )
+            const scarab::param_array& connArray = node->array_at( "connections" );
+            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
             {
                 if( ! (*connIt)->is_node() )
                 {
@@ -180,14 +180,14 @@ namespace Nymph
         // The run queue is an array of processor names, or groups of names, which will be run sequentially.
         // If names are grouped (in another array), those in that group will be run in parallel.
         // In single threaded mode all threads will be run sequentially in the order they were specified.
-        const scarab::param_array* rqArray = node->array_at( "run-queue" );
-        if (rqArray == NULL)
+        if (! node->has("run-queue"))
         {
             KTWARN(proclog, "Run queue was not specified");
         }
         else
         {
-            for (scarab::param_array::const_iterator rqIt = rqArray->begin(); rqIt != rqArray->end(); ++rqIt)
+            const scarab::param_array& rqArray = node->array_at( "run-queue" );
+            for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
             {
                 if ((*rqIt)->is_value())
                 {
@@ -235,29 +235,21 @@ namespace Nymph
         {
             KTDEBUG(proclog, "Attempting to configure processor <" << iter->first << ">");
             string procName = iter->first;
-            string nameUsed;
-            const scarab::param_node* subNode = node->node_at(procName);
-            if (subNode == NULL)
+            string nameUsed(procName);
+            if (! node->has(nameUsed))
             {
-                string configName = iter->second.fProc->GetConfigName();
-                KTWARN(proclog, "Did not find a parameter node <" << procName << ">\n"
-                        "\tWill check using the generic name of the processor, <" << configName << ">.");
-                subNode = node->node_at(configName);
-                if (subNode == NULL)
+                nameUsed = iter->second.fProc->GetConfigName();
+                if (! node->has(nameUsed))
                 {
-                    KTWARN(proclog, "Did not find a parameter node <" << configName << ">\n"
-                            "\tProcessor <" << iter->first << "> was not configured.");
+                    KTWARN(proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
+                            "\tProcessor <" << procName << "> was not configured.");
                     continue;
                 }
-                nameUsed = configName;
             }
-            else
-            {
-                nameUsed = procName;
-            }
-            if (! iter->second.fProc->Configure(subNode))
+            const scarab::param_node& subNode = node->node_at(nameUsed);
+            if (! iter->second.fProc->Configure(&subNode))
             {
-                KTERROR(proclog, "An error occurred while configuring processor <" << iter->first << "> with parameter node <" << nameUsed << ">");
+                KTERROR(proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">");
                 return false;
             }
         }
diff --git a/Library/Application/KTRunNymph.cc b/Library/Application/KTRunNymph.cc
index 7888242..4f7ea90 100644
--- a/Library/Application/KTRunNymph.cc
+++ b/Library/Application/KTRunNymph.cc
@@ -21,9 +21,9 @@ namespace Nymph
     {
         try
         {
-            const scarab::param_node* parentConfigNode = app->GetConfigurator()->Config();
+            const scarab::param_node& parentConfigNode = app->GetConfigurator()->Config();
 
-            if (! app->Configure(parentConfigNode->node_at(app->GetConfigName())))
+            if( ! app->Configure(&parentConfigNode.node_at(app->GetConfigName() ) ) )
             {
                 KTERROR( nlog, "Unable to configure the application. Aborting.");
                 return -2;
@@ -33,16 +33,16 @@ namespace Nymph
             // This will create all of the requested processors, connect their signals and slots, and fill the run queue.
             KTProcessorToolbox procTB;
 
-            if ( ! procTB.Configure( parentConfigNode->node_at( procTB.GetConfigName() ) ) )
+            if ( ! procTB.Configure( &parentConfigNode.node_at( procTB.GetConfigName() ) ) )
             {
-                KTERROR( nlog, "Unable to configure processor toolbox. Aborting.");
+                KTERROR( nlog, "Unable to configure processor toolbox. Aborting." );
                 return -3;
             }
 
             // Configure the processors
-            if ( ! procTB.ConfigureProcessors( parentConfigNode ) )
+            if ( ! procTB.ConfigureProcessors( &parentConfigNode ) )
             {
-                KTERROR( nlog, "Unable to configure processors. Aborting.");
+                KTERROR( nlog, "Unable to configure processors. Aborting." );
                 return -4;
             }
 
diff --git a/Library/Utility/KTConfigurable.cc b/Library/Utility/KTConfigurable.cc
index 542ff5e..e2f6acc 100644
--- a/Library/Utility/KTConfigurable.cc
+++ b/Library/Utility/KTConfigurable.cc
@@ -61,8 +61,7 @@ namespace Nymph
     {
         if (fIsConfigured) return true;
 
-        scarab::param_node* node = KTConfigurator::get_instance()->Config();
-        if (! this->Configure(node))
+        if (! this->Configure(&KTConfigurator::get_instance()->Config()))
         {
             KTERROR(conflog, "An error occurred while configuring <" << fConfigName << ">");
             return false;
diff --git a/Scarab b/Scarab
index 409659a..16beb8e 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 409659a19eccd1e871e6b17b2af62e65a7e78c6c
+Subproject commit 16beb8efb83d718f79c3e3d5b0b5ea2359226455

From 87964eeff45bcaa1d697b80417f25d8bf14de175 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 May 2017 17:07:41 -0700
Subject: [PATCH 039/521] Scarab now has a terminate() function to give useful
 information for unhandled exceptions

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 16beb8e..d6eb49f 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 16beb8efb83d718f79c3e3d5b0b5ea2359226455
+Subproject commit d6eb49f445a7d675e3e76b56ba12b175dca10d92

From f4ee90bf427c0a6d6f046f36efd1532adf4cf9ca Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 24 May 2017 18:12:16 -0700
Subject: [PATCH 040/521] Messy, but just possibly functional refactoring of
 how threads are handled by KTProcessorToolbox

---
 .../Validation/KTTestPrimaryProcessor.cc      |   2 +-
 Executables/Validation/KTTestProcessor.cc     |   2 +-
 Executables/Validation/TestExceptionInSlot.cc |  21 +-
 .../Validation/TestPrimaryProcessor.cc        |  19 +-
 .../TestProcessorToolbox2Threads.cc           |   5 +
 .../TestProcessorToolboxMultithreaded.cc      |   5 +
 .../TestProcessorToolboxSinglethreaded.cc     |   5 +
 Executables/Validation/TestUseBreakpoint.cc   | 123 ++---
 Library/Application/KTProcessorToolbox.cc     | 467 ++++++++++--------
 Library/Application/KTProcessorToolbox.hh     |  69 ++-
 Library/Data/KTApplyCut.cc                    |   2 +-
 Library/Data/KTCutFilter.cc                   |   2 +-
 Library/Processor/KTPrimaryProcessor.cc       |  12 +-
 Library/Processor/KTPrimaryProcessor.hh       |  10 +-
 Library/Processor/KTProcessor.cc              |   4 +-
 Library/Processor/KTProcessor.hh              |   2 +-
 Library/Processor/KTSlot.hh                   |   2 +-
 Library/Processor/KTSlotWrapper.hh            |  10 +-
 Library/Processor/KTThreadReference.cc        |  69 ++-
 Library/Processor/KTThreadReference.hh        |  23 +-
 20 files changed, 518 insertions(+), 336 deletions(-)

diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
index 39e6121..42f8aab 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -39,7 +39,7 @@ namespace Nymph
             // e.g. for a real processor, do some work here instead of sleeping
             boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
 
-            if( fThreadRef.fThreadIndicator->fCanceled ) break;
+            if( fThreadRef->fCanceled ) break;
 
             fTheSignal( iIteration );
         }
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 826b673..5401600 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -92,7 +92,7 @@ namespace Nymph
 
     void KTTestProcessorC::SlotFunc1(int input)
     {
-        KTThreadReference* ref = fSlot1.GetSlotWrapper()->GetThreadRef();
+        std::shared_ptr< KTThreadReference > ref = fSlot1.GetSlotWrapper()->GetThreadRef();
 
         KTINFO(testsiglog, "Slot1: input is " << input);
         throw KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)";
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 1fe808d..6944424 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -35,9 +35,9 @@ int main()
     }
 
     // setup to execute processors asynchronously
-    KTThreadReference exeThreadRef;
-    auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
-    tpC.GetSlot( "first-slot" )->SetThreadRef (&exeThreadRef );
+    std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
+    //boost::shared_future< KTDataPtr > exeThreadFuture = exeThreadRef->fDataPtrRetFuture;
+    tpC.GetSlot( "first-slot" )->SetThreadRef( exeThreadRef );
 
     std::atomic< bool > canceled( false );
 
@@ -60,7 +60,7 @@ int main()
         }
         catch( ... )
         {
-            exeThreadRef.fDataPtrRet.set_exception( std::current_exception() );
+            exeThreadRef->fDataPtrRet.set_exception( boost::current_exception() );
         }
 
         return;
@@ -70,16 +70,21 @@ int main()
     boost::thread thread( exeFunc );
 
     // wait for a result to be set
-    exeThreadFuture.wait();
+    exeThreadRef->fDataPtrRetFuture.wait();
 
     try
     {
-        exeThreadFuture.get();
+        exeThreadRef->fDataPtrRetFuture.get();
     }
-    catch( std::exception& e )
+    //catch( std::exception& e )
+    //{
+    //    canceled = true;
+    //    KTERROR( testexclog, "An error occurred while running a processor: " << e.what() );
+    //}
+    catch( boost::exception& e )
     {
         canceled = true;
-        KTERROR( testexclog, "An error occurred while running a processor: " << e.what() );
+        KTERROR( testexclog, "An error occurred while running a processor: " << diagnostic_information( e ) );
     }
 
     thread.join();
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
index 22d3c1e..e549215 100644
--- a/Executables/Validation/TestPrimaryProcessor.cc
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -34,8 +34,10 @@ int main()
     }
 
     // setup to execute processors asynchronously
-    KTThreadReference exeThreadRef;
-    auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
+    //KTThreadReference exeThreadRef;
+    //auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
+    std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
+    exeThreadRef->fName = std::string( "tpp" );
 
     // run the thread
     boost::condition_variable threadStartedCV;
@@ -43,7 +45,7 @@ int main()
     bool threadStartedFlag = false;
 
     boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
-    boost::thread thread( [&](){ tpp( std::move( exeThreadRef ), threadStartedCV, threadStartedFlag ); } );
+    boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
 
     while( ! threadStartedFlag )
     {
@@ -52,17 +54,22 @@ int main()
     KTDEBUG( testpplog, "Thread has started" );
 
     // wait for a result to be set
-    exeThreadFuture.wait();
+    exeThreadRef->fDataPtrRetFuture.wait();
 
     try
     {
-        exeThreadFuture.get();
+        exeThreadRef->fDataPtrRetFuture.get();
     }
     catch( std::exception& e )
     {
-        exeThreadRef.fThreadIndicator->fCanceled = true;
+        exeThreadRef->fCanceled = true;
         KTERROR( testpplog, "An error occurred while running a processor: " << e.what() );
     }
+    catch( boost::exception& e )
+    {
+        exeThreadRef->fCanceled = true;
+        KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+    }
 
     thread.join();
 
diff --git a/Executables/Validation/TestProcessorToolbox2Threads.cc b/Executables/Validation/TestProcessorToolbox2Threads.cc
index d92960f..c43459f 100644
--- a/Executables/Validation/TestProcessorToolbox2Threads.cc
+++ b/Executables/Validation/TestProcessorToolbox2Threads.cc
@@ -110,5 +110,10 @@ int main()
         KTERROR( testptlog, "Exception caught: " << e.what() );
         return -1;
     }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
     return 0;
 }
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
index d71b5ab..089407c 100644
--- a/Executables/Validation/TestProcessorToolboxMultithreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
@@ -72,5 +72,10 @@ int main()
         KTERROR( testptlog, "Exception caught: " << e.what() );
         return -1;
     }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
     return 0;
 }
diff --git a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
index 56a73db..65144ab 100644
--- a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
@@ -72,6 +72,11 @@ int main()
         KTERROR( testptlog, "Exception caught: " << e.what() );
         return -1;
     }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
 
     return 0;
 }
diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Executables/Validation/TestUseBreakpoint.cc
index 466b814..738fd04 100644
--- a/Executables/Validation/TestUseBreakpoint.cc
+++ b/Executables/Validation/TestUseBreakpoint.cc
@@ -16,71 +16,82 @@ KTLOGGER( testptlog, "TestUseBreakpoint" )
 
 int main()
 {
-    KTINFO( testptlog, "Preparing to run" );
-
-    KTProcessorToolbox ptb;
-
-    // add the primary processor
-    if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
-    {
-        KTERROR( testptlog, "Unable to create test primary processor" );
-        return -1;
-    }
-
-    // add processor b
-    if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
-    {
-        KTERROR( testptlog, "Unable to create test processor b" );
-        return -1;
-    }
-    // set breakpoint
-    if( ! ptb.SetBreakpoint( "tp", "first-slot" ) )
+    try
     {
-        KTERROR( testptlog, "Unable to set the breakpoint" );
-        return -1;
-    }
-
-    // make connections
-    if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
-    {
-        KTERROR( testptlog, "Unable to connect tpp to tp" );
-        return -1;
-    }
-
-    // set the run queue
-    if( ! ptb.PushBackToRunQueue( "tpp" ) )
-    {
-        KTERROR( testptlog, "Unable to add tpp to the run queue" );
-        return -1;
-    }
+        KTINFO( testptlog, "Preparing to run" );
 
-    // go!
-    KTINFO( testptlog, "Starting asynchronous run" );
-    ptb.AsyncRun();
+        KTProcessorToolbox ptb;
 
-    KTINFO( testptlog, "Starting asynchronous breakpoint user" );
-    auto buFuture = boost::async( boost::launch::async, [&](){
-        KTINFO( testptlog, "In breakpoint user thread" );
-        while( ptb.WaitForBreak() )
+        // add the primary processor
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
         {
-            KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
-            std::string temp;
-            KTPROG( testptlog, "Please press [return]" );
-            getline( std::cin, temp );
-            ptb.Continue();
+            KTERROR( testptlog, "Unable to create test primary processor" );
+            return -1;
         }
-        KTINFO( testptlog, "Finished breakpoint user thread" );
-        return;
-    });
 
-    KTINFO( testptlog, "Waiting for the end of the run" );
-    ptb.WaitForEndOfRun();
+        // add processor b
+        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b" );
+            return -1;
+        }
+        // set breakpoint
+        if( ! ptb.SetBreakpoint( "tp", "first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to set the breakpoint" );
+            return -1;
+        }
 
-    KTINFO( testptlog, "Processing complete" );
+        // make connections
+        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp to tp" );
+            return -1;
+        }
 
-    ptb.JoinRunThread();
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to add tpp to the run queue" );
+            return -1;
+        }
 
-    KTINFO( testptlog, "Tests complete" );
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        KTINFO( testptlog, "Starting asynchronous breakpoint user" );
+        auto buFuture = boost::async( boost::launch::async, [&](){
+            KTINFO( testptlog, "In breakpoint user thread" );
+            while( ptb.WaitForBreak() )
+            {
+                KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
+                std::string temp;
+                KTPROG( testptlog, "Please press [return]" );
+                getline( std::cin, temp );
+                ptb.Continue();
+            }
+            KTINFO( testptlog, "Finished breakpoint user thread" );
+            return;
+        });
+
+        KTINFO( testptlog, "Waiting for the end of the run" );
+        ptb.WaitForEndOfRun();
+
+        KTINFO( testptlog, "Processing complete" );
+
+        ptb.JoinRunThread();
+
+        KTINFO( testptlog, "Tests complete" );
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( testptlog, "Caught exception: " << e.what() );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Caught exception: " << diagnostic_information( e ) );
+    }
 
     return 0;
 }
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index a29e8f6..95bb39a 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -14,6 +14,7 @@
 #include "factory.hh"
 #include "param_codec.hh"
 
+#include <boost/exception/get_error_info.hpp>
 #include <boost/thread.hpp>
 
 using std::deque;
@@ -31,7 +32,9 @@ namespace Nymph
             fRunSingleThreaded( false ),
             fRunQueue(),
             fProcMap(),
-            fThreadFutures(),
+            fThreadReferences(),
+            fThreadFuturesMutex(),
+            //fThreadFutures(),
             fContinueSignaler(),
             fMasterContSignal(),
             fBreakContMutex(),
@@ -581,176 +584,204 @@ namespace Nymph
 
         if( willRunSingleThreaded )
         {
-            auto singleThreadRun = [&]()
+            StartSingleThreadedRun();
+        }
+        else
+        {
+            StartMultiThreadedRun();
+        }
+
+        return;
+    }
+
+    void KTProcessorToolbox::StartSingleThreadedRun()
+    {
+        auto singleThreadRun = [&]()
+        {
+            try
             {
-                try
+                // reset the continue signaler
+                fContinueSignaler = boost::promise< void >();
+                fMasterContSignal = fContinueSignaler.get_future().share();
+                if( ! fMasterContSignal.valid() )
                 {
-                    // reset the continue signaler
-                    fContinueSignaler = boost::promise< void >();
-                    fMasterContSignal = fContinueSignaler.get_future().share();
-                    if( ! fMasterContSignal.valid() )
-                    {
-                        KTERROR( proclog, "Invalid master continue-signal created" );
-                        throw KTException() << "Invalid master continue-signal created";
-                    }
-                    // copy for use in this function
-                    boost::shared_future< void > continueSignal = fMasterContSignal;
+                    KTERROR( proclog, "Invalid master continue-signal created" );
+                    throw KTException() << "Invalid master continue-signal created";
+                }
+                // copy for use in this function
+                boost::shared_future< void > continueSignal = fMasterContSignal;
 
-                    KTPROG( proclog, "Starting single-threaded processing" );
+                KTPROG( proclog, "Starting single-threaded processing" );
 
-                    for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                     {
-                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                        {
-                            std::string procName( tgIter->fName );
-                            KTINFO( proclog, "Starting processor <" << procName << ">" );
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
 
-                            KTThreadReference thisThreadRef;
+                        std::string procName( tgIter->fName );
+                        KTINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
-                            fThreadNames.push_back( procName );
-                            //auto& futureNameIndex = fThreadFutures.get<1>();
+                        //KTThreadReference thisThreadRef;
+                        std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                        thisThreadRef->fName = procName;
 
-                            if( ! fThreadFutures.back().valid() )
-                            {
-                                KTERROR( proclog, "Invalid thread future created" );
-                                throw KTException() << "Invalid thread future created";
-                            }
+                        //fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
+                        //fThreadNames.push_back( procName );
+                        //auto& futureNameIndex = fThreadFutures.get<1>();
 
-                            fThreadIndicators.emplace_back( new KTThreadIndicator() );
-                            fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
+                        //if( ! fThreadFutures.back().valid() )
+                        //{
+                        //    KTERROR( proclog, "Invalid thread future created" );
+                        //    throw KTException() << "Invalid thread future created";
+                        //}
 
-                            thisThreadRef.fThreadIndicator = fThreadIndicators.back();
-                            thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
-                            thisThreadRef.fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
+                        //fThreadIndicators.emplace_back( new KTThreadIndicator() );
+                        //fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
+                        thisThreadRef->fContinueSignal = fMasterContSignal;
 
-                            boost::condition_variable threadStartedCV;
-                            boost::mutex threadStartedMutex;
-                            bool threadStartedFlag = false;
+                        //thisThreadRef->fThreadIndicator = fThreadIndicators.back();
+                        thisThreadRef->fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
+                        //thisThreadRef->fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
-                            boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
-                            boost::thread thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ), threadStartedCV, threadStartedFlag ); } );
-                            KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
-                            while( ! threadStartedFlag )
-                            {
-                                threadStartedCV.wait( threadStartedLock );
-                            }
-                            KTDEBUG( proclog, "Thread has started" );
+                        fThreadReferences.push_back( thisThreadRef );
+
+                        boost::condition_variable threadStartedCV;
+                        boost::mutex threadStartedMutex;
+                        bool threadStartedFlag = false;
 
-                            KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
+                        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+                        boost::thread thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
+                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
+                        while( ! threadStartedFlag )
+                        {
+                            threadStartedCV.wait( threadStartedLock );
+                        }
+                        KTDEBUG( proclog, "Thread has started" );
 
-                            bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
+
+                        threadFuturesLock.unlock();
+
+                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                        do
+                        {
+                            boost::future_status status;
                             do
                             {
-                                boost::future_status status;
-                                do
-                                {
-                                    status = fThreadFutures.back().wait_for( boost::chrono::milliseconds(500) );
-                                } while (status != boost::future_status::ready);
+                                status = fThreadReferences.back()->fDataPtrRetFuture.wait_for( boost::chrono::milliseconds(500) );
+                            } while (status != boost::future_status::ready);
 
-                                stillRunning = false;
-                                if( fThreadIndicators.back()->fBreakFlag )
+                            stillRunning = false;
+                            if( fThreadReferences.back()->fBreakFlag )
+                            {
+                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << fThreadReferences.back()->fName << ">; may not be where breakpoint is set)" );
+                                continueSignal.wait();
+                                KTDEBUG( proclog, "Breakpoint finished" );
+                                stillRunning = true;
+                                continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                            }
+                            else
+                            {
+                                try
                                 {
-                                    KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << fThreadNames.back() << ">; may not be where breakpoint is set)" );
-                                    continueSignal.wait();
-                                    KTDEBUG( proclog, "Breakpoint finished" );
-                                    stillRunning = true;
-                                    continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                                    fThreadReferences.back()->fDataPtrRetFuture.get();
+                                    KTINFO( proclog, "Thread <" << fThreadReferences.back()->fName << "> has finished" );
+                                    fThreadReferences.pop_back();
                                 }
-                                else
+                                catch( boost::exception& e )
                                 {
-                                    try
-                                    {
-                                        fThreadFutures.back().get();
-                                        KTINFO( proclog, "Thread <" << fThreadNames.back() << "> has finished" );
-                                        fThreadFutures.pop_back();
-                                        fThreadNames.pop_back();
-                                    }
-                                    catch( std::exception& e )
-                                    {
-                                        KTERROR( proclog, "Thread <" << fThreadNames.back() << "> threw an error: " << e.what() );
-                                        // this transfers an exception thrown by a processor to the outer catch block in this function
-                                        throw KTException() << "An error occurred while running processor <" << procName << ">: " << e.what();
-                                    }
-                                    stillRunning = false;
+                                    KTERROR( proclog, "Thread <" << fThreadReferences.back()->fName << "> threw an error: " << diagnostic_information( e ) );
+                                    // this transfers an exception thrown by a processor to the outer catch block in this function
+                                    throw KTException() << "An error occurred while running processor <" << procName << ">: " << diagnostic_information( e );
                                 }
-                            } while( stillRunning );
+                                stillRunning = false;
+                            }
+                        } while( stillRunning );
 
-                            KTINFO( proclog, "Processor <" << procName << "> has finished" );
+                        KTINFO( proclog, "Processor <" << procName << "> has finished" );
 
-                            thread.join();
-                            fThreadIndicators.clear();
-                            fThreadFutures.clear();
-                            fThreadNames.clear();
-                        } // end for loop over the thread group
-                    } // end for loop over the run-queue
+                        thread.join();
+                        fThreadReferences.clear();
+                        //fThreadFutures.clear();
+                        //fThreadNames.clear();
+                    } // end for loop over the thread group
+                } // end for loop over the run-queue
 
-                    KTPROG( proclog, "Processing is complete (single-threaded)" );
-                }
-                catch( std::exception& e )
-                {
-                    KTDEBUG( proclog, "Caught exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                    // exceptions thrown in this function or from within processors will end up here
-                    fDoRunPromise.set_exception( std::current_exception() );
-                }
-                fDoRunPromise.set_value();
-                return;
-            };
+                KTPROG( proclog, "Processing is complete (single-threaded)" );
+            }
+            catch( std::exception& e )
+            {
+                KTDEBUG( proclog, "Caught exception thrown in a processor or in the single-threaded run function: " << e.what() );
+                // exceptions thrown in this function or from within processors will end up here
+                fDoRunPromise.set_exception( std::current_exception() );
+            }
+            catch( boost::exception& e )
+            {
+                KTDEBUG( proclog, "Caught exception thrown in a processor or in the single-threaded run function: " << diagnostic_information( e ) );
+                // exceptions thrown in this function or from within processors will end up here
+                fDoRunPromise.set_exception( std::current_exception() );
+            }
+            fDoRunPromise.set_value();
+            return;
+        }; // end single-threaded run lambda
 
-            fDoRunThread = new boost::thread( singleThreadRun );
-        }
-        else
+        fDoRunThread = new boost::thread( singleThreadRun );
+        return;
+    }
+    void KTProcessorToolbox::StartMultiThreadedRun()
+    {
+        auto multiThreadRun = [&]()
         {
-            auto multiThreadRun = [&]()
+            try
             {
-                try
+                // reset the continue signaler
+                fContinueSignaler = boost::promise< void >();
+                fMasterContSignal = fContinueSignaler.get_future().share();
+                if( ! fMasterContSignal.valid() )
                 {
-                    // reset the continue signaler
-                    fContinueSignaler = boost::promise< void >();
-                    fMasterContSignal = fContinueSignaler.get_future().share();
-                    if( ! fMasterContSignal.valid() )
-                    {
-                        KTERROR( proclog, "Invalid master continue-signal created" );
-                        throw KTException() << "Invalid master continue-signal created";
-                    }
-                    // copy for use in this function
-                    boost::shared_future< void > continueSignal = fMasterContSignal;
+                    KTERROR( proclog, "Invalid master continue-signal created" );
+                    throw KTException() << "Invalid master continue-signal created";
+                }
+                // copy for use in this function
+                boost::shared_future< void > continueSignal = fMasterContSignal;
 
-                    KTPROG( proclog, "Starting multi-threaded processing" );
+                KTPROG( proclog, "Starting multi-threaded processing" );
 
-                    for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-                    {
-                        boost::thread_group threads;
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    boost::thread_group threads;
+
+                    { // scope for threadFuturesLock
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
 
                         for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
                             std::string procName( tgIter->fName );
                             KTINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            KTThreadReference thisThreadRef;
-
-                            fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
-                            fThreadNames.push_back( procName );
+                            //KTThreadReference thisThreadRef;
+                            std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                            thisThreadRef->fName = procName;
 
-                            if( ! fThreadFutures.back().valid() )
-                            {
-                                KTERROR( proclog, "Invalid thread future created" );
-                                throw KTException() << "Invalid thread future created";
-                            }
+                            //fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
+                            //fThreadNames.push_back( procName );
 
-                            fThreadIndicators.emplace_back( new KTThreadIndicator() );
-                            fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
-
-                            thisThreadRef.fThreadIndicator = fThreadIndicators.back();
-                            thisThreadRef.fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
-                            thisThreadRef.fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
+                            //fThreadIndicators.emplace_back( new KTThreadIndicator() );
+                            //fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
+                            thisThreadRef->fContinueSignal = fMasterContSignal;
 
+                            //thisThreadRef->fThreadIndicator = fThreadIndicators.back();
+                            thisThreadRef->fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
+                            //thisThreadRef->fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
                             boost::condition_variable threadStartedCV;
                             boost::mutex threadStartedMutex;
                             bool threadStartedFlag = false;
 
+                            fThreadReferences.push_back( thisThreadRef );
+
                             boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
-                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( std::move( thisThreadRef ), threadStartedCV, threadStartedFlag ); } );
+                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
                             KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
                             while( ! threadStartedFlag )
                             {
@@ -761,85 +792,116 @@ namespace Nymph
                             threads.add_thread( thisThread );
 
                         }// end for loop over the thread group
+                    } // end scope for threadFuturesLock
 
-                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
-                        do
+                    bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                    do
+                    {
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+                        //KTThreadRefFutureIterator finishedFuturePtr( fThreadReferences.begin());
+                        //auto finishedFuturePtr = boost::wait_for_any( futureIndex.begin(), futureIndex.end() );
+                        //auto finishedFuturePtr = boost::wait_for_any( fThreadFutures.begin(), fThreadFutures.end() );
+                        auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
+                        size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
+                        auto finishedReferencePtr = fThreadReferences.begin() + iThread;
+                        std::string threadName( (*finishedReferencePtr)->fName );
+                        //KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
+                        KTWARN( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" ); // TODO: swtich this back to DEBUG
+
+                        stillRunning = false;
+                        if( fDoRunBreakFlag )
                         {
-                            boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
-                            //auto finishedFuturePtr = boost::wait_for_any( futureIndex.begin(), futureIndex.end() );
-                            auto finishedFuturePtr = boost::wait_for_any( fThreadFutures.begin(), fThreadFutures.end() );
-                            size_t iThread = finishedFuturePtr - fThreadFutures.begin();
-                            std::string threadName( fThreadNames[iThread] );
-
-                            stillRunning = false;
-                            if( fDoRunBreakFlag )
+                            // a breakpoint has been reached
+                            //KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
+                            KTWARN( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" ); //TODO: switch this back to debug
+                            threadFuturesLock.unlock();
+                            // wait here for the user to continue
+                            continueSignal.wait();
+                            KTDEBUG( proclog, "Breakpoint finished" );
+                            boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
+                            stillRunning = true;
+                            continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                        }
+                        else
+                        {
+                            // we're finished a thread; get its results
+                            try
                             {
-                                // a breakpoint has been reached
-                                threadFuturesLock.unlock();
-                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
-                                continueSignal.wait();
-                                KTDEBUG( proclog, "Breakpoint finished" );
-                                boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
-                                stillRunning = true;
-                                continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                                //futureIndex.modify( finishedFuturePtr, [](LabeledFuture& lFuture){ lFuture.fFuture.get(); } );
+                                //KTINFO( proclog, "Thread <" << threadName << "> has finished" );
+                                KTWARN( proclog, "Thread <" << threadName << "> has finished" ); // TODO: switch this back to INFO
+                                finishedFuturePtr->get();
+                                fThreadReferences.erase( finishedReferencePtr );
+                                //fThreadFutures.erase( finishedFuturePtr );
+                                //fThreadNames.erase( fThreadNames.begin() + iThread );
                             }
-                            else
+                            catch( boost::exception& e )
                             {
-                                // we're finished a thread; get its results
-                                try
-                                {
-                                    //futureIndex.modify( finishedFuturePtr, [](LabeledFuture& lFuture){ lFuture.fFuture.get(); } );
-                                    finishedFuturePtr->get();
-                                    KTINFO( proclog, "Thread <" << threadName << "> has finished" );
-                                    fThreadFutures.erase( finishedFuturePtr );
-                                    fThreadNames.erase( fThreadNames.begin() + iThread );
-                                }
-                                catch( std::exception& e )
-                                {
-                                    KTERROR( proclog, "Thread <" << threadName << "> threw an error: " << e.what() );
-                                    // this transfers an exception thrown by a processor to the outer catch block in this function
-                                    throw KTException() << "An error occurred while running processor <" << threadName << ">: " << e.what();
-                                }
-
-                                if( fThreadFutures.empty() ) stillRunning = false;
-                                else stillRunning = true;
+                                KTERROR( proclog, "Thread <" << threadName << "> threw an error: " << diagnostic_information( e ) );
+                                // this transfers an exception thrown by a processor to the outer catch block in this function
+                                throw KTException() << "An error occurred while running processor <" << threadName << ">: " << diagnostic_information( e );
                             }
-                        } while( stillRunning );
-
-                        KTDEBUG( proclog, "Joining threads" );
-                        threads.join_all();
-                        fThreadIndicators.clear();
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
-                        fThreadFutures.clear();
-                        fThreadNames.clear();
-                    } // end for loop over the run-queue
 
-                    KTPROG( proclog, "Processing is complete (multi-threaded)" );
-                }
-                catch( std::exception& e )
-                {
-                    // exceptions thrown in this function or from within processors will end up here
-                    KTDEBUG( proclog, "Caught exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                    fDoRunPromise.set_exception( std::current_exception() );
-                }
-                fDoRunPromise.set_value();
+                            if( fThreadReferences.empty() ) stillRunning = false;
+                            else stillRunning = true;
+                        }
+                    } while( stillRunning );
+
+                    KTDEBUG( proclog, "Joining threads" );
+                    threads.join_all();
+                    //fThreadIndicators.clear();
+                    boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+                    fThreadReferences.clear();
+                    //fThreadFutures.clear();
+                    //fThreadNames.clear();
+                } // end for loop over the run-queue
+
+                KTPROG( proclog, "Processing is complete (multi-threaded)" );
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                KTERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
                 return;
-            };
-
-            fDoRunThread = new boost::thread( multiThreadRun );
-        }
+            }
+            catch( boost::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                KTERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << diagnostic_information( e ) );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            KTWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
+            fDoRunPromise.set_value();
+            return;
+        }; // end multi-threaded run lambda
 
+        fDoRunThread = new boost::thread( multiThreadRun );
         return;
     }
 
+
     bool KTProcessorToolbox::WaitForBreak()
     {
+        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
+
+        if( fDoRunBreakFlag )
+        {
+            KTWARN( proclog, "Can't wait for a break; Already at a breakpoint" );
+            return true;
+        }
+
         boost::shared_future< void > doRunFuture = fDoRunFuture;
         if( ! doRunFuture.valid() )
         {
             throw KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)";
         }
 
+        breakContLock.unlock();
+
         doRunFuture.wait();
 
         if( fDoRunBreakFlag )
@@ -850,7 +912,7 @@ namespace Nymph
 
         try
         {
-            doRunFuture.get();
+            doRunFuture.get(); // TODO: do we really need this?  NSO, 5/23/17
             KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
             return false;
         }
@@ -893,13 +955,14 @@ namespace Nymph
         boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
 
         // futures have been used; clear them to be replaced
-        fThreadFutures.clear();
+        //fThreadFutures.clear();
 
         // reset all break flags
         fDoRunBreakFlag = false;
-        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
             (*tiIt)->fBreakFlag = false;
+            (*tiIt)->RefreshDataPtrRet();
         }
 
         // reset the do-run promise and future
@@ -908,13 +971,14 @@ namespace Nymph
 
         KTINFO( proclog, "Continuing from breakpoint" );
         // signal everything to resume
+        KTWARN( proclog, "Setting value of continue-signaler promise" );
         fContinueSignaler.set_value();
 
         // reset the signaler and all signals
         // hopefully the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
         fContinueSignaler = boost::promise< void >();
         fMasterContSignal = fContinueSignaler.get_future().share();
-        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
             (*tiIt)->fContinueSignal = fMasterContSignal;
         }
@@ -926,41 +990,36 @@ namespace Nymph
     {
         boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
 
-        auto tnIt = fThreadNames.begin();
-        for( ; tnIt != fThreadNames.end(); ++tnIt )
+        auto tnIt = fThreadReferences.begin();
+        for( ; tnIt != fThreadReferences.end(); ++tnIt )
         {
-            if( *tnIt == threadName ) break;
+            if( (*tnIt)->fName == threadName ) break;
         }
-        if( tnIt == fThreadNames.end() )
+        if( tnIt == fThreadReferences.end() )
         {
             KTWARN( proclog, "Did not find thread <" << threadName << ">" );
             throw KTException() << "Did not find thread <" << threadName << ">" ;
         }
 
-        size_t iThread = tnIt - fThreadNames.begin();
-        if( iThread >= fThreadFutures.size() )
-        {
-            KTERROR( proclog, "Thread futures and thread names are unsynchronized" );
-            throw KTException() << "Thread futures and thread names are unsynchronized; found thread name <" << threadName << "> at position <" << iThread << ">, but there are only <" << fThreadFutures.size() << "> futures.";
-        }
-
-        return fThreadFutures[ iThread ].get();
+        return (*tnIt)->fDataPtrRetFuture.get();
     }
 
     void KTProcessorToolbox::InitiateBreak()
     {
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
+        if( fDoRunBreakFlag ) return;
 
         // set all break flags
         // master break flag
         fDoRunBreakFlag = true;
         // thread break flags
-        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
             (*tiIt)->fBreakFlag = true;
         }
 
         // use the do-run promise to signal the break
+        KTWARN( proclog, "Setting value of do-run-promise" );
         fDoRunPromise.set_value();
 
         return;
@@ -969,7 +1028,7 @@ namespace Nymph
     void KTProcessorToolbox::CancelThreads()
     {
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
-        for( auto tiIt = fThreadIndicators.begin(); tiIt != fThreadIndicators.end(); ++tiIt )
+        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
             (*tiIt)->fCanceled = true;
         }
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index f9bc967..dfebeae 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -20,6 +20,10 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
+
 #include <deque>
 #include <initializer_list>
 #include <limits>
@@ -228,20 +232,25 @@ namespace Nymph
 
             typedef boost::shared_future< KTDataPtr > Future;
 
+            void StartSingleThreadedRun();
+            void StartMultiThreadedRun();
+
             // called from ThreadPacket::Break
             void InitiateBreak();
             // called from ThreadPacket::Break
-            void TakeFuture( const std::string& name, Future&& future );
+            //void TakeFuture( const std::string& name, Future&& future );
+
+            std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
 
-            typedef std::vector< Future > ThreadFutures;
-            typedef std::vector< std::string > ThreadNames;
+            //typedef std::vector< Future > ThreadFutures;
+            //typedef std::vector< std::string > ThreadNames;
 
-            ThreadFutures fThreadFutures;
-            ThreadNames fThreadNames;
+            //ThreadFutures fThreadFutures;
+            //ThreadNames fThreadNames;
             boost::mutex fThreadFuturesMutex;
 
-            typedef std::vector< std::shared_ptr< KTThreadIndicator > > ThreadIndicators;
-            ThreadIndicators fThreadIndicators;
+            //typedef std::vector< std::shared_ptr< KTThreadIndicator > > ThreadIndicators;
+            //ThreadIndicators fThreadIndicators;
 
             boost::promise< void > fContinueSignaler;
             boost::shared_future< void > fMasterContSignal;
@@ -254,6 +263,40 @@ namespace Nymph
 
     };
 
+    template< class Value, class IIterator >
+    class KTThreadRefFutureIter : public boost::iterator_adaptor< KTThreadRefFutureIter< Value, IIterator >, IIterator, Value, boost::random_access_traversal_tag >
+    {
+        private:
+            // used for the conversion constructor below
+            struct enabler {};
+
+        public:
+            KTThreadRefFutureIter() :
+                    KTThreadRefFutureIter::iterator_adaptor_()
+            {}
+            KTThreadRefFutureIter( const IIterator& other ) :
+                    KTThreadRefFutureIter::iterator_adaptor_( other )
+            {}
+
+            // converts from Iterator to ConstIterator, but the enable_if business prevents converting from ConstIterator to Iterator
+            template< class OtherValue, class OtherIIterator >
+            KTThreadRefFutureIter( const KTThreadRefFutureIter< OtherValue, OtherIIterator > & other, typename boost::enable_if< boost::is_convertible< OtherValue, Value >, enabler >::type = enabler() ) :
+                    KTThreadRefFutureIter::iterator_adaptor_( other.base )
+            {}
+
+        private:
+            friend class boost::iterator_core_access;
+
+            Value& dereference() const
+            {
+                return (*(this->base_reference()))->fDataPtrRetFuture;
+            }
+    };
+
+    typedef KTThreadRefFutureIter< boost::unique_future< KTDataPtr >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
+    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataPtr >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
+
+
     inline void KTProcessorToolbox::PopBackOfRunQueue()
     {
         fRunQueue.pop_back();
@@ -272,12 +315,12 @@ namespace Nymph
         return;
     }
 
-    inline void KTProcessorToolbox::TakeFuture( const std::string& name, Future&& future )
-    {
-        fThreadFutures.push_back( std::move( future ) );
-        fThreadNames.push_back( name );
-        return;
-    }
+    //inline void KTProcessorToolbox::TakeFuture( const std::string& name, Future&& future )
+    //{
+    //    fThreadFutures.push_back( std::move( future ) );
+    //    fThreadNames.push_back( name );
+    //    return;
+    //}
 
     inline void KTProcessorToolbox::JoinRunThread()
     {
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 3907a42..a4535ea 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -85,7 +85,7 @@ namespace Nymph
 
     void KTApplyCut::ApplyCut(KTDataPtr dataPtr)
     {
-        KTThreadReference* ref = fApplyCutSW->GetThreadRef();
+        std::shared_ptr< KTThreadReference > ref = fApplyCutSW->GetThreadRef();
 
         if (fCut == NULL)
         {
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 7104a8b..af4fcb1 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -76,7 +76,7 @@ namespace Nymph
 
     void KTCutFilter::FilterData(KTDataPtr dataPtr)
     {
-        KTThreadReference* ref = fFilterDataSW->GetThreadRef();
+        std::shared_ptr< KTThreadReference > ref = fFilterDataSW->GetThreadRef();
 
         // all KTDataPtr's have KTData, so we won't bother checking
 
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index dda0ad4..cfce927 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -27,9 +27,9 @@ namespace Nymph
     {
     }
 
-    void KTPrimaryProcessor::operator ()( KTThreadReference&& ref, boost::condition_variable& startedCV, bool& startedFlag )
+    void KTPrimaryProcessor::operator ()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag )
     {
-        fThreadRef = std::move( ref );
+        fThreadRef = ref;
 
         // pass updated thread reference to downstream slots
         for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
@@ -39,7 +39,7 @@ namespace Nymph
             for( SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt )
             {
                 // pass the update on to the connected-to processor
-                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, &fThreadRef );
+                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, fThreadRef );
             }
         }
 
@@ -52,16 +52,16 @@ namespace Nymph
             if( ! Run() )
             {
                 KTERROR( proclog, "An error occurred during processor running." );
-                THROW_RETURN_EXCEPTION( fThreadRef.fDataPtrRet, KTException() << "An error occurred during processor running" );
+                THROW_RETURN_EXCEPTION( fThreadRef->fDataPtrRet, KTException() << "An error occurred during processor running" );
             }
             else
             {
-                fThreadRef.fDataPtrRet.set_value( KTDataPtr() );
+                fThreadRef->fDataPtrRet.set_value( KTDataPtr() );
             }
         }
         catch( ... )
         {
-            fThreadRef.fDataPtrRet.set_exception( std::current_exception() );
+            fThreadRef->fDataPtrRet.set_exception( std::current_exception() );
         }
         return;
     }
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index b470303..2367e4d 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -28,25 +28,25 @@ namespace Nymph
 
         public:
             /// Callable function used by std::thread
-            void operator()( KTThreadReference&& ref, boost::condition_variable& startedCV, bool& startedFlag );
+            void operator()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag );
 
             /// Starts the  main action of the processor
             virtual bool Run() = 0;
 
-            KTThreadReference* GetThreadRef();
+            std::shared_ptr< KTThreadReference > GetThreadRef();
 
             MEMBERVARIABLE( bool, DoBreakpoint );
 
         protected:
             std::vector< std::string > fSignalsEmitted;
 
-            KTThreadReference fThreadRef;
+            std::shared_ptr< KTThreadReference > fThreadRef;
 
     };
 
-    inline KTThreadReference* KTPrimaryProcessor::GetThreadRef()
+    inline std::shared_ptr< KTThreadReference > KTPrimaryProcessor::GetThreadRef()
     {
-        return &fThreadRef;
+        return fThreadRef;
     }
 
 } /* namespace Nymph */
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index cee44ed..c8df746 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -45,9 +45,9 @@ namespace Nymph
         }
     }
 
-    void KTProcessor::PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef)
+    void KTProcessor::PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef)
     {
-        std::function< void(KTThreadReference*) > funcObj = [this, &slotName](KTThreadReference* ref){ GetSlot(slotName)->SetThreadRef(ref); };
+        std::function< void(std::shared_ptr< KTThreadReference >) > funcObj = [this, &slotName](std::shared_ptr< KTThreadReference > ref){ GetSlot(slotName)->SetThreadRef(ref); };
         PassToConnProcs(slotName, funcObj, threadRef);
         return;
     }
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 735c863..c4365e0 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -68,7 +68,7 @@ namespace Nymph
 
         public:
             /// For a slot that is called, update the slot's ThreadRef, and pass the update to any slots that get called by signals emitted by this slot
-            void PassThreadRefUpdate(const std::string& slotName, KTThreadReference* threadRef);
+            void PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef);
 
             void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
             void ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum=-1);
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index ac43597..6019dae 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -269,7 +269,7 @@ namespace Nymph
     {
         // Standard data slot pattern:
 
-        KTThreadReference* ref = fSlotWrapper->GetThreadRef();
+        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
 
         // Check to ensure that the required data type is present
         if( ! DataPresent< XDataTypes... >( dataPtr ) )
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index 329619b..158316b 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -88,14 +88,14 @@ namespace Nymph
             KTConnection fConnection;
 
         public:
-            KTThreadReference* GetThreadRef() const;
-            void SetThreadRef(KTThreadReference* ref);
+            std::shared_ptr< KTThreadReference > GetThreadRef() const;
+            void SetThreadRef(std::shared_ptr< KTThreadReference > ref);
 
             bool GetDoBreakpoint() const;
             void SetDoBreakpoint(bool flag);
 
         private:
-            KTThreadReference* fThreadRef;
+            std::shared_ptr< KTThreadReference > fThreadRef;
             bool fDoBreakpoint;
 
     };
@@ -126,12 +126,12 @@ namespace Nymph
         return;
     }
 
-    inline KTThreadReference* KTSlotWrapper::GetThreadRef() const
+    inline std::shared_ptr< KTThreadReference > KTSlotWrapper::GetThreadRef() const
     {
         return fThreadRef;
     }
 
-    inline void KTSlotWrapper::SetThreadRef(KTThreadReference* ref)
+    inline void KTSlotWrapper::SetThreadRef(std::shared_ptr< KTThreadReference > ref)
     {
         fThreadRef = ref;
         return;
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index f439320..5d3a17f 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -7,45 +7,71 @@
 
 #include "KTThreadReference.hh"
 
+#include "KTException.hh"
 #include "KTLogger.hh"
 
 KTLOGGER( trlog, "KTThreadReference" );
 
 namespace Nymph
 {
-    KTThreadIndicator::KTThreadIndicator() :
-            fBreakFlag( false ),
-            fContinueSignal(),
-            fCanceled( false )
-    {}
+    //KTThreadIndicator::KTThreadIndicator() :
+    //        fBreakFlag( false ),
+    //        fContinueSignal(),
+    //        fCanceled( false )
+    //{}
 
     KTThreadReference::KTThreadReference() :
+            fName(),
             fDataPtrRet(),
+            fDataPtrRetFuture( fDataPtrRet.get_future() ),
             fInitiateBreakFunc( [](){return;} ),
             fRefreshFutureFunc( [](const std::string&, boost::shared_future< KTDataPtr >&&){return;} ),
-            fThreadIndicator( new KTThreadIndicator() ),
+            //fThreadIndicator( new KTThreadIndicator() ),
+            fBreakFlag( false ),
+            fContinueSignal(),
+            fCanceled( false ),
             fPrimaryProcName()
-    {}
+    {
+        if( ! fDataPtrRetFuture.valid() )
+        {
+            KTERROR( trlog, "Invalid data-pointer-return future created" );
+            throw KTException() << "Invalid data-pointer-return future created";
+        }
+    }
 
     KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
+            fName( std::move( orig.fName ) ),
             fDataPtrRet( std::move( orig.fDataPtrRet ) ),
+            fDataPtrRetFuture( std::move( orig.fDataPtrRetFuture ) ),
             fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
             fRefreshFutureFunc( std::move( orig.fRefreshFutureFunc ) ),
-            fThreadIndicator( orig.fThreadIndicator ),
+            //fThreadIndicator( orig.fThreadIndicator ),
+            fBreakFlag( orig.fBreakFlag ),
+            fContinueSignal( std::move( orig.fContinueSignal ) ),
+            fCanceled( orig.fCanceled ),
             fPrimaryProcName( std::move( orig.fPrimaryProcName ) )
     {
-        orig.fThreadIndicator = nullptr;
+        //orig.fThreadIndicator = nullptr;
+        orig.fBreakFlag = false;
+        orig.fCanceled = false;
     }
 
     KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
     {
+        fName = std::move( orig.fName );
         fDataPtrRet = std::move( orig.fDataPtrRet );
+        fDataPtrRetFuture = std::move( orig.fDataPtrRetFuture );
         fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
         fRefreshFutureFunc = std::move( orig.fRefreshFutureFunc );
-        fThreadIndicator = orig.fThreadIndicator;
+        //fThreadIndicator = orig.fThreadIndicator;
+        fBreakFlag = orig.fBreakFlag;
+        fContinueSignal = std::move( orig.fContinueSignal );
+        fCanceled = orig.fCanceled;
         fPrimaryProcName = std::move( orig.fPrimaryProcName );
 
-        orig.fThreadIndicator = nullptr;
+        //orig.fThreadIndicator = nullptr;
+        orig.fBreakFlag = false;
+        orig.fCanceled = false;
 
         return *this;
     }
@@ -54,22 +80,31 @@ namespace Nymph
     {
         if( doBreakpoint )
         {
-            KTDEBUG( trlog, "Initiating break" );
+            KTDEBUG( trlog, "Initiating break (" << fName << ")" );
             fInitiateBreakFunc();
         }
-        if( fThreadIndicator->fBreakFlag || doBreakpoint )
+        if( fBreakFlag || doBreakpoint )
         {
-            KTDEBUG( trlog, "Reacting to break" );
+            KTDEBUG( trlog, "Reacting to break (" << fName << ")" );
             // set the return for this thread
+            KTWARN( trlog, "Setting value of data-ptr-ret promise (" << fName << ")" );
             fDataPtrRet.set_value( dataPtr );
             // wait for continue signal
-            fThreadIndicator->fContinueSignal.wait();
+            //fThreadIndicator->fContinueSignal.wait();
+            fContinueSignal.wait();
             // reset the promise
-            fDataPtrRet = KTDataPtrReturn();
+            //fDataPtrRet = KTDataPtrReturn();
             // pass the future back to the processor toolbox (if it's in use)
-            fRefreshFutureFunc( fPrimaryProcName, std::move( fDataPtrRet.get_future().share() ) );
+            //fRefreshFutureFunc( fPrimaryProcName, std::move( fDataPtrRet.get_future().share() ) );
         }
         return;
     }
 
+    void KTThreadReference::RefreshDataPtrRet()
+    {
+        fDataPtrRet = KTDataPtrReturn();
+        fDataPtrRetFuture = fDataPtrRet.get_future();
+        return;
+    }
+
 } /* namespace Nymph */
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index c77a175..5e1be14 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -16,20 +16,25 @@
 
 namespace Nymph
 {
-    struct KTThreadIndicator
-    {
-        bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
-        boost::shared_future< void > fContinueSignal;
-        bool fCanceled;
-        KTThreadIndicator();
-    };
+    //struct KTThreadIndicator
+    //{
+    //    bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
+    //    boost::shared_future< void > fContinueSignal;
+    //    bool fCanceled;
+    //    KTThreadIndicator();
+    //};
 
     struct KTThreadReference
     {
+        std::string fName;
         KTDataPtrReturn fDataPtrRet;
+        boost::unique_future< KTDataPtr > fDataPtrRetFuture;
         std::function< void() > fInitiateBreakFunc;
         std::function< void(const std::string&, boost::shared_future< KTDataPtr >&&) > fRefreshFutureFunc;
-        std::shared_ptr< KTThreadIndicator > fThreadIndicator;
+        //std::shared_ptr< KTThreadIndicator > fThreadIndicator;
+        bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
+        boost::shared_future< void > fContinueSignal;
+        bool fCanceled;
         std::string fPrimaryProcName;
 
         KTThreadReference();
@@ -40,6 +45,8 @@ namespace Nymph
         KTThreadReference& operator=( KTThreadReference&& );
 
         void Break( const KTDataPtr& dataPtr, bool doBreakpoint  );
+
+        void RefreshDataPtrRet();
     };
 
 } /* namespace Nymph */

From 229b1adea428e3013bbd62f3213c75e7090ac058 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 25 May 2017 14:39:07 -0700
Subject: [PATCH 041/521] Massively-improved exception handling

---
 Executables/Validation/KTTestProcessor.cc     |   2 +-
 Executables/Validation/TestExceptionInSlot.cc | 102 +++++++++---------
 .../Validation/TestPrimaryProcessor.cc        |  89 ++++++++-------
 .../TestPrimaryProcessorNoThreading.cc        |  30 +++---
 .../TestProcessorToolbox2Threads.cc           |   5 -
 .../TestProcessorToolboxMultithreaded.cc      |   5 -
 .../TestProcessorToolboxSinglethreaded.cc     |   5 -
 Executables/Validation/TestSignalsAndSlots.cc |  48 ++++-----
 Executables/Validation/TestUseBreakpoint.cc   |   4 -
 Library/Application/KTApplication.cc          |   6 +-
 Library/Application/KTCommandLineHandler.cc   |   6 +-
 Library/Application/KTCommandLineHandler.hh   |  11 +-
 Library/Application/KTConfigurator.hh         |   2 +-
 Library/Application/KTProcessorToolbox.cc     |  91 ++++++++--------
 Library/Application/KTProcessorToolbox.hh     |   3 +-
 Library/Processor/KTProcessor.cc              |  46 ++++----
 Library/Processor/KTProcessor.hh              |  10 +-
 Library/Processor/KTSignalWrapper.cc          |   3 -
 Library/Processor/KTSignalWrapper.hh          |   6 --
 Library/Processor/KTSlotWrapper.cc            |   7 +-
 Library/Processor/KTSlotWrapper.hh            |  12 +--
 Library/Processor/KTThreadReference.cc        |   2 +-
 Library/Utility/KTException.cc                |  15 ++-
 Library/Utility/KTException.hh                |  83 ++++++++++++--
 24 files changed, 315 insertions(+), 278 deletions(-)

diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 5401600..20a169a 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -95,7 +95,7 @@ namespace Nymph
         std::shared_ptr< KTThreadReference > ref = fSlot1.GetSlotWrapper()->GetThreadRef();
 
         KTINFO(testsiglog, "Slot1: input is " << input);
-        throw KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)";
+        BOOST_THROW_EXCEPTION( KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)" << eom );
 
         return;
     }
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 6944424..f036428 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -20,76 +20,76 @@ KTLOGGER( testexclog, "TestExceptionInSlot" )
 int main()
 {
 
-    KTTestProcessorA tpA;
-    KTTestProcessorC tpC;
-
-    KTINFO( testexclog, "Connecting the-signal to first-slot" );
     try
     {
+        KTTestProcessorA tpA;
+        KTTestProcessorC tpC;
+
+        KTINFO( testexclog, "Connecting the-signal to first-slot" );
         tpA.ConnectASlot( "the-signal", &tpC, "first-slot", 20 );
-    }
-    catch( std::exception& e )
-    {
-        KTERROR( testexclog, "A problem occurred while connecting the signal and slots:\n" << e.what() );
-        return -1;
-    }
 
-    // setup to execute processors asynchronously
-    std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
-    //boost::shared_future< KTDataPtr > exeThreadFuture = exeThreadRef->fDataPtrRetFuture;
-    tpC.GetSlot( "first-slot" )->SetThreadRef( exeThreadRef );
+        // setup to execute processors asynchronously
+        std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
+        //boost::shared_future< KTDataPtr > exeThreadFuture = exeThreadRef->fDataPtrRetFuture;
+        tpC.GetSlot( "first-slot" )->SetThreadRef( exeThreadRef );
 
-    std::atomic< bool > canceled( false );
+        std::atomic< bool > canceled( false );
 
-    auto exeFunc = [&]() {
-        try
-        {
-            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
+        auto exeFunc = [&]() {
+            try
+            {
+                boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
+
+                KTINFO( testexclog, "Emitting signals" );
+
+                if( canceled.load() ) return;
+                KTINFO( testexclog, "First test signal: 5" );
+                tpA.EmitSignals( 5 );
+
+                boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
 
-            KTINFO( testexclog, "Emitting signals" );
+                if( canceled.load() ) return;
+                KTINFO( testexclog, "Second test signal: 18" );
+                tpA.EmitSignals( 18 );
+            }
+            catch( boost::exception& e )
+            {
+                exeThreadRef->fDataPtrRet.set_exception( boost::current_exception() );
+            }
 
-            if( canceled.load() ) return;
-            KTINFO( testexclog, "First test signal: 5" );
-            tpA.EmitSignals( 5 );
+            return;
+        };
 
-            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
+        // run the thread
+        boost::thread thread( exeFunc );
 
-            if( canceled.load() ) return;
-            KTINFO( testexclog, "Second test signal: 18" );
-            tpA.EmitSignals( 18 );
+        // wait for a result to be set
+        exeThreadRef->fDataPtrRetFuture.wait();
+
+        try
+        {
+            exeThreadRef->fDataPtrRetFuture.get();
         }
-        catch( ... )
+        //catch( std::exception& e )
+        //{
+        //    canceled = true;
+        //    KTERROR( testexclog, "An error occurred while running a processor: " << e.what() );
+        //}
+        catch( boost::exception& e )
         {
-            exeThreadRef->fDataPtrRet.set_exception( boost::current_exception() );
+            canceled = true;
+            KTERROR( testexclog, "An error occurred while running a processor: " << diagnostic_information( e ) );
         }
 
-        return;
-    };
-
-    // run the thread
-    boost::thread thread( exeFunc );
-
-    // wait for a result to be set
-    exeThreadRef->fDataPtrRetFuture.wait();
+        thread.join();
 
-    try
-    {
-        exeThreadRef->fDataPtrRetFuture.get();
+        KTINFO( testexclog, "Tests complete" );
     }
-    //catch( std::exception& e )
-    //{
-    //    canceled = true;
-    //    KTERROR( testexclog, "An error occurred while running a processor: " << e.what() );
-    //}
     catch( boost::exception& e )
     {
-        canceled = true;
-        KTERROR( testexclog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+        KTERROR( testexclog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
     }
 
-    thread.join();
-
-    KTINFO( testexclog, "Tests complete" );
-
     return 0;
 }
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
index e549215..219905e 100644
--- a/Executables/Validation/TestPrimaryProcessor.cc
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -19,61 +19,56 @@ KTLOGGER( testpplog, "TestPrimaryProcessor" )
 int main()
 {
 
-    KTTestPrimaryProcessor tpp;
-    KTTestProcessorB tp;
-
-    KTINFO( testpplog, "Connecting the-signal to first-slot" );
     try
     {
-        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
-    }
-    catch( std::exception& e )
-    {
-        KTERROR( testpplog, "A problem occurred while connecting the signal and slots:\n" << e.what() );
-        return -1;
-    }
-
-    // setup to execute processors asynchronously
-    //KTThreadReference exeThreadRef;
-    //auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
-    std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
-    exeThreadRef->fName = std::string( "tpp" );
-
-    // run the thread
-    boost::condition_variable threadStartedCV;
-    boost::mutex threadStartedMutex;
-    bool threadStartedFlag = false;
-
-    boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
-    boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
-
-    while( ! threadStartedFlag )
-    {
-        threadStartedCV.wait( threadStartedLock );
-    }
-    KTDEBUG( testpplog, "Thread has started" );
+        KTTestPrimaryProcessor tpp;
+        KTTestProcessorB tp;
 
-    // wait for a result to be set
-    exeThreadRef->fDataPtrRetFuture.wait();
+        KTINFO( testpplog, "Connecting the-signal to first-slot" );
+        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
 
-    try
-    {
-        exeThreadRef->fDataPtrRetFuture.get();
-    }
-    catch( std::exception& e )
-    {
-        exeThreadRef->fCanceled = true;
-        KTERROR( testpplog, "An error occurred while running a processor: " << e.what() );
+        // setup to execute processors asynchronously
+        //KTThreadReference exeThreadRef;
+        //auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
+        std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
+        exeThreadRef->fName = std::string( "tpp" );
+
+        // run the thread
+        boost::condition_variable threadStartedCV;
+        boost::mutex threadStartedMutex;
+        bool threadStartedFlag = false;
+
+        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+        boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
+
+        while( ! threadStartedFlag )
+        {
+            threadStartedCV.wait( threadStartedLock );
+        }
+        KTDEBUG( testpplog, "Thread has started" );
+
+        // wait for a result to be set
+        exeThreadRef->fDataPtrRetFuture.wait();
+
+        try
+        {
+            exeThreadRef->fDataPtrRetFuture.get();
+        }
+        catch( boost::exception& e )
+        {
+            exeThreadRef->fCanceled = true;
+            KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+        }
+
+        thread.join();
+
+        KTINFO( testpplog, "Tests complete" );
     }
     catch( boost::exception& e )
     {
-        exeThreadRef->fCanceled = true;
-        KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+        KTERROR( testpplog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
     }
 
-    thread.join();
-
-    KTINFO( testpplog, "Tests complete" );
-
     return 0;
 }
diff --git a/Executables/Validation/TestPrimaryProcessorNoThreading.cc b/Executables/Validation/TestPrimaryProcessorNoThreading.cc
index d35a22f..4ee12de 100644
--- a/Executables/Validation/TestPrimaryProcessorNoThreading.cc
+++ b/Executables/Validation/TestPrimaryProcessorNoThreading.cc
@@ -17,29 +17,29 @@ KTLOGGER( testpplog, "TestPrimaryProcessorNoThreading" )
 int main()
 {
 
-    KTTestPrimaryProcessor tpp;
-    KTTestProcessorB tp;
-
-    KTINFO( testpplog, "Connecting the-signal to first-slot" );
     try
     {
+        KTTestPrimaryProcessor tpp;
+        KTTestProcessorB tp;
+
+        KTINFO( testpplog, "Connecting the-signal to first-slot" );
         tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
-    }
-    catch( std::exception& e )
-    {
-        KTERROR( testpplog, "A problem occurred while connecting the signal and slots:\n" << e.what() );
-        return -1;
-    }
 
-    KTINFO( testpplog, "Running the primary processor" )
+        KTINFO( testpplog, "Running the primary processor" )
+
+        if( ! tpp.Run() )
+        {
+            KTERROR( testpplog, "Something went wrong while running the primary processor" );
+            return -1;
+        }
 
-    if( ! tpp.Run() )
+        KTINFO( testpplog, "Tests complete" );
+    }
+    catch( boost::exception& e )
     {
-        KTERROR( testpplog, "Something went wrong while running the primary processor" );
+        KTERROR( testpplog, "An unexpected exception was caught: " << diagnostic_information( e ) );
         return -1;
     }
 
-    KTINFO( testpplog, "Tests complete" );
-
     return 0;
 }
diff --git a/Executables/Validation/TestProcessorToolbox2Threads.cc b/Executables/Validation/TestProcessorToolbox2Threads.cc
index c43459f..65cb6dd 100644
--- a/Executables/Validation/TestProcessorToolbox2Threads.cc
+++ b/Executables/Validation/TestProcessorToolbox2Threads.cc
@@ -105,11 +105,6 @@ int main()
 
         KTINFO( testptlog, "Tests complete" );
     }
-    catch( std::exception& e )
-    {
-        KTERROR( testptlog, "Exception caught: " << e.what() );
-        return -1;
-    }
     catch( boost::exception& e )
     {
         KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
index 089407c..de583b9 100644
--- a/Executables/Validation/TestProcessorToolboxMultithreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
@@ -67,11 +67,6 @@ int main()
 
         KTINFO( testptlog, "Tests complete" );
     }
-    catch( std::exception& e )
-    {
-        KTERROR( testptlog, "Exception caught: " << e.what() );
-        return -1;
-    }
     catch( boost::exception& e )
     {
         KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
diff --git a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
index 65144ab..5e91926 100644
--- a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
+++ b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
@@ -67,11 +67,6 @@ int main()
 
         KTINFO( testptlog, "Tests complete" );
     }
-    catch( std::exception& e )
-    {
-        KTERROR( testptlog, "Exception caught: " << e.what() );
-        return -1;
-    }
     catch( boost::exception& e )
     {
         KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
diff --git a/Executables/Validation/TestSignalsAndSlots.cc b/Executables/Validation/TestSignalsAndSlots.cc
index e026364..6d11dd2 100644
--- a/Executables/Validation/TestSignalsAndSlots.cc
+++ b/Executables/Validation/TestSignalsAndSlots.cc
@@ -15,43 +15,43 @@ KTLOGGER(testsiglog, "TestSignalsAndSlots")
 
 int main()
 {
+    try
+    {
+        KTTestProcessorA tpA;
+        KTTestProcessorB tpB;
 
-    KTTestProcessorA tpA;
-    KTTestProcessorB tpB;
+        /* Basic Test
+        KTSignalWrapper* signalPtr = tpA.GetSignal("the_signal");
+        KTSlotWrapper* slot1Ptr = tpB.GetSlot("first_slot");
 
-    /* Basic Test
-    KTSignalWrapper* signalPtr = tpA.GetSignal("the_signal");
-    KTSlotWrapper* slot1Ptr = tpB.GetSlot("first_slot");
+        slot1Ptr->SetConnection(signalPtr);
 
-    slot1Ptr->SetConnection(signalPtr);
+        tpA.EmitSignals(5);
 
-    tpA.EmitSignals(5);
+        slot1Ptr->Disconnect();
 
-    slot1Ptr->Disconnect();
+        return 0;
+        */
 
-    return 0;
-    */
-
-    /* More Complicated Test */
-    KTINFO(testsiglog, "Connecting the-signal to first-slot and second-slot");
-    try
-    {
+        /* More Complicated Test */
+        KTINFO(testsiglog, "Connecting the-signal to first-slot and second-slot");
         tpA.ConnectASlot("the-signal", &tpB, "first-slot", 20);
         tpB.ConnectASignal(&tpA, "the-signal", "second-slot", 10);
+
+        KTINFO(testsiglog, "Emitting signals");
+        KTINFO(testsiglog, "First test signal: 5");
+        tpA.EmitSignals(5);
+        KTINFO(testsiglog, "Second test signal: 18");
+        tpA.EmitSignals(18);
+
+        KTINFO(testsiglog, "Tests complete");
     }
-    catch(std::exception& e)
+    catch( boost::exception& e )
     {
-        KTERROR(testsiglog, "A problem occurred while connecting the signal and slots:\n" << e.what());
+        KTERROR( testsiglog, "An exception was caught: " << diagnostic_information( e ) );
         return -1;
     }
 
-    KTINFO(testsiglog, "Emitting signals");
-    KTINFO(testsiglog, "First test signal: 5");
-    tpA.EmitSignals(5);
-    KTINFO(testsiglog, "Second test signal: 18");
-    tpA.EmitSignals(18);
-
-    KTINFO(testsiglog, "Tests complete");
     return 0;
     /**/
 }
diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Executables/Validation/TestUseBreakpoint.cc
index 738fd04..e9f76f4 100644
--- a/Executables/Validation/TestUseBreakpoint.cc
+++ b/Executables/Validation/TestUseBreakpoint.cc
@@ -84,10 +84,6 @@ int main()
 
         KTINFO( testptlog, "Tests complete" );
     }
-    catch( std::exception& e )
-    {
-        KTERROR( testptlog, "Caught exception: " << e.what() );
-    }
     catch( boost::exception& e )
     {
         KTERROR( testptlog, "Caught exception: " << diagnostic_information( e ) );
diff --git a/Library/Application/KTApplication.cc b/Library/Application/KTApplication.cc
index 0dca130..f573527 100644
--- a/Library/Application/KTApplication.cc
+++ b/Library/Application/KTApplication.cc
@@ -70,11 +70,11 @@ namespace Nymph
             scarab::param* configFromFile = translator.read_file( configFilePath.native() );
             if( configFromFile == NULL )
             {
-                throw KTException() << "[KTApplication] error parsing config file";
+                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] error parsing config file" << eom );
             }
             if( ! configFromFile->is_node() )
             {
-                throw KTException() << "[KTApplication] configuration file must consist of an object/node";
+                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] configuration file must consist of an object/node" << eom );
             }
             fConfigurator->Merge( configFromFile->as_node() );
             delete configFromFile;
@@ -87,7 +87,7 @@ namespace Nymph
             scarab::param* configFromJSON = inputJSON.read_string( clJSON );
             if( ! configFromJSON->is_node() )
             {
-                throw KTException() << "[KTApplication] command line json must be an object";
+                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] command line json must be an object" << eom );
             }
             fConfigurator->Merge( configFromJSON->as_node() );
             delete configFromJSON;
diff --git a/Library/Application/KTCommandLineHandler.cc b/Library/Application/KTCommandLineHandler.cc
index 40ea9fc..3e72779 100644
--- a/Library/Application/KTCommandLineHandler.cc
+++ b/Library/Application/KTCommandLineHandler.cc
@@ -26,10 +26,6 @@ namespace Nymph
 {
     KTLOGGER(utillog, "KTCommandLineHandler");
 
-    CommandLineHandlerException::CommandLineHandlerException (std::string const& why)
-      : std::logic_error(why)
-    {}
-
     KTCommandLineHandler::KTCommandLineHandler() :
             fExecutableName("NONE"),
             fPackageString(STRINGIFY_2(PACKAGE_STRING)),
@@ -389,7 +385,7 @@ namespace Nymph
         {
             KTERROR(utillog, "Exception caught while performing initial CL parsing:\n"
                     << '\t' << e.what());
-            throw std::logic_error(e.what());
+            BOOST_THROW_EXCEPTION( KTException() << e.what() << eom );
         }
         // Save the remaining command-line options for later parsing (after the full option list has been populated)
         fCommandLineParseLater = po::collect_unrecognized(tParsedOpts.options, po::include_positional);
diff --git a/Library/Application/KTCommandLineHandler.hh b/Library/Application/KTCommandLineHandler.hh
index ed76317..6aca4b9 100644
--- a/Library/Application/KTCommandLineHandler.hh
+++ b/Library/Application/KTCommandLineHandler.hh
@@ -9,6 +9,7 @@
 #ifndef KTCOMMANDLINEHANDLER_H_
 #define KTCOMMANDLINEHANDLER_H_
 
+#include "KTException.hh"
 #include "KTLogger.hh"
 
 #include "param.hh"
@@ -19,7 +20,6 @@ namespace po = boost::program_options;
 
 #include <map>
 #include <set>
-#include <stdexcept>
 #include <string>
 #include <vector>
 
@@ -27,13 +27,6 @@ namespace Nymph
 {
     KTLOGGER(utillog_clh, "KTCommandLineHandler.hh");
 
-    class CommandLineHandlerException : public std::logic_error
-    {
-        public:
-            CommandLineHandlerException(std::string const& why);
-    };
-
-
     /*!
      @class KTCommandLineHandler
      @author N. S. Oblath
@@ -287,7 +280,7 @@ namespace Nymph
         {
             KTWARN(utillog_clh, "Command line option <" << aCLOption << "> was not set!\n"
                    "Next time check whether it's set before calling this function.");
-            throw CommandLineHandlerException("Command line option " + aCLOption + " was not set!");
+            BOOST_THROW_EXCEPTION( KTException() << "Command line option " + aCLOption + " was not set!" << eom );
         }
         return fCommandLineVarMap[aCLOption].as< XReturnType >();
     }
diff --git a/Library/Application/KTConfigurator.hh b/Library/Application/KTConfigurator.hh
index d38872f..bbdcc49 100644
--- a/Library/Application/KTConfigurator.hh
+++ b/Library/Application/KTConfigurator.hh
@@ -60,7 +60,7 @@ namespace Nymph
         }
         catch( std::exception& e )
         {}
-        throw KTException() << "configurator does not have a value for <" << aName << ">";
+        BOOST_THROW_EXCEPTION( KTException() << "configurator does not have a value for <" << aName << ">" << eom );
     }
 
     template< typename XReturnType >
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 95bb39a..afe5bcc 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -410,12 +410,12 @@ namespace Nymph
                 signalProc->ConnectASlot(signalName, slotProc, slotName);
             }
         }
-        catch (std::exception& e)
+        catch (boost::exception& e)
         {
             KTERROR(proclog, "An error occurred while connecting signals and slots:\n"
                     << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->GetConfigName() << ")" << '\n'
                     << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->GetConfigName() << ")" << '\n'
-                    << '\t' << e.what());
+                    << '\t' << diagnostic_information( e ));
             return false;
         }
 
@@ -448,9 +448,9 @@ namespace Nymph
             slotProc->SetDoBreakpoint(slotName, true);
             return true;
         }
-        catch (std::exception& e)
+        catch (boost::exception& e)
         {
-            KTERROR(proclog, "Unable to set breakpoint: " << e.what());
+            KTERROR(proclog, "Unable to set breakpoint: " << diagnostic_information( e ));
             return false;
         }
     }
@@ -481,9 +481,9 @@ namespace Nymph
             slotProc->SetDoBreakpoint(slotName, false);
             return true;
         }
-        catch (std::exception& e)
+        catch (boost::exception& e)
         {
-            KTERROR(proclog, "Unable to set breakpoint: " << e.what());
+            KTERROR(proclog, "Unable to set breakpoint: " << diagnostic_information( e ));
             return false;
         }
     }
@@ -606,7 +606,7 @@ namespace Nymph
                 if( ! fMasterContSignal.valid() )
                 {
                     KTERROR( proclog, "Invalid master continue-signal created" );
-                    throw KTException() << "Invalid master continue-signal created";
+                    BOOST_THROW_EXCEPTION( KTException() << "Invalid master continue-signal created" << eom );
                 }
                 // copy for use in this function
                 boost::shared_future< void > continueSignal = fMasterContSignal;
@@ -633,7 +633,7 @@ namespace Nymph
                         //if( ! fThreadFutures.back().valid() )
                         //{
                         //    KTERROR( proclog, "Invalid thread future created" );
-                        //    throw KTException() << "Invalid thread future created";
+                        //    BOOST_THROW_EXCEPTION( KTException() << "Invalid thread future created";
                         //}
 
                         //fThreadIndicators.emplace_back( new KTThreadIndicator() );
@@ -691,9 +691,8 @@ namespace Nymph
                                 }
                                 catch( boost::exception& e )
                                 {
-                                    KTERROR( proclog, "Thread <" << fThreadReferences.back()->fName << "> threw an error: " << diagnostic_information( e ) );
-                                    // this transfers an exception thrown by a processor to the outer catch block in this function
-                                    throw KTException() << "An error occurred while running processor <" << procName << ">: " << diagnostic_information( e );
+                                    e << KTErrorMsgInfo( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
+                                    throw;
                                 }
                                 stillRunning = false;
                             }
@@ -712,15 +711,19 @@ namespace Nymph
             }
             catch( std::exception& e )
             {
-                KTDEBUG( proclog, "Caught exception thrown in a processor or in the single-threaded run function: " << e.what() );
                 // exceptions thrown in this function or from within processors will end up here
-                fDoRunPromise.set_exception( std::current_exception() );
+                KTERROR( proclog, "Caught std::exception thrown in a processor or in the single-threaded run function: " << e.what() );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
             }
             catch( boost::exception& e )
             {
-                KTDEBUG( proclog, "Caught exception thrown in a processor or in the single-threaded run function: " << diagnostic_information( e ) );
                 // exceptions thrown in this function or from within processors will end up here
-                fDoRunPromise.set_exception( std::current_exception() );
+                KTERROR( proclog, "Caught boost::exception thrown in a processor or in the single-threaded run function" );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
             }
             fDoRunPromise.set_value();
             return;
@@ -741,7 +744,7 @@ namespace Nymph
                 if( ! fMasterContSignal.valid() )
                 {
                     KTERROR( proclog, "Invalid master continue-signal created" );
-                    throw KTException() << "Invalid master continue-signal created";
+                    BOOST_THROW_EXCEPTION( KTException() << "Invalid master continue-signal created" << eom );
                 }
                 // copy for use in this function
                 boost::shared_future< void > continueSignal = fMasterContSignal;
@@ -837,9 +840,8 @@ namespace Nymph
                             }
                             catch( boost::exception& e )
                             {
-                                KTERROR( proclog, "Thread <" << threadName << "> threw an error: " << diagnostic_information( e ) );
-                                // this transfers an exception thrown by a processor to the outer catch block in this function
-                                throw KTException() << "An error occurred while running processor <" << threadName << ">: " << diagnostic_information( e );
+                                e << KTErrorMsgInfo( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
+                                throw;
                             }
 
                             if( fThreadReferences.empty() ) stillRunning = false;
@@ -869,7 +871,7 @@ namespace Nymph
             catch( boost::exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
-                KTERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << diagnostic_information( e ) );
+                KTERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
                 KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
                 fDoRunPromise.set_exception( boost::current_exception() );
                 return;
@@ -897,11 +899,12 @@ namespace Nymph
         boost::shared_future< void > doRunFuture = fDoRunFuture;
         if( ! doRunFuture.valid() )
         {
-            throw KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)";
+            BOOST_THROW_EXCEPTION( KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)" << eom );
         }
 
         breakContLock.unlock();
 
+        // block here until there's a break
         doRunFuture.wait();
 
         if( fDoRunBreakFlag )
@@ -912,34 +915,30 @@ namespace Nymph
 
         try
         {
-            doRunFuture.get(); // TODO: do we really need this?  NSO, 5/23/17
+            doRunFuture.get();
             KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
             return false;
         }
-        catch( std::exception& e )
+        catch( boost::exception& e )
         {
-            KTERROR( proclog, "An error occurred during processing: " << e.what() );
+            KTERROR( proclog, "An error occurred during processing: " << boost::diagnostic_information( e ) );
             return false;
         }
     }
 
     void KTProcessorToolbox::WaitForEndOfRun()
     {
-        try
-        {
-            KTDEBUG( proclog, "Waiting for end-of-run" );
-            while( WaitForBreak() )
-            {
-                KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-                WaitForContinue();
-                KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
-            }
-            KTDEBUG( proclog, "End-of-run reached" );
-        }
-        catch( std::exception& e )
+        // WaitForBreak() and WaitForContinue() throw boost::exception for problems with the future or promise objects
+
+        KTDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreak() )
         {
-            throw;
+            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            WaitForContinue();
+            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
         }
+        KTDEBUG( proclog, "End-of-run reached" );
+
         return;
     }
 
@@ -998,7 +997,7 @@ namespace Nymph
         if( tnIt == fThreadReferences.end() )
         {
             KTWARN( proclog, "Did not find thread <" << threadName << ">" );
-            throw KTException() << "Did not find thread <" << threadName << ">" ;
+            BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
         }
 
         return (*tnIt)->fDataPtrRetFuture.get();
@@ -1037,18 +1036,14 @@ namespace Nymph
 
     bool KTProcessorToolbox::Run()
     {
-        try
-        {
-            AsyncRun();
+        // can throw boost::exception
 
-            WaitForEndOfRun();
+        AsyncRun();
+
+        WaitForEndOfRun();
+
+        JoinRunThread();
 
-            JoinRunThread();
-        }
-        catch( std::exception& e )
-        {
-            throw;
-        }
         return true;
     }
 
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index dfebeae..cf6c24d 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -213,8 +213,9 @@ namespace Nymph
             void WaitForContinue();
 
             /// Returns when processing is completed or a breakpoint is reached
-            /// Throws an exception if an error occurred during processing
+            /// Throws a boost::exception if there's an error with the future object in use
             /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
             bool WaitForBreak();
 
             void WaitForEndOfRun();
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index c8df746..ff5eeaa 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -18,11 +18,6 @@ namespace Nymph
 {
     //KTLOGGER(proclog, "KTProcessor");
 
-    ProcessorException::ProcessorException (std::string const& why)
-      : std::logic_error(why)
-    {}
-
-
     KTProcessor::KTProcessor(const string& name) :
             KTConfigurable(name),
             fSignalMap(),
@@ -63,14 +58,28 @@ namespace Nymph
             // make the connection
             ConnectSignalToSlot(signal, slot, groupNum);
         }
-        catch (std::exception& e)
+        catch( KTSignalException& e )
+        {
+            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
+            e << KTErrorMsgInfo( "You may have the signal name wrong." );
+            throw;
+        }
+        catch( KTSlotException& e )
+        {
+            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
+            e << KTErrorMsgInfo( "You may have the slot name wrong." );
+            throw;
+        }
+        catch( KTConnectionException& e )
+        {
+            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
+            e << KTErrorMsgInfo( "Check that the signatures of the signal and slot match exactly." );
+            throw;
+        }
+        catch( boost::exception& e )
         {
-            string errorMsg = string("Exception caught in KTProcessor::ConnectASignal; signal: ") +
-                    signalName + string(", slot: ") + slotName + string("\n") + e.what() + string("\n") +
-                    string("\tIf the signal wrapper cannot be cast correctly, check that the signatures of the signal and slot match exactly.\n") +
-                    string("\tIf the signal pointer is NULL, you may have the signal name wrong.\n") +
-                    string("\tIf the slot pointer is NULL, you may have the slot name wrong.");
-            throw std::logic_error(errorMsg);
+            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
+            throw;
         }
 
         // record the connection in the signal-connection map
@@ -83,13 +92,13 @@ namespace Nymph
 
     void KTProcessor::ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum)
     {
-        if (signal == NULL)
+        if (signal == nullptr)
         {
-            throw ProcessorException("Signal pointer was NULL");
+            BOOST_THROW_EXCEPTION( KTSignalException() << "Signal pointer was NULL" << eom );
         }
-        if (slot == NULL)
+        if (slot == nullptr)
         {
-            throw ProcessorException("Slot pointer was NULL");
+            BOOST_THROW_EXCEPTION( KTSlotException() << "Slot pointer was NULL" << eom );
         }
 
         slot->SetConnection(signal, groupNum);
@@ -124,7 +133,8 @@ namespace Nymph
         {
             return slot->GetDoBreakpoint();
         }
-        throw KTException() << "Slot <" << slotName << "> was not found";
+        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        return false;
     }
 
     void KTProcessor::SetDoBreakpoint(const std::string& slotName, bool flag)
@@ -134,7 +144,7 @@ namespace Nymph
         {
             return slot->SetDoBreakpoint(flag);
         }
-        throw KTException() << "Slot <" << slotName << "> was not found";
+        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
         return;
     }
 
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index c4365e0..aad8d20 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -30,11 +30,11 @@ namespace Nymph
 {
     KTLOGGER(processorlog, "KTProcessor.hh");
 
-    class ProcessorException : public std::logic_error
-    {
-        public:
-            ProcessorException(std::string const& why);
-    };
+    struct KTProcessorException : virtual public KTException
+    {};
+
+    struct KTSignalException : virtual public KTException {};
+    struct KTSlotException : virtual public KTException {};
 
     class KTThreadReference;
 
diff --git a/Library/Processor/KTSignalWrapper.cc b/Library/Processor/KTSignalWrapper.cc
index 42c629c..795fc2c 100644
--- a/Library/Processor/KTSignalWrapper.cc
+++ b/Library/Processor/KTSignalWrapper.cc
@@ -9,9 +9,6 @@
 
 namespace Nymph
 {
-    SignalException::SignalException (std::string const& why)
-      : std::logic_error(why)
-    {}
 
     KTSignalWrapper::KTSignalWrapper() :
             fSignalWrapper(NULL)
diff --git a/Library/Processor/KTSignalWrapper.hh b/Library/Processor/KTSignalWrapper.hh
index 22ed542..aa4f658 100644
--- a/Library/Processor/KTSignalWrapper.hh
+++ b/Library/Processor/KTSignalWrapper.hh
@@ -23,12 +23,6 @@ namespace Nymph
         typedef typename boost::signals2::signal< Signature >::slot_type slot_type;
     };
 
-    class SignalException : public std::logic_error
-    {
-        public:
-            SignalException(std::string const& why);
-    };
-
     class KTSignalWrapper : public boost::noncopyable
     {
         public:
diff --git a/Library/Processor/KTSlotWrapper.cc b/Library/Processor/KTSlotWrapper.cc
index 2eb5f4f..66e12f1 100644
--- a/Library/Processor/KTSlotWrapper.cc
+++ b/Library/Processor/KTSlotWrapper.cc
@@ -9,13 +9,12 @@
 
 namespace Nymph
 {
-    SlotException::SlotException (std::string const& why)
-      : std::logic_error(why)
-    {}
 
     KTSlotWrapper::KTSlotWrapper() :
             fSlotWrapper(NULL),
-            fConnection()
+            fConnection(),
+            fThreadRef(),
+            fDoBreakpoint(false)
     {
     }
 
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index 158316b..86386f1 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -9,6 +9,7 @@
 #define KTSLOTWRAPPER_HH_
 
 #include "KTConnection.hh"
+#include "KTException.hh"
 #include "KTSignalWrapper.hh"
 #include "KTThreadReference.hh"
 
@@ -16,11 +17,8 @@
 
 namespace Nymph
 {
-    class SlotException : public std::logic_error
-    {
-        public:
-            SlotException(std::string const& why);
-    };
+    struct KTConnectionException : public KTException
+    {};
 
     class KTSlotWrapper : public boost::noncopyable
     {
@@ -56,7 +54,7 @@ namespace Nymph
                         SignalWrapper* derivedSignalWrapper = dynamic_cast< SignalWrapper* >(internalSignalWrap);
                         if (derivedSignalWrapper == NULL)
                         {
-                            throw SignalException("In KTSpecifiedInternalSlotWrapper::Connect:\nUnable to cast from KTInternalSignalWrapper* to derived type.");
+                            BOOST_THROW_EXCEPTION( KTConnectionException() << "Cannot make connection: unable to cast from KTInternalSignalWrapper* to this slot's derived type." << eom );
                         }
                         if (groupNum >= 0)
                         {
@@ -81,7 +79,7 @@ namespace Nymph
 
         public:
             void SetConnection(KTConnection conn);
-            void SetConnection(KTSignalWrapper* signalWrap, int groupNum=-1);
+            void SetConnection(KTSignalWrapper* signalWrap, int groupNum=-1); // can throw KTConnectionException
             void Disconnect();
 
         private:
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index 5d3a17f..c64eaef 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -35,7 +35,7 @@ namespace Nymph
         if( ! fDataPtrRetFuture.valid() )
         {
             KTERROR( trlog, "Invalid data-pointer-return future created" );
-            throw KTException() << "Invalid data-pointer-return future created";
+            BOOST_THROW_EXCEPTION( KTException() << "Invalid data-pointer-return future created" << eom );
         }
     }
 
diff --git a/Library/Utility/KTException.cc b/Library/Utility/KTException.cc
index 55a7a5f..62d0810 100644
--- a/Library/Utility/KTException.cc
+++ b/Library/Utility/KTException.cc
@@ -11,13 +11,15 @@ namespace Nymph
 {
 
     KTException::KTException() :
+            boost::exception(),
             std::exception(),
-            fException( "" )
+            fMsgBuffer( "" )
     {
     }
     KTException::KTException( const KTException& an_exception ) :
-            std::exception(),
-            fException( an_exception.fException )
+            boost::exception( an_exception ),
+            std::exception( an_exception ),
+            fMsgBuffer( an_exception.fMsgBuffer )
     {
     }
 
@@ -27,7 +29,12 @@ namespace Nymph
 
     const char* KTException::what() const throw ()
     {
-        return fException.c_str();
+        if( ! fMsgBuffer.empty() )
+        {
+            *this << KTErrorMsgInfo{ fMsgBuffer };
+            fMsgBuffer.clear();
+        }
+        return this->std::exception::what();
     }
 
 }
diff --git a/Library/Utility/KTException.hh b/Library/Utility/KTException.hh
index a599fbf..c2b256c 100644
--- a/Library/Utility/KTException.hh
+++ b/Library/Utility/KTException.hh
@@ -9,30 +9,86 @@
 #ifndef KTEXCEPTION_HH_
 #define KTEXCEPTION_HH_
 
+#include <boost/exception/all.hpp>
+
 #include <exception>
 #include <sstream>
 #include <string>
 
 namespace Nymph
 {
+    struct KTMessageEnd {};
+    static const KTMessageEnd eom = KTMessageEnd();
+
+    typedef boost::error_info<struct tag_errmsg, std::string> KTErrorMsgInfo;
+
+    /*!
+     @class KTException
+     @author N.S. Oblath
+
+     @brief Exception base class for Nymph and Nymph-based projects
+
+     @details
+
+     How to throw:
+
+     BOOST_THROW_EXCEPTION( KTException() << "[error message here]" << eom );
+
+     Why do it like this?
+      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
+      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
+      - KTException can be replaced with whatever derived exception class you're using.
+
+      How to catch, add information, and re-throw:
+
+      try
+      {
+          // code that throws a KTException
+      }
+      catch( boost::exception& e )
+      {
+          e << KTErrorMsgInfo( "Here's some information about the context in which the exception was thrown" );
+          throw;
+      }
+
 
-    class KTException :
-        public std::exception
+      How to do the final catch
+
+      try
+      {
+          // code that throws a KTException
+      }
+      catch( boost::exception& e )
+      {
+          KTERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
+      }
+    */
+
+    class KTException : virtual public boost::exception, virtual public std::exception
     {
         public:
             KTException();
             KTException( const KTException& );
             ~KTException() throw ();
 
+            // adds to the message buffer
             template< class XStreamable >
             KTException& operator<<( XStreamable a_fragment );
+            // adds to the message buffer
             KTException& operator<<( const std::string& a_fragment );
+            // adds to the message buffer
             KTException& operator<<( const char* a_fragment );
 
+            // adds the current contents of the message buffer as a KTErrorMsgInfo
+            KTException& operator<<( const KTMessageEnd& eom );
+
+            // overload for KTErrorMsgInfo to make sure error messages are streamed correctly, and not via the template function
+            const KTException& operator<<( KTErrorMsgInfo& emi );
+
             virtual const char* what() const throw();
 
         private:
-            std::string fException;
+            mutable std::string fMsgBuffer;
     };
 
     template< class XStreamable >
@@ -40,22 +96,37 @@ namespace Nymph
     {
         std::stringstream stream;
         stream << a_fragment;
-        stream >> fException;
+        stream >> fMsgBuffer;
         return *this;
     }
 
     inline KTException& KTException::operator<<( const std::string& a_fragment )
     {
-        fException += a_fragment;
+        fMsgBuffer += a_fragment;
         return *this;
     }
 
     inline KTException& KTException::operator<<( const char* a_fragment )
     {
-        fException += std::string( a_fragment );
+        fMsgBuffer += std::string( a_fragment );
         return *this;
     }
 
+    inline KTException& KTException::operator<<( const KTMessageEnd& eom )
+    {
+        if( ! fMsgBuffer.empty() )
+        {
+            boost::operator<<( *this, KTErrorMsgInfo{ fMsgBuffer } );
+            fMsgBuffer.clear();
+        }
+        return *this;
+    }
+
+    inline const KTException& KTException::operator<<( KTErrorMsgInfo& emi )
+    {
+        return boost::operator<<( *this, emi );
+    }
+
 }
 
 #endif /* KTEXCEPTION_HH_ */

From 626260a51ec7a46539be2a0ad8213fb7865640ec Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 25 May 2017 16:04:45 -0700
Subject: [PATCH 042/521] Promoted KTThreadRef to a class and partial work on
 adapting to its encapsulation

---
 .../Validation/KTTestPrimaryProcessor.cc      |   2 +-
 Executables/Validation/TestExceptionInSlot.cc |   6 +-
 .../Validation/TestPrimaryProcessor.cc        |  10 +-
 Library/Application/KTProcessorToolbox.cc     |  38 ++---
 Library/Application/KTProcessorToolbox.hh     |   2 +-
 Library/Data/KTApplyCut.cc                    |   2 +-
 Library/Data/KTData.hh                        |   8 --
 Library/Processor/KTPrimaryProcessor.cc       |   8 +-
 Library/Processor/KTSlot.hh                   |   4 +-
 Library/Processor/KTSlotWrapper.hh            |   5 +-
 Library/Processor/KTThreadReference.cc        |  43 ++----
 Library/Processor/KTThreadReference.hh        | 135 ++++++++++++++----
 12 files changed, 151 insertions(+), 112 deletions(-)

diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
index 42f8aab..d9270de 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -39,7 +39,7 @@ namespace Nymph
             // e.g. for a real processor, do some work here instead of sleeping
             boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
 
-            if( fThreadRef->fCanceled ) break;
+            if( fThreadRef->GetCanceled() ) break;
 
             fTheSignal( iIteration );
         }
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index f036428..2f889d0 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -54,7 +54,7 @@ int main()
             }
             catch( boost::exception& e )
             {
-                exeThreadRef->fDataPtrRet.set_exception( boost::current_exception() );
+                exeThreadRef->SetReturnException( boost::current_exception() );
             }
 
             return;
@@ -64,11 +64,11 @@ int main()
         boost::thread thread( exeFunc );
 
         // wait for a result to be set
-        exeThreadRef->fDataPtrRetFuture.wait();
+        exeThreadRef->GetDataPtrRetFuture().wait();
 
         try
         {
-            exeThreadRef->fDataPtrRetFuture.get();
+            exeThreadRef->GetReturnValue();
         }
         //catch( std::exception& e )
         //{
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
index 219905e..21a7aee 100644
--- a/Executables/Validation/TestPrimaryProcessor.cc
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -30,8 +30,8 @@ int main()
         // setup to execute processors asynchronously
         //KTThreadReference exeThreadRef;
         //auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
-        std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
-        exeThreadRef->fName = std::string( "tpp" );
+        std::shared_ptr< KTThreadReference > exeThreadRef( std::make_shared< KTThreadReference >() );
+        exeThreadRef->Name() = std::string( "tpp" );
 
         // run the thread
         boost::condition_variable threadStartedCV;
@@ -48,15 +48,15 @@ int main()
         KTDEBUG( testpplog, "Thread has started" );
 
         // wait for a result to be set
-        exeThreadRef->fDataPtrRetFuture.wait();
+        exeThreadRef->GetDataPtrRetFuture().wait();
 
         try
         {
-            exeThreadRef->fDataPtrRetFuture.get();
+            exeThreadRef->GetReturnValue();
         }
         catch( boost::exception& e )
         {
-            exeThreadRef->fCanceled = true;
+            exeThreadRef->SetCanceled( true );
             KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
         }
 
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index afe5bcc..839e355 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -624,7 +624,7 @@ namespace Nymph
 
                         //KTThreadReference thisThreadRef;
                         std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                        thisThreadRef->fName = procName;
+                        thisThreadRef->Name() = procName;
 
                         //fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
                         //fThreadNames.push_back( procName );
@@ -638,10 +638,10 @@ namespace Nymph
 
                         //fThreadIndicators.emplace_back( new KTThreadIndicator() );
                         //fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
-                        thisThreadRef->fContinueSignal = fMasterContSignal;
+                        thisThreadRef->SetContinueSignal( fMasterContSignal );
 
                         //thisThreadRef->fThreadIndicator = fThreadIndicators.back();
-                        thisThreadRef->fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
+                        thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
                         //thisThreadRef->fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
                         fThreadReferences.push_back( thisThreadRef );
@@ -669,13 +669,13 @@ namespace Nymph
                             boost::future_status status;
                             do
                             {
-                                status = fThreadReferences.back()->fDataPtrRetFuture.wait_for( boost::chrono::milliseconds(500) );
+                                status = fThreadReferences.back()->GetDataPtrRetFuture().wait_for( boost::chrono::milliseconds(500) );
                             } while (status != boost::future_status::ready);
 
                             stillRunning = false;
-                            if( fThreadReferences.back()->fBreakFlag )
+                            if( fThreadReferences.back()->GetBreakFlag() )
                             {
-                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << fThreadReferences.back()->fName << ">; may not be where breakpoint is set)" );
+                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << procName << ">; may not be where breakpoint is set)" );
                                 continueSignal.wait();
                                 KTDEBUG( proclog, "Breakpoint finished" );
                                 stillRunning = true;
@@ -685,8 +685,8 @@ namespace Nymph
                             {
                                 try
                                 {
-                                    fThreadReferences.back()->fDataPtrRetFuture.get();
-                                    KTINFO( proclog, "Thread <" << fThreadReferences.back()->fName << "> has finished" );
+                                    fThreadReferences.back()->GetReturnValue();
+                                    KTINFO( proclog, "Thread <" << procName << "> has finished" );
                                     fThreadReferences.pop_back();
                                 }
                                 catch( boost::exception& e )
@@ -765,17 +765,17 @@ namespace Nymph
 
                             //KTThreadReference thisThreadRef;
                             std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                            thisThreadRef->fName = procName;
+                            thisThreadRef->Name() = procName;
 
                             //fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
                             //fThreadNames.push_back( procName );
 
                             //fThreadIndicators.emplace_back( new KTThreadIndicator() );
                             //fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
-                            thisThreadRef->fContinueSignal = fMasterContSignal;
+                            thisThreadRef->SetContinueSignal( fMasterContSignal );
 
                             //thisThreadRef->fThreadIndicator = fThreadIndicators.back();
-                            thisThreadRef->fInitiateBreakFunc = [&](){ this->InitiateBreak(); };
+                            thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
                             //thisThreadRef->fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
                             boost::condition_variable threadStartedCV;
                             boost::mutex threadStartedMutex;
@@ -807,9 +807,9 @@ namespace Nymph
                         auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
                         size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
                         auto finishedReferencePtr = fThreadReferences.begin() + iThread;
-                        std::string threadName( (*finishedReferencePtr)->fName );
+                        std::string threadName( (*finishedReferencePtr)->Name() );
                         //KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
-                        KTWARN( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" ); // TODO: swtich this back to DEBUG
+                        KTWARN( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" ); // TODO: switch this back to DEBUG
 
                         stillRunning = false;
                         if( fDoRunBreakFlag )
@@ -960,7 +960,7 @@ namespace Nymph
         fDoRunBreakFlag = false;
         for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
-            (*tiIt)->fBreakFlag = false;
+            (*tiIt)->SetBreakFlag( false );
             (*tiIt)->RefreshDataPtrRet();
         }
 
@@ -979,7 +979,7 @@ namespace Nymph
         fMasterContSignal = fContinueSignaler.get_future().share();
         for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
-            (*tiIt)->fContinueSignal = fMasterContSignal;
+            (*tiIt)->SetContinueSignal( fMasterContSignal );
         }
 
         return;
@@ -992,7 +992,7 @@ namespace Nymph
         auto tnIt = fThreadReferences.begin();
         for( ; tnIt != fThreadReferences.end(); ++tnIt )
         {
-            if( (*tnIt)->fName == threadName ) break;
+            if( (*tnIt)->Name() == threadName ) break;
         }
         if( tnIt == fThreadReferences.end() )
         {
@@ -1000,7 +1000,7 @@ namespace Nymph
             BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
         }
 
-        return (*tnIt)->fDataPtrRetFuture.get();
+        return (*tnIt)->GetReturnValue();
     }
 
     void KTProcessorToolbox::InitiateBreak()
@@ -1014,7 +1014,7 @@ namespace Nymph
         // thread break flags
         for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
-            (*tiIt)->fBreakFlag = true;
+            (*tiIt)->SetBreakFlag( true );
         }
 
         // use the do-run promise to signal the break
@@ -1029,7 +1029,7 @@ namespace Nymph
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
         for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
         {
-            (*tiIt)->fCanceled = true;
+            (*tiIt)->SetCanceled( true );
         }
         return;
     }
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index cf6c24d..b05cb6d 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -290,7 +290,7 @@ namespace Nymph
 
             Value& dereference() const
             {
-                return (*(this->base_reference()))->fDataPtrRetFuture;
+                return (*(this->base_reference()))->GetDataPtrRetFuture();
             }
     };
 
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index a4535ea..47b5e98 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -89,7 +89,7 @@ namespace Nymph
 
         if (fCut == NULL)
         {
-            ref->fDataPtrRet.set_exception( std::make_exception_ptr( KTException() << "No cut was specified" ) );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "No cut was specified" );
             return;
         }
 
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 32838e9..1f93d4f 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -13,9 +13,6 @@
 #include "KTCutStatus.hh"
 #include "KTMemberVariable.hh"
 
-#include <boost/thread/future.hpp>
-
-//#include <future>
 #include <memory>
 #include <string>
 
@@ -75,10 +72,5 @@ namespace Nymph
 
     typedef std::shared_ptr< KTData > KTDataPtr;
 
-    typedef boost::promise< KTDataPtr > KTDataPtrReturn;
-
-#define THROW_RETURN_EXCEPTION( ret_promise, exception ) \
-    ret_promise.set_exception( std::make_exception_ptr( exception ) );
-
 } /* namespace Nymph */
 #endif /* KTDATA_HH_ */
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index cfce927..9e16eaf 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -52,16 +52,16 @@ namespace Nymph
             if( ! Run() )
             {
                 KTERROR( proclog, "An error occurred during processor running." );
-                THROW_RETURN_EXCEPTION( fThreadRef->fDataPtrRet, KTException() << "An error occurred during processor running" );
+                THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
             }
             else
             {
-                fThreadRef->fDataPtrRet.set_value( KTDataPtr() );
+                fThreadRef->SetReturnValue( KTDataPtr() );
             }
         }
-        catch( ... )
+        catch( boost::exception& e )
         {
-            fThreadRef->fDataPtrRet.set_exception( std::current_exception() );
+            fThreadRef->SetReturnException( boost::current_exception() );
         }
         return;
     }
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 6019dae..9840131 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -275,7 +275,7 @@ namespace Nymph
         if( ! DataPresent< XDataTypes... >( dataPtr ) )
         {
             KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            THROW_RETURN_EXCEPTION( ref->fDataPtrRet, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
             return;
         }
 
@@ -283,7 +283,7 @@ namespace Nymph
         if( ! fFunc( dataPtr->Of< XDataTypes >()... ) )
         {
             KTERROR( slotlog, "Something went wrong in slot <" << fName << ">. Aborting." );
-            THROW_RETURN_EXCEPTION( ref->fDataPtrRet, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
             return;
         }
 
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library/Processor/KTSlotWrapper.hh
index 86386f1..70d3f3f 100644
--- a/Library/Processor/KTSlotWrapper.hh
+++ b/Library/Processor/KTSlotWrapper.hh
@@ -102,9 +102,10 @@ namespace Nymph
     KTSlotWrapper::KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont) :
             fSlotWrapper(new KTSpecifiedInternalSlotWrapper< XSignature, XTypeContainer >(signalPtr, typeCont)),
             fConnection(),
-            fThreadRef(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
             fDoBreakpoint(false)
-    {}
+    {
+    }
 
     inline void KTSlotWrapper::SetConnection(KTConnection conn)
     {
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index c64eaef..c934fd2 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -14,23 +14,15 @@ KTLOGGER( trlog, "KTThreadReference" );
 
 namespace Nymph
 {
-    //KTThreadIndicator::KTThreadIndicator() :
-    //        fBreakFlag( false ),
-    //        fContinueSignal(),
-    //        fCanceled( false )
-    //{}
 
     KTThreadReference::KTThreadReference() :
             fName(),
+            fBreakFlag( false ),
+            fCanceled( false ),
             fDataPtrRet(),
             fDataPtrRetFuture( fDataPtrRet.get_future() ),
             fInitiateBreakFunc( [](){return;} ),
-            fRefreshFutureFunc( [](const std::string&, boost::shared_future< KTDataPtr >&&){return;} ),
-            //fThreadIndicator( new KTThreadIndicator() ),
-            fBreakFlag( false ),
-            fContinueSignal(),
-            fCanceled( false ),
-            fPrimaryProcName()
+            fContinueSignal()
     {
         if( ! fDataPtrRetFuture.valid() )
         {
@@ -41,17 +33,13 @@ namespace Nymph
 
     KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
             fName( std::move( orig.fName ) ),
+            fBreakFlag( orig.fBreakFlag ),
+            fCanceled( orig.fCanceled ),
             fDataPtrRet( std::move( orig.fDataPtrRet ) ),
             fDataPtrRetFuture( std::move( orig.fDataPtrRetFuture ) ),
             fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
-            fRefreshFutureFunc( std::move( orig.fRefreshFutureFunc ) ),
-            //fThreadIndicator( orig.fThreadIndicator ),
-            fBreakFlag( orig.fBreakFlag ),
-            fContinueSignal( std::move( orig.fContinueSignal ) ),
-            fCanceled( orig.fCanceled ),
-            fPrimaryProcName( std::move( orig.fPrimaryProcName ) )
+            fContinueSignal( std::move( orig.fContinueSignal ) )
     {
-        //orig.fThreadIndicator = nullptr;
         orig.fBreakFlag = false;
         orig.fCanceled = false;
     }
@@ -59,17 +47,13 @@ namespace Nymph
     KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
     {
         fName = std::move( orig.fName );
+        fBreakFlag = orig.fBreakFlag;
+        fCanceled = orig.fCanceled;
         fDataPtrRet = std::move( orig.fDataPtrRet );
         fDataPtrRetFuture = std::move( orig.fDataPtrRetFuture );
         fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
-        fRefreshFutureFunc = std::move( orig.fRefreshFutureFunc );
-        //fThreadIndicator = orig.fThreadIndicator;
-        fBreakFlag = orig.fBreakFlag;
         fContinueSignal = std::move( orig.fContinueSignal );
-        fCanceled = orig.fCanceled;
-        fPrimaryProcName = std::move( orig.fPrimaryProcName );
 
-        //orig.fThreadIndicator = nullptr;
         orig.fBreakFlag = false;
         orig.fCanceled = false;
 
@@ -90,21 +74,10 @@ namespace Nymph
             KTWARN( trlog, "Setting value of data-ptr-ret promise (" << fName << ")" );
             fDataPtrRet.set_value( dataPtr );
             // wait for continue signal
-            //fThreadIndicator->fContinueSignal.wait();
             fContinueSignal.wait();
-            // reset the promise
-            //fDataPtrRet = KTDataPtrReturn();
-            // pass the future back to the processor toolbox (if it's in use)
-            //fRefreshFutureFunc( fPrimaryProcName, std::move( fDataPtrRet.get_future().share() ) );
         }
         return;
     }
 
-    void KTThreadReference::RefreshDataPtrRet()
-    {
-        fDataPtrRet = KTDataPtrReturn();
-        fDataPtrRetFuture = fDataPtrRet.get_future();
-        return;
-    }
 
 } /* namespace Nymph */
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 5e1be14..d15526e 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -16,39 +16,112 @@
 
 namespace Nymph
 {
-    //struct KTThreadIndicator
-    //{
-    //    bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
-    //    boost::shared_future< void > fContinueSignal;
-    //    bool fCanceled;
-    //    KTThreadIndicator();
-    //};
-
-    struct KTThreadReference
-    {
-        std::string fName;
-        KTDataPtrReturn fDataPtrRet;
-        boost::unique_future< KTDataPtr > fDataPtrRetFuture;
-        std::function< void() > fInitiateBreakFunc;
-        std::function< void(const std::string&, boost::shared_future< KTDataPtr >&&) > fRefreshFutureFunc;
-        //std::shared_ptr< KTThreadIndicator > fThreadIndicator;
-        bool fBreakFlag; // only use outside of blocks protected by a mutex are reads, so we shouldn't need to make this an atomic
-        boost::shared_future< void > fContinueSignal;
-        bool fCanceled;
-        std::string fPrimaryProcName;
-
-        KTThreadReference();
-        KTThreadReference( const KTThreadReference& ) = delete;
-        KTThreadReference( KTThreadReference&& orig );
-
-        KTThreadReference& operator=( const KTThreadReference& ) = delete;
-        KTThreadReference& operator=( KTThreadReference&& );
-
-        void Break( const KTDataPtr& dataPtr, bool doBreakpoint  );
-
-        void RefreshDataPtrRet();
+    typedef boost::promise< KTDataPtr > KTDataPtrReturn;
+
+    class KTThreadReference
+    {
+        public:
+            KTThreadReference();
+            KTThreadReference( const KTThreadReference& ) = delete;
+            KTThreadReference( KTThreadReference&& orig );
+
+            KTThreadReference& operator=( const KTThreadReference& ) = delete;
+            KTThreadReference& operator=( KTThreadReference&& );
+
+        public:
+            //**************************
+            // for use within the thread
+            //**************************
+
+            void Break( const KTDataPtr& dataPtr, bool doBreakpoint  );
+
+            void SetReturnException( boost::exception_ptr excPtr );
+            void SetReturnValue( KTDataPtr dataPtr );
+
+        public:
+            //******************************
+            // for use outside of the thread
+            //******************************
+
+            KTDataPtr GetReturnValue();
+            boost::unique_future< KTDataPtr >& GetDataPtrRetFuture();
+            const boost::unique_future< KTDataPtr >& GetDataPtrRetFuture() const;
+
+            void RefreshDataPtrRet();
+
+            void SetContinueSignal( const boost::shared_future< void >& contSig );
+            void SetInitiateBreakFunc( const std::function< void() >& initBreakFunc );
+
+        public:
+            MEMBERVARIABLEREF( std::string, Name );
+            MEMBERVARIABLE( bool, BreakFlag );
+            MEMBERVARIABLE( bool, Canceled );
+
+        private:
+            KTDataPtrReturn fDataPtrRet;
+            boost::unique_future< KTDataPtr > fDataPtrRetFuture;
+            std::function< void() > fInitiateBreakFunc;
+            boost::shared_future< void > fContinueSignal;
     };
 
+    inline void KTThreadReference::SetReturnException( boost::exception_ptr excPtr )
+    {
+        fDataPtrRet.set_exception( excPtr );
+        return;
+    }
+
+    inline void KTThreadReference::SetReturnValue( KTDataPtr dataPtr )
+    {
+        fDataPtrRet.set_value( dataPtr );
+        return;
+    }
+
+    inline KTDataPtr KTThreadReference::GetReturnValue()
+    {
+        return fDataPtrRetFuture.get();
+    }
+
+    inline boost::unique_future< KTDataPtr >& KTThreadReference::GetDataPtrRetFuture()
+    {
+        return fDataPtrRetFuture;
+    }
+
+    inline const boost::unique_future< KTDataPtr >& KTThreadReference::GetDataPtrRetFuture() const
+    {
+        return fDataPtrRetFuture;
+    }
+
+    inline void KTThreadReference::RefreshDataPtrRet()
+    {
+        fDataPtrRet = KTDataPtrReturn();
+        fDataPtrRetFuture = fDataPtrRet.get_future();
+        return;
+    }
+
+    inline void KTThreadReference::SetContinueSignal( const boost::shared_future< void >& contSig )
+    {
+        fContinueSignal = contSig;
+        return;
+    }
+
+    inline void KTThreadReference::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
+    {
+        fInitiateBreakFunc = initBreakFunc;
+        return;
+    }
+
+#ifndef THROW_THREADREF_EXCEPTION
+#define THROW_THREADREF_EXCEPTION( ref, exc ) \
+        try \
+        { \
+            BOOST_THROW_EXCEPTION( exc ); \
+        } \
+        catch( ::boost::exception& e ) \
+        { \
+            ref->SetReturnException( ::boost::current_exception() ); \
+        }
+#endif // THROW_THREADREF_EXCEPTION
+
 } /* namespace Nymph */
 
 #endif /* KTTHREADREFERENCE_HH_ */

From 141333d6345a903bbfcfbcfc1f529d674fefe71a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 25 May 2017 16:34:06 -0700
Subject: [PATCH 043/521] Breaking changes to MemberVariable.hh: reference-type
 members now have const and non-const access functions instead of getters and
 setters

---
 Executables/Validation/KTTestCuts.cc        |  4 ++--
 Executables/Validation/TestApplyCut.cc      |  2 +-
 Executables/Validation/TestCut.cc           |  2 +-
 Executables/Validation/TestCutFilter.cc     |  2 +-
 Executables/Validation/TestPrintData.cc     |  4 ++--
 Library/Application/KTPrintDataStructure.cc |  2 +-
 Library/Data/KTCutFilter.cc                 |  4 ++--
 Library/Data/KTData.hh                      |  9 +------
 Library/Utility/KTMemberVariable.hh         | 26 ++++++++++-----------
 9 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index 99fb290..e66ff30 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -48,7 +48,7 @@ namespace Nymph
         bool isCut = ! testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
         KTDEBUG(testlog, "Is data cut? " << isCut);
-        data.GetCutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
+        data.CutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
         return isCut;
     }
 
@@ -71,7 +71,7 @@ namespace Nymph
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
         KTDEBUG(testlog, "Is data cut? " << isCut);
         // use the name-based AddCutResult
-        data.GetCutStatus().AddCutResult("not-awesome-cut", isCut);
+        data.CutStatus().AddCutResult("not-awesome-cut", isCut);
         return isCut;
     }
 
diff --git a/Executables/Validation/TestApplyCut.cc b/Executables/Validation/TestApplyCut.cc
index e808aeb..fbde4bb 100644
--- a/Executables/Validation/TestApplyCut.cc
+++ b/Executables/Validation/TestApplyCut.cc
@@ -20,7 +20,7 @@ int main()
     KTDataPtr dataPtr(new KTData());
     KTTestData& testData = dataPtr->Of< KTTestData >();
 
-    KTCutStatus& cutStatus = dataPtr->GetCutStatus();
+    KTCutStatus& cutStatus = dataPtr->CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTApplyCut applyCut;
diff --git a/Executables/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
index a507728..968f880 100644
--- a/Executables/Validation/TestCut.cc
+++ b/Executables/Validation/TestCut.cc
@@ -19,7 +19,7 @@ int main()
     KTData data;
     KTTestData& testData = data.Of< KTTestData >();
 
-    KTCutStatus& cutStatus = data.GetCutStatus();
+    KTCutStatus& cutStatus = data.CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTINFO(testlog, "Applying awesome cut");
diff --git a/Executables/Validation/TestCutFilter.cc b/Executables/Validation/TestCutFilter.cc
index 718a8fa..d2306ec 100644
--- a/Executables/Validation/TestCutFilter.cc
+++ b/Executables/Validation/TestCutFilter.cc
@@ -21,7 +21,7 @@ int main()
     KTDataPtr dataPtr(new KTData());
     KTTestData& testData = dataPtr->Of< KTTestData >();
 
-    KTCutStatus& cutStatus = dataPtr->GetCutStatus();
+    KTCutStatus& cutStatus = dataPtr->CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTApplyCut applyCut;
diff --git a/Executables/Validation/TestPrintData.cc b/Executables/Validation/TestPrintData.cc
index f37bf67..ed6fe50 100644
--- a/Executables/Validation/TestPrintData.cc
+++ b/Executables/Validation/TestPrintData.cc
@@ -53,7 +53,7 @@ namespace Nymph
             bool Apply(KTData& data, KTTestData& testData)
             {
                 bool isCut = ! testData.GetIsAwesome();
-                data.GetCutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
+                data.CutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
                 return isCut;
             }
 
@@ -90,7 +90,7 @@ namespace Nymph
             {
                 bool isCut = testData.GetIsAwesome();
                 // use the name-based AddCutResult
-                data.GetCutStatus().AddCutResult("not-awesome-cut", isCut);
+                data.CutStatus().AddCutResult("not-awesome-cut", isCut);
                 return isCut;
             }
 
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index dd04708..29c42e7 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -100,7 +100,7 @@ namespace Nymph
     {
         std::stringstream printbuf;
 
-        KTCutStatus& cutStatus = dataPtr->GetCutStatus();
+        KTCutStatus& cutStatus = dataPtr->CutStatus();
         printbuf << "\n" << cutStatus;
 
         const KTCutResult* cutResult = cutStatus.CutResults();
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index af4fcb1..c8e6e9b 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -60,10 +60,10 @@ namespace Nymph
     {
         if (fAllBits)
         {
-            return data.GetCutStatus().IsCut();
+            return data.CutStatus().IsCut();
         }
 
-        KTCutStatus& cutStatus = data.GetCutStatus();
+        KTCutStatus& cutStatus = data.CutStatus();
         if (fConvertToBitset)
         {
             fCutMask = cutStatus.ToBitset(fCutMaskInt);
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 1f93d4f..6b5a18c 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -57,19 +57,12 @@ namespace Nymph
             MEMBERVARIABLE(unsigned, Counter);
             MEMBERVARIABLE(bool, LastData);
 
-            MEMBERVARIABLEREF_NOSET(KTCutStatus, CutStatus);
-            // additional non-const get function
-            KTCutStatus& GetCutStatus();
+            MEMBERVARIABLEREF(KTCutStatus, CutStatus);
 
         public:
             static const std::string sName;
     };
 
-    inline KTCutStatus& KTData::GetCutStatus()
-    {
-        return fCutStatus;
-    }
-
     typedef std::shared_ptr< KTData > KTDataPtr;
 
 } /* namespace Nymph */
diff --git a/Library/Utility/KTMemberVariable.hh b/Library/Utility/KTMemberVariable.hh
index 4f36539..ded3ae2 100644
--- a/Library/Utility/KTMemberVariable.hh
+++ b/Library/Utility/KTMemberVariable.hh
@@ -54,8 +54,8 @@
 
 
 /**
- * Creates a member variable with type TYPE name f[NAME], plus getters and setters.
- * MEMBERVARIABLEREF_NOSET will provide the variable and getter, but no setter, allowing you to provide a custom setter.
+ * Creates a member variable with type TYPE name f[NAME], const and non-const access functions.
+ * MEMBERVARIABLEREF_CONST will provide the variable and the const access function, but no non-const access function.
  *
  * Usage example, in a class header file:
  *     MEMBERVARIABLEREF(std::string, MyVar)
@@ -66,36 +66,36 @@
  *     private:
  *         TYPE f[NAME];
  *     public:
- *         inline const TYPE& Get[NAME]() const
+ *         inline const TYPE& [NAME]() const
  *         {
  *             return f[NAME];
  *         }
- *         inline void Set[NAME](const TYPE& var)
+ *         inline TYPE& [NAME]()
  *         {
- *             f[NAME] = var;
+ *             return f[NAME];
  *         }
  */
-#define MEMBERVARIABLEREF_NOSET(TYPE, NAME) \
+#define MEMBERVARIABLEREF_CONST(TYPE, NAME) \
         private: \
             TYPE f##NAME; \
         public: \
-            inline const TYPE& Get##NAME() const {return f##NAME;} \
-            inline TYPE& GET##NAME() {return f##NAME;}
+            inline const TYPE& NAME() const {return f##NAME;} \
+            inline TYPE& NAME() {return f##NAME;}
 
 #define MEMBERVARIABLEREF(TYPE, NAME) \
-        MEMBERVARIABLEREF_NOSET(TYPE, NAME) \
-            inline void Set##NAME(const TYPE& var) {f##NAME = var; return;}
+        MEMBERVARIABLEREF_CONST(TYPE, NAME) \
+            inline TYPE& NAME(const TYPE& var) {return f##NAME;}
 
 #define MEMBERVARIABLEREF_PROTECTED_NOSET(TYPE, NAME) \
         protected: \
             TYPE f##NAME; \
         public: \
-            inline const TYPE& Get##NAME() const {return f##NAME;} \
-            inline TYPE& GET##NAME() {return f##NAME;}
+            inline const TYPE& NAME() const {return f##NAME;} \
+            inline TYPE& NAME() {return f##NAME;}
 
 #define MEMBERVARIABLEREF_PROTECTED(TYPE, NAME) \
         MEMBERVARIABLEREF_PROTECTED_NOSET(TYPE, NAME) \
-            inline void Set##NAME(const TYPE& var) {f##NAME = var; return;}
+            inline TYPE& NAME() {return f##NAME;}
 
 
 #endif /* KTMEMBERVARIABLE_HH_ */

From 8503de9fd435461879f73ab11cbc11a49a96ba96 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 25 May 2017 16:47:51 -0700
Subject: [PATCH 044/521] Updating the scarab commit, and some cleanup

---
 Executables/Validation/TestExceptionInSlot.cc |  6 ---
 .../Validation/TestPrimaryProcessor.cc        |  2 -
 Library/Application/KTProcessorToolbox.cc     | 52 +++----------------
 Library/Application/KTProcessorToolbox.hh     | 19 +------
 Scarab                                        |  2 +-
 5 files changed, 9 insertions(+), 72 deletions(-)

diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 2f889d0..6961c6b 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -30,7 +30,6 @@ int main()
 
         // setup to execute processors asynchronously
         std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
-        //boost::shared_future< KTDataPtr > exeThreadFuture = exeThreadRef->fDataPtrRetFuture;
         tpC.GetSlot( "first-slot" )->SetThreadRef( exeThreadRef );
 
         std::atomic< bool > canceled( false );
@@ -70,11 +69,6 @@ int main()
         {
             exeThreadRef->GetReturnValue();
         }
-        //catch( std::exception& e )
-        //{
-        //    canceled = true;
-        //    KTERROR( testexclog, "An error occurred while running a processor: " << e.what() );
-        //}
         catch( boost::exception& e )
         {
             canceled = true;
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
index 21a7aee..0fc9499 100644
--- a/Executables/Validation/TestPrimaryProcessor.cc
+++ b/Executables/Validation/TestPrimaryProcessor.cc
@@ -28,8 +28,6 @@ int main()
         tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
 
         // setup to execute processors asynchronously
-        //KTThreadReference exeThreadRef;
-        //auto exeThreadFuture = exeThreadRef.fDataPtrRet.get_future();
         std::shared_ptr< KTThreadReference > exeThreadRef( std::make_shared< KTThreadReference >() );
         exeThreadRef->Name() = std::string( "tpp" );
 
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 839e355..eb41286 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -33,8 +33,7 @@ namespace Nymph
             fRunQueue(),
             fProcMap(),
             fThreadReferences(),
-            fThreadFuturesMutex(),
-            //fThreadFutures(),
+            fThreadReferencesMutex(),
             fContinueSignaler(),
             fMasterContSignal(),
             fBreakContMutex(),
@@ -617,32 +616,17 @@ namespace Nymph
                 {
                     for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                     {
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
 
                         std::string procName( tgIter->fName );
                         KTINFO( proclog, "Starting processor <" << procName << ">" );
 
-                        //KTThreadReference thisThreadRef;
                         std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                         thisThreadRef->Name() = procName;
 
-                        //fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
-                        //fThreadNames.push_back( procName );
-                        //auto& futureNameIndex = fThreadFutures.get<1>();
-
-                        //if( ! fThreadFutures.back().valid() )
-                        //{
-                        //    KTERROR( proclog, "Invalid thread future created" );
-                        //    BOOST_THROW_EXCEPTION( KTException() << "Invalid thread future created";
-                        //}
-
-                        //fThreadIndicators.emplace_back( new KTThreadIndicator() );
-                        //fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
                         thisThreadRef->SetContinueSignal( fMasterContSignal );
 
-                        //thisThreadRef->fThreadIndicator = fThreadIndicators.back();
                         thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                        //thisThreadRef->fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
 
                         fThreadReferences.push_back( thisThreadRef );
 
@@ -702,8 +686,6 @@ namespace Nymph
 
                         thread.join();
                         fThreadReferences.clear();
-                        //fThreadFutures.clear();
-                        //fThreadNames.clear();
                     } // end for loop over the thread group
                 } // end for loop over the run-queue
 
@@ -756,27 +738,19 @@ namespace Nymph
                     boost::thread_group threads;
 
                     { // scope for threadFuturesLock
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
 
                         for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
                             std::string procName( tgIter->fName );
                             KTINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            //KTThreadReference thisThreadRef;
                             std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                             thisThreadRef->Name() = procName;
 
-                            //fThreadFutures.push_back( std::move( thisThreadRef.fDataPtrRet.get_future() ) );
-                            //fThreadNames.push_back( procName );
-
-                            //fThreadIndicators.emplace_back( new KTThreadIndicator() );
-                            //fThreadIndicators.back()->fContinueSignal = fMasterContSignal;
                             thisThreadRef->SetContinueSignal( fMasterContSignal );
 
-                            //thisThreadRef->fThreadIndicator = fThreadIndicators.back();
                             thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                            //thisThreadRef->fRefreshFutureFunc = [&]( const std::string& name, Future&& ret ){ this->TakeFuture( name, std::move(ret) ); };
                             boost::condition_variable threadStartedCV;
                             boost::mutex threadStartedMutex;
                             bool threadStartedFlag = false;
@@ -800,10 +774,7 @@ namespace Nymph
                     bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                     do
                     {
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
-                        //KTThreadRefFutureIterator finishedFuturePtr( fThreadReferences.begin());
-                        //auto finishedFuturePtr = boost::wait_for_any( futureIndex.begin(), futureIndex.end() );
-                        //auto finishedFuturePtr = boost::wait_for_any( fThreadFutures.begin(), fThreadFutures.end() );
+                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
                         auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
                         size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
                         auto finishedReferencePtr = fThreadReferences.begin() + iThread;
@@ -830,13 +801,10 @@ namespace Nymph
                             // we're finished a thread; get its results
                             try
                             {
-                                //futureIndex.modify( finishedFuturePtr, [](LabeledFuture& lFuture){ lFuture.fFuture.get(); } );
                                 //KTINFO( proclog, "Thread <" << threadName << "> has finished" );
                                 KTWARN( proclog, "Thread <" << threadName << "> has finished" ); // TODO: switch this back to INFO
                                 finishedFuturePtr->get();
                                 fThreadReferences.erase( finishedReferencePtr );
-                                //fThreadFutures.erase( finishedFuturePtr );
-                                //fThreadNames.erase( fThreadNames.begin() + iThread );
                             }
                             catch( boost::exception& e )
                             {
@@ -851,11 +819,8 @@ namespace Nymph
 
                     KTDEBUG( proclog, "Joining threads" );
                     threads.join_all();
-                    //fThreadIndicators.clear();
-                    boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+                    boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
                     fThreadReferences.clear();
-                    //fThreadFutures.clear();
-                    //fThreadNames.clear();
                 } // end for loop over the run-queue
 
                 KTPROG( proclog, "Processing is complete (multi-threaded)" );
@@ -951,10 +916,7 @@ namespace Nymph
         }
 
         boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
-        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
-
-        // futures have been used; clear them to be replaced
-        //fThreadFutures.clear();
+        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
 
         // reset all break flags
         fDoRunBreakFlag = false;
@@ -987,7 +949,7 @@ namespace Nymph
 
     KTDataPtr KTProcessorToolbox::GetData( const std::string& threadName )
     {
-        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadFuturesMutex );
+        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
 
         auto tnIt = fThreadReferences.begin();
         for( ; tnIt != fThreadReferences.end(); ++tnIt )
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index b05cb6d..bb7c5ce 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -239,19 +239,9 @@ namespace Nymph
             // called from ThreadPacket::Break
             void InitiateBreak();
             // called from ThreadPacket::Break
-            //void TakeFuture( const std::string& name, Future&& future );
 
             std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
-
-            //typedef std::vector< Future > ThreadFutures;
-            //typedef std::vector< std::string > ThreadNames;
-
-            //ThreadFutures fThreadFutures;
-            //ThreadNames fThreadNames;
-            boost::mutex fThreadFuturesMutex;
-
-            //typedef std::vector< std::shared_ptr< KTThreadIndicator > > ThreadIndicators;
-            //ThreadIndicators fThreadIndicators;
+            boost::mutex fThreadReferencesMutex;
 
             boost::promise< void > fContinueSignaler;
             boost::shared_future< void > fMasterContSignal;
@@ -316,13 +306,6 @@ namespace Nymph
         return;
     }
 
-    //inline void KTProcessorToolbox::TakeFuture( const std::string& name, Future&& future )
-    //{
-    //    fThreadFutures.push_back( std::move( future ) );
-    //    fThreadNames.push_back( name );
-    //    return;
-    //}
-
     inline void KTProcessorToolbox::JoinRunThread()
     {
         if( fDoRunThread == nullptr ) return;
diff --git a/Scarab b/Scarab
index d6eb49f..6362897 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit d6eb49f445a7d675e3e76b56ba12b175dca10d92
+Subproject commit 6362897c81362b0ad90e55f1d2c9bbd703f20b93

From 9b28f2d3229df7d2ae54ee7dcdb4fe7fafac7112 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 26 May 2017 15:44:33 -0700
Subject: [PATCH 045/521] Settled on method for adding messages to
 KTExceptions. Added a mutex to KTThreadReference. Use a condition_variable
 instead of a promise/future to indicate continuing processing.

---
 Executables/Validation/TestExceptionInSlot.cc |   4 +
 Library/Application/KTProcessorToolbox.cc     | 140 +++++++-----------
 Library/Application/KTProcessorToolbox.hh     |  21 ++-
 Library/Processor/KTProcessor.cc              |  14 +-
 Library/Processor/KTThreadReference.cc        |  11 +-
 Library/Processor/KTThreadReference.hh        |  30 +++-
 Library/Utility/KTException.cc                |  12 +-
 Library/Utility/KTException.hh                |  21 +--
 Scarab                                        |   2 +-
 9 files changed, 122 insertions(+), 133 deletions(-)

diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
index 6961c6b..bc4887c 100644
--- a/Executables/Validation/TestExceptionInSlot.cc
+++ b/Executables/Validation/TestExceptionInSlot.cc
@@ -8,6 +8,8 @@
  */
 
 #include "KTTestProcessor.hh"
+
+#include "KTException.hh"
 #include "KTLogger.hh"
 
 #include <boost/thread.hpp>
@@ -72,6 +74,8 @@ int main()
         catch( boost::exception& e )
         {
             canceled = true;
+            //ADD_ERROR_MSG( e, "Added error message!" );
+            e << KTErrorMsgInfo< struct testEIS_GetRetVal >( "Added error message!" );
             KTERROR( testexclog, "An error occurred while running a processor: " << diagnostic_information( e ) );
         }
 
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index eb41286..27ba8c2 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -33,9 +33,8 @@ namespace Nymph
             fRunQueue(),
             fProcMap(),
             fThreadReferences(),
-            fThreadReferencesMutex(),
-            fContinueSignaler(),
-            fMasterContSignal(),
+            fContinueCV(),
+            fDoContinue( false ),
             fBreakContMutex(),
             fDoRunThread( nullptr ),
             fDoRunPromise(),
@@ -599,24 +598,13 @@ namespace Nymph
         {
             try
             {
-                // reset the continue signaler
-                fContinueSignaler = boost::promise< void >();
-                fMasterContSignal = fContinueSignaler.get_future().share();
-                if( ! fMasterContSignal.valid() )
-                {
-                    KTERROR( proclog, "Invalid master continue-signal created" );
-                    BOOST_THROW_EXCEPTION( KTException() << "Invalid master continue-signal created" << eom );
-                }
-                // copy for use in this function
-                boost::shared_future< void > continueSignal = fMasterContSignal;
-
                 KTPROG( proclog, "Starting single-threaded processing" );
 
                 for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                 {
                     for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                     {
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
+                        boost_unique_lock breakContLock( fBreakContMutex );
 
                         std::string procName( tgIter->fName );
                         KTINFO( proclog, "Starting processor <" << procName << ">" );
@@ -624,9 +612,8 @@ namespace Nymph
                         std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                         thisThreadRef->Name() = procName;
 
-                        thisThreadRef->SetContinueSignal( fMasterContSignal );
-
                         thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                        thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
 
                         fThreadReferences.push_back( thisThreadRef );
 
@@ -634,7 +621,7 @@ namespace Nymph
                         boost::mutex threadStartedMutex;
                         bool threadStartedFlag = false;
 
-                        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+                        boost_unique_lock threadStartedLock( threadStartedMutex );
                         boost::thread thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
                         KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
                         while( ! threadStartedFlag )
@@ -645,8 +632,6 @@ namespace Nymph
 
                         KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
 
-                        threadFuturesLock.unlock();
-
                         bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                         do
                         {
@@ -660,10 +645,11 @@ namespace Nymph
                             if( fThreadReferences.back()->GetBreakFlag() )
                             {
                                 KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << procName << ">; may not be where breakpoint is set)" );
-                                continueSignal.wait();
+
+                                WaitForContinue( breakContLock );
+
                                 KTDEBUG( proclog, "Breakpoint finished" );
                                 stillRunning = true;
-                                continueSignal = fMasterContSignal; // refresh the local copy of the shared future
                             }
                             else
                             {
@@ -675,7 +661,7 @@ namespace Nymph
                                 }
                                 catch( boost::exception& e )
                                 {
-                                    e << KTErrorMsgInfo( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
+                                    e << KTErrorMsgInfo< struct procTB_STRFinishing >( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
                                     throw;
                                 }
                                 stillRunning = false;
@@ -720,17 +706,6 @@ namespace Nymph
         {
             try
             {
-                // reset the continue signaler
-                fContinueSignaler = boost::promise< void >();
-                fMasterContSignal = fContinueSignaler.get_future().share();
-                if( ! fMasterContSignal.valid() )
-                {
-                    KTERROR( proclog, "Invalid master continue-signal created" );
-                    BOOST_THROW_EXCEPTION( KTException() << "Invalid master continue-signal created" << eom );
-                }
-                // copy for use in this function
-                boost::shared_future< void > continueSignal = fMasterContSignal;
-
                 KTPROG( proclog, "Starting multi-threaded processing" );
 
                 for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
@@ -738,7 +713,8 @@ namespace Nymph
                     boost::thread_group threads;
 
                     { // scope for threadFuturesLock
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
+                        boost_unique_lock breakContLock( fBreakContMutex );
+                        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
 
                         for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
@@ -748,16 +724,15 @@ namespace Nymph
                             std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                             thisThreadRef->Name() = procName;
 
-                            thisThreadRef->SetContinueSignal( fMasterContSignal );
-
                             thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                            thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
+                            fThreadReferences.push_back( thisThreadRef );
+
                             boost::condition_variable threadStartedCV;
                             boost::mutex threadStartedMutex;
                             bool threadStartedFlag = false;
 
-                            fThreadReferences.push_back( thisThreadRef );
-
-                            boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+                            boost_unique_lock threadStartedLock( threadStartedMutex );
                             boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
                             KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
                             while( ! threadStartedFlag )
@@ -774,41 +749,39 @@ namespace Nymph
                     bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                     do
                     {
-                        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
                         auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
+                        boost_unique_lock breakContLock( fBreakContMutex );
+
                         size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
                         auto finishedReferencePtr = fThreadReferences.begin() + iThread;
                         std::string threadName( (*finishedReferencePtr)->Name() );
-                        //KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
-                        KTWARN( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" ); // TODO: switch this back to DEBUG
+                        KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
 
                         stillRunning = false;
                         if( fDoRunBreakFlag )
                         {
                             // a breakpoint has been reached
-                            //KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
-                            KTWARN( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" ); //TODO: switch this back to debug
-                            threadFuturesLock.unlock();
+                            KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
+
                             // wait here for the user to continue
-                            continueSignal.wait();
+                            WaitForContinue( breakContLock );
+
                             KTDEBUG( proclog, "Breakpoint finished" );
-                            boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
                             stillRunning = true;
-                            continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                            //continueSignal = fMasterContSignal; // refresh the local copy of the shared future
                         }
                         else
                         {
                             // we're finished a thread; get its results
                             try
                             {
-                                //KTINFO( proclog, "Thread <" << threadName << "> has finished" );
-                                KTWARN( proclog, "Thread <" << threadName << "> has finished" ); // TODO: switch this back to INFO
+                                KTINFO( proclog, "Thread <" << threadName << "> has finished" );
                                 finishedFuturePtr->get();
                                 fThreadReferences.erase( finishedReferencePtr );
                             }
                             catch( boost::exception& e )
                             {
-                                e << KTErrorMsgInfo( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
+                                e << KTErrorMsgInfo< struct procTB_MTRFinishing >( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
                                 throw;
                             }
 
@@ -819,7 +792,7 @@ namespace Nymph
 
                     KTDEBUG( proclog, "Joining threads" );
                     threads.join_all();
-                    boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
+                    boost_unique_lock breakContLock( fBreakContMutex );
                     fThreadReferences.clear();
                 } // end for loop over the run-queue
 
@@ -853,7 +826,7 @@ namespace Nymph
 
     bool KTProcessorToolbox::WaitForBreak()
     {
-        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
+        boost_unique_lock breakContLock( fBreakContMutex );
 
         if( fDoRunBreakFlag )
         {
@@ -899,7 +872,9 @@ namespace Nymph
         while( WaitForBreak() )
         {
             KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            WaitForContinue();
+            boost::mutex localMutex;
+            boost_unique_lock localLock( localMutex );
+            WaitForContinue( localLock );
             KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
         }
         KTDEBUG( proclog, "End-of-run reached" );
@@ -915,15 +890,16 @@ namespace Nymph
             return;
         }
 
-        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
-        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
+        boost_unique_lock breakContLock( fBreakContMutex );
 
         // reset all break flags
         fDoRunBreakFlag = false;
-        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
+        std::vector< boost_unique_lock > trLocks;
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
         {
-            (*tiIt)->SetBreakFlag( false );
-            (*tiIt)->RefreshDataPtrRet();
+            trLocks.emplace_back( (*trIt)->Mutex() );
+            (*trIt)->SetBreakFlag( false );
+            (*trIt)->RefreshDataPtrRet();
         }
 
         // reset the do-run promise and future
@@ -932,51 +908,48 @@ namespace Nymph
 
         KTINFO( proclog, "Continuing from breakpoint" );
         // signal everything to resume
-        KTWARN( proclog, "Setting value of continue-signaler promise" );
-        fContinueSignaler.set_value();
-
-        // reset the signaler and all signals
-        // hopefully the delay of creating the new signaler and starting the for loop is enough that anything waiting on the old signal has already seen that signal and moved on
-        fContinueSignaler = boost::promise< void >();
-        fMasterContSignal = fContinueSignaler.get_future().share();
-        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
-        {
-            (*tiIt)->SetContinueSignal( fMasterContSignal );
-        }
+        fDoContinue = true;
+        fContinueCV.notify_all();
 
         return;
     }
 
     KTDataPtr KTProcessorToolbox::GetData( const std::string& threadName )
     {
-        boost::unique_lock< boost::mutex > threadFuturesLock( fThreadReferencesMutex );
+        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
+        boost_unique_lock breakContLock( fBreakContMutex );
 
-        auto tnIt = fThreadReferences.begin();
-        for( ; tnIt != fThreadReferences.end(); ++tnIt )
+        auto trIt = fThreadReferences.begin();
+        for( ; trIt != fThreadReferences.end(); ++trIt )
         {
-            if( (*tnIt)->Name() == threadName ) break;
+            if( (*trIt)->Name() == threadName ) break;
         }
-        if( tnIt == fThreadReferences.end() )
+        if( trIt == fThreadReferences.end() )
         {
             KTWARN( proclog, "Did not find thread <" << threadName << ">" );
             BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
         }
 
-        return (*tnIt)->GetReturnValue();
+        boost_unique_lock lock( (*trIt)->Mutex() );
+        return (*trIt)->GetReturnValue();
     }
 
     void KTProcessorToolbox::InitiateBreak()
     {
-        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
+        boost_unique_lock breakContLock( fBreakContMutex );
         if( fDoRunBreakFlag ) return;
 
+        // set the continue flag to false so that things will wait for the continue
+        fDoContinue = false;
+
         // set all break flags
         // master break flag
         fDoRunBreakFlag = true;
         // thread break flags
-        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
         {
-            (*tiIt)->SetBreakFlag( true );
+            boost_unique_lock lock( (*trIt)->Mutex() );
+            (*trIt)->SetBreakFlag( true );
         }
 
         // use the do-run promise to signal the break
@@ -988,10 +961,11 @@ namespace Nymph
 
     void KTProcessorToolbox::CancelThreads()
     {
-        boost::unique_lock< boost::mutex > breakContLock( fBreakContMutex );
-        for( auto tiIt = fThreadReferences.begin(); tiIt != fThreadReferences.end(); ++tiIt )
+        boost_unique_lock breakContLock( fBreakContMutex );
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
         {
-            (*tiIt)->SetCanceled( true );
+            boost_unique_lock lock( (*trIt)->Mutex() );
+            (*trIt)->SetCanceled( true );
         }
         return;
     }
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index bb7c5ce..59df4d2 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -85,6 +85,9 @@ namespace Nymph
     */
     class KTProcessorToolbox : public KTConfigurable
     {
+        private:
+            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
+
         public:
             KTProcessorToolbox(const std::string& name = "processor-toolbox");
             virtual ~KTProcessorToolbox();
@@ -210,7 +213,7 @@ namespace Nymph
 
             void AsyncRun();
 
-            void WaitForContinue();
+            void WaitForContinue( boost_unique_lock& lock );
 
             /// Returns when processing is completed or a breakpoint is reached
             /// Throws a boost::exception if there's an error with the future object in use
@@ -236,15 +239,13 @@ namespace Nymph
             void StartSingleThreadedRun();
             void StartMultiThreadedRun();
 
-            // called from ThreadPacket::Break
+            // called from KTThreadReference::Break
             void InitiateBreak();
-            // called from ThreadPacket::Break
 
             std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
-            boost::mutex fThreadReferencesMutex;
 
-            boost::promise< void > fContinueSignaler;
-            boost::shared_future< void > fMasterContSignal;
+            boost::condition_variable fContinueCV;
+            bool fDoContinue;
             boost::mutex fBreakContMutex;
 
             boost::thread* fDoRunThread;
@@ -300,9 +301,13 @@ namespace Nymph
         return;
     }
 
-    inline void KTProcessorToolbox::WaitForContinue()
+    inline void KTProcessorToolbox::WaitForContinue( boost_unique_lock& lock )
     {
-        fMasterContSignal.wait();
+        //fMasterContSignal.wait();
+        while( ! fDoContinue )
+        {
+            fContinueCV.wait( lock );
+        }
         return;
     }
 
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index ff5eeaa..0ba0806 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -60,25 +60,25 @@ namespace Nymph
         }
         catch( KTSignalException& e )
         {
-            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
-            e << KTErrorMsgInfo( "You may have the signal name wrong." );
+            e << KTErrorMsgInfo< struct proc_Sig_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
+            e << KTErrorMsgInfo< struct proc_Sig_1 >( "You may have the signal name wrong." );
             throw;
         }
         catch( KTSlotException& e )
         {
-            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
-            e << KTErrorMsgInfo( "You may have the slot name wrong." );
+            e << KTErrorMsgInfo< struct proc_Slot_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
+            e << KTErrorMsgInfo< struct proc_Slot_1 >( "You may have the slot name wrong." );
             throw;
         }
         catch( KTConnectionException& e )
         {
-            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
-            e << KTErrorMsgInfo( "Check that the signatures of the signal and slot match exactly." );
+            e << KTErrorMsgInfo< struct proc_Conn_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
+            e << KTErrorMsgInfo< struct proc_Conn_1 >( "Check that the signatures of the signal and slot match exactly." );
             throw;
         }
         catch( boost::exception& e )
         {
-            e << KTErrorMsgInfo( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
+            e << KTErrorMsgInfo< struct proc_Unkn >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
             throw;
         }
 
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index c934fd2..c5de273 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -22,7 +22,8 @@ namespace Nymph
             fDataPtrRet(),
             fDataPtrRetFuture( fDataPtrRet.get_future() ),
             fInitiateBreakFunc( [](){return;} ),
-            fContinueSignal()
+            fWaitForContinueFunc( []( boost_unique_lock& ){return;} ),
+            fMutex()
     {
         if( ! fDataPtrRetFuture.valid() )
         {
@@ -38,7 +39,8 @@ namespace Nymph
             fDataPtrRet( std::move( orig.fDataPtrRet ) ),
             fDataPtrRetFuture( std::move( orig.fDataPtrRetFuture ) ),
             fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
-            fContinueSignal( std::move( orig.fContinueSignal ) )
+            fWaitForContinueFunc( std::move( orig.fWaitForContinueFunc ) ),
+            fMutex()
     {
         orig.fBreakFlag = false;
         orig.fCanceled = false;
@@ -52,7 +54,7 @@ namespace Nymph
         fDataPtrRet = std::move( orig.fDataPtrRet );
         fDataPtrRetFuture = std::move( orig.fDataPtrRetFuture );
         fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
-        fContinueSignal = std::move( orig.fContinueSignal );
+        fWaitForContinueFunc = std::move( orig.fWaitForContinueFunc );
 
         orig.fBreakFlag = false;
         orig.fCanceled = false;
@@ -67,6 +69,7 @@ namespace Nymph
             KTDEBUG( trlog, "Initiating break (" << fName << ")" );
             fInitiateBreakFunc();
         }
+        boost_unique_lock lock( fMutex );
         if( fBreakFlag || doBreakpoint )
         {
             KTDEBUG( trlog, "Reacting to break (" << fName << ")" );
@@ -74,7 +77,7 @@ namespace Nymph
             KTWARN( trlog, "Setting value of data-ptr-ret promise (" << fName << ")" );
             fDataPtrRet.set_value( dataPtr );
             // wait for continue signal
-            fContinueSignal.wait();
+            fWaitForContinueFunc( lock );
         }
         return;
     }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index d15526e..9a963b5 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -20,6 +20,9 @@ namespace Nymph
 
     class KTThreadReference
     {
+        private:
+            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
+
         public:
             KTThreadReference();
             KTThreadReference( const KTThreadReference& ) = delete;
@@ -49,8 +52,11 @@ namespace Nymph
 
             void RefreshDataPtrRet();
 
-            void SetContinueSignal( const boost::shared_future< void >& contSig );
             void SetInitiateBreakFunc( const std::function< void() >& initBreakFunc );
+            void SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc );
+
+            boost::mutex& Mutex();
+            const boost::mutex& Mutex() const;
 
         public:
             MEMBERVARIABLEREF( std::string, Name );
@@ -61,7 +67,8 @@ namespace Nymph
             KTDataPtrReturn fDataPtrRet;
             boost::unique_future< KTDataPtr > fDataPtrRetFuture;
             std::function< void() > fInitiateBreakFunc;
-            boost::shared_future< void > fContinueSignal;
+            std::function< void( boost_unique_lock& ) > fWaitForContinueFunc;
+            boost::mutex fMutex;
     };
 
     inline void KTThreadReference::SetReturnException( boost::exception_ptr excPtr )
@@ -98,18 +105,29 @@ namespace Nymph
         return;
     }
 
-    inline void KTThreadReference::SetContinueSignal( const boost::shared_future< void >& contSig )
+    inline void KTThreadReference::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
     {
-        fContinueSignal = contSig;
+        fInitiateBreakFunc = initBreakFunc;
         return;
     }
 
-    inline void KTThreadReference::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
+    inline void KTThreadReference::SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc )
     {
-        fInitiateBreakFunc = initBreakFunc;
+        fWaitForContinueFunc = waitForContFunc;
         return;
     }
 
+    inline boost::mutex& KTThreadReference::Mutex()
+    {
+        return fMutex;
+    }
+
+    inline const boost::mutex& KTThreadReference::Mutex() const
+    {
+        return fMutex;
+    }
+
+
 #ifndef THROW_THREADREF_EXCEPTION
 #define THROW_THREADREF_EXCEPTION( ref, exc ) \
         try \
diff --git a/Library/Utility/KTException.cc b/Library/Utility/KTException.cc
index 62d0810..96e8df5 100644
--- a/Library/Utility/KTException.cc
+++ b/Library/Utility/KTException.cc
@@ -13,7 +13,7 @@ namespace Nymph
     KTException::KTException() :
             boost::exception(),
             std::exception(),
-            fMsgBuffer( "" )
+            fMsgBuffer()
     {
     }
     KTException::KTException( const KTException& an_exception ) :
@@ -27,14 +27,4 @@ namespace Nymph
     {
     }
 
-    const char* KTException::what() const throw ()
-    {
-        if( ! fMsgBuffer.empty() )
-        {
-            *this << KTErrorMsgInfo{ fMsgBuffer };
-            fMsgBuffer.clear();
-        }
-        return this->std::exception::what();
-    }
-
 }
diff --git a/Library/Utility/KTException.hh b/Library/Utility/KTException.hh
index c2b256c..10ae966 100644
--- a/Library/Utility/KTException.hh
+++ b/Library/Utility/KTException.hh
@@ -9,6 +9,8 @@
 #ifndef KTEXCEPTION_HH_
 #define KTEXCEPTION_HH_
 
+#include "macros.hh"
+
 #include <boost/exception/all.hpp>
 
 #include <exception>
@@ -20,7 +22,10 @@ namespace Nymph
     struct KTMessageEnd {};
     static const KTMessageEnd eom = KTMessageEnd();
 
-    typedef boost::error_info<struct tag_errmsg, std::string> KTErrorMsgInfo;
+    //typedef boost::error_info<struct tag_errmsg, std::string> KTErrorMsgInfo;
+
+    template< class XLabel >
+    using KTErrorMsgInfo = boost::error_info< XLabel, std::string>;
 
     /*!
      @class KTException
@@ -47,7 +52,7 @@ namespace Nymph
       }
       catch( boost::exception& e )
       {
-          e << KTErrorMsgInfo( "Here's some information about the context in which the exception was thrown" );
+          e << KTErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
           throw;
       }
 
@@ -82,11 +87,6 @@ namespace Nymph
             // adds the current contents of the message buffer as a KTErrorMsgInfo
             KTException& operator<<( const KTMessageEnd& eom );
 
-            // overload for KTErrorMsgInfo to make sure error messages are streamed correctly, and not via the template function
-            const KTException& operator<<( KTErrorMsgInfo& emi );
-
-            virtual const char* what() const throw();
-
         private:
             mutable std::string fMsgBuffer;
     };
@@ -116,17 +116,12 @@ namespace Nymph
     {
         if( ! fMsgBuffer.empty() )
         {
-            boost::operator<<( *this, KTErrorMsgInfo{ fMsgBuffer } );
+            boost::operator<<( *this, KTErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
             fMsgBuffer.clear();
         }
         return *this;
     }
 
-    inline const KTException& KTException::operator<<( KTErrorMsgInfo& emi )
-    {
-        return boost::operator<<( *this, emi );
-    }
-
 }
 
 #endif /* KTEXCEPTION_HH_ */
diff --git a/Scarab b/Scarab
index 6362897..003cbf4 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 6362897c81362b0ad90e55f1d2c9bbd703f20b93
+Subproject commit 003cbf4f802a0d1046fe599b18a39349de13f86f

From 453970368f91600d4838ca4d330d39b916b56e72 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 26 May 2017 17:28:14 -0700
Subject: [PATCH 046/521] =?UTF-8?q?Refactored=20KTMemberVariable.hh=20so?=
 =?UTF-8?q?=20that=20it=20uses=20scarab=E2=80=99s=20=5Fmember=5Fvariable.h?=
 =?UTF-8?q?h.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Library/Data/KTCutResult.hh            |   2 +-
 Library/Data/KTData.hh                 |   2 +-
 Library/Processor/KTThreadReference.hh |   2 +-
 Library/Utility/KTMemberVariable.hh    | 143 ++++++++++++-------------
 Scarab                                 |   2 +-
 5 files changed, 70 insertions(+), 81 deletions(-)

diff --git a/Library/Data/KTCutResult.hh b/Library/Data/KTCutResult.hh
index e89f5f3..a0845be 100644
--- a/Library/Data/KTCutResult.hh
+++ b/Library/Data/KTCutResult.hh
@@ -26,7 +26,7 @@ namespace Nymph
 
             virtual const std::string& Name() const = 0;
 
-            MEMBERVARIABLE_PROTECTED(bool, State);
+            MEMBERVARIABLE(bool, State);
     };
 
     typedef KTExtensibleStructCore< KTCutResultCore > KTCutResult;
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 6b5a18c..688d7fe 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -57,7 +57,7 @@ namespace Nymph
             MEMBERVARIABLE(unsigned, Counter);
             MEMBERVARIABLE(bool, LastData);
 
-            MEMBERVARIABLEREF(KTCutStatus, CutStatus);
+            MEMBERVARIABLE_REF(KTCutStatus, CutStatus);
 
         public:
             static const std::string sName;
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 9a963b5..8d403ea 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -59,7 +59,7 @@ namespace Nymph
             const boost::mutex& Mutex() const;
 
         public:
-            MEMBERVARIABLEREF( std::string, Name );
+            MEMBERVARIABLE_REF( std::string, Name );
             MEMBERVARIABLE( bool, BreakFlag );
             MEMBERVARIABLE( bool, Canceled );
 
diff --git a/Library/Utility/KTMemberVariable.hh b/Library/Utility/KTMemberVariable.hh
index ded3ae2..ef98764 100644
--- a/Library/Utility/KTMemberVariable.hh
+++ b/Library/Utility/KTMemberVariable.hh
@@ -8,94 +8,83 @@
 #ifndef KTMEMBERVARIABLE_HH_
 #define KTMEMBERVARIABLE_HH_
 
-
 /**
- * Creates a member variable with type TYPE name f[NAME], plus getter and setter.
- * MEMBERVARIABLE_NOSET will provide the variable and getter, but no setter, allowing you to provide a custom setter.
+ * Macros for class member variables
  *
- * Usage example, in a class header file:
- *     MEMBERVARIABLE(double, MyVar)
+ * In all cases remember to initialize the variables!
  *
- * You still need to initialize the variables in the class constructors.
+ * For "normal" variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [type fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMBERVARIABLE
+ *  - MEMBERVARIABLE_NOSET
+ *  - MEMBERVARIABLE_STATIC
+ *  - MEMBERVARIABLE_STATIC_NOSET
  *
- * The generated code is:
- *     private:
- *         TYPE f[NAME];
- *     public:
- *         inline TYPE Get[NAME]() const
- *         {
- *             return f[NAME];
- *         }
- *         inline void Set[NAME](TYPE var)
- *         {
- *             f[NAME] = var;
- *         }
- */
-#define MEMBERVARIABLE_NOSET(TYPE, NAME) \
-        private: \
-            TYPE f##NAME; \
-        public: \
-            inline TYPE Get##NAME() const {return f##NAME;} \
-
-#define MEMBERVARIABLE(TYPE, NAME) \
-        MEMBERVARIABLE_NOSET(TYPE, NAME) \
-            inline void Set##NAME(TYPE var) {f##NAME = var; return;}
-
-#define MEMBERVARIABLE_PROTECTED_NOSET(TYPE, NAME) \
-        protected: \
-            TYPE f##NAME; \
-        public: \
-            inline TYPE Get##NAME() const {return f##NAME;} \
-
-#define MEMBERVARIABLE_PROTECTED(TYPE, NAME) \
-        MEMBERVARIABLE_PROTECTED_NOSET(TYPE, NAME) \
-            inline void Set##NAME(TYPE var) {f##NAME = var; return;}
-
-
-
-/**
- * Creates a member variable with type TYPE name f[NAME], const and non-const access functions.
- * MEMBERVARIABLEREF_CONST will provide the variable and the const access function, but no non-const access function.
+ * For variables accessed by reference
+ * Defines accessors [const type& MyVar() const], [type& MyVar()], and member variable [type fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMBERVARIABLE_REF
+ *  - MEMBERVARIABLE_REF_CONST
+ *  - MEMBERVARIABLE_REF_STATIC
+ *  - MEMBERVARIABLE_REF_STATIC_CONST
+ *
+ * For pointer variables
+ * Defines accessors [type* GetMyVar() const], [void SetMyVar( type* )], and member variable [type* fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMBERVARIABLE_PTR
+ *  - MEMBERVARIABLE_PTR_NOSET
+ *  - MEMBERVARIABLE_PTR_STATIC
+ *  - MEMBERVARIABLE_PTR_STATIC_NOSET
  *
- * Usage example, in a class header file:
- *     MEMBERVARIABLEREF(std::string, MyVar)
+ * For shared_ptr's
+ * Defines accessors [const std::shared_ptr< type > MyVar() const], [std::shared_ptr< type > MyVar()], and member variable [std::shared_ptr< type > fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMBERVARIABLE_SHARED_PTR
+ *  - MEMBERVARIABLE_SHARED_PTR_CONST
+ *  - MEMBERVARIABLE_SHARED_PTR_STATIC
+ *  - MEMBERVARIABLE_SHARED_PTR_STATIC_CONST
  *
- * You still need to initialize the variables in the class constructors.
+ * For atomic variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [std::atomic< type > fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMBERVARIABLE_ATOMIC
+ *  - MEMBERVARIABLE_ATOMIC_NOSET
+ *  - MEMBERVARIABLE_ATOMIC_STATIC
+ *  - MEMBERVARIABLE_ATOMIC_STATIC_NOSET
  *
- * The generated code is:
- *     private:
- *         TYPE f[NAME];
- *     public:
- *         inline const TYPE& [NAME]() const
- *         {
- *             return f[NAME];
- *         }
- *         inline TYPE& [NAME]()
- *         {
- *             return f[NAME];
- *         }
  */
-#define MEMBERVARIABLEREF_CONST(TYPE, NAME) \
-        private: \
-            TYPE f##NAME; \
-        public: \
-            inline const TYPE& NAME() const {return f##NAME;} \
-            inline TYPE& NAME() {return f##NAME;}
 
-#define MEMBERVARIABLEREF(TYPE, NAME) \
-        MEMBERVARIABLEREF_CONST(TYPE, NAME) \
-            inline TYPE& NAME(const TYPE& var) {return f##NAME;}
+#define set_prefix Set
+#define get_prefix Get
+#define var_prefix f
+#define static_prefix s
+
+#include "_member_variables.hh"
+
+#define MEMBERVARIABLE                         mv_accessible
+#define MEMBERVARIABLE_NOSET                   mv_accessible_noset
+#define MEMBERVARIABLE_STATIC                  mv_accessible_static
+#define MEMBERVARIABLE_STATIC_NOSET            mv_accessible_static_noset
+
+#define MEMBERVARIABLE_REF                     mv_referrable
+#define MEMBERVARIABLE_REF_CONST               mv_referrable_const
+#define MEMBERVARIABLE_REF_STATIC              mv_referrable_static
+#define MEMBERVARIABLE_REF_STATIC_CONST        mv_referrable_static_const
 
-#define MEMBERVARIABLEREF_PROTECTED_NOSET(TYPE, NAME) \
-        protected: \
-            TYPE f##NAME; \
-        public: \
-            inline const TYPE& NAME() const {return f##NAME;} \
-            inline TYPE& NAME() {return f##NAME;}
+#define MEMBERVARIABLE_PTR                     mv_assignable
+#define MEMBERVARIABLE_PTR_NOSET               mv_assignable_noset
+#define MEMBERVARIABLE_PTR_STATIC              mv_assignable_static
+#define MEMBERVARIABLE_PTR_STATIC_NOSET        mv_assignable_static_noset
 
-#define MEMBERVARIABLEREF_PROTECTED(TYPE, NAME) \
-        MEMBERVARIABLEREF_PROTECTED_NOSET(TYPE, NAME) \
-            inline TYPE& NAME() {return f##NAME;}
+#define MEMBERVARIABLE_SHARED_PTR              mv_shared_ptr
+#define MEMBERVARIABLE_SHARED_PTR_NOSET        mv_shared_ptr_noset
+#define MEMBERVARIABLE_SHARED_PTR_STATIC       mv_shared_ptr_static
+#define MEMBERVARIABLE_SHARED_PTR_STATIC_NOSET mv_shared_ptr_static_noset
 
+#define MEMBERVARIABLE_ATOMIC                  mv_atomic
+#define MEMBERVARIABLE_ATOMIC_NOSET            mv_atomic_noset
+#define MEMBERVARIABLE_ATOMIC_STATIC           mv_atomic_static
+#define MEMBERVARIABLE_ATOMIC_STATIC_NOSET     mv_atomic_static_noset
 
 #endif /* KTMEMBERVARIABLE_HH_ */
diff --git a/Scarab b/Scarab
index 003cbf4..1e8862c 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 003cbf4f802a0d1046fe599b18a39349de13f86f
+Subproject commit 1e8862c00bed696e53dfbf2428d48f9fd5e56c9e

From b8dd002775586a4a3aba449a09ab462240e46125 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 30 May 2017 17:27:04 -0700
Subject: [PATCH 047/521] Updated scarab to incorporate member variable
 changes, and updated KTMemberVariable.hh

---
 Library/Utility/KTMemberVariable.hh | 12 +++++++++---
 Scarab                              |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Library/Utility/KTMemberVariable.hh b/Library/Utility/KTMemberVariable.hh
index ef98764..d867381 100644
--- a/Library/Utility/KTMemberVariable.hh
+++ b/Library/Utility/KTMemberVariable.hh
@@ -66,25 +66,31 @@
 #define MEMBERVARIABLE_NOSET                   mv_accessible_noset
 #define MEMBERVARIABLE_STATIC                  mv_accessible_static
 #define MEMBERVARIABLE_STATIC_NOSET            mv_accessible_static_noset
+#define MEMBERVARIABLE_MUTABLE                 mv_accessible_mutable
+#define MEMBERVARIABLE_MUTABLE_NOSET           mv_accessible_mutable_noset
 
 #define MEMBERVARIABLE_REF                     mv_referrable
 #define MEMBERVARIABLE_REF_CONST               mv_referrable_const
 #define MEMBERVARIABLE_REF_STATIC              mv_referrable_static
-#define MEMBERVARIABLE_REF_STATIC_CONST        mv_referrable_static_const
+#define MEMBERVARIABLE_REF_MUTABLE             mv_referrable_mutable
 
 #define MEMBERVARIABLE_PTR                     mv_assignable
 #define MEMBERVARIABLE_PTR_NOSET               mv_assignable_noset
 #define MEMBERVARIABLE_PTR_STATIC              mv_assignable_static
 #define MEMBERVARIABLE_PTR_STATIC_NOSET        mv_assignable_static_noset
+#define MEMBERVARIABLE_PTR_MUTABLE             mv_assignable_mutable
+#define MEMBERVARIABLE_PTR_MUTABLE_NOSET       mv_assignable_mutable_noset
 
 #define MEMBERVARIABLE_SHARED_PTR              mv_shared_ptr
-#define MEMBERVARIABLE_SHARED_PTR_NOSET        mv_shared_ptr_noset
+#define MEMBERVARIABLE_SHARED_PTR_CONST        mv_shared_ptr_const
 #define MEMBERVARIABLE_SHARED_PTR_STATIC       mv_shared_ptr_static
-#define MEMBERVARIABLE_SHARED_PTR_STATIC_NOSET mv_shared_ptr_static_noset
+#define MEMBERVARIABLE_SHARED_PTR_MUTABLE      mv_shared_ptr_mutable
 
 #define MEMBERVARIABLE_ATOMIC                  mv_atomic
 #define MEMBERVARIABLE_ATOMIC_NOSET            mv_atomic_noset
 #define MEMBERVARIABLE_ATOMIC_STATIC           mv_atomic_static
 #define MEMBERVARIABLE_ATOMIC_STATIC_NOSET     mv_atomic_static_noset
+#define MEMBERVARIABLE_ATOMIC_MUTABLE          mv_atomic_mutable
+#define MEMBERVARIABLE_ATOMIC_MUTABLE_NOSET    mv_atomic_mutable_noset
 
 #endif /* KTMEMBERVARIABLE_HH_ */
diff --git a/Scarab b/Scarab
index 1e8862c..da22e7f 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 1e8862c00bed696e53dfbf2428d48f9fd5e56c9e
+Subproject commit da22e7f4ad38a02df699a947ff21c15baf0c2bfd

From 1939d60ffbe6b115a75f98b578a47423fd9e95bc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 30 May 2017 17:43:27 -0700
Subject: [PATCH 048/521] Add default of no signals in
 KTSlotWrapper::RegisterSlot()

---
 Library/Processor/KTProcessor.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index aad8d20..193cbe2 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -77,7 +77,7 @@ namespace Nymph
             KTSignalWrapper* RegisterSignal(std::string name, XProcessor* signalPtr);
 
             template< class XTarget, typename XReturn, typename... XArgs >
-            KTSlotWrapper* RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...), std::initializer_list< std::string > signals);
+            KTSlotWrapper* RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...), std::initializer_list< std::string > signals = {});
 
             KTSignalWrapper* GetSignal(const std::string& name);
 

From 6db37cc6222dbf1577e6b176a573f2016a7bf176 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 31 May 2017 11:45:43 -0700
Subject: [PATCH 049/521] Move KTProcessor::ConnectSignalToSlot() to a public
 static function

---
 Library/Processor/KTProcessor.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 193cbe2..6b04e3b 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -70,6 +70,8 @@ namespace Nymph
             /// For a slot that is called, update the slot's ThreadRef, and pass the update to any slots that get called by signals emitted by this slot
             void PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef);
 
+            static void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
+
             void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
             void ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum=-1);
 
@@ -90,8 +92,6 @@ namespace Nymph
             template< typename XReturn, typename... XArgs >
             void PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args);
 
-            void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
-
             SignalMap fSignalMap;
 
             SlotMap fSlotMap;

From c589cd3427a889381bbf56bd386874e7668fcac4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Jun 2017 13:27:45 -0700
Subject: [PATCH 050/521] Scarab updated for param iterators; Nymph adapted to
 new iterators.

---
 Library/Application/KTApplication.cc      |  2 +-
 Library/Application/KTProcessorToolbox.cc | 20 ++++++++++----------
 Library/Data/KTApplyCut.cc                |  6 +++---
 Scarab                                    |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Library/Application/KTApplication.cc b/Library/Application/KTApplication.cc
index f573527..48ff2fc 100644
--- a/Library/Application/KTApplication.cc
+++ b/Library/Application/KTApplication.cc
@@ -152,7 +152,7 @@ namespace Nymph
         	const scarab::param_node& paramNode = param.as_node();
     		for (scarab::param_node::const_iterator nodeIt = paramNode.begin(); nodeIt != paramNode.end(); ++nodeIt)
     		{
-    			AddConfigOptionsToCLHandler(*nodeIt->second, nextRootName + nodeIt->first);
+    			AddConfigOptionsToCLHandler(*nodeIt, nextRootName + nodeIt.name());
     		}
     	}
 
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 27ba8c2..2e81a17 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -67,12 +67,12 @@ namespace Nymph
             const scarab::param_array& procArray = node->array_at( "processors" );
             for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
             {
-                if( ! (*procIt)->is_node() )
+                if( ! procIt->is_node() )
                 {
                     KTERROR( proclog, "Invalid processor entry: not a node" );
                     return false;
                 }
-                const scarab::param_node* procNode = &( (*procIt)->as_node() );
+                const scarab::param_node* procNode = &( procIt->as_node() );
 
                 if (! procNode->has("type"))
                 {
@@ -118,12 +118,12 @@ namespace Nymph
             const scarab::param_array& connArray = node->array_at( "connections" );
             for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
             {
-                if( ! (*connIt)->is_node() )
+                if( ! connIt->is_node() )
                 {
                     KTERROR( proclog, "Invalid connection entry: not a node" );
                     return false;
                 }
-                const scarab::param_node* connNode = &( (*connIt)->as_node() );
+                const scarab::param_node* connNode = &( connIt->as_node() );
 
                 if ( ! connNode->has("signal") || ! connNode->has("slot") )
                 {
@@ -190,27 +190,27 @@ namespace Nymph
             const scarab::param_array& rqArray = node->array_at( "run-queue" );
             for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
             {
-                if ((*rqIt)->is_value())
+                if (rqIt->is_value())
                 {
-                    if (! PushBackToRunQueue((*rqIt)->as_value().as_string()))
+                    if (! PushBackToRunQueue(rqIt->as_value().as_string()))
                     {
                         KTERROR(proclog, "Unable to process run-queue entry: could not add processor to the queue");
                         return false;
                     }
                 }
-                else if ((*rqIt)->is_array())
+                else if (rqIt->is_array())
                 {
-                    const scarab::param_array* rqNode = &( (*rqIt)->as_array() );
+                    const scarab::param_array* rqNode = &( rqIt->as_array() );
                     std::vector< std::string > names;
 
                     for (scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt)
                     {
-                        if (! (*rqArrayIt)->is_value())
+                        if (! rqArrayIt->is_value())
                         {
                             KTERROR(proclog, "Invalid run-queue array entry: not a value");
                             return false;
                         }
-                        names.push_back((*rqArrayIt)->as_value().as_string());
+                        names.push_back(rqArrayIt->as_value().as_string());
                     }
 
                     if (! PushBackToRunQueue(names))
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 47b5e98..7bc975a 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -45,11 +45,11 @@ namespace Nymph
 
             // any remaining should be cut names
             // ignore any that don't work
-            if (SelectCut(nodeIt->first))
+            if (SelectCut(nodeIt.name()))
             {
-                if (nodeIt->second->is_node())
+                if (nodeIt->is_node())
                 {
-                    fCut->Configure(&nodeIt->second->as_node());
+                    fCut->Configure(&nodeIt->as_node());
                 }
                 continue;
             }
diff --git a/Scarab b/Scarab
index da22e7f..7af4d4a 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit da22e7f4ad38a02df699a947ff21c15baf0c2bfd
+Subproject commit 7af4d4ab2876e0672811ad908b6793c7488a143c

From 738dccff145b18f1721c90c08f2901c53997cde1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Jun 2017 14:08:53 -0700
Subject: [PATCH 051/521] Minor notation improvement

---
 Library/Application/KTProcessorToolbox.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 2e81a17..5b19a1e 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -192,7 +192,7 @@ namespace Nymph
             {
                 if (rqIt->is_value())
                 {
-                    if (! PushBackToRunQueue(rqIt->as_value().as_string()))
+                    if (! PushBackToRunQueue((*rqIt)().as_string()))
                     {
                         KTERROR(proclog, "Unable to process run-queue entry: could not add processor to the queue");
                         return false;
@@ -210,7 +210,7 @@ namespace Nymph
                             KTERROR(proclog, "Invalid run-queue array entry: not a value");
                             return false;
                         }
-                        names.push_back(rqArrayIt->as_value().as_string());
+                        names.push_back((*rqArrayIt)().as_string());
                     }
 
                     if (! PushBackToRunQueue(names))

From c80e9b9dacebb7a08bd5d7a45713a3612fd0b1cc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Jun 2017 14:21:20 -0700
Subject: [PATCH 052/521] Scarab update

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 7af4d4a..5d1e21a 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 7af4d4ab2876e0672811ad908b6793c7488a143c
+Subproject commit 5d1e21a03665d5feb8f8464f3a89826876933f4c

From 186c4d6283d9d0e1d29b1c1706ab20448fbc6c9a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Jun 2017 16:00:58 -0700
Subject: [PATCH 053/521] Created KTTestData.hh/cc and make KTTestProcessorD
 with a slot for KTTestData

---
 Executables/Validation/CMakeLists.txt     |  2 +
 Executables/Validation/KTTestCuts.cc      | 12 +---
 Executables/Validation/KTTestCuts.hh      | 16 +-----
 Executables/Validation/KTTestData.cc      | 42 ++++++++++++++
 Executables/Validation/KTTestData.hh      | 67 +++++++++++++++++++++++
 Executables/Validation/KTTestProcessor.cc | 25 +++++++++
 Executables/Validation/KTTestProcessor.hh | 20 +++++++
 Executables/Validation/TestApplyCut.cc    |  1 +
 Executables/Validation/TestCut.cc         |  1 +
 Executables/Validation/TestCutFilter.cc   |  1 +
 Executables/Validation/TestPrintData.cc   | 20 +------
 Library/Processor/KTSlot.hh               | 16 +++---
 12 files changed, 171 insertions(+), 52 deletions(-)
 create mode 100644 Executables/Validation/KTTestData.cc
 create mode 100644 Executables/Validation/KTTestData.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 4b43ee9..ab270a3 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -15,6 +15,7 @@ if (Nymph_ENABLE_TESTING)
     set (VALIDATION_HEADERFILES
         KTTestConfigurable.hh
         KTTestCuts.hh
+        KTTestData.hh
         KTTestPrimaryProcessor.hh
         KTTestProcessor.hh
     )
@@ -22,6 +23,7 @@ if (Nymph_ENABLE_TESTING)
     set (VALIDATION_SOURCEFILES
         KTTestConfigurable.cc
         KTTestCuts.cc
+        KTTestData.cc
         KTTestPrimaryProcessor.cc
         KTTestProcessor.cc
     )
diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index e66ff30..dbc5758 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -8,13 +8,12 @@
 #include "KTTestCuts.hh"
 
 #include "KTLogger.hh"
+#include "KTTestData.hh"
 
 namespace Nymph
 {
     KTLOGGER(testlog, "KTTestCuts");
 
-    const std::string KTTestData::sName = "test-data";
-
     const std::string KTAwesomeCut::Result::sName = "awesome-cut";
     const std::string KTNotAwesomeCut::Result::sName = "not-awesome-cut";
 
@@ -22,15 +21,6 @@ namespace Nymph
     KT_REGISTER_CUT(KTNotAwesomeCut);
 
 
-    KTTestData::KTTestData() :
-            KTExtensibleData< KTTestData >(),
-            fIsAwesome(false)
-    {}
-
-    KTTestData::~KTTestData()
-    {}
-
-
     KTAwesomeCut::KTAwesomeCut(const std::string& name) :
             KTCutOneArg(name)
     {}
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
index cfa97c6..e1f159c 100644
--- a/Executables/Validation/KTTestCuts.hh
+++ b/Executables/Validation/KTTestCuts.hh
@@ -9,25 +9,13 @@
 #define NYMPH_KTTESTCUTS_HH_
 
 #include "KTCut.hh"
-#include "KTData.hh"
 #include "KTMemberVariable.hh"
+#include "KTData.hh"
 
 
 namespace Nymph
 {
-
-    class KTTestData : public KTExtensibleData< KTTestData >
-    {
-        public:
-            KTTestData();
-            virtual ~KTTestData();
-
-            MEMBERVARIABLE(bool, IsAwesome);
-
-        public:
-            static const std::string sName;
-
-    };
+    class KTTestData;
 
     // Cuts data that is NOT awesome
     class KTAwesomeCut : public KTCutOneArg< KTTestData >
diff --git a/Executables/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
new file mode 100644
index 0000000..11baaba
--- /dev/null
+++ b/Executables/Validation/KTTestData.cc
@@ -0,0 +1,42 @@
+/*
+ * KTTestData.cc
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+#include "KTTestData.hh"
+
+namespace Nymph
+{
+    KTTestData::KTTestData() :
+        KTExtensibleData< KTTestData >(),
+        fIsAwesome(false)
+    {}
+
+    KTTestData::~KTTestData()
+    {}
+
+    const std::string KTTestData::sName = "test-data";
+
+
+    KTTestDerived1Data::KTTestDerived1Data() :
+            KTTestPolyDataBase< KTTestDerived1Data >()
+    {}
+
+    KTTestDerived1Data::~KTTestDerived1Data()
+    {}
+
+    const std::string KTTestDerived1Data::sName = "test-derived-1-data";
+
+    KTTestDerived2Data::KTTestDerived2Data() :
+            KTTestPolyDataBase< KTTestDerived2Data >()
+    {}
+
+    KTTestDerived2Data::~KTTestDerived2Data()
+    {}
+
+    const std::string KTTestDerived2Data::sName = "test-derived-2-data";
+
+} /* namespace Nymph */
+
diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
new file mode 100644
index 0000000..42fa1fe
--- /dev/null
+++ b/Executables/Validation/KTTestData.hh
@@ -0,0 +1,67 @@
+/*
+ * KTTestData.hh
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_KTTESTDATA_HH_
+#define NYMPH_KTTESTDATA_HH_
+
+#include "KTData.hh"
+#include "KTMemberVariable.hh"
+
+
+namespace Nymph
+{
+
+    class KTTestData : public KTExtensibleData< KTTestData >
+    {
+        public:
+            KTTestData();
+            virtual ~KTTestData();
+
+            MEMBERVARIABLE(bool, IsAwesome);
+
+        public:
+            static const std::string sName;
+
+    };
+
+
+    template< class XDerivedDataType >
+    class KTTestPolyDataBase : public KTExtensibleData< XDerivedDataType >
+    {
+        public:
+            KTTestPolyDataBase() :
+                KTExtensibleData< XDerivedDataType >(),
+                fFunniness(1000.)
+            {}
+            virtual ~KTTestPolyDataBase() {}
+
+            MEMBERVARIABLE(double, Funniness);
+    };
+
+    class KTTestDerived1Data : public KTTestPolyDataBase< KTTestDerived1Data >
+    {
+        public:
+            KTTestDerived1Data();
+            virtual ~KTTestDerived1Data();
+
+        public:
+            static const std::string sName;
+    };
+
+    class KTTestDerived2Data : public KTTestPolyDataBase< KTTestDerived2Data >
+    {
+        public:
+            KTTestDerived2Data();
+            virtual ~KTTestDerived2Data();
+
+        public:
+            static const std::string sName;
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTTESTDATA_HH_ */
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 20a169a..a5ed5a6 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -10,6 +10,8 @@
 #include "KTException.hh"
 #include "KTLogger.hh"
 
+#include "KTTestData.hh"
+
 namespace Nymph
 {
     KTLOGGER(testsiglog, "KTTestProcessor")
@@ -101,4 +103,27 @@ namespace Nymph
     }
 
 
+    KT_REGISTER_PROCESSOR(KTTestProcessorD, "test-proc-d");
+
+    KTTestProcessorD::KTTestProcessorD( const std::string& name ) :
+            KTProcessor( name ),
+            fSlot("test-data", this, &KTTestProcessorD::SlotFunc, {})
+    {
+    }
+
+    KTTestProcessorD::~KTTestProcessorD()
+    {
+    }
+
+    bool KTTestProcessorD::Configure(const scarab::param_node*)
+    {
+        return true;
+    }
+
+    bool KTTestProcessorD::SlotFunc(KTTestData& data)
+    {
+        KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
+        return true;
+    }
+
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 689ccc0..5f80236 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -73,5 +73,25 @@ namespace Nymph
     };
 
 
+    class KTTestData;
+
+    /*!
+     * A simple test processor that has a slot for KTTestData
+     */
+    class KTTestProcessorD : public KTProcessor
+    {
+        public:
+            KTTestProcessorD( const std::string& name = "test-proc-d" );
+            virtual ~KTTestProcessorD();
+
+            bool Configure(const scarab::param_node* node);
+
+            bool SlotFunc(KTTestData& data);
+
+        private:
+            KTSlotData< KTTestData > fSlot;
+    };
+
+
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/TestApplyCut.cc b/Executables/Validation/TestApplyCut.cc
index fbde4bb..030022c 100644
--- a/Executables/Validation/TestApplyCut.cc
+++ b/Executables/Validation/TestApplyCut.cc
@@ -9,6 +9,7 @@
 
 #include "KTApplyCut.hh"
 #include "KTLogger.hh"
+#include "KTTestData.hh"
 
 KTLOGGER(testlog, "TestApplyCut");
 
diff --git a/Executables/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
index 968f880..21bb358 100644
--- a/Executables/Validation/TestCut.cc
+++ b/Executables/Validation/TestCut.cc
@@ -8,6 +8,7 @@
 #include "KTTestCuts.hh"
 
 #include "KTLogger.hh"
+#include "KTTestData.hh"
 
 KTLOGGER(testlog, "TestCut");
 
diff --git a/Executables/Validation/TestCutFilter.cc b/Executables/Validation/TestCutFilter.cc
index d2306ec..2f31103 100644
--- a/Executables/Validation/TestCutFilter.cc
+++ b/Executables/Validation/TestCutFilter.cc
@@ -10,6 +10,7 @@
 #include "KTApplyCut.hh"
 #include "KTCutFilter.hh"
 #include "KTLogger.hh"
+#include "KTTestData.hh"
 
 KTLOGGER(testlog, "TestCutFilter");
 
diff --git a/Executables/Validation/TestPrintData.cc b/Executables/Validation/TestPrintData.cc
index ed6fe50..59d70ca 100644
--- a/Executables/Validation/TestPrintData.cc
+++ b/Executables/Validation/TestPrintData.cc
@@ -7,8 +7,8 @@
 
 #include "KTCut.hh"
 #include "KTLogger.hh"
-#include "KTMemberVariable.hh"
 #include "KTPrintDataStructure.hh"
+#include "KTTestData.hh"
 
 #include "param.hh"
 
@@ -16,22 +16,6 @@ namespace Nymph
 {
     KTLOGGER(testlog, "TestPrintData");
 
-    class KTTestData : public KTExtensibleData< KTTestData >
-    {
-        public:
-            KTTestData() :
-                KTExtensibleData< KTTestData >(),
-                fIsAwesome(false)
-            {}
-            virtual ~KTTestData() {}
-
-            MEMBERVARIABLE(bool, IsAwesome);
-
-        public:
-            static const std::string sName;
-
-    };
-
     // Cuts data that is NOT awesome
     class KTAwesomeCut : public KTCut
     {
@@ -106,8 +90,6 @@ namespace Nymph
     };
 
 
-    const std::string KTTestData::sName = "test-data";
-
     const std::string KTAwesomeCut::Result::sName = "awesome-cut";
     const std::string KTNotAwesomeCut::Result::sName = "not-awesome-cut";
 
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 9840131..289ffb4 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -100,12 +100,12 @@ namespace Nymph
 
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr=nullptr );
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr=nullptr );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr=nullptr );
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr=nullptr );
 
             virtual ~KTSlotData();
 
@@ -242,8 +242,8 @@ namespace Nymph
     // KTSlotData
 
     template< class... XDataTypes >
-    template< class XFuncOwnerType >
-    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
             KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
@@ -251,8 +251,8 @@ namespace Nymph
     }
 
     template< class... XDataTypes >
-    template< class XFuncOwnerType >
-    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XDataTypes&... ), KTSignalData* signalPtr) :
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
             KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )

From 9d38ce53eaf19c88008b2448b7bfb6c4a3985b0c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 2 Jun 2017 17:44:24 -0700
Subject: [PATCH 054/521] Enabled polymorphic slot functionality

---
 Executables/Validation/CMakeLists.txt         |  2 +
 Executables/Validation/KTTestData.cc          |  8 ++-
 Executables/Validation/KTTestProcessor.cc     | 65 +++++++++++++++++--
 Executables/Validation/KTTestProcessor.hh     | 53 +++++++++++++--
 .../Validation/TestPolymorphicSlotData.cc     | 41 ++++++++++++
 Executables/Validation/TestSlotData.cc        | 43 ++++++++++++
 Library/Processor/KTSlot.hh                   | 44 +++++++++----
 7 files changed, 231 insertions(+), 25 deletions(-)
 create mode 100644 Executables/Validation/TestPolymorphicSlotData.cc
 create mode 100644 Executables/Validation/TestSlotData.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index ab270a3..fc41cfb 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -52,6 +52,7 @@ if (Nymph_ENABLE_TESTING)
         TestCutFilter
         TestExceptionInSlot
         TestLogger
+        TestPolymorphicSlotData
         TestPrimaryProcessor
         TestPrimaryProcessorNoThreading
         TestPrintData
@@ -59,6 +60,7 @@ if (Nymph_ENABLE_TESTING)
         TestProcessorToolboxMultithreaded
         TestProcessorToolboxSinglethreaded
         TestSignalsAndSlots
+        TestSlotData
         TestThroughputProfiler
         TestUseBreakpoint
     )
diff --git a/Executables/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
index 11baaba..6aa5186 100644
--- a/Executables/Validation/KTTestData.cc
+++ b/Executables/Validation/KTTestData.cc
@@ -22,7 +22,9 @@ namespace Nymph
 
     KTTestDerived1Data::KTTestDerived1Data() :
             KTTestPolyDataBase< KTTestDerived1Data >()
-    {}
+    {
+        fFunniness = 500;
+    }
 
     KTTestDerived1Data::~KTTestDerived1Data()
     {}
@@ -31,7 +33,9 @@ namespace Nymph
 
     KTTestDerived2Data::KTTestDerived2Data() :
             KTTestPolyDataBase< KTTestDerived2Data >()
-    {}
+    {
+        fFunniness = 1000000000000;
+    }
 
     KTTestDerived2Data::~KTTestDerived2Data()
     {}
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index a5ed5a6..c44d217 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -10,7 +10,7 @@
 #include "KTException.hh"
 #include "KTLogger.hh"
 
-#include "KTTestData.hh"
+//#include "KTTestData.hh"
 
 namespace Nymph
 {
@@ -44,8 +44,8 @@ namespace Nymph
 
     KTTestProcessorB::KTTestProcessorB( const std::string& name ) :
             KTProcessor( name ),
-            fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1, {}),
-            fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2, {})
+            fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1),
+            fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2)
     {
         fSlot1Wrapper = GetSlot( "first-slot" );
         fSlot2Wrapper = GetSlot( "second-slot" );
@@ -79,7 +79,7 @@ namespace Nymph
 
     KTTestProcessorC::KTTestProcessorC( const std::string& name ) :
             KTProcessor( name ),
-            fSlot1("first-slot", this, &KTTestProcessorC::SlotFunc1, {})
+            fSlot1("first-slot", this, &KTTestProcessorC::SlotFunc1)
     {
     }
 
@@ -107,7 +107,8 @@ namespace Nymph
 
     KTTestProcessorD::KTTestProcessorD( const std::string& name ) :
             KTProcessor( name ),
-            fSlot("test-data", this, &KTTestProcessorD::SlotFunc, {})
+            fDataSlot("test-data-slot", this, &KTTestProcessorD::SlotFunc),
+            fDataSignal("test-data-signal", this)
     {
     }
 
@@ -120,10 +121,64 @@ namespace Nymph
         return true;
     }
 
+    void KTTestProcessorD::EmitSignal(bool isAwesome)
+    {
+        KTDataPtr dataPtr = std::make_shared< KTData >();
+        KTTestData& data = dataPtr->Of< KTTestData >();
+        data.SetIsAwesome(isAwesome);
+        fDataSignal(dataPtr);
+        return;
+    }
+
     bool KTTestProcessorD::SlotFunc(KTTestData& data)
     {
         KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
         return true;
     }
 
+
+    KT_REGISTER_PROCESSOR(KTTestProcessorE, "test-proc-e");
+
+    KTTestProcessorE::KTTestProcessorE( const std::string& name ) :
+            KTProcessor( name ),
+            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseSlotFunc< KTTestDerived1Data >),
+            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseSlotFunc< KTTestDerived2Data >),
+            fDerived1DataSignal("derived-1", this),
+            fDerived2DataSignal("derived-2", this)
+    {
+    }
+
+    KTTestProcessorE::~KTTestProcessorE()
+    {
+    }
+
+    bool KTTestProcessorE::Configure(const scarab::param_node*)
+    {
+        return true;
+    }
+
+    void KTTestProcessorE::EmitSignals()
+    {
+        KTDataPtr dataPtr = std::make_shared< KTData >();
+
+        KTINFO(testsiglog, "Creating data objects");
+        KTTestDerived1Data& data1 = dataPtr->Of< KTTestDerived1Data >();
+        KTTestDerived2Data& data2 = dataPtr->Of< KTTestDerived2Data >();
+
+        KTINFO(testsiglog, "Emitting data-1 signal");
+        fDerived1DataSignal( dataPtr );
+
+        KTINFO(testsiglog, "Emitting data-2 signal");
+        fDerived2DataSignal( dataPtr );
+
+        return;
+    }
+
+    void KTTestProcessorE::PrintFunniness( unsigned funniness)
+    {
+        KTINFO(testsiglog, "Data funniness measured to be: <" << funniness << ">");
+        return;
+    }
+
+
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 5f80236..5b6b507 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -9,10 +9,10 @@
 #define KTTESTPROCESSOR_HH_
 
 #include "KTProcessor.hh"
-
-#include "KTSignal.hh"
 #include "KTSlot.hh"
 
+#include "KTTestData.hh"
+
 namespace Nymph
 {
 
@@ -73,7 +73,7 @@ namespace Nymph
     };
 
 
-    class KTTestData;
+//    class KTTestData;
 
     /*!
      * A simple test processor that has a slot for KTTestData
@@ -86,12 +86,57 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
+            // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
+            void EmitSignal(bool isAwesome = true);
+
             bool SlotFunc(KTTestData& data);
 
         private:
-            KTSlotData< KTTestData > fSlot;
+            KTSlotData< KTTestData > fDataSlot;
+
+            KTSignalData fDataSignal;
+    };
+
+
+//    template< class XDerivedDataType >
+//    class KTTestPolyDataBase< XDerivedDataType >;
+//    class KTTestDerived1Data;
+//    class KTTestDerived2Data;
+
+    /*!
+     * A simple test processor for testing polymorphic data, signals, and slots
+     */
+    class KTTestProcessorE : public KTProcessor
+    {
+        public:
+            KTTestProcessorE( const std::string& name = "test-proc-d" );
+            virtual ~KTTestProcessorE();
+
+            bool Configure(const scarab::param_node* node);
+
+            void EmitSignals();
+
+            template< class XDerivedDataType >
+            bool BaseSlotFunc(KTTestPolyDataBase< XDerivedDataType >& data);
+
+        private:
+            KTSlotData< KTTestDerived1Data > fDerived1DataSlot;
+            KTSlotData< KTTestDerived2Data > fDerived2DataSlot;
+
+            KTSignalData fDerived1DataSignal;
+            KTSignalData fDerived2DataSignal;
+
+            // utility function to avoid putting a logger in the header
+            void PrintFunniness( unsigned funniness );
     };
 
+    template< class XDerivedDataType >
+    bool KTTestProcessorE::BaseSlotFunc(KTTestPolyDataBase< XDerivedDataType >& data)
+    {
+        PrintFunniness( data.GetFunniness() );
+        return true;
+    }
+
 
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/TestPolymorphicSlotData.cc b/Executables/Validation/TestPolymorphicSlotData.cc
new file mode 100644
index 0000000..76b03e8
--- /dev/null
+++ b/Executables/Validation/TestPolymorphicSlotData.cc
@@ -0,0 +1,41 @@
+/*
+ * TestSlotData.cc
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+
+#include "KTTestData.hh"
+#include "KTTestProcessor.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testslotdata, "TestPolymorphicSlotData")
+
+int main()
+{
+    try
+    {
+        KTTestProcessorE tpE;
+
+        KTINFO(testslotdata, "Connecting derived-1 to derived-1 and derived-2 to derived-2");
+        // for simplicity the signal and slot are in the same processor, but that need not be, of course
+        tpE.ConnectASlot("derived-1", &tpE, "derived-1" );
+        tpE.ConnectASlot("derived-2", &tpE, "derived-2" );
+
+        KTINFO(testslotdata, "Emitting signals");
+        tpE.EmitSignals();
+
+        KTINFO(testslotdata, "Tests complete");
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testslotdata, "An exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
+
diff --git a/Executables/Validation/TestSlotData.cc b/Executables/Validation/TestSlotData.cc
new file mode 100644
index 0000000..889bd03
--- /dev/null
+++ b/Executables/Validation/TestSlotData.cc
@@ -0,0 +1,43 @@
+/*
+ * TestSlotData.cc
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+
+#include "KTTestData.hh"
+#include "KTTestProcessor.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testslotdata, "TestSlotData")
+
+int main()
+{
+    try
+    {
+        KTTestProcessorD tpD;
+
+        KTINFO(testslotdata, "Connecting test-data-signal to test-data-slot");
+        // for simplicity the signal and slot are in the same processor, but that need not be, of course
+        tpD.ConnectASlot("test-data-signal", &tpD, "test-data-slot" );
+
+        KTINFO(testslotdata, "Emitting signals");
+        KTINFO(testslotdata, "First test signal: true");
+        tpD.EmitSignal(true);
+        KTINFO(testslotdata, "Second test signal: false");
+        tpD.EmitSignal(false);
+
+        KTINFO(testslotdata, "Tests complete");
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testslotdata, "An exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
+
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 289ffb4..75b43b8 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -42,11 +42,11 @@ namespace Nymph
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType >
-            KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
+            KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType >
-            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals );
+            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
 
             virtual ~KTSlot();
 
@@ -93,19 +93,22 @@ namespace Nymph
     template< class... XDataTypes >
     class KTSlotData : public KTSlot< KTDataPtr  >
     {
-        //public:
-            //typedef XDataType data_type;
-            //typedef std::function< bool( KTDataPtr ) > function_signature;
-            //typedef typename function_signature::result_type return_type;
-
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr=nullptr );
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr=nullptr );
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
 
             virtual ~KTSlotData();
 
@@ -115,11 +118,6 @@ namespace Nymph
             template< typename... DataTypes >
             bool DataPresent( KTDataPtr data );
 
-            //template<  >
-            //bool DataPresent( KTDataPtr data );
-            //template< typename DataType, typename... DataTypes >
-            //bool DataPresent( KTDataPtr data );
-
             //function_signature fFunc;
             std::function< bool (XDataTypes&...) > fFunc;
 
@@ -250,6 +248,15 @@ namespace Nymph
     {
     }
 
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
     template< class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
@@ -259,6 +266,15 @@ namespace Nymph
     {
     }
 
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
     template< class... XDataTypes >
     KTSlotData< XDataTypes... >::~KTSlotData()
     {

From 6f6e071a3b0b1d558cda09c66125310f2332a7eb Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 8 Jun 2017 15:03:06 -0700
Subject: [PATCH 055/521] =?UTF-8?q?Partial=20implementation=20of=20data=20?=
 =?UTF-8?q?changes=20(won=E2=80=99t=20compile)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Executables/Validation/KTTestCuts.cc        |  4 +-
 Executables/Validation/KTTestCuts.hh        |  6 +-
 Executables/Validation/KTTestData.cc        | 29 +------
 Executables/Validation/KTTestData.hh        | 40 +++-------
 Executables/Validation/KTTestProcessor.cc   | 33 ++++----
 Executables/Validation/KTTestProcessor.hh   | 17 +---
 Executables/Validation/TestApplyCut.cc      | 10 +--
 Executables/Validation/TestCut.cc           |  2 +-
 Executables/Validation/TestCutFilter.cc     | 12 +--
 Executables/Validation/TestPrintData.cc     | 26 +++----
 Library/Application/KTDataQueueProcessor.cc |  6 +-
 Library/Application/KTDataQueueProcessor.hh | 30 +++----
 Library/Application/KTPrintDataStructure.cc | 38 ++++-----
 Library/Application/KTPrintDataStructure.hh | 24 +++---
 Library/Application/KTProcessorToolbox.cc   |  2 +-
 Library/Application/KTProcessorToolbox.hh   |  8 +-
 Library/Application/KTThroughputProfiler.cc |  4 +-
 Library/Application/KTThroughputProfiler.hh |  8 +-
 Library/CMakeLists.txt                      |  2 +
 Library/Data/KTApplyCut.cc                  | 12 +--
 Library/Data/KTApplyCut.hh                  | 10 +--
 Library/Data/KTCoreData.cc                  | 37 +++++++++
 Library/Data/KTCoreData.hh                  | 42 ++++++++++
 Library/Data/KTCut.hh                       | 40 +++++-----
 Library/Data/KTCutFilter.cc                 | 16 ++--
 Library/Data/KTCutFilter.hh                 | 14 ++--
 Library/Data/KTCutStatus.hh                 |  2 +-
 Library/Data/KTData.cc                      | 21 ++---
 Library/Data/KTData.hh                      | 57 ++++++--------
 Library/Data/KTDataPy.hh                    |  8 +-
 Library/Processor/KTPrimaryProcessor.cc     |  2 +-
 Library/Processor/KTPrimaryProcessor.hh     |  2 +-
 Library/Processor/KTSignal.hh               |  8 +-
 Library/Processor/KTSlot.hh                 | 86 +++++++++++----------
 Library/Processor/KTThreadReference.cc      |  4 +-
 Library/Processor/KTThreadReference.hh      | 26 +++----
 36 files changed, 355 insertions(+), 333 deletions(-)
 create mode 100644 Library/Data/KTCoreData.cc
 create mode 100644 Library/Data/KTCoreData.hh

diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index dbc5758..bc8e153 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -33,7 +33,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTAwesomeCut::Apply(KTData& data, KTTestData& testData)
+    bool KTAwesomeCut::Apply(KTCoreData& data, KTTestData& testData)
     {
         bool isCut = ! testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
@@ -55,7 +55,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTNotAwesomeCut::Apply(KTData& data, KTTestData& testData)
+    bool KTNotAwesomeCut::Apply(KTCoreData& data, KTTestData& testData)
     {
         bool isCut = testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
index e1f159c..a0541cb 100644
--- a/Executables/Validation/KTTestCuts.hh
+++ b/Executables/Validation/KTTestCuts.hh
@@ -10,7 +10,7 @@
 
 #include "KTCut.hh"
 #include "KTMemberVariable.hh"
-#include "KTData.hh"
+#include "KTCoreData.hh"
 
 
 namespace Nymph
@@ -32,7 +32,7 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            bool Apply(KTData& data, KTTestData& testData);
+            bool Apply(KTCoreData& data, KTTestData& testData);
     };
 
     // Cuts data that is IS awesome
@@ -50,7 +50,7 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            bool Apply(KTData& data, KTTestData& testData);
+            bool Apply(KTCoreData& data, KTTestData& testData);
     };
 
 }
diff --git a/Executables/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
index 6aa5186..d879bcf 100644
--- a/Executables/Validation/KTTestData.cc
+++ b/Executables/Validation/KTTestData.cc
@@ -10,37 +10,12 @@
 namespace Nymph
 {
     KTTestData::KTTestData() :
-        KTExtensibleData< KTTestData >(),
-        fIsAwesome(false)
+        KTData( "test-data" ),
+        fIsAwesome( false )
     {}
 
     KTTestData::~KTTestData()
     {}
 
-    const std::string KTTestData::sName = "test-data";
-
-
-    KTTestDerived1Data::KTTestDerived1Data() :
-            KTTestPolyDataBase< KTTestDerived1Data >()
-    {
-        fFunniness = 500;
-    }
-
-    KTTestDerived1Data::~KTTestDerived1Data()
-    {}
-
-    const std::string KTTestDerived1Data::sName = "test-derived-1-data";
-
-    KTTestDerived2Data::KTTestDerived2Data() :
-            KTTestPolyDataBase< KTTestDerived2Data >()
-    {
-        fFunniness = 1000000000000;
-    }
-
-    KTTestDerived2Data::~KTTestDerived2Data()
-    {}
-
-    const std::string KTTestDerived2Data::sName = "test-derived-2-data";
-
 } /* namespace Nymph */
 
diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
index 42fa1fe..288bf92 100644
--- a/Executables/Validation/KTTestData.hh
+++ b/Executables/Validation/KTTestData.hh
@@ -8,59 +8,39 @@
 #ifndef NYMPH_KTTESTDATA_HH_
 #define NYMPH_KTTESTDATA_HH_
 
-#include "KTData.hh"
+#include "KTCoreData.hh"
 #include "KTMemberVariable.hh"
 
 
 namespace Nymph
 {
 
-    class KTTestData : public KTExtensibleData< KTTestData >
+    class KTTestData : public KTData
     {
         public:
             KTTestData();
             virtual ~KTTestData();
 
             MEMBERVARIABLE(bool, IsAwesome);
-
-        public:
-            static const std::string sName;
-
     };
 
+    DEFINE_EXT_DATA( KTTestData ); // defines KTTestDataExt
+
 
-    template< class XDerivedDataType >
-    class KTTestPolyDataBase : public KTExtensibleData< XDerivedDataType >
+    class KTTestBaseData : public KTData
     {
         public:
-            KTTestPolyDataBase() :
-                KTExtensibleData< XDerivedDataType >(),
+            KTTestBaseData() :
+                KTData( "poly-data" ),
                 fFunniness(1000.)
             {}
-            virtual ~KTTestPolyDataBase() {}
+            virtual ~KTTestBaseData() {}
 
             MEMBERVARIABLE(double, Funniness);
     };
 
-    class KTTestDerived1Data : public KTTestPolyDataBase< KTTestDerived1Data >
-    {
-        public:
-            KTTestDerived1Data();
-            virtual ~KTTestDerived1Data();
-
-        public:
-            static const std::string sName;
-    };
-
-    class KTTestDerived2Data : public KTTestPolyDataBase< KTTestDerived2Data >
-    {
-        public:
-            KTTestDerived2Data();
-            virtual ~KTTestDerived2Data();
-
-        public:
-            static const std::string sName;
-    };
+    DEFINE_EXT_DATA_2( KTTestDerived1DataHandle, KTTestBaseData );
+    DEFINE_EXT_DATA_2( KTTestDerived2DataHandle, KTTestBaseData );
 
 } /* namespace Nymph */
 
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index c44d217..396a5ab 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -63,14 +63,14 @@ namespace Nymph
     void KTTestProcessorB::SlotFunc1(int input)
     {
         KTINFO(testsiglog, "Slot1: input is " << input);
-        fSlot1Wrapper->GetThreadRef()->Break( KTDataPtr(), fSlot1Wrapper->GetDoBreakpoint());
+        fSlot1Wrapper->GetThreadRef()->Break( KTDataHandle(), fSlot1Wrapper->GetDoBreakpoint());
         return;
     }
 
     void KTTestProcessorB::SlotFunc2(int input)
     {
         KTINFO(testsiglog, "Slot2: twice input is " << 2 * input);
-        fSlot2Wrapper->GetThreadRef()->Break( KTDataPtr(), fSlot2Wrapper->GetDoBreakpoint());
+        fSlot2Wrapper->GetThreadRef()->Break( KTDataHandle(), fSlot2Wrapper->GetDoBreakpoint());
         return;
     }
 
@@ -123,17 +123,17 @@ namespace Nymph
 
     void KTTestProcessorD::EmitSignal(bool isAwesome)
     {
-        KTDataPtr dataPtr = std::make_shared< KTData >();
-        KTTestData& data = dataPtr->Of< KTTestData >();
+        KTDataHandle dataHandle = std::make_shared< KTCoreData >();
+        KTTestData& data = dataHandle->Of< KTTestData >();
         data.SetIsAwesome(isAwesome);
-        fDataSignal(dataPtr);
+        fDataSignal(dataHandle);
         return;
     }
 
-    bool KTTestProcessorD::SlotFunc(KTTestData& data)
+    void KTTestProcessorD::SlotFunc(KTTestData& data)
     {
         KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
-        return true;
+        return;
     }
 
 
@@ -141,8 +141,8 @@ namespace Nymph
 
     KTTestProcessorE::KTTestProcessorE( const std::string& name ) :
             KTProcessor( name ),
-            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseSlotFunc< KTTestDerived1Data >),
-            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseSlotFunc< KTTestDerived2Data >),
+            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseSlotFunc),
+            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseSlotFunc),
             fDerived1DataSignal("derived-1", this),
             fDerived2DataSignal("derived-2", this)
     {
@@ -159,26 +159,25 @@ namespace Nymph
 
     void KTTestProcessorE::EmitSignals()
     {
-        KTDataPtr dataPtr = std::make_shared< KTData >();
+        KTDataHandle dataHandle = std::make_shared< KTCoreData >();
 
         KTINFO(testsiglog, "Creating data objects");
-        KTTestDerived1Data& data1 = dataPtr->Of< KTTestDerived1Data >();
-        KTTestDerived2Data& data2 = dataPtr->Of< KTTestDerived2Data >();
+        dataHandle->Of< KTTestDerived1DataHandle >();
+        dataHandle->Of< KTTestDerived2DataHandle >();
 
         KTINFO(testsiglog, "Emitting data-1 signal");
-        fDerived1DataSignal( dataPtr );
+        fDerived1DataSignal( dataHandle );
 
         KTINFO(testsiglog, "Emitting data-2 signal");
-        fDerived2DataSignal( dataPtr );
+        fDerived2DataSignal( dataHandle );
 
         return;
     }
 
-    void KTTestProcessorE::PrintFunniness( unsigned funniness)
+    void KTTestProcessorE::BaseSlotFunc(KTTestBaseData& data)
     {
-        KTINFO(testsiglog, "Data funniness measured to be: <" << funniness << ">");
+        KTINFO(testsiglog, "Data funniness measured to be: <" << data.GetFunniness() << ">");
         return;
     }
 
-
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 5b6b507..6d482e4 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -89,7 +89,7 @@ namespace Nymph
             // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
             void EmitSignal(bool isAwesome = true);
 
-            bool SlotFunc(KTTestData& data);
+            void SlotFunc(KTTestData& data);
 
         private:
             KTSlotData< KTTestData > fDataSlot;
@@ -116,12 +116,11 @@ namespace Nymph
 
             void EmitSignals();
 
-            template< class XDerivedDataType >
-            bool BaseSlotFunc(KTTestPolyDataBase< XDerivedDataType >& data);
+            void BaseSlotFunc(KTTestBaseData& data);
 
         private:
-            KTSlotData< KTTestDerived1Data > fDerived1DataSlot;
-            KTSlotData< KTTestDerived2Data > fDerived2DataSlot;
+            KTSlotData< KTTestDerived1DataHandle > fDerived1DataSlot;
+            KTSlotData< KTTestDerived2DataHandle > fDerived2DataSlot;
 
             KTSignalData fDerived1DataSignal;
             KTSignalData fDerived2DataSignal;
@@ -130,13 +129,5 @@ namespace Nymph
             void PrintFunniness( unsigned funniness );
     };
 
-    template< class XDerivedDataType >
-    bool KTTestProcessorE::BaseSlotFunc(KTTestPolyDataBase< XDerivedDataType >& data)
-    {
-        PrintFunniness( data.GetFunniness() );
-        return true;
-    }
-
-
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/TestApplyCut.cc b/Executables/Validation/TestApplyCut.cc
index 030022c..4d8e7a8 100644
--- a/Executables/Validation/TestApplyCut.cc
+++ b/Executables/Validation/TestApplyCut.cc
@@ -18,17 +18,17 @@ using namespace std;
 
 int main()
 {
-    KTDataPtr dataPtr(new KTData());
-    KTTestData& testData = dataPtr->Of< KTTestData >();
+    KTDataHandle dataHandle(new KTCoreData());
+    KTTestData& testData = dataHandle->Of< KTTestData >();
 
-    KTCutStatus& cutStatus = dataPtr->CutStatus();
+    KTCutStatus& cutStatus = dataHandle->CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTApplyCut applyCut;
 
     KTINFO(testlog, "Applying awesome cut");
     applyCut.SetCut(new KTAwesomeCut());
-    applyCut.ApplyCut(dataPtr);
+    applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
     KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
@@ -40,7 +40,7 @@ int main()
 
     KTINFO(testlog, "Applying not-awesome cut");
     applyCut.SelectCut("not-awesome-cut");
-    applyCut.ApplyCut(dataPtr);
+    applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
     KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
diff --git a/Executables/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
index 21bb358..8497919 100644
--- a/Executables/Validation/TestCut.cc
+++ b/Executables/Validation/TestCut.cc
@@ -17,7 +17,7 @@ using namespace std;
 
 int main()
 {
-    KTData data;
+    KTCoreData data;
     KTTestData& testData = data.Of< KTTestData >();
 
     KTCutStatus& cutStatus = data.CutStatus();
diff --git a/Executables/Validation/TestCutFilter.cc b/Executables/Validation/TestCutFilter.cc
index 2f31103..8888e5a 100644
--- a/Executables/Validation/TestCutFilter.cc
+++ b/Executables/Validation/TestCutFilter.cc
@@ -19,17 +19,17 @@ using namespace std;
 
 int main()
 {
-    KTDataPtr dataPtr(new KTData());
-    KTTestData& testData = dataPtr->Of< KTTestData >();
+    KTDataHandle dataHandle(new KTCoreData());
+    KTTestData& testData = dataHandle->Of< KTTestData >();
 
-    KTCutStatus& cutStatus = dataPtr->CutStatus();
+    KTCutStatus& cutStatus = dataHandle->CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTApplyCut applyCut;
 
     KTINFO(testlog, "Applying awesome cut");
     applyCut.SetCut(new KTAwesomeCut());
-    applyCut.ApplyCut(dataPtr);
+    applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
     KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
@@ -41,7 +41,7 @@ int main()
 
     KTINFO(testlog, "Applying not-awesome cut");
     applyCut.SelectCut("not-awesome-cut");
-    applyCut.ApplyCut(dataPtr);
+    applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
     KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
@@ -54,7 +54,7 @@ int main()
     KTINFO(testlog, "Cut state of <KTNotAwesomeCut::Result> is: " << cutStatus.GetCutState< KTNotAwesomeCut::Result >());
 
     KTCutFilter cutFilter;
-    KTData& data = dataPtr->Of< KTData >();
+    KTCoreData& data = dataHandle->Of< KTCoreData >();
 
     KTINFO(testlog, "Filtering with all cuts");
     cutFilter.SetCutMaskAll();
diff --git a/Executables/Validation/TestPrintData.cc b/Executables/Validation/TestPrintData.cc
index 59d70ca..e73e9d0 100644
--- a/Executables/Validation/TestPrintData.cc
+++ b/Executables/Validation/TestPrintData.cc
@@ -34,21 +34,21 @@ namespace Nymph
             bool Configure(const scarab::param_node* node)
             {return true;}
 
-            bool Apply(KTData& data, KTTestData& testData)
+            bool Apply(KTCoreData& data, KTTestData& testData)
             {
                 bool isCut = ! testData.GetIsAwesome();
                 data.CutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
                 return isCut;
             }
 
-            bool Apply(KTDataPtr dataPtr)
+            bool Apply(KTDataHandle dataHandle)
             {
-                if (! dataPtr->Has< KTTestData >())
+                if (! dataHandle->Has< KTTestDataExt >())
                 {
                     KTERROR(testlog, "Data type <KTTestData> was not present");
                     return false;
                 }
-                return Apply(dataPtr->Of< KTData >(), dataPtr->Of< KTTestData >());
+                return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< KTTestDataExt >());
             }
     };
 
@@ -70,7 +70,7 @@ namespace Nymph
             bool Configure(const scarab::param_node* node)
             {return true;}
 
-            bool Apply(KTData& data, KTTestData& testData)
+            bool Apply(KTCoreData& data, KTTestData& testData)
             {
                 bool isCut = testData.GetIsAwesome();
                 // use the name-based AddCutResult
@@ -78,14 +78,14 @@ namespace Nymph
                 return isCut;
             }
 
-            bool Apply(KTDataPtr dataPtr)
+            bool Apply(KTDataHandle dataHandle)
             {
-                if (! dataPtr->Has< KTTestData >())
+                if (! dataHandle->Has< KTTestData >())
                 {
                     KTERROR(testlog, "Data type <KTTestData> was not present");
                     return false;
                 }
-                return Apply(dataPtr->Of< KTData >(), dataPtr->Of< KTTestData >());
+                return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< KTTestData >());
             }
     };
 
@@ -103,9 +103,9 @@ using namespace std;
 
 int main()
 {
-    KTDataPtr dataPtr(new KTData());
-    KTData& data = dataPtr->Of< KTData >();
-    KTTestData& testData = dataPtr->Of< KTTestData >();
+    KTDataHandle dataHandle(new KTCoreData());
+    KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
+    KTTestDataExt& testData = dataHandle->Of< KTTestDataExt >();
 
     KTINFO(testlog, "Applying awesome cut");
     KTAwesomeCut cut;
@@ -118,10 +118,10 @@ int main()
     KTPrintDataStructure printer;
 
     KTINFO(testlog, "Printing data structure");
-    printer.PrintDataStructure(dataPtr);
+    printer.PrintDataStructure(dataHandle);
 
     KTINFO(testlog, "Printing cut structure");
-    printer.PrintCutStructure(dataPtr);
+    printer.PrintCutStructure(dataHandle);
 
     return 0;
 }
diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index bca51fd..4a7975b 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -33,19 +33,19 @@ namespace Nymph
         return true;
     }
 
-    void KTDataQueueProcessor::EmitDataSignal(KTDataPtr data)
+    void KTDataQueueProcessor::EmitDataSignal(KTDataHandle data)
     {
         fDataSignal(data);
         return;
     }
 
-    void KTDataQueueProcessor::QueueData(KTDataPtr& data)
+    void KTDataQueueProcessor::QueueData(KTDataHandle& data)
     {
         fQueueDataSW->GetThreadRef()->Break(data, fQueueDataSW->GetDoBreakpoint());
         return DoQueueData(data);
     }
 /*
-    void KTDataQueueProcessor::QueueDataList(list< KTDataPtr >* dataList)
+    void KTDataQueueProcessor::QueueDataList(list< KTDataHandle >* dataList)
     {
         return DoQueueDataList(dataList, &KTDataQueueProcessor::EmitDataSignal);
     }
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index 867efb8..bb2b54a 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -11,7 +11,7 @@
 #include "KTPrimaryProcessor.hh"
 
 #include "KTConcurrentQueue.hh"
-#include "KTData.hh"
+#include "KTCoreData.hh"
 #include "KTLogger.hh"
 #include "KTSlot.hh"
 
@@ -46,11 +46,11 @@ namespace Nymph
     class KTDataQueueProcessorTemplate : public KTPrimaryProcessor
     {
         public:
-            typedef void (XProcessorType::*FuncPtrType)(KTDataPtr);
+            typedef void (XProcessorType::*FuncPtrType)(KTDataHandle);
 
             struct DataAndFunc
             {
-                KTDataPtr fData;
+                KTDataHandle fData;
                 FuncPtrType fFuncPtr;
             };
 
@@ -113,15 +113,15 @@ namespace Nymph
         protected:
             /// Queue an data object with a provided function
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataPtr& data, FuncPtrType func);
+            void DoQueueData(KTDataHandle& data, FuncPtrType func);
 
             /// Queue an data object with fFuncPtr
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataPtr& data);
+            void DoQueueData(KTDataHandle& data);
 
             /// Queue a list of data objects
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
-            //void DoQueueDataList(std::list< KTDataPtr& >* dataList, void (XProcessorType::*fFuncPtr)(KTDataPtr));
+            //void DoQueueDataList(std::list< KTDataHandle& >* dataList, void (XProcessorType::*fFuncPtr)(KTDataHandle));
 
             //*********
             // Slots
@@ -159,10 +159,10 @@ namespace Nymph
      Available configuration values:
 
      Slots:
-     - "data": void (KTDataPtr) -- Queue a data object for asynchronous processing; use signal "data"
+     - "data": void (KTDataHandle) -- Queue a data object for asynchronous processing; use signal "data"
 
      Signals:
-     - "data": void (KTDataPtr) -- Emitted for each data object in the queue
+     - "data": void (KTDataHandle) -- Emitted for each data object in the queue
      - "queue-done": void () -- Emitted when queue is emptied (inherited from KTDataQueueProcessorTemplate)
     */
     class KTDataQueueProcessor : public KTDataQueueProcessorTemplate< KTDataQueueProcessor >
@@ -174,7 +174,7 @@ namespace Nymph
             bool ConfigureSubClass(const scarab::param_node* node);
 
         public:
-            void EmitDataSignal(KTDataPtr data);
+            void EmitDataSignal(KTDataHandle data);
 
             //***************
             // Signals
@@ -189,12 +189,12 @@ namespace Nymph
         public:
             /// Queue an data object; will emit data signal
             /// Assumes ownership of the data; original shared pointer will be nullified
-            void QueueData(KTDataPtr& data);
+            void QueueData(KTDataHandle& data);
             KTSlotWrapper* fQueueDataSW;
 
             /// Queue a list of data objects; will emit data signal
             /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
-            //void QueueDataList(std::list< KTDataPtr >* dataList);
+            //void QueueDataList(std::list< KTDataHandle >* dataList);
 
     };
 
@@ -303,7 +303,7 @@ namespace Nymph
 
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data, FuncPtrType func)
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataHandle& data, FuncPtrType func)
     {
         KTDEBUG(eqplog, "Queueing data");
         DataAndFunc daf;
@@ -315,16 +315,16 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataPtr& data)
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataHandle& data)
     {
         DoQueueData(data, fFuncPtr);
         return;
     }
 /*
     template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueDataList(std::list< KTDataPtr& >* dataList, void (XProcessorType::*func)(KTDataPtr))
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueDataList(std::list< KTDataHandle& >* dataList, void (XProcessorType::*func)(KTDataHandle))
     {
-        typedef std::list< KTDataPtr > DataList;
+        typedef std::list< KTDataHandle > DataList;
 
         KTDEBUG(eqplog, "Queueing data objects");
         DataAndFunc daf;
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index 29c42e7..48d6c70 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -38,52 +38,52 @@ namespace Nymph
         return true;
     }
 
-    void KTPrintDataStructure::PrintDataStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::PrintDataStructure(KTDataHandle dataHandle)
     {
-        DoPrintDataStructure(dataPtr);
+        DoPrintDataStructure(dataHandle);
 
         KTSlotWrapper* slotWrap = fDataStructSlot.GetSlotWrapper();
-        slotWrap->GetThreadRef()->Break( dataPtr, slotWrap->GetDoBreakpoint() );
+        slotWrap->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
 
-        fDataSignal(dataPtr);
+        fDataSignal(dataHandle);
 
         return;
     }
 
-    void KTPrintDataStructure::PrintCutStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::PrintCutStructure(KTDataHandle dataHandle)
     {
-        DoPrintCutStructure(dataPtr);
+        DoPrintCutStructure(dataHandle);
 
         KTSlotWrapper* slotWrap = fCutStructSlot.GetSlotWrapper();
-        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr, slotWrap->GetDoBreakpoint() );
+        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
 
-        fDataSignal(dataPtr);
+        fDataSignal(dataHandle);
 
         return;
     }
 
 
-    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataHandle dataHandle)
     {
-        DoPrintDataStructure(dataPtr);
-        DoPrintCutStructure(dataPtr);
+        DoPrintDataStructure(dataHandle);
+        DoPrintCutStructure(dataHandle);
 
         KTSlotWrapper* slotWrap = fDataAndCutStructSlot.GetSlotWrapper();
-        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataPtr, slotWrap->GetDoBreakpoint() );
+        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
 
-        fDataSignal(dataPtr);
+        fDataSignal(dataHandle);
 
         return;
     }
 
-    void KTPrintDataStructure::DoPrintDataStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::DoPrintDataStructure(KTDataHandle dataHandle)
     {
         std::stringstream printbuf;
 
         printbuf << "\nData Structure:\n";
-        printbuf << "\t- " << dataPtr->Name() << '\n';
-        KTDEBUG(datalog, "Found data type " << dataPtr->Name());
-        KTExtensibleStructCore< KTDataCore >* nextData = dataPtr->Next();
+        printbuf << "\t- " << dataHandle->Name() << '\n';
+        KTDEBUG(datalog, "Found data type " << dataHandle->Name());
+        KTExtensibleStructCore< KTDataCore >* nextData = dataHandle->Next();
         while (nextData != NULL)
         {
             printbuf << "\t- " << nextData->Name() << '\n';
@@ -96,11 +96,11 @@ namespace Nymph
         return;
     }
 
-    void KTPrintDataStructure::DoPrintCutStructure(KTDataPtr dataPtr)
+    void KTPrintDataStructure::DoPrintCutStructure(KTDataHandle dataHandle)
     {
         std::stringstream printbuf;
 
-        KTCutStatus& cutStatus = dataPtr->CutStatus();
+        KTCutStatus& cutStatus = dataHandle->CutStatus();
         printbuf << "\n" << cutStatus;
 
         const KTCutResult* cutResult = cutStatus.CutResults();
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index 204ab09..6df0a69 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -35,12 +35,12 @@ namespace Nymph
      Available configuration values: none
 
      Slots:
-     - "print-data": void (KTDataPtr) -- Prints the structure of the data object; Does not modify the data or cuts; Emits signal "data"
-     - "print-cuts": void (KTDataPtr) -- Prints the structure of the data's cuts; Does not modify the data or cuts; Emits signal "data"
-     - "print-data-and-cuts": void (KTDataPtr) -- Prints the structure of the data object and its cuts; Does not modify the data or cuts; Emits signal "data"
+     - "print-data": void (KTDataHandle) -- Prints the structure of the data object; Does not modify the data or cuts; Emits signal "data"
+     - "print-cuts": void (KTDataHandle) -- Prints the structure of the data's cuts; Does not modify the data or cuts; Emits signal "data"
+     - "print-data-and-cuts": void (KTDataHandle) -- Prints the structure of the data object and its cuts; Does not modify the data or cuts; Emits signal "data"
 
      Signals:
-     - "data": void (KTDataPtr) -- Emitted after structure information is printed
+     - "data": void (KTDataHandle) -- Emitted after structure information is printed
     */
 
     class KTPrintDataStructure : public KTProcessor
@@ -52,13 +52,13 @@ namespace Nymph
             bool Configure(const scarab::param_node* node);
 
         public:
-            void PrintDataStructure(KTDataPtr dataPtr);
-            void PrintCutStructure(KTDataPtr dataPtr);
-            void PrintDataAndCutStructure(KTDataPtr dataPtr);
+            void PrintDataStructure(KTDataHandle dataHandle);
+            void PrintCutStructure(KTDataHandle dataHandle);
+            void PrintDataAndCutStructure(KTDataHandle dataHandle);
 
         private:
-            void DoPrintDataStructure(KTDataPtr dataPtr);
-            void DoPrintCutStructure(KTDataPtr dataPtr);
+            void DoPrintDataStructure(KTDataHandle dataHandle);
+            void DoPrintCutStructure(KTDataHandle dataHandle);
 
             //***************
             // Signals
@@ -72,9 +72,9 @@ namespace Nymph
             //***************
 
         private:
-            KTSlot< KTDataPtr > fDataStructSlot;
-            KTSlot< KTDataPtr > fCutStructSlot;
-            KTSlot< KTDataPtr > fDataAndCutStructSlot;
+            KTSlot< KTDataHandle > fDataStructSlot;
+            KTSlot< KTDataHandle > fCutStructSlot;
+            KTSlot< KTDataHandle > fDataAndCutStructSlot;
 
     };
 }
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 5b19a1e..1f18885 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -914,7 +914,7 @@ namespace Nymph
         return;
     }
 
-    KTDataPtr KTProcessorToolbox::GetData( const std::string& threadName )
+    KTDataHandle KTProcessorToolbox::GetData( const std::string& threadName )
     {
         //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
         boost_unique_lock breakContLock( fBreakContMutex );
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 59df4d2..6e13edb 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -229,12 +229,12 @@ namespace Nymph
 
             void JoinRunThread();
 
-            KTDataPtr GetData( const std::string& threadName );
+            KTDataHandle GetData( const std::string& threadName );
 
         private:
             friend class KTThreadReference;
 
-            typedef boost::shared_future< KTDataPtr > Future;
+            typedef boost::shared_future< KTDataHandle > Future;
 
             void StartSingleThreadedRun();
             void StartMultiThreadedRun();
@@ -285,8 +285,8 @@ namespace Nymph
             }
     };
 
-    typedef KTThreadRefFutureIter< boost::unique_future< KTDataPtr >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
-    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataPtr >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
+    typedef KTThreadRefFutureIter< boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
+    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
 
 
     inline void KTProcessorToolbox::PopBackOfRunQueue()
diff --git a/Library/Application/KTThroughputProfiler.cc b/Library/Application/KTThroughputProfiler.cc
index 19e43fa..700e940 100644
--- a/Library/Application/KTThroughputProfiler.cc
+++ b/Library/Application/KTThroughputProfiler.cc
@@ -64,7 +64,7 @@ namespace Nymph
         return Diff(fTimeStart, fTimeEnd);
     }
 
-    void KTThroughputProfiler::StartProfiling(KTDataPtr header)
+    void KTThroughputProfiler::StartProfiling(KTDataHandle header)
     {
         KTINFO(proflog, "Profiling started");
         fNDataProcessed = 0;
@@ -72,7 +72,7 @@ namespace Nymph
         return;
     }
 
-    void KTThroughputProfiler::Data(KTDataPtr data)
+    void KTThroughputProfiler::Data(KTDataHandle data)
     {
         (void)data;
         fNDataProcessed++;
diff --git a/Library/Application/KTThroughputProfiler.hh b/Library/Application/KTThroughputProfiler.hh
index afd4ea5..1fcdd03 100644
--- a/Library/Application/KTThroughputProfiler.hh
+++ b/Library/Application/KTThroughputProfiler.hh
@@ -14,7 +14,7 @@
 
 #include "KTProcessor.hh"
 
-#include "KTData.hh"
+#include "KTCoreData.hh"
 
 #include <string>
 #include <sys/time.h>
@@ -70,7 +70,7 @@ namespace Nymph
 
      Slots:
      - "start": void (KTEggHeader*) -- Start the timer
-     - "data": void (KTDataPtr) -- Increment the counter on the number of data slices
+     - "data": void (KTDataHandle) -- Increment the counter on the number of data slices
      - "stop": void () -- Stop the timer
 
     */
@@ -86,9 +86,9 @@ namespace Nymph
             void Start();
             void Stop();
 
-            void StartProfiling(KTDataPtr data);
+            void StartProfiling(KTDataHandle data);
 
-            void Data(KTDataPtr data);
+            void Data(KTDataHandle data);
 
             void Finish();
 
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 28a7e8d..c0692b4 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -23,6 +23,7 @@ set( NYMPH_HEADERFILES
     ${UTIL_DIR}/KTTIFactory.hh
     ${UTIL_DIR}/KTTime.hh
     ${DATA_DIR}/KTApplyCut.hh
+    ${DATA_DIR}/KTCoreData.hh
     ${DATA_DIR}/KTCut.hh
     ${DATA_DIR}/KTCutFilter.hh
     ${DATA_DIR}/KTCutResult.hh
@@ -58,6 +59,7 @@ set( NYMPH_SOURCEFILES
     ${UTIL_DIR}/KTException.cc
     ${UTIL_DIR}/KTTime.cc
     ${DATA_DIR}/KTApplyCut.cc
+    ${DATA_DIR}/KTCoreData.cc
     ${DATA_DIR}/KTCut.cc
     ${DATA_DIR}/KTCutFilter.cc
     ${DATA_DIR}/KTCutStatus.cc
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 7bc975a..14fad8b 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -83,7 +83,7 @@ namespace Nymph
     }
 
 
-    void KTApplyCut::ApplyCut(KTDataPtr dataPtr)
+    void KTApplyCut::ApplyCut(KTDataHandle dataHandle)
     {
         std::shared_ptr< KTThreadReference > ref = fApplyCutSW->GetThreadRef();
 
@@ -93,19 +93,19 @@ namespace Nymph
             return;
         }
 
-        bool cutFailed = fCut->Apply(dataPtr);
+        bool cutFailed = fCut->Apply(dataHandle);
 
-        ref->Break( dataPtr, fApplyCutSW->GetDoBreakpoint() );
+        ref->Break( dataHandle, fApplyCutSW->GetDoBreakpoint() );
 
         if (cutFailed)
         {
-            fAfterCutFailSignal(dataPtr);
+            fAfterCutFailSignal(dataHandle);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr);
+            fAfterCutPassSignal(dataHandle);
         }
-        fAfterCutSignal(dataPtr);
+        fAfterCutSignal(dataHandle);
         return;
     }
 
diff --git a/Library/Data/KTApplyCut.hh b/Library/Data/KTApplyCut.hh
index 79be604..72564b0 100644
--- a/Library/Data/KTApplyCut.hh
+++ b/Library/Data/KTApplyCut.hh
@@ -43,12 +43,12 @@ namespace Nymph
      - "[cut name]": subtree -- specifies the cut to be used; parent node for the cut configuration
 
      Slots:
-     - "apply": void (KTDataPtr) -- Applies the cut to the received data; Requirements are set by the cut; No data is added.
+     - "apply": void (KTDataHandle) -- Applies the cut to the received data; Requirements are set by the cut; No data is added.
 
      Signals:
-     - "all": void (KTDataPtr) -- Emitted upon application of the cut regardless of cut result.
-     - "pass": void (KTDataPtr) -- Emitted upon application of the cut if the cut passed.
-     - "fail": void (KTDataPtr) -- Emitted upon application of the cut if the cut failed.
+     - "all": void (KTDataHandle) -- Emitted upon application of the cut regardless of cut result.
+     - "pass": void (KTDataHandle) -- Emitted upon application of the cut if the cut passed.
+     - "fail": void (KTDataHandle) -- Emitted upon application of the cut if the cut failed.
     */
 
     class KTApplyCut : public KTProcessor
@@ -67,7 +67,7 @@ namespace Nymph
             KTCut* fCut;
 
         public:
-            void ApplyCut(KTDataPtr dataPtr);
+            void ApplyCut(KTDataHandle dataHandle);
 
 
             //***************
diff --git a/Library/Data/KTCoreData.cc b/Library/Data/KTCoreData.cc
new file mode 100644
index 0000000..70f817d
--- /dev/null
+++ b/Library/Data/KTCoreData.cc
@@ -0,0 +1,37 @@
+/*
+ * KTCoreData.cc
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTCoreData.hh"
+
+namespace Nymph
+{
+    KTCoreData::KTCoreData() :
+            KTData( "data" ),
+            fCounter( 0 ),
+            fLastData( false ),
+            fCutStatus()
+    {
+    }
+
+    KTCoreData::KTCoreData( const KTCoreData& orig ) :
+            KTData( orig ),
+            fCounter( orig.fCounter ),
+            fLastData( orig.fLastData ),
+            fCutStatus( orig.fCutStatus )
+    {}
+
+    KTCoreData::KTCoreData( KTCoreData&& orig ) :
+            KTData( orig ),
+            fCounter( std::move( orig.fCounter ) ),
+            fLastData( std::move( orig.fLastData ) ),
+            fCutStatus( std::move( orig.fCutStatus ) )
+    {}
+
+    KTCoreData::~KTCoreData()
+    {}
+
+} /* namespace Nymph */
diff --git a/Library/Data/KTCoreData.hh b/Library/Data/KTCoreData.hh
new file mode 100644
index 0000000..bf4b520
--- /dev/null
+++ b/Library/Data/KTCoreData.hh
@@ -0,0 +1,42 @@
+/*
+ * KTCoreData.hh
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTCOREDATA_HH_
+#define KTCOREDATA_HH_
+
+#include "KTData.hh"
+
+#include "KTCutStatus.hh"
+#include "KTMemberVariable.hh"
+
+#include <memory>
+#include <string>
+
+namespace Nymph
+{
+
+    class KTCoreData : public KTData
+    {
+        public:
+            KTCoreData();
+            KTCoreData( const KTCoreData& orig );
+            KTCoreData( KTCoreData&& orig );
+            virtual ~KTCoreData();
+
+            MEMBERVARIABLE( unsigned, Counter );
+            MEMBERVARIABLE( bool, LastData );
+
+            MEMBERVARIABLE_REF( KTCutStatus, CutStatus );
+
+    };
+
+    DEFINE_EXT_DATA( KTCoreData )
+
+    typedef std::shared_ptr< KTCoreData > KTDataHandle;
+
+} /* namespace Nymph */
+#endif /* KTCOREDATA_HH_ */
diff --git a/Library/Data/KTCut.hh b/Library/Data/KTCut.hh
index c6ecfc5..c68246b 100644
--- a/Library/Data/KTCut.hh
+++ b/Library/Data/KTCut.hh
@@ -10,7 +10,7 @@
 
 #include "KTConfigurable.hh"
 #include "KTCutResult.hh"
-#include "KTData.hh"
+#include "KTCoreData.hh"
 #include "KTExtensibleStructFactory.hh"
 #include "KTLogger.hh"
 #include "KTMemberVariable.hh"
@@ -33,13 +33,13 @@ namespace Nymph
      - Public nested class called Result, inheriting from KTExtensibleCutResult< Result >, and containing a public static std::string name sName.
      - Cut registration using the macro KT_REGISTER_CUT([class name])
      - Implementation of bool Configure(const scarab::param_node*)
-     - Implementation of bool Apply(KTData&, <DataType(s)>)
+     - Implementation of bool Apply(KTCoreData&, <DataType(s)>)
 
      Your cut class should inherit from KTCutOneArg or KTCutTwoArgs, depending on the number of data types involved in your cut.
 
      The existence of [class name]::Result and [class name]::Result::sName are enforces at compile time by the KT_REGISTER_CUT macro.
 
-     The functions bool Configure(const scarab::param_node*) and void Apply(KTData&, <DataType(s)>) are abstract in the base classes, and therefore must be implemented.
+     The functions bool Configure(const scarab::param_node*) and void Apply(KTCoreData&, <DataType(s)>) are abstract in the base classes, and therefore must be implemented.
 
      Boolean return value interpretation:
      - TRUE means the cut was failed
@@ -69,7 +69,7 @@ namespace Nymph
              MEMBERVARIABLE(double, AwesomenessThreshold);
 
          public:
-             bool Apply(KTData& data, KTSomeData& data);
+             bool Apply(KTCoreData& data, KTSomeData& data);
 
      };
 
@@ -96,7 +96,7 @@ namespace Nymph
          return true;
      }
 
-     bool KTAwesomenessCut::Apply(KTData& data, KTSomeData& someData)
+     bool KTAwesomenessCut::Apply(KTCoreData& data, KTSomeData& someData)
      {
          bool isCut = someData.Awesomeness() < fAwesomenessThreshold;
          data.GetCutStatus().AddCutResult< KTAwesomenessCut::Result >(isCut);
@@ -115,7 +115,7 @@ namespace Nymph
             KTCut(const std::string& name = "default-cut-name");
             virtual ~KTCut();
 
-            virtual bool Apply(KTDataPtr) = 0;
+            virtual bool Apply(KTDataHandle) = 0;
     };
 
 
@@ -130,9 +130,9 @@ namespace Nymph
             KTCutOneArg(const std::string& name = "default-cut-name");
             virtual ~KTCutOneArg();
 
-            virtual bool Apply(KTData& data, XDataType& dataType) = 0;
+            virtual bool Apply(KTCoreData& data, XDataType& dataType) = 0;
 
-            virtual bool Apply(KTDataPtr dataPtr);
+            virtual bool Apply(KTDataHandle dataHandle);
     };
 
 
@@ -147,9 +147,9 @@ namespace Nymph
             KTCutTwoArgs(const std::string& name = "default-cut-name");
             virtual ~KTCutTwoArgs();
 
-            virtual bool Apply(KTData& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
+            virtual bool Apply(KTCoreData& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
 
-            virtual bool Apply(KTDataPtr dataPtr);
+            virtual bool Apply(KTDataHandle dataHandle);
     };
 
 
@@ -168,14 +168,14 @@ namespace Nymph
     {}
 
     template< class XDataType >
-    bool KTCutOneArg< XDataType >::Apply(KTDataPtr dataPtr)
+    bool KTCutOneArg< XDataType >::Apply(KTDataHandle dataHandle)
     {
-        if (! dataPtr->Has< XDataType >())
+        if (! dataHandle->Has< XDataType >())
         {
             KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType()) << "> was not present");
             return false;
         }
-        return Apply(dataPtr->Of< KTData >(), dataPtr->Of< XDataType >());
+        return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< XDataType >());
     }
 
 
@@ -190,23 +190,23 @@ namespace Nymph
     {}
 
     template< class XDataType1, class XDataType2 >
-    bool KTCutTwoArgs< XDataType1, XDataType2 >::Apply(KTDataPtr dataPtr)
+    bool KTCutTwoArgs< XDataType1, XDataType2 >::Apply(KTDataHandle dataHandle)
     {
-        if (! dataPtr->Has< XDataType1 >())
+        if (! dataHandle->Has< XDataType1 >())
         {
             KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType1()) << "> was not present");
             return false;
         }
-        if (! dataPtr->Has< XDataType2 >())
+        if (! dataHandle->Has< XDataType2 >())
         {
             KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType2()) << "> was not present");
             return false;
         }
-        return Apply(dataPtr->Of< KTData >(), dataPtr->Of< XDataType1 >(), dataPtr->Of< XDataType2 >());
+        return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< XDataType1 >(), dataHandle->Of< XDataType2 >());
     }
 
 /* Playing around: wouldn't it be cool if this could be done with variadic tmeplates?
- * Unfortunately we'll need to be able to iterate over the types in the template pack in the Apply(KTDataPtr) function.
+ * Unfortunately we'll need to be able to iterate over the types in the template pack in the Apply(KTDataHandle) function.
  *
     template< class ... DataTypes >
     class KTCutOnData : public KTCut
@@ -217,7 +217,7 @@ namespace Nymph
 
             virtual bool Apply(DataTypes ...) = 0;
 
-            virtual bool Apply(KTDataPtr dataPtr);
+            virtual bool Apply(KTDataHandle dataHandle);
     };
 
     template< class ... DataTypes >
@@ -231,7 +231,7 @@ namespace Nymph
     {}
 
     template< class ... DataTypes >
-    bool KTCutOnData< DataTypes... >::Apply(KTDataPtr dataPtr)
+    bool KTCutOnData< DataTypes... >::Apply(KTDataHandle dataHandle)
     {
 
     }
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index c8e6e9b..8cb9e6a 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -56,7 +56,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTCutFilter::Filter(KTData& data)
+    bool KTCutFilter::Filter(KTCoreData& data)
     {
         if (fAllBits)
         {
@@ -74,25 +74,25 @@ namespace Nymph
         return cutStatus.IsCut(fCutMask);
     }
 
-    void KTCutFilter::FilterData(KTDataPtr dataPtr)
+    void KTCutFilter::FilterData(KTDataHandle dataHandle)
     {
         std::shared_ptr< KTThreadReference > ref = fFilterDataSW->GetThreadRef();
 
-        // all KTDataPtr's have KTData, so we won't bother checking
+        // all KTDataHandle's have KTCoreData, so we won't bother checking
 
-        bool failCut = Filter(dataPtr->Of< KTData >());
+        bool failCut = Filter(dataHandle->Of< KTCoreData >());
 
-        ref->Break( dataPtr, fFilterDataSW->GetDoBreakpoint() );
+        ref->Break( dataHandle, fFilterDataSW->GetDoBreakpoint() );
 
         if (failCut)
         {
-            fAfterCutFailSignal(dataPtr);
+            fAfterCutFailSignal(dataHandle);
         }
         else
         {
-            fAfterCutPassSignal(dataPtr);
+            fAfterCutPassSignal(dataHandle);
         }
-        fAfterCutSignal(dataPtr);
+        fAfterCutSignal(dataHandle);
 
         return;
     }
diff --git a/Library/Data/KTCutFilter.hh b/Library/Data/KTCutFilter.hh
index 89522b4..7d0ff0a 100644
--- a/Library/Data/KTCutFilter.hh
+++ b/Library/Data/KTCutFilter.hh
@@ -33,7 +33,7 @@ namespace Nymph
      KTCutFilter checks the status of cuts that have already been applied to a data.  If the bitwise AND of the cut status with
      the configurable cut mask is non-zero, than the data fails the filter.
 
-     Interpretation of the boolean returned by Filter(KTData&):
+     Interpretation of the boolean returned by Filter(KTCoreData&):
      - TRUE means the data failed the cut filter.
      - FALSE means the data passed the cut filter.
 
@@ -46,12 +46,12 @@ namespace Nymph
      - "cut-mask-int": unsigned int -- Set the cut mask with an unsigned integer's bit values.
 
      Slots:
-     - "filter": void (KTDataPtr) -- Checks the cut status of the received data ANDed with the cut mask; No data is added.
+     - "filter": void (KTDataHandle) -- Checks the cut status of the received data ANDed with the cut mask; No data is added.
 
      Signals:
-     - "all": void (KTDataPtr) -- Emitted after cut status is checked for all data.
-     - "pass": void (KTDataPtr) -- Emitted after cut status is checked if the cut filter passed.
-     - "fail": void (KTDataPtr) -- Emitted after cut status is checked if the cut filter failed.
+     - "all": void (KTDataHandle) -- Emitted after cut status is checked for all data.
+     - "pass": void (KTDataHandle) -- Emitted after cut status is checked if the cut filter passed.
+     - "fail": void (KTDataHandle) -- Emitted after cut status is checked if the cut filter failed.
     */
 
     class KTCutFilter : public KTProcessor
@@ -78,9 +78,9 @@ namespace Nymph
             bool fAllBits;
 
         public:
-            bool Filter(KTData& data);
+            bool Filter(KTCoreData& data);
 
-            void FilterData(KTDataPtr dataPtr);
+            void FilterData(KTDataHandle dataHandle);
 
 
             //***************
diff --git a/Library/Data/KTCutStatus.hh b/Library/Data/KTCutStatus.hh
index 24d31bb..9642575 100644
--- a/Library/Data/KTCutStatus.hh
+++ b/Library/Data/KTCutStatus.hh
@@ -25,7 +25,7 @@ namespace Nymph
      @brief Provides easy access to cut information.
 
      @details
-     KTCutStatus is typically used as a member variable of KTData, the top-level data object.
+     KTCutStatus is typically used as a member variable of KTCoreData, the top-level data object.
 
      KTCutStatus owns the set of cut results that have been added to a data object.
      It also owns a summary of those cuts (implemented with boost::dynamic_bitset).
diff --git a/Library/Data/KTData.cc b/Library/Data/KTData.cc
index 4dfd079..3b284a2 100644
--- a/Library/Data/KTData.cc
+++ b/Library/Data/KTData.cc
@@ -9,21 +9,16 @@
 
 namespace Nymph
 {
-    const std::string KTData::sName("data");
+    KTData::KTData( const std::string& name ) :
+            fName( name )
+    {}
 
-    KTData::KTData() :
-            KTExtensibleData< KTData >(),
-            fCounter(0),
-            fLastData(false),
-            fCutStatus()
-    {
-    }
+    KTData::KTData( const KTData& orig ) :
+            fName( orig.fName )
+    {}
 
-    KTData::KTData(const KTData& orig) :
-            KTExtensibleData< KTData >(orig),
-            fCounter(orig.fCounter),
-            fLastData(orig.fLastData),
-            fCutStatus(orig.fCutStatus)
+    KTData::KTData( KTData&& orig ) :
+            fName( std::move( orig.fName ) )
     {}
 
     KTData::~KTData()
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 688d7fe..13efcf2 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -10,60 +10,53 @@
 
 #include "KTExtensibleStruct.hh"
 
-#include "KTCutStatus.hh"
 #include "KTMemberVariable.hh"
 
-#include <memory>
 #include <string>
 
 namespace Nymph
 {
-    class KTDataCore
+
+    class KTData
     {
         public:
-            KTDataCore() {}
-            virtual ~KTDataCore() {}
-
-            virtual const std::string& Name() const = 0;
+            KTData() = delete;
+            KTData( const std::string& name );
+            KTData( const KTData& orig );
+            KTData( KTData&& orig );
+            virtual ~KTData();
 
+            MEMBERVARIABLE_REF( std::string, Name );
     };
 
-    template< class XDerivedType >
-    class KTExtensibleData : public KTExtensibleStruct< XDerivedType, KTDataCore >
+    class KTDataRider
     {
         public:
-            KTExtensibleData() {}
-            virtual ~KTExtensibleData() {}
-
-            const std::string& Name() const;
+            KTDataRider() {}
+            virtual ~KTDataRider() {}
 
     };
 
     template< class XDerivedType >
-    inline const std::string& KTExtensibleData< XDerivedType >::Name() const
-    {
-        return XDerivedType::sName;
-    }
-
-
-
-    class KTData : public KTExtensibleData< KTData >
+    class KTExtensibleDataRider : public KTExtensibleStruct< XDerivedType, KTDataRider >
     {
         public:
-            KTData();
-            KTData(const KTData& orig);
-            ~KTData();
-
-            MEMBERVARIABLE(unsigned, Counter);
-            MEMBERVARIABLE(bool, LastData);
+            KTExtensibleDataRider() {}
+            virtual ~KTExtensibleDataRider() {}
 
-            MEMBERVARIABLE_REF(KTCutStatus, CutStatus);
-
-        public:
-            static const std::string sName;
     };
 
-    typedef std::shared_ptr< KTData > KTDataPtr;
+#define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name ) \
+        class ex_data_class_name : public data_class_name, public KTExtensibleDataRider< ex_data_class_name > \
+        { \
+            public: \
+                ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >() {} \
+                ex_data_class_name( const ex_data_class_name& orig ) : data_class_name( orig ), KTExtensibleDataRider< ex_data_class_name >( orig ) {} \
+                ex_data_class_name( ex_data_class_name&& orig ) : data_class_name( orig ), KTExtensibleDataRider< ex_data_class_name >( orig ) {} \
+                virtual ~ex_data_class_name() {} \
+        };
+
+#define DEFINE_EXT_DATA( data_class_name ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name )
 
 } /* namespace Nymph */
 #endif /* KTDATA_HH_ */
diff --git a/Library/Data/KTDataPy.hh b/Library/Data/KTDataPy.hh
index 2e0ae06..2b853eb 100644
--- a/Library/Data/KTDataPy.hh
+++ b/Library/Data/KTDataPy.hh
@@ -8,15 +8,15 @@
  #ifndef KTDATAPY_HH_
  #define KTDATAPY_HH_
 
-#include "KTData.hh"
+#include "KTCoreData.hh"
 
 void export_DataPy()
 {
     using namespace Nymph;
     using namespace boost::python;
-    class_<KTData, KTDataPtr, boost::noncopyable>("KTData", init<>())
-        .add_property("Counter", &KTData::GetCounter, &KTData::SetCounter)
-        .add_property("LastData", &KTData::GetLastData, &KTData::SetLastData)
+    class_<KTCoreData, KTDataHandle, boost::noncopyable>("KTCoreData", init<>())
+        .add_property("Counter", &KTCoreData::GetCounter, &KTCoreData::SetCounter)
+        .add_property("LastData", &KTCoreData::GetLastData, &KTCoreData::SetLastData)
         ;
 }
 
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library/Processor/KTPrimaryProcessor.cc
index 9e16eaf..babcccd 100644
--- a/Library/Processor/KTPrimaryProcessor.cc
+++ b/Library/Processor/KTPrimaryProcessor.cc
@@ -56,7 +56,7 @@ namespace Nymph
             }
             else
             {
-                fThreadRef->SetReturnValue( KTDataPtr() );
+                fThreadRef->SetReturnValue( KTDataHandle() );
             }
         }
         catch( boost::exception& e )
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library/Processor/KTPrimaryProcessor.hh
index 2367e4d..218eb0f 100644
--- a/Library/Processor/KTPrimaryProcessor.hh
+++ b/Library/Processor/KTPrimaryProcessor.hh
@@ -10,7 +10,7 @@
 
 #include "KTProcessor.hh"
 
-#include "KTData.hh"
+#include "KTCoreData.hh"
 #include "KTThreadReference.hh"
 
 #include <boost/thread/condition_variable.hpp>
diff --git a/Library/Processor/KTSignal.hh b/Library/Processor/KTSignal.hh
index cad637f..f4dc7e8 100644
--- a/Library/Processor/KTSignal.hh
+++ b/Library/Processor/KTSignal.hh
@@ -10,7 +10,7 @@
 
 #include "KTProcessor.hh"
 
-#include "KTData.hh"
+#include "KTCoreData.hh"
 
 #include <boost/signals2.hpp>
 
@@ -75,10 +75,10 @@ namespace Nymph
      @class KTSignalData
      @author N. S. Oblath
 
-     @brief Creates a signal that takes a KTDataPtr object as its argument.
+     @brief Creates a signal that takes a KTDataHandle object as its argument.
 
      @details
-     The purpose of the signal is for passing KTData pointers between Processors.
+     The purpose of the signal is for passing KTCoreData pointers between Processors.
      The signal is emitted by calling operator().
      If a KTDataSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
 
@@ -89,7 +89,7 @@ namespace Nymph
 
      That's it!
     */
-    typedef KTSignal< KTDataPtr > KTSignalData;
+    typedef KTSignal< KTDataHandle > KTSignalData;
 
 
     //*******************
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 75b43b8..e77c778 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -74,13 +74,13 @@ namespace Nymph
      @class KTSlotData
      @author N. S. Oblath
 
-     @brief Creates a slot that takes a KTDataPtr object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
+     @brief Creates a slot that takes a KTDataHandle object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
 
      @details
      Usage:
-     This slot type adds the slot function (signature void (KTDataPtr).
+     This slot type adds the slot function (signature void (KTDataHandle).
      Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
-     The slot function checks that the provided KTData object contains data of type DataType, and then calls the member function.
+     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
 
      In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
      The variable may be private.
@@ -90,36 +90,36 @@ namespace Nymph
 
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
-    template< class... XDataTypes >
-    class KTSlotData : public KTSlot< KTDataPtr  >
+    template< class XReturnType, class... XDataArgs >
+    class KTSlotData : public KTSlot< KTDataHandle  >
     {
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
 
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
 
             virtual ~KTSlotData();
 
-            void operator()( KTDataPtr data );
+            void operator()( KTDataHandle data );
 
         protected:
             template< typename... DataTypes >
-            bool DataPresent( KTDataPtr data );
+            bool DataPresent( KTDataHandle data );
 
             //function_signature fFunc;
-            std::function< bool (XDataTypes&...) > fFunc;
+            std::function< XReturnType (XDataArgs&...) > fFunc;
 
             KTSignalData* fSignalPtr;
     };
@@ -128,7 +128,7 @@ namespace Nymph
     template< typename... DataTypes >
     struct DataPresentHelper
     {
-        static bool DataPresent( KTDataPtr )
+        static bool DataPresent( KTDataHandle )
         {
             return true;
         }
@@ -137,7 +137,7 @@ namespace Nymph
     template< typename DataType, typename... DataTypes >
     struct DataPresentHelper< DataType, DataTypes... >
     {
-        static bool DataPresent( KTDataPtr data )
+        static bool DataPresent( KTDataHandle data )
         {
             if( ! data->Has< DataType >() )
             {
@@ -151,11 +151,11 @@ namespace Nymph
 
     // Typedefs for backwards compatibility
 
-    template< typename XDataType1 >
-    using KTSlotDataOneType = KTSlotData< XDataType1 >;
+    //template< typename XDataType1 >
+    //using KTSlotDataOneType = KTSlotData< XDataType1 >;
 
-    template< typename XDataType1, typename XDataType2 >
-    using KTSlotDataTwoTypes = KTSlotData< XDataType1, XDataType2 >;
+    //template< typename XDataType1, typename XDataType2 >
+    //using KTSlotDataTwoTypes = KTSlotData< XDataType1, XDataType2 >;
 
 
     /*!
@@ -239,56 +239,56 @@ namespace Nymph
 
     // KTSlotData
 
-    template< class... XDataTypes >
+    template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
             KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
     {
     }
 
-    template< class... XDataTypes >
+    template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
             KTSlot( name, owner, this, &KTSlotData::operator() ),
             fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( nullptr )
     {
     }
 
-    template< class... XDataTypes >
+    template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
             KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )
     {
     }
 
-    template< class... XDataTypes >
+    template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
             KTSlot( name, proc, this, &KTSlotData::operator() ),
             fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
             fSignalPtr( nullptr )
     {
     }
 
-    template< class... XDataTypes >
-    KTSlotData< XDataTypes... >::~KTSlotData()
+    template< class XReturnType, class... XDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::~KTSlotData()
     {
     }
 
-    template< class... XDataTypes >
-    void KTSlotData< XDataTypes... >::operator()( KTDataPtr dataPtr )
+    template< class XReturnType, class... XDataTypes >
+    void KTSlotData< XReturnType, XDataTypes... >::operator()( KTDataHandle dataHandle )
     {
         // Standard data slot pattern:
 
         std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
 
         // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataPtr ) )
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
         {
             KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
             THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
@@ -296,7 +296,15 @@ namespace Nymph
         }
 
         // Call the function
-        if( ! fFunc( dataPtr->Of< XDataTypes >()... ) )
+        try
+        {
+            dataHandle->
+        }
+        catch( ... )
+        {
+            ref->SetReturnException( boost::current_exception() );
+        }
+        if( ! fFunc( dataHandle->Of< XDataTypes >()... ) )
         {
             KTERROR( slotlog, "Something went wrong in slot <" << fName << ">. Aborting." );
             THROW_THREADREF_EXCEPTION( ref, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
@@ -304,20 +312,20 @@ namespace Nymph
         }
 
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataPtr into the return
-        ref->Break( dataPtr, fSlotWrapper->GetDoBreakpoint() );
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
         {
-            (*fSignalPtr)( dataPtr );
+            (*fSignalPtr)( dataHandle );
         }
         return;
     }
 
-    template< class... XDataTypes >
+    template< class XReturnType, class... XDataTypes >
     template< typename... DataTypes >
-    bool KTSlotData< XDataTypes... >::DataPresent( KTDataPtr data )
+    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
     {
         return DataPresentHelper< DataTypes... >::DataPresent( data );
     }
@@ -351,8 +359,8 @@ namespace Nymph
         fFunc();
 
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataPtr into the return
-        fSlotWrapper->GetThreadRef()->Break( KTDataPtr(), fSlotWrapper->GetDoBreakpoint() );
+        // Sets the dataHandle into the return
+        fSlotWrapper->GetThreadRef()->Break( KTDataHandle(), fSlotWrapper->GetDoBreakpoint() );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
diff --git a/Library/Processor/KTThreadReference.cc b/Library/Processor/KTThreadReference.cc
index c5de273..e42a16c 100644
--- a/Library/Processor/KTThreadReference.cc
+++ b/Library/Processor/KTThreadReference.cc
@@ -62,7 +62,7 @@ namespace Nymph
         return *this;
     }
 
-    void KTThreadReference::Break( const KTDataPtr& dataPtr, bool doBreakpoint )
+    void KTThreadReference::Break( const KTDataHandle& dataHandle, bool doBreakpoint )
     {
         if( doBreakpoint )
         {
@@ -75,7 +75,7 @@ namespace Nymph
             KTDEBUG( trlog, "Reacting to break (" << fName << ")" );
             // set the return for this thread
             KTWARN( trlog, "Setting value of data-ptr-ret promise (" << fName << ")" );
-            fDataPtrRet.set_value( dataPtr );
+            fDataPtrRet.set_value( dataHandle );
             // wait for continue signal
             fWaitForContinueFunc( lock );
         }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 8d403ea..05f6cca 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -8,7 +8,7 @@
 #ifndef KTTHREADREFERENCE_HH_
 #define KTTHREADREFERENCE_HH_
 
-#include "KTData.hh"
+#include "KTCoreData.hh"
 
 #include <boost/thread/future.hpp>
 
@@ -16,7 +16,7 @@
 
 namespace Nymph
 {
-    typedef boost::promise< KTDataPtr > KTDataPtrReturn;
+    typedef boost::promise< KTDataHandle > KTDataPtrReturn;
 
     class KTThreadReference
     {
@@ -36,19 +36,19 @@ namespace Nymph
             // for use within the thread
             //**************************
 
-            void Break( const KTDataPtr& dataPtr, bool doBreakpoint  );
+            void Break( const KTDataHandle& dataHandle, bool doBreakpoint  );
 
             void SetReturnException( boost::exception_ptr excPtr );
-            void SetReturnValue( KTDataPtr dataPtr );
+            void SetReturnValue( KTDataHandle dataHandle );
 
         public:
             //******************************
             // for use outside of the thread
             //******************************
 
-            KTDataPtr GetReturnValue();
-            boost::unique_future< KTDataPtr >& GetDataPtrRetFuture();
-            const boost::unique_future< KTDataPtr >& GetDataPtrRetFuture() const;
+            KTDataHandle GetReturnValue();
+            boost::unique_future< KTDataHandle >& GetDataPtrRetFuture();
+            const boost::unique_future< KTDataHandle >& GetDataPtrRetFuture() const;
 
             void RefreshDataPtrRet();
 
@@ -65,7 +65,7 @@ namespace Nymph
 
         private:
             KTDataPtrReturn fDataPtrRet;
-            boost::unique_future< KTDataPtr > fDataPtrRetFuture;
+            boost::unique_future< KTDataHandle > fDataPtrRetFuture;
             std::function< void() > fInitiateBreakFunc;
             std::function< void( boost_unique_lock& ) > fWaitForContinueFunc;
             boost::mutex fMutex;
@@ -77,23 +77,23 @@ namespace Nymph
         return;
     }
 
-    inline void KTThreadReference::SetReturnValue( KTDataPtr dataPtr )
+    inline void KTThreadReference::SetReturnValue( KTDataHandle dataHandle )
     {
-        fDataPtrRet.set_value( dataPtr );
+        fDataPtrRet.set_value( dataHandle );
         return;
     }
 
-    inline KTDataPtr KTThreadReference::GetReturnValue()
+    inline KTDataHandle KTThreadReference::GetReturnValue()
     {
         return fDataPtrRetFuture.get();
     }
 
-    inline boost::unique_future< KTDataPtr >& KTThreadReference::GetDataPtrRetFuture()
+    inline boost::unique_future< KTDataHandle >& KTThreadReference::GetDataPtrRetFuture()
     {
         return fDataPtrRetFuture;
     }
 
-    inline const boost::unique_future< KTDataPtr >& KTThreadReference::GetDataPtrRetFuture() const
+    inline const boost::unique_future< KTDataHandle >& KTThreadReference::GetDataPtrRetFuture() const
     {
         return fDataPtrRetFuture;
     }

From eceb6f09f2941c40dc3c0f073c6337f1cdb5f0dd Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 8 Jun 2017 17:58:40 -0700
Subject: [PATCH 056/521] It builds!

---
 Executables/Validation/KTTestCuts.cc        |   4 +-
 Executables/Validation/KTTestCuts.hh        |  10 +-
 Executables/Validation/KTTestData.cc        |   2 +-
 Executables/Validation/KTTestData.hh        |   8 +-
 Executables/Validation/KTTestProcessor.cc   |  18 +--
 Executables/Validation/KTTestProcessor.hh   |  13 +-
 Executables/Validation/TestApplyCut.cc      |   4 +-
 Executables/Validation/TestCut.cc           |   4 +-
 Executables/Validation/TestCutFilter.cc     |   6 +-
 Executables/Validation/TestPrintData.cc     |  89 +-----------
 Library/Application/KTPrintDataStructure.cc |   2 +-
 Library/Data/KTCoreData.cc                  |  20 +--
 Library/Data/KTCoreData.hh                  |   7 +-
 Library/Data/KTCut.hh                       |   8 +-
 Library/Data/KTCutFilter.cc                 |   6 +-
 Library/Data/KTCutFilter.hh                 |   2 +-
 Library/Data/KTData.cc                      |  12 +-
 Library/Data/KTData.hh                      |  23 ++-
 Library/Processor/KTSlot.hh                 | 151 +++++++++++++++++---
 19 files changed, 204 insertions(+), 185 deletions(-)

diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index bc8e153..f0eed69 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -33,7 +33,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTAwesomeCut::Apply(KTCoreData& data, KTTestData& testData)
+    bool KTAwesomeCut::Apply(KTCoreDataExt& data, KTTestDataExt& testData)
     {
         bool isCut = ! testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
@@ -55,7 +55,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTNotAwesomeCut::Apply(KTCoreData& data, KTTestData& testData)
+    bool KTNotAwesomeCut::Apply(KTCoreDataExt& data, KTTestDataExt& testData)
     {
         bool isCut = testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
index a0541cb..9bfd6fc 100644
--- a/Executables/Validation/KTTestCuts.hh
+++ b/Executables/Validation/KTTestCuts.hh
@@ -15,10 +15,10 @@
 
 namespace Nymph
 {
-    class KTTestData;
+    class KTTestDataExt;
 
     // Cuts data that is NOT awesome
-    class KTAwesomeCut : public KTCutOneArg< KTTestData >
+    class KTAwesomeCut : public KTCutOneArg< KTTestDataExt >
     {
         public:
             struct Result : KTExtensibleCutResult< Result >
@@ -32,11 +32,11 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            bool Apply(KTCoreData& data, KTTestData& testData);
+            bool Apply(KTCoreDataExt& data, KTTestDataExt& testData);
     };
 
     // Cuts data that is IS awesome
-    class KTNotAwesomeCut : public KTCutOneArg< KTTestData >
+    class KTNotAwesomeCut : public KTCutOneArg< KTTestDataExt >
     {
         public:
             struct Result : KTExtensibleCutResult< Result >
@@ -50,7 +50,7 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            bool Apply(KTCoreData& data, KTTestData& testData);
+            bool Apply(KTCoreDataExt& data, KTTestDataExt& testData);
     };
 
 }
diff --git a/Executables/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
index d879bcf..b5a7180 100644
--- a/Executables/Validation/KTTestData.cc
+++ b/Executables/Validation/KTTestData.cc
@@ -10,7 +10,7 @@
 namespace Nymph
 {
     KTTestData::KTTestData() :
-        KTData( "test-data" ),
+        KTData(),
         fIsAwesome( false )
     {}
 
diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
index 288bf92..4386b19 100644
--- a/Executables/Validation/KTTestData.hh
+++ b/Executables/Validation/KTTestData.hh
@@ -24,14 +24,14 @@ namespace Nymph
             MEMBERVARIABLE(bool, IsAwesome);
     };
 
-    DEFINE_EXT_DATA( KTTestData ); // defines KTTestDataExt
+    DEFINE_EXT_DATA( KTTestData, "test" ); // defines KTTestDataExt
 
 
     class KTTestBaseData : public KTData
     {
         public:
             KTTestBaseData() :
-                KTData( "poly-data" ),
+                KTData(),
                 fFunniness(1000.)
             {}
             virtual ~KTTestBaseData() {}
@@ -39,8 +39,8 @@ namespace Nymph
             MEMBERVARIABLE(double, Funniness);
     };
 
-    DEFINE_EXT_DATA_2( KTTestDerived1DataHandle, KTTestBaseData );
-    DEFINE_EXT_DATA_2( KTTestDerived2DataHandle, KTTestBaseData );
+    DEFINE_EXT_DATA_2( KTTestDerived1DataExt, KTTestBaseData, "test-derived-1" );
+    DEFINE_EXT_DATA_2( KTTestDerived2DataExt, KTTestBaseData, "test-derived-2" );
 
 } /* namespace Nymph */
 
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 396a5ab..232f164 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -107,8 +107,8 @@ namespace Nymph
 
     KTTestProcessorD::KTTestProcessorD( const std::string& name ) :
             KTProcessor( name ),
-            fDataSlot("test-data-slot", this, &KTTestProcessorD::SlotFunc),
-            fDataSignal("test-data-signal", this)
+            fDataSlot("test", this, &KTTestProcessorD::SlotFunc),
+            fDataSignal("test", this)
     {
     }
 
@@ -123,14 +123,14 @@ namespace Nymph
 
     void KTTestProcessorD::EmitSignal(bool isAwesome)
     {
-        KTDataHandle dataHandle = std::make_shared< KTCoreData >();
-        KTTestData& data = dataHandle->Of< KTTestData >();
+        KTDataHandle dataHandle = CreateNewDataHandle();
+        KTTestDataExt& data = dataHandle->Of< KTTestDataExt >();
         data.SetIsAwesome(isAwesome);
         fDataSignal(dataHandle);
         return;
     }
 
-    void KTTestProcessorD::SlotFunc(KTTestData& data)
+    void KTTestProcessorD::SlotFunc(const KTTestData& data)
     {
         KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
         return;
@@ -159,11 +159,11 @@ namespace Nymph
 
     void KTTestProcessorE::EmitSignals()
     {
-        KTDataHandle dataHandle = std::make_shared< KTCoreData >();
+        KTDataHandle dataHandle = CreateNewDataHandle();
 
         KTINFO(testsiglog, "Creating data objects");
-        dataHandle->Of< KTTestDerived1DataHandle >();
-        dataHandle->Of< KTTestDerived2DataHandle >();
+        dataHandle->Of< KTTestDerived1DataExt >();
+        dataHandle->Of< KTTestDerived2DataExt >();
 
         KTINFO(testsiglog, "Emitting data-1 signal");
         fDerived1DataSignal( dataHandle );
@@ -174,7 +174,7 @@ namespace Nymph
         return;
     }
 
-    void KTTestProcessorE::BaseSlotFunc(KTTestBaseData& data)
+    void KTTestProcessorE::BaseSlotFunc(const KTTestBaseData& data)
     {
         KTINFO(testsiglog, "Data funniness measured to be: <" << data.GetFunniness() << ">");
         return;
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 6d482e4..d539668 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -89,10 +89,10 @@ namespace Nymph
             // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
             void EmitSignal(bool isAwesome = true);
 
-            void SlotFunc(KTTestData& data);
+            void SlotFunc(const KTTestData& data);
 
         private:
-            KTSlotData< KTTestData > fDataSlot;
+            KTSlotData< void, KTTestDataExt > fDataSlot;
 
             KTSignalData fDataSignal;
     };
@@ -116,17 +116,14 @@ namespace Nymph
 
             void EmitSignals();
 
-            void BaseSlotFunc(KTTestBaseData& data);
+            void BaseSlotFunc(const KTTestBaseData& data);
 
         private:
-            KTSlotData< KTTestDerived1DataHandle > fDerived1DataSlot;
-            KTSlotData< KTTestDerived2DataHandle > fDerived2DataSlot;
+            KTSlotData< void, KTTestDerived1DataExt > fDerived1DataSlot;
+            KTSlotData< void, KTTestDerived2DataExt > fDerived2DataSlot;
 
             KTSignalData fDerived1DataSignal;
             KTSignalData fDerived2DataSignal;
-
-            // utility function to avoid putting a logger in the header
-            void PrintFunniness( unsigned funniness );
     };
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/TestApplyCut.cc b/Executables/Validation/TestApplyCut.cc
index 4d8e7a8..c3fe237 100644
--- a/Executables/Validation/TestApplyCut.cc
+++ b/Executables/Validation/TestApplyCut.cc
@@ -18,8 +18,8 @@ using namespace std;
 
 int main()
 {
-    KTDataHandle dataHandle(new KTCoreData());
-    KTTestData& testData = dataHandle->Of< KTTestData >();
+    KTDataHandle dataHandle = CreateNewDataHandle();
+    KTTestData& testData = dataHandle->Of< KTTestDataExt >();
 
     KTCutStatus& cutStatus = dataHandle->CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
diff --git a/Executables/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
index 8497919..0e4403e 100644
--- a/Executables/Validation/TestCut.cc
+++ b/Executables/Validation/TestCut.cc
@@ -17,8 +17,8 @@ using namespace std;
 
 int main()
 {
-    KTCoreData data;
-    KTTestData& testData = data.Of< KTTestData >();
+    KTCoreDataExt data;
+    KTTestDataExt& testData = data.Of< KTTestDataExt >();
 
     KTCutStatus& cutStatus = data.CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
diff --git a/Executables/Validation/TestCutFilter.cc b/Executables/Validation/TestCutFilter.cc
index 8888e5a..4b770cc 100644
--- a/Executables/Validation/TestCutFilter.cc
+++ b/Executables/Validation/TestCutFilter.cc
@@ -19,8 +19,8 @@ using namespace std;
 
 int main()
 {
-    KTDataHandle dataHandle(new KTCoreData());
-    KTTestData& testData = dataHandle->Of< KTTestData >();
+    KTDataHandle dataHandle = CreateNewDataHandle();
+    KTTestData& testData = dataHandle->Of< KTTestDataExt >();
 
     KTCutStatus& cutStatus = dataHandle->CutStatus();
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
@@ -54,7 +54,7 @@ int main()
     KTINFO(testlog, "Cut state of <KTNotAwesomeCut::Result> is: " << cutStatus.GetCutState< KTNotAwesomeCut::Result >());
 
     KTCutFilter cutFilter;
-    KTCoreData& data = dataHandle->Of< KTCoreData >();
+    KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
 
     KTINFO(testlog, "Filtering with all cuts");
     cutFilter.SetCutMaskAll();
diff --git a/Executables/Validation/TestPrintData.cc b/Executables/Validation/TestPrintData.cc
index e73e9d0..9684420 100644
--- a/Executables/Validation/TestPrintData.cc
+++ b/Executables/Validation/TestPrintData.cc
@@ -8,94 +8,13 @@
 #include "KTCut.hh"
 #include "KTLogger.hh"
 #include "KTPrintDataStructure.hh"
+
+#include "KTTestCuts.hh"
 #include "KTTestData.hh"
 
 #include "param.hh"
 
-namespace Nymph
-{
-    KTLOGGER(testlog, "TestPrintData");
-
-    // Cuts data that is NOT awesome
-    class KTAwesomeCut : public KTCut
-    {
-        public:
-            struct Result : KTExtensibleCutResult< Result >
-            {
-                static const std::string sName;
-            };
-
-        public:
-            KTAwesomeCut(const std::string& name = "default-awesome-cut") :
-                KTCut(name)
-            {}
-            ~KTAwesomeCut() {}
-
-            bool Configure(const scarab::param_node* node)
-            {return true;}
-
-            bool Apply(KTCoreData& data, KTTestData& testData)
-            {
-                bool isCut = ! testData.GetIsAwesome();
-                data.CutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
-                return isCut;
-            }
-
-            bool Apply(KTDataHandle dataHandle)
-            {
-                if (! dataHandle->Has< KTTestDataExt >())
-                {
-                    KTERROR(testlog, "Data type <KTTestData> was not present");
-                    return false;
-                }
-                return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< KTTestDataExt >());
-            }
-    };
-
-    // Cuts data that is IS awesome
-    class KTNotAwesomeCut : public KTCut
-    {
-        public:
-            struct Result : KTExtensibleCutResult< Result >
-            {
-                static const std::string sName;
-            };
-
-        public:
-            KTNotAwesomeCut(const std::string& name = "default-not-awesome-cut") :
-                KTCut(name)
-            {}
-            ~KTNotAwesomeCut() {}
-
-            bool Configure(const scarab::param_node* node)
-            {return true;}
-
-            bool Apply(KTCoreData& data, KTTestData& testData)
-            {
-                bool isCut = testData.GetIsAwesome();
-                // use the name-based AddCutResult
-                data.CutStatus().AddCutResult("not-awesome-cut", isCut);
-                return isCut;
-            }
-
-            bool Apply(KTDataHandle dataHandle)
-            {
-                if (! dataHandle->Has< KTTestData >())
-                {
-                    KTERROR(testlog, "Data type <KTTestData> was not present");
-                    return false;
-                }
-                return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< KTTestData >());
-            }
-    };
-
-
-    const std::string KTAwesomeCut::Result::sName = "awesome-cut";
-    const std::string KTNotAwesomeCut::Result::sName = "not-awesome-cut";
-
-    KT_REGISTER_CUT(KTAwesomeCut);
-    KT_REGISTER_CUT(KTNotAwesomeCut);
-}
+KTLOGGER(testlog, "TestPrintData");
 
 
 using namespace Nymph;
@@ -103,7 +22,7 @@ using namespace std;
 
 int main()
 {
-    KTDataHandle dataHandle(new KTCoreData());
+    KTDataHandle dataHandle = CreateNewDataHandle();
     KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
     KTTestDataExt& testData = dataHandle->Of< KTTestDataExt >();
 
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index 48d6c70..fede0a2 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -83,7 +83,7 @@ namespace Nymph
         printbuf << "\nData Structure:\n";
         printbuf << "\t- " << dataHandle->Name() << '\n';
         KTDEBUG(datalog, "Found data type " << dataHandle->Name());
-        KTExtensibleStructCore< KTDataCore >* nextData = dataHandle->Next();
+        KTExtensibleStructCore< KTDataRider >* nextData = dataHandle->Next();
         while (nextData != NULL)
         {
             printbuf << "\t- " << nextData->Name() << '\n';
diff --git a/Library/Data/KTCoreData.cc b/Library/Data/KTCoreData.cc
index 70f817d..ecc198e 100644
--- a/Library/Data/KTCoreData.cc
+++ b/Library/Data/KTCoreData.cc
@@ -10,28 +10,20 @@
 namespace Nymph
 {
     KTCoreData::KTCoreData() :
-            KTData( "data" ),
+            KTData(),
             fCounter( 0 ),
             fLastData( false ),
             fCutStatus()
     {
     }
 
-    KTCoreData::KTCoreData( const KTCoreData& orig ) :
-            KTData( orig ),
-            fCounter( orig.fCounter ),
-            fLastData( orig.fLastData ),
-            fCutStatus( orig.fCutStatus )
+    KTCoreData::~KTCoreData()
     {}
 
-    KTCoreData::KTCoreData( KTCoreData&& orig ) :
-            KTData( orig ),
-            fCounter( std::move( orig.fCounter ) ),
-            fLastData( std::move( orig.fLastData ) ),
-            fCutStatus( std::move( orig.fCutStatus ) )
-    {}
 
-    KTCoreData::~KTCoreData()
-    {}
+    KTDataHandle CreateNewDataHandle()
+    {
+        return std::make_shared< KTCoreDataExt >();
+    }
 
 } /* namespace Nymph */
diff --git a/Library/Data/KTCoreData.hh b/Library/Data/KTCoreData.hh
index bf4b520..1c42382 100644
--- a/Library/Data/KTCoreData.hh
+++ b/Library/Data/KTCoreData.hh
@@ -23,8 +23,6 @@ namespace Nymph
     {
         public:
             KTCoreData();
-            KTCoreData( const KTCoreData& orig );
-            KTCoreData( KTCoreData&& orig );
             virtual ~KTCoreData();
 
             MEMBERVARIABLE( unsigned, Counter );
@@ -34,9 +32,10 @@ namespace Nymph
 
     };
 
-    DEFINE_EXT_DATA( KTCoreData )
+    DEFINE_EXT_DATA( KTCoreData, "core" )
 
-    typedef std::shared_ptr< KTCoreData > KTDataHandle;
+    typedef std::shared_ptr< KTCoreDataExt > KTDataHandle;
+    KTDataHandle CreateNewDataHandle();
 
 } /* namespace Nymph */
 #endif /* KTCOREDATA_HH_ */
diff --git a/Library/Data/KTCut.hh b/Library/Data/KTCut.hh
index c68246b..72a6844 100644
--- a/Library/Data/KTCut.hh
+++ b/Library/Data/KTCut.hh
@@ -130,7 +130,7 @@ namespace Nymph
             KTCutOneArg(const std::string& name = "default-cut-name");
             virtual ~KTCutOneArg();
 
-            virtual bool Apply(KTCoreData& data, XDataType& dataType) = 0;
+            virtual bool Apply(KTCoreDataExt& data, XDataType& dataType) = 0;
 
             virtual bool Apply(KTDataHandle dataHandle);
     };
@@ -147,7 +147,7 @@ namespace Nymph
             KTCutTwoArgs(const std::string& name = "default-cut-name");
             virtual ~KTCutTwoArgs();
 
-            virtual bool Apply(KTCoreData& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
+            virtual bool Apply(KTCoreDataExt& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
 
             virtual bool Apply(KTDataHandle dataHandle);
     };
@@ -175,7 +175,7 @@ namespace Nymph
             KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType()) << "> was not present");
             return false;
         }
-        return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< XDataType >());
+        return Apply(dataHandle->Of< KTCoreDataExt >(), dataHandle->Of< XDataType >());
     }
 
 
@@ -202,7 +202,7 @@ namespace Nymph
             KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType2()) << "> was not present");
             return false;
         }
-        return Apply(dataHandle->Of< KTCoreData >(), dataHandle->Of< XDataType1 >(), dataHandle->Of< XDataType2 >());
+        return Apply(dataHandle->Of< KTCoreDataExt >(), dataHandle->Of< XDataType1 >(), dataHandle->Of< XDataType2 >());
     }
 
 /* Playing around: wouldn't it be cool if this could be done with variadic tmeplates?
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 8cb9e6a..e4dff78 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -56,14 +56,14 @@ namespace Nymph
         return true;
     }
 
-    bool KTCutFilter::Filter(KTCoreData& data)
+    bool KTCutFilter::Filter(const KTCoreData& data)
     {
         if (fAllBits)
         {
             return data.CutStatus().IsCut();
         }
 
-        KTCutStatus& cutStatus = data.CutStatus();
+        const KTCutStatus& cutStatus = data.CutStatus();
         if (fConvertToBitset)
         {
             fCutMask = cutStatus.ToBitset(fCutMaskInt);
@@ -80,7 +80,7 @@ namespace Nymph
 
         // all KTDataHandle's have KTCoreData, so we won't bother checking
 
-        bool failCut = Filter(dataHandle->Of< KTCoreData >());
+        bool failCut = Filter(dataHandle->Of< KTCoreDataExt >());
 
         ref->Break( dataHandle, fFilterDataSW->GetDoBreakpoint() );
 
diff --git a/Library/Data/KTCutFilter.hh b/Library/Data/KTCutFilter.hh
index 7d0ff0a..d7f6982 100644
--- a/Library/Data/KTCutFilter.hh
+++ b/Library/Data/KTCutFilter.hh
@@ -78,7 +78,7 @@ namespace Nymph
             bool fAllBits;
 
         public:
-            bool Filter(KTCoreData& data);
+            bool Filter(const KTCoreData& data);
 
             void FilterData(KTDataHandle dataHandle);
 
diff --git a/Library/Data/KTData.cc b/Library/Data/KTData.cc
index 3b284a2..9294aab 100644
--- a/Library/Data/KTData.cc
+++ b/Library/Data/KTData.cc
@@ -9,19 +9,17 @@
 
 namespace Nymph
 {
-    KTData::KTData( const std::string& name ) :
-            fName( name )
+    KTData::KTData()
     {}
 
-    KTData::KTData( const KTData& orig ) :
-            fName( orig.fName )
+    KTData::~KTData()
     {}
 
-    KTData::KTData( KTData&& orig ) :
-            fName( std::move( orig.fName ) )
+    KTDataRider::KTDataRider() :
+            fName()
     {}
 
-    KTData::~KTData()
+    KTDataRider::~KTDataRider()
     {}
 
 } /* namespace Nymph */
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 13efcf2..19a6d1c 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -20,43 +20,38 @@ namespace Nymph
     class KTData
     {
         public:
-            KTData() = delete;
-            KTData( const std::string& name );
-            KTData( const KTData& orig );
-            KTData( KTData&& orig );
+            KTData();
             virtual ~KTData();
-
-            MEMBERVARIABLE_REF( std::string, Name );
     };
 
     class KTDataRider
     {
         public:
-            KTDataRider() {}
-            virtual ~KTDataRider() {}
+            KTDataRider();
+            virtual ~KTDataRider();
 
+            MEMBERVARIABLE_REF( std::string, Name );
     };
 
     template< class XDerivedType >
     class KTExtensibleDataRider : public KTExtensibleStruct< XDerivedType, KTDataRider >
     {
         public:
-            KTExtensibleDataRider() {}
+            KTExtensibleDataRider() = delete;
+            KTExtensibleDataRider( const std::string& name ) { KTDataRider::fName = name; }
             virtual ~KTExtensibleDataRider() {}
 
     };
 
-#define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name ) \
+#define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name, label ) \
         class ex_data_class_name : public data_class_name, public KTExtensibleDataRider< ex_data_class_name > \
         { \
             public: \
-                ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >() {} \
-                ex_data_class_name( const ex_data_class_name& orig ) : data_class_name( orig ), KTExtensibleDataRider< ex_data_class_name >( orig ) {} \
-                ex_data_class_name( ex_data_class_name&& orig ) : data_class_name( orig ), KTExtensibleDataRider< ex_data_class_name >( orig ) {} \
+                ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >( label ) {} \
                 virtual ~ex_data_class_name() {} \
         };
 
-#define DEFINE_EXT_DATA( data_class_name ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name )
+#define DEFINE_EXT_DATA( data_class_name, label ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name, label )
 
 } /* namespace Nymph */
 #endif /* KTDATA_HH_ */
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index e77c778..87af964 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -96,19 +96,19 @@ namespace Nymph
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
 
             /// Constructor for the case where the processor has the function that will be called by the slot
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr );
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ) );
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
 
             virtual ~KTSlotData();
 
@@ -119,7 +119,42 @@ namespace Nymph
             bool DataPresent( KTDataHandle data );
 
             //function_signature fFunc;
-            std::function< XReturnType (XDataArgs&...) > fFunc;
+            std::function< XReturnType (const XDataArgs&..., XReturnType&) > fFunc;
+
+            KTSignalData* fSignalPtr;
+    };
+
+    // partial specialization for no new data type
+    template< class... XDataArgs >
+    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            virtual ~KTSlotData();
+
+            void operator()( KTDataHandle data );
+
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            //function_signature fFunc;
+            std::function< void (XDataArgs&...) > fFunc;
 
             KTSignalData* fSignalPtr;
     };
@@ -241,7 +276,7 @@ namespace Nymph
 
     template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
             KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
@@ -250,7 +285,7 @@ namespace Nymph
 
     template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
             KTSlot( name, owner, this, &KTSlotData::operator() ),
             fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( nullptr )
@@ -259,7 +294,7 @@ namespace Nymph
 
     template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... ), KTSignalData* signalPtr) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
             KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
             fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )
@@ -268,7 +303,7 @@ namespace Nymph
 
     template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, XReturnType (XFuncOwnerType::*func)( XFuncDataTypes&... )) :
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
             KTSlot( name, proc, this, &KTSlotData::operator() ),
             fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
             fSignalPtr( nullptr )
@@ -298,19 +333,103 @@ namespace Nymph
         // Call the function
         try
         {
-            dataHandle->
+            fFunc( dataHandle->Of< XDataTypes >()... , dataHandle->Of< XReturnType >() );
         }
-        catch( ... )
+        catch( boost::exception& e )
         {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
             ref->SetReturnException( boost::current_exception() );
         }
-        if( ! fFunc( dataHandle->Of< XDataTypes >()... ) )
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
         {
-            KTERROR( slotlog, "Something went wrong in slot <" << fName << ">. Aborting." );
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "Something went wrong in slot <" << fName << ">. Aborting." );
+            (*fSignalPtr)( dataHandle );
+        }
+        return;
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
+
+
+    // KTSlotData with no return type
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
+            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
+            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    KTSlotData< void, XDataTypes... >::~KTSlotData()
+    {
+    }
+
+    template< class... XDataTypes >
+    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    {
+        // Standard data slot pattern:
+
+        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
             return;
         }
 
+        // Call the function
+        try
+        {
+            fFunc( dataHandle->Of< XDataTypes >()... );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
+            ref->SetReturnException( boost::current_exception() );
+        }
+
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
         // Sets the dataHandle into the return
         ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
@@ -323,9 +442,9 @@ namespace Nymph
         return;
     }
 
-    template< class XReturnType, class... XDataTypes >
+    template< class... XDataTypes >
     template< typename... DataTypes >
-    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
+    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
     {
         return DataPresentHelper< DataTypes... >::DataPresent( data );
     }

From ab3a68ca248a807f7f884f526b7b06e227c4f912 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 9 Jun 2017 12:00:46 -0700
Subject: [PATCH 057/521] Moved the DataPresent helper structs to KTCoreData.hh

---
 Library/Data/KTCoreData.cc  |  1 +
 Library/Data/KTCoreData.hh  | 38 +++++++++++++++++++++++++++++++++++++
 Library/Processor/KTSlot.hh | 27 +-------------------------
 3 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/Library/Data/KTCoreData.cc b/Library/Data/KTCoreData.cc
index ecc198e..96aa004 100644
--- a/Library/Data/KTCoreData.cc
+++ b/Library/Data/KTCoreData.cc
@@ -26,4 +26,5 @@ namespace Nymph
         return std::make_shared< KTCoreDataExt >();
     }
 
+
 } /* namespace Nymph */
diff --git a/Library/Data/KTCoreData.hh b/Library/Data/KTCoreData.hh
index 1c42382..a85a778 100644
--- a/Library/Data/KTCoreData.hh
+++ b/Library/Data/KTCoreData.hh
@@ -11,6 +11,7 @@
 #include "KTData.hh"
 
 #include "KTCutStatus.hh"
+#include "KTLogger.hh"
 #include "KTMemberVariable.hh"
 
 #include <memory>
@@ -18,6 +19,7 @@
 
 namespace Nymph
 {
+    LOGGER( cdlog_h, "KTCoreData.hh" )
 
     class KTCoreData : public KTData
     {
@@ -34,8 +36,44 @@ namespace Nymph
 
     DEFINE_EXT_DATA( KTCoreData, "core" )
 
+
+    // Define KTDataHandle and a convenience function to create new handles
     typedef std::shared_ptr< KTCoreDataExt > KTDataHandle;
     KTDataHandle CreateNewDataHandle();
 
+
+    // Recursive helper structs for determining if data objects are present
+
+    // End of the recursion; this will only be used if NoOtherDataTypes has nothing in it
+    template< class... NoOtherDataTypes >
+    struct DataPresentHelper
+    {
+        static bool DataPresent( KTDataHandle );
+    };
+
+    template< class DataType, class... OtherDataTypes >
+    struct DataPresentHelper< DataType, OtherDataTypes... >
+    {
+        static bool DataPresent( KTDataHandle data );
+    };
+
+    template< class... NoOtherDataTypes >
+    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( KTDataHandle )
+    {
+        return true;
+    }
+
+    template< class DataType, class... OtherDataTypes >
+    bool DataPresentHelper< DataType, OtherDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        if( ! data->Has< DataType >() )
+        {
+            KTERROR( cdlog_h, "Data not found with type <" << typeid( DataType ).name() << ">" );
+            return false;
+        }
+        return DataPresentHelper< OtherDataTypes... >::DataPresent( data );
+    }
+
+
 } /* namespace Nymph */
 #endif /* KTCOREDATA_HH_ */
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 87af964..6d486d6 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -154,36 +154,11 @@ namespace Nymph
             bool DataPresent( KTDataHandle data );
 
             //function_signature fFunc;
-            std::function< void (XDataArgs&...) > fFunc;
+            std::function< void (const XDataArgs&...) > fFunc;
 
             KTSignalData* fSignalPtr;
     };
 
-    // helper structs (have to be defined outside the templated KTSlot class to use specialization
-    template< typename... DataTypes >
-    struct DataPresentHelper
-    {
-        static bool DataPresent( KTDataHandle )
-        {
-            return true;
-        }
-    };
-
-    template< typename DataType, typename... DataTypes >
-    struct DataPresentHelper< DataType, DataTypes... >
-    {
-        static bool DataPresent( KTDataHandle data )
-        {
-            if( ! data->Has< DataType >() )
-            {
-                KTERROR( slotlog, "Data not found with type <" << typeid( DataType ).name() << ">" );
-                return false;
-            }
-            return DataPresentHelper< DataTypes... >::DataPresent( data );
-        }
-    };
-
-
     // Typedefs for backwards compatibility
 
     //template< typename XDataType1 >

From ea9a619c13925826124563c1845fc7a53acca919 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 9 Jun 2017 12:01:09 -0700
Subject: [PATCH 058/521] Function renaming for improved consistency

---
 Executables/Validation/KTTestProcessor.cc | 10 +++++-----
 Executables/Validation/KTTestProcessor.hh |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 232f164..0f6d014 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -107,7 +107,7 @@ namespace Nymph
 
     KTTestProcessorD::KTTestProcessorD( const std::string& name ) :
             KTProcessor( name ),
-            fDataSlot("test", this, &KTTestProcessorD::SlotFunc),
+            fDataSlot("test", this, &KTTestProcessorD::AnalysisFunc),
             fDataSignal("test", this)
     {
     }
@@ -130,7 +130,7 @@ namespace Nymph
         return;
     }
 
-    void KTTestProcessorD::SlotFunc(const KTTestData& data)
+    void KTTestProcessorD::AnalysisFunc(const KTTestData& data)
     {
         KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
         return;
@@ -141,8 +141,8 @@ namespace Nymph
 
     KTTestProcessorE::KTTestProcessorE( const std::string& name ) :
             KTProcessor( name ),
-            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseSlotFunc),
-            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseSlotFunc),
+            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseAnalysisFunc),
+            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseAnalysisFunc),
             fDerived1DataSignal("derived-1", this),
             fDerived2DataSignal("derived-2", this)
     {
@@ -174,7 +174,7 @@ namespace Nymph
         return;
     }
 
-    void KTTestProcessorE::BaseSlotFunc(const KTTestBaseData& data)
+    void KTTestProcessorE::BaseAnalysisFunc(const KTTestBaseData& data)
     {
         KTINFO(testsiglog, "Data funniness measured to be: <" << data.GetFunniness() << ">");
         return;
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index d539668..be68835 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -89,7 +89,7 @@ namespace Nymph
             // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
             void EmitSignal(bool isAwesome = true);
 
-            void SlotFunc(const KTTestData& data);
+            void AnalysisFunc(const KTTestData& data);
 
         private:
             KTSlotData< void, KTTestDataExt > fDataSlot;
@@ -116,7 +116,7 @@ namespace Nymph
 
             void EmitSignals();
 
-            void BaseSlotFunc(const KTTestBaseData& data);
+            void BaseAnalysisFunc(const KTTestBaseData& data);
 
         private:
             KTSlotData< void, KTTestDerived1DataExt > fDerived1DataSlot;

From 032478b5affec4310087cbeb467f9893e08f52d7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 9 Jun 2017 12:03:21 -0700
Subject: [PATCH 059/521] Cuts now act on KTData objects, while KTCutOnData is
 templated with the extensible data class(es).  KTCutOnData (with variadic
 templates) now works, and should be used instead of the one- and two-type
 cuts

---
 Executables/Validation/KTTestCuts.cc | 16 ++++---
 Executables/Validation/KTTestCuts.hh |  9 ++--
 Library/Data/KTCut.hh                | 68 +++++++++++++++++++++-------
 3 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index f0eed69..497b481 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -22,8 +22,10 @@ namespace Nymph
 
 
     KTAwesomeCut::KTAwesomeCut(const std::string& name) :
-            KTCutOneArg(name)
-    {}
+            KTCutOnData(name)
+    {
+        fFunc = [this]( KTCoreDataExt& data, const KTTestData& testData )->bool {return this->Apply(data, testData);};
+    }
 
     KTAwesomeCut::~KTAwesomeCut()
     {}
@@ -33,7 +35,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTAwesomeCut::Apply(KTCoreDataExt& data, KTTestDataExt& testData)
+    bool KTAwesomeCut::Apply(KTCoreData& data, const KTTestData& testData)
     {
         bool isCut = ! testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
@@ -44,8 +46,10 @@ namespace Nymph
 
 
     KTNotAwesomeCut::KTNotAwesomeCut(const std::string& name) :
-            KTCutOneArg(name)
-    {}
+            KTCutOnData(name)
+    {
+        fFunc = [this]( KTCoreDataExt& data, const KTTestData& testData )->bool {return this->Apply(data, testData);};
+    }
 
     KTNotAwesomeCut::~KTNotAwesomeCut()
     {}
@@ -55,7 +59,7 @@ namespace Nymph
         return true;
     }
 
-    bool KTNotAwesomeCut::Apply(KTCoreDataExt& data, KTTestDataExt& testData)
+    bool KTNotAwesomeCut::Apply(KTCoreData& data, const KTTestData& testData)
     {
         bool isCut = testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
index 9bfd6fc..7d344f3 100644
--- a/Executables/Validation/KTTestCuts.hh
+++ b/Executables/Validation/KTTestCuts.hh
@@ -15,10 +15,11 @@
 
 namespace Nymph
 {
+    class KTTestData;
     class KTTestDataExt;
 
     // Cuts data that is NOT awesome
-    class KTAwesomeCut : public KTCutOneArg< KTTestDataExt >
+    class KTAwesomeCut : public KTCutOnData< KTTestDataExt >
     {
         public:
             struct Result : KTExtensibleCutResult< Result >
@@ -32,11 +33,11 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            bool Apply(KTCoreDataExt& data, KTTestDataExt& testData);
+            bool Apply(KTCoreData& data, const KTTestData& testData);
     };
 
     // Cuts data that is IS awesome
-    class KTNotAwesomeCut : public KTCutOneArg< KTTestDataExt >
+    class KTNotAwesomeCut : public KTCutOnData< KTTestDataExt >
     {
         public:
             struct Result : KTExtensibleCutResult< Result >
@@ -50,7 +51,7 @@ namespace Nymph
 
             bool Configure(const scarab::param_node* node);
 
-            bool Apply(KTCoreDataExt& data, KTTestDataExt& testData);
+            bool Apply(KTCoreData& data, const KTTestData& testData);
     };
 
 }
diff --git a/Library/Data/KTCut.hh b/Library/Data/KTCut.hh
index 72a6844..69aa656 100644
--- a/Library/Data/KTCut.hh
+++ b/Library/Data/KTCut.hh
@@ -11,6 +11,7 @@
 #include "KTConfigurable.hh"
 #include "KTCutResult.hh"
 #include "KTCoreData.hh"
+#include "KTException.hh"
 #include "KTExtensibleStructFactory.hh"
 #include "KTLogger.hh"
 #include "KTMemberVariable.hh"
@@ -18,6 +19,8 @@
 #include "factory.hh"
 #include "typename.hh"
 
+#include <functional>
+
 namespace Nymph
 {
     KTLOGGER(cutlog_h, "KTCut.h");
@@ -116,6 +119,7 @@ namespace Nymph
             virtual ~KTCut();
 
             virtual bool Apply(KTDataHandle) = 0;
+
     };
 
 
@@ -130,9 +134,12 @@ namespace Nymph
             KTCutOneArg(const std::string& name = "default-cut-name");
             virtual ~KTCutOneArg();
 
-            virtual bool Apply(KTCoreDataExt& data, XDataType& dataType) = 0;
+            //virtual bool Apply(KTCoreData& data, XDataType& dataType) = 0;
 
             virtual bool Apply(KTDataHandle dataHandle);
+
+        private:
+            std::function< bool (KTCoreData& data, const XDataType& dataType) > fFunc;
     };
 
 
@@ -147,7 +154,7 @@ namespace Nymph
             KTCutTwoArgs(const std::string& name = "default-cut-name");
             virtual ~KTCutTwoArgs();
 
-            virtual bool Apply(KTCoreDataExt& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
+            virtual bool Apply(KTCoreData& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
 
             virtual bool Apply(KTDataHandle dataHandle);
     };
@@ -159,7 +166,8 @@ namespace Nymph
 
     template< class XDataType >
     KTCutOneArg< XDataType >::KTCutOneArg(const std::string& name) :
-            KTCut(name)
+            KTCut(name),
+            fFunc(nullptr)
     {
     }
 
@@ -175,7 +183,7 @@ namespace Nymph
             KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType()) << "> was not present");
             return false;
         }
-        return Apply(dataHandle->Of< KTCoreDataExt >(), dataHandle->Of< XDataType >());
+        return fFunc(dataHandle->Of< KTCoreDataExt >(), dataHandle->Of< XDataType >());
     }
 
 
@@ -207,35 +215,63 @@ namespace Nymph
 
 /* Playing around: wouldn't it be cool if this could be done with variadic tmeplates?
  * Unfortunately we'll need to be able to iterate over the types in the template pack in the Apply(KTDataHandle) function.
- *
-    template< class ... DataTypes >
+ */
+    template< class ... XDataTypes >
     class KTCutOnData : public KTCut
     {
         public:
-            KTCutOnData(const std::string& name = "default-cut-name");
+            KTCutOnData( const std::string& name = "default-cut-name" );
             virtual ~KTCutOnData();
 
-            virtual bool Apply(DataTypes ...) = 0;
+            virtual bool Apply( KTDataHandle dataHandle );
+
+        protected:
+            template< typename... SomeDataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            std::function< bool ( KTCoreDataExt& data, const XDataTypes&... dataType ) > fFunc;
 
-            virtual bool Apply(KTDataHandle dataHandle);
     };
 
-    template< class ... DataTypes >
-    KTCutOnData< DataTypes... >::KTCutOnData(const std::string& name) :
+    template< class ... XDataTypes >
+    KTCutOnData< XDataTypes... >::KTCutOnData( const std::string& name ) :
             KTCut(name)
     {
     }
 
-    template< class ... DataTypes >
-    KTCutOnData< DataTypes... >::~KTCutOnData()
+    template< class ... XDataTypes >
+    KTCutOnData< XDataTypes... >::~KTCutOnData()
     {}
 
-    template< class ... DataTypes >
-    bool KTCutOnData< DataTypes... >::Apply(KTDataHandle dataHandle)
+    template< class ... XDataTypes >
+    bool KTCutOnData< XDataTypes... >::Apply( KTDataHandle dataHandle )
     {
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( cutlog_h, "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." );
+            BOOST_THROW_EXCEPTION( KTException() << "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." << eom );
+        }
+
+        try
+        {
+            return fFunc( dataHandle->Of< KTCoreDataExt >() , dataHandle->Of< XDataTypes >()... );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fConfigName + ">. Aborting." );
+            throw;
+        }
+    }
 
+    template< class... XDataTypes >
+    template< typename... SomeDataTypes >
+    bool KTCutOnData< XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< SomeDataTypes... >::DataPresent( data );
     }
-*/
+
+
 
     // this macro enforces the existence of cut_class::Result and cut_class::Result::sName at compile time
 #define KT_REGISTER_CUT(cut_class) \

From cb6b7b57e1d0a160577a9db54bedd06a9e2a1bde Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 9 Jun 2017 15:33:05 -0700
Subject: [PATCH 060/521] Cleanup and adding SetApplyFunc function

---
 Executables/Validation/KTTestCuts.cc |   4 +-
 Library/Data/KTCut.hh                | 153 +++++++--------------------
 2 files changed, 42 insertions(+), 115 deletions(-)

diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index 497b481..944bc71 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -24,7 +24,7 @@ namespace Nymph
     KTAwesomeCut::KTAwesomeCut(const std::string& name) :
             KTCutOnData(name)
     {
-        fFunc = [this]( KTCoreDataExt& data, const KTTestData& testData )->bool {return this->Apply(data, testData);};
+        SetApplyFunc( this, &KTAwesomeCut::Apply );
     }
 
     KTAwesomeCut::~KTAwesomeCut()
@@ -48,7 +48,7 @@ namespace Nymph
     KTNotAwesomeCut::KTNotAwesomeCut(const std::string& name) :
             KTCutOnData(name)
     {
-        fFunc = [this]( KTCoreDataExt& data, const KTTestData& testData )->bool {return this->Apply(data, testData);};
+        SetApplyFunc( this, &KTNotAwesomeCut::Apply );
     }
 
     KTNotAwesomeCut::~KTNotAwesomeCut()
diff --git a/Library/Data/KTCut.hh b/Library/Data/KTCut.hh
index 69aa656..4cd3d8f 100644
--- a/Library/Data/KTCut.hh
+++ b/Library/Data/KTCut.hh
@@ -53,9 +53,10 @@ namespace Nymph
      --------------------------------------
 
      class KTSomeData;
+     class KTSomeDataExt;
 
      // Data must be at least as awesome as fAwesomenessThreshold to pass this cut
-     class KTAwesomenessCut : public KTCutOneArg< KTSomeData >
+     class KTAwesomenessCut : public KTCutOnData< KTSomeDataExt >
      {
          public:
              struct Result : KTExtensibleCutResult< Result >
@@ -80,14 +81,16 @@ namespace Nymph
      ------- Example Implementation -------
      --------------------------------------
 
-     const std::string KTExampleCut::Result::sName = "awesomeness-cut";
+     const std::string KTAwesomenessCut::Result::sName = "awesomeness-cut";
 
-     KT_REGISTER_CUT(KTExampleCut);
+     KT_REGISTER_CUT(KTAwesomenessCut);
 
      KTAwesomenessCut::KTAwesomenessCut(const std::string& name) :
-             KTCutOneArg(name),
+             KTCutOnData(name),
              fAwesomenessThreshold(1000000.)
-     {}
+     {
+         SetApplyFunc( this, &KTAwesomeCut::Apply );
+     }
 
      KTAwesomenessCut::~KTExampleCut()
      {}
@@ -122,101 +125,11 @@ namespace Nymph
 
     };
 
+    //*******************************************************
+    // KTCutOnData -- cut applied to one or more data objects
+    //*******************************************************
 
-    //*****************************************************************
-    // KTCutOneArg -- base class for cuts operating on one data type
-    //*****************************************************************
-
-    template< class XDataType >
-    class KTCutOneArg : public KTCut
-    {
-        public:
-            KTCutOneArg(const std::string& name = "default-cut-name");
-            virtual ~KTCutOneArg();
-
-            //virtual bool Apply(KTCoreData& data, XDataType& dataType) = 0;
-
-            virtual bool Apply(KTDataHandle dataHandle);
-
-        private:
-            std::function< bool (KTCoreData& data, const XDataType& dataType) > fFunc;
-    };
-
-
-    //*******************************************************************
-    // KTCutTwoArgs -- base class for cuts operating on two data types
-    //*******************************************************************
-
-    template< class XDataType1, class XDataType2 >
-    class KTCutTwoArgs : public KTCut
-    {
-        public:
-            KTCutTwoArgs(const std::string& name = "default-cut-name");
-            virtual ~KTCutTwoArgs();
-
-            virtual bool Apply(KTCoreData& data, XDataType1& dataType1, XDataType2& dataType2) = 0;
-
-            virtual bool Apply(KTDataHandle dataHandle);
-    };
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    template< class XDataType >
-    KTCutOneArg< XDataType >::KTCutOneArg(const std::string& name) :
-            KTCut(name),
-            fFunc(nullptr)
-    {
-    }
-
-    template< class XDataType >
-    KTCutOneArg< XDataType >::~KTCutOneArg()
-    {}
-
-    template< class XDataType >
-    bool KTCutOneArg< XDataType >::Apply(KTDataHandle dataHandle)
-    {
-        if (! dataHandle->Has< XDataType >())
-        {
-            KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType()) << "> was not present");
-            return false;
-        }
-        return fFunc(dataHandle->Of< KTCoreDataExt >(), dataHandle->Of< XDataType >());
-    }
-
-
-    template< class XDataType1, class XDataType2 >
-    KTCutTwoArgs< XDataType1, XDataType2 >::KTCutTwoArgs(const std::string& name) :
-            KTCut(name)
-    {
-    }
-
-    template< class XDataType1, class XDataType2 >
-    KTCutTwoArgs< XDataType1, XDataType2 >::~KTCutTwoArgs()
-    {}
-
-    template< class XDataType1, class XDataType2 >
-    bool KTCutTwoArgs< XDataType1, XDataType2 >::Apply(KTDataHandle dataHandle)
-    {
-        if (! dataHandle->Has< XDataType1 >())
-        {
-            KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType1()) << "> was not present");
-            return false;
-        }
-        if (! dataHandle->Has< XDataType2 >())
-        {
-            KTERROR(cutlog_h, "Data type <" << scarab::type(XDataType2()) << "> was not present");
-            return false;
-        }
-        return Apply(dataHandle->Of< KTCoreDataExt >(), dataHandle->Of< XDataType1 >(), dataHandle->Of< XDataType2 >());
-    }
-
-/* Playing around: wouldn't it be cool if this could be done with variadic tmeplates?
- * Unfortunately we'll need to be able to iterate over the types in the template pack in the Apply(KTDataHandle) function.
- */
-    template< class ... XDataTypes >
+    template< class ... XExtDataTypes >
     class KTCutOnData : public KTCut
     {
         public:
@@ -226,28 +139,36 @@ namespace Nymph
             virtual bool Apply( KTDataHandle dataHandle );
 
         protected:
-            template< typename... SomeDataTypes >
+            template< class... SomeExtDataTypes >
             bool DataPresent( KTDataHandle data );
 
-            std::function< bool ( KTCoreDataExt& data, const XDataTypes&... dataType ) > fFunc;
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            void SetApplyFunc( XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( KTCoreData&, const XFuncDataTypes&... ) );
+
+            std::function< bool ( KTCoreDataExt& data, const XExtDataTypes&... dataType ) > fFunc;
 
     };
 
-    template< class ... XDataTypes >
-    KTCutOnData< XDataTypes... >::KTCutOnData( const std::string& name ) :
+
+    //*******************
+    // Implementations
+    //*******************
+
+    template< class ... XExtDataTypes >
+    KTCutOnData< XExtDataTypes... >::KTCutOnData( const std::string& name ) :
             KTCut(name)
     {
     }
 
-    template< class ... XDataTypes >
-    KTCutOnData< XDataTypes... >::~KTCutOnData()
+    template< class ... XExtDataTypes >
+    KTCutOnData< XExtDataTypes... >::~KTCutOnData()
     {}
 
-    template< class ... XDataTypes >
-    bool KTCutOnData< XDataTypes... >::Apply( KTDataHandle dataHandle )
+    template< class ... XExtDataTypes >
+    bool KTCutOnData< XExtDataTypes... >::Apply( KTDataHandle dataHandle )
     {
         // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        if( ! DataPresent< XExtDataTypes... >( dataHandle ) )
         {
             KTERROR( cutlog_h, "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." );
             BOOST_THROW_EXCEPTION( KTException() << "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." << eom );
@@ -255,7 +176,7 @@ namespace Nymph
 
         try
         {
-            return fFunc( dataHandle->Of< KTCoreDataExt >() , dataHandle->Of< XDataTypes >()... );
+            return fFunc( dataHandle->Of< KTCoreDataExt >() , dataHandle->Of< XExtDataTypes >()... );
         }
         catch( boost::exception& e )
         {
@@ -264,13 +185,19 @@ namespace Nymph
         }
     }
 
-    template< class... XDataTypes >
-    template< typename... SomeDataTypes >
-    bool KTCutOnData< XDataTypes... >::DataPresent( KTDataHandle data )
+    template< class... XExtDataTypes >
+    template< typename... SomeExtDataTypes >
+    bool KTCutOnData< XExtDataTypes... >::DataPresent( KTDataHandle data )
     {
-        return DataPresentHelper< SomeDataTypes... >::DataPresent( data );
+        return DataPresentHelper< SomeExtDataTypes... >::DataPresent( data );
     }
 
+    template< class... XExtDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    void KTCutOnData< XExtDataTypes... >::SetApplyFunc( XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( KTCoreData&, const XFuncDataTypes&... ) )
+    {
+        fFunc = [func, owner]( KTCoreDataExt& data, const XExtDataTypes&... testData )->bool {return (owner->*func)(data, testData...);};
+    }
 
 
     // this macro enforces the existence of cut_class::Result and cut_class::Result::sName at compile time

From 99ce5b4070b83e8f9c4cd6e9f5086677b0933d0a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 9 Jun 2017 15:38:05 -0700
Subject: [PATCH 061/521] fixed test signal and slot names

---
 Executables/Validation/TestSlotData.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Executables/Validation/TestSlotData.cc b/Executables/Validation/TestSlotData.cc
index 889bd03..52853d8 100644
--- a/Executables/Validation/TestSlotData.cc
+++ b/Executables/Validation/TestSlotData.cc
@@ -22,7 +22,7 @@ int main()
 
         KTINFO(testslotdata, "Connecting test-data-signal to test-data-slot");
         // for simplicity the signal and slot are in the same processor, but that need not be, of course
-        tpD.ConnectASlot("test-data-signal", &tpD, "test-data-slot" );
+        tpD.ConnectASlot("test", &tpD, "test" );
 
         KTINFO(testslotdata, "Emitting signals");
         KTINFO(testslotdata, "First test signal: true");

From 38a4164c10d1cbbbb1e72c22d808339f6f776b18 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 16 Jul 2017 19:02:30 -0700
Subject: [PATCH 062/521] Switched configure signature to use const param_node&
 instead of a pointer.

---
 Executables/Validation/KTTestConfigurable.cc  | 25 ++++++++---------
 Executables/Validation/KTTestConfigurable.hh  |  2 +-
 Executables/Validation/KTTestCuts.cc          |  4 +--
 Executables/Validation/KTTestCuts.hh          |  4 +--
 .../Validation/KTTestPrimaryProcessor.cc      |  6 ++--
 .../Validation/KTTestPrimaryProcessor.hh      |  2 +-
 Executables/Validation/KTTestProcessor.cc     | 10 +++----
 Executables/Validation/KTTestProcessor.hh     | 10 +++----
 Executables/Validation/TestApplication.cc     |  2 +-
 Library/Application/KTApplication.cc          |  4 +--
 Library/Application/KTApplication.hh          |  2 +-
 Library/Application/KTDataQueueProcessor.cc   |  2 +-
 Library/Application/KTDataQueueProcessor.hh   | 10 +++----
 Library/Application/KTPrintDataStructure.cc   |  2 +-
 Library/Application/KTPrintDataStructure.hh   |  2 +-
 Library/Application/KTProcessorToolbox.cc     | 28 +++++++++----------
 Library/Application/KTProcessorToolbox.hh     |  4 +--
 Library/Application/KTRunNymph.cc             |  6 ++--
 Library/Application/KTThroughputProfiler.cc   |  6 ++--
 Library/Application/KTThroughputProfiler.hh   |  2 +-
 Library/Data/KTApplyCut.cc                    |  7 ++---
 Library/Data/KTApplyCut.hh                    |  2 +-
 Library/Data/KTCutFilter.cc                   | 14 ++++------
 Library/Data/KTCutFilter.hh                   |  2 +-
 Library/Utility/KTCacheDirectory.cc           |  6 ++--
 Library/Utility/KTCacheDirectory.hh           |  2 +-
 Library/Utility/KTConfigurable.cc             |  4 +--
 Library/Utility/KTConfigurable.hh             |  4 +--
 28 files changed, 81 insertions(+), 93 deletions(-)

diff --git a/Executables/Validation/KTTestConfigurable.cc b/Executables/Validation/KTTestConfigurable.cc
index 057097a..c5598b9 100644
--- a/Executables/Validation/KTTestConfigurable.cc
+++ b/Executables/Validation/KTTestConfigurable.cc
@@ -31,25 +31,22 @@ namespace Nymph
     {
     }
 
-    bool KTTestConfigurable::Configure(const scarab::param_node* node)
+    bool KTTestConfigurable::Configure(const scarab::param_node& node)
     {
         // Config-file options
-        if (node != NULL)
+        // option: check for data before getting it from the node
+        if (node.has("int-data"))
         {
-            // option: check for data before getting it from the node
-            if (node->has("int-data"))
-            {
-                fIntData = node->get_value< int >("int-data", fIntData);
-                KTINFO(testparamlog, "Configured integer (= existing value if not provided): " << fIntData);
-            }
-
-            // option: don't check for data before getting it from the node; rely on the default if it's not there.
-            fDoubleData = node->get_value< double >("double-data", fDoubleData);
-            KTINFO(testparamlog, "Configured double (= existing value if not provided): " << fDoubleData);
-            fStringData = node->get_value("string-data", fStringData);
-            KTINFO(testparamlog, "Configured string (= existing value if not provided): " << fStringData);
+            fIntData = node.get_value< int >("int-data", fIntData);
+            KTINFO(testparamlog, "Configured integer (= existing value if not provided): " << fIntData);
         }
 
+        // option: don't check for data before getting it from the node; rely on the default if it's not there.
+        fDoubleData = node.get_value< double >("double-data", fDoubleData);
+        KTINFO(testparamlog, "Configured double (= existing value if not provided): " << fDoubleData);
+        fStringData = node.get_value("string-data", fStringData);
+        KTINFO(testparamlog, "Configured string (= existing value if not provided): " << fStringData);
+
         // Command-line options
         fIntData = fCLHandler->GetCommandLineValue< int >("int-data", fIntData);
         KTINFO(testparamlog, "Configured integer from CL (= existing value if not provided): " << fIntData);
diff --git a/Executables/Validation/KTTestConfigurable.hh b/Executables/Validation/KTTestConfigurable.hh
index 5cc7836..44c473f 100644
--- a/Executables/Validation/KTTestConfigurable.hh
+++ b/Executables/Validation/KTTestConfigurable.hh
@@ -19,7 +19,7 @@ namespace Nymph
             virtual ~KTTestConfigurable();
 
         public:
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
         public:
             int GetIntData() const;
diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index 944bc71..345ed5f 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -30,7 +30,7 @@ namespace Nymph
     KTAwesomeCut::~KTAwesomeCut()
     {}
 
-    bool KTAwesomeCut::Configure(const scarab::param_node* node)
+    bool KTAwesomeCut::Configure(const scarab::param_node&)
     {
         return true;
     }
@@ -54,7 +54,7 @@ namespace Nymph
     KTNotAwesomeCut::~KTNotAwesomeCut()
     {}
 
-    bool KTNotAwesomeCut::Configure(const scarab::param_node* node)
+    bool KTNotAwesomeCut::Configure(const scarab::param_node&)
     {
         return true;
     }
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
index 7d344f3..6fc12e6 100644
--- a/Executables/Validation/KTTestCuts.hh
+++ b/Executables/Validation/KTTestCuts.hh
@@ -31,7 +31,7 @@ namespace Nymph
             KTAwesomeCut(const std::string& name = "default-awesome-cut");
             virtual ~KTAwesomeCut();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             bool Apply(KTCoreData& data, const KTTestData& testData);
     };
@@ -49,7 +49,7 @@ namespace Nymph
             KTNotAwesomeCut(const std::string& name = "default-not-awesome-cut");
             virtual ~KTNotAwesomeCut();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             bool Apply(KTCoreData& data, const KTTestData& testData);
     };
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
index d9270de..897a728 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -23,11 +23,9 @@ namespace Nymph
     {
     }
 
-    bool KTTestPrimaryProcessor::Configure( const scarab::param_node* node )
+    bool KTTestPrimaryProcessor::Configure( const scarab::param_node& node )
     {
-        if( node == nullptr ) return true;
-
-        SetIterations( node->get_value( "iterations", GetIterations() ) );
+        SetIterations( node.get_value( "iterations", GetIterations() ) );
 
         return true;
     }
diff --git a/Executables/Validation/KTTestPrimaryProcessor.hh b/Executables/Validation/KTTestPrimaryProcessor.hh
index 6cc104a..4eb7639 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.hh
+++ b/Executables/Validation/KTTestPrimaryProcessor.hh
@@ -23,7 +23,7 @@ namespace Nymph
             virtual ~KTTestPrimaryProcessor();
 
         public:
-            bool Configure( const scarab::param_node* node );
+            bool Configure( const scarab::param_node& node );
 
             MEMBERVARIABLE( unsigned, Iterations );
 
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 0f6d014..f045160 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -28,7 +28,7 @@ namespace Nymph
     {
     }
 
-    bool KTTestProcessorA::Configure(const scarab::param_node*)
+    bool KTTestProcessorA::Configure(const scarab::param_node&)
     {
         return true;
     }
@@ -55,7 +55,7 @@ namespace Nymph
     {
     }
 
-    bool KTTestProcessorB::Configure(const scarab::param_node*)
+    bool KTTestProcessorB::Configure(const scarab::param_node&)
     {
         return true;
     }
@@ -87,7 +87,7 @@ namespace Nymph
     {
     }
 
-    bool KTTestProcessorC::Configure(const scarab::param_node*)
+    bool KTTestProcessorC::Configure(const scarab::param_node&)
     {
         return true;
     }
@@ -116,7 +116,7 @@ namespace Nymph
     {
     }
 
-    bool KTTestProcessorD::Configure(const scarab::param_node*)
+    bool KTTestProcessorD::Configure(const scarab::param_node&)
     {
         return true;
     }
@@ -152,7 +152,7 @@ namespace Nymph
     {
     }
 
-    bool KTTestProcessorE::Configure(const scarab::param_node*)
+    bool KTTestProcessorE::Configure(const scarab::param_node&)
     {
         return true;
     }
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index be68835..8dace64 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -25,7 +25,7 @@ namespace Nymph
             KTTestProcessorA( const std::string& name = "test-proc-a" );
             virtual ~KTTestProcessorA();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             void EmitSignals(int);
 
@@ -42,7 +42,7 @@ namespace Nymph
             KTTestProcessorB( const std::string& name = "test-proc-b" );
             virtual ~KTTestProcessorB();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             void SlotFunc1(int);
             void SlotFunc2(int);
@@ -64,7 +64,7 @@ namespace Nymph
             KTTestProcessorC( const std::string& name = "test-proc-c" );
             virtual ~KTTestProcessorC();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             void SlotFunc1(int);
 
@@ -84,7 +84,7 @@ namespace Nymph
             KTTestProcessorD( const std::string& name = "test-proc-d" );
             virtual ~KTTestProcessorD();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
             void EmitSignal(bool isAwesome = true);
@@ -112,7 +112,7 @@ namespace Nymph
             KTTestProcessorE( const std::string& name = "test-proc-d" );
             virtual ~KTTestProcessorE();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             void EmitSignals();
 
diff --git a/Executables/Validation/TestApplication.cc b/Executables/Validation/TestApplication.cc
index 810fada..37d4539 100644
--- a/Executables/Validation/TestApplication.cc
+++ b/Executables/Validation/TestApplication.cc
@@ -84,7 +84,7 @@ int main(int argc, char** argv)
 
     const scarab::param_node& topNode = app->GetConfigurator()->Config();
 
-    if (testObj->Configure(&topNode.node_at(testObj->GetConfigName())))
+    if (testObj->Configure(topNode.node_at(testObj->GetConfigName())))
     {
         KTINFO(testapplog, "Configuration complete:\n"
                 << "\tInt data: " << testObj->GetIntData() << '\n'
diff --git a/Library/Application/KTApplication.cc b/Library/Application/KTApplication.cc
index 48ff2fc..2ff51e2 100644
--- a/Library/Application/KTApplication.cc
+++ b/Library/Application/KTApplication.cc
@@ -159,10 +159,8 @@ namespace Nymph
     	return;
     }
 
-    bool KTApplication::Configure(const scarab::param_node* node)
+    bool KTApplication::Configure(const scarab::param_node&)
     {
-        //if (node == NULL) return true;
-
         return true;
     }
 
diff --git a/Library/Application/KTApplication.hh b/Library/Application/KTApplication.hh
index 677bbbc..57ec7a8 100644
--- a/Library/Application/KTApplication.hh
+++ b/Library/Application/KTApplication.hh
@@ -65,7 +65,7 @@ namespace Nymph
             void AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName);
 
         public:
-            virtual bool Configure(const scarab::param_node* node);
+            virtual bool Configure(const scarab::param_node& node);
 
         public:
             KTCommandLineHandler* GetCommandLineHandler() const;
diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library/Application/KTDataQueueProcessor.cc
index 4a7975b..4354dfd 100644
--- a/Library/Application/KTDataQueueProcessor.cc
+++ b/Library/Application/KTDataQueueProcessor.cc
@@ -28,7 +28,7 @@ namespace Nymph
 
     }
 
-    bool KTDataQueueProcessor::ConfigureSubClass(const scarab::param_node*)
+    bool KTDataQueueProcessor::ConfigureSubClass(const scarab::param_node&)
     {
         return true;
     }
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library/Application/KTDataQueueProcessor.hh
index bb2b54a..8ce93cf 100644
--- a/Library/Application/KTDataQueueProcessor.hh
+++ b/Library/Application/KTDataQueueProcessor.hh
@@ -69,8 +69,8 @@ namespace Nymph
             KTDataQueueProcessorTemplate(const std::string& name = "default-data-queue-proc-template-name");
             virtual ~KTDataQueueProcessorTemplate();
 
-            bool Configure(const scarab::param_node* node);
-            virtual bool ConfigureSubClass(const scarab::param_node* node) = 0;
+            bool Configure(const scarab::param_node& node);
+            virtual bool ConfigureSubClass(const scarab::param_node& node) = 0;
 
             Status GetStatus() const;
             void SetStatus(KTDataQueueProcessorTemplate< XProcessorType >::Status);
@@ -171,7 +171,7 @@ namespace Nymph
             KTDataQueueProcessor(const std::string& name = "data-queue");
             virtual ~KTDataQueueProcessor();
 
-            bool ConfigureSubClass(const scarab::param_node* node);
+            bool ConfigureSubClass(const scarab::param_node& node);
 
         public:
             void EmitDataSignal(KTDataHandle data);
@@ -225,9 +225,9 @@ namespace Nymph
     }
 
     template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Configure(const scarab::param_node* node)
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Configure(const scarab::param_node& node)
     {
-        fQueue.set_timeout(node->get_value< unsigned >("timeout", fQueue.get_timeout()));
+        fQueue.set_timeout(node.get_value< unsigned >("timeout", fQueue.get_timeout()));
 
         if (! ConfigureSubClass(node)) return false;
         return true;
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index fede0a2..749324e 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -33,7 +33,7 @@ namespace Nymph
     {
     }
 
-    bool KTPrintDataStructure::Configure(const scarab::param_node* node)
+    bool KTPrintDataStructure::Configure(const scarab::param_node&)
     {
         return true;
     }
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library/Application/KTPrintDataStructure.hh
index 6df0a69..10c171c 100644
--- a/Library/Application/KTPrintDataStructure.hh
+++ b/Library/Application/KTPrintDataStructure.hh
@@ -49,7 +49,7 @@ namespace Nymph
             KTPrintDataStructure(const std::string& name = "print-data-structure");
             virtual ~KTPrintDataStructure();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
         public:
             void PrintDataStructure(KTDataHandle dataHandle);
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 1f18885..2d94c57 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -51,20 +51,20 @@ namespace Nymph
         ClearProcessors();
     }
 
-    bool KTProcessorToolbox::Configure(const scarab::param_node* node)
+    bool KTProcessorToolbox::Configure(const scarab::param_node& node)
     {
         KTPROG(proclog, "Configuring . . .");
 
-        SetRunSingleThreaded( node->get_value( "single-threaded", fRunSingleThreaded ) );
+        SetRunSingleThreaded( node.get_value( "single-threaded", fRunSingleThreaded ) );
 
         // Deal with "processor" blocks
-        if (! node->has("processors"))
+        if (! node.has("processors"))
         {
             KTWARN(proclog, "No processors were specified");
         }
         else
         {
-            const scarab::param_array& procArray = node->array_at( "processors" );
+            const scarab::param_array& procArray = node.array_at( "processors" );
             for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
             {
                 if( ! procIt->is_node() )
@@ -109,13 +109,13 @@ namespace Nymph
 
 
         // Then deal with connections"
-        if (! node->has("connections"))
+        if (! node.has("connections"))
         {
             KTWARN(proclog, "No connections were specified");
         }
         else
         {
-            const scarab::param_array& connArray = node->array_at( "connections" );
+            const scarab::param_array& connArray = node.array_at( "connections" );
             for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
             {
                 if( ! connIt->is_node() )
@@ -181,13 +181,13 @@ namespace Nymph
         // The run queue is an array of processor names, or groups of names, which will be run sequentially.
         // If names are grouped (in another array), those in that group will be run in parallel.
         // In single threaded mode all threads will be run sequentially in the order they were specified.
-        if (! node->has("run-queue"))
+        if (! node.has("run-queue"))
         {
             KTWARN(proclog, "Run queue was not specified");
         }
         else
         {
-            const scarab::param_array& rqArray = node->array_at( "run-queue" );
+            const scarab::param_array& rqArray = node.array_at( "run-queue" );
             for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
             {
                 if (rqIt->is_value())
@@ -230,25 +230,25 @@ namespace Nymph
         return true;
     }
 
-    bool KTProcessorToolbox::ConfigureProcessors(const scarab::param_node* node)
+    bool KTProcessorToolbox::ConfigureProcessors(const scarab::param_node& node)
     {
         for (ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); iter++)
         {
             KTDEBUG(proclog, "Attempting to configure processor <" << iter->first << ">");
             string procName = iter->first;
             string nameUsed(procName);
-            if (! node->has(nameUsed))
+            if (! node.has(nameUsed))
             {
                 nameUsed = iter->second.fProc->GetConfigName();
-                if (! node->has(nameUsed))
+                if (! node.has(nameUsed))
                 {
                     KTWARN(proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
                             "\tProcessor <" << procName << "> was not configured.");
                     continue;
                 }
             }
-            const scarab::param_node& subNode = node->node_at(nameUsed);
-            if (! iter->second.fProc->Configure(&subNode))
+            const scarab::param_node& subNode = node.node_at(nameUsed);
+            if (! iter->second.fProc->Configure(subNode))
             {
                 KTERROR(proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">");
                 return false;
@@ -262,7 +262,7 @@ namespace Nymph
         scarab::param_translator translator;
         scarab::param_node optNode;
         optNode.add( "encoding", new scarab::param_value( "json" ) );
-        return ConfigureProcessors( &translator.read_string( config, &optNode )->as_node() );
+        return ConfigureProcessors( translator.read_string( config, &optNode )->as_node() );
     }
 
     KTProcessor* KTProcessorToolbox::GetProcessor(const std::string& procName)
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 6e13edb..5d5ccda 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -98,10 +98,10 @@ namespace Nymph
 
         public:
             /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             /// Configure processors (only those specified in the toolbox)
-            bool ConfigureProcessors(const scarab::param_node* node);
+            bool ConfigureProcessors(const scarab::param_node& node);
             /// Configure processors from a json-encoding of their configurations
             bool ConfigureProcessors(const std::string& config);
 
diff --git a/Library/Application/KTRunNymph.cc b/Library/Application/KTRunNymph.cc
index 4f7ea90..26594c4 100644
--- a/Library/Application/KTRunNymph.cc
+++ b/Library/Application/KTRunNymph.cc
@@ -23,7 +23,7 @@ namespace Nymph
         {
             const scarab::param_node& parentConfigNode = app->GetConfigurator()->Config();
 
-            if( ! app->Configure(&parentConfigNode.node_at(app->GetConfigName() ) ) )
+            if( ! app->Configure(parentConfigNode.node_at(app->GetConfigName() ) ) )
             {
                 KTERROR( nlog, "Unable to configure the application. Aborting.");
                 return -2;
@@ -33,14 +33,14 @@ namespace Nymph
             // This will create all of the requested processors, connect their signals and slots, and fill the run queue.
             KTProcessorToolbox procTB;
 
-            if ( ! procTB.Configure( &parentConfigNode.node_at( procTB.GetConfigName() ) ) )
+            if ( ! procTB.Configure( parentConfigNode.node_at( procTB.GetConfigName() ) ) )
             {
                 KTERROR( nlog, "Unable to configure processor toolbox. Aborting." );
                 return -3;
             }
 
             // Configure the processors
-            if ( ! procTB.ConfigureProcessors( &parentConfigNode ) )
+            if ( ! procTB.ConfigureProcessors( parentConfigNode ) )
             {
                 KTERROR( nlog, "Unable to configure processors. Aborting." );
                 return -4;
diff --git a/Library/Application/KTThroughputProfiler.cc b/Library/Application/KTThroughputProfiler.cc
index 700e940..2dc9fcd 100644
--- a/Library/Application/KTThroughputProfiler.cc
+++ b/Library/Application/KTThroughputProfiler.cc
@@ -37,10 +37,10 @@ namespace Nymph
     {
     };
 
-    bool KTThroughputProfiler::Configure(const scarab::param_node* node)
+    bool KTThroughputProfiler::Configure(const scarab::param_node& node)
     {
-        SetOutputFileFlag(node->get_value< bool >("output-file-flag", fOutputFileFlag));
-        SetOutputFilename(node->get_value("output-filename-base", fOutputFilename));
+        SetOutputFileFlag(node.get_value< bool >("output-file-flag", fOutputFileFlag));
+        SetOutputFilename(node.get_value("output-filename-base", fOutputFilename));
 
         return true;
     }
diff --git a/Library/Application/KTThroughputProfiler.hh b/Library/Application/KTThroughputProfiler.hh
index 1fcdd03..0d7509f 100644
--- a/Library/Application/KTThroughputProfiler.hh
+++ b/Library/Application/KTThroughputProfiler.hh
@@ -81,7 +81,7 @@ namespace Nymph
             KTThroughputProfiler(const std::string& name = "throughput-profiler");
             virtual ~KTThroughputProfiler();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             void Start();
             void Stop();
diff --git a/Library/Data/KTApplyCut.cc b/Library/Data/KTApplyCut.cc
index 14fad8b..fc57302 100644
--- a/Library/Data/KTApplyCut.cc
+++ b/Library/Data/KTApplyCut.cc
@@ -33,12 +33,11 @@ namespace Nymph
         delete fCut;
     }
 
-    bool KTApplyCut::Configure(const scarab::param_node* node)
+    bool KTApplyCut::Configure(const scarab::param_node& node)
     {
         // Config-file settings
-        if (node == NULL) return false;
 
-        for (scarab::param_node::const_iterator nodeIt = node->begin(); nodeIt != node->end(); ++nodeIt)
+        for (scarab::param_node::const_iterator nodeIt = node.begin(); nodeIt != node.end(); ++nodeIt)
         {
             // first do configuration values we know about
             // as it happens, there aren't any
@@ -49,7 +48,7 @@ namespace Nymph
             {
                 if (nodeIt->is_node())
                 {
-                    fCut->Configure(&nodeIt->as_node());
+                    fCut->Configure(nodeIt->as_node());
                 }
                 continue;
             }
diff --git a/Library/Data/KTApplyCut.hh b/Library/Data/KTApplyCut.hh
index 72564b0..e9d3b7e 100644
--- a/Library/Data/KTApplyCut.hh
+++ b/Library/Data/KTApplyCut.hh
@@ -57,7 +57,7 @@ namespace Nymph
             KTApplyCut(const std::string& name = "apply-cut");
             virtual ~KTApplyCut();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             KTCut* GetCut() const;
             void SetCut(KTCut* cut);
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index e4dff78..7be973e 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -35,20 +35,18 @@ namespace Nymph
     {
     }
 
-    bool KTCutFilter::Configure(const scarab::param_node* node)
+    bool KTCutFilter::Configure(const scarab::param_node& node)
     {
         // Config-file settings
-        if (node == NULL) return true;
-
-        if (node->has("cut-mask-int"))
+        if (node.has("cut-mask-int"))
         {
-            SetCutMask(node->get_value< unsigned long long >("cut-mask-int"));
+            SetCutMask(node.get_value< unsigned long long >("cut-mask-int"));
         }
-        if (node->has("cut-mask"))
+        if (node.has("cut-mask"))
         {
-            SetCutMask(KTCutStatus::bitset_type(node->get_value("cut-mask")));
+            SetCutMask(KTCutStatus::bitset_type(node.get_value("cut-mask")));
         }
-        if (node->get_value("cut-mask-all", false))
+        if (node.get_value("cut-mask-all", false))
         {
             SetCutMaskAll();
         }
diff --git a/Library/Data/KTCutFilter.hh b/Library/Data/KTCutFilter.hh
index d7f6982..dacd571 100644
--- a/Library/Data/KTCutFilter.hh
+++ b/Library/Data/KTCutFilter.hh
@@ -60,7 +60,7 @@ namespace Nymph
             KTCutFilter(const std::string& name = "cut-filter");
             virtual ~KTCutFilter();
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             void SetCutMask(KTCutStatus::bitset_type mask);
             void SetCutMask(unsigned long long mask);
diff --git a/Library/Utility/KTCacheDirectory.cc b/Library/Utility/KTCacheDirectory.cc
index 8dad0be..d36f6e8 100644
--- a/Library/Utility/KTCacheDirectory.cc
+++ b/Library/Utility/KTCacheDirectory.cc
@@ -26,11 +26,9 @@ namespace Nymph
     {
     }
 
-    bool KTCacheDirectory::Configure(const scarab::param_node* node)
+    bool KTCacheDirectory::Configure(const scarab::param_node& node)
     {
-        if (node == NULL) return false;
-
-        return SetPath(node->get_value("path", fPath.string()));
+        return SetPath(node.get_value("path", fPath.string()));
     }
 
 } /* namespace Nymph */
diff --git a/Library/Utility/KTCacheDirectory.hh b/Library/Utility/KTCacheDirectory.hh
index 0db2553..d8d362d 100644
--- a/Library/Utility/KTCacheDirectory.hh
+++ b/Library/Utility/KTCacheDirectory.hh
@@ -27,7 +27,7 @@ namespace Nymph
         public:
             using KTSelfConfigurable::Configure;
 
-            bool Configure(const scarab::param_node* node);
+            bool Configure(const scarab::param_node& node);
 
             bool IsReady() const;
 
diff --git a/Library/Utility/KTConfigurable.cc b/Library/Utility/KTConfigurable.cc
index e2f6acc..b79d9fd 100644
--- a/Library/Utility/KTConfigurable.cc
+++ b/Library/Utility/KTConfigurable.cc
@@ -39,7 +39,7 @@ namespace Nymph
         scarab::param_translator translator;
         scarab::param_node optNode;
         optNode.add( "encoding", new scarab::param_value( "json" ) );
-        return Configure( &translator.read_string( config, &optNode )->as_node() );;
+        return Configure( translator.read_string( config, &optNode )->as_node() );;
     }
 
 
@@ -61,7 +61,7 @@ namespace Nymph
     {
         if (fIsConfigured) return true;
 
-        if (! this->Configure(&KTConfigurator::get_instance()->Config()))
+        if (! this->Configure(KTConfigurator::get_instance()->Config()))
         {
             KTERROR(conflog, "An error occurred while configuring <" << fConfigName << ">");
             return false;
diff --git a/Library/Utility/KTConfigurable.hh b/Library/Utility/KTConfigurable.hh
index 6b29145..c93d6b8 100644
--- a/Library/Utility/KTConfigurable.hh
+++ b/Library/Utility/KTConfigurable.hh
@@ -28,7 +28,7 @@ namespace Nymph
             virtual ~KTConfigurable();
 
             /// Should perform parameter store and command-line configurations
-            virtual bool Configure(const scarab::param_node* node) = 0;
+            virtual bool Configure(const scarab::param_node& node) = 0;
             /// Implement the option for calling Configure without passing a parameter store node.
             //virtual bool Configure();
             /// Configure from a JSON string
@@ -73,7 +73,7 @@ namespace Nymph
             virtual ~KTSelfConfigurable();
 
             /// Should perform parameter store and command-line configurations
-            virtual bool Configure(const scarab::param_node* node) = 0;
+            virtual bool Configure(const scarab::param_node& node) = 0;
             /// Configure by getting the top-level node from the parameter store
             virtual bool Configure();
 

From 412bd0312d317e588725e63602fc9756cafe0f2f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 Jan 2018 17:48:31 -0800
Subject: [PATCH 063/521] Added Cereal submodule and tested build

---
 .gitmodules     | 3 +++
 CMakeLists.txt  | 8 ++++++++
 External/cereal | 1 +
 3 files changed, 12 insertions(+)
 create mode 160000 External/cereal

diff --git a/.gitmodules b/.gitmodules
index 5e77012..4a11728 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Scarab"]
 	path = Scarab
 	url = https://github.com/project8/scarab
+[submodule "External/cereal"]
+	path = External/cereal
+	url = https://github.com/USCiLab/cereal.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7db1ed0..39ab538 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,14 @@ if (Nymph_ENABLE_PYTHON)
     python_package_find_python( 2.7 )
 endif (Nymph_ENABLE_PYTHON)
 
+########
+# Cereal
+########
+
+set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
+add_subdirectory( External/cereal )
+include_directories( External/cereal/include )
+
 
 ###############
 # Build Nymph #
diff --git a/External/cereal b/External/cereal
new file mode 160000
index 0000000..51cbda5
--- /dev/null
+++ b/External/cereal
@@ -0,0 +1 @@
+Subproject commit 51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4

From 6833f1a071e42bf4bce3f0d4e40e32588b2708d0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 24 Jan 2018 11:41:10 -0800
Subject: [PATCH 064/521] Simple serialization of data objects

---
 Executables/Validation/CMakeLists.txt       |  1 +
 Executables/Validation/KTTestData.hh        | 14 +++++
 Executables/Validation/TestSerialization.cc | 68 +++++++++++++++++++++
 Library/Data/KTCoreData.hh                  | 10 +++
 Library/Data/KTData.hh                      | 40 +++++++++++-
 5 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 Executables/Validation/TestSerialization.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index fc41cfb..718fc89 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -59,6 +59,7 @@ if (Nymph_ENABLE_TESTING)
         TestProcessorToolbox2Threads
         TestProcessorToolboxMultithreaded
         TestProcessorToolboxSinglethreaded
+        TestSerialization
         TestSignalsAndSlots
         TestSlotData
         TestThroughputProfiler
diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
index 4386b19..b771114 100644
--- a/Executables/Validation/KTTestData.hh
+++ b/Executables/Validation/KTTestData.hh
@@ -22,6 +22,12 @@ namespace Nymph
             virtual ~KTTestData();
 
             MEMBERVARIABLE(bool, IsAwesome);
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
     };
 
     DEFINE_EXT_DATA( KTTestData, "test" ); // defines KTTestDataExt
@@ -42,6 +48,14 @@ namespace Nymph
     DEFINE_EXT_DATA_2( KTTestDerived1DataExt, KTTestBaseData, "test-derived-1" );
     DEFINE_EXT_DATA_2( KTTestDerived2DataExt, KTTestBaseData, "test-derived-2" );
 
+
+    template< class Archive >
+    void KTTestData::serialize( Archive& ar )
+    {
+            std::cout << "### serialize for KTTestData" << std::endl;
+            ar( cereal::base_class< KTData >( this ), fIsAwesome );
+    }
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_KTTESTDATA_HH_ */
diff --git a/Executables/Validation/TestSerialization.cc b/Executables/Validation/TestSerialization.cc
new file mode 100644
index 0000000..df35a4d
--- /dev/null
+++ b/Executables/Validation/TestSerialization.cc
@@ -0,0 +1,68 @@
+/*
+ * TestSerialization.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTLogger.hh"
+
+#include "KTTestData.hh"
+
+#include "cereal/archives/json.hpp"
+
+#include <fstream>
+
+LOGGER( testlog, "TestSerialization" );
+
+using namespace Nymph;
+
+int main()
+{
+    const std::string filename( "test_serialization_output.json" );
+
+    // save data to archive
+    {
+        KTCoreData coreData;
+        KTTestData testData;
+
+        // change data values from their defaults
+        coreData.SetCounter( 5 );
+        testData.SetIsAwesome( true );
+
+        KTINFO( testlog, "KTCoreData counter: " << coreData.GetCounter() );
+        KTINFO( testlog, "KTTestData is-awesome: " << testData.GetIsAwesome() );
+
+        // create and open a file for output
+        std::ofstream fileOut( filename );
+
+        cereal::JSONOutputArchive archiveOut( fileOut );
+
+        KTINFO( testlog, "Writing data to JSON archive" );
+        archiveOut( coreData, testData );
+
+        // archive and stream closed when destructors are called
+    }
+
+    // ... some time later restore the class instance to its original state
+    {
+        KTCoreData newCoreData;
+        KTTestData newTestData;
+
+         // create and open an archive for input
+        std::ifstream fileIn( filename );
+
+        cereal::JSONInputArchive archiveIn( fileIn );
+
+        KTINFO( testlog, "Reading data from JSON archive" );
+        archiveIn( newCoreData, newTestData );
+
+        KTINFO(testlog, "KTCoreData counter: " << newCoreData.GetCounter());
+        KTINFO(testlog, "KTTestData is-awesome: " << newTestData.GetIsAwesome());
+
+        // archive and stream closed when destructors are called
+    }
+
+    return 0;
+}
+
diff --git a/Library/Data/KTCoreData.hh b/Library/Data/KTCoreData.hh
index a85a778..e81bf5a 100644
--- a/Library/Data/KTCoreData.hh
+++ b/Library/Data/KTCoreData.hh
@@ -32,6 +32,16 @@ namespace Nymph
 
             MEMBERVARIABLE_REF( KTCutStatus, CutStatus );
 
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTCoreData" << std::endl;
+                ar( cereal::base_class< KTData >( this ), fCounter, fLastData );
+                //ar( cereal::base_class< KTData >( this ), fCounter, fLastData, fCutStatus );
+            }
     };
 
     DEFINE_EXT_DATA( KTCoreData, "core" )
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 19a6d1c..f1aa67d 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -12,6 +12,10 @@
 
 #include "KTMemberVariable.hh"
 
+#include "cereal/types/polymorphic.hpp" // required to avoid compile error
+#include "cereal/types/base_class.hpp" // required for base-class specification
+#include "cereal/access.hpp" // required for private member access
+
 #include <string>
 
 namespace Nymph
@@ -22,6 +26,12 @@ namespace Nymph
         public:
             KTData();
             virtual ~KTData();
+
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTData" << std::endl;
+            }
     };
 
     class KTDataRider
@@ -31,6 +41,17 @@ namespace Nymph
             virtual ~KTDataRider();
 
             MEMBERVARIABLE_REF( std::string, Name );
+/*
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTDataRider" << std::endl;
+                ar( fName );
+            }
+*/
     };
 
     template< class XDerivedType >
@@ -40,7 +61,14 @@ namespace Nymph
             KTExtensibleDataRider() = delete;
             KTExtensibleDataRider( const std::string& name ) { KTDataRider::fName = name; }
             virtual ~KTExtensibleDataRider() {}
-
+/*
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTExtensibleStruct< XDerivedType, KTDataRider >" << std::endl;
+                ar( cereal::base_class< KTExtensibleStruct< XDerivedType, KTDataRider > >( this ) );
+            }
+*/
     };
 
 #define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name, label ) \
@@ -49,8 +77,18 @@ namespace Nymph
             public: \
                 ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >( label ) {} \
                 virtual ~ex_data_class_name() {} \
+                \
         };
 
+/*
+                template< class Archive > \
+                void serialize( Archive& ar ) \
+                { \
+                    std::cout << "### serialize for ex_data_class_name" << std::endl;
+                    ar( cereal::base_class< data_class_name >( this ), cereal::base_class< KTExtensibleDataRider< ex_data_class_name > >( this ) ); \
+                } \
+*/
+
 #define DEFINE_EXT_DATA( data_class_name, label ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name, label )
 
 } /* namespace Nymph */

From c41fa487f945fd2f2504eba9e8039e41c6daaa3a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 24 Jan 2018 13:44:50 -0800
Subject: [PATCH 065/521] Add pybind11 as an external package

---
 .gitmodules       |  3 +++
 CMakeLists.txt    | 13 +++++++++++++
 External/pybind11 |  1 +
 3 files changed, 17 insertions(+)
 create mode 160000 External/pybind11

diff --git a/.gitmodules b/.gitmodules
index 5e77012..dd1605b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "Scarab"]
 	path = Scarab
 	url = https://github.com/project8/scarab
+[submodule "External/pybind11"]
+	path = External/pybind11
+	url = https://github.com/pybind/pybind11.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7db1ed0..0e433a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,9 @@ option( Nymph_BUILD_NYMPH_EXE "Flag to build the Nymph executable; also requires
 # Build python bindings (requires boost::python)
 option( Nymph_ENABLE_PYTHON "Build python bindings (NymphPy)" OFF )
 
+# Build python bindings via pybind11 (this should be renamed Nymph_ENABLE_PYTHON if we choose to go with pybind11 over boost::python)
+option( Nymph_ENABLE_PYBIND11 "Build python bindings via pybind11" OFF )
+
 # Add a "Standard" build type
 #set (CMAKE_BUILD_TYPE standard)
 set (CMAKE_CXX_FLAGS_STANDARD "-O1 -DNDEBUG -DSTANDARD" CACHE STRING "Flags used by the compiler during standard builds.")
@@ -91,6 +94,16 @@ if (Nymph_ENABLE_PYTHON)
     python_package_find_python( 2.7 )
 endif (Nymph_ENABLE_PYTHON)
 
+##########
+# Pybind11
+##########
+
+if( Nymph_ENABLE_PYBIND11 )
+    set( PYBIND11_INSTALL ON CACHE BOOL "Pybind11 option to install itself" FORCE )
+    add_subdirectory( External/pybind11 )
+    include_directories( External/pybind11/include )    
+endif( Nymph_ENABLE_PYBIND11 )
+
 
 ###############
 # Build Nymph #
diff --git a/External/pybind11 b/External/pybind11
new file mode 160000
index 0000000..add56cc
--- /dev/null
+++ b/External/pybind11
@@ -0,0 +1 @@
+Subproject commit add56ccdcac23a6c522a2c1174a866e293c61dab

From 1d06a9636c34f34ea2967d6b2234779408370428 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 24 Jan 2018 13:45:52 -0800
Subject: [PATCH 066/521] Fix warning when building nymph by itself

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e433a2..9d97bb7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,12 @@ pbuilder_add_submodule( Scarab Scarab/library )
 
 # this is needed for anything that wants to read or write JSON files
 get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY Scarab/library DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
-set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
+message( STATUS "is standalone? ${PBUILDER_STANDALONE}" )
+if( PBUILDER_STANDALONE )
+    set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} )
+else( PBUILDER_STANDALONE )
+    set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
+endif( PBUILDER_STANDALONE )
 
 #######
 # Boost

From 77f1b4d8fadc3f94bf1472e11d760c14bc91192f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 24 Jan 2018 16:42:40 -0800
Subject: [PATCH 067/521] Added a basic test program for pybind11

---
 Executables/Validation/CMakeLists.txt         | 12 +++++++++
 Executables/Validation/TestPythonBasics.cc    | 25 +++++++++++++++++++
 Executables/Validation/TestPythonBasics.py.in |  6 +++++
 3 files changed, 43 insertions(+)
 create mode 100644 Executables/Validation/TestPythonBasics.cc
 create mode 100644 Executables/Validation/TestPythonBasics.py.in

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index fc41cfb..8a5e66f 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -66,5 +66,17 @@ if (Nymph_ENABLE_TESTING)
     )
     
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
+    
+    
+    # Python bindings
+    set( VALIDATION_PYBINDING_FILES
+        TestPythonBasics.cc
+    )
+    
+    pybind11_add_module( nymph_validation MODULE ${VALIDATION_PYBINDING_FILES} )
+    pbuilder_install_libraries( nymph_validation )
+    
+    configure_file( TestPythonBasics.py.in TestPythonBasics.py @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/TestPythonBasics.py DESTINATION ${BIN_INSTALL_DIR} )
         
 endif (Nymph_ENABLE_TESTING) 
diff --git a/Executables/Validation/TestPythonBasics.cc b/Executables/Validation/TestPythonBasics.cc
new file mode 100644
index 0000000..c7551f4
--- /dev/null
+++ b/Executables/Validation/TestPythonBasics.cc
@@ -0,0 +1,25 @@
+/*
+ * TestPythonBasics.hh
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "pybind11/pybind11.h"
+
+
+namespace Nymph
+{
+    namespace PyTest
+    {
+        int add( int i, int j )
+        {
+            return i + j;
+        }
+    }
+}
+
+PYBIND11_MODULE( nymph_validation, mod )
+{
+    mod.def( "add", &Nymph::PyTest::add, "A function that adds two integers" );
+}
diff --git a/Executables/Validation/TestPythonBasics.py.in b/Executables/Validation/TestPythonBasics.py.in
new file mode 100644
index 0000000..0aaf4a4
--- /dev/null
+++ b/Executables/Validation/TestPythonBasics.py.in
@@ -0,0 +1,6 @@
+import sys
+sys.path.append('@LIB_INSTALL_DIR@')
+
+import nymph_validation
+
+print( '1 + 2 =', nymph_validation.add(1, 2) )

From 32de2d5698b0bcff1d3bf618f7788ad831793508 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 24 Jan 2018 17:24:14 -0800
Subject: [PATCH 068/521] Refining the python setup a bit

---
 Executables/Validation/CMakeLists.txt                  | 10 ++++++++--
 .../{TestPythonBasics.py.in => TestPythonBasics.py}    |  3 +--
 Library/AddLibPythonPath.sh.in                         |  3 +++
 Library/CMakeLists.txt                                 |  5 +++++
 4 files changed, 17 insertions(+), 4 deletions(-)
 rename Executables/Validation/{TestPythonBasics.py.in => TestPythonBasics.py} (51%)
 create mode 100644 Library/AddLibPythonPath.sh.in

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 8a5e66f..0c43b6c 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -68,15 +68,21 @@ if (Nymph_ENABLE_TESTING)
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
     
     
+    # Python Interface
+    
     # Python bindings
     set( VALIDATION_PYBINDING_FILES
         TestPythonBasics.cc
     )
+
+    # Python scripts
+    set( VALIDATION_PY_SCRIPTS
+        TestPythonBasics.py
+    )
     
     pybind11_add_module( nymph_validation MODULE ${VALIDATION_PYBINDING_FILES} )
     pbuilder_install_libraries( nymph_validation )
     
-    configure_file( TestPythonBasics.py.in TestPythonBasics.py @ONLY)
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/TestPythonBasics.py DESTINATION ${BIN_INSTALL_DIR} )
+    install( FILES ${VALIDATION_PY_SCRIPTS} DESTINATION ${BIN_INSTALL_DIR} )
         
 endif (Nymph_ENABLE_TESTING) 
diff --git a/Executables/Validation/TestPythonBasics.py.in b/Executables/Validation/TestPythonBasics.py
similarity index 51%
rename from Executables/Validation/TestPythonBasics.py.in
rename to Executables/Validation/TestPythonBasics.py
index 0aaf4a4..ea9dbcd 100644
--- a/Executables/Validation/TestPythonBasics.py.in
+++ b/Executables/Validation/TestPythonBasics.py
@@ -1,5 +1,4 @@
-import sys
-sys.path.append('@LIB_INSTALL_DIR@')
+# Uses Nymph::PyTest::add(), which is defined in TestPythonBasics.cc
 
 import nymph_validation
 
diff --git a/Library/AddLibPythonPath.sh.in b/Library/AddLibPythonPath.sh.in
new file mode 100644
index 0000000..68aff4b
--- /dev/null
+++ b/Library/AddLibPythonPath.sh.in
@@ -0,0 +1,3 @@
+# Adds the lib install directory to the python path
+
+export PYTHONPATH=@LIB_INSTALL_DIR@:$PYTHONPATH
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index c0692b4..6eabc5c 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -96,3 +96,8 @@ pbuilder_install_headers( ${NYMPH_HEADERFILES} )
 if (Nymph_ENABLE_PYTHON)
     python_package_add_module(NymphPy.cc)
 endif (Nymph_ENABLE_PYTHON)
+
+if( Nymph_ENABLE_PYBIND11 )
+    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
+endif( Nymph_ENABLE_PYBIND11 )

From f14fb50cca62be2bff69e3345b1532bcf00e7ec1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 27 Jan 2018 18:03:02 -0800
Subject: [PATCH 069/521] Ok, now we're getting our ducks in a row.  Added
 KTPyTestClass and its binding, and setup things in the Validation folder to
 make a single module with multiple contributions that also is linked to the
 other Nymph and external libraries.

---
 Executables/Validation/CMakeLists.txt         | 17 +++++--
 Executables/Validation/KTPyTestClass.cc       | 22 ++++++++++
 Executables/Validation/KTPyTestClass.hh       | 44 +++++++++++++++++++
 Executables/Validation/KTPyTestClassPybind.hh | 22 ++++++++++
 Executables/Validation/NymphValidationPy.cc   | 18 ++++++++
 Executables/Validation/TestPyTestClass.py     |  9 ++++
 ...estPythonBasics.cc => TestPythonBasics.hh} |  2 +-
 7 files changed, 130 insertions(+), 4 deletions(-)
 create mode 100644 Executables/Validation/KTPyTestClass.cc
 create mode 100644 Executables/Validation/KTPyTestClass.hh
 create mode 100644 Executables/Validation/KTPyTestClassPybind.hh
 create mode 100644 Executables/Validation/NymphValidationPy.cc
 create mode 100644 Executables/Validation/TestPyTestClass.py
 rename Executables/Validation/{TestPythonBasics.cc => TestPythonBasics.hh} (86%)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 0c43b6c..3b97912 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -13,6 +13,7 @@ if (Nymph_ENABLE_TESTING)
 
     # Headers for any test classes
     set (VALIDATION_HEADERFILES
+        KTPyTestClass.hh
         KTTestConfigurable.hh
         KTTestCuts.hh
         KTTestData.hh
@@ -21,6 +22,7 @@ if (Nymph_ENABLE_TESTING)
     )
     
     set (VALIDATION_SOURCEFILES
+        KTPyTestclass.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc
@@ -70,18 +72,27 @@ if (Nymph_ENABLE_TESTING)
     
     # Python Interface
     
+    # Python binding headers
+    set( VALIDATION_PYBINDING_HEADERFILES
+        KTPyTestClassPybind.hh
+        TestPythonBasics.hh
+    )
+    
     # Python bindings
-    set( VALIDATION_PYBINDING_FILES
-        TestPythonBasics.cc
+    set( VALIDATION_PYBINDING_SOURCEFILES
+        NymphValidationPy.cc
     )
 
     # Python scripts
     set( VALIDATION_PY_SCRIPTS
+        TestPyTestClass.py
         TestPythonBasics.py
     )
     
-    pybind11_add_module( nymph_validation MODULE ${VALIDATION_PYBINDING_FILES} )
+    pybind11_add_module( nymph_validation MODULE ${VALIDATION_PYBINDING_SOURCEFILES} )
+    target_link_libraries( nymph_validation PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
     pbuilder_install_libraries( nymph_validation )
+    pbuilder_install_headers( ${VALIDATION_PYBINDING_HEADERFILES} )
     
     install( FILES ${VALIDATION_PY_SCRIPTS} DESTINATION ${BIN_INSTALL_DIR} )
         
diff --git a/Executables/Validation/KTPyTestClass.cc b/Executables/Validation/KTPyTestClass.cc
new file mode 100644
index 0000000..43c8f3b
--- /dev/null
+++ b/Executables/Validation/KTPyTestClass.cc
@@ -0,0 +1,22 @@
+/*
+ * KTPyTestClass.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTPyTestClass.hh"
+
+namespace Nymph
+{
+
+    KTPyTestClass::KTPyTestClass() :
+            fValue( 5 )
+    {
+    }
+
+    KTPyTestClass::~KTPyTestClass()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Executables/Validation/KTPyTestClass.hh b/Executables/Validation/KTPyTestClass.hh
new file mode 100644
index 0000000..9e6ad27
--- /dev/null
+++ b/Executables/Validation/KTPyTestClass.hh
@@ -0,0 +1,44 @@
+/*
+ * KTPyTestClass.hh
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_KTPYTESTCLASS_HH_
+#define NYMPH_KTPYTESTCLASS_HH_
+
+#include <iostream>
+
+namespace Nymph
+{
+
+    class KTPyTestClass
+    {
+        public:
+            KTPyTestClass();
+            ~KTPyTestClass();
+
+            void SayHello()
+            {
+                std::cout << "Hello" << std::endl;
+            }
+
+            int GetValue()
+            {
+                return fValue;
+            }
+
+            void SetValue( int value )
+            {
+                fValue = value;
+                return;
+            }
+
+        private:
+            int fValue;
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTPYTESTCLASS_HH_ */
diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
new file mode 100644
index 0000000..7520725
--- /dev/null
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -0,0 +1,22 @@
+/*
+ * KTPyTestClassPybind.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTPyTestClass.hh"
+
+#include "pybind11/pybind11.h"
+
+void ExportKTPyTestClass( pybind11::module& mod )
+{
+    pybind11::class_< Nymph::KTPyTestClass >( mod, "KTPyTestClass" )
+            .def( pybind11::init<>() )
+            .def( "SayHello", &Nymph::KTPyTestClass::SayHello )
+            .def( "GetValue", &Nymph::KTPyTestClass::GetValue )
+            .def( "SetValue", &Nymph::KTPyTestClass::SetValue )
+            ;
+}
+
+
diff --git a/Executables/Validation/NymphValidationPy.cc b/Executables/Validation/NymphValidationPy.cc
new file mode 100644
index 0000000..99bcfee
--- /dev/null
+++ b/Executables/Validation/NymphValidationPy.cc
@@ -0,0 +1,18 @@
+/*
+ * NymphValidationPy.cc
+ *
+ *  Created on: Jan 25, 2018
+ *      Author: obla999
+ */
+
+#include "KTPyTestClassPybind.hh"
+#include "TestPythonBasics.hh"
+
+PYBIND11_MODULE( nymph_validation, mod )
+{
+    ExportKTPyTestClass( mod );
+    ExportTestPythonBasics( mod );
+}
+
+
+
diff --git a/Executables/Validation/TestPyTestClass.py b/Executables/Validation/TestPyTestClass.py
new file mode 100644
index 0000000..150fc38
--- /dev/null
+++ b/Executables/Validation/TestPyTestClass.py
@@ -0,0 +1,9 @@
+# Demonstrates access to KTPyTestClass
+
+import nymph_validation as nv
+
+ptc = nv.KTPyTestClass()
+
+print( 'Ok, KTPyTestClass, say hello . . .' )
+print( ptc.SayHello() )
+print( 'This should print the default value of KTPyTestClass::fValue, which is 5:', ptc.GetValue() )
diff --git a/Executables/Validation/TestPythonBasics.cc b/Executables/Validation/TestPythonBasics.hh
similarity index 86%
rename from Executables/Validation/TestPythonBasics.cc
rename to Executables/Validation/TestPythonBasics.hh
index c7551f4..7911acd 100644
--- a/Executables/Validation/TestPythonBasics.cc
+++ b/Executables/Validation/TestPythonBasics.hh
@@ -19,7 +19,7 @@ namespace Nymph
     }
 }
 
-PYBIND11_MODULE( nymph_validation, mod )
+void ExportTestPythonBasics( pybind11::module& mod )
 {
     mod.def( "add", &Nymph::PyTest::add, "A function that adds two integers" );
 }

From 86e874692e572a39326825cf3e06465c829bf3f2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 29 Jan 2018 17:40:59 -0800
Subject: [PATCH 070/521] Added bindings for KTProcessorToolbox.  Added dummy
 python processor base class KTPyProcessor.  Added test script for the proc
 toolbox, TestProcessorToolbox.py.

---
 Executables/Validation/CMakeLists.txt         | 52 +++++-----
 Executables/Validation/KTPyTestClassPybind.hh | 19 ++--
 ...lidationPy.cc => NymphValidationPybind.cc} |  6 +-
 .../Validation/TestProcessorToolbox.py        | 23 +++++
 Executables/Validation/TestPyTestClass.py     |  2 +-
 Executables/Validation/TestPythonBasics.hh    |  9 +-
 Executables/Validation/TestPythonBasics.py    |  2 +-
 Library/Application/KTProcessorToolbox.hh     |  9 +-
 .../Application/KTProcessorToolboxPybind.hh   | 98 +++++++++++++++++++
 Library/CMakeLists.txt                        | 20 ++++
 Library/NymphPybind.cc                        | 20 ++++
 Library/Processor/KTProcessorPybind.hh        | 38 +++++++
 Library/Processor/KTPyProcessor.hh            | 32 ++++++
 Library/Utility/KTConfigurablePybind.hh       | 29 ++++++
 14 files changed, 316 insertions(+), 43 deletions(-)
 rename Executables/Validation/{NymphValidationPy.cc => NymphValidationPybind.cc} (56%)
 create mode 100644 Executables/Validation/TestProcessorToolbox.py
 create mode 100644 Library/Application/KTProcessorToolboxPybind.hh
 create mode 100644 Library/NymphPybind.cc
 create mode 100644 Library/Processor/KTProcessorPybind.hh
 create mode 100644 Library/Processor/KTPyProcessor.hh
 create mode 100644 Library/Utility/KTConfigurablePybind.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 3b97912..cb562e7 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -70,30 +70,34 @@ if (Nymph_ENABLE_TESTING)
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
     
     
-    # Python Interface
-    
-    # Python binding headers
-    set( VALIDATION_PYBINDING_HEADERFILES
-        KTPyTestClassPybind.hh
-        TestPythonBasics.hh
-    )
-    
-    # Python bindings
-    set( VALIDATION_PYBINDING_SOURCEFILES
-        NymphValidationPy.cc
-    )
-
-    # Python scripts
-    set( VALIDATION_PY_SCRIPTS
-        TestPyTestClass.py
-        TestPythonBasics.py
-    )
-    
-    pybind11_add_module( nymph_validation MODULE ${VALIDATION_PYBINDING_SOURCEFILES} )
-    target_link_libraries( nymph_validation PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
-    pbuilder_install_libraries( nymph_validation )
-    pbuilder_install_headers( ${VALIDATION_PYBINDING_HEADERFILES} )
+    if( Nymph_ENABLE_PYBIND11 )
+        # Python Interface
+        
+        # Python binding headers
+        set( VALIDATION_PYBINDING_HEADERFILES
+            KTPyTestClassPybind.hh
+            TestPythonBasics.hh
+        )
+        
+        # Python bindings
+        set( VALIDATION_PYBINDING_SOURCEFILES
+            NymphValidationPybind.cc
+        )
+    
+        # Python scripts
+        set( VALIDATION_PY_SCRIPTS
+            TestProcessorToolbox.py
+            TestPyTestClass.py
+            TestPythonBasics.py
+        )
+        
+        pybind11_add_module( py_nymph_validation MODULE ${VALIDATION_PYBINDING_SOURCEFILES} )
+        target_link_libraries( py_nymph_validation PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
+        pbuilder_install_libraries( py_nymph_validation )
+        pbuilder_install_headers( ${VALIDATION_PYBINDING_HEADERFILES} )
+        
+        install( FILES ${VALIDATION_PY_SCRIPTS} DESTINATION ${BIN_INSTALL_DIR} )
     
-    install( FILES ${VALIDATION_PY_SCRIPTS} DESTINATION ${BIN_INSTALL_DIR} )
+    endif( Nymph_ENABLE_PYBIND11 )
         
 endif (Nymph_ENABLE_TESTING) 
diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
index 7520725..bda9d69 100644
--- a/Executables/Validation/KTPyTestClassPybind.hh
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -9,14 +9,17 @@
 
 #include "pybind11/pybind11.h"
 
-void ExportKTPyTestClass( pybind11::module& mod )
+namespace Nymph
 {
-    pybind11::class_< Nymph::KTPyTestClass >( mod, "KTPyTestClass" )
-            .def( pybind11::init<>() )
-            .def( "SayHello", &Nymph::KTPyTestClass::SayHello )
-            .def( "GetValue", &Nymph::KTPyTestClass::GetValue )
-            .def( "SetValue", &Nymph::KTPyTestClass::SetValue )
-            ;
-}
 
+    void ExportKTPyTestClass( pybind11::module& mod )
+    {
+        pybind11::class_< Nymph::KTPyTestClass >( mod, "KTPyTestClass" )
+                .def( pybind11::init<>() )
+                .def( "SayHello", &Nymph::KTPyTestClass::SayHello )
+                .def( "GetValue", &Nymph::KTPyTestClass::GetValue )
+                .def( "SetValue", &Nymph::KTPyTestClass::SetValue )
+                ;
+    }
 
+} /* namespace Nymph */
diff --git a/Executables/Validation/NymphValidationPy.cc b/Executables/Validation/NymphValidationPybind.cc
similarity index 56%
rename from Executables/Validation/NymphValidationPy.cc
rename to Executables/Validation/NymphValidationPybind.cc
index 99bcfee..0f2bad2 100644
--- a/Executables/Validation/NymphValidationPy.cc
+++ b/Executables/Validation/NymphValidationPybind.cc
@@ -8,10 +8,10 @@
 #include "KTPyTestClassPybind.hh"
 #include "TestPythonBasics.hh"
 
-PYBIND11_MODULE( nymph_validation, mod )
+PYBIND11_MODULE( py_nymph_validation, mod )
 {
-    ExportKTPyTestClass( mod );
-    ExportTestPythonBasics( mod );
+    Nymph::ExportKTPyTestClass( mod );
+    Nymph::ExportTestPythonBasics( mod );
 }
 
 
diff --git a/Executables/Validation/TestProcessorToolbox.py b/Executables/Validation/TestProcessorToolbox.py
new file mode 100644
index 0000000..e2c4bb5
--- /dev/null
+++ b/Executables/Validation/TestProcessorToolbox.py
@@ -0,0 +1,23 @@
+# TestProcessorToolbox.py
+#  Created on: Jan 29, 2018
+#      Author: N.S. Oblath
+#
+#  Tests the ability to use the processor toolbox from a Python script
+
+import py_nymph as nymph
+import py_nymph_validation as nv
+
+ptb = nymph.KTProcessorToolbox('pt')
+
+print('Configuring')
+
+ptb.AddProcessor('test-p-proc', 'tpp')
+ptb.AddProcessor('test-proc-b', 'tp')
+ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.PushBackToRunQueue('tpp')
+
+print('Running')
+
+ptb.Run()
+
+print('All done')
diff --git a/Executables/Validation/TestPyTestClass.py b/Executables/Validation/TestPyTestClass.py
index 150fc38..3520ef9 100644
--- a/Executables/Validation/TestPyTestClass.py
+++ b/Executables/Validation/TestPyTestClass.py
@@ -1,6 +1,6 @@
 # Demonstrates access to KTPyTestClass
 
-import nymph_validation as nv
+import py_nymph_validation as nv
 
 ptc = nv.KTPyTestClass()
 
diff --git a/Executables/Validation/TestPythonBasics.hh b/Executables/Validation/TestPythonBasics.hh
index 7911acd..f1f6ef0 100644
--- a/Executables/Validation/TestPythonBasics.hh
+++ b/Executables/Validation/TestPythonBasics.hh
@@ -17,9 +17,10 @@ namespace Nymph
             return i + j;
         }
     }
-}
 
-void ExportTestPythonBasics( pybind11::module& mod )
-{
-    mod.def( "add", &Nymph::PyTest::add, "A function that adds two integers" );
+    void ExportTestPythonBasics( pybind11::module& mod )
+    {
+        mod.def( "add", &PyTest::add, "A function that adds two integers" );
+    }
+
 }
diff --git a/Executables/Validation/TestPythonBasics.py b/Executables/Validation/TestPythonBasics.py
index ea9dbcd..0014f12 100644
--- a/Executables/Validation/TestPythonBasics.py
+++ b/Executables/Validation/TestPythonBasics.py
@@ -1,5 +1,5 @@
 # Uses Nymph::PyTest::add(), which is defined in TestPythonBasics.cc
 
-import nymph_validation
+import py_nymph_validation
 
 print( '1 + 2 =', nymph_validation.add(1, 2) )
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 5d5ccda..42d97fd 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -144,14 +144,19 @@ namespace Nymph
 
 
         public:
+            // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
+
             /// Make a connection between the signal from one processor and the slot from another processor
             /// Both processors should already have been added to the Toolbox
             /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
-            bool MakeConnection(const std::string& signal, const std::string& slot, int order = std::numeric_limits< int >::min());
+            bool MakeConnection(const std::string& signal, const std::string& slot, int order);
+            bool MakeConnection(const std::string& signal, const std::string& slot) {return MakeConnection(signal, slot, std::numeric_limits< int >::min());}
 
             /// Make a connection between the signal from one processor and the slot from another processor
             /// Both processors should already have been added to the Toolbox
-            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order = std::numeric_limits< int >::min());
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName)
+                    {return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min());}
 
             /// Set a breakpoint on a slot
             /// Slot string should be formatted as: [processor name]:[slot name]
diff --git a/Library/Application/KTProcessorToolboxPybind.hh b/Library/Application/KTProcessorToolboxPybind.hh
new file mode 100644
index 0000000..678a374
--- /dev/null
+++ b/Library/Application/KTProcessorToolboxPybind.hh
@@ -0,0 +1,98 @@
+/*
+ * KTProcessorToolboxPybind.hh
+ *
+ *  Created on: Jan 29, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_
+#define NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_
+
+#include "KTProcessorToolbox.hh"
+
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
+
+namespace Nymph
+{
+    void ExportKTProcessorToolbox( pybind11::module& mod )
+    {
+
+        pybind11::class_< KTProcessorToolbox >( mod, "KTProcessorToolbox" )
+                .def( pybind11::init< const std::string & >() )
+
+                // members related to configuration
+                .def( "ConfigureProcessors", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::ConfigureProcessors,
+                        "Configure processors from a json dictionary. Top-level keys are processor names, values are dictionaries with their configurations" )
+
+                // processor access
+                // GetProcessor skipped because raw pointers are not supported by pybind11
+                .def( "AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::AddProcessor,
+                        "Create a processor by name and add it to the toolbox" )
+                // skipping AddProcessor(const std::string&, KTProcessor*)
+                .def( "RemoveProcessor", &KTProcessorToolbox::RemoveProcessor,
+                        "Remove a processor from the toolbox" )
+                // skipping ReleaseProcessor
+                .def( "ClearProcessor", &KTProcessorToolbox::ClearProcessors,
+                        "Remove all processors from the toolbox" )
+
+                // processor connections
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, int)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor; the signal and slot strings should be formatted as: [processor name]:[signal/slot name]" )
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor; the signal and slot strings should be formatted as: [processor name]:[signal/slot name]" )
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, const std::string&, const std::string&, int)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor" )
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, const std::string&, const std::string&)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor" )
+
+                // breakpoints
+                .def( "SetBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::SetBreakpoint,
+                        "Set a breakpoint at a specific slot; slot string should be formatted as: [processor name]:[slot name]" )
+                .def( "SetBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::SetBreakpoint,
+                        "Set a breakpoint at a specific slot" )
+
+                .def( "RemoveBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::RemoveBreakpoint,
+                        "Remove a breakpoint; slot string should be formatted as: [processor name]:[slot name]" )
+                .def( "RemoveBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::RemoveBreakpoint,
+                        "Remove a breakpoint" )
+
+                // run queue
+                .def( "PushBackToRunQueue", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::PushBackToRunQueue,
+                        "Push one or more processors to the back of the run queue using a comma-separated string" )
+                .def( "PushBackToRunQueue", (bool (KTProcessorToolbox::*)(std::vector< std::string >)) &KTProcessorToolbox::PushBackToRunQueue,
+                        "Push one or more processors to the back of the run queue using a vector of strings" )
+
+                .def( "PopBackOfRunQueue", &KTProcessorToolbox::PopBackOfRunQueue,
+                        "Remove the last item in the run queue, whether it's a single processor or a group" )
+                .def( "ClearRunQueue", &KTProcessorToolbox::ClearRunQueue,
+                        "Remove all items from the run queue" )
+
+                // run methods
+                .def( "Run", &KTProcessorToolbox::Run, "Start the processors listed in the run queue (blocking)" )
+                .def( "AsyncRun", &KTProcessorToolbox::AsyncRun, "Non-blocking call to Run()" )
+                .def( "WaitForBreak", &KTProcessorToolbox::WaitForBreak, "Blocking call that waits until a breakpoint is reached; you must manually Continue() to proceed" )
+                .def( "WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "Blocking call to Continue() execution until the end of the run is reached; you must manually Continue() to proceed" )
+                .def( "Continue", &KTProcessorToolbox::Continue, "Resume execution (non-blocking)" )
+                .def( "CancelThreads", &KTProcessorToolbox::CancelThreads, "Kill any running thread at the next breakpoint check" )
+                .def( "JoinRunThread", &KTProcessorToolbox::JoinRunThread, "Blocking call to wait until Run() is complete; this should only be done by the owner of the thread (typically whoever called Run())" )
+
+                .def( "GetData", &KTProcessorToolbox::GetData, "Retrieve the data handle from a slot by thread name (i.e. the name of the primary processor for that thread)" )
+
+                /*
+                // these are implemented in the boost::python version but not yet here
+
+                PROPERTYMEMBER(KTProcessorToolbox, RunSingleThreaded)
+
+                // Processor access
+                .def("GetProcessor", GetProcessor_wrap, return_value_policy<reference_existing_object>(), "Get a pointer to a processor in the toolbox")
+                .def("AddProcessor", AddProcessor_Ref, "add a processor to the toolbox, toolbox takes ownership")
+                // TODO: Not 100% certain that the reference count for this processor is now correct, given the return_value_policy
+                .def("ReleaseProcessor", &KTProcessorToolbox::ReleaseProcessor, return_value_policy<reference_existing_object>(), "Remove a processor from the toolbox and return it to the user, ownership is passed")
+                */
+                ;
+
+    }
+}
+
+#endif /* NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_ */
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 6eabc5c..f9c7f14 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -88,6 +88,18 @@ set( NYMPH_PY_HEADERFILES
     ${APPL_DIR}/KTProcessorToolboxPy.hh
 )
 
+# Python binding headers
+set( NYMPH_PYBINDING_HEADERFILES
+    #${UTIL_DIR}/KTConfigurablePybind.hh
+    ${PROC_DIR}/KTProcessorPybind.hh
+    ${PROC_DIR}/KTPyProcessor.hh
+)
+
+# Python bindings
+set( NYMPH_PYBINDING_SOURCEFILES
+    NymphPybind.cc
+)
+
 ##################################################
 
 pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
@@ -98,6 +110,14 @@ if (Nymph_ENABLE_PYTHON)
 endif (Nymph_ENABLE_PYTHON)
 
 if( Nymph_ENABLE_PYBIND11 )
+    set( LIB_DEPENDENCIES Nymph )
+
     configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
     install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
+    
+    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
+    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
+    pbuilder_install_libraries( py_nymph )
+    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
+
 endif( Nymph_ENABLE_PYBIND11 )
diff --git a/Library/NymphPybind.cc b/Library/NymphPybind.cc
new file mode 100644
index 0000000..dc99ee8
--- /dev/null
+++ b/Library/NymphPybind.cc
@@ -0,0 +1,20 @@
+/*
+ * NymphPybind.cc
+ *
+ *  Created on: Jan 27, 2018
+ *      Author: obla999
+ */
+
+#include "Application/KTProcessorToolboxPybind.hh"
+#include "Processor/KTProcessorPybind.hh"
+//#include "Utility/KTConfigurablePybind.hh"
+
+PYBIND11_MODULE( py_nymph, mod )
+{
+    //Nymph::ExportKTConfigurable( mod );
+    Nymph::ExportKTProcessor( mod );
+    Nymph::ExportKTProcessorToolbox( mod );
+}
+
+
+
diff --git a/Library/Processor/KTProcessorPybind.hh b/Library/Processor/KTProcessorPybind.hh
new file mode 100644
index 0000000..fcfee1e
--- /dev/null
+++ b/Library/Processor/KTProcessorPybind.hh
@@ -0,0 +1,38 @@
+/*
+ * KTProcessorPybind.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_KTPROCESSORPYBIND_HH_
+#define NYMPH_KTPROCESSORPYBIND_HH_
+
+#include "KTPyProcessor.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportKTProcessor( pybind11::module& mod )
+    {
+/*        pybind11::class_< KTProcessor, KTConfigurable >( mod, "KTProcessor" )
+                .def( pybind11::init< const std::string & >() )
+
+                .def( "ConnectASlot", &Nymph::KTProcessor::ConnectASlot )
+                .def( "ConnectASignal", &Nymph::KTProcessor::ConnectASignal )
+
+                .def( "GetDoBreakpoint", &Nymph::KTProcessor::GetDoBreakpoint )
+                .def( "SetDoBreakpoint", &Nymph::KTProcessor::SetDoBreakpoint )
+                ;
+*/
+        pybind11::class_< KTPyProcessor >( mod, "KTPyProcessor" )
+                .def( pybind11::init< const std::string & >() )
+                ;
+
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTPROCESSORPYBIND_HH_ */
diff --git a/Library/Processor/KTPyProcessor.hh b/Library/Processor/KTPyProcessor.hh
new file mode 100644
index 0000000..52f27b1
--- /dev/null
+++ b/Library/Processor/KTPyProcessor.hh
@@ -0,0 +1,32 @@
+/*
+ * KTPyProcessor.hh
+ *
+ *  Created on: Jan 29, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTPYPROCESSOR_HH_
+#define NYMPH_KTPYPROCESSOR_HH_
+
+#include "KTProcessor.hh"
+
+namespace Nymph
+{
+
+    class KTPyProcessor : public KTProcessor
+    {
+        public:
+            using KTProcessor::KTProcessor; // inherit constructors
+
+            // for now, override KTConfigurable::Configure(const scarab::param_node&) with a non-functional function
+            bool Configure(const scarab::param_node& )
+            {
+                return true;
+            }
+    };
+
+
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTPYPROCESSOR_HH_ */
diff --git a/Library/Utility/KTConfigurablePybind.hh b/Library/Utility/KTConfigurablePybind.hh
new file mode 100644
index 0000000..585a33f
--- /dev/null
+++ b/Library/Utility/KTConfigurablePybind.hh
@@ -0,0 +1,29 @@
+/*
+ * KTConfigurablePybind.cc
+ *
+ *  Created on: Jan 27, 2018
+ *      Author: N. Oblath
+ */
+
+#include "KTConfigurable.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportKTConfigurable( pybind11::module& mod )
+    {
+/*        pybind11::class_< KTConfigurable >( mod, "KTConfigurable" )
+                .def( pybind11::init< const std::string & >() )
+
+                .def( "Configure", (bool (KTConfigurable::*)(const std::string&)) &KTConfigurable::Configure )
+                //.def( "Configure", (void (KTConfigurable::*)(const scarab::param_node&)) &KTConfigurable::Configure )
+
+                .def( "GetConfigName", &KTConfigurable::GetConfigName )
+                .def( "SetConfigName", &KTConfigurable::SetConfigName )
+                ;
+*/
+    }
+
+} /* namespace Nymph */

From e7875d1d2ad5eed65b63c58c6607589e30cfb37f Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Thu, 1 Feb 2018 16:43:06 +0100
Subject: [PATCH 071/521] changed KTPyTestclass.cc to KTPyTestClass.cc in
 Executables/Validation/CMakeLists.txt

---
 Executables/Validation/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index cb562e7..72c3ba6 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -22,7 +22,7 @@ if (Nymph_ENABLE_TESTING)
     )
     
     set (VALIDATION_SOURCEFILES
-        KTPyTestclass.cc
+        KTPyTestClass.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc

From 06468c6d85236c4acb1187ce3635d1c99c4d3cf6 Mon Sep 17 00:00:00 2001
From: lgladstone <gladston@mit.edu>
Date: Thu, 1 Feb 2018 08:16:50 -0800
Subject: [PATCH 072/521] add py_ prefix

---
 Executables/Validation/TestPythonBasics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Executables/Validation/TestPythonBasics.py b/Executables/Validation/TestPythonBasics.py
index 0014f12..5702fe7 100644
--- a/Executables/Validation/TestPythonBasics.py
+++ b/Executables/Validation/TestPythonBasics.py
@@ -2,4 +2,4 @@
 
 import py_nymph_validation
 
-print( '1 + 2 =', nymph_validation.add(1, 2) )
+print( '1 + 2 =', py_nymph_validation.add(1, 2) )

From fbe2a5a8295e425f9a27d150d4ef4e64c789550e Mon Sep 17 00:00:00 2001
From: Evan Zayas <ezayas@Evans-MacBook-Pro.local>
Date: Thu, 1 Feb 2018 12:17:25 -0500
Subject: [PATCH 073/521] drafted serial writer class

---
 Executables/Validation/CMakeLists.txt    |  2 +
 Executables/Validation/KTSerialWriter.cc | 55 ++++++++++++++++
 Executables/Validation/KTSerialWriter.hh | 83 ++++++++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 Executables/Validation/KTSerialWriter.cc
 create mode 100644 Executables/Validation/KTSerialWriter.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 718fc89..051e661 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -13,6 +13,7 @@ if (Nymph_ENABLE_TESTING)
 
     # Headers for any test classes
     set (VALIDATION_HEADERFILES
+        KTSerialWriter.hh
         KTTestConfigurable.hh
         KTTestCuts.hh
         KTTestData.hh
@@ -21,6 +22,7 @@ if (Nymph_ENABLE_TESTING)
     )
     
     set (VALIDATION_SOURCEFILES
+        KTSerialWriter.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc
diff --git a/Executables/Validation/KTSerialWriter.cc b/Executables/Validation/KTSerialWriter.cc
new file mode 100644
index 0000000..3bcd385
--- /dev/null
+++ b/Executables/Validation/KTSerialWriter.cc
@@ -0,0 +1,55 @@
+/*
+ *	KTSerialWriter.cc
+ *
+ *	Created on: Feb 1, 2018
+ *		Author: E Zayas
+ *
+*/
+
+#include "KTSerialWriter.hh"
+
+#include "KTLogger.hh"
+
+LOGGER( avlog_hh, "KTSerialWriter" );
+
+namespace Nymph
+{
+	KTSerialWriter::KTSerialWriter( const std::string& name ) :
+		KTProcessor( name ),
+		fFileName( "placeholder.json" ),
+		fStreamOutPtr(nullptr),
+		fArchiveOutPtr(nullptr)
+		{
+			// Register slots here
+		}
+
+	KTSerialWriter::~KTSerialWriter()
+	{
+		//delete fStreamOutPtr;
+		//delete fArchiveOutPtr;
+	}
+
+	bool KTSerialWriter::Configure( const scarab::param_node* node )
+	{
+		if (node == NULL) return false;
+
+		SetFileName( node->get_value< std::string >( "file-name", fFileName ) );
+
+		*fStreamOutPtr = std::ofstream( fFileName );
+		cereal::JSONOutputArchive fStupid( *fStreamOutPtr );
+		fArchiveOutPtr = &fStupid;
+
+		return true;
+	}
+
+	template< class XDataType >
+	void KTSerialWriter::SlotFunction( const XDataType& data )
+	{
+        // Write to JSON archive
+        KTINFO( avlog_hh, "Writing data to JSON acrhive" );
+        *fArchiveOutPtr( data );
+
+        KTINFO( avlog_hh, "Successfully wrote data to archive" );
+        return;
+	}
+}
diff --git a/Executables/Validation/KTSerialWriter.hh b/Executables/Validation/KTSerialWriter.hh
new file mode 100644
index 0000000..35d630c
--- /dev/null
+++ b/Executables/Validation/KTSerialWriter.hh
@@ -0,0 +1,83 @@
+/*
+ *	KTSerialWriter.hh
+ *
+ *	Created on: Feb 1, 2018
+ *		Author: E Zayas
+ *
+*/
+
+#ifndef KTSERIALWRITER_HH_
+#define KTSERIALWRITER_HH_
+
+#include "KTData.hh"
+#include "KTProcessor.hh"
+#include "KTSlot.hh"
+
+#include "cereal/archives/json.hpp"
+#include <fstream>
+
+namespace Nymph
+{
+	class KTSerialWriter : public KTProcessor
+	{
+		public:
+			KTSerialWriter( const std::string& name = "serial-writer" );
+			virtual ~KTSerialWriter();
+
+		private:
+			std::string fFileName;
+			std::ofstream* fStreamOutPtr;
+			cereal::JSONOutputArchive* fArchiveOutPtr;
+
+		public:
+			bool Configure( const scarab::param_node* node );
+
+			std::string GetFileName() const;
+			void SetFileName( std::string file );
+
+			std::ofstream* GetStreamOutPtr() const;
+			void SetStreamOutPtr( std::ofstream stream );
+
+			cereal::JSONOutputArchive* GetArchiveOutPtr() const;
+			void SetArchiveOutPtr( cereal::JSONOutputArchive archive );
+
+			template< class XDataType >
+			void SlotFunction( const XDataType& data );
+	};
+
+	inline std::string KTSerialWriter::GetFileName() const
+	{
+		return fFileName;
+	}
+
+	inline void KTSerialWriter::SetFileName( std::string file )
+	{
+		fFileName = file;
+		return;
+	}
+
+	inline std::ofstream* KTSerialWriter::GetStreamOutPtr() const
+	{
+		return fStreamOutPtr;
+	}
+
+	inline void KTSerialWriter::SetStreamOutPtr( std::ofstream stream )
+	{
+		fStreamOutPtr = &stream;
+		return;
+	}
+
+	inline cereal::JSONOutputArchive* KTSerialWriter::GetArchiveOutPtr() const
+	{
+		return fArchiveOutPtr;
+	}
+
+	inline void KTSerialWriter::SetArchiveOutPtr( cereal::JSONOutputArchive archive )
+	{
+		fArchiveOutPtr = &archive;
+		return;
+	}
+
+} // namespace Nymph
+
+#endif // KTSERIALWRITER_HH_

From 4dd15f41222f888c751568d8b24df146c634865f Mon Sep 17 00:00:00 2001
From: Evan Zayas <ezayas@Evans-MacBook-Pro.local>
Date: Thu, 1 Feb 2018 12:34:42 -0500
Subject: [PATCH 074/521] tabs -> spaces

---
 Executables/Validation/KTSerialWriter.cc |  70 ++++++-------
 Executables/Validation/KTSerialWriter.hh | 124 +++++++++++------------
 2 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/Executables/Validation/KTSerialWriter.cc b/Executables/Validation/KTSerialWriter.cc
index 3bcd385..53e96cd 100644
--- a/Executables/Validation/KTSerialWriter.cc
+++ b/Executables/Validation/KTSerialWriter.cc
@@ -1,8 +1,8 @@
 /*
- *	KTSerialWriter.cc
+ *  KTSerialWriter.cc
  *
- *	Created on: Feb 1, 2018
- *		Author: E Zayas
+ *  Created on: Feb 1, 2018
+ *      Author: E Zayas
  *
 */
 
@@ -14,42 +14,42 @@ LOGGER( avlog_hh, "KTSerialWriter" );
 
 namespace Nymph
 {
-	KTSerialWriter::KTSerialWriter( const std::string& name ) :
-		KTProcessor( name ),
-		fFileName( "placeholder.json" ),
-		fStreamOutPtr(nullptr),
-		fArchiveOutPtr(nullptr)
-		{
-			// Register slots here
-		}
-
-	KTSerialWriter::~KTSerialWriter()
-	{
-		//delete fStreamOutPtr;
-		//delete fArchiveOutPtr;
-	}
-
-	bool KTSerialWriter::Configure( const scarab::param_node* node )
-	{
-		if (node == NULL) return false;
-
-		SetFileName( node->get_value< std::string >( "file-name", fFileName ) );
-
-		*fStreamOutPtr = std::ofstream( fFileName );
-		cereal::JSONOutputArchive fStupid( *fStreamOutPtr );
-		fArchiveOutPtr = &fStupid;
-
-		return true;
-	}
-
-	template< class XDataType >
-	void KTSerialWriter::SlotFunction( const XDataType& data )
-	{
+    KTSerialWriter::KTSerialWriter( const std::string& name ) :
+        KTProcessor( name ),
+        fFileName( "placeholder.json" ),
+        fStreamOutPtr(nullptr),
+        fArchiveOutPtr(nullptr)
+        {
+            // Register slots here
+        }
+
+    KTSerialWriter::~KTSerialWriter()
+    {
+        //delete fStreamOutPtr;
+        //delete fArchiveOutPtr;
+    }
+
+    bool KTSerialWriter::Configure( const scarab::param_node* node )
+    {
+        if (node == NULL) return false;
+
+        SetFileName( node->get_value< std::string >( "file-name", fFileName ) );
+
+        *fStreamOutPtr = std::ofstream( fFileName );
+        cereal::JSONOutputArchive fStupid( *fStreamOutPtr );
+        fArchiveOutPtr = &fStupid;
+
+        return true;
+    }
+
+    template< class XDataType >
+    void KTSerialWriter::SlotFunction( const XDataType& data )
+    {
         // Write to JSON archive
         KTINFO( avlog_hh, "Writing data to JSON acrhive" );
         *fArchiveOutPtr( data );
 
         KTINFO( avlog_hh, "Successfully wrote data to archive" );
         return;
-	}
+    }
 }
diff --git a/Executables/Validation/KTSerialWriter.hh b/Executables/Validation/KTSerialWriter.hh
index 35d630c..971925c 100644
--- a/Executables/Validation/KTSerialWriter.hh
+++ b/Executables/Validation/KTSerialWriter.hh
@@ -1,8 +1,8 @@
 /*
- *	KTSerialWriter.hh
+ *  KTSerialWriter.hh
  *
- *	Created on: Feb 1, 2018
- *		Author: E Zayas
+ *  Created on: Feb 1, 2018
+ *      Author: E Zayas
  *
 */
 
@@ -18,65 +18,65 @@
 
 namespace Nymph
 {
-	class KTSerialWriter : public KTProcessor
-	{
-		public:
-			KTSerialWriter( const std::string& name = "serial-writer" );
-			virtual ~KTSerialWriter();
-
-		private:
-			std::string fFileName;
-			std::ofstream* fStreamOutPtr;
-			cereal::JSONOutputArchive* fArchiveOutPtr;
-
-		public:
-			bool Configure( const scarab::param_node* node );
-
-			std::string GetFileName() const;
-			void SetFileName( std::string file );
-
-			std::ofstream* GetStreamOutPtr() const;
-			void SetStreamOutPtr( std::ofstream stream );
-
-			cereal::JSONOutputArchive* GetArchiveOutPtr() const;
-			void SetArchiveOutPtr( cereal::JSONOutputArchive archive );
-
-			template< class XDataType >
-			void SlotFunction( const XDataType& data );
-	};
-
-	inline std::string KTSerialWriter::GetFileName() const
-	{
-		return fFileName;
-	}
-
-	inline void KTSerialWriter::SetFileName( std::string file )
-	{
-		fFileName = file;
-		return;
-	}
-
-	inline std::ofstream* KTSerialWriter::GetStreamOutPtr() const
-	{
-		return fStreamOutPtr;
-	}
-
-	inline void KTSerialWriter::SetStreamOutPtr( std::ofstream stream )
-	{
-		fStreamOutPtr = &stream;
-		return;
-	}
-
-	inline cereal::JSONOutputArchive* KTSerialWriter::GetArchiveOutPtr() const
-	{
-		return fArchiveOutPtr;
-	}
-
-	inline void KTSerialWriter::SetArchiveOutPtr( cereal::JSONOutputArchive archive )
-	{
-		fArchiveOutPtr = &archive;
-		return;
-	}
+    class KTSerialWriter : public KTProcessor
+    {
+        public:
+            KTSerialWriter( const std::string& name = "serial-writer" );
+            virtual ~KTSerialWriter();
+
+        private:
+            std::string fFileName;
+            std::ofstream* fStreamOutPtr;
+            cereal::JSONOutputArchive* fArchiveOutPtr;
+
+        public:
+            bool Configure( const scarab::param_node* node );
+
+            std::string GetFileName() const;
+            void SetFileName( std::string file );
+
+            std::ofstream* GetStreamOutPtr() const;
+            void SetStreamOutPtr( std::ofstream stream );
+
+            cereal::JSONOutputArchive* GetArchiveOutPtr() const;
+            void SetArchiveOutPtr( cereal::JSONOutputArchive archive );
+
+            template< class XDataType >
+            void SlotFunction( const XDataType& data );
+    };
+
+    inline std::string KTSerialWriter::GetFileName() const
+    {
+        return fFileName;
+    }
+
+    inline void KTSerialWriter::SetFileName( std::string file )
+    {
+        fFileName = file;
+        return;
+    }
+
+    inline std::ofstream* KTSerialWriter::GetStreamOutPtr() const
+    {
+        return fStreamOutPtr;
+    }
+
+    inline void KTSerialWriter::SetStreamOutPtr( std::ofstream stream )
+    {
+        fStreamOutPtr = &stream;
+        return;
+    }
+
+    inline cereal::JSONOutputArchive* KTSerialWriter::GetArchiveOutPtr() const
+    {
+        return fArchiveOutPtr;
+    }
+
+    inline void KTSerialWriter::SetArchiveOutPtr( cereal::JSONOutputArchive archive )
+    {
+        fArchiveOutPtr = &archive;
+        return;
+    }
 
 } // namespace Nymph
 

From e78b80be6e0bca20c0ea243f5410e1c2ad31c188 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Feb 2018 10:22:07 -0800
Subject: [PATCH 075/521] Added test json reader

---
 Executables/Validation/CMakeLists.txt  |  2 +
 Executables/Validation/KTJSONReader.cc | 37 ++++++++++++++++
 Executables/Validation/KTJSONReader.hh | 59 ++++++++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100644 Executables/Validation/KTJSONReader.cc
 create mode 100644 Executables/Validation/KTJSONReader.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 718fc89..5e4568f 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -13,6 +13,7 @@ if (Nymph_ENABLE_TESTING)
 
     # Headers for any test classes
     set (VALIDATION_HEADERFILES
+        kTJSONReader.hh
         KTTestConfigurable.hh
         KTTestCuts.hh
         KTTestData.hh
@@ -21,6 +22,7 @@ if (Nymph_ENABLE_TESTING)
     )
     
     set (VALIDATION_SOURCEFILES
+        KTJSONReader.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc
diff --git a/Executables/Validation/KTJSONReader.cc b/Executables/Validation/KTJSONReader.cc
new file mode 100644
index 0000000..e3449ca
--- /dev/null
+++ b/Executables/Validation/KTJSONReader.cc
@@ -0,0 +1,37 @@
+/*
+ * KTJSONReader.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N.S. Oblath
+ */
+
+// Data classes need to be included before the archive header
+#include "KTTestData.hh"
+
+#include "KTJSONReader.hh"
+
+
+namespace Nymph
+{
+
+    KTJSONReader::KTJSONReader() :
+            fFilename( "json-reader-default-file.json" ),
+            fStreamInPtr( nullptr ),
+            fArchiveInPtr( nullptr )
+    {
+    }
+
+    KTJSONReader::~KTJSONReader()
+    {
+        delete fArchiveInPtr;
+        delete fStreamInPtr;
+    }
+
+    bool KTJSONReader::Configure( const scarab::param_node& node )
+    {
+        SetFilename( node.get_value( "filename" , fFilename ));
+
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Executables/Validation/KTJSONReader.hh b/Executables/Validation/KTJSONReader.hh
new file mode 100644
index 0000000..6b5664b
--- /dev/null
+++ b/Executables/Validation/KTJSONReader.hh
@@ -0,0 +1,59 @@
+/*
+ * KTJSONReader.hh
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTJSONREADER_HH_
+#define NYMPH_KTJSONREADER_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTLogger.hh"
+
+#include "cereal/archives/json.hpp"
+
+
+KTLOGGER( jsrlog_hh, "KTJSONReader" )
+
+
+namespace Nymph
+{
+
+    class KTJSONReader : public KTProcessor
+    {
+        public:
+            KTJSONReader();
+            virtual ~KTJSONReader();
+
+            bool Configure( const scarab::param_node& node );
+
+            MEMBERVARIABLE( std::string, Filename );
+
+        private:
+            std::ifstream* fStreamInPtr;
+            cereal::JSONInputArchive* fArchiveInPtr;
+
+            template< class XDataType >
+            void ReadData( XDataType& data );
+    };
+
+    template< class XDataType >
+    void KTJSONReader::ReadData( XDataType& data )
+    {
+        if( fStreamInPtr == nullptr )
+        {
+            KTDEBUG( jsrlog_hh, "Creating stream and archive" );
+            fStreamInPtr = new std::ifstream( fFilename );
+            fArchiveInPtr = new cereal::JSONInputArchive( *fStreamInPtr );
+        }
+
+        *fArchiveInPtr( data );
+
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTJSONREADER_HH_ */

From 5858bdc4a46bc4948588c565fa0b60ede920bd45 Mon Sep 17 00:00:00 2001
From: Evan Zayas <ezayas@Evans-MacBook-Pro.local>
Date: Thu, 1 Feb 2018 13:32:50 -0500
Subject: [PATCH 076/521] some small refactoring and val script for serial
 writer

---
 Executables/Validation/CMakeLists.txt      |  1 +
 Executables/Validation/KTSerialWriter.cc   | 21 ++++++++-----
 Executables/Validation/KTSerialWriter.hh   |  8 +++--
 Executables/Validation/TestSerialWriter.cc | 34 ++++++++++++++++++++++
 4 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 Executables/Validation/TestSerialWriter.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 051e661..7323009 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -62,6 +62,7 @@ if (Nymph_ENABLE_TESTING)
         TestProcessorToolboxMultithreaded
         TestProcessorToolboxSinglethreaded
         TestSerialization
+        TestSerialWriter
         TestSignalsAndSlots
         TestSlotData
         TestThroughputProfiler
diff --git a/Executables/Validation/KTSerialWriter.cc b/Executables/Validation/KTSerialWriter.cc
index 53e96cd..638fe49 100644
--- a/Executables/Validation/KTSerialWriter.cc
+++ b/Executables/Validation/KTSerialWriter.cc
@@ -17,10 +17,11 @@ namespace Nymph
     KTSerialWriter::KTSerialWriter( const std::string& name ) :
         KTProcessor( name ),
         fFileName( "placeholder.json" ),
-        fStreamOutPtr(nullptr),
-        fArchiveOutPtr(nullptr)
+        fStreamOutPtr( nullptr ),
+        fArchiveOutPtr( nullptr )
         {
             // Register slots here
+            RegisterSlot( "test-data", this, &KTSerialWriter::SlotFunction< KTTestData > );
         }
 
     KTSerialWriter::~KTSerialWriter()
@@ -29,25 +30,29 @@ namespace Nymph
         //delete fArchiveOutPtr;
     }
 
-    bool KTSerialWriter::Configure( const scarab::param_node* node )
+    bool KTSerialWriter::Configure( const scarab::param_node& node )
     {
-        if (node == NULL) return false;
+        SetFileName( node.get_value< std::string >( "file-name", fFileName ) );
+        Initialize();
 
-        SetFileName( node->get_value< std::string >( "file-name", fFileName ) );
+        return true;
+    }
 
+    void KTSerialWriter::Initialize()
+    {
         *fStreamOutPtr = std::ofstream( fFileName );
         cereal::JSONOutputArchive fStupid( *fStreamOutPtr );
         fArchiveOutPtr = &fStupid;
 
-        return true;
+        return;
     }
 
     template< class XDataType >
-    void KTSerialWriter::SlotFunction( const XDataType& data )
+    void KTSerialWriter::SlotFunction( XDataType& data )
     {
         // Write to JSON archive
         KTINFO( avlog_hh, "Writing data to JSON acrhive" );
-        *fArchiveOutPtr( data );
+        (*fArchiveOutPtr)( data );
 
         KTINFO( avlog_hh, "Successfully wrote data to archive" );
         return;
diff --git a/Executables/Validation/KTSerialWriter.hh b/Executables/Validation/KTSerialWriter.hh
index 971925c..165acc1 100644
--- a/Executables/Validation/KTSerialWriter.hh
+++ b/Executables/Validation/KTSerialWriter.hh
@@ -13,6 +13,8 @@
 #include "KTProcessor.hh"
 #include "KTSlot.hh"
 
+#include "KTTestData.hh"
+
 #include "cereal/archives/json.hpp"
 #include <fstream>
 
@@ -30,7 +32,9 @@ namespace Nymph
             cereal::JSONOutputArchive* fArchiveOutPtr;
 
         public:
-            bool Configure( const scarab::param_node* node );
+            bool Configure( const scarab::param_node& node );
+
+            void Initialize();
 
             std::string GetFileName() const;
             void SetFileName( std::string file );
@@ -42,7 +46,7 @@ namespace Nymph
             void SetArchiveOutPtr( cereal::JSONOutputArchive archive );
 
             template< class XDataType >
-            void SlotFunction( const XDataType& data );
+            void SlotFunction( XDataType& data );
     };
 
     inline std::string KTSerialWriter::GetFileName() const
diff --git a/Executables/Validation/TestSerialWriter.cc b/Executables/Validation/TestSerialWriter.cc
new file mode 100644
index 0000000..b0046bf
--- /dev/null
+++ b/Executables/Validation/TestSerialWriter.cc
@@ -0,0 +1,34 @@
+/*
+ *	TestSerialWriter.cc
+ *
+ *	Created on: Feb 1, 2018
+ * 		Author: E Zayas
+ *
+*/
+
+#include "KTLogger.hh"
+#include "KTSerialWriter.hh"
+#include "KTTestData.hh" 
+
+LOGGER( testlog, "TestSerialWriter" );
+
+using namespace Nymph;
+
+int main()
+{
+	// Create the test data
+	KTTestData testData;
+	testData.SetIsAwesome( true ); // because it isn't by default :(
+
+	KTINFO( testlog, "KTTestData is awesome? " << testData.GetIsAwesome() );
+
+	// Create the writer
+	KTSerialWriter writer;
+	writer.SetFileName( "test_serial_writer_output.json" );
+	writer.Initialize();
+
+	writer.SlotFunction< KTTestData >( testData );
+
+	KTINFO( testlog, "Validation script concluded" );
+	return 0;
+}

From ead66638b444e6ac5dc8970dc71f165df133a462 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Thu, 1 Feb 2018 20:01:08 +0100
Subject: [PATCH 077/521] made KTWrapProcessor and try to bind it with pybind.
 status: it builds

---
 Executables/Validation/KTPyTestClassPybind.hh | 29 +++++++++++-
 Executables/Validation/KTTestProcessor.cc     | 31 +++++++++++++
 Executables/Validation/KTTestProcessor.hh     | 44 +++++++++++++++++++
 .../Validation/TestProcessorToolbox.py        |  2 +
 4 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
index bda9d69..718b6c0 100644
--- a/Executables/Validation/KTPyTestClassPybind.hh
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -6,6 +6,7 @@
  */
 
 #include "KTPyTestClass.hh"
+#include "KTTestProcessor.hh"
 
 #include "pybind11/pybind11.h"
 
@@ -20,6 +21,32 @@ namespace Nymph
                 .def( "GetValue", &Nymph::KTPyTestClass::GetValue )
                 .def( "SetValue", &Nymph::KTPyTestClass::SetValue )
                 ;
-    }
+    };
+
+	class KTPyWrapProcessor: public KTWrapProcessor
+	{
+		public:
+			// Inherit the constructors
+			using KTWrapProcessor::KTWrapProcessor;
+
+			// Trampoline (need one for each virtual function)
+			void WrapFunction(int input) override {
+				PYBIND11_OVERLOAD_PURE(
+						void, // Return type
+						KTWrapProcessor,      // Parent class
+						WrapFunction,          // Name of function in C++ (must match Python name)
+						input      // Argument(s)
+						);
+				}
+	};
+
+    PYBIND11_MODULE(pywrapper, m) {
+    	pybind11::class_<KTWrapProcessor, KTPyWrapProcessor> pythonwrap(m, "PythonWrap");
+        pythonwrap
+    		.def(pybind11::init<>())
+			.def("WrapFunction", &KTWrapProcessor::WrapFunction);
+	};
+
+
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index f045160..c9521fe 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -180,4 +180,35 @@ namespace Nymph
         return;
     }
 
+    KT_REGISTER_PROCESSOR(KTWrapProcessor, "test-proc-python-wrap");
+
+    KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
+            KTProcessor( name ),
+            fSlot("wrap-slot", this, &KTWrapProcessor::SlotFunc)
+
+    {
+    }
+
+    KTWrapProcessor::~KTWrapProcessor()
+    {
+    }
+
+    bool KTWrapProcessor::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTWrapProcessor::SlotFunc(int input)
+    {
+        KTINFO(testsiglog, "Calling wrap function ");
+        this->WrapFunction(input);
+        return;
+    }
+
+    void KTWrapProcessor::WrapFunction(int input)
+    {
+        KTINFO(testsiglog, "Hey, I'm base class");
+        return;
+    }
+
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 8dace64..2bc3aee 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -10,6 +10,10 @@
 
 #include "KTProcessor.hh"
 #include "KTSlot.hh"
+//#include "pybind11/pybind11.h"
+
+
+//using namespace py;
 
 #include "KTTestData.hh"
 
@@ -126,5 +130,45 @@ namespace Nymph
             KTSignalData fDerived2DataSignal;
     };
 
+
+    class KTWrapProcessor : public KTProcessor
+    {
+        public:
+            KTWrapProcessor( const std::string& name = "base-wrap-processor" );
+            virtual ~KTWrapProcessor();
+
+            bool Configure(const scarab::param_node& node);
+
+            void SlotFunc(int);
+            virtual void WrapFunction(int input);
+
+        private:
+            KTSlot< int > fSlot;
+
+    };
+
+/*    PYBIND11_MODULE(pywrapper, m) {
+        pybind11::class_<KTWrapProcessor, KTPyWrapProcessor> pythonwrap(m, "PythonWrap");
+        pythonwrap
+			.def(py::init<>())
+            .def("WrapFunction", &KTWrapProcessor::WrapFunction);
+    }
+
+    class KTPyWrapProcessor: public KTWrapProcessor
+    {
+    	public:
+    		// Inherit the constructors
+			using KTWrapProcessor::KTWrapProcessor;
+
+			// Trampoline (need one for each virtual function)
+			void WrapFunction(int input) override {
+				PYBIND11_OVERLOAD_PURE(
+						void, // Return type
+						KTWrapProcessor,      // Parent class
+						WrapFunction,          // Name of function in C++ (must match Python name)
+						input      // Argument(s)
+						);
+				}
+    };*/
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/TestProcessorToolbox.py b/Executables/Validation/TestProcessorToolbox.py
index e2c4bb5..0538ee9 100644
--- a/Executables/Validation/TestProcessorToolbox.py
+++ b/Executables/Validation/TestProcessorToolbox.py
@@ -14,6 +14,8 @@
 ptb.AddProcessor('test-p-proc', 'tpp')
 ptb.AddProcessor('test-proc-b', 'tp')
 ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.AddProcessor('test-proc-python-wrap', 'pw')
+ptb.MakeConnection('tpp:the-signal', 'pw:wrap-slot')
 ptb.PushBackToRunQueue('tpp')
 
 print('Running')

From 3d6c8fc36c8596f5923297794eabfeeea8f7715e Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Feb 2018 11:35:08 -0800
Subject: [PATCH 078/521] Moved serial writer to json writer and fixed some
 things

---
 Executables/Validation/KTJSONReader.cc   |  5 +-
 Executables/Validation/KTJSONReader.hh   | 11 ++--
 Executables/Validation/KTJSONWriter.cc   | 42 +++----------
 Executables/Validation/KTJSONWriter.hh   | 80 +++++++++---------------
 Executables/Validation/TestJSONWriter.cc | 45 +++++++++----
 5 files changed, 82 insertions(+), 101 deletions(-)

diff --git a/Executables/Validation/KTJSONReader.cc b/Executables/Validation/KTJSONReader.cc
index e3449ca..126bb07 100644
--- a/Executables/Validation/KTJSONReader.cc
+++ b/Executables/Validation/KTJSONReader.cc
@@ -14,8 +14,9 @@
 namespace Nymph
 {
 
-    KTJSONReader::KTJSONReader() :
-            fFilename( "json-reader-default-file.json" ),
+    KTJSONReader::KTJSONReader( const std::string& name) :
+            KTProcessor( name ),
+            fFilename( "json_reader_default_file.json" ),
             fStreamInPtr( nullptr ),
             fArchiveInPtr( nullptr )
     {
diff --git a/Executables/Validation/KTJSONReader.hh b/Executables/Validation/KTJSONReader.hh
index 6b5664b..ca6506d 100644
--- a/Executables/Validation/KTJSONReader.hh
+++ b/Executables/Validation/KTJSONReader.hh
@@ -24,19 +24,21 @@ namespace Nymph
     class KTJSONReader : public KTProcessor
     {
         public:
-            KTJSONReader();
+            KTJSONReader( const std::string& name = "json-reader" );
             virtual ~KTJSONReader();
 
             bool Configure( const scarab::param_node& node );
 
             MEMBERVARIABLE( std::string, Filename );
 
+        public:
+            template< class XDataType >
+            void ReadData( XDataType& data );
+
         private:
             std::ifstream* fStreamInPtr;
             cereal::JSONInputArchive* fArchiveInPtr;
 
-            template< class XDataType >
-            void ReadData( XDataType& data );
     };
 
     template< class XDataType >
@@ -49,7 +51,8 @@ namespace Nymph
             fArchiveInPtr = new cereal::JSONInputArchive( *fStreamInPtr );
         }
 
-        *fArchiveInPtr( data );
+        KTDEBUG( jsrlog_hh, "Reading an object from JSON" );
+        (*fArchiveInPtr)( data );
 
         return;
     }
diff --git a/Executables/Validation/KTJSONWriter.cc b/Executables/Validation/KTJSONWriter.cc
index 638fe49..23bac0a 100644
--- a/Executables/Validation/KTJSONWriter.cc
+++ b/Executables/Validation/KTJSONWriter.cc
@@ -1,60 +1,38 @@
 /*
- *  KTSerialWriter.cc
+ *  KTJSONWriter.cc
  *
  *  Created on: Feb 1, 2018
  *      Author: E Zayas
  *
 */
 
-#include "KTSerialWriter.hh"
-
+#include "KTJSONWriter.hh"
 #include "KTLogger.hh"
 
-LOGGER( avlog_hh, "KTSerialWriter" );
 
 namespace Nymph
 {
-    KTSerialWriter::KTSerialWriter( const std::string& name ) :
+    KTJSONWriter::KTJSONWriter( const std::string& name ) :
         KTProcessor( name ),
-        fFileName( "placeholder.json" ),
+        fFilename( "json_writer_default_file.json" ),
         fStreamOutPtr( nullptr ),
         fArchiveOutPtr( nullptr )
         {
             // Register slots here
-            RegisterSlot( "test-data", this, &KTSerialWriter::SlotFunction< KTTestData > );
+            RegisterSlot( "test-data", this, &KTJSONWriter::WriteData< KTTestData > );
         }
 
-    KTSerialWriter::~KTSerialWriter()
+    KTJSONWriter::~KTJSONWriter()
     {
-        //delete fStreamOutPtr;
-        //delete fArchiveOutPtr;
+        delete fStreamOutPtr;
+        delete fArchiveOutPtr;
     }
 
-    bool KTSerialWriter::Configure( const scarab::param_node& node )
+    bool KTJSONWriter::Configure( const scarab::param_node& node )
     {
-        SetFileName( node.get_value< std::string >( "file-name", fFileName ) );
-        Initialize();
+        SetFilename( node.get_value( "file-name", fFilename ) );
 
         return true;
     }
 
-    void KTSerialWriter::Initialize()
-    {
-        *fStreamOutPtr = std::ofstream( fFileName );
-        cereal::JSONOutputArchive fStupid( *fStreamOutPtr );
-        fArchiveOutPtr = &fStupid;
-
-        return;
-    }
-
-    template< class XDataType >
-    void KTSerialWriter::SlotFunction( XDataType& data )
-    {
-        // Write to JSON archive
-        KTINFO( avlog_hh, "Writing data to JSON acrhive" );
-        (*fArchiveOutPtr)( data );
-
-        KTINFO( avlog_hh, "Successfully wrote data to archive" );
-        return;
-    }
 }
diff --git a/Executables/Validation/KTJSONWriter.hh b/Executables/Validation/KTJSONWriter.hh
index 165acc1..6dad8e9 100644
--- a/Executables/Validation/KTJSONWriter.hh
+++ b/Executables/Validation/KTJSONWriter.hh
@@ -1,13 +1,13 @@
 /*
- *  KTSerialWriter.hh
+ *  KTJSONWriter.hh
  *
  *  Created on: Feb 1, 2018
  *      Author: E Zayas
  *
 */
 
-#ifndef KTSERIALWRITER_HH_
-#define KTSERIALWRITER_HH_
+#ifndef KTJSONWRITER_HH_
+#define KTJSONWRITER_HH_
 
 #include "KTData.hh"
 #include "KTProcessor.hh"
@@ -15,73 +15,53 @@
 
 #include "KTTestData.hh"
 
+#include "KTLogger.hh"
+
 #include "cereal/archives/json.hpp"
+
 #include <fstream>
 
+KTLOGGER( avlog_hh, "KTJSONWriter" );
+
 namespace Nymph
 {
-    class KTSerialWriter : public KTProcessor
+    class KTJSONWriter : public KTProcessor
     {
         public:
-            KTSerialWriter( const std::string& name = "serial-writer" );
-            virtual ~KTSerialWriter();
-
-        private:
-            std::string fFileName;
-            std::ofstream* fStreamOutPtr;
-            cereal::JSONOutputArchive* fArchiveOutPtr;
+            KTJSONWriter( const std::string& name = "serial-writer" );
+            virtual ~KTJSONWriter();
 
-        public:
             bool Configure( const scarab::param_node& node );
 
-            void Initialize();
-
-            std::string GetFileName() const;
-            void SetFileName( std::string file );
-
-            std::ofstream* GetStreamOutPtr() const;
-            void SetStreamOutPtr( std::ofstream stream );
-
-            cereal::JSONOutputArchive* GetArchiveOutPtr() const;
-            void SetArchiveOutPtr( cereal::JSONOutputArchive archive );
+            MEMBERVARIABLE( std::string, Filename );
 
+        public:
             template< class XDataType >
-            void SlotFunction( XDataType& data );
-    };
-
-    inline std::string KTSerialWriter::GetFileName() const
-    {
-        return fFileName;
-    }
+            void WriteData( XDataType& data );
 
-    inline void KTSerialWriter::SetFileName( std::string file )
-    {
-        fFileName = file;
-        return;
-    }
+        private:
+            std::ofstream* fStreamOutPtr;
+            cereal::JSONOutputArchive* fArchiveOutPtr;
 
-    inline std::ofstream* KTSerialWriter::GetStreamOutPtr() const
-    {
-        return fStreamOutPtr;
-    }
+    };
 
-    inline void KTSerialWriter::SetStreamOutPtr( std::ofstream stream )
+    template< class XDataType >
+    void KTJSONWriter::WriteData( XDataType& data )
     {
-        fStreamOutPtr = &stream;
-        return;
-    }
+        if( fStreamOutPtr == nullptr )
+        {
+            fStreamOutPtr = new std::ofstream( fFilename );
+            fArchiveOutPtr = new cereal::JSONOutputArchive( *fStreamOutPtr );
+        }
 
-    inline cereal::JSONOutputArchive* KTSerialWriter::GetArchiveOutPtr() const
-    {
-        return fArchiveOutPtr;
-    }
+        // Write to JSON archive
+        KTINFO( avlog_hh, "Writing data to JSON acrhive" );
+        (*fArchiveOutPtr)( data );
 
-    inline void KTSerialWriter::SetArchiveOutPtr( cereal::JSONOutputArchive archive )
-    {
-        fArchiveOutPtr = &archive;
+        KTINFO( avlog_hh, "Successfully wrote data to archive" );
         return;
     }
 
 } // namespace Nymph
 
-#endif // KTSERIALWRITER_HH_
+#endif // KTJSONWRITER_HH_
diff --git a/Executables/Validation/TestJSONWriter.cc b/Executables/Validation/TestJSONWriter.cc
index b0046bf..c6320f0 100644
--- a/Executables/Validation/TestJSONWriter.cc
+++ b/Executables/Validation/TestJSONWriter.cc
@@ -6,29 +6,48 @@
  *
 */
 
-#include "KTLogger.hh"
-#include "KTSerialWriter.hh"
+#include "KTJSONWriter.hh"
+#include "KTJSONReader.hh"
+
 #include "KTTestData.hh" 
 
-LOGGER( testlog, "TestSerialWriter" );
+KTLOGGER( testlog, "TestJSONWriter" );
 
 using namespace Nymph;
 
 int main()
 {
-	// Create the test data
-	KTTestData testData;
-	testData.SetIsAwesome( true ); // because it isn't by default :(
+    std::string filename( "test_json_writer_output.json" );
+
+    {
+        // Create the test data
+        KTTestData testData;
+        testData.SetIsAwesome( true ); // because it isn't by default :(
+
+        KTINFO( testlog, "KTTestData is awesome? " << testData.GetIsAwesome() );
+
+        // Create the writer
+        KTJSONWriter writer;
+        writer.SetFilename( filename );
+
+        KTINFO( testlog, "Writing data" );
+
+        writer.WriteData< KTTestData >( testData );
+
+        // destruction of the stream and archive (in the writer's destructor) properly closes the file
+    }
+
+    {
+        KTTestData newTestData;
 
-	KTINFO( testlog, "KTTestData is awesome? " << testData.GetIsAwesome() );
+        KTJSONReader reader;
+        reader.SetFilename( filename );
 
-	// Create the writer
-	KTSerialWriter writer;
-	writer.SetFileName( "test_serial_writer_output.json" );
-	writer.Initialize();
+        reader.ReadData< KTTestData >( newTestData );
 
-	writer.SlotFunction< KTTestData >( testData );
+        KTINFO( testlog, "Is the read data awesome? " << newTestData.GetIsAwesome() );
+    }
 
-	KTINFO( testlog, "Validation script concluded" );
+    KTINFO( testlog, "Validation script concluded" );
 	return 0;
 }

From faf7f646f5947f5e1a6ac7552b51d936d98608f9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Feb 2018 11:37:37 -0800
Subject: [PATCH 079/521] Correct deletion order

---
 Executables/Validation/KTJSONReader.cc | 1 +
 Executables/Validation/KTJSONWriter.cc | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Executables/Validation/KTJSONReader.cc b/Executables/Validation/KTJSONReader.cc
index 126bb07..2da348b 100644
--- a/Executables/Validation/KTJSONReader.cc
+++ b/Executables/Validation/KTJSONReader.cc
@@ -24,6 +24,7 @@ namespace Nymph
 
     KTJSONReader::~KTJSONReader()
     {
+        // archive must be delete before the stream!
         delete fArchiveInPtr;
         delete fStreamInPtr;
     }
diff --git a/Executables/Validation/KTJSONWriter.cc b/Executables/Validation/KTJSONWriter.cc
index 23bac0a..7272c49 100644
--- a/Executables/Validation/KTJSONWriter.cc
+++ b/Executables/Validation/KTJSONWriter.cc
@@ -24,8 +24,9 @@ namespace Nymph
 
     KTJSONWriter::~KTJSONWriter()
     {
-        delete fStreamOutPtr;
+        // archive must be delete before the stream!
         delete fArchiveOutPtr;
+        delete fStreamOutPtr;
     }
 
     bool KTJSONWriter::Configure( const scarab::param_node& node )

From 41796a16491ee384213333f44193ee378a13d71c Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Thu, 1 Feb 2018 20:59:18 +0100
Subject: [PATCH 080/521] made the new processor part of the
 py_nymph_validation module

---
 Executables/Validation/KTPyTestClassPybind.hh |  8 -------
 Executables/Validation/KTTestProcessor.hh     | 23 -------------------
 .../Validation/NymphValidationPybind.cc       |  7 +++++-
 .../Validation/TestProcessorToolbox.py        |  2 --
 Executables/Validation/TestWrapProcessor.py   |  9 ++++++++
 5 files changed, 15 insertions(+), 34 deletions(-)
 create mode 100644 Executables/Validation/TestWrapProcessor.py

diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
index 718b6c0..6057a0e 100644
--- a/Executables/Validation/KTPyTestClassPybind.hh
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -40,13 +40,5 @@ namespace Nymph
 				}
 	};
 
-    PYBIND11_MODULE(pywrapper, m) {
-    	pybind11::class_<KTWrapProcessor, KTPyWrapProcessor> pythonwrap(m, "PythonWrap");
-        pythonwrap
-    		.def(pybind11::init<>())
-			.def("WrapFunction", &KTWrapProcessor::WrapFunction);
-	};
-
-
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 2bc3aee..e6108f1 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -147,28 +147,5 @@ namespace Nymph
 
     };
 
-/*    PYBIND11_MODULE(pywrapper, m) {
-        pybind11::class_<KTWrapProcessor, KTPyWrapProcessor> pythonwrap(m, "PythonWrap");
-        pythonwrap
-			.def(py::init<>())
-            .def("WrapFunction", &KTWrapProcessor::WrapFunction);
-    }
-
-    class KTPyWrapProcessor: public KTWrapProcessor
-    {
-    	public:
-    		// Inherit the constructors
-			using KTWrapProcessor::KTWrapProcessor;
-
-			// Trampoline (need one for each virtual function)
-			void WrapFunction(int input) override {
-				PYBIND11_OVERLOAD_PURE(
-						void, // Return type
-						KTWrapProcessor,      // Parent class
-						WrapFunction,          // Name of function in C++ (must match Python name)
-						input      // Argument(s)
-						);
-				}
-    };*/
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/NymphValidationPybind.cc b/Executables/Validation/NymphValidationPybind.cc
index 0f2bad2..60cc171 100644
--- a/Executables/Validation/NymphValidationPybind.cc
+++ b/Executables/Validation/NymphValidationPybind.cc
@@ -7,12 +7,17 @@
 
 #include "KTPyTestClassPybind.hh"
 #include "TestPythonBasics.hh"
+#include "pybind11/pybind11.h"
 
 PYBIND11_MODULE( py_nymph_validation, mod )
 {
     Nymph::ExportKTPyTestClass( mod );
     Nymph::ExportTestPythonBasics( mod );
-}
 
+    pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
+        wrap_processor
+    		.def(pybind11::init<>())
+    		.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction);
+}
 
 
diff --git a/Executables/Validation/TestProcessorToolbox.py b/Executables/Validation/TestProcessorToolbox.py
index 0538ee9..e2c4bb5 100644
--- a/Executables/Validation/TestProcessorToolbox.py
+++ b/Executables/Validation/TestProcessorToolbox.py
@@ -14,8 +14,6 @@
 ptb.AddProcessor('test-p-proc', 'tpp')
 ptb.AddProcessor('test-proc-b', 'tp')
 ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
-ptb.AddProcessor('test-proc-python-wrap', 'pw')
-ptb.MakeConnection('tpp:the-signal', 'pw:wrap-slot')
 ptb.PushBackToRunQueue('tpp')
 
 print('Running')
diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
new file mode 100644
index 0000000..81a6d22
--- /dev/null
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -0,0 +1,9 @@
+# TestWrapProcessor.py
+#  Created on: Feb 1, 2018
+#      Author: C. Claessens
+#
+#  Tests the ability to overwrite processor functions
+
+import py_nymph as nymph
+import py_nymph_validation as nv
+print(dir(nv))
\ No newline at end of file

From d974b7b751c6f4dad1af07589caeb575e7d8a608 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Thu, 1 Feb 2018 22:01:40 +0100
Subject: [PATCH 081/521] Configure of KTWrapProcessor is overwritable in
 python, but still has a default implementation.

---
 Executables/Validation/KTPyTestClassPybind.hh | 10 ++++++-
 Executables/Validation/KTTestProcessor.cc     |  2 +-
 Executables/Validation/KTTestProcessor.hh     |  2 +-
 .../Validation/NymphValidationPybind.cc       |  3 +-
 .../Validation/TestProcessorToolbox.py        | 15 +++++++++-
 Executables/Validation/TestWrapProcessor.py   | 29 ++++++++++++++++++-
 6 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
index 6057a0e..db3e5b6 100644
--- a/Executables/Validation/KTPyTestClassPybind.hh
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -37,7 +37,15 @@ namespace Nymph
 						WrapFunction,          // Name of function in C++ (must match Python name)
 						input      // Argument(s)
 						);
-				}
+			}
+			bool Configure(const scarab::param_node& node) override {
+							PYBIND11_OVERLOAD(
+									bool, // Return type
+									KTWrapProcessor,      // Parent class
+									Configure,          // Name of function in C++ (must match Python name)
+									node      // Argument(s)
+									);
+			}
 	};
 
 
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index c9521fe..65bccd0 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -180,7 +180,7 @@ namespace Nymph
         return;
     }
 
-    KT_REGISTER_PROCESSOR(KTWrapProcessor, "test-proc-python-wrap");
+    KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
 
     KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
             KTProcessor( name ),
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index e6108f1..4ba76d5 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -134,7 +134,7 @@ namespace Nymph
     class KTWrapProcessor : public KTProcessor
     {
         public:
-            KTWrapProcessor( const std::string& name = "base-wrap-processor" );
+            KTWrapProcessor( const std::string& name = "base-wrap-proc" );
             virtual ~KTWrapProcessor();
 
             bool Configure(const scarab::param_node& node);
diff --git a/Executables/Validation/NymphValidationPybind.cc b/Executables/Validation/NymphValidationPybind.cc
index 60cc171..657eb48 100644
--- a/Executables/Validation/NymphValidationPybind.cc
+++ b/Executables/Validation/NymphValidationPybind.cc
@@ -17,7 +17,8 @@ PYBIND11_MODULE( py_nymph_validation, mod )
     pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
         wrap_processor
     		.def(pybind11::init<>())
-    		.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction);
+    		.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
+        	.def("Configure", &Nymph::KTWrapProcessor::Configure);
 }
 
 
diff --git a/Executables/Validation/TestProcessorToolbox.py b/Executables/Validation/TestProcessorToolbox.py
index e2c4bb5..31868de 100644
--- a/Executables/Validation/TestProcessorToolbox.py
+++ b/Executables/Validation/TestProcessorToolbox.py
@@ -7,13 +7,26 @@
 import py_nymph as nymph
 import py_nymph_validation as nv
 
+class WrappedProcessor(nv.WrapProcessor):
+    pass
+
 ptb = nymph.KTProcessorToolbox('pt')
 
 print('Configuring')
 
 ptb.AddProcessor('test-p-proc', 'tpp')
 ptb.AddProcessor('test-proc-b', 'tp')
-ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.AddProcessor('base-wrap-proc', 'bwp')
+
+
+
+#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
+
+p = WrappedProcessor()
+p.WrapFunction = lambda x: print("Hey, I'm python")
+
 ptb.PushBackToRunQueue('tpp')
 
 print('Running')
diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
index 81a6d22..82e1778 100644
--- a/Executables/Validation/TestWrapProcessor.py
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -6,4 +6,31 @@
 
 import py_nymph as nymph
 import py_nymph_validation as nv
-print(dir(nv))
\ No newline at end of file
+
+class WrappedProcessor(nv.WrapProcessor):
+    pass
+
+ptb = nymph.KTProcessorToolbox('pt')
+
+print('Configuring')
+
+ptb.AddProcessor('test-p-proc', 'tpp')
+ptb.AddProcessor('test-proc-b', 'tp')
+ptb.AddProcessor('base-wrap-proc', 'bwp')
+
+
+
+#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
+
+p = WrappedProcessor()
+p.WrapFunction = lambda x: print("Hey, I'm python")
+
+ptb.PushBackToRunQueue('tpp')
+
+print('Running')
+
+ptb.Run()
+
+print('All done')
\ No newline at end of file

From 2b99fc9a3d0340087950c1a4ebda6b6a749d6471 Mon Sep 17 00:00:00 2001
From: Evan Zayas <ezayas@Evans-MacBook-Pro.local>
Date: Thu, 1 Feb 2018 16:20:13 -0500
Subject: [PATCH 082/521] I did something idk

---
 Library/Data/KTData.hh                | 18 +++++++++---------
 Library/Utility/KTExtensibleStruct.hh | 20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index f1aa67d..d15673f 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -41,19 +41,19 @@ namespace Nymph
             virtual ~KTDataRider();
 
             MEMBERVARIABLE_REF( std::string, Name );
-/*
-        private:
-            friend class cereal::access;
 
+        private:
             template< class Archive >
-            void serialize( Archive& ar )
-            {
-                std::cout << "### serialize for KTDataRider" << std::endl;
-                ar( fName );
-            }
-*/
+            void serialize( Archive& ar );
     };
 
+    template< class Archive >
+    void KTDataRider::serialize( Archive& ar )
+    {
+            std::cout << "### serialize for KTDataRider" << std::endl;
+            ar( fName );
+    }
+
     template< class XDerivedType >
     class KTExtensibleDataRider : public KTExtensibleStruct< XDerivedType, KTDataRider >
     {
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index 557f83d..4fc78e4 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -9,6 +9,8 @@
 #ifndef KTEXTENSIBLESTRUCT_HH_
 #define KTEXTENSIBLESTRUCT_HH_
 
+#include <cereal/types/polymorphic.hpp>
+
 namespace Nymph
 {
 
@@ -55,6 +57,12 @@ namespace Nymph
             void SetPrevPtrInNext();
             mutable KTExtensibleStructCore* fNext;
             mutable KTExtensibleStructCore* fPrev;
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
     };
 
 
@@ -231,6 +239,18 @@ namespace Nymph
         return;
     }
 
+    template< class XBaseType >
+    template< class Archive >
+    void KTExtensibleStructCore<XBaseType>::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
+        ar( this );
+
+        if( fNext == 0 ){ return; }
+        
+        // archive pointer ( fNext )?
+    }
+
 
 
     template<class XInstanceType, class XBaseType>

From 6f7f1c5c51e445294544a76b8fa463cfa90d2dfc Mon Sep 17 00:00:00 2001
From: Evan Zayas <ezayas@Evans-MacBook-Pro.local>
Date: Thu, 1 Feb 2018 16:47:54 -0500
Subject: [PATCH 083/521] hmmm

---
 Library/Data/KTData.hh                |  2 ++
 Library/Utility/KTExtensibleStruct.hh | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index d15673f..330e840 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -43,6 +43,8 @@ namespace Nymph
             MEMBERVARIABLE_REF( std::string, Name );
 
         private:
+            friend class cereal::access;
+
             template< class Archive >
             void serialize( Archive& ar );
     };
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index 4fc78e4..fae2704 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -85,6 +85,9 @@ namespace Nymph
             void SetIsCopyDisabled(bool flag);
         private:
             bool fIsCopyDisabled;
+
+            template< class Archive >
+            void serialize( Archive& ar );
     };
 
 
@@ -253,6 +256,16 @@ namespace Nymph
 
 
 
+    template< class XInstanceType, class XBaseType >
+    template< class Archive >
+    void KTExtensibleStruct<XInstanceType, XBaseType>::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
+        ar( cereal::base_class< KTExtensibleStructCore< XBaseType > >( this ), fIsCopyDisabled );
+
+        return;
+    }
+
     template<class XInstanceType, class XBaseType>
     KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct(void)
     {

From 0d10512a2b7844baabab1b11d8a0ea89a780cc20 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Thu, 1 Feb 2018 22:50:02 +0100
Subject: [PATCH 084/521] swapped KTProcessor* by std::shared_ptr< KTProcessor
 > in KTProcessorToolbox

---
 Library/Application/KTProcessorToolbox.cc | 42 +++++++++++------------
 Library/Application/KTProcessorToolbox.hh | 11 +++---
 Library/Processor/KTProcessor.hh          |  1 +
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index 2d94c57..f1589a3 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -91,7 +91,7 @@ namespace Nymph
                 {
                     procName = procNode->get_value("name");
                 }
-                KTProcessor* newProc = fProcFactory->create(procType, procType);
+                std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
                 if (newProc == NULL)
                 {
                     KTERROR(proclog, "Unable to create processor of type <" << procType << ">");
@@ -101,7 +101,7 @@ namespace Nymph
                 if (! AddProcessor(procName, newProc))
                 {
                     KTERROR(proclog, "Unable to add processor <" << procName << ">");
-                    delete newProc;
+                    //delete newProc; //not required for smart pointers
                     return false;
                 }
             }
@@ -265,7 +265,7 @@ namespace Nymph
         return ConfigureProcessors( translator.read_string( config, &optNode )->as_node() );
     }
 
-    KTProcessor* KTProcessorToolbox::GetProcessor(const std::string& procName)
+    std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName)
     {
         ProcMapIt it = fProcMap.find(procName);
         if (it == fProcMap.end())
@@ -276,7 +276,7 @@ namespace Nymph
         return it->second.fProc;
     }
 
-    const KTProcessor* KTProcessorToolbox::GetProcessor(const std::string& procName) const
+    const std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName) const
     {
         ProcMapCIt it = fProcMap.find(procName);
         if (it == fProcMap.end())
@@ -287,7 +287,7 @@ namespace Nymph
         return it->second.fProc;
     }
 
-    bool KTProcessorToolbox::AddProcessor(const std::string& procName, KTProcessor* proc)
+    bool KTProcessorToolbox::AddProcessor(const std::string& procName, std::shared_ptr< KTProcessor > proc)
     {
         ProcMapIt it = fProcMap.find(procName);
         if (it == fProcMap.end())
@@ -307,7 +307,7 @@ namespace Nymph
         ProcMapIt it = fProcMap.find(procName);
         if (it == fProcMap.end())
         {
-            KTProcessor* newProc = fProcFactory->create(procType, procType);
+            std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
             if (newProc == NULL)
             {
                 KTERROR(proclog, "Unable to create processor of type <" << procType << ">");
@@ -316,7 +316,7 @@ namespace Nymph
             if (! AddProcessor(procName, newProc))
             {
                 KTERROR(proclog, "Unable to add processor <" << procName << ">");
-                delete newProc;
+                //delete newProc;
                 return false;
             }
             return true;
@@ -327,17 +327,17 @@ namespace Nymph
 
     bool KTProcessorToolbox::RemoveProcessor(const std::string& procName)
     {
-        KTProcessor* procToRemove = ReleaseProcessor(procName);
+        std::shared_ptr< KTProcessor > procToRemove = ReleaseProcessor(procName);
         if (procToRemove == NULL)
         {
             return false;
         }
-        delete procToRemove;
+        //delete procToRemove;
         KTDEBUG(proclog, "Processor <" << procName << "> deleted.");
         return true;
     }
 
-    KTProcessor* KTProcessorToolbox::ReleaseProcessor(const std::string& procName)
+    std::shared_ptr< KTProcessor > KTProcessorToolbox::ReleaseProcessor(const std::string& procName)
     {
         ProcMapIt it = fProcMap.find(procName);
         if (it == fProcMap.end())
@@ -345,17 +345,17 @@ namespace Nymph
             KTWARN(proclog, "Processor <" << procName << "> was not found.");
             return NULL;
         }
-        KTProcessor* procToRelease = it->second.fProc;
+        std::shared_ptr< KTProcessor > procToRelease = it->second.fProc;
         fProcMap.erase(it);
         return procToRelease;
     }
 
     void KTProcessorToolbox::ClearProcessors()
     {
-        for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
+        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
         {
             delete it->second.fProc;
-        }
+        }*/ //not required for smart pointers
         fProcMap.clear();
         fRunQueue.clear();
         return;
@@ -383,14 +383,14 @@ namespace Nymph
 
     bool KTProcessorToolbox::MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order)
     {
-        KTProcessor* signalProc = GetProcessor(signalProcName);
+        std::shared_ptr< KTProcessor > signalProc = GetProcessor(signalProcName);
         if (signalProc == NULL)
         {
             KTERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
             return false;
         }
 
-        KTProcessor* slotProc = GetProcessor(slotProcName);
+        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
         if (slotProc == NULL)
         {
             KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
@@ -401,11 +401,11 @@ namespace Nymph
         {
             if (order != std::numeric_limits< int >::min())
             {
-                signalProc->ConnectASlot(signalName, slotProc, slotName, order);
+                signalProc->ConnectASlot(signalName, slotProc.get(), slotName, order);
             }
             else
             {
-                signalProc->ConnectASlot(signalName, slotProc, slotName);
+                signalProc->ConnectASlot(signalName, slotProc.get(), slotName);
             }
         }
         catch (boost::exception& e)
@@ -434,7 +434,7 @@ namespace Nymph
 
     bool KTProcessorToolbox::SetBreakpoint(const std::string& slotProcName, const std::string& slotName)
     {
-        KTProcessor* slotProc = GetProcessor(slotProcName);
+        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
         if (slotProc == NULL)
         {
             KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
@@ -467,7 +467,7 @@ namespace Nymph
 
     bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName)
     {
-        KTProcessor* slotProc = GetProcessor(slotProcName);
+        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
         if (slotProc == NULL)
         {
             KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
@@ -545,7 +545,7 @@ namespace Nymph
 
     bool KTProcessorToolbox::AddProcessorToThreadGroup(const std::string& name, ThreadGroup& group)
     {
-        KTProcessor* procForRunQueue = GetProcessor(name);
+        std::shared_ptr< KTProcessor > procForRunQueue = GetProcessor(name);
         KTDEBUG(proclog, "Attempting to add processor <" << name << "> to the run queue");
         if (procForRunQueue == NULL)
         {
@@ -553,7 +553,7 @@ namespace Nymph
             return false;
         }
 
-        KTPrimaryProcessor* primaryProc = dynamic_cast< KTPrimaryProcessor* >(procForRunQueue);
+        KTPrimaryProcessor* primaryProc = dynamic_cast< KTPrimaryProcessor* >(procForRunQueue.get());
         if (primaryProc == NULL)
         {
             KTERROR(proclog, "Processor <" << name << "> is not a primary processor.");
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library/Application/KTProcessorToolbox.hh
index 42d97fd..829e3f6 100644
--- a/Library/Application/KTProcessorToolbox.hh
+++ b/Library/Application/KTProcessorToolbox.hh
@@ -28,6 +28,7 @@
 #include <initializer_list>
 #include <limits>
 #include <set>
+#include <memory>
 
 
 namespace Nymph
@@ -110,7 +111,7 @@ namespace Nymph
         private:
             struct ProcessorInfo
             {
-                KTProcessor* fProc;
+                std::shared_ptr< KTProcessor > fProc;
             };
             typedef std::map< std::string, ProcessorInfo > ProcessorMap;
             typedef ProcessorMap::iterator ProcMapIt;
@@ -119,13 +120,13 @@ namespace Nymph
 
         public:
             /// Get a pointer to a processor in the toolbox
-            KTProcessor* GetProcessor(const std::string& procName);
+            std::shared_ptr< KTProcessor > GetProcessor(const std::string& procName);
             /// Get a pointer to a processor in the toolbox
-            const KTProcessor* GetProcessor(const std::string& procName) const;
+            const std::shared_ptr< KTProcessor > GetProcessor(const std::string& procName) const;
 
             /// Add a processor to the toolbox
             /// Toolbox takes ownership of the processor
-            bool AddProcessor(const std::string& procName, KTProcessor* proc);
+            bool AddProcessor(const std::string& procName, std::shared_ptr< KTProcessor > proc);
             bool AddProcessor(const std::string& procType, const std::string& procName);
 
             /// Remove a processor from the toolbox
@@ -133,7 +134,7 @@ namespace Nymph
 
             /// Remove a processor from the toolbox and return it to the user
             /// Ownership is passed to the user
-            KTProcessor* ReleaseProcessor(const std::string& procName);
+            std::shared_ptr< KTProcessor > ReleaseProcessor(const std::string& procName);
 
             /// Remove all processors from the toolbox
             /// Also clears the run queue
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index 6b04e3b..c2e143a 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -25,6 +25,7 @@
 #include <map>
 #include <sstream>
 #include <string>
+#include <memory>
 
 namespace Nymph
 {

From 03472de74ba69e0cf5e486f62f587ee7bd69106a Mon Sep 17 00:00:00 2001
From: Evan Zayas <ezayas@Evans-MacBook-Pro.local>
Date: Thu, 1 Feb 2018 16:52:42 -0500
Subject: [PATCH 085/521] made a new friend

---
 Library/Utility/KTExtensibleStruct.hh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index fae2704..5eaaf81 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -85,6 +85,7 @@ namespace Nymph
             void SetIsCopyDisabled(bool flag);
         private:
             bool fIsCopyDisabled;
+            friend class cereal::access;
 
             template< class Archive >
             void serialize( Archive& ar );

From 5fa37739310e3885940151839b864fc0561760bc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Feb 2018 14:23:57 -0800
Subject: [PATCH 086/521] Some incomplete work on extending serialization into
 the extensible structs

---
 Library/Data/KTCutStatus.cc           |  8 +--
 Library/Data/KTCutStatus.hh           | 30 +++++------
 Library/Utility/KTExtensibleStruct.hh | 72 +++++++++++++--------------
 3 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/Library/Data/KTCutStatus.cc b/Library/Data/KTCutStatus.cc
index 788eed7..ee371bd 100644
--- a/Library/Data/KTCutStatus.cc
+++ b/Library/Data/KTCutStatus.cc
@@ -102,7 +102,7 @@ namespace Nymph
         return cut->GetState();
     }
 
-    const KTCutResult* KTCutStatus::GetCutResult(const std::string& cutName) const
+    const KTCutResult& KTCutStatus::GetCutResult(const std::string& cutName) const
     {
         const KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
         while (cut != NULL)
@@ -110,10 +110,10 @@ namespace Nymph
             if (cut->Name() == cutName) return cut;
             cut = cut->Next();
         }
-        return NULL;
+        throw KTException() << "Cannot find cut result";
     }
 
-    KTCutResult* KTCutStatus::GetCutResult(const std::string& cutName)
+    KTCutResult& KTCutStatus::GetCutResult(const std::string& cutName)
     {
         KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
         while (cut != NULL)
@@ -121,7 +121,7 @@ namespace Nymph
             if (cut->Name() == cutName) return cut;
             cut = cut->Next();
         }
-        return NULL;
+        throw KTException() << "Cannot find cut result";
     }
 
     bool KTCutStatus::SetCutState(const std::string& cutName, bool state, bool doUpdateStatus)
diff --git a/Library/Data/KTCutStatus.hh b/Library/Data/KTCutStatus.hh
index 9642575..80bb33d 100644
--- a/Library/Data/KTCutStatus.hh
+++ b/Library/Data/KTCutStatus.hh
@@ -11,9 +11,11 @@
 
 #include "KTCutResult.hh"
 
+#include "KTException.hh"
+
 #include <boost/dynamic_bitset.hpp>
-#include <boost/scoped_ptr.hpp>
 
+#include <memory>
 #include <string>
 
 namespace Nymph
@@ -75,7 +77,7 @@ namespace Nymph
 
             KTCutStatus& operator=(const KTCutStatus& rhs);
 
-            const KTCutResult* CutResults() const;
+            const std::shared_ptr< KTCutResult > CutResults() const;
 
             void UpdateStatus();
 
@@ -96,12 +98,12 @@ namespace Nymph
             bool GetCutState(const std::string& cutName) const;
 
             template< typename XCutType >
-            const KTCutResult* GetCutResult() const;
-            const KTCutResult* GetCutResult(const std::string& cutName) const;
+            const KTCutResult& GetCutResult() const;
+            const KTCutResult& GetCutResult(const std::string& cutName) const;
 
             template< typename XCutType >
-            KTCutResult* GetCutResult();
-            KTCutResult* GetCutResult(const std::string& cutName);
+            KTCutResult& GetCutResult();
+            KTCutResult& GetCutResult(const std::string& cutName);
 
             template< typename XCutType >
             bool SetCutState(bool state, bool doUpdateStatus=true);
@@ -119,7 +121,7 @@ namespace Nymph
         private:
             friend std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
 
-            boost::scoped_ptr< KTCutResultHandle > fCutResults;
+            std::unique_ptr< KTCutResultHandle > fCutResults;
 
             bitset_type fSummary;
 
@@ -137,7 +139,7 @@ namespace Nymph
     std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
 
 
-    inline const KTCutResult* KTCutStatus::CutResults() const
+    inline const std::shared_ptr< KTCutResult > KTCutStatus::CutResults() const
     {
         return fCutResults.get()->Next();
     }
@@ -188,23 +190,23 @@ namespace Nymph
     }
 
     template< typename XCutType >
-    const KTCutResult* KTCutStatus::GetCutResult() const
+    const KTCutResult& KTCutStatus::GetCutResult() const
     {
         if (HasCutResult< XCutType >())
         {
-            return &(fCutResults.get()->Of< XCutType >());
+            return fCutResults.get()->Of< XCutType >();
         }
-        return NULL;
+        throw KTException() << "Cannot find cut result";
     }
 
     template< typename XCutType >
-    KTCutResult* KTCutStatus::GetCutResult()
+    KTCutResult& KTCutStatus::GetCutResult()
     {
         if (HasCutResult< XCutType >())
         {
-            return &(fCutResults.get()->Of< XCutType >());
+            return fCutResults.get()->Of< XCutType >();
         }
-        return NULL;
+        throw KTException() << "Cannot find cut result";
     }
 
     template< typename XCutType >
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index fae2704..f74a5ea 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -11,6 +11,8 @@
 
 #include <cereal/types/polymorphic.hpp>
 
+#include <memory>
+
 namespace Nymph
 {
 
@@ -42,21 +44,21 @@ namespace Nymph
             /// Extracts object of type XStructType
             template< class XStructType > inline XStructType* Detatch(void);
             /// Duplicates the extended object
-            virtual KTExtensibleStructCore* Clone(void) const = 0;
+            virtual std::shared_ptr< XBaseType > Clone(void) const = 0;
             /// Duplicates object only
             virtual void Pull(const KTExtensibleStructCore< XBaseType >& object) = 0;
             /// Returns the pointer to the next field
-            KTExtensibleStructCore* Next() const;
+            std::shared_ptr< KTExtensibleStructCore > Next() const;
             /// Returns the pointer to the previous field
-            KTExtensibleStructCore* Prev() const;
+            std::shared_ptr< KTExtensibleStructCore > Prev() const;
             /// Returns the pointer to the last field
-            KTExtensibleStructCore* Last() const;
+            std::shared_ptr< KTExtensibleStructCore > Last() const;
             /// Returns the pointer to the first field
-            KTExtensibleStructCore* First() const;
+            std::shared_ptr< KTExtensibleStructCore > First() const;
         protected:
             void SetPrevPtrInNext();
-            mutable KTExtensibleStructCore* fNext;
-            mutable KTExtensibleStructCore* fPrev;
+            mutable std::shared_ptr< KTExtensibleStructCore > fNext;
+            mutable std::shared_ptr< KTExtensibleStructCore > fPrev;
 
         private:
             friend class cereal::access;
@@ -79,7 +81,7 @@ namespace Nymph
             /// Duplicates the extended object
             KTExtensibleStruct& operator=(const KTExtensibleStruct& object);
             /// Duplicates the extended object
-            virtual KTExtensibleStructCore< XBaseType >* Clone(void) const;
+            virtual std::shared_ptr< XBaseType > Clone(void) const;
             /// Duplicates object only
             virtual void Pull(const KTExtensibleStructCore< XBaseType >& object);
             void SetIsCopyDisabled(bool flag);
@@ -93,38 +95,36 @@ namespace Nymph
 
 
     template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(void)
+    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(void) :
+            fNext(),
+            fPrev()
     {
-        fPrev = 0;
-        fNext = 0;
     }
 
     template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(const KTExtensibleStructCore&)
+    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(const KTExtensibleStructCore&) :
+            fNext(),
+            fPrev()
     {
-        fPrev = 0;
-        fNext = 0;
     }
 
     template<class XBaseType>
     KTExtensibleStructCore<XBaseType>::~KTExtensibleStructCore()
     {
-        delete fNext;
-        fNext = 0;
+        fNext.reset();
     }
 
     template<class XBaseType>
     KTExtensibleStructCore<XBaseType>& KTExtensibleStructCore<XBaseType>::operator=(const KTExtensibleStructCore&)
     {
-        fNext = 0;
+        fNext.reset();
         return *this;
     }
 
     template<class XBaseType>
     void KTExtensibleStructCore<XBaseType>::Clear(void)
     {
-        delete fNext;
-        fNext = 0;
+        fNext.reset();
     }
 
     template<class XBaseType>
@@ -143,7 +143,7 @@ namespace Nymph
             fNext->fPrev = this;
         }
 
-        return fNext->Of<XStructType>();
+        return fNext->template Of<XStructType>();
     }
 
     template<class XBaseType>
@@ -156,13 +156,13 @@ namespace Nymph
             return *target;
         }
 
-        if (fNext == 0)
+        if (! fNext)
         {
             fNext = new XStructType();
             fNext->fPrev = const_cast< KTExtensibleStructCore< XBaseType >* >(this);
         }
 
-        return fNext->Of<XStructType>();
+        return fNext->template Of<XStructType>();
     }
 
 
@@ -177,7 +177,7 @@ namespace Nymph
         }
         if (fNext)
         {
-            return fNext->Has<XStructType>();
+            return fNext->template Has<XStructType>();
         }
 
         return false;
@@ -200,45 +200,45 @@ namespace Nymph
             {
                 fNext = next->fNext;
                 fNext->fPrev = this;
-                next->fNext = 0;
+                next->fNext.reset();
             }
-            next->fPrev = 0;
+            next->fPrev.reset();
             return next;
         }
-        return fNext->Detatch<XStructType>();
+        return fNext->template Detatch<XStructType>();
     }
 
 
     template<class XBaseType>
-    inline KTExtensibleStructCore<XBaseType>* KTExtensibleStructCore<XBaseType>::Next() const
+    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::Next() const
     {
         return fNext;
     }
 
     template<class XBaseType>
-    inline KTExtensibleStructCore<XBaseType>* KTExtensibleStructCore<XBaseType>::Prev() const
+    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::Prev() const
     {
         return fPrev;
     }
 
     template<class XBaseType>
-    inline KTExtensibleStructCore<XBaseType>* KTExtensibleStructCore<XBaseType>::Last() const
+    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::Last() const
     {
-        if (fNext == 0) return this;
+        if (fNext) return this;
         return fNext->Last();
     }
 
     template<class XBaseType>
-    inline KTExtensibleStructCore<XBaseType>* KTExtensibleStructCore<XBaseType>::First() const
+    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::First() const
     {
-        if (fPrev == 0) return this;
+        if (fPrev) return this;
         return fPrev->First();
     }
 
     template<class XBaseType>
     inline void KTExtensibleStructCore<XBaseType>::SetPrevPtrInNext()
     {
-        fNext->fPrev = this;
+        fNext->fPrev.reset( this );
         return;
     }
 
@@ -287,7 +287,7 @@ namespace Nymph
 
         if (object.fNext)
         {
-            this->fNext = object.fNext->Clone();
+            this->fNext.reset( object.fNext->Clone() );
         }
     }
 
@@ -314,14 +314,14 @@ namespace Nymph
     }
 
     template<class XInstanceType, class XBaseType>
-    KTExtensibleStructCore<XBaseType>* KTExtensibleStruct<XInstanceType, XBaseType>::Clone(void) const
+    std::shared_ptr< XBaseType > KTExtensibleStruct<XInstanceType, XBaseType>::Clone(void) const
     {
         // assume CRTP is used properly,
         // otherwise compiling fails here (intended behavior)
         XInstanceType* instance = new XInstanceType(dynamic_cast<const XInstanceType&>(*this));
         if (this->fNext)
         {
-            instance->fNext = this->fNext->Clone();
+            instance->fNext.reset( this->fNext->Clone() );
             instance->SetPrevPtrInNext();
             //instance->fNext->fPrev = instance->fNext;
         }

From 618f5c6fe77215a0aaa33025d37da481f8bdf2b5 Mon Sep 17 00:00:00 2001
From: lgladstone <gladston@mit.edu>
Date: Thu, 1 Feb 2018 14:32:44 -0800
Subject: [PATCH 087/521] Workshop work: paramnode and paramvalue pybindings
 They're not quite finished, but it's partway there. This version compiles.

---
 Executables/Validation/CMakeLists.txt        |  1 +
 Executables/Validation/TestPythonBindings.py | 28 +++++++++++
 Library/CMakeLists.txt                       |  1 +
 Library/NymphPybind.cc                       |  2 +
 Library/Utility/KTParamNodePybind.hh         | 53 ++++++++++++++++++++
 5 files changed, 85 insertions(+)
 create mode 100644 Executables/Validation/TestPythonBindings.py
 create mode 100644 Library/Utility/KTParamNodePybind.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 72c3ba6..2d14ffa 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -89,6 +89,7 @@ if (Nymph_ENABLE_TESTING)
             TestProcessorToolbox.py
             TestPyTestClass.py
             TestPythonBasics.py
+            TestPythonBindings.py
         )
         
         pybind11_add_module( py_nymph_validation MODULE ${VALIDATION_PYBINDING_SOURCEFILES} )
diff --git a/Executables/Validation/TestPythonBindings.py b/Executables/Validation/TestPythonBindings.py
new file mode 100644
index 0000000..e6f2e4d
--- /dev/null
+++ b/Executables/Validation/TestPythonBindings.py
@@ -0,0 +1,28 @@
+# Demonstrates access to KTPyTestClass
+
+import py_nymph as nymph
+
+# want to instantiate this will enough values to test all types: 
+# # TypeError: get_value(): incompatible function arguments. The following argument types are supported:
+#     1. (self: py_nymph.ParamNodePybind, arg0: str) -> bool
+#     2. (self: py_nymph.ParamNodePybind, arg0: str) -> int
+#     3. (self: py_nymph.ParamNodePybind, arg0: str) -> int
+#     4. (self: py_nymph.ParamNodePybind, arg0: str) -> float
+#     5. (self: py_nymph.ParamNodePybind, arg0: str) -> str
+#     6. (self: py_nymph.ParamNodePybind, arg0: str, arg1: bool) -> bool
+#     7. (self: py_nymph.ParamNodePybind, arg0: str, arg1: int) -> int
+#     8. (self: py_nymph.ParamNodePybind, arg0: str, arg1: int) -> int
+#     9. (self: py_nymph.ParamNodePybind, arg0: str, arg1: float) -> float
+#     10. (self: py_nymph.ParamNodePybind, arg0: str, arg1: str) -> str
+
+a_value = nymph.ParamValue(True)
+print("Get a bool set to True: ", a_value.get())
+
+# print(pnp.get_value())
+
+
+
+
+a_node = nymph.ParamNode()
+# Test the "get_value" function for all the different types: 
+# a_node.get_value("myKey")
\ No newline at end of file
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index f9c7f14..05e92ca 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -93,6 +93,7 @@ set( NYMPH_PYBINDING_HEADERFILES
     #${UTIL_DIR}/KTConfigurablePybind.hh
     ${PROC_DIR}/KTProcessorPybind.hh
     ${PROC_DIR}/KTPyProcessor.hh
+    ${UTIL_DIR}/KTParamNodePybind.hh
 )
 
 # Python bindings
diff --git a/Library/NymphPybind.cc b/Library/NymphPybind.cc
index dc99ee8..b579c6d 100644
--- a/Library/NymphPybind.cc
+++ b/Library/NymphPybind.cc
@@ -8,12 +8,14 @@
 #include "Application/KTProcessorToolboxPybind.hh"
 #include "Processor/KTProcessorPybind.hh"
 //#include "Utility/KTConfigurablePybind.hh"
+#include "Utility/KTParamNodePybind.hh"
 
 PYBIND11_MODULE( py_nymph, mod )
 {
     //Nymph::ExportKTConfigurable( mod );
     Nymph::ExportKTProcessor( mod );
     Nymph::ExportKTProcessorToolbox( mod );
+    Nymph::ExportParamNodePybind( mod );
 }
 
 
diff --git a/Library/Utility/KTParamNodePybind.hh b/Library/Utility/KTParamNodePybind.hh
new file mode 100644
index 0000000..ff6b284
--- /dev/null
+++ b/Library/Utility/KTParamNodePybind.hh
@@ -0,0 +1,53 @@
+/*
+ * KTPyNymph.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone
+ */
+
+#include "param_node.hh"
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportParamNodePybind( pybind11::module& mod )
+    {
+        pybind11::class_< scarab::param_value >(mod, "ParamValue")
+            .def(pybind11::init<bool>())
+            .def("get",(bool (scarab::param_value::*)() const) &scarab::param_value::get<bool>,"Get parameter value")
+            ;
+
+        pybind11::class_< scarab::param_node >(mod, "ParamNode")
+            .def(pybind11::init<>())
+            
+            .def("add",(bool (scarab::param_node::*)(const scarab::param_value&) const) &scarab::param_value::get<bool>,"Add a parameter value to a node")
+
+            // Get value of the parameter, when no default is set
+            .def("get_value", (bool (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<bool>, "Get parameter node value")
+            .def("get_value", (uint (scarab::param_node::*)(const std::string &) const) 
+                &scarab::param_node::get_value<uint>, "Get parameter node value")
+            .def("get_value", (int (scarab::param_node::*)(const std::string &) const) 
+                &scarab::param_node::get_value<int>, "Get parameter node value")
+            .def("get_value", (double (scarab::param_node::*)(const std::string &) const) 
+                &scarab::param_node::get_value<double>, "Get parameter node value")
+            .def("get_value", (std::string (scarab::param_node::*)(const std::string &) const) 
+                &scarab::param_node::get_value, "Get parameter node value")
+
+            // Get value of the parameter, bringing along the default value
+            .def("get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>, "Get parameter node value")
+            .def("get_value", (uint (scarab::param_node::*)(const std::string &, uint) const) 
+                &scarab::param_node::get_value<uint>, "Get parameter node value")
+            .def("get_value", (int (scarab::param_node::*)(const std::string &, int) const) 
+                &scarab::param_node::get_value<int>, "Get parameter node value")
+            .def("get_value", (double (scarab::param_node::*)(const std::string &, double) const) 
+                &scarab::param_node::get_value<double>, "Get parameter node value")
+            .def("get_value", (std::string (scarab::param_node::*)(const std::string &, const std::string & ) const) 
+                &scarab::param_node::get_value, "Get parameter node value")
+            ;
+
+
+
+    }
+    
+} /* namespace Nymph */

From 1fd20aace26c841f522873ee6645c16ff243b464 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Fri, 2 Feb 2018 00:24:33 +0100
Subject: [PATCH 088/521] added binding for AddProcessor in
 KTProcessorToolboxPybind

---
 Executables/Validation/TestProcessorToolbox.py  | 13 ++-----------
 Executables/Validation/TestWrapProcessor.py     | 10 ++++++----
 Library/Application/KTProcessorToolboxPybind.hh |  8 +++++---
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Executables/Validation/TestProcessorToolbox.py b/Executables/Validation/TestProcessorToolbox.py
index 31868de..8453a79 100644
--- a/Executables/Validation/TestProcessorToolbox.py
+++ b/Executables/Validation/TestProcessorToolbox.py
@@ -7,8 +7,6 @@
 import py_nymph as nymph
 import py_nymph_validation as nv
 
-class WrappedProcessor(nv.WrapProcessor):
-    pass
 
 ptb = nymph.KTProcessorToolbox('pt')
 
@@ -16,17 +14,10 @@ class WrappedProcessor(nv.WrapProcessor):
 
 ptb.AddProcessor('test-p-proc', 'tpp')
 ptb.AddProcessor('test-proc-b', 'tp')
-ptb.AddProcessor('base-wrap-proc', 'bwp')
+ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
 
 
-
-#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
-#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
-ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
-
-p = WrappedProcessor()
-p.WrapFunction = lambda x: print("Hey, I'm python")
-
 ptb.PushBackToRunQueue('tpp')
 
 print('Running')
diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
index 82e1778..517af2b 100644
--- a/Executables/Validation/TestWrapProcessor.py
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -15,17 +15,19 @@ class WrappedProcessor(nv.WrapProcessor):
 print('Configuring')
 
 ptb.AddProcessor('test-p-proc', 'tpp')
-ptb.AddProcessor('test-proc-b', 'tp')
-ptb.AddProcessor('base-wrap-proc', 'bwp')
+#ptb.AddProcessor('test-proc-b', 'tp')
 
+p = WrappedProcessor()
+print('type of WrappedProcessor in python is: {}'.format( type(p)))
 
+p.WrapFunction = lambda x: print("Hey, I'm python")
 
+ptb.AddProcessor('bwp', p)
 #ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
 #ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
 ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
 
-p = WrappedProcessor()
-p.WrapFunction = lambda x: print("Hey, I'm python")
+
 
 ptb.PushBackToRunQueue('tpp')
 
diff --git a/Library/Application/KTProcessorToolboxPybind.hh b/Library/Application/KTProcessorToolboxPybind.hh
index 678a374..a0dc85d 100644
--- a/Library/Application/KTProcessorToolboxPybind.hh
+++ b/Library/Application/KTProcessorToolboxPybind.hh
@@ -17,7 +17,6 @@ namespace Nymph
 {
     void ExportKTProcessorToolbox( pybind11::module& mod )
     {
-
         pybind11::class_< KTProcessorToolbox >( mod, "KTProcessorToolbox" )
                 .def( pybind11::init< const std::string & >() )
 
@@ -29,7 +28,8 @@ namespace Nymph
                 // GetProcessor skipped because raw pointers are not supported by pybind11
                 .def( "AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::AddProcessor,
                         "Create a processor by name and add it to the toolbox" )
-                // skipping AddProcessor(const std::string&, KTProcessor*)
+				.def("AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, std::shared_ptr< KTProcessor > proc)) &KTProcessorToolbox::AddProcessor,
+						                       "Create a processor and add it to the toolbox" )
                 .def( "RemoveProcessor", &KTProcessorToolbox::RemoveProcessor,
                         "Remove a processor from the toolbox" )
                 // skipping ReleaseProcessor
@@ -77,7 +77,8 @@ namespace Nymph
                 .def( "CancelThreads", &KTProcessorToolbox::CancelThreads, "Kill any running thread at the next breakpoint check" )
                 .def( "JoinRunThread", &KTProcessorToolbox::JoinRunThread, "Blocking call to wait until Run() is complete; this should only be done by the owner of the thread (typically whoever called Run())" )
 
-                .def( "GetData", &KTProcessorToolbox::GetData, "Retrieve the data handle from a slot by thread name (i.e. the name of the primary processor for that thread)" )
+                .def( "GetData", &KTProcessorToolbox::GetData, "Retrieve the data handle from a slot by thread name (i.e. the name of the primary processor for that thread)" );
+
 
                 /*
                 // these are implemented in the boost::python version but not yet here
@@ -93,6 +94,7 @@ namespace Nymph
                 ;
 
     }
+
 }
 
 #endif /* NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_ */

From def217ff9ba0c23d487892bd7f3d87dd89505330 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 1 Feb 2018 21:47:39 -0800
Subject: [PATCH 089/521] Further partial work in fixing the extensible struct
 system to be serializable

---
 Library/Data/KTCutStatus.hh           |   2 +-
 Library/Utility/KTExtensibleStruct.hh | 100 ++++++++++++++------------
 2 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/Library/Data/KTCutStatus.hh b/Library/Data/KTCutStatus.hh
index 80bb33d..f90a847 100644
--- a/Library/Data/KTCutStatus.hh
+++ b/Library/Data/KTCutStatus.hh
@@ -141,7 +141,7 @@ namespace Nymph
 
     inline const std::shared_ptr< KTCutResult > KTCutStatus::CutResults() const
     {
-        return fCutResults.get()->Next();
+        return fCutResults->Next();
     }
 
     template< typename XCutType >
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index 60c6bb3..c439d6a 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -25,40 +25,47 @@ namespace Nymph
     template< class XBaseType >
     struct KTExtensibleStructCore : public XBaseType
     {
+        public:
+            typedef std::shared_ptr< XBaseType > BasePtr;
+
         public:
             /// Default constructor
-            KTExtensibleStructCore(void);
+            KTExtensibleStructCore();
             /// Copy constructor; duplicates the extended object
-            KTExtensibleStructCore(const KTExtensibleStructCore&);
+            KTExtensibleStructCore( const KTExtensibleStructCore& );
             virtual ~KTExtensibleStructCore();
             /// Duplicates the extended object
-            KTExtensibleStructCore& operator=(const KTExtensibleStructCore&);
+            KTExtensibleStructCore& operator=( const KTExtensibleStructCore& );
             /// Removes extended fields
-            virtual void Clear(void);
+            virtual void Clear();
             /// Returns a reference to the object of type XStructType; creates that object if it doesn't exist
-            template< class XStructType > inline XStructType& Of(void);
+            template< class XStructType >
+            inline XStructType& Of();
             /// Returns a const reference to the object of type XStructType; creates that object if it doesn't exist
-            template< class XStructType > inline const XStructType& Of(void) const;
+            template< class XStructType >
+            inline const XStructType& Of() const;
             /// Returns true if XStructType is or is below this object
-            template< class XStructType > inline bool Has(void) const;
+            template< class XStructType >
+            inline bool Has() const;
             /// Extracts object of type XStructType
-            template< class XStructType > inline XStructType* Detatch(void);
+            template< class XStructType >
+            inline std::shared_ptr< XStructType > Detatch();
             /// Duplicates the extended object
-            virtual std::shared_ptr< XBaseType > Clone(void) const = 0;
+            virtual BasePtr Clone() const = 0;
             /// Duplicates object only
-            virtual void Pull(const KTExtensibleStructCore< XBaseType >& object) = 0;
+            virtual void Pull( const KTExtensibleStructCore< XBaseType >& object ) = 0;
             /// Returns the pointer to the next field
-            std::shared_ptr< KTExtensibleStructCore > Next() const;
+            BasePtr Next() const;
             /// Returns the pointer to the previous field
-            std::shared_ptr< KTExtensibleStructCore > Prev() const;
+            BasePtr Prev() const;
             /// Returns the pointer to the last field
-            std::shared_ptr< KTExtensibleStructCore > Last() const;
+            BasePtr Last() const;
             /// Returns the pointer to the first field
-            std::shared_ptr< KTExtensibleStructCore > First() const;
+            BasePtr First() const;
         protected:
             void SetPrevPtrInNext();
-            mutable std::shared_ptr< KTExtensibleStructCore > fNext;
-            mutable std::shared_ptr< KTExtensibleStructCore > fPrev;
+            mutable BasePtr fNext;
+            mutable BasePtr fPrev;
 
         private:
             friend class cereal::access;
@@ -72,19 +79,22 @@ namespace Nymph
     template< class XInstanceType, class XBaseType >
     struct KTExtensibleStruct : KTExtensibleStructCore< XBaseType >
     {
+        public:
+            typedef typename KTExtensibleStructCore< XBaseType >::BasePtr BasePtr;
+
         public:
             /// Default constructor
-            KTExtensibleStruct(void);
+            KTExtensibleStruct();
             /// Copy constructor; duplicates the extended object
-            KTExtensibleStruct(const KTExtensibleStruct& object);
+            KTExtensibleStruct( const KTExtensibleStruct& object );
             virtual ~KTExtensibleStruct();
             /// Duplicates the extended object
-            KTExtensibleStruct& operator=(const KTExtensibleStruct& object);
+            KTExtensibleStruct& operator=( const KTExtensibleStruct& object );
             /// Duplicates the extended object
-            virtual std::shared_ptr< XBaseType > Clone(void) const;
+            virtual BasePtr Clone() const;
             /// Duplicates object only
-            virtual void Pull(const KTExtensibleStructCore< XBaseType >& object);
-            void SetIsCopyDisabled(bool flag);
+            virtual void Pull( const KTExtensibleStructCore< XBaseType >& object );
+            void SetIsCopyDisabled( bool flag );
         private:
             bool fIsCopyDisabled;
             friend class cereal::access;
@@ -103,7 +113,7 @@ namespace Nymph
     }
 
     template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(const KTExtensibleStructCore&) :
+    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore( const KTExtensibleStructCore& ) :
             fNext(),
             fPrev()
     {
@@ -116,21 +126,21 @@ namespace Nymph
     }
 
     template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>& KTExtensibleStructCore<XBaseType>::operator=(const KTExtensibleStructCore&)
+    KTExtensibleStructCore<XBaseType>& KTExtensibleStructCore<XBaseType>::operator=( const KTExtensibleStructCore& )
     {
         fNext.reset();
         return *this;
     }
 
     template<class XBaseType>
-    void KTExtensibleStructCore<XBaseType>::Clear(void)
+    void KTExtensibleStructCore<XBaseType>::Clear()
     {
         fNext.reset();
     }
 
     template<class XBaseType>
     template<class XStructType>
-    inline XStructType& KTExtensibleStructCore<XBaseType>::Of(void)
+    inline XStructType& KTExtensibleStructCore<XBaseType>::Of()
     {
         XStructType* target = dynamic_cast<XStructType*>(this);
         if (target)
@@ -140,8 +150,8 @@ namespace Nymph
 
         if (! fNext)
         {
-            fNext = new XStructType();
-            fNext->fPrev = this;
+            fNext = std::make_shared< XStructType >();
+            fNext->fPrev.reset( this );
         }
 
         return fNext->template Of<XStructType>();
@@ -149,7 +159,7 @@ namespace Nymph
 
     template<class XBaseType>
     template<class XStructType>
-    inline const XStructType& KTExtensibleStructCore<XBaseType>::Of(void) const
+    inline const XStructType& KTExtensibleStructCore<XBaseType>::Of() const
     {
         const XStructType* target = dynamic_cast<const XStructType*>(this);
         if (target)
@@ -159,8 +169,8 @@ namespace Nymph
 
         if (! fNext)
         {
-            fNext = new XStructType();
-            fNext->fPrev = const_cast< KTExtensibleStructCore< XBaseType >* >(this);
+            fNext = std::make_shared< XStructType >();
+            fNext->fPrev.reset( const_cast< KTExtensibleStructCore< XBaseType >* >(this) );
         }
 
         return fNext->template Of<XStructType>();
@@ -170,7 +180,7 @@ namespace Nymph
 
     template<class XBaseType>
     template<class XStructType>
-    inline bool KTExtensibleStructCore<XBaseType>::Has(void) const
+    inline bool KTExtensibleStructCore<XBaseType>::Has() const
     {
         if (dynamic_cast<const XStructType*>(this))
         {
@@ -188,13 +198,13 @@ namespace Nymph
 
     template<class XBaseType>
     template<class XStructType>
-    inline XStructType* KTExtensibleStructCore<XBaseType>::Detatch(void)
+    inline std::shared_ptr< XStructType > KTExtensibleStructCore<XBaseType>::Detatch()
     {
         if (! fNext)
         {
-            return 0;
+            return std::shared_ptr< XStructType >();
         }
-        XStructType* next = dynamic_cast<XStructType*>(fNext);
+        std::shared_ptr< XStructType > next = std::dynamic_pointer_cast< XStructType >(fNext);
         if (next)
         {
             if (next->fNext)
@@ -211,26 +221,26 @@ namespace Nymph
 
 
     template<class XBaseType>
-    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::Next() const
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Next() const
     {
         return fNext;
     }
 
     template<class XBaseType>
-    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::Prev() const
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Prev() const
     {
         return fPrev;
     }
 
     template<class XBaseType>
-    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::Last() const
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Last() const
     {
         if (fNext) return this;
         return fNext->Last();
     }
 
     template<class XBaseType>
-    inline std::shared_ptr< KTExtensibleStructCore<XBaseType> > KTExtensibleStructCore<XBaseType>::First() const
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::First() const
     {
         if (fPrev) return this;
         return fPrev->First();
@@ -268,9 +278,10 @@ namespace Nymph
     }
 
     template<class XInstanceType, class XBaseType>
-    KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct(void)
+    KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct() :
+            KTExtensibleStructCore< XBaseType >(),
+            fIsCopyDisabled( false )
     {
-        fIsCopyDisabled = false;
     }
 
     template<class XInstanceType, class XBaseType>
@@ -301,8 +312,7 @@ namespace Nymph
             return *this;
         }
 
-        delete this->fNext;
-        this->fNext = 0;
+        this->fNext.reset();
 
         if (object.fNext)
         {
@@ -315,11 +325,11 @@ namespace Nymph
     }
 
     template<class XInstanceType, class XBaseType>
-    std::shared_ptr< XBaseType > KTExtensibleStruct<XInstanceType, XBaseType>::Clone(void) const
+    typename KTExtensibleStruct<XInstanceType, XBaseType>::BasePtr KTExtensibleStruct<XInstanceType, XBaseType>::Clone() const
     {
         // assume CRTP is used properly,
         // otherwise compiling fails here (intended behavior)
-        XInstanceType* instance = new XInstanceType(dynamic_cast<const XInstanceType&>(*this));
+        BasePtr instance = std::make_shared< XBaseType >( XInstanceType(dynamic_cast<const XInstanceType&>(*this)) );
         if (this->fNext)
         {
             instance->fNext.reset( this->fNext->Clone() );

From 72fc7dc9c3b38206cc58a86872e021db7fbce956 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Fri, 2 Feb 2018 15:52:45 +0100
Subject: [PATCH 090/521] included shared_ptr <KTProcessor> in
 py_nymph_validation

---
 Executables/Validation/NymphValidationPybind.cc | 4 ++++
 Executables/Validation/TestWrapProcessor.py     | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Executables/Validation/NymphValidationPybind.cc b/Executables/Validation/NymphValidationPybind.cc
index 657eb48..411d198 100644
--- a/Executables/Validation/NymphValidationPybind.cc
+++ b/Executables/Validation/NymphValidationPybind.cc
@@ -8,6 +8,7 @@
 #include "KTPyTestClassPybind.hh"
 #include "TestPythonBasics.hh"
 #include "pybind11/pybind11.h"
+#include <memory>
 
 PYBIND11_MODULE( py_nymph_validation, mod )
 {
@@ -19,6 +20,9 @@ PYBIND11_MODULE( py_nymph_validation, mod )
     		.def(pybind11::init<>())
     		.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
         	.def("Configure", &Nymph::KTWrapProcessor::Configure);
+
+    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
+
 }
 
 
diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
index 517af2b..181b9f0 100644
--- a/Executables/Validation/TestWrapProcessor.py
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -10,6 +10,8 @@
 class WrappedProcessor(nv.WrapProcessor):
     pass
 
+
+
 ptb = nymph.KTProcessorToolbox('pt')
 
 print('Configuring')
@@ -18,17 +20,14 @@ class WrappedProcessor(nv.WrapProcessor):
 #ptb.AddProcessor('test-proc-b', 'tp')
 
 p = WrappedProcessor()
+p.WrapFunction = lambda x: print("Hey, I'm python")
 print('type of WrappedProcessor in python is: {}'.format( type(p)))
 
-p.WrapFunction = lambda x: print("Hey, I'm python")
 
 ptb.AddProcessor('bwp', p)
-#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
-#ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
 ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
 
 
-
 ptb.PushBackToRunQueue('tpp')
 
 print('Running')

From 586a4373ffea3eb0bcddebfc1ccdca82f8a40f85 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Wed, 7 Feb 2018 10:29:09 +0100
Subject: [PATCH 091/521] moved wrappable processor from py_nymph_validation to
 py_nymph.

---
 Executables/Validation/KTPyTestClassPybind.hh |  4 +-
 Executables/Validation/KTTestProcessor.cc     |  4 +-
 Executables/Validation/KTTestProcessor.hh     |  4 +-
 .../Validation/NymphValidationPybind.cc       |  6 +-
 Executables/Validation/TestWrapProcessor.py   |  5 +-
 Library/CMakeLists.txt                        |  1 +
 Library/NymphPybind.cc                        | 12 +++-
 Library/Processor/KTProcessorPybind.cc        | 48 ++++++++++++++++
 Library/Processor/KTProcessorPybind.hh        | 57 +++++++++++++++++--
 9 files changed, 124 insertions(+), 17 deletions(-)
 create mode 100644 Library/Processor/KTProcessorPybind.cc

diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
index db3e5b6..e016939 100644
--- a/Executables/Validation/KTPyTestClassPybind.hh
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -23,7 +23,7 @@ namespace Nymph
                 ;
     };
 
-	class KTPyWrapProcessor: public KTWrapProcessor
+/*	class KTPyWrapProcessor: public KTWrapProcessor
 	{
 		public:
 			// Inherit the constructors
@@ -46,7 +46,7 @@ namespace Nymph
 									node      // Argument(s)
 									);
 			}
-	};
+	};*/
 
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index 65bccd0..cd151cd 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -180,7 +180,7 @@ namespace Nymph
         return;
     }
 
-    KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
+  /*  KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
 
     KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
             KTProcessor( name ),
@@ -209,6 +209,6 @@ namespace Nymph
     {
         KTINFO(testsiglog, "Hey, I'm base class");
         return;
-    }
+    }*/
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index 4ba76d5..d14930f 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -131,7 +131,7 @@ namespace Nymph
     };
 
 
-    class KTWrapProcessor : public KTProcessor
+ /*   class KTWrapProcessor : public KTProcessor
     {
         public:
             KTWrapProcessor( const std::string& name = "base-wrap-proc" );
@@ -145,7 +145,7 @@ namespace Nymph
         private:
             KTSlot< int > fSlot;
 
-    };
+    };*/
 
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/NymphValidationPybind.cc b/Executables/Validation/NymphValidationPybind.cc
index 411d198..2c4281e 100644
--- a/Executables/Validation/NymphValidationPybind.cc
+++ b/Executables/Validation/NymphValidationPybind.cc
@@ -15,13 +15,13 @@ PYBIND11_MODULE( py_nymph_validation, mod )
     Nymph::ExportKTPyTestClass( mod );
     Nymph::ExportTestPythonBasics( mod );
 
-    pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
+    /*pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
         wrap_processor
     		.def(pybind11::init<>())
     		.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
         	.def("Configure", &Nymph::KTWrapProcessor::Configure);
-
-    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
+*/
+    //pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
 
 }
 
diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
index 181b9f0..fd53b8b 100644
--- a/Executables/Validation/TestWrapProcessor.py
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -7,11 +7,12 @@
 import py_nymph as nymph
 import py_nymph_validation as nv
 
-class WrappedProcessor(nv.WrapProcessor):
+class WrappedProcessor(nymph.WrapProcessor):
+    def __init__(self):
+        super(WrappedProcessor, self).__init__()
     pass
 
 
-
 ptb = nymph.KTProcessorToolbox('pt')
 
 print('Configuring')
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index f9c7f14..c9a33b8 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -97,6 +97,7 @@ set( NYMPH_PYBINDING_HEADERFILES
 
 # Python bindings
 set( NYMPH_PYBINDING_SOURCEFILES
+    ${PROC_DIR}/KTProcessorPybind.cc
     NymphPybind.cc
 )
 
diff --git a/Library/NymphPybind.cc b/Library/NymphPybind.cc
index dc99ee8..d3397ac 100644
--- a/Library/NymphPybind.cc
+++ b/Library/NymphPybind.cc
@@ -7,13 +7,23 @@
 
 #include "Application/KTProcessorToolboxPybind.hh"
 #include "Processor/KTProcessorPybind.hh"
+#include <memory>
 //#include "Utility/KTConfigurablePybind.hh"
 
 PYBIND11_MODULE( py_nymph, mod )
 {
     //Nymph::ExportKTConfigurable( mod );
-    Nymph::ExportKTProcessor( mod );
+	//Nymph::ExportKTProcessor( mod );
     Nymph::ExportKTProcessorToolbox( mod );
+
+    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
+
+    pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
+            wrap_processor
+				.def(pybind11::init<>())
+				.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
+				.def("Configure", &Nymph::KTWrapProcessor::Configure);
+
 }
 
 
diff --git a/Library/Processor/KTProcessorPybind.cc b/Library/Processor/KTProcessorPybind.cc
new file mode 100644
index 0000000..04cc151
--- /dev/null
+++ b/Library/Processor/KTProcessorPybind.cc
@@ -0,0 +1,48 @@
+/*
+ * KTProcessorPybind.cc
+ *
+ *  Created on: Feb 06, 2018
+ *      Author: cclaessens
+ */
+
+#include "KTProcessor.hh"
+#include "KTProcessorPybind.hh"
+
+
+#include "KTLogger.hh"
+
+namespace Nymph
+{
+
+	KTLOGGER(procpylog, "KTProcessorPybind");
+	KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
+
+    KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
+            KTProcessor( name ),
+            fSlot("wrap-slot", this, &KTWrapProcessor::SlotFunc)
+
+    {
+    }
+
+    KTWrapProcessor::~KTWrapProcessor()
+    {
+    }
+
+    bool KTWrapProcessor::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTWrapProcessor::SlotFunc(int input)
+    {
+        KTINFO(procpylog, "Calling wrap function ");
+        this->WrapFunction(input);
+        return;
+    }
+
+    void KTWrapProcessor::WrapFunction(int input)
+    {
+        KTINFO(procpylog, "Hey, I'm base class");
+        return;
+    }
+} /* namespace Nymph */
diff --git a/Library/Processor/KTProcessorPybind.hh b/Library/Processor/KTProcessorPybind.hh
index fcfee1e..8cccc6f 100644
--- a/Library/Processor/KTProcessorPybind.hh
+++ b/Library/Processor/KTProcessorPybind.hh
@@ -1,5 +1,5 @@
 /*
- * KTProcessorPybind.cc
+ * KTProcessorPybind.hh
  *
  *  Created on: Jan 24, 2018
  *      Author: obla999
@@ -9,15 +9,17 @@
 #define NYMPH_KTPROCESSORPYBIND_HH_
 
 #include "KTPyProcessor.hh"
+#include "KTProcessor.hh"
+#include "KTSlot.hh"
 
 #include "pybind11/pybind11.h"
 
 namespace Nymph
 {
 
-    void ExportKTProcessor( pybind11::module& mod )
+/*    void ExportKTProcessor( pybind11::module& mod )
     {
-/*        pybind11::class_< KTProcessor, KTConfigurable >( mod, "KTProcessor" )
+        pybind11::class_< KTProcessor, KTConfigurable >( mod, "KTProcessor" )
                 .def( pybind11::init< const std::string & >() )
 
                 .def( "ConnectASlot", &Nymph::KTProcessor::ConnectASlot )
@@ -26,12 +28,57 @@ namespace Nymph
                 .def( "GetDoBreakpoint", &Nymph::KTProcessor::GetDoBreakpoint )
                 .def( "SetDoBreakpoint", &Nymph::KTProcessor::SetDoBreakpoint )
                 ;
-*/
+
         pybind11::class_< KTPyProcessor >( mod, "KTPyProcessor" )
                 .def( pybind11::init< const std::string & >() )
                 ;
 
-    }
+
+
+    }*/
+
+    // processor with wrapfunction
+    class KTWrapProcessor : public KTProcessor
+    {
+        public:
+            KTWrapProcessor( const std::string& name = "base-wrap-proc" );
+            virtual ~KTWrapProcessor();
+
+            bool Configure(const scarab::param_node& node);
+
+            void SlotFunc(int);
+            virtual void WrapFunction(int input);
+
+        private:
+            KTSlot< int > fSlot;
+
+    };
+
+	// helper class
+	class KTPyWrapProcessor: public KTWrapProcessor
+	{
+		public:
+			// Inherit the constructors
+			using KTWrapProcessor::KTWrapProcessor;
+
+			// Trampoline (need one for each virtual function)
+			void WrapFunction(int input) override {
+				PYBIND11_OVERLOAD_PURE(
+						void, // Return type
+						KTWrapProcessor,      // Parent class
+						WrapFunction,          // Name of function in C++ (must match Python name)
+						input      // Argument(s)
+						);
+			}
+			bool Configure(const scarab::param_node& node) override {
+				PYBIND11_OVERLOAD(
+						bool, // Return type
+						KTWrapProcessor,      // Parent class
+						Configure,          // Name of function in C++ (must match Python name)
+						node      // Argument(s)
+						);
+			}
+	};
 
 } /* namespace Nymph */
 

From fae39d9d9630c9984dbcbd0ce07f302eba113917 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 7 Feb 2018 15:27:44 -0800
Subject: [PATCH 092/521] Preserving some partial progress

---
 Library/Data/KTCutResult.hh           |  53 +++++-----
 Library/Data/KTCutStatus.cc           | 106 +-------------------
 Library/Data/KTCutStatus.hh           | 134 +++++++++++++++-----------
 Library/Data/KTData.cc                |   4 +
 Library/Data/KTData.hh                |   9 ++
 Library/Utility/KTExtensibleStruct.hh |  26 ++---
 6 files changed, 142 insertions(+), 190 deletions(-)

diff --git a/Library/Data/KTCutResult.hh b/Library/Data/KTCutResult.hh
index a0845be..666a147 100644
--- a/Library/Data/KTCutResult.hh
+++ b/Library/Data/KTCutResult.hh
@@ -8,45 +8,50 @@
 #ifndef KTCUTRESULT_HH_
 #define KTCUTRESULT_HH_
 
-#include "KTExtensibleStruct.hh"
+//#include "KTExtensibleStruct.hh"
 
-#include "KTMemberVariable.hh"
+//#include "KTMemberVariable.hh"
 
 #include <string>
 
 namespace Nymph
 {
-    class KTCutResultCore
+    struct KTCutResult
     {
-        public:
-            KTCutResultCore() :
-                    fState(false)
-            {}
-            virtual ~KTCutResultCore() {}
-
-            virtual const std::string& Name() const = 0;
-
-            MEMBERVARIABLE(bool, State);
+        bool fState;
+        KTCutResult( bool state ) { fState = state; }
+        virtual ~KTCutResult() {}
+        virtual const std::string& Name() const = 0;
     };
 
-    typedef KTExtensibleStructCore< KTCutResultCore > KTCutResult;
-
-    template< class XDerivedType >
-    class KTExtensibleCutResult : public KTExtensibleStruct< XDerivedType, KTCutResultCore >
+    template< class XCutType >
+    struct KTTypedCutResult : KTCutResult
     {
-        public:
-            KTExtensibleCutResult() {}
-            virtual ~KTExtensibleCutResult() {}
-
-            const std::string& Name() const;
+        KTTypedCutResult( bool state ) : KTCutResult( state ) {}
+        virtual ~KTTypedCutResult() {}
+        virtual const std::string& Name() const
+        {
+            return XCutType::GetName();
+        }
     };
 
-    template< class XDerivedType >
-    inline const std::string& KTExtensibleCutResult< XDerivedType >::Name() const
+    template< class XCutType >
+    bool CheckCutResultType( std::shared_ptr< KTCutResult > result )
     {
-        return XDerivedType::sName;
+        return std::dynamic_pointer_cast< KTTypedCutResult< XCutType > >( result );
+
     }
 
+    struct CheckCutResultName
+    {
+        std::string fName;
+        CheckCutResultName( const std::string& name ) : fName( name ) {}
+        bool operator()( std::shared_ptr< KTCutResult > result )
+        {
+            return result->Name() == fName;
+        }
+    };
+
 } /* namespace Nymph */
 
 #endif /* KTCUTRESULT_HH_ */
diff --git a/Library/Data/KTCutStatus.cc b/Library/Data/KTCutStatus.cc
index ee371bd..06e6873 100644
--- a/Library/Data/KTCutStatus.cc
+++ b/Library/Data/KTCutStatus.cc
@@ -15,7 +15,7 @@ namespace Nymph
     KTLOGGER(cutlog, "KTCut");
 
     KTCutStatus::KTCutStatus() :
-            fCutResults(new KTCutResultHandle()),
+            fCutResults(),
             fSummary()
     {
     }
@@ -68,99 +68,16 @@ namespace Nymph
         return;
     }
 
-    bool KTCutStatus::AddCutResult(const std::string& cutName, bool state, bool doUpdateStatus)
-    {
-        if (! HasCutResult(cutName))
-        {
-            KTExtensibleStructFactory< KTCutResultCore >* factory = KTExtensibleStructFactory< KTCutResultCore >::get_instance();
-            KTCutResult* newCut = factory->Create(cutName, fCutResults.get());
-            if (newCut == NULL)
-            {
-                KTERROR(cutlog, "Could not create cut of type <" << cutName << ">");
-                return false;
-            }
-            newCut->SetState(state);
-
-            if (doUpdateStatus) UpdateStatus();
-            return true;
-        }
-        return false;
-
-    }
-
-    bool KTCutStatus::HasCutResult(const std::string& cutName) const
-    {
-        if (GetCutResult(cutName) == NULL) return false;
-        return true;
-
-    }
-
-    bool KTCutStatus::GetCutState(const std::string& cutName) const
-    {
-        const KTCutResult* cut = GetCutResult(cutName);
-        if (cut == NULL) return false;
-        return cut->GetState();
-    }
-
-    const KTCutResult& KTCutStatus::GetCutResult(const std::string& cutName) const
-    {
-        const KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
-        while (cut != NULL)
-        {
-            if (cut->Name() == cutName) return cut;
-            cut = cut->Next();
-        }
-        throw KTException() << "Cannot find cut result";
-    }
-
-    KTCutResult& KTCutStatus::GetCutResult(const std::string& cutName)
-    {
-        KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
-        while (cut != NULL)
-        {
-            if (cut->Name() == cutName) return cut;
-            cut = cut->Next();
-        }
-        throw KTException() << "Cannot find cut result";
-    }
-
-    bool KTCutStatus::SetCutState(const std::string& cutName, bool state, bool doUpdateStatus)
-    {
-        KTCutResult* cut = GetCutResult(cutName);
-        if (cut == NULL)
-        {
-            KTWARN(cutlog, "Cut <" << cutName << "> not found");
-            return false;
-        }
-        cut->SetState(state);
-
-        if (doUpdateStatus) UpdateStatus();
-        return true;
-    }
-
-    /*
-    void KTCutStatus::RemoveCutResult(const std::string& cutName, bool doUpdateStatus)
-    {
-        KTCutResult* cut = fCutResults.get(); // don't skip over KTCutResultHandle
-        KTCutResult* nextCut = cut->Next();
-        while (nextCut != NULL)
-        {
-            if (nextCut->Name() == cutName)
-            {
-                // problem: can't pass nextCut->Next() to cut->Next()
-                if (doUpdateStatus) UpdateStatus();
-            }
-        }
-        return;
-    }
-    */
-
     std::string KTCutStatus::CutResultsPresent() const
     {
         KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
         if (cut == NULL ) return "";
 
         std::string cutsPresent;
+        for (auto cutIt = fCutResults.cbegin(); cutIt != fCutResults.cend(); ++cutIt)
+        {
+            cutsPresent = cutIt->Name() + cutsPresent;
+        }
         while (true)
         {
             cutsPresent = cut->Name() + cutsPresent;
@@ -171,19 +88,6 @@ namespace Nymph
         return cutsPresent;
     }
 
-    // private class KTCutStatus::KTCutResultHandle
-    // purposefully not registered with the cut factory
-    KTCutStatus::KTCutResultHandle::KTCutResultHandle() :
-                KTExtensibleCutResult< KTCutStatus::KTCutResultHandle >()
-    {
-        fState = false;
-    }
-    KTCutStatus::KTCutResultHandle::~KTCutResultHandle()
-    {}
-
-    const std::string KTCutStatus::KTCutResultHandle::sName("top");
-
-
     std::ostream& operator<<(std::ostream& out, const KTCutStatus& status)
     {
         out << "Cut summary: " << status.fSummary << '\n';
diff --git a/Library/Data/KTCutStatus.hh b/Library/Data/KTCutStatus.hh
index f90a847..cf9d7b9 100644
--- a/Library/Data/KTCutStatus.hh
+++ b/Library/Data/KTCutStatus.hh
@@ -15,8 +15,9 @@
 
 #include <boost/dynamic_bitset.hpp>
 
+#include <algorithm>
 #include <memory>
-#include <string>
+#include <vector>
 
 namespace Nymph
 {
@@ -58,17 +59,11 @@ namespace Nymph
         public:
             typedef boost::dynamic_bitset< > bitset_type;
 
-        private:
-            // private class KTCutStatus::KTCutResultHandle
-            // purposefully not registered with the cut factory
-            class KTCutResultHandle : public KTExtensibleCutResult< KTCutResultHandle >
-            {
-                public:
-                    KTCutResultHandle();
-                    ~KTCutResultHandle();
+            typedef std::shared_ptr< KTCutResult > CutResultPtr;
+            typedef std::vector< CutResultPtr > CutResults_t;
 
-                    static const std::string sName;
-            };
+            typedef CutResults_t::iterator CutResultsIt;
+            typedef CutResults_t::const_iterator CutResultsCIt;
 
         public:
             KTCutStatus();
@@ -77,33 +72,33 @@ namespace Nymph
 
             KTCutStatus& operator=(const KTCutStatus& rhs);
 
-            const std::shared_ptr< KTCutResult > CutResults() const;
+            const CutResults_t& CutResults() const;
 
             void UpdateStatus();
 
             template< typename XCutType >
             bool AddCutResult(bool state, bool doUpdateStatus=true);
-            bool AddCutResult(const std::string& cutName, bool state, bool doUpdateStatus=true);
-            // overload for const char* to avoid specializing the templated function below
-            bool AddCutResult(const char* cutName, bool state, bool doUpdateStatus=true);
             template< typename XCutType >
-            bool AddCutResult(const XCutType& cut, bool doUpdateStatus=true);
+            bool AddCutResult(const XCutType& cut, bool state, bool doUpdateStatus=true);
 
             template< typename XCutType >
-            bool HasCutResult() const;
-            bool HasCutResult(const std::string& cutName) const;
+            CutResultsIt FindCutResult();
+            CutResultsIt FindCutResult(const std::string& cutName);
 
             template< typename XCutType >
-            bool GetCutState() const;
-            bool GetCutState(const std::string& cutName) const;
+            CutResultsCIt FindCutResultC() const;
+            CutResultsCIt FindCutResultC(const std::string& cutName) const;
+
+            CutResultsIt  CutResultsEnd();
+            CutResultsCIt CutResultsEndC() const;
 
             template< typename XCutType >
-            const KTCutResult& GetCutResult() const;
-            const KTCutResult& GetCutResult(const std::string& cutName) const;
+            bool HasCutResult() const;
+            bool HasCutResult(const std::string& cutName) const;
 
             template< typename XCutType >
-            KTCutResult& GetCutResult();
-            KTCutResult& GetCutResult(const std::string& cutName);
+            bool GetCutState() const;
+            bool GetCutState(const std::string& cutName) const;
 
             template< typename XCutType >
             bool SetCutState(bool state, bool doUpdateStatus=true);
@@ -111,8 +106,7 @@ namespace Nymph
 
             template< typename XCutType >
             void RemoveCutResult(bool doUpdateStatus=true);
-            // cannot currently update by cut name
-            //void RemoveCutResult(const std::string& cutName, bool doUpdateStatus=true);
+            void RemoveCutResult(const std::string& cutName, bool doUpdateStatus=true);
 
             /// Returns a string with the names of the cuts that are present in bitset order
             std::string CutResultsPresent() const;
@@ -121,7 +115,7 @@ namespace Nymph
         private:
             friend std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
 
-            std::unique_ptr< KTCutResultHandle > fCutResults;
+            CutResults_t fCutResults;
 
             bitset_type fSummary;
 
@@ -139,9 +133,9 @@ namespace Nymph
     std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
 
 
-    inline const std::shared_ptr< KTCutResult > KTCutStatus::CutResults() const
+    inline const KTCutStatus::CutResults_t& KTCutStatus::CutResults() const
     {
-        return fCutResults->Next();
+        return fCutResults;
     }
 
     template< typename XCutType >
@@ -149,70 +143,102 @@ namespace Nymph
     {
         if (! HasCutResult< XCutType >())
         {
-            fCutResults.get()->Of< XCutType >().SetState(state);
+            fCutResults.emplace_back( state );
             if (doUpdateStatus) UpdateStatus();
             return true;
         }
         return false;
     }
 
-    inline bool KTCutStatus::AddCutResult(const char* cutName, bool state, bool doUpdateStatus)
-    {
-        return AddCutResult(std::string(cutName), state, doUpdateStatus);
-    }
-
     template< typename XCutType >
-    bool KTCutStatus::AddCutResult(const XCutType& cut, bool doUpdateStatus)
+    bool KTCutStatus::AddCutResult(const XCutType&, bool state, bool doUpdateStatus)
     {
         if (! HasCutResult< XCutType >())
         {
-            fCutResults.get()->Of< XCutType >() = cut;
+            fCutResults.emplace_back( state );
             if (doUpdateStatus) UpdateStatus();
             return true;
         }
         return false;
     }
 
+    template< typename XCutType >
+    inline KTCutStatus::CutResultsIt KTCutStatus::FindCutResult()
+    {
+        return std::find_if( fCutResults.begin(), fCutResults.end(), CheckCutResultType< XCutType > );
+    }
+
+    inline KTCutStatus::CutResultsIt KTCutStatus::FindCutResult( const std::string& name )
+    {
+        return std::find_if( fCutResults.begin(), fCutResults.end(), CheckCutResultName(name) );
+    }
+
+    template< typename XCutType >
+    inline KTCutStatus::CutResultsCIt KTCutStatus::FindCutResultC() const
+    {
+        return std::find_if( fCutResults.cbegin(), fCutResults.cend(), CheckCutResultType< XCutType > );
+    }
+
+    inline KTCutStatus::CutResultsCIt KTCutStatus::FindCutResultC( const std::string& name ) const
+    {
+        return std::find_if( fCutResults.cbegin(), fCutResults.cend(), CheckCutResultName(name) );
+    }
+
+    inline KTCutStatus::CutResultsIt KTCutStatus::CutResultsEnd()
+    {
+        return fCutResults.end();
+    }
+
+    inline KTCutStatus::CutResultsCIt KTCutStatus::CutResultsEndC() const
+    {
+        return fCutResults.cend();
+    }
+
     template< typename XCutType >
     inline bool KTCutStatus::HasCutResult() const
     {
-        return fCutResults.get()->Has< XCutType >();
+        return FindCutResultC< XCutType >() != std::end(fCutResults);
+    }
+
+    inline bool KTCutStatus::HasCutResult( const std::string& name) const
+    {
+        return FindCutResultC(name) != std::end(fCutResults);
     }
 
     template< typename XCutType >
     bool KTCutStatus::GetCutState() const
     {
-        if (HasCutResult< XCutType >())
+        auto cutIt = FindCutResult< XCutType >();
+        if (cutIt != fCutResults.cend())
         {
-            return fCutResults.get()->Of< XCutType >().GetState();
+            return cutIt->fState;
         }
         return false;
     }
 
-    template< typename XCutType >
-    const KTCutResult& KTCutStatus::GetCutResult() const
+    bool KTCutStatus::GetCutState( const std::string& name ) const
     {
-        if (HasCutResult< XCutType >())
+        CutResultsCIt cutIt = FindCutResultC(name);
+        if (cutIt != fCutResults.cend())
         {
-            return fCutResults.get()->Of< XCutType >();
+            return (*cutIt)->fState;
         }
-        throw KTException() << "Cannot find cut result";
+        return false;
     }
 
     template< typename XCutType >
-    KTCutResult& KTCutStatus::GetCutResult()
+    inline void KTCutStatus::RemoveCutResult(bool doUpdateStatus)
     {
-        if (HasCutResult< XCutType >())
-        {
-            return fCutResults.get()->Of< XCutType >();
-        }
-        throw KTException() << "Cannot find cut result";
+        auto cutIt = FindCutResult< XCutType >();
+        if (cutIt != fCutResults.end()) fCutResults.erase(cutIt);
+        if (doUpdateStatus) UpdateStatus();
+        return;
     }
 
-    template< typename XCutType >
-    inline void KTCutStatus::RemoveCutResult(bool doUpdateStatus)
+    inline void KTCutStatus::RemoveCutResult(const std::string& name, bool doUpdateStatus)
     {
-        delete fCutResults.get()->Detatch< XCutType >();
+        auto cutIt = FindCutResult(name);
+        if (cutIt != fCutResults.end()) fCutResults.erase(cutIt);
         if (doUpdateStatus) UpdateStatus();
         return;
     }
diff --git a/Library/Data/KTData.cc b/Library/Data/KTData.cc
index 9294aab..9cc427c 100644
--- a/Library/Data/KTData.cc
+++ b/Library/Data/KTData.cc
@@ -19,6 +19,10 @@ namespace Nymph
             fName()
     {}
 
+    KTDataRider::KTDataRider( const KTDataRider& orig ) :
+            fName( orig.fName )
+    {}
+
     KTDataRider::~KTDataRider()
     {}
 
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 330e840..3e8f34e 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -38,6 +38,7 @@ namespace Nymph
     {
         public:
             KTDataRider();
+            KTDataRider( const KTDataRider& orig );
             virtual ~KTDataRider();
 
             MEMBERVARIABLE_REF( std::string, Name );
@@ -62,7 +63,9 @@ namespace Nymph
         public:
             KTExtensibleDataRider() = delete;
             KTExtensibleDataRider( const std::string& name ) { KTDataRider::fName = name; }
+            KTExtensibleDataRider( const KTExtensibleDataRider< XDerivedType >& orig ) : KTExtensibleStruct< XDerivedType, KTDataRider >( *this ) {}
             virtual ~KTExtensibleDataRider() {}
+
 /*
             template< class Archive >
             void serialize( Archive& ar )
@@ -78,8 +81,14 @@ namespace Nymph
         { \
             public: \
                 ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >( label ) {} \
+                ex_data_class_name( const ex_data_class_name& orig ) : data_class_name( *this ), KTExtensibleDataRider< ex_data_class_name >( *this ) {} \
                 virtual ~ex_data_class_name() {} \
                 \
+                std::shared_ptr< KTExtensibleStructCore< KTDataRider > > Clone() const \
+                { \
+                    std::shared_ptr< ex_data_class_name > copy = std::make_shared< ex_data_class_name >( *this ); \
+                    return std::static_pointer_cast< KTExtensibleStructCore< KTDataRider >, ex_data_class_name >( copy ); \
+                } \
         };
 
 /*
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index c439d6a..f2dc0c2 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -26,7 +26,8 @@ namespace Nymph
     struct KTExtensibleStructCore : public XBaseType
     {
         public:
-            typedef std::shared_ptr< XBaseType > BasePtr;
+            typedef KTExtensibleStructCore< XBaseType > BasePtrType;
+            typedef std::shared_ptr< BasePtrType > BasePtr;
 
         public:
             /// Default constructor
@@ -53,7 +54,7 @@ namespace Nymph
             /// Duplicates the extended object
             virtual BasePtr Clone() const = 0;
             /// Duplicates object only
-            virtual void Pull( const KTExtensibleStructCore< XBaseType >& object ) = 0;
+            virtual void Pull( const BasePtrType& object ) = 0;
             /// Returns the pointer to the next field
             BasePtr Next() const;
             /// Returns the pointer to the previous field
@@ -80,6 +81,7 @@ namespace Nymph
     struct KTExtensibleStruct : KTExtensibleStructCore< XBaseType >
     {
         public:
+            typedef typename KTExtensibleStructCore< XBaseType >::BasePtrType BasePtrType;
             typedef typename KTExtensibleStructCore< XBaseType >::BasePtr BasePtr;
 
         public:
@@ -93,7 +95,7 @@ namespace Nymph
             /// Duplicates the extended object
             virtual BasePtr Clone() const;
             /// Duplicates object only
-            virtual void Pull( const KTExtensibleStructCore< XBaseType >& object );
+            virtual void Pull( const BasePtrType& object );
             void SetIsCopyDisabled( bool flag );
         private:
             bool fIsCopyDisabled;
@@ -170,7 +172,7 @@ namespace Nymph
         if (! fNext)
         {
             fNext = std::make_shared< XStructType >();
-            fNext->fPrev.reset( const_cast< KTExtensibleStructCore< XBaseType >* >(this) );
+            fNext->fPrev.reset( const_cast< BasePtrType* >(this) );
         }
 
         return fNext->template Of<XStructType>();
@@ -272,7 +274,7 @@ namespace Nymph
     void KTExtensibleStruct<XInstanceType, XBaseType>::serialize( Archive& ar )
     {
         std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
-        ar( cereal::base_class< KTExtensibleStructCore< XBaseType > >( this ), fIsCopyDisabled );
+        ar( cereal::base_class< BasePtrType >( this ), fIsCopyDisabled );
 
         return;
     }
@@ -299,7 +301,7 @@ namespace Nymph
 
         if (object.fNext)
         {
-            this->fNext.reset( object.fNext->Clone() );
+            this->fNext = object.fNext->Clone();
         }
     }
 
@@ -317,7 +319,7 @@ namespace Nymph
         if (object.fNext)
         {
             this->fNext = object.fNext->Clone();
-            this->KTExtensibleStructCore< XBaseType >::SetPrevPtrInNext();
+            this->BasePtrType::SetPrevPtrInNext();
             //this->fNext->fPrev = this;
         }
 
@@ -329,18 +331,20 @@ namespace Nymph
     {
         // assume CRTP is used properly,
         // otherwise compiling fails here (intended behavior)
-        BasePtr instance = std::make_shared< XBaseType >( XInstanceType(dynamic_cast<const XInstanceType&>(*this)) );
+        typedef KTExtensibleStruct< XInstanceType, XBaseType > InstancePtrType;
+        typedef std::shared_ptr< InstancePtrType > InstancePtr;
+        InstancePtr instance = std::make_shared< InstancePtrType >( XInstanceType(dynamic_cast<const XInstanceType&>(*this)) );
         if (this->fNext)
         {
-            instance->fNext.reset( this->fNext->Clone() );
+            instance->fNext = this->fNext->Clone();
             instance->SetPrevPtrInNext();
             //instance->fNext->fPrev = instance->fNext;
         }
-        return instance;
+        return std::static_pointer_cast< BasePtrType, InstancePtrType >( instance );
     }
 
     template<class XInstanceType, class XBaseType>
-    void KTExtensibleStruct<XInstanceType, XBaseType>::Pull(const KTExtensibleStructCore<XBaseType>& object)
+    void KTExtensibleStruct<XInstanceType, XBaseType>::Pull(const BasePtrType& object)
     {
         if (&object == this)
         {

From b0f3c7c365097958b722cf673022e1f1641cca0f Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Fri, 9 Feb 2018 13:36:04 +0100
Subject: [PATCH 093/521] It works! KTWrapProcessor can be used as base class
 in python and added to the processor toolbox. Methods can be overwritten in
 python and called by the slot function.

---
 Executables/Validation/TestWrapProcessor.py | 21 ++++++++++++---------
 Library/NymphPybind.cc                      |  2 +-
 Library/Processor/KTProcessorPybind.hh      |  4 ++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
index fd53b8b..d05fe79 100644
--- a/Executables/Validation/TestWrapProcessor.py
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -8,23 +8,26 @@
 import py_nymph_validation as nv
 
 class WrappedProcessor(nymph.WrapProcessor):
-    def __init__(self):
-        super(WrappedProcessor, self).__init__()
+#    def WrapFunction(self, x):
+#        self.fThreshold = 0
+#        print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(self.fThreshold))
     pass
 
+print("Making instace in python of class WrappedProcessor that inherits from nymph.WrapProcessor")
+p = WrappedProcessor()
+
+print("Overwriting WrapFunction that will be called from the slot function")
+p.WrapFunction = lambda x: print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(p.fThreshold))
 
+print("Adding a new variable to the processor")
+p.fThreshold = 6
+
+print('property fThreshold from python processor is {}'.format(p.fThreshold))
 ptb = nymph.KTProcessorToolbox('pt')
 
 print('Configuring')
 
 ptb.AddProcessor('test-p-proc', 'tpp')
-#ptb.AddProcessor('test-proc-b', 'tp')
-
-p = WrappedProcessor()
-p.WrapFunction = lambda x: print("Hey, I'm python")
-print('type of WrappedProcessor in python is: {}'.format( type(p)))
-
-
 ptb.AddProcessor('bwp', p)
 ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
 
diff --git a/Library/NymphPybind.cc b/Library/NymphPybind.cc
index d3397ac..e569bba 100644
--- a/Library/NymphPybind.cc
+++ b/Library/NymphPybind.cc
@@ -18,7 +18,7 @@ PYBIND11_MODULE( py_nymph, mod )
 
     pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
 
-    pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
+    pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor, Nymph::KTProcessor, std::shared_ptr<Nymph::KTWrapProcessor>> wrap_processor(mod, "WrapProcessor", pybind11::dynamic_attr());
             wrap_processor
 				.def(pybind11::init<>())
 				.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
diff --git a/Library/Processor/KTProcessorPybind.hh b/Library/Processor/KTProcessorPybind.hh
index 8cccc6f..e82faf2 100644
--- a/Library/Processor/KTProcessorPybind.hh
+++ b/Library/Processor/KTProcessorPybind.hh
@@ -63,6 +63,10 @@ namespace Nymph
 
 			// Trampoline (need one for each virtual function)
 			void WrapFunction(int input) override {
+				// I dont know what these two lines do,
+				// but at least the first one is necessary or nymph hangs when calling this as python method
+				pybind11::gil_scoped_release release;
+				pybind11::gil_scoped_acquire acquire;
 				PYBIND11_OVERLOAD_PURE(
 						void, // Return type
 						KTWrapProcessor,      // Parent class

From a5b7ff2cb4dbb6ba479bdeaca57b5caef9c1248c Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Fri, 9 Feb 2018 13:57:23 +0100
Subject: [PATCH 094/521] Configure method can be overwritten too.

---
 Executables/Validation/TestWrapProcessor.py | 34 +++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
index d05fe79..75337ad 100644
--- a/Executables/Validation/TestWrapProcessor.py
+++ b/Executables/Validation/TestWrapProcessor.py
@@ -8,32 +8,42 @@
 import py_nymph_validation as nv
 
 class WrappedProcessor(nymph.WrapProcessor):
-#    def WrapFunction(self, x):
-#        self.fThreshold = 0
-#        print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(self.fThreshold))
     pass
 
-print("Making instace in python of class WrappedProcessor that inherits from nymph.WrapProcessor")
+print("\nMaking instace in python of class WrappedProcessor that inherits from nymph.WrapProcessor.\n")
 p = WrappedProcessor()
 
-print("Overwriting WrapFunction that will be called from the slot function")
-p.WrapFunction = lambda x: print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(p.fThreshold))
-
-print("Adding a new variable to the processor")
-p.fThreshold = 6
 
-print('property fThreshold from python processor is {}'.format(p.fThreshold))
 ptb = nymph.KTProcessorToolbox('pt')
 
 print('Configuring')
-
 ptb.AddProcessor('test-p-proc', 'tpp')
 ptb.AddProcessor('bwp', p)
 ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
 
-
 ptb.PushBackToRunQueue('tpp')
 
+
+print("\nBefore running: Overwrite WrapFunction that will be called from the slot function.\n")
+p.WrapFunction = lambda x: print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(p.fThreshold))
+
+
+print("Add a new variable to the processor.\n")
+p.fThreshold = 6
+print('Property fThreshold from python processor is {}.\n'.format(p.fThreshold))
+
+
+print('Define new Configure method to set self.fThreshold.\n')
+def Configure(self, a):
+    print('In Configure: Setting new fThreshold.\n')
+    self.fThreshold = a
+    
+p.Configure = Configure
+p.Configure(p, 7)
+
+
+
+
 print('Running')
 
 ptb.Run()

From 1e82c9675a39d968c9e90e014c648fc383c89f99 Mon Sep 17 00:00:00 2001
From: cclaessens <claessen@uni-mainz.de>
Date: Fri, 9 Feb 2018 14:09:21 +0100
Subject: [PATCH 095/521] Removed commented processors for pybind from
 KTTestProcessors, KTPyTestClassPybind.hh and NymphValidationPybind.cc

---
 Executables/Validation/KTPyTestClassPybind.hh | 26 ----------------
 Executables/Validation/KTTestProcessor.cc     | 31 -------------------
 Executables/Validation/KTTestProcessor.hh     | 19 ------------
 .../Validation/NymphValidationPybind.cc       |  8 -----
 4 files changed, 84 deletions(-)

diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
index e016939..459ecce 100644
--- a/Executables/Validation/KTPyTestClassPybind.hh
+++ b/Executables/Validation/KTPyTestClassPybind.hh
@@ -23,30 +23,4 @@ namespace Nymph
                 ;
     };
 
-/*	class KTPyWrapProcessor: public KTWrapProcessor
-	{
-		public:
-			// Inherit the constructors
-			using KTWrapProcessor::KTWrapProcessor;
-
-			// Trampoline (need one for each virtual function)
-			void WrapFunction(int input) override {
-				PYBIND11_OVERLOAD_PURE(
-						void, // Return type
-						KTWrapProcessor,      // Parent class
-						WrapFunction,          // Name of function in C++ (must match Python name)
-						input      // Argument(s)
-						);
-			}
-			bool Configure(const scarab::param_node& node) override {
-							PYBIND11_OVERLOAD(
-									bool, // Return type
-									KTWrapProcessor,      // Parent class
-									Configure,          // Name of function in C++ (must match Python name)
-									node      // Argument(s)
-									);
-			}
-	};*/
-
-
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
index cd151cd..f045160 100644
--- a/Executables/Validation/KTTestProcessor.cc
+++ b/Executables/Validation/KTTestProcessor.cc
@@ -180,35 +180,4 @@ namespace Nymph
         return;
     }
 
-  /*  KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
-
-    KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
-            KTProcessor( name ),
-            fSlot("wrap-slot", this, &KTWrapProcessor::SlotFunc)
-
-    {
-    }
-
-    KTWrapProcessor::~KTWrapProcessor()
-    {
-    }
-
-    bool KTWrapProcessor::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTWrapProcessor::SlotFunc(int input)
-    {
-        KTINFO(testsiglog, "Calling wrap function ");
-        this->WrapFunction(input);
-        return;
-    }
-
-    void KTWrapProcessor::WrapFunction(int input)
-    {
-        KTINFO(testsiglog, "Hey, I'm base class");
-        return;
-    }*/
-
 } /* namespace Nymph */
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
index d14930f..c274ee9 100644
--- a/Executables/Validation/KTTestProcessor.hh
+++ b/Executables/Validation/KTTestProcessor.hh
@@ -10,8 +10,6 @@
 
 #include "KTProcessor.hh"
 #include "KTSlot.hh"
-//#include "pybind11/pybind11.h"
-
 
 //using namespace py;
 
@@ -130,22 +128,5 @@ namespace Nymph
             KTSignalData fDerived2DataSignal;
     };
 
-
- /*   class KTWrapProcessor : public KTProcessor
-    {
-        public:
-            KTWrapProcessor( const std::string& name = "base-wrap-proc" );
-            virtual ~KTWrapProcessor();
-
-            bool Configure(const scarab::param_node& node);
-
-            void SlotFunc(int);
-            virtual void WrapFunction(int input);
-
-        private:
-            KTSlot< int > fSlot;
-
-    };*/
-
 } /* namespace Nymph */
 #endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Executables/Validation/NymphValidationPybind.cc b/Executables/Validation/NymphValidationPybind.cc
index 2c4281e..f281181 100644
--- a/Executables/Validation/NymphValidationPybind.cc
+++ b/Executables/Validation/NymphValidationPybind.cc
@@ -15,14 +15,6 @@ PYBIND11_MODULE( py_nymph_validation, mod )
     Nymph::ExportKTPyTestClass( mod );
     Nymph::ExportTestPythonBasics( mod );
 
-    /*pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor> wrap_processor(mod, "WrapProcessor");
-        wrap_processor
-    		.def(pybind11::init<>())
-    		.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
-        	.def("Configure", &Nymph::KTWrapProcessor::Configure);
-*/
-    //pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
-
 }
 
 

From 54604a21d62bf26a26de134ef3ccf1dfc939264c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 9 Feb 2018 14:01:59 -0800
Subject: [PATCH 096/521] Better cut setup.  Compiles but test programs
 segfault.

---
 Executables/Validation/KTTestCuts.cc        |  12 +-
 Executables/Validation/KTTestCuts.hh        |  12 --
 Executables/Validation/TestApplyCut.cc      |  30 ++--
 Executables/Validation/TestCut.cc           |  33 +++--
 Executables/Validation/TestCutFilter.cc     |  30 ++--
 Library/Application/KTPrintDataStructure.cc |  13 +-
 Library/Data/KTCut.hh                       |   5 +-
 Library/Data/KTCutResult.hh                 |  33 +----
 Library/Data/KTCutStatus.cc                 |  54 +++----
 Library/Data/KTCutStatus.hh                 | 153 ++++++++++----------
 10 files changed, 171 insertions(+), 204 deletions(-)

diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index 345ed5f..e486445 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -14,11 +14,8 @@ namespace Nymph
 {
     KTLOGGER(testlog, "KTTestCuts");
 
-    const std::string KTAwesomeCut::Result::sName = "awesome-cut";
-    const std::string KTNotAwesomeCut::Result::sName = "not-awesome-cut";
-
-    KT_REGISTER_CUT(KTAwesomeCut);
-    KT_REGISTER_CUT(KTNotAwesomeCut);
+    KT_REGISTER_CUT(KTAwesomeCut, "awesome-cut");
+    KT_REGISTER_CUT(KTNotAwesomeCut, "not-awesome-cut");
 
 
     KTAwesomeCut::KTAwesomeCut(const std::string& name) :
@@ -40,7 +37,7 @@ namespace Nymph
         bool isCut = ! testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
         KTDEBUG(testlog, "Is data cut? " << isCut);
-        data.CutStatus().AddCutResult< KTAwesomeCut::Result >(isCut);
+        data.CutStatus().SetCutState(fConfigName, isCut);
         return isCut;
     }
 
@@ -64,8 +61,7 @@ namespace Nymph
         bool isCut = testData.GetIsAwesome();
         KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
         KTDEBUG(testlog, "Is data cut? " << isCut);
-        // use the name-based AddCutResult
-        data.CutStatus().AddCutResult("not-awesome-cut", isCut);
+        data.CutStatus().SetCutState(fConfigName, isCut);
         return isCut;
     }
 
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
index 6fc12e6..5ebe0d6 100644
--- a/Executables/Validation/KTTestCuts.hh
+++ b/Executables/Validation/KTTestCuts.hh
@@ -21,12 +21,6 @@ namespace Nymph
     // Cuts data that is NOT awesome
     class KTAwesomeCut : public KTCutOnData< KTTestDataExt >
     {
-        public:
-            struct Result : KTExtensibleCutResult< Result >
-            {
-                static const std::string sName;
-            };
-
         public:
             KTAwesomeCut(const std::string& name = "default-awesome-cut");
             virtual ~KTAwesomeCut();
@@ -39,12 +33,6 @@ namespace Nymph
     // Cuts data that is IS awesome
     class KTNotAwesomeCut : public KTCutOnData< KTTestDataExt >
     {
-        public:
-            struct Result : KTExtensibleCutResult< Result >
-            {
-                static const std::string sName;
-            };
-
         public:
             KTNotAwesomeCut(const std::string& name = "default-not-awesome-cut");
             virtual ~KTNotAwesomeCut();
diff --git a/Executables/Validation/TestApplyCut.cc b/Executables/Validation/TestApplyCut.cc
index c3fe237..8998ac9 100644
--- a/Executables/Validation/TestApplyCut.cc
+++ b/Executables/Validation/TestApplyCut.cc
@@ -22,6 +22,12 @@ int main()
     KTTestData& testData = dataHandle->Of< KTTestDataExt >();
 
     KTCutStatus& cutStatus = dataHandle->CutStatus();
+    unsigned awesomeCutPos = 0;
+    string awesomeCutName("awesome-cut");
+    unsigned notAwesomeCutPos = 1;
+    string notAwesomeCutName("not-awesome-cut");
+    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
+    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTApplyCut applyCut;
@@ -31,10 +37,10 @@ int main()
     applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTAwesomeCut::Result>? " << cutStatus.HasCutResult< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"awesome-cut\" is: " << cutStatus.GetCutState("awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTAwesomeCut::Result> is: " << cutStatus.GetCutState< KTAwesomeCut::Result >());
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
     KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
     KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
 
@@ -43,14 +49,14 @@ int main()
     applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTAwesomeCut::Result>? " << cutStatus.HasCutResult< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"awesome-cut\" is: " << cutStatus.GetCutState("awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTAwesomeCut::Result> is: " << cutStatus.GetCutState< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Has cut result \"not-awesome-cut\"? " << cutStatus.HasCutResult("not-awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTNotAwesomeCut::Result>? " << cutStatus.HasCutResult< KTNotAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"not-awesome-cut\" is: " << cutStatus.GetCutState("not-awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTNotAwesomeCut::Result> is: " << cutStatus.GetCutState< KTNotAwesomeCut::Result >());
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
     KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
     KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
     KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
diff --git a/Executables/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
index 0e4403e..ac9f6a0 100644
--- a/Executables/Validation/TestCut.cc
+++ b/Executables/Validation/TestCut.cc
@@ -21,6 +21,15 @@ int main()
     KTTestDataExt& testData = data.Of< KTTestDataExt >();
 
     KTCutStatus& cutStatus = data.CutStatus();
+
+    KTINFO(testlog, "Assigning cuts");
+    unsigned awesomeCutPos = 0;
+    string awesomeCutName("awesome-cut");
+    unsigned notAwesomeCutPos = 1;
+    string notAwesomeCutName("not-awesome-cut");
+    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
+    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
+
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTINFO(testlog, "Applying awesome cut");
@@ -28,10 +37,10 @@ int main()
     cut.Apply(data, testData);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTAwesomeCut::Result>? " << cutStatus.HasCutResult< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"awesome-cut\" is: " << cutStatus.GetCutState("awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTAwesomeCut::Result> is: " << cutStatus.GetCutState< KTAwesomeCut::Result >());
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
     KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
     KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
 
@@ -40,14 +49,14 @@ int main()
     naCut.Apply(data, testData);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTAwesomeCut::Result>? " << cutStatus.HasCutResult< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"awesome-cut\" is: " << cutStatus.GetCutState("awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTAwesomeCut::Result> is: " << cutStatus.GetCutState< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Has cut result \"not-awesome-cut\"? " << cutStatus.HasCutResult("not-awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTNotAwesomeCut::Result>? " << cutStatus.HasCutResult< KTNotAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"not-awesome-cut\" is: " << cutStatus.GetCutState("not-awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTNotAwesomeCut::Result> is: " << cutStatus.GetCutState< KTNotAwesomeCut::Result >());
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
     KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
     KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
     KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
diff --git a/Executables/Validation/TestCutFilter.cc b/Executables/Validation/TestCutFilter.cc
index 4b770cc..04a96df 100644
--- a/Executables/Validation/TestCutFilter.cc
+++ b/Executables/Validation/TestCutFilter.cc
@@ -23,6 +23,12 @@ int main()
     KTTestData& testData = dataHandle->Of< KTTestDataExt >();
 
     KTCutStatus& cutStatus = dataHandle->CutStatus();
+    unsigned awesomeCutPos = 0;
+    string awesomeCutName("awesome-cut");
+    unsigned notAwesomeCutPos = 1;
+    string notAwesomeCutName("not-awesome-cut");
+    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
+    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
     KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
     KTApplyCut applyCut;
@@ -32,10 +38,10 @@ int main()
     applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTAwesomeCut::Result>? " << cutStatus.HasCutResult< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"awesome-cut\" is: " << cutStatus.GetCutState("awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTAwesomeCut::Result> is: " << cutStatus.GetCutState< KTAwesomeCut::Result >());
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
     KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
     KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
 
@@ -44,14 +50,14 @@ int main()
     applyCut.ApplyCut(dataHandle);
 
     KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result \"awesome-cut\"? " << cutStatus.HasCutResult("awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTAwesomeCut::Result>? " << cutStatus.HasCutResult< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"awesome-cut\" is: " << cutStatus.GetCutState("awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTAwesomeCut::Result> is: " << cutStatus.GetCutState< KTAwesomeCut::Result >());
-    KTINFO(testlog, "Has cut result \"not-awesome-cut\"? " << cutStatus.HasCutResult("not-awesome-cut"));
-    KTINFO(testlog, "Has cut result <KTNotAwesomeCut::Result>? " << cutStatus.HasCutResult< KTNotAwesomeCut::Result >());
-    KTINFO(testlog, "Cut state of \"not-awesome-cut\" is: " << cutStatus.GetCutState("not-awesome-cut"));
-    KTINFO(testlog, "Cut state of <KTNotAwesomeCut::Result> is: " << cutStatus.GetCutState< KTNotAwesomeCut::Result >());
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
 
     KTCutFilter cutFilter;
     KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index 749324e..d48aa52 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -83,7 +83,7 @@ namespace Nymph
         printbuf << "\nData Structure:\n";
         printbuf << "\t- " << dataHandle->Name() << '\n';
         KTDEBUG(datalog, "Found data type " << dataHandle->Name());
-        KTExtensibleStructCore< KTDataRider >* nextData = dataHandle->Next();
+        KTExtensibleStructCore< KTDataRider >::BasePtr nextData = dataHandle->Next();
         while (nextData != NULL)
         {
             printbuf << "\t- " << nextData->Name() << '\n';
@@ -103,13 +103,14 @@ namespace Nymph
         KTCutStatus& cutStatus = dataHandle->CutStatus();
         printbuf << "\n" << cutStatus;
 
-        const KTCutResult* cutResult = cutStatus.CutResults();
+        const KTCutStatus::CutResults_t cutResults = cutStatus.CutResults();
         printbuf << "Cut Structure:\n";
-        while (cutResult != NULL)
+        unsigned nCuts = cutResults.size();
+        for (unsigned iCut = 0; iCut < nCuts; ++iCut)
         {
-            printbuf << "\t- " << cutResult->Name() << " -- is cut: " << cutResult->GetState() << '\n';
-            KTDEBUG(datalog, "Found cut type " << cutResult->Name());
-            cutResult = cutResult->Next();
+            if (! cutResults[iCut].fAssigned) continue;
+            printbuf << "\t" << iCut << " -- " << cutResults[iCut].fName << " -- is cut: " << cutResults[iCut].fState << '\n';
+            KTDEBUG(datalog, "Found cut type " << cutResults[iCut].fName << " at mask position " << iCut);
         }
 
         KTINFO(datalog, printbuf.str());
diff --git a/Library/Data/KTCut.hh b/Library/Data/KTCut.hh
index 4cd3d8f..753d83a 100644
--- a/Library/Data/KTCut.hh
+++ b/Library/Data/KTCut.hh
@@ -201,9 +201,8 @@ namespace Nymph
 
 
     // this macro enforces the existence of cut_class::Result and cut_class::Result::sName at compile time
-#define KT_REGISTER_CUT(cut_class) \
-        static ::scarab::registrar< ::Nymph::KTCut, cut_class, const std::string& > sCut##cut_class##Registrar( cut_class::Result::sName ); \
-        static ::Nymph::KTExtensibleStructRegistrar< ::Nymph::KTCutResultCore, cut_class::Result > sCut##cut_class##ResultRegistrar( cut_class::Result::sName );
+#define KT_REGISTER_CUT(cut_class, cut_name) \
+        static ::scarab::registrar< ::Nymph::KTCut, cut_class, const std::string& > sCut##cut_class##Registrar( cut_name );
 
 } /* namespace Nymph */
 
diff --git a/Library/Data/KTCutResult.hh b/Library/Data/KTCutResult.hh
index 666a147..dbc0438 100644
--- a/Library/Data/KTCutResult.hh
+++ b/Library/Data/KTCutResult.hh
@@ -8,47 +8,26 @@
 #ifndef KTCUTRESULT_HH_
 #define KTCUTRESULT_HH_
 
-//#include "KTExtensibleStruct.hh"
-
-//#include "KTMemberVariable.hh"
-
 #include <string>
 
 namespace Nymph
 {
     struct KTCutResult
     {
+        std::string fName;
         bool fState;
-        KTCutResult( bool state ) { fState = state; }
-        virtual ~KTCutResult() {}
-        virtual const std::string& Name() const = 0;
+        bool fAssigned;
+        KTCutResult() : fName(), fState( false ), fAssigned( false ) {}
+        KTCutResult( const std::string& name, bool state ) : fName( name ), fState( state ), fAssigned( true ) {}
     };
 
-    template< class XCutType >
-    struct KTTypedCutResult : KTCutResult
-    {
-        KTTypedCutResult( bool state ) : KTCutResult( state ) {}
-        virtual ~KTTypedCutResult() {}
-        virtual const std::string& Name() const
-        {
-            return XCutType::GetName();
-        }
-    };
-
-    template< class XCutType >
-    bool CheckCutResultType( std::shared_ptr< KTCutResult > result )
-    {
-        return std::dynamic_pointer_cast< KTTypedCutResult< XCutType > >( result );
-
-    }
-
     struct CheckCutResultName
     {
         std::string fName;
         CheckCutResultName( const std::string& name ) : fName( name ) {}
-        bool operator()( std::shared_ptr< KTCutResult > result )
+        bool operator()( const KTCutResult& result )
         {
-            return result->Name() == fName;
+            return result.fName == fName;
         }
     };
 
diff --git a/Library/Data/KTCutStatus.cc b/Library/Data/KTCutStatus.cc
index 06e6873..d1c1f52 100644
--- a/Library/Data/KTCutStatus.cc
+++ b/Library/Data/KTCutStatus.cc
@@ -21,7 +21,7 @@ namespace Nymph
     }
 
     KTCutStatus::KTCutStatus(const KTCutStatus& orig) :
-            fCutResults(dynamic_cast< KTCutResultHandle* >(orig.fCutResults->Clone())),
+            fCutResults(orig.fCutResults),
             fSummary()
     {
         UpdateStatus();
@@ -32,37 +32,34 @@ namespace Nymph
 
     KTCutStatus& KTCutStatus::operator=(const KTCutStatus& rhs)
     {
-        fCutResults.reset(dynamic_cast< KTCutResultHandle* >(rhs.fCutResults->Clone()));
+        fCutResults = rhs.fCutResults;
         UpdateStatus();
         return *this;
     }
 
-    void KTCutStatus::UpdateStatus()
+    void KTCutStatus::AssignCutResult(unsigned maskPos, const std::string& name, bool state, bool doUpdateStatus)
     {
-        KTDEBUG(cutlog, "Updating cut summary");
-        KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
-        if (cut == NULL)
+        if( fCutResults[maskPos].fAssigned )
         {
-            KTDEBUG(cutlog, "No cuts");
-            fSummary.resize(1, false);
-            return;
+            throw KTException() << "Mask position <" << maskPos << "> has already been assigned";
         }
+        fCutResults[maskPos].fName = name;
+        fCutResults[maskPos].fState = state;
+        fCutResults[maskPos].fAssigned = true;
+        if( doUpdateStatus ) UpdateStatus();
+        return;
+    }
 
-        // loop through once to count cuts
-        unsigned nCuts = 0;
-        while (cut != NULL)
-        {
-            ++nCuts;
-            cut = cut->Next();
-        }
-        KTDEBUG(cutlog, nCuts << " cuts");
+    void KTCutStatus::UpdateStatus()
+    {
+        KTDEBUG(cutlog, "Updating cut summary");
+        unsigned nCuts = fCutResults.size();
         fSummary.resize(nCuts, false);
-        // loop through again to set cuts
-        cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
+
+        // loop through to set cuts
         for (unsigned iCut = 0; iCut < nCuts; ++iCut)
         {
-            fSummary[iCut] = cut->GetState();
-            cut = cut->Next();
+            fSummary[iCut] = fCutResults[iCut].fAssigned && fCutResults[iCut].fState;
         }
         KTDEBUG(cutlog, "Cut summary bitset: " << fSummary);
         return;
@@ -70,20 +67,13 @@ namespace Nymph
 
     std::string KTCutStatus::CutResultsPresent() const
     {
-        KTCutResult* cut = fCutResults.get()->Next(); // skip over KTCutResultHandle
-        if (cut == NULL ) return "";
-
         std::string cutsPresent;
         for (auto cutIt = fCutResults.cbegin(); cutIt != fCutResults.cend(); ++cutIt)
         {
-            cutsPresent = cutIt->Name() + cutsPresent;
-        }
-        while (true)
-        {
-            cutsPresent = cut->Name() + cutsPresent;
-            cut = cut->Next();
-            if (cut != NULL) cutsPresent = " " + cutsPresent;
-            else break;
+            if (! cutIt->fName.empty())
+            {
+                cutsPresent = cutIt->fName + " " + cutsPresent;
+            }
         }
         return cutsPresent;
     }
diff --git a/Library/Data/KTCutStatus.hh b/Library/Data/KTCutStatus.hh
index cf9d7b9..2f69f08 100644
--- a/Library/Data/KTCutStatus.hh
+++ b/Library/Data/KTCutStatus.hh
@@ -59,8 +59,7 @@ namespace Nymph
         public:
             typedef boost::dynamic_bitset< > bitset_type;
 
-            typedef std::shared_ptr< KTCutResult > CutResultPtr;
-            typedef std::vector< CutResultPtr > CutResults_t;
+            typedef std::vector< KTCutResult > CutResults_t;
 
             typedef CutResults_t::iterator CutResultsIt;
             typedef CutResults_t::const_iterator CutResultsCIt;
@@ -72,46 +71,48 @@ namespace Nymph
 
             KTCutStatus& operator=(const KTCutStatus& rhs);
 
+            /// Returns the size of the cut results vector
+            size_t size() const;
+
+            /// Returns a reference to the cut results vector
             const CutResults_t& CutResults() const;
 
+            /// Updates the summary bitset from the cut results vector
             void UpdateStatus();
 
-            template< typename XCutType >
-            bool AddCutResult(bool state, bool doUpdateStatus=true);
-            template< typename XCutType >
-            bool AddCutResult(const XCutType& cut, bool state, bool doUpdateStatus=true);
+            /// Adds a new cut result if it doesn't exist, and assigns the specified name and state at maskPos; throws KTException if maskPos is already assigned
+            void AssignCutResult(unsigned maskPos, const std::string& name, bool state=false, bool doUpdateStatus=true);
 
-            template< typename XCutType >
-            CutResultsIt FindCutResult();
-            CutResultsIt FindCutResult(const std::string& cutName);
+            /// Removes the cut by erasing the name and setting the state to false
+            void RemoveCutResult(const std::string& cutName, bool doUpdateStatus=true);
+            /// Removes the cut by erasing the name and setting the state to false
+            void RemoveCutResult(unsigned maskPos, bool doUpdateStatus=true);
 
-            template< typename XCutType >
-            CutResultsCIt FindCutResultC() const;
+            CutResultsIt FindCutResult(const std::string& cutName);
             CutResultsCIt FindCutResultC(const std::string& cutName) const;
 
             CutResultsIt  CutResultsEnd();
             CutResultsCIt CutResultsEndC() const;
 
-            template< typename XCutType >
-            bool HasCutResult() const;
+            /// Returns whether or not the specified cut is present
             bool HasCutResult(const std::string& cutName) const;
+            /// Returns whether or not the specified cut is present (whether or not it has been explicitly assigned)
+            bool HasCutResult(unsigned maskPos) const;
 
-            template< typename XCutType >
-            bool GetCutState() const;
+            /// Returns the state of the named cut; throws KTException if it doesn't exist
             bool GetCutState(const std::string& cutName) const;
+            /// Returns the state of the specified cut; throws KTException if it doesn't exist
+            bool GetCutState(unsigned maskPos) const;
 
-            template< typename XCutType >
-            bool SetCutState(bool state, bool doUpdateStatus=true);
-            bool SetCutState(const std::string& cutName, bool state, bool doUpdateStatus=true);
-
-            template< typename XCutType >
-            void RemoveCutResult(bool doUpdateStatus=true);
-            void RemoveCutResult(const std::string& cutName, bool doUpdateStatus=true);
+            /// Sets the state of the specified cut; throws KTException if it doesn't exist
+            void SetCutState(const std::string& cutName, bool state, bool doUpdateStatus=true);
+            /// Sets the state of the specified cut; throws KTException if it doesn't exist
+            void SetCutState(unsigned maskPos, bool state, bool doUpdateStatus=true);
 
             /// Returns a string with the names of the cuts that are present in bitset order
             std::string CutResultsPresent() const;
 
-            size_t size() const;
+
         private:
             friend std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
 
@@ -138,49 +139,15 @@ namespace Nymph
         return fCutResults;
     }
 
-    template< typename XCutType >
-    bool KTCutStatus::AddCutResult(bool state, bool doUpdateStatus)
-    {
-        if (! HasCutResult< XCutType >())
-        {
-            fCutResults.emplace_back( state );
-            if (doUpdateStatus) UpdateStatus();
-            return true;
-        }
-        return false;
-    }
-
-    template< typename XCutType >
-    bool KTCutStatus::AddCutResult(const XCutType&, bool state, bool doUpdateStatus)
-    {
-        if (! HasCutResult< XCutType >())
-        {
-            fCutResults.emplace_back( state );
-            if (doUpdateStatus) UpdateStatus();
-            return true;
-        }
-        return false;
-    }
-
-    template< typename XCutType >
-    inline KTCutStatus::CutResultsIt KTCutStatus::FindCutResult()
-    {
-        return std::find_if( fCutResults.begin(), fCutResults.end(), CheckCutResultType< XCutType > );
-    }
-
     inline KTCutStatus::CutResultsIt KTCutStatus::FindCutResult( const std::string& name )
     {
+        if( name.empty() ) return fCutResults.end();
         return std::find_if( fCutResults.begin(), fCutResults.end(), CheckCutResultName(name) );
     }
 
-    template< typename XCutType >
-    inline KTCutStatus::CutResultsCIt KTCutStatus::FindCutResultC() const
-    {
-        return std::find_if( fCutResults.cbegin(), fCutResults.cend(), CheckCutResultType< XCutType > );
-    }
-
     inline KTCutStatus::CutResultsCIt KTCutStatus::FindCutResultC( const std::string& name ) const
     {
+        if( name.empty() ) return fCutResults.cend();
         return std::find_if( fCutResults.cbegin(), fCutResults.cend(), CheckCutResultName(name) );
     }
 
@@ -194,51 +161,77 @@ namespace Nymph
         return fCutResults.cend();
     }
 
-    template< typename XCutType >
-    inline bool KTCutStatus::HasCutResult() const
+    inline bool KTCutStatus::HasCutResult( const std::string& name ) const
     {
-        return FindCutResultC< XCutType >() != std::end(fCutResults);
+        return FindCutResultC(name) != std::end(fCutResults);
     }
 
-    inline bool KTCutStatus::HasCutResult( const std::string& name) const
+    inline bool KTCutStatus::HasCutResult( unsigned maskPos ) const
     {
-        return FindCutResultC(name) != std::end(fCutResults);
+        return maskPos < fCutResults.size() && fCutResults[maskPos].fAssigned;
     }
 
-    template< typename XCutType >
-    bool KTCutStatus::GetCutState() const
+    inline bool KTCutStatus::GetCutState( const std::string& name ) const
     {
-        auto cutIt = FindCutResult< XCutType >();
+        CutResultsCIt cutIt = FindCutResultC(name);
         if (cutIt != fCutResults.cend())
         {
             return cutIt->fState;
         }
-        return false;
+        throw KTException() << "Unable to find cut <" << name << ">";
     }
 
-    bool KTCutStatus::GetCutState( const std::string& name ) const
+    inline bool KTCutStatus::GetCutState( unsigned maskPos ) const
     {
-        CutResultsCIt cutIt = FindCutResultC(name);
-        if (cutIt != fCutResults.cend())
+        if (maskPos < fCutResults.size())
         {
-            return (*cutIt)->fState;
+            return fCutResults[maskPos].fState;
+        }
+        throw KTException() << "Mask position <" << maskPos << "> is out of range (only " << size() << " cuts are present)";
+    }
+
+    inline void KTCutStatus::SetCutState(const std::string& name, bool state, bool doUpdateStatus)
+    {
+        CutResultsIt cutIt = FindCutResult(name);
+        if (cutIt != fCutResults.end())
+        {
+            cutIt->fState = state;
+            if (doUpdateStatus) UpdateStatus();
+            return;
         }
-        return false;
+        throw KTException() << "Unable to find cut <" << name << ">";
     }
 
-    template< typename XCutType >
-    inline void KTCutStatus::RemoveCutResult(bool doUpdateStatus)
+    inline void KTCutStatus::SetCutState(unsigned maskPos, bool state, bool doUpdateStatus)
     {
-        auto cutIt = FindCutResult< XCutType >();
-        if (cutIt != fCutResults.end()) fCutResults.erase(cutIt);
+        if (maskPos < fCutResults.size())
+        {
+            fCutResults[maskPos].fState = state;
+            if (doUpdateStatus) UpdateStatus();
+            return;
+        }
+        throw KTException() << "Mask position <" << maskPos << "> is out of range (only "<< size() << " cuts are present)";
+    }
+
+    inline void KTCutStatus::RemoveCutResult(const std::string& name, bool doUpdateStatus)
+    {
+        CutResultsIt cutIt = FindCutResult(name);
+        if (cutIt != fCutResults.end())
+        {
+            cutIt->fName = "";
+            cutIt->fState = false;
+        }
         if (doUpdateStatus) UpdateStatus();
         return;
     }
 
-    inline void KTCutStatus::RemoveCutResult(const std::string& name, bool doUpdateStatus)
+    inline void KTCutStatus::RemoveCutResult(unsigned maskPos, bool doUpdateStatus)
     {
-        auto cutIt = FindCutResult(name);
-        if (cutIt != fCutResults.end()) fCutResults.erase(cutIt);
+        if (maskPos < fCutResults.size())
+        {
+            fCutResults[maskPos].fName = "";
+            fCutResults[maskPos].fState = false;
+        }
         if (doUpdateStatus) UpdateStatus();
         return;
     }

From d8e36eb665200d61afc8966f86e80fbabf23cb49 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 13 Feb 2018 17:49:12 -0800
Subject: [PATCH 097/521] Work on cuts.  KTExtensibleStruct has issues, so I'm
 redeveloping in KTExtTest.

---
 Executables/Validation/CMakeLists.txt |   5 +
 Executables/Validation/KTExtTest.cc   |  18 ++
 Executables/Validation/KTExtTest.hh   | 327 ++++++++++++++++++++++++++
 Executables/Validation/KTTestCuts.cc  |   2 +-
 Executables/Validation/KTTestData.cc  |   8 +-
 Executables/Validation/TestCut.cc     |  94 ++++----
 Executables/Validation/TestData.cc    |  25 ++
 Executables/Validation/TestExt.cc     |  78 ++++++
 Library/Data/KTCoreData.cc            |   5 +-
 Library/Data/KTCutStatus.cc           |   6 +
 Library/Data/KTData.cc                |   8 +-
 Library/Utility/KTExtensibleStruct.hh |  26 +-
 12 files changed, 543 insertions(+), 59 deletions(-)
 create mode 100644 Executables/Validation/KTExtTest.cc
 create mode 100644 Executables/Validation/KTExtTest.hh
 create mode 100644 Executables/Validation/TestData.cc
 create mode 100644 Executables/Validation/TestExt.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index d7ea68f..c15aa51 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -20,6 +20,8 @@ if (Nymph_ENABLE_TESTING)
         KTTestData.hh
         KTTestPrimaryProcessor.hh
         KTTestProcessor.hh
+        
+        KTExtTest.hh
     )
     
     set (VALIDATION_SOURCEFILES
@@ -54,6 +56,7 @@ if (Nymph_ENABLE_TESTING)
         TestCacheDirectory
         TestCut
         TestCutFilter
+        TestData
         TestExceptionInSlot
         TestJSONWriter
         TestLogger
@@ -69,6 +72,8 @@ if (Nymph_ENABLE_TESTING)
         TestSlotData
         TestThroughputProfiler
         TestUseBreakpoint
+        
+        TestExt
     )
     
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
diff --git a/Executables/Validation/KTExtTest.cc b/Executables/Validation/KTExtTest.cc
new file mode 100644
index 0000000..69d59b1
--- /dev/null
+++ b/Executables/Validation/KTExtTest.cc
@@ -0,0 +1,18 @@
+/*
+ * KTExtTest.cc
+ *
+ *  Created on: Feb 11, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTExtTest.hh"
+
+#include <iostream>
+
+namespace Nymph
+{
+
+
+
+
+} /* namespace Nymph */
diff --git a/Executables/Validation/KTExtTest.hh b/Executables/Validation/KTExtTest.hh
new file mode 100644
index 0000000..76fe6ff
--- /dev/null
+++ b/Executables/Validation/KTExtTest.hh
@@ -0,0 +1,327 @@
+/*
+ * KTExtTest.hh
+ *
+ *  Created on: Feb 11, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_VALIDATION_KTEXTTEST_HH_
+#define NYMPH_VALIDATION_KTEXTTEST_HH_
+
+#include "KTException.hh"
+
+#include <iostream>
+#include <memory>
+
+namespace Nymph
+{
+
+    template< class XBaseType >
+    class KTExtensibleCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleCore< XBaseType > >
+    {
+        private:
+            typedef std::enable_shared_from_this< KTExtensibleCore< XBaseType > > ESFTBaseType;
+
+        public:
+            KTExtensibleCore();
+            KTExtensibleCore( const KTExtensibleCore< XBaseType >& orig ) = delete; // deleted because copy of KTExtensibleCore is done using operator=()
+            virtual ~KTExtensibleCore();
+
+            /// Copies extended object
+            KTExtensibleCore& operator=( const KTExtensibleCore< XBaseType >& orig );
+
+            /// Copies the current object and only extended fields already present
+            virtual KTExtensibleCore& Pull( const KTExtensibleCore< XBaseType >& orig ) = 0; // implemented in KTExtensible because it requires knowing the extended field type
+
+            /// Clones the extended object
+            virtual std::shared_ptr< KTExtensibleCore< XBaseType > > Clone() const = 0; // implemented in KTExtensible because it requires knowing the extended field type
+
+            /// Returns the size of the extended object, including this field and any extended below it
+            unsigned size() const;
+
+            /// Returns the object of the requested type or creates a new one if it's not present
+            template< class XRequestedType >
+            XRequestedType& Of();
+
+            /// Returns the object of the requested type or throws KTException if it's not present
+            template< class XRequestedType >
+            const XRequestedType& Of() const;
+
+            /// Checks whether the requested type is present
+            template< class XRequestedType >
+            bool Has() const;
+
+            /// Extracts the data object of the requested type if it's present; returns an empty pointer if not
+            /// Note that if you detatch the first field without holding a pointer to any other extended fields, those fields will be destroyed.
+            template< class XRequestedType >
+            std::shared_ptr< XRequestedType > Detatch();
+
+        protected:
+            template< class XRequestedType >
+            std::shared_ptr< XRequestedType > _Detatch( std::shared_ptr< KTExtensibleCore< XBaseType > > prev = std::shared_ptr< KTExtensibleCore< XBaseType > >() );
+            //void SetPrevInNext( std::shared_ptr< KTExtensibleCore< XBaseType > > ptr );
+
+            //std::weak_ptr< KTExtensibleCore< XBaseType > > fPrev;
+            std::shared_ptr< KTExtensibleCore< XBaseType > > fNext;
+
+            bool fDisableExtendedCopy; // internal variable used to determine whether operator= copies extended fields
+    };
+
+    template< class XInstanceType, class XBaseType >
+    class KTExtensible : public KTExtensibleCore< XBaseType >
+    {
+        public:
+            KTExtensible();
+            KTExtensible( const KTExtensible< XInstanceType, XBaseType >& orig );
+            virtual ~KTExtensible();
+
+            /// Copies the extended object
+            KTExtensible& operator=( const KTExtensible< XInstanceType, XBaseType >& orig );
+
+            /// Copies the current object and only extended fields already present
+            virtual KTExtensibleCore< XBaseType >& Pull( const KTExtensibleCore< XBaseType >& orig );
+
+            /// Clones the extended object
+            virtual std::shared_ptr< KTExtensibleCore< XBaseType > > Clone() const;
+    };
+
+
+
+    //**************
+    // KTExtensibleCore implementation
+    //**************
+
+    template< class XBaseType >
+    KTExtensibleCore< XBaseType >::KTExtensibleCore() :
+            XBaseType(),
+            //fPrev(),
+            fNext(),
+            fDisableExtendedCopy( false )
+    {
+    }
+
+    template< class XBaseType >
+    KTExtensibleCore< XBaseType >::~KTExtensibleCore()
+    {
+    }
+
+    template< class XBaseType >
+    KTExtensibleCore< XBaseType >& KTExtensibleCore< XBaseType >::operator=( const KTExtensibleCore< XBaseType >& orig )
+    {
+        // must not call virtual functions on this because it's used in the copy constructor
+
+        std::cout << "KTExtensibleCore::operator=()" << std::endl;
+        if( this == &orig ) return *this;
+
+        fDisableExtendedCopy = false;
+
+        // remove any extended fields
+        fNext.reset();
+
+        // copy extended fields
+        // only do this if orig.fDisableExtendedCopy is false
+        std::cout << "do we copy extended fields? ! " << orig.fDisableExtendedCopy << " && " << orig.fNext.operator bool() << " = " << bool(! orig.fDisableExtendedCopy && orig.fNext) << std::endl;
+        if( ! orig.fDisableExtendedCopy && orig.fNext )
+        {
+            std::cout << "duplicating extended fields" << std::endl;
+            // duplicate extended fields with Clone()
+            fNext = orig.fNext->Clone();  // this's fNext points to the copy of orig's fNext
+            //SetPrevInNext( ESFTBaseType::shared_from_this() ); // this's fNext's fPrev points back to this
+        }
+
+        // duplicate base class
+        this->XBaseType::operator=( *this );
+
+        return *this;
+    }
+
+    template< class XBaseType >
+    unsigned KTExtensibleCore< XBaseType >::size() const
+    {
+        return fNext.operator bool() ? 1 + fNext->size() : 1;
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    XRequestedType& KTExtensibleCore< XBaseType >::Of()
+    {
+        std::cout << "in KTExtensibleCore::Of()" << std::endl;
+        XRequestedType* requested = dynamic_cast< XRequestedType* >(this);
+        if( requested != nullptr )
+        {
+            std::cout << "type match" << std::endl;
+            return *requested;
+        }
+
+        if( ! fNext )
+        {
+            std::cout << "creating a new ext test core" << std::endl;
+            std::shared_ptr< XRequestedType > requestedShared = std::make_shared< XRequestedType >();
+            fNext = requestedShared;
+            //SetPrevInNext( ESFTBaseType::shared_from_this() );
+            return *requestedShared;
+        }
+        std::cout << "moving on to the next test core: " << fNext.operator bool() << std::endl;
+        return fNext->template Of< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    const XRequestedType& KTExtensibleCore< XBaseType >::Of() const
+    {
+        std::cout << "in KTExtensibleCore::Of() const" << std::endl;
+        const XRequestedType* requested = dynamic_cast< const XRequestedType* >(this);
+        if( requested != nullptr )
+        {
+            return *requested;
+        }
+
+        if( ! fNext )
+        {
+            throw KTException() << "Cannot add to a const extensible object";
+        }
+        return fNext->template Of< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    bool KTExtensibleCore< XBaseType >::Has() const
+    {
+        if( dynamic_cast< const XRequestedType* >( this ) )
+        {
+            return true;
+        }
+        if( fNext )
+        {
+            return fNext->template Has< XRequestedType >();
+        }
+        return false;
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Detatch()
+    {
+        return _Detatch< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::_Detatch( std::shared_ptr< KTExtensibleCore< XBaseType > > prev )
+    {
+        if( dynamic_cast< XRequestedType* >( this ) )
+        {
+            // create a shared pointer to this here, so that when we reset prev.fNext (if it exists), that won't be the last reference to this
+            std::shared_ptr< XRequestedType > detatched = std::static_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
+            if( prev )
+            {
+                // link prev and fNext if fNext exists; otherwise resets prev.fNext
+                prev->fNext = this->fNext;
+            }
+            fNext.reset();
+            return detatched;
+        }
+
+        if( fNext )
+        {
+            return fNext->template _Detatch< XRequestedType >( ESFTBaseType::shared_from_this() );
+        }
+
+        return std::shared_ptr< XRequestedType >();
+    }
+
+
+
+    //template< class XBaseType >
+    //void KTExtensibleCore< XBaseType >::SetPrevInNext( std::shared_ptr< KTExtensibleCore< XBaseType > > ptr )
+    //{
+    //    fNext->fPrev = ptr;
+   //     return;
+    //}
+
+
+    //**************
+    // KTExtensible implementation
+    //**************
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >::KTExtensible() :
+            KTExtensibleCore< XBaseType >()
+    {}
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >::KTExtensible( const KTExtensible< XInstanceType, XBaseType >& orig ) :
+            KTExtensibleCore< XBaseType >() // copy of KTExtensibleCore is done from operator=()
+    {
+        *this = orig;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >::~KTExtensible()
+    {}
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >& KTExtensible< XInstanceType, XBaseType >::operator=( const KTExtensible< XInstanceType, XBaseType >& orig )
+    {
+        // must not call any virtual functions on `this` because it's called from the copy constructor
+
+        std::cout << "KTExtensible::operator=()" << std::endl;
+        if( this == &orig ) return *this;
+
+        this->KTExtensibleCore< XBaseType >::operator=( orig );
+
+        return *this;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensibleCore< XBaseType >& KTExtensible< XInstanceType, XBaseType >::Pull( const KTExtensibleCore< XBaseType >& orig )
+    {
+        // copies information out from orig based on this's instance type and any extended fields present
+        std::cout << "KTExtensible::Pull()" << std::endl;
+
+        if( this == &orig ) return *this;
+
+        this->fDisableExtendedCopy = true; // we're going to use operator=, so we need to disable copying of extended fields to only get the instance type
+        XInstanceType* instance = static_cast< XInstanceType* >( this ); // guaranteed to be ok by CRTP
+        // orig is const, so Of() will throw an exception if XInstanceType is not present
+        // in that case, make a copy of a new object
+        try
+        {
+            instance->operator=( orig.template Of< XInstanceType >() );
+        }
+        catch( KTException& )
+        {
+            instance->operator=( XInstanceType() );
+        }
+        this->fDisableExtendedCopy = false;
+
+        // continue the pull process for any extended fields present in this
+        if( this->fNext )
+        {
+            this->fNext->Pull( orig );
+        }
+
+        return *this;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensible< XInstanceType, XBaseType >::Clone() const
+    {
+        std::cout << "KTExtensible::Clone()" << std::endl;
+
+        std::shared_ptr< XInstanceType > instancePtr = std::make_shared< XInstanceType >();
+        instancePtr->Pull(*this); // extracts just XInstanceType from this because instancePtr doesn't have any extended fields
+
+        // if there are extended fields, clone them
+        if( this->fNext )
+        {
+            instancePtr->fNext = this->fNext->Clone(); // instancePtr's fNext is a clone of this's fNext
+            //instancePtr->SetPrevInNext( instancePtr ); // instancePtr's fNext's fPrev points back to instance pointer
+        }
+
+        return instancePtr;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_VALIDATION_KTEXTTEST_HH_ */
diff --git a/Executables/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
index e486445..d78aeba 100644
--- a/Executables/Validation/KTTestCuts.cc
+++ b/Executables/Validation/KTTestCuts.cc
@@ -15,7 +15,7 @@ namespace Nymph
     KTLOGGER(testlog, "KTTestCuts");
 
     KT_REGISTER_CUT(KTAwesomeCut, "awesome-cut");
-    KT_REGISTER_CUT(KTNotAwesomeCut, "not-awesome-cut");
+    KT_REGISTER_CUT(KTNotAwesomeCut, "not-awesome-cut"  );
 
 
     KTAwesomeCut::KTAwesomeCut(const std::string& name) :
diff --git a/Executables/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
index b5a7180..72d3576 100644
--- a/Executables/Validation/KTTestData.cc
+++ b/Executables/Validation/KTTestData.cc
@@ -12,10 +12,14 @@ namespace Nymph
     KTTestData::KTTestData() :
         KTData(),
         fIsAwesome( false )
-    {}
+    {
+        std::cout << "### KTTestData constructor" << std::endl;
+    }
 
     KTTestData::~KTTestData()
-    {}
+    {
+        std::cout << "### KTTestData destructor" << std::endl;
+    }
 
 } /* namespace Nymph */
 
diff --git a/Executables/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
index ac9f6a0..37b55cd 100644
--- a/Executables/Validation/TestCut.cc
+++ b/Executables/Validation/TestCut.cc
@@ -17,55 +17,65 @@ using namespace std;
 
 int main()
 {
-    KTCoreDataExt data;
-    KTTestDataExt& testData = data.Of< KTTestDataExt >();
+    try
+    {
+        KTCoreDataExt data;
+        KTTestDataExt& testData = data.Of< KTTestDataExt >();
 
-    KTCutStatus& cutStatus = data.CutStatus();
+        KTCutStatus& cutStatus = data.CutStatus();
 
-    KTINFO(testlog, "Assigning cuts");
-    unsigned awesomeCutPos = 0;
-    string awesomeCutName("awesome-cut");
-    unsigned notAwesomeCutPos = 1;
-    string notAwesomeCutName("not-awesome-cut");
-    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
-    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
+        KTINFO(testlog, "Assigning awesome-cut");
+        unsigned awesomeCutPos = 0;
+        string awesomeCutName("awesome-cut");
+        cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
 
-    KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
+        KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
 
-    KTINFO(testlog, "Applying awesome cut");
-    KTAwesomeCut cut;
-    cut.Apply(data, testData);
+        KTINFO(testlog, "Applying awesome cut");
+        KTAwesomeCut cut(awesomeCutName);
+        cut.Apply(data, testData);
 
-    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
-    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-    KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
+        KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+        KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+        KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+        KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+        KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+        KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+        KTINFO(testlog, "Current cut status: " << cutStatus);
+        KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
 
-    KTINFO(testlog, "Applying not-awesome cut");
-    KTNotAwesomeCut naCut;
-    naCut.Apply(data, testData);
+        KTINFO(testlog, "Assigning not-awesome-cut");
+        unsigned notAwesomeCutPos = 1;
+        string notAwesomeCutName("not-awesome-cut");
+        cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
 
-    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
-    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
-    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
-    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
-    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-    KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
-    KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
-    KTINFO(testlog, "Is cut with mask \"10\"? " << cutStatus.IsCut("10"));
-    KTINFO(testlog, "Is cut with mask \"11\"? " << cutStatus.IsCut("11"));
-    KTINFO(testlog, "Is cut with mask 0? " << cutStatus.IsCut(0));
-    KTINFO(testlog, "Is cut with mask 1? " << cutStatus.IsCut(1));
-    KTINFO(testlog, "Is cut with mask 2? " << cutStatus.IsCut(2));
-    KTINFO(testlog, "Is cut with mask 3? " << cutStatus.IsCut(3));
+        KTINFO(testlog, "Applying not-awesome cut");
+        KTNotAwesomeCut naCut(notAwesomeCutName);
+        naCut.Apply(data, testData);
+
+        KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+        KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+        KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+        KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+        KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+        KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+        KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+        KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+        KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
+        KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+        KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
+        KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
+        KTINFO(testlog, "Is cut with mask \"10\"? " << cutStatus.IsCut("10"));
+        KTINFO(testlog, "Is cut with mask \"11\"? " << cutStatus.IsCut("11"));
+        KTINFO(testlog, "Is cut with mask 0? " << cutStatus.IsCut(0));
+        KTINFO(testlog, "Is cut with mask 1? " << cutStatus.IsCut(1));
+        KTINFO(testlog, "Is cut with mask 2? " << cutStatus.IsCut(2));
+        KTINFO(testlog, "Is cut with mask 3? " << cutStatus.IsCut(3));
+    }
+    catch(std::exception& e)
+    {
+        KTERROR(testlog, "Exception caught: " << e.what());
+    }
 
     return 0;
 }
diff --git a/Executables/Validation/TestData.cc b/Executables/Validation/TestData.cc
new file mode 100644
index 0000000..18ea6be
--- /dev/null
+++ b/Executables/Validation/TestData.cc
@@ -0,0 +1,25 @@
+/*
+ * TestData.cc
+ *
+ *  Created on: Feb 10, 2018
+ *      Author: obla999
+ */
+
+#include "KTTestData.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+LOGGER(testlog, "TestData")
+
+int main()
+{
+
+    KTCoreDataExt data;
+    KTTestDataExt& testData = data.Of< KTTestDataExt >();
+    KTINFO(testlog, data.Name());
+    KTINFO(testlog, testData.Name());
+
+    return 0;
+}
diff --git a/Executables/Validation/TestExt.cc b/Executables/Validation/TestExt.cc
new file mode 100644
index 0000000..f7f724d
--- /dev/null
+++ b/Executables/Validation/TestExt.cc
@@ -0,0 +1,78 @@
+/*
+ * TestExt.cc
+ *
+ *  Created on: Feb 11, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTExtTest.hh"
+
+#include "KTLogger.hh"
+
+#include <iostream>
+
+KTLOGGER( testlog, "KTExtTest" );
+
+using namespace Nymph;
+
+namespace Nymph
+{
+    class MyBaseClass
+    {
+        public:
+            MyBaseClass() {}
+            virtual ~MyBaseClass() {}
+    };
+
+    class MyClass1 : public KTExtensible< MyClass1, MyBaseClass >
+    {
+        public:
+            MyClass1() : KTExtensible< MyClass1, MyBaseClass >(), fValue() {}
+            MyClass1( const MyClass1& orig ) : KTExtensible< MyClass1, MyBaseClass >( orig ), fValue( orig.fValue ) {}
+            virtual ~MyClass1() {};
+        public:
+            int fValue;
+    };
+
+    class MyClass2 : public KTExtensible< MyClass2, MyBaseClass >
+    {
+        public:
+            MyClass2() : KTExtensible< MyClass2, MyBaseClass >(), fValue() {}
+            MyClass2( const MyClass2& orig ) : KTExtensible< MyClass2, MyBaseClass >( orig ), fValue( orig.fValue ) {}
+            virtual ~MyClass2() {};
+        public:
+            int fValue;
+    };
+
+}
+
+int main()
+{
+    std::shared_ptr< MyClass1 > data1 = std::make_shared< MyClass1 >();
+    data1->fValue = 5;
+
+    MyClass2& data2 = data1->Of< MyClass2 >();
+    data2.fValue = 3;
+
+    KTINFO( testlog, "data1 has data1: " << data1->Has< MyClass1 >() );
+    KTINFO( testlog, "data1 has data2: " << data1->Has< MyClass2 >() );
+    KTINFO( testlog, "data2 has data1: " << data2.Has< MyClass1 >() );
+    KTINFO( testlog, "data2 has data2: " << data2.Has< MyClass2 >() );
+    KTINFO( testlog, "Value of data1: " << data1->fValue );
+    KTINFO( testlog, "Value of data2: " << data2.fValue );
+    KTINFO( testlog, "Size of data1: " << data1->size() );
+    KTINFO( testlog, "Size of data2: " << data2.size() );
+
+    std::shared_ptr< MyClass1 > copyOfData1 = std::make_shared< MyClass1 >( *data1 );
+    MyClass2& copyOfData2 = copyOfData1->Of< MyClass2 >();
+
+    KTINFO( testlog, "Value of data1's copy: " << copyOfData1->fValue );
+    KTINFO( testlog, "Value of data2's copy: " << copyOfData2.fValue );
+
+    std::shared_ptr< MyClass2 > detatchedCoypOfData2 = copyOfData1->Detatch< MyClass2 >();
+
+    KTINFO( testlog, "Size of copy of data1 after detatch: " << copyOfData1->size() );
+    KTINFO( testlog, "Size of detatched copy of data2: " << detatchedCoypOfData2->size() );
+
+    return 0;
+}
diff --git a/Library/Data/KTCoreData.cc b/Library/Data/KTCoreData.cc
index 96aa004..9b80e3b 100644
--- a/Library/Data/KTCoreData.cc
+++ b/Library/Data/KTCoreData.cc
@@ -15,10 +15,13 @@ namespace Nymph
             fLastData( false ),
             fCutStatus()
     {
+        std::cout << "### KTCoreData constructor" << std::endl;
     }
 
     KTCoreData::~KTCoreData()
-    {}
+    {
+        std::cout << "### KTCoreData destrutor" << std::endl;
+    }
 
 
     KTDataHandle CreateNewDataHandle()
diff --git a/Library/Data/KTCutStatus.cc b/Library/Data/KTCutStatus.cc
index d1c1f52..9396e76 100644
--- a/Library/Data/KTCutStatus.cc
+++ b/Library/Data/KTCutStatus.cc
@@ -39,6 +39,12 @@ namespace Nymph
 
     void KTCutStatus::AssignCutResult(unsigned maskPos, const std::string& name, bool state, bool doUpdateStatus)
     {
+        KTDEBUG(cutlog, "Assigning cut result <" << name << "> to position <" << maskPos << "> with state <" << state << ">");
+        if( maskPos >= fCutResults.size() )
+        {
+            fCutResults.resize( maskPos + 1 );
+        }
+        KTDEBUG(cutlog, "Cut result size is now <" << fCutResults.size() << ">");
         if( fCutResults[maskPos].fAssigned )
         {
             throw KTException() << "Mask position <" << maskPos << "> has already been assigned";
diff --git a/Library/Data/KTData.cc b/Library/Data/KTData.cc
index 9cc427c..7c7df99 100644
--- a/Library/Data/KTData.cc
+++ b/Library/Data/KTData.cc
@@ -17,13 +17,17 @@ namespace Nymph
 
     KTDataRider::KTDataRider() :
             fName()
-    {}
+    {
+        std::cout << "### KTDataRider for <" << fName << "> constructor" << std::endl;
+    }
 
     KTDataRider::KTDataRider( const KTDataRider& orig ) :
             fName( orig.fName )
     {}
 
     KTDataRider::~KTDataRider()
-    {}
+    {
+        std::cout << "### KTDataRider for <" << fName << "> destructor" << std::endl;
+    }
 
 } /* namespace Nymph */
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library/Utility/KTExtensibleStruct.hh
index f2dc0c2..63deb64 100644
--- a/Library/Utility/KTExtensibleStruct.hh
+++ b/Library/Utility/KTExtensibleStruct.hh
@@ -9,6 +9,8 @@
 #ifndef KTEXTENSIBLESTRUCT_HH_
 #define KTEXTENSIBLESTRUCT_HH_
 
+#include "KTException.hh"
+
 #include <cereal/types/polymorphic.hpp>
 
 #include <memory>
@@ -23,11 +25,15 @@ namespace Nymph
      */
 
     template< class XBaseType >
-    struct KTExtensibleStructCore : public XBaseType
+    struct KTExtensibleStructCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleStructCore< XBaseType > >
     {
         public:
             typedef KTExtensibleStructCore< XBaseType > BasePtrType;
             typedef std::shared_ptr< BasePtrType > BasePtr;
+            typedef std::weak_ptr< BasePtrType > WeakBasePtr;
+
+        private:
+            typedef std::enable_shared_from_this< KTExtensibleStructCore< XBaseType > > ESFTType;
 
         public:
             /// Default constructor
@@ -66,7 +72,7 @@ namespace Nymph
         protected:
             void SetPrevPtrInNext();
             mutable BasePtr fNext;
-            mutable BasePtr fPrev;
+            mutable WeakBasePtr fPrev;
 
         private:
             friend class cereal::access;
@@ -124,7 +130,6 @@ namespace Nymph
     template<class XBaseType>
     KTExtensibleStructCore<XBaseType>::~KTExtensibleStructCore()
     {
-        fNext.reset();
     }
 
     template<class XBaseType>
@@ -153,7 +158,7 @@ namespace Nymph
         if (! fNext)
         {
             fNext = std::make_shared< XStructType >();
-            fNext->fPrev.reset( this );
+            fNext->fPrev = ESFTType::shared_from_this();
         }
 
         return fNext->template Of<XStructType>();
@@ -171,8 +176,7 @@ namespace Nymph
 
         if (! fNext)
         {
-            fNext = std::make_shared< XStructType >();
-            fNext->fPrev.reset( const_cast< BasePtrType* >(this) );
+            throw KTException() << "Requested component of (const) extensible struct not present";
         }
 
         return fNext->template Of<XStructType>();
@@ -212,7 +216,7 @@ namespace Nymph
             if (next->fNext)
             {
                 fNext = next->fNext;
-                fNext->fPrev = this;
+                fNext->fPrev = ESFTType::shared_from_this();
                 next->fNext.reset();
             }
             next->fPrev.reset();
@@ -231,7 +235,7 @@ namespace Nymph
     template<class XBaseType>
     inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Prev() const
     {
-        return fPrev;
+        return fPrev.lock();
     }
 
     template<class XBaseType>
@@ -244,14 +248,14 @@ namespace Nymph
     template<class XBaseType>
     inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::First() const
     {
-        if (fPrev) return this;
-        return fPrev->First();
+        if (! fPrev) return BasePtr(this);
+        return fPrev.lock()->First();
     }
 
     template<class XBaseType>
     inline void KTExtensibleStructCore<XBaseType>::SetPrevPtrInNext()
     {
-        fNext->fPrev.reset( this );
+        fNext->fPrev = ESFTType::shared_from_this();
         return;
     }
 

From b4863c6a54dd2129d15f2c041fa81a8886e3ddd4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 14 Feb 2018 17:14:53 -0800
Subject: [PATCH 098/521] Added Share() functions and some typedefs

---
 Executables/Validation/KTExtTest.hh | 85 ++++++++++++++++++++++++-----
 Executables/Validation/TestExt.cc   |  3 +
 2 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/Executables/Validation/KTExtTest.hh b/Executables/Validation/KTExtTest.hh
index 76fe6ff..f05741d 100644
--- a/Executables/Validation/KTExtTest.hh
+++ b/Executables/Validation/KTExtTest.hh
@@ -19,22 +19,26 @@ namespace Nymph
     template< class XBaseType >
     class KTExtensibleCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleCore< XBaseType > >
     {
+        public:
+            typedef KTExtensibleCore< XBaseType > ExtCoreType;
+            typedef std::shared_ptr< ExtCoreType > BasePtrType;
+
         private:
             typedef std::enable_shared_from_this< KTExtensibleCore< XBaseType > > ESFTBaseType;
 
         public:
             KTExtensibleCore();
-            KTExtensibleCore( const KTExtensibleCore< XBaseType >& orig ) = delete; // deleted because copy of KTExtensibleCore is done using operator=()
+            KTExtensibleCore( const ExtCoreType& orig ) = delete; // deleted because copy of KTExtensibleCore is done using operator=()
             virtual ~KTExtensibleCore();
 
             /// Copies extended object
-            KTExtensibleCore& operator=( const KTExtensibleCore< XBaseType >& orig );
+            ExtCoreType& operator=( const ExtCoreType& orig );
 
             /// Copies the current object and only extended fields already present
-            virtual KTExtensibleCore& Pull( const KTExtensibleCore< XBaseType >& orig ) = 0; // implemented in KTExtensible because it requires knowing the extended field type
+            virtual ExtCoreType& Pull( const ExtCoreType& orig ) = 0; // implemented in KTExtensible because it requires knowing the extended field type
 
             /// Clones the extended object
-            virtual std::shared_ptr< KTExtensibleCore< XBaseType > > Clone() const = 0; // implemented in KTExtensible because it requires knowing the extended field type
+            virtual BasePtrType Clone() const = 0; // implemented in KTExtensible because it requires knowing the extended field type
 
             /// Returns the size of the extended object, including this field and any extended below it
             unsigned size() const;
@@ -47,6 +51,14 @@ namespace Nymph
             template< class XRequestedType >
             const XRequestedType& Of() const;
 
+            /// Returns a pointer to the object of the requested type or creates a new one if it's not present
+            template< class XRequestedType >
+            std::shared_ptr< XRequestedType > Share();
+
+            /// Returns a pointer to the object of the requested type or throws KTException if it's not present
+            template< class XRequestedType >
+            const std::shared_ptr< XRequestedType > Share() const;
+
             /// Checks whether the requested type is present
             template< class XRequestedType >
             bool Has() const;
@@ -58,11 +70,11 @@ namespace Nymph
 
         protected:
             template< class XRequestedType >
-            std::shared_ptr< XRequestedType > _Detatch( std::shared_ptr< KTExtensibleCore< XBaseType > > prev = std::shared_ptr< KTExtensibleCore< XBaseType > >() );
+            std::shared_ptr< XRequestedType > _Detatch( BasePtrType prev = BasePtrType() );
             //void SetPrevInNext( std::shared_ptr< KTExtensibleCore< XBaseType > > ptr );
 
             //std::weak_ptr< KTExtensibleCore< XBaseType > > fPrev;
-            std::shared_ptr< KTExtensibleCore< XBaseType > > fNext;
+            BasePtrType fNext;
 
             bool fDisableExtendedCopy; // internal variable used to determine whether operator= copies extended fields
     };
@@ -70,19 +82,24 @@ namespace Nymph
     template< class XInstanceType, class XBaseType >
     class KTExtensible : public KTExtensibleCore< XBaseType >
     {
+        public:
+            typedef KTExtensible< XInstanceType, XBaseType > ExtType;
+            typedef KTExtensibleCore< XBaseType > ExtCoreType;
+            typedef std::shared_ptr< KTExtensibleCore< XBaseType > > BasePtrType;
+
         public:
             KTExtensible();
-            KTExtensible( const KTExtensible< XInstanceType, XBaseType >& orig );
+            KTExtensible( const ExtType& orig );
             virtual ~KTExtensible();
 
             /// Copies the extended object
-            KTExtensible& operator=( const KTExtensible< XInstanceType, XBaseType >& orig );
+            ExtType& operator=( const ExtType& orig );
 
             /// Copies the current object and only extended fields already present
-            virtual KTExtensibleCore< XBaseType >& Pull( const KTExtensibleCore< XBaseType >& orig );
+            virtual ExtCoreType& Pull( const ExtCoreType& orig );
 
             /// Clones the extended object
-            virtual std::shared_ptr< KTExtensibleCore< XBaseType > > Clone() const;
+            virtual BasePtrType Clone() const;
     };
 
 
@@ -146,7 +163,7 @@ namespace Nymph
     XRequestedType& KTExtensibleCore< XBaseType >::Of()
     {
         std::cout << "in KTExtensibleCore::Of()" << std::endl;
-        XRequestedType* requested = dynamic_cast< XRequestedType* >(this);
+        XRequestedType* requested = dynamic_cast< XRequestedType* >( this );
         if( requested != nullptr )
         {
             std::cout << "type match" << std::endl;
@@ -170,7 +187,7 @@ namespace Nymph
     const XRequestedType& KTExtensibleCore< XBaseType >::Of() const
     {
         std::cout << "in KTExtensibleCore::Of() const" << std::endl;
-        const XRequestedType* requested = dynamic_cast< const XRequestedType* >(this);
+        const XRequestedType* requested = dynamic_cast< const XRequestedType* >( this );
         if( requested != nullptr )
         {
             return *requested;
@@ -183,6 +200,48 @@ namespace Nymph
         return fNext->template Of< XRequestedType >();
     }
 
+    template< class XBaseType >
+    template< class XRequestedType >
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share()
+    {
+        std::cout << "in KTExtensibleCore::Share()" << std::endl;
+        std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
+        if( requested )
+        {
+            std::cout << "type match" << std::endl;
+            return requested;
+        }
+
+        if( ! fNext )
+        {
+            std::cout << "creating a new ext test core" << std::endl;
+            requested = std::make_shared< XRequestedType >();
+            fNext = requested;
+            //SetPrevInNext( ESFTBaseType::shared_from_this() );
+            return requested;
+        }
+        std::cout << "moving on to the next test core: " << fNext.operator bool() << std::endl;
+        return fNext->template Share< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    const std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share() const
+    {
+        std::cout << "in KTExtensibleCore::Share() const" << std::endl;
+        const std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< const XRequestedType >( ESFTBaseType::shared_from_this() );
+        if( requested )
+        {
+            return requested;
+        }
+
+        if( ! fNext )
+        {
+            throw KTException() << "Cannot add to a const extensible object";
+        }
+        return fNext->template Share< XRequestedType >();
+    }
+
     template< class XBaseType >
     template< class XRequestedType >
     bool KTExtensibleCore< XBaseType >::Has() const
@@ -207,7 +266,7 @@ namespace Nymph
 
     template< class XBaseType >
     template< class XRequestedType >
-    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::_Detatch( std::shared_ptr< KTExtensibleCore< XBaseType > > prev )
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::_Detatch( KTExtensibleCore< XBaseType >::BasePtrType prev )
     {
         if( dynamic_cast< XRequestedType* >( this ) )
         {
diff --git a/Executables/Validation/TestExt.cc b/Executables/Validation/TestExt.cc
index f7f724d..b8c0d31 100644
--- a/Executables/Validation/TestExt.cc
+++ b/Executables/Validation/TestExt.cc
@@ -54,12 +54,15 @@ int main()
     MyClass2& data2 = data1->Of< MyClass2 >();
     data2.fValue = 3;
 
+    std::shared_ptr< MyClass2 > data2Shared = data1->Share< MyClass2 >();
+
     KTINFO( testlog, "data1 has data1: " << data1->Has< MyClass1 >() );
     KTINFO( testlog, "data1 has data2: " << data1->Has< MyClass2 >() );
     KTINFO( testlog, "data2 has data1: " << data2.Has< MyClass1 >() );
     KTINFO( testlog, "data2 has data2: " << data2.Has< MyClass2 >() );
     KTINFO( testlog, "Value of data1: " << data1->fValue );
     KTINFO( testlog, "Value of data2: " << data2.fValue );
+    KTINFO( testlog, "Value of data2Shared: " << data2Shared->fValue );
     KTINFO( testlog, "Size of data1: " << data1->size() );
     KTINFO( testlog, "Size of data2: " << data2.size() );
 

From 11fbddbc9e88ac7fdc3f5cd7b36aba334ba044b4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 14 Feb 2018 17:28:12 -0800
Subject: [PATCH 099/521] Removed debugging output

---
 Executables/Validation/KTExtTest.hh | 32 -----------------------------
 1 file changed, 32 deletions(-)

diff --git a/Executables/Validation/KTExtTest.hh b/Executables/Validation/KTExtTest.hh
index f05741d..4f68284 100644
--- a/Executables/Validation/KTExtTest.hh
+++ b/Executables/Validation/KTExtTest.hh
@@ -71,9 +71,7 @@ namespace Nymph
         protected:
             template< class XRequestedType >
             std::shared_ptr< XRequestedType > _Detatch( BasePtrType prev = BasePtrType() );
-            //void SetPrevInNext( std::shared_ptr< KTExtensibleCore< XBaseType > > ptr );
 
-            //std::weak_ptr< KTExtensibleCore< XBaseType > > fPrev;
             BasePtrType fNext;
 
             bool fDisableExtendedCopy; // internal variable used to determine whether operator= copies extended fields
@@ -111,7 +109,6 @@ namespace Nymph
     template< class XBaseType >
     KTExtensibleCore< XBaseType >::KTExtensibleCore() :
             XBaseType(),
-            //fPrev(),
             fNext(),
             fDisableExtendedCopy( false )
     {
@@ -127,7 +124,6 @@ namespace Nymph
     {
         // must not call virtual functions on this because it's used in the copy constructor
 
-        std::cout << "KTExtensibleCore::operator=()" << std::endl;
         if( this == &orig ) return *this;
 
         fDisableExtendedCopy = false;
@@ -137,13 +133,10 @@ namespace Nymph
 
         // copy extended fields
         // only do this if orig.fDisableExtendedCopy is false
-        std::cout << "do we copy extended fields? ! " << orig.fDisableExtendedCopy << " && " << orig.fNext.operator bool() << " = " << bool(! orig.fDisableExtendedCopy && orig.fNext) << std::endl;
         if( ! orig.fDisableExtendedCopy && orig.fNext )
         {
-            std::cout << "duplicating extended fields" << std::endl;
             // duplicate extended fields with Clone()
             fNext = orig.fNext->Clone();  // this's fNext points to the copy of orig's fNext
-            //SetPrevInNext( ESFTBaseType::shared_from_this() ); // this's fNext's fPrev points back to this
         }
 
         // duplicate base class
@@ -162,23 +155,18 @@ namespace Nymph
     template< class XRequestedType >
     XRequestedType& KTExtensibleCore< XBaseType >::Of()
     {
-        std::cout << "in KTExtensibleCore::Of()" << std::endl;
         XRequestedType* requested = dynamic_cast< XRequestedType* >( this );
         if( requested != nullptr )
         {
-            std::cout << "type match" << std::endl;
             return *requested;
         }
 
         if( ! fNext )
         {
-            std::cout << "creating a new ext test core" << std::endl;
             std::shared_ptr< XRequestedType > requestedShared = std::make_shared< XRequestedType >();
             fNext = requestedShared;
-            //SetPrevInNext( ESFTBaseType::shared_from_this() );
             return *requestedShared;
         }
-        std::cout << "moving on to the next test core: " << fNext.operator bool() << std::endl;
         return fNext->template Of< XRequestedType >();
     }
 
@@ -186,7 +174,6 @@ namespace Nymph
     template< class XRequestedType >
     const XRequestedType& KTExtensibleCore< XBaseType >::Of() const
     {
-        std::cout << "in KTExtensibleCore::Of() const" << std::endl;
         const XRequestedType* requested = dynamic_cast< const XRequestedType* >( this );
         if( requested != nullptr )
         {
@@ -204,7 +191,6 @@ namespace Nymph
     template< class XRequestedType >
     std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share()
     {
-        std::cout << "in KTExtensibleCore::Share()" << std::endl;
         std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
         if( requested )
         {
@@ -214,13 +200,10 @@ namespace Nymph
 
         if( ! fNext )
         {
-            std::cout << "creating a new ext test core" << std::endl;
             requested = std::make_shared< XRequestedType >();
             fNext = requested;
-            //SetPrevInNext( ESFTBaseType::shared_from_this() );
             return requested;
         }
-        std::cout << "moving on to the next test core: " << fNext.operator bool() << std::endl;
         return fNext->template Share< XRequestedType >();
     }
 
@@ -228,7 +211,6 @@ namespace Nymph
     template< class XRequestedType >
     const std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share() const
     {
-        std::cout << "in KTExtensibleCore::Share() const" << std::endl;
         const std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< const XRequestedType >( ESFTBaseType::shared_from_this() );
         if( requested )
         {
@@ -290,15 +272,6 @@ namespace Nymph
     }
 
 
-
-    //template< class XBaseType >
-    //void KTExtensibleCore< XBaseType >::SetPrevInNext( std::shared_ptr< KTExtensibleCore< XBaseType > > ptr )
-    //{
-    //    fNext->fPrev = ptr;
-   //     return;
-    //}
-
-
     //**************
     // KTExtensible implementation
     //**************
@@ -324,7 +297,6 @@ namespace Nymph
     {
         // must not call any virtual functions on `this` because it's called from the copy constructor
 
-        std::cout << "KTExtensible::operator=()" << std::endl;
         if( this == &orig ) return *this;
 
         this->KTExtensibleCore< XBaseType >::operator=( orig );
@@ -336,7 +308,6 @@ namespace Nymph
     KTExtensibleCore< XBaseType >& KTExtensible< XInstanceType, XBaseType >::Pull( const KTExtensibleCore< XBaseType >& orig )
     {
         // copies information out from orig based on this's instance type and any extended fields present
-        std::cout << "KTExtensible::Pull()" << std::endl;
 
         if( this == &orig ) return *this;
 
@@ -366,8 +337,6 @@ namespace Nymph
     template< class XInstanceType, class XBaseType >
     std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensible< XInstanceType, XBaseType >::Clone() const
     {
-        std::cout << "KTExtensible::Clone()" << std::endl;
-
         std::shared_ptr< XInstanceType > instancePtr = std::make_shared< XInstanceType >();
         instancePtr->Pull(*this); // extracts just XInstanceType from this because instancePtr doesn't have any extended fields
 
@@ -375,7 +344,6 @@ namespace Nymph
         if( this->fNext )
         {
             instancePtr->fNext = this->fNext->Clone(); // instancePtr's fNext is a clone of this's fNext
-            //instancePtr->SetPrevInNext( instancePtr ); // instancePtr's fNext's fPrev points back to instance pointer
         }
 
         return instancePtr;

From 86900a22c4af0d4fbeac3ef14975b353bb2fcaa7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 14 Feb 2018 18:36:48 -0800
Subject: [PATCH 100/521] Switch extended data classes to KTExtensible.  Added
 TestExtSerialization, but it currently doesn't fully work.

---
 Executables/Validation/CMakeLists.txt         |  6 +-
 Executables/Validation/KTExtTest.cc           | 18 -----
 Executables/Validation/TestExt.cc             |  4 +-
 .../Validation/TestExtSerialization.cc        | 69 +++++++++++++++++++
 Library/Application/KTPrintDataStructure.cc   |  2 +-
 Library/CMakeLists.txt                        |  1 +
 Library/Data/KTData.hh                        | 24 ++-----
 .../Utility/KTExtensible.hh                   | 49 +++++++++++--
 8 files changed, 125 insertions(+), 48 deletions(-)
 delete mode 100644 Executables/Validation/KTExtTest.cc
 create mode 100644 Executables/Validation/TestExtSerialization.cc
 rename Executables/Validation/KTExtTest.hh => Library/Utility/KTExtensible.hh (89%)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index c15aa51..e7d8423 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -20,8 +20,6 @@ if (Nymph_ENABLE_TESTING)
         KTTestData.hh
         KTTestPrimaryProcessor.hh
         KTTestProcessor.hh
-        
-        KTExtTest.hh
     )
     
     set (VALIDATION_SOURCEFILES
@@ -58,6 +56,8 @@ if (Nymph_ENABLE_TESTING)
         TestCutFilter
         TestData
         TestExceptionInSlot
+        TestExt
+        TestExtSerialization
         TestJSONWriter
         TestLogger
         TestPolymorphicSlotData
@@ -72,8 +72,6 @@ if (Nymph_ENABLE_TESTING)
         TestSlotData
         TestThroughputProfiler
         TestUseBreakpoint
-        
-        TestExt
     )
     
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
diff --git a/Executables/Validation/KTExtTest.cc b/Executables/Validation/KTExtTest.cc
deleted file mode 100644
index 69d59b1..0000000
--- a/Executables/Validation/KTExtTest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * KTExtTest.cc
- *
- *  Created on: Feb 11, 2018
- *      Author: N.S. Oblath
- */
-
-#include "KTExtTest.hh"
-
-#include <iostream>
-
-namespace Nymph
-{
-
-
-
-
-} /* namespace Nymph */
diff --git a/Executables/Validation/TestExt.cc b/Executables/Validation/TestExt.cc
index b8c0d31..7dcbdbb 100644
--- a/Executables/Validation/TestExt.cc
+++ b/Executables/Validation/TestExt.cc
@@ -5,11 +5,9 @@
  *      Author: N.S. Oblath
  */
 
-#include "KTExtTest.hh"
-
 #include "KTLogger.hh"
 
-#include <iostream>
+#include "KTExtensible.hh"
 
 KTLOGGER( testlog, "KTExtTest" );
 
diff --git a/Executables/Validation/TestExtSerialization.cc b/Executables/Validation/TestExtSerialization.cc
new file mode 100644
index 0000000..d47d470
--- /dev/null
+++ b/Executables/Validation/TestExtSerialization.cc
@@ -0,0 +1,69 @@
+/*
+ * TestSerialization.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTLogger.hh"
+
+#include "KTTestData.hh"
+
+#include "cereal/archives/json.hpp"
+
+#include <fstream>
+
+LOGGER( testlog, "TestSerialization" );
+
+using namespace Nymph;
+
+int main()
+{
+    const std::string filename( "test_serialization_output.json" );
+
+    // save data to archive
+    {
+        std::shared_ptr< KTCoreDataExt > coreData = std::make_shared< KTCoreDataExt >();
+        std::shared_ptr< KTTestDataExt > testData = coreData->Share< KTTestDataExt >();
+
+        // change data values from their defaults
+        coreData->SetCounter( 5 );
+        testData->SetIsAwesome( true );
+
+        KTINFO( testlog, "KTCoreData counter: " << coreData->GetCounter() );
+        KTINFO( testlog, "KTTestData is-awesome: " << testData->GetIsAwesome() );
+
+        // create and open a file for output
+        std::ofstream fileOut( filename );
+
+        cereal::JSONOutputArchive archiveOut( fileOut );
+
+        KTINFO( testlog, "Writing data to JSON archive" );
+        archiveOut( coreData );
+
+        // archive and stream closed when destructors are called
+    }
+
+    // ... some time later restore the class instance to its original state
+    {
+        std::shared_ptr< KTCoreDataExt > newCoreData = std::make_shared< KTCoreDataExt >();
+
+         // create and open an archive for input
+        std::ifstream fileIn( filename );
+
+        cereal::JSONInputArchive archiveIn( fileIn );
+
+        KTINFO( testlog, "Reading data from JSON archive" );
+        archiveIn( newCoreData );
+
+        std::shared_ptr< KTTestDataExt > newTestData = newCoreData->Share< KTTestDataExt >();
+
+        KTINFO(testlog, "KTCoreData counter: " << newCoreData->GetCounter());
+        KTINFO(testlog, "KTTestData is-awesome: " << newTestData->GetIsAwesome());
+
+        // archive and stream closed when destructors are called
+    }
+
+    return 0;
+}
+
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library/Application/KTPrintDataStructure.cc
index d48aa52..c05e518 100644
--- a/Library/Application/KTPrintDataStructure.cc
+++ b/Library/Application/KTPrintDataStructure.cc
@@ -83,7 +83,7 @@ namespace Nymph
         printbuf << "\nData Structure:\n";
         printbuf << "\t- " << dataHandle->Name() << '\n';
         KTDEBUG(datalog, "Found data type " << dataHandle->Name());
-        KTExtensibleStructCore< KTDataRider >::BasePtr nextData = dataHandle->Next();
+        KTExtensibleCore< KTDataRider >::BasePtrType nextData = dataHandle->Next();
         while (nextData != NULL)
         {
             printbuf << "\t- " << nextData->Name() << '\n';
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index c0692b4..b89cec1 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -16,6 +16,7 @@ set( NYMPH_HEADERFILES
     ${UTIL_DIR}/KTDirectory.hh
     ${UTIL_DIR}/KTEventLoop.hh
     ${UTIL_DIR}/KTException.hh
+    ${UTIL_DIR}/KTExtensible.hh
     ${UTIL_DIR}/KTExtensibleStruct.hh
     ${UTIL_DIR}/KTExtensibleStructFactory.hh
     ${UTIL_DIR}/KTLogger.hh
diff --git a/Library/Data/KTData.hh b/Library/Data/KTData.hh
index 3e8f34e..90b3b6a 100644
--- a/Library/Data/KTData.hh
+++ b/Library/Data/KTData.hh
@@ -8,7 +8,7 @@
 #ifndef KTDATA_HH_
 #define KTDATA_HH_
 
-#include "KTExtensibleStruct.hh"
+#include "KTExtensible.hh"
 
 #include "KTMemberVariable.hh"
 
@@ -58,22 +58,20 @@ namespace Nymph
     }
 
     template< class XDerivedType >
-    class KTExtensibleDataRider : public KTExtensibleStruct< XDerivedType, KTDataRider >
+    class KTExtensibleDataRider : public KTExtensible< XDerivedType, KTDataRider >
     {
         public:
             KTExtensibleDataRider() = delete;
             KTExtensibleDataRider( const std::string& name ) { KTDataRider::fName = name; }
-            KTExtensibleDataRider( const KTExtensibleDataRider< XDerivedType >& orig ) : KTExtensibleStruct< XDerivedType, KTDataRider >( *this ) {}
+            KTExtensibleDataRider( const KTExtensibleDataRider< XDerivedType >& orig ) : KTExtensible< XDerivedType, KTDataRider >( *this ) {}
             virtual ~KTExtensibleDataRider() {}
 
-/*
             template< class Archive >
             void serialize( Archive& ar )
             {
-                std::cout << "### serialize for KTExtensibleStruct< XDerivedType, KTDataRider >" << std::endl;
-                ar( cereal::base_class< KTExtensibleStruct< XDerivedType, KTDataRider > >( this ) );
+                std::cout << "### serialize for KTExtensibleDataRider< XDerivedType >" << std::endl;
+                ar( cereal::base_class< KTExtensible< XDerivedType, KTDataRider > >( this ) );
             }
-*/
     };
 
 #define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name, label ) \
@@ -84,21 +82,13 @@ namespace Nymph
                 ex_data_class_name( const ex_data_class_name& orig ) : data_class_name( *this ), KTExtensibleDataRider< ex_data_class_name >( *this ) {} \
                 virtual ~ex_data_class_name() {} \
                 \
-                std::shared_ptr< KTExtensibleStructCore< KTDataRider > > Clone() const \
-                { \
-                    std::shared_ptr< ex_data_class_name > copy = std::make_shared< ex_data_class_name >( *this ); \
-                    return std::static_pointer_cast< KTExtensibleStructCore< KTDataRider >, ex_data_class_name >( copy ); \
-                } \
-        };
-
-/*
                 template< class Archive > \
                 void serialize( Archive& ar ) \
                 { \
-                    std::cout << "### serialize for ex_data_class_name" << std::endl;
+                    std::cout << "### serialize for ex_data_class_name" << std::endl; \
                     ar( cereal::base_class< data_class_name >( this ), cereal::base_class< KTExtensibleDataRider< ex_data_class_name > >( this ) ); \
                 } \
-*/
+        };
 
 #define DEFINE_EXT_DATA( data_class_name, label ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name, label )
 
diff --git a/Executables/Validation/KTExtTest.hh b/Library/Utility/KTExtensible.hh
similarity index 89%
rename from Executables/Validation/KTExtTest.hh
rename to Library/Utility/KTExtensible.hh
index 4f68284..73fe331 100644
--- a/Executables/Validation/KTExtTest.hh
+++ b/Library/Utility/KTExtensible.hh
@@ -1,16 +1,17 @@
 /*
- * KTExtTest.hh
+ * KTExtensible.hh
  *
  *  Created on: Feb 11, 2018
  *      Author: N.S. Oblath
  */
 
-#ifndef NYMPH_VALIDATION_KTEXTTEST_HH_
-#define NYMPH_VALIDATION_KTEXTTEST_HH_
+#ifndef NYMPH_KTEXTENSIBLE_HH_
+#define NYMPH_KTEXTENSIBLE_HH_
 
 #include "KTException.hh"
 
-#include <iostream>
+#include <cereal/types/polymorphic.hpp>
+
 #include <memory>
 
 namespace Nymph
@@ -68,6 +69,9 @@ namespace Nymph
             template< class XRequestedType >
             std::shared_ptr< XRequestedType > Detatch();
 
+            /// Returns a pointer to the next extended field
+            BasePtrType Next();
+
         protected:
             template< class XRequestedType >
             std::shared_ptr< XRequestedType > _Detatch( BasePtrType prev = BasePtrType() );
@@ -75,6 +79,12 @@ namespace Nymph
             BasePtrType fNext;
 
             bool fDisableExtendedCopy; // internal variable used to determine whether operator= copies extended fields
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
     };
 
     template< class XInstanceType, class XBaseType >
@@ -98,6 +108,12 @@ namespace Nymph
 
             /// Clones the extended object
             virtual BasePtrType Clone() const;
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
     };
 
 
@@ -246,6 +262,12 @@ namespace Nymph
         return _Detatch< XRequestedType >();
     }
 
+    template< class XBaseType >
+    std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensibleCore< XBaseType >::Next()
+    {
+        return fNext;
+    }
+
     template< class XBaseType >
     template< class XRequestedType >
     std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::_Detatch( KTExtensibleCore< XBaseType >::BasePtrType prev )
@@ -271,6 +293,14 @@ namespace Nymph
         return std::shared_ptr< XRequestedType >();
     }
 
+    template< class XBaseType >
+    template< class Archive >
+    void KTExtensibleCore< XBaseType >::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(KTExtensibleCore< XBaseType >).name() << std::endl;
+        ar( cereal::base_class< XBaseType >( this ), fNext );
+    }
+
 
     //**************
     // KTExtensible implementation
@@ -349,6 +379,15 @@ namespace Nymph
         return instancePtr;
     }
 
+    template< class XInstanceType, class XBaseType >
+    template< class Archive >
+    void KTExtensible< XInstanceType, XBaseType >::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(KTExtensible< XInstanceType, XBaseType >).name() << std::endl;
+        ar( cereal::base_class< ExtCoreType >( this ) );
+        return;
+    }
+
 } /* namespace Nymph */
 
-#endif /* NYMPH_VALIDATION_KTEXTTEST_HH_ */
+#endif /* NYMPH_KTEXTENSIBLE_HH_ */

From 62f062281e85c2b4595164bbc9681cdc12482064 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 18:36:28 -0600
Subject: [PATCH 101/521] Added registration of data classes, and things work. 
 Nice.

---
 Executables/Validation/TestExtSerialization.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Executables/Validation/TestExtSerialization.cc b/Executables/Validation/TestExtSerialization.cc
index d47d470..b4ac89b 100644
--- a/Executables/Validation/TestExtSerialization.cc
+++ b/Executables/Validation/TestExtSerialization.cc
@@ -17,6 +17,11 @@ LOGGER( testlog, "TestSerialization" );
 
 using namespace Nymph;
 
+// register the data classes so they can be serialized from base-class pointers.
+// json archive is already included, so it has been registered before these classes.
+CEREAL_REGISTER_TYPE( KTCoreDataExt );
+CEREAL_REGISTER_TYPE( KTTestDataExt );
+
 int main()
 {
     const std::string filename( "test_serialization_output.json" );

From 2190b3eb863cc666249fe745219cec2e24cbc98c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 19:33:23 -0600
Subject: [PATCH 102/521] Added KTRegisterNymphExtData.hh

---
 .../Validation/TestExtSerialization.cc        |  3 +-
 Library/CMakeLists.txt                        |  1 +
 Library/Data/KTRegisterNymphExtData.hh        | 29 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Library/Data/KTRegisterNymphExtData.hh

diff --git a/Executables/Validation/TestExtSerialization.cc b/Executables/Validation/TestExtSerialization.cc
index b4ac89b..2668eef 100644
--- a/Executables/Validation/TestExtSerialization.cc
+++ b/Executables/Validation/TestExtSerialization.cc
@@ -11,6 +11,8 @@
 
 #include "cereal/archives/json.hpp"
 
+#include "KTRegisterNymphExtData.hh"
+
 #include <fstream>
 
 LOGGER( testlog, "TestSerialization" );
@@ -19,7 +21,6 @@ using namespace Nymph;
 
 // register the data classes so they can be serialized from base-class pointers.
 // json archive is already included, so it has been registered before these classes.
-CEREAL_REGISTER_TYPE( KTCoreDataExt );
 CEREAL_REGISTER_TYPE( KTTestDataExt );
 
 int main()
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index b89cec1..0c4dc89 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -30,6 +30,7 @@ set( NYMPH_HEADERFILES
     ${DATA_DIR}/KTCutResult.hh
     ${DATA_DIR}/KTCutStatus.hh
     ${DATA_DIR}/KTData.hh
+    ${DATA_DIR}/KTRegisterNymphExtData.hh
     ${PROC_DIR}/KTConnection.hh
     ${PROC_DIR}/KTPrimaryProcessor.hh
     ${PROC_DIR}/KTProcessor.hh
diff --git a/Library/Data/KTRegisterNymphExtData.hh b/Library/Data/KTRegisterNymphExtData.hh
new file mode 100644
index 0000000..cc2c479
--- /dev/null
+++ b/Library/Data/KTRegisterNymphExtData.hh
@@ -0,0 +1,29 @@
+/*
+ * KTRegisterNymphExtData.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTREGISTERNYMPHEXTDATA_HH_
+#define NYMPH_KTREGISTERNYMPHEXTDATA_HH_
+
+/**
+ * @file KTRegisterNymphExtData.hh
+ *
+ * Register the extensible data objects that live in Nymph here.
+ * This file should be included with registration headers packages using Nymph's extensible data setup.
+ *
+ * This header should be included _after_ the relevant archives are registered (after #include'ing the headers, generally)
+ *
+ */
+
+
+#include <cereal/types/polymorphic.hpp>
+
+#include "KTCoreData.hh"
+
+CEREAL_REGISTER_TYPE( Nymph::KTCoreDataExt );
+
+
+#endif /* NYMPH_KTREGISTERNYMPHEXTDATA_HH_ */

From acc058ba2be478bf8bd42b44885ee24dc48b75a9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 21:32:40 -0600
Subject: [PATCH 103/521] JSON Writer outputs data.  Added typist for
 validation.

---
 Executables/Validation/CMakeLists.txt         |  4 ++-
 Executables/Validation/KTJSONWriter.cc        | 10 +++---
 Executables/Validation/KTJSONWriter.hh        | 32 +++++++++++--------
 .../Validation/KTJSONWriterValidation.cc      | 29 +++++++++++++++++
 .../Validation/KTJSONWriterValidation.hh      | 32 +++++++++++++++++++
 .../KTRegisterNymphValidationExtData.hh       | 19 +++++++++++
 Executables/Validation/KTTestData.hh          | 13 ++++++++
 Executables/Validation/TestJSONWriter.cc      |  6 ++--
 8 files changed, 123 insertions(+), 22 deletions(-)
 create mode 100644 Executables/Validation/KTJSONWriterValidation.cc
 create mode 100644 Executables/Validation/KTJSONWriterValidation.hh
 create mode 100644 Executables/Validation/KTRegisterNymphValidationExtData.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index e7d8423..5c1d43f 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -13,8 +13,9 @@ if (Nymph_ENABLE_TESTING)
 
     # Headers for any test classes
     set (VALIDATION_HEADERFILES
-        kTJSONReader.hh
+        KTJSONReader.hh
         KTJSONWriter.hh
+        KTJSONWriterValidation.hh
         KTTestConfigurable.hh
         KTTestCuts.hh
         KTTestData.hh
@@ -25,6 +26,7 @@ if (Nymph_ENABLE_TESTING)
     set (VALIDATION_SOURCEFILES
         KTJSONReader.cc
         KTJSONWriter.cc
+        KTJSONWriterValidation.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc
diff --git a/Executables/Validation/KTJSONWriter.cc b/Executables/Validation/KTJSONWriter.cc
index 7272c49..6b8f489 100644
--- a/Executables/Validation/KTJSONWriter.cc
+++ b/Executables/Validation/KTJSONWriter.cc
@@ -2,24 +2,24 @@
  *  KTJSONWriter.cc
  *
  *  Created on: Feb 1, 2018
- *      Author: E Zayas
+ *      Author: N.S. Oblath
  *
 */
 
 #include "KTJSONWriter.hh"
+
 #include "KTLogger.hh"
 
 
 namespace Nymph
 {
     KTJSONWriter::KTJSONWriter( const std::string& name ) :
-        KTProcessor( name ),
+        KTWriterWithTypists< KTJSONWriter, KTJSONWriterTypist >( name ),
         fFilename( "json_writer_default_file.json" ),
         fStreamOutPtr( nullptr ),
-        fArchiveOutPtr( nullptr )
+        fArchiveOutPtr( nullptr ),
+        fCoreDataSlot( "core", this, &KTJSONWriter::WriteData< KTCoreDataExt > )
         {
-            // Register slots here
-            RegisterSlot( "test-data", this, &KTJSONWriter::WriteData< KTTestData > );
         }
 
     KTJSONWriter::~KTJSONWriter()
diff --git a/Executables/Validation/KTJSONWriter.hh b/Executables/Validation/KTJSONWriter.hh
index 6dad8e9..6122d5b 100644
--- a/Executables/Validation/KTJSONWriter.hh
+++ b/Executables/Validation/KTJSONWriter.hh
@@ -2,33 +2,37 @@
  *  KTJSONWriter.hh
  *
  *  Created on: Feb 1, 2018
- *      Author: E Zayas
+ *      Author: N.S. Oblath
  *
 */
 
-#ifndef KTJSONWRITER_HH_
-#define KTJSONWRITER_HH_
+#ifndef NYMPH_KTJSONWRITER_HH_
+#define NYMPH_KTJSONWRITER_HH_
 
-#include "KTData.hh"
-#include "KTProcessor.hh"
+// included first so that the archive is registered before the data classes
+#include "cereal/archives/json.hpp"
+
+#include "KTWriter.hh"
 #include "KTSlot.hh"
 
-#include "KTTestData.hh"
+#include "KTRegisterNymphValidationExtData.hh"
 
 #include "KTLogger.hh"
 
-#include "cereal/archives/json.hpp"
-
 #include <fstream>
 
 KTLOGGER( avlog_hh, "KTJSONWriter" );
 
 namespace Nymph
 {
-    class KTJSONWriter : public KTProcessor
+    class KTJSONWriter;
+
+    typedef KTDerivedTypeWriter< KTJSONWriter > KTJSONWriterTypist;
+
+    class KTJSONWriter : public KTWriterWithTypists< KTJSONWriter, KTJSONWriterTypist >
     {
         public:
-            KTJSONWriter( const std::string& name = "serial-writer" );
+            KTJSONWriter( const std::string& name = "json-writer" );
             virtual ~KTJSONWriter();
 
             bool Configure( const scarab::param_node& node );
@@ -37,16 +41,18 @@ namespace Nymph
 
         public:
             template< class XDataType >
-            void WriteData( XDataType& data );
+            void WriteData( const XDataType& data );
 
         private:
             std::ofstream* fStreamOutPtr;
             cereal::JSONOutputArchive* fArchiveOutPtr;
 
+        private:
+            KTSlotData< void, KTCoreDataExt > fCoreDataSlot;
     };
 
     template< class XDataType >
-    void KTJSONWriter::WriteData( XDataType& data )
+    void KTJSONWriter::WriteData( const XDataType& data )
     {
         if( fStreamOutPtr == nullptr )
         {
@@ -64,4 +70,4 @@ namespace Nymph
 
 } // namespace Nymph
 
-#endif // KTJSONWRITER_HH_
+#endif // NYMPH_KTJSONWRITER_HH_
diff --git a/Executables/Validation/KTJSONWriterValidation.cc b/Executables/Validation/KTJSONWriterValidation.cc
new file mode 100644
index 0000000..4de7df4
--- /dev/null
+++ b/Executables/Validation/KTJSONWriterValidation.cc
@@ -0,0 +1,29 @@
+/*
+ * KTJSONWriterValidation.cc
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTJSONWriterValidation.hh"
+
+#include "KTTestData.hh"
+
+namespace Nymph
+{
+
+    KTJSONWriterValidation::KTJSONWriterValidation() :
+            KTJSONWriterTypist(),
+            fTestDataSlot( "test", fWriter, &KTJSONWriter::WriteData< KTTestDataExt > )
+    {
+    }
+
+    KTJSONWriterValidation::~KTJSONWriterValidation()
+    {
+    }
+
+    void KTJSONWriterValidation::RegisterSlots()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Executables/Validation/KTJSONWriterValidation.hh b/Executables/Validation/KTJSONWriterValidation.hh
new file mode 100644
index 0000000..4141e80
--- /dev/null
+++ b/Executables/Validation/KTJSONWriterValidation.hh
@@ -0,0 +1,32 @@
+/*
+ * KTJSONWriterValidation.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTJSONWRITERVALIDATION_HH_
+#define NYMPH_KTJSONWRITERVALIDATION_HH_
+
+#include "KTJSONWriter.hh"
+
+namespace Nymph
+{
+    class KTTestDataExt;
+
+    class KTJSONWriterValidation : public KTJSONWriterTypist
+    {
+        public:
+            KTJSONWriterValidation();
+            virtual ~KTJSONWriterValidation();
+
+            virtual void RegisterSlots();
+
+        private:
+            KTSlotData< void, KTTestDataExt > fTestDataSlot;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTJSONWRITERVALIDATION_HH_ */
diff --git a/Executables/Validation/KTRegisterNymphValidationExtData.hh b/Executables/Validation/KTRegisterNymphValidationExtData.hh
new file mode 100644
index 0000000..efa5da6
--- /dev/null
+++ b/Executables/Validation/KTRegisterNymphValidationExtData.hh
@@ -0,0 +1,19 @@
+/*
+ * KTRegisterNymphValidationExtData.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_
+#define NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_
+
+#include "KTRegisterNymphExtData.hh"
+
+#include "KTTestData.hh"
+
+CEREAL_REGISTER_TYPE( Nymph::KTTestDataExt );
+CEREAL_REGISTER_TYPE( Nymph::KTTestDerived1DataExt );
+CEREAL_REGISTER_TYPE( Nymph::KTTestDerived2DataExt );
+
+#endif /* NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_ */
diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
index b771114..e2fdc00 100644
--- a/Executables/Validation/KTTestData.hh
+++ b/Executables/Validation/KTTestData.hh
@@ -43,6 +43,12 @@ namespace Nymph
             virtual ~KTTestBaseData() {}
 
             MEMBERVARIABLE(double, Funniness);
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
     };
 
     DEFINE_EXT_DATA_2( KTTestDerived1DataExt, KTTestBaseData, "test-derived-1" );
@@ -56,6 +62,13 @@ namespace Nymph
             ar( cereal::base_class< KTData >( this ), fIsAwesome );
     }
 
+    template< class Archive >
+    void KTTestBaseData::serialize( Archive& ar )
+    {
+            std::cout << "### serialize for KTTestBaseData" << std::endl;
+            ar( cereal::base_class< KTData >( this ), fFunniness );
+    }
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_KTTESTDATA_HH_ */
diff --git a/Executables/Validation/TestJSONWriter.cc b/Executables/Validation/TestJSONWriter.cc
index c6320f0..3a6d567 100644
--- a/Executables/Validation/TestJSONWriter.cc
+++ b/Executables/Validation/TestJSONWriter.cc
@@ -6,8 +6,8 @@
  *
 */
 
-#include "KTJSONWriter.hh"
 #include "KTJSONReader.hh"
+#include "KTJSONWriter.hh"
 
 #include "KTTestData.hh" 
 
@@ -36,7 +36,7 @@ int main()
 
         // destruction of the stream and archive (in the writer's destructor) properly closes the file
     }
-
+/*
     {
         KTTestData newTestData;
 
@@ -47,7 +47,7 @@ int main()
 
         KTINFO( testlog, "Is the read data awesome? " << newTestData.GetIsAwesome() );
     }
-
+*/
     KTINFO( testlog, "Validation script concluded" );
 	return 0;
 }

From df94bbb09e4c3c96a1dfb001d11429621c136fe3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 21:45:46 -0600
Subject: [PATCH 104/521] Added KTTestDataPrimaryProcessor to Validation

---
 Executables/Validation/CMakeLists.txt         |  2 +
 .../Validation/KTTestDataPrimaryProcessor.cc  | 53 +++++++++++++++++++
 .../Validation/KTTestDataPrimaryProcessor.hh  | 40 ++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 Executables/Validation/KTTestDataPrimaryProcessor.cc
 create mode 100644 Executables/Validation/KTTestDataPrimaryProcessor.hh

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 5c1d43f..3585fc8 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -19,6 +19,7 @@ if (Nymph_ENABLE_TESTING)
         KTTestConfigurable.hh
         KTTestCuts.hh
         KTTestData.hh
+        KTTestDataPrimaryProcessor.hh
         KTTestPrimaryProcessor.hh
         KTTestProcessor.hh
     )
@@ -30,6 +31,7 @@ if (Nymph_ENABLE_TESTING)
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc
+        KTTestDataPrimaryProcessor.cc
         KTTestPrimaryProcessor.cc
         KTTestProcessor.cc
     )
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Executables/Validation/KTTestDataPrimaryProcessor.cc
new file mode 100644
index 0000000..0a7753a
--- /dev/null
+++ b/Executables/Validation/KTTestDataPrimaryProcessor.cc
@@ -0,0 +1,53 @@
+/*
+ * KTTestDataPrimaryProcessor.cc
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestDataPrimaryProcessor.hh"
+
+#include "KTTestData.hh"
+
+namespace Nymph
+{
+
+    KT_REGISTER_PROCESSOR(KTTestDataPrimaryProcessor, "test-data-p-proc");
+
+    KTTestDataPrimaryProcessor::KTTestDataPrimaryProcessor( const std::string& name ) :
+            KTPrimaryProcessor( {"derived-1"}, name ),
+            fIterations(10),
+            fTheSignal("derived-1", this)
+    {
+    }
+
+    KTTestDataPrimaryProcessor::~KTTestDataPrimaryProcessor()
+    {
+    }
+
+    bool KTTestDataPrimaryProcessor::Configure( const scarab::param_node& node )
+    {
+        SetIterations( node.get_value( "iterations", GetIterations() ) );
+
+        return true;
+    }
+
+    bool KTTestDataPrimaryProcessor::Run()
+    {
+        for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
+        {
+            // e.g. for a real processor, do some work here instead of sleeping
+            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
+
+            if( fThreadRef->GetCanceled() ) break;
+
+            KTDataHandle handle = CreateNewDataHandle();
+            KTTestDerived1DataExt& testData = handle->Of< KTTestDerived1DataExt >();
+            testData.SetFunniness( 867 );
+
+            fTheSignal( handle );
+        }
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.hh b/Executables/Validation/KTTestDataPrimaryProcessor.hh
new file mode 100644
index 0000000..96b6955
--- /dev/null
+++ b/Executables/Validation/KTTestDataPrimaryProcessor.hh
@@ -0,0 +1,40 @@
+/*
+ * KTTestPrimaryProcessor.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef KTTESTDATAPRIMARYPROCESSOR_HH_
+#define KTTESTDATAPRIMARYPROCESSOR_HH_
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTMemberVariable.hh"
+#include "KTSignal.hh"
+
+namespace Nymph
+{
+
+   class KTTestDataPrimaryProcessor : public KTPrimaryProcessor
+    {
+        public:
+            KTTestDataPrimaryProcessor( const std::string& name = "test-data-p-proc" );
+            virtual ~KTTestDataPrimaryProcessor();
+
+        public:
+            bool Configure( const scarab::param_node& node );
+
+            MEMBERVARIABLE( unsigned, Iterations );
+
+        public:
+            virtual bool Run();
+
+        private:
+            KTSignalData fTheSignal;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTTESTDATAPRIMARYPROCESSOR_HH_ */

From 3c2b0b00b26c5c0098b920ae0b875e70cb6a0ccf Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 23:19:57 -0600
Subject: [PATCH 105/521] Added constructor argumnts to KTTIFactory

---
 Library/Utility/KTTIFactory.hh | 221 +++++++++++++++++++++++++++++----
 1 file changed, 199 insertions(+), 22 deletions(-)

diff --git a/Library/Utility/KTTIFactory.hh b/Library/Utility/KTTIFactory.hh
index c2c0ccf..294bafe 100644
--- a/Library/Utility/KTTIFactory.hh
+++ b/Library/Utility/KTTIFactory.hh
@@ -21,11 +21,90 @@ namespace Nymph
 {
     KTLOGGER(utillog_ti_factory, "KTTIFactory");
 
-    template< class XBaseType >
+    //********************
+    // Class definitions
+    //********************
+
+    template< class XBaseType, typename ... XArgs >
     class KTTIFactory;
 
-    template< class XBaseType >
+    template< class XBaseType, typename ... XArgs >
     class KTTIRegistrarBase
+    {
+        public:
+            KTTIRegistrarBase() {}
+            virtual ~KTTIRegistrarBase() {}
+
+        public:
+            friend class KTTIFactory< XBaseType, XArgs... >;
+
+        protected:
+            virtual XBaseType* Create(XArgs ... args) const = 0;
+
+    };
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    class KTTIRegistrar : public KTTIRegistrarBase< XBaseType, XArgs... >
+    {
+        public:
+            KTTIRegistrar();
+            virtual ~KTTIRegistrar();
+
+        protected:
+            void Register() const;
+
+            XBaseType* Create(XArgs ... args) const;
+
+    };
+
+
+    template< class XBaseType, typename ... XArgs >
+    class KTTIFactory : public scarab::singleton< KTTIFactory< XBaseType, XArgs... > >
+    {
+        public:
+            struct CompareTypeInfo
+            {
+                bool operator() (const std::type_info* lhs, const std::type_info* rhs)
+                {
+                    return lhs->before(*rhs);
+                }
+            };
+
+        public:
+            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType, XArgs... >* > FactoryMap;
+            typedef typename FactoryMap::value_type FactoryEntry;
+            typedef typename FactoryMap::iterator FactoryIt;
+            typedef typename FactoryMap::const_iterator FactoryCIt;
+
+        public:
+            template< class XDerivedType >
+            XBaseType* Create(XArgs ... args);
+
+            XBaseType* Create(const FactoryCIt& iter, XArgs ... args);
+
+            template< class XDerivedType >
+            void Register(const KTTIRegistrarBase< XBaseType, XArgs... >* registrar);
+
+            FactoryCIt GetFactoryMapBegin() const;
+            FactoryCIt GetFactoryMapEnd() const;
+
+        protected:
+            FactoryMap* fMap;
+
+
+        protected:
+            friend class scarab::singleton< KTTIFactory >;
+            friend class scarab::destroyer< KTTIFactory >;
+            KTTIFactory();
+            ~KTTIFactory();
+    };
+
+    //*****************************************
+    // Partial specialization for empty XArgs
+    //*****************************************
+
+    template< class XBaseType >
+    class KTTIRegistrarBase< XBaseType, void >
     {
         public:
             KTTIRegistrarBase() {}
@@ -40,7 +119,7 @@ namespace Nymph
     };
 
     template< class XBaseType, class XDerivedType >
-    class KTTIRegistrar : public KTTIRegistrarBase< XBaseType >
+    class KTTIRegistrar< XBaseType, XDerivedType, void > : public KTTIRegistrarBase< XBaseType, void >
     {
         public:
             KTTIRegistrar();
@@ -55,7 +134,7 @@ namespace Nymph
 
 
     template< class XBaseType >
-    class KTTIFactory : public scarab::singleton< KTTIFactory< XBaseType > >
+    class KTTIFactory< XBaseType, void > : public scarab::singleton< KTTIFactory< XBaseType, void > >
     {
         public:
             struct CompareTypeInfo
@@ -67,7 +146,7 @@ namespace Nymph
             };
 
         public:
-            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType >* > FactoryMap;
+            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType, void >* > FactoryMap;
             typedef typename FactoryMap::value_type FactoryEntry;
             typedef typename FactoryMap::iterator FactoryIt;
             typedef typename FactoryMap::const_iterator FactoryCIt;
@@ -79,7 +158,7 @@ namespace Nymph
             XBaseType* Create(const FactoryCIt& iter);
 
             template< class XDerivedType >
-            void Register(const KTTIRegistrarBase< XBaseType >* registrar);
+            void Register(const KTTIRegistrarBase< XBaseType, void >* registrar);
 
             FactoryCIt GetFactoryMapBegin() const;
             FactoryCIt GetFactoryMapEnd() const;
@@ -95,9 +174,108 @@ namespace Nymph
             ~KTTIFactory();
     };
 
+
+    //******************
+    // Implementations
+    //******************
+
+    // Factory
+
+    template< class XBaseType, typename ... XArgs >
+    template< class XDerivedType >
+    XBaseType* KTTIFactory< XBaseType, XArgs... >::Create(XArgs ... args)
+    {
+        FactoryCIt it = fMap->find(&typeid(XDerivedType));
+        if (it == fMap->end())
+        {
+            KTERROR(utillog_ti_factory, "Did not find factory with type <" << typeid(XDerivedType).name() << ">.");
+            return NULL;
+        }
+
+        return it->second->Create(args...);
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    XBaseType* KTTIFactory< XBaseType, XArgs... >::Create(const FactoryCIt& iter, XArgs ... args)
+    {
+        return iter->second->Create(args...);
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    template< class XDerivedType >
+    void KTTIFactory< XBaseType, XArgs... >::Register(const KTTIRegistrarBase< XBaseType, XArgs... >* registrar)
+    {
+        // A local (static) logger is created inside this function to avoid static initialization order problems
+        KTLOGGER(utillog_ti_factory_reg, "KTTIFactory-Register");
+
+        FactoryCIt it = fMap->find(&typeid(XDerivedType));
+        if (it != fMap->end())
+        {
+            KTERROR(utillog_ti_factory_reg, "Already have factory registered for type <" << typeid(XDerivedType).name() << ">.");
+            return;
+        }
+        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType, XArgs... >* >(&typeid(XDerivedType), registrar));
+        KTDEBUG(utillog_ti_factory_reg, "Registered a factory for class type " << typeid(XDerivedType).name() << ", factory #" << fMap->size()-1);
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    KTTIFactory< XBaseType, XArgs... >::KTTIFactory() :
+        fMap(new FactoryMap())
+    {}
+
+    template< class XBaseType, typename ... XArgs >
+    KTTIFactory< XBaseType, XArgs... >::~KTTIFactory()
+    {
+        delete fMap;
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    typename KTTIFactory< XBaseType, XArgs... >::FactoryCIt KTTIFactory< XBaseType, XArgs... >::GetFactoryMapBegin() const
+    {
+        return fMap->begin();
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    typename KTTIFactory< XBaseType, XArgs... >::FactoryCIt KTTIFactory< XBaseType, XArgs... >::GetFactoryMapEnd() const
+    {
+        return fMap->end();
+    }
+
+    // Registrar
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::KTTIRegistrar() :
+            KTTIRegistrarBase< XBaseType, XArgs... >()
+    {
+        Register();
+    }
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::~KTTIRegistrar()
+    {}
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    void KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::Register() const
+    {
+        KTTIFactory< XBaseType, XArgs... >::get_instance()->template Register<XDerivedType>(this);
+        return;
+    }
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    XBaseType* KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::Create(XArgs ... args) const
+    {
+        return dynamic_cast< XBaseType* >(new XDerivedType(args...));
+    }
+
+    //*******************************************
+    // Implementations (partial specialization)
+    //*******************************************
+
+    // Factory
+
     template< class XBaseType >
     template< class XDerivedType >
-    XBaseType* KTTIFactory< XBaseType >::Create()
+    XBaseType* KTTIFactory< XBaseType, void >::Create()
     {
         FactoryCIt it = fMap->find(&typeid(XDerivedType));
         if (it == fMap->end())
@@ -110,14 +288,14 @@ namespace Nymph
     }
 
     template< class XBaseType >
-    XBaseType* KTTIFactory< XBaseType >::Create(const FactoryCIt& iter)
+    XBaseType* KTTIFactory< XBaseType, void >::Create(const FactoryCIt& iter)
     {
         return iter->second->Create();
     }
 
     template< class XBaseType >
     template< class XDerivedType >
-    void KTTIFactory< XBaseType >::Register(const KTTIRegistrarBase< XBaseType >* registrar)
+    void KTTIFactory< XBaseType, void >::Register(const KTTIRegistrarBase< XBaseType, void >* registrar)
     {
         // A local (static) logger is created inside this function to avoid static initialization order problems
         KTLOGGER(utillog_ti_factory_reg, "KTTIFactory-Register");
@@ -128,56 +306,55 @@ namespace Nymph
             KTERROR(utillog_ti_factory_reg, "Already have factory registered for type <" << typeid(XDerivedType).name() << ">.");
             return;
         }
-        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType >* >(&typeid(XDerivedType), registrar));
+        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType, void >* >(&typeid(XDerivedType), registrar));
         KTDEBUG(utillog_ti_factory_reg, "Registered a factory for class type " << typeid(XDerivedType).name() << ", factory #" << fMap->size()-1);
     }
 
     template< class XBaseType >
-    KTTIFactory< XBaseType >::KTTIFactory() :
+    KTTIFactory< XBaseType, void >::KTTIFactory() :
         fMap(new FactoryMap())
     {}
 
     template< class XBaseType >
-    KTTIFactory< XBaseType >::~KTTIFactory()
+    KTTIFactory< XBaseType, void >::~KTTIFactory()
     {
         delete fMap;
     }
 
     template< class XBaseType >
-    typename KTTIFactory< XBaseType >::FactoryCIt KTTIFactory< XBaseType >::GetFactoryMapBegin() const
+    typename KTTIFactory< XBaseType, void >::FactoryCIt KTTIFactory< XBaseType, void >::GetFactoryMapBegin() const
     {
         return fMap->begin();
     }
 
     template< class XBaseType >
-    typename KTTIFactory< XBaseType >::FactoryCIt KTTIFactory< XBaseType >::GetFactoryMapEnd() const
+    typename KTTIFactory< XBaseType, void >::FactoryCIt KTTIFactory< XBaseType, void >::GetFactoryMapEnd() const
     {
         return fMap->end();
     }
 
-
-
+    // Registrar
 
     template< class XBaseType, class XDerivedType >
-    KTTIRegistrar< XBaseType, XDerivedType >::KTTIRegistrar() :
-            KTTIRegistrarBase< XBaseType >()
+    KTTIRegistrar< XBaseType, XDerivedType, void >::KTTIRegistrar() :
+            KTTIRegistrarBase< XBaseType, void >()
     {
         Register();
     }
 
     template< class XBaseType, class XDerivedType >
-    KTTIRegistrar< XBaseType, XDerivedType >::~KTTIRegistrar()
+    KTTIRegistrar< XBaseType, XDerivedType, void >::~KTTIRegistrar()
     {}
 
     template< class XBaseType, class XDerivedType >
-    void KTTIRegistrar< XBaseType, XDerivedType >::Register() const
+    void KTTIRegistrar< XBaseType, XDerivedType, void >::Register() const
     {
-        KTTIFactory< XBaseType >::get_instance()->template Register<XDerivedType>(this);
+        KTTIFactory< XBaseType, void >::get_instance()->template Register<XDerivedType>(this);
         return;
     }
 
     template< class XBaseType, class XDerivedType >
-    XBaseType* KTTIRegistrar< XBaseType, XDerivedType >::Create() const
+    XBaseType* KTTIRegistrar< XBaseType, XDerivedType, void >::Create() const
     {
         return dynamic_cast< XBaseType* >(new XDerivedType());
     }

From 9739b6eca909a49b2d9cd80fadc1aff3d95f43e6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 23:21:45 -0600
Subject: [PATCH 106/521] Added type writer registration macro and
 TestJSONWriterViaSlot.cc

---
 Executables/Validation/CMakeLists.txt         |  1 +
 Executables/Validation/KTJSONWriter.cc        |  2 +-
 Executables/Validation/KTJSONWriter.hh        |  4 +-
 .../Validation/KTJSONWriterValidation.cc      | 14 ++++--
 .../Validation/KTJSONWriterValidation.hh      | 12 +++--
 .../Validation/KTTestDataPrimaryProcessor.cc  |  4 +-
 .../Validation/TestJSONWriterViaSlot.cc       | 46 +++++++++++++++++++
 Library/IO/KTWriter.hh                        | 16 ++++---
 8 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 Executables/Validation/TestJSONWriterViaSlot.cc

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 3585fc8..7cc7e0e 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -63,6 +63,7 @@ if (Nymph_ENABLE_TESTING)
         TestExt
         TestExtSerialization
         TestJSONWriter
+        TestJSONWriterViaSlot
         TestLogger
         TestPolymorphicSlotData
         TestPrimaryProcessor
diff --git a/Executables/Validation/KTJSONWriter.cc b/Executables/Validation/KTJSONWriter.cc
index 6b8f489..6723611 100644
--- a/Executables/Validation/KTJSONWriter.cc
+++ b/Executables/Validation/KTJSONWriter.cc
@@ -14,7 +14,7 @@
 namespace Nymph
 {
     KTJSONWriter::KTJSONWriter( const std::string& name ) :
-        KTWriterWithTypists< KTJSONWriter, KTJSONWriterTypist >( name ),
+        KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >( name ),
         fFilename( "json_writer_default_file.json" ),
         fStreamOutPtr( nullptr ),
         fArchiveOutPtr( nullptr ),
diff --git a/Executables/Validation/KTJSONWriter.hh b/Executables/Validation/KTJSONWriter.hh
index 6122d5b..b16e8fa 100644
--- a/Executables/Validation/KTJSONWriter.hh
+++ b/Executables/Validation/KTJSONWriter.hh
@@ -27,9 +27,9 @@ namespace Nymph
 {
     class KTJSONWriter;
 
-    typedef KTDerivedTypeWriter< KTJSONWriter > KTJSONWriterTypist;
+    typedef KTDerivedTypeWriter< KTJSONWriter > KTJSONTypeWriter;
 
-    class KTJSONWriter : public KTWriterWithTypists< KTJSONWriter, KTJSONWriterTypist >
+    class KTJSONWriter : public KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >
     {
         public:
             KTJSONWriter( const std::string& name = "json-writer" );
diff --git a/Executables/Validation/KTJSONWriterValidation.cc b/Executables/Validation/KTJSONWriterValidation.cc
index 4de7df4..3279a6c 100644
--- a/Executables/Validation/KTJSONWriterValidation.cc
+++ b/Executables/Validation/KTJSONWriterValidation.cc
@@ -11,18 +11,22 @@
 
 namespace Nymph
 {
+    KT_REGISTER_TYPE_WRITER( KTJSONWriter, KTJSONTypeWriter, Validation );
 
-    KTJSONWriterValidation::KTJSONWriterValidation() :
-            KTJSONWriterTypist(),
-            fTestDataSlot( "test", fWriter, &KTJSONWriter::WriteData< KTTestDataExt > )
+    KTJSONTypeWriterValidation::KTJSONTypeWriterValidation( KTJSONWriter* writer) :
+            KTJSONTypeWriter( writer ),
+            fTestSlot( "test", fWriter, &KTJSONWriter::WriteData< KTTestDataExt > ),
+            fTestDerived1Slot( "test-derived-1", fWriter, &KTJSONWriter::WriteData< KTTestDerived1DataExt > ),
+            fTestDerived2Slot( "test-derived-2", fWriter, &KTJSONWriter::WriteData< KTTestDerived2DataExt > )
     {
+        std::cout << "Created a KTJSONWriterValidation" << std::endl;
     }
 
-    KTJSONWriterValidation::~KTJSONWriterValidation()
+    KTJSONTypeWriterValidation::~KTJSONTypeWriterValidation()
     {
     }
 
-    void KTJSONWriterValidation::RegisterSlots()
+    void KTJSONTypeWriterValidation::RegisterSlots()
     {
     }
 
diff --git a/Executables/Validation/KTJSONWriterValidation.hh b/Executables/Validation/KTJSONWriterValidation.hh
index 4141e80..49ed6cc 100644
--- a/Executables/Validation/KTJSONWriterValidation.hh
+++ b/Executables/Validation/KTJSONWriterValidation.hh
@@ -13,17 +13,21 @@
 namespace Nymph
 {
     class KTTestDataExt;
+    class KTTestDerived1DataExt;
+    class KTTestDerived2DataExt;
 
-    class KTJSONWriterValidation : public KTJSONWriterTypist
+    class KTJSONTypeWriterValidation : public KTJSONTypeWriter
     {
         public:
-            KTJSONWriterValidation();
-            virtual ~KTJSONWriterValidation();
+            KTJSONTypeWriterValidation( KTJSONWriter* writer );
+            virtual ~KTJSONTypeWriterValidation();
 
             virtual void RegisterSlots();
 
         private:
-            KTSlotData< void, KTTestDataExt > fTestDataSlot;
+            KTSlotData< void, KTTestDataExt > fTestSlot;
+            KTSlotData< void, KTTestDerived1DataExt > fTestDerived1Slot;
+            KTSlotData< void, KTTestDerived2DataExt > fTestDerived2Slot;
 
     };
 
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Executables/Validation/KTTestDataPrimaryProcessor.cc
index 0a7753a..f6d3cd3 100644
--- a/Executables/Validation/KTTestDataPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestDataPrimaryProcessor.cc
@@ -15,9 +15,9 @@ namespace Nymph
     KT_REGISTER_PROCESSOR(KTTestDataPrimaryProcessor, "test-data-p-proc");
 
     KTTestDataPrimaryProcessor::KTTestDataPrimaryProcessor( const std::string& name ) :
-            KTPrimaryProcessor( {"derived-1"}, name ),
+            KTPrimaryProcessor( {"test-derived-1"}, name ),
             fIterations(10),
-            fTheSignal("derived-1", this)
+            fTheSignal("test-derived-1", this)
     {
     }
 
diff --git a/Executables/Validation/TestJSONWriterViaSlot.cc b/Executables/Validation/TestJSONWriterViaSlot.cc
new file mode 100644
index 0000000..66ced7e
--- /dev/null
+++ b/Executables/Validation/TestJSONWriterViaSlot.cc
@@ -0,0 +1,46 @@
+/*
+ * TestJSONWriterViaSlot.cc
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestDataPrimaryProcessor.hh"
+#include "KTJSONWriterValidation.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testlog, "TestJSONWriterViaSlot" )
+
+int main()
+{
+
+    try
+    {
+        KTINFO( testlog, "Creating processors" );
+        KTTestDataPrimaryProcessor tdpp;
+        KTJSONWriter jw;
+
+        KTINFO( testlog, "Connecting the-signal to first-slot" );
+        tdpp.ConnectASlot( "test-derived-1", &jw, "test-derived-1", 20 );
+
+        KTINFO( testlog, "Running the primary processor" )
+
+        if( ! tdpp.Run() )
+        {
+            KTERROR( testlog, "Something went wrong while running the primary processor" );
+            return -1;
+        }
+
+        KTINFO( testlog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testlog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Library/IO/KTWriter.hh b/Library/IO/KTWriter.hh
index e89b677..278e680 100644
--- a/Library/IO/KTWriter.hh
+++ b/Library/IO/KTWriter.hh
@@ -33,7 +33,7 @@ namespace Nymph
     class KTDerivedTypeWriter : public KTTypeWriter
     {
         public:
-            KTDerivedTypeWriter();
+            KTDerivedTypeWriter(XWriter* writer);
             virtual ~KTDerivedTypeWriter();
 
             void SetWriter(XWriter* writer);
@@ -44,9 +44,9 @@ namespace Nymph
 
 
     template< class XWriter >
-    KTDerivedTypeWriter< XWriter >::KTDerivedTypeWriter() :
+    KTDerivedTypeWriter< XWriter >::KTDerivedTypeWriter(XWriter* writer) :
             KTTypeWriter(),
-            fWriter(NULL)
+            fWriter(writer)
     {
     }
 
@@ -96,13 +96,13 @@ namespace Nymph
             KTWriter(name),
             fTypeWriters()
     {
-        KTTIFactory< XTypist >* twFactory = KTTIFactory< XTypist >::get_instance();
-        for (typename KTTIFactory< XTypist >::FactoryCIt factoryIt = twFactory->GetFactoryMapBegin();
+        KTTIFactory< XTypist, XWriter* >* twFactory = KTTIFactory< XTypist, XWriter* >::get_instance();
+        for (typename KTTIFactory< XTypist, XWriter* >::FactoryCIt factoryIt = twFactory->GetFactoryMapBegin();
                 factoryIt != twFactory->GetFactoryMapEnd();
                 factoryIt++)
         {
-            XTypist* newTypeWriter = twFactory->Create(factoryIt);
-            newTypeWriter->SetWriter(static_cast< XWriter* >(this));
+            XTypist* newTypeWriter = twFactory->Create(factoryIt, static_cast< XWriter* >(this));
+            //newTypeWriter->SetWriter(static_cast< XWriter* >(this));
             newTypeWriter->RegisterSlots();
             fTypeWriters.insert(typename TypeWriterMap::value_type(factoryIt->first, newTypeWriter));
         }
@@ -130,6 +130,8 @@ namespace Nymph
         return static_cast< XTypeWriter* >(it->second);
     }
 
+#define KT_REGISTER_TYPE_WRITER(writer_class, type_writer_base_class, typist) \
+        static ::Nymph::KTTIRegistrar< type_writer_base_class, type_writer_base_class##typist, writer_class* > s##type_writer_base_class##typist##Registrar;
 
 #define KT_REGISTER_WRITER(writer_class, writer_name) \
         static ::scarab::registrar< ::Nymph::KTWriter, writer_class, const std::string& > s##writer_class##WriterRegistrar(writer_name);

From 04c28e9eb0b3389493e8240f63c5e149fb593afa Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 17 Feb 2018 23:36:55 -0600
Subject: [PATCH 107/521] Fix issue with checking non-existant thread ref

---
 Executables/Validation/KTTestDataPrimaryProcessor.cc | 2 +-
 Executables/Validation/KTTestPrimaryProcessor.cc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Executables/Validation/KTTestDataPrimaryProcessor.cc
index f6d3cd3..528d059 100644
--- a/Executables/Validation/KTTestDataPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestDataPrimaryProcessor.cc
@@ -39,7 +39,7 @@ namespace Nymph
             // e.g. for a real processor, do some work here instead of sleeping
             boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
 
-            if( fThreadRef->GetCanceled() ) break;
+            if( fThreadRef && fThreadRef->GetCanceled() ) break;
 
             KTDataHandle handle = CreateNewDataHandle();
             KTTestDerived1DataExt& testData = handle->Of< KTTestDerived1DataExt >();
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
index 897a728..43692c1 100644
--- a/Executables/Validation/KTTestPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestPrimaryProcessor.cc
@@ -37,7 +37,7 @@ namespace Nymph
             // e.g. for a real processor, do some work here instead of sleeping
             boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
 
-            if( fThreadRef->GetCanceled() ) break;
+            if( fThreadRef && fThreadRef->GetCanceled() ) break;
 
             fTheSignal( iIteration );
         }

From 2acf6f08903ce122713e5a2c7bf61da518ed6015 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 19 Feb 2018 16:40:39 -0800
Subject: [PATCH 108/521] Testing name-value pairs

---
 Executables/Validation/KTTestData.hh        |  4 ++--
 Executables/Validation/TestSerialization.cc | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
index e2fdc00..a181bfb 100644
--- a/Executables/Validation/KTTestData.hh
+++ b/Executables/Validation/KTTestData.hh
@@ -59,14 +59,14 @@ namespace Nymph
     void KTTestData::serialize( Archive& ar )
     {
             std::cout << "### serialize for KTTestData" << std::endl;
-            ar( cereal::base_class< KTData >( this ), fIsAwesome );
+            ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fIsAwesome) );
     }
 
     template< class Archive >
     void KTTestBaseData::serialize( Archive& ar )
     {
             std::cout << "### serialize for KTTestBaseData" << std::endl;
-            ar( cereal::base_class< KTData >( this ), fFunniness );
+            ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fFunniness) );
     }
 
 } /* namespace Nymph */
diff --git a/Executables/Validation/TestSerialization.cc b/Executables/Validation/TestSerialization.cc
index df35a4d..ab97d7b 100644
--- a/Executables/Validation/TestSerialization.cc
+++ b/Executables/Validation/TestSerialization.cc
@@ -25,13 +25,16 @@ int main()
     {
         KTCoreData coreData;
         KTTestData testData;
+        KTTestBaseData testBaseData;
 
         // change data values from their defaults
         coreData.SetCounter( 5 );
         testData.SetIsAwesome( true );
+        testBaseData.SetFunniness( 923 );
 
         KTINFO( testlog, "KTCoreData counter: " << coreData.GetCounter() );
         KTINFO( testlog, "KTTestData is-awesome: " << testData.GetIsAwesome() );
+        KTINFO( testlog, "KTTestBaseData funniness: " << testBaseData.GetFunniness() );
 
         // create and open a file for output
         std::ofstream fileOut( filename );
@@ -39,7 +42,7 @@ int main()
         cereal::JSONOutputArchive archiveOut( fileOut );
 
         KTINFO( testlog, "Writing data to JSON archive" );
-        archiveOut( coreData, testData );
+        archiveOut( CEREAL_NVP(coreData), CEREAL_NVP(testData), CEREAL_NVP(testBaseData) );
 
         // archive and stream closed when destructors are called
     }
@@ -48,6 +51,7 @@ int main()
     {
         KTCoreData newCoreData;
         KTTestData newTestData;
+        KTTestBaseData newTestBaseData;
 
          // create and open an archive for input
         std::ifstream fileIn( filename );
@@ -55,10 +59,11 @@ int main()
         cereal::JSONInputArchive archiveIn( fileIn );
 
         KTINFO( testlog, "Reading data from JSON archive" );
-        archiveIn( newCoreData, newTestData );
+        archiveIn( newCoreData, newTestData, newTestBaseData );
 
-        KTINFO(testlog, "KTCoreData counter: " << newCoreData.GetCounter());
-        KTINFO(testlog, "KTTestData is-awesome: " << newTestData.GetIsAwesome());
+        KTINFO( testlog, "KTCoreData counter: " << newCoreData.GetCounter() );
+        KTINFO( testlog, "KTTestData is-awesome: " << newTestData.GetIsAwesome() );
+        KTINFO( testlog, "KTTestBaseData funniness: " << newTestBaseData.GetFunniness() );
 
         // archive and stream closed when destructors are called
     }

From 32228884f542273660be014f81c8bf60bca54a3f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 19 Feb 2018 17:07:04 -0800
Subject: [PATCH 109/521] Extended serialization to cut results and status, and
 updated the documentation in KTCutStatus

---
 Library/Data/KTCoreData.hh  |  3 +-
 Library/Data/KTCutStatus.hh | 62 ++++++++++++++++++++++++++++++-------
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/Library/Data/KTCoreData.hh b/Library/Data/KTCoreData.hh
index e81bf5a..f6d6901 100644
--- a/Library/Data/KTCoreData.hh
+++ b/Library/Data/KTCoreData.hh
@@ -39,8 +39,7 @@ namespace Nymph
             void serialize( Archive& ar )
             {
                 std::cout << "### serialize for KTCoreData" << std::endl;
-                ar( cereal::base_class< KTData >( this ), fCounter, fLastData );
-                //ar( cereal::base_class< KTData >( this ), fCounter, fLastData, fCutStatus );
+                ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fCounter), CEREAL_NVP(fLastData), CEREAL_NVP(fCutStatus) );
             }
     };
 
diff --git a/Library/Data/KTCutStatus.hh b/Library/Data/KTCutStatus.hh
index 2f69f08..77c41ee 100644
--- a/Library/Data/KTCutStatus.hh
+++ b/Library/Data/KTCutStatus.hh
@@ -13,6 +13,10 @@
 
 #include "KTException.hh"
 
+#include "cereal/access.hpp"
+#include "cereal/types/string.hpp"
+#include "cereal/types/vector.hpp"
+
 #include <boost/dynamic_bitset.hpp>
 
 #include <algorithm>
@@ -25,12 +29,16 @@ namespace Nymph
      @class KTCutStatus
      @author N. S. Oblath
 
-     @brief Provides easy access to cut information.
+     @brief Provides easy access to cut result information.
 
      @details
+     The cut results can be imagined as an array of booleans, specifying whether the cut was passed: [true, false, false, true, . . . ].
+
+     Cuts are assigned both an array position (non-negative integer) and a name (string) before or when the results are set.
+
      KTCutStatus is typically used as a member variable of KTCoreData, the top-level data object.
 
-     KTCutStatus owns the set of cut results that have been added to a data object.
+     KTCutStatus owns the set of KTCutResults that have been added to a data object.
      It also owns a summary of those cuts (implemented with boost::dynamic_bitset).
 
      You can check if the data has been cut with the IsCut functions.
@@ -44,16 +52,25 @@ namespace Nymph
      - std::string masks are strings with each character either a 0 or 1.
 
      With KTCutStatus you can interact with individual cut results in the following ways:
-     - Add cut results to a data object with AddCutResult,
-     - Check to see if a particular cut result is present using HasCutResult,
-     - Get the value of a cut result with GetCutState,
-     - Set the value of a cut result with SetCutState,
-     - Directly access the cut result with GetCutResult, and
-     - Remove a cut result with RemoveCutResult.
-
-     For all except KTCutStatus::RemoveCutResult, the cut result can be identified by type or string name.
+     - Get the number of cut results with size(),
+     - Get a reference to the cut results with CutResults(),
+     - If you need to manually update the cut status bitset, use UpdateStatus(),
+     - Add cut results to a data object with AssignCutResult(),
+     - Remove a cut result with RemoveCutResult(),
+     - Check to see if a particular cut result is present using HasCutResult(),
+     - Get the value of a cut result with GetCutState(), and
+     - Set the value of a cut result with SetCutState(),
+
+     Cut results can typically be accessed by either name or mask position.
      */
 
+    // external serialization function for KTCutResult
+    template< class Archive >
+    void serialize( Archive & archive, KTCutResult& cutResult )
+    {
+        archive( CEREAL_NVP(cutResult.fName), CEREAL_NVP(cutResult.fState), CEREAL_NVP(cutResult.fAssigned) );
+    }
+
     class KTCutStatus
     {
         public:
@@ -112,7 +129,6 @@ namespace Nymph
             /// Returns a string with the names of the cuts that are present in bitset order
             std::string CutResultsPresent() const;
 
-
         private:
             friend std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
 
@@ -129,6 +145,15 @@ namespace Nymph
             bitset_type ToBitset(unsigned long long mask) const;
             bitset_type ToBitset(const std::string& mask) const;
 
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void save( Archive& ar ) const;
+
+            template< class Archive >
+            void load( Archive& ar );
+
     };
 
     std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
@@ -271,6 +296,21 @@ namespace Nymph
         return bitset_type(mask);
     }
 
+    template< class Archive >
+    void KTCutStatus::save( Archive& ar ) const
+    {
+        std::cout << "### save for KTCutStatus" << std::endl;
+        ar( CEREAL_NVP(fCutResults) );
+    }
+
+    template< class Archive >
+    void KTCutStatus::load( Archive& ar )
+    {
+        std::cout << "### load for KTCutStatus" << std::endl;
+        ar( CEREAL_NVP(fCutResults) );
+        UpdateStatus();
+    }
+
 } /* namespace Nymph */
 
 #endif /* KTCUTSTATUS_HH_ */

From daed1294528ff02a8ec2fffed66b15ab14bf0e00 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 19 Feb 2018 17:56:52 -0800
Subject: [PATCH 110/521] More testing!

---
 Executables/Validation/TestExtSerialization.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Executables/Validation/TestExtSerialization.cc b/Executables/Validation/TestExtSerialization.cc
index 2668eef..ae14d30 100644
--- a/Executables/Validation/TestExtSerialization.cc
+++ b/Executables/Validation/TestExtSerialization.cc
@@ -25,19 +25,22 @@ CEREAL_REGISTER_TYPE( KTTestDataExt );
 
 int main()
 {
-    const std::string filename( "test_serialization_output.json" );
+    const std::string filename( "test_ext_serialization_output.json" );
 
     // save data to archive
     {
         std::shared_ptr< KTCoreDataExt > coreData = std::make_shared< KTCoreDataExt >();
         std::shared_ptr< KTTestDataExt > testData = coreData->Share< KTTestDataExt >();
+        std::shared_ptr< KTTestDerived1DataExt > testD1Data = coreData->Share< KTTestDerived1DataExt >();
 
         // change data values from their defaults
         coreData->SetCounter( 5 );
         testData->SetIsAwesome( true );
+        testD1Data->SetFunniness( 924 );
 
         KTINFO( testlog, "KTCoreData counter: " << coreData->GetCounter() );
         KTINFO( testlog, "KTTestData is-awesome: " << testData->GetIsAwesome() );
+        KTINFO( testlog, "KTTestDerived1Data funniness: " << testD1Data->GetFunniness() );
 
         // create and open a file for output
         std::ofstream fileOut( filename );
@@ -63,9 +66,11 @@ int main()
         archiveIn( newCoreData );
 
         std::shared_ptr< KTTestDataExt > newTestData = newCoreData->Share< KTTestDataExt >();
+        std::shared_ptr< KTTestDerived1DataExt > newD1Data = newCoreData->Share< KTTestDerived1DataExt >();
 
         KTINFO(testlog, "KTCoreData counter: " << newCoreData->GetCounter());
         KTINFO(testlog, "KTTestData is-awesome: " << newTestData->GetIsAwesome());
+        KTINFO( testlog, "KTTestDerived1Data funniness: " << newD1Data->GetFunniness() );
 
         // archive and stream closed when destructors are called
     }

From 242f45b0c4b1bdfa7f583610e7ef19420e287242 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 14:02:42 -0800
Subject: [PATCH 111/521] Fixed bug in data-slot classes that caused
 duplication instead of reference passing

---
 Library/Processor/KTSlot.hh | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 6d486d6..8058273 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -159,14 +159,6 @@ namespace Nymph
             KTSignalData* fSignalPtr;
     };
 
-    // Typedefs for backwards compatibility
-
-    //template< typename XDataType1 >
-    //using KTSlotDataOneType = KTSlotData< XDataType1 >;
-
-    //template< typename XDataType1, typename XDataType2 >
-    //using KTSlotDataTwoTypes = KTSlotData< XDataType1, XDataType2 >;
-
 
     /*!
      @class KTSlotDone
@@ -202,7 +194,7 @@ namespace Nymph
             void operator()();
 
         protected:
-            boost::function< void () > fFunc;
+            std::function< void () > fFunc;
 
             KTSignalDone* fSignalPtr;
     };
@@ -253,7 +245,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
             KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
-            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
     {
     }
@@ -262,7 +254,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
             KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( nullptr )
     {
     }
@@ -271,7 +263,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
             KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
-            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )
     {
     }
@@ -280,7 +272,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
             KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
             fSignalPtr( nullptr )
     {
     }
@@ -342,7 +334,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
             KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
-            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
     {
     }
@@ -351,7 +343,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
             KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( XDataTypes... args ){ return (owner->*func)(args...);} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( nullptr )
     {
     }
@@ -360,7 +352,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
             KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
-            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )
     {
     }
@@ -369,7 +361,7 @@ namespace Nymph
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
             KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( XDataTypes... args ){return (owner->*func) (args... );} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
             fSignalPtr( nullptr )
     {
     }

From dad17aab755ab2904a0632279fa526528a486df4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 14:03:24 -0800
Subject: [PATCH 112/521] Minor changes

---
 Executables/Validation/KTJSONWriter.hh               | 4 +++-
 Executables/Validation/KTTestDataPrimaryProcessor.cc | 7 ++++++-
 Library/Data/KTData.cc                               | 8 ++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Executables/Validation/KTJSONWriter.hh b/Executables/Validation/KTJSONWriter.hh
index b16e8fa..66cda6c 100644
--- a/Executables/Validation/KTJSONWriter.hh
+++ b/Executables/Validation/KTJSONWriter.hh
@@ -21,6 +21,8 @@
 
 #include <fstream>
 
+#include "KTTestData.hh"
+
 KTLOGGER( avlog_hh, "KTJSONWriter" );
 
 namespace Nymph
@@ -61,7 +63,7 @@ namespace Nymph
         }
 
         // Write to JSON archive
-        KTINFO( avlog_hh, "Writing data to JSON acrhive" );
+        KTINFO( avlog_hh, "Writing data to JSON archive" );
         (*fArchiveOutPtr)( data );
 
         KTINFO( avlog_hh, "Successfully wrote data to archive" );
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Executables/Validation/KTTestDataPrimaryProcessor.cc
index 528d059..ee0ed4e 100644
--- a/Executables/Validation/KTTestDataPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestDataPrimaryProcessor.cc
@@ -9,10 +9,14 @@
 
 #include "KTTestData.hh"
 
+#include "KTLogger.hh"
+
+LOGGER( testlog, "KTTestDataPrimaryProcessor" );
+
 namespace Nymph
 {
 
-    KT_REGISTER_PROCESSOR(KTTestDataPrimaryProcessor, "test-data-p-proc");
+    KT_REGISTER_PROCESSOR( KTTestDataPrimaryProcessor, "test-data-p-proc" );
 
     KTTestDataPrimaryProcessor::KTTestDataPrimaryProcessor( const std::string& name ) :
             KTPrimaryProcessor( {"test-derived-1"}, name ),
@@ -44,6 +48,7 @@ namespace Nymph
             KTDataHandle handle = CreateNewDataHandle();
             KTTestDerived1DataExt& testData = handle->Of< KTTestDerived1DataExt >();
             testData.SetFunniness( 867 );
+            KTINFO( testlog, "Test derived1 data funniness: " << testData.GetFunniness() );
 
             fTheSignal( handle );
         }
diff --git a/Library/Data/KTData.cc b/Library/Data/KTData.cc
index 7c7df99..536cb8e 100644
--- a/Library/Data/KTData.cc
+++ b/Library/Data/KTData.cc
@@ -10,10 +10,14 @@
 namespace Nymph
 {
     KTData::KTData()
-    {}
+    {
+        std::cout << "### KTData constructor" << std::endl;
+    }
 
     KTData::~KTData()
-    {}
+    {
+        std::cout << "### KTData destructor" << std::endl;
+    }
 
     KTDataRider::KTDataRider() :
             fName()

From d0611d209fbbe10e8f0ecdfba88e8fc57627b1a2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 14:12:46 -0800
Subject: [PATCH 113/521] Move KTJSONWriter to Library/IO

---
 Executables/Validation/CMakeLists.txt                  | 2 --
 Executables/Validation/KTJSONWriterValidation.cc       | 2 +-
 Executables/Validation/TestJSONWriter.cc               | 3 +--
 Library/CMakeLists.txt                                 | 2 ++
 {Executables/Validation => Library/IO}/KTJSONWriter.cc | 2 +-
 {Executables/Validation => Library/IO}/KTJSONWriter.hh | 7 +++----
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename {Executables/Validation => Library/IO}/KTJSONWriter.cc (94%)
 rename {Executables/Validation => Library/IO}/KTJSONWriter.hh (95%)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index 7cc7e0e..d36d0fb 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -14,7 +14,6 @@ if (Nymph_ENABLE_TESTING)
     # Headers for any test classes
     set (VALIDATION_HEADERFILES
         KTJSONReader.hh
-        KTJSONWriter.hh
         KTJSONWriterValidation.hh
         KTTestConfigurable.hh
         KTTestCuts.hh
@@ -26,7 +25,6 @@ if (Nymph_ENABLE_TESTING)
     
     set (VALIDATION_SOURCEFILES
         KTJSONReader.cc
-        KTJSONWriter.cc
         KTJSONWriterValidation.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
diff --git a/Executables/Validation/KTJSONWriterValidation.cc b/Executables/Validation/KTJSONWriterValidation.cc
index 3279a6c..1cdc86d 100644
--- a/Executables/Validation/KTJSONWriterValidation.cc
+++ b/Executables/Validation/KTJSONWriterValidation.cc
@@ -7,7 +7,7 @@
 
 #include "KTJSONWriterValidation.hh"
 
-#include "KTTestData.hh"
+#include "KTRegisterNymphValidationExtData.hh"
 
 namespace Nymph
 {
diff --git a/Executables/Validation/TestJSONWriter.cc b/Executables/Validation/TestJSONWriter.cc
index 3a6d567..79f27bd 100644
--- a/Executables/Validation/TestJSONWriter.cc
+++ b/Executables/Validation/TestJSONWriter.cc
@@ -6,9 +6,8 @@
  *
 */
 
+#include "../../Library/IO/KTJSONWriter.hh"
 #include "KTJSONReader.hh"
-#include "KTJSONWriter.hh"
-
 #include "KTTestData.hh" 
 
 KTLOGGER( testlog, "TestJSONWriter" );
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 0c4dc89..4ba155e 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -39,6 +39,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/KTSlot.hh
     ${PROC_DIR}/KTSlotWrapper.hh
     ${PROC_DIR}/KTThreadReference.hh
+    ${IO_DIR}/KTJSONWriter.hh
     ${IO_DIR}/KTReader.hh
     ${IO_DIR}/KTWriter.hh
     ${APPL_DIR}/KTApplication.hh
@@ -71,6 +72,7 @@ set( NYMPH_SOURCEFILES
     ${PROC_DIR}/KTSignalWrapper.cc
     ${PROC_DIR}/KTSlotWrapper.cc
     ${PROC_DIR}/KTThreadReference.cc
+    ${IO_DIR}/KTJSONWriter.cc
     ${IO_DIR}/KTReader.cc
     ${IO_DIR}/KTWriter.cc
     ${APPL_DIR}/KTApplication.cc
diff --git a/Executables/Validation/KTJSONWriter.cc b/Library/IO/KTJSONWriter.cc
similarity index 94%
rename from Executables/Validation/KTJSONWriter.cc
rename to Library/IO/KTJSONWriter.cc
index 6723611..62f12f5 100644
--- a/Executables/Validation/KTJSONWriter.cc
+++ b/Library/IO/KTJSONWriter.cc
@@ -6,7 +6,7 @@
  *
 */
 
-#include "KTJSONWriter.hh"
+#include "../../Library/IO/KTJSONWriter.hh"
 
 #include "KTLogger.hh"
 
diff --git a/Executables/Validation/KTJSONWriter.hh b/Library/IO/KTJSONWriter.hh
similarity index 95%
rename from Executables/Validation/KTJSONWriter.hh
rename to Library/IO/KTJSONWriter.hh
index 66cda6c..635ec3d 100644
--- a/Executables/Validation/KTJSONWriter.hh
+++ b/Library/IO/KTJSONWriter.hh
@@ -11,18 +11,17 @@
 
 // included first so that the archive is registered before the data classes
 #include "cereal/archives/json.hpp"
+// then register the nymph extensible data classes
+#include "KTRegisterNymphExtData.hh"
+
 
 #include "KTWriter.hh"
 #include "KTSlot.hh"
 
-#include "KTRegisterNymphValidationExtData.hh"
-
 #include "KTLogger.hh"
 
 #include <fstream>
 
-#include "KTTestData.hh"
-
 KTLOGGER( avlog_hh, "KTJSONWriter" );
 
 namespace Nymph

From f0fa5adeece53186099add80725b4fdb67f0d94b Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 14:56:39 -0800
Subject: [PATCH 114/521] Added function to KTJSONWriter to write extensible
 data objects.  For some reason it sometimes doesn't write out the data; I'm
 not sure what's going on there.

---
 Executables/Validation/CMakeLists.txt         |  4 +-
 ...ation.cc => KTJSONTypeWriterValidation.cc} |  3 +-
 ...ation.hh => KTJSONTypeWriterValidation.hh} |  8 ++--
 Executables/Validation/KTTestData.cc          | 13 ++++++
 Executables/Validation/KTTestData.hh          |  7 +--
 .../Validation/KTTestDataPrimaryProcessor.cc  |  6 ++-
 .../Validation/TestJSONWriterViaSlot.cc       | 44 +++++++++++++++++--
 Library/IO/KTJSONWriter.cc                    | 18 +++++++-
 Library/IO/KTJSONWriter.hh                    |  7 ++-
 Library/Processor/KTSlot.hh                   |  2 +-
 10 files changed, 91 insertions(+), 21 deletions(-)
 rename Executables/Validation/{KTJSONWriterValidation.cc => KTJSONTypeWriterValidation.cc} (95%)
 rename Executables/Validation/{KTJSONWriterValidation.hh => KTJSONTypeWriterValidation.hh} (80%)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index d36d0fb..7f30232 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -14,7 +14,7 @@ if (Nymph_ENABLE_TESTING)
     # Headers for any test classes
     set (VALIDATION_HEADERFILES
         KTJSONReader.hh
-        KTJSONWriterValidation.hh
+        KTJSONTypeWriterValidation.hh
         KTTestConfigurable.hh
         KTTestCuts.hh
         KTTestData.hh
@@ -25,7 +25,7 @@ if (Nymph_ENABLE_TESTING)
     
     set (VALIDATION_SOURCEFILES
         KTJSONReader.cc
-        KTJSONWriterValidation.cc
+        KTJSONTypeWriterValidation.cc
         KTTestConfigurable.cc
         KTTestCuts.cc
         KTTestData.cc
diff --git a/Executables/Validation/KTJSONWriterValidation.cc b/Executables/Validation/KTJSONTypeWriterValidation.cc
similarity index 95%
rename from Executables/Validation/KTJSONWriterValidation.cc
rename to Executables/Validation/KTJSONTypeWriterValidation.cc
index 1cdc86d..3e9cc28 100644
--- a/Executables/Validation/KTJSONWriterValidation.cc
+++ b/Executables/Validation/KTJSONTypeWriterValidation.cc
@@ -5,8 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "KTJSONWriterValidation.hh"
-
+#include "KTJSONTypeWriterValidation.hh"
 #include "KTRegisterNymphValidationExtData.hh"
 
 namespace Nymph
diff --git a/Executables/Validation/KTJSONWriterValidation.hh b/Executables/Validation/KTJSONTypeWriterValidation.hh
similarity index 80%
rename from Executables/Validation/KTJSONWriterValidation.hh
rename to Executables/Validation/KTJSONTypeWriterValidation.hh
index 49ed6cc..80436e5 100644
--- a/Executables/Validation/KTJSONWriterValidation.hh
+++ b/Executables/Validation/KTJSONTypeWriterValidation.hh
@@ -1,12 +1,12 @@
 /*
- * KTJSONWriterValidation.hh
+ * KTJSONTypeWriterValidation.hh
  *
  *  Created on: Feb 17, 2018
  *      Author: N.S. Oblath
  */
 
-#ifndef NYMPH_KTJSONWRITERVALIDATION_HH_
-#define NYMPH_KTJSONWRITERVALIDATION_HH_
+#ifndef NYMPH_KTJSONTYPEWRITERVALIDATION_HH_
+#define NYMPH_KTJSONTYPEWRITERVALIDATION_HH_
 
 #include "KTJSONWriter.hh"
 
@@ -33,4 +33,4 @@ namespace Nymph
 
 } /* namespace Nymph */
 
-#endif /* NYMPH_KTJSONWRITERVALIDATION_HH_ */
+#endif /* NYMPH_KTJSONTYPEWRITERVALIDATION_HH_ */
diff --git a/Executables/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
index 72d3576..3bc6f32 100644
--- a/Executables/Validation/KTTestData.cc
+++ b/Executables/Validation/KTTestData.cc
@@ -21,5 +21,18 @@ namespace Nymph
         std::cout << "### KTTestData destructor" << std::endl;
     }
 
+    KTTestBaseData::KTTestBaseData() :
+        KTData(),
+        fFunniness(1000.)
+    {
+        std::cout << "### KTTestBaseData constructor" << std::endl;
+    }
+
+    KTTestBaseData::~KTTestBaseData()
+    {
+        std::cout << "### KTTestBaseData destructor" << std::endl;
+    }
+
+
 } /* namespace Nymph */
 
diff --git a/Executables/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
index a181bfb..c28bf55 100644
--- a/Executables/Validation/KTTestData.hh
+++ b/Executables/Validation/KTTestData.hh
@@ -36,11 +36,8 @@ namespace Nymph
     class KTTestBaseData : public KTData
     {
         public:
-            KTTestBaseData() :
-                KTData(),
-                fFunniness(1000.)
-            {}
-            virtual ~KTTestBaseData() {}
+            KTTestBaseData();
+            virtual ~KTTestBaseData();
 
             MEMBERVARIABLE(double, Funniness);
 
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Executables/Validation/KTTestDataPrimaryProcessor.cc
index ee0ed4e..218f495 100644
--- a/Executables/Validation/KTTestDataPrimaryProcessor.cc
+++ b/Executables/Validation/KTTestDataPrimaryProcessor.cc
@@ -38,8 +38,12 @@ namespace Nymph
 
     bool KTTestDataPrimaryProcessor::Run()
     {
+        unsigned funniness = 867;
+
         for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
         {
+            KTINFO( testlog, "Beginning iteration " << iIteration );
+
             // e.g. for a real processor, do some work here instead of sleeping
             boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
 
@@ -47,7 +51,7 @@ namespace Nymph
 
             KTDataHandle handle = CreateNewDataHandle();
             KTTestDerived1DataExt& testData = handle->Of< KTTestDerived1DataExt >();
-            testData.SetFunniness( 867 );
+            testData.SetFunniness( funniness++ );
             KTINFO( testlog, "Test derived1 data funniness: " << testData.GetFunniness() );
 
             fTheSignal( handle );
diff --git a/Executables/Validation/TestJSONWriterViaSlot.cc b/Executables/Validation/TestJSONWriterViaSlot.cc
index 66ced7e..d757587 100644
--- a/Executables/Validation/TestJSONWriterViaSlot.cc
+++ b/Executables/Validation/TestJSONWriterViaSlot.cc
@@ -5,9 +5,8 @@
  *      Author: N.S. Oblath
  */
 
+#include "KTJSONTypeWriterValidation.hh"
 #include "KTTestDataPrimaryProcessor.hh"
-#include "KTJSONWriterValidation.hh"
-
 #include "KTLogger.hh"
 
 using namespace Nymph;
@@ -19,10 +18,17 @@ int main()
 
     try
     {
+        KTPROG( testlog, "Testing single-data-object writing" );
+
         KTINFO( testlog, "Creating processors" );
         KTTestDataPrimaryProcessor tdpp;
         KTJSONWriter jw;
 
+        KTINFO( testlog, "Configuring processors" );
+        scarab::param_node jwConfig;
+        jwConfig.add( "filename", scarab::param_value( "test_jsonwriter_slot_singleobj.json" ) );
+        jw.Configure( jwConfig );
+
         KTINFO( testlog, "Connecting the-signal to first-slot" );
         tdpp.ConnectASlot( "test-derived-1", &jw, "test-derived-1", 20 );
 
@@ -34,7 +40,39 @@ int main()
             return -1;
         }
 
-        KTINFO( testlog, "Tests complete" );
+        KTINFO( testlog, "Test complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testlog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    try
+    {
+        KTPROG( testlog, "Testing extensible-data-object writing" );
+
+        KTINFO( testlog, "Creating processors" );
+        KTTestDataPrimaryProcessor tdpp;
+        KTJSONWriter jw;
+
+        KTINFO( testlog, "Configuring processors" );
+        scarab::param_node jwConfig;
+        jwConfig.add( "filename", scarab::param_value( "test_jsonwriter_slot_extdata.json" ) );
+        jw.Configure( jwConfig );
+
+        KTINFO( testlog, "Connecting the-signal to first-slot" );
+        tdpp.ConnectASlot( "test-derived-1", &jw, "ext-data", 20 );
+
+        KTINFO( testlog, "Running the primary processor" )
+
+        if( ! tdpp.Run() )
+        {
+            KTERROR( testlog, "Something went wrong while running the primary processor" );
+            return -1;
+        }
+
+        KTINFO( testlog, "Test complete" );
     }
     catch( boost::exception& e )
     {
diff --git a/Library/IO/KTJSONWriter.cc b/Library/IO/KTJSONWriter.cc
index 62f12f5..cb9754d 100644
--- a/Library/IO/KTJSONWriter.cc
+++ b/Library/IO/KTJSONWriter.cc
@@ -18,6 +18,7 @@ namespace Nymph
         fFilename( "json_writer_default_file.json" ),
         fStreamOutPtr( nullptr ),
         fArchiveOutPtr( nullptr ),
+        fExtDataSlot( "ext-data", this, &KTJSONWriter::WriteExtData ),
         fCoreDataSlot( "core", this, &KTJSONWriter::WriteData< KTCoreDataExt > )
         {
         }
@@ -31,9 +32,24 @@ namespace Nymph
 
     bool KTJSONWriter::Configure( const scarab::param_node& node )
     {
-        SetFilename( node.get_value( "file-name", fFilename ) );
+        SetFilename( node.get_value( "filename", fFilename ) );
 
         return true;
     }
 
+    void KTJSONWriter::WriteExtData( KTDataHandle handle )
+    {
+        if( fStreamOutPtr == nullptr )
+        {
+            fStreamOutPtr = new std::ofstream( fFilename );
+            fArchiveOutPtr = new cereal::JSONOutputArchive( *fStreamOutPtr );
+        }
+
+        // Write to JSON archive
+        KTDEBUG( avlog_hh, "Writing extensible data to JSON archive" );
+        (*fArchiveOutPtr)( handle );
+
+        return;
+    }
+
 }
diff --git a/Library/IO/KTJSONWriter.hh b/Library/IO/KTJSONWriter.hh
index 635ec3d..ce2766d 100644
--- a/Library/IO/KTJSONWriter.hh
+++ b/Library/IO/KTJSONWriter.hh
@@ -44,11 +44,15 @@ namespace Nymph
             template< class XDataType >
             void WriteData( const XDataType& data );
 
+            void WriteExtData( KTDataHandle handle );
+
         private:
             std::ofstream* fStreamOutPtr;
             cereal::JSONOutputArchive* fArchiveOutPtr;
 
         private:
+            KTSlot< KTDataHandle > fExtDataSlot;
+
             KTSlotData< void, KTCoreDataExt > fCoreDataSlot;
     };
 
@@ -62,10 +66,9 @@ namespace Nymph
         }
 
         // Write to JSON archive
-        KTINFO( avlog_hh, "Writing data to JSON archive" );
+        KTDEBUG( avlog_hh, "Writing data to JSON archive" );
         (*fArchiveOutPtr)( data );
 
-        KTINFO( avlog_hh, "Successfully wrote data to archive" );
         return;
     }
 
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 8058273..7f374a9 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -28,7 +28,7 @@ namespace Nymph
      @details
      Usage:
      To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
-     The function should have the signature ReturnType (Args).
+     The function should have the signature void (Args).
 
      In your Processor's header add a member variable of type KTSlot< ProcessorType, ReturnType, Args >.
      The variable may be private.

From e3128b29ad72b3ea3a2c306dea47d18f638d0406 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 15:07:49 -0800
Subject: [PATCH 115/521] Register KTJSONWriter as a processor and add
 documentation

---
 Library/IO/KTJSONWriter.cc |  4 +++-
 Library/IO/KTJSONWriter.hh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Library/IO/KTJSONWriter.cc b/Library/IO/KTJSONWriter.cc
index cb9754d..36add47 100644
--- a/Library/IO/KTJSONWriter.cc
+++ b/Library/IO/KTJSONWriter.cc
@@ -6,13 +6,15 @@
  *
 */
 
-#include "../../Library/IO/KTJSONWriter.hh"
+#include "KTJSONWriter.hh"
 
 #include "KTLogger.hh"
 
 
 namespace Nymph
 {
+    KT_REGISTER_PROCESSOR( KTJSONWriter, "json-writer" );
+
     KTJSONWriter::KTJSONWriter( const std::string& name ) :
         KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >( name ),
         fFilename( "json_writer_default_file.json" ),
diff --git a/Library/IO/KTJSONWriter.hh b/Library/IO/KTJSONWriter.hh
index ce2766d..b6ba7a8 100644
--- a/Library/IO/KTJSONWriter.hh
+++ b/Library/IO/KTJSONWriter.hh
@@ -30,6 +30,36 @@ namespace Nymph
 
     typedef KTDerivedTypeWriter< KTJSONWriter > KTJSONTypeWriter;
 
+    /*!
+     @class KTJSONWriter
+     @author N. S. Oblath
+
+     @brief Writes data to a JSON file
+
+     @details
+     Can write single data objects or full extensible data objects.
+
+     The Cereal serialization library is used for this writer.
+     Data objects must have a serial or save function to be successfully serialized.
+
+     The slots for this writer can be extended in other compilation units using the type-writer system.
+     As an example, see Executables/Validation/KTJSONTypeWriterValidation and KTRegisterNymphValidationExtData.
+
+     Data objects must be registered after the Cereal JSON archive is included, and before any serialization takes place.
+     As an example when extending the writer, see KTRegisterNymphValidationExtData.
+
+     Configuration name: "json-writer"
+
+     Available configuration options:
+     - "filename": string -- JSON filename to write to
+
+     Signals: N/A
+
+     Slots:
+     - "ext-data": void (KTDataHandle) -- write a full extensible data object
+     - "core" void (KTDataHandle) -- write a KTCoreData object; requires KTCoreData
+
+   */
     class KTJSONWriter : public KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >
     {
         public:

From fae8778f89b391748c18ffd287709761e2107afc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 15:34:54 -0800
Subject: [PATCH 116/521] Minor aesthetic changes

---
 Executables/Validation/TestPyTestClass.py  |  4 ++++
 Executables/Validation/TestPythonBasics.py |  5 +++++
 Library/NymphPybind.cc                     | 20 +++++++++++---------
 Library/Processor/KTProcessorPybind.hh     |  6 +++---
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Executables/Validation/TestPyTestClass.py b/Executables/Validation/TestPyTestClass.py
index 3520ef9..1db0264 100644
--- a/Executables/Validation/TestPyTestClass.py
+++ b/Executables/Validation/TestPyTestClass.py
@@ -1,3 +1,7 @@
+# TestPyTestClass.py
+#  Created on: Feb 1, 2018
+#      Author: C. Claessens
+#
 # Demonstrates access to KTPyTestClass
 
 import py_nymph_validation as nv
diff --git a/Executables/Validation/TestPythonBasics.py b/Executables/Validation/TestPythonBasics.py
index 0014f12..06cf75d 100644
--- a/Executables/Validation/TestPythonBasics.py
+++ b/Executables/Validation/TestPythonBasics.py
@@ -1,3 +1,8 @@
+# TestPythonBasics.py
+#  Created on: Jan 29, 2018
+#      Author: N.S. Oblath
+#
+# Verifies that we can import Nymph python modules and call wrapped functions.
 # Uses Nymph::PyTest::add(), which is defined in TestPythonBasics.cc
 
 import py_nymph_validation
diff --git a/Library/NymphPybind.cc b/Library/NymphPybind.cc
index e569bba..204ba88 100644
--- a/Library/NymphPybind.cc
+++ b/Library/NymphPybind.cc
@@ -2,12 +2,14 @@
  * NymphPybind.cc
  *
  *  Created on: Jan 27, 2018
- *      Author: obla999
+ *      Author: N.S. Oblath
  */
 
-#include "Application/KTProcessorToolboxPybind.hh"
-#include "Processor/KTProcessorPybind.hh"
+#include "KTProcessorToolboxPybind.hh"
+#include "KTProcessorPybind.hh"
+
 #include <memory>
+
 //#include "Utility/KTConfigurablePybind.hh"
 
 PYBIND11_MODULE( py_nymph, mod )
@@ -16,13 +18,13 @@ PYBIND11_MODULE( py_nymph, mod )
 	//Nymph::ExportKTProcessor( mod );
     Nymph::ExportKTProcessorToolbox( mod );
 
-    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor>>( mod, "KTProcessor" );
+    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor> >( mod, "KTProcessor" );
 
-    pybind11::class_<Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor, Nymph::KTProcessor, std::shared_ptr<Nymph::KTWrapProcessor>> wrap_processor(mod, "WrapProcessor", pybind11::dynamic_attr());
-            wrap_processor
-				.def(pybind11::init<>())
-				.def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
-				.def("Configure", &Nymph::KTWrapProcessor::Configure);
+    pybind11::class_< Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor, Nymph::KTProcessor, std::shared_ptr<Nymph::KTWrapProcessor> > wrap_processor(mod, "WrapProcessor", pybind11::dynamic_attr());
+    wrap_processor
+        .def(pybind11::init<>())
+        .def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
+        .def("Configure", &Nymph::KTWrapProcessor::Configure);
 
 }
 
diff --git a/Library/Processor/KTProcessorPybind.hh b/Library/Processor/KTProcessorPybind.hh
index e82faf2..41bed4c 100644
--- a/Library/Processor/KTProcessorPybind.hh
+++ b/Library/Processor/KTProcessorPybind.hh
@@ -2,7 +2,7 @@
  * KTProcessorPybind.hh
  *
  *  Created on: Jan 24, 2018
- *      Author: obla999
+ *      Author: N.S. Oblath
  */
 
 #ifndef NYMPH_KTPROCESSORPYBIND_HH_
@@ -72,7 +72,7 @@ namespace Nymph
 						KTWrapProcessor,      // Parent class
 						WrapFunction,          // Name of function in C++ (must match Python name)
 						input      // Argument(s)
-						);
+				);
 			}
 			bool Configure(const scarab::param_node& node) override {
 				PYBIND11_OVERLOAD(
@@ -80,7 +80,7 @@ namespace Nymph
 						KTWrapProcessor,      // Parent class
 						Configure,          // Name of function in C++ (must match Python name)
 						node      // Argument(s)
-						);
+				);
 			}
 	};
 

From 06903e3776c43535110ee0f95e7a9026b161fb4e Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 20 Feb 2018 15:55:10 -0800
Subject: [PATCH 117/521] Renamed a python script

---
 Executables/Validation/CMakeLists.txt                           | 2 +-
 .../Validation/{TestPythonBindings.py => TestParamBindings.py}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Executables/Validation/{TestPythonBindings.py => TestParamBindings.py} (100%)

diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index d445190..d3b7b41 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -98,10 +98,10 @@ if (Nymph_ENABLE_TESTING)
     
         # Python scripts
         set( VALIDATION_PY_SCRIPTS
+            TestParamBindings.py
             TestProcessorToolbox.py
             TestPyTestClass.py
             TestPythonBasics.py
-            TestPythonBindings.py
             TestWrapProcessor.py
         )
         
diff --git a/Executables/Validation/TestPythonBindings.py b/Executables/Validation/TestParamBindings.py
similarity index 100%
rename from Executables/Validation/TestPythonBindings.py
rename to Executables/Validation/TestParamBindings.py

From fea8d39ae7afec335e4f9e56403eb4acb1c1af82 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 21 Feb 2018 10:58:33 -0800
Subject: [PATCH 118/521] Some additional scarab::param_value bindings, and a
 successful test script

---
 Executables/Validation/TestParamBindings.py | 11 ++--
 Library/CMakeLists.txt                      |  2 +-
 Library/NymphPybind.cc                      |  4 +-
 Library/Utility/KTParamNodePybind.hh        | 53 ---------------
 Library/Utility/KTParamPybind.hh            | 72 +++++++++++++++++++++
 5 files changed, 82 insertions(+), 60 deletions(-)
 delete mode 100644 Library/Utility/KTParamNodePybind.hh
 create mode 100644 Library/Utility/KTParamPybind.hh

diff --git a/Executables/Validation/TestParamBindings.py b/Executables/Validation/TestParamBindings.py
index e6f2e4d..c906fb5 100644
--- a/Executables/Validation/TestParamBindings.py
+++ b/Executables/Validation/TestParamBindings.py
@@ -1,4 +1,4 @@
-# Demonstrates access to KTPyTestClass
+# Demonstrates access to param classes
 
 import py_nymph as nymph
 
@@ -15,14 +15,17 @@
 #     9. (self: py_nymph.ParamNodePybind, arg0: str, arg1: float) -> float
 #     10. (self: py_nymph.ParamNodePybind, arg0: str, arg1: str) -> str
 
-a_value = nymph.ParamValue(True)
-print("Get a bool set to True: ", a_value.get())
+int_value = nymph.param_value(5)
+print("Get value set to 5: ", int_value.as_int())
+
+string_value = nymph.param_value("Hello!")
+print("Get value set to \"Hello!\"", string_value.as_string())
 
 # print(pnp.get_value())
 
 
 
 
-a_node = nymph.ParamNode()
+#a_node = nymph.ParamNode()
 # Test the "get_value" function for all the different types: 
 # a_node.get_value("myKey")
\ No newline at end of file
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 44b2e33..11ee82f 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -95,9 +95,9 @@ set( NYMPH_PY_HEADERFILES
 # Python binding headers
 set( NYMPH_PYBINDING_HEADERFILES
     #${UTIL_DIR}/KTConfigurablePybind.hh
+    ${UTIL_DIR}/KTParamPybind.hh
     ${PROC_DIR}/KTProcessorPybind.hh
     ${PROC_DIR}/KTPyProcessor.hh
-    ${UTIL_DIR}/KTParamNodePybind.hh
 )
 
 # Python bindings
diff --git a/Library/NymphPybind.cc b/Library/NymphPybind.cc
index 8a9adb9..39ceb7c 100644
--- a/Library/NymphPybind.cc
+++ b/Library/NymphPybind.cc
@@ -5,7 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "KTParamNodePybind.hh"
+#include "KTParamPybind.hh"
 
 #include "KTProcessorToolboxPybind.hh"
 #include "KTProcessorPybind.hh"
@@ -19,7 +19,7 @@ PYBIND11_MODULE( py_nymph, mod )
     //Nymph::ExportKTConfigurable( mod );
 	//Nymph::ExportKTProcessor( mod );
     Nymph::ExportKTProcessorToolbox( mod );
-    Nymph::ExportParamNodePybind( mod );
+    Nymph::ExportParamPybind( mod );
 
     pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor> >( mod, "KTProcessor" );
 
diff --git a/Library/Utility/KTParamNodePybind.hh b/Library/Utility/KTParamNodePybind.hh
deleted file mode 100644
index ff6b284..0000000
--- a/Library/Utility/KTParamNodePybind.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * KTPyNymph.cc
- *
- *  Created on: Feb 1, 2018
- *      Author: N. Oblath, L. Gladstone
- */
-
-#include "param_node.hh"
-#include "pybind11/pybind11.h"
-
-namespace Nymph
-{
-
-    void ExportParamNodePybind( pybind11::module& mod )
-    {
-        pybind11::class_< scarab::param_value >(mod, "ParamValue")
-            .def(pybind11::init<bool>())
-            .def("get",(bool (scarab::param_value::*)() const) &scarab::param_value::get<bool>,"Get parameter value")
-            ;
-
-        pybind11::class_< scarab::param_node >(mod, "ParamNode")
-            .def(pybind11::init<>())
-            
-            .def("add",(bool (scarab::param_node::*)(const scarab::param_value&) const) &scarab::param_value::get<bool>,"Add a parameter value to a node")
-
-            // Get value of the parameter, when no default is set
-            .def("get_value", (bool (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<bool>, "Get parameter node value")
-            .def("get_value", (uint (scarab::param_node::*)(const std::string &) const) 
-                &scarab::param_node::get_value<uint>, "Get parameter node value")
-            .def("get_value", (int (scarab::param_node::*)(const std::string &) const) 
-                &scarab::param_node::get_value<int>, "Get parameter node value")
-            .def("get_value", (double (scarab::param_node::*)(const std::string &) const) 
-                &scarab::param_node::get_value<double>, "Get parameter node value")
-            .def("get_value", (std::string (scarab::param_node::*)(const std::string &) const) 
-                &scarab::param_node::get_value, "Get parameter node value")
-
-            // Get value of the parameter, bringing along the default value
-            .def("get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>, "Get parameter node value")
-            .def("get_value", (uint (scarab::param_node::*)(const std::string &, uint) const) 
-                &scarab::param_node::get_value<uint>, "Get parameter node value")
-            .def("get_value", (int (scarab::param_node::*)(const std::string &, int) const) 
-                &scarab::param_node::get_value<int>, "Get parameter node value")
-            .def("get_value", (double (scarab::param_node::*)(const std::string &, double) const) 
-                &scarab::param_node::get_value<double>, "Get parameter node value")
-            .def("get_value", (std::string (scarab::param_node::*)(const std::string &, const std::string & ) const) 
-                &scarab::param_node::get_value, "Get parameter node value")
-            ;
-
-
-
-    }
-    
-} /* namespace Nymph */
diff --git a/Library/Utility/KTParamPybind.hh b/Library/Utility/KTParamPybind.hh
new file mode 100644
index 0000000..b849585
--- /dev/null
+++ b/Library/Utility/KTParamPybind.hh
@@ -0,0 +1,72 @@
+/*
+ * KTPyNymph.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone
+ */
+
+#include "param.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportParamPybind( pybind11::module& mod )
+    {
+        pybind11::class_< scarab::param_value >( mod, "param_value" )
+            .def( pybind11::init< bool >() )
+            .def( pybind11::init< unsigned >() )
+            .def( pybind11::init< int >() )
+            .def( pybind11::init< double >() )
+            .def( pybind11::init< const std::string& >() )
+
+            .def( "as_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::as_bool, "Get parameter value as a bool" )
+            .def( "as_uint", (unsigned (scarab::param_value::*)() const) &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
+            .def( "as_int", (int (scarab::param_value::*)() const) &scarab::param_value::as_int, "Get parameter value as a signed integer" )
+            .def( "as_double", (double (scarab::param_value::*)() const) &scarab::param_value::as_double, "Get parameter value as a float" )
+            .def( "as_string", (std::string (scarab::param_value::*)() const) &scarab::param_value::as_string, "Get parameter value as a string" )
+
+            .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set, "Set a bool value" )
+            .def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set, "Set an unsigned integer value" )
+            .def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set, "Set a signed integer value" )
+            .def( "set", (void (scarab::param_value::*)(double)) &scarab::param_value::set, "Set an float value" )
+            .def( "set", (void (scarab::param_value::*)(const std::string&)) &scarab::param_value::set, "Set an string value" )
+            ;
+
+        pybind11::class_< scarab::param_node >( mod, "param_node" )
+            .def( pybind11::init<>() )
+            
+            .def( "add",(bool (scarab::param_node::*)(const scarab::param_value&) const) &scarab::param_value::get<bool>,
+                    "Add a parameter value to a node" )
+
+            // Get value of the parameter, when no default is set
+            .def( "get_value", (bool (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<bool>,
+                    "Get parameter node value as a bool" )
+            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value<uint>,
+                    "Get parameter node value as an unsigned integer" )
+            .def( "get_value", (int (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value<int>,
+                    "Get parameter node value as a signed integer" )
+            .def( "get_value", (double (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value<double>,
+                    "Get parameter node value as a float" )
+            .def( "get_value", (std::string (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value,
+                    "Get parameter node value as a string" )
+
+            // Get value of the parameter, bringing along the default value
+            .def( "get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
+                    "Get parameter node value as a bool" )
+            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string &, unsigned) const) &scarab::param_node::get_value<uint>,
+                    "Get parameter node value as an unsigned integer" )
+            .def( "get_value", (int (scarab::param_node::*)(const std::string &, int) const) &scarab::param_node::get_value<int>,
+                    "Get parameter node value as a signed integer" )
+            .def( "get_value", (double (scarab::param_node::*)(const std::string &, double) const) &scarab::param_node::get_value<double>,
+                    "Get parameter node value as a float" )
+            .def( "get_value", (std::string (scarab::param_node::*)(const std::string &, const std::string& ) const) &scarab::param_node::get_value,
+                    "Get parameter node value as a string" )
+            ;
+
+
+
+    }
+    
+} /* namespace Nymph */

From d31b4ca77b7154c2000065f432f64a2994db659b Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 21 Feb 2018 13:06:14 -0800
Subject: [PATCH 119/521] Progress on param_node bindings

---
 Executables/Validation/TestParamBindings.py | 14 +++++++--
 Library/Utility/KTParamPybind.hh            | 35 +++++++++++++--------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/Executables/Validation/TestParamBindings.py b/Executables/Validation/TestParamBindings.py
index c906fb5..a36fa1a 100644
--- a/Executables/Validation/TestParamBindings.py
+++ b/Executables/Validation/TestParamBindings.py
@@ -16,16 +16,24 @@
 #     10. (self: py_nymph.ParamNodePybind, arg0: str, arg1: str) -> str
 
 int_value = nymph.param_value(5)
-print("Get value set to 5: ", int_value.as_int())
+print("What type of value is stored? (bool, uint, int, double, string): ", int_value.is_bool(), int_value.is_uint(), int_value.is_int(), int_value.is_double(), int_value.is_string())
+print("Get value set to 5:", int_value.as_int())
 
 string_value = nymph.param_value("Hello!")
-print("Get value set to \"Hello!\"", string_value.as_string())
+print("What type of value is stored? (bool, uint, int, double, string): ", string_value.is_bool(), string_value.is_uint(), string_value.is_int(), string_value.is_double(), string_value.is_string())
+print("Get value set to \"Hello!\":", string_value.as_string())
 
 # print(pnp.get_value())
 
 
 
 
-#a_node = nymph.ParamNode()
+a_node = nymph.param_node()
+a_node.add("int-value", int_value)
+a_node.add("string-value", string_value)
+
+print("Int value from node:", a_node.get_value_int("int-value"))
+print("String value from node:", a_node.get_value_string("string-value"))
+
 # Test the "get_value" function for all the different types: 
 # a_node.get_value("myKey")
\ No newline at end of file
diff --git a/Library/Utility/KTParamPybind.hh b/Library/Utility/KTParamPybind.hh
index b849585..c75a79e 100644
--- a/Library/Utility/KTParamPybind.hh
+++ b/Library/Utility/KTParamPybind.hh
@@ -14,6 +14,9 @@ namespace Nymph
 
     void ExportParamPybind( pybind11::module& mod )
     {
+        // param
+
+        // param_value
         pybind11::class_< scarab::param_value >( mod, "param_value" )
             .def( pybind11::init< bool >() )
             .def( pybind11::init< unsigned >() )
@@ -21,6 +24,12 @@ namespace Nymph
             .def( pybind11::init< double >() )
             .def( pybind11::init< const std::string& >() )
 
+            .def( "is_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::is_bool, "Return whether the param_value stores a boolean value" )
+            .def( "is_uint", (bool (scarab::param_value::*)() const) &scarab::param_value::is_uint, "Return whether the param_value stores an unsigned integer value" )
+            .def( "is_int", (bool (scarab::param_value::*)() const) &scarab::param_value::is_int, "Return whether the param_value stores a signed integer value" )
+            .def( "is_double", (bool (scarab::param_value::*)() const) &scarab::param_value::is_double, "Return whether the param_value stores a double value" )
+            .def( "is_string", (bool (scarab::param_value::*)() const) &scarab::param_value::is_string, "Return whether the param_value stores a string value" )
+
             .def( "as_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::as_bool, "Get parameter value as a bool" )
             .def( "as_uint", (unsigned (scarab::param_value::*)() const) &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
             .def( "as_int", (int (scarab::param_value::*)() const) &scarab::param_value::as_int, "Get parameter value as a signed integer" )
@@ -34,39 +43,39 @@ namespace Nymph
             .def( "set", (void (scarab::param_value::*)(const std::string&)) &scarab::param_value::set, "Set an string value" )
             ;
 
+        // param_node
         pybind11::class_< scarab::param_node >( mod, "param_node" )
             .def( pybind11::init<>() )
             
-            .def( "add",(bool (scarab::param_node::*)(const scarab::param_value&) const) &scarab::param_value::get<bool>,
-                    "Add a parameter value to a node" )
+            .def( "add",(bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,
+                    "Add a param object to a node" )
 
             // Get value of the parameter, when no default is set
-            .def( "get_value", (bool (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<bool>,
+            .def( "get_value_bool", (bool (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<bool>,
                     "Get parameter node value as a bool" )
-            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value<uint>,
+            .def( "get_value_uint", (unsigned (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<uint>,
                     "Get parameter node value as an unsigned integer" )
-            .def( "get_value", (int (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value<int>,
+            .def( "get_value_int", (int (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<int>,
                     "Get parameter node value as a signed integer" )
-            .def( "get_value", (double (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value<double>,
+            .def( "get_value_double", (double (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<double>,
                     "Get parameter node value as a float" )
-            .def( "get_value", (std::string (scarab::param_node::*)(const std::string &) const) &scarab::param_node::get_value,
+            .def( "get_value_string", (std::string (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value,
                     "Get parameter node value as a string" )
 
             // Get value of the parameter, bringing along the default value
             .def( "get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
                     "Get parameter node value as a bool" )
-            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string &, unsigned) const) &scarab::param_node::get_value<uint>,
+            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string&, unsigned) const) &scarab::param_node::get_value<uint>,
                     "Get parameter node value as an unsigned integer" )
-            .def( "get_value", (int (scarab::param_node::*)(const std::string &, int) const) &scarab::param_node::get_value<int>,
+            .def( "get_value", (int (scarab::param_node::*)(const std::string&, int) const) &scarab::param_node::get_value<int>,
                     "Get parameter node value as a signed integer" )
-            .def( "get_value", (double (scarab::param_node::*)(const std::string &, double) const) &scarab::param_node::get_value<double>,
+            .def( "get_value", (double (scarab::param_node::*)(const std::string&, double) const) &scarab::param_node::get_value<double>,
                     "Get parameter node value as a float" )
-            .def( "get_value", (std::string (scarab::param_node::*)(const std::string &, const std::string& ) const) &scarab::param_node::get_value,
+            .def( "get_value", (std::string (scarab::param_node::*)(const std::string&, const std::string& ) const) &scarab::param_node::get_value,
                     "Get parameter node value as a string" )
             ;
 
-
-
+        // param_array
     }
     
 } /* namespace Nymph */

From fda41f46800c943c869fae9b94d3fa563940d209 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Jun 2018 12:42:05 -0700
Subject: [PATCH 120/521] Fixed as_string py binding and added initializer with
 const char*

---
 Library/Utility/KTParamPybind.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Utility/KTParamPybind.hh b/Library/Utility/KTParamPybind.hh
index c75a79e..a1d633a 100644
--- a/Library/Utility/KTParamPybind.hh
+++ b/Library/Utility/KTParamPybind.hh
@@ -23,6 +23,7 @@ namespace Nymph
             .def( pybind11::init< int >() )
             .def( pybind11::init< double >() )
             .def( pybind11::init< const std::string& >() )
+            .def( pybind11::init< const char* >() )
 
             .def( "is_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::is_bool, "Return whether the param_value stores a boolean value" )
             .def( "is_uint", (bool (scarab::param_value::*)() const) &scarab::param_value::is_uint, "Return whether the param_value stores an unsigned integer value" )
@@ -34,7 +35,7 @@ namespace Nymph
             .def( "as_uint", (unsigned (scarab::param_value::*)() const) &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
             .def( "as_int", (int (scarab::param_value::*)() const) &scarab::param_value::as_int, "Get parameter value as a signed integer" )
             .def( "as_double", (double (scarab::param_value::*)() const) &scarab::param_value::as_double, "Get parameter value as a float" )
-            .def( "as_string", (std::string (scarab::param_value::*)() const) &scarab::param_value::as_string, "Get parameter value as a string" )
+            .def( "as_string", (const std::string& (scarab::param_value::*)() const) &scarab::param_value::as_string, "Get parameter value as a string" )
 
             .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set, "Set a bool value" )
             .def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set, "Set an unsigned integer value" )

From e39fa1090ac46a85ff50730cce312d6428a5f08f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Jun 2018 13:09:24 -0700
Subject: [PATCH 121/521] Added binding of param and specification of
 inheritance of param_value and param_node from param

---
 Library/Utility/KTParamPybind.hh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Library/Utility/KTParamPybind.hh b/Library/Utility/KTParamPybind.hh
index a1d633a..915941b 100644
--- a/Library/Utility/KTParamPybind.hh
+++ b/Library/Utility/KTParamPybind.hh
@@ -15,9 +15,10 @@ namespace Nymph
     void ExportParamPybind( pybind11::module& mod )
     {
         // param
+        pybind11::class_< scarab::param >( mod, "param" );
 
         // param_value
-        pybind11::class_< scarab::param_value >( mod, "param_value" )
+        pybind11::class_< scarab::param_value, scarab::param >( mod, "param_value" )
             .def( pybind11::init< bool >() )
             .def( pybind11::init< unsigned >() )
             .def( pybind11::init< int >() )
@@ -45,7 +46,7 @@ namespace Nymph
             ;
 
         // param_node
-        pybind11::class_< scarab::param_node >( mod, "param_node" )
+        pybind11::class_< scarab::param_node, scarab::param >( mod, "param_node" )
             .def( pybind11::init<>() )
             
             .def( "add",(bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,

From 0bd645c83c3485d6fc069757e7bcd269aa71a79b Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Jun 2018 13:36:30 -0700
Subject: [PATCH 122/521] Added initial param_array binding and test
 functionality

---
 Executables/Validation/TestParamBindings.py | 22 ++++++++++---
 Library/Utility/KTParamPybind.hh            | 36 +++++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/Executables/Validation/TestParamBindings.py b/Executables/Validation/TestParamBindings.py
index a36fa1a..5608755 100644
--- a/Executables/Validation/TestParamBindings.py
+++ b/Executables/Validation/TestParamBindings.py
@@ -15,6 +15,8 @@
 #     9. (self: py_nymph.ParamNodePybind, arg0: str, arg1: float) -> float
 #     10. (self: py_nymph.ParamNodePybind, arg0: str, arg1: str) -> str
 
+
+# Value testing
 int_value = nymph.param_value(5)
 print("What type of value is stored? (bool, uint, int, double, string): ", int_value.is_bool(), int_value.is_uint(), int_value.is_int(), int_value.is_double(), int_value.is_string())
 print("Get value set to 5:", int_value.as_int())
@@ -23,11 +25,8 @@
 print("What type of value is stored? (bool, uint, int, double, string): ", string_value.is_bool(), string_value.is_uint(), string_value.is_int(), string_value.is_double(), string_value.is_string())
 print("Get value set to \"Hello!\":", string_value.as_string())
 
-# print(pnp.get_value())
-
-
-
 
+# Node testing
 a_node = nymph.param_node()
 a_node.add("int-value", int_value)
 a_node.add("string-value", string_value)
@@ -36,4 +35,17 @@
 print("String value from node:", a_node.get_value_string("string-value"))
 
 # Test the "get_value" function for all the different types: 
-# a_node.get_value("myKey")
\ No newline at end of file
+print("Get int value from the node as different types (bool, uint, int, double, string): ", a_node.get_value_bool("int-value"), a_node.get_value_uint("int-value"), a_node.get_value_int("int-value"), a_node.get_value_double("int-value"), a_node.get_value_string("int-value"))
+
+
+# Array testing
+an_array = nymph.param_array()
+an_array.resize(2)
+an_array.assign(0, int_value)
+an_array.assign(1, string_value)
+
+print("Int value from array:", an_array.get_value_int(0))
+print("String value from array:", an_array.get_value_string(1))
+
+# Test the "get_value" function for all the different types: 
+print("Get int value from the array as different types (bool, uint, int, double, string): ", an_array.get_value_bool(0), an_array.get_value_uint(0), an_array.get_value_int(0), an_array.get_value_double(0), an_array.get_value_string(0))
diff --git a/Library/Utility/KTParamPybind.hh b/Library/Utility/KTParamPybind.hh
index 915941b..e55db88 100644
--- a/Library/Utility/KTParamPybind.hh
+++ b/Library/Utility/KTParamPybind.hh
@@ -78,6 +78,42 @@ namespace Nymph
             ;
 
         // param_array
+        pybind11::class_< scarab::param_array, scarab::param >( mod, "param_array" )
+            .def( pybind11::init<>() )
+
+            .def( "size", (unsigned (scarab::param_array::*)() const) &scarab::param_array::size,
+                    "Returns the size of the array" )
+
+            .def( "resize", (void (scarab::param_array::*)(unsigned)) &scarab::param_array::resize,
+                    "Sets the size of the array; if smaller than the current size, the extra elements are deleted")
+
+            .def( "assign", (void (scarab::param_array::*)(unsigned, const scarab::param&)) &scarab::param_array::assign,
+                    "Add a param object to the specified index in a array" )
+
+            // Get value of the parameter, when no default is set
+            .def( "get_value_bool", (bool (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<bool>,
+                    "Get parameter array value as a bool" )
+            .def( "get_value_uint", (unsigned (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<uint>,
+                    "Get parameter array value as an unsigned integer" )
+            .def( "get_value_int", (int (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<int>,
+                    "Get parameter array value as a signed integer" )
+            .def( "get_value_double", (double (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<double>,
+                    "Get parameter array value as a float" )
+            .def( "get_value_string", (std::string (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value,
+                    "Get parameter array value as a string" )
+
+            // Get value of the parameter, bringing along the default value
+            .def( "get_value", (bool (scarab::param_array::*)(unsigned, bool) const) &scarab::param_array::get_value<bool>,
+                    "Get parameter array value as a bool" )
+            .def( "get_value", (unsigned (scarab::param_array::*)(unsigned, unsigned) const) &scarab::param_array::get_value<uint>,
+                    "Get parameter array value as an unsigned integer" )
+            .def( "get_value", (int (scarab::param_array::*)(unsigned, int) const) &scarab::param_array::get_value<int>,
+                    "Get parameter array value as a signed integer" )
+            .def( "get_value", (double (scarab::param_array::*)(unsigned, double) const) &scarab::param_array::get_value<double>,
+                    "Get parameter array value as a float" )
+            .def( "get_value", (std::string (scarab::param_array::*)(unsigned, const std::string& ) const) &scarab::param_array::get_value,
+                    "Get parameter array value as a string" )
+            ;
     }
     
 } /* namespace Nymph */

From 298c3725185c7aa830acb0c2aefc352d98dacba8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Jun 2018 13:49:30 -0700
Subject: [PATCH 123/521] Updated Scarab to new version of scarab2/develop

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index b3999e8..ada7716 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit b3999e86e72be1aeea6a84c5d464c3d4869211fd
+Subproject commit ada7716f64c9c33b9c1c07ebb1d4074462603f98

From 23cbf3ec6957bb6275a97887b23871628afc6e81 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 22 Feb 2019 21:13:14 -0800
Subject: [PATCH 124/521] Bumped Scarab to v2.4.3

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index ada7716..ae05d4c 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit ada7716f64c9c33b9c1c07ebb1d4074462603f98
+Subproject commit ae05d4c5c157c6cc569b1f3855a8b2599abbdd70

From f60ca6b9fa7989ab9a49e8540d4db8f298ea2f5a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 22 Feb 2019 21:26:54 -0800
Subject: [PATCH 125/521] Stripped boost python

---
 CMakeLists.txt                              | 18 +---
 Executables/Validation/CMakeLists.txt       |  4 +-
 Library/Application/KTProcessorToolboxPy.hh | 98 ---------------------
 Library/CMakeLists.txt                      | 15 +---
 Library/Data/KTDataPy.hh                    | 23 -----
 Library/NymphPy.cc                          | 14 ---
 Library/Processor/KTProcessorPy.hh          | 47 ----------
 7 files changed, 7 insertions(+), 212 deletions(-)
 delete mode 100644 Library/Application/KTProcessorToolboxPy.hh
 delete mode 100644 Library/Data/KTDataPy.hh
 delete mode 100644 Library/NymphPy.cc
 delete mode 100644 Library/Processor/KTProcessorPy.hh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d76b9bd..46e13d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,10 +32,7 @@ set_option( USE_CPP11 TRUE )
 option( Nymph_BUILD_NYMPH_EXE "Flag to build the Nymph executable; also requires Nymph_ENABLE_EXECUTABLES" ON )
 
 # Build python bindings (requires boost::python)
-option( Nymph_ENABLE_PYTHON "Build python bindings (NymphPy)" OFF )
-
-# Build python bindings via pybind11 (this should be renamed Nymph_ENABLE_PYTHON if we choose to go with pybind11 over boost::python)
-option( Nymph_ENABLE_PYBIND11 "Build python bindings via pybind11" OFF )
+option( Nymph_ENABLE_PYTHON "Build python bindings" OFF )
 
 # Add a "Standard" build type
 #set (CMAKE_BUILD_TYPE standard)
@@ -84,30 +81,21 @@ endif( PBUILDER_STANDALONE )
 
 # Boost (1.46 required for filesystem version 3)
 list (APPEND Boost_COMPONENTS chrono date_time filesystem program_options system thread)
-if (Nymph_ENABLE_PYTHON)
-    list(APPEND Boost_COMPONENTS python)
-endif (Nymph_ENABLE_PYTHON)
 find_package (Boost 1.46.0 REQUIRED COMPONENTS ${Boost_COMPONENTS})
 # make sure dynamic linking is assumed for all boost libraries
 add_definitions (-DBOOST_ALL_DYN_LINK)
 include_directories (${Boost_INCLUDE_DIRS})
 pbuilder_add_ext_libraries (${Boost_LIBRARIES})
 
-# python deps
-if (Nymph_ENABLE_PYTHON)
-    include (PythonPackage)
-    python_package_find_python( 2.7 )
-endif (Nymph_ENABLE_PYTHON)
-
 ##########
 # Pybind11
 ##########
 
-if( Nymph_ENABLE_PYBIND11 )
+if( Nymph_ENABLE_PYTHON )
     set( PYBIND11_INSTALL ON CACHE BOOL "Pybind11 option to install itself" FORCE )
     add_subdirectory( External/pybind11 )
     include_directories( External/pybind11/include )    
-endif( Nymph_ENABLE_PYBIND11 )
+endif( Nymph_ENABLE_PYTHON )
 
 ########
 # Cereal
diff --git a/Executables/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
index d3b7b41..22f0e06 100644
--- a/Executables/Validation/CMakeLists.txt
+++ b/Executables/Validation/CMakeLists.txt
@@ -82,7 +82,7 @@ if (Nymph_ENABLE_TESTING)
     pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
     
     
-    if( Nymph_ENABLE_PYBIND11 )
+    if( Nymph_ENABLE_PYTHON )
         # Python Interface
         
         # Python binding headers
@@ -112,6 +112,6 @@ if (Nymph_ENABLE_TESTING)
         
         install( FILES ${VALIDATION_PY_SCRIPTS} DESTINATION ${BIN_INSTALL_DIR} )
     
-    endif( Nymph_ENABLE_PYBIND11 )
+    endif( Nymph_ENABLE_PYTHON )
         
 endif (Nymph_ENABLE_TESTING) 
diff --git a/Library/Application/KTProcessorToolboxPy.hh b/Library/Application/KTProcessorToolboxPy.hh
deleted file mode 100644
index 16dc109..0000000
--- a/Library/Application/KTProcessorToolboxPy.hh
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- @file KTProcessorToolboxPy.hh
- @brief Contains KTProcessorToolbox python bindings
- @details Manages processors requested by the user at run time.
- @author: B. H. LaRoque 
- @date: April 20, 2017
- */
-
-#ifndef KTPROCESSORTOOLBOXPY_HH_
-#define KTPROCESSORTOOLBOXPY_HH_
-
-#include "KTProcessorToolbox.hh"
-#include "KTPythonMacros.hh"
-
-// Make connection overloads
-   /* need two macros to cover all signatures*/
-bool (Nymph::KTProcessorToolbox::*MakeConnection_2names)(const std::string&, const std::string&, int order) = &Nymph::KTProcessorToolbox::MakeConnection;
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(MakeConnection_2names_overloads, Nymph::KTProcessorToolbox::MakeConnection, 2, 3)
-bool (Nymph::KTProcessorToolbox::*MakeConnection_4names)(const std::string&, const std::string&, const std::string&, const std::string&, int order) = &Nymph::KTProcessorToolbox::MakeConnection;
-BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(MakeConnection_4names_overloads, Nymph::KTProcessorToolbox::MakeConnection, 4, 5)
-
-// Set and Remove breakpoint overloads
-bool (Nymph::KTProcessorToolbox::*SetBreakpoint_1arg)(const std::string&) = &Nymph::KTProcessorToolbox::SetBreakpoint;
-bool (Nymph::KTProcessorToolbox::*SetBreakpoint_2arg)(const std::string&, const std::string&) = &Nymph::KTProcessorToolbox::SetBreakpoint;
-bool (Nymph::KTProcessorToolbox::*RemoveBreakpoint_1arg)(const std::string&) = &Nymph::KTProcessorToolbox::RemoveBreakpoint;
-bool (Nymph::KTProcessorToolbox::*RemoveBreakpoint_2arg)(const std::string&, const std::string&) = &Nymph::KTProcessorToolbox::RemoveBreakpoint;
-//BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(SetBreakpoint_overloads, Nymph::KTProcessorToolbox::SetBreakpoint, 1, 2)
-//BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(RemoveBreakpoint_overloads, Nymph::KTProcessorToolbox::SetBreakpoint, 1, 2)
-
-// Run queue pushback overloads
-bool (Nymph::KTProcessorToolbox::*PushBackToRunQueue_string)(const std::string& name) = &Nymph::KTProcessorToolbox::PushBackToRunQueue;
-bool (Nymph::KTProcessorToolbox::*PushBackToRunQueue_init_list)(std::initializer_list< std::string >) = &Nymph::KTProcessorToolbox::PushBackToRunQueue;
-bool (Nymph::KTProcessorToolbox::*PushBackToRunQueue_vector)(std::vector< std::string >) = &Nymph::KTProcessorToolbox::PushBackToRunQueue;
-
-// Add Processor overloads
-bool (Nymph::KTProcessorToolbox::*AddProcessor_Ref)(const std::string&, Nymph::KTProcessor*) = &Nymph::KTProcessorToolbox::AddProcessor;
-bool (Nymph::KTProcessorToolbox::*AddProcessor_TypeStr)(const std::string&, const std::string&) = &Nymph::KTProcessorToolbox::AddProcessor;
-
-// Get Processor overloads
-Nymph::KTProcessor* (Nymph::KTProcessorToolbox::*GetProcessor_wrap)(const std::string&) = &Nymph::KTProcessorToolbox::GetProcessor;
-
-// Configure Processor overloads
-bool (Nymph::KTProcessorToolbox::*ConfigureProcessors_JsonStr)(const std::string&) = &Nymph::KTProcessorToolbox::ConfigureProcessors;
-
-void export_ProcessorToolbox()
-{
-    using namespace Nymph;
-    using namespace boost::python;
-    class_<KTProcessorToolbox, boost::noncopyable>("KTProcessorToolbox", init<std::string>())
-
-        // members related to configuration
-        .def("ConfigureProcessors", ConfigureProcessors_JsonStr, "Configure processors from a json dictionary. Top-level keys are processor names, values are dictionaries with their configurations")
-        PROPERTYMEMBER(KTProcessorToolbox, RunSingleThreaded)
-
-
-        // Processor access
-        .def("GetProcessor", GetProcessor_wrap, return_value_policy<reference_existing_object>(), "Get a pointer to a processor in the toolbox")
-        .def("AddProcessor", AddProcessor_Ref, "add a processor to the toolbox, toolbox takes ownership")
-        .def("AddProcessor", AddProcessor_TypeStr, "add a processor to the toolbox, toolbox takes ownership")
-        .def("RemoveProcessor", &KTProcessorToolbox::RemoveProcessor, "remove a processor from the toolbox")
-        /* TODO: Not 100% certain that the reference count for this processor is now correct, given the return_value_policy */
-        .def("ReleaseProcessor", &KTProcessorToolbox::ReleaseProcessor, return_value_policy<reference_existing_object>(), "Remove a processor from the toolbox and return it to the user, ownership is passed")
-        .def("ClearProcessors", &KTProcessorToolbox::ClearProcessors, "Remove all processors and clear run queue")
-
-        // Processor connections
-        .def("MakeConnection", MakeConnection_2names, MakeConnection_2names_overloads())
-        .def("MakeConnection", MakeConnection_4names, MakeConnection_4names_overloads())
-        /* TODO use macro for arg counts?*/
-        .def("SetBreakpoint", SetBreakpoint_1arg, "add breakpoint to 'procName:slotName'")
-        .def("SetBreakpoint", SetBreakpoint_2arg, "add breakpoint to 'procName, slotName'")
-        .def("RemoveBreakpoint", RemoveBreakpoint_1arg, "add breakpoint to 'procName:slotName'")
-        .def("RemoveBreakpoint", RemoveBreakpoint_2arg, "add breakpoint to 'procName, slotName'")
-
-        // Run Queue
-        // Push new processor(s) to back of run queue
-        .def("PushBackToRunQueue", PushBackToRunQueue_string, "Push processor(s) to the back of the run queue")
-        .def("PushBackToRunQueue", PushBackToRunQueue_init_list)
-        .def("PushBackToRunQueue", PushBackToRunQueue_vector)
-
-        // Remove items from run queue
-        .def("PopBackOfRunQueue", &KTProcessorToolbox::PopBackOfRunQueue, "Remove the last item in the run queue, whether it's a single processor or a group of processors")
-        .def("ClearRunQueue", &KTProcessorToolbox::ClearRunQueue, "Clear the run queue")
-
-        // Run methods
-        .def("Run", &KTProcessorToolbox::Run, "Call Run() on all processors in the run queue")
-        .def("AsyncRun", &KTProcessorToolbox::AsyncRun, "Non-blocking call to Run()")
-        .def("WaitForContinue", &KTProcessorToolbox::WaitForContinue)
-        .def("WaitForBreak", &KTProcessorToolbox::WaitForBreak, "blocking call that waits until a breakpoint is reached, you must manually Continue()")
-        .def("WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "blocking call to Continue() execution until end of run is reached, you must manually Continue()")
-        .def("Continue", &KTProcessorToolbox::Continue, "non-blocking call to resume execution")
-        .def("CancelThreads", &KTProcessorToolbox::CancelThreads, "kill any running thread at the next breakpoint check")
-        .def("JoinRunThread", &KTProcessorToolbox::JoinRunThread)
-
-        .def("GetData", &KTProcessorToolbox::GetData)
-        ;
-}
-
-#endif /* KTPROCESSORTOOLBOXPY_HH_ */
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 11ee82f..ba43a3d 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -86,12 +86,6 @@ set( NYMPH_SOURCEFILES
     ${APPL_DIR}/KTThroughputProfiler.cc
 )
 
-set( NYMPH_PY_HEADERFILES
-    ${DATA_DIR}/KTDataPy.hh
-    ${PROC_DIR}/KTProcessorPy.hh
-    ${APPL_DIR}/KTProcessorToolboxPy.hh
-)
-
 # Python binding headers
 set( NYMPH_PYBINDING_HEADERFILES
     #${UTIL_DIR}/KTConfigurablePybind.hh
@@ -111,11 +105,7 @@ set( NYMPH_PYBINDING_SOURCEFILES
 pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
 pbuilder_install_headers( ${NYMPH_HEADERFILES} )
 
-if (Nymph_ENABLE_PYTHON)
-    python_package_add_module(NymphPy.cc)
-endif (Nymph_ENABLE_PYTHON)
-
-if( Nymph_ENABLE_PYBIND11 )
+if( Nymph_ENABLE_PYTHON )
     set( LIB_DEPENDENCIES Nymph )
 
     configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
@@ -125,5 +115,4 @@ if( Nymph_ENABLE_PYBIND11 )
     target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
     pbuilder_install_libraries( py_nymph )
     pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
-
-endif( Nymph_ENABLE_PYBIND11 )
+endif( Nymph_ENABLE_PYTHON )
diff --git a/Library/Data/KTDataPy.hh b/Library/Data/KTDataPy.hh
deleted file mode 100644
index 2b853eb..0000000
--- a/Library/Data/KTDataPy.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * KTDataPy.hh
- *
- * Created on: April 10, 2017
- *     Author: laroque
- */
-
- #ifndef KTDATAPY_HH_
- #define KTDATAPY_HH_
-
-#include "KTCoreData.hh"
-
-void export_DataPy()
-{
-    using namespace Nymph;
-    using namespace boost::python;
-    class_<KTCoreData, KTDataHandle, boost::noncopyable>("KTCoreData", init<>())
-        .add_property("Counter", &KTCoreData::GetCounter, &KTCoreData::SetCounter)
-        .add_property("LastData", &KTCoreData::GetLastData, &KTCoreData::SetLastData)
-        ;
-}
-
-#endif /* KTDATAPY_HH_ */
diff --git a/Library/NymphPy.cc b/Library/NymphPy.cc
deleted file mode 100644
index 9fa346d..0000000
--- a/Library/NymphPy.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <boost/python.hpp>
-
-/* include components here*/
-#include "KTDataPy.hh"
-#include "KTProcessorPy.hh"
-#include "KTProcessorToolboxPy.hh"
-
-BOOST_PYTHON_MODULE(NymphPy)
-{
-    using namespace boost::python;
-    export_DataPy();
-    export_Processor();
-    export_ProcessorToolbox();
-}
diff --git a/Library/Processor/KTProcessorPy.hh b/Library/Processor/KTProcessorPy.hh
deleted file mode 100644
index f258310..0000000
--- a/Library/Processor/KTProcessorPy.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- @file KTProcessorPy.hh
- @brief Contains KTProcessor python wrapping
- @details KTProcessor is the processor base class
- @author: B. H. LaRoque
- @date: April 20, 2017
- */
-
-#ifndef KTPROCESSORPY_HH_
-#define KTPROCESSORPY_HH_
-
-#include "KTProcessor.hh"
-
-bool (Nymph::KTConfigurable::*Configure_JsonStr)(const std::string& config) = &Nymph::KTConfigurable::Configure;
-
-void export_Processor()
-{
-    using namespace Nymph;
-    using namespace boost::python;
-
-    // KTProcessor base class
-    class_<KTProcessor, boost::noncopyable>("KTProcessor", no_init)
-        //.def("RegisterProcessor", pure_virtual(&KTProcessor::RegisterProcessor), return_value_policy<manage_new_object>(), "register a processor")
-        
-        // PassThreadRefUpdate... needs KTThreadReference
-        //.def("PassThreadRefUpdate", &KTProcessor::PassThreadRefUpdate) 
-        .def("ConnectASlot", &KTProcessor::ConnectASlot)
-        .def("ConnectASignal", &KTProcessor::ConnectASignal)
-
-        // these next four need wrappers for return types (KT[Signal,Slot]Wrapper)
-        //.def("RegisterSignal", &KTProcessor::RegisterSignal)
-        //.def("RegisterSlot", &KTProcessor::RegisterSlot)
-        //.def("GetSignal", &KTProcessor::GetSignal)
-        //.def("GetSlot", &KTProcessor::GetSlot)
-
-        /* now protected */
-        //.def("ConnectSignalToSlot", &KTProcessor::ConnectSignalToSlot)
-
-        .def("GetDoBreakpoint", &KTProcessor::GetDoBreakpoint)
-        .def("SetDoBreakpoint", &KTProcessor::SetDoBreakpoint)
-
-        /* Inherited methods from unwrapped bases */
-        .def("Configure", Configure_JsonStr, "Configure from json encoded configuration")
-        ;
-}
-
-#endif /* KTPROCESSORPY_HH_ */

From 2e4e59dd19f89ed8f71c854aa4bbc99d3bad21dc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 22 Feb 2019 22:55:33 -0800
Subject: [PATCH 126/521] Adaptations to updated scarab

---
 Executables/Validation/TestApplication.cc   |  2 +-
 Library/Application/KTApplication.cc        |  8 ++-
 Library/Application/KTCommandLineHandler.cc |  2 +-
 Library/Application/KTConfigurator.hh       |  8 +--
 Library/Application/KTProcessorToolbox.cc   | 48 +++++++++---------
 Library/Application/KTRunNymph.cc           |  4 +-
 Library/Data/KTCutFilter.cc                 |  4 +-
 Library/Utility/KTConfigurable.cc           |  4 +-
 Library/Utility/KTMemberVariable.hh         | 56 +++++++++++----------
 9 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/Executables/Validation/TestApplication.cc b/Executables/Validation/TestApplication.cc
index 37d4539..059848c 100644
--- a/Executables/Validation/TestApplication.cc
+++ b/Executables/Validation/TestApplication.cc
@@ -84,7 +84,7 @@ int main(int argc, char** argv)
 
     const scarab::param_node& topNode = app->GetConfigurator()->Config();
 
-    if (testObj->Configure(topNode.node_at(testObj->GetConfigName())))
+    if (testObj->Configure(topNode[testObj->GetConfigName()].as_node()))
     {
         KTINFO(testapplog, "Configuration complete:\n"
                 << "\tInt data: " << testObj->GetIntData() << '\n'
diff --git a/Library/Application/KTApplication.cc b/Library/Application/KTApplication.cc
index 2ff51e2..4349856 100644
--- a/Library/Application/KTApplication.cc
+++ b/Library/Application/KTApplication.cc
@@ -67,7 +67,7 @@ namespace Nymph
         {
             scarab::path configFilePath = scarab::expand_path( fConfigFilename );
             scarab::param_translator translator;
-            scarab::param* configFromFile = translator.read_file( configFilePath.native() );
+            scarab::param_ptr_t configFromFile = translator.read_file( configFilePath.native() );
             if( configFromFile == NULL )
             {
                 BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] error parsing config file" << eom );
@@ -77,20 +77,18 @@ namespace Nymph
                 BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] configuration file must consist of an object/node" << eom );
             }
             fConfigurator->Merge( configFromFile->as_node() );
-            delete configFromFile;
         }
 
         // Command-line JSON configuration
         if (! clJSON.empty())
         {
             scarab::param_input_json inputJSON;
-            scarab::param* configFromJSON = inputJSON.read_string( clJSON );
+            scarab::param_ptr_t configFromJSON = inputJSON.read_string( clJSON );
             if( ! configFromJSON->is_node() )
             {
                 BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] command line json must be an object" << eom );
             }
             fConfigurator->Merge( configFromJSON->as_node() );
-            delete configFromJSON;
         }
 
         // Command-line overrides
@@ -141,7 +139,7 @@ namespace Nymph
     		unsigned arraySize = paramArray.size();
     		for (unsigned iParam = 0; iParam < arraySize; ++iParam)
     		{
-    			AddConfigOptionsToCLHandler(paramArray.at(iParam), nextRootName + std::to_string(iParam));
+    			AddConfigOptionsToCLHandler(paramArray[iParam], nextRootName + std::to_string(iParam));
     		}
     	}
     	else if (param.is_node())
diff --git a/Library/Application/KTCommandLineHandler.cc b/Library/Application/KTCommandLineHandler.cc
index 3e72779..e50164f 100644
--- a/Library/Application/KTCommandLineHandler.cc
+++ b/Library/Application/KTCommandLineHandler.cc
@@ -275,7 +275,7 @@ namespace Nymph
                     string nodeName(t_full_name.substr(t_node_start_pos, t_node_sep_pos));
                     if (parentNode.has(nodeName))
                     {
-                        parentNode = parentNode.node_at(nodeName);
+                        parentNode = parentNode[nodeName]().as_node();
                     }
                     else
                     {
diff --git a/Library/Application/KTConfigurator.hh b/Library/Application/KTConfigurator.hh
index bbdcc49..a25fcdc 100644
--- a/Library/Application/KTConfigurator.hh
+++ b/Library/Application/KTConfigurator.hh
@@ -52,10 +52,10 @@ namespace Nymph
     {
         try
         {
-            fParamBuffer = &const_cast< scarab::param& >( fMasterConfig->at( aName ) );
+            fParamBuffer = &const_cast< scarab::param& >( (*fMasterConfig)[aName] );
             if( fParamBuffer->is_value() )
             {
-                return fParamBuffer->as_value().get< XReturnType >();
+                return (*fParamBuffer)().as< XReturnType >();
             }
         }
         catch( std::exception& e )
@@ -68,10 +68,10 @@ namespace Nymph
     {
         try
         {
-            fParamBuffer = &const_cast< scarab::param& >( fMasterConfig->at( aName ) );
+            fParamBuffer = &const_cast< scarab::param& >( (*fMasterConfig)[aName] );
             if( fParamBuffer->is_value() )
             {
-                return fParamBuffer->as_value().get< XReturnType >();
+                return (*fParamBuffer)().as< XReturnType >();
             }
         }
         catch( std::exception& e )
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library/Application/KTProcessorToolbox.cc
index f1589a3..d483f1d 100644
--- a/Library/Application/KTProcessorToolbox.cc
+++ b/Library/Application/KTProcessorToolbox.cc
@@ -64,7 +64,7 @@ namespace Nymph
         }
         else
         {
-            const scarab::param_array& procArray = node.array_at( "processors" );
+            const scarab::param_array& procArray = node["processors"].as_array();
             for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
             {
                 if( ! procIt->is_node() )
@@ -72,24 +72,24 @@ namespace Nymph
                     KTERROR( proclog, "Invalid processor entry: not a node" );
                     return false;
                 }
-                const scarab::param_node* procNode = &( procIt->as_node() );
+                const scarab::param_node& procNode = procIt->as_node();
 
-                if (! procNode->has("type"))
+                if (! procNode.has("type"))
                 {
                     KTERROR(proclog, "Unable to create processor: no processor type given");
                     return false;
                 }
-                string procType = procNode->get_value("type");
+                string procType = procNode["type"]().as_string();
 
                 string procName;
-                if (! procNode->has("name"))
+                if (! procNode.has("name"))
                 {
                     KTINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
                     procName = procType;
                 }
                 else
                 {
-                    procName = procNode->get_value("name");
+                    procName = procNode["name"]().as_string();
                 }
                 std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
                 if (newProc == NULL)
@@ -115,7 +115,7 @@ namespace Nymph
         }
         else
         {
-            const scarab::param_array& connArray = node.array_at( "connections" );
+            const scarab::param_array& connArray = node["connections"].as_array();
             for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
             {
                 if( ! connIt->is_node() )
@@ -123,23 +123,23 @@ namespace Nymph
                     KTERROR( proclog, "Invalid connection entry: not a node" );
                     return false;
                 }
-                const scarab::param_node* connNode = &( connIt->as_node() );
+                const scarab::param_node& connNode = connIt->as_node();
 
-                if ( ! connNode->has("signal") || ! connNode->has("slot") )
+                if ( ! connNode.has("signal") || ! connNode.has("slot") )
                 {
                     KTERROR(proclog, "Signal/Slot connection information is incomplete!");
-                    if (connNode->has("signal"))
+                    if (connNode.has("signal"))
                     {
-                        KTWARN(proclog, "signal = " << connNode->get_value("signal"));
+                        KTWARN(proclog, "signal = " << connNode["signal"]());
                     }
                     else
                     {
                         KTERROR(proclog, "signal = MISSING");
                     }
 
-                    if (connNode->has("slot"))
+                    if (connNode.has("slot"))
                     {
-                        KTWARN(proclog, "slot = " << connNode->get_value("slot"));
+                        KTWARN(proclog, "slot = " << connNode["slot"]());
                     }
                     else
                     {
@@ -149,30 +149,30 @@ namespace Nymph
                 }
 
                 bool connReturn = false;
-                if (connNode->has("order"))
+                if (connNode.has("order"))
                 {
-                    connReturn = MakeConnection(connNode->get_value("signal"), connNode->get_value("slot"), connNode->get_value< int >("order"));
+                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int());
                 }
                 else
                 {
-                    connReturn = MakeConnection(connNode->get_value("signal"), connNode->get_value("slot"));
+                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string());
                 }
                 if (! connReturn)
                 {
-                    KTERROR(proclog, "Unable to make connection <" << connNode->get_value("signal") << "> --> <" << connNode->get_value("slot") << ">");
+                    KTERROR(proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">");
                     return false;
                 }
 
-                if (connNode->has("breakpoint"))
+                if (connNode.has("breakpoint"))
                 {
-                    if (! SetBreakpoint(connNode->get_value("slot")))
+                    if (! SetBreakpoint(connNode["slot"]().as_string()))
                     {
-                        KTERROR(proclog, "Unable to set breakpoint on <" << connNode->get_value("slot"));
+                        KTERROR(proclog, "Unable to set breakpoint on <" << connNode["slot"]());
                         return false;
                     }
                 }
 
-                KTINFO(proclog, "Signal <" << connNode->get_value("signal") << "> connected to slot <" << connNode->get_value("slot") << ">");
+                KTINFO(proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">");
             }
         }
 
@@ -187,7 +187,7 @@ namespace Nymph
         }
         else
         {
-            const scarab::param_array& rqArray = node.array_at( "run-queue" );
+            const scarab::param_array& rqArray = node["run-queue"].as_array();
             for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
             {
                 if (rqIt->is_value())
@@ -247,7 +247,7 @@ namespace Nymph
                     continue;
                 }
             }
-            const scarab::param_node& subNode = node.node_at(nameUsed);
+            const scarab::param_node& subNode = node[nameUsed].as_node();
             if (! iter->second.fProc->Configure(subNode))
             {
                 KTERROR(proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">");
@@ -262,7 +262,7 @@ namespace Nymph
         scarab::param_translator translator;
         scarab::param_node optNode;
         optNode.add( "encoding", new scarab::param_value( "json" ) );
-        return ConfigureProcessors( translator.read_string( config, &optNode )->as_node() );
+        return ConfigureProcessors( translator.read_string( config, optNode )->as_node() );
     }
 
     std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName)
diff --git a/Library/Application/KTRunNymph.cc b/Library/Application/KTRunNymph.cc
index 26594c4..fd33f28 100644
--- a/Library/Application/KTRunNymph.cc
+++ b/Library/Application/KTRunNymph.cc
@@ -23,7 +23,7 @@ namespace Nymph
         {
             const scarab::param_node& parentConfigNode = app->GetConfigurator()->Config();
 
-            if( ! app->Configure(parentConfigNode.node_at(app->GetConfigName() ) ) )
+            if( ! app->Configure( parentConfigNode[app->GetConfigName()].as_node() ) )
             {
                 KTERROR( nlog, "Unable to configure the application. Aborting.");
                 return -2;
@@ -33,7 +33,7 @@ namespace Nymph
             // This will create all of the requested processors, connect their signals and slots, and fill the run queue.
             KTProcessorToolbox procTB;
 
-            if ( ! procTB.Configure( parentConfigNode.node_at( procTB.GetConfigName() ) ) )
+            if ( ! procTB.Configure( parentConfigNode[procTB.GetConfigName()].as_node() ) )
             {
                 KTERROR( nlog, "Unable to configure processor toolbox. Aborting." );
                 return -3;
diff --git a/Library/Data/KTCutFilter.cc b/Library/Data/KTCutFilter.cc
index 7be973e..05d1906 100644
--- a/Library/Data/KTCutFilter.cc
+++ b/Library/Data/KTCutFilter.cc
@@ -40,11 +40,11 @@ namespace Nymph
         // Config-file settings
         if (node.has("cut-mask-int"))
         {
-            SetCutMask(node.get_value< unsigned long long >("cut-mask-int"));
+            SetCutMask(node["cut-mask-int"]().as_uint());
         }
         if (node.has("cut-mask"))
         {
-            SetCutMask(KTCutStatus::bitset_type(node.get_value("cut-mask")));
+            SetCutMask(KTCutStatus::bitset_type(node["cut-mask"]().as_string()));
         }
         if (node.get_value("cut-mask-all", false))
         {
diff --git a/Library/Utility/KTConfigurable.cc b/Library/Utility/KTConfigurable.cc
index b79d9fd..d5f2cdb 100644
--- a/Library/Utility/KTConfigurable.cc
+++ b/Library/Utility/KTConfigurable.cc
@@ -38,8 +38,8 @@ namespace Nymph
     {
         scarab::param_translator translator;
         scarab::param_node optNode;
-        optNode.add( "encoding", new scarab::param_value( "json" ) );
-        return Configure( translator.read_string( config, &optNode )->as_node() );;
+        optNode.add( "encoding", "json" );
+        return Configure( translator.read_string( config, optNode )->as_node() );;
     }
 
 
diff --git a/Library/Utility/KTMemberVariable.hh b/Library/Utility/KTMemberVariable.hh
index d867381..f9bdec1 100644
--- a/Library/Utility/KTMemberVariable.hh
+++ b/Library/Utility/KTMemberVariable.hh
@@ -60,37 +60,39 @@
 #define var_prefix f
 #define static_prefix s
 
-#include "_member_variables.hh"
+#include "_camel_case_member_variables.hh"
 
-#define MEMBERVARIABLE                         mv_accessible
-#define MEMBERVARIABLE_NOSET                   mv_accessible_noset
-#define MEMBERVARIABLE_STATIC                  mv_accessible_static
-#define MEMBERVARIABLE_STATIC_NOSET            mv_accessible_static_noset
-#define MEMBERVARIABLE_MUTABLE                 mv_accessible_mutable
-#define MEMBERVARIABLE_MUTABLE_NOSET           mv_accessible_mutable_noset
+#define MEMBERVARIABLE                         camel_case_mv_accessible
+#define MEMBERVARIABLE_NOSET                   camel_case_mv_accessible_noset
+#define MEMBERVARIABLE_STATIC                  camel_case_mv_accessible_static
+#define MEMBERVARIABLE_STATIC_NOSET            camel_case_mv_accessible_static_noset
+#define MEMBERVARIABLE_MUTABLE                 camel_case_mv_accessible_mutable
+#define MEMBERVARIABLE_MUTABLE_NOSET           camel_case_mv_accessible_mutable_noset
 
-#define MEMBERVARIABLE_REF                     mv_referrable
-#define MEMBERVARIABLE_REF_CONST               mv_referrable_const
-#define MEMBERVARIABLE_REF_STATIC              mv_referrable_static
-#define MEMBERVARIABLE_REF_MUTABLE             mv_referrable_mutable
+#define MEMBERVARIABLE_REF                     camel_case_mv_referrable
+#define MEMBERVARIABLE_REF_CONST               camel_case_mv_referrable_const
+#define MEMBERVARIABLE_REF_STATIC              camel_case_mv_referrable_static
+#define MEMBERVARIABLE_REF_MUTABLE             camel_case_mv_referrable_mutable
+#define MEMBERVARIABLE_REF_MUTABLE_CONST       camel_case_mv_referrable_mutable
 
-#define MEMBERVARIABLE_PTR                     mv_assignable
-#define MEMBERVARIABLE_PTR_NOSET               mv_assignable_noset
-#define MEMBERVARIABLE_PTR_STATIC              mv_assignable_static
-#define MEMBERVARIABLE_PTR_STATIC_NOSET        mv_assignable_static_noset
-#define MEMBERVARIABLE_PTR_MUTABLE             mv_assignable_mutable
-#define MEMBERVARIABLE_PTR_MUTABLE_NOSET       mv_assignable_mutable_noset
+#define MEMBERVARIABLE_PTR                     camel_case_mv_assignable
+#define MEMBERVARIABLE_PTR_NOSET               camel_case_mv_assignable_noset
+#define MEMBERVARIABLE_PTR_STATIC              camel_case_mv_assignable_static
+#define MEMBERVARIABLE_PTR_STATIC_NOSET        camel_case_mv_assignable_static_noset
+#define MEMBERVARIABLE_PTR_MUTABLE             camel_case_mv_assignable_mutable
+#define MEMBERVARIABLE_PTR_MUTABLE_NOSET       camel_case_mv_assignable_mutable_noset
 
-#define MEMBERVARIABLE_SHARED_PTR              mv_shared_ptr
-#define MEMBERVARIABLE_SHARED_PTR_CONST        mv_shared_ptr_const
-#define MEMBERVARIABLE_SHARED_PTR_STATIC       mv_shared_ptr_static
-#define MEMBERVARIABLE_SHARED_PTR_MUTABLE      mv_shared_ptr_mutable
+#define MEMBERVARIABLE_SHARED_PTR              camel_case_mv_shared_ptr
+#define MEMBERVARIABLE_SHARED_PTR_CONST        camel_case_mv_shared_ptr_const
+#define MEMBERVARIABLE_SHARED_PTR_STATIC       camel_case_mv_shared_ptr_static
+#define MEMBERVARIABLE_SHARED_PTR_MUTABLE      camel_case_mv_shared_ptr_mutable
+#define MEMBERVARIABLE_SHARED_PTR_MUTABLE_CONST camel_case_mv_shared_ptr_mutable
 
-#define MEMBERVARIABLE_ATOMIC                  mv_atomic
-#define MEMBERVARIABLE_ATOMIC_NOSET            mv_atomic_noset
-#define MEMBERVARIABLE_ATOMIC_STATIC           mv_atomic_static
-#define MEMBERVARIABLE_ATOMIC_STATIC_NOSET     mv_atomic_static_noset
-#define MEMBERVARIABLE_ATOMIC_MUTABLE          mv_atomic_mutable
-#define MEMBERVARIABLE_ATOMIC_MUTABLE_NOSET    mv_atomic_mutable_noset
+#define MEMBERVARIABLE_ATOMIC                  camel_case_mv_atomic
+#define MEMBERVARIABLE_ATOMIC_NOSET            camel_case_mv_atomic_noset
+#define MEMBERVARIABLE_ATOMIC_STATIC           camel_case_mv_atomic_static
+#define MEMBERVARIABLE_ATOMIC_STATIC_NOSET     camel_case_mv_atomic_static_noset
+#define MEMBERVARIABLE_ATOMIC_MUTABLE          camel_case_mv_atomic_mutable
+#define MEMBERVARIABLE_ATOMIC_MUTABLE_NOSET    camel_case_mv_atomic_mutable_noset
 
 #endif /* KTMEMBERVARIABLE_HH_ */

From d7691238f84fed21cb8a775a8f765f11c45a23af Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 23 Feb 2019 23:16:40 -0800
Subject: [PATCH 127/521] Adapted KTParamPybind.hh to changes in param*

---
 Library/Utility/KTParamPybind.hh | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/Library/Utility/KTParamPybind.hh b/Library/Utility/KTParamPybind.hh
index e55db88..dbbf917 100644
--- a/Library/Utility/KTParamPybind.hh
+++ b/Library/Utility/KTParamPybind.hh
@@ -39,10 +39,10 @@ namespace Nymph
             .def( "as_string", (const std::string& (scarab::param_value::*)() const) &scarab::param_value::as_string, "Get parameter value as a string" )
 
             .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set, "Set a bool value" )
-            .def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set, "Set an unsigned integer value" )
-            .def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set, "Set a signed integer value" )
+            .def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set<uint64_t>, "Set an unsigned integer value" )
+            .def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set<int64_t>, "Set a signed integer value" )
             .def( "set", (void (scarab::param_value::*)(double)) &scarab::param_value::set, "Set an float value" )
-            .def( "set", (void (scarab::param_value::*)(const std::string&)) &scarab::param_value::set, "Set an string value" )
+            .def( "set", (void (scarab::param_value::*)(std::string)) &scarab::param_value::set, "Set an string value" )
             ;
 
         // param_node
@@ -52,17 +52,8 @@ namespace Nymph
             .def( "add",(bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,
                     "Add a param object to a node" )
 
-            // Get value of the parameter, when no default is set
-            .def( "get_value_bool", (bool (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<bool>,
-                    "Get parameter node value as a bool" )
-            .def( "get_value_uint", (unsigned (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<uint>,
-                    "Get parameter node value as an unsigned integer" )
-            .def( "get_value_int", (int (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<int>,
-                    "Get parameter node value as a signed integer" )
-            .def( "get_value_double", (double (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value<double>,
-                    "Get parameter node value as a float" )
-            .def( "get_value_string", (std::string (scarab::param_node::*)(const std::string&) const) &scarab::param_node::get_value,
-                    "Get parameter node value as a string" )
+            .def( "at", (scarab::param& (scarab::param_node::*)(const std::string&)) &scarab::param_node::operator[],
+                    "Get the param object for a given key" )
 
             // Get value of the parameter, bringing along the default value
             .def( "get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
@@ -90,17 +81,8 @@ namespace Nymph
             .def( "assign", (void (scarab::param_array::*)(unsigned, const scarab::param&)) &scarab::param_array::assign,
                     "Add a param object to the specified index in a array" )
 
-            // Get value of the parameter, when no default is set
-            .def( "get_value_bool", (bool (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<bool>,
-                    "Get parameter array value as a bool" )
-            .def( "get_value_uint", (unsigned (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<uint>,
-                    "Get parameter array value as an unsigned integer" )
-            .def( "get_value_int", (int (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<int>,
-                    "Get parameter array value as a signed integer" )
-            .def( "get_value_double", (double (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value<double>,
-                    "Get parameter array value as a float" )
-            .def( "get_value_string", (std::string (scarab::param_array::*)(unsigned) const) &scarab::param_array::get_value,
-                    "Get parameter array value as a string" )
+            .def( "at", (scarab::param& (scarab::param_array::*)(unsigned)) &scarab::param_array::operator[],
+                    "Get the param object for a given index" )
 
             // Get value of the parameter, bringing along the default value
             .def( "get_value", (bool (scarab::param_array::*)(unsigned, bool) const) &scarab::param_array::get_value<bool>,

From eae5b0a06f9ed5d10f0e9b7d0712b383d6c371c2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Feb 2019 13:04:05 -0800
Subject: [PATCH 128/521] Interim commit

---
 Library/Processor/KTNymphSignals.hh   |  46 +++
 Library/Processor/KTNymphSlot.hh      | 381 +++++++++++++++++++++
 Library/Processor/KTSignal.hh         | 144 ++++++--
 Library/Processor/KTSignalSlotBase.hh |  52 +++
 Library/Processor/KTSlot.hh           | 457 ++++++--------------------
 5 files changed, 702 insertions(+), 378 deletions(-)
 create mode 100644 Library/Processor/KTNymphSignals.hh
 create mode 100644 Library/Processor/KTNymphSlot.hh
 create mode 100644 Library/Processor/KTSignalSlotBase.hh

diff --git a/Library/Processor/KTNymphSignals.hh b/Library/Processor/KTNymphSignals.hh
new file mode 100644
index 0000000..aa52aba
--- /dev/null
+++ b/Library/Processor/KTNymphSignals.hh
@@ -0,0 +1,46 @@
+/*
+ * KTNymphSignals.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTNYMPHSIGNALS_HH_
+#define NYMPH_KTNYMPHSIGNALS_HH_
+
+#include "KTSignal.hh"
+
+#include "KTCoreData.hh"
+
+namespace Nymph
+{
+    /// Convenience typedef for done signals
+    typedef KTSignal<> KTSignalDone;
+
+    // Convenience typedef for backwards compatibility
+    template< typename XDataType >
+    using KTSignalOneArg = KTSignal< XDataType >;
+
+    /*!
+     @class KTSignalData
+     @author N. S. Oblath
+
+     @brief Creates a signal that takes a KTDataHandle object as its argument.
+
+     @details
+     The purpose of the signal is for passing KTCoreData pointers between Processors.
+     The signal is emitted by calling operator().
+     If a KTDataSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+
+     Usage:
+     In your Processor's header add a member variable of type KTSignalData.
+
+     Initialize the signal with the processor's 'this' pointer and the name of the signal.
+
+     That's it!
+    */
+    typedef KTSignal< KTDataHandle > KTSignalData;
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTNYMPHSIGNALS_HH_ */
diff --git a/Library/Processor/KTNymphSlot.hh b/Library/Processor/KTNymphSlot.hh
new file mode 100644
index 0000000..5e65969
--- /dev/null
+++ b/Library/Processor/KTNymphSlot.hh
@@ -0,0 +1,381 @@
+/*
+ * KTNymphSlot.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTNYMPHSLOT_HH_
+#define NYMPH_KTNYMPHSLOT_HH_
+
+#include "KTSlot.hh"
+
+
+
+namespace Nymph
+{
+    // Typedefs for backwards compatibility
+
+    typedef KTSlot<> KTSlotNoArg;
+
+    template < typename Arg1 >
+    using KTSlotOneArg = KTSlot< Arg1 >;
+
+    template< typename Arg1, typename Arg2 >
+    using KTSlotTwoArg = KTSlot< Arg1, Arg2 >;
+
+
+    /*!
+     @class KTSlotData
+     @author N. S. Oblath
+
+     @brief Creates a slot that takes a KTDataHandle object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
+
+     @details
+     Usage:
+     This slot type adds the slot function (signature void (KTDataHandle).
+     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
+     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
+
+     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+    template< class XReturnType, class... XDataArgs >
+    class KTSlotData : public KTSlot< KTDataHandle  >
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            virtual ~KTSlotData();
+
+            void operator()( KTDataHandle data );
+
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            //function_signature fFunc;
+            std::function< XReturnType (const XDataArgs&..., XReturnType&) > fFunc;
+
+            KTSignalData* fSignalPtr;
+    };
+
+    // partial specialization for no new data type
+    template< class... XDataArgs >
+    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            virtual ~KTSlotData();
+
+            void operator()( KTDataHandle data );
+
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            //function_signature fFunc;
+            std::function< void (const XDataArgs&...) > fFunc;
+
+            KTSignalData* fSignalPtr;
+    };
+
+
+    /*!
+     @class KTSlotDone
+     @author N. S. Oblath
+
+     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
+
+     @details
+     Usage:
+     This slot type adds the slot function (signature void ()).
+     Your processor (or, optionally, a different object) must have a member function with the signature void ().
+     The slot calls the member function.
+
+     In your Processor's header add a member variable of type KTDoneSlot.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+    class KTSlotDone : public KTSlot<>
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
+            virtual ~KTSlotDone();
+
+            void operator()();
+
+        protected:
+            std::function< void () > fFunc;
+
+            KTSignalDone* fSignalPtr;
+    };
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    // KTSlotData
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::~KTSlotData()
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    void KTSlotData< XReturnType, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    {
+        // Standard data slot pattern:
+
+        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( dataHandle->Of< XDataTypes >()... , dataHandle->Of< XReturnType >() );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
+            ref->SetReturnException( boost::current_exception() );
+        }
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)( dataHandle );
+        }
+        return;
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
+
+
+    // KTSlotData with no return type
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    KTSlotData< void, XDataTypes... >::~KTSlotData()
+    {
+    }
+
+    template< class... XDataTypes >
+    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    {
+        // Standard data slot pattern:
+
+        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( dataHandle->Of< XDataTypes >()... );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
+            ref->SetReturnException( boost::current_exception() );
+        }
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)( dataHandle );
+        }
+        return;
+    }
+
+    template< class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
+
+
+    // KTSlotDone
+
+    template< class XFuncOwnerType >
+    KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XFuncOwnerType >
+    KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    inline KTSlotDone::~KTSlotDone()
+    {
+    }
+
+    inline void KTSlotDone::operator()()
+    {
+        // Call the function
+        fFunc();
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        fSlotWrapper->GetThreadRef()->Break( KTDataHandle(), fSlotWrapper->GetDoBreakpoint() );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)();
+        }
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTNYMPHSLOT_HH_ */
diff --git a/Library/Processor/KTSignal.hh b/Library/Processor/KTSignal.hh
index f4dc7e8..8f0d23c 100644
--- a/Library/Processor/KTSignal.hh
+++ b/Library/Processor/KTSignal.hh
@@ -8,16 +8,54 @@
 #ifndef KTSIGNAL_HH_
 #define KTSIGNAL_HH_
 
-#include "KTProcessor.hh"
+#include "KTSignalSlotBase.hh"
 
-#include "KTCoreData.hh"
+#include "KTConnection.hh"
 
-#include <boost/signals2.hpp>
-
-#include <string>
+#include <map>
 
 namespace Nymph
 {
+    /// A m_signal object may call multiple slots with the
+    /// same signature. You can connect functions to the m_signal
+    /// which will be called when the emit() method on the
+    /// m_signal object is invoked. Any argument passed to emit()
+    /// will be passed to the given functions.
+    /// The name "m_signal" was chosen to avoid conflicting with std::signal.
+    template< typename... XArgs >
+    class KTSignal : public KTSignalBase
+    {
+        public:
+            using signature = void( XArgs... );
+            using boost_signal = boost::signals2::signal< signature >;
+
+        public:
+            template< typename XOwner >
+            KTSignal( const std::string& name, XOwner* owner );
+            KTSignal( const KTSignal& ) = delete;
+            KTSignal( KTSignal&& ) = delete;
+            virtual ~KTSignal();
+
+            virtual void Connect( KTSlotBase* slot );
+
+            // disconnects a previously connected function
+            void Disconnect( KTSlotBase* slot ) const;
+
+            // disconnects all previously connected functions
+            void DisconnectAll() const;
+
+            // calls all connected functions
+            void Emit( XArgs... args );
+            void operator()( XArgs... args );
+
+        private:
+            typedef std::map< KTSlotBase*, KTConnection > slot_map; // to get around the problem of having a comma inside a macro function argument
+            MEMBERVARIABLE_REF_MUTABLE_CONST( slot_map, Slots );
+
+            boost_signal fSignal;
+    };
+
+
     /*!
      @class KTSignal
      @author N. S. Oblath
@@ -34,7 +72,7 @@ namespace Nymph
      Initialize the signal with the processor's 'this' pointer and the name of the signal.
 
      To use the signal, call it as: fSignalObject(arg);
-    */
+    *//*
     template< class... XSignalArguments >
     class KTSignal
     {
@@ -63,39 +101,87 @@ namespace Nymph
 
             std::string fName;
     };
+*/
 
-    /// Convenience typedef for done signals
-    typedef KTSignal<> KTSignalDone;
 
-    // Convenience typedef for backwards compatibility
-    template< typename XDataType >
-    using KTSignalOneArg = KTSignal< XDataType >;
+    //*******************
+    // Implementations
+    //*******************
 
-    /*!
-     @class KTSignalData
-     @author N. S. Oblath
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSignal< XArgs... >::KTSignal< XOwner >( const std::string& name, XOwner* owner ) :
+            fSlots()
+    {
+        owner->RegisterSignal( name, this );
+    }
 
-     @brief Creates a signal that takes a KTDataHandle object as its argument.
+    template< typename... XArgs >
+    KTSignal< XArgs... >::~KTSignal()
+    {
+        DisconnectAll();
+    }
 
-     @details
-     The purpose of the signal is for passing KTCoreData pointers between Processors.
-     The signal is emitted by calling operator().
-     If a KTDataSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::Connect( KTSlotBase* slot )
+    {
+        // ensure that the slot is of the correct type
+        m_slot< x_args... >* derived_slot = dynamic_cast< m_slot< x_args... >* >( p_slot );
+        if( p_slot == nullptr )
+        {
+            throw error() << "signal/slot signature mismatch: signal=" << f_name << "; slot=" << p_slot->name();
+        }
 
-     Usage:
-     In your Processor's header add a member variable of type KTSignalData.
+        // make the connection
+        int connection_id = connect_function( derived_slot->function() );
 
-     Initialize the signal with the processor's 'this' pointer and the name of the signal.
+        // inform the slot of the signal connection so that it can disconnect
+        derived_slot->connections().insert( std::pair< int, m_signal< x_args... >* >( connection_id, this ) );
 
-     That's it!
-    */
-    typedef KTSignal< KTDataHandle > KTSignalData;
+        return connection_id;
 
+    }
 
-    //*******************
-    // Implementations
-    //*******************
+    // disconnects a previously connected function
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::Disconnect( KTSlotBase* slot ) const
+    {
+        auto connectionIt = fSlots.find( slot );
+        if( connectionIt != fSlots.end() )
+        {
+            connectionIt->second.disconnect();
+            connectionIt->first->RemoveConnection( this );
+        }
+        return;
+    }
 
+    // disconnects all previously connected functions
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::DisconnectAll() const
+    {
+        for( auto connection : fSlots )
+        {
+            connection.second.disconnect();
+            connection.first->RemoveConnection( this );
+        }
+        return;
+    }
+
+    // calls all connected functions
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::Emit( XArgs... args )
+    {
+        (*this)( args );
+        return;
+    }
+
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::operator()( XArgs... args )
+    {
+        fSignal( args );
+    }
+
+/*
     template< class... XSignalArguments >
     KTSignal< XSignalArguments... >::KTSignal( const std::string& name, KTProcessor* proc ) :
             fSignal(),
@@ -138,6 +224,6 @@ namespace Nymph
     {
         return fName;
     }
-
+*/
 } /* namespace Nymph */
 #endif /* KTSIGNAL_HH_ */
diff --git a/Library/Processor/KTSignalSlotBase.hh b/Library/Processor/KTSignalSlotBase.hh
new file mode 100644
index 0000000..1e06d3d
--- /dev/null
+++ b/Library/Processor/KTSignalSlotBase.hh
@@ -0,0 +1,52 @@
+/*
+ * KTSignalSlotBase.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTSIGNALSLOTBASE_HH_
+#define NYMPH_KTSIGNALSLOTBASE_HH_
+
+#include "KTMemberVariable.hh"
+
+#include <string>
+
+namespace Nymph
+{
+    class KTSignalBase;
+
+    class KTSlotBase
+    {
+        public:
+            KTSlotBase( const std::string& name );
+            template< typename XOwner >
+            KTSlotBase( const std::string& name, XOwner* owner );
+            virtual ~KTSlotBase();
+
+            void AddConnection( KTSignalBase* ) const = 0;
+
+            void RemoveConnection( KTSignalBase* ) const = 0;
+
+            MEMBERVARIABLE_REF( std::string, name );
+    };
+
+
+    class KTSignalBase
+    {
+        public:
+            KTSignalBase( const std::string& name );
+            template< typename x_owner >
+            KTSignalBase( const std::string& name, x_owner* owner );
+            virtual ~KTSignalBase();
+
+            virtual void Connect( KTSlotBase* slot ) = 0;
+
+            virtual void Disconnect( KTSlotBase* slot ) = 0;
+
+            MEMBERVARIABLE_REF( std::string, name );
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTSIGNALSLOTBASE_HH_ */
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 7f374a9..6a68d08 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -8,17 +8,56 @@
 #ifndef KTSLOT_HH_
 #define KTSLOT_HH_
 
-#include "KTException.hh"
+#include "KTSignalSlotBase.hh"
+
+//#include "KTException.hh"
 #include "KTLogger.hh"
-#include "KTSignal.hh"
 
-#include <functional>
-#include <string>
+#include <initializer_list>
+#include <set>
 
 namespace Nymph
 {
     KTLOGGER(slotlog, "KTSlot");
 
+
+    // Type XOwner is the class that owns the KTSlot object
+    template< typename... XArgs >
+    class KTSlot : public KTSlotBase
+    {
+        public:
+            using signature = void( XArgs... );
+            using signal_list = std::initializer_list< std::string >;
+
+        public:
+            template< typename XOwner >
+            KTSlot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
+            template< typename XOwner >
+            KTSlot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
+            template< typename XOwner >
+            KTSlot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
+            template< typename XOwner, typename XFuncClass >
+            KTSlot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
+            template< typename XOwner, typename XFuncClass >
+            KTSlot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
+            KTSlot( const KTSlot& ) = delete;
+            KTSlot( KTSlot&& ) = delete;
+            virtual ~KTSlot();
+
+            void DisconnectAll() const;
+
+            void AddConnection( KTSignalBase* ) const;
+
+            void RemoveConnection( KTSignalBase* ) const;
+
+            MEMBERVARIABLE_REF( boost::function< signature >, Function );
+
+            typedef std::set< KTSignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
+            MEMBERVARIABLE_REF_MUTABLE( signal_connections, Connections );
+
+    };
+
+
     /*!
      @class KTSlot
      @author N. S. Oblath
@@ -35,7 +74,7 @@ namespace Nymph
 
      Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
      Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-    */
+    *//*
     template< typename... Args >
     class KTSlot
     {
@@ -58,146 +97,7 @@ namespace Nymph
             std::string fName;
             KTSlotWrapper* fSlotWrapper;
     };
-
-    // Typedefs for backwards compatibility
-
-    typedef KTSlot<> KTSlotNoArg;
-
-    template < typename Arg1 >
-    using KTSlotOneArg = KTSlot< Arg1 >;
-
-    template< typename Arg1, typename Arg2 >
-    using KTSlotTwoArg = KTSlot< Arg1, Arg2 >;
-
-
-    /*!
-     @class KTSlotData
-     @author N. S. Oblath
-
-     @brief Creates a slot that takes a KTDataHandle object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
-
-     @details
-     Usage:
-     This slot type adds the slot function (signature void (KTDataHandle).
-     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
-     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
-
-     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-
-     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
-    */
-    template< class XReturnType, class... XDataArgs >
-    class KTSlotData : public KTSlot< KTDataHandle  >
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
-            virtual ~KTSlotData();
-
-            void operator()( KTDataHandle data );
-
-        protected:
-            template< typename... DataTypes >
-            bool DataPresent( KTDataHandle data );
-
-            //function_signature fFunc;
-            std::function< XReturnType (const XDataArgs&..., XReturnType&) > fFunc;
-
-            KTSignalData* fSignalPtr;
-    };
-
-    // partial specialization for no new data type
-    template< class... XDataArgs >
-    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
-
-            virtual ~KTSlotData();
-
-            void operator()( KTDataHandle data );
-
-        protected:
-            template< typename... DataTypes >
-            bool DataPresent( KTDataHandle data );
-
-            //function_signature fFunc;
-            std::function< void (const XDataArgs&...) > fFunc;
-
-            KTSignalData* fSignalPtr;
-    };
-
-
-    /*!
-     @class KTSlotDone
-     @author N. S. Oblath
-
-     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
-
-     @details
-     Usage:
-     This slot type adds the slot function (signature void ()).
-     Your processor (or, optionally, a different object) must have a member function with the signature void ().
-     The slot calls the member function.
-
-     In your Processor's header add a member variable of type KTDoneSlot.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-
-     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
-    */
-    class KTSlotDone : public KTSlot<>
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
-            virtual ~KTSlotDone();
-
-            void operator()();
-
-        protected:
-            std::function< void () > fFunc;
-
-            KTSignalDone* fSignalPtr;
-    };
+*/
 
 
     //*******************
@@ -206,255 +106,114 @@ namespace Nymph
 
     // KTSlot
 
-    template< typename... Args >
-    template< class XFuncOwnerType >
-    KTSlot< Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
-            fName( name )
-    {
-        fSlotWrapper = owner->RegisterSlot( name, owner, func, signals );
-    }
-
-    template< typename... Args >
-    template< class XFuncOwnerType >
-    KTSlot< Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
-            fName( name )
-    {
-        fSlotWrapper = proc->RegisterSlot( name, owner, func, signals );
-    }
-
-    template< typename... Args >
-    KTSlot< Args... >::~KTSlot()
-    {
-    }
-
-    template< typename... Args >
-    inline const std::string& KTSlot< Args... >::GetName() const
-    {
-        return fName;
-    }
-
-    template< typename... Args >
-    inline KTSlotWrapper* KTSlot< Args... >::GetSlotWrapper()
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
+            fConnections()
     {
-        return fSlotWrapper;
+        owner->RegisterSlot( name, this, signals );
     }
 
-    // KTSlotData
-
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( signalPtr )
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+    fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
+    fConnections()
     {
+        owner->RegisterSlot( name, this, signals );
     }
 
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+    fFunction( func ),
+    fConnections()
     {
+        owner->RegisterSlot( name, this, signals );
     }
 
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( signalPtr )
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+    fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+    fConnections()
     {
+        owner->RegisterSlot( name, this, signals );
     }
 
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+    fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+    fConnections()
     {
+        owner->RegisterSlot( name, this, signals );
     }
 
-    template< class XReturnType, class... XDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::~KTSlotData()
+    template< typename... XArgs >
+    KTSlot< XArgs... >::~KTSlot()
     {
+        DisconnectAll();
     }
 
-    template< class XReturnType, class... XDataTypes >
-    void KTSlotData< XReturnType, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    template< typename... XArgs >
+    void KTSlot< XArgs... >::DisconnectAll() const
     {
-        // Standard data slot pattern:
-
-        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
-
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataHandle ) )
-        {
-            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            return;
-        }
-
-        // Call the function
-        try
-        {
-            fFunc( dataHandle->Of< XDataTypes >()... , dataHandle->Of< XReturnType >() );
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
-            ref->SetReturnException( boost::current_exception() );
-        }
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
+        for( auto connection : fConnections )
         {
-            (*fSignalPtr)( dataHandle );
+            connection->Disconnect( this );
         }
         return;
     }
 
-    template< class XReturnType, class... XDataTypes >
-    template< typename... DataTypes >
-    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
-    {
-        return DataPresentHelper< DataTypes... >::DataPresent( data );
-    }
-
-
-    // KTSlotData with no return type
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class... XDataTypes >
-    KTSlotData< void, XDataTypes... >::~KTSlotData()
+    template< typename... XArgs >
+    void KTSlot< XArgs... >::AddConnection( KTSignalBase* signal ) const
     {
+        fConnections.insert( signal );
+        return;
     }
 
-    template< class... XDataTypes >
-    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    template< typename... XArgs >
+    void KTSlot< XArgs... >::RemoveConnection( KTSignalBase* signal ) const
     {
-        // Standard data slot pattern:
-
-        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
-
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataHandle ) )
-        {
-            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            return;
-        }
-
-        // Call the function
-        try
-        {
-            fFunc( dataHandle->Of< XDataTypes >()... );
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
-            ref->SetReturnException( boost::current_exception() );
-        }
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)( dataHandle );
-        }
+        fConnections.erase( signal );
         return;
     }
 
-    template< class... XDataTypes >
-    template< typename... DataTypes >
-    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
+/*
+    template< typename... Args >
+    template< class XFuncOwnerType >
+    KTSlot< Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
+            fName( name )
     {
-        return DataPresentHelper< DataTypes... >::DataPresent( data );
+        fSlotWrapper = owner->RegisterSlot( name, owner, func, signals );
     }
 
-
-    // KTSlotDone
-
+    template< typename... Args >
     template< class XFuncOwnerType >
-    KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
-            fFunc( [func, owner](){ return (owner->*func)(); } ),
-            fSignalPtr( signalPtr )
+    KTSlot< Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
+            fName( name )
     {
+        fSlotWrapper = proc->RegisterSlot( name, owner, func, signals );
     }
 
-    template< class XFuncOwnerType >
-    KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
-            fFunc( [func, owner](){ return (owner->*func)(); } ),
-            fSignalPtr( signalPtr )
+    template< typename... Args >
+    KTSlot< Args... >::~KTSlot()
     {
     }
 
-    inline KTSlotDone::~KTSlotDone()
+    template< typename... Args >
+    inline const std::string& KTSlot< Args... >::GetName() const
     {
+        return fName;
     }
 
-    inline void KTSlotDone::operator()()
+    template< typename... Args >
+    inline KTSlotWrapper* KTSlot< Args... >::GetSlotWrapper()
     {
-        // Call the function
-        fFunc();
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        fSlotWrapper->GetThreadRef()->Break( KTDataHandle(), fSlotWrapper->GetDoBreakpoint() );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)();
-        }
-        return;
+        return fSlotWrapper;
     }
-
+*/
 } /* namespace Nymph */
 #endif /* KTSLOT_HH_ */

From a43a2e6e29ee43b7cedf8e638fdbdad7c3534581 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Feb 2019 13:39:20 -0800
Subject: [PATCH 129/521] Basic components of the new signal/slot setup are in
 place, but untested.

---
 Library/Processor/KTSignal.hh         | 47 +++++++++++++++++++--------
 Library/Processor/KTSignalSlotBase.hh |  4 +--
 2 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/Library/Processor/KTSignal.hh b/Library/Processor/KTSignal.hh
index 8f0d23c..c3a8f8b 100644
--- a/Library/Processor/KTSignal.hh
+++ b/Library/Processor/KTSignal.hh
@@ -11,11 +11,18 @@
 #include "KTSignalSlotBase.hh"
 
 #include "KTConnection.hh"
+#include "KTException.hh"
+#include "KTLogger.hh"
 
 #include <map>
 
 namespace Nymph
 {
+    KTLOGGER( signallog, "KTSignal" );
+
+    struct KTConnectionException : public KTException
+    {};
+
     /// A m_signal object may call multiple slots with the
     /// same signature. You can connect functions to the m_signal
     /// which will be called when the emit() method on the
@@ -36,7 +43,7 @@ namespace Nymph
             KTSignal( KTSignal&& ) = delete;
             virtual ~KTSignal();
 
-            virtual void Connect( KTSlotBase* slot );
+            virtual void Connect( KTSlotBase* slot, int group );
 
             // disconnects a previously connected function
             void Disconnect( KTSlotBase* slot ) const;
@@ -52,7 +59,7 @@ namespace Nymph
             typedef std::map< KTSlotBase*, KTConnection > slot_map; // to get around the problem of having a comma inside a macro function argument
             MEMBERVARIABLE_REF_MUTABLE_CONST( slot_map, Slots );
 
-            boost_signal fSignal;
+            boost_signal fInternalSignal;
     };
 
 
@@ -111,7 +118,8 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner >
     KTSignal< XArgs... >::KTSignal< XOwner >( const std::string& name, XOwner* owner ) :
-            fSlots()
+            fSlots(),
+            fInternalSignal()
     {
         owner->RegisterSignal( name, this );
     }
@@ -123,23 +131,36 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void KTSignal< XArgs... >::Connect( KTSlotBase* slot )
+    void KTSignal< XArgs... >::Connect( KTSlotBase* slot, int group )
     {
-        // ensure that the slot is of the correct type
-        m_slot< x_args... >* derived_slot = dynamic_cast< m_slot< x_args... >* >( p_slot );
-        if( p_slot == nullptr )
+        if( fSlots.count( slot ) != 0 )
         {
-            throw error() << "signal/slot signature mismatch: signal=" << f_name << "; slot=" << p_slot->name();
+            KTWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
+            return;
         }
 
-        // make the connection
-        int connection_id = connect_function( derived_slot->function() );
+        // ensure that the slot is of the correct type
+        KTSlot< XArgs... >* derivedSlot = dynamic_cast< KTSlot< XArgs... >* >( slot );
+        if( slot == nullptr )
+        {
+            BOOST_THROW_EXCEPTION( KTConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+                    "\tUnable to cast from KTSlotBase to this signal's derived type." << eom );
+        }
 
-        // inform the slot of the signal connection so that it can disconnect
-        derived_slot->connections().insert( std::pair< int, m_signal< x_args... >* >( connection_id, this ) );
+        KTConnection connection;
+        if( group >= 0 )
+        {
+            connection = fInternalSignal.connect( group, derivedSlot->Function() );
+        }
+        else
+        {
+            connection = fInternalSignal.connect( derivedSlot->Function() );
+        }
 
-        return connection_id;
+        fSlots.insert( std::make_pair< KTSlotBase*, KTConnection >( slot, connection ) );
+        slot->AddConnection( this );
 
+        return;
     }
 
     // disconnects a previously connected function
diff --git a/Library/Processor/KTSignalSlotBase.hh b/Library/Processor/KTSignalSlotBase.hh
index 1e06d3d..6031fd7 100644
--- a/Library/Processor/KTSignalSlotBase.hh
+++ b/Library/Processor/KTSignalSlotBase.hh
@@ -28,7 +28,7 @@ namespace Nymph
 
             void RemoveConnection( KTSignalBase* ) const = 0;
 
-            MEMBERVARIABLE_REF( std::string, name );
+            MEMBERVARIABLE_REF( std::string, Name );
     };
 
 
@@ -44,7 +44,7 @@ namespace Nymph
 
             virtual void Disconnect( KTSlotBase* slot ) = 0;
 
-            MEMBERVARIABLE_REF( std::string, name );
+            MEMBERVARIABLE_REF( std::string, Name );
     };
 
 } /* namespace Nymph */

From efc6bfd05b8697c580b95bdfd318455c9d9c0b88 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 13 Jul 2019 22:17:57 -0700
Subject: [PATCH 130/521] More progress

---
 Library/Processor/KTNymphSlot.hh       | 41 ++++++++++++-----
 Library/Processor/KTProcessor.cc       | 19 ++++----
 Library/Processor/KTProcessor.hh       | 41 ++++++-----------
 Library/Processor/KTSignalSlotBase.hh  |  4 +-
 Library/Processor/KTSlot.hh            | 35 ++++++++++----
 Library/Processor/KTThreadReference.hh | 63 ++++++++++++++++++--------
 6 files changed, 124 insertions(+), 79 deletions(-)

diff --git a/Library/Processor/KTNymphSlot.hh b/Library/Processor/KTNymphSlot.hh
index 5e65969..a584b3c 100644
--- a/Library/Processor/KTNymphSlot.hh
+++ b/Library/Processor/KTNymphSlot.hh
@@ -10,7 +10,9 @@
 
 #include "KTSlot.hh"
 
-
+#include "KTException.hh"
+#include "KTNymphSignals.hh"
+#include "KTProcessor.hh"
 
 namespace Nymph
 {
@@ -25,6 +27,21 @@ namespace Nymph
     using KTSlotTwoArg = KTSlot< Arg1, Arg2 >;
 
 
+    template <typename... Types>
+    struct foo {};
+
+    template < typename... Types1, template <typename...> class T
+             , typename... Types2, template <typename...> class V
+             , typename U >
+    void
+    bar(const T<Types1...>&, const V<Types2...>&, const U& u)
+    {
+      std::cout << sizeof...(Types1) << std::endl;
+      std::cout << sizeof...(Types2) << std::endl;
+      std::cout << u << std::endl;
+    }
+
+
     /*!
      @class KTSlotData
      @author N. S. Oblath
@@ -164,7 +181,7 @@ namespace Nymph
     template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
             fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
     {
@@ -182,7 +199,7 @@ namespace Nymph
     template< class XReturnType, class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
             fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )
     {
@@ -207,7 +224,7 @@ namespace Nymph
     {
         // Standard data slot pattern:
 
-        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
+        std::shared_ptr< KTThreadReference > ref = fThreadRef;
 
         // Check to ensure that the required data type is present
         if( ! DataPresent< XDataTypes... >( dataHandle ) )
@@ -230,7 +247,7 @@ namespace Nymph
 
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
         // Sets the dataHandle into the return
-        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
+        ref->Break( dataHandle, fDoBreakpoint );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
@@ -253,7 +270,7 @@ namespace Nymph
     template< class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->GetName()} ),
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
             fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
             fSignalPtr( signalPtr )
     {
@@ -271,7 +288,7 @@ namespace Nymph
     template< class... XDataTypes >
     template< class XFuncOwnerType, class... XFuncDataTypes >
     KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->GetName()} ),
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
             fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
             fSignalPtr( signalPtr )
     {
@@ -296,7 +313,7 @@ namespace Nymph
     {
         // Standard data slot pattern:
 
-        std::shared_ptr< KTThreadReference > ref = fSlotWrapper->GetThreadRef();
+        std::shared_ptr< KTThreadReference > ref = fThreadRef;
 
         // Check to ensure that the required data type is present
         if( ! DataPresent< XDataTypes... >( dataHandle ) )
@@ -319,7 +336,7 @@ namespace Nymph
 
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
         // Sets the dataHandle into the return
-        ref->Break( dataHandle, fSlotWrapper->GetDoBreakpoint() );
+        ref->Break( dataHandle, fDoBreakpoint );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
@@ -341,7 +358,7 @@ namespace Nymph
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
+            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
             fFunc( [func, owner](){ return (owner->*func)(); } ),
             fSignalPtr( signalPtr )
     {
@@ -349,7 +366,7 @@ namespace Nymph
 
     template< class XFuncOwnerType >
     KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->GetName()} ),
+            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
             fFunc( [func, owner](){ return (owner->*func)(); } ),
             fSignalPtr( signalPtr )
     {
@@ -366,7 +383,7 @@ namespace Nymph
 
         // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
         // Sets the dataHandle into the return
-        fSlotWrapper->GetThreadRef()->Break( KTDataHandle(), fSlotWrapper->GetDoBreakpoint() );
+        fThreadRef->Break( KTDataHandle(), fDoBreakpoint );
 
         // If there's a signal pointer, emit the signal
         if( fSignalPtr != nullptr )
diff --git a/Library/Processor/KTProcessor.cc b/Library/Processor/KTProcessor.cc
index 0ba0806..c28cfa9 100644
--- a/Library/Processor/KTProcessor.cc
+++ b/Library/Processor/KTProcessor.cc
@@ -31,7 +31,6 @@ namespace Nymph
     {
         for (SlotMapIt iter = fSlotMap.begin(); iter != fSlotMap.end(); iter++)
         {
-            iter->second->Disconnect();
             delete iter->second;
         }
         for (SigMapIt iter = fSignalMap.begin(); iter != fSignalMap.end(); iter++)
@@ -42,7 +41,7 @@ namespace Nymph
 
     void KTProcessor::PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef)
     {
-        std::function< void(std::shared_ptr< KTThreadReference >) > funcObj = [this, &slotName](std::shared_ptr< KTThreadReference > ref){ GetSlot(slotName)->SetThreadRef(ref); };
+        std::function< void(std::shared_ptr< KTThreadReference >) > funcObj = [this, &slotName](std::shared_ptr< KTThreadReference > ref){ GetSlot(slotName)->ThreadRef() = ref; };
         PassToConnProcs(slotName, funcObj, threadRef);
         return;
     }
@@ -50,8 +49,8 @@ namespace Nymph
     void KTProcessor::ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum)
     {
         // get the signal and slot wrapper pointers
-        KTSignalWrapper* signal = GetSignal(signalName);
-        KTSlotWrapper* slot = processor->GetSlot(slotName);
+        KTSignalBase* signal = GetSignal(signalName);
+        KTSlotBase* slot = processor->GetSlot(slotName);
 
         try
         {
@@ -90,7 +89,7 @@ namespace Nymph
         return;
     }
 
-    void KTProcessor::ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum)
+    void KTProcessor::ConnectSignalToSlot(KTSignalBase* signal, KTSlotBase* slot, int groupNum)
     {
         if (signal == nullptr)
         {
@@ -101,12 +100,12 @@ namespace Nymph
             BOOST_THROW_EXCEPTION( KTSlotException() << "Slot pointer was NULL" << eom );
         }
 
-        slot->SetConnection(signal, groupNum);
+        signal->Connect(slot, groupNum);
 
         return;
     }
 
-    KTSignalWrapper* KTProcessor::GetSignal(const std::string& name)
+    KTSignalBase* KTProcessor::GetSignal(const std::string& name)
     {
         SigMapIt iter = fSignalMap.find(name);
         if (iter == fSignalMap.end())
@@ -116,7 +115,7 @@ namespace Nymph
         return iter->second;
     }
 
-    KTSlotWrapper* KTProcessor::GetSlot(const std::string& name)
+    KTSlotBase* KTProcessor::GetSlot(const std::string& name)
     {
         SlotMapIt iter = fSlotMap.find(name);
         if (iter == fSlotMap.end())
@@ -128,7 +127,7 @@ namespace Nymph
 
     bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
     {
-        KTSlotWrapper* slot = GetSlot(slotName);
+        KTSlotBase* slot = GetSlot(slotName);
         if (slot != nullptr)
         {
             return slot->GetDoBreakpoint();
@@ -139,7 +138,7 @@ namespace Nymph
 
     void KTProcessor::SetDoBreakpoint(const std::string& slotName, bool flag)
     {
-        KTSlotWrapper* slot = GetSlot(slotName);
+        KTSlotBase* slot = GetSlot(slotName);
         if (slot != nullptr)
         {
             return slot->SetDoBreakpoint(flag);
diff --git a/Library/Processor/KTProcessor.hh b/Library/Processor/KTProcessor.hh
index c2e143a..2575131 100644
--- a/Library/Processor/KTProcessor.hh
+++ b/Library/Processor/KTProcessor.hh
@@ -11,20 +11,15 @@
 
 #include "KTConfigurable.hh"
 
-#include "KTConnection.hh"
 #include "KTLogger.hh"
-#include "KTSignalWrapper.hh"
-#include "KTSlotWrapper.hh"
+#include "KTNymphSlot.hh"
 
 #include "factory.hh"
 
-#include <boost/signals2.hpp>
-
 #include <exception>
 #include <initializer_list>
 #include <map>
 #include <sstream>
-#include <string>
 #include <memory>
 
 namespace Nymph
@@ -42,11 +37,11 @@ namespace Nymph
     class KTProcessor : public KTConfigurable
     {
         protected:
-            typedef std::map< std::string, KTSignalWrapper* > SignalMap;
+            typedef std::map< std::string, KTSignalBase* > SignalMap;
             typedef SignalMap::iterator SigMapIt;
             typedef SignalMap::value_type SigMapVal;
 
-            typedef std::map< std::string, KTSlotWrapper* > SlotMap;
+            typedef std::map< std::string, KTSlotBase* > SlotMap;
             typedef SlotMap::iterator SlotMapIt;
             typedef SlotMap::value_type SlotMapVal;
 
@@ -71,20 +66,18 @@ namespace Nymph
             /// For a slot that is called, update the slot's ThreadRef, and pass the update to any slots that get called by signals emitted by this slot
             void PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef);
 
-            static void ConnectSignalToSlot(KTSignalWrapper* signal, KTSlotWrapper* slot, int groupNum=-1);
+            static void ConnectSignalToSlot(KTSignalBase* signal, KTSlotBase* slot, int groupNum=-1);
 
             void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
             void ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum=-1);
 
-            template< class XProcessor >
-            KTSignalWrapper* RegisterSignal(std::string name, XProcessor* signalPtr);
+            void RegisterSignal(std::string name, KTSignalBase* signal);
 
-            template< class XTarget, typename XReturn, typename... XArgs >
-            KTSlotWrapper* RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...), std::initializer_list< std::string > signals = {});
+            void RegisterSlot(std::string name, KTSlotBase* slot, std::initializer_list< std::string > signals = {});
 
-            KTSignalWrapper* GetSignal(const std::string& name);
+            KTSignalBase* GetSignal(const std::string& name);
 
-            KTSlotWrapper* GetSlot(const std::string& name);
+            KTSlotBase* GetSlot(const std::string& name);
 
             bool GetDoBreakpoint(const std::string& slotName);
             void SetDoBreakpoint(const std::string& slotName, bool flag);
@@ -105,31 +98,25 @@ namespace Nymph
     };
 
 
-    template< typename XSignalSig >
-    KTSignalWrapper* KTProcessor::RegisterSignal(std::string name, XSignalSig* signalPtr)
+    void KTProcessor::RegisterSignal(std::string name, KTSignalBase* signal)
     {
         KTDEBUG(processorlog, "Registering signal <" << name << "> in processor <" << fConfigName << ">");
-        KTSignalWrapper* sig = new KTSignalWrapper(signalPtr);
-        fSignalMap.insert(SigMapVal(name, sig));
-        return sig;
+        fSignalMap.insert(SigMapVal(name, signal));
+        return;
     }
 
-    template< class XTarget, typename XReturn, typename... XArgs >
-    KTSlotWrapper* KTProcessor::RegisterSlot(std::string name, XTarget* target, XReturn (XTarget::* funcPtr)(XArgs...), std::initializer_list< std::string > signals)
+    void KTProcessor::RegisterSlot(std::string name, KTSlotBase* slot, std::initializer_list< std::string > signals)
     {
         KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
 
-        KTSignalConcept< XReturn (XArgs...) > signalConcept;
-
-        KTSlotWrapper* slot = new KTSlotWrapper([funcPtr, target](XArgs... args){return (target->*funcPtr)(args...);}, &signalConcept);
         fSlotMap.insert(SlotMapVal(name, slot));
 
-        for (std::initializer_list< std::string >::const_iterator sigIt = signals.begin(); sigIt != signals.end(); ++sigIt)
+        for (auto sigIt = signals.begin(); sigIt != signals.end(); ++sigIt)
         {
             fSlotToSigMap.insert(SlotToSigMapVal(name, *sigIt));
             KTDEBUG(processorlog, "Slot-to-signal connection <" << name << "> --> <" << *sigIt << ">");
         }
-        return slot;
+        return;
     }
 
     inline void KTProcessor::ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum)
diff --git a/Library/Processor/KTSignalSlotBase.hh b/Library/Processor/KTSignalSlotBase.hh
index 6031fd7..f775c93 100644
--- a/Library/Processor/KTSignalSlotBase.hh
+++ b/Library/Processor/KTSignalSlotBase.hh
@@ -40,9 +40,9 @@ namespace Nymph
             KTSignalBase( const std::string& name, x_owner* owner );
             virtual ~KTSignalBase();
 
-            virtual void Connect( KTSlotBase* slot ) = 0;
+            virtual void Connect( KTSlotBase* slot, int group ) = 0;
 
-            virtual void Disconnect( KTSlotBase* slot ) = 0;
+            virtual void Disconnect( KTSlotBase* slot ) const = 0;
 
             MEMBERVARIABLE_REF( std::string, Name );
     };
diff --git a/Library/Processor/KTSlot.hh b/Library/Processor/KTSlot.hh
index 6a68d08..0729eb0 100644
--- a/Library/Processor/KTSlot.hh
+++ b/Library/Processor/KTSlot.hh
@@ -12,6 +12,7 @@
 
 //#include "KTException.hh"
 #include "KTLogger.hh"
+#include "KTThreadReference.hh"
 
 #include <initializer_list>
 #include <set>
@@ -55,6 +56,12 @@ namespace Nymph
             typedef std::set< KTSignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
             MEMBERVARIABLE_REF_MUTABLE( signal_connections, Connections );
 
+            // TODO: move fDoBreakpoint to KTSlot
+            // TODO: KTThreadReference should be a templated object, KTThreadReference< XArgs... >
+            // TODO: KTThreadReference< XArgs... > inherits from KTThreadReferenceBase
+            MEMBERVARIABLE( bool, DoBreakpoint );
+            MEMBERVARIABLE_SHARED_PTR_CONST( KTThreadReference, ThreadRef );
+
     };
 
 
@@ -110,7 +117,9 @@ namespace Nymph
     template< typename XOwner >
     KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
-            fConnections()
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
     }
@@ -118,8 +127,10 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner >
     KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
-    fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
-    fConnections()
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
     }
@@ -127,8 +138,10 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner >
     KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
-    fFunction( func ),
-    fConnections()
+            fFunction( func ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
     }
@@ -136,8 +149,10 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
     KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
-    fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-    fConnections()
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
     }
@@ -145,8 +160,10 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
     KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
-    fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-    fConnections()
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
     }
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index 05f6cca..e6d88fe 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -18,11 +18,51 @@ namespace Nymph
 {
     typedef boost::promise< KTDataHandle > KTDataPtrReturn;
 
-    class KTThreadReference
+    class KTThreadReferenceBase
     {
-        private:
+        protected:
             typedef boost::unique_lock< boost::mutex > boost_unique_lock;
 
+        public:
+            KTThreadReferenceBase();
+            KTThreadReferenceBase( const KTThreadReferenceBase& ) = delete;
+            KTThreadReferenceBase( KTThreadReferenceBase&& orig );
+
+            KTThreadReferenceBase& operator=( const KTThreadReferenceBase& ) = delete;
+            KTThreadReferenceBase& operator=( KTThreadReferenceBase&& );
+
+        public:
+            //**************************
+            // for use within the thread
+            //**************************
+
+            void SetReturnException( boost::exception_ptr excPtr );
+
+        public:
+            //******************************
+            // for use outside of the thread
+            //******************************
+
+            void SetInitiateBreakFunc( const std::function< void() >& initBreakFunc );
+            void SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc );
+
+        public:
+            MEMBERVARIABLE_REF( std::string, Name );
+            MEMBERVARIABLE( bool, BreakFlag );
+            MEMBERVARIABLE( bool, Canceled );
+            MEMBERVARIABLE_REF( boost::mutex, Mutex );
+
+        private:
+            std::function< void() > fInitiateBreakFunc;
+            std::function< void( boost_unique_lock& ) > fWaitForContinueFunc;
+    };
+
+    template< typename... XArgs >
+    class KTThreadReference : public KTThreadReferenceBase
+    {
+        private:
+            typedef KTThreadReferenceBase::boost_unique_lock boost_unique_lock;
+
         public:
             KTThreadReference();
             KTThreadReference( const KTThreadReference& ) = delete;
@@ -36,10 +76,9 @@ namespace Nymph
             // for use within the thread
             //**************************
 
-            void Break( const KTDataHandle& dataHandle, bool doBreakpoint  );
+            void Break( bool doBreakpoint, const XArgs&... dataHandle );
 
-            void SetReturnException( boost::exception_ptr excPtr );
-            void SetReturnValue( KTDataHandle dataHandle );
+            void SetReturnValue( XArgs... dataHandle );
 
         public:
             //******************************
@@ -52,23 +91,9 @@ namespace Nymph
 
             void RefreshDataPtrRet();
 
-            void SetInitiateBreakFunc( const std::function< void() >& initBreakFunc );
-            void SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc );
-
-            boost::mutex& Mutex();
-            const boost::mutex& Mutex() const;
-
-        public:
-            MEMBERVARIABLE_REF( std::string, Name );
-            MEMBERVARIABLE( bool, BreakFlag );
-            MEMBERVARIABLE( bool, Canceled );
-
         private:
             KTDataPtrReturn fDataPtrRet;
             boost::unique_future< KTDataHandle > fDataPtrRetFuture;
-            std::function< void() > fInitiateBreakFunc;
-            std::function< void( boost_unique_lock& ) > fWaitForContinueFunc;
-            boost::mutex fMutex;
     };
 
     inline void KTThreadReference::SetReturnException( boost::exception_ptr excPtr )

From d28a01ac9ec3c5e0eafc6dfe053af22df1840153 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 26 Aug 2019 09:47:54 -0700
Subject: [PATCH 131/521] Initial use of catch2

---
 CMakeLists.txt          |    14 +
 Testing/CMakeLists.txt  |    38 +
 Testing/Catch/catch.hpp | 13359 ++++++++++++++++++++++++++++++++++++++
 Testing/README.md       |    36 +
 Testing/TestExt.cc      |    88 +
 Testing/UseCatch.cc     |    10 +
 6 files changed, 13545 insertions(+)
 create mode 100644 Testing/CMakeLists.txt
 create mode 100644 Testing/Catch/catch.hpp
 create mode 100644 Testing/README.md
 create mode 100644 Testing/TestExt.cc
 create mode 100644 Testing/UseCatch.cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4010fd4..03dee56 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,4 +124,18 @@ if (Nymph_ENABLE_EXECUTABLES)
     add_subdirectory( Executables/Validation )
 endif (Nymph_ENABLE_EXECUTABLES)
 
+
+#########
+# Tests #
+#########
+
+if( Nymph_ENABLE_TESTING )
+    add_subdirectory( Testing )
+endif()
+
+
+####################################
+# Variables for the parent project #
+####################################
+
 pbuilder_variables_for_parent()
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
new file mode 100644
index 0000000..1daaf14
--- /dev/null
+++ b/Testing/CMakeLists.txt
@@ -0,0 +1,38 @@
+# CMakeLists.txt for Nymph/Testing
+# Author: N.S. Oblath
+# Created: Aug 23, 2019
+
+##########
+
+set( testing_HEADERS
+)
+
+set( testing_SOURCES
+    TestExt.cc
+    UseCatch.cc
+)
+
+set( lib_dependencies 
+    Nymph
+    Catch
+)
+
+# Interface library was recommended for Catch:
+# https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
+add_library( Catch INTERFACE )
+target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/Catch )
+
+add_executable( RunTests ${testing_SOURCES} )
+target_link_libraries( RunTests ${lib_dependencies} )
+
+# So far it seems sufficient to use Catch2's ability to run tests, and not CTest.
+# Here are two ways it could potentially be integrated with CTest, if we change our minds.
+
+# Normal CMake Integration
+#enable_testing()
+#add_test(NAME test_test COMMAND run_tests )
+
+# Automated CMake Integration
+#include(CTest)
+#include(Catch)
+#catch_discover_tests(foo)
diff --git a/Testing/Catch/catch.hpp b/Testing/Catch/catch.hpp
new file mode 100644
index 0000000..bdc2f74
--- /dev/null
+++ b/Testing/Catch/catch.hpp
@@ -0,0 +1,13359 @@
+/*
+ *  Catch v2.3.0
+ *  Generated: 2018-07-23 10:09:14.936841
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2018 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 3
+#define CATCH_VERSION_PATCH 0
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+     // GCC likes to warn on REQUIREs, and we cannot suppress them
+     // locally because g++'s support for _Pragma is lacking in older,
+     // still supported, versions
+#    pragma GCC diagnostic ignored "-Wparentheses"
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#  define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+#  define CATCH_CONFIG_EXTERNAL_INTERFACES
+#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#    undef CATCH_CONFIG_DISABLE_MATCHERS
+#  endif
+#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX == 1
+#  define CATCH_PLATFORM_MAC
+# elif TARGET_OS_IPHONE == 1
+#  define CATCH_PLATFORM_IPHONE
+# endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+    unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+#  if __cplusplus >= 201402L
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#  if __cplusplus >= 201703L
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#endif
+
+#if defined(CATCH_CPP17_OR_GREATER)
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#ifdef __clang__
+
+#       define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+            _Pragma( "clang diagnostic push" ) \
+            _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+            _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+#       define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+            _Pragma( "clang diagnostic pop" )
+
+#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            _Pragma( "clang diagnostic push" ) \
+            _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+#       define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+            _Pragma( "clang diagnostic pop" )
+
+#       define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+            _Pragma( "clang diagnostic push" ) \
+            _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+#       define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS \
+            _Pragma( "clang diagnostic pop" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#    define CATCH_CONFIG_COLOUR_NONE
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+
+// DJGPP
+#ifdef __DJGPP__
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+#   define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#   define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#   define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+#   define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+namespace Catch {
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+
+    protected:
+        NonCopyable();
+        virtual ~NonCopyable();
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+        :   file( _file ),
+            line( _line )
+        {}
+
+        SourceLineInfo( SourceLineInfo const& other )        = default;
+        SourceLineInfo( SourceLineInfo && )                  = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
+        SourceLineInfo& operator = ( SourceLineInfo && )     = default;
+
+        bool empty() const noexcept;
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() const;
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestInvoker {
+        virtual void invoke () const = 0;
+        virtual ~ITestInvoker();
+    };
+
+    using ITestCasePtr = std::shared_ptr<ITestInvoker>;
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+
+namespace Catch {
+
+    class StringData;
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated. c_str() must return a null terminated
+    /// string, however, and so the StringRef will internally take ownership
+    /// (taking a copy), if necessary. In theory this ownership is not externally
+    /// visible - but it does mean (substring) StringRefs should not be shared between
+    /// threads.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+
+    private:
+        friend struct StringRefTestAccess;
+
+        char const* m_start;
+        size_type m_size;
+
+        char* m_data = nullptr;
+
+        void takeOwnership();
+
+        static constexpr char const* const s_empty = "";
+
+    public: // construction/ assignment
+        StringRef() noexcept
+        :   StringRef( s_empty, 0 )
+        {}
+
+        StringRef( StringRef const& other ) noexcept
+        :   m_start( other.m_start ),
+            m_size( other.m_size )
+        {}
+
+        StringRef( StringRef&& other ) noexcept
+        :   m_start( other.m_start ),
+            m_size( other.m_size ),
+            m_data( other.m_data )
+        {
+            other.m_data = nullptr;
+        }
+
+        StringRef( char const* rawChars ) noexcept;
+
+        StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        ~StringRef() noexcept {
+            delete[] m_data;
+        }
+
+        auto operator = ( StringRef const &other ) noexcept -> StringRef& {
+            delete[] m_data;
+            m_data = nullptr;
+            m_start = other.m_start;
+            m_size = other.m_size;
+            return *this;
+        }
+
+        operator std::string() const;
+
+        void swap( StringRef& other ) noexcept;
+
+    public: // operators
+        auto operator == ( StringRef const& other ) const noexcept -> bool;
+        auto operator != ( StringRef const& other ) const noexcept -> bool;
+
+        auto operator[] ( size_type index ) const noexcept -> char;
+
+    public: // named queries
+        auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        auto numberOfCharacters() const noexcept -> size_type;
+        auto c_str() const -> char const*;
+
+    public: // substrings and searches
+        auto substr( size_type start, size_type size ) const noexcept -> StringRef;
+
+        // Returns the current start pointer.
+        // Note that the pointer can change when if the StringRef is a substring
+        auto currentData() const noexcept -> char const*;
+
+    private: // ownership queries - may not be consistent between calls
+        auto isOwned() const noexcept -> bool;
+        auto isSubstring() const noexcept -> bool;
+    };
+
+    auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string;
+    auto operator + ( StringRef const& lhs, char const* rhs ) -> std::string;
+    auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string;
+
+    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+    inline auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+
+} // namespace Catch
+
+// end catch_stringref.h
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+    ~AutoReg();
+};
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF ClassName) { \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+
+        // We want to delete this constructor but a compiler bug in 4.8 means
+        // the struct is then treated as non-aggregate
+        //AssertionInfo() = delete;
+    };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    class StringRef;
+
+    struct IStream {
+        virtual ~IStream();
+        virtual std::ostream& stream() const = 0;
+    };
+
+    auto makeStream( StringRef const &filename ) -> IStream const*;
+
+    class ReusableStringStream {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        auto str() const -> std::string;
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+        auto get() -> std::ostream& { return *m_oss; }
+
+        static void cleanup();
+    };
+}
+
+// end catch_stream.h
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+    // Bring in operator<< from global namespace into Catch namespace
+    using ::operator<<;
+
+    namespace Detail {
+
+        extern const std::string unprintableString;
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename SS, typename TT>
+            static auto test(int)
+                -> decltype(std::declval<SS&>() << std::declval<TT>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string>::type convertUnstreamable( T const& ) {
+            return Detail::unprintableString;
+        }
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string>::type convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+        template<typename T>
+        typename std::enable_if<
+            std::is_enum<T>::value
+        , std::string>::type convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+    // If we decide for C++14, change these to enable_if_ts
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif
+
+    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+    //      while keeping string semantics?
+    template<int SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return ::Catch::Detail::stringify(std::string{ str });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b);
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char c);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char c);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t);
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+    };
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator>
+        std::string rangeToString(InputIterator first, InputIterator last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+#ifdef __OBJC__
+    template<>
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString * nsstring) {
+            if (!nsstring)
+                return "nil";
+            return std::string("@") + [nsstring UTF8String];
+        }
+    };
+    template<>
+    struct StringMaker<NSObject*> {
+        static std::string convert(NSObject* nsObject) {
+            return ::Catch::Detail::stringify([nsObject description]);
+        }
+
+    };
+    namespace Detail {
+        inline std::string stringify( NSString* nsstring ) {
+            return StringMaker<NSString*>::convert( nsstring );
+        }
+
+    } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+namespace Catch {
+    struct not_this_one {}; // Tag type for detecting which begin/ end are being selected
+
+    // Import begin/ end from std here so they are considered alongside the fallback (...) overloads in this namespace
+    using std::begin;
+    using std::end;
+
+    not_this_one begin( ... );
+    not_this_one end( ... );
+
+    template <typename T>
+    struct is_range {
+        static const bool value =
+            !std::is_same<decltype(begin(std::declval<T>())), not_this_one>::value &&
+            !std::is_same<decltype(end(std::declval<T>())), not_this_one>::value;
+    };
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, int SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+    Catch::ReusableStringStream rss;
+    rss << '[' << Ratio::num << '/'
+        << Ratio::den << ']';
+    return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+    static std::string symbol();
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#endif
+
+namespace Catch {
+
+    struct ITransientExpression {
+        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        auto getResult() const -> bool { return m_result; }
+        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+        ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        // We don't actually need a virtual destructor, but many static analysers
+        // complain if it's not here :-(
+        virtual ~ITransientExpression();
+
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, lhs ? true : false },
+            m_lhs( lhs )
+        {}
+    };
+
+    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+    template<typename LhsT, typename RhsT>
+    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+    template<typename T>
+    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+    template<typename LhsT, typename RhsT>
+    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+    template<typename T>
+    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+        template<typename RhsT>
+        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+        }
+        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs == rhs, m_lhs, "==", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+        }
+        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs != rhs, m_lhs, "!=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+        }
+        template<typename RhsT>
+        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+        }
+        template<typename RhsT>
+        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+        }
+        template<typename RhsT>
+        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+        }
+
+        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    void handleExpression( ITransientExpression const& expr );
+
+    template<typename T>
+    void handleExpression( ExprLhs<T> const& expr ) {
+        handleExpression( expr.makeUnaryExpr() );
+    }
+
+    struct Decomposer {
+        template<typename T>
+        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<T const&>{ lhs };
+        }
+
+        auto operator <=( bool value ) -> ExprLhs<bool> {
+            return ExprLhs<bool>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct Counts;
+    struct BenchmarkInfo;
+    struct BenchmarkStats;
+    struct AssertionReaction;
+
+    struct ITransientExpression;
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats const& stats ) = 0;
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+    struct TestFailureException{};
+    struct AssertionResultData;
+    struct IResultCapture;
+    class RunContext;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated );
+        LazyExpression( LazyExpression const& other );
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const;
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+        void setCompleted();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    std::string const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        std::string macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const;
+        bool operator < ( MessageInfo const& other ) const;
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( std::string const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type );
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder const& builder );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+    };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+            CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, false && static_cast<bool>( !!(__VA_ARGS__) ) ) // the expression here is never evaluated at runtime but it forces the compiler to give it a look
+    // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            static_cast<void>(__VA_ARGS__); \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::size_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::size_t passed = 0;
+        std::size_t failed = 0;
+        std::size_t failedButOk = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        int error = 0;
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name );
+
+        // Deprecated
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+        std::string name;
+        std::string description; // !Deprecated: this will always be empty
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+    auto getEstimatedClockResolution() -> uint64_t;
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+    CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+    CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+
+// end catch_section.h
+// start catch_benchmark.h
+
+#include <cstdint>
+#include <string>
+
+namespace Catch {
+
+    class BenchmarkLooper {
+
+        std::string m_name;
+        std::size_t m_count = 0;
+        std::size_t m_iterationsToRun = 1;
+        uint64_t m_resolution;
+        Timer m_timer;
+
+        static auto getResolution() -> uint64_t;
+    public:
+        // Keep most of this inline as it's on the code path that is being timed
+        BenchmarkLooper( StringRef name )
+        :   m_name( name ),
+            m_resolution( getResolution() )
+        {
+            reportStart();
+            m_timer.start();
+        }
+
+        explicit operator bool() {
+            if( m_count < m_iterationsToRun )
+                return true;
+            return needsMoreIterations();
+        }
+
+        void increment() {
+            ++m_count;
+        }
+
+        void reportStart();
+        auto needsMoreIterations() -> bool;
+    };
+
+} // end namespace Catch
+
+#define BENCHMARK( name ) \
+    for( Catch::BenchmarkLooper looper( name ); looper; looper.increment() )
+
+// end catch_benchmark.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+    class StartupExceptionRegistry;
+
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+
+        virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+    };
+
+    IRegistryHub& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+        static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    struct IExceptionTranslator;
+    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+#include <stdexcept>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T const& value ) {
+            Approx approx( static_cast<double>(value) );
+            approx.epsilon( m_epsilon );
+            approx.margin( m_margin );
+            approx.scale( m_scale );
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T const& newEpsilon ) {
+            double epsilonAsDouble = static_cast<double>(newEpsilon);
+            if( epsilonAsDouble < 0 || epsilonAsDouble > 1.0 ) {
+                throw std::domain_error
+                    (   "Invalid Approx::epsilon: " +
+                        Catch::Detail::stringify( epsilonAsDouble ) +
+                        ", Approx::epsilon has to be between 0 and 1" );
+            }
+            m_epsilon = epsilonAsDouble;
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T const& newMargin ) {
+            double marginAsDouble = static_cast<double>(newMargin);
+            if( marginAsDouble < 0 ) {
+                throw std::domain_error
+                    (   "Invalid Approx::margin: " +
+                         Catch::Detail::stringify( marginAsDouble ) +
+                         ", Approx::Margin has to be non-negative." );
+
+            }
+            m_margin = marginAsDouble;
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val);
+    Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+    static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    std::string trim( std::string const& str );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            MatcherUntypedBase() = default;
+            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+            std::string toString() const;
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        };
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+        template<typename PtrT>
+        struct MatcherMethod<PtrT*> {
+            virtual bool match( PtrT* arg ) const = 0;
+        };
+
+        template<typename T>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<T> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT>& operator && ( MatcherBase<ArgT> const& other ) {
+                m_matchers.push_back( &other );
+                return *this;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT>& operator || ( MatcherBase<ArgT> const& other ) {
+                m_matchers.push_back( &other );
+                return *this;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename T>
+        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<T>() && *this && other;
+        }
+        template<typename T>
+        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<T>() || *this || other;
+        }
+        template<typename T>
+        MatchNotOf<T> MatcherBase<T>::operator ! () const {
+            return MatchNotOf<T>( *this );
+        }
+
+    } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_floating.h
+
+#include <type_traits>
+#include <cmath>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Floating {
+
+        enum class FloatingPointKind : uint8_t;
+
+        struct WithinAbsMatcher : MatcherBase<double> {
+            WithinAbsMatcher(double target, double margin);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_margin;
+        };
+
+        struct WithinUlpsMatcher : MatcherBase<double> {
+            WithinUlpsMatcher(double target, int ulps, FloatingPointKind baseType);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            int m_ulps;
+            FloatingPointKind m_type;
+        };
+
+    } // namespace Floating
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    Floating::WithinUlpsMatcher WithinULP(double target, int maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, int maxUlpDiff);
+    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+    std::function<bool(T const&)> m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+        :m_predicate(std::move(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+} // namespace Generic
+
+    // The following functions create the actual matcher objects.
+    // The user has to explicitly specify type to the function, because
+    // infering std::function<bool(T const&)> is hard (but possible) and
+    // requires a lot of TMP.
+    template<typename T>
+    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+        return Generic::PredicateMatcher<T>(predicate, description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            std::string describe() const override;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+
+        struct RegexMatcher : MatcherBase<std::string> {
+            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+            bool match( std::string const& matchee ) const override;
+            std::string describe() const override;
+
+        private:
+            std::string m_regex;
+            CaseSensitive::Choice m_caseSensitivity;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+        namespace Detail {
+            template <typename InputIterator, typename T>
+            size_t count(InputIterator first, InputIterator last, T const& item) {
+                size_t cnt = 0;
+                for (; first != last; ++first) {
+                    if (*first == item) {
+                        ++cnt;
+                    }
+                }
+                return cnt;
+            }
+            template <typename InputIterator, typename T>
+            bool contains(InputIterator first, InputIterator last, T const& item) {
+                for (; first != last; ++first) {
+                    if (*first == item) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        template<typename T>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T>> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T> const &v) const override {
+                for (auto const& el : v) {
+                    if (el == m_comparator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T>
+        struct ContainsMatcher : MatcherBase<std::vector<T>> {
+
+            ContainsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const override {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (auto const& comparator : m_comparator) {
+                    auto present = false;
+                    for (const auto& el : v) {
+                        if (el == comparator) {
+                            present = true;
+                            break;
+                        }
+                    }
+                    if (!present) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            std::vector<T> const& m_comparator;
+        };
+
+        template<typename T>
+        struct EqualsMatcher : MatcherBase<std::vector<T>> {
+
+            EqualsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const override {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            std::vector<T> const& m_comparator;
+        };
+
+        template<typename T>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T>> {
+            UnorderedEqualsMatcher(std::vector<T> const& target) : m_target(target) {}
+            bool match(std::vector<T> const& vec) const override {
+                // Note: This is a reimplementation of std::is_permutation,
+                //       because I don't want to include <algorithm> inside the common path
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                auto lfirst = m_target.begin(), llast = m_target.end();
+                auto rfirst = vec.begin(), rlast = vec.end();
+                // Cut common prefix to optimize checking of permuted parts
+                while (lfirst != llast && *lfirst != *rfirst) {
+                    ++lfirst; ++rfirst;
+                }
+                if (lfirst == llast) {
+                    return true;
+                }
+
+                for (auto mid = lfirst; mid != llast; ++mid) {
+                    // Skip already counted items
+                    if (Detail::contains(lfirst, mid, *mid)) {
+                        continue;
+                    }
+                    size_t num_vec = Detail::count(rfirst, rlast, *mid);
+                    if (num_vec == 0 || Detail::count(lfirst, llast, *mid) != num_vec) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            std::string describe() const override {
+                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+            }
+        private:
+            std::vector<T> const& m_target;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T>
+    Vector::ContainsMatcher<T> Contains( std::vector<T> const& comparator ) {
+        return Vector::ContainsMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::ContainsElementMatcher<T> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::EqualsMatcher<T> Equals( std::vector<T> const& comparator ) {
+        return Vector::EqualsMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::UnorderedEqualsMatcher<T> UnorderedEquals(std::vector<T> const& target) {
+        return Vector::UnorderedEqualsMatcher<T>(target);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT const& m_arg;
+        MatcherT m_matcher;
+        StringRef m_matcherString;
+    public:
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef matcherString )
+        :   ITransientExpression{ true, matcher.match( arg ) },
+            m_arg( arg ),
+            m_matcher( matcher ),
+            m_matcherString( matcherString )
+        {}
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            auto matcherAsString = m_matcher.toString();
+            os << Catch::Detail::stringify( m_arg ) << ' ';
+            if( matcherAsString == Detail::unprintableString )
+                os << m_matcherString;
+            else
+                os << matcherAsString;
+        }
+    };
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString  );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+    }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+// end catch_capture_matchers.h
+#endif
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestInvoker;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* arg ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+#ifdef CATCH_CONFIG_EXTERNAL_INTERFACES
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string adjustCase( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    class TestSpec {
+        struct Pattern {
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            NamePattern( std::string const& name );
+            virtual ~NamePattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            TagPattern( std::string const& tag );
+            virtual ~TagPattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            ExcludedPattern( PatternPtr const& underlyingPattern );
+            virtual ~ExcludedPattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+        };
+
+    public:
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+
+    private:
+        std::vector<Filter> m_filters;
+
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        bool m_exclusion = false;
+        std::size_t m_start = std::string::npos, m_pos = 0;
+        std::string m_arg;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        void visitChar( char c );
+        void startNewMode( Mode mode, std::size_t start );
+        void escape();
+        std::string subString() const;
+
+        template<typename T>
+        void addPattern() {
+            std::string token = subString();
+            for( std::size_t i = 0; i < m_escapeChars.size(); ++i )
+                token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 );
+            m_escapeChars.clear();
+            if( startsWith( token, "exclude:" ) ) {
+                m_exclusion = true;
+                token = token.substr( 8 );
+            }
+            if( !token.empty() ) {
+                TestSpec::PatternPtr pattern = std::make_shared<T>( token );
+                if( m_exclusion )
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>( pattern );
+                m_currentFilter.m_patterns.push_back( pattern );
+            }
+            m_exclusion = false;
+            m_mode = None;
+        }
+
+        void addFilter();
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// start catch_interfaces_config.h
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01,
+        NoTests = 0x02
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : NonCopyable {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutNoTests() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual int benchmarkResolutionMultiple() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+    };
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+        int benchmarkResolutionMultiple = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        virtual TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        int benchmarkResolutionMultiple() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+// start catch_option.hpp
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        bool shouldRedirectStdOut = false;
+        bool shouldReportAllAssertions = false;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = default;
+        AssertionStats& operator = ( AssertionStats && )     = default;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct BenchmarkInfo {
+        std::string name;
+    };
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+        std::size_t iterations;
+        uint64_t elapsedTimeInNanoseconds;
+    };
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+        // *** experimental ***
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        // *** experimental ***
+        virtual void benchmarkEnded( BenchmarkStats const& ) {}
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                throw std::domain_error( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                throw std::domain_error( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            virtual std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            virtual std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+     CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS   \
+     namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+     CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats const& stats) override;
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, bool indent = true );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+        };
+
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name );
+
+        ScopedElement scopedElement( std::string const& name );
+
+        XmlWriter& endElement();
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, bool indent = true );
+
+        XmlWriter& writeComment( std::string const& text );
+
+        void writeStylesheetRef( std::string const& url );
+
+        XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+    private:
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection(std::string const& className,
+                          std::string const& rootName,
+                          SectionNode const& sectionNode);
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+    };
+
+    struct ITracker;
+
+    using ITrackerPtr = std::shared_ptr<ITracker>;
+
+    struct ITracker {
+        virtual ~ITracker();
+
+        // static queries
+        virtual NameAndLocation const& nameAndLocation() const = 0;
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( ITrackerPtr const& child ) = 0;
+        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isIndexTracker() const = 0;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        static TrackerContext& instance();
+
+        ITracker& startRun();
+        void endRun();
+
+        void startCycle();
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker();
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        class TrackerHasName {
+            NameAndLocation m_nameAndLocation;
+        public:
+            TrackerHasName( NameAndLocation const& nameAndLocation );
+            bool operator ()( ITrackerPtr const& tracker ) const;
+        };
+
+        using Children = std::vector<ITrackerPtr>;
+        NameAndLocation m_nameAndLocation;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        NameAndLocation const& nameAndLocation() const override;
+        bool isComplete() const override;
+        bool isSuccessfullyCompleted() const override;
+        bool isOpen() const override;
+        bool hasChildren() const override;
+
+        void addChild( ITrackerPtr const& child ) override;
+
+        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+        ITracker& parent() override;
+
+        void openChild() override;
+
+        bool isSectionTracker() const override;
+        bool isIndexTracker() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+        void markAsNeedingAnotherRun() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<std::string> const& filters );
+    };
+
+    class IndexTracker : public TrackerBase {
+        int m_size;
+        int m_index = -1;
+    public:
+        IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size );
+
+        bool isIndexTracker() const override;
+        void close() override;
+
+        static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size );
+
+        int index() const;
+
+        void moveNext();
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+using TestCaseTracking::IndexTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+    };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin) || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(m_value)));
+    }
+
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
+
+    private:
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
+    };
+
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        return *IMutableContext::currentContext;
+    }
+
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext();
+}
+
+// end catch_context.h
+// start catch_debugger.h
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifdef CATCH_TRAP
+    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { CATCH_TRAP(); }
+#else
+    namespace Catch {
+        inline void doNothing() {}
+    }
+    #define CATCH_BREAK_INTO_DEBUGGER() Catch::doNothing()
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+        FatalConditionHandler();
+        static void reset();
+        ~FatalConditionHandler();
+
+    private:
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static PVOID exceptionHandlerHandle;
+    };
+
+} // namespace Catch
+
+#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static bool isSet;
+        static struct sigaction oldSigActions[];
+        static stack_t oldSigStack;
+        static char altStackMem[];
+
+        static void handleSignal( int sig );
+
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+        static void reset();
+    };
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset();
+    };
+}
+
+#endif
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+    struct IMutableContext;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+        ~RunContext() override;
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+        Totals runTest(TestCase const& testCase);
+
+        IConfigPtr config() const;
+        IStreamingReporter& reporter() const;
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo const& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats const& stats ) override;
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const final;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult const& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker;
+        Option<AssertionResult> m_lastResult;
+
+        IConfigPtr m_config;
+        Totals m_totals;
+        IStreamingReporterPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+    namespace {
+        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+            expr.streamReconstructedExpression( os );
+            return os;
+        }
+    }
+
+    LazyExpression::LazyExpression( bool isNegated )
+    :   m_isNegated( isNegated )
+    {}
+
+    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+    LazyExpression::operator bool() const {
+        return m_transientExpression != nullptr;
+    }
+
+    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+        if( lazyExpr.m_isNegated )
+            os << "!";
+
+        if( lazyExpr ) {
+            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+                os << "(" << *lazyExpr.m_transientExpression << ")";
+            else
+                os << *lazyExpr.m_transientExpression;
+        }
+        else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+    AssertionHandler::AssertionHandler
+        (   StringRef macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {}
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        setCompleted();
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if( m_reaction.shouldThrow )
+            throw Catch::TestFailureException();
+    }
+    void AssertionHandler::setCompleted() {
+        m_completed = true;
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef matcherString  ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+    }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return m_info.capturedExpression[0] != 0;
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        if( isFalseTest( m_info.resultDisposition ) )
+            return "!(" + m_info.capturedExpression + ")";
+        else
+            return m_info.capturedExpression;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        std::string expr;
+        if( m_info.macroName[0] == 0 )
+            expr = m_info.capturedExpression;
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_benchmark.cpp
+
+namespace Catch {
+
+    auto BenchmarkLooper::getResolution() -> uint64_t {
+        return getEstimatedClockResolution() * getCurrentContext().getConfig()->benchmarkResolutionMultiple();
+    }
+
+    void BenchmarkLooper::reportStart() {
+        getResultCapture().benchmarkStarting( { m_name } );
+    }
+    auto BenchmarkLooper::needsMoreIterations() -> bool {
+        auto elapsed = m_timer.getElapsedNanoseconds();
+
+        // Exponentially increasing iterations until we're confident in our timer resolution
+        if( elapsed < m_resolution ) {
+            m_iterationsToRun *= 10;
+            return true;
+        }
+
+        getResultCapture().benchmarkEnded( { { m_name }, m_count, elapsed } );
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_benchmark.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString  ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.4
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// This work is licensed under the BSD 2-Clause license.
+// See the accompanying LICENSE file, or the one at https://opensource.org/licenses/BSD-2-Clause
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch { namespace clara { namespace TextFlow {
+
+    inline auto isWhitespace( char c ) -> bool {
+        static std::string chars = " \t\n\r";
+        return chars.find( c ) != std::string::npos;
+    }
+    inline auto isBreakableBefore( char c ) -> bool {
+        static std::string chars = "[({<|";
+        return chars.find( c ) != std::string::npos;
+    }
+    inline auto isBreakableAfter( char c ) -> bool {
+        static std::string chars = "])}>.,:;*+-=&/\\";
+        return chars.find( c ) != std::string::npos;
+    }
+
+    class Columns;
+
+    class Column {
+        std::vector<std::string> m_strings;
+        size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+        size_t m_indent = 0;
+        size_t m_initialIndent = std::string::npos;
+
+    public:
+        class iterator {
+            friend Column;
+
+            Column const& m_column;
+            size_t m_stringIndex = 0;
+            size_t m_pos = 0;
+
+            size_t m_len = 0;
+            size_t m_end = 0;
+            bool m_suffix = false;
+
+            iterator( Column const& column, size_t stringIndex )
+            :   m_column( column ),
+                m_stringIndex( stringIndex )
+            {}
+
+            auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+            auto isBoundary( size_t at ) const -> bool {
+                assert( at > 0 );
+                assert( at <= line().size() );
+
+                return at == line().size() ||
+                       ( isWhitespace( line()[at] ) && !isWhitespace( line()[at-1] ) ) ||
+                       isBreakableBefore( line()[at] ) ||
+                       isBreakableAfter( line()[at-1] );
+            }
+
+            void calcLength() {
+                assert( m_stringIndex < m_column.m_strings.size() );
+
+                m_suffix = false;
+                auto width = m_column.m_width-indent();
+                m_end = m_pos;
+                while( m_end < line().size() && line()[m_end] != '\n' )
+                    ++m_end;
+
+                if( m_end < m_pos + width ) {
+                    m_len = m_end - m_pos;
+                }
+                else {
+                    size_t len = width;
+                    while (len > 0 && !isBoundary(m_pos + len))
+                        --len;
+                    while (len > 0 && isWhitespace( line()[m_pos + len - 1] ))
+                        --len;
+
+                    if (len > 0) {
+                        m_len = len;
+                    } else {
+                        m_suffix = true;
+                        m_len = width - 1;
+                    }
+                }
+            }
+
+            auto indent() const -> size_t {
+                auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+                return initial == std::string::npos ? m_column.m_indent : initial;
+            }
+
+            auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+                return std::string( indent(), ' ' ) + (m_suffix ? plain + "-" : plain);
+            }
+
+        public:
+            explicit iterator( Column const& column ) : m_column( column ) {
+                assert( m_column.m_width > m_column.m_indent );
+                assert( m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent );
+                calcLength();
+                if( m_len == 0 )
+                    m_stringIndex++; // Empty string
+            }
+
+            auto operator *() const -> std::string {
+                assert( m_stringIndex < m_column.m_strings.size() );
+                assert( m_pos <= m_end );
+                if( m_pos + m_column.m_width < m_end )
+                    return addIndentAndSuffix(line().substr(m_pos, m_len));
+                else
+                    return addIndentAndSuffix(line().substr(m_pos, m_end - m_pos));
+            }
+
+            auto operator ++() -> iterator& {
+                m_pos += m_len;
+                if( m_pos < line().size() && line()[m_pos] == '\n' )
+                    m_pos += 1;
+                else
+                    while( m_pos < line().size() && isWhitespace( line()[m_pos] ) )
+                        ++m_pos;
+
+                if( m_pos == line().size() ) {
+                    m_pos = 0;
+                    ++m_stringIndex;
+                }
+                if( m_stringIndex < m_column.m_strings.size() )
+                    calcLength();
+                return *this;
+            }
+            auto operator ++(int) -> iterator {
+                iterator prev( *this );
+                operator++();
+                return prev;
+            }
+
+            auto operator ==( iterator const& other ) const -> bool {
+                return
+                    m_pos == other.m_pos &&
+                    m_stringIndex == other.m_stringIndex &&
+                    &m_column == &other.m_column;
+            }
+            auto operator !=( iterator const& other ) const -> bool {
+                return !operator==( other );
+            }
+        };
+        using const_iterator = iterator;
+
+        explicit Column( std::string const& text ) { m_strings.push_back( text ); }
+
+        auto width( size_t newWidth ) -> Column& {
+            assert( newWidth > 0 );
+            m_width = newWidth;
+            return *this;
+        }
+        auto indent( size_t newIndent ) -> Column& {
+            m_indent = newIndent;
+            return *this;
+        }
+        auto initialIndent( size_t newIndent ) -> Column& {
+            m_initialIndent = newIndent;
+            return *this;
+        }
+
+        auto width() const -> size_t { return m_width; }
+        auto begin() const -> iterator { return iterator( *this ); }
+        auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+        inline friend std::ostream& operator << ( std::ostream& os, Column const& col ) {
+            bool first = true;
+            for( auto line : col ) {
+                if( first )
+                    first = false;
+                else
+                    os << "\n";
+                os <<  line;
+            }
+            return os;
+        }
+
+        auto operator + ( Column const& other ) -> Columns;
+
+        auto toString() const -> std::string {
+            std::ostringstream oss;
+            oss << *this;
+            return oss.str();
+        }
+    };
+
+    class Spacer : public Column {
+
+    public:
+        explicit Spacer( size_t spaceWidth ) : Column( "" ) {
+            width( spaceWidth );
+        }
+    };
+
+    class Columns {
+        std::vector<Column> m_columns;
+
+    public:
+
+        class iterator {
+            friend Columns;
+            struct EndTag {};
+
+            std::vector<Column> const& m_columns;
+            std::vector<Column::iterator> m_iterators;
+            size_t m_activeIterators;
+
+            iterator( Columns const& columns, EndTag )
+            :   m_columns( columns.m_columns ),
+                m_activeIterators( 0 )
+            {
+                m_iterators.reserve( m_columns.size() );
+
+                for( auto const& col : m_columns )
+                    m_iterators.push_back( col.end() );
+            }
+
+        public:
+            explicit iterator( Columns const& columns )
+            :   m_columns( columns.m_columns ),
+                m_activeIterators( m_columns.size() )
+            {
+                m_iterators.reserve( m_columns.size() );
+
+                for( auto const& col : m_columns )
+                    m_iterators.push_back( col.begin() );
+            }
+
+            auto operator ==( iterator const& other ) const -> bool {
+                return m_iterators == other.m_iterators;
+            }
+            auto operator !=( iterator const& other ) const -> bool {
+                return m_iterators != other.m_iterators;
+            }
+            auto operator *() const -> std::string {
+                std::string row, padding;
+
+                for( size_t i = 0; i < m_columns.size(); ++i ) {
+                    auto width = m_columns[i].width();
+                    if( m_iterators[i] != m_columns[i].end() ) {
+                        std::string col = *m_iterators[i];
+                        row += padding + col;
+                        if( col.size() < width )
+                            padding = std::string( width - col.size(), ' ' );
+                        else
+                            padding = "";
+                    }
+                    else {
+                        padding += std::string( width, ' ' );
+                    }
+                }
+                return row;
+            }
+            auto operator ++() -> iterator& {
+                for( size_t i = 0; i < m_columns.size(); ++i ) {
+                    if (m_iterators[i] != m_columns[i].end())
+                        ++m_iterators[i];
+                }
+                return *this;
+            }
+            auto operator ++(int) -> iterator {
+                iterator prev( *this );
+                operator++();
+                return prev;
+            }
+        };
+        using const_iterator = iterator;
+
+        auto begin() const -> iterator { return iterator( *this ); }
+        auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+        auto operator += ( Column const& col ) -> Columns& {
+            m_columns.push_back( col );
+            return *this;
+        }
+        auto operator + ( Column const& col ) -> Columns {
+            Columns combined = *this;
+            combined += col;
+            return combined;
+        }
+
+        inline friend std::ostream& operator << ( std::ostream& os, Columns const& cols ) {
+
+            bool first = true;
+            for( auto line : cols ) {
+                if( first )
+                    first = false;
+                else
+                    os << "\n";
+                os << line;
+            }
+            return os;
+        }
+
+        auto toString() const -> std::string {
+            std::ostringstream oss;
+            oss << *this;
+            return oss.str();
+        }
+    };
+
+    inline auto Column::operator + ( Column const& other ) -> Columns {
+        Columns cols;
+        cols += *this;
+        cols += other;
+        return cols;
+    }
+}}} // namespace Catch::clara::TextFlow
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+    template<typename L>
+    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+    template<typename ClassT, typename ReturnT, typename... Args>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+        static const bool isValid = false;
+    };
+
+    template<typename ClassT, typename ReturnT, typename ArgT>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+        static const bool isValid = true;
+        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+        using ReturnType = ReturnT;
+    };
+
+    class TokenStream;
+
+    // Transport for raw args (copied from main args, or supplied via init list for testing)
+    class Args {
+        friend TokenStream;
+        std::string m_exeName;
+        std::vector<std::string> m_args;
+
+    public:
+        Args( int argc, char const* const* argv )
+            : m_exeName(argv[0]),
+              m_args(argv + 1, argv + argc) {}
+
+        Args( std::initializer_list<std::string> args )
+        :   m_exeName( *args.begin() ),
+            m_args( args.begin()+1, args.end() )
+        {}
+
+        auto exeName() const -> std::string {
+            return m_exeName;
+        }
+    };
+
+    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+    // may encode an option + its argument if the : or = form is used
+    enum class TokenType {
+        Option, Argument
+    };
+    struct Token {
+        TokenType type;
+        std::string token;
+    };
+
+    inline auto isOptPrefix( char c ) -> bool {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+            || c == '/'
+#endif
+        ;
+    }
+
+    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+    class TokenStream {
+        using Iterator = std::vector<std::string>::const_iterator;
+        Iterator it;
+        Iterator itEnd;
+        std::vector<Token> m_tokenBuffer;
+
+        void loadBuffer() {
+            m_tokenBuffer.resize( 0 );
+
+            // Skip any empty strings
+            while( it != itEnd && it->empty() )
+                ++it;
+
+            if( it != itEnd ) {
+                auto const &next = *it;
+                if( isOptPrefix( next[0] ) ) {
+                    auto delimiterPos = next.find_first_of( " :=" );
+                    if( delimiterPos != std::string::npos ) {
+                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+                    } else {
+                        if( next[1] != '-' && next.size() > 2 ) {
+                            std::string opt = "- ";
+                            for( size_t i = 1; i < next.size(); ++i ) {
+                                opt[1] = next[i];
+                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
+                            }
+                        } else {
+                            m_tokenBuffer.push_back( { TokenType::Option, next } );
+                        }
+                    }
+                } else {
+                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
+                }
+            }
+        }
+
+    public:
+        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+            loadBuffer();
+        }
+
+        explicit operator bool() const {
+            return !m_tokenBuffer.empty() || it != itEnd;
+        }
+
+        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+        auto operator*() const -> Token {
+            assert( !m_tokenBuffer.empty() );
+            return m_tokenBuffer.front();
+        }
+
+        auto operator->() const -> Token const * {
+            assert( !m_tokenBuffer.empty() );
+            return &m_tokenBuffer.front();
+        }
+
+        auto operator++() -> TokenStream & {
+            if( m_tokenBuffer.size() >= 2 ) {
+                m_tokenBuffer.erase( m_tokenBuffer.begin() );
+            } else {
+                if( it != itEnd )
+                    ++it;
+                loadBuffer();
+            }
+            return *this;
+        }
+    };
+
+    class ResultBase {
+    public:
+        enum Type {
+            Ok, LogicError, RuntimeError
+        };
+
+    protected:
+        ResultBase( Type type ) : m_type( type ) {}
+        virtual ~ResultBase() = default;
+
+        virtual void enforceOk() const = 0;
+
+        Type m_type;
+    };
+
+    template<typename T>
+    class ResultValueBase : public ResultBase {
+    public:
+        auto value() const -> T const & {
+            enforceOk();
+            return m_value;
+        }
+
+    protected:
+        ResultValueBase( Type type ) : ResultBase( type ) {}
+
+        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+        }
+
+        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+            new( &m_value ) T( value );
+        }
+
+        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+            if( m_type == ResultBase::Ok )
+                m_value.~T();
+            ResultBase::operator=(other);
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+            return *this;
+        }
+
+        ~ResultValueBase() override {
+            if( m_type == Ok )
+                m_value.~T();
+        }
+
+        union {
+            T m_value;
+        };
+    };
+
+    template<>
+    class ResultValueBase<void> : public ResultBase {
+    protected:
+        using ResultBase::ResultBase;
+    };
+
+    template<typename T = void>
+    class BasicResult : public ResultValueBase<T> {
+    public:
+        template<typename U>
+        explicit BasicResult( BasicResult<U> const &other )
+        :   ResultValueBase<T>( other.type() ),
+            m_errorMessage( other.errorMessage() )
+        {
+            assert( type() != ResultBase::Ok );
+        }
+
+        template<typename U>
+        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+        explicit operator bool() const { return m_type == ResultBase::Ok; }
+        auto type() const -> ResultBase::Type { return m_type; }
+        auto errorMessage() const -> std::string { return m_errorMessage; }
+
+    protected:
+        void enforceOk() const override {
+
+            // Errors shouldn't reach this point, but if they do
+            // the actual error message will be in m_errorMessage
+            assert( m_type != ResultBase::LogicError );
+            assert( m_type != ResultBase::RuntimeError );
+            if( m_type != ResultBase::Ok )
+                std::abort();
+        }
+
+        std::string m_errorMessage; // Only populated if resultType is an error
+
+        BasicResult( ResultBase::Type type, std::string const &message )
+        :   ResultValueBase<T>(type),
+            m_errorMessage(message)
+        {
+            assert( m_type != ResultBase::Ok );
+        }
+
+        using ResultValueBase<T>::ResultValueBase;
+        using ResultBase::m_type;
+    };
+
+    enum class ParseResultType {
+        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+    };
+
+    class ParseState {
+    public:
+
+        ParseState( ParseResultType type, TokenStream const &remainingTokens )
+        : m_type(type),
+          m_remainingTokens( remainingTokens )
+        {}
+
+        auto type() const -> ParseResultType { return m_type; }
+        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+    private:
+        ParseResultType m_type;
+        TokenStream m_remainingTokens;
+    };
+
+    using Result = BasicResult<void>;
+    using ParserResult = BasicResult<ParseResultType>;
+    using InternalParseResult = BasicResult<ParseState>;
+
+    struct HelpColumns {
+        std::string left;
+        std::string right;
+    };
+
+    template<typename T>
+    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+        std::stringstream ss;
+        ss << source;
+        ss >> target;
+        if( ss.fail() )
+            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+        else
+            return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+        target = source;
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+        std::string srcLC = source;
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( ::tolower(c) ); } );
+        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+            target = true;
+        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+            target = false;
+        else
+            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+    template<typename T>
+    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+        T temp;
+        auto result = convertInto( source, temp );
+        if( result )
+            target = std::move(temp);
+        return result;
+    }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+    struct NonCopyable {
+        NonCopyable() = default;
+        NonCopyable( NonCopyable const & ) = delete;
+        NonCopyable( NonCopyable && ) = delete;
+        NonCopyable &operator=( NonCopyable const & ) = delete;
+        NonCopyable &operator=( NonCopyable && ) = delete;
+    };
+
+    struct BoundRef : NonCopyable {
+        virtual ~BoundRef() = default;
+        virtual auto isContainer() const -> bool { return false; }
+        virtual auto isFlag() const -> bool { return false; }
+    };
+    struct BoundValueRefBase : BoundRef {
+        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+    };
+    struct BoundFlagRefBase : BoundRef {
+        virtual auto setFlag( bool flag ) -> ParserResult = 0;
+        virtual auto isFlag() const -> bool { return true; }
+    };
+
+    template<typename T>
+    struct BoundValueRef : BoundValueRefBase {
+        T &m_ref;
+
+        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return convertInto( arg, m_ref );
+        }
+    };
+
+    template<typename T>
+    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+        std::vector<T> &m_ref;
+
+        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+        auto isContainer() const -> bool override { return true; }
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            T temp;
+            auto result = convertInto( arg, temp );
+            if( result )
+                m_ref.push_back( temp );
+            return result;
+        }
+    };
+
+    struct BoundFlagRef : BoundFlagRefBase {
+        bool &m_ref;
+
+        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            m_ref = flag;
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ReturnType>
+    struct LambdaInvoker {
+        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            return lambda( arg );
+        }
+    };
+
+    template<>
+    struct LambdaInvoker<void> {
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            lambda( arg );
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ArgType, typename L>
+    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+        ArgType temp{};
+        auto result = convertInto( arg, temp );
+        return !result
+           ? result
+           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+    }
+
+    template<typename L>
+    struct BoundLambda : BoundValueRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+        }
+    };
+
+    template<typename L>
+    struct BoundFlagLambda : BoundFlagRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+        }
+    };
+
+    enum class Optionality { Optional, Required };
+
+    struct Parser;
+
+    class ParserBase {
+    public:
+        virtual ~ParserBase() = default;
+        virtual auto validate() const -> Result { return Result::ok(); }
+        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
+        virtual auto cardinality() const -> size_t { return 1; }
+
+        auto parse( Args const &args ) const -> InternalParseResult {
+            return parse( args.exeName(), TokenStream( args ) );
+        }
+    };
+
+    template<typename DerivedT>
+    class ComposableParserImpl : public ParserBase {
+    public:
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser;
+
+		template<typename T>
+        auto operator+( T const &other ) const -> Parser;
+    };
+
+    // Common code and state for Args and Opts
+    template<typename DerivedT>
+    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+    protected:
+        Optionality m_optionality = Optionality::Optional;
+        std::shared_ptr<BoundRef> m_ref;
+        std::string m_hint;
+        std::string m_description;
+
+        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+    public:
+        template<typename T>
+        ParserRefImpl( T &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+            m_hint( hint )
+        {}
+
+        template<typename LambdaT>
+        ParserRefImpl( LambdaT const &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+            m_hint(hint)
+        {}
+
+        auto operator()( std::string const &description ) -> DerivedT & {
+            m_description = description;
+            return static_cast<DerivedT &>( *this );
+        }
+
+        auto optional() -> DerivedT & {
+            m_optionality = Optionality::Optional;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto required() -> DerivedT & {
+            m_optionality = Optionality::Required;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto isOptional() const -> bool {
+            return m_optionality == Optionality::Optional;
+        }
+
+        auto cardinality() const -> size_t override {
+            if( m_ref->isContainer() )
+                return 0;
+            else
+                return 1;
+        }
+
+        auto hint() const -> std::string { return m_hint; }
+    };
+
+    class ExeName : public ComposableParserImpl<ExeName> {
+        std::shared_ptr<std::string> m_name;
+        std::shared_ptr<BoundValueRefBase> m_ref;
+
+        template<typename LambdaT>
+        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+        }
+
+    public:
+        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+        explicit ExeName( std::string &ref ) : ExeName() {
+            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+        }
+
+        template<typename LambdaT>
+        explicit ExeName( LambdaT const& lambda ) : ExeName() {
+            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+        }
+
+        // The exe name is not parsed out of the normal tokens, but is handled specially
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+        }
+
+        auto name() const -> std::string { return *m_name; }
+        auto set( std::string const& newName ) -> ParserResult {
+
+            auto lastSlash = newName.find_last_of( "\\/" );
+            auto filename = ( lastSlash == std::string::npos )
+                    ? newName
+                    : newName.substr( lastSlash+1 );
+
+            *m_name = filename;
+            if( m_ref )
+                return m_ref->setValue( filename );
+            else
+                return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    class Arg : public ParserRefImpl<Arg> {
+    public:
+        using ParserRefImpl::ParserRefImpl;
+
+        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            auto const &token = *remainingTokens;
+            if( token.type != TokenType::Argument )
+                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+            assert( !m_ref->isFlag() );
+            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+            auto result = valueRef->setValue( remainingTokens->token );
+            if( !result )
+                return InternalParseResult( result );
+            else
+                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+        }
+    };
+
+    inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+        if( optName[0] == '/' )
+            return "-" + optName.substr( 1 );
+        else
+#endif
+            return optName;
+    }
+
+    class Opt : public ParserRefImpl<Opt> {
+    protected:
+        std::vector<std::string> m_optNames;
+
+    public:
+        template<typename LambdaT>
+        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+        template<typename LambdaT>
+        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        template<typename T>
+        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        auto operator[]( std::string const &optName ) -> Opt & {
+            m_optNames.push_back( optName );
+            return *this;
+        }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::ostringstream oss;
+            bool first = true;
+            for( auto const &opt : m_optNames ) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if( !m_hint.empty() )
+                oss << " <" << m_hint << ">";
+            return { { oss.str(), m_description } };
+        }
+
+        auto isMatch( std::string const &optToken ) const -> bool {
+            auto normalisedToken = normaliseOpt( optToken );
+            for( auto const &name : m_optNames ) {
+                if( normaliseOpt( name ) == normalisedToken )
+                    return true;
+            }
+            return false;
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+                auto const &token = *remainingTokens;
+                if( isMatch(token.token ) ) {
+                    if( m_ref->isFlag() ) {
+                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+                        auto result = flagRef->setFlag( true );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    } else {
+                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+                        ++remainingTokens;
+                        if( !remainingTokens )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto const &argToken = *remainingTokens;
+                        if( argToken.type != TokenType::Argument )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto result = valueRef->setValue( argToken.token );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    }
+                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+                }
+            }
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+        }
+
+        auto validate() const -> Result override {
+            if( m_optNames.empty() )
+                return Result::logicError( "No options supplied to Opt" );
+            for( auto const &name : m_optNames ) {
+                if( name.empty() )
+                    return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+                if( name[0] != '-' && name[0] != '/' )
+                    return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+                if( name[0] != '-' )
+                    return Result::logicError( "Option name must begin with '-'" );
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+    };
+
+    struct Help : Opt {
+        Help( bool &showHelpFlag )
+        :   Opt([&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            })
+        {
+            static_cast<Opt &>( *this )
+                    ("display usage information")
+                    ["-?"]["-h"]["--help"]
+                    .optional();
+        }
+    };
+
+    struct Parser : ParserBase {
+
+        mutable ExeName m_exeName;
+        std::vector<Opt> m_options;
+        std::vector<Arg> m_args;
+
+        auto operator|=( ExeName const &exeName ) -> Parser & {
+            m_exeName = exeName;
+            return *this;
+        }
+
+        auto operator|=( Arg const &arg ) -> Parser & {
+            m_args.push_back(arg);
+            return *this;
+        }
+
+        auto operator|=( Opt const &opt ) -> Parser & {
+            m_options.push_back(opt);
+            return *this;
+        }
+
+        auto operator|=( Parser const &other ) -> Parser & {
+            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+            return *this;
+        }
+
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser {
+            return Parser( *this ) |= other;
+        }
+
+        // Forward deprecated interface with '+' instead of '|'
+        template<typename T>
+        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+        template<typename T>
+        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::vector<HelpColumns> cols;
+            for (auto const &o : m_options) {
+                auto childCols = o.getHelpColumns();
+                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+            }
+            return cols;
+        }
+
+        void writeToStream( std::ostream &os ) const {
+            if (!m_exeName.name().empty()) {
+                os << "usage:\n" << "  " << m_exeName.name() << " ";
+                bool required = true, first = true;
+                for( auto const &arg : m_args ) {
+                    if (first)
+                        first = false;
+                    else
+                        os << " ";
+                    if( arg.isOptional() && required ) {
+                        os << "[";
+                        required = false;
+                    }
+                    os << "<" << arg.hint() << ">";
+                    if( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if( !required )
+                    os << "]";
+                if( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:" << std::endl;
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for( auto const &cols : rows )
+                optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+            optWidth = (std::min)(optWidth, consoleWidth/2);
+
+            for( auto const &cols : rows ) {
+                auto row =
+                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+                        TextFlow::Spacer(4) +
+                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+                os << row << std::endl;
+            }
+        }
+
+        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+            parser.writeToStream( os );
+            return os;
+        }
+
+        auto validate() const -> Result override {
+            for( auto const &opt : m_options ) {
+                auto result = opt.validate();
+                if( !result )
+                    return result;
+            }
+            for( auto const &arg : m_args ) {
+                auto result = arg.validate();
+                if( !result )
+                    return result;
+            }
+            return Result::ok();
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            const size_t totalParsers = m_options.size() + m_args.size();
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
+
+            {
+                size_t i = 0;
+                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+            while( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
+                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+                        if (!result)
+                            return result;
+                        if (result.value().type() != ParseResultType::NoMatch) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if( !tokenParsed )
+                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+    };
+
+    template<typename DerivedT>
+    template<typename T>
+    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+        return Parser() | static_cast<DerivedT const &>( *this ) | other;
+    }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+                auto warningSet = [&]() {
+                    if( warning == "NoAssertions" )
+                        return WarnAbout::NoAssertions;
+
+                    if ( warning == "NoTests" )
+                        return WarnAbout::NoTests;
+
+                    return WarnAbout::Nothing;
+                }();
+
+                if (warningSet == WarnAbout::Nothing)
+                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + line + '"';
+                        config.testsOrTags.push_back( line + ',' );
+                    }
+                }
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = RunTests::InDeclarationOrder;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = RunTests::InLexicographicalOrder;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = RunTests::InRandomOrder;
+                else
+                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed != "time" )
+                    return clara::detail::convertInto( seed, config.rngSeed );
+                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setColourUsage = [&]( std::string const& useColour ) {
+                    auto mode = toLower( useColour );
+
+                    if( mode == "yes" )
+                        config.useColour = UseColour::Yes;
+                    else if( mode == "no" )
+                        config.useColour = UseColour::No;
+                    else if( mode == "auto" )
+                        config.useColour = UseColour::Auto;
+                    else
+                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.listTests )
+                ["-l"]["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["-t"]["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.outputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "output filename" )
+            | Opt( config.reporterName, "name" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTestNamesOnly )
+                ["--list-test-names-only"]
+                ( "list all/matching test cases names only" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all reporters" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setColourUsage, "yes|no" )
+                ["--use-colour"]
+                ( "should output be colourised" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.benchmarkResolutionMultiple, "multiplier" )
+                ["--benchmark-resolution-multiple"]
+                ( "multiple of clock resolution to run benchmarks" )
+
+            | Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::empty() const noexcept {
+        return file[0] == '\0';
+    }
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        return line < other.line || ( line == other.line && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    std::string StreamEndStop::operator+() const {
+        return std::string();
+    }
+
+    NonCopyable::NonCopyable() = default;
+    NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+// start catch_enforce.h
+
+#include <stdexcept>
+
+#define CATCH_PREPARE_EXCEPTION( type, msg ) \
+    type( ( Catch::ReusableStringStream() << msg ).str() )
+#define CATCH_INTERNAL_ERROR( msg ) \
+    throw CATCH_PREPARE_EXCEPTION( std::logic_error, CATCH_INTERNAL_LINEINFO << ": Internal Catch error: " << msg);
+#define CATCH_ERROR( msg ) \
+    throw CATCH_PREPARE_EXCEPTION( std::domain_error, msg )
+#define CATCH_ENFORCE( condition, msg ) \
+    do{ if( !(condition) ) CATCH_ERROR( msg ); } while(false)
+
+// end catch_enforce.h
+namespace Catch {
+
+    Config::Config( ConfigData const& data )
+    :   m_data( data ),
+        m_stream( openStream() )
+    {
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (data.testsOrTags.empty()) {
+            parser.parse("~[.]"); // All not hidden tests
+        }
+        else {
+            m_hasTestFilters = true;
+            for( auto const& testOrTags : data.testsOrTags )
+                parser.parse( testOrTags );
+        }
+        m_testSpec = parser.testSpec();
+    }
+
+    std::string const& Config::getFilename() const {
+        return m_data.outputFilename ;
+    }
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+
+    std::string Config::getProcessName() const { return m_data.processName; }
+    std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    std::ostream& Config::stream() const               { return m_stream->stream(); }
+    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
+    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
+    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
+    int Config::benchmarkResolutionMultiple() const    { return m_data.benchmarkResolutionMultiple; }
+    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    IStream const* Config::openStream() {
+        return Catch::makeStream(m_data.outputFilename);
+    }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+// end catch_errno_guard.h
+#include <sstream>
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() = default;
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        virtual void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = UseColour::Yes;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        virtual void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            Catch::cout() << '\033' << _escapeCode;
+        }
+    };
+
+    bool useColourOnPlatform() {
+        return
+#ifdef CATCH_PLATFORM_MAC
+            !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+            isatty(STDOUT_FILENO)
+#else
+            false
+#endif
+            ;
+    }
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = useColourOnPlatform()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+    Colour::Colour( Colour&& rhs ) noexcept {
+        m_moved = rhs.m_moved;
+        rhs.m_moved = true;
+    }
+    Colour& Colour::operator=( Colour&& rhs ) noexcept {
+        m_moved = rhs.m_moved;
+        rhs.m_moved  = true;
+        return *this;
+    }
+
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        impl->use( _colourCode );
+    }
+
+    std::ostream& operator << ( std::ostream& os, Colour const& ) {
+        return os;
+    }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+    class Context : public IMutableContext, NonCopyable {
+
+    public: // IContext
+        virtual IResultCapture* getResultCapture() override {
+            return m_resultCapture;
+        }
+        virtual IRunner* getRunner() override {
+            return m_runner;
+        }
+
+        virtual IConfigPtr const& getConfig() const override {
+            return m_config;
+        }
+
+        virtual ~Context() override;
+
+    public: // IMutableContext
+        virtual void setResultCapture( IResultCapture* resultCapture ) override {
+            m_resultCapture = resultCapture;
+        }
+        virtual void setRunner( IRunner* runner ) override {
+            m_runner = runner;
+        }
+        virtual void setConfig( IConfigPtr const& config ) override {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IConfigPtr m_config;
+        IRunner* m_runner = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+    };
+
+    IMutableContext *IMutableContext::currentContext = nullptr;
+
+    void IMutableContext::createContext()
+    {
+        currentContext = new Context();
+    }
+
+    void cleanUpContext() {
+        delete IMutableContext::currentContext;
+        IMutableContext::currentContext = nullptr;
+    }
+    IContext::~IContext() = default;
+    IMutableContext::~IMutableContext() = default;
+    Context::~Context() = default;
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#ifdef CATCH_PLATFORM_WINDOWS
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#ifdef CATCH_PLATFORM_MAC
+
+#  include <assert.h>
+#  include <stdbool.h>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <sys/sysctl.h>
+#  include <cstddef>
+#  include <ostream>
+
+namespace Catch {
+
+        // The following function is taken directly from the following technical note:
+        // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+    ITransientExpression::~ITransientExpression() = default;
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << " " << op << " " << rhs;
+        else
+            os << lhs << "\n" << op << "\n" << rhs;
+    }
+}
+// end catch_decomposer.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry();
+        virtual void registerTranslator( const IExceptionTranslator* translator );
+        virtual std::string translateActiveException() const override;
+        std::string tryTranslators() const;
+
+    private:
+        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+    };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+    }
+
+    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+    }
+
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        try {
+#ifdef __OBJC__
+            // In Objective-C try objective-c exceptions first
+            @try {
+                return tryTranslators();
+            }
+            @catch (NSException *exception) {
+                return Catch::Detail::stringify( [exception description] );
+            }
+#else
+            // Compiling a mixed mode project with MSVC means that CLR
+            // exceptions will be caught in (...) as well. However, these
+            // do not fill-in std::current_exception and thus lead to crash
+            // when attempting rethrow.
+            // /EHa switch also causes structured exceptions to be caught
+            // here, but they fill-in current_exception properly, so
+            // at worst the output should be a little weird, instead of
+            // causing a crash.
+            if (std::current_exception() == nullptr) {
+                return "Non C++ exception. Possibly a CLR exception.";
+            }
+            return tryTranslators();
+#endif
+        }
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception& ex ) {
+            return ex.what();
+        }
+        catch( std::string& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        if( m_translators.empty() )
+            std::rethrow_exception(std::current_exception());
+        else
+            return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() );
+    }
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    // Report the error condition
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+}
+
+#endif // signals/SEH handling
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { EXCEPTION_ILLEGAL_INSTRUCTION,  "SIGILL - Illegal instruction signal" },
+        { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" },
+        { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" },
+        { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" },
+    };
+
+    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        // 32k seems enough for Catch to handle stack overflow,
+        // but the value was found experimentally, so there is no strong guarantee
+        guaranteeSize = 32 * 1024;
+        exceptionHandlerHandle = nullptr;
+        // Register as first handler in current chain
+        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+        // Pass in guarantee size to be filled
+        SetThreadStackGuarantee(&guaranteeSize);
+    }
+
+    void FatalConditionHandler::reset() {
+        if (isSet) {
+            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+            SetThreadStackGuarantee(&guaranteeSize);
+            exceptionHandlerHandle = nullptr;
+            isSet = false;
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+bool FatalConditionHandler::isSet = false;
+ULONG FatalConditionHandler::guaranteeSize = 0;
+PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+
+} // namespace Catch
+
+#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    // 32kb for the alternate stack seems to be sufficient. However, this value
+    // is experimentally determined, so that's not guaranteed.
+    constexpr static std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+    void FatalConditionHandler::handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        reset();
+        reportFatal(name);
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = sigStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+    void FatalConditionHandler::reset() {
+        if( isSet ) {
+            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+            }
+            // Return the old stack
+            sigaltstack(&oldSigStack, nullptr);
+            isSet = false;
+        }
+    }
+
+    bool FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+    stack_t FatalConditionHandler::oldSigStack = {};
+    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    void FatalConditionHandler::reset() {}
+}
+
+#endif // signals/SEH handling
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+// end catch_fatal_condition.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+    class ListeningReporter : public IStreamingReporter {
+        using Reporters = std::vector<IStreamingReporterPtr>;
+        Reporters m_listeners;
+        IStreamingReporterPtr m_reporter = nullptr;
+        ReporterPreferences m_preferences;
+
+    public:
+        ListeningReporter();
+
+        void addListener( IStreamingReporterPtr&& listener );
+        void addReporter( IStreamingReporterPtr&& reporter );
+
+    public: // IStreamingReporter
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases( std::string const& spec ) override;
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats const& benchmarkStats ) override;
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testGroupStarting( GroupInfo const& groupInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        // The return value indicates if the messages buffer should be cleared:
+        bool assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+        bool isMulti() const override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+    std::ostream& ReporterConfig::stream() const { return *m_stream; }
+    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+    GroupInfo::GroupInfo(  std::string const& _name,
+                           std::size_t _groupIndex,
+                           std::size_t _groupsCount )
+    :   name( _name ),
+        groupIndex( _groupIndex ),
+        groupsCounts( _groupsCount )
+    {}
+
+     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                     std::vector<MessageInfo> const& _infoMessages,
+                                     Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder << assertionResult.getMessage();
+            builder.m_info.message = builder.m_stream.str();
+
+            infoMessages.push_back( builder.m_info );
+        }
+    }
+
+     AssertionStats::~AssertionStats() = default;
+
+    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( _sectionInfo ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+    SectionStats::~SectionStats() = default;
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string const& _stdOut,
+                                   std::string const& _stdErr,
+                                   bool _aborting )
+    : testInfo( _testInfo ),
+        totals( _totals ),
+        stdOut( _stdOut ),
+        stdErr( _stdErr ),
+        aborting( _aborting )
+    {}
+
+    TestCaseStats::~TestCaseStats() = default;
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+                                    Totals const& _totals,
+                                    bool _aborting )
+    :   groupInfo( _groupInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+    :   groupInfo( _groupInfo ),
+        aborting( false )
+    {}
+
+    TestGroupStats::~TestGroupStats() = default;
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestRunStats::~TestRunStats() = default;
+
+    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+    bool IStreamingReporter::isMulti() const { return false; }
+
+    IReporterFactory::~IReporterFactory() = default;
+    IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+    IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+	LeakDetector::LeakDetector() {
+		int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+		flag |= _CRTDBG_LEAK_CHECK_DF;
+		flag |= _CRTDBG_ALLOC_MEM_DF;
+		_CrtSetDbgFlag(flag);
+		_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+		_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+		// Change this to leaking allocation's number to break there
+		_CrtSetBreakAlloc(-1);
+	}
+}
+
+#else
+
+    Catch::LeakDetector::LeakDetector() {}
+
+#endif
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config );
+
+    std::size_t listTestsNamesOnly( Config const& config );
+
+    struct TagInfo {
+        void add( std::string const& spelling );
+        std::string all() const;
+
+        std::set<std::string> spellings;
+        std::size_t count = 0;
+    };
+
+    std::size_t listTags( Config const& config );
+
+    std::size_t listReporters( Config const& /*config*/ );
+
+    Option<std::size_t> list( Config const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+    using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+        }
+
+        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+            if( config.verbosity() >= Verbosity::High ) {
+                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Column( description ).indent(4) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+        }
+
+        if( !config.hasTestFilters() )
+            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+        return matchedTestCases.size();
+    }
+
+    std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            matchedTests++;
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.verbosity() >= Verbosity::High )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    void TagInfo::add( std::string const& spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        std::string out;
+        for( auto const& spelling : spellings )
+            out += "[" + spelling + "]";
+        return out;
+    }
+
+    std::size_t listTags( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCase : matchedTestCases ) {
+            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+                std::string lcaseTagName = toLower( tagName );
+                auto countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( auto const& tagCount : tagCounts ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
+            auto str = rss.str();
+            auto wrapper = Column( tagCount.second.all() )
+                                                    .initialIndent( 0 )
+                                                    .indent( str.size() )
+                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+            Catch::cout() << str << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    std::size_t listReporters( Config const& /*config*/ ) {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        std::size_t maxNameLen = 0;
+        for( auto const& factoryKvp : factories )
+            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+        for( auto const& factoryKvp : factories ) {
+            Catch::cout()
+                    << Column( factoryKvp.first + ":" )
+                            .indent(2)
+                            .width( 5+maxNameLen )
+                    +  Column( factoryKvp.second->getDescription() )
+                            .initialIndent(0)
+                            .indent(2)
+                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+                    << "\n";
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    Option<std::size_t> list( Config const& config ) {
+        Option<std::size_t> listedCount;
+        if( config.listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( config );
+        if( config.listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config );
+        if( config.listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( config );
+        if( config.listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters( config );
+        return listedCount;
+    }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        std::string MatcherUntypedBase::toString() const {
+            if( m_cachedToString.empty() )
+                m_cachedToString = describe();
+            return m_cachedToString;
+        }
+
+        MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+    } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <stdexcept>
+
+namespace Catch {
+namespace Matchers {
+namespace Floating {
+enum class FloatingPointKind : uint8_t {
+    Float,
+    Double
+};
+}
+}
+}
+
+namespace {
+
+template <typename T>
+struct Converter;
+
+template <>
+struct Converter<float> {
+    static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+    Converter(float f) {
+        std::memcpy(&i, &f, sizeof(f));
+    }
+    int32_t i;
+};
+
+template <>
+struct Converter<double> {
+    static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+    Converter(double d) {
+        std::memcpy(&i, &d, sizeof(d));
+    }
+    int64_t i;
+};
+
+template <typename T>
+auto convert(T t) -> Converter<T> {
+    return Converter<T>(t);
+}
+
+template <typename FP>
+bool almostEqualUlps(FP lhs, FP rhs, int maxUlpDiff) {
+    // Comparison with NaN should always be false.
+    // This way we can rule it out before getting into the ugly details
+    if (std::isnan(lhs) || std::isnan(rhs)) {
+        return false;
+    }
+
+    auto lc = convert(lhs);
+    auto rc = convert(rhs);
+
+    if ((lc.i < 0) != (rc.i < 0)) {
+        // Potentially we can have +0 and -0
+        return lhs == rhs;
+    }
+
+    auto ulpDiff = std::abs(lc.i - rc.i);
+    return ulpDiff <= maxUlpDiff;
+}
+
+}
+
+namespace Catch {
+namespace Matchers {
+namespace Floating {
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        if (m_margin < 0) {
+            throw std::domain_error("Allowed margin difference has to be >= 0");
+        }
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, int ulps, FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        if (m_ulps < 0) {
+            throw std::domain_error("Allowed ulp difference has to be >= 0");
+        }
+    }
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            throw std::domain_error("Unknown FloatingPointKind value");
+        }
+    }
+
+    std::string WithinUlpsMatcher::describe() const {
+        return "is within " + Catch::to_string(m_ulps) + " ULPs of " + ::Catch::Detail::stringify(m_target) + ((m_type == FloatingPointKind::Float)? "f" : "");
+    }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, int maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, int maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+    return Floating::WithinAbsMatcher(target, margin);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+        bool RegexMatcher::match(std::string const& matchee) const {
+            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+            if (m_caseSensitivity == CaseSensitive::Choice::No) {
+                flags |= std::regex::icase;
+            }
+            auto reg = std::regex(m_regex, flags);
+            return std::regex_match(matchee, reg);
+        }
+
+        std::string RegexMatcher::describe() const {
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+        return StdString::RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+namespace Catch {
+
+    MessageInfo::MessageInfo(   std::string const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    bool MessageInfo::operator==( MessageInfo const& other ) const {
+        return sequence == other.sequence;
+    }
+
+    bool MessageInfo::operator<( MessageInfo const& other ) const {
+        return sequence < other.sequence;
+    }
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    Catch::MessageBuilder::MessageBuilder( std::string const& macroName,
+                                           SourceLineInfo const& lineInfo,
+                                           ResultWas::OfType type )
+        :m_info(macroName, lineInfo, type) {}
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info )
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            throw std::runtime_error("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                throw std::runtime_error("Could not translate errno to string");
+            }
+            throw std::runtime_error("Could not open the temp file: " + std::string(m_buffer) + buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            throw std::runtime_error("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_random_number_generator.cpp
+
+// start catch_random_number_generator.h
+
+#include <algorithm>
+#include <random>
+
+namespace Catch {
+
+    struct IConfig;
+
+    std::mt19937& rng();
+    void seedRng( IConfig const& config );
+    unsigned int rngSeed();
+
+}
+
+// end catch_random_number_generator.h
+namespace Catch {
+
+    std::mt19937& rng() {
+        static std::mt19937 s_rng;
+        return s_rng;
+    }
+
+    void seedRng( IConfig const& config ) {
+        if( config.rngSeed() != 0 ) {
+            std::srand( config.rngSeed() );
+            rng().seed( config.rngSeed() );
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+    class TestCase;
+    struct IConfig;
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        virtual ~TestRegistry() = default;
+
+        virtual void registerTest( TestCase const& testCase );
+
+        std::vector<TestCase> const& getAllTests() const override;
+        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        std::size_t m_unnamedCount = 0;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class TestInvokerAsFunction : public ITestInvoker {
+        void(*m_testAsFunction)();
+    public:
+        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+        void invoke() const override;
+    };
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+    ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        ~ReporterRegistry() override;
+
+        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+        void registerListener( IReporterFactoryPtr const& factory );
+
+        FactoryMap const& getFactories() const override;
+        Listeners const& getListeners() const override;
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+    };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+                            private NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            void registerListener( IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerListener( factory );
+            }
+            void registerTest( TestCase const& testInfo ) override {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            void registerTranslator( const IExceptionTranslator* translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+                m_exceptionRegistry.add(std::current_exception());
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+        };
+
+        // Single, global, instance
+        RegistryHub*& getTheRegistryHub() {
+            static RegistryHub* theRegistryHub = nullptr;
+            if( !theRegistryHub )
+                theRegistryHub = new RegistryHub();
+            return theRegistryHub;
+        }
+    }
+
+    IRegistryHub& getRegistryHub() {
+        return *getTheRegistryHub();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return *getTheRegistryHub();
+    }
+    void cleanUp() {
+        delete getTheRegistryHub();
+        getTheRegistryHub() = nullptr;
+        cleanUpContext();
+        ReusableStringStream::cleanup();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+        auto it =  m_factories.find( name );
+        if( it == m_factories.end() )
+            return nullptr;
+        return it->second->create( ReporterConfig( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+        m_factories.emplace(name, factory);
+    }
+    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+        m_listeners.push_back( factory );
+    }
+
+    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+        return m_factories;
+    }
+    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+        return m_listeners;
+    }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_context(getCurrentMutableContext()),
+        m_config(_config),
+        m_reporter(std::move(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        m_context.setRunner(this);
+        m_context.setConfig(m_config);
+        m_context.setResultCapture(this);
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+    }
+
+    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCase const& testCase) {
+        Totals prevTotals = m_totals;
+
+        std::string redirectedCout;
+        std::string redirectedCerr;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+
+        m_reporter->testCaseStarting(testInfo);
+
+        m_activeTestCase = &testCase;
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+            runCurrentTest(redirectedCout, redirectedCerr);
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  redirectedCout,
+                                  redirectedCerr,
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+    IConfigPtr RunContext::config() const {
+        return m_config;
+    }
+
+    IStreamingReporter& RunContext::reporter() const {
+        return *m_reporter;
+    }
+
+    void RunContext::assertionEnded(AssertionResult const & result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (!result.isOk()) {
+            m_lastAssertionPassed = false;
+            if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+        // and should be let to clear themselves out.
+        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+        // Reset working state
+        resetAssertionInfo();
+        m_lastResult = result;
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+    }
+
+    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+        if (m_unfinishedSections.empty())
+            m_activeSections.back()->fail();
+        else
+            m_activeSections.back()->close();
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(endInfo);
+    }
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = message;
+        AssertionResult result(m_lastAssertionInfo, tempResult);
+
+        assertionEnded(result);
+
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        testGroupEnded(std::string(), m_totals, 1, 1);
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed == static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        seedRng(*m_config);
+
+        Timer timer;
+        try {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStdOut redirectedStdOut;
+                RedirectedStdErr redirectedStdErr;
+
+                timer.start();
+                invokeActiveTestCase();
+                redirectedCout += redirectedStdOut.str();
+                redirectedCerr += redirectedStdErr.str();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } catch (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } catch (...) {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+
+        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        FatalConditionHandler fatalConditionHandler; // Handle signals
+        m_activeTestCase->invoke();
+        fatalConditionHandler.reset();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(*it);
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, data };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( assertionResult );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef const& message,
+            AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ m_lastAssertionInfo, data };
+        assertionEnded( assertionResult );
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string const& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+        populateReaction( reaction );
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+            if( uncaught_exceptions() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name )
+    :   name( _name ),
+        lineInfo( _lineInfo )
+    {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+    class Session : NonCopyable {
+    public:
+
+        Session();
+        ~Session() override;
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+
+        void useConfigData( ConfigData const& configData );
+
+        int run( int argc, char* argv[] );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
+        int run( int argc, wchar_t* const argv[] );
+    #endif
+        int run();
+
+        clara::Parser const& cli() const;
+        void cli( clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        clara::Parser m_cli;
+        ConfigData m_configData;
+        std::shared_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+            return reporter;
+        }
+
+        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+                return createReporter(config->getReporterName(), config);
+            }
+
+            auto multi = std::unique_ptr<ListeningReporter>(new ListeningReporter);
+
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi->addListener(listener->create(Catch::ReporterConfig(config)));
+            }
+            multi->addReporter(createReporter(config->getReporterName(), config));
+            return std::move(multi);
+        }
+
+        Catch::Totals runTests(std::shared_ptr<Config> const& config) {
+            // FixMe: Add listeners in order first, then add reporters.
+
+            auto reporter = makeReporter(config);
+
+            RunContext context(config, std::move(reporter));
+
+            Totals totals;
+
+            context.testGroupStarting(config->name(), 1, 1);
+
+            TestSpec testSpec = config->testSpec();
+
+            auto const& allTestCases = getAllTestCasesSorted(*config);
+            for (auto const& testCase : allTestCases) {
+                if (!context.aborting() && matchTest(testCase, testSpec, *config))
+                    totals += context.runTest(testCase);
+                else
+                    context.reporter().skipTest(testCase);
+            }
+
+            if (config->warnAboutNoTests() && totals.testCases.total() == 0) {
+                ReusableStringStream testConfig;
+
+                bool first = true;
+                for (const auto& input : config->getTestsOrTags()) {
+                    if (!first) { testConfig << ' '; }
+                    first = false;
+                    testConfig << input;
+                }
+
+                context.reporter().noMatchingTestCases(testConfig.str());
+                totals.error = -1;
+            }
+
+            context.testGroupEnded(config->name(), totals, 1, 1);
+            return totals;
+        }
+
+        void applyFilenamesAsTags(Catch::IConfig const& config) {
+            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+            for (auto& testCase : tests) {
+                auto tags = testCase.tags;
+
+                std::string filename = testCase.lineInfo.file;
+                auto lastSlash = filename.find_last_of("\\/");
+                if (lastSlash != std::string::npos) {
+                    filename.erase(0, lastSlash);
+                    filename[0] = '#';
+                }
+
+                auto lastDot = filename.find_last_of('.');
+                if (lastDot != std::string::npos) {
+                    filename.erase(lastDot);
+                }
+
+                tags.push_back(std::move(filename));
+                setTags(testCase, tags);
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            try         { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            catch(...)  { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            m_startupExceptions = true;
+            Colour colourGuard( Colour::Red );
+            Catch::cerr() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch v" << libraryVersion() << "\n"
+                << m_cli << std::endl
+                << "For more detailed usage please see the project docs\n" << std::endl;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( clara::Args( argc, argv ) );
+        if( !result ) {
+            Catch::cerr()
+                << Colour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            Catch::cerr() << "Run with -? for usage\n" << std::endl;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+        m_config.reset();
+        return 0;
+    }
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run( int argc, char* argv[] ) {
+        if( m_startupExceptions )
+            return 1;
+        int returnCode = applyCommandLine( argc, argv );
+        if( returnCode == 0 )
+            returnCode = run();
+        return returnCode;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
+    int Session::run( int argc, wchar_t* const argv[] ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+        }
+
+        int returnCode = run( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = std::make_shared<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if( m_configData.showHelp || m_configData.libIdentify )
+            return 0;
+
+        try
+        {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if( m_configData.filenamesAsTags )
+                applyFilenamesAsTags( *m_config );
+
+            // Handle list request
+            if( Option<std::size_t> listed = list( config() ) )
+                return static_cast<int>( *listed );
+
+            auto totals = runTests( m_config );
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+        }
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << std::endl;
+            return MaxExitCode;
+        }
+    }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_startup_exception_registry.cpp
+
+namespace Catch {
+    void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        try {
+            m_exceptions.push_back(exception);
+        }
+        catch(...) {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+
+} // end namespace Catch
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+    namespace detail { namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const&str ) {
+                writeToDebugConsole( str );
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream : public IStream {
+            mutable std::ofstream m_ofs;
+        public:
+            FileStream( StringRef filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+            }
+            ~FileStream() override = default;
+        public: // IStream
+            std::ostream& stream() const override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream : public IStream {
+            mutable std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+            ~CoutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream : public IStream {
+            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            mutable std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+            ~DebugOutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+    }} // namespace anon::detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( StringRef const &filename ) -> IStream const* {
+        if( filename.empty() )
+            return new detail::CoutStream();
+        else if( filename[0] == '%' ) {
+            if( filename == "%debug" )
+                return new detail::DebugOutStream();
+            else
+                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+        }
+        else
+            return new detail::FileStream( filename );
+    }
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+        static StringStreams* s_instance;
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+
+        // !TBD: put in TLS
+        static auto instance() -> StringStreams& {
+            if( !s_instance )
+                s_instance = new StringStreams();
+            return *s_instance;
+        }
+        static void cleanup() {
+            delete s_instance;
+            s_instance = nullptr;
+        }
+    };
+
+    StringStreams* StringStreams::s_instance = nullptr;
+
+    void ReusableStringStream::cleanup() {
+        StringStreams::cleanup();
+    }
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( StringStreams::instance().add() ),
+        m_oss( StringStreams::instance().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        StringStreams::instance().release( m_index );
+    }
+
+    auto ReusableStringStream::str() const -> std::string {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+}
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+
+namespace Catch {
+
+    namespace {
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( c ) );
+        }
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace {
+    const uint32_t byte_2_lead = 0xC0;
+    const uint32_t byte_3_lead = 0xE0;
+    const uint32_t byte_4_lead = 0xF0;
+}
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+    {}
+
+    StringRef::operator std::string() const {
+        return std::string( m_start, m_size );
+    }
+
+    void StringRef::swap( StringRef& other ) noexcept {
+        std::swap( m_start, other.m_start );
+        std::swap( m_size, other.m_size );
+        std::swap( m_data, other.m_data );
+    }
+
+    auto StringRef::c_str() const -> char const* {
+        if( isSubstring() )
+           const_cast<StringRef*>( this )->takeOwnership();
+        return m_start;
+    }
+    auto StringRef::currentData() const noexcept -> char const* {
+        return m_start;
+    }
+
+    auto StringRef::isOwned() const noexcept -> bool {
+        return m_data != nullptr;
+    }
+    auto StringRef::isSubstring() const noexcept -> bool {
+        return m_start[m_size] != '\0';
+    }
+
+    void StringRef::takeOwnership() {
+        if( !isOwned() ) {
+            m_data = new char[m_size+1];
+            memcpy( m_data, m_start, m_size );
+            m_data[m_size] = '\0';
+            m_start = m_data;
+        }
+    }
+    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+        if( start < m_size )
+            return StringRef( m_start+start, size );
+        else
+            return StringRef();
+    }
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return
+            size() == other.size() &&
+            (std::strncmp( m_start, other.m_start, size() ) == 0);
+    }
+    auto StringRef::operator != ( StringRef const& other ) const noexcept -> bool {
+        return !operator==( other );
+    }
+
+    auto StringRef::operator[](size_type index) const noexcept -> char {
+        return m_start[index];
+    }
+
+    auto StringRef::numberOfCharacters() const noexcept -> size_type {
+        size_type noChars = m_size;
+        // Make adjustments for uft encodings
+        for( size_type i=0; i < m_size; ++i ) {
+            char c = m_start[i];
+            if( ( c & byte_2_lead ) == byte_2_lead ) {
+                noChars--;
+                if (( c & byte_3_lead ) == byte_3_lead )
+                    noChars--;
+                if( ( c & byte_4_lead ) == byte_4_lead )
+                    noChars--;
+            }
+        }
+        return noChars;
+    }
+
+    auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string {
+        std::string str;
+        str.reserve( lhs.size() + rhs.size() );
+        str += lhs;
+        str += rhs;
+        return str;
+    }
+    auto operator + ( StringRef const& lhs, const char* rhs ) -> std::string {
+        return std::string( lhs ) + std::string( rhs );
+    }
+    auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string {
+        return std::string( lhs ) + std::string( rhs );
+    }
+
+    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+        return os.write(str.currentData(), str.size());
+    }
+
+    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+        lhs.append(rhs.currentData(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        try {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } catch (...) {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+            if( startsWith( tag, '.' ) ||
+                tag == "!hide" )
+                return TestCaseInfo::IsHidden;
+            else if( tag == "!throws" )
+                return TestCaseInfo::Throws;
+            else if( tag == "!shouldfail" )
+                return TestCaseInfo::ShouldFail;
+            else if( tag == "!mayfail" )
+                return TestCaseInfo::MayFail;
+            else if( tag == "!nonportable" )
+                return TestCaseInfo::NonPortable;
+            else if( tag == "!benchmark" )
+                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+            else
+                return TestCaseInfo::None;
+        }
+        bool isReservedTag( std::string const& tag ) {
+            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alpha-numeric characters are reserved\n"
+                          << _lineInfo );
+        }
+    }
+
+    TestCase makeTestCase(  ITestInvoker* _testCase,
+                            std::string const& _className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden = false;
+
+        // Parse out tags
+        std::vector<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        std::string _descOrTags = nameAndTags.tags;
+        for (char c : _descOrTags) {
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    tags.push_back( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            tags.push_back( "." );
+        }
+
+        TestCaseInfo info( nameAndTags.name, _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, std::move(info) );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+        testCaseInfo.lcaseTags.clear();
+
+        for( auto const& tag : tags ) {
+            std::string lcaseTag = toLower( tag );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.push_back( lcaseTag );
+        }
+        testCaseInfo.tags = std::move(tags);
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::vector<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret.append(tag);
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+
+        std::vector<TestCase> sorted = unsortedTestCases;
+
+        switch( config.runOrder() ) {
+            case RunTests::InLexicographicalOrder:
+                std::sort( sorted.begin(), sorted.end() );
+                break;
+            case RunTests::InRandomOrder:
+                seedRng( config );
+                std::shuffle( sorted.begin(), sorted.end(), rng() );
+                break;
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+        }
+        return sorted;
+    }
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( auto const& function : functions ) {
+            auto prev = seenFunctions.insert( function );
+            CATCH_ENFORCE( prev.second,
+                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for( auto const& testCase : testCases )
+            if( matchTest( testCase, testSpec, config ) )
+                filtered.push_back( testCase );
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    void TestRegistry::registerTest( TestCase const& testCase ) {
+        std::string name = testCase.getTestCaseInfo().name;
+        if( name.empty() ) {
+            ReusableStringStream rss;
+            rss << "Anonymous test case " << ++m_unnamedCount;
+            return registerTest( testCase.withName( rss.str() ) );
+        }
+        m_functions.push_back( testCase );
+    }
+
+    std::vector<TestCase> const& TestRegistry::getAllTests() const {
+        return m_functions;
+    }
+    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_functions );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_functions );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+    void TestInvokerAsFunction::invoke() const {
+        m_testAsFunction();
+    }
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+        std::string className = classOrQualifiedMethodName;
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+    :   name( _name ),
+        location( _location )
+    {}
+
+    ITracker::~ITracker() = default;
+
+    TrackerContext& TrackerContext::instance() {
+        static TrackerContext s_instance;
+        return s_instance;
+    }
+
+    ITracker& TrackerContext::startRun() {
+        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::endRun() {
+        m_rootTracker.reset();
+        m_currentTracker = nullptr;
+        m_runState = NotStarted;
+    }
+
+    void TrackerContext::startCycle() {
+        m_currentTracker = m_rootTracker.get();
+        m_runState = Executing;
+    }
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    ITracker& TrackerContext::currentTracker() {
+        return *m_currentTracker;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+    TrackerBase::TrackerHasName::TrackerHasName( NameAndLocation const& nameAndLocation ) : m_nameAndLocation( nameAndLocation ) {}
+    bool TrackerBase::TrackerHasName::operator ()( ITrackerPtr const& tracker ) const {
+        return
+            tracker->nameAndLocation().location == m_nameAndLocation.location &&
+            tracker->nameAndLocation().name == m_nameAndLocation.name;
+    }
+
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   m_nameAndLocation( nameAndLocation ),
+        m_ctx( ctx ),
+        m_parent( parent )
+    {}
+
+    NameAndLocation const& TrackerBase::nameAndLocation() const {
+        return m_nameAndLocation;
+    }
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+    bool TrackerBase::isSuccessfullyCompleted() const {
+        return m_runState == CompletedSuccessfully;
+    }
+    bool TrackerBase::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+    bool TrackerBase::hasChildren() const {
+        return !m_children.empty();
+    }
+
+    void TrackerBase::addChild( ITrackerPtr const& child ) {
+        m_children.push_back( child );
+    }
+
+    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+        auto it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( nameAndLocation ) );
+        return( it != m_children.end() )
+            ? *it
+            : nullptr;
+    }
+    ITracker& TrackerBase::parent() {
+        assert( m_parent ); // Should always be non-null except for root
+        return *m_parent;
+    }
+
+    void TrackerBase::openChild() {
+        if( m_runState != ExecutingChildren ) {
+            m_runState = ExecutingChildren;
+            if( m_parent )
+                m_parent->openChild();
+        }
+    }
+
+    bool TrackerBase::isSectionTracker() const { return false; }
+    bool TrackerBase::isIndexTracker() const { return false; }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( m_children.empty() || m_children.back()->isComplete() )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( nameAndLocation, ctx, parent )
+    {
+        if( parent ) {
+            while( !parent->isSectionTracker() )
+                parent = &parent->parent();
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+        std::shared_ptr<SectionTracker> section;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            section = std::static_pointer_cast<SectionTracker>( childTracker );
+        }
+        else {
+            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
+            currentTracker.addChild( section );
+        }
+        if( !ctx.completedCycle() )
+            section->tryOpen();
+        return *section;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() && (m_filters.empty() || m_filters[0].empty() ||  m_filters[0] == m_nameAndLocation.name ) )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.push_back(""); // Root - should never be consulted
+            m_filters.push_back(""); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() );
+    }
+
+    IndexTracker::IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_size( size )
+    {}
+
+    bool IndexTracker::isIndexTracker() const { return true; }
+
+    IndexTracker& IndexTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) {
+        std::shared_ptr<IndexTracker> tracker;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isIndexTracker() );
+            tracker = std::static_pointer_cast<IndexTracker>( childTracker );
+        }
+        else {
+            tracker = std::make_shared<IndexTracker>( nameAndLocation, ctx, &currentTracker, size );
+            currentTracker.addChild( tracker );
+        }
+
+        if( !ctx.completedCycle() && !tracker->isComplete() ) {
+            if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun )
+                tracker->moveNext();
+            tracker->open();
+        }
+
+        return *tracker;
+    }
+
+    int IndexTracker::index() const { return m_index; }
+
+    void IndexTracker::moveNext() {
+        m_index++;
+        m_children.clear();
+    }
+
+    void IndexTracker::close() {
+        TrackerBase::close();
+        if( m_runState == CompletedSuccessfully && m_index < m_size-1 )
+            m_runState = Executing;
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+using TestCaseTracking::IndexTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+    }
+
+    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        try {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCase(
+                            invoker,
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo));
+        } catch (...) {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+    AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    TestSpec::Pattern::~Pattern() = default;
+    TestSpec::NamePattern::~NamePattern() = default;
+    TestSpec::TagPattern::~TagPattern() = default;
+    TestSpec::ExcludedPattern::~ExcludedPattern() = default;
+
+    TestSpec::NamePattern::NamePattern( std::string const& name )
+    : m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( toLower( testCase.name ) );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        // All patterns in a filter must match for the filter to be a match
+        for( auto const& pattern : m_patterns ) {
+            if( !pattern->matches( testCase ) )
+                return false;
+        }
+        return true;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        // A TestSpec matches if any filter matches
+        for( auto const& filter : m_filters )
+            if( filter.matches( testCase ) )
+                return true;
+        return false;
+    }
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_start = std::string::npos;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+            visitChar( m_arg[m_pos] );
+        if( m_mode == Name )
+            addPattern<TestSpec::NamePattern>();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+
+    void TestSpecParser::visitChar( char c ) {
+        if( m_mode == None ) {
+            switch( c ) {
+            case ' ': return;
+            case '~': m_exclusion = true; return;
+            case '[': return startNewMode( Tag, ++m_pos );
+            case '"': return startNewMode( QuotedName, ++m_pos );
+            case '\\': return escape();
+            default: startNewMode( Name, m_pos ); break;
+            }
+        }
+        if( m_mode == Name ) {
+            if( c == ',' ) {
+                addPattern<TestSpec::NamePattern>();
+                addFilter();
+            }
+            else if( c == '[' ) {
+                if( subString() == "exclude:" )
+                    m_exclusion = true;
+                else
+                    addPattern<TestSpec::NamePattern>();
+                startNewMode( Tag, ++m_pos );
+            }
+            else if( c == '\\' )
+                escape();
+        }
+        else if( m_mode == EscapedName )
+            m_mode = Name;
+        else if( m_mode == QuotedName && c == '"' )
+            addPattern<TestSpec::NamePattern>();
+        else if( m_mode == Tag && c == ']' )
+            addPattern<TestSpec::TagPattern>();
+    }
+    void TestSpecParser::startNewMode( Mode mode, std::size_t start ) {
+        m_mode = mode;
+        m_start = start;
+    }
+    void TestSpecParser::escape() {
+        if( m_mode == None )
+            m_start = m_pos;
+        m_mode = EscapedName;
+        m_escapeChars.push_back( m_pos );
+    }
+    std::string TestSpecParser::subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+    }
+
+    namespace {
+        auto estimateClockResolution() -> uint64_t {
+            uint64_t sum = 0;
+            static const uint64_t iterations = 1000000;
+
+            auto startTime = getCurrentNanosecondsSinceEpoch();
+
+            for( std::size_t i = 0; i < iterations; ++i ) {
+
+                uint64_t ticks;
+                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+                do {
+                    ticks = getCurrentNanosecondsSinceEpoch();
+                } while( ticks == baseTicks );
+
+                auto delta = ticks - baseTicks;
+                sum += delta;
+
+                // If we have been calibrating for over 3 seconds -- the clock
+                // is terrible and we should move on.
+                // TBD: How to signal that the measured resolution is probably wrong?
+                if (ticks > startTime + 3 * nanosecondsInSecond) {
+                    return sum / i;
+                }
+            }
+
+            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+            // - and potentially do more iterations if there's a high variance.
+            return sum/iterations;
+        }
+    }
+    auto getEstimatedClockResolution() -> uint64_t {
+        static auto s_resolution = estimateClockResolution();
+        return s_resolution;
+    }
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#    pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                union _{
+                    int asInt;
+                    char asChar[sizeof (int)];
+                } u;
+
+                u.asInt = 1;
+                return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    if (std::isnan(value)) {
+        return "nan";
+    }
+
+    ReusableStringStream rss;
+    rss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = rss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    if (!getCurrentContext().getConfig()->showInvisibles()) {
+        return '"' + str + '"';
+    }
+
+    std::string s("\"");
+    for (char c : str) {
+        switch (c) {
+        case '\n':
+            s.append("\\n");
+            break;
+        case '\t':
+            s.append("\\t");
+            break;
+        default:
+            s.push_back(c);
+            break;
+        }
+    }
+    s.append("\"");
+    return s;
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+    return b ? "true" : "false";
+}
+
+std::string StringMaker<char>::convert(char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<signed char>::convert(signed char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+    return "nullptr";
+}
+
+std::string StringMaker<float>::convert(float value) {
+    return fpToString(value, 5) + 'f';
+}
+std::string StringMaker<double>::convert(double value) {
+    return fpToString(value, 10);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        return *this;
+    }
+
+    std::size_t Counts::total() const {
+        return passed + failed + failedButOk;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 2, 3, 0, "", 0 );
+        return version;
+    }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive::Choice caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( adjustCase( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == adjustCase( str );
+            case WildcardAtStart:
+                return endsWith( adjustCase( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( adjustCase( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( adjustCase( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::adjustCase( std::string const& str ) const {
+        return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str;
+    }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+
+using uchar = unsigned char;
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+    }
+
+} // anonymous namespace
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            uchar c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    uchar nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer )
+    :   m_writer( writer )
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ){
+        other.m_writer = nullptr;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if( m_writer )
+            m_writer->endElement();
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, bool indent ) {
+        m_writer->writeText( text, indent );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while( !m_tags.empty() )
+            endElement();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        m_os << m_indent << '<' << name;
+        m_tags.push_back( name );
+        m_indent += "  ";
+        m_tagIsOpen = true;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name ) {
+        ScopedElement scoped( this );
+        startElement( name );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement() {
+        newlineIfNecessary();
+        m_indent = m_indent.substr( 0, m_indent.size()-2 );
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        }
+        else {
+            m_os << m_indent << "</" << m_tags.back() << ">";
+        }
+        m_os << std::endl;
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, bool indent ) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if( tagWasOpen && indent )
+                m_os << m_indent;
+            m_os << XmlEncode( text );
+            m_needsNewline = true;
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( std::string const& text ) {
+        ensureTagClosed();
+        m_os << m_indent << "<!--" << text << "-->";
+        m_needsNewline = true;
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( std::string const& url ) {
+        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    }
+
+    XmlWriter& XmlWriter::writeBlankLine() {
+        ensureTagClosed();
+        m_os << '\n';
+        return *this;
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << ">" << std::endl;
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result) {
+        result.getExpandedExpression();
+    }
+
+    // Because formatting using c++ streams is stateful, drop down to C is required
+    // Alternatively we could use stringstream, but its performance is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        sprintf_s(buffer, "%.3f", duration);
+#else
+        sprintf(buffer, "%.3f", duration);
+#endif
+        return std::string(buffer);
+    }
+
+    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+        :StreamingReporterBase(_config) {}
+
+    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+    const char* failedString() { return "FAILED"; }
+    const char* passedString() { return "PASSED"; }
+#else
+    const char* failedString() { return "failed"; }
+    const char* passedString() { return "passed"; }
+#endif
+
+    // Colour::LightGrey
+    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+    std::string bothOrAll( std::size_t count ) {
+        return count == 1 ? std::string() :
+               count == 2 ? "both " : "all " ;
+    }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+    if (totals.testCases.total() == 0) {
+        out << "No tests ran.";
+    } else if (totals.testCases.failed == totals.testCases.total()) {
+        Colour colour(Colour::ResultError);
+        const std::string qualify_assertions_failed =
+            totals.assertions.failed == totals.assertions.total() ?
+            bothOrAll(totals.assertions.failed) : std::string();
+        out <<
+            "Failed " << bothOrAll(totals.testCases.failed)
+            << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << qualify_assertions_failed <<
+            pluralise(totals.assertions.failed, "assertion") << '.';
+    } else if (totals.assertions.total() == 0) {
+        out <<
+            "Passed " << bothOrAll(totals.testCases.total())
+            << pluralise(totals.testCases.total(), "test case")
+            << " (no assertions).";
+    } else if (totals.assertions.failed) {
+        Colour colour(Colour::ResultError);
+        out <<
+            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+    } else {
+        Colour colour(Colour::ResultSuccess);
+        out <<
+            "Passed " << bothOrAll(totals.testCases.passed)
+            << pluralise(totals.testCases.passed, "test case") <<
+            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+    }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages) {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, passedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+            else
+                printResultType(Colour::Error, failedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, failedString());
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, failedString());
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, failedString());
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, failedString());
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+        if (!passOrFail.empty()) {
+            {
+                Colour colourGuard(colour);
+                stream << ' ' << passOrFail;
+            }
+            stream << ':';
+        }
+    }
+
+    void printIssue(std::string const& issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                Colour colour(dimColour());
+                stream << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            {
+                Colour colour(dimColour());
+                stream << " for: ";
+            }
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = dimColour()) {
+        if (itMessage == messages.end())
+            return;
+
+        // using messages.end() directly yields (or auto) compilation error:
+        std::vector<MessageInfo>::const_iterator itEnd = messages.end();
+        const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+        {
+            Colour colourGuard(colour);
+            stream << " with " << pluralise(N, "message") << ':';
+        }
+
+        for (; itMessage != itEnd; ) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                stream << " '" << itMessage->message << '\'';
+                if (++itMessage != itEnd) {
+                    Colour colourGuard(dimColour());
+                    stream << " and";
+                }
+            }
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        ReporterPreferences CompactReporter::getPreferences() const {
+            return m_reporterPrefs;
+        }
+
+        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            if (m_config->showDurations() == ShowDurations::Always) {
+                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( stream, _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() {}
+
+    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled
+ // and default is missing) is enabled
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        message(result.getMessage()),
+        messages(_stats.infoMessages),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED";
+            //if( result.hasMessage() )
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok";
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED";
+            }
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to unexpected exception with ";
+            if (_stats.infoMessages.size() == 1)
+                messageLabel += "message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel += "messages";
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to a fatal error condition";
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "because no exception was thrown where one was expected";
+            break;
+        case ResultWas::Info:
+            messageLabel = "info";
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning";
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED";
+            colour = Colour::Error;
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "explicitly with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "explicitly with messages";
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **";
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            if (result.isOk())
+                stream << '\n';
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            Colour colourGuard(colour);
+            stream << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            Colour colourGuard(Colour::OriginalExpression);
+            stream << "  ";
+            stream << result.getExpressionInMacro();
+            stream << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            Colour colourGuard(Colour::ReconstructedExpression);
+            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    std::string passOrFail;
+    std::string messageLabel;
+    std::string message;
+    std::vector<MessageInfo> messages;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+    if (i > j && i > k)
+        return i;
+    else if (j > k)
+        return j;
+    else
+        return k;
+}
+
+struct ColumnInfo {
+    enum Justification { Left, Right };
+    std::string name;
+    int width;
+    Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    uint64_t m_inNanoseconds;
+    Unit m_units;
+
+public:
+    explicit Duration(uint64_t inNanoseconds, Unit units = Unit::Auto)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return static_cast<double>(m_inNanoseconds);
+        }
+    }
+    auto unitsAsString() const -> std::string {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns";
+        case Unit::Microseconds:
+            return "µs";
+        case Unit::Milliseconds:
+            return "ms";
+        case Unit::Seconds:
+            return "s";
+        case Unit::Minutes:
+            return "m";
+        default:
+            return "** internal error **";
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << duration.value() << " " << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    std::ostringstream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( std::move( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+            for (auto const& info : m_columnInfos)
+                *this << info.name << ColumnBreak();
+            *this << RowBreak();
+            m_os << Catch::getLineOfChars<'-'>() << "\n";
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << std::endl;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        // This takes account of utf8 encodings
+        auto strSize = Catch::StringRef(colStr).numberOfCharacters();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << "\n";
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 2 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 2), ' ')
+            : std::string();
+        if (colInfo.justification == ColumnInfo::Left)
+            tp.m_os << colStr << padding << " ";
+        else
+            tp.m_os << padding << colStr << " ";
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << "\n";
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+    : StreamingReporterBase(config),
+    m_tablePrinter(new TablePrinter(config.stream(),
+    {
+        { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left },
+        { "iters", 8, ColumnInfo::Right },
+        { "elapsed ns", 14, ColumnInfo::Right },
+        { "average", 14, ColumnInfo::Right }
+    })) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+    stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    if (!includeResults && result.getResultType() != ResultWas::Warning)
+        return false;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+    printer.print();
+    stream << std::endl;
+    return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        Colour colour(Colour::ResultError);
+        if (m_sectionStack.size() > 1)
+            stream << "\nNo assertions in section";
+        else
+            stream << "\nNo assertions in test case";
+        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+    }
+    if (m_config->showDurations() == ShowDurations::Always) {
+        stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    lazyPrintWithoutClosingBenchmarkTable();
+
+    auto nameCol = Column( info.name ).width( static_cast<std::size_t>( m_tablePrinter->columnInfos()[0].width - 2 ) );
+
+    bool firstLine = true;
+    for (auto line : nameCol) {
+        if (!firstLine)
+            (*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+        else
+            firstLine = false;
+
+        (*m_tablePrinter) << line << ColumnBreak();
+    }
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats const& stats) {
+    Duration average(stats.elapsedTimeInNanoseconds / stats.iterations);
+    (*m_tablePrinter)
+        << stats.iterations << ColumnBreak()
+        << stats.elapsedTimeInNanoseconds << ColumnBreak()
+        << average << ColumnBreak();
+}
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+    if (currentGroupInfo.used) {
+        printSummaryDivider();
+        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+        printTotals(_testGroupStats.totals);
+        stream << '\n' << std::endl;
+    }
+    StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTotals(_testRunStats.totals);
+    stream << std::endl;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if (!currentTestRunInfo.used)
+        lazyPrintRunInfo();
+    if (!currentGroupInfo.used)
+        lazyPrintGroupInfo();
+
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    stream << '\n' << getLineOfChars<'~'>() << '\n';
+    Colour colour(Colour::SecondaryText);
+    stream << currentTestRunInfo->name
+        << " is a Catch v" << libraryVersion() << " host application.\n"
+        << "Run with -? for options\n\n";
+
+    if (m_config->rngSeed() != 0)
+        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+    currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+        printClosedHeader("Group: " + currentGroupInfo->name);
+        currentGroupInfo.used = true;
+    }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        Colour colourGuard(Colour::Headers);
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+    if (!lineInfo.empty()) {
+        stream << getLineOfChars<'-'>() << '\n';
+        Colour colourGuard(Colour::FileName);
+        stream << lineInfo << '\n';
+    }
+    stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    stream << getLineOfChars<'-'>() << '\n';
+    {
+        Colour colourGuard(Colour::Headers);
+        printHeaderString(_name);
+    }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    std::size_t i = _string.find(": ");
+    if (i != std::string::npos)
+        i += 2;
+    else
+        i = 0;
+    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+    SummaryColumn( std::string _label, Colour::Code _colour )
+    :   label( std::move( _label ) ),
+        colour( _colour ) {}
+    SummaryColumn addRow( std::size_t count ) {
+        ReusableStringStream rss;
+        rss << count;
+        std::string row = rss.str();
+        for (auto& oldRow : rows) {
+            while (oldRow.size() < row.size())
+                oldRow = ' ' + oldRow;
+            while (oldRow.size() > row.size())
+                row = ' ' + row;
+        }
+        rows.push_back(row);
+        return *this;
+    }
+
+    std::string label;
+    Colour::Code colour;
+    std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+    if (totals.testCases.total() == 0) {
+        stream << Colour(Colour::Warning) << "No tests ran\n";
+    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+        stream << Colour(Colour::ResultSuccess) << "All tests passed";
+        stream << " ("
+            << pluralise(totals.assertions.passed, "assertion") << " in "
+            << pluralise(totals.testCases.passed, "test case") << ')'
+            << '\n';
+    } else {
+
+        std::vector<SummaryColumn> columns;
+        columns.push_back(SummaryColumn("", Colour::None)
+                          .addRow(totals.testCases.total())
+                          .addRow(totals.assertions.total()));
+        columns.push_back(SummaryColumn("passed", Colour::Success)
+                          .addRow(totals.testCases.passed)
+                          .addRow(totals.assertions.passed));
+        columns.push_back(SummaryColumn("failed", Colour::ResultError)
+                          .addRow(totals.testCases.failed)
+                          .addRow(totals.assertions.failed));
+        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+                          .addRow(totals.testCases.failedButOk)
+                          .addRow(totals.assertions.failedButOk));
+
+        printSummaryRow("test cases", columns, 0);
+        printSummaryRow("assertions", columns, 1);
+    }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+    for (auto col : cols) {
+        std::string value = col.rows[row];
+        if (col.label.empty()) {
+            stream << label << ": ";
+            if (value != "0")
+                stream << value;
+            else
+                stream << Colour(Colour::Warning) << "- none -";
+        } else if (value != "0") {
+            stream << Colour(Colour::LightGrey) << " | ";
+            stream << Colour(col.colour)
+                << value << ' ' << col.label;
+        }
+    }
+    stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+        if (totals.testCases.allPassed())
+            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+        else
+            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+    } else {
+        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+    }
+    stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+    stream << getLineOfChars<'-'>() << '\n';
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+
+        std::string fileNameTag(const std::vector<std::string> &tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (std::string const& tag) {return tag.front() == '#'; });
+            if (it != tags.end())
+                return it->substr(1);
+            return std::string();
+        }
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+            m_reporterPrefs.shouldReportAllAssertions = true;
+        }
+
+    JunitReporter::~JunitReporter() {}
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+    }
+
+    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+        CumulativeReporterBase::testGroupStarting( groupInfo );
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        return CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        double suiteTime = suiteTimer.getElapsedSeconds();
+        CumulativeReporterBase::testGroupEnded( testGroupStats );
+        writeGroup( *m_testGroups.back(), suiteTime );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        xml.endElement();
+    }
+
+    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+        TestGroupStats const& stats = groupNode.value;
+        xml.writeAttribute( "name", stats.groupInfo.name );
+        xml.writeAttribute( "errors", unexpectedExceptions );
+        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "tests", stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname", "tbd" ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time", "" );
+        else
+            xml.writeAttribute( "time", suiteTime );
+        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+        // Write test cases
+        for( auto const& child : groupNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), false );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), false );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className = stats.testInfo.className;
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo.tags);
+            if ( className.empty() )
+                className = "global";
+        }
+
+        if ( !m_config->name().empty() )
+            className = m_config->name() + "." + className;
+
+        writeSection( className, "", rootSection );
+    }
+
+    void JunitReporter::writeSection(  std::string const& className,
+                        std::string const& rootName,
+                        SectionNode const& sectionNode ) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( !sectionNode.assertions.empty() ||
+            !sectionNode.stdOut.empty() ||
+            !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname", name );
+                xml.writeAttribute( "name", "root" );
+            }
+            else {
+                xml.writeAttribute( "classname", className );
+                xml.writeAttribute( "name", name );
+            }
+            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+
+            writeAssertions( sectionNode );
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode );
+            else
+                writeSection( className, name, *childNode );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for( auto const& assertion : sectionNode.assertions )
+            writeAssertion( assertion );
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if( !result.isOk() ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                    elementName = "failure";
+                    break;
+                case ResultWas::ExpressionFailed:
+                    elementName = "failure";
+                    break;
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message", result.getExpandedExpression() );
+            xml.writeAttribute( "type", result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if( !result.getMessage().empty() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), false );
+        }
+    }
+
+    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+    ListeningReporter::ListeningReporter() {
+        // We will assume that listeners will always want all assertions
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        m_listeners.push_back( std::move( listener ) );
+    }
+
+    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+        m_reporter = std::move( reporter );
+        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+    }
+
+    ReporterPreferences ListeningReporter::getPreferences() const {
+        return m_preferences;
+    }
+
+    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+        return std::set<Verbosity>{ };
+    }
+
+    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->noMatchingTestCases( spec );
+        }
+        m_reporter->noMatchingTestCases( spec );
+    }
+
+    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkStarting( benchmarkInfo );
+        }
+        m_reporter->benchmarkStarting( benchmarkInfo );
+    }
+    void ListeningReporter::benchmarkEnded( BenchmarkStats const& benchmarkStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkEnded( benchmarkStats );
+        }
+        m_reporter->benchmarkEnded( benchmarkStats );
+    }
+
+    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunStarting( testRunInfo );
+        }
+        m_reporter->testRunStarting( testRunInfo );
+    }
+
+    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupStarting( groupInfo );
+        }
+        m_reporter->testGroupStarting( groupInfo );
+    }
+
+    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseStarting( testInfo );
+        }
+        m_reporter->testCaseStarting( testInfo );
+    }
+
+    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionStarting( sectionInfo );
+        }
+        m_reporter->sectionStarting( sectionInfo );
+    }
+
+    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->assertionStarting( assertionInfo );
+        }
+        m_reporter->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        for( auto const& listener : m_listeners ) {
+            static_cast<void>( listener->assertionEnded( assertionStats ) );
+        }
+        return m_reporter->assertionEnded( assertionStats );
+    }
+
+    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionEnded( sectionStats );
+        }
+        m_reporter->sectionEnded( sectionStats );
+    }
+
+    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseEnded( testCaseStats );
+        }
+        m_reporter->testCaseEnded( testCaseStats );
+    }
+
+    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupEnded( testGroupStats );
+        }
+        m_reporter->testGroupEnded( testGroupStats );
+    }
+
+    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunEnded( testRunStats );
+        }
+        m_reporter->testRunEnded( testRunStats );
+    }
+
+    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->skipTest( testInfo );
+        }
+        m_reporter->skipTest( testInfo );
+    }
+
+    bool ListeningReporter::isMulti() const {
+        return true;
+    }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig const& _config )
+    :   StreamingReporterBase( _config ),
+        m_xml(_config.stream())
+    {
+        m_reporterPrefs.shouldRedirectStdOut = true;
+        m_reporterPrefs.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename", sourceInfo.file )
+            .writeAttribute( "line", sourceInfo.line );
+    }
+
+    void XmlReporter::noMatchingTestCases( std::string const& s ) {
+        StreamingReporterBase::noMatchingTestCases( s );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement( "Catch" );
+        if( !m_config->name().empty() )
+            m_xml.writeAttribute( "name", m_config->name() );
+    }
+
+    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        StreamingReporterBase::testGroupStarting( groupInfo );
+        m_xml.startElement( "Group" )
+            .writeAttribute( "name", groupInfo.name );
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name", trim( testInfo.name ) )
+            .writeAttribute( "description", testInfo.description )
+            .writeAttribute( "tags", testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name", trim( sectionInfo.name ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    m_xml.scopedElement( "Info" )
+                            .writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    m_xml.scopedElement( "Warning" )
+                            .writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if( !includeResults && result.getResultType() != ResultWas::Warning )
+            return true;
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success", result.succeeded() )
+                .writeAttribute( "type", result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                    .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+
+        return true;
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if( --m_sectionDepth > 0 ) {
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+            e.writeAttribute( "successes", sectionStats.assertions.passed );
+            e.writeAttribute( "failures", sectionStats.assertions.failed );
+            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        StreamingReporterBase::testGroupEnded( testGroupStats );
+        // TODO: Check testGroupStats.aborting and act accordingly.
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.endElement();
+    }
+
+    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+    LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << ::Catch::Detail::stringify(msg) )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc )    INTERNAL_CATCH_DYNAMIC_SECTION( "   Given: " << desc )
+#define CATCH_WHEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    When: " << desc )
+#define CATCH_AND_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And when: " << desc )
+#define CATCH_THEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Then: " << desc )
+#define CATCH_AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "     And: " << desc )
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << ::Catch::Detail::stringify(msg) )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc )    INTERNAL_CATCH_DYNAMIC_SECTION( "   Given: " << desc )
+#define WHEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    When: " << desc )
+#define AND_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And when: " << desc )
+#define THEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Then: " << desc )
+#define AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "     And: " << desc )
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... )        (void)(0)
+#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... )         (void)(0)
+#define CATCH_CHECK_FALSE( ... )   (void)(0)
+#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+#define CATCH_CHECK_THROWS( ... )  (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg )    (void)(0)
+#define CATCH_WARN( msg )    (void)(0)
+#define CATCH_CAPTURE( msg ) (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... )       (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... )  (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+
+#define GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/Testing/README.md b/Testing/README.md
new file mode 100644
index 0000000..bafcc78
--- /dev/null
+++ b/Testing/README.md
@@ -0,0 +1,36 @@
+# README for Nymph/Testing
+
+## Catch2
+
+Nymph uses the Catch2 testing framework for unit tests.  See these links for more information:
+
+* [Main GitHub page](https://github.com/catchorg/Catch2)
+* [Tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md)
+
+## Building tests
+
+In CMake, enable the option `Nymph_ENABLE_TESTING`, and build.
+
+The testing executable, `RunTests`, will be installed in `install_prefix/testing`.
+
+## Running tests
+
+To see the available options for running tests, you can do:
+
+```
+> testing/RunTests -h
+```
+
+To simply run all of the tests, you can do:
+
+```
+> testing/RunTests
+```
+
+Or if you want to run a specific test, you can do:
+
+```
+> testing/RunTests [name]
+```
+
+For further documentation on using Catch2, see the [tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md).
diff --git a/Testing/TestExt.cc b/Testing/TestExt.cc
new file mode 100644
index 0000000..9521af1
--- /dev/null
+++ b/Testing/TestExt.cc
@@ -0,0 +1,88 @@
+/*
+ * TestExt.cc
+ *
+ *  Created on: Aug 23, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "KTExtensible.hh"
+
+#include "catch.hpp"
+
+namespace Nymph
+{
+    class MyBaseClass
+    {
+        public:
+            MyBaseClass() {}
+            virtual ~MyBaseClass() {}
+    };
+
+    class MyClass1 : public KTExtensible< MyClass1, MyBaseClass >
+    {
+        public:
+            MyClass1() : KTExtensible< MyClass1, MyBaseClass >(), fValue() {}
+            MyClass1( const MyClass1& orig ) : KTExtensible< MyClass1, MyBaseClass >( orig ), fValue( orig.fValue ) {}
+            virtual ~MyClass1() {};
+        public:
+            int fValue;
+    };
+
+    class MyClass2 : public KTExtensible< MyClass2, MyBaseClass >
+    {
+        public:
+            MyClass2() : KTExtensible< MyClass2, MyBaseClass >(), fValue() {}
+            MyClass2( const MyClass2& orig ) : KTExtensible< MyClass2, MyBaseClass >( orig ), fValue( orig.fValue ) {}
+            virtual ~MyClass2() {};
+        public:
+            int fValue;
+    };
+
+}
+
+TEST_CASE( "extensible", "[utility]" )
+{
+    using namespace Nymph;
+
+    std::shared_ptr< MyClass1 > data1 = std::make_shared< MyClass1 >();
+    data1->fValue = 5;
+
+    MyClass2& data2 = data1->Of< MyClass2 >();
+    data2.fValue = 3;
+
+    std::shared_ptr< MyClass2 > data2Shared = data1->Share< MyClass2 >();
+
+    SECTION( "Basic extensibility and values" )
+    {
+        REQUIRE( data1->Has< MyClass1 >() );
+        REQUIRE( data1->Has< MyClass2 >() );
+        REQUIRE_FALSE( data2.Has< MyClass1 >() );
+        REQUIRE( data2.Has< MyClass2 >() );
+
+        REQUIRE( data1->fValue == 5 );
+        REQUIRE( data2.fValue == 3 );
+
+        REQUIRE( data2Shared->fValue == 3 );
+
+        REQUIRE( data1->size() == 2 );
+        REQUIRE( data2.size() == 1 );
+    }
+
+    std::shared_ptr< MyClass1 > copyOfData1 = std::make_shared< MyClass1 >( *data1 );
+    MyClass2& copyOfData2 = copyOfData1->Of< MyClass2 >();
+
+    SECTION( "Copying data" )
+    {
+        REQUIRE( copyOfData1->fValue == data1->fValue );
+        REQUIRE_FALSE( copyOfData1 == data1 );
+        REQUIRE( copyOfData2.fValue == data2.fValue );
+    }
+
+    std::shared_ptr< MyClass2 > detatchedCopyOfData2 = copyOfData1->Detatch< MyClass2 >();
+
+    SECTION( "Detatching" )
+    {
+        REQUIRE( copyOfData1->size() == 1 );
+        REQUIRE( detatchedCopyOfData2->size() == 1 );
+    }
+}
diff --git a/Testing/UseCatch.cc b/Testing/UseCatch.cc
new file mode 100644
index 0000000..4cb169c
--- /dev/null
+++ b/Testing/UseCatch.cc
@@ -0,0 +1,10 @@
+/*
+ * use_catch.cc
+ *
+ *  Created on: Aug 14, 2018
+ *      Author: N.S. Oblath
+ */
+
+// Tells Catch to provide a main()
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"

From 8f1411d33c0c726a9214f5a69f14ef404ee2bf5f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 26 Aug 2019 09:48:29 -0700
Subject: [PATCH 132/521] Added a Dockerfile

---
 .dockerignore | 31 +++++++++++++++++++++++++++++++
 Dockerfile    | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..a97774f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,31 @@
+#general:
+*.swp
+*.o
+*.so
+*.a
+*.dylib
+
+#mac
+.DS_Store
+
+#from Eclipse
+.project
+.cproject
+
+#from cmake
+CMakeCache.txt
+CMakeFiles/
+Makefile
+build*/
+cbuild*/
+cmake_install.cmake
+*Dict.h
+*Dict.cxx
+Documentation/ReferenceGuide/Doxyfile
+Source/Main/ExtractEvents
+Source/Main/SimpleElectronHunt
+Source/Applications/Main/SimpleElectronHunt
+install_manifest.txt
+
+# from emacs
+*~
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..b743827
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,50 @@
+FROM project8/p8compute_dependencies:v0.7.0 as nymph_common
+
+ARG build_type=Release
+ENV NYMPH_BUILD_TYPE=$build_type
+ARG build_tests_exe=FALSE
+ENV NYMPH_BUILD_TESTS_EXE=$build_tests_exe
+
+ENV NYMPH_TAG=v2.17.0
+ENV NYMPH_BUILD_PREFIX=/usr/local/p8/katydid/$NYMPH_TAG
+
+RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
+    chmod -R 777 $NYMPH_BUILD_PREFIX/.. &&\
+    cd $NYMPH_BUILD_PREFIX &&\
+    echo "source ${COMMON_BUILD_PREFIX}/setup.sh" > setup.sh &&\
+    echo "export NYMPH_TAG=${NYMPH_TAG}" >> setup.sh &&\
+    echo "export NYMPH_BUILD_PREFIX=${NYMPH_BUILD_PREFIX}" >> setup.sh &&\
+    echo 'ln -sfT $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX/../current' >> setup.sh &&\
+    echo 'export PATH=$NYMPH_BUILD_PREFIX/bin:$PATH' >> setup.sh &&\
+    echo 'export LD_LIBRARY_PATH=$NYMPH_BUILD_PREFIX/lib:$LD_LIBRARY_PATH' >> setup.sh &&\
+    /bin/true
+
+########################
+FROM nymph_common as nymph_done
+
+COPY cmake /tmp_source/cmake
+COPY Executables /tmp_source/Executables
+COPY External /tmp_source/External
+COPY Library /tmp_source/Library
+COPY Scarab /tmp_source/Scarab
+COPY CMakeLists.txt /tmp_source/CMakeLists.txt
+COPY .git /tmp_source/.git
+
+# repeat the cmake command to get the change of install prefix to set correctly (a package_builder known issue)
+RUN source $NYMPH_BUILD_PREFIX/setup.sh &&\
+    cd /tmp_source &&\
+    mkdir build &&\
+    cd build &&\
+    cmake -D CMAKE_BUILD_TYPE=$NYMPH_BUILD_TYPE \
+          -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_BUILD_PREFIX \
+          -D Nymph_ENABLE_TESTING:BOOL=$NYMPH_BUILD_TESTS_EXE .. &&\
+    cmake -D CMAKE_BUILD_TYPE=$NYMPH_BUILD_TYPE \
+          -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_BUILD_PREFIX \
+          -D Nymph_ENABLE_TESTING:BOOL=$NYMPH_BUILD_TESTS_EXE .. &&\
+    make -j3 install &&\
+    /bin/true
+
+########################
+FROM nymph_common
+
+COPY --from=nymph_done $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX

From f73aa479a37d2d4803b0b2cf2e2edce3e4144935 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 28 Aug 2019 00:33:04 -0700
Subject: [PATCH 133/521] Some bug fixing

---
 Library/Processor/KTSignalSlotBase.hh  |  4 +--
 Library/Processor/KTThreadReference.hh | 38 ++++++++++++--------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/Library/Processor/KTSignalSlotBase.hh b/Library/Processor/KTSignalSlotBase.hh
index f775c93..35a7db1 100644
--- a/Library/Processor/KTSignalSlotBase.hh
+++ b/Library/Processor/KTSignalSlotBase.hh
@@ -24,9 +24,9 @@ namespace Nymph
             KTSlotBase( const std::string& name, XOwner* owner );
             virtual ~KTSlotBase();
 
-            void AddConnection( KTSignalBase* ) const = 0;
+            virtual void AddConnection( KTSignalBase* ) const = 0;
 
-            void RemoveConnection( KTSignalBase* ) const = 0;
+            virtual void RemoveConnection( KTSignalBase* ) const = 0;
 
             MEMBERVARIABLE_REF( std::string, Name );
     };
diff --git a/Library/Processor/KTThreadReference.hh b/Library/Processor/KTThreadReference.hh
index e6d88fe..b792c3f 100644
--- a/Library/Processor/KTThreadReference.hh
+++ b/Library/Processor/KTThreadReference.hh
@@ -36,7 +36,7 @@ namespace Nymph
             // for use within the thread
             //**************************
 
-            void SetReturnException( boost::exception_ptr excPtr );
+            //void SetReturnException( boost::exception_ptr excPtr );
 
         public:
             //******************************
@@ -85,6 +85,8 @@ namespace Nymph
             // for use outside of the thread
             //******************************
 
+            void SetReturnException( boost::exception_ptr excPtr );
+
             KTDataHandle GetReturnValue();
             boost::unique_future< KTDataHandle >& GetDataPtrRetFuture();
             const boost::unique_future< KTDataHandle >& GetDataPtrRetFuture() const;
@@ -96,62 +98,58 @@ namespace Nymph
             boost::unique_future< KTDataHandle > fDataPtrRetFuture;
     };
 
-    inline void KTThreadReference::SetReturnException( boost::exception_ptr excPtr )
+    template< typename... XArgs >
+    void KTThreadReference< XArgs... >::SetReturnException( boost::exception_ptr excPtr )
     {
         fDataPtrRet.set_exception( excPtr );
         return;
     }
 
-    inline void KTThreadReference::SetReturnValue( KTDataHandle dataHandle )
+    template< typename... XArgs >
+    void KTThreadReference< XArgs... >::SetReturnValue( XArgs... dataHandle )
     {
-        fDataPtrRet.set_value( dataHandle );
+        fDataPtrRet.set_value( dataHandle... );
         return;
     }
 
-    inline KTDataHandle KTThreadReference::GetReturnValue()
+    template< typename... XArgs >
+    KTDataHandle KTThreadReference< XArgs... >::GetReturnValue()
     {
         return fDataPtrRetFuture.get();
     }
 
-    inline boost::unique_future< KTDataHandle >& KTThreadReference::GetDataPtrRetFuture()
+    template< typename... XArgs >
+    boost::unique_future< KTDataHandle >& KTThreadReference< XArgs... >::GetDataPtrRetFuture()
     {
         return fDataPtrRetFuture;
     }
 
-    inline const boost::unique_future< KTDataHandle >& KTThreadReference::GetDataPtrRetFuture() const
+    template< typename... XArgs >
+    const boost::unique_future< KTDataHandle >& KTThreadReference< XArgs... >::GetDataPtrRetFuture() const
     {
         return fDataPtrRetFuture;
     }
 
-    inline void KTThreadReference::RefreshDataPtrRet()
+    template< typename... XArgs >
+    void KTThreadReference< XArgs... >::RefreshDataPtrRet()
     {
         fDataPtrRet = KTDataPtrReturn();
         fDataPtrRetFuture = fDataPtrRet.get_future();
         return;
     }
 
-    inline void KTThreadReference::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
+    inline void KTThreadReferenceBase::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
     {
         fInitiateBreakFunc = initBreakFunc;
         return;
     }
 
-    inline void KTThreadReference::SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc )
+    inline void KTThreadReferenceBase::SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc )
     {
         fWaitForContinueFunc = waitForContFunc;
         return;
     }
 
-    inline boost::mutex& KTThreadReference::Mutex()
-    {
-        return fMutex;
-    }
-
-    inline const boost::mutex& KTThreadReference::Mutex() const
-    {
-        return fMutex;
-    }
-
 
 #ifndef THROW_THREADREF_EXCEPTION
 #define THROW_THREADREF_EXCEPTION( ref, exc ) \

From 24541ce35c9b344b9d6d44bac2498b5058959e55 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 28 Aug 2019 00:57:50 -0700
Subject: [PATCH 134/521] Remove everything from the build

---
 Executables/Main/CMakeLists.txt |   6 +-
 Library/CMakeLists.txt          | 142 ++++++++++++++++----------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/Executables/Main/CMakeLists.txt b/Executables/Main/CMakeLists.txt
index 8fd619b..e41ac9d 100644
--- a/Executables/Main/CMakeLists.txt
+++ b/Executables/Main/CMakeLists.txt
@@ -7,15 +7,15 @@ if( Nymph_ENABLE_EXECUTABLES )
     message(STATUS "Nymph exectuables library dependencies: ${all_libs}" )
     
     set( programs
-        ConfigCheck
+#        ConfigCheck
     )
     
     if( Nymph_BUILD_NYMPH_EXE )
         set( programs
-            Nymph
+#            Nymph
         )
     endif( Nymph_BUILD_NYMPH_EXE )
     
-    pbuilder_executables( programs all_libs )
+#    pbuilder_executables( programs all_libs )
     
 endif( Nymph_ENABLE_EXECUTABLES )
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index ba43a3d..93c2421 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -10,80 +10,80 @@ set( IO_DIR IO )
 set( APPL_DIR Application )
 
 set( NYMPH_HEADERFILES
-    ${UTIL_DIR}/KTCacheDirectory.hh
-    ${UTIL_DIR}/KTConcurrentQueue.hh
-    ${UTIL_DIR}/KTConfigurable.hh
-    ${UTIL_DIR}/KTDirectory.hh
-    ${UTIL_DIR}/KTEventLoop.hh
-    ${UTIL_DIR}/KTException.hh
-    ${UTIL_DIR}/KTExtensible.hh
-    ${UTIL_DIR}/KTExtensibleStruct.hh
-    ${UTIL_DIR}/KTExtensibleStructFactory.hh
-    ${UTIL_DIR}/KTLogger.hh
-    ${UTIL_DIR}/KTMemberVariable.hh
-    ${UTIL_DIR}/KTTIFactory.hh
-    ${UTIL_DIR}/KTTime.hh
-    ${DATA_DIR}/KTApplyCut.hh
-    ${DATA_DIR}/KTCoreData.hh
-    ${DATA_DIR}/KTCut.hh
-    ${DATA_DIR}/KTCutFilter.hh
-    ${DATA_DIR}/KTCutResult.hh
-    ${DATA_DIR}/KTCutStatus.hh
-    ${DATA_DIR}/KTData.hh
-    ${DATA_DIR}/KTRegisterNymphExtData.hh
-    ${PROC_DIR}/KTConnection.hh
-    ${PROC_DIR}/KTPrimaryProcessor.hh
-    ${PROC_DIR}/KTProcessor.hh
-    ${PROC_DIR}/KTSignal.hh
-    ${PROC_DIR}/KTSignalWrapper.hh
-    ${PROC_DIR}/KTSlot.hh
-    ${PROC_DIR}/KTSlotWrapper.hh
-    ${PROC_DIR}/KTThreadReference.hh
-    ${IO_DIR}/KTJSONWriter.hh
-    ${IO_DIR}/KTReader.hh
-    ${IO_DIR}/KTWriter.hh
-    ${APPL_DIR}/KTApplication.hh
-    ${APPL_DIR}/KTCommandLineHandler.hh
-    ${APPL_DIR}/KTCommandLineOption.hh
-    ${APPL_DIR}/KTConfigurator.hh
-    ${APPL_DIR}/KTDataQueueProcessor.hh
-    ${APPL_DIR}/KTFilenameParsers.hh
-    ${APPL_DIR}/KTPrintDataStructure.hh
-    ${APPL_DIR}/KTProcessorToolbox.hh
-    ${APPL_DIR}/KTRunNymph.hh
-    ${APPL_DIR}/KTThroughputProfiler.hh
+#    ${UTIL_DIR}/KTCacheDirectory.hh
+#    ${UTIL_DIR}/KTConcurrentQueue.hh
+#    ${UTIL_DIR}/KTConfigurable.hh
+#    ${UTIL_DIR}/KTDirectory.hh
+#    ${UTIL_DIR}/KTEventLoop.hh
+#    ${UTIL_DIR}/KTException.hh
+#    ${UTIL_DIR}/KTExtensible.hh
+#    ${UTIL_DIR}/KTExtensibleStruct.hh
+#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
+#    ${UTIL_DIR}/KTLogger.hh
+#    ${UTIL_DIR}/KTMemberVariable.hh
+#    ${UTIL_DIR}/KTTIFactory.hh
+#    ${UTIL_DIR}/KTTime.hh
+#    ${DATA_DIR}/KTApplyCut.hh
+#    ${DATA_DIR}/KTCoreData.hh
+#    ${DATA_DIR}/KTCut.hh
+#    ${DATA_DIR}/KTCutFilter.hh
+#    ${DATA_DIR}/KTCutResult.hh
+#    ${DATA_DIR}/KTCutStatus.hh
+#    ${DATA_DIR}/KTData.hh
+#    ${DATA_DIR}/KTRegisterNymphExtData.hh
+#    ${PROC_DIR}/KTConnection.hh
+#    ${PROC_DIR}/KTPrimaryProcessor.hh
+#    ${PROC_DIR}/KTProcessor.hh
+#    ${PROC_DIR}/KTSignal.hh
+#    ${PROC_DIR}/KTSignalWrapper.hh
+#    ${PROC_DIR}/KTSlot.hh
+#    ${PROC_DIR}/KTSlotWrapper.hh
+#    ${PROC_DIR}/KTThreadReference.hh
+#    ${IO_DIR}/KTJSONWriter.hh
+#    ${IO_DIR}/KTReader.hh
+#    ${IO_DIR}/KTWriter.hh
+#    ${APPL_DIR}/KTApplication.hh
+#    ${APPL_DIR}/KTCommandLineHandler.hh
+#    ${APPL_DIR}/KTCommandLineOption.hh
+#    ${APPL_DIR}/KTConfigurator.hh
+#    ${APPL_DIR}/KTDataQueueProcessor.hh
+#    ${APPL_DIR}/KTFilenameParsers.hh
+#    ${APPL_DIR}/KTPrintDataStructure.hh
+#    ${APPL_DIR}/KTProcessorToolbox.hh
+#    ${APPL_DIR}/KTRunNymph.hh
+#    ${APPL_DIR}/KTThroughputProfiler.hh
 )
 
 set( NYMPH_SOURCEFILES
-    ${UTIL_DIR}/KTCacheDirectory.cc
-    ${UTIL_DIR}/KTConfigurable.cc
-    ${UTIL_DIR}/KTDirectory.cc
-    ${UTIL_DIR}/KTEventLoop.cc
-    ${UTIL_DIR}/KTException.cc
-    ${UTIL_DIR}/KTTime.cc
-    ${DATA_DIR}/KTApplyCut.cc
-    ${DATA_DIR}/KTCoreData.cc
-    ${DATA_DIR}/KTCut.cc
-    ${DATA_DIR}/KTCutFilter.cc
-    ${DATA_DIR}/KTCutStatus.cc
-    ${DATA_DIR}/KTData.cc
-    ${PROC_DIR}/KTPrimaryProcessor.cc
-    ${PROC_DIR}/KTProcessor.cc
-    ${PROC_DIR}/KTSignalWrapper.cc
-    ${PROC_DIR}/KTSlotWrapper.cc
-    ${PROC_DIR}/KTThreadReference.cc
-    ${IO_DIR}/KTJSONWriter.cc
-    ${IO_DIR}/KTReader.cc
-    ${IO_DIR}/KTWriter.cc
-    ${APPL_DIR}/KTApplication.cc
-    ${APPL_DIR}/KTCommandLineHandler.cc
-    ${APPL_DIR}/KTConfigurator.cc
-    ${APPL_DIR}/KTDataQueueProcessor.cc
-    ${APPL_DIR}/KTFilenameParsers.cc
-    ${APPL_DIR}/KTPrintDataStructure.cc
-    ${APPL_DIR}/KTProcessorToolbox.cc
-    ${APPL_DIR}/KTRunNymph.cc
-    ${APPL_DIR}/KTThroughputProfiler.cc
+#    ${UTIL_DIR}/KTCacheDirectory.cc
+#    ${UTIL_DIR}/KTConfigurable.cc
+#    ${UTIL_DIR}/KTDirectory.cc
+#    ${UTIL_DIR}/KTEventLoop.cc
+#    ${UTIL_DIR}/KTException.cc
+#    ${UTIL_DIR}/KTTime.cc
+#    ${DATA_DIR}/KTApplyCut.cc
+#    ${DATA_DIR}/KTCoreData.cc
+#    ${DATA_DIR}/KTCut.cc
+#    ${DATA_DIR}/KTCutFilter.cc
+#    ${DATA_DIR}/KTCutStatus.cc
+#    ${DATA_DIR}/KTData.cc
+#    ${PROC_DIR}/KTPrimaryProcessor.cc
+#    ${PROC_DIR}/KTProcessor.cc
+#    ${PROC_DIR}/KTSignalWrapper.cc
+#    ${PROC_DIR}/KTSlotWrapper.cc
+#    ${PROC_DIR}/KTThreadReference.cc
+#    ${IO_DIR}/KTJSONWriter.cc
+#    ${IO_DIR}/KTReader.cc
+#    ${IO_DIR}/KTWriter.cc
+#    ${APPL_DIR}/KTApplication.cc
+#    ${APPL_DIR}/KTCommandLineHandler.cc
+#    ${APPL_DIR}/KTConfigurator.cc
+#    ${APPL_DIR}/KTDataQueueProcessor.cc
+#    ${APPL_DIR}/KTFilenameParsers.cc
+#    ${APPL_DIR}/KTPrintDataStructure.cc
+#    ${APPL_DIR}/KTProcessorToolbox.cc
+#    ${APPL_DIR}/KTRunNymph.cc
+#    ${APPL_DIR}/KTThroughputProfiler.cc
 )
 
 # Python binding headers

From f0e1e9d6934fa0a3103fba4cd3eca3a29d495307 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 28 Aug 2019 01:22:33 -0700
Subject: [PATCH 135/521] Starting rebuild: Exception.cc/hh and
 MemberVariable.hh

---
 Library/CMakeLists.txt            |   3 +
 Library/Utility/Exception.cc      |  30 +++++++
 Library/Utility/Exception.hh      | 127 ++++++++++++++++++++++++++++++
 Library/Utility/MemberVariable.hh |  93 ++++++++++++++++++++++
 4 files changed, 253 insertions(+)
 create mode 100644 Library/Utility/Exception.cc
 create mode 100644 Library/Utility/Exception.hh
 create mode 100644 Library/Utility/MemberVariable.hh

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 93c2421..1411560 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -52,6 +52,8 @@ set( NYMPH_HEADERFILES
 #    ${APPL_DIR}/KTProcessorToolbox.hh
 #    ${APPL_DIR}/KTRunNymph.hh
 #    ${APPL_DIR}/KTThroughputProfiler.hh
+    ${UTIL_DIR}/Exception.hh
+    ${UTIL_DIR}/MemberVariable.hh
 )
 
 set( NYMPH_SOURCEFILES
@@ -84,6 +86,7 @@ set( NYMPH_SOURCEFILES
 #    ${APPL_DIR}/KTProcessorToolbox.cc
 #    ${APPL_DIR}/KTRunNymph.cc
 #    ${APPL_DIR}/KTThroughputProfiler.cc
+    ${UTIL_DIR}/Exception.cc
 )
 
 # Python binding headers
diff --git a/Library/Utility/Exception.cc b/Library/Utility/Exception.cc
new file mode 100644
index 0000000..6770e91
--- /dev/null
+++ b/Library/Utility/Exception.cc
@@ -0,0 +1,30 @@
+/*
+ * Exception.cc
+ *
+ *  Created on: Feb 25, 2014
+ *      Author: nsoblath
+ */
+
+#include "Exception.hh"
+
+namespace Nymph
+{
+
+    Exception::Exception() :
+            boost::exception(),
+            std::exception(),
+            fMsgBuffer()
+    {
+    }
+    Exception::Exception( const Exception& an_exception ) :
+            boost::exception( an_exception ),
+            std::exception( an_exception ),
+            fMsgBuffer( an_exception.fMsgBuffer )
+    {
+    }
+
+    Exception::~Exception() throw ()
+    {
+    }
+
+}
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
new file mode 100644
index 0000000..cc7c542
--- /dev/null
+++ b/Library/Utility/Exception.hh
@@ -0,0 +1,127 @@
+/*
+ * Exception.hh
+ *
+ *  Created on: Feb 25, 2014
+ *      Author: nsoblath
+ */
+
+
+#ifndef NYMPH_EXCEPTION_HH_
+#define NYMPH_EXCEPTION_HH_
+
+#include "macros.hh"
+
+#include <boost/exception/all.hpp>
+
+#include <exception>
+#include <sstream>
+#include <string>
+
+namespace Nymph
+{
+    struct MessageEnd {};
+    static const MessageEnd eom = MessageEnd();
+
+    //typedef boost::error_info<struct tag_errmsg, std::string> ErrorMsgInfo;
+
+    template< class XLabel >
+    using ErrorMsgInfo = boost::error_info< XLabel, std::string>;
+
+    /*!
+     @class Exception
+     @author N.S. Oblath
+
+     @brief Exception base class for Nymph and Nymph-based projects
+
+     @details
+
+     How to throw:
+
+     BOOST_THROW_EXCEPTION( Exception() << "[error message here]" << eom );
+
+     Why do it like this?
+      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
+      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
+      - Exception can be replaced with whatever derived exception class you're using.
+
+      How to catch, add information, and re-throw:
+
+      try
+      {
+          // code that throws a Exception
+      }
+      catch( boost::exception& e )
+      {
+          e << ErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
+          throw;
+      }
+
+
+      How to do the final catch
+
+      try
+      {
+          // code that throws a Exception
+      }
+      catch( boost::exception& e )
+      {
+          ERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
+      }
+    */
+
+    class Exception : virtual public boost::exception, virtual public std::exception
+    {
+        public:
+            Exception();
+            Exception( const Exception& );
+            ~Exception() throw ();
+
+            // adds to the message buffer
+            template< class XStreamable >
+            Exception& operator<<( XStreamable a_fragment );
+            // adds to the message buffer
+            Exception& operator<<( const std::string& a_fragment );
+            // adds to the message buffer
+            Exception& operator<<( const char* a_fragment );
+
+            // adds the current contents of the message buffer as a ErrorMsgInfo
+            Exception& operator<<( const MessageEnd& eom );
+
+        private:
+            mutable std::string fMsgBuffer;
+    };
+
+    template< class XStreamable >
+    Exception& Exception::operator<<( XStreamable a_fragment )
+    {
+        std::stringstream stream;
+        stream << a_fragment;
+        stream >> fMsgBuffer;
+        return *this;
+    }
+
+    inline Exception& Exception::operator<<( const std::string& a_fragment )
+    {
+        fMsgBuffer += a_fragment;
+        return *this;
+    }
+
+    inline Exception& Exception::operator<<( const char* a_fragment )
+    {
+        fMsgBuffer += std::string( a_fragment );
+        return *this;
+    }
+
+    inline Exception& Exception::operator<<( const MessageEnd& eom )
+    {
+        if( ! fMsgBuffer.empty() )
+        {
+            boost::operator<<( *this, ErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
+            fMsgBuffer.clear();
+        }
+        return *this;
+    }
+
+}
+
+#endif /* NYMPH_EXCEPTION_HH_ */
diff --git a/Library/Utility/MemberVariable.hh b/Library/Utility/MemberVariable.hh
new file mode 100644
index 0000000..b48e3ef
--- /dev/null
+++ b/Library/Utility/MemberVariable.hh
@@ -0,0 +1,93 @@
+/*
+ * MemberVariable.hh
+ *
+ *  Created on: Aug 5, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef NYMPH_MEMBERVARIABLE_HH_
+#define NYMPH_MEMBERVARIABLE_HH_
+
+/**
+ * Macros for class member variables
+ *
+ * In all cases remember to initialize the variables!
+ *
+ * For "normal" variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [type fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMVAR
+ *  - MEMVAR_NOSET
+ *  - MEMVAR_STATIC
+ *  - MEMVAR_STATIC_NOSET
+ *
+ * For variables accessed by reference
+ * Defines accessors [const type& MyVar() const], [type& MyVar()], and member variable [type fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMVAR_REF
+ *  - MEMVAR_REF_CONST
+ *  - MEMVAR_REF_STATIC
+ *  - MEMVAR_REF_STATIC_CONST
+ *
+ * For pointer variables
+ * Defines accessors [type* GetMyVar() const], [void SetMyVar( type* )], and member variable [type* fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMVAR_PTR
+ *  - MEMVAR_PTR_NOSET
+ *  - MEMVAR_PTR_STATIC
+ *  - MEMVAR_PTR_STATIC_NOSET
+ *
+ * For shared_ptr's
+ * Defines accessors [const std::shared_ptr< type > MyVar() const], [std::shared_ptr< type > MyVar()], and member variable [std::shared_ptr< type > fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMVAR_SHARED_PTR
+ *  - MEMVAR_SHARED_PTR_CONST
+ *  - MEMVAR_SHARED_PTR_STATIC
+ *  - MEMVAR_SHARED_PTR_STATIC_CONST
+ *
+ * For atomic variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [std::atomic< type > fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMVAR_ATOMIC
+ *  - MEMVAR_ATOMIC_NOSET
+ *  - MEMVAR_ATOMIC_STATIC
+ *  - MEMVAR_ATOMIC_STATIC_NOSET
+ *
+ */
+
+#include "_camel_case_member_variables.hh"
+
+#define MEMVAR                         camel_case_mv_accessible
+#define MEMVAR_NOSET                   camel_case_mv_accessible_noset
+#define MEMVAR_STATIC                  camel_case_mv_accessible_static
+#define MEMVAR_STATIC_NOSET            camel_case_mv_accessible_static_noset
+#define MEMVAR_MUTABLE                 camel_case_mv_accessible_mutable
+#define MEMVAR_MUTABLE_NOSET           camel_case_mv_accessible_mutable_noset
+
+#define MEMVAR_REF                     camel_case_mv_referrable
+#define MEMVAR_REF_CONST               camel_case_mv_referrable_const
+#define MEMVAR_REF_STATIC              camel_case_mv_referrable_static
+#define MEMVAR_REF_MUTABLE             camel_case_mv_referrable_mutable
+#define MEMVAR_REF_MUTABLE_CONST       camel_case_mv_referrable_mutable
+
+#define MEMVAR_PTR                     camel_case_mv_assignable
+#define MEMVAR_PTR_NOSET               camel_case_mv_assignable_noset
+#define MEMVAR_PTR_STATIC              camel_case_mv_assignable_static
+#define MEMVAR_PTR_STATIC_NOSET        camel_case_mv_assignable_static_noset
+#define MEMVAR_PTR_MUTABLE             camel_case_mv_assignable_mutable
+#define MEMVAR_PTR_MUTABLE_NOSET       camel_case_mv_assignable_mutable_noset
+
+#define MEMVAR_SHARED_PTR              camel_case_mv_shared_ptr
+#define MEMVAR_SHARED_PTR_CONST        camel_case_mv_shared_ptr_const
+#define MEMVAR_SHARED_PTR_STATIC       camel_case_mv_shared_ptr_static
+#define MEMVAR_SHARED_PTR_MUTABLE      camel_case_mv_shared_ptr_mutable
+#define MEMVAR_SHARED_PTR_MUTABLE_CONST camel_case_mv_shared_ptr_mutable
+
+#define MEMVAR_ATOMIC                  camel_case_mv_atomic
+#define MEMVAR_ATOMIC_NOSET            camel_case_mv_atomic_noset
+#define MEMVAR_ATOMIC_STATIC           camel_case_mv_atomic_static
+#define MEMVAR_ATOMIC_STATIC_NOSET     camel_case_mv_atomic_static_noset
+#define MEMVAR_ATOMIC_MUTABLE          camel_case_mv_atomic_mutable
+#define MEMVAR_ATOMIC_MUTABLE_NOSET    camel_case_mv_atomic_mutable_noset
+
+#endif /* NYMPH_MEMBERVARIABLE_HH_ */

From e08ad5406da76007b2510e8f10bb6acaf3b47d55 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 2 Sep 2019 02:44:01 -0700
Subject: [PATCH 136/521] Moved old library to a separate directory.  New
 .gitignore.

---
 .gitignore                                    |  55 +++++---
 Library/CMakeLists.txt                        |  98 +-------------
 .../AddLibPythonPath.sh.in                    |   0
 .../Application/KTApplication.cc              |   0
 .../Application/KTApplication.hh              |   0
 .../Application/KTCommandLineHandler.cc       |   0
 .../Application/KTCommandLineHandler.hh       |   0
 .../Application/KTCommandLineOption.hh        |   0
 .../Application/KTConfigurator.cc             |   0
 .../Application/KTConfigurator.hh             |   0
 .../Application/KTDataQueueProcessor.cc       |   0
 .../Application/KTDataQueueProcessor.hh       |   0
 .../Application/KTFilenameParsers.cc          |   0
 .../Application/KTFilenameParsers.hh          |   0
 .../Application/KTPrintDataStructure.cc       |   0
 .../Application/KTPrintDataStructure.hh       |   0
 .../Application/KTProcessorToolbox.cc         |   0
 .../Application/KTProcessorToolbox.hh         |   0
 .../Application/KTProcessorToolboxPybind.hh   |   0
 .../Application/KTRunNymph.cc                 |   0
 .../Application/KTRunNymph.hh                 |   0
 .../Application/KTThroughputProfiler.cc       |   0
 .../Application/KTThroughputProfiler.hh       |   0
 Library_v1/CMakeLists.txt                     | 121 ++++++++++++++++++
 {Library => Library_v1}/Data/KTApplyCut.cc    |   0
 {Library => Library_v1}/Data/KTApplyCut.hh    |   0
 {Library => Library_v1}/Data/KTCoreData.cc    |   0
 {Library => Library_v1}/Data/KTCoreData.hh    |   0
 {Library => Library_v1}/Data/KTCut.cc         |   0
 {Library => Library_v1}/Data/KTCut.hh         |   0
 {Library => Library_v1}/Data/KTCutFilter.cc   |   0
 {Library => Library_v1}/Data/KTCutFilter.hh   |   0
 {Library => Library_v1}/Data/KTCutResult.hh   |   0
 {Library => Library_v1}/Data/KTCutStatus.cc   |   0
 {Library => Library_v1}/Data/KTCutStatus.hh   |   0
 {Library => Library_v1}/Data/KTData.cc        |   0
 {Library => Library_v1}/Data/KTData.hh        |   0
 .../Data/KTRegisterNymphExtData.hh            |   0
 Library_v1/Data/KTTester.cc                   |  24 ++++
 Library_v1/Data/KTTester.hh                   |  41 ++++++
 {Library => Library_v1}/IO/KTJSONWriter.cc    |   0
 {Library => Library_v1}/IO/KTJSONWriter.hh    |   0
 {Library => Library_v1}/IO/KTReader.cc        |   0
 {Library => Library_v1}/IO/KTReader.hh        |   0
 {Library => Library_v1}/IO/KTWriter.cc        |   0
 {Library => Library_v1}/IO/KTWriter.hh        |   0
 {Library => Library_v1}/NymphPybind.cc        |   0
 .../Processor/KTConnection.hh                 |   0
 .../Processor/KTNymphSignals.hh               |   0
 .../Processor/KTNymphSlot.hh                  |   0
 .../Processor/KTPrimaryProcessor.cc           |   0
 .../Processor/KTPrimaryProcessor.hh           |   0
 .../Processor/KTProcessor.cc                  |   0
 .../Processor/KTProcessor.hh                  |   0
 .../Processor/KTProcessorPybind.cc            |   0
 .../Processor/KTProcessorPybind.hh            |   0
 .../Processor/KTPyProcessor.hh                |   0
 {Library => Library_v1}/Processor/KTSignal.hh |   0
 .../Processor/KTSignalSlotBase.hh             |   0
 .../Processor/KTSignalWrapper.cc              |   0
 .../Processor/KTSignalWrapper.hh              |   0
 {Library => Library_v1}/Processor/KTSlot.hh   |   0
 .../Processor/KTSlotWrapper.cc                |   0
 .../Processor/KTSlotWrapper.hh                |   0
 .../Processor/KTThreadReference.cc            |   0
 .../Processor/KTThreadReference.hh            |   0
 .../Utility/KTCacheDirectory.cc               |   0
 .../Utility/KTCacheDirectory.hh               |   0
 .../Utility/KTConcurrentQueue.hh              |   0
 .../Utility/KTConfigurable.cc                 |   0
 .../Utility/KTConfigurable.hh                 |   0
 .../Utility/KTConfigurablePybind.hh           |   0
 .../Utility/KTDirectory.cc                    |   0
 .../Utility/KTDirectory.hh                    |   0
 .../Utility/KTEventLoop.cc                    |   0
 .../Utility/KTEventLoop.hh                    |   0
 .../Utility/KTException.cc                    |   0
 .../Utility/KTException.hh                    |   0
 .../Utility/KTExtensible.hh                   |   0
 .../Utility/KTExtensibleStruct.hh             |   0
 .../Utility/KTExtensibleStructFactory.hh      |   0
 {Library => Library_v1}/Utility/KTLogger.hh   |   0
 .../Utility/KTMemberVariable.hh               |   0
 .../Utility/KTParamPybind.hh                  |   0
 .../Utility/KTPythonMacros.hh                 |   0
 .../Utility/KTTIFactory.hh                    |   0
 {Library => Library_v1}/Utility/KTTime.cc     |   0
 {Library => Library_v1}/Utility/KTTime.hh     |   0
 88 files changed, 221 insertions(+), 118 deletions(-)
 rename {Library => Library_v1}/AddLibPythonPath.sh.in (100%)
 rename {Library => Library_v1}/Application/KTApplication.cc (100%)
 rename {Library => Library_v1}/Application/KTApplication.hh (100%)
 rename {Library => Library_v1}/Application/KTCommandLineHandler.cc (100%)
 rename {Library => Library_v1}/Application/KTCommandLineHandler.hh (100%)
 rename {Library => Library_v1}/Application/KTCommandLineOption.hh (100%)
 rename {Library => Library_v1}/Application/KTConfigurator.cc (100%)
 rename {Library => Library_v1}/Application/KTConfigurator.hh (100%)
 rename {Library => Library_v1}/Application/KTDataQueueProcessor.cc (100%)
 rename {Library => Library_v1}/Application/KTDataQueueProcessor.hh (100%)
 rename {Library => Library_v1}/Application/KTFilenameParsers.cc (100%)
 rename {Library => Library_v1}/Application/KTFilenameParsers.hh (100%)
 rename {Library => Library_v1}/Application/KTPrintDataStructure.cc (100%)
 rename {Library => Library_v1}/Application/KTPrintDataStructure.hh (100%)
 rename {Library => Library_v1}/Application/KTProcessorToolbox.cc (100%)
 rename {Library => Library_v1}/Application/KTProcessorToolbox.hh (100%)
 rename {Library => Library_v1}/Application/KTProcessorToolboxPybind.hh (100%)
 rename {Library => Library_v1}/Application/KTRunNymph.cc (100%)
 rename {Library => Library_v1}/Application/KTRunNymph.hh (100%)
 rename {Library => Library_v1}/Application/KTThroughputProfiler.cc (100%)
 rename {Library => Library_v1}/Application/KTThroughputProfiler.hh (100%)
 create mode 100644 Library_v1/CMakeLists.txt
 rename {Library => Library_v1}/Data/KTApplyCut.cc (100%)
 rename {Library => Library_v1}/Data/KTApplyCut.hh (100%)
 rename {Library => Library_v1}/Data/KTCoreData.cc (100%)
 rename {Library => Library_v1}/Data/KTCoreData.hh (100%)
 rename {Library => Library_v1}/Data/KTCut.cc (100%)
 rename {Library => Library_v1}/Data/KTCut.hh (100%)
 rename {Library => Library_v1}/Data/KTCutFilter.cc (100%)
 rename {Library => Library_v1}/Data/KTCutFilter.hh (100%)
 rename {Library => Library_v1}/Data/KTCutResult.hh (100%)
 rename {Library => Library_v1}/Data/KTCutStatus.cc (100%)
 rename {Library => Library_v1}/Data/KTCutStatus.hh (100%)
 rename {Library => Library_v1}/Data/KTData.cc (100%)
 rename {Library => Library_v1}/Data/KTData.hh (100%)
 rename {Library => Library_v1}/Data/KTRegisterNymphExtData.hh (100%)
 create mode 100644 Library_v1/Data/KTTester.cc
 create mode 100644 Library_v1/Data/KTTester.hh
 rename {Library => Library_v1}/IO/KTJSONWriter.cc (100%)
 rename {Library => Library_v1}/IO/KTJSONWriter.hh (100%)
 rename {Library => Library_v1}/IO/KTReader.cc (100%)
 rename {Library => Library_v1}/IO/KTReader.hh (100%)
 rename {Library => Library_v1}/IO/KTWriter.cc (100%)
 rename {Library => Library_v1}/IO/KTWriter.hh (100%)
 rename {Library => Library_v1}/NymphPybind.cc (100%)
 rename {Library => Library_v1}/Processor/KTConnection.hh (100%)
 rename {Library => Library_v1}/Processor/KTNymphSignals.hh (100%)
 rename {Library => Library_v1}/Processor/KTNymphSlot.hh (100%)
 rename {Library => Library_v1}/Processor/KTPrimaryProcessor.cc (100%)
 rename {Library => Library_v1}/Processor/KTPrimaryProcessor.hh (100%)
 rename {Library => Library_v1}/Processor/KTProcessor.cc (100%)
 rename {Library => Library_v1}/Processor/KTProcessor.hh (100%)
 rename {Library => Library_v1}/Processor/KTProcessorPybind.cc (100%)
 rename {Library => Library_v1}/Processor/KTProcessorPybind.hh (100%)
 rename {Library => Library_v1}/Processor/KTPyProcessor.hh (100%)
 rename {Library => Library_v1}/Processor/KTSignal.hh (100%)
 rename {Library => Library_v1}/Processor/KTSignalSlotBase.hh (100%)
 rename {Library => Library_v1}/Processor/KTSignalWrapper.cc (100%)
 rename {Library => Library_v1}/Processor/KTSignalWrapper.hh (100%)
 rename {Library => Library_v1}/Processor/KTSlot.hh (100%)
 rename {Library => Library_v1}/Processor/KTSlotWrapper.cc (100%)
 rename {Library => Library_v1}/Processor/KTSlotWrapper.hh (100%)
 rename {Library => Library_v1}/Processor/KTThreadReference.cc (100%)
 rename {Library => Library_v1}/Processor/KTThreadReference.hh (100%)
 rename {Library => Library_v1}/Utility/KTCacheDirectory.cc (100%)
 rename {Library => Library_v1}/Utility/KTCacheDirectory.hh (100%)
 rename {Library => Library_v1}/Utility/KTConcurrentQueue.hh (100%)
 rename {Library => Library_v1}/Utility/KTConfigurable.cc (100%)
 rename {Library => Library_v1}/Utility/KTConfigurable.hh (100%)
 rename {Library => Library_v1}/Utility/KTConfigurablePybind.hh (100%)
 rename {Library => Library_v1}/Utility/KTDirectory.cc (100%)
 rename {Library => Library_v1}/Utility/KTDirectory.hh (100%)
 rename {Library => Library_v1}/Utility/KTEventLoop.cc (100%)
 rename {Library => Library_v1}/Utility/KTEventLoop.hh (100%)
 rename {Library => Library_v1}/Utility/KTException.cc (100%)
 rename {Library => Library_v1}/Utility/KTException.hh (100%)
 rename {Library => Library_v1}/Utility/KTExtensible.hh (100%)
 rename {Library => Library_v1}/Utility/KTExtensibleStruct.hh (100%)
 rename {Library => Library_v1}/Utility/KTExtensibleStructFactory.hh (100%)
 rename {Library => Library_v1}/Utility/KTLogger.hh (100%)
 rename {Library => Library_v1}/Utility/KTMemberVariable.hh (100%)
 rename {Library => Library_v1}/Utility/KTParamPybind.hh (100%)
 rename {Library => Library_v1}/Utility/KTPythonMacros.hh (100%)
 rename {Library => Library_v1}/Utility/KTTIFactory.hh (100%)
 rename {Library => Library_v1}/Utility/KTTime.cc (100%)
 rename {Library => Library_v1}/Utility/KTTime.hh (100%)

diff --git a/.gitignore b/.gitignore
index a97774f..77bfe6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,44 @@
-#general:
-*.swp
+# from emacs
+*~
+
+# Compiled Object files
+*.slo
+*.lo
 *.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
 *.so
-*.a
 *.dylib
+*.dll
 
-#mac
-.DS_Store
+# Fortran module files
+*.mod
+*.smod
 
-#from Eclipse
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Eclipse
 .project
 .cproject
+.settings/
 
-#from cmake
-CMakeCache.txt
-CMakeFiles/
-Makefile
+# VSCode
+.vscode/
+
+# Build directories
 build*/
-cbuild*/
-cmake_install.cmake
-*Dict.h
-*Dict.cxx
-Documentation/ReferenceGuide/Doxyfile
-Source/Main/ExtractEvents
-Source/Main/SimpleElectronHunt
-Source/Applications/Main/SimpleElectronHunt
-install_manifest.txt
 
-# from emacs
-*~
diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 1411560..508f7ac 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CMakeLists for Nymph/Library
-# Author: N. Oblath
+# Author: N.S. Oblath
 
 include( PythonPackage )
 
@@ -10,112 +10,16 @@ set( IO_DIR IO )
 set( APPL_DIR Application )
 
 set( NYMPH_HEADERFILES
-#    ${UTIL_DIR}/KTCacheDirectory.hh
-#    ${UTIL_DIR}/KTConcurrentQueue.hh
-#    ${UTIL_DIR}/KTConfigurable.hh
-#    ${UTIL_DIR}/KTDirectory.hh
-#    ${UTIL_DIR}/KTEventLoop.hh
-#    ${UTIL_DIR}/KTException.hh
-#    ${UTIL_DIR}/KTExtensible.hh
-#    ${UTIL_DIR}/KTExtensibleStruct.hh
-#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
-#    ${UTIL_DIR}/KTLogger.hh
-#    ${UTIL_DIR}/KTMemberVariable.hh
-#    ${UTIL_DIR}/KTTIFactory.hh
-#    ${UTIL_DIR}/KTTime.hh
-#    ${DATA_DIR}/KTApplyCut.hh
-#    ${DATA_DIR}/KTCoreData.hh
-#    ${DATA_DIR}/KTCut.hh
-#    ${DATA_DIR}/KTCutFilter.hh
-#    ${DATA_DIR}/KTCutResult.hh
-#    ${DATA_DIR}/KTCutStatus.hh
-#    ${DATA_DIR}/KTData.hh
-#    ${DATA_DIR}/KTRegisterNymphExtData.hh
-#    ${PROC_DIR}/KTConnection.hh
-#    ${PROC_DIR}/KTPrimaryProcessor.hh
-#    ${PROC_DIR}/KTProcessor.hh
-#    ${PROC_DIR}/KTSignal.hh
-#    ${PROC_DIR}/KTSignalWrapper.hh
-#    ${PROC_DIR}/KTSlot.hh
-#    ${PROC_DIR}/KTSlotWrapper.hh
-#    ${PROC_DIR}/KTThreadReference.hh
-#    ${IO_DIR}/KTJSONWriter.hh
-#    ${IO_DIR}/KTReader.hh
-#    ${IO_DIR}/KTWriter.hh
-#    ${APPL_DIR}/KTApplication.hh
-#    ${APPL_DIR}/KTCommandLineHandler.hh
-#    ${APPL_DIR}/KTCommandLineOption.hh
-#    ${APPL_DIR}/KTConfigurator.hh
-#    ${APPL_DIR}/KTDataQueueProcessor.hh
-#    ${APPL_DIR}/KTFilenameParsers.hh
-#    ${APPL_DIR}/KTPrintDataStructure.hh
-#    ${APPL_DIR}/KTProcessorToolbox.hh
-#    ${APPL_DIR}/KTRunNymph.hh
-#    ${APPL_DIR}/KTThroughputProfiler.hh
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
 )
 
 set( NYMPH_SOURCEFILES
-#    ${UTIL_DIR}/KTCacheDirectory.cc
-#    ${UTIL_DIR}/KTConfigurable.cc
-#    ${UTIL_DIR}/KTDirectory.cc
-#    ${UTIL_DIR}/KTEventLoop.cc
-#    ${UTIL_DIR}/KTException.cc
-#    ${UTIL_DIR}/KTTime.cc
-#    ${DATA_DIR}/KTApplyCut.cc
-#    ${DATA_DIR}/KTCoreData.cc
-#    ${DATA_DIR}/KTCut.cc
-#    ${DATA_DIR}/KTCutFilter.cc
-#    ${DATA_DIR}/KTCutStatus.cc
-#    ${DATA_DIR}/KTData.cc
-#    ${PROC_DIR}/KTPrimaryProcessor.cc
-#    ${PROC_DIR}/KTProcessor.cc
-#    ${PROC_DIR}/KTSignalWrapper.cc
-#    ${PROC_DIR}/KTSlotWrapper.cc
-#    ${PROC_DIR}/KTThreadReference.cc
-#    ${IO_DIR}/KTJSONWriter.cc
-#    ${IO_DIR}/KTReader.cc
-#    ${IO_DIR}/KTWriter.cc
-#    ${APPL_DIR}/KTApplication.cc
-#    ${APPL_DIR}/KTCommandLineHandler.cc
-#    ${APPL_DIR}/KTConfigurator.cc
-#    ${APPL_DIR}/KTDataQueueProcessor.cc
-#    ${APPL_DIR}/KTFilenameParsers.cc
-#    ${APPL_DIR}/KTPrintDataStructure.cc
-#    ${APPL_DIR}/KTProcessorToolbox.cc
-#    ${APPL_DIR}/KTRunNymph.cc
-#    ${APPL_DIR}/KTThroughputProfiler.cc
     ${UTIL_DIR}/Exception.cc
 )
 
-# Python binding headers
-set( NYMPH_PYBINDING_HEADERFILES
-    #${UTIL_DIR}/KTConfigurablePybind.hh
-    ${UTIL_DIR}/KTParamPybind.hh
-    ${PROC_DIR}/KTProcessorPybind.hh
-    ${PROC_DIR}/KTPyProcessor.hh
-)
-
-# Python bindings
-set( NYMPH_PYBINDING_SOURCEFILES
-    ${PROC_DIR}/KTProcessorPybind.cc
-    NymphPybind.cc
-)
 
 ##################################################
 
 pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
 pbuilder_install_headers( ${NYMPH_HEADERFILES} )
-
-if( Nymph_ENABLE_PYTHON )
-    set( LIB_DEPENDENCIES Nymph )
-
-    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
-    
-    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
-    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
-    pbuilder_install_libraries( py_nymph )
-    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
-endif( Nymph_ENABLE_PYTHON )
diff --git a/Library/AddLibPythonPath.sh.in b/Library_v1/AddLibPythonPath.sh.in
similarity index 100%
rename from Library/AddLibPythonPath.sh.in
rename to Library_v1/AddLibPythonPath.sh.in
diff --git a/Library/Application/KTApplication.cc b/Library_v1/Application/KTApplication.cc
similarity index 100%
rename from Library/Application/KTApplication.cc
rename to Library_v1/Application/KTApplication.cc
diff --git a/Library/Application/KTApplication.hh b/Library_v1/Application/KTApplication.hh
similarity index 100%
rename from Library/Application/KTApplication.hh
rename to Library_v1/Application/KTApplication.hh
diff --git a/Library/Application/KTCommandLineHandler.cc b/Library_v1/Application/KTCommandLineHandler.cc
similarity index 100%
rename from Library/Application/KTCommandLineHandler.cc
rename to Library_v1/Application/KTCommandLineHandler.cc
diff --git a/Library/Application/KTCommandLineHandler.hh b/Library_v1/Application/KTCommandLineHandler.hh
similarity index 100%
rename from Library/Application/KTCommandLineHandler.hh
rename to Library_v1/Application/KTCommandLineHandler.hh
diff --git a/Library/Application/KTCommandLineOption.hh b/Library_v1/Application/KTCommandLineOption.hh
similarity index 100%
rename from Library/Application/KTCommandLineOption.hh
rename to Library_v1/Application/KTCommandLineOption.hh
diff --git a/Library/Application/KTConfigurator.cc b/Library_v1/Application/KTConfigurator.cc
similarity index 100%
rename from Library/Application/KTConfigurator.cc
rename to Library_v1/Application/KTConfigurator.cc
diff --git a/Library/Application/KTConfigurator.hh b/Library_v1/Application/KTConfigurator.hh
similarity index 100%
rename from Library/Application/KTConfigurator.hh
rename to Library_v1/Application/KTConfigurator.hh
diff --git a/Library/Application/KTDataQueueProcessor.cc b/Library_v1/Application/KTDataQueueProcessor.cc
similarity index 100%
rename from Library/Application/KTDataQueueProcessor.cc
rename to Library_v1/Application/KTDataQueueProcessor.cc
diff --git a/Library/Application/KTDataQueueProcessor.hh b/Library_v1/Application/KTDataQueueProcessor.hh
similarity index 100%
rename from Library/Application/KTDataQueueProcessor.hh
rename to Library_v1/Application/KTDataQueueProcessor.hh
diff --git a/Library/Application/KTFilenameParsers.cc b/Library_v1/Application/KTFilenameParsers.cc
similarity index 100%
rename from Library/Application/KTFilenameParsers.cc
rename to Library_v1/Application/KTFilenameParsers.cc
diff --git a/Library/Application/KTFilenameParsers.hh b/Library_v1/Application/KTFilenameParsers.hh
similarity index 100%
rename from Library/Application/KTFilenameParsers.hh
rename to Library_v1/Application/KTFilenameParsers.hh
diff --git a/Library/Application/KTPrintDataStructure.cc b/Library_v1/Application/KTPrintDataStructure.cc
similarity index 100%
rename from Library/Application/KTPrintDataStructure.cc
rename to Library_v1/Application/KTPrintDataStructure.cc
diff --git a/Library/Application/KTPrintDataStructure.hh b/Library_v1/Application/KTPrintDataStructure.hh
similarity index 100%
rename from Library/Application/KTPrintDataStructure.hh
rename to Library_v1/Application/KTPrintDataStructure.hh
diff --git a/Library/Application/KTProcessorToolbox.cc b/Library_v1/Application/KTProcessorToolbox.cc
similarity index 100%
rename from Library/Application/KTProcessorToolbox.cc
rename to Library_v1/Application/KTProcessorToolbox.cc
diff --git a/Library/Application/KTProcessorToolbox.hh b/Library_v1/Application/KTProcessorToolbox.hh
similarity index 100%
rename from Library/Application/KTProcessorToolbox.hh
rename to Library_v1/Application/KTProcessorToolbox.hh
diff --git a/Library/Application/KTProcessorToolboxPybind.hh b/Library_v1/Application/KTProcessorToolboxPybind.hh
similarity index 100%
rename from Library/Application/KTProcessorToolboxPybind.hh
rename to Library_v1/Application/KTProcessorToolboxPybind.hh
diff --git a/Library/Application/KTRunNymph.cc b/Library_v1/Application/KTRunNymph.cc
similarity index 100%
rename from Library/Application/KTRunNymph.cc
rename to Library_v1/Application/KTRunNymph.cc
diff --git a/Library/Application/KTRunNymph.hh b/Library_v1/Application/KTRunNymph.hh
similarity index 100%
rename from Library/Application/KTRunNymph.hh
rename to Library_v1/Application/KTRunNymph.hh
diff --git a/Library/Application/KTThroughputProfiler.cc b/Library_v1/Application/KTThroughputProfiler.cc
similarity index 100%
rename from Library/Application/KTThroughputProfiler.cc
rename to Library_v1/Application/KTThroughputProfiler.cc
diff --git a/Library/Application/KTThroughputProfiler.hh b/Library_v1/Application/KTThroughputProfiler.hh
similarity index 100%
rename from Library/Application/KTThroughputProfiler.hh
rename to Library_v1/Application/KTThroughputProfiler.hh
diff --git a/Library_v1/CMakeLists.txt b/Library_v1/CMakeLists.txt
new file mode 100644
index 0000000..1411560
--- /dev/null
+++ b/Library_v1/CMakeLists.txt
@@ -0,0 +1,121 @@
+# CMakeLists for Nymph/Library
+# Author: N. Oblath
+
+include( PythonPackage )
+
+set( UTIL_DIR Utility )
+set( DATA_DIR Data )
+set( PROC_DIR Processor )
+set( IO_DIR IO )
+set( APPL_DIR Application )
+
+set( NYMPH_HEADERFILES
+#    ${UTIL_DIR}/KTCacheDirectory.hh
+#    ${UTIL_DIR}/KTConcurrentQueue.hh
+#    ${UTIL_DIR}/KTConfigurable.hh
+#    ${UTIL_DIR}/KTDirectory.hh
+#    ${UTIL_DIR}/KTEventLoop.hh
+#    ${UTIL_DIR}/KTException.hh
+#    ${UTIL_DIR}/KTExtensible.hh
+#    ${UTIL_DIR}/KTExtensibleStruct.hh
+#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
+#    ${UTIL_DIR}/KTLogger.hh
+#    ${UTIL_DIR}/KTMemberVariable.hh
+#    ${UTIL_DIR}/KTTIFactory.hh
+#    ${UTIL_DIR}/KTTime.hh
+#    ${DATA_DIR}/KTApplyCut.hh
+#    ${DATA_DIR}/KTCoreData.hh
+#    ${DATA_DIR}/KTCut.hh
+#    ${DATA_DIR}/KTCutFilter.hh
+#    ${DATA_DIR}/KTCutResult.hh
+#    ${DATA_DIR}/KTCutStatus.hh
+#    ${DATA_DIR}/KTData.hh
+#    ${DATA_DIR}/KTRegisterNymphExtData.hh
+#    ${PROC_DIR}/KTConnection.hh
+#    ${PROC_DIR}/KTPrimaryProcessor.hh
+#    ${PROC_DIR}/KTProcessor.hh
+#    ${PROC_DIR}/KTSignal.hh
+#    ${PROC_DIR}/KTSignalWrapper.hh
+#    ${PROC_DIR}/KTSlot.hh
+#    ${PROC_DIR}/KTSlotWrapper.hh
+#    ${PROC_DIR}/KTThreadReference.hh
+#    ${IO_DIR}/KTJSONWriter.hh
+#    ${IO_DIR}/KTReader.hh
+#    ${IO_DIR}/KTWriter.hh
+#    ${APPL_DIR}/KTApplication.hh
+#    ${APPL_DIR}/KTCommandLineHandler.hh
+#    ${APPL_DIR}/KTCommandLineOption.hh
+#    ${APPL_DIR}/KTConfigurator.hh
+#    ${APPL_DIR}/KTDataQueueProcessor.hh
+#    ${APPL_DIR}/KTFilenameParsers.hh
+#    ${APPL_DIR}/KTPrintDataStructure.hh
+#    ${APPL_DIR}/KTProcessorToolbox.hh
+#    ${APPL_DIR}/KTRunNymph.hh
+#    ${APPL_DIR}/KTThroughputProfiler.hh
+    ${UTIL_DIR}/Exception.hh
+    ${UTIL_DIR}/MemberVariable.hh
+)
+
+set( NYMPH_SOURCEFILES
+#    ${UTIL_DIR}/KTCacheDirectory.cc
+#    ${UTIL_DIR}/KTConfigurable.cc
+#    ${UTIL_DIR}/KTDirectory.cc
+#    ${UTIL_DIR}/KTEventLoop.cc
+#    ${UTIL_DIR}/KTException.cc
+#    ${UTIL_DIR}/KTTime.cc
+#    ${DATA_DIR}/KTApplyCut.cc
+#    ${DATA_DIR}/KTCoreData.cc
+#    ${DATA_DIR}/KTCut.cc
+#    ${DATA_DIR}/KTCutFilter.cc
+#    ${DATA_DIR}/KTCutStatus.cc
+#    ${DATA_DIR}/KTData.cc
+#    ${PROC_DIR}/KTPrimaryProcessor.cc
+#    ${PROC_DIR}/KTProcessor.cc
+#    ${PROC_DIR}/KTSignalWrapper.cc
+#    ${PROC_DIR}/KTSlotWrapper.cc
+#    ${PROC_DIR}/KTThreadReference.cc
+#    ${IO_DIR}/KTJSONWriter.cc
+#    ${IO_DIR}/KTReader.cc
+#    ${IO_DIR}/KTWriter.cc
+#    ${APPL_DIR}/KTApplication.cc
+#    ${APPL_DIR}/KTCommandLineHandler.cc
+#    ${APPL_DIR}/KTConfigurator.cc
+#    ${APPL_DIR}/KTDataQueueProcessor.cc
+#    ${APPL_DIR}/KTFilenameParsers.cc
+#    ${APPL_DIR}/KTPrintDataStructure.cc
+#    ${APPL_DIR}/KTProcessorToolbox.cc
+#    ${APPL_DIR}/KTRunNymph.cc
+#    ${APPL_DIR}/KTThroughputProfiler.cc
+    ${UTIL_DIR}/Exception.cc
+)
+
+# Python binding headers
+set( NYMPH_PYBINDING_HEADERFILES
+    #${UTIL_DIR}/KTConfigurablePybind.hh
+    ${UTIL_DIR}/KTParamPybind.hh
+    ${PROC_DIR}/KTProcessorPybind.hh
+    ${PROC_DIR}/KTPyProcessor.hh
+)
+
+# Python bindings
+set( NYMPH_PYBINDING_SOURCEFILES
+    ${PROC_DIR}/KTProcessorPybind.cc
+    NymphPybind.cc
+)
+
+##################################################
+
+pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
+pbuilder_install_headers( ${NYMPH_HEADERFILES} )
+
+if( Nymph_ENABLE_PYTHON )
+    set( LIB_DEPENDENCIES Nymph )
+
+    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
+    
+    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
+    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
+    pbuilder_install_libraries( py_nymph )
+    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
+endif( Nymph_ENABLE_PYTHON )
diff --git a/Library/Data/KTApplyCut.cc b/Library_v1/Data/KTApplyCut.cc
similarity index 100%
rename from Library/Data/KTApplyCut.cc
rename to Library_v1/Data/KTApplyCut.cc
diff --git a/Library/Data/KTApplyCut.hh b/Library_v1/Data/KTApplyCut.hh
similarity index 100%
rename from Library/Data/KTApplyCut.hh
rename to Library_v1/Data/KTApplyCut.hh
diff --git a/Library/Data/KTCoreData.cc b/Library_v1/Data/KTCoreData.cc
similarity index 100%
rename from Library/Data/KTCoreData.cc
rename to Library_v1/Data/KTCoreData.cc
diff --git a/Library/Data/KTCoreData.hh b/Library_v1/Data/KTCoreData.hh
similarity index 100%
rename from Library/Data/KTCoreData.hh
rename to Library_v1/Data/KTCoreData.hh
diff --git a/Library/Data/KTCut.cc b/Library_v1/Data/KTCut.cc
similarity index 100%
rename from Library/Data/KTCut.cc
rename to Library_v1/Data/KTCut.cc
diff --git a/Library/Data/KTCut.hh b/Library_v1/Data/KTCut.hh
similarity index 100%
rename from Library/Data/KTCut.hh
rename to Library_v1/Data/KTCut.hh
diff --git a/Library/Data/KTCutFilter.cc b/Library_v1/Data/KTCutFilter.cc
similarity index 100%
rename from Library/Data/KTCutFilter.cc
rename to Library_v1/Data/KTCutFilter.cc
diff --git a/Library/Data/KTCutFilter.hh b/Library_v1/Data/KTCutFilter.hh
similarity index 100%
rename from Library/Data/KTCutFilter.hh
rename to Library_v1/Data/KTCutFilter.hh
diff --git a/Library/Data/KTCutResult.hh b/Library_v1/Data/KTCutResult.hh
similarity index 100%
rename from Library/Data/KTCutResult.hh
rename to Library_v1/Data/KTCutResult.hh
diff --git a/Library/Data/KTCutStatus.cc b/Library_v1/Data/KTCutStatus.cc
similarity index 100%
rename from Library/Data/KTCutStatus.cc
rename to Library_v1/Data/KTCutStatus.cc
diff --git a/Library/Data/KTCutStatus.hh b/Library_v1/Data/KTCutStatus.hh
similarity index 100%
rename from Library/Data/KTCutStatus.hh
rename to Library_v1/Data/KTCutStatus.hh
diff --git a/Library/Data/KTData.cc b/Library_v1/Data/KTData.cc
similarity index 100%
rename from Library/Data/KTData.cc
rename to Library_v1/Data/KTData.cc
diff --git a/Library/Data/KTData.hh b/Library_v1/Data/KTData.hh
similarity index 100%
rename from Library/Data/KTData.hh
rename to Library_v1/Data/KTData.hh
diff --git a/Library/Data/KTRegisterNymphExtData.hh b/Library_v1/Data/KTRegisterNymphExtData.hh
similarity index 100%
rename from Library/Data/KTRegisterNymphExtData.hh
rename to Library_v1/Data/KTRegisterNymphExtData.hh
diff --git a/Library_v1/Data/KTTester.cc b/Library_v1/Data/KTTester.cc
new file mode 100644
index 0000000..e0ce295
--- /dev/null
+++ b/Library_v1/Data/KTTester.cc
@@ -0,0 +1,24 @@
+/*
+ * KTTester.cc
+ *
+ *  Created on: Aug 26, 2019
+ *      Author: obla999
+ */
+
+#include "KTTester.hh"
+
+namespace Nymph
+{
+
+    KTTester::KTTester()
+    {
+        // TODO Auto-generated constructor stub
+
+    }
+
+    KTTester::~KTTester()
+    {
+        // TODO Auto-generated destructor stub
+    }
+
+} /* namespace Nymph */
diff --git a/Library_v1/Data/KTTester.hh b/Library_v1/Data/KTTester.hh
new file mode 100644
index 0000000..f0e3f5b
--- /dev/null
+++ b/Library_v1/Data/KTTester.hh
@@ -0,0 +1,41 @@
+/*
+ * KTTester.hh
+ *
+ *  Created on: Aug 26, 2019
+ *      Author: obla999
+ */
+
+#ifndef LIBRARY_DATA_KTTESTER_HH_
+#define LIBRARY_DATA_KTTESTER_HH_
+
+//#include "KTConfigurable.hh"
+
+#include "KTConnection.hh"
+//#include "KTLogger.hh"
+#include "KTSignalWrapper.hh"
+#include "KTSlotWrapper.hh"
+
+//#include "factory.hh"
+
+//#include <boost/signals2.hpp>
+
+//#include <exception>
+//#include <initializer_list>
+//#include <map>
+//#include <sstream>
+//#include <string>
+//#include <memory>
+
+namespace Nymph
+{
+
+    class KTTester
+    {
+        public:
+            KTTester();
+            virtual ~KTTester();
+    };
+
+} /* namespace Nymph */
+
+#endif /* LIBRARY_DATA_KTTESTER_HH_ */
diff --git a/Library/IO/KTJSONWriter.cc b/Library_v1/IO/KTJSONWriter.cc
similarity index 100%
rename from Library/IO/KTJSONWriter.cc
rename to Library_v1/IO/KTJSONWriter.cc
diff --git a/Library/IO/KTJSONWriter.hh b/Library_v1/IO/KTJSONWriter.hh
similarity index 100%
rename from Library/IO/KTJSONWriter.hh
rename to Library_v1/IO/KTJSONWriter.hh
diff --git a/Library/IO/KTReader.cc b/Library_v1/IO/KTReader.cc
similarity index 100%
rename from Library/IO/KTReader.cc
rename to Library_v1/IO/KTReader.cc
diff --git a/Library/IO/KTReader.hh b/Library_v1/IO/KTReader.hh
similarity index 100%
rename from Library/IO/KTReader.hh
rename to Library_v1/IO/KTReader.hh
diff --git a/Library/IO/KTWriter.cc b/Library_v1/IO/KTWriter.cc
similarity index 100%
rename from Library/IO/KTWriter.cc
rename to Library_v1/IO/KTWriter.cc
diff --git a/Library/IO/KTWriter.hh b/Library_v1/IO/KTWriter.hh
similarity index 100%
rename from Library/IO/KTWriter.hh
rename to Library_v1/IO/KTWriter.hh
diff --git a/Library/NymphPybind.cc b/Library_v1/NymphPybind.cc
similarity index 100%
rename from Library/NymphPybind.cc
rename to Library_v1/NymphPybind.cc
diff --git a/Library/Processor/KTConnection.hh b/Library_v1/Processor/KTConnection.hh
similarity index 100%
rename from Library/Processor/KTConnection.hh
rename to Library_v1/Processor/KTConnection.hh
diff --git a/Library/Processor/KTNymphSignals.hh b/Library_v1/Processor/KTNymphSignals.hh
similarity index 100%
rename from Library/Processor/KTNymphSignals.hh
rename to Library_v1/Processor/KTNymphSignals.hh
diff --git a/Library/Processor/KTNymphSlot.hh b/Library_v1/Processor/KTNymphSlot.hh
similarity index 100%
rename from Library/Processor/KTNymphSlot.hh
rename to Library_v1/Processor/KTNymphSlot.hh
diff --git a/Library/Processor/KTPrimaryProcessor.cc b/Library_v1/Processor/KTPrimaryProcessor.cc
similarity index 100%
rename from Library/Processor/KTPrimaryProcessor.cc
rename to Library_v1/Processor/KTPrimaryProcessor.cc
diff --git a/Library/Processor/KTPrimaryProcessor.hh b/Library_v1/Processor/KTPrimaryProcessor.hh
similarity index 100%
rename from Library/Processor/KTPrimaryProcessor.hh
rename to Library_v1/Processor/KTPrimaryProcessor.hh
diff --git a/Library/Processor/KTProcessor.cc b/Library_v1/Processor/KTProcessor.cc
similarity index 100%
rename from Library/Processor/KTProcessor.cc
rename to Library_v1/Processor/KTProcessor.cc
diff --git a/Library/Processor/KTProcessor.hh b/Library_v1/Processor/KTProcessor.hh
similarity index 100%
rename from Library/Processor/KTProcessor.hh
rename to Library_v1/Processor/KTProcessor.hh
diff --git a/Library/Processor/KTProcessorPybind.cc b/Library_v1/Processor/KTProcessorPybind.cc
similarity index 100%
rename from Library/Processor/KTProcessorPybind.cc
rename to Library_v1/Processor/KTProcessorPybind.cc
diff --git a/Library/Processor/KTProcessorPybind.hh b/Library_v1/Processor/KTProcessorPybind.hh
similarity index 100%
rename from Library/Processor/KTProcessorPybind.hh
rename to Library_v1/Processor/KTProcessorPybind.hh
diff --git a/Library/Processor/KTPyProcessor.hh b/Library_v1/Processor/KTPyProcessor.hh
similarity index 100%
rename from Library/Processor/KTPyProcessor.hh
rename to Library_v1/Processor/KTPyProcessor.hh
diff --git a/Library/Processor/KTSignal.hh b/Library_v1/Processor/KTSignal.hh
similarity index 100%
rename from Library/Processor/KTSignal.hh
rename to Library_v1/Processor/KTSignal.hh
diff --git a/Library/Processor/KTSignalSlotBase.hh b/Library_v1/Processor/KTSignalSlotBase.hh
similarity index 100%
rename from Library/Processor/KTSignalSlotBase.hh
rename to Library_v1/Processor/KTSignalSlotBase.hh
diff --git a/Library/Processor/KTSignalWrapper.cc b/Library_v1/Processor/KTSignalWrapper.cc
similarity index 100%
rename from Library/Processor/KTSignalWrapper.cc
rename to Library_v1/Processor/KTSignalWrapper.cc
diff --git a/Library/Processor/KTSignalWrapper.hh b/Library_v1/Processor/KTSignalWrapper.hh
similarity index 100%
rename from Library/Processor/KTSignalWrapper.hh
rename to Library_v1/Processor/KTSignalWrapper.hh
diff --git a/Library/Processor/KTSlot.hh b/Library_v1/Processor/KTSlot.hh
similarity index 100%
rename from Library/Processor/KTSlot.hh
rename to Library_v1/Processor/KTSlot.hh
diff --git a/Library/Processor/KTSlotWrapper.cc b/Library_v1/Processor/KTSlotWrapper.cc
similarity index 100%
rename from Library/Processor/KTSlotWrapper.cc
rename to Library_v1/Processor/KTSlotWrapper.cc
diff --git a/Library/Processor/KTSlotWrapper.hh b/Library_v1/Processor/KTSlotWrapper.hh
similarity index 100%
rename from Library/Processor/KTSlotWrapper.hh
rename to Library_v1/Processor/KTSlotWrapper.hh
diff --git a/Library/Processor/KTThreadReference.cc b/Library_v1/Processor/KTThreadReference.cc
similarity index 100%
rename from Library/Processor/KTThreadReference.cc
rename to Library_v1/Processor/KTThreadReference.cc
diff --git a/Library/Processor/KTThreadReference.hh b/Library_v1/Processor/KTThreadReference.hh
similarity index 100%
rename from Library/Processor/KTThreadReference.hh
rename to Library_v1/Processor/KTThreadReference.hh
diff --git a/Library/Utility/KTCacheDirectory.cc b/Library_v1/Utility/KTCacheDirectory.cc
similarity index 100%
rename from Library/Utility/KTCacheDirectory.cc
rename to Library_v1/Utility/KTCacheDirectory.cc
diff --git a/Library/Utility/KTCacheDirectory.hh b/Library_v1/Utility/KTCacheDirectory.hh
similarity index 100%
rename from Library/Utility/KTCacheDirectory.hh
rename to Library_v1/Utility/KTCacheDirectory.hh
diff --git a/Library/Utility/KTConcurrentQueue.hh b/Library_v1/Utility/KTConcurrentQueue.hh
similarity index 100%
rename from Library/Utility/KTConcurrentQueue.hh
rename to Library_v1/Utility/KTConcurrentQueue.hh
diff --git a/Library/Utility/KTConfigurable.cc b/Library_v1/Utility/KTConfigurable.cc
similarity index 100%
rename from Library/Utility/KTConfigurable.cc
rename to Library_v1/Utility/KTConfigurable.cc
diff --git a/Library/Utility/KTConfigurable.hh b/Library_v1/Utility/KTConfigurable.hh
similarity index 100%
rename from Library/Utility/KTConfigurable.hh
rename to Library_v1/Utility/KTConfigurable.hh
diff --git a/Library/Utility/KTConfigurablePybind.hh b/Library_v1/Utility/KTConfigurablePybind.hh
similarity index 100%
rename from Library/Utility/KTConfigurablePybind.hh
rename to Library_v1/Utility/KTConfigurablePybind.hh
diff --git a/Library/Utility/KTDirectory.cc b/Library_v1/Utility/KTDirectory.cc
similarity index 100%
rename from Library/Utility/KTDirectory.cc
rename to Library_v1/Utility/KTDirectory.cc
diff --git a/Library/Utility/KTDirectory.hh b/Library_v1/Utility/KTDirectory.hh
similarity index 100%
rename from Library/Utility/KTDirectory.hh
rename to Library_v1/Utility/KTDirectory.hh
diff --git a/Library/Utility/KTEventLoop.cc b/Library_v1/Utility/KTEventLoop.cc
similarity index 100%
rename from Library/Utility/KTEventLoop.cc
rename to Library_v1/Utility/KTEventLoop.cc
diff --git a/Library/Utility/KTEventLoop.hh b/Library_v1/Utility/KTEventLoop.hh
similarity index 100%
rename from Library/Utility/KTEventLoop.hh
rename to Library_v1/Utility/KTEventLoop.hh
diff --git a/Library/Utility/KTException.cc b/Library_v1/Utility/KTException.cc
similarity index 100%
rename from Library/Utility/KTException.cc
rename to Library_v1/Utility/KTException.cc
diff --git a/Library/Utility/KTException.hh b/Library_v1/Utility/KTException.hh
similarity index 100%
rename from Library/Utility/KTException.hh
rename to Library_v1/Utility/KTException.hh
diff --git a/Library/Utility/KTExtensible.hh b/Library_v1/Utility/KTExtensible.hh
similarity index 100%
rename from Library/Utility/KTExtensible.hh
rename to Library_v1/Utility/KTExtensible.hh
diff --git a/Library/Utility/KTExtensibleStruct.hh b/Library_v1/Utility/KTExtensibleStruct.hh
similarity index 100%
rename from Library/Utility/KTExtensibleStruct.hh
rename to Library_v1/Utility/KTExtensibleStruct.hh
diff --git a/Library/Utility/KTExtensibleStructFactory.hh b/Library_v1/Utility/KTExtensibleStructFactory.hh
similarity index 100%
rename from Library/Utility/KTExtensibleStructFactory.hh
rename to Library_v1/Utility/KTExtensibleStructFactory.hh
diff --git a/Library/Utility/KTLogger.hh b/Library_v1/Utility/KTLogger.hh
similarity index 100%
rename from Library/Utility/KTLogger.hh
rename to Library_v1/Utility/KTLogger.hh
diff --git a/Library/Utility/KTMemberVariable.hh b/Library_v1/Utility/KTMemberVariable.hh
similarity index 100%
rename from Library/Utility/KTMemberVariable.hh
rename to Library_v1/Utility/KTMemberVariable.hh
diff --git a/Library/Utility/KTParamPybind.hh b/Library_v1/Utility/KTParamPybind.hh
similarity index 100%
rename from Library/Utility/KTParamPybind.hh
rename to Library_v1/Utility/KTParamPybind.hh
diff --git a/Library/Utility/KTPythonMacros.hh b/Library_v1/Utility/KTPythonMacros.hh
similarity index 100%
rename from Library/Utility/KTPythonMacros.hh
rename to Library_v1/Utility/KTPythonMacros.hh
diff --git a/Library/Utility/KTTIFactory.hh b/Library_v1/Utility/KTTIFactory.hh
similarity index 100%
rename from Library/Utility/KTTIFactory.hh
rename to Library_v1/Utility/KTTIFactory.hh
diff --git a/Library/Utility/KTTime.cc b/Library_v1/Utility/KTTime.cc
similarity index 100%
rename from Library/Utility/KTTime.cc
rename to Library_v1/Utility/KTTime.cc
diff --git a/Library/Utility/KTTime.hh b/Library_v1/Utility/KTTime.hh
similarity index 100%
rename from Library/Utility/KTTime.hh
rename to Library_v1/Utility/KTTime.hh

From f189a7637f6606950edb5272ef0365295e4946a3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 7 Sep 2019 07:56:53 -0700
Subject: [PATCH 137/521] Updated Scarab (develop branch)

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index ae05d4c..d8a19bf 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit ae05d4c5c157c6cc569b1f3855a8b2599abbdd70
+Subproject commit d8a19bfb2d8d41eff57a84f30760d1c4c3291ab0

From 7ede698d6c5e8dea61a15acc4b9b81575f75f3f9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 7 Sep 2019 08:03:14 -0700
Subject: [PATCH 138/521] Removed pybind11 submodule

---
 .gitmodules       | 3 ---
 External/pybind11 | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 External/pybind11

diff --git a/.gitmodules b/.gitmodules
index 2588cda..4a11728 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "Scarab"]
 	path = Scarab
 	url = https://github.com/project8/scarab
-[submodule "External/pybind11"]
-	path = External/pybind11
-	url = https://github.com/pybind/pybind11.git
 [submodule "External/cereal"]
 	path = External/cereal
 	url = https://github.com/USCiLab/cereal.git
diff --git a/External/pybind11 b/External/pybind11
deleted file mode 160000
index add56cc..0000000
--- a/External/pybind11
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit add56ccdcac23a6c522a2c1174a866e293c61dab

From df14b7ed68d017c497b19b918d2e4f9e7e6dc7df Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 7 Sep 2019 16:21:58 -0700
Subject: [PATCH 139/521] Basics of signals, slots, and processors compile

---
 Library/CMakeLists.txt                |   6 +
 Library/Processor/PrimaryProcessor.cc |  69 +++++++
 Library/Processor/PrimaryProcessor.hh |  53 ++++++
 Library/Processor/Processor.cc        | 114 ++++++++++++
 Library/Processor/Processor.hh        | 115 ++++++++++++
 Library/Processor/Signal.hh           | 259 ++++++++++++++++++++++++++
 Library/Processor/SignalSlotBase.cc   |  26 +++
 Library/Processor/SignalSlotBase.hh   |  57 ++++++
 Library/Processor/Slot.hh             | 229 +++++++++++++++++++++++
 9 files changed, 928 insertions(+)
 create mode 100644 Library/Processor/PrimaryProcessor.cc
 create mode 100644 Library/Processor/PrimaryProcessor.hh
 create mode 100644 Library/Processor/Processor.cc
 create mode 100644 Library/Processor/Processor.hh
 create mode 100644 Library/Processor/Signal.hh
 create mode 100644 Library/Processor/SignalSlotBase.cc
 create mode 100644 Library/Processor/SignalSlotBase.hh
 create mode 100644 Library/Processor/Slot.hh

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 508f7ac..7cc4740 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -12,10 +12,16 @@ set( APPL_DIR Application )
 set( NYMPH_HEADERFILES
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
+    #${PROC_DIR}/PrimaryProcessor.hh
+    ${PROC_DIR}/Processor.hh
+    ${PROC_DIR}/SignalSlotBase.hh
 )
 
 set( NYMPH_SOURCEFILES
     ${UTIL_DIR}/Exception.cc
+    #${PROC_DIR}/PrimaryProcessor.cc
+    ${PROC_DIR}/Processor.cc
+    ${PROC_DIR}/SignalSlotBase.cc
 )
 
 
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
new file mode 100644
index 0000000..27b6f1d
--- /dev/null
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -0,0 +1,69 @@
+/*
+ * KTPrimaryProcessor.cc
+ *
+ *  Created on: Oct 10, 2012
+ *      Author: N.S. Oblath
+ */
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+namespace Nymph
+{
+    KTLOGGER( proclog, "KTPrimaryProcessor" );
+
+    KTPrimaryProcessor::KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name ) :
+            KTProcessor( name ),
+            fSignalsEmitted( signals ),
+            fThreadRef(),
+            fDoBreakpoint(false)
+    {
+
+    }
+
+    KTPrimaryProcessor::~KTPrimaryProcessor()
+    {
+    }
+
+    void KTPrimaryProcessor::operator ()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag )
+    {
+        fThreadRef = ref;
+
+        // pass updated thread reference to downstream slots
+        for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
+        {
+            // loop over all processor:slots called by this signal
+            auto sigConnRange = fSigConnMap.equal_range( *sigIt );
+            for( SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt )
+            {
+                // pass the update on to the connected-to processor
+                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, fThreadRef );
+            }
+        }
+
+        startedFlag = true;
+        startedCV.notify_all();
+
+        // go!
+        try
+        {
+            if( ! Run() )
+            {
+                KTERROR( proclog, "An error occurred during processor running." );
+                THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
+            }
+            else
+            {
+                fThreadRef->SetReturnValue( KTDataHandle() );
+            }
+        }
+        catch( boost::exception& e )
+        {
+            fThreadRef->SetReturnException( boost::current_exception() );
+        }
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
new file mode 100644
index 0000000..e72fcf3
--- /dev/null
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -0,0 +1,53 @@
+/*
+ * KTPrimaryProcessor.hh
+ *
+ *  Created on: Oct 10, 2012
+ *      Author: N.S. Oblath
+ */
+
+#ifndef KTPRIMARYPROCESSOR_HH_
+#define KTPRIMARYPROCESSOR_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTCoreData.hh"
+#include "KTThreadReference.hh"
+
+#include <boost/thread/condition_variable.hpp>
+
+#include <atomic>
+
+namespace Nymph
+{
+
+    class KTPrimaryProcessor : public KTProcessor
+    {
+        public:
+            KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
+            virtual ~KTPrimaryProcessor();
+
+        public:
+            /// Callable function used by std::thread
+            void operator()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag );
+
+            /// Starts the  main action of the processor
+            virtual bool Run() = 0;
+
+            std::shared_ptr< KTThreadReference > GetThreadRef();
+
+            MEMBERVARIABLE( bool, DoBreakpoint );
+
+        protected:
+            std::vector< std::string > fSignalsEmitted;
+
+            std::shared_ptr< KTThreadReference > fThreadRef;
+
+    };
+
+    inline std::shared_ptr< KTThreadReference > KTPrimaryProcessor::GetThreadRef()
+    {
+        return fThreadRef;
+    }
+
+} /* namespace Nymph */
+#endif /* KTPRIMARYPROCESSOR_HH_ */
diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
new file mode 100644
index 0000000..0bfca18
--- /dev/null
+++ b/Library/Processor/Processor.cc
@@ -0,0 +1,114 @@
+/*
+ * Processor.cc
+ *
+ *  Created on: Jan 5, 2012
+ *      Author: N.S. Oblath
+ */
+
+#include "Processor.hh"
+
+
+namespace Nymph
+{
+    //KTLOGGER(proclog, "Processor");
+
+    Processor::Processor( const std::string& name ) :
+            fName( name ),
+            fSignals(),
+            fSlots()
+    {
+    }
+
+    Processor::~Processor()
+    {}
+
+    void Processor::ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum )
+    {
+        // get the signal and slot pointers
+        SigMapIt signalIt = fSignals.find(signalName);
+        if( signalIt == fSignals.end() )
+        {
+            BOOST_THROW_EXCEPTION( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
+                                                        "You may have the signal name wrong." << eom );
+        }
+
+        SlotMapIt slotIt = processor.fSlots.find(slotName);
+        if( slotIt == processor.fSlots.end() )
+        {
+            BOOST_THROW_EXCEPTION( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
+                                                      "You may have the slot name wrong." << eom );
+        }
+
+        try
+        {
+            // make the connection
+            ConnectSignalToSlot( signalIt->second, slotIt->second, groupNum );
+        }
+        catch( SignalException& e )
+        {
+            e << ErrorMsgInfo< struct proc_Sig_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
+            e << ErrorMsgInfo< struct proc_Sig_1 >( "You may have the signal name wrong." );
+            throw;
+        }
+        catch( SlotException& e )
+        {
+            e << ErrorMsgInfo< struct proc_Slot_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
+            e << ErrorMsgInfo< struct proc_Slot_1 >( "You may have the slot name wrong." );
+            throw;
+        }
+        catch( ConnectionException& e )
+        {
+            e << ErrorMsgInfo< struct proc_Conn_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
+            e << ErrorMsgInfo< struct proc_Conn_1 >( "Check that the signatures of the signal and slot match exactly." );
+            throw;
+        }
+        catch( boost::exception& e )
+        {
+            e << ErrorMsgInfo< struct proc_Unkn >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
+            throw;
+        }
+
+        LDEBUG(processorlog, "Connected signal <" << this->Name() << ":" << signalName << "> to slot <" << processor.Name() << ":" << slotName << ">");
+
+        return;
+    }
+
+    void Processor::ConnectSignalToSlot( SignalPtr_t signal, SlotPtr_t slot, int groupNum )
+    {
+        if( ! signal )
+        {
+            BOOST_THROW_EXCEPTION( SignalException() << "Signal pointer was NULL" << eom );
+        }
+        if( ! slot )
+        {
+            BOOST_THROW_EXCEPTION( SlotException() << "Slot pointer was NULL" << eom );
+        }
+
+        signal->Connect(slot, groupNum);
+
+        return;
+    }
+/*
+    bool Processor::GetDoBreakpoint( const std::string& slotName )
+    {
+        KTSlotBase* slot = GetSlot(slotName);
+        if (slot != nullptr)
+        {
+            return slot->GetDoBreakpoint();
+        }
+        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        return false;
+    }
+
+    void Processor::SetDoBreakpoint( const std::string& slotName, bool flag )
+    {
+        KTSlotBase* slot = GetSlot(slotName);
+        if (slot != nullptr)
+        {
+            return slot->SetDoBreakpoint(flag);
+        }
+        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        return;
+    }
+*/
+} /* namespace Nymph */
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
new file mode 100644
index 0000000..ab40742
--- /dev/null
+++ b/Library/Processor/Processor.hh
@@ -0,0 +1,115 @@
+/**
+ @file Processor.hh
+ @brief Base class for processors
+ @author: N. S. Oblath
+ @date: Jan 5, 2012
+ */
+
+#ifndef NYMPH_PROCESSOR_HH_
+#define NYMPH_PROCESSOR_HH_
+
+#include "SignalSlotBase.hh"
+
+#include "Exception.hh"
+#include "MemberVariable.hh"
+
+#include "factory.hh"
+#include "logger.hh"
+#include "param.hh"
+
+#include <map>
+
+namespace Nymph
+{
+    LOGGER(processorlog, "Processor.hh");
+
+    struct ProcessorException : virtual public Exception {};
+
+    struct SignalException : virtual public Exception {};
+    struct SlotException : virtual public Exception {};
+
+    struct ConnectionException : public Exception {};
+
+    class Processor
+    {
+        protected:
+            typedef std::map< std::string, SignalPtr_t > SignalMap;
+            typedef SignalMap::iterator SigMapIt;
+            typedef SignalMap::value_type SigMapVal;
+
+            typedef std::map< std::string, SlotPtr_t > SlotMap;
+            typedef SlotMap::iterator SlotMapIt;
+            typedef SlotMap::value_type SlotMapVal;
+
+        public:
+            Processor( const std::string& name );
+            virtual ~Processor();
+
+            template< class XDerivedProc >
+            static scarab::registrar< Nymph::Processor, XDerivedProc, const std::string& >* RegisterProcessor( const std::string& name );
+
+        public:
+            /// Configure the processor with a param_node
+            virtual bool Configure( const scarab::param_node& node ) = 0;
+
+            /// Utility function for connecting any signal to any slot
+            static void ConnectSignalToSlot( SignalPtr_t signal, SlotPtr_t slot, int groupNum=-1 );
+
+            /// Connect a signal in this processor to a slot in a different processor
+            void ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum=-1 );
+            /// Connect a signal in a different processor to a slot in this processor
+            void ConnectASignal( Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum=-1 );
+
+            /// Register a signal object with this processor
+            void RegisterSignal( std::string name, SignalPtr_t signal );
+
+            /// Register a slot object with this processor
+            void RegisterSlot( std::string name, SlotPtr_t slot, std::initializer_list< std::string > signals = {} );
+
+            //bool GetDoBreakpoint( const std::string& slotName );
+            //void SetDoBreakpoint( const std::string& slotName, bool flag );
+
+            MEMVAR_REF( std::string, Name );
+
+            MEMVAR_REF_CONST( SignalMap, Signals );
+            MEMVAR_REF_CONST( SlotMap, Slots );
+
+        protected:
+            template< typename XReturn, typename... XArgs >
+            void PassToConnProcs( const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args );
+
+    };
+
+
+    inline void Processor::RegisterSignal( std::string name, SignalPtr_t signal )
+    {
+        LDEBUG( processorlog, "Registering signal <" << name << "> in processor <" << fName << ">" );
+        fSignals.insert( SigMapVal(name, signal) );
+        return;
+    }
+
+    inline void Processor::RegisterSlot( std::string name, SlotPtr_t slot, std::initializer_list< std::string > signals )
+    {
+        LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
+        fSlots.insert( SlotMapVal(name, slot) );
+        return;
+    }
+
+    inline void Processor::ConnectASignal(Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum )
+    {
+        processor.ConnectASlot( signalName, *this, slotName, groupNum );
+        return;
+    }
+
+    template< class XDerivedProc >
+    scarab::registrar< Processor, XDerivedProc, const std::string& >* Processor::RegisterProcessor( const std::string& name )
+    {
+        return new scarab::registrar< Processor, XDerivedProc, const std::string& >( name );
+    }
+
+#define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_PROCESSOR_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
new file mode 100644
index 0000000..b583990
--- /dev/null
+++ b/Library/Processor/Signal.hh
@@ -0,0 +1,259 @@
+/*
+ * Signal.hh
+ *
+ *  Created on: Jan 15, 2013
+ *      Author: N.S. Oblath
+ * 
+ *  Based on this implementation: https://schneegans.github.io/tutorials/2015/09/20/signal-slot
+ */
+
+#ifndef NYMPH_SIGNAL_HH_
+#define NYMPH_SIGNAL_HH_
+
+#include "SignalSlotBase.hh"
+
+#include "Exception.hh"
+#include "Logger.hh"
+
+#include <map>
+
+namespace Nymph
+{
+    LOGGER( signallog, "Signal" );
+
+    /// A Signal object may call multiple slots with the
+    /// same signature. You can connect functions to the Signal
+    /// that will be called when the emit() method on the
+    /// Signal object is invoked. Any argument passed to emit()
+    /// will be passed to the given functions.
+    template< typename... XArgs >
+    class Signal : public SignalBase
+    {
+        public:
+            using signature = void( XArgs... );
+
+        public:
+            Signal( const std::string& name );
+            template< typename XOwner >
+            Signal( const std::string& name, XOwner* owner );
+            Signal( const Signal& ) = delete;
+            Signal( Signal&& ) = delete;
+            virtual ~Signal();
+
+            virtual void Connect( SlotPtr_t slot, int group );
+
+            // disconnects a previously connected function
+            void Disconnect( SlotPtr_t slot ) const;
+
+            // disconnects all previously connected functions
+            void DisconnectAll() const;
+
+            // calls all connected functions
+            void Emit( XArgs... args );
+            void operator()( XArgs... args );
+
+            typedef std::set< SlotPtr_t > slot_connections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
+
+        protected:
+            friend class Slot< XArgs... >;
+            void _Connect( SlotPtr_t slot, int group );
+    };
+
+
+    /*!
+     @class Signal
+     @author N. S. Oblath
+
+     @brief Creates a signal that takes 0 or more arguments.
+
+     @details
+     The signal is emitted by calling operator().
+     If a Slot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+
+     Usage:
+     In your Processor's header add a member variable of type Signal< ArgumentTypes >.
+
+     Initialize the signal with the processor's 'this' pointer and the name of the signal.
+
+     To use the signal, call it as: fSignalObject(arg);
+    *//*
+    template< class... XSignalArguments >
+    class Signal
+    {
+        public:
+            typedef void (signature)( XSignalArguments... );
+            typedef boost::signals2::signal< signature > boost_signal;
+            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
+
+        public:
+            Signal();
+            Signal( const std::string& name, Processor* proc );
+            virtual ~Signal();
+
+        protected:
+            Signal( const Signal& );
+
+        public:
+            void operator()( XSignalArguments... args );
+
+            boost_signal* Signal();
+
+            const std::string& GetName() const;
+
+        protected:
+            boost_signal fSignal;
+
+            std::string fName;
+    };
+*/
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    template< typename... XArgs >
+    Signal< XArgs... >::Signal( const std::string& name ) :
+            SignalBase( name ),
+            fConnections()
+    {}
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Signal< XArgs... >::Signal< XOwner >( const std::string& name, XOwner* owner ) :
+            fSlots()
+    {
+        owner->RegisterSignal( name, this );
+    }
+
+    template< typename... XArgs >
+    Signal< XArgs... >::~Signal()
+    {
+        DisconnectAll();
+    }
+
+    template< typename... XArgs >
+    void Signal< XArgs... >::Connect( SlotPtr_t slot, int group )
+    {
+        if( fSlots.count( slot ) != 0 )
+        {
+            LWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
+            return;
+        }
+
+        // ensure that the slot is of the correct type
+        if( ! std::dynamic_pointer_cast< Slot< XArgs... > >( slot ) )
+        {
+            BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+                    "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
+                    "\tArgument types do not match" << eom );
+        }
+/*
+        Connection connection;
+        if( group >= 0 )
+        {
+            connection = fInternalSignal.connect( group, derivedSlot->Function() );
+        }
+        else
+        {
+            connection = fInternalSignal.connect( derivedSlot->Function() );
+        }
+*/
+        _Connect( slot, group );
+        slot->_AddConnection( this );
+
+        return;
+    }
+
+    template< typename... XArgs >
+    void Signal< XArgs... >::_Connect( SlotPtr_t slot, int group )
+    {
+        fConnections.insert( slot );
+        return;
+    }
+
+    // disconnects a previously connected function
+    template< typename... XArgs >
+    void Signal< XArgs... >::Disconnect( SlotPtr_t slot ) const
+    {
+        slot->RemoveConnection( this );
+        return;
+    }
+
+    // disconnects all previously connected functions
+    template< typename... XArgs >
+    void Signal< XArgs... >::DisconnectAll() const
+    {
+        for( auto connection : fSlots )
+        {
+            connection->RemoveConnection( this );
+        }
+        return;
+    }
+
+    // calls all connected functions
+    template< typename... XArgs >
+    inline void Signal< XArgs... >::Emit( XArgs... args )
+    {
+        (*this)( args );
+        return;
+    }
+
+    template< typename... XArgs >
+    inline void Signal< XArgs... >::operator()( XArgs... args )
+    {
+        for( auto connection : fSlots )
+        {
+            connection->Function( args );
+        }
+        return;
+    }
+
+/*
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::Signal( const std::string& name, Processor* proc ) :
+            fSignal(),
+            fName( name )
+    {
+        proc->RegisterSignal(name, &fSignal);
+    }
+
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::Signal() :
+            fSignal(),
+            fName("none")
+    {}
+
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::Signal( const Signal& signal ) :
+            fSignal(),
+            fName( signal.fName )
+    {}
+
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::~Signal()
+    {
+    }
+
+    template< class... XSignalArguments >
+    inline void Signal< XSignalArguments... >::operator()( XSignalArguments... args )
+    {
+        fSignal( args... );
+    }
+
+    template< class... XSignalArguments >
+    inline typename Signal< XSignalArguments... >::boost_signal* Signal< XSignalArguments... >::Signal()
+    {
+        return &fSignal;
+    }
+
+    template< class... XSignalArguments >
+    inline const std::string& Signal< XSignalArguments... >::GetName() const
+    {
+        return fName;
+    }
+*/
+} /* namespace Nymph */
+
+#endif /* NYMPH_SIGNAL_HH_ */
diff --git a/Library/Processor/SignalSlotBase.cc b/Library/Processor/SignalSlotBase.cc
new file mode 100644
index 0000000..bdc9afe
--- /dev/null
+++ b/Library/Processor/SignalSlotBase.cc
@@ -0,0 +1,26 @@
+/*
+ * SignalSlotBase.cc
+ *
+ *  Created on: Sept 7, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "SignalSlotBase.hh"
+
+namespace Nymph
+{
+        SlotBase::SlotBase( const std::string& name ) :
+            fName( name )
+    {}
+
+    SlotBase::~SlotBase()
+    {}
+
+    SignalBase::SignalBase( const std::string& name ) :
+            fName( name )
+    {}
+
+    SignalBase::~SignalBase()
+    {}
+
+}
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
new file mode 100644
index 0000000..d8b1e69
--- /dev/null
+++ b/Library/Processor/SignalSlotBase.hh
@@ -0,0 +1,57 @@
+/*
+ * SignalSlotBase.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_SIGNALSLOTBASE_HH_
+#define NYMPH_SIGNALSLOTBASE_HH_
+
+#include "MemberVariable.hh"
+
+#include <memory>
+#include <string>
+
+namespace Nymph
+{
+    class SignalBase;
+    class SlotBase;
+
+    typedef std::shared_ptr< SignalBase > SignalPtr_t;
+    typedef std::shared_ptr< SlotBase > SlotPtr_t;
+
+    class SlotBase
+    {
+        public:
+            SlotBase( const std::string& name );
+            //template< typename XOwner >
+            //SlotBase( const std::string& name, XOwner* owner );
+            virtual ~SlotBase();
+
+            virtual void AddConnection( SignalPtr_t ) const = 0;
+
+            virtual void RemoveConnection( SignalPtr_t ) const = 0;
+
+            MEMVAR_REF( std::string, Name );
+    };
+
+
+    class SignalBase
+    {
+        public:
+            SignalBase( const std::string& name );
+            //template< typename XOwner >
+            //SignalBase( const std::string& name, XOwner* owner );
+            virtual ~SignalBase();
+
+            virtual void Connect( SlotPtr_t slot, int group ) = 0;
+
+            virtual void Disconnect( SlotPtr_t slot ) const = 0;
+
+            MEMVAR_REF( std::string, Name );
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SIGNALSLOTBASE_HH_ */
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
new file mode 100644
index 0000000..9f2c37b
--- /dev/null
+++ b/Library/Processor/Slot.hh
@@ -0,0 +1,229 @@
+/*
+ * Slot.hh
+ *
+ *  Created on: Jan 13, 2013
+ *      Author: N.S. Oblath
+ * 
+ *  Based on this implementation: https://schneegans.github.io/tutorials/2015/09/20/signal-slot
+ */
+
+#ifndef NYMPH_SLOT_HH_
+#define NYMPH_SLOT_HH_
+
+#include "SignalSlotBase.hh"
+
+//#include "Exception.hh"
+//#include "ThreadReference.hh"
+
+#include "Logger.hh"
+
+#include <initializer_list>
+#include <set>
+
+namespace Nymph
+{
+    LOGGER(slotlog, "Slot");
+
+
+    // Type XOwner is the class that owns the Slot object
+    template< typename... XArgs >
+    class Slot : public SlotBase
+    {
+        public:
+            using signature = void( XArgs... );
+            using signal_list = std::initializer_list< std::string >;
+
+        public:
+            template< typename XOwner >
+            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
+            template< typename XOwner >
+            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
+            template< typename XOwner >
+            Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
+            template< typename XOwner, typename XFuncClass >
+            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
+            template< typename XOwner, typename XFuncClass >
+            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
+            Slot( const Slot& ) = delete;
+            Slot( Slot&& ) = delete;
+            virtual ~Slot();
+
+            void DisconnectAll() const;
+
+            void AddConnection( SignalPtr_t ) const;
+
+            void RemoveConnection( SignalPtr_t ) const;
+
+            MEMVAR_REF( boost::function< signature >, Function );
+
+            typedef std::set< SignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE( signal_connections, Connections );
+
+            MEMVAR( bool, DoBreakpoint );
+
+        protected:
+            friend class Signal< XArgs... >;
+            void _AddConnection( Signal_ptr_t ) const;
+
+    };
+
+
+    /*!
+     @class Slot
+     @author N. S. Oblath
+
+     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
+
+     @details
+     Usage:
+     To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
+     The function should have the signature void (Args).
+
+     In your Processor's header add a member variable of type Slot< ProcessorType, ReturnType, Args >.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+    *//*
+    template< typename... Args >
+    class Slot
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            Slot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            Slot( const std::string& name, Processor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
+
+            virtual ~Slot();
+
+            const std::string& GetName() const;
+
+            SlotWrapper* GetSlotWrapper();
+
+        protected:
+            std::string fName;
+            SlotWrapper* fSlotWrapper;
+    };
+*/
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    // Slot
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Slot< XArgs... >::Slot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
+            fConnections(),
+            fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Slot< XArgs... >::Slot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Slot< XArgs... >::Slot< XOwner >( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+            fFunction( func ),
+            fConnections(),
+            fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    Slot< XArgs... >::Slot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    Slot< XArgs... >::Slot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    Slot< XArgs... >::~Slot()
+    {
+        DisconnectAll();
+    }
+
+    template< typename... XArgs >
+    void Slot< XArgs... >::DisconnectAll() const
+    {
+        for( auto connection : fConnections )
+        {
+            connection->Disconnect( this );
+        }
+        return;
+    }
+
+    template< typename... XArgs >
+    void Slot< XArgs... >::AddConnection( SignalPtr_t signal ) const
+    {
+        if( fConnections.count( signal ) != 0 )
+        {
+            LWARN( signallog, "Slot <" << fName << "> is already has connection to signal <" << signal->Name() << ">" );
+            return;
+        }
+
+        // ensure that the slot is of the correct type
+        if( ! std::dynamic_pointer_cast< Signal< XArgs... > >( signal ) )
+        {
+            BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect slot <" << fName << "> to signal <" << signal->Name() << ">, but cannot make the connection:\n" <<
+                    "\tUnable to cast from SignalBase to this slot's derived type.\n" << 
+                    "\tArgument types do not match" << eom );
+        }
+
+        _AddConnection( signal, group );
+        signal->_Connect( this, group );
+
+        return;
+    }
+
+    template< typename... XArgs >
+    void Slot< XArgs... >::_AddConnection( SignalPtr_t signal ) const
+    {
+        fConnections.insert( signal );
+        return;
+    }
+
+    template< typename... XArgs >
+    void Slot< XArgs... >::RemoveConnection( SignalPtr_t signal ) const
+    {
+        fConnections.erase( signal );
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SLOT_HH_ */

From f0190bb8fe26f0c76bd89cd7002e4db26bd969fb Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 10 Sep 2019 08:48:50 -0700
Subject: [PATCH 140/521] Progress

---
 CMakeLists.txt                      |  2 +-
 Library/Processor/Processor.hh      |  8 -----
 Library/Processor/Signal.hh         | 33 +++++++++++-------
 Library/Processor/SignalSlotBase.hh | 19 +++++++++--
 Library/Processor/Slot.hh           | 53 +++++++++++++++++++++--------
 Testing/CMakeLists.txt              |  2 +-
 Testing/TestSignalSlot.cc           | 37 ++++++++++++++++++++
 7 files changed, 113 insertions(+), 41 deletions(-)
 create mode 100644 Testing/TestSignalSlot.cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03dee56..8ac8bf3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,7 +121,7 @@ include_directories (BEFORE
 
 add_subdirectory( Library )
 if (Nymph_ENABLE_EXECUTABLES)
-    add_subdirectory( Executables/Validation )
+    #add_subdirectory( Executables/Validation )
 endif (Nymph_ENABLE_EXECUTABLES)
 
 
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index ab40742..6efb137 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -10,9 +10,6 @@
 
 #include "SignalSlotBase.hh"
 
-#include "Exception.hh"
-#include "MemberVariable.hh"
-
 #include "factory.hh"
 #include "logger.hh"
 #include "param.hh"
@@ -25,11 +22,6 @@ namespace Nymph
 
     struct ProcessorException : virtual public Exception {};
 
-    struct SignalException : virtual public Exception {};
-    struct SlotException : virtual public Exception {};
-
-    struct ConnectionException : public Exception {};
-
     class Processor
     {
         protected:
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index b583990..d448927 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -13,14 +13,18 @@
 #include "SignalSlotBase.hh"
 
 #include "Exception.hh"
-#include "Logger.hh"
 
-#include <map>
+#include "logger.hh"
+
+#include <set>
 
 namespace Nymph
 {
     LOGGER( signallog, "Signal" );
 
+    template< typename... XArgs >
+    class Slot;
+
     /// A Signal object may call multiple slots with the
     /// same signature. You can connect functions to the Signal
     /// that will be called when the emit() method on the
@@ -33,14 +37,16 @@ namespace Nymph
             using signature = void( XArgs... );
 
         public:
+            /// Unowned signal
             Signal( const std::string& name );
+            /// Owned signal
             template< typename XOwner >
             Signal( const std::string& name, XOwner* owner );
             Signal( const Signal& ) = delete;
             Signal( Signal&& ) = delete;
             virtual ~Signal();
 
-            virtual void Connect( SlotPtr_t slot, int group );
+            virtual void Connect( SlotPtr_t slot, int group = -1 );
 
             // disconnects a previously connected function
             void Disconnect( SlotPtr_t slot ) const;
@@ -57,7 +63,7 @@ namespace Nymph
 
         protected:
             friend class Slot< XArgs... >;
-            void _Connect( SlotPtr_t slot, int group );
+            virtual void _Connect( SlotPtr_t slot, int group );
     };
 
 
@@ -121,8 +127,9 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner >
-    Signal< XArgs... >::Signal< XOwner >( const std::string& name, XOwner* owner ) :
-            fSlots()
+    inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
+            SignalBase( name ),
+            fConnections()
     {
         owner->RegisterSignal( name, this );
     }
@@ -136,7 +143,7 @@ namespace Nymph
     template< typename... XArgs >
     void Signal< XArgs... >::Connect( SlotPtr_t slot, int group )
     {
-        if( fSlots.count( slot ) != 0 )
+        if( fConnections.count( slot ) != 0 )
         {
             LWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
             return;
@@ -167,7 +174,7 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void Signal< XArgs... >::_Connect( SlotPtr_t slot, int group )
+    inline void Signal< XArgs... >::_Connect( SlotPtr_t slot, int group )
     {
         fConnections.insert( slot );
         return;
@@ -175,7 +182,7 @@ namespace Nymph
 
     // disconnects a previously connected function
     template< typename... XArgs >
-    void Signal< XArgs... >::Disconnect( SlotPtr_t slot ) const
+    inline void Signal< XArgs... >::Disconnect( SlotPtr_t slot ) const
     {
         slot->RemoveConnection( this );
         return;
@@ -185,7 +192,7 @@ namespace Nymph
     template< typename... XArgs >
     void Signal< XArgs... >::DisconnectAll() const
     {
-        for( auto connection : fSlots )
+        for( auto connection : fConnections )
         {
             connection->RemoveConnection( this );
         }
@@ -196,16 +203,16 @@ namespace Nymph
     template< typename... XArgs >
     inline void Signal< XArgs... >::Emit( XArgs... args )
     {
-        (*this)( args );
+        (*this)( args... );
         return;
     }
 
     template< typename... XArgs >
     inline void Signal< XArgs... >::operator()( XArgs... args )
     {
-        for( auto connection : fSlots )
+        for( auto connection : fConnections )
         {
-            connection->Function( args );
+            connection->Function( args... );
         }
         return;
     }
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index d8b1e69..3766c66 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -8,6 +8,7 @@
 #ifndef NYMPH_SIGNALSLOTBASE_HH_
 #define NYMPH_SIGNALSLOTBASE_HH_
 
+#include "Exception.hh"
 #include "MemberVariable.hh"
 
 #include <memory>
@@ -15,6 +16,12 @@
 
 namespace Nymph
 {
+    struct SignalException : virtual public Exception {};
+    struct SlotException : virtual public Exception {};
+
+    struct ConnectionException : public Exception {};
+
+
     class SignalBase;
     class SlotBase;
 
@@ -29,11 +36,14 @@ namespace Nymph
             //SlotBase( const std::string& name, XOwner* owner );
             virtual ~SlotBase();
 
-            virtual void AddConnection( SignalPtr_t ) const = 0;
+            virtual void AddConnection( SignalPtr_t signal, int group = -1 ) const = 0;
 
-            virtual void RemoveConnection( SignalPtr_t ) const = 0;
+            virtual void RemoveConnection( SignalPtr_t signal) const = 0;
 
             MEMVAR_REF( std::string, Name );
+
+        protected:
+            virtual void _AddConnection( SignalPtr_t signal, int group ) const = 0;
     };
 
 
@@ -45,11 +55,14 @@ namespace Nymph
             //SignalBase( const std::string& name, XOwner* owner );
             virtual ~SignalBase();
 
-            virtual void Connect( SlotPtr_t slot, int group ) = 0;
+            virtual void Connect( SlotPtr_t slot, int group = -1 ) = 0;
 
             virtual void Disconnect( SlotPtr_t slot ) const = 0;
 
             MEMVAR_REF( std::string, Name );
+
+        protected:
+            virtual void _Connect( SlotPtr_t slot, int group ) = 0;
     };
 
 } /* namespace Nymph */
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 9f2c37b..7d74e0f 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -15,7 +15,9 @@
 //#include "Exception.hh"
 //#include "ThreadReference.hh"
 
-#include "Logger.hh"
+#include "logger.hh"
+
+#include <boost/function.hpp>
 
 #include <initializer_list>
 #include <set>
@@ -34,14 +36,21 @@ namespace Nymph
             using signal_list = std::initializer_list< std::string >;
 
         public:
+            /// Unowned slot
+            Slot( const std::string& name, const boost::function< signature >& func, signal_list signals = {} );
+            /// Owned slot, non-const member function
             template< typename XOwner >
             Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
+            /// Owned slot, const member function
             template< typename XOwner >
             Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
+            /// Owned slot, generic function
             template< typename XOwner >
             Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
+            /// Owned slot, non-const member fuction of another class
             template< typename XOwner, typename XFuncClass >
             Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
+            /// Owned slot, const member fuction of another class
             template< typename XOwner, typename XFuncClass >
             Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
             Slot( const Slot& ) = delete;
@@ -50,9 +59,9 @@ namespace Nymph
 
             void DisconnectAll() const;
 
-            void AddConnection( SignalPtr_t ) const;
+            void AddConnection( SignalPtr_t signal, int group = -1 ) const;
 
-            void RemoveConnection( SignalPtr_t ) const;
+            void RemoveConnection( SignalPtr_t signal ) const;
 
             MEMVAR_REF( boost::function< signature >, Function );
 
@@ -63,7 +72,7 @@ namespace Nymph
 
         protected:
             friend class Signal< XArgs... >;
-            void _AddConnection( Signal_ptr_t ) const;
+            virtual void _AddConnection( SignalPtr_t, int group ) const;
 
     };
 
@@ -116,12 +125,22 @@ namespace Nymph
 
     // Slot
 
+    template< typename... XArgs >
+    Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func, signal_list signals ) :
+            SlotBase( name ),
+            fFunction( func ),
+            fConnections(),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint( false )
+    {}
+
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+            SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
             fConnections(),
-            fThreadRef( std::make_shared< ThreadReference >() ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
@@ -129,10 +148,11 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+            SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
             fConnections(),
-            fThreadRef( std::make_shared< ThreadReference >() ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
@@ -140,10 +160,11 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot< XOwner >( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+            SlotBase( name ),
             fFunction( func ),
             fConnections(),
-            fThreadRef( std::make_shared< ThreadReference >() ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
@@ -151,10 +172,11 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
-    Slot< XArgs... >::Slot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+            SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
             fConnections(),
-            fThreadRef( std::make_shared< ThreadReference >() ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
@@ -162,10 +184,11 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
-    Slot< XArgs... >::Slot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+            SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
             fConnections(),
-            fThreadRef( std::make_shared< ThreadReference >() ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this, signals );
@@ -188,7 +211,7 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void Slot< XArgs... >::AddConnection( SignalPtr_t signal ) const
+    void Slot< XArgs... >::AddConnection( SignalPtr_t signal, int group ) const
     {
         if( fConnections.count( signal ) != 0 )
         {
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 1daaf14..be65fc3 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,7 +8,7 @@ set( testing_HEADERS
 )
 
 set( testing_SOURCES
-    TestExt.cc
+    TestSignalSlot.cc
     UseCatch.cc
 )
 
diff --git a/Testing/TestSignalSlot.cc b/Testing/TestSignalSlot.cc
new file mode 100644
index 0000000..8b18fa0
--- /dev/null
+++ b/Testing/TestSignalSlot.cc
@@ -0,0 +1,37 @@
+/*
+ * TestSigSlot.cc
+ *
+ *  Created on: Sept 7, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
+{
+    using namespace Nymph;
+
+    int testValue = 0;
+
+    SignalPtr_t signalPtr = std::make_shared< Signal< int > >( "signal" );
+    SlotPtr_t slotPtr = std::make_shared< Slot< int > >( "slot", [&](int aValue ){ testValue = aValue; } );
+
+    REQUIRE( signalPtr );
+    REQUIRE( slotPtr );
+
+    signalPtr->Connect( slotPtr );
+
+    //REQUIRE( signalPtr->Connections().size() == 1 );
+    //REQUIRE( slotPtr->Connections().size() == 1 );
+
+    std::dynamic_pointer_cast< Signal< int > >(signalPtr)->Emit( 5 );
+    REQUIRE( testValue == 5 );
+
+    std::dynamic_pointer_cast< Signal< int > >(signalPtr)->operator()( 10 );
+    REQUIRE( testValue == 10 );
+
+}

From dd0b85f764f5dc2ad1e6938c767c6ff11b019811 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 10 Sep 2019 22:54:57 -0700
Subject: [PATCH 141/521] Working version of new signals and slots

---
 Library/Processor/Signal.hh         | 51 +++-----------------------
 Library/Processor/SignalSlotBase.cc | 29 +++++++++++++--
 Library/Processor/SignalSlotBase.hh | 52 +++++++++++++++++++++++----
 Library/Processor/Slot.hh           | 56 ++++-------------------------
 4 files changed, 82 insertions(+), 106 deletions(-)

diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index d448927..ebfc7a2 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -16,7 +16,6 @@
 
 #include "logger.hh"
 
-#include <set>
 
 namespace Nymph
 {
@@ -48,22 +47,9 @@ namespace Nymph
 
             virtual void Connect( SlotPtr_t slot, int group = -1 );
 
-            // disconnects a previously connected function
-            void Disconnect( SlotPtr_t slot ) const;
-
-            // disconnects all previously connected functions
-            void DisconnectAll() const;
-
             // calls all connected functions
             void Emit( XArgs... args );
             void operator()( XArgs... args );
-
-            typedef std::set< SlotPtr_t > slot_connections; // to get around the problem of having a comma inside a macro function argument
-            MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
-
-        protected:
-            friend class Slot< XArgs... >;
-            virtual void _Connect( SlotPtr_t slot, int group );
     };
 
 
@@ -121,15 +107,13 @@ namespace Nymph
 
     template< typename... XArgs >
     Signal< XArgs... >::Signal( const std::string& name ) :
-            SignalBase( name ),
-            fConnections()
+            SignalBase( name )
     {}
 
     template< typename... XArgs >
     template< typename XOwner >
     inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
-            SignalBase( name ),
-            fConnections()
+            SignalBase( name )
     {
         owner->RegisterSignal( name, this );
     }
@@ -167,35 +151,8 @@ namespace Nymph
             connection = fInternalSignal.connect( derivedSlot->Function() );
         }
 */
-        _Connect( slot, group );
-        slot->_AddConnection( this );
-
-        return;
-    }
+        AddConnection( slot, group );
 
-    template< typename... XArgs >
-    inline void Signal< XArgs... >::_Connect( SlotPtr_t slot, int group )
-    {
-        fConnections.insert( slot );
-        return;
-    }
-
-    // disconnects a previously connected function
-    template< typename... XArgs >
-    inline void Signal< XArgs... >::Disconnect( SlotPtr_t slot ) const
-    {
-        slot->RemoveConnection( this );
-        return;
-    }
-
-    // disconnects all previously connected functions
-    template< typename... XArgs >
-    void Signal< XArgs... >::DisconnectAll() const
-    {
-        for( auto connection : fConnections )
-        {
-            connection->RemoveConnection( this );
-        }
         return;
     }
 
@@ -212,7 +169,7 @@ namespace Nymph
     {
         for( auto connection : fConnections )
         {
-            connection->Function( args... );
+            std::static_pointer_cast< Slot< XArgs... > >(connection)->Function()( args... );
         }
         return;
     }
diff --git a/Library/Processor/SignalSlotBase.cc b/Library/Processor/SignalSlotBase.cc
index bdc9afe..cf6588d 100644
--- a/Library/Processor/SignalSlotBase.cc
+++ b/Library/Processor/SignalSlotBase.cc
@@ -9,18 +9,41 @@
 
 namespace Nymph
 {
-        SlotBase::SlotBase( const std::string& name ) :
-            fName( name )
+    SlotBase::SlotBase( const std::string& name ) :
+            fName( name ),
+            fConnections()
     {}
 
     SlotBase::~SlotBase()
     {}
 
+    void SlotBase::DisconnectAll()
+    {
+        for( auto connection : fConnections )
+        {
+            connection->Disconnect( shared_from_this() );
+        }
+        return;
+    }
+
     SignalBase::SignalBase( const std::string& name ) :
-            fName( name )
+            fName( name ),
+            fConnections()
     {}
 
     SignalBase::~SignalBase()
     {}
 
+    // disconnects all previously connected functions
+    void SignalBase::DisconnectAll()
+    {
+        for( auto connection : fConnections )
+        {
+            Disconnect( connection );
+        }
+        return;
+    }
+
+
 }
+
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index 3766c66..cdeaaa5 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -12,6 +12,7 @@
 #include "MemberVariable.hh"
 
 #include <memory>
+#include <set>
 #include <string>
 
 namespace Nymph
@@ -28,7 +29,7 @@ namespace Nymph
     typedef std::shared_ptr< SignalBase > SignalPtr_t;
     typedef std::shared_ptr< SlotBase > SlotPtr_t;
 
-    class SlotBase
+    class SlotBase : public std::enable_shared_from_this< SlotBase >
     {
         public:
             SlotBase( const std::string& name );
@@ -36,18 +37,23 @@ namespace Nymph
             //SlotBase( const std::string& name, XOwner* owner );
             virtual ~SlotBase();
 
-            virtual void AddConnection( SignalPtr_t signal, int group = -1 ) const = 0;
+            virtual void ConnectTo( SignalPtr_t signal, int group = -1 ) = 0;
 
-            virtual void RemoveConnection( SignalPtr_t signal) const = 0;
+            void Disconnect( SignalPtr_t signal);
+            void DisconnectAll();
 
             MEMVAR_REF( std::string, Name );
 
+            typedef std::set< SignalPtr_t > signal_connections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE( signal_connections, Connections );
+
         protected:
-            virtual void _AddConnection( SignalPtr_t signal, int group ) const = 0;
+            friend class SignalBase;
+            virtual void AddConnection( SignalPtr_t signal );
     };
 
 
-    class SignalBase
+    class SignalBase : public std::enable_shared_from_this< SignalBase >
     {
         public:
             SignalBase( const std::string& name );
@@ -57,14 +63,46 @@ namespace Nymph
 
             virtual void Connect( SlotPtr_t slot, int group = -1 ) = 0;
 
-            virtual void Disconnect( SlotPtr_t slot ) const = 0;
+            void Disconnect( const SlotPtr_t slot );
+            void DisconnectAll();
 
             MEMVAR_REF( std::string, Name );
 
+            typedef std::set< SlotPtr_t > slot_connections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
+
         protected:
-            virtual void _Connect( SlotPtr_t slot, int group ) = 0;
+            friend class SignalBase;
+            virtual void AddConnection( SlotPtr_t slot, int group );
     };
 
+    inline void SlotBase::AddConnection( SignalPtr_t signal )
+    {
+        fConnections.insert( signal );
+        return;
+    }
+
+    inline void SlotBase::Disconnect( SignalPtr_t signal )
+    {
+        signal->Disconnect( shared_from_this() );
+        return;
+    }
+
+    inline void SignalBase::AddConnection( SlotPtr_t slot, int group )
+    {
+        fConnections.insert( slot );
+        slot->AddConnection( shared_from_this() );
+        return;
+    }
+
+    // disconnects a previously connected function
+    inline void SignalBase::Disconnect( SlotPtr_t slot )
+    {
+        slot->fConnections.erase( shared_from_this() );
+        fConnections.erase( slot );
+        return;
+    }
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_SIGNALSLOTBASE_HH_ */
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 7d74e0f..72d4acb 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -20,7 +20,6 @@
 #include <boost/function.hpp>
 
 #include <initializer_list>
-#include <set>
 
 namespace Nymph
 {
@@ -57,23 +56,14 @@ namespace Nymph
             Slot( Slot&& ) = delete;
             virtual ~Slot();
 
-            void DisconnectAll() const;
+            void ConnectTo( SignalPtr_t signal, int group = -1 );
 
-            void AddConnection( SignalPtr_t signal, int group = -1 ) const;
-
-            void RemoveConnection( SignalPtr_t signal ) const;
+            // execute fFunction
+            void operator()( XArgs... args );
 
             MEMVAR_REF( boost::function< signature >, Function );
 
-            typedef std::set< SignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
-            MEMVAR_REF_MUTABLE( signal_connections, Connections );
-
             MEMVAR( bool, DoBreakpoint );
-
-        protected:
-            friend class Signal< XArgs... >;
-            virtual void _AddConnection( SignalPtr_t, int group ) const;
-
     };
 
 
@@ -129,7 +119,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func, signal_list signals ) :
             SlotBase( name ),
             fFunction( func ),
-            fConnections(),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint( false )
     {}
@@ -139,7 +128,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
             SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
-            fConnections(),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
@@ -151,7 +139,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
             SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
-            fConnections(),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
@@ -163,7 +150,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
             SlotBase( name ),
             fFunction( func ),
-            fConnections(),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
@@ -175,7 +161,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
             SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            fConnections(),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
@@ -187,7 +172,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
             SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            fConnections(),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
@@ -201,17 +185,7 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void Slot< XArgs... >::DisconnectAll() const
-    {
-        for( auto connection : fConnections )
-        {
-            connection->Disconnect( this );
-        }
-        return;
-    }
-
-    template< typename... XArgs >
-    void Slot< XArgs... >::AddConnection( SignalPtr_t signal, int group ) const
+    void Slot< XArgs... >::ConnectTo( SignalPtr_t signal, int group )
     {
         if( fConnections.count( signal ) != 0 )
         {
@@ -219,31 +193,15 @@ namespace Nymph
             return;
         }
 
-        // ensure that the slot is of the correct type
-        if( ! std::dynamic_pointer_cast< Signal< XArgs... > >( signal ) )
-        {
-            BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect slot <" << fName << "> to signal <" << signal->Name() << ">, but cannot make the connection:\n" <<
-                    "\tUnable to cast from SignalBase to this slot's derived type.\n" << 
-                    "\tArgument types do not match" << eom );
-        }
-
-        _AddConnection( signal, group );
-        signal->_Connect( this, group );
+        signal->Connect( shared_from_this(), group );
 
         return;
     }
 
     template< typename... XArgs >
-    void Slot< XArgs... >::_AddConnection( SignalPtr_t signal ) const
-    {
-        fConnections.insert( signal );
-        return;
-    }
-
-    template< typename... XArgs >
-    void Slot< XArgs... >::RemoveConnection( SignalPtr_t signal ) const
+    inline void Slot< XArgs... >::operator()( XArgs... args )
     {
-        fConnections.erase( signal );
+        fFunction( args... );
         return;
     }
 

From 66e8562652f9231fe96ab77e6655f9cbae63867c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 13 Sep 2019 04:15:45 -0700
Subject: [PATCH 142/521] Some reworking of signals, slots, and their use by
 processors.  Added TestProcessor.cc.  Seems to be working now.

---
 Library/Processor/Processor.cc      |   2 +-
 Library/Processor/Processor.hh      |  20 ++--
 Library/Processor/Signal.hh         |   8 +-
 Library/Processor/SignalSlotBase.cc |   8 +-
 Library/Processor/SignalSlotBase.hh |  38 ++++----
 Library/Processor/Slot.hh           |   6 +-
 Testing/CMakeLists.txt              |   1 +
 Testing/TestProcessor.cc            | 145 ++++++++++++++++++++++++++++
 Testing/TestSignalSlot.cc           |  55 +++++++++--
 9 files changed, 228 insertions(+), 55 deletions(-)
 create mode 100644 Testing/TestProcessor.cc

diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 0bfca18..aa647a2 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -73,7 +73,7 @@ namespace Nymph
         return;
     }
 
-    void Processor::ConnectSignalToSlot( SignalPtr_t signal, SlotPtr_t slot, int groupNum )
+    void Processor::ConnectSignalToSlot( SignalBase* signal, SlotBase* slot, int groupNum )
     {
         if( ! signal )
         {
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 6efb137..cfcf109 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -25,11 +25,11 @@ namespace Nymph
     class Processor
     {
         protected:
-            typedef std::map< std::string, SignalPtr_t > SignalMap;
+            typedef std::map< std::string, SignalBase* > SignalMap;
             typedef SignalMap::iterator SigMapIt;
             typedef SignalMap::value_type SigMapVal;
 
-            typedef std::map< std::string, SlotPtr_t > SlotMap;
+            typedef std::map< std::string, SlotBase* > SlotMap;
             typedef SlotMap::iterator SlotMapIt;
             typedef SlotMap::value_type SlotMapVal;
 
@@ -42,10 +42,10 @@ namespace Nymph
 
         public:
             /// Configure the processor with a param_node
-            virtual bool Configure( const scarab::param_node& node ) = 0;
+            virtual void Configure( const scarab::param_node& node ) = 0;
 
             /// Utility function for connecting any signal to any slot
-            static void ConnectSignalToSlot( SignalPtr_t signal, SlotPtr_t slot, int groupNum=-1 );
+            static void ConnectSignalToSlot( SignalBase* signal, SlotBase* slot, int groupNum=-1 );
 
             /// Connect a signal in this processor to a slot in a different processor
             void ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum=-1 );
@@ -53,10 +53,10 @@ namespace Nymph
             void ConnectASignal( Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum=-1 );
 
             /// Register a signal object with this processor
-            void RegisterSignal( std::string name, SignalPtr_t signal );
+            void RegisterSignal( std::string name, SignalBase* signal );
 
             /// Register a slot object with this processor
-            void RegisterSlot( std::string name, SlotPtr_t slot, std::initializer_list< std::string > signals = {} );
+            void RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals = {} );
 
             //bool GetDoBreakpoint( const std::string& slotName );
             //void SetDoBreakpoint( const std::string& slotName, bool flag );
@@ -66,21 +66,17 @@ namespace Nymph
             MEMVAR_REF_CONST( SignalMap, Signals );
             MEMVAR_REF_CONST( SlotMap, Slots );
 
-        protected:
-            template< typename XReturn, typename... XArgs >
-            void PassToConnProcs( const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args );
-
     };
 
 
-    inline void Processor::RegisterSignal( std::string name, SignalPtr_t signal )
+    inline void Processor::RegisterSignal( std::string name, SignalBase* signal )
     {
         LDEBUG( processorlog, "Registering signal <" << name << "> in processor <" << fName << ">" );
         fSignals.insert( SigMapVal(name, signal) );
         return;
     }
 
-    inline void Processor::RegisterSlot( std::string name, SlotPtr_t slot, std::initializer_list< std::string > signals )
+    inline void Processor::RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals )
     {
         LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
         fSlots.insert( SlotMapVal(name, slot) );
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index ebfc7a2..42bc3c5 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -45,7 +45,7 @@ namespace Nymph
             Signal( Signal&& ) = delete;
             virtual ~Signal();
 
-            virtual void Connect( SlotPtr_t slot, int group = -1 );
+            virtual void Connect( SlotBase* slot, int group = -1 );
 
             // calls all connected functions
             void Emit( XArgs... args );
@@ -125,7 +125,7 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void Signal< XArgs... >::Connect( SlotPtr_t slot, int group )
+    void Signal< XArgs... >::Connect( SlotBase* slot, int group )
     {
         if( fConnections.count( slot ) != 0 )
         {
@@ -134,7 +134,7 @@ namespace Nymph
         }
 
         // ensure that the slot is of the correct type
-        if( ! std::dynamic_pointer_cast< Slot< XArgs... > >( slot ) )
+        if( ! dynamic_cast< Slot< XArgs... >* >( slot ) )
         {
             BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
                     "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
@@ -169,7 +169,7 @@ namespace Nymph
     {
         for( auto connection : fConnections )
         {
-            std::static_pointer_cast< Slot< XArgs... > >(connection)->Function()( args... );
+            static_cast< Slot< XArgs... >* >(connection)->Function()( args... );
         }
         return;
     }
diff --git a/Library/Processor/SignalSlotBase.cc b/Library/Processor/SignalSlotBase.cc
index cf6588d..1e76364 100644
--- a/Library/Processor/SignalSlotBase.cc
+++ b/Library/Processor/SignalSlotBase.cc
@@ -19,9 +19,9 @@ namespace Nymph
 
     void SlotBase::DisconnectAll()
     {
-        for( auto connection : fConnections )
+        while( ! fConnections.empty() )
         {
-            connection->Disconnect( shared_from_this() );
+            Disconnect( *fConnections.begin() );
         }
         return;
     }
@@ -37,9 +37,9 @@ namespace Nymph
     // disconnects all previously connected functions
     void SignalBase::DisconnectAll()
     {
-        for( auto connection : fConnections )
+        while( ! fConnections.empty() )
         {
-            Disconnect( connection );
+            Disconnect( *fConnections.begin() );
         }
         return;
     }
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index cdeaaa5..ae1fd3c 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -24,12 +24,8 @@ namespace Nymph
 
 
     class SignalBase;
-    class SlotBase;
 
-    typedef std::shared_ptr< SignalBase > SignalPtr_t;
-    typedef std::shared_ptr< SlotBase > SlotPtr_t;
-
-    class SlotBase : public std::enable_shared_from_this< SlotBase >
+    class SlotBase
     {
         public:
             SlotBase( const std::string& name );
@@ -37,23 +33,23 @@ namespace Nymph
             //SlotBase( const std::string& name, XOwner* owner );
             virtual ~SlotBase();
 
-            virtual void ConnectTo( SignalPtr_t signal, int group = -1 ) = 0;
+            virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
 
-            void Disconnect( SignalPtr_t signal);
+            void Disconnect( SignalBase* signal);
             void DisconnectAll();
 
             MEMVAR_REF( std::string, Name );
 
-            typedef std::set< SignalPtr_t > signal_connections; // to get around the problem of having a comma inside a macro function argument
+            typedef std::set< SignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE( signal_connections, Connections );
 
         protected:
             friend class SignalBase;
-            virtual void AddConnection( SignalPtr_t signal );
+            virtual void AddConnection( SignalBase* signal );
     };
 
 
-    class SignalBase : public std::enable_shared_from_this< SignalBase >
+    class SignalBase
     {
         public:
             SignalBase( const std::string& name );
@@ -61,44 +57,44 @@ namespace Nymph
             //SignalBase( const std::string& name, XOwner* owner );
             virtual ~SignalBase();
 
-            virtual void Connect( SlotPtr_t slot, int group = -1 ) = 0;
+            virtual void Connect( SlotBase* slot, int group = -1 ) = 0;
 
-            void Disconnect( const SlotPtr_t slot );
+            void Disconnect( SlotBase* slot );
             void DisconnectAll();
 
             MEMVAR_REF( std::string, Name );
 
-            typedef std::set< SlotPtr_t > slot_connections; // to get around the problem of having a comma inside a macro function argument
+            typedef std::set< SlotBase* > slot_connections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
 
         protected:
             friend class SignalBase;
-            virtual void AddConnection( SlotPtr_t slot, int group );
+            virtual void AddConnection( SlotBase* slot, int group );
     };
 
-    inline void SlotBase::AddConnection( SignalPtr_t signal )
+    inline void SlotBase::AddConnection( SignalBase* signal )
     {
         fConnections.insert( signal );
         return;
     }
 
-    inline void SlotBase::Disconnect( SignalPtr_t signal )
+    inline void SlotBase::Disconnect( SignalBase* signal )
     {
-        signal->Disconnect( shared_from_this() );
+        signal->Disconnect( this );
         return;
     }
 
-    inline void SignalBase::AddConnection( SlotPtr_t slot, int group )
+    inline void SignalBase::AddConnection( SlotBase* slot, int group )
     {
         fConnections.insert( slot );
-        slot->AddConnection( shared_from_this() );
+        slot->AddConnection( this );
         return;
     }
 
     // disconnects a previously connected function
-    inline void SignalBase::Disconnect( SlotPtr_t slot )
+    inline void SignalBase::Disconnect( SlotBase* slot )
     {
-        slot->fConnections.erase( shared_from_this() );
+        slot->fConnections.erase( this );
         fConnections.erase( slot );
         return;
     }
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 72d4acb..46202a0 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -56,7 +56,7 @@ namespace Nymph
             Slot( Slot&& ) = delete;
             virtual ~Slot();
 
-            void ConnectTo( SignalPtr_t signal, int group = -1 );
+            void ConnectTo( SignalBase* signal, int group = -1 );
 
             // execute fFunction
             void operator()( XArgs... args );
@@ -185,7 +185,7 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void Slot< XArgs... >::ConnectTo( SignalPtr_t signal, int group )
+    void Slot< XArgs... >::ConnectTo( SignalBase* signal, int group )
     {
         if( fConnections.count( signal ) != 0 )
         {
@@ -193,7 +193,7 @@ namespace Nymph
             return;
         }
 
-        signal->Connect( shared_from_this(), group );
+        signal->Connect( this, group );
 
         return;
     }
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index be65fc3..e95e65f 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,6 +8,7 @@ set( testing_HEADERS
 )
 
 set( testing_SOURCES
+    TestProcessor.cc
     TestSignalSlot.cc
     UseCatch.cc
 )
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
new file mode 100644
index 0000000..3b1f94e
--- /dev/null
+++ b/Testing/TestProcessor.cc
@@ -0,0 +1,145 @@
+/*
+ * TestProcessor.cc
+ *
+ *  Created on: Sept 12, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "Processor.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "catch.hpp"
+
+namespace Nymph
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestProc : public Processor
+    {
+        public:
+            TestProc() :
+                    Processor( "test" ),
+                    fValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestProc::SetValue )
+            {}
+
+            ~TestProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                fValue = node.get_value( "value", fValue );
+                return;
+            }
+
+            MEMVAR( int, Value );
+
+            Signal< int >& ValueSig()
+            {
+                return fValueSig;
+            }
+
+        private:
+            Signal< int > fValueSig;
+            Slot< int > fValueSlot;
+    };
+
+    // external slot function owner
+    struct TestSlotOwner
+    {
+        int fValue = 0;
+        void TestSlotFunc( int input )
+        {
+            fValue = input;
+            return;
+        }
+    };
+}
+
+TEST_CASE( "processor", "[signal],[slot],[processor]" )
+{
+    using namespace Nymph;
+
+    TestProc tester;
+
+    SECTION( "Configuration" )
+    {
+        REQUIRE( tester.GetValue() == 0 );
+
+        // setup the config parameter
+        scarab::param_node config;
+        int configValue = 5;
+        config.add( "value", configValue );
+
+        // perform configuration
+        tester.Configure( config );
+
+        // check that the value was set correctly
+        REQUIRE( tester.GetValue() == configValue );
+    }
+
+    SECTION( "Signals and Slots" )
+    {
+        // check that the processor has one slot and one signal
+        REQUIRE( tester.Signals().size() == 1 );
+        REQUIRE( tester.Slots().size() == 1 );
+
+        // this is a slot using a lambda function to set a variable
+        int lambdaValue = 0;
+        Slot< int > lambdaSlot( "lambdaSlot", [&lambdaValue](int input){ lambdaValue = input; } );
+        tester.RegisterSlot( "lambdaSlot", &lambdaSlot );
+
+        // this slot is a member function of an object other than the processor
+        TestSlotOwner slotOwner;
+        Slot< int > slotOwnerSlot( "slotOwnerSlot", &tester, &slotOwner, &TestSlotOwner::TestSlotFunc );
+
+        // check initial value
+        REQUIRE( slotOwner.fValue == 0 );
+        REQUIRE( lambdaValue == 0 );
+
+        // we've added a couple more slots
+        REQUIRE( tester.Slots().size() == 3 );
+
+        // no connections yet
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 0 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 0 );
+
+        // make a connection
+        tester.ConnectASlot( "value", tester, "value" );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+
+        // repeat connection should be ignored
+        tester.ConnectASlot( "value", tester, "value" );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+
+        // connect the lambda slot to the signal
+        tester.ConnectASignal( tester, "value", "lambdaSlot" );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 2 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("lambdaSlot")->Connections().size() == 1 );
+
+        // connect the exteranlly-owned slot to the signal
+        Processor::ConnectSignalToSlot( tester.Signals().at("value"), tester.Slots().at("slotOwnerSlot") );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 3 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("slotOwnerSlot")->Connections().size() == 1 );
+
+        // emit the signal
+        int newValue = 10;
+        tester.ValueSig().Emit( newValue );
+
+        // check that all values have been changed
+        REQUIRE( tester.GetValue() == newValue );
+        REQUIRE( slotOwner.fValue == newValue );
+        REQUIRE( lambdaValue == newValue );
+    }
+
+}
diff --git a/Testing/TestSignalSlot.cc b/Testing/TestSignalSlot.cc
index 8b18fa0..dabb39b 100644
--- a/Testing/TestSignalSlot.cc
+++ b/Testing/TestSignalSlot.cc
@@ -17,21 +17,56 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
 
     int testValue = 0;
 
-    SignalPtr_t signalPtr = std::make_shared< Signal< int > >( "signal" );
-    SlotPtr_t slotPtr = std::make_shared< Slot< int > >( "slot", [&](int aValue ){ testValue = aValue; } );
+    Signal< int > signal( "signal" );
+    Slot< int > slot( "slot", [&](int aValue ){ testValue = aValue; } );
 
-    REQUIRE( signalPtr );
-    REQUIRE( slotPtr );
+    signal.Connect( &slot );
 
-    signalPtr->Connect( slotPtr );
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
 
-    //REQUIRE( signalPtr->Connections().size() == 1 );
-    //REQUIRE( slotPtr->Connections().size() == 1 );
-
-    std::dynamic_pointer_cast< Signal< int > >(signalPtr)->Emit( 5 );
+    signal.Emit( 5 );
     REQUIRE( testValue == 5 );
 
-    std::dynamic_pointer_cast< Signal< int > >(signalPtr)->operator()( 10 );
+    signal( 10 );
     REQUIRE( testValue == 10 );
 
+    signal.Disconnect( &slot );
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+    // connect and disconnect via slot
+    slot.ConnectTo( &signal );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    slot.Disconnect( &signal );
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+    // reconnect for testing SignalBase::DisconnectAll()
+    signal.Connect( &slot );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    signal.DisconnectAll();
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+    // reconnect for testing SlotBaseDisconnectAll()
+    slot.ConnectTo( &signal );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    slot.DisconnectAll();
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
 }

From 1ccd07d47f8b3bc3d8d84ba5ab41f30b45fbb678 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 14 Sep 2019 19:54:00 -0700
Subject: [PATCH 143/521] Added blank ControlAccess class, the slot wrapper
 function, calling the slot wrapper function from a signal with the control
 access, and the ability to tell a slot which signals it calls.

---
 Library/CMakeLists.txt              |  1 +
 Library/Processor/ControlAccess.hh  | 20 +++++++++++++++
 Library/Processor/Processor.cc      | 40 +++++++++++++++++++++++++++++
 Library/Processor/Processor.hh      | 19 ++++----------
 Library/Processor/Signal.hh         |  3 ++-
 Library/Processor/SignalSlotBase.cc |  6 +++--
 Library/Processor/SignalSlotBase.hh |  6 +++++
 Library/Processor/Slot.hh           | 38 +++++++++++++++++++++++----
 8 files changed, 111 insertions(+), 22 deletions(-)
 create mode 100644 Library/Processor/ControlAccess.hh

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 7cc4740..164a04a 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -12,6 +12,7 @@ set( APPL_DIR Application )
 set( NYMPH_HEADERFILES
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
+    ${PROC_DIR}/ControlAccess.hh
     #${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/SignalSlotBase.hh
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
new file mode 100644
index 0000000..12109d3
--- /dev/null
+++ b/Library/Processor/ControlAccess.hh
@@ -0,0 +1,20 @@
+/*
+ * ControlAccess.hh
+ *
+ *  Created on: Sept 14, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_CONTROLACCESS_HH_
+#define NYMPH_CONTROLACCESS_HH_
+
+namespace Nymph
+{
+
+    //TODO fill this in with anything useful
+    struct ControlAccess
+    {};
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_CONTROLACCESS_HH_ */
diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index aa647a2..4a56b47 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -7,6 +7,7 @@
 
 #include "Processor.hh"
 
+#include <utility>
 
 namespace Nymph
 {
@@ -22,6 +23,45 @@ namespace Nymph
     Processor::~Processor()
     {}
 
+    void Processor::RegisterSignal( std::string name, SignalBase* signal )
+    {
+        LDEBUG( processorlog, "Registering signal <" << name << "> in processor <" << fName << ">" );
+        fSignals.insert( SigMapVal(name, signal) );
+
+        // give the signal to any slots that are waiting for it
+        auto range = fSlotsWaitingForSignals.equal_range( name );
+        for( auto rangeIt = range.first; rangeIt != range.second; ++rangeIt )
+        {
+            rangeIt->second->SignalsUsed().push_back( signal );
+        }
+
+        return;
+    }
+
+    void Processor::RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals )
+    {
+        LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
+        fSlots.insert( SlotMapVal(name, slot) );
+
+        // take care of giving signal pointers to the slot, or saving them for later assignment
+        for( auto signalIt = signals.begin(); signalIt != signals.end(); ++signalIt )
+        {
+            auto signalPtrIt = fSignals.find( *signalIt );
+            if( signalPtrIt == fSignals.end() )
+            {
+                // don't have that signal yet, so the slot will wait
+                fSlotsWaitingForSignals.insert( std::make_pair( *signalIt, slot ) );
+            }
+            else
+            {
+                // have the signal; give it to the slot
+                slot->SignalsUsed().push_back( signalPtrIt->second );
+            }
+        }
+
+        return;
+    }
+
     void Processor::ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum )
     {
         // get the signal and slot pointers
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index cfcf109..46f7856 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -66,22 +66,13 @@ namespace Nymph
             MEMVAR_REF_CONST( SignalMap, Signals );
             MEMVAR_REF_CONST( SlotMap, Slots );
 
-    };
-
+            // this is used only to hold pointers to slots waiting for signals
+            // the keys are the names of the signals being waited for, and the values are the slot pointers
+            typedef std::multimap< std::string, SlotBase* > WaitingSlotMap;
+            MEMVAR_REF_CONST( WaitingSlotMap, SlotsWaitingForSignals );
 
-    inline void Processor::RegisterSignal( std::string name, SignalBase* signal )
-    {
-        LDEBUG( processorlog, "Registering signal <" << name << "> in processor <" << fName << ">" );
-        fSignals.insert( SigMapVal(name, signal) );
-        return;
-    }
+    };
 
-    inline void Processor::RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals )
-    {
-        LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
-        fSlots.insert( SlotMapVal(name, slot) );
-        return;
-    }
 
     inline void Processor::ConnectASignal(Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum )
     {
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 42bc3c5..64025d7 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -34,6 +34,7 @@ namespace Nymph
     {
         public:
             using signature = void( XArgs... );
+            using full_signature = void( ControlAccess*, XArgs... );
 
         public:
             /// Unowned signal
@@ -169,7 +170,7 @@ namespace Nymph
     {
         for( auto connection : fConnections )
         {
-            static_cast< Slot< XArgs... >* >(connection)->Function()( args... );
+            static_cast< Slot< XArgs... >* >(connection)->operator()( fControl, args... );
         }
         return;
     }
diff --git a/Library/Processor/SignalSlotBase.cc b/Library/Processor/SignalSlotBase.cc
index 1e76364..b5529d9 100644
--- a/Library/Processor/SignalSlotBase.cc
+++ b/Library/Processor/SignalSlotBase.cc
@@ -11,7 +11,8 @@ namespace Nymph
 {
     SlotBase::SlotBase( const std::string& name ) :
             fName( name ),
-            fConnections()
+            fConnections(),
+            fSignalsUsed()
     {}
 
     SlotBase::~SlotBase()
@@ -28,7 +29,8 @@ namespace Nymph
 
     SignalBase::SignalBase( const std::string& name ) :
             fName( name ),
-            fConnections()
+            fConnections(),
+            fControl( nullptr )
     {}
 
     SignalBase::~SignalBase()
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index ae1fd3c..2168dfc 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -8,12 +8,14 @@
 #ifndef NYMPH_SIGNALSLOTBASE_HH_
 #define NYMPH_SIGNALSLOTBASE_HH_
 
+#include "ControlAccess.hh"
 #include "Exception.hh"
 #include "MemberVariable.hh"
 
 #include <memory>
 #include <set>
 #include <string>
+#include <vector>
 
 namespace Nymph
 {
@@ -43,6 +45,8 @@ namespace Nymph
             typedef std::set< SignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE( signal_connections, Connections );
 
+            MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
+
         protected:
             friend class SignalBase;
             virtual void AddConnection( SignalBase* signal );
@@ -67,6 +71,8 @@ namespace Nymph
             typedef std::set< SlotBase* > slot_connections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
 
+            MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
+
         protected:
             friend class SignalBase;
             virtual void AddConnection( SlotBase* slot, int group );
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 46202a0..c132f5b 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -13,7 +13,6 @@
 #include "SignalSlotBase.hh"
 
 //#include "Exception.hh"
-//#include "ThreadReference.hh"
 
 #include "logger.hh"
 
@@ -25,18 +24,18 @@ namespace Nymph
 {
     LOGGER(slotlog, "Slot");
 
-
     // Type XOwner is the class that owns the Slot object
     template< typename... XArgs >
     class Slot : public SlotBase
     {
         public:
             using signature = void( XArgs... );
+            using full_signature = void( ControlAccess*, XArgs... );
             using signal_list = std::initializer_list< std::string >;
 
         public:
             /// Unowned slot
-            Slot( const std::string& name, const boost::function< signature >& func, signal_list signals = {} );
+            Slot( const std::string& name, const boost::function< signature >& func );
             /// Owned slot, non-const member function
             template< typename XOwner >
             Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
@@ -58,12 +57,18 @@ namespace Nymph
 
             void ConnectTo( SignalBase* signal, int group = -1 );
 
-            // execute fFunction
+            /// execute fFunction without using a ControlAccess object
             void operator()( XArgs... args );
 
+            /// execute fFunction with a ControlAccess object
+            void operator()( ControlAccess* access, XArgs... args );
+
             MEMVAR_REF( boost::function< signature >, Function );
 
             MEMVAR( bool, DoBreakpoint );
+
+        protected:
+            void SlotFuncWrapper( ControlAccess* access, XArgs... args );
     };
 
 
@@ -116,7 +121,7 @@ namespace Nymph
     // Slot
 
     template< typename... XArgs >
-    Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func ) :
             SlotBase( name ),
             fFunction( func ),
             //fThreadRef( std::make_shared< ThreadReference >() ),
@@ -205,6 +210,29 @@ namespace Nymph
         return;
     }
 
+    template< typename... XArgs >
+    inline void Slot< XArgs... >::operator()( ControlAccess* access, XArgs... args )
+    {
+        SlotFuncWrapper( access, args... );
+        return;
+    }
+
+    template< typename... XArgs >
+    inline void Slot< XArgs... >::SlotFuncWrapper( ControlAccess* access, XArgs... args )
+    {
+        //TODO could do something with `access` here
+        for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
+        {
+            (*signalIt)->SetControl( access );
+        }
+
+        fFunction( args... );
+
+        //TODO could do more with `access` here
+
+        return;
+    }
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_SLOT_HH_ */

From 8f394ee61a2070a84707645f0c8515295ae92166 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 15 Sep 2019 03:31:53 -0700
Subject: [PATCH 144/521] Added testing of slot/signal/slot relationships

---
 Testing/TestProcessor.cc | 60 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 55 insertions(+), 5 deletions(-)

diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index 3b1f94e..e110634 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -9,8 +9,12 @@
 #include "Signal.hh"
 #include "Slot.hh"
 
+#include "logger.hh"
+
 #include "catch.hpp"
 
+LOGGER( testlog, "TestProcessor" );
+
 namespace Nymph
 {
     // concrete processor class that we can test
@@ -21,8 +25,12 @@ namespace Nymph
             TestProc() :
                     Processor( "test" ),
                     fValue( 0 ),
+                    fSecondValue( 0 ),
                     fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestProc::SetValue )
+                    fValueSlot( "value", this, &TestProc::SetValue ),
+                    fSecondValueSig( "second-value", this ),
+                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
+                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
             {}
 
             ~TestProc()
@@ -35,15 +43,27 @@ namespace Nymph
             }
 
             MEMVAR( int, Value );
+            MEMVAR( int, SecondValue );
 
             Signal< int >& ValueSig()
             {
                 return fValueSig;
             }
 
+            void SecondValueSlotFunction( int newValue )
+            {
+                fSecondValueSig( newValue );
+            }
+
         private:
             Signal< int > fValueSig;
             Slot< int > fValueSlot;
+
+            //Signal< int > fSecondValueSig;
+            MEMVAR_REF( Signal< int >, SecondValueSig );
+        private:
+            Slot< int > fSecondValueSlot;
+            Slot< int > fSecondValueSlot2;
     };
 
     // external slot function owner
@@ -82,9 +102,13 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
 
     SECTION( "Signals and Slots" )
     {
-        // check that the processor has one slot and one signal
-        REQUIRE( tester.Signals().size() == 1 );
-        REQUIRE( tester.Slots().size() == 1 );
+        // check that the processor has the right number of signals and slots registered
+        REQUIRE( tester.Signals().size() == 2 );
+        REQUIRE( tester.Slots().size() == 3 );
+
+        //**************************
+        // Testing signal->slot
+        //**************************
 
         // this is a slot using a lambda function to set a variable
         int lambdaValue = 0;
@@ -100,7 +124,7 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         REQUIRE( lambdaValue == 0 );
 
         // we've added a couple more slots
-        REQUIRE( tester.Slots().size() == 3 );
+        REQUIRE( tester.Slots().size() == 5 );
 
         // no connections yet
         REQUIRE( tester.Signals().at("value")->Connections().size() == 0 );
@@ -132,6 +156,11 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
         REQUIRE( tester.Slots().at("slotOwnerSlot")->Connections().size() == 1 );
 
+        // now have "signal" connected to three slots:
+        //     value --> value
+        //     value --> lambdaSlot
+        //     value --> slotOwnerSlot
+
         // emit the signal
         int newValue = 10;
         tester.ValueSig().Emit( newValue );
@@ -140,6 +169,27 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         REQUIRE( tester.GetValue() == newValue );
         REQUIRE( slotOwner.fValue == newValue );
         REQUIRE( lambdaValue == newValue );
+
+        //*********************************
+        // testing slot->signal->slot
+        //*********************************
+
+        // check initial value
+        REQUIRE( tester.GetSecondValue() == 0 );
+
+        REQUIRE( tester.Slots().at("second-value")->SignalsUsed().size() == 1 );
+        REQUIRE( tester.Slots().at("second-value")->SignalsUsed()[0] == &tester.SecondValueSig() );
+
+        tester.ConnectASlot( "second-value", tester, "second-value-2" );
+
+        // now have second-value (slot) emits second-value --> second-value-2
+
+        REQUIRE( tester.Signals().at("second-value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("second-value-2")->Connections().size() == 1 );
+
+        tester.SecondValueSlotFunction( newValue );
+
+        REQUIRE( tester.GetSecondValue() == newValue );
     }
 
 }

From 11bc36d90b4215317a5e552bdd25f1df303044a3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 15 Sep 2019 06:17:43 -0700
Subject: [PATCH 145/521] Got PrimaryProcessor in shape and a test version of
 ControlAccess.

---
 Library/CMakeLists.txt                |  7 ++-
 Library/Processor/ControlAccess.cc    | 28 ++++++++++
 Library/Processor/ControlAccess.hh    | 80 ++++++++++++++++++++++++++-
 Library/Processor/PrimaryProcessor.cc | 54 +++++++-----------
 Library/Processor/PrimaryProcessor.hh | 43 +++++++++-----
 Testing/CMakeLists.txt                |  2 +
 Testing/TestControlAccess.cc          | 29 ++++++++++
 Testing/TestPrimaryProcessor.cc       | 70 +++++++++++++++++++++++
 Testing/TestProcessor.cc              | 19 ++-----
 9 files changed, 265 insertions(+), 67 deletions(-)
 create mode 100644 Library/Processor/ControlAccess.cc
 create mode 100644 Testing/TestControlAccess.cc
 create mode 100644 Testing/TestPrimaryProcessor.cc

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 164a04a..bd3fee4 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -12,15 +12,18 @@ set( APPL_DIR Application )
 set( NYMPH_HEADERFILES
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
+    
     ${PROC_DIR}/ControlAccess.hh
-    #${PROC_DIR}/PrimaryProcessor.hh
+    ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/SignalSlotBase.hh
 )
 
 set( NYMPH_SOURCEFILES
     ${UTIL_DIR}/Exception.cc
-    #${PROC_DIR}/PrimaryProcessor.cc
+
+    ${PROC_DIR}/ControlAccess.cc
+    ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
     ${PROC_DIR}/SignalSlotBase.cc
 )
diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
new file mode 100644
index 0000000..673a6d6
--- /dev/null
+++ b/Library/Processor/ControlAccess.cc
@@ -0,0 +1,28 @@
+/*
+ * ControlAccess.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "ControlAccess.hh"
+
+
+namespace Nymph
+{
+    ReturnBufferBase::ReturnBufferBase()
+    {}
+
+    ReturnBufferBase::~ReturnBufferBase()
+    {}
+
+
+    ControlAccess::ControlAccess() :
+            fReturn( new ReturnBuffer< int >() )
+    {}
+
+    ControlAccess::~ControlAccess()
+    {}
+
+
+} /* namespace Nymph */
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 12109d3..b64ef60 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -8,12 +8,88 @@
 #ifndef NYMPH_CONTROLACCESS_HH_
 #define NYMPH_CONTROLACCESS_HH_
 
+#include <memory>
+
 namespace Nymph
 {
+    class ReturnBufferBase
+    {
+        public:
+            ReturnBufferBase();
+            virtual ~ReturnBufferBase();
+    };
+
+    template< typename OneArg >
+    struct ReturnBuffer : ReturnBufferBase
+    {
+        public:
+            ReturnBuffer() :
+                    fReturn( nullptr )
+            {}
+
+            ReturnBuffer( OneArg& retval ) :
+                    fReturn( &retval )
+            {}
+
+            virtual ~ReturnBuffer()
+            {}
+
+            OneArg& GetReturn()
+            {
+                if( fReturn == nullptr ) throw std::exception();
+                return *fReturn;
+            }
+
+        protected:
+            OneArg* fReturn;
+    };
+
+    template<>
+    struct ReturnBuffer< void > : ReturnBufferBase
+    {
+        ReturnBuffer() :
+                ReturnBufferBase()
+        {}
+
+        void GetReturn()
+        {
+            return;
+        }
+    };
 
     //TODO fill this in with anything useful
-    struct ControlAccess
-    {};
+    class ControlAccess
+    {
+        public:
+            ControlAccess();
+
+            virtual ~ControlAccess();
+
+            template< typename OneArg >
+            void SetReturn( OneArg& arg );
+
+            template< typename OneArg >
+            OneArg& GetReturn();
+
+        protected:
+            std::shared_ptr< ReturnBufferBase > fReturn;
+    };
+
+
+    template< typename OneArg >
+    void ControlAccess::SetReturn( OneArg& arg )
+    {
+        fReturn = std::make_shared< ReturnBuffer< OneArg > >( arg );
+        return;
+    }
+
+    template< typename OneArg >
+    OneArg& ControlAccess::GetReturn()
+    {
+        std::shared_ptr< ReturnBuffer< OneArg > > buffer( std::dynamic_pointer_cast< ReturnBuffer< OneArg > >(fReturn) );
+        if( buffer == nullptr ) throw std::exception();
+        return buffer->GetReturn();
+    }
 
 } /* namespace Nymph */
 
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 27b6f1d..7c362a1 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -1,67 +1,51 @@
 /*
- * KTPrimaryProcessor.cc
+ * PrimaryProcessor.cc
  *
  *  Created on: Oct 10, 2012
  *      Author: N.S. Oblath
  */
 
-#include "KTPrimaryProcessor.hh"
+#include "PrimaryProcessor.hh"
 
-#include "KTException.hh"
-#include "KTLogger.hh"
+#include "Exception.hh"
+
+#include "logger.hh"
 
 namespace Nymph
 {
-    KTLOGGER( proclog, "KTPrimaryProcessor" );
+    LOGGER( proclog, "PrimaryProcessor" );
 
-    KTPrimaryProcessor::KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name ) :
-            KTProcessor( name ),
-            fSignalsEmitted( signals ),
-            fThreadRef(),
-            fDoBreakpoint(false)
-    {
+    PrimaryProcessor::PrimaryProcessor( const std::string& name ) :
+            Processor( name )
+    {}
 
-    }
-
-    KTPrimaryProcessor::~KTPrimaryProcessor()
-    {
-    }
+    PrimaryProcessor::~PrimaryProcessor()
+    {}
 
-    void KTPrimaryProcessor::operator ()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag )
+    void PrimaryProcessor::operator()( ControlAccess* control )
     {
-        fThreadRef = ref;
-
-        // pass updated thread reference to downstream slots
-        for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
+        for( auto signalIt = fSignals.begin(); signalIt != fSignals.end(); ++signalIt )
         {
-            // loop over all processor:slots called by this signal
-            auto sigConnRange = fSigConnMap.equal_range( *sigIt );
-            for( SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt )
-            {
-                // pass the update on to the connected-to processor
-                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, fThreadRef );
-            }
+            signalIt->second->SetControl( control );
         }
 
-        startedFlag = true;
-        startedCV.notify_all();
-
         // go!
         try
         {
             if( ! Run() )
             {
-                KTERROR( proclog, "An error occurred during processor running." );
-                THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
+                LERROR( proclog, "An error occurred during processor running." );
+                //THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
             }
             else
             {
-                fThreadRef->SetReturnValue( KTDataHandle() );
+                LWARN( proclog, "Valid return" );
+                //fThreadRef->SetReturnValue( KTDataHandle() );
             }
         }
         catch( boost::exception& e )
         {
-            fThreadRef->SetReturnException( boost::current_exception() );
+            //fThreadRef->SetReturnException( boost::current_exception() );
         }
         return;
     }
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index e72fcf3..9d125b7 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -1,30 +1,41 @@
 /*
- * KTPrimaryProcessor.hh
+ * PrimaryProcessor.hh
  *
  *  Created on: Oct 10, 2012
  *      Author: N.S. Oblath
  */
 
-#ifndef KTPRIMARYPROCESSOR_HH_
-#define KTPRIMARYPROCESSOR_HH_
+#ifndef NYMPH_PRIMARYPROCESSOR_HH_
+#define NYMPH_PRIMARYPROCESSOR_HH_
 
-#include "KTProcessor.hh"
+#include "Processor.hh"
 
-#include "KTCoreData.hh"
-#include "KTThreadReference.hh"
-
-#include <boost/thread/condition_variable.hpp>
-
-#include <atomic>
 
 namespace Nymph
 {
 
-    class KTPrimaryProcessor : public KTProcessor
+    class PrimaryProcessor : public Processor
+    {
+        public:
+            PrimaryProcessor( const std::string& name );
+            virtual ~PrimaryProcessor();
+
+        public:
+            /// Callable function used by std::thread
+            void operator()( ControlAccess* control );
+
+            /// Starts the  main action of the processor
+            virtual bool Run() = 0;
+
+    };
+
+
+/*
+    class PrimaryProcessor : public Processor
     {
         public:
-            KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
-            virtual ~KTPrimaryProcessor();
+            PrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
+            virtual ~PrimaryProcessor();
 
         public:
             /// Callable function used by std::thread
@@ -44,10 +55,12 @@ namespace Nymph
 
     };
 
-    inline std::shared_ptr< KTThreadReference > KTPrimaryProcessor::GetThreadRef()
+    inline std::shared_ptr< KTThreadReference > PrimaryProcessor::GetThreadRef()
     {
         return fThreadRef;
     }
+*/
 
 } /* namespace Nymph */
-#endif /* KTPRIMARYPROCESSOR_HH_ */
+
+#endif /* NYMPH_PRIMARYPROCESSOR_HH_ */
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index e95e65f..29726b0 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -8,6 +8,8 @@ set( testing_HEADERS
 )
 
 set( testing_SOURCES
+    TestControlAccess.cc
+    TestPrimaryProcessor.cc
     TestProcessor.cc
     TestSignalSlot.cc
     UseCatch.cc
diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
new file mode 100644
index 0000000..f853c3c
--- /dev/null
+++ b/Testing/TestControlAccess.cc
@@ -0,0 +1,29 @@
+/*
+ * TestControlAccesss.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#include "ControlAccess.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "control_access", "[control_access]" )
+{
+    using namespace Nymph;
+
+    ControlAccess control;
+
+    int intReturn = 5;
+
+    REQUIRE_THROWS( control.GetReturn< int >() );
+
+    control.SetReturn< int >( intReturn );
+
+    REQUIRE( control.GetReturn< int >() == intReturn );
+    REQUIRE_THROWS( control.GetReturn< unsigned >() == intReturn );
+
+}
\ No newline at end of file
diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
new file mode 100644
index 0000000..62afb44
--- /dev/null
+++ b/Testing/TestPrimaryProcessor.cc
@@ -0,0 +1,70 @@
+/*
+ * TestPrimaryProcessor.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "PrimaryProcessor.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "logger.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestPrimaryProcessor" );
+
+namespace Nymph
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestPrimaryProc : public PrimaryProcessor
+    {
+        public:
+            TestPrimaryProc() :
+                    PrimaryProcessor( "test" ),
+                    fNewValue( 10 ),
+                    fValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
+            {}
+
+            virtual ~TestPrimaryProc()
+            {}
+
+            void Configure( const scarab::param_node& )
+            {
+                return;
+            }
+
+            bool Run()
+            {
+                fValueSig( fNewValue );
+                return true;
+            }
+
+            MEMVAR( int, NewValue );
+            MEMVAR( int, Value );
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+    };
+}
+
+TEST_CASE( "primary_processor", "[primary_processor]" )
+{
+    using namespace Nymph;
+
+    TestPrimaryProc tester;
+
+    tester.ConnectASlot( "value", tester, "value" );
+
+    ControlAccess control;
+    tester( &control );
+
+    REQUIRE( tester.GetValue() == tester.GetNewValue() );
+
+    REQUIRE( tester.ValueSig().GetControl() == &control );
+}
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index e110634..f075355 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -33,7 +33,7 @@ namespace Nymph
                     fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
             {}
 
-            ~TestProc()
+            virtual ~TestProc()
             {}
 
             void Configure( const scarab::param_node& node )
@@ -45,25 +45,18 @@ namespace Nymph
             MEMVAR( int, Value );
             MEMVAR( int, SecondValue );
 
-            Signal< int >& ValueSig()
-            {
-                return fValueSig;
-            }
-
             void SecondValueSlotFunction( int newValue )
             {
                 fSecondValueSig( newValue );
             }
 
-        private:
-            Signal< int > fValueSig;
-            Slot< int > fValueSlot;
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
 
-            //Signal< int > fSecondValueSig;
             MEMVAR_REF( Signal< int >, SecondValueSig );
-        private:
-            Slot< int > fSecondValueSlot;
-            Slot< int > fSecondValueSlot2;
+            MEMVAR_REF( Slot< int >, SecondValueSlot );
+            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
+
     };
 
     // external slot function owner

From 7d49d5127f81b934d5d436f0babfebb9681e477a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 15 Sep 2019 07:04:05 -0700
Subject: [PATCH 146/521] Switch ControlAccess return to use std::tuple to
 return multiple types

---
 Library/Processor/ControlAccess.hh | 32 +++++++++++++++---------------
 Testing/TestControlAccess.cc       |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index b64ef60..13296bc 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -9,6 +9,7 @@
 #define NYMPH_CONTROLACCESS_HH_
 
 #include <memory>
+#include <tuple>
 
 namespace Nymph
 {
@@ -19,7 +20,7 @@ namespace Nymph
             virtual ~ReturnBufferBase();
     };
 
-    template< typename OneArg >
+    template< typename... Args >
     struct ReturnBuffer : ReturnBufferBase
     {
         public:
@@ -27,21 +28,21 @@ namespace Nymph
                     fReturn( nullptr )
             {}
 
-            ReturnBuffer( OneArg& retval ) :
-                    fReturn( &retval )
+            ReturnBuffer( Args&... retval ) :
+                    fReturn( new std::tuple< Args&... >( retval... ) )
             {}
 
             virtual ~ReturnBuffer()
             {}
 
-            OneArg& GetReturn()
+            std::tuple< Args&... >& GetReturn()
             {
                 if( fReturn == nullptr ) throw std::exception();
                 return *fReturn;
             }
 
         protected:
-            OneArg* fReturn;
+            std::tuple< Args&... >* fReturn;
     };
 
     template<>
@@ -57,7 +58,6 @@ namespace Nymph
         }
     };
 
-    //TODO fill this in with anything useful
     class ControlAccess
     {
         public:
@@ -65,28 +65,28 @@ namespace Nymph
 
             virtual ~ControlAccess();
 
-            template< typename OneArg >
-            void SetReturn( OneArg& arg );
+            template< typename... Args >
+            void SetReturn( Args&... arg );
 
-            template< typename OneArg >
-            OneArg& GetReturn();
+            template< typename... Args >
+            std::tuple< Args&... >& GetReturn();
 
         protected:
             std::shared_ptr< ReturnBufferBase > fReturn;
     };
 
 
-    template< typename OneArg >
-    void ControlAccess::SetReturn( OneArg& arg )
+    template< typename... Args >
+    void ControlAccess::SetReturn( Args&... args )
     {
-        fReturn = std::make_shared< ReturnBuffer< OneArg > >( arg );
+        fReturn = std::make_shared< ReturnBuffer< Args... > >( args... );
         return;
     }
 
-    template< typename OneArg >
-    OneArg& ControlAccess::GetReturn()
+    template< typename... Args >
+    std::tuple< Args&... >& ControlAccess::GetReturn()
     {
-        std::shared_ptr< ReturnBuffer< OneArg > > buffer( std::dynamic_pointer_cast< ReturnBuffer< OneArg > >(fReturn) );
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturn) );
         if( buffer == nullptr ) throw std::exception();
         return buffer->GetReturn();
     }
diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
index f853c3c..c4adf02 100644
--- a/Testing/TestControlAccess.cc
+++ b/Testing/TestControlAccess.cc
@@ -23,7 +23,7 @@ TEST_CASE( "control_access", "[control_access]" )
 
     control.SetReturn< int >( intReturn );
 
-    REQUIRE( control.GetReturn< int >() == intReturn );
-    REQUIRE_THROWS( control.GetReturn< unsigned >() == intReturn );
+    REQUIRE( std::get< 0 >(control.GetReturn< int >()) == intReturn );
+    REQUIRE_THROWS( control.GetReturn< unsigned >() );
 
 }
\ No newline at end of file

From ca48401b27b1b9b37a5f571f9d599a381e2ca885 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sun, 15 Sep 2019 07:09:57 -0700
Subject: [PATCH 147/521] Test two returns

---
 Testing/TestControlAccess.cc | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
index c4adf02..039e0cd 100644
--- a/Testing/TestControlAccess.cc
+++ b/Testing/TestControlAccess.cc
@@ -17,13 +17,27 @@ TEST_CASE( "control_access", "[control_access]" )
 
     ControlAccess control;
 
-    int intReturn = 5;
+    SECTION( "One Return" )
+    {
+        int intReturn = 5;
 
-    REQUIRE_THROWS( control.GetReturn< int >() );
+        REQUIRE_THROWS( control.GetReturn< int >() );
 
-    control.SetReturn< int >( intReturn );
+        control.SetReturn< int >( intReturn );
 
-    REQUIRE( std::get< 0 >(control.GetReturn< int >()) == intReturn );
-    REQUIRE_THROWS( control.GetReturn< unsigned >() );
+        REQUIRE( std::get< 0 >(control.GetReturn< int >()) == intReturn );
+        REQUIRE_THROWS( control.GetReturn< unsigned >() );
+    }
+
+    SECTION( "Two Returns" )
+    {
+        int return1 = 5;
+        double return2 = 10.;
+
+        control.SetReturn< int, double >( return1, return2 );
+
+        REQUIRE( std::get< 0 >(control.GetReturn< int, double >()) == return1 );
+        REQUIRE( std::get< 1 >(control.GetReturn< int, double >()) == return2 );
+    }
 
 }
\ No newline at end of file

From 192cef12b425831e285b59a6fadd5cc2180bf256 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 20 Sep 2019 00:48:01 -0700
Subject: [PATCH 148/521] Finished and tested basic breakpoint functionality

---
 Library/Processor/ControlAccess.cc | 26 +++++++++++++++++++++++++-
 Library/Processor/ControlAccess.hh | 19 ++++++++++++++++++-
 Library/Processor/Signal.hh        | 14 ++++++++++++--
 Testing/TestControlAccess.cc       | 20 ++++++++++++++++++++
 4 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
index 673a6d6..8069c4d 100644
--- a/Library/Processor/ControlAccess.cc
+++ b/Library/Processor/ControlAccess.cc
@@ -7,6 +7,9 @@
 
 #include "ControlAccess.hh"
 
+#include <boost/thread/locks.hpp>
+#include <boost/thread/lock_types.hpp>
+
 
 namespace Nymph
 {
@@ -18,11 +21,32 @@ namespace Nymph
 
 
     ControlAccess::ControlAccess() :
-            fReturn( new ReturnBuffer< int >() )
+            fReturn( new ReturnBuffer< int >() ),
+            fMutex(),
+            fCondVar(),
+            fBreakFlag( false ),
+            fCycleTimeMS( 500 )
     {}
 
     ControlAccess::~ControlAccess()
     {}
 
+    void ControlAccess::Resume()
+    {
+        boost::unique_lock< boost::mutex > lock( fMutex );
+        fBreakFlag.store( false );
+        fCondVar.notify_one();
+    }
+
+    void ControlAccess::Break()
+    {
+        boost::unique_lock< boost::mutex > lock( fMutex );
+        fBreakFlag.store( true );
+        while( fBreakFlag.load() && ! is_canceled() )
+        {
+            fCondVar.wait_for( lock, boost::chrono::milliseconds(fCycleTimeMS) );
+        }
+    }
+
 
 } /* namespace Nymph */
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 13296bc..90a768a 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -8,6 +8,13 @@
 #ifndef NYMPH_CONTROLACCESS_HH_
 #define NYMPH_CONTROLACCESS_HH_
 
+#include "MemberVariable.hh"
+
+#include "cancelable.hh"
+
+#include <boost/thread/condition_variable.hpp>
+#include <boost/thread/mutex.hpp>
+
 #include <memory>
 #include <tuple>
 
@@ -58,7 +65,7 @@ namespace Nymph
         }
     };
 
-    class ControlAccess
+    class ControlAccess : public scarab::cancelable
     {
         public:
             ControlAccess();
@@ -73,6 +80,16 @@ namespace Nymph
 
         protected:
             std::shared_ptr< ReturnBufferBase > fReturn;
+
+        public:
+            void Break(); // called by this thread
+            void Resume(); // called by user thread
+
+            MEMVAR_REF( boost::mutex, Mutex );
+            MEMVAR_REF( boost::condition_variable, CondVar );
+            MEMVAR_ATOMIC_NOSET( bool, BreakFlag );
+            MEMVAR( unsigned, CycleTimeMS );
+
     };
 
 
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 64025d7..27109b7 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -51,6 +51,8 @@ namespace Nymph
             // calls all connected functions
             void Emit( XArgs... args );
             void operator()( XArgs... args );
+
+            MEMVAR( bool, DoBreakpoint );
     };
 
 
@@ -108,13 +110,15 @@ namespace Nymph
 
     template< typename... XArgs >
     Signal< XArgs... >::Signal( const std::string& name ) :
-            SignalBase( name )
+            SignalBase( name ),
+            fDoBreakpoint( false )
     {}
 
     template< typename... XArgs >
     template< typename XOwner >
     inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
-            SignalBase( name )
+            SignalBase( name ),
+            fDoBreakpoint( false )
     {
         owner->RegisterSignal( name, this );
     }
@@ -168,6 +172,12 @@ namespace Nymph
     template< typename... XArgs >
     inline void Signal< XArgs... >::operator()( XArgs... args )
     {
+        if( fDoBreakpoint )
+        {
+            fControl->SetReturn< XArgs... >( args... );
+            fControl->Break(); // waits for resume or exit
+        }
+
         for( auto connection : fConnections )
         {
             static_cast< Slot< XArgs... >* >(connection)->operator()( fControl, args... );
diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
index 039e0cd..fbbe650 100644
--- a/Testing/TestControlAccess.cc
+++ b/Testing/TestControlAccess.cc
@@ -8,6 +8,8 @@
 
 #include "ControlAccess.hh"
 
+#include <thread>
+
 #include "catch.hpp"
 
 
@@ -40,4 +42,22 @@ TEST_CASE( "control_access", "[control_access]" )
         REQUIRE( std::get< 1 >(control.GetReturn< int, double >()) == return2 );
     }
 
+    SECTION( "Break" )
+    {
+        std::thread thread( [&](){ 
+            control.Break();
+            } );
+        
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+        REQUIRE( control.GetBreakFlag() );
+
+        control.Resume();
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+        REQUIRE_FALSE( control.GetBreakFlag() );
+
+        thread.join();
+
+        REQUIRE_FALSE( control.GetBreakFlag() );
+    }
+
 }
\ No newline at end of file

From c669fbda23420272560358a6f2a9918c43e81613 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 25 Sep 2019 01:12:14 -0700
Subject: [PATCH 149/521] Some formatting changes

---
 Library/Processor/ProcessorToolbox.cc | 985 ++++++++++++++++++++++++++
 Library/Processor/ProcessorToolbox.hh | 338 +++++++++
 2 files changed, 1323 insertions(+)
 create mode 100644 Library/Processor/ProcessorToolbox.cc
 create mode 100644 Library/Processor/ProcessorToolbox.hh

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
new file mode 100644
index 0000000..371fbac
--- /dev/null
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -0,0 +1,985 @@
+/*
+ * ProcessorToolbox.cc
+ *
+ *  Created on: Sep 27, 2012
+ *      Author: N.S. Oblath
+ */
+
+#include "ProcessorToolbox.hh"
+
+#include "Exception.hh"
+#include "Logger.hh"
+#include "PrimaryProcessor.hh"
+
+#include "factory.hh"
+#include "param_codec.hh"
+
+#include <boost/exception/get_error_info.hpp>
+#include <boost/thread.hpp>
+
+using std::deque;
+using std::set;
+using std::string;
+using std::vector;
+
+namespace Nymph
+{
+    LOGGER(proclog, "ProcessorToolbox");
+
+    ProcessorToolbox::ProcessorToolbox( const std::string& name ) :
+            fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
+            fRunSingleThreaded( false ),
+            fRunQueue(),
+            fProcMap(),
+            fThreadReferences(),
+            fContinueCV(),
+            fDoContinue( false ),
+            fBreakContMutex(),
+            fDoRunThread( nullptr ),
+            fDoRunPromise(),
+            fDoRunBreakFlag( false )
+    {
+    }
+
+    ProcessorToolbox::~ProcessorToolbox()
+    {
+        CancelThreads();
+
+        JoinRunThread();
+
+        ClearProcessors();
+    }
+
+    bool ProcessorToolbox::Configure( const scarab::param_node& node )
+    {
+        LPROG(proclog, "Configuring . . .");
+
+        SetRunSingleThreaded( node.get_value( "single-threaded", fRunSingleThreaded ) );
+
+        // Deal with "processor" blocks
+        if( ! node.has("processors") )
+        {
+            LWARN(proclog, "No processors were specified");
+        }
+        else
+        {
+            const scarab::param_array& procArray = node["processors"].as_array();
+            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
+            {
+                if( ! procIt->is_node() )
+                {
+                    LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
+                    return false;
+                }
+                const scarab::param_node& procNode = procIt->as_node();
+
+                if (! procNode.has("type"))
+                {
+                    LERROR(proclog, "Unable to create processor: no processor type given");
+                    return false;
+                }
+                string procType = procNode["type"]().as_string();
+
+                string procName;
+                if (! procNode.has("name"))
+                {
+                    LINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
+                    procName = procType;
+                }
+                else
+                {
+                    procName = procNode["name"]().as_string();
+                }
+                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procType));
+                if (newProc == NULL)
+                {
+                    LERROR(proclog, "Unable to create processor of type <" << procType << ">");
+                    return false;
+                }
+
+                if (! AddProcessor(procName, newProc))
+                {
+                    LERROR(proclog, "Unable to add processor <" << procName << ">");
+                    //delete newProc; //not required for smart pointers
+                    return false;
+                }
+            }
+        }
+
+
+        // Then deal with connections"
+        if (! node.has("connections"))
+        {
+            LWARN(proclog, "No connections were specified");
+        }
+        else
+        {
+            const scarab::param_array& connArray = node["connections"].as_array();
+            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
+            {
+                if( ! connIt->is_node() )
+                {
+                    LERROR( proclog, "Invalid connection entry: not a node" );
+                    return false;
+                }
+                const scarab::param_node& connNode = connIt->as_node();
+
+                if ( ! connNode.has("signal") || ! connNode.has("slot") )
+                {
+                    LERROR(proclog, "Signal/Slot connection information is incomplete!");
+                    if (connNode.has("signal"))
+                    {
+                        LWARN(proclog, "signal = " << connNode["signal"]());
+                    }
+                    else
+                    {
+                        LERROR(proclog, "signal = MISSING");
+                    }
+
+                    if (connNode.has("slot"))
+                    {
+                        LWARN(proclog, "slot = " << connNode["slot"]());
+                    }
+                    else
+                    {
+                        LERROR(proclog, "slot = MISSING");
+                    }
+                    return false;
+                }
+
+                bool connReturn = false;
+                if (connNode.has("order"))
+                {
+                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int());
+                }
+                else
+                {
+                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string());
+                }
+                if (! connReturn)
+                {
+                    LERROR(proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">");
+                    return false;
+                }
+
+                if (connNode.has("breakpoint"))
+                {
+                    if (! SetBreakpoint(connNode["slot"]().as_string()))
+                    {
+                        LERROR(proclog, "Unable to set breakpoint on <" << connNode["slot"]());
+                        return false;
+                    }
+                }
+
+                LINFO(proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">");
+            }
+        }
+
+
+        // Finally, deal with processor-run specifications
+        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
+        // If names are grouped (in another array), those in that group will be run in parallel.
+        // In single threaded mode all threads will be run sequentially in the order they were specified.
+        if (! node.has("run-queue"))
+        {
+            LWARN(proclog, "Run queue was not specified");
+        }
+        else
+        {
+            const scarab::param_array& rqArray = node["run-queue"].as_array();
+            for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
+            {
+                if (rqIt->is_value())
+                {
+                    if (! PushBackToRunQueue((*rqIt)().as_string()))
+                    {
+                        LERROR(proclog, "Unable to process run-queue entry: could not add processor to the queue");
+                        return false;
+                    }
+                }
+                else if (rqIt->is_array())
+                {
+                    const scarab::param_array* rqNode = &( rqIt->as_array() );
+                    std::vector< std::string > names;
+
+                    for (scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt)
+                    {
+                        if (! rqArrayIt->is_value())
+                        {
+                            LERROR(proclog, "Invalid run-queue array entry: not a value");
+                            return false;
+                        }
+                        names.push_back((*rqArrayIt)().as_string());
+                    }
+
+                    if (! PushBackToRunQueue(names))
+                    {
+                        LERROR(proclog, "Unable to process run-queue entry: could not add list of processors to the queue");
+                        return false;
+                    }
+                }
+                else
+                {
+                    LERROR(proclog, "Invalid run-queue entry: not a value or array");
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
+    {
+        for( ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); ++iter )
+        {
+            LDEBUG( proclog, "Attempting to configure processor <" << iter->first << ">" );
+            string procName = iter->first;
+            string nameUsed(procName);
+            if( ! node.has(nameUsed) )
+            {
+                nameUsed = iter->second.fProc->GetConfigName();
+                if( ! node.has(nameUsed) )
+                {
+                    LWARN( proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
+                            "\tProcessor <" << procName << "> was not configured." );
+                    continue;
+                }
+            }
+            const scarab::param_node& subNode = node[nameUsed].as_node();
+            if( ! iter->second.fProc->Configure(subNode) )
+            {
+                LERROR( proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">" );
+                return false;
+            }
+        }
+        return true;
+    }
+
+    bool ProcessorToolbox::ConfigureProcessors( const std::string& config )
+    {
+        scarab::param_translator translator;
+        scarab::param_node optNode;
+        optNode.add( "encoding", new scarab::param_value( "json" ) );
+        return ConfigureProcessors( translator.read_string( config, optNode )->as_node() );
+    }
+
+    std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName )
+    {
+        ProcMapIt it = fProcMap.find( procName );
+        if( it == fProcMap.end() )
+        {
+            LWARN( proclog, "Processor <" << procName << "> was not found." );
+            return NULL;
+        }
+        return it->second.fProc;
+    }
+
+    const std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName ) const
+    {
+        ProcMapCIt it = fProcMap.find( procName );
+        if (it == fProcMap.end())
+        {
+            LWARN( proclog, "Processor <" << procName << "> was not found." );
+            return NULL;
+        }
+        return it->second.fProc;
+    }
+
+    bool ProcessorToolbox::AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc )
+    {
+        ProcMapIt it = fProcMap.find( procName);
+        if( it == fProcMap.end() )
+        {
+            ProcessorInfo pInfo;
+            pInfo.fProc = proc;
+            fProcMap.insert( ProcMapValue(procName, pInfo) );
+            LDEBUG( proclog, "Added processor <" << procName << "> (a.k.a. " << proc->GetConfigName() << ")" );
+            return true;
+        }
+        LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
+        return false;
+    }
+
+    bool ProcessorToolbox::AddProcessor( const std::string& procType, const std::string& procName )
+    {
+        ProcMapIt it = fProcMap.find( procName );
+        if( it == fProcMap.end() )
+        {
+            std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procType) );
+            if( newProc == NULL )
+            {
+                LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
+                return false;
+            }
+            if( ! AddProcessor(procName, newProc) )
+            {
+                LERROR( proclog, "Unable to add processor <" << procName << ">" );
+                //delete newProc;
+                return false;
+            }
+            return true;
+        }
+        LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
+        return false;
+    }
+
+    bool ProcessorToolbox::RemoveProcessor( const std::string& procName )
+    {
+        std::shared_ptr< Processor > procToRemove = ReleaseProcessor( procName );
+        if( procToRemove == NULL )
+        {
+            return false;
+        }
+        //delete procToRemove;
+        LDEBUG( proclog, "Processor <" << procName << "> deleted." );
+        return true;
+    }
+
+    std::shared_ptr< Processor > ProcessorToolbox::ReleaseProcessor( const std::string& procName 
+    {
+        ProcMapIt it = fProcMap.find(p rocName );
+        if( it == fProcMap.end() )
+        {
+            LWARN( proclog, "Processor <" << procName << "> was not found." );
+            return NULL;
+        }
+        std::shared_ptr< Processor > procToRelease = it->second.fProc;
+        fProcMap.erase( it );
+        return procToRelease;
+    }
+
+    void ProcessorToolbox::ClearProcessors()
+    {
+        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
+        {
+            delete it->second.fProc;
+        }*/ //not required for smart pointers
+        fProcMap.clear();
+        fRunQueue.clear();
+        return;
+    }
+
+
+    bool ProcessorToolbox::MakeConnection( const std::string& signal, const std::string& slot, int order )
+    {
+        string signalProcName, signalName;
+        if( ! ParseSignalSlotName( signal, signalProcName, signalName ) )
+        {
+            LERROR( proclog, "Unable to parse signal name: <" << signal << ">" );
+            return false;
+        }
+
+        string slotProcName, slotName;
+        if( ! ParseSignalSlotName( slot, slotProcName, slotName ) )
+        {
+            LERROR( proclog, "Unable to parse slot name: <" << slot << ">" );
+            return false;
+        }
+
+        return MakeConnection( signalProcName, signalName, slotProcName, slotName, order );
+    }
+
+    bool ProcessorToolbox::MakeConnection( const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order )
+    {
+        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
+        if( signalProc == nullptr )
+        {
+            LERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
+            return false;
+        }
+
+        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
+        if( slotProc == nullptr )
+        {
+            LERROR( proclog, "Processor named <" << slotProcName << "> was not found!" );
+            return false;
+        }
+
+        try
+        {
+            if( order != std::numeric_limits< int >::min() )
+            {
+                signalProc->ConnectASlot( signalName, *slotProc.get(), slotName, order );
+            }
+            else
+            {
+                signalProc->ConnectASlot(signalName, *slotProc.get(), slotName);
+            }
+        }
+        catch (boost::exception& e)
+        {
+            LERROR( proclog, "An error occurred while connecting signals and slots:\n"
+                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->GetConfigName() << ")" << '\n'
+                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->GetConfigName() << ")" << '\n'
+                    << '\t' << diagnostic_information( e ) );
+            return false;
+        }
+
+        return true;
+    }
+
+    bool ProcessorToolbox::SetBreakpoint( const std::string& slot )
+    {
+        string slotProcName, slotName;
+        if(! ParseSignalSlotName( slot, slotProcName, slotName ) )
+        {
+            LERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            return false;
+        }
+
+        return SetBreakpoint( slotProcName, slotName );
+    }
+
+    bool ProcessorToolbox::SetBreakpoint( const std::string& slotProcName, const std::string& slotName )
+    {
+        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
+        if( slotProc == nullptr )
+        {
+            LERROR( proclog, "Processor named <" << slotProcName << "> was not found!" );
+            return false;
+        }
+
+        try
+        {
+            slotProc->SetDoBreakpoint( slotName, true );
+            return true;
+        }
+        catch( boost::exception& e )
+        {
+            LERROR( proclog, "Unable to set breakpoint: " << diagnostic_information( e ) );
+            return false;
+        }
+    }
+
+    bool ProcessorToolbox::RemoveBreakpoint( const std::string& slot )
+    {
+        string slotProcName, slotName;
+        if( ! ParseSignalSlotName( slot, slotProcName, slotName ) )
+        {
+            LERROR( proclog, "Unable to parse slot name: <" << slot << ">" );
+            return false;
+        }
+
+        return RemoveBreakpoint( slotProcName, slotName );
+    }
+
+    bool ProcessorToolbox::RemoveBreakpoint( const std::string& slotProcName, const std::string& slotName )
+    {
+        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
+        if( slotProc == nullptr )
+        {
+            LERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            slotProc->SetDoBreakpoint( slotName, false );
+            return true;
+        }
+        catch( boost::exception& e )
+        {
+            LERROR( proclog, "Unable to set breakpoint: " << diagnostic_information( e ) );
+            return false;
+        }
+    }
+
+    bool ProcessorToolbox::ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
+    {
+        size_t sepPos = toParse.find_first_of( fSigSlotNameSep );
+        if( sepPos == string::npos )
+        {
+            LERROR( proclog, "Unable to find separator between processor and signal/slot name in <" << toParse << ">" );
+            return false;
+        }
+        nameOfProc = toParse.substr( 0, sepPos );
+        nameOfSigSlot = toParse.substr( sepPos + 1 );
+        return true;
+    }
+
+
+    bool ProcessorToolbox::PushBackToRunQueue( const std::string& name )
+    {
+        ThreadGroup threadGroup;
+
+        if( ! AddProcessorToThreadGroup( name, threadGroup ) )
+        {
+            LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
+            return false;
+        }
+
+        fRunQueue.push_back( threadGroup );
+
+        LINFO( proclog, "Added processor <" << name << "> to the run queue" );
+        return true;
+    }
+
+    bool ProcessorToolbox::PushBackToRunQueue( std::initializer_list< std::string > names )
+    {
+        return PushBackToRunQueue( std::vector< std::string >(names) );
+    }
+
+    bool ProcessorToolbox::PushBackToRunQueue( std::vector< std::string > names )
+    {
+        ThreadGroup threadGroup;
+
+        std::stringstream toPrint;
+        for( const std::string& name : names )
+        {
+            if(! AddProcessorToThreadGroup( name, threadGroup ) )
+            {
+                LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
+                return false;
+            }
+            toPrint << name << ", "; // the extra comma at the end is removed below
+        }
+
+        fRunQueue.push_back( threadGroup );
+        std::string toPrintString = toPrint.str();
+        toPrintString.resize( toPrintString.size() - 2 );
+        LINFO( proclog, "Added processors <" << toPrintString << "> to the run queue" );
+        return true;
+    }
+
+    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadGroup& group )
+    {
+        std::shared_ptr< Processor > procForRunQueue = GetProcessor( name );
+        LDEBUG( proclog, "Attempting to add processor <" << name << "> to the run queue" );
+        if( procForRunQueue == nullptr )
+        {
+            LERROR( proclog, "Unable to find processor <" << name << "> requested for the run queue" );
+            return false;
+        }
+
+        PrimaryProcessor* primaryProc = dynamic_cast< PrimaryProcessor* >( procForRunQueue.get() );
+        if( primaryProc == nullptr )
+        {
+            LERROR( proclog, "Processor <" << name << "> is not a primary processor." );
+            return false;
+        }
+        //group.insert(primaryProc);
+        group.insert( Thread(primaryProc, name) );
+        return true;
+    }
+
+    void ProcessorToolbox::AsyncRun()
+    {
+        if( fDoRunThread != nullptr )
+        {
+            LERROR( proclog, "It appears that a run has already been started" );
+            return;
+        }
+
+        fDoRunPromise = boost::promise< void >();
+        fDoRunFuture = fDoRunPromise.get_future().share();
+
+        bool willRunSingleThreaded = fRunSingleThreaded;
+#ifdef SINGLETHREADED
+        willRunSingleThreaded = true;
+#endif
+
+        if( willRunSingleThreaded )
+        {
+            StartSingleThreadedRun();
+        }
+        else
+        {
+            StartMultiThreadedRun();
+        }
+
+        return;
+    }
+
+    void ProcessorToolbox::StartSingleThreadedRun()
+    {
+        auto singleThreadRun = [&]()
+        {
+            try
+            {
+                LPROG( proclog, "Starting single-threaded processing" );
+
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                    {
+                        boost_unique_lock breakContLock( fBreakContMutex );
+
+                        std::string procName( tgIter->fName );
+                        LINFO( proclog, "Starting processor <" << procName << ">" );
+
+                        std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                        thisThreadRef->Name() = procName;
+
+                        thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                        thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
+
+                        fThreadReferences.push_back( thisThreadRef );
+
+                        boost::condition_variable threadStartedCV;
+                        boost::mutex threadStartedMutex;
+                        bool threadStartedFlag = false;
+
+                        boost_unique_lock threadStartedLock( threadStartedMutex );
+                        boost::thread thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
+                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
+                        while( ! threadStartedFlag )
+                        {
+                            threadStartedCV.wait( threadStartedLock );
+                        }
+                        KTDEBUG( proclog, "Thread has started" );
+
+                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
+
+                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                        do
+                        {
+                            boost::future_status status;
+                            do
+                            {
+                                status = fThreadReferences.back()->GetDataPtrRetFuture().wait_for( boost::chrono::milliseconds(500) );
+                            } while (status != boost::future_status::ready);
+
+                            stillRunning = false;
+                            if( fThreadReferences.back()->GetBreakFlag() )
+                            {
+                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << procName << ">; may not be where breakpoint is set)" );
+
+                                WaitForContinue( breakContLock );
+
+                                KTDEBUG( proclog, "Breakpoint finished" );
+                                stillRunning = true;
+                            }
+                            else
+                            {
+                                try
+                                {
+                                    fThreadReferences.back()->GetReturnValue();
+                                    LINFO( proclog, "Thread <" << procName << "> has finished" );
+                                    fThreadReferences.pop_back();
+                                }
+                                catch( boost::exception& e )
+                                {
+                                    e << KTErrorMsgInfo< struct procTB_STRFinishing >( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
+                                    throw;
+                                }
+                                stillRunning = false;
+                            }
+                        } while( stillRunning );
+
+                        LINFO( proclog, "Processor <" << procName << "> has finished" );
+
+                        thread.join();
+                        fThreadReferences.clear();
+                    } // end for loop over the thread group
+                } // end for loop over the run-queue
+
+                LPROG( proclog, "Processing is complete (single-threaded)" );
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught std::exception thrown in a processor or in the single-threaded run function: " << e.what() );
+                LWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            catch( boost::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught boost::exception thrown in a processor or in the single-threaded run function" );
+                LWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            fDoRunPromise.set_value();
+            return;
+        }; // end single-threaded run lambda
+
+        fDoRunThread = new boost::thread( singleThreadRun );
+        return;
+    }
+    void ProcessorToolbox::StartMultiThreadedRun()
+    {
+        auto multiThreadRun = [&]()
+        {
+            try
+            {
+                LPROG( proclog, "Starting multi-threaded processing" );
+
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    boost::thread_group threads;
+
+                    { // scope for threadFuturesLock
+                        boost_unique_lock breakContLock( fBreakContMutex );
+                        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
+
+                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        {
+                            std::string procName( tgIter->fName );
+                            LINFO( proclog, "Starting processor <" << procName << ">" );
+
+                            std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                            thisThreadRef->Name() = procName;
+
+                            thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                            thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
+                            fThreadReferences.push_back( thisThreadRef );
+
+                            boost::condition_variable threadStartedCV;
+                            boost::mutex threadStartedMutex;
+                            bool threadStartedFlag = false;
+
+                            boost_unique_lock threadStartedLock( threadStartedMutex );
+                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
+                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
+                            while( ! threadStartedFlag )
+                            {
+                                threadStartedCV.wait( threadStartedLock );
+                            }
+                            KTDEBUG( proclog, "Thread has started" );
+
+                            threads.add_thread( thisThread );
+
+                        }// end for loop over the thread group
+                    } // end scope for threadFuturesLock
+
+                    bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                    do
+                    {
+                        auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
+                        boost_unique_lock breakContLock( fBreakContMutex );
+
+                        size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
+                        auto finishedReferencePtr = fThreadReferences.begin() + iThread;
+                        std::string threadName( (*finishedReferencePtr)->Name() );
+                        KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
+
+                        stillRunning = false;
+                        if( fDoRunBreakFlag )
+                        {
+                            // a breakpoint has been reached
+                            KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
+
+                            // wait here for the user to continue
+                            WaitForContinue( breakContLock );
+
+                            KTDEBUG( proclog, "Breakpoint finished" );
+                            stillRunning = true;
+                            //continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                        }
+                        else
+                        {
+                            // we're finished a thread; get its results
+                            try
+                            {
+                                LINFO( proclog, "Thread <" << threadName << "> has finished" );
+                                finishedFuturePtr->get();
+                                fThreadReferences.erase( finishedReferencePtr );
+                            }
+                            catch( boost::exception& e )
+                            {
+                                e << KTErrorMsgInfo< struct procTB_MTRFinishing >( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
+                                throw;
+                            }
+
+                            if( fThreadReferences.empty() ) stillRunning = false;
+                            else stillRunning = true;
+                        }
+                    } while( stillRunning );
+
+                    KTDEBUG( proclog, "Joining threads" );
+                    threads.join_all();
+                    boost_unique_lock breakContLock( fBreakContMutex );
+                    fThreadReferences.clear();
+                } // end for loop over the run-queue
+
+                LPROG( proclog, "Processing is complete (multi-threaded)" );
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            catch( boost::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
+                LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            LWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
+            fDoRunPromise.set_value();
+            return;
+        }; // end multi-threaded run lambda
+
+        fDoRunThread = new boost::thread( multiThreadRun );
+        return;
+    }
+
+
+    bool ProcessorToolbox::WaitForBreak()
+    {
+        boost_unique_lock breakContLock( fBreakContMutex );
+
+        if( fDoRunBreakFlag )
+        {
+            LWARN( proclog, "Can't wait for a break; Already at a breakpoint" );
+            return true;
+        }
+
+        boost::shared_future< void > doRunFuture = fDoRunFuture;
+        if( ! doRunFuture.valid() )
+        {
+            BOOST_THROW_EXCEPTION( KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)" << eom );
+        }
+
+        breakContLock.unlock();
+
+        // block here until there's a break
+        doRunFuture.wait();
+
+        if( fDoRunBreakFlag )
+        {
+            KTDEBUG( proclog, "Breakpoint reached (the wait is over)" );
+            return true;
+        }
+
+        try
+        {
+            doRunFuture.get();
+            KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
+            return false;
+        }
+        catch( boost::exception& e )
+        {
+            LERROR( proclog, "An error occurred during processing: " << boost::diagnostic_information( e ) );
+            return false;
+        }
+    }
+
+    void ProcessorToolbox::WaitForEndOfRun()
+    {
+        // WaitForBreak() and WaitForContinue() throw boost::exception for problems with the future or promise objects
+
+        KTDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreak() )
+        {
+            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            boost::mutex localMutex;
+            boost_unique_lock localLock( localMutex );
+            WaitForContinue( localLock );
+            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+        }
+        KTDEBUG( proclog, "End-of-run reached" );
+
+        return;
+    }
+
+    void ProcessorToolbox::Continue()
+    {
+        if( ! fDoRunBreakFlag )
+        {
+            LWARN( proclog, "Not currently at a breakpoint" );
+            return;
+        }
+
+        boost_unique_lock breakContLock( fBreakContMutex );
+
+        // reset all break flags
+        fDoRunBreakFlag = false;
+        std::vector< boost_unique_lock > trLocks;
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
+        {
+            trLocks.emplace_back( (*trIt)->Mutex() );
+            (*trIt)->SetBreakFlag( false );
+            (*trIt)->RefreshDataPtrRet();
+        }
+
+        // reset the do-run promise and future
+        fDoRunPromise = boost::promise< void >();
+        fDoRunFuture = fDoRunPromise.get_future().share();
+
+        LINFO( proclog, "Continuing from breakpoint" );
+        // signal everything to resume
+        fDoContinue = true;
+        fContinueCV.notify_all();
+
+        return;
+    }
+
+    KTDataHandle ProcessorToolbox::GetData( const std::string& threadName )
+    {
+        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
+        boost_unique_lock breakContLock( fBreakContMutex );
+
+        auto trIt = fThreadReferences.begin();
+        for( ; trIt != fThreadReferences.end(); ++trIt )
+        {
+            if( (*trIt)->Name() == threadName ) break;
+        }
+        if( trIt == fThreadReferences.end() )
+        {
+            LWARN( proclog, "Did not find thread <" << threadName << ">" );
+            BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
+        }
+
+        boost_unique_lock lock( (*trIt)->Mutex() );
+        return (*trIt)->GetReturnValue();
+    }
+
+    void ProcessorToolbox::InitiateBreak()
+    {
+        boost_unique_lock breakContLock( fBreakContMutex );
+        if( fDoRunBreakFlag ) return;
+
+        // set the continue flag to false so that things will wait for the continue
+        fDoContinue = false;
+
+        // set all break flags
+        // master break flag
+        fDoRunBreakFlag = true;
+        // thread break flags
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
+        {
+            boost_unique_lock lock( (*trIt)->Mutex() );
+            (*trIt)->SetBreakFlag( true );
+        }
+
+        // use the do-run promise to signal the break
+        LWARN( proclog, "Setting value of do-run-promise" );
+        fDoRunPromise.set_value();
+
+        return;
+    }
+
+    void ProcessorToolbox::CancelThreads()
+    {
+        boost_unique_lock breakContLock( fBreakContMutex );
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
+        {
+            boost_unique_lock lock( (*trIt)->Mutex() );
+            (*trIt)->SetCanceled( true );
+        }
+        return;
+    }
+
+    bool ProcessorToolbox::Run()
+    {
+        // can throw boost::exception
+
+        AsyncRun();
+
+        WaitForEndOfRun();
+
+        JoinRunThread();
+
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
new file mode 100644
index 0000000..6ac45a8
--- /dev/null
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -0,0 +1,338 @@
+/**
+ @file ProcessorToolbox.hh
+ @brief Contains ProcessorToolbox
+ @details Manages processors requested by the user at run time.
+ @author: N. S. Oblath
+ @date: Sep 27, 2012
+ */
+
+#ifndef NYMPH_PROCESSORTOOLBOX_HH_
+#define NYMPH_PROCESSORTOOLBOX_HH_
+
+#include "MemberVariable.hh"
+//#include "KTThreadReference.hh"
+
+#include "factory.hh"
+#include "param.hh"
+
+#define BOOST_THREAD_PROVIDES_FUTURE
+#include <boost/thread/future.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
+
+#include <deque>
+#include <initializer_list>
+#include <limits>
+#include <set>
+#include <memory>
+
+
+namespace Nymph
+{
+    class PrimaryProcessor;
+    class Processor;
+
+    /*!
+     @class ProcessorToolbox
+     @author N. S. Oblath
+
+     @brief Manages processors requested by the user at run time.
+
+     @details
+     ProcessorToolbox allows the user to setup an application at runtime.
+
+     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
+     the program via a configuration file.
+
+     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
+
+     The following order should be used for configuring the processor toolbox:
+     <ol>
+         <li>Create processors</li>
+         <li>Connect signals and slots</li>
+         <li>Create the run queue</li>
+     </ol>
+
+     Available (nested) configuration values:
+     <ul>
+         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
+         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
+             <ul>
+                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
+                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
+             </ul>
+         </li>
+         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
+             <ul>
+                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
+                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
+                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
+             </ul>
+         </li>
+         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
+         The elements of this array specify processors that are run sequentially.
+         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
+             <ul>
+                 <li>processor name -- add a processor to the run queue, or </li>
+                 <li>array of processor names -- add a group of processors to the run queue.</li>
+             </ul>
+             In single-threaded mode, all processors will be run sequentially, in the order specified.
+         </li>
+     </ul>
+    */
+    class ProcessorToolbox
+    {
+        private:
+            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
+
+        public:
+            ProcessorToolbox( const std::string& name = "processor-toolbox" );
+            virtual ~ProcessorToolbox();
+
+        private:
+            scarab::factory< Processor, const std::string& >* fProcFactory; // singleton; not owned by ProcessorToolbox
+
+
+        public:
+            /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
+            bool Configure( const scarab::param_node& node );
+
+            /// Configure processors (only those specified in the toolbox)
+            bool ConfigureProcessors( const scarab::param_node& node );
+
+            MEMVAR( bool, RunSingleThreaded );
+
+        private:
+            struct ProcessorInfo
+            {
+                std::shared_ptr< Processor > fProc;
+            };
+            typedef std::map< std::string, ProcessorInfo > ProcessorMap;
+            typedef ProcessorMap::iterator ProcMapIt;
+            typedef ProcessorMap::const_iterator ProcMapCIt;
+            typedef ProcessorMap::value_type ProcMapValue;
+
+        public:
+            /// Get a pointer to a processor in the toolbox
+            std::shared_ptr< Processor > GetProcessor( const std::string& procName );
+            /// Get a pointer to a processor in the toolbox
+            const std::shared_ptr< Processor > GetProcessor( const std::string& procName ) const;
+
+            /// Add a processor to the toolbox
+            /// Toolbox takes ownership of the processor
+            bool AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc );
+            bool AddProcessor( const std::string& procType, const std::string& procName );
+
+            /// Remove a processor from the toolbox
+            bool RemoveProcessor( const std::string& procName );
+
+            /// Remove a processor from the toolbox and return it to the user
+            /// Ownership is passed to the user
+            std::shared_ptr< Processor > ReleaseProcessor( const std::string& procName );
+
+            /// Remove all processors from the toolbox
+            /// Also clears the run queue
+            void ClearProcessors();
+
+        private:
+            ProcessorMap fProcMap;
+
+
+        public:
+            // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
+
+            /// Make a connection between the signal from one processor and the slot from another processor
+            /// Both processors should already have been added to the Toolbox
+            /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
+            bool MakeConnection(const std::string& signal, const std::string& slot, int order);
+            bool MakeConnection(const std::string& signal, const std::string& slot);
+
+            /// Make a connection between the signal from one processor and the slot from another processor
+            /// Both processors should already have been added to the Toolbox
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName);
+
+            /// Set a breakpoint on a slot
+            /// Slot string should be formatted as: [processor name]:[slot name]
+            bool SetBreakpoint( const std::string& slot );
+            /// Set a breakpoint on a slot
+            bool SetBreakpoint( const std::string& slotProcName, const std::string& slotName );
+
+            /// Remove a breakpoint from a slot
+            /// Slot string should be formatted as: [processor name]:[slot name]
+            bool RemoveBreakpoint( const std::string& slot );
+            /// Remove a breakpoint from a slot
+            bool RemoveBreakpoint( const std::string& slotProcName, const std::string& slotName );
+
+        private:
+            bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
+            static const char fSigSlotNameSep = ':';
+
+
+        public:
+            /// Push a single processor to the back of the run queue
+            bool PushBackToRunQueue( const std::string& name );
+
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue( std::initializer_list< std::string > names );
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue( std::vector< std::string > names );
+
+            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
+            void PopBackOfRunQueue();
+
+            /// Clear the run queue
+            void ClearRunQueue();
+
+        private:
+            struct Thread
+            {
+                PrimaryProcessor* fProc;
+                std::string fName;
+                Thread( PrimaryProcessor* proc, const std::string& name ) : 
+                        fProc(proc), fName(name)
+                {}
+            };
+            struct CompareThread
+            {
+                bool operator()( const Thread& lhs, const Thread& rhs ) const
+                {
+                    return lhs.fProc < rhs.fProc;
+                }
+            };
+            typedef std::set< Thread, CompareThread > ThreadGroup;
+            typedef std::deque< ThreadGroup > RunQueue;
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadGroup& group );
+
+            RunQueue fRunQueue;
+
+        public:
+            /// Process the run queue.
+            /// This will call Run() on all of the processors in the queue.
+            bool Run();
+
+            void AsyncRun();
+
+            void WaitForContinue( boost_unique_lock& lock );
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// Throws a boost::exception if there's an error with the future object in use
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            bool WaitForBreak();
+
+            void WaitForEndOfRun();
+
+            void Continue();
+
+            void CancelThreads();
+
+            void JoinRunThread();
+
+            KTDataHandle GetData( const std::string& threadName );
+
+        private:
+            friend class KTThreadReference;
+
+            typedef boost::shared_future< KTDataHandle > Future;
+
+            void StartSingleThreadedRun();
+            void StartMultiThreadedRun();
+
+            // called from KTThreadReference::Break
+            void InitiateBreak();
+
+            std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
+
+            boost::condition_variable fContinueCV;
+            bool fDoContinue;
+            boost::mutex fBreakContMutex;
+
+            boost::thread* fDoRunThread;
+            boost::promise< void > fDoRunPromise;
+            boost::shared_future< void > fDoRunFuture;
+            bool fDoRunBreakFlag;
+
+    };
+
+
+    template< class Value, class IIterator >
+    class KTThreadRefFutureIter : public boost::iterator_adaptor< KTThreadRefFutureIter< Value, IIterator >, IIterator, Value, boost::random_access_traversal_tag >
+    {
+        private:
+            // used for the conversion constructor below
+            struct enabler {};
+
+        public:
+            KTThreadRefFutureIter() :
+                    KTThreadRefFutureIter::iterator_adaptor_()
+            {}
+            KTThreadRefFutureIter( const IIterator& other ) :
+                    KTThreadRefFutureIter::iterator_adaptor_( other )
+            {}
+
+            // converts from Iterator to ConstIterator, but the enable_if business prevents converting from ConstIterator to Iterator
+            template< class OtherValue, class OtherIIterator >
+            KTThreadRefFutureIter( const KTThreadRefFutureIter< OtherValue, OtherIIterator > & other, typename boost::enable_if< boost::is_convertible< OtherValue, Value >, enabler >::type = enabler() ) :
+                    KTThreadRefFutureIter::iterator_adaptor_( other.base )
+            {}
+
+        private:
+            friend class boost::iterator_core_access;
+
+            Value& dereference() const
+            {
+                return (*(this->base_reference()))->GetDataPtrRetFuture();
+            }
+    };
+
+    typedef KTThreadRefFutureIter< boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
+    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
+
+
+    inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
+    {
+        return MakeConnection(signal, slot, std::numeric_limits< int >::min());
+    }
+
+    inline bool ProcessorToolbox::MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName)
+    {
+        return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min()); 
+    }
+
+    inline void ProcessorToolbox::PopBackOfRunQueue()
+    {
+        fRunQueue.pop_back();
+        return;
+    }
+
+    inline void ProcessorToolbox::ClearRunQueue()
+    {
+        fRunQueue.clear();
+        return;
+    }
+
+    inline void ProcessorToolbox::WaitForContinue( boost_unique_lock& lock )
+    {
+        //fMasterContSignal.wait();
+        while( ! fDoContinue )
+        {
+            fContinueCV.wait( lock );
+        }
+        return;
+    }
+
+    inline void ProcessorToolbox::JoinRunThread()
+    {
+        if( fDoRunThread == nullptr ) return;
+        fDoRunThread->join();
+        delete fDoRunThread;
+        fDoRunThread = nullptr;
+    }
+
+} /* namespace Nymph */
+#endif /* NYMPH_PROCESSORTOOLBOX_HH_ */

From 69a33b10185e0d4f7d824344e441fb73536758a4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Sat, 28 Sep 2019 00:38:11 -0700
Subject: [PATCH 150/521] Progress

---
 Library/CMakeLists.txt                |  2 +
 Library/Processor/Processor.hh        |  4 +-
 Library/Processor/ProcessorToolbox.cc | 68 ++++++++++++---------------
 Library/Processor/ProcessorToolbox.hh | 37 ++++++++-------
 Library/Processor/Signal.hh           |  8 +---
 Library/Processor/SignalSlotBase.cc   |  3 +-
 Library/Processor/SignalSlotBase.hh   |  2 +
 7 files changed, 59 insertions(+), 65 deletions(-)

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index bd3fee4..83c75ff 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -16,6 +16,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/ControlAccess.hh
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
+    ${PROC_DIR}/ProcessorToolbox.hh
     ${PROC_DIR}/SignalSlotBase.hh
 )
 
@@ -25,6 +26,7 @@ set( NYMPH_SOURCEFILES
     ${PROC_DIR}/ControlAccess.cc
     ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
+    ${PROC_DIR}/ProcessorToolbox.cc
     ${PROC_DIR}/SignalSlotBase.cc
 )
 
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 46f7856..168ff9c 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -58,8 +58,8 @@ namespace Nymph
             /// Register a slot object with this processor
             void RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals = {} );
 
-            //bool GetDoBreakpoint( const std::string& slotName );
-            //void SetDoBreakpoint( const std::string& slotName, bool flag );
+            bool GetDoBreakpoint( const std::string& slotName );
+            void SetDoBreakpoint( const std::string& slotName, bool flag );
 
             MEMVAR_REF( std::string, Name );
 
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 371fbac..5e551ff 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -8,10 +8,10 @@
 #include "ProcessorToolbox.hh"
 
 #include "Exception.hh"
-#include "Logger.hh"
 #include "PrimaryProcessor.hh"
 
 #include "factory.hh"
+#include "logger.hh"
 #include "param_codec.hh"
 
 #include <boost/exception/get_error_info.hpp>
@@ -30,22 +30,22 @@ namespace Nymph
             fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
             fRunSingleThreaded( false ),
             fRunQueue(),
-            fProcMap(),
+            fProcMap()/*,
             fThreadReferences(),
             fContinueCV(),
             fDoContinue( false ),
             fBreakContMutex(),
             fDoRunThread( nullptr ),
             fDoRunPromise(),
-            fDoRunBreakFlag( false )
+            fDoRunBreakFlag( false )*/
     {
     }
 
     ProcessorToolbox::~ProcessorToolbox()
     {
-        CancelThreads();
+        //CancelThreads();
 
-        JoinRunThread();
+        //JoinRunThread();
 
         ClearProcessors();
     }
@@ -238,7 +238,7 @@ namespace Nymph
             string nameUsed(procName);
             if( ! node.has(nameUsed) )
             {
-                nameUsed = iter->second.fProc->GetConfigName();
+                nameUsed = iter->second.fProc->Name();
                 if( ! node.has(nameUsed) )
                 {
                     LWARN( proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
@@ -256,14 +256,6 @@ namespace Nymph
         return true;
     }
 
-    bool ProcessorToolbox::ConfigureProcessors( const std::string& config )
-    {
-        scarab::param_translator translator;
-        scarab::param_node optNode;
-        optNode.add( "encoding", new scarab::param_value( "json" ) );
-        return ConfigureProcessors( translator.read_string( config, optNode )->as_node() );
-    }
-
     std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName )
     {
         ProcMapIt it = fProcMap.find( procName );
@@ -336,9 +328,9 @@ namespace Nymph
         return true;
     }
 
-    std::shared_ptr< Processor > ProcessorToolbox::ReleaseProcessor( const std::string& procName 
+    std::shared_ptr< Processor > ProcessorToolbox::ReleaseProcessor( const std::string& procName )
     {
-        ProcMapIt it = fProcMap.find(p rocName );
+        ProcMapIt it = fProcMap.find( procName );
         if( it == fProcMap.end() )
         {
             LWARN( proclog, "Processor <" << procName << "> was not found." );
@@ -419,30 +411,30 @@ namespace Nymph
         return true;
     }
 
-    bool ProcessorToolbox::SetBreakpoint( const std::string& slot )
+    bool ProcessorToolbox::SetBreakpoint( const std::string& signal )
     {
-        string slotProcName, slotName;
-        if(! ParseSignalSlotName( slot, slotProcName, slotName ) )
+        string signalProcName, signalName;
+        if(! ParseSignalSlotName( signal, signalProcName, signalName ) )
         {
-            LERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            LERROR(proclog, "Unable to parse signal name: <" << signal << ">");
             return false;
         }
 
-        return SetBreakpoint( slotProcName, slotName );
+        return SetBreakpoint( signalProcName, signalName );
     }
 
-    bool ProcessorToolbox::SetBreakpoint( const std::string& slotProcName, const std::string& slotName )
+    bool ProcessorToolbox::SetBreakpoint( const std::string& signalProcName, const std::string& signalName )
     {
-        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
-        if( slotProc == nullptr )
+        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
+        if( signalProc == nullptr )
         {
-            LERROR( proclog, "Processor named <" << slotProcName << "> was not found!" );
+            LERROR( proclog, "Processor named <" << signalProcName << "> was not found!" );
             return false;
         }
 
         try
         {
-            slotProc->SetDoBreakpoint( slotName, true );
+            signalProc->SetDoBreakpoint( signalName, true );
             return true;
         }
         catch( boost::exception& e )
@@ -452,30 +444,30 @@ namespace Nymph
         }
     }
 
-    bool ProcessorToolbox::RemoveBreakpoint( const std::string& slot )
+    bool ProcessorToolbox::RemoveBreakpoint( const std::string& signal )
     {
-        string slotProcName, slotName;
-        if( ! ParseSignalSlotName( slot, slotProcName, slotName ) )
+        string signalProcName, signalName;
+        if( ! ParseSignalSlotName( signal, signalProcName, signalName ) )
         {
-            LERROR( proclog, "Unable to parse slot name: <" << slot << ">" );
+            LERROR( proclog, "Unable to parse signal name: <" << signal << ">" );
             return false;
         }
 
-        return RemoveBreakpoint( slotProcName, slotName );
+        return RemoveBreakpoint( signalProcName, signalName );
     }
 
-    bool ProcessorToolbox::RemoveBreakpoint( const std::string& slotProcName, const std::string& slotName )
+    bool ProcessorToolbox::RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName )
     {
-        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
-        if( slotProc == nullptr )
+        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
+        if( signalProc == nullptr )
         {
-            LERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            LERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
             return false;
         }
 
         try
         {
-            slotProc->SetDoBreakpoint( slotName, false );
+            signalProc->SetDoBreakpoint( signalName, false );
             return true;
         }
         catch( boost::exception& e )
@@ -562,7 +554,7 @@ namespace Nymph
         group.insert( Thread(primaryProc, name) );
         return true;
     }
-
+/*
     void ProcessorToolbox::AsyncRun()
     {
         if( fDoRunThread != nullptr )
@@ -981,5 +973,5 @@ namespace Nymph
 
         return true;
     }
-
+*/
 } /* namespace Nymph */
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 6ac45a8..2889a85 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -156,17 +156,17 @@ namespace Nymph
             bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
             bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName);
 
-            /// Set a breakpoint on a slot
-            /// Slot string should be formatted as: [processor name]:[slot name]
-            bool SetBreakpoint( const std::string& slot );
-            /// Set a breakpoint on a slot
-            bool SetBreakpoint( const std::string& slotProcName, const std::string& slotName );
-
-            /// Remove a breakpoint from a slot
-            /// Slot string should be formatted as: [processor name]:[slot name]
-            bool RemoveBreakpoint( const std::string& slot );
-            /// Remove a breakpoint from a slot
-            bool RemoveBreakpoint( const std::string& slotProcName, const std::string& slotName );
+            /// Set a breakpoint on a signal
+            /// Slot string should be formatted as: [processor name]:[signal name]
+            bool SetBreakpoint( const std::string& signal );
+            /// Set a breakpoint on a signal
+            bool SetBreakpoint( const std::string& signalProcName, const std::string& signalName );
+
+            /// Remove a breakpoint from a signal
+            /// Slot string should be formatted as: [processor name]:[signal name]
+            bool RemoveBreakpoint( const std::string& signal );
+            /// Remove a breakpoint from a signal
+            bool RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName );
 
         private:
             bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
@@ -206,10 +206,11 @@ namespace Nymph
             };
             typedef std::set< Thread, CompareThread > ThreadGroup;
             typedef std::deque< ThreadGroup > RunQueue;
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadGroup& group );
-
             RunQueue fRunQueue;
 
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadGroup& group );
+/*
+
         public:
             /// Process the run queue.
             /// This will call Run() on all of the processors in the queue.
@@ -256,10 +257,10 @@ namespace Nymph
             boost::promise< void > fDoRunPromise;
             boost::shared_future< void > fDoRunFuture;
             bool fDoRunBreakFlag;
-
+*/
     };
 
-
+/*
     template< class Value, class IIterator >
     class KTThreadRefFutureIter : public boost::iterator_adaptor< KTThreadRefFutureIter< Value, IIterator >, IIterator, Value, boost::random_access_traversal_tag >
     {
@@ -292,7 +293,7 @@ namespace Nymph
 
     typedef KTThreadRefFutureIter< boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
     typedef KTThreadRefFutureIter< const boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
-
+*/
 
     inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
     {
@@ -315,7 +316,7 @@ namespace Nymph
         fRunQueue.clear();
         return;
     }
-
+/*
     inline void ProcessorToolbox::WaitForContinue( boost_unique_lock& lock )
     {
         //fMasterContSignal.wait();
@@ -333,6 +334,6 @@ namespace Nymph
         delete fDoRunThread;
         fDoRunThread = nullptr;
     }
-
+*/
 } /* namespace Nymph */
 #endif /* NYMPH_PROCESSORTOOLBOX_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 27109b7..1a2ffd1 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -51,8 +51,6 @@ namespace Nymph
             // calls all connected functions
             void Emit( XArgs... args );
             void operator()( XArgs... args );
-
-            MEMVAR( bool, DoBreakpoint );
     };
 
 
@@ -110,15 +108,13 @@ namespace Nymph
 
     template< typename... XArgs >
     Signal< XArgs... >::Signal( const std::string& name ) :
-            SignalBase( name ),
-            fDoBreakpoint( false )
+            SignalBase( name )
     {}
 
     template< typename... XArgs >
     template< typename XOwner >
     inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
-            SignalBase( name ),
-            fDoBreakpoint( false )
+            SignalBase( name )
     {
         owner->RegisterSignal( name, this );
     }
diff --git a/Library/Processor/SignalSlotBase.cc b/Library/Processor/SignalSlotBase.cc
index b5529d9..bcdba67 100644
--- a/Library/Processor/SignalSlotBase.cc
+++ b/Library/Processor/SignalSlotBase.cc
@@ -30,7 +30,8 @@ namespace Nymph
     SignalBase::SignalBase( const std::string& name ) :
             fName( name ),
             fConnections(),
-            fControl( nullptr )
+            fControl( nullptr ),
+            fDoBreakpoint( false )
     {}
 
     SignalBase::~SignalBase()
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index 2168dfc..69a33ea 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -73,6 +73,8 @@ namespace Nymph
 
             MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
 
+            MEMVAR( bool, DoBreakpoint );
+
         protected:
             friend class SignalBase;
             virtual void AddConnection( SlotBase* slot, int group );

From ad5bbf84cb76b039b32c9230f325fcacec8fe777 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 16 Oct 2019 00:30:43 -0700
Subject: [PATCH 151/521] Toolbox progress

---
 Library/Processor/Processor.cc        | 14 ++++++++------
 Library/Processor/ProcessorToolbox.cc | 10 +++++-----
 Library/Processor/ProcessorToolbox.hh | 12 ++++++------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 4a56b47..6d5c7b1 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -128,13 +128,15 @@ namespace Nymph
 
         return;
     }
-/*
-    bool Processor::GetDoBreakpoint( const std::string& slotName )
+
+    bool Processor::GetDoBreakpoint( const std::string& signalName )
     {
-        KTSlotBase* slot = GetSlot(slotName);
-        if (slot != nullptr)
+        if( fSignals.count( signalName ) != 0 )
+        {
+        SignalBase* signal = fSignals.at(signalName);
+        if (signal != nullptr)
         {
-            return slot->GetDoBreakpoint();
+            return signal->GetDoBreakpoint();
         }
         BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
         return false;
@@ -150,5 +152,5 @@ namespace Nymph
         BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
         return;
     }
-*/
+
 } /* namespace Nymph */
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 5e551ff..da630f6 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -14,8 +14,8 @@
 #include "logger.hh"
 #include "param_codec.hh"
 
-#include <boost/exception/get_error_info.hpp>
-#include <boost/thread.hpp>
+//#include <boost/exception/get_error_info.hpp>
+//#include <boost/thread.hpp>
 
 using std::deque;
 using std::set;
@@ -286,7 +286,7 @@ namespace Nymph
             ProcessorInfo pInfo;
             pInfo.fProc = proc;
             fProcMap.insert( ProcMapValue(procName, pInfo) );
-            LDEBUG( proclog, "Added processor <" << procName << "> (a.k.a. " << proc->GetConfigName() << ")" );
+            LDEBUG( proclog, "Added processor <" << procName << "> (a.k.a. " << proc->Name() << ")" );
             return true;
         }
         LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
@@ -402,8 +402,8 @@ namespace Nymph
         catch (boost::exception& e)
         {
             LERROR( proclog, "An error occurred while connecting signals and slots:\n"
-                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->GetConfigName() << ")" << '\n'
-                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->GetConfigName() << ")" << '\n'
+                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->Name() << ")" << '\n'
+                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->Name() << ")" << '\n'
                     << '\t' << diagnostic_information( e ) );
             return false;
         }
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 2889a85..598b6b1 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -15,14 +15,14 @@
 #include "factory.hh"
 #include "param.hh"
 
-#define BOOST_THREAD_PROVIDES_FUTURE
-#include <boost/thread/future.hpp>
+//#define BOOST_THREAD_PROVIDES_FUTURE
+//#include <boost/thread/future.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
+//#include <boost/thread/thread.hpp>
 
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
+//#include <boost/iterator/iterator_adaptor.hpp>
+//#include <boost/type_traits/is_convertible.hpp>
+//#include <boost/utility/enable_if.hpp>
 
 #include <deque>
 #include <initializer_list>

From 33d667ae29f07253c1af56a048e491e225c6a0d9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 16 Oct 2019 10:18:34 -0700
Subject: [PATCH 152/521] Switch to the standard threading library

---
 Library/Processor/ControlAccess.cc    |  6 +++---
 Library/Processor/ControlAccess.hh    | 10 ++++++----
 Library/Processor/Processor.cc        | 18 +++++++++---------
 Library/Processor/Processor.hh        |  4 ++--
 Library/Processor/ProcessorToolbox.cc |  7 ++++++-
 Library/Processor/ProcessorToolbox.hh |  4 ++--
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
index 8069c4d..f4943fe 100644
--- a/Library/Processor/ControlAccess.cc
+++ b/Library/Processor/ControlAccess.cc
@@ -33,18 +33,18 @@ namespace Nymph
 
     void ControlAccess::Resume()
     {
-        boost::unique_lock< boost::mutex > lock( fMutex );
+        std::unique_lock< std::mutex > lock( fMutex );
         fBreakFlag.store( false );
         fCondVar.notify_one();
     }
 
     void ControlAccess::Break()
     {
-        boost::unique_lock< boost::mutex > lock( fMutex );
+        std::unique_lock< std::mutex > lock( fMutex );
         fBreakFlag.store( true );
         while( fBreakFlag.load() && ! is_canceled() )
         {
-            fCondVar.wait_for( lock, boost::chrono::milliseconds(fCycleTimeMS) );
+            fCondVar.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
     }
 
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 90a768a..6dc6a85 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -12,10 +12,12 @@
 
 #include "cancelable.hh"
 
-#include <boost/thread/condition_variable.hpp>
-#include <boost/thread/mutex.hpp>
+//#include <boost/thread/condition_variable.hpp>
+//#include <boost/thread/mutex.hpp>
 
+#include <condition_variable>
 #include <memory>
+#include <mutex>
 #include <tuple>
 
 namespace Nymph
@@ -85,8 +87,8 @@ namespace Nymph
             void Break(); // called by this thread
             void Resume(); // called by user thread
 
-            MEMVAR_REF( boost::mutex, Mutex );
-            MEMVAR_REF( boost::condition_variable, CondVar );
+            MEMVAR_REF( std::mutex, Mutex );
+            MEMVAR_REF( std::condition_variable, CondVar );
             MEMVAR_ATOMIC_NOSET( bool, BreakFlag );
             MEMVAR( unsigned, CycleTimeMS );
 
diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 6d5c7b1..21df8a4 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -7,6 +7,8 @@
 
 #include "Processor.hh"
 
+#include "Exception.hh"
+
 #include <utility>
 
 namespace Nymph
@@ -131,25 +133,23 @@ namespace Nymph
 
     bool Processor::GetDoBreakpoint( const std::string& signalName )
     {
-        if( fSignals.count( signalName ) != 0 )
-        {
-        SignalBase* signal = fSignals.at(signalName);
+        SignalBase* signal = fSignals.at(signalName  );
         if (signal != nullptr)
         {
             return signal->GetDoBreakpoint();
         }
-        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        BOOST_THROW_EXCEPTION( Exception() << "Signal <" << signalName << "> was not found" << eom );
         return false;
     }
 
-    void Processor::SetDoBreakpoint( const std::string& slotName, bool flag )
+    void Processor::SetDoBreakpoint( const std::string& signalName, bool flag )
     {
-        KTSlotBase* slot = GetSlot(slotName);
-        if (slot != nullptr)
+        SignalBase* signal = fSignals.at(signalName  );
+        if( signal != nullptr )
         {
-            return slot->SetDoBreakpoint(flag);
+            return signal->SetDoBreakpoint( flag );
         }
-        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        BOOST_THROW_EXCEPTION( Exception() << "Signal <" << signalName << "> was not found" << eom );
         return;
     }
 
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 168ff9c..045c655 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -58,8 +58,8 @@ namespace Nymph
             /// Register a slot object with this processor
             void RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals = {} );
 
-            bool GetDoBreakpoint( const std::string& slotName );
-            void SetDoBreakpoint( const std::string& slotName, bool flag );
+            bool GetDoBreakpoint( const std::string& signalName );
+            void SetDoBreakpoint( const std::string& signalName, bool flag );
 
             MEMVAR_REF( std::string, Name );
 
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index da630f6..a35c30e 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -247,9 +247,14 @@ namespace Nymph
                 }
             }
             const scarab::param_node& subNode = node[nameUsed].as_node();
-            if( ! iter->second.fProc->Configure(subNode) )
+            try
+            {
+                iter->second.fProc->Configure(subNode);
+            }
+            catch( const Exception& e )
             {
                 LERROR( proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">" );
+                LERROR( proclog, e.what() );
                 return false;
             }
         }
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 598b6b1..d3d639c 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -17,7 +17,7 @@
 
 //#define BOOST_THREAD_PROVIDES_FUTURE
 //#include <boost/thread/future.hpp>
-#include <boost/thread/mutex.hpp>
+//#include <boost/thread/mutex.hpp>
 //#include <boost/thread/thread.hpp>
 
 //#include <boost/iterator/iterator_adaptor.hpp>
@@ -87,7 +87,7 @@ namespace Nymph
     class ProcessorToolbox
     {
         private:
-            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
+            typedef std::unique_lock< std::mutex > unique_lock;
 
         public:
             ProcessorToolbox( const std::string& name = "processor-toolbox" );

From 69f4f50a8b532e1fbcff1bf582e58135972b21c1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 17 Oct 2019 10:02:19 -0700
Subject: [PATCH 153/521] Interim commit, processor toolbox execution

---
 Library/Processor/ProcessorToolbox.cc | 47 ++++++++++++++-------------
 Library/Processor/ProcessorToolbox.hh | 18 +++++-----
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index a35c30e..39f3119 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -498,7 +498,7 @@ namespace Nymph
 
     bool ProcessorToolbox::PushBackToRunQueue( const std::string& name )
     {
-        ThreadGroup threadGroup;
+        ThreadSourceGroup threadGroup;
 
         if( ! AddProcessorToThreadGroup( name, threadGroup ) )
         {
@@ -519,7 +519,7 @@ namespace Nymph
 
     bool ProcessorToolbox::PushBackToRunQueue( std::vector< std::string > names )
     {
-        ThreadGroup threadGroup;
+        ThreadSourceGroup threadGroup;
 
         std::stringstream toPrint;
         for( const std::string& name : names )
@@ -539,7 +539,7 @@ namespace Nymph
         return true;
     }
 
-    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadGroup& group )
+    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
     {
         std::shared_ptr< Processor > procForRunQueue = GetProcessor( name );
         LDEBUG( proclog, "Attempting to add processor <" << name << "> to the run queue" );
@@ -556,10 +556,10 @@ namespace Nymph
             return false;
         }
         //group.insert(primaryProc);
-        group.insert( Thread(primaryProc, name) );
+        group.insert( ThreadSource(primaryProc, name) );
         return true;
     }
-/*
+
     void ProcessorToolbox::AsyncRun()
     {
         if( fDoRunThread != nullptr )
@@ -696,6 +696,7 @@ namespace Nymph
         fDoRunThread = new boost::thread( singleThreadRun );
         return;
     }
+
     void ProcessorToolbox::StartMultiThreadedRun()
     {
         auto multiThreadRun = [&]()
@@ -712,30 +713,30 @@ namespace Nymph
                         boost_unique_lock breakContLock( fBreakContMutex );
                         //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
 
-                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
                             std::string procName( tgIter->fName );
                             LINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                            thisThreadRef->Name() = procName;
+                            //std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                            //thisThreadRef->Name() = procName;
 
-                            thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                            thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
-                            fThreadReferences.push_back( thisThreadRef );
+                            //thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                            //thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
+                            //fThreadReferences.push_back( thisThreadRef );
 
-                            boost::condition_variable threadStartedCV;
-                            boost::mutex threadStartedMutex;
-                            bool threadStartedFlag = false;
+                            //boost::condition_variable threadStartedCV;
+                            //boost::mutex threadStartedMutex;
+                            //bool threadStartedFlag = false;
 
-                            boost_unique_lock threadStartedLock( threadStartedMutex );
-                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
-                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
-                            while( ! threadStartedFlag )
-                            {
-                                threadStartedCV.wait( threadStartedLock );
-                            }
-                            KTDEBUG( proclog, "Thread has started" );
+                            //boost_unique_lock threadStartedLock( threadStartedMutex );
+                            //boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
+                            //KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
+                            //while( ! threadStartedFlag )
+                            //{
+                            //    threadStartedCV.wait( threadStartedLock );
+                            //}
+                            //KTDEBUG( proclog, "Thread has started" );
 
                             threads.add_thread( thisThread );
 
@@ -978,5 +979,5 @@ namespace Nymph
 
         return true;
     }
-*/
+
 } /* namespace Nymph */
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index d3d639c..65364ca 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -189,27 +189,27 @@ namespace Nymph
             void ClearRunQueue();
 
         private:
-            struct Thread
+            struct ThreadSource
             {
                 PrimaryProcessor* fProc;
                 std::string fName;
-                Thread( PrimaryProcessor* proc, const std::string& name ) : 
+                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
                         fProc(proc), fName(name)
                 {}
             };
-            struct CompareThread
+            struct CompareThreadSource
             {
-                bool operator()( const Thread& lhs, const Thread& rhs ) const
+                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
                 {
                     return lhs.fProc < rhs.fProc;
                 }
             };
-            typedef std::set< Thread, CompareThread > ThreadGroup;
-            typedef std::deque< ThreadGroup > RunQueue;
+            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroup;
+            typedef std::deque< ThreadSourceGroup > RunQueue;
             RunQueue fRunQueue;
 
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadGroup& group );
-/*
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group );
+
 
         public:
             /// Process the run queue.
@@ -257,7 +257,7 @@ namespace Nymph
             boost::promise< void > fDoRunPromise;
             boost::shared_future< void > fDoRunFuture;
             bool fDoRunBreakFlag;
-*/
+
     };
 
 /*

From da464c55d3b8bd866f03750f7740cb13d41c461e Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 18 Oct 2019 11:41:24 -0700
Subject: [PATCH 154/521] Incremental progress on control access, processors,
 and signals/slots

---
 Library/Processor/ControlAccess.cc    | 72 ++++++++++++++++++++-------
 Library/Processor/ControlAccess.hh    | 38 +++++++++++---
 Library/Processor/PrimaryProcessor.cc |  5 +-
 Library/Processor/PrimaryProcessor.hh |  2 +-
 Library/Processor/ProcessorToolbox.cc |  5 +-
 Library/Processor/ProcessorToolbox.hh |  8 +--
 Library/Processor/Signal.hh           |  8 ++-
 Library/Processor/Slot.hh             | 10 ++--
 8 files changed, 109 insertions(+), 39 deletions(-)

diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
index f4943fe..f85985f 100644
--- a/Library/Processor/ControlAccess.cc
+++ b/Library/Processor/ControlAccess.cc
@@ -13,40 +13,78 @@
 
 namespace Nymph
 {
-    ReturnBufferBase::ReturnBufferBase()
-    {}
-
-    ReturnBufferBase::~ReturnBufferBase()
-    {}
-
-
-    ControlAccess::ControlAccess() :
-            fReturn( new ReturnBuffer< int >() ),
+    SharedControl::SharedControl() :
             fMutex(),
             fCondVar(),
             fBreakFlag( false ),
+            fCanceledFlag( false ),
             fCycleTimeMS( 500 )
     {}
 
-    ControlAccess::~ControlAccess()
+    SharedContrl::~SharedControl()
     {}
 
-    void ControlAccess::Resume()
+    void SharedContrl::Break()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag.store( false );
-        fCondVar.notify_one();
+        fBreakFlag = true;
+        return;
     }
 
-    void ControlAccess::Break()
+    void SharedContrl::Cancel()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag.store( true );
-        while( fBreakFlag.load() && ! is_canceled() )
+        fCanceledFlag = true;
+        return;
+    }
+
+    bool SharedContrl::IsAtBreak() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fBreakFlag;
+    }
+
+    bool SharedContrl::IsCanceled() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fCanceledFlag;
+    }
+
+    bool SharedContrl::WaitToContinue() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fBreakFlag )
         {
-            fCondVar.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            while( fBreakFlag && ! fCanceledFlag )
+            {
+                fCondVar.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            }
         }
+        return ! fCanceled; // returns true if the thread should continue; false if it should end
+    }
+
+    void SharedContrl::Resume()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = false;
+        fCondVar.notify_all();
     }
 
 
+
+    ReturnBufferBase::ReturnBufferBase()
+    {}
+
+    ReturnBufferBase::~ReturnBufferBase()
+    {}
+
+
+    ControlAccess::ControlAccess() :
+            fReturn( new ReturnBuffer< int >() ),
+            fControl()
+    {}
+
+    ControlAccess::~ControlAccess()
+    {}
+
 } /* namespace Nymph */
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 6dc6a85..98252b8 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -22,6 +22,33 @@
 
 namespace Nymph
 {
+    class SharedControl
+    {
+        public:
+            SharedControl();
+            virtual ~SharedControl();
+
+            void Break(); // to be called by a working thread
+
+            void Cancel(); // to be called by a working thread
+
+            bool IsAtBreak() const; // to be called by a working thread
+
+            bool IsCanceled() const; // to be called by a working thread
+
+            // return: true = continue; false = cancel
+            bool WaitToContinue() const; // to be called by a working thread
+
+            void Resume(); // to be called by the processor toolbox
+
+            MEMVAR_REF( std::mutex, Mutex );
+            MEMVAR_REF( std::condition_variable, CondVar );
+            MEMVAR_NOSET( bool, BreakFlag );
+            MEMVAR_NOSET( bool, CanceledFlag );
+            MEMVAR( unsigned, CycleTimeMS );
+
+    }
+
     class ReturnBufferBase
     {
         public:
@@ -84,16 +111,11 @@ namespace Nymph
             std::shared_ptr< ReturnBufferBase > fReturn;
 
         public:
-            void Break(); // called by this thread
-            void Resume(); // called by user thread
-
-            MEMVAR_REF( std::mutex, Mutex );
-            MEMVAR_REF( std::condition_variable, CondVar );
-            MEMVAR_ATOMIC_NOSET( bool, BreakFlag );
-            MEMVAR( unsigned, CycleTimeMS );
-
+            MEM_VAR_SHARED_PTR( SharedControl, Control );
     };
 
+    typedef std::shared_ptr< ControlAccess > ControlAccessPtr;
+
 
     template< typename... Args >
     void ControlAccess::SetReturn( Args&... args )
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 7c362a1..246cc5f 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -22,11 +22,12 @@ namespace Nymph
     PrimaryProcessor::~PrimaryProcessor()
     {}
 
-    void PrimaryProcessor::operator()( ControlAccess* control )
+    void PrimaryProcessor::operator()( ControlAccessPtr control )
     {
+        // pass the control access pointer to every signal in the primary processor
         for( auto signalIt = fSignals.begin(); signalIt != fSignals.end(); ++signalIt )
         {
-            signalIt->second->SetControl( control );
+            signalIt->second->SetControlAcc( control );
         }
 
         // go!
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index 9d125b7..45f6530 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -22,7 +22,7 @@ namespace Nymph
 
         public:
             /// Callable function used by std::thread
-            void operator()( ControlAccess* control );
+            void operator()( ControlAccessPtr control );
 
             /// Starts the  main action of the processor
             virtual bool Run() = 0;
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 39f3119..86da326 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -30,7 +30,8 @@ namespace Nymph
             fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
             fRunSingleThreaded( false ),
             fRunQueue(),
-            fProcMap()/*,
+            fProcMap(),
+            fControl( new SharedControl() )/*,
             fThreadReferences(),
             fContinueCV(),
             fDoContinue( false ),
@@ -718,6 +719,8 @@ namespace Nymph
                             std::string procName( tgIter->fName );
                             LINFO( proclog, "Starting processor <" << procName << ">" );
 
+                            
+
                             //std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                             //thisThreadRef->Name() = procName;
 
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 65364ca..577ceee 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -9,6 +9,7 @@
 #ifndef NYMPH_PROCESSORTOOLBOX_HH_
 #define NYMPH_PROCESSORTOOLBOX_HH_
 
+#include "ControlAccess.hh"
 #include "MemberVariable.hh"
 //#include "KTThreadReference.hh"
 
@@ -193,8 +194,9 @@ namespace Nymph
             {
                 PrimaryProcessor* fProc;
                 std::string fName;
+                ControlAccessPtr fControlAccess;
                 ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
-                        fProc(proc), fName(name)
+                        fProc(proc), fName(name), fControlAccess( new ControlAccess() )
                 {}
             };
             struct CompareThreadSource
@@ -236,9 +238,9 @@ namespace Nymph
 
             KTDataHandle GetData( const std::string& threadName );
 
-        private:
-            friend class KTThreadReference;
+            MEMVAR_SHARED_PTR_CONST( SharedControl, Control );
 
+        private:
             typedef boost::shared_future< KTDataHandle > Future;
 
             void StartSingleThreadedRun();
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 1a2ffd1..9f7b08e 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -34,7 +34,7 @@ namespace Nymph
     {
         public:
             using signature = void( XArgs... );
-            using full_signature = void( ControlAccess*, XArgs... );
+            using full_signature = void( ControlAccessPtr, XArgs... );
 
         public:
             /// Unowned signal
@@ -51,6 +51,8 @@ namespace Nymph
             // calls all connected functions
             void Emit( XArgs... args );
             void operator()( XArgs... args );
+
+            MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
     };
 
 
@@ -168,15 +170,17 @@ namespace Nymph
     template< typename... XArgs >
     inline void Signal< XArgs... >::operator()( XArgs... args )
     {
+        // TODO: if not canceled and at breakpoint, then set return and break
         if( fDoBreakpoint )
         {
             fControl->SetReturn< XArgs... >( args... );
             fControl->Break(); // waits for resume or exit
         }
+        // TODO: if canceled, quit
 
         for( auto connection : fConnections )
         {
-            static_cast< Slot< XArgs... >* >(connection)->operator()( fControl, args... );
+            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );
         }
         return;
     }
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index c132f5b..446507b 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -30,7 +30,7 @@ namespace Nymph
     {
         public:
             using signature = void( XArgs... );
-            using full_signature = void( ControlAccess*, XArgs... );
+            using full_signature = void( ControlAccessPtr, XArgs... );
             using signal_list = std::initializer_list< std::string >;
 
         public:
@@ -61,14 +61,14 @@ namespace Nymph
             void operator()( XArgs... args );
 
             /// execute fFunction with a ControlAccess object
-            void operator()( ControlAccess* access, XArgs... args );
+            void operator()( ControlAccessPtr access, XArgs... args );
 
             MEMVAR_REF( boost::function< signature >, Function );
 
             MEMVAR( bool, DoBreakpoint );
 
         protected:
-            void SlotFuncWrapper( ControlAccess* access, XArgs... args );
+            void SlotFuncWrapper( ControlAccessPtr access, XArgs... args );
     };
 
 
@@ -211,14 +211,14 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    inline void Slot< XArgs... >::operator()( ControlAccess* access, XArgs... args )
+    inline void Slot< XArgs... >::operator()( ControlAccessPtr access, XArgs... args )
     {
         SlotFuncWrapper( access, args... );
         return;
     }
 
     template< typename... XArgs >
-    inline void Slot< XArgs... >::SlotFuncWrapper( ControlAccess* access, XArgs... args )
+    inline void Slot< XArgs... >::SlotFuncWrapper( ControlAccessPtr access, XArgs... args )
     {
         //TODO could do something with `access` here
         for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )

From 0378283e7713d9360da14ee5d4e3de89566f9e6a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 22 Oct 2019 14:37:50 -0700
Subject: [PATCH 155/521] A lot of preliminary progress in reworking how the
 processor toolbox and associated classes operate.

---
 Library/CMakeLists.txt                |  3 +
 Library/Processor/ControlAccess.cc    | 53 ++++++++--------
 Library/Processor/ControlAccess.hh    | 89 ++++++++++++++-------------
 Library/Processor/PrimaryProcessor.cc |  9 ++-
 Library/Processor/PrimaryProcessor.hh |  2 +-
 Library/Processor/Processor.cc        | 12 ++--
 Library/Processor/Processor.hh        |  4 +-
 Library/Processor/ProcessorToolbox.cc | 56 +++++++++++++----
 Library/Processor/QuitThread.hh       | 31 ++++++++++
 Library/Processor/ReturnBuffer.cc     | 19 ++++++
 Library/Processor/ReturnBuffer.hh     | 63 +++++++++++++++++++
 Library/Processor/Signal.hh           | 22 +++++--
 Library/Processor/SignalSlotBase.cc   |  6 +-
 Library/Processor/SignalSlotBase.hh   |  6 +-
 Library/Processor/Slot.hh             |  8 +--
 Scarab                                |  2 +-
 16 files changed, 279 insertions(+), 106 deletions(-)
 create mode 100644 Library/Processor/QuitThread.hh
 create mode 100644 Library/Processor/ReturnBuffer.cc
 create mode 100644 Library/Processor/ReturnBuffer.hh

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 83c75ff..84e6f66 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -17,6 +17,8 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
+    ${PROC_DIR}/QuitThread.hh
+    ${PROC_DIR}/ReturnBuffer.hh
     ${PROC_DIR}/SignalSlotBase.hh
 )
 
@@ -27,6 +29,7 @@ set( NYMPH_SOURCEFILES
     ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
     ${PROC_DIR}/ProcessorToolbox.cc
+    ${PROC_DIR}/ReturnBuffer.cc
     ${PROC_DIR}/SignalSlotBase.cc
 )
 
diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
index f85985f..f473cec 100644
--- a/Library/Processor/ControlAccess.cc
+++ b/Library/Processor/ControlAccess.cc
@@ -7,81 +7,80 @@
 
 #include "ControlAccess.hh"
 
-#include <boost/thread/locks.hpp>
-#include <boost/thread/lock_types.hpp>
+//#include <boost/thread/locks.hpp>
+//#include <boost/thread/lock_types.hpp>
 
 
 namespace Nymph
 {
     SharedControl::SharedControl() :
             fMutex(),
-            fCondVar(),
+            fCondVarContinue(),
+            fCondVarBreak(),
             fBreakFlag( false ),
             fCanceledFlag( false ),
             fCycleTimeMS( 500 )
     {}
 
-    SharedContrl::~SharedControl()
+    SharedControl::~SharedControl()
     {}
 
-    void SharedContrl::Break()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag = true;
-        return;
-    }
-
-    void SharedContrl::Cancel()
+    void SharedControl::Cancel()
     {
         std::unique_lock< std::mutex > lock( fMutex );
         fCanceledFlag = true;
+        fCondVarBreak.notify_all();
         return;
     }
 
-    bool SharedContrl::IsAtBreak() const
+    bool SharedControl::IsAtBreak() const
     {
         std::unique_lock< std::mutex > lock( fMutex );
         return fBreakFlag;
     }
 
-    bool SharedContrl::IsCanceled() const
+    bool SharedControl::IsCanceled() const
     {
         std::unique_lock< std::mutex > lock( fMutex );
         return fCanceledFlag;
     }
 
-    bool SharedContrl::WaitToContinue() const
+    bool SharedControl::WaitToContinue() const
     {
         std::unique_lock< std::mutex > lock( fMutex );
         if( fBreakFlag )
         {
             while( fBreakFlag && ! fCanceledFlag )
             {
-                fCondVar.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
             }
         }
-        return ! fCanceled; // returns true if the thread should continue; false if it should end
+        return ! fCanceledFlag; // returns true if the thread should continue; false if it should end
     }
 
-    void SharedContrl::Resume()
+    bool SharedControl::WaitForBreakOrCanceled() const
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag = false;
-        fCondVar.notify_all();
+        while( ! fBreakFlag && ! fCanceledFlag )
+        {
+            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+        }
+        return fCanceledFlag ? false : fBreakFlag;
     }
 
+    void SharedControl::Resume()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = false;
+        fCondVarContinue.notify_all();
+    }
 
 
-    ReturnBufferBase::ReturnBufferBase()
-    {}
-
-    ReturnBufferBase::~ReturnBufferBase()
-    {}
 
 
     ControlAccess::ControlAccess() :
-            fReturn( new ReturnBuffer< int >() ),
-            fControl()
+            fReturn( new ReturnBuffer< int >() )//,
+            //fControl()
     {}
 
     ControlAccess::~ControlAccess()
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 98252b8..b034ce9 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -8,9 +8,12 @@
 #ifndef NYMPH_CONTROLACCESS_HH_
 #define NYMPH_CONTROLACCESS_HH_
 
+#include "Exception.hh"
 #include "MemberVariable.hh"
+#include "ReturnBuffer.hh"
 
-#include "cancelable.hh"
+#include "cancelable.hh" // remove when ControlAccess is removed
+#include "singleton.hh"
 
 //#include <boost/thread/condition_variable.hpp>
 //#include <boost/thread/mutex.hpp>
@@ -18,17 +21,24 @@
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-#include <tuple>
 
 namespace Nymph
 {
-    class SharedControl
+
+    class SharedControl : public scarab::singleton< SharedControl >
     {
-        public:
+        protected:
+            allow_singleton_access( SharedControl );
+
             SharedControl();
             virtual ~SharedControl();
 
-            void Break(); // to be called by a working thread
+        public:
+            template< typename... Args >
+            std::tuple< Args&... >& GetReturn();
+
+            template< typename... Args >
+            void Break( Args&... args ); // to be called by a working thread
 
             void Cancel(); // to be called by a working thread
 
@@ -39,60 +49,51 @@ namespace Nymph
             // return: true = continue; false = cancel
             bool WaitToContinue() const; // to be called by a working thread
 
+            // return: true = was a break; false = cancel
+            bool WaitForBreakOrCanceled() const; // to be called by the processor toolbox
+
             void Resume(); // to be called by the processor toolbox
 
-            MEMVAR_REF( std::mutex, Mutex );
-            MEMVAR_REF( std::condition_variable, CondVar );
+            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
             MEMVAR_NOSET( bool, BreakFlag );
             MEMVAR_NOSET( bool, CanceledFlag );
             MEMVAR( unsigned, CycleTimeMS );
+            MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
 
-    }
-
-    class ReturnBufferBase
-    {
-        public:
-            ReturnBufferBase();
-            virtual ~ReturnBufferBase();
     };
 
     template< typename... Args >
-    struct ReturnBuffer : ReturnBufferBase
+    void SharedControl::Break( Args&... args )
     {
-        public:
-            ReturnBuffer() :
-                    fReturn( nullptr )
-            {}
-
-            ReturnBuffer( Args&... retval ) :
-                    fReturn( new std::tuple< Args&... >( retval... ) )
-            {}
-
-            virtual ~ReturnBuffer()
-            {}
-
-            std::tuple< Args&... >& GetReturn()
+        while( IsAtBreak() && ! IsCanceled() )
+        {
+            if( ! WaitToContinue() )
             {
-                if( fReturn == nullptr ) throw std::exception();
-                return *fReturn;
+                BOOST_THROW_EXCEPTION( Exception() << "Canceled while waiting to initiate a breakpoint" << eom );
             }
+        }
+
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
 
-        protected:
-            std::tuple< Args&... >* fReturn;
-    };
 
-    template<>
-    struct ReturnBuffer< void > : ReturnBufferBase
+
+    template< typename... Args >
+    std::tuple< Args&... >& SharedControl::GetReturn()
     {
-        ReturnBuffer() :
-                ReturnBufferBase()
-        {}
+        if( ! fReturnPtr ) BOOST_THROW_EXCEPTION( Exception() << "No return available" << eom );
+        std::unique_lock< std::mutex > lock( fMutex );
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
+        if( buffer == nullptr ) BOOST_THROW_EXCEPTION( Exception() << "Incorrect types used to get return" << eom );
+        return buffer->GetReturn();
+    }
+
 
-        void GetReturn()
-        {
-            return;
-        }
-    };
 
     class ControlAccess : public scarab::cancelable
     {
@@ -111,7 +112,7 @@ namespace Nymph
             std::shared_ptr< ReturnBufferBase > fReturn;
 
         public:
-            MEM_VAR_SHARED_PTR( SharedControl, Control );
+            //MEM_VAR_SHARED_PTR( SharedControl, Control );
     };
 
     typedef std::shared_ptr< ControlAccess > ControlAccessPtr;
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 246cc5f..87ee3cf 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -7,6 +7,7 @@
 
 #include "PrimaryProcessor.hh"
 
+#include "QuitThread.hh"
 #include "Exception.hh"
 
 #include "logger.hh"
@@ -22,13 +23,15 @@ namespace Nymph
     PrimaryProcessor::~PrimaryProcessor()
     {}
 
-    void PrimaryProcessor::operator()( ControlAccessPtr control )
+    void PrimaryProcessor::operator()()// ControlAccessPtr control )
     {
         // pass the control access pointer to every signal in the primary processor
+        /*
         for( auto signalIt = fSignals.begin(); signalIt != fSignals.end(); ++signalIt )
         {
             signalIt->second->SetControlAcc( control );
         }
+        */
 
         // go!
         try
@@ -44,6 +47,10 @@ namespace Nymph
                 //fThreadRef->SetReturnValue( KTDataHandle() );
             }
         }
+        catch( QuitThread& e )
+        {
+            LDEBUG( proclog, "Thread quit from " << e.fFile << ", line " << e.fLine );
+        }
         catch( boost::exception& e )
         {
             //fThreadRef->SetReturnException( boost::current_exception() );
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index 45f6530..785ff57 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -22,7 +22,7 @@ namespace Nymph
 
         public:
             /// Callable function used by std::thread
-            void operator()( ControlAccessPtr control );
+            void operator()();// ControlAccessPtr control );
 
             /// Starts the  main action of the processor
             virtual bool Run() = 0;
diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 21df8a4..d491122 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -31,11 +31,11 @@ namespace Nymph
         fSignals.insert( SigMapVal(name, signal) );
 
         // give the signal to any slots that are waiting for it
-        auto range = fSlotsWaitingForSignals.equal_range( name );
-        for( auto rangeIt = range.first; rangeIt != range.second; ++rangeIt )
-        {
-            rangeIt->second->SignalsUsed().push_back( signal );
-        }
+        //auto range = fSlotsWaitingForSignals.equal_range( name );
+        //for( auto rangeIt = range.first; rangeIt != range.second; ++rangeIt )
+        //{
+        //    rangeIt->second->SignalsUsed().push_back( signal );
+        //}
 
         return;
     }
@@ -45,6 +45,7 @@ namespace Nymph
         LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
         fSlots.insert( SlotMapVal(name, slot) );
 
+        /*
         // take care of giving signal pointers to the slot, or saving them for later assignment
         for( auto signalIt = signals.begin(); signalIt != signals.end(); ++signalIt )
         {
@@ -60,6 +61,7 @@ namespace Nymph
                 slot->SignalsUsed().push_back( signalPtrIt->second );
             }
         }
+        */
 
         return;
     }
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 045c655..3b5e9ae 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -68,8 +68,8 @@ namespace Nymph
 
             // this is used only to hold pointers to slots waiting for signals
             // the keys are the names of the signals being waited for, and the values are the slot pointers
-            typedef std::multimap< std::string, SlotBase* > WaitingSlotMap;
-            MEMVAR_REF_CONST( WaitingSlotMap, SlotsWaitingForSignals );
+            //typedef std::multimap< std::string, SlotBase* > WaitingSlotMap;
+            //MEMVAR_REF_CONST( WaitingSlotMap, SlotsWaitingForSignals );
 
     };
 
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 86da326..1e8359a 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -14,6 +14,9 @@
 #include "logger.hh"
 #include "param_codec.hh"
 
+#include <map>
+#include <thread>
+
 //#include <boost/exception/get_error_info.hpp>
 //#include <boost/thread.hpp>
 
@@ -708,10 +711,11 @@ namespace Nymph
 
                 for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                 {
-                    boost::thread_group threads;
+                    //boost::thread_group threads;
+                    std::map< std::thread > threads;
 
                     { // scope for threadFuturesLock
-                        boost_unique_lock breakContLock( fBreakContMutex );
+                        //boost_unique_lock breakContLock( fBreakContMutex );
                         //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
 
                         for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
@@ -719,7 +723,7 @@ namespace Nymph
                             std::string procName( tgIter->fName );
                             LINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            
+                            threads.emplace( procName, &PrimaryProcessor::operator(), tgIter->fProc );
 
                             //std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                             //thisThreadRef->Name() = procName;
@@ -741,11 +745,37 @@ namespace Nymph
                             //}
                             //KTDEBUG( proclog, "Thread has started" );
 
-                            threads.add_thread( thisThread );
+                            //threads.add_thread( thisThread );
 
                         }// end for loop over the thread group
                     } // end scope for threadFuturesLock
 
+                    SharedControl* control = SharedControl::get_instance();
+                    bool stillRunning = true;
+                    while( stillRunning )
+                    {
+                        bool breakOrCanceled = control->WaitForBreakOrCanceled();
+                        if( breakOrCanceled )
+                        {
+                            // then at a breakpoint
+                            stillRunning = true;
+                            LDEBUG( proclog, "At a breakpoint" );
+                            // TODO: do we need to do anything while at a breakpoint?
+                            if( ! control->WaitToContinue() )
+                            {
+                                stillRunning = false;
+                                LDEBUG( proclog, "Detected cancelation while waiting at breakpoint" );
+                            }
+                        }
+                        else
+                        {
+                            // then canceled
+                            stillRunning = false;
+                            LDEBUG( proclog, "Detected cancelation while waiting during running" );
+                        }
+                    }
+
+                    /*
                     bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
                     do
                     {
@@ -794,6 +824,7 @@ namespace Nymph
                     threads.join_all();
                     boost_unique_lock breakContLock( fBreakContMutex );
                     fThreadReferences.clear();
+                    */
                 } // end for loop over the run-queue
 
                 LPROG( proclog, "Processing is complete (multi-threaded)" );
@@ -802,24 +833,27 @@ namespace Nymph
             {
                 // exceptions thrown in this function or from within processors will end up here
                 LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
+                SharedControl::get_instance()->Cancel();
+                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
             catch( boost::exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
                 LERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
-                LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
+                LERROR( proclog, "Diagnostic Information:\n" << diagnostic_information( e ) );
+                SharedControl::get_instance()->Cancel();
+                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
-            LWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
-            fDoRunPromise.set_value();
+            //LWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
+            //fDoRunPromise.set_value();
             return;
         }; // end multi-threaded run lambda
 
-        fDoRunThread = new boost::thread( multiThreadRun );
+        fDoRunThread = new std::thread( multiThreadRun );
         return;
     }
 
diff --git a/Library/Processor/QuitThread.hh b/Library/Processor/QuitThread.hh
new file mode 100644
index 0000000..a11983c
--- /dev/null
+++ b/Library/Processor/QuitThread.hh
@@ -0,0 +1,31 @@
+/*
+ * QuitThread.hh
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_QUITTHREAD_HH_
+#define NYMPH_QUITTHREAD_HH_
+
+#include <string>
+
+namespace Nymph
+{
+
+    struct QuitThread
+    {
+        std::string fFile;
+        std::string fLine;
+        QuitThread( const std::string& file, const std::string& line ) :
+                fFile( file ),
+                fLine( line )
+        {}
+    };
+
+    #define QUIT_THREAD \
+        throw ::Nymph::QuitThread( TOSTRING(__FILE__), TOSTRING(__LINE__) );
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_QUITTHREAD_HH_ */
diff --git a/Library/Processor/ReturnBuffer.cc b/Library/Processor/ReturnBuffer.cc
new file mode 100644
index 0000000..7e0bf57
--- /dev/null
+++ b/Library/Processor/ReturnBuffer.cc
@@ -0,0 +1,19 @@
+/*
+ * ReturnBuffer.cc
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "ReturnBuffer.hh"
+
+namespace Nymph
+{
+    
+    ReturnBufferBase::ReturnBufferBase()
+    {}
+
+    ReturnBufferBase::~ReturnBufferBase()
+    {}
+
+}
diff --git a/Library/Processor/ReturnBuffer.hh b/Library/Processor/ReturnBuffer.hh
new file mode 100644
index 0000000..c29a146
--- /dev/null
+++ b/Library/Processor/ReturnBuffer.hh
@@ -0,0 +1,63 @@
+/*
+ * ReturnBuffer.hh
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_RETURNBUFFER_HH_
+#define NYMPH_RETURNBUFFER_HH_
+
+#include <tuple>
+
+namespace Nymph
+{
+
+    class ReturnBufferBase
+    {
+        public:
+            ReturnBufferBase();
+            virtual ~ReturnBufferBase();
+    };
+
+    template< typename... Args >
+    struct ReturnBuffer : ReturnBufferBase
+    {
+        public:
+            ReturnBuffer() :
+                    fReturn( nullptr )
+            {}
+
+            ReturnBuffer( Args&... retval ) :
+                    fReturn( new std::tuple< Args&... >( retval... ) )
+            {}
+
+            virtual ~ReturnBuffer()
+            {}
+
+            std::tuple< Args&... >& GetReturn()
+            {
+                if( fReturn == nullptr ) throw std::exception();
+                return *fReturn;
+            }
+
+        protected:
+            std::tuple< Args&... >* fReturn;
+    };
+
+    template<>
+    struct ReturnBuffer< void > : ReturnBufferBase
+    {
+        ReturnBuffer() :
+                ReturnBufferBase()
+        {}
+
+        void GetReturn()
+        {
+            return;
+        }
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_RETURNBUFFER_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 9f7b08e..2bb2ffe 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -12,7 +12,9 @@
 
 #include "SignalSlotBase.hh"
 
+#include "ControlAccess.hh"
 #include "Exception.hh"
+#include "QuitThread.hh"
 
 #include "logger.hh"
 
@@ -52,6 +54,7 @@ namespace Nymph
             void Emit( XArgs... args );
             void operator()( XArgs... args );
 
+            // TODO: remove this
             MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
     };
 
@@ -170,13 +173,24 @@ namespace Nymph
     template< typename... XArgs >
     inline void Signal< XArgs... >::operator()( XArgs... args )
     {
-        // TODO: if not canceled and at breakpoint, then set return and break
+        SharedControl* control = SharedControl::get_instance();
+
+        // if we're canceled, then quit the thread
+        // if we're at a break, then wait to continue
+        //   once we continue, if we need to quit, then do so
+        if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
+        {
+            QUIT_THREAD;
+        }
+
         if( fDoBreakpoint )
         {
-            fControl->SetReturn< XArgs... >( args... );
-            fControl->Break(); // waits for resume or exit
+            control->Break( args... );
+            if( ! control->WaitToContinue() )
+            {
+                QUIT_THREAD;
+            }
         }
-        // TODO: if canceled, quit
 
         for( auto connection : fConnections )
         {
diff --git a/Library/Processor/SignalSlotBase.cc b/Library/Processor/SignalSlotBase.cc
index bcdba67..ec234ce 100644
--- a/Library/Processor/SignalSlotBase.cc
+++ b/Library/Processor/SignalSlotBase.cc
@@ -11,8 +11,8 @@ namespace Nymph
 {
     SlotBase::SlotBase( const std::string& name ) :
             fName( name ),
-            fConnections(),
-            fSignalsUsed()
+            fConnections()//,
+            //fSignalsUsed()
     {}
 
     SlotBase::~SlotBase()
@@ -30,7 +30,7 @@ namespace Nymph
     SignalBase::SignalBase( const std::string& name ) :
             fName( name ),
             fConnections(),
-            fControl( nullptr ),
+            //fControl( nullptr ),
             fDoBreakpoint( false )
     {}
 
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index 69a33ea..dc43d74 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -8,7 +8,7 @@
 #ifndef NYMPH_SIGNALSLOTBASE_HH_
 #define NYMPH_SIGNALSLOTBASE_HH_
 
-#include "ControlAccess.hh"
+//#include "ControlAccess.hh"
 #include "Exception.hh"
 #include "MemberVariable.hh"
 
@@ -45,7 +45,7 @@ namespace Nymph
             typedef std::set< SignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE( signal_connections, Connections );
 
-            MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
+            //MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
 
         protected:
             friend class SignalBase;
@@ -71,7 +71,7 @@ namespace Nymph
             typedef std::set< SlotBase* > slot_connections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
 
-            MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
+            //MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
 
             MEMVAR( bool, DoBreakpoint );
 
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 446507b..ad79b8b 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -221,10 +221,10 @@ namespace Nymph
     inline void Slot< XArgs... >::SlotFuncWrapper( ControlAccessPtr access, XArgs... args )
     {
         //TODO could do something with `access` here
-        for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
-        {
-            (*signalIt)->SetControl( access );
-        }
+        //for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
+        //{
+        //    (*signalIt)->SetControl( access );
+        //}
 
         fFunction( args... );
 
diff --git a/Scarab b/Scarab
index d8a19bf..25cf398 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit d8a19bfb2d8d41eff57a84f30760d1c4c3291ab0
+Subproject commit 25cf3988ff1968cfc0750349c9c14e23b1b1697a

From 79c667803e55f1f91bdeade33feb3a9964f441d8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 22 Oct 2019 17:05:29 -0700
Subject: [PATCH 156/521] A little more progress

---
 Library/Processor/ProcessorToolbox.cc | 42 +++++++++++++++------------
 Library/Processor/ProcessorToolbox.hh | 36 ++++++++++++-----------
 2 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 1e8359a..7973bd8 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -572,26 +572,26 @@ namespace Nymph
             return;
         }
 
-        fDoRunPromise = boost::promise< void >();
-        fDoRunFuture = fDoRunPromise.get_future().share();
-
-        bool willRunSingleThreaded = fRunSingleThreaded;
-#ifdef SINGLETHREADED
-        willRunSingleThreaded = true;
-#endif
-
-        if( willRunSingleThreaded )
-        {
-            StartSingleThreadedRun();
-        }
-        else
-        {
-            StartMultiThreadedRun();
-        }
+        //fDoRunPromise = boost::promise< void >();
+        //fDoRunFuture = fDoRunPromise.get_future().share();
+
+        //bool willRunSingleThreaded = fRunSingleThreaded;
+//#ifdef SINGLETHREADED
+        //willRunSingleThreaded = true;
+//#endif
+
+        //if( willRunSingleThreaded )
+        //{
+        //    StartSingleThreadedRun();
+        //}
+        //else
+        //{
+        StartMultiThreadedRun();
+        //}
 
         return;
     }
-
+/*
     void ProcessorToolbox::StartSingleThreadedRun()
     {
         auto singleThreadRun = [&]()
@@ -700,7 +700,7 @@ namespace Nymph
         fDoRunThread = new boost::thread( singleThreadRun );
         return;
     }
-
+*/
     void ProcessorToolbox::StartMultiThreadedRun()
     {
         auto multiThreadRun = [&]()
@@ -968,6 +968,7 @@ namespace Nymph
         return (*trIt)->GetReturnValue();
     }
 
+/*
     void ProcessorToolbox::InitiateBreak()
     {
         boost_unique_lock breakContLock( fBreakContMutex );
@@ -992,9 +993,13 @@ namespace Nymph
 
         return;
     }
+    */
 
     void ProcessorToolbox::CancelThreads()
     {
+        SharedControl::get_instance()->Cancel();
+        return;
+        /*
         boost_unique_lock breakContLock( fBreakContMutex );
         for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
         {
@@ -1002,6 +1007,7 @@ namespace Nymph
             (*trIt)->SetCanceled( true );
         }
         return;
+        */
     }
 
     bool ProcessorToolbox::Run()
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 577ceee..f5cc696 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -194,9 +194,9 @@ namespace Nymph
             {
                 PrimaryProcessor* fProc;
                 std::string fName;
-                ControlAccessPtr fControlAccess;
+                //ControlAccessPtr fControlAccess;
                 ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
-                        fProc(proc), fName(name), fControlAccess( new ControlAccess() )
+                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
                 {}
             };
             struct CompareThreadSource
@@ -220,13 +220,13 @@ namespace Nymph
 
             void AsyncRun();
 
-            void WaitForContinue( boost_unique_lock& lock );
+            void WaitToContinue();
 
             /// Returns when processing is completed or a breakpoint is reached
             /// Throws a boost::exception if there's an error with the future object in use
             /// If the return is true, processing can continue after the break
             /// If the return is false, processing has ended (either normally or due to an error)
-            bool WaitForBreak();
+            bool WaitForBreakOrCanceled();
 
             void WaitForEndOfRun();
 
@@ -236,29 +236,31 @@ namespace Nymph
 
             void JoinRunThread();
 
-            KTDataHandle GetData( const std::string& threadName );
+            // TODO: return value access
 
-            MEMVAR_SHARED_PTR_CONST( SharedControl, Control );
+            //KTDataHandle GetData( const std::string& threadName );
+
+            //MEMVAR_SHARED_PTR_CONST( SharedControl, Control );
 
         private:
-            typedef boost::shared_future< KTDataHandle > Future;
+            //typedef boost::shared_future< KTDataHandle > Future;
 
-            void StartSingleThreadedRun();
+            //void StartSingleThreadedRun();
             void StartMultiThreadedRun();
 
             // called from KTThreadReference::Break
-            void InitiateBreak();
+            //void InitiateBreak();
 
-            std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
+            //std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
 
-            boost::condition_variable fContinueCV;
-            bool fDoContinue;
-            boost::mutex fBreakContMutex;
+            //boost::condition_variable fContinueCV;
+            //bool fDoContinue;
+            //boost::mutex fBreakContMutex;
 
-            boost::thread* fDoRunThread;
-            boost::promise< void > fDoRunPromise;
-            boost::shared_future< void > fDoRunFuture;
-            bool fDoRunBreakFlag;
+            //boost::thread* fDoRunThread;
+            //boost::promise< void > fDoRunPromise;
+            //boost::shared_future< void > fDoRunFuture;
+            //bool fDoRunBreakFlag;
 
     };
 

From 00c44a00723f97fb689f0e6b851cb7914ccb18eb Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 23 Oct 2019 00:44:06 -0700
Subject: [PATCH 157/521] ProcessorToolbox compiles, but untested and minus
 return setup.

---
 Library/Processor/ProcessorToolbox.cc | 62 +++++++++++++++++----------
 Library/Processor/ProcessorToolbox.hh |  5 ++-
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 7973bd8..e6c124a 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -34,14 +34,14 @@ namespace Nymph
             fRunSingleThreaded( false ),
             fRunQueue(),
             fProcMap(),
-            fControl( new SharedControl() )/*,
-            fThreadReferences(),
-            fContinueCV(),
-            fDoContinue( false ),
-            fBreakContMutex(),
-            fDoRunThread( nullptr ),
-            fDoRunPromise(),
-            fDoRunBreakFlag( false )*/
+            //fControl( new SharedControl() ),
+            //fThreadReferences(),
+            //fContinueCV(),
+            //fDoContinue( false ),
+            //fBreakContMutex(),
+            fDoRunThread()//,
+            //fDoRunPromise(),
+            //fDoRunBreakFlag( false )
     {
     }
 
@@ -566,7 +566,7 @@ namespace Nymph
 
     void ProcessorToolbox::AsyncRun()
     {
-        if( fDoRunThread != nullptr )
+        if( ! fDoRunThread.joinable() )
         {
             LERROR( proclog, "It appears that a run has already been started" );
             return;
@@ -712,7 +712,7 @@ namespace Nymph
                 for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                 {
                     //boost::thread_group threads;
-                    std::map< std::thread > threads;
+                    std::map< std::string, std::thread > threads;
 
                     { // scope for threadFuturesLock
                         //boost_unique_lock breakContLock( fBreakContMutex );
@@ -723,7 +723,7 @@ namespace Nymph
                             std::string procName( tgIter->fName );
                             LINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            threads.emplace( procName, &PrimaryProcessor::operator(), tgIter->fProc );
+                            threads.emplace( procName, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) );
 
                             //std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
                             //thisThreadRef->Name() = procName;
@@ -853,13 +853,15 @@ namespace Nymph
             return;
         }; // end multi-threaded run lambda
 
-        fDoRunThread = new std::thread( multiThreadRun );
+        fDoRunThread = std::thread( multiThreadRun );
         return;
     }
 
 
-    bool ProcessorToolbox::WaitForBreak()
+    bool ProcessorToolbox::WaitForBreakOrCanceled()
     {
+        return SharedControl::get_instance()->WaitForBreakOrCanceled();
+        /*
         boost_unique_lock breakContLock( fBreakContMutex );
 
         if( fDoRunBreakFlag )
@@ -896,28 +898,35 @@ namespace Nymph
             LERROR( proclog, "An error occurred during processing: " << boost::diagnostic_information( e ) );
             return false;
         }
+        */
+    }
+
+    bool ProcessorToolbox::WaitToContinue()
+    {
+        return SharedControl::get_instance()->WaitToContinue();
     }
 
     void ProcessorToolbox::WaitForEndOfRun()
     {
         // WaitForBreak() and WaitForContinue() throw boost::exception for problems with the future or promise objects
 
-        KTDEBUG( proclog, "Waiting for end-of-run" );
-        while( WaitForBreak() )
+        LDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreakOrCanceled() )
         {
-            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            boost::mutex localMutex;
-            boost_unique_lock localLock( localMutex );
-            WaitForContinue( localLock );
-            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+            LDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            WaitToContinue();
+            LDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
         }
-        KTDEBUG( proclog, "End-of-run reached" );
+        LDEBUG( proclog, "End-of-run reached" );
 
         return;
     }
 
     void ProcessorToolbox::Continue()
     {
+        SharedControl::get_instance()->Resume();
+        return;
+        /*
         if( ! fDoRunBreakFlag )
         {
             LWARN( proclog, "Not currently at a breakpoint" );
@@ -946,8 +955,9 @@ namespace Nymph
         fContinueCV.notify_all();
 
         return;
+        */
     }
-
+/*
     KTDataHandle ProcessorToolbox::GetData( const std::string& threadName )
     {
         //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
@@ -967,7 +977,7 @@ namespace Nymph
         boost_unique_lock lock( (*trIt)->Mutex() );
         return (*trIt)->GetReturnValue();
     }
-
+*/
 /*
     void ProcessorToolbox::InitiateBreak()
     {
@@ -995,6 +1005,12 @@ namespace Nymph
     }
     */
 
+   void ProcessorToolbox::JoinRunThread()
+   {
+       fDoRunThread.join();
+       return;
+   }
+
     void ProcessorToolbox::CancelThreads()
     {
         SharedControl::get_instance()->Cancel();
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index f5cc696..96a6be9 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -30,6 +30,7 @@
 #include <limits>
 #include <set>
 #include <memory>
+#include <thread>
 
 
 namespace Nymph
@@ -220,7 +221,7 @@ namespace Nymph
 
             void AsyncRun();
 
-            void WaitToContinue();
+            bool WaitToContinue();
 
             /// Returns when processing is completed or a breakpoint is reached
             /// Throws a boost::exception if there's an error with the future object in use
@@ -257,7 +258,7 @@ namespace Nymph
             //bool fDoContinue;
             //boost::mutex fBreakContMutex;
 
-            //boost::thread* fDoRunThread;
+            std::thread fDoRunThread;
             //boost::promise< void > fDoRunPromise;
             //boost::shared_future< void > fDoRunFuture;
             //bool fDoRunBreakFlag;

From 3d3d5b35fe835ecc9b2dbff6704267bba2afcdef Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 11 Nov 2019 00:44:12 -0800
Subject: [PATCH 158/521] Very preliminary work on data

---
 Library/Data/Data.cc        | 18 +++++++++++++++++
 Library/Data/Data.hh        | 24 +++++++++++++++++++++++
 Library/Data/DataFrame.cc   | 18 +++++++++++++++++
 Library/Data/DataFrame.hh   | 24 +++++++++++++++++++++++
 Library/Data/DataManager.cc | 18 +++++++++++++++++
 Library/Data/DataManager.hh | 39 +++++++++++++++++++++++++++++++++++++
 6 files changed, 141 insertions(+)
 create mode 100644 Library/Data/Data.cc
 create mode 100644 Library/Data/Data.hh
 create mode 100644 Library/Data/DataFrame.cc
 create mode 100644 Library/Data/DataFrame.hh
 create mode 100644 Library/Data/DataManager.cc
 create mode 100644 Library/Data/DataManager.hh

diff --git a/Library/Data/Data.cc b/Library/Data/Data.cc
new file mode 100644
index 0000000..12be720
--- /dev/null
+++ b/Library/Data/Data.cc
@@ -0,0 +1,18 @@
+/*
+ *  Data.cc
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "Data.hh"
+
+namespace Nymph
+{
+    Data::Data()
+    {}
+
+    Data::~Data()
+    {}
+
+} /* namespace Nymph */
diff --git a/Library/Data/Data.hh b/Library/Data/Data.hh
new file mode 100644
index 0000000..590deca
--- /dev/null
+++ b/Library/Data/Data.hh
@@ -0,0 +1,24 @@
+/*
+ *  Data.hh
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#ifndef NYMPH_DATA_HH_
+#define NYMPH_DATA_HH_
+
+namespace Nymph
+{
+
+    class Data
+    {
+        public:
+            Data();
+            virtual ~Data();
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATA_HH_ */
diff --git a/Library/Data/DataFrame.cc b/Library/Data/DataFrame.cc
new file mode 100644
index 0000000..833fdce
--- /dev/null
+++ b/Library/Data/DataFrame.cc
@@ -0,0 +1,18 @@
+/*
+ *  DataFrame.cc
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "DataFrame.hh"
+
+namespace Nymph
+{
+    DataFrame::DataFrame()
+    {}
+
+    DataFrame::~DataFrame()
+    {}
+
+} /* namespace Nymph */
diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
new file mode 100644
index 0000000..8a8b62d
--- /dev/null
+++ b/Library/Data/DataFrame.hh
@@ -0,0 +1,24 @@
+/*
+ *  DataFrame.hh
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#ifndef NYMPH_DATAFRAME_HH_
+#define NYMPH_DATAFRAME_HH_
+
+namespace Nymph
+{
+
+    class DataFrame
+    {
+        public:
+            DataFrame();
+            virtual ~DataFrame();
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATAFRAME_HH_ */
diff --git a/Library/Data/DataManager.cc b/Library/Data/DataManager.cc
new file mode 100644
index 0000000..3fda7bc
--- /dev/null
+++ b/Library/Data/DataManager.cc
@@ -0,0 +1,18 @@
+/*
+ *  DataManager.cc
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "DataManager.hh"
+
+namespace Nymph
+{
+    DataManager::DataManager()
+    {}
+
+    DataManager::~DataManager()
+    {}
+
+} /* namespace Nymph */
diff --git a/Library/Data/DataManager.hh b/Library/Data/DataManager.hh
new file mode 100644
index 0000000..3552738
--- /dev/null
+++ b/Library/Data/DataManager.hh
@@ -0,0 +1,39 @@
+/*
+ *  DataManager.hh
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#ifndef NYMPH_DATAMANAGER_HH_
+#define NYMPH_DATAMANAGER_HH_
+
+#include "MemberVariable.hh"
+
+#include <typeindex>
+#include <unordered_map>
+
+namespace Nymph
+{
+    struct Holder
+    {}
+
+    template< typename XType >
+    struct TypedHolder
+    {
+        
+    }
+
+    class DataManager
+    {
+        public:
+            DataManager();
+            virtual ~DataManager();
+
+            MEMVAR_REF( std::map< std::type_index, std::list< Holder > >, DataStore );
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATAMANAGER_HH_ */

From 7f835caa9d5a986176018656175f3f1f165400fc Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 8 Dec 2021 15:20:07 -0800
Subject: [PATCH 159/521] Remove another KT prefix

---
 Library/Processor/Processor.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 3b5e9ae..294319b 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -86,7 +86,7 @@ namespace Nymph
         return new scarab::registrar< Processor, XDerivedProc, const std::string& >( name );
     }
 
-#define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
+#define REGISTER_PROCESSOR(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
 } /* namespace Nymph */

From 9448e523666f35cb59f12aabb35bd6cbd5843f27 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 8 Dec 2021 15:20:33 -0800
Subject: [PATCH 160/521] Move the test processor to its own header file

---
 Testing/CMakeLists.txt   |  6 ++++
 Testing/TestProc.hh      | 67 ++++++++++++++++++++++++++++++++++++++++
 Testing/TestProcessor.cc | 61 ++----------------------------------
 3 files changed, 76 insertions(+), 58 deletions(-)
 create mode 100644 Testing/TestProc.hh

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 29726b0..26945fe 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -4,13 +4,19 @@
 
 ##########
 
+include_directories( BEFORE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
 set( testing_HEADERS
+    TestProc.hh
 )
 
 set( testing_SOURCES
     TestControlAccess.cc
     TestPrimaryProcessor.cc
     TestProcessor.cc
+    TestProcessorToolbox.cc
     TestSignalSlot.cc
     UseCatch.cc
 )
diff --git a/Testing/TestProc.hh b/Testing/TestProc.hh
new file mode 100644
index 0000000..19cb143
--- /dev/null
+++ b/Testing/TestProc.hh
@@ -0,0 +1,67 @@
+/*
+ * TestProc.hh
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "Processor.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+
+namespace Nymph
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestProc : public Processor
+    {
+        public:
+            TestProc() :
+                    Processor( "test" ),
+                    fValue( 0 ),
+                    fSecondValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestProc::SetValue ),
+                    fSecondValueSig( "second-value", this ),
+                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
+                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
+            {}
+
+            virtual ~TestProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                fValue = node.get_value( "value", fValue );
+                return;
+            }
+
+            MEMVAR( int, Value );
+            MEMVAR( int, SecondValue );
+
+            void SecondValueSlotFunction( int newValue )
+            {
+                fSecondValueSig( newValue );
+            }
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+            MEMVAR_REF( Signal< int >, SecondValueSig );
+            MEMVAR_REF( Slot< int >, SecondValueSlot );
+            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
+
+    };
+
+    // external slot function owner
+    struct TestSlotOwner
+    {
+        int fValue = 0;
+        void TestSlotFunc( int input )
+        {
+            fValue = input;
+            return;
+        }
+    };
+}
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index f075355..42e7465 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -5,9 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "Processor.hh"
-#include "Signal.hh"
-#include "Slot.hh"
+#include "TestProc.hh"
 
 #include "logger.hh"
 
@@ -15,61 +13,8 @@
 
 LOGGER( testlog, "TestProcessor" );
 
-namespace Nymph
-{
-    // concrete processor class that we can test
-    // implements Configure() and has its own signal and slot
-    class TestProc : public Processor
-    {
-        public:
-            TestProc() :
-                    Processor( "test" ),
-                    fValue( 0 ),
-                    fSecondValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestProc::SetValue ),
-                    fSecondValueSig( "second-value", this ),
-                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
-                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
-            {}
-
-            virtual ~TestProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                fValue = node.get_value( "value", fValue );
-                return;
-            }
-
-            MEMVAR( int, Value );
-            MEMVAR( int, SecondValue );
-
-            void SecondValueSlotFunction( int newValue )
-            {
-                fSecondValueSig( newValue );
-            }
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-            MEMVAR_REF( Signal< int >, SecondValueSig );
-            MEMVAR_REF( Slot< int >, SecondValueSlot );
-            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
-
-    };
-
-    // external slot function owner
-    struct TestSlotOwner
-    {
-        int fValue = 0;
-        void TestSlotFunc( int input )
-        {
-            fValue = input;
-            return;
-        }
-    };
-}
+REGISTER_PROCESSOR(Nymph::TestProc, "test-proc");
+
 
 TEST_CASE( "processor", "[signal],[slot],[processor]" )
 {

From 0a7f7adfadb6ea6e5b3965818f210f00dd110738 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 8 Dec 2021 15:21:00 -0800
Subject: [PATCH 161/521] The Break section of the control access test uses
 SharedControl

---
 Testing/TestControlAccess.cc | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
index fbbe650..215981b 100644
--- a/Testing/TestControlAccess.cc
+++ b/Testing/TestControlAccess.cc
@@ -44,20 +44,22 @@ TEST_CASE( "control_access", "[control_access]" )
 
     SECTION( "Break" )
     {
+        SharedControl* shared = SharedControl::create_instance();
+
         std::thread thread( [&](){ 
-            control.Break();
-            } );
+            shared->Break();
+        } );
         
         std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE( control.GetBreakFlag() );
+        REQUIRE( shared->GetBreakFlag() );
 
-        control.Resume();
+        shared->Resume();
         std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE_FALSE( control.GetBreakFlag() );
+        REQUIRE_FALSE( shared->GetBreakFlag() );
 
         thread.join();
 
-        REQUIRE_FALSE( control.GetBreakFlag() );
+        REQUIRE_FALSE( shared->GetBreakFlag() );
     }
 
 }
\ No newline at end of file

From 72484b2a765a7faf00abe4e93537626b94c32d7f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 8 Dec 2021 15:21:19 -0800
Subject: [PATCH 162/521] Added TestProcessorToolbox.cc

---
 Testing/TestProcessorToolbox.cc | 46 +++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 Testing/TestProcessorToolbox.cc

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
new file mode 100644
index 0000000..9f2e52d
--- /dev/null
+++ b/Testing/TestProcessorToolbox.cc
@@ -0,0 +1,46 @@
+/*
+ * TestProcessorToolbox.cc
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProc.hh"
+
+#include "ProcessorToolbox.hh"
+
+#include "logger.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestProcessorToolbox" );
+
+
+TEST_CASE( "processor_toolbox" )
+{
+    using namespace Nymph;
+
+    ProcessorToolbox toolbox;
+
+    SECTION( "Configuration" )
+    {
+        REQUIRE_FALSE( toolbox.GetProcessor( "testproc-1" ) );
+
+        std::string config_str(
+            "processors:\n" +
+            "  - type: test-proc\n" +
+            "    name: testproc-1"
+        )
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str );
+
+        toolbox.Configure( config );
+
+        REQUIRE( toolbox.GetProcessor( "testproc-1" ) );
+
+
+    }
+
+
+}

From aab1d18cdc4224204d40eb1080359a319713ea44 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 11:28:13 -0800
Subject: [PATCH 163/521] Cleaning up modifications to use of signals and slots

---
 Library/Processor/PrimaryProcessor.cc |  2 +-
 Library/Processor/PrimaryProcessor.hh |  2 +-
 Library/Processor/Processor.hh        | 12 +++++++++++-
 Library/Processor/Signal.hh           |  9 +++++----
 Library/Processor/SignalSlotBase.hh   | 10 +++++-----
 Library/Processor/Slot.hh             | 17 ++++++++++-------
 Testing/TestPrimaryProcessor.cc       |  5 ++---
 Testing/TestProc.hh                   |  4 ++--
 Testing/TestProcessor.cc              |  6 +++---
 Testing/TestProcessorToolbox.cc       | 11 ++++++-----
 10 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 87ee3cf..90be231 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -23,7 +23,7 @@ namespace Nymph
     PrimaryProcessor::~PrimaryProcessor()
     {}
 
-    void PrimaryProcessor::operator()()// ControlAccessPtr control )
+    void PrimaryProcessor::operator()()// ControlAccessPtr control ) // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
     {
         // pass the control access pointer to every signal in the primary processor
         /*
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index 785ff57..5850396 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -22,7 +22,7 @@ namespace Nymph
 
         public:
             /// Callable function used by std::thread
-            void operator()();// ControlAccessPtr control );
+            void operator()();// ControlAccessPtr control ); // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
 
             /// Starts the  main action of the processor
             virtual bool Run() = 0;
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 294319b..b815f30 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -86,9 +86,19 @@ namespace Nymph
         return new scarab::registrar< Processor, XDerivedProc, const std::string& >( name );
     }
 
-#define REGISTER_PROCESSOR(proc_class, proc_name) \
+#define REGISTER_PROCESSOR_NONAMEPSACE(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
+#define REGISTER_PROCESSOR_NAMESPACE(proc_namespace, proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::Processor, ::proc_namespace::proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+// Macro overloading trick from here: https://stackoverflow.com/a/11763277
+#define GET_MACRO(_1, _2, _3, NAME, ...) NAME
+/// Processors defined in a namespace need to specify the namespace first:
+///   [no namespace]: REGISTER_PROCESSOR( [class], [name in quotes] )
+///   [with namespace]: REGISTER_PROCESSOR( [namespace], [class], [name in quotes] )
+#define REGISTER_PROCESSOR(...) GET_MACRO(__VA_ARGS__, REGISTER_PROCESSOR_NAMESPACE, REGISTER_PROCESSOR_NONAMESPACE, )(__VA_ARGS__)
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_PROCESSOR_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 2bb2ffe..8f04cf3 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -36,7 +36,7 @@ namespace Nymph
     {
         public:
             using signature = void( XArgs... );
-            using full_signature = void( ControlAccessPtr, XArgs... );
+//            using full_signature = void( ControlAccessPtr, XArgs... );
 
         public:
             /// Unowned signal
@@ -54,8 +54,8 @@ namespace Nymph
             void Emit( XArgs... args );
             void operator()( XArgs... args );
 
-            // TODO: remove this
-            MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
+            // TODO: remove this  // 12/8/21, NSO: why remove this?  // NSO: oh, because we no longer need to pass ControlAccess between signals and slots before they're used
+            //MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
     };
 
 
@@ -194,7 +194,8 @@ namespace Nymph
 
         for( auto connection : fConnections )
         {
-            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );
+//            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );
+            static_cast< Slot< XArgs... >* >(connection)->operator()( args... );
         }
         return;
     }
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index dc43d74..04bc1ef 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -42,8 +42,8 @@ namespace Nymph
 
             MEMVAR_REF( std::string, Name );
 
-            typedef std::set< SignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
-            MEMVAR_REF_MUTABLE( signal_connections, Connections );
+            typedef std::set< SignalBase* > SignalConnections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE( SignalConnections, Connections );
 
             //MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
 
@@ -68,15 +68,15 @@ namespace Nymph
 
             MEMVAR_REF( std::string, Name );
 
-            typedef std::set< SlotBase* > slot_connections; // to get around the problem of having a comma inside a macro function argument
-            MEMVAR_REF_MUTABLE_CONST( slot_connections, Connections );
+            typedef std::set< SlotBase* > SlotConnections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE_CONST( SlotConnections, Connections );
 
             //MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
 
             MEMVAR( bool, DoBreakpoint );
 
         protected:
-            friend class SignalBase;
+            friend class SlotBase;
             virtual void AddConnection( SlotBase* slot, int group );
     };
 
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index ad79b8b..1eb33a8 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -30,7 +30,7 @@ namespace Nymph
     {
         public:
             using signature = void( XArgs... );
-            using full_signature = void( ControlAccessPtr, XArgs... );
+//            using full_signature = void( ControlAccessPtr, XArgs... );
             using signal_list = std::initializer_list< std::string >;
 
         public:
@@ -61,14 +61,15 @@ namespace Nymph
             void operator()( XArgs... args );
 
             /// execute fFunction with a ControlAccess object
-            void operator()( ControlAccessPtr access, XArgs... args );
+//            void operator()( ControlAccessPtr access, XArgs... args );
 
             MEMVAR_REF( boost::function< signature >, Function );
 
             MEMVAR( bool, DoBreakpoint );
 
         protected:
-            void SlotFuncWrapper( ControlAccessPtr access, XArgs... args );
+//            void SlotFuncWrapper( ControlAccessPtr access, XArgs... args );
+            void SlotFuncWrapper( XArgs... args );
     };
 
 
@@ -206,21 +207,23 @@ namespace Nymph
     template< typename... XArgs >
     inline void Slot< XArgs... >::operator()( XArgs... args )
     {
-        fFunction( args... );
+//        fFunction( args... );
+        SlotFuncWrapper( args... );
         return;
     }
-
+/*
     template< typename... XArgs >
     inline void Slot< XArgs... >::operator()( ControlAccessPtr access, XArgs... args )
     {
         SlotFuncWrapper( access, args... );
         return;
     }
-
+*/
     template< typename... XArgs >
-    inline void Slot< XArgs... >::SlotFuncWrapper( ControlAccessPtr access, XArgs... args )
+    inline void Slot< XArgs... >::SlotFuncWrapper( /*ControlAccessPtr access,*/ XArgs... args )
     {
         //TODO could do something with `access` here
+        //NOTE (12/9/21): instead of using `access`, get SharedControl and use that
         //for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
         //{
         //    (*signalIt)->SetControl( access );
diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
index 62afb44..0bb9940 100644
--- a/Testing/TestPrimaryProcessor.cc
+++ b/Testing/TestPrimaryProcessor.cc
@@ -61,10 +61,9 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
 
     tester.ConnectASlot( "value", tester, "value" );
 
-    ControlAccess control;
-    tester( &control );
+    tester();
 
     REQUIRE( tester.GetValue() == tester.GetNewValue() );
 
-    REQUIRE( tester.ValueSig().GetControl() == &control );
+    //REQUIRE( tester.ValueSig().GetControl() == &control );
 }
diff --git a/Testing/TestProc.hh b/Testing/TestProc.hh
index 19cb143..e733127 100644
--- a/Testing/TestProc.hh
+++ b/Testing/TestProc.hh
@@ -17,8 +17,8 @@ namespace Nymph
     class TestProc : public Processor
     {
         public:
-            TestProc() :
-                    Processor( "test" ),
+            TestProc( const std::string& name = "test" ) :
+                    Processor( name ),
                     fValue( 0 ),
                     fSecondValue( 0 ),
                     fValueSig( "value", this ),
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index 42e7465..be824ad 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -13,7 +13,7 @@
 
 LOGGER( testlog, "TestProcessor" );
 
-REGISTER_PROCESSOR(Nymph::TestProc, "test-proc");
+REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
 
 
 TEST_CASE( "processor", "[signal],[slot],[processor]" )
@@ -115,8 +115,8 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         // check initial value
         REQUIRE( tester.GetSecondValue() == 0 );
 
-        REQUIRE( tester.Slots().at("second-value")->SignalsUsed().size() == 1 );
-        REQUIRE( tester.Slots().at("second-value")->SignalsUsed()[0] == &tester.SecondValueSig() );
+        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed().size() == 1 );
+        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed()[0] == &tester.SecondValueSig() );
 
         tester.ConnectASlot( "second-value", tester, "second-value-2" );
 
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 9f2e52d..6298598 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -10,6 +10,7 @@
 #include "ProcessorToolbox.hh"
 
 #include "logger.hh"
+#include "param_codec.hh"
 
 #include "catch.hpp"
 
@@ -27,15 +28,15 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE_FALSE( toolbox.GetProcessor( "testproc-1" ) );
 
         std::string config_str(
-            "processors:\n" +
-            "  - type: test-proc\n" +
-            "    name: testproc-1"
-        )
+            "processors:"
+            "- type: test-proc"
+            "  name: testproc-1"
+        );
 
         scarab::param_translator translator;
         auto config = translator.read_string( config_str );
 
-        toolbox.Configure( config );
+        toolbox.Configure( config->as_node() );
 
         REQUIRE( toolbox.GetProcessor( "testproc-1" ) );
 

From b7e667473fcd5117d7367cbe486bb404c223ba22 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 13:11:17 -0800
Subject: [PATCH 164/521] Updated Scarab to v3.9.1

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 25cf398..62f3004 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 25cf3988ff1968cfc0750349c9c14e23b1b1697a
+Subproject commit 62f3004eda6eab02d03bdedfb81e385d915f82a5

From 9d341c71eede79a20a90a5f3adcc27462887bda8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 13:47:34 -0800
Subject: [PATCH 165/521] A few more changes from upgrading Scarab

---
 CMakeLists.txt | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccd1cef..4f34b38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ endif( Nymph_ENABLE_PYTHON )
 # Cereal
 ########
 
-set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
-add_subdirectory( External/cereal )
-include_directories( External/cereal/include )
+#set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
+#add_subdirectory( External/cereal )
+#include_directories( External/cereal/include )
 
 
 #####################
@@ -115,7 +115,7 @@ pbuilder_add_submodule( Scarab Scarab )
 pbuilder_use_sm_library( Scarab Scarab )
 
 # this is needed for anything that wants to read or write JSON files
-get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY Scarab/library DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
+get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
 set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 
@@ -125,13 +125,9 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 add_subdirectory( Library )
 
-if (Nymph_ENABLE_TESTING)
-    add_subdirectory( Executables/Validation )
-endif (Nymph_ENABLE_TESTING)
-
-if (Nymph_ENABLE_EXECUTABLES)
-    add_subdirectory( Executables/Main )
-endif (Nymph_ENABLE_EXECUTABLES )
+#if (Nymph_ENABLE_EXECUTABLES)
+#    add_subdirectory( Executables/Main )
+#endif (Nymph_ENABLE_EXECUTABLES )
 
 
 #########

From 067f4a021f515e879d88a54bb88ef074c7352bf1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 13:48:16 -0800
Subject: [PATCH 166/521] Finished the AddRemoveProcessors section of
 TestProcessorToolbox; one bug fix in the toolbox

---
 Library/Processor/ProcessorToolbox.cc |  2 +-
 Testing/TestProcessorToolbox.cc       | 33 ++++++++++++++++++++++-----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index e6c124a..5cd2423 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -94,7 +94,7 @@ namespace Nymph
                 {
                     procName = procNode["name"]().as_string();
                 }
-                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procType));
+                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName));
                 if (newProc == NULL)
                 {
                     LERROR(proclog, "Unable to create processor of type <" << procType << ">");
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 6298598..fb5beb4 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -23,24 +23,45 @@ TEST_CASE( "processor_toolbox" )
 
     ProcessorToolbox toolbox;
 
-    SECTION( "Configuration" )
+    SECTION( "AddRemoveProcessors" )
     {
-        REQUIRE_FALSE( toolbox.GetProcessor( "testproc-1" ) );
+        LINFO( testlog, "Add/Remove Processor tests" );
+        
+        std::string procName1( "testproc-1" );
+        std::string procName2( "testproc-2" );
+
+        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
 
         std::string config_str(
-            "processors:"
-            "- type: test-proc"
+            "processors:\n"
+            "- type: test-proc\n"
             "  name: testproc-1"
         );
 
         scarab::param_translator translator;
-        auto config = translator.read_string( config_str );
+        auto config = translator.read_string( config_str, "yaml" );
 
         toolbox.Configure( config->as_node() );
 
-        REQUIRE( toolbox.GetProcessor( "testproc-1" ) );
+        REQUIRE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
+
+        std::shared_ptr< Processor > tp1 = toolbox.ReleaseProcessor( procName1 );
+        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+
+        REQUIRE( toolbox.AddProcessor( procName1, tp1 ) );
+        REQUIRE( toolbox.GetProcessor( procName1 ) );
+
+        REQUIRE( toolbox.AddProcessor(  "test-proc", procName2 ) );
+        REQUIRE( toolbox.GetProcessor( procName2 ) );
 
+        REQUIRE( toolbox.RemoveProcessor( procName1 ) );
+        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE( toolbox.GetProcessor( procName2 ) );
 
+        toolbox.ClearProcessors();
+        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
     }
 
 

From fb07274ec86321c925af33835e3c675c82232af5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 13:11:17 -0800
Subject: [PATCH 167/521] Upgrade Scarab to v3.9.1

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index d8a19bf..62f3004 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit d8a19bfb2d8d41eff57a84f30760d1c4c3291ab0
+Subproject commit 62f3004eda6eab02d03bdedfb81e385d915f82a5

From a2b4c8a30019998b095ead38bd3bd90da00c6031 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 13:47:34 -0800
Subject: [PATCH 168/521] A few more changes from upgrading Scarab

---
 CMakeLists.txt | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccd1cef..4f34b38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ endif( Nymph_ENABLE_PYTHON )
 # Cereal
 ########
 
-set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
-add_subdirectory( External/cereal )
-include_directories( External/cereal/include )
+#set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
+#add_subdirectory( External/cereal )
+#include_directories( External/cereal/include )
 
 
 #####################
@@ -115,7 +115,7 @@ pbuilder_add_submodule( Scarab Scarab )
 pbuilder_use_sm_library( Scarab Scarab )
 
 # this is needed for anything that wants to read or write JSON files
-get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY Scarab/library DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
+get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
 set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 
@@ -125,13 +125,9 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 add_subdirectory( Library )
 
-if (Nymph_ENABLE_TESTING)
-    add_subdirectory( Executables/Validation )
-endif (Nymph_ENABLE_TESTING)
-
-if (Nymph_ENABLE_EXECUTABLES)
-    add_subdirectory( Executables/Main )
-endif (Nymph_ENABLE_EXECUTABLES )
+#if (Nymph_ENABLE_EXECUTABLES)
+#    add_subdirectory( Executables/Main )
+#endif (Nymph_ENABLE_EXECUTABLES )
 
 
 #########

From 61cbec08b438dcd30f651d37503511e6cef22d1d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 9 Dec 2021 14:21:03 -0800
Subject: [PATCH 169/521] Added Connections tests for ProcessorToolbox

---
 Testing/TestProcessorToolbox.cc | 50 +++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index fb5beb4..5060a21 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -26,7 +26,7 @@ TEST_CASE( "processor_toolbox" )
     SECTION( "AddRemoveProcessors" )
     {
         LINFO( testlog, "Add/Remove Processor tests" );
-        
+
         std::string procName1( "testproc-1" );
         std::string procName2( "testproc-2" );
 
@@ -42,7 +42,7 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        toolbox.Configure( config->as_node() );
+        REQUIRE( toolbox.Configure( config->as_node() ) );
 
         REQUIRE( toolbox.GetProcessor( procName1 ) );
         REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
@@ -64,5 +64,51 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
     }
 
+    SECTION( "Connections" )
+    {
+        LINFO( testlog, "Connections Tests")
+
+        std::string procName1( "testproc-1" );
+        std::string procName2( "testproc-2" );
+
+        std::string config_str(
+            "processors:\n"
+            "- type: test-proc\n"
+            "  name: testproc-1\n"
+            "connections:\n"
+            "- signal: \"testproc-1:value\"\n"
+            "  slot: \"testproc-1:second-value\""
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE( toolbox.Configure( config->as_node() ) );
+
+        std::shared_ptr< Processor > tp1 = toolbox.GetProcessor( procName1 );
+
+        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
+        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
+
+        tp1->Signals().at("value")->DisconnectAll();
+        REQUIRE( tp1->Signals().at("value")->Connections().empty() );
+
+        toolbox.MakeConnection( "testproc-1:value", "testproc-1:second-value" );
+        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
+        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
+
+        tp1->Signals().at("value")->DisconnectAll();
+        REQUIRE( tp1->Signals().at("value")->Connections().empty() );
+
+        toolbox.MakeConnection( "testproc-1", "value", "testproc-1", "second-value" );
+        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
+        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
+    }
 
 }

From 61b0b942551ec1776a6be5bd4c42225bfc408ea1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 11:15:59 -0800
Subject: [PATCH 170/521] Initial build-and-test workflow

---
 .github/workflows/build.yaml | 75 ++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 .github/workflows/build.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000..b2f9a42
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,75 @@
+name: Build and Test Nymph
+
+on:
+  pull_request:
+  push:
+    branches: [main, develop]
+    tags: ['*']
+
+env:
+  Nymph_BUILD_NYMPH_EXE: ON
+  Nymph_ENABLE_EXECUTABLES: ON
+  Nymph_ENABLE_PYTHON: OFF
+  Nymph_ENABLE_TESTING: ON
+  Nymph_SINGLETHREADED: OFF
+
+jobs:
+
+  build:
+    name: Build and Test
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macOS-10.15]
+        python-version: [3.9]
+
+    steps:
+
+      - name: Checkout reposistory
+        uses: actions/checkout@master
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Mac Dependencies
+        if: startsWith(matrix.os, 'macos')  # Mac only
+        run: |
+          brew update \
+          brew install \
+            boost
+
+      - name: Linux Dependencies
+        if: startsWith(matrix.os, 'ubuntu')  # Linux only
+        run: |
+          sudo apt-get update
+          sudo apt-get install -yq \
+            boost
+
+      - name: Configure
+        run: |
+          mkdir -p build
+          cd build
+          cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+
+      - name: Build
+        run: |
+          cd build
+          make -j install
+
+      - name: Run tests
+        run: |
+          cd build
+          Testing/RunTests
+
+# For debugging
+#      - name: Setup tmate session
+#        if: ${{ ! success() }}
+#        uses: mxschmitt/action-tmate@v3
+

From dc2afddb4889308572ac3ef0ca136bca00f76a4c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 11:22:16 -0800
Subject: [PATCH 171/521] Fixing and updating dependencies

---
 .github/workflows/build.yaml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b2f9a42..56d1af5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,16 +41,20 @@ jobs:
       - name: Mac Dependencies
         if: startsWith(matrix.os, 'macos')  # Mac only
         run: |
-          brew update \
+          brew update
           brew install \
-            boost
+            boost \
+            rapidjson \
+            yaml-cpp
 
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
         run: |
           sudo apt-get update
           sudo apt-get install -yq \
-            boost
+            libboost-dev \
+            libyaml-cpp-dev \
+            rapidjson-dev
 
       - name: Configure
         run: |

From 6853fcdbf8f1532186d5d1d92974076e95c1ab0b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 11:28:44 -0800
Subject: [PATCH 172/521] Remove use of brew update because it takes so long

---
 .github/workflows/build.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 56d1af5..67cab88 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,7 +41,6 @@ jobs:
       - name: Mac Dependencies
         if: startsWith(matrix.os, 'macos')  # Mac only
         run: |
-          brew update
           brew install \
             boost \
             rapidjson \

From e115c095448bedac3acf1cfcda1e54e8ee5c5cb0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 11:28:54 -0800
Subject: [PATCH 173/521] Test without rt library

---
 cmake/Nymph.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cmake/Nymph.cmake b/cmake/Nymph.cmake
index 003dab9..1d4d1ef 100644
--- a/cmake/Nymph.cmake
+++ b/cmake/Nymph.cmake
@@ -49,7 +49,6 @@ macro (nymph_process_options)
 	set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG_WARNINGS}")
 
     if( UNIX AND NOT APPLE )
-        pbuilder_add_ext_libraries (rt)
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed")
     endif( UNIX AND NOT APPLE )
 

From c21b79d167e24545123f6c0e028f92fee73b854f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 11:37:07 -0800
Subject: [PATCH 174/521] Required the boost.chrono library

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f34b38..4c3845f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,9 +66,9 @@ set( PRIVATE_EXT_LIBS )
 #######
 
 # Boost (1.46 required for filesystem version 3)
-list( APPEND BOOST_COMPONENTS date_time filesystem program_options system thread )
+list( APPEND BOOST_COMPONENTS chrono date_time filesystem program_options system thread )
 find_package( Boost 1.46.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
-list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::date_time Boost::program_options Boost::thread Boost::filesystem )
+list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::program_options Boost::thread Boost::filesystem )
 # make sure dynamic linking is assumed for all boost libraries
 set( Boost_USE_STATIC_LIBS OFF )
 set( Boost_USE_STATIC_RUNTIME OFF )

From a28eb557e2889c0a7de44493c4d56b65662c941d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 11:39:41 -0800
Subject: [PATCH 175/521] Enable tmate session for debugging

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 67cab88..5cb939b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -72,7 +72,7 @@ jobs:
           Testing/RunTests
 
 # For debugging
-#      - name: Setup tmate session
-#        if: ${{ ! success() }}
-#        uses: mxschmitt/action-tmate@v3
+      - name: Setup tmate session
+        if: ${{ ! success() }}
+        uses: mxschmitt/action-tmate@v3
 

From 4380c64b10acf1ec0e27469db808fab74cbae9c1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 13:44:39 -0800
Subject: [PATCH 176/521] Add a docker build based on p8compute_dependencies

---
 .github/workflows/build.yaml | 27 +++++++++++++++++++++++++++
 Dockerfile                   | 10 ++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5cb939b..3664632 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,9 +12,36 @@ env:
   Nymph_ENABLE_PYTHON: OFF
   Nymph_ENABLE_TESTING: ON
   Nymph_SINGLETHREADED: OFF
+  Nymph_TAG: test
 
 jobs:
 
+  docker_build:
+    name: Build and Test in Docker
+
+    runs-on: ubuntu-20.04
+
+    steps:
+
+      - name: Checkout the repo 
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Build and run
+        run: |
+          docker build \
+            --build-arg img_repo=${BASE_IMAGE_REPO} \
+            --build-arg img_tag=${BASE_IMAGE_TAG} \
+            --build-arg build_type=Debug \
+            --build-arg build_tests_exe=${Nymph_ENABLE_TESTING} \
+            --build-arg nymph_tag=${Nymph_TAG} \
+            --tag project8/nymph:${Nymph_TAG} \
+            .
+
+#          docker run project8/nymph:${Nymph_TAG} /usr/local/p8/nymph/${Nymph_TAG}
+
+
   build:
     name: Build and Test
 
diff --git a/Dockerfile b/Dockerfile
index b743827..84e03cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,13 @@
-FROM project8/p8compute_dependencies:v0.7.0 as nymph_common
+FROM project8/p8compute_dependencies:v1.2.0 as nymph_common
 
 ARG build_type=Release
 ENV NYMPH_BUILD_TYPE=$build_type
 ARG build_tests_exe=FALSE
 ENV NYMPH_BUILD_TESTS_EXE=$build_tests_exe
 
-ENV NYMPH_TAG=v2.17.0
-ENV NYMPH_BUILD_PREFIX=/usr/local/p8/katydid/$NYMPH_TAG
+ARG nymph_tag=dev
+ENV NYMPH_TAG=$nymph_tag
+ENV NYMPH_BUILD_PREFIX=/usr/local/p8/nymph/$NYMPH_TAG
 
 RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
     chmod -R 777 $NYMPH_BUILD_PREFIX/.. &&\
@@ -24,9 +25,10 @@ FROM nymph_common as nymph_done
 
 COPY cmake /tmp_source/cmake
 COPY Executables /tmp_source/Executables
-COPY External /tmp_source/External
+#COPY External /tmp_source/External
 COPY Library /tmp_source/Library
 COPY Scarab /tmp_source/Scarab
+COPY Testing /tmp_source/Testing
 COPY CMakeLists.txt /tmp_source/CMakeLists.txt
 COPY .git /tmp_source/.git
 

From 2cf60d32a203720a069f6fbb101aaa8fe54e0eb7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 13:44:47 -0800
Subject: [PATCH 177/521] Fix boost package

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3664632..e86c7d4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -78,7 +78,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -yq \
-            libboost-dev \
+            libboost-all-dev \
             libyaml-cpp-dev \
             rapidjson-dev
 

From 3d778c8bd7b036d8ef9ed1279e28a86d6d089b4b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 14:13:52 -0800
Subject: [PATCH 178/521] Missing file in the docker build

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 84e03cb..715365a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ COPY Library /tmp_source/Library
 COPY Scarab /tmp_source/Scarab
 COPY Testing /tmp_source/Testing
 COPY CMakeLists.txt /tmp_source/CMakeLists.txt
+COPY NymphConfig.cmake.in /tmp_source/NymphConfig.cmake.in
 COPY .git /tmp_source/.git
 
 # repeat the cmake command to get the change of install prefix to set correctly (a package_builder known issue)

From 8d089e01be416e0334fef6902128707cf1a85f2f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 14:45:09 -0800
Subject: [PATCH 179/521] Add test running to the docker build

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e86c7d4..9ada860 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -28,9 +28,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Build and run
+      - name: Build and test
         run: |
           docker build \
+            --target nymph_common \
             --build-arg img_repo=${BASE_IMAGE_REPO} \
             --build-arg img_tag=${BASE_IMAGE_TAG} \
             --build-arg build_type=Debug \
@@ -38,8 +39,7 @@ jobs:
             --build-arg nymph_tag=${Nymph_TAG} \
             --tag project8/nymph:${Nymph_TAG} \
             .
-
-#          docker run project8/nymph:${Nymph_TAG} /usr/local/p8/nymph/${Nymph_TAG}
+          docker run project8/nymph:${Nymph_TAG} /tmp_source/Testing/RunTests
 
 
   build:

From 8d059a3e440d1998bb7772c34771bbc39b01cfcf Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 14:53:27 -0800
Subject: [PATCH 180/521] Fixing two more mistakes in the docker build

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9ada860..d5611e5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Build and test
         run: |
           docker build \
-            --target nymph_common \
+            --target nymph_done \
             --build-arg img_repo=${BASE_IMAGE_REPO} \
             --build-arg img_tag=${BASE_IMAGE_TAG} \
             --build-arg build_type=Debug \
@@ -39,7 +39,7 @@ jobs:
             --build-arg nymph_tag=${Nymph_TAG} \
             --tag project8/nymph:${Nymph_TAG} \
             .
-          docker run project8/nymph:${Nymph_TAG} /tmp_source/Testing/RunTests
+          docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
 
 
   build:

From e1807f4f14f3583c803e4eccaeb2a5b841426ce2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 16:24:03 -0800
Subject: [PATCH 181/521] Add class revealing protected (previously private)
 methods in ProcessorToolbox for testing

---
 Library/Processor/ProcessorToolbox.hh | 14 +++++-----
 Testing/TestProcessorToolbox.cc       | 37 ++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 96a6be9..b8574b3 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -88,14 +88,14 @@ namespace Nymph
     */
     class ProcessorToolbox
     {
-        private:
+        protected:
             typedef std::unique_lock< std::mutex > unique_lock;
 
         public:
             ProcessorToolbox( const std::string& name = "processor-toolbox" );
             virtual ~ProcessorToolbox();
 
-        private:
+        protected:
             scarab::factory< Processor, const std::string& >* fProcFactory; // singleton; not owned by ProcessorToolbox
 
 
@@ -108,7 +108,7 @@ namespace Nymph
 
             MEMVAR( bool, RunSingleThreaded );
 
-        private:
+        protected:
             struct ProcessorInfo
             {
                 std::shared_ptr< Processor > fProc;
@@ -140,7 +140,7 @@ namespace Nymph
             /// Also clears the run queue
             void ClearProcessors();
 
-        private:
+        protected:
             ProcessorMap fProcMap;
 
 
@@ -170,7 +170,7 @@ namespace Nymph
             /// Remove a breakpoint from a signal
             bool RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName );
 
-        private:
+        protected:
             bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
             static const char fSigSlotNameSep = ':';
 
@@ -190,7 +190,7 @@ namespace Nymph
             /// Clear the run queue
             void ClearRunQueue();
 
-        private:
+        protected:
             struct ThreadSource
             {
                 PrimaryProcessor* fProc;
@@ -243,7 +243,7 @@ namespace Nymph
 
             //MEMVAR_SHARED_PTR_CONST( SharedControl, Control );
 
-        private:
+        protected:
             //typedef boost::shared_future< KTDataHandle > Future;
 
             //void StartSingleThreadedRun();
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 5060a21..aa6e7e9 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -17,6 +17,33 @@
 LOGGER( testlog, "TestProcessorToolbox" );
 
 
+namespace Nymph
+{
+    class ProcTBRevealer : public ProcessorToolbox
+    {
+        public:
+            using ProcessorToolbox::ProcessorToolbox;
+
+            bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
+            {
+                return ProcessorToolbox::ParseSignalSlotName( toParse, nameOfProc, nameOfSigSlot );
+            }
+
+            using ProcessorToolbox::ThreadSource;
+            using ProcessorToolbox::ThreadSourceGroup;
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
+            {
+                return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
+            }
+
+            void StartMultiThreadedRun()
+            {
+                return ProcessorToolbox::StartMultiThreadedRun();
+            }
+    };
+}
+
+
 TEST_CASE( "processor_toolbox" )
 {
     using namespace Nymph;
@@ -66,7 +93,15 @@ TEST_CASE( "processor_toolbox" )
 
     SECTION( "Connections" )
     {
-        LINFO( testlog, "Connections Tests")
+        LINFO( testlog, "Connections Tests");
+
+        std::string toParse( "proc:sigslot" );
+        std::string parsedProc, parsedSigSlot;
+
+        ProcTBRevealer revealer;
+        revealer.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
+        REQUIRE( parsedProc == "proc" );
+        REQUIRE( parsedSigSlot == "sigslot" );
 
         std::string procName1( "testproc-1" );
         std::string procName2( "testproc-2" );

From c8f046d3cd962431985f336ec59f9d960fda80fd Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 16:41:43 -0800
Subject: [PATCH 182/521] Move the test primary processor class definition to
 TestProc.hh

---
 Testing/TestPrimaryProcessor.cc | 41 ++-------------------------------
 Testing/TestProc.hh             | 38 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
index 0bb9940..4c7d659 100644
--- a/Testing/TestPrimaryProcessor.cc
+++ b/Testing/TestPrimaryProcessor.cc
@@ -5,9 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "PrimaryProcessor.hh"
-#include "Signal.hh"
-#include "Slot.hh"
+#include "TestProc.hh"
 
 #include "logger.hh"
 
@@ -15,43 +13,8 @@
 
 LOGGER( testlog, "TestPrimaryProcessor" );
 
-namespace Nymph
-{
-    // concrete processor class that we can test
-    // implements Configure() and has its own signal and slot
-    class TestPrimaryProc : public PrimaryProcessor
-    {
-        public:
-            TestPrimaryProc() :
-                    PrimaryProcessor( "test" ),
-                    fNewValue( 10 ),
-                    fValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
-            {}
-
-            virtual ~TestPrimaryProc()
-            {}
-
-            void Configure( const scarab::param_node& )
-            {
-                return;
-            }
-
-            bool Run()
-            {
-                fValueSig( fNewValue );
-                return true;
-            }
+REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
 
-            MEMVAR( int, NewValue );
-            MEMVAR( int, Value );
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-    };
-}
 
 TEST_CASE( "primary_processor", "[primary_processor]" )
 {
diff --git a/Testing/TestProc.hh b/Testing/TestProc.hh
index e733127..ce8013d 100644
--- a/Testing/TestProc.hh
+++ b/Testing/TestProc.hh
@@ -5,6 +5,7 @@
  *      Author: N.S. Oblath
  */
 
+#include "PrimaryProcessor.hh"
 #include "Processor.hh"
 #include "Signal.hh"
 #include "Slot.hh"
@@ -64,4 +65,41 @@ namespace Nymph
             return;
         }
     };
+
+
+    // concrete primary processor class that we can test
+    // implements Configure(), Run(), and has its own signal and slot
+    class TestPrimaryProc : public PrimaryProcessor
+    {
+        public:
+            TestPrimaryProc( const std::string& name = "test" ) :
+                    PrimaryProcessor( name ),
+                    fNewValue( 10 ),
+                    fValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
+            {}
+
+            virtual ~TestPrimaryProc()
+            {}
+
+            void Configure( const scarab::param_node& )
+            {
+                return;
+            }
+
+            bool Run()
+            {
+                fValueSig( fNewValue );
+                return true;
+            }
+
+            MEMVAR( int, NewValue );
+            MEMVAR( int, Value );
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+    };
+
 }

From 0a481abdea84999211fbc77f1ec072f065b0a8e5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 22 Dec 2021 16:41:59 -0800
Subject: [PATCH 183/521] Add initial RunQueue tests

---
 Testing/TestProcessorToolbox.cc | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index aa6e7e9..65747ef 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -48,7 +48,7 @@ TEST_CASE( "processor_toolbox" )
 {
     using namespace Nymph;
 
-    ProcessorToolbox toolbox;
+    ProcTBRevealer toolbox;
 
     SECTION( "AddRemoveProcessors" )
     {
@@ -98,8 +98,7 @@ TEST_CASE( "processor_toolbox" )
         std::string toParse( "proc:sigslot" );
         std::string parsedProc, parsedSigSlot;
 
-        ProcTBRevealer revealer;
-        revealer.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
+        toolbox.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
         REQUIRE( parsedProc == "proc" );
         REQUIRE( parsedSigSlot == "sigslot" );
 
@@ -146,4 +145,29 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
     }
 
+    SECTION( "RunQueue" )
+    {
+        LINFO( "RunQueue Tests" );
+
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: testprimary\n"
+            "- type: test-proc\n"
+            "  name: testproc-1\n"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE( toolbox.Configure( config->as_node() ) );
+
+        ProcTBRevealer::ThreadSourceGroup group;
+        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
+        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "testproc-1", group ) );
+        REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary", group ) );
+
+        // TODO: test public functions for RunQueue in ProcTB
+    }
+
 }

From b5d7657bbe48d137badaaf257ba6ee0d0a0ad6b9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 23 Dec 2021 02:40:04 -0800
Subject: [PATCH 184/521] RunQueue modification tests are complete

---
 Testing/TestProcessorToolbox.cc | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 65747ef..fb0a4e6 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -40,6 +40,12 @@ namespace Nymph
             {
                 return ProcessorToolbox::StartMultiThreadedRun();
             }
+
+            using ProcessorToolbox::RunQueue;
+            RunQueue& GetRunQueue()
+            {
+                return fRunQueue;
+            }
     };
 }
 
@@ -152,7 +158,9 @@ TEST_CASE( "processor_toolbox" )
         std::string config_str(
             "processors:\n"
             "- type: test-primary\n"
-            "  name: testprimary\n"
+            "  name: testprimary-1\n"
+            "- type: test-primary\n"
+            "  name: testprimary-2\n"
             "- type: test-proc\n"
             "  name: testproc-1\n"
         );
@@ -165,9 +173,27 @@ TEST_CASE( "processor_toolbox" )
         ProcTBRevealer::ThreadSourceGroup group;
         REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
         REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "testproc-1", group ) );
-        REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary", group ) );
+        REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary-1", group ) );
+        REQUIRE( group.size() == 1 );
+
+        REQUIRE_FALSE( toolbox.PushBackToRunQueue( "testproc-1" ) );
+        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-1" ) );
+        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
+        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-2" ) );
+        REQUIRE( toolbox.GetRunQueue().size() == 2 );
+        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
+        
+        toolbox.PopBackOfRunQueue();
+        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+
+        toolbox.ClearRunQueue();
+        REQUIRE( toolbox.GetRunQueue().empty() );
+        
+        REQUIRE( toolbox.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
+        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+        REQUIRE( toolbox.GetRunQueue()[0].size() == 2 );
 
-        // TODO: test public functions for RunQueue in ProcTB
     }
 
 }

From fdfb7ef2ef8e9bd0e130a4f330050313bf3b1021 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 5 Jan 2022 00:32:12 -0800
Subject: [PATCH 185/521] Added a type-indexed unordered map to the DataFrame
 class.

---
 Library/Data/DataFrame.cc |  3 ++-
 Library/Data/DataFrame.hh | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Library/Data/DataFrame.cc b/Library/Data/DataFrame.cc
index 833fdce..1224059 100644
--- a/Library/Data/DataFrame.cc
+++ b/Library/Data/DataFrame.cc
@@ -9,7 +9,8 @@
 
 namespace Nymph
 {
-    DataFrame::DataFrame()
+    DataFrame::DataFrame() :
+        fDataObjects()
     {}
 
     DataFrame::~DataFrame()
diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 8a8b62d..4fa24ef 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -9,6 +9,14 @@
 #ifndef NYMPH_DATAFRAME_HH_
 #define NYMPH_DATAFRAME_HH_
 
+#include "Data.hh"
+
+#include "MemberVariable.hh"
+
+#include <unordered_map>
+#include <memory>
+#include <typeindex>
+
 namespace Nymph
 {
 
@@ -17,6 +25,10 @@ namespace Nymph
         public:
             DataFrame();
             virtual ~DataFrame();
+
+            // typedef used to avoid problems with the comma in the MEMVAR macro
+            typedef std::unordered_map< std::type_index, std::unique_ptr<Data> > DataMap;
+            MEMVAR_REF( DataMap, DataObjects );
     };
 
 } /* namespace Nymph */

From fe90f35e7a80dec9bffe99287c0e0422c8fa5030 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 5 Jan 2022 00:32:50 -0800
Subject: [PATCH 186/521] Added Data and DataFrame to the library
 CMakeLists.txt.  Added a simple test for DataFrame.

---
 Library/CMakeLists.txt   |  6 ++++++
 Testing/CMakeLists.txt   |  1 +
 Testing/TestDataFrame.cc | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 Testing/TestDataFrame.cc

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 211e52f..53b93c7 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -20,6 +20,9 @@ include_directories( BEFORE
 set( NYMPH_HEADERFILES
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
+
+    ${DATA_DIR}/Data.hh
+    ${DATA_DIR}/DataFrame.hh
     
     ${PROC_DIR}/ControlAccess.hh
     ${PROC_DIR}/PrimaryProcessor.hh
@@ -30,6 +33,9 @@ set( NYMPH_HEADERFILES
 set( NYMPH_SOURCEFILES
     ${UTIL_DIR}/Exception.cc
 
+    ${DATA_DIR}/Data.cc
+    ${DATA_DIR}/DataFrame.cc
+    
     ${PROC_DIR}/ControlAccess.cc
     ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 29726b0..88aecbb 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -9,6 +9,7 @@ set( testing_HEADERS
 
 set( testing_SOURCES
     TestControlAccess.cc
+    TestDataFrame.cc
     TestPrimaryProcessor.cc
     TestProcessor.cc
     TestSignalSlot.cc
diff --git a/Testing/TestDataFrame.cc b/Testing/TestDataFrame.cc
new file mode 100644
index 0000000..d61096c
--- /dev/null
+++ b/Testing/TestDataFrame.cc
@@ -0,0 +1,20 @@
+/*
+ * TestDataFrame.cc
+ *
+ *  Created on: Jan 5, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "DataFrame.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "data_frame", "[data]" )
+{
+    using namespace Nymph;
+
+    DataFrame frame;
+    REQUIRE( frame.DataObjects().empty() );
+
+}

From a27fe9f0b64294623e0887be11df2a997fc73bdc Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 10 Jan 2022 16:12:59 -0800
Subject: [PATCH 187/521] Added basic data tests

---
 Testing/CMakeLists.txt     |  1 +
 Testing/TestData.cc        | 28 ++++++++++++++++++++
 Testing/TestDataClasses.hh | 54 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 Testing/TestData.cc
 create mode 100644 Testing/TestDataClasses.hh

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 88aecbb..c9324fe 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -9,6 +9,7 @@ set( testing_HEADERS
 
 set( testing_SOURCES
     TestControlAccess.cc
+    TestData.cc
     TestDataFrame.cc
     TestPrimaryProcessor.cc
     TestProcessor.cc
diff --git a/Testing/TestData.cc b/Testing/TestData.cc
new file mode 100644
index 0000000..8682488
--- /dev/null
+++ b/Testing/TestData.cc
@@ -0,0 +1,28 @@
+/*
+ * TestData.cc
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "TestDataClasses.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "data", "[data]" )
+{
+    using namespace Nymph;
+
+    TestData1 data1;
+    REQUIRE( data1.GetIValue1() == 0 );
+    REQUIRE( data1.GetIValue2() == 5 );
+
+    data1.SetIValue1( 50 );
+    REQUIRE( data1.GetIValue1() == 50 );
+
+    TestData2 data2;
+    REQUIRE( data2.GetDValue1() == Approx( 0.0 ) );
+    REQUIRE( data2.GetDValue2() == Approx( 10.0 ) );
+
+}
diff --git a/Testing/TestDataClasses.hh b/Testing/TestDataClasses.hh
new file mode 100644
index 0000000..c23650a
--- /dev/null
+++ b/Testing/TestDataClasses.hh
@@ -0,0 +1,54 @@
+/*
+ * TestDataClasses.hh
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_TESTING_TESTDATACLASSES
+#define NYMPH_TESTING_TESTDATACLASSES
+
+#include "Data.hh"
+#include "MemberVariable.hh"
+
+#include <iostream>
+namespace Nymph
+{
+    class TestData1 : public Data
+    {
+        public:
+            TestData1() :
+                    Data(),
+                    fIValue1( 0 ),
+                    fIValue2( 5 )
+            {
+                std::cerr << "in test data 1 constuctor" << std::endl;
+            }
+
+            virtual ~TestData1()
+            {}
+
+            MEMVAR( int, IValue1 );
+            MEMVAR( int, IValue2 );
+    };
+
+    class TestData2 : public Data
+    {
+        public:
+            TestData2() :
+                    Data(),
+                    fDValue1( 0. ),
+                    fDValue2( 10. )
+            {}
+
+            virtual ~TestData2()
+            {}
+
+            MEMVAR( double, DValue1 );
+            MEMVAR( double, DValue2 );
+    };
+
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_TESTING_TESTDATACLASSES */

From 49dc444ca081885aad94adefdf958436af09bea2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 10 Jan 2022 16:14:15 -0800
Subject: [PATCH 188/521] Fill out DataFrame a bit

---
 Library/Data/DataFrame.hh | 58 +++++++++++++++++++++++++++++++++++++++
 Testing/TestDataFrame.cc  | 23 +++++++++++++++-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 4fa24ef..3a3cb72 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -10,27 +10,85 @@
 #define NYMPH_DATAFRAME_HH_
 
 #include "Data.hh"
+#include "Exception.hh"
 
 #include "MemberVariable.hh"
 
+#include "typename.hh"
+
 #include <unordered_map>
 #include <memory>
 #include <typeindex>
 
 namespace Nymph
 {
+    struct DataFrameException : virtual public Exception {};
+
+    /*!
+     @class DataFrame
+
+     @author N. S. Oblath
+
+     @brief Container for Data objects used during data processing
 
+     @details
+     Individual Data objects are held in an unordered map, indexed by type.
+
+    */
     class DataFrame
     {
         public:
             DataFrame();
             virtual ~DataFrame();
 
+            /// Returns true if object of type XData exists in the frame; returns false otherwise
+            template< typename XData >
+            bool Has() const;
+
+            /// Returns a reference to the object of type XData if it exists in the frame.
+            /// Creates and returns a reference to an object of type XData if it does not exist.
+            template< typename XData >
+            XData& Get();
+
+            /// Returns a reference to the object of type XData if it exists in the frame.
+            /// Throws DataFrameException if it does not exist.
+            template< typename XData >
+            const XData& Get() const;
+
             // typedef used to avoid problems with the comma in the MEMVAR macro
             typedef std::unordered_map< std::type_index, std::unique_ptr<Data> > DataMap;
             MEMVAR_REF( DataMap, DataObjects );
     };
 
+
+    template< typename XData >
+    bool DataFrame::Has() const
+    {
+        return fDataObjects.count( typeid(XData) ) != 0;
+    }
+
+    template< typename XData >
+    XData& DataFrame::Get()
+    {
+        if( Has< XData >() )
+        {
+            return static_cast< XData& >( *fDataObjects[typeid(XData)] );
+        }
+
+        fDataObjects[ typeid(XData) ].reset( new XData() );
+        return static_cast< XData& >( *fDataObjects[typeid(XData)] );
+    }
+
+    template< typename XData >
+    const XData& DataFrame::Get() const
+    {
+        if( Has< XData >() )
+        {
+            return static_cast< const XData& >( *fDataObjects.at(typeid(XData) ));
+        }
+        BOOST_THROW_EXCEPTION( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" << eom );
+    }
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_DATAFRAME_HH_ */
diff --git a/Testing/TestDataFrame.cc b/Testing/TestDataFrame.cc
index d61096c..290e350 100644
--- a/Testing/TestDataFrame.cc
+++ b/Testing/TestDataFrame.cc
@@ -1,10 +1,12 @@
 /*
  * TestDataFrame.cc
  *
- *  Created on: Jan 5, 2022
+ *  Created on: Jan 6, 2022
  *      Author: N.S. Oblath
  */
 
+#include "TestDataClasses.hh"
+
 #include "DataFrame.hh"
 
 #include "catch.hpp"
@@ -15,6 +17,25 @@ TEST_CASE( "data_frame", "[data]" )
     using namespace Nymph;
 
     DataFrame frame;
+    const DataFrame& cFrame = frame;
+
     REQUIRE( frame.DataObjects().empty() );
+    REQUIRE_FALSE( frame.Has< TestData1 >() );
+    REQUIRE_FALSE( frame.Has< TestData2 >() );
+
+    // create a data object  with Get()
+    TestData1& data1 = frame.Get< TestData1 >();
+    REQUIRE( frame.Has< TestData1 >() );
+    // ensure TestData1 object was initialized correctly
+    REQUIRE( data1.GetIValue1() == 0 );
+    REQUIRE( data1.GetIValue2() == 5 );
+
+    // make sure that we haven't made a copy of the data object
+    data1.SetIValue1( 50 );
+    REQUIRE( data1.GetIValue1() == 50 );
+    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 50 );
 
+    // check const access
+    REQUIRE( cFrame.Get< TestData1 >().GetIValue1() == 50 );
+    REQUIRE_THROWS_AS( cFrame.Get< TestData2 >(), DataFrameException );
 }

From d3a2fb9476ea250f4791b3c3eafa832c3a781807 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 10 Jan 2022 16:14:24 -0800
Subject: [PATCH 189/521] Add basic exception testing

---
 Testing/CMakeLists.txt   |  1 +
 Testing/TestException.cc | 35 ++++++++++++++++
 Testing/TestExt.cc       | 88 ----------------------------------------
 3 files changed, 36 insertions(+), 88 deletions(-)
 create mode 100644 Testing/TestException.cc
 delete mode 100644 Testing/TestExt.cc

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c9324fe..08cdc80 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -11,6 +11,7 @@ set( testing_SOURCES
     TestControlAccess.cc
     TestData.cc
     TestDataFrame.cc
+    TestException.cc
     TestPrimaryProcessor.cc
     TestProcessor.cc
     TestSignalSlot.cc
diff --git a/Testing/TestException.cc b/Testing/TestException.cc
new file mode 100644
index 0000000..69511d9
--- /dev/null
+++ b/Testing/TestException.cc
@@ -0,0 +1,35 @@
+/*
+ * TestException.cc
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "Exception.hh"
+
+#include "catch.hpp"
+
+#include "logger.hh"
+
+LOGGER( testlog, "TestException" );
+
+TEST_CASE( "exception", "[utility]" )
+{
+    using namespace Nymph;
+
+    auto throwException = []() {
+        BOOST_THROW_EXCEPTION( Exception() << "Test exception" << eom );
+    };
+
+    REQUIRE_THROWS_AS( throwException(), Exception );
+
+    try
+    {
+        throwException();
+    }
+    catch(const Exception& e)
+    {
+        LWARN( testlog, diagnostic_information(e) );
+    }
+    
+}
diff --git a/Testing/TestExt.cc b/Testing/TestExt.cc
deleted file mode 100644
index 9521af1..0000000
--- a/Testing/TestExt.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * TestExt.cc
- *
- *  Created on: Aug 23, 2019
- *      Author: N.S. Oblath
- */
-
-#include "KTExtensible.hh"
-
-#include "catch.hpp"
-
-namespace Nymph
-{
-    class MyBaseClass
-    {
-        public:
-            MyBaseClass() {}
-            virtual ~MyBaseClass() {}
-    };
-
-    class MyClass1 : public KTExtensible< MyClass1, MyBaseClass >
-    {
-        public:
-            MyClass1() : KTExtensible< MyClass1, MyBaseClass >(), fValue() {}
-            MyClass1( const MyClass1& orig ) : KTExtensible< MyClass1, MyBaseClass >( orig ), fValue( orig.fValue ) {}
-            virtual ~MyClass1() {};
-        public:
-            int fValue;
-    };
-
-    class MyClass2 : public KTExtensible< MyClass2, MyBaseClass >
-    {
-        public:
-            MyClass2() : KTExtensible< MyClass2, MyBaseClass >(), fValue() {}
-            MyClass2( const MyClass2& orig ) : KTExtensible< MyClass2, MyBaseClass >( orig ), fValue( orig.fValue ) {}
-            virtual ~MyClass2() {};
-        public:
-            int fValue;
-    };
-
-}
-
-TEST_CASE( "extensible", "[utility]" )
-{
-    using namespace Nymph;
-
-    std::shared_ptr< MyClass1 > data1 = std::make_shared< MyClass1 >();
-    data1->fValue = 5;
-
-    MyClass2& data2 = data1->Of< MyClass2 >();
-    data2.fValue = 3;
-
-    std::shared_ptr< MyClass2 > data2Shared = data1->Share< MyClass2 >();
-
-    SECTION( "Basic extensibility and values" )
-    {
-        REQUIRE( data1->Has< MyClass1 >() );
-        REQUIRE( data1->Has< MyClass2 >() );
-        REQUIRE_FALSE( data2.Has< MyClass1 >() );
-        REQUIRE( data2.Has< MyClass2 >() );
-
-        REQUIRE( data1->fValue == 5 );
-        REQUIRE( data2.fValue == 3 );
-
-        REQUIRE( data2Shared->fValue == 3 );
-
-        REQUIRE( data1->size() == 2 );
-        REQUIRE( data2.size() == 1 );
-    }
-
-    std::shared_ptr< MyClass1 > copyOfData1 = std::make_shared< MyClass1 >( *data1 );
-    MyClass2& copyOfData2 = copyOfData1->Of< MyClass2 >();
-
-    SECTION( "Copying data" )
-    {
-        REQUIRE( copyOfData1->fValue == data1->fValue );
-        REQUIRE_FALSE( copyOfData1 == data1 );
-        REQUIRE( copyOfData2.fValue == data2.fValue );
-    }
-
-    std::shared_ptr< MyClass2 > detatchedCopyOfData2 = copyOfData1->Detatch< MyClass2 >();
-
-    SECTION( "Detatching" )
-    {
-        REQUIRE( copyOfData1->size() == 1 );
-        REQUIRE( detatchedCopyOfData2->size() == 1 );
-    }
-}

From 9af5c06a741b4ef74f5a292415b3adc4348e307c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 10 Jan 2022 16:14:24 -0800
Subject: [PATCH 190/521] Add basic exception testing

---
 Testing/CMakeLists.txt   |  1 +
 Testing/TestException.cc | 35 ++++++++++++++++
 Testing/TestExt.cc       | 88 ----------------------------------------
 3 files changed, 36 insertions(+), 88 deletions(-)
 create mode 100644 Testing/TestException.cc
 delete mode 100644 Testing/TestExt.cc

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 29726b0..da40e68 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -9,6 +9,7 @@ set( testing_HEADERS
 
 set( testing_SOURCES
     TestControlAccess.cc
+    TestException.cc
     TestPrimaryProcessor.cc
     TestProcessor.cc
     TestSignalSlot.cc
diff --git a/Testing/TestException.cc b/Testing/TestException.cc
new file mode 100644
index 0000000..69511d9
--- /dev/null
+++ b/Testing/TestException.cc
@@ -0,0 +1,35 @@
+/*
+ * TestException.cc
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "Exception.hh"
+
+#include "catch.hpp"
+
+#include "logger.hh"
+
+LOGGER( testlog, "TestException" );
+
+TEST_CASE( "exception", "[utility]" )
+{
+    using namespace Nymph;
+
+    auto throwException = []() {
+        BOOST_THROW_EXCEPTION( Exception() << "Test exception" << eom );
+    };
+
+    REQUIRE_THROWS_AS( throwException(), Exception );
+
+    try
+    {
+        throwException();
+    }
+    catch(const Exception& e)
+    {
+        LWARN( testlog, diagnostic_information(e) );
+    }
+    
+}
diff --git a/Testing/TestExt.cc b/Testing/TestExt.cc
deleted file mode 100644
index 9521af1..0000000
--- a/Testing/TestExt.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * TestExt.cc
- *
- *  Created on: Aug 23, 2019
- *      Author: N.S. Oblath
- */
-
-#include "KTExtensible.hh"
-
-#include "catch.hpp"
-
-namespace Nymph
-{
-    class MyBaseClass
-    {
-        public:
-            MyBaseClass() {}
-            virtual ~MyBaseClass() {}
-    };
-
-    class MyClass1 : public KTExtensible< MyClass1, MyBaseClass >
-    {
-        public:
-            MyClass1() : KTExtensible< MyClass1, MyBaseClass >(), fValue() {}
-            MyClass1( const MyClass1& orig ) : KTExtensible< MyClass1, MyBaseClass >( orig ), fValue( orig.fValue ) {}
-            virtual ~MyClass1() {};
-        public:
-            int fValue;
-    };
-
-    class MyClass2 : public KTExtensible< MyClass2, MyBaseClass >
-    {
-        public:
-            MyClass2() : KTExtensible< MyClass2, MyBaseClass >(), fValue() {}
-            MyClass2( const MyClass2& orig ) : KTExtensible< MyClass2, MyBaseClass >( orig ), fValue( orig.fValue ) {}
-            virtual ~MyClass2() {};
-        public:
-            int fValue;
-    };
-
-}
-
-TEST_CASE( "extensible", "[utility]" )
-{
-    using namespace Nymph;
-
-    std::shared_ptr< MyClass1 > data1 = std::make_shared< MyClass1 >();
-    data1->fValue = 5;
-
-    MyClass2& data2 = data1->Of< MyClass2 >();
-    data2.fValue = 3;
-
-    std::shared_ptr< MyClass2 > data2Shared = data1->Share< MyClass2 >();
-
-    SECTION( "Basic extensibility and values" )
-    {
-        REQUIRE( data1->Has< MyClass1 >() );
-        REQUIRE( data1->Has< MyClass2 >() );
-        REQUIRE_FALSE( data2.Has< MyClass1 >() );
-        REQUIRE( data2.Has< MyClass2 >() );
-
-        REQUIRE( data1->fValue == 5 );
-        REQUIRE( data2.fValue == 3 );
-
-        REQUIRE( data2Shared->fValue == 3 );
-
-        REQUIRE( data1->size() == 2 );
-        REQUIRE( data2.size() == 1 );
-    }
-
-    std::shared_ptr< MyClass1 > copyOfData1 = std::make_shared< MyClass1 >( *data1 );
-    MyClass2& copyOfData2 = copyOfData1->Of< MyClass2 >();
-
-    SECTION( "Copying data" )
-    {
-        REQUIRE( copyOfData1->fValue == data1->fValue );
-        REQUIRE_FALSE( copyOfData1 == data1 );
-        REQUIRE( copyOfData2.fValue == data2.fValue );
-    }
-
-    std::shared_ptr< MyClass2 > detatchedCopyOfData2 = copyOfData1->Detatch< MyClass2 >();
-
-    SECTION( "Detatching" )
-    {
-        REQUIRE( copyOfData1->size() == 1 );
-        REQUIRE( detatchedCopyOfData2->size() == 1 );
-    }
-}

From 68a37159c39b11d6c0685fea6eb444263982413b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 02:36:03 -0800
Subject: [PATCH 191/521] Swapped out boost::exception for a simplified
 exception system that records file and line number of the throw with macros.

---
 Library/CMakeLists.txt         |   2 +-
 Library/Processor/Processor.cc |  38 ++++++------
 Library/Processor/Signal.hh    |   6 +-
 Library/Utility/Exception.cc   |   5 +-
 Library/Utility/Exception.hh   |  91 ++++++++++++++++++++++++++---
 Testing/TestException.cc       | 103 ++++++++++++++++++++++++++++++++-
 6 files changed, 211 insertions(+), 34 deletions(-)

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 211e52f..2287e43 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -28,7 +28,7 @@ set( NYMPH_HEADERFILES
 )
 
 set( NYMPH_SOURCEFILES
-    ${UTIL_DIR}/Exception.cc
+    #${UTIL_DIR}/Exception.cc
 
     ${PROC_DIR}/ControlAccess.cc
     ${PROC_DIR}/PrimaryProcessor.cc
diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 4a56b47..7aa6ac6 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -68,15 +68,19 @@ namespace Nymph
         SigMapIt signalIt = fSignals.find(signalName);
         if( signalIt == fSignals.end() )
         {
-            BOOST_THROW_EXCEPTION( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
-                                                        "You may have the signal name wrong." << eom );
+            //throw EXCEPT_HERE(SignalException()) << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
+            //                                        "You may have the signal name wrong.";
+//       BOOST_THROW_EXCEPTION( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
+//                                                        "You may have the signal name wrong." << eom );
         }
 
         SlotMapIt slotIt = processor.fSlots.find(slotName);
         if( slotIt == processor.fSlots.end() )
         {
-            BOOST_THROW_EXCEPTION( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
-                                                      "You may have the slot name wrong." << eom );
+            //throw EXCEPT_HERE(SlotException()) << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
+            //                                      "You may have the slot name wrong.";
+//            BOOST_THROW_EXCEPTION( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
+//                                                      "You may have the slot name wrong." << eom );
         }
 
         try
@@ -86,26 +90,22 @@ namespace Nymph
         }
         catch( SignalException& e )
         {
-            e << ErrorMsgInfo< struct proc_Sig_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
-            e << ErrorMsgInfo< struct proc_Sig_1 >( "You may have the signal name wrong." );
-            throw;
+            //std::throw_with_nested( EXCEPT_HERE(SignalException()) << "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem with the signal." <<
+            //                                                          "  You may have the signal name wrong." );
         }
         catch( SlotException& e )
         {
-            e << ErrorMsgInfo< struct proc_Slot_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
-            e << ErrorMsgInfo< struct proc_Slot_1 >( "You may have the slot name wrong." );
-            throw;
+            //std::throw_with_nested( EXCEPT_HERE(SlotException()) << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." <<
+            //                                                        "  You may have the slot name wrong." );
         }
         catch( ConnectionException& e )
         {
-            e << ErrorMsgInfo< struct proc_Conn_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
-            e << ErrorMsgInfo< struct proc_Conn_1 >( "Check that the signatures of the signal and slot match exactly." );
-            throw;
+            //std::throw_with_nested( EXCEPT_HERE(ConnectionException()) <<  "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem making the connection." <<
+            //                                                               "  Check that the signatures of the signal and slot match exactly." );
         }
-        catch( boost::exception& e )
+        catch( std::exception& e )
         {
-            e << ErrorMsgInfo< struct proc_Unkn >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
-            throw;
+            //std::throw_with_nested( EXCEPT_HERE(Exception()) <<  "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
         }
 
         LDEBUG(processorlog, "Connected signal <" << this->Name() << ":" << signalName << "> to slot <" << processor.Name() << ":" << slotName << ">");
@@ -117,11 +117,13 @@ namespace Nymph
     {
         if( ! signal )
         {
-            BOOST_THROW_EXCEPTION( SignalException() << "Signal pointer was NULL" << eom );
+            //throw EXCEPT_HERE(SignalException()) << "Signal pointer was NULL";
+//            BOOST_THROW_EXCEPTION( SignalException() << "Signal pointer was NULL" << eom );
         }
         if( ! slot )
         {
-            BOOST_THROW_EXCEPTION( SlotException() << "Slot pointer was NULL" << eom );
+            //throw EXCEPT_HERE(SlotException()) << "Slot pointer was NULL";
+//            BOOST_THROW_EXCEPTION( SlotException() << "Slot pointer was NULL" << eom );
         }
 
         signal->Connect(slot, groupNum);
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 27109b7..1db64c8 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -141,9 +141,9 @@ namespace Nymph
         // ensure that the slot is of the correct type
         if( ! dynamic_cast< Slot< XArgs... >* >( slot ) )
         {
-            BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
-                    "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
-                    "\tArgument types do not match" << eom );
+            //BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+            //        "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
+            //        "\tArgument types do not match" << eom );
         }
 /*
         Connection connection;
diff --git a/Library/Utility/Exception.cc b/Library/Utility/Exception.cc
index 6770e91..d7fa0bb 100644
--- a/Library/Utility/Exception.cc
+++ b/Library/Utility/Exception.cc
@@ -10,6 +10,9 @@
 namespace Nymph
 {
 
+
+
+/* removed for trying home-grown exceptions, 1/10/22
     Exception::Exception() :
             boost::exception(),
             std::exception(),
@@ -26,5 +29,5 @@ namespace Nymph
     Exception::~Exception() throw ()
     {
     }
-
+*/
 }
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index cc7c542..a97446c 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -9,16 +9,89 @@
 #ifndef NYMPH_EXCEPTION_HH_
 #define NYMPH_EXCEPTION_HH_
 
-#include "macros.hh"
+#include "MemberVariable.hh"
 
-#include <boost/exception/all.hpp>
+#include "base_exception.hh"
 
-#include <exception>
-#include <sstream>
-#include <string>
+//#include <boost/exception/all.hpp>
+
+//#include <exception>
+//#include <sstream>
+//#include <string>
 
 namespace Nymph
 {
+
+    template< typename XDerived >
+    class BaseException : public scarab::base_exception< XDerived >
+    {
+        public:
+            BaseException();
+            BaseException( const std::string& filename, int lineNum );
+            ~BaseException() noexcept;
+
+            XDerived& operator()( const std::string& filename, int lineNum );
+            XDerived& operator%( const std::string& filename );
+            XDerived& operator%( int lineNum );
+
+            MEMVAR_REF( std::string, AtFilename );
+            MEMVAR( int, AtLineNumber );
+    };
+
+    class Exception : public BaseException< Exception >
+    {
+        public:
+            using BaseException< Exception >::BaseException;
+            ~Exception() = default;
+    };
+
+#define CREATE_EXCEPT_HERE( anException )  anException( __FILE__, __LINE__ )
+#define EXCEPT_HERE( anException )  (anException)( __FILE__, __LINE__ )
+
+#define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( Exception() << "test message" )
+
+    template< typename XDerived >
+    BaseException< XDerived >::BaseException() :
+            scarab::base_exception< XDerived >(),
+            fAtFilename( "unknown" ),
+            fAtLineNumber( 0 )
+    {}
+
+    template< typename XDerived >
+    BaseException< XDerived >::BaseException( const std::string& filename, int lineNumber ) :
+            scarab::base_exception< XDerived >(),
+            fAtFilename( filename ),
+            fAtLineNumber( lineNumber )
+    {}
+
+    template< typename XDerived >
+    BaseException< XDerived >::~BaseException() noexcept
+    {}
+
+    template< typename XDerived >
+    XDerived& BaseException< XDerived >::operator()( const std::string& filename, int lineNumber )
+    {
+        fAtFilename = filename;
+        fAtLineNumber = lineNumber;
+        return *static_cast< XDerived* >(this);
+    }
+
+    template< typename XDerived >
+    XDerived& BaseException< XDerived >::operator%( const std::string& filename )
+    {
+        fAtFilename = filename;
+        return *static_cast< XDerived* >(this);
+    }
+
+    template< typename XDerived >
+    XDerived& BaseException< XDerived >::operator%( int lineNum )
+    {
+        fAtLineNumber = lineNum;
+        return *static_cast< XDerived* >(this);
+    }
+
+
+/* removed for trying home-grown exceptions, 1/10/22
     struct MessageEnd {};
     static const MessageEnd eom = MessageEnd();
 
@@ -26,8 +99,8 @@ namespace Nymph
 
     template< class XLabel >
     using ErrorMsgInfo = boost::error_info< XLabel, std::string>;
-
-    /*!
+*/
+    /* // removed for trying home-grown exceptions, 1/10/22
      @class Exception
      @author N.S. Oblath
 
@@ -68,7 +141,7 @@ namespace Nymph
           ERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
       }
     */
-
+/* removed for trying home-grown exceptions, 1/10/22
     class Exception : virtual public boost::exception, virtual public std::exception
     {
         public:
@@ -121,7 +194,7 @@ namespace Nymph
         }
         return *this;
     }
-
+*/
 }
 
 #endif /* NYMPH_EXCEPTION_HH_ */
diff --git a/Testing/TestException.cc b/Testing/TestException.cc
index 69511d9..4e6c032 100644
--- a/Testing/TestException.cc
+++ b/Testing/TestException.cc
@@ -17,6 +17,106 @@ TEST_CASE( "exception", "[utility]" )
 {
     using namespace Nymph;
 
+    Exception blankEx;
+    REQUIRE( blankEx.what() == std::string() );
+    REQUIRE( blankEx.AtFilename() == "unknown" );
+    REQUIRE( blankEx.GetAtLineNumber() == 0 );
+
+    Exception testEx( "some_file", 1 );
+    REQUIRE( testEx.AtFilename() == "some_file" );
+    REQUIRE( testEx.GetAtLineNumber() == 1 );
+
+    std::string testMessage("test message 2: ");
+    int testInt = 5;
+    testEx << testMessage << testInt;
+    REQUIRE( testEx.what() == testMessage + std::to_string(testInt) );
+
+    /*EXCEPT_HERE( Exception testEx );*/ 
+    // uses of __LINE__ need to be on the same line
+    testEx( __FILE__, __LINE__ ); std::string recordFile( __FILE__ ); int recordLine( __LINE__ );
+    LWARN( testlog, "recorded file: " << recordFile );
+    LWARN( testlog, "recorded line: " << recordLine );
+    REQUIRE( testEx.AtFilename() == recordFile );
+    REQUIRE( testEx.GetAtLineNumber() == recordLine );
+
+    EXCEPT_HERE( testEx ); recordFile = std::string(__FILE__); recordLine = __LINE__;
+    REQUIRE( testEx.AtFilename() == recordFile );
+    REQUIRE( testEx.GetAtLineNumber() == recordLine );
+}
+
+TEST_CASE( "throw", "[utility]" )
+{
+    using namespace Nymph;
+
+    try
+    {
+        throw Exception();
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string() );
+        REQUIRE( e.AtFilename() == "unknown" );
+        REQUIRE( e.GetAtLineNumber() == 0 );
+    }
+    
+    std::string recordFile;
+    int recordLine = 0;
+
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        throw Exception( __FILE__, __LINE__ ) << "test message";
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string("test message") );
+        REQUIRE( e.AtFilename() == recordFile );
+        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+    // Give CREATE_EXCEPT_HERE the class name
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        throw CREATE_EXCEPT_HERE( Exception );
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string() );
+        REQUIRE( e.AtFilename() == recordFile );
+        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+    // Give EXCEPT_HERE an exception
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        throw EXCEPT_HERE( Exception() << "test message" );
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string("test message") );
+        REQUIRE( e.AtFilename() == recordFile );
+        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+    // THROW macro
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        THROW_EXCEPT_HERE( Exception() << "test message" );
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string("test message") );
+        REQUIRE( e.AtFilename() == recordFile );
+        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+
+}
+
+/* removed for trying home-grown exceptions, 1/10/22
     auto throwException = []() {
         BOOST_THROW_EXCEPTION( Exception() << "Test exception" << eom );
     };
@@ -31,5 +131,4 @@ TEST_CASE( "exception", "[utility]" )
     {
         LWARN( testlog, diagnostic_information(e) );
     }
-    
-}
+*/  

From ff80c02129fb6898576de37c59fda81cd86ca9fd Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 11:14:18 -0800
Subject: [PATCH 192/521] Demonstrate nested exception use

---
 Testing/TestException.cc | 78 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/Testing/TestException.cc b/Testing/TestException.cc
index 4e6c032..b3bb77a 100644
--- a/Testing/TestException.cc
+++ b/Testing/TestException.cc
@@ -113,7 +113,85 @@ TEST_CASE( "throw", "[utility]" )
         REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
     }
     
+}
+
+const unsigned layers = 5;
+const std::string firstThrowText( "First throw" );
+const std::string nestedThrowText( "nested throw at layer " );
+
+void CatchThrow() 
+{
+    //const static unsigned layers = 5;
+    static unsigned count = 0;
+
+    try
+    {
+        if( count == layers )
+        {
+            throw CREATE_EXCEPT_HERE( Nymph::Exception ) << firstThrowText;
+        }
+        else
+        {
+            ++count;
+            CatchThrow();
+            return;
+        }
+    }
+    catch(const Nymph::Exception& e)
+    {
+        if( count == layers )
+        {
+            REQUIRE( e.what() == firstThrowText );
+        }
+        else
+        {
+            std::string what( e.what() );
+            REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
+        }
+        std::throw_with_nested( EXCEPT_HERE( Nymph::Exception() << nestedThrowText << count-- ) );
+    }
+}
+
+// recursive print function
+void PrintException( const Nymph::Exception& e, unsigned count = 0 )
+{
+    LINFO( testlog, std::string(count, ' ') << "Exception: " << e.what() );
+    if( count == layers + 1 )
+    {
+        REQUIRE( e.what() == firstThrowText );
+    }
+    else
+    {
+        std::string what( e.what() );
+        REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
+    }
+
+    try
+    {
+        std::rethrow_if_nested( e );
+    }
+    catch(const Nymph::Exception& e)
+    {
+        PrintException( e, ++count );
+    }
+    return;
+}
+
+
+TEST_CASE( "nested_throw", "[utility]" )
+{
+    using namespace Nymph;
 
+    try
+    {
+        CatchThrow();
+    }
+    catch(const Exception& e)
+    {
+
+        PrintException(e);
+    }
+    
 }
 
 /* removed for trying home-grown exceptions, 1/10/22

From 4aabd9fe209151e236bb705c24219c71dd858879 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 11:32:14 -0800
Subject: [PATCH 193/521] Fix THROW_EXCEPT_HERE  and add
 THROW_NESTED_EXCEPT_HERE

---
 Library/Utility/Exception.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index a97446c..9c4cc78 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -48,7 +48,8 @@ namespace Nymph
 #define CREATE_EXCEPT_HERE( anException )  anException( __FILE__, __LINE__ )
 #define EXCEPT_HERE( anException )  (anException)( __FILE__, __LINE__ )
 
-#define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( Exception() << "test message" )
+#define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( anException )
+#define THROW_NESTED_EXCEPT_HERE( anException ) std::throw_with_nested( EXCEPT_HERE( anException ) )
 
     template< typename XDerived >
     BaseException< XDerived >::BaseException() :

From ed3c820c7b049d5fbef3626f426c901c21f96461 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 11:32:35 -0800
Subject: [PATCH 194/521] Update exception throwing in Processor and Signal

---
 Library/Processor/Processor.cc | 26 +++++++++++++-------------
 Library/Processor/Signal.hh    |  4 ++++
 Testing/TestException.cc       |  4 +---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 7aa6ac6..53232f1 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -68,8 +68,8 @@ namespace Nymph
         SigMapIt signalIt = fSignals.find(signalName);
         if( signalIt == fSignals.end() )
         {
-            //throw EXCEPT_HERE(SignalException()) << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
-            //                                        "You may have the signal name wrong.";
+            THROW_EXCEPT_HERE( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
+                                                    "You may have the signal name wrong." );
 //       BOOST_THROW_EXCEPTION( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
 //                                                        "You may have the signal name wrong." << eom );
         }
@@ -77,8 +77,8 @@ namespace Nymph
         SlotMapIt slotIt = processor.fSlots.find(slotName);
         if( slotIt == processor.fSlots.end() )
         {
-            //throw EXCEPT_HERE(SlotException()) << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
-            //                                      "You may have the slot name wrong.";
+            THROW_EXCEPT_HERE( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
+                                                  "You may have the slot name wrong." );
 //            BOOST_THROW_EXCEPTION( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
 //                                                      "You may have the slot name wrong." << eom );
         }
@@ -90,22 +90,22 @@ namespace Nymph
         }
         catch( SignalException& e )
         {
-            //std::throw_with_nested( EXCEPT_HERE(SignalException()) << "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem with the signal." <<
-            //                                                          "  You may have the signal name wrong." );
+            THROW_NESTED_EXCEPT_HERE( SignalException() << "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem with the signal." <<
+                                                           "\tYou may have the signal name wrong." );
         }
         catch( SlotException& e )
         {
-            //std::throw_with_nested( EXCEPT_HERE(SlotException()) << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." <<
-            //                                                        "  You may have the slot name wrong." );
+            THROW_NESTED_EXCEPT_HERE( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." <<
+                                                         "\tYou may have the slot name wrong." );
         }
         catch( ConnectionException& e )
         {
-            //std::throw_with_nested( EXCEPT_HERE(ConnectionException()) <<  "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem making the connection." <<
-            //                                                               "  Check that the signatures of the signal and slot match exactly." );
+            THROW_NESTED_EXCEPT_HERE( ConnectionException() <<  "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem making the connection." <<
+                                                                "\tCheck that the signatures of the signal and slot match exactly." );
         }
         catch( std::exception& e )
         {
-            //std::throw_with_nested( EXCEPT_HERE(Exception()) <<  "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
+            THROW_NESTED_EXCEPT_HERE( Exception() <<  "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
         }
 
         LDEBUG(processorlog, "Connected signal <" << this->Name() << ":" << signalName << "> to slot <" << processor.Name() << ":" << slotName << ">");
@@ -117,12 +117,12 @@ namespace Nymph
     {
         if( ! signal )
         {
-            //throw EXCEPT_HERE(SignalException()) << "Signal pointer was NULL";
+            THROW_EXCEPT_HERE( SignalException() << "Signal pointer was NULL" );
 //            BOOST_THROW_EXCEPTION( SignalException() << "Signal pointer was NULL" << eom );
         }
         if( ! slot )
         {
-            //throw EXCEPT_HERE(SlotException()) << "Slot pointer was NULL";
+            THROW_EXCEPT_HERE( SlotException() << "Slot pointer was NULL" );
 //            BOOST_THROW_EXCEPTION( SlotException() << "Slot pointer was NULL" << eom );
         }
 
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 1db64c8..6853007 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -141,6 +141,10 @@ namespace Nymph
         // ensure that the slot is of the correct type
         if( ! dynamic_cast< Slot< XArgs... >* >( slot ) )
         {
+            THROW_EXCEPT_HERE( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+                    "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
+                    "\tArgument types do not match" );
+
             //BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
             //        "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
             //        "\tArgument types do not match" << eom );
diff --git a/Testing/TestException.cc b/Testing/TestException.cc
index b3bb77a..cf08f8e 100644
--- a/Testing/TestException.cc
+++ b/Testing/TestException.cc
@@ -34,8 +34,6 @@ TEST_CASE( "exception", "[utility]" )
     /*EXCEPT_HERE( Exception testEx );*/ 
     // uses of __LINE__ need to be on the same line
     testEx( __FILE__, __LINE__ ); std::string recordFile( __FILE__ ); int recordLine( __LINE__ );
-    LWARN( testlog, "recorded file: " << recordFile );
-    LWARN( testlog, "recorded line: " << recordLine );
     REQUIRE( testEx.AtFilename() == recordFile );
     REQUIRE( testEx.GetAtLineNumber() == recordLine );
 
@@ -148,7 +146,7 @@ void CatchThrow()
             std::string what( e.what() );
             REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
         }
-        std::throw_with_nested( EXCEPT_HERE( Nymph::Exception() << nestedThrowText << count-- ) );
+        THROW_NESTED_EXCEPT_HERE( Nymph::Exception() << nestedThrowText << count-- ) ;
     }
 }
 

From 0ec8b666ae2515198bea60a2469ecaa08d63a0d7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 14:31:36 -0800
Subject: [PATCH 195/521] Updated Catch2 to v2.13.8

---
 Testing/Catch/catch.hpp | 10391 +++++++++++++++++++++++++++-----------
 1 file changed, 7499 insertions(+), 2892 deletions(-)

diff --git a/Testing/Catch/catch.hpp b/Testing/Catch/catch.hpp
index bdc2f74..db1fed3 100644
--- a/Testing/Catch/catch.hpp
+++ b/Testing/Catch/catch.hpp
@@ -1,9 +1,9 @@
 /*
- *  Catch v2.3.0
- *  Generated: 2018-07-23 10:09:14.936841
+ *  Catch v2.13.8
+ *  Generated: 2022-01-03 21:20:09.589503
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2018 Two Blue Cubes Ltd. All rights reserved.
+ *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
  *
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -14,8 +14,8 @@
 
 
 #define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 3
-#define CATCH_VERSION_PATCH 0
+#define CATCH_VERSION_MINOR 13
+#define CATCH_VERSION_PATCH 8
 
 #ifdef __clang__
 #    pragma clang system_header
@@ -36,10 +36,11 @@
 #       pragma clang diagnostic ignored "-Wcovered-switch-default"
 #    endif
 #elif defined __GNUC__
-     // GCC likes to warn on REQUIREs, and we cannot suppress them
-     // locally because g++'s support for _Pragma is lacking in older,
-     // still supported, versions
-#    pragma GCC diagnostic ignored "-Wparentheses"
+     // Because REQUIREs trigger GCC's -Wparentheses, and because still
+     // supported version of g++ have only buggy support for _Pragmas,
+     // Wparentheses have to be suppressed globally.
+#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
 #    pragma GCC diagnostic push
 #    pragma GCC diagnostic ignored "-Wunused-variable"
 #    pragma GCC diagnostic ignored "-Wpadded"
@@ -65,13 +66,16 @@
 #if !defined(CATCH_CONFIG_IMPL_ONLY)
 // start catch_platform.h
 
+// See e.g.:
+// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
 #ifdef __APPLE__
-# include <TargetConditionals.h>
-# if TARGET_OS_OSX == 1
-#  define CATCH_PLATFORM_MAC
-# elif TARGET_OS_IPHONE == 1
-#  define CATCH_PLATFORM_IPHONE
-# endif
+#  include <TargetConditionals.h>
+#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
+      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
+#    define CATCH_PLATFORM_MAC
+#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
+#    define CATCH_PLATFORM_IPHONE
+#  endif
 
 #elif defined(linux) || defined(__linux) || defined(__linux__)
 #  define CATCH_PLATFORM_LINUX
@@ -108,6 +112,7 @@ namespace Catch {
 // CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
 // CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
 // CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
 // ****************
 // Note to maintainers: if new toggles are added please document them
 // in configuration.md, too
@@ -120,40 +125,61 @@ namespace Catch {
 
 #ifdef __cplusplus
 
-#  if __cplusplus >= 201402L
+#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
 #    define CATCH_CPP14_OR_GREATER
 #  endif
 
-#  if __cplusplus >= 201703L
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
 #    define CATCH_CPP17_OR_GREATER
 #  endif
 
 #endif
 
-#if defined(CATCH_CPP17_OR_GREATER)
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+// Only GCC compiler should be used in this block, so other compilers trying to
+// mask themselves as GCC should be ignored.
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
+
 #endif
 
-#ifdef __clang__
+#if defined(__clang__)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
+// which results in calls to destructors being emitted for each temporary,
+// without a matching initialization. In practice, this can result in something
+// like `std::string::~string` being called on an uninitialized value.
+//
+// For example, this code will likely segfault under IBM XL:
+// ```
+// REQUIRE(std::string("12") + "34" == "1234")
+// ```
+//
+// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
+#  if !defined(__ibmxl__) && !defined(__CUDACC__)
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
+#  endif
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
 
-#       define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-            _Pragma( "clang diagnostic push" ) \
-            _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
-            _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
-#       define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
-            _Pragma( "clang diagnostic pop" )
-
-#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            _Pragma( "clang diagnostic push" ) \
-            _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-#       define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
-            _Pragma( "clang diagnostic pop" )
-
-#       define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-            _Pragma( "clang diagnostic push" ) \
-            _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
-#       define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS \
-            _Pragma( "clang diagnostic pop" )
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
 
 #endif // __clang__
 
@@ -178,6 +204,7 @@ namespace Catch {
 // Android somehow still does not support std::to_string
 #if defined(__ANDROID__)
 #    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -199,16 +226,19 @@ namespace Catch {
 // Required for some versions of Cygwin to declare gettimeofday
 // see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
 #   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
 
+# endif
 #endif // __CYGWIN__
 
 ////////////////////////////////////////////////////////////////////////////////
 // Visual C++
-#ifdef _MSC_VER
-
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
+#if defined(_MSC_VER)
 
 // Universal Windows platform does not support SEH
 // Or console colours (or console at all...)
@@ -218,15 +248,45 @@ namespace Catch {
 #    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
 #  endif
 
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#    endif // MSVC_TRADITIONAL
+
+// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
+#  endif // __clang__
+
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
 #endif // _MSC_VER
 
 ////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
 
+////////////////////////////////////////////////////////////////////////////////
 // DJGPP
 #ifdef __DJGPP__
 #  define CATCH_INTERNAL_CONFIG_NO_WCHAR
 #endif // __DJGPP__
 
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // Use of __COUNTER__ is suppressed during code analysis in
@@ -238,6 +298,58 @@ namespace Catch {
     #define CATCH_INTERNAL_CONFIG_COUNTER
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    include <cstddef>
+  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
+  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #    endif
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
 #if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
 #   define CATCH_CONFIG_COUNTER
 #endif
@@ -257,8 +369,20 @@ namespace Catch {
 #    define CATCH_CONFIG_CPP11_TO_STRING
 #endif
 
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
 #endif
 
 #if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
@@ -269,17 +393,75 @@ namespace Catch {
 #  define CATCH_CONFIG_NEW_CAPTURE
 #endif
 
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#  define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
 #if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#   define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS
 #endif
 #if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#   define CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
 #endif
 #if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
 #   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
-#   define CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+
+// The goal of this macro is to avoid evaluation of the arguments, but
+// still have the compiler warn on problems inside...
+#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
+#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
 #endif
 
 // end catch_compiler_capabilities.h
@@ -295,6 +477,10 @@ namespace Catch {
 #include <string>
 #include <cstdint>
 
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
 namespace Catch {
 
     struct CaseSensitive { enum Choice {
@@ -321,12 +507,12 @@ namespace Catch {
             line( _line )
         {}
 
-        SourceLineInfo( SourceLineInfo const& other )        = default;
-        SourceLineInfo( SourceLineInfo && )                  = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
-        SourceLineInfo& operator = ( SourceLineInfo && )     = default;
+        SourceLineInfo( SourceLineInfo const& other )            = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
+        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
+        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
 
-        bool empty() const noexcept;
+        bool empty() const noexcept { return file[0] == '\0'; }
         bool operator == ( SourceLineInfo const& other ) const noexcept;
         bool operator < ( SourceLineInfo const& other ) const noexcept;
 
@@ -336,6 +522,11 @@ namespace Catch {
 
     std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
 
+    // Bring in operator<< from global namespace into Catch namespace
+    // This is necessary because the overload of operator<< above makes
+    // lookup stop at namespace Catch
+    using ::operator<<;
+
     // Use this in variadic streaming macros to allow
     //    >> +StreamEndStop
     // as well as
@@ -362,9 +553,10 @@ namespace Catch {
 } // end namespace Catch
 
 #define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
     CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
     namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
-    CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
 // end catch_tag_alias_autoregistrar.h
 // start catch_test_registry.h
@@ -372,7 +564,6 @@ namespace Catch {
 // start catch_interfaces_testcase.h
 
 #include <vector>
-#include <memory>
 
 namespace Catch {
 
@@ -383,8 +574,6 @@ namespace Catch {
         virtual ~ITestInvoker();
     };
 
-    using ITestCasePtr = std::shared_ptr<ITestInvoker>;
-
     class TestCase;
     struct IConfig;
 
@@ -394,6 +583,7 @@ namespace Catch {
         virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
     };
 
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
@@ -406,55 +596,30 @@ namespace Catch {
 #include <cstddef>
 #include <string>
 #include <iosfwd>
+#include <cassert>
 
 namespace Catch {
 
-    class StringData;
-
     /// A non-owning string class (similar to the forthcoming std::string_view)
     /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated. c_str() must return a null terminated
-    /// string, however, and so the StringRef will internally take ownership
-    /// (taking a copy), if necessary. In theory this ownership is not externally
-    /// visible - but it does mean (substring) StringRefs should not be shared between
-    /// threads.
+    /// it may not be null terminated.
     class StringRef {
     public:
         using size_type = std::size_t;
+        using const_iterator = const char*;
 
     private:
-        friend struct StringRefTestAccess;
-
-        char const* m_start;
-        size_type m_size;
-
-        char* m_data = nullptr;
-
-        void takeOwnership();
-
         static constexpr char const* const s_empty = "";
 
-    public: // construction/ assignment
-        StringRef() noexcept
-        :   StringRef( s_empty, 0 )
-        {}
-
-        StringRef( StringRef const& other ) noexcept
-        :   m_start( other.m_start ),
-            m_size( other.m_size )
-        {}
+        char const* m_start = s_empty;
+        size_type m_size = 0;
 
-        StringRef( StringRef&& other ) noexcept
-        :   m_start( other.m_start ),
-            m_size( other.m_size ),
-            m_data( other.m_data )
-        {
-            other.m_data = nullptr;
-        }
+    public: // construction
+        constexpr StringRef() noexcept = default;
 
         StringRef( char const* rawChars ) noexcept;
 
-        StringRef( char const* rawChars, size_type size ) noexcept
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
         :   m_start( rawChars ),
             m_size( size )
         {}
@@ -464,65 +629,333 @@ namespace Catch {
             m_size( stdString.size() )
         {}
 
-        ~StringRef() noexcept {
-            delete[] m_data;
-        }
-
-        auto operator = ( StringRef const &other ) noexcept -> StringRef& {
-            delete[] m_data;
-            m_data = nullptr;
-            m_start = other.m_start;
-            m_size = other.m_size;
-            return *this;
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
         }
 
-        operator std::string() const;
-
-        void swap( StringRef& other ) noexcept;
-
     public: // operators
         auto operator == ( StringRef const& other ) const noexcept -> bool;
-        auto operator != ( StringRef const& other ) const noexcept -> bool;
+        auto operator != (StringRef const& other) const noexcept -> bool {
+            return !(*this == other);
+        }
 
-        auto operator[] ( size_type index ) const noexcept -> char;
+        auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
 
     public: // named queries
-        auto empty() const noexcept -> bool {
+        constexpr auto empty() const noexcept -> bool {
             return m_size == 0;
         }
-        auto size() const noexcept -> size_type {
+        constexpr auto size() const noexcept -> size_type {
             return m_size;
         }
 
-        auto numberOfCharacters() const noexcept -> size_type;
+        // Returns the current start pointer. If the StringRef is not
+        // null-terminated, throws std::domain_exception
         auto c_str() const -> char const*;
 
     public: // substrings and searches
-        auto substr( size_type start, size_type size ) const noexcept -> StringRef;
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
 
-        // Returns the current start pointer.
-        // Note that the pointer can change when if the StringRef is a substring
-        auto currentData() const noexcept -> char const*;
+        // Returns the current start pointer. May not be null-terminated.
+        auto data() const noexcept -> char const*;
 
-    private: // ownership queries - may not be consistent between calls
-        auto isOwned() const noexcept -> bool;
-        auto isSubstring() const noexcept -> bool;
-    };
+        constexpr auto isNullTerminated() const noexcept -> bool {
+            return m_start[m_size] == '\0';
+        }
 
-    auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string;
-    auto operator + ( StringRef const& lhs, char const* rhs ) -> std::string;
-    auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string;
+    public: // iterators
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+    };
 
     auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
     auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
 
-    inline auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
         return StringRef( rawChars, size );
     }
-
 } // namespace Catch
 
+constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
 // end catch_stringref.h
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+namespace Catch {
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template <typename> struct true_given : std::true_type {};
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
+        template <typename...>
+        std::false_type static test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here.
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
+#else
+    // Keep ::type here because we still support C++11
+    template <typename Func, typename... U>
+    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+// end catch_meta.hpp
 namespace Catch {
 
 template<typename C>
@@ -557,59 +990,353 @@ struct AutoReg : NonCopyable {
 
 } // end namespace Catch
 
-#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
-#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
-#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
-#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-
 #if defined(CATCH_CONFIG_DISABLE)
     #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
         static void TestName()
     #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
         namespace{                        \
-            struct TestName : INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF ClassName) { \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
                 void test();              \
             };                            \
         }                                 \
         void TestName::test()
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
 
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
 #endif
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
         static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
         CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
         namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
         static void TestName()
     #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
         CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
         namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
         CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
         namespace{ \
-            struct TestName : INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF ClassName) { \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
                 void test(); \
             }; \
             Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
         } \
-        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
         void TestName::test()
     #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
         CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
         Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    int index = 0;                                    \
+                    using expander = int[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                int index = 0;                                    \
+                using expander = int[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
 
 // end catch_test_registry.h
 // start catch_capture.hpp
@@ -710,7 +1437,7 @@ namespace Catch {
 
     auto makeStream( StringRef const &filename ) -> IStream const*;
 
-    class ReusableStringStream {
+    class ReusableStringStream : NonCopyable {
         std::size_t m_index;
         std::ostream* m_oss;
     public:
@@ -725,12 +1452,50 @@ namespace Catch {
             return *this;
         }
         auto get() -> std::ostream& { return *m_oss; }
-
-        static void cleanup();
     };
 }
 
 // end catch_stream.h
+// start catch_interfaces_enum_values_registry.h
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    struct IMutableEnumValuesRegistry {
+        virtual ~IMutableEnumValuesRegistry();
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+// end catch_interfaces_enum_values_registry.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
 
 #ifdef __OBJC__
 // start catch_objc_arc.hpp
@@ -783,14 +1548,7 @@ inline id performOptionalSelector( id obj, SEL sel ) {
 #pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
 #endif
 
-// We need a dummy global operator<< so we can bring it into Catch namespace later
-struct Catch_global_namespace_dummy {};
-std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
-
 namespace Catch {
-    // Bring in operator<< from global namespace into Catch namespace
-    using ::operator<<;
-
     namespace Detail {
 
         extern const std::string unprintableString;
@@ -804,9 +1562,9 @@ namespace Catch {
 
         template<typename T>
         class IsStreamInsertable {
-            template<typename SS, typename TT>
+            template<typename Stream, typename U>
             static auto test(int)
-                -> decltype(std::declval<SS&>() << std::declval<TT>(), std::true_type());
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
 
             template<typename, typename>
             static auto test(...)->std::false_type;
@@ -907,10 +1665,11 @@ namespace Catch {
     struct StringMaker<std::string> {
         static std::string convert(const std::string& str);
     };
-#ifdef CATCH_CONFIG_WCHAR
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
     template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
     };
 #endif
 
@@ -924,6 +1683,18 @@ namespace Catch {
     };
 
 #ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
     template<>
     struct StringMaker<wchar_t const *> {
         static std::string convert(wchar_t const * str);
@@ -955,6 +1726,12 @@ namespace Catch {
         }
     };
 
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
     template<>
     struct StringMaker<int> {
         static std::string convert(int value);
@@ -1006,10 +1783,13 @@ namespace Catch {
     template<>
     struct StringMaker<float> {
         static std::string convert(float value);
+        static int precision;
     };
+
     template<>
     struct StringMaker<double> {
         static std::string convert(double value);
+        static int precision;
     };
 
     template <typename T>
@@ -1045,8 +1825,8 @@ namespace Catch {
 #endif
 
     namespace Detail {
-        template<typename InputIterator>
-        std::string rangeToString(InputIterator first, InputIterator last) {
+        template<typename InputIterator, typename Sentinel = InputIterator>
+        std::string rangeToString(InputIterator first, Sentinel last) {
             ReusableStringStream rss;
             rss << "{ ";
             if (first != last) {
@@ -1092,7 +1872,9 @@ namespace Catch {
 #if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
 #  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
 #  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
 #  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
 #endif
 
 // Separate std::pair specialization
@@ -1114,6 +1896,24 @@ namespace Catch {
 }
 #endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
 
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            ReusableStringStream rss;
+            if (optional.has_value()) {
+                rss << ::Catch::Detail::stringify(*optional);
+            } else {
+                rss << "{ }";
+            }
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
 // Separate std::tuple specialization
 #if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
 #include <tuple>
@@ -1155,21 +1955,56 @@ namespace Catch {
 }
 #endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
 
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
 namespace Catch {
-    struct not_this_one {}; // Tag type for detecting which begin/ end are being selected
-
-    // Import begin/ end from std here so they are considered alongside the fallback (...) overloads in this namespace
-    using std::begin;
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    // Import begin/ end from std here
+    using std::begin;
     using std::end;
 
-    not_this_one begin( ... );
-    not_this_one end( ... );
+    namespace detail {
+        template <typename...>
+        struct void_type {
+            using type = void;
+        };
+
+        template <typename T, typename = void>
+        struct is_range_impl : std::false_type {
+        };
+
+        template <typename T>
+        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
+        };
+    } // namespace detail
 
     template <typename T>
-    struct is_range {
-        static const bool value =
-            !std::is_same<decltype(begin(std::declval<T>())), not_this_one>::value &&
-            !std::is_same<decltype(end(std::declval<T>())), not_this_one>::value;
+    struct is_range : detail::is_range_impl<T> {
     };
 
 #if defined(_MANAGED) // Managed types are never ranges
@@ -1334,6 +2169,18 @@ struct ratio_string<std::milli> {
 }
 #endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
 
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
@@ -1347,6 +2194,7 @@ struct ratio_string<std::milli> {
 #pragma warning(disable:4018) // more "signed/unsigned mismatch"
 #pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
 #pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
 #endif
 
 namespace Catch {
@@ -1390,6 +2238,62 @@ namespace Catch {
             m_op( op ),
             m_rhs( rhs )
         {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
     };
 
     template<typename LhsT>
@@ -1402,7 +2306,7 @@ namespace Catch {
 
     public:
         explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, lhs ? true : false },
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
             m_lhs( lhs )
         {}
     };
@@ -1468,6 +2372,32 @@ namespace Catch {
         auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
             return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
         }
+        template <typename RhsT>
+        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
+        }
+        template <typename RhsT>
+        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
+        }
+        template <typename RhsT>
+        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
 
         auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
             return UnaryExpr<LhsT>{ m_lhs };
@@ -1502,6 +2432,7 @@ namespace Catch {
 // start catch_interfaces_capture.h
 
 #include <string>
+#include <chrono>
 
 namespace Catch {
 
@@ -1510,12 +2441,19 @@ namespace Catch {
     struct SectionInfo;
     struct SectionEndInfo;
     struct MessageInfo;
+    struct MessageBuilder;
     struct Counts;
-    struct BenchmarkInfo;
-    struct BenchmarkStats;
     struct AssertionReaction;
+    struct SourceLineInfo;
 
     struct ITransientExpression;
+    struct IGeneratorTracker;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo;
+    template <typename Duration = std::chrono::duration<double, std::nano>>
+    struct BenchmarkStats;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
     struct IResultCapture {
 
@@ -1526,12 +2464,20 @@ namespace Catch {
         virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
         virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
 
+        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& name ) = 0;
         virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats const& stats ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( std::string const& error ) = 0;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
         virtual void pushScopedMessage( MessageInfo const& message ) = 0;
         virtual void popScopedMessage( MessageInfo const& message ) = 0;
 
+        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
+
         virtual void handleFatalErrorCondition( StringRef message ) = 0;
 
         virtual void handleExpr
@@ -1607,7 +2553,7 @@ namespace Catch {
 
     public:
         AssertionHandler
-            (   StringRef macroName,
+            (   StringRef const& macroName,
                 SourceLineInfo const& lineInfo,
                 StringRef capturedExpression,
                 ResultDisposition::Flags resultDisposition );
@@ -1638,7 +2584,7 @@ namespace Catch {
         auto allowThrows() const -> bool;
     };
 
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef matcherString );
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
 
 } // namespace Catch
 
@@ -1646,15 +2592,16 @@ namespace Catch {
 // start catch_message.h
 
 #include <string>
+#include <vector>
 
 namespace Catch {
 
     struct MessageInfo {
-        MessageInfo(    std::string const& _macroName,
+        MessageInfo(    StringRef const& _macroName,
                         SourceLineInfo const& _lineInfo,
                         ResultWas::OfType _type );
 
-        std::string macroName;
+        StringRef macroName;
         std::string message;
         SourceLineInfo lineInfo;
         ResultWas::OfType type;
@@ -1678,7 +2625,7 @@ namespace Catch {
     };
 
     struct MessageBuilder : MessageStream {
-        MessageBuilder( std::string const& macroName,
+        MessageBuilder( StringRef const& macroName,
                         SourceLineInfo const& lineInfo,
                         ResultWas::OfType type );
 
@@ -1694,9 +2641,34 @@ namespace Catch {
     class ScopedMessage {
     public:
         explicit ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old );
         ~ScopedMessage();
 
         MessageInfo m_info;
+        bool m_moved;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture = getResultCapture();
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
     };
 
 } // end namespace Catch
@@ -1710,7 +2682,7 @@ namespace Catch {
   #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
 #endif
 
-#if defined(CATCH_CONFIG_FAST_COMPILE)
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
 
 ///////////////////////////////////////////////////////////////////////////////
 // Another way to speed-up compilation is to omit local try-catch for REQUIRE*
@@ -1730,15 +2702,16 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
         INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
             CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
             catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
         } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
         INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, false && static_cast<bool>( !!(__VA_ARGS__) ) ) // the expression here is never evaluated at runtime but it forces the compiler to give it a look
-    // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
 
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
@@ -1753,7 +2726,7 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
         try { \
             static_cast<void>(__VA_ARGS__); \
             catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
@@ -1767,7 +2740,7 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 static_cast<void>(__VA_ARGS__); \
@@ -1784,7 +2757,7 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 static_cast<void>(expr); \
@@ -1804,27 +2777,36 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
         catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
         INTERNAL_CATCH_REACT( catchAssertionHandler ) \
     } while( false )
 
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+    varName.captureValues( 0, __VA_ARGS__ )
+
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
 
 ///////////////////////////////////////////////////////////////////////////////
 // Although this is matcher-based, it can be used with just a string
 #define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 static_cast<void>(__VA_ARGS__); \
                 catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
             } \
             catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher ); \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
             } \
         else \
             catchAssertionHandler.handleThrowingCallSkipped(); \
@@ -1946,62 +2928,18 @@ namespace Catch {
 } // end namespace Catch
 
 #define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
     CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
     if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
 #define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
     CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
     if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_UNSUPPRESS_UNUSED_WARNINGS
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
 
 // end catch_section.h
-// start catch_benchmark.h
-
-#include <cstdint>
-#include <string>
-
-namespace Catch {
-
-    class BenchmarkLooper {
-
-        std::string m_name;
-        std::size_t m_count = 0;
-        std::size_t m_iterationsToRun = 1;
-        uint64_t m_resolution;
-        Timer m_timer;
-
-        static auto getResolution() -> uint64_t;
-    public:
-        // Keep most of this inline as it's on the code path that is being timed
-        BenchmarkLooper( StringRef name )
-        :   m_name( name ),
-            m_resolution( getResolution() )
-        {
-            reportStart();
-            m_timer.start();
-        }
-
-        explicit operator bool() {
-            if( m_count < m_iterationsToRun )
-                return true;
-            return needsMoreIterations();
-        }
-
-        void increment() {
-            ++m_count;
-        }
-
-        void reportStart();
-        auto needsMoreIterations() -> bool;
-    };
-
-} // end namespace Catch
-
-#define BENCHMARK( name ) \
-    for( Catch::BenchmarkLooper looper( name ); looper; looper.increment() )
-
-// end catch_benchmark.h
 // start catch_interfaces_exception.h
 
 // start catch_interfaces_registry_hub.h
@@ -2018,6 +2956,8 @@ namespace Catch {
     struct IReporterRegistry;
     struct IReporterFactory;
     struct ITagAliasRegistry;
+    struct IMutableEnumValuesRegistry;
+
     class StartupExceptionRegistry;
 
     using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
@@ -2028,8 +2968,7 @@ namespace Catch {
         virtual IReporterRegistry const& getReporterRegistry() const = 0;
         virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
         virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-
-        virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
 
         virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
     };
@@ -2042,9 +2981,10 @@ namespace Catch {
         virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
         virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
         virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
     };
 
-    IRegistryHub& getRegistryHub();
+    IRegistryHub const& getRegistryHub();
     IMutableRegistryHub& getMutableRegistryHub();
     void cleanUp();
     std::string translateActiveException();
@@ -2088,6 +3028,9 @@ namespace Catch {
             {}
 
             std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                return "";
+#else
                 try {
                     if( it == itEnd )
                         std::rethrow_exception(std::current_exception());
@@ -2097,6 +3040,7 @@ namespace Catch {
                 catch( T& ex ) {
                     return m_translateFunction( ex );
                 }
+#endif
             }
 
         protected:
@@ -2115,9 +3059,10 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
     static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
     CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
     namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
     static std::string translatorName( signature )
 
 #define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
@@ -2126,7 +3071,6 @@ namespace Catch {
 // start catch_approx.h
 
 #include <type_traits>
-#include <stdexcept>
 
 namespace Catch {
 namespace Detail {
@@ -2134,6 +3078,12 @@ namespace Detail {
     class Approx {
     private:
         bool equalityComparisonImpl(double other) const;
+        // Validates the new margin (margin >= 0)
+        // out-of-line to avoid including stdexcept in the header
+        void setMargin(double margin);
+        // Validates the new epsilon (0 < epsilon < 1)
+        // out-of-line to avoid including stdexcept in the header
+        void setEpsilon(double epsilon);
 
     public:
         explicit Approx ( double value );
@@ -2143,11 +3093,11 @@ namespace Detail {
         Approx operator-() const;
 
         template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) {
+        Approx operator()( T const& value ) const {
             Approx approx( static_cast<double>(value) );
-            approx.epsilon( m_epsilon );
-            approx.margin( m_margin );
-            approx.scale( m_scale );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
             return approx;
         }
 
@@ -2199,27 +3149,14 @@ namespace Detail {
         template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
         Approx& epsilon( T const& newEpsilon ) {
             double epsilonAsDouble = static_cast<double>(newEpsilon);
-            if( epsilonAsDouble < 0 || epsilonAsDouble > 1.0 ) {
-                throw std::domain_error
-                    (   "Invalid Approx::epsilon: " +
-                        Catch::Detail::stringify( epsilonAsDouble ) +
-                        ", Approx::epsilon has to be between 0 and 1" );
-            }
-            m_epsilon = epsilonAsDouble;
+            setEpsilon(epsilonAsDouble);
             return *this;
         }
 
         template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
         Approx& margin( T const& newMargin ) {
             double marginAsDouble = static_cast<double>(newMargin);
-            if( marginAsDouble < 0 ) {
-                throw std::domain_error
-                    (   "Invalid Approx::margin: " +
-                         Catch::Detail::stringify( marginAsDouble ) +
-                         ", Approx::Margin has to be non-negative." );
-
-            }
-            m_margin = marginAsDouble;
+            setMargin(marginAsDouble);
             return *this;
         }
 
@@ -2256,6 +3193,7 @@ struct StringMaker<Catch::Detail::Approx> {
 
 #include <string>
 #include <iosfwd>
+#include <vector>
 
 namespace Catch {
 
@@ -2266,7 +3204,13 @@ namespace Catch {
     bool contains( std::string const& s, std::string const& infix );
     void toLowerInPlace( std::string& s );
     std::string toLower( std::string const& s );
+    //! Returns a new string without whitespace at the start/end
     std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
     bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
 
     struct pluralise {
@@ -2309,14 +3253,28 @@ namespace Matchers {
             mutable std::string m_cachedToString;
         };
 
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
         template<typename ObjectT>
         struct MatcherMethod {
             virtual bool match( ObjectT const& arg ) const = 0;
         };
-        template<typename PtrT>
-        struct MatcherMethod<PtrT*> {
-            virtual bool match( PtrT* arg ) const = 0;
+
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
         };
+#endif
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
 
         template<typename T>
         struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
@@ -2351,9 +3309,10 @@ namespace Matchers {
                 return description;
             }
 
-            MatchAllOf<ArgT>& operator && ( MatcherBase<ArgT> const& other ) {
-                m_matchers.push_back( &other );
-                return *this;
+            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
             }
 
             std::vector<MatcherBase<ArgT> const*> m_matchers;
@@ -2384,9 +3343,10 @@ namespace Matchers {
                 return description;
             }
 
-            MatchAnyOf<ArgT>& operator || ( MatcherBase<ArgT> const& other ) {
-                m_matchers.push_back( &other );
-                return *this;
+            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
             }
 
             std::vector<MatcherBase<ArgT> const*> m_matchers;
@@ -2430,10 +3390,34 @@ using Matchers::Impl::MatcherBase;
 } // namespace Catch
 
 // end catch_matchers.h
-// start catch_matchers_floating.h
+// start catch_matchers_exception.hpp
 
-#include <type_traits>
-#include <cmath>
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+class ExceptionMessageMatcher : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+} // namespace Exception
+
+Exception::ExceptionMessageMatcher Message(std::string const& message);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_exception.hpp
+// start catch_matchers_floating.h
 
 namespace Catch {
 namespace Matchers {
@@ -2452,22 +3436,43 @@ namespace Matchers {
         };
 
         struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, int ulps, FloatingPointKind baseType);
+            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
             bool match(double const& matchee) const override;
             std::string describe() const override;
         private:
             double m_target;
-            int m_ulps;
+            uint64_t m_ulps;
             FloatingPointKind m_type;
         };
 
+        // Given IEEE-754 format for floats and doubles, we can assume
+        // that float -> double promotion is lossless. Given this, we can
+        // assume that if we do the standard relative comparison of
+        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+        // the same result if we do this for floats, as if we do this for
+        // doubles that were promoted from floats.
+        struct WithinRelMatcher : MatcherBase<double> {
+            WithinRelMatcher(double target, double epsilon);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_epsilon;
+        };
+
     } // namespace Floating
 
     // The following functions create the actual matcher objects.
     // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, int maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, int maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
     Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+    Floating::WithinRelMatcher WithinRel(double target, double eps);
+    // defaults epsilon to 100*numeric_limits<double>::epsilon()
+    Floating::WithinRelMatcher WithinRel(double target);
+    Floating::WithinRelMatcher WithinRel(float target, float eps);
+    // defaults epsilon to 100*numeric_limits<float>::epsilon()
+    Floating::WithinRelMatcher WithinRel(float target);
 
 } // namespace Matchers
 } // namespace Catch
@@ -2510,7 +3515,7 @@ class PredicateMatcher : public MatcherBase<T> {
 
     // The following functions create the actual matcher objects.
     // The user has to explicitly specify type to the function, because
-    // infering std::function<bool(T const&)> is hard (but possible) and
+    // inferring std::function<bool(T const&)> is hard (but possible) and
     // requires a lot of TMP.
     template<typename T>
     Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
@@ -2598,34 +3603,12 @@ namespace Catch {
 namespace Matchers {
 
     namespace Vector {
-        namespace Detail {
-            template <typename InputIterator, typename T>
-            size_t count(InputIterator first, InputIterator last, T const& item) {
-                size_t cnt = 0;
-                for (; first != last; ++first) {
-                    if (*first == item) {
-                        ++cnt;
-                    }
-                }
-                return cnt;
-            }
-            template <typename InputIterator, typename T>
-            bool contains(InputIterator first, InputIterator last, T const& item) {
-                for (; first != last; ++first) {
-                    if (*first == item) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-
-        template<typename T>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T>> {
+        template<typename T, typename Alloc>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
 
             ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
 
-            bool match(std::vector<T> const &v) const override {
+            bool match(std::vector<T, Alloc> const &v) const override {
                 for (auto const& el : v) {
                     if (el == m_comparator) {
                         return true;
@@ -2641,12 +3624,12 @@ namespace Matchers {
             T const& m_comparator;
         };
 
-        template<typename T>
-        struct ContainsMatcher : MatcherBase<std::vector<T>> {
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
 
-            ContainsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
 
-            bool match(std::vector<T> const &v) const override {
+            bool match(std::vector<T, AllocMatch> const &v) const override {
                 // !TBD: see note in EqualsMatcher
                 if (m_comparator.size() > v.size())
                     return false;
@@ -2668,18 +3651,18 @@ namespace Matchers {
                 return "Contains: " + ::Catch::Detail::stringify( m_comparator );
             }
 
-            std::vector<T> const& m_comparator;
+            std::vector<T, AllocComp> const& m_comparator;
         };
 
-        template<typename T>
-        struct EqualsMatcher : MatcherBase<std::vector<T>> {
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
 
-            EqualsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
 
-            bool match(std::vector<T> const &v) const override {
+            bool match(std::vector<T, AllocMatch> const &v) const override {
                 // !TBD: This currently works if all elements can be compared using !=
                 // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T> etc
+                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
                 // - then just call that directly
                 if (m_comparator.size() != v.size())
                     return false;
@@ -2691,47 +3674,60 @@ namespace Matchers {
             std::string describe() const override {
                 return "Equals: " + ::Catch::Detail::stringify( m_comparator );
             }
-            std::vector<T> const& m_comparator;
+            std::vector<T, AllocComp> const& m_comparator;
         };
 
-        template<typename T>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T>> {
-            UnorderedEqualsMatcher(std::vector<T> const& target) : m_target(target) {}
-            bool match(std::vector<T> const& vec) const override {
-                // Note: This is a reimplementation of std::is_permutation,
-                //       because I don't want to include <algorithm> inside the common path
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                auto lfirst = m_target.begin(), llast = m_target.end();
-                auto rfirst = vec.begin(), rlast = vec.end();
-                // Cut common prefix to optimize checking of permuted parts
-                while (lfirst != llast && *lfirst != *rfirst) {
-                    ++lfirst; ++rfirst;
-                }
-                if (lfirst == llast) {
-                    return true;
-                }
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
 
-                for (auto mid = lfirst; mid != llast; ++mid) {
-                    // Skip already counted items
-                    if (Detail::contains(lfirst, mid, *mid)) {
-                        continue;
-                    }
-                    size_t num_vec = Detail::count(rfirst, rlast, *mid);
-                    if (num_vec == 0 || Detail::count(lfirst, llast, *mid) != num_vec) {
-                        return false;
-                    }
-                }
+            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
 
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != approx(v[i]))
+                        return false;
                 return true;
             }
+            std::string describe() const override {
+                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& epsilon( T const& newEpsilon ) {
+                approx.epsilon(newEpsilon);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& margin( T const& newMargin ) {
+                approx.margin(newMargin);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& scale( T const& newScale ) {
+                approx.scale(newScale);
+                return *this;
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
+            bool match(std::vector<T, AllocMatch> const& vec) const override {
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+            }
 
             std::string describe() const override {
                 return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
             }
         private:
-            std::vector<T> const& m_target;
+            std::vector<T, AllocComp> const& m_target;
         };
 
     } // namespace Vector
@@ -2739,24 +3735,29 @@ namespace Matchers {
     // The following functions create the actual matcher objects.
     // This allows the types to be inferred
 
-    template<typename T>
-    Vector::ContainsMatcher<T> Contains( std::vector<T> const& comparator ) {
-        return Vector::ContainsMatcher<T>( comparator );
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
     }
 
-    template<typename T>
-    Vector::ContainsElementMatcher<T> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T>( comparator );
+    template<typename T, typename Alloc = std::allocator<T>>
+    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
     }
 
-    template<typename T>
-    Vector::EqualsMatcher<T> Equals( std::vector<T> const& comparator ) {
-        return Vector::EqualsMatcher<T>( comparator );
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
     }
 
-    template<typename T>
-    Vector::UnorderedEqualsMatcher<T> UnorderedEquals(std::vector<T> const& target) {
-        return Vector::UnorderedEqualsMatcher<T>(target);
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
+        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
     }
 
 } // namespace Matchers
@@ -2771,7 +3772,7 @@ namespace Catch {
         MatcherT m_matcher;
         StringRef m_matcherString;
     public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef matcherString )
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
         :   ITransientExpression{ true, matcher.match( arg ) },
             m_arg( arg ),
             m_matcher( matcher ),
@@ -2790,10 +3791,10 @@ namespace Catch {
 
     using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
 
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString  );
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
 
     template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
         return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
     }
 
@@ -2802,9 +3803,9 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
         INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher ) ); \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
         } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
         INTERNAL_CATCH_REACT( catchAssertionHandler ) \
     } while( false )
@@ -2812,14 +3813,14 @@ namespace Catch {
 ///////////////////////////////////////////////////////////////////////////////
 #define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
     do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
         if( catchAssertionHandler.allowThrows() ) \
             try { \
                 static_cast<void>(__VA_ARGS__ ); \
                 catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
             } \
             catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher ) ); \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
             } \
             catch( ... ) { \
                 catchAssertionHandler.handleUnexpectedInflightException(); \
@@ -2831,494 +3832,640 @@ namespace Catch {
 
 // end catch_capture_matchers.h
 #endif
+// start catch_generators.hpp
 
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
+// start catch_interfaces_generatortracker.h
 
-#include <string>
-#include <vector>
-#include <memory>
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
+#include <memory>
 
 namespace Catch {
 
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
+    namespace Generators {
+        class GeneratorUntypedBase {
+        public:
+            GeneratorUntypedBase() = default;
+            virtual ~GeneratorUntypedBase();
+            // Attempts to move the generator to the next element
+             //
+             // Returns true iff the move succeeded (and a valid element
+             // can be retrieved).
+            virtual bool next() = 0;
         };
+        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
 
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
+    } // namespace Generators
 
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+    struct IGeneratorTracker {
+        virtual ~IGeneratorTracker();
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
 
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
+} // namespace Catch
 
-        std::string tagsAsString() const;
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
 
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
+#include <exception>
 
-    class TestCase : public TestCaseInfo {
-    public:
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
 
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
 
-        TestCase withName( std::string const& _newName ) const;
+} // namespace Catch;
 
-        void invoke() const;
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
 
-        TestCaseInfo const& getTestCaseInfo() const;
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
 
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
 
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
 
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
 
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
+#include <utility>
+#include <exception>
 
 namespace Catch {
 
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
+class GeneratorException : public std::exception {
+    const char* const m_msg = "";
 
-#import <objc/runtime.h>
+public:
+    GeneratorException(const char* msg):
+        m_msg(msg)
+    {}
 
-#include <string>
+    const char* what() const noexcept override final;
+};
 
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
+namespace Generators {
 
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
+    // !TBD move this into its own location?
+    namespace pf{
+        template<typename T, typename... Args>
+        std::unique_ptr<T> make_unique( Args&&... args ) {
+            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+        }
+    }
 
-@optional
+    template<typename T>
+    struct IGenerator : GeneratorUntypedBase {
+        virtual ~IGenerator() = default;
+
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
 
--(void) setUp;
--(void) tearDown;
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
 
-@end
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
 
-namespace Catch {
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
 
-    class OcMethod : public ITestInvoker {
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
 
+    template <typename T>
+    class GeneratorWrapper final {
+        std::unique_ptr<IGenerator<T>> m_generator;
     public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+            m_generator(std::move(generator))
+        {}
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->next();
+        }
+    };
 
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
+    template <typename T>
+    GeneratorWrapper<T> value(T&& value) {
+        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+    }
 
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
 
-            arcSafeRelease( obj );
+        void populate(GeneratorWrapper<T>&& generator) {
+            m_generators.emplace_back(std::move(generator));
+        }
+        void populate(T&& val) {
+            m_generators.emplace_back(value(std::forward<T>(val)));
+        }
+        template<typename U>
+        void populate(U&& val) {
+            populate(T(std::forward<U>(val)));
+        }
+        template<typename U, typename... Gs>
+        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
+            populate(std::forward<U>(valueOrGenerator));
+            populate(std::forward<Gs>(moreGenerators)...);
         }
-    private:
-        virtual ~OcMethod() {}
 
-        Class m_cls;
-        SEL m_sel;
-    };
+    public:
+        template <typename... Gs>
+        Generators(Gs &&... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
 
-    namespace Detail{
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
 
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
         }
+    };
+
+    template<typename... Ts>
+    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
     }
 
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
 
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
+        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(std::move(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+    }
 
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
 
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
+    template<typename L>
+    // Note: The type after -> is weird, because VS2015 cannot parse
+    //       the expression used in the typedef inside, when it is in
+    //       return type. Yeah.
+    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
+        if (!tracker.hasGenerator()) {
+            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
         }
-        return noTestMethods;
-    }
 
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+        return generator.get();
+    }
 
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
+} // namespace Generators
+} // namespace Catch
 
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
+#define GENERATE( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+
+// end catch_generators.hpp
+// start catch_generators_generic.hpp
 
-                bool match( NSString* arg ) const override {
-                    return false;
-                }
+namespace Catch {
+namespace Generators {
 
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
+    template <typename T>
+    class TakeGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
 
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
 
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+    }
 
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
+    template <typename T, typename Predicate>
+    class FilterGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_predicate(std::forward<P>(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = nextImpl();
+                if (!has_initial_value) {
+                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
                 }
-            };
+            }
+        }
 
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
+        T const& get() const override {
+            return m_generator.get();
+        }
 
-                bool match( NSString* str ) const {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
+        bool next() override {
+            return nextImpl();
+        }
 
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
+    private:
+        bool nextImpl() {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
 
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+    }
 
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
+    template <typename T>
+    class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
 
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
 
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
 
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
                 }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
+                return m_current_repeat < m_target_repeats;
+            }
 
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
 
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+    }
 
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+    template <typename T, typename U, typename Func>
+    class MapGenerator : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(std::move(generator)),
+            m_function(std::forward<F2>(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
 
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
 
-    } // namespace Matchers
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
 
-    using namespace Matchers;
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
 
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-#ifdef CATCH_CONFIG_EXTERNAL_INTERFACES
-// start catch_external_interfaces.h
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(std::move(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
 
-// start catch_reporter_bases.hpp
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
+        );
+    }
 
-// start catch_interfaces_reporter.h
+} // namespace Generators
+} // namespace Catch
 
-// start catch_config.hpp
+// end catch_generators_generic.hpp
+// start catch_generators_specific.hpp
 
-// start catch_test_spec_parser.h
+// start catch_context.h
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
+#include <memory>
 
-// start catch_test_spec.h
+namespace Catch {
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
 
-// start catch_wildcard_pattern.h
+    using IConfigPtr = std::shared_ptr<IConfig const>;
 
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
+    struct IContext
+    {
+        virtual ~IContext();
 
-    public:
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
 
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
 
     private:
-        std::string adjustCase( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
     };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    class TestSpec {
-        struct Pattern {
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            NamePattern( std::string const& name );
-            virtual ~NamePattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            TagPattern( std::string const& tag );
-            virtual ~TagPattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            ExcludedPattern( PatternPtr const& underlyingPattern );
-            virtual ~ExcludedPattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
 
-            bool matches( TestCaseInfo const& testCase ) const;
-        };
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *IMutableContext::currentContext;
+    }
 
-    public:
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
 
-    private:
-        std::vector<Filter> m_filters;
+    void cleanUpContext();
 
-        friend class TestSpecParser;
-    };
+    class SimplePcg32;
+    SimplePcg32& rng();
 }
 
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
+// end catch_context.h
+// start catch_interfaces_config.h
 
-#include <string>
+// start catch_option.hpp
 
 namespace Catch {
 
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
 
-} // end namespace Catch
+        ~Option() {
+            reset();
+        }
 
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
 
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        bool m_exclusion = false;
-        std::size_t m_start = std::string::npos, m_pos = 0;
-        std::string m_arg;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
 
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
 
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
 
-    private:
-        void visitChar( char c );
-        void startNewMode( Mode mode, std::size_t start );
-        void escape();
-        std::string subString() const;
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
 
-        template<typename T>
-        void addPattern() {
-            std::string token = subString();
-            for( std::size_t i = 0; i < m_escapeChars.size(); ++i )
-                token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 );
-            m_escapeChars.clear();
-            if( startsWith( token, "exclude:" ) ) {
-                m_exclusion = true;
-                token = token.substr( 8 );
-            }
-            if( !token.empty() ) {
-                TestSpec::PatternPtr pattern = std::make_shared<T>( token );
-                if( m_exclusion )
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>( pattern );
-                m_currentFilter.m_patterns.push_back( pattern );
-            }
-            m_exclusion = false;
-            m_mode = None;
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
         }
 
-        void addFilter();
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
     };
-    TestSpec parseTestSpec( std::string const& arg );
 
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// start catch_interfaces_config.h
+} // end namespace Catch
 
+// end catch_option.hpp
+#include <chrono>
 #include <iosfwd>
 #include <string>
 #include <vector>
@@ -3376,1127 +4523,2936 @@ namespace Catch {
         virtual int abortAfter() const = 0;
         virtual bool showInvisibles() const = 0;
         virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual double minDuration() const = 0;
         virtual TestSpec const& testSpec() const = 0;
         virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
         virtual RunTests::InWhatOrder runOrder() const = 0;
         virtual unsigned int rngSeed() const = 0;
-        virtual int benchmarkResolutionMultiple() const = 0;
         virtual UseColour::YesOrNo useColour() const = 0;
         virtual std::vector<std::string> const& getSectionsToRun() const = 0;
         virtual Verbosity verbosity() const = 0;
+
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
     };
 
     using IConfigPtr = std::shared_ptr<IConfig const>;
 }
 
 // end catch_interfaces_config.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
+// start catch_random_number_generator.h
 
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
+#include <cstdint>
 
 namespace Catch {
 
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
 
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
 
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-        int benchmarkResolutionMultiple = 100;
+        explicit SimplePcg32(result_type seed_);
 
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
 
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
+        result_type operator()();
 
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
     };
 
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
+} // end namespace Catch
 
-        std::vector<std::string> const& getTestsOrTags() const;
-        std::vector<std::string> const& getSectionsToRun() const override;
+// end catch_random_number_generator.h
+#include <random>
 
-        virtual TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
+namespace Catch {
+namespace Generators {
 
-        bool showHelp() const;
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_real_distribution<Float> m_dist;
+    Float m_current_number;
+public:
 
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        int benchmarkResolutionMultiple() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
+    RandomFloatingGenerator(Float a, Float b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
 
-    private:
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
 
-        IStream const* openStream();
-        ConfigData m_data;
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_int_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
 
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
+    RandomIntegerGenerator(Integer a, Integer b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
 
-} // end namespace Catch
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
 
-// end catch_config.hpp
-// start catch_assertionresult.h
+// TODO: Ideally this would be also constrained against the various char types,
+//       but I don't expect users to run into that in practice.
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
+    );
+}
 
-#include <string>
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
+    );
+}
 
-namespace Catch {
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
 
-    struct AssertionResultData
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
     {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
 
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
 
-} // end namespace Catch
+    T const& get() const override {
+        return m_current;
+    }
 
-// end catch_assertionresult.h
-// start catch_option.hpp
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
 
-namespace Catch {
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
+}
 
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
+}
 
-        ~Option() {
-            reset();
-        }
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
 
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
         }
+    }
 
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
+    T const& get() const override {
+        return m_elems[m_current];
+    }
 
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
 
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
 
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+}
 
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
+} // namespace Generators
+} // namespace Catch
 
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
+// end catch_generators_specific.hpp
 
-} // end namespace Catch
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
 
-// end catch_option.hpp
 #include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
+#include <vector>
 #include <memory>
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
 namespace Catch {
 
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+    struct ITestInvoker;
 
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
 
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
 
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
 
-    struct ReporterPreferences {
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* str ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+// Benchmarking needs the externally-facing parts of reporters to work
+#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    struct IConfig;
+
+    class TestSpec {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
+        };
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidArgs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidArgs;
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100000;
+        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        double minDuration = -1;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        double minDuration() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool benchmarkNoAnalysis() const override;
+        int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+        std::chrono::milliseconds benchmarkWarmupTime() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_estimate.hpp
+
+ // Statistics estimates
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct Estimate {
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
+            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate.hpp
+// start catch_outlier_classification.hpp
+
+// Outlier information
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_outlier_classification.hpp
+
+#include <iterator>
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+#include <algorithm>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
         bool shouldRedirectStdOut = false;
         bool shouldReportAllAssertions = false;
     };
 
     template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    template <class Duration>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Duration> samples;
+        Benchmark::Estimate<Duration> mean;
+        Benchmark::Estimate<Duration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+
+        template <typename Duration2>
+        operator BenchmarkStats<Duration2>() const {
+            std::vector<Duration2> samples2;
+            samples2.reserve(samples.size());
+            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+            return {
+                info,
+                std::move(samples2),
+                mean,
+                standardDeviation,
+                outliers,
+                outlierVariance,
+            };
+        }
+    };
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void reportInvalidArguments(std::string const&) {}
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& ) {}
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
+        virtual void benchmarkFailed( std::string const& ) {}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    //! Should the reporter show
+    bool shouldShowDuration( IConfig const& config, double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& container );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void reportInvalidArguments(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
         }
-        void reset() {
-            Option<T>::reset();
-            used = false;
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
         }
-        bool used = false;
     };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed(std::string const& error) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+        void printTestFilters();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
 
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
 
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
     };
 
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
 
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = default;
-        AssertionStats& operator = ( AssertionStats && )     = default;
-        virtual ~AssertionStats();
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
 
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
 
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
+        void encodeTo( std::ostream& os ) const;
 
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
     };
 
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
+    class XmlWriter {
+    public:
 
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
 
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
 
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
+            ~ScopedElement();
 
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
+            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
 
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
 
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
 
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
 
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
 
-    struct BenchmarkInfo {
-        std::string name;
-    };
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-        std::size_t iterations;
-        uint64_t elapsedTimeInNanoseconds;
-    };
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
 
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
 
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
 
-        virtual ReporterPreferences getPreferences() const = 0;
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
 
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
 
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
 
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
 
-        // *** experimental ***
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
 
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+        void writeStylesheetRef( std::string const& url );
 
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+        XmlWriter& writeBlankLine();
 
-        // *** experimental ***
-        virtual void benchmarkEnded( BenchmarkStats const& ) {}
+        void ensureTagClosed();
 
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+    private:
 
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+        void applyFormatting(XmlFormatting fmt);
 
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
+        void writeDeclaration();
 
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+        void newlineIfNecessary();
 
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
     };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
 
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
+}
 
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection( std::string const& className,
+                           std::string const& rootName,
+                           SectionNode const& sectionNode,
+                           bool testOkToFail );
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
     };
 
 } // end namespace Catch
 
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
 
 namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
 
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
+        ~XmlReporter() override;
 
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
+        static std::string getDescription();
 
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                throw std::domain_error( "Verbosity level not supported by this reporter" );
-        }
+        virtual std::string getStylesheetRef() const;
 
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
 
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
 
-        ~StreamingReporterBase() override = default;
+        void testRunStarting(TestRunInfo const& testInfo) override;
 
-        void noMatchingTestCases(std::string const&) override {}
+        void testGroupStarting(GroupInfo const& groupInfo) override;
 
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
 
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
+        void sectionStarting(SectionInfo const& sectionInfo) override;
 
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
+        void assertionStarting(AssertionInfo const&) override;
 
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
+        bool assertionEnded(AssertionStats const& assertionStats) override;
 
-        IConfigPtr m_config;
-        std::ostream& stream;
+        void sectionEnded(SectionStats const& sectionStats) override;
 
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
 
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
 
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
+        void testRunEnded(TestRunStats const& testRunStats) override;
 
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
 
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
+} // end namespace Catch
 
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
+// end catch_reporter_xml.h
 
-        private:
-            SectionInfo const& m_other;
-        };
+// end catch_external_interfaces.h
+#endif
 
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_benchmarking_all.hpp
 
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                throw std::domain_error( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
+// A proxy header that includes all of the benchmarking headers to allow
+// concise include of the benchmarking features. You should prefer the
+// individual includes in standard use.
 
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
+// start catch_benchmark.hpp
 
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
+ // Benchmark
 
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
+// start catch_chronometer.hpp
 
-        void testCaseStarting( TestCaseInfo const& ) override {}
+// User-facing chronometer
 
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
 
-        void assertionStarting(AssertionInfo const&) override {}
+// start catch_clock.hpp
 
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
+// Clocks
 
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
 
-        void skipTest(TestCaseInfo const&) override {}
+#include <chrono>
+#include <ratio>
 
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+namespace Catch {
+    namespace Benchmark {
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
 
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
 
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
+        using default_clock = std::chrono::steady_clock;
 
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
 
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
+    } // namespace Benchmark
+} // namespace Catch
 
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
+// end catch_clock.hpp
+// start catch_optimizer.hpp
 
-} // end namespace Catch
+ // Hinting the optimizer
 
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
+
+#if defined(_MSC_VER)
+#   include <atomic> // atomic_thread_fence
+#endif
 
 namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
 
-    struct Colour {
-        enum Code {
-            None = 0,
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER)
 
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
+#pragma optimize("", off)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#pragma optimize("", on)
 
-            Bright = 0x10,
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
 
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
+#endif
 
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
 
-            Error = BrightRed,
-            Success = Green,
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
+            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
+        }
 
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
+            std::forward<Fn>(fn) (std::forward<Args...>(args...));
+        }
+    } // namespace Benchmark
+} // namespace Catch
 
-            SecondaryText = LightGrey,
-            Headers = White
-        };
+// end catch_optimizer.hpp
+// start catch_complete_invoke.hpp
 
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
+// Invoke with a special case for void
 
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
 
-    private:
-        bool m_moved = false;
-    };
+#include <type_traits>
+#include <utility>
 
-    std::ostream& operator << ( std::ostream& os, Colour const& );
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                    return {};
+                }
+            };
 
-} // end namespace Catch
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
+            }
 
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
+            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+        } // namespace Detail
 
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            CATCH_TRY{
+                return Detail::complete_invoke(std::forward<Fun>(fun));
+            } CATCH_CATCH_ALL{
+                getResultCapture().benchmarkFailed(translateActiveException());
+                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
+            }
+        }
+    } // namespace Benchmark
+} // namespace Catch
 
+// end catch_complete_invoke.hpp
 namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept() = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
 
-    template<typename T>
-    class ReporterRegistrar {
+                ClockDuration<Clock> elapsed() const { return finished - started; }
 
-        class ReporterFactory : public IReporterFactory {
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
 
-            virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return k; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int k)
+                : impl(&meter)
+                , k(k) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
             }
 
-            virtual std::string getDescription() const override {
-                return T::getDescription();
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
             }
-        };
 
-    public:
+            Detail::ChronometerConcept* impl;
+            int k;
+        };
+    } // namespace Benchmark
+} // namespace Catch
 
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
+// end catch_chronometer.hpp
+// start catch_environment.hpp
 
-    template<typename T>
-    class ListenerRegistrar {
+// Environment information
 
-        class ListenerFactory : public IReporterFactory {
 
-            virtual IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            virtual std::string getDescription() const override {
-                return std::string();
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct EnvironmentEstimate {
+            Duration mean;
+            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
             }
         };
+        template <typename Clock>
+        struct Environment {
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
 
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
+// end catch_environment.hpp
+// start catch_execution_plan.hpp
 
-#if !defined(CATCH_CONFIG_DISABLE)
+ // Execution plan
 
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_UNSUPPRESS_GLOBALS_WARNINGS
 
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-     CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS   \
-     namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-     CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#else // CATCH_CONFIG_DISABLE
+// start catch_benchmark_function.hpp
 
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
+ // Dumb std::function implementation for consistent call overhead
 
-#endif // CATCH_CONFIG_DISABLE
 
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
+#include <cassert>
+#include <type_traits>
+#include <utility>
+#include <memory>
 
 namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            using Decay = typename std::decay<T>::type;
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<Decay<T>, Decay<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual callable* clone() const = 0;
+                    virtual ~callable() = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun) : fun(std::move(fun)) {}
+                    model(Fun const& fun) : fun(fun) {}
+
+                    model<Fun>* clone() const override { return new model<Fun>(*this); }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
 
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+                    Fun fun;
+                };
 
-        using StreamingReporterBase::StreamingReporterBase;
+                struct do_nothing { void operator()() const {} };
 
-        ~CompactReporter() override;
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
 
-        static std::string getDescription();
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
 
-        ReporterPreferences getPreferences() const override;
+                template <typename Fun,
+                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
 
-        void noMatchingTestCases(std::string const& spec) override;
+                BenchmarkFunction(BenchmarkFunction&& that)
+                    : f(std::move(that.f)) {}
 
-        void assertionStarting(AssertionInfo const&) override;
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
 
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
+                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
+                    f = std::move(that.f);
+                    return *this;
+                }
 
-        void sectionEnded(SectionStats const& _sectionStats) override;
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f.reset(that.f->clone());
+                    return *this;
+                }
 
-        void testRunEnded(TestRunStats const& _testRunStats) override;
+                void operator()(Chronometer meter) const { f->call(meter); }
 
-    };
+            private:
+                std::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
 
-} // end namespace Catch
+// end catch_benchmark_function.hpp
+// start catch_repeat.hpp
 
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
+// repeat algorithm
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
+
+#include <type_traits>
+#include <utility>
 
 namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
+                return { std::forward<Fun>(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
 
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
+// end catch_repeat.hpp
+// start catch_run_for_at_least.hpp
 
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
+// Run a function for a minimum amount of time
 
-        void noMatchingTestCases(std::string const& spec) override;
 
-        void assertionStarting(AssertionInfo const&) override;
+// start catch_measure.hpp
 
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
+// Measure
 
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
 
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats const& stats) override;
+// start catch_timing.hpp
 
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
+// Timing
 
-    private:
 
-        void lazyPrint();
+#include <tuple>
+#include <type_traits>
 
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration, typename Result>
+        struct Timing {
+            Duration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Clock, typename Func, typename... Args>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+    } // namespace Benchmark
+} // namespace Catch
 
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
+// end catch_timing.hpp
+#include <utility>
 
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, std::forward<decltype(r)>(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
 
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+// end catch_measure.hpp
+#include <utility>
+#include <type_traits>
 
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
 
-    private:
-        bool m_headerPrinted = false;
-    };
+                return { meter.elapsed(), std::move(result), iters };
+            }
 
-} // end namespace Catch
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override {
+                    return "could not measure benchmark, maybe it was optimized away";
+                }
+            };
 
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
+                auto iters = seed;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
 
-// start catch_xmlwriter.h
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, std::move(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                Catch::throw_exception(optimized_away_error{});
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
 
-#include <vector>
+// end catch_run_for_at_least.hpp
+#include <algorithm>
+#include <iterator>
 
 namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            Duration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            Duration warmup_time;
+            int warmup_iterations;
+
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
 
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
 
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+// end catch_execution_plan.hpp
+// start catch_estimate_clock.hpp
 
-        void encodeTo( std::ostream& os ) const;
+ // Environment measurement
 
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
 
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
+// start catch_stats.hpp
 
-    class XmlWriter {
-    public:
+// Statistical analysis tools
 
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer );
 
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+#include <algorithm>
+#include <functional>
+#include <vector>
+#include <iterator>
+#include <numeric>
+#include <tuple>
+#include <cmath>
+#include <utility>
+#include <cstddef>
+#include <random>
 
-            ~ScopedElement();
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
 
-            ScopedElement& writeText( std::string const& text, bool indent = true );
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
 
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);
+
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
             }
 
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-        };
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / count;
+            }
 
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
+            template <typename URng, typename Iterator, typename Estimator>
+            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
+                auto n = last - first;
+                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+                sample out;
+                out.reserve(resamples);
+                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+                    std::vector<double> resampled;
+                    resampled.reserve(n);
+                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+                    return estimator(resampled.begin(), resampled.end());
+                });
+                std::sort(out.begin(), out.end());
+                return out;
+            }
 
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = last - first;
+                auto second = std::next(first);
+                sample results;
+                results.reserve(n);
 
-        XmlWriter& startElement( std::string const& name );
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
 
-        ScopedElement scopedElement( std::string const& name );
+                return results;
+            }
 
-        XmlWriter& endElement();
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }
 
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                int n = static_cast<int>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
+                // degenerate case with uniform samples
+                if (prob_n == 0) return { point, point, point, confidence_level };
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n](double x) -> int {
+                    return std::lround(normal_cdf(x) * n); };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = (std::max)(cumn(a1), 0);
+                auto hi = (std::min)(cumn(a2), n - 1);
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
 
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
 
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_stats.hpp
+#include <algorithm>
+#include <iterator>
+#include <tuple>
+#include <vector>
+#include <cmath>
 
-        XmlWriter& writeText( std::string const& text, bool indent = true );
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(k + 1);
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+
+                std::vector<double> deltas;
+                deltas.reserve(k);
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+
+                return deltas;
+            }
 
-        XmlWriter& writeComment( std::string const& text );
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+                auto time_limit = (std::min)(
+                    resolution * clock_cost_estimation_tick_limit,
+                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(nsamples);
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
+                return {
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
+                };
+            }
 
-        void writeStylesheetRef( std::string const& url );
+            template <typename Clock>
+            Environment<FloatDuration<Clock>> measure_environment() {
+                static Environment<FloatDuration<Clock>>* env = nullptr;
+                if (env) {
+                    return *env;
+                }
 
-        XmlWriter& writeBlankLine();
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
 
-        void ensureTagClosed();
+                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
 
-    private:
+// end catch_estimate_clock.hpp
+// start catch_analyse.hpp
 
-        void writeDeclaration();
+ // Run and analyse one benchmark
 
-        void newlineIfNecessary();
 
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
+// start catch_sample_analysis.hpp
 
-}
+// Benchmark results
 
-// end catch_xmlwriter.h
-namespace Catch {
 
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <iterator>
 
-        ~JunitReporter() override;
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct SampleAnalysis {
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    std::move(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
 
-        static std::string getDescription();
+// end catch_sample_analysis.hpp
+#include <algorithm>
+#include <iterator>
+#include <vector>
 
-        void noMatchingTestCases(std::string const& /*spec*/) override;
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(last - first);
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        std::move(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(last - first);
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        std::move(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
 
-        void testRunStarting(TestRunInfo const& runInfo) override;
+// end catch_analyse.hpp
+#include <algorithm>
+#include <functional>
+#include <string>
+#include <vector>
+#include <cmath>
 
-        void testGroupStarting(GroupInfo const& groupInfo) override;
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string &&name)
+                : name(std::move(name)) {}
+
+            template <class FUN>
+            Benchmark(std::string &&name, FUN &&func)
+                : fun(std::move(func)), name(std::move(name)) {}
+
+            template <typename Clock>
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+            }
 
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
+            template <typename Clock = default_clock>
+            void run() {
+                IConfigPtr cfg = getCurrentContext().getConfig();
 
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+                auto env = Detail::measure_environment<Clock>();
 
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
 
-        void testRunEndedCumulative() override;
+                    BenchmarkInfo info {
+                        name,
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
 
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+                    getResultCapture().benchmarkStarting(info);
 
-        void writeTestCase(TestCaseNode const& testCaseNode);
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
 
-        void writeSection(std::string const& className,
-                          std::string const& rootName,
-                          SectionNode const& sectionNode);
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
 
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
+                } CATCH_CATCH_ALL{
+                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
+                        std::rethrow_exception(std::current_exception());
+                }
+            }
 
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun,
+                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
+                Benchmark & operator=(Fun func) {
+                fun = Detail::BenchmarkFunction(func);
+                run();
+                return *this;
+            }
 
-} // end namespace Catch
+            explicit operator bool() {
+                return true;
+            }
 
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
 
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
 
-        ~XmlReporter() override;
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
 
-        static std::string getDescription();
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
 
-        virtual std::string getStylesheetRef() const;
+// end catch_benchmark.hpp
+// start catch_constructor.hpp
 
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+// Constructor and destructor helpers
 
-    public: // StreamingReporterBase
 
-        void noMatchingTestCases(std::string const& s) override;
+#include <type_traits>
 
-        void testRunStarting(TestRunInfo const& testInfo) override;
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, bool Destruct>
+            struct ObjectStorage
+            {
+                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
 
-        void testGroupStarting(GroupInfo const& groupInfo) override;
+                ObjectStorage() : data() {}
 
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
+                ObjectStorage(const ObjectStorage& other)
+                {
+                    new(&data) T(other.stored_object());
+                }
 
-        void sectionStarting(SectionInfo const& sectionInfo) override;
+                ObjectStorage(ObjectStorage&& other)
+                {
+                    new(&data) T(std::move(other.stored_object()));
+                }
 
-        void assertionStarting(AssertionInfo const&) override;
+                ~ObjectStorage() { destruct_on_exit<T>(); }
 
-        bool assertionEnded(AssertionStats const& assertionStats) override;
+                template <typename... Args>
+                void construct(Args&&... args)
+                {
+                    new (&data) T(std::forward<Args>(args)...);
+                }
 
-        void sectionEnded(SectionStats const& sectionStats) override;
+                template <bool AllowManualDestruction = !Destruct>
+                typename std::enable_if<AllowManualDestruction>::type destruct()
+                {
+                    stored_object().~T();
+                }
 
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+            private:
+                // If this is a constructor benchmark, destruct the underlying object
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
+                // Otherwise, don't
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
 
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
 
-        void testRunEnded(TestRunStats const& testRunStats) override;
+                T const& stored_object() const {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
 
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
+                TStorage data;
+            };
+        }
 
-} // end namespace Catch
+        template <typename T>
+        using storage_for = Detail::ObjectStorage<T, true>;
 
-// end catch_reporter_xml.h
+        template <typename T>
+        using destructable_object = Detail::ObjectStorage<T, false>;
+    }
+}
 
-// end catch_external_interfaces.h
+// end catch_constructor.hpp
+// end catch_benchmarking_all.hpp
 #endif
 
 #endif // ! CATCH_CONFIG_IMPL_ONLY
@@ -4524,23 +7480,37 @@ namespace TestCaseTracking {
         SourceLineInfo location;
 
         NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
+            return lhs.name == rhs.name
+                && lhs.location == rhs.location;
+        }
     };
 
-    struct ITracker;
+    class ITracker;
 
     using ITrackerPtr = std::shared_ptr<ITracker>;
 
-    struct ITracker {
-        virtual ~ITracker();
+    class  ITracker {
+        NameAndLocation m_nameAndLocation;
+
+    public:
+        ITracker(NameAndLocation const& nameAndLoc) :
+            m_nameAndLocation(nameAndLoc)
+        {}
 
         // static queries
-        virtual NameAndLocation const& nameAndLocation() const = 0;
+        NameAndLocation const& nameAndLocation() const {
+            return m_nameAndLocation;
+        }
+
+        virtual ~ITracker();
 
         // dynamic queries
         virtual bool isComplete() const = 0; // Successfully completed or failed
         virtual bool isSuccessfullyCompleted() const = 0;
         virtual bool isOpen() const = 0; // Started but not complete
         virtual bool hasChildren() const = 0;
+        virtual bool hasStarted() const = 0;
 
         virtual ITracker& parent() = 0;
 
@@ -4555,7 +7525,7 @@ namespace TestCaseTracking {
 
         // Debug/ checking
         virtual bool isSectionTracker() const = 0;
-        virtual bool isIndexTracker() const = 0;
+        virtual bool isGeneratorTracker() const = 0;
     };
 
     class TrackerContext {
@@ -4572,8 +7542,6 @@ namespace TestCaseTracking {
 
     public:
 
-        static TrackerContext& instance();
-
         ITracker& startRun();
         void endRun();
 
@@ -4596,15 +7564,7 @@ namespace TestCaseTracking {
             Failed
         };
 
-        class TrackerHasName {
-            NameAndLocation m_nameAndLocation;
-        public:
-            TrackerHasName( NameAndLocation const& nameAndLocation );
-            bool operator ()( ITrackerPtr const& tracker ) const;
-        };
-
         using Children = std::vector<ITrackerPtr>;
-        NameAndLocation m_nameAndLocation;
         TrackerContext& m_ctx;
         ITracker* m_parent;
         Children m_children;
@@ -4613,11 +7573,13 @@ namespace TestCaseTracking {
     public:
         TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
 
-        NameAndLocation const& nameAndLocation() const override;
         bool isComplete() const override;
         bool isSuccessfullyCompleted() const override;
         bool isOpen() const override;
         bool hasChildren() const override;
+        bool hasStarted() const override {
+            return m_runState != NotStarted;
+        }
 
         void addChild( ITrackerPtr const& child ) override;
 
@@ -4627,7 +7589,7 @@ namespace TestCaseTracking {
         void openChild() override;
 
         bool isSectionTracker() const override;
-        bool isIndexTracker() const override;
+        bool isGeneratorTracker() const override;
 
         void open();
 
@@ -4642,33 +7604,24 @@ namespace TestCaseTracking {
 
     class SectionTracker : public TrackerBase {
         std::vector<std::string> m_filters;
+        std::string m_trimmed_name;
     public:
         SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
 
         bool isSectionTracker() const override;
 
+        bool isComplete() const override;
+
         static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
 
         void tryOpen();
 
         void addInitialFilters( std::vector<std::string> const& filters );
         void addNextFilters( std::vector<std::string> const& filters );
-    };
-
-    class IndexTracker : public TrackerBase {
-        int m_size;
-        int m_index = -1;
-    public:
-        IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size );
-
-        bool isIndexTracker() const override;
-        void close() override;
-
-        static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size );
-
-        int index() const;
-
-        void moveNext();
+        //! Returns filters active in this tracker
+        std::vector<std::string> const& getFilters() const;
+        //! Returns whitespace-trimmed name of the tracked section
+        std::string const& trimmedName() const;
     };
 
 } // namespace TestCaseTracking
@@ -4676,7 +7629,6 @@ namespace TestCaseTracking {
 using TestCaseTracking::ITracker;
 using TestCaseTracking::TrackerContext;
 using TestCaseTracking::SectionTracker;
-using TestCaseTracking::IndexTracker;
 
 } // namespace Catch
 
@@ -4688,11 +7640,223 @@ namespace Catch {
 
     struct LeakDetector {
         LeakDetector();
+        ~LeakDetector();
     };
 
 }
 // end catch_leak_detector.h
 // Cpp files will be included in the single-header file here
+// start catch_stats.cpp
+
+// Statistical analysis tools
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+
+#include <cassert>
+#include <random>
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace {
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
+            double diff = b - m;
+            return a + diff * diff;
+            }) / (last - first);
+            return std::sqrt(variance);
+    }
+
+}
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if (g == 0) return xj;
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;
+
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
+                };
+
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    return std::async(std::launch::async, [=] {
+                        std::mt19937 rng(seed);
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+// end catch_stats.cpp
 // start catch_approx.cpp
 
 #include <cmath>
@@ -4737,80 +7901,43 @@ namespace Detail {
     bool Approx::equalityComparisonImpl(const double other) const {
         // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
         // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin) || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(m_value)));
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
 
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        return *IMutableContext::currentContext;
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
     }
 
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
     }
 
-    void cleanUpContext();
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
 }
 
-// end catch_context.h
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
 // start catch_debugger.h
 
 namespace Catch {
@@ -4819,7 +7946,24 @@ namespace Catch {
 
 #ifdef CATCH_PLATFORM_MAC
 
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
+
+#elif defined(CATCH_PLATFORM_IPHONE)
+
+    // use inline assembler
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP()  __asm__("int $3")
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #elif defined(__arm__) && !defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
+    #elif defined(__arm__) &&  defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xde01")
+    #endif
 
 #elif defined(CATCH_PLATFORM_LINUX)
     // If we can use inline assembler, do it because this allows us to break
@@ -4839,13 +7983,12 @@ namespace Catch {
     #define CATCH_TRAP() DebugBreak()
 #endif
 
-#ifdef CATCH_TRAP
-    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { CATCH_TRAP(); }
-#else
-    namespace Catch {
-        inline void doNothing() {}
-    }
-    #define CATCH_BREAK_INTO_DEBUGGER() Catch::doNothing()
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+    #ifdef CATCH_TRAP
+        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+    #else
+        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+    #endif
 #endif
 
 // end catch_debugger.h
@@ -4853,86 +7996,58 @@ namespace Catch {
 
 // start catch_fatal_condition.h
 
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
+#include <cassert>
 
 namespace Catch {
 
-    struct FatalConditionHandler {
-
-        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+    // Wrapper for platform-specific fatal error (signals/SEH) handlers
+    //
+    // Tries to be cooperative with other handlers, and not step over
+    // other handlers. This means that unknown structured exceptions
+    // are passed on, previous signal handlers are called, and so on.
+    //
+    // Can only be instantiated once, and assumes that once a signal
+    // is caught, the binary will end up terminating. Thus, there
+    class FatalConditionHandler {
+        bool m_started = false;
+
+        // Install/disengage implementation for specific platform.
+        // Should be if-defed to work on current platform, can assume
+        // engage-disengage 1:1 pairing.
+        void engage_platform();
+        void disengage_platform();
+    public:
+        // Should also have platform-specific implementations as needed
         FatalConditionHandler();
-        static void reset();
         ~FatalConditionHandler();
 
-    private:
-        static bool isSet;
-        static ULONG guaranteeSize;
-        static PVOID exceptionHandlerHandle;
-    };
-
-} // namespace Catch
-
-#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct FatalConditionHandler {
-
-        static bool isSet;
-        static struct sigaction oldSigActions[];
-        static stack_t oldSigStack;
-        static char altStackMem[];
-
-        static void handleSignal( int sig );
+        void engage() {
+            assert(!m_started && "Handler cannot be installed twice.");
+            m_started = true;
+            engage_platform();
+        }
 
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-        static void reset();
+        void disengage() {
+            assert(m_started && "Handler cannot be uninstalled without being installed first");
+            m_started = false;
+            disengage_platform();
+        }
     };
 
-} // namespace Catch
-
-#else
-
-namespace Catch {
-    struct FatalConditionHandler {
-        void reset();
+    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
+    class FatalConditionHandlerGuard {
+        FatalConditionHandler* m_handler;
+    public:
+        FatalConditionHandlerGuard(FatalConditionHandler* handler):
+            m_handler(handler) {
+            m_handler->engage();
+        }
+        ~FatalConditionHandlerGuard() {
+            m_handler->disengage();
+        }
     };
-}
 
-#endif
+} // end namespace Catch
 
 // end catch_fatal_condition.h
 #include <string>
@@ -4992,12 +8107,20 @@ namespace Catch {
         void sectionEnded( SectionEndInfo const& endInfo ) override;
         void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
 
+        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing( std::string const& name ) override;
         void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats const& stats ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( std::string const& error ) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
         void pushScopedMessage( MessageInfo const& message ) override;
         void popScopedMessage( MessageInfo const& message ) override;
 
+        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
+
         std::string getCurrentTestName() const override;
 
         const AssertionResult* getLastResult() const override;
@@ -5038,22 +8161,26 @@ namespace Catch {
         TestRunInfo m_runInfo;
         IMutableContext& m_context;
         TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker;
+        ITracker* m_testCaseTracker = nullptr;
         Option<AssertionResult> m_lastResult;
 
         IConfigPtr m_config;
         Totals m_totals;
         IStreamingReporterPtr m_reporter;
         std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
         AssertionInfo m_lastAssertionInfo;
         std::vector<SectionEndInfo> m_unfinishedSections;
         std::vector<ITracker*> m_activeSections;
         TrackerContext m_trackerContext;
+        FatalConditionHandler m_fatalConditionhandler;
         bool m_lastAssertionPassed = false;
         bool m_shouldReportUnexpected = true;
         bool m_includeSuccessfulResults;
     };
 
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
 } // end namespace Catch
 
 // end catch_run_context.h
@@ -5093,7 +8220,7 @@ namespace Catch {
     }
 
     AssertionHandler::AssertionHandler
-        (   StringRef macroName,
+        (   StringRef const& macroName,
             SourceLineInfo const& lineInfo,
             StringRef capturedExpression,
             ResultDisposition::Flags resultDisposition )
@@ -5122,8 +8249,13 @@ namespace Catch {
             // (To go back to the test and change execution, jump over the throw, next)
             CATCH_BREAK_INTO_DEBUGGER();
         }
-        if( m_reaction.shouldThrow )
+        if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
             throw Catch::TestFailureException();
+#else
+            CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+        }
     }
     void AssertionHandler::setCompleted() {
         m_completed = true;
@@ -5150,7 +8282,7 @@ namespace Catch {
 
     // This is the overload that takes a string and infers the Equals matcher from it
     // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef matcherString  ) {
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
         handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
     }
 
@@ -5195,7 +8327,7 @@ namespace Catch {
     }
 
     bool AssertionResult::hasExpression() const {
-        return m_info.capturedExpression[0] != 0;
+        return !m_info.capturedExpression.empty();
     }
 
     bool AssertionResult::hasMessage() const {
@@ -5203,16 +8335,22 @@ namespace Catch {
     }
 
     std::string AssertionResult::getExpression() const {
-        if( isFalseTest( m_info.resultDisposition ) )
-            return "!(" + m_info.capturedExpression + ")";
-        else
-            return m_info.capturedExpression;
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
     }
 
     std::string AssertionResult::getExpressionInMacro() const {
         std::string expr;
-        if( m_info.macroName[0] == 0 )
-            expr = m_info.capturedExpression;
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
         else {
             expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
             expr += m_info.macroName;
@@ -5247,32 +8385,6 @@ namespace Catch {
 
 } // end namespace Catch
 // end catch_assertionresult.cpp
-// start catch_benchmark.cpp
-
-namespace Catch {
-
-    auto BenchmarkLooper::getResolution() -> uint64_t {
-        return getEstimatedClockResolution() * getCurrentContext().getConfig()->benchmarkResolutionMultiple();
-    }
-
-    void BenchmarkLooper::reportStart() {
-        getResultCapture().benchmarkStarting( { m_name } );
-    }
-    auto BenchmarkLooper::needsMoreIterations() -> bool {
-        auto elapsed = m_timer.getElapsedNanoseconds();
-
-        // Exponentially increasing iterations until we're confident in our timer resolution
-        if( elapsed < m_resolution ) {
-            m_iterationsToRun *= 10;
-            return true;
-        }
-
-        getResultCapture().benchmarkEnded( { { m_name }, m_count, elapsed } );
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_benchmark.cpp
 // start catch_capture_matchers.cpp
 
 namespace Catch {
@@ -5282,7 +8394,7 @@ namespace Catch {
     // This is the general overload that takes a any string matcher
     // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
     // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef matcherString  ) {
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
         std::string exceptionMessage = Catch::translateActiveException();
         MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
         handler.handleExpr( expr );
@@ -5318,7 +8430,7 @@ namespace Catch {
 //
 // See https://github.com/philsquared/Clara for more details
 
-// Clara v1.1.4
+// Clara v1.1.5
 
 
 #ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
@@ -5344,8 +8456,8 @@ namespace Catch {
 //
 // A single-header library for wrapping and laying out basic text, by Phil Nash
 //
-// This work is licensed under the BSD 2-Clause license.
-// See the accompanying LICENSE file, or the one at https://opensource.org/licenses/BSD-2-Clause
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 // This project is hosted at https://github.com/philsquared/textflowcpp
 
@@ -5359,314 +8471,328 @@ namespace Catch {
 #define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
 #endif
 
-namespace Catch { namespace clara { namespace TextFlow {
-
-    inline auto isWhitespace( char c ) -> bool {
-        static std::string chars = " \t\n\r";
-        return chars.find( c ) != std::string::npos;
-    }
-    inline auto isBreakableBefore( char c ) -> bool {
-        static std::string chars = "[({<|";
-        return chars.find( c ) != std::string::npos;
-    }
-    inline auto isBreakableAfter( char c ) -> bool {
-        static std::string chars = "])}>.,:;*+-=&/\\";
-        return chars.find( c ) != std::string::npos;
-    }
-
-    class Columns;
-
-    class Column {
-        std::vector<std::string> m_strings;
-        size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-        size_t m_indent = 0;
-        size_t m_initialIndent = std::string::npos;
-
-    public:
-        class iterator {
-            friend Column;
-
-            Column const& m_column;
-            size_t m_stringIndex = 0;
-            size_t m_pos = 0;
-
-            size_t m_len = 0;
-            size_t m_end = 0;
-            bool m_suffix = false;
-
-            iterator( Column const& column, size_t stringIndex )
-            :   m_column( column ),
-                m_stringIndex( stringIndex )
-            {}
-
-            auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-            auto isBoundary( size_t at ) const -> bool {
-                assert( at > 0 );
-                assert( at <= line().size() );
-
-                return at == line().size() ||
-                       ( isWhitespace( line()[at] ) && !isWhitespace( line()[at-1] ) ) ||
-                       isBreakableBefore( line()[at] ) ||
-                       isBreakableAfter( line()[at-1] );
-            }
-
-            void calcLength() {
-                assert( m_stringIndex < m_column.m_strings.size() );
-
-                m_suffix = false;
-                auto width = m_column.m_width-indent();
-                m_end = m_pos;
-                while( m_end < line().size() && line()[m_end] != '\n' )
-                    ++m_end;
-
-                if( m_end < m_pos + width ) {
-                    m_len = m_end - m_pos;
-                }
-                else {
-                    size_t len = width;
-                    while (len > 0 && !isBoundary(m_pos + len))
-                        --len;
-                    while (len > 0 && isWhitespace( line()[m_pos + len - 1] ))
-                        --len;
-
-                    if (len > 0) {
-                        m_len = len;
-                    } else {
-                        m_suffix = true;
-                        m_len = width - 1;
-                    }
-                }
-            }
-
-            auto indent() const -> size_t {
-                auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-                return initial == std::string::npos ? m_column.m_indent : initial;
-            }
-
-            auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-                return std::string( indent(), ' ' ) + (m_suffix ? plain + "-" : plain);
-            }
-
-        public:
-            explicit iterator( Column const& column ) : m_column( column ) {
-                assert( m_column.m_width > m_column.m_indent );
-                assert( m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent );
-                calcLength();
-                if( m_len == 0 )
-                    m_stringIndex++; // Empty string
-            }
-
-            auto operator *() const -> std::string {
-                assert( m_stringIndex < m_column.m_strings.size() );
-                assert( m_pos <= m_end );
-                if( m_pos + m_column.m_width < m_end )
-                    return addIndentAndSuffix(line().substr(m_pos, m_len));
-                else
-                    return addIndentAndSuffix(line().substr(m_pos, m_end - m_pos));
-            }
-
-            auto operator ++() -> iterator& {
-                m_pos += m_len;
-                if( m_pos < line().size() && line()[m_pos] == '\n' )
-                    m_pos += 1;
-                else
-                    while( m_pos < line().size() && isWhitespace( line()[m_pos] ) )
-                        ++m_pos;
-
-                if( m_pos == line().size() ) {
-                    m_pos = 0;
-                    ++m_stringIndex;
-                }
-                if( m_stringIndex < m_column.m_strings.size() )
-                    calcLength();
-                return *this;
-            }
-            auto operator ++(int) -> iterator {
-                iterator prev( *this );
-                operator++();
-                return prev;
-            }
-
-            auto operator ==( iterator const& other ) const -> bool {
-                return
-                    m_pos == other.m_pos &&
-                    m_stringIndex == other.m_stringIndex &&
-                    &m_column == &other.m_column;
-            }
-            auto operator !=( iterator const& other ) const -> bool {
-                return !operator==( other );
-            }
-        };
-        using const_iterator = iterator;
-
-        explicit Column( std::string const& text ) { m_strings.push_back( text ); }
-
-        auto width( size_t newWidth ) -> Column& {
-            assert( newWidth > 0 );
-            m_width = newWidth;
-            return *this;
-        }
-        auto indent( size_t newIndent ) -> Column& {
-            m_indent = newIndent;
-            return *this;
-        }
-        auto initialIndent( size_t newIndent ) -> Column& {
-            m_initialIndent = newIndent;
-            return *this;
-        }
-
-        auto width() const -> size_t { return m_width; }
-        auto begin() const -> iterator { return iterator( *this ); }
-        auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-        inline friend std::ostream& operator << ( std::ostream& os, Column const& col ) {
-            bool first = true;
-            for( auto line : col ) {
-                if( first )
-                    first = false;
-                else
-                    os << "\n";
-                os <<  line;
-            }
-            return os;
-        }
-
-        auto operator + ( Column const& other ) -> Columns;
-
-        auto toString() const -> std::string {
-            std::ostringstream oss;
-            oss << *this;
-            return oss.str();
-        }
-    };
-
-    class Spacer : public Column {
-
-    public:
-        explicit Spacer( size_t spaceWidth ) : Column( "" ) {
-            width( spaceWidth );
-        }
-    };
+namespace Catch {
+namespace clara {
+namespace TextFlow {
 
-    class Columns {
-        std::vector<Column> m_columns;
+inline auto isWhitespace(char c) -> bool {
+	static std::string chars = " \t\n\r";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+	static std::string chars = "[({<|";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+	static std::string chars = "])}>.,:;*+-=&/\\";
+	return chars.find(c) != std::string::npos;
+}
 
-    public:
+class Columns;
 
-        class iterator {
-            friend Columns;
-            struct EndTag {};
+class Column {
+	std::vector<std::string> m_strings;
+	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+	size_t m_indent = 0;
+	size_t m_initialIndent = std::string::npos;
 
-            std::vector<Column> const& m_columns;
-            std::vector<Column::iterator> m_iterators;
-            size_t m_activeIterators;
+public:
+	class iterator {
+		friend Column;
+
+		Column const& m_column;
+		size_t m_stringIndex = 0;
+		size_t m_pos = 0;
+
+		size_t m_len = 0;
+		size_t m_end = 0;
+		bool m_suffix = false;
+
+		iterator(Column const& column, size_t stringIndex)
+			: m_column(column),
+			m_stringIndex(stringIndex) {}
+
+		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+		auto isBoundary(size_t at) const -> bool {
+			assert(at > 0);
+			assert(at <= line().size());
+
+			return at == line().size() ||
+				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+				isBreakableBefore(line()[at]) ||
+				isBreakableAfter(line()[at - 1]);
+		}
+
+		void calcLength() {
+			assert(m_stringIndex < m_column.m_strings.size());
+
+			m_suffix = false;
+			auto width = m_column.m_width - indent();
+			m_end = m_pos;
+			if (line()[m_pos] == '\n') {
+				++m_end;
+			}
+			while (m_end < line().size() && line()[m_end] != '\n')
+				++m_end;
+
+			if (m_end < m_pos + width) {
+				m_len = m_end - m_pos;
+			} else {
+				size_t len = width;
+				while (len > 0 && !isBoundary(m_pos + len))
+					--len;
+				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+					--len;
+
+				if (len > 0) {
+					m_len = len;
+				} else {
+					m_suffix = true;
+					m_len = width - 1;
+				}
+			}
+		}
+
+		auto indent() const -> size_t {
+			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+			return initial == std::string::npos ? m_column.m_indent : initial;
+		}
+
+		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Column const& column) : m_column(column) {
+			assert(m_column.m_width > m_column.m_indent);
+			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+			calcLength();
+			if (m_len == 0)
+				m_stringIndex++; // Empty string
+		}
+
+		auto operator *() const -> std::string {
+			assert(m_stringIndex < m_column.m_strings.size());
+			assert(m_pos <= m_end);
+			return addIndentAndSuffix(line().substr(m_pos, m_len));
+		}
+
+		auto operator ++() -> iterator& {
+			m_pos += m_len;
+			if (m_pos < line().size() && line()[m_pos] == '\n')
+				m_pos += 1;
+			else
+				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+					++m_pos;
+
+			if (m_pos == line().size()) {
+				m_pos = 0;
+				++m_stringIndex;
+			}
+			if (m_stringIndex < m_column.m_strings.size())
+				calcLength();
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return
+				m_pos == other.m_pos &&
+				m_stringIndex == other.m_stringIndex &&
+				&m_column == &other.m_column;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return !operator==(other);
+		}
+	};
+	using const_iterator = iterator;
+
+	explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+	auto width(size_t newWidth) -> Column& {
+		assert(newWidth > 0);
+		m_width = newWidth;
+		return *this;
+	}
+	auto indent(size_t newIndent) -> Column& {
+		m_indent = newIndent;
+		return *this;
+	}
+	auto initialIndent(size_t newIndent) -> Column& {
+		m_initialIndent = newIndent;
+		return *this;
+	}
 
-            iterator( Columns const& columns, EndTag )
-            :   m_columns( columns.m_columns ),
-                m_activeIterators( 0 )
-            {
-                m_iterators.reserve( m_columns.size() );
+	auto width() const -> size_t { return m_width; }
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+		bool first = true;
+		for (auto line : col) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
 
-                for( auto const& col : m_columns )
-                    m_iterators.push_back( col.end() );
-            }
+	auto operator + (Column const& other)->Columns;
 
-        public:
-            explicit iterator( Columns const& columns )
-            :   m_columns( columns.m_columns ),
-                m_activeIterators( m_columns.size() )
-            {
-                m_iterators.reserve( m_columns.size() );
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
 
-                for( auto const& col : m_columns )
-                    m_iterators.push_back( col.begin() );
-            }
+class Spacer : public Column {
 
-            auto operator ==( iterator const& other ) const -> bool {
-                return m_iterators == other.m_iterators;
-            }
-            auto operator !=( iterator const& other ) const -> bool {
-                return m_iterators != other.m_iterators;
-            }
-            auto operator *() const -> std::string {
-                std::string row, padding;
+public:
+	explicit Spacer(size_t spaceWidth) : Column("") {
+		width(spaceWidth);
+	}
+};
 
-                for( size_t i = 0; i < m_columns.size(); ++i ) {
-                    auto width = m_columns[i].width();
-                    if( m_iterators[i] != m_columns[i].end() ) {
-                        std::string col = *m_iterators[i];
-                        row += padding + col;
-                        if( col.size() < width )
-                            padding = std::string( width - col.size(), ' ' );
-                        else
-                            padding = "";
-                    }
-                    else {
-                        padding += std::string( width, ' ' );
-                    }
-                }
-                return row;
-            }
-            auto operator ++() -> iterator& {
-                for( size_t i = 0; i < m_columns.size(); ++i ) {
-                    if (m_iterators[i] != m_columns[i].end())
-                        ++m_iterators[i];
-                }
-                return *this;
-            }
-            auto operator ++(int) -> iterator {
-                iterator prev( *this );
-                operator++();
-                return prev;
-            }
-        };
-        using const_iterator = iterator;
+class Columns {
+	std::vector<Column> m_columns;
 
-        auto begin() const -> iterator { return iterator( *this ); }
-        auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+public:
 
-        auto operator += ( Column const& col ) -> Columns& {
-            m_columns.push_back( col );
-            return *this;
-        }
-        auto operator + ( Column const& col ) -> Columns {
-            Columns combined = *this;
-            combined += col;
-            return combined;
-        }
+	class iterator {
+		friend Columns;
+		struct EndTag {};
+
+		std::vector<Column> const& m_columns;
+		std::vector<Column::iterator> m_iterators;
+		size_t m_activeIterators;
+
+		iterator(Columns const& columns, EndTag)
+			: m_columns(columns.m_columns),
+			m_activeIterators(0) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.end());
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Columns const& columns)
+			: m_columns(columns.m_columns),
+			m_activeIterators(m_columns.size()) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.begin());
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return m_iterators == other.m_iterators;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return m_iterators != other.m_iterators;
+		}
+		auto operator *() const -> std::string {
+			std::string row, padding;
+
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				auto width = m_columns[i].width();
+				if (m_iterators[i] != m_columns[i].end()) {
+					std::string col = *m_iterators[i];
+					row += padding + col;
+					if (col.size() < width)
+						padding = std::string(width - col.size(), ' ');
+					else
+						padding = "";
+				} else {
+					padding += std::string(width, ' ');
+				}
+			}
+			return row;
+		}
+		auto operator ++() -> iterator& {
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				if (m_iterators[i] != m_columns[i].end())
+					++m_iterators[i];
+			}
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+	};
+	using const_iterator = iterator;
+
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+	auto operator += (Column const& col) -> Columns& {
+		m_columns.push_back(col);
+		return *this;
+	}
+	auto operator + (Column const& col) -> Columns {
+		Columns combined = *this;
+		combined += col;
+		return combined;
+	}
 
-        inline friend std::ostream& operator << ( std::ostream& os, Columns const& cols ) {
+	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+		bool first = true;
+		for (auto line : cols) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
 
-            bool first = true;
-            for( auto line : cols ) {
-                if( first )
-                    first = false;
-                else
-                    os << "\n";
-                os << line;
-            }
-            return os;
-        }
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
 
-        auto toString() const -> std::string {
-            std::ostringstream oss;
-            oss << *this;
-            return oss.str();
-        }
-    };
+inline auto Column::operator + (Column const& other) -> Columns {
+	Columns cols;
+	cols += *this;
+	cols += other;
+	return cols;
+}
+}
 
-    inline auto Column::operator + ( Column const& other ) -> Columns {
-        Columns cols;
-        cols += *this;
-        cols += other;
-        return cols;
-    }
-}}} // namespace Catch::clara::TextFlow
+}
+}
 
 // ----------- end of #include from clara_textflow.hpp -----------
 // ........... back in clara.hpp
 
+#include <cctype>
+#include <string>
 #include <memory>
 #include <set>
 #include <algorithm>
@@ -5958,7 +9084,7 @@ namespace detail {
     }
     inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
         std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( char c ) { return static_cast<char>( ::tolower(c) ); } );
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
         if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
             target = true;
         else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
@@ -6606,9 +9732,14 @@ namespace Catch {
                     if( !line.empty() && !startsWith( line, '#' ) ) {
                         if( !startsWith( line, '"' ) )
                             line = '"' + line + '"';
-                        config.testsOrTags.push_back( line + ',' );
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.emplace_back( "," );
                     }
                 }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
                 return ParserResult::ok( ParseResultType::Matched );
             };
         auto const setTestOrder = [&]( std::string const& order ) {
@@ -6643,14 +9774,16 @@ namespace Catch {
             };
         auto const setWaitForKeypress = [&]( std::string const& keypress ) {
                 auto keypressLc = toLower( keypress );
-                if( keypressLc == "start" )
+                if (keypressLc == "never")
+                    config.waitForKeypress = WaitForKeypress::Never;
+                else if( keypressLc == "start" )
                     config.waitForKeypress = WaitForKeypress::BeforeStart;
                 else if( keypressLc == "exit" )
                     config.waitForKeypress = WaitForKeypress::BeforeExit;
                 else if( keypressLc == "both" )
                     config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
                 else
-                    return ParserResult::runtimeError( "keypress argument must be one of: start, exit or both. '" + keypress + "' not recognised" );
+                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
             return ParserResult::ok( ParseResultType::Matched );
             };
         auto const setVerbosity = [&]( std::string const& verbosity ) {
@@ -6665,6 +9798,18 @@ namespace Catch {
                 return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
             return ParserResult::ok( ParseResultType::Matched );
         };
+        auto const setReporter = [&]( std::string const& reporter ) {
+            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+            auto lcReporter = toLower( reporter );
+            auto result = factories.find( lcReporter );
+
+            if( factories.end() != result )
+                config.reporterName = lcReporter;
+            else
+                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
 
         auto cli
             = ExeName( config.processName )
@@ -6690,7 +9835,7 @@ namespace Catch {
             | Opt( config.outputFilename, "filename" )
                 ["-o"]["--out"]
                 ( "output filename" )
-            | Opt( config.reporterName, "name" )
+            | Opt( setReporter, "name" )
                 ["-r"]["--reporter"]
                 ( "reporter to use (defaults to console)" )
             | Opt( config.name, "name" )
@@ -6708,6 +9853,9 @@ namespace Catch {
             | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
                 ["-d"]["--durations"]
                 ( "show test durations" )
+            | Opt( config.minDuration, "seconds" )
+                ["-D"]["--min-duration"]
+                ( "show test durations for tests taking at least the given number of seconds" )
             | Opt( loadTestNamesFromFile, "filename" )
                 ["-f"]["--input-file"]
                 ( "load test names to run from a file" )
@@ -6738,13 +9886,24 @@ namespace Catch {
             | Opt( config.libIdentify )
                 ["--libidentify"]
                 ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "start|exit|both" )
+            | Opt( setWaitForKeypress, "never|start|exit|both" )
                 ["--wait-for-keypress"]
                 ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkResolutionMultiple, "multiplier" )
-                ["--benchmark-resolution-multiple"]
-                ( "multiple of clock resolution to run benchmarks" )
-
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
+                ["--benchmark-warmup-time"]
+                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
             | Arg( config.testsOrTags, "test name|pattern|tags" )
                 ( "which test or tests to use" );
 
@@ -6760,14 +9919,13 @@ namespace Catch {
 
 namespace Catch {
 
-    bool SourceLineInfo::empty() const noexcept {
-        return file[0] == '\0';
-    }
     bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
         return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
     }
     bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        return line < other.line || ( line == other.line && (std::strcmp(file, other.file) < 0));
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
     }
 
     std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
@@ -6790,34 +9948,29 @@ namespace Catch {
 // end catch_common.cpp
 // start catch_config.cpp
 
-// start catch_enforce.h
-
-#include <stdexcept>
-
-#define CATCH_PREPARE_EXCEPTION( type, msg ) \
-    type( ( Catch::ReusableStringStream() << msg ).str() )
-#define CATCH_INTERNAL_ERROR( msg ) \
-    throw CATCH_PREPARE_EXCEPTION( std::logic_error, CATCH_INTERNAL_LINEINFO << ": Internal Catch error: " << msg);
-#define CATCH_ERROR( msg ) \
-    throw CATCH_PREPARE_EXCEPTION( std::domain_error, msg )
-#define CATCH_ENFORCE( condition, msg ) \
-    do{ if( !(condition) ) CATCH_ERROR( msg ); } while(false)
-
-// end catch_enforce.h
 namespace Catch {
 
     Config::Config( ConfigData const& data )
     :   m_data( data ),
         m_stream( openStream() )
     {
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (data.testsOrTags.empty()) {
-            parser.parse("~[.]"); // All not hidden tests
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
         }
-        else {
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
             m_hasTestFilters = true;
-            for( auto const& testOrTags : data.testsOrTags )
-                parser.parse( testOrTags );
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
         }
         m_testSpec = parser.testSpec();
     }
@@ -6850,15 +10003,21 @@ namespace Catch {
     bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
     bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
     ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    double Config::minDuration() const                 { return m_data.minDuration; }
     RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
     unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    int Config::benchmarkResolutionMultiple() const    { return m_data.benchmarkResolutionMultiple; }
     UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
     bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
     int Config::abortAfter() const                     { return m_data.abortAfter; }
     bool Config::showInvisibles() const                { return m_data.showInvisibles; }
     Verbosity Config::verbosity() const                { return m_data.verbosity; }
 
+    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
+    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
+    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
+
     IStream const* Config::openStream() {
         return Catch::makeStream(m_data.outputFilename);
     }
@@ -6887,6 +10046,36 @@ namespace Catch {
 }
 
 // end catch_errno_guard.h
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
 #include <sstream>
 
 namespace Catch {
@@ -6898,7 +10087,7 @@ namespace Catch {
         };
 
         struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) {}
+            void use( Colour::Code ) override {}
 
             static IColourImpl* instance() {
                 static NoColourImpl s_instance;
@@ -6932,7 +10121,7 @@ namespace {
             originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
         }
 
-        virtual void use( Colour::Code _colourCode ) override {
+        void use( Colour::Code _colourCode ) override {
             switch( _colourCode ) {
                 case Colour::None:      return setTextAttribute( originalForegroundAttributes );
                 case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
@@ -6995,7 +10184,7 @@ namespace {
     // https://github.com/philsquared/Catch/pull/131
     class PosixColourImpl : public IColourImpl {
     public:
-        virtual void use( Colour::Code _colourCode ) override {
+        void use( Colour::Code _colourCode ) override {
             switch( _colourCode ) {
                 case Colour::None:
                 case Colour::White:     return setColour( "[0m" );
@@ -7023,13 +10212,14 @@ namespace {
 
     private:
         void setColour( const char* _escapeCode ) {
-            Catch::cout() << '\033' << _escapeCode;
+            getCurrentContext().getConfig()->stream()
+                << '\033' << _escapeCode;
         }
     };
 
     bool useColourOnPlatform() {
         return
-#ifdef CATCH_PLATFORM_MAC
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
             !isDebuggerActive() &&
 #endif
 #if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
@@ -7070,13 +10260,13 @@ namespace Catch {
 namespace Catch {
 
     Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& rhs ) noexcept {
-        m_moved = rhs.m_moved;
-        rhs.m_moved = true;
+    Colour::Colour( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved = true;
     }
-    Colour& Colour::operator=( Colour&& rhs ) noexcept {
-        m_moved = rhs.m_moved;
-        rhs.m_moved  = true;
+    Colour& Colour::operator=( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved  = true;
         return *this;
     }
 
@@ -7084,7 +10274,13 @@ namespace Catch {
 
     void Colour::use( Code _colourCode ) {
         static IColourImpl* impl = platformColourInstance();
-        impl->use( _colourCode );
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != nullptr) {
+            impl->use( _colourCode );
+        }
     }
 
     std::ostream& operator << ( std::ostream& os, Colour const& ) {
@@ -7105,27 +10301,27 @@ namespace Catch {
     class Context : public IMutableContext, NonCopyable {
 
     public: // IContext
-        virtual IResultCapture* getResultCapture() override {
+        IResultCapture* getResultCapture() override {
             return m_resultCapture;
         }
-        virtual IRunner* getRunner() override {
+        IRunner* getRunner() override {
             return m_runner;
         }
 
-        virtual IConfigPtr const& getConfig() const override {
+        IConfigPtr const& getConfig() const override {
             return m_config;
         }
 
-        virtual ~Context() override;
+        ~Context() override;
 
     public: // IMutableContext
-        virtual void setResultCapture( IResultCapture* resultCapture ) override {
+        void setResultCapture( IResultCapture* resultCapture ) override {
             m_resultCapture = resultCapture;
         }
-        virtual void setRunner( IRunner* runner ) override {
+        void setRunner( IRunner* runner ) override {
             m_runner = runner;
         }
-        virtual void setConfig( IConfigPtr const& config ) override {
+        void setConfig( IConfigPtr const& config ) override {
             m_config = config;
         }
 
@@ -7151,6 +10347,12 @@ namespace Catch {
     IContext::~IContext() = default;
     IMutableContext::~IMutableContext() = default;
     Context::~Context() = default;
+
+    SimplePcg32& rng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
 }
 // end catch_context.cpp
 // start catch_debug_console.cpp
@@ -7164,7 +10366,16 @@ namespace Catch {
 }
 
 // end catch_debug_console.h
-#ifdef CATCH_PLATFORM_WINDOWS
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
 
     namespace Catch {
         void writeToDebugConsole( std::string const& text ) {
@@ -7185,25 +10396,28 @@ namespace Catch {
 // end catch_debug_console.cpp
 // start catch_debugger.cpp
 
-#ifdef CATCH_PLATFORM_MAC
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
 
-#  include <assert.h>
-#  include <stdbool.h>
+#  include <cassert>
 #  include <sys/types.h>
 #  include <unistd.h>
-#  include <sys/sysctl.h>
 #  include <cstddef>
 #  include <ostream>
 
-namespace Catch {
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
 
+    namespace Catch {
+        #ifdef __apple_build_version__
         // The following function is taken directly from the following technical note:
-        // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
 
         // Returns true if the current process is being debugged (either
         // running under the debugger or has a debugger attached post facto).
         bool isDebuggerActive(){
-
             int                 mib[4];
             struct kinfo_proc   info;
             std::size_t         size;
@@ -7233,6 +10447,12 @@ namespace Catch {
 
             return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
         }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
     } // namespace Catch
 
 #elif defined(CATCH_PLATFORM_LINUX)
@@ -7301,6 +10521,129 @@ namespace Catch {
     }
 }
 // end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+#include <stdexcept>
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_enum_values_registry.cpp
+// start catch_enum_values_registry.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    namespace Detail {
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+// end catch_enum_values_registry.h
+
+#include <map>
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurrence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() {}
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.emplace_back(value, valueNames[i++]);
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+// end catch_enum_values_registry.cpp
 // start catch_errno_guard.cpp
 
 #include <cerrno>
@@ -7324,7 +10667,7 @@ namespace Catch {
     public:
         ~ExceptionTranslatorRegistry();
         virtual void registerTranslator( const IExceptionTranslator* translator );
-        virtual std::string translateActiveException() const override;
+        std::string translateActiveException() const override;
         std::string tryTranslators() const;
 
     private:
@@ -7346,6 +10689,7 @@ namespace Catch {
         m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
     }
 
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
     std::string ExceptionTranslatorRegistry::translateActiveException() const {
         try {
 #ifdef __OBJC__
@@ -7389,47 +10733,81 @@ namespace Catch {
     }
 
     std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if( m_translators.empty() )
+        if (m_translators.empty()) {
             std::rethrow_exception(std::current_exception());
-        else
-            return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() );
+        } else {
+            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
     }
+#endif
+
 }
 // end catch_exception_translator_registry.cpp
 // start catch_fatal_condition.cpp
 
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
+#include <algorithm>
+
+#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    // If neither SEH nor signal handling is required, the handler impls
+    // do not have to do anything, and can be empty.
+    void FatalConditionHandler::engage_platform() {}
+    void FatalConditionHandler::disengage_platform() {}
+    FatalConditionHandler::FatalConditionHandler() = default;
+    FatalConditionHandler::~FatalConditionHandler() = default;
+
+} // end namespace Catch
+
+#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
+#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
+#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
 
 #if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
 
 namespace {
-    // Report the error condition
+    //! Signals fatal error message to the run context
     void reportFatal( char const * const message ) {
         Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
     }
-}
 
-#endif // signals/SEH handling
+    //! Minimal size Catch2 needs for its own fatal error handling.
+    //! Picked anecdotally, so it might not be sufficient on all
+    //! platforms, and for all configurations.
+    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
+} // end unnamed namespace
+
+#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
 
 #if defined( CATCH_CONFIG_WINDOWS_SEH )
 
 namespace Catch {
+
     struct SignalDefs { DWORD id; const char* name; };
 
     // There is no 1-1 mapping between signals and windows exceptions.
     // Windows can easily distinguish between SO and SigSegV,
     // but SigInt, SigTerm, etc are handled differently.
     static SignalDefs signalDefs[] = {
-        { EXCEPTION_ILLEGAL_INSTRUCTION,  "SIGILL - Illegal instruction signal" },
-        { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" },
-        { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" },
-        { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" },
+        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
+        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
+        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
+        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
     };
 
-    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+    static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
         for (auto const& def : signalDefs) {
             if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
                 reportFatal(def.name);
@@ -7440,38 +10818,50 @@ namespace Catch {
         return EXCEPTION_CONTINUE_SEARCH;
     }
 
+    // Since we do not support multiple instantiations, we put these
+    // into global variables and rely on cleaning them up in outlined
+    // constructors/destructors
+    static PVOID exceptionHandlerHandle = nullptr;
+
+    // For MSVC, we reserve part of the stack memory for handling
+    // memory overflow structured exception.
     FatalConditionHandler::FatalConditionHandler() {
-        isSet = true;
-        // 32k seems enough for Catch to handle stack overflow,
-        // but the value was found experimentally, so there is no strong guarantee
-        guaranteeSize = 32 * 1024;
-        exceptionHandlerHandle = nullptr;
+        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
+        if (!SetThreadStackGuarantee(&guaranteeSize)) {
+            // We do not want to fully error out, because needing
+            // the stack reserve should be rare enough anyway.
+            Catch::cerr()
+                << "Failed to reserve piece of stack."
+                << " Stack overflows will not be reported successfully.";
+        }
+    }
+
+    // We do not attempt to unset the stack guarantee, because
+    // Windows does not support lowering the stack size guarantee.
+    FatalConditionHandler::~FatalConditionHandler() = default;
+
+    void FatalConditionHandler::engage_platform() {
         // Register as first handler in current chain
         exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        // Pass in guarantee size to be filled
-        SetThreadStackGuarantee(&guaranteeSize);
+        if (!exceptionHandlerHandle) {
+            CATCH_RUNTIME_ERROR("Could not register vectored exception handler");
+        }
     }
 
-    void FatalConditionHandler::reset() {
-        if (isSet) {
-            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
-            SetThreadStackGuarantee(&guaranteeSize);
-            exceptionHandlerHandle = nullptr;
-            isSet = false;
+    void FatalConditionHandler::disengage_platform() {
+        if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) {
+            CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler");
         }
+        exceptionHandlerHandle = nullptr;
     }
 
-    FatalConditionHandler::~FatalConditionHandler() {
-        reset();
-    }
+} // end namespace Catch
 
-bool FatalConditionHandler::isSet = false;
-ULONG FatalConditionHandler::guaranteeSize = 0;
-PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+#endif // CATCH_CONFIG_WINDOWS_SEH
 
-} // namespace Catch
+#if defined( CATCH_CONFIG_POSIX_SIGNALS )
 
-#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+#include <signal.h>
 
 namespace Catch {
 
@@ -7480,10 +10870,6 @@ namespace Catch {
         const char* name;
     };
 
-    // 32kb for the alternate stack seems to be sufficient. However, this value
-    // is experimentally determined, so that's not guaranteed.
-    constexpr static std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
-
     static SignalDefs signalDefs[] = {
         { SIGINT,  "SIGINT - Terminal interrupt signal" },
         { SIGILL,  "SIGILL - Illegal instruction signal" },
@@ -7493,7 +10879,32 @@ namespace Catch {
         { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
     };
 
-    void FatalConditionHandler::handleSignal( int sig ) {
+// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
+// which is zero initialization, but not explicit. We want to avoid
+// that.
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+    static char* altStackMem = nullptr;
+    static std::size_t altStackSize = 0;
+    static stack_t oldSigStack{};
+    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
+
+    static void restorePreviousSignalHandlers() {
+        // We set signal handlers back to the previous ones. Hopefully
+        // nobody overwrote them in the meantime, and doesn't expect
+        // their signal handlers to live past ours given that they
+        // installed them after ours..
+        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+        }
+        // Return the old stack
+        sigaltstack(&oldSigStack, nullptr);
+    }
+
+    static void handleSignal( int sig ) {
         char const * name = "<unknown signal>";
         for (auto const& def : signalDefs) {
             if (sig == def.id) {
@@ -7501,16 +10912,33 @@ namespace Catch {
                 break;
             }
         }
-        reset();
-        reportFatal(name);
+        // We need to restore previous signal handlers and let them do
+        // their thing, so that the users can have the debugger break
+        // when a signal is raised, and so on.
+        restorePreviousSignalHandlers();
+        reportFatal( name );
         raise( sig );
     }
 
     FatalConditionHandler::FatalConditionHandler() {
-        isSet = true;
+        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
+        if (altStackSize == 0) {
+            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
+        }
+        altStackMem = new char[altStackSize]();
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        delete[] altStackMem;
+        // We signal that another instance can be constructed by zeroing
+        // out the pointer.
+        altStackMem = nullptr;
+    }
+
+    void FatalConditionHandler::engage_platform() {
         stack_t sigStack;
         sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = sigStackSize;
+        sigStack.ss_size = altStackSize;
         sigStack.ss_flags = 0;
         sigaltstack(&sigStack, &oldSigStack);
         struct sigaction sa = { };
@@ -7522,41 +10950,42 @@ namespace Catch {
         }
     }
 
-    FatalConditionHandler::~FatalConditionHandler() {
-        reset();
-    }
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
 
-    void FatalConditionHandler::reset() {
-        if( isSet ) {
-            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
-            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
-                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-            }
-            // Return the old stack
-            sigaltstack(&oldSigStack, nullptr);
-            isSet = false;
-        }
+    void FatalConditionHandler::disengage_platform() {
+        restorePreviousSignalHandlers();
     }
 
-    bool FatalConditionHandler::isSet = false;
-    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
-    stack_t FatalConditionHandler::oldSigStack = {};
-    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+} // end namespace Catch
 
-} // namespace Catch
+#endif // CATCH_CONFIG_POSIX_SIGNALS
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
 
-#else
+#include <limits>
+#include <set>
 
 namespace Catch {
-    void FatalConditionHandler::reset() {}
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+    return m_msg;
 }
 
-#endif // signals/SEH handling
+namespace Generators {
 
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-// end catch_fatal_condition.cpp
+    GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
+    }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
 // start catch_interfaces_capture.cpp
 
 namespace Catch {
@@ -7607,10 +11036,16 @@ namespace Catch {
 
         void noMatchingTestCases( std::string const& spec ) override;
 
+        void reportInvalidArguments(std::string const&arg) override;
+
         static std::set<Verbosity> getSupportedVerbosities();
 
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
         void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats const& benchmarkStats ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
         void testRunStarting( TestRunInfo const& testRunInfo ) override;
         void testGroupStarting( GroupInfo const& groupInfo ) override;
@@ -7755,16 +11190,16 @@ namespace Catch {
 
 namespace Catch {
 
-	LeakDetector::LeakDetector() {
-		int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-		flag |= _CRTDBG_LEAK_CHECK_DF;
-		flag |= _CRTDBG_ALLOC_MEM_DF;
-		_CrtSetDbgFlag(flag);
-		_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-		_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-		// Change this to leaking allocation's number to break there
-		_CrtSetBreakAlloc(-1);
-	}
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
 }
 
 #else
@@ -7772,6 +11207,10 @@ namespace Catch {
     Catch::LeakDetector::LeakDetector() {}
 
 #endif
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
 // end catch_leak_detector.cpp
 // start catch_list.cpp
 
@@ -7795,9 +11234,9 @@ namespace Catch {
 
     std::size_t listTags( Config const& config );
 
-    std::size_t listReporters( Config const& /*config*/ );
+    std::size_t listReporters();
 
-    Option<std::size_t> list( Config const& config );
+    Option<std::size_t> list( std::shared_ptr<Config> const& config );
 
 } // end namespace Catch
 
@@ -7816,7 +11255,7 @@ namespace Catch {
 namespace Catch {
 
     std::size_t listTests( Config const& config ) {
-        TestSpec testSpec = config.testSpec();
+        TestSpec const& testSpec = config.testSpec();
         if( config.hasTestFilters() )
             Catch::cout() << "Matching test cases:\n";
         else {
@@ -7850,7 +11289,7 @@ namespace Catch {
     }
 
     std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec testSpec = config.testSpec();
+        TestSpec const& testSpec = config.testSpec();
         std::size_t matchedTests = 0;
         std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
         for( auto const& testCaseInfo : matchedTestCases ) {
@@ -7872,14 +11311,23 @@ namespace Catch {
     }
 
     std::string TagInfo::all() const {
-        std::string out;
-        for( auto const& spelling : spellings )
-            out += "[" + spelling + "]";
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
         return out;
     }
 
     std::size_t listTags( Config const& config ) {
-        TestSpec testSpec = config.testSpec();
+        TestSpec const& testSpec = config.testSpec();
         if( config.hasTestFilters() )
             Catch::cout() << "Tags for matching test cases:\n";
         else {
@@ -7913,7 +11361,7 @@ namespace Catch {
         return tagCounts.size();
     }
 
-    std::size_t listReporters( Config const& /*config*/ ) {
+    std::size_t listReporters() {
         Catch::cout() << "Available reporters:\n";
         IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
         std::size_t maxNameLen = 0;
@@ -7935,16 +11383,17 @@ namespace Catch {
         return factories.size();
     }
 
-    Option<std::size_t> list( Config const& config ) {
+    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
         Option<std::size_t> listedCount;
-        if( config.listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( config );
-        if( config.listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config );
-        if( config.listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( config );
-        if( config.listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters( config );
+        getCurrentMutableContext().setConfig( config );
+        if( config->listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( *config );
+        if( config->listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
+        if( config->listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( *config );
+        if( config->listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters();
         return listedCount;
     }
 
@@ -7972,8 +11421,39 @@ using Matchers::Impl::MatcherBase;
 
 } // namespace Catch
 // end catch_matchers.cpp
+// start catch_matchers_exception.cpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + "\"";
+}
+
+}
+Exception::ExceptionMessageMatcher Message(std::string const& message) {
+    return Exception::ExceptionMessageMatcher(message);
+}
+
+// namespace Exception
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_exception.cpp
 // start catch_matchers_floating.cpp
 
+// start catch_polyfills.hpp
+
+namespace Catch {
+    bool isnan(float f);
+    bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
 // start catch_to_string.hpp
 
 #include <string>
@@ -7992,80 +11472,105 @@ namespace Catch {
 } // end namespace Catch
 
 // end catch_to_string.hpp
+#include <algorithm>
+#include <cmath>
 #include <cstdlib>
 #include <cstdint>
 #include <cstring>
-#include <stdexcept>
+#include <sstream>
+#include <type_traits>
+#include <iomanip>
+#include <limits>
 
 namespace Catch {
-namespace Matchers {
-namespace Floating {
-enum class FloatingPointKind : uint8_t {
-    Float,
-    Double
-};
-}
-}
-}
-
 namespace {
 
-template <typename T>
-struct Converter;
+    int32_t convert(float f) {
+        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+        int32_t i;
+        std::memcpy(&i, &f, sizeof(f));
+        return i;
+    }
+
+    int64_t convert(double d) {
+        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+        int64_t i;
+        std::memcpy(&i, &d, sizeof(d));
+        return i;
+    }
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        auto lc = convert(lhs);
+        auto rc = convert(rhs);
+
+        if ((lc < 0) != (rc < 0)) {
+            // Potentially we can have +0 and -0
+            return lhs == rhs;
+        }
 
-template <>
-struct Converter<float> {
-    static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-    Converter(float f) {
-        std::memcpy(&i, &f, sizeof(f));
+        // static cast as a workaround for IBM XLC
+        auto ulpDiff = std::abs(static_cast<FP>(lc - rc));
+        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
     }
-    int32_t i;
-};
 
-template <>
-struct Converter<double> {
-    static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-    Converter(double d) {
-        std::memcpy(&i, &d, sizeof(d));
-    }
-    int64_t i;
-};
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
 
-template <typename T>
-auto convert(T t) -> Converter<T> {
-    return Converter<T>(t);
-}
+    float nextafter(float x, float y) {
+        return ::nextafterf(x, y);
+    }
 
-template <typename FP>
-bool almostEqualUlps(FP lhs, FP rhs, int maxUlpDiff) {
-    // Comparison with NaN should always be false.
-    // This way we can rule it out before getting into the ugly details
-    if (std::isnan(lhs) || std::isnan(rhs)) {
-        return false;
+    double nextafter(double x, double y) {
+        return ::nextafter(x, y);
     }
 
-    auto lc = convert(lhs);
-    auto rc = convert(rhs);
+#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
 
-    if ((lc.i < 0) != (rc.i < 0)) {
-        // Potentially we can have +0 and -0
-        return lhs == rhs;
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+        start = Catch::nextafter(start, direction);
+#else
+        start = std::nextafter(start, direction);
+#endif
     }
+    return start;
+}
 
-    auto ulpDiff = std::abs(lc.i - rc.i);
-    return ulpDiff <= maxUlpDiff;
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
 }
 
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
 }
 
-namespace Catch {
+} // end anonymous namespace
+
 namespace Matchers {
 namespace Floating {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
     WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
         :m_target{ target }, m_margin{ margin } {
-        if (m_margin < 0) {
-            throw std::domain_error("Allowed margin difference has to be >= 0");
-        }
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
     }
 
     // Performs equivalent check of std::fabs(lhs - rhs) <= margin
@@ -8078,13 +11583,19 @@ namespace Floating {
         return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
     }
 
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, int ulps, FloatingPointKind baseType)
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
         :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        if (m_ulps < 0) {
-            throw std::domain_error("Allowed ulp difference has to be >= 0");
-        }
+        CATCH_ENFORCE(m_type == FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
     }
 
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
     bool WithinUlpsMatcher::match(double const& matchee) const {
         switch (m_type) {
         case FloatingPointKind::Float:
@@ -8092,21 +11603,68 @@ namespace Floating {
         case FloatingPointKind::Double:
             return almostEqualUlps<double>(matchee, m_target, m_ulps);
         default:
-            throw std::domain_error("Unknown FloatingPointKind value");
+            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
         }
     }
 
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
     std::string WithinUlpsMatcher::describe() const {
-        return "is within " + Catch::to_string(m_ulps) + " ULPs of " + ::Catch::Detail::stringify(m_target) + ((m_type == FloatingPointKind::Float)? "f" : "");
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == FloatingPointKind::Double) {
+            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
     }
 
 }// namespace Floating
 
-Floating::WithinUlpsMatcher WithinULP(double target, int maxUlpDiff) {
+Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
     return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
 }
 
-Floating::WithinUlpsMatcher WithinULP(float target, int maxUlpDiff) {
+Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
     return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
 }
 
@@ -8114,9 +11672,24 @@ Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
     return Floating::WithinAbsMatcher(target, margin);
 }
 
+Floating::WithinRelMatcher WithinRel(double target, double eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(double target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+Floating::WithinRelMatcher WithinRel(float target, float eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(float target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
 } // namespace Matchers
 } // namespace Catch
-
 // end catch_matchers_floating.cpp
 // start catch_matchers_generic.cpp
 
@@ -8239,9 +11812,12 @@ namespace Catch {
 } // end namespace Catch
 
 // end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
 namespace Catch {
 
-    MessageInfo::MessageInfo(   std::string const& _macroName,
+    MessageInfo::MessageInfo(   StringRef const& _macroName,
                                 SourceLineInfo const& _lineInfo,
                                 ResultWas::OfType _type )
     :   macroName( _macroName ),
@@ -8263,7 +11839,7 @@ namespace Catch {
 
     ////////////////////////////////////////////////////////////////////////////
 
-    Catch::MessageBuilder::MessageBuilder( std::string const& macroName,
+    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
                                            SourceLineInfo const& lineInfo,
                                            ResultWas::OfType type )
         :m_info(macroName, lineInfo, type) {}
@@ -8271,17 +11847,96 @@ namespace Catch {
     ////////////////////////////////////////////////////////////////////////////
 
     ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info )
+    : m_info( builder.m_info ), m_moved()
     {
         m_info.message = builder.m_stream.str();
         getResultCapture().pushScopedMessage( m_info );
     }
 
+    ScopedMessage::ScopedMessage( ScopedMessage&& old )
+    : m_info( old.m_info ), m_moved()
+    {
+        old.m_moved = true;
+    }
+
     ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() ){
+        if ( !uncaught_exceptions() && !m_moved ){
             getResultCapture().popScopedMessage(m_info);
         }
     }
+
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.empty()) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            }
+        }
+        assert(openings.empty() && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
 } // end namespace Catch
 // end catch_message.cpp
 // start catch_output_redirect.cpp
@@ -8326,6 +11981,22 @@ namespace Catch {
         auto str() const -> std::string;
     };
 
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
 #if defined(CATCH_CONFIG_NEW_CAPTURE)
 
     // Windows's implementation of std::tmpfile is terrible (it tries
@@ -8417,26 +12088,36 @@ namespace Catch {
     {}
     auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
 
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
 #if defined(CATCH_CONFIG_NEW_CAPTURE)
 
 #if defined(_MSC_VER)
     TempFile::TempFile() {
         if (tmpnam_s(m_buffer)) {
-            throw std::runtime_error("Could not get a temp filename");
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
         }
-        if (fopen_s(&m_file, m_buffer, "w")) {
+        if (fopen_s(&m_file, m_buffer, "w+")) {
             char buffer[100];
             if (strerror_s(buffer, errno)) {
-                throw std::runtime_error("Could not translate errno to string");
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
             }
-            throw std::runtime_error("Could not open the temp file: " + std::string(m_buffer) + buffer);
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
         }
     }
 #else
     TempFile::TempFile() {
         m_file = std::tmpfile();
         if (!m_file) {
-            throw std::runtime_error("Could not create a temp file.");
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
         }
     }
 
@@ -8503,40 +12184,90 @@ namespace Catch {
     #endif
 #endif
 // end catch_output_redirect.cpp
-// start catch_random_number_generator.cpp
+// start catch_polyfills.cpp
 
-// start catch_random_number_generator.h
+#include <cmath>
 
-#include <algorithm>
-#include <random>
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
 
 namespace Catch {
 
-    struct IConfig;
+namespace {
 
-    std::mt19937& rng();
-    void seedRng( IConfig const& config );
-    unsigned int rngSeed();
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
 
 }
 
-// end catch_random_number_generator.h
-namespace Catch {
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
 
-    std::mt19937& rng() {
-        static std::mt19937 s_rng;
-        return s_rng;
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
     }
 
-    void seedRng( IConfig const& config ) {
-        if( config.rngSeed() != 0 ) {
-            std::srand( config.rngSeed() );
-            rng().seed( config.rngSeed() );
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
         }
     }
 
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
     }
 }
 // end catch_random_number_generator.cpp
@@ -8555,6 +12286,8 @@ namespace Catch {
     struct IConfig;
 
     std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
 
     void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
@@ -8667,16 +12400,53 @@ namespace Catch {
 namespace Catch {
 
     class StartupExceptionRegistry {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
     public:
         void add(std::exception_ptr const& exception) noexcept;
         std::vector<std::exception_ptr> const& getExceptions() const noexcept;
     private:
         std::vector<std::exception_ptr> m_exceptions;
+#endif
     };
 
 } // end namespace Catch
 
 // end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton();
+    };
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
 namespace Catch {
 
     namespace {
@@ -8692,7 +12462,7 @@ namespace Catch {
             ITestCaseRegistry const& getTestCaseRegistry() const override {
                 return m_testCaseRegistry;
             }
-            IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() override {
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
                 return m_exceptionTranslatorRegistry;
             }
             ITagAliasRegistry const& getTagAliasRegistry() const override {
@@ -8719,7 +12489,14 @@ namespace Catch {
                 m_tagAliasRegistry.add( alias, tag, lineInfo );
             }
             void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
                 m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
             }
 
         private:
@@ -8728,28 +12505,21 @@ namespace Catch {
             ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
             TagAliasRegistry m_tagAliasRegistry;
             StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
         };
-
-        // Single, global, instance
-        RegistryHub*& getTheRegistryHub() {
-            static RegistryHub* theRegistryHub = nullptr;
-            if( !theRegistryHub )
-                theRegistryHub = new RegistryHub();
-            return theRegistryHub;
-        }
     }
 
-    IRegistryHub& getRegistryHub() {
-        return *getTheRegistryHub();
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
     }
     IMutableRegistryHub& getMutableRegistryHub() {
-        return *getTheRegistryHub();
+        return RegistryHubSingleton::getMutable();
     }
     void cleanUp() {
-        delete getTheRegistryHub();
-        getTheRegistryHub() = nullptr;
+        cleanupSingletons();
         cleanUpContext();
-        ReusableStringStream::cleanup();
     }
     std::string translateActiveException() {
         return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
@@ -8814,6 +12584,136 @@ namespace Catch {
 
 namespace Catch {
 
+    namespace Generators {
+        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+            GeneratorBasePtr m_generator;
+
+            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+            :   TrackerBase( nameAndLocation, ctx, parent )
+            {}
+            ~GeneratorTracker();
+
+            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+                std::shared_ptr<GeneratorTracker> tracker;
+
+                ITracker& currentTracker = ctx.currentTracker();
+                // Under specific circumstances, the generator we want
+                // to acquire is also the current tracker. If this is
+                // the case, we have to avoid looking through current
+                // tracker's children, and instead return the current
+                // tracker.
+                // A case where this check is important is e.g.
+                //     for (int i = 0; i < 5; ++i) {
+                //         int n = GENERATE(1, 2);
+                //     }
+                //
+                // without it, the code above creates 5 nested generators.
+                if (currentTracker.nameAndLocation() == nameAndLocation) {
+                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
+                    assert(thisTracker);
+                    assert(thisTracker->isGeneratorTracker());
+                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
+                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                    assert( childTracker );
+                    assert( childTracker->isGeneratorTracker() );
+                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+                } else {
+                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
+                    currentTracker.addChild( tracker );
+                }
+
+                if( !tracker->isComplete() ) {
+                    tracker->open();
+                }
+
+                return *tracker;
+            }
+
+            // TrackerBase interface
+            bool isGeneratorTracker() const override { return true; }
+            auto hasGenerator() const -> bool override {
+                return !!m_generator;
+            }
+            void close() override {
+                TrackerBase::close();
+                // If a generator has a child (it is followed by a section)
+                // and none of its children have started, then we must wait
+                // until later to start consuming its values.
+                // This catches cases where `GENERATE` is placed between two
+                // `SECTION`s.
+                // **The check for m_children.empty cannot be removed**.
+                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
+                const bool should_wait_for_child = [&]() {
+                    // No children -> nobody to wait for
+                    if ( m_children.empty() ) {
+                        return false;
+                    }
+                    // If at least one child started executing, don't wait
+                    if ( std::find_if(
+                             m_children.begin(),
+                             m_children.end(),
+                             []( TestCaseTracking::ITrackerPtr tracker ) {
+                                 return tracker->hasStarted();
+                             } ) != m_children.end() ) {
+                        return false;
+                    }
+
+                    // No children have started. We need to check if they _can_
+                    // start, and thus we should wait for them, or they cannot
+                    // start (due to filters), and we shouldn't wait for them
+                    auto* parent = m_parent;
+                    // This is safe: there is always at least one section
+                    // tracker in a test case tracking tree
+                    while ( !parent->isSectionTracker() ) {
+                        parent = &( parent->parent() );
+                    }
+                    assert( parent &&
+                            "Missing root (test case) level section" );
+
+                    auto const& parentSection =
+                        static_cast<SectionTracker&>( *parent );
+                    auto const& filters = parentSection.getFilters();
+                    // No filters -> no restrictions on running sections
+                    if ( filters.empty() ) {
+                        return true;
+                    }
+
+                    for ( auto const& child : m_children ) {
+                        if ( child->isSectionTracker() &&
+                             std::find( filters.begin(),
+                                        filters.end(),
+                                        static_cast<SectionTracker&>( *child )
+                                            .trimmedName() ) !=
+                                 filters.end() ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }();
+
+                // This check is a bit tricky, because m_generator->next()
+                // has a side-effect, where it consumes generator's current
+                // value, but we do not want to invoke the side-effect if
+                // this generator is still waiting for any child to start.
+                if ( should_wait_for_child ||
+                     ( m_runState == CompletedSuccessfully &&
+                       m_generator->next() ) ) {
+                    m_children.clear();
+                    m_runState = Executing;
+                }
+            }
+
+            // IGeneratorTracker interface
+            auto getGenerator() const -> GeneratorBasePtr const& override {
+                return m_generator;
+            }
+            void setGenerator( GeneratorBasePtr&& generator ) override {
+                m_generator = std::move( generator );
+            }
+        };
+        GeneratorTracker::~GeneratorTracker() {}
+    }
+
     RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
     :   m_runInfo(_config->name()),
         m_context(getCurrentMutableContext()),
@@ -8907,6 +12807,9 @@ namespace Catch {
         // and should be let to clear themselves out.
         static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
 
+        if (result.getResultType() != ResultWas::Warning)
+            m_messageScopes.clear();
+
         // Reset working state
         resetAssertionInfo();
         m_lastResult = result;
@@ -8930,6 +12833,13 @@ namespace Catch {
 
         return true;
     }
+    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        using namespace Generators;
+        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
+                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
 
     bool RunContext::testForMissingAssertions(Counts& assertions) {
         if (assertions.total() != 0)
@@ -8954,6 +12864,7 @@ namespace Catch {
 
         m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
         m_messages.clear();
+        m_messageScopes.clear();
     }
 
     void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
@@ -8965,12 +12876,21 @@ namespace Catch {
 
         m_unfinishedSections.push_back(endInfo);
     }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void RunContext::benchmarkPreparing(std::string const& name) {
+        m_reporter->benchmarkPreparing(name);
+    }
     void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
         m_reporter->benchmarkStarting( info );
     }
-    void RunContext::benchmarkEnded( BenchmarkStats const& stats ) {
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
         m_reporter->benchmarkEnded( stats );
     }
+    void RunContext::benchmarkFailed(std::string const & error) {
+        m_reporter->benchmarkFailed(error);
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
     void RunContext::pushScopedMessage(MessageInfo const & message) {
         m_messages.push_back(message);
@@ -8980,6 +12900,10 @@ namespace Catch {
         m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
     }
 
+    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
+        m_messageScopes.emplace_back( builder );
+    }
+
     std::string RunContext::getCurrentTestName() const {
         return m_activeTestCase
             ? m_activeTestCase->getTestCaseInfo().name
@@ -9001,7 +12925,7 @@ namespace Catch {
         // Don't rebuild the result -- the stringification itself can cause more fatal errors
         // Instead, fake a result data.
         AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = message;
+        tempResult.message = static_cast<std::string>(message);
         AssertionResult result(m_lastAssertionInfo, tempResult);
 
         assertionEnded(result);
@@ -9040,10 +12964,11 @@ namespace Catch {
         m_lastAssertionPassed = true;
         ++m_totals.assertions.passed;
         resetAssertionInfo();
+        m_messageScopes.clear();
     }
 
     bool RunContext::aborting() const {
-        return m_totals.assertions.failed == static_cast<std::size_t>(m_config->abortAfter());
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
     }
 
     void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
@@ -9058,16 +12983,13 @@ namespace Catch {
         seedRng(*m_config);
 
         Timer timer;
-        try {
+        CATCH_TRY {
             if (m_reporter->getPreferences().shouldRedirectStdOut) {
 #if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStdOut redirectedStdOut;
-                RedirectedStdErr redirectedStdErr;
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
 
                 timer.start();
                 invokeActiveTestCase();
-                redirectedCout += redirectedStdOut.str();
-                redirectedCerr += redirectedStdErr.str();
 #else
                 OutputRedirect r(redirectedCout, redirectedCerr);
                 timer.start();
@@ -9078,9 +13000,9 @@ namespace Catch {
                 invokeActiveTestCase();
             }
             duration = timer.getElapsedSeconds();
-        } catch (TestFailureException&) {
+        } CATCH_CATCH_ANON (TestFailureException&) {
             // This just means the test was aborted due to failure
-        } catch (...) {
+        } CATCH_CATCH_ALL {
             // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
             // are reported without translation at the point of origin.
             if( m_shouldReportUnexpected ) {
@@ -9094,15 +13016,15 @@ namespace Catch {
         m_testCaseTracker->close();
         handleUnfinishedSections();
         m_messages.clear();
+        m_messageScopes.clear();
 
         SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
         m_reporter->sectionEnded(testCaseSectionStats);
     }
 
     void RunContext::invokeActiveTestCase() {
-        FatalConditionHandler fatalConditionHandler; // Handle signals
+        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
         m_activeTestCase->invoke();
-        fatalConditionHandler.reset();
     }
 
     void RunContext::handleUnfinishedSections() {
@@ -9165,7 +13087,7 @@ namespace Catch {
         m_lastAssertionInfo = info;
 
         AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = message;
+        data.message = static_cast<std::string>(message);
         AssertionResult assertionResult{ m_lastAssertionInfo, data };
         assertionEnded( assertionResult );
         if( !assertionResult.isOk() )
@@ -9228,6 +13150,18 @@ namespace Catch {
         else
             CATCH_INTERNAL_ERROR("No result capture instance");
     }
+
+    void seedRng(IConfig const& config) {
+        if (config.rngSeed() != 0) {
+            std::srand(config.rngSeed());
+            rng().seed(config.rngSeed());
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
 }
 // end catch_run_context.cpp
 // start catch_section.cpp
@@ -9289,13 +13223,22 @@ namespace Catch {
         void libIdentify();
 
         int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
 
         void useConfigData( ConfigData const& configData );
 
-        int run( int argc, char* argv[] );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
-        int run( int argc, wchar_t* const argv[] );
-    #endif
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
         int run();
 
         clara::Parser const& cli() const;
@@ -9347,6 +13290,8 @@ namespace Catch {
 // end catch_version.h
 #include <cstdlib>
 #include <iomanip>
+#include <set>
+#include <iterator>
 
 namespace Catch {
 
@@ -9365,54 +13310,76 @@ namespace Catch {
                 return createReporter(config->getReporterName(), config);
             }
 
-            auto multi = std::unique_ptr<ListeningReporter>(new ListeningReporter);
-
+            // On older platforms, returning std::unique_ptr<ListeningReporter>
+            // when the return type is std::unique_ptr<IStreamingReporter>
+            // doesn't compile without a std::move call. However, this causes
+            // a warning on newer platforms. Thus, we have to work around
+            // it a bit and downcast the pointer manually.
+            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+            auto& multi = static_cast<ListeningReporter&>(*ret);
             auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
             for (auto const& listener : listeners) {
-                multi->addListener(listener->create(Catch::ReporterConfig(config)));
+                multi.addListener(listener->create(Catch::ReporterConfig(config)));
             }
-            multi->addReporter(createReporter(config->getReporterName(), config));
-            return std::move(multi);
+            multi.addReporter(createReporter(config->getReporterName(), config));
+            return ret;
         }
 
-        Catch::Totals runTests(std::shared_ptr<Config> const& config) {
-            // FixMe: Add listeners in order first, then add reporters.
-
-            auto reporter = makeReporter(config);
-
-            RunContext context(config, std::move(reporter));
-
-            Totals totals;
-
-            context.testGroupStarting(config->name(), 1, 1);
-
-            TestSpec testSpec = config->testSpec();
-
-            auto const& allTestCases = getAllTestCasesSorted(*config);
-            for (auto const& testCase : allTestCases) {
-                if (!context.aborting() && matchTest(testCase, testSpec, *config))
-                    totals += context.runTest(testCase);
-                else
-                    context.reporter().skipTest(testCase);
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+
+                if (m_matches.empty() && invalidArgs.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
             }
 
-            if (config->warnAboutNoTests() && totals.testCases.total() == 0) {
-                ReusableStringStream testConfig;
+            Totals execute() {
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
+                }
 
-                bool first = true;
-                for (const auto& input : config->getTestsOrTags()) {
-                    if (!first) { testConfig << ' '; }
-                    first = false;
-                    testConfig << input;
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+
+                if (!invalidArgs.empty()) {
+                    for (auto const& invalidArg: invalidArgs)
+                         m_context.reporter().reportInvalidArguments(invalidArg);
                 }
 
-                context.reporter().noMatchingTestCases(testConfig.str());
-                totals.error = -1;
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
             }
 
-            context.testGroupEnded(config->name(), totals, 1, 1);
-            return totals;
-        }
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
 
         void applyFilenamesAsTags(Catch::IConfig const& config) {
             auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
@@ -9441,12 +13408,17 @@ namespace Catch {
     Session::Session() {
         static bool alreadyInstantiated = false;
         if( alreadyInstantiated ) {
-            try         { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            catch(...)  { getMutableRegistryHub().registerStartupException(); }
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
         }
 
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
         const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
         if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+
             m_startupExceptions = true;
             Colour colourGuard( Colour::Red );
             Catch::cerr() << "Errors occurred during startup!" << '\n';
@@ -9459,6 +13431,7 @@ namespace Catch {
                 }
             }
         }
+#endif
 
         alreadyInstantiated = true;
         m_cli = makeCommandLineParser( m_configData );
@@ -9475,7 +13448,7 @@ namespace Catch {
     }
     void Session::libIdentify() {
         Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch test executable\n"
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
                 << std::left << std::setw(16) << "category: " << "testframework\n"
                 << std::left << std::setw(16) << "framework: " << "Catch Test\n"
                 << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
@@ -9487,6 +13460,8 @@ namespace Catch {
 
         auto result = m_cli.parse( clara::Args( argc, argv ) );
         if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
             Catch::cerr()
                 << Colour( Colour::Red )
                 << "\nError(s) in input:\n"
@@ -9504,34 +13479,20 @@ namespace Catch {
         return 0;
     }
 
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run( int argc, char* argv[] ) {
-        if( m_startupExceptions )
-            return 1;
-        int returnCode = applyCommandLine( argc, argv );
-        if( returnCode == 0 )
-            returnCode = run();
-        return returnCode;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
-    int Session::run( int argc, wchar_t* const argv[] ) {
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
 
         char **utf8Argv = new char *[ argc ];
 
         for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
 
             utf8Argv[ i ] = new char[ bufSize ];
 
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
         }
 
-        int returnCode = run( argc, utf8Argv );
+        int returnCode = applyCommandLine( argc, utf8Argv );
 
         for ( int i = 0; i < argc; ++i )
             delete [] utf8Argv[ i ];
@@ -9541,6 +13502,12 @@ namespace Catch {
         return returnCode;
     }
 #endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
     int Session::run() {
         if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
             Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
@@ -9573,11 +13540,11 @@ namespace Catch {
         if( m_startupExceptions )
             return 1;
 
-        if( m_configData.showHelp || m_configData.libIdentify )
+        if (m_configData.showHelp || m_configData.libIdentify) {
             return 0;
+        }
 
-        try
-        {
+        CATCH_TRY {
             config(); // Force config to be constructed
 
             seedRng( *m_config );
@@ -9586,31 +13553,68 @@ namespace Catch {
                 applyFilenamesAsTags( *m_config );
 
             // Handle list request
-            if( Option<std::size_t> listed = list( config() ) )
+            if( Option<std::size_t> listed = list( m_config ) )
                 return static_cast<int>( *listed );
 
-            auto totals = runTests( m_config );
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
             // Note that on unices only the lower 8 bits are usually used, clamping
             // the return value to 255 prevents false negative when some multiple
             // of 256 tests has failed
             return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
         }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
         catch( std::exception& ex ) {
             Catch::cerr() << ex.what() << std::endl;
             return MaxExitCode;
         }
+#endif
     }
 
 } // end namespace Catch
 // end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() {}
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+// end catch_singletons.cpp
 // start catch_startup_exception_registry.cpp
 
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
 namespace Catch {
-    void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        try {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
             m_exceptions.push_back(exception);
-        }
-        catch(...) {
+        } CATCH_CATCH_ALL {
             // If we run out of memory during start-up there's really not a lot more we can do about it
             std::terminate();
         }
@@ -9621,6 +13625,7 @@ namespace Catch {
     }
 
 } // end namespace Catch
+#endif
 // end catch_startup_exception_registry.cpp
 // start catch_stream.cpp
 
@@ -9631,16 +13636,11 @@ namespace Catch {
 #include <vector>
 #include <memory>
 
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
 namespace Catch {
 
     Catch::IStream::~IStream() = default;
 
-    namespace detail { namespace {
+    namespace Detail { namespace {
         template<typename WriterF, std::size_t bufferSize=256>
         class StreamBufImpl : public std::streambuf {
             char data[bufferSize];
@@ -9739,15 +13739,15 @@ namespace Catch {
 
     auto makeStream( StringRef const &filename ) -> IStream const* {
         if( filename.empty() )
-            return new detail::CoutStream();
+            return new Detail::CoutStream();
         else if( filename[0] == '%' ) {
             if( filename == "%debug" )
-                return new detail::DebugOutStream();
+                return new Detail::DebugOutStream();
             else
                 CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
         }
         else
-            return new detail::FileStream( filename );
+            return new Detail::FileStream( filename );
     }
 
     // This class encapsulates the idea of a pool of ostringstreams that can be reused.
@@ -9755,7 +13755,6 @@ namespace Catch {
         std::vector<std::unique_ptr<std::ostringstream>> m_streams;
         std::vector<std::size_t> m_unused;
         std::ostringstream m_referenceStream; // Used for copy state/ flags from
-        static StringStreams* s_instance;
 
         auto add() -> std::size_t {
             if( m_unused.empty() ) {
@@ -9773,34 +13772,17 @@ namespace Catch {
             m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
             m_unused.push_back(index);
         }
-
-        // !TBD: put in TLS
-        static auto instance() -> StringStreams& {
-            if( !s_instance )
-                s_instance = new StringStreams();
-            return *s_instance;
-        }
-        static void cleanup() {
-            delete s_instance;
-            s_instance = nullptr;
-        }
     };
 
-    StringStreams* StringStreams::s_instance = nullptr;
-
-    void ReusableStringStream::cleanup() {
-        StringStreams::cleanup();
-    }
-
     ReusableStringStream::ReusableStringStream()
-    :   m_index( StringStreams::instance().add() ),
-        m_oss( StringStreams::instance().m_streams[m_index].get() )
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
     {}
 
     ReusableStringStream::~ReusableStringStream() {
         static_cast<std::ostringstream*>( m_oss )->str("");
         m_oss->clear();
-        StringStreams::instance().release( m_index );
+        Singleton<StringStreams>::getMutable().release( m_index );
     }
 
     auto ReusableStringStream::str() const -> std::string {
@@ -9815,10 +13797,6 @@ namespace Catch {
     std::ostream& clog() { return std::clog; }
 #endif
 }
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
 // end catch_stream.cpp
 // start catch_string_manip.cpp
 
@@ -9826,12 +13804,13 @@ namespace Catch {
 #include <ostream>
 #include <cstring>
 #include <cctype>
+#include <vector>
 
 namespace Catch {
 
     namespace {
         char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( c ) );
+            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
         }
     }
 
@@ -9866,6 +13845,18 @@ namespace Catch {
         return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
     }
 
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
     bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
         bool replaced = false;
         std::size_t i = str.find( replaceThis );
@@ -9880,6 +13871,21 @@ namespace Catch {
         return replaced;
     }
 
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
     pluralise::pluralise( std::size_t count, std::string const& label )
     :   m_count( count ),
         m_label( label )
@@ -9896,123 +13902,46 @@ namespace Catch {
 // end catch_string_manip.cpp
 // start catch_stringref.cpp
 
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
+#include <algorithm>
 #include <ostream>
 #include <cstring>
 #include <cstdint>
 
-namespace {
-    const uint32_t byte_2_lead = 0xC0;
-    const uint32_t byte_3_lead = 0xE0;
-    const uint32_t byte_4_lead = 0xF0;
-}
-
 namespace Catch {
     StringRef::StringRef( char const* rawChars ) noexcept
     : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
     {}
 
-    StringRef::operator std::string() const {
-        return std::string( m_start, m_size );
-    }
-
-    void StringRef::swap( StringRef& other ) noexcept {
-        std::swap( m_start, other.m_start );
-        std::swap( m_size, other.m_size );
-        std::swap( m_data, other.m_data );
-    }
-
     auto StringRef::c_str() const -> char const* {
-        if( isSubstring() )
-           const_cast<StringRef*>( this )->takeOwnership();
+        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
         return m_start;
     }
-    auto StringRef::currentData() const noexcept -> char const* {
+    auto StringRef::data() const noexcept -> char const* {
         return m_start;
     }
 
-    auto StringRef::isOwned() const noexcept -> bool {
-        return m_data != nullptr;
-    }
-    auto StringRef::isSubstring() const noexcept -> bool {
-        return m_start[m_size] != '\0';
-    }
-
-    void StringRef::takeOwnership() {
-        if( !isOwned() ) {
-            m_data = new char[m_size+1];
-            memcpy( m_data, m_start, m_size );
-            m_data[m_size] = '\0';
-            m_start = m_data;
-        }
-    }
     auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if( start < m_size )
-            return StringRef( m_start+start, size );
-        else
+        if (start < m_size) {
+            return StringRef(m_start + start, (std::min)(m_size - start, size));
+        } else {
             return StringRef();
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return
-            size() == other.size() &&
-            (std::strncmp( m_start, other.m_start, size() ) == 0);
-    }
-    auto StringRef::operator != ( StringRef const& other ) const noexcept -> bool {
-        return !operator==( other );
-    }
-
-    auto StringRef::operator[](size_type index) const noexcept -> char {
-        return m_start[index];
-    }
-
-    auto StringRef::numberOfCharacters() const noexcept -> size_type {
-        size_type noChars = m_size;
-        // Make adjustments for uft encodings
-        for( size_type i=0; i < m_size; ++i ) {
-            char c = m_start[i];
-            if( ( c & byte_2_lead ) == byte_2_lead ) {
-                noChars--;
-                if (( c & byte_3_lead ) == byte_3_lead )
-                    noChars--;
-                if( ( c & byte_4_lead ) == byte_4_lead )
-                    noChars--;
-            }
         }
-        return noChars;
-    }
-
-    auto operator + ( StringRef const& lhs, StringRef const& rhs ) -> std::string {
-        std::string str;
-        str.reserve( lhs.size() + rhs.size() );
-        str += lhs;
-        str += rhs;
-        return str;
-    }
-    auto operator + ( StringRef const& lhs, const char* rhs ) -> std::string {
-        return std::string( lhs ) + std::string( rhs );
     }
-    auto operator + ( char const* lhs, StringRef const& rhs ) -> std::string {
-        return std::string( lhs ) + std::string( rhs );
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return m_size == other.m_size
+            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
     }
 
     auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.currentData(), str.size());
+        return os.write(str.data(), str.size());
     }
 
     auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.currentData(), rhs.size());
+        lhs.append(rhs.data(), rhs.size());
         return lhs;
     }
 
 } // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
 // end catch_stringref.cpp
 // start catch_tag_alias.cpp
 
@@ -10025,9 +13954,9 @@ namespace Catch {
 namespace Catch {
 
     RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        try {
+        CATCH_TRY {
             getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } catch (...) {
+        } CATCH_CATCH_ALL {
             // Do not throw when constructing global objects, instead register the exception to be processed later
             getMutableRegistryHub().registerStartupException();
         }
@@ -10115,7 +14044,7 @@ namespace Catch {
         void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
             CATCH_ENFORCE( !isReservedTag(tag),
                           "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alpha-numeric characters are reserved\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
                           << _lineInfo );
         }
     }
@@ -10131,8 +14060,7 @@ namespace Catch {
         std::vector<std::string> tags;
         std::string desc, tag;
         bool inTag = false;
-        std::string _descOrTags = nameAndTags.tags;
-        for (char c : _descOrTags) {
+        for (char c : nameAndTags.tags) {
             if( !inTag ) {
                 if( c == '[' )
                     inTag = true;
@@ -10147,6 +14075,12 @@ namespace Catch {
                     else if( prop == TestCaseInfo::None )
                         enforceNotReservedTag( tag, _lineInfo );
 
+                    // Merged hide tags like `[.approvals]` should be added as
+                    // `[.][approvals]`. The `[.]` is added at later point, so
+                    // we only strip the prefix
+                    if (startsWith(tag, '.') && tag.size() > 1) {
+                        tag.erase(0, 1);
+                    }
                     tags.push_back( tag );
                     tag.clear();
                     inTag = false;
@@ -10156,10 +14090,11 @@ namespace Catch {
             }
         }
         if( isHidden ) {
-            tags.push_back( "." );
+            // Add all "hidden" tags to make them behave identically
+            tags.insert( tags.end(), { ".", "!hide" } );
         }
 
-        TestCaseInfo info( nameAndTags.name, _className, desc, tags, _lineInfo );
+        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
         return TestCase( _testCase, std::move(info) );
     }
 
@@ -10251,30 +14186,89 @@ namespace Catch {
 // end catch_test_case_info.cpp
 // start catch_test_case_registry_impl.cpp
 
+#include <algorithm>
 #include <sstream>
 
 namespace Catch {
 
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+    namespace {
+        struct TestHasher {
+            using hash_t = uint64_t;
+
+            explicit TestHasher( hash_t hashSuffix ):
+                m_hashSuffix{ hashSuffix } {}
+
+            uint32_t operator()( TestCase const& t ) const {
+                // FNV-1a hash with multiplication fold.
+                const hash_t prime = 1099511628211u;
+                hash_t hash = 14695981039346656037u;
+                for ( const char c : t.name ) {
+                    hash ^= c;
+                    hash *= prime;
+                }
+                hash ^= m_hashSuffix;
+                hash *= prime;
+                const uint32_t low{ static_cast<uint32_t>( hash ) };
+                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
+                return low * high;
+            }
 
-        std::vector<TestCase> sorted = unsortedTestCases;
+        private:
+            hash_t m_hashSuffix;
+        };
+    } // end unnamed namespace
 
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
         switch( config.runOrder() ) {
-            case RunTests::InLexicographicalOrder:
-                std::sort( sorted.begin(), sorted.end() );
-                break;
-            case RunTests::InRandomOrder:
-                seedRng( config );
-                std::shuffle( sorted.begin(), sorted.end(), rng() );
-                break;
             case RunTests::InDeclarationOrder:
                 // already in declaration order
                 break;
+
+            case RunTests::InLexicographicalOrder: {
+                std::vector<TestCase> sorted = unsortedTestCases;
+                std::sort( sorted.begin(), sorted.end() );
+                return sorted;
+            }
+
+            case RunTests::InRandomOrder: {
+                seedRng( config );
+                TestHasher h{ config.rngSeed() };
+
+                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
+                std::vector<hashedTest> indexed_tests;
+                indexed_tests.reserve( unsortedTestCases.size() );
+
+                for (auto const& testCase : unsortedTestCases) {
+                    indexed_tests.emplace_back(h(testCase), &testCase);
+                }
+
+                std::sort(indexed_tests.begin(), indexed_tests.end(),
+                          [](hashedTest const& lhs, hashedTest const& rhs) {
+                          if (lhs.first == rhs.first) {
+                              return lhs.second->name < rhs.second->name;
+                          }
+                          return lhs.first < rhs.first;
+                });
+
+                std::vector<TestCase> sorted;
+                sorted.reserve( indexed_tests.size() );
+
+                for (auto const& hashed : indexed_tests) {
+                    sorted.emplace_back(*hashed.second);
+                }
+
+                return sorted;
+            }
         }
-        return sorted;
+        return unsortedTestCases;
+    }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
     }
+
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
     }
 
     void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
@@ -10291,9 +14285,12 @@ namespace Catch {
     std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
         std::vector<TestCase> filtered;
         filtered.reserve( testCases.size() );
-        for( auto const& testCase : testCases )
-            if( matchTest( testCase, testSpec, config ) )
-                filtered.push_back( testCase );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
         return filtered;
     }
     std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
@@ -10332,7 +14329,7 @@ namespace Catch {
     }
 
     std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className = classOrQualifiedMethodName;
+        std::string className(classOrQualifiedMethodName);
         if( startsWith( className, '&' ) )
         {
             std::size_t lastColons = className.rfind( "::" );
@@ -10369,11 +14366,6 @@ namespace TestCaseTracking {
 
     ITracker::~ITracker() = default;
 
-    TrackerContext& TrackerContext::instance() {
-        static TrackerContext s_instance;
-        return s_instance;
-    }
-
     ITracker& TrackerContext::startRun() {
         m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
         m_currentTracker = nullptr;
@@ -10405,22 +14397,12 @@ namespace TestCaseTracking {
         m_currentTracker = tracker;
     }
 
-    TrackerBase::TrackerHasName::TrackerHasName( NameAndLocation const& nameAndLocation ) : m_nameAndLocation( nameAndLocation ) {}
-    bool TrackerBase::TrackerHasName::operator ()( ITrackerPtr const& tracker ) const {
-        return
-            tracker->nameAndLocation().location == m_nameAndLocation.location &&
-            tracker->nameAndLocation().name == m_nameAndLocation.name;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   m_nameAndLocation( nameAndLocation ),
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
+        ITracker(nameAndLocation),
         m_ctx( ctx ),
         m_parent( parent )
     {}
 
-    NameAndLocation const& TrackerBase::nameAndLocation() const {
-        return m_nameAndLocation;
-    }
     bool TrackerBase::isComplete() const {
         return m_runState == CompletedSuccessfully || m_runState == Failed;
     }
@@ -10439,7 +14421,12 @@ namespace TestCaseTracking {
     }
 
     ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( nameAndLocation ) );
+        auto it = std::find_if( m_children.begin(), m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ){
+                return
+                    tracker->nameAndLocation().location == nameAndLocation.location &&
+                    tracker->nameAndLocation().name == nameAndLocation.name;
+            } );
         return( it != m_children.end() )
             ? *it
             : nullptr;
@@ -10458,7 +14445,7 @@ namespace TestCaseTracking {
     }
 
     bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isIndexTracker() const { return false; }
+    bool TrackerBase::isGeneratorTracker() const { return false; }
 
     void TrackerBase::open() {
         m_runState = Executing;
@@ -10481,7 +14468,7 @@ namespace TestCaseTracking {
                 m_runState = CompletedSuccessfully;
                 break;
             case ExecutingChildren:
-                if( m_children.empty() || m_children.back()->isComplete() )
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
                     m_runState = CompletedSuccessfully;
                 break;
 
@@ -10516,7 +14503,8 @@ namespace TestCaseTracking {
     }
 
     SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_trimmed_name(trim(nameAndLocation.name))
     {
         if( parent ) {
             while( !parent->isSectionTracker() )
@@ -10527,6 +14515,17 @@ namespace TestCaseTracking {
         }
     }
 
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if (m_filters.empty()
+            || m_filters[0] == ""
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
     bool SectionTracker::isSectionTracker() const { return true; }
 
     SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
@@ -10548,63 +14547,29 @@ namespace TestCaseTracking {
     }
 
     void SectionTracker::tryOpen() {
-        if( !isComplete() && (m_filters.empty() || m_filters[0].empty() ||  m_filters[0] == m_nameAndLocation.name ) )
+        if( !isComplete() )
             open();
     }
 
     void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
         if( !filters.empty() ) {
-            m_filters.push_back(""); // Root - should never be consulted
-            m_filters.push_back(""); // Test Case - not a section filter
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.emplace_back(""); // Root - should never be consulted
+            m_filters.emplace_back(""); // Test Case - not a section filter
             m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
         }
     }
     void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
         if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() );
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
     }
 
-    IndexTracker::IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_size( size )
-    {}
-
-    bool IndexTracker::isIndexTracker() const { return true; }
-
-    IndexTracker& IndexTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) {
-        std::shared_ptr<IndexTracker> tracker;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isIndexTracker() );
-            tracker = std::static_pointer_cast<IndexTracker>( childTracker );
-        }
-        else {
-            tracker = std::make_shared<IndexTracker>( nameAndLocation, ctx, &currentTracker, size );
-            currentTracker.addChild( tracker );
-        }
-
-        if( !ctx.completedCycle() && !tracker->isComplete() ) {
-            if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun )
-                tracker->moveNext();
-            tracker->open();
-        }
-
-        return *tracker;
-    }
-
-    int IndexTracker::index() const { return m_index; }
-
-    void IndexTracker::moveNext() {
-        m_index++;
-        m_children.clear();
+    std::vector<std::string> const& SectionTracker::getFilters() const {
+        return m_filters;
     }
 
-    void IndexTracker::close() {
-        TrackerBase::close();
-        if( m_runState == CompletedSuccessfully && m_index < m_size-1 )
-            m_runState = Executing;
+    std::string const& SectionTracker::trimmedName() const {
+        return m_trimmed_name;
     }
 
 } // namespace TestCaseTracking
@@ -10612,7 +14577,6 @@ namespace TestCaseTracking {
 using TestCaseTracking::ITracker;
 using TestCaseTracking::TrackerContext;
 using TestCaseTracking::SectionTracker;
-using TestCaseTracking::IndexTracker;
 
 } // namespace Catch
 
@@ -10631,7 +14595,7 @@ namespace Catch {
     NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
 
     AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        try {
+        CATCH_TRY {
             getMutableRegistryHub()
                     .registerTest(
                         makeTestCase(
@@ -10639,7 +14603,7 @@ namespace Catch {
                             extractClassName( classOrMethod ),
                             nameAndTags,
                             lineInfo));
-        } catch (...) {
+        } CATCH_CATCH_ALL {
             // Do not throw when constructing global objects, instead register the exception to be processed later
             getMutableRegistryHub().registerStartupException();
         }
@@ -10657,122 +14621,308 @@ namespace Catch {
 
 namespace Catch {
 
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
     TestSpec::Pattern::~Pattern() = default;
-    TestSpec::NamePattern::~NamePattern() = default;
-    TestSpec::TagPattern::~TagPattern() = default;
-    TestSpec::ExcludedPattern::~ExcludedPattern() = default;
 
-    TestSpec::NamePattern::NamePattern( std::string const& name )
-    : m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
     {}
+
     bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( toLower( testCase.name ) );
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
+        return  (m_invalidArgs);
+    }
+
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidArgs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
     }
 
-    TestSpec::TagPattern::TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
     }
 
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         m_realPatternPos = 0;
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
 
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        // All patterns in a filter must match for the filter to be a match
-        for( auto const& pattern : m_patterns ) {
-            if( !pattern->matches( testCase ) )
-                return false;
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
         }
-        return true;
-    }
 
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        // A TestSpec matches if any filter matches
-        for( auto const& filter : m_filters )
-            if( filter.matches( testCase ) )
-                return true;
-        return false;
-    }
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
+        m_patternName.clear();
+        m_realPatternPos = 0;
 
-namespace Catch {
+        return token;
+    }
 
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
 
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
+        if (!token.empty()) {
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
+            if (m_exclusion)
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
         m_exclusion = false;
-        m_start = std::string::npos;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-            visitChar( m_arg[m_pos] );
-        if( m_mode == Name )
-            addPattern<TestSpec::NamePattern>();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
+        m_mode = None;
     }
 
-    void TestSpecParser::visitChar( char c ) {
-        if( m_mode == None ) {
-            switch( c ) {
-            case ' ': return;
-            case '~': m_exclusion = true; return;
-            case '[': return startNewMode( Tag, ++m_pos );
-            case '"': return startNewMode( QuotedName, ++m_pos );
-            case '\\': return escape();
-            default: startNewMode( Name, m_pos ); break;
-            }
-        }
-        if( m_mode == Name ) {
-            if( c == ',' ) {
-                addPattern<TestSpec::NamePattern>();
-                addFilter();
-            }
-            else if( c == '[' ) {
-                if( subString() == "exclude:" )
-                    m_exclusion = true;
-                else
-                    addPattern<TestSpec::NamePattern>();
-                startNewMode( Tag, ++m_pos );
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
+                if (m_exclusion) {
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+                }
+                m_currentFilter.m_patterns.push_back(pattern);
             }
-            else if( c == '\\' )
-                escape();
-        }
-        else if( m_mode == EscapedName )
-            m_mode = Name;
-        else if( m_mode == QuotedName && c == '"' )
-            addPattern<TestSpec::NamePattern>();
-        else if( m_mode == Tag && c == ']' )
-            addPattern<TestSpec::TagPattern>();
-    }
-    void TestSpecParser::startNewMode( Mode mode, std::size_t start ) {
-        m_mode = mode;
-        m_start = start;
-    }
-    void TestSpecParser::escape() {
-        if( m_mode == None )
-            m_start = m_pos;
-        m_mode = EscapedName;
-        m_escapeChars.push_back( m_pos );
-    }
-    std::string TestSpecParser::subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
 
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
+
+            if (m_exclusion) {
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            }
+            m_currentFilter.m_patterns.push_back(pattern);
         }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
     }
 
     TestSpec parseTestSpec( std::string const& arg ) {
@@ -10815,7 +14965,7 @@ namespace Catch {
                 // is terrible and we should move on.
                 // TBD: How to signal that the measured resolution is probably wrong?
                 if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / i;
+                    return sum / ( i + 1u );
                 }
             }
 
@@ -10876,13 +15026,11 @@ namespace Detail {
             enum Arch { Big, Little };
 
             static Arch which() {
-                union _{
-                    int asInt;
-                    char asChar[sizeof (int)];
-                } u;
-
-                u.asInt = 1;
-                return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
             }
         };
     }
@@ -10906,7 +15054,7 @@ namespace Detail {
 
 template<typename T>
 std::string fpToString( T value, int precision ) {
-    if (std::isnan(value)) {
+    if (Catch::isnan(value)) {
         return "nan";
     }
 
@@ -10953,14 +15101,9 @@ std::string StringMaker<std::string>::convert(const std::string& str) {
     return s;
 }
 
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return ::Catch::Detail::stringify(std::string{ str });
 }
 #endif
 
@@ -10978,7 +15121,23 @@ std::string StringMaker<char*>::convert(char* str) {
         return{ "{null string}" };
     }
 }
+
 #ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
 std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
     if (str) {
         return ::Catch::Detail::stringify(std::wstring{ str });
@@ -10995,6 +15154,13 @@ std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
 }
 #endif
 
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
 std::string StringMaker<int>::convert(int value) {
     return ::Catch::Detail::stringify(static_cast<long long>(value));
 }
@@ -11029,7 +15195,7 @@ std::string StringMaker<bool>::convert(bool b) {
     return b ? "true" : "false";
 }
 
-std::string StringMaker<char>::convert(char value) {
+std::string StringMaker<signed char>::convert(signed char value) {
     if (value == '\r') {
         return "'\\r'";
     } else if (value == '\f') {
@@ -11046,8 +15212,8 @@ std::string StringMaker<char>::convert(char value) {
         return chstr;
     }
 }
-std::string StringMaker<signed char>::convert(signed char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
 }
 std::string StringMaker<unsigned char>::convert(unsigned char c) {
     return ::Catch::Detail::stringify(static_cast<char>(c));
@@ -11057,11 +15223,16 @@ std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
     return "nullptr";
 }
 
+int StringMaker<float>::precision = 5;
+
 std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, 5) + 'f';
+    return fpToString(value, precision) + 'f';
 }
+
+int StringMaker<double>::precision = 10;
+
 std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, 10);
+    return fpToString(value, precision);
 }
 
 std::string ratio_string<std::atto>::symbol() { return "a"; }
@@ -11135,11 +15306,48 @@ namespace Catch {
 // end catch_totals.cpp
 // start catch_uncaught_exceptions.cpp
 
+// start catch_config_uncaught_exceptions.hpp
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE_1_0.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+
+#if defined(_MSC_VER)
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+#endif
+
+#include <exception>
+
+#if defined(__cpp_lib_uncaught_exceptions) \
+    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif // __cpp_lib_uncaught_exceptions
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+// end catch_config_uncaught_exceptions.hpp
 #include <exception>
 
 namespace Catch {
     bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        return false;
+#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
         return std::uncaught_exceptions() > 0;
 #else
         return std::uncaught_exception();
@@ -11179,7 +15387,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 2, 3, 0, "", 0 );
+        static Version version( 2, 13, 8, "", 0 );
         return version;
     }
 
@@ -11187,14 +15395,12 @@ namespace Catch {
 // end catch_version.cpp
 // start catch_wildcard_pattern.cpp
 
-#include <sstream>
-
 namespace Catch {
 
     WildcardPattern::WildcardPattern( std::string const& pattern,
                                       CaseSensitive::Choice caseSensitivity )
     :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( adjustCase( pattern ) )
+        m_pattern( normaliseString( pattern ) )
     {
         if( startsWith( m_pattern, '*' ) ) {
             m_pattern = m_pattern.substr( 1 );
@@ -11209,28 +15415,27 @@ namespace Catch {
     bool WildcardPattern::matches( std::string const& str ) const {
         switch( m_wildcard ) {
             case NoWildcard:
-                return m_pattern == adjustCase( str );
+                return m_pattern == normaliseString( str );
             case WildcardAtStart:
-                return endsWith( adjustCase( str ), m_pattern );
+                return endsWith( normaliseString( str ), m_pattern );
             case WildcardAtEnd:
-                return startsWith( adjustCase( str ), m_pattern );
+                return startsWith( normaliseString( str ), m_pattern );
             case WildcardAtBothEnds:
-                return contains( adjustCase( str ), m_pattern );
+                return contains( normaliseString( str ), m_pattern );
             default:
                 CATCH_INTERNAL_ERROR( "Unknown enum" );
         }
     }
 
-    std::string WildcardPattern::adjustCase( std::string const& str ) const {
-        return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str;
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
     }
 }
 // end catch_wildcard_pattern.cpp
 // start catch_xmlwriter.cpp
 
 #include <iomanip>
-
-using uchar = unsigned char;
+#include <type_traits>
 
 namespace Catch {
 
@@ -11263,13 +15468,37 @@ namespace {
     }
 
     void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
         os << "\\x"
             << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
             << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
     }
 
 } // anonymous namespace
 
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
     XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
     :   m_str( str ),
         m_forWhat( forWhat )
@@ -11280,7 +15509,7 @@ namespace {
         // (see: http://www.w3.org/TR/xml/#syntax)
 
         for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            uchar c = m_str[idx];
+            unsigned char c = m_str[idx];
             switch (c) {
             case '<':   os << "&lt;"; break;
             case '&':   os << "&amp;"; break;
@@ -11340,7 +15569,7 @@ namespace {
                 bool valid = true;
                 uint32_t value = headerValue(c);
                 for (std::size_t n = 1; n < encBytes; ++n) {
-                    uchar nc = m_str[idx + n];
+                    unsigned char nc = m_str[idx + n];
                     valid &= ((nc & 0xC0) == 0x80);
                     value = (value << 6) | (nc & 0x3F);
                 }
@@ -11374,13 +15603,17 @@ namespace {
         return os;
     }
 
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer )
-    :   m_writer( writer )
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
     {}
 
     XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ){
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
         other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
     }
     XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
         if ( m_writer ) {
@@ -11388,16 +15621,19 @@ namespace {
         }
         m_writer = other.m_writer;
         other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
         return *this;
     }
 
     XmlWriter::ScopedElement::~ScopedElement() {
-        if( m_writer )
-            m_writer->endElement();
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
     }
 
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, bool indent ) {
-        m_writer->writeText( text, indent );
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
         return *this;
     }
 
@@ -11407,37 +15643,47 @@ namespace {
     }
 
     XmlWriter::~XmlWriter() {
-        while( !m_tags.empty() )
+        while (!m_tags.empty()) {
             endElement();
+        }
+        newlineIfNecessary();
     }
 
-    XmlWriter& XmlWriter::startElement( std::string const& name ) {
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
         ensureTagClosed();
         newlineIfNecessary();
-        m_os << m_indent << '<' << name;
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
         m_tags.push_back( name );
-        m_indent += "  ";
         m_tagIsOpen = true;
+        applyFormatting(fmt);
         return *this;
     }
 
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name ) {
-        ScopedElement scoped( this );
-        startElement( name );
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
         return scoped;
     }
 
-    XmlWriter& XmlWriter::endElement() {
-        newlineIfNecessary();
-        m_indent = m_indent.substr( 0, m_indent.size()-2 );
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
         if( m_tagIsOpen ) {
             m_os << "/>";
             m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << ">";
         }
-        else {
-            m_os << m_indent << "</" << m_tags.back() << ">";
-        }
-        m_os << std::endl;
+        m_os << std::flush;
+        applyFormatting(fmt);
         m_tags.pop_back();
         return *this;
     }
@@ -11453,22 +15699,26 @@ namespace {
         return *this;
     }
 
-    XmlWriter& XmlWriter::writeText( std::string const& text, bool indent ) {
+    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
         if( !text.empty() ){
             bool tagWasOpen = m_tagIsOpen;
             ensureTagClosed();
-            if( tagWasOpen && indent )
+            if (tagWasOpen && shouldIndent(fmt)) {
                 m_os << m_indent;
+            }
             m_os << XmlEncode( text );
-            m_needsNewline = true;
+            applyFormatting(fmt);
         }
         return *this;
     }
 
-    XmlWriter& XmlWriter::writeComment( std::string const& text ) {
+    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
         ensureTagClosed();
-        m_os << m_indent << "<!--" << text << "-->";
-        m_needsNewline = true;
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!--" << text << "-->";
+        applyFormatting(fmt);
         return *this;
     }
 
@@ -11484,11 +15734,16 @@ namespace {
 
     void XmlWriter::ensureTagClosed() {
         if( m_tagIsOpen ) {
-            m_os << ">" << std::endl;
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
             m_tagIsOpen = false;
         }
     }
 
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
     void XmlWriter::writeDeclaration() {
         m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
     }
@@ -11529,14 +15784,44 @@ namespace Catch {
 #ifdef _MSC_VER
         sprintf_s(buffer, "%.3f", duration);
 #else
-        sprintf(buffer, "%.3f", duration);
+        std::sprintf(buffer, "%.3f", duration);
 #endif
         return std::string(buffer);
     }
 
+    bool shouldShowDuration( IConfig const& config, double duration ) {
+        if ( config.showDurations() == ShowDurations::Always ) {
+            return true;
+        }
+        if ( config.showDurations() == ShowDurations::Never ) {
+            return false;
+        }
+        const double min = config.minDuration();
+        return min >= 0 && duration >= min;
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& container ) {
+        ReusableStringStream oss;
+        bool first = true;
+        for (auto&& filter : container)
+        {
+            if (!first)
+                oss << ' ';
+            else
+                first = false;
+
+            oss << filter;
+        }
+        return oss.str();
+    }
+
     TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
         :StreamingReporterBase(_config) {}
 
+    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+    }
+
     void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
 
     bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
@@ -11745,24 +16030,25 @@ class AssertionPrinter {
         if (itMessage == messages.end())
             return;
 
-        // using messages.end() directly yields (or auto) compilation error:
-        std::vector<MessageInfo>::const_iterator itEnd = messages.end();
-        const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
 
         {
             Colour colourGuard(colour);
             stream << " with " << pluralise(N, "message") << ':';
         }
 
-        for (; itMessage != itEnd; ) {
+        while (itMessage != itEnd) {
             // If this assertion is a warning ignore any INFO messages
             if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                stream << " '" << itMessage->message << '\'';
-                if (++itMessage != itEnd) {
+                printMessage();
+                if (itMessage != itEnd) {
                     Colour colourGuard(dimColour());
                     stream << " and";
                 }
+                continue;
             }
+            ++itMessage;
         }
     }
 
@@ -11780,10 +16066,6 @@ class AssertionPrinter {
             return "Reports test results on a single line, suitable for IDEs";
         }
 
-        ReporterPreferences CompactReporter::getPreferences() const {
-            return m_reporterPrefs;
-        }
-
         void CompactReporter::noMatchingTestCases( std::string const& spec ) {
             stream << "No test cases matched '" << spec << '\'' << std::endl;
         }
@@ -11810,8 +16092,9 @@ class AssertionPrinter {
         }
 
         void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            if (m_config->showDurations() == ShowDurations::Always) {
-                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            double dur = _sectionStats.durationInSeconds;
+            if ( shouldShowDuration( *m_config, dur ) ) {
+                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
             }
         }
 
@@ -11835,8 +16118,13 @@ class AssertionPrinter {
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled
- // and default is missing) is enabled
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
 #endif
 
 namespace Catch {
@@ -11925,8 +16213,6 @@ class ConsoleAssertionPrinter {
     void print() const {
         printSourceInfo();
         if (stats.totals.assertions.total() > 0) {
-            if (result.isOk())
-                stream << '\n';
             printResultType();
             printOriginalExpression();
             printReconstructedExpression();
@@ -12020,11 +16306,11 @@ class Duration {
     static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
     static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
 
-    uint64_t m_inNanoseconds;
+    double m_inNanoseconds;
     Unit m_units;
 
 public:
-    explicit Duration(uint64_t inNanoseconds, Unit units = Unit::Auto)
+    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
         : m_inNanoseconds(inNanoseconds),
         m_units(units) {
         if (m_units == Unit::Auto) {
@@ -12053,7 +16339,7 @@ class Duration {
         case Unit::Minutes:
             return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
         default:
-            return static_cast<double>(m_inNanoseconds);
+            return m_inNanoseconds;
         }
     }
     auto unitsAsString() const -> std::string {
@@ -12061,7 +16347,7 @@ class Duration {
         case Unit::Nanoseconds:
             return "ns";
         case Unit::Microseconds:
-            return "µs";
+            return "us";
         case Unit::Milliseconds:
             return "ms";
         case Unit::Seconds:
@@ -12074,7 +16360,7 @@ class Duration {
 
     }
     friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << duration.value() << " " << duration.unitsAsString();
+        return os << duration.value() << ' ' << duration.unitsAsString();
     }
 };
 } // end anon namespace
@@ -12099,10 +16385,16 @@ class TablePrinter {
         if (!m_isOpen) {
             m_isOpen = true;
             *this << RowBreak();
-            for (auto const& info : m_columnInfos)
-                *this << info.name << ColumnBreak();
-            *this << RowBreak();
-            m_os << Catch::getLineOfChars<'-'>() << "\n";
+
+			Columns headerCols;
+			Spacer spacer(2);
+			for (auto const& info : m_columnInfos) {
+				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
+				headerCols += spacer;
+			}
+			m_os << headerCols << '\n';
+
+            m_os << Catch::getLineOfChars<'-'>() << '\n';
         }
     }
     void close() {
@@ -12121,30 +16413,29 @@ class TablePrinter {
 
     friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
         auto colStr = tp.m_oss.str();
-        // This takes account of utf8 encodings
-        auto strSize = Catch::StringRef(colStr).numberOfCharacters();
+        const auto strSize = colStr.size();
         tp.m_oss.str("");
         tp.open();
         if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
             tp.m_currentColumn = -1;
-            tp.m_os << "\n";
+            tp.m_os << '\n';
         }
         tp.m_currentColumn++;
 
         auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 2 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 2), ' ')
+        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 1), ' ')
             : std::string();
         if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << " ";
+            tp.m_os << colStr << padding << ' ';
         else
-            tp.m_os << padding << colStr << " ";
+            tp.m_os << padding << colStr << ' ';
         return tp;
     }
 
     friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
         if (tp.m_currentColumn > 0) {
-            tp.m_os << "\n";
+            tp.m_os << '\n';
             tp.m_currentColumn = -1;
         }
         return tp;
@@ -12154,12 +16445,26 @@ class TablePrinter {
 ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
     : StreamingReporterBase(config),
     m_tablePrinter(new TablePrinter(config.stream(),
-    {
-        { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left },
-        { "iters", 8, ColumnInfo::Right },
-        { "elapsed ns", 14, ColumnInfo::Right },
-        { "average", 14, ColumnInfo::Right }
-    })) {}
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "     samples", 14, ColumnInfo::Right },
+                { "  iterations", 14, ColumnInfo::Right },
+                { "        mean", 14, ColumnInfo::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "samples      mean       std dev", 14, ColumnInfo::Right },
+                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
+                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
+            };
+        }
+    }())) {}
 ConsoleReporter::~ConsoleReporter() = default;
 
 std::string ConsoleReporter::getDescription() {
@@ -12170,6 +16475,10 @@ void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
     stream << "No test cases matched '" << spec << '\'' << std::endl;
 }
 
+void ConsoleReporter::reportInvalidArguments(std::string const&arg){
+    stream << "Invalid Filter: " << arg << std::endl;
+}
+
 void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
 
 bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
@@ -12190,6 +16499,7 @@ bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
 }
 
 void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
     m_headerPrinted = false;
     StreamingReporterBase::sectionStarting(_sectionInfo);
 }
@@ -12204,8 +16514,9 @@ void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
             stream << "\nNo assertions in test case";
         stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
     }
-    if (m_config->showDurations() == ShowDurations::Always) {
-        stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    double dur = _sectionStats.durationInSeconds;
+    if (shouldShowDuration(*m_config, dur)) {
+        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
     }
     if (m_headerPrinted) {
         m_headerPrinted = false;
@@ -12213,28 +16524,53 @@ void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
     StreamingReporterBase::sectionEnded(_sectionStats);
 }
 
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    lazyPrintWithoutClosingBenchmarkTable();
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+void ConsoleReporter::benchmarkPreparing(std::string const& name) {
+	lazyPrintWithoutClosingBenchmarkTable();
 
-    auto nameCol = Column( info.name ).width( static_cast<std::size_t>( m_tablePrinter->columnInfos()[0].width - 2 ) );
+	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
 
-    bool firstLine = true;
-    for (auto line : nameCol) {
-        if (!firstLine)
-            (*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-        else
-            firstLine = false;
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
 
-        (*m_tablePrinter) << line << ColumnBreak();
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if (!m_config->benchmarkNoAnalysis())
+        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
     }
 }
-void ConsoleReporter::benchmarkEnded(BenchmarkStats const& stats) {
-    Duration average(stats.elapsedTimeInNanoseconds / stats.iterations);
+
+void ConsoleReporter::benchmarkFailed(std::string const& error) {
+	Colour colour(Colour::Red);
     (*m_tablePrinter)
-        << stats.iterations << ColumnBreak()
-        << stats.elapsedTimeInNanoseconds << ColumnBreak()
-        << average << ColumnBreak();
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
 }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
 void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
     m_tablePrinter->close();
@@ -12256,6 +16592,10 @@ void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
     stream << std::endl;
     StreamingReporterBase::testRunEnded(_testRunStats);
 }
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
+    StreamingReporterBase::testRunStarting(_testInfo);
+    printTestFilters();
+}
 
 void ConsoleReporter::lazyPrint() {
 
@@ -12309,11 +16649,9 @@ void ConsoleReporter::printTestCaseAndSectionHeader() {
 
     SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
 
-    if (!lineInfo.empty()) {
-        stream << getLineOfChars<'-'>() << '\n';
-        Colour colourGuard(Colour::FileName);
-        stream << lineInfo << '\n';
-    }
+    stream << getLineOfChars<'-'>() << '\n';
+    Colour colourGuard(Colour::FileName);
+    stream << lineInfo << '\n';
     stream << getLineOfChars<'.'>() << '\n' << std::endl;
 }
 
@@ -12437,6 +16775,13 @@ void ConsoleReporter::printSummaryDivider() {
     stream << getLineOfChars<'-'>() << '\n';
 }
 
+void ConsoleReporter::printTestFilters() {
+    if (m_config->testSpec().hasFilters()) {
+        Colour guard(Colour::BrightYellow);
+        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
+    }
+}
+
 CATCH_REGISTER_REPORTER("console", ConsoleReporter)
 
 } // end namespace Catch
@@ -12444,6 +16789,10 @@ CATCH_REGISTER_REPORTER("console", ConsoleReporter)
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
 // end catch_reporter_console.cpp
 // start catch_reporter_junit.cpp
 
@@ -12451,6 +16800,7 @@ CATCH_REGISTER_REPORTER("console", ConsoleReporter)
 #include <sstream>
 #include <ctime>
 #include <algorithm>
+#include <iomanip>
 
 namespace Catch {
 
@@ -12478,7 +16828,7 @@ namespace Catch {
 #else
             std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
 #endif
-            return std::string(timeStamp);
+            return std::string(timeStamp, timeStampSize-1);
         }
 
         std::string fileNameTag(const std::vector<std::string> &tags) {
@@ -12489,6 +16839,17 @@ namespace Catch {
                 return it->substr(1);
             return std::string();
         }
+
+        // Formats the duration in seconds to 3 decimal places.
+        // This is done because some genius defined Maven Surefire schema
+        // in a way that only accepts 3 decimal places, and tools like
+        // Jenkins use that schema for validation JUnit reporter output.
+        std::string formatDuration( double seconds ) {
+            ReusableStringStream rss;
+            rss << std::fixed << std::setprecision( 3 ) << seconds;
+            return rss.str();
+        }
+
     } // anonymous namespace
 
     JunitReporter::JunitReporter( ReporterConfig const& _config )
@@ -12548,6 +16909,7 @@ namespace Catch {
 
     void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
         XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
         TestGroupStats const& stats = groupNode.value;
         xml.writeAttribute( "name", stats.groupInfo.name );
         xml.writeAttribute( "errors", unexpectedExceptions );
@@ -12557,15 +16919,30 @@ namespace Catch {
         if( m_config->showDurations() == ShowDurations::Never )
             xml.writeAttribute( "time", "" );
         else
-            xml.writeAttribute( "time", suiteTime );
+            xml.writeAttribute( "time", formatDuration( suiteTime ) );
         xml.writeAttribute( "timestamp", getCurrentTimestamp() );
 
+        // Write properties if there are any
+        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
+            auto properties = xml.scopedElement("properties");
+            if (m_config->hasTestFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "filters")
+                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
+            }
+            if (m_config->rngSeed() != 0) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "random-seed")
+                    .writeAttribute("value", m_config->rngSeed());
+            }
+        }
+
         // Write test cases
         for( auto const& child : groupNode.children )
             writeTestCase( *child );
 
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), false );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), false );
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
     }
 
     void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
@@ -12587,12 +16964,13 @@ namespace Catch {
         if ( !m_config->name().empty() )
             className = m_config->name() + "." + className;
 
-        writeSection( className, "", rootSection );
+        writeSection( className, "", rootSection, stats.testInfo.okToFail() );
     }
 
-    void JunitReporter::writeSection(  std::string const& className,
-                        std::string const& rootName,
-                        SectionNode const& sectionNode ) {
+    void JunitReporter::writeSection( std::string const& className,
+                                      std::string const& rootName,
+                                      SectionNode const& sectionNode,
+                                      bool testOkToFail) {
         std::string name = trim( sectionNode.stats.sectionInfo.name );
         if( !rootName.empty() )
             name = rootName + '/' + name;
@@ -12609,20 +16987,30 @@ namespace Catch {
                 xml.writeAttribute( "classname", className );
                 xml.writeAttribute( "name", name );
             }
-            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+            xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) );
+            // This is not ideal, but it should be enough to mimic gtest's
+            // junit output.
+            // Ideally the JUnit reporter would also handle `skipTest`
+            // events and write those out appropriately.
+            xml.writeAttribute( "status", "run" );
+
+            if (sectionNode.stats.assertions.failedButOk) {
+                xml.scopedElement("skipped")
+                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
+            }
 
             writeAssertions( sectionNode );
 
             if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
             if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
         }
         for( auto const& childNode : sectionNode.childSections )
             if( className.empty() )
-                writeSection( name, "", *childNode );
+                writeSection( name, "", *childNode, testOkToFail );
             else
-                writeSection( className, name, *childNode );
+                writeSection( className, name, *childNode, testOkToFail );
     }
 
     void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
@@ -12640,11 +17028,7 @@ namespace Catch {
                     elementName = "error";
                     break;
                 case ResultWas::ExplicitFailure:
-                    elementName = "failure";
-                    break;
                 case ResultWas::ExpressionFailed:
-                    elementName = "failure";
-                    break;
                 case ResultWas::DidntThrowException:
                     elementName = "failure";
                     break;
@@ -12662,10 +17046,25 @@ namespace Catch {
 
             XmlWriter::ScopedElement e = xml.scopedElement( elementName );
 
-            xml.writeAttribute( "message", result.getExpandedExpression() );
+            xml.writeAttribute( "message", result.getExpression() );
             xml.writeAttribute( "type", result.getTestMacroName() );
 
             ReusableStringStream rss;
+            if (stats.totals.assertions.total() > 0) {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            } else {
+                rss << '\n';
+            }
+
             if( !result.getMessage().empty() )
                 rss << result.getMessage() << '\n';
             for( auto const& msg : stats.infoMessages )
@@ -12673,7 +17072,7 @@ namespace Catch {
                     rss << msg.message << '\n';
 
             rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), false );
+            xml.writeText( rss.str(), XmlFormatting::Newline );
         }
     }
 
@@ -12717,19 +17116,41 @@ namespace Catch {
         m_reporter->noMatchingTestCases( spec );
     }
 
+    void ListeningReporter::reportInvalidArguments(std::string const&arg){
+        for ( auto const& listener : m_listeners ) {
+            listener->reportInvalidArguments( arg );
+        }
+        m_reporter->reportInvalidArguments( arg );
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkPreparing(name);
+		}
+		m_reporter->benchmarkPreparing(name);
+	}
     void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
         for ( auto const& listener : m_listeners ) {
             listener->benchmarkStarting( benchmarkInfo );
         }
         m_reporter->benchmarkStarting( benchmarkInfo );
     }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats const& benchmarkStats ) {
+    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
         for ( auto const& listener : m_listeners ) {
             listener->benchmarkEnded( benchmarkStats );
         }
         m_reporter->benchmarkEnded( benchmarkStats );
     }
 
+	void ListeningReporter::benchmarkFailed( std::string const& error ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkFailed(error);
+		}
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
     void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
         for ( auto const& listener : m_listeners ) {
             listener->testRunStarting( testRunInfo );
@@ -12860,6 +17281,11 @@ namespace Catch {
         m_xml.startElement( "Catch" );
         if( !m_config->name().empty() )
             m_xml.writeAttribute( "name", m_config->name() );
+        if (m_config->testSpec().hasFilters())
+            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
+        if( m_config->rngSeed() != 0 )
+            m_xml.scopedElement( "Randomness" )
+                .writeAttribute( "seed", m_config->rngSeed() );
     }
 
     void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
@@ -12992,9 +17418,9 @@ namespace Catch {
             e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
 
         if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false );
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
         if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false );
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
 
         m_xml.endElement();
     }
@@ -13006,6 +17432,10 @@ namespace Catch {
             .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
             .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
             .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
+            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
         m_xml.endElement();
     }
 
@@ -13015,9 +17445,58 @@ namespace Catch {
             .writeAttribute( "successes", testRunStats.totals.assertions.passed )
             .writeAttribute( "failures", testRunStats.totals.assertions.failed )
             .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
+            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
         m_xml.endElement();
     }
 
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
+        m_xml.startElement("BenchmarkResults")
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
+            .writeAttribute("resamples", info.resamples)
+            .writeAttribute("iterations", info.iterations)
+            .writeAttribute("clockResolution", info.clockResolution)
+            .writeAttribute("estimatedDuration", info.estimatedDuration)
+            .writeComment("All values in nano seconds");
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.startElement("mean")
+            .writeAttribute("value", benchmarkStats.mean.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("standardDeviation")
+            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("outliers")
+            .writeAttribute("variance", benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(std::string const &error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message", error);
+        m_xml.endElement();
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
     CATCH_REGISTER_REPORTER( "xml", XmlReporter )
 
 } // end namespace Catch
@@ -13043,7 +17522,7 @@ namespace Catch {
 
 #ifndef __OBJC__
 
-#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
 // Standard C/C++ Win32 Unicode wmain entry point
 extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
 #else
@@ -13091,7 +17570,7 @@ int main (int argc, char * const argv[]) {
 #define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
 #define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
 
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
 #define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
 #define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
 #if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
@@ -13105,7 +17584,7 @@ int main (int argc, char * const argv[]) {
 #define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
 #define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
 
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", __VA_ARGS__ )
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
 #define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
 #define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
 #if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
@@ -13120,8 +17599,9 @@ int main (int argc, char * const argv[]) {
 #endif // CATCH_CONFIG_DISABLE_MATCHERS
 
 #define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
 #define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << ::Catch::Detail::stringify(msg) )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
 
 #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
 #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
@@ -13135,14 +17615,50 @@ int main (int argc, char * const argv[]) {
 
 #define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
 
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
 // "BDD-style" convenience wrappers
 #define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
 #define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )    INTERNAL_CATCH_DYNAMIC_SECTION( "   Given: " << desc )
-#define CATCH_WHEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    When: " << desc )
-#define CATCH_AND_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And when: " << desc )
-#define CATCH_THEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Then: " << desc )
-#define CATCH_AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "     And: " << desc )
+#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
 // If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
 #else
@@ -13179,8 +17695,9 @@ int main (int argc, char * const argv[]) {
 #endif // CATCH_CONFIG_DISABLE_MATCHERS
 
 #define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
 #define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << ::Catch::Detail::stringify(msg) )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
 
 #define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
 #define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
@@ -13193,6 +17710,38 @@ int main (int argc, char * const argv[]) {
 #define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
 #define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
 
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
 #endif
 
 #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
@@ -13201,11 +17750,19 @@ int main (int argc, char * const argv[]) {
 #define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
 #define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
 
-#define GIVEN( desc )    INTERNAL_CATCH_DYNAMIC_SECTION( "   Given: " << desc )
-#define WHEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    When: " << desc )
-#define AND_WHEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And when: " << desc )
-#define THEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Then: " << desc )
-#define AND_THEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "     And: " << desc )
+#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
 using Catch::Detail::Approx;
 
@@ -13246,12 +17803,13 @@ using Catch::Detail::Approx;
 #define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
 #endif // CATCH_CONFIG_DISABLE_MATCHERS
 
-#define CATCH_INFO( msg )    (void)(0)
-#define CATCH_WARN( msg )    (void)(0)
-#define CATCH_CAPTURE( msg ) (void)(0)
+#define CATCH_INFO( msg )          (void)(0)
+#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg )          (void)(0)
+#define CATCH_CAPTURE( msg )       (void)(0)
 
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
 #define CATCH_METHOD_AS_TEST_CASE( method, ... )
 #define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
 #define CATCH_SECTION( ... )
@@ -13260,17 +17818,41 @@ using Catch::Detail::Approx;
 #define CATCH_FAIL_CHECK( ... ) (void)(0)
 #define CATCH_SUCCEED( ... ) (void)(0)
 
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
 
 // "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
 #define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
 #define CATCH_WHEN( desc )
 #define CATCH_AND_WHEN( desc )
 #define CATCH_THEN( desc )
 #define CATCH_AND_THEN( desc )
 
+#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
 // If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
 #else
 
@@ -13306,11 +17888,12 @@ using Catch::Detail::Approx;
 #endif // CATCH_CONFIG_DISABLE_MATCHERS
 
 #define INFO( msg ) (void)(0)
+#define UNSCOPED_INFO( msg ) (void)(0)
 #define WARN( msg ) (void)(0)
 #define CAPTURE( msg ) (void)(0)
 
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
 #define METHOD_AS_TEST_CASE( method, ... )
 #define REGISTER_TEST_CASE( Function, ... ) (void)(0)
 #define SECTION( ... )
@@ -13318,17 +17901,41 @@ using Catch::Detail::Approx;
 #define FAIL( ... ) (void)(0)
 #define FAIL_CHECK( ... ) (void)(0)
 #define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... )       (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
 
 #endif
 
 #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
 
 // "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
 
 #define GIVEN( desc )
+#define AND_GIVEN( desc )
 #define WHEN( desc )
 #define AND_WHEN( desc )
 #define THEN( desc )

From 76909a0645306814763cc7c254087f26d03145c7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 14:32:07 -0800
Subject: [PATCH 196/521] Fix up DataFrameException and use the new throwing
 macro

---
 Library/Data/DataFrame.hh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 3a3cb72..a106490 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -22,7 +22,12 @@
 
 namespace Nymph
 {
-    struct DataFrameException : virtual public Exception {};
+    class DataFrameException : public BaseException< DataFrameException >
+    {
+        public:
+            using BaseException< DataFrameException >::BaseException;
+            ~DataFrameException() = default;
+    };
 
     /*!
      @class DataFrame
@@ -86,7 +91,7 @@ namespace Nymph
         {
             return static_cast< const XData& >( *fDataObjects.at(typeid(XData) ));
         }
-        BOOST_THROW_EXCEPTION( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" << eom );
+        THROW_EXCEPT_HERE( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" );
     }
 
 } /* namespace Nymph */

From 8d33a6c7bcdc3eed44709b0bb1e665a8bb7556fe Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 14:35:08 -0800
Subject: [PATCH 197/521] Improve the signal, slot, and connection exceptions

---
 Library/Processor/SignalSlotBase.hh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index 2168dfc..58dd953 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -19,10 +19,27 @@
 
 namespace Nymph
 {
-    struct SignalException : virtual public Exception {};
-    struct SlotException : virtual public Exception {};
 
-    struct ConnectionException : public Exception {};
+    class SignalException : public BaseException< SignalException >
+    {
+        public:
+            using BaseException< SignalException >::BaseException;
+            ~SignalException() = default;
+    };
+
+    class SlotException : public BaseException< SlotException >
+    {
+        public:
+            using BaseException< SlotException >::BaseException;
+            ~SlotException() = default;
+    };
+
+    class ConnectionException : public BaseException< ConnectionException >
+    {
+        public:
+            using BaseException< ConnectionException >::BaseException;
+            ~ConnectionException() = default;
+    };
 
 
     class SignalBase;

From e7d9b5842b7bc7389953458351aa31b33c010fff Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 11 Jan 2022 15:46:15 -0800
Subject: [PATCH 198/521] Implemented and tested DataFrame::Set() and
 DataFrame::Remove()

---
 Library/Data/DataFrame.hh | 54 +++++++++++++++++++++++++++++++++++++++
 Testing/TestDataFrame.cc  | 31 ++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index a106490..69a0a14 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -46,6 +46,9 @@ namespace Nymph
             DataFrame();
             virtual ~DataFrame();
 
+            /// Returns true if the frame has no data objects
+            bool Empty() const;
+
             /// Returns true if object of type XData exists in the frame; returns false otherwise
             template< typename XData >
             bool Has() const;
@@ -60,12 +63,37 @@ namespace Nymph
             template< typename XData >
             const XData& Get() const;
 
+            /// Inserts the provided object of type XData into the frame, taking ownership of the object.
+            /// If an object of this type exists, it is replaced.
+            template< typename XData >
+            void Set( XData* ptr );
+
+            /// Inserts the provided object of type XData into the frame, taking ownership of the object.
+            /// If an object of this type exists, it is replaced.
+            template< typename XData >
+            void Set( std::unique_ptr<XData>&& ptr );
+
+            /// Inserts a copy of the provided object of type XData into the frame.
+            /// If an object of this type exists, it is replaced.
+            template< typename XData >
+            void Set( const XData& obj );
+
+            /// Removes and destroys the object of type XData if it exists in the frame.
+            /// Does nothing if the object does not exist.
+            template< typename XData >
+            void Remove();
+
             // typedef used to avoid problems with the comma in the MEMVAR macro
             typedef std::unordered_map< std::type_index, std::unique_ptr<Data> > DataMap;
             MEMVAR_REF( DataMap, DataObjects );
     };
 
 
+    inline bool DataFrame::Empty() const
+    {
+        return fDataObjects.empty();
+    }
+
     template< typename XData >
     bool DataFrame::Has() const
     {
@@ -94,6 +122,32 @@ namespace Nymph
         THROW_EXCEPT_HERE( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" );
     }
 
+    template< typename XData >
+    void DataFrame::Set( XData* ptr )
+    {
+        fDataObjects[ typeid(XData) ].reset( ptr );  // take ownership of ptr
+    }
+
+    template< typename XData >
+    void DataFrame::Set( std::unique_ptr< XData >&& ptr )
+    {
+        fDataObjects[ typeid(XData) ] = std::move(ptr);  // take ownership of ptr
+        return;
+    }
+
+    template< typename XData >
+    void DataFrame::Set( const XData& obj )
+    {
+        fDataObjects[ typeid(XData) ].reset( new XData(obj) );  // make a copy of obj
+    }
+
+    template< typename XData >
+    void DataFrame::Remove()
+    {
+        fDataObjects.erase( typeid(XData) );
+        return;
+    }
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_DATAFRAME_HH_ */
diff --git a/Testing/TestDataFrame.cc b/Testing/TestDataFrame.cc
index 290e350..100ca62 100644
--- a/Testing/TestDataFrame.cc
+++ b/Testing/TestDataFrame.cc
@@ -20,6 +20,7 @@ TEST_CASE( "data_frame", "[data]" )
     const DataFrame& cFrame = frame;
 
     REQUIRE( frame.DataObjects().empty() );
+    REQUIRE( frame.Empty() );
     REQUIRE_FALSE( frame.Has< TestData1 >() );
     REQUIRE_FALSE( frame.Has< TestData2 >() );
 
@@ -36,6 +37,36 @@ TEST_CASE( "data_frame", "[data]" )
     REQUIRE( frame.Get< TestData1 >().GetIValue1() == 50 );
 
     // check const access
+    // currently has TestData1; does not have TestData2
     REQUIRE( cFrame.Get< TestData1 >().GetIValue1() == 50 );
     REQUIRE_THROWS_AS( cFrame.Get< TestData2 >(), DataFrameException );
+
+    // remove a data object
+    // currently has TestData1; does not have TestData2
+    REQUIRE_NOTHROW( frame.Remove< TestData2 >() );
+    REQUIRE_NOTHROW( frame.Remove< TestData1 >() );
+    REQUIRE_FALSE( frame.Has< TestData1 >() );
+    REQUIRE( frame.Empty() );
+
+    // set an object with a raw pointer
+    TestData2* newTestData2Ptr = new TestData2();
+    REQUIRE_NOTHROW( frame.Set( newTestData2Ptr ) );
+    REQUIRE( frame.Has< TestData2 >() );
+    REQUIRE( (Data*)newTestData2Ptr == frame.DataObjects()[typeid(TestData2)].get() ); // we did not make a copy
+
+    // set an object with a unique_ptr
+    std::unique_ptr< TestData1 > newTestData1Ptr( new TestData1 );
+    REQUIRE_NOTHROW( frame.Set( std::move(newTestData1Ptr) ) );
+    REQUIRE_FALSE( newTestData1Ptr );
+    REQUIRE( frame.Has< TestData1 >() );
+    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 0 ); // check that fIValue1 has the default value; we'll overwrite the data object next, and verify we have the new value
+
+    // set an object with a copy of an object
+    TestData1 anotherTestData1;
+    anotherTestData1.SetIValue1( 4000 );
+    REQUIRE_NOTHROW( frame.Set( anotherTestData1 ) );
+    REQUIRE( anotherTestData1.GetIValue1() == 4000 );
+    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 4000 );
+    REQUIRE_FALSE( (Data*)(&anotherTestData1) == frame.DataObjects()[typeid(TestData1)].get() ); // we made a copy
+
 }

From e2cb44748d5d44ce5793328939e20edc3aace41c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 01:06:17 -0800
Subject: [PATCH 199/521] Updated Scarab on dev branch with exception updates

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 62f3004..f888449 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 62f3004eda6eab02d03bdedfb81e385d915f82a5
+Subproject commit f888449ecdfe7369b714d794148a35131c316a14

From 482542779132550c891b3223e2dfd963840af5c1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 01:06:58 -0800
Subject: [PATCH 200/521] Use improved Scarab exceptions

---
 Library/Data/DataFrame.hh           |  4 +-
 Library/Processor/SignalSlotBase.hh | 12 ++---
 Library/Utility/Exception.cc        | 23 ++++++++-
 Library/Utility/Exception.hh        | 72 ++++++++++++++---------------
 4 files changed, 64 insertions(+), 47 deletions(-)

diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 69a0a14..1fb1944 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -22,10 +22,10 @@
 
 namespace Nymph
 {
-    class DataFrameException : public BaseException< DataFrameException >
+    class DataFrameException : public scarab::typed_exception< DataFrameException >
     {
         public:
-            using BaseException< DataFrameException >::BaseException;
+            using scarab::typed_exception< DataFrameException >::typed_exception;
             ~DataFrameException() = default;
     };
 
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index eb5bdd7..1029317 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -20,24 +20,24 @@
 namespace Nymph
 {
 
-    class SignalException : public BaseException< SignalException >
+    class SignalException : public scarab::typed_exception< SignalException >
     {
         public:
-            using BaseException< SignalException >::BaseException;
+            using scarab::typed_exception< SignalException >::typed_exception;
             ~SignalException() = default;
     };
 
-    class SlotException : public BaseException< SlotException >
+    class SlotException : public scarab::typed_exception< SlotException >
     {
         public:
-            using BaseException< SlotException >::BaseException;
+            using scarab::typed_exception< SlotException >::typed_exception;
             ~SlotException() = default;
     };
 
-    class ConnectionException : public BaseException< ConnectionException >
+    class ConnectionException : public scarab::typed_exception< ConnectionException >
     {
         public:
-            using BaseException< ConnectionException >::BaseException;
+            using scarab::typed_exception< ConnectionException >::typed_exception;
             ~ConnectionException() = default;
     };
 
diff --git a/Library/Utility/Exception.cc b/Library/Utility/Exception.cc
index d7fa0bb..0bd874d 100644
--- a/Library/Utility/Exception.cc
+++ b/Library/Utility/Exception.cc
@@ -9,9 +9,30 @@
 
 namespace Nymph
 {
+/*
+    BaseException::BaseException() :
+            std::exception(),
+            fAtFilename( "unknown" ),
+            fAtLineNumber( 0 ),
+            fBuffer()
+    {}
 
+    BaseException::~BaseException() noexcept
+    {}
 
-
+    const char* BaseException::where() const noexcept
+    {
+        try
+        {
+            fBuffer = fAtFilename + "(" + std::to_string(fAtLineNumber) + ")";
+        }
+        catch(const std::bad_alloc& e)
+        {
+            fBuffer = fAtFilename;
+        }
+        return fBuffer.c_str();
+    }
+*/
 /* removed for trying home-grown exceptions, 1/10/22
     Exception::Exception() :
             boost::exception(),
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index 9c4cc78..1ad1857 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -9,8 +9,6 @@
 #ifndef NYMPH_EXCEPTION_HH_
 #define NYMPH_EXCEPTION_HH_
 
-#include "MemberVariable.hh"
-
 #include "base_exception.hh"
 
 //#include <boost/exception/all.hpp>
@@ -21,28 +19,40 @@
 
 namespace Nymph
 {
-
-    template< typename XDerived >
-    class BaseException : public scarab::base_exception< XDerived >
+    /*
+    class BaseException : virtual public std::exception
     {
         public:
             BaseException();
-            BaseException( const std::string& filename, int lineNum );
             ~BaseException() noexcept;
 
-            XDerived& operator()( const std::string& filename, int lineNum );
-            XDerived& operator%( const std::string& filename );
-            XDerived& operator%( int lineNum );
-
             MEMVAR_REF( std::string, AtFilename );
             MEMVAR( int, AtLineNumber );
+
+            virtual const char* where() const noexcept;
+
+        private:
+            mutable std::string fBuffer;
+    };
+
+    template< typename XDerived >
+    class TypedException : virtual public scarab::base_exception< XDerived >, public BaseException
+    {
+        public:
+            TypedException();
+            TypedException( const std::string& filename, int lineNum );
+            ~TypedException() noexcept;
+
+            XDerived& operator()( const std::string& filename, int lineNum );
+
     };
+    */
 
-    class Exception : public BaseException< Exception >
+    class Exception : public scarab::typed_exception< Exception >
     {
         public:
-            using BaseException< Exception >::BaseException;
-            ~Exception() = default;
+            using scarab::typed_exception< Exception >::typed_exception;
+            virtual ~Exception() noexcept = default;
     };
 
 #define CREATE_EXCEPT_HERE( anException )  anException( __FILE__, __LINE__ )
@@ -50,48 +60,34 @@ namespace Nymph
 
 #define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( anException )
 #define THROW_NESTED_EXCEPT_HERE( anException ) std::throw_with_nested( EXCEPT_HERE( anException ) )
-
+/*
     template< typename XDerived >
-    BaseException< XDerived >::BaseException() :
+    TypedException< XDerived >::TypedException() :
             scarab::base_exception< XDerived >(),
-            fAtFilename( "unknown" ),
-            fAtLineNumber( 0 )
+            BaseException()
     {}
 
     template< typename XDerived >
-    BaseException< XDerived >::BaseException( const std::string& filename, int lineNumber ) :
+    TypedException< XDerived >::TypedException( const std::string& filename, int lineNumber ) :
             scarab::base_exception< XDerived >(),
-            fAtFilename( filename ),
-            fAtLineNumber( lineNumber )
-    {}
-
-    template< typename XDerived >
-    BaseException< XDerived >::~BaseException() noexcept
-    {}
-
-    template< typename XDerived >
-    XDerived& BaseException< XDerived >::operator()( const std::string& filename, int lineNumber )
+            BaseException()
     {
         fAtFilename = filename;
         fAtLineNumber = lineNumber;
-        return *static_cast< XDerived* >(this);
     }
 
     template< typename XDerived >
-    XDerived& BaseException< XDerived >::operator%( const std::string& filename )
-    {
-        fAtFilename = filename;
-        return *static_cast< XDerived* >(this);
-    }
+    TypedException< XDerived >::~TypedException() noexcept
+    {}
 
     template< typename XDerived >
-    XDerived& BaseException< XDerived >::operator%( int lineNum )
+    XDerived& TypedException< XDerived >::operator()( const std::string& filename, int lineNumber )
     {
-        fAtLineNumber = lineNum;
+        fAtFilename = filename;
+        fAtLineNumber = lineNumber;
         return *static_cast< XDerived* >(this);
     }
-
-
+*/
 /* removed for trying home-grown exceptions, 1/10/22
     struct MessageEnd {};
     static const MessageEnd eom = MessageEnd();

From a95e7ca9f006d126f20447350c4c9bca91ae7171 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 01:28:54 -0800
Subject: [PATCH 201/521] Scarab update

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index f888449..b8fcbaf 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit f888449ecdfe7369b714d794148a35131c316a14
+Subproject commit b8fcbaf99f19690715c00f83b6ca52491b6634b0

From c6e66344ba8fbde7154664b2758776360906d782 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 01:29:14 -0800
Subject: [PATCH 202/521] Fixed remaining changes from exception updates

---
 Library/CMakeLists.txt                |  2 +-
 Library/Processor/ControlAccess.hh    |  6 ++--
 Library/Processor/Processor.cc        |  4 +--
 Library/Processor/ProcessorToolbox.cc | 21 +++++++------
 Library/Utility/Exception.cc          | 19 ++++++++++++
 Library/Utility/Exception.hh          |  4 +++
 Testing/TestException.cc              | 43 +++++++++++++--------------
 7 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 6941aee..55986dc 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -34,7 +34,7 @@ set( NYMPH_HEADERFILES
 )
 
 set( NYMPH_SOURCEFILES
-    #${UTIL_DIR}/Exception.cc
+    ${UTIL_DIR}/Exception.cc
 
     ${DATA_DIR}/Data.cc
     ${DATA_DIR}/DataFrame.cc
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index b034ce9..3c4c4cc 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -71,7 +71,7 @@ namespace Nymph
         {
             if( ! WaitToContinue() )
             {
-                BOOST_THROW_EXCEPTION( Exception() << "Canceled while waiting to initiate a breakpoint" << eom );
+                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
             }
         }
 
@@ -86,10 +86,10 @@ namespace Nymph
     template< typename... Args >
     std::tuple< Args&... >& SharedControl::GetReturn()
     {
-        if( ! fReturnPtr ) BOOST_THROW_EXCEPTION( Exception() << "No return available" << eom );
+        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
         std::unique_lock< std::mutex > lock( fMutex );
         std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
-        if( buffer == nullptr ) BOOST_THROW_EXCEPTION( Exception() << "Incorrect types used to get return" << eom );
+        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
         return buffer->GetReturn();
     }
 
diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index 2abea1b..a085c91 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -142,7 +142,7 @@ namespace Nymph
         {
             return signal->GetDoBreakpoint();
         }
-        BOOST_THROW_EXCEPTION( Exception() << "Signal <" << signalName << "> was not found" << eom );
+        THROW_EXCEPT_HERE( Exception() << "Signal <" << signalName << "> was not found" );
         return false;
     }
 
@@ -153,7 +153,7 @@ namespace Nymph
         {
             return signal->SetDoBreakpoint( flag );
         }
-        BOOST_THROW_EXCEPTION( Exception() << "Signal <" << signalName << "> was not found" << eom );
+        THROW_EXCEPT_HERE( Exception() << "Signal <" << signalName << "> was not found" );
         return;
     }
 
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 5cd2423..c4cb27c 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -408,12 +408,12 @@ namespace Nymph
                 signalProc->ConnectASlot(signalName, *slotProc.get(), slotName);
             }
         }
-        catch (boost::exception& e)
+        catch( scarab::base_exception& e )
         {
             LERROR( proclog, "An error occurred while connecting signals and slots:\n"
                     << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->Name() << ")" << '\n'
-                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->Name() << ")" << '\n'
-                    << '\t' << diagnostic_information( e ) );
+                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->Name() << ")" << '\n' );
+            PrintException( e );
             return false;
         }
 
@@ -446,9 +446,10 @@ namespace Nymph
             signalProc->SetDoBreakpoint( signalName, true );
             return true;
         }
-        catch( boost::exception& e )
+        catch( scarab::base_exception& e )
         {
-            LERROR( proclog, "Unable to set breakpoint: " << diagnostic_information( e ) );
+            LERROR( proclog, "Unable to set breakpoint: " );
+            PrintException( e );
             return false;
         }
     }
@@ -479,9 +480,10 @@ namespace Nymph
             signalProc->SetDoBreakpoint( signalName, false );
             return true;
         }
-        catch( boost::exception& e )
+        catch( scarab::base_exception& e )
         {
-            LERROR( proclog, "Unable to set breakpoint: " << diagnostic_information( e ) );
+            LERROR( proclog, "Unable to set breakpoint: " );
+            PrintException( e );
             return false;
         }
     }
@@ -838,11 +840,12 @@ namespace Nymph
                 //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
-            catch( boost::exception& e )
+            catch( scarab::base_exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
                 LERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
-                LERROR( proclog, "Diagnostic Information:\n" << diagnostic_information( e ) );
+                LERROR( proclog, "Diagnostic Information:\n" );
+                PrintException( e );
                 SharedControl::get_instance()->Cancel();
                 //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
                 //fDoRunPromise.set_exception( boost::current_exception() );
diff --git a/Library/Utility/Exception.cc b/Library/Utility/Exception.cc
index 0bd874d..5446122 100644
--- a/Library/Utility/Exception.cc
+++ b/Library/Utility/Exception.cc
@@ -7,8 +7,27 @@
 
 #include "Exception.hh"
 
+#include "logger.hh"
+
+LOGGER( exlog, "Exception" );
+
 namespace Nymph
 {
+    void PrintException( const scarab::base_exception& e, unsigned count )
+    {
+        LINFO( exlog, std::string(count, ' ') << "Exception: " << e.what() );
+        LINFO( exlog, std::string(count, ' ') << "\tThrown at: " << e.where() );
+        try
+        {
+            std::rethrow_if_nested( e );
+        }
+        catch(const Nymph::Exception& e)
+        {
+            PrintException( e, ++count );
+        }
+        return;
+    }
+
 /*
     BaseException::BaseException() :
             std::exception(),
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index 1ad1857..479241a 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -60,6 +60,10 @@ namespace Nymph
 
 #define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( anException )
 #define THROW_NESTED_EXCEPT_HERE( anException ) std::throw_with_nested( EXCEPT_HERE( anException ) )
+
+/// Recursive print function for potentially-nested exceptions
+void PrintException( const scarab::base_exception& e, unsigned count = 0 );
+
 /*
     template< typename XDerived >
     TypedException< XDerived >::TypedException() :
diff --git a/Testing/TestException.cc b/Testing/TestException.cc
index cf08f8e..c990250 100644
--- a/Testing/TestException.cc
+++ b/Testing/TestException.cc
@@ -19,12 +19,12 @@ TEST_CASE( "exception", "[utility]" )
 
     Exception blankEx;
     REQUIRE( blankEx.what() == std::string() );
-    REQUIRE( blankEx.AtFilename() == "unknown" );
-    REQUIRE( blankEx.GetAtLineNumber() == 0 );
+    REQUIRE( blankEx.filename().empty() );
+    REQUIRE( blankEx.line() == 0 );
 
     Exception testEx( "some_file", 1 );
-    REQUIRE( testEx.AtFilename() == "some_file" );
-    REQUIRE( testEx.GetAtLineNumber() == 1 );
+    REQUIRE( testEx.filename() == "some_file" );
+    REQUIRE( testEx.line() == 1 );
 
     std::string testMessage("test message 2: ");
     int testInt = 5;
@@ -34,12 +34,12 @@ TEST_CASE( "exception", "[utility]" )
     /*EXCEPT_HERE( Exception testEx );*/ 
     // uses of __LINE__ need to be on the same line
     testEx( __FILE__, __LINE__ ); std::string recordFile( __FILE__ ); int recordLine( __LINE__ );
-    REQUIRE( testEx.AtFilename() == recordFile );
-    REQUIRE( testEx.GetAtLineNumber() == recordLine );
+    REQUIRE( testEx.filename() == recordFile );
+    REQUIRE( testEx.line() == recordLine );
 
     EXCEPT_HERE( testEx ); recordFile = std::string(__FILE__); recordLine = __LINE__;
-    REQUIRE( testEx.AtFilename() == recordFile );
-    REQUIRE( testEx.GetAtLineNumber() == recordLine );
+    REQUIRE( testEx.filename() == recordFile );
+    REQUIRE( testEx.line() == recordLine );
 }
 
 TEST_CASE( "throw", "[utility]" )
@@ -53,8 +53,8 @@ TEST_CASE( "throw", "[utility]" )
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string() );
-        REQUIRE( e.AtFilename() == "unknown" );
-        REQUIRE( e.GetAtLineNumber() == 0 );
+        REQUIRE( e.filename().empty() );
+        REQUIRE( e.line() == 0 );
     }
     
     std::string recordFile;
@@ -68,8 +68,8 @@ TEST_CASE( "throw", "[utility]" )
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.AtFilename() == recordFile );
-        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
     }
     
     // Give CREATE_EXCEPT_HERE the class name
@@ -81,8 +81,8 @@ TEST_CASE( "throw", "[utility]" )
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string() );
-        REQUIRE( e.AtFilename() == recordFile );
-        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
     }
     
     // Give EXCEPT_HERE an exception
@@ -94,8 +94,8 @@ TEST_CASE( "throw", "[utility]" )
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.AtFilename() == recordFile );
-        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
     }
     
     // THROW macro
@@ -107,8 +107,8 @@ TEST_CASE( "throw", "[utility]" )
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.AtFilename() == recordFile );
-        REQUIRE( e.GetAtLineNumber() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
     }
     
 }
@@ -150,10 +150,10 @@ void CatchThrow()
     }
 }
 
-// recursive print function
-void PrintException( const Nymph::Exception& e, unsigned count = 0 )
+void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
 {
     LINFO( testlog, std::string(count, ' ') << "Exception: " << e.what() );
+    LINFO( testlog, std::string(count, ' ') << "\tThrown at: " << e.where() );
     if( count == layers + 1 )
     {
         REQUIRE( e.what() == firstThrowText );
@@ -175,7 +175,6 @@ void PrintException( const Nymph::Exception& e, unsigned count = 0 )
     return;
 }
 
-
 TEST_CASE( "nested_throw", "[utility]" )
 {
     using namespace Nymph;
@@ -187,7 +186,7 @@ TEST_CASE( "nested_throw", "[utility]" )
     catch(const Exception& e)
     {
 
-        PrintException(e);
+        PrintExceptionWithTests(e);
     }
     
 }

From 9e2417370870d88b319496e15c1ddf4122b626ec Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 13:42:55 -0800
Subject: [PATCH 203/521] Update scarab and fix up exception printing

---
 Library/Utility/Exception.cc | 5 +++--
 Scarab                       | 2 +-
 Testing/TestException.cc     | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Library/Utility/Exception.cc b/Library/Utility/Exception.cc
index 5446122..707d749 100644
--- a/Library/Utility/Exception.cc
+++ b/Library/Utility/Exception.cc
@@ -15,8 +15,9 @@ namespace Nymph
 {
     void PrintException( const scarab::base_exception& e, unsigned count )
     {
-        LINFO( exlog, std::string(count, ' ') << "Exception: " << e.what() );
-        LINFO( exlog, std::string(count, ' ') << "\tThrown at: " << e.where() );
+        std::string prefix = std::to_string(count) + ": ";
+        LINFO( exlog, prefix << "Thrown at: " << e.where() );
+        LINFO( exlog, prefix << e.what() );
         try
         {
             std::rethrow_if_nested( e );
diff --git a/Scarab b/Scarab
index b8fcbaf..89d2073 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit b8fcbaf99f19690715c00f83b6ca52491b6634b0
+Subproject commit 89d20734cee198b6e7d4258db030b4250e7a85d7
diff --git a/Testing/TestException.cc b/Testing/TestException.cc
index c990250..eb0785c 100644
--- a/Testing/TestException.cc
+++ b/Testing/TestException.cc
@@ -152,8 +152,9 @@ void CatchThrow()
 
 void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
 {
-    LINFO( testlog, std::string(count, ' ') << "Exception: " << e.what() );
-    LINFO( testlog, std::string(count, ' ') << "\tThrown at: " << e.where() );
+    std::string prefix( count, ' ' );
+    LINFO( testlog, prefix << "Thrown at: " << e.where() );
+    LINFO( testlog, prefix << e.what() );
     if( count == layers + 1 )
     {
         REQUIRE( e.what() == firstThrowText );
@@ -170,7 +171,7 @@ void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
     }
     catch(const Nymph::Exception& e)
     {
-        PrintException( e, ++count );
+        PrintExceptionWithTests( e, ++count );
     }
     return;
 }

From 5acd3dd9519bef274fea652429380fa69fd90b2b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 13:57:47 -0800
Subject: [PATCH 204/521] Cleanup: remove unused code in ProcessorToolbox

---
 Library/Processor/ProcessorToolbox.cc | 332 +-------------------------
 Library/Processor/ProcessorToolbox.hh |  72 ------
 2 files changed, 1 insertion(+), 403 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index c4cb27c..a24fad4 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -574,135 +574,11 @@ namespace Nymph
             return;
         }
 
-        //fDoRunPromise = boost::promise< void >();
-        //fDoRunFuture = fDoRunPromise.get_future().share();
-
-        //bool willRunSingleThreaded = fRunSingleThreaded;
-//#ifdef SINGLETHREADED
-        //willRunSingleThreaded = true;
-//#endif
-
-        //if( willRunSingleThreaded )
-        //{
-        //    StartSingleThreadedRun();
-        //}
-        //else
-        //{
         StartMultiThreadedRun();
-        //}
 
         return;
     }
-/*
-    void ProcessorToolbox::StartSingleThreadedRun()
-    {
-        auto singleThreadRun = [&]()
-        {
-            try
-            {
-                LPROG( proclog, "Starting single-threaded processing" );
-
-                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-                {
-                    for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                    {
-                        boost_unique_lock breakContLock( fBreakContMutex );
-
-                        std::string procName( tgIter->fName );
-                        LINFO( proclog, "Starting processor <" << procName << ">" );
-
-                        std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                        thisThreadRef->Name() = procName;
-
-                        thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                        thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
-
-                        fThreadReferences.push_back( thisThreadRef );
-
-                        boost::condition_variable threadStartedCV;
-                        boost::mutex threadStartedMutex;
-                        bool threadStartedFlag = false;
-
-                        boost_unique_lock threadStartedLock( threadStartedMutex );
-                        boost::thread thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
-                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
-                        while( ! threadStartedFlag )
-                        {
-                            threadStartedCV.wait( threadStartedLock );
-                        }
-                        KTDEBUG( proclog, "Thread has started" );
-
-                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
-
-                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
-                        do
-                        {
-                            boost::future_status status;
-                            do
-                            {
-                                status = fThreadReferences.back()->GetDataPtrRetFuture().wait_for( boost::chrono::milliseconds(500) );
-                            } while (status != boost::future_status::ready);
-
-                            stillRunning = false;
-                            if( fThreadReferences.back()->GetBreakFlag() )
-                            {
-                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << procName << ">; may not be where breakpoint is set)" );
-
-                                WaitForContinue( breakContLock );
-
-                                KTDEBUG( proclog, "Breakpoint finished" );
-                                stillRunning = true;
-                            }
-                            else
-                            {
-                                try
-                                {
-                                    fThreadReferences.back()->GetReturnValue();
-                                    LINFO( proclog, "Thread <" << procName << "> has finished" );
-                                    fThreadReferences.pop_back();
-                                }
-                                catch( boost::exception& e )
-                                {
-                                    e << KTErrorMsgInfo< struct procTB_STRFinishing >( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
-                                    throw;
-                                }
-                                stillRunning = false;
-                            }
-                        } while( stillRunning );
-
-                        LINFO( proclog, "Processor <" << procName << "> has finished" );
-
-                        thread.join();
-                        fThreadReferences.clear();
-                    } // end for loop over the thread group
-                } // end for loop over the run-queue
-
-                LPROG( proclog, "Processing is complete (single-threaded)" );
-            }
-            catch( std::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught std::exception thrown in a processor or in the single-threaded run function: " << e.what() );
-                LWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            catch( boost::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught boost::exception thrown in a processor or in the single-threaded run function" );
-                LWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            fDoRunPromise.set_value();
-            return;
-        }; // end single-threaded run lambda
 
-        fDoRunThread = new boost::thread( singleThreadRun );
-        return;
-    }
-*/
     void ProcessorToolbox::StartMultiThreadedRun()
     {
         auto multiThreadRun = [&]()
@@ -717,8 +593,6 @@ namespace Nymph
                     std::map< std::string, std::thread > threads;
 
                     { // scope for threadFuturesLock
-                        //boost_unique_lock breakContLock( fBreakContMutex );
-                        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
 
                         for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
                         {
@@ -726,29 +600,6 @@ namespace Nymph
                             LINFO( proclog, "Starting processor <" << procName << ">" );
 
                             threads.emplace( procName, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) );
-
-                            //std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                            //thisThreadRef->Name() = procName;
-
-                            //thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                            //thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
-                            //fThreadReferences.push_back( thisThreadRef );
-
-                            //boost::condition_variable threadStartedCV;
-                            //boost::mutex threadStartedMutex;
-                            //bool threadStartedFlag = false;
-
-                            //boost_unique_lock threadStartedLock( threadStartedMutex );
-                            //boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
-                            //KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
-                            //while( ! threadStartedFlag )
-                            //{
-                            //    threadStartedCV.wait( threadStartedLock );
-                            //}
-                            //KTDEBUG( proclog, "Thread has started" );
-
-                            //threads.add_thread( thisThread );
-
                         }// end for loop over the thread group
                     } // end scope for threadFuturesLock
 
@@ -776,57 +627,6 @@ namespace Nymph
                             LDEBUG( proclog, "Detected cancelation while waiting during running" );
                         }
                     }
-
-                    /*
-                    bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
-                    do
-                    {
-                        auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
-                        boost_unique_lock breakContLock( fBreakContMutex );
-
-                        size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
-                        auto finishedReferencePtr = fThreadReferences.begin() + iThread;
-                        std::string threadName( (*finishedReferencePtr)->Name() );
-                        KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
-
-                        stillRunning = false;
-                        if( fDoRunBreakFlag )
-                        {
-                            // a breakpoint has been reached
-                            KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
-
-                            // wait here for the user to continue
-                            WaitForContinue( breakContLock );
-
-                            KTDEBUG( proclog, "Breakpoint finished" );
-                            stillRunning = true;
-                            //continueSignal = fMasterContSignal; // refresh the local copy of the shared future
-                        }
-                        else
-                        {
-                            // we're finished a thread; get its results
-                            try
-                            {
-                                LINFO( proclog, "Thread <" << threadName << "> has finished" );
-                                finishedFuturePtr->get();
-                                fThreadReferences.erase( finishedReferencePtr );
-                            }
-                            catch( boost::exception& e )
-                            {
-                                e << KTErrorMsgInfo< struct procTB_MTRFinishing >( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
-                                throw;
-                            }
-
-                            if( fThreadReferences.empty() ) stillRunning = false;
-                            else stillRunning = true;
-                        }
-                    } while( stillRunning );
-
-                    KTDEBUG( proclog, "Joining threads" );
-                    threads.join_all();
-                    boost_unique_lock breakContLock( fBreakContMutex );
-                    fThreadReferences.clear();
-                    */
                 } // end for loop over the run-queue
 
                 LPROG( proclog, "Processing is complete (multi-threaded)" );
@@ -847,12 +647,8 @@ namespace Nymph
                 LERROR( proclog, "Diagnostic Information:\n" );
                 PrintException( e );
                 SharedControl::get_instance()->Cancel();
-                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
-            //LWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
-            //fDoRunPromise.set_value();
             return;
         }; // end multi-threaded run lambda
 
@@ -864,44 +660,6 @@ namespace Nymph
     bool ProcessorToolbox::WaitForBreakOrCanceled()
     {
         return SharedControl::get_instance()->WaitForBreakOrCanceled();
-        /*
-        boost_unique_lock breakContLock( fBreakContMutex );
-
-        if( fDoRunBreakFlag )
-        {
-            LWARN( proclog, "Can't wait for a break; Already at a breakpoint" );
-            return true;
-        }
-
-        boost::shared_future< void > doRunFuture = fDoRunFuture;
-        if( ! doRunFuture.valid() )
-        {
-            BOOST_THROW_EXCEPTION( KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)" << eom );
-        }
-
-        breakContLock.unlock();
-
-        // block here until there's a break
-        doRunFuture.wait();
-
-        if( fDoRunBreakFlag )
-        {
-            KTDEBUG( proclog, "Breakpoint reached (the wait is over)" );
-            return true;
-        }
-
-        try
-        {
-            doRunFuture.get();
-            KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
-            return false;
-        }
-        catch( boost::exception& e )
-        {
-            LERROR( proclog, "An error occurred during processing: " << boost::diagnostic_information( e ) );
-            return false;
-        }
-        */
     }
 
     bool ProcessorToolbox::WaitToContinue()
@@ -911,8 +669,6 @@ namespace Nymph
 
     void ProcessorToolbox::WaitForEndOfRun()
     {
-        // WaitForBreak() and WaitForContinue() throw boost::exception for problems with the future or promise objects
-
         LDEBUG( proclog, "Waiting for end-of-run" );
         while( WaitForBreakOrCanceled() )
         {
@@ -929,84 +685,7 @@ namespace Nymph
     {
         SharedControl::get_instance()->Resume();
         return;
-        /*
-        if( ! fDoRunBreakFlag )
-        {
-            LWARN( proclog, "Not currently at a breakpoint" );
-            return;
-        }
-
-        boost_unique_lock breakContLock( fBreakContMutex );
-
-        // reset all break flags
-        fDoRunBreakFlag = false;
-        std::vector< boost_unique_lock > trLocks;
-        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
-        {
-            trLocks.emplace_back( (*trIt)->Mutex() );
-            (*trIt)->SetBreakFlag( false );
-            (*trIt)->RefreshDataPtrRet();
-        }
-
-        // reset the do-run promise and future
-        fDoRunPromise = boost::promise< void >();
-        fDoRunFuture = fDoRunPromise.get_future().share();
-
-        LINFO( proclog, "Continuing from breakpoint" );
-        // signal everything to resume
-        fDoContinue = true;
-        fContinueCV.notify_all();
-
-        return;
-        */
-    }
-/*
-    KTDataHandle ProcessorToolbox::GetData( const std::string& threadName )
-    {
-        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
-        boost_unique_lock breakContLock( fBreakContMutex );
-
-        auto trIt = fThreadReferences.begin();
-        for( ; trIt != fThreadReferences.end(); ++trIt )
-        {
-            if( (*trIt)->Name() == threadName ) break;
-        }
-        if( trIt == fThreadReferences.end() )
-        {
-            LWARN( proclog, "Did not find thread <" << threadName << ">" );
-            BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
-        }
-
-        boost_unique_lock lock( (*trIt)->Mutex() );
-        return (*trIt)->GetReturnValue();
-    }
-*/
-/*
-    void ProcessorToolbox::InitiateBreak()
-    {
-        boost_unique_lock breakContLock( fBreakContMutex );
-        if( fDoRunBreakFlag ) return;
-
-        // set the continue flag to false so that things will wait for the continue
-        fDoContinue = false;
-
-        // set all break flags
-        // master break flag
-        fDoRunBreakFlag = true;
-        // thread break flags
-        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
-        {
-            boost_unique_lock lock( (*trIt)->Mutex() );
-            (*trIt)->SetBreakFlag( true );
-        }
-
-        // use the do-run promise to signal the break
-        LWARN( proclog, "Setting value of do-run-promise" );
-        fDoRunPromise.set_value();
-
-        return;
     }
-    */
 
    void ProcessorToolbox::JoinRunThread()
    {
@@ -1018,20 +697,11 @@ namespace Nymph
     {
         SharedControl::get_instance()->Cancel();
         return;
-        /*
-        boost_unique_lock breakContLock( fBreakContMutex );
-        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
-        {
-            boost_unique_lock lock( (*trIt)->Mutex() );
-            (*trIt)->SetCanceled( true );
-        }
-        return;
-        */
     }
 
     bool ProcessorToolbox::Run()
     {
-        // can throw boost::exception
+        // can throw scarab::base_exception
 
         AsyncRun();
 
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index b8574b3..c2029f3 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -239,67 +239,13 @@ namespace Nymph
 
             // TODO: return value access
 
-            //KTDataHandle GetData( const std::string& threadName );
-
-            //MEMVAR_SHARED_PTR_CONST( SharedControl, Control );
-
         protected:
-            //typedef boost::shared_future< KTDataHandle > Future;
-
-            //void StartSingleThreadedRun();
             void StartMultiThreadedRun();
 
-            // called from KTThreadReference::Break
-            //void InitiateBreak();
-
-            //std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
-
-            //boost::condition_variable fContinueCV;
-            //bool fDoContinue;
-            //boost::mutex fBreakContMutex;
-
             std::thread fDoRunThread;
-            //boost::promise< void > fDoRunPromise;
-            //boost::shared_future< void > fDoRunFuture;
-            //bool fDoRunBreakFlag;
-
-    };
-
-/*
-    template< class Value, class IIterator >
-    class KTThreadRefFutureIter : public boost::iterator_adaptor< KTThreadRefFutureIter< Value, IIterator >, IIterator, Value, boost::random_access_traversal_tag >
-    {
-        private:
-            // used for the conversion constructor below
-            struct enabler {};
 
-        public:
-            KTThreadRefFutureIter() :
-                    KTThreadRefFutureIter::iterator_adaptor_()
-            {}
-            KTThreadRefFutureIter( const IIterator& other ) :
-                    KTThreadRefFutureIter::iterator_adaptor_( other )
-            {}
-
-            // converts from Iterator to ConstIterator, but the enable_if business prevents converting from ConstIterator to Iterator
-            template< class OtherValue, class OtherIIterator >
-            KTThreadRefFutureIter( const KTThreadRefFutureIter< OtherValue, OtherIIterator > & other, typename boost::enable_if< boost::is_convertible< OtherValue, Value >, enabler >::type = enabler() ) :
-                    KTThreadRefFutureIter::iterator_adaptor_( other.base )
-            {}
-
-        private:
-            friend class boost::iterator_core_access;
-
-            Value& dereference() const
-            {
-                return (*(this->base_reference()))->GetDataPtrRetFuture();
-            }
     };
 
-    typedef KTThreadRefFutureIter< boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
-    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
-*/
-
     inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
     {
         return MakeConnection(signal, slot, std::numeric_limits< int >::min());
@@ -321,24 +267,6 @@ namespace Nymph
         fRunQueue.clear();
         return;
     }
-/*
-    inline void ProcessorToolbox::WaitForContinue( boost_unique_lock& lock )
-    {
-        //fMasterContSignal.wait();
-        while( ! fDoContinue )
-        {
-            fContinueCV.wait( lock );
-        }
-        return;
-    }
 
-    inline void ProcessorToolbox::JoinRunThread()
-    {
-        if( fDoRunThread == nullptr ) return;
-        fDoRunThread->join();
-        delete fDoRunThread;
-        fDoRunThread = nullptr;
-    }
-*/
 } /* namespace Nymph */
 #endif /* NYMPH_PROCESSORTOOLBOX_HH_ */

From aeaefaf7531d03c376103112432a80467259b85b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 16:15:45 -0800
Subject: [PATCH 205/521] Rename TestProc.hh to TestProcessorClasses.hh

---
 Testing/TestProc.hh             | 105 -------------------
 Testing/TestProcessorClasses.hh | 175 ++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+), 105 deletions(-)
 delete mode 100644 Testing/TestProc.hh
 create mode 100644 Testing/TestProcessorClasses.hh

diff --git a/Testing/TestProc.hh b/Testing/TestProc.hh
deleted file mode 100644
index ce8013d..0000000
--- a/Testing/TestProc.hh
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * TestProc.hh
- *
- *  Created on: Nov 25, 2021
- *      Author: N.S. Oblath
- */
-
-#include "PrimaryProcessor.hh"
-#include "Processor.hh"
-#include "Signal.hh"
-#include "Slot.hh"
-
-
-namespace Nymph
-{
-    // concrete processor class that we can test
-    // implements Configure() and has its own signal and slot
-    class TestProc : public Processor
-    {
-        public:
-            TestProc( const std::string& name = "test" ) :
-                    Processor( name ),
-                    fValue( 0 ),
-                    fSecondValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestProc::SetValue ),
-                    fSecondValueSig( "second-value", this ),
-                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
-                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
-            {}
-
-            virtual ~TestProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                fValue = node.get_value( "value", fValue );
-                return;
-            }
-
-            MEMVAR( int, Value );
-            MEMVAR( int, SecondValue );
-
-            void SecondValueSlotFunction( int newValue )
-            {
-                fSecondValueSig( newValue );
-            }
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-            MEMVAR_REF( Signal< int >, SecondValueSig );
-            MEMVAR_REF( Slot< int >, SecondValueSlot );
-            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
-
-    };
-
-    // external slot function owner
-    struct TestSlotOwner
-    {
-        int fValue = 0;
-        void TestSlotFunc( int input )
-        {
-            fValue = input;
-            return;
-        }
-    };
-
-
-    // concrete primary processor class that we can test
-    // implements Configure(), Run(), and has its own signal and slot
-    class TestPrimaryProc : public PrimaryProcessor
-    {
-        public:
-            TestPrimaryProc( const std::string& name = "test" ) :
-                    PrimaryProcessor( name ),
-                    fNewValue( 10 ),
-                    fValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
-            {}
-
-            virtual ~TestPrimaryProc()
-            {}
-
-            void Configure( const scarab::param_node& )
-            {
-                return;
-            }
-
-            bool Run()
-            {
-                fValueSig( fNewValue );
-                return true;
-            }
-
-            MEMVAR( int, NewValue );
-            MEMVAR( int, Value );
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-    };
-
-}
diff --git a/Testing/TestProcessorClasses.hh b/Testing/TestProcessorClasses.hh
new file mode 100644
index 0000000..313d0d7
--- /dev/null
+++ b/Testing/TestProcessorClasses.hh
@@ -0,0 +1,175 @@
+/*
+ * TestProcessorClasses.hh
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "PrimaryProcessor.hh"
+#include "Processor.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "logger.hh"
+
+#include <chrono>
+#include <thread>
+
+LOGGER( testprocclasses_h_log, "TestProcessorClasses" );
+
+namespace Nymph
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestProc : public Processor
+    {
+        public:
+            TestProc( const std::string& name = "test" ) :
+                    Processor( name ),
+                    fValue( 0 ),
+                    fSecondValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestProc::SetValue ),
+                    fSecondValueSig( "second-value", this ),
+                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
+                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
+            {}
+
+            virtual ~TestProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                fValue = node.get_value( "value", fValue );
+
+                // we'll test configuration error throwing by having a string with restricted values
+                if( node.has("string") )
+                {
+                    if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
+                    else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
+                    else THROW_EXCEPT_HERE( ConfigException( node ) << "Invalid choice for \"string\"" );
+                }
+
+                return;
+            }
+
+            MEMVAR( int, Value );
+            MEMVAR( int, SecondValue );
+            MEMVAR_REF( std::string, StringValue );
+
+            void SecondValueSlotFunction( int newValue )
+            {
+                fSecondValueSig( newValue );
+            }
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+            MEMVAR_REF( Signal< int >, SecondValueSig );
+            MEMVAR_REF( Slot< int >, SecondValueSlot );
+            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
+
+    };
+
+    // external slot function owner
+    struct TestSlotOwner
+    {
+        int fValue = 0;
+        void TestSlotFunc( int input )
+        {
+            fValue = input;
+            return;
+        }
+    };
+
+
+    // concrete primary processor class that we can test
+    // implements Configure(), Run(), and has its own signal and slot
+    class TestPrimaryProc : public PrimaryProcessor
+    {
+        public:
+            enum class TestType
+            {
+                SignalNewValue,
+                WaitTwoSec,
+                ThrowExcept
+            };
+
+            TestPrimaryProc( const std::string& name = "test" ) :
+                    PrimaryProcessor( name ),
+                    fTestSelection( TestType::ThrowExcept ),
+                    fNewValue( 10 ),
+                    fValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
+            {}
+
+            virtual ~TestPrimaryProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                if( node.has("test") )
+                {
+                    std::string testSelectionStr( node["test"]().as_string() );
+                    if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
+                    else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
+                    else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
+                    else
+                    {
+                        LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
+                        THROW_EXCEPT_HERE( ConfigException() << "Invalid test selection: " << testSelectionStr );
+                    }
+                }
+                return;
+            }
+
+            void Run()
+            {
+                switch( fTestSelection )
+                {
+                    case TestType::SignalNewValue:
+                        TestSignalNewValue();
+                        return;
+                    case TestType::WaitTwoSec:
+                        TestWaitTwoSec();
+                        return;
+                    case TestType::ThrowExcept:
+                        TestThrowExcept();
+                        return;
+                    default:
+                        LERROR( testprocclasses_h_log, "Invalid test choice" );
+                        THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
+                }
+                return;
+            }
+
+            void TestSignalNewValue()
+            {
+                fValueSig( fNewValue );
+                return;
+            }
+
+            void TestWaitTwoSec()
+            {
+                std::this_thread::sleep_for(std::chrono::seconds(2));
+                return;
+            }
+
+            void TestThrowExcept()
+            {
+                THROW_EXCEPT_HERE( Exception() << "PrimaryProcessor test function: throw Exception" );
+                return;
+            }
+
+            MEMVAR( TestType, TestSelection );
+
+            MEMVAR( int, NewValue );
+            MEMVAR( int, Value );
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+    };
+
+}

From a3675fa7662ae95126cbd5c0d04334f5096d24a6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 16:16:19 -0800
Subject: [PATCH 206/521] Add ConfigException to Processor.hh/cc

---
 Library/Processor/Processor.cc | 57 ++++++++++++++++++++++++++++++++++
 Library/Processor/Processor.hh | 18 +++++++++++
 2 files changed, 75 insertions(+)

diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index a085c91..f53bbe5 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -15,6 +15,63 @@ namespace Nymph
 {
     //KTLOGGER(proclog, "Processor");
 
+    ConfigException::ConfigException() noexcept :
+            scarab::typed_exception< ConfigException >(),
+            fConfig(),
+            fConfigStr()
+    {}
+
+    ConfigException::ConfigException( const std::string& a_filename, int a_line ) noexcept :
+            scarab::typed_exception< ConfigException >( a_filename, a_line ),
+            fConfig(),
+            fConfigStr()
+    {}
+
+    ConfigException::ConfigException( const scarab::param_node& node ) noexcept :
+            scarab::typed_exception< ConfigException >(),
+            fConfig(),
+            fConfigStr()
+    {
+        try
+        {
+            fConfig.reset( new scarab::param_node(node) );
+        }
+        catch( ... )
+        {}
+    }
+
+    ConfigException::ConfigException( const ConfigException& orig ) noexcept :
+            scarab::typed_exception< ConfigException >( orig ),
+            fConfig(),
+            fConfigStr()
+    {
+        try
+        {
+            if( orig.fConfig ) fConfig.reset( new scarab::param_node(orig.fConfig->as_node()) );
+        }
+        catch( ... )
+        {}
+        
+    }
+
+    ConfigException::~ConfigException() noexcept
+    {}
+
+    const char* ConfigException::what() const noexcept
+    {
+        try
+        {
+            fConfigStr = f_what + '\n' + fConfig->to_string();
+            return fConfigStr.c_str();
+        }
+        catch( ... )
+        {
+            return f_what.c_str();
+        }
+    }
+
+
+
     Processor::Processor( const std::string& name ) :
             fName( name ),
             fSignals(),
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index b815f30..bb7f09b 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -22,6 +22,24 @@ namespace Nymph
 
     struct ProcessorException : virtual public Exception {};
 
+    class ConfigException : public scarab::typed_exception< ConfigException >
+    {
+        public:
+            ConfigException() noexcept;
+            ConfigException( const std::string& a_filename, int a_line ) noexcept;
+            ConfigException( const scarab::param_node& node ) noexcept;
+            ConfigException( const ConfigException& orig ) noexcept;
+            virtual ~ConfigException() noexcept;
+
+            virtual const char* what() const noexcept;
+
+            MEMVAR_REF( scarab::param_ptr_t, Config );
+
+        protected:
+            mutable std::string fConfigStr;
+    };
+
+
     class Processor
     {
         protected:

From 6d5016247718a998dd24562c888ee1d96c588785 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 16:17:55 -0800
Subject: [PATCH 207/521] Add exception pointer to PrimaryProcessor Run() now
 returns void Cleanup unused code

---
 Library/Processor/PrimaryProcessor.cc | 30 +++++++++------------------
 Library/Processor/PrimaryProcessor.hh |  4 +++-
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 90be231..7942131 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -17,7 +17,8 @@ namespace Nymph
     LOGGER( proclog, "PrimaryProcessor" );
 
     PrimaryProcessor::PrimaryProcessor( const std::string& name ) :
-            Processor( name )
+            Processor( name ),
+            fExceptionPtr()
     {}
 
     PrimaryProcessor::~PrimaryProcessor()
@@ -25,36 +26,25 @@ namespace Nymph
 
     void PrimaryProcessor::operator()()// ControlAccessPtr control ) // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
     {
-        // pass the control access pointer to every signal in the primary processor
-        /*
-        for( auto signalIt = fSignals.begin(); signalIt != fSignals.end(); ++signalIt )
-        {
-            signalIt->second->SetControlAcc( control );
-        }
-        */
-
         // go!
         try
         {
-            if( ! Run() )
-            {
-                LERROR( proclog, "An error occurred during processor running." );
-                //THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
-            }
-            else
-            {
-                LWARN( proclog, "Valid return" );
-                //fThreadRef->SetReturnValue( KTDataHandle() );
-            }
+            Run();
         }
         catch( QuitThread& e )
         {
             LDEBUG( proclog, "Thread quit from " << e.fFile << ", line " << e.fLine );
         }
-        catch( boost::exception& e )
+        catch( std::exception& e )
         {
+            LERROR( proclog, "An error occurred during processor running." );
+            fExceptionPtr = std::current_exception(); // capture the exception
             //fThreadRef->SetReturnException( boost::current_exception() );
+            return;
         }
+
+        LWARN( proclog, "Valid return" );
+
         return;
     }
 
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index 5850396..74287d8 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -25,7 +25,9 @@ namespace Nymph
             void operator()();// ControlAccessPtr control ); // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
 
             /// Starts the  main action of the processor
-            virtual bool Run() = 0;
+            virtual void Run() = 0;
+
+            MEMVAR_REF( std::exception_ptr, ExceptionPtr );
 
     };
 

From c2e7707c991830edbf8e18d1fe98dbf3029d8fbd Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 16:18:25 -0800
Subject: [PATCH 208/521] TestProcessor.cc now tests illegal configuration
 values

---
 Testing/TestProcessor.cc | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index be824ad..12e18c0 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -5,7 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "TestProc.hh"
+#include "TestProcessorClasses.hh"
 
 #include "logger.hh"
 
@@ -31,11 +31,28 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         int configValue = 5;
         config.add( "value", configValue );
 
-        // perform configuration
-        tester.Configure( config );
-
+        // perform configuration with no value for "string"
+        REQUIRE_NOTHROW( tester.Configure( config ) );
         // check that the value was set correctly
         REQUIRE( tester.GetValue() == configValue );
+
+        // peform configuration with an illegal value for "string"
+        config.add( "string", "illegal value" );
+        REQUIRE_THROWS_AS( tester.Configure( config ), ConfigException );
+        try
+        {
+            tester.Configure( config );
+        }
+        catch( const ConfigException& e )
+        {
+            PrintException(e);
+        }
+        
+        // perform configuration with a legal value for "string"
+        config["string"]().set( "ok value 1" );
+        REQUIRE_NOTHROW( tester.Configure( config ) );
+        REQUIRE( tester.StringValue() == "ok 1" );
+
     }
 
     SECTION( "Signals and Slots" )

From 90fda0d3aa05786d1ce9df1db4a428b46ca69037 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 16:19:14 -0800
Subject: [PATCH 209/521] TestPrimaryProcessor tests multiple run
 configurations

---
 Testing/TestPrimaryProcessor.cc | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
index 4c7d659..9dbd926 100644
--- a/Testing/TestPrimaryProcessor.cc
+++ b/Testing/TestPrimaryProcessor.cc
@@ -5,7 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "TestProc.hh"
+#include "TestProcessorClasses.hh"
 
 #include "logger.hh"
 
@@ -21,12 +21,33 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
     using namespace Nymph;
 
     TestPrimaryProc tester;
+    REQUIRE_FALSE( tester.ExceptionPtr() );
 
+    // SignalNewValue test
+    tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
     tester.ConnectASlot( "value", tester, "value" );
-
     tester();
-
     REQUIRE( tester.GetValue() == tester.GetNewValue() );
 
+    // WaitTwoSec test
+    // -- no test implemented here right now --
+    //tester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
+
+    // ThrowExcept test
+    tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
+    REQUIRE_NOTHROW( tester() ); // the exception should be caught by operator() and stored as the exception ptr
+    REQUIRE( tester.ExceptionPtr() ); // the exception ptr should now be set
+    try
+    {
+        std::rethrow_exception( tester.ExceptionPtr() );
+    }
+    catch( const scarab::base_exception& e )
+    {
+        PrintException( e );
+        REQUIRE( std::string(e.what()) == std::string("PrimaryProcessor test function: throw Exception") );
+    }
+    
+    
+
     //REQUIRE( tester.ValueSig().GetControl() == &control );
 }

From d5c1b694c678e7f09d4a1756966ab3f45b44ba2e Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 16:19:50 -0800
Subject: [PATCH 210/521] Initial DoRun test in TestProcessorToolbox.cc

---
 Testing/TestProcessorToolbox.cc | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index fb0a4e6..e559967 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -5,7 +5,7 @@
  *      Author: N.S. Oblath
  */
 
-#include "TestProc.hh"
+#include "TestProcessorClasses.hh"
 
 #include "ProcessorToolbox.hh"
 
@@ -196,4 +196,24 @@ TEST_CASE( "processor_toolbox" )
 
     }
 
+    SECTION( "DoRun" )
+    {
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: pp\n"
+            "connections:\n"
+            "- signal: \"pp:value\"\n"
+            "  slot: \"pp:value\"\n"
+            "run-queue:\n"
+            "- pp"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE( toolbox.Configure( config->as_node() ) );
+
+    }
+
 }

From 84ea06927caf45739df80b5e8245bfcd1831d41c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 17:11:50 -0800
Subject: [PATCH 211/521] Cancel run on exception caught by primary processor

---
 Library/Processor/PrimaryProcessor.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 7942131..0a47e4c 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -8,6 +8,7 @@
 #include "PrimaryProcessor.hh"
 
 #include "QuitThread.hh"
+#include "ControlAccess.hh"
 #include "Exception.hh"
 
 #include "logger.hh"
@@ -37,8 +38,9 @@ namespace Nymph
         }
         catch( std::exception& e )
         {
-            LERROR( proclog, "An error occurred during processor running." );
+            LERROR( proclog, "An error occurred during processor running: " << e.what() );
             fExceptionPtr = std::current_exception(); // capture the exception
+            SharedControl::get_instance()->Cancel();
             //fThreadRef->SetReturnException( boost::current_exception() );
             return;
         }

From bd2ae0b00271a82360b5e78704845c3922946c88 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 17:12:27 -0800
Subject: [PATCH 212/521] Convert ProcessorToolbox::Configure() to return void
 and report errors by exception

---
 Library/Processor/ProcessorToolbox.cc | 120 +++++++++++++-------------
 Library/Processor/ProcessorToolbox.hh |   2 +-
 2 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index a24fad4..df48a0d 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -54,16 +54,14 @@ namespace Nymph
         ClearProcessors();
     }
 
-    bool ProcessorToolbox::Configure( const scarab::param_node& node )
+    void ProcessorToolbox::Configure( const scarab::param_node& node )
     {
-        LPROG(proclog, "Configuring . . .");
-
-        SetRunSingleThreaded( node.get_value( "single-threaded", fRunSingleThreaded ) );
+        LPROG( proclog, "Configuring . . ." );
 
         // Deal with "processor" blocks
         if( ! node.has("processors") )
         {
-            LWARN(proclog, "No processors were specified");
+            LWARN( proclog, "No processors were specified" );
         }
         else
         {
@@ -73,19 +71,19 @@ namespace Nymph
                 if( ! procIt->is_node() )
                 {
                     LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
-                    return false;
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
                 }
                 const scarab::param_node& procNode = procIt->as_node();
 
-                if (! procNode.has("type"))
+                if( ! procNode.has("type") )
                 {
-                    LERROR(proclog, "Unable to create processor: no processor type given");
-                    return false;
+                    LERROR( proclog, "Unable to create processor: no processor type given" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
                 }
                 string procType = procNode["type"]().as_string();
 
                 string procName;
-                if (! procNode.has("name"))
+                if( ! procNode.has("name") )
                 {
                     LINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
                     procName = procType;
@@ -94,27 +92,26 @@ namespace Nymph
                 {
                     procName = procNode["name"]().as_string();
                 }
-                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName));
-                if (newProc == NULL)
+                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
+                if( newProc == nullptr )
                 {
-                    LERROR(proclog, "Unable to create processor of type <" << procType << ">");
-                    return false;
+                    LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
                 }
 
-                if (! AddProcessor(procName, newProc))
+                if( ! AddProcessor( procName, newProc ) )
                 {
-                    LERROR(proclog, "Unable to add processor <" << procName << ">");
-                    //delete newProc; //not required for smart pointers
-                    return false;
+                    LERROR( proclog, "Unable to add processor <" << procName << ">" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
                 }
             }
         }
 
 
         // Then deal with connections"
-        if (! node.has("connections"))
+        if( ! node.has("connections") )
         {
-            LWARN(proclog, "No connections were specified");
+            LWARN( proclog, "No connections were specified" );
         }
         else
         {
@@ -123,59 +120,62 @@ namespace Nymph
             {
                 if( ! connIt->is_node() )
                 {
-                    LERROR( proclog, "Invalid connection entry: not a node" );
-                    return false;
+                    LERROR( proclog, "Invalid connection entry: not a node" << *connIt );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
                 }
                 const scarab::param_node& connNode = connIt->as_node();
 
-                if ( ! connNode.has("signal") || ! connNode.has("slot") )
+                if( ! connNode.has("signal") || ! connNode.has("slot") )
                 {
-                    LERROR(proclog, "Signal/Slot connection information is incomplete!");
+                    LERROR( proclog, "Signal/Slot connection information is incomplete!" );
+                    std::string sigSlotMessage( "signal = " );
                     if (connNode.has("signal"))
                     {
-                        LWARN(proclog, "signal = " << connNode["signal"]());
+                        sigSlotMessage += connNode["signal"]().as_string();
                     }
                     else
                     {
-                        LERROR(proclog, "signal = MISSING");
+                        sigSlotMessage += "MISSING";
                     }
 
+                    sigSlotMessage += "\nslot = ";
                     if (connNode.has("slot"))
                     {
-                        LWARN(proclog, "slot = " << connNode["slot"]());
+                        sigSlotMessage += connNode["slot"]().as_string();
                     }
                     else
                     {
-                        LERROR(proclog, "slot = MISSING");
+                        sigSlotMessage += "MISSING";
                     }
-                    return false;
+                    LERROR( proclog, sigSlotMessage );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
                 }
 
                 bool connReturn = false;
-                if (connNode.has("order"))
+                if( connNode.has("order") )
                 {
-                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int());
+                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int() );
                 }
                 else
                 {
-                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string());
+                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string() );
                 }
-                if (! connReturn)
+                if( ! connReturn )
                 {
-                    LERROR(proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">");
-                    return false;
+                    LERROR( proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
                 }
 
-                if (connNode.has("breakpoint"))
+                if( connNode.has("breakpoint") )
                 {
-                    if (! SetBreakpoint(connNode["slot"]().as_string()))
+                    if (! SetBreakpoint( connNode["slot"]().as_string() ) )
                     {
-                        LERROR(proclog, "Unable to set breakpoint on <" << connNode["slot"]());
-                        return false;
+                        LERROR( proclog, "Unable to set breakpoint on <" << connNode["slot"]() );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
                     }
                 }
 
-                LINFO(proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">");
+                LINFO( proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">" );
             }
         }
 
@@ -184,53 +184,53 @@ namespace Nymph
         // The run queue is an array of processor names, or groups of names, which will be run sequentially.
         // If names are grouped (in another array), those in that group will be run in parallel.
         // In single threaded mode all threads will be run sequentially in the order they were specified.
-        if (! node.has("run-queue"))
+        if( ! node.has("run-queue") )
         {
-            LWARN(proclog, "Run queue was not specified");
+            LWARN( proclog, "Run queue was not specified" );
         }
         else
         {
             const scarab::param_array& rqArray = node["run-queue"].as_array();
-            for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
+            for( scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt )
             {
-                if (rqIt->is_value())
+                if( rqIt->is_value() )
                 {
-                    if (! PushBackToRunQueue((*rqIt)().as_string()))
+                    if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
                     {
-                        LERROR(proclog, "Unable to process run-queue entry: could not add processor to the queue");
-                        return false;
+                        LERROR( proclog, "Unable to process run-queue entry: could not add processor to the queue" );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
                     }
                 }
-                else if (rqIt->is_array())
+                else if( rqIt->is_array() )
                 {
                     const scarab::param_array* rqNode = &( rqIt->as_array() );
                     std::vector< std::string > names;
 
-                    for (scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt)
+                    for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
                     {
-                        if (! rqArrayIt->is_value())
+                        if( ! rqArrayIt->is_value() )
                         {
-                            LERROR(proclog, "Invalid run-queue array entry: not a value");
-                            return false;
+                            LERROR( proclog, "Invalid run-queue array entry: not a value" );
+                            THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
                         }
-                        names.push_back((*rqArrayIt)().as_string());
+                        names.push_back( (*rqArrayIt)().as_string() );
                     }
 
-                    if (! PushBackToRunQueue(names))
+                    if( ! PushBackToRunQueue(names) )
                     {
-                        LERROR(proclog, "Unable to process run-queue entry: could not add list of processors to the queue");
-                        return false;
+                        LERROR( proclog, "Unable to process run-queue entry: could not add list of processors to the queue" );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
                     }
                 }
                 else
                 {
-                    LERROR(proclog, "Invalid run-queue entry: not a value or array");
-                    return false;
+                    LERROR( proclog, "Invalid run-queue entry: not a value or array" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
                 }
             }
         }
 
-        return true;
+        return;
     }
 
     bool ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
@@ -568,7 +568,7 @@ namespace Nymph
 
     void ProcessorToolbox::AsyncRun()
     {
-        if( ! fDoRunThread.joinable() )
+        if( fDoRunThread.joinable() )
         {
             LERROR( proclog, "It appears that a run has already been started" );
             return;
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index c2029f3..81372b5 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -101,7 +101,7 @@ namespace Nymph
 
         public:
             /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
-            bool Configure( const scarab::param_node& node );
+            void Configure( const scarab::param_node& node );
 
             /// Configure processors (only those specified in the toolbox)
             bool ConfigureProcessors( const scarab::param_node& node );

From e1c0ddbe49dad64ba578b75bcc5c0e2befade6cd Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 12 Jan 2022 17:13:24 -0800
Subject: [PATCH 213/521] Use ProcessorToolbox::Configure where it fails by
 exception in proc toolbox test. Fill out DoRun section

---
 Testing/TestProcessorToolbox.cc | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index e559967..2a4780d 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -75,7 +75,7 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
 
         REQUIRE( toolbox.GetProcessor( procName1 ) );
         REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
@@ -123,7 +123,7 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
 
         std::shared_ptr< Processor > tp1 = toolbox.GetProcessor( procName1 );
 
@@ -168,7 +168,7 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
 
         ProcTBRevealer::ThreadSourceGroup group;
         REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
@@ -212,7 +212,17 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
+        REQUIRE( ppProc );
+        ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
+
+        // do the run
+        REQUIRE_NOTHROW( toolbox.Run() );
+
+        // check the results
+        REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
 
     }
 

From 650ee987ed483c900754d230d0ee8b0cd89b57d2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 00:49:19 -0800
Subject: [PATCH 214/521] Track active threads and use lack of activity to exit
 the run-thread function.  Threads are joined after completion.

---
 Library/CMakeLists.txt                |  2 +-
 Library/Processor/ControlAccess.cc    | 32 ++++++++++++++++++++++-----
 Library/Processor/ControlAccess.hh    |  4 ++++
 Library/Processor/PrimaryProcessor.cc | 13 +++++------
 Library/Processor/ProcessorToolbox.cc | 28 +++++++++++++++--------
 5 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 55986dc..ef67a92 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -28,7 +28,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
-    ${PROC_DIR}/QuitThread.hh
+    #${PROC_DIR}/QuitThread.hh
     ${PROC_DIR}/ReturnBuffer.hh
     ${PROC_DIR}/SignalSlotBase.hh
 )
diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
index f473cec..c34c98e 100644
--- a/Library/Processor/ControlAccess.cc
+++ b/Library/Processor/ControlAccess.cc
@@ -7,9 +7,12 @@
 
 #include "ControlAccess.hh"
 
+#include "logger.hh"
+
 //#include <boost/thread/locks.hpp>
 //#include <boost/thread/lock_types.hpp>
 
+LOGGER( contlog, "ControlAccess" );
 
 namespace Nymph
 {
@@ -19,7 +22,8 @@ namespace Nymph
             fCondVarBreak(),
             fBreakFlag( false ),
             fCanceledFlag( false ),
-            fCycleTimeMS( 500 )
+            fCycleTimeMS( 500 ),
+            fNActiveThreads( 0 )
     {}
 
     SharedControl::~SharedControl()
@@ -28,6 +32,7 @@ namespace Nymph
     void SharedControl::Cancel()
     {
         std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "CANCEL called" );
         fCanceledFlag = true;
         fCondVarBreak.notify_all();
         return;
@@ -50,31 +55,48 @@ namespace Nymph
         std::unique_lock< std::mutex > lock( fMutex );
         if( fBreakFlag )
         {
-            while( fBreakFlag && ! fCanceledFlag )
+            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
             {
                 fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
             }
         }
-        return ! fCanceledFlag; // returns true if the thread should continue; false if it should end
+        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
     }
 
     bool SharedControl::WaitForBreakOrCanceled() const
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! fCanceledFlag )
+        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
         {
             fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
-        return fCanceledFlag ? false : fBreakFlag;
+        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
     }
 
     void SharedControl::Resume()
     {
         std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "RESUME called" );
         fBreakFlag = false;
         fCondVarContinue.notify_all();
     }
 
+    void SharedControl::IncrementActiveThreads()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        ++fNActiveThreads;
+        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
+        return;
+    }
+
+    void SharedControl::DecrementActiveThreads()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fNActiveThreads > 0 ) --fNActiveThreads;
+        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
+        return;
+    }
+
 
 
 
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 3c4c4cc..5b745d7 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -54,6 +54,9 @@ namespace Nymph
 
             void Resume(); // to be called by the processor toolbox
 
+            void IncrementActiveThreads();
+            void DecrementActiveThreads();
+
             MEMVAR_REF_MUTABLE( std::mutex, Mutex );
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
@@ -61,6 +64,7 @@ namespace Nymph
             MEMVAR_NOSET( bool, CanceledFlag );
             MEMVAR( unsigned, CycleTimeMS );
             MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
+            MEMVAR( unsigned, NActiveThreads );
 
     };
 
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 0a47e4c..a332ed5 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -7,7 +7,6 @@
 
 #include "PrimaryProcessor.hh"
 
-#include "QuitThread.hh"
 #include "ControlAccess.hh"
 #include "Exception.hh"
 
@@ -25,26 +24,24 @@ namespace Nymph
     PrimaryProcessor::~PrimaryProcessor()
     {}
 
-    void PrimaryProcessor::operator()()// ControlAccessPtr control ) // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
+    void PrimaryProcessor::operator()()
     {
         // go!
         try
         {
             Run();
         }
-        catch( QuitThread& e )
-        {
-            LDEBUG( proclog, "Thread quit from " << e.fFile << ", line " << e.fLine );
-        }
         catch( std::exception& e )
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );
             fExceptionPtr = std::current_exception(); // capture the exception
-            SharedControl::get_instance()->Cancel();
-            //fThreadRef->SetReturnException( boost::current_exception() );
+            SharedControl* control = SharedControl::get_instance();
+            control->DecrementActiveThreads();
+            control->Cancel();
             return;
         }
 
+        SharedControl::get_instance()->DecrementActiveThreads();
         LWARN( proclog, "Valid return" );
 
         return;
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index df48a0d..a00b6da 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -589,6 +589,8 @@ namespace Nymph
 
                 for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                 {
+                    SharedControl* control = SharedControl::get_instance();
+
                     //boost::thread_group threads;
                     std::map< std::string, std::thread > threads;
 
@@ -600,10 +602,11 @@ namespace Nymph
                             LINFO( proclog, "Starting processor <" << procName << ">" );
 
                             threads.emplace( procName, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) );
+
+                            control->IncrementActiveThreads();
                         }// end for loop over the thread group
                     } // end scope for threadFuturesLock
 
-                    SharedControl* control = SharedControl::get_instance();
                     bool stillRunning = true;
                     while( stillRunning )
                     {
@@ -627,26 +630,33 @@ namespace Nymph
                             LDEBUG( proclog, "Detected cancelation while waiting during running" );
                         }
                     }
+
+                    for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
+                    {
+                        LDEBUG( proclog, "Joining thread for processor <" << threadIt->first << ">" );
+                        threadIt->second.join();
+                    }
+
                 } // end for loop over the run-queue
 
                 LPROG( proclog, "Processing is complete (multi-threaded)" );
             }
-            catch( std::exception& e )
+            catch( scarab::base_exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                LERROR( proclog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
+                LERROR( proclog, "Diagnostic Information:\n" );
+                PrintException( e );
                 SharedControl::get_instance()->Cancel();
-                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
-            catch( scarab::base_exception& e )
+            catch( std::exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
-                LERROR( proclog, "Diagnostic Information:\n" );
-                PrintException( e );
+                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
                 SharedControl::get_instance()->Cancel();
+                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
             return;

From dc2ae3d7ce15fac6878a02ce47e22c26e734412e Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 11:08:56 -0800
Subject: [PATCH 215/521] Introduce Reset() function in SharedControl so we can
 use it multiple times in the test application

---
 Library/Processor/ControlAccess.cc | 11 +++++++++++
 Library/Processor/ControlAccess.hh |  4 ++++
 Testing/TestPrimaryProcessor.cc    |  2 ++
 Testing/TestProcessor.cc           |  2 ++
 Testing/TestProcessorToolbox.cc    |  2 ++
 5 files changed, 21 insertions(+)

diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
index c34c98e..05342ac 100644
--- a/Library/Processor/ControlAccess.cc
+++ b/Library/Processor/ControlAccess.cc
@@ -29,6 +29,17 @@ namespace Nymph
     SharedControl::~SharedControl()
     {}
 
+    void SharedControl::Reset()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "Reseting ControlAccess" );
+        fBreakFlag = false;
+        fCanceledFlag = false;
+        fCycleTimeMS = 500;
+        fNActiveThreads = 0;
+        return;
+    }
+
     void SharedControl::Cancel()
     {
         std::unique_lock< std::mutex > lock( fMutex );
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
index 5b745d7..3833c85 100644
--- a/Library/Processor/ControlAccess.hh
+++ b/Library/Processor/ControlAccess.hh
@@ -66,6 +66,10 @@ namespace Nymph
             MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
             MEMVAR( unsigned, NActiveThreads );
 
+            // WARNING: This function resets the state of this class to a just-constructed state
+            //          It is intended for use with testing when a single application might use it multiple times
+            void Reset();
+
     };
 
     template< typename... Args >
diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
index 9dbd926..a33242f 100644
--- a/Testing/TestPrimaryProcessor.cc
+++ b/Testing/TestPrimaryProcessor.cc
@@ -20,6 +20,8 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
 {
     using namespace Nymph;
 
+    SharedControl::get_instance()->Reset();
+
     TestPrimaryProc tester;
     REQUIRE_FALSE( tester.ExceptionPtr() );
 
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index 12e18c0..9766015 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -20,6 +20,8 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
 {
     using namespace Nymph;
 
+    SharedControl::get_instance()->Reset();
+
     TestProc tester;
 
     SECTION( "Configuration" )
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 2a4780d..f3a8d2e 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -54,6 +54,8 @@ TEST_CASE( "processor_toolbox" )
 {
     using namespace Nymph;
 
+    SharedControl::get_instance()->Reset();
+
     ProcTBRevealer toolbox;
 
     SECTION( "AddRemoveProcessors" )

From e102698e6ebe7aab85eb1ca47e2c280d7df548c2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 11:09:30 -0800
Subject: [PATCH 216/521] Reintroduce and improve QuitThread

---
 Library/CMakeLists.txt          |  2 +-
 Library/Processor/QuitThread.hh | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index ef67a92..55986dc 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -28,7 +28,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
-    #${PROC_DIR}/QuitThread.hh
+    ${PROC_DIR}/QuitThread.hh
     ${PROC_DIR}/ReturnBuffer.hh
     ${PROC_DIR}/SignalSlotBase.hh
 )
diff --git a/Library/Processor/QuitThread.hh b/Library/Processor/QuitThread.hh
index a11983c..a59e491 100644
--- a/Library/Processor/QuitThread.hh
+++ b/Library/Processor/QuitThread.hh
@@ -12,19 +12,14 @@
 
 namespace Nymph
 {
-
-    struct QuitThread
+    class QuitThread : public scarab::typed_exception< QuitThread >
     {
-        std::string fFile;
-        std::string fLine;
-        QuitThread( const std::string& file, const std::string& line ) :
-                fFile( file ),
-                fLine( line )
-        {}
+        public:
+            using scarab::typed_exception< QuitThread >::typed_exception;
+            ~QuitThread() = default;
     };
 
-    #define QUIT_THREAD \
-        throw ::Nymph::QuitThread( TOSTRING(__FILE__), TOSTRING(__LINE__) );
+    #define QUIT_THREAD  THROW_EXCEPT_HERE( ::Nymph::QuitThread() )
 
 } /* namespace Nymph */
 

From cecf0b0ade88c92cadf7be12fc6e416e22730ce0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 11:22:25 -0800
Subject: [PATCH 217/521] Some clarification in how thread quitting is done in
 Signal

---
 Library/Processor/Signal.hh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 3014a1b..ca06bf7 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -179,23 +179,28 @@ namespace Nymph
     {
         SharedControl* control = SharedControl::get_instance();
 
-        // if we're canceled, then quit the thread
-        // if we're at a break, then wait to continue
-        //   once we continue, if we need to quit, then do so
+        // Check for whether we need to quit from external input:
+        // - if we're canceled, then quit the thread
+        // - if we're at a break, then wait to continue;
+        //     once we continue, if we need to quit, then do so
         if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
         {
-            QUIT_THREAD;
+            QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
         }
 
+        // Check for whether this signal emission has a breakpoint
         if( fDoBreakpoint )
         {
+            // do the break
             control->Break( args... );
+            // wait to continue; once we continue, if we need to quit, then do so
             if( ! control->WaitToContinue() )
             {
-                QUIT_THREAD;
+                QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
             }
         }
 
+        // Emit signal by calling all connected slots
         for( auto connection : fConnections )
         {
 //            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );

From 0cd1920fb655c2b389f4174fc0b370f8178f1365 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 11:22:41 -0800
Subject: [PATCH 218/521] Catch QuitThread separately in
 PrimaryProcessor::operator()

---
 Library/Processor/PrimaryProcessor.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index a332ed5..f27ad38 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -8,7 +8,7 @@
 #include "PrimaryProcessor.hh"
 
 #include "ControlAccess.hh"
-#include "Exception.hh"
+#include "QuitThread.hh"
 
 #include "logger.hh"
 
@@ -31,6 +31,14 @@ namespace Nymph
         {
             Run();
         }
+        catch( QuitThread& e )
+        {
+            LINFO( proclog, "Processor thread started by <" << fName << "> is quitting" );
+            fExceptionPtr = std::current_exception(); // capture the exception
+            control->DecrementActiveThreads();
+            // we don't initiate cancellation on QuitThread; this type of quitting has been initiated elsewhere and detected in this thread.
+            return;
+        }
         catch( std::exception& e )
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );

From 861fb5829d11872cf95aa03fd3579558f2793a06 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 12:38:20 -0800
Subject: [PATCH 219/521] Expand thread cleanup process to include checking for
 exceptions and quitting if necessary

---
 Library/Processor/ProcessorToolbox.cc | 65 ++++++++++++++++++++-------
 1 file changed, 49 insertions(+), 16 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index a00b6da..88d72ec 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -7,8 +7,8 @@
 
 #include "ProcessorToolbox.hh"
 
-#include "Exception.hh"
 #include "PrimaryProcessor.hh"
+#include "QuitThread.hh"
 
 #include "factory.hh"
 #include "logger.hh"
@@ -591,22 +591,21 @@ namespace Nymph
                 {
                     SharedControl* control = SharedControl::get_instance();
 
-                    //boost::thread_group threads;
-                    std::map< std::string, std::thread > threads;
+                    typedef std::pair< PrimaryProcessor*, std::thread > ThreadBundle;
+                    std::map< std::string, ThreadBundle > threads;
 
-                    { // scope for threadFuturesLock
-
-                        for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                        {
-                            std::string procName( tgIter->fName );
-                            LINFO( proclog, "Starting processor <" << procName << ">" );
+                    // iterate over primary processors in this group and launch threads
+                    for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                    {
+                        std::string procName( tgIter->fName );
+                        LINFO( proclog, "Starting processor <" << procName << ">" );
 
-                            threads.emplace( procName, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) );
+                        threads.emplace( procName, ThreadBundle( tgIter->fProc, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) ) );
 
-                            control->IncrementActiveThreads();
-                        }// end for loop over the thread group
-                    } // end scope for threadFuturesLock
+                        control->IncrementActiveThreads();
+                    }// end for loop over the thread group
 
+                    // wait here while things are still running
                     bool stillRunning = true;
                     while( stillRunning )
                     {
@@ -631,15 +630,49 @@ namespace Nymph
                         }
                     }
 
+                    // join threads and check for exceptions
+                    // break out of the run-queue iteration loop if there was an exception
+                    bool quitAfterThis = control->IsCanceled();
                     for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
                     {
-                        LDEBUG( proclog, "Joining thread for processor <" << threadIt->first << ">" );
-                        threadIt->second.join();
+                        LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
+                        LDEBUG( proclog, "Joining thread" );
+                        threadIt->second.second.join();
+                        if( threadIt->second.first->ExceptionPtr() )
+                        {
+                            try
+                            {
+                                std::rethrow_exception( threadIt->second.first->ExceptionPtr() );
+                            }
+                            catch( const QuitThread& e )
+                            {
+                                // not necessarily an error, so don't set quitAfterThis to true
+                                LINFO( proclog, "Thread exited with QuitThread" );
+                            }
+                            catch( const scarab::base_exception& e )
+                            {
+                                // this is an error, so set quitAfterThis to true
+                                LERROR( proclog, "Thread exited with an exception" );
+                                PrintException( e );
+                                quitAfterThis = true;
+                            }
+                        }
+                        else
+                        {
+                            // this thread did not have an exeption set, so it exited normally
+                            LINFO( proclog, "Thread exited normally" )
+                        }
+                    }
+
+                    if( quitAfterThis )
+                    {
+                        LWARN( proclog, "Exiting from run-queue loop under abnormal conditions" );
+                        break;
                     }
 
                 } // end for loop over the run-queue
 
-                LPROG( proclog, "Processing is complete (multi-threaded)" );
+                LPROG( proclog, "Processing is complete" );
             }
             catch( scarab::base_exception& e )
             {

From df6ffc8ebdfd95b0fae7a34b448cdda1dd892428 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 12:38:46 -0800
Subject: [PATCH 220/521] Some tweaks around QuitThread

---
 Library/Processor/PrimaryProcessor.cc | 6 +++---
 Library/Processor/QuitThread.hh       | 3 ++-
 Library/Processor/Signal.hh           | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index f27ad38..9e05508 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -31,15 +31,15 @@ namespace Nymph
         {
             Run();
         }
-        catch( QuitThread& e )
+        catch( const QuitThread& e )
         {
             LINFO( proclog, "Processor thread started by <" << fName << "> is quitting" );
             fExceptionPtr = std::current_exception(); // capture the exception
-            control->DecrementActiveThreads();
+            SharedControl::get_instance()->DecrementActiveThreads();
             // we don't initiate cancellation on QuitThread; this type of quitting has been initiated elsewhere and detected in this thread.
             return;
         }
-        catch( std::exception& e )
+        catch( const std::exception& e )
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );
             fExceptionPtr = std::current_exception(); // capture the exception
diff --git a/Library/Processor/QuitThread.hh b/Library/Processor/QuitThread.hh
index a59e491..10597ff 100644
--- a/Library/Processor/QuitThread.hh
+++ b/Library/Processor/QuitThread.hh
@@ -19,7 +19,8 @@ namespace Nymph
             ~QuitThread() = default;
     };
 
-    #define QUIT_THREAD  THROW_EXCEPT_HERE( ::Nymph::QuitThread() )
+    #define QUIT_THREAD  throw ::Nymph::QuitThread()(__FILE__, __LINE__)
+    //THROW_EXCEPT_HERE( ::Nymph::QuitThread() )
 
 } /* namespace Nymph */
 
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index ca06bf7..e278f81 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -13,7 +13,6 @@
 #include "SignalSlotBase.hh"
 
 #include "ControlAccess.hh"
-#include "Exception.hh"
 #include "QuitThread.hh"
 
 #include "logger.hh"

From 9b66f70bba20b6708103dc64cfd2b6df58bc4786 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 13 Jan 2022 17:26:36 -0800
Subject: [PATCH 221/521] Initial reorganization

---
 Library/Control/ControlAccess.cc              |  36 ++
 Library/Control/ControlAccess.hh              |  83 +++++
 Library/Control/Controller.cc                 |  22 ++
 Library/Control/Controller.hh                 |  27 ++
 .../{Processor => Control}/ReturnBuffer.cc    |   0
 .../{Processor => Control}/ReturnBuffer.hh    |   0
 Library/Control/SingleRunController.cc        | 318 ++++++++++++++++++
 Library/Control/SingleRunController.hh        | 190 +++++++++++
 Library/Processor/ControlAccess.cc            | 122 -------
 Library/Processor/ControlAccess.hh            | 146 --------
 Library/Processor/ProcessorToolbox.cc         | 205 +----------
 Library/Processor/ProcessorToolbox.hh         |  43 ---
 12 files changed, 678 insertions(+), 514 deletions(-)
 create mode 100644 Library/Control/ControlAccess.cc
 create mode 100644 Library/Control/ControlAccess.hh
 create mode 100644 Library/Control/Controller.cc
 create mode 100644 Library/Control/Controller.hh
 rename Library/{Processor => Control}/ReturnBuffer.cc (100%)
 rename Library/{Processor => Control}/ReturnBuffer.hh (100%)
 create mode 100644 Library/Control/SingleRunController.cc
 create mode 100644 Library/Control/SingleRunController.hh
 delete mode 100644 Library/Processor/ControlAccess.cc
 delete mode 100644 Library/Processor/ControlAccess.hh

diff --git a/Library/Control/ControlAccess.cc b/Library/Control/ControlAccess.cc
new file mode 100644
index 0000000..1e7c26b
--- /dev/null
+++ b/Library/Control/ControlAccess.cc
@@ -0,0 +1,36 @@
+/*
+ * ControlAccess.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "ControlAccess.hh"
+
+#include "logger.hh"
+
+//#include <boost/thread/locks.hpp>
+//#include <boost/thread/lock_types.hpp>
+
+LOGGER( contlog, "ControlAccess" );
+
+namespace Nymph
+{
+    SharedControl::SharedControl() :
+    {}
+
+    SharedControl::~SharedControl()
+    {}
+
+
+
+
+    ControlAccess::ControlAccess() :
+            fReturn( new ReturnBuffer< int >() )//,
+            //fControl()
+    {}
+
+    ControlAccess::~ControlAccess()
+    {}
+
+} /* namespace Nymph */
diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
new file mode 100644
index 0000000..39ff356
--- /dev/null
+++ b/Library/Control/ControlAccess.hh
@@ -0,0 +1,83 @@
+/*
+ * ControlAccess.hh
+ *
+ *  Created on: Sept 14, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_CONTROLACCESS_HH_
+#define NYMPH_CONTROLACCESS_HH_
+
+#include "Exception.hh"
+#include "MemberVariable.hh"
+#include "ReturnBuffer.hh"
+
+#include "cancelable.hh" // remove when ControlAccess is removed
+#include "singleton.hh"
+
+//#include <boost/thread/condition_variable.hpp>
+//#include <boost/thread/mutex.hpp>
+
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+
+namespace Nymph
+{
+
+    class SharedControl : public scarab::singleton< SharedControl >
+    {
+        protected:
+            allow_singleton_access( SharedControl );
+
+            SharedControl();
+            virtual ~SharedControl();
+
+        public:
+
+
+    };
+
+
+
+    class ControlAccess : public scarab::cancelable
+    {
+        public:
+            ControlAccess();
+
+            virtual ~ControlAccess();
+
+            template< typename... Args >
+            void SetReturn( Args&... arg );
+
+            template< typename... Args >
+            std::tuple< Args&... >& GetReturn();
+
+        protected:
+            std::shared_ptr< ReturnBufferBase > fReturn;
+
+        public:
+            //MEM_VAR_SHARED_PTR( SharedControl, Control );
+    };
+
+    typedef std::shared_ptr< ControlAccess > ControlAccessPtr;
+
+
+    template< typename... Args >
+    void ControlAccess::SetReturn( Args&... args )
+    {
+        fReturn = std::make_shared< ReturnBuffer< Args... > >( args... );
+        return;
+    }
+
+    template< typename... Args >
+    std::tuple< Args&... >& ControlAccess::GetReturn()
+    {
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturn) );
+        if( buffer == nullptr ) throw std::exception();
+        return buffer->GetReturn();
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_CONTROLACCESS_HH_ */
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
new file mode 100644
index 0000000..ee92b3b
--- /dev/null
+++ b/Library/Control/Controller.cc
@@ -0,0 +1,22 @@
+/*
+ * Controller.cc
+ *
+ *  Created on: Jan 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "Controller.hh"
+
+#include "logger.hh"
+
+namespace Nymph
+{
+    LOGGER( contlog, "Controller" );
+
+    Controller::Controller()
+    {}
+
+    Controller::~Controller()
+    {}
+
+} /* namespace Nymph */
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
new file mode 100644
index 0000000..2a2832a
--- /dev/null
+++ b/Library/Control/Controller.hh
@@ -0,0 +1,27 @@
+/*
+ * Controller.hh
+ *
+ *  Created on: Jan 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_CONTROLLER_HH_
+#define NYMPH_CONTROLLER_HH_
+
+#include "MemberVariable.hh"
+
+namespace Nymph
+{
+
+    class Controller
+    {
+        public:
+            Controller();
+            virtual ~Controller();
+
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_CONTROLLER_HH_ */
diff --git a/Library/Processor/ReturnBuffer.cc b/Library/Control/ReturnBuffer.cc
similarity index 100%
rename from Library/Processor/ReturnBuffer.cc
rename to Library/Control/ReturnBuffer.cc
diff --git a/Library/Processor/ReturnBuffer.hh b/Library/Control/ReturnBuffer.hh
similarity index 100%
rename from Library/Processor/ReturnBuffer.hh
rename to Library/Control/ReturnBuffer.hh
diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
new file mode 100644
index 0000000..d1b332c
--- /dev/null
+++ b/Library/Control/SingleRunController.cc
@@ -0,0 +1,318 @@
+/*
+ * SingleRunController.cc
+ *
+ *  Created on: Jan 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "SingleRunController.hh"
+
+#include "logger.hh"
+
+#include <map>
+#include <thread>
+
+
+namespace Nymph
+{
+    LOGGER( contlog, "SingleRunController");
+
+    SingleRunController::SingleRunController( const std::string& name ) :
+            fDoRunThread(),
+            fMutex(),
+            fCondVarContinue(),
+            fCondVarBreak(),
+            fBreakFlag( false ),
+            fCanceledFlag( false ),
+            fCycleTimeMS( 500 ),
+            fNActiveThreads( 0 )
+    {
+    }
+
+    SingleRunController::~SingleRunController()
+    {
+    }
+
+    void ProcessorToolbox::Configure( const scarab::param_node& node )
+    {
+        LPROG( proclog, "Configuring run control" );
+
+
+    }
+
+
+
+    void ProcessorToolbox::AsyncRun()
+    {
+        if( fDoRunThread.joinable() )
+        {
+            LERROR( proclog, "It appears that a run has already been started" );
+            return;
+        }
+
+        StartMultiThreadedRun();
+
+        return;
+    }
+
+    void ProcessorToolbox::StartMultiThreadedRun()
+    {
+        auto multiThreadRun = [&]()
+        {
+            try
+            {
+                LPROG( proclog, "Starting multi-threaded processing" );
+
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    SharedControl* control = SharedControl::get_instance();
+
+                    typedef std::pair< PrimaryProcessor*, std::thread > ThreadBundle;
+                    std::map< std::string, ThreadBundle > threads;
+
+                    // iterate over primary processors in this group and launch threads
+                    for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                    {
+                        std::string procName( tgIter->fName );
+                        LINFO( proclog, "Starting processor <" << procName << ">" );
+
+                        threads.emplace( procName, ThreadBundle( tgIter->fProc, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) ) );
+
+                        control->IncrementActiveThreads();
+                    }// end for loop over the thread group
+
+                    // wait here while things are still running
+                    bool stillRunning = true;
+                    while( stillRunning )
+                    {
+                        bool breakOrCanceled = control->WaitForBreakOrCanceled();
+                        if( breakOrCanceled )
+                        {
+                            // then at a breakpoint
+                            stillRunning = true;
+                            LDEBUG( proclog, "At a breakpoint" );
+                            // TODO: do we need to do anything while at a breakpoint?
+                            if( ! control->WaitToContinue() )
+                            {
+                                stillRunning = false;
+                                LDEBUG( proclog, "Detected cancelation while waiting at breakpoint" );
+                            }
+                        }
+                        else
+                        {
+                            // then canceled
+                            stillRunning = false;
+                            LDEBUG( proclog, "Detected cancelation while waiting during running" );
+                        }
+                    }
+
+                    // join threads and check for exceptions
+                    // break out of the run-queue iteration loop if there was an exception
+                    bool quitAfterThis = control->IsCanceled();
+                    for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
+                    {
+                        LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
+                        LDEBUG( proclog, "Joining thread" );
+                        threadIt->second.second.join();
+                        if( threadIt->second.first->ExceptionPtr() )
+                        {
+                            try
+                            {
+                                std::rethrow_exception( threadIt->second.first->ExceptionPtr() );
+                            }
+                            catch( const QuitThread& e )
+                            {
+                                // not necessarily an error, so don't set quitAfterThis to true
+                                LINFO( proclog, "Thread exited with QuitThread" );
+                            }
+                            catch( const scarab::base_exception& e )
+                            {
+                                // this is an error, so set quitAfterThis to true
+                                LERROR( proclog, "Thread exited with an exception" );
+                                PrintException( e );
+                                quitAfterThis = true;
+                            }
+                        }
+                        else
+                        {
+                            // this thread did not have an exeption set, so it exited normally
+                            LINFO( proclog, "Thread exited normally" )
+                        }
+                    }
+
+                    if( quitAfterThis )
+                    {
+                        LWARN( proclog, "Exiting from run-queue loop under abnormal conditions" );
+                        break;
+                    }
+
+                } // end for loop over the run-queue
+
+                LPROG( proclog, "Processing is complete" );
+            }
+            catch( scarab::base_exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
+                LERROR( proclog, "Diagnostic Information:\n" );
+                PrintException( e );
+                SharedControl::get_instance()->Cancel();
+                return;
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                SharedControl::get_instance()->Cancel();
+                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                //fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            return;
+        }; // end multi-threaded run lambda
+
+        fDoRunThread = std::thread( multiThreadRun );
+        return;
+    }
+
+
+    bool ProcessorToolbox::WaitForBreakOrCanceled()
+    {
+        return SharedControl::get_instance()->WaitForBreakOrCanceled();
+    }
+
+    bool ProcessorToolbox::WaitToContinue()
+    {
+        return SharedControl::get_instance()->WaitToContinue();
+    }
+
+    void ProcessorToolbox::WaitForEndOfRun()
+    {
+        LDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreakOrCanceled() )
+        {
+            LDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            WaitToContinue();
+            LDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+        }
+        LDEBUG( proclog, "End-of-run reached" );
+
+        return;
+    }
+
+    void ProcessorToolbox::Continue()
+    {
+        SharedControl::get_instance()->Resume();
+        return;
+    }
+
+   void ProcessorToolbox::JoinRunThread()
+   {
+       fDoRunThread.join();
+       return;
+   }
+
+    void ProcessorToolbox::CancelThreads()
+    {
+        SharedControl::get_instance()->Cancel();
+        return;
+    }
+
+    bool ProcessorToolbox::Run()
+    {
+        // can throw scarab::base_exception
+
+        AsyncRun();
+
+        WaitForEndOfRun();
+
+        JoinRunThread();
+
+        return true;
+    }
+
+
+
+
+        void SharedControl::Reset()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "Reseting ControlAccess" );
+        fBreakFlag = false;
+        fCanceledFlag = false;
+        fCycleTimeMS = 500;
+        fNActiveThreads = 0;
+        return;
+    }
+
+    void SharedControl::Cancel()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "CANCEL called" );
+        fCanceledFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
+
+    bool SharedControl::IsAtBreak() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fBreakFlag;
+    }
+
+    bool SharedControl::IsCanceled() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fCanceledFlag;
+    }
+
+    bool SharedControl::WaitToContinue() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fBreakFlag )
+        {
+            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+            {
+                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            }
+        }
+        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
+    }
+
+    bool SharedControl::WaitForBreakOrCanceled() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+        {
+            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+        }
+        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
+    }
+
+    void SharedControl::Resume()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "RESUME called" );
+        fBreakFlag = false;
+        fCondVarContinue.notify_all();
+    }
+
+    void SharedControl::IncrementActiveThreads()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        ++fNActiveThreads;
+        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
+        return;
+    }
+
+    void SharedControl::DecrementActiveThreads()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fNActiveThreads > 0 ) --fNActiveThreads;
+        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
+        return;
+    }
+
+
+
+} /* namespace Nymph */
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
new file mode 100644
index 0000000..6dc21d3
--- /dev/null
+++ b/Library/Control/SingleRunController.hh
@@ -0,0 +1,190 @@
+/**
+ @file SingleRunController.hh
+ @brief Contains SingleRunController
+ @details 
+ @author: N. S. Oblath
+ @date: Sep 27, 2012
+ */
+
+#ifndef NYMPH_SINGLERUNCONTROLLER_HH_
+#define NYMPH_SINGLERUNCONTROLLER_HH_
+
+#include "Controller.hh"
+
+#include "ControlAccess.hh"
+#include "ProcessorToolbox.hh"
+
+#include <deque>
+#include <initializer_list>
+#include <limits>
+#include <set>
+#include <memory>
+#include <thread>
+
+
+namespace Nymph
+{
+    class PrimaryProcessor;
+    class Processor;
+
+    /*!
+     @class ProcessorToolbox
+     @author N. S. Oblath
+
+     @brief Manages processors requested by the user at run time.
+
+     @details
+     ProcessorToolbox allows the user to setup an application at runtime.
+
+     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
+     the program via a configuration file.
+
+     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
+
+     The following order should be used for configuring the processor toolbox:
+     <ol>
+         <li>Create processors</li>
+         <li>Connect signals and slots</li>
+         <li>Create the run queue</li>
+     </ol>
+
+     Available (nested) configuration values:
+     <ul>
+         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
+         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
+             <ul>
+                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
+                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
+             </ul>
+         </li>
+         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
+             <ul>
+                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
+                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
+                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
+             </ul>
+         </li>
+         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
+         The elements of this array specify processors that are run sequentially.
+         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
+             <ul>
+                 <li>processor name -- add a processor to the run queue, or </li>
+                 <li>array of processor names -- add a group of processors to the run queue.</li>
+             </ul>
+             In single-threaded mode, all processors will be run sequentially, in the order specified.
+         </li>
+     </ul>
+    */
+    class SingleRunController : public Controller
+    {
+        public:
+            ProcessorToolbox( const std::string& name = "processor-toolbox" );
+            virtual ~ProcessorToolbox();
+
+        public:
+            /// Configure the controller
+            void Configure( const scarab::param_node& node );
+
+        public:
+            /// Process the run queue.
+            /// This will call Run() on all of the primary processors in the queue.
+            bool Run();
+
+            void AsyncRun();
+
+            bool WaitToContinue();
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// Throws a boost::exception if there's an error with the future object in use
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            bool WaitForBreakOrCanceled();
+
+            void WaitForEndOfRun();
+
+            void Continue();
+
+            void CancelThreads();
+
+            void JoinRunThread();
+
+            // TODO: return value access
+
+        protected:
+            void StartMultiThreadedRun();
+
+            std::thread fDoRunThread;
+
+
+        public:
+            template< typename... Args >
+            std::tuple< Args&... >& GetReturn();
+
+            template< typename... Args >
+            void Break( Args&... args ); // to be called by a working thread
+
+            void Cancel(); // to be called by a working thread
+
+            bool IsAtBreak() const; // to be called by a working thread
+
+            bool IsCanceled() const; // to be called by a working thread
+
+            // return: true = continue; false = cancel
+            bool WaitToContinue() const; // to be called by a working thread
+
+            // return: true = was a break; false = cancel
+            bool WaitForBreakOrCanceled() const; // to be called by the processor toolbox
+
+            void Resume(); // to be called by the processor toolbox
+
+            void IncrementActiveThreads();
+            void DecrementActiveThreads();
+
+            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
+            MEMVAR_NOSET( bool, BreakFlag );
+            MEMVAR_NOSET( bool, CanceledFlag );
+            MEMVAR( unsigned, CycleTimeMS );
+            MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
+            MEMVAR( unsigned, NActiveThreads );
+
+            // WARNING: This function resets the state of this class to a just-constructed state
+            //          It is intended for use with testing when a single application might use it multiple times
+            void Reset();
+
+    };
+
+    template< typename... Args >
+    void SharedControl::Break( Args&... args )
+    {
+        while( IsAtBreak() && ! IsCanceled() )
+        {
+            if( ! WaitToContinue() )
+            {
+                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
+            }
+        }
+
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
+
+
+
+    template< typename... Args >
+    std::tuple< Args&... >& SharedControl::GetReturn()
+    {
+        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
+        std::unique_lock< std::mutex > lock( fMutex );
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
+        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
+        return buffer->GetReturn();
+    }
+
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SINGLERUNCONTROLLER_HH_ */
diff --git a/Library/Processor/ControlAccess.cc b/Library/Processor/ControlAccess.cc
deleted file mode 100644
index 05342ac..0000000
--- a/Library/Processor/ControlAccess.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * ControlAccess.cc
- *
- *  Created on: Sept 15, 2019
- *      Author: N.S. Oblath
- */
-
-#include "ControlAccess.hh"
-
-#include "logger.hh"
-
-//#include <boost/thread/locks.hpp>
-//#include <boost/thread/lock_types.hpp>
-
-LOGGER( contlog, "ControlAccess" );
-
-namespace Nymph
-{
-    SharedControl::SharedControl() :
-            fMutex(),
-            fCondVarContinue(),
-            fCondVarBreak(),
-            fBreakFlag( false ),
-            fCanceledFlag( false ),
-            fCycleTimeMS( 500 ),
-            fNActiveThreads( 0 )
-    {}
-
-    SharedControl::~SharedControl()
-    {}
-
-    void SharedControl::Reset()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "Reseting ControlAccess" );
-        fBreakFlag = false;
-        fCanceledFlag = false;
-        fCycleTimeMS = 500;
-        fNActiveThreads = 0;
-        return;
-    }
-
-    void SharedControl::Cancel()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "CANCEL called" );
-        fCanceledFlag = true;
-        fCondVarBreak.notify_all();
-        return;
-    }
-
-    bool SharedControl::IsAtBreak() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        return fBreakFlag;
-    }
-
-    bool SharedControl::IsCanceled() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        return fCanceledFlag;
-    }
-
-    bool SharedControl::WaitToContinue() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fBreakFlag )
-        {
-            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
-            {
-                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-            }
-        }
-        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
-    }
-
-    bool SharedControl::WaitForBreakOrCanceled() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
-        {
-            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-        }
-        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
-    }
-
-    void SharedControl::Resume()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "RESUME called" );
-        fBreakFlag = false;
-        fCondVarContinue.notify_all();
-    }
-
-    void SharedControl::IncrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        ++fNActiveThreads;
-        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
-        return;
-    }
-
-    void SharedControl::DecrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fNActiveThreads > 0 ) --fNActiveThreads;
-        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
-        return;
-    }
-
-
-
-
-    ControlAccess::ControlAccess() :
-            fReturn( new ReturnBuffer< int >() )//,
-            //fControl()
-    {}
-
-    ControlAccess::~ControlAccess()
-    {}
-
-} /* namespace Nymph */
diff --git a/Library/Processor/ControlAccess.hh b/Library/Processor/ControlAccess.hh
deleted file mode 100644
index 3833c85..0000000
--- a/Library/Processor/ControlAccess.hh
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * ControlAccess.hh
- *
- *  Created on: Sept 14, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_CONTROLACCESS_HH_
-#define NYMPH_CONTROLACCESS_HH_
-
-#include "Exception.hh"
-#include "MemberVariable.hh"
-#include "ReturnBuffer.hh"
-
-#include "cancelable.hh" // remove when ControlAccess is removed
-#include "singleton.hh"
-
-//#include <boost/thread/condition_variable.hpp>
-//#include <boost/thread/mutex.hpp>
-
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-
-namespace Nymph
-{
-
-    class SharedControl : public scarab::singleton< SharedControl >
-    {
-        protected:
-            allow_singleton_access( SharedControl );
-
-            SharedControl();
-            virtual ~SharedControl();
-
-        public:
-            template< typename... Args >
-            std::tuple< Args&... >& GetReturn();
-
-            template< typename... Args >
-            void Break( Args&... args ); // to be called by a working thread
-
-            void Cancel(); // to be called by a working thread
-
-            bool IsAtBreak() const; // to be called by a working thread
-
-            bool IsCanceled() const; // to be called by a working thread
-
-            // return: true = continue; false = cancel
-            bool WaitToContinue() const; // to be called by a working thread
-
-            // return: true = was a break; false = cancel
-            bool WaitForBreakOrCanceled() const; // to be called by the processor toolbox
-
-            void Resume(); // to be called by the processor toolbox
-
-            void IncrementActiveThreads();
-            void DecrementActiveThreads();
-
-            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
-            MEMVAR_NOSET( bool, BreakFlag );
-            MEMVAR_NOSET( bool, CanceledFlag );
-            MEMVAR( unsigned, CycleTimeMS );
-            MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
-            MEMVAR( unsigned, NActiveThreads );
-
-            // WARNING: This function resets the state of this class to a just-constructed state
-            //          It is intended for use with testing when a single application might use it multiple times
-            void Reset();
-
-    };
-
-    template< typename... Args >
-    void SharedControl::Break( Args&... args )
-    {
-        while( IsAtBreak() && ! IsCanceled() )
-        {
-            if( ! WaitToContinue() )
-            {
-                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
-            }
-        }
-
-        std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag = true;
-        fCondVarBreak.notify_all();
-        return;
-    }
-
-
-
-    template< typename... Args >
-    std::tuple< Args&... >& SharedControl::GetReturn()
-    {
-        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
-        std::unique_lock< std::mutex > lock( fMutex );
-        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
-        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
-        return buffer->GetReturn();
-    }
-
-
-
-    class ControlAccess : public scarab::cancelable
-    {
-        public:
-            ControlAccess();
-
-            virtual ~ControlAccess();
-
-            template< typename... Args >
-            void SetReturn( Args&... arg );
-
-            template< typename... Args >
-            std::tuple< Args&... >& GetReturn();
-
-        protected:
-            std::shared_ptr< ReturnBufferBase > fReturn;
-
-        public:
-            //MEM_VAR_SHARED_PTR( SharedControl, Control );
-    };
-
-    typedef std::shared_ptr< ControlAccess > ControlAccessPtr;
-
-
-    template< typename... Args >
-    void ControlAccess::SetReturn( Args&... args )
-    {
-        fReturn = std::make_shared< ReturnBuffer< Args... > >( args... );
-        return;
-    }
-
-    template< typename... Args >
-    std::tuple< Args&... >& ControlAccess::GetReturn()
-    {
-        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturn) );
-        if( buffer == nullptr ) throw std::exception();
-        return buffer->GetReturn();
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_CONTROLACCESS_HH_ */
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 88d72ec..f126d9d 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -33,30 +33,18 @@ namespace Nymph
             fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
             fRunSingleThreaded( false ),
             fRunQueue(),
-            fProcMap(),
-            //fControl( new SharedControl() ),
-            //fThreadReferences(),
-            //fContinueCV(),
-            //fDoContinue( false ),
-            //fBreakContMutex(),
-            fDoRunThread()//,
-            //fDoRunPromise(),
-            //fDoRunBreakFlag( false )
+            fProcMap()
     {
     }
 
     ProcessorToolbox::~ProcessorToolbox()
     {
-        //CancelThreads();
-
-        //JoinRunThread();
-
         ClearProcessors();
     }
 
     void ProcessorToolbox::Configure( const scarab::param_node& node )
     {
-        LPROG( proclog, "Configuring . . ." );
+        LPROG( proclog, "Configuring processor toolbox" );
 
         // Deal with "processor" blocks
         if( ! node.has("processors") )
@@ -566,193 +554,4 @@ namespace Nymph
         return true;
     }
 
-    void ProcessorToolbox::AsyncRun()
-    {
-        if( fDoRunThread.joinable() )
-        {
-            LERROR( proclog, "It appears that a run has already been started" );
-            return;
-        }
-
-        StartMultiThreadedRun();
-
-        return;
-    }
-
-    void ProcessorToolbox::StartMultiThreadedRun()
-    {
-        auto multiThreadRun = [&]()
-        {
-            try
-            {
-                LPROG( proclog, "Starting multi-threaded processing" );
-
-                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-                {
-                    SharedControl* control = SharedControl::get_instance();
-
-                    typedef std::pair< PrimaryProcessor*, std::thread > ThreadBundle;
-                    std::map< std::string, ThreadBundle > threads;
-
-                    // iterate over primary processors in this group and launch threads
-                    for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                    {
-                        std::string procName( tgIter->fName );
-                        LINFO( proclog, "Starting processor <" << procName << ">" );
-
-                        threads.emplace( procName, ThreadBundle( tgIter->fProc, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) ) );
-
-                        control->IncrementActiveThreads();
-                    }// end for loop over the thread group
-
-                    // wait here while things are still running
-                    bool stillRunning = true;
-                    while( stillRunning )
-                    {
-                        bool breakOrCanceled = control->WaitForBreakOrCanceled();
-                        if( breakOrCanceled )
-                        {
-                            // then at a breakpoint
-                            stillRunning = true;
-                            LDEBUG( proclog, "At a breakpoint" );
-                            // TODO: do we need to do anything while at a breakpoint?
-                            if( ! control->WaitToContinue() )
-                            {
-                                stillRunning = false;
-                                LDEBUG( proclog, "Detected cancelation while waiting at breakpoint" );
-                            }
-                        }
-                        else
-                        {
-                            // then canceled
-                            stillRunning = false;
-                            LDEBUG( proclog, "Detected cancelation while waiting during running" );
-                        }
-                    }
-
-                    // join threads and check for exceptions
-                    // break out of the run-queue iteration loop if there was an exception
-                    bool quitAfterThis = control->IsCanceled();
-                    for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
-                    {
-                        LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
-                        LDEBUG( proclog, "Joining thread" );
-                        threadIt->second.second.join();
-                        if( threadIt->second.first->ExceptionPtr() )
-                        {
-                            try
-                            {
-                                std::rethrow_exception( threadIt->second.first->ExceptionPtr() );
-                            }
-                            catch( const QuitThread& e )
-                            {
-                                // not necessarily an error, so don't set quitAfterThis to true
-                                LINFO( proclog, "Thread exited with QuitThread" );
-                            }
-                            catch( const scarab::base_exception& e )
-                            {
-                                // this is an error, so set quitAfterThis to true
-                                LERROR( proclog, "Thread exited with an exception" );
-                                PrintException( e );
-                                quitAfterThis = true;
-                            }
-                        }
-                        else
-                        {
-                            // this thread did not have an exeption set, so it exited normally
-                            LINFO( proclog, "Thread exited normally" )
-                        }
-                    }
-
-                    if( quitAfterThis )
-                    {
-                        LWARN( proclog, "Exiting from run-queue loop under abnormal conditions" );
-                        break;
-                    }
-
-                } // end for loop over the run-queue
-
-                LPROG( proclog, "Processing is complete" );
-            }
-            catch( scarab::base_exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
-                LERROR( proclog, "Diagnostic Information:\n" );
-                PrintException( e );
-                SharedControl::get_instance()->Cancel();
-                return;
-            }
-            catch( std::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                SharedControl::get_instance()->Cancel();
-                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                //fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            return;
-        }; // end multi-threaded run lambda
-
-        fDoRunThread = std::thread( multiThreadRun );
-        return;
-    }
-
-
-    bool ProcessorToolbox::WaitForBreakOrCanceled()
-    {
-        return SharedControl::get_instance()->WaitForBreakOrCanceled();
-    }
-
-    bool ProcessorToolbox::WaitToContinue()
-    {
-        return SharedControl::get_instance()->WaitToContinue();
-    }
-
-    void ProcessorToolbox::WaitForEndOfRun()
-    {
-        LDEBUG( proclog, "Waiting for end-of-run" );
-        while( WaitForBreakOrCanceled() )
-        {
-            LDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            WaitToContinue();
-            LDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
-        }
-        LDEBUG( proclog, "End-of-run reached" );
-
-        return;
-    }
-
-    void ProcessorToolbox::Continue()
-    {
-        SharedControl::get_instance()->Resume();
-        return;
-    }
-
-   void ProcessorToolbox::JoinRunThread()
-   {
-       fDoRunThread.join();
-       return;
-   }
-
-    void ProcessorToolbox::CancelThreads()
-    {
-        SharedControl::get_instance()->Cancel();
-        return;
-    }
-
-    bool ProcessorToolbox::Run()
-    {
-        // can throw scarab::base_exception
-
-        AsyncRun();
-
-        WaitForEndOfRun();
-
-        JoinRunThread();
-
-        return true;
-    }
-
 } /* namespace Nymph */
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 81372b5..01fc3c5 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -11,26 +11,15 @@
 
 #include "ControlAccess.hh"
 #include "MemberVariable.hh"
-//#include "KTThreadReference.hh"
 
 #include "factory.hh"
 #include "param.hh"
 
-//#define BOOST_THREAD_PROVIDES_FUTURE
-//#include <boost/thread/future.hpp>
-//#include <boost/thread/mutex.hpp>
-//#include <boost/thread/thread.hpp>
-
-//#include <boost/iterator/iterator_adaptor.hpp>
-//#include <boost/type_traits/is_convertible.hpp>
-//#include <boost/utility/enable_if.hpp>
-
 #include <deque>
 #include <initializer_list>
 #include <limits>
 #include <set>
 #include <memory>
-#include <thread>
 
 
 namespace Nymph
@@ -212,38 +201,6 @@ namespace Nymph
             RunQueue fRunQueue;
 
             bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group );
-
-
-        public:
-            /// Process the run queue.
-            /// This will call Run() on all of the processors in the queue.
-            bool Run();
-
-            void AsyncRun();
-
-            bool WaitToContinue();
-
-            /// Returns when processing is completed or a breakpoint is reached
-            /// Throws a boost::exception if there's an error with the future object in use
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            bool WaitForBreakOrCanceled();
-
-            void WaitForEndOfRun();
-
-            void Continue();
-
-            void CancelThreads();
-
-            void JoinRunThread();
-
-            // TODO: return value access
-
-        protected:
-            void StartMultiThreadedRun();
-
-            std::thread fDoRunThread;
-
     };
 
     inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 

From 4ed5736391d803aaf31118ed19c1a946d95122a7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 20 Jan 2022 01:14:36 -0800
Subject: [PATCH 222/521] Initial removal of Controller responsibilities from
 the ProcessorToolbox and disabling of SharedControl.  TODO: re-enable
 SharedControl (or equivalent) use in PrimaryProcessor.cc and Signal.hh

---
 Library/CMakeLists.txt                | 17 +++++--
 Library/Processor/PrimaryProcessor.cc | 12 ++---
 Library/Processor/Signal.hh           | 20 ++++----
 Testing/CMakeLists.txt                |  3 +-
 Testing/TestPrimaryProcessor.cc       |  2 +-
 Testing/TestProcessor.cc              |  2 +-
 Testing/TestProcessorToolbox.cc       | 37 +-------------
 Testing/TestSingleRunController.cc    | 72 +++++++++++++++++++++++++++
 8 files changed, 106 insertions(+), 59 deletions(-)
 create mode 100644 Testing/TestSingleRunController.cc

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 55986dc..3a9ec83 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -6,6 +6,7 @@
 set( UTIL_DIR Utility )
 set( DATA_DIR Data )
 set( PROC_DIR Processor )
+set( CONT_DIR Control )
 set( IO_DIR IO )
 set( APPL_DIR Application )
 
@@ -13,6 +14,7 @@ include_directories( BEFORE
     ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${CONT_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
 )
@@ -24,13 +26,16 @@ set( NYMPH_HEADERFILES
     ${DATA_DIR}/Data.hh
     ${DATA_DIR}/DataFrame.hh
     
-    ${PROC_DIR}/ControlAccess.hh
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
     ${PROC_DIR}/QuitThread.hh
-    ${PROC_DIR}/ReturnBuffer.hh
     ${PROC_DIR}/SignalSlotBase.hh
+
+    ${CONT_DIR}/ControlAccess.hh
+    ${CONT_DIR}/Controller.hh
+    ${CONT_DIR}/ReturnBuffer.hh
+    ${CONT_DIR}/SingleRunController.hh
 )
 
 set( NYMPH_SOURCEFILES
@@ -39,12 +44,16 @@ set( NYMPH_SOURCEFILES
     ${DATA_DIR}/Data.cc
     ${DATA_DIR}/DataFrame.cc
     
-    ${PROC_DIR}/ControlAccess.cc
     ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
     ${PROC_DIR}/ProcessorToolbox.cc
-    ${PROC_DIR}/ReturnBuffer.cc
     ${PROC_DIR}/SignalSlotBase.cc
+
+
+#    ${CONT_DIR}/ControlAccess.cc
+#    ${CONT_DIR}/Controller.cc
+#    ${CONT_DIR}/ReturnBuffer.cc
+#    ${CONT_DIR}/SingleRunController.cc
 )
 
 
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 9e05508..c4f38cf 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -7,7 +7,7 @@
 
 #include "PrimaryProcessor.hh"
 
-#include "ControlAccess.hh"
+//#include "ControlAccess.hh"
 #include "QuitThread.hh"
 
 #include "logger.hh"
@@ -35,7 +35,7 @@ namespace Nymph
         {
             LINFO( proclog, "Processor thread started by <" << fName << "> is quitting" );
             fExceptionPtr = std::current_exception(); // capture the exception
-            SharedControl::get_instance()->DecrementActiveThreads();
+            /////SharedControl::get_instance()->DecrementActiveThreads();
             // we don't initiate cancellation on QuitThread; this type of quitting has been initiated elsewhere and detected in this thread.
             return;
         }
@@ -43,13 +43,13 @@ namespace Nymph
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );
             fExceptionPtr = std::current_exception(); // capture the exception
-            SharedControl* control = SharedControl::get_instance();
-            control->DecrementActiveThreads();
-            control->Cancel();
+            /////SharedControl* control = SharedControl::get_instance();
+            /////control->DecrementActiveThreads();
+            /////control->Cancel();
             return;
         }
 
-        SharedControl::get_instance()->DecrementActiveThreads();
+        /////SharedControl::get_instance()->DecrementActiveThreads();
         LWARN( proclog, "Valid return" );
 
         return;
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index e278f81..41614e4 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -176,27 +176,27 @@ namespace Nymph
     template< typename... XArgs >
     inline void Signal< XArgs... >::operator()( XArgs... args )
     {
-        SharedControl* control = SharedControl::get_instance();
+        /////SharedControl* control = SharedControl::get_instance();
 
         // Check for whether we need to quit from external input:
         // - if we're canceled, then quit the thread
         // - if we're at a break, then wait to continue;
         //     once we continue, if we need to quit, then do so
-        if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
-        {
-            QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
-        }
+        /////if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
+        /////{
+        /////    QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+        /////}
 
         // Check for whether this signal emission has a breakpoint
         if( fDoBreakpoint )
         {
             // do the break
-            control->Break( args... );
+            /////control->Break( args... );
             // wait to continue; once we continue, if we need to quit, then do so
-            if( ! control->WaitToContinue() )
-            {
-                QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
-            }
+            /////if( ! control->WaitToContinue() )
+            /////{
+            /////    QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+            /////}
         }
 
         // Emit signal by calling all connected slots
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 753efc6..e3a8b38 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -13,7 +13,7 @@ set( testing_HEADERS
 )
 
 set( testing_SOURCES
-    TestControlAccess.cc
+#    TestControlAccess.cc
     TestData.cc
     TestDataFrame.cc
     TestException.cc
@@ -21,6 +21,7 @@ set( testing_SOURCES
     TestProcessor.cc
     TestProcessorToolbox.cc
     TestSignalSlot.cc
+#    TestSingleRunController.cc
     UseCatch.cc
 )
 
diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
index a33242f..5c1b3a2 100644
--- a/Testing/TestPrimaryProcessor.cc
+++ b/Testing/TestPrimaryProcessor.cc
@@ -20,7 +20,7 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
 {
     using namespace Nymph;
 
-    SharedControl::get_instance()->Reset();
+    //SharedControl::get_instance()->Reset();
 
     TestPrimaryProc tester;
     REQUIRE_FALSE( tester.ExceptionPtr() );
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index 9766015..3532a8f 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -20,7 +20,7 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
 {
     using namespace Nymph;
 
-    SharedControl::get_instance()->Reset();
+    //SharedControl::get_instance()->Reset();
 
     TestProc tester;
 
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index f3a8d2e..0a684b8 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -36,11 +36,6 @@ namespace Nymph
                 return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
             }
 
-            void StartMultiThreadedRun()
-            {
-                return ProcessorToolbox::StartMultiThreadedRun();
-            }
-
             using ProcessorToolbox::RunQueue;
             RunQueue& GetRunQueue()
             {
@@ -54,7 +49,7 @@ TEST_CASE( "processor_toolbox" )
 {
     using namespace Nymph;
 
-    SharedControl::get_instance()->Reset();
+    //SharedControl::get_instance()->Reset();
 
     ProcTBRevealer toolbox;
 
@@ -198,34 +193,4 @@ TEST_CASE( "processor_toolbox" )
 
     }
 
-    SECTION( "DoRun" )
-    {
-        std::string config_str(
-            "processors:\n"
-            "- type: test-primary\n"
-            "  name: pp\n"
-            "connections:\n"
-            "- signal: \"pp:value\"\n"
-            "  slot: \"pp:value\"\n"
-            "run-queue:\n"
-            "- pp"
-        );
-
-        scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
-
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
-
-        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
-        REQUIRE( ppProc );
-        ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
-
-        // do the run
-        REQUIRE_NOTHROW( toolbox.Run() );
-
-        // check the results
-        REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
-
-    }
-
 }
diff --git a/Testing/TestSingleRunController.cc b/Testing/TestSingleRunController.cc
new file mode 100644
index 0000000..5bb47cd
--- /dev/null
+++ b/Testing/TestSingleRunController.cc
@@ -0,0 +1,72 @@
+/*
+ * TestSingleRunController.cc
+ *
+ *  Created on: Jan 17, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProcessorClasses.hh"
+
+#include "SingleRunController.hh"
+
+#include "logger.hh"
+#include "param_codec.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestSingleRunController" );
+
+
+namespace Nymph
+{
+    class SRCRevealer : public SingleRunController
+    {
+        public:
+            using SingleRunController::SingleRunController;
+
+            void StartMultiThreadedRun()
+            {
+                return SingleRunController::StartMultiThreadedRun();
+            }
+
+    };
+}
+
+
+TEST_CASE( "processor_toolbox" )
+{
+    using namespace Nymph;
+
+    SRCRevealer controller;
+
+    SECTION( "DoRun" )
+    {
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: pp\n"
+            "connections:\n"
+            "- signal: \"pp:value\"\n"
+            "  slot: \"pp:value\"\n"
+            "run-queue:\n"
+            "- pp"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
+        REQUIRE( ppProc );
+        ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
+
+        // do the run
+        REQUIRE_NOTHROW( toolbox.Run() );
+
+        // check the results
+        REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
+
+    }
+
+}

From f79f311ba0c1eb7ef957e6b737bdbfb5f1c49f74 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 20 Jan 2022 17:57:45 -0800
Subject: [PATCH 223/521] More intermediate work on the refactor

---
 Library/CMakeLists.txt                 |   2 +-
 Library/Control/ControlAccess.cc       |  67 +++++++++++--
 Library/Control/ControlAccess.hh       |  50 +++++++---
 Library/Control/Controller.cc          | 112 +++++++++++++++++++++-
 Library/Control/Controller.hh          | 112 +++++++++++++++++++++-
 Library/Control/SingleRunController.cc | 126 ++++---------------------
 Library/Control/SingleRunController.hh |  76 ++-------------
 Library/Processor/PrimaryProcessor.cc  |  13 +--
 Library/Processor/QuitChain.hh         |  28 ++++++
 Library/Processor/QuitThread.hh        |  27 ------
 Library/Processor/Signal.hh            |  12 +--
 11 files changed, 387 insertions(+), 238 deletions(-)
 create mode 100644 Library/Processor/QuitChain.hh
 delete mode 100644 Library/Processor/QuitThread.hh

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 3a9ec83..d4562f9 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -29,7 +29,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
-    ${PROC_DIR}/QuitThread.hh
+    ${PROC_DIR}/QuitChain.hh
     ${PROC_DIR}/SignalSlotBase.hh
 
     ${CONT_DIR}/ControlAccess.hh
diff --git a/Library/Control/ControlAccess.cc b/Library/Control/ControlAccess.cc
index 1e7c26b..d148312 100644
--- a/Library/Control/ControlAccess.cc
+++ b/Library/Control/ControlAccess.cc
@@ -9,28 +9,79 @@
 
 #include "logger.hh"
 
-//#include <boost/thread/locks.hpp>
-//#include <boost/thread/lock_types.hpp>
-
 LOGGER( contlog, "ControlAccess" );
 
 namespace Nymph
 {
-    SharedControl::SharedControl() :
-    {}
+    ControlAccess::ControlAccess() :
+            scarab::singleton< ControlAccess >(),
+            ControllerInterface(),
+            fControl( nullptr )
+    {
+        fControl = Controller::
+    }
 
-    SharedControl::~SharedControl()
+    ControlAccess::~ControlAccess()
     {}
 
+    bool ControlAccess::WaitToContinue()
+    {
+        return fControl->WaitToContinue();
+    }
 
+    bool ControlAccess::WaitForBreakOrCanceled()
+    {
+        return fControl->WaitForBreakOrCanceled();
+    }
 
+    void ControlAccess::WaitForEndOfRun()
+    {
+        fControl->WaitForEndOfRun();
+        return;
+    }
 
-    ControlAccess::ControlAccess() :
+    void ControlAccess::Continue()
+    {
+        fControl->Continue();
+        return;
+    }
+
+    void ControlAccess::Cancel( int code )
+    {
+        fControl->Cancel( code );
+        return;
+    }
+
+    bool ControlAccess::IsCanceled() const
+    {
+        return fControl->IsCanceled();
+    }
+
+    void ControlAccess::Break()
+    {
+        fControl->Break();
+        return;
+    }
+
+    bool ControlAccess::IsAtBreak() const
+    {
+        return fControl->IsAtBreak();
+    }
+
+    void ControlAccess::ChainQuitting( std::exception_ptr ePtr )
+    {
+        fControl->ChainQuitting( ePtr );
+        return;
+    }
+
+
+
+    ReturnAccess::ReturnAccess() :
             fReturn( new ReturnBuffer< int >() )//,
             //fControl()
     {}
 
-    ControlAccess::~ControlAccess()
+    ReturnAccess::~ReturnAccess()
     {}
 
 } /* namespace Nymph */
diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index 39ff356..6cc606d 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -8,6 +8,7 @@
 #ifndef NYMPH_CONTROLACCESS_HH_
 #define NYMPH_CONTROLACCESS_HH_
 
+#include "Controller.hh"
 #include "Exception.hh"
 #include "MemberVariable.hh"
 #include "ReturnBuffer.hh"
@@ -15,9 +16,6 @@
 #include "cancelable.hh" // remove when ControlAccess is removed
 #include "singleton.hh"
 
-//#include <boost/thread/condition_variable.hpp>
-//#include <boost/thread/mutex.hpp>
-
 #include <condition_variable>
 #include <memory>
 #include <mutex>
@@ -25,27 +23,55 @@
 namespace Nymph
 {
 
-    class SharedControl : public scarab::singleton< SharedControl >
+    class ControlAccess : public scarab::singleton< ControlAccess >, public ControllerInterface
     {
         protected:
-            allow_singleton_access( SharedControl );
+            allow_singleton_access( ControlAccess );
 
-            SharedControl();
-            virtual ~SharedControl();
+            ControlAccess();
+            virtual ~ControlAccess();
 
         public:
+            virtual bool WaitToContinue();
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            virtual bool WaitForBreakOrCanceled();
+
+            /// Use this to have a thread wait for the end of a run
+            virtual void WaitForEndOfRun();
+
+            /// Instruct the Controller to continue after a breakpoint
+            virtual void Continue();
+
+            /// Cancel all threads and end the run
+            virtual void Cancel( int code = 0 );
 
+            /// Reports whether controls is canceled
+            virtual bool IsCanceled() const;
+
+            /// Initiate a break
+            virtual void Break();
+
+            /// Reports whether control is at a breakpoint
+            virtual bool IsAtBreak() const;
+
+            /// Notify the control that a chain is quitting
+            virtual void ChainQuitting( std::exception_ptr ePtr );
+
+            MEMVAR_PTR( ControllerInterface, Control );
 
     };
 
 
 
-    class ControlAccess : public scarab::cancelable
+    class ReturnAccess : public scarab::cancelable
     {
         public:
-            ControlAccess();
+            ReturnAccess();
 
-            virtual ~ControlAccess();
+            virtual ~ReturnAccess();
 
             template< typename... Args >
             void SetReturn( Args&... arg );
@@ -64,14 +90,14 @@ namespace Nymph
 
 
     template< typename... Args >
-    void ControlAccess::SetReturn( Args&... args )
+    void ReturnAccess::SetReturn( Args&... args )
     {
         fReturn = std::make_shared< ReturnBuffer< Args... > >( args... );
         return;
     }
 
     template< typename... Args >
-    std::tuple< Args&... >& ControlAccess::GetReturn()
+    std::tuple< Args&... >& ReturnAccess::GetReturn()
     {
         std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturn) );
         if( buffer == nullptr ) throw std::exception();
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index ee92b3b..c5c563f 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -7,16 +7,126 @@
 
 #include "Controller.hh"
 
+#include "Exception.hh"
+
 #include "logger.hh"
 
+
 namespace Nymph
 {
     LOGGER( contlog, "Controller" );
 
-    Controller::Controller()
+    ControllerInterface::ControllerInterface()
+    {}
+
+    ControllerInterface::~ControllerInterface()
+    {}
+
+
+    Controller::Controller() :
+            ControllerInterface(),
+            scarab::cancelable(),
+            fMutex(),
+            fCondVarContinue(),
+            fCondVarBreak(),
+            fBreakFlag( false ),
+            fCycleTimeMS( 500 )
     {}
 
     Controller::~Controller()
     {}
 
+    bool Controller::WaitForBreakOrCanceled()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+        {
+            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+        }
+        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
+    }
+
+    bool Controller::WaitToContinue()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fBreakFlag )
+        {
+            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+            {
+                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            }
+        }
+        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
+    }
+
+    void Controller::WaitForEndOfRun()
+    {
+        LDEBUG( contlog, "Waiting for end-of-run" );
+        while( WaitForBreakOrCanceled() )
+        {
+            LDEBUG( contlog, "Reached breakpoint; waiting for continue" );
+            WaitToContinue();
+            LDEBUG( contlog, "Processing resuming; waiting for end-of-run" );
+        }
+        LDEBUG( contlog, "End-of-run reached" );
+
+        return;
+    }
+
+    void Controller::Continue()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "RESUME called" );
+        fBreakFlag = false;
+        fCondVarContinue.notify_all();
+        return;
+    }
+
+    void Controller::Cancel( int code )
+    {
+        this->cancel( code );
+        return;
+    }
+
+    bool Controller::IsCanceled() const
+    {
+        return this->is_canceled();
+    }
+
+    void Controller::Break()
+    {
+        while( IsAtBreak() && ! IsCanceled() )
+        {
+            if( ! WaitToContinue() )
+            {
+                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
+            }
+        }
+
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
+
+    bool Controller::IsAtBreak() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fBreakFlag;
+    }
+
+    void Controller::ChainQuitting( std::exception_ptr ePtr )
+    {
+
+    }
+
+    void Controller::do_cancellation( int code )
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "CANCEL called" );
+        f_canceled.store( true );
+        fCondVarBreak.notify_all();
+        return;
+    }
+
 } /* namespace Nymph */
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index 2a2832a..847b775 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -10,18 +10,128 @@
 
 #include "MemberVariable.hh"
 
+#include "cancelable.hh"
+
+#include <condition_variable>
+#include <mutex>
+
 namespace Nymph
 {
 
-    class Controller
+    class ControllerInterface
+    {
+        public:
+            ControllerInterface();
+            virtual ~ControllerInterface();
+
+            virtual bool WaitToContinue() = 0;
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            virtual bool WaitForBreakOrCanceled() = 0;
+
+            /// Use this to have a thread wait for the end of a run
+            virtual void WaitForEndOfRun() = 0;
+
+            /// Instruct the Controller to continue after a breakpoint
+            virtual void Continue() = 0;
+
+            /// Cancel all threads and end the run
+            virtual void Cancel( int code = 0 ) = 0;
+
+            /// Reports whether controls is canceled
+            virtual bool IsCanceled() const = 0;
+
+            /// Initiate a break
+            virtual void Break() = 0;
+
+            /// Reports whether control is at a breakpoint
+            virtual bool IsAtBreak() const = 0;
+
+            /// Notify the control that a chain is quitting
+            virtual void ChainQuitting( std::exception_ptr ePtr ) = 0;
+    };
+
+    class Controller : public ControllerInterface, public scarab::cancelable
     {
         public:
             Controller();
             virtual ~Controller();
 
 
+        public:    
+            virtual bool WaitToContinue();
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            virtual bool WaitForBreakOrCanceled();
+
+            /// Use this to have a thread wait for the end of a run
+            virtual void WaitForEndOfRun();
+
+            /// Instruct the Controller to continue after a breakpoint
+            virtual void Continue();
+
+            /// Cancel all threads and end the run
+            virtual void Cancel( int code = 0 );
+
+            /// Reports whether controls is canceled
+            virtual bool IsCanceled() const;
+
+            /// Inititate a break
+            virtual void Break();
+
+            /// Reports whether control is at a breakpoint
+            virtual bool IsAtBreak() const;
+
+            /// Notify the control that a chain is quitting
+            virtual void ChainQuitting( std::exception_ptr ePtr );
+
+            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
+            MEMVAR_NOSET( bool, BreakFlag );
+            MEMVAR( unsigned, CycleTimeMS );
+            //MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
+
+        protected:
+            void do_cancellation( int code );
+
     };
 
+/*
+    template< typename... Args >
+    void SharedControl::Break( Args&... args )
+    {
+        while( IsAtBreak() && ! IsCanceled() )
+        {
+            if( ! WaitToContinue() )
+            {
+                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
+            }
+        }
+
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
+
+
+
+    template< typename... Args >
+    std::tuple< Args&... >& SharedControl::GetReturn()
+    {
+        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
+        std::unique_lock< std::mutex > lock( fMutex );
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
+        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
+        return buffer->GetReturn();
+    }
+*/
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_CONTROLLER_HH_ */
diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index d1b332c..1bf094c 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -18,14 +18,8 @@ namespace Nymph
     LOGGER( contlog, "SingleRunController");
 
     SingleRunController::SingleRunController( const std::string& name ) :
-            fDoRunThread(),
-            fMutex(),
-            fCondVarContinue(),
-            fCondVarBreak(),
-            fBreakFlag( false ),
-            fCanceledFlag( false ),
-            fCycleTimeMS( 500 ),
-            fNActiveThreads( 0 )
+            fNActiveThreads( 0 ),
+            fDoRunThread()
     {
     }
 
@@ -33,7 +27,7 @@ namespace Nymph
     {
     }
 
-    void ProcessorToolbox::Configure( const scarab::param_node& node )
+    void SingleRunController::Configure( const scarab::param_node& node )
     {
         LPROG( proclog, "Configuring run control" );
 
@@ -42,7 +36,7 @@ namespace Nymph
 
 
 
-    void ProcessorToolbox::AsyncRun()
+    void SingleRunController::AsyncRun()
     {
         if( fDoRunThread.joinable() )
         {
@@ -55,7 +49,7 @@ namespace Nymph
         return;
     }
 
-    void ProcessorToolbox::StartMultiThreadedRun()
+    void SingleRunController::StartMultiThreadedRun()
     {
         auto multiThreadRun = [&]()
         {
@@ -176,49 +170,19 @@ namespace Nymph
     }
 
 
-    bool ProcessorToolbox::WaitForBreakOrCanceled()
-    {
-        return SharedControl::get_instance()->WaitForBreakOrCanceled();
-    }
-
-    bool ProcessorToolbox::WaitToContinue()
-    {
-        return SharedControl::get_instance()->WaitToContinue();
-    }
-
-    void ProcessorToolbox::WaitForEndOfRun()
-    {
-        LDEBUG( proclog, "Waiting for end-of-run" );
-        while( WaitForBreakOrCanceled() )
-        {
-            LDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            WaitToContinue();
-            LDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
-        }
-        LDEBUG( proclog, "End-of-run reached" );
-
-        return;
-    }
-
-    void ProcessorToolbox::Continue()
-    {
-        SharedControl::get_instance()->Resume();
-        return;
-    }
-
-   void ProcessorToolbox::JoinRunThread()
+   void SingleRunController::JoinRunThread()
    {
        fDoRunThread.join();
        return;
    }
 
-    void ProcessorToolbox::CancelThreads()
+    void SingleRunController::CancelThreads()
     {
         SharedControl::get_instance()->Cancel();
         return;
     }
 
-    bool ProcessorToolbox::Run()
+    bool SingleRunController::Run()
     {
         // can throw scarab::base_exception
 
@@ -232,86 +196,36 @@ namespace Nymph
     }
 
 
-
-
-        void SharedControl::Reset()
+    void SingleRunController::IncrementActiveThreads()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "Reseting ControlAccess" );
-        fBreakFlag = false;
-        fCanceledFlag = false;
-        fCycleTimeMS = 500;
-        fNActiveThreads = 0;
+        ++fNActiveThreads;
+        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
         return;
     }
 
-    void SharedControl::Cancel()
+    void SingleRunController::DecrementActiveThreads()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "CANCEL called" );
-        fCanceledFlag = true;
-        fCondVarBreak.notify_all();
+        if( fNActiveThreads > 0 ) --fNActiveThreads;
+        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
         return;
     }
 
-    bool SharedControl::IsAtBreak() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        return fBreakFlag;
-    }
 
-    bool SharedControl::IsCanceled() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        return fCanceledFlag;
-    }
-
-    bool SharedControl::WaitToContinue() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fBreakFlag )
-        {
-            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
-            {
-                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-            }
-        }
-        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
-    }
-
-    bool SharedControl::WaitForBreakOrCanceled() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
-        {
-            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-        }
-        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
-    }
 
-    void SharedControl::Resume()
+    void SharedControl::Reset()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "RESUME called" );
+        LDEBUG( contlog, "Reseting ControlAccess" );
         fBreakFlag = false;
-        fCondVarContinue.notify_all();
-    }
-
-    void SharedControl::IncrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        ++fNActiveThreads;
-        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
+        fCanceledFlag = false;
+        fCycleTimeMS = 500;
+        fNActiveThreads = 0;
         return;
     }
 
-    void SharedControl::DecrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fNActiveThreads > 0 ) --fNActiveThreads;
-        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
-        return;
-    }
+
 
 
 
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 6dc21d3..9cf5c97 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -78,8 +78,8 @@ namespace Nymph
     class SingleRunController : public Controller
     {
         public:
-            ProcessorToolbox( const std::string& name = "processor-toolbox" );
-            virtual ~ProcessorToolbox();
+            SingleRunController( const std::string& name = "single-run-controller" );
+            virtual ~SingleRunController();
 
         public:
             /// Configure the controller
@@ -88,66 +88,34 @@ namespace Nymph
         public:
             /// Process the run queue.
             /// This will call Run() on all of the primary processors in the queue.
-            bool Run();
+            void Run();
 
             void AsyncRun();
 
-            bool WaitToContinue();
-
-            /// Returns when processing is completed or a breakpoint is reached
-            /// Throws a boost::exception if there's an error with the future object in use
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            bool WaitForBreakOrCanceled();
-
-            void WaitForEndOfRun();
-
-            void Continue();
-
-            void CancelThreads();
-
             void JoinRunThread();
 
             // TODO: return value access
 
+            MEMVAR( unsigned, NActiveThreads );
+
         protected:
             void StartMultiThreadedRun();
 
             std::thread fDoRunThread;
 
+            void do_cancellation( int code );
 
         public:
+        /*
             template< typename... Args >
             std::tuple< Args&... >& GetReturn();
 
             template< typename... Args >
             void Break( Args&... args ); // to be called by a working thread
-
-            void Cancel(); // to be called by a working thread
-
-            bool IsAtBreak() const; // to be called by a working thread
-
-            bool IsCanceled() const; // to be called by a working thread
-
-            // return: true = continue; false = cancel
-            bool WaitToContinue() const; // to be called by a working thread
-
-            // return: true = was a break; false = cancel
-            bool WaitForBreakOrCanceled() const; // to be called by the processor toolbox
-
-            void Resume(); // to be called by the processor toolbox
-
+        */
             void IncrementActiveThreads();
             void DecrementActiveThreads();
 
-            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
-            MEMVAR_NOSET( bool, BreakFlag );
-            MEMVAR_NOSET( bool, CanceledFlag );
-            MEMVAR( unsigned, CycleTimeMS );
-            MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
-            MEMVAR( unsigned, NActiveThreads );
 
             // WARNING: This function resets the state of this class to a just-constructed state
             //          It is intended for use with testing when a single application might use it multiple times
@@ -155,34 +123,6 @@ namespace Nymph
 
     };
 
-    template< typename... Args >
-    void SharedControl::Break( Args&... args )
-    {
-        while( IsAtBreak() && ! IsCanceled() )
-        {
-            if( ! WaitToContinue() )
-            {
-                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
-            }
-        }
-
-        std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag = true;
-        fCondVarBreak.notify_all();
-        return;
-    }
-
-
-
-    template< typename... Args >
-    std::tuple< Args&... >& SharedControl::GetReturn()
-    {
-        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
-        std::unique_lock< std::mutex > lock( fMutex );
-        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
-        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
-        return buffer->GetReturn();
-    }
 
 
 } /* namespace Nymph */
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index c4f38cf..fbc6720 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -8,7 +8,7 @@
 #include "PrimaryProcessor.hh"
 
 //#include "ControlAccess.hh"
-#include "QuitThread.hh"
+#include "QuitChain.hh"
 
 #include "logger.hh"
 
@@ -31,21 +31,18 @@ namespace Nymph
         {
             Run();
         }
-        catch( const QuitThread& e )
+        catch( const QuitChain& e )
         {
-            LINFO( proclog, "Processor thread started by <" << fName << "> is quitting" );
+            LINFO( proclog, "Processor chain started by <" << fName << "> is quitting" );
             fExceptionPtr = std::current_exception(); // capture the exception
-            /////SharedControl::get_instance()->DecrementActiveThreads();
-            // we don't initiate cancellation on QuitThread; this type of quitting has been initiated elsewhere and detected in this thread.
+            ControlAccess::get_instance()->ChainQuitting( fExceptionPtr );
             return;
         }
         catch( const std::exception& e )
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );
             fExceptionPtr = std::current_exception(); // capture the exception
-            /////SharedControl* control = SharedControl::get_instance();
-            /////control->DecrementActiveThreads();
-            /////control->Cancel();
+            ControlAccess::get_instance()->ChainQuitting( fExceptionPtr );
             return;
         }
 
diff --git a/Library/Processor/QuitChain.hh b/Library/Processor/QuitChain.hh
new file mode 100644
index 0000000..976597b
--- /dev/null
+++ b/Library/Processor/QuitChain.hh
@@ -0,0 +1,28 @@
+/*
+ * QuitChain.hh
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_QUITCHAIN_HH_
+#define NYMPH_QUITCHAIN_HH_
+
+#include <string>
+
+namespace Nymph
+{
+    /// QuitChain is used to communicate within a Chain that the chain should stop running from the top (i.e. from the PrimaryProcessor)
+    class QuitChain : public scarab::typed_exception< QuitChain >
+    {
+        public:
+            using scarab::typed_exception< QuitChain >::typed_exception;
+            ~QuitChain() = default;
+    };
+
+    #define QUIT_CHAIN  throw ::Nymph::QuitChain()(__FILE__, __LINE__)
+    //THROW_EXCEPT_HERE( ::Nymph::QuitChain() )
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_QUITCHAIN_HH_ */
diff --git a/Library/Processor/QuitThread.hh b/Library/Processor/QuitThread.hh
deleted file mode 100644
index 10597ff..0000000
--- a/Library/Processor/QuitThread.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * QuitThread.hh
- *
- *  Created on: Oct 22, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_QUITTHREAD_HH_
-#define NYMPH_QUITTHREAD_HH_
-
-#include <string>
-
-namespace Nymph
-{
-    class QuitThread : public scarab::typed_exception< QuitThread >
-    {
-        public:
-            using scarab::typed_exception< QuitThread >::typed_exception;
-            ~QuitThread() = default;
-    };
-
-    #define QUIT_THREAD  throw ::Nymph::QuitThread()(__FILE__, __LINE__)
-    //THROW_EXCEPT_HERE( ::Nymph::QuitThread() )
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_QUITTHREAD_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 41614e4..9a6e496 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -176,16 +176,16 @@ namespace Nymph
     template< typename... XArgs >
     inline void Signal< XArgs... >::operator()( XArgs... args )
     {
-        /////SharedControl* control = SharedControl::get_instance();
+        ControlAccess* control = ControlAccess::get_instance();
 
         // Check for whether we need to quit from external input:
         // - if we're canceled, then quit the thread
         // - if we're at a break, then wait to continue;
         //     once we continue, if we need to quit, then do so
-        /////if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
-        /////{
-        /////    QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
-        /////}
+        if( control->is_canceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
+        {
+            QUIT_CHAIN; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+        }
 
         // Check for whether this signal emission has a breakpoint
         if( fDoBreakpoint )
@@ -195,7 +195,7 @@ namespace Nymph
             // wait to continue; once we continue, if we need to quit, then do so
             /////if( ! control->WaitToContinue() )
             /////{
-            /////    QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+            /////    QUIT_CHAIN; // throws QuitThread; should be caught by PrimaryProcessor::operator()
             /////}
         }
 

From 1245e519ec783f7161eef1461c546bd62a5cd9b3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 21 Jan 2022 01:27:47 -0800
Subject: [PATCH 224/521] More progress on the Controls reorganization

---
 Library/Control/ControlAccess.cc       |   4 +-
 Library/Control/ControlAccess.hh       |   2 +-
 Library/Control/Controller.cc          |  35 +++++++--
 Library/Control/Controller.hh          |   4 +-
 Library/Control/SingleRunController.cc | 105 +++++++++++++++++--------
 Library/Control/SingleRunController.hh |   7 ++
 Library/Processor/PrimaryProcessor.cc  |  10 +--
 Library/Processor/PrimaryProcessor.hh  |   2 +-
 Library/Processor/QuitChain.hh         |   2 +-
 Library/Processor/Signal.hh            |  12 +--
 Library/Utility/Exception.hh           |   5 --
 11 files changed, 126 insertions(+), 62 deletions(-)

diff --git a/Library/Control/ControlAccess.cc b/Library/Control/ControlAccess.cc
index d148312..455271d 100644
--- a/Library/Control/ControlAccess.cc
+++ b/Library/Control/ControlAccess.cc
@@ -68,9 +68,9 @@ namespace Nymph
         return fControl->IsAtBreak();
     }
 
-    void ControlAccess::ChainQuitting( std::exception_ptr ePtr )
+    void ControlAccess::ChainQuitting( const std::string& name, std::exception_ptr ePtr )
     {
-        fControl->ChainQuitting( ePtr );
+        fControl->ChainQuitting( name, ePtr );
         return;
     }
 
diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index 6cc606d..e36bd5b 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -58,7 +58,7 @@ namespace Nymph
             virtual bool IsAtBreak() const;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( std::exception_ptr ePtr );
+            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
             MEMVAR_PTR( ControllerInterface, Control );
 
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index c5c563f..6505458 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -7,7 +7,7 @@
 
 #include "Controller.hh"
 
-#include "Exception.hh"
+#include "QuitChain.hh"
 
 #include "logger.hh"
 
@@ -39,11 +39,11 @@ namespace Nymph
     bool Controller::WaitForBreakOrCanceled()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+        while( ! fBreakFlag && ! is_canceled() && fNActiveThreads > 0 )
         {
             fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
-        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
+        return is_canceled() || fNActiveThreads == 0 ? false : fBreakFlag;
     }
 
     bool Controller::WaitToContinue()
@@ -51,12 +51,12 @@ namespace Nymph
         std::unique_lock< std::mutex > lock( fMutex );
         if( fBreakFlag )
         {
-            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+            while( fBreakFlag && ! is_canceled() && fNActiveThreads > 0 )
             {
                 fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
             }
         }
-        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
+        return (! is_canceled()) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
     }
 
     void Controller::WaitForEndOfRun()
@@ -115,9 +115,32 @@ namespace Nymph
         return fBreakFlag;
     }
 
-    void Controller::ChainQuitting( std::exception_ptr ePtr )
+    void Controller::ChainQuitting( const std::string& name, std::exception_ptr ePtr )
     {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "Chain <" << name << "> is quitting" );
 
+        if( ePtr )
+        {
+            try
+            {
+                std::rethrow_exception( ePtr );
+            }
+            catch( const QuitChain& e )
+            {
+                // not necessarily an error, so don't set quitAfterThis to true
+                LINFO( contlog, "Chain exited with QuitChain" );
+            }
+            catch( const scarab::base_exception& e )
+            {
+                // this is an error, so set quitAfterThis to true
+                LERROR( contlog, "Chain exited with an exception" );
+                PrintException( e );
+                this->Cancel( RETURN_ERROR );
+            }
+        }
+
+        return;
     }
 
     void Controller::do_cancellation( int code )
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index 847b775..efe0895 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -50,7 +50,7 @@ namespace Nymph
             virtual bool IsAtBreak() const = 0;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( std::exception_ptr ePtr ) = 0;
+            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr ) = 0;
     };
 
     class Controller : public ControllerInterface, public scarab::cancelable
@@ -87,7 +87,7 @@ namespace Nymph
             virtual bool IsAtBreak() const;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( std::exception_ptr ePtr );
+            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
             MEMVAR_REF_MUTABLE( std::mutex, Mutex );
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index 1bf094c..5d38ff3 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -19,7 +19,8 @@ namespace Nymph
 
     SingleRunController::SingleRunController( const std::string& name ) :
             fNActiveThreads( 0 ),
-            fDoRunThread()
+            fDoRunThread(),
+            fChainThreads()
     {
     }
 
@@ -34,8 +35,6 @@ namespace Nymph
 
     }
 
-
-
     void SingleRunController::AsyncRun()
     {
         if( fDoRunThread.joinable() )
@@ -49,6 +48,36 @@ namespace Nymph
         return;
     }
 
+    void SingleRunController::ChainQuitting( const std::string& name, std::exception_ptr ePtr )
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "Chain <" << name << "> is quitting" );
+        
+        if( ePtr )
+        {
+            try
+            {
+                std::rethrow_exception( ePtr );
+            }
+            catch( const QuitChain& e )
+            {
+                // not necessarily an error, so don't set quitAfterThis to true
+                LINFO( contlog, "Chain <" << name << "> exited with QuitChain" );
+            }
+            catch( const scarab::base_exception& e )
+            {
+                // this is an error, so set quitAfterThis to true
+                LERROR( contlog, "Chain <" << name << "> exited with an exception" );
+                PrintException( e );
+                this->Cancel( RETURN_ERROR );
+            }
+        }
+
+        --fNActiveThreads;
+
+        return;
+    }
+
     void SingleRunController::StartMultiThreadedRun()
     {
         auto multiThreadRun = [&]()
@@ -59,21 +88,26 @@ namespace Nymph
 
                 for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                 {
-                    SharedControl* control = SharedControl::get_instance();
+                    { // scope for mutex lock
+                        std::unique_lock< std::mutex > lock( fMutex );
 
-                    typedef std::pair< PrimaryProcessor*, std::thread > ThreadBundle;
-                    std::map< std::string, ThreadBundle > threads;
-
-                    // iterate over primary processors in this group and launch threads
-                    for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                    {
-                        std::string procName( tgIter->fName );
-                        LINFO( proclog, "Starting processor <" << procName << ">" );
-
-                        threads.emplace( procName, ThreadBundle( tgIter->fProc, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) ) );
-
-                        control->IncrementActiveThreads();
-                    }// end for loop over the thread group
+                        // iterate over primary processors in this group and launch threads
+                        for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        {
+                            std::string procName( tgIter->fName );
+                            LINFO( proclog, "Starting processor <" << procName << ">" );
+
+                            fChainThreads.emplace( 
+                                procName, 
+                                ThreadBundle( 
+                                    tgIter->fProc, 
+                                    std::thread(&PrimaryProcessor::operator(), tgIter->fProc),
+                                    std::exception_ptr() 
+                                ) 
+                            );
+                            ++fNActiveThreads;
+                        }// end for loop over the thread group
+                    }
 
                     // wait here while things are still running
                     bool stillRunning = true;
@@ -100,29 +134,42 @@ namespace Nymph
                         }
                     }
 
+                    // ok, we're not running anymore.  join all threads and move along.
+
                     // join threads and check for exceptions
                     // break out of the run-queue iteration loop if there was an exception
-                    bool quitAfterThis = control->IsCanceled();
+                    bool quitAfterThis = is_canceled();
                     for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
                     {
                         LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
-                        LDEBUG( proclog, "Joining thread" );
-                        threadIt->second.second.join();
-                        if( threadIt->second.first->ExceptionPtr() )
+
+                        std::thread thread( std::move(std::get<1>( threadIt->second )) );
+                        if( ! thread.joinable() )
+                        {
+                            LDEBUG( contlog, "Thread for processor <" << threadIt->first << "> is not joinable" );
+                        }
+                        else
+                        {
+                            LDEBUG( proclog, "Joining thread, ID = " << thread.thread_id() );
+                            thread.join();
+                        }
+
+                        std::exception_ptr exPtr( std::move(std::get<2>( threadIt->second )) );
+                        if( exPtr )
                         {
                             try
                             {
-                                std::rethrow_exception( threadIt->second.first->ExceptionPtr() );
+                                std::rethrow_exception( exPtr );
                             }
                             catch( const QuitThread& e )
                             {
                                 // not necessarily an error, so don't set quitAfterThis to true
-                                LINFO( proclog, "Thread exited with QuitThread" );
+                                LINFO( proclog, "Thread had exited with QuitThread" );
                             }
                             catch( const scarab::base_exception& e )
                             {
                                 // this is an error, so set quitAfterThis to true
-                                LERROR( proclog, "Thread exited with an exception" );
+                                LERROR( proclog, "Thread had exited with an exception" );
                                 PrintException( e );
                                 quitAfterThis = true;
                             }
@@ -130,7 +177,7 @@ namespace Nymph
                         else
                         {
                             // this thread did not have an exeption set, so it exited normally
-                            LINFO( proclog, "Thread exited normally" )
+                            LINFO( proclog, "Thread had exited normally" )
                         }
                     }
 
@@ -158,8 +205,6 @@ namespace Nymph
                 // exceptions thrown in this function or from within processors will end up here
                 LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
                 SharedControl::get_instance()->Cancel();
-                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                //fDoRunPromise.set_exception( boost::current_exception() );
                 return;
             }
             return;
@@ -176,12 +221,6 @@ namespace Nymph
        return;
    }
 
-    void SingleRunController::CancelThreads()
-    {
-        SharedControl::get_instance()->Cancel();
-        return;
-    }
-
     bool SingleRunController::Run()
     {
         // can throw scarab::base_exception
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 9cf5c97..be30ada 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -20,6 +20,7 @@
 #include <set>
 #include <memory>
 #include <thread>
+#include <pair>
 
 
 namespace Nymph
@@ -94,6 +95,9 @@ namespace Nymph
 
             void JoinRunThread();
 
+            /// Notify the control that a chain is quitting
+            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
+
             // TODO: return value access
 
             MEMVAR( unsigned, NActiveThreads );
@@ -103,6 +107,9 @@ namespace Nymph
 
             std::thread fDoRunThread;
 
+            typedef std::tuple< PrimaryProcessor*, std::thread, std::exception_ptr > ThreadBundle;
+            std::map< std::string, ThreadBundle > fChainThreads;
+
             void do_cancellation( int code );
 
         public:
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index fbc6720..83b4034 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -17,8 +17,8 @@ namespace Nymph
     LOGGER( proclog, "PrimaryProcessor" );
 
     PrimaryProcessor::PrimaryProcessor( const std::string& name ) :
-            Processor( name ),
-            fExceptionPtr()
+            Processor( name )//,
+//            fExceptionPtr()
     {}
 
     PrimaryProcessor::~PrimaryProcessor()
@@ -35,19 +35,19 @@ namespace Nymph
         {
             LINFO( proclog, "Processor chain started by <" << fName << "> is quitting" );
             fExceptionPtr = std::current_exception(); // capture the exception
-            ControlAccess::get_instance()->ChainQuitting( fExceptionPtr );
+            ControlAccess::get_instance()->ChainQuitting( fName, fExceptionPtr );
             return;
         }
         catch( const std::exception& e )
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );
             fExceptionPtr = std::current_exception(); // capture the exception
-            ControlAccess::get_instance()->ChainQuitting( fExceptionPtr );
+            ControlAccess::get_instance()->ChainQuitting( fName, fExceptionPtr );
             return;
         }
 
-        /////SharedControl::get_instance()->DecrementActiveThreads();
         LWARN( proclog, "Valid return" );
+        ControlAccess::get_instance()->ChainQuitting( fName );
 
         return;
     }
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index 74287d8..100ded9 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -27,7 +27,7 @@ namespace Nymph
             /// Starts the  main action of the processor
             virtual void Run() = 0;
 
-            MEMVAR_REF( std::exception_ptr, ExceptionPtr );
+//            MEMVAR_REF( std::exception_ptr, ExceptionPtr );
 
     };
 
diff --git a/Library/Processor/QuitChain.hh b/Library/Processor/QuitChain.hh
index 976597b..192e656 100644
--- a/Library/Processor/QuitChain.hh
+++ b/Library/Processor/QuitChain.hh
@@ -8,7 +8,7 @@
 #ifndef NYMPH_QUITCHAIN_HH_
 #define NYMPH_QUITCHAIN_HH_
 
-#include <string>
+#include "base_exception.hh"
 
 namespace Nymph
 {
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 9a6e496..abeb575 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -191,18 +191,18 @@ namespace Nymph
         if( fDoBreakpoint )
         {
             // do the break
-            /////control->Break( args... );
+            //control->Break( args... );
+            control->Break();
             // wait to continue; once we continue, if we need to quit, then do so
-            /////if( ! control->WaitToContinue() )
-            /////{
-            /////    QUIT_CHAIN; // throws QuitThread; should be caught by PrimaryProcessor::operator()
-            /////}
+            if( ! control->WaitToContinue() )
+            {
+                QUIT_CHAIN; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+            }
         }
 
         // Emit signal by calling all connected slots
         for( auto connection : fConnections )
         {
-//            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );
             static_cast< Slot< XArgs... >* >(connection)->operator()( args... );
         }
         return;
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index 479241a..60933c0 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -11,11 +11,6 @@
 
 #include "base_exception.hh"
 
-//#include <boost/exception/all.hpp>
-
-//#include <exception>
-//#include <sstream>
-//#include <string>
 
 namespace Nymph
 {

From d9d20a21c0c87c6d43f42785878c71753087167c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 21 Jan 2022 09:26:22 -0800
Subject: [PATCH 225/521] Cleaning up and fixing logic in waiting for breaks
 and cancellation

---
 Library/Control/Controller.cc | 15 ++++++---------
 Library/Control/Controller.hh |  7 +++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index 6505458..059052b 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -39,24 +39,21 @@ namespace Nymph
     bool Controller::WaitForBreakOrCanceled()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! is_canceled() && fNActiveThreads > 0 )
+        while( ! fBreakFlag && ! is_canceled() )
         {
             fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
-        return is_canceled() || fNActiveThreads == 0 ? false : fBreakFlag;
+        return is_canceled() ? false : fBreakFlag; // returns true if the thread should continue; false if it should end
     }
 
     bool Controller::WaitToContinue()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        if( fBreakFlag )
+        while( fBreakFlag && ! is_canceled() )
         {
-            while( fBreakFlag && ! is_canceled() && fNActiveThreads > 0 )
-            {
-                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-            }
+            fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
-        return (! is_canceled()) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
+        return ! is_canceled(); // returns true if the thread should continue; false if it should end
     }
 
     void Controller::WaitForEndOfRun()
@@ -65,7 +62,7 @@ namespace Nymph
         while( WaitForBreakOrCanceled() )
         {
             LDEBUG( contlog, "Reached breakpoint; waiting for continue" );
-            WaitToContinue();
+            if( ! WaitToContinue() ) break;
             LDEBUG( contlog, "Processing resuming; waiting for end-of-run" );
         }
         LDEBUG( contlog, "End-of-run reached" );
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index efe0895..3cb604f 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -60,10 +60,13 @@ namespace Nymph
             virtual ~Controller();
 
 
-        public:    
+        public:   
+            /// Use this to make a thread wait on a break
+            /// If the return is true, processing should continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error) 
             virtual bool WaitToContinue();
 
-            /// Returns when processing is completed or a breakpoint is reached
+            /// Use this to wait for a breakpoint to be reached or for cancellation
             /// If the return is true, processing can continue after the break
             /// If the return is false, processing has ended (either normally or due to an error)
             virtual bool WaitForBreakOrCanceled();

From 617a01e842b76c9d5461ad40edf84fbb9b35e2b3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 21 Jan 2022 09:26:30 -0800
Subject: [PATCH 226/521] Cleanup

---
 Library/Control/ControlAccess.cc       |  4 +--
 Library/Control/ControlAccess.hh       |  8 ++----
 Library/Control/Controller.cc          |  2 +-
 Library/Control/Controller.hh          |  4 +--
 Library/Control/SingleRunController.cc | 36 +++++++-------------------
 Library/Control/SingleRunController.hh | 15 +++--------
 6 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/Library/Control/ControlAccess.cc b/Library/Control/ControlAccess.cc
index 455271d..2b314d6 100644
--- a/Library/Control/ControlAccess.cc
+++ b/Library/Control/ControlAccess.cc
@@ -68,9 +68,9 @@ namespace Nymph
         return fControl->IsAtBreak();
     }
 
-    void ControlAccess::ChainQuitting( const std::string& name, std::exception_ptr ePtr )
+    void ControlAccess::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
-        fControl->ChainQuitting( name, ePtr );
+        fControl->ChainIsQuitting( name, ePtr );
         return;
     }
 
diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index e36bd5b..8dc438e 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -9,17 +9,13 @@
 #define NYMPH_CONTROLACCESS_HH_
 
 #include "Controller.hh"
+
 #include "Exception.hh"
 #include "MemberVariable.hh"
 #include "ReturnBuffer.hh"
 
-#include "cancelable.hh" // remove when ControlAccess is removed
 #include "singleton.hh"
 
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-
 namespace Nymph
 {
 
@@ -58,7 +54,7 @@ namespace Nymph
             virtual bool IsAtBreak() const;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
             MEMVAR_PTR( ControllerInterface, Control );
 
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index 059052b..513513e 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -112,7 +112,7 @@ namespace Nymph
         return fBreakFlag;
     }
 
-    void Controller::ChainQuitting( const std::string& name, std::exception_ptr ePtr )
+    void Controller::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
         std::unique_lock< std::mutex > lock( fMutex );
         LDEBUG( contlog, "Chain <" << name << "> is quitting" );
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index 3cb604f..013cb01 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -50,7 +50,7 @@ namespace Nymph
             virtual bool IsAtBreak() const = 0;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr ) = 0;
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr ) = 0;
     };
 
     class Controller : public ControllerInterface, public scarab::cancelable
@@ -90,7 +90,7 @@ namespace Nymph
             virtual bool IsAtBreak() const;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
             MEMVAR_REF_MUTABLE( std::mutex, Mutex );
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index 5d38ff3..ad46d4d 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -9,16 +9,12 @@
 
 #include "logger.hh"
 
-#include <map>
-#include <thread>
-
-
 namespace Nymph
 {
     LOGGER( contlog, "SingleRunController");
 
     SingleRunController::SingleRunController( const std::string& name ) :
-            fNActiveThreads( 0 ),
+    //        fNActiveThreads( 0 ),
             fDoRunThread(),
             fChainThreads()
     {
@@ -48,7 +44,7 @@ namespace Nymph
         return;
     }
 
-    void SingleRunController::ChainQuitting( const std::string& name, std::exception_ptr ePtr )
+    void SingleRunController::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
         std::unique_lock< std::mutex > lock( fMutex );
         LDEBUG( contlog, "Chain <" << name << "> is quitting" );
@@ -73,7 +69,7 @@ namespace Nymph
             }
         }
 
-        --fNActiveThreads;
+//        --fNActiveThreads;
 
         return;
     }
@@ -92,7 +88,7 @@ namespace Nymph
                         std::unique_lock< std::mutex > lock( fMutex );
 
                         // iterate over primary processors in this group and launch threads
-                        for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        for( ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter )
                         {
                             std::string procName( tgIter->fName );
                             LINFO( proclog, "Starting processor <" << procName << ">" );
@@ -105,7 +101,7 @@ namespace Nymph
                                     std::exception_ptr() 
                                 ) 
                             );
-                            ++fNActiveThreads;
+//                            ++fNActiveThreads;
                         }// end for loop over the thread group
                     }
 
@@ -189,6 +185,9 @@ namespace Nymph
 
                 } // end for loop over the run-queue
 
+                // we have to cancel on success to make sure anything waiting on the control in some way finishes up
+                this->Cancel( RETURN_SUCCESS );
+
                 LPROG( proclog, "Processing is complete" );
             }
             catch( scarab::base_exception& e )
@@ -235,23 +234,6 @@ namespace Nymph
     }
 
 
-    void SingleRunController::IncrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        ++fNActiveThreads;
-        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
-        return;
-    }
-
-    void SingleRunController::DecrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fNActiveThreads > 0 ) --fNActiveThreads;
-        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
-        return;
-    }
-
-
 
     void SharedControl::Reset()
     {
@@ -260,7 +242,7 @@ namespace Nymph
         fBreakFlag = false;
         fCanceledFlag = false;
         fCycleTimeMS = 500;
-        fNActiveThreads = 0;
+//        fNActiveThreads = 0;
         return;
     }
 
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index be30ada..9a3bbe5 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -14,13 +14,9 @@
 #include "ControlAccess.hh"
 #include "ProcessorToolbox.hh"
 
-#include <deque>
-#include <initializer_list>
-#include <limits>
-#include <set>
-#include <memory>
+#include <map>
 #include <thread>
-#include <pair>
+#include <tuple>
 
 
 namespace Nymph
@@ -96,11 +92,11 @@ namespace Nymph
             void JoinRunThread();
 
             /// Notify the control that a chain is quitting
-            virtual void ChainQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
             // TODO: return value access
 
-            MEMVAR( unsigned, NActiveThreads );
+//            MEMVAR( unsigned, NActiveThreads );
 
         protected:
             void StartMultiThreadedRun();
@@ -120,9 +116,6 @@ namespace Nymph
             template< typename... Args >
             void Break( Args&... args ); // to be called by a working thread
         */
-            void IncrementActiveThreads();
-            void DecrementActiveThreads();
-
 
             // WARNING: This function resets the state of this class to a just-constructed state
             //          It is intended for use with testing when a single application might use it multiple times

From 048a6b7be77c058ddfb5a16ec91054a6efbb0d8e Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 21 Jan 2022 09:38:54 -0800
Subject: [PATCH 227/521] Add public access to the RunQueue object in
 ProcessorToolbox

---
 Library/Processor/ProcessorToolbox.hh | 46 +++++++++++++++------------
 Testing/TestProcessorToolbox.cc       | 22 +++++--------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 01fc3c5..5dc3214 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -77,6 +77,26 @@ namespace Nymph
     */
     class ProcessorToolbox
     {
+        public:
+            struct ThreadSource
+            {
+                PrimaryProcessor* fProc;
+                std::string fName;
+                //ControlAccessPtr fControlAccess;
+                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
+                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
+                {}
+            };
+            struct CompareThreadSource
+            {
+                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
+                {
+                    return lhs.fProc < rhs.fProc;
+                }
+            };
+            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroupT;
+            typedef std::deque< ThreadSourceGroupT > RunQueueT;
+
         protected:
             typedef std::unique_lock< std::mutex > unique_lock;
 
@@ -163,7 +183,6 @@ namespace Nymph
             bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
             static const char fSigSlotNameSep = ':';
 
-
         public:
             /// Push a single processor to the back of the run queue
             bool PushBackToRunQueue( const std::string& name );
@@ -179,28 +198,13 @@ namespace Nymph
             /// Clear the run queue
             void ClearRunQueue();
 
+            /// Const access to the run queue
+            const RunQueue& RunQueue() const;
+
         protected:
-            struct ThreadSource
-            {
-                PrimaryProcessor* fProc;
-                std::string fName;
-                //ControlAccessPtr fControlAccess;
-                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
-                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
-                {}
-            };
-            struct CompareThreadSource
-            {
-                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
-                {
-                    return lhs.fProc < rhs.fProc;
-                }
-            };
-            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroup;
-            typedef std::deque< ThreadSourceGroup > RunQueue;
-            RunQueue fRunQueue;
+            RunQueueT fRunQueue;
 
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group );
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group );
     };
 
     inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 0a684b8..74002c5 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -35,12 +35,6 @@ namespace Nymph
             {
                 return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
             }
-
-            using ProcessorToolbox::RunQueue;
-            RunQueue& GetRunQueue()
-            {
-                return fRunQueue;
-            }
     };
 }
 
@@ -175,21 +169,21 @@ TEST_CASE( "processor_toolbox" )
 
         REQUIRE_FALSE( toolbox.PushBackToRunQueue( "testproc-1" ) );
         REQUIRE( toolbox.PushBackToRunQueue( "testprimary-1" ) );
-        REQUIRE( toolbox.GetRunQueue().size() == 1 );
-        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
+        REQUIRE( toolbox.RunQueue().size() == 1 );
+        REQUIRE( toolbox.RunQueue().begin()[0].size() == 1 );
         REQUIRE( toolbox.PushBackToRunQueue( "testprimary-2" ) );
-        REQUIRE( toolbox.GetRunQueue().size() == 2 );
-        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
+        REQUIRE( toolbox.RunQueue().size() == 2 );
+        REQUIRE( toolbox.RunQueue().begin()[0].size() == 1 );
         
         toolbox.PopBackOfRunQueue();
-        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+        REQUIRE( toolbox.RunQueue().size() == 1 );
 
         toolbox.ClearRunQueue();
-        REQUIRE( toolbox.GetRunQueue().empty() );
+        REQUIRE( toolbox.RunQueue().empty() );
         
         REQUIRE( toolbox.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
-        REQUIRE( toolbox.GetRunQueue().size() == 1 );
-        REQUIRE( toolbox.GetRunQueue()[0].size() == 2 );
+        REQUIRE( toolbox.RunQueue().size() == 1 );
+        REQUIRE( toolbox.RunQueue()[0].size() == 2 );
 
     }
 

From 28e4142ce635e5b8fa131b98b529f57d36645af8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 21 Jan 2022 09:39:41 -0800
Subject: [PATCH 228/521] Simplify run start in SingleRunController, and use
 the processor toolbox to get the run queue

---
 Library/Control/SingleRunController.cc | 94 ++++++++++++--------------
 Library/Control/SingleRunController.hh |  6 +-
 2 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index ad46d4d..aaf44fc 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -31,64 +31,40 @@ namespace Nymph
 
     }
 
-    void SingleRunController::AsyncRun()
+    bool SingleRunController::Run( const ProcessorToolbox& procTB )
     {
-        if( fDoRunThread.joinable() )
-        {
-            LERROR( proclog, "It appears that a run has already been started" );
-            return;
-        }
+        // can throw scarab::base_exception
 
-        StartMultiThreadedRun();
+        StartMultiThreadedRun( procTB );
 
-        return;
+        WaitForEndOfRun();
+
+        JoinRunThread();
+
+        return true;
     }
 
-    void SingleRunController::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
+    void SingleRunController::StartMultiThreadedRun( const ProcessorToolbox& procTB )
     {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "Chain <" << name << "> is quitting" );
-        
-        if( ePtr )
+        if( fDoRunThread.joinable() )
         {
-            try
-            {
-                std::rethrow_exception( ePtr );
-            }
-            catch( const QuitChain& e )
-            {
-                // not necessarily an error, so don't set quitAfterThis to true
-                LINFO( contlog, "Chain <" << name << "> exited with QuitChain" );
-            }
-            catch( const scarab::base_exception& e )
-            {
-                // this is an error, so set quitAfterThis to true
-                LERROR( contlog, "Chain <" << name << "> exited with an exception" );
-                PrintException( e );
-                this->Cancel( RETURN_ERROR );
-            }
+            LERROR( proclog, "It appears that a run has already been started" );
+            return;
         }
 
-//        --fNActiveThreads;
-
-        return;
-    }
-
-    void SingleRunController::StartMultiThreadedRun()
-    {
         auto multiThreadRun = [&]()
         {
             try
             {
                 LPROG( proclog, "Starting multi-threaded processing" );
 
-                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                for (auto rqIter = procTB.RunQueue().begin(); rqIter != procTB.RunQueue().begin().end(); ++rqIter)
                 {
                     { // scope for mutex lock
                         std::unique_lock< std::mutex > lock( fMutex );
 
                         // iterate over primary processors in this group and launch threads
-                        for( ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter )
+                        for( auto tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter )
                         {
                             std::string procName( tgIter->fName );
                             LINFO( proclog, "Starting processor <" << procName << ">" );
@@ -213,6 +189,35 @@ namespace Nymph
         return;
     }
 
+    void SingleRunController::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "Chain <" << name << "> is quitting" );
+        
+        if( ePtr )
+        {
+            try
+            {
+                std::rethrow_exception( ePtr );
+            }
+            catch( const QuitChain& e )
+            {
+                // not necessarily an error, so don't set quitAfterThis to true
+                LINFO( contlog, "Chain <" << name << "> exited with QuitChain" );
+            }
+            catch( const scarab::base_exception& e )
+            {
+                // this is an error, so set quitAfterThis to true
+                LERROR( contlog, "Chain <" << name << "> exited with an exception" );
+                PrintException( e );
+                this->Cancel( RETURN_ERROR );
+            }
+        }
+
+//        --fNActiveThreads;
+
+        return;
+    }
 
    void SingleRunController::JoinRunThread()
    {
@@ -220,19 +225,6 @@ namespace Nymph
        return;
    }
 
-    bool SingleRunController::Run()
-    {
-        // can throw scarab::base_exception
-
-        AsyncRun();
-
-        WaitForEndOfRun();
-
-        JoinRunThread();
-
-        return true;
-    }
-
 
 
     void SharedControl::Reset()
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 9a3bbe5..1de347c 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -85,9 +85,7 @@ namespace Nymph
         public:
             /// Process the run queue.
             /// This will call Run() on all of the primary processors in the queue.
-            void Run();
-
-            void AsyncRun();
+            void Run( const ProcessorToolbox& procTB );
 
             void JoinRunThread();
 
@@ -99,7 +97,7 @@ namespace Nymph
 //            MEMVAR( unsigned, NActiveThreads );
 
         protected:
-            void StartMultiThreadedRun();
+            void StartMultiThreadedRun( const ProcessorToolbox& procTB );
 
             std::thread fDoRunThread;
 

From b94cdcbbcfbedad07c3d8365d88aca7eeb47b8ca Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 24 Jan 2022 13:28:53 -0800
Subject: [PATCH 229/521] Debugging controller setup and adding TestController

---
 Library/CMakeLists.txt                 |  10 +-
 Library/Control/ControlAccess.cc       |  29 ++--
 Library/Control/ControlAccess.hh       |   2 +-
 Library/Control/Controller.cc          |  31 ++---
 Library/Control/Controller.hh          |  37 +----
 Library/Control/ControllerInterface.cc |  19 +++
 Library/Control/ControllerInterface.hh |  54 +++++++
 Library/Control/SingleRunController.cc |  81 ++++++-----
 Library/Control/SingleRunController.hh |  16 ++-
 Library/Processor/PrimaryProcessor.cc  |  10 +-
 Library/Processor/ProcessorToolbox.cc  |   8 +-
 Library/Processor/ProcessorToolbox.hh  |   7 +-
 Library/Processor/Signal.hh            |   4 +-
 Testing/CMakeLists.txt                 |   1 +
 Testing/TestControlAccess.cc           |   3 +-
 Testing/TestController.cc              | 186 +++++++++++++++++++++++++
 Testing/TestControllerClasses.hh       |  36 +++++
 Testing/TestPrimaryProcessor.cc        |  16 +--
 Testing/TestProcessor.cc               |   4 +
 Testing/TestProcessorClasses.hh        |  22 ++-
 Testing/TestProcessorToolbox.cc        |   6 +-
 Testing/TestSignalSlot.cc              |   5 +
 22 files changed, 448 insertions(+), 139 deletions(-)
 create mode 100644 Library/Control/ControllerInterface.cc
 create mode 100644 Library/Control/ControllerInterface.hh
 create mode 100644 Testing/TestController.cc
 create mode 100644 Testing/TestControllerClasses.hh

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index d4562f9..ce67dfb 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -34,6 +34,7 @@ set( NYMPH_HEADERFILES
 
     ${CONT_DIR}/ControlAccess.hh
     ${CONT_DIR}/Controller.hh
+    ${CONT_DIR}/ControllerInterface.hh
     ${CONT_DIR}/ReturnBuffer.hh
     ${CONT_DIR}/SingleRunController.hh
 )
@@ -50,10 +51,11 @@ set( NYMPH_SOURCEFILES
     ${PROC_DIR}/SignalSlotBase.cc
 
 
-#    ${CONT_DIR}/ControlAccess.cc
-#    ${CONT_DIR}/Controller.cc
-#    ${CONT_DIR}/ReturnBuffer.cc
-#    ${CONT_DIR}/SingleRunController.cc
+    ${CONT_DIR}/ControlAccess.cc
+    ${CONT_DIR}/Controller.cc
+    ${CONT_DIR}/ControllerInterface.cc
+    ${CONT_DIR}/ReturnBuffer.cc
+    ${CONT_DIR}/SingleRunController.cc
 )
 
 
diff --git a/Library/Control/ControlAccess.cc b/Library/Control/ControlAccess.cc
index 2b314d6..8d0458f 100644
--- a/Library/Control/ControlAccess.cc
+++ b/Library/Control/ControlAccess.cc
@@ -18,7 +18,7 @@ namespace Nymph
             ControllerInterface(),
             fControl( nullptr )
     {
-        fControl = Controller::
+
     }
 
     ControlAccess::~ControlAccess()
@@ -26,51 +26,60 @@ namespace Nymph
 
     bool ControlAccess::WaitToContinue()
     {
-        return fControl->WaitToContinue();
+        if( fControl ) return fControl->WaitToContinue();
+        THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
     }
 
     bool ControlAccess::WaitForBreakOrCanceled()
     {
-        return fControl->WaitForBreakOrCanceled();
+        if( fControl ) return fControl->WaitForBreakOrCanceled();
+        THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
     }
 
     void ControlAccess::WaitForEndOfRun()
     {
-        fControl->WaitForEndOfRun();
+        if( fControl ) fControl->WaitForEndOfRun();
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
     }
 
     void ControlAccess::Continue()
     {
-        fControl->Continue();
+        if( fControl ) fControl->Continue();
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
     }
 
     void ControlAccess::Cancel( int code )
     {
-        fControl->Cancel( code );
+        if( fControl ) fControl->Cancel( code );
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
     }
 
     bool ControlAccess::IsCanceled() const
     {
-        return fControl->IsCanceled();
+        if( fControl ) return fControl->IsCanceled();
+        THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
     }
 
     void ControlAccess::Break()
     {
-        fControl->Break();
+        if( fControl ) fControl->Break();
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
     }
 
     bool ControlAccess::IsAtBreak() const
     {
-        return fControl->IsAtBreak();
+        if( fControl ) return fControl->IsAtBreak();
+        THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
     }
 
     void ControlAccess::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
-        fControl->ChainIsQuitting( name, ePtr );
+        if( fControl ) fControl->ChainIsQuitting( name, ePtr );
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
     }
 
diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index 8dc438e..77f62d0 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -56,7 +56,7 @@ namespace Nymph
             /// Notify the control that a chain is quitting
             virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
-            MEMVAR_PTR( ControllerInterface, Control );
+            MEMVAR( ControllerInterface*, Control );
 
     };
 
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index 513513e..77119a0 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -7,6 +7,8 @@
 
 #include "Controller.hh"
 
+#include "ControlAccess.hh"
+#include "Exception.hh"
 #include "QuitChain.hh"
 
 #include "logger.hh"
@@ -16,13 +18,6 @@ namespace Nymph
 {
     LOGGER( contlog, "Controller" );
 
-    ControllerInterface::ControllerInterface()
-    {}
-
-    ControllerInterface::~ControllerInterface()
-    {}
-
-
     Controller::Controller() :
             ControllerInterface(),
             scarab::cancelable(),
@@ -31,29 +26,31 @@ namespace Nymph
             fCondVarBreak(),
             fBreakFlag( false ),
             fCycleTimeMS( 500 )
-    {}
+    {
+        ControlAccess::get_instance()->SetControl( this );
+    }
 
     Controller::~Controller()
     {}
 
-    bool Controller::WaitForBreakOrCanceled()
+    bool Controller::WaitToContinue()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! is_canceled() )
+        while( fBreakFlag && ! is_canceled() )
         {
-            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
-        return is_canceled() ? false : fBreakFlag; // returns true if the thread should continue; false if it should end
+        return ! is_canceled(); // returns true if the thread should continue; false if it should end
     }
 
-    bool Controller::WaitToContinue()
+    bool Controller::WaitForBreakOrCanceled()
     {
         std::unique_lock< std::mutex > lock( fMutex );
-        while( fBreakFlag && ! is_canceled() )
+        while( ! fBreakFlag && ! is_canceled() )
         {
-            fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
         }
-        return ! is_canceled(); // returns true if the thread should continue; false if it should end
+        return is_canceled() ? false : fBreakFlag; // returns true if the thread should continue; false if it should end
     }
 
     void Controller::WaitForEndOfRun()
@@ -114,7 +111,6 @@ namespace Nymph
 
     void Controller::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
-        std::unique_lock< std::mutex > lock( fMutex );
         LDEBUG( contlog, "Chain <" << name << "> is quitting" );
 
         if( ePtr )
@@ -144,7 +140,6 @@ namespace Nymph
     {
         std::unique_lock< std::mutex > lock( fMutex );
         LDEBUG( contlog, "CANCEL called" );
-        f_canceled.store( true );
         fCondVarBreak.notify_all();
         return;
     }
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index 013cb01..94bbfb7 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -8,6 +8,8 @@
 #ifndef NYMPH_CONTROLLER_HH_
 #define NYMPH_CONTROLLER_HH_
 
+#include "ControllerInterface.hh"
+
 #include "MemberVariable.hh"
 
 #include "cancelable.hh"
@@ -18,41 +20,6 @@
 namespace Nymph
 {
 
-    class ControllerInterface
-    {
-        public:
-            ControllerInterface();
-            virtual ~ControllerInterface();
-
-            virtual bool WaitToContinue() = 0;
-
-            /// Returns when processing is completed or a breakpoint is reached
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            virtual bool WaitForBreakOrCanceled() = 0;
-
-            /// Use this to have a thread wait for the end of a run
-            virtual void WaitForEndOfRun() = 0;
-
-            /// Instruct the Controller to continue after a breakpoint
-            virtual void Continue() = 0;
-
-            /// Cancel all threads and end the run
-            virtual void Cancel( int code = 0 ) = 0;
-
-            /// Reports whether controls is canceled
-            virtual bool IsCanceled() const = 0;
-
-            /// Initiate a break
-            virtual void Break() = 0;
-
-            /// Reports whether control is at a breakpoint
-            virtual bool IsAtBreak() const = 0;
-
-            /// Notify the control that a chain is quitting
-            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr ) = 0;
-    };
-
     class Controller : public ControllerInterface, public scarab::cancelable
     {
         public:
diff --git a/Library/Control/ControllerInterface.cc b/Library/Control/ControllerInterface.cc
new file mode 100644
index 0000000..075718a
--- /dev/null
+++ b/Library/Control/ControllerInterface.cc
@@ -0,0 +1,19 @@
+/*
+ * ControllerInterface.cc
+ *
+ *  Created on: Jan 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "ControllerInterface.hh"
+
+namespace Nymph
+{
+    ControllerInterface::ControllerInterface()
+    {}
+
+    ControllerInterface::~ControllerInterface()
+    {}
+
+
+} /* namespace Nymph */
diff --git a/Library/Control/ControllerInterface.hh b/Library/Control/ControllerInterface.hh
new file mode 100644
index 0000000..40cdfe5
--- /dev/null
+++ b/Library/Control/ControllerInterface.hh
@@ -0,0 +1,54 @@
+/*
+ * ControllerInterface.hh
+ *
+ *  Created on: Jan 24, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_CONTROLLERINTERFACE_HH_
+#define NYMPH_CONTROLLERINTERFACE_HH_
+
+#include <exception>
+#include <string>
+
+namespace Nymph
+{
+
+    class ControllerInterface
+    {
+        public:
+            ControllerInterface();
+            virtual ~ControllerInterface();
+
+            virtual bool WaitToContinue() = 0;
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            virtual bool WaitForBreakOrCanceled() = 0;
+
+            /// Use this to have a thread wait for the end of a run
+            virtual void WaitForEndOfRun() = 0;
+
+            /// Instruct the Controller to continue after a breakpoint
+            virtual void Continue() = 0;
+
+            /// Cancel all threads and end the run
+            virtual void Cancel( int code = 0 ) = 0;
+
+            /// Reports whether controls is canceled
+            virtual bool IsCanceled() const = 0;
+
+            /// Initiate a break
+            virtual void Break() = 0;
+
+            /// Reports whether control is at a breakpoint
+            virtual bool IsAtBreak() const = 0;
+
+            /// Notify the control that a chain is quitting
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr ) = 0;
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_CONTROLLERINTERFACE_HH_ */
diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index aaf44fc..378e499 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -7,7 +7,13 @@
 
 #include "SingleRunController.hh"
 
+#include "ControlAccess.hh"
+#include "PrimaryProcessor.hh"
+#include "ProcessorToolbox.hh"
+#include "QuitChain.hh"
+
 #include "logger.hh"
+#include "param.hh"
 
 namespace Nymph
 {
@@ -26,12 +32,12 @@ namespace Nymph
 
     void SingleRunController::Configure( const scarab::param_node& node )
     {
-        LPROG( proclog, "Configuring run control" );
+        LPROG( contlog, "Configuring run control" );
 
 
     }
 
-    bool SingleRunController::Run( const ProcessorToolbox& procTB )
+    void SingleRunController::Run( const ProcessorToolbox& procTB )
     {
         // can throw scarab::base_exception
 
@@ -41,14 +47,20 @@ namespace Nymph
 
         JoinRunThread();
 
-        return true;
+        return;
     }
 
     void SingleRunController::StartMultiThreadedRun( const ProcessorToolbox& procTB )
     {
         if( fDoRunThread.joinable() )
         {
-            LERROR( proclog, "It appears that a run has already been started" );
+            LERROR( contlog, "It appears that a run has already been started" );
+            return;
+        }
+
+        if( fChainThreads.empty() )
+        {
+            LERROR( contlog, "Chain threads map is not empty; cannot start new threads" );
             return;
         }
 
@@ -56,9 +68,9 @@ namespace Nymph
         {
             try
             {
-                LPROG( proclog, "Starting multi-threaded processing" );
+                LPROG( contlog, "Starting multi-threaded processing" );
 
-                for (auto rqIter = procTB.RunQueue().begin(); rqIter != procTB.RunQueue().begin().end(); ++rqIter)
+                for (auto rqIter = procTB.RunQueue().begin(); rqIter != procTB.RunQueue().end(); ++rqIter)
                 {
                     { // scope for mutex lock
                         std::unique_lock< std::mutex > lock( fMutex );
@@ -67,7 +79,7 @@ namespace Nymph
                         for( auto tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter )
                         {
                             std::string procName( tgIter->fName );
-                            LINFO( proclog, "Starting processor <" << procName << ">" );
+                            LINFO( contlog, "Starting processor <" << procName << ">" );
 
                             fChainThreads.emplace( 
                                 procName, 
@@ -85,24 +97,24 @@ namespace Nymph
                     bool stillRunning = true;
                     while( stillRunning )
                     {
-                        bool breakOrCanceled = control->WaitForBreakOrCanceled();
+                        bool breakOrCanceled = ControlAccess::get_instance()->WaitForBreakOrCanceled();
                         if( breakOrCanceled )
                         {
                             // then at a breakpoint
                             stillRunning = true;
-                            LDEBUG( proclog, "At a breakpoint" );
+                            LDEBUG( contlog, "At a breakpoint" );
                             // TODO: do we need to do anything while at a breakpoint?
-                            if( ! control->WaitToContinue() )
+                            if( ! ControlAccess::get_instance()->WaitToContinue() )
                             {
                                 stillRunning = false;
-                                LDEBUG( proclog, "Detected cancelation while waiting at breakpoint" );
+                                LDEBUG( contlog, "Detected cancelation while waiting at breakpoint" );
                             }
                         }
                         else
                         {
                             // then canceled
                             stillRunning = false;
-                            LDEBUG( proclog, "Detected cancelation while waiting during running" );
+                            LDEBUG( contlog, "Detected cancelation while waiting during running" );
                         }
                     }
 
@@ -111,9 +123,9 @@ namespace Nymph
                     // join threads and check for exceptions
                     // break out of the run-queue iteration loop if there was an exception
                     bool quitAfterThis = is_canceled();
-                    for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
+                    for( auto threadIt = fChainThreads.begin(); threadIt != fChainThreads.end(); ++threadIt )
                     {
-                        LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
+                        LINFO( contlog, "Cleaning up thread for processor <" << threadIt->first << ">" )
 
                         std::thread thread( std::move(std::get<1>( threadIt->second )) );
                         if( ! thread.joinable() )
@@ -122,7 +134,7 @@ namespace Nymph
                         }
                         else
                         {
-                            LDEBUG( proclog, "Joining thread, ID = " << thread.thread_id() );
+                            LDEBUG( contlog, "Joining thread, ID = " << thread.get_id() );
                             thread.join();
                         }
 
@@ -133,15 +145,15 @@ namespace Nymph
                             {
                                 std::rethrow_exception( exPtr );
                             }
-                            catch( const QuitThread& e )
+                            catch( const QuitChain& e )
                             {
                                 // not necessarily an error, so don't set quitAfterThis to true
-                                LINFO( proclog, "Thread had exited with QuitThread" );
+                                LINFO( contlog, "Thread had exited with QuitChain" );
                             }
                             catch( const scarab::base_exception& e )
                             {
                                 // this is an error, so set quitAfterThis to true
-                                LERROR( proclog, "Thread had exited with an exception" );
+                                LERROR( contlog, "Thread had exited with an exception" );
                                 PrintException( e );
                                 quitAfterThis = true;
                             }
@@ -149,13 +161,16 @@ namespace Nymph
                         else
                         {
                             // this thread did not have an exeption set, so it exited normally
-                            LINFO( proclog, "Thread had exited normally" )
+                            LINFO( contlog, "Thread had exited normally" )
                         }
+
                     }
 
+                    fChainThreads.clear();
+
                     if( quitAfterThis )
                     {
-                        LWARN( proclog, "Exiting from run-queue loop under abnormal conditions" );
+                        LWARN( contlog, "Exiting from run-queue loop under abnormal conditions" );
                         break;
                     }
 
@@ -164,22 +179,22 @@ namespace Nymph
                 // we have to cancel on success to make sure anything waiting on the control in some way finishes up
                 this->Cancel( RETURN_SUCCESS );
 
-                LPROG( proclog, "Processing is complete" );
+                LPROG( contlog, "Processing is complete" );
             }
             catch( scarab::base_exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
-                LERROR( proclog, "Diagnostic Information:\n" );
+                LERROR( contlog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
+                LERROR( contlog, "Diagnostic Information:\n" );
                 PrintException( e );
-                SharedControl::get_instance()->Cancel();
+                ControlAccess::get_instance()->Cancel();
                 return;
             }
             catch( std::exception& e )
             {
                 // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                SharedControl::get_instance()->Cancel();
+                LERROR( contlog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                ControlAccess::get_instance()->Cancel();
                 return;
             }
             return;
@@ -191,7 +206,6 @@ namespace Nymph
 
     void SingleRunController::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
-        std::unique_lock< std::mutex > lock( fMutex );
         LDEBUG( contlog, "Chain <" << name << "> is quitting" );
         
         if( ePtr )
@@ -219,14 +233,11 @@ namespace Nymph
         return;
     }
 
-   void SingleRunController::JoinRunThread()
-   {
-       fDoRunThread.join();
-       return;
-   }
-
-
+//    void SingleRunController::do_cancellation( int code )
+//    {
+//    }
 
+/*
     void SharedControl::Reset()
     {
         std::unique_lock< std::mutex > lock( fMutex );
@@ -237,7 +248,7 @@ namespace Nymph
 //        fNActiveThreads = 0;
         return;
     }
-
+*/
 
 
 
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 1de347c..0e8ac19 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -11,18 +11,19 @@
 
 #include "Controller.hh"
 
-#include "ControlAccess.hh"
-#include "ProcessorToolbox.hh"
-
 #include <map>
 #include <thread>
 #include <tuple>
 
+namespace scarab
+{
+    class param_node;
+}
 
 namespace Nymph
 {
     class PrimaryProcessor;
-    class Processor;
+    class ProcessorToolbox;
 
     /*!
      @class ProcessorToolbox
@@ -104,7 +105,7 @@ namespace Nymph
             typedef std::tuple< PrimaryProcessor*, std::thread, std::exception_ptr > ThreadBundle;
             std::map< std::string, ThreadBundle > fChainThreads;
 
-            void do_cancellation( int code );
+//            void do_cancellation( int code );
 
         public:
         /*
@@ -121,6 +122,11 @@ namespace Nymph
 
     };
 
+   inline void SingleRunController::JoinRunThread()
+    {
+        fDoRunThread.join();
+        return;
+    }
 
 
 } /* namespace Nymph */
diff --git a/Library/Processor/PrimaryProcessor.cc b/Library/Processor/PrimaryProcessor.cc
index 83b4034..9f89d8d 100644
--- a/Library/Processor/PrimaryProcessor.cc
+++ b/Library/Processor/PrimaryProcessor.cc
@@ -7,7 +7,7 @@
 
 #include "PrimaryProcessor.hh"
 
-//#include "ControlAccess.hh"
+#include "ControlAccess.hh"
 #include "QuitChain.hh"
 
 #include "logger.hh"
@@ -34,20 +34,18 @@ namespace Nymph
         catch( const QuitChain& e )
         {
             LINFO( proclog, "Processor chain started by <" << fName << "> is quitting" );
-            fExceptionPtr = std::current_exception(); // capture the exception
-            ControlAccess::get_instance()->ChainQuitting( fName, fExceptionPtr );
+            ControlAccess::get_instance()->ChainIsQuitting( fName, std::current_exception() );
             return;
         }
         catch( const std::exception& e )
         {
             LERROR( proclog, "An error occurred during processor running: " << e.what() );
-            fExceptionPtr = std::current_exception(); // capture the exception
-            ControlAccess::get_instance()->ChainQuitting( fName, fExceptionPtr );
+            ControlAccess::get_instance()->ChainIsQuitting( fName, std::current_exception() );
             return;
         }
 
         LWARN( proclog, "Valid return" );
-        ControlAccess::get_instance()->ChainQuitting( fName );
+        ControlAccess::get_instance()->ChainIsQuitting( fName );
 
         return;
     }
diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index f126d9d..740a543 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -8,7 +8,7 @@
 #include "ProcessorToolbox.hh"
 
 #include "PrimaryProcessor.hh"
-#include "QuitThread.hh"
+#include "QuitChain.hh"
 
 #include "factory.hh"
 #include "logger.hh"
@@ -492,7 +492,7 @@ namespace Nymph
 
     bool ProcessorToolbox::PushBackToRunQueue( const std::string& name )
     {
-        ThreadSourceGroup threadGroup;
+        ThreadSourceGroupT threadGroup;
 
         if( ! AddProcessorToThreadGroup( name, threadGroup ) )
         {
@@ -513,7 +513,7 @@ namespace Nymph
 
     bool ProcessorToolbox::PushBackToRunQueue( std::vector< std::string > names )
     {
-        ThreadSourceGroup threadGroup;
+        ThreadSourceGroupT threadGroup;
 
         std::stringstream toPrint;
         for( const std::string& name : names )
@@ -533,7 +533,7 @@ namespace Nymph
         return true;
     }
 
-    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
+    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
     {
         std::shared_ptr< Processor > procForRunQueue = GetProcessor( name );
         LDEBUG( proclog, "Attempting to add processor <" << name << "> to the run queue" );
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 5dc3214..696e49d 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -199,7 +199,7 @@ namespace Nymph
             void ClearRunQueue();
 
             /// Const access to the run queue
-            const RunQueue& RunQueue() const;
+            const RunQueueT& RunQueue() const;
 
         protected:
             RunQueueT fRunQueue;
@@ -229,5 +229,10 @@ namespace Nymph
         return;
     }
 
+    inline const ProcessorToolbox::RunQueueT& ProcessorToolbox::RunQueue() const
+    {
+        return fRunQueue;
+    }
+
 } /* namespace Nymph */
 #endif /* NYMPH_PROCESSORTOOLBOX_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index abeb575..21ded79 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -13,7 +13,7 @@
 #include "SignalSlotBase.hh"
 
 #include "ControlAccess.hh"
-#include "QuitThread.hh"
+#include "QuitChain.hh"
 
 #include "logger.hh"
 
@@ -182,7 +182,7 @@ namespace Nymph
         // - if we're canceled, then quit the thread
         // - if we're at a break, then wait to continue;
         //     once we continue, if we need to quit, then do so
-        if( control->is_canceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
+        if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
         {
             QUIT_CHAIN; // throws QuitThread; should be caught by PrimaryProcessor::operator()
         }
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index e3a8b38..c8425b6 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -14,6 +14,7 @@ set( testing_HEADERS
 
 set( testing_SOURCES
 #    TestControlAccess.cc
+    TestController.cc
     TestData.cc
     TestDataFrame.cc
     TestException.cc
diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
index 215981b..3ba2dd5 100644
--- a/Testing/TestControlAccess.cc
+++ b/Testing/TestControlAccess.cc
@@ -12,7 +12,7 @@
 
 #include "catch.hpp"
 
-
+/*
 TEST_CASE( "control_access", "[control_access]" )
 {
     using namespace Nymph;
@@ -41,6 +41,7 @@ TEST_CASE( "control_access", "[control_access]" )
         REQUIRE( std::get< 0 >(control.GetReturn< int, double >()) == return1 );
         REQUIRE( std::get< 1 >(control.GetReturn< int, double >()) == return2 );
     }
+*/
 
     SECTION( "Break" )
     {
diff --git a/Testing/TestController.cc b/Testing/TestController.cc
new file mode 100644
index 0000000..01144d3
--- /dev/null
+++ b/Testing/TestController.cc
@@ -0,0 +1,186 @@
+/*
+ * TestController.cc
+ *
+ *  Created on: Jan 21, 2022
+ *      Author: N.S. Oblath
+ */
+
+
+#include "Controller.hh"
+
+#include "Exception.hh"
+#include "QuitChain.hh"
+
+#include <thread>
+
+#include "catch.hpp"
+
+namespace Nymph
+{
+    class ControllerRevealer : public Controller
+    {
+        public:
+            using Controller::Controller;
+            virtual ~ControllerRevealer() {}
+
+            void SetBreakFlag( bool flag )
+            {
+                fBreakFlag = flag;
+                return;
+            }
+
+            void SetCanceled( bool flag )
+            {
+                f_canceled.store( flag );
+                return;
+            }
+
+            void do_cancellation( int code )
+            {
+                Controller::do_cancellation( code );
+                return;
+            }
+    };
+}
+
+// unit tests
+TEST_CASE( "controller", "[control]" )
+{
+    using namespace Nymph;
+
+    ControllerRevealer control;
+
+    SECTION( "Basics" )
+    {
+        REQUIRE_NOTHROW( control.Mutex().lock() );
+        REQUIRE_NOTHROW( control.Mutex().unlock() );
+
+        REQUIRE_FALSE( control.GetBreakFlag() );
+
+        control.SetCycleTimeMS( 100 );
+        REQUIRE( control.GetCycleTimeMS() == 100 );
+        control.SetCycleTimeMS( 500 );
+
+        REQUIRE_FALSE( control.IsCanceled() );
+        control.Cancel( 5 );
+        REQUIRE( control.IsCanceled() );
+    }
+
+    SECTION( "WaitToContinue" )
+    {
+        control.SetCanceled( false );
+        control.SetBreakFlag( false );
+        REQUIRE( control.WaitToContinue() );
+
+        control.SetBreakFlag( true );
+        control.SetCanceled( true );
+        REQUIRE_FALSE( control.WaitToContinue() );    
+
+        // TODO: test with fBreakFlag==true && cancelled==false requires a thread
+    }
+
+    SECTION( "WaitForBreakOrCanceled" )
+    {
+        control.SetCanceled( false );
+        control.SetBreakFlag( true );
+        REQUIRE( control.WaitForBreakOrCanceled() == control.GetBreakFlag() );
+
+        control.SetCanceled( true );
+        control.SetBreakFlag( false );
+        REQUIRE_FALSE( control.WaitForBreakOrCanceled() );
+
+
+    }
+
+    SECTION( "BreakContinue" )
+    {
+
+    }
+
+    SECTION( "ChainIsQuitting" )
+    {
+        // As if an error is thrown
+        std::exception_ptr exceptPtr = std::make_exception_ptr( Exception() << "Test: ChainIsQuitting, throwing Exception" );
+        REQUIRE_NOTHROW( control.ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
+
+        control.reset_cancel();
+
+        // As if QuitChain is thrown
+        std::exception_ptr qcPtr = std::make_exception_ptr( QuitChain() << "Test: ChainIsQuitting, throwing QuitChain" );
+        REQUIRE_NOTHROW( control.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", qcPtr ) );
+
+        control.reset_cancel();
+
+        // As if std::runtime_error is thrown; not handled by ChainIsQuitting()
+        std::exception_ptr runtimePtr = std::make_exception_ptr( std::runtime_error("Test: ChainIsQuitting, throwing std::runtime_error") );
+        REQUIRE_THROWS_AS( control.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", runtimePtr ), std::runtime_error );
+
+    }
+
+/*
+                virtual bool WaitToContinue();
+
+            /// Use this to wait for a breakpoint to be reached or for cancellation
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            virtual bool WaitForBreakOrCanceled();
+
+            /// Use this to have a thread wait for the end of a run
+            virtual void WaitForEndOfRun();
+
+            /// Instruct the Controller to continue after a breakpoint
+            virtual void Continue();
+
+            /// Cancel all threads and end the run
+            virtual void Cancel( int code = 0 );
+
+            /// Reports whether controls is canceled
+            virtual bool IsCanceled() const;
+
+            /// Inititate a break
+            virtual void Break();
+
+            /// Reports whether control is at a breakpoint
+            virtual bool IsAtBreak() const;
+
+            /// Notify the control that a chain is quitting
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
+
+            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
+            MEMVAR_NOSET( bool, BreakFlag );
+            MEMVAR( unsigned, CycleTimeMS );
+            //MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
+*/
+}
+
+/*
+TEST_CASE( "controller", "[control]" )
+{
+    using namespace Nymph;
+
+    Controller control;
+
+    SECTION( "Break" )
+    {
+        REQUIRE_FALSE( control.GetBreakFlag() );
+
+        std::thread thread( [&](){ 
+            control.Break();
+        } );
+        
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+        REQUIRE( control.GetBreakFlag() );
+
+        control.Continue();
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+        REQUIRE_FALSE( control.GetBreakFlag() );
+
+        thread.join();
+
+        REQUIRE_FALSE( control.GetBreakFlag() );
+    }
+
+}
+*/
\ No newline at end of file
diff --git a/Testing/TestControllerClasses.hh b/Testing/TestControllerClasses.hh
new file mode 100644
index 0000000..4c410e7
--- /dev/null
+++ b/Testing/TestControllerClasses.hh
@@ -0,0 +1,36 @@
+/*
+ * TestControllerClasses.hh
+ *
+ *  Created on: Jan 24, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_TESTING_TESTCONTROLLERCLASSES
+#define NYMPH_TESTING_TESTCONTROLLERCLASSES
+
+#include "Controller.hh"
+
+namespace Nymph
+{
+
+    class CIQThrowController : public Controller
+    {
+
+        public:
+            using Controller::Controller;
+            virtual ~CIQThrowController() {}
+
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() )
+            {
+                if( ePtr )
+                {
+                    std::rethrow_exception( ePtr );
+                }
+                return;
+            }
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_TESTING_TESTCONTROLLERCLASSES */
diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/TestPrimaryProcessor.cc
index 5c1b3a2..6560989 100644
--- a/Testing/TestPrimaryProcessor.cc
+++ b/Testing/TestPrimaryProcessor.cc
@@ -5,6 +5,7 @@
  *      Author: N.S. Oblath
  */
 
+#include "TestControllerClasses.hh"
 #include "TestProcessorClasses.hh"
 
 #include "logger.hh"
@@ -23,7 +24,7 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
     //SharedControl::get_instance()->Reset();
 
     TestPrimaryProc tester;
-    REQUIRE_FALSE( tester.ExceptionPtr() );
+    CIQThrowController controller;
 
     // SignalNewValue test
     tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
@@ -37,17 +38,8 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
 
     // ThrowExcept test
     tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
-    REQUIRE_NOTHROW( tester() ); // the exception should be caught by operator() and stored as the exception ptr
-    REQUIRE( tester.ExceptionPtr() ); // the exception ptr should now be set
-    try
-    {
-        std::rethrow_exception( tester.ExceptionPtr() );
-    }
-    catch( const scarab::base_exception& e )
-    {
-        PrintException( e );
-        REQUIRE( std::string(e.what()) == std::string("PrimaryProcessor test function: throw Exception") );
-    }
+    REQUIRE_THROWS_AS( tester(), TestPPException );
+
     
     
 
diff --git a/Testing/TestProcessor.cc b/Testing/TestProcessor.cc
index 3532a8f..ba2e2f4 100644
--- a/Testing/TestProcessor.cc
+++ b/Testing/TestProcessor.cc
@@ -5,6 +5,7 @@
  *      Author: N.S. Oblath
  */
 
+#include "TestControllerClasses.hh"
 #include "TestProcessorClasses.hh"
 
 #include "logger.hh"
@@ -20,6 +21,9 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
 {
     using namespace Nymph;
 
+    // need a controller to exist
+    CIQThrowController controller;
+
     //SharedControl::get_instance()->Reset();
 
     TestProc tester;
diff --git a/Testing/TestProcessorClasses.hh b/Testing/TestProcessorClasses.hh
index 313d0d7..8849853 100644
--- a/Testing/TestProcessorClasses.hh
+++ b/Testing/TestProcessorClasses.hh
@@ -7,6 +7,7 @@
 
 #include "PrimaryProcessor.hh"
 #include "Processor.hh"
+#include "QuitChain.hh"
 #include "Signal.hh"
 #include "Slot.hh"
 
@@ -83,6 +84,14 @@ namespace Nymph
     };
 
 
+    class TestPPException : public scarab::typed_exception< TestPPException >
+    {
+        public:
+            using scarab::typed_exception< TestPPException >::typed_exception;
+            ~TestPPException() = default;
+    };
+
+
     // concrete primary processor class that we can test
     // implements Configure(), Run(), and has its own signal and slot
     class TestPrimaryProc : public PrimaryProcessor
@@ -92,7 +101,8 @@ namespace Nymph
             {
                 SignalNewValue,
                 WaitTwoSec,
-                ThrowExcept
+                ThrowExcept,
+                QuitChain
             };
 
             TestPrimaryProc( const std::string& name = "test" ) :
@@ -137,6 +147,9 @@ namespace Nymph
                     case TestType::ThrowExcept:
                         TestThrowExcept();
                         return;
+                    case TestType::QuitChain:
+                        TestQuitChain();
+                        return;
                     default:
                         LERROR( testprocclasses_h_log, "Invalid test choice" );
                         THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
@@ -158,10 +171,15 @@ namespace Nymph
 
             void TestThrowExcept()
             {
-                THROW_EXCEPT_HERE( Exception() << "PrimaryProcessor test function: throw Exception" );
+                THROW_EXCEPT_HERE( TestPPException() << "PrimaryProcessor test function: throw Exception" );
                 return;
             }
 
+            void TestQuitChain()
+            {
+                QUIT_CHAIN;
+            }
+
             MEMVAR( TestType, TestSelection );
 
             MEMVAR( int, NewValue );
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 74002c5..4c230e3 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -30,8 +30,8 @@ namespace Nymph
             }
 
             using ProcessorToolbox::ThreadSource;
-            using ProcessorToolbox::ThreadSourceGroup;
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
+            using ProcessorToolbox::ThreadSourceGroupT;
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
             {
                 return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
             }
@@ -161,7 +161,7 @@ TEST_CASE( "processor_toolbox" )
 
         REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
 
-        ProcTBRevealer::ThreadSourceGroup group;
+        ProcTBRevealer::ThreadSourceGroupT group;
         REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
         REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "testproc-1", group ) );
         REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary-1", group ) );
diff --git a/Testing/TestSignalSlot.cc b/Testing/TestSignalSlot.cc
index dabb39b..81a159a 100644
--- a/Testing/TestSignalSlot.cc
+++ b/Testing/TestSignalSlot.cc
@@ -8,6 +8,8 @@
 #include "Signal.hh"
 #include "Slot.hh"
 
+#include "TestControllerClasses.hh"
+
 #include "catch.hpp"
 
 
@@ -15,6 +17,9 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
 {
     using namespace Nymph;
 
+    // need a controller to exist
+    CIQThrowController controller;
+
     int testValue = 0;
 
     Signal< int > signal( "signal" );

From ff15c27fd2fc2f6cf63ffe16bbe0c6bf31b5b550 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 24 Jan 2022 13:48:11 -0800
Subject: [PATCH 230/521] Completing TestController

---
 Testing/TestController.cc | 102 +++++++++++++-------------------------
 1 file changed, 34 insertions(+), 68 deletions(-)

diff --git a/Testing/TestController.cc b/Testing/TestController.cc
index 01144d3..01363c2 100644
--- a/Testing/TestController.cc
+++ b/Testing/TestController.cc
@@ -94,6 +94,40 @@ TEST_CASE( "controller", "[control]" )
 
     SECTION( "BreakContinue" )
     {
+        REQUIRE_FALSE( control.GetBreakFlag() );
+        REQUIRE_FALSE( control.IsCanceled() );
+
+        // This thread will do the breaking and continuing
+        std::thread thread( [&](){ 
+            std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
+
+            control.Break(); // step 1
+
+            std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
+
+            control.Continue(); // step 2
+
+            std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
+
+            control.Cancel( 0 ); // step 3
+        } );
+        
+        // Waiting for break (step 1)
+        REQUIRE( control.WaitForBreakOrCanceled() );
+        REQUIRE( control.GetBreakFlag() );
+        REQUIRE_FALSE( control.IsCanceled() );
+
+        // Waiting for continue (step 2)
+        control.WaitToContinue();
+        REQUIRE_FALSE( control.GetBreakFlag() );
+        REQUIRE_FALSE( control.IsCanceled() );
+
+        // Waiting for cancelation (step 3)
+        REQUIRE_FALSE( control.WaitForBreakOrCanceled() );
+        REQUIRE_FALSE( control.GetBreakFlag() );
+        REQUIRE( control.IsCanceled() );
+
+        thread.join();
 
     }
 
@@ -116,71 +150,3 @@ TEST_CASE( "controller", "[control]" )
         REQUIRE_THROWS_AS( control.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", runtimePtr ), std::runtime_error );
 
     }
-
-/*
-                virtual bool WaitToContinue();
-
-            /// Use this to wait for a breakpoint to be reached or for cancellation
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            virtual bool WaitForBreakOrCanceled();
-
-            /// Use this to have a thread wait for the end of a run
-            virtual void WaitForEndOfRun();
-
-            /// Instruct the Controller to continue after a breakpoint
-            virtual void Continue();
-
-            /// Cancel all threads and end the run
-            virtual void Cancel( int code = 0 );
-
-            /// Reports whether controls is canceled
-            virtual bool IsCanceled() const;
-
-            /// Inititate a break
-            virtual void Break();
-
-            /// Reports whether control is at a breakpoint
-            virtual bool IsAtBreak() const;
-
-            /// Notify the control that a chain is quitting
-            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
-
-            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
-            MEMVAR_NOSET( bool, BreakFlag );
-            MEMVAR( unsigned, CycleTimeMS );
-            //MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
-*/
-}
-
-/*
-TEST_CASE( "controller", "[control]" )
-{
-    using namespace Nymph;
-
-    Controller control;
-
-    SECTION( "Break" )
-    {
-        REQUIRE_FALSE( control.GetBreakFlag() );
-
-        std::thread thread( [&](){ 
-            control.Break();
-        } );
-        
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE( control.GetBreakFlag() );
-
-        control.Continue();
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE_FALSE( control.GetBreakFlag() );
-
-        thread.join();
-
-        REQUIRE_FALSE( control.GetBreakFlag() );
-    }
-
-}
-*/
\ No newline at end of file

From 08298d200718b7a627fca30185009bc47f28bba3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 24 Jan 2022 13:54:02 -0800
Subject: [PATCH 231/521] Somehow missing this closing bracket

---
 Testing/TestController.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Testing/TestController.cc b/Testing/TestController.cc
index 01363c2..a9cb537 100644
--- a/Testing/TestController.cc
+++ b/Testing/TestController.cc
@@ -150,3 +150,5 @@ TEST_CASE( "controller", "[control]" )
         REQUIRE_THROWS_AS( control.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", runtimePtr ), std::runtime_error );
 
     }
+
+}

From e76b01e72f033666efb83e910ba7a5f964f3b82d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 24 Jan 2022 16:35:54 -0800
Subject: [PATCH 232/521] Fixing logic for finishing runs

---
 Library/Control/SingleRunController.cc | 39 ++++++++------------------
 Library/Control/SingleRunController.hh |  2 +-
 Testing/CMakeLists.txt                 |  2 +-
 Testing/TestSingleRunController.cc     | 10 ++++---
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index 378e499..adc60a4 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -20,7 +20,7 @@ namespace Nymph
     LOGGER( contlog, "SingleRunController");
 
     SingleRunController::SingleRunController( const std::string& name ) :
-    //        fNActiveThreads( 0 ),
+            fNActiveThreads( 0 ),
             fDoRunThread(),
             fChainThreads()
     {
@@ -43,9 +43,12 @@ namespace Nymph
 
         StartMultiThreadedRun( procTB );
 
-        WaitForEndOfRun();
+        if( fDoRunThread.joinable() ) 
+        {
+            WaitForEndOfRun();
 
-        JoinRunThread();
+            JoinRunThread();
+        }
 
         return;
     }
@@ -58,7 +61,7 @@ namespace Nymph
             return;
         }
 
-        if( fChainThreads.empty() )
+        if( ! fChainThreads.empty() )
         {
             LERROR( contlog, "Chain threads map is not empty; cannot start new threads" );
             return;
@@ -89,33 +92,15 @@ namespace Nymph
                                     std::exception_ptr() 
                                 ) 
                             );
-//                            ++fNActiveThreads;
+                            ++fNActiveThreads;
                         }// end for loop over the thread group
                     }
 
                     // wait here while things are still running
-                    bool stillRunning = true;
-                    while( stillRunning )
+                    while( ! is_canceled() && fNActiveThreads > 0 )
                     {
-                        bool breakOrCanceled = ControlAccess::get_instance()->WaitForBreakOrCanceled();
-                        if( breakOrCanceled )
-                        {
-                            // then at a breakpoint
-                            stillRunning = true;
-                            LDEBUG( contlog, "At a breakpoint" );
-                            // TODO: do we need to do anything while at a breakpoint?
-                            if( ! ControlAccess::get_instance()->WaitToContinue() )
-                            {
-                                stillRunning = false;
-                                LDEBUG( contlog, "Detected cancelation while waiting at breakpoint" );
-                            }
-                        }
-                        else
-                        {
-                            // then canceled
-                            stillRunning = false;
-                            LDEBUG( contlog, "Detected cancelation while waiting during running" );
-                        }
+                        LDEBUG( contlog, "Not canceled and nthreads = " << fNActiveThreads );
+                        std::this_thread::sleep_for( std::chrono::milliseconds(fCycleTimeMS) );
                     }
 
                     // ok, we're not running anymore.  join all threads and move along.
@@ -228,7 +213,7 @@ namespace Nymph
             }
         }
 
-//        --fNActiveThreads;
+        --fNActiveThreads;
 
         return;
     }
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 0e8ac19..d1e5e45 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -95,7 +95,7 @@ namespace Nymph
 
             // TODO: return value access
 
-//            MEMVAR( unsigned, NActiveThreads );
+            MEMVAR( unsigned, NActiveThreads );
 
         protected:
             void StartMultiThreadedRun( const ProcessorToolbox& procTB );
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index c8425b6..b60f8e2 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -22,7 +22,7 @@ set( testing_SOURCES
     TestProcessor.cc
     TestProcessorToolbox.cc
     TestSignalSlot.cc
-#    TestSingleRunController.cc
+    TestSingleRunController.cc
     UseCatch.cc
 )
 
diff --git a/Testing/TestSingleRunController.cc b/Testing/TestSingleRunController.cc
index 5bb47cd..d24ee72 100644
--- a/Testing/TestSingleRunController.cc
+++ b/Testing/TestSingleRunController.cc
@@ -7,6 +7,7 @@
 
 #include "TestProcessorClasses.hh"
 
+#include "ProcessorToolbox.hh"
 #include "SingleRunController.hh"
 
 #include "logger.hh"
@@ -24,20 +25,21 @@ namespace Nymph
         public:
             using SingleRunController::SingleRunController;
 
-            void StartMultiThreadedRun()
+            void StartMultiThreadedRun( const ProcessorToolbox& procTB )
             {
-                return SingleRunController::StartMultiThreadedRun();
+                return SingleRunController::StartMultiThreadedRun( procTB );
             }
 
     };
 }
 
 
-TEST_CASE( "processor_toolbox" )
+TEST_CASE( "single_run_controller" )
 {
     using namespace Nymph;
 
     SRCRevealer controller;
+    ProcessorToolbox toolbox;
 
     SECTION( "DoRun" )
     {
@@ -62,7 +64,7 @@ TEST_CASE( "processor_toolbox" )
         ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
 
         // do the run
-        REQUIRE_NOTHROW( toolbox.Run() );
+        REQUIRE_NOTHROW( controller.Run( toolbox ) );
 
         // check the results
         REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );

From 9b092244b942c61aad480d80a818f3d73f40b5da Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 24 Jan 2022 16:47:34 -0800
Subject: [PATCH 233/521] Refinements

---
 Library/Control/Controller.cc          |  4 ++--
 Library/Control/SingleRunController.cc | 24 ++----------------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index 77119a0..3245c9c 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -122,12 +122,12 @@ namespace Nymph
             catch( const QuitChain& e )
             {
                 // not necessarily an error, so don't set quitAfterThis to true
-                LINFO( contlog, "Chain exited with QuitChain" );
+                LINFO( contlog, "Chain <" << name << "> exited with QuitChain" );
             }
             catch( const scarab::base_exception& e )
             {
                 // this is an error, so set quitAfterThis to true
-                LERROR( contlog, "Chain exited with an exception" );
+                LERROR( contlog, "Chain <" << name << "> exited with an exception" );
                 PrintException( e );
                 this->Cancel( RETURN_ERROR );
             }
diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index adc60a4..cb35d45 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -99,9 +99,9 @@ namespace Nymph
                     // wait here while things are still running
                     while( ! is_canceled() && fNActiveThreads > 0 )
                     {
-                        LDEBUG( contlog, "Not canceled and nthreads = " << fNActiveThreads );
                         std::this_thread::sleep_for( std::chrono::milliseconds(fCycleTimeMS) );
                     }
+                    LDEBUG( contlog, "Past the wait for threads to stop.\nEither canceled (" << is_canceled() << ") or no active threads remain (# active threads: " << fNActiveThreads << ")" );
 
                     // ok, we're not running anymore.  join all threads and move along.
 
@@ -191,27 +191,7 @@ namespace Nymph
 
     void SingleRunController::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
-        LDEBUG( contlog, "Chain <" << name << "> is quitting" );
-        
-        if( ePtr )
-        {
-            try
-            {
-                std::rethrow_exception( ePtr );
-            }
-            catch( const QuitChain& e )
-            {
-                // not necessarily an error, so don't set quitAfterThis to true
-                LINFO( contlog, "Chain <" << name << "> exited with QuitChain" );
-            }
-            catch( const scarab::base_exception& e )
-            {
-                // this is an error, so set quitAfterThis to true
-                LERROR( contlog, "Chain <" << name << "> exited with an exception" );
-                PrintException( e );
-                this->Cancel( RETURN_ERROR );
-            }
-        }
+        Controller::ChainIsQuitting( name, ePtr );
 
         --fNActiveThreads;
 

From fd3bb506b0552663545c3e1593bc6047c0363201 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 25 Jan 2022 00:55:59 -0800
Subject: [PATCH 234/521] Configure Controller

---
 Library/Control/Controller.cc | 11 +++++++++--
 Library/Control/Controller.hh |  7 ++++++-
 Testing/TestController.cc     | 22 ++++++++++++++++++----
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index 3245c9c..a3965c9 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -21,11 +21,11 @@ namespace Nymph
     Controller::Controller() :
             ControllerInterface(),
             scarab::cancelable(),
+            fCycleTimeMS( 500 ),
             fMutex(),
             fCondVarContinue(),
             fCondVarBreak(),
-            fBreakFlag( false ),
-            fCycleTimeMS( 500 )
+            fBreakFlag( false )
     {
         ControlAccess::get_instance()->SetControl( this );
     }
@@ -33,6 +33,13 @@ namespace Nymph
     Controller::~Controller()
     {}
 
+    void Controller::Configure( const scarab::param_node& node )
+    {
+        SetCycleTimeMS( node.get_value( "cycle-time-ms", fCycleTimeMS ) );
+
+        return;
+    }
+
     bool Controller::WaitToContinue()
     {
         std::unique_lock< std::mutex > lock( fMutex );
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index 94bbfb7..49db60d 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -13,6 +13,7 @@
 #include "MemberVariable.hh"
 
 #include "cancelable.hh"
+#include "param.hh"
 
 #include <condition_variable>
 #include <mutex>
@@ -26,6 +27,11 @@ namespace Nymph
             Controller();
             virtual ~Controller();
 
+        public:
+            /// Configure the controller
+            void Configure( const scarab::param_node& node );
+
+            MEMVAR( unsigned, CycleTimeMS );
 
         public:   
             /// Use this to make a thread wait on a break
@@ -63,7 +69,6 @@ namespace Nymph
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
             MEMVAR_NOSET( bool, BreakFlag );
-            MEMVAR( unsigned, CycleTimeMS );
             //MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
 
         protected:
diff --git a/Testing/TestController.cc b/Testing/TestController.cc
index a9cb537..b9b152d 100644
--- a/Testing/TestController.cc
+++ b/Testing/TestController.cc
@@ -11,6 +11,8 @@
 #include "Exception.hh"
 #include "QuitChain.hh"
 
+#include "param_codec.hh"
+
 #include <thread>
 
 #include "catch.hpp"
@@ -52,20 +54,32 @@ TEST_CASE( "controller", "[control]" )
 
     SECTION( "Basics" )
     {
+        control.SetCycleTimeMS( 100 );
+        REQUIRE( control.GetCycleTimeMS() == 100 );
+        control.SetCycleTimeMS( 500 );
+
         REQUIRE_NOTHROW( control.Mutex().lock() );
         REQUIRE_NOTHROW( control.Mutex().unlock() );
 
         REQUIRE_FALSE( control.GetBreakFlag() );
 
-        control.SetCycleTimeMS( 100 );
-        REQUIRE( control.GetCycleTimeMS() == 100 );
-        control.SetCycleTimeMS( 500 );
-
         REQUIRE_FALSE( control.IsCanceled() );
         control.Cancel( 5 );
         REQUIRE( control.IsCanceled() );
     }
 
+    SECTION( "Configure" )
+    {
+        std::string config_str(
+            "controller:\n"
+            "  cycle-time-ms: 10\n"        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( control.Configure( config->as_node() ) );
+    }
+
     SECTION( "WaitToContinue" )
     {
         control.SetCanceled( false );

From e11e28c9361f6156c9715ac1410f16bfff72e4fc Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 25 Jan 2022 00:56:23 -0800
Subject: [PATCH 235/521] Cleanup and tweaks

---
 Library/Control/SingleRunController.cc | 28 ++----------
 Library/Control/SingleRunController.hh | 61 ++++----------------------
 Testing/TestSingleRunController.cc     | 18 +-------
 3 files changed, 14 insertions(+), 93 deletions(-)

diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index cb35d45..f4b65f7 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -34,14 +34,14 @@ namespace Nymph
     {
         LPROG( contlog, "Configuring run control" );
 
+        Controller::Configure( node );
 
+        return;
     }
 
     void SingleRunController::Run( const ProcessorToolbox& procTB )
     {
-        // can throw scarab::base_exception
-
-        StartMultiThreadedRun( procTB );
+        StartRun( procTB );
 
         if( fDoRunThread.joinable() ) 
         {
@@ -53,7 +53,7 @@ namespace Nymph
         return;
     }
 
-    void SingleRunController::StartMultiThreadedRun( const ProcessorToolbox& procTB )
+    void SingleRunController::StartRun( const ProcessorToolbox& procTB )
     {
         if( fDoRunThread.joinable() )
         {
@@ -198,24 +198,4 @@ namespace Nymph
         return;
     }
 
-//    void SingleRunController::do_cancellation( int code )
-//    {
-//    }
-
-/*
-    void SharedControl::Reset()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "Reseting ControlAccess" );
-        fBreakFlag = false;
-        fCanceledFlag = false;
-        fCycleTimeMS = 500;
-//        fNActiveThreads = 0;
-        return;
-    }
-*/
-
-
-
-
 } /* namespace Nymph */
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index d1e5e45..5c1b949 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -26,52 +26,11 @@ namespace Nymph
     class ProcessorToolbox;
 
     /*!
-     @class ProcessorToolbox
+     @class SingleRunController
      @author N. S. Oblath
 
-     @brief Manages processors requested by the user at run time.
-
-     @details
-     ProcessorToolbox allows the user to setup an application at runtime.
-
-     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
-     the program via a configuration file.
-
-     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
-
-     The following order should be used for configuring the processor toolbox:
-     <ol>
-         <li>Create processors</li>
-         <li>Connect signals and slots</li>
-         <li>Create the run queue</li>
-     </ol>
-
-     Available (nested) configuration values:
-     <ul>
-         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
-         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
-             <ul>
-                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
-                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
-             </ul>
-         </li>
-         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
-             <ul>
-                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
-                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
-                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
-             </ul>
-         </li>
-         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
-         The elements of this array specify processors that are run sequentially.
-         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
-             <ul>
-                 <li>processor name -- add a processor to the run queue, or </li>
-                 <li>array of processor names -- add a group of processors to the run queue.</li>
-             </ul>
-             In single-threaded mode, all processors will be run sequentially, in the order specified.
-         </li>
-     </ul>
+     @brief Performs a single run as specified to the ProcessorToolbox
+
     */
     class SingleRunController : public Controller
     {
@@ -86,8 +45,14 @@ namespace Nymph
         public:
             /// Process the run queue.
             /// This will call Run() on all of the primary processors in the queue.
+            /// This is a blocking call that waits until the run is completed before returning.
             void Run( const ProcessorToolbox& procTB );
 
+            /// Asynchronously start a run
+            /// Starts run in a new thread and returns
+            void StartRun( const ProcessorToolbox& procTB );
+
+            /// Wait for the run to complete; 
             void JoinRunThread();
 
             /// Notify the control that a chain is quitting
@@ -98,15 +63,11 @@ namespace Nymph
             MEMVAR( unsigned, NActiveThreads );
 
         protected:
-            void StartMultiThreadedRun( const ProcessorToolbox& procTB );
-
             std::thread fDoRunThread;
 
             typedef std::tuple< PrimaryProcessor*, std::thread, std::exception_ptr > ThreadBundle;
             std::map< std::string, ThreadBundle > fChainThreads;
 
-//            void do_cancellation( int code );
-
         public:
         /*
             template< typename... Args >
@@ -116,10 +77,6 @@ namespace Nymph
             void Break( Args&... args ); // to be called by a working thread
         */
 
-            // WARNING: This function resets the state of this class to a just-constructed state
-            //          It is intended for use with testing when a single application might use it multiple times
-            void Reset();
-
     };
 
    inline void SingleRunController::JoinRunThread()
diff --git a/Testing/TestSingleRunController.cc b/Testing/TestSingleRunController.cc
index d24ee72..facfc21 100644
--- a/Testing/TestSingleRunController.cc
+++ b/Testing/TestSingleRunController.cc
@@ -18,27 +18,11 @@
 LOGGER( testlog, "TestSingleRunController" );
 
 
-namespace Nymph
-{
-    class SRCRevealer : public SingleRunController
-    {
-        public:
-            using SingleRunController::SingleRunController;
-
-            void StartMultiThreadedRun( const ProcessorToolbox& procTB )
-            {
-                return SingleRunController::StartMultiThreadedRun( procTB );
-            }
-
-    };
-}
-
-
 TEST_CASE( "single_run_controller" )
 {
     using namespace Nymph;
 
-    SRCRevealer controller;
+    SingleRunController controller;
     ProcessorToolbox toolbox;
 
     SECTION( "DoRun" )

From 68fcdcb89ab76d3efa7b49f2f87de2bcf4768391 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 25 Jan 2022 01:17:08 -0800
Subject: [PATCH 236/521] Documentation update

---
 Library/Control/Controller.hh          |  7 +++++++
 Library/Control/ControllerInterface.hh |  7 +++++++
 Library/Processor/PrimaryProcessor.hh  | 13 +++++++++++++
 Library/Processor/Processor.hh         | 12 ++++++++++++
 Library/Processor/ProcessorToolbox.hh  |  1 -
 Library/Processor/QuitChain.hh         |  9 ++++++++-
 Library/Processor/Signal.hh            | 22 +++++++++-------------
 Library/Processor/SignalSlotBase.hh    | 14 ++++++++++++++
 Library/Processor/Slot.hh              | 14 ++++++++------
 Library/Utility/Exception.hh           |  7 +++++++
 10 files changed, 85 insertions(+), 21 deletions(-)

diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index 49db60d..c6fce41 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -21,6 +21,13 @@
 namespace Nymph
 {
 
+    /*!
+     @class Controller
+     @author N. S. Oblath
+
+     @brief Base class for Controller classes, with basic break/continue/cancel functionality
+
+    */
     class Controller : public ControllerInterface, public scarab::cancelable
     {
         public:
diff --git a/Library/Control/ControllerInterface.hh b/Library/Control/ControllerInterface.hh
index 40cdfe5..8a7502a 100644
--- a/Library/Control/ControllerInterface.hh
+++ b/Library/Control/ControllerInterface.hh
@@ -14,6 +14,13 @@
 namespace Nymph
 {
 
+    /*!
+     @class ControllerInterface
+     @author N. S. Oblath
+
+     @brief Interface for controller classes: break/continue/cancel functionality
+
+    */
     class ControllerInterface
     {
         public:
diff --git a/Library/Processor/PrimaryProcessor.hh b/Library/Processor/PrimaryProcessor.hh
index 100ded9..0766edd 100644
--- a/Library/Processor/PrimaryProcessor.hh
+++ b/Library/Processor/PrimaryProcessor.hh
@@ -14,6 +14,19 @@
 namespace Nymph
 {
 
+    /*!
+     @class PrimaryProcessor
+     @author N. S. Oblath
+
+     @brief Base class for PrimaryProcessors.  Each processor chain is headed by a PrimaryProcessor.
+
+     @details
+
+     Exceptions thrown during the run by any Processors in this PP's chain are caught by PrimaryProcessor::operator()().   
+     This class catches any exceptions inheriting from scarab::base_exception.
+     It also catches QuitChain for situations where the quitting has been requested from outside of the chain (e.g. cancelation from another thread).
+
+    */
     class PrimaryProcessor : public Processor
     {
         public:
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index bb7f09b..849014e 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -22,6 +22,18 @@ namespace Nymph
 
     struct ProcessorException : virtual public Exception {};
 
+    /*!
+     @class ConfigException
+     @author N. S. Oblath
+
+     @brief An exception class for use with errors that occur during configuration.
+
+     @details
+
+     The param_node of the configuration in question can be attached to the exception using the constructor 
+     or the function Config().  
+
+    */
     class ConfigException : public scarab::typed_exception< ConfigException >
     {
         public:
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index 696e49d..b96f4eb 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -71,7 +71,6 @@ namespace Nymph
                  <li>processor name -- add a processor to the run queue, or </li>
                  <li>array of processor names -- add a group of processors to the run queue.</li>
              </ul>
-             In single-threaded mode, all processors will be run sequentially, in the order specified.
          </li>
      </ul>
     */
diff --git a/Library/Processor/QuitChain.hh b/Library/Processor/QuitChain.hh
index 192e656..fff9b13 100644
--- a/Library/Processor/QuitChain.hh
+++ b/Library/Processor/QuitChain.hh
@@ -12,7 +12,14 @@
 
 namespace Nymph
 {
-    /// QuitChain is used to communicate within a Chain that the chain should stop running from the top (i.e. from the PrimaryProcessor)
+    /*!
+     @class QuitChain
+     @author N. S. Oblath
+
+     @brief Thrown from a Processor chain to communicate within the chain that the chain 
+     should stop running from the top (i.e. from the Primary Processor)
+
+    */
     class QuitChain : public scarab::typed_exception< QuitChain >
     {
         public:
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 21ded79..38edd15 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -25,17 +25,20 @@ namespace Nymph
     template< typename... XArgs >
     class Slot;
 
-    /// A Signal object may call multiple slots with the
-    /// same signature. You can connect functions to the Signal
-    /// that will be called when the emit() method on the
-    /// Signal object is invoked. Any argument passed to emit()
-    /// will be passed to the given functions.
+    /*!
+     @class Signal
+     @author N. S. Oblath
+
+     @brief A signal object may call multiple slots with the same signature.  You can connect functions to the Signal 
+     that will be called when the `emit()` method on the Signal object is invoked.  Any argument passed to `emit()`
+     will be passed to the given functions.
+
+    */
     template< typename... XArgs >
     class Signal : public SignalBase
     {
         public:
             using signature = void( XArgs... );
-//            using full_signature = void( ControlAccessPtr, XArgs... );
 
         public:
             /// Unowned signal
@@ -52,9 +55,6 @@ namespace Nymph
             // calls all connected functions
             void Emit( XArgs... args );
             void operator()( XArgs... args );
-
-            // TODO: remove this  // 12/8/21, NSO: why remove this?  // NSO: oh, because we no longer need to pass ControlAccess between signals and slots before they're used
-            //MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
     };
 
 
@@ -144,10 +144,6 @@ namespace Nymph
             THROW_EXCEPT_HERE( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
                     "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
                     "\tArgument types do not match" );
-
-            //BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
-            //        "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
-            //        "\tArgument types do not match" << eom );
         }
 /*
         Connection connection;
diff --git a/Library/Processor/SignalSlotBase.hh b/Library/Processor/SignalSlotBase.hh
index 1029317..3f5d01c 100644
--- a/Library/Processor/SignalSlotBase.hh
+++ b/Library/Processor/SignalSlotBase.hh
@@ -44,6 +44,13 @@ namespace Nymph
 
     class SignalBase;
 
+    /*!
+     @class SlotBase
+     @author N. S. Oblath
+
+     @brief Provides the basic slot interface, including connect/disconnect, and storage of connections.
+
+    */
     class SlotBase
     {
         public:
@@ -70,6 +77,13 @@ namespace Nymph
     };
 
 
+    /*!
+     @class SignalBase
+     @author N. S. Oblath
+
+     @brief Provides the basic signal interface, including connect/disconnect, storage of connections, and the option to perform a breakpoint.
+
+    */
     class SignalBase
     {
         public:
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 1eb33a8..c53377e 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -25,12 +25,18 @@ namespace Nymph
     LOGGER(slotlog, "Slot");
 
     // Type XOwner is the class that owns the Slot object
+    /*!
+     @class Slot
+     @author N. S. Oblath
+
+     @brief A Slot is connected to and called by a Signal with the same signature.
+
+    */
     template< typename... XArgs >
     class Slot : public SlotBase
     {
         public:
             using signature = void( XArgs... );
-//            using full_signature = void( ControlAccessPtr, XArgs... );
             using signal_list = std::initializer_list< std::string >;
 
         public:
@@ -57,18 +63,14 @@ namespace Nymph
 
             void ConnectTo( SignalBase* signal, int group = -1 );
 
-            /// execute fFunction without using a ControlAccess object
+            /// execute fFunction
             void operator()( XArgs... args );
 
-            /// execute fFunction with a ControlAccess object
-//            void operator()( ControlAccessPtr access, XArgs... args );
-
             MEMVAR_REF( boost::function< signature >, Function );
 
             MEMVAR( bool, DoBreakpoint );
 
         protected:
-//            void SlotFuncWrapper( ControlAccessPtr access, XArgs... args );
             void SlotFuncWrapper( XArgs... args );
     };
 
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index 60933c0..243ba86 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -43,6 +43,13 @@ namespace Nymph
     };
     */
 
+    /*!
+     @class Exception
+     @author N. S. Oblath
+
+     @brief Basic exception class for use in Nymph and derived packages
+
+    */
     class Exception : public scarab::typed_exception< Exception >
     {
         public:

From 689ed7990b002e1cf3cef8540c0ed72264fe87cd Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 25 Jan 2022 13:03:01 -0800
Subject: [PATCH 237/521] Improve Signal testing

---
 Library/Processor/Signal.hh |   3 +
 Testing/TestSignalSlot.cc   | 123 +++++++++++++++++++++++++++---------
 2 files changed, 95 insertions(+), 31 deletions(-)

diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 38edd15..77787af 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -33,6 +33,9 @@ namespace Nymph
      that will be called when the `emit()` method on the Signal object is invoked.  Any argument passed to `emit()`
      will be passed to the given functions.
 
+     @details
+     An owned slot will register itself with the owner.  The owner must have a `RegisterSignal()` function that can be called.
+     
     */
     template< typename... XArgs >
     class Signal : public SignalBase
diff --git a/Testing/TestSignalSlot.cc b/Testing/TestSignalSlot.cc
index 81a159a..92e17d7 100644
--- a/Testing/TestSignalSlot.cc
+++ b/Testing/TestSignalSlot.cc
@@ -12,6 +12,7 @@
 
 #include "catch.hpp"
 
+#include <future>
 
 TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
 {
@@ -25,53 +26,113 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
     Signal< int > signal( "signal" );
     Slot< int > slot( "slot", [&](int aValue ){ testValue = aValue; } );
 
-    signal.Connect( &slot );
+    REQUIRE_FALSE( signal.GetDoBreakpoint() );
 
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
+    SECTION( "signal_emit" )
+    {
+        // this section tests all of the paths in Signal::operator()()
+        // nothing is listening to the signal, and instead we verify whether exceptions are thrown
 
-    signal.Emit( 5 );
-    REQUIRE( testValue == 5 );
+        // test successful throw, no unusual circumstances
+        REQUIRE_NOTHROW( signal.Emit( 1 ) );
 
-    signal( 10 );
-    REQUIRE( testValue == 10 );
+        // test successful throw after breakpoint not set by the signal
+        auto asyncReturn = std::async( std::launch::async, [&controller](){
+            controller.WaitForBreakOrCanceled();
+            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+            controller.Continue();
+        } );
+        controller.Break();
+        REQUIRE_NOTHROW( signal.Emit( 2 ) );
 
-    signal.Disconnect( &slot );
+        // test successful throw after breakpoint set by the signal
+        signal.SetDoBreakpoint( true );
+        asyncReturn = std::async( std::launch::async, [&controller](){
+            controller.WaitForBreakOrCanceled();
+            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+            controller.Continue();
+        } );
+        REQUIRE_NOTHROW( signal.Emit( 3 ) );
+        signal.SetDoBreakpoint( false );
 
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
+        // test behavior for canceled controller
+        controller.Cancel();
+        REQUIRE_THROWS_AS( signal.Emit( 1 ), QuitChain );
+        controller.reset_cancel();
 
-    // connect and disconnect via slot
-    slot.ConnectTo( &signal );
+        // test behavior for controller canceled during break
+        asyncReturn = std::async( std::launch::async, [&controller](){
+            controller.WaitForBreakOrCanceled();
+            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+            controller.Cancel();
+        } );
+        controller.Break();
+        REQUIRE_THROWS_AS( signal.Emit( 2 ), QuitChain );
+        controller.reset_cancel();
 
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
+        // test behavior for signal starting the break, and controller is canceled during the break
+        signal.SetDoBreakpoint( true );
+        asyncReturn = std::async( std::launch::async, [&controller](){
+            controller.WaitForBreakOrCanceled();
+            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+            controller.Cancel();
+        } );
+        REQUIRE_THROWS_AS( signal.Emit( 3 ), QuitChain );
 
-    slot.Disconnect( &signal );
+    }
 
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
+    SECTION( "connections" )
+    {
+        // TODO: connect to an incompatible slot and check exception
 
-    // reconnect for testing SignalBase::DisconnectAll()
-    signal.Connect( &slot );
+        REQUIRE_NOTHROW( signal.Connect( &slot ) );
 
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
+        REQUIRE( signal.Connections().size() == 1 );
+        REQUIRE( slot.Connections().size() == 1 );
 
-    signal.DisconnectAll();
+        signal.Emit( 5 );
+        REQUIRE( testValue == 5 );
 
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
+        signal( 10 );
+        REQUIRE( testValue == 10 );
 
-    // reconnect for testing SlotBaseDisconnectAll()
-    slot.ConnectTo( &signal );
+        signal.Disconnect( &slot );
 
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
+        REQUIRE( signal.Connections().size() == 0 );
+        REQUIRE( slot.Connections().size() == 0 );
 
-    slot.DisconnectAll();
+        // connect and disconnect via slot
+        slot.ConnectTo( &signal );
 
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
+        REQUIRE( signal.Connections().size() == 1 );
+        REQUIRE( slot.Connections().size() == 1 );
+
+        slot.Disconnect( &signal );
+
+        REQUIRE( signal.Connections().size() == 0 );
+        REQUIRE( slot.Connections().size() == 0 );
+
+        // reconnect for testing SignalBase::DisconnectAll()
+        signal.Connect( &slot );
+
+        REQUIRE( signal.Connections().size() == 1 );
+        REQUIRE( slot.Connections().size() == 1 );
+
+        signal.DisconnectAll();
+
+        REQUIRE( signal.Connections().size() == 0 );
+        REQUIRE( slot.Connections().size() == 0 );
+
+        // reconnect for testing SlotBaseDisconnectAll()
+        slot.ConnectTo( &signal );
+
+        REQUIRE( signal.Connections().size() == 1 );
+        REQUIRE( slot.Connections().size() == 1 );
+
+        slot.DisconnectAll();
+
+        REQUIRE( signal.Connections().size() == 0 );
+        REQUIRE( slot.Connections().size() == 0 );
+    }
 
 }

From ae26696cfbaa398d1e0fb8ad52287f052d2f73d0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 25 Jan 2022 13:03:34 -0800
Subject: [PATCH 238/521] Add SignalData

---
 Library/Data/SignalData.hh | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Library/Data/SignalData.hh

diff --git a/Library/Data/SignalData.hh b/Library/Data/SignalData.hh
new file mode 100644
index 0000000..f3cdd97
--- /dev/null
+++ b/Library/Data/SignalData.hh
@@ -0,0 +1,45 @@
+/*
+ * SignalData.hh
+ *
+ *  Created on: Jan 25, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_SIGNALDATA_HH_
+#define NYMPH_SIGNALDATA_HH_
+
+#include "Signal.hh"
+
+#include "DataFrame.hh"
+
+namespace Nymph
+{
+    /*!
+     @class SignalData
+     @author N. S. Oblath
+
+     @brief Creates a signal that takes a DataFrame object as its argument.
+
+     @details
+     The purpose of the signal is for passing DataFrame pointers between Processors.
+
+     // TODO: remove this comment; perhaps move it to Slot or SlotData
+     If a DataSlot is being used to receive the DataFrame that this Signal is supposed to emit
+     then the Slot can be given a pointer to this Signal and the generic Slot function will automatically emit this Signal.
+
+     Usage:
+     In your Processor's header add a member variable of type SignalData:
+
+         SignalData fMySignal;
+
+     Initialize the signal with the processor's 'this' pointer and the name of the signal:
+
+        fMySignal( "my-signal", this )
+
+     That's it!
+    */
+    typedef KTSignal< DataFrame > SignalData;
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SIGNALDATA_HH_ */

From 41418f950c080de48dcd2e98b9089298bf6ac092 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Wed, 26 Jan 2022 07:52:03 -0500
Subject: [PATCH 239/521] first stab at the reorganization, and first commit

---
 Library/CMakeLists.txt                        | 64 -------------
 Testing/{ => cpp}/Catch/catch.hpp             |  0
 .../cpp}/ConfigFiles/TestConfigurator.json    |  0
 .../ConfigFiles/TestParameterStoreConfig.json |  0
 .../cpp}/KTJSONReader.cc                      |  0
 .../cpp}/KTJSONReader.hh                      |  0
 .../cpp}/KTJSONTypeWriterValidation.cc        |  0
 .../cpp}/KTJSONTypeWriterValidation.hh        |  0
 .../cpp}/KTRegisterNymphValidationExtData.hh  |  0
 .../cpp}/KTTestConfigurable.cc                |  0
 .../cpp}/KTTestConfigurable.hh                |  0
 .../Validation => Testing/cpp}/KTTestCuts.cc  |  0
 .../Validation => Testing/cpp}/KTTestCuts.hh  |  0
 .../Validation => Testing/cpp}/KTTestData.cc  |  0
 .../Validation => Testing/cpp}/KTTestData.hh  |  0
 .../cpp}/KTTestDataPrimaryProcessor.cc        |  0
 .../cpp}/KTTestDataPrimaryProcessor.hh        |  0
 .../cpp}/KTTestPrimaryProcessor.cc            |  0
 .../cpp}/KTTestPrimaryProcessor.hh            |  0
 .../cpp}/KTTestProcessor.cc                   |  0
 .../cpp}/KTTestProcessor.hh                   |  0
 .../cpp}/TestApplication.cc                   |  0
 .../cpp}/TestApplyCut.cc                      |  0
 .../cpp}/TestCacheDirectory.cc                |  0
 Testing/{ => cpp}/TestControlAccess.cc        |  0
 .../Validation => Testing/cpp}/TestCut.cc     |  0
 .../cpp}/TestCutFilter.cc                     |  0
 .../Validation => Testing/cpp}/TestData.cc    |  0
 Testing/{TestData.cc => cpp/TestDataCatch.cc} |  0
 Testing/{ => cpp}/TestDataClasses.hh          |  0
 Testing/{ => cpp}/TestDataFrame.cc            |  0
 Testing/{ => cpp}/TestException.cc            |  0
 .../cpp}/TestExceptionInSlot.cc               |  0
 .../Validation => Testing/cpp}/TestExt.cc     |  0
 .../cpp}/TestExtSerialization.cc              |  0
 .../cpp}/TestJSONWriter.cc                    |  0
 .../cpp}/TestJSONWriterViaSlot.cc             |  0
 .../Validation => Testing/cpp}/TestLogger.cc  |  0
 .../cpp}/TestPolymorphicSlotData.cc           |  0
 .../cpp}/TestPrimaryProcessor.cc              |  0
 .../TestPrimaryProcessorCatch.cc}             |  0
 .../cpp}/TestPrimaryProcessorNoThreading.cc   |  0
 .../cpp}/TestPrintData.cc                     |  0
 Testing/{ => cpp}/TestProcessor.cc            |  0
 Testing/{ => cpp}/TestProcessorClasses.hh     |  0
 Testing/{ => cpp}/TestProcessorToolbox.cc     |  0
 .../cpp}/TestProcessorToolbox2Threads.cc      |  0
 .../cpp}/TestProcessorToolboxMultithreaded.cc |  0
 .../TestProcessorToolboxSinglethreaded.cc     |  0
 .../cpp}/TestSerialization.cc                 |  0
 Testing/{ => cpp}/TestSignalSlot.cc           |  0
 .../cpp}/TestSignalsAndSlots.cc               |  0
 .../cpp}/TestSlotData.cc                      |  0
 .../cpp}/TestThroughputProfiler.cc            |  0
 .../cpp}/TestUseBreakpoint.cc                 |  0
 .../TestingCMakeLists.txt}                    |  0
 Testing/{ => cpp}/UseCatch.cc                 |  0
 .../cpp/ValidationCMakeLists.txt              |  0
 Testing/python/CMakeLists.txt                 | 91 +++++++++++++++++++
 .../python}/KTPyTestClass.cc                  |  0
 .../python}/KTPyTestClass.hh                  |  0
 .../python}/KTPyTestClassPybind.hh            |  0
 .../python}/NymphValidationPybind.cc          |  0
 .../python}/TestParamBindings.py              |  0
 .../python}/TestProcessorToolbox.py           |  0
 .../python}/TestPyTestClass.py                |  0
 .../python}/TestPythonBasics.hh               |  0
 .../python}/TestPythonBasics.py               |  0
 .../python}/TestWrapProcessor.py              |  0
 .../Main => cpp/Executables}/CMakeLists.txt   |  0
 .../Main => cpp/Executables}/ConfigCheck.cc   |  0
 .../Main => cpp/Executables}/Nymph.cc         |  0
 .../Library}/Application/KTApplication.cc     |  0
 .../Library}/Application/KTApplication.hh     |  0
 .../Application/KTCommandLineHandler.cc       |  0
 .../Application/KTCommandLineHandler.hh       |  0
 .../Application/KTCommandLineOption.hh        |  0
 .../Library}/Application/KTConfigurator.cc    |  0
 .../Library}/Application/KTConfigurator.hh    |  0
 .../Application/KTDataQueueProcessor.cc       |  0
 .../Application/KTDataQueueProcessor.hh       |  0
 .../Library}/Application/KTFilenameParsers.cc |  0
 .../Library}/Application/KTFilenameParsers.hh |  0
 .../Application/KTPrintDataStructure.cc       |  0
 .../Application/KTPrintDataStructure.hh       |  0
 .../Application/KTProcessorToolbox.cc         |  0
 .../Application/KTProcessorToolbox.hh         |  0
 .../Library}/Application/KTRunNymph.cc        |  0
 .../Library}/Application/KTRunNymph.hh        |  0
 .../Application/KTThroughputProfiler.cc       |  0
 .../Application/KTThroughputProfiler.hh       |  0
 {Library_v1 => cpp/Library}/CMakeLists.txt    | 82 ++++++++++-------
 {Library => cpp/Library}/Data/Data.cc         |  0
 {Library => cpp/Library}/Data/Data.hh         |  0
 {Library => cpp/Library}/Data/DataFrame.cc    |  0
 {Library => cpp/Library}/Data/DataFrame.hh    |  0
 {Library => cpp/Library}/Data/DataManager.cc  |  0
 {Library => cpp/Library}/Data/DataManager.hh  |  0
 .../Library}/Data/KTApplyCut.cc               |  0
 .../Library}/Data/KTApplyCut.hh               |  0
 .../Library}/Data/KTCoreData.cc               |  0
 .../Library}/Data/KTCoreData.hh               |  0
 {Library_v1 => cpp/Library}/Data/KTCut.cc     |  0
 {Library_v1 => cpp/Library}/Data/KTCut.hh     |  0
 .../Library}/Data/KTCutFilter.cc              |  0
 .../Library}/Data/KTCutFilter.hh              |  0
 .../Library}/Data/KTCutResult.hh              |  0
 .../Library}/Data/KTCutStatus.cc              |  0
 .../Library}/Data/KTCutStatus.hh              |  0
 {Library_v1 => cpp/Library}/Data/KTData.cc    |  0
 {Library_v1 => cpp/Library}/Data/KTData.hh    |  0
 .../Library}/Data/KTRegisterNymphExtData.hh   |  0
 {Library_v1 => cpp/Library}/Data/KTTester.cc  |  0
 {Library_v1 => cpp/Library}/Data/KTTester.hh  |  0
 .../Library}/IO/KTJSONWriter.cc               |  0
 .../Library}/IO/KTJSONWriter.hh               |  0
 {Library_v1 => cpp/Library}/IO/KTReader.cc    |  0
 {Library_v1 => cpp/Library}/IO/KTReader.hh    |  0
 {Library_v1 => cpp/Library}/IO/KTWriter.cc    |  0
 {Library_v1 => cpp/Library}/IO/KTWriter.hh    |  0
 .../Library}/Processor/ControlAccess.cc       |  0
 .../Library}/Processor/ControlAccess.hh       |  0
 .../Library}/Processor/KTConnection.hh        |  0
 .../Library}/Processor/KTNymphSignals.hh      |  0
 .../Library}/Processor/KTNymphSlot.hh         |  0
 .../Library}/Processor/KTPrimaryProcessor.cc  |  0
 .../Library}/Processor/KTPrimaryProcessor.hh  |  0
 .../Library}/Processor/KTProcessor.cc         |  0
 .../Library}/Processor/KTProcessor.hh         |  0
 .../Library}/Processor/KTSignal.hh            |  0
 .../Library}/Processor/KTSignalSlotBase.hh    |  0
 .../Library}/Processor/KTSignalWrapper.cc     |  0
 .../Library}/Processor/KTSignalWrapper.hh     |  0
 .../Library}/Processor/KTSlot.hh              |  0
 .../Library}/Processor/KTSlotWrapper.cc       |  0
 .../Library}/Processor/KTSlotWrapper.hh       |  0
 .../Library}/Processor/KTThreadReference.cc   |  0
 .../Library}/Processor/KTThreadReference.hh   |  0
 .../Library}/Processor/PrimaryProcessor.cc    |  0
 .../Library}/Processor/PrimaryProcessor.hh    |  0
 .../Library}/Processor/Processor.cc           |  0
 .../Library}/Processor/Processor.hh           |  0
 .../Library}/Processor/ProcessorToolbox.cc    |  0
 .../Library}/Processor/ProcessorToolbox.hh    |  0
 .../Library}/Processor/QuitThread.hh          |  0
 .../Library}/Processor/ReturnBuffer.cc        |  0
 .../Library}/Processor/ReturnBuffer.hh        |  0
 {Library => cpp/Library}/Processor/Signal.hh  |  0
 .../Library}/Processor/SignalSlotBase.cc      |  0
 .../Library}/Processor/SignalSlotBase.hh      |  0
 {Library => cpp/Library}/Processor/Slot.hh    |  0
 {Library => cpp/Library}/Utility/Exception.cc |  0
 {Library => cpp/Library}/Utility/Exception.hh |  0
 .../Library}/Utility/KTCacheDirectory.cc      |  0
 .../Library}/Utility/KTCacheDirectory.hh      |  0
 .../Library}/Utility/KTConcurrentQueue.hh     |  0
 .../Library}/Utility/KTConfigurable.cc        |  0
 .../Library}/Utility/KTConfigurable.hh        |  0
 .../Library}/Utility/KTDirectory.cc           |  0
 .../Library}/Utility/KTDirectory.hh           |  0
 .../Library}/Utility/KTEventLoop.cc           |  0
 .../Library}/Utility/KTEventLoop.hh           |  0
 .../Library}/Utility/KTException.cc           |  0
 .../Library}/Utility/KTException.hh           |  0
 .../Library}/Utility/KTExtensible.hh          |  0
 .../Library}/Utility/KTExtensibleStruct.hh    |  0
 .../Utility/KTExtensibleStructFactory.hh      |  0
 .../Library}/Utility/KTLogger.hh              |  0
 .../Library}/Utility/KTMemberVariable.hh      |  0
 .../Library}/Utility/KTTIFactory.hh           |  0
 {Library_v1 => cpp/Library}/Utility/KTTime.cc |  0
 {Library_v1 => cpp/Library}/Utility/KTTime.hh |  0
 .../Library}/Utility/MemberVariable.hh        |  0
 .../Templates}/KTProcessorTemplate.cc         |  0
 .../Templates}/KTProcessorTemplate.hh         |  0
 .../Templates}/MainCMakeLists.txt             |  0
 .../nymph}/AddLibPythonPath.sh.in             |  0
 python/nymph/CMakeLists.txt                   | 60 ++++++++++++
 .../nymph}/KTConfigurablePybind.hh            |  0
 .../Utility => python/nymph}/KTParamPybind.hh |  0
 .../nymph}/KTProcessorPybind.cc               |  0
 .../nymph}/KTProcessorPybind.hh               |  0
 .../nymph}/KTProcessorToolboxPybind.hh        |  0
 .../nymph}/KTPyProcessor.hh                   |  0
 .../nymph}/KTPythonMacros.hh                  |  0
 {Library_v1 => python/nymph}/NymphPybind.cc   |  0
 python/nymph/__init__.py                      |  0
 187 files changed, 201 insertions(+), 96 deletions(-)
 delete mode 100644 Library/CMakeLists.txt
 rename Testing/{ => cpp}/Catch/catch.hpp (100%)
 rename {Executables/Validation => Testing/cpp}/ConfigFiles/TestConfigurator.json (100%)
 rename {Executables/Validation => Testing/cpp}/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename {Executables/Validation => Testing/cpp}/KTJSONReader.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTJSONReader.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTJSONTypeWriterValidation.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTJSONTypeWriterValidation.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTRegisterNymphValidationExtData.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestConfigurable.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestConfigurable.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestCuts.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestCuts.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestData.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestData.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestDataPrimaryProcessor.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestDataPrimaryProcessor.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestPrimaryProcessor.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestPrimaryProcessor.hh (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestProcessor.cc (100%)
 rename {Executables/Validation => Testing/cpp}/KTTestProcessor.hh (100%)
 rename {Executables/Validation => Testing/cpp}/TestApplication.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestApplyCut.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestCacheDirectory.cc (100%)
 rename Testing/{ => cpp}/TestControlAccess.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestCut.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestCutFilter.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestData.cc (100%)
 rename Testing/{TestData.cc => cpp/TestDataCatch.cc} (100%)
 rename Testing/{ => cpp}/TestDataClasses.hh (100%)
 rename Testing/{ => cpp}/TestDataFrame.cc (100%)
 rename Testing/{ => cpp}/TestException.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestExceptionInSlot.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestExt.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestExtSerialization.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestJSONWriter.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestJSONWriterViaSlot.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestLogger.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestPolymorphicSlotData.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestPrimaryProcessor.cc (100%)
 rename Testing/{TestPrimaryProcessor.cc => cpp/TestPrimaryProcessorCatch.cc} (100%)
 rename {Executables/Validation => Testing/cpp}/TestPrimaryProcessorNoThreading.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestPrintData.cc (100%)
 rename Testing/{ => cpp}/TestProcessor.cc (100%)
 rename Testing/{ => cpp}/TestProcessorClasses.hh (100%)
 rename Testing/{ => cpp}/TestProcessorToolbox.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestProcessorToolbox2Threads.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestProcessorToolboxMultithreaded.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestProcessorToolboxSinglethreaded.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestSerialization.cc (100%)
 rename Testing/{ => cpp}/TestSignalSlot.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestSignalsAndSlots.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestSlotData.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestThroughputProfiler.cc (100%)
 rename {Executables/Validation => Testing/cpp}/TestUseBreakpoint.cc (100%)
 rename Testing/{CMakeLists.txt => cpp/TestingCMakeLists.txt} (100%)
 rename Testing/{ => cpp}/UseCatch.cc (100%)
 rename Executables/Validation/CMakeLists.txt => Testing/cpp/ValidationCMakeLists.txt (100%)
 create mode 100644 Testing/python/CMakeLists.txt
 rename {Executables/Validation => Testing/python}/KTPyTestClass.cc (100%)
 rename {Executables/Validation => Testing/python}/KTPyTestClass.hh (100%)
 rename {Executables/Validation => Testing/python}/KTPyTestClassPybind.hh (100%)
 rename {Executables/Validation => Testing/python}/NymphValidationPybind.cc (100%)
 rename {Executables/Validation => Testing/python}/TestParamBindings.py (100%)
 rename {Executables/Validation => Testing/python}/TestProcessorToolbox.py (100%)
 rename {Executables/Validation => Testing/python}/TestPyTestClass.py (100%)
 rename {Executables/Validation => Testing/python}/TestPythonBasics.hh (100%)
 rename {Executables/Validation => Testing/python}/TestPythonBasics.py (100%)
 rename {Executables/Validation => Testing/python}/TestWrapProcessor.py (100%)
 rename {Executables/Main => cpp/Executables}/CMakeLists.txt (100%)
 rename {Executables/Main => cpp/Executables}/ConfigCheck.cc (100%)
 rename {Executables/Main => cpp/Executables}/Nymph.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTApplication.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTApplication.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTCommandLineHandler.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTCommandLineHandler.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTCommandLineOption.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTConfigurator.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTConfigurator.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTDataQueueProcessor.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTDataQueueProcessor.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTFilenameParsers.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTFilenameParsers.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTPrintDataStructure.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTPrintDataStructure.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTProcessorToolbox.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTProcessorToolbox.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTRunNymph.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTRunNymph.hh (100%)
 rename {Library_v1 => cpp/Library}/Application/KTThroughputProfiler.cc (100%)
 rename {Library_v1 => cpp/Library}/Application/KTThroughputProfiler.hh (100%)
 rename {Library_v1 => cpp/Library}/CMakeLists.txt (71%)
 rename {Library => cpp/Library}/Data/Data.cc (100%)
 rename {Library => cpp/Library}/Data/Data.hh (100%)
 rename {Library => cpp/Library}/Data/DataFrame.cc (100%)
 rename {Library => cpp/Library}/Data/DataFrame.hh (100%)
 rename {Library => cpp/Library}/Data/DataManager.cc (100%)
 rename {Library => cpp/Library}/Data/DataManager.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTApplyCut.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTApplyCut.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCoreData.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCoreData.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCut.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCut.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCutFilter.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCutFilter.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCutResult.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCutStatus.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTCutStatus.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTData.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTData.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTRegisterNymphExtData.hh (100%)
 rename {Library_v1 => cpp/Library}/Data/KTTester.cc (100%)
 rename {Library_v1 => cpp/Library}/Data/KTTester.hh (100%)
 rename {Library_v1 => cpp/Library}/IO/KTJSONWriter.cc (100%)
 rename {Library_v1 => cpp/Library}/IO/KTJSONWriter.hh (100%)
 rename {Library_v1 => cpp/Library}/IO/KTReader.cc (100%)
 rename {Library_v1 => cpp/Library}/IO/KTReader.hh (100%)
 rename {Library_v1 => cpp/Library}/IO/KTWriter.cc (100%)
 rename {Library_v1 => cpp/Library}/IO/KTWriter.hh (100%)
 rename {Library => cpp/Library}/Processor/ControlAccess.cc (100%)
 rename {Library => cpp/Library}/Processor/ControlAccess.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTConnection.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTNymphSignals.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTNymphSlot.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTPrimaryProcessor.cc (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTPrimaryProcessor.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTProcessor.cc (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTProcessor.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSignal.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSignalSlotBase.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSignalWrapper.cc (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSignalWrapper.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSlot.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSlotWrapper.cc (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTSlotWrapper.hh (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTThreadReference.cc (100%)
 rename {Library_v1 => cpp/Library}/Processor/KTThreadReference.hh (100%)
 rename {Library => cpp/Library}/Processor/PrimaryProcessor.cc (100%)
 rename {Library => cpp/Library}/Processor/PrimaryProcessor.hh (100%)
 rename {Library => cpp/Library}/Processor/Processor.cc (100%)
 rename {Library => cpp/Library}/Processor/Processor.hh (100%)
 rename {Library => cpp/Library}/Processor/ProcessorToolbox.cc (100%)
 rename {Library => cpp/Library}/Processor/ProcessorToolbox.hh (100%)
 rename {Library => cpp/Library}/Processor/QuitThread.hh (100%)
 rename {Library => cpp/Library}/Processor/ReturnBuffer.cc (100%)
 rename {Library => cpp/Library}/Processor/ReturnBuffer.hh (100%)
 rename {Library => cpp/Library}/Processor/Signal.hh (100%)
 rename {Library => cpp/Library}/Processor/SignalSlotBase.cc (100%)
 rename {Library => cpp/Library}/Processor/SignalSlotBase.hh (100%)
 rename {Library => cpp/Library}/Processor/Slot.hh (100%)
 rename {Library => cpp/Library}/Utility/Exception.cc (100%)
 rename {Library => cpp/Library}/Utility/Exception.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTCacheDirectory.cc (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTCacheDirectory.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTConcurrentQueue.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTConfigurable.cc (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTConfigurable.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTDirectory.cc (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTDirectory.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTEventLoop.cc (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTEventLoop.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTException.cc (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTException.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTExtensible.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTExtensibleStruct.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTExtensibleStructFactory.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTLogger.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTMemberVariable.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTTIFactory.hh (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTTime.cc (100%)
 rename {Library_v1 => cpp/Library}/Utility/KTTime.hh (100%)
 rename {Library => cpp/Library}/Utility/MemberVariable.hh (100%)
 rename {Templates => cpp/Templates}/KTProcessorTemplate.cc (100%)
 rename {Templates => cpp/Templates}/KTProcessorTemplate.hh (100%)
 rename {Templates => cpp/Templates}/MainCMakeLists.txt (100%)
 rename {Library_v1 => python/nymph}/AddLibPythonPath.sh.in (100%)
 create mode 100644 python/nymph/CMakeLists.txt
 rename {Library_v1/Utility => python/nymph}/KTConfigurablePybind.hh (100%)
 rename {Library_v1/Utility => python/nymph}/KTParamPybind.hh (100%)
 rename {Library_v1/Processor => python/nymph}/KTProcessorPybind.cc (100%)
 rename {Library_v1/Processor => python/nymph}/KTProcessorPybind.hh (100%)
 rename {Library_v1/Application => python/nymph}/KTProcessorToolboxPybind.hh (100%)
 rename {Library_v1/Processor => python/nymph}/KTPyProcessor.hh (100%)
 rename {Library_v1/Utility => python/nymph}/KTPythonMacros.hh (100%)
 rename {Library_v1 => python/nymph}/NymphPybind.cc (100%)
 create mode 100644 python/nymph/__init__.py

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
deleted file mode 100644
index 55986dc..0000000
--- a/Library/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# CMakeLists for Nymph/Library
-# Author: N.S. Oblath
-
-#include( PythonPackage )
-
-set( UTIL_DIR Utility )
-set( DATA_DIR Data )
-set( PROC_DIR Processor )
-set( IO_DIR IO )
-set( APPL_DIR Application )
-
-include_directories( BEFORE 
-    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
-)
-
-set( NYMPH_HEADERFILES
-    ${UTIL_DIR}/Exception.hh
-    ${UTIL_DIR}/MemberVariable.hh
-
-    ${DATA_DIR}/Data.hh
-    ${DATA_DIR}/DataFrame.hh
-    
-    ${PROC_DIR}/ControlAccess.hh
-    ${PROC_DIR}/PrimaryProcessor.hh
-    ${PROC_DIR}/Processor.hh
-    ${PROC_DIR}/ProcessorToolbox.hh
-    ${PROC_DIR}/QuitThread.hh
-    ${PROC_DIR}/ReturnBuffer.hh
-    ${PROC_DIR}/SignalSlotBase.hh
-)
-
-set( NYMPH_SOURCEFILES
-    ${UTIL_DIR}/Exception.cc
-
-    ${DATA_DIR}/Data.cc
-    ${DATA_DIR}/DataFrame.cc
-    
-    ${PROC_DIR}/ControlAccess.cc
-    ${PROC_DIR}/PrimaryProcessor.cc
-    ${PROC_DIR}/Processor.cc
-    ${PROC_DIR}/ProcessorToolbox.cc
-    ${PROC_DIR}/ReturnBuffer.cc
-    ${PROC_DIR}/SignalSlotBase.cc
-)
-
-
-##################################################
-
-pbuilder_library( 
-    TARGET Nymph 
-    SOURCES ${NYMPH_SOURCEFILES}
-    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Library
-    LIBTARGETS Nymph
-)
-
-pbuilder_install_headers( ${NYMPH_HEADERFILES} )
diff --git a/Testing/Catch/catch.hpp b/Testing/cpp/Catch/catch.hpp
similarity index 100%
rename from Testing/Catch/catch.hpp
rename to Testing/cpp/Catch/catch.hpp
diff --git a/Executables/Validation/ConfigFiles/TestConfigurator.json b/Testing/cpp/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Executables/Validation/ConfigFiles/TestConfigurator.json
rename to Testing/cpp/ConfigFiles/TestConfigurator.json
diff --git a/Executables/Validation/ConfigFiles/TestParameterStoreConfig.json b/Testing/cpp/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Executables/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to Testing/cpp/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Executables/Validation/KTJSONReader.cc b/Testing/cpp/KTJSONReader.cc
similarity index 100%
rename from Executables/Validation/KTJSONReader.cc
rename to Testing/cpp/KTJSONReader.cc
diff --git a/Executables/Validation/KTJSONReader.hh b/Testing/cpp/KTJSONReader.hh
similarity index 100%
rename from Executables/Validation/KTJSONReader.hh
rename to Testing/cpp/KTJSONReader.hh
diff --git a/Executables/Validation/KTJSONTypeWriterValidation.cc b/Testing/cpp/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from Executables/Validation/KTJSONTypeWriterValidation.cc
rename to Testing/cpp/KTJSONTypeWriterValidation.cc
diff --git a/Executables/Validation/KTJSONTypeWriterValidation.hh b/Testing/cpp/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from Executables/Validation/KTJSONTypeWriterValidation.hh
rename to Testing/cpp/KTJSONTypeWriterValidation.hh
diff --git a/Executables/Validation/KTRegisterNymphValidationExtData.hh b/Testing/cpp/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from Executables/Validation/KTRegisterNymphValidationExtData.hh
rename to Testing/cpp/KTRegisterNymphValidationExtData.hh
diff --git a/Executables/Validation/KTTestConfigurable.cc b/Testing/cpp/KTTestConfigurable.cc
similarity index 100%
rename from Executables/Validation/KTTestConfigurable.cc
rename to Testing/cpp/KTTestConfigurable.cc
diff --git a/Executables/Validation/KTTestConfigurable.hh b/Testing/cpp/KTTestConfigurable.hh
similarity index 100%
rename from Executables/Validation/KTTestConfigurable.hh
rename to Testing/cpp/KTTestConfigurable.hh
diff --git a/Executables/Validation/KTTestCuts.cc b/Testing/cpp/KTTestCuts.cc
similarity index 100%
rename from Executables/Validation/KTTestCuts.cc
rename to Testing/cpp/KTTestCuts.cc
diff --git a/Executables/Validation/KTTestCuts.hh b/Testing/cpp/KTTestCuts.hh
similarity index 100%
rename from Executables/Validation/KTTestCuts.hh
rename to Testing/cpp/KTTestCuts.hh
diff --git a/Executables/Validation/KTTestData.cc b/Testing/cpp/KTTestData.cc
similarity index 100%
rename from Executables/Validation/KTTestData.cc
rename to Testing/cpp/KTTestData.cc
diff --git a/Executables/Validation/KTTestData.hh b/Testing/cpp/KTTestData.hh
similarity index 100%
rename from Executables/Validation/KTTestData.hh
rename to Testing/cpp/KTTestData.hh
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Testing/cpp/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from Executables/Validation/KTTestDataPrimaryProcessor.cc
rename to Testing/cpp/KTTestDataPrimaryProcessor.cc
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.hh b/Testing/cpp/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from Executables/Validation/KTTestDataPrimaryProcessor.hh
rename to Testing/cpp/KTTestDataPrimaryProcessor.hh
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Testing/cpp/KTTestPrimaryProcessor.cc
similarity index 100%
rename from Executables/Validation/KTTestPrimaryProcessor.cc
rename to Testing/cpp/KTTestPrimaryProcessor.cc
diff --git a/Executables/Validation/KTTestPrimaryProcessor.hh b/Testing/cpp/KTTestPrimaryProcessor.hh
similarity index 100%
rename from Executables/Validation/KTTestPrimaryProcessor.hh
rename to Testing/cpp/KTTestPrimaryProcessor.hh
diff --git a/Executables/Validation/KTTestProcessor.cc b/Testing/cpp/KTTestProcessor.cc
similarity index 100%
rename from Executables/Validation/KTTestProcessor.cc
rename to Testing/cpp/KTTestProcessor.cc
diff --git a/Executables/Validation/KTTestProcessor.hh b/Testing/cpp/KTTestProcessor.hh
similarity index 100%
rename from Executables/Validation/KTTestProcessor.hh
rename to Testing/cpp/KTTestProcessor.hh
diff --git a/Executables/Validation/TestApplication.cc b/Testing/cpp/TestApplication.cc
similarity index 100%
rename from Executables/Validation/TestApplication.cc
rename to Testing/cpp/TestApplication.cc
diff --git a/Executables/Validation/TestApplyCut.cc b/Testing/cpp/TestApplyCut.cc
similarity index 100%
rename from Executables/Validation/TestApplyCut.cc
rename to Testing/cpp/TestApplyCut.cc
diff --git a/Executables/Validation/TestCacheDirectory.cc b/Testing/cpp/TestCacheDirectory.cc
similarity index 100%
rename from Executables/Validation/TestCacheDirectory.cc
rename to Testing/cpp/TestCacheDirectory.cc
diff --git a/Testing/TestControlAccess.cc b/Testing/cpp/TestControlAccess.cc
similarity index 100%
rename from Testing/TestControlAccess.cc
rename to Testing/cpp/TestControlAccess.cc
diff --git a/Executables/Validation/TestCut.cc b/Testing/cpp/TestCut.cc
similarity index 100%
rename from Executables/Validation/TestCut.cc
rename to Testing/cpp/TestCut.cc
diff --git a/Executables/Validation/TestCutFilter.cc b/Testing/cpp/TestCutFilter.cc
similarity index 100%
rename from Executables/Validation/TestCutFilter.cc
rename to Testing/cpp/TestCutFilter.cc
diff --git a/Executables/Validation/TestData.cc b/Testing/cpp/TestData.cc
similarity index 100%
rename from Executables/Validation/TestData.cc
rename to Testing/cpp/TestData.cc
diff --git a/Testing/TestData.cc b/Testing/cpp/TestDataCatch.cc
similarity index 100%
rename from Testing/TestData.cc
rename to Testing/cpp/TestDataCatch.cc
diff --git a/Testing/TestDataClasses.hh b/Testing/cpp/TestDataClasses.hh
similarity index 100%
rename from Testing/TestDataClasses.hh
rename to Testing/cpp/TestDataClasses.hh
diff --git a/Testing/TestDataFrame.cc b/Testing/cpp/TestDataFrame.cc
similarity index 100%
rename from Testing/TestDataFrame.cc
rename to Testing/cpp/TestDataFrame.cc
diff --git a/Testing/TestException.cc b/Testing/cpp/TestException.cc
similarity index 100%
rename from Testing/TestException.cc
rename to Testing/cpp/TestException.cc
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Testing/cpp/TestExceptionInSlot.cc
similarity index 100%
rename from Executables/Validation/TestExceptionInSlot.cc
rename to Testing/cpp/TestExceptionInSlot.cc
diff --git a/Executables/Validation/TestExt.cc b/Testing/cpp/TestExt.cc
similarity index 100%
rename from Executables/Validation/TestExt.cc
rename to Testing/cpp/TestExt.cc
diff --git a/Executables/Validation/TestExtSerialization.cc b/Testing/cpp/TestExtSerialization.cc
similarity index 100%
rename from Executables/Validation/TestExtSerialization.cc
rename to Testing/cpp/TestExtSerialization.cc
diff --git a/Executables/Validation/TestJSONWriter.cc b/Testing/cpp/TestJSONWriter.cc
similarity index 100%
rename from Executables/Validation/TestJSONWriter.cc
rename to Testing/cpp/TestJSONWriter.cc
diff --git a/Executables/Validation/TestJSONWriterViaSlot.cc b/Testing/cpp/TestJSONWriterViaSlot.cc
similarity index 100%
rename from Executables/Validation/TestJSONWriterViaSlot.cc
rename to Testing/cpp/TestJSONWriterViaSlot.cc
diff --git a/Executables/Validation/TestLogger.cc b/Testing/cpp/TestLogger.cc
similarity index 100%
rename from Executables/Validation/TestLogger.cc
rename to Testing/cpp/TestLogger.cc
diff --git a/Executables/Validation/TestPolymorphicSlotData.cc b/Testing/cpp/TestPolymorphicSlotData.cc
similarity index 100%
rename from Executables/Validation/TestPolymorphicSlotData.cc
rename to Testing/cpp/TestPolymorphicSlotData.cc
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Testing/cpp/TestPrimaryProcessor.cc
similarity index 100%
rename from Executables/Validation/TestPrimaryProcessor.cc
rename to Testing/cpp/TestPrimaryProcessor.cc
diff --git a/Testing/TestPrimaryProcessor.cc b/Testing/cpp/TestPrimaryProcessorCatch.cc
similarity index 100%
rename from Testing/TestPrimaryProcessor.cc
rename to Testing/cpp/TestPrimaryProcessorCatch.cc
diff --git a/Executables/Validation/TestPrimaryProcessorNoThreading.cc b/Testing/cpp/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from Executables/Validation/TestPrimaryProcessorNoThreading.cc
rename to Testing/cpp/TestPrimaryProcessorNoThreading.cc
diff --git a/Executables/Validation/TestPrintData.cc b/Testing/cpp/TestPrintData.cc
similarity index 100%
rename from Executables/Validation/TestPrintData.cc
rename to Testing/cpp/TestPrintData.cc
diff --git a/Testing/TestProcessor.cc b/Testing/cpp/TestProcessor.cc
similarity index 100%
rename from Testing/TestProcessor.cc
rename to Testing/cpp/TestProcessor.cc
diff --git a/Testing/TestProcessorClasses.hh b/Testing/cpp/TestProcessorClasses.hh
similarity index 100%
rename from Testing/TestProcessorClasses.hh
rename to Testing/cpp/TestProcessorClasses.hh
diff --git a/Testing/TestProcessorToolbox.cc b/Testing/cpp/TestProcessorToolbox.cc
similarity index 100%
rename from Testing/TestProcessorToolbox.cc
rename to Testing/cpp/TestProcessorToolbox.cc
diff --git a/Executables/Validation/TestProcessorToolbox2Threads.cc b/Testing/cpp/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from Executables/Validation/TestProcessorToolbox2Threads.cc
rename to Testing/cpp/TestProcessorToolbox2Threads.cc
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Testing/cpp/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from Executables/Validation/TestProcessorToolboxMultithreaded.cc
rename to Testing/cpp/TestProcessorToolboxMultithreaded.cc
diff --git a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc b/Testing/cpp/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from Executables/Validation/TestProcessorToolboxSinglethreaded.cc
rename to Testing/cpp/TestProcessorToolboxSinglethreaded.cc
diff --git a/Executables/Validation/TestSerialization.cc b/Testing/cpp/TestSerialization.cc
similarity index 100%
rename from Executables/Validation/TestSerialization.cc
rename to Testing/cpp/TestSerialization.cc
diff --git a/Testing/TestSignalSlot.cc b/Testing/cpp/TestSignalSlot.cc
similarity index 100%
rename from Testing/TestSignalSlot.cc
rename to Testing/cpp/TestSignalSlot.cc
diff --git a/Executables/Validation/TestSignalsAndSlots.cc b/Testing/cpp/TestSignalsAndSlots.cc
similarity index 100%
rename from Executables/Validation/TestSignalsAndSlots.cc
rename to Testing/cpp/TestSignalsAndSlots.cc
diff --git a/Executables/Validation/TestSlotData.cc b/Testing/cpp/TestSlotData.cc
similarity index 100%
rename from Executables/Validation/TestSlotData.cc
rename to Testing/cpp/TestSlotData.cc
diff --git a/Executables/Validation/TestThroughputProfiler.cc b/Testing/cpp/TestThroughputProfiler.cc
similarity index 100%
rename from Executables/Validation/TestThroughputProfiler.cc
rename to Testing/cpp/TestThroughputProfiler.cc
diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Testing/cpp/TestUseBreakpoint.cc
similarity index 100%
rename from Executables/Validation/TestUseBreakpoint.cc
rename to Testing/cpp/TestUseBreakpoint.cc
diff --git a/Testing/CMakeLists.txt b/Testing/cpp/TestingCMakeLists.txt
similarity index 100%
rename from Testing/CMakeLists.txt
rename to Testing/cpp/TestingCMakeLists.txt
diff --git a/Testing/UseCatch.cc b/Testing/cpp/UseCatch.cc
similarity index 100%
rename from Testing/UseCatch.cc
rename to Testing/cpp/UseCatch.cc
diff --git a/Executables/Validation/CMakeLists.txt b/Testing/cpp/ValidationCMakeLists.txt
similarity index 100%
rename from Executables/Validation/CMakeLists.txt
rename to Testing/cpp/ValidationCMakeLists.txt
diff --git a/Testing/python/CMakeLists.txt b/Testing/python/CMakeLists.txt
new file mode 100644
index 0000000..b40d929
--- /dev/null
+++ b/Testing/python/CMakeLists.txt
@@ -0,0 +1,91 @@
+# CMakeLists for Nymph/Executables/Validation
+# Author: N. Oblath
+
+############################
+# Config files
+############################
+
+set (VALIDATION_CONFIGFILES
+    ConfigFiles/TestConfigurator.json
+)
+
+pbuilder_install_config (${VALIDATION_CONFIGFILES})
+
+
+############################
+# NymphValidation library files
+############################
+
+set (VALIDATION_HEADERFILES
+    KTTestConfigurable.hh
+    KTTestCuts.hh
+    KTTestProcessor.hh
+)
+
+set (VALIDATION_SOURCEFILES
+    KTTestConfigurable.cc
+    KTTestCuts.cc
+    KTTestProcessor.cc
+)
+
+set( LIB_DEPENDENCIES
+    Nymph
+)
+
+############################
+# NymphValidation library 
+############################
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+pbuilder_library( 
+    TARGET NymphValidation 
+    SOURCES ${VALIDATION_SOURCEFILES}
+    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Validation
+    LIBTARGETS NymphValidation
+)
+
+pbuilder_install_headers( ${VALIDATION_HEADERFILES} )
+
+
+############################
+# Executables
+############################
+
+set( LIB_DEPENDENCIES
+    NymphValidation
+)
+
+set( TEST_SOURCES
+    TestApplication.cc
+    TestApplyCut.cc
+    TestCacheDirectory.cc
+    TestCut.cc
+    TestCutFilter.cc
+    TestLogger.cc
+    TestPrintData.cc
+    TestSignalsAndSlots.cc
+    TestThroughputProfiler.cc
+)
+
+pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
+
+set( TEST_PROGRAMS )
+pbuilder_executables( 
+    SOURCES ${TEST_SOURCES}
+    TARGETS_VAR TEST_PROGRAMS
+    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
+    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Validation
+    EXETARGETS ${TEST_PROGRAMS}
+)
diff --git a/Executables/Validation/KTPyTestClass.cc b/Testing/python/KTPyTestClass.cc
similarity index 100%
rename from Executables/Validation/KTPyTestClass.cc
rename to Testing/python/KTPyTestClass.cc
diff --git a/Executables/Validation/KTPyTestClass.hh b/Testing/python/KTPyTestClass.hh
similarity index 100%
rename from Executables/Validation/KTPyTestClass.hh
rename to Testing/python/KTPyTestClass.hh
diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Testing/python/KTPyTestClassPybind.hh
similarity index 100%
rename from Executables/Validation/KTPyTestClassPybind.hh
rename to Testing/python/KTPyTestClassPybind.hh
diff --git a/Executables/Validation/NymphValidationPybind.cc b/Testing/python/NymphValidationPybind.cc
similarity index 100%
rename from Executables/Validation/NymphValidationPybind.cc
rename to Testing/python/NymphValidationPybind.cc
diff --git a/Executables/Validation/TestParamBindings.py b/Testing/python/TestParamBindings.py
similarity index 100%
rename from Executables/Validation/TestParamBindings.py
rename to Testing/python/TestParamBindings.py
diff --git a/Executables/Validation/TestProcessorToolbox.py b/Testing/python/TestProcessorToolbox.py
similarity index 100%
rename from Executables/Validation/TestProcessorToolbox.py
rename to Testing/python/TestProcessorToolbox.py
diff --git a/Executables/Validation/TestPyTestClass.py b/Testing/python/TestPyTestClass.py
similarity index 100%
rename from Executables/Validation/TestPyTestClass.py
rename to Testing/python/TestPyTestClass.py
diff --git a/Executables/Validation/TestPythonBasics.hh b/Testing/python/TestPythonBasics.hh
similarity index 100%
rename from Executables/Validation/TestPythonBasics.hh
rename to Testing/python/TestPythonBasics.hh
diff --git a/Executables/Validation/TestPythonBasics.py b/Testing/python/TestPythonBasics.py
similarity index 100%
rename from Executables/Validation/TestPythonBasics.py
rename to Testing/python/TestPythonBasics.py
diff --git a/Executables/Validation/TestWrapProcessor.py b/Testing/python/TestWrapProcessor.py
similarity index 100%
rename from Executables/Validation/TestWrapProcessor.py
rename to Testing/python/TestWrapProcessor.py
diff --git a/Executables/Main/CMakeLists.txt b/cpp/Executables/CMakeLists.txt
similarity index 100%
rename from Executables/Main/CMakeLists.txt
rename to cpp/Executables/CMakeLists.txt
diff --git a/Executables/Main/ConfigCheck.cc b/cpp/Executables/ConfigCheck.cc
similarity index 100%
rename from Executables/Main/ConfigCheck.cc
rename to cpp/Executables/ConfigCheck.cc
diff --git a/Executables/Main/Nymph.cc b/cpp/Executables/Nymph.cc
similarity index 100%
rename from Executables/Main/Nymph.cc
rename to cpp/Executables/Nymph.cc
diff --git a/Library_v1/Application/KTApplication.cc b/cpp/Library/Application/KTApplication.cc
similarity index 100%
rename from Library_v1/Application/KTApplication.cc
rename to cpp/Library/Application/KTApplication.cc
diff --git a/Library_v1/Application/KTApplication.hh b/cpp/Library/Application/KTApplication.hh
similarity index 100%
rename from Library_v1/Application/KTApplication.hh
rename to cpp/Library/Application/KTApplication.hh
diff --git a/Library_v1/Application/KTCommandLineHandler.cc b/cpp/Library/Application/KTCommandLineHandler.cc
similarity index 100%
rename from Library_v1/Application/KTCommandLineHandler.cc
rename to cpp/Library/Application/KTCommandLineHandler.cc
diff --git a/Library_v1/Application/KTCommandLineHandler.hh b/cpp/Library/Application/KTCommandLineHandler.hh
similarity index 100%
rename from Library_v1/Application/KTCommandLineHandler.hh
rename to cpp/Library/Application/KTCommandLineHandler.hh
diff --git a/Library_v1/Application/KTCommandLineOption.hh b/cpp/Library/Application/KTCommandLineOption.hh
similarity index 100%
rename from Library_v1/Application/KTCommandLineOption.hh
rename to cpp/Library/Application/KTCommandLineOption.hh
diff --git a/Library_v1/Application/KTConfigurator.cc b/cpp/Library/Application/KTConfigurator.cc
similarity index 100%
rename from Library_v1/Application/KTConfigurator.cc
rename to cpp/Library/Application/KTConfigurator.cc
diff --git a/Library_v1/Application/KTConfigurator.hh b/cpp/Library/Application/KTConfigurator.hh
similarity index 100%
rename from Library_v1/Application/KTConfigurator.hh
rename to cpp/Library/Application/KTConfigurator.hh
diff --git a/Library_v1/Application/KTDataQueueProcessor.cc b/cpp/Library/Application/KTDataQueueProcessor.cc
similarity index 100%
rename from Library_v1/Application/KTDataQueueProcessor.cc
rename to cpp/Library/Application/KTDataQueueProcessor.cc
diff --git a/Library_v1/Application/KTDataQueueProcessor.hh b/cpp/Library/Application/KTDataQueueProcessor.hh
similarity index 100%
rename from Library_v1/Application/KTDataQueueProcessor.hh
rename to cpp/Library/Application/KTDataQueueProcessor.hh
diff --git a/Library_v1/Application/KTFilenameParsers.cc b/cpp/Library/Application/KTFilenameParsers.cc
similarity index 100%
rename from Library_v1/Application/KTFilenameParsers.cc
rename to cpp/Library/Application/KTFilenameParsers.cc
diff --git a/Library_v1/Application/KTFilenameParsers.hh b/cpp/Library/Application/KTFilenameParsers.hh
similarity index 100%
rename from Library_v1/Application/KTFilenameParsers.hh
rename to cpp/Library/Application/KTFilenameParsers.hh
diff --git a/Library_v1/Application/KTPrintDataStructure.cc b/cpp/Library/Application/KTPrintDataStructure.cc
similarity index 100%
rename from Library_v1/Application/KTPrintDataStructure.cc
rename to cpp/Library/Application/KTPrintDataStructure.cc
diff --git a/Library_v1/Application/KTPrintDataStructure.hh b/cpp/Library/Application/KTPrintDataStructure.hh
similarity index 100%
rename from Library_v1/Application/KTPrintDataStructure.hh
rename to cpp/Library/Application/KTPrintDataStructure.hh
diff --git a/Library_v1/Application/KTProcessorToolbox.cc b/cpp/Library/Application/KTProcessorToolbox.cc
similarity index 100%
rename from Library_v1/Application/KTProcessorToolbox.cc
rename to cpp/Library/Application/KTProcessorToolbox.cc
diff --git a/Library_v1/Application/KTProcessorToolbox.hh b/cpp/Library/Application/KTProcessorToolbox.hh
similarity index 100%
rename from Library_v1/Application/KTProcessorToolbox.hh
rename to cpp/Library/Application/KTProcessorToolbox.hh
diff --git a/Library_v1/Application/KTRunNymph.cc b/cpp/Library/Application/KTRunNymph.cc
similarity index 100%
rename from Library_v1/Application/KTRunNymph.cc
rename to cpp/Library/Application/KTRunNymph.cc
diff --git a/Library_v1/Application/KTRunNymph.hh b/cpp/Library/Application/KTRunNymph.hh
similarity index 100%
rename from Library_v1/Application/KTRunNymph.hh
rename to cpp/Library/Application/KTRunNymph.hh
diff --git a/Library_v1/Application/KTThroughputProfiler.cc b/cpp/Library/Application/KTThroughputProfiler.cc
similarity index 100%
rename from Library_v1/Application/KTThroughputProfiler.cc
rename to cpp/Library/Application/KTThroughputProfiler.cc
diff --git a/Library_v1/Application/KTThroughputProfiler.hh b/cpp/Library/Application/KTThroughputProfiler.hh
similarity index 100%
rename from Library_v1/Application/KTThroughputProfiler.hh
rename to cpp/Library/Application/KTThroughputProfiler.hh
diff --git a/Library_v1/CMakeLists.txt b/cpp/Library/CMakeLists.txt
similarity index 71%
rename from Library_v1/CMakeLists.txt
rename to cpp/Library/CMakeLists.txt
index 1411560..9abb7bc 100644
--- a/Library_v1/CMakeLists.txt
+++ b/cpp/Library/CMakeLists.txt
@@ -1,7 +1,5 @@
-# CMakeLists for Nymph/Library
-# Author: N. Oblath
-
-include( PythonPackage )
+# CMakeLists for Nymph/cpp/Library
+# Author: N.S. Oblath
 
 set( UTIL_DIR Utility )
 set( DATA_DIR Data )
@@ -9,7 +7,31 @@ set( PROC_DIR Processor )
 set( IO_DIR IO )
 set( APPL_DIR Application )
 
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
+)
+
 set( NYMPH_HEADERFILES
+    ${UTIL_DIR}/Exception.hh
+    ${UTIL_DIR}/MemberVariable.hh
+
+    ${DATA_DIR}/Data.hh
+    ${DATA_DIR}/DataFrame.hh
+    
+    ${PROC_DIR}/ControlAccess.hh
+    ${PROC_DIR}/PrimaryProcessor.hh
+    ${PROC_DIR}/Processor.hh
+    ${PROC_DIR}/ProcessorToolbox.hh
+    ${PROC_DIR}/QuitThread.hh
+    ${PROC_DIR}/ReturnBuffer.hh
+    ${PROC_DIR}/SignalSlotBase.hh
+
+# Below are the v1 Library files
+
 #    ${UTIL_DIR}/KTCacheDirectory.hh
 #    ${UTIL_DIR}/KTConcurrentQueue.hh
 #    ${UTIL_DIR}/KTConfigurable.hh
@@ -52,11 +74,23 @@ set( NYMPH_HEADERFILES
 #    ${APPL_DIR}/KTProcessorToolbox.hh
 #    ${APPL_DIR}/KTRunNymph.hh
 #    ${APPL_DIR}/KTThroughputProfiler.hh
-    ${UTIL_DIR}/Exception.hh
-    ${UTIL_DIR}/MemberVariable.hh
 )
 
 set( NYMPH_SOURCEFILES
+    ${UTIL_DIR}/Exception.cc
+
+    ${DATA_DIR}/Data.cc
+    ${DATA_DIR}/DataFrame.cc
+    
+    ${PROC_DIR}/ControlAccess.cc
+    ${PROC_DIR}/PrimaryProcessor.cc
+    ${PROC_DIR}/Processor.cc
+    ${PROC_DIR}/ProcessorToolbox.cc
+    ${PROC_DIR}/ReturnBuffer.cc
+    ${PROC_DIR}/SignalSlotBase.cc
+
+# Below are the v1 Library files
+
 #    ${UTIL_DIR}/KTCacheDirectory.cc
 #    ${UTIL_DIR}/KTConfigurable.cc
 #    ${UTIL_DIR}/KTDirectory.cc
@@ -86,36 +120,20 @@ set( NYMPH_SOURCEFILES
 #    ${APPL_DIR}/KTProcessorToolbox.cc
 #    ${APPL_DIR}/KTRunNymph.cc
 #    ${APPL_DIR}/KTThroughputProfiler.cc
-    ${UTIL_DIR}/Exception.cc
-)
-
-# Python binding headers
-set( NYMPH_PYBINDING_HEADERFILES
-    #${UTIL_DIR}/KTConfigurablePybind.hh
-    ${UTIL_DIR}/KTParamPybind.hh
-    ${PROC_DIR}/KTProcessorPybind.hh
-    ${PROC_DIR}/KTPyProcessor.hh
 )
 
-# Python bindings
-set( NYMPH_PYBINDING_SOURCEFILES
-    ${PROC_DIR}/KTProcessorPybind.cc
-    NymphPybind.cc
-)
 
 ##################################################
 
-pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
-pbuilder_install_headers( ${NYMPH_HEADERFILES} )
+pbuilder_library( 
+    TARGET Nymph 
+    SOURCES ${NYMPH_SOURCEFILES}
+    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+)
 
-if( Nymph_ENABLE_PYTHON )
-    set( LIB_DEPENDENCIES Nymph )
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS Nymph
+)
 
-    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
-    
-    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
-    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
-    pbuilder_install_libraries( py_nymph )
-    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
-endif( Nymph_ENABLE_PYTHON )
+pbuilder_install_headers( ${NYMPH_HEADERFILES} )
diff --git a/Library/Data/Data.cc b/cpp/Library/Data/Data.cc
similarity index 100%
rename from Library/Data/Data.cc
rename to cpp/Library/Data/Data.cc
diff --git a/Library/Data/Data.hh b/cpp/Library/Data/Data.hh
similarity index 100%
rename from Library/Data/Data.hh
rename to cpp/Library/Data/Data.hh
diff --git a/Library/Data/DataFrame.cc b/cpp/Library/Data/DataFrame.cc
similarity index 100%
rename from Library/Data/DataFrame.cc
rename to cpp/Library/Data/DataFrame.cc
diff --git a/Library/Data/DataFrame.hh b/cpp/Library/Data/DataFrame.hh
similarity index 100%
rename from Library/Data/DataFrame.hh
rename to cpp/Library/Data/DataFrame.hh
diff --git a/Library/Data/DataManager.cc b/cpp/Library/Data/DataManager.cc
similarity index 100%
rename from Library/Data/DataManager.cc
rename to cpp/Library/Data/DataManager.cc
diff --git a/Library/Data/DataManager.hh b/cpp/Library/Data/DataManager.hh
similarity index 100%
rename from Library/Data/DataManager.hh
rename to cpp/Library/Data/DataManager.hh
diff --git a/Library_v1/Data/KTApplyCut.cc b/cpp/Library/Data/KTApplyCut.cc
similarity index 100%
rename from Library_v1/Data/KTApplyCut.cc
rename to cpp/Library/Data/KTApplyCut.cc
diff --git a/Library_v1/Data/KTApplyCut.hh b/cpp/Library/Data/KTApplyCut.hh
similarity index 100%
rename from Library_v1/Data/KTApplyCut.hh
rename to cpp/Library/Data/KTApplyCut.hh
diff --git a/Library_v1/Data/KTCoreData.cc b/cpp/Library/Data/KTCoreData.cc
similarity index 100%
rename from Library_v1/Data/KTCoreData.cc
rename to cpp/Library/Data/KTCoreData.cc
diff --git a/Library_v1/Data/KTCoreData.hh b/cpp/Library/Data/KTCoreData.hh
similarity index 100%
rename from Library_v1/Data/KTCoreData.hh
rename to cpp/Library/Data/KTCoreData.hh
diff --git a/Library_v1/Data/KTCut.cc b/cpp/Library/Data/KTCut.cc
similarity index 100%
rename from Library_v1/Data/KTCut.cc
rename to cpp/Library/Data/KTCut.cc
diff --git a/Library_v1/Data/KTCut.hh b/cpp/Library/Data/KTCut.hh
similarity index 100%
rename from Library_v1/Data/KTCut.hh
rename to cpp/Library/Data/KTCut.hh
diff --git a/Library_v1/Data/KTCutFilter.cc b/cpp/Library/Data/KTCutFilter.cc
similarity index 100%
rename from Library_v1/Data/KTCutFilter.cc
rename to cpp/Library/Data/KTCutFilter.cc
diff --git a/Library_v1/Data/KTCutFilter.hh b/cpp/Library/Data/KTCutFilter.hh
similarity index 100%
rename from Library_v1/Data/KTCutFilter.hh
rename to cpp/Library/Data/KTCutFilter.hh
diff --git a/Library_v1/Data/KTCutResult.hh b/cpp/Library/Data/KTCutResult.hh
similarity index 100%
rename from Library_v1/Data/KTCutResult.hh
rename to cpp/Library/Data/KTCutResult.hh
diff --git a/Library_v1/Data/KTCutStatus.cc b/cpp/Library/Data/KTCutStatus.cc
similarity index 100%
rename from Library_v1/Data/KTCutStatus.cc
rename to cpp/Library/Data/KTCutStatus.cc
diff --git a/Library_v1/Data/KTCutStatus.hh b/cpp/Library/Data/KTCutStatus.hh
similarity index 100%
rename from Library_v1/Data/KTCutStatus.hh
rename to cpp/Library/Data/KTCutStatus.hh
diff --git a/Library_v1/Data/KTData.cc b/cpp/Library/Data/KTData.cc
similarity index 100%
rename from Library_v1/Data/KTData.cc
rename to cpp/Library/Data/KTData.cc
diff --git a/Library_v1/Data/KTData.hh b/cpp/Library/Data/KTData.hh
similarity index 100%
rename from Library_v1/Data/KTData.hh
rename to cpp/Library/Data/KTData.hh
diff --git a/Library_v1/Data/KTRegisterNymphExtData.hh b/cpp/Library/Data/KTRegisterNymphExtData.hh
similarity index 100%
rename from Library_v1/Data/KTRegisterNymphExtData.hh
rename to cpp/Library/Data/KTRegisterNymphExtData.hh
diff --git a/Library_v1/Data/KTTester.cc b/cpp/Library/Data/KTTester.cc
similarity index 100%
rename from Library_v1/Data/KTTester.cc
rename to cpp/Library/Data/KTTester.cc
diff --git a/Library_v1/Data/KTTester.hh b/cpp/Library/Data/KTTester.hh
similarity index 100%
rename from Library_v1/Data/KTTester.hh
rename to cpp/Library/Data/KTTester.hh
diff --git a/Library_v1/IO/KTJSONWriter.cc b/cpp/Library/IO/KTJSONWriter.cc
similarity index 100%
rename from Library_v1/IO/KTJSONWriter.cc
rename to cpp/Library/IO/KTJSONWriter.cc
diff --git a/Library_v1/IO/KTJSONWriter.hh b/cpp/Library/IO/KTJSONWriter.hh
similarity index 100%
rename from Library_v1/IO/KTJSONWriter.hh
rename to cpp/Library/IO/KTJSONWriter.hh
diff --git a/Library_v1/IO/KTReader.cc b/cpp/Library/IO/KTReader.cc
similarity index 100%
rename from Library_v1/IO/KTReader.cc
rename to cpp/Library/IO/KTReader.cc
diff --git a/Library_v1/IO/KTReader.hh b/cpp/Library/IO/KTReader.hh
similarity index 100%
rename from Library_v1/IO/KTReader.hh
rename to cpp/Library/IO/KTReader.hh
diff --git a/Library_v1/IO/KTWriter.cc b/cpp/Library/IO/KTWriter.cc
similarity index 100%
rename from Library_v1/IO/KTWriter.cc
rename to cpp/Library/IO/KTWriter.cc
diff --git a/Library_v1/IO/KTWriter.hh b/cpp/Library/IO/KTWriter.hh
similarity index 100%
rename from Library_v1/IO/KTWriter.hh
rename to cpp/Library/IO/KTWriter.hh
diff --git a/Library/Processor/ControlAccess.cc b/cpp/Library/Processor/ControlAccess.cc
similarity index 100%
rename from Library/Processor/ControlAccess.cc
rename to cpp/Library/Processor/ControlAccess.cc
diff --git a/Library/Processor/ControlAccess.hh b/cpp/Library/Processor/ControlAccess.hh
similarity index 100%
rename from Library/Processor/ControlAccess.hh
rename to cpp/Library/Processor/ControlAccess.hh
diff --git a/Library_v1/Processor/KTConnection.hh b/cpp/Library/Processor/KTConnection.hh
similarity index 100%
rename from Library_v1/Processor/KTConnection.hh
rename to cpp/Library/Processor/KTConnection.hh
diff --git a/Library_v1/Processor/KTNymphSignals.hh b/cpp/Library/Processor/KTNymphSignals.hh
similarity index 100%
rename from Library_v1/Processor/KTNymphSignals.hh
rename to cpp/Library/Processor/KTNymphSignals.hh
diff --git a/Library_v1/Processor/KTNymphSlot.hh b/cpp/Library/Processor/KTNymphSlot.hh
similarity index 100%
rename from Library_v1/Processor/KTNymphSlot.hh
rename to cpp/Library/Processor/KTNymphSlot.hh
diff --git a/Library_v1/Processor/KTPrimaryProcessor.cc b/cpp/Library/Processor/KTPrimaryProcessor.cc
similarity index 100%
rename from Library_v1/Processor/KTPrimaryProcessor.cc
rename to cpp/Library/Processor/KTPrimaryProcessor.cc
diff --git a/Library_v1/Processor/KTPrimaryProcessor.hh b/cpp/Library/Processor/KTPrimaryProcessor.hh
similarity index 100%
rename from Library_v1/Processor/KTPrimaryProcessor.hh
rename to cpp/Library/Processor/KTPrimaryProcessor.hh
diff --git a/Library_v1/Processor/KTProcessor.cc b/cpp/Library/Processor/KTProcessor.cc
similarity index 100%
rename from Library_v1/Processor/KTProcessor.cc
rename to cpp/Library/Processor/KTProcessor.cc
diff --git a/Library_v1/Processor/KTProcessor.hh b/cpp/Library/Processor/KTProcessor.hh
similarity index 100%
rename from Library_v1/Processor/KTProcessor.hh
rename to cpp/Library/Processor/KTProcessor.hh
diff --git a/Library_v1/Processor/KTSignal.hh b/cpp/Library/Processor/KTSignal.hh
similarity index 100%
rename from Library_v1/Processor/KTSignal.hh
rename to cpp/Library/Processor/KTSignal.hh
diff --git a/Library_v1/Processor/KTSignalSlotBase.hh b/cpp/Library/Processor/KTSignalSlotBase.hh
similarity index 100%
rename from Library_v1/Processor/KTSignalSlotBase.hh
rename to cpp/Library/Processor/KTSignalSlotBase.hh
diff --git a/Library_v1/Processor/KTSignalWrapper.cc b/cpp/Library/Processor/KTSignalWrapper.cc
similarity index 100%
rename from Library_v1/Processor/KTSignalWrapper.cc
rename to cpp/Library/Processor/KTSignalWrapper.cc
diff --git a/Library_v1/Processor/KTSignalWrapper.hh b/cpp/Library/Processor/KTSignalWrapper.hh
similarity index 100%
rename from Library_v1/Processor/KTSignalWrapper.hh
rename to cpp/Library/Processor/KTSignalWrapper.hh
diff --git a/Library_v1/Processor/KTSlot.hh b/cpp/Library/Processor/KTSlot.hh
similarity index 100%
rename from Library_v1/Processor/KTSlot.hh
rename to cpp/Library/Processor/KTSlot.hh
diff --git a/Library_v1/Processor/KTSlotWrapper.cc b/cpp/Library/Processor/KTSlotWrapper.cc
similarity index 100%
rename from Library_v1/Processor/KTSlotWrapper.cc
rename to cpp/Library/Processor/KTSlotWrapper.cc
diff --git a/Library_v1/Processor/KTSlotWrapper.hh b/cpp/Library/Processor/KTSlotWrapper.hh
similarity index 100%
rename from Library_v1/Processor/KTSlotWrapper.hh
rename to cpp/Library/Processor/KTSlotWrapper.hh
diff --git a/Library_v1/Processor/KTThreadReference.cc b/cpp/Library/Processor/KTThreadReference.cc
similarity index 100%
rename from Library_v1/Processor/KTThreadReference.cc
rename to cpp/Library/Processor/KTThreadReference.cc
diff --git a/Library_v1/Processor/KTThreadReference.hh b/cpp/Library/Processor/KTThreadReference.hh
similarity index 100%
rename from Library_v1/Processor/KTThreadReference.hh
rename to cpp/Library/Processor/KTThreadReference.hh
diff --git a/Library/Processor/PrimaryProcessor.cc b/cpp/Library/Processor/PrimaryProcessor.cc
similarity index 100%
rename from Library/Processor/PrimaryProcessor.cc
rename to cpp/Library/Processor/PrimaryProcessor.cc
diff --git a/Library/Processor/PrimaryProcessor.hh b/cpp/Library/Processor/PrimaryProcessor.hh
similarity index 100%
rename from Library/Processor/PrimaryProcessor.hh
rename to cpp/Library/Processor/PrimaryProcessor.hh
diff --git a/Library/Processor/Processor.cc b/cpp/Library/Processor/Processor.cc
similarity index 100%
rename from Library/Processor/Processor.cc
rename to cpp/Library/Processor/Processor.cc
diff --git a/Library/Processor/Processor.hh b/cpp/Library/Processor/Processor.hh
similarity index 100%
rename from Library/Processor/Processor.hh
rename to cpp/Library/Processor/Processor.hh
diff --git a/Library/Processor/ProcessorToolbox.cc b/cpp/Library/Processor/ProcessorToolbox.cc
similarity index 100%
rename from Library/Processor/ProcessorToolbox.cc
rename to cpp/Library/Processor/ProcessorToolbox.cc
diff --git a/Library/Processor/ProcessorToolbox.hh b/cpp/Library/Processor/ProcessorToolbox.hh
similarity index 100%
rename from Library/Processor/ProcessorToolbox.hh
rename to cpp/Library/Processor/ProcessorToolbox.hh
diff --git a/Library/Processor/QuitThread.hh b/cpp/Library/Processor/QuitThread.hh
similarity index 100%
rename from Library/Processor/QuitThread.hh
rename to cpp/Library/Processor/QuitThread.hh
diff --git a/Library/Processor/ReturnBuffer.cc b/cpp/Library/Processor/ReturnBuffer.cc
similarity index 100%
rename from Library/Processor/ReturnBuffer.cc
rename to cpp/Library/Processor/ReturnBuffer.cc
diff --git a/Library/Processor/ReturnBuffer.hh b/cpp/Library/Processor/ReturnBuffer.hh
similarity index 100%
rename from Library/Processor/ReturnBuffer.hh
rename to cpp/Library/Processor/ReturnBuffer.hh
diff --git a/Library/Processor/Signal.hh b/cpp/Library/Processor/Signal.hh
similarity index 100%
rename from Library/Processor/Signal.hh
rename to cpp/Library/Processor/Signal.hh
diff --git a/Library/Processor/SignalSlotBase.cc b/cpp/Library/Processor/SignalSlotBase.cc
similarity index 100%
rename from Library/Processor/SignalSlotBase.cc
rename to cpp/Library/Processor/SignalSlotBase.cc
diff --git a/Library/Processor/SignalSlotBase.hh b/cpp/Library/Processor/SignalSlotBase.hh
similarity index 100%
rename from Library/Processor/SignalSlotBase.hh
rename to cpp/Library/Processor/SignalSlotBase.hh
diff --git a/Library/Processor/Slot.hh b/cpp/Library/Processor/Slot.hh
similarity index 100%
rename from Library/Processor/Slot.hh
rename to cpp/Library/Processor/Slot.hh
diff --git a/Library/Utility/Exception.cc b/cpp/Library/Utility/Exception.cc
similarity index 100%
rename from Library/Utility/Exception.cc
rename to cpp/Library/Utility/Exception.cc
diff --git a/Library/Utility/Exception.hh b/cpp/Library/Utility/Exception.hh
similarity index 100%
rename from Library/Utility/Exception.hh
rename to cpp/Library/Utility/Exception.hh
diff --git a/Library_v1/Utility/KTCacheDirectory.cc b/cpp/Library/Utility/KTCacheDirectory.cc
similarity index 100%
rename from Library_v1/Utility/KTCacheDirectory.cc
rename to cpp/Library/Utility/KTCacheDirectory.cc
diff --git a/Library_v1/Utility/KTCacheDirectory.hh b/cpp/Library/Utility/KTCacheDirectory.hh
similarity index 100%
rename from Library_v1/Utility/KTCacheDirectory.hh
rename to cpp/Library/Utility/KTCacheDirectory.hh
diff --git a/Library_v1/Utility/KTConcurrentQueue.hh b/cpp/Library/Utility/KTConcurrentQueue.hh
similarity index 100%
rename from Library_v1/Utility/KTConcurrentQueue.hh
rename to cpp/Library/Utility/KTConcurrentQueue.hh
diff --git a/Library_v1/Utility/KTConfigurable.cc b/cpp/Library/Utility/KTConfigurable.cc
similarity index 100%
rename from Library_v1/Utility/KTConfigurable.cc
rename to cpp/Library/Utility/KTConfigurable.cc
diff --git a/Library_v1/Utility/KTConfigurable.hh b/cpp/Library/Utility/KTConfigurable.hh
similarity index 100%
rename from Library_v1/Utility/KTConfigurable.hh
rename to cpp/Library/Utility/KTConfigurable.hh
diff --git a/Library_v1/Utility/KTDirectory.cc b/cpp/Library/Utility/KTDirectory.cc
similarity index 100%
rename from Library_v1/Utility/KTDirectory.cc
rename to cpp/Library/Utility/KTDirectory.cc
diff --git a/Library_v1/Utility/KTDirectory.hh b/cpp/Library/Utility/KTDirectory.hh
similarity index 100%
rename from Library_v1/Utility/KTDirectory.hh
rename to cpp/Library/Utility/KTDirectory.hh
diff --git a/Library_v1/Utility/KTEventLoop.cc b/cpp/Library/Utility/KTEventLoop.cc
similarity index 100%
rename from Library_v1/Utility/KTEventLoop.cc
rename to cpp/Library/Utility/KTEventLoop.cc
diff --git a/Library_v1/Utility/KTEventLoop.hh b/cpp/Library/Utility/KTEventLoop.hh
similarity index 100%
rename from Library_v1/Utility/KTEventLoop.hh
rename to cpp/Library/Utility/KTEventLoop.hh
diff --git a/Library_v1/Utility/KTException.cc b/cpp/Library/Utility/KTException.cc
similarity index 100%
rename from Library_v1/Utility/KTException.cc
rename to cpp/Library/Utility/KTException.cc
diff --git a/Library_v1/Utility/KTException.hh b/cpp/Library/Utility/KTException.hh
similarity index 100%
rename from Library_v1/Utility/KTException.hh
rename to cpp/Library/Utility/KTException.hh
diff --git a/Library_v1/Utility/KTExtensible.hh b/cpp/Library/Utility/KTExtensible.hh
similarity index 100%
rename from Library_v1/Utility/KTExtensible.hh
rename to cpp/Library/Utility/KTExtensible.hh
diff --git a/Library_v1/Utility/KTExtensibleStruct.hh b/cpp/Library/Utility/KTExtensibleStruct.hh
similarity index 100%
rename from Library_v1/Utility/KTExtensibleStruct.hh
rename to cpp/Library/Utility/KTExtensibleStruct.hh
diff --git a/Library_v1/Utility/KTExtensibleStructFactory.hh b/cpp/Library/Utility/KTExtensibleStructFactory.hh
similarity index 100%
rename from Library_v1/Utility/KTExtensibleStructFactory.hh
rename to cpp/Library/Utility/KTExtensibleStructFactory.hh
diff --git a/Library_v1/Utility/KTLogger.hh b/cpp/Library/Utility/KTLogger.hh
similarity index 100%
rename from Library_v1/Utility/KTLogger.hh
rename to cpp/Library/Utility/KTLogger.hh
diff --git a/Library_v1/Utility/KTMemberVariable.hh b/cpp/Library/Utility/KTMemberVariable.hh
similarity index 100%
rename from Library_v1/Utility/KTMemberVariable.hh
rename to cpp/Library/Utility/KTMemberVariable.hh
diff --git a/Library_v1/Utility/KTTIFactory.hh b/cpp/Library/Utility/KTTIFactory.hh
similarity index 100%
rename from Library_v1/Utility/KTTIFactory.hh
rename to cpp/Library/Utility/KTTIFactory.hh
diff --git a/Library_v1/Utility/KTTime.cc b/cpp/Library/Utility/KTTime.cc
similarity index 100%
rename from Library_v1/Utility/KTTime.cc
rename to cpp/Library/Utility/KTTime.cc
diff --git a/Library_v1/Utility/KTTime.hh b/cpp/Library/Utility/KTTime.hh
similarity index 100%
rename from Library_v1/Utility/KTTime.hh
rename to cpp/Library/Utility/KTTime.hh
diff --git a/Library/Utility/MemberVariable.hh b/cpp/Library/Utility/MemberVariable.hh
similarity index 100%
rename from Library/Utility/MemberVariable.hh
rename to cpp/Library/Utility/MemberVariable.hh
diff --git a/Templates/KTProcessorTemplate.cc b/cpp/Templates/KTProcessorTemplate.cc
similarity index 100%
rename from Templates/KTProcessorTemplate.cc
rename to cpp/Templates/KTProcessorTemplate.cc
diff --git a/Templates/KTProcessorTemplate.hh b/cpp/Templates/KTProcessorTemplate.hh
similarity index 100%
rename from Templates/KTProcessorTemplate.hh
rename to cpp/Templates/KTProcessorTemplate.hh
diff --git a/Templates/MainCMakeLists.txt b/cpp/Templates/MainCMakeLists.txt
similarity index 100%
rename from Templates/MainCMakeLists.txt
rename to cpp/Templates/MainCMakeLists.txt
diff --git a/Library_v1/AddLibPythonPath.sh.in b/python/nymph/AddLibPythonPath.sh.in
similarity index 100%
rename from Library_v1/AddLibPythonPath.sh.in
rename to python/nymph/AddLibPythonPath.sh.in
diff --git a/python/nymph/CMakeLists.txt b/python/nymph/CMakeLists.txt
new file mode 100644
index 0000000..0d0f0e8
--- /dev/null
+++ b/python/nymph/CMakeLists.txt
@@ -0,0 +1,60 @@
+# CMakeLists for Nymph/python/Library
+# Author: N.S. Oblath
+
+#include( PythonPackage )
+
+set( UTIL_DIR Utility )
+set( DATA_DIR Data )
+set( PROC_DIR Processor )
+set( IO_DIR IO )
+set( APPL_DIR Application )
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
+)
+
+set( NYMPH_HEADERFILES
+
+)
+
+set( NYMPH_SOURCEFILES
+
+)
+
+##################################################
+
+
+# Python binding headers
+set( NYMPH_PYBINDING_HEADERFILES
+    #${UTIL_DIR}/KTConfigurablePybind.hh
+    ${UTIL_DIR}/KTParamPybind.hh
+    ${PROC_DIR}/KTProcessorPybind.hh
+    ${PROC_DIR}/KTPyProcessor.hh
+)
+
+# Python bindings
+set( NYMPH_PYBINDING_SOURCEFILES
+    ${PROC_DIR}/KTProcessorPybind.cc
+    NymphPybind.cc
+)
+
+##################################################
+
+pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
+pbuilder_install_headers( ${NYMPH_HEADERFILES} )
+
+if( Nymph_ENABLE_PYTHON )
+    set( LIB_DEPENDENCIES Nymph )
+
+    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
+    
+    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
+    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
+    pbuilder_install_libraries( py_nymph )
+    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
+endif( Nymph_ENABLE_PYTHON )
\ No newline at end of file
diff --git a/Library_v1/Utility/KTConfigurablePybind.hh b/python/nymph/KTConfigurablePybind.hh
similarity index 100%
rename from Library_v1/Utility/KTConfigurablePybind.hh
rename to python/nymph/KTConfigurablePybind.hh
diff --git a/Library_v1/Utility/KTParamPybind.hh b/python/nymph/KTParamPybind.hh
similarity index 100%
rename from Library_v1/Utility/KTParamPybind.hh
rename to python/nymph/KTParamPybind.hh
diff --git a/Library_v1/Processor/KTProcessorPybind.cc b/python/nymph/KTProcessorPybind.cc
similarity index 100%
rename from Library_v1/Processor/KTProcessorPybind.cc
rename to python/nymph/KTProcessorPybind.cc
diff --git a/Library_v1/Processor/KTProcessorPybind.hh b/python/nymph/KTProcessorPybind.hh
similarity index 100%
rename from Library_v1/Processor/KTProcessorPybind.hh
rename to python/nymph/KTProcessorPybind.hh
diff --git a/Library_v1/Application/KTProcessorToolboxPybind.hh b/python/nymph/KTProcessorToolboxPybind.hh
similarity index 100%
rename from Library_v1/Application/KTProcessorToolboxPybind.hh
rename to python/nymph/KTProcessorToolboxPybind.hh
diff --git a/Library_v1/Processor/KTPyProcessor.hh b/python/nymph/KTPyProcessor.hh
similarity index 100%
rename from Library_v1/Processor/KTPyProcessor.hh
rename to python/nymph/KTPyProcessor.hh
diff --git a/Library_v1/Utility/KTPythonMacros.hh b/python/nymph/KTPythonMacros.hh
similarity index 100%
rename from Library_v1/Utility/KTPythonMacros.hh
rename to python/nymph/KTPythonMacros.hh
diff --git a/Library_v1/NymphPybind.cc b/python/nymph/NymphPybind.cc
similarity index 100%
rename from Library_v1/NymphPybind.cc
rename to python/nymph/NymphPybind.cc
diff --git a/python/nymph/__init__.py b/python/nymph/__init__.py
new file mode 100644
index 0000000..e69de29

From 3a1361c73d408cf29d6540c7290a5237069cdab7 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Wed, 26 Jan 2022 08:07:00 -0500
Subject: [PATCH 240/521] Fixed paths in top-level CMakeLists.txt file and the
 cmake/Nymph.cmake file

---
 CMakeLists.txt    | 2 +-
 cmake/Nymph.cmake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c3845f..98d35df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,7 +126,7 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 add_subdirectory( Library )
 
 #if (Nymph_ENABLE_EXECUTABLES)
-#    add_subdirectory( Executables/Main )
+#    add_subdirectory( cpp/Executables )
 #endif (Nymph_ENABLE_EXECUTABLES )
 
 
diff --git a/cmake/Nymph.cmake b/cmake/Nymph.cmake
index 1d4d1ef..0519239 100644
--- a/cmake/Nymph.cmake
+++ b/cmake/Nymph.cmake
@@ -55,6 +55,6 @@ macro (nymph_process_options)
 endmacro ()
 
 macro (nymph_build_executables)
-	add_subdirectory (${NYMPH_DIR}/Executables/Main)
+	add_subdirectory (${NYMPH_DIR}/Executables)
 endmacro ()
 

From 234a36518e3d9c12927d7350b5ff6fe3b7a038ae Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 26 Jan 2022 08:54:52 -0800
Subject: [PATCH 241/521] Added SlotData and DataPresent

---
 Library/CMakeLists.txt      |   5 +
 Library/Data/DataPresent.hh |  48 +++++
 Library/Data/SignalData.hh  |   2 +-
 Library/Data/SlotData.hh    | 386 ++++++++++++++++++++++++++++++++++++
 Testing/CMakeLists.txt      |   1 +
 Testing/TestSlotData.cc     |  36 ++++
 6 files changed, 477 insertions(+), 1 deletion(-)
 create mode 100644 Library/Data/DataPresent.hh
 create mode 100644 Library/Data/SlotData.hh
 create mode 100644 Testing/TestSlotData.cc

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index ce67dfb..4584597 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -25,12 +25,17 @@ set( NYMPH_HEADERFILES
 
     ${DATA_DIR}/Data.hh
     ${DATA_DIR}/DataFrame.hh
+    ${DATA_DIR}/DataPresent.hh
+    ${DATA_DIR}/SignalData.hh
+    ${DATA_DIR}/SlotData.hh
     
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
     ${PROC_DIR}/QuitChain.hh
+    ${PROC_DIR}/Signal.hh
     ${PROC_DIR}/SignalSlotBase.hh
+    ${PROC_DIR}/Slot.hh
 
     ${CONT_DIR}/ControlAccess.hh
     ${CONT_DIR}/Controller.hh
diff --git a/Library/Data/DataPresent.hh b/Library/Data/DataPresent.hh
new file mode 100644
index 0000000..50272aa
--- /dev/null
+++ b/Library/Data/DataPresent.hh
@@ -0,0 +1,48 @@
+ 
+
+#ifndef NYMPH_DATAPRESENT_HH_
+#define NYMPH_DATAPRESENT_HH_
+
+#include "DataFrame.hh"
+
+#include "logger.hh"
+ 
+namespace Nymph
+{
+    LOGGER( dplog_h, "DataPresent" );
+ 
+    // Recursive helper structs for determining if data objects are present
+
+    // End of the recursion; this will only be used if NoOtherDataTypes has nothing in it
+    template< class... NoOtherDataTypes >
+    struct DataPresentHelper
+    {
+        static bool DataPresent( const DataFrame& );
+    };
+
+    template< class XDataType, class... XOtherDataTypes >
+    struct DataPresentHelper< XDataType, XOtherDataTypes... >
+    {
+        static bool DataPresent( const DataFrame& frame );
+    };
+
+    template< class... NoOtherDataTypes >
+    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( const DataFrame& )
+    {
+        return true;
+    }
+
+    template< class XDataType, class... XOtherDataTypes >
+    bool DataPresentHelper< XDataType, XOtherDataTypes... >::DataPresent( const DataFrame& frame )
+    {
+        if( ! frame.Has< XDataType >() )
+        {
+            LERROR( dplog_h, "Data not found with type <" << scarab::type(XDataType()) << ">" );
+            return false;
+        }
+        return DataPresentHelper< XOtherDataTypes... >::DataPresent( frame );
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATAPRESENT_HH_ */
diff --git a/Library/Data/SignalData.hh b/Library/Data/SignalData.hh
index f3cdd97..4290ae2 100644
--- a/Library/Data/SignalData.hh
+++ b/Library/Data/SignalData.hh
@@ -38,7 +38,7 @@ namespace Nymph
 
      That's it!
     */
-    typedef KTSignal< DataFrame > SignalData;
+    typedef Signal< DataFrame > SignalData;
 
 } /* namespace Nymph */
 
diff --git a/Library/Data/SlotData.hh b/Library/Data/SlotData.hh
new file mode 100644
index 0000000..4fd9ebe
--- /dev/null
+++ b/Library/Data/SlotData.hh
@@ -0,0 +1,386 @@
+/*
+ * SlotData.hh
+ *
+ *  Created on: Jan 25, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_SLOTDATA_HH_
+#define NYMPH_SLOTDATA_HH_
+
+#include "Slot.hh"
+
+#include "DataPresent.hh"
+
+//#include "KTException.hh"
+//#include "KTNymphSignals.hh"
+//#include "KTProcessor.hh"
+
+namespace Nymph
+{
+    template< class... XTypes >
+    struct TypeList {};
+
+    template< class... XTypes >
+    using In = TypeList< XTypes... >;
+
+    template< class... XTypes >
+    using Out = TypeList< XTypes... >;
+
+    template< class XInList, class XOutList >
+    class SlotData;
+
+    class Processor;
+
+    /*!
+     @class SlotData
+     @author N. S. Oblath
+
+     @brief Creates a slot that takes a DataFrame object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
+
+     @details
+     Usage:
+     This slot type adds the slot function (signature void (KTDataHandle).
+     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
+     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
+
+     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
+    class SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> > : public Slot< DataFrame >
+    {
+        public:
+            template< class XFuncOwnerType >
+            using Signature = void (XFuncOwnerType::*)( XInTypes&..., XOutTypes&... );
+
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            SlotData( const std::string& name, XFuncOwnerType* owner, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            //template< class XFuncOwnerType, class... XFuncDataTypes >
+            //KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            SlotData( const std::string& name, Processor* proc, XFuncOwnerType* owner, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            //template< class XFuncOwnerType, class... XFuncDataTypes >
+            //KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            virtual ~SlotData();
+
+            void operator()( DataFrame frame );
+
+        protected:
+            template< class... XDataTypes >
+            bool DataPresent( const DataFrame& frame ) const;
+
+            //function_signature fFunc;
+            std::function< void (const XInTypes&..., XOutTypes&... ) > fFunc;
+
+            SignalData* fSignalPtr;
+    };
+/*
+    // partial specialization for no new data type
+    template< class... XDataArgs >
+    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            virtual ~KTSlotData();
+
+            void operator()( KTDataHandle data );
+
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            //function_signature fFunc;
+            std::function< void (const XDataArgs&...) > fFunc;
+
+            KTSignalData* fSignalPtr;
+    };
+*/
+
+    /*!
+     @class KTSlotDone
+     @author N. S. Oblath
+
+     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
+
+     @details
+     Usage:
+     This slot type adds the slot function (signature void ()).
+     Your processor (or, optionally, a different object) must have a member function with the signature void ().
+     The slot calls the member function.
+
+     In your Processor's header add a member variable of type KTDoneSlot.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+/*
+    class KTSlotDone : public KTSlot<>
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
+            virtual ~KTSlotDone();
+
+            void operator()();
+
+        protected:
+            std::function< void () > fFunc;
+
+            KTSignalDone* fSignalPtr;
+    };
+*/
+
+    //*******************
+    // Implementations
+    //*******************
+
+    // KTSlotData
+
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
+    template< class XFuncOwnerType >
+    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, XFuncOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
+            Slot( name, this, &SlotData::operator() ),
+            fFunc( [func, owner]( XInTypes&... inArgs, XOutTypes&... outArgs ){ owner->func( inArgs..., outArgs... ); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+/*
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+*/
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
+    template< class XFuncOwnerType >
+    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, Processor* proc, XFuncOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
+            Slot( name, proc, this, &SlotData::operator(), { signalPtr->Name()} ),
+            fFunc( [func, owner]( XInTypes&... inArgs, XOutTypes&... outArgs ){ owner->func( inArgs..., outArgs... ); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+/*
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+*/
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
+    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::~SlotData()
+    {
+    }
+
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
+    void SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::operator()( DataFrame frame )
+    {
+        // Standard data slot pattern:
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XInTypes... >( frame ) )
+        {
+            THROW_EXCEPT_HERE( Exception() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( frame.Get< XInTypes >()... , frame.Get< XOutTypes >()... );
+        }
+        catch( scarab::base_exception& )
+        {
+            THROW_NESTED_EXCEPT_HERE( Exception() << "Something went wrong in slot <" + fName + ">. Aborting." );
+            return;
+        }
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr )
+        {
+            (*fSignalPtr)( frame );
+        }
+        return;
+    }
+
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
+    template< class... XDataTypes >
+    bool SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::DataPresent( const DataFrame& frame ) const
+    {
+        return DataPresentHelper< XDataTypes... >::DataPresent( frame );
+    }
+
+/*
+    // KTSlotData with no return type
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    KTSlotData< void, XDataTypes... >::~KTSlotData()
+    {
+    }
+
+    template< class... XDataTypes >
+    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    {
+        // Standard data slot pattern:
+
+        std::shared_ptr< KTThreadReference > ref = fThreadRef;
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( dataHandle->Of< XDataTypes >()... );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
+            ref->SetReturnException( boost::current_exception() );
+        }
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fDoBreakpoint );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)( dataHandle );
+        }
+        return;
+    }
+
+    template< class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
+*/
+/*
+    // KTSlotDone
+
+    template< class XFuncOwnerType >
+    KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XFuncOwnerType >
+    KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    inline KTSlotDone::~KTSlotDone()
+    {
+    }
+
+    inline void KTSlotDone::operator()()
+    {
+        // Call the function
+        fFunc();
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        fThreadRef->Break( KTDataHandle(), fDoBreakpoint );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)();
+        }
+        return;
+    }
+*/
+} /* namespace Nymph */
+
+#endif /* NYMPH_SLOTDATA_HH_ */
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index b60f8e2..4ad50b0 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -23,6 +23,7 @@ set( testing_SOURCES
     TestProcessorToolbox.cc
     TestSignalSlot.cc
     TestSingleRunController.cc
+    TestSlotData.cc
     UseCatch.cc
 )
 
diff --git a/Testing/TestSlotData.cc b/Testing/TestSlotData.cc
new file mode 100644
index 0000000..394758d
--- /dev/null
+++ b/Testing/TestSlotData.cc
@@ -0,0 +1,36 @@
+/*
+ * TestSlotData.cc
+ *
+ *  Created on: Jan 25, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "TestDataProcessorClasses.hh"
+
+#include "catch.hpp"
+
+TEST_CASE( "signal_slot", "[slot],[data]" )
+{
+    using namespace Nymph;
+
+// TODO: test creation of slot with:
+//   * proc == owner; no return; multiple inputs
+//   * proc == owner; multiple returns; multiple inputs
+//   * proc != owner; no return; multiple inputs
+//   * proc= != owner; multiple returns; multiple inputs
+
+// TODO: test calling of function
+//   * multiple inputs; data not present; throws exception
+//   * multiple inputs; multiple output; call is successful
+//   * call throws
+
+// TODO: test signal emmission
+
+    Adder adder;
+    adder.SetValue( 5 );
+
+
+
+}
+
+

From b1c0f6d24af985e9d59e5e177f2fd02d015fb2ef Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 26 Jan 2022 08:55:46 -0800
Subject: [PATCH 242/521] Removed string initializer_lists from Slot
 initialization

---
 Library/Processor/Processor.cc  |  2 +-
 Library/Processor/Processor.hh  |  2 +-
 Library/Processor/Slot.hh       | 30 +++++++++++++++---------------
 Testing/TestProcessorClasses.hh |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index f53bbe5..e65bedb 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -97,7 +97,7 @@ namespace Nymph
         return;
     }
 
-    void Processor::RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals )
+    void Processor::RegisterSlot( std::string name, SlotBase* slot )
     {
         LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
         fSlots.insert( SlotMapVal(name, slot) );
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index 849014e..da67d52 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -86,7 +86,7 @@ namespace Nymph
             void RegisterSignal( std::string name, SignalBase* signal );
 
             /// Register a slot object with this processor
-            void RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals = {} );
+            void RegisterSlot( std::string name, SlotBase* slot );
 
             bool GetDoBreakpoint( const std::string& signalName );
             void SetDoBreakpoint( const std::string& signalName, bool flag );
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index c53377e..912aefc 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -44,19 +44,19 @@ namespace Nymph
             Slot( const std::string& name, const boost::function< signature >& func );
             /// Owned slot, non-const member function
             template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
+            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) );
             /// Owned slot, const member function
             template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
+            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const );
             /// Owned slot, generic function
             template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
+            Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func );
             /// Owned slot, non-const member fuction of another class
             template< typename XOwner, typename XFuncClass >
-            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
+            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) );
             /// Owned slot, const member fuction of another class
             template< typename XOwner, typename XFuncClass >
-            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
+            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const );
             Slot( const Slot& ) = delete;
             Slot( Slot&& ) = delete;
             virtual ~Slot();
@@ -133,57 +133,57 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) ) :
             SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
-        owner->RegisterSlot( name, this, signals );
+        owner->RegisterSlot( name, this );
     }
 
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const ) :
             SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
-        owner->RegisterSlot( name, this, signals );
+        owner->RegisterSlot( name, this );
     }
 
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func ) :
             SlotBase( name ),
             fFunction( func ),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
-        owner->RegisterSlot( name, this, signals );
+        owner->RegisterSlot( name, this );
     }
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) ) :
             SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
-        owner->RegisterSlot( name, this, signals );
+        owner->RegisterSlot( name, this );
     }
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const ) :
             SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
             //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
-        owner->RegisterSlot( name, this, signals );
+        owner->RegisterSlot( name, this );
     }
 
     template< typename... XArgs >
diff --git a/Testing/TestProcessorClasses.hh b/Testing/TestProcessorClasses.hh
index 8849853..aaeb6ed 100644
--- a/Testing/TestProcessorClasses.hh
+++ b/Testing/TestProcessorClasses.hh
@@ -32,7 +32,7 @@ namespace Nymph
                     fValueSig( "value", this ),
                     fValueSlot( "value", this, &TestProc::SetValue ),
                     fSecondValueSig( "second-value", this ),
-                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
+                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction ),
                     fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
             {}
 

From d1df7164b154fac12f10e54fc3e419b8d8a03a0d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 26 Jan 2022 08:56:16 -0800
Subject: [PATCH 243/521] Added TestDataProcessorClasses (incomplete)

---
 Testing/TestDataProcessorClasses.hh | 57 +++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 Testing/TestDataProcessorClasses.hh

diff --git a/Testing/TestDataProcessorClasses.hh b/Testing/TestDataProcessorClasses.hh
new file mode 100644
index 0000000..84e0330
--- /dev/null
+++ b/Testing/TestDataProcessorClasses.hh
@@ -0,0 +1,57 @@
+/*
+ * TestProcessorClasses.hh
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "TestDataClasses.hh"
+
+#include "Processor.hh"
+#include "SignalData.hh"
+#include "SlotData.hh"
+
+
+namespace Nymph
+{
+    // This processor has a data slot that takes TestData1 as input and has no output
+    class Adder : public Processor
+    {
+        public:
+            Adder( const std::string& name = "adder" ) :
+                    Processor( name ),
+                    fValue( 0 ),
+                    fAddSignal( "add", this ),
+                    fAddSlotWithSig( "add-sig", this, &Adder::Add, &fAddSignal ),
+                    fAddSlotNoSig( "add-no-sig", this, &Adder::Add )
+            {}
+
+            virtual ~Adder()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                fValue = node.get_value( "value", fValue );
+
+                return;
+            }
+
+            MEMVAR( int, Value );
+
+        public:
+            void Add( TestData1& data )
+            {
+                data.SetIValue1( data.GetIValue1() + fValue );
+                data.SetIValue2( data.GetIValue2() + fValue );
+                return;
+            }
+
+        public:
+            SignalData fAddSignal;
+
+            SlotData< In<TestData1>, Out<> > fAddSlotWithSig;
+            SlotData< In<TestData1>, Out<> > fAddSlotNoSig;
+
+    };
+
+}

From 797faad00ebf0d34bcb6b1be0348f052dc6e74f1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 26 Jan 2022 08:57:33 -0800
Subject: [PATCH 244/521] By default, tmate session is off

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d5611e5..805db06 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -99,7 +99,7 @@ jobs:
           Testing/RunTests
 
 # For debugging
-      - name: Setup tmate session
-        if: ${{ ! success() }}
-        uses: mxschmitt/action-tmate@v3
+#      - name: Setup tmate session
+#        if: ${{ ! success() }}
+#        uses: mxschmitt/action-tmate@v3
 

From 0e3ba34f019c00c558b28f25f98318d3c3298dbe Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Thu, 27 Jan 2022 07:01:30 -0500
Subject: [PATCH 245/521] modified a path in the CMakeLists file, the build
 appears to be working now

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98d35df..c60b12c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 # Build Nymph #
 ###############
 
-add_subdirectory( Library )
+add_subdirectory( cpp/Library )
 
 #if (Nymph_ENABLE_EXECUTABLES)
 #    add_subdirectory( cpp/Executables )

From 1f7dd25801effc5eb731f7bb9f49379e6c177f9c Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Thu, 27 Jan 2022 07:11:27 -0500
Subject: [PATCH 246/521] found another path which was incorrect

---
 cmake/Nymph.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Nymph.cmake b/cmake/Nymph.cmake
index 0519239..12a46fd 100644
--- a/cmake/Nymph.cmake
+++ b/cmake/Nymph.cmake
@@ -55,6 +55,6 @@ macro (nymph_process_options)
 endmacro ()
 
 macro (nymph_build_executables)
-	add_subdirectory (${NYMPH_DIR}/Executables)
+	add_subdirectory (${NYMPH_DIR}/cpp/Executables)
 endmacro ()
 

From 50ddb9f15e706434099938edb584df3333eda323 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Thu, 27 Jan 2022 07:45:23 -0500
Subject: [PATCH 247/521] added a couple cmakelists files where they were
 needed. Created separate validation dir insided testing to keep those
 separate for now.

---
 Testing/CMakeLists.txt                        | 141 ++++++++++++++++++
 .../{TestingCMakeLists.txt => CMakeLists.txt} |   2 +-
 .../CMakeLists.txt}                           |   2 +-
 .../ConfigFiles/TestConfigurator.json         |   0
 .../ConfigFiles/TestParameterStoreConfig.json |   0
 .../{ => Validation}/KTTestConfigurable.cc    |   0
 .../{ => Validation}/KTTestConfigurable.hh    |   0
 Testing/cpp/{ => Validation}/KTTestCuts.cc    |   0
 Testing/cpp/{ => Validation}/KTTestCuts.hh    |   0
 Testing/cpp/{ => Validation}/KTTestData.cc    |   0
 .../cpp/{ => Validation}/KTTestProcessor.cc   |   0
 .../cpp/{ => Validation}/KTTestProcessor.hh   |   0
 .../cpp/{ => Validation}/TestApplication.cc   |   0
 Testing/cpp/{ => Validation}/TestApplyCut.cc  |   0
 .../{ => Validation}/TestCacheDirectory.cc    |   0
 Testing/cpp/{ => Validation}/TestCut.cc       |   0
 Testing/cpp/{ => Validation}/TestCutFilter.cc |   0
 Testing/cpp/{ => Validation}/TestLogger.cc    |   0
 Testing/cpp/{ => Validation}/TestPrintData.cc |   0
 .../{ => Validation}/TestSignalsAndSlots.cc   |   0
 .../TestThroughputProfiler.cc                 |   0
 Testing/python/CMakeLists.txt                 |  89 +++++------
 .../python/ConfigFiles/TestConfigurator.json  |  41 +++++
 .../ConfigFiles/TestParameterStoreConfig.json |  23 +++
 cpp/Executables/CMakeLists.txt                |   2 +-
 25 files changed, 253 insertions(+), 47 deletions(-)
 create mode 100644 Testing/CMakeLists.txt
 rename Testing/cpp/{TestingCMakeLists.txt => CMakeLists.txt} (96%)
 rename Testing/cpp/{ValidationCMakeLists.txt => Validation/CMakeLists.txt} (97%)
 rename Testing/cpp/{ => Validation}/ConfigFiles/TestConfigurator.json (100%)
 rename Testing/cpp/{ => Validation}/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename Testing/cpp/{ => Validation}/KTTestConfigurable.cc (100%)
 rename Testing/cpp/{ => Validation}/KTTestConfigurable.hh (100%)
 rename Testing/cpp/{ => Validation}/KTTestCuts.cc (100%)
 rename Testing/cpp/{ => Validation}/KTTestCuts.hh (100%)
 rename Testing/cpp/{ => Validation}/KTTestData.cc (100%)
 rename Testing/cpp/{ => Validation}/KTTestProcessor.cc (100%)
 rename Testing/cpp/{ => Validation}/KTTestProcessor.hh (100%)
 rename Testing/cpp/{ => Validation}/TestApplication.cc (100%)
 rename Testing/cpp/{ => Validation}/TestApplyCut.cc (100%)
 rename Testing/cpp/{ => Validation}/TestCacheDirectory.cc (100%)
 rename Testing/cpp/{ => Validation}/TestCut.cc (100%)
 rename Testing/cpp/{ => Validation}/TestCutFilter.cc (100%)
 rename Testing/cpp/{ => Validation}/TestLogger.cc (100%)
 rename Testing/cpp/{ => Validation}/TestPrintData.cc (100%)
 rename Testing/cpp/{ => Validation}/TestSignalsAndSlots.cc (100%)
 rename Testing/cpp/{ => Validation}/TestThroughputProfiler.cc (100%)
 create mode 100644 Testing/python/ConfigFiles/TestConfigurator.json
 create mode 100644 Testing/python/ConfigFiles/TestParameterStoreConfig.json

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
new file mode 100644
index 0000000..2f23190
--- /dev/null
+++ b/Testing/CMakeLists.txt
@@ -0,0 +1,141 @@
+# CMakeLists for Nymph/Testing
+# Author: N.S. Oblath
+
+set( PY_DIR python )
+set( CPP_DIR cpp )
+#set( PROC_DIR Processor )
+#set( IO_DIR IO )
+#set( APPL_DIR Application )
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${CPP_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
+)
+
+# copied from Nymph/cpp/Library CMakeLists.txt file
+
+#set( NYMPH_HEADERFILES
+#    ${UTIL_DIR}/Exception.hh
+#    ${UTIL_DIR}/MemberVariable.hh
+#
+#    ${DATA_DIR}/Data.hh
+#    ${DATA_DIR}/DataFrame.hh
+#    
+#    ${PROC_DIR}/ControlAccess.hh
+#    ${PROC_DIR}/PrimaryProcessor.hh
+#    ${PROC_DIR}/Processor.hh
+#    ${PROC_DIR}/ProcessorToolbox.hh
+#    ${PROC_DIR}/QuitThread.hh
+#    ${PROC_DIR}/ReturnBuffer.hh
+#    ${PROC_DIR}/SignalSlotBase.hh
+
+# Below are the v1 Library files
+
+#    ${UTIL_DIR}/KTCacheDirectory.hh
+#    ${UTIL_DIR}/KTConcurrentQueue.hh
+#    ${UTIL_DIR}/KTConfigurable.hh
+#    ${UTIL_DIR}/KTDirectory.hh
+#    ${UTIL_DIR}/KTEventLoop.hh
+#    ${UTIL_DIR}/KTException.hh
+#    ${UTIL_DIR}/KTExtensible.hh
+#    ${UTIL_DIR}/KTExtensibleStruct.hh
+#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
+#    ${UTIL_DIR}/KTLogger.hh
+#    ${UTIL_DIR}/KTMemberVariable.hh
+#    ${UTIL_DIR}/KTTIFactory.hh
+#    ${UTIL_DIR}/KTTime.hh
+#    ${DATA_DIR}/KTApplyCut.hh
+#    ${DATA_DIR}/KTCoreData.hh
+#    ${DATA_DIR}/KTCut.hh
+#    ${DATA_DIR}/KTCutFilter.hh
+#    ${DATA_DIR}/KTCutResult.hh
+#    ${DATA_DIR}/KTCutStatus.hh
+#    ${DATA_DIR}/KTData.hh
+#    ${DATA_DIR}/KTRegisterNymphExtData.hh
+#    ${PROC_DIR}/KTConnection.hh
+#    ${PROC_DIR}/KTPrimaryProcessor.hh
+#    ${PROC_DIR}/KTProcessor.hh
+#    ${PROC_DIR}/KTSignal.hh
+#    ${PROC_DIR}/KTSignalWrapper.hh
+#    ${PROC_DIR}/KTSlot.hh
+#    ${PROC_DIR}/KTSlotWrapper.hh
+#    ${PROC_DIR}/KTThreadReference.hh
+#    ${IO_DIR}/KTJSONWriter.hh
+#    ${IO_DIR}/KTReader.hh
+#    ${IO_DIR}/KTWriter.hh
+#    ${APPL_DIR}/KTApplication.hh
+#    ${APPL_DIR}/KTCommandLineHandler.hh
+#    ${APPL_DIR}/KTCommandLineOption.hh
+#    ${APPL_DIR}/KTConfigurator.hh
+#    ${APPL_DIR}/KTDataQueueProcessor.hh
+#    ${APPL_DIR}/KTFilenameParsers.hh
+#    ${APPL_DIR}/KTPrintDataStructure.hh
+#    ${APPL_DIR}/KTProcessorToolbox.hh
+#    ${APPL_DIR}/KTRunNymph.hh
+#    ${APPL_DIR}/KTThroughputProfiler.hh
+#)
+
+#set( NYMPH_SOURCEFILES
+#    ${UTIL_DIR}/Exception.cc
+#
+#    ${DATA_DIR}/Data.cc
+#    ${DATA_DIR}/DataFrame.cc
+    
+#    ${PROC_DIR}/ControlAccess.cc
+#    ${PROC_DIR}/PrimaryProcessor.cc
+#    ${PROC_DIR}/Processor.cc
+#    ${PROC_DIR}/ProcessorToolbox.cc
+#    ${PROC_DIR}/ReturnBuffer.cc
+#    ${PROC_DIR}/SignalSlotBase.cc
+
+# Below are the v1 Library files
+
+#    ${UTIL_DIR}/KTCacheDirectory.cc
+#    ${UTIL_DIR}/KTConfigurable.cc
+#    ${UTIL_DIR}/KTDirectory.cc
+#    ${UTIL_DIR}/KTEventLoop.cc
+#    ${UTIL_DIR}/KTException.cc
+#    ${UTIL_DIR}/KTTime.cc
+#    ${DATA_DIR}/KTApplyCut.cc
+#    ${DATA_DIR}/KTCoreData.cc
+#    ${DATA_DIR}/KTCut.cc
+#    ${DATA_DIR}/KTCutFilter.cc
+#    ${DATA_DIR}/KTCutStatus.cc
+#    ${DATA_DIR}/KTData.cc
+#    ${PROC_DIR}/KTPrimaryProcessor.cc
+#    ${PROC_DIR}/KTProcessor.cc
+#    ${PROC_DIR}/KTSignalWrapper.cc
+#    ${PROC_DIR}/KTSlotWrapper.cc
+#    ${PROC_DIR}/KTThreadReference.cc
+#    ${IO_DIR}/KTJSONWriter.cc
+#    ${IO_DIR}/KTReader.cc
+#    ${IO_DIR}/KTWriter.cc
+#    ${APPL_DIR}/KTApplication.cc
+#    ${APPL_DIR}/KTCommandLineHandler.cc
+#    ${APPL_DIR}/KTConfigurator.cc
+#    ${APPL_DIR}/KTDataQueueProcessor.cc
+#    ${APPL_DIR}/KTFilenameParsers.cc
+#    ${APPL_DIR}/KTPrintDataStructure.cc
+#    ${APPL_DIR}/KTProcessorToolbox.cc
+#    ${APPL_DIR}/KTRunNymph.cc
+#    ${APPL_DIR}/KTThroughputProfiler.cc
+#)
+
+
+##################################################
+
+#pbuilder_library( 
+#    TARGET Nymph 
+#    SOURCES ${NYMPH_SOURCEFILES}
+#    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+#)
+
+#pbuilder_component_install_and_export( 
+#    COMPONENT Library
+#    LIBTARGETS Nymph
+#)
+
+#pbuilder_install_headers( ${NYMPH_HEADERFILES} )
diff --git a/Testing/cpp/TestingCMakeLists.txt b/Testing/cpp/CMakeLists.txt
similarity index 96%
rename from Testing/cpp/TestingCMakeLists.txt
rename to Testing/cpp/CMakeLists.txt
index 753efc6..7e0255f 100644
--- a/Testing/cpp/TestingCMakeLists.txt
+++ b/Testing/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists.txt for Nymph/Testing
+# CMakeLists.txt for Nymph/cpp/Testing
 # Author: N.S. Oblath
 # Created: Aug 23, 2019
 
diff --git a/Testing/cpp/ValidationCMakeLists.txt b/Testing/cpp/Validation/CMakeLists.txt
similarity index 97%
rename from Testing/cpp/ValidationCMakeLists.txt
rename to Testing/cpp/Validation/CMakeLists.txt
index b40d929..2eb1b4f 100644
--- a/Testing/cpp/ValidationCMakeLists.txt
+++ b/Testing/cpp/Validation/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for Nymph/Executables/Validation
+# CMakeLists for Nymph/Testing/cpp/Validation
 # Author: N. Oblath
 
 ############################
diff --git a/Testing/cpp/ConfigFiles/TestConfigurator.json b/Testing/cpp/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Testing/cpp/ConfigFiles/TestConfigurator.json
rename to Testing/cpp/Validation/ConfigFiles/TestConfigurator.json
diff --git a/Testing/cpp/ConfigFiles/TestParameterStoreConfig.json b/Testing/cpp/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Testing/cpp/ConfigFiles/TestParameterStoreConfig.json
rename to Testing/cpp/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Testing/cpp/KTTestConfigurable.cc b/Testing/cpp/Validation/KTTestConfigurable.cc
similarity index 100%
rename from Testing/cpp/KTTestConfigurable.cc
rename to Testing/cpp/Validation/KTTestConfigurable.cc
diff --git a/Testing/cpp/KTTestConfigurable.hh b/Testing/cpp/Validation/KTTestConfigurable.hh
similarity index 100%
rename from Testing/cpp/KTTestConfigurable.hh
rename to Testing/cpp/Validation/KTTestConfigurable.hh
diff --git a/Testing/cpp/KTTestCuts.cc b/Testing/cpp/Validation/KTTestCuts.cc
similarity index 100%
rename from Testing/cpp/KTTestCuts.cc
rename to Testing/cpp/Validation/KTTestCuts.cc
diff --git a/Testing/cpp/KTTestCuts.hh b/Testing/cpp/Validation/KTTestCuts.hh
similarity index 100%
rename from Testing/cpp/KTTestCuts.hh
rename to Testing/cpp/Validation/KTTestCuts.hh
diff --git a/Testing/cpp/KTTestData.cc b/Testing/cpp/Validation/KTTestData.cc
similarity index 100%
rename from Testing/cpp/KTTestData.cc
rename to Testing/cpp/Validation/KTTestData.cc
diff --git a/Testing/cpp/KTTestProcessor.cc b/Testing/cpp/Validation/KTTestProcessor.cc
similarity index 100%
rename from Testing/cpp/KTTestProcessor.cc
rename to Testing/cpp/Validation/KTTestProcessor.cc
diff --git a/Testing/cpp/KTTestProcessor.hh b/Testing/cpp/Validation/KTTestProcessor.hh
similarity index 100%
rename from Testing/cpp/KTTestProcessor.hh
rename to Testing/cpp/Validation/KTTestProcessor.hh
diff --git a/Testing/cpp/TestApplication.cc b/Testing/cpp/Validation/TestApplication.cc
similarity index 100%
rename from Testing/cpp/TestApplication.cc
rename to Testing/cpp/Validation/TestApplication.cc
diff --git a/Testing/cpp/TestApplyCut.cc b/Testing/cpp/Validation/TestApplyCut.cc
similarity index 100%
rename from Testing/cpp/TestApplyCut.cc
rename to Testing/cpp/Validation/TestApplyCut.cc
diff --git a/Testing/cpp/TestCacheDirectory.cc b/Testing/cpp/Validation/TestCacheDirectory.cc
similarity index 100%
rename from Testing/cpp/TestCacheDirectory.cc
rename to Testing/cpp/Validation/TestCacheDirectory.cc
diff --git a/Testing/cpp/TestCut.cc b/Testing/cpp/Validation/TestCut.cc
similarity index 100%
rename from Testing/cpp/TestCut.cc
rename to Testing/cpp/Validation/TestCut.cc
diff --git a/Testing/cpp/TestCutFilter.cc b/Testing/cpp/Validation/TestCutFilter.cc
similarity index 100%
rename from Testing/cpp/TestCutFilter.cc
rename to Testing/cpp/Validation/TestCutFilter.cc
diff --git a/Testing/cpp/TestLogger.cc b/Testing/cpp/Validation/TestLogger.cc
similarity index 100%
rename from Testing/cpp/TestLogger.cc
rename to Testing/cpp/Validation/TestLogger.cc
diff --git a/Testing/cpp/TestPrintData.cc b/Testing/cpp/Validation/TestPrintData.cc
similarity index 100%
rename from Testing/cpp/TestPrintData.cc
rename to Testing/cpp/Validation/TestPrintData.cc
diff --git a/Testing/cpp/TestSignalsAndSlots.cc b/Testing/cpp/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from Testing/cpp/TestSignalsAndSlots.cc
rename to Testing/cpp/Validation/TestSignalsAndSlots.cc
diff --git a/Testing/cpp/TestThroughputProfiler.cc b/Testing/cpp/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from Testing/cpp/TestThroughputProfiler.cc
rename to Testing/cpp/Validation/TestThroughputProfiler.cc
diff --git a/Testing/python/CMakeLists.txt b/Testing/python/CMakeLists.txt
index b40d929..b4dc490 100644
--- a/Testing/python/CMakeLists.txt
+++ b/Testing/python/CMakeLists.txt
@@ -1,31 +1,31 @@
-# CMakeLists for Nymph/Executables/Validation
+# CMakeLists for Nymph/Testing/python
 # Author: N. Oblath
 
 ############################
 # Config files
 ############################
 
-set (VALIDATION_CONFIGFILES
+set (TESTING_CONFIGFILES
     ConfigFiles/TestConfigurator.json
 )
 
-pbuilder_install_config (${VALIDATION_CONFIGFILES})
+pbuilder_install_config (${TESTING_CONFIGFILES})
 
 
 ############################
-# NymphValidation library files
+# NymphPythonTesting library files
 ############################
 
-set (VALIDATION_HEADERFILES
-    KTTestConfigurable.hh
-    KTTestCuts.hh
-    KTTestProcessor.hh
+set (PYTHONTESTING_HEADERFILES
+    KTPyTestClass.hh
+    KTPyTestClassPybind.hh
+    KTTestPythonBasics.hh
 )
 
-set (VALIDATION_SOURCEFILES
-    KTTestConfigurable.cc
-    KTTestCuts.cc
-    KTTestProcessor.cc
+set (PYTHONTESTING_SOURCEFILES
+    KTPyTestClass.cc
+    KTPyTestClassPybind.cc
+    KTTestPythonBasics.cc
 )
 
 set( LIB_DEPENDENCIES
@@ -33,7 +33,7 @@ set( LIB_DEPENDENCIES
 )
 
 ############################
-# NymphValidation library 
+# NymphPythonTesting library 
 ############################
 
 include_directories( BEFORE 
@@ -41,17 +41,17 @@ include_directories( BEFORE
 )
 
 pbuilder_library( 
-    TARGET NymphValidation 
-    SOURCES ${VALIDATION_SOURCEFILES}
+    TARGET NymphPythonTesting
+    SOURCES ${PYTHONTESTING_SOURCEFILES}
     PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
 )
 
 pbuilder_component_install_and_export( 
-    COMPONENT Validation
-    LIBTARGETS NymphValidation
+    COMPONENT PythonTesting
+    LIBTARGETS NymphPythonTesting
 )
 
-pbuilder_install_headers( ${VALIDATION_HEADERFILES} )
+pbuilder_install_headers( ${PYTHONTESTING_HEADERFILES} )
 
 
 ############################
@@ -59,33 +59,34 @@ pbuilder_install_headers( ${VALIDATION_HEADERFILES} )
 ############################
 
 set( LIB_DEPENDENCIES
-    NymphValidation
+    NymphPythonTesting
 )
 
-set( TEST_SOURCES
-    TestApplication.cc
-    TestApplyCut.cc
-    TestCacheDirectory.cc
-    TestCut.cc
-    TestCutFilter.cc
-    TestLogger.cc
-    TestPrintData.cc
-    TestSignalsAndSlots.cc
-    TestThroughputProfiler.cc
-)
-
-pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
-
-set( TEST_PROGRAMS )
-pbuilder_executables( 
-    SOURCES ${TEST_SOURCES}
-    TARGETS_VAR TEST_PROGRAMS
-    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
-    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+#
+#set( TEST_SOURCES
+#    TestApplication.cc
+#    TestApplyCut.cc
+#    TestCacheDirectory.cc
+#    TestCut.cc
+#    TestCutFilter.cc
+#    TestLogger.cc
+#    TestPrintData.cc
+#    TestSignalsAndSlots.cc
+#    TestThroughputProfiler.cc
+#)
+
+#pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
+
+#set( TEST_PROGRAMS )
+#pbuilder_executables( 
+#    SOURCES ${TEST_SOURCES}
+#    TARGETS_VAR TEST_PROGRAMS
+#    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
+#    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
 #        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
+#)
 
-pbuilder_component_install_and_export( 
-    COMPONENT Validation
-    EXETARGETS ${TEST_PROGRAMS}
-)
+#pbuilder_component_install_and_export( 
+#    COMPONENT Validation
+#    EXETARGETS ${TEST_PROGRAMS}
+#)
diff --git a/Testing/python/ConfigFiles/TestConfigurator.json b/Testing/python/ConfigFiles/TestConfigurator.json
new file mode 100644
index 0000000..8a5d5a1
--- /dev/null
+++ b/Testing/python/ConfigFiles/TestConfigurator.json
@@ -0,0 +1,41 @@
+{
+    "test-configurable":
+    {
+        "int-data": 5,
+        "double-data": 50,
+        "string-data": "It works!",
+        "comment": "This should not show up in the as-parsed configuration",
+        "comment":
+        {
+            "neither": "should this"
+        }
+        
+    },
+    
+    "nested-data":
+    {
+        "single-data": 222,
+        "single-data-2": -5000,
+        "#single-data-3": 1,
+        "single-data-3": 10,
+        
+        "sub-data":
+        {
+            "single-data":111,
+            "single-data-2": 6789,
+            "multi-data":
+            [ 345, 456, ["###", 567], 789 ]
+        }
+    },
+    
+    "nested-data-2":
+    {
+        "single-data-2": 212121,
+        "single-data-3": "this replaced an integer",
+        
+        "sub-data":
+        {
+            "single-data-2": 12345
+        }
+    }
+}
\ No newline at end of file
diff --git a/Testing/python/ConfigFiles/TestParameterStoreConfig.json b/Testing/python/ConfigFiles/TestParameterStoreConfig.json
new file mode 100644
index 0000000..a599ab0
--- /dev/null
+++ b/Testing/python/ConfigFiles/TestParameterStoreConfig.json
@@ -0,0 +1,23 @@
+{
+    "test-configurable":
+    {
+        "int-data": 5,
+        "double-data": 50,
+        "string-data": "It works!"
+        
+    },
+    
+    "nested-data":
+    {
+        "single-data":222,
+        
+        "sub-data":
+        {
+            "single-data":111,
+            "multi-data":345,
+            "multi-data":567,
+            "multi-data":789
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/cpp/Executables/CMakeLists.txt b/cpp/Executables/CMakeLists.txt
index fd41e02..4195d99 100644
--- a/cpp/Executables/CMakeLists.txt
+++ b/cpp/Executables/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for Nymph/Executables/Main
+# CMakeLists for Nymph/cpp/Executables
 # Author: N. Oblath
 
 if( NOT Nymph_AS_SUBMODULE )

From 47bd22168fc25468d3572cd738a3cd7b3de9795d Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Thu, 27 Jan 2022 08:01:25 -0500
Subject: [PATCH 248/521] debugging the automatic builds with the new file
 structure

---
 .github/workflows/build.yaml | 2 +-
 Dockerfile                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d5611e5..248f983 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -96,7 +96,7 @@ jobs:
       - name: Run tests
         run: |
           cd build
-          Testing/RunTests
+          Testing/cpp/RunTests
 
 # For debugging
       - name: Setup tmate session
diff --git a/Dockerfile b/Dockerfile
index 715365a..f032174 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,9 +24,9 @@ RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
 FROM nymph_common as nymph_done
 
 COPY cmake /tmp_source/cmake
-COPY Executables /tmp_source/Executables
+COPY Executables /tmp_source/cpp/Executables
 #COPY External /tmp_source/External
-COPY Library /tmp_source/Library
+COPY Library /tmp_source/cpp/Library
 COPY Scarab /tmp_source/Scarab
 COPY Testing /tmp_source/Testing
 COPY CMakeLists.txt /tmp_source/CMakeLists.txt

From 1e9da340a38c40089078bd43a1b4162e459708b8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 27 Jan 2022 16:00:04 -0800
Subject: [PATCH 249/521] Delete copy constructor/assignment of DataFrame until
 we're ready to explicitly make copying work

---
 Library/Data/DataFrame.hh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 1fb1944..1abe1d9 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -44,8 +44,11 @@ namespace Nymph
     {
         public:
             DataFrame();
+            DataFrame( const DataFrame& ) = delete;
             virtual ~DataFrame();
 
+            DataFrame& operator=( const DataFrame& ) = delete;
+
             /// Returns true if the frame has no data objects
             bool Empty() const;
 

From ec1ffa78a62a3ae4f99f75d119c279064c896ba7 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 27 Jan 2022 16:00:56 -0800
Subject: [PATCH 250/521] Remove const-ness from the type arguments of
 DataFrame function calls so that `const MyData` works as a type from the
 SlotData perspective

---
 Library/Data/DataFrame.hh | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 1abe1d9..9369465 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -100,54 +100,61 @@ namespace Nymph
     template< typename XData >
     bool DataFrame::Has() const
     {
-        return fDataObjects.count( typeid(XData) ) != 0;
+        typedef std::remove_const_t< XData > XDataNoConst;
+        return fDataObjects.count( typeid(XDataNoConst) ) != 0;
     }
 
     template< typename XData >
     XData& DataFrame::Get()
     {
-        if( Has< XData >() )
+        typedef std::remove_const_t< XData > XDataNoConst;
+        if( ! Has< XDataNoConst >() )
         {
-            return static_cast< XData& >( *fDataObjects[typeid(XData)] );
+            fDataObjects[ typeid(XDataNoConst) ].reset( new XDataNoConst() );
         }
-
-        fDataObjects[ typeid(XData) ].reset( new XData() );
-        return static_cast< XData& >( *fDataObjects[typeid(XData)] );
+        return static_cast< XDataNoConst& >( *fDataObjects[typeid(XDataNoConst)] );
     }
 
     template< typename XData >
     const XData& DataFrame::Get() const
     {
-        if( Has< XData >() )
+        typedef std::remove_const_t< XData > XDataNoConst;
+        if( Has< XDataNoConst >() )
         {
-            return static_cast< const XData& >( *fDataObjects.at(typeid(XData) ));
+            return static_cast< const XDataNoConst& >( *fDataObjects.at(typeid(XDataNoConst)) );
         }
-        THROW_EXCEPT_HERE( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" );
+        THROW_EXCEPT_HERE( DataFrameException() << "Data type <" << scarab::type(XDataNoConst()) << "> is not present when const Get() was called" );
     }
 
     template< typename XData >
     void DataFrame::Set( XData* ptr )
     {
-        fDataObjects[ typeid(XData) ].reset( ptr );  // take ownership of ptr
+        typedef std::remove_const_t< XData > XDataNoConst;
+        fDataObjects[ typeid(XDataNoConst) ].reset( ptr );  // take ownership of ptr
+        return;
     }
 
     template< typename XData >
     void DataFrame::Set( std::unique_ptr< XData >&& ptr )
     {
-        fDataObjects[ typeid(XData) ] = std::move(ptr);  // take ownership of ptr
+        typedef std::remove_const_t< XData > XDataNoConst;
+        fDataObjects[ typeid(XDataNoConst) ] = std::move(ptr);  // take ownership of ptr
         return;
     }
 
     template< typename XData >
     void DataFrame::Set( const XData& obj )
     {
-        fDataObjects[ typeid(XData) ].reset( new XData(obj) );  // make a copy of obj
+        typedef std::remove_const_t< XData > XDataNoConst;
+        fDataObjects[ typeid(XDataNoConst) ].reset( new XDataNoConst(obj) );  // make a copy of obj
+        return;
     }
 
     template< typename XData >
     void DataFrame::Remove()
     {
-        fDataObjects.erase( typeid(XData) );
+        typedef std::remove_const_t< XData > XDataNoConst;
+        fDataObjects.erase( typeid(XDataNoConst) );
         return;
     }
 

From c660a8b9864ac7bf46764dd1908a3d2f0edf94d4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 27 Jan 2022 16:02:57 -0800
Subject: [PATCH 251/521] Pass around DataHandle instead of DataFrame to
 calling for the copy constructor

---
 CMakeLists.txt              |   4 +-
 Library/Data/DataFrame.hh   |   6 ++
 Library/Data/DataPresent.hh |  12 +--
 Library/Data/SignalData.hh  |   2 +-
 Library/Data/SlotData.hh    | 179 +++++++++++++++++++++++++++++++-----
 5 files changed, 172 insertions(+), 31 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c3845f..825ee68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,8 +23,8 @@ include( Nymph )
 # Nymph options #
 #################
 
-# require C++11
-set( CMAKE_CXX_STANDARD 11 )
+# require C++17 (for: if constexpr)
+set( CMAKE_CXX_STANDARD 17 )
 
 # Build the Nymph executable (also requires Nymph_ENABLE_EXECUTABLES)
 option( Nymph_BUILD_NYMPH_EXE "Flag to build the Nymph executable; also requires Nymph_ENABLE_EXECUTABLES" ON )
diff --git a/Library/Data/DataFrame.hh b/Library/Data/DataFrame.hh
index 9369465..4e8d463 100644
--- a/Library/Data/DataFrame.hh
+++ b/Library/Data/DataFrame.hh
@@ -29,6 +29,12 @@ namespace Nymph
             ~DataFrameException() = default;
     };
 
+    // forward declare so we can define DataHandle here
+    class DataFrame;
+
+    /// Pointer object to use for passing between Processors
+    typedef std::shared_ptr< DataFrame > DataHandle;
+
     /*!
      @class DataFrame
 
diff --git a/Library/Data/DataPresent.hh b/Library/Data/DataPresent.hh
index 50272aa..0dba77e 100644
--- a/Library/Data/DataPresent.hh
+++ b/Library/Data/DataPresent.hh
@@ -17,30 +17,30 @@ namespace Nymph
     template< class... NoOtherDataTypes >
     struct DataPresentHelper
     {
-        static bool DataPresent( const DataFrame& );
+        static bool DataPresent( const DataHandle& );
     };
 
     template< class XDataType, class... XOtherDataTypes >
     struct DataPresentHelper< XDataType, XOtherDataTypes... >
     {
-        static bool DataPresent( const DataFrame& frame );
+        static bool DataPresent( const DataHandle& handle );
     };
 
     template< class... NoOtherDataTypes >
-    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( const DataFrame& )
+    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( const DataHandle& )
     {
         return true;
     }
 
     template< class XDataType, class... XOtherDataTypes >
-    bool DataPresentHelper< XDataType, XOtherDataTypes... >::DataPresent( const DataFrame& frame )
+    bool DataPresentHelper< XDataType, XOtherDataTypes... >::DataPresent( const DataHandle& handle )
     {
-        if( ! frame.Has< XDataType >() )
+        if( ! handle->Has< XDataType >() )
         {
             LERROR( dplog_h, "Data not found with type <" << scarab::type(XDataType()) << ">" );
             return false;
         }
-        return DataPresentHelper< XOtherDataTypes... >::DataPresent( frame );
+        return DataPresentHelper< XOtherDataTypes... >::DataPresent( handle );
     }
 
 } /* namespace Nymph */
diff --git a/Library/Data/SignalData.hh b/Library/Data/SignalData.hh
index 4290ae2..1c75c44 100644
--- a/Library/Data/SignalData.hh
+++ b/Library/Data/SignalData.hh
@@ -38,7 +38,7 @@ namespace Nymph
 
      That's it!
     */
-    typedef Signal< DataFrame > SignalData;
+    typedef Signal< DataHandle > SignalData;
 
 } /* namespace Nymph */
 
diff --git a/Library/Data/SlotData.hh b/Library/Data/SlotData.hh
index 4fd9ebe..14303fc 100644
--- a/Library/Data/SlotData.hh
+++ b/Library/Data/SlotData.hh
@@ -36,7 +36,7 @@ namespace Nymph
      @class SlotData
      @author N. S. Oblath
 
-     @brief Creates a slot that takes a DataFrame object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
+     @brief Creates a slot that takes a DataHandle as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
 
      @details
      Usage:
@@ -53,7 +53,7 @@ namespace Nymph
      Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
     */
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
-    class SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> > : public Slot< DataFrame >
+    class SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> > : public Slot< DataHandle >
     {
         public:
             template< class XFuncOwnerType >
@@ -61,16 +61,56 @@ namespace Nymph
 
         public:
             /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            SlotData( const std::string& name, XFuncOwnerType* owner, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
+            template< class XOwnerType >
+            SlotData( const std::string& name, XOwnerType* owner, Signature< XOwnerType > func, SignalData* signalPtr = nullptr );
 
             /// Constructor for the case where the processor has the function that will be called by the slot
             //template< class XFuncOwnerType, class... XFuncDataTypes >
             //KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XSlotOwnerType, class XFuncOwnerType >
+            SlotData( const std::string& name, XSlotOwnerType* proc, XFuncOwnerType* inst, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            //template< class XFuncOwnerType, class... XFuncDataTypes >
+            //KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            virtual ~SlotData();
+
+            void operator()( DataHandle handle );
+
+        protected:
+            template< class... XDataTypes >
+            bool DataPresent( const DataHandle& handle ) const;
+
+            //function_signature fFunc;
+            std::function< void (XInTypes&..., XOutTypes&... ) > fFunc;
+
+            SignalData* fSignalPtr;
+    };
+
+
+/*
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
+    class SlotData< XInList<XInTypes...>, XOutList<> > : public Slot< DataHandle >
+    {
+        public:
             template< class XFuncOwnerType >
-            SlotData( const std::string& name, Processor* proc, XFuncOwnerType* owner, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
+            using Signature = void (XFuncOwnerType::*)( XInTypes&... );
+
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XOwnerType >
+            SlotData( const std::string& name, XOwnerType* owner, Signature< XOwnerType > func, SignalData* signalPtr = nullptr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            //template< class XFuncOwnerType, class... XFuncDataTypes >
+            //KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XSlotOwnerType, class XFuncOwnerType >
+            SlotData( const std::string& name, XSlotOwnerType* proc, XFuncOwnerType* inst, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
 
             /// Constructor for the case where the processor and the object with the function that will be called are different
             //template< class XFuncOwnerType, class... XFuncDataTypes >
@@ -78,17 +118,19 @@ namespace Nymph
 
             virtual ~SlotData();
 
-            void operator()( DataFrame frame );
+            void operator()( DataHandle handle );
 
         protected:
             template< class... XDataTypes >
-            bool DataPresent( const DataFrame& frame ) const;
+            bool DataPresent( const DataHandle& handle ) const;
 
             //function_signature fFunc;
-            std::function< void (const XInTypes&..., XOutTypes&... ) > fFunc;
+            std::function< void (XInTypes&... ) > fFunc;
 
             SignalData* fSignalPtr;
     };
+*/
+
 /*
     // partial specialization for no new data type
     template< class... XDataArgs >
@@ -174,10 +216,10 @@ namespace Nymph
     // KTSlotData
 
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
-    template< class XFuncOwnerType >
-    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, XFuncOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
-            Slot( name, this, &SlotData::operator() ),
-            fFunc( [func, owner]( XInTypes&... inArgs, XOutTypes&... outArgs ){ owner->func( inArgs..., outArgs... ); } ),
+    template< class XOwnerType >
+    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, XOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XOwnerType > func, SignalData* signalPtr ) :
+            Slot( name, owner, this, &SlotData::operator() ),
+            fFunc( [func, owner]( XInTypes&... inArgs, XOutTypes&... outArgs ){ (owner->*func)( inArgs..., outArgs... ); } ),
             fSignalPtr( signalPtr )
     {
     }
@@ -192,10 +234,10 @@ namespace Nymph
     }
 */
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
-    template< class XFuncOwnerType >
-    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, Processor* proc, XFuncOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
-            Slot( name, proc, this, &SlotData::operator(), { signalPtr->Name()} ),
-            fFunc( [func, owner]( XInTypes&... inArgs, XOutTypes&... outArgs ){ owner->func( inArgs..., outArgs... ); } ),
+    template< class XSlotOwnerType, class XFuncOwnerType >
+    SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, XSlotOwnerType* owner, XFuncOwnerType* inst, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
+            Slot( name, owner, this, &SlotData::operator() ),
+            fFunc( [func, inst]( XInTypes&... inArgs, XOutTypes&... outArgs ){ (inst->*func)( inArgs..., outArgs... ); } ),
             fSignalPtr( signalPtr )
     {
     }
@@ -215,12 +257,12 @@ namespace Nymph
     }
 
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
-    void SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::operator()( DataFrame frame )
+    void SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::operator()( DataHandle handle )
     {
         // Standard data slot pattern:
 
         // Check to ensure that the required data type is present
-        if( ! DataPresent< XInTypes... >( frame ) )
+        if( ! DataPresent< XInTypes... >( handle ) )
         {
             THROW_EXCEPT_HERE( Exception() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
             return;
@@ -229,7 +271,7 @@ namespace Nymph
         // Call the function
         try
         {
-            fFunc( frame.Get< XInTypes >()... , frame.Get< XOutTypes >()... );
+            fFunc( handle->Get< XInTypes >()... , handle->Get< XOutTypes >()... );
         }
         catch( scarab::base_exception& )
         {
@@ -240,17 +282,110 @@ namespace Nymph
         // If there's a signal pointer, emit the signal
         if( fSignalPtr )
         {
-            (*fSignalPtr)( frame );
+            (*fSignalPtr)( handle );
         }
         return;
     }
 
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
     template< class... XDataTypes >
-    bool SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::DataPresent( const DataFrame& frame ) const
+    bool SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::DataPresent( const DataHandle& handle ) const
+    {
+        return DataPresentHelper< XDataTypes... >::DataPresent( handle );
+    }
+
+
+
+
+
+
+    // KTSlotData
+    // No output types
+/*
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
+    template< class XOwnerType >
+    SlotData< XInList<XInTypes...>, XOutList<> >::SlotData(const std::string& name, XOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<> >::Signature< XOwnerType > func, SignalData* signalPtr ) :
+            Slot( name, owner, this, &SlotData::operator() ),
+            fFunc( [func, owner]( XInTypes&... inArgs ){ (owner->*func)( inArgs... ); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+/*
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+*//*
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
+    template< class XSlotOwnerType, class XFuncOwnerType >
+    SlotData< XInList<XInTypes...>, XOutList<> >::SlotData(const std::string& name, XSlotOwnerType* owner, XFuncOwnerType* inst, SlotData< XInList<XInTypes...>, XOutList<> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
+            Slot( name, owner, this, &SlotData::operator(), { signalPtr->Name()} ),
+            fFunc( [func, inst]( XInTypes&... inArgs ){ (inst->*func)( inArgs... ); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+/*
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+*//*
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
+    SlotData< XInList<XInTypes...>, XOutList<> >::~SlotData()
+    {
+    }
+
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
+    void SlotData< XInList<XInTypes...>, XOutList<> >::operator()( DataHandle handle )
+    {
+        // Standard data slot pattern:
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XInTypes... >( handle ) )
+        {
+            THROW_EXCEPT_HERE( Exception() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( handle->Get< XInTypes >()... );
+        }
+        catch( scarab::base_exception& )
+        {
+            THROW_NESTED_EXCEPT_HERE( Exception() << "Something went wrong in slot <" + fName + ">. Aborting." );
+            return;
+        }
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr )
+        {
+            (*fSignalPtr)( handle );
+        }
+        return;
+    }
+
+    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
+    template< class... XDataTypes >
+    bool SlotData< XInList<XInTypes...>, XOutList<> >::DataPresent( const DataHandle& handle ) const
     {
-        return DataPresentHelper< XDataTypes... >::DataPresent( frame );
+        return DataPresentHelper< XDataTypes... >::DataPresent( handle );
     }
+*/
+
+
+
+
+
 
 /*
     // KTSlotData with no return type

From de844dd8ebe6e105810c5f8724131576bbb65f31 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 27 Jan 2022 16:03:21 -0800
Subject: [PATCH 252/521] Cleanup

---
 Library/Data/SlotData.hh   | 4 ----
 Library/Processor/Slot.hh  | 6 ------
 Testing/TestDataClasses.hh | 5 +----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/Library/Data/SlotData.hh b/Library/Data/SlotData.hh
index 14303fc..dda5192 100644
--- a/Library/Data/SlotData.hh
+++ b/Library/Data/SlotData.hh
@@ -12,10 +12,6 @@
 
 #include "DataPresent.hh"
 
-//#include "KTException.hh"
-//#include "KTNymphSignals.hh"
-//#include "KTProcessor.hh"
-
 namespace Nymph
 {
     template< class... XTypes >
diff --git a/Library/Processor/Slot.hh b/Library/Processor/Slot.hh
index 912aefc..e381f8c 100644
--- a/Library/Processor/Slot.hh
+++ b/Library/Processor/Slot.hh
@@ -127,7 +127,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func ) :
             SlotBase( name ),
             fFunction( func ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint( false )
     {}
 
@@ -136,7 +135,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) ) :
             SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this );
@@ -147,7 +145,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const ) :
             SlotBase( name ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this );
@@ -158,7 +155,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func ) :
             SlotBase( name ),
             fFunction( func ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this );
@@ -169,7 +165,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) ) :
             SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this );
@@ -180,7 +175,6 @@ namespace Nymph
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const ) :
             SlotBase( name ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
             fDoBreakpoint(false)
     {
         owner->RegisterSlot( name, this );
diff --git a/Testing/TestDataClasses.hh b/Testing/TestDataClasses.hh
index c23650a..f77e742 100644
--- a/Testing/TestDataClasses.hh
+++ b/Testing/TestDataClasses.hh
@@ -11,7 +11,6 @@
 #include "Data.hh"
 #include "MemberVariable.hh"
 
-#include <iostream>
 namespace Nymph
 {
     class TestData1 : public Data
@@ -21,9 +20,7 @@ namespace Nymph
                     Data(),
                     fIValue1( 0 ),
                     fIValue2( 5 )
-            {
-                std::cerr << "in test data 1 constuctor" << std::endl;
-            }
+            {}
 
             virtual ~TestData1()
             {}

From 5e554a37b7a02dfefd181b66c1053a43765f3c85 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 27 Jan 2022 16:03:40 -0800
Subject: [PATCH 253/521] Implement TestSlotData

---
 Testing/TestDataProcessorClasses.hh |  67 +++++++++++++++++--
 Testing/TestSlotData.cc             | 100 +++++++++++++++++++++++++---
 2 files changed, 152 insertions(+), 15 deletions(-)

diff --git a/Testing/TestDataProcessorClasses.hh b/Testing/TestDataProcessorClasses.hh
index 84e0330..7da2e57 100644
--- a/Testing/TestDataProcessorClasses.hh
+++ b/Testing/TestDataProcessorClasses.hh
@@ -7,23 +7,44 @@
 
 #include "TestDataClasses.hh"
 
+#include "Exception.hh"
 #include "Processor.hh"
 #include "SignalData.hh"
 #include "SlotData.hh"
 
+#include "logger.hh"
+
+LOGGER( tdpclog_h, "TestDataProcessorClasses" );
 
 namespace Nymph
 {
-    // This processor has a data slot that takes TestData1 as input and has no output
+
+    // external slot function owner
+    struct MultiplyFuncOwner
+    {
+        double fValue = 2.5;
+        void Multiply( const TestData1& intData, TestData2& doubleData )
+        {
+            doubleData.SetDValue1( (double)intData.GetIValue1() * fValue );
+            doubleData.SetDValue2( (double)intData.GetIValue2() * fValue );
+            return;
+        }
+    };
+
+    // This processor has a data slot that takes TestData1 as input and has no output (TestData1 is modified in place)
     class Adder : public Processor
     {
         public:
             Adder( const std::string& name = "adder" ) :
                     Processor( name ),
-                    fValue( 0 ),
+                    fAddValue( 0 ),
                     fAddSignal( "add", this ),
                     fAddSlotWithSig( "add-sig", this, &Adder::Add, &fAddSignal ),
-                    fAddSlotNoSig( "add-no-sig", this, &Adder::Add )
+                    fAddSlotNoSig( "add-no-sig", this, &Adder::Add ),
+                    fMultiplySlot( "multiply", this, &fMultFunc, &MultiplyFuncOwner::Multiply ),
+                    fIToDSlot( "i-to-d", this, &Adder::IntToDouble ),
+                    fPrintSlot( "print", this, &Adder::Print ),
+                    fJustThrowsSlot( "just-throws", this, &Adder::JustThrows )
             {}
 
             virtual ~Adder()
@@ -31,27 +52,59 @@ namespace Nymph
 
             void Configure( const scarab::param_node& node )
             {
-                fValue = node.get_value( "value", fValue );
+                fAddValue = node.get_value( "to-add", fAddValue );
+
+                fMultFunc.fValue = node.get_value( "to-mult", fMultFunc.fValue );
 
                 return;
             }
 
-            MEMVAR( int, Value );
+            MEMVAR( int, AddValue );
 
         public:
             void Add( TestData1& data )
             {
-                data.SetIValue1( data.GetIValue1() + fValue );
-                data.SetIValue2( data.GetIValue2() + fValue );
+                data.SetIValue1( data.GetIValue1() + fAddValue );
+                data.SetIValue2( data.GetIValue2() + fAddValue );
+                return;
+            }
+
+            void Print( const TestData1& data )
+            {
+                LPROG( tdpclog_h, "Value 1: " << data.GetIValue1() );
+                LPROG( tdpclog_h, "Value 2: " << data.GetIValue2() );
+                return;
+            }
+
+            void IntToDouble( const TestData1& intData, TestData2& doubleData )
+            {
+                doubleData.SetDValue1( (double)intData.GetIValue1() );
+                doubleData.SetDValue2( (double)intData.GetIValue2() );
                 return;
             }
 
+            void JustThrows( TestData1& )
+            {
+                throw CREATE_EXCEPT_HERE( Exception );
+            }
+
+        protected:
+            MultiplyFuncOwner fMultFunc;
+
         public:
             SignalData fAddSignal;
 
             SlotData< In<TestData1>, Out<> > fAddSlotWithSig;
             SlotData< In<TestData1>, Out<> > fAddSlotNoSig;
 
+            SlotData< In<const TestData1>, Out<TestData2> > fMultiplySlot;
+
+            SlotData< In<const TestData1>, Out<TestData2> > fIToDSlot;
+
+            SlotData< In<const TestData1>, Out<> > fPrintSlot;
+
+            SlotData< In<TestData1>, Out<> > fJustThrowsSlot;
+
     };
 
 }
diff --git a/Testing/TestSlotData.cc b/Testing/TestSlotData.cc
index 394758d..dd259cc 100644
--- a/Testing/TestSlotData.cc
+++ b/Testing/TestSlotData.cc
@@ -5,32 +5,116 @@
  *      Author: N.S. Oblath
  */
 
+#include "TestControllerClasses.hh"
 #include "TestDataProcessorClasses.hh"
 
 #include "catch.hpp"
 
-TEST_CASE( "signal_slot", "[slot],[data]" )
+TEST_CASE( "slot_data", "[slot],[data]" )
 {
     using namespace Nymph;
 
+    // need a controller to exist
+    CIQThrowController controller;
+
+
 // TODO: test creation of slot with:
-//   * proc == owner; no return; multiple inputs
-//   * proc == owner; multiple returns; multiple inputs
-//   * proc != owner; no return; multiple inputs
+//   x proc == owner; no return; multiple inputs
+//   x proc == owner; multiple returns; multiple inputs
 //   * proc= != owner; multiple returns; multiple inputs
+//   x const arguments (supply const with type)
 
 // TODO: test calling of function
-//   * multiple inputs; data not present; throws exception
-//   * multiple inputs; multiple output; call is successful
-//   * call throws
+//   x multiple inputs; data not present; throws Exception
+//   x multiple inputs; multiple output; call is successful
+//   x call throws results in thrown Exception
 
 // TODO: test signal emmission
+//   x slot with output calls a second slot
 
+    // create the processor and verify the presence of the slots
     Adder adder;
-    adder.SetValue( 5 );
+    REQUIRE( adder.Slots().count("add-sig") == 1 );
+    REQUIRE( adder.Slots().count("add-no-sig") == 1 );
+
+    // get signal and slot pointers and cast
+    SlotData< In<TestData1>, Out<> >* sdAddSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-sig") );
+    SlotData< In<TestData1>, Out<> >* sdAddNoSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-no-sig") );
+    REQUIRE( sdAddSig );
+    REQUIRE( sdAddNoSig );
+
+    SlotData< In<const TestData1>, Out<TestData2> >* sdMult = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( adder.Slots().at("multiply") );
+    REQUIRE( sdMult );
+
+    SlotData< In<const TestData1>, Out<TestData2> >* sdIToD = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( adder.Slots().at("i-to-d") );
+    REQUIRE( sdIToD );
+
+    SlotData< In<const TestData1>, Out<> >* sdPrint = dynamic_cast< SlotData< In<const TestData1>, Out<> >* >( adder.Slots().at("print") );
+    REQUIRE( sdPrint );
+
+    SlotData< In<TestData1>, Out<> >* sdJustThrows = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("just-throws") );
+    REQUIRE( sdJustThrows );
+
+    SignalData* sigdAdd = dynamic_cast< SignalData* >( adder.Signals().at("add") );
+    REQUIRE( sigdAdd );
+
+    // configure the processor
+    adder.SetAddValue( 5 );
+
+    // create a data frame
+    DataHandle handle = std::make_shared< DataFrame >();
+
+    // verify that when we call the slot on an empty frame we get an exception
+    REQUIRE_THROWS_AS( (*sdAddSig)( handle ), Exception );
+
+    TestData1& td1 = handle->Get< TestData1 >();
+    td1.SetIValue1( 1 );
+    td1.SetIValue2( 2 );
+
+    // verify that slots can be called, n this case with an input and no output
+    // verify that slots work whether or not signals are automatically called
+    // call the add slot functions and verify operation
+    REQUIRE_NOTHROW( (*sdAddSig)( handle ) );
+    REQUIRE( td1.GetIValue1() == 6 );
+    REQUIRE( td1.GetIValue2() == 7 );
+
+    REQUIRE_NOTHROW( (*sdAddNoSig)( handle ) );
+    REQUIRE( td1.GetIValue1() == 11 );
+
+    // call the IToD slot function and verify operation
+    REQUIRE_NOTHROW( (*sdIToD)( handle ) );
+    REQUIRE( handle->Has< TestData2 >() );
+    TestData2& td2 = handle->Get< TestData2 >();
+    REQUIRE( td2.GetDValue1() == Approx(11.) );
+    REQUIRE( td2.GetDValue2() == Approx(12.) );
+
+    // verify that a slot with a const data object works
+    // call the print slot function to verify use with const data
+    REQUIRE_NOTHROW( (*sdPrint)( handle ) );
 
+    // verify that a thrown exception appears
+    // calls the slot function that just throws Exception; verify it appears here
+    REQUIRE_THROWS_AS( (*sdJustThrows)( handle ), Exception );
 
+    // verify that an automatic signal call is made
+    // connect signal "add" to slot "i-to-d"
+    REQUIRE_NOTHROW( adder.ConnectSignalToSlot( sigdAdd, sdIToD ) );
+    // remove TestData2
+    handle->Remove< TestData2 >();
+    REQUIRE_FALSE( handle->Has< TestData2 >() );
+    // call the add-sig slot and verify that the i-to-d slot gets called via the signal
+    REQUIRE_NOTHROW( (*sdAddSig)( handle ) );
+    REQUIRE( handle->Has< TestData2 >() );
+    REQUIRE( td1.GetIValue1() == 16 );
+    REQUIRE( td2.GetDValue1() == Approx(16.) );
 
+    // verify that slots owned by something else work
+    // remove TestData2
+    handle->Remove< TestData2 >();
+    REQUIRE_FALSE( handle->Has< TestData2 >() );
+    // call the mult slot and verify that it worked
+    REQUIRE_NOTHROW( (*sdMult)( handle ) );
+    REQUIRE( td2.GetDValue1() == Approx(40.) );
 }
 
 

From d210498b7f6d314efad8566a2df8370e5262a589 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Fri, 28 Jan 2022 07:06:36 -0500
Subject: [PATCH 254/521] edited dockerfile

---
 Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f032174..86b91ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,9 +24,11 @@ RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
 FROM nymph_common as nymph_done
 
 COPY cmake /tmp_source/cmake
-COPY Executables /tmp_source/cpp/Executables
+COPY python /tmp_source/python
+COPY cpp /tmp_source/cpp 
+#COPY Executables /tmp_source/cpp/Executables
 #COPY External /tmp_source/External
-COPY Library /tmp_source/cpp/Library
+#COPY Library /tmp_source/cpp/Library
 COPY Scarab /tmp_source/Scarab
 COPY Testing /tmp_source/Testing
 COPY CMakeLists.txt /tmp_source/CMakeLists.txt

From 7c8100778578cc5add588e68aaf809c84a5a8ddb Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Fri, 28 Jan 2022 07:16:53 -0500
Subject: [PATCH 255/521] modified a path in the build so that the RunTest exe
 can be found

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 248f983..d5611e5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -96,7 +96,7 @@ jobs:
       - name: Run tests
         run: |
           cd build
-          Testing/cpp/RunTests
+          Testing/RunTests
 
 # For debugging
       - name: Setup tmate session

From dc9e1f688614be7b4200692467235f4f96a4f1fb Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Fri, 28 Jan 2022 08:49:12 -0500
Subject: [PATCH 256/521] now the RunTests exe will actually be built

---
 CMakeLists.txt                                |   6 +-
 Testing/CMakeLists.txt                        | 190 +++++++-----------
 Testing/cpp/CMakeLists.txt                    |  50 -----
 Testing/cpp/TestData.cc                       |  29 +--
 Testing/cpp/TestDataCatch.cc                  |  28 ---
 Testing/cpp/TestPrimaryProcessor.cc           |  83 +++-----
 Testing/cpp/TestPrimaryProcessorCatch.cc      |  55 -----
 Testing/cpp/{ => Validation}/KTTestData.hh    |   0
 Testing/cpp/Validation/TestData.cc            |  25 +++
 .../cpp/Validation/TestPrimaryProcessor.cc    |  72 +++++++
 Testing/python/CMakeLists.txt                 |  92 ---------
 11 files changed, 221 insertions(+), 409 deletions(-)
 delete mode 100644 Testing/cpp/CMakeLists.txt
 delete mode 100644 Testing/cpp/TestDataCatch.cc
 delete mode 100644 Testing/cpp/TestPrimaryProcessorCatch.cc
 rename Testing/cpp/{ => Validation}/KTTestData.hh (100%)
 create mode 100644 Testing/cpp/Validation/TestData.cc
 create mode 100644 Testing/cpp/Validation/TestPrimaryProcessor.cc
 delete mode 100644 Testing/python/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c60b12c..417468d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,9 +89,9 @@ endif( Nymph_ENABLE_PYTHON )
 # Cereal
 ########
 
-#set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
-#add_subdirectory( External/cereal )
-#include_directories( External/cereal/include )
+set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
+add_subdirectory( External/cereal )
+include_directories( External/cereal/include )
 
 
 #####################
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 2f23190..efc26c0 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -3,139 +3,93 @@
 
 set( PY_DIR python )
 set( CPP_DIR cpp )
-#set( PROC_DIR Processor )
-#set( IO_DIR IO )
-#set( APPL_DIR Application )
 
 include_directories( BEFORE 
     ${CMAKE_CURRENT_SOURCE_DIR}/${PY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${CPP_DIR}
-    #${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
-    #${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
-    #${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
 )
 
-# copied from Nymph/cpp/Library CMakeLists.txt file
-
-#set( NYMPH_HEADERFILES
-#    ${UTIL_DIR}/Exception.hh
-#    ${UTIL_DIR}/MemberVariable.hh
-#
-#    ${DATA_DIR}/Data.hh
-#    ${DATA_DIR}/DataFrame.hh
-#    
-#    ${PROC_DIR}/ControlAccess.hh
-#    ${PROC_DIR}/PrimaryProcessor.hh
-#    ${PROC_DIR}/Processor.hh
-#    ${PROC_DIR}/ProcessorToolbox.hh
-#    ${PROC_DIR}/QuitThread.hh
-#    ${PROC_DIR}/ReturnBuffer.hh
-#    ${PROC_DIR}/SignalSlotBase.hh
-
-# Below are the v1 Library files
-
-#    ${UTIL_DIR}/KTCacheDirectory.hh
-#    ${UTIL_DIR}/KTConcurrentQueue.hh
-#    ${UTIL_DIR}/KTConfigurable.hh
-#    ${UTIL_DIR}/KTDirectory.hh
-#    ${UTIL_DIR}/KTEventLoop.hh
-#    ${UTIL_DIR}/KTException.hh
-#    ${UTIL_DIR}/KTExtensible.hh
-#    ${UTIL_DIR}/KTExtensibleStruct.hh
-#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
-#    ${UTIL_DIR}/KTLogger.hh
-#    ${UTIL_DIR}/KTMemberVariable.hh
-#    ${UTIL_DIR}/KTTIFactory.hh
-#    ${UTIL_DIR}/KTTime.hh
-#    ${DATA_DIR}/KTApplyCut.hh
-#    ${DATA_DIR}/KTCoreData.hh
-#    ${DATA_DIR}/KTCut.hh
-#    ${DATA_DIR}/KTCutFilter.hh
-#    ${DATA_DIR}/KTCutResult.hh
-#    ${DATA_DIR}/KTCutStatus.hh
-#    ${DATA_DIR}/KTData.hh
-#    ${DATA_DIR}/KTRegisterNymphExtData.hh
-#    ${PROC_DIR}/KTConnection.hh
-#    ${PROC_DIR}/KTPrimaryProcessor.hh
-#    ${PROC_DIR}/KTProcessor.hh
-#    ${PROC_DIR}/KTSignal.hh
-#    ${PROC_DIR}/KTSignalWrapper.hh
-#    ${PROC_DIR}/KTSlot.hh
-#    ${PROC_DIR}/KTSlotWrapper.hh
-#    ${PROC_DIR}/KTThreadReference.hh
-#    ${IO_DIR}/KTJSONWriter.hh
-#    ${IO_DIR}/KTReader.hh
-#    ${IO_DIR}/KTWriter.hh
-#    ${APPL_DIR}/KTApplication.hh
-#    ${APPL_DIR}/KTCommandLineHandler.hh
-#    ${APPL_DIR}/KTCommandLineOption.hh
-#    ${APPL_DIR}/KTConfigurator.hh
-#    ${APPL_DIR}/KTDataQueueProcessor.hh
-#    ${APPL_DIR}/KTFilenameParsers.hh
-#    ${APPL_DIR}/KTPrintDataStructure.hh
-#    ${APPL_DIR}/KTProcessorToolbox.hh
-#    ${APPL_DIR}/KTRunNymph.hh
-#    ${APPL_DIR}/KTThroughputProfiler.hh
+set (pytesting_CONFIGFILES
+    ${PY_DIR}/ConfigFiles/TestConfigurator.json
+)
+
+pbuilder_install_config (${pytesting_CONFIGFILES})
+
+set( testing_HEADERS
+    ${CPP_DIR}/TestProc.hh
+)
+
+#set (pytesting_HEADERS
+    #${PY_DIR}/KTPyTestClass.hh
+    #${PY_DIR}/KTPyTestClassPybind.hh
+    #${PY_DIR}/KTTestPythonBasics.hh
 #)
 
-#set( NYMPH_SOURCEFILES
-#    ${UTIL_DIR}/Exception.cc
-#
-#    ${DATA_DIR}/Data.cc
-#    ${DATA_DIR}/DataFrame.cc
-    
-#    ${PROC_DIR}/ControlAccess.cc
-#    ${PROC_DIR}/PrimaryProcessor.cc
-#    ${PROC_DIR}/Processor.cc
-#    ${PROC_DIR}/ProcessorToolbox.cc
-#    ${PROC_DIR}/ReturnBuffer.cc
-#    ${PROC_DIR}/SignalSlotBase.cc
-
-# Below are the v1 Library files
-
-#    ${UTIL_DIR}/KTCacheDirectory.cc
-#    ${UTIL_DIR}/KTConfigurable.cc
-#    ${UTIL_DIR}/KTDirectory.cc
-#    ${UTIL_DIR}/KTEventLoop.cc
-#    ${UTIL_DIR}/KTException.cc
-#    ${UTIL_DIR}/KTTime.cc
-#    ${DATA_DIR}/KTApplyCut.cc
-#    ${DATA_DIR}/KTCoreData.cc
-#    ${DATA_DIR}/KTCut.cc
-#    ${DATA_DIR}/KTCutFilter.cc
-#    ${DATA_DIR}/KTCutStatus.cc
-#    ${DATA_DIR}/KTData.cc
-#    ${PROC_DIR}/KTPrimaryProcessor.cc
-#    ${PROC_DIR}/KTProcessor.cc
-#    ${PROC_DIR}/KTSignalWrapper.cc
-#    ${PROC_DIR}/KTSlotWrapper.cc
-#    ${PROC_DIR}/KTThreadReference.cc
-#    ${IO_DIR}/KTJSONWriter.cc
-#    ${IO_DIR}/KTReader.cc
-#    ${IO_DIR}/KTWriter.cc
-#    ${APPL_DIR}/KTApplication.cc
-#    ${APPL_DIR}/KTCommandLineHandler.cc
-#    ${APPL_DIR}/KTConfigurator.cc
-#    ${APPL_DIR}/KTDataQueueProcessor.cc
-#    ${APPL_DIR}/KTFilenameParsers.cc
-#    ${APPL_DIR}/KTPrintDataStructure.cc
-#    ${APPL_DIR}/KTProcessorToolbox.cc
-#    ${APPL_DIR}/KTRunNymph.cc
-#    ${APPL_DIR}/KTThroughputProfiler.cc
+#set (pytesting_SOURCES
+    #${PY_DIR}/KTPyTestClass.cc
+    #e${PY_DIR}/KTPyTestClassPybind.cc
+    #${PY_DIR}/KTTestPythonBasics.cc
 #)
 
+set( testing_SOURCES
+    ${CPP_DIR}/TestControlAccess.cc
+    ${CPP_DIR}/TestData.cc
+    ${CPP_DIR}/TestDataFrame.cc
+    ${CPP_DIR}/TestException.cc
+    ${CPP_DIR}/TestPrimaryProcessor.cc
+    ${CPP_DIR}/TestProcessor.cc
+    ${CPP_DIR}/TestProcessorToolbox.cc
+    ${CPP_DIR}/TestSignalSlot.cc
+    ${CPP_DIR}/UseCatch.cc
+)
+
+set( lib_dependencies 
+    Nymph
+    Catch
+)
+
+# Interface library was recommended for Catch:
+# https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
 
-##################################################
+add_library( Catch INTERFACE )
+target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${CPP_DIR}/Catch )
+
+add_executable( RunTests ${testing_SOURCES} )
+target_link_libraries( RunTests ${lib_dependencies} )
+
+# So far it seems sufficient to use Catch2's ability to run tests, and not CTest.
+# Here are two ways it could potentially be integrated with CTest, if we change our minds.
+
+# Normal CMake Integration
+#enable_testing()
+#add_test(NAME test_test COMMAND run_tests )
+
+# Automated CMake Integration
+#include(CTest)
+#include(Catch)
+#catch_discover_tests(foo)
+
+############################
+# NymphPyTesting library 
+############################
 
 #pbuilder_library( 
-#    TARGET Nymph 
-#    SOURCES ${NYMPH_SOURCEFILES}
-#    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+#    TARGET NymphPyTesting
+#    SOURCES ${pytesting_SOURCES}
+#    PROJECT_LIBRARIES ${lib_dependencies}
 #)
 
 #pbuilder_component_install_and_export( 
-#    COMPONENT Library
-#    LIBTARGETS Nymph
+#    COMPONENT Testing
+#    LIBTARGETS NymphPyTesting
 #)
 
-#pbuilder_install_headers( ${NYMPH_HEADERFILES} )
+#pbuilder_install_headers( ${pytesting_HEADERS} )
+
+############################
+# Executables
+############################
+
+#set( lib_dependencies
+#    NymphPyTesting
+#)
diff --git a/Testing/cpp/CMakeLists.txt b/Testing/cpp/CMakeLists.txt
deleted file mode 100644
index 7e0255f..0000000
--- a/Testing/cpp/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# CMakeLists.txt for Nymph/cpp/Testing
-# Author: N.S. Oblath
-# Created: Aug 23, 2019
-
-##########
-
-include_directories( BEFORE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set( testing_HEADERS
-    TestProc.hh
-)
-
-set( testing_SOURCES
-    TestControlAccess.cc
-    TestData.cc
-    TestDataFrame.cc
-    TestException.cc
-    TestPrimaryProcessor.cc
-    TestProcessor.cc
-    TestProcessorToolbox.cc
-    TestSignalSlot.cc
-    UseCatch.cc
-)
-
-set( lib_dependencies 
-    Nymph
-    Catch
-)
-
-# Interface library was recommended for Catch:
-# https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
-add_library( Catch INTERFACE )
-target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/Catch )
-
-add_executable( RunTests ${testing_SOURCES} )
-target_link_libraries( RunTests ${lib_dependencies} )
-
-# So far it seems sufficient to use Catch2's ability to run tests, and not CTest.
-# Here are two ways it could potentially be integrated with CTest, if we change our minds.
-
-# Normal CMake Integration
-#enable_testing()
-#add_test(NAME test_test COMMAND run_tests )
-
-# Automated CMake Integration
-#include(CTest)
-#include(Catch)
-#catch_discover_tests(foo)
diff --git a/Testing/cpp/TestData.cc b/Testing/cpp/TestData.cc
index 18ea6be..8682488 100644
--- a/Testing/cpp/TestData.cc
+++ b/Testing/cpp/TestData.cc
@@ -1,25 +1,28 @@
 /*
  * TestData.cc
  *
- *  Created on: Feb 10, 2018
- *      Author: obla999
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
  */
 
-#include "KTTestData.hh"
+#include "TestDataClasses.hh"
 
-#include "KTLogger.hh"
+#include "catch.hpp"
 
-using namespace Nymph;
 
-LOGGER(testlog, "TestData")
-
-int main()
+TEST_CASE( "data", "[data]" )
 {
+    using namespace Nymph;
+
+    TestData1 data1;
+    REQUIRE( data1.GetIValue1() == 0 );
+    REQUIRE( data1.GetIValue2() == 5 );
+
+    data1.SetIValue1( 50 );
+    REQUIRE( data1.GetIValue1() == 50 );
 
-    KTCoreDataExt data;
-    KTTestDataExt& testData = data.Of< KTTestDataExt >();
-    KTINFO(testlog, data.Name());
-    KTINFO(testlog, testData.Name());
+    TestData2 data2;
+    REQUIRE( data2.GetDValue1() == Approx( 0.0 ) );
+    REQUIRE( data2.GetDValue2() == Approx( 10.0 ) );
 
-    return 0;
 }
diff --git a/Testing/cpp/TestDataCatch.cc b/Testing/cpp/TestDataCatch.cc
deleted file mode 100644
index 8682488..0000000
--- a/Testing/cpp/TestDataCatch.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * TestData.cc
- *
- *  Created on: Jan 6, 2022
- *      Author: N.S. Oblath
- */
-
-#include "TestDataClasses.hh"
-
-#include "catch.hpp"
-
-
-TEST_CASE( "data", "[data]" )
-{
-    using namespace Nymph;
-
-    TestData1 data1;
-    REQUIRE( data1.GetIValue1() == 0 );
-    REQUIRE( data1.GetIValue2() == 5 );
-
-    data1.SetIValue1( 50 );
-    REQUIRE( data1.GetIValue1() == 50 );
-
-    TestData2 data2;
-    REQUIRE( data2.GetDValue1() == Approx( 0.0 ) );
-    REQUIRE( data2.GetDValue2() == Approx( 10.0 ) );
-
-}
diff --git a/Testing/cpp/TestPrimaryProcessor.cc b/Testing/cpp/TestPrimaryProcessor.cc
index 0fc9499..a33242f 100644
--- a/Testing/cpp/TestPrimaryProcessor.cc
+++ b/Testing/cpp/TestPrimaryProcessor.cc
@@ -1,72 +1,55 @@
 /*
  * TestPrimaryProcessor.cc
  *
- *  Created on: May 4, 2017
+ *  Created on: Sept 15, 2019
  *      Author: N.S. Oblath
  */
 
-#include "KTTestPrimaryProcessor.hh"
-#include "KTTestProcessor.hh"
+#include "TestProcessorClasses.hh"
 
-#include "KTLogger.hh"
+#include "logger.hh"
 
-#include <boost/thread.hpp>
+#include "catch.hpp"
 
-using namespace Nymph;
+LOGGER( testlog, "TestPrimaryProcessor" );
 
-KTLOGGER( testpplog, "TestPrimaryProcessor" )
+REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
 
-int main()
-{
-
-    try
-    {
-        KTTestPrimaryProcessor tpp;
-        KTTestProcessorB tp;
-
-        KTINFO( testpplog, "Connecting the-signal to first-slot" );
-        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
 
-        // setup to execute processors asynchronously
-        std::shared_ptr< KTThreadReference > exeThreadRef( std::make_shared< KTThreadReference >() );
-        exeThreadRef->Name() = std::string( "tpp" );
-
-        // run the thread
-        boost::condition_variable threadStartedCV;
-        boost::mutex threadStartedMutex;
-        bool threadStartedFlag = false;
-
-        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
-        boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
+TEST_CASE( "primary_processor", "[primary_processor]" )
+{
+    using namespace Nymph;
 
-        while( ! threadStartedFlag )
-        {
-            threadStartedCV.wait( threadStartedLock );
-        }
-        KTDEBUG( testpplog, "Thread has started" );
+    SharedControl::get_instance()->Reset();
 
-        // wait for a result to be set
-        exeThreadRef->GetDataPtrRetFuture().wait();
+    TestPrimaryProc tester;
+    REQUIRE_FALSE( tester.ExceptionPtr() );
 
-        try
-        {
-            exeThreadRef->GetReturnValue();
-        }
-        catch( boost::exception& e )
-        {
-            exeThreadRef->SetCanceled( true );
-            KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
-        }
+    // SignalNewValue test
+    tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
+    tester.ConnectASlot( "value", tester, "value" );
+    tester();
+    REQUIRE( tester.GetValue() == tester.GetNewValue() );
 
-        thread.join();
+    // WaitTwoSec test
+    // -- no test implemented here right now --
+    //tester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
 
-        KTINFO( testpplog, "Tests complete" );
+    // ThrowExcept test
+    tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
+    REQUIRE_NOTHROW( tester() ); // the exception should be caught by operator() and stored as the exception ptr
+    REQUIRE( tester.ExceptionPtr() ); // the exception ptr should now be set
+    try
+    {
+        std::rethrow_exception( tester.ExceptionPtr() );
     }
-    catch( boost::exception& e )
+    catch( const scarab::base_exception& e )
     {
-        KTERROR( testpplog, "Exception caught: " << diagnostic_information( e ) );
-        return -1;
+        PrintException( e );
+        REQUIRE( std::string(e.what()) == std::string("PrimaryProcessor test function: throw Exception") );
     }
+    
+    
 
-    return 0;
+    //REQUIRE( tester.ValueSig().GetControl() == &control );
 }
diff --git a/Testing/cpp/TestPrimaryProcessorCatch.cc b/Testing/cpp/TestPrimaryProcessorCatch.cc
deleted file mode 100644
index a33242f..0000000
--- a/Testing/cpp/TestPrimaryProcessorCatch.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * TestPrimaryProcessor.cc
- *
- *  Created on: Sept 15, 2019
- *      Author: N.S. Oblath
- */
-
-#include "TestProcessorClasses.hh"
-
-#include "logger.hh"
-
-#include "catch.hpp"
-
-LOGGER( testlog, "TestPrimaryProcessor" );
-
-REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
-
-
-TEST_CASE( "primary_processor", "[primary_processor]" )
-{
-    using namespace Nymph;
-
-    SharedControl::get_instance()->Reset();
-
-    TestPrimaryProc tester;
-    REQUIRE_FALSE( tester.ExceptionPtr() );
-
-    // SignalNewValue test
-    tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
-    tester.ConnectASlot( "value", tester, "value" );
-    tester();
-    REQUIRE( tester.GetValue() == tester.GetNewValue() );
-
-    // WaitTwoSec test
-    // -- no test implemented here right now --
-    //tester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
-
-    // ThrowExcept test
-    tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
-    REQUIRE_NOTHROW( tester() ); // the exception should be caught by operator() and stored as the exception ptr
-    REQUIRE( tester.ExceptionPtr() ); // the exception ptr should now be set
-    try
-    {
-        std::rethrow_exception( tester.ExceptionPtr() );
-    }
-    catch( const scarab::base_exception& e )
-    {
-        PrintException( e );
-        REQUIRE( std::string(e.what()) == std::string("PrimaryProcessor test function: throw Exception") );
-    }
-    
-    
-
-    //REQUIRE( tester.ValueSig().GetControl() == &control );
-}
diff --git a/Testing/cpp/KTTestData.hh b/Testing/cpp/Validation/KTTestData.hh
similarity index 100%
rename from Testing/cpp/KTTestData.hh
rename to Testing/cpp/Validation/KTTestData.hh
diff --git a/Testing/cpp/Validation/TestData.cc b/Testing/cpp/Validation/TestData.cc
new file mode 100644
index 0000000..18ea6be
--- /dev/null
+++ b/Testing/cpp/Validation/TestData.cc
@@ -0,0 +1,25 @@
+/*
+ * TestData.cc
+ *
+ *  Created on: Feb 10, 2018
+ *      Author: obla999
+ */
+
+#include "KTTestData.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+LOGGER(testlog, "TestData")
+
+int main()
+{
+
+    KTCoreDataExt data;
+    KTTestDataExt& testData = data.Of< KTTestDataExt >();
+    KTINFO(testlog, data.Name());
+    KTINFO(testlog, testData.Name());
+
+    return 0;
+}
diff --git a/Testing/cpp/Validation/TestPrimaryProcessor.cc b/Testing/cpp/Validation/TestPrimaryProcessor.cc
new file mode 100644
index 0000000..0fc9499
--- /dev/null
+++ b/Testing/cpp/Validation/TestPrimaryProcessor.cc
@@ -0,0 +1,72 @@
+/*
+ * TestPrimaryProcessor.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+#include "KTTestProcessor.hh"
+
+#include "KTLogger.hh"
+
+#include <boost/thread.hpp>
+
+using namespace Nymph;
+
+KTLOGGER( testpplog, "TestPrimaryProcessor" )
+
+int main()
+{
+
+    try
+    {
+        KTTestPrimaryProcessor tpp;
+        KTTestProcessorB tp;
+
+        KTINFO( testpplog, "Connecting the-signal to first-slot" );
+        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
+
+        // setup to execute processors asynchronously
+        std::shared_ptr< KTThreadReference > exeThreadRef( std::make_shared< KTThreadReference >() );
+        exeThreadRef->Name() = std::string( "tpp" );
+
+        // run the thread
+        boost::condition_variable threadStartedCV;
+        boost::mutex threadStartedMutex;
+        bool threadStartedFlag = false;
+
+        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+        boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
+
+        while( ! threadStartedFlag )
+        {
+            threadStartedCV.wait( threadStartedLock );
+        }
+        KTDEBUG( testpplog, "Thread has started" );
+
+        // wait for a result to be set
+        exeThreadRef->GetDataPtrRetFuture().wait();
+
+        try
+        {
+            exeThreadRef->GetReturnValue();
+        }
+        catch( boost::exception& e )
+        {
+            exeThreadRef->SetCanceled( true );
+            KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+        }
+
+        thread.join();
+
+        KTINFO( testpplog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testpplog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Testing/python/CMakeLists.txt b/Testing/python/CMakeLists.txt
deleted file mode 100644
index b4dc490..0000000
--- a/Testing/python/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-# CMakeLists for Nymph/Testing/python
-# Author: N. Oblath
-
-############################
-# Config files
-############################
-
-set (TESTING_CONFIGFILES
-    ConfigFiles/TestConfigurator.json
-)
-
-pbuilder_install_config (${TESTING_CONFIGFILES})
-
-
-############################
-# NymphPythonTesting library files
-############################
-
-set (PYTHONTESTING_HEADERFILES
-    KTPyTestClass.hh
-    KTPyTestClassPybind.hh
-    KTTestPythonBasics.hh
-)
-
-set (PYTHONTESTING_SOURCEFILES
-    KTPyTestClass.cc
-    KTPyTestClassPybind.cc
-    KTTestPythonBasics.cc
-)
-
-set( LIB_DEPENDENCIES
-    Nymph
-)
-
-############################
-# NymphPythonTesting library 
-############################
-
-include_directories( BEFORE 
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-pbuilder_library( 
-    TARGET NymphPythonTesting
-    SOURCES ${PYTHONTESTING_SOURCEFILES}
-    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT PythonTesting
-    LIBTARGETS NymphPythonTesting
-)
-
-pbuilder_install_headers( ${PYTHONTESTING_HEADERFILES} )
-
-
-############################
-# Executables
-############################
-
-set( LIB_DEPENDENCIES
-    NymphPythonTesting
-)
-
-#
-#set( TEST_SOURCES
-#    TestApplication.cc
-#    TestApplyCut.cc
-#    TestCacheDirectory.cc
-#    TestCut.cc
-#    TestCutFilter.cc
-#    TestLogger.cc
-#    TestPrintData.cc
-#    TestSignalsAndSlots.cc
-#    TestThroughputProfiler.cc
-#)
-
-#pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
-
-#set( TEST_PROGRAMS )
-#pbuilder_executables( 
-#    SOURCES ${TEST_SOURCES}
-#    TARGETS_VAR TEST_PROGRAMS
-#    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
-#    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-#)
-
-#pbuilder_component_install_and_export( 
-#    COMPONENT Validation
-#    EXETARGETS ${TEST_PROGRAMS}
-#)

From 691138664ab883788acfef3ed555e31e1ecf48de Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Fri, 28 Jan 2022 09:01:04 -0500
Subject: [PATCH 257/521] uncommented the External/cereal line in the
 dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 86b91ec..e281869 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ COPY cmake /tmp_source/cmake
 COPY python /tmp_source/python
 COPY cpp /tmp_source/cpp 
 #COPY Executables /tmp_source/cpp/Executables
-#COPY External /tmp_source/External
+COPY External /tmp_source/External
 #COPY Library /tmp_source/cpp/Library
 COPY Scarab /tmp_source/Scarab
 COPY Testing /tmp_source/Testing

From 4c5f4d39825d7dc365403e77196f813bf5547e7f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 28 Jan 2022 17:55:21 -0800
Subject: [PATCH 258/521] Print both std::exception and scarab::base_exception

---
 Library/Utility/Exception.cc |  51 ++++-------
 Library/Utility/Exception.hh | 166 +----------------------------------
 2 files changed, 20 insertions(+), 197 deletions(-)

diff --git a/Library/Utility/Exception.cc b/Library/Utility/Exception.cc
index 707d749..43b0c57 100644
--- a/Library/Utility/Exception.cc
+++ b/Library/Utility/Exception.cc
@@ -22,53 +22,34 @@ namespace Nymph
         {
             std::rethrow_if_nested( e );
         }
-        catch(const Nymph::Exception& e)
+        catch(const scarab::base_exception& e)
+        {
+            PrintException( e, ++count );
+        }
+        catch(const std::exception& e)
         {
             PrintException( e, ++count );
         }
         return;
     }
 
-/*
-    BaseException::BaseException() :
-            std::exception(),
-            fAtFilename( "unknown" ),
-            fAtLineNumber( 0 ),
-            fBuffer()
-    {}
-
-    BaseException::~BaseException() noexcept
-    {}
-
-    const char* BaseException::where() const noexcept
+    void PrintException( const std::exception& e, unsigned count )
     {
+        std::string prefix = std::to_string(count) + ": ";
+        LINFO( exlog, prefix << e.what() );
         try
         {
-            fBuffer = fAtFilename + "(" + std::to_string(fAtLineNumber) + ")";
+            std::rethrow_if_nested( e );
+        }
+        catch(const scarab::base_exception& e)
+        {
+            PrintException( e, ++count );
         }
-        catch(const std::bad_alloc& e)
+        catch(const std::exception& e)
         {
-            fBuffer = fAtFilename;
+            PrintException( e, ++count );
         }
-        return fBuffer.c_str();
-    }
-*/
-/* removed for trying home-grown exceptions, 1/10/22
-    Exception::Exception() :
-            boost::exception(),
-            std::exception(),
-            fMsgBuffer()
-    {
-    }
-    Exception::Exception( const Exception& an_exception ) :
-            boost::exception( an_exception ),
-            std::exception( an_exception ),
-            fMsgBuffer( an_exception.fMsgBuffer )
-    {
+        return;
     }
 
-    Exception::~Exception() throw ()
-    {
-    }
-*/
 }
diff --git a/Library/Utility/Exception.hh b/Library/Utility/Exception.hh
index 243ba86..f2b16d2 100644
--- a/Library/Utility/Exception.hh
+++ b/Library/Utility/Exception.hh
@@ -14,35 +14,6 @@
 
 namespace Nymph
 {
-    /*
-    class BaseException : virtual public std::exception
-    {
-        public:
-            BaseException();
-            ~BaseException() noexcept;
-
-            MEMVAR_REF( std::string, AtFilename );
-            MEMVAR( int, AtLineNumber );
-
-            virtual const char* where() const noexcept;
-
-        private:
-            mutable std::string fBuffer;
-    };
-
-    template< typename XDerived >
-    class TypedException : virtual public scarab::base_exception< XDerived >, public BaseException
-    {
-        public:
-            TypedException();
-            TypedException( const std::string& filename, int lineNum );
-            ~TypedException() noexcept;
-
-            XDerived& operator()( const std::string& filename, int lineNum );
-
-    };
-    */
-
     /*!
      @class Exception
      @author N. S. Oblath
@@ -63,141 +34,12 @@ namespace Nymph
 #define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( anException )
 #define THROW_NESTED_EXCEPT_HERE( anException ) std::throw_with_nested( EXCEPT_HERE( anException ) )
 
-/// Recursive print function for potentially-nested exceptions
-void PrintException( const scarab::base_exception& e, unsigned count = 0 );
-
-/*
-    template< typename XDerived >
-    TypedException< XDerived >::TypedException() :
-            scarab::base_exception< XDerived >(),
-            BaseException()
-    {}
-
-    template< typename XDerived >
-    TypedException< XDerived >::TypedException( const std::string& filename, int lineNumber ) :
-            scarab::base_exception< XDerived >(),
-            BaseException()
-    {
-        fAtFilename = filename;
-        fAtLineNumber = lineNumber;
-    }
-
-    template< typename XDerived >
-    TypedException< XDerived >::~TypedException() noexcept
-    {}
-
-    template< typename XDerived >
-    XDerived& TypedException< XDerived >::operator()( const std::string& filename, int lineNumber )
-    {
-        fAtFilename = filename;
-        fAtLineNumber = lineNumber;
-        return *static_cast< XDerived* >(this);
-    }
-*/
-/* removed for trying home-grown exceptions, 1/10/22
-    struct MessageEnd {};
-    static const MessageEnd eom = MessageEnd();
-
-    //typedef boost::error_info<struct tag_errmsg, std::string> ErrorMsgInfo;
-
-    template< class XLabel >
-    using ErrorMsgInfo = boost::error_info< XLabel, std::string>;
-*/
-    /* // removed for trying home-grown exceptions, 1/10/22
-     @class Exception
-     @author N.S. Oblath
+    /// Recursive print function for potentially-nested exceptions (for scarab::base_exception)
+    void PrintException( const scarab::base_exception& e, unsigned count = 0 );
 
-     @brief Exception base class for Nymph and Nymph-based projects
+    /// Recursive print function for potentially-nested exceptions (for std::exception)
+    void PrintException( const std::exception& e, unsigned count = 0 );
 
-     @details
-
-     How to throw:
-
-     BOOST_THROW_EXCEPTION( Exception() << "[error message here]" << eom );
-
-     Why do it like this?
-      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
-      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
-      - Exception can be replaced with whatever derived exception class you're using.
-
-      How to catch, add information, and re-throw:
-
-      try
-      {
-          // code that throws a Exception
-      }
-      catch( boost::exception& e )
-      {
-          e << ErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
-          throw;
-      }
-
-
-      How to do the final catch
-
-      try
-      {
-          // code that throws a Exception
-      }
-      catch( boost::exception& e )
-      {
-          ERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
-      }
-    */
-/* removed for trying home-grown exceptions, 1/10/22
-    class Exception : virtual public boost::exception, virtual public std::exception
-    {
-        public:
-            Exception();
-            Exception( const Exception& );
-            ~Exception() throw ();
-
-            // adds to the message buffer
-            template< class XStreamable >
-            Exception& operator<<( XStreamable a_fragment );
-            // adds to the message buffer
-            Exception& operator<<( const std::string& a_fragment );
-            // adds to the message buffer
-            Exception& operator<<( const char* a_fragment );
-
-            // adds the current contents of the message buffer as a ErrorMsgInfo
-            Exception& operator<<( const MessageEnd& eom );
-
-        private:
-            mutable std::string fMsgBuffer;
-    };
-
-    template< class XStreamable >
-    Exception& Exception::operator<<( XStreamable a_fragment )
-    {
-        std::stringstream stream;
-        stream << a_fragment;
-        stream >> fMsgBuffer;
-        return *this;
-    }
-
-    inline Exception& Exception::operator<<( const std::string& a_fragment )
-    {
-        fMsgBuffer += a_fragment;
-        return *this;
-    }
-
-    inline Exception& Exception::operator<<( const char* a_fragment )
-    {
-        fMsgBuffer += std::string( a_fragment );
-        return *this;
-    }
-
-    inline Exception& Exception::operator<<( const MessageEnd& eom )
-    {
-        if( ! fMsgBuffer.empty() )
-        {
-            boost::operator<<( *this, ErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
-            fMsgBuffer.clear();
-        }
-        return *this;
-    }
-*/
 }
 
 #endif /* NYMPH_EXCEPTION_HH_ */

From 3ccea5ce2ccbf61773cf17ca3939163d49d47ddc Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 28 Jan 2022 17:55:48 -0800
Subject: [PATCH 259/521] Extract exception pointers to the thread map

---
 Library/Control/SingleRunController.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Library/Control/SingleRunController.cc b/Library/Control/SingleRunController.cc
index f4b65f7..662ab9a 100644
--- a/Library/Control/SingleRunController.cc
+++ b/Library/Control/SingleRunController.cc
@@ -193,6 +193,8 @@ namespace Nymph
     {
         Controller::ChainIsQuitting( name, ePtr );
 
+        std::get<2>( fChainThreads.at(name) ) = std::move(ePtr); 
+
         --fNActiveThreads;
 
         return;

From 6e2b5cbea7a6a7d4d39394537f9ec4d2d0eb82e8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 28 Jan 2022 17:56:17 -0800
Subject: [PATCH 260/521] Add RunNymph in the new Implementations directory and
 add TestRunNymph

---
 Library/CMakeLists.txt             | 32 +++++++++-------
 Library/Implementation/RunNymph.cc | 60 ++++++++++++++++++++++++++++++
 Library/Implementation/RunNymph.hh | 22 +++++++++++
 Testing/CMakeLists.txt             |  1 +
 Testing/TestRunNymph.cc            | 52 ++++++++++++++++++++++++++
 5 files changed, 153 insertions(+), 14 deletions(-)
 create mode 100644 Library/Implementation/RunNymph.cc
 create mode 100644 Library/Implementation/RunNymph.hh
 create mode 100644 Testing/TestRunNymph.cc

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 4584597..cdf31d2 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -3,32 +3,26 @@
 
 #include( PythonPackage )
 
-set( UTIL_DIR Utility )
-set( DATA_DIR Data )
-set( PROC_DIR Processor )
 set( CONT_DIR Control )
+set( DATA_DIR Data )
+set( IMPL_DIR Implementation )
 set( IO_DIR IO )
-set( APPL_DIR Application )
+set( PROC_DIR Processor )
+set( UTIL_DIR Utility )
 
 include_directories( BEFORE 
-    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${CONT_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${IMPL_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
 )
 
 set( NYMPH_HEADERFILES
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
 
-    ${DATA_DIR}/Data.hh
-    ${DATA_DIR}/DataFrame.hh
-    ${DATA_DIR}/DataPresent.hh
-    ${DATA_DIR}/SignalData.hh
-    ${DATA_DIR}/SlotData.hh
-    
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
@@ -37,11 +31,19 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/SignalSlotBase.hh
     ${PROC_DIR}/Slot.hh
 
+    ${DATA_DIR}/Data.hh
+    ${DATA_DIR}/DataFrame.hh
+    ${DATA_DIR}/DataPresent.hh
+    ${DATA_DIR}/SignalData.hh
+    ${DATA_DIR}/SlotData.hh
+    
     ${CONT_DIR}/ControlAccess.hh
     ${CONT_DIR}/Controller.hh
     ${CONT_DIR}/ControllerInterface.hh
     ${CONT_DIR}/ReturnBuffer.hh
     ${CONT_DIR}/SingleRunController.hh
+
+    ${IMPL_DIR}/RunNymph.hh
 )
 
 set( NYMPH_SOURCEFILES
@@ -61,6 +63,8 @@ set( NYMPH_SOURCEFILES
     ${CONT_DIR}/ControllerInterface.cc
     ${CONT_DIR}/ReturnBuffer.cc
     ${CONT_DIR}/SingleRunController.cc
+
+    ${IMPL_DIR}/RunNymph.cc
 )
 
 
diff --git a/Library/Implementation/RunNymph.cc b/Library/Implementation/RunNymph.cc
new file mode 100644
index 0000000..904c59e
--- /dev/null
+++ b/Library/Implementation/RunNymph.cc
@@ -0,0 +1,60 @@
+/*
+ * RunNymph.cc
+ *
+ *  Created on: Sep 13, 2016
+ *      Author: obla999
+ */
+
+#include "ProcessorToolbox.hh"
+#include "SingleRunController.hh"
+
+#include "logger.hh"
+#include "param.hh"
+
+#include <string>
+
+LOGGER( nlog, "RunNymph" );
+
+namespace Nymph
+{
+    int RunNymph( scarab::param_node& config )
+    {
+        try
+        {
+            LPROG( nlog, "Configuring processor toolbox" );
+
+            // Create and configure the processor toolbox.
+            ProcessorToolbox procTB;
+            procTB.Configure( config);
+
+            // Create and configure the single-run controller.
+            LPROG( nlog, "Configuring controller" );
+            SingleRunController controller;
+            if( config.has("controller") )
+            {
+                controller.Configure( config["controller"].as_node() );
+            }
+
+            LPROG( nlog, "Executing run" );
+
+            // Now execute the run
+            controller.Run( procTB );
+
+            LPROG( nlog, "That's all, folks!" );
+
+            return RETURN_SUCCESS;
+        }
+        catch( scarab::base_exception& e )
+        {
+            LERROR( nlog, "Exception caught:" );
+            PrintException( e );
+            return RETURN_ERROR;
+        }
+        catch( std::exception& e )
+        {
+            LERROR(  nlog, "Exception caught:" );
+            PrintException( e );
+            return RETURN_ERROR;
+        }
+    }
+}
diff --git a/Library/Implementation/RunNymph.hh b/Library/Implementation/RunNymph.hh
new file mode 100644
index 0000000..37ecd6f
--- /dev/null
+++ b/Library/Implementation/RunNymph.hh
@@ -0,0 +1,22 @@
+/*
+ * RunNymph.hh
+ *
+ *  Created on: Sep 13, 2016
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_RUNNYMPH_HH_
+#define NYMPH_RUNNYMPH_HH_
+
+namespace scarab
+{
+    class param_node;
+}
+
+namespace Nymph
+{
+    int RunNymph( scarab::param_node& config );
+}
+
+
+#endif /* NYMPH_RUNNYMPH_HH_ */
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 4ad50b0..bcccdb5 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -21,6 +21,7 @@ set( testing_SOURCES
     TestPrimaryProcessor.cc
     TestProcessor.cc
     TestProcessorToolbox.cc
+    TestRunNymph.cc
     TestSignalSlot.cc
     TestSingleRunController.cc
     TestSlotData.cc
diff --git a/Testing/TestRunNymph.cc b/Testing/TestRunNymph.cc
new file mode 100644
index 0000000..547e4f0
--- /dev/null
+++ b/Testing/TestRunNymph.cc
@@ -0,0 +1,52 @@
+/*
+ * TestRunNymph.cc
+ *
+ *  Created on: Jan 28, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "RunNymph.hh"
+
+#include "logger.hh"
+#include "param_codec.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestSingleRunController" );
+
+
+TEST_CASE( "run_nymph" )
+{
+    using namespace Nymph;
+
+    SECTION( "Missing ProcTB")
+    {
+
+    }
+
+    SECTION( "Missing Cont" )
+    {
+
+    }
+
+    SECTION( "DoRun" )
+    {
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: pp\n"
+            "connections:\n"
+            "- signal: \"pp:value\"\n"
+            "  slot: \"pp:value\"\n"
+            "run-queue:\n"
+            "- pp\n"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( RunNymph( config->as_node() ) );
+
+    }
+
+}

From 5b42e4070b7cd2f8773361c67d24787bcea2328b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 28 Jan 2022 17:57:39 -0800
Subject: [PATCH 261/521] Removed unused test sections

---
 Testing/TestRunNymph.cc | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/Testing/TestRunNymph.cc b/Testing/TestRunNymph.cc
index 547e4f0..14a0b73 100644
--- a/Testing/TestRunNymph.cc
+++ b/Testing/TestRunNymph.cc
@@ -19,16 +19,6 @@ TEST_CASE( "run_nymph" )
 {
     using namespace Nymph;
 
-    SECTION( "Missing ProcTB")
-    {
-
-    }
-
-    SECTION( "Missing Cont" )
-    {
-
-    }
-
     SECTION( "DoRun" )
     {
         std::string config_str(

From b65265b112f32fe376c8c249cbb263efd3564578 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 31 Jan 2022 08:10:24 -0500
Subject: [PATCH 262/521] Addressing feedback from Noah, created Library_v1 and
 Executables_v1 under Cpp

---
 CMakeLists.txt                                |   4 +-
 Dockerfile                                    |   4 +-
 Testing/CMakeLists.txt                        |  20 ++-
 .../python/ConfigFiles/TestConfigurator.json  |  41 ------
 .../ConfigFiles/TestParameterStoreConfig.json |  23 ----
 cmake/Nymph.cmake                             |   2 +-
 .../Main}/CMakeLists.txt                      |   2 +-
 .../Main}/ConfigCheck.cc                      |   0
 .../Main}/Nymph.cc                            |   0
 .../Executables_v1}/Validation/CMakeLists.txt |   2 +-
 .../ConfigFiles/TestConfigurator.json         |   0
 .../ConfigFiles/TestParameterStoreConfig.json |   0
 .../Validation}/KTJSONReader.cc               |   0
 .../Validation}/KTJSONReader.hh               |   0
 .../Validation}/KTJSONTypeWriterValidation.cc |   0
 .../Validation}/KTJSONTypeWriterValidation.hh |   0
 .../Validation}/KTPyTestClass.cc              |   0
 .../Validation}/KTPyTestClass.hh              |   0
 .../Validation}/KTPyTestClassPybind.hh        |   0
 .../KTRegisterNymphValidationExtData.hh       |   0
 .../Validation/KTTestConfigurable.cc          |   0
 .../Validation/KTTestConfigurable.hh          |   0
 .../Executables_v1}/Validation/KTTestCuts.cc  |   0
 .../Executables_v1}/Validation/KTTestCuts.hh  |   0
 .../Executables_v1}/Validation/KTTestData.cc  |   0
 .../Executables_v1}/Validation/KTTestData.hh  |   0
 .../Validation}/KTTestDataPrimaryProcessor.cc |   0
 .../Validation}/KTTestDataPrimaryProcessor.hh |   0
 .../Validation}/KTTestPrimaryProcessor.cc     |   0
 .../Validation}/KTTestPrimaryProcessor.hh     |   0
 .../Validation/KTTestProcessor.cc             |   0
 .../Validation/KTTestProcessor.hh             |   0
 .../Validation}/NymphValidationPybind.cc      |   0
 .../Validation/TestApplication.cc             |   0
 .../Validation/TestApplyCut.cc                |   0
 .../Validation/TestCacheDirectory.cc          |   0
 .../Executables_v1}/Validation/TestCut.cc     |   0
 .../Validation/TestCutFilter.cc               |   0
 .../Executables_v1}/Validation/TestData.cc    |   0
 .../Validation}/TestExceptionInSlot.cc        |   0
 .../Executables_v1/Validation}/TestExt.cc     |   0
 .../Validation}/TestExtSerialization.cc       |   0
 .../Validation}/TestJSONWriter.cc             |   0
 .../Validation}/TestJSONWriterViaSlot.cc      |   0
 .../Executables_v1}/Validation/TestLogger.cc  |   0
 .../Validation}/TestParamBindings.py          |   0
 .../Validation}/TestPolymorphicSlotData.cc    |   0
 .../Validation/TestPrimaryProcessor.cc        |   0
 .../TestPrimaryProcessorNoThreading.cc        |   0
 .../Validation/TestPrintData.cc               |   0
 .../Validation}/TestProcessorToolbox.py       |   0
 .../TestProcessorToolbox2Threads.cc           |   0
 .../TestProcessorToolboxMultithreaded.cc      |   0
 .../TestProcessorToolboxSinglethreaded.cc     |   0
 .../Validation}/TestPyTestClass.py            |   0
 .../Validation}/TestPythonBasics.hh           |   0
 .../Validation}/TestPythonBasics.py           |   0
 .../Validation}/TestSerialization.cc          |   0
 .../Validation/TestSignalsAndSlots.cc         |   0
 .../Validation}/TestSlotData.cc               |   0
 .../Validation/TestThroughputProfiler.cc      |   0
 .../Validation}/TestUseBreakpoint.cc          |   0
 .../Validation}/TestWrapProcessor.py          |   0
 cpp/Library/CMakeLists.txt                    |  86 +------------
 .../Library_v1}/AddLibPythonPath.sh.in        |   0
 .../Application/KTApplication.cc              |   0
 .../Application/KTApplication.hh              |   0
 .../Application/KTCommandLineHandler.cc       |   0
 .../Application/KTCommandLineHandler.hh       |   0
 .../Application/KTCommandLineOption.hh        |   0
 .../Application/KTConfigurator.cc             |   0
 .../Application/KTConfigurator.hh             |   0
 .../Application/KTDataQueueProcessor.cc       |   0
 .../Application/KTDataQueueProcessor.hh       |   0
 .../Application/KTFilenameParsers.cc          |   0
 .../Application/KTFilenameParsers.hh          |   0
 .../Application/KTPrintDataStructure.cc       |   0
 .../Application/KTPrintDataStructure.hh       |   0
 .../Application/KTProcessorToolbox.cc         |   0
 .../Application/KTProcessorToolbox.hh         |   0
 .../Application}/KTProcessorToolboxPybind.hh  |   0
 .../Application/KTRunNymph.cc                 |   0
 .../Application/KTRunNymph.hh                 |   0
 .../Application/KTThroughputProfiler.cc       |   0
 .../Application/KTThroughputProfiler.hh       |   0
 cpp/Library_v1/CMakeLists.txt                 | 121 ++++++++++++++++++
 .../Data/KTApplyCut.cc                        |   0
 .../Data/KTApplyCut.hh                        |   0
 .../Data/KTCoreData.cc                        |   0
 .../Data/KTCoreData.hh                        |   0
 cpp/{Library => Library_v1}/Data/KTCut.cc     |   0
 cpp/{Library => Library_v1}/Data/KTCut.hh     |   0
 .../Data/KTCutFilter.cc                       |   0
 .../Data/KTCutFilter.hh                       |   0
 .../Data/KTCutResult.hh                       |   0
 .../Data/KTCutStatus.cc                       |   0
 .../Data/KTCutStatus.hh                       |   0
 cpp/{Library => Library_v1}/Data/KTData.cc    |   0
 cpp/{Library => Library_v1}/Data/KTData.hh    |   0
 .../Data/KTRegisterNymphExtData.hh            |   0
 cpp/{Library => Library_v1}/Data/KTTester.cc  |   0
 cpp/{Library => Library_v1}/Data/KTTester.hh  |   0
 .../IO/KTJSONWriter.cc                        |   0
 .../IO/KTJSONWriter.hh                        |   0
 cpp/{Library => Library_v1}/IO/KTReader.cc    |   0
 cpp/{Library => Library_v1}/IO/KTReader.hh    |   0
 cpp/{Library => Library_v1}/IO/KTWriter.cc    |   0
 cpp/{Library => Library_v1}/IO/KTWriter.hh    |   0
 .../nymph => cpp/Library_v1}/NymphPybind.cc   |   0
 .../Processor/KTConnection.hh                 |   0
 .../Processor/KTNymphSignals.hh               |   0
 .../Processor/KTNymphSlot.hh                  |   0
 .../Processor/KTPrimaryProcessor.cc           |   0
 .../Processor/KTPrimaryProcessor.hh           |   0
 .../Processor/KTProcessor.cc                  |   0
 .../Processor/KTProcessor.hh                  |   0
 .../Processor}/KTProcessorPybind.cc           |   0
 .../Processor}/KTProcessorPybind.hh           |   0
 .../Library_v1/Processor}/KTPyProcessor.hh    |   0
 .../Processor/KTSignal.hh                     |   0
 .../Processor/KTSignalSlotBase.hh             |   0
 .../Processor/KTSignalWrapper.cc              |   0
 .../Processor/KTSignalWrapper.hh              |   0
 .../Processor/KTSlot.hh                       |   0
 .../Processor/KTSlotWrapper.cc                |   0
 .../Processor/KTSlotWrapper.hh                |   0
 .../Processor/KTThreadReference.cc            |   0
 .../Processor/KTThreadReference.hh            |   0
 .../Utility/KTCacheDirectory.cc               |   0
 .../Utility/KTCacheDirectory.hh               |   0
 .../Utility/KTConcurrentQueue.hh              |   0
 .../Utility/KTConfigurable.cc                 |   0
 .../Utility/KTConfigurable.hh                 |   0
 .../Utility}/KTConfigurablePybind.hh          |   0
 .../Utility/KTDirectory.cc                    |   0
 .../Utility/KTDirectory.hh                    |   0
 .../Utility/KTEventLoop.cc                    |   0
 .../Utility/KTEventLoop.hh                    |   0
 .../Utility/KTException.cc                    |   0
 .../Utility/KTException.hh                    |   0
 .../Utility/KTExtensible.hh                   |   0
 .../Utility/KTExtensibleStruct.hh             |   0
 .../Utility/KTExtensibleStructFactory.hh      |   0
 .../Utility/KTLogger.hh                       |   0
 .../Utility/KTMemberVariable.hh               |   0
 .../Library_v1/Utility}/KTParamPybind.hh      |   0
 .../Library_v1/Utility}/KTPythonMacros.hh     |   0
 .../Utility/KTTIFactory.hh                    |   0
 cpp/{Library => Library_v1}/Utility/KTTime.cc |   0
 cpp/{Library => Library_v1}/Utility/KTTime.hh |   0
 python/nymph/CMakeLists.txt                   |  60 ---------
 151 files changed, 141 insertions(+), 224 deletions(-)
 delete mode 100644 Testing/python/ConfigFiles/TestConfigurator.json
 delete mode 100644 Testing/python/ConfigFiles/TestParameterStoreConfig.json
 rename cpp/{Executables => Executables_v1/Main}/CMakeLists.txt (93%)
 rename cpp/{Executables => Executables_v1/Main}/ConfigCheck.cc (100%)
 rename cpp/{Executables => Executables_v1/Main}/Nymph.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/CMakeLists.txt (97%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/ConfigFiles/TestConfigurator.json (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTJSONReader.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTJSONReader.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTJSONTypeWriterValidation.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTJSONTypeWriterValidation.hh (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/KTPyTestClass.cc (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/KTPyTestClass.hh (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/KTPyTestClassPybind.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTRegisterNymphValidationExtData.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestConfigurable.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestConfigurable.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestCuts.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestCuts.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestData.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestData.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTTestDataPrimaryProcessor.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTTestDataPrimaryProcessor.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTTestPrimaryProcessor.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/KTTestPrimaryProcessor.hh (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestProcessor.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/KTTestProcessor.hh (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/NymphValidationPybind.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestApplication.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestApplyCut.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestCacheDirectory.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestCut.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestCutFilter.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestData.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestExceptionInSlot.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestExt.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestExtSerialization.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestJSONWriter.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestJSONWriterViaSlot.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestLogger.cc (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/TestParamBindings.py (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestPolymorphicSlotData.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestPrimaryProcessor.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestPrimaryProcessorNoThreading.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestPrintData.cc (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/TestProcessorToolbox.py (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestProcessorToolbox2Threads.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestProcessorToolboxMultithreaded.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestProcessorToolboxSinglethreaded.cc (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/TestPyTestClass.py (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/TestPythonBasics.hh (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/TestPythonBasics.py (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestSerialization.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestSignalsAndSlots.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestSlotData.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1}/Validation/TestThroughputProfiler.cc (100%)
 rename {Testing/cpp => cpp/Executables_v1/Validation}/TestUseBreakpoint.cc (100%)
 rename {Testing/python => cpp/Executables_v1/Validation}/TestWrapProcessor.py (100%)
 rename {python/nymph => cpp/Library_v1}/AddLibPythonPath.sh.in (100%)
 rename cpp/{Library => Library_v1}/Application/KTApplication.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTApplication.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTCommandLineHandler.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTCommandLineHandler.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTCommandLineOption.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTConfigurator.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTConfigurator.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTDataQueueProcessor.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTDataQueueProcessor.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTFilenameParsers.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTFilenameParsers.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTPrintDataStructure.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTPrintDataStructure.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTProcessorToolbox.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTProcessorToolbox.hh (100%)
 rename {python/nymph => cpp/Library_v1/Application}/KTProcessorToolboxPybind.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTRunNymph.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTRunNymph.hh (100%)
 rename cpp/{Library => Library_v1}/Application/KTThroughputProfiler.cc (100%)
 rename cpp/{Library => Library_v1}/Application/KTThroughputProfiler.hh (100%)
 create mode 100644 cpp/Library_v1/CMakeLists.txt
 rename cpp/{Library => Library_v1}/Data/KTApplyCut.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTApplyCut.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTCoreData.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTCoreData.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTCut.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTCut.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTCutFilter.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTCutFilter.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTCutResult.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTCutStatus.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTCutStatus.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTData.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTData.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTRegisterNymphExtData.hh (100%)
 rename cpp/{Library => Library_v1}/Data/KTTester.cc (100%)
 rename cpp/{Library => Library_v1}/Data/KTTester.hh (100%)
 rename cpp/{Library => Library_v1}/IO/KTJSONWriter.cc (100%)
 rename cpp/{Library => Library_v1}/IO/KTJSONWriter.hh (100%)
 rename cpp/{Library => Library_v1}/IO/KTReader.cc (100%)
 rename cpp/{Library => Library_v1}/IO/KTReader.hh (100%)
 rename cpp/{Library => Library_v1}/IO/KTWriter.cc (100%)
 rename cpp/{Library => Library_v1}/IO/KTWriter.hh (100%)
 rename {python/nymph => cpp/Library_v1}/NymphPybind.cc (100%)
 rename cpp/{Library => Library_v1}/Processor/KTConnection.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTNymphSignals.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTNymphSlot.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTPrimaryProcessor.cc (100%)
 rename cpp/{Library => Library_v1}/Processor/KTPrimaryProcessor.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTProcessor.cc (100%)
 rename cpp/{Library => Library_v1}/Processor/KTProcessor.hh (100%)
 rename {python/nymph => cpp/Library_v1/Processor}/KTProcessorPybind.cc (100%)
 rename {python/nymph => cpp/Library_v1/Processor}/KTProcessorPybind.hh (100%)
 rename {python/nymph => cpp/Library_v1/Processor}/KTPyProcessor.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSignal.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSignalSlotBase.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSignalWrapper.cc (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSignalWrapper.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSlot.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSlotWrapper.cc (100%)
 rename cpp/{Library => Library_v1}/Processor/KTSlotWrapper.hh (100%)
 rename cpp/{Library => Library_v1}/Processor/KTThreadReference.cc (100%)
 rename cpp/{Library => Library_v1}/Processor/KTThreadReference.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTCacheDirectory.cc (100%)
 rename cpp/{Library => Library_v1}/Utility/KTCacheDirectory.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTConcurrentQueue.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTConfigurable.cc (100%)
 rename cpp/{Library => Library_v1}/Utility/KTConfigurable.hh (100%)
 rename {python/nymph => cpp/Library_v1/Utility}/KTConfigurablePybind.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTDirectory.cc (100%)
 rename cpp/{Library => Library_v1}/Utility/KTDirectory.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTEventLoop.cc (100%)
 rename cpp/{Library => Library_v1}/Utility/KTEventLoop.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTException.cc (100%)
 rename cpp/{Library => Library_v1}/Utility/KTException.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTExtensible.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTExtensibleStruct.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTExtensibleStructFactory.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTLogger.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTMemberVariable.hh (100%)
 rename {python/nymph => cpp/Library_v1/Utility}/KTParamPybind.hh (100%)
 rename {python/nymph => cpp/Library_v1/Utility}/KTPythonMacros.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTTIFactory.hh (100%)
 rename cpp/{Library => Library_v1}/Utility/KTTime.cc (100%)
 rename cpp/{Library => Library_v1}/Utility/KTTime.hh (100%)
 delete mode 100644 python/nymph/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 417468d..e376976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,10 +123,10 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 # Build Nymph #
 ###############
 
-add_subdirectory( cpp/Library )
+add_subdirectory( Cpp/Library )
 
 #if (Nymph_ENABLE_EXECUTABLES)
-#    add_subdirectory( cpp/Executables )
+#    add_subdirectory( Cpp/Executables_v1 )
 #endif (Nymph_ENABLE_EXECUTABLES )
 
 
diff --git a/Dockerfile b/Dockerfile
index e281869..8c1c9a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,8 @@ RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
 FROM nymph_common as nymph_done
 
 COPY cmake /tmp_source/cmake
-COPY python /tmp_source/python
-COPY cpp /tmp_source/cpp 
+COPY Python /tmp_source/Python
+COPY Cpp /tmp_source/Cpp 
 #COPY Executables /tmp_source/cpp/Executables
 COPY External /tmp_source/External
 #COPY Library /tmp_source/cpp/Library
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index efc26c0..1840076 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,34 +1,30 @@
 # CMakeLists for Nymph/Testing
 # Author: N.S. Oblath
 
-set( PY_DIR python )
-set( CPP_DIR cpp )
+set( PY_DIR Python )
+set( CPP_DIR Cpp )
 
 include_directories( BEFORE 
     ${CMAKE_CURRENT_SOURCE_DIR}/${PY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${CPP_DIR}
 )
 
-set (pytesting_CONFIGFILES
-    ${PY_DIR}/ConfigFiles/TestConfigurator.json
-)
+#set (pytesting_CONFIGFILES
+#    ${PY_DIR}/ConfigFiles/TestConfigurator.json
+#)
 
-pbuilder_install_config (${pytesting_CONFIGFILES})
+#pbuilder_install_config (${pytesting_CONFIGFILES})
 
 set( testing_HEADERS
     ${CPP_DIR}/TestProc.hh
 )
 
 #set (pytesting_HEADERS
-    #${PY_DIR}/KTPyTestClass.hh
-    #${PY_DIR}/KTPyTestClassPybind.hh
-    #${PY_DIR}/KTTestPythonBasics.hh
+#  
 #)
 
 #set (pytesting_SOURCES
-    #${PY_DIR}/KTPyTestClass.cc
-    #e${PY_DIR}/KTPyTestClassPybind.cc
-    #${PY_DIR}/KTTestPythonBasics.cc
+#
 #)
 
 set( testing_SOURCES
diff --git a/Testing/python/ConfigFiles/TestConfigurator.json b/Testing/python/ConfigFiles/TestConfigurator.json
deleted file mode 100644
index 8a5d5a1..0000000
--- a/Testing/python/ConfigFiles/TestConfigurator.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "test-configurable":
-    {
-        "int-data": 5,
-        "double-data": 50,
-        "string-data": "It works!",
-        "comment": "This should not show up in the as-parsed configuration",
-        "comment":
-        {
-            "neither": "should this"
-        }
-        
-    },
-    
-    "nested-data":
-    {
-        "single-data": 222,
-        "single-data-2": -5000,
-        "#single-data-3": 1,
-        "single-data-3": 10,
-        
-        "sub-data":
-        {
-            "single-data":111,
-            "single-data-2": 6789,
-            "multi-data":
-            [ 345, 456, ["###", 567], 789 ]
-        }
-    },
-    
-    "nested-data-2":
-    {
-        "single-data-2": 212121,
-        "single-data-3": "this replaced an integer",
-        
-        "sub-data":
-        {
-            "single-data-2": 12345
-        }
-    }
-}
\ No newline at end of file
diff --git a/Testing/python/ConfigFiles/TestParameterStoreConfig.json b/Testing/python/ConfigFiles/TestParameterStoreConfig.json
deleted file mode 100644
index a599ab0..0000000
--- a/Testing/python/ConfigFiles/TestParameterStoreConfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "test-configurable":
-    {
-        "int-data": 5,
-        "double-data": 50,
-        "string-data": "It works!"
-        
-    },
-    
-    "nested-data":
-    {
-        "single-data":222,
-        
-        "sub-data":
-        {
-            "single-data":111,
-            "multi-data":345,
-            "multi-data":567,
-            "multi-data":789
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/cmake/Nymph.cmake b/cmake/Nymph.cmake
index 12a46fd..67521d5 100644
--- a/cmake/Nymph.cmake
+++ b/cmake/Nymph.cmake
@@ -55,6 +55,6 @@ macro (nymph_process_options)
 endmacro ()
 
 macro (nymph_build_executables)
-	add_subdirectory (${NYMPH_DIR}/cpp/Executables)
+	add_subdirectory (${NYMPH_DIR}/Cpp/Executables_v1)
 endmacro ()
 
diff --git a/cpp/Executables/CMakeLists.txt b/cpp/Executables_v1/Main/CMakeLists.txt
similarity index 93%
rename from cpp/Executables/CMakeLists.txt
rename to cpp/Executables_v1/Main/CMakeLists.txt
index 4195d99..a7ba2b1 100644
--- a/cpp/Executables/CMakeLists.txt
+++ b/cpp/Executables_v1/Main/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for Nymph/cpp/Executables
+# CMakeLists for Nymph/Executables_v1/Main
 # Author: N. Oblath
 
 if( NOT Nymph_AS_SUBMODULE )
diff --git a/cpp/Executables/ConfigCheck.cc b/cpp/Executables_v1/Main/ConfigCheck.cc
similarity index 100%
rename from cpp/Executables/ConfigCheck.cc
rename to cpp/Executables_v1/Main/ConfigCheck.cc
diff --git a/cpp/Executables/Nymph.cc b/cpp/Executables_v1/Main/Nymph.cc
similarity index 100%
rename from cpp/Executables/Nymph.cc
rename to cpp/Executables_v1/Main/Nymph.cc
diff --git a/Testing/cpp/Validation/CMakeLists.txt b/cpp/Executables_v1/Validation/CMakeLists.txt
similarity index 97%
rename from Testing/cpp/Validation/CMakeLists.txt
rename to cpp/Executables_v1/Validation/CMakeLists.txt
index 2eb1b4f..90bc734 100644
--- a/Testing/cpp/Validation/CMakeLists.txt
+++ b/cpp/Executables_v1/Validation/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for Nymph/Testing/cpp/Validation
+# CMakeLists for Nymph/Executables_v1/Validation
 # Author: N. Oblath
 
 ############################
diff --git a/Testing/cpp/Validation/ConfigFiles/TestConfigurator.json b/cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Testing/cpp/Validation/ConfigFiles/TestConfigurator.json
rename to cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
diff --git a/Testing/cpp/Validation/ConfigFiles/TestParameterStoreConfig.json b/cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Testing/cpp/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Testing/cpp/KTJSONReader.cc b/cpp/Executables_v1/Validation/KTJSONReader.cc
similarity index 100%
rename from Testing/cpp/KTJSONReader.cc
rename to cpp/Executables_v1/Validation/KTJSONReader.cc
diff --git a/Testing/cpp/KTJSONReader.hh b/cpp/Executables_v1/Validation/KTJSONReader.hh
similarity index 100%
rename from Testing/cpp/KTJSONReader.hh
rename to cpp/Executables_v1/Validation/KTJSONReader.hh
diff --git a/Testing/cpp/KTJSONTypeWriterValidation.cc b/cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from Testing/cpp/KTJSONTypeWriterValidation.cc
rename to cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
diff --git a/Testing/cpp/KTJSONTypeWriterValidation.hh b/cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from Testing/cpp/KTJSONTypeWriterValidation.hh
rename to cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
diff --git a/Testing/python/KTPyTestClass.cc b/cpp/Executables_v1/Validation/KTPyTestClass.cc
similarity index 100%
rename from Testing/python/KTPyTestClass.cc
rename to cpp/Executables_v1/Validation/KTPyTestClass.cc
diff --git a/Testing/python/KTPyTestClass.hh b/cpp/Executables_v1/Validation/KTPyTestClass.hh
similarity index 100%
rename from Testing/python/KTPyTestClass.hh
rename to cpp/Executables_v1/Validation/KTPyTestClass.hh
diff --git a/Testing/python/KTPyTestClassPybind.hh b/cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
similarity index 100%
rename from Testing/python/KTPyTestClassPybind.hh
rename to cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
diff --git a/Testing/cpp/KTRegisterNymphValidationExtData.hh b/cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from Testing/cpp/KTRegisterNymphValidationExtData.hh
rename to cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
diff --git a/Testing/cpp/Validation/KTTestConfigurable.cc b/cpp/Executables_v1/Validation/KTTestConfigurable.cc
similarity index 100%
rename from Testing/cpp/Validation/KTTestConfigurable.cc
rename to cpp/Executables_v1/Validation/KTTestConfigurable.cc
diff --git a/Testing/cpp/Validation/KTTestConfigurable.hh b/cpp/Executables_v1/Validation/KTTestConfigurable.hh
similarity index 100%
rename from Testing/cpp/Validation/KTTestConfigurable.hh
rename to cpp/Executables_v1/Validation/KTTestConfigurable.hh
diff --git a/Testing/cpp/Validation/KTTestCuts.cc b/cpp/Executables_v1/Validation/KTTestCuts.cc
similarity index 100%
rename from Testing/cpp/Validation/KTTestCuts.cc
rename to cpp/Executables_v1/Validation/KTTestCuts.cc
diff --git a/Testing/cpp/Validation/KTTestCuts.hh b/cpp/Executables_v1/Validation/KTTestCuts.hh
similarity index 100%
rename from Testing/cpp/Validation/KTTestCuts.hh
rename to cpp/Executables_v1/Validation/KTTestCuts.hh
diff --git a/Testing/cpp/Validation/KTTestData.cc b/cpp/Executables_v1/Validation/KTTestData.cc
similarity index 100%
rename from Testing/cpp/Validation/KTTestData.cc
rename to cpp/Executables_v1/Validation/KTTestData.cc
diff --git a/Testing/cpp/Validation/KTTestData.hh b/cpp/Executables_v1/Validation/KTTestData.hh
similarity index 100%
rename from Testing/cpp/Validation/KTTestData.hh
rename to cpp/Executables_v1/Validation/KTTestData.hh
diff --git a/Testing/cpp/KTTestDataPrimaryProcessor.cc b/cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from Testing/cpp/KTTestDataPrimaryProcessor.cc
rename to cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
diff --git a/Testing/cpp/KTTestDataPrimaryProcessor.hh b/cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from Testing/cpp/KTTestDataPrimaryProcessor.hh
rename to cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
diff --git a/Testing/cpp/KTTestPrimaryProcessor.cc b/cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
similarity index 100%
rename from Testing/cpp/KTTestPrimaryProcessor.cc
rename to cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
diff --git a/Testing/cpp/KTTestPrimaryProcessor.hh b/cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
similarity index 100%
rename from Testing/cpp/KTTestPrimaryProcessor.hh
rename to cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
diff --git a/Testing/cpp/Validation/KTTestProcessor.cc b/cpp/Executables_v1/Validation/KTTestProcessor.cc
similarity index 100%
rename from Testing/cpp/Validation/KTTestProcessor.cc
rename to cpp/Executables_v1/Validation/KTTestProcessor.cc
diff --git a/Testing/cpp/Validation/KTTestProcessor.hh b/cpp/Executables_v1/Validation/KTTestProcessor.hh
similarity index 100%
rename from Testing/cpp/Validation/KTTestProcessor.hh
rename to cpp/Executables_v1/Validation/KTTestProcessor.hh
diff --git a/Testing/python/NymphValidationPybind.cc b/cpp/Executables_v1/Validation/NymphValidationPybind.cc
similarity index 100%
rename from Testing/python/NymphValidationPybind.cc
rename to cpp/Executables_v1/Validation/NymphValidationPybind.cc
diff --git a/Testing/cpp/Validation/TestApplication.cc b/cpp/Executables_v1/Validation/TestApplication.cc
similarity index 100%
rename from Testing/cpp/Validation/TestApplication.cc
rename to cpp/Executables_v1/Validation/TestApplication.cc
diff --git a/Testing/cpp/Validation/TestApplyCut.cc b/cpp/Executables_v1/Validation/TestApplyCut.cc
similarity index 100%
rename from Testing/cpp/Validation/TestApplyCut.cc
rename to cpp/Executables_v1/Validation/TestApplyCut.cc
diff --git a/Testing/cpp/Validation/TestCacheDirectory.cc b/cpp/Executables_v1/Validation/TestCacheDirectory.cc
similarity index 100%
rename from Testing/cpp/Validation/TestCacheDirectory.cc
rename to cpp/Executables_v1/Validation/TestCacheDirectory.cc
diff --git a/Testing/cpp/Validation/TestCut.cc b/cpp/Executables_v1/Validation/TestCut.cc
similarity index 100%
rename from Testing/cpp/Validation/TestCut.cc
rename to cpp/Executables_v1/Validation/TestCut.cc
diff --git a/Testing/cpp/Validation/TestCutFilter.cc b/cpp/Executables_v1/Validation/TestCutFilter.cc
similarity index 100%
rename from Testing/cpp/Validation/TestCutFilter.cc
rename to cpp/Executables_v1/Validation/TestCutFilter.cc
diff --git a/Testing/cpp/Validation/TestData.cc b/cpp/Executables_v1/Validation/TestData.cc
similarity index 100%
rename from Testing/cpp/Validation/TestData.cc
rename to cpp/Executables_v1/Validation/TestData.cc
diff --git a/Testing/cpp/TestExceptionInSlot.cc b/cpp/Executables_v1/Validation/TestExceptionInSlot.cc
similarity index 100%
rename from Testing/cpp/TestExceptionInSlot.cc
rename to cpp/Executables_v1/Validation/TestExceptionInSlot.cc
diff --git a/Testing/cpp/TestExt.cc b/cpp/Executables_v1/Validation/TestExt.cc
similarity index 100%
rename from Testing/cpp/TestExt.cc
rename to cpp/Executables_v1/Validation/TestExt.cc
diff --git a/Testing/cpp/TestExtSerialization.cc b/cpp/Executables_v1/Validation/TestExtSerialization.cc
similarity index 100%
rename from Testing/cpp/TestExtSerialization.cc
rename to cpp/Executables_v1/Validation/TestExtSerialization.cc
diff --git a/Testing/cpp/TestJSONWriter.cc b/cpp/Executables_v1/Validation/TestJSONWriter.cc
similarity index 100%
rename from Testing/cpp/TestJSONWriter.cc
rename to cpp/Executables_v1/Validation/TestJSONWriter.cc
diff --git a/Testing/cpp/TestJSONWriterViaSlot.cc b/cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
similarity index 100%
rename from Testing/cpp/TestJSONWriterViaSlot.cc
rename to cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
diff --git a/Testing/cpp/Validation/TestLogger.cc b/cpp/Executables_v1/Validation/TestLogger.cc
similarity index 100%
rename from Testing/cpp/Validation/TestLogger.cc
rename to cpp/Executables_v1/Validation/TestLogger.cc
diff --git a/Testing/python/TestParamBindings.py b/cpp/Executables_v1/Validation/TestParamBindings.py
similarity index 100%
rename from Testing/python/TestParamBindings.py
rename to cpp/Executables_v1/Validation/TestParamBindings.py
diff --git a/Testing/cpp/TestPolymorphicSlotData.cc b/cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
similarity index 100%
rename from Testing/cpp/TestPolymorphicSlotData.cc
rename to cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
diff --git a/Testing/cpp/Validation/TestPrimaryProcessor.cc b/cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
similarity index 100%
rename from Testing/cpp/Validation/TestPrimaryProcessor.cc
rename to cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
diff --git a/Testing/cpp/TestPrimaryProcessorNoThreading.cc b/cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from Testing/cpp/TestPrimaryProcessorNoThreading.cc
rename to cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
diff --git a/Testing/cpp/Validation/TestPrintData.cc b/cpp/Executables_v1/Validation/TestPrintData.cc
similarity index 100%
rename from Testing/cpp/Validation/TestPrintData.cc
rename to cpp/Executables_v1/Validation/TestPrintData.cc
diff --git a/Testing/python/TestProcessorToolbox.py b/cpp/Executables_v1/Validation/TestProcessorToolbox.py
similarity index 100%
rename from Testing/python/TestProcessorToolbox.py
rename to cpp/Executables_v1/Validation/TestProcessorToolbox.py
diff --git a/Testing/cpp/TestProcessorToolbox2Threads.cc b/cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from Testing/cpp/TestProcessorToolbox2Threads.cc
rename to cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
diff --git a/Testing/cpp/TestProcessorToolboxMultithreaded.cc b/cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from Testing/cpp/TestProcessorToolboxMultithreaded.cc
rename to cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
diff --git a/Testing/cpp/TestProcessorToolboxSinglethreaded.cc b/cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from Testing/cpp/TestProcessorToolboxSinglethreaded.cc
rename to cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
diff --git a/Testing/python/TestPyTestClass.py b/cpp/Executables_v1/Validation/TestPyTestClass.py
similarity index 100%
rename from Testing/python/TestPyTestClass.py
rename to cpp/Executables_v1/Validation/TestPyTestClass.py
diff --git a/Testing/python/TestPythonBasics.hh b/cpp/Executables_v1/Validation/TestPythonBasics.hh
similarity index 100%
rename from Testing/python/TestPythonBasics.hh
rename to cpp/Executables_v1/Validation/TestPythonBasics.hh
diff --git a/Testing/python/TestPythonBasics.py b/cpp/Executables_v1/Validation/TestPythonBasics.py
similarity index 100%
rename from Testing/python/TestPythonBasics.py
rename to cpp/Executables_v1/Validation/TestPythonBasics.py
diff --git a/Testing/cpp/TestSerialization.cc b/cpp/Executables_v1/Validation/TestSerialization.cc
similarity index 100%
rename from Testing/cpp/TestSerialization.cc
rename to cpp/Executables_v1/Validation/TestSerialization.cc
diff --git a/Testing/cpp/Validation/TestSignalsAndSlots.cc b/cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from Testing/cpp/Validation/TestSignalsAndSlots.cc
rename to cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
diff --git a/Testing/cpp/TestSlotData.cc b/cpp/Executables_v1/Validation/TestSlotData.cc
similarity index 100%
rename from Testing/cpp/TestSlotData.cc
rename to cpp/Executables_v1/Validation/TestSlotData.cc
diff --git a/Testing/cpp/Validation/TestThroughputProfiler.cc b/cpp/Executables_v1/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from Testing/cpp/Validation/TestThroughputProfiler.cc
rename to cpp/Executables_v1/Validation/TestThroughputProfiler.cc
diff --git a/Testing/cpp/TestUseBreakpoint.cc b/cpp/Executables_v1/Validation/TestUseBreakpoint.cc
similarity index 100%
rename from Testing/cpp/TestUseBreakpoint.cc
rename to cpp/Executables_v1/Validation/TestUseBreakpoint.cc
diff --git a/Testing/python/TestWrapProcessor.py b/cpp/Executables_v1/Validation/TestWrapProcessor.py
similarity index 100%
rename from Testing/python/TestWrapProcessor.py
rename to cpp/Executables_v1/Validation/TestWrapProcessor.py
diff --git a/cpp/Library/CMakeLists.txt b/cpp/Library/CMakeLists.txt
index 9abb7bc..bf91763 100644
--- a/cpp/Library/CMakeLists.txt
+++ b/cpp/Library/CMakeLists.txt
@@ -1,18 +1,18 @@
-# CMakeLists for Nymph/cpp/Library
+# CMakeLists for Nymph/Cpp/Library
 # Author: N.S. Oblath
 
 set( UTIL_DIR Utility )
 set( DATA_DIR Data )
 set( PROC_DIR Processor )
-set( IO_DIR IO )
-set( APPL_DIR Application )
+#set( IO_DIR IO )
+#set( APPL_DIR Application )
 
 include_directories( BEFORE 
     ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
 )
 
 set( NYMPH_HEADERFILES
@@ -30,50 +30,6 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/ReturnBuffer.hh
     ${PROC_DIR}/SignalSlotBase.hh
 
-# Below are the v1 Library files
-
-#    ${UTIL_DIR}/KTCacheDirectory.hh
-#    ${UTIL_DIR}/KTConcurrentQueue.hh
-#    ${UTIL_DIR}/KTConfigurable.hh
-#    ${UTIL_DIR}/KTDirectory.hh
-#    ${UTIL_DIR}/KTEventLoop.hh
-#    ${UTIL_DIR}/KTException.hh
-#    ${UTIL_DIR}/KTExtensible.hh
-#    ${UTIL_DIR}/KTExtensibleStruct.hh
-#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
-#    ${UTIL_DIR}/KTLogger.hh
-#    ${UTIL_DIR}/KTMemberVariable.hh
-#    ${UTIL_DIR}/KTTIFactory.hh
-#    ${UTIL_DIR}/KTTime.hh
-#    ${DATA_DIR}/KTApplyCut.hh
-#    ${DATA_DIR}/KTCoreData.hh
-#    ${DATA_DIR}/KTCut.hh
-#    ${DATA_DIR}/KTCutFilter.hh
-#    ${DATA_DIR}/KTCutResult.hh
-#    ${DATA_DIR}/KTCutStatus.hh
-#    ${DATA_DIR}/KTData.hh
-#    ${DATA_DIR}/KTRegisterNymphExtData.hh
-#    ${PROC_DIR}/KTConnection.hh
-#    ${PROC_DIR}/KTPrimaryProcessor.hh
-#    ${PROC_DIR}/KTProcessor.hh
-#    ${PROC_DIR}/KTSignal.hh
-#    ${PROC_DIR}/KTSignalWrapper.hh
-#    ${PROC_DIR}/KTSlot.hh
-#    ${PROC_DIR}/KTSlotWrapper.hh
-#    ${PROC_DIR}/KTThreadReference.hh
-#    ${IO_DIR}/KTJSONWriter.hh
-#    ${IO_DIR}/KTReader.hh
-#    ${IO_DIR}/KTWriter.hh
-#    ${APPL_DIR}/KTApplication.hh
-#    ${APPL_DIR}/KTCommandLineHandler.hh
-#    ${APPL_DIR}/KTCommandLineOption.hh
-#    ${APPL_DIR}/KTConfigurator.hh
-#    ${APPL_DIR}/KTDataQueueProcessor.hh
-#    ${APPL_DIR}/KTFilenameParsers.hh
-#    ${APPL_DIR}/KTPrintDataStructure.hh
-#    ${APPL_DIR}/KTProcessorToolbox.hh
-#    ${APPL_DIR}/KTRunNymph.hh
-#    ${APPL_DIR}/KTThroughputProfiler.hh
 )
 
 set( NYMPH_SOURCEFILES
@@ -88,38 +44,6 @@ set( NYMPH_SOURCEFILES
     ${PROC_DIR}/ProcessorToolbox.cc
     ${PROC_DIR}/ReturnBuffer.cc
     ${PROC_DIR}/SignalSlotBase.cc
-
-# Below are the v1 Library files
-
-#    ${UTIL_DIR}/KTCacheDirectory.cc
-#    ${UTIL_DIR}/KTConfigurable.cc
-#    ${UTIL_DIR}/KTDirectory.cc
-#    ${UTIL_DIR}/KTEventLoop.cc
-#    ${UTIL_DIR}/KTException.cc
-#    ${UTIL_DIR}/KTTime.cc
-#    ${DATA_DIR}/KTApplyCut.cc
-#    ${DATA_DIR}/KTCoreData.cc
-#    ${DATA_DIR}/KTCut.cc
-#    ${DATA_DIR}/KTCutFilter.cc
-#    ${DATA_DIR}/KTCutStatus.cc
-#    ${DATA_DIR}/KTData.cc
-#    ${PROC_DIR}/KTPrimaryProcessor.cc
-#    ${PROC_DIR}/KTProcessor.cc
-#    ${PROC_DIR}/KTSignalWrapper.cc
-#    ${PROC_DIR}/KTSlotWrapper.cc
-#    ${PROC_DIR}/KTThreadReference.cc
-#    ${IO_DIR}/KTJSONWriter.cc
-#    ${IO_DIR}/KTReader.cc
-#    ${IO_DIR}/KTWriter.cc
-#    ${APPL_DIR}/KTApplication.cc
-#    ${APPL_DIR}/KTCommandLineHandler.cc
-#    ${APPL_DIR}/KTConfigurator.cc
-#    ${APPL_DIR}/KTDataQueueProcessor.cc
-#    ${APPL_DIR}/KTFilenameParsers.cc
-#    ${APPL_DIR}/KTPrintDataStructure.cc
-#    ${APPL_DIR}/KTProcessorToolbox.cc
-#    ${APPL_DIR}/KTRunNymph.cc
-#    ${APPL_DIR}/KTThroughputProfiler.cc
 )
 
 
diff --git a/python/nymph/AddLibPythonPath.sh.in b/cpp/Library_v1/AddLibPythonPath.sh.in
similarity index 100%
rename from python/nymph/AddLibPythonPath.sh.in
rename to cpp/Library_v1/AddLibPythonPath.sh.in
diff --git a/cpp/Library/Application/KTApplication.cc b/cpp/Library_v1/Application/KTApplication.cc
similarity index 100%
rename from cpp/Library/Application/KTApplication.cc
rename to cpp/Library_v1/Application/KTApplication.cc
diff --git a/cpp/Library/Application/KTApplication.hh b/cpp/Library_v1/Application/KTApplication.hh
similarity index 100%
rename from cpp/Library/Application/KTApplication.hh
rename to cpp/Library_v1/Application/KTApplication.hh
diff --git a/cpp/Library/Application/KTCommandLineHandler.cc b/cpp/Library_v1/Application/KTCommandLineHandler.cc
similarity index 100%
rename from cpp/Library/Application/KTCommandLineHandler.cc
rename to cpp/Library_v1/Application/KTCommandLineHandler.cc
diff --git a/cpp/Library/Application/KTCommandLineHandler.hh b/cpp/Library_v1/Application/KTCommandLineHandler.hh
similarity index 100%
rename from cpp/Library/Application/KTCommandLineHandler.hh
rename to cpp/Library_v1/Application/KTCommandLineHandler.hh
diff --git a/cpp/Library/Application/KTCommandLineOption.hh b/cpp/Library_v1/Application/KTCommandLineOption.hh
similarity index 100%
rename from cpp/Library/Application/KTCommandLineOption.hh
rename to cpp/Library_v1/Application/KTCommandLineOption.hh
diff --git a/cpp/Library/Application/KTConfigurator.cc b/cpp/Library_v1/Application/KTConfigurator.cc
similarity index 100%
rename from cpp/Library/Application/KTConfigurator.cc
rename to cpp/Library_v1/Application/KTConfigurator.cc
diff --git a/cpp/Library/Application/KTConfigurator.hh b/cpp/Library_v1/Application/KTConfigurator.hh
similarity index 100%
rename from cpp/Library/Application/KTConfigurator.hh
rename to cpp/Library_v1/Application/KTConfigurator.hh
diff --git a/cpp/Library/Application/KTDataQueueProcessor.cc b/cpp/Library_v1/Application/KTDataQueueProcessor.cc
similarity index 100%
rename from cpp/Library/Application/KTDataQueueProcessor.cc
rename to cpp/Library_v1/Application/KTDataQueueProcessor.cc
diff --git a/cpp/Library/Application/KTDataQueueProcessor.hh b/cpp/Library_v1/Application/KTDataQueueProcessor.hh
similarity index 100%
rename from cpp/Library/Application/KTDataQueueProcessor.hh
rename to cpp/Library_v1/Application/KTDataQueueProcessor.hh
diff --git a/cpp/Library/Application/KTFilenameParsers.cc b/cpp/Library_v1/Application/KTFilenameParsers.cc
similarity index 100%
rename from cpp/Library/Application/KTFilenameParsers.cc
rename to cpp/Library_v1/Application/KTFilenameParsers.cc
diff --git a/cpp/Library/Application/KTFilenameParsers.hh b/cpp/Library_v1/Application/KTFilenameParsers.hh
similarity index 100%
rename from cpp/Library/Application/KTFilenameParsers.hh
rename to cpp/Library_v1/Application/KTFilenameParsers.hh
diff --git a/cpp/Library/Application/KTPrintDataStructure.cc b/cpp/Library_v1/Application/KTPrintDataStructure.cc
similarity index 100%
rename from cpp/Library/Application/KTPrintDataStructure.cc
rename to cpp/Library_v1/Application/KTPrintDataStructure.cc
diff --git a/cpp/Library/Application/KTPrintDataStructure.hh b/cpp/Library_v1/Application/KTPrintDataStructure.hh
similarity index 100%
rename from cpp/Library/Application/KTPrintDataStructure.hh
rename to cpp/Library_v1/Application/KTPrintDataStructure.hh
diff --git a/cpp/Library/Application/KTProcessorToolbox.cc b/cpp/Library_v1/Application/KTProcessorToolbox.cc
similarity index 100%
rename from cpp/Library/Application/KTProcessorToolbox.cc
rename to cpp/Library_v1/Application/KTProcessorToolbox.cc
diff --git a/cpp/Library/Application/KTProcessorToolbox.hh b/cpp/Library_v1/Application/KTProcessorToolbox.hh
similarity index 100%
rename from cpp/Library/Application/KTProcessorToolbox.hh
rename to cpp/Library_v1/Application/KTProcessorToolbox.hh
diff --git a/python/nymph/KTProcessorToolboxPybind.hh b/cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
similarity index 100%
rename from python/nymph/KTProcessorToolboxPybind.hh
rename to cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
diff --git a/cpp/Library/Application/KTRunNymph.cc b/cpp/Library_v1/Application/KTRunNymph.cc
similarity index 100%
rename from cpp/Library/Application/KTRunNymph.cc
rename to cpp/Library_v1/Application/KTRunNymph.cc
diff --git a/cpp/Library/Application/KTRunNymph.hh b/cpp/Library_v1/Application/KTRunNymph.hh
similarity index 100%
rename from cpp/Library/Application/KTRunNymph.hh
rename to cpp/Library_v1/Application/KTRunNymph.hh
diff --git a/cpp/Library/Application/KTThroughputProfiler.cc b/cpp/Library_v1/Application/KTThroughputProfiler.cc
similarity index 100%
rename from cpp/Library/Application/KTThroughputProfiler.cc
rename to cpp/Library_v1/Application/KTThroughputProfiler.cc
diff --git a/cpp/Library/Application/KTThroughputProfiler.hh b/cpp/Library_v1/Application/KTThroughputProfiler.hh
similarity index 100%
rename from cpp/Library/Application/KTThroughputProfiler.hh
rename to cpp/Library_v1/Application/KTThroughputProfiler.hh
diff --git a/cpp/Library_v1/CMakeLists.txt b/cpp/Library_v1/CMakeLists.txt
new file mode 100644
index 0000000..c03d325
--- /dev/null
+++ b/cpp/Library_v1/CMakeLists.txt
@@ -0,0 +1,121 @@
+# CMakeLists for Nymph/Library_v1
+# Author: N. Oblath
+
+include( PythonPackage )
+
+set( UTIL_DIR Utility )
+set( DATA_DIR Data )
+set( PROC_DIR Processor )
+set( IO_DIR IO )
+set( APPL_DIR Application )
+
+set( NYMPH_HEADERFILES
+#    ${UTIL_DIR}/KTCacheDirectory.hh
+#    ${UTIL_DIR}/KTConcurrentQueue.hh
+#    ${UTIL_DIR}/KTConfigurable.hh
+#    ${UTIL_DIR}/KTDirectory.hh
+#    ${UTIL_DIR}/KTEventLoop.hh
+#    ${UTIL_DIR}/KTException.hh
+#    ${UTIL_DIR}/KTExtensible.hh
+#    ${UTIL_DIR}/KTExtensibleStruct.hh
+#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
+#    ${UTIL_DIR}/KTLogger.hh
+#    ${UTIL_DIR}/KTMemberVariable.hh
+#    ${UTIL_DIR}/KTTIFactory.hh
+#    ${UTIL_DIR}/KTTime.hh
+#    ${DATA_DIR}/KTApplyCut.hh
+#    ${DATA_DIR}/KTCoreData.hh
+#    ${DATA_DIR}/KTCut.hh
+#    ${DATA_DIR}/KTCutFilter.hh
+#    ${DATA_DIR}/KTCutResult.hh
+#    ${DATA_DIR}/KTCutStatus.hh
+#    ${DATA_DIR}/KTData.hh
+#    ${DATA_DIR}/KTRegisterNymphExtData.hh
+#    ${PROC_DIR}/KTConnection.hh
+#    ${PROC_DIR}/KTPrimaryProcessor.hh
+#    ${PROC_DIR}/KTProcessor.hh
+#    ${PROC_DIR}/KTSignal.hh
+#    ${PROC_DIR}/KTSignalWrapper.hh
+#    ${PROC_DIR}/KTSlot.hh
+#    ${PROC_DIR}/KTSlotWrapper.hh
+#    ${PROC_DIR}/KTThreadReference.hh
+#    ${IO_DIR}/KTJSONWriter.hh
+#    ${IO_DIR}/KTReader.hh
+#    ${IO_DIR}/KTWriter.hh
+#    ${APPL_DIR}/KTApplication.hh
+#    ${APPL_DIR}/KTCommandLineHandler.hh
+#    ${APPL_DIR}/KTCommandLineOption.hh
+#    ${APPL_DIR}/KTConfigurator.hh
+#    ${APPL_DIR}/KTDataQueueProcessor.hh
+#    ${APPL_DIR}/KTFilenameParsers.hh
+#    ${APPL_DIR}/KTPrintDataStructure.hh
+#    ${APPL_DIR}/KTProcessorToolbox.hh
+#    ${APPL_DIR}/KTRunNymph.hh
+#    ${APPL_DIR}/KTThroughputProfiler.hh
+    ${UTIL_DIR}/Exception.hh
+    ${UTIL_DIR}/MemberVariable.hh
+)
+
+set( NYMPH_SOURCEFILES
+#    ${UTIL_DIR}/KTCacheDirectory.cc
+#    ${UTIL_DIR}/KTConfigurable.cc
+#    ${UTIL_DIR}/KTDirectory.cc
+#    ${UTIL_DIR}/KTEventLoop.cc
+#    ${UTIL_DIR}/KTException.cc
+#    ${UTIL_DIR}/KTTime.cc
+#    ${DATA_DIR}/KTApplyCut.cc
+#    ${DATA_DIR}/KTCoreData.cc
+#    ${DATA_DIR}/KTCut.cc
+#    ${DATA_DIR}/KTCutFilter.cc
+#    ${DATA_DIR}/KTCutStatus.cc
+#    ${DATA_DIR}/KTData.cc
+#    ${PROC_DIR}/KTPrimaryProcessor.cc
+#    ${PROC_DIR}/KTProcessor.cc
+#    ${PROC_DIR}/KTSignalWrapper.cc
+#    ${PROC_DIR}/KTSlotWrapper.cc
+#    ${PROC_DIR}/KTThreadReference.cc
+#    ${IO_DIR}/KTJSONWriter.cc
+#    ${IO_DIR}/KTReader.cc
+#    ${IO_DIR}/KTWriter.cc
+#    ${APPL_DIR}/KTApplication.cc
+#    ${APPL_DIR}/KTCommandLineHandler.cc
+#    ${APPL_DIR}/KTConfigurator.cc
+#    ${APPL_DIR}/KTDataQueueProcessor.cc
+#    ${APPL_DIR}/KTFilenameParsers.cc
+#    ${APPL_DIR}/KTPrintDataStructure.cc
+#    ${APPL_DIR}/KTProcessorToolbox.cc
+#    ${APPL_DIR}/KTRunNymph.cc
+#    ${APPL_DIR}/KTThroughputProfiler.cc
+    ${UTIL_DIR}/Exception.cc
+)
+
+# Python binding headers
+set( NYMPH_PYBINDING_HEADERFILES
+    #${UTIL_DIR}/KTConfigurablePybind.hh
+    ${UTIL_DIR}/KTParamPybind.hh
+    ${PROC_DIR}/KTProcessorPybind.hh
+    ${PROC_DIR}/KTPyProcessor.hh
+)
+
+# Python bindings
+set( NYMPH_PYBINDING_SOURCEFILES
+    ${PROC_DIR}/KTProcessorPybind.cc
+    NymphPybind.cc
+)
+
+##################################################
+
+pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
+pbuilder_install_headers( ${NYMPH_HEADERFILES} )
+
+if( Nymph_ENABLE_PYTHON )
+    set( LIB_DEPENDENCIES Nymph )
+
+    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
+    
+    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
+    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
+    pbuilder_install_libraries( py_nymph )
+    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
+endif( Nymph_ENABLE_PYTHON )
diff --git a/cpp/Library/Data/KTApplyCut.cc b/cpp/Library_v1/Data/KTApplyCut.cc
similarity index 100%
rename from cpp/Library/Data/KTApplyCut.cc
rename to cpp/Library_v1/Data/KTApplyCut.cc
diff --git a/cpp/Library/Data/KTApplyCut.hh b/cpp/Library_v1/Data/KTApplyCut.hh
similarity index 100%
rename from cpp/Library/Data/KTApplyCut.hh
rename to cpp/Library_v1/Data/KTApplyCut.hh
diff --git a/cpp/Library/Data/KTCoreData.cc b/cpp/Library_v1/Data/KTCoreData.cc
similarity index 100%
rename from cpp/Library/Data/KTCoreData.cc
rename to cpp/Library_v1/Data/KTCoreData.cc
diff --git a/cpp/Library/Data/KTCoreData.hh b/cpp/Library_v1/Data/KTCoreData.hh
similarity index 100%
rename from cpp/Library/Data/KTCoreData.hh
rename to cpp/Library_v1/Data/KTCoreData.hh
diff --git a/cpp/Library/Data/KTCut.cc b/cpp/Library_v1/Data/KTCut.cc
similarity index 100%
rename from cpp/Library/Data/KTCut.cc
rename to cpp/Library_v1/Data/KTCut.cc
diff --git a/cpp/Library/Data/KTCut.hh b/cpp/Library_v1/Data/KTCut.hh
similarity index 100%
rename from cpp/Library/Data/KTCut.hh
rename to cpp/Library_v1/Data/KTCut.hh
diff --git a/cpp/Library/Data/KTCutFilter.cc b/cpp/Library_v1/Data/KTCutFilter.cc
similarity index 100%
rename from cpp/Library/Data/KTCutFilter.cc
rename to cpp/Library_v1/Data/KTCutFilter.cc
diff --git a/cpp/Library/Data/KTCutFilter.hh b/cpp/Library_v1/Data/KTCutFilter.hh
similarity index 100%
rename from cpp/Library/Data/KTCutFilter.hh
rename to cpp/Library_v1/Data/KTCutFilter.hh
diff --git a/cpp/Library/Data/KTCutResult.hh b/cpp/Library_v1/Data/KTCutResult.hh
similarity index 100%
rename from cpp/Library/Data/KTCutResult.hh
rename to cpp/Library_v1/Data/KTCutResult.hh
diff --git a/cpp/Library/Data/KTCutStatus.cc b/cpp/Library_v1/Data/KTCutStatus.cc
similarity index 100%
rename from cpp/Library/Data/KTCutStatus.cc
rename to cpp/Library_v1/Data/KTCutStatus.cc
diff --git a/cpp/Library/Data/KTCutStatus.hh b/cpp/Library_v1/Data/KTCutStatus.hh
similarity index 100%
rename from cpp/Library/Data/KTCutStatus.hh
rename to cpp/Library_v1/Data/KTCutStatus.hh
diff --git a/cpp/Library/Data/KTData.cc b/cpp/Library_v1/Data/KTData.cc
similarity index 100%
rename from cpp/Library/Data/KTData.cc
rename to cpp/Library_v1/Data/KTData.cc
diff --git a/cpp/Library/Data/KTData.hh b/cpp/Library_v1/Data/KTData.hh
similarity index 100%
rename from cpp/Library/Data/KTData.hh
rename to cpp/Library_v1/Data/KTData.hh
diff --git a/cpp/Library/Data/KTRegisterNymphExtData.hh b/cpp/Library_v1/Data/KTRegisterNymphExtData.hh
similarity index 100%
rename from cpp/Library/Data/KTRegisterNymphExtData.hh
rename to cpp/Library_v1/Data/KTRegisterNymphExtData.hh
diff --git a/cpp/Library/Data/KTTester.cc b/cpp/Library_v1/Data/KTTester.cc
similarity index 100%
rename from cpp/Library/Data/KTTester.cc
rename to cpp/Library_v1/Data/KTTester.cc
diff --git a/cpp/Library/Data/KTTester.hh b/cpp/Library_v1/Data/KTTester.hh
similarity index 100%
rename from cpp/Library/Data/KTTester.hh
rename to cpp/Library_v1/Data/KTTester.hh
diff --git a/cpp/Library/IO/KTJSONWriter.cc b/cpp/Library_v1/IO/KTJSONWriter.cc
similarity index 100%
rename from cpp/Library/IO/KTJSONWriter.cc
rename to cpp/Library_v1/IO/KTJSONWriter.cc
diff --git a/cpp/Library/IO/KTJSONWriter.hh b/cpp/Library_v1/IO/KTJSONWriter.hh
similarity index 100%
rename from cpp/Library/IO/KTJSONWriter.hh
rename to cpp/Library_v1/IO/KTJSONWriter.hh
diff --git a/cpp/Library/IO/KTReader.cc b/cpp/Library_v1/IO/KTReader.cc
similarity index 100%
rename from cpp/Library/IO/KTReader.cc
rename to cpp/Library_v1/IO/KTReader.cc
diff --git a/cpp/Library/IO/KTReader.hh b/cpp/Library_v1/IO/KTReader.hh
similarity index 100%
rename from cpp/Library/IO/KTReader.hh
rename to cpp/Library_v1/IO/KTReader.hh
diff --git a/cpp/Library/IO/KTWriter.cc b/cpp/Library_v1/IO/KTWriter.cc
similarity index 100%
rename from cpp/Library/IO/KTWriter.cc
rename to cpp/Library_v1/IO/KTWriter.cc
diff --git a/cpp/Library/IO/KTWriter.hh b/cpp/Library_v1/IO/KTWriter.hh
similarity index 100%
rename from cpp/Library/IO/KTWriter.hh
rename to cpp/Library_v1/IO/KTWriter.hh
diff --git a/python/nymph/NymphPybind.cc b/cpp/Library_v1/NymphPybind.cc
similarity index 100%
rename from python/nymph/NymphPybind.cc
rename to cpp/Library_v1/NymphPybind.cc
diff --git a/cpp/Library/Processor/KTConnection.hh b/cpp/Library_v1/Processor/KTConnection.hh
similarity index 100%
rename from cpp/Library/Processor/KTConnection.hh
rename to cpp/Library_v1/Processor/KTConnection.hh
diff --git a/cpp/Library/Processor/KTNymphSignals.hh b/cpp/Library_v1/Processor/KTNymphSignals.hh
similarity index 100%
rename from cpp/Library/Processor/KTNymphSignals.hh
rename to cpp/Library_v1/Processor/KTNymphSignals.hh
diff --git a/cpp/Library/Processor/KTNymphSlot.hh b/cpp/Library_v1/Processor/KTNymphSlot.hh
similarity index 100%
rename from cpp/Library/Processor/KTNymphSlot.hh
rename to cpp/Library_v1/Processor/KTNymphSlot.hh
diff --git a/cpp/Library/Processor/KTPrimaryProcessor.cc b/cpp/Library_v1/Processor/KTPrimaryProcessor.cc
similarity index 100%
rename from cpp/Library/Processor/KTPrimaryProcessor.cc
rename to cpp/Library_v1/Processor/KTPrimaryProcessor.cc
diff --git a/cpp/Library/Processor/KTPrimaryProcessor.hh b/cpp/Library_v1/Processor/KTPrimaryProcessor.hh
similarity index 100%
rename from cpp/Library/Processor/KTPrimaryProcessor.hh
rename to cpp/Library_v1/Processor/KTPrimaryProcessor.hh
diff --git a/cpp/Library/Processor/KTProcessor.cc b/cpp/Library_v1/Processor/KTProcessor.cc
similarity index 100%
rename from cpp/Library/Processor/KTProcessor.cc
rename to cpp/Library_v1/Processor/KTProcessor.cc
diff --git a/cpp/Library/Processor/KTProcessor.hh b/cpp/Library_v1/Processor/KTProcessor.hh
similarity index 100%
rename from cpp/Library/Processor/KTProcessor.hh
rename to cpp/Library_v1/Processor/KTProcessor.hh
diff --git a/python/nymph/KTProcessorPybind.cc b/cpp/Library_v1/Processor/KTProcessorPybind.cc
similarity index 100%
rename from python/nymph/KTProcessorPybind.cc
rename to cpp/Library_v1/Processor/KTProcessorPybind.cc
diff --git a/python/nymph/KTProcessorPybind.hh b/cpp/Library_v1/Processor/KTProcessorPybind.hh
similarity index 100%
rename from python/nymph/KTProcessorPybind.hh
rename to cpp/Library_v1/Processor/KTProcessorPybind.hh
diff --git a/python/nymph/KTPyProcessor.hh b/cpp/Library_v1/Processor/KTPyProcessor.hh
similarity index 100%
rename from python/nymph/KTPyProcessor.hh
rename to cpp/Library_v1/Processor/KTPyProcessor.hh
diff --git a/cpp/Library/Processor/KTSignal.hh b/cpp/Library_v1/Processor/KTSignal.hh
similarity index 100%
rename from cpp/Library/Processor/KTSignal.hh
rename to cpp/Library_v1/Processor/KTSignal.hh
diff --git a/cpp/Library/Processor/KTSignalSlotBase.hh b/cpp/Library_v1/Processor/KTSignalSlotBase.hh
similarity index 100%
rename from cpp/Library/Processor/KTSignalSlotBase.hh
rename to cpp/Library_v1/Processor/KTSignalSlotBase.hh
diff --git a/cpp/Library/Processor/KTSignalWrapper.cc b/cpp/Library_v1/Processor/KTSignalWrapper.cc
similarity index 100%
rename from cpp/Library/Processor/KTSignalWrapper.cc
rename to cpp/Library_v1/Processor/KTSignalWrapper.cc
diff --git a/cpp/Library/Processor/KTSignalWrapper.hh b/cpp/Library_v1/Processor/KTSignalWrapper.hh
similarity index 100%
rename from cpp/Library/Processor/KTSignalWrapper.hh
rename to cpp/Library_v1/Processor/KTSignalWrapper.hh
diff --git a/cpp/Library/Processor/KTSlot.hh b/cpp/Library_v1/Processor/KTSlot.hh
similarity index 100%
rename from cpp/Library/Processor/KTSlot.hh
rename to cpp/Library_v1/Processor/KTSlot.hh
diff --git a/cpp/Library/Processor/KTSlotWrapper.cc b/cpp/Library_v1/Processor/KTSlotWrapper.cc
similarity index 100%
rename from cpp/Library/Processor/KTSlotWrapper.cc
rename to cpp/Library_v1/Processor/KTSlotWrapper.cc
diff --git a/cpp/Library/Processor/KTSlotWrapper.hh b/cpp/Library_v1/Processor/KTSlotWrapper.hh
similarity index 100%
rename from cpp/Library/Processor/KTSlotWrapper.hh
rename to cpp/Library_v1/Processor/KTSlotWrapper.hh
diff --git a/cpp/Library/Processor/KTThreadReference.cc b/cpp/Library_v1/Processor/KTThreadReference.cc
similarity index 100%
rename from cpp/Library/Processor/KTThreadReference.cc
rename to cpp/Library_v1/Processor/KTThreadReference.cc
diff --git a/cpp/Library/Processor/KTThreadReference.hh b/cpp/Library_v1/Processor/KTThreadReference.hh
similarity index 100%
rename from cpp/Library/Processor/KTThreadReference.hh
rename to cpp/Library_v1/Processor/KTThreadReference.hh
diff --git a/cpp/Library/Utility/KTCacheDirectory.cc b/cpp/Library_v1/Utility/KTCacheDirectory.cc
similarity index 100%
rename from cpp/Library/Utility/KTCacheDirectory.cc
rename to cpp/Library_v1/Utility/KTCacheDirectory.cc
diff --git a/cpp/Library/Utility/KTCacheDirectory.hh b/cpp/Library_v1/Utility/KTCacheDirectory.hh
similarity index 100%
rename from cpp/Library/Utility/KTCacheDirectory.hh
rename to cpp/Library_v1/Utility/KTCacheDirectory.hh
diff --git a/cpp/Library/Utility/KTConcurrentQueue.hh b/cpp/Library_v1/Utility/KTConcurrentQueue.hh
similarity index 100%
rename from cpp/Library/Utility/KTConcurrentQueue.hh
rename to cpp/Library_v1/Utility/KTConcurrentQueue.hh
diff --git a/cpp/Library/Utility/KTConfigurable.cc b/cpp/Library_v1/Utility/KTConfigurable.cc
similarity index 100%
rename from cpp/Library/Utility/KTConfigurable.cc
rename to cpp/Library_v1/Utility/KTConfigurable.cc
diff --git a/cpp/Library/Utility/KTConfigurable.hh b/cpp/Library_v1/Utility/KTConfigurable.hh
similarity index 100%
rename from cpp/Library/Utility/KTConfigurable.hh
rename to cpp/Library_v1/Utility/KTConfigurable.hh
diff --git a/python/nymph/KTConfigurablePybind.hh b/cpp/Library_v1/Utility/KTConfigurablePybind.hh
similarity index 100%
rename from python/nymph/KTConfigurablePybind.hh
rename to cpp/Library_v1/Utility/KTConfigurablePybind.hh
diff --git a/cpp/Library/Utility/KTDirectory.cc b/cpp/Library_v1/Utility/KTDirectory.cc
similarity index 100%
rename from cpp/Library/Utility/KTDirectory.cc
rename to cpp/Library_v1/Utility/KTDirectory.cc
diff --git a/cpp/Library/Utility/KTDirectory.hh b/cpp/Library_v1/Utility/KTDirectory.hh
similarity index 100%
rename from cpp/Library/Utility/KTDirectory.hh
rename to cpp/Library_v1/Utility/KTDirectory.hh
diff --git a/cpp/Library/Utility/KTEventLoop.cc b/cpp/Library_v1/Utility/KTEventLoop.cc
similarity index 100%
rename from cpp/Library/Utility/KTEventLoop.cc
rename to cpp/Library_v1/Utility/KTEventLoop.cc
diff --git a/cpp/Library/Utility/KTEventLoop.hh b/cpp/Library_v1/Utility/KTEventLoop.hh
similarity index 100%
rename from cpp/Library/Utility/KTEventLoop.hh
rename to cpp/Library_v1/Utility/KTEventLoop.hh
diff --git a/cpp/Library/Utility/KTException.cc b/cpp/Library_v1/Utility/KTException.cc
similarity index 100%
rename from cpp/Library/Utility/KTException.cc
rename to cpp/Library_v1/Utility/KTException.cc
diff --git a/cpp/Library/Utility/KTException.hh b/cpp/Library_v1/Utility/KTException.hh
similarity index 100%
rename from cpp/Library/Utility/KTException.hh
rename to cpp/Library_v1/Utility/KTException.hh
diff --git a/cpp/Library/Utility/KTExtensible.hh b/cpp/Library_v1/Utility/KTExtensible.hh
similarity index 100%
rename from cpp/Library/Utility/KTExtensible.hh
rename to cpp/Library_v1/Utility/KTExtensible.hh
diff --git a/cpp/Library/Utility/KTExtensibleStruct.hh b/cpp/Library_v1/Utility/KTExtensibleStruct.hh
similarity index 100%
rename from cpp/Library/Utility/KTExtensibleStruct.hh
rename to cpp/Library_v1/Utility/KTExtensibleStruct.hh
diff --git a/cpp/Library/Utility/KTExtensibleStructFactory.hh b/cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
similarity index 100%
rename from cpp/Library/Utility/KTExtensibleStructFactory.hh
rename to cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
diff --git a/cpp/Library/Utility/KTLogger.hh b/cpp/Library_v1/Utility/KTLogger.hh
similarity index 100%
rename from cpp/Library/Utility/KTLogger.hh
rename to cpp/Library_v1/Utility/KTLogger.hh
diff --git a/cpp/Library/Utility/KTMemberVariable.hh b/cpp/Library_v1/Utility/KTMemberVariable.hh
similarity index 100%
rename from cpp/Library/Utility/KTMemberVariable.hh
rename to cpp/Library_v1/Utility/KTMemberVariable.hh
diff --git a/python/nymph/KTParamPybind.hh b/cpp/Library_v1/Utility/KTParamPybind.hh
similarity index 100%
rename from python/nymph/KTParamPybind.hh
rename to cpp/Library_v1/Utility/KTParamPybind.hh
diff --git a/python/nymph/KTPythonMacros.hh b/cpp/Library_v1/Utility/KTPythonMacros.hh
similarity index 100%
rename from python/nymph/KTPythonMacros.hh
rename to cpp/Library_v1/Utility/KTPythonMacros.hh
diff --git a/cpp/Library/Utility/KTTIFactory.hh b/cpp/Library_v1/Utility/KTTIFactory.hh
similarity index 100%
rename from cpp/Library/Utility/KTTIFactory.hh
rename to cpp/Library_v1/Utility/KTTIFactory.hh
diff --git a/cpp/Library/Utility/KTTime.cc b/cpp/Library_v1/Utility/KTTime.cc
similarity index 100%
rename from cpp/Library/Utility/KTTime.cc
rename to cpp/Library_v1/Utility/KTTime.cc
diff --git a/cpp/Library/Utility/KTTime.hh b/cpp/Library_v1/Utility/KTTime.hh
similarity index 100%
rename from cpp/Library/Utility/KTTime.hh
rename to cpp/Library_v1/Utility/KTTime.hh
diff --git a/python/nymph/CMakeLists.txt b/python/nymph/CMakeLists.txt
deleted file mode 100644
index 0d0f0e8..0000000
--- a/python/nymph/CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-# CMakeLists for Nymph/python/Library
-# Author: N.S. Oblath
-
-#include( PythonPackage )
-
-set( UTIL_DIR Utility )
-set( DATA_DIR Data )
-set( PROC_DIR Processor )
-set( IO_DIR IO )
-set( APPL_DIR Application )
-
-include_directories( BEFORE 
-    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
-)
-
-set( NYMPH_HEADERFILES
-
-)
-
-set( NYMPH_SOURCEFILES
-
-)
-
-##################################################
-
-
-# Python binding headers
-set( NYMPH_PYBINDING_HEADERFILES
-    #${UTIL_DIR}/KTConfigurablePybind.hh
-    ${UTIL_DIR}/KTParamPybind.hh
-    ${PROC_DIR}/KTProcessorPybind.hh
-    ${PROC_DIR}/KTPyProcessor.hh
-)
-
-# Python bindings
-set( NYMPH_PYBINDING_SOURCEFILES
-    ${PROC_DIR}/KTProcessorPybind.cc
-    NymphPybind.cc
-)
-
-##################################################
-
-pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
-pbuilder_install_headers( ${NYMPH_HEADERFILES} )
-
-if( Nymph_ENABLE_PYTHON )
-    set( LIB_DEPENDENCIES Nymph )
-
-    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
-    
-    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
-    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
-    pbuilder_install_libraries( py_nymph )
-    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
-endif( Nymph_ENABLE_PYTHON )
\ No newline at end of file

From 2553f7e0031cd9595378f605c8445fe755b25c18 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 14:45:47 -0800
Subject: [PATCH 263/521] Moved Executables to Executables_v1 and added a
 possibly-useless demo

---
 CMakeLists.txt                                |  5 +-
 Executables/Demos/CMakeLists.txt              | 26 +++++++
 Executables/Demos/Return.cc                   | 72 +++++++++++++++++++
 .../Main/CMakeLists.txt                       |  0
 .../Main/ConfigCheck.cc                       |  0
 {Executables => Executables_v1}/Main/Nymph.cc |  0
 .../Validation/CMakeLists.txt                 |  0
 .../ConfigFiles/TestConfigurator.json         |  0
 .../ConfigFiles/TestParameterStoreConfig.json |  0
 .../Validation/KTJSONReader.cc                |  0
 .../Validation/KTJSONReader.hh                |  0
 .../Validation/KTJSONTypeWriterValidation.cc  |  0
 .../Validation/KTJSONTypeWriterValidation.hh  |  0
 .../Validation/KTPyTestClass.cc               |  0
 .../Validation/KTPyTestClass.hh               |  0
 .../Validation/KTPyTestClassPybind.hh         |  0
 .../KTRegisterNymphValidationExtData.hh       |  0
 .../Validation/KTTestConfigurable.cc          |  0
 .../Validation/KTTestConfigurable.hh          |  0
 .../Validation/KTTestCuts.cc                  |  0
 .../Validation/KTTestCuts.hh                  |  0
 .../Validation/KTTestData.cc                  |  0
 .../Validation/KTTestData.hh                  |  0
 .../Validation/KTTestDataPrimaryProcessor.cc  |  0
 .../Validation/KTTestDataPrimaryProcessor.hh  |  0
 .../Validation/KTTestPrimaryProcessor.cc      |  0
 .../Validation/KTTestPrimaryProcessor.hh      |  0
 .../Validation/KTTestProcessor.cc             |  0
 .../Validation/KTTestProcessor.hh             |  0
 .../Validation/NymphValidationPybind.cc       |  0
 .../Validation/TestApplication.cc             |  0
 .../Validation/TestApplyCut.cc                |  0
 .../Validation/TestCacheDirectory.cc          |  0
 .../Validation/TestCut.cc                     |  0
 .../Validation/TestCutFilter.cc               |  0
 .../Validation/TestData.cc                    |  0
 .../Validation/TestExceptionInSlot.cc         |  0
 .../Validation/TestExt.cc                     |  0
 .../Validation/TestExtSerialization.cc        |  0
 .../Validation/TestJSONWriter.cc              |  0
 .../Validation/TestJSONWriterViaSlot.cc       |  0
 .../Validation/TestLogger.cc                  |  0
 .../Validation/TestParamBindings.py           |  0
 .../Validation/TestPolymorphicSlotData.cc     |  0
 .../Validation/TestPrimaryProcessor.cc        |  0
 .../TestPrimaryProcessorNoThreading.cc        |  0
 .../Validation/TestPrintData.cc               |  0
 .../Validation/TestProcessorToolbox.py        |  0
 .../TestProcessorToolbox2Threads.cc           |  0
 .../TestProcessorToolboxMultithreaded.cc      |  0
 .../TestProcessorToolboxSinglethreaded.cc     |  0
 .../Validation/TestPyTestClass.py             |  0
 .../Validation/TestPythonBasics.hh            |  0
 .../Validation/TestPythonBasics.py            |  0
 .../Validation/TestSerialization.cc           |  0
 .../Validation/TestSignalsAndSlots.cc         |  0
 .../Validation/TestSlotData.cc                |  0
 .../Validation/TestThroughputProfiler.cc      |  0
 .../Validation/TestUseBreakpoint.cc           |  0
 .../Validation/TestWrapProcessor.py           |  0
 60 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 Executables/Demos/CMakeLists.txt
 create mode 100644 Executables/Demos/Return.cc
 rename {Executables => Executables_v1}/Main/CMakeLists.txt (100%)
 rename {Executables => Executables_v1}/Main/ConfigCheck.cc (100%)
 rename {Executables => Executables_v1}/Main/Nymph.cc (100%)
 rename {Executables => Executables_v1}/Validation/CMakeLists.txt (100%)
 rename {Executables => Executables_v1}/Validation/ConfigFiles/TestConfigurator.json (100%)
 rename {Executables => Executables_v1}/Validation/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename {Executables => Executables_v1}/Validation/KTJSONReader.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTJSONReader.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTJSONTypeWriterValidation.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTJSONTypeWriterValidation.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTPyTestClass.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTPyTestClass.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTPyTestClassPybind.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTRegisterNymphValidationExtData.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTTestConfigurable.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTTestConfigurable.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTTestCuts.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTTestCuts.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTTestData.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTTestData.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTTestDataPrimaryProcessor.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTTestDataPrimaryProcessor.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTTestPrimaryProcessor.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTTestPrimaryProcessor.hh (100%)
 rename {Executables => Executables_v1}/Validation/KTTestProcessor.cc (100%)
 rename {Executables => Executables_v1}/Validation/KTTestProcessor.hh (100%)
 rename {Executables => Executables_v1}/Validation/NymphValidationPybind.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestApplication.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestApplyCut.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestCacheDirectory.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestCut.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestCutFilter.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestData.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestExceptionInSlot.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestExt.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestExtSerialization.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestJSONWriter.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestJSONWriterViaSlot.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestLogger.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestParamBindings.py (100%)
 rename {Executables => Executables_v1}/Validation/TestPolymorphicSlotData.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestPrimaryProcessor.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestPrimaryProcessorNoThreading.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestPrintData.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestProcessorToolbox.py (100%)
 rename {Executables => Executables_v1}/Validation/TestProcessorToolbox2Threads.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestProcessorToolboxMultithreaded.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestProcessorToolboxSinglethreaded.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestPyTestClass.py (100%)
 rename {Executables => Executables_v1}/Validation/TestPythonBasics.hh (100%)
 rename {Executables => Executables_v1}/Validation/TestPythonBasics.py (100%)
 rename {Executables => Executables_v1}/Validation/TestSerialization.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestSignalsAndSlots.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestSlotData.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestThroughputProfiler.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestUseBreakpoint.cc (100%)
 rename {Executables => Executables_v1}/Validation/TestWrapProcessor.py (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 825ee68..b149f94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,9 +125,10 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 add_subdirectory( Library )
 
-#if (Nymph_ENABLE_EXECUTABLES)
+if (Nymph_ENABLE_EXECUTABLES)
 #    add_subdirectory( Executables/Main )
-#endif (Nymph_ENABLE_EXECUTABLES )
+    add_subdirectory( Executables/Demos )
+endif (Nymph_ENABLE_EXECUTABLES )
 
 
 #########
diff --git a/Executables/Demos/CMakeLists.txt b/Executables/Demos/CMakeLists.txt
new file mode 100644
index 0000000..b72887d
--- /dev/null
+++ b/Executables/Demos/CMakeLists.txt
@@ -0,0 +1,26 @@
+# CMakeLists for Nymph/Executables/Demos
+# Author: N.S. Oblath
+
+if( NOT Nymph_AS_SUBMODULE )
+    set( Nymph_package_libs
+        Nymph
+    )
+endif()
+
+set( Nymph_SOURCES
+    Return.cc
+)
+
+set( Nymph_PROGRAMS )
+pbuilder_executables( 
+    SOURCES ${Nymph_SOURCES}
+    TARGETS_VAR Nymph_PROGRAMS
+    PROJECT_LIBRARIES ${Nymph_package_libs}
+    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Executables
+    EXETARGETS ${Nymph_PROGRAMS}
+)
diff --git a/Executables/Demos/Return.cc b/Executables/Demos/Return.cc
new file mode 100644
index 0000000..483452d
--- /dev/null
+++ b/Executables/Demos/Return.cc
@@ -0,0 +1,72 @@
+
+
+#include <exception>
+#include <iostream>
+#include <vector>
+
+
+struct Typeless
+{
+    template< typename XGet >
+    XGet& Get()
+    {
+        HiddenType< XGet >* thisCast = dynamic_cast< XGet* >( this );
+        if( ! thisCast )
+        {
+            throw std::runtime_error( "Invalid cast type" );
+        }
+        return thisCast->fObj;
+    }
+};
+
+template< typename XHidden >
+struct HiddenType : Typeless
+{
+    XHidden fObj;
+};
+
+template< typename... XTypes >
+void ProcessVector( const std::vector< Typeless* >& captured )
+{
+    try
+    {
+        unsigned index = 0;
+        for( auto iter = captured.begin(); iter != captured.end(); ++iter )
+        {
+            std::cout << index << ": " << captured->Get< XType >() << std::endl;
+            ++index;
+        }
+    }
+    catch(const std::exception& e)
+    {
+        std::cerr << e.what() << '\n';
+    }
+    return;    
+}
+
+template< typename... XArgs >
+std::vector< Typeless* > ProcessArgs( XArgs... args )
+{
+    std::tuple< XArgs... > argsTuple{ args };
+
+    std::vector< Typeless* > captured;
+    const unsigned nArgs = sizeof...(args);
+    for( unsigned i = 0; i < nArgs; ++i)
+    {
+        captured[i] = new HiddenType< std::tuple_element<i, args...> >{std::get<i>(argsTuple)};
+    }
+
+}
+
+
+
+
+int main()
+{
+
+    auto vec = ProcessArgs( 1, 2.5, "hello" );
+
+    ProcessVector< int, double, std::string >( *vec );
+
+    return 0;
+}
\ No newline at end of file
diff --git a/Executables/Main/CMakeLists.txt b/Executables_v1/Main/CMakeLists.txt
similarity index 100%
rename from Executables/Main/CMakeLists.txt
rename to Executables_v1/Main/CMakeLists.txt
diff --git a/Executables/Main/ConfigCheck.cc b/Executables_v1/Main/ConfigCheck.cc
similarity index 100%
rename from Executables/Main/ConfigCheck.cc
rename to Executables_v1/Main/ConfigCheck.cc
diff --git a/Executables/Main/Nymph.cc b/Executables_v1/Main/Nymph.cc
similarity index 100%
rename from Executables/Main/Nymph.cc
rename to Executables_v1/Main/Nymph.cc
diff --git a/Executables/Validation/CMakeLists.txt b/Executables_v1/Validation/CMakeLists.txt
similarity index 100%
rename from Executables/Validation/CMakeLists.txt
rename to Executables_v1/Validation/CMakeLists.txt
diff --git a/Executables/Validation/ConfigFiles/TestConfigurator.json b/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Executables/Validation/ConfigFiles/TestConfigurator.json
rename to Executables_v1/Validation/ConfigFiles/TestConfigurator.json
diff --git a/Executables/Validation/ConfigFiles/TestParameterStoreConfig.json b/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Executables/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Executables/Validation/KTJSONReader.cc b/Executables_v1/Validation/KTJSONReader.cc
similarity index 100%
rename from Executables/Validation/KTJSONReader.cc
rename to Executables_v1/Validation/KTJSONReader.cc
diff --git a/Executables/Validation/KTJSONReader.hh b/Executables_v1/Validation/KTJSONReader.hh
similarity index 100%
rename from Executables/Validation/KTJSONReader.hh
rename to Executables_v1/Validation/KTJSONReader.hh
diff --git a/Executables/Validation/KTJSONTypeWriterValidation.cc b/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from Executables/Validation/KTJSONTypeWriterValidation.cc
rename to Executables_v1/Validation/KTJSONTypeWriterValidation.cc
diff --git a/Executables/Validation/KTJSONTypeWriterValidation.hh b/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from Executables/Validation/KTJSONTypeWriterValidation.hh
rename to Executables_v1/Validation/KTJSONTypeWriterValidation.hh
diff --git a/Executables/Validation/KTPyTestClass.cc b/Executables_v1/Validation/KTPyTestClass.cc
similarity index 100%
rename from Executables/Validation/KTPyTestClass.cc
rename to Executables_v1/Validation/KTPyTestClass.cc
diff --git a/Executables/Validation/KTPyTestClass.hh b/Executables_v1/Validation/KTPyTestClass.hh
similarity index 100%
rename from Executables/Validation/KTPyTestClass.hh
rename to Executables_v1/Validation/KTPyTestClass.hh
diff --git a/Executables/Validation/KTPyTestClassPybind.hh b/Executables_v1/Validation/KTPyTestClassPybind.hh
similarity index 100%
rename from Executables/Validation/KTPyTestClassPybind.hh
rename to Executables_v1/Validation/KTPyTestClassPybind.hh
diff --git a/Executables/Validation/KTRegisterNymphValidationExtData.hh b/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from Executables/Validation/KTRegisterNymphValidationExtData.hh
rename to Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
diff --git a/Executables/Validation/KTTestConfigurable.cc b/Executables_v1/Validation/KTTestConfigurable.cc
similarity index 100%
rename from Executables/Validation/KTTestConfigurable.cc
rename to Executables_v1/Validation/KTTestConfigurable.cc
diff --git a/Executables/Validation/KTTestConfigurable.hh b/Executables_v1/Validation/KTTestConfigurable.hh
similarity index 100%
rename from Executables/Validation/KTTestConfigurable.hh
rename to Executables_v1/Validation/KTTestConfigurable.hh
diff --git a/Executables/Validation/KTTestCuts.cc b/Executables_v1/Validation/KTTestCuts.cc
similarity index 100%
rename from Executables/Validation/KTTestCuts.cc
rename to Executables_v1/Validation/KTTestCuts.cc
diff --git a/Executables/Validation/KTTestCuts.hh b/Executables_v1/Validation/KTTestCuts.hh
similarity index 100%
rename from Executables/Validation/KTTestCuts.hh
rename to Executables_v1/Validation/KTTestCuts.hh
diff --git a/Executables/Validation/KTTestData.cc b/Executables_v1/Validation/KTTestData.cc
similarity index 100%
rename from Executables/Validation/KTTestData.cc
rename to Executables_v1/Validation/KTTestData.cc
diff --git a/Executables/Validation/KTTestData.hh b/Executables_v1/Validation/KTTestData.hh
similarity index 100%
rename from Executables/Validation/KTTestData.hh
rename to Executables_v1/Validation/KTTestData.hh
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.cc b/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from Executables/Validation/KTTestDataPrimaryProcessor.cc
rename to Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
diff --git a/Executables/Validation/KTTestDataPrimaryProcessor.hh b/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from Executables/Validation/KTTestDataPrimaryProcessor.hh
rename to Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
diff --git a/Executables/Validation/KTTestPrimaryProcessor.cc b/Executables_v1/Validation/KTTestPrimaryProcessor.cc
similarity index 100%
rename from Executables/Validation/KTTestPrimaryProcessor.cc
rename to Executables_v1/Validation/KTTestPrimaryProcessor.cc
diff --git a/Executables/Validation/KTTestPrimaryProcessor.hh b/Executables_v1/Validation/KTTestPrimaryProcessor.hh
similarity index 100%
rename from Executables/Validation/KTTestPrimaryProcessor.hh
rename to Executables_v1/Validation/KTTestPrimaryProcessor.hh
diff --git a/Executables/Validation/KTTestProcessor.cc b/Executables_v1/Validation/KTTestProcessor.cc
similarity index 100%
rename from Executables/Validation/KTTestProcessor.cc
rename to Executables_v1/Validation/KTTestProcessor.cc
diff --git a/Executables/Validation/KTTestProcessor.hh b/Executables_v1/Validation/KTTestProcessor.hh
similarity index 100%
rename from Executables/Validation/KTTestProcessor.hh
rename to Executables_v1/Validation/KTTestProcessor.hh
diff --git a/Executables/Validation/NymphValidationPybind.cc b/Executables_v1/Validation/NymphValidationPybind.cc
similarity index 100%
rename from Executables/Validation/NymphValidationPybind.cc
rename to Executables_v1/Validation/NymphValidationPybind.cc
diff --git a/Executables/Validation/TestApplication.cc b/Executables_v1/Validation/TestApplication.cc
similarity index 100%
rename from Executables/Validation/TestApplication.cc
rename to Executables_v1/Validation/TestApplication.cc
diff --git a/Executables/Validation/TestApplyCut.cc b/Executables_v1/Validation/TestApplyCut.cc
similarity index 100%
rename from Executables/Validation/TestApplyCut.cc
rename to Executables_v1/Validation/TestApplyCut.cc
diff --git a/Executables/Validation/TestCacheDirectory.cc b/Executables_v1/Validation/TestCacheDirectory.cc
similarity index 100%
rename from Executables/Validation/TestCacheDirectory.cc
rename to Executables_v1/Validation/TestCacheDirectory.cc
diff --git a/Executables/Validation/TestCut.cc b/Executables_v1/Validation/TestCut.cc
similarity index 100%
rename from Executables/Validation/TestCut.cc
rename to Executables_v1/Validation/TestCut.cc
diff --git a/Executables/Validation/TestCutFilter.cc b/Executables_v1/Validation/TestCutFilter.cc
similarity index 100%
rename from Executables/Validation/TestCutFilter.cc
rename to Executables_v1/Validation/TestCutFilter.cc
diff --git a/Executables/Validation/TestData.cc b/Executables_v1/Validation/TestData.cc
similarity index 100%
rename from Executables/Validation/TestData.cc
rename to Executables_v1/Validation/TestData.cc
diff --git a/Executables/Validation/TestExceptionInSlot.cc b/Executables_v1/Validation/TestExceptionInSlot.cc
similarity index 100%
rename from Executables/Validation/TestExceptionInSlot.cc
rename to Executables_v1/Validation/TestExceptionInSlot.cc
diff --git a/Executables/Validation/TestExt.cc b/Executables_v1/Validation/TestExt.cc
similarity index 100%
rename from Executables/Validation/TestExt.cc
rename to Executables_v1/Validation/TestExt.cc
diff --git a/Executables/Validation/TestExtSerialization.cc b/Executables_v1/Validation/TestExtSerialization.cc
similarity index 100%
rename from Executables/Validation/TestExtSerialization.cc
rename to Executables_v1/Validation/TestExtSerialization.cc
diff --git a/Executables/Validation/TestJSONWriter.cc b/Executables_v1/Validation/TestJSONWriter.cc
similarity index 100%
rename from Executables/Validation/TestJSONWriter.cc
rename to Executables_v1/Validation/TestJSONWriter.cc
diff --git a/Executables/Validation/TestJSONWriterViaSlot.cc b/Executables_v1/Validation/TestJSONWriterViaSlot.cc
similarity index 100%
rename from Executables/Validation/TestJSONWriterViaSlot.cc
rename to Executables_v1/Validation/TestJSONWriterViaSlot.cc
diff --git a/Executables/Validation/TestLogger.cc b/Executables_v1/Validation/TestLogger.cc
similarity index 100%
rename from Executables/Validation/TestLogger.cc
rename to Executables_v1/Validation/TestLogger.cc
diff --git a/Executables/Validation/TestParamBindings.py b/Executables_v1/Validation/TestParamBindings.py
similarity index 100%
rename from Executables/Validation/TestParamBindings.py
rename to Executables_v1/Validation/TestParamBindings.py
diff --git a/Executables/Validation/TestPolymorphicSlotData.cc b/Executables_v1/Validation/TestPolymorphicSlotData.cc
similarity index 100%
rename from Executables/Validation/TestPolymorphicSlotData.cc
rename to Executables_v1/Validation/TestPolymorphicSlotData.cc
diff --git a/Executables/Validation/TestPrimaryProcessor.cc b/Executables_v1/Validation/TestPrimaryProcessor.cc
similarity index 100%
rename from Executables/Validation/TestPrimaryProcessor.cc
rename to Executables_v1/Validation/TestPrimaryProcessor.cc
diff --git a/Executables/Validation/TestPrimaryProcessorNoThreading.cc b/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from Executables/Validation/TestPrimaryProcessorNoThreading.cc
rename to Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
diff --git a/Executables/Validation/TestPrintData.cc b/Executables_v1/Validation/TestPrintData.cc
similarity index 100%
rename from Executables/Validation/TestPrintData.cc
rename to Executables_v1/Validation/TestPrintData.cc
diff --git a/Executables/Validation/TestProcessorToolbox.py b/Executables_v1/Validation/TestProcessorToolbox.py
similarity index 100%
rename from Executables/Validation/TestProcessorToolbox.py
rename to Executables_v1/Validation/TestProcessorToolbox.py
diff --git a/Executables/Validation/TestProcessorToolbox2Threads.cc b/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from Executables/Validation/TestProcessorToolbox2Threads.cc
rename to Executables_v1/Validation/TestProcessorToolbox2Threads.cc
diff --git a/Executables/Validation/TestProcessorToolboxMultithreaded.cc b/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from Executables/Validation/TestProcessorToolboxMultithreaded.cc
rename to Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
diff --git a/Executables/Validation/TestProcessorToolboxSinglethreaded.cc b/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from Executables/Validation/TestProcessorToolboxSinglethreaded.cc
rename to Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
diff --git a/Executables/Validation/TestPyTestClass.py b/Executables_v1/Validation/TestPyTestClass.py
similarity index 100%
rename from Executables/Validation/TestPyTestClass.py
rename to Executables_v1/Validation/TestPyTestClass.py
diff --git a/Executables/Validation/TestPythonBasics.hh b/Executables_v1/Validation/TestPythonBasics.hh
similarity index 100%
rename from Executables/Validation/TestPythonBasics.hh
rename to Executables_v1/Validation/TestPythonBasics.hh
diff --git a/Executables/Validation/TestPythonBasics.py b/Executables_v1/Validation/TestPythonBasics.py
similarity index 100%
rename from Executables/Validation/TestPythonBasics.py
rename to Executables_v1/Validation/TestPythonBasics.py
diff --git a/Executables/Validation/TestSerialization.cc b/Executables_v1/Validation/TestSerialization.cc
similarity index 100%
rename from Executables/Validation/TestSerialization.cc
rename to Executables_v1/Validation/TestSerialization.cc
diff --git a/Executables/Validation/TestSignalsAndSlots.cc b/Executables_v1/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from Executables/Validation/TestSignalsAndSlots.cc
rename to Executables_v1/Validation/TestSignalsAndSlots.cc
diff --git a/Executables/Validation/TestSlotData.cc b/Executables_v1/Validation/TestSlotData.cc
similarity index 100%
rename from Executables/Validation/TestSlotData.cc
rename to Executables_v1/Validation/TestSlotData.cc
diff --git a/Executables/Validation/TestThroughputProfiler.cc b/Executables_v1/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from Executables/Validation/TestThroughputProfiler.cc
rename to Executables_v1/Validation/TestThroughputProfiler.cc
diff --git a/Executables/Validation/TestUseBreakpoint.cc b/Executables_v1/Validation/TestUseBreakpoint.cc
similarity index 100%
rename from Executables/Validation/TestUseBreakpoint.cc
rename to Executables_v1/Validation/TestUseBreakpoint.cc
diff --git a/Executables/Validation/TestWrapProcessor.py b/Executables_v1/Validation/TestWrapProcessor.py
similarity index 100%
rename from Executables/Validation/TestWrapProcessor.py
rename to Executables_v1/Validation/TestWrapProcessor.py

From 451eed3ee8dc4e3c3c958532d57d06f9ec14bd92 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 14:46:45 -0800
Subject: [PATCH 264/521] Initial work at making it possible to return sig/slot
 arguments at breakpoints

---
 Library/Control/ControlAccess.hh       | 10 +++++++++-
 Library/Control/Controller.hh          |  2 +-
 Library/Control/ControllerInterface.hh |  2 +-
 Library/Control/ReturnBuffer.hh        | 13 +++++++++++++
 Library/Control/SingleRunController.hh | 13 +++++++++++--
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index 77f62d0..5289cfa 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -48,7 +48,10 @@ namespace Nymph
             virtual bool IsCanceled() const;
 
             /// Initiate a break
-            virtual void Break();
+            virtual void InitiateBreak();
+
+            template< typename... Args >
+            void Break( Args&... args ); // to be called by a working thread
 
             /// Reports whether control is at a breakpoint
             virtual bool IsAtBreak() const;
@@ -60,6 +63,11 @@ namespace Nymph
 
     };
 
+    template< class... XArgs >
+    void ControlAccess::Break( Args&... args )
+    {
+        
+    }
 
 
     class ReturnAccess : public scarab::cancelable
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index c6fce41..fc352bf 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -64,7 +64,7 @@ namespace Nymph
             virtual bool IsCanceled() const;
 
             /// Inititate a break
-            virtual void Break();
+            virtual void InitiateBreak();
 
             /// Reports whether control is at a breakpoint
             virtual bool IsAtBreak() const;
diff --git a/Library/Control/ControllerInterface.hh b/Library/Control/ControllerInterface.hh
index 8a7502a..646e239 100644
--- a/Library/Control/ControllerInterface.hh
+++ b/Library/Control/ControllerInterface.hh
@@ -47,7 +47,7 @@ namespace Nymph
             virtual bool IsCanceled() const = 0;
 
             /// Initiate a break
-            virtual void Break() = 0;
+            virtual void InitiateBreak() = 0;
 
             /// Reports whether control is at a breakpoint
             virtual bool IsAtBreak() const = 0;
diff --git a/Library/Control/ReturnBuffer.hh b/Library/Control/ReturnBuffer.hh
index c29a146..7113bca 100644
--- a/Library/Control/ReturnBuffer.hh
+++ b/Library/Control/ReturnBuffer.hh
@@ -18,6 +18,9 @@ namespace Nymph
         public:
             ReturnBufferBase();
             virtual ~ReturnBufferBase();
+
+            template< class... XArgs >
+            std::tuple< XArgs&... >& GetReturn();
     };
 
     template< typename... Args >
@@ -58,6 +61,16 @@ namespace Nymph
         }
     };
 
+
+    template< class... XArgs >
+    std::tuple< XArgs&... >& ReturnBufferBase::GetReturn()
+    {
+        ReturnBuffer< XArgs... >* typedBuffer = dynamic_cast< ReturnBuffer< XArgs... >* >(this);
+        if( ! typedBuffer ) THROW_EXCEPT_HERE( Exception() << "Invalid set of arguments for this return buffer" );
+        return typedBuffer->GetReturn();
+    }
+
+
 } /* namespace Nymph */
 
 #endif /* NYMPH_RETURNBUFFER_HH_ */
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 5c1b949..50108fb 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -69,13 +69,14 @@ namespace Nymph
             std::map< std::string, ThreadBundle > fChainThreads;
 
         public:
-        /*
             template< typename... Args >
             std::tuple< Args&... >& GetReturn();
 
             template< typename... Args >
             void Break( Args&... args ); // to be called by a working thread
-        */
+
+        protected:
+            std::unique_ptr< ReturnBufferBase > fReturnBuffer;
 
     };
 
@@ -85,6 +86,14 @@ namespace Nymph
         return;
     }
 
+    template< typename... XArgs >
+    void SingleRunController::Break( Args&... args )
+    {
+        Controller::InitiateBreak();
+        fReturnBuffer.reset( new ReturnBuffer( args... ) );
+        return;
+    }
+
 
 } /* namespace Nymph */
 

From 50022dfb21fc0157bc21909bffcaf2f6bdcd38c9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 16:37:04 -0800
Subject: [PATCH 265/521] Split ProcessorToolbox::Configure into three
 sub-functions, and add configuration of individual processors

---
 Library/Processor/ProcessorToolbox.cc | 307 +++++++++++++-------------
 1 file changed, 151 insertions(+), 156 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 740a543..c19571b 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -31,16 +31,13 @@ namespace Nymph
 
     ProcessorToolbox::ProcessorToolbox( const std::string& name ) :
             fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
-            fRunSingleThreaded( false ),
             fRunQueue(),
             fProcMap()
     {
     }
 
     ProcessorToolbox::~ProcessorToolbox()
-    {
-        ClearProcessors();
-    }
+    {}
 
     void ProcessorToolbox::Configure( const scarab::param_node& node )
     {
@@ -53,49 +50,9 @@ namespace Nymph
         }
         else
         {
-            const scarab::param_array& procArray = node["processors"].as_array();
-            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
-            {
-                if( ! procIt->is_node() )
-                {
-                    LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
-                }
-                const scarab::param_node& procNode = procIt->as_node();
-
-                if( ! procNode.has("type") )
-                {
-                    LERROR( proclog, "Unable to create processor: no processor type given" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
-                }
-                string procType = procNode["type"]().as_string();
-
-                string procName;
-                if( ! procNode.has("name") )
-                {
-                    LINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
-                    procName = procType;
-                }
-                else
-                {
-                    procName = procNode["name"]().as_string();
-                }
-                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
-                if( newProc == nullptr )
-                {
-                    LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
-                }
-
-                if( ! AddProcessor( procName, newProc ) )
-                {
-                    LERROR( proclog, "Unable to add processor <" << procName << ">" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
-                }
-            }
+            ConfigureProcessors( node["processors"].as_node() );
         }
 
-
         // Then deal with connections"
         if( ! node.has("connections") )
         {
@@ -103,154 +60,192 @@ namespace Nymph
         }
         else
         {
-            const scarab::param_array& connArray = node["connections"].as_array();
-            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
-            {
-                if( ! connIt->is_node() )
-                {
-                    LERROR( proclog, "Invalid connection entry: not a node" << *connIt );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
-                }
-                const scarab::param_node& connNode = connIt->as_node();
-
-                if( ! connNode.has("signal") || ! connNode.has("slot") )
-                {
-                    LERROR( proclog, "Signal/Slot connection information is incomplete!" );
-                    std::string sigSlotMessage( "signal = " );
-                    if (connNode.has("signal"))
-                    {
-                        sigSlotMessage += connNode["signal"]().as_string();
-                    }
-                    else
-                    {
-                        sigSlotMessage += "MISSING";
-                    }
-
-                    sigSlotMessage += "\nslot = ";
-                    if (connNode.has("slot"))
-                    {
-                        sigSlotMessage += connNode["slot"]().as_string();
-                    }
-                    else
-                    {
-                        sigSlotMessage += "MISSING";
-                    }
-                    LERROR( proclog, sigSlotMessage );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
-                }
-
-                bool connReturn = false;
-                if( connNode.has("order") )
-                {
-                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int() );
-                }
-                else
-                {
-                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string() );
-                }
-                if( ! connReturn )
-                {
-                    LERROR( proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
-                }
-
-                if( connNode.has("breakpoint") )
-                {
-                    if (! SetBreakpoint( connNode["slot"]().as_string() ) )
-                    {
-                        LERROR( proclog, "Unable to set breakpoint on <" << connNode["slot"]() );
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
-                    }
-                }
-
-                LINFO( proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">" );
-            }
+            ConfigureConnections( node["connections"].as_node() );
         }
 
-
         // Finally, deal with processor-run specifications
         // The run queue is an array of processor names, or groups of names, which will be run sequentially.
         // If names are grouped (in another array), those in that group will be run in parallel.
-        // In single threaded mode all threads will be run sequentially in the order they were specified.
         if( ! node.has("run-queue") )
         {
             LWARN( proclog, "Run queue was not specified" );
         }
         else
         {
-            const scarab::param_array& rqArray = node["run-queue"].as_array();
-            for( scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt )
+            ConfigureRunQueue( node["run-queue"].as_node() );
+        }
+
+        return;
+    }
+
+
+    void ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
+    {
+        const scarab::param_array& procArray = node["processors"].as_array();
+        for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
+        {
+            if( ! procIt->is_node() )
+            {
+                LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
+            }
+            const scarab::param_node& procNode = procIt->as_node();
+
+            if( ! procNode.has("type") )
+            {
+                LERROR( proclog, "Unable to create processor: no processor type given" );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
+            }
+            string procType = procNode["type"]().as_string();
+
+            string procName;
+            if( ! procNode.has("name") )
+            {
+                LINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
+                procName = procType;
+            }
+            else
             {
-                if( rqIt->is_value() )
+                procName = procNode["name"]().as_string();
+            }
+            std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
+            if( newProc == nullptr )
+            {
+                LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
+            }
+
+            LDEBUG( proclog, "Attempting to configure processor <" << iter->first << ">" );
+            try
+            {
+                iter->second.fProc->Configure(subNode);
+            }
+            catch( scarab::base_exception& e )
+            {
+                THROW_NESTED_EXCEPT_HERE( Exception() << "An error occurred while configuring processor <" << procName << ">" );
+            }
+
+            if( ! AddProcessor( procName, newProc ) )
+            {
+                LERROR( proclog, "Unable to add processor <" << procName << ">" );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
+            }
+        }
+
+        return;
+    }
+
+
+    void ProcessorToolbox::ConfigureConnections( const scarab::param_node& node )
+    {
+        const scarab::param_array& connArray = node["connections"].as_array();
+        for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
+        {
+            if( ! connIt->is_node() )
+            {
+                LERROR( proclog, "Invalid connection entry: not a node" << *connIt );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
+            }
+            const scarab::param_node& connNode = connIt->as_node();
+
+            if( ! connNode.has("signal") || ! connNode.has("slot") )
+            {
+                LERROR( proclog, "Signal/Slot connection information is incomplete!" );
+                std::string sigSlotMessage( "signal = " );
+                if (connNode.has("signal"))
                 {
-                    if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
-                    {
-                        LERROR( proclog, "Unable to process run-queue entry: could not add processor to the queue" );
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
-                    }
+                    sigSlotMessage += connNode["signal"]().as_string();
                 }
-                else if( rqIt->is_array() )
+                else
                 {
-                    const scarab::param_array* rqNode = &( rqIt->as_array() );
-                    std::vector< std::string > names;
-
-                    for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
-                    {
-                        if( ! rqArrayIt->is_value() )
-                        {
-                            LERROR( proclog, "Invalid run-queue array entry: not a value" );
-                            THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
-                        }
-                        names.push_back( (*rqArrayIt)().as_string() );
-                    }
+                    sigSlotMessage += "MISSING";
+                }
 
-                    if( ! PushBackToRunQueue(names) )
-                    {
-                        LERROR( proclog, "Unable to process run-queue entry: could not add list of processors to the queue" );
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
-                    }
+                sigSlotMessage += "\nslot = ";
+                if (connNode.has("slot"))
+                {
+                    sigSlotMessage += connNode["slot"]().as_string();
                 }
                 else
                 {
-                    LERROR( proclog, "Invalid run-queue entry: not a value or array" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
+                    sigSlotMessage += "MISSING";
+                }
+                LERROR( proclog, sigSlotMessage );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
+            }
+
+            bool connReturn = false;
+            if( connNode.has("order") )
+            {
+                connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int() );
+            }
+            else
+            {
+                connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string() );
+            }
+            if( ! connReturn )
+            {
+                LERROR( proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
+            }
+
+            if( connNode.has("breakpoint") )
+            {
+                if (! SetBreakpoint( connNode["slot"]().as_string() ) )
+                {
+                    LERROR( proclog, "Unable to set breakpoint on <" << connNode["slot"]() );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
                 }
             }
+
+            LINFO( proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">" );
         }
 
         return;
     }
 
-    bool ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
+    void ProcessorToolbox::ConfigureRunQueue( const scarab::param_node& node )
     {
-        for( ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); ++iter )
+        const scarab::param_array& rqArray = node["run-queue"].as_array();
+        for( scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt )
         {
-            LDEBUG( proclog, "Attempting to configure processor <" << iter->first << ">" );
-            string procName = iter->first;
-            string nameUsed(procName);
-            if( ! node.has(nameUsed) )
+            if( rqIt->is_value() )
             {
-                nameUsed = iter->second.fProc->Name();
-                if( ! node.has(nameUsed) )
+                if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
                 {
-                    LWARN( proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
-                            "\tProcessor <" << procName << "> was not configured." );
-                    continue;
+                    LERROR( proclog, "Unable to process run-queue entry: could not add processor to the queue" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
                 }
             }
-            const scarab::param_node& subNode = node[nameUsed].as_node();
-            try
+            else if( rqIt->is_array() )
             {
-                iter->second.fProc->Configure(subNode);
+                const scarab::param_array* rqNode = &( rqIt->as_array() );
+                std::vector< std::string > names;
+
+                for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
+                {
+                    if( ! rqArrayIt->is_value() )
+                    {
+                        LERROR( proclog, "Invalid run-queue array entry: not a value" );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
+                    }
+                    names.push_back( (*rqArrayIt)().as_string() );
+                }
+
+                if( ! PushBackToRunQueue(names) )
+                {
+                    LERROR( proclog, "Unable to process run-queue entry: could not add list of processors to the queue" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
+                }
             }
-            catch( const Exception& e )
+            else
             {
-                LERROR( proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">" );
-                LERROR( proclog, e.what() );
-                return false;
+                LERROR( proclog, "Invalid run-queue entry: not a value or array" );
+                THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
             }
         }
-        return true;
+
+        return;
     }
 
     std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName )

From 39312df767d4d9c80c2cba0d092f0977163d1f0e Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 16:42:23 -0800
Subject: [PATCH 266/521] Various updates, including removing duplicate error
 messages

---
 Library/Processor/ProcessorToolbox.cc | 40 ++++-----------------------
 Library/Processor/ProcessorToolbox.hh | 14 ++++++----
 2 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index c19571b..931027f 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -8,22 +8,12 @@
 #include "ProcessorToolbox.hh"
 
 #include "PrimaryProcessor.hh"
-#include "QuitChain.hh"
 
 #include "factory.hh"
 #include "logger.hh"
 #include "param_codec.hh"
 
 #include <map>
-#include <thread>
-
-//#include <boost/exception/get_error_info.hpp>
-//#include <boost/thread.hpp>
-
-using std::deque;
-using std::set;
-using std::string;
-using std::vector;
 
 namespace Nymph
 {
@@ -86,14 +76,12 @@ namespace Nymph
         {
             if( ! procIt->is_node() )
             {
-                LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
             }
             const scarab::param_node& procNode = procIt->as_node();
 
             if( ! procNode.has("type") )
             {
-                LERROR( proclog, "Unable to create processor: no processor type given" );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
             }
             string procType = procNode["type"]().as_string();
@@ -111,7 +99,6 @@ namespace Nymph
             std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
             if( newProc == nullptr )
             {
-                LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
             }
 
@@ -127,7 +114,6 @@ namespace Nymph
 
             if( ! AddProcessor( procName, newProc ) )
             {
-                LERROR( proclog, "Unable to add processor <" << procName << ">" );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
             }
         }
@@ -143,14 +129,12 @@ namespace Nymph
         {
             if( ! connIt->is_node() )
             {
-                LERROR( proclog, "Invalid connection entry: not a node" << *connIt );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
             }
             const scarab::param_node& connNode = connIt->as_node();
 
             if( ! connNode.has("signal") || ! connNode.has("slot") )
             {
-                LERROR( proclog, "Signal/Slot connection information is incomplete!" );
                 std::string sigSlotMessage( "signal = " );
                 if (connNode.has("signal"))
                 {
@@ -170,7 +154,6 @@ namespace Nymph
                 {
                     sigSlotMessage += "MISSING";
                 }
-                LERROR( proclog, sigSlotMessage );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
             }
 
@@ -185,7 +168,6 @@ namespace Nymph
             }
             if( ! connReturn )
             {
-                LERROR( proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
             }
 
@@ -193,7 +175,6 @@ namespace Nymph
             {
                 if (! SetBreakpoint( connNode["slot"]().as_string() ) )
                 {
-                    LERROR( proclog, "Unable to set breakpoint on <" << connNode["slot"]() );
                     THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
                 }
             }
@@ -213,7 +194,6 @@ namespace Nymph
             {
                 if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
                 {
-                    LERROR( proclog, "Unable to process run-queue entry: could not add processor to the queue" );
                     THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
                 }
             }
@@ -226,7 +206,6 @@ namespace Nymph
                 {
                     if( ! rqArrayIt->is_value() )
                     {
-                        LERROR( proclog, "Invalid run-queue array entry: not a value" );
                         THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
                     }
                     names.push_back( (*rqArrayIt)().as_string() );
@@ -234,13 +213,11 @@ namespace Nymph
 
                 if( ! PushBackToRunQueue(names) )
                 {
-                    LERROR( proclog, "Unable to process run-queue entry: could not add list of processors to the queue" );
                     THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
                 }
             }
             else
             {
-                LERROR( proclog, "Invalid run-queue entry: not a value or array" );
                 THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
             }
         }
@@ -254,7 +231,7 @@ namespace Nymph
         if( it == fProcMap.end() )
         {
             LWARN( proclog, "Processor <" << procName << "> was not found." );
-            return NULL;
+            return nullptr;
         }
         return it->second.fProc;
     }
@@ -265,7 +242,7 @@ namespace Nymph
         if (it == fProcMap.end())
         {
             LWARN( proclog, "Processor <" << procName << "> was not found." );
-            return NULL;
+            return nullptr;
         }
         return it->second.fProc;
     }
@@ -291,7 +268,7 @@ namespace Nymph
         if( it == fProcMap.end() )
         {
             std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procType) );
-            if( newProc == NULL )
+            if( newProc == nullptr )
             {
                 LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
                 return false;
@@ -299,7 +276,6 @@ namespace Nymph
             if( ! AddProcessor(procName, newProc) )
             {
                 LERROR( proclog, "Unable to add processor <" << procName << ">" );
-                //delete newProc;
                 return false;
             }
             return true;
@@ -311,11 +287,10 @@ namespace Nymph
     bool ProcessorToolbox::RemoveProcessor( const std::string& procName )
     {
         std::shared_ptr< Processor > procToRemove = ReleaseProcessor( procName );
-        if( procToRemove == NULL )
+        if( procToRemove == nullptr )
         {
             return false;
         }
-        //delete procToRemove;
         LDEBUG( proclog, "Processor <" << procName << "> deleted." );
         return true;
     }
@@ -326,7 +301,7 @@ namespace Nymph
         if( it == fProcMap.end() )
         {
             LWARN( proclog, "Processor <" << procName << "> was not found." );
-            return NULL;
+            return nullptr;
         }
         std::shared_ptr< Processor > procToRelease = it->second.fProc;
         fProcMap.erase( it );
@@ -335,10 +310,6 @@ namespace Nymph
 
     void ProcessorToolbox::ClearProcessors()
     {
-        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
-        {
-            delete it->second.fProc;
-        }*/ //not required for smart pointers
         fProcMap.clear();
         fRunQueue.clear();
         return;
@@ -544,7 +515,6 @@ namespace Nymph
             LERROR( proclog, "Processor <" << name << "> is not a primary processor." );
             return false;
         }
-        //group.insert(primaryProc);
         group.insert( ThreadSource(primaryProc, name) );
         return true;
     }
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index b96f4eb..f309f12 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -111,11 +111,6 @@ namespace Nymph
             /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
             void Configure( const scarab::param_node& node );
 
-            /// Configure processors (only those specified in the toolbox)
-            bool ConfigureProcessors( const scarab::param_node& node );
-
-            MEMVAR( bool, RunSingleThreaded );
-
         protected:
             struct ProcessorInfo
             {
@@ -127,6 +122,9 @@ namespace Nymph
             typedef ProcessorMap::value_type ProcMapValue;
 
         public:
+            /// Create processors and configure each according to the `processors` configuration block
+            void ConfigureProcessors( const scarab::param_node& node );
+
             /// Get a pointer to a processor in the toolbox
             std::shared_ptr< Processor > GetProcessor( const std::string& procName );
             /// Get a pointer to a processor in the toolbox
@@ -155,6 +153,9 @@ namespace Nymph
         public:
             // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
 
+            /// Make connections between processors according to the `connections` configuration block
+            void ConfigureConnections( const scarab::param_node& node );
+
             /// Make a connection between the signal from one processor and the slot from another processor
             /// Both processors should already have been added to the Toolbox
             /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
@@ -183,6 +184,9 @@ namespace Nymph
             static const char fSigSlotNameSep = ':';
 
         public:
+            /// Setup the run queue according to the `run-queue` configuration block
+            bool ConfigureRunQueue( const scarab::param_node& node );
+
             /// Push a single processor to the back of the run queue
             bool PushBackToRunQueue( const std::string& name );
 

From 75de94009308549e23082bf9439f0fcb2de3d2a4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 17:16:30 -0800
Subject: [PATCH 267/521] ConfigException takes all params, not just param_node

---
 Library/Processor/Processor.cc | 6 +++---
 Library/Processor/Processor.hh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Processor/Processor.cc b/Library/Processor/Processor.cc
index e65bedb..23841ce 100644
--- a/Library/Processor/Processor.cc
+++ b/Library/Processor/Processor.cc
@@ -27,14 +27,14 @@ namespace Nymph
             fConfigStr()
     {}
 
-    ConfigException::ConfigException( const scarab::param_node& node ) noexcept :
+    ConfigException::ConfigException( const scarab::param& config ) noexcept :
             scarab::typed_exception< ConfigException >(),
             fConfig(),
             fConfigStr()
     {
         try
         {
-            fConfig.reset( new scarab::param_node(node) );
+            fConfig = config.clone();
         }
         catch( ... )
         {}
@@ -47,7 +47,7 @@ namespace Nymph
     {
         try
         {
-            if( orig.fConfig ) fConfig.reset( new scarab::param_node(orig.fConfig->as_node()) );
+            if( orig.fConfig ) fConfig = orig.fConfig->clone();
         }
         catch( ... )
         {}
diff --git a/Library/Processor/Processor.hh b/Library/Processor/Processor.hh
index da67d52..73e05d5 100644
--- a/Library/Processor/Processor.hh
+++ b/Library/Processor/Processor.hh
@@ -39,7 +39,7 @@ namespace Nymph
         public:
             ConfigException() noexcept;
             ConfigException( const std::string& a_filename, int a_line ) noexcept;
-            ConfigException( const scarab::param_node& node ) noexcept;
+            ConfigException( const scarab::param& config ) noexcept;
             ConfigException( const ConfigException& orig ) noexcept;
             virtual ~ConfigException() noexcept;
 

From 8c268d80729b775c6be216ff7296cb7eba04b50a Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 17:16:52 -0800
Subject: [PATCH 268/521] Fixing up how things are configured

---
 Library/Processor/ProcessorToolbox.cc | 52 +++++++++++++--------------
 Library/Processor/ProcessorToolbox.hh |  6 ++--
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Library/Processor/ProcessorToolbox.cc b/Library/Processor/ProcessorToolbox.cc
index 931027f..8bc037f 100644
--- a/Library/Processor/ProcessorToolbox.cc
+++ b/Library/Processor/ProcessorToolbox.cc
@@ -15,6 +15,8 @@
 
 #include <map>
 
+using std::string;
+
 namespace Nymph
 {
     LOGGER(proclog, "ProcessorToolbox");
@@ -40,7 +42,7 @@ namespace Nymph
         }
         else
         {
-            ConfigureProcessors( node["processors"].as_node() );
+            ConfigureProcessors( node["processors"].as_array() );
         }
 
         // Then deal with connections"
@@ -50,7 +52,7 @@ namespace Nymph
         }
         else
         {
-            ConfigureConnections( node["connections"].as_node() );
+            ConfigureConnections( node["connections"].as_array() );
         }
 
         // Finally, deal with processor-run specifications
@@ -62,27 +64,26 @@ namespace Nymph
         }
         else
         {
-            ConfigureRunQueue( node["run-queue"].as_node() );
+            ConfigureRunQueue( node["run-queue"].as_array() );
         }
 
         return;
     }
 
 
-    void ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
+    void ProcessorToolbox::ConfigureProcessors( const scarab::param_array& array )
     {
-        const scarab::param_array& procArray = node["processors"].as_array();
-        for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
+        for( auto procIt = array.begin(); procIt != array.end(); ++procIt )
         {
             if( ! procIt->is_node() )
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Invalid processor entry (not a node): " << *procIt );
             }
             const scarab::param_node& procNode = procIt->as_node();
 
             if( ! procNode.has("type") )
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to create processor: no processor type given" );
             }
             string procType = procNode["type"]().as_string();
 
@@ -96,16 +97,17 @@ namespace Nymph
             {
                 procName = procNode["name"]().as_string();
             }
+
             std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
             if( newProc == nullptr )
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to create processor of type <" << procType << ">" );
             }
 
-            LDEBUG( proclog, "Attempting to configure processor <" << iter->first << ">" );
+            LDEBUG( proclog, "Attempting to configure processor <" << procName << ">" );
             try
             {
-                iter->second.fProc->Configure(subNode);
+                newProc->Configure(procNode);
             }
             catch( scarab::base_exception& e )
             {
@@ -114,7 +116,7 @@ namespace Nymph
 
             if( ! AddProcessor( procName, newProc ) )
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to add processor <" << procName << ">" );
             }
         }
 
@@ -122,14 +124,13 @@ namespace Nymph
     }
 
 
-    void ProcessorToolbox::ConfigureConnections( const scarab::param_node& node )
+    void ProcessorToolbox::ConfigureConnections( const scarab::param_array& array )
     {
-        const scarab::param_array& connArray = node["connections"].as_array();
-        for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
+        for( auto connIt = array.begin(); connIt != array.end(); ++connIt )
         {
             if( ! connIt->is_node() )
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Invalid connection entry: not a node" << *connIt );
             }
             const scarab::param_node& connNode = connIt->as_node();
 
@@ -154,7 +155,7 @@ namespace Nymph
                 {
                     sigSlotMessage += "MISSING";
                 }
-                THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
             }
 
             bool connReturn = false;
@@ -168,14 +169,14 @@ namespace Nymph
             }
             if( ! connReturn )
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
             }
 
             if( connNode.has("breakpoint") )
             {
                 if (! SetBreakpoint( connNode["slot"]().as_string() ) )
                 {
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
+                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to set breakpoint on <" << connNode["slot"]() );
                 }
             }
 
@@ -185,16 +186,15 @@ namespace Nymph
         return;
     }
 
-    void ProcessorToolbox::ConfigureRunQueue( const scarab::param_node& node )
+    void ProcessorToolbox::ConfigureRunQueue( const scarab::param_array& array )
     {
-        const scarab::param_array& rqArray = node["run-queue"].as_array();
-        for( scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt )
+        for( auto rqIt = array.begin(); rqIt != array.end(); ++rqIt )
         {
             if( rqIt->is_value() )
             {
                 if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
                 {
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
+                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to process run-queue entry: could not add processor to the queue" );
                 }
             }
             else if( rqIt->is_array() )
@@ -206,19 +206,19 @@ namespace Nymph
                 {
                     if( ! rqArrayIt->is_value() )
                     {
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
+                        THROW_EXCEPT_HERE( ConfigException(array) << "Invalid run-queue array entry: not a value" );
                     }
                     names.push_back( (*rqArrayIt)().as_string() );
                 }
 
                 if( ! PushBackToRunQueue(names) )
                 {
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
+                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to process run-queue entry: could not add list of processors to the queue" );
                 }
             }
             else
             {
-                THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
+                THROW_EXCEPT_HERE( ConfigException(array) << "Invalid run-queue entry: not a value or array" );
             }
         }
 
diff --git a/Library/Processor/ProcessorToolbox.hh b/Library/Processor/ProcessorToolbox.hh
index f309f12..0d245f3 100644
--- a/Library/Processor/ProcessorToolbox.hh
+++ b/Library/Processor/ProcessorToolbox.hh
@@ -123,7 +123,7 @@ namespace Nymph
 
         public:
             /// Create processors and configure each according to the `processors` configuration block
-            void ConfigureProcessors( const scarab::param_node& node );
+            void ConfigureProcessors( const scarab::param_array& node );
 
             /// Get a pointer to a processor in the toolbox
             std::shared_ptr< Processor > GetProcessor( const std::string& procName );
@@ -154,7 +154,7 @@ namespace Nymph
             // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
 
             /// Make connections between processors according to the `connections` configuration block
-            void ConfigureConnections( const scarab::param_node& node );
+            void ConfigureConnections( const scarab::param_array& node );
 
             /// Make a connection between the signal from one processor and the slot from another processor
             /// Both processors should already have been added to the Toolbox
@@ -185,7 +185,7 @@ namespace Nymph
 
         public:
             /// Setup the run queue according to the `run-queue` configuration block
-            bool ConfigureRunQueue( const scarab::param_node& node );
+            void ConfigureRunQueue( const scarab::param_array& node );
 
             /// Push a single processor to the back of the run queue
             bool PushBackToRunQueue( const std::string& name );

From 99149f51ce3247a71013cf0dd43cd9fd1f73c55f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 18:00:01 -0800
Subject: [PATCH 269/521] Updated TestProcessorToolbox

---
 Testing/TestProcessorToolbox.cc | 65 ++++++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 4c230e3..7bd53cd 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -58,7 +58,6 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
 
         std::string config_str(
-            "processors:\n"
             "- type: test-proc\n"
             "  name: testproc-1"
         );
@@ -66,7 +65,7 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
 
         REQUIRE( toolbox.GetProcessor( procName1 ) );
         REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
@@ -102,19 +101,22 @@ TEST_CASE( "processor_toolbox" )
         std::string procName1( "testproc-1" );
         std::string procName2( "testproc-2" );
 
-        std::string config_str(
-            "processors:\n"
+        std::string p_config_str(
             "- type: test-proc\n"
-            "  name: testproc-1\n"
-            "connections:\n"
+            "  name: testproc-1"
+        );
+
+        std::string c_config_str(
             "- signal: \"testproc-1:value\"\n"
             "  slot: \"testproc-1:second-value\""
         );
 
         scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
+        auto p_config = translator.read_string( p_config_str, "yaml" );
+        auto c_config = translator.read_string( c_config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( p_config->as_array() ) );
+        REQUIRE_NOTHROW( toolbox.ConfigureConnections( c_config->as_array() ) );
 
         std::shared_ptr< Processor > tp1 = toolbox.GetProcessor( procName1 );
 
@@ -147,7 +149,6 @@ TEST_CASE( "processor_toolbox" )
         LINFO( "RunQueue Tests" );
 
         std::string config_str(
-            "processors:\n"
             "- type: test-primary\n"
             "  name: testprimary-1\n"
             "- type: test-primary\n"
@@ -159,7 +160,7 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
 
         ProcTBRevealer::ThreadSourceGroupT group;
         REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
@@ -187,4 +188,48 @@ TEST_CASE( "processor_toolbox" )
 
     }
 
+    SECTION( "FullConfig" )
+    {
+        std::string testprimaryName( "testprimary" );
+        std::string testprocName( "testproc" );
+
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: testprimary\n"
+            "- type: test-proc\n"
+            "  name: testproc\n"
+            "connections:\n"
+            "- signal: \"testprimary:value\"\n"
+            "  slot: \"testproc:value\"\n"
+            "run-queue:\n"
+            "- testprimary"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        // processors
+        REQUIRE( toolbox.GetProcessor( testprimaryName ) );
+        REQUIRE( toolbox.GetProcessor( testprimaryName )->Name() == testprimaryName );
+
+        REQUIRE( toolbox.GetProcessor( testprocName ) );
+        REQUIRE( toolbox.GetProcessor( testprocName )->Name() == testprocName );
+
+        // connections
+        std::shared_ptr< Processor > testprimary = toolbox.GetProcessor( testprimaryName );
+        REQUIRE( testprimary->Signals().at("value")->Connections().size() == 1 );
+
+        std::shared_ptr< Processor > testproc = toolbox.GetProcessor( testprocName );
+        REQUIRE( testproc->Signals().at("value")->Connections().size() == 0 );
+        REQUIRE( testproc->Slots().at("value")->Connections().size() == 1 );
+
+        // run queue
+        REQUIRE( toolbox.RunQueue().size() == 1 );
+        REQUIRE( toolbox.RunQueue().begin()[0].size() == 1 );
+
+    }
+
 }

From ce6f0252021ed0bcd959623b9d66e07af4a93ce2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 31 Jan 2022 18:08:35 -0800
Subject: [PATCH 270/521] Added a test to make sure processors get configured

---
 Testing/TestProcessorToolbox.cc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Testing/TestProcessorToolbox.cc b/Testing/TestProcessorToolbox.cc
index 7bd53cd..21b5b33 100644
--- a/Testing/TestProcessorToolbox.cc
+++ b/Testing/TestProcessorToolbox.cc
@@ -59,7 +59,9 @@ TEST_CASE( "processor_toolbox" )
 
         std::string config_str(
             "- type: test-proc\n"
-            "  name: testproc-1"
+            "  name: testproc-1\n"
+            "  value: 5\n"
+            "  string: ok value 1"
         );
 
         scarab::param_translator translator;
@@ -67,8 +69,14 @@ TEST_CASE( "processor_toolbox" )
 
         REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
 
-        REQUIRE( toolbox.GetProcessor( procName1 ) );
-        REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
+        auto proc = toolbox.GetProcessor( procName1 );
+        REQUIRE( proc );
+        REQUIRE( proc->Name() == procName1 );
+
+        auto testProc = std::dynamic_pointer_cast< TestProc >( proc );
+        REQUIRE( testProc );
+        REQUIRE( testProc->GetValue() == 5 );
+        REQUIRE( testProc->StringValue() == "ok 1" );
 
         std::shared_ptr< Processor > tp1 = toolbox.ReleaseProcessor( procName1 );
         REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );

From 41c479a85ba5a93c4121b5d70a226cd5a28e5d47 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 1 Feb 2022 07:26:47 -0500
Subject: [PATCH 271/521] I think I fixed the issues with mac case sensitivity.

---
 Cpp/Executables_v1/Main/CMakeLists.txt        |    33 +
 Cpp/Executables_v1/Main/ConfigCheck.cc        |    29 +
 Cpp/Executables_v1/Main/Nymph.cc              |    68 +
 Cpp/Executables_v1/Validation/CMakeLists.txt  |    91 +
 .../ConfigFiles/TestConfigurator.json         |    41 +
 .../ConfigFiles/TestParameterStoreConfig.json |    23 +
 Cpp/Executables_v1/Validation/KTJSONReader.cc |    39 +
 Cpp/Executables_v1/Validation/KTJSONReader.hh |    62 +
 .../Validation/KTJSONTypeWriterValidation.cc  |    32 +
 .../Validation/KTJSONTypeWriterValidation.hh  |    36 +
 .../Validation/KTPyTestClass.cc               |    22 +
 .../Validation/KTPyTestClass.hh               |    44 +
 .../Validation/KTPyTestClassPybind.hh         |    26 +
 .../KTRegisterNymphValidationExtData.hh       |    19 +
 .../Validation/KTTestConfigurable.cc          |    67 +
 .../Validation/KTTestConfigurable.hh          |    53 +
 Cpp/Executables_v1/Validation/KTTestCuts.cc   |    69 +
 Cpp/Executables_v1/Validation/KTTestCuts.hh   |    48 +
 Cpp/Executables_v1/Validation/KTTestData.cc   |    38 +
 Cpp/Executables_v1/Validation/KTTestData.hh   |    71 +
 .../Validation/KTTestDataPrimaryProcessor.cc  |    62 +
 .../Validation/KTTestDataPrimaryProcessor.hh  |    40 +
 .../Validation/KTTestPrimaryProcessor.cc      |    47 +
 .../Validation/KTTestPrimaryProcessor.hh      |    40 +
 .../Validation/KTTestProcessor.cc             |   151 +
 .../Validation/KTTestProcessor.hh             |   108 +
 .../Validation/NymphValidationPybind.cc       |    20 +
 .../Validation/TestApplication.cc             |   102 +
 Cpp/Executables_v1/Validation/TestApplyCut.cc |    71 +
 .../Validation/TestCacheDirectory.cc          |    48 +
 Cpp/Executables_v1/Validation/TestCut.cc      |    81 +
 .../Validation/TestCutFilter.cc               |    90 +
 Cpp/Executables_v1/Validation/TestData.cc     |    25 +
 .../Validation/TestExceptionInSlot.cc         |    93 +
 Cpp/Executables_v1/Validation/TestExt.cc      |    79 +
 .../Validation/TestExtSerialization.cc        |    80 +
 .../Validation/TestJSONWriter.cc              |    52 +
 .../Validation/TestJSONWriterViaSlot.cc       |    84 +
 Cpp/Executables_v1/Validation/TestLogger.cc   |    33 +
 .../Validation/TestParamBindings.py           |    51 +
 .../Validation/TestPolymorphicSlotData.cc     |    41 +
 .../Validation/TestPrimaryProcessor.cc        |    72 +
 .../TestPrimaryProcessorNoThreading.cc        |    45 +
 .../Validation/TestPrintData.cc               |    41 +
 .../Validation/TestProcessorToolbox.py        |    27 +
 .../TestProcessorToolbox2Threads.cc           |   114 +
 .../TestProcessorToolboxMultithreaded.cc      |    76 +
 .../TestProcessorToolboxSinglethreaded.cc     |    77 +
 .../Validation/TestPyTestClass.py             |    13 +
 .../Validation/TestPythonBasics.hh            |    26 +
 .../Validation/TestPythonBasics.py            |    10 +
 .../Validation/TestSerialization.cc           |    73 +
 .../Validation/TestSignalsAndSlots.cc         |    58 +
 Cpp/Executables_v1/Validation/TestSlotData.cc |    43 +
 .../Validation/TestThroughputProfiler.cc      |    45 +
 .../Validation/TestUseBreakpoint.cc           |    93 +
 .../Validation/TestWrapProcessor.py           |    51 +
 Cpp/Library/CMakeLists.txt                    |    63 +
 Cpp/Library/Data/Data.cc                      |    18 +
 Cpp/Library/Data/Data.hh                      |    24 +
 Cpp/Library/Data/DataFrame.cc                 |    19 +
 Cpp/Library/Data/DataFrame.hh                 |   153 +
 Cpp/Library/Data/DataManager.cc               |    18 +
 Cpp/Library/Data/DataManager.hh               |    39 +
 Cpp/Library/Processor/ControlAccess.cc        |   122 +
 Cpp/Library/Processor/ControlAccess.hh        |   146 +
 Cpp/Library/Processor/PrimaryProcessor.cc     |    58 +
 Cpp/Library/Processor/PrimaryProcessor.hh     |    68 +
 Cpp/Library/Processor/Processor.cc            |   217 +
 Cpp/Library/Processor/Processor.hh            |   122 +
 Cpp/Library/Processor/ProcessorToolbox.cc     |   758 +
 Cpp/Library/Processor/ProcessorToolbox.hh     |   272 +
 Cpp/Library/Processor/QuitThread.hh           |    27 +
 Cpp/Library/Processor/ReturnBuffer.cc         |    19 +
 Cpp/Library/Processor/ReturnBuffer.hh         |    63 +
 Cpp/Library/Processor/Signal.hh               |   257 +
 Cpp/Library/Processor/SignalSlotBase.cc       |    52 +
 Cpp/Library/Processor/SignalSlotBase.hh       |   129 +
 Cpp/Library/Processor/Slot.hh                 |   241 +
 Cpp/Library/Utility/Exception.cc              |    74 +
 Cpp/Library/Utility/Exception.hh              |   201 +
 Cpp/Library/Utility/MemberVariable.hh         |    93 +
 Cpp/Library_v1/AddLibPythonPath.sh.in         |     3 +
 Cpp/Library_v1/Application/KTApplication.cc   |   174 +
 Cpp/Library_v1/Application/KTApplication.hh   |   105 +
 .../Application/KTCommandLineHandler.cc       |   458 +
 .../Application/KTCommandLineHandler.hh       |   339 +
 .../Application/KTCommandLineOption.hh        |    89 +
 Cpp/Library_v1/Application/KTConfigurator.cc  |    32 +
 Cpp/Library_v1/Application/KTConfigurator.hh  |   123 +
 .../Application/KTDataQueueProcessor.cc       |    53 +
 .../Application/KTDataQueueProcessor.hh       |   395 +
 .../Application/KTFilenameParsers.cc          |    49 +
 .../Application/KTFilenameParsers.hh          |    27 +
 .../Application/KTPrintDataStructure.cc       |   121 +
 .../Application/KTPrintDataStructure.hh       |    82 +
 .../Application/KTProcessorToolbox.cc         |   986 +
 .../Application/KTProcessorToolbox.hh         |   331 +
 .../Application/KTProcessorToolboxPybind.hh   |   100 +
 Cpp/Library_v1/Application/KTRunNymph.cc      |    69 +
 Cpp/Library_v1/Application/KTRunNymph.hh      |    21 +
 .../Application/KTThroughputProfiler.cc       |   166 +
 .../Application/KTThroughputProfiler.hh       |   149 +
 Cpp/Library_v1/CMakeLists.txt                 |   121 +
 Cpp/Library_v1/Data/KTApplyCut.cc             |   113 +
 Cpp/Library_v1/Data/KTApplyCut.hh             |    99 +
 Cpp/Library_v1/Data/KTCoreData.cc             |    33 +
 Cpp/Library_v1/Data/KTCoreData.hh             |    88 +
 Cpp/Library_v1/Data/KTCut.cc                  |    21 +
 Cpp/Library_v1/Data/KTCut.hh                  |   209 +
 Cpp/Library_v1/Data/KTCutFilter.cc            |   100 +
 Cpp/Library_v1/Data/KTCutFilter.hh            |   139 +
 Cpp/Library_v1/Data/KTCutResult.hh            |    36 +
 Cpp/Library_v1/Data/KTCutStatus.cc            |    94 +
 Cpp/Library_v1/Data/KTCutStatus.hh            |   316 +
 Cpp/Library_v1/Data/KTData.cc                 |    37 +
 Cpp/Library_v1/Data/KTData.hh                 |    96 +
 Cpp/Library_v1/Data/KTRegisterNymphExtData.hh |    29 +
 Cpp/Library_v1/Data/KTTester.cc               |    24 +
 Cpp/Library_v1/Data/KTTester.hh               |    41 +
 Cpp/Library_v1/IO/KTJSONWriter.cc             |    57 +
 Cpp/Library_v1/IO/KTJSONWriter.hh             |   107 +
 Cpp/Library_v1/IO/KTReader.cc                 |    22 +
 Cpp/Library_v1/IO/KTReader.hh                 |    29 +
 Cpp/Library_v1/IO/KTWriter.cc                 |    34 +
 Cpp/Library_v1/IO/KTWriter.hh                 |   140 +
 Cpp/Library_v1/NymphPybind.cc                 |    35 +
 Cpp/Library_v1/Processor/KTConnection.hh      |    17 +
 Cpp/Library_v1/Processor/KTNymphSignals.hh    |    46 +
 Cpp/Library_v1/Processor/KTNymphSlot.hh       |   398 +
 .../Processor/KTPrimaryProcessor.cc           |    69 +
 .../Processor/KTPrimaryProcessor.hh           |    53 +
 Cpp/Library_v1/Processor/KTProcessor.cc       |   150 +
 Cpp/Library_v1/Processor/KTProcessor.hh       |   161 +
 Cpp/Library_v1/Processor/KTProcessorPybind.cc |    48 +
 Cpp/Library_v1/Processor/KTProcessorPybind.hh |    89 +
 Cpp/Library_v1/Processor/KTPyProcessor.hh     |    32 +
 Cpp/Library_v1/Processor/KTSignal.hh          |   250 +
 Cpp/Library_v1/Processor/KTSignalSlotBase.hh  |    52 +
 Cpp/Library_v1/Processor/KTSignalWrapper.cc   |    23 +
 Cpp/Library_v1/Processor/KTSignalWrapper.hh   |    82 +
 Cpp/Library_v1/Processor/KTSlot.hh            |   236 +
 Cpp/Library_v1/Processor/KTSlotWrapper.cc     |    27 +
 Cpp/Library_v1/Processor/KTSlotWrapper.hh     |   152 +
 Cpp/Library_v1/Processor/KTThreadReference.cc |    86 +
 Cpp/Library_v1/Processor/KTThreadReference.hh |   168 +
 Cpp/Library_v1/Utility/KTCacheDirectory.cc    |    34 +
 Cpp/Library_v1/Utility/KTCacheDirectory.hh    |    42 +
 Cpp/Library_v1/Utility/KTConcurrentQueue.hh   |   170 +
 Cpp/Library_v1/Utility/KTConfigurable.cc      |    82 +
 Cpp/Library_v1/Utility/KTConfigurable.hh      |    96 +
 .../Utility/KTConfigurablePybind.hh           |    29 +
 Cpp/Library_v1/Utility/KTDirectory.cc         |    86 +
 Cpp/Library_v1/Utility/KTDirectory.hh         |    47 +
 Cpp/Library_v1/Utility/KTEventLoop.cc         |    24 +
 Cpp/Library_v1/Utility/KTEventLoop.hh         |    36 +
 Cpp/Library_v1/Utility/KTException.cc         |    30 +
 Cpp/Library_v1/Utility/KTException.hh         |   127 +
 Cpp/Library_v1/Utility/KTExtensible.hh        |   393 +
 Cpp/Library_v1/Utility/KTExtensibleStruct.hh  |   384 +
 .../Utility/KTExtensibleStructFactory.hh      |   201 +
 Cpp/Library_v1/Utility/KTLogger.hh            |    51 +
 Cpp/Library_v1/Utility/KTMemberVariable.hh    |    98 +
 Cpp/Library_v1/Utility/KTParamPybind.hh       |   101 +
 Cpp/Library_v1/Utility/KTPythonMacros.hh      |    23 +
 Cpp/Library_v1/Utility/KTTIFactory.hh         |   364 +
 Cpp/Library_v1/Utility/KTTime.cc              |    93 +
 Cpp/Library_v1/Utility/KTTime.hh              |    53 +
 Cpp/Templates/KTProcessorTemplate.cc          |    46 +
 Cpp/Templates/KTProcessorTemplate.hh          |    85 +
 Cpp/Templates/MainCMakeLists.txt              |    24 +
 Python/nymph/__init__.py                      |     0
 Testing/Cpp/Catch/catch.hpp                   | 17966 ++++++++++++++++
 Testing/Cpp/TestControlAccess.cc              |    65 +
 Testing/Cpp/TestData.cc                       |    28 +
 Testing/Cpp/TestDataClasses.hh                |    54 +
 Testing/Cpp/TestDataFrame.cc                  |    72 +
 Testing/Cpp/TestException.cc                  |   210 +
 Testing/Cpp/TestPrimaryProcessor.cc           |    55 +
 Testing/Cpp/TestProcessor.cc                  |   152 +
 Testing/Cpp/TestProcessorClasses.hh           |   175 +
 Testing/Cpp/TestProcessorToolbox.cc           |   231 +
 Testing/Cpp/TestSignalSlot.cc                 |    72 +
 Testing/Cpp/UseCatch.cc                       |    10 +
 184 files changed, 36266 insertions(+)
 create mode 100644 Cpp/Executables_v1/Main/CMakeLists.txt
 create mode 100644 Cpp/Executables_v1/Main/ConfigCheck.cc
 create mode 100644 Cpp/Executables_v1/Main/Nymph.cc
 create mode 100644 Cpp/Executables_v1/Validation/CMakeLists.txt
 create mode 100644 Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
 create mode 100644 Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
 create mode 100644 Cpp/Executables_v1/Validation/KTJSONReader.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTJSONReader.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTPyTestClass.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTPyTestClass.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTTestConfigurable.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTTestConfigurable.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTTestCuts.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTTestCuts.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTTestData.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTTestData.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
 create mode 100644 Cpp/Executables_v1/Validation/KTTestProcessor.cc
 create mode 100644 Cpp/Executables_v1/Validation/KTTestProcessor.hh
 create mode 100644 Cpp/Executables_v1/Validation/NymphValidationPybind.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestApplication.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestApplyCut.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestCacheDirectory.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestCut.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestCutFilter.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestData.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestExt.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestExtSerialization.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestJSONWriter.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestLogger.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestParamBindings.py
 create mode 100644 Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestPrintData.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestProcessorToolbox.py
 create mode 100644 Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestPyTestClass.py
 create mode 100644 Cpp/Executables_v1/Validation/TestPythonBasics.hh
 create mode 100644 Cpp/Executables_v1/Validation/TestPythonBasics.py
 create mode 100644 Cpp/Executables_v1/Validation/TestSerialization.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestSlotData.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
 create mode 100644 Cpp/Executables_v1/Validation/TestWrapProcessor.py
 create mode 100644 Cpp/Library/CMakeLists.txt
 create mode 100644 Cpp/Library/Data/Data.cc
 create mode 100644 Cpp/Library/Data/Data.hh
 create mode 100644 Cpp/Library/Data/DataFrame.cc
 create mode 100644 Cpp/Library/Data/DataFrame.hh
 create mode 100644 Cpp/Library/Data/DataManager.cc
 create mode 100644 Cpp/Library/Data/DataManager.hh
 create mode 100644 Cpp/Library/Processor/ControlAccess.cc
 create mode 100644 Cpp/Library/Processor/ControlAccess.hh
 create mode 100644 Cpp/Library/Processor/PrimaryProcessor.cc
 create mode 100644 Cpp/Library/Processor/PrimaryProcessor.hh
 create mode 100644 Cpp/Library/Processor/Processor.cc
 create mode 100644 Cpp/Library/Processor/Processor.hh
 create mode 100644 Cpp/Library/Processor/ProcessorToolbox.cc
 create mode 100644 Cpp/Library/Processor/ProcessorToolbox.hh
 create mode 100644 Cpp/Library/Processor/QuitThread.hh
 create mode 100644 Cpp/Library/Processor/ReturnBuffer.cc
 create mode 100644 Cpp/Library/Processor/ReturnBuffer.hh
 create mode 100644 Cpp/Library/Processor/Signal.hh
 create mode 100644 Cpp/Library/Processor/SignalSlotBase.cc
 create mode 100644 Cpp/Library/Processor/SignalSlotBase.hh
 create mode 100644 Cpp/Library/Processor/Slot.hh
 create mode 100644 Cpp/Library/Utility/Exception.cc
 create mode 100644 Cpp/Library/Utility/Exception.hh
 create mode 100644 Cpp/Library/Utility/MemberVariable.hh
 create mode 100644 Cpp/Library_v1/AddLibPythonPath.sh.in
 create mode 100644 Cpp/Library_v1/Application/KTApplication.cc
 create mode 100644 Cpp/Library_v1/Application/KTApplication.hh
 create mode 100644 Cpp/Library_v1/Application/KTCommandLineHandler.cc
 create mode 100644 Cpp/Library_v1/Application/KTCommandLineHandler.hh
 create mode 100644 Cpp/Library_v1/Application/KTCommandLineOption.hh
 create mode 100644 Cpp/Library_v1/Application/KTConfigurator.cc
 create mode 100644 Cpp/Library_v1/Application/KTConfigurator.hh
 create mode 100644 Cpp/Library_v1/Application/KTDataQueueProcessor.cc
 create mode 100644 Cpp/Library_v1/Application/KTDataQueueProcessor.hh
 create mode 100644 Cpp/Library_v1/Application/KTFilenameParsers.cc
 create mode 100644 Cpp/Library_v1/Application/KTFilenameParsers.hh
 create mode 100644 Cpp/Library_v1/Application/KTPrintDataStructure.cc
 create mode 100644 Cpp/Library_v1/Application/KTPrintDataStructure.hh
 create mode 100644 Cpp/Library_v1/Application/KTProcessorToolbox.cc
 create mode 100644 Cpp/Library_v1/Application/KTProcessorToolbox.hh
 create mode 100644 Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
 create mode 100644 Cpp/Library_v1/Application/KTRunNymph.cc
 create mode 100644 Cpp/Library_v1/Application/KTRunNymph.hh
 create mode 100644 Cpp/Library_v1/Application/KTThroughputProfiler.cc
 create mode 100644 Cpp/Library_v1/Application/KTThroughputProfiler.hh
 create mode 100644 Cpp/Library_v1/CMakeLists.txt
 create mode 100644 Cpp/Library_v1/Data/KTApplyCut.cc
 create mode 100644 Cpp/Library_v1/Data/KTApplyCut.hh
 create mode 100644 Cpp/Library_v1/Data/KTCoreData.cc
 create mode 100644 Cpp/Library_v1/Data/KTCoreData.hh
 create mode 100644 Cpp/Library_v1/Data/KTCut.cc
 create mode 100644 Cpp/Library_v1/Data/KTCut.hh
 create mode 100644 Cpp/Library_v1/Data/KTCutFilter.cc
 create mode 100644 Cpp/Library_v1/Data/KTCutFilter.hh
 create mode 100644 Cpp/Library_v1/Data/KTCutResult.hh
 create mode 100644 Cpp/Library_v1/Data/KTCutStatus.cc
 create mode 100644 Cpp/Library_v1/Data/KTCutStatus.hh
 create mode 100644 Cpp/Library_v1/Data/KTData.cc
 create mode 100644 Cpp/Library_v1/Data/KTData.hh
 create mode 100644 Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
 create mode 100644 Cpp/Library_v1/Data/KTTester.cc
 create mode 100644 Cpp/Library_v1/Data/KTTester.hh
 create mode 100644 Cpp/Library_v1/IO/KTJSONWriter.cc
 create mode 100644 Cpp/Library_v1/IO/KTJSONWriter.hh
 create mode 100644 Cpp/Library_v1/IO/KTReader.cc
 create mode 100644 Cpp/Library_v1/IO/KTReader.hh
 create mode 100644 Cpp/Library_v1/IO/KTWriter.cc
 create mode 100644 Cpp/Library_v1/IO/KTWriter.hh
 create mode 100644 Cpp/Library_v1/NymphPybind.cc
 create mode 100644 Cpp/Library_v1/Processor/KTConnection.hh
 create mode 100644 Cpp/Library_v1/Processor/KTNymphSignals.hh
 create mode 100644 Cpp/Library_v1/Processor/KTNymphSlot.hh
 create mode 100644 Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
 create mode 100644 Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
 create mode 100644 Cpp/Library_v1/Processor/KTProcessor.cc
 create mode 100644 Cpp/Library_v1/Processor/KTProcessor.hh
 create mode 100644 Cpp/Library_v1/Processor/KTProcessorPybind.cc
 create mode 100644 Cpp/Library_v1/Processor/KTProcessorPybind.hh
 create mode 100644 Cpp/Library_v1/Processor/KTPyProcessor.hh
 create mode 100644 Cpp/Library_v1/Processor/KTSignal.hh
 create mode 100644 Cpp/Library_v1/Processor/KTSignalSlotBase.hh
 create mode 100644 Cpp/Library_v1/Processor/KTSignalWrapper.cc
 create mode 100644 Cpp/Library_v1/Processor/KTSignalWrapper.hh
 create mode 100644 Cpp/Library_v1/Processor/KTSlot.hh
 create mode 100644 Cpp/Library_v1/Processor/KTSlotWrapper.cc
 create mode 100644 Cpp/Library_v1/Processor/KTSlotWrapper.hh
 create mode 100644 Cpp/Library_v1/Processor/KTThreadReference.cc
 create mode 100644 Cpp/Library_v1/Processor/KTThreadReference.hh
 create mode 100644 Cpp/Library_v1/Utility/KTCacheDirectory.cc
 create mode 100644 Cpp/Library_v1/Utility/KTCacheDirectory.hh
 create mode 100644 Cpp/Library_v1/Utility/KTConcurrentQueue.hh
 create mode 100644 Cpp/Library_v1/Utility/KTConfigurable.cc
 create mode 100644 Cpp/Library_v1/Utility/KTConfigurable.hh
 create mode 100644 Cpp/Library_v1/Utility/KTConfigurablePybind.hh
 create mode 100644 Cpp/Library_v1/Utility/KTDirectory.cc
 create mode 100644 Cpp/Library_v1/Utility/KTDirectory.hh
 create mode 100644 Cpp/Library_v1/Utility/KTEventLoop.cc
 create mode 100644 Cpp/Library_v1/Utility/KTEventLoop.hh
 create mode 100644 Cpp/Library_v1/Utility/KTException.cc
 create mode 100644 Cpp/Library_v1/Utility/KTException.hh
 create mode 100644 Cpp/Library_v1/Utility/KTExtensible.hh
 create mode 100644 Cpp/Library_v1/Utility/KTExtensibleStruct.hh
 create mode 100644 Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
 create mode 100644 Cpp/Library_v1/Utility/KTLogger.hh
 create mode 100644 Cpp/Library_v1/Utility/KTMemberVariable.hh
 create mode 100644 Cpp/Library_v1/Utility/KTParamPybind.hh
 create mode 100644 Cpp/Library_v1/Utility/KTPythonMacros.hh
 create mode 100644 Cpp/Library_v1/Utility/KTTIFactory.hh
 create mode 100644 Cpp/Library_v1/Utility/KTTime.cc
 create mode 100644 Cpp/Library_v1/Utility/KTTime.hh
 create mode 100644 Cpp/Templates/KTProcessorTemplate.cc
 create mode 100644 Cpp/Templates/KTProcessorTemplate.hh
 create mode 100644 Cpp/Templates/MainCMakeLists.txt
 create mode 100644 Python/nymph/__init__.py
 create mode 100644 Testing/Cpp/Catch/catch.hpp
 create mode 100644 Testing/Cpp/TestControlAccess.cc
 create mode 100644 Testing/Cpp/TestData.cc
 create mode 100644 Testing/Cpp/TestDataClasses.hh
 create mode 100644 Testing/Cpp/TestDataFrame.cc
 create mode 100644 Testing/Cpp/TestException.cc
 create mode 100644 Testing/Cpp/TestPrimaryProcessor.cc
 create mode 100644 Testing/Cpp/TestProcessor.cc
 create mode 100644 Testing/Cpp/TestProcessorClasses.hh
 create mode 100644 Testing/Cpp/TestProcessorToolbox.cc
 create mode 100644 Testing/Cpp/TestSignalSlot.cc
 create mode 100644 Testing/Cpp/UseCatch.cc

diff --git a/Cpp/Executables_v1/Main/CMakeLists.txt b/Cpp/Executables_v1/Main/CMakeLists.txt
new file mode 100644
index 0000000..a7ba2b1
--- /dev/null
+++ b/Cpp/Executables_v1/Main/CMakeLists.txt
@@ -0,0 +1,33 @@
+# CMakeLists for Nymph/Executables_v1/Main
+# Author: N. Oblath
+
+if( NOT Nymph_AS_SUBMODULE )
+    set( Nymph_package_libs
+        Nymph
+    )
+endif()
+
+set( Nymph_SOURCES
+#    ConfigCheck.cc
+)
+if( Nymph_BUILD_NYMPH_EXE )
+    set( Nymph_SOURCES
+        ${Nymph_SOURCES}
+        Nymph.cc
+    )
+endif( Nymph_BUILD_NYMPH_EXE )
+
+
+set( Nymph_PROGRAMS )
+pbuilder_executables( 
+    SOURCES ${Nymph_SOURCES}
+    TARGETS_VAR Nymph_PROGRAMS
+    PROJECT_LIBRARIES ${Nymph_package_libs}
+    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Executables
+    EXETARGETS ${Nymph_PROGRAMS}
+)
diff --git a/Cpp/Executables_v1/Main/ConfigCheck.cc b/Cpp/Executables_v1/Main/ConfigCheck.cc
new file mode 100644
index 0000000..ac3e712
--- /dev/null
+++ b/Cpp/Executables_v1/Main/ConfigCheck.cc
@@ -0,0 +1,29 @@
+/*
+ * ConfigCheck.cc
+ *
+ *  Created on: Jan 4, 2013
+ *      Author: nsoblath
+ *
+ */
+
+#include "KTApplication.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(cclog, "ConfigCheck");
+
+int main(int argc, char** argv)
+{
+    try
+    {
+        KTApplication app(argc, argv);
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( cclog, "Something went wrong while processing the command line:\n" << e.what() );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Main/Nymph.cc b/Cpp/Executables_v1/Main/Nymph.cc
new file mode 100644
index 0000000..8bbdd1f
--- /dev/null
+++ b/Cpp/Executables_v1/Main/Nymph.cc
@@ -0,0 +1,68 @@
+/*
+ * Nymph.cc
+ *
+ *  Created on: Sep 28, 2012
+ *      Author: nsoblath
+ *
+ *  This program will run any processor-based code in packages built with Nymph.
+ *  All of the action is setup with a config file.
+ *  See KTProcessorToolbox for details on the configuration option.
+ */
+
+#include "KTApplication.hh"
+#include "KTLogger.hh"
+#include "KTRunNymph.hh"
+
+KTLOGGER( nymphlog, "Nymph" );
+
+
+int main( int argc, char** argv )
+{
+    KTPROG( nymphlog, "Welcome to Nymph!" );
+    KTDEBUG( nymphlog,
+            "\n" <<
+            "                                           Z                                 \n" <<
+            "                                            =M                               \n" <<
+            "                                             M                               \n" <<
+            "                                             M                               \n" <<
+            "                                            =M                               \n" <<
+            "                                            N                                \n" <<
+            "                                            M             NINMMMMMZ...M      \n" <<
+            "                                            M            $$                  \n" <<
+            "                        M:                  N.           IM                  \n" <<
+            "                          ZD.                 M?          M                  \n" <<
+            "                             $                M ?M       MM           .$     \n" <<
+            "                               DM               M  O      8       .+MZ       \n" <<
+            "                                 ~M                M~ 8  M~  MM:~M           \n" <<
+            "                                   O:MMIZ+,?DNMD$.... M,MM MZ ? D$=  .8MOM+  \n" <<
+            "                                      ,= MN ZZ D:  M:MM~MM==     MMZM        \n" <<
+            "                                           ...MM MMM8,M+ I:ND $MMM           \n" <<
+            "                                         MMMMO   ~M, ,MM7MOD$                \n" <<
+            "                                    MMMMMM ~~8M? ,O~= MDNM M ,               \n" <<
+            "                                MMMM:M   Z8 MMM :MNM = ..,  MZ               \n" <<
+            "                            MNMMNM MM IM NM,M    N M   MM    +M         .NM M\n" <<
+            "                        ~MMD8 :  D  MM=MM,     O MO    8=    + $     .IM     \n" <<
+            "               ONMMMMMM..?  8 :MMMMM          = M      N      M    :M        \n" <<
+            "   ..+M8=...:=MMMMMMMMMN OMM:M,             M  ~       7       MMM8          \n" <<
+            "ZM8         ~M+:MZMMM~ M                    OM         M                     \n" <<
+            "      .:M..$D..$D ? M,                    MM           MN                    \n" <<
+            "   $M7      M   M+                       M              NMMMM:..             \n" <<
+            "         M..M                          :N                       7M           \n" <<
+            "      MM,                             M                           D          \n" <<
+            "                                     M                                       \n" <<
+            "                                   M=                                        \n" <<
+            "                                   M                                         \n" <<
+            "                                  =                                          \n" <<
+            "                                  M                                          \n");
+
+    try
+    {
+        return Nymph::RunNymph( std::make_shared< Nymph::KTApplication >( argc, argv ) );
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( nymphlog, "Exception caught:\n" << e.what() );
+        return -1;
+    }
+
+}
diff --git a/Cpp/Executables_v1/Validation/CMakeLists.txt b/Cpp/Executables_v1/Validation/CMakeLists.txt
new file mode 100644
index 0000000..90bc734
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/CMakeLists.txt
@@ -0,0 +1,91 @@
+# CMakeLists for Nymph/Executables_v1/Validation
+# Author: N. Oblath
+
+############################
+# Config files
+############################
+
+set (VALIDATION_CONFIGFILES
+    ConfigFiles/TestConfigurator.json
+)
+
+pbuilder_install_config (${VALIDATION_CONFIGFILES})
+
+
+############################
+# NymphValidation library files
+############################
+
+set (VALIDATION_HEADERFILES
+    KTTestConfigurable.hh
+    KTTestCuts.hh
+    KTTestProcessor.hh
+)
+
+set (VALIDATION_SOURCEFILES
+    KTTestConfigurable.cc
+    KTTestCuts.cc
+    KTTestProcessor.cc
+)
+
+set( LIB_DEPENDENCIES
+    Nymph
+)
+
+############################
+# NymphValidation library 
+############################
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+pbuilder_library( 
+    TARGET NymphValidation 
+    SOURCES ${VALIDATION_SOURCEFILES}
+    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Validation
+    LIBTARGETS NymphValidation
+)
+
+pbuilder_install_headers( ${VALIDATION_HEADERFILES} )
+
+
+############################
+# Executables
+############################
+
+set( LIB_DEPENDENCIES
+    NymphValidation
+)
+
+set( TEST_SOURCES
+    TestApplication.cc
+    TestApplyCut.cc
+    TestCacheDirectory.cc
+    TestCut.cc
+    TestCutFilter.cc
+    TestLogger.cc
+    TestPrintData.cc
+    TestSignalsAndSlots.cc
+    TestThroughputProfiler.cc
+)
+
+pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
+
+set( TEST_PROGRAMS )
+pbuilder_executables( 
+    SOURCES ${TEST_SOURCES}
+    TARGETS_VAR TEST_PROGRAMS
+    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
+    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Validation
+    EXETARGETS ${TEST_PROGRAMS}
+)
diff --git a/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json b/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
new file mode 100644
index 0000000..8a5d5a1
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
@@ -0,0 +1,41 @@
+{
+    "test-configurable":
+    {
+        "int-data": 5,
+        "double-data": 50,
+        "string-data": "It works!",
+        "comment": "This should not show up in the as-parsed configuration",
+        "comment":
+        {
+            "neither": "should this"
+        }
+        
+    },
+    
+    "nested-data":
+    {
+        "single-data": 222,
+        "single-data-2": -5000,
+        "#single-data-3": 1,
+        "single-data-3": 10,
+        
+        "sub-data":
+        {
+            "single-data":111,
+            "single-data-2": 6789,
+            "multi-data":
+            [ 345, 456, ["###", 567], 789 ]
+        }
+    },
+    
+    "nested-data-2":
+    {
+        "single-data-2": 212121,
+        "single-data-3": "this replaced an integer",
+        
+        "sub-data":
+        {
+            "single-data-2": 12345
+        }
+    }
+}
\ No newline at end of file
diff --git a/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json b/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
new file mode 100644
index 0000000..a599ab0
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
@@ -0,0 +1,23 @@
+{
+    "test-configurable":
+    {
+        "int-data": 5,
+        "double-data": 50,
+        "string-data": "It works!"
+        
+    },
+    
+    "nested-data":
+    {
+        "single-data":222,
+        
+        "sub-data":
+        {
+            "single-data":111,
+            "multi-data":345,
+            "multi-data":567,
+            "multi-data":789
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/Cpp/Executables_v1/Validation/KTJSONReader.cc b/Cpp/Executables_v1/Validation/KTJSONReader.cc
new file mode 100644
index 0000000..2da348b
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTJSONReader.cc
@@ -0,0 +1,39 @@
+/*
+ * KTJSONReader.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N.S. Oblath
+ */
+
+// Data classes need to be included before the archive header
+#include "KTTestData.hh"
+
+#include "KTJSONReader.hh"
+
+
+namespace Nymph
+{
+
+    KTJSONReader::KTJSONReader( const std::string& name) :
+            KTProcessor( name ),
+            fFilename( "json_reader_default_file.json" ),
+            fStreamInPtr( nullptr ),
+            fArchiveInPtr( nullptr )
+    {
+    }
+
+    KTJSONReader::~KTJSONReader()
+    {
+        // archive must be delete before the stream!
+        delete fArchiveInPtr;
+        delete fStreamInPtr;
+    }
+
+    bool KTJSONReader::Configure( const scarab::param_node& node )
+    {
+        SetFilename( node.get_value( "filename" , fFilename ));
+
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTJSONReader.hh b/Cpp/Executables_v1/Validation/KTJSONReader.hh
new file mode 100644
index 0000000..ca6506d
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTJSONReader.hh
@@ -0,0 +1,62 @@
+/*
+ * KTJSONReader.hh
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTJSONREADER_HH_
+#define NYMPH_KTJSONREADER_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTLogger.hh"
+
+#include "cereal/archives/json.hpp"
+
+
+KTLOGGER( jsrlog_hh, "KTJSONReader" )
+
+
+namespace Nymph
+{
+
+    class KTJSONReader : public KTProcessor
+    {
+        public:
+            KTJSONReader( const std::string& name = "json-reader" );
+            virtual ~KTJSONReader();
+
+            bool Configure( const scarab::param_node& node );
+
+            MEMBERVARIABLE( std::string, Filename );
+
+        public:
+            template< class XDataType >
+            void ReadData( XDataType& data );
+
+        private:
+            std::ifstream* fStreamInPtr;
+            cereal::JSONInputArchive* fArchiveInPtr;
+
+    };
+
+    template< class XDataType >
+    void KTJSONReader::ReadData( XDataType& data )
+    {
+        if( fStreamInPtr == nullptr )
+        {
+            KTDEBUG( jsrlog_hh, "Creating stream and archive" );
+            fStreamInPtr = new std::ifstream( fFilename );
+            fArchiveInPtr = new cereal::JSONInputArchive( *fStreamInPtr );
+        }
+
+        KTDEBUG( jsrlog_hh, "Reading an object from JSON" );
+        (*fArchiveInPtr)( data );
+
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTJSONREADER_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc b/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
new file mode 100644
index 0000000..3e9cc28
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
@@ -0,0 +1,32 @@
+/*
+ * KTJSONWriterValidation.cc
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTJSONTypeWriterValidation.hh"
+#include "KTRegisterNymphValidationExtData.hh"
+
+namespace Nymph
+{
+    KT_REGISTER_TYPE_WRITER( KTJSONWriter, KTJSONTypeWriter, Validation );
+
+    KTJSONTypeWriterValidation::KTJSONTypeWriterValidation( KTJSONWriter* writer) :
+            KTJSONTypeWriter( writer ),
+            fTestSlot( "test", fWriter, &KTJSONWriter::WriteData< KTTestDataExt > ),
+            fTestDerived1Slot( "test-derived-1", fWriter, &KTJSONWriter::WriteData< KTTestDerived1DataExt > ),
+            fTestDerived2Slot( "test-derived-2", fWriter, &KTJSONWriter::WriteData< KTTestDerived2DataExt > )
+    {
+        std::cout << "Created a KTJSONWriterValidation" << std::endl;
+    }
+
+    KTJSONTypeWriterValidation::~KTJSONTypeWriterValidation()
+    {
+    }
+
+    void KTJSONTypeWriterValidation::RegisterSlots()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh b/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
new file mode 100644
index 0000000..80436e5
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
@@ -0,0 +1,36 @@
+/*
+ * KTJSONTypeWriterValidation.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTJSONTYPEWRITERVALIDATION_HH_
+#define NYMPH_KTJSONTYPEWRITERVALIDATION_HH_
+
+#include "KTJSONWriter.hh"
+
+namespace Nymph
+{
+    class KTTestDataExt;
+    class KTTestDerived1DataExt;
+    class KTTestDerived2DataExt;
+
+    class KTJSONTypeWriterValidation : public KTJSONTypeWriter
+    {
+        public:
+            KTJSONTypeWriterValidation( KTJSONWriter* writer );
+            virtual ~KTJSONTypeWriterValidation();
+
+            virtual void RegisterSlots();
+
+        private:
+            KTSlotData< void, KTTestDataExt > fTestSlot;
+            KTSlotData< void, KTTestDerived1DataExt > fTestDerived1Slot;
+            KTSlotData< void, KTTestDerived2DataExt > fTestDerived2Slot;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTJSONTYPEWRITERVALIDATION_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTPyTestClass.cc b/Cpp/Executables_v1/Validation/KTPyTestClass.cc
new file mode 100644
index 0000000..43c8f3b
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTPyTestClass.cc
@@ -0,0 +1,22 @@
+/*
+ * KTPyTestClass.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTPyTestClass.hh"
+
+namespace Nymph
+{
+
+    KTPyTestClass::KTPyTestClass() :
+            fValue( 5 )
+    {
+    }
+
+    KTPyTestClass::~KTPyTestClass()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTPyTestClass.hh b/Cpp/Executables_v1/Validation/KTPyTestClass.hh
new file mode 100644
index 0000000..9e6ad27
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTPyTestClass.hh
@@ -0,0 +1,44 @@
+/*
+ * KTPyTestClass.hh
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_KTPYTESTCLASS_HH_
+#define NYMPH_KTPYTESTCLASS_HH_
+
+#include <iostream>
+
+namespace Nymph
+{
+
+    class KTPyTestClass
+    {
+        public:
+            KTPyTestClass();
+            ~KTPyTestClass();
+
+            void SayHello()
+            {
+                std::cout << "Hello" << std::endl;
+            }
+
+            int GetValue()
+            {
+                return fValue;
+            }
+
+            void SetValue( int value )
+            {
+                fValue = value;
+                return;
+            }
+
+        private:
+            int fValue;
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTPYTESTCLASS_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh b/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
new file mode 100644
index 0000000..459ecce
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
@@ -0,0 +1,26 @@
+/*
+ * KTPyTestClassPybind.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTPyTestClass.hh"
+#include "KTTestProcessor.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportKTPyTestClass( pybind11::module& mod )
+    {
+        pybind11::class_< Nymph::KTPyTestClass >( mod, "KTPyTestClass" )
+                .def( pybind11::init<>() )
+                .def( "SayHello", &Nymph::KTPyTestClass::SayHello )
+                .def( "GetValue", &Nymph::KTPyTestClass::GetValue )
+                .def( "SetValue", &Nymph::KTPyTestClass::SetValue )
+                ;
+    };
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh b/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
new file mode 100644
index 0000000..efa5da6
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
@@ -0,0 +1,19 @@
+/*
+ * KTRegisterNymphValidationExtData.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_
+#define NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_
+
+#include "KTRegisterNymphExtData.hh"
+
+#include "KTTestData.hh"
+
+CEREAL_REGISTER_TYPE( Nymph::KTTestDataExt );
+CEREAL_REGISTER_TYPE( Nymph::KTTestDerived1DataExt );
+CEREAL_REGISTER_TYPE( Nymph::KTTestDerived2DataExt );
+
+#endif /* NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTTestConfigurable.cc b/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
new file mode 100644
index 0000000..c5598b9
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
@@ -0,0 +1,67 @@
+/*
+ * KTTestConfigurable.cc
+ *
+ *  Created on: Jul 25, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTLogger.hh"
+#include "KTTestConfigurable.hh"
+#include "KTCommandLineOption.hh"
+
+#include "param.hh"
+
+using std::string;
+
+namespace Nymph
+{
+    static KTCommandLineOption< int > sTestConfigStringCLO("Test Configurable", "Command-line option for testing", "int-data", 'i');
+
+    KTLOGGER(testparamlog, "KTTestConfigurable");
+
+    KTTestConfigurable::KTTestConfigurable(const std::string& name) :
+            KTConfigurable(name),
+            fIntData(-9),
+            fDoubleData(-99.),
+            fStringData("not configured")
+    {
+    }
+
+    KTTestConfigurable::~KTTestConfigurable()
+    {
+    }
+
+    bool KTTestConfigurable::Configure(const scarab::param_node& node)
+    {
+        // Config-file options
+        // option: check for data before getting it from the node
+        if (node.has("int-data"))
+        {
+            fIntData = node.get_value< int >("int-data", fIntData);
+            KTINFO(testparamlog, "Configured integer (= existing value if not provided): " << fIntData);
+        }
+
+        // option: don't check for data before getting it from the node; rely on the default if it's not there.
+        fDoubleData = node.get_value< double >("double-data", fDoubleData);
+        KTINFO(testparamlog, "Configured double (= existing value if not provided): " << fDoubleData);
+        fStringData = node.get_value("string-data", fStringData);
+        KTINFO(testparamlog, "Configured string (= existing value if not provided): " << fStringData);
+
+        // Command-line options
+        fIntData = fCLHandler->GetCommandLineValue< int >("int-data", fIntData);
+        KTINFO(testparamlog, "Configured integer from CL (= existing value if not provided): " << fIntData);
+
+        return true;
+    }
+
+    void KTTestConfigurable::PrintConfig() const
+    {
+        KTINFO(testparamlog, "Final configuration of KTTestConfigurable:\n" <<
+                "\tInt data: " << fIntData << "\n" <<
+                "\tDouble data: " << fDoubleData << "\n" <<
+                "\tString data: " << fStringData);
+        return;
+    }
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTTestConfigurable.hh b/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
new file mode 100644
index 0000000..44c473f
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
@@ -0,0 +1,53 @@
+/*
+ * KTTestConfigurable.hh
+ *
+ *  Created on: Jul 25, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTTESTCONFIGURABLE_HH_
+#define KTTESTCONFIGURABLE_HH_
+
+#include "KTConfigurable.hh"
+
+namespace Nymph
+{
+    class KTTestConfigurable : public KTConfigurable
+    {
+        public:
+            KTTestConfigurable(const std::string& name = "test-configurable");
+            virtual ~KTTestConfigurable();
+
+        public:
+            bool Configure(const scarab::param_node& node);
+
+        public:
+            int GetIntData() const;
+            double GetDoubleData() const;
+            const std::string& GetStringData() const;
+
+            void PrintConfig() const;
+
+        private:
+            int fIntData;
+            double fDoubleData;
+            std::string fStringData;
+    };
+
+    inline int KTTestConfigurable::GetIntData() const
+    {
+        return fIntData;
+    }
+
+    inline double KTTestConfigurable::GetDoubleData() const
+    {
+        return fDoubleData;
+    }
+
+    inline const std::string& KTTestConfigurable::GetStringData() const
+    {
+        return fStringData;
+    }
+
+} /* namespace Nymph */
+#endif /* KTTESTCONFIGURABLE_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTTestCuts.cc b/Cpp/Executables_v1/Validation/KTTestCuts.cc
new file mode 100644
index 0000000..d78aeba
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestCuts.cc
@@ -0,0 +1,69 @@
+/*
+ * KTTestCuts.cc
+ *
+ *  Created on: Nov 2, 2016
+ *      Author: obla999
+ */
+
+#include "KTTestCuts.hh"
+
+#include "KTLogger.hh"
+#include "KTTestData.hh"
+
+namespace Nymph
+{
+    KTLOGGER(testlog, "KTTestCuts");
+
+    KT_REGISTER_CUT(KTAwesomeCut, "awesome-cut");
+    KT_REGISTER_CUT(KTNotAwesomeCut, "not-awesome-cut"  );
+
+
+    KTAwesomeCut::KTAwesomeCut(const std::string& name) :
+            KTCutOnData(name)
+    {
+        SetApplyFunc( this, &KTAwesomeCut::Apply );
+    }
+
+    KTAwesomeCut::~KTAwesomeCut()
+    {}
+
+    bool KTAwesomeCut::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    bool KTAwesomeCut::Apply(KTCoreData& data, const KTTestData& testData)
+    {
+        bool isCut = ! testData.GetIsAwesome();
+        KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
+        KTDEBUG(testlog, "Is data cut? " << isCut);
+        data.CutStatus().SetCutState(fConfigName, isCut);
+        return isCut;
+    }
+
+
+    KTNotAwesomeCut::KTNotAwesomeCut(const std::string& name) :
+            KTCutOnData(name)
+    {
+        SetApplyFunc( this, &KTNotAwesomeCut::Apply );
+    }
+
+    KTNotAwesomeCut::~KTNotAwesomeCut()
+    {}
+
+    bool KTNotAwesomeCut::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    bool KTNotAwesomeCut::Apply(KTCoreData& data, const KTTestData& testData)
+    {
+        bool isCut = testData.GetIsAwesome();
+        KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
+        KTDEBUG(testlog, "Is data cut? " << isCut);
+        data.CutStatus().SetCutState(fConfigName, isCut);
+        return isCut;
+    }
+
+}
+
diff --git a/Cpp/Executables_v1/Validation/KTTestCuts.hh b/Cpp/Executables_v1/Validation/KTTestCuts.hh
new file mode 100644
index 0000000..5ebe0d6
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestCuts.hh
@@ -0,0 +1,48 @@
+/*
+ * KTTestCuts.hh
+ *
+ *  Created on: Nov 2, 2016
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_KTTESTCUTS_HH_
+#define NYMPH_KTTESTCUTS_HH_
+
+#include "KTCut.hh"
+#include "KTMemberVariable.hh"
+#include "KTCoreData.hh"
+
+
+namespace Nymph
+{
+    class KTTestData;
+    class KTTestDataExt;
+
+    // Cuts data that is NOT awesome
+    class KTAwesomeCut : public KTCutOnData< KTTestDataExt >
+    {
+        public:
+            KTAwesomeCut(const std::string& name = "default-awesome-cut");
+            virtual ~KTAwesomeCut();
+
+            bool Configure(const scarab::param_node& node);
+
+            bool Apply(KTCoreData& data, const KTTestData& testData);
+    };
+
+    // Cuts data that is IS awesome
+    class KTNotAwesomeCut : public KTCutOnData< KTTestDataExt >
+    {
+        public:
+            KTNotAwesomeCut(const std::string& name = "default-not-awesome-cut");
+            virtual ~KTNotAwesomeCut();
+
+            bool Configure(const scarab::param_node& node);
+
+            bool Apply(KTCoreData& data, const KTTestData& testData);
+    };
+
+}
+
+
+#endif /* NYMPH_KTTESTCUTS_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTTestData.cc b/Cpp/Executables_v1/Validation/KTTestData.cc
new file mode 100644
index 0000000..3bc6f32
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestData.cc
@@ -0,0 +1,38 @@
+/*
+ * KTTestData.cc
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+#include "KTTestData.hh"
+
+namespace Nymph
+{
+    KTTestData::KTTestData() :
+        KTData(),
+        fIsAwesome( false )
+    {
+        std::cout << "### KTTestData constructor" << std::endl;
+    }
+
+    KTTestData::~KTTestData()
+    {
+        std::cout << "### KTTestData destructor" << std::endl;
+    }
+
+    KTTestBaseData::KTTestBaseData() :
+        KTData(),
+        fFunniness(1000.)
+    {
+        std::cout << "### KTTestBaseData constructor" << std::endl;
+    }
+
+    KTTestBaseData::~KTTestBaseData()
+    {
+        std::cout << "### KTTestBaseData destructor" << std::endl;
+    }
+
+
+} /* namespace Nymph */
+
diff --git a/Cpp/Executables_v1/Validation/KTTestData.hh b/Cpp/Executables_v1/Validation/KTTestData.hh
new file mode 100644
index 0000000..c28bf55
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestData.hh
@@ -0,0 +1,71 @@
+/*
+ * KTTestData.hh
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_KTTESTDATA_HH_
+#define NYMPH_KTTESTDATA_HH_
+
+#include "KTCoreData.hh"
+#include "KTMemberVariable.hh"
+
+
+namespace Nymph
+{
+
+    class KTTestData : public KTData
+    {
+        public:
+            KTTestData();
+            virtual ~KTTestData();
+
+            MEMBERVARIABLE(bool, IsAwesome);
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+    DEFINE_EXT_DATA( KTTestData, "test" ); // defines KTTestDataExt
+
+
+    class KTTestBaseData : public KTData
+    {
+        public:
+            KTTestBaseData();
+            virtual ~KTTestBaseData();
+
+            MEMBERVARIABLE(double, Funniness);
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+    DEFINE_EXT_DATA_2( KTTestDerived1DataExt, KTTestBaseData, "test-derived-1" );
+    DEFINE_EXT_DATA_2( KTTestDerived2DataExt, KTTestBaseData, "test-derived-2" );
+
+
+    template< class Archive >
+    void KTTestData::serialize( Archive& ar )
+    {
+            std::cout << "### serialize for KTTestData" << std::endl;
+            ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fIsAwesome) );
+    }
+
+    template< class Archive >
+    void KTTestBaseData::serialize( Archive& ar )
+    {
+            std::cout << "### serialize for KTTestBaseData" << std::endl;
+            ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fFunniness) );
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTTESTDATA_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc b/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
new file mode 100644
index 0000000..218f495
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
@@ -0,0 +1,62 @@
+/*
+ * KTTestDataPrimaryProcessor.cc
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestDataPrimaryProcessor.hh"
+
+#include "KTTestData.hh"
+
+#include "KTLogger.hh"
+
+LOGGER( testlog, "KTTestDataPrimaryProcessor" );
+
+namespace Nymph
+{
+
+    KT_REGISTER_PROCESSOR( KTTestDataPrimaryProcessor, "test-data-p-proc" );
+
+    KTTestDataPrimaryProcessor::KTTestDataPrimaryProcessor( const std::string& name ) :
+            KTPrimaryProcessor( {"test-derived-1"}, name ),
+            fIterations(10),
+            fTheSignal("test-derived-1", this)
+    {
+    }
+
+    KTTestDataPrimaryProcessor::~KTTestDataPrimaryProcessor()
+    {
+    }
+
+    bool KTTestDataPrimaryProcessor::Configure( const scarab::param_node& node )
+    {
+        SetIterations( node.get_value( "iterations", GetIterations() ) );
+
+        return true;
+    }
+
+    bool KTTestDataPrimaryProcessor::Run()
+    {
+        unsigned funniness = 867;
+
+        for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
+        {
+            KTINFO( testlog, "Beginning iteration " << iIteration );
+
+            // e.g. for a real processor, do some work here instead of sleeping
+            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
+
+            if( fThreadRef && fThreadRef->GetCanceled() ) break;
+
+            KTDataHandle handle = CreateNewDataHandle();
+            KTTestDerived1DataExt& testData = handle->Of< KTTestDerived1DataExt >();
+            testData.SetFunniness( funniness++ );
+            KTINFO( testlog, "Test derived1 data funniness: " << testData.GetFunniness() );
+
+            fTheSignal( handle );
+        }
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh b/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
new file mode 100644
index 0000000..96b6955
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
@@ -0,0 +1,40 @@
+/*
+ * KTTestPrimaryProcessor.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef KTTESTDATAPRIMARYPROCESSOR_HH_
+#define KTTESTDATAPRIMARYPROCESSOR_HH_
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTMemberVariable.hh"
+#include "KTSignal.hh"
+
+namespace Nymph
+{
+
+   class KTTestDataPrimaryProcessor : public KTPrimaryProcessor
+    {
+        public:
+            KTTestDataPrimaryProcessor( const std::string& name = "test-data-p-proc" );
+            virtual ~KTTestDataPrimaryProcessor();
+
+        public:
+            bool Configure( const scarab::param_node& node );
+
+            MEMBERVARIABLE( unsigned, Iterations );
+
+        public:
+            virtual bool Run();
+
+        private:
+            KTSignalData fTheSignal;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTTESTDATAPRIMARYPROCESSOR_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc b/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
new file mode 100644
index 0000000..43692c1
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
@@ -0,0 +1,47 @@
+/*
+ * KTTestPrimaryProcessor.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+
+namespace Nymph
+{
+
+    KT_REGISTER_PROCESSOR(KTTestPrimaryProcessor, "test-p-proc");
+
+    KTTestPrimaryProcessor::KTTestPrimaryProcessor( const std::string& name ) :
+            KTPrimaryProcessor( {"the-signal"}, name ),
+            fIterations(10),
+            fTheSignal("the-signal", this)
+    {
+    }
+
+    KTTestPrimaryProcessor::~KTTestPrimaryProcessor()
+    {
+    }
+
+    bool KTTestPrimaryProcessor::Configure( const scarab::param_node& node )
+    {
+        SetIterations( node.get_value( "iterations", GetIterations() ) );
+
+        return true;
+    }
+
+    bool KTTestPrimaryProcessor::Run()
+    {
+        for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
+        {
+            // e.g. for a real processor, do some work here instead of sleeping
+            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
+
+            if( fThreadRef && fThreadRef->GetCanceled() ) break;
+
+            fTheSignal( iIteration );
+        }
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh b/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
new file mode 100644
index 0000000..4eb7639
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
@@ -0,0 +1,40 @@
+/*
+ * KTTestPrimaryProcessor.hh
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#ifndef KTTESTPRIMARYPROCESSOR_HH_
+#define KTTESTPRIMARYPROCESSOR_HH_
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTMemberVariable.hh"
+#include "KTSignal.hh"
+
+namespace Nymph
+{
+
+   class KTTestPrimaryProcessor : public KTPrimaryProcessor
+    {
+        public:
+            KTTestPrimaryProcessor( const std::string& name = "test-p-proc" );
+            virtual ~KTTestPrimaryProcessor();
+
+        public:
+            bool Configure( const scarab::param_node& node );
+
+            MEMBERVARIABLE( unsigned, Iterations );
+
+        public:
+            virtual bool Run();
+
+        private:
+            KTSignal< int > fTheSignal;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTTESTPRIMARYPROCESSOR_HH_ */
diff --git a/Cpp/Executables_v1/Validation/KTTestProcessor.cc b/Cpp/Executables_v1/Validation/KTTestProcessor.cc
new file mode 100644
index 0000000..f19a3ee
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestProcessor.cc
@@ -0,0 +1,151 @@
+/*
+ * KTTestProcessor.cc
+ *
+ *  Created on: Aug 15, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTTestProcessor.hh"
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+//#include "KTTestData.hh"
+
+namespace Nymph
+{
+    KTLOGGER(testsiglog, "KTTestProcessor")
+
+    KT_REGISTER_PROCESSOR(KTTestProcessorA, "test-proc-a");
+
+    KTTestProcessorA::KTTestProcessorA( const std::string& name ) :
+            KTProcessor( name ),
+            fTheSignal("the-signal", this)
+    {
+    }
+
+    KTTestProcessorA::~KTTestProcessorA()
+    {
+    }
+
+    bool KTTestProcessorA::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTTestProcessorA::EmitSignals(int value)
+    {
+        fTheSignal(value);
+        return;
+    }
+
+
+    KT_REGISTER_PROCESSOR(KTTestProcessorB, "test-proc-b");
+
+    KTTestProcessorB::KTTestProcessorB( const std::string& name ) :
+            KTProcessor( name ),
+            fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1),
+            fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2)
+    {
+        fSlot1Wrapper = GetSlot( "first-slot" );
+        fSlot2Wrapper = GetSlot( "second-slot" );
+    }
+
+    KTTestProcessorB::~KTTestProcessorB()
+    {
+    }
+
+    bool KTTestProcessorB::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTTestProcessorC::SlotFunc1(int input)
+    {
+        std::shared_ptr< KTThreadReference > ref = fSlot1.GetSlotWrapper()->GetThreadRef();
+
+        KTINFO(testsiglog, "Slot1: input is " << input);
+        BOOST_THROW_EXCEPTION( KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)" << eom );
+
+        return;
+    }
+
+
+    KT_REGISTER_PROCESSOR(KTTestProcessorD, "test-proc-d");
+
+    KTTestProcessorD::KTTestProcessorD( const std::string& name ) :
+            KTProcessor( name ),
+            fDataSlot("test", this, &KTTestProcessorD::AnalysisFunc),
+            fDataSignal("test", this)
+    {
+    }
+
+    KTTestProcessorD::~KTTestProcessorD()
+    {
+    }
+
+    bool KTTestProcessorD::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTTestProcessorD::EmitSignal(bool isAwesome)
+    {
+        KTDataHandle dataHandle = CreateNewDataHandle();
+        KTTestDataExt& data = dataHandle->Of< KTTestDataExt >();
+        data.SetIsAwesome(isAwesome);
+        fDataSignal(dataHandle);
+        return;
+    }
+
+    void KTTestProcessorD::AnalysisFunc(const KTTestData& data)
+    {
+        KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
+        return;
+    }
+
+
+    KT_REGISTER_PROCESSOR(KTTestProcessorE, "test-proc-e");
+
+    KTTestProcessorE::KTTestProcessorE( const std::string& name ) :
+            KTProcessor( name ),
+            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseAnalysisFunc),
+            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseAnalysisFunc),
+            fDerived1DataSignal("derived-1", this),
+            fDerived2DataSignal("derived-2", this)
+    {
+    }
+
+    KTTestProcessorE::~KTTestProcessorE()
+    {
+    }
+
+    bool KTTestProcessorE::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTTestProcessorE::EmitSignals()
+    {
+        KTDataHandle dataHandle = CreateNewDataHandle();
+
+        KTINFO(testsiglog, "Creating data objects");
+        dataHandle->Of< KTTestDerived1DataExt >();
+        dataHandle->Of< KTTestDerived2DataExt >();
+
+        KTINFO(testsiglog, "Emitting data-1 signal");
+        fDerived1DataSignal( dataHandle );
+
+        KTINFO(testsiglog, "Emitting data-2 signal");
+        fDerived2DataSignal( dataHandle );
+
+        return;
+    }
+
+    void KTTestProcessorE::BaseAnalysisFunc(const KTTestBaseData& data)
+    {
+        KTINFO(testsiglog, "Data funniness measured to be: <" << data.GetFunniness() << ">");
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Executables_v1/Validation/KTTestProcessor.hh b/Cpp/Executables_v1/Validation/KTTestProcessor.hh
new file mode 100644
index 0000000..d704f9f
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/KTTestProcessor.hh
@@ -0,0 +1,108 @@
+/*
+ * KTTestProcessor.hh
+ *
+ *  Created on: Aug 15, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTTESTPROCESSOR_HH_
+#define KTTESTPROCESSOR_HH_
+
+#include "KTProcessor.hh"
+#include "KTSlot.hh"
+
+//using namespace py;
+
+#include "KTTestData.hh"
+
+namespace Nymph
+{
+
+    /*!
+     * A simple test processor that emits a signal with an integer argument
+     */
+    class KTTestProcessorA : public KTProcessor
+    {
+        public:
+            KTTestProcessorA( const std::string& name = "test-proc-a" );
+            virtual ~KTTestProcessorA();
+
+            bool Configure(const scarab::param_node& node);
+
+            void EmitSignals(int);
+
+        private:
+            KTSignal< int > fTheSignal;
+    };
+
+    /*!
+     * A simple test processor that has two slots with integer arguments
+     */
+    class KTTestProcessorB : public KTProcessor
+    {
+        public:
+            KTTestProcessorB( const std::string& name = "test-proc-b" );
+            virtual ~KTTestProcessorB();
+
+            bool Configure(const scarab::param_node& node);
+
+        private:
+            KTSlot< int > fSlot1;
+    };
+
+
+//    class KTTestData;
+
+    /*!
+     * A simple test processor that has a slot for KTTestData
+     */
+    class KTTestProcessorD : public KTProcessor
+    {
+        public:
+            KTTestProcessorD( const std::string& name = "test-proc-d" );
+            virtual ~KTTestProcessorD();
+
+            bool Configure(const scarab::param_node& node);
+
+            // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
+            void EmitSignal(bool isAwesome = true);
+
+            void AnalysisFunc(const KTTestData& data);
+
+        private:
+            KTSlotData< void, KTTestDataExt > fDataSlot;
+
+            KTSignalData fDataSignal;
+    };
+
+
+//    template< class XDerivedDataType >
+//    class KTTestPolyDataBase< XDerivedDataType >;
+//    class KTTestDerived1Data;
+//    class KTTestDerived2Data;
+
+    /*!
+     * A simple test processor for testing polymorphic data, signals, and slots
+     */
+    class KTTestProcessorE : public KTProcessor
+    {
+        public:
+            KTTestProcessorE( const std::string& name = "test-proc-d" );
+            virtual ~KTTestProcessorE();
+
+            bool Configure(const scarab::param_node& node);
+
+            void EmitSignals();
+
+            void BaseAnalysisFunc(const KTTestBaseData& data);
+
+        private:
+            KTSlotData< void, KTTestDerived1DataExt > fDerived1DataSlot;
+            KTSlotData< void, KTTestDerived2DataExt > fDerived2DataSlot;
+
+            KTSignalData fDerived1DataSignal;
+            KTSignalData fDerived2DataSignal;
+    };
+
+} /* namespace Nymph */
+#endif /* KTTESTPROCESSOR_HH_ */
diff --git a/Cpp/Executables_v1/Validation/NymphValidationPybind.cc b/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
new file mode 100644
index 0000000..f281181
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
@@ -0,0 +1,20 @@
+/*
+ * NymphValidationPy.cc
+ *
+ *  Created on: Jan 25, 2018
+ *      Author: obla999
+ */
+
+#include "KTPyTestClassPybind.hh"
+#include "TestPythonBasics.hh"
+#include "pybind11/pybind11.h"
+#include <memory>
+
+PYBIND11_MODULE( py_nymph_validation, mod )
+{
+    Nymph::ExportKTPyTestClass( mod );
+    Nymph::ExportTestPythonBasics( mod );
+
+}
+
+
diff --git a/Cpp/Executables_v1/Validation/TestApplication.cc b/Cpp/Executables_v1/Validation/TestApplication.cc
new file mode 100644
index 0000000..f19c737
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestApplication.cc
@@ -0,0 +1,102 @@
+/*
+ * TestApplication.cc
+ *
+ *  Created on: Aug 1, 2012
+ *      Author: nsoblath
+ *
+ *  To test the command-line interface:
+ *    > TestApplication -c /path/to/TestConfigurator.json
+ *    > TestApplication -c /path/to/TestConfigurator.json --test-app-opt=blah
+ *    > TestApplication -c /path/to/TestConfigurator.json --int-data 20
+ */
+
+
+#include "KTTestConfigurable.hh"
+#include "KTApplication.hh"
+#include "KTCommandLineOption.hh"
+
+#include "param.hh"
+
+using namespace Nymph;
+using namespace std;
+
+KTLOGGER(testapplog, "TestApplication");
+
+// Add an application-specific command-line option
+static KTCommandLineOption< string > sTestAppOption("TestApplication", "Application-specific command-line option", "test-app-opt", 'a');
+
+
+int main(int argc, char** argv)
+{
+    //****************************
+    // Create the app; this performs the initial command-line processing
+    //****************************
+
+    KTApplication* app = NULL;
+    try
+    {
+        app = new KTApplication(argc, argv);
+    }
+    catch (std::exception& e)
+    {
+        KTERROR(testapplog, "Exception caught from KTApplication constructor:\n"
+                << '\t' << e.what());
+        return 0;
+    }
+
+
+    //****************************
+    // Check basic command-line reading
+    //****************************
+
+    KTINFO(testapplog, "Application: " << app->GetCommandLineHandler()->GetExecutableName());
+    KTINFO(testapplog, "Config filename: " << app->GetCommandLineHandler()->GetConfigFilename());
+
+
+    //****************************
+    // Check reading of command-line options
+    //****************************
+
+    if (app->GetCommandLineHandler()->IsCommandLineOptSet("test-app-opt"))
+    {
+        KTINFO(testapplog, "Test application option is set to value <" << app->GetCommandLineHandler()->GetCommandLineValue< string >("test-app-opt") << ">");
+    }
+    else
+    {
+        KTINFO(testapplog, "Test application option was not set");
+    }
+
+    if (app->GetCommandLineHandler()->IsCommandLineOptSet("int-data"))
+    {
+        KTINFO(testapplog, "Test option <int-data> is set to value <" << app->GetCommandLineHandler()->GetCommandLineValue< int >("int-data") << ">");
+    }
+    else
+    {
+        KTINFO(testapplog, "Test option <int-data> was not set");
+    }
+
+
+    //****************************
+    // Check reading of the config file
+    //****************************
+
+    KTTestConfigurable* testObj = new KTTestConfigurable();
+
+    const scarab::param_node& topNode = app->GetConfigurator()->Config();
+
+    if (testObj->Configure(topNode[testObj->GetConfigName()].as_node()))
+    {
+        KTINFO(testapplog, "Configuration complete:\n"
+                << "\tInt data: " << testObj->GetIntData() << '\n'
+                << "\tDouble data: " << testObj->GetDoubleData() << '\n'
+                << "\tString data: " << testObj->GetStringData());
+    }
+    else
+    {
+        KTERROR(testapplog, "Something went wrong during the configuration");
+    }
+
+    delete testObj;
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestApplyCut.cc b/Cpp/Executables_v1/Validation/TestApplyCut.cc
new file mode 100644
index 0000000..8998ac9
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestApplyCut.cc
@@ -0,0 +1,71 @@
+/*
+ * TestApplyCut.cc
+ *
+ *  Created on: Oct 07, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTTestCuts.hh"
+
+#include "KTApplyCut.hh"
+#include "KTLogger.hh"
+#include "KTTestData.hh"
+
+KTLOGGER(testlog, "TestApplyCut");
+
+using namespace Nymph;
+using namespace std;
+
+int main()
+{
+    KTDataHandle dataHandle = CreateNewDataHandle();
+    KTTestData& testData = dataHandle->Of< KTTestDataExt >();
+
+    KTCutStatus& cutStatus = dataHandle->CutStatus();
+    unsigned awesomeCutPos = 0;
+    string awesomeCutName("awesome-cut");
+    unsigned notAwesomeCutPos = 1;
+    string notAwesomeCutName("not-awesome-cut");
+    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
+    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
+    KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
+
+    KTApplyCut applyCut;
+
+    KTINFO(testlog, "Applying awesome cut");
+    applyCut.SetCut(new KTAwesomeCut());
+    applyCut.ApplyCut(dataHandle);
+
+    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+    KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
+
+    KTINFO(testlog, "Applying not-awesome cut");
+    applyCut.SelectCut("not-awesome-cut");
+    applyCut.ApplyCut(dataHandle);
+
+    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
+    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+    KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
+    KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
+    KTINFO(testlog, "Is cut with mask \"10\"? " << cutStatus.IsCut("10"));
+    KTINFO(testlog, "Is cut with mask \"11\"? " << cutStatus.IsCut("11"));
+    KTINFO(testlog, "Is cut with mask 0? " << cutStatus.IsCut(0));
+    KTINFO(testlog, "Is cut with mask 1? " << cutStatus.IsCut(1));
+    KTINFO(testlog, "Is cut with mask 2? " << cutStatus.IsCut(2));
+    KTINFO(testlog, "Is cut with mask 3? " << cutStatus.IsCut(3));
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestCacheDirectory.cc b/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
new file mode 100644
index 0000000..05b1761
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
@@ -0,0 +1,48 @@
+/*
+ * TestCacheDirectory.cc
+ *
+ *  Created on: Dec 3, 2012
+ *      Author: nsoblath
+ *
+ *      Usage:
+ *      > TestCacheDirectory
+ *
+ *      Will first test if the current directory can be used as the cache (the default condition if no other directory is specified.
+ *      Then tests if ./TestCacheDirectory can be used as the cache. This will pass if the directory exists and is read/writable.
+ */
+
+#include "KTCacheDirectory.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testlog, "TestCacheDirectory");
+
+int main()
+{
+
+    KTCacheDirectory* cacheDir = KTCacheDirectory::get_instance();
+
+    KTINFO(testlog, "Testing ./ (should pass if the current directory is read/writeable)");
+    KTINFO(testlog, "Current cache directory is: " << cacheDir->GetPath());
+    KTWARN(testlog, "Is the cache directory OK? " << cacheDir->IsReady());
+
+    KTINFO(testlog, "Testing ./TestCacheDirectory (should pass if ./TestCacheDirectory exists and is read/writeable)");
+    if (! cacheDir->SetPath("./TestCacheDirectory"))
+    {
+        KTERROR(testlog, "Error setting the path");
+    }
+    KTINFO(testlog, "Current cache directory is: " << cacheDir->GetPath());
+    KTWARN(testlog, "Is the cache directory OK? " << cacheDir->IsReady());
+
+    KTINFO(testlog, "Testing /usr/local (should fail, assuming you're not running as root)");
+    if (! cacheDir->SetPath("/usr/local"))
+    {
+        KTERROR(testlog, "Error setting the path");
+    }
+    KTINFO(testlog, "Current cache directory is: " << cacheDir->GetPath());
+    KTWARN(testlog, "Is the cache directory OK? " << cacheDir->IsReady());
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestCut.cc b/Cpp/Executables_v1/Validation/TestCut.cc
new file mode 100644
index 0000000..37b55cd
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestCut.cc
@@ -0,0 +1,81 @@
+/*
+ * TestCut.cc
+ *
+ *  Created on: Sep 29, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTTestCuts.hh"
+
+#include "KTLogger.hh"
+#include "KTTestData.hh"
+
+KTLOGGER(testlog, "TestCut");
+
+using namespace Nymph;
+using namespace std;
+
+int main()
+{
+    try
+    {
+        KTCoreDataExt data;
+        KTTestDataExt& testData = data.Of< KTTestDataExt >();
+
+        KTCutStatus& cutStatus = data.CutStatus();
+
+        KTINFO(testlog, "Assigning awesome-cut");
+        unsigned awesomeCutPos = 0;
+        string awesomeCutName("awesome-cut");
+        cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
+
+        KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
+
+        KTINFO(testlog, "Applying awesome cut");
+        KTAwesomeCut cut(awesomeCutName);
+        cut.Apply(data, testData);
+
+        KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+        KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+        KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+        KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+        KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+        KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+        KTINFO(testlog, "Current cut status: " << cutStatus);
+        KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
+
+        KTINFO(testlog, "Assigning not-awesome-cut");
+        unsigned notAwesomeCutPos = 1;
+        string notAwesomeCutName("not-awesome-cut");
+        cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
+
+        KTINFO(testlog, "Applying not-awesome cut");
+        KTNotAwesomeCut naCut(notAwesomeCutName);
+        naCut.Apply(data, testData);
+
+        KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+        KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+        KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+        KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+        KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+        KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+        KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+        KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+        KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
+        KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+        KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
+        KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
+        KTINFO(testlog, "Is cut with mask \"10\"? " << cutStatus.IsCut("10"));
+        KTINFO(testlog, "Is cut with mask \"11\"? " << cutStatus.IsCut("11"));
+        KTINFO(testlog, "Is cut with mask 0? " << cutStatus.IsCut(0));
+        KTINFO(testlog, "Is cut with mask 1? " << cutStatus.IsCut(1));
+        KTINFO(testlog, "Is cut with mask 2? " << cutStatus.IsCut(2));
+        KTINFO(testlog, "Is cut with mask 3? " << cutStatus.IsCut(3));
+    }
+    catch(std::exception& e)
+    {
+        KTERROR(testlog, "Exception caught: " << e.what());
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestCutFilter.cc b/Cpp/Executables_v1/Validation/TestCutFilter.cc
new file mode 100644
index 0000000..04a96df
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestCutFilter.cc
@@ -0,0 +1,90 @@
+/*
+ * TestCutFilter.cc
+ *
+ *  Created on: Oct 07, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTTestCuts.hh"
+
+#include "KTApplyCut.hh"
+#include "KTCutFilter.hh"
+#include "KTLogger.hh"
+#include "KTTestData.hh"
+
+KTLOGGER(testlog, "TestCutFilter");
+
+using namespace Nymph;
+using namespace std;
+
+int main()
+{
+    KTDataHandle dataHandle = CreateNewDataHandle();
+    KTTestData& testData = dataHandle->Of< KTTestDataExt >();
+
+    KTCutStatus& cutStatus = dataHandle->CutStatus();
+    unsigned awesomeCutPos = 0;
+    string awesomeCutName("awesome-cut");
+    unsigned notAwesomeCutPos = 1;
+    string notAwesomeCutName("not-awesome-cut");
+    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
+    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
+    KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
+
+    KTApplyCut applyCut;
+
+    KTINFO(testlog, "Applying awesome cut");
+    applyCut.SetCut(new KTAwesomeCut());
+    applyCut.ApplyCut(dataHandle);
+
+    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
+    KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
+
+    KTINFO(testlog, "Applying not-awesome cut");
+    applyCut.SelectCut("not-awesome-cut");
+    applyCut.ApplyCut(dataHandle);
+
+    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
+    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
+    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
+    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
+    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
+    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
+    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
+    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
+
+    KTCutFilter cutFilter;
+    KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
+
+    KTINFO(testlog, "Filtering with all cuts");
+    cutFilter.SetCutMaskAll();
+    KTINFO(testlog, "Is cut (all results)? " << cutFilter.Filter(data));
+
+    KTINFO(testlog, "Testing filter set with a string");
+    cutFilter.SetCutMask("00");
+    KTINFO(testlog, "Is cut with mask \"00\"? " << cutFilter.Filter(data));
+    cutFilter.SetCutMask("01");
+    KTINFO(testlog, "Is cut with mask \"01\"? " << cutFilter.Filter(data));
+    cutFilter.SetCutMask("10");
+    KTINFO(testlog, "Is cut with mask \"10\"? " << cutFilter.Filter(data));
+    cutFilter.SetCutMask("11");
+    KTINFO(testlog, "Is cut with mask \"11\"? " << cutFilter.Filter(data));
+
+    KTINFO(testlog, "Testing filter set with an integer");
+    cutFilter.SetCutMask(0);
+    KTINFO(testlog, "Is cut with mask 0? " << cutFilter.Filter(data));
+    cutFilter.SetCutMask(1);
+    KTINFO(testlog, "Is cut with mask 1? " << cutFilter.Filter(data));
+    cutFilter.SetCutMask(2);
+    KTINFO(testlog, "Is cut with mask 2? " << cutFilter.Filter(data));
+    cutFilter.SetCutMask(3);
+    KTINFO(testlog, "Is cut with mask 3? " << cutFilter.Filter(data));
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestData.cc b/Cpp/Executables_v1/Validation/TestData.cc
new file mode 100644
index 0000000..18ea6be
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestData.cc
@@ -0,0 +1,25 @@
+/*
+ * TestData.cc
+ *
+ *  Created on: Feb 10, 2018
+ *      Author: obla999
+ */
+
+#include "KTTestData.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+LOGGER(testlog, "TestData")
+
+int main()
+{
+
+    KTCoreDataExt data;
+    KTTestDataExt& testData = data.Of< KTTestDataExt >();
+    KTINFO(testlog, data.Name());
+    KTINFO(testlog, testData.Name());
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc b/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
new file mode 100644
index 0000000..bc4887c
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
@@ -0,0 +1,93 @@
+/*
+ * TestExceptionInSlot.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N. Oblath
+ *
+ *  Intended outcome: Exception is thrown in first-slot when the first signal (5) is emitted; the second signal should not be emitted.
+ */
+
+#include "KTTestProcessor.hh"
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+#include <boost/thread.hpp>
+#include <atomic>
+
+using namespace Nymph;
+
+KTLOGGER( testexclog, "TestExceptionInSlot" )
+
+int main()
+{
+
+    try
+    {
+        KTTestProcessorA tpA;
+        KTTestProcessorC tpC;
+
+        KTINFO( testexclog, "Connecting the-signal to first-slot" );
+        tpA.ConnectASlot( "the-signal", &tpC, "first-slot", 20 );
+
+        // setup to execute processors asynchronously
+        std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
+        tpC.GetSlot( "first-slot" )->SetThreadRef( exeThreadRef );
+
+        std::atomic< bool > canceled( false );
+
+        auto exeFunc = [&]() {
+            try
+            {
+                boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
+
+                KTINFO( testexclog, "Emitting signals" );
+
+                if( canceled.load() ) return;
+                KTINFO( testexclog, "First test signal: 5" );
+                tpA.EmitSignals( 5 );
+
+                boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
+
+                if( canceled.load() ) return;
+                KTINFO( testexclog, "Second test signal: 18" );
+                tpA.EmitSignals( 18 );
+            }
+            catch( boost::exception& e )
+            {
+                exeThreadRef->SetReturnException( boost::current_exception() );
+            }
+
+            return;
+        };
+
+        // run the thread
+        boost::thread thread( exeFunc );
+
+        // wait for a result to be set
+        exeThreadRef->GetDataPtrRetFuture().wait();
+
+        try
+        {
+            exeThreadRef->GetReturnValue();
+        }
+        catch( boost::exception& e )
+        {
+            canceled = true;
+            //ADD_ERROR_MSG( e, "Added error message!" );
+            e << KTErrorMsgInfo< struct testEIS_GetRetVal >( "Added error message!" );
+            KTERROR( testexclog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+        }
+
+        thread.join();
+
+        KTINFO( testexclog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testexclog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestExt.cc b/Cpp/Executables_v1/Validation/TestExt.cc
new file mode 100644
index 0000000..7dcbdbb
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestExt.cc
@@ -0,0 +1,79 @@
+/*
+ * TestExt.cc
+ *
+ *  Created on: Feb 11, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTLogger.hh"
+
+#include "KTExtensible.hh"
+
+KTLOGGER( testlog, "KTExtTest" );
+
+using namespace Nymph;
+
+namespace Nymph
+{
+    class MyBaseClass
+    {
+        public:
+            MyBaseClass() {}
+            virtual ~MyBaseClass() {}
+    };
+
+    class MyClass1 : public KTExtensible< MyClass1, MyBaseClass >
+    {
+        public:
+            MyClass1() : KTExtensible< MyClass1, MyBaseClass >(), fValue() {}
+            MyClass1( const MyClass1& orig ) : KTExtensible< MyClass1, MyBaseClass >( orig ), fValue( orig.fValue ) {}
+            virtual ~MyClass1() {};
+        public:
+            int fValue;
+    };
+
+    class MyClass2 : public KTExtensible< MyClass2, MyBaseClass >
+    {
+        public:
+            MyClass2() : KTExtensible< MyClass2, MyBaseClass >(), fValue() {}
+            MyClass2( const MyClass2& orig ) : KTExtensible< MyClass2, MyBaseClass >( orig ), fValue( orig.fValue ) {}
+            virtual ~MyClass2() {};
+        public:
+            int fValue;
+    };
+
+}
+
+int main()
+{
+    std::shared_ptr< MyClass1 > data1 = std::make_shared< MyClass1 >();
+    data1->fValue = 5;
+
+    MyClass2& data2 = data1->Of< MyClass2 >();
+    data2.fValue = 3;
+
+    std::shared_ptr< MyClass2 > data2Shared = data1->Share< MyClass2 >();
+
+    KTINFO( testlog, "data1 has data1: " << data1->Has< MyClass1 >() );
+    KTINFO( testlog, "data1 has data2: " << data1->Has< MyClass2 >() );
+    KTINFO( testlog, "data2 has data1: " << data2.Has< MyClass1 >() );
+    KTINFO( testlog, "data2 has data2: " << data2.Has< MyClass2 >() );
+    KTINFO( testlog, "Value of data1: " << data1->fValue );
+    KTINFO( testlog, "Value of data2: " << data2.fValue );
+    KTINFO( testlog, "Value of data2Shared: " << data2Shared->fValue );
+    KTINFO( testlog, "Size of data1: " << data1->size() );
+    KTINFO( testlog, "Size of data2: " << data2.size() );
+
+    std::shared_ptr< MyClass1 > copyOfData1 = std::make_shared< MyClass1 >( *data1 );
+    MyClass2& copyOfData2 = copyOfData1->Of< MyClass2 >();
+
+    KTINFO( testlog, "Value of data1's copy: " << copyOfData1->fValue );
+    KTINFO( testlog, "Value of data2's copy: " << copyOfData2.fValue );
+
+    std::shared_ptr< MyClass2 > detatchedCoypOfData2 = copyOfData1->Detatch< MyClass2 >();
+
+    KTINFO( testlog, "Size of copy of data1 after detatch: " << copyOfData1->size() );
+    KTINFO( testlog, "Size of detatched copy of data2: " << detatchedCoypOfData2->size() );
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestExtSerialization.cc b/Cpp/Executables_v1/Validation/TestExtSerialization.cc
new file mode 100644
index 0000000..ae14d30
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestExtSerialization.cc
@@ -0,0 +1,80 @@
+/*
+ * TestSerialization.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTLogger.hh"
+
+#include "KTTestData.hh"
+
+#include "cereal/archives/json.hpp"
+
+#include "KTRegisterNymphExtData.hh"
+
+#include <fstream>
+
+LOGGER( testlog, "TestSerialization" );
+
+using namespace Nymph;
+
+// register the data classes so they can be serialized from base-class pointers.
+// json archive is already included, so it has been registered before these classes.
+CEREAL_REGISTER_TYPE( KTTestDataExt );
+
+int main()
+{
+    const std::string filename( "test_ext_serialization_output.json" );
+
+    // save data to archive
+    {
+        std::shared_ptr< KTCoreDataExt > coreData = std::make_shared< KTCoreDataExt >();
+        std::shared_ptr< KTTestDataExt > testData = coreData->Share< KTTestDataExt >();
+        std::shared_ptr< KTTestDerived1DataExt > testD1Data = coreData->Share< KTTestDerived1DataExt >();
+
+        // change data values from their defaults
+        coreData->SetCounter( 5 );
+        testData->SetIsAwesome( true );
+        testD1Data->SetFunniness( 924 );
+
+        KTINFO( testlog, "KTCoreData counter: " << coreData->GetCounter() );
+        KTINFO( testlog, "KTTestData is-awesome: " << testData->GetIsAwesome() );
+        KTINFO( testlog, "KTTestDerived1Data funniness: " << testD1Data->GetFunniness() );
+
+        // create and open a file for output
+        std::ofstream fileOut( filename );
+
+        cereal::JSONOutputArchive archiveOut( fileOut );
+
+        KTINFO( testlog, "Writing data to JSON archive" );
+        archiveOut( coreData );
+
+        // archive and stream closed when destructors are called
+    }
+
+    // ... some time later restore the class instance to its original state
+    {
+        std::shared_ptr< KTCoreDataExt > newCoreData = std::make_shared< KTCoreDataExt >();
+
+         // create and open an archive for input
+        std::ifstream fileIn( filename );
+
+        cereal::JSONInputArchive archiveIn( fileIn );
+
+        KTINFO( testlog, "Reading data from JSON archive" );
+        archiveIn( newCoreData );
+
+        std::shared_ptr< KTTestDataExt > newTestData = newCoreData->Share< KTTestDataExt >();
+        std::shared_ptr< KTTestDerived1DataExt > newD1Data = newCoreData->Share< KTTestDerived1DataExt >();
+
+        KTINFO(testlog, "KTCoreData counter: " << newCoreData->GetCounter());
+        KTINFO(testlog, "KTTestData is-awesome: " << newTestData->GetIsAwesome());
+        KTINFO( testlog, "KTTestDerived1Data funniness: " << newD1Data->GetFunniness() );
+
+        // archive and stream closed when destructors are called
+    }
+
+    return 0;
+}
+
diff --git a/Cpp/Executables_v1/Validation/TestJSONWriter.cc b/Cpp/Executables_v1/Validation/TestJSONWriter.cc
new file mode 100644
index 0000000..79f27bd
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestJSONWriter.cc
@@ -0,0 +1,52 @@
+/*
+ *	TestSerialWriter.cc
+ *
+ *	Created on: Feb 1, 2018
+ * 		Author: E Zayas
+ *
+*/
+
+#include "../../Library/IO/KTJSONWriter.hh"
+#include "KTJSONReader.hh"
+#include "KTTestData.hh" 
+
+KTLOGGER( testlog, "TestJSONWriter" );
+
+using namespace Nymph;
+
+int main()
+{
+    std::string filename( "test_json_writer_output.json" );
+
+    {
+        // Create the test data
+        KTTestData testData;
+        testData.SetIsAwesome( true ); // because it isn't by default :(
+
+        KTINFO( testlog, "KTTestData is awesome? " << testData.GetIsAwesome() );
+
+        // Create the writer
+        KTJSONWriter writer;
+        writer.SetFilename( filename );
+
+        KTINFO( testlog, "Writing data" );
+
+        writer.WriteData< KTTestData >( testData );
+
+        // destruction of the stream and archive (in the writer's destructor) properly closes the file
+    }
+/*
+    {
+        KTTestData newTestData;
+
+        KTJSONReader reader;
+        reader.SetFilename( filename );
+
+        reader.ReadData< KTTestData >( newTestData );
+
+        KTINFO( testlog, "Is the read data awesome? " << newTestData.GetIsAwesome() );
+    }
+*/
+    KTINFO( testlog, "Validation script concluded" );
+	return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc b/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
new file mode 100644
index 0000000..d757587
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
@@ -0,0 +1,84 @@
+/*
+ * TestJSONWriterViaSlot.cc
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTJSONTypeWriterValidation.hh"
+#include "KTTestDataPrimaryProcessor.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testlog, "TestJSONWriterViaSlot" )
+
+int main()
+{
+
+    try
+    {
+        KTPROG( testlog, "Testing single-data-object writing" );
+
+        KTINFO( testlog, "Creating processors" );
+        KTTestDataPrimaryProcessor tdpp;
+        KTJSONWriter jw;
+
+        KTINFO( testlog, "Configuring processors" );
+        scarab::param_node jwConfig;
+        jwConfig.add( "filename", scarab::param_value( "test_jsonwriter_slot_singleobj.json" ) );
+        jw.Configure( jwConfig );
+
+        KTINFO( testlog, "Connecting the-signal to first-slot" );
+        tdpp.ConnectASlot( "test-derived-1", &jw, "test-derived-1", 20 );
+
+        KTINFO( testlog, "Running the primary processor" )
+
+        if( ! tdpp.Run() )
+        {
+            KTERROR( testlog, "Something went wrong while running the primary processor" );
+            return -1;
+        }
+
+        KTINFO( testlog, "Test complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testlog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    try
+    {
+        KTPROG( testlog, "Testing extensible-data-object writing" );
+
+        KTINFO( testlog, "Creating processors" );
+        KTTestDataPrimaryProcessor tdpp;
+        KTJSONWriter jw;
+
+        KTINFO( testlog, "Configuring processors" );
+        scarab::param_node jwConfig;
+        jwConfig.add( "filename", scarab::param_value( "test_jsonwriter_slot_extdata.json" ) );
+        jw.Configure( jwConfig );
+
+        KTINFO( testlog, "Connecting the-signal to first-slot" );
+        tdpp.ConnectASlot( "test-derived-1", &jw, "ext-data", 20 );
+
+        KTINFO( testlog, "Running the primary processor" )
+
+        if( ! tdpp.Run() )
+        {
+            KTERROR( testlog, "Something went wrong while running the primary processor" );
+            return -1;
+        }
+
+        KTINFO( testlog, "Test complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testlog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestLogger.cc b/Cpp/Executables_v1/Validation/TestLogger.cc
new file mode 100644
index 0000000..4190f03
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestLogger.cc
@@ -0,0 +1,33 @@
+/*
+ * TestLogger.cc
+ *
+ *  Created on: May 01, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTLogger.hh"
+
+#include <exception>
+#include <iostream>
+
+KTLOGGER(logger, "TestLogger")
+
+int main()
+{
+    try
+    {
+        KTTRACE(logger, "This is a TRACE message from Nymph");
+        KTDEBUG(logger, "This is a DEBUG message from Nymph");
+        KTINFO(logger, "This is an INFO message from Nymph");
+        KTPROG(logger, "This is a PROG message from Nymph");
+        KTWARN(logger, "This is a WARN message from Nymph");
+        KTERROR(logger, "This is an ERROR message from Nymph");
+        KTFATAL(logger, "This is a FATAL message from Nymph");
+    }
+    catch (std::exception& e)
+    {
+        std::cout << "Exception caught: " << e.what() << std::endl;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestParamBindings.py b/Cpp/Executables_v1/Validation/TestParamBindings.py
new file mode 100644
index 0000000..5608755
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestParamBindings.py
@@ -0,0 +1,51 @@
+# Demonstrates access to param classes
+
+import py_nymph as nymph
+
+# want to instantiate this will enough values to test all types: 
+# # TypeError: get_value(): incompatible function arguments. The following argument types are supported:
+#     1. (self: py_nymph.ParamNodePybind, arg0: str) -> bool
+#     2. (self: py_nymph.ParamNodePybind, arg0: str) -> int
+#     3. (self: py_nymph.ParamNodePybind, arg0: str) -> int
+#     4. (self: py_nymph.ParamNodePybind, arg0: str) -> float
+#     5. (self: py_nymph.ParamNodePybind, arg0: str) -> str
+#     6. (self: py_nymph.ParamNodePybind, arg0: str, arg1: bool) -> bool
+#     7. (self: py_nymph.ParamNodePybind, arg0: str, arg1: int) -> int
+#     8. (self: py_nymph.ParamNodePybind, arg0: str, arg1: int) -> int
+#     9. (self: py_nymph.ParamNodePybind, arg0: str, arg1: float) -> float
+#     10. (self: py_nymph.ParamNodePybind, arg0: str, arg1: str) -> str
+
+
+# Value testing
+int_value = nymph.param_value(5)
+print("What type of value is stored? (bool, uint, int, double, string): ", int_value.is_bool(), int_value.is_uint(), int_value.is_int(), int_value.is_double(), int_value.is_string())
+print("Get value set to 5:", int_value.as_int())
+
+string_value = nymph.param_value("Hello!")
+print("What type of value is stored? (bool, uint, int, double, string): ", string_value.is_bool(), string_value.is_uint(), string_value.is_int(), string_value.is_double(), string_value.is_string())
+print("Get value set to \"Hello!\":", string_value.as_string())
+
+
+# Node testing
+a_node = nymph.param_node()
+a_node.add("int-value", int_value)
+a_node.add("string-value", string_value)
+
+print("Int value from node:", a_node.get_value_int("int-value"))
+print("String value from node:", a_node.get_value_string("string-value"))
+
+# Test the "get_value" function for all the different types: 
+print("Get int value from the node as different types (bool, uint, int, double, string): ", a_node.get_value_bool("int-value"), a_node.get_value_uint("int-value"), a_node.get_value_int("int-value"), a_node.get_value_double("int-value"), a_node.get_value_string("int-value"))
+
+
+# Array testing
+an_array = nymph.param_array()
+an_array.resize(2)
+an_array.assign(0, int_value)
+an_array.assign(1, string_value)
+
+print("Int value from array:", an_array.get_value_int(0))
+print("String value from array:", an_array.get_value_string(1))
+
+# Test the "get_value" function for all the different types: 
+print("Get int value from the array as different types (bool, uint, int, double, string): ", an_array.get_value_bool(0), an_array.get_value_uint(0), an_array.get_value_int(0), an_array.get_value_double(0), an_array.get_value_string(0))
diff --git a/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc b/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
new file mode 100644
index 0000000..76b03e8
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
@@ -0,0 +1,41 @@
+/*
+ * TestSlotData.cc
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+
+#include "KTTestData.hh"
+#include "KTTestProcessor.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testslotdata, "TestPolymorphicSlotData")
+
+int main()
+{
+    try
+    {
+        KTTestProcessorE tpE;
+
+        KTINFO(testslotdata, "Connecting derived-1 to derived-1 and derived-2 to derived-2");
+        // for simplicity the signal and slot are in the same processor, but that need not be, of course
+        tpE.ConnectASlot("derived-1", &tpE, "derived-1" );
+        tpE.ConnectASlot("derived-2", &tpE, "derived-2" );
+
+        KTINFO(testslotdata, "Emitting signals");
+        tpE.EmitSignals();
+
+        KTINFO(testslotdata, "Tests complete");
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testslotdata, "An exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
+
diff --git a/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc b/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
new file mode 100644
index 0000000..0fc9499
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
@@ -0,0 +1,72 @@
+/*
+ * TestPrimaryProcessor.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+#include "KTTestProcessor.hh"
+
+#include "KTLogger.hh"
+
+#include <boost/thread.hpp>
+
+using namespace Nymph;
+
+KTLOGGER( testpplog, "TestPrimaryProcessor" )
+
+int main()
+{
+
+    try
+    {
+        KTTestPrimaryProcessor tpp;
+        KTTestProcessorB tp;
+
+        KTINFO( testpplog, "Connecting the-signal to first-slot" );
+        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
+
+        // setup to execute processors asynchronously
+        std::shared_ptr< KTThreadReference > exeThreadRef( std::make_shared< KTThreadReference >() );
+        exeThreadRef->Name() = std::string( "tpp" );
+
+        // run the thread
+        boost::condition_variable threadStartedCV;
+        boost::mutex threadStartedMutex;
+        bool threadStartedFlag = false;
+
+        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
+        boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
+
+        while( ! threadStartedFlag )
+        {
+            threadStartedCV.wait( threadStartedLock );
+        }
+        KTDEBUG( testpplog, "Thread has started" );
+
+        // wait for a result to be set
+        exeThreadRef->GetDataPtrRetFuture().wait();
+
+        try
+        {
+            exeThreadRef->GetReturnValue();
+        }
+        catch( boost::exception& e )
+        {
+            exeThreadRef->SetCanceled( true );
+            KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
+        }
+
+        thread.join();
+
+        KTINFO( testpplog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testpplog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc b/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
new file mode 100644
index 0000000..4ee12de
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
@@ -0,0 +1,45 @@
+/*
+ * TestPrimaryProcessorNoThreading.cc
+ *
+ *  Created on: May 5, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTTestPrimaryProcessor.hh"
+#include "KTTestProcessor.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testpplog, "TestPrimaryProcessorNoThreading" )
+
+int main()
+{
+
+    try
+    {
+        KTTestPrimaryProcessor tpp;
+        KTTestProcessorB tp;
+
+        KTINFO( testpplog, "Connecting the-signal to first-slot" );
+        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
+
+        KTINFO( testpplog, "Running the primary processor" )
+
+        if( ! tpp.Run() )
+        {
+            KTERROR( testpplog, "Something went wrong while running the primary processor" );
+            return -1;
+        }
+
+        KTINFO( testpplog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testpplog, "An unexpected exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestPrintData.cc b/Cpp/Executables_v1/Validation/TestPrintData.cc
new file mode 100644
index 0000000..f22bf19
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPrintData.cc
@@ -0,0 +1,41 @@
+/*
+ * TestPrintData.cc
+ *
+ *  Created on: Oct 07, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTLogger.hh"
+#include "KTPrintDataStructure.hh"
+
+#include "KTTestCuts.hh"
+
+KTLOGGER(testlog, "TestPrintData");
+
+using namespace Nymph;
+using namespace std;
+
+int main()
+{
+    KTDataHandle dataHandle = CreateNewDataHandle();
+    KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
+    KTTestDataExt& testData = dataHandle->Of< KTTestDataExt >();
+
+    KTINFO(testlog, "Applying awesome cut");
+    KTAwesomeCut cut;
+    cut.Apply(data, testData);
+
+    KTINFO(testlog, "Applying not-awesome cut");
+    KTNotAwesomeCut naCut;
+    naCut.Apply(data, testData);
+
+    KTPrintDataStructure printer;
+
+    KTINFO(testlog, "Printing data structure");
+    printer.PrintDataStructure(dataHandle);
+
+    KTINFO(testlog, "Printing cut structure");
+    printer.PrintCutStructure(dataHandle);
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolbox.py b/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
new file mode 100644
index 0000000..8453a79
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
@@ -0,0 +1,27 @@
+# TestProcessorToolbox.py
+#  Created on: Jan 29, 2018
+#      Author: N.S. Oblath
+#
+#  Tests the ability to use the processor toolbox from a Python script
+
+import py_nymph as nymph
+import py_nymph_validation as nv
+
+
+ptb = nymph.KTProcessorToolbox('pt')
+
+print('Configuring')
+
+ptb.AddProcessor('test-p-proc', 'tpp')
+ptb.AddProcessor('test-proc-b', 'tp')
+ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
+
+
+ptb.PushBackToRunQueue('tpp')
+
+print('Running')
+
+ptb.Run()
+
+print('All done')
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc b/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
new file mode 100644
index 0000000..65cb6dd
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
@@ -0,0 +1,114 @@
+/*
+ * TestProcessorToolboxMultithreaded.cc
+ *
+ *  Created on: May 8, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestProcessorToolbox" )
+
+int main()
+{
+    try
+    {
+        KTINFO( testptlog, "Preparing to run" );
+
+        KTProcessorToolbox ptb;
+
+        // add the primary processor, thread 1
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
+            return -1;
+        }
+
+        // add processor b, thread 1
+        if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
+            return -1;
+        }
+
+        // add the primary processor, thread 2
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
+            return -1;
+        }
+
+        // add processor b, thread 2
+        if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
+            return -1;
+        }
+
+        // set breakpoint, thread 1
+        if( ! ptb.SetBreakpoint( "tp1", "first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to set the breakpoint" );
+            return -1;
+        }
+
+        // no breakpoint, thread2
+
+        // make connections, thread 1
+        if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
+            return -1;
+        }
+
+        // make connections, thread 2
+        if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:second-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
+            return -1;
+        }
+
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
+        {
+            KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
+            return -1;
+        }
+
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        KTINFO( testptlog, "Starting asynchronous breakpoint user" );
+        auto buFuture = boost::async( boost::launch::async, [&](){
+            KTINFO( testptlog, "In breakpoint user thread" );
+            while( ptb.WaitForBreak() )
+            {
+                KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
+                std::string temp;
+                KTPROG( testptlog, "Please press [return]" );
+                getline( std::cin, temp );
+                ptb.Continue();
+            }
+            KTINFO( testptlog, "Finished breakpoint user thread" );
+            return;
+        });
+
+        KTINFO( testptlog, "Waiting for the end of the run" );
+        ptb.WaitForEndOfRun();
+
+        KTINFO( testptlog, "Processing complete" );
+
+        KTINFO( testptlog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc b/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
new file mode 100644
index 0000000..de583b9
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
@@ -0,0 +1,76 @@
+/*
+ * TestProcessorToolboxMultithreaded.cc
+ *
+ *  Created on: May 8, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestProcessorToolboxMultithreaded" )
+
+int main()
+{
+    try
+    {
+        KTINFO( testptlog, "Preparing to run" );
+
+        KTProcessorToolbox ptb;
+
+        // set for multi-threaded running
+        ptb.SetRunSingleThreaded( false );
+
+        // add the primary processor
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor" );
+            return -1;
+        }
+
+        // add processor b
+        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b" );
+            return -1;
+        }
+
+        // make connections
+        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp to tp" );
+            return -1;
+        }
+
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to add tpp to the run queue" );
+            return -1;
+        }
+
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        // wait for run completion, and ignore breakpoints
+        while( ptb.WaitForBreak() )
+        {
+            KTINFO( testptlog, "Reached breakpoint; continuing" );
+            ptb.Continue();
+        }
+
+        KTINFO( testptlog, "Processing complete" );
+
+        KTINFO( testptlog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc b/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
new file mode 100644
index 0000000..5e91926
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
@@ -0,0 +1,77 @@
+/*
+ * TestProcessorToolboxSinglethreaded.cc
+ *
+ *  Created on: May 4, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestProcessorToolboxSinglethreaded" )
+
+int main()
+{
+    try
+    {
+        KTINFO( testptlog, "Preparing to run" );
+
+        KTProcessorToolbox ptb;
+
+        // set for single-threaded running
+        ptb.SetRunSingleThreaded( true );
+
+        // add the primary processor
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor" );
+            return -1;
+        }
+
+        // add processor b
+        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b" );
+            return -1;
+        }
+
+        // make connections
+        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp to tp" );
+            return -1;
+        }
+
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to add tpp to the run queue" );
+            return -1;
+        }
+
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        // wait for run completion, and ignore breakpoints
+        while( ptb.WaitForBreak() )
+        {
+            KTINFO( testptlog, "Reached breakpoint; continuing" );
+            ptb.Continue();
+        }
+
+        KTINFO( testptlog, "Processing complete" );
+
+        KTINFO( testptlog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestPyTestClass.py b/Cpp/Executables_v1/Validation/TestPyTestClass.py
new file mode 100644
index 0000000..1db0264
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPyTestClass.py
@@ -0,0 +1,13 @@
+# TestPyTestClass.py
+#  Created on: Feb 1, 2018
+#      Author: C. Claessens
+#
+# Demonstrates access to KTPyTestClass
+
+import py_nymph_validation as nv
+
+ptc = nv.KTPyTestClass()
+
+print( 'Ok, KTPyTestClass, say hello . . .' )
+print( ptc.SayHello() )
+print( 'This should print the default value of KTPyTestClass::fValue, which is 5:', ptc.GetValue() )
diff --git a/Cpp/Executables_v1/Validation/TestPythonBasics.hh b/Cpp/Executables_v1/Validation/TestPythonBasics.hh
new file mode 100644
index 0000000..f1f6ef0
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPythonBasics.hh
@@ -0,0 +1,26 @@
+/*
+ * TestPythonBasics.hh
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "pybind11/pybind11.h"
+
+
+namespace Nymph
+{
+    namespace PyTest
+    {
+        int add( int i, int j )
+        {
+            return i + j;
+        }
+    }
+
+    void ExportTestPythonBasics( pybind11::module& mod )
+    {
+        mod.def( "add", &PyTest::add, "A function that adds two integers" );
+    }
+
+}
diff --git a/Cpp/Executables_v1/Validation/TestPythonBasics.py b/Cpp/Executables_v1/Validation/TestPythonBasics.py
new file mode 100644
index 0000000..0babf31
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestPythonBasics.py
@@ -0,0 +1,10 @@
+# TestPythonBasics.py
+#  Created on: Jan 29, 2018
+#      Author: N.S. Oblath
+#
+# Verifies that we can import Nymph python modules and call wrapped functions.
+# Uses Nymph::PyTest::add(), which is defined in TestPythonBasics.cc
+
+import py_nymph_validation
+
+print( '1 + 2 =', py_nymph_validation.add(1, 2) )
diff --git a/Cpp/Executables_v1/Validation/TestSerialization.cc b/Cpp/Executables_v1/Validation/TestSerialization.cc
new file mode 100644
index 0000000..ab97d7b
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestSerialization.cc
@@ -0,0 +1,73 @@
+/*
+ * TestSerialization.cc
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: obla999
+ */
+
+#include "KTLogger.hh"
+
+#include "KTTestData.hh"
+
+#include "cereal/archives/json.hpp"
+
+#include <fstream>
+
+LOGGER( testlog, "TestSerialization" );
+
+using namespace Nymph;
+
+int main()
+{
+    const std::string filename( "test_serialization_output.json" );
+
+    // save data to archive
+    {
+        KTCoreData coreData;
+        KTTestData testData;
+        KTTestBaseData testBaseData;
+
+        // change data values from their defaults
+        coreData.SetCounter( 5 );
+        testData.SetIsAwesome( true );
+        testBaseData.SetFunniness( 923 );
+
+        KTINFO( testlog, "KTCoreData counter: " << coreData.GetCounter() );
+        KTINFO( testlog, "KTTestData is-awesome: " << testData.GetIsAwesome() );
+        KTINFO( testlog, "KTTestBaseData funniness: " << testBaseData.GetFunniness() );
+
+        // create and open a file for output
+        std::ofstream fileOut( filename );
+
+        cereal::JSONOutputArchive archiveOut( fileOut );
+
+        KTINFO( testlog, "Writing data to JSON archive" );
+        archiveOut( CEREAL_NVP(coreData), CEREAL_NVP(testData), CEREAL_NVP(testBaseData) );
+
+        // archive and stream closed when destructors are called
+    }
+
+    // ... some time later restore the class instance to its original state
+    {
+        KTCoreData newCoreData;
+        KTTestData newTestData;
+        KTTestBaseData newTestBaseData;
+
+         // create and open an archive for input
+        std::ifstream fileIn( filename );
+
+        cereal::JSONInputArchive archiveIn( fileIn );
+
+        KTINFO( testlog, "Reading data from JSON archive" );
+        archiveIn( newCoreData, newTestData, newTestBaseData );
+
+        KTINFO( testlog, "KTCoreData counter: " << newCoreData.GetCounter() );
+        KTINFO( testlog, "KTTestData is-awesome: " << newTestData.GetIsAwesome() );
+        KTINFO( testlog, "KTTestBaseData funniness: " << newTestBaseData.GetFunniness() );
+
+        // archive and stream closed when destructors are called
+    }
+
+    return 0;
+}
+
diff --git a/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc b/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
new file mode 100644
index 0000000..6d11dd2
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
@@ -0,0 +1,58 @@
+/*
+ * TestSignalsAndSlots.cc
+ *
+ *  Created on: Aug 15, 2012
+ *      Author: nsoblath
+ */
+
+
+#include "KTTestProcessor.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testsiglog, "TestSignalsAndSlots")
+
+int main()
+{
+    try
+    {
+        KTTestProcessorA tpA;
+        KTTestProcessorB tpB;
+
+        /* Basic Test
+        KTSignalWrapper* signalPtr = tpA.GetSignal("the_signal");
+        KTSlotWrapper* slot1Ptr = tpB.GetSlot("first_slot");
+
+        slot1Ptr->SetConnection(signalPtr);
+
+        tpA.EmitSignals(5);
+
+        slot1Ptr->Disconnect();
+
+        return 0;
+        */
+
+        /* More Complicated Test */
+        KTINFO(testsiglog, "Connecting the-signal to first-slot and second-slot");
+        tpA.ConnectASlot("the-signal", &tpB, "first-slot", 20);
+        tpB.ConnectASignal(&tpA, "the-signal", "second-slot", 10);
+
+        KTINFO(testsiglog, "Emitting signals");
+        KTINFO(testsiglog, "First test signal: 5");
+        tpA.EmitSignals(5);
+        KTINFO(testsiglog, "Second test signal: 18");
+        tpA.EmitSignals(18);
+
+        KTINFO(testsiglog, "Tests complete");
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testsiglog, "An exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+    /**/
+}
+
diff --git a/Cpp/Executables_v1/Validation/TestSlotData.cc b/Cpp/Executables_v1/Validation/TestSlotData.cc
new file mode 100644
index 0000000..52853d8
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestSlotData.cc
@@ -0,0 +1,43 @@
+/*
+ * TestSlotData.cc
+ *
+ *  Created on: Jun 1, 2017
+ *      Author: obla999
+ */
+
+
+#include "KTTestData.hh"
+#include "KTTestProcessor.hh"
+#include "KTLogger.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testslotdata, "TestSlotData")
+
+int main()
+{
+    try
+    {
+        KTTestProcessorD tpD;
+
+        KTINFO(testslotdata, "Connecting test-data-signal to test-data-slot");
+        // for simplicity the signal and slot are in the same processor, but that need not be, of course
+        tpD.ConnectASlot("test", &tpD, "test" );
+
+        KTINFO(testslotdata, "Emitting signals");
+        KTINFO(testslotdata, "First test signal: true");
+        tpD.EmitSignal(true);
+        KTINFO(testslotdata, "Second test signal: false");
+        tpD.EmitSignal(false);
+
+        KTINFO(testslotdata, "Tests complete");
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testslotdata, "An exception was caught: " << diagnostic_information( e ) );
+        return -1;
+    }
+
+    return 0;
+}
+
diff --git a/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc b/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
new file mode 100644
index 0000000..a59d0d1
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
@@ -0,0 +1,45 @@
+/*
+ * TestThroughputProfiler.cc
+ *
+ *  Created on: Dec 2, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTLogger.hh"
+#include "KTThroughputProfiler.hh"
+
+using namespace Nymph;
+
+KTLOGGER(testlog, "TestThroughputProfiler");
+
+int main()
+{
+    KTThroughputProfiler prof;
+
+    unsigned nIterations = 1000000;
+    unsigned sum = 0;
+    KTINFO(testlog, "Test 1: " << nIterations << " iterations");
+    prof.Start();
+    for (unsigned i=0; i<nIterations; i++)
+    {
+        sum++;
+    }
+    prof.Stop();
+    timespec diff = prof.Elapsed();
+    KTINFO(testlog, "Elapsed time: " << diff.tv_sec << " sec and " << diff.tv_nsec << " nsec");
+
+    nIterations = 5000000;
+    sum = 0;
+    KTINFO(testlog, "Test 2: " << nIterations << " iterations");
+    prof.Start();
+    for (unsigned i=0; i<nIterations; i++)
+    {
+        sum++;
+    }
+    prof.Stop();
+    diff = prof.Elapsed();
+    KTINFO(testlog, "Elapsed time: " << diff.tv_sec << " sec and " << diff.tv_nsec << " nsec");
+
+    return 0;
+}
+
diff --git a/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc b/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
new file mode 100644
index 0000000..e9f76f4
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
@@ -0,0 +1,93 @@
+/*
+ * TestUseBreakpoint.cc
+ *
+ *  Created on: May 5, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTLogger.hh"
+
+
+using namespace Nymph;
+
+KTLOGGER( testptlog, "TestUseBreakpoint" )
+
+int main()
+{
+    try
+    {
+        KTINFO( testptlog, "Preparing to run" );
+
+        KTProcessorToolbox ptb;
+
+        // add the primary processor
+        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test primary processor" );
+            return -1;
+        }
+
+        // add processor b
+        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
+        {
+            KTERROR( testptlog, "Unable to create test processor b" );
+            return -1;
+        }
+        // set breakpoint
+        if( ! ptb.SetBreakpoint( "tp", "first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to set the breakpoint" );
+            return -1;
+        }
+
+        // make connections
+        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
+        {
+            KTERROR( testptlog, "Unable to connect tpp to tp" );
+            return -1;
+        }
+
+        // set the run queue
+        if( ! ptb.PushBackToRunQueue( "tpp" ) )
+        {
+            KTERROR( testptlog, "Unable to add tpp to the run queue" );
+            return -1;
+        }
+
+        // go!
+        KTINFO( testptlog, "Starting asynchronous run" );
+        ptb.AsyncRun();
+
+        KTINFO( testptlog, "Starting asynchronous breakpoint user" );
+        auto buFuture = boost::async( boost::launch::async, [&](){
+            KTINFO( testptlog, "In breakpoint user thread" );
+            while( ptb.WaitForBreak() )
+            {
+                KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
+                std::string temp;
+                KTPROG( testptlog, "Please press [return]" );
+                getline( std::cin, temp );
+                ptb.Continue();
+            }
+            KTINFO( testptlog, "Finished breakpoint user thread" );
+            return;
+        });
+
+        KTINFO( testptlog, "Waiting for the end of the run" );
+        ptb.WaitForEndOfRun();
+
+        KTINFO( testptlog, "Processing complete" );
+
+        ptb.JoinRunThread();
+
+        KTINFO( testptlog, "Tests complete" );
+    }
+    catch( boost::exception& e )
+    {
+        KTERROR( testptlog, "Caught exception: " << diagnostic_information( e ) );
+    }
+
+    return 0;
+}
diff --git a/Cpp/Executables_v1/Validation/TestWrapProcessor.py b/Cpp/Executables_v1/Validation/TestWrapProcessor.py
new file mode 100644
index 0000000..75337ad
--- /dev/null
+++ b/Cpp/Executables_v1/Validation/TestWrapProcessor.py
@@ -0,0 +1,51 @@
+# TestWrapProcessor.py
+#  Created on: Feb 1, 2018
+#      Author: C. Claessens
+#
+#  Tests the ability to overwrite processor functions
+
+import py_nymph as nymph
+import py_nymph_validation as nv
+
+class WrappedProcessor(nymph.WrapProcessor):
+    pass
+
+print("\nMaking instace in python of class WrappedProcessor that inherits from nymph.WrapProcessor.\n")
+p = WrappedProcessor()
+
+
+ptb = nymph.KTProcessorToolbox('pt')
+
+print('Configuring')
+ptb.AddProcessor('test-p-proc', 'tpp')
+ptb.AddProcessor('bwp', p)
+ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
+
+ptb.PushBackToRunQueue('tpp')
+
+
+print("\nBefore running: Overwrite WrapFunction that will be called from the slot function.\n")
+p.WrapFunction = lambda x: print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(p.fThreshold))
+
+
+print("Add a new variable to the processor.\n")
+p.fThreshold = 6
+print('Property fThreshold from python processor is {}.\n'.format(p.fThreshold))
+
+
+print('Define new Configure method to set self.fThreshold.\n')
+def Configure(self, a):
+    print('In Configure: Setting new fThreshold.\n')
+    self.fThreshold = a
+    
+p.Configure = Configure
+p.Configure(p, 7)
+
+
+
+
+print('Running')
+
+ptb.Run()
+
+print('All done')
\ No newline at end of file
diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
new file mode 100644
index 0000000..bf91763
--- /dev/null
+++ b/Cpp/Library/CMakeLists.txt
@@ -0,0 +1,63 @@
+# CMakeLists for Nymph/Cpp/Library
+# Author: N.S. Oblath
+
+set( UTIL_DIR Utility )
+set( DATA_DIR Data )
+set( PROC_DIR Processor )
+#set( IO_DIR IO )
+#set( APPL_DIR Application )
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
+    #${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
+)
+
+set( NYMPH_HEADERFILES
+    ${UTIL_DIR}/Exception.hh
+    ${UTIL_DIR}/MemberVariable.hh
+
+    ${DATA_DIR}/Data.hh
+    ${DATA_DIR}/DataFrame.hh
+    
+    ${PROC_DIR}/ControlAccess.hh
+    ${PROC_DIR}/PrimaryProcessor.hh
+    ${PROC_DIR}/Processor.hh
+    ${PROC_DIR}/ProcessorToolbox.hh
+    ${PROC_DIR}/QuitThread.hh
+    ${PROC_DIR}/ReturnBuffer.hh
+    ${PROC_DIR}/SignalSlotBase.hh
+
+)
+
+set( NYMPH_SOURCEFILES
+    ${UTIL_DIR}/Exception.cc
+
+    ${DATA_DIR}/Data.cc
+    ${DATA_DIR}/DataFrame.cc
+    
+    ${PROC_DIR}/ControlAccess.cc
+    ${PROC_DIR}/PrimaryProcessor.cc
+    ${PROC_DIR}/Processor.cc
+    ${PROC_DIR}/ProcessorToolbox.cc
+    ${PROC_DIR}/ReturnBuffer.cc
+    ${PROC_DIR}/SignalSlotBase.cc
+)
+
+
+##################################################
+
+pbuilder_library( 
+    TARGET Nymph 
+    SOURCES ${NYMPH_SOURCEFILES}
+    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS Nymph
+)
+
+pbuilder_install_headers( ${NYMPH_HEADERFILES} )
diff --git a/Cpp/Library/Data/Data.cc b/Cpp/Library/Data/Data.cc
new file mode 100644
index 0000000..12be720
--- /dev/null
+++ b/Cpp/Library/Data/Data.cc
@@ -0,0 +1,18 @@
+/*
+ *  Data.cc
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "Data.hh"
+
+namespace Nymph
+{
+    Data::Data()
+    {}
+
+    Data::~Data()
+    {}
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Data/Data.hh b/Cpp/Library/Data/Data.hh
new file mode 100644
index 0000000..590deca
--- /dev/null
+++ b/Cpp/Library/Data/Data.hh
@@ -0,0 +1,24 @@
+/*
+ *  Data.hh
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#ifndef NYMPH_DATA_HH_
+#define NYMPH_DATA_HH_
+
+namespace Nymph
+{
+
+    class Data
+    {
+        public:
+            Data();
+            virtual ~Data();
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATA_HH_ */
diff --git a/Cpp/Library/Data/DataFrame.cc b/Cpp/Library/Data/DataFrame.cc
new file mode 100644
index 0000000..1224059
--- /dev/null
+++ b/Cpp/Library/Data/DataFrame.cc
@@ -0,0 +1,19 @@
+/*
+ *  DataFrame.cc
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "DataFrame.hh"
+
+namespace Nymph
+{
+    DataFrame::DataFrame() :
+        fDataObjects()
+    {}
+
+    DataFrame::~DataFrame()
+    {}
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Data/DataFrame.hh b/Cpp/Library/Data/DataFrame.hh
new file mode 100644
index 0000000..1fb1944
--- /dev/null
+++ b/Cpp/Library/Data/DataFrame.hh
@@ -0,0 +1,153 @@
+/*
+ *  DataFrame.hh
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#ifndef NYMPH_DATAFRAME_HH_
+#define NYMPH_DATAFRAME_HH_
+
+#include "Data.hh"
+#include "Exception.hh"
+
+#include "MemberVariable.hh"
+
+#include "typename.hh"
+
+#include <unordered_map>
+#include <memory>
+#include <typeindex>
+
+namespace Nymph
+{
+    class DataFrameException : public scarab::typed_exception< DataFrameException >
+    {
+        public:
+            using scarab::typed_exception< DataFrameException >::typed_exception;
+            ~DataFrameException() = default;
+    };
+
+    /*!
+     @class DataFrame
+
+     @author N. S. Oblath
+
+     @brief Container for Data objects used during data processing
+
+     @details
+     Individual Data objects are held in an unordered map, indexed by type.
+
+    */
+    class DataFrame
+    {
+        public:
+            DataFrame();
+            virtual ~DataFrame();
+
+            /// Returns true if the frame has no data objects
+            bool Empty() const;
+
+            /// Returns true if object of type XData exists in the frame; returns false otherwise
+            template< typename XData >
+            bool Has() const;
+
+            /// Returns a reference to the object of type XData if it exists in the frame.
+            /// Creates and returns a reference to an object of type XData if it does not exist.
+            template< typename XData >
+            XData& Get();
+
+            /// Returns a reference to the object of type XData if it exists in the frame.
+            /// Throws DataFrameException if it does not exist.
+            template< typename XData >
+            const XData& Get() const;
+
+            /// Inserts the provided object of type XData into the frame, taking ownership of the object.
+            /// If an object of this type exists, it is replaced.
+            template< typename XData >
+            void Set( XData* ptr );
+
+            /// Inserts the provided object of type XData into the frame, taking ownership of the object.
+            /// If an object of this type exists, it is replaced.
+            template< typename XData >
+            void Set( std::unique_ptr<XData>&& ptr );
+
+            /// Inserts a copy of the provided object of type XData into the frame.
+            /// If an object of this type exists, it is replaced.
+            template< typename XData >
+            void Set( const XData& obj );
+
+            /// Removes and destroys the object of type XData if it exists in the frame.
+            /// Does nothing if the object does not exist.
+            template< typename XData >
+            void Remove();
+
+            // typedef used to avoid problems with the comma in the MEMVAR macro
+            typedef std::unordered_map< std::type_index, std::unique_ptr<Data> > DataMap;
+            MEMVAR_REF( DataMap, DataObjects );
+    };
+
+
+    inline bool DataFrame::Empty() const
+    {
+        return fDataObjects.empty();
+    }
+
+    template< typename XData >
+    bool DataFrame::Has() const
+    {
+        return fDataObjects.count( typeid(XData) ) != 0;
+    }
+
+    template< typename XData >
+    XData& DataFrame::Get()
+    {
+        if( Has< XData >() )
+        {
+            return static_cast< XData& >( *fDataObjects[typeid(XData)] );
+        }
+
+        fDataObjects[ typeid(XData) ].reset( new XData() );
+        return static_cast< XData& >( *fDataObjects[typeid(XData)] );
+    }
+
+    template< typename XData >
+    const XData& DataFrame::Get() const
+    {
+        if( Has< XData >() )
+        {
+            return static_cast< const XData& >( *fDataObjects.at(typeid(XData) ));
+        }
+        THROW_EXCEPT_HERE( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" );
+    }
+
+    template< typename XData >
+    void DataFrame::Set( XData* ptr )
+    {
+        fDataObjects[ typeid(XData) ].reset( ptr );  // take ownership of ptr
+    }
+
+    template< typename XData >
+    void DataFrame::Set( std::unique_ptr< XData >&& ptr )
+    {
+        fDataObjects[ typeid(XData) ] = std::move(ptr);  // take ownership of ptr
+        return;
+    }
+
+    template< typename XData >
+    void DataFrame::Set( const XData& obj )
+    {
+        fDataObjects[ typeid(XData) ].reset( new XData(obj) );  // make a copy of obj
+    }
+
+    template< typename XData >
+    void DataFrame::Remove()
+    {
+        fDataObjects.erase( typeid(XData) );
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATAFRAME_HH_ */
diff --git a/Cpp/Library/Data/DataManager.cc b/Cpp/Library/Data/DataManager.cc
new file mode 100644
index 0000000..3fda7bc
--- /dev/null
+++ b/Cpp/Library/Data/DataManager.cc
@@ -0,0 +1,18 @@
+/*
+ *  DataManager.cc
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "DataManager.hh"
+
+namespace Nymph
+{
+    DataManager::DataManager()
+    {}
+
+    DataManager::~DataManager()
+    {}
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Data/DataManager.hh b/Cpp/Library/Data/DataManager.hh
new file mode 100644
index 0000000..3552738
--- /dev/null
+++ b/Cpp/Library/Data/DataManager.hh
@@ -0,0 +1,39 @@
+/*
+ *  DataManager.hh
+ *
+ *  Created on: Nov 5, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#ifndef NYMPH_DATAMANAGER_HH_
+#define NYMPH_DATAMANAGER_HH_
+
+#include "MemberVariable.hh"
+
+#include <typeindex>
+#include <unordered_map>
+
+namespace Nymph
+{
+    struct Holder
+    {}
+
+    template< typename XType >
+    struct TypedHolder
+    {
+        
+    }
+
+    class DataManager
+    {
+        public:
+            DataManager();
+            virtual ~DataManager();
+
+            MEMVAR_REF( std::map< std::type_index, std::list< Holder > >, DataStore );
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_DATAMANAGER_HH_ */
diff --git a/Cpp/Library/Processor/ControlAccess.cc b/Cpp/Library/Processor/ControlAccess.cc
new file mode 100644
index 0000000..05342ac
--- /dev/null
+++ b/Cpp/Library/Processor/ControlAccess.cc
@@ -0,0 +1,122 @@
+/*
+ * ControlAccess.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "ControlAccess.hh"
+
+#include "logger.hh"
+
+//#include <boost/thread/locks.hpp>
+//#include <boost/thread/lock_types.hpp>
+
+LOGGER( contlog, "ControlAccess" );
+
+namespace Nymph
+{
+    SharedControl::SharedControl() :
+            fMutex(),
+            fCondVarContinue(),
+            fCondVarBreak(),
+            fBreakFlag( false ),
+            fCanceledFlag( false ),
+            fCycleTimeMS( 500 ),
+            fNActiveThreads( 0 )
+    {}
+
+    SharedControl::~SharedControl()
+    {}
+
+    void SharedControl::Reset()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "Reseting ControlAccess" );
+        fBreakFlag = false;
+        fCanceledFlag = false;
+        fCycleTimeMS = 500;
+        fNActiveThreads = 0;
+        return;
+    }
+
+    void SharedControl::Cancel()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "CANCEL called" );
+        fCanceledFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
+
+    bool SharedControl::IsAtBreak() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fBreakFlag;
+    }
+
+    bool SharedControl::IsCanceled() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        return fCanceledFlag;
+    }
+
+    bool SharedControl::WaitToContinue() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fBreakFlag )
+        {
+            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+            {
+                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+            }
+        }
+        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
+    }
+
+    bool SharedControl::WaitForBreakOrCanceled() const
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
+        {
+            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
+        }
+        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
+    }
+
+    void SharedControl::Resume()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        LDEBUG( contlog, "RESUME called" );
+        fBreakFlag = false;
+        fCondVarContinue.notify_all();
+    }
+
+    void SharedControl::IncrementActiveThreads()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        ++fNActiveThreads;
+        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
+        return;
+    }
+
+    void SharedControl::DecrementActiveThreads()
+    {
+        std::unique_lock< std::mutex > lock( fMutex );
+        if( fNActiveThreads > 0 ) --fNActiveThreads;
+        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
+        return;
+    }
+
+
+
+
+    ControlAccess::ControlAccess() :
+            fReturn( new ReturnBuffer< int >() )//,
+            //fControl()
+    {}
+
+    ControlAccess::~ControlAccess()
+    {}
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Processor/ControlAccess.hh b/Cpp/Library/Processor/ControlAccess.hh
new file mode 100644
index 0000000..3833c85
--- /dev/null
+++ b/Cpp/Library/Processor/ControlAccess.hh
@@ -0,0 +1,146 @@
+/*
+ * ControlAccess.hh
+ *
+ *  Created on: Sept 14, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_CONTROLACCESS_HH_
+#define NYMPH_CONTROLACCESS_HH_
+
+#include "Exception.hh"
+#include "MemberVariable.hh"
+#include "ReturnBuffer.hh"
+
+#include "cancelable.hh" // remove when ControlAccess is removed
+#include "singleton.hh"
+
+//#include <boost/thread/condition_variable.hpp>
+//#include <boost/thread/mutex.hpp>
+
+#include <condition_variable>
+#include <memory>
+#include <mutex>
+
+namespace Nymph
+{
+
+    class SharedControl : public scarab::singleton< SharedControl >
+    {
+        protected:
+            allow_singleton_access( SharedControl );
+
+            SharedControl();
+            virtual ~SharedControl();
+
+        public:
+            template< typename... Args >
+            std::tuple< Args&... >& GetReturn();
+
+            template< typename... Args >
+            void Break( Args&... args ); // to be called by a working thread
+
+            void Cancel(); // to be called by a working thread
+
+            bool IsAtBreak() const; // to be called by a working thread
+
+            bool IsCanceled() const; // to be called by a working thread
+
+            // return: true = continue; false = cancel
+            bool WaitToContinue() const; // to be called by a working thread
+
+            // return: true = was a break; false = cancel
+            bool WaitForBreakOrCanceled() const; // to be called by the processor toolbox
+
+            void Resume(); // to be called by the processor toolbox
+
+            void IncrementActiveThreads();
+            void DecrementActiveThreads();
+
+            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
+            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
+            MEMVAR_NOSET( bool, BreakFlag );
+            MEMVAR_NOSET( bool, CanceledFlag );
+            MEMVAR( unsigned, CycleTimeMS );
+            MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
+            MEMVAR( unsigned, NActiveThreads );
+
+            // WARNING: This function resets the state of this class to a just-constructed state
+            //          It is intended for use with testing when a single application might use it multiple times
+            void Reset();
+
+    };
+
+    template< typename... Args >
+    void SharedControl::Break( Args&... args )
+    {
+        while( IsAtBreak() && ! IsCanceled() )
+        {
+            if( ! WaitToContinue() )
+            {
+                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
+            }
+        }
+
+        std::unique_lock< std::mutex > lock( fMutex );
+        fBreakFlag = true;
+        fCondVarBreak.notify_all();
+        return;
+    }
+
+
+
+    template< typename... Args >
+    std::tuple< Args&... >& SharedControl::GetReturn()
+    {
+        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
+        std::unique_lock< std::mutex > lock( fMutex );
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
+        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
+        return buffer->GetReturn();
+    }
+
+
+
+    class ControlAccess : public scarab::cancelable
+    {
+        public:
+            ControlAccess();
+
+            virtual ~ControlAccess();
+
+            template< typename... Args >
+            void SetReturn( Args&... arg );
+
+            template< typename... Args >
+            std::tuple< Args&... >& GetReturn();
+
+        protected:
+            std::shared_ptr< ReturnBufferBase > fReturn;
+
+        public:
+            //MEM_VAR_SHARED_PTR( SharedControl, Control );
+    };
+
+    typedef std::shared_ptr< ControlAccess > ControlAccessPtr;
+
+
+    template< typename... Args >
+    void ControlAccess::SetReturn( Args&... args )
+    {
+        fReturn = std::make_shared< ReturnBuffer< Args... > >( args... );
+        return;
+    }
+
+    template< typename... Args >
+    std::tuple< Args&... >& ControlAccess::GetReturn()
+    {
+        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturn) );
+        if( buffer == nullptr ) throw std::exception();
+        return buffer->GetReturn();
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_CONTROLACCESS_HH_ */
diff --git a/Cpp/Library/Processor/PrimaryProcessor.cc b/Cpp/Library/Processor/PrimaryProcessor.cc
new file mode 100644
index 0000000..9e05508
--- /dev/null
+++ b/Cpp/Library/Processor/PrimaryProcessor.cc
@@ -0,0 +1,58 @@
+/*
+ * PrimaryProcessor.cc
+ *
+ *  Created on: Oct 10, 2012
+ *      Author: N.S. Oblath
+ */
+
+#include "PrimaryProcessor.hh"
+
+#include "ControlAccess.hh"
+#include "QuitThread.hh"
+
+#include "logger.hh"
+
+namespace Nymph
+{
+    LOGGER( proclog, "PrimaryProcessor" );
+
+    PrimaryProcessor::PrimaryProcessor( const std::string& name ) :
+            Processor( name ),
+            fExceptionPtr()
+    {}
+
+    PrimaryProcessor::~PrimaryProcessor()
+    {}
+
+    void PrimaryProcessor::operator()()
+    {
+        // go!
+        try
+        {
+            Run();
+        }
+        catch( const QuitThread& e )
+        {
+            LINFO( proclog, "Processor thread started by <" << fName << "> is quitting" );
+            fExceptionPtr = std::current_exception(); // capture the exception
+            SharedControl::get_instance()->DecrementActiveThreads();
+            // we don't initiate cancellation on QuitThread; this type of quitting has been initiated elsewhere and detected in this thread.
+            return;
+        }
+        catch( const std::exception& e )
+        {
+            LERROR( proclog, "An error occurred during processor running: " << e.what() );
+            fExceptionPtr = std::current_exception(); // capture the exception
+            SharedControl* control = SharedControl::get_instance();
+            control->DecrementActiveThreads();
+            control->Cancel();
+            return;
+        }
+
+        SharedControl::get_instance()->DecrementActiveThreads();
+        LWARN( proclog, "Valid return" );
+
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Processor/PrimaryProcessor.hh b/Cpp/Library/Processor/PrimaryProcessor.hh
new file mode 100644
index 0000000..74287d8
--- /dev/null
+++ b/Cpp/Library/Processor/PrimaryProcessor.hh
@@ -0,0 +1,68 @@
+/*
+ * PrimaryProcessor.hh
+ *
+ *  Created on: Oct 10, 2012
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_PRIMARYPROCESSOR_HH_
+#define NYMPH_PRIMARYPROCESSOR_HH_
+
+#include "Processor.hh"
+
+
+namespace Nymph
+{
+
+    class PrimaryProcessor : public Processor
+    {
+        public:
+            PrimaryProcessor( const std::string& name );
+            virtual ~PrimaryProcessor();
+
+        public:
+            /// Callable function used by std::thread
+            void operator()();// ControlAccessPtr control ); // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
+
+            /// Starts the  main action of the processor
+            virtual void Run() = 0;
+
+            MEMVAR_REF( std::exception_ptr, ExceptionPtr );
+
+    };
+
+
+/*
+    class PrimaryProcessor : public Processor
+    {
+        public:
+            PrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
+            virtual ~PrimaryProcessor();
+
+        public:
+            /// Callable function used by std::thread
+            void operator()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag );
+
+            /// Starts the  main action of the processor
+            virtual bool Run() = 0;
+
+            std::shared_ptr< KTThreadReference > GetThreadRef();
+
+            MEMBERVARIABLE( bool, DoBreakpoint );
+
+        protected:
+            std::vector< std::string > fSignalsEmitted;
+
+            std::shared_ptr< KTThreadReference > fThreadRef;
+
+    };
+
+    inline std::shared_ptr< KTThreadReference > PrimaryProcessor::GetThreadRef()
+    {
+        return fThreadRef;
+    }
+*/
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_PRIMARYPROCESSOR_HH_ */
diff --git a/Cpp/Library/Processor/Processor.cc b/Cpp/Library/Processor/Processor.cc
new file mode 100644
index 0000000..f53bbe5
--- /dev/null
+++ b/Cpp/Library/Processor/Processor.cc
@@ -0,0 +1,217 @@
+/*
+ * Processor.cc
+ *
+ *  Created on: Jan 5, 2012
+ *      Author: N.S. Oblath
+ */
+
+#include "Processor.hh"
+
+#include "Exception.hh"
+
+#include <utility>
+
+namespace Nymph
+{
+    //KTLOGGER(proclog, "Processor");
+
+    ConfigException::ConfigException() noexcept :
+            scarab::typed_exception< ConfigException >(),
+            fConfig(),
+            fConfigStr()
+    {}
+
+    ConfigException::ConfigException( const std::string& a_filename, int a_line ) noexcept :
+            scarab::typed_exception< ConfigException >( a_filename, a_line ),
+            fConfig(),
+            fConfigStr()
+    {}
+
+    ConfigException::ConfigException( const scarab::param_node& node ) noexcept :
+            scarab::typed_exception< ConfigException >(),
+            fConfig(),
+            fConfigStr()
+    {
+        try
+        {
+            fConfig.reset( new scarab::param_node(node) );
+        }
+        catch( ... )
+        {}
+    }
+
+    ConfigException::ConfigException( const ConfigException& orig ) noexcept :
+            scarab::typed_exception< ConfigException >( orig ),
+            fConfig(),
+            fConfigStr()
+    {
+        try
+        {
+            if( orig.fConfig ) fConfig.reset( new scarab::param_node(orig.fConfig->as_node()) );
+        }
+        catch( ... )
+        {}
+        
+    }
+
+    ConfigException::~ConfigException() noexcept
+    {}
+
+    const char* ConfigException::what() const noexcept
+    {
+        try
+        {
+            fConfigStr = f_what + '\n' + fConfig->to_string();
+            return fConfigStr.c_str();
+        }
+        catch( ... )
+        {
+            return f_what.c_str();
+        }
+    }
+
+
+
+    Processor::Processor( const std::string& name ) :
+            fName( name ),
+            fSignals(),
+            fSlots()
+    {
+    }
+
+    Processor::~Processor()
+    {}
+
+    void Processor::RegisterSignal( std::string name, SignalBase* signal )
+    {
+        LDEBUG( processorlog, "Registering signal <" << name << "> in processor <" << fName << ">" );
+        fSignals.insert( SigMapVal(name, signal) );
+
+        // give the signal to any slots that are waiting for it
+        //auto range = fSlotsWaitingForSignals.equal_range( name );
+        //for( auto rangeIt = range.first; rangeIt != range.second; ++rangeIt )
+        //{
+        //    rangeIt->second->SignalsUsed().push_back( signal );
+        //}
+
+        return;
+    }
+
+    void Processor::RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals )
+    {
+        LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
+        fSlots.insert( SlotMapVal(name, slot) );
+
+        /*
+        // take care of giving signal pointers to the slot, or saving them for later assignment
+        for( auto signalIt = signals.begin(); signalIt != signals.end(); ++signalIt )
+        {
+            auto signalPtrIt = fSignals.find( *signalIt );
+            if( signalPtrIt == fSignals.end() )
+            {
+                // don't have that signal yet, so the slot will wait
+                fSlotsWaitingForSignals.insert( std::make_pair( *signalIt, slot ) );
+            }
+            else
+            {
+                // have the signal; give it to the slot
+                slot->SignalsUsed().push_back( signalPtrIt->second );
+            }
+        }
+        */
+
+        return;
+    }
+
+    void Processor::ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum )
+    {
+        // get the signal and slot pointers
+        SigMapIt signalIt = fSignals.find(signalName);
+        if( signalIt == fSignals.end() )
+        {
+            THROW_EXCEPT_HERE( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
+                                                    "You may have the signal name wrong." );
+//       BOOST_THROW_EXCEPTION( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
+//                                                        "You may have the signal name wrong." << eom );
+        }
+
+        SlotMapIt slotIt = processor.fSlots.find(slotName);
+        if( slotIt == processor.fSlots.end() )
+        {
+            THROW_EXCEPT_HERE( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
+                                                  "You may have the slot name wrong." );
+//            BOOST_THROW_EXCEPTION( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
+//                                                      "You may have the slot name wrong." << eom );
+        }
+
+        try
+        {
+            // make the connection
+            ConnectSignalToSlot( signalIt->second, slotIt->second, groupNum );
+        }
+        catch( SignalException& e )
+        {
+            THROW_NESTED_EXCEPT_HERE( SignalException() << "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem with the signal." <<
+                                                           "\tYou may have the signal name wrong." );
+        }
+        catch( SlotException& e )
+        {
+            THROW_NESTED_EXCEPT_HERE( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." <<
+                                                         "\tYou may have the slot name wrong." );
+        }
+        catch( ConnectionException& e )
+        {
+            THROW_NESTED_EXCEPT_HERE( ConnectionException() <<  "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem making the connection." <<
+                                                                "\tCheck that the signatures of the signal and slot match exactly." );
+        }
+        catch( std::exception& e )
+        {
+            THROW_NESTED_EXCEPT_HERE( Exception() <<  "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
+        }
+
+        LDEBUG(processorlog, "Connected signal <" << this->Name() << ":" << signalName << "> to slot <" << processor.Name() << ":" << slotName << ">");
+
+        return;
+    }
+
+    void Processor::ConnectSignalToSlot( SignalBase* signal, SlotBase* slot, int groupNum )
+    {
+        if( ! signal )
+        {
+            THROW_EXCEPT_HERE( SignalException() << "Signal pointer was NULL" );
+//            BOOST_THROW_EXCEPTION( SignalException() << "Signal pointer was NULL" << eom );
+        }
+        if( ! slot )
+        {
+            THROW_EXCEPT_HERE( SlotException() << "Slot pointer was NULL" );
+//            BOOST_THROW_EXCEPTION( SlotException() << "Slot pointer was NULL" << eom );
+        }
+
+        signal->Connect(slot, groupNum);
+
+        return;
+    }
+
+    bool Processor::GetDoBreakpoint( const std::string& signalName )
+    {
+        SignalBase* signal = fSignals.at(signalName  );
+        if (signal != nullptr)
+        {
+            return signal->GetDoBreakpoint();
+        }
+        THROW_EXCEPT_HERE( Exception() << "Signal <" << signalName << "> was not found" );
+        return false;
+    }
+
+    void Processor::SetDoBreakpoint( const std::string& signalName, bool flag )
+    {
+        SignalBase* signal = fSignals.at(signalName  );
+        if( signal != nullptr )
+        {
+            return signal->SetDoBreakpoint( flag );
+        }
+        THROW_EXCEPT_HERE( Exception() << "Signal <" << signalName << "> was not found" );
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Processor/Processor.hh b/Cpp/Library/Processor/Processor.hh
new file mode 100644
index 0000000..bb7f09b
--- /dev/null
+++ b/Cpp/Library/Processor/Processor.hh
@@ -0,0 +1,122 @@
+/**
+ @file Processor.hh
+ @brief Base class for processors
+ @author: N. S. Oblath
+ @date: Jan 5, 2012
+ */
+
+#ifndef NYMPH_PROCESSOR_HH_
+#define NYMPH_PROCESSOR_HH_
+
+#include "SignalSlotBase.hh"
+
+#include "factory.hh"
+#include "logger.hh"
+#include "param.hh"
+
+#include <map>
+
+namespace Nymph
+{
+    LOGGER(processorlog, "Processor.hh");
+
+    struct ProcessorException : virtual public Exception {};
+
+    class ConfigException : public scarab::typed_exception< ConfigException >
+    {
+        public:
+            ConfigException() noexcept;
+            ConfigException( const std::string& a_filename, int a_line ) noexcept;
+            ConfigException( const scarab::param_node& node ) noexcept;
+            ConfigException( const ConfigException& orig ) noexcept;
+            virtual ~ConfigException() noexcept;
+
+            virtual const char* what() const noexcept;
+
+            MEMVAR_REF( scarab::param_ptr_t, Config );
+
+        protected:
+            mutable std::string fConfigStr;
+    };
+
+
+    class Processor
+    {
+        protected:
+            typedef std::map< std::string, SignalBase* > SignalMap;
+            typedef SignalMap::iterator SigMapIt;
+            typedef SignalMap::value_type SigMapVal;
+
+            typedef std::map< std::string, SlotBase* > SlotMap;
+            typedef SlotMap::iterator SlotMapIt;
+            typedef SlotMap::value_type SlotMapVal;
+
+        public:
+            Processor( const std::string& name );
+            virtual ~Processor();
+
+            template< class XDerivedProc >
+            static scarab::registrar< Nymph::Processor, XDerivedProc, const std::string& >* RegisterProcessor( const std::string& name );
+
+        public:
+            /// Configure the processor with a param_node
+            virtual void Configure( const scarab::param_node& node ) = 0;
+
+            /// Utility function for connecting any signal to any slot
+            static void ConnectSignalToSlot( SignalBase* signal, SlotBase* slot, int groupNum=-1 );
+
+            /// Connect a signal in this processor to a slot in a different processor
+            void ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum=-1 );
+            /// Connect a signal in a different processor to a slot in this processor
+            void ConnectASignal( Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum=-1 );
+
+            /// Register a signal object with this processor
+            void RegisterSignal( std::string name, SignalBase* signal );
+
+            /// Register a slot object with this processor
+            void RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals = {} );
+
+            bool GetDoBreakpoint( const std::string& signalName );
+            void SetDoBreakpoint( const std::string& signalName, bool flag );
+
+            MEMVAR_REF( std::string, Name );
+
+            MEMVAR_REF_CONST( SignalMap, Signals );
+            MEMVAR_REF_CONST( SlotMap, Slots );
+
+            // this is used only to hold pointers to slots waiting for signals
+            // the keys are the names of the signals being waited for, and the values are the slot pointers
+            //typedef std::multimap< std::string, SlotBase* > WaitingSlotMap;
+            //MEMVAR_REF_CONST( WaitingSlotMap, SlotsWaitingForSignals );
+
+    };
+
+
+    inline void Processor::ConnectASignal(Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum )
+    {
+        processor.ConnectASlot( signalName, *this, slotName, groupNum );
+        return;
+    }
+
+    template< class XDerivedProc >
+    scarab::registrar< Processor, XDerivedProc, const std::string& >* Processor::RegisterProcessor( const std::string& name )
+    {
+        return new scarab::registrar< Processor, XDerivedProc, const std::string& >( name );
+    }
+
+#define REGISTER_PROCESSOR_NONAMEPSACE(proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+#define REGISTER_PROCESSOR_NAMESPACE(proc_namespace, proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::Processor, ::proc_namespace::proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+// Macro overloading trick from here: https://stackoverflow.com/a/11763277
+#define GET_MACRO(_1, _2, _3, NAME, ...) NAME
+/// Processors defined in a namespace need to specify the namespace first:
+///   [no namespace]: REGISTER_PROCESSOR( [class], [name in quotes] )
+///   [with namespace]: REGISTER_PROCESSOR( [namespace], [class], [name in quotes] )
+#define REGISTER_PROCESSOR(...) GET_MACRO(__VA_ARGS__, REGISTER_PROCESSOR_NAMESPACE, REGISTER_PROCESSOR_NONAMESPACE, )(__VA_ARGS__)
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_PROCESSOR_HH_ */
diff --git a/Cpp/Library/Processor/ProcessorToolbox.cc b/Cpp/Library/Processor/ProcessorToolbox.cc
new file mode 100644
index 0000000..88d72ec
--- /dev/null
+++ b/Cpp/Library/Processor/ProcessorToolbox.cc
@@ -0,0 +1,758 @@
+/*
+ * ProcessorToolbox.cc
+ *
+ *  Created on: Sep 27, 2012
+ *      Author: N.S. Oblath
+ */
+
+#include "ProcessorToolbox.hh"
+
+#include "PrimaryProcessor.hh"
+#include "QuitThread.hh"
+
+#include "factory.hh"
+#include "logger.hh"
+#include "param_codec.hh"
+
+#include <map>
+#include <thread>
+
+//#include <boost/exception/get_error_info.hpp>
+//#include <boost/thread.hpp>
+
+using std::deque;
+using std::set;
+using std::string;
+using std::vector;
+
+namespace Nymph
+{
+    LOGGER(proclog, "ProcessorToolbox");
+
+    ProcessorToolbox::ProcessorToolbox( const std::string& name ) :
+            fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
+            fRunSingleThreaded( false ),
+            fRunQueue(),
+            fProcMap(),
+            //fControl( new SharedControl() ),
+            //fThreadReferences(),
+            //fContinueCV(),
+            //fDoContinue( false ),
+            //fBreakContMutex(),
+            fDoRunThread()//,
+            //fDoRunPromise(),
+            //fDoRunBreakFlag( false )
+    {
+    }
+
+    ProcessorToolbox::~ProcessorToolbox()
+    {
+        //CancelThreads();
+
+        //JoinRunThread();
+
+        ClearProcessors();
+    }
+
+    void ProcessorToolbox::Configure( const scarab::param_node& node )
+    {
+        LPROG( proclog, "Configuring . . ." );
+
+        // Deal with "processor" blocks
+        if( ! node.has("processors") )
+        {
+            LWARN( proclog, "No processors were specified" );
+        }
+        else
+        {
+            const scarab::param_array& procArray = node["processors"].as_array();
+            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
+            {
+                if( ! procIt->is_node() )
+                {
+                    LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
+                }
+                const scarab::param_node& procNode = procIt->as_node();
+
+                if( ! procNode.has("type") )
+                {
+                    LERROR( proclog, "Unable to create processor: no processor type given" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
+                }
+                string procType = procNode["type"]().as_string();
+
+                string procName;
+                if( ! procNode.has("name") )
+                {
+                    LINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
+                    procName = procType;
+                }
+                else
+                {
+                    procName = procNode["name"]().as_string();
+                }
+                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
+                if( newProc == nullptr )
+                {
+                    LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
+                }
+
+                if( ! AddProcessor( procName, newProc ) )
+                {
+                    LERROR( proclog, "Unable to add processor <" << procName << ">" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
+                }
+            }
+        }
+
+
+        // Then deal with connections"
+        if( ! node.has("connections") )
+        {
+            LWARN( proclog, "No connections were specified" );
+        }
+        else
+        {
+            const scarab::param_array& connArray = node["connections"].as_array();
+            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
+            {
+                if( ! connIt->is_node() )
+                {
+                    LERROR( proclog, "Invalid connection entry: not a node" << *connIt );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
+                }
+                const scarab::param_node& connNode = connIt->as_node();
+
+                if( ! connNode.has("signal") || ! connNode.has("slot") )
+                {
+                    LERROR( proclog, "Signal/Slot connection information is incomplete!" );
+                    std::string sigSlotMessage( "signal = " );
+                    if (connNode.has("signal"))
+                    {
+                        sigSlotMessage += connNode["signal"]().as_string();
+                    }
+                    else
+                    {
+                        sigSlotMessage += "MISSING";
+                    }
+
+                    sigSlotMessage += "\nslot = ";
+                    if (connNode.has("slot"))
+                    {
+                        sigSlotMessage += connNode["slot"]().as_string();
+                    }
+                    else
+                    {
+                        sigSlotMessage += "MISSING";
+                    }
+                    LERROR( proclog, sigSlotMessage );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
+                }
+
+                bool connReturn = false;
+                if( connNode.has("order") )
+                {
+                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int() );
+                }
+                else
+                {
+                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string() );
+                }
+                if( ! connReturn )
+                {
+                    LERROR( proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
+                }
+
+                if( connNode.has("breakpoint") )
+                {
+                    if (! SetBreakpoint( connNode["slot"]().as_string() ) )
+                    {
+                        LERROR( proclog, "Unable to set breakpoint on <" << connNode["slot"]() );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
+                    }
+                }
+
+                LINFO( proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">" );
+            }
+        }
+
+
+        // Finally, deal with processor-run specifications
+        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
+        // If names are grouped (in another array), those in that group will be run in parallel.
+        // In single threaded mode all threads will be run sequentially in the order they were specified.
+        if( ! node.has("run-queue") )
+        {
+            LWARN( proclog, "Run queue was not specified" );
+        }
+        else
+        {
+            const scarab::param_array& rqArray = node["run-queue"].as_array();
+            for( scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt )
+            {
+                if( rqIt->is_value() )
+                {
+                    if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
+                    {
+                        LERROR( proclog, "Unable to process run-queue entry: could not add processor to the queue" );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
+                    }
+                }
+                else if( rqIt->is_array() )
+                {
+                    const scarab::param_array* rqNode = &( rqIt->as_array() );
+                    std::vector< std::string > names;
+
+                    for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
+                    {
+                        if( ! rqArrayIt->is_value() )
+                        {
+                            LERROR( proclog, "Invalid run-queue array entry: not a value" );
+                            THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
+                        }
+                        names.push_back( (*rqArrayIt)().as_string() );
+                    }
+
+                    if( ! PushBackToRunQueue(names) )
+                    {
+                        LERROR( proclog, "Unable to process run-queue entry: could not add list of processors to the queue" );
+                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
+                    }
+                }
+                else
+                {
+                    LERROR( proclog, "Invalid run-queue entry: not a value or array" );
+                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
+                }
+            }
+        }
+
+        return;
+    }
+
+    bool ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
+    {
+        for( ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); ++iter )
+        {
+            LDEBUG( proclog, "Attempting to configure processor <" << iter->first << ">" );
+            string procName = iter->first;
+            string nameUsed(procName);
+            if( ! node.has(nameUsed) )
+            {
+                nameUsed = iter->second.fProc->Name();
+                if( ! node.has(nameUsed) )
+                {
+                    LWARN( proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
+                            "\tProcessor <" << procName << "> was not configured." );
+                    continue;
+                }
+            }
+            const scarab::param_node& subNode = node[nameUsed].as_node();
+            try
+            {
+                iter->second.fProc->Configure(subNode);
+            }
+            catch( const Exception& e )
+            {
+                LERROR( proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">" );
+                LERROR( proclog, e.what() );
+                return false;
+            }
+        }
+        return true;
+    }
+
+    std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName )
+    {
+        ProcMapIt it = fProcMap.find( procName );
+        if( it == fProcMap.end() )
+        {
+            LWARN( proclog, "Processor <" << procName << "> was not found." );
+            return NULL;
+        }
+        return it->second.fProc;
+    }
+
+    const std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName ) const
+    {
+        ProcMapCIt it = fProcMap.find( procName );
+        if (it == fProcMap.end())
+        {
+            LWARN( proclog, "Processor <" << procName << "> was not found." );
+            return NULL;
+        }
+        return it->second.fProc;
+    }
+
+    bool ProcessorToolbox::AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc )
+    {
+        ProcMapIt it = fProcMap.find( procName);
+        if( it == fProcMap.end() )
+        {
+            ProcessorInfo pInfo;
+            pInfo.fProc = proc;
+            fProcMap.insert( ProcMapValue(procName, pInfo) );
+            LDEBUG( proclog, "Added processor <" << procName << "> (a.k.a. " << proc->Name() << ")" );
+            return true;
+        }
+        LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
+        return false;
+    }
+
+    bool ProcessorToolbox::AddProcessor( const std::string& procType, const std::string& procName )
+    {
+        ProcMapIt it = fProcMap.find( procName );
+        if( it == fProcMap.end() )
+        {
+            std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procType) );
+            if( newProc == NULL )
+            {
+                LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
+                return false;
+            }
+            if( ! AddProcessor(procName, newProc) )
+            {
+                LERROR( proclog, "Unable to add processor <" << procName << ">" );
+                //delete newProc;
+                return false;
+            }
+            return true;
+        }
+        LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
+        return false;
+    }
+
+    bool ProcessorToolbox::RemoveProcessor( const std::string& procName )
+    {
+        std::shared_ptr< Processor > procToRemove = ReleaseProcessor( procName );
+        if( procToRemove == NULL )
+        {
+            return false;
+        }
+        //delete procToRemove;
+        LDEBUG( proclog, "Processor <" << procName << "> deleted." );
+        return true;
+    }
+
+    std::shared_ptr< Processor > ProcessorToolbox::ReleaseProcessor( const std::string& procName )
+    {
+        ProcMapIt it = fProcMap.find( procName );
+        if( it == fProcMap.end() )
+        {
+            LWARN( proclog, "Processor <" << procName << "> was not found." );
+            return NULL;
+        }
+        std::shared_ptr< Processor > procToRelease = it->second.fProc;
+        fProcMap.erase( it );
+        return procToRelease;
+    }
+
+    void ProcessorToolbox::ClearProcessors()
+    {
+        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
+        {
+            delete it->second.fProc;
+        }*/ //not required for smart pointers
+        fProcMap.clear();
+        fRunQueue.clear();
+        return;
+    }
+
+
+    bool ProcessorToolbox::MakeConnection( const std::string& signal, const std::string& slot, int order )
+    {
+        string signalProcName, signalName;
+        if( ! ParseSignalSlotName( signal, signalProcName, signalName ) )
+        {
+            LERROR( proclog, "Unable to parse signal name: <" << signal << ">" );
+            return false;
+        }
+
+        string slotProcName, slotName;
+        if( ! ParseSignalSlotName( slot, slotProcName, slotName ) )
+        {
+            LERROR( proclog, "Unable to parse slot name: <" << slot << ">" );
+            return false;
+        }
+
+        return MakeConnection( signalProcName, signalName, slotProcName, slotName, order );
+    }
+
+    bool ProcessorToolbox::MakeConnection( const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order )
+    {
+        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
+        if( signalProc == nullptr )
+        {
+            LERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
+            return false;
+        }
+
+        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
+        if( slotProc == nullptr )
+        {
+            LERROR( proclog, "Processor named <" << slotProcName << "> was not found!" );
+            return false;
+        }
+
+        try
+        {
+            if( order != std::numeric_limits< int >::min() )
+            {
+                signalProc->ConnectASlot( signalName, *slotProc.get(), slotName, order );
+            }
+            else
+            {
+                signalProc->ConnectASlot(signalName, *slotProc.get(), slotName);
+            }
+        }
+        catch( scarab::base_exception& e )
+        {
+            LERROR( proclog, "An error occurred while connecting signals and slots:\n"
+                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->Name() << ")" << '\n'
+                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->Name() << ")" << '\n' );
+            PrintException( e );
+            return false;
+        }
+
+        return true;
+    }
+
+    bool ProcessorToolbox::SetBreakpoint( const std::string& signal )
+    {
+        string signalProcName, signalName;
+        if(! ParseSignalSlotName( signal, signalProcName, signalName ) )
+        {
+            LERROR(proclog, "Unable to parse signal name: <" << signal << ">");
+            return false;
+        }
+
+        return SetBreakpoint( signalProcName, signalName );
+    }
+
+    bool ProcessorToolbox::SetBreakpoint( const std::string& signalProcName, const std::string& signalName )
+    {
+        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
+        if( signalProc == nullptr )
+        {
+            LERROR( proclog, "Processor named <" << signalProcName << "> was not found!" );
+            return false;
+        }
+
+        try
+        {
+            signalProc->SetDoBreakpoint( signalName, true );
+            return true;
+        }
+        catch( scarab::base_exception& e )
+        {
+            LERROR( proclog, "Unable to set breakpoint: " );
+            PrintException( e );
+            return false;
+        }
+    }
+
+    bool ProcessorToolbox::RemoveBreakpoint( const std::string& signal )
+    {
+        string signalProcName, signalName;
+        if( ! ParseSignalSlotName( signal, signalProcName, signalName ) )
+        {
+            LERROR( proclog, "Unable to parse signal name: <" << signal << ">" );
+            return false;
+        }
+
+        return RemoveBreakpoint( signalProcName, signalName );
+    }
+
+    bool ProcessorToolbox::RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName )
+    {
+        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
+        if( signalProc == nullptr )
+        {
+            LERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            signalProc->SetDoBreakpoint( signalName, false );
+            return true;
+        }
+        catch( scarab::base_exception& e )
+        {
+            LERROR( proclog, "Unable to set breakpoint: " );
+            PrintException( e );
+            return false;
+        }
+    }
+
+    bool ProcessorToolbox::ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
+    {
+        size_t sepPos = toParse.find_first_of( fSigSlotNameSep );
+        if( sepPos == string::npos )
+        {
+            LERROR( proclog, "Unable to find separator between processor and signal/slot name in <" << toParse << ">" );
+            return false;
+        }
+        nameOfProc = toParse.substr( 0, sepPos );
+        nameOfSigSlot = toParse.substr( sepPos + 1 );
+        return true;
+    }
+
+
+    bool ProcessorToolbox::PushBackToRunQueue( const std::string& name )
+    {
+        ThreadSourceGroup threadGroup;
+
+        if( ! AddProcessorToThreadGroup( name, threadGroup ) )
+        {
+            LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
+            return false;
+        }
+
+        fRunQueue.push_back( threadGroup );
+
+        LINFO( proclog, "Added processor <" << name << "> to the run queue" );
+        return true;
+    }
+
+    bool ProcessorToolbox::PushBackToRunQueue( std::initializer_list< std::string > names )
+    {
+        return PushBackToRunQueue( std::vector< std::string >(names) );
+    }
+
+    bool ProcessorToolbox::PushBackToRunQueue( std::vector< std::string > names )
+    {
+        ThreadSourceGroup threadGroup;
+
+        std::stringstream toPrint;
+        for( const std::string& name : names )
+        {
+            if(! AddProcessorToThreadGroup( name, threadGroup ) )
+            {
+                LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
+                return false;
+            }
+            toPrint << name << ", "; // the extra comma at the end is removed below
+        }
+
+        fRunQueue.push_back( threadGroup );
+        std::string toPrintString = toPrint.str();
+        toPrintString.resize( toPrintString.size() - 2 );
+        LINFO( proclog, "Added processors <" << toPrintString << "> to the run queue" );
+        return true;
+    }
+
+    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
+    {
+        std::shared_ptr< Processor > procForRunQueue = GetProcessor( name );
+        LDEBUG( proclog, "Attempting to add processor <" << name << "> to the run queue" );
+        if( procForRunQueue == nullptr )
+        {
+            LERROR( proclog, "Unable to find processor <" << name << "> requested for the run queue" );
+            return false;
+        }
+
+        PrimaryProcessor* primaryProc = dynamic_cast< PrimaryProcessor* >( procForRunQueue.get() );
+        if( primaryProc == nullptr )
+        {
+            LERROR( proclog, "Processor <" << name << "> is not a primary processor." );
+            return false;
+        }
+        //group.insert(primaryProc);
+        group.insert( ThreadSource(primaryProc, name) );
+        return true;
+    }
+
+    void ProcessorToolbox::AsyncRun()
+    {
+        if( fDoRunThread.joinable() )
+        {
+            LERROR( proclog, "It appears that a run has already been started" );
+            return;
+        }
+
+        StartMultiThreadedRun();
+
+        return;
+    }
+
+    void ProcessorToolbox::StartMultiThreadedRun()
+    {
+        auto multiThreadRun = [&]()
+        {
+            try
+            {
+                LPROG( proclog, "Starting multi-threaded processing" );
+
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    SharedControl* control = SharedControl::get_instance();
+
+                    typedef std::pair< PrimaryProcessor*, std::thread > ThreadBundle;
+                    std::map< std::string, ThreadBundle > threads;
+
+                    // iterate over primary processors in this group and launch threads
+                    for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                    {
+                        std::string procName( tgIter->fName );
+                        LINFO( proclog, "Starting processor <" << procName << ">" );
+
+                        threads.emplace( procName, ThreadBundle( tgIter->fProc, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) ) );
+
+                        control->IncrementActiveThreads();
+                    }// end for loop over the thread group
+
+                    // wait here while things are still running
+                    bool stillRunning = true;
+                    while( stillRunning )
+                    {
+                        bool breakOrCanceled = control->WaitForBreakOrCanceled();
+                        if( breakOrCanceled )
+                        {
+                            // then at a breakpoint
+                            stillRunning = true;
+                            LDEBUG( proclog, "At a breakpoint" );
+                            // TODO: do we need to do anything while at a breakpoint?
+                            if( ! control->WaitToContinue() )
+                            {
+                                stillRunning = false;
+                                LDEBUG( proclog, "Detected cancelation while waiting at breakpoint" );
+                            }
+                        }
+                        else
+                        {
+                            // then canceled
+                            stillRunning = false;
+                            LDEBUG( proclog, "Detected cancelation while waiting during running" );
+                        }
+                    }
+
+                    // join threads and check for exceptions
+                    // break out of the run-queue iteration loop if there was an exception
+                    bool quitAfterThis = control->IsCanceled();
+                    for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
+                    {
+                        LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
+                        LDEBUG( proclog, "Joining thread" );
+                        threadIt->second.second.join();
+                        if( threadIt->second.first->ExceptionPtr() )
+                        {
+                            try
+                            {
+                                std::rethrow_exception( threadIt->second.first->ExceptionPtr() );
+                            }
+                            catch( const QuitThread& e )
+                            {
+                                // not necessarily an error, so don't set quitAfterThis to true
+                                LINFO( proclog, "Thread exited with QuitThread" );
+                            }
+                            catch( const scarab::base_exception& e )
+                            {
+                                // this is an error, so set quitAfterThis to true
+                                LERROR( proclog, "Thread exited with an exception" );
+                                PrintException( e );
+                                quitAfterThis = true;
+                            }
+                        }
+                        else
+                        {
+                            // this thread did not have an exeption set, so it exited normally
+                            LINFO( proclog, "Thread exited normally" )
+                        }
+                    }
+
+                    if( quitAfterThis )
+                    {
+                        LWARN( proclog, "Exiting from run-queue loop under abnormal conditions" );
+                        break;
+                    }
+
+                } // end for loop over the run-queue
+
+                LPROG( proclog, "Processing is complete" );
+            }
+            catch( scarab::base_exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
+                LERROR( proclog, "Diagnostic Information:\n" );
+                PrintException( e );
+                SharedControl::get_instance()->Cancel();
+                return;
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                SharedControl::get_instance()->Cancel();
+                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                //fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            return;
+        }; // end multi-threaded run lambda
+
+        fDoRunThread = std::thread( multiThreadRun );
+        return;
+    }
+
+
+    bool ProcessorToolbox::WaitForBreakOrCanceled()
+    {
+        return SharedControl::get_instance()->WaitForBreakOrCanceled();
+    }
+
+    bool ProcessorToolbox::WaitToContinue()
+    {
+        return SharedControl::get_instance()->WaitToContinue();
+    }
+
+    void ProcessorToolbox::WaitForEndOfRun()
+    {
+        LDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreakOrCanceled() )
+        {
+            LDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            WaitToContinue();
+            LDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+        }
+        LDEBUG( proclog, "End-of-run reached" );
+
+        return;
+    }
+
+    void ProcessorToolbox::Continue()
+    {
+        SharedControl::get_instance()->Resume();
+        return;
+    }
+
+   void ProcessorToolbox::JoinRunThread()
+   {
+       fDoRunThread.join();
+       return;
+   }
+
+    void ProcessorToolbox::CancelThreads()
+    {
+        SharedControl::get_instance()->Cancel();
+        return;
+    }
+
+    bool ProcessorToolbox::Run()
+    {
+        // can throw scarab::base_exception
+
+        AsyncRun();
+
+        WaitForEndOfRun();
+
+        JoinRunThread();
+
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
new file mode 100644
index 0000000..81372b5
--- /dev/null
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -0,0 +1,272 @@
+/**
+ @file ProcessorToolbox.hh
+ @brief Contains ProcessorToolbox
+ @details Manages processors requested by the user at run time.
+ @author: N. S. Oblath
+ @date: Sep 27, 2012
+ */
+
+#ifndef NYMPH_PROCESSORTOOLBOX_HH_
+#define NYMPH_PROCESSORTOOLBOX_HH_
+
+#include "ControlAccess.hh"
+#include "MemberVariable.hh"
+//#include "KTThreadReference.hh"
+
+#include "factory.hh"
+#include "param.hh"
+
+//#define BOOST_THREAD_PROVIDES_FUTURE
+//#include <boost/thread/future.hpp>
+//#include <boost/thread/mutex.hpp>
+//#include <boost/thread/thread.hpp>
+
+//#include <boost/iterator/iterator_adaptor.hpp>
+//#include <boost/type_traits/is_convertible.hpp>
+//#include <boost/utility/enable_if.hpp>
+
+#include <deque>
+#include <initializer_list>
+#include <limits>
+#include <set>
+#include <memory>
+#include <thread>
+
+
+namespace Nymph
+{
+    class PrimaryProcessor;
+    class Processor;
+
+    /*!
+     @class ProcessorToolbox
+     @author N. S. Oblath
+
+     @brief Manages processors requested by the user at run time.
+
+     @details
+     ProcessorToolbox allows the user to setup an application at runtime.
+
+     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
+     the program via a configuration file.
+
+     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
+
+     The following order should be used for configuring the processor toolbox:
+     <ol>
+         <li>Create processors</li>
+         <li>Connect signals and slots</li>
+         <li>Create the run queue</li>
+     </ol>
+
+     Available (nested) configuration values:
+     <ul>
+         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
+         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
+             <ul>
+                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
+                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
+             </ul>
+         </li>
+         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
+             <ul>
+                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
+                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
+                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
+             </ul>
+         </li>
+         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
+         The elements of this array specify processors that are run sequentially.
+         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
+             <ul>
+                 <li>processor name -- add a processor to the run queue, or </li>
+                 <li>array of processor names -- add a group of processors to the run queue.</li>
+             </ul>
+             In single-threaded mode, all processors will be run sequentially, in the order specified.
+         </li>
+     </ul>
+    */
+    class ProcessorToolbox
+    {
+        protected:
+            typedef std::unique_lock< std::mutex > unique_lock;
+
+        public:
+            ProcessorToolbox( const std::string& name = "processor-toolbox" );
+            virtual ~ProcessorToolbox();
+
+        protected:
+            scarab::factory< Processor, const std::string& >* fProcFactory; // singleton; not owned by ProcessorToolbox
+
+
+        public:
+            /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
+            void Configure( const scarab::param_node& node );
+
+            /// Configure processors (only those specified in the toolbox)
+            bool ConfigureProcessors( const scarab::param_node& node );
+
+            MEMVAR( bool, RunSingleThreaded );
+
+        protected:
+            struct ProcessorInfo
+            {
+                std::shared_ptr< Processor > fProc;
+            };
+            typedef std::map< std::string, ProcessorInfo > ProcessorMap;
+            typedef ProcessorMap::iterator ProcMapIt;
+            typedef ProcessorMap::const_iterator ProcMapCIt;
+            typedef ProcessorMap::value_type ProcMapValue;
+
+        public:
+            /// Get a pointer to a processor in the toolbox
+            std::shared_ptr< Processor > GetProcessor( const std::string& procName );
+            /// Get a pointer to a processor in the toolbox
+            const std::shared_ptr< Processor > GetProcessor( const std::string& procName ) const;
+
+            /// Add a processor to the toolbox
+            /// Toolbox takes ownership of the processor
+            bool AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc );
+            bool AddProcessor( const std::string& procType, const std::string& procName );
+
+            /// Remove a processor from the toolbox
+            bool RemoveProcessor( const std::string& procName );
+
+            /// Remove a processor from the toolbox and return it to the user
+            /// Ownership is passed to the user
+            std::shared_ptr< Processor > ReleaseProcessor( const std::string& procName );
+
+            /// Remove all processors from the toolbox
+            /// Also clears the run queue
+            void ClearProcessors();
+
+        protected:
+            ProcessorMap fProcMap;
+
+
+        public:
+            // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
+
+            /// Make a connection between the signal from one processor and the slot from another processor
+            /// Both processors should already have been added to the Toolbox
+            /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
+            bool MakeConnection(const std::string& signal, const std::string& slot, int order);
+            bool MakeConnection(const std::string& signal, const std::string& slot);
+
+            /// Make a connection between the signal from one processor and the slot from another processor
+            /// Both processors should already have been added to the Toolbox
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName);
+
+            /// Set a breakpoint on a signal
+            /// Slot string should be formatted as: [processor name]:[signal name]
+            bool SetBreakpoint( const std::string& signal );
+            /// Set a breakpoint on a signal
+            bool SetBreakpoint( const std::string& signalProcName, const std::string& signalName );
+
+            /// Remove a breakpoint from a signal
+            /// Slot string should be formatted as: [processor name]:[signal name]
+            bool RemoveBreakpoint( const std::string& signal );
+            /// Remove a breakpoint from a signal
+            bool RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName );
+
+        protected:
+            bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
+            static const char fSigSlotNameSep = ':';
+
+
+        public:
+            /// Push a single processor to the back of the run queue
+            bool PushBackToRunQueue( const std::string& name );
+
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue( std::initializer_list< std::string > names );
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue( std::vector< std::string > names );
+
+            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
+            void PopBackOfRunQueue();
+
+            /// Clear the run queue
+            void ClearRunQueue();
+
+        protected:
+            struct ThreadSource
+            {
+                PrimaryProcessor* fProc;
+                std::string fName;
+                //ControlAccessPtr fControlAccess;
+                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
+                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
+                {}
+            };
+            struct CompareThreadSource
+            {
+                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
+                {
+                    return lhs.fProc < rhs.fProc;
+                }
+            };
+            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroup;
+            typedef std::deque< ThreadSourceGroup > RunQueue;
+            RunQueue fRunQueue;
+
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group );
+
+
+        public:
+            /// Process the run queue.
+            /// This will call Run() on all of the processors in the queue.
+            bool Run();
+
+            void AsyncRun();
+
+            bool WaitToContinue();
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// Throws a boost::exception if there's an error with the future object in use
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            bool WaitForBreakOrCanceled();
+
+            void WaitForEndOfRun();
+
+            void Continue();
+
+            void CancelThreads();
+
+            void JoinRunThread();
+
+            // TODO: return value access
+
+        protected:
+            void StartMultiThreadedRun();
+
+            std::thread fDoRunThread;
+
+    };
+
+    inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
+    {
+        return MakeConnection(signal, slot, std::numeric_limits< int >::min());
+    }
+
+    inline bool ProcessorToolbox::MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName)
+    {
+        return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min()); 
+    }
+
+    inline void ProcessorToolbox::PopBackOfRunQueue()
+    {
+        fRunQueue.pop_back();
+        return;
+    }
+
+    inline void ProcessorToolbox::ClearRunQueue()
+    {
+        fRunQueue.clear();
+        return;
+    }
+
+} /* namespace Nymph */
+#endif /* NYMPH_PROCESSORTOOLBOX_HH_ */
diff --git a/Cpp/Library/Processor/QuitThread.hh b/Cpp/Library/Processor/QuitThread.hh
new file mode 100644
index 0000000..10597ff
--- /dev/null
+++ b/Cpp/Library/Processor/QuitThread.hh
@@ -0,0 +1,27 @@
+/*
+ * QuitThread.hh
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_QUITTHREAD_HH_
+#define NYMPH_QUITTHREAD_HH_
+
+#include <string>
+
+namespace Nymph
+{
+    class QuitThread : public scarab::typed_exception< QuitThread >
+    {
+        public:
+            using scarab::typed_exception< QuitThread >::typed_exception;
+            ~QuitThread() = default;
+    };
+
+    #define QUIT_THREAD  throw ::Nymph::QuitThread()(__FILE__, __LINE__)
+    //THROW_EXCEPT_HERE( ::Nymph::QuitThread() )
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_QUITTHREAD_HH_ */
diff --git a/Cpp/Library/Processor/ReturnBuffer.cc b/Cpp/Library/Processor/ReturnBuffer.cc
new file mode 100644
index 0000000..7e0bf57
--- /dev/null
+++ b/Cpp/Library/Processor/ReturnBuffer.cc
@@ -0,0 +1,19 @@
+/*
+ * ReturnBuffer.cc
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "ReturnBuffer.hh"
+
+namespace Nymph
+{
+    
+    ReturnBufferBase::ReturnBufferBase()
+    {}
+
+    ReturnBufferBase::~ReturnBufferBase()
+    {}
+
+}
diff --git a/Cpp/Library/Processor/ReturnBuffer.hh b/Cpp/Library/Processor/ReturnBuffer.hh
new file mode 100644
index 0000000..c29a146
--- /dev/null
+++ b/Cpp/Library/Processor/ReturnBuffer.hh
@@ -0,0 +1,63 @@
+/*
+ * ReturnBuffer.hh
+ *
+ *  Created on: Oct 22, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_RETURNBUFFER_HH_
+#define NYMPH_RETURNBUFFER_HH_
+
+#include <tuple>
+
+namespace Nymph
+{
+
+    class ReturnBufferBase
+    {
+        public:
+            ReturnBufferBase();
+            virtual ~ReturnBufferBase();
+    };
+
+    template< typename... Args >
+    struct ReturnBuffer : ReturnBufferBase
+    {
+        public:
+            ReturnBuffer() :
+                    fReturn( nullptr )
+            {}
+
+            ReturnBuffer( Args&... retval ) :
+                    fReturn( new std::tuple< Args&... >( retval... ) )
+            {}
+
+            virtual ~ReturnBuffer()
+            {}
+
+            std::tuple< Args&... >& GetReturn()
+            {
+                if( fReturn == nullptr ) throw std::exception();
+                return *fReturn;
+            }
+
+        protected:
+            std::tuple< Args&... >* fReturn;
+    };
+
+    template<>
+    struct ReturnBuffer< void > : ReturnBufferBase
+    {
+        ReturnBuffer() :
+                ReturnBufferBase()
+        {}
+
+        void GetReturn()
+        {
+            return;
+        }
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_RETURNBUFFER_HH_ */
diff --git a/Cpp/Library/Processor/Signal.hh b/Cpp/Library/Processor/Signal.hh
new file mode 100644
index 0000000..e278f81
--- /dev/null
+++ b/Cpp/Library/Processor/Signal.hh
@@ -0,0 +1,257 @@
+/*
+ * Signal.hh
+ *
+ *  Created on: Jan 15, 2013
+ *      Author: N.S. Oblath
+ * 
+ *  Based on this implementation: https://schneegans.github.io/tutorials/2015/09/20/signal-slot
+ */
+
+#ifndef NYMPH_SIGNAL_HH_
+#define NYMPH_SIGNAL_HH_
+
+#include "SignalSlotBase.hh"
+
+#include "ControlAccess.hh"
+#include "QuitThread.hh"
+
+#include "logger.hh"
+
+
+namespace Nymph
+{
+    LOGGER( signallog, "Signal" );
+
+    template< typename... XArgs >
+    class Slot;
+
+    /// A Signal object may call multiple slots with the
+    /// same signature. You can connect functions to the Signal
+    /// that will be called when the emit() method on the
+    /// Signal object is invoked. Any argument passed to emit()
+    /// will be passed to the given functions.
+    template< typename... XArgs >
+    class Signal : public SignalBase
+    {
+        public:
+            using signature = void( XArgs... );
+//            using full_signature = void( ControlAccessPtr, XArgs... );
+
+        public:
+            /// Unowned signal
+            Signal( const std::string& name );
+            /// Owned signal
+            template< typename XOwner >
+            Signal( const std::string& name, XOwner* owner );
+            Signal( const Signal& ) = delete;
+            Signal( Signal&& ) = delete;
+            virtual ~Signal();
+
+            virtual void Connect( SlotBase* slot, int group = -1 );
+
+            // calls all connected functions
+            void Emit( XArgs... args );
+            void operator()( XArgs... args );
+
+            // TODO: remove this  // 12/8/21, NSO: why remove this?  // NSO: oh, because we no longer need to pass ControlAccess between signals and slots before they're used
+            //MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
+    };
+
+
+    /*!
+     @class Signal
+     @author N. S. Oblath
+
+     @brief Creates a signal that takes 0 or more arguments.
+
+     @details
+     The signal is emitted by calling operator().
+     If a Slot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+
+     Usage:
+     In your Processor's header add a member variable of type Signal< ArgumentTypes >.
+
+     Initialize the signal with the processor's 'this' pointer and the name of the signal.
+
+     To use the signal, call it as: fSignalObject(arg);
+    *//*
+    template< class... XSignalArguments >
+    class Signal
+    {
+        public:
+            typedef void (signature)( XSignalArguments... );
+            typedef boost::signals2::signal< signature > boost_signal;
+            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
+
+        public:
+            Signal();
+            Signal( const std::string& name, Processor* proc );
+            virtual ~Signal();
+
+        protected:
+            Signal( const Signal& );
+
+        public:
+            void operator()( XSignalArguments... args );
+
+            boost_signal* Signal();
+
+            const std::string& GetName() const;
+
+        protected:
+            boost_signal fSignal;
+
+            std::string fName;
+    };
+*/
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    template< typename... XArgs >
+    Signal< XArgs... >::Signal( const std::string& name ) :
+            SignalBase( name )
+    {}
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
+            SignalBase( name )
+    {
+        owner->RegisterSignal( name, this );
+    }
+
+    template< typename... XArgs >
+    Signal< XArgs... >::~Signal()
+    {
+        DisconnectAll();
+    }
+
+    template< typename... XArgs >
+    void Signal< XArgs... >::Connect( SlotBase* slot, int group )
+    {
+        if( fConnections.count( slot ) != 0 )
+        {
+            LWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
+            return;
+        }
+
+        // ensure that the slot is of the correct type
+        if( ! dynamic_cast< Slot< XArgs... >* >( slot ) )
+        {
+            THROW_EXCEPT_HERE( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+                    "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
+                    "\tArgument types do not match" );
+
+            //BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+            //        "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
+            //        "\tArgument types do not match" << eom );
+        }
+/*
+        Connection connection;
+        if( group >= 0 )
+        {
+            connection = fInternalSignal.connect( group, derivedSlot->Function() );
+        }
+        else
+        {
+            connection = fInternalSignal.connect( derivedSlot->Function() );
+        }
+*/
+        AddConnection( slot, group );
+
+        return;
+    }
+
+    // calls all connected functions
+    template< typename... XArgs >
+    inline void Signal< XArgs... >::Emit( XArgs... args )
+    {
+        (*this)( args... );
+        return;
+    }
+
+    template< typename... XArgs >
+    inline void Signal< XArgs... >::operator()( XArgs... args )
+    {
+        SharedControl* control = SharedControl::get_instance();
+
+        // Check for whether we need to quit from external input:
+        // - if we're canceled, then quit the thread
+        // - if we're at a break, then wait to continue;
+        //     once we continue, if we need to quit, then do so
+        if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
+        {
+            QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+        }
+
+        // Check for whether this signal emission has a breakpoint
+        if( fDoBreakpoint )
+        {
+            // do the break
+            control->Break( args... );
+            // wait to continue; once we continue, if we need to quit, then do so
+            if( ! control->WaitToContinue() )
+            {
+                QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
+            }
+        }
+
+        // Emit signal by calling all connected slots
+        for( auto connection : fConnections )
+        {
+//            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );
+            static_cast< Slot< XArgs... >* >(connection)->operator()( args... );
+        }
+        return;
+    }
+
+/*
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::Signal( const std::string& name, Processor* proc ) :
+            fSignal(),
+            fName( name )
+    {
+        proc->RegisterSignal(name, &fSignal);
+    }
+
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::Signal() :
+            fSignal(),
+            fName("none")
+    {}
+
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::Signal( const Signal& signal ) :
+            fSignal(),
+            fName( signal.fName )
+    {}
+
+    template< class... XSignalArguments >
+    Signal< XSignalArguments... >::~Signal()
+    {
+    }
+
+    template< class... XSignalArguments >
+    inline void Signal< XSignalArguments... >::operator()( XSignalArguments... args )
+    {
+        fSignal( args... );
+    }
+
+    template< class... XSignalArguments >
+    inline typename Signal< XSignalArguments... >::boost_signal* Signal< XSignalArguments... >::Signal()
+    {
+        return &fSignal;
+    }
+
+    template< class... XSignalArguments >
+    inline const std::string& Signal< XSignalArguments... >::GetName() const
+    {
+        return fName;
+    }
+*/
+} /* namespace Nymph */
+
+#endif /* NYMPH_SIGNAL_HH_ */
diff --git a/Cpp/Library/Processor/SignalSlotBase.cc b/Cpp/Library/Processor/SignalSlotBase.cc
new file mode 100644
index 0000000..ec234ce
--- /dev/null
+++ b/Cpp/Library/Processor/SignalSlotBase.cc
@@ -0,0 +1,52 @@
+/*
+ * SignalSlotBase.cc
+ *
+ *  Created on: Sept 7, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "SignalSlotBase.hh"
+
+namespace Nymph
+{
+    SlotBase::SlotBase( const std::string& name ) :
+            fName( name ),
+            fConnections()//,
+            //fSignalsUsed()
+    {}
+
+    SlotBase::~SlotBase()
+    {}
+
+    void SlotBase::DisconnectAll()
+    {
+        while( ! fConnections.empty() )
+        {
+            Disconnect( *fConnections.begin() );
+        }
+        return;
+    }
+
+    SignalBase::SignalBase( const std::string& name ) :
+            fName( name ),
+            fConnections(),
+            //fControl( nullptr ),
+            fDoBreakpoint( false )
+    {}
+
+    SignalBase::~SignalBase()
+    {}
+
+    // disconnects all previously connected functions
+    void SignalBase::DisconnectAll()
+    {
+        while( ! fConnections.empty() )
+        {
+            Disconnect( *fConnections.begin() );
+        }
+        return;
+    }
+
+
+}
+
diff --git a/Cpp/Library/Processor/SignalSlotBase.hh b/Cpp/Library/Processor/SignalSlotBase.hh
new file mode 100644
index 0000000..1029317
--- /dev/null
+++ b/Cpp/Library/Processor/SignalSlotBase.hh
@@ -0,0 +1,129 @@
+/*
+ * SignalSlotBase.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_SIGNALSLOTBASE_HH_
+#define NYMPH_SIGNALSLOTBASE_HH_
+
+//#include "ControlAccess.hh"
+#include "Exception.hh"
+#include "MemberVariable.hh"
+
+#include <memory>
+#include <set>
+#include <string>
+#include <vector>
+
+namespace Nymph
+{
+
+    class SignalException : public scarab::typed_exception< SignalException >
+    {
+        public:
+            using scarab::typed_exception< SignalException >::typed_exception;
+            ~SignalException() = default;
+    };
+
+    class SlotException : public scarab::typed_exception< SlotException >
+    {
+        public:
+            using scarab::typed_exception< SlotException >::typed_exception;
+            ~SlotException() = default;
+    };
+
+    class ConnectionException : public scarab::typed_exception< ConnectionException >
+    {
+        public:
+            using scarab::typed_exception< ConnectionException >::typed_exception;
+            ~ConnectionException() = default;
+    };
+
+
+    class SignalBase;
+
+    class SlotBase
+    {
+        public:
+            SlotBase( const std::string& name );
+            //template< typename XOwner >
+            //SlotBase( const std::string& name, XOwner* owner );
+            virtual ~SlotBase();
+
+            virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
+
+            void Disconnect( SignalBase* signal);
+            void DisconnectAll();
+
+            MEMVAR_REF( std::string, Name );
+
+            typedef std::set< SignalBase* > SignalConnections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE( SignalConnections, Connections );
+
+            //MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
+
+        protected:
+            friend class SignalBase;
+            virtual void AddConnection( SignalBase* signal );
+    };
+
+
+    class SignalBase
+    {
+        public:
+            SignalBase( const std::string& name );
+            //template< typename XOwner >
+            //SignalBase( const std::string& name, XOwner* owner );
+            virtual ~SignalBase();
+
+            virtual void Connect( SlotBase* slot, int group = -1 ) = 0;
+
+            void Disconnect( SlotBase* slot );
+            void DisconnectAll();
+
+            MEMVAR_REF( std::string, Name );
+
+            typedef std::set< SlotBase* > SlotConnections; // to get around the problem of having a comma inside a macro function argument
+            MEMVAR_REF_MUTABLE_CONST( SlotConnections, Connections );
+
+            //MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
+
+            MEMVAR( bool, DoBreakpoint );
+
+        protected:
+            friend class SlotBase;
+            virtual void AddConnection( SlotBase* slot, int group );
+    };
+
+    inline void SlotBase::AddConnection( SignalBase* signal )
+    {
+        fConnections.insert( signal );
+        return;
+    }
+
+    inline void SlotBase::Disconnect( SignalBase* signal )
+    {
+        signal->Disconnect( this );
+        return;
+    }
+
+    inline void SignalBase::AddConnection( SlotBase* slot, int group )
+    {
+        fConnections.insert( slot );
+        slot->AddConnection( this );
+        return;
+    }
+
+    // disconnects a previously connected function
+    inline void SignalBase::Disconnect( SlotBase* slot )
+    {
+        slot->fConnections.erase( this );
+        fConnections.erase( slot );
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SIGNALSLOTBASE_HH_ */
diff --git a/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
new file mode 100644
index 0000000..1eb33a8
--- /dev/null
+++ b/Cpp/Library/Processor/Slot.hh
@@ -0,0 +1,241 @@
+/*
+ * Slot.hh
+ *
+ *  Created on: Jan 13, 2013
+ *      Author: N.S. Oblath
+ * 
+ *  Based on this implementation: https://schneegans.github.io/tutorials/2015/09/20/signal-slot
+ */
+
+#ifndef NYMPH_SLOT_HH_
+#define NYMPH_SLOT_HH_
+
+#include "SignalSlotBase.hh"
+
+//#include "Exception.hh"
+
+#include "logger.hh"
+
+#include <boost/function.hpp>
+
+#include <initializer_list>
+
+namespace Nymph
+{
+    LOGGER(slotlog, "Slot");
+
+    // Type XOwner is the class that owns the Slot object
+    template< typename... XArgs >
+    class Slot : public SlotBase
+    {
+        public:
+            using signature = void( XArgs... );
+//            using full_signature = void( ControlAccessPtr, XArgs... );
+            using signal_list = std::initializer_list< std::string >;
+
+        public:
+            /// Unowned slot
+            Slot( const std::string& name, const boost::function< signature >& func );
+            /// Owned slot, non-const member function
+            template< typename XOwner >
+            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
+            /// Owned slot, const member function
+            template< typename XOwner >
+            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
+            /// Owned slot, generic function
+            template< typename XOwner >
+            Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
+            /// Owned slot, non-const member fuction of another class
+            template< typename XOwner, typename XFuncClass >
+            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
+            /// Owned slot, const member fuction of another class
+            template< typename XOwner, typename XFuncClass >
+            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
+            Slot( const Slot& ) = delete;
+            Slot( Slot&& ) = delete;
+            virtual ~Slot();
+
+            void ConnectTo( SignalBase* signal, int group = -1 );
+
+            /// execute fFunction without using a ControlAccess object
+            void operator()( XArgs... args );
+
+            /// execute fFunction with a ControlAccess object
+//            void operator()( ControlAccessPtr access, XArgs... args );
+
+            MEMVAR_REF( boost::function< signature >, Function );
+
+            MEMVAR( bool, DoBreakpoint );
+
+        protected:
+//            void SlotFuncWrapper( ControlAccessPtr access, XArgs... args );
+            void SlotFuncWrapper( XArgs... args );
+    };
+
+
+    /*!
+     @class Slot
+     @author N. S. Oblath
+
+     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
+
+     @details
+     Usage:
+     To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
+     The function should have the signature void (Args).
+
+     In your Processor's header add a member variable of type Slot< ProcessorType, ReturnType, Args >.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+    *//*
+    template< typename... Args >
+    class Slot
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            Slot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            Slot( const std::string& name, Processor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
+
+            virtual ~Slot();
+
+            const std::string& GetName() const;
+
+            SlotWrapper* GetSlotWrapper();
+
+        protected:
+            std::string fName;
+            SlotWrapper* fSlotWrapper;
+    };
+*/
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    // Slot
+
+    template< typename... XArgs >
+    Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func ) :
+            SlotBase( name ),
+            fFunction( func ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint( false )
+    {}
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+            SlotBase( name ),
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+            SlotBase( name ),
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+            SlotBase( name ),
+            fFunction( func ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+            SlotBase( name ),
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+            SlotBase( name ),
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            //fThreadRef( std::make_shared< ThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    Slot< XArgs... >::~Slot()
+    {
+        DisconnectAll();
+    }
+
+    template< typename... XArgs >
+    void Slot< XArgs... >::ConnectTo( SignalBase* signal, int group )
+    {
+        if( fConnections.count( signal ) != 0 )
+        {
+            LWARN( signallog, "Slot <" << fName << "> is already has connection to signal <" << signal->Name() << ">" );
+            return;
+        }
+
+        signal->Connect( this, group );
+
+        return;
+    }
+
+    template< typename... XArgs >
+    inline void Slot< XArgs... >::operator()( XArgs... args )
+    {
+//        fFunction( args... );
+        SlotFuncWrapper( args... );
+        return;
+    }
+/*
+    template< typename... XArgs >
+    inline void Slot< XArgs... >::operator()( ControlAccessPtr access, XArgs... args )
+    {
+        SlotFuncWrapper( access, args... );
+        return;
+    }
+*/
+    template< typename... XArgs >
+    inline void Slot< XArgs... >::SlotFuncWrapper( /*ControlAccessPtr access,*/ XArgs... args )
+    {
+        //TODO could do something with `access` here
+        //NOTE (12/9/21): instead of using `access`, get SharedControl and use that
+        //for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
+        //{
+        //    (*signalIt)->SetControl( access );
+        //}
+
+        fFunction( args... );
+
+        //TODO could do more with `access` here
+
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SLOT_HH_ */
diff --git a/Cpp/Library/Utility/Exception.cc b/Cpp/Library/Utility/Exception.cc
new file mode 100644
index 0000000..707d749
--- /dev/null
+++ b/Cpp/Library/Utility/Exception.cc
@@ -0,0 +1,74 @@
+/*
+ * Exception.cc
+ *
+ *  Created on: Feb 25, 2014
+ *      Author: nsoblath
+ */
+
+#include "Exception.hh"
+
+#include "logger.hh"
+
+LOGGER( exlog, "Exception" );
+
+namespace Nymph
+{
+    void PrintException( const scarab::base_exception& e, unsigned count )
+    {
+        std::string prefix = std::to_string(count) + ": ";
+        LINFO( exlog, prefix << "Thrown at: " << e.where() );
+        LINFO( exlog, prefix << e.what() );
+        try
+        {
+            std::rethrow_if_nested( e );
+        }
+        catch(const Nymph::Exception& e)
+        {
+            PrintException( e, ++count );
+        }
+        return;
+    }
+
+/*
+    BaseException::BaseException() :
+            std::exception(),
+            fAtFilename( "unknown" ),
+            fAtLineNumber( 0 ),
+            fBuffer()
+    {}
+
+    BaseException::~BaseException() noexcept
+    {}
+
+    const char* BaseException::where() const noexcept
+    {
+        try
+        {
+            fBuffer = fAtFilename + "(" + std::to_string(fAtLineNumber) + ")";
+        }
+        catch(const std::bad_alloc& e)
+        {
+            fBuffer = fAtFilename;
+        }
+        return fBuffer.c_str();
+    }
+*/
+/* removed for trying home-grown exceptions, 1/10/22
+    Exception::Exception() :
+            boost::exception(),
+            std::exception(),
+            fMsgBuffer()
+    {
+    }
+    Exception::Exception( const Exception& an_exception ) :
+            boost::exception( an_exception ),
+            std::exception( an_exception ),
+            fMsgBuffer( an_exception.fMsgBuffer )
+    {
+    }
+
+    Exception::~Exception() throw ()
+    {
+    }
+*/
+}
diff --git a/Cpp/Library/Utility/Exception.hh b/Cpp/Library/Utility/Exception.hh
new file mode 100644
index 0000000..479241a
--- /dev/null
+++ b/Cpp/Library/Utility/Exception.hh
@@ -0,0 +1,201 @@
+/*
+ * Exception.hh
+ *
+ *  Created on: Feb 25, 2014
+ *      Author: nsoblath
+ */
+
+
+#ifndef NYMPH_EXCEPTION_HH_
+#define NYMPH_EXCEPTION_HH_
+
+#include "base_exception.hh"
+
+//#include <boost/exception/all.hpp>
+
+//#include <exception>
+//#include <sstream>
+//#include <string>
+
+namespace Nymph
+{
+    /*
+    class BaseException : virtual public std::exception
+    {
+        public:
+            BaseException();
+            ~BaseException() noexcept;
+
+            MEMVAR_REF( std::string, AtFilename );
+            MEMVAR( int, AtLineNumber );
+
+            virtual const char* where() const noexcept;
+
+        private:
+            mutable std::string fBuffer;
+    };
+
+    template< typename XDerived >
+    class TypedException : virtual public scarab::base_exception< XDerived >, public BaseException
+    {
+        public:
+            TypedException();
+            TypedException( const std::string& filename, int lineNum );
+            ~TypedException() noexcept;
+
+            XDerived& operator()( const std::string& filename, int lineNum );
+
+    };
+    */
+
+    class Exception : public scarab::typed_exception< Exception >
+    {
+        public:
+            using scarab::typed_exception< Exception >::typed_exception;
+            virtual ~Exception() noexcept = default;
+    };
+
+#define CREATE_EXCEPT_HERE( anException )  anException( __FILE__, __LINE__ )
+#define EXCEPT_HERE( anException )  (anException)( __FILE__, __LINE__ )
+
+#define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( anException )
+#define THROW_NESTED_EXCEPT_HERE( anException ) std::throw_with_nested( EXCEPT_HERE( anException ) )
+
+/// Recursive print function for potentially-nested exceptions
+void PrintException( const scarab::base_exception& e, unsigned count = 0 );
+
+/*
+    template< typename XDerived >
+    TypedException< XDerived >::TypedException() :
+            scarab::base_exception< XDerived >(),
+            BaseException()
+    {}
+
+    template< typename XDerived >
+    TypedException< XDerived >::TypedException( const std::string& filename, int lineNumber ) :
+            scarab::base_exception< XDerived >(),
+            BaseException()
+    {
+        fAtFilename = filename;
+        fAtLineNumber = lineNumber;
+    }
+
+    template< typename XDerived >
+    TypedException< XDerived >::~TypedException() noexcept
+    {}
+
+    template< typename XDerived >
+    XDerived& TypedException< XDerived >::operator()( const std::string& filename, int lineNumber )
+    {
+        fAtFilename = filename;
+        fAtLineNumber = lineNumber;
+        return *static_cast< XDerived* >(this);
+    }
+*/
+/* removed for trying home-grown exceptions, 1/10/22
+    struct MessageEnd {};
+    static const MessageEnd eom = MessageEnd();
+
+    //typedef boost::error_info<struct tag_errmsg, std::string> ErrorMsgInfo;
+
+    template< class XLabel >
+    using ErrorMsgInfo = boost::error_info< XLabel, std::string>;
+*/
+    /* // removed for trying home-grown exceptions, 1/10/22
+     @class Exception
+     @author N.S. Oblath
+
+     @brief Exception base class for Nymph and Nymph-based projects
+
+     @details
+
+     How to throw:
+
+     BOOST_THROW_EXCEPTION( Exception() << "[error message here]" << eom );
+
+     Why do it like this?
+      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
+      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
+      - Exception can be replaced with whatever derived exception class you're using.
+
+      How to catch, add information, and re-throw:
+
+      try
+      {
+          // code that throws a Exception
+      }
+      catch( boost::exception& e )
+      {
+          e << ErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
+          throw;
+      }
+
+
+      How to do the final catch
+
+      try
+      {
+          // code that throws a Exception
+      }
+      catch( boost::exception& e )
+      {
+          ERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
+      }
+    */
+/* removed for trying home-grown exceptions, 1/10/22
+    class Exception : virtual public boost::exception, virtual public std::exception
+    {
+        public:
+            Exception();
+            Exception( const Exception& );
+            ~Exception() throw ();
+
+            // adds to the message buffer
+            template< class XStreamable >
+            Exception& operator<<( XStreamable a_fragment );
+            // adds to the message buffer
+            Exception& operator<<( const std::string& a_fragment );
+            // adds to the message buffer
+            Exception& operator<<( const char* a_fragment );
+
+            // adds the current contents of the message buffer as a ErrorMsgInfo
+            Exception& operator<<( const MessageEnd& eom );
+
+        private:
+            mutable std::string fMsgBuffer;
+    };
+
+    template< class XStreamable >
+    Exception& Exception::operator<<( XStreamable a_fragment )
+    {
+        std::stringstream stream;
+        stream << a_fragment;
+        stream >> fMsgBuffer;
+        return *this;
+    }
+
+    inline Exception& Exception::operator<<( const std::string& a_fragment )
+    {
+        fMsgBuffer += a_fragment;
+        return *this;
+    }
+
+    inline Exception& Exception::operator<<( const char* a_fragment )
+    {
+        fMsgBuffer += std::string( a_fragment );
+        return *this;
+    }
+
+    inline Exception& Exception::operator<<( const MessageEnd& eom )
+    {
+        if( ! fMsgBuffer.empty() )
+        {
+            boost::operator<<( *this, ErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
+            fMsgBuffer.clear();
+        }
+        return *this;
+    }
+*/
+}
+
+#endif /* NYMPH_EXCEPTION_HH_ */
diff --git a/Cpp/Library/Utility/MemberVariable.hh b/Cpp/Library/Utility/MemberVariable.hh
new file mode 100644
index 0000000..b48e3ef
--- /dev/null
+++ b/Cpp/Library/Utility/MemberVariable.hh
@@ -0,0 +1,93 @@
+/*
+ * MemberVariable.hh
+ *
+ *  Created on: Aug 5, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef NYMPH_MEMBERVARIABLE_HH_
+#define NYMPH_MEMBERVARIABLE_HH_
+
+/**
+ * Macros for class member variables
+ *
+ * In all cases remember to initialize the variables!
+ *
+ * For "normal" variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [type fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMVAR
+ *  - MEMVAR_NOSET
+ *  - MEMVAR_STATIC
+ *  - MEMVAR_STATIC_NOSET
+ *
+ * For variables accessed by reference
+ * Defines accessors [const type& MyVar() const], [type& MyVar()], and member variable [type fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMVAR_REF
+ *  - MEMVAR_REF_CONST
+ *  - MEMVAR_REF_STATIC
+ *  - MEMVAR_REF_STATIC_CONST
+ *
+ * For pointer variables
+ * Defines accessors [type* GetMyVar() const], [void SetMyVar( type* )], and member variable [type* fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMVAR_PTR
+ *  - MEMVAR_PTR_NOSET
+ *  - MEMVAR_PTR_STATIC
+ *  - MEMVAR_PTR_STATIC_NOSET
+ *
+ * For shared_ptr's
+ * Defines accessors [const std::shared_ptr< type > MyVar() const], [std::shared_ptr< type > MyVar()], and member variable [std::shared_ptr< type > fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMVAR_SHARED_PTR
+ *  - MEMVAR_SHARED_PTR_CONST
+ *  - MEMVAR_SHARED_PTR_STATIC
+ *  - MEMVAR_SHARED_PTR_STATIC_CONST
+ *
+ * For atomic variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [std::atomic< type > fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMVAR_ATOMIC
+ *  - MEMVAR_ATOMIC_NOSET
+ *  - MEMVAR_ATOMIC_STATIC
+ *  - MEMVAR_ATOMIC_STATIC_NOSET
+ *
+ */
+
+#include "_camel_case_member_variables.hh"
+
+#define MEMVAR                         camel_case_mv_accessible
+#define MEMVAR_NOSET                   camel_case_mv_accessible_noset
+#define MEMVAR_STATIC                  camel_case_mv_accessible_static
+#define MEMVAR_STATIC_NOSET            camel_case_mv_accessible_static_noset
+#define MEMVAR_MUTABLE                 camel_case_mv_accessible_mutable
+#define MEMVAR_MUTABLE_NOSET           camel_case_mv_accessible_mutable_noset
+
+#define MEMVAR_REF                     camel_case_mv_referrable
+#define MEMVAR_REF_CONST               camel_case_mv_referrable_const
+#define MEMVAR_REF_STATIC              camel_case_mv_referrable_static
+#define MEMVAR_REF_MUTABLE             camel_case_mv_referrable_mutable
+#define MEMVAR_REF_MUTABLE_CONST       camel_case_mv_referrable_mutable
+
+#define MEMVAR_PTR                     camel_case_mv_assignable
+#define MEMVAR_PTR_NOSET               camel_case_mv_assignable_noset
+#define MEMVAR_PTR_STATIC              camel_case_mv_assignable_static
+#define MEMVAR_PTR_STATIC_NOSET        camel_case_mv_assignable_static_noset
+#define MEMVAR_PTR_MUTABLE             camel_case_mv_assignable_mutable
+#define MEMVAR_PTR_MUTABLE_NOSET       camel_case_mv_assignable_mutable_noset
+
+#define MEMVAR_SHARED_PTR              camel_case_mv_shared_ptr
+#define MEMVAR_SHARED_PTR_CONST        camel_case_mv_shared_ptr_const
+#define MEMVAR_SHARED_PTR_STATIC       camel_case_mv_shared_ptr_static
+#define MEMVAR_SHARED_PTR_MUTABLE      camel_case_mv_shared_ptr_mutable
+#define MEMVAR_SHARED_PTR_MUTABLE_CONST camel_case_mv_shared_ptr_mutable
+
+#define MEMVAR_ATOMIC                  camel_case_mv_atomic
+#define MEMVAR_ATOMIC_NOSET            camel_case_mv_atomic_noset
+#define MEMVAR_ATOMIC_STATIC           camel_case_mv_atomic_static
+#define MEMVAR_ATOMIC_STATIC_NOSET     camel_case_mv_atomic_static_noset
+#define MEMVAR_ATOMIC_MUTABLE          camel_case_mv_atomic_mutable
+#define MEMVAR_ATOMIC_MUTABLE_NOSET    camel_case_mv_atomic_mutable_noset
+
+#endif /* NYMPH_MEMBERVARIABLE_HH_ */
diff --git a/Cpp/Library_v1/AddLibPythonPath.sh.in b/Cpp/Library_v1/AddLibPythonPath.sh.in
new file mode 100644
index 0000000..68aff4b
--- /dev/null
+++ b/Cpp/Library_v1/AddLibPythonPath.sh.in
@@ -0,0 +1,3 @@
+# Adds the lib install directory to the python path
+
+export PYTHONPATH=@LIB_INSTALL_DIR@:$PYTHONPATH
diff --git a/Cpp/Library_v1/Application/KTApplication.cc b/Cpp/Library_v1/Application/KTApplication.cc
new file mode 100644
index 0000000..4bc4e01
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTApplication.cc
@@ -0,0 +1,174 @@
+/*
+ * KTApplication.cc
+ *
+ *  Created on: Aug 5, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTApplication.hh"
+
+#include "KTEventLoop.hh"
+#include "KTLogger.hh"
+
+#include "param_codec.hh"
+#include "param_json.hh"
+
+using std::set;
+using std::string;
+
+#include <iostream>
+
+namespace Nymph
+{
+    KTLOGGER(applog, "KTApplication");
+
+    KTApplication::KTApplication() :
+            KTConfigurable("app"),
+            fCLHandler(KTCommandLineHandler::get_instance()),
+            fConfigurator( KTConfigurator::get_instance() ),
+            fConfigFilename()
+    {
+    }
+
+    KTApplication::KTApplication(int argC, char** argV, bool requireArgs, const scarab::param_node& defaultConfig) :
+            KTConfigurable("app"),
+            fCLHandler(KTCommandLineHandler::get_instance()),
+            fConfigurator( KTConfigurator::get_instance() ),
+            fConfigFilename()
+    {
+        // process command-line arguments
+        fCLHandler->ProcessCommandLine(argC, argV);
+
+        // if requested, print help or version messages, and exit
+        if (fCLHandler->GetPrintHelpMessageFlag() || (requireArgs && fCLHandler->GetNArgs() == 1))
+        {
+            fCLHandler->PrintHelpMessage();
+            exit(0);
+        }
+        if (fCLHandler->GetPrintVersionMessage())
+        {
+            fCLHandler->PrintVersionMessage();
+            exit(0);
+        }
+
+        // get configuration information from the CLHandler
+        fConfigFilename = fCLHandler->GetConfigFilename();
+        string clJSON = fCLHandler->GetCommandLineJSON();
+        const scarab::param_node* clConfigOverride = fCLHandler->GetConfigOverride();
+
+        // Default configuration
+        fConfigurator->Merge(defaultConfig);
+
+        // JSON file configuration
+        if (! fConfigFilename.empty())
+        {
+            scarab::path configFilePath = scarab::expand_path( fConfigFilename );
+            scarab::param_translator translator;
+            scarab::param_ptr_t configFromFile = translator.read_file( configFilePath.native() );
+            if( configFromFile == NULL )
+            {
+                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] error parsing config file" << eom );
+            }
+            if( ! configFromFile->is_node() )
+            {
+                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] configuration file must consist of an object/node" << eom );
+            }
+            fConfigurator->Merge( configFromFile->as_node() );
+        }
+
+        // Command-line JSON configuration
+        if (! clJSON.empty())
+        {
+            scarab::param_input_json inputJSON;
+            scarab::param_ptr_t configFromJSON = inputJSON.read_string( clJSON );
+            if( ! configFromJSON->is_node() )
+            {
+                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] command line json must be an object" << eom );
+            }
+            fConfigurator->Merge( configFromJSON->as_node() );
+        }
+
+        // Command-line overrides
+        if (clConfigOverride != NULL)
+        {
+            fConfigurator->Merge( *clConfigOverride );
+        }
+
+        KTINFO( applog, "Final configuration:\n" << fConfigurator->Config() );
+
+        AddConfigOptionsToCLHandler(fConfigurator->Config(), "");
+        fCLHandler->FinalizeNewOptionGroups();
+
+        if (fCLHandler->GetPrintHelpMessageAfterConfigFlag())
+        {
+        	fCLHandler->PrintHelpMessage();
+        	exit(0);
+        }
+
+        fCLHandler->DelayedCommandLineProcessing();
+    }
+
+    KTApplication::~KTApplication()
+    {
+        for (set< KTEventLoop* >::iterator loopIt = fEventLoops.begin(); loopIt != fEventLoops.end(); ++loopIt)
+        {
+            // does NOT delete event loops
+            (*loopIt)->Stop();
+        }
+    }
+
+    void KTApplication::AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName)
+    {
+    	if (param.is_null())
+    	{
+    		fCLHandler->AddOption("Config File Options", "Configuration flag: " + rootName, rootName, false);
+    	}
+    	else if (param.is_value())
+    	{
+    		fCLHandler->AddOption< string >("Config File Options", "Configuration value: " + rootName, rootName, false);
+    	}
+    	else if (param.is_array())
+    	{
+        	string nextRootName(rootName);
+        	if (! rootName.empty() && rootName.back() != '.') nextRootName += ".";
+
+        	const scarab::param_array& paramArray = param.as_array();
+    		unsigned arraySize = paramArray.size();
+    		for (unsigned iParam = 0; iParam < arraySize; ++iParam)
+    		{
+    			AddConfigOptionsToCLHandler(paramArray[iParam], nextRootName + std::to_string(iParam));
+    		}
+    	}
+    	else if (param.is_node())
+    	{
+        	string nextRootName(rootName);
+        	if (! rootName.empty()) nextRootName += ".";
+
+        	const scarab::param_node& paramNode = param.as_node();
+    		for (scarab::param_node::const_iterator nodeIt = paramNode.begin(); nodeIt != paramNode.end(); ++nodeIt)
+    		{
+    			AddConfigOptionsToCLHandler(*nodeIt, nextRootName + nodeIt.name());
+    		}
+    	}
+
+    	return;
+    }
+
+    bool KTApplication::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTApplication::AddEventLoop(KTEventLoop* loop)
+    {
+        fEventLoops.insert(loop);
+        return;
+    }
+
+    void KTApplication::RemoveEventLoop(KTEventLoop* loop)
+    {
+        fEventLoops.erase(loop);
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Application/KTApplication.hh b/Cpp/Library_v1/Application/KTApplication.hh
new file mode 100644
index 0000000..0b2dfc7
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTApplication.hh
@@ -0,0 +1,105 @@
+/**
+ @file KTApplication.hh
+ @brief Contains KTApplication
+ @details Interface for the command-line handler and the parameter store
+ @author: N. S. Oblath
+ @date: Created on: Aug 5, 2012
+ */
+
+#ifndef KTAPPLICATION_HH_
+#define KTAPPLICATION_HH_
+
+#include "KTCommandLineHandler.hh"
+#include "KTConfigurable.hh"
+#include "KTConfigurator.hh"
+
+#include "param.hh"
+
+#include <set>
+#include <string>
+
+namespace Nymph
+{
+    class KTEventLoop;
+    //class scarab::param_node;
+
+    /*!
+     @class KTApplication
+     @author N. S. Oblath
+
+     @brief Interface for the command-line handler and the configurator.
+
+     @details
+     The interface implemented here is meant to simplify the use of the command line and parameter store.
+
+     The basic format for the command line arguments are as follows:
+      - The first argument should be the configuration filename, if you're using one.
+      - All further arguments should either use the "long format" or the "short format":
+          o Long format: --long-option-name[=value]
+          o Short format: -s[value]
+        Strings with spaces should be put in quotation marks.
+
+     When creating an application, the user would perform the following steps:
+     1. Create the KTApplication and pass it the command-line arguments (argc and argv).
+        The configuration file will be automatically extracted from the command line.
+        If --help (-h) or --version (-v) were given, those will be handled immediately, and the program will exit.
+     2. Call KTApplication::ReadConfigFile() to read the config file and store the values in the parameter store.
+     3. Use KTAppilcation::GetNode(address) to get parameter-store nodes.
+
+     Event Loops:
+     KTApplication can oversee the running of event loops.  It takes a very light-handed approach to that oversight.
+     In the event that the KTApplication object is deleted, all loops it knows about will be stopped.
+     Event loops are not deleted.
+     If an event loop is going out of scope before the KTApplication object, the user should make sure to remove it from
+     KTApplication's oversight.
+    */
+    class KTApplication : public KTConfigurable
+    {
+        public:
+            KTApplication();
+            /// Constructor to use with command-line options; includes parsing of the command line by KTCommandLineHandler (except for config-file-dependent options)
+            KTApplication(int argC, char** argV, bool requireArgs=true, const scarab::param_node& defaultConfig=scarab::param_node());
+            virtual ~KTApplication();
+
+        private:
+            void AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName);
+
+        public:
+            virtual bool Configure(const scarab::param_node& node);
+
+        public:
+            KTCommandLineHandler* GetCommandLineHandler() const;
+            const KTConfigurator* GetConfigurator() const;
+
+            const std::string& GetConfigFilename() const;
+
+            void AddEventLoop(KTEventLoop* loop); /// Adds loop to the set of event loops overseen by KTApplication.  Does NOT assume ownership of an event loop
+            void RemoveEventLoop(KTEventLoop* loop); /// Removes loop from the set of event loops overseen by KTApplication. Does not stop the loop.
+
+        protected:
+            KTCommandLineHandler* fCLHandler;
+            KTConfigurator* fConfigurator;
+
+            std::string fConfigFilename;
+
+            std::set< KTEventLoop* > fEventLoops;
+
+    };
+
+    inline KTCommandLineHandler* KTApplication::GetCommandLineHandler() const
+    {
+        return fCLHandler;
+    }
+
+    inline const KTConfigurator* KTApplication::GetConfigurator() const
+    {
+        return fConfigurator;
+    }
+
+    inline const std::string& KTApplication::GetConfigFilename() const
+    {
+        return fConfigFilename;
+    }
+
+} /* namespace Nymph */
+#endif /* KTAPPLICATION_HH_ */
diff --git a/Cpp/Library_v1/Application/KTCommandLineHandler.cc b/Cpp/Library_v1/Application/KTCommandLineHandler.cc
new file mode 100644
index 0000000..5023633
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTCommandLineHandler.cc
@@ -0,0 +1,458 @@
+/*
+ * KTCommandLineHandler.cxx
+ *
+ *  Created on: Nov 21, 2011
+ *      Author: nsoblath
+ */
+
+#include "KTCommandLineHandler.hh"
+
+#include "KTCommandLineOption.hh"
+
+//#include "NymphConfig.hh"
+
+#include <sstream>
+
+#ifndef PACKAGE_STRING
+#define PACKAGE_STRING Nymph (unknown version)
+#endif
+#define STRINGIFY_1(x) #x
+#define STRINGIFY_2(x) STRINGIFY_1(x)
+
+using std::string;
+using std::vector;
+
+namespace Nymph
+{
+    KTLOGGER(utillog, "KTCommandLineHandler");
+
+    KTCommandLineHandler::KTCommandLineHandler() :
+            fExecutableName("NONE"),
+            fPackageString(STRINGIFY_2(PACKAGE_STRING)),
+            fNArgs(0),
+            fArgV(NULL),
+            fArgumentsTaken(false),
+            fCommandLineOptions(),
+            fPrintHelpOptions(),
+            fCommandLineParseLater(),
+            fParsedOptions(NULL),
+            fCommandLineVarMap(),
+            fConfigOverrideValues(),
+            fPrintHelpMessage(false),
+            fPrintVersionMessage(false),
+            fPrintHelpMessageAfterConfig(false),
+            fConfigFilename(),
+            fCommandLineJSON()
+    {
+    }
+
+    KTCommandLineHandler::~KTCommandLineHandler()
+    {
+        while (! fProposedGroups.empty())
+        {
+            OptDescMapIt tIter = fProposedGroups.begin();
+            delete tIter->second;
+            fProposedGroups.erase(tIter);
+        }
+    }
+
+    bool KTCommandLineHandler::TakeArguments(int argC, char** argV)
+    {
+        if (fArgumentsTaken) return false;
+
+        fNArgs = argC;
+        fArgV = argV;
+        fArgumentsTaken = true;
+
+        return true;
+    }
+
+    bool KTCommandLineHandler::ProcessCommandLine(int argC, char** argV)
+    {
+    	TakeArguments(argC, argV);
+
+        InitialCommandLineProcessing();
+
+        return DelayedCommandLineProcessing();
+    }
+
+    //**************
+
+    bool KTCommandLineHandler::GetArgumentsTaken()
+    {
+        return fArgumentsTaken;
+    }
+
+    int KTCommandLineHandler::GetNArgs()
+    {
+        return fNArgs;
+    }
+
+    char** KTCommandLineHandler::GetArgV()
+    {
+        return fArgV;
+    }
+
+    //**************
+
+    KTCommandLineHandler::OptDescMapIt KTCommandLineHandler::CreateNewOptionGroup(const string& aTitle)
+    {
+        po::options_description* tNewOpts = new po::options_description(aTitle);
+        std::pair< OptDescMapIt, bool > result = fProposedGroups.insert(OptDescMap::value_type(aTitle, tNewOpts));
+        if (! result.second)
+        {
+            KTWARN(utillog, "There is already an option group with title <" << aTitle << ">");
+            delete tNewOpts;
+        }
+
+        return result.first;
+    }
+
+    bool KTCommandLineHandler::AddOption(const string& aTitle, const string& aHelpMsg, const string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate)
+    {
+        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
+        {
+            if (aWarnOnDuplicate)
+                KTWARN(utillog, "There is already an option called <" << aLongOpt << ">");
+            return false;
+        }
+        if (aShortOpt != '#')
+        {
+            if (fAllOptionsShort.find(aShortOpt) != fAllOptionsShort.end())
+            {
+                if (aWarnOnDuplicate)
+                        KTWARN(utillog, "There is already a short option called <" << aShortOpt << ">");
+                return false;
+            }
+        }
+
+        // option is okay at this point
+
+        OptDescMapIt tIter = fProposedGroups.find(aTitle);
+        if (tIter == fProposedGroups.end())
+        {
+            tIter = CreateNewOptionGroup(aTitle);
+        }
+
+        string tOptionName = aLongOpt;
+        fAllOptionsLong.insert(aLongOpt);
+        if (aShortOpt != '#')
+        {
+            tOptionName += "," + string(&aShortOpt);
+            fAllOptionsShort.insert(aShortOpt);
+        }
+        tIter->second->add_options()(tOptionName.c_str(), aHelpMsg.c_str());
+
+        return true;
+    }
+
+    bool KTCommandLineHandler::AddOption(const string& aTitle, const string& aHelpMsg, const string& aLongOpt, bool aWarnOnDuplicate)
+    {
+        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
+        {
+            if (aWarnOnDuplicate)
+                KTWARN(utillog, "There is already an option called <" << aLongOpt << ">");
+            return false;
+        }
+
+        // option is okay at this point
+
+        OptDescMapIt tIter = fProposedGroups.find(aTitle);
+        if (tIter == fProposedGroups.end())
+        {
+            tIter = CreateNewOptionGroup(aTitle);
+        }
+
+        fAllOptionsLong.insert(aLongOpt);
+        tIter->second->add_options()(aLongOpt.c_str(), aHelpMsg.c_str());
+
+        return true;
+    }
+
+    po::options_description* KTCommandLineHandler::GetOptionsDescription(const string& aKey)
+    {
+        OptDescMapIt tIter = fProposedGroups.find(aKey);
+        if (tIter == fProposedGroups.end())
+        {
+            KTWARN(utillog, "There no proposed option group with key <" << aKey << ">");
+            return NULL;
+        }
+        return tIter->second;
+    }
+
+    //**************
+
+   bool KTCommandLineHandler::FinalizeNewOptionGroups()
+    {
+        for (OptDescMapIt tIter = fProposedGroups.begin(); tIter != fProposedGroups.end(); tIter++)
+        {
+            if (! AddCommandLineOptions(*(tIter->second)))
+            {
+                return false;
+            }
+            delete tIter->second;
+        }
+        fProposedGroups.clear();
+
+        return true;
+    }
+
+    bool KTCommandLineHandler::AddCommandLineOptions(const po::options_description& aSetOfOpts)
+    {
+        try
+        {
+            fCommandLineOptions.add(aSetOfOpts);
+            fPrintHelpOptions.add(aSetOfOpts);
+        }
+        catch (std::exception& e)
+        {
+            KTERROR(utillog, "Exception thrown while adding options: " << e.what());
+            return false;
+        }
+        catch (...)
+        {
+            KTERROR(utillog, "Exception was thrown, but caught in a generic way!");
+            return false;
+        }
+        return true;
+    }
+
+    //**************
+
+    bool KTCommandLineHandler::IsCommandLineOptSet(const string& aCLOption)
+    {
+        return fCommandLineVarMap.count(aCLOption) != 0;
+    }
+
+    //**************
+
+    bool KTCommandLineHandler::DelayedCommandLineProcessing()
+    {
+        if (! fProposedGroups.empty())
+        {
+            if (! this->FinalizeNewOptionGroups())
+            {
+                KTERROR(utillog, "An error occurred while adding the proposed option groups\n" <<
+                        "Command-line options were not parsed");
+                return false;
+            }
+        }
+
+        // Parse the command line options that remain after the initial parsing
+        try
+        {
+            fParsedOptions = po::command_line_parser(fCommandLineParseLater).options(fCommandLineOptions).allow_unregistered().run();
+        }
+        catch (std::exception& e)
+        {
+            KTERROR(utillog, "An error occurred while boost was parsing the command line options:\n" << e.what());
+            return false;
+        }
+
+        // these will be the unregistered items, which are assumed to be intended to edit the config file
+        vector< string > tRemainingToParse = po::collect_unrecognized(fParsedOptions.options, po::include_positional);
+
+        // Create the variable map from the parse options
+        po::store(fParsedOptions, fCommandLineVarMap);
+        po::notify(fCommandLineVarMap);
+
+        // now parse the remaining items into the config override param node
+        for (vector< string >::const_iterator tokenIt = tRemainingToParse.begin(); tokenIt != tRemainingToParse.end(); ++tokenIt)
+        {
+            string argument(*tokenIt);
+            size_t t_name_pos = argument.find_first_not_of( fDash );
+            size_t t_val_pos = argument.find_first_of( fSeparator );
+            // the name should have 2 dashes before it, and there should be a separator
+            if( t_name_pos == 2 && t_val_pos != string::npos )
+            {
+                string t_full_name(argument.substr( t_name_pos, t_val_pos-2 ));
+
+                size_t t_node_start_pos = 0;
+                size_t t_node_sep_pos = t_full_name.find_first_of( fNodeSeparator );
+                scarab::param_node& parentNode = fConfigOverrideValues;
+                while (t_node_sep_pos != string::npos)
+                {
+                    string nodeName(t_full_name.substr(t_node_start_pos, t_node_sep_pos));
+                    if (parentNode.has(nodeName))
+                    {
+<<<<<<< HEAD:Library_v1/Application/KTCommandLineHandler.cc
+                        parentNode = parentNode[nodeName]().as_node();
+                    }
+                    else
+                    {
+                        scarab::param_node* newChildNode = new scarab::param_node();
+                        parentNode.add(nodeName, newChildNode);
+                        parentNode = *newChildNode;
+=======
+                        parentNode = parentNode[nodeName].as_node();
+                    }
+                    else
+                    {
+                        parentNode.add(nodeName, scarab::param_ptr_t( new scarab::param_node()));
+                        parentNode = parentNode[nodeName].as_node();
+>>>>>>> develop:Library/Application/KTCommandLineHandler.cc
+                    }
+                    t_node_start_pos = t_node_sep_pos + 1;
+                    t_node_sep_pos = t_full_name.find_first_of(fNodeSeparator, t_node_start_pos);
+                }
+
+                string valueName(t_full_name.substr(t_node_start_pos, t_val_pos));
+
+                scarab::param_value* new_value = new scarab::param_value();
+                new_value->set(argument.substr( t_val_pos + 1 ));
+
+                //std::cout << "(parser) adding < " << t_name << "<" << t_type << "> > = <" << new_value.value() << ">" << std::endl;
+
+                parentNode.replace( valueName, new_value );
+
+                continue;
+            }
+
+            KTERROR(utillog, "Argument <" << argument << "> does not match --<name>=<value> pattern");
+            return false;
+        }
+
+        return true;
+    }
+
+    void KTCommandLineHandler::InitialCommandLineProcessing()
+    {
+        if (fNArgs <= 0 || fArgV == NULL)
+        {
+            fNArgs = 0;
+            fArgV = NULL;
+            return;
+        }
+
+        // Get the executable name
+        if (fNArgs >= 1) fExecutableName = string(fArgV[0]);
+
+        // If no arguments were given, just return now
+        if (fNArgs == 1) return;
+
+        // Define general options, and add them to the complete option list
+        po::options_description tGeneralOpts("General options");
+        tGeneralOpts.add_options()("help,h", "Print help message")("help-config", "Print help message after reading config file")("version,v", "Print version information");
+        /* WHEN NOT USING POSITIONAL CONFIG FILE ARGUMENT */
+        tGeneralOpts.add_options()("config,c", po::value< string >(), "Configuration file");
+        tGeneralOpts.add_options()("json,j", po::value< string >(), "Command-Line JSON");
+        /**/
+        // We want to have the general options printed if --help is used
+        fPrintHelpOptions.add(tGeneralOpts);
+
+        // Fill in the duplication-checking sets
+        fAllGroupKeys.insert("General");
+        fAllOptionsLong.insert("help");
+        fAllOptionsShort.insert('h');
+        fAllOptionsLong.insert("help-config");
+        fAllOptionsLong.insert("version");
+        fAllOptionsShort.insert('v');
+
+        // Define the option for the user configuration file; this does not get printed in list of options when --help is used
+        po::options_description tHiddenOpts("Hidden options");
+        /* WHEN USING POSITIONAL CONFIG FILE ARGUMENT
+        tHiddenOpts.add_options()("config-file", po::value< string >(), "Configuration file");
+        */
+        // Add together any options that will be parsed here, in the initial command-line processing
+        po::options_description tInitialOptions("Initial options");
+        tInitialOptions.add(tGeneralOpts).add(tHiddenOpts);
+
+        // Allow the UserConfiguration file to be specified with the only positional option
+        /* WHEN USING POSITIONAL CONFIG FILE ARGUMENT
+        po::positional_options_description tPositionOpt;
+        tPositionOpt.add("config-file", 1);
+        */
+
+        // Add contributions of other options from elsewhere in Nymph
+        FinalizeNewOptionGroups();
+
+        // Command line style
+        po::command_line_style::style_t pstyle = po::command_line_style::unix_style;
+        /*
+        po::command_line_style::style_t pstyle = po::command_line_style::style_t(
+                po::command_line_style::allow_long |
+                po::command_line_style::allow_short |
+                po::command_line_style::allow_dash_for_short |
+                po::command_line_style::long_allow_next |
+                po::command_line_style::long_allow_adjacent |
+                po::command_line_style::short_allow_next |
+                po::command_line_style::short_allow_adjacent |
+                po::command_line_style::allow_guessing |
+                po::command_line_style::allow_sticky);
+        */
+
+        po::parsed_options tParsedOpts(NULL);
+        // Parse the command line looking only for the general options
+        try
+        {
+            tParsedOpts = po::command_line_parser(fNArgs, fArgV).style(pstyle).options(tInitialOptions).allow_unregistered().run();
+            /* WHEN USING POSITIONAL CONFIG FILE ARGUMENT
+            tParsedOpts = po::command_line_parser(fNArgs, fArgV).style(pstyle).options(tInitialOptions).positional(tPositionOpt).allow_unregistered().run();
+            */
+        }
+        catch (std::exception& e)
+        {
+            KTERROR(utillog, "Exception caught while performing initial CL parsing:\n"
+                    << '\t' << e.what());
+            BOOST_THROW_EXCEPTION( KTException() << e.what() << eom );
+        }
+        // Save the remaining command-line options for later parsing (after the full option list has been populated)
+        fCommandLineParseLater = po::collect_unrecognized(tParsedOpts.options, po::include_positional);
+        /* some debugging couts
+        std::cout << "there are " << fCommandLineParseLater.size() << " tokens to parse later." << std::endl;
+        for (unsigned i = 0; i < fCommandLineParseLater.size(); i++)
+        {
+            std::cout << "   " << fCommandLineParseLater[i] << std::endl;
+        }
+        */
+
+        // Create the variable map from the general options
+        po::variables_map tGeneralOptsVarMap;
+        po::store(tParsedOpts, tGeneralOptsVarMap);
+        po::notify(tGeneralOptsVarMap);
+
+        // Use the general options information
+        if (tGeneralOptsVarMap.count("help"))
+        {
+            fPrintHelpMessage = true;
+        }
+        if (tGeneralOptsVarMap.count("help-config"))
+        {
+            fPrintHelpMessageAfterConfig = true;
+        }
+        if (tGeneralOptsVarMap.count("version"))
+        {
+            fPrintVersionMessage = true;
+        }
+        if (tGeneralOptsVarMap.count("config"))
+        {
+            fConfigFilename = tGeneralOptsVarMap["config"].as< string >();
+        }
+        if (tGeneralOptsVarMap.count("json"))
+        {
+            fCommandLineJSON = tGeneralOptsVarMap["json"].as< string >();
+        }
+
+        return;
+    }
+
+    //**************
+
+    void KTCommandLineHandler::PrintHelpMessage()
+    {
+        KTPROG(utillog, "\nUsage: " << fExecutableName << " [options]\n\n" <<
+               "  If using a config file, it should be specified as:  -c config_file.json\n" <<
+               "  Config file options can be modified using:  --address.of.option=\"value\"\n" <<
+               fPrintHelpOptions);
+        return;
+    }
+
+    void KTCommandLineHandler::PrintVersionMessage()
+    {
+        KTPROG(utillog, fExecutableName << " -- Version Information\n" << "Built with: " << fPackageString);
+        return;
+    }
+
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Application/KTCommandLineHandler.hh b/Cpp/Library_v1/Application/KTCommandLineHandler.hh
new file mode 100644
index 0000000..6aca4b9
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTCommandLineHandler.hh
@@ -0,0 +1,339 @@
+/**
+ @file KTCommandLineHandler.hh
+ @brief Contains KTCommandLineHandler
+ @details Parses and stores command-line options
+ @author: N. S. Oblath
+ @date: Created on: Nov 21, 2011
+ */
+
+#ifndef KTCOMMANDLINEHANDLER_H_
+#define KTCOMMANDLINEHANDLER_H_
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+#include "param.hh"
+#include "singleton.hh"
+
+#include <boost/program_options.hpp>
+namespace po = boost::program_options;
+
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+
+namespace Nymph
+{
+    KTLOGGER(utillog_clh, "KTCommandLineHandler.hh");
+
+    /*!
+     @class KTCommandLineHandler
+     @author N. S. Oblath
+
+     @brief Parses and stores command-line options
+
+     @details
+     The basic format for the command line arguments are as follows:
+      <!-- - The first argument should be the configuration filename, if you're using one. -->
+      - All further arguments should either use the "long format" or the "short format":
+          o Long format: --long-option-name[=value]
+                         --long-option-name [value]
+          o Short format: -s[value]
+                          -s [value]
+        Strings with spaces should be put in quotation marks.
+
+     The configuration file will be automatically extracted from the command line.
+     If --help (-h) or --version (-v) were given, those will be handled immediately, and the program will exit.
+    */
+
+    class KTCommandLineHandler : public scarab::singleton< KTCommandLineHandler >
+    {
+        protected:
+            typedef std::map< std::string, po::options_description* > OptDescMap;
+            typedef OptDescMap::iterator OptDescMapIt;
+            typedef OptDescMap::const_iterator OptDescMapCIt;
+
+            //**************
+            // Singleton
+            //**************
+
+        protected:
+            friend class scarab::singleton< KTCommandLineHandler >;
+            friend class scarab::destroyer< KTCommandLineHandler >;
+            KTCommandLineHandler();
+            virtual ~KTCommandLineHandler();
+
+            //**************
+            // Identification
+            //**************
+
+        public:
+            const std::string& GetExecutableName() const;
+            const std::string& GetPackageString() const;
+
+        private:
+            std::string fExecutableName; // from argv[0], if provided
+            std::string fPackageString; // Package name and version
+
+            //**************
+            // Command line arguments
+            //**************
+
+        public:
+            bool ProcessCommandLine(int argC, char** argV);
+
+            bool TakeArguments(int argC, char** argV);
+            bool GetArgumentsTaken();
+            int GetNArgs();
+            char** GetArgV();
+
+        private:
+            int fNArgs;
+            char** fArgV;
+            bool fArgumentsTaken;
+
+            //**************
+            // Option-adding interface
+            //**************
+
+        public:
+            /// Makes a new option group available for command line options.
+            OptDescMapIt CreateNewOptionGroup(const std::string& aTitle);
+
+            /// Simple option adding function, with short option (flag only; no values allowed)
+            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate=true);
+            /// Simple option adding function, without short option (flag only; no values allowed)
+            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, bool aWarnOnDuplicate=true);
+
+            /// Option-with-value adding function with short option
+            template< class XValueType >
+            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate=true);
+            /// Option-with-value adding function without short option
+            template< class XValueType >
+            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, bool aWarnOnDuplicate=true);
+
+            /// Request access to the options description object for more freedom (and responsibility!) in adding options
+            po::options_description* GetOptionsDescription(const std::string& aKey);
+
+            /// Adds the groups of options to the set of usable options groups (note: this must be called to make the options in the groups usable)
+            bool FinalizeNewOptionGroups();
+
+        protected:
+            OptDescMap fProposedGroups;
+            std::set< std::string > fAllGroupKeys;
+            std::set< std::string > fAllOptionsLong;
+            std::set< char > fAllOptionsShort;
+
+            po::options_description fCommandLineOptions;
+            po::options_description fPrintHelpOptions;
+
+        protected:
+            /// Adds a set of command line options
+            bool AddCommandLineOptions(const po::options_description& aSetOfOpts);
+
+            //**************
+            // Parsing
+            //**************
+
+        public:
+            /// Parses the general options and stores the remaining options available for later parsing
+            void InitialCommandLineProcessing();
+
+            /// Parses the remaining command line options (those that weren't parsed during the InitialCommandLineProcessing
+            bool DelayedCommandLineProcessing();
+
+        private:
+            std::vector< std::string > fCommandLineParseLater;
+
+            //**************
+            // Access to values
+            //**************
+
+        public:
+            /// Check if a command line option was set
+            bool IsCommandLineOptSet(const std::string& aCLOption);
+
+            /// Return the value of a command line option; throws an exception if the value was not set
+            template< class XReturnType >
+            XReturnType GetCommandLineValue(const std::string& aCLOption);
+
+            /// Return the value of a command line option; returns the default if the value was not set
+            template< class XReturnType >
+            XReturnType GetCommandLineValue(const std::string& aCLOption, XReturnType defaultValue);
+
+            bool GetPrintHelpMessageFlag() const;
+            bool GetPrintHelpMessageAfterConfigFlag() const;
+            bool GetPrintVersionMessage() const;
+
+            /// Return the file name provided by the user on the command line for the config file
+            const std::string& GetConfigFilename() const;
+
+            /// Return the string of json provided by the user on the command line
+            const std::string& GetCommandLineJSON() const;
+
+            const po::parsed_options* GetParsedOptions() const;
+            const po::variables_map* GetVariablesMap() const;
+
+            const scarab::param_node* GetConfigOverride() const;
+
+        private:
+            po::parsed_options fParsedOptions;
+            po::variables_map fCommandLineVarMap;
+
+            scarab::param_node fConfigOverrideValues;
+            static const char fDash = '-';
+            static const char fSeparator = '=';
+            static const char fNodeSeparator = '.';
+
+            bool fPrintHelpMessage;
+            bool fPrintHelpMessageAfterConfig;
+            bool fPrintVersionMessage;
+
+            std::string fConfigFilename;
+            std::string fCommandLineJSON;
+
+            //**************
+            // Print useful information
+            //**************
+
+        public:
+            virtual void PrintHelpMessage();
+            virtual void PrintVersionMessage();
+    };
+
+    inline const std::string& KTCommandLineHandler::GetExecutableName() const
+    {
+        return fExecutableName;
+    }
+    inline const std::string& KTCommandLineHandler::GetPackageString() const
+    {
+        return fPackageString;
+    }
+
+    template< class XValueType >
+    bool KTCommandLineHandler::AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate)
+    {
+        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
+        {
+            if (aWarnOnDuplicate)
+                KTWARN(utillog_clh, "There is already an option called <" << aLongOpt << ">");
+            return false;
+        }
+        if (fAllOptionsShort.find(aShortOpt) != fAllOptionsShort.end())
+        {
+            if (aWarnOnDuplicate)
+                KTWARN(utillog_clh, "There is already a short option called <" << aShortOpt << ">");
+            return false;
+        }
+
+        // option is okay at this point
+
+        OptDescMapIt tIter = fProposedGroups.find(aTitle);
+        if (tIter == fProposedGroups.end())
+        {
+            tIter = CreateNewOptionGroup(aTitle);
+        }
+
+        std::string tOptionName = aLongOpt;
+        fAllOptionsLong.insert(aLongOpt);
+        tOptionName += "," + std::string(&aShortOpt);
+        fAllOptionsShort.insert(aShortOpt);
+
+        tIter->second->add_options()(tOptionName.c_str(), po::value< XValueType >(), aHelpMsg.c_str());
+
+        return true;
+
+    }
+
+    template< class XValueType >
+    bool KTCommandLineHandler::AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, bool aWarnOnDuplicate)
+    {
+        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
+        {
+            if (aWarnOnDuplicate)
+                KTWARN(utillog_clh, "There is already an option called <" << aLongOpt << ">");
+            return false;
+        }
+
+        // option is okay at this point
+
+        OptDescMapIt tIter = fProposedGroups.find(aTitle);
+        if (tIter == fProposedGroups.end())
+        {
+            tIter = CreateNewOptionGroup(aTitle);
+        }
+
+        fAllOptionsLong.insert(aLongOpt);
+
+        tIter->second->add_options()(aLongOpt.c_str(), po::value< XValueType >(), aHelpMsg.c_str());
+
+        return true;
+
+    }
+
+
+    template< class XReturnType >
+    XReturnType KTCommandLineHandler::GetCommandLineValue(const std::string& aCLOption)
+    {
+        if (! IsCommandLineOptSet(aCLOption))
+        {
+            KTWARN(utillog_clh, "Command line option <" << aCLOption << "> was not set!\n"
+                   "Next time check whether it's set before calling this function.");
+            BOOST_THROW_EXCEPTION( KTException() << "Command line option " + aCLOption + " was not set!" << eom );
+        }
+        return fCommandLineVarMap[aCLOption].as< XReturnType >();
+    }
+
+    template< class XReturnType >
+    XReturnType KTCommandLineHandler::GetCommandLineValue(const std::string& aCLOption, XReturnType defaultValue)
+    {
+        if (! IsCommandLineOptSet(aCLOption))
+        {
+            return defaultValue;
+        }
+        return fCommandLineVarMap[aCLOption].as< XReturnType >();
+    }
+
+    inline const std::string& KTCommandLineHandler::GetConfigFilename() const
+    {
+        return fConfigFilename;
+    }
+
+    inline const std::string& KTCommandLineHandler::GetCommandLineJSON() const
+    {
+        return fCommandLineJSON;
+    }
+
+    inline bool KTCommandLineHandler::GetPrintVersionMessage() const
+    {
+        return fPrintVersionMessage;
+    }
+
+    inline bool KTCommandLineHandler::GetPrintHelpMessageFlag() const
+    {
+        return fPrintHelpMessage;
+    }
+
+    inline bool KTCommandLineHandler::GetPrintHelpMessageAfterConfigFlag() const
+    {
+        return fPrintHelpMessageAfterConfig;
+    }
+
+    inline const po::parsed_options* KTCommandLineHandler::GetParsedOptions() const
+    {
+        return &fParsedOptions;
+    }
+
+    inline const po::variables_map* KTCommandLineHandler::GetVariablesMap() const
+    {
+        return &fCommandLineVarMap;
+    }
+
+    inline const scarab::param_node* KTCommandLineHandler::GetConfigOverride() const
+    {
+        return &fConfigOverrideValues;
+    }
+
+} /* namespace Nymph */
+#endif /* KTCOMMANDLINEHANDLER_H_ */
diff --git a/Cpp/Library_v1/Application/KTCommandLineOption.hh b/Cpp/Library_v1/Application/KTCommandLineOption.hh
new file mode 100644
index 0000000..f932ea9
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTCommandLineOption.hh
@@ -0,0 +1,89 @@
+/*
+ * KTCommandLineOption.hh
+ *
+ *  Created on: Aug 1, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTCOMMANDLINEOPTION_H_
+#define KTCOMMANDLINEOPTION_H_
+
+#include "KTCommandLineHandler.hh"
+
+#include <string>
+
+namespace Nymph
+{
+    //class KTCommandLineHandler;
+
+    template< typename XInputType >
+    class KTCommandLineOption
+    {
+        public:
+            KTCommandLineOption();
+            KTCommandLineOption(const std::string& group, const std::string& helpMsg, const std::string& longOpt, char shortOpt='#');
+            virtual ~KTCommandLineOption();
+
+        protected:
+            KTCommandLineHandler* fCLHandler;
+
+    };
+
+    template< typename XInputType >
+    KTCommandLineOption< XInputType >::KTCommandLineOption() :
+            fCLHandler(KTCommandLineHandler::get_instance())
+    {
+    }
+
+    template< typename XInputType >
+    KTCommandLineOption< XInputType >::KTCommandLineOption(const std::string& group, const std::string& helpMsg, const std::string& longOpt, char shortOpt) :
+            fCLHandler(KTCommandLineHandler::get_instance())
+    {
+        if (shortOpt == '#')
+        {
+            fCLHandler->AddOption< XInputType >(group, helpMsg, longOpt);
+        }
+        else
+        {
+            fCLHandler->AddOption< XInputType >(group, helpMsg, longOpt, shortOpt);
+        }
+    }
+
+    template< typename XInputType >
+    KTCommandLineOption< XInputType >::~KTCommandLineOption()
+    {
+    }
+
+
+    template< >
+    class KTCommandLineOption< bool >
+    {
+        public:
+            KTCommandLineOption() :
+                fCLHandler(KTCommandLineHandler::get_instance())
+            {
+            }
+            KTCommandLineOption(const std::string& group, const std::string& helpMsg, const std::string& longOpt, char shortOpt='#') :
+                fCLHandler(KTCommandLineHandler::get_instance())
+            {
+                if (shortOpt == '#')
+                {
+                    fCLHandler->AddOption(group, helpMsg, longOpt);
+                }
+                else
+                {
+                    fCLHandler->AddOption(group, helpMsg, longOpt, shortOpt);
+                }
+            }
+            virtual ~KTCommandLineOption()
+            {
+            }
+
+        protected:
+            KTCommandLineHandler* fCLHandler;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTCOMMANDLINEOPTION_H_ */
diff --git a/Cpp/Library_v1/Application/KTConfigurator.cc b/Cpp/Library_v1/Application/KTConfigurator.cc
new file mode 100644
index 0000000..4207a39
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTConfigurator.cc
@@ -0,0 +1,32 @@
+/*
+ * KTConfigurator.cc
+ *
+ *  Created on: Nov 5, 2013
+ *      Author: nsoblath
+ */
+
+#include "KTConfigurator.hh"
+
+#include "KTLogger.hh"
+
+using std::string;
+
+namespace Nymph
+{
+    KTLOGGER( conflog, "KTConfigurator" );
+
+    KTConfigurator::KTConfigurator() :
+            fMasterConfig(),
+            fStringBuffer()
+    {
+    }
+
+    KTConfigurator::~KTConfigurator()
+    {
+<<<<<<< HEAD:Library_v1/Application/KTConfigurator.cc
+        delete fMasterConfig;
+=======
+>>>>>>> develop:Library/Application/KTConfigurator.cc
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Application/KTConfigurator.hh b/Cpp/Library_v1/Application/KTConfigurator.hh
new file mode 100644
index 0000000..05b9f76
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTConfigurator.hh
@@ -0,0 +1,123 @@
+/*
+ * KTConfigurator.hh
+ *
+ *  Created on: Nov 5, 2013
+ *      Author: nsoblath
+ */
+
+#ifndef KTCONFIGURATOR_HH_
+#define KTCONFIGURATOR_HH_
+
+#include "singleton.hh"
+#include "param.hh"
+
+#include "KTException.hh"
+
+#include <string>
+
+namespace Nymph
+{
+
+    class KTConfigurator : public scarab::singleton< KTConfigurator >
+    {
+        private:
+            friend class scarab::singleton< KTConfigurator >;
+            friend class scarab::destroyer< KTConfigurator >;
+
+            KTConfigurator();
+            virtual ~KTConfigurator();
+
+        public:
+            void Merge(const scarab::param_node& aNode);
+
+            scarab::param_node& Config();
+            const scarab::param_node& Config() const;
+
+            template< typename XReturnType >
+            XReturnType Get( const std::string& aName ) const;
+
+            template< typename XReturnType >
+            XReturnType Get( const std::string& aName, XReturnType aDefault ) const;
+
+        private:
+            scarab::param_node fMasterConfig;
+
+            std::string fStringBuffer;
+    };
+
+    template< typename XReturnType >
+    XReturnType KTConfigurator::Get( const std::string& aName ) const
+    {
+<<<<<<< HEAD:Library_v1/Application/KTConfigurator.hh
+        try
+        {
+            fParamBuffer = &const_cast< scarab::param& >( (*fMasterConfig)[aName] );
+            if( fParamBuffer->is_value() )
+            {
+                return (*fParamBuffer)().as< XReturnType >();
+            }
+        }
+        catch( std::exception& e )
+        {}
+        BOOST_THROW_EXCEPTION( KTException() << "configurator does not have a value for <" << aName << ">" << eom );
+=======
+        return fMasterConfig[ aName ]().as< XReturnType >();
+>>>>>>> develop:Library/Application/KTConfigurator.hh
+    }
+
+    template< typename XReturnType >
+    XReturnType KTConfigurator::Get( const std::string& aName, XReturnType aDefault ) const
+    {
+<<<<<<< HEAD:Library_v1/Application/KTConfigurator.hh
+        try
+        {
+            fParamBuffer = &const_cast< scarab::param& >( (*fMasterConfig)[aName] );
+            if( fParamBuffer->is_value() )
+            {
+                return (*fParamBuffer)().as< XReturnType >();
+            }
+        }
+        catch( std::exception& e )
+        {}
+        return aDefault;
+    }
+
+    inline void KTConfigurator::Merge(const scarab::param_node& aNode)
+    {
+        fMasterConfig->merge(aNode);
+        return;
+    }
+
+    inline scarab::param_node& KTConfigurator::Config()
+    {
+        return *fMasterConfig;
+=======
+        return fMasterConfig.get_value< XReturnType >( aName, aDefault );
+    }
+
+    inline void KTConfigurator::Merge(const scarab::param_node& aNode)
+    {
+        fMasterConfig.merge(aNode);
+        return;
+    }
+
+    inline scarab::param_node& KTConfigurator::Config()
+    {
+        return fMasterConfig;
+    }
+
+    inline const scarab::param_node& KTConfigurator::Config() const
+    {
+        return fMasterConfig;
+>>>>>>> develop:Library/Application/KTConfigurator.hh
+    }
+
+    inline const scarab::param_node& KTConfigurator::Config() const
+    {
+        return *fMasterConfig;
+    }
+
+
+
+} /* namespace Nymph */
+#endif /* KTCONFIGURATOR_HH_ */
diff --git a/Cpp/Library_v1/Application/KTDataQueueProcessor.cc b/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
new file mode 100644
index 0000000..4354dfd
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
@@ -0,0 +1,53 @@
+/*
+ * KTDataQueueProcessor.cc
+ *
+ *  Created on: Feb 5, 2013
+ *      Author: nsoblath
+ */
+
+#include "KTDataQueueProcessor.hh"
+
+//using std::list;
+
+namespace Nymph
+{
+    KT_REGISTER_PROCESSOR(KTDataQueueProcessor, "data-queue");
+
+    KTDataQueueProcessor::KTDataQueueProcessor(const std::string& name) :
+        KTDataQueueProcessorTemplate< KTDataQueueProcessor >(name),
+        fDataSignal("data", this)
+    {
+        SetFuncPtr(&KTDataQueueProcessor::EmitDataSignal);
+        fQueueDataSW = RegisterSlot("data", this, &KTDataQueueProcessor::QueueData, {});
+        fSignalsEmitted.push_back("data");
+        //RegisterSlot("data-list", this, &KTDataQueueProcessor::QueueDataList);
+    }
+
+    KTDataQueueProcessor::~KTDataQueueProcessor()
+    {
+
+    }
+
+    bool KTDataQueueProcessor::ConfigureSubClass(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTDataQueueProcessor::EmitDataSignal(KTDataHandle data)
+    {
+        fDataSignal(data);
+        return;
+    }
+
+    void KTDataQueueProcessor::QueueData(KTDataHandle& data)
+    {
+        fQueueDataSW->GetThreadRef()->Break(data, fQueueDataSW->GetDoBreakpoint());
+        return DoQueueData(data);
+    }
+/*
+    void KTDataQueueProcessor::QueueDataList(list< KTDataHandle >* dataList)
+    {
+        return DoQueueDataList(dataList, &KTDataQueueProcessor::EmitDataSignal);
+    }
+*/
+}
diff --git a/Cpp/Library_v1/Application/KTDataQueueProcessor.hh b/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
new file mode 100644
index 0000000..8ce93cf
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
@@ -0,0 +1,395 @@
+/*
+ * KTDataQueueProcessorTemplate.hh
+ *
+ *  Created on: Jan 10, 2013
+ *      Author: nsoblath
+ */
+
+#ifndef KTDATAQUEUEPROCESSOR_HH_
+#define KTDATAQUEUEPROCESSOR_HH_
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTConcurrentQueue.hh"
+#include "KTCoreData.hh"
+#include "KTLogger.hh"
+#include "KTSlot.hh"
+
+namespace Nymph
+{
+    KTLOGGER(eqplog, "KTDataQueueProcessor");
+
+    //***********************************
+    // Data Queue Processor Template
+    //***********************************
+
+    /*!
+     @class KTDataQueueProcessorTemplate
+     @author N. S. Oblath
+
+     @brief Template class for creating data queueing processors
+
+     @details
+
+     Available configuration values:
+     - "timeout": unsigned -- maximum time to wait for new data (integer number of milliseconds)
+
+     Slots:
+     - "use-timed-pop": void () -- Switch the queue-popping function to the TIMED version
+     - "use-untimed-pop": void () -- Switch the queue-popping function to the UNTIMED version
+     - "use-single-pop": void () -- Switch to the single-pop queue-popping function
+
+     Signals:
+     - "queue-done": void () -- Emitted when queue is emptied
+    */
+    template< class XProcessorType >
+    class KTDataQueueProcessorTemplate : public KTPrimaryProcessor
+    {
+        public:
+            typedef void (XProcessorType::*FuncPtrType)(KTDataHandle);
+
+            struct DataAndFunc
+            {
+                KTDataHandle fData;
+                FuncPtrType fFuncPtr;
+            };
+
+            typedef KTConcurrentQueue< DataAndFunc > Queue;
+
+            typedef bool (KTConcurrentQueue< DataAndFunc >::*QueuePoppingFunc)(DataAndFunc&);
+
+            enum Status
+            {
+                kStopped,
+                kRunning,
+                kContinue
+            };
+
+        public:
+            KTDataQueueProcessorTemplate(const std::string& name = "default-data-queue-proc-template-name");
+            virtual ~KTDataQueueProcessorTemplate();
+
+            bool Configure(const scarab::param_node& node);
+            virtual bool ConfigureSubClass(const scarab::param_node& node) = 0;
+
+            Status GetStatus() const;
+            void SetStatus(KTDataQueueProcessorTemplate< XProcessorType >::Status);
+
+        protected:
+            Status fStatus;
+
+            //**********************************************
+            // Derived Processor function pointer (optional)
+            //**********************************************
+        public:
+            void SetFuncPtr(FuncPtrType ptr);
+
+        protected:
+            FuncPtrType fFuncPtr;
+
+
+            //*********
+            // Queue
+            //*********
+        public:
+            /// Begins processing of queue (switches status from kStopped to kRunning)
+            bool Run();
+
+            /// Stops processing of queue (switches status to kStopped)
+            void Stop();
+
+            /// Begins processing of queue if status is already kRunning; otherwise does nothing.
+            bool ProcessQueue();
+
+            void ClearQueue();
+
+        protected:
+            Queue fQueue;
+            QueuePoppingFunc fPopFromQueue;
+
+            //*********
+            // Queueing functions for slots
+            //*********
+        protected:
+            /// Queue an data object with a provided function
+            /// Assumes ownership of the data; original shared pointer will be nullified
+            void DoQueueData(KTDataHandle& data, FuncPtrType func);
+
+            /// Queue an data object with fFuncPtr
+            /// Assumes ownership of the data; original shared pointer will be nullified
+            void DoQueueData(KTDataHandle& data);
+
+            /// Queue a list of data objects
+            /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
+            //void DoQueueDataList(std::list< KTDataHandle& >* dataList, void (XProcessorType::*fFuncPtr)(KTDataHandle));
+
+            //*********
+            // Slots
+            //*********
+        public:
+            void SwitchToTimedPop();
+            void SwitchToUntimedPop();
+            void SwitchToSinglePop();
+
+            //*********
+            // Signals
+            //*********
+        protected:
+            KTSignalDone fQueueDoneSignal;
+
+    };
+
+
+    //**************************
+    // Data Queue Processor
+    //**************************
+
+    /*!
+     @class KTDataQueueProcessor
+     @author N. S. Oblath
+
+     @brief Generic data queue for asynchronous processing
+
+     @details
+     Asynchronously emits a signal for each data object it receives.
+     Allows the user to start an asynchronous chain of processors.
+
+     Configuration name: "data-queue"
+
+     Available configuration values:
+
+     Slots:
+     - "data": void (KTDataHandle) -- Queue a data object for asynchronous processing; use signal "data"
+
+     Signals:
+     - "data": void (KTDataHandle) -- Emitted for each data object in the queue
+     - "queue-done": void () -- Emitted when queue is emptied (inherited from KTDataQueueProcessorTemplate)
+    */
+    class KTDataQueueProcessor : public KTDataQueueProcessorTemplate< KTDataQueueProcessor >
+    {
+        public:
+            KTDataQueueProcessor(const std::string& name = "data-queue");
+            virtual ~KTDataQueueProcessor();
+
+            bool ConfigureSubClass(const scarab::param_node& node);
+
+        public:
+            void EmitDataSignal(KTDataHandle data);
+
+            //***************
+            // Signals
+            //***************
+
+        private:
+            KTSignalData fDataSignal;
+
+            //*********
+            // Slots
+            //*********
+        public:
+            /// Queue an data object; will emit data signal
+            /// Assumes ownership of the data; original shared pointer will be nullified
+            void QueueData(KTDataHandle& data);
+            KTSlotWrapper* fQueueDataSW;
+
+            /// Queue a list of data objects; will emit data signal
+            /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
+            //void QueueDataList(std::list< KTDataHandle >* dataList);
+
+    };
+
+
+    //**************************************************
+    // Data Queue Processor Template Implementation
+    //**************************************************
+
+
+    template< class XProcessorType >
+    KTDataQueueProcessorTemplate< XProcessorType >::KTDataQueueProcessorTemplate(const std::string& name) :
+            KTPrimaryProcessor({"queue-done"}, name),
+            fStatus(kStopped),
+            fFuncPtr(NULL),
+            fQueue(),
+            fPopFromQueue(&KTConcurrentQueue< DataAndFunc >::wait_and_pop),
+            fQueueDoneSignal("queue-done", this)
+    {
+        RegisterSlot("use-timed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToTimedPop, {});
+        RegisterSlot("use-untimed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToUntimedPop, {});
+        RegisterSlot("use-single-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToSinglePop, {});
+    }
+
+    template< class XProcessorType >
+    KTDataQueueProcessorTemplate< XProcessorType >::~KTDataQueueProcessorTemplate()
+    {
+        ClearQueue();
+    }
+
+    template< class XProcessorType >
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Configure(const scarab::param_node& node)
+    {
+        fQueue.set_timeout(node.get_value< unsigned >("timeout", fQueue.get_timeout()));
+
+        if (! ConfigureSubClass(node)) return false;
+        return true;
+    }
+
+    template< class XProcessorType >
+    bool KTDataQueueProcessorTemplate< XProcessorType >::Run()
+    {
+        fStatus = kRunning;
+        KTINFO(eqplog, "Queue started");
+        return ProcessQueue();
+    }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::Stop()
+    {
+        fStatus = kStopped;
+        fQueue.interrupt();
+        KTINFO(eqplog, "Queue stopped");
+        return;
+    }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::SetFuncPtr(FuncPtrType ptr)
+    {
+        fFuncPtr = ptr;
+        return;
+    }
+
+
+    template< class XProcessorType >
+    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue()
+    {
+        KTINFO(eqplog, "Beginning to process queue");
+        while (fStatus != kStopped)
+        {
+            KTDEBUG(eqplog, "processing . . .");
+            DataAndFunc daf;
+            if ((fQueue.*fPopFromQueue)(daf))
+            {
+                KTDEBUG(eqplog, "Data acquired for processing");
+                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData);
+                if (daf.fData->GetLastData()) fStatus = kStopped;
+            }
+            else
+            {
+                if (fStatus == kContinue)
+                {
+                    fStatus = kRunning;
+                }
+                else
+                {
+                    fStatus = kStopped;
+                }
+            }
+        }
+        fQueueDoneSignal();
+        KTINFO(eqplog, "Queue processing has ended");
+        return true;
+    }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::ClearQueue()
+    {
+        while (! fQueue.empty())
+        {
+            DataAndFunc daf;
+            fQueue.try_pop(daf);
+        }
+        KTINFO(eqplog, "Queue cleared");
+        return;
+    }
+
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataHandle& data, FuncPtrType func)
+    {
+        KTDEBUG(eqplog, "Queueing data");
+        DataAndFunc daf;
+        daf.fData = data; // I'd like to use move semantics here (operator=(shared_ptr&&)), but they didn't work, so I bootstrapped with copy and reset.
+        data.reset();
+        daf.fFuncPtr = func;
+        fQueue.push(daf);
+        return;
+    }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataHandle& data)
+    {
+        DoQueueData(data, fFuncPtr);
+        return;
+    }
+/*
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueDataList(std::list< KTDataHandle& >* dataList, void (XProcessorType::*func)(KTDataHandle))
+    {
+        typedef std::list< KTDataHandle > DataList;
+
+        KTDEBUG(eqplog, "Queueing data objects");
+        DataAndFunc daf;
+        while (! dataList->empty())
+        {
+            daf.fData = &(dataList->front()); // using move semantics
+            daf.fFuncPtr = func;
+            dataList->pop_front();
+            fQueue.push(daf);
+        }
+        delete dataList;
+        return;
+    }
+*/
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::SwitchToTimedPop()
+    {
+        if (fPopFromQueue == &KTConcurrentQueue< DataAndFunc >::timed_wait_and_pop)
+            return;
+
+        KTDEBUG(eqplog, "Switching to timed pop function");
+        fPopFromQueue = &KTConcurrentQueue< DataAndFunc >::timed_wait_and_pop;
+        if (fStatus == kRunning)
+        {
+            fStatus = kContinue;
+            KTINFO(eqplog, "Pop function changed; interrupting queue");
+            fQueue.interrupt();
+        }
+        return;
+    }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::SwitchToUntimedPop()
+    {
+        if (fPopFromQueue == &KTConcurrentQueue< DataAndFunc >::wait_and_pop)
+            return;
+
+        KTDEBUG(eqplog, "Switching to untimed pop function");
+        this->fPopFromQueue = &KTConcurrentQueue< DataAndFunc >::wait_and_pop;
+        if (fStatus == kRunning)
+        {
+            fStatus = kContinue;
+            KTINFO(eqplog, "Pop function changed; interrupting queue");
+            fQueue.interrupt();
+        }
+        return;
+    }
+
+    template< class XProcessorType >
+    void KTDataQueueProcessorTemplate< XProcessorType >::SwitchToSinglePop()
+    {
+        if (fPopFromQueue == &KTConcurrentQueue< DataAndFunc >::try_pop)
+            return;
+
+        KTDEBUG(eqplog, "Switching to single-pop function");
+        this->fPopFromQueue = &KTConcurrentQueue< DataAndFunc >::try_pop;
+        if (fStatus == kRunning)
+        {
+            fStatus = kContinue;
+            KTINFO(eqplog, "Pop function changed; interrupting queue");
+            fQueue.interrupt();
+        }
+        return;
+    }
+
+} /* namespace Nymph */
+#endif /* KTDATAQUEUEPROCESSOR_HH_ */
diff --git a/Cpp/Library_v1/Application/KTFilenameParsers.cc b/Cpp/Library_v1/Application/KTFilenameParsers.cc
new file mode 100644
index 0000000..bad43a9
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTFilenameParsers.cc
@@ -0,0 +1,49 @@
+/*
+ * KTFilenameParsers.cc
+ *
+ *  Created on: May 31, 2013
+ *      Author: nsoblath
+ */
+
+#include "KTFilenameParsers.hh"
+
+#include "KTLogger.hh"
+
+#include <boost/property_tree/ptree.hpp>
+
+#include <boost/spirit/include/qi.hpp>
+#include <boost/spirit/include/phoenix_core.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+
+// I can't just use boost::spirit::qi because of naming conflicts with std
+using boost::spirit::qi::int_;
+using boost::spirit::qi::double_;
+// I had to take this out because of a naming conflict with boost::bind
+//using boost::spirit::qi::_1;
+using boost::spirit::qi::phrase_parse;
+using boost::spirit::ascii::space;
+using boost::phoenix::ref;
+
+using std::string;
+
+namespace Nymph
+{
+    KTLOGGER(fnplog, "KTFilenameParsers");
+
+
+    KTLocustMCFilename::KTLocustMCFilename(const string& filename)
+    {
+        bool parsed = phrase_parse(filename.begin(), filename.end(),
+                (int_[ref(fNEvents)=boost::spirit::qi::_1] >> "events_" >>
+                 double_[ref(fEventLength) = boost::spirit::qi::_1] >> "dur_" >>
+                 double_[ref(fdfdt) = boost::spirit::qi::_1] >> "dfdt_" >>
+                 double_[ref(fSignalPower) = boost::spirit::qi::_1] >> "power.egg"
+                ), space);
+        if (! parsed)
+        {
+            KTERROR(fnplog, "Filename was not parsed correctly: " << filename);
+        }
+    }
+
+
+}
diff --git a/Cpp/Library_v1/Application/KTFilenameParsers.hh b/Cpp/Library_v1/Application/KTFilenameParsers.hh
new file mode 100644
index 0000000..85939cd
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTFilenameParsers.hh
@@ -0,0 +1,27 @@
+/*
+ * KTFilenameParsers.hh
+ *
+ *  Created on: May 31, 2013
+ *      Author: nsoblath
+ */
+
+#ifndef KTFILENAMEPARSERS_HH_
+#define KTFILENAMEPARSERS_HH_
+
+#include <string>
+
+namespace Nymph
+{
+    struct KTLocustMCFilename
+    {
+            unsigned fNEvents;
+            double fEventLength; // sec
+            double fdfdt; // Hz/sec ?
+            double fSignalPower; // Watts
+            KTLocustMCFilename(const std::string& filename);
+    };
+
+
+} /* namespace Nymph */
+
+#endif /* KTFILENAMEPARSERS_HH_*/
diff --git a/Cpp/Library_v1/Application/KTPrintDataStructure.cc b/Cpp/Library_v1/Application/KTPrintDataStructure.cc
new file mode 100644
index 0000000..c05e518
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTPrintDataStructure.cc
@@ -0,0 +1,121 @@
+/*
+ * KTPrintDataStructure.cc
+ *
+ *  Created on: Sept 12, 2014
+ *      Author: N.S. Oblath
+ */
+
+#include "KTPrintDataStructure.hh"
+
+#include "KTLogger.hh"
+
+#include <sstream>
+
+using boost::shared_ptr;
+
+namespace Nymph
+{
+    KTLOGGER(datalog, "KTPrintDataStructure");
+
+    // Register the processor
+    KT_REGISTER_PROCESSOR(KTPrintDataStructure, "print-data-structure");
+
+    KTPrintDataStructure::KTPrintDataStructure(const std::string& name) :
+            KTProcessor(name),
+            fDataSignal("data", this),
+            fDataStructSlot("print-data", this, &KTPrintDataStructure::PrintDataStructure, {"data"}),
+            fCutStructSlot("print-cuts", this, &KTPrintDataStructure::PrintCutStructure, {"data"}),
+            fDataAndCutStructSlot("print-data-and-cuts", this, &KTPrintDataStructure::PrintDataAndCutStructure, {"data"})
+    {
+    }
+
+    KTPrintDataStructure::~KTPrintDataStructure()
+    {
+    }
+
+    bool KTPrintDataStructure::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTPrintDataStructure::PrintDataStructure(KTDataHandle dataHandle)
+    {
+        DoPrintDataStructure(dataHandle);
+
+        KTSlotWrapper* slotWrap = fDataStructSlot.GetSlotWrapper();
+        slotWrap->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
+
+        fDataSignal(dataHandle);
+
+        return;
+    }
+
+    void KTPrintDataStructure::PrintCutStructure(KTDataHandle dataHandle)
+    {
+        DoPrintCutStructure(dataHandle);
+
+        KTSlotWrapper* slotWrap = fCutStructSlot.GetSlotWrapper();
+        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
+
+        fDataSignal(dataHandle);
+
+        return;
+    }
+
+
+    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataHandle dataHandle)
+    {
+        DoPrintDataStructure(dataHandle);
+        DoPrintCutStructure(dataHandle);
+
+        KTSlotWrapper* slotWrap = fDataAndCutStructSlot.GetSlotWrapper();
+        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
+
+        fDataSignal(dataHandle);
+
+        return;
+    }
+
+    void KTPrintDataStructure::DoPrintDataStructure(KTDataHandle dataHandle)
+    {
+        std::stringstream printbuf;
+
+        printbuf << "\nData Structure:\n";
+        printbuf << "\t- " << dataHandle->Name() << '\n';
+        KTDEBUG(datalog, "Found data type " << dataHandle->Name());
+        KTExtensibleCore< KTDataRider >::BasePtrType nextData = dataHandle->Next();
+        while (nextData != NULL)
+        {
+            printbuf << "\t- " << nextData->Name() << '\n';
+            KTDEBUG(datalog, "Found data type " << nextData->Name());
+            nextData = nextData->Next();
+        }
+
+        KTINFO(datalog, printbuf.str());
+
+        return;
+    }
+
+    void KTPrintDataStructure::DoPrintCutStructure(KTDataHandle dataHandle)
+    {
+        std::stringstream printbuf;
+
+        KTCutStatus& cutStatus = dataHandle->CutStatus();
+        printbuf << "\n" << cutStatus;
+
+        const KTCutStatus::CutResults_t cutResults = cutStatus.CutResults();
+        printbuf << "Cut Structure:\n";
+        unsigned nCuts = cutResults.size();
+        for (unsigned iCut = 0; iCut < nCuts; ++iCut)
+        {
+            if (! cutResults[iCut].fAssigned) continue;
+            printbuf << "\t" << iCut << " -- " << cutResults[iCut].fName << " -- is cut: " << cutResults[iCut].fState << '\n';
+            KTDEBUG(datalog, "Found cut type " << cutResults[iCut].fName << " at mask position " << iCut);
+        }
+
+        KTINFO(datalog, printbuf.str());
+
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Application/KTPrintDataStructure.hh b/Cpp/Library_v1/Application/KTPrintDataStructure.hh
new file mode 100644
index 0000000..10c171c
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTPrintDataStructure.hh
@@ -0,0 +1,82 @@
+/**
+ @file KTPrintDataStructure.hh
+ @brief Contains KTPrintDataStructure
+ @details Prints the structure of data objects
+ @author: N.S. Oblath
+ @date: Sept 12, 2014
+ */
+
+#ifndef KTPRINTDATASTRUCTURE_HH_
+#define KTPRINTDATASTRUCTURE_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTSlot.hh"
+
+
+namespace Nymph
+{
+
+    /*!
+     @class KTPrintDataStructure
+     @author N.S. Oblath
+
+     @brief Prints the structure of data objects
+
+     @details
+
+     Configuration name: "print-data-structure"
+
+     Example usage:
+       "egg-processor:ts" --> "simple-fft:ts"
+       "simple-fft:fft-forward" --> "print-data-structure:print-data"
+     will show that the data consists of data, slice-header, raw-time-series, time-series, and frequency-spectrum-polar
+
+     Available configuration values: none
+
+     Slots:
+     - "print-data": void (KTDataHandle) -- Prints the structure of the data object; Does not modify the data or cuts; Emits signal "data"
+     - "print-cuts": void (KTDataHandle) -- Prints the structure of the data's cuts; Does not modify the data or cuts; Emits signal "data"
+     - "print-data-and-cuts": void (KTDataHandle) -- Prints the structure of the data object and its cuts; Does not modify the data or cuts; Emits signal "data"
+
+     Signals:
+     - "data": void (KTDataHandle) -- Emitted after structure information is printed
+    */
+
+    class KTPrintDataStructure : public KTProcessor
+    {
+        public:
+            KTPrintDataStructure(const std::string& name = "print-data-structure");
+            virtual ~KTPrintDataStructure();
+
+            bool Configure(const scarab::param_node& node);
+
+        public:
+            void PrintDataStructure(KTDataHandle dataHandle);
+            void PrintCutStructure(KTDataHandle dataHandle);
+            void PrintDataAndCutStructure(KTDataHandle dataHandle);
+
+        private:
+            void DoPrintDataStructure(KTDataHandle dataHandle);
+            void DoPrintCutStructure(KTDataHandle dataHandle);
+
+            //***************
+            // Signals
+            //***************
+
+        private:
+            KTSignalData fDataSignal;
+
+            //***************
+            // Slots
+            //***************
+
+        private:
+            KTSlot< KTDataHandle > fDataStructSlot;
+            KTSlot< KTDataHandle > fCutStructSlot;
+            KTSlot< KTDataHandle > fDataAndCutStructSlot;
+
+    };
+}
+ /* namespace Nymph */
+#endif /* KTPRINTDATASTRUCTURE_HH_ */
diff --git a/Cpp/Library_v1/Application/KTProcessorToolbox.cc b/Cpp/Library_v1/Application/KTProcessorToolbox.cc
new file mode 100644
index 0000000..d483f1d
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTProcessorToolbox.cc
@@ -0,0 +1,986 @@
+/*
+ * KTProcessorToolbox.cc
+ *
+ *  Created on: Sep 27, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTProcessorToolbox.hh"
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+#include "KTPrimaryProcessor.hh"
+
+#include "factory.hh"
+#include "param_codec.hh"
+
+#include <boost/exception/get_error_info.hpp>
+#include <boost/thread.hpp>
+
+using std::deque;
+using std::set;
+using std::string;
+using std::vector;
+
+namespace Nymph
+{
+    KTLOGGER(proclog, "KTProcessorToolbox");
+
+    KTProcessorToolbox::KTProcessorToolbox(const std::string& name) :
+            KTConfigurable(name),
+            fProcFactory(scarab::factory< KTProcessor, const std::string& >::get_instance()),
+            fRunSingleThreaded( false ),
+            fRunQueue(),
+            fProcMap(),
+            fThreadReferences(),
+            fContinueCV(),
+            fDoContinue( false ),
+            fBreakContMutex(),
+            fDoRunThread( nullptr ),
+            fDoRunPromise(),
+            fDoRunBreakFlag( false )
+    {
+    }
+
+    KTProcessorToolbox::~KTProcessorToolbox()
+    {
+        CancelThreads();
+
+        JoinRunThread();
+
+        ClearProcessors();
+    }
+
+    bool KTProcessorToolbox::Configure(const scarab::param_node& node)
+    {
+        KTPROG(proclog, "Configuring . . .");
+
+        SetRunSingleThreaded( node.get_value( "single-threaded", fRunSingleThreaded ) );
+
+        // Deal with "processor" blocks
+        if (! node.has("processors"))
+        {
+            KTWARN(proclog, "No processors were specified");
+        }
+        else
+        {
+            const scarab::param_array& procArray = node["processors"].as_array();
+            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
+            {
+                if( ! procIt->is_node() )
+                {
+                    KTERROR( proclog, "Invalid processor entry: not a node" );
+                    return false;
+                }
+                const scarab::param_node& procNode = procIt->as_node();
+
+                if (! procNode.has("type"))
+                {
+                    KTERROR(proclog, "Unable to create processor: no processor type given");
+                    return false;
+                }
+                string procType = procNode["type"]().as_string();
+
+                string procName;
+                if (! procNode.has("name"))
+                {
+                    KTINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
+                    procName = procType;
+                }
+                else
+                {
+                    procName = procNode["name"]().as_string();
+                }
+                std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
+                if (newProc == NULL)
+                {
+                    KTERROR(proclog, "Unable to create processor of type <" << procType << ">");
+                    return false;
+                }
+
+                if (! AddProcessor(procName, newProc))
+                {
+                    KTERROR(proclog, "Unable to add processor <" << procName << ">");
+                    //delete newProc; //not required for smart pointers
+                    return false;
+                }
+            }
+        }
+
+
+        // Then deal with connections"
+        if (! node.has("connections"))
+        {
+            KTWARN(proclog, "No connections were specified");
+        }
+        else
+        {
+            const scarab::param_array& connArray = node["connections"].as_array();
+            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
+            {
+                if( ! connIt->is_node() )
+                {
+                    KTERROR( proclog, "Invalid connection entry: not a node" );
+                    return false;
+                }
+                const scarab::param_node& connNode = connIt->as_node();
+
+                if ( ! connNode.has("signal") || ! connNode.has("slot") )
+                {
+                    KTERROR(proclog, "Signal/Slot connection information is incomplete!");
+                    if (connNode.has("signal"))
+                    {
+                        KTWARN(proclog, "signal = " << connNode["signal"]());
+                    }
+                    else
+                    {
+                        KTERROR(proclog, "signal = MISSING");
+                    }
+
+                    if (connNode.has("slot"))
+                    {
+                        KTWARN(proclog, "slot = " << connNode["slot"]());
+                    }
+                    else
+                    {
+                        KTERROR(proclog, "slot = MISSING");
+                    }
+                    return false;
+                }
+
+                bool connReturn = false;
+                if (connNode.has("order"))
+                {
+                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int());
+                }
+                else
+                {
+                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string());
+                }
+                if (! connReturn)
+                {
+                    KTERROR(proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">");
+                    return false;
+                }
+
+                if (connNode.has("breakpoint"))
+                {
+                    if (! SetBreakpoint(connNode["slot"]().as_string()))
+                    {
+                        KTERROR(proclog, "Unable to set breakpoint on <" << connNode["slot"]());
+                        return false;
+                    }
+                }
+
+                KTINFO(proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">");
+            }
+        }
+
+
+        // Finally, deal with processor-run specifications
+        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
+        // If names are grouped (in another array), those in that group will be run in parallel.
+        // In single threaded mode all threads will be run sequentially in the order they were specified.
+        if (! node.has("run-queue"))
+        {
+            KTWARN(proclog, "Run queue was not specified");
+        }
+        else
+        {
+            const scarab::param_array& rqArray = node["run-queue"].as_array();
+            for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
+            {
+                if (rqIt->is_value())
+                {
+                    if (! PushBackToRunQueue((*rqIt)().as_string()))
+                    {
+                        KTERROR(proclog, "Unable to process run-queue entry: could not add processor to the queue");
+                        return false;
+                    }
+                }
+                else if (rqIt->is_array())
+                {
+                    const scarab::param_array* rqNode = &( rqIt->as_array() );
+                    std::vector< std::string > names;
+
+                    for (scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt)
+                    {
+                        if (! rqArrayIt->is_value())
+                        {
+                            KTERROR(proclog, "Invalid run-queue array entry: not a value");
+                            return false;
+                        }
+                        names.push_back((*rqArrayIt)().as_string());
+                    }
+
+                    if (! PushBackToRunQueue(names))
+                    {
+                        KTERROR(proclog, "Unable to process run-queue entry: could not add list of processors to the queue");
+                        return false;
+                    }
+                }
+                else
+                {
+                    KTERROR(proclog, "Invalid run-queue entry: not a value or array");
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool KTProcessorToolbox::ConfigureProcessors(const scarab::param_node& node)
+    {
+        for (ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); iter++)
+        {
+            KTDEBUG(proclog, "Attempting to configure processor <" << iter->first << ">");
+            string procName = iter->first;
+            string nameUsed(procName);
+            if (! node.has(nameUsed))
+            {
+                nameUsed = iter->second.fProc->GetConfigName();
+                if (! node.has(nameUsed))
+                {
+                    KTWARN(proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
+                            "\tProcessor <" << procName << "> was not configured.");
+                    continue;
+                }
+            }
+            const scarab::param_node& subNode = node[nameUsed].as_node();
+            if (! iter->second.fProc->Configure(subNode))
+            {
+                KTERROR(proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">");
+                return false;
+            }
+        }
+        return true;
+    }
+
+    bool KTProcessorToolbox::ConfigureProcessors(const std::string& config)
+    {
+        scarab::param_translator translator;
+        scarab::param_node optNode;
+        optNode.add( "encoding", new scarab::param_value( "json" ) );
+        return ConfigureProcessors( translator.read_string( config, optNode )->as_node() );
+    }
+
+    std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName)
+    {
+        ProcMapIt it = fProcMap.find(procName);
+        if (it == fProcMap.end())
+        {
+            KTWARN(proclog, "Processor <" << procName << "> was not found.");
+            return NULL;
+        }
+        return it->second.fProc;
+    }
+
+    const std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName) const
+    {
+        ProcMapCIt it = fProcMap.find(procName);
+        if (it == fProcMap.end())
+        {
+            KTWARN(proclog, "Processor <" << procName << "> was not found.");
+            return NULL;
+        }
+        return it->second.fProc;
+    }
+
+    bool KTProcessorToolbox::AddProcessor(const std::string& procName, std::shared_ptr< KTProcessor > proc)
+    {
+        ProcMapIt it = fProcMap.find(procName);
+        if (it == fProcMap.end())
+        {
+            ProcessorInfo pInfo;
+            pInfo.fProc = proc;
+            fProcMap.insert(ProcMapValue(procName, pInfo));
+            KTDEBUG(proclog, "Added processor <" << procName << "> (a.k.a. " << proc->GetConfigName() << ")");
+            return true;
+        }
+        KTWARN(proclog, "Processor <" << procName << "> already exists; new processor was not added.");
+        return false;
+    }
+
+    bool KTProcessorToolbox::AddProcessor(const std::string& procType, const std::string& procName)
+    {
+        ProcMapIt it = fProcMap.find(procName);
+        if (it == fProcMap.end())
+        {
+            std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
+            if (newProc == NULL)
+            {
+                KTERROR(proclog, "Unable to create processor of type <" << procType << ">");
+                return false;
+            }
+            if (! AddProcessor(procName, newProc))
+            {
+                KTERROR(proclog, "Unable to add processor <" << procName << ">");
+                //delete newProc;
+                return false;
+            }
+            return true;
+        }
+        KTWARN(proclog, "Processor <" << procName << "> already exists; new processor was not added.");
+        return false;
+    }
+
+    bool KTProcessorToolbox::RemoveProcessor(const std::string& procName)
+    {
+        std::shared_ptr< KTProcessor > procToRemove = ReleaseProcessor(procName);
+        if (procToRemove == NULL)
+        {
+            return false;
+        }
+        //delete procToRemove;
+        KTDEBUG(proclog, "Processor <" << procName << "> deleted.");
+        return true;
+    }
+
+    std::shared_ptr< KTProcessor > KTProcessorToolbox::ReleaseProcessor(const std::string& procName)
+    {
+        ProcMapIt it = fProcMap.find(procName);
+        if (it == fProcMap.end())
+        {
+            KTWARN(proclog, "Processor <" << procName << "> was not found.");
+            return NULL;
+        }
+        std::shared_ptr< KTProcessor > procToRelease = it->second.fProc;
+        fProcMap.erase(it);
+        return procToRelease;
+    }
+
+    void KTProcessorToolbox::ClearProcessors()
+    {
+        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
+        {
+            delete it->second.fProc;
+        }*/ //not required for smart pointers
+        fProcMap.clear();
+        fRunQueue.clear();
+        return;
+    }
+
+
+    bool KTProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot, int order)
+    {
+        string signalProcName, signalName;
+        if (! ParseSignalSlotName(signal, signalProcName, signalName))
+        {
+            KTERROR(proclog, "Unable to parse signal name: <" << signal << ">");
+            return false;
+        }
+
+        string slotProcName, slotName;
+        if (! ParseSignalSlotName(slot, slotProcName, slotName))
+        {
+            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            return false;
+        }
+
+        return MakeConnection(signalProcName, signalName, slotProcName, slotName, order);
+    }
+
+    bool KTProcessorToolbox::MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order)
+    {
+        std::shared_ptr< KTProcessor > signalProc = GetProcessor(signalProcName);
+        if (signalProc == NULL)
+        {
+            KTERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
+            return false;
+        }
+
+        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
+        if (slotProc == NULL)
+        {
+            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            if (order != std::numeric_limits< int >::min())
+            {
+                signalProc->ConnectASlot(signalName, slotProc.get(), slotName, order);
+            }
+            else
+            {
+                signalProc->ConnectASlot(signalName, slotProc.get(), slotName);
+            }
+        }
+        catch (boost::exception& e)
+        {
+            KTERROR(proclog, "An error occurred while connecting signals and slots:\n"
+                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->GetConfigName() << ")" << '\n'
+                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->GetConfigName() << ")" << '\n'
+                    << '\t' << diagnostic_information( e ));
+            return false;
+        }
+
+        return true;
+    }
+
+    bool KTProcessorToolbox::SetBreakpoint(const std::string& slot)
+    {
+        string slotProcName, slotName;
+        if (! ParseSignalSlotName(slot, slotProcName, slotName))
+        {
+            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            return false;
+        }
+
+        return SetBreakpoint(slotProcName, slotName);
+    }
+
+    bool KTProcessorToolbox::SetBreakpoint(const std::string& slotProcName, const std::string& slotName)
+    {
+        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
+        if (slotProc == NULL)
+        {
+            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            slotProc->SetDoBreakpoint(slotName, true);
+            return true;
+        }
+        catch (boost::exception& e)
+        {
+            KTERROR(proclog, "Unable to set breakpoint: " << diagnostic_information( e ));
+            return false;
+        }
+    }
+
+    bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slot)
+    {
+        string slotProcName, slotName;
+        if (! ParseSignalSlotName(slot, slotProcName, slotName))
+        {
+            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
+            return false;
+        }
+
+        return RemoveBreakpoint(slotProcName, slotName);
+    }
+
+    bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName)
+    {
+        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
+        if (slotProc == NULL)
+        {
+            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
+            return false;
+        }
+
+        try
+        {
+            slotProc->SetDoBreakpoint(slotName, false);
+            return true;
+        }
+        catch (boost::exception& e)
+        {
+            KTERROR(proclog, "Unable to set breakpoint: " << diagnostic_information( e ));
+            return false;
+        }
+    }
+
+    bool KTProcessorToolbox::ParseSignalSlotName(const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot) const
+    {
+        size_t sepPos = toParse.find_first_of(fSigSlotNameSep);
+        if (sepPos == string::npos)
+        {
+            KTERROR(proclog, "Unable to find separator between processor and signal/slot name in <" << toParse << ">");
+            return false;
+        }
+        nameOfProc = toParse.substr(0, sepPos);
+        nameOfSigSlot = toParse.substr(sepPos + 1);
+        return true;
+    }
+
+
+    bool KTProcessorToolbox::PushBackToRunQueue(const std::string& name)
+    {
+        ThreadGroup threadGroup;
+
+        if (! AddProcessorToThreadGroup( name, threadGroup))
+        {
+            KTERROR(proclog, "Unable to add processor <" << name << "> to thread group");
+            return false;
+        }
+
+        fRunQueue.push_back(threadGroup);
+
+        KTINFO(proclog, "Added processor <" << name << "> to the run queue");
+        return true;
+    }
+
+    bool KTProcessorToolbox::PushBackToRunQueue(std::initializer_list< std::string > names)
+    {
+        return PushBackToRunQueue(std::vector< std::string >(names));
+    }
+
+    bool KTProcessorToolbox::PushBackToRunQueue(std::vector< std::string > names)
+    {
+        ThreadGroup threadGroup;
+
+        std::stringstream toPrint;
+        for (const std::string& name : names)
+        {
+            if (! AddProcessorToThreadGroup(name, threadGroup))
+            {
+                KTERROR(proclog, "Unable to add processor <" << name << "> to thread group");
+                return false;
+            }
+            toPrint << name << ", "; // the extra comma at the end is removed below
+        }
+
+        fRunQueue.push_back(threadGroup);
+        std::string toPrintString = toPrint.str();
+        toPrintString.resize(toPrintString.size()-2);
+        KTINFO(proclog, "Added processors <" << toPrintString << "> to the run queue");
+        return true;
+    }
+
+    bool KTProcessorToolbox::AddProcessorToThreadGroup(const std::string& name, ThreadGroup& group)
+    {
+        std::shared_ptr< KTProcessor > procForRunQueue = GetProcessor(name);
+        KTDEBUG(proclog, "Attempting to add processor <" << name << "> to the run queue");
+        if (procForRunQueue == NULL)
+        {
+            KTERROR(proclog, "Unable to find processor <" << name << "> requested for the run queue");
+            return false;
+        }
+
+        KTPrimaryProcessor* primaryProc = dynamic_cast< KTPrimaryProcessor* >(procForRunQueue.get());
+        if (primaryProc == NULL)
+        {
+            KTERROR(proclog, "Processor <" << name << "> is not a primary processor.");
+            return false;
+        }
+        //group.insert(primaryProc);
+        group.insert(Thread(primaryProc, name));
+        return true;
+    }
+
+    void KTProcessorToolbox::AsyncRun()
+    {
+        if( fDoRunThread != nullptr )
+        {
+            KTERROR( proclog, "It appears that a run has already been started" );
+            return;
+        }
+
+        fDoRunPromise = boost::promise< void >();
+        fDoRunFuture = fDoRunPromise.get_future().share();
+
+        bool willRunSingleThreaded = fRunSingleThreaded;
+#ifdef SINGLETHREADED
+        willRunSingleThreaded = true;
+#endif
+
+        if( willRunSingleThreaded )
+        {
+            StartSingleThreadedRun();
+        }
+        else
+        {
+            StartMultiThreadedRun();
+        }
+
+        return;
+    }
+
+    void KTProcessorToolbox::StartSingleThreadedRun()
+    {
+        auto singleThreadRun = [&]()
+        {
+            try
+            {
+                KTPROG( proclog, "Starting single-threaded processing" );
+
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                    {
+                        boost_unique_lock breakContLock( fBreakContMutex );
+
+                        std::string procName( tgIter->fName );
+                        KTINFO( proclog, "Starting processor <" << procName << ">" );
+
+                        std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                        thisThreadRef->Name() = procName;
+
+                        thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                        thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
+
+                        fThreadReferences.push_back( thisThreadRef );
+
+                        boost::condition_variable threadStartedCV;
+                        boost::mutex threadStartedMutex;
+                        bool threadStartedFlag = false;
+
+                        boost_unique_lock threadStartedLock( threadStartedMutex );
+                        boost::thread thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
+                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
+                        while( ! threadStartedFlag )
+                        {
+                            threadStartedCV.wait( threadStartedLock );
+                        }
+                        KTDEBUG( proclog, "Thread has started" );
+
+                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
+
+                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                        do
+                        {
+                            boost::future_status status;
+                            do
+                            {
+                                status = fThreadReferences.back()->GetDataPtrRetFuture().wait_for( boost::chrono::milliseconds(500) );
+                            } while (status != boost::future_status::ready);
+
+                            stillRunning = false;
+                            if( fThreadReferences.back()->GetBreakFlag() )
+                            {
+                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << procName << ">; may not be where breakpoint is set)" );
+
+                                WaitForContinue( breakContLock );
+
+                                KTDEBUG( proclog, "Breakpoint finished" );
+                                stillRunning = true;
+                            }
+                            else
+                            {
+                                try
+                                {
+                                    fThreadReferences.back()->GetReturnValue();
+                                    KTINFO( proclog, "Thread <" << procName << "> has finished" );
+                                    fThreadReferences.pop_back();
+                                }
+                                catch( boost::exception& e )
+                                {
+                                    e << KTErrorMsgInfo< struct procTB_STRFinishing >( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
+                                    throw;
+                                }
+                                stillRunning = false;
+                            }
+                        } while( stillRunning );
+
+                        KTINFO( proclog, "Processor <" << procName << "> has finished" );
+
+                        thread.join();
+                        fThreadReferences.clear();
+                    } // end for loop over the thread group
+                } // end for loop over the run-queue
+
+                KTPROG( proclog, "Processing is complete (single-threaded)" );
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                KTERROR( proclog, "Caught std::exception thrown in a processor or in the single-threaded run function: " << e.what() );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            catch( boost::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                KTERROR( proclog, "Caught boost::exception thrown in a processor or in the single-threaded run function" );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            fDoRunPromise.set_value();
+            return;
+        }; // end single-threaded run lambda
+
+        fDoRunThread = new boost::thread( singleThreadRun );
+        return;
+    }
+    void KTProcessorToolbox::StartMultiThreadedRun()
+    {
+        auto multiThreadRun = [&]()
+        {
+            try
+            {
+                KTPROG( proclog, "Starting multi-threaded processing" );
+
+                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
+                {
+                    boost::thread_group threads;
+
+                    { // scope for threadFuturesLock
+                        boost_unique_lock breakContLock( fBreakContMutex );
+                        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
+
+                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
+                        {
+                            std::string procName( tgIter->fName );
+                            KTINFO( proclog, "Starting processor <" << procName << ">" );
+
+                            std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
+                            thisThreadRef->Name() = procName;
+
+                            thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
+                            thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
+                            fThreadReferences.push_back( thisThreadRef );
+
+                            boost::condition_variable threadStartedCV;
+                            boost::mutex threadStartedMutex;
+                            bool threadStartedFlag = false;
+
+                            boost_unique_lock threadStartedLock( threadStartedMutex );
+                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
+                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
+                            while( ! threadStartedFlag )
+                            {
+                                threadStartedCV.wait( threadStartedLock );
+                            }
+                            KTDEBUG( proclog, "Thread has started" );
+
+                            threads.add_thread( thisThread );
+
+                        }// end for loop over the thread group
+                    } // end scope for threadFuturesLock
+
+                    bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
+                    do
+                    {
+                        auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
+                        boost_unique_lock breakContLock( fBreakContMutex );
+
+                        size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
+                        auto finishedReferencePtr = fThreadReferences.begin() + iThread;
+                        std::string threadName( (*finishedReferencePtr)->Name() );
+                        KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
+
+                        stillRunning = false;
+                        if( fDoRunBreakFlag )
+                        {
+                            // a breakpoint has been reached
+                            KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
+
+                            // wait here for the user to continue
+                            WaitForContinue( breakContLock );
+
+                            KTDEBUG( proclog, "Breakpoint finished" );
+                            stillRunning = true;
+                            //continueSignal = fMasterContSignal; // refresh the local copy of the shared future
+                        }
+                        else
+                        {
+                            // we're finished a thread; get its results
+                            try
+                            {
+                                KTINFO( proclog, "Thread <" << threadName << "> has finished" );
+                                finishedFuturePtr->get();
+                                fThreadReferences.erase( finishedReferencePtr );
+                            }
+                            catch( boost::exception& e )
+                            {
+                                e << KTErrorMsgInfo< struct procTB_MTRFinishing >( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
+                                throw;
+                            }
+
+                            if( fThreadReferences.empty() ) stillRunning = false;
+                            else stillRunning = true;
+                        }
+                    } while( stillRunning );
+
+                    KTDEBUG( proclog, "Joining threads" );
+                    threads.join_all();
+                    boost_unique_lock breakContLock( fBreakContMutex );
+                    fThreadReferences.clear();
+                } // end for loop over the run-queue
+
+                KTPROG( proclog, "Processing is complete (multi-threaded)" );
+            }
+            catch( std::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                KTERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            catch( boost::exception& e )
+            {
+                // exceptions thrown in this function or from within processors will end up here
+                KTERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
+                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
+                fDoRunPromise.set_exception( boost::current_exception() );
+                return;
+            }
+            KTWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
+            fDoRunPromise.set_value();
+            return;
+        }; // end multi-threaded run lambda
+
+        fDoRunThread = new boost::thread( multiThreadRun );
+        return;
+    }
+
+
+    bool KTProcessorToolbox::WaitForBreak()
+    {
+        boost_unique_lock breakContLock( fBreakContMutex );
+
+        if( fDoRunBreakFlag )
+        {
+            KTWARN( proclog, "Can't wait for a break; Already at a breakpoint" );
+            return true;
+        }
+
+        boost::shared_future< void > doRunFuture = fDoRunFuture;
+        if( ! doRunFuture.valid() )
+        {
+            BOOST_THROW_EXCEPTION( KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)" << eom );
+        }
+
+        breakContLock.unlock();
+
+        // block here until there's a break
+        doRunFuture.wait();
+
+        if( fDoRunBreakFlag )
+        {
+            KTDEBUG( proclog, "Breakpoint reached (the wait is over)" );
+            return true;
+        }
+
+        try
+        {
+            doRunFuture.get();
+            KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
+            return false;
+        }
+        catch( boost::exception& e )
+        {
+            KTERROR( proclog, "An error occurred during processing: " << boost::diagnostic_information( e ) );
+            return false;
+        }
+    }
+
+    void KTProcessorToolbox::WaitForEndOfRun()
+    {
+        // WaitForBreak() and WaitForContinue() throw boost::exception for problems with the future or promise objects
+
+        KTDEBUG( proclog, "Waiting for end-of-run" );
+        while( WaitForBreak() )
+        {
+            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
+            boost::mutex localMutex;
+            boost_unique_lock localLock( localMutex );
+            WaitForContinue( localLock );
+            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
+        }
+        KTDEBUG( proclog, "End-of-run reached" );
+
+        return;
+    }
+
+    void KTProcessorToolbox::Continue()
+    {
+        if( ! fDoRunBreakFlag )
+        {
+            KTWARN( proclog, "Not currently at a breakpoint" );
+            return;
+        }
+
+        boost_unique_lock breakContLock( fBreakContMutex );
+
+        // reset all break flags
+        fDoRunBreakFlag = false;
+        std::vector< boost_unique_lock > trLocks;
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
+        {
+            trLocks.emplace_back( (*trIt)->Mutex() );
+            (*trIt)->SetBreakFlag( false );
+            (*trIt)->RefreshDataPtrRet();
+        }
+
+        // reset the do-run promise and future
+        fDoRunPromise = boost::promise< void >();
+        fDoRunFuture = fDoRunPromise.get_future().share();
+
+        KTINFO( proclog, "Continuing from breakpoint" );
+        // signal everything to resume
+        fDoContinue = true;
+        fContinueCV.notify_all();
+
+        return;
+    }
+
+    KTDataHandle KTProcessorToolbox::GetData( const std::string& threadName )
+    {
+        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
+        boost_unique_lock breakContLock( fBreakContMutex );
+
+        auto trIt = fThreadReferences.begin();
+        for( ; trIt != fThreadReferences.end(); ++trIt )
+        {
+            if( (*trIt)->Name() == threadName ) break;
+        }
+        if( trIt == fThreadReferences.end() )
+        {
+            KTWARN( proclog, "Did not find thread <" << threadName << ">" );
+            BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
+        }
+
+        boost_unique_lock lock( (*trIt)->Mutex() );
+        return (*trIt)->GetReturnValue();
+    }
+
+    void KTProcessorToolbox::InitiateBreak()
+    {
+        boost_unique_lock breakContLock( fBreakContMutex );
+        if( fDoRunBreakFlag ) return;
+
+        // set the continue flag to false so that things will wait for the continue
+        fDoContinue = false;
+
+        // set all break flags
+        // master break flag
+        fDoRunBreakFlag = true;
+        // thread break flags
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
+        {
+            boost_unique_lock lock( (*trIt)->Mutex() );
+            (*trIt)->SetBreakFlag( true );
+        }
+
+        // use the do-run promise to signal the break
+        KTWARN( proclog, "Setting value of do-run-promise" );
+        fDoRunPromise.set_value();
+
+        return;
+    }
+
+    void KTProcessorToolbox::CancelThreads()
+    {
+        boost_unique_lock breakContLock( fBreakContMutex );
+        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
+        {
+            boost_unique_lock lock( (*trIt)->Mutex() );
+            (*trIt)->SetCanceled( true );
+        }
+        return;
+    }
+
+    bool KTProcessorToolbox::Run()
+    {
+        // can throw boost::exception
+
+        AsyncRun();
+
+        WaitForEndOfRun();
+
+        JoinRunThread();
+
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Application/KTProcessorToolbox.hh b/Cpp/Library_v1/Application/KTProcessorToolbox.hh
new file mode 100644
index 0000000..e64c794
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTProcessorToolbox.hh
@@ -0,0 +1,331 @@
+/**
+ @file KTProcessorToolbox.hh
+ @brief Contains KTProcessorToolbox
+ @details Manages processors requested by the user at run time.
+ @author: N. S. Oblath
+ @date: Sep 27, 2012
+ */
+
+#ifndef KTPROCESSORTOOLBOX_HH_
+#define KTPROCESSORTOOLBOX_HH_
+
+#include "KTConfigurable.hh"
+<<<<<<< HEAD:Library_v1/Application/KTProcessorToolbox.hh
+#include "KTMemberVariable.hh"
+#include "KTThreadReference.hh"
+
+#include "factory.hh"
+=======
+>>>>>>> develop:Library/Application/KTProcessorToolbox.hh
+
+#define BOOST_THREAD_PROVIDES_FUTURE
+#include <boost/thread/future.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
+
+#include <deque>
+#include <initializer_list>
+#include <limits>
+#include <set>
+#include <memory>
+
+
+namespace Nymph
+{
+    class KTPrimaryProcessor;
+    class KTProcessor;
+
+    /*!
+     @class KTProcessorToolbox
+     @author N. S. Oblath
+
+     @brief Manages processors requested by the user at run time.
+
+     @details
+     KTProcessorToolbox allows the user to setup an application at runtime.
+
+     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
+     the program via a configuration file.
+
+     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
+
+     The following order should be used for configuring the processor toolbox:
+     <ol>
+         <li>Create processors</li>
+         <li>Connect signals and slots</li>
+         <li>Create the run queue</li>
+     </ol>
+
+     Available (nested) configuration values:
+     <ul>
+         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
+         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
+             <ul>
+                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
+                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
+             </ul>
+         </li>
+         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
+             <ul>
+                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
+                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
+                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
+             </ul>
+         </li>
+         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
+         The elements of this array specify processors that are run sequentially.
+         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
+             <ul>
+                 <li>processor name -- add a processor to the run queue, or </li>
+                 <li>array of processor names -- add a group of processors to the run queue.</li>
+             </ul>
+             In single-threaded mode, all processors will be run sequentially, in the order specified.
+         </li>
+     </ul>
+    */
+    class KTProcessorToolbox : public KTConfigurable
+    {
+        private:
+            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
+
+        public:
+            KTProcessorToolbox(const std::string& name = "processor-toolbox");
+            virtual ~KTProcessorToolbox();
+
+        public:
+            /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
+            bool Configure(const scarab::param_node& node);
+
+            /// Configure processors (only those specified in the toolbox)
+            bool ConfigureProcessors(const scarab::param_node& node);
+            /// Configure processors from a json-encoding of their configurations
+            bool ConfigureProcessors(const std::string& config);
+
+            MEMBERVARIABLE( bool, RunSingleThreaded );
+
+        private:
+            struct ProcessorInfo
+            {
+                std::shared_ptr< KTProcessor > fProc;
+            };
+            typedef std::map< std::string, ProcessorInfo > ProcessorMap;
+            typedef ProcessorMap::iterator ProcMapIt;
+            typedef ProcessorMap::const_iterator ProcMapCIt;
+            typedef ProcessorMap::value_type ProcMapValue;
+
+        public:
+            /// Get a pointer to a processor in the toolbox
+            std::shared_ptr< KTProcessor > GetProcessor(const std::string& procName);
+            /// Get a pointer to a processor in the toolbox
+            const std::shared_ptr< KTProcessor > GetProcessor(const std::string& procName) const;
+
+            /// Add a processor to the toolbox
+            /// Toolbox takes ownership of the processor
+            bool AddProcessor(const std::string& procName, std::shared_ptr< KTProcessor > proc);
+            bool AddProcessor(const std::string& procType, const std::string& procName);
+
+            /// Remove a processor from the toolbox
+            bool RemoveProcessor(const std::string& procName);
+
+            /// Remove a processor from the toolbox and return it to the user
+            /// Ownership is passed to the user
+            std::shared_ptr< KTProcessor > ReleaseProcessor(const std::string& procName);
+
+            /// Remove all processors from the toolbox
+            /// Also clears the run queue
+            void ClearProcessors();
+
+        private:
+            ProcessorMap fProcMap;
+
+
+        public:
+            // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
+
+            /// Make a connection between the signal from one processor and the slot from another processor
+            /// Both processors should already have been added to the Toolbox
+            /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
+            bool MakeConnection(const std::string& signal, const std::string& slot, int order);
+            bool MakeConnection(const std::string& signal, const std::string& slot) {return MakeConnection(signal, slot, std::numeric_limits< int >::min());}
+
+            /// Make a connection between the signal from one processor and the slot from another processor
+            /// Both processors should already have been added to the Toolbox
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
+            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName)
+                    {return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min());}
+
+            /// Set a breakpoint on a slot
+            /// Slot string should be formatted as: [processor name]:[slot name]
+            bool SetBreakpoint(const std::string& slot);
+            /// Set a breakpoint on a slot
+            bool SetBreakpoint(const std::string& slotProcName, const std::string& slotName);
+
+            /// Remove a breakpoint from a slot
+            /// Slot string should be formatted as: [processor name]:[slot name]
+            bool RemoveBreakpoint(const std::string& slot);
+            /// Remove a breakpoint from a slot
+            bool RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName);
+
+        private:
+            bool ParseSignalSlotName(const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot) const;
+            static const char fSigSlotNameSep = ':';
+
+
+        public:
+            /// Push a single processor to the back of the run queue
+            bool PushBackToRunQueue(const std::string& name);
+
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue(std::initializer_list< std::string > names);
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue(std::vector< std::string > names);
+
+            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
+            void PopBackOfRunQueue();
+
+            /// Clear the run queue
+            void ClearRunQueue();
+
+        private:
+            struct Thread
+            {
+                    KTPrimaryProcessor* fProc;
+                    std::string fName;
+                    Thread(KTPrimaryProcessor* proc, const std::string& name) : fProc(proc), fName(name)
+                    {}
+            };
+            struct CompareThread
+            {
+                bool operator() (const Thread& lhs, const Thread& rhs) const
+                {
+                    return lhs.fProc < rhs.fProc;
+                }
+            };
+            typedef std::set< Thread, CompareThread > ThreadGroup;
+            typedef std::deque< ThreadGroup > RunQueue;
+            bool AddProcessorToThreadGroup(const std::string& name, ThreadGroup& group);
+
+            RunQueue fRunQueue;
+
+        public:
+            /// Process the run queue.
+            /// This will call Run() on all of the processors in the queue.
+            bool Run();
+
+            void AsyncRun();
+
+            void WaitForContinue( boost_unique_lock& lock );
+
+            /// Returns when processing is completed or a breakpoint is reached
+            /// Throws a boost::exception if there's an error with the future object in use
+            /// If the return is true, processing can continue after the break
+            /// If the return is false, processing has ended (either normally or due to an error)
+            bool WaitForBreak();
+
+            void WaitForEndOfRun();
+
+            void Continue();
+
+            void CancelThreads();
+
+            void JoinRunThread();
+
+            KTDataHandle GetData( const std::string& threadName );
+
+        private:
+            friend class KTThreadReference;
+
+            typedef boost::shared_future< KTDataHandle > Future;
+
+            void StartSingleThreadedRun();
+            void StartMultiThreadedRun();
+
+            // called from KTThreadReference::Break
+            void InitiateBreak();
+
+            std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
+
+            boost::condition_variable fContinueCV;
+            bool fDoContinue;
+            boost::mutex fBreakContMutex;
+
+            boost::thread* fDoRunThread;
+            boost::promise< void > fDoRunPromise;
+            boost::shared_future< void > fDoRunFuture;
+            bool fDoRunBreakFlag;
+
+    };
+
+    template< class Value, class IIterator >
+    class KTThreadRefFutureIter : public boost::iterator_adaptor< KTThreadRefFutureIter< Value, IIterator >, IIterator, Value, boost::random_access_traversal_tag >
+    {
+        private:
+            // used for the conversion constructor below
+            struct enabler {};
+
+        public:
+            KTThreadRefFutureIter() :
+                    KTThreadRefFutureIter::iterator_adaptor_()
+            {}
+            KTThreadRefFutureIter( const IIterator& other ) :
+                    KTThreadRefFutureIter::iterator_adaptor_( other )
+            {}
+
+            // converts from Iterator to ConstIterator, but the enable_if business prevents converting from ConstIterator to Iterator
+            template< class OtherValue, class OtherIIterator >
+            KTThreadRefFutureIter( const KTThreadRefFutureIter< OtherValue, OtherIIterator > & other, typename boost::enable_if< boost::is_convertible< OtherValue, Value >, enabler >::type = enabler() ) :
+                    KTThreadRefFutureIter::iterator_adaptor_( other.base )
+            {}
+
+        private:
+            friend class boost::iterator_core_access;
+
+            Value& dereference() const
+            {
+                return (*(this->base_reference()))->GetDataPtrRetFuture();
+            }
+    };
+
+    typedef KTThreadRefFutureIter< boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
+    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
+
+
+    inline void KTProcessorToolbox::PopBackOfRunQueue()
+    {
+        fRunQueue.pop_back();
+        return;
+    }
+
+    inline void KTProcessorToolbox::ClearRunQueue()
+    {
+        fRunQueue.clear();
+        return;
+    }
+
+<<<<<<< HEAD:Library_v1/Application/KTProcessorToolbox.hh
+    inline void KTProcessorToolbox::WaitForContinue( boost_unique_lock& lock )
+    {
+        //fMasterContSignal.wait();
+        while( ! fDoContinue )
+        {
+            fContinueCV.wait( lock );
+        }
+        return;
+    }
+
+    inline void KTProcessorToolbox::JoinRunThread()
+    {
+        if( fDoRunThread == nullptr ) return;
+        fDoRunThread->join();
+        delete fDoRunThread;
+        fDoRunThread = nullptr;
+    }
+
+=======
+>>>>>>> develop:Library/Application/KTProcessorToolbox.hh
+} /* namespace Nymph */
+#endif /* KTPROCESSORTOOLBOX_HH_ */
diff --git a/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh b/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
new file mode 100644
index 0000000..a0dc85d
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
@@ -0,0 +1,100 @@
+/*
+ * KTProcessorToolboxPybind.hh
+ *
+ *  Created on: Jan 29, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_
+#define NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_
+
+#include "KTProcessorToolbox.hh"
+
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
+
+namespace Nymph
+{
+    void ExportKTProcessorToolbox( pybind11::module& mod )
+    {
+        pybind11::class_< KTProcessorToolbox >( mod, "KTProcessorToolbox" )
+                .def( pybind11::init< const std::string & >() )
+
+                // members related to configuration
+                .def( "ConfigureProcessors", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::ConfigureProcessors,
+                        "Configure processors from a json dictionary. Top-level keys are processor names, values are dictionaries with their configurations" )
+
+                // processor access
+                // GetProcessor skipped because raw pointers are not supported by pybind11
+                .def( "AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::AddProcessor,
+                        "Create a processor by name and add it to the toolbox" )
+				.def("AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, std::shared_ptr< KTProcessor > proc)) &KTProcessorToolbox::AddProcessor,
+						                       "Create a processor and add it to the toolbox" )
+                .def( "RemoveProcessor", &KTProcessorToolbox::RemoveProcessor,
+                        "Remove a processor from the toolbox" )
+                // skipping ReleaseProcessor
+                .def( "ClearProcessor", &KTProcessorToolbox::ClearProcessors,
+                        "Remove all processors from the toolbox" )
+
+                // processor connections
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, int)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor; the signal and slot strings should be formatted as: [processor name]:[signal/slot name]" )
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor; the signal and slot strings should be formatted as: [processor name]:[signal/slot name]" )
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, const std::string&, const std::string&, int)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor" )
+                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, const std::string&, const std::string&)) &KTProcessorToolbox::MakeConnection,
+                        "Make a connection between the signal of one processor and the slot of another processor" )
+
+                // breakpoints
+                .def( "SetBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::SetBreakpoint,
+                        "Set a breakpoint at a specific slot; slot string should be formatted as: [processor name]:[slot name]" )
+                .def( "SetBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::SetBreakpoint,
+                        "Set a breakpoint at a specific slot" )
+
+                .def( "RemoveBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::RemoveBreakpoint,
+                        "Remove a breakpoint; slot string should be formatted as: [processor name]:[slot name]" )
+                .def( "RemoveBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::RemoveBreakpoint,
+                        "Remove a breakpoint" )
+
+                // run queue
+                .def( "PushBackToRunQueue", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::PushBackToRunQueue,
+                        "Push one or more processors to the back of the run queue using a comma-separated string" )
+                .def( "PushBackToRunQueue", (bool (KTProcessorToolbox::*)(std::vector< std::string >)) &KTProcessorToolbox::PushBackToRunQueue,
+                        "Push one or more processors to the back of the run queue using a vector of strings" )
+
+                .def( "PopBackOfRunQueue", &KTProcessorToolbox::PopBackOfRunQueue,
+                        "Remove the last item in the run queue, whether it's a single processor or a group" )
+                .def( "ClearRunQueue", &KTProcessorToolbox::ClearRunQueue,
+                        "Remove all items from the run queue" )
+
+                // run methods
+                .def( "Run", &KTProcessorToolbox::Run, "Start the processors listed in the run queue (blocking)" )
+                .def( "AsyncRun", &KTProcessorToolbox::AsyncRun, "Non-blocking call to Run()" )
+                .def( "WaitForBreak", &KTProcessorToolbox::WaitForBreak, "Blocking call that waits until a breakpoint is reached; you must manually Continue() to proceed" )
+                .def( "WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "Blocking call to Continue() execution until the end of the run is reached; you must manually Continue() to proceed" )
+                .def( "Continue", &KTProcessorToolbox::Continue, "Resume execution (non-blocking)" )
+                .def( "CancelThreads", &KTProcessorToolbox::CancelThreads, "Kill any running thread at the next breakpoint check" )
+                .def( "JoinRunThread", &KTProcessorToolbox::JoinRunThread, "Blocking call to wait until Run() is complete; this should only be done by the owner of the thread (typically whoever called Run())" )
+
+                .def( "GetData", &KTProcessorToolbox::GetData, "Retrieve the data handle from a slot by thread name (i.e. the name of the primary processor for that thread)" );
+
+
+                /*
+                // these are implemented in the boost::python version but not yet here
+
+                PROPERTYMEMBER(KTProcessorToolbox, RunSingleThreaded)
+
+                // Processor access
+                .def("GetProcessor", GetProcessor_wrap, return_value_policy<reference_existing_object>(), "Get a pointer to a processor in the toolbox")
+                .def("AddProcessor", AddProcessor_Ref, "add a processor to the toolbox, toolbox takes ownership")
+                // TODO: Not 100% certain that the reference count for this processor is now correct, given the return_value_policy
+                .def("ReleaseProcessor", &KTProcessorToolbox::ReleaseProcessor, return_value_policy<reference_existing_object>(), "Remove a processor from the toolbox and return it to the user, ownership is passed")
+                */
+                ;
+
+    }
+
+}
+
+#endif /* NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_ */
diff --git a/Cpp/Library_v1/Application/KTRunNymph.cc b/Cpp/Library_v1/Application/KTRunNymph.cc
new file mode 100644
index 0000000..7912d06
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTRunNymph.cc
@@ -0,0 +1,69 @@
+/*
+ * RunNymph.cc
+ *
+ *  Created on: Sep 13, 2016
+ *      Author: obla999
+ */
+
+#include "KTApplication.hh"
+#include "KTLogger.hh"
+#include "KTProcessorToolbox.hh"
+
+#include "param.hh"
+
+#include <string>
+
+KTLOGGER( nlog, "RunNymph" );
+
+namespace Nymph
+{
+    int RunNymph( std::shared_ptr< KTApplication > app )
+    {
+        try
+        {
+            const scarab::param_node& parentConfigNode = app->GetConfigurator()->Config();
+
+            if( ! app->Configure( parentConfigNode[app->GetConfigName()].as_node() ) )
+            {
+                KTERROR( nlog, "Unable to configure the application. Aborting." );
+                return -2;
+            }
+
+            // Create and configure the processor toolbox.
+            // This will create all of the requested processors, connect their signals and slots, and fill the run queue.
+            KTProcessorToolbox procTB;
+
+<<<<<<< HEAD:Library_v1/Application/KTRunNymph.cc
+            if ( ! procTB.Configure( parentConfigNode[procTB.GetConfigName()].as_node() ) )
+=======
+            if( ! procTB.Configure( parentConfigNode[procTB.GetConfigName()].as_node() ) )
+>>>>>>> develop:Library/Application/KTRunNymph.cc
+            {
+                KTERROR( nlog, "Unable to configure processor toolbox. Aborting." );
+                return -3;
+            }
+
+            // Configure the processors
+            if( ! procTB.ConfigureProcessors( parentConfigNode ) )
+            {
+                KTERROR( nlog, "Unable to configure processors. Aborting." );
+                return -4;
+            }
+
+            // Execute the run queue!
+            bool success = procTB.Run();
+
+            procTB.ClearProcessors();
+
+            KTPROG( nlog, "That's all, folks!" );
+
+            if( ! success ) return -5;
+            return 0;
+        }
+        catch( std::exception& e )
+        {
+            KTERROR(  nlog, "Exception caught:\n" << e.what() );
+            return -1;
+        }
+    }
+}
diff --git a/Cpp/Library_v1/Application/KTRunNymph.hh b/Cpp/Library_v1/Application/KTRunNymph.hh
new file mode 100644
index 0000000..dfdff17
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTRunNymph.hh
@@ -0,0 +1,21 @@
+/*
+ * RunNymph.hh
+ *
+ *  Created on: Sep 13, 2016
+ *      Author: obla999
+ */
+
+#ifndef NYMPH_RUNNYMPH_HH_
+#define NYMPH_RUNNYMPH_HH_
+
+#include <memory>
+
+namespace Nymph
+{
+    class KTApplication;
+
+    int RunNymph( std::shared_ptr< KTApplication > aApp);
+}
+
+
+#endif /* NYMPH_RUNNYMPH_HH_ */
diff --git a/Cpp/Library_v1/Application/KTThroughputProfiler.cc b/Cpp/Library_v1/Application/KTThroughputProfiler.cc
new file mode 100644
index 0000000..2dc9fcd
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTThroughputProfiler.cc
@@ -0,0 +1,166 @@
+/*
+ * KTThroughputProfiler.cc
+ *
+ *  Created on: Nov 30, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTThroughputProfiler.hh"
+
+#include <sstream>
+
+
+using std::string;
+using std::stringstream;
+using std::vector;
+
+namespace Nymph
+{
+    KTLOGGER(proflog, "KTThroughputProfiler");
+
+    KT_REGISTER_PROCESSOR(KTThroughputProfiler, "throughput-profiler");
+
+    KTThroughputProfiler::KTThroughputProfiler(const std::string& name) :
+            KTProcessor(name),
+            fOutputFileFlag(false),
+            fOutputFilename("throughput.json"),
+            fTimeStart(),
+            fTimeEnd(),
+            fNDataProcessed(0)
+    {
+        RegisterSlot("start", this, &KTThroughputProfiler::StartProfiling, {});
+        RegisterSlot("data", this, &KTThroughputProfiler::Data, {});
+        RegisterSlot("stop", this, &KTThroughputProfiler::Finish, {});
+    };
+
+    KTThroughputProfiler::~KTThroughputProfiler()
+    {
+    };
+
+    bool KTThroughputProfiler::Configure(const scarab::param_node& node)
+    {
+        SetOutputFileFlag(node.get_value< bool >("output-file-flag", fOutputFileFlag));
+        SetOutputFilename(node.get_value("output-filename-base", fOutputFilename));
+
+        return true;
+    }
+
+    void KTThroughputProfiler::Start()
+    {
+        fTimeStart = CurrentTime();
+        KTDEBUG(proflog, "Start time: " << fTimeStart.tv_sec << " sec and " << fTimeStart.tv_nsec << " nsec");
+        return;
+    }
+
+    void KTThroughputProfiler::Stop()
+    {
+        fTimeEnd = CurrentTime();
+        KTDEBUG(proflog, "End time: " << fTimeEnd.tv_sec << " sec and " << fTimeEnd.tv_nsec << " nsec");
+        return;
+    }
+
+    timespec KTThroughputProfiler::Elapsed()
+    {
+        return Diff(fTimeStart, fTimeEnd);
+    }
+
+    void KTThroughputProfiler::StartProfiling(KTDataHandle header)
+    {
+        KTINFO(proflog, "Profiling started");
+        fNDataProcessed = 0;
+        Start();
+        return;
+    }
+
+    void KTThroughputProfiler::Data(KTDataHandle data)
+    {
+        (void)data;
+        fNDataProcessed++;
+        return;
+    }
+
+    void KTThroughputProfiler::Finish()
+    {
+        Stop();
+        KTINFO(proflog, "Profiling stopped");
+        timespec diffTime = Elapsed();
+        KTPROG(proflog, fNDataProcessed << " slices processed");
+        double totalSeconds = TimeToSec(diffTime);
+        KTPROG(proflog, "Throughput time: " << diffTime.tv_sec << " sec and " << diffTime.tv_nsec << " nsec (" << totalSeconds << " sec)");
+
+        // Data production rate in bytes per second
+        //double dataProductionRate = double(fEggHeader.GetNChannels()) * fEggHeader.GetAcquisitionRate() * double(fEggHeader.GetDataTypeSize());
+
+        // Data throughput rate in bytes per second
+        //double dataThroughputRate = 0.;
+        //if (totalSeconds != 0)
+        //    dataThroughputRate = double(fEggHeader.GetSliceSize() * fEggHeader.GetNChannels() * fNDataProcessed * fEggHeader.GetDataTypeSize()) / totalSeconds;
+
+        //KTINFO(proflog, "Data production rate: " << dataProductionRate << " bytes per second");
+        //KTINFO(proflog, "Data throughput rate: " << dataThroughputRate << " bytes per second");
+        //KTPROG(proflog, "Analysis time factor: " << dataProductionRate / dataThroughputRate);
+
+        return;
+    }
+
+    timespec KTThroughputProfiler::CurrentTime()
+    {
+        timespec ts;
+        GetTimeCurrent(&ts);
+        return ts;
+    }
+
+    timespec KTThroughputProfiler::Diff(timespec start, timespec end) const
+    {
+        timespec diff;
+        TimeDiff(start, end, &diff);
+        return diff;
+    }
+
+#ifdef __MACH__
+    double KTThroughputProfiler::sTimebase = 0.0;
+    uint64_t KTThroughputProfiler::sTimestart = 0;
+#endif
+
+    int KTThroughputProfiler::GetTimeCurrent(struct timespec* time)
+    {
+    #ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+        if (! sTimestart)
+        {
+            mach_timebase_info_data_t tb = { .numer = 0, .denom = 1 };
+            mach_timebase_info(&tb);
+            sTimebase = tb.numer;
+            sTimebase /= tb.denom;
+            sTimestart = mach_absolute_time();
+        }
+        double diff = (mach_absolute_time() - sTimestart) * sTimebase;
+        time->tv_sec = diff * MACNANO;
+        time->tv_nsec = diff - (time->tv_sec * MACGIGA);
+        return 0;
+    #else
+        return clock_gettime(CLOCK_PROCESS_CPUTIME_ID, time);
+    #endif
+
+    }
+
+    double KTThroughputProfiler::TimeToSec(struct timespec time)
+    {
+        return (double)time.tv_sec + (double)time.tv_nsec / (double)NSEC_PER_SEC;
+    }
+
+    void KTThroughputProfiler::TimeDiff(struct timespec start, struct timespec end, struct timespec* diff)
+    {
+        if ((end.tv_nsec - start.tv_nsec < 0))
+        {
+            diff->tv_sec = end.tv_sec - start.tv_sec - 1;
+            diff->tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
+        }
+        else
+        {
+            diff->tv_sec = end.tv_sec - start.tv_sec;
+            diff->tv_nsec = end.tv_nsec - start.tv_nsec;
+        }
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Application/KTThroughputProfiler.hh b/Cpp/Library_v1/Application/KTThroughputProfiler.hh
new file mode 100644
index 0000000..0d7509f
--- /dev/null
+++ b/Cpp/Library_v1/Application/KTThroughputProfiler.hh
@@ -0,0 +1,149 @@
+/*
+ * KTKTThroughputProfiler.hh
+ *
+ *  Created on: Nov 30, 2012
+ *      Author: nsoblath
+ *
+ *      Portability for Mac OS X:
+ *      Author: Jens Gustedt
+ *      URL: http://stackoverflow.com/a/5167506
+ */
+
+#ifndef KTTHROUGHPUTPROFILER_HH_
+#define KTTHROUGHPUTPROFILER_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTCoreData.hh"
+
+#include <string>
+#include <sys/time.h>
+#include <time.h>
+
+#ifndef NSEC_PER_SEC
+#define NSEC_PER_SEC 1000000000
+#endif
+
+#ifndef SEC_PER_NSEC
+#define SEC_PER_NSEC 1.e-9
+#endif
+
+#ifdef __MACH__
+#include <mach/mach_time.h>
+
+#ifndef MACNANO
+#define MACNANO (+1.0E-9)
+#define MACGIGA UINT64_C(1000000000)
+#endif // MACNANO
+#endif // __MACH__
+
+namespace Nymph
+{
+    /*!
+     @class KTThroughputProfiler
+     @author N. S. Oblath
+
+     @brief Measures the speed of data processing
+
+     @details
+
+     A single timer is used to count the total processing time.
+
+     The timer is started with a call to the Start function.
+     The ProcessHeader function is provided as a convenient timer-starting slot called "start", since the Egg processor emits a matching signal before slice processing starts.
+     If using the signal/slot interface, it's recommended to connect the "header" signal (e.g. from KTEggProcessor) to the "start" slot last (i.e. after any other processors have used the "header" signal).
+
+     The timer is stopped with a call to the Stop function.
+     The Finish function is provided as a convenient timer-stopping slot called "stop".
+     If using the signal/slot interface, it's recommended to connect the "egg-done" signal (e.g. from KTEggProcessor) to the "stop" slot first (i.e. before any other processors have used the "egg-done" signal).
+
+     Information printed:
+     - Number of slices processed
+     - Total throughput time -- time in seconds between calling the Start function and the Stop function
+     - Data production rate -- bytes per second calculated assuming the slices were recorded in real-time
+     - Data throughput rate -- bytes per second through the analysis
+     - Analysis time factor -- ratio of the data throughput rate to the data production rate.  If this is 1, then the code analyzes the data at the same speed it was produced.
+
+     Configuration name: "throughput-profiler"
+
+     Available configuration values:
+
+     Slots:
+     - "start": void (KTEggHeader*) -- Start the timer
+     - "data": void (KTDataHandle) -- Increment the counter on the number of data slices
+     - "stop": void () -- Stop the timer
+
+    */
+    class KTThroughputProfiler : public KTProcessor
+    {
+
+        public:
+            KTThroughputProfiler(const std::string& name = "throughput-profiler");
+            virtual ~KTThroughputProfiler();
+
+            bool Configure(const scarab::param_node& node);
+
+            void Start();
+            void Stop();
+
+            void StartProfiling(KTDataHandle data);
+
+            void Data(KTDataHandle data);
+
+            void Finish();
+
+            timespec Elapsed();
+
+            bool GetOutputFileFlag() const;
+            void SetOutputFileFlag(bool flag);
+
+            const std::string& GetOutputFilename() const;
+            void SetOutputFilename(const std::string& fname);
+
+        private:
+            timespec CurrentTime();
+            timespec Diff(timespec start, timespec end) const;
+
+            bool fOutputFileFlag;
+            std::string fOutputFilename;
+
+            timespec fTimeStart;
+            timespec fTimeEnd;
+
+            unsigned fNDataProcessed;
+
+            static int GetTimeCurrent(struct timespec* time);
+            static double TimeToSec(struct timespec time);
+            static void TimeDiff(struct timespec start, struct timespec end, struct timespec* diff);
+#ifdef __MACH__
+            static double sTimebase;
+            static uint64_t sTimestart;
+#endif
+
+
+    };
+
+    inline bool KTThroughputProfiler::GetOutputFileFlag() const
+    {
+        return fOutputFileFlag;
+    }
+
+    inline void KTThroughputProfiler::SetOutputFileFlag(bool flag)
+    {
+        fOutputFileFlag = flag;
+        return;
+    }
+
+    inline const std::string& KTThroughputProfiler::GetOutputFilename() const
+    {
+        return fOutputFilename;
+    }
+
+    inline void KTThroughputProfiler::SetOutputFilename(const std::string& fname)
+    {
+        fOutputFilename = fname;
+        return;
+    }
+
+} /* namespace Nymph */
+#endif /* KTTHROUGHPUTPROFILER_HH_ */
diff --git a/Cpp/Library_v1/CMakeLists.txt b/Cpp/Library_v1/CMakeLists.txt
new file mode 100644
index 0000000..c03d325
--- /dev/null
+++ b/Cpp/Library_v1/CMakeLists.txt
@@ -0,0 +1,121 @@
+# CMakeLists for Nymph/Library_v1
+# Author: N. Oblath
+
+include( PythonPackage )
+
+set( UTIL_DIR Utility )
+set( DATA_DIR Data )
+set( PROC_DIR Processor )
+set( IO_DIR IO )
+set( APPL_DIR Application )
+
+set( NYMPH_HEADERFILES
+#    ${UTIL_DIR}/KTCacheDirectory.hh
+#    ${UTIL_DIR}/KTConcurrentQueue.hh
+#    ${UTIL_DIR}/KTConfigurable.hh
+#    ${UTIL_DIR}/KTDirectory.hh
+#    ${UTIL_DIR}/KTEventLoop.hh
+#    ${UTIL_DIR}/KTException.hh
+#    ${UTIL_DIR}/KTExtensible.hh
+#    ${UTIL_DIR}/KTExtensibleStruct.hh
+#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
+#    ${UTIL_DIR}/KTLogger.hh
+#    ${UTIL_DIR}/KTMemberVariable.hh
+#    ${UTIL_DIR}/KTTIFactory.hh
+#    ${UTIL_DIR}/KTTime.hh
+#    ${DATA_DIR}/KTApplyCut.hh
+#    ${DATA_DIR}/KTCoreData.hh
+#    ${DATA_DIR}/KTCut.hh
+#    ${DATA_DIR}/KTCutFilter.hh
+#    ${DATA_DIR}/KTCutResult.hh
+#    ${DATA_DIR}/KTCutStatus.hh
+#    ${DATA_DIR}/KTData.hh
+#    ${DATA_DIR}/KTRegisterNymphExtData.hh
+#    ${PROC_DIR}/KTConnection.hh
+#    ${PROC_DIR}/KTPrimaryProcessor.hh
+#    ${PROC_DIR}/KTProcessor.hh
+#    ${PROC_DIR}/KTSignal.hh
+#    ${PROC_DIR}/KTSignalWrapper.hh
+#    ${PROC_DIR}/KTSlot.hh
+#    ${PROC_DIR}/KTSlotWrapper.hh
+#    ${PROC_DIR}/KTThreadReference.hh
+#    ${IO_DIR}/KTJSONWriter.hh
+#    ${IO_DIR}/KTReader.hh
+#    ${IO_DIR}/KTWriter.hh
+#    ${APPL_DIR}/KTApplication.hh
+#    ${APPL_DIR}/KTCommandLineHandler.hh
+#    ${APPL_DIR}/KTCommandLineOption.hh
+#    ${APPL_DIR}/KTConfigurator.hh
+#    ${APPL_DIR}/KTDataQueueProcessor.hh
+#    ${APPL_DIR}/KTFilenameParsers.hh
+#    ${APPL_DIR}/KTPrintDataStructure.hh
+#    ${APPL_DIR}/KTProcessorToolbox.hh
+#    ${APPL_DIR}/KTRunNymph.hh
+#    ${APPL_DIR}/KTThroughputProfiler.hh
+    ${UTIL_DIR}/Exception.hh
+    ${UTIL_DIR}/MemberVariable.hh
+)
+
+set( NYMPH_SOURCEFILES
+#    ${UTIL_DIR}/KTCacheDirectory.cc
+#    ${UTIL_DIR}/KTConfigurable.cc
+#    ${UTIL_DIR}/KTDirectory.cc
+#    ${UTIL_DIR}/KTEventLoop.cc
+#    ${UTIL_DIR}/KTException.cc
+#    ${UTIL_DIR}/KTTime.cc
+#    ${DATA_DIR}/KTApplyCut.cc
+#    ${DATA_DIR}/KTCoreData.cc
+#    ${DATA_DIR}/KTCut.cc
+#    ${DATA_DIR}/KTCutFilter.cc
+#    ${DATA_DIR}/KTCutStatus.cc
+#    ${DATA_DIR}/KTData.cc
+#    ${PROC_DIR}/KTPrimaryProcessor.cc
+#    ${PROC_DIR}/KTProcessor.cc
+#    ${PROC_DIR}/KTSignalWrapper.cc
+#    ${PROC_DIR}/KTSlotWrapper.cc
+#    ${PROC_DIR}/KTThreadReference.cc
+#    ${IO_DIR}/KTJSONWriter.cc
+#    ${IO_DIR}/KTReader.cc
+#    ${IO_DIR}/KTWriter.cc
+#    ${APPL_DIR}/KTApplication.cc
+#    ${APPL_DIR}/KTCommandLineHandler.cc
+#    ${APPL_DIR}/KTConfigurator.cc
+#    ${APPL_DIR}/KTDataQueueProcessor.cc
+#    ${APPL_DIR}/KTFilenameParsers.cc
+#    ${APPL_DIR}/KTPrintDataStructure.cc
+#    ${APPL_DIR}/KTProcessorToolbox.cc
+#    ${APPL_DIR}/KTRunNymph.cc
+#    ${APPL_DIR}/KTThroughputProfiler.cc
+    ${UTIL_DIR}/Exception.cc
+)
+
+# Python binding headers
+set( NYMPH_PYBINDING_HEADERFILES
+    #${UTIL_DIR}/KTConfigurablePybind.hh
+    ${UTIL_DIR}/KTParamPybind.hh
+    ${PROC_DIR}/KTProcessorPybind.hh
+    ${PROC_DIR}/KTPyProcessor.hh
+)
+
+# Python bindings
+set( NYMPH_PYBINDING_SOURCEFILES
+    ${PROC_DIR}/KTProcessorPybind.cc
+    NymphPybind.cc
+)
+
+##################################################
+
+pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
+pbuilder_install_headers( ${NYMPH_HEADERFILES} )
+
+if( Nymph_ENABLE_PYTHON )
+    set( LIB_DEPENDENCIES Nymph )
+
+    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
+    
+    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
+    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
+    pbuilder_install_libraries( py_nymph )
+    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
+endif( Nymph_ENABLE_PYTHON )
diff --git a/Cpp/Library_v1/Data/KTApplyCut.cc b/Cpp/Library_v1/Data/KTApplyCut.cc
new file mode 100644
index 0000000..fc57302
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTApplyCut.cc
@@ -0,0 +1,113 @@
+/*
+ * KTApplyCut.cc
+ *
+ *  Created on: Oct 06, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTApplyCut.hh"
+
+#include "KTCut.hh"
+
+using std::string;
+
+
+namespace Nymph
+{
+    KTLOGGER(cutlog, "KTApplyCut");
+
+    KT_REGISTER_PROCESSOR(KTApplyCut, "apply-cut");
+
+    KTApplyCut::KTApplyCut(const std::string& name) :
+            KTProcessor(name),
+            fCut(NULL),
+            fAfterCutSignal("all", this),
+            fAfterCutPassSignal("pass", this),
+            fAfterCutFailSignal("fail", this)
+    {
+        fApplyCutSW = RegisterSlot("apply", this, &KTApplyCut::ApplyCut, {"all", "pass", "fail"});
+    }
+
+    KTApplyCut::~KTApplyCut()
+    {
+        delete fCut;
+    }
+
+    bool KTApplyCut::Configure(const scarab::param_node& node)
+    {
+        // Config-file settings
+
+        for (scarab::param_node::const_iterator nodeIt = node.begin(); nodeIt != node.end(); ++nodeIt)
+        {
+            // first do configuration values we know about
+            // as it happens, there aren't any
+
+            // any remaining should be cut names
+            // ignore any that don't work
+            if (SelectCut(nodeIt.name()))
+            {
+                if (nodeIt->is_node())
+                {
+                    fCut->Configure(nodeIt->as_node());
+                }
+                continue;
+            }
+        }
+
+        if (fCut == NULL)
+        {
+            KTERROR(cutlog, "No cut was selected");
+            return false;
+        }
+        return true;
+    }
+
+    void KTApplyCut::SetCut(KTCut* cut)
+    {
+        delete fCut;
+        fCut = cut;
+        return;
+    }
+
+    bool KTApplyCut::SelectCut(const string& cutName)
+    {
+        KTCut* tempCut = scarab::factory< KTCut, const std::string& >::get_instance()->create(cutName, cutName);
+        if (tempCut == NULL)
+        {
+            KTERROR(cutlog, "Invalid cut name given: <" << cutName << ">.");
+            return false;
+        }
+        SetCut(tempCut);
+        return true;
+    }
+
+
+    void KTApplyCut::ApplyCut(KTDataHandle dataHandle)
+    {
+        std::shared_ptr< KTThreadReference > ref = fApplyCutSW->GetThreadRef();
+
+        if (fCut == NULL)
+        {
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "No cut was specified" );
+            return;
+        }
+
+        bool cutFailed = fCut->Apply(dataHandle);
+
+        ref->Break( dataHandle, fApplyCutSW->GetDoBreakpoint() );
+
+        if (cutFailed)
+        {
+            fAfterCutFailSignal(dataHandle);
+        }
+        else
+        {
+            fAfterCutPassSignal(dataHandle);
+        }
+        fAfterCutSignal(dataHandle);
+        return;
+    }
+
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTApplyCut.hh b/Cpp/Library_v1/Data/KTApplyCut.hh
new file mode 100644
index 0000000..e9d3b7e
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTApplyCut.hh
@@ -0,0 +1,99 @@
+/**
+ @file KTApplyCut.hh
+ @brief Contains KTApplyCut
+ @details Applies a cut to data
+ @author: N. S. Oblath
+ @date: Oct 6, 2014
+ */
+
+#ifndef KTAPPLYCUT_HH_
+#define KTAPPLYCUT_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTLogger.hh"
+#include "KTMemberVariable.hh"
+#include "KTSlot.hh"
+
+#include <string>
+
+namespace Nymph
+{
+    class KTCut;
+
+    /*!
+     @class KTApplyCut
+     @author N. S. Oblath
+
+     @brief Applies a cut to data.
+
+     @details
+     KTApplyCut applies a cut to data -- the type of cut and its parameters are specified at runtime
+     from the set of cuts registered.
+
+     Only one cut can be applied by a given instance of KTApplyCut.  To apply more than one cut, add another instance.
+
+     Interpretation of boolean returned by KTCut::Apply
+     - TRUE means the cut was failed
+     - FALSE means the cut was passed
+
+     Configuration name: "apply-cut"
+
+     Available configuration values:
+     - "[cut name]": subtree -- specifies the cut to be used; parent node for the cut configuration
+
+     Slots:
+     - "apply": void (KTDataHandle) -- Applies the cut to the received data; Requirements are set by the cut; No data is added.
+
+     Signals:
+     - "all": void (KTDataHandle) -- Emitted upon application of the cut regardless of cut result.
+     - "pass": void (KTDataHandle) -- Emitted upon application of the cut if the cut passed.
+     - "fail": void (KTDataHandle) -- Emitted upon application of the cut if the cut failed.
+    */
+
+    class KTApplyCut : public KTProcessor
+    {
+        public:
+            KTApplyCut(const std::string& name = "apply-cut");
+            virtual ~KTApplyCut();
+
+            bool Configure(const scarab::param_node& node);
+
+            KTCut* GetCut() const;
+            void SetCut(KTCut* cut);
+            bool SelectCut(const std::string& cutName);
+
+        private:
+            KTCut* fCut;
+
+        public:
+            void ApplyCut(KTDataHandle dataHandle);
+
+
+            //***************
+            // Signals
+            //***************
+
+        private:
+            KTSignalData fAfterCutSignal;
+            KTSignalData fAfterCutPassSignal;
+            KTSignalData fAfterCutFailSignal;
+
+            //***************
+            // Slots
+            //***************
+
+            KTSlotWrapper* fApplyCutSW;
+
+        private:
+
+    };
+
+
+    inline KTCut* KTApplyCut::GetCut() const
+    {
+        return fCut;
+    }
+
+} /* namespace Nymph */
+#endif /* KTAPPLYCUT_HH_ */
diff --git a/Cpp/Library_v1/Data/KTCoreData.cc b/Cpp/Library_v1/Data/KTCoreData.cc
new file mode 100644
index 0000000..9b80e3b
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCoreData.cc
@@ -0,0 +1,33 @@
+/*
+ * KTCoreData.cc
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTCoreData.hh"
+
+namespace Nymph
+{
+    KTCoreData::KTCoreData() :
+            KTData(),
+            fCounter( 0 ),
+            fLastData( false ),
+            fCutStatus()
+    {
+        std::cout << "### KTCoreData constructor" << std::endl;
+    }
+
+    KTCoreData::~KTCoreData()
+    {
+        std::cout << "### KTCoreData destrutor" << std::endl;
+    }
+
+
+    KTDataHandle CreateNewDataHandle()
+    {
+        return std::make_shared< KTCoreDataExt >();
+    }
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTCoreData.hh b/Cpp/Library_v1/Data/KTCoreData.hh
new file mode 100644
index 0000000..f6d6901
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCoreData.hh
@@ -0,0 +1,88 @@
+/*
+ * KTCoreData.hh
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTCOREDATA_HH_
+#define KTCOREDATA_HH_
+
+#include "KTData.hh"
+
+#include "KTCutStatus.hh"
+#include "KTLogger.hh"
+#include "KTMemberVariable.hh"
+
+#include <memory>
+#include <string>
+
+namespace Nymph
+{
+    LOGGER( cdlog_h, "KTCoreData.hh" )
+
+    class KTCoreData : public KTData
+    {
+        public:
+            KTCoreData();
+            virtual ~KTCoreData();
+
+            MEMBERVARIABLE( unsigned, Counter );
+            MEMBERVARIABLE( bool, LastData );
+
+            MEMBERVARIABLE_REF( KTCutStatus, CutStatus );
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTCoreData" << std::endl;
+                ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fCounter), CEREAL_NVP(fLastData), CEREAL_NVP(fCutStatus) );
+            }
+    };
+
+    DEFINE_EXT_DATA( KTCoreData, "core" )
+
+
+    // Define KTDataHandle and a convenience function to create new handles
+    typedef std::shared_ptr< KTCoreDataExt > KTDataHandle;
+    KTDataHandle CreateNewDataHandle();
+
+
+    // Recursive helper structs for determining if data objects are present
+
+    // End of the recursion; this will only be used if NoOtherDataTypes has nothing in it
+    template< class... NoOtherDataTypes >
+    struct DataPresentHelper
+    {
+        static bool DataPresent( KTDataHandle );
+    };
+
+    template< class DataType, class... OtherDataTypes >
+    struct DataPresentHelper< DataType, OtherDataTypes... >
+    {
+        static bool DataPresent( KTDataHandle data );
+    };
+
+    template< class... NoOtherDataTypes >
+    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( KTDataHandle )
+    {
+        return true;
+    }
+
+    template< class DataType, class... OtherDataTypes >
+    bool DataPresentHelper< DataType, OtherDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        if( ! data->Has< DataType >() )
+        {
+            KTERROR( cdlog_h, "Data not found with type <" << typeid( DataType ).name() << ">" );
+            return false;
+        }
+        return DataPresentHelper< OtherDataTypes... >::DataPresent( data );
+    }
+
+
+} /* namespace Nymph */
+#endif /* KTCOREDATA_HH_ */
diff --git a/Cpp/Library_v1/Data/KTCut.cc b/Cpp/Library_v1/Data/KTCut.cc
new file mode 100644
index 0000000..4b20a98
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCut.cc
@@ -0,0 +1,21 @@
+/*
+ * KTCut.cc
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTCut.hh"
+
+namespace Nymph
+{
+    KTCut::KTCut(const std::string& name) :
+            KTConfigurable(name)
+    {
+    }
+
+    KTCut::~KTCut()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTCut.hh b/Cpp/Library_v1/Data/KTCut.hh
new file mode 100644
index 0000000..753d83a
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCut.hh
@@ -0,0 +1,209 @@
+/*
+ * KTCut.hh
+ *
+ *  Created on: Sept 19, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTCUT_HH_
+#define KTCUT_HH_
+
+#include "KTConfigurable.hh"
+#include "KTCutResult.hh"
+#include "KTCoreData.hh"
+#include "KTException.hh"
+#include "KTExtensibleStructFactory.hh"
+#include "KTLogger.hh"
+#include "KTMemberVariable.hh"
+
+#include "factory.hh"
+#include "typename.hh"
+
+#include <functional>
+
+namespace Nymph
+{
+    KTLOGGER(cutlog_h, "KTCut.h");
+
+    /*!
+     @class KTCut
+     @author N. S. Oblath
+
+     @brief Base class for a cut that gets applied to data objects.
+
+     @details
+     A fully implemented cut MUST have the following:
+     - Public nested class called Result, inheriting from KTExtensibleCutResult< Result >, and containing a public static std::string name sName.
+     - Cut registration using the macro KT_REGISTER_CUT([class name])
+     - Implementation of bool Configure(const scarab::param_node*)
+     - Implementation of bool Apply(KTCoreData&, <DataType(s)>)
+
+     Your cut class should inherit from KTCutOneArg or KTCutTwoArgs, depending on the number of data types involved in your cut.
+
+     The existence of [class name]::Result and [class name]::Result::sName are enforces at compile time by the KT_REGISTER_CUT macro.
+
+     The functions bool Configure(const scarab::param_node*) and void Apply(KTCoreData&, <DataType(s)>) are abstract in the base classes, and therefore must be implemented.
+
+     Boolean return value interpretation:
+     - TRUE means the cut was failed
+     - FALSE means the cut was passed
+
+     --------------------------------------
+     ------- Example Cut Definition -------
+     --------------------------------------
+
+     class KTSomeData;
+     class KTSomeDataExt;
+
+     // Data must be at least as awesome as fAwesomenessThreshold to pass this cut
+     class KTAwesomenessCut : public KTCutOnData< KTSomeDataExt >
+     {
+         public:
+             struct Result : KTExtensibleCutResult< Result >
+             {
+                 static const std::string sName;
+             };
+
+         public:
+             KTAwesomenessCut(const std::string& name = "default-example-cut");
+             virtual ~KTAwesomenessCut();
+
+             bool Configure(const scarab::param_node* node);
+
+             MEMBERVARIABLE(double, AwesomenessThreshold);
+
+         public:
+             bool Apply(KTCoreData& data, KTSomeData& data);
+
+     };
+
+     --------------------------------------
+     ------- Example Implementation -------
+     --------------------------------------
+
+     const std::string KTAwesomenessCut::Result::sName = "awesomeness-cut";
+
+     KT_REGISTER_CUT(KTAwesomenessCut);
+
+     KTAwesomenessCut::KTAwesomenessCut(const std::string& name) :
+             KTCutOnData(name),
+             fAwesomenessThreshold(1000000.)
+     {
+         SetApplyFunc( this, &KTAwesomeCut::Apply );
+     }
+
+     KTAwesomenessCut::~KTExampleCut()
+     {}
+
+     bool KTAwesomenessCut::Configure(const scarab::param_node* node)
+     {
+         if (node == NULL) return true;
+         SetAwesomenessThreshold(node->get_value("awesomeness", GetAwesomenessThreshold()));
+         return true;
+     }
+
+     bool KTAwesomenessCut::Apply(KTCoreData& data, KTSomeData& someData)
+     {
+         bool isCut = someData.Awesomeness() < fAwesomenessThreshold;
+         data.GetCutStatus().AddCutResult< KTAwesomenessCut::Result >(isCut);
+         return isCut;
+     }
+
+    */
+
+    //************************************
+    // KTCut -- base class for all cuts
+    //************************************
+
+    class KTCut : public KTConfigurable
+    {
+        public:
+            KTCut(const std::string& name = "default-cut-name");
+            virtual ~KTCut();
+
+            virtual bool Apply(KTDataHandle) = 0;
+
+    };
+
+    //*******************************************************
+    // KTCutOnData -- cut applied to one or more data objects
+    //*******************************************************
+
+    template< class ... XExtDataTypes >
+    class KTCutOnData : public KTCut
+    {
+        public:
+            KTCutOnData( const std::string& name = "default-cut-name" );
+            virtual ~KTCutOnData();
+
+            virtual bool Apply( KTDataHandle dataHandle );
+
+        protected:
+            template< class... SomeExtDataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            void SetApplyFunc( XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( KTCoreData&, const XFuncDataTypes&... ) );
+
+            std::function< bool ( KTCoreDataExt& data, const XExtDataTypes&... dataType ) > fFunc;
+
+    };
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    template< class ... XExtDataTypes >
+    KTCutOnData< XExtDataTypes... >::KTCutOnData( const std::string& name ) :
+            KTCut(name)
+    {
+    }
+
+    template< class ... XExtDataTypes >
+    KTCutOnData< XExtDataTypes... >::~KTCutOnData()
+    {}
+
+    template< class ... XExtDataTypes >
+    bool KTCutOnData< XExtDataTypes... >::Apply( KTDataHandle dataHandle )
+    {
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XExtDataTypes... >( dataHandle ) )
+        {
+            KTERROR( cutlog_h, "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." );
+            BOOST_THROW_EXCEPTION( KTException() << "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." << eom );
+        }
+
+        try
+        {
+            return fFunc( dataHandle->Of< KTCoreDataExt >() , dataHandle->Of< XExtDataTypes >()... );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fConfigName + ">. Aborting." );
+            throw;
+        }
+    }
+
+    template< class... XExtDataTypes >
+    template< typename... SomeExtDataTypes >
+    bool KTCutOnData< XExtDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< SomeExtDataTypes... >::DataPresent( data );
+    }
+
+    template< class... XExtDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    void KTCutOnData< XExtDataTypes... >::SetApplyFunc( XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( KTCoreData&, const XFuncDataTypes&... ) )
+    {
+        fFunc = [func, owner]( KTCoreDataExt& data, const XExtDataTypes&... testData )->bool {return (owner->*func)(data, testData...);};
+    }
+
+
+    // this macro enforces the existence of cut_class::Result and cut_class::Result::sName at compile time
+#define KT_REGISTER_CUT(cut_class, cut_name) \
+        static ::scarab::registrar< ::Nymph::KTCut, cut_class, const std::string& > sCut##cut_class##Registrar( cut_name );
+
+} /* namespace Nymph */
+
+#endif /* KTCUT_HH_ */
diff --git a/Cpp/Library_v1/Data/KTCutFilter.cc b/Cpp/Library_v1/Data/KTCutFilter.cc
new file mode 100644
index 0000000..05d1906
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCutFilter.cc
@@ -0,0 +1,100 @@
+/*
+ * KTCutFilter.cc
+ *
+ *  Created on: Oct 06, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTCutFilter.hh"
+
+#include "KTCut.hh"
+
+using std::string;
+
+
+namespace Nymph
+{
+    KTLOGGER(cutlog, "KTCutFilter");
+
+    KT_REGISTER_PROCESSOR(KTCutFilter, "cut-filter");
+
+    KTCutFilter::KTCutFilter(const std::string& name) :
+            KTProcessor(name),
+            fCutMask(),
+            fCutMaskInt(0),
+            fConvertToBitset(false),
+            fAllBits(true),
+            fAfterCutSignal("all", this),
+            fAfterCutPassSignal("pass", this),
+            fAfterCutFailSignal("fail", this)
+    {
+        fFilterDataSW = RegisterSlot("filter", this, &KTCutFilter::FilterData, {"all", "pass", "fail"});
+    }
+
+    KTCutFilter::~KTCutFilter()
+    {
+    }
+
+    bool KTCutFilter::Configure(const scarab::param_node& node)
+    {
+        // Config-file settings
+        if (node.has("cut-mask-int"))
+        {
+            SetCutMask(node["cut-mask-int"]().as_uint());
+        }
+        if (node.has("cut-mask"))
+        {
+            SetCutMask(KTCutStatus::bitset_type(node["cut-mask"]().as_string()));
+        }
+        if (node.get_value("cut-mask-all", false))
+        {
+            SetCutMaskAll();
+        }
+
+        return true;
+    }
+
+    bool KTCutFilter::Filter(const KTCoreData& data)
+    {
+        if (fAllBits)
+        {
+            return data.CutStatus().IsCut();
+        }
+
+        const KTCutStatus& cutStatus = data.CutStatus();
+        if (fConvertToBitset)
+        {
+            fCutMask = cutStatus.ToBitset(fCutMaskInt);
+        }
+
+        if (fCutMask.size() != cutStatus.size()) fCutMask.resize(cutStatus.size());
+
+        return cutStatus.IsCut(fCutMask);
+    }
+
+    void KTCutFilter::FilterData(KTDataHandle dataHandle)
+    {
+        std::shared_ptr< KTThreadReference > ref = fFilterDataSW->GetThreadRef();
+
+        // all KTDataHandle's have KTCoreData, so we won't bother checking
+
+        bool failCut = Filter(dataHandle->Of< KTCoreDataExt >());
+
+        ref->Break( dataHandle, fFilterDataSW->GetDoBreakpoint() );
+
+        if (failCut)
+        {
+            fAfterCutFailSignal(dataHandle);
+        }
+        else
+        {
+            fAfterCutPassSignal(dataHandle);
+        }
+        fAfterCutSignal(dataHandle);
+
+        return;
+    }
+
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTCutFilter.hh b/Cpp/Library_v1/Data/KTCutFilter.hh
new file mode 100644
index 0000000..dacd571
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCutFilter.hh
@@ -0,0 +1,139 @@
+/**
+ @file KTApplyCut.hh
+ @brief Contains KTApplyCut
+ @details Applies a cut to data
+ @author: N. S. Oblath
+ @date: Oct 6, 2014
+ */
+
+#ifndef KTCUTFILTER_HH_
+#define KTCUTFILTER_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTCutStatus.hh"
+
+#include "KTLogger.hh"
+#include "KTMemberVariable.hh"
+#include "KTSlot.hh"
+
+#include <string>
+
+namespace Nymph
+{
+    class KTCut;
+
+    /*!
+     @class KTCutFilter
+     @author N. S. Oblath
+
+     @brief Filters data based on cuts already applied and a filter mask.
+
+     @details
+     KTCutFilter checks the status of cuts that have already been applied to a data.  If the bitwise AND of the cut status with
+     the configurable cut mask is non-zero, than the data fails the filter.
+
+     Interpretation of the boolean returned by Filter(KTCoreData&):
+     - TRUE means the data failed the cut filter.
+     - FALSE means the data passed the cut filter.
+
+     Configuration name: "cut-filter"
+
+     Available configuration values:
+     - "cut-mask-all": bool -- If true, filter will use all cuts. If this is present and true, it overrules other mask configurations.
+     - "cut-mask": string -- Set the cut mask with a string of 1's and 0's. The first character is the highest significant bit, and the last character is the least significant bit.
+                             If present, it overrules cut-mask-int.
+     - "cut-mask-int": unsigned int -- Set the cut mask with an unsigned integer's bit values.
+
+     Slots:
+     - "filter": void (KTDataHandle) -- Checks the cut status of the received data ANDed with the cut mask; No data is added.
+
+     Signals:
+     - "all": void (KTDataHandle) -- Emitted after cut status is checked for all data.
+     - "pass": void (KTDataHandle) -- Emitted after cut status is checked if the cut filter passed.
+     - "fail": void (KTDataHandle) -- Emitted after cut status is checked if the cut filter failed.
+    */
+
+    class KTCutFilter : public KTProcessor
+    {
+        public:
+            KTCutFilter(const std::string& name = "cut-filter");
+            virtual ~KTCutFilter();
+
+            bool Configure(const scarab::param_node& node);
+
+            void SetCutMask(KTCutStatus::bitset_type mask);
+            void SetCutMask(unsigned long long mask);
+            /// Set the mask with a string; String must consist of all 0's and 1's.
+            void SetCutMask(const std::string& mask);
+
+            /// Set the cut mask to use all cuts
+            void SetCutMaskAll();
+
+        private:
+            KTCutStatus::bitset_type fCutMask;
+            MEMBERVARIABLE_NOSET(unsigned long long, CutMaskInt);
+
+            bool fConvertToBitset;
+            bool fAllBits;
+
+        public:
+            bool Filter(const KTCoreData& data);
+
+            void FilterData(KTDataHandle dataHandle);
+
+
+            //***************
+            // Signals
+            //***************
+
+        private:
+            KTSignalData fAfterCutSignal;
+            KTSignalData fAfterCutPassSignal;
+            KTSignalData fAfterCutFailSignal;
+
+            //***************
+            // Slots
+            //***************
+
+            KTSlotWrapper* fFilterDataSW;
+
+        private:
+
+    };
+
+
+    inline void KTCutFilter::SetCutMask(KTCutStatus::bitset_type mask)
+    {
+        fCutMask = mask;
+        fConvertToBitset = false;
+        fAllBits = false;
+        return;
+    }
+
+    inline void KTCutFilter::SetCutMask(unsigned long long mask)
+    {
+        fCutMaskInt = mask;
+        fConvertToBitset = true;
+        fAllBits = false;
+        return;
+    }
+
+    inline void KTCutFilter::SetCutMask(const std::string& mask)
+    {
+        fCutMask = KTCutStatus::bitset_type(mask);
+        fConvertToBitset = false;
+        fAllBits = false;
+        return;
+    }
+
+    inline void KTCutFilter::SetCutMaskAll()
+    {
+        fCutMask.clear();
+        fConvertToBitset = false;
+        fAllBits = true;
+        return;
+    }
+
+} /* namespace Nymph */
+#endif /* KTCUTFILTER_HH_ */
diff --git a/Cpp/Library_v1/Data/KTCutResult.hh b/Cpp/Library_v1/Data/KTCutResult.hh
new file mode 100644
index 0000000..dbc0438
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCutResult.hh
@@ -0,0 +1,36 @@
+/*
+ * KTCutResult.hh
+ *
+ *  Created on: Sept 19, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTCUTRESULT_HH_
+#define KTCUTRESULT_HH_
+
+#include <string>
+
+namespace Nymph
+{
+    struct KTCutResult
+    {
+        std::string fName;
+        bool fState;
+        bool fAssigned;
+        KTCutResult() : fName(), fState( false ), fAssigned( false ) {}
+        KTCutResult( const std::string& name, bool state ) : fName( name ), fState( state ), fAssigned( true ) {}
+    };
+
+    struct CheckCutResultName
+    {
+        std::string fName;
+        CheckCutResultName( const std::string& name ) : fName( name ) {}
+        bool operator()( const KTCutResult& result )
+        {
+            return result.fName == fName;
+        }
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTCUTRESULT_HH_ */
diff --git a/Cpp/Library_v1/Data/KTCutStatus.cc b/Cpp/Library_v1/Data/KTCutStatus.cc
new file mode 100644
index 0000000..9396e76
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCutStatus.cc
@@ -0,0 +1,94 @@
+/*
+ * KTCut.cc
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTCutStatus.hh"
+
+#include "KTExtensibleStructFactory.hh"
+#include "KTLogger.hh"
+
+namespace Nymph
+{
+    KTLOGGER(cutlog, "KTCut");
+
+    KTCutStatus::KTCutStatus() :
+            fCutResults(),
+            fSummary()
+    {
+    }
+
+    KTCutStatus::KTCutStatus(const KTCutStatus& orig) :
+            fCutResults(orig.fCutResults),
+            fSummary()
+    {
+        UpdateStatus();
+    }
+
+    KTCutStatus::~KTCutStatus()
+    {}
+
+    KTCutStatus& KTCutStatus::operator=(const KTCutStatus& rhs)
+    {
+        fCutResults = rhs.fCutResults;
+        UpdateStatus();
+        return *this;
+    }
+
+    void KTCutStatus::AssignCutResult(unsigned maskPos, const std::string& name, bool state, bool doUpdateStatus)
+    {
+        KTDEBUG(cutlog, "Assigning cut result <" << name << "> to position <" << maskPos << "> with state <" << state << ">");
+        if( maskPos >= fCutResults.size() )
+        {
+            fCutResults.resize( maskPos + 1 );
+        }
+        KTDEBUG(cutlog, "Cut result size is now <" << fCutResults.size() << ">");
+        if( fCutResults[maskPos].fAssigned )
+        {
+            throw KTException() << "Mask position <" << maskPos << "> has already been assigned";
+        }
+        fCutResults[maskPos].fName = name;
+        fCutResults[maskPos].fState = state;
+        fCutResults[maskPos].fAssigned = true;
+        if( doUpdateStatus ) UpdateStatus();
+        return;
+    }
+
+    void KTCutStatus::UpdateStatus()
+    {
+        KTDEBUG(cutlog, "Updating cut summary");
+        unsigned nCuts = fCutResults.size();
+        fSummary.resize(nCuts, false);
+
+        // loop through to set cuts
+        for (unsigned iCut = 0; iCut < nCuts; ++iCut)
+        {
+            fSummary[iCut] = fCutResults[iCut].fAssigned && fCutResults[iCut].fState;
+        }
+        KTDEBUG(cutlog, "Cut summary bitset: " << fSummary);
+        return;
+    }
+
+    std::string KTCutStatus::CutResultsPresent() const
+    {
+        std::string cutsPresent;
+        for (auto cutIt = fCutResults.cbegin(); cutIt != fCutResults.cend(); ++cutIt)
+        {
+            if (! cutIt->fName.empty())
+            {
+                cutsPresent = cutIt->fName + " " + cutsPresent;
+            }
+        }
+        return cutsPresent;
+    }
+
+    std::ostream& operator<<(std::ostream& out, const KTCutStatus& status)
+    {
+        out << "Cut summary: " << status.fSummary << '\n';
+        return out;
+    }
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTCutStatus.hh b/Cpp/Library_v1/Data/KTCutStatus.hh
new file mode 100644
index 0000000..77c41ee
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTCutStatus.hh
@@ -0,0 +1,316 @@
+/*
+ * KTCutStatus.hh
+ *
+ *  Created on: Sept 19, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTCUTSTATUS_HH_
+#define KTCUTSTATUS_HH_
+
+
+#include "KTCutResult.hh"
+
+#include "KTException.hh"
+
+#include "cereal/access.hpp"
+#include "cereal/types/string.hpp"
+#include "cereal/types/vector.hpp"
+
+#include <boost/dynamic_bitset.hpp>
+
+#include <algorithm>
+#include <memory>
+#include <vector>
+
+namespace Nymph
+{
+    /*!
+     @class KTCutStatus
+     @author N. S. Oblath
+
+     @brief Provides easy access to cut result information.
+
+     @details
+     The cut results can be imagined as an array of booleans, specifying whether the cut was passed: [true, false, false, true, . . . ].
+
+     Cuts are assigned both an array position (non-negative integer) and a name (string) before or when the results are set.
+
+     KTCutStatus is typically used as a member variable of KTCoreData, the top-level data object.
+
+     KTCutStatus owns the set of KTCutResults that have been added to a data object.
+     It also owns a summary of those cuts (implemented with boost::dynamic_bitset).
+
+     You can check if the data has been cut with the IsCut functions.
+     - IsCut() returns true if any cut results are true;
+     - IsCut(const bitset_type& mask), IsCut(unsigned int mask), and IsCut(const std::string& mask) allow you to specify
+       a cut mask, and return true if any of the cut results specified by the mask are true.
+
+     When specifying a cut mask, bits set to true specify cuts that should be used:
+     - bitset_type is boost::dynamic_bitset;
+     - unsigned integer masks use the bits of the integer;
+     - std::string masks are strings with each character either a 0 or 1.
+
+     With KTCutStatus you can interact with individual cut results in the following ways:
+     - Get the number of cut results with size(),
+     - Get a reference to the cut results with CutResults(),
+     - If you need to manually update the cut status bitset, use UpdateStatus(),
+     - Add cut results to a data object with AssignCutResult(),
+     - Remove a cut result with RemoveCutResult(),
+     - Check to see if a particular cut result is present using HasCutResult(),
+     - Get the value of a cut result with GetCutState(), and
+     - Set the value of a cut result with SetCutState(),
+
+     Cut results can typically be accessed by either name or mask position.
+     */
+
+    // external serialization function for KTCutResult
+    template< class Archive >
+    void serialize( Archive & archive, KTCutResult& cutResult )
+    {
+        archive( CEREAL_NVP(cutResult.fName), CEREAL_NVP(cutResult.fState), CEREAL_NVP(cutResult.fAssigned) );
+    }
+
+    class KTCutStatus
+    {
+        public:
+            typedef boost::dynamic_bitset< > bitset_type;
+
+            typedef std::vector< KTCutResult > CutResults_t;
+
+            typedef CutResults_t::iterator CutResultsIt;
+            typedef CutResults_t::const_iterator CutResultsCIt;
+
+        public:
+            KTCutStatus();
+            KTCutStatus(const KTCutStatus& orig);
+            ~KTCutStatus();
+
+            KTCutStatus& operator=(const KTCutStatus& rhs);
+
+            /// Returns the size of the cut results vector
+            size_t size() const;
+
+            /// Returns a reference to the cut results vector
+            const CutResults_t& CutResults() const;
+
+            /// Updates the summary bitset from the cut results vector
+            void UpdateStatus();
+
+            /// Adds a new cut result if it doesn't exist, and assigns the specified name and state at maskPos; throws KTException if maskPos is already assigned
+            void AssignCutResult(unsigned maskPos, const std::string& name, bool state=false, bool doUpdateStatus=true);
+
+            /// Removes the cut by erasing the name and setting the state to false
+            void RemoveCutResult(const std::string& cutName, bool doUpdateStatus=true);
+            /// Removes the cut by erasing the name and setting the state to false
+            void RemoveCutResult(unsigned maskPos, bool doUpdateStatus=true);
+
+            CutResultsIt FindCutResult(const std::string& cutName);
+            CutResultsCIt FindCutResultC(const std::string& cutName) const;
+
+            CutResultsIt  CutResultsEnd();
+            CutResultsCIt CutResultsEndC() const;
+
+            /// Returns whether or not the specified cut is present
+            bool HasCutResult(const std::string& cutName) const;
+            /// Returns whether or not the specified cut is present (whether or not it has been explicitly assigned)
+            bool HasCutResult(unsigned maskPos) const;
+
+            /// Returns the state of the named cut; throws KTException if it doesn't exist
+            bool GetCutState(const std::string& cutName) const;
+            /// Returns the state of the specified cut; throws KTException if it doesn't exist
+            bool GetCutState(unsigned maskPos) const;
+
+            /// Sets the state of the specified cut; throws KTException if it doesn't exist
+            void SetCutState(const std::string& cutName, bool state, bool doUpdateStatus=true);
+            /// Sets the state of the specified cut; throws KTException if it doesn't exist
+            void SetCutState(unsigned maskPos, bool state, bool doUpdateStatus=true);
+
+            /// Returns a string with the names of the cuts that are present in bitset order
+            std::string CutResultsPresent() const;
+
+        private:
+            friend std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
+
+            CutResults_t fCutResults;
+
+            bitset_type fSummary;
+
+        public:
+            bool IsCut() const;
+            bool IsCut(const bitset_type& mask) const;
+            bool IsCut(unsigned long long mask) const;
+            bool IsCut(const std::string& mask) const;
+
+            bitset_type ToBitset(unsigned long long mask) const;
+            bitset_type ToBitset(const std::string& mask) const;
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void save( Archive& ar ) const;
+
+            template< class Archive >
+            void load( Archive& ar );
+
+    };
+
+    std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
+
+
+    inline const KTCutStatus::CutResults_t& KTCutStatus::CutResults() const
+    {
+        return fCutResults;
+    }
+
+    inline KTCutStatus::CutResultsIt KTCutStatus::FindCutResult( const std::string& name )
+    {
+        if( name.empty() ) return fCutResults.end();
+        return std::find_if( fCutResults.begin(), fCutResults.end(), CheckCutResultName(name) );
+    }
+
+    inline KTCutStatus::CutResultsCIt KTCutStatus::FindCutResultC( const std::string& name ) const
+    {
+        if( name.empty() ) return fCutResults.cend();
+        return std::find_if( fCutResults.cbegin(), fCutResults.cend(), CheckCutResultName(name) );
+    }
+
+    inline KTCutStatus::CutResultsIt KTCutStatus::CutResultsEnd()
+    {
+        return fCutResults.end();
+    }
+
+    inline KTCutStatus::CutResultsCIt KTCutStatus::CutResultsEndC() const
+    {
+        return fCutResults.cend();
+    }
+
+    inline bool KTCutStatus::HasCutResult( const std::string& name ) const
+    {
+        return FindCutResultC(name) != std::end(fCutResults);
+    }
+
+    inline bool KTCutStatus::HasCutResult( unsigned maskPos ) const
+    {
+        return maskPos < fCutResults.size() && fCutResults[maskPos].fAssigned;
+    }
+
+    inline bool KTCutStatus::GetCutState( const std::string& name ) const
+    {
+        CutResultsCIt cutIt = FindCutResultC(name);
+        if (cutIt != fCutResults.cend())
+        {
+            return cutIt->fState;
+        }
+        throw KTException() << "Unable to find cut <" << name << ">";
+    }
+
+    inline bool KTCutStatus::GetCutState( unsigned maskPos ) const
+    {
+        if (maskPos < fCutResults.size())
+        {
+            return fCutResults[maskPos].fState;
+        }
+        throw KTException() << "Mask position <" << maskPos << "> is out of range (only " << size() << " cuts are present)";
+    }
+
+    inline void KTCutStatus::SetCutState(const std::string& name, bool state, bool doUpdateStatus)
+    {
+        CutResultsIt cutIt = FindCutResult(name);
+        if (cutIt != fCutResults.end())
+        {
+            cutIt->fState = state;
+            if (doUpdateStatus) UpdateStatus();
+            return;
+        }
+        throw KTException() << "Unable to find cut <" << name << ">";
+    }
+
+    inline void KTCutStatus::SetCutState(unsigned maskPos, bool state, bool doUpdateStatus)
+    {
+        if (maskPos < fCutResults.size())
+        {
+            fCutResults[maskPos].fState = state;
+            if (doUpdateStatus) UpdateStatus();
+            return;
+        }
+        throw KTException() << "Mask position <" << maskPos << "> is out of range (only "<< size() << " cuts are present)";
+    }
+
+    inline void KTCutStatus::RemoveCutResult(const std::string& name, bool doUpdateStatus)
+    {
+        CutResultsIt cutIt = FindCutResult(name);
+        if (cutIt != fCutResults.end())
+        {
+            cutIt->fName = "";
+            cutIt->fState = false;
+        }
+        if (doUpdateStatus) UpdateStatus();
+        return;
+    }
+
+    inline void KTCutStatus::RemoveCutResult(unsigned maskPos, bool doUpdateStatus)
+    {
+        if (maskPos < fCutResults.size())
+        {
+            fCutResults[maskPos].fName = "";
+            fCutResults[maskPos].fState = false;
+        }
+        if (doUpdateStatus) UpdateStatus();
+        return;
+    }
+
+    inline size_t KTCutStatus::size() const
+    {
+        return fSummary.size();
+    }
+
+    inline bool KTCutStatus::IsCut() const
+    {
+        return fSummary.any();
+    }
+
+    inline bool KTCutStatus::IsCut(const bitset_type& mask) const
+    {
+        return (fSummary & mask).any();
+    }
+
+    inline bool KTCutStatus::IsCut(unsigned long long mask) const
+    {
+        return IsCut(ToBitset(mask));
+    }
+
+    inline bool KTCutStatus::IsCut(const std::string& mask) const
+    {
+        return IsCut(ToBitset(mask));
+    }
+
+    inline KTCutStatus::bitset_type KTCutStatus::ToBitset(unsigned long long mask) const
+    {
+        return bitset_type(fSummary.size(), mask);
+    }
+
+    inline KTCutStatus::bitset_type KTCutStatus::ToBitset(const std::string& mask) const
+    {
+        return bitset_type(mask);
+    }
+
+    template< class Archive >
+    void KTCutStatus::save( Archive& ar ) const
+    {
+        std::cout << "### save for KTCutStatus" << std::endl;
+        ar( CEREAL_NVP(fCutResults) );
+    }
+
+    template< class Archive >
+    void KTCutStatus::load( Archive& ar )
+    {
+        std::cout << "### load for KTCutStatus" << std::endl;
+        ar( CEREAL_NVP(fCutResults) );
+        UpdateStatus();
+    }
+
+} /* namespace Nymph */
+
+#endif /* KTCUTSTATUS_HH_ */
diff --git a/Cpp/Library_v1/Data/KTData.cc b/Cpp/Library_v1/Data/KTData.cc
new file mode 100644
index 0000000..536cb8e
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTData.cc
@@ -0,0 +1,37 @@
+/*
+ * KTData.cc
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTData.hh"
+
+namespace Nymph
+{
+    KTData::KTData()
+    {
+        std::cout << "### KTData constructor" << std::endl;
+    }
+
+    KTData::~KTData()
+    {
+        std::cout << "### KTData destructor" << std::endl;
+    }
+
+    KTDataRider::KTDataRider() :
+            fName()
+    {
+        std::cout << "### KTDataRider for <" << fName << "> constructor" << std::endl;
+    }
+
+    KTDataRider::KTDataRider( const KTDataRider& orig ) :
+            fName( orig.fName )
+    {}
+
+    KTDataRider::~KTDataRider()
+    {
+        std::cout << "### KTDataRider for <" << fName << "> destructor" << std::endl;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTData.hh b/Cpp/Library_v1/Data/KTData.hh
new file mode 100644
index 0000000..90b3b6a
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTData.hh
@@ -0,0 +1,96 @@
+/*
+ * KTData.hh
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTDATA_HH_
+#define KTDATA_HH_
+
+#include "KTExtensible.hh"
+
+#include "KTMemberVariable.hh"
+
+#include "cereal/types/polymorphic.hpp" // required to avoid compile error
+#include "cereal/types/base_class.hpp" // required for base-class specification
+#include "cereal/access.hpp" // required for private member access
+
+#include <string>
+
+namespace Nymph
+{
+
+    class KTData
+    {
+        public:
+            KTData();
+            virtual ~KTData();
+
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTData" << std::endl;
+            }
+    };
+
+    class KTDataRider
+    {
+        public:
+            KTDataRider();
+            KTDataRider( const KTDataRider& orig );
+            virtual ~KTDataRider();
+
+            MEMBERVARIABLE_REF( std::string, Name );
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+    template< class Archive >
+    void KTDataRider::serialize( Archive& ar )
+    {
+            std::cout << "### serialize for KTDataRider" << std::endl;
+            ar( fName );
+    }
+
+    template< class XDerivedType >
+    class KTExtensibleDataRider : public KTExtensible< XDerivedType, KTDataRider >
+    {
+        public:
+            KTExtensibleDataRider() = delete;
+            KTExtensibleDataRider( const std::string& name ) { KTDataRider::fName = name; }
+            KTExtensibleDataRider( const KTExtensibleDataRider< XDerivedType >& orig ) : KTExtensible< XDerivedType, KTDataRider >( *this ) {}
+            virtual ~KTExtensibleDataRider() {}
+
+            template< class Archive >
+            void serialize( Archive& ar )
+            {
+                std::cout << "### serialize for KTExtensibleDataRider< XDerivedType >" << std::endl;
+                ar( cereal::base_class< KTExtensible< XDerivedType, KTDataRider > >( this ) );
+            }
+    };
+
+#define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name, label ) \
+        class ex_data_class_name : public data_class_name, public KTExtensibleDataRider< ex_data_class_name > \
+        { \
+            public: \
+                ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >( label ) {} \
+                ex_data_class_name( const ex_data_class_name& orig ) : data_class_name( *this ), KTExtensibleDataRider< ex_data_class_name >( *this ) {} \
+                virtual ~ex_data_class_name() {} \
+                \
+                template< class Archive > \
+                void serialize( Archive& ar ) \
+                { \
+                    std::cout << "### serialize for ex_data_class_name" << std::endl; \
+                    ar( cereal::base_class< data_class_name >( this ), cereal::base_class< KTExtensibleDataRider< ex_data_class_name > >( this ) ); \
+                } \
+        };
+
+#define DEFINE_EXT_DATA( data_class_name, label ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name, label )
+
+} /* namespace Nymph */
+#endif /* KTDATA_HH_ */
diff --git a/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh b/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
new file mode 100644
index 0000000..cc2c479
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
@@ -0,0 +1,29 @@
+/*
+ * KTRegisterNymphExtData.hh
+ *
+ *  Created on: Feb 17, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTREGISTERNYMPHEXTDATA_HH_
+#define NYMPH_KTREGISTERNYMPHEXTDATA_HH_
+
+/**
+ * @file KTRegisterNymphExtData.hh
+ *
+ * Register the extensible data objects that live in Nymph here.
+ * This file should be included with registration headers packages using Nymph's extensible data setup.
+ *
+ * This header should be included _after_ the relevant archives are registered (after #include'ing the headers, generally)
+ *
+ */
+
+
+#include <cereal/types/polymorphic.hpp>
+
+#include "KTCoreData.hh"
+
+CEREAL_REGISTER_TYPE( Nymph::KTCoreDataExt );
+
+
+#endif /* NYMPH_KTREGISTERNYMPHEXTDATA_HH_ */
diff --git a/Cpp/Library_v1/Data/KTTester.cc b/Cpp/Library_v1/Data/KTTester.cc
new file mode 100644
index 0000000..e0ce295
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTTester.cc
@@ -0,0 +1,24 @@
+/*
+ * KTTester.cc
+ *
+ *  Created on: Aug 26, 2019
+ *      Author: obla999
+ */
+
+#include "KTTester.hh"
+
+namespace Nymph
+{
+
+    KTTester::KTTester()
+    {
+        // TODO Auto-generated constructor stub
+
+    }
+
+    KTTester::~KTTester()
+    {
+        // TODO Auto-generated destructor stub
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Data/KTTester.hh b/Cpp/Library_v1/Data/KTTester.hh
new file mode 100644
index 0000000..f0e3f5b
--- /dev/null
+++ b/Cpp/Library_v1/Data/KTTester.hh
@@ -0,0 +1,41 @@
+/*
+ * KTTester.hh
+ *
+ *  Created on: Aug 26, 2019
+ *      Author: obla999
+ */
+
+#ifndef LIBRARY_DATA_KTTESTER_HH_
+#define LIBRARY_DATA_KTTESTER_HH_
+
+//#include "KTConfigurable.hh"
+
+#include "KTConnection.hh"
+//#include "KTLogger.hh"
+#include "KTSignalWrapper.hh"
+#include "KTSlotWrapper.hh"
+
+//#include "factory.hh"
+
+//#include <boost/signals2.hpp>
+
+//#include <exception>
+//#include <initializer_list>
+//#include <map>
+//#include <sstream>
+//#include <string>
+//#include <memory>
+
+namespace Nymph
+{
+
+    class KTTester
+    {
+        public:
+            KTTester();
+            virtual ~KTTester();
+    };
+
+} /* namespace Nymph */
+
+#endif /* LIBRARY_DATA_KTTESTER_HH_ */
diff --git a/Cpp/Library_v1/IO/KTJSONWriter.cc b/Cpp/Library_v1/IO/KTJSONWriter.cc
new file mode 100644
index 0000000..36add47
--- /dev/null
+++ b/Cpp/Library_v1/IO/KTJSONWriter.cc
@@ -0,0 +1,57 @@
+/*
+ *  KTJSONWriter.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N.S. Oblath
+ *
+*/
+
+#include "KTJSONWriter.hh"
+
+#include "KTLogger.hh"
+
+
+namespace Nymph
+{
+    KT_REGISTER_PROCESSOR( KTJSONWriter, "json-writer" );
+
+    KTJSONWriter::KTJSONWriter( const std::string& name ) :
+        KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >( name ),
+        fFilename( "json_writer_default_file.json" ),
+        fStreamOutPtr( nullptr ),
+        fArchiveOutPtr( nullptr ),
+        fExtDataSlot( "ext-data", this, &KTJSONWriter::WriteExtData ),
+        fCoreDataSlot( "core", this, &KTJSONWriter::WriteData< KTCoreDataExt > )
+        {
+        }
+
+    KTJSONWriter::~KTJSONWriter()
+    {
+        // archive must be delete before the stream!
+        delete fArchiveOutPtr;
+        delete fStreamOutPtr;
+    }
+
+    bool KTJSONWriter::Configure( const scarab::param_node& node )
+    {
+        SetFilename( node.get_value( "filename", fFilename ) );
+
+        return true;
+    }
+
+    void KTJSONWriter::WriteExtData( KTDataHandle handle )
+    {
+        if( fStreamOutPtr == nullptr )
+        {
+            fStreamOutPtr = new std::ofstream( fFilename );
+            fArchiveOutPtr = new cereal::JSONOutputArchive( *fStreamOutPtr );
+        }
+
+        // Write to JSON archive
+        KTDEBUG( avlog_hh, "Writing extensible data to JSON archive" );
+        (*fArchiveOutPtr)( handle );
+
+        return;
+    }
+
+}
diff --git a/Cpp/Library_v1/IO/KTJSONWriter.hh b/Cpp/Library_v1/IO/KTJSONWriter.hh
new file mode 100644
index 0000000..b6ba7a8
--- /dev/null
+++ b/Cpp/Library_v1/IO/KTJSONWriter.hh
@@ -0,0 +1,107 @@
+/*
+ *  KTJSONWriter.hh
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N.S. Oblath
+ *
+*/
+
+#ifndef NYMPH_KTJSONWRITER_HH_
+#define NYMPH_KTJSONWRITER_HH_
+
+// included first so that the archive is registered before the data classes
+#include "cereal/archives/json.hpp"
+// then register the nymph extensible data classes
+#include "KTRegisterNymphExtData.hh"
+
+
+#include "KTWriter.hh"
+#include "KTSlot.hh"
+
+#include "KTLogger.hh"
+
+#include <fstream>
+
+KTLOGGER( avlog_hh, "KTJSONWriter" );
+
+namespace Nymph
+{
+    class KTJSONWriter;
+
+    typedef KTDerivedTypeWriter< KTJSONWriter > KTJSONTypeWriter;
+
+    /*!
+     @class KTJSONWriter
+     @author N. S. Oblath
+
+     @brief Writes data to a JSON file
+
+     @details
+     Can write single data objects or full extensible data objects.
+
+     The Cereal serialization library is used for this writer.
+     Data objects must have a serial or save function to be successfully serialized.
+
+     The slots for this writer can be extended in other compilation units using the type-writer system.
+     As an example, see Executables/Validation/KTJSONTypeWriterValidation and KTRegisterNymphValidationExtData.
+
+     Data objects must be registered after the Cereal JSON archive is included, and before any serialization takes place.
+     As an example when extending the writer, see KTRegisterNymphValidationExtData.
+
+     Configuration name: "json-writer"
+
+     Available configuration options:
+     - "filename": string -- JSON filename to write to
+
+     Signals: N/A
+
+     Slots:
+     - "ext-data": void (KTDataHandle) -- write a full extensible data object
+     - "core" void (KTDataHandle) -- write a KTCoreData object; requires KTCoreData
+
+   */
+    class KTJSONWriter : public KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >
+    {
+        public:
+            KTJSONWriter( const std::string& name = "json-writer" );
+            virtual ~KTJSONWriter();
+
+            bool Configure( const scarab::param_node& node );
+
+            MEMBERVARIABLE( std::string, Filename );
+
+        public:
+            template< class XDataType >
+            void WriteData( const XDataType& data );
+
+            void WriteExtData( KTDataHandle handle );
+
+        private:
+            std::ofstream* fStreamOutPtr;
+            cereal::JSONOutputArchive* fArchiveOutPtr;
+
+        private:
+            KTSlot< KTDataHandle > fExtDataSlot;
+
+            KTSlotData< void, KTCoreDataExt > fCoreDataSlot;
+    };
+
+    template< class XDataType >
+    void KTJSONWriter::WriteData( const XDataType& data )
+    {
+        if( fStreamOutPtr == nullptr )
+        {
+            fStreamOutPtr = new std::ofstream( fFilename );
+            fArchiveOutPtr = new cereal::JSONOutputArchive( *fStreamOutPtr );
+        }
+
+        // Write to JSON archive
+        KTDEBUG( avlog_hh, "Writing data to JSON archive" );
+        (*fArchiveOutPtr)( data );
+
+        return;
+    }
+
+} // namespace Nymph
+
+#endif // NYMPH_KTJSONWRITER_HH_
diff --git a/Cpp/Library_v1/IO/KTReader.cc b/Cpp/Library_v1/IO/KTReader.cc
new file mode 100644
index 0000000..0aa7b2d
--- /dev/null
+++ b/Cpp/Library_v1/IO/KTReader.cc
@@ -0,0 +1,22 @@
+/*
+ * KTReader.cc
+ *
+ *  Created on: Apr 11, 2013
+ *      Author: nsoblath
+ */
+
+#include "KTReader.hh"
+
+namespace Nymph
+{
+
+    KTReader::KTReader(const std::string& name) :
+            KTPrimaryProcessor({}, name)
+    {
+    }
+
+    KTReader::~KTReader()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/IO/KTReader.hh b/Cpp/Library_v1/IO/KTReader.hh
new file mode 100644
index 0000000..86759ab
--- /dev/null
+++ b/Cpp/Library_v1/IO/KTReader.hh
@@ -0,0 +1,29 @@
+/*
+ * KTReader.hh
+ *
+ *  Created on: Apr 11, 2013
+ *      Author: nsoblath
+ */
+
+#ifndef KTREADER_HH_
+#define KTREADER_HH_
+
+#include "KTPrimaryProcessor.hh"
+
+#include "factory.hh"
+
+namespace Nymph
+{
+    class KTReader : public KTPrimaryProcessor
+    {
+        public:
+            KTReader(const std::string& name = "default-reader-name");
+            virtual ~KTReader();
+
+    };
+
+#define KT_REGISTER_READER(reader_class, reader_name) \
+        static ::scarab::registrar< ::Nymph::KTReader, reader_class, const std::string& > s##reader_class##ReaderRegistrar(reader_name);
+
+} /* namespace Nymph */
+#endif /* KTREADER_HH_ */
diff --git a/Cpp/Library_v1/IO/KTWriter.cc b/Cpp/Library_v1/IO/KTWriter.cc
new file mode 100644
index 0000000..3e6f82e
--- /dev/null
+++ b/Cpp/Library_v1/IO/KTWriter.cc
@@ -0,0 +1,34 @@
+/*
+ * KTWriter.cc
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTWriter.hh"
+
+namespace Nymph
+{
+
+    KTWriter::KTWriter(const std::string& name) :
+            KTProcessor(name)
+    {
+    }
+
+    KTWriter::~KTWriter()
+    {
+    }
+
+
+
+    KTTypeWriter::KTTypeWriter()
+    {
+    }
+
+    KTTypeWriter::~KTTypeWriter()
+    {
+    }
+
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/IO/KTWriter.hh b/Cpp/Library_v1/IO/KTWriter.hh
new file mode 100644
index 0000000..278e680
--- /dev/null
+++ b/Cpp/Library_v1/IO/KTWriter.hh
@@ -0,0 +1,140 @@
+/*
+ * KTWriter.hh
+ *
+ *  Created on: Aug 24, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTWRITER_HH_
+#define KTWRITER_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTTIFactory.hh"
+
+#include "factory.hh"
+
+#include <map>
+#include <typeinfo>
+
+namespace Nymph
+{
+    class KTTypeWriter
+    {
+        public:
+            KTTypeWriter();
+            virtual ~KTTypeWriter();
+
+            virtual void RegisterSlots() = 0;
+    };
+
+
+    template< class XWriter >
+    class KTDerivedTypeWriter : public KTTypeWriter
+    {
+        public:
+            KTDerivedTypeWriter(XWriter* writer);
+            virtual ~KTDerivedTypeWriter();
+
+            void SetWriter(XWriter* writer);
+
+        protected:
+            XWriter* fWriter;
+    };
+
+
+    template< class XWriter >
+    KTDerivedTypeWriter< XWriter >::KTDerivedTypeWriter(XWriter* writer) :
+            KTTypeWriter(),
+            fWriter(writer)
+    {
+    }
+
+    template< class XWriter >
+    KTDerivedTypeWriter< XWriter >::~KTDerivedTypeWriter()
+    {
+    }
+
+    template< class XWriter >
+    void KTDerivedTypeWriter< XWriter >::SetWriter(XWriter* writer)
+    {
+        fWriter = writer;
+        return;
+    }
+
+
+
+
+    class KTWriter : public KTProcessor
+    {
+        public:
+            KTWriter(const std::string& name = "default-writer-name");
+            virtual ~KTWriter();
+
+    };
+
+    template< class XWriter, class XTypist >
+    class KTWriterWithTypists : public KTWriter
+    {
+        protected:
+            typedef std::map< const std::type_info*, XTypist* > TypeWriterMap;
+        public:
+            KTWriterWithTypists(const std::string& name = "default-writer-with-typists-name");
+            virtual ~KTWriterWithTypists();
+
+            template< class XTypeWriter >
+            XTypeWriter* GetTypeWriter();
+
+        protected:
+            TypeWriterMap fTypeWriters;
+
+    };
+
+
+    template< class XWriter, class XTypist >
+    KTWriterWithTypists< XWriter, XTypist >::KTWriterWithTypists(const std::string& name) :
+            KTWriter(name),
+            fTypeWriters()
+    {
+        KTTIFactory< XTypist, XWriter* >* twFactory = KTTIFactory< XTypist, XWriter* >::get_instance();
+        for (typename KTTIFactory< XTypist, XWriter* >::FactoryCIt factoryIt = twFactory->GetFactoryMapBegin();
+                factoryIt != twFactory->GetFactoryMapEnd();
+                factoryIt++)
+        {
+            XTypist* newTypeWriter = twFactory->Create(factoryIt, static_cast< XWriter* >(this));
+            //newTypeWriter->SetWriter(static_cast< XWriter* >(this));
+            newTypeWriter->RegisterSlots();
+            fTypeWriters.insert(typename TypeWriterMap::value_type(factoryIt->first, newTypeWriter));
+        }
+    }
+
+    template< class XWriter, class XTypist >
+    KTWriterWithTypists< XWriter, XTypist >::~KTWriterWithTypists()
+    {
+        while (! fTypeWriters.empty())
+        {
+            delete fTypeWriters.begin()->second;
+            fTypeWriters.erase(fTypeWriters.begin());
+        }
+    }
+
+    template< class XWriter, class XTypist >
+    template< class XTypeWriter >
+    XTypeWriter* KTWriterWithTypists< XWriter, XTypist >::GetTypeWriter()
+    {
+        typename TypeWriterMap::const_iterator it = fTypeWriters.find(&typeid(XTypeWriter));
+        if (it == fTypeWriters.end())
+        {
+            return NULL;
+        }
+        return static_cast< XTypeWriter* >(it->second);
+    }
+
+#define KT_REGISTER_TYPE_WRITER(writer_class, type_writer_base_class, typist) \
+        static ::Nymph::KTTIRegistrar< type_writer_base_class, type_writer_base_class##typist, writer_class* > s##type_writer_base_class##typist##Registrar;
+
+#define KT_REGISTER_WRITER(writer_class, writer_name) \
+        static ::scarab::registrar< ::Nymph::KTWriter, writer_class, const std::string& > s##writer_class##WriterRegistrar(writer_name);
+
+} /* namespace Nymph */
+#endif /* KTWRITER_HH_ */
diff --git a/Cpp/Library_v1/NymphPybind.cc b/Cpp/Library_v1/NymphPybind.cc
new file mode 100644
index 0000000..39ceb7c
--- /dev/null
+++ b/Cpp/Library_v1/NymphPybind.cc
@@ -0,0 +1,35 @@
+/*
+ * NymphPybind.cc
+ *
+ *  Created on: Jan 27, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "KTParamPybind.hh"
+
+#include "KTProcessorToolboxPybind.hh"
+#include "KTProcessorPybind.hh"
+
+#include <memory>
+
+//#include "Utility/KTConfigurablePybind.hh"
+
+PYBIND11_MODULE( py_nymph, mod )
+{
+    //Nymph::ExportKTConfigurable( mod );
+	//Nymph::ExportKTProcessor( mod );
+    Nymph::ExportKTProcessorToolbox( mod );
+    Nymph::ExportParamPybind( mod );
+
+    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor> >( mod, "KTProcessor" );
+
+    pybind11::class_< Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor, Nymph::KTProcessor, std::shared_ptr<Nymph::KTWrapProcessor> > wrap_processor(mod, "WrapProcessor", pybind11::dynamic_attr());
+    wrap_processor
+        .def(pybind11::init<>())
+        .def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
+        .def("Configure", &Nymph::KTWrapProcessor::Configure);
+
+}
+
+
+
diff --git a/Cpp/Library_v1/Processor/KTConnection.hh b/Cpp/Library_v1/Processor/KTConnection.hh
new file mode 100644
index 0000000..491a353
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTConnection.hh
@@ -0,0 +1,17 @@
+/*
+ * KTConnection.hh
+ *
+ *  Created on: Aug 8, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTCONNECTION_HH_
+#define KTCONNECTION_HH_
+
+#include <boost/signals2.hpp>
+
+namespace Nymph
+{
+    typedef boost::signals2::connection KTConnection;
+} /* namespace Nymph */
+#endif /* KTCONNECTION_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTNymphSignals.hh b/Cpp/Library_v1/Processor/KTNymphSignals.hh
new file mode 100644
index 0000000..aa52aba
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTNymphSignals.hh
@@ -0,0 +1,46 @@
+/*
+ * KTNymphSignals.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTNYMPHSIGNALS_HH_
+#define NYMPH_KTNYMPHSIGNALS_HH_
+
+#include "KTSignal.hh"
+
+#include "KTCoreData.hh"
+
+namespace Nymph
+{
+    /// Convenience typedef for done signals
+    typedef KTSignal<> KTSignalDone;
+
+    // Convenience typedef for backwards compatibility
+    template< typename XDataType >
+    using KTSignalOneArg = KTSignal< XDataType >;
+
+    /*!
+     @class KTSignalData
+     @author N. S. Oblath
+
+     @brief Creates a signal that takes a KTDataHandle object as its argument.
+
+     @details
+     The purpose of the signal is for passing KTCoreData pointers between Processors.
+     The signal is emitted by calling operator().
+     If a KTDataSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+
+     Usage:
+     In your Processor's header add a member variable of type KTSignalData.
+
+     Initialize the signal with the processor's 'this' pointer and the name of the signal.
+
+     That's it!
+    */
+    typedef KTSignal< KTDataHandle > KTSignalData;
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTNYMPHSIGNALS_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTNymphSlot.hh b/Cpp/Library_v1/Processor/KTNymphSlot.hh
new file mode 100644
index 0000000..a584b3c
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTNymphSlot.hh
@@ -0,0 +1,398 @@
+/*
+ * KTNymphSlot.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTNYMPHSLOT_HH_
+#define NYMPH_KTNYMPHSLOT_HH_
+
+#include "KTSlot.hh"
+
+#include "KTException.hh"
+#include "KTNymphSignals.hh"
+#include "KTProcessor.hh"
+
+namespace Nymph
+{
+    // Typedefs for backwards compatibility
+
+    typedef KTSlot<> KTSlotNoArg;
+
+    template < typename Arg1 >
+    using KTSlotOneArg = KTSlot< Arg1 >;
+
+    template< typename Arg1, typename Arg2 >
+    using KTSlotTwoArg = KTSlot< Arg1, Arg2 >;
+
+
+    template <typename... Types>
+    struct foo {};
+
+    template < typename... Types1, template <typename...> class T
+             , typename... Types2, template <typename...> class V
+             , typename U >
+    void
+    bar(const T<Types1...>&, const V<Types2...>&, const U& u)
+    {
+      std::cout << sizeof...(Types1) << std::endl;
+      std::cout << sizeof...(Types2) << std::endl;
+      std::cout << u << std::endl;
+    }
+
+
+    /*!
+     @class KTSlotData
+     @author N. S. Oblath
+
+     @brief Creates a slot that takes a KTDataHandle object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
+
+     @details
+     Usage:
+     This slot type adds the slot function (signature void (KTDataHandle).
+     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
+     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
+
+     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+    template< class XReturnType, class... XDataArgs >
+    class KTSlotData : public KTSlot< KTDataHandle  >
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
+
+            virtual ~KTSlotData();
+
+            void operator()( KTDataHandle data );
+
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            //function_signature fFunc;
+            std::function< XReturnType (const XDataArgs&..., XReturnType&) > fFunc;
+
+            KTSignalData* fSignalPtr;
+    };
+
+    // partial specialization for no new data type
+    template< class... XDataArgs >
+    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType, class... XFuncDataTypes >
+            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
+
+            virtual ~KTSlotData();
+
+            void operator()( KTDataHandle data );
+
+        protected:
+            template< typename... DataTypes >
+            bool DataPresent( KTDataHandle data );
+
+            //function_signature fFunc;
+            std::function< void (const XDataArgs&...) > fFunc;
+
+            KTSignalData* fSignalPtr;
+    };
+
+
+    /*!
+     @class KTSlotDone
+     @author N. S. Oblath
+
+     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
+
+     @details
+     Usage:
+     This slot type adds the slot function (signature void ()).
+     Your processor (or, optionally, a different object) must have a member function with the signature void ().
+     The slot calls the member function.
+
+     In your Processor's header add a member variable of type KTDoneSlot.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+
+     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
+    */
+    class KTSlotDone : public KTSlot<>
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
+            virtual ~KTSlotDone();
+
+            void operator()();
+
+        protected:
+            std::function< void () > fFunc;
+
+            KTSignalDone* fSignalPtr;
+    };
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    // KTSlotData
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    KTSlotData< XReturnType, XDataTypes... >::~KTSlotData()
+    {
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    void KTSlotData< XReturnType, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    {
+        // Standard data slot pattern:
+
+        std::shared_ptr< KTThreadReference > ref = fThreadRef;
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( dataHandle->Of< XDataTypes >()... , dataHandle->Of< XReturnType >() );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
+            ref->SetReturnException( boost::current_exception() );
+        }
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fDoBreakpoint );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)( dataHandle );
+        }
+        return;
+    }
+
+    template< class XReturnType, class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
+
+
+    // KTSlotData with no return type
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, owner, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class... XDataTypes >
+    template< class XFuncOwnerType, class... XFuncDataTypes >
+    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
+            KTSlot( name, proc, this, &KTSlotData::operator() ),
+            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
+            fSignalPtr( nullptr )
+    {
+    }
+
+    template< class... XDataTypes >
+    KTSlotData< void, XDataTypes... >::~KTSlotData()
+    {
+    }
+
+    template< class... XDataTypes >
+    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
+    {
+        // Standard data slot pattern:
+
+        std::shared_ptr< KTThreadReference > ref = fThreadRef;
+
+        // Check to ensure that the required data type is present
+        if( ! DataPresent< XDataTypes... >( dataHandle ) )
+        {
+            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
+            return;
+        }
+
+        // Call the function
+        try
+        {
+            fFunc( dataHandle->Of< XDataTypes >()... );
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
+            ref->SetReturnException( boost::current_exception() );
+        }
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        ref->Break( dataHandle, fDoBreakpoint );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)( dataHandle );
+        }
+        return;
+    }
+
+    template< class... XDataTypes >
+    template< typename... DataTypes >
+    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
+    {
+        return DataPresentHelper< DataTypes... >::DataPresent( data );
+    }
+
+
+    // KTSlotDone
+
+    template< class XFuncOwnerType >
+    KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
+            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    template< class XFuncOwnerType >
+    KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
+            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
+            fFunc( [func, owner](){ return (owner->*func)(); } ),
+            fSignalPtr( signalPtr )
+    {
+    }
+
+    inline KTSlotDone::~KTSlotDone()
+    {
+    }
+
+    inline void KTSlotDone::operator()()
+    {
+        // Call the function
+        fFunc();
+
+        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
+        // Sets the dataHandle into the return
+        fThreadRef->Break( KTDataHandle(), fDoBreakpoint );
+
+        // If there's a signal pointer, emit the signal
+        if( fSignalPtr != nullptr )
+        {
+            (*fSignalPtr)();
+        }
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTNYMPHSLOT_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc b/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
new file mode 100644
index 0000000..babcccd
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
@@ -0,0 +1,69 @@
+/*
+ * KTPrimaryProcessor.cc
+ *
+ *  Created on: Oct 10, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTPrimaryProcessor.hh"
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+namespace Nymph
+{
+    KTLOGGER( proclog, "KTPrimaryProcessor" );
+
+    KTPrimaryProcessor::KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name ) :
+            KTProcessor( name ),
+            fSignalsEmitted( signals ),
+            fThreadRef(),
+            fDoBreakpoint(false)
+    {
+
+    }
+
+    KTPrimaryProcessor::~KTPrimaryProcessor()
+    {
+    }
+
+    void KTPrimaryProcessor::operator ()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag )
+    {
+        fThreadRef = ref;
+
+        // pass updated thread reference to downstream slots
+        for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
+        {
+            // loop over all processor:slots called by this signal
+            auto sigConnRange = fSigConnMap.equal_range( *sigIt );
+            for( SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt )
+            {
+                // pass the update on to the connected-to processor
+                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, fThreadRef );
+            }
+        }
+
+        startedFlag = true;
+        startedCV.notify_all();
+
+        // go!
+        try
+        {
+            if( ! Run() )
+            {
+                KTERROR( proclog, "An error occurred during processor running." );
+                THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
+            }
+            else
+            {
+                fThreadRef->SetReturnValue( KTDataHandle() );
+            }
+        }
+        catch( boost::exception& e )
+        {
+            fThreadRef->SetReturnException( boost::current_exception() );
+        }
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh b/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
new file mode 100644
index 0000000..218eb0f
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
@@ -0,0 +1,53 @@
+/*
+ * KTPrimaryProcessor.hh
+ *
+ *  Created on: Oct 10, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTPRIMARYPROCESSOR_HH_
+#define KTPRIMARYPROCESSOR_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTCoreData.hh"
+#include "KTThreadReference.hh"
+
+#include <boost/thread/condition_variable.hpp>
+
+#include <atomic>
+
+namespace Nymph
+{
+
+    class KTPrimaryProcessor : public KTProcessor
+    {
+        public:
+            KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
+            virtual ~KTPrimaryProcessor();
+
+        public:
+            /// Callable function used by std::thread
+            void operator()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag );
+
+            /// Starts the  main action of the processor
+            virtual bool Run() = 0;
+
+            std::shared_ptr< KTThreadReference > GetThreadRef();
+
+            MEMBERVARIABLE( bool, DoBreakpoint );
+
+        protected:
+            std::vector< std::string > fSignalsEmitted;
+
+            std::shared_ptr< KTThreadReference > fThreadRef;
+
+    };
+
+    inline std::shared_ptr< KTThreadReference > KTPrimaryProcessor::GetThreadRef()
+    {
+        return fThreadRef;
+    }
+
+} /* namespace Nymph */
+#endif /* KTPRIMARYPROCESSOR_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTProcessor.cc b/Cpp/Library_v1/Processor/KTProcessor.cc
new file mode 100644
index 0000000..c28cfa9
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTProcessor.cc
@@ -0,0 +1,150 @@
+/*
+ * KTProcessor.cc
+ *
+ *  Created on: Jan 5, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTProcessor.hh"
+
+#include "KTException.hh"
+//#include "KTLogger.hh"
+
+#include <string>
+
+using std::string;
+
+namespace Nymph
+{
+    //KTLOGGER(proclog, "KTProcessor");
+
+    KTProcessor::KTProcessor(const string& name) :
+            KTConfigurable(name),
+            fSignalMap(),
+            fSlotMap(),
+            fSlotToSigMap(),
+            fSigConnMap()
+    {
+    }
+
+    KTProcessor::~KTProcessor()
+    {
+        for (SlotMapIt iter = fSlotMap.begin(); iter != fSlotMap.end(); iter++)
+        {
+            delete iter->second;
+        }
+        for (SigMapIt iter = fSignalMap.begin(); iter != fSignalMap.end(); iter++)
+        {
+            delete iter->second;
+        }
+    }
+
+    void KTProcessor::PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef)
+    {
+        std::function< void(std::shared_ptr< KTThreadReference >) > funcObj = [this, &slotName](std::shared_ptr< KTThreadReference > ref){ GetSlot(slotName)->ThreadRef() = ref; };
+        PassToConnProcs(slotName, funcObj, threadRef);
+        return;
+    }
+
+    void KTProcessor::ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum)
+    {
+        // get the signal and slot wrapper pointers
+        KTSignalBase* signal = GetSignal(signalName);
+        KTSlotBase* slot = processor->GetSlot(slotName);
+
+        try
+        {
+            // make the connection
+            ConnectSignalToSlot(signal, slot, groupNum);
+        }
+        catch( KTSignalException& e )
+        {
+            e << KTErrorMsgInfo< struct proc_Sig_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
+            e << KTErrorMsgInfo< struct proc_Sig_1 >( "You may have the signal name wrong." );
+            throw;
+        }
+        catch( KTSlotException& e )
+        {
+            e << KTErrorMsgInfo< struct proc_Slot_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
+            e << KTErrorMsgInfo< struct proc_Slot_1 >( "You may have the slot name wrong." );
+            throw;
+        }
+        catch( KTConnectionException& e )
+        {
+            e << KTErrorMsgInfo< struct proc_Conn_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
+            e << KTErrorMsgInfo< struct proc_Conn_1 >( "Check that the signatures of the signal and slot match exactly." );
+            throw;
+        }
+        catch( boost::exception& e )
+        {
+            e << KTErrorMsgInfo< struct proc_Unkn >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
+            throw;
+        }
+
+        // record the connection in the signal-connection map
+        fSigConnMap.insert(SigConnMapVal(signalName, std::make_pair(processor, slotName)));
+
+        KTDEBUG(processorlog, "Connected signal <" << this->GetConfigName() << ":" << signalName << "> to slot <" << processor->GetConfigName() << ":" << slotName << ">");
+
+        return;
+    }
+
+    void KTProcessor::ConnectSignalToSlot(KTSignalBase* signal, KTSlotBase* slot, int groupNum)
+    {
+        if (signal == nullptr)
+        {
+            BOOST_THROW_EXCEPTION( KTSignalException() << "Signal pointer was NULL" << eom );
+        }
+        if (slot == nullptr)
+        {
+            BOOST_THROW_EXCEPTION( KTSlotException() << "Slot pointer was NULL" << eom );
+        }
+
+        signal->Connect(slot, groupNum);
+
+        return;
+    }
+
+    KTSignalBase* KTProcessor::GetSignal(const std::string& name)
+    {
+        SigMapIt iter = fSignalMap.find(name);
+        if (iter == fSignalMap.end())
+        {
+            return NULL;
+        }
+        return iter->second;
+    }
+
+    KTSlotBase* KTProcessor::GetSlot(const std::string& name)
+    {
+        SlotMapIt iter = fSlotMap.find(name);
+        if (iter == fSlotMap.end())
+        {
+            return NULL;
+        }
+        return iter->second;
+    }
+
+    bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
+    {
+        KTSlotBase* slot = GetSlot(slotName);
+        if (slot != nullptr)
+        {
+            return slot->GetDoBreakpoint();
+        }
+        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        return false;
+    }
+
+    void KTProcessor::SetDoBreakpoint(const std::string& slotName, bool flag)
+    {
+        KTSlotBase* slot = GetSlot(slotName);
+        if (slot != nullptr)
+        {
+            return slot->SetDoBreakpoint(flag);
+        }
+        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Processor/KTProcessor.hh b/Cpp/Library_v1/Processor/KTProcessor.hh
new file mode 100644
index 0000000..2575131
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTProcessor.hh
@@ -0,0 +1,161 @@
+/**
+ @file KTProcessor.hh
+ @brief Contains KTProcessor
+ @details KTProcessor is the processor base class
+ @author: N. S. Oblath
+ @date: Jan 5, 2012
+ */
+
+#ifndef KTPROCESSOR_HH_
+#define KTPROCESSOR_HH_
+
+#include "KTConfigurable.hh"
+
+#include "KTLogger.hh"
+#include "KTNymphSlot.hh"
+
+#include "factory.hh"
+
+#include <exception>
+#include <initializer_list>
+#include <map>
+#include <sstream>
+#include <memory>
+
+namespace Nymph
+{
+    KTLOGGER(processorlog, "KTProcessor.hh");
+
+    struct KTProcessorException : virtual public KTException
+    {};
+
+    struct KTSignalException : virtual public KTException {};
+    struct KTSlotException : virtual public KTException {};
+
+    class KTThreadReference;
+
+    class KTProcessor : public KTConfigurable
+    {
+        protected:
+            typedef std::map< std::string, KTSignalBase* > SignalMap;
+            typedef SignalMap::iterator SigMapIt;
+            typedef SignalMap::value_type SigMapVal;
+
+            typedef std::map< std::string, KTSlotBase* > SlotMap;
+            typedef SlotMap::iterator SlotMapIt;
+            typedef SlotMap::value_type SlotMapVal;
+
+            typedef std::multimap< std::string, std::string > SlotToSigMap;
+            typedef SlotToSigMap::iterator SlotToSigMapIt;
+            typedef SlotToSigMap::const_iterator SlotToSigMapCIt;
+            typedef SlotToSigMap::value_type SlotToSigMapVal;
+
+            typedef std::multimap< std::string, std::pair< KTProcessor*, std::string > > SigConnMap;
+            typedef SigConnMap::iterator SigConnMapIt;
+            typedef SigConnMap::const_iterator SigConnMapCIt;
+            typedef SigConnMap::value_type SigConnMapVal;
+
+        public:
+            KTProcessor(const std::string& name="default-proc-name");
+            virtual ~KTProcessor();
+
+            template< class XDerivedProc >
+            static scarab::registrar< Nymph::KTProcessor, XDerivedProc, const std::string& >* RegisterProcessor( const std::string& name );
+
+        public:
+            /// For a slot that is called, update the slot's ThreadRef, and pass the update to any slots that get called by signals emitted by this slot
+            void PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef);
+
+            static void ConnectSignalToSlot(KTSignalBase* signal, KTSlotBase* slot, int groupNum=-1);
+
+            void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
+            void ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum=-1);
+
+            void RegisterSignal(std::string name, KTSignalBase* signal);
+
+            void RegisterSlot(std::string name, KTSlotBase* slot, std::initializer_list< std::string > signals = {});
+
+            KTSignalBase* GetSignal(const std::string& name);
+
+            KTSlotBase* GetSlot(const std::string& name);
+
+            bool GetDoBreakpoint(const std::string& slotName);
+            void SetDoBreakpoint(const std::string& slotName, bool flag);
+
+        protected:
+            template< typename XReturn, typename... XArgs >
+            void PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args);
+
+            SignalMap fSignalMap;
+
+            SlotMap fSlotMap;
+
+            // maps which slots call which signals in this processor
+            SlotToSigMap fSlotToSigMap;
+
+            // maps which signals get connected to which slots in other processors
+            SigConnMap fSigConnMap;
+    };
+
+
+    void KTProcessor::RegisterSignal(std::string name, KTSignalBase* signal)
+    {
+        KTDEBUG(processorlog, "Registering signal <" << name << "> in processor <" << fConfigName << ">");
+        fSignalMap.insert(SigMapVal(name, signal));
+        return;
+    }
+
+    void KTProcessor::RegisterSlot(std::string name, KTSlotBase* slot, std::initializer_list< std::string > signals)
+    {
+        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
+
+        fSlotMap.insert(SlotMapVal(name, slot));
+
+        for (auto sigIt = signals.begin(); sigIt != signals.end(); ++sigIt)
+        {
+            fSlotToSigMap.insert(SlotToSigMapVal(name, *sigIt));
+            KTDEBUG(processorlog, "Slot-to-signal connection <" << name << "> --> <" << *sigIt << ">");
+        }
+        return;
+    }
+
+    inline void KTProcessor::ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum)
+    {
+        processor->ConnectASlot(signalName, this, slotName, groupNum);
+        return;
+    }
+
+    template< typename XReturn, typename... XArgs >
+    void KTProcessor::PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args)
+    {
+        // update this slot
+        function(args...);
+
+        // get the list of slot-to-signal connections for this slot
+        auto stsRange = fSlotToSigMap.equal_range(slotName);
+
+        // loop over signals called in the performance of slot slotName
+        for (SlotToSigMapCIt stsIt = stsRange.first; stsIt != stsRange.second; ++stsIt)
+        {
+            // loop over all processor:slots called by this signal
+            auto sigConnRange = fSigConnMap.equal_range(stsIt->second);
+            for (SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt)
+            {
+                // pass the update on to the connected-to processor
+                sigConnIt->second.first->PassToConnProcs(sigConnIt->second.second, function, args...);
+            }
+        }
+        return;
+    }
+
+    template< class XDerivedProc >
+    scarab::registrar< KTProcessor, XDerivedProc, const std::string& >* KTProcessor::RegisterProcessor( const std::string& name )
+    {
+        return new scarab::registrar< KTProcessor, XDerivedProc, const std::string& >( name );
+    }
+
+#define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::KTProcessor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+} /* namespace Nymph */
+#endif /* KTPROCESSOR_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTProcessorPybind.cc b/Cpp/Library_v1/Processor/KTProcessorPybind.cc
new file mode 100644
index 0000000..04cc151
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTProcessorPybind.cc
@@ -0,0 +1,48 @@
+/*
+ * KTProcessorPybind.cc
+ *
+ *  Created on: Feb 06, 2018
+ *      Author: cclaessens
+ */
+
+#include "KTProcessor.hh"
+#include "KTProcessorPybind.hh"
+
+
+#include "KTLogger.hh"
+
+namespace Nymph
+{
+
+	KTLOGGER(procpylog, "KTProcessorPybind");
+	KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
+
+    KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
+            KTProcessor( name ),
+            fSlot("wrap-slot", this, &KTWrapProcessor::SlotFunc)
+
+    {
+    }
+
+    KTWrapProcessor::~KTWrapProcessor()
+    {
+    }
+
+    bool KTWrapProcessor::Configure(const scarab::param_node&)
+    {
+        return true;
+    }
+
+    void KTWrapProcessor::SlotFunc(int input)
+    {
+        KTINFO(procpylog, "Calling wrap function ");
+        this->WrapFunction(input);
+        return;
+    }
+
+    void KTWrapProcessor::WrapFunction(int input)
+    {
+        KTINFO(procpylog, "Hey, I'm base class");
+        return;
+    }
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Processor/KTProcessorPybind.hh b/Cpp/Library_v1/Processor/KTProcessorPybind.hh
new file mode 100644
index 0000000..41bed4c
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTProcessorPybind.hh
@@ -0,0 +1,89 @@
+/*
+ * KTProcessorPybind.hh
+ *
+ *  Created on: Jan 24, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTPROCESSORPYBIND_HH_
+#define NYMPH_KTPROCESSORPYBIND_HH_
+
+#include "KTPyProcessor.hh"
+#include "KTProcessor.hh"
+#include "KTSlot.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+/*    void ExportKTProcessor( pybind11::module& mod )
+    {
+        pybind11::class_< KTProcessor, KTConfigurable >( mod, "KTProcessor" )
+                .def( pybind11::init< const std::string & >() )
+
+                .def( "ConnectASlot", &Nymph::KTProcessor::ConnectASlot )
+                .def( "ConnectASignal", &Nymph::KTProcessor::ConnectASignal )
+
+                .def( "GetDoBreakpoint", &Nymph::KTProcessor::GetDoBreakpoint )
+                .def( "SetDoBreakpoint", &Nymph::KTProcessor::SetDoBreakpoint )
+                ;
+
+        pybind11::class_< KTPyProcessor >( mod, "KTPyProcessor" )
+                .def( pybind11::init< const std::string & >() )
+                ;
+
+
+
+    }*/
+
+    // processor with wrapfunction
+    class KTWrapProcessor : public KTProcessor
+    {
+        public:
+            KTWrapProcessor( const std::string& name = "base-wrap-proc" );
+            virtual ~KTWrapProcessor();
+
+            bool Configure(const scarab::param_node& node);
+
+            void SlotFunc(int);
+            virtual void WrapFunction(int input);
+
+        private:
+            KTSlot< int > fSlot;
+
+    };
+
+	// helper class
+	class KTPyWrapProcessor: public KTWrapProcessor
+	{
+		public:
+			// Inherit the constructors
+			using KTWrapProcessor::KTWrapProcessor;
+
+			// Trampoline (need one for each virtual function)
+			void WrapFunction(int input) override {
+				// I dont know what these two lines do,
+				// but at least the first one is necessary or nymph hangs when calling this as python method
+				pybind11::gil_scoped_release release;
+				pybind11::gil_scoped_acquire acquire;
+				PYBIND11_OVERLOAD_PURE(
+						void, // Return type
+						KTWrapProcessor,      // Parent class
+						WrapFunction,          // Name of function in C++ (must match Python name)
+						input      // Argument(s)
+				);
+			}
+			bool Configure(const scarab::param_node& node) override {
+				PYBIND11_OVERLOAD(
+						bool, // Return type
+						KTWrapProcessor,      // Parent class
+						Configure,          // Name of function in C++ (must match Python name)
+						node      // Argument(s)
+				);
+			}
+	};
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTPROCESSORPYBIND_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTPyProcessor.hh b/Cpp/Library_v1/Processor/KTPyProcessor.hh
new file mode 100644
index 0000000..52f27b1
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTPyProcessor.hh
@@ -0,0 +1,32 @@
+/*
+ * KTPyProcessor.hh
+ *
+ *  Created on: Jan 29, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTPYPROCESSOR_HH_
+#define NYMPH_KTPYPROCESSOR_HH_
+
+#include "KTProcessor.hh"
+
+namespace Nymph
+{
+
+    class KTPyProcessor : public KTProcessor
+    {
+        public:
+            using KTProcessor::KTProcessor; // inherit constructors
+
+            // for now, override KTConfigurable::Configure(const scarab::param_node&) with a non-functional function
+            bool Configure(const scarab::param_node& )
+            {
+                return true;
+            }
+    };
+
+
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTPYPROCESSOR_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTSignal.hh b/Cpp/Library_v1/Processor/KTSignal.hh
new file mode 100644
index 0000000..c3a8f8b
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSignal.hh
@@ -0,0 +1,250 @@
+/*
+ * KTSignal.hh
+ *
+ *  Created on: Jan 15, 2013
+ *      Author: nsoblath
+ */
+
+#ifndef KTSIGNAL_HH_
+#define KTSIGNAL_HH_
+
+#include "KTSignalSlotBase.hh"
+
+#include "KTConnection.hh"
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+#include <map>
+
+namespace Nymph
+{
+    KTLOGGER( signallog, "KTSignal" );
+
+    struct KTConnectionException : public KTException
+    {};
+
+    /// A m_signal object may call multiple slots with the
+    /// same signature. You can connect functions to the m_signal
+    /// which will be called when the emit() method on the
+    /// m_signal object is invoked. Any argument passed to emit()
+    /// will be passed to the given functions.
+    /// The name "m_signal" was chosen to avoid conflicting with std::signal.
+    template< typename... XArgs >
+    class KTSignal : public KTSignalBase
+    {
+        public:
+            using signature = void( XArgs... );
+            using boost_signal = boost::signals2::signal< signature >;
+
+        public:
+            template< typename XOwner >
+            KTSignal( const std::string& name, XOwner* owner );
+            KTSignal( const KTSignal& ) = delete;
+            KTSignal( KTSignal&& ) = delete;
+            virtual ~KTSignal();
+
+            virtual void Connect( KTSlotBase* slot, int group );
+
+            // disconnects a previously connected function
+            void Disconnect( KTSlotBase* slot ) const;
+
+            // disconnects all previously connected functions
+            void DisconnectAll() const;
+
+            // calls all connected functions
+            void Emit( XArgs... args );
+            void operator()( XArgs... args );
+
+        private:
+            typedef std::map< KTSlotBase*, KTConnection > slot_map; // to get around the problem of having a comma inside a macro function argument
+            MEMBERVARIABLE_REF_MUTABLE_CONST( slot_map, Slots );
+
+            boost_signal fInternalSignal;
+    };
+
+
+    /*!
+     @class KTSignal
+     @author N. S. Oblath
+
+     @brief Creates a signal that takes 0 or more arguments.
+
+     @details
+     The signal is emitted by calling operator().
+     If a KTSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
+
+     Usage:
+     In your Processor's header add a member variable of type KTSignal< ArgumentTypes >.
+
+     Initialize the signal with the processor's 'this' pointer and the name of the signal.
+
+     To use the signal, call it as: fSignalObject(arg);
+    *//*
+    template< class... XSignalArguments >
+    class KTSignal
+    {
+        public:
+            typedef void (signature)( XSignalArguments... );
+            typedef boost::signals2::signal< signature > boost_signal;
+            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
+
+        public:
+            KTSignal();
+            KTSignal( const std::string& name, KTProcessor* proc );
+            virtual ~KTSignal();
+
+        protected:
+            KTSignal( const KTSignal& );
+
+        public:
+            void operator()( XSignalArguments... args );
+
+            boost_signal* Signal();
+
+            const std::string& GetName() const;
+
+        protected:
+            boost_signal fSignal;
+
+            std::string fName;
+    };
+*/
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSignal< XArgs... >::KTSignal< XOwner >( const std::string& name, XOwner* owner ) :
+            fSlots(),
+            fInternalSignal()
+    {
+        owner->RegisterSignal( name, this );
+    }
+
+    template< typename... XArgs >
+    KTSignal< XArgs... >::~KTSignal()
+    {
+        DisconnectAll();
+    }
+
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::Connect( KTSlotBase* slot, int group )
+    {
+        if( fSlots.count( slot ) != 0 )
+        {
+            KTWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
+            return;
+        }
+
+        // ensure that the slot is of the correct type
+        KTSlot< XArgs... >* derivedSlot = dynamic_cast< KTSlot< XArgs... >* >( slot );
+        if( slot == nullptr )
+        {
+            BOOST_THROW_EXCEPTION( KTConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
+                    "\tUnable to cast from KTSlotBase to this signal's derived type." << eom );
+        }
+
+        KTConnection connection;
+        if( group >= 0 )
+        {
+            connection = fInternalSignal.connect( group, derivedSlot->Function() );
+        }
+        else
+        {
+            connection = fInternalSignal.connect( derivedSlot->Function() );
+        }
+
+        fSlots.insert( std::make_pair< KTSlotBase*, KTConnection >( slot, connection ) );
+        slot->AddConnection( this );
+
+        return;
+    }
+
+    // disconnects a previously connected function
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::Disconnect( KTSlotBase* slot ) const
+    {
+        auto connectionIt = fSlots.find( slot );
+        if( connectionIt != fSlots.end() )
+        {
+            connectionIt->second.disconnect();
+            connectionIt->first->RemoveConnection( this );
+        }
+        return;
+    }
+
+    // disconnects all previously connected functions
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::DisconnectAll() const
+    {
+        for( auto connection : fSlots )
+        {
+            connection.second.disconnect();
+            connection.first->RemoveConnection( this );
+        }
+        return;
+    }
+
+    // calls all connected functions
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::Emit( XArgs... args )
+    {
+        (*this)( args );
+        return;
+    }
+
+    template< typename... XArgs >
+    void KTSignal< XArgs... >::operator()( XArgs... args )
+    {
+        fSignal( args );
+    }
+
+/*
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::KTSignal( const std::string& name, KTProcessor* proc ) :
+            fSignal(),
+            fName( name )
+    {
+        proc->RegisterSignal(name, &fSignal);
+    }
+
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::KTSignal() :
+            fSignal(),
+            fName("none")
+    {}
+
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::KTSignal( const KTSignal& signal ) :
+            fSignal(),
+            fName( signal.fName )
+    {}
+
+    template< class... XSignalArguments >
+    KTSignal< XSignalArguments... >::~KTSignal()
+    {
+    }
+
+    template< class... XSignalArguments >
+    inline void KTSignal< XSignalArguments... >::operator()( XSignalArguments... args )
+    {
+        fSignal( args... );
+    }
+
+    template< class... XSignalArguments >
+    inline typename KTSignal< XSignalArguments... >::boost_signal* KTSignal< XSignalArguments... >::Signal()
+    {
+        return &fSignal;
+    }
+
+    template< class... XSignalArguments >
+    inline const std::string& KTSignal< XSignalArguments... >::GetName() const
+    {
+        return fName;
+    }
+*/
+} /* namespace Nymph */
+#endif /* KTSIGNAL_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTSignalSlotBase.hh b/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
new file mode 100644
index 0000000..35a7db1
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
@@ -0,0 +1,52 @@
+/*
+ * KTSignalSlotBase.hh
+ *
+ *  Created on: Feb 25, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTSIGNALSLOTBASE_HH_
+#define NYMPH_KTSIGNALSLOTBASE_HH_
+
+#include "KTMemberVariable.hh"
+
+#include <string>
+
+namespace Nymph
+{
+    class KTSignalBase;
+
+    class KTSlotBase
+    {
+        public:
+            KTSlotBase( const std::string& name );
+            template< typename XOwner >
+            KTSlotBase( const std::string& name, XOwner* owner );
+            virtual ~KTSlotBase();
+
+            virtual void AddConnection( KTSignalBase* ) const = 0;
+
+            virtual void RemoveConnection( KTSignalBase* ) const = 0;
+
+            MEMBERVARIABLE_REF( std::string, Name );
+    };
+
+
+    class KTSignalBase
+    {
+        public:
+            KTSignalBase( const std::string& name );
+            template< typename x_owner >
+            KTSignalBase( const std::string& name, x_owner* owner );
+            virtual ~KTSignalBase();
+
+            virtual void Connect( KTSlotBase* slot, int group ) = 0;
+
+            virtual void Disconnect( KTSlotBase* slot ) const = 0;
+
+            MEMBERVARIABLE_REF( std::string, Name );
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTSIGNALSLOTBASE_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTSignalWrapper.cc b/Cpp/Library_v1/Processor/KTSignalWrapper.cc
new file mode 100644
index 0000000..795fc2c
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSignalWrapper.cc
@@ -0,0 +1,23 @@
+/*
+ * KTSignalWrapper.cc
+ *
+ *  Created on: Aug 8, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTSignalWrapper.hh"
+
+namespace Nymph
+{
+
+    KTSignalWrapper::KTSignalWrapper() :
+            fSignalWrapper(NULL)
+    {
+    }
+
+    KTSignalWrapper::~KTSignalWrapper()
+    {
+        delete fSignalWrapper;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Processor/KTSignalWrapper.hh b/Cpp/Library_v1/Processor/KTSignalWrapper.hh
new file mode 100644
index 0000000..aa4f658
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSignalWrapper.hh
@@ -0,0 +1,82 @@
+/*
+ * KTSignalWrapper.hh
+ *
+ *  Created on: Aug 8, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTSIGNALWRAPPER_HH_
+#define KTSIGNALWRAPPER_HH_
+
+#include <boost/signals2.hpp>
+#include <boost/utility.hpp>
+
+#include <iostream>
+
+namespace Nymph
+{
+    template< typename Signature >
+    struct KTSignalConcept
+    {
+        typedef Signature signature;
+        typedef boost::signals2::signal< Signature > signal;
+        typedef typename boost::signals2::signal< Signature >::slot_type slot_type;
+    };
+
+    class KTSignalWrapper : public boost::noncopyable
+    {
+        public:
+            friend class KTSlotWrapper;
+
+        private:
+            class KTInternalSignalWrapper
+            {
+                public:
+                    KTInternalSignalWrapper() {}
+                    virtual ~KTInternalSignalWrapper() {}
+            };
+
+            template< typename XSignature >
+            class KTSpecifiedInternalSignalWrapper : public KTInternalSignalWrapper, public boost::noncopyable
+            {
+                public:
+                    KTSpecifiedInternalSignalWrapper(XSignature* signalPtr) : fSignal(signalPtr)
+                    {}
+                    virtual ~KTSpecifiedInternalSignalWrapper() {}
+
+                    XSignature* GetSignal() const
+                    {
+                        return fSignal;
+                    }
+                private:
+                    XSignature* fSignal; //not owned by this KTSpecifiedInternalSignalWrapper
+            };
+
+        public:
+            template< typename XSignature >
+            KTSignalWrapper(XSignature* signalPtr);
+            ~KTSignalWrapper();
+
+        private:
+            KTSignalWrapper();
+
+            KTInternalSignalWrapper* GetInternal() const;
+
+            KTInternalSignalWrapper* fSignalWrapper;
+
+    };
+
+    template< typename XSignature >
+    KTSignalWrapper::KTSignalWrapper(XSignature* signalPtr) :
+            fSignalWrapper(NULL)
+    {
+        fSignalWrapper = new KTSpecifiedInternalSignalWrapper< XSignature >(signalPtr);
+    }
+
+    inline KTSignalWrapper::KTInternalSignalWrapper* KTSignalWrapper::GetInternal() const
+    {
+        return fSignalWrapper;
+    }
+
+} /* namespace Nymph */
+#endif /* KTSIGNALWRAPPER_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTSlot.hh b/Cpp/Library_v1/Processor/KTSlot.hh
new file mode 100644
index 0000000..0729eb0
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSlot.hh
@@ -0,0 +1,236 @@
+/*
+ * KTSlot.hh
+ *
+ *  Created on: Jan 13, 2013
+ *      Author: nsoblath
+ */
+
+#ifndef KTSLOT_HH_
+#define KTSLOT_HH_
+
+#include "KTSignalSlotBase.hh"
+
+//#include "KTException.hh"
+#include "KTLogger.hh"
+#include "KTThreadReference.hh"
+
+#include <initializer_list>
+#include <set>
+
+namespace Nymph
+{
+    KTLOGGER(slotlog, "KTSlot");
+
+
+    // Type XOwner is the class that owns the KTSlot object
+    template< typename... XArgs >
+    class KTSlot : public KTSlotBase
+    {
+        public:
+            using signature = void( XArgs... );
+            using signal_list = std::initializer_list< std::string >;
+
+        public:
+            template< typename XOwner >
+            KTSlot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
+            template< typename XOwner >
+            KTSlot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
+            template< typename XOwner >
+            KTSlot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
+            template< typename XOwner, typename XFuncClass >
+            KTSlot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
+            template< typename XOwner, typename XFuncClass >
+            KTSlot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
+            KTSlot( const KTSlot& ) = delete;
+            KTSlot( KTSlot&& ) = delete;
+            virtual ~KTSlot();
+
+            void DisconnectAll() const;
+
+            void AddConnection( KTSignalBase* ) const;
+
+            void RemoveConnection( KTSignalBase* ) const;
+
+            MEMBERVARIABLE_REF( boost::function< signature >, Function );
+
+            typedef std::set< KTSignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
+            MEMBERVARIABLE_REF_MUTABLE( signal_connections, Connections );
+
+            // TODO: move fDoBreakpoint to KTSlot
+            // TODO: KTThreadReference should be a templated object, KTThreadReference< XArgs... >
+            // TODO: KTThreadReference< XArgs... > inherits from KTThreadReferenceBase
+            MEMBERVARIABLE( bool, DoBreakpoint );
+            MEMBERVARIABLE_SHARED_PTR_CONST( KTThreadReference, ThreadRef );
+
+    };
+
+
+    /*!
+     @class KTSlot
+     @author N. S. Oblath
+
+     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
+
+     @details
+     Usage:
+     To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
+     The function should have the signature void (Args).
+
+     In your Processor's header add a member variable of type KTSlot< ProcessorType, ReturnType, Args >.
+     The variable may be private.
+
+     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
+     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
+    *//*
+    template< typename... Args >
+    class KTSlot
+    {
+        public:
+            /// Constructor for the case where the processor has the function that will be called by the slot
+            template< class XFuncOwnerType >
+            KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
+
+            /// Constructor for the case where the processor and the object with the function that will be called are different
+            template< class XFuncOwnerType >
+            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
+
+            virtual ~KTSlot();
+
+            const std::string& GetName() const;
+
+            KTSlotWrapper* GetSlotWrapper();
+
+        protected:
+            std::string fName;
+            KTSlotWrapper* fSlotWrapper;
+    };
+*/
+
+
+    //*******************
+    // Implementations
+    //*******************
+
+    // KTSlot
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner >
+    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
+            fFunction( func ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    template< typename XOwner, typename XFuncClass >
+    KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
+            fConnections(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+        owner->RegisterSlot( name, this, signals );
+    }
+
+    template< typename... XArgs >
+    KTSlot< XArgs... >::~KTSlot()
+    {
+        DisconnectAll();
+    }
+
+    template< typename... XArgs >
+    void KTSlot< XArgs... >::DisconnectAll() const
+    {
+        for( auto connection : fConnections )
+        {
+            connection->Disconnect( this );
+        }
+        return;
+    }
+
+    template< typename... XArgs >
+    void KTSlot< XArgs... >::AddConnection( KTSignalBase* signal ) const
+    {
+        fConnections.insert( signal );
+        return;
+    }
+
+    template< typename... XArgs >
+    void KTSlot< XArgs... >::RemoveConnection( KTSignalBase* signal ) const
+    {
+        fConnections.erase( signal );
+        return;
+    }
+
+/*
+    template< typename... Args >
+    template< class XFuncOwnerType >
+    KTSlot< Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
+            fName( name )
+    {
+        fSlotWrapper = owner->RegisterSlot( name, owner, func, signals );
+    }
+
+    template< typename... Args >
+    template< class XFuncOwnerType >
+    KTSlot< Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
+            fName( name )
+    {
+        fSlotWrapper = proc->RegisterSlot( name, owner, func, signals );
+    }
+
+    template< typename... Args >
+    KTSlot< Args... >::~KTSlot()
+    {
+    }
+
+    template< typename... Args >
+    inline const std::string& KTSlot< Args... >::GetName() const
+    {
+        return fName;
+    }
+
+    template< typename... Args >
+    inline KTSlotWrapper* KTSlot< Args... >::GetSlotWrapper()
+    {
+        return fSlotWrapper;
+    }
+*/
+} /* namespace Nymph */
+#endif /* KTSLOT_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTSlotWrapper.cc b/Cpp/Library_v1/Processor/KTSlotWrapper.cc
new file mode 100644
index 0000000..66e12f1
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSlotWrapper.cc
@@ -0,0 +1,27 @@
+/*
+ * KTSlotWrapper.cc
+ *
+ *  Created on: Feb 10, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTSlotWrapper.hh"
+
+namespace Nymph
+{
+
+    KTSlotWrapper::KTSlotWrapper() :
+            fSlotWrapper(NULL),
+            fConnection(),
+            fThreadRef(),
+            fDoBreakpoint(false)
+    {
+    }
+
+    KTSlotWrapper::~KTSlotWrapper()
+    {
+        this->Disconnect();
+        delete fSlotWrapper;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Processor/KTSlotWrapper.hh b/Cpp/Library_v1/Processor/KTSlotWrapper.hh
new file mode 100644
index 0000000..70d3f3f
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTSlotWrapper.hh
@@ -0,0 +1,152 @@
+/*
+ * KTSlotWrapper.hh
+ *
+ *  Created on: Feb 10, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTSLOTWRAPPER_HH_
+#define KTSLOTWRAPPER_HH_
+
+#include "KTConnection.hh"
+#include "KTException.hh"
+#include "KTSignalWrapper.hh"
+#include "KTThreadReference.hh"
+
+#include <boost/signals2.hpp>
+
+namespace Nymph
+{
+    struct KTConnectionException : public KTException
+    {};
+
+    class KTSlotWrapper : public boost::noncopyable
+    {
+        private:
+            class KTInternalSlotWrapper
+            {
+                public:
+                    KTInternalSlotWrapper() {}
+                    virtual ~KTInternalSlotWrapper() {}
+
+                    virtual KTConnection Connect(KTSignalWrapper* signalWrap, int groupNum=-1) = 0;
+            };
+
+            template< typename XSignature, typename XTypeContainer >
+            class KTSpecifiedInternalSlotWrapper : public KTInternalSlotWrapper, public boost::noncopyable
+            {
+                public:
+                    KTSpecifiedInternalSlotWrapper(XSignature funcPtr, XTypeContainer* typeCont=NULL) :
+                            fSlot(funcPtr)
+                    {
+                        (void)typeCont; // to suppress warnings
+                    }
+                    virtual ~KTSpecifiedInternalSlotWrapper()
+                    {
+                    }
+
+                    virtual KTConnection Connect(KTSignalWrapper* signalWrap, int groupNum=-1)
+                    {
+                        typedef KTSignalWrapper::KTInternalSignalWrapper SignalWrapperBase;
+                        typedef KTSignalWrapper::KTSpecifiedInternalSignalWrapper< typename XTypeContainer::signal > SignalWrapper;
+
+                        SignalWrapperBase* internalSignalWrap = signalWrap->GetInternal();
+                        SignalWrapper* derivedSignalWrapper = dynamic_cast< SignalWrapper* >(internalSignalWrap);
+                        if (derivedSignalWrapper == NULL)
+                        {
+                            BOOST_THROW_EXCEPTION( KTConnectionException() << "Cannot make connection: unable to cast from KTInternalSignalWrapper* to this slot's derived type." << eom );
+                        }
+                        if (groupNum >= 0)
+                        {
+                            return derivedSignalWrapper->GetSignal()->connect(groupNum, fSlot);
+                        }
+                        return derivedSignalWrapper->GetSignal()->connect(fSlot);
+                    }
+
+                private:
+                    XSignature fSlot;
+            };
+
+        public:
+            template< typename XSignature, typename XTypeContainer >
+            KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont);
+            ~KTSlotWrapper();
+
+        private:
+            KTSlotWrapper();
+
+            KTInternalSlotWrapper* fSlotWrapper;
+
+        public:
+            void SetConnection(KTConnection conn);
+            void SetConnection(KTSignalWrapper* signalWrap, int groupNum=-1); // can throw KTConnectionException
+            void Disconnect();
+
+        private:
+            KTConnection fConnection;
+
+        public:
+            std::shared_ptr< KTThreadReference > GetThreadRef() const;
+            void SetThreadRef(std::shared_ptr< KTThreadReference > ref);
+
+            bool GetDoBreakpoint() const;
+            void SetDoBreakpoint(bool flag);
+
+        private:
+            std::shared_ptr< KTThreadReference > fThreadRef;
+            bool fDoBreakpoint;
+
+    };
+
+    template< typename XSignature, typename XTypeContainer >
+    KTSlotWrapper::KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont) :
+            fSlotWrapper(new KTSpecifiedInternalSlotWrapper< XSignature, XTypeContainer >(signalPtr, typeCont)),
+            fConnection(),
+            fThreadRef( std::make_shared< KTThreadReference >() ),
+            fDoBreakpoint(false)
+    {
+    }
+
+    inline void KTSlotWrapper::SetConnection(KTConnection conn)
+    {
+        fConnection = conn;
+        return;
+    }
+
+    inline void KTSlotWrapper::SetConnection(KTSignalWrapper* signalWrap, int groupNum)
+    {
+        fConnection = this->fSlotWrapper->Connect(signalWrap, groupNum);
+        return;
+    }
+
+    inline void KTSlotWrapper::Disconnect()
+    {
+        fConnection.disconnect();
+        return;
+    }
+
+    inline std::shared_ptr< KTThreadReference > KTSlotWrapper::GetThreadRef() const
+    {
+        return fThreadRef;
+    }
+
+    inline void KTSlotWrapper::SetThreadRef(std::shared_ptr< KTThreadReference > ref)
+    {
+        fThreadRef = ref;
+        return;
+    }
+
+    inline bool KTSlotWrapper::GetDoBreakpoint() const
+    {
+        return fDoBreakpoint;
+    }
+
+    inline void KTSlotWrapper::SetDoBreakpoint(bool flag)
+    {
+        fDoBreakpoint = flag;
+        return;
+    }
+
+
+} /* namespace Nymph */
+#endif /* KTSLOTWRAPPER_HH_ */
diff --git a/Cpp/Library_v1/Processor/KTThreadReference.cc b/Cpp/Library_v1/Processor/KTThreadReference.cc
new file mode 100644
index 0000000..e42a16c
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTThreadReference.cc
@@ -0,0 +1,86 @@
+/*
+ * KTThreadReference.cc
+ *
+ *  Created on: May 2, 2017
+ *      Author: obla999
+ */
+
+#include "KTThreadReference.hh"
+
+#include "KTException.hh"
+#include "KTLogger.hh"
+
+KTLOGGER( trlog, "KTThreadReference" );
+
+namespace Nymph
+{
+
+    KTThreadReference::KTThreadReference() :
+            fName(),
+            fBreakFlag( false ),
+            fCanceled( false ),
+            fDataPtrRet(),
+            fDataPtrRetFuture( fDataPtrRet.get_future() ),
+            fInitiateBreakFunc( [](){return;} ),
+            fWaitForContinueFunc( []( boost_unique_lock& ){return;} ),
+            fMutex()
+    {
+        if( ! fDataPtrRetFuture.valid() )
+        {
+            KTERROR( trlog, "Invalid data-pointer-return future created" );
+            BOOST_THROW_EXCEPTION( KTException() << "Invalid data-pointer-return future created" << eom );
+        }
+    }
+
+    KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
+            fName( std::move( orig.fName ) ),
+            fBreakFlag( orig.fBreakFlag ),
+            fCanceled( orig.fCanceled ),
+            fDataPtrRet( std::move( orig.fDataPtrRet ) ),
+            fDataPtrRetFuture( std::move( orig.fDataPtrRetFuture ) ),
+            fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
+            fWaitForContinueFunc( std::move( orig.fWaitForContinueFunc ) ),
+            fMutex()
+    {
+        orig.fBreakFlag = false;
+        orig.fCanceled = false;
+    }
+
+    KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
+    {
+        fName = std::move( orig.fName );
+        fBreakFlag = orig.fBreakFlag;
+        fCanceled = orig.fCanceled;
+        fDataPtrRet = std::move( orig.fDataPtrRet );
+        fDataPtrRetFuture = std::move( orig.fDataPtrRetFuture );
+        fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
+        fWaitForContinueFunc = std::move( orig.fWaitForContinueFunc );
+
+        orig.fBreakFlag = false;
+        orig.fCanceled = false;
+
+        return *this;
+    }
+
+    void KTThreadReference::Break( const KTDataHandle& dataHandle, bool doBreakpoint )
+    {
+        if( doBreakpoint )
+        {
+            KTDEBUG( trlog, "Initiating break (" << fName << ")" );
+            fInitiateBreakFunc();
+        }
+        boost_unique_lock lock( fMutex );
+        if( fBreakFlag || doBreakpoint )
+        {
+            KTDEBUG( trlog, "Reacting to break (" << fName << ")" );
+            // set the return for this thread
+            KTWARN( trlog, "Setting value of data-ptr-ret promise (" << fName << ")" );
+            fDataPtrRet.set_value( dataHandle );
+            // wait for continue signal
+            fWaitForContinueFunc( lock );
+        }
+        return;
+    }
+
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Processor/KTThreadReference.hh b/Cpp/Library_v1/Processor/KTThreadReference.hh
new file mode 100644
index 0000000..b792c3f
--- /dev/null
+++ b/Cpp/Library_v1/Processor/KTThreadReference.hh
@@ -0,0 +1,168 @@
+/*
+ * KTThreadReference.hh
+ *
+ *  Created on: May 2, 2017
+ *      Author: obla999
+ */
+
+#ifndef KTTHREADREFERENCE_HH_
+#define KTTHREADREFERENCE_HH_
+
+#include "KTCoreData.hh"
+
+#include <boost/thread/future.hpp>
+
+#include <memory>
+
+namespace Nymph
+{
+    typedef boost::promise< KTDataHandle > KTDataPtrReturn;
+
+    class KTThreadReferenceBase
+    {
+        protected:
+            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
+
+        public:
+            KTThreadReferenceBase();
+            KTThreadReferenceBase( const KTThreadReferenceBase& ) = delete;
+            KTThreadReferenceBase( KTThreadReferenceBase&& orig );
+
+            KTThreadReferenceBase& operator=( const KTThreadReferenceBase& ) = delete;
+            KTThreadReferenceBase& operator=( KTThreadReferenceBase&& );
+
+        public:
+            //**************************
+            // for use within the thread
+            //**************************
+
+            //void SetReturnException( boost::exception_ptr excPtr );
+
+        public:
+            //******************************
+            // for use outside of the thread
+            //******************************
+
+            void SetInitiateBreakFunc( const std::function< void() >& initBreakFunc );
+            void SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc );
+
+        public:
+            MEMBERVARIABLE_REF( std::string, Name );
+            MEMBERVARIABLE( bool, BreakFlag );
+            MEMBERVARIABLE( bool, Canceled );
+            MEMBERVARIABLE_REF( boost::mutex, Mutex );
+
+        private:
+            std::function< void() > fInitiateBreakFunc;
+            std::function< void( boost_unique_lock& ) > fWaitForContinueFunc;
+    };
+
+    template< typename... XArgs >
+    class KTThreadReference : public KTThreadReferenceBase
+    {
+        private:
+            typedef KTThreadReferenceBase::boost_unique_lock boost_unique_lock;
+
+        public:
+            KTThreadReference();
+            KTThreadReference( const KTThreadReference& ) = delete;
+            KTThreadReference( KTThreadReference&& orig );
+
+            KTThreadReference& operator=( const KTThreadReference& ) = delete;
+            KTThreadReference& operator=( KTThreadReference&& );
+
+        public:
+            //**************************
+            // for use within the thread
+            //**************************
+
+            void Break( bool doBreakpoint, const XArgs&... dataHandle );
+
+            void SetReturnValue( XArgs... dataHandle );
+
+        public:
+            //******************************
+            // for use outside of the thread
+            //******************************
+
+            void SetReturnException( boost::exception_ptr excPtr );
+
+            KTDataHandle GetReturnValue();
+            boost::unique_future< KTDataHandle >& GetDataPtrRetFuture();
+            const boost::unique_future< KTDataHandle >& GetDataPtrRetFuture() const;
+
+            void RefreshDataPtrRet();
+
+        private:
+            KTDataPtrReturn fDataPtrRet;
+            boost::unique_future< KTDataHandle > fDataPtrRetFuture;
+    };
+
+    template< typename... XArgs >
+    void KTThreadReference< XArgs... >::SetReturnException( boost::exception_ptr excPtr )
+    {
+        fDataPtrRet.set_exception( excPtr );
+        return;
+    }
+
+    template< typename... XArgs >
+    void KTThreadReference< XArgs... >::SetReturnValue( XArgs... dataHandle )
+    {
+        fDataPtrRet.set_value( dataHandle... );
+        return;
+    }
+
+    template< typename... XArgs >
+    KTDataHandle KTThreadReference< XArgs... >::GetReturnValue()
+    {
+        return fDataPtrRetFuture.get();
+    }
+
+    template< typename... XArgs >
+    boost::unique_future< KTDataHandle >& KTThreadReference< XArgs... >::GetDataPtrRetFuture()
+    {
+        return fDataPtrRetFuture;
+    }
+
+    template< typename... XArgs >
+    const boost::unique_future< KTDataHandle >& KTThreadReference< XArgs... >::GetDataPtrRetFuture() const
+    {
+        return fDataPtrRetFuture;
+    }
+
+    template< typename... XArgs >
+    void KTThreadReference< XArgs... >::RefreshDataPtrRet()
+    {
+        fDataPtrRet = KTDataPtrReturn();
+        fDataPtrRetFuture = fDataPtrRet.get_future();
+        return;
+    }
+
+    inline void KTThreadReferenceBase::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
+    {
+        fInitiateBreakFunc = initBreakFunc;
+        return;
+    }
+
+    inline void KTThreadReferenceBase::SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc )
+    {
+        fWaitForContinueFunc = waitForContFunc;
+        return;
+    }
+
+
+#ifndef THROW_THREADREF_EXCEPTION
+#define THROW_THREADREF_EXCEPTION( ref, exc ) \
+        try \
+        { \
+            BOOST_THROW_EXCEPTION( exc ); \
+        } \
+        catch( ::boost::exception& e ) \
+        { \
+            ref->SetReturnException( ::boost::current_exception() ); \
+        }
+#endif // THROW_THREADREF_EXCEPTION
+
+} /* namespace Nymph */
+
+#endif /* KTTHREADREFERENCE_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTCacheDirectory.cc b/Cpp/Library_v1/Utility/KTCacheDirectory.cc
new file mode 100644
index 0000000..d36f6e8
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTCacheDirectory.cc
@@ -0,0 +1,34 @@
+/*
+ * KTCacheDirectory.cc
+ *
+ *  Created on: Dec 3, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTCacheDirectory.hh"
+
+#include "KTLogger.hh"
+#include "param.hh"
+
+using std::string;
+
+namespace Nymph
+{
+    KTLOGGER(dirlog, "KTCacheDirectory");
+
+    KTCacheDirectory::KTCacheDirectory(const std::string& name) :
+            KTDirectory(),
+            KTSelfConfigurable(name)
+    {
+    }
+
+    KTCacheDirectory::~KTCacheDirectory()
+    {
+    }
+
+    bool KTCacheDirectory::Configure(const scarab::param_node& node)
+    {
+        return SetPath(node.get_value("path", fPath.string()));
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Utility/KTCacheDirectory.hh b/Cpp/Library_v1/Utility/KTCacheDirectory.hh
new file mode 100644
index 0000000..d8d362d
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTCacheDirectory.hh
@@ -0,0 +1,42 @@
+/*
+ * KTCacheDirectory.hh
+ *
+ *  Created on: Dec 3, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTCACHEDIRECTORY_HH_
+#define KTCACHEDIRECTORY_HH_
+
+#include "KTConfigurable.hh"
+#include "KTDirectory.hh"
+
+#include "singleton.hh"
+
+namespace Nymph
+{
+
+    class KTCacheDirectory : public KTDirectory, public scarab::singleton< KTCacheDirectory >, public KTSelfConfigurable
+    {
+        protected:
+            friend class scarab::singleton< KTCacheDirectory >;
+            friend class scarab::destroyer< KTCacheDirectory >;
+            KTCacheDirectory(const std::string& name = "cache-directory");
+            virtual ~KTCacheDirectory();
+
+        public:
+            using KTSelfConfigurable::Configure;
+
+            bool Configure(const scarab::param_node& node);
+
+            bool IsReady() const;
+
+    };
+
+    inline bool KTCacheDirectory::IsReady() const
+    {
+        return fPathExists && fAccess == eReadWrite;
+    }
+
+} /* namespace Nymph */
+#endif /* KTCACHEDIRECTORY_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTConcurrentQueue.hh b/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
new file mode 100644
index 0000000..b32fe28
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
@@ -0,0 +1,170 @@
+/*
+ * KTConcurrentQueue.hh
+ *
+ *  Created on: Oct 22, 2012
+ *      Author: nsoblath
+ *
+ *      FIFO Queue
+ *
+ *      Based almost exactly on the class concurrent_queue from:
+ *      http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html
+ *      Post author: Anthony Williams
+ *      Copyright  2005-2013 Just Software Solutions Ltd. All rights reserved.
+ */
+
+#ifndef KTCONCURRENTQUEUE_HH_
+#define KTCONCURRENTQUEUE_HH_
+
+#include "KTLogger.hh"
+
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/thread.hpp>
+
+#include <deque>
+
+namespace Nymph
+{
+    KTLOGGER(queuelog, "KTConcurrentQueue");
+
+    template< class XDataType >
+    class KTConcurrentQueue
+    {
+        public:
+            typedef std::deque< XDataType > Queue;
+
+            struct QueueNotEmpty
+            {
+                Queue& fQueue;
+                QueueNotEmpty(Queue& aQueue) :
+                    fQueue(aQueue)
+                {}
+                bool operator()() const
+                {
+                    return ! fQueue.empty();
+                }
+            };
+
+            typedef boost::unique_lock< boost::mutex > ScopedLock;
+
+        public:
+            KTConcurrentQueue() :
+                fQueue(),
+                fInterrupt(false),
+                fTimeout(boost::posix_time::milliseconds(1000)),
+                fMutex(),
+                fConditionVar()
+            {
+            }
+
+            virtual ~KTConcurrentQueue()
+            {
+                fQueue.clear();
+            }
+
+        private:
+            Queue fQueue;
+            bool fInterrupt;
+
+            boost::posix_time::time_duration fTimeout; /// Timeout duration in milliseconds
+
+            mutable boost::mutex fMutex;
+            boost::condition_variable fConditionVar;
+
+        public:
+            void push(XDataType const& data)
+            {
+                KTDEBUG(queuelog, "Attempting to push to queue");
+                ScopedLock lock(fMutex);
+                KTDEBUG(queuelog, "Pushing to concurrent queue; size: " << fQueue.size());
+                fQueue.push_back(data);
+                lock.unlock();
+                fConditionVar.notify_one();
+                return;
+            }
+
+            bool empty() const
+            {
+                ScopedLock lock(fMutex);
+                return fQueue.empty();
+            }
+
+            bool size() const
+            {
+                ScopedLock lock(fMutex);
+                return fQueue.size();
+            }
+
+            bool try_pop(XDataType& popped_value)
+            {
+                ScopedLock lock(fMutex);
+                fInterrupt = false;
+                if(fQueue.empty())
+                {
+                    return false;
+                }
+
+                popped_value=fQueue.front();
+                fQueue.pop_front();
+                return true;
+            }
+
+            bool wait_and_pop(XDataType& popped_value)
+            {
+                ScopedLock lock(fMutex);
+                fInterrupt = false;
+                fConditionVar.wait(lock, QueueNotEmpty(fQueue));
+                if (fInterrupt)
+                {
+                    fInterrupt = false;
+                    return false;
+                }
+
+                popped_value=fQueue.front();
+                fQueue.pop_front();
+                KTDEBUG(queuelog, "Popping from concurrent queue; size: " << fQueue.size());
+                return true;
+            }
+
+            bool timed_wait_and_pop(XDataType& popped_value)
+            {
+                ScopedLock lock(fMutex);
+                fInterrupt = false;
+                boost::system_time const waitUntil = boost::get_system_time() + fTimeout;
+                if (! fConditionVar.timed_wait(lock, waitUntil, QueueNotEmpty(fQueue)))
+                {
+                    KTDEBUG(queuelog, "Queue wait has timed out");
+                    return false;
+                }
+                if (fInterrupt)
+                {
+                    fInterrupt = false;
+                    return false;
+                }
+
+                popped_value=fQueue.front();
+                fQueue.pop_front();
+                KTDEBUG(queuelog, "Popping from concurrent queue; size: " << fQueue.size());
+                return true;
+            }
+
+            void interrupt()
+            {
+                fInterrupt = true;
+                fConditionVar.notify_one();
+                return;
+            }
+
+            inline unsigned get_timeout() const
+            {
+                return fTimeout.total_milliseconds();
+            }
+
+            inline void set_timeout(unsigned duration)
+            {
+                fTimeout = boost::posix_time::milliseconds(duration);
+                return;
+            }
+    };
+
+} /* namespace Nymph */
+#endif /* KTCONCURRENTQUEUE_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTConfigurable.cc b/Cpp/Library_v1/Utility/KTConfigurable.cc
new file mode 100644
index 0000000..7fae521
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTConfigurable.cc
@@ -0,0 +1,82 @@
+/*
+ * KTConfigurable.cc
+ *
+ *  Created on: Aug 21, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTConfigurable.hh"
+
+#include "KTCommandLineHandler.hh"
+#include "KTLogger.hh"
+#include "KTConfigurator.hh"
+
+#include "param_codec.hh"
+
+using std::string;
+
+namespace Nymph
+{
+
+    KTLOGGER(conflog, "KTConfigurable");
+
+    //******************
+    // KTConfigurable
+    //******************
+
+    KTConfigurable::KTConfigurable(const string& name) :
+            fCLHandler(KTCommandLineHandler::get_instance()),
+            fConfigName(name)
+    {
+    }
+
+    KTConfigurable::~KTConfigurable()
+    {
+    }
+
+    bool KTConfigurable::Configure(const std::string& config)
+    {
+        scarab::param_translator translator;
+        scarab::param_node optNode;
+<<<<<<< HEAD:Library_v1/Utility/KTConfigurable.cc
+        optNode.add( "encoding", "json" );
+=======
+        optNode.add( "encoding", new scarab::param_value( "json" ) );
+>>>>>>> develop:Library/Utility/KTConfigurable.cc
+        return Configure( translator.read_string( config, optNode )->as_node() );;
+    }
+
+
+    //**********************
+    // KTSelfConfigurable
+    //**********************
+
+    KTSelfConfigurable::KTSelfConfigurable(const string& name) :
+            KTConfigurable(name),
+            fIsConfigured(false)
+    {
+    }
+
+    KTSelfConfigurable::~KTSelfConfigurable()
+    {
+    }
+
+    bool KTSelfConfigurable::Configure()
+    {
+        if (fIsConfigured) return true;
+
+<<<<<<< HEAD:Library_v1/Utility/KTConfigurable.cc
+        if (! this->Configure(KTConfigurator::get_instance()->Config()))
+=======
+        const scarab::param_node& node = KTConfigurator::get_instance()->Config();
+        if (! this->Configure(node))
+>>>>>>> develop:Library/Utility/KTConfigurable.cc
+        {
+            KTERROR(conflog, "An error occurred while configuring <" << fConfigName << ">");
+            return false;
+        }
+        fIsConfigured = IsReady();
+        return fIsConfigured;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Utility/KTConfigurable.hh b/Cpp/Library_v1/Utility/KTConfigurable.hh
new file mode 100644
index 0000000..c93d6b8
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTConfigurable.hh
@@ -0,0 +1,96 @@
+/*
+ * KTConfigurable.hh
+ *
+ *  Created on: Aug 21, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTCONFIGURABLE_HH_
+#define KTCONFIGURABLE_HH_
+
+#include "param.hh"
+
+#include <string>
+
+namespace Nymph
+{
+    class KTCommandLineHandler;
+
+
+    //******************
+    // KTConfigurable
+    //******************
+
+    class KTConfigurable
+    {
+        public:
+            KTConfigurable(const std::string& name="default-name");
+            virtual ~KTConfigurable();
+
+            /// Should perform parameter store and command-line configurations
+            virtual bool Configure(const scarab::param_node& node) = 0;
+            /// Implement the option for calling Configure without passing a parameter store node.
+            //virtual bool Configure();
+            /// Configure from a JSON string
+            bool Configure(const std::string& config);
+
+        protected:
+            KTCommandLineHandler* fCLHandler;
+
+        public:
+            const std::string& GetConfigName() const;
+            void SetConfigName(const std::string& name);
+
+        protected:
+            std::string fConfigName;
+
+    };
+/*
+    inline bool KTConfigurable::Configure()
+    {
+        return Configure(NULL);
+    }
+*/
+    inline const std::string& KTConfigurable::GetConfigName() const
+    {
+        return fConfigName;
+    }
+
+    inline void KTConfigurable::SetConfigName(const std::string& name)
+    {
+        fConfigName = name;
+    }
+
+
+    //**********************
+    // KTSelfConfigurable
+    //**********************
+
+    class KTSelfConfigurable : public KTConfigurable
+    {
+        public:
+            KTSelfConfigurable(const std::string& name="default-self-name");
+            virtual ~KTSelfConfigurable();
+
+            /// Should perform parameter store and command-line configurations
+            virtual bool Configure(const scarab::param_node& node) = 0;
+            /// Configure by getting the top-level node from the parameter store
+            virtual bool Configure();
+
+            /// Check if everything has been correctly configured
+            virtual bool IsReady() const = 0;
+
+            bool GetIsConfigured();
+
+        private:
+            bool fIsConfigured;
+
+    };
+
+    inline bool KTSelfConfigurable::GetIsConfigured()
+    {
+        return fIsConfigured;
+    }
+
+} /* namespace Nymph */
+#endif /* KTCONFIGURABLE_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTConfigurablePybind.hh b/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
new file mode 100644
index 0000000..585a33f
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
@@ -0,0 +1,29 @@
+/*
+ * KTConfigurablePybind.cc
+ *
+ *  Created on: Jan 27, 2018
+ *      Author: N. Oblath
+ */
+
+#include "KTConfigurable.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportKTConfigurable( pybind11::module& mod )
+    {
+/*        pybind11::class_< KTConfigurable >( mod, "KTConfigurable" )
+                .def( pybind11::init< const std::string & >() )
+
+                .def( "Configure", (bool (KTConfigurable::*)(const std::string&)) &KTConfigurable::Configure )
+                //.def( "Configure", (void (KTConfigurable::*)(const scarab::param_node&)) &KTConfigurable::Configure )
+
+                .def( "GetConfigName", &KTConfigurable::GetConfigName )
+                .def( "SetConfigName", &KTConfigurable::SetConfigName )
+                ;
+*/
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Utility/KTDirectory.cc b/Cpp/Library_v1/Utility/KTDirectory.cc
new file mode 100644
index 0000000..b4a8895
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTDirectory.cc
@@ -0,0 +1,86 @@
+/*
+ * KTDirectory.cc
+ *
+ *  Created on: Dec 3, 2012
+ *      Author: nsoblath
+ */
+
+#include "KTDirectory.hh"
+
+#include "KTLogger.hh"
+
+#include <unistd.h>
+
+using std::string;
+
+using boost::filesystem::path;
+
+namespace Nymph
+{
+    KTLOGGER(dirlog, "KTDirectory");
+
+    KTDirectory::KTDirectory() :
+            fPath(""),
+            fPathExists(false),
+            fAccess(eNone)
+    {
+        SetPath("./");
+    }
+
+    KTDirectory::~KTDirectory()
+    {
+    }
+
+    const string& KTDirectory::GetPath() const
+    {
+        return fPath.string();
+    }
+
+    bool KTDirectory::GetPathExists() const
+    {
+        return fPathExists;
+    }
+
+    KTDirectory::Access KTDirectory::GetAccess() const
+    {
+        return fAccess;
+    }
+
+    bool KTDirectory::SetPath(const string& strPath)
+    {
+        path newPath(strPath);
+        if (! newPath.is_absolute())
+        {
+            newPath = absolute(newPath);
+        }
+        if (! exists(newPath))
+        {
+            KTERROR(dirlog, "Path does not exist: " << strPath);
+            return false;
+        }
+        if (! is_directory(newPath))
+        {
+            KTERROR(dirlog, "Path specified is not a directory: " << strPath);
+            return false;
+        }
+        fPathExists = true;
+        fPath = newPath;
+
+        // set access
+        if (access(strPath.c_str(), R_OK | W_OK) != -1)
+        {
+            fAccess = eReadWrite;
+        }
+        else if (access(strPath.c_str(), R_OK))
+        {
+            fAccess = eRead;
+        }
+        else
+        {
+            fAccess = eNone;
+        }
+
+        return true;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Utility/KTDirectory.hh b/Cpp/Library_v1/Utility/KTDirectory.hh
new file mode 100644
index 0000000..a379fc5
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTDirectory.hh
@@ -0,0 +1,47 @@
+/*
+ * KTDirectory.hh
+ *
+ *  Created on: Dec 3, 2012
+ *      Author: nsoblath
+ */
+
+#ifndef KTDIRECTORY_HH_
+#define KTDIRECTORY_HH_
+
+#include <boost/filesystem.hpp>
+
+#include <string>
+
+namespace Nymph
+{
+
+    class KTDirectory
+    {
+        public:
+            enum Access
+            {
+                eNone,
+                eRead,
+                eReadWrite
+            };
+
+        public:
+            KTDirectory();
+            virtual ~KTDirectory();
+
+        public:
+            const std::string& GetPath() const;
+            bool GetPathExists() const;
+            Access GetAccess() const;
+
+            bool SetPath(const std::string& strPath);
+
+        protected:
+            boost::filesystem::path fPath;
+            bool fPathExists;
+            Access fAccess;
+
+    };
+
+} /* namespace Nymph */
+#endif /* KTDIRECTORY_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTEventLoop.cc b/Cpp/Library_v1/Utility/KTEventLoop.cc
new file mode 100644
index 0000000..0c21b02
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTEventLoop.cc
@@ -0,0 +1,24 @@
+/*
+ * KTEventLoop.cc
+ *
+ *  Created on: Apr 22, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTEventLoop.hh"
+
+#include "KTLogger.hh"
+
+namespace Nymph
+{
+    KTLOGGER(evlog, "KTEventLoop")
+
+    KTEventLoop::KTEventLoop()
+    {
+    }
+
+    KTEventLoop::~KTEventLoop()
+    {
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Utility/KTEventLoop.hh b/Cpp/Library_v1/Utility/KTEventLoop.hh
new file mode 100644
index 0000000..6859be5
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTEventLoop.hh
@@ -0,0 +1,36 @@
+/*
+ * KTEventLoop.hh
+ *
+ *  Created on: Apr 22, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTEVENTLOOP_HH_
+#define KTEVENTLOOP_HH_
+
+namespace Nymph
+{
+
+    /*!
+     @class KTEventLoop
+     @author N. S. Oblath
+
+     @brief Abstract base class for event loops
+
+     @details
+     */
+    class KTEventLoop
+    {
+        public:
+            KTEventLoop();
+            virtual ~KTEventLoop();
+
+            virtual void Go() = 0;
+
+            virtual void Stop() = 0;
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* KTEVENTLOOP_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTException.cc b/Cpp/Library_v1/Utility/KTException.cc
new file mode 100644
index 0000000..96e8df5
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTException.cc
@@ -0,0 +1,30 @@
+/*
+ * KTException.cc
+ *
+ *  Created on: Feb 25, 2014
+ *      Author: nsoblath
+ */
+
+#include "KTException.hh"
+
+namespace Nymph
+{
+
+    KTException::KTException() :
+            boost::exception(),
+            std::exception(),
+            fMsgBuffer()
+    {
+    }
+    KTException::KTException( const KTException& an_exception ) :
+            boost::exception( an_exception ),
+            std::exception( an_exception ),
+            fMsgBuffer( an_exception.fMsgBuffer )
+    {
+    }
+
+    KTException::~KTException() throw ()
+    {
+    }
+
+}
diff --git a/Cpp/Library_v1/Utility/KTException.hh b/Cpp/Library_v1/Utility/KTException.hh
new file mode 100644
index 0000000..10ae966
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTException.hh
@@ -0,0 +1,127 @@
+/*
+ * KTException.hh
+ *
+ *  Created on: Feb 25, 2014
+ *      Author: nsoblath
+ */
+
+
+#ifndef KTEXCEPTION_HH_
+#define KTEXCEPTION_HH_
+
+#include "macros.hh"
+
+#include <boost/exception/all.hpp>
+
+#include <exception>
+#include <sstream>
+#include <string>
+
+namespace Nymph
+{
+    struct KTMessageEnd {};
+    static const KTMessageEnd eom = KTMessageEnd();
+
+    //typedef boost::error_info<struct tag_errmsg, std::string> KTErrorMsgInfo;
+
+    template< class XLabel >
+    using KTErrorMsgInfo = boost::error_info< XLabel, std::string>;
+
+    /*!
+     @class KTException
+     @author N.S. Oblath
+
+     @brief Exception base class for Nymph and Nymph-based projects
+
+     @details
+
+     How to throw:
+
+     BOOST_THROW_EXCEPTION( KTException() << "[error message here]" << eom );
+
+     Why do it like this?
+      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
+      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
+      - KTException can be replaced with whatever derived exception class you're using.
+
+      How to catch, add information, and re-throw:
+
+      try
+      {
+          // code that throws a KTException
+      }
+      catch( boost::exception& e )
+      {
+          e << KTErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
+          throw;
+      }
+
+
+      How to do the final catch
+
+      try
+      {
+          // code that throws a KTException
+      }
+      catch( boost::exception& e )
+      {
+          KTERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
+      }
+    */
+
+    class KTException : virtual public boost::exception, virtual public std::exception
+    {
+        public:
+            KTException();
+            KTException( const KTException& );
+            ~KTException() throw ();
+
+            // adds to the message buffer
+            template< class XStreamable >
+            KTException& operator<<( XStreamable a_fragment );
+            // adds to the message buffer
+            KTException& operator<<( const std::string& a_fragment );
+            // adds to the message buffer
+            KTException& operator<<( const char* a_fragment );
+
+            // adds the current contents of the message buffer as a KTErrorMsgInfo
+            KTException& operator<<( const KTMessageEnd& eom );
+
+        private:
+            mutable std::string fMsgBuffer;
+    };
+
+    template< class XStreamable >
+    KTException& KTException::operator<<( XStreamable a_fragment )
+    {
+        std::stringstream stream;
+        stream << a_fragment;
+        stream >> fMsgBuffer;
+        return *this;
+    }
+
+    inline KTException& KTException::operator<<( const std::string& a_fragment )
+    {
+        fMsgBuffer += a_fragment;
+        return *this;
+    }
+
+    inline KTException& KTException::operator<<( const char* a_fragment )
+    {
+        fMsgBuffer += std::string( a_fragment );
+        return *this;
+    }
+
+    inline KTException& KTException::operator<<( const KTMessageEnd& eom )
+    {
+        if( ! fMsgBuffer.empty() )
+        {
+            boost::operator<<( *this, KTErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
+            fMsgBuffer.clear();
+        }
+        return *this;
+    }
+
+}
+
+#endif /* KTEXCEPTION_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTExtensible.hh b/Cpp/Library_v1/Utility/KTExtensible.hh
new file mode 100644
index 0000000..73fe331
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTExtensible.hh
@@ -0,0 +1,393 @@
+/*
+ * KTExtensible.hh
+ *
+ *  Created on: Feb 11, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_KTEXTENSIBLE_HH_
+#define NYMPH_KTEXTENSIBLE_HH_
+
+#include "KTException.hh"
+
+#include <cereal/types/polymorphic.hpp>
+
+#include <memory>
+
+namespace Nymph
+{
+
+    template< class XBaseType >
+    class KTExtensibleCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleCore< XBaseType > >
+    {
+        public:
+            typedef KTExtensibleCore< XBaseType > ExtCoreType;
+            typedef std::shared_ptr< ExtCoreType > BasePtrType;
+
+        private:
+            typedef std::enable_shared_from_this< KTExtensibleCore< XBaseType > > ESFTBaseType;
+
+        public:
+            KTExtensibleCore();
+            KTExtensibleCore( const ExtCoreType& orig ) = delete; // deleted because copy of KTExtensibleCore is done using operator=()
+            virtual ~KTExtensibleCore();
+
+            /// Copies extended object
+            ExtCoreType& operator=( const ExtCoreType& orig );
+
+            /// Copies the current object and only extended fields already present
+            virtual ExtCoreType& Pull( const ExtCoreType& orig ) = 0; // implemented in KTExtensible because it requires knowing the extended field type
+
+            /// Clones the extended object
+            virtual BasePtrType Clone() const = 0; // implemented in KTExtensible because it requires knowing the extended field type
+
+            /// Returns the size of the extended object, including this field and any extended below it
+            unsigned size() const;
+
+            /// Returns the object of the requested type or creates a new one if it's not present
+            template< class XRequestedType >
+            XRequestedType& Of();
+
+            /// Returns the object of the requested type or throws KTException if it's not present
+            template< class XRequestedType >
+            const XRequestedType& Of() const;
+
+            /// Returns a pointer to the object of the requested type or creates a new one if it's not present
+            template< class XRequestedType >
+            std::shared_ptr< XRequestedType > Share();
+
+            /// Returns a pointer to the object of the requested type or throws KTException if it's not present
+            template< class XRequestedType >
+            const std::shared_ptr< XRequestedType > Share() const;
+
+            /// Checks whether the requested type is present
+            template< class XRequestedType >
+            bool Has() const;
+
+            /// Extracts the data object of the requested type if it's present; returns an empty pointer if not
+            /// Note that if you detatch the first field without holding a pointer to any other extended fields, those fields will be destroyed.
+            template< class XRequestedType >
+            std::shared_ptr< XRequestedType > Detatch();
+
+            /// Returns a pointer to the next extended field
+            BasePtrType Next();
+
+        protected:
+            template< class XRequestedType >
+            std::shared_ptr< XRequestedType > _Detatch( BasePtrType prev = BasePtrType() );
+
+            BasePtrType fNext;
+
+            bool fDisableExtendedCopy; // internal variable used to determine whether operator= copies extended fields
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+    template< class XInstanceType, class XBaseType >
+    class KTExtensible : public KTExtensibleCore< XBaseType >
+    {
+        public:
+            typedef KTExtensible< XInstanceType, XBaseType > ExtType;
+            typedef KTExtensibleCore< XBaseType > ExtCoreType;
+            typedef std::shared_ptr< KTExtensibleCore< XBaseType > > BasePtrType;
+
+        public:
+            KTExtensible();
+            KTExtensible( const ExtType& orig );
+            virtual ~KTExtensible();
+
+            /// Copies the extended object
+            ExtType& operator=( const ExtType& orig );
+
+            /// Copies the current object and only extended fields already present
+            virtual ExtCoreType& Pull( const ExtCoreType& orig );
+
+            /// Clones the extended object
+            virtual BasePtrType Clone() const;
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+
+
+    //**************
+    // KTExtensibleCore implementation
+    //**************
+
+    template< class XBaseType >
+    KTExtensibleCore< XBaseType >::KTExtensibleCore() :
+            XBaseType(),
+            fNext(),
+            fDisableExtendedCopy( false )
+    {
+    }
+
+    template< class XBaseType >
+    KTExtensibleCore< XBaseType >::~KTExtensibleCore()
+    {
+    }
+
+    template< class XBaseType >
+    KTExtensibleCore< XBaseType >& KTExtensibleCore< XBaseType >::operator=( const KTExtensibleCore< XBaseType >& orig )
+    {
+        // must not call virtual functions on this because it's used in the copy constructor
+
+        if( this == &orig ) return *this;
+
+        fDisableExtendedCopy = false;
+
+        // remove any extended fields
+        fNext.reset();
+
+        // copy extended fields
+        // only do this if orig.fDisableExtendedCopy is false
+        if( ! orig.fDisableExtendedCopy && orig.fNext )
+        {
+            // duplicate extended fields with Clone()
+            fNext = orig.fNext->Clone();  // this's fNext points to the copy of orig's fNext
+        }
+
+        // duplicate base class
+        this->XBaseType::operator=( *this );
+
+        return *this;
+    }
+
+    template< class XBaseType >
+    unsigned KTExtensibleCore< XBaseType >::size() const
+    {
+        return fNext.operator bool() ? 1 + fNext->size() : 1;
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    XRequestedType& KTExtensibleCore< XBaseType >::Of()
+    {
+        XRequestedType* requested = dynamic_cast< XRequestedType* >( this );
+        if( requested != nullptr )
+        {
+            return *requested;
+        }
+
+        if( ! fNext )
+        {
+            std::shared_ptr< XRequestedType > requestedShared = std::make_shared< XRequestedType >();
+            fNext = requestedShared;
+            return *requestedShared;
+        }
+        return fNext->template Of< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    const XRequestedType& KTExtensibleCore< XBaseType >::Of() const
+    {
+        const XRequestedType* requested = dynamic_cast< const XRequestedType* >( this );
+        if( requested != nullptr )
+        {
+            return *requested;
+        }
+
+        if( ! fNext )
+        {
+            throw KTException() << "Cannot add to a const extensible object";
+        }
+        return fNext->template Of< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share()
+    {
+        std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
+        if( requested )
+        {
+            std::cout << "type match" << std::endl;
+            return requested;
+        }
+
+        if( ! fNext )
+        {
+            requested = std::make_shared< XRequestedType >();
+            fNext = requested;
+            return requested;
+        }
+        return fNext->template Share< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    const std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share() const
+    {
+        const std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< const XRequestedType >( ESFTBaseType::shared_from_this() );
+        if( requested )
+        {
+            return requested;
+        }
+
+        if( ! fNext )
+        {
+            throw KTException() << "Cannot add to a const extensible object";
+        }
+        return fNext->template Share< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    bool KTExtensibleCore< XBaseType >::Has() const
+    {
+        if( dynamic_cast< const XRequestedType* >( this ) )
+        {
+            return true;
+        }
+        if( fNext )
+        {
+            return fNext->template Has< XRequestedType >();
+        }
+        return false;
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Detatch()
+    {
+        return _Detatch< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensibleCore< XBaseType >::Next()
+    {
+        return fNext;
+    }
+
+    template< class XBaseType >
+    template< class XRequestedType >
+    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::_Detatch( KTExtensibleCore< XBaseType >::BasePtrType prev )
+    {
+        if( dynamic_cast< XRequestedType* >( this ) )
+        {
+            // create a shared pointer to this here, so that when we reset prev.fNext (if it exists), that won't be the last reference to this
+            std::shared_ptr< XRequestedType > detatched = std::static_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
+            if( prev )
+            {
+                // link prev and fNext if fNext exists; otherwise resets prev.fNext
+                prev->fNext = this->fNext;
+            }
+            fNext.reset();
+            return detatched;
+        }
+
+        if( fNext )
+        {
+            return fNext->template _Detatch< XRequestedType >( ESFTBaseType::shared_from_this() );
+        }
+
+        return std::shared_ptr< XRequestedType >();
+    }
+
+    template< class XBaseType >
+    template< class Archive >
+    void KTExtensibleCore< XBaseType >::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(KTExtensibleCore< XBaseType >).name() << std::endl;
+        ar( cereal::base_class< XBaseType >( this ), fNext );
+    }
+
+
+    //**************
+    // KTExtensible implementation
+    //**************
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >::KTExtensible() :
+            KTExtensibleCore< XBaseType >()
+    {}
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >::KTExtensible( const KTExtensible< XInstanceType, XBaseType >& orig ) :
+            KTExtensibleCore< XBaseType >() // copy of KTExtensibleCore is done from operator=()
+    {
+        *this = orig;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >::~KTExtensible()
+    {}
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensible< XInstanceType, XBaseType >& KTExtensible< XInstanceType, XBaseType >::operator=( const KTExtensible< XInstanceType, XBaseType >& orig )
+    {
+        // must not call any virtual functions on `this` because it's called from the copy constructor
+
+        if( this == &orig ) return *this;
+
+        this->KTExtensibleCore< XBaseType >::operator=( orig );
+
+        return *this;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    KTExtensibleCore< XBaseType >& KTExtensible< XInstanceType, XBaseType >::Pull( const KTExtensibleCore< XBaseType >& orig )
+    {
+        // copies information out from orig based on this's instance type and any extended fields present
+
+        if( this == &orig ) return *this;
+
+        this->fDisableExtendedCopy = true; // we're going to use operator=, so we need to disable copying of extended fields to only get the instance type
+        XInstanceType* instance = static_cast< XInstanceType* >( this ); // guaranteed to be ok by CRTP
+        // orig is const, so Of() will throw an exception if XInstanceType is not present
+        // in that case, make a copy of a new object
+        try
+        {
+            instance->operator=( orig.template Of< XInstanceType >() );
+        }
+        catch( KTException& )
+        {
+            instance->operator=( XInstanceType() );
+        }
+        this->fDisableExtendedCopy = false;
+
+        // continue the pull process for any extended fields present in this
+        if( this->fNext )
+        {
+            this->fNext->Pull( orig );
+        }
+
+        return *this;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensible< XInstanceType, XBaseType >::Clone() const
+    {
+        std::shared_ptr< XInstanceType > instancePtr = std::make_shared< XInstanceType >();
+        instancePtr->Pull(*this); // extracts just XInstanceType from this because instancePtr doesn't have any extended fields
+
+        // if there are extended fields, clone them
+        if( this->fNext )
+        {
+            instancePtr->fNext = this->fNext->Clone(); // instancePtr's fNext is a clone of this's fNext
+        }
+
+        return instancePtr;
+    }
+
+    template< class XInstanceType, class XBaseType >
+    template< class Archive >
+    void KTExtensible< XInstanceType, XBaseType >::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(KTExtensible< XInstanceType, XBaseType >).name() << std::endl;
+        ar( cereal::base_class< ExtCoreType >( this ) );
+        return;
+    }
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_KTEXTENSIBLE_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTExtensibleStruct.hh b/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
new file mode 100644
index 0000000..63deb64
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
@@ -0,0 +1,384 @@
+/*
+ * KTExtensibleStruct.hh
+ *
+ *  Created on: Feb 14, 2013
+ *      Author: nsoblath
+ *      Original Author: Sanshiro Enomoto <sanshiro@uw.edu> (KDExternalStruct, from the KATRIN experiment)
+ */
+
+#ifndef KTEXTENSIBLESTRUCT_HH_
+#define KTEXTENSIBLESTRUCT_HH_
+
+#include "KTException.hh"
+
+#include <cereal/types/polymorphic.hpp>
+
+#include <memory>
+
+namespace Nymph
+{
+
+    // *) operator= reallocates extended fields: to avoid this, use Pull().
+
+    /**
+     *
+     */
+
+    template< class XBaseType >
+    struct KTExtensibleStructCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleStructCore< XBaseType > >
+    {
+        public:
+            typedef KTExtensibleStructCore< XBaseType > BasePtrType;
+            typedef std::shared_ptr< BasePtrType > BasePtr;
+            typedef std::weak_ptr< BasePtrType > WeakBasePtr;
+
+        private:
+            typedef std::enable_shared_from_this< KTExtensibleStructCore< XBaseType > > ESFTType;
+
+        public:
+            /// Default constructor
+            KTExtensibleStructCore();
+            /// Copy constructor; duplicates the extended object
+            KTExtensibleStructCore( const KTExtensibleStructCore& );
+            virtual ~KTExtensibleStructCore();
+            /// Duplicates the extended object
+            KTExtensibleStructCore& operator=( const KTExtensibleStructCore& );
+            /// Removes extended fields
+            virtual void Clear();
+            /// Returns a reference to the object of type XStructType; creates that object if it doesn't exist
+            template< class XStructType >
+            inline XStructType& Of();
+            /// Returns a const reference to the object of type XStructType; creates that object if it doesn't exist
+            template< class XStructType >
+            inline const XStructType& Of() const;
+            /// Returns true if XStructType is or is below this object
+            template< class XStructType >
+            inline bool Has() const;
+            /// Extracts object of type XStructType
+            template< class XStructType >
+            inline std::shared_ptr< XStructType > Detatch();
+            /// Duplicates the extended object
+            virtual BasePtr Clone() const = 0;
+            /// Duplicates object only
+            virtual void Pull( const BasePtrType& object ) = 0;
+            /// Returns the pointer to the next field
+            BasePtr Next() const;
+            /// Returns the pointer to the previous field
+            BasePtr Prev() const;
+            /// Returns the pointer to the last field
+            BasePtr Last() const;
+            /// Returns the pointer to the first field
+            BasePtr First() const;
+        protected:
+            void SetPrevPtrInNext();
+            mutable BasePtr fNext;
+            mutable WeakBasePtr fPrev;
+
+        private:
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+
+
+    template< class XInstanceType, class XBaseType >
+    struct KTExtensibleStruct : KTExtensibleStructCore< XBaseType >
+    {
+        public:
+            typedef typename KTExtensibleStructCore< XBaseType >::BasePtrType BasePtrType;
+            typedef typename KTExtensibleStructCore< XBaseType >::BasePtr BasePtr;
+
+        public:
+            /// Default constructor
+            KTExtensibleStruct();
+            /// Copy constructor; duplicates the extended object
+            KTExtensibleStruct( const KTExtensibleStruct& object );
+            virtual ~KTExtensibleStruct();
+            /// Duplicates the extended object
+            KTExtensibleStruct& operator=( const KTExtensibleStruct& object );
+            /// Duplicates the extended object
+            virtual BasePtr Clone() const;
+            /// Duplicates object only
+            virtual void Pull( const BasePtrType& object );
+            void SetIsCopyDisabled( bool flag );
+        private:
+            bool fIsCopyDisabled;
+            friend class cereal::access;
+
+            template< class Archive >
+            void serialize( Archive& ar );
+    };
+
+
+
+    template<class XBaseType>
+    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(void) :
+            fNext(),
+            fPrev()
+    {
+    }
+
+    template<class XBaseType>
+    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore( const KTExtensibleStructCore& ) :
+            fNext(),
+            fPrev()
+    {
+    }
+
+    template<class XBaseType>
+    KTExtensibleStructCore<XBaseType>::~KTExtensibleStructCore()
+    {
+    }
+
+    template<class XBaseType>
+    KTExtensibleStructCore<XBaseType>& KTExtensibleStructCore<XBaseType>::operator=( const KTExtensibleStructCore& )
+    {
+        fNext.reset();
+        return *this;
+    }
+
+    template<class XBaseType>
+    void KTExtensibleStructCore<XBaseType>::Clear()
+    {
+        fNext.reset();
+    }
+
+    template<class XBaseType>
+    template<class XStructType>
+    inline XStructType& KTExtensibleStructCore<XBaseType>::Of()
+    {
+        XStructType* target = dynamic_cast<XStructType*>(this);
+        if (target)
+        {
+            return *target;
+        }
+
+        if (! fNext)
+        {
+            fNext = std::make_shared< XStructType >();
+            fNext->fPrev = ESFTType::shared_from_this();
+        }
+
+        return fNext->template Of<XStructType>();
+    }
+
+    template<class XBaseType>
+    template<class XStructType>
+    inline const XStructType& KTExtensibleStructCore<XBaseType>::Of() const
+    {
+        const XStructType* target = dynamic_cast<const XStructType*>(this);
+        if (target)
+        {
+            return *target;
+        }
+
+        if (! fNext)
+        {
+            throw KTException() << "Requested component of (const) extensible struct not present";
+        }
+
+        return fNext->template Of<XStructType>();
+    }
+
+
+
+    template<class XBaseType>
+    template<class XStructType>
+    inline bool KTExtensibleStructCore<XBaseType>::Has() const
+    {
+        if (dynamic_cast<const XStructType*>(this))
+        {
+            return true;
+        }
+        if (fNext)
+        {
+            return fNext->template Has<XStructType>();
+        }
+
+        return false;
+    }
+
+
+
+    template<class XBaseType>
+    template<class XStructType>
+    inline std::shared_ptr< XStructType > KTExtensibleStructCore<XBaseType>::Detatch()
+    {
+        if (! fNext)
+        {
+            return std::shared_ptr< XStructType >();
+        }
+        std::shared_ptr< XStructType > next = std::dynamic_pointer_cast< XStructType >(fNext);
+        if (next)
+        {
+            if (next->fNext)
+            {
+                fNext = next->fNext;
+                fNext->fPrev = ESFTType::shared_from_this();
+                next->fNext.reset();
+            }
+            next->fPrev.reset();
+            return next;
+        }
+        return fNext->template Detatch<XStructType>();
+    }
+
+
+    template<class XBaseType>
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Next() const
+    {
+        return fNext;
+    }
+
+    template<class XBaseType>
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Prev() const
+    {
+        return fPrev.lock();
+    }
+
+    template<class XBaseType>
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Last() const
+    {
+        if (fNext) return this;
+        return fNext->Last();
+    }
+
+    template<class XBaseType>
+    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::First() const
+    {
+        if (! fPrev) return BasePtr(this);
+        return fPrev.lock()->First();
+    }
+
+    template<class XBaseType>
+    inline void KTExtensibleStructCore<XBaseType>::SetPrevPtrInNext()
+    {
+        fNext->fPrev = ESFTType::shared_from_this();
+        return;
+    }
+
+    template< class XBaseType >
+    template< class Archive >
+    void KTExtensibleStructCore<XBaseType>::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
+        ar( this );
+
+        if( fNext == 0 ){ return; }
+        
+        // archive pointer ( fNext )?
+    }
+
+
+
+    template< class XInstanceType, class XBaseType >
+    template< class Archive >
+    void KTExtensibleStruct<XInstanceType, XBaseType>::serialize( Archive& ar )
+    {
+        std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
+        ar( cereal::base_class< BasePtrType >( this ), fIsCopyDisabled );
+
+        return;
+    }
+
+    template<class XInstanceType, class XBaseType>
+    KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct() :
+            KTExtensibleStructCore< XBaseType >(),
+            fIsCopyDisabled( false )
+    {
+    }
+
+    template<class XInstanceType, class XBaseType>
+    KTExtensibleStruct<XInstanceType, XBaseType>::~KTExtensibleStruct()
+    {
+        fIsCopyDisabled = false;
+    }
+
+    template<class XInstanceType, class XBaseType>
+    KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct(const KTExtensibleStruct<XInstanceType, XBaseType>& object) :
+            KTExtensibleStructCore<XBaseType>(object)
+    {
+        // should this check fIsCopyDisabled in object?
+        fIsCopyDisabled = false;
+
+        if (object.fNext)
+        {
+            this->fNext = object.fNext->Clone();
+        }
+    }
+
+    template<class XInstanceType, class XBaseType>
+    KTExtensibleStruct<XInstanceType, XBaseType>& KTExtensibleStruct<XInstanceType, XBaseType>::operator=(const KTExtensibleStruct<XInstanceType, XBaseType>& object)
+    {
+        // should this check fIsCopyDisabled in object?
+        if ((&object == this) || fIsCopyDisabled)
+        {
+            return *this;
+        }
+
+        this->fNext.reset();
+
+        if (object.fNext)
+        {
+            this->fNext = object.fNext->Clone();
+            this->BasePtrType::SetPrevPtrInNext();
+            //this->fNext->fPrev = this;
+        }
+
+        return *this;
+    }
+
+    template<class XInstanceType, class XBaseType>
+    typename KTExtensibleStruct<XInstanceType, XBaseType>::BasePtr KTExtensibleStruct<XInstanceType, XBaseType>::Clone() const
+    {
+        // assume CRTP is used properly,
+        // otherwise compiling fails here (intended behavior)
+        typedef KTExtensibleStruct< XInstanceType, XBaseType > InstancePtrType;
+        typedef std::shared_ptr< InstancePtrType > InstancePtr;
+        InstancePtr instance = std::make_shared< InstancePtrType >( XInstanceType(dynamic_cast<const XInstanceType&>(*this)) );
+        if (this->fNext)
+        {
+            instance->fNext = this->fNext->Clone();
+            instance->SetPrevPtrInNext();
+            //instance->fNext->fPrev = instance->fNext;
+        }
+        return std::static_pointer_cast< BasePtrType, InstancePtrType >( instance );
+    }
+
+    template<class XInstanceType, class XBaseType>
+    void KTExtensibleStruct<XInstanceType, XBaseType>::Pull(const BasePtrType& object)
+    {
+        if (&object == this)
+        {
+            return;
+        }
+
+        fIsCopyDisabled = true;
+        XInstanceType* instance = dynamic_cast<XInstanceType*>(this);
+        if (object.template Has<XInstanceType>())
+        {
+            instance->operator=(object.template Of<XInstanceType>());
+        }
+        else
+        {
+            instance->operator=(XInstanceType());
+        }
+        fIsCopyDisabled = false;
+
+        if (this->fNext)
+        {
+            this->fNext->Pull(object);
+        }
+    }
+
+    template<class XInstanceType, class XBaseType>
+    inline void KTExtensibleStruct<XInstanceType, XBaseType>::SetIsCopyDisabled(bool flag)
+    {
+        fIsCopyDisabled = flag;
+        return;
+    }
+
+} /* namespace Nymph */
+#endif /* KTEXTENSIBLESTRUCT_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh b/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
new file mode 100644
index 0000000..46f6925
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
@@ -0,0 +1,201 @@
+/*
+ * KTExtensibleStructFactory.hh
+ *
+ *  Created on: Sept 22, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTEXTENSIBLESTRUCTFACTORY_HH_
+#define KTEXTENSIBLESTRUCTFACTORY_HH_
+
+#include "KTExtensibleStruct.hh"
+#include "KTLogger.hh"
+
+#include "singleton.hh"
+
+#include <map>
+#include <string>
+
+namespace Nymph
+{
+    KTLOGGER(utillog_esfactory, "KTExtensibleStructFactory");
+
+    template< class XBaseType >
+    class KTExtensibleStructFactory;
+
+    template< class XBaseType >
+    class KTExtensibleStructRegistrarBase
+    {
+        public:
+            KTExtensibleStructRegistrarBase() {}
+            virtual ~KTExtensibleStructRegistrarBase() {}
+
+        public:
+            friend class KTExtensibleStructFactory< XBaseType >;
+
+        protected:
+            virtual KTExtensibleStructCore< XBaseType >* Create() const = 0;
+            virtual KTExtensibleStructCore< XBaseType >* Create(KTExtensibleStructCore< XBaseType >* object) const = 0;
+
+    };
+
+    template< class XBaseType, class XDerivedType >
+    class KTExtensibleStructRegistrar : public KTExtensibleStructRegistrarBase< XBaseType >
+    {
+        public:
+            KTExtensibleStructRegistrar(const std::string& className);
+            virtual ~KTExtensibleStructRegistrar();
+
+        protected:
+            void Register(const std::string& className) const;
+
+            KTExtensibleStructCore< XBaseType >* Create() const;
+            KTExtensibleStructCore< XBaseType >* Create(KTExtensibleStructCore< XBaseType >* object) const;
+
+    };
+
+
+    template< class XBaseType >
+    class KTExtensibleStructFactory : public scarab::singleton< KTExtensibleStructFactory< XBaseType > >
+    {
+        public:
+            typedef std::map< std::string, const KTExtensibleStructRegistrarBase< XBaseType >* > FactoryMap;
+            typedef typename FactoryMap::value_type FactoryEntry;
+            typedef typename FactoryMap::iterator FactoryIt;
+            typedef typename FactoryMap::const_iterator FactoryCIt;
+
+        public:
+            KTExtensibleStructCore< XBaseType >* Create(const std::string& className);
+            KTExtensibleStructCore< XBaseType >* Create(const FactoryCIt& iter);
+
+            KTExtensibleStructCore< XBaseType >* Create(const std::string& className, KTExtensibleStructCore< XBaseType >* object);
+            KTExtensibleStructCore< XBaseType >* Create(const FactoryCIt& iter, KTExtensibleStructCore< XBaseType >* object);
+
+            void Register(const std::string& className, const KTExtensibleStructRegistrarBase< XBaseType >* registrar);
+
+            FactoryCIt GetFactoryMapBegin() const;
+            FactoryCIt GetFactoryMapEnd() const;
+
+        protected:
+            FactoryMap* fMap;
+
+
+        protected:
+            friend class scarab::singleton< KTExtensibleStructFactory >;
+            friend class scarab::destroyer< KTExtensibleStructFactory >;
+            KTExtensibleStructFactory();
+            ~KTExtensibleStructFactory();
+    };
+
+    template< class XBaseType >
+    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const FactoryCIt& iter)
+    {
+        return iter->second->Create();
+    }
+
+    template< class XBaseType >
+    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const std::string& className)
+    {
+        FactoryCIt it = fMap->find(className);
+        if (it == fMap->end())
+        {
+            KTERROR(utillog_esfactory, "Did not find factory for <" << className << ">.");
+            return NULL;
+        }
+
+        return it->second->Create();
+    }
+
+    template< class XBaseType >
+    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const FactoryCIt& iter, KTExtensibleStructCore< XBaseType >* object)
+    {
+        return iter->second->Create(object);
+    }
+
+    template< class XBaseType >
+    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const std::string& className, KTExtensibleStructCore< XBaseType >* object)
+    {
+        FactoryCIt it = fMap->find(className);
+        if (it == fMap->end())
+        {
+            KTERROR(utillog_esfactory, "Did not find factory for <" << className << ">.");
+            return NULL;
+        }
+
+        return it->second->Create(object);
+    }
+
+    template< class XBaseType >
+    void KTExtensibleStructFactory< XBaseType >::Register(const std::string& className, const KTExtensibleStructRegistrarBase< XBaseType >* registrar)
+    {
+        // A local (static) logger is created inside this function to avoid static initialization order problems
+        KTLOGGER(utillog_esfactory_reg, "KTExtensibleStructFactory-Register");
+
+        FactoryCIt it = fMap->find(className);
+        if (it != fMap->end())
+        {
+            KTERROR(utillog_esfactory_reg, "Already have factory registered for <" << className << ">.");
+            return;
+        }
+        fMap->insert(std::pair< std::string, const KTExtensibleStructRegistrarBase< XBaseType >* >(className, registrar));
+        KTDEBUG(utillog_esfactory_reg, "Registered a factory for class " << className << ", factory #" << fMap->size()-1);
+    }
+
+    template< class XBaseType >
+    KTExtensibleStructFactory< XBaseType >::KTExtensibleStructFactory() :
+        fMap(new FactoryMap())
+    {}
+
+    template< class XBaseType >
+    KTExtensibleStructFactory< XBaseType >::~KTExtensibleStructFactory()
+    {
+        delete fMap;
+    }
+
+    template< class XBaseType >
+    typename KTExtensibleStructFactory< XBaseType >::FactoryCIt KTExtensibleStructFactory< XBaseType >::GetFactoryMapBegin() const
+    {
+        return fMap->begin();
+    }
+
+    template< class XBaseType >
+    typename KTExtensibleStructFactory< XBaseType >::FactoryCIt KTExtensibleStructFactory< XBaseType >::GetFactoryMapEnd() const
+    {
+        return fMap->end();
+    }
+
+
+
+
+    template< class XBaseType, class XDerivedType >
+    KTExtensibleStructRegistrar< XBaseType, XDerivedType >::KTExtensibleStructRegistrar(const std::string& className) :
+            KTExtensibleStructRegistrarBase< XBaseType >()
+    {
+        Register(className);
+    }
+
+    template< class XBaseType, class XDerivedType >
+    KTExtensibleStructRegistrar< XBaseType, XDerivedType >::~KTExtensibleStructRegistrar()
+    {}
+
+    template< class XBaseType, class XDerivedType >
+    void KTExtensibleStructRegistrar< XBaseType, XDerivedType >::Register(const std::string& className) const
+    {
+        KTExtensibleStructFactory< XBaseType >::get_instance()->Register(className, this);
+        return;
+    }
+
+    template< class XBaseType, class XDerivedType >
+    KTExtensibleStructCore< XBaseType >* KTExtensibleStructRegistrar< XBaseType, XDerivedType >::Create() const
+    {
+        return dynamic_cast< KTExtensibleStructCore< XBaseType >* >(new XDerivedType());
+    }
+
+    template< class XBaseType, class XDerivedType >
+    KTExtensibleStructCore< XBaseType >* KTExtensibleStructRegistrar< XBaseType, XDerivedType >::Create(KTExtensibleStructCore< XBaseType >* object) const
+    {
+        return dynamic_cast< KTExtensibleStructCore< XBaseType >* >(&object->template Of< XDerivedType >());
+    }
+
+} /* namespace Nymph */
+#endif /* KTEXTENSIBLESTRUCTFACTORY_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTLogger.hh b/Cpp/Library_v1/Utility/KTLogger.hh
new file mode 100644
index 0000000..adeee63
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTLogger.hh
@@ -0,0 +1,51 @@
+/*
+ * KTLogger.hh
+ * Based on KLogger.h, from KATRIN's Kasper
+ *
+ *  Created on: Jan 23, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTLOGGER_HH_
+#define KTLOGGER_HH_
+
+#include "logger.hh"
+
+/*
+ * The Nymph logger is now a simple rebranding of the Scarab logger
+ */
+
+// PUBLIC MACROS
+
+#define KTLOGGER(I,K)      static ::scarab::logger I(K);
+
+#define KTLOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
+#ifdef NDEBUG
+#define KTTRACE(...)
+#define KTDEBUG(...)
+#else
+#define KTTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
+#endif
+#define KTINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
+#define KTPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
+#define KTWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
+#define KTERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
+#define KTFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
+#define KTASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
+
+#define KTLOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#ifdef NDEBUG
+#define KTTRACE_ONCE(...)
+#define KTDEBUG_ONCE(...)
+#else
+#define KTTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#endif
+#define KTINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define KTFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+
+#endif /* KTLOGGER_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTMemberVariable.hh b/Cpp/Library_v1/Utility/KTMemberVariable.hh
new file mode 100644
index 0000000..f9bdec1
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTMemberVariable.hh
@@ -0,0 +1,98 @@
+/*
+ * KTMemberVariable.hh
+ *
+ *  Created on: Aug 5, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef KTMEMBERVARIABLE_HH_
+#define KTMEMBERVARIABLE_HH_
+
+/**
+ * Macros for class member variables
+ *
+ * In all cases remember to initialize the variables!
+ *
+ * For "normal" variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [type fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMBERVARIABLE
+ *  - MEMBERVARIABLE_NOSET
+ *  - MEMBERVARIABLE_STATIC
+ *  - MEMBERVARIABLE_STATIC_NOSET
+ *
+ * For variables accessed by reference
+ * Defines accessors [const type& MyVar() const], [type& MyVar()], and member variable [type fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMBERVARIABLE_REF
+ *  - MEMBERVARIABLE_REF_CONST
+ *  - MEMBERVARIABLE_REF_STATIC
+ *  - MEMBERVARIABLE_REF_STATIC_CONST
+ *
+ * For pointer variables
+ * Defines accessors [type* GetMyVar() const], [void SetMyVar( type* )], and member variable [type* fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMBERVARIABLE_PTR
+ *  - MEMBERVARIABLE_PTR_NOSET
+ *  - MEMBERVARIABLE_PTR_STATIC
+ *  - MEMBERVARIABLE_PTR_STATIC_NOSET
+ *
+ * For shared_ptr's
+ * Defines accessors [const std::shared_ptr< type > MyVar() const], [std::shared_ptr< type > MyVar()], and member variable [std::shared_ptr< type > fMyVar]
+ * The non-const function is not available if the _CONST macros are used
+ *  - MEMBERVARIABLE_SHARED_PTR
+ *  - MEMBERVARIABLE_SHARED_PTR_CONST
+ *  - MEMBERVARIABLE_SHARED_PTR_STATIC
+ *  - MEMBERVARIABLE_SHARED_PTR_STATIC_CONST
+ *
+ * For atomic variables
+ * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [std::atomic< type > fMyVar]
+ * The Set function is not available if the _NOSET macros are used
+ *  - MEMBERVARIABLE_ATOMIC
+ *  - MEMBERVARIABLE_ATOMIC_NOSET
+ *  - MEMBERVARIABLE_ATOMIC_STATIC
+ *  - MEMBERVARIABLE_ATOMIC_STATIC_NOSET
+ *
+ */
+
+#define set_prefix Set
+#define get_prefix Get
+#define var_prefix f
+#define static_prefix s
+
+#include "_camel_case_member_variables.hh"
+
+#define MEMBERVARIABLE                         camel_case_mv_accessible
+#define MEMBERVARIABLE_NOSET                   camel_case_mv_accessible_noset
+#define MEMBERVARIABLE_STATIC                  camel_case_mv_accessible_static
+#define MEMBERVARIABLE_STATIC_NOSET            camel_case_mv_accessible_static_noset
+#define MEMBERVARIABLE_MUTABLE                 camel_case_mv_accessible_mutable
+#define MEMBERVARIABLE_MUTABLE_NOSET           camel_case_mv_accessible_mutable_noset
+
+#define MEMBERVARIABLE_REF                     camel_case_mv_referrable
+#define MEMBERVARIABLE_REF_CONST               camel_case_mv_referrable_const
+#define MEMBERVARIABLE_REF_STATIC              camel_case_mv_referrable_static
+#define MEMBERVARIABLE_REF_MUTABLE             camel_case_mv_referrable_mutable
+#define MEMBERVARIABLE_REF_MUTABLE_CONST       camel_case_mv_referrable_mutable
+
+#define MEMBERVARIABLE_PTR                     camel_case_mv_assignable
+#define MEMBERVARIABLE_PTR_NOSET               camel_case_mv_assignable_noset
+#define MEMBERVARIABLE_PTR_STATIC              camel_case_mv_assignable_static
+#define MEMBERVARIABLE_PTR_STATIC_NOSET        camel_case_mv_assignable_static_noset
+#define MEMBERVARIABLE_PTR_MUTABLE             camel_case_mv_assignable_mutable
+#define MEMBERVARIABLE_PTR_MUTABLE_NOSET       camel_case_mv_assignable_mutable_noset
+
+#define MEMBERVARIABLE_SHARED_PTR              camel_case_mv_shared_ptr
+#define MEMBERVARIABLE_SHARED_PTR_CONST        camel_case_mv_shared_ptr_const
+#define MEMBERVARIABLE_SHARED_PTR_STATIC       camel_case_mv_shared_ptr_static
+#define MEMBERVARIABLE_SHARED_PTR_MUTABLE      camel_case_mv_shared_ptr_mutable
+#define MEMBERVARIABLE_SHARED_PTR_MUTABLE_CONST camel_case_mv_shared_ptr_mutable
+
+#define MEMBERVARIABLE_ATOMIC                  camel_case_mv_atomic
+#define MEMBERVARIABLE_ATOMIC_NOSET            camel_case_mv_atomic_noset
+#define MEMBERVARIABLE_ATOMIC_STATIC           camel_case_mv_atomic_static
+#define MEMBERVARIABLE_ATOMIC_STATIC_NOSET     camel_case_mv_atomic_static_noset
+#define MEMBERVARIABLE_ATOMIC_MUTABLE          camel_case_mv_atomic_mutable
+#define MEMBERVARIABLE_ATOMIC_MUTABLE_NOSET    camel_case_mv_atomic_mutable_noset
+
+#endif /* KTMEMBERVARIABLE_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTParamPybind.hh b/Cpp/Library_v1/Utility/KTParamPybind.hh
new file mode 100644
index 0000000..dbbf917
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTParamPybind.hh
@@ -0,0 +1,101 @@
+/*
+ * KTPyNymph.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone
+ */
+
+#include "param.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace Nymph
+{
+
+    void ExportParamPybind( pybind11::module& mod )
+    {
+        // param
+        pybind11::class_< scarab::param >( mod, "param" );
+
+        // param_value
+        pybind11::class_< scarab::param_value, scarab::param >( mod, "param_value" )
+            .def( pybind11::init< bool >() )
+            .def( pybind11::init< unsigned >() )
+            .def( pybind11::init< int >() )
+            .def( pybind11::init< double >() )
+            .def( pybind11::init< const std::string& >() )
+            .def( pybind11::init< const char* >() )
+
+            .def( "is_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::is_bool, "Return whether the param_value stores a boolean value" )
+            .def( "is_uint", (bool (scarab::param_value::*)() const) &scarab::param_value::is_uint, "Return whether the param_value stores an unsigned integer value" )
+            .def( "is_int", (bool (scarab::param_value::*)() const) &scarab::param_value::is_int, "Return whether the param_value stores a signed integer value" )
+            .def( "is_double", (bool (scarab::param_value::*)() const) &scarab::param_value::is_double, "Return whether the param_value stores a double value" )
+            .def( "is_string", (bool (scarab::param_value::*)() const) &scarab::param_value::is_string, "Return whether the param_value stores a string value" )
+
+            .def( "as_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::as_bool, "Get parameter value as a bool" )
+            .def( "as_uint", (unsigned (scarab::param_value::*)() const) &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
+            .def( "as_int", (int (scarab::param_value::*)() const) &scarab::param_value::as_int, "Get parameter value as a signed integer" )
+            .def( "as_double", (double (scarab::param_value::*)() const) &scarab::param_value::as_double, "Get parameter value as a float" )
+            .def( "as_string", (const std::string& (scarab::param_value::*)() const) &scarab::param_value::as_string, "Get parameter value as a string" )
+
+            .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set, "Set a bool value" )
+            .def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set<uint64_t>, "Set an unsigned integer value" )
+            .def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set<int64_t>, "Set a signed integer value" )
+            .def( "set", (void (scarab::param_value::*)(double)) &scarab::param_value::set, "Set an float value" )
+            .def( "set", (void (scarab::param_value::*)(std::string)) &scarab::param_value::set, "Set an string value" )
+            ;
+
+        // param_node
+        pybind11::class_< scarab::param_node, scarab::param >( mod, "param_node" )
+            .def( pybind11::init<>() )
+            
+            .def( "add",(bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,
+                    "Add a param object to a node" )
+
+            .def( "at", (scarab::param& (scarab::param_node::*)(const std::string&)) &scarab::param_node::operator[],
+                    "Get the param object for a given key" )
+
+            // Get value of the parameter, bringing along the default value
+            .def( "get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
+                    "Get parameter node value as a bool" )
+            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string&, unsigned) const) &scarab::param_node::get_value<uint>,
+                    "Get parameter node value as an unsigned integer" )
+            .def( "get_value", (int (scarab::param_node::*)(const std::string&, int) const) &scarab::param_node::get_value<int>,
+                    "Get parameter node value as a signed integer" )
+            .def( "get_value", (double (scarab::param_node::*)(const std::string&, double) const) &scarab::param_node::get_value<double>,
+                    "Get parameter node value as a float" )
+            .def( "get_value", (std::string (scarab::param_node::*)(const std::string&, const std::string& ) const) &scarab::param_node::get_value,
+                    "Get parameter node value as a string" )
+            ;
+
+        // param_array
+        pybind11::class_< scarab::param_array, scarab::param >( mod, "param_array" )
+            .def( pybind11::init<>() )
+
+            .def( "size", (unsigned (scarab::param_array::*)() const) &scarab::param_array::size,
+                    "Returns the size of the array" )
+
+            .def( "resize", (void (scarab::param_array::*)(unsigned)) &scarab::param_array::resize,
+                    "Sets the size of the array; if smaller than the current size, the extra elements are deleted")
+
+            .def( "assign", (void (scarab::param_array::*)(unsigned, const scarab::param&)) &scarab::param_array::assign,
+                    "Add a param object to the specified index in a array" )
+
+            .def( "at", (scarab::param& (scarab::param_array::*)(unsigned)) &scarab::param_array::operator[],
+                    "Get the param object for a given index" )
+
+            // Get value of the parameter, bringing along the default value
+            .def( "get_value", (bool (scarab::param_array::*)(unsigned, bool) const) &scarab::param_array::get_value<bool>,
+                    "Get parameter array value as a bool" )
+            .def( "get_value", (unsigned (scarab::param_array::*)(unsigned, unsigned) const) &scarab::param_array::get_value<uint>,
+                    "Get parameter array value as an unsigned integer" )
+            .def( "get_value", (int (scarab::param_array::*)(unsigned, int) const) &scarab::param_array::get_value<int>,
+                    "Get parameter array value as a signed integer" )
+            .def( "get_value", (double (scarab::param_array::*)(unsigned, double) const) &scarab::param_array::get_value<double>,
+                    "Get parameter array value as a float" )
+            .def( "get_value", (std::string (scarab::param_array::*)(unsigned, const std::string& ) const) &scarab::param_array::get_value,
+                    "Get parameter array value as a string" )
+            ;
+    }
+    
+} /* namespace Nymph */
diff --git a/Cpp/Library_v1/Utility/KTPythonMacros.hh b/Cpp/Library_v1/Utility/KTPythonMacros.hh
new file mode 100644
index 0000000..b9567b1
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTPythonMacros.hh
@@ -0,0 +1,23 @@
+/*
+ * KTPythonMacros.hh
+ *
+ * Created on: April 26, 2017
+ *     Author: laroque
+ */
+
+#ifndef KTPYTHONMACROS_HH_
+#define KTPYTHONMACROS_HH_
+
+#define PROPERTYMEMBER( CLASS, MEMBER ) \
+    .add_property( #MEMBER, &CLASS::Get##MEMBER, &CLASS::Set##MEMBER )
+
+#define PROPERTYMEMBER_NOSET( CLASS, MEMBER ) \
+    .add_property( #MEMBER, &CLASS::Get##MEMBER, boost::python::no_set )
+
+#define PROPERTYMEMBER_RETPOLICY( CLASS, MEMBER, RETPOLICY ) \
+    .add_property( #MEMBER, make_function( &CLASS::Get##MEMBER, return_value_policy<RETPOLICY>()), &CLASS::Set##MEMBER )
+
+#define PROPERTYMEMBER_RETPOLICY_NOSET( CLASS, MEMBER, RETPOLICY ) \
+    .add_property( #MEMBER, make_function( &CLASS::Get##MEMBER, return_value_policy<RETPOLICY>()), boost::python::no_set )
+
+#endif /* KTPYTHONMACROS_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTTIFactory.hh b/Cpp/Library_v1/Utility/KTTIFactory.hh
new file mode 100644
index 0000000..294bafe
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTTIFactory.hh
@@ -0,0 +1,364 @@
+/*
+ * KTTIFactory.hh
+ *
+ *  Created on: Jan 2, 2013
+ *      Author: nsoblath
+ *
+ *      Type-Indexed Factory and Registrars
+ */
+
+#ifndef KTTIFACTORY_HH_
+#define KTTIFACTORY_HH_
+
+#include "KTLogger.hh"
+
+#include "singleton.hh"
+
+#include <map>
+#include <typeinfo>
+
+namespace Nymph
+{
+    KTLOGGER(utillog_ti_factory, "KTTIFactory");
+
+    //********************
+    // Class definitions
+    //********************
+
+    template< class XBaseType, typename ... XArgs >
+    class KTTIFactory;
+
+    template< class XBaseType, typename ... XArgs >
+    class KTTIRegistrarBase
+    {
+        public:
+            KTTIRegistrarBase() {}
+            virtual ~KTTIRegistrarBase() {}
+
+        public:
+            friend class KTTIFactory< XBaseType, XArgs... >;
+
+        protected:
+            virtual XBaseType* Create(XArgs ... args) const = 0;
+
+    };
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    class KTTIRegistrar : public KTTIRegistrarBase< XBaseType, XArgs... >
+    {
+        public:
+            KTTIRegistrar();
+            virtual ~KTTIRegistrar();
+
+        protected:
+            void Register() const;
+
+            XBaseType* Create(XArgs ... args) const;
+
+    };
+
+
+    template< class XBaseType, typename ... XArgs >
+    class KTTIFactory : public scarab::singleton< KTTIFactory< XBaseType, XArgs... > >
+    {
+        public:
+            struct CompareTypeInfo
+            {
+                bool operator() (const std::type_info* lhs, const std::type_info* rhs)
+                {
+                    return lhs->before(*rhs);
+                }
+            };
+
+        public:
+            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType, XArgs... >* > FactoryMap;
+            typedef typename FactoryMap::value_type FactoryEntry;
+            typedef typename FactoryMap::iterator FactoryIt;
+            typedef typename FactoryMap::const_iterator FactoryCIt;
+
+        public:
+            template< class XDerivedType >
+            XBaseType* Create(XArgs ... args);
+
+            XBaseType* Create(const FactoryCIt& iter, XArgs ... args);
+
+            template< class XDerivedType >
+            void Register(const KTTIRegistrarBase< XBaseType, XArgs... >* registrar);
+
+            FactoryCIt GetFactoryMapBegin() const;
+            FactoryCIt GetFactoryMapEnd() const;
+
+        protected:
+            FactoryMap* fMap;
+
+
+        protected:
+            friend class scarab::singleton< KTTIFactory >;
+            friend class scarab::destroyer< KTTIFactory >;
+            KTTIFactory();
+            ~KTTIFactory();
+    };
+
+    //*****************************************
+    // Partial specialization for empty XArgs
+    //*****************************************
+
+    template< class XBaseType >
+    class KTTIRegistrarBase< XBaseType, void >
+    {
+        public:
+            KTTIRegistrarBase() {}
+            virtual ~KTTIRegistrarBase() {}
+
+        public:
+            friend class KTTIFactory< XBaseType >;
+
+        protected:
+            virtual XBaseType* Create() const = 0;
+
+    };
+
+    template< class XBaseType, class XDerivedType >
+    class KTTIRegistrar< XBaseType, XDerivedType, void > : public KTTIRegistrarBase< XBaseType, void >
+    {
+        public:
+            KTTIRegistrar();
+            virtual ~KTTIRegistrar();
+
+        protected:
+            void Register() const;
+
+            XBaseType* Create() const;
+
+    };
+
+
+    template< class XBaseType >
+    class KTTIFactory< XBaseType, void > : public scarab::singleton< KTTIFactory< XBaseType, void > >
+    {
+        public:
+            struct CompareTypeInfo
+            {
+                bool operator() (const std::type_info* lhs, const std::type_info* rhs)
+                {
+                    return lhs->before(*rhs);
+                }
+            };
+
+        public:
+            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType, void >* > FactoryMap;
+            typedef typename FactoryMap::value_type FactoryEntry;
+            typedef typename FactoryMap::iterator FactoryIt;
+            typedef typename FactoryMap::const_iterator FactoryCIt;
+
+        public:
+            template< class XDerivedType >
+            XBaseType* Create();
+
+            XBaseType* Create(const FactoryCIt& iter);
+
+            template< class XDerivedType >
+            void Register(const KTTIRegistrarBase< XBaseType, void >* registrar);
+
+            FactoryCIt GetFactoryMapBegin() const;
+            FactoryCIt GetFactoryMapEnd() const;
+
+        protected:
+            FactoryMap* fMap;
+
+
+        protected:
+            friend class scarab::singleton< KTTIFactory >;
+            friend class scarab::destroyer< KTTIFactory >;
+            KTTIFactory();
+            ~KTTIFactory();
+    };
+
+
+    //******************
+    // Implementations
+    //******************
+
+    // Factory
+
+    template< class XBaseType, typename ... XArgs >
+    template< class XDerivedType >
+    XBaseType* KTTIFactory< XBaseType, XArgs... >::Create(XArgs ... args)
+    {
+        FactoryCIt it = fMap->find(&typeid(XDerivedType));
+        if (it == fMap->end())
+        {
+            KTERROR(utillog_ti_factory, "Did not find factory with type <" << typeid(XDerivedType).name() << ">.");
+            return NULL;
+        }
+
+        return it->second->Create(args...);
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    XBaseType* KTTIFactory< XBaseType, XArgs... >::Create(const FactoryCIt& iter, XArgs ... args)
+    {
+        return iter->second->Create(args...);
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    template< class XDerivedType >
+    void KTTIFactory< XBaseType, XArgs... >::Register(const KTTIRegistrarBase< XBaseType, XArgs... >* registrar)
+    {
+        // A local (static) logger is created inside this function to avoid static initialization order problems
+        KTLOGGER(utillog_ti_factory_reg, "KTTIFactory-Register");
+
+        FactoryCIt it = fMap->find(&typeid(XDerivedType));
+        if (it != fMap->end())
+        {
+            KTERROR(utillog_ti_factory_reg, "Already have factory registered for type <" << typeid(XDerivedType).name() << ">.");
+            return;
+        }
+        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType, XArgs... >* >(&typeid(XDerivedType), registrar));
+        KTDEBUG(utillog_ti_factory_reg, "Registered a factory for class type " << typeid(XDerivedType).name() << ", factory #" << fMap->size()-1);
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    KTTIFactory< XBaseType, XArgs... >::KTTIFactory() :
+        fMap(new FactoryMap())
+    {}
+
+    template< class XBaseType, typename ... XArgs >
+    KTTIFactory< XBaseType, XArgs... >::~KTTIFactory()
+    {
+        delete fMap;
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    typename KTTIFactory< XBaseType, XArgs... >::FactoryCIt KTTIFactory< XBaseType, XArgs... >::GetFactoryMapBegin() const
+    {
+        return fMap->begin();
+    }
+
+    template< class XBaseType, typename ... XArgs >
+    typename KTTIFactory< XBaseType, XArgs... >::FactoryCIt KTTIFactory< XBaseType, XArgs... >::GetFactoryMapEnd() const
+    {
+        return fMap->end();
+    }
+
+    // Registrar
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::KTTIRegistrar() :
+            KTTIRegistrarBase< XBaseType, XArgs... >()
+    {
+        Register();
+    }
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::~KTTIRegistrar()
+    {}
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    void KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::Register() const
+    {
+        KTTIFactory< XBaseType, XArgs... >::get_instance()->template Register<XDerivedType>(this);
+        return;
+    }
+
+    template< class XBaseType, class XDerivedType, typename ... XArgs >
+    XBaseType* KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::Create(XArgs ... args) const
+    {
+        return dynamic_cast< XBaseType* >(new XDerivedType(args...));
+    }
+
+    //*******************************************
+    // Implementations (partial specialization)
+    //*******************************************
+
+    // Factory
+
+    template< class XBaseType >
+    template< class XDerivedType >
+    XBaseType* KTTIFactory< XBaseType, void >::Create()
+    {
+        FactoryCIt it = fMap->find(&typeid(XDerivedType));
+        if (it == fMap->end())
+        {
+            KTERROR(utillog_ti_factory, "Did not find factory with type <" << typeid(XDerivedType).name() << ">.");
+            return NULL;
+        }
+
+        return it->second->Create();
+    }
+
+    template< class XBaseType >
+    XBaseType* KTTIFactory< XBaseType, void >::Create(const FactoryCIt& iter)
+    {
+        return iter->second->Create();
+    }
+
+    template< class XBaseType >
+    template< class XDerivedType >
+    void KTTIFactory< XBaseType, void >::Register(const KTTIRegistrarBase< XBaseType, void >* registrar)
+    {
+        // A local (static) logger is created inside this function to avoid static initialization order problems
+        KTLOGGER(utillog_ti_factory_reg, "KTTIFactory-Register");
+
+        FactoryCIt it = fMap->find(&typeid(XDerivedType));
+        if (it != fMap->end())
+        {
+            KTERROR(utillog_ti_factory_reg, "Already have factory registered for type <" << typeid(XDerivedType).name() << ">.");
+            return;
+        }
+        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType, void >* >(&typeid(XDerivedType), registrar));
+        KTDEBUG(utillog_ti_factory_reg, "Registered a factory for class type " << typeid(XDerivedType).name() << ", factory #" << fMap->size()-1);
+    }
+
+    template< class XBaseType >
+    KTTIFactory< XBaseType, void >::KTTIFactory() :
+        fMap(new FactoryMap())
+    {}
+
+    template< class XBaseType >
+    KTTIFactory< XBaseType, void >::~KTTIFactory()
+    {
+        delete fMap;
+    }
+
+    template< class XBaseType >
+    typename KTTIFactory< XBaseType, void >::FactoryCIt KTTIFactory< XBaseType, void >::GetFactoryMapBegin() const
+    {
+        return fMap->begin();
+    }
+
+    template< class XBaseType >
+    typename KTTIFactory< XBaseType, void >::FactoryCIt KTTIFactory< XBaseType, void >::GetFactoryMapEnd() const
+    {
+        return fMap->end();
+    }
+
+    // Registrar
+
+    template< class XBaseType, class XDerivedType >
+    KTTIRegistrar< XBaseType, XDerivedType, void >::KTTIRegistrar() :
+            KTTIRegistrarBase< XBaseType, void >()
+    {
+        Register();
+    }
+
+    template< class XBaseType, class XDerivedType >
+    KTTIRegistrar< XBaseType, XDerivedType, void >::~KTTIRegistrar()
+    {}
+
+    template< class XBaseType, class XDerivedType >
+    void KTTIRegistrar< XBaseType, XDerivedType, void >::Register() const
+    {
+        KTTIFactory< XBaseType, void >::get_instance()->template Register<XDerivedType>(this);
+        return;
+    }
+
+    template< class XBaseType, class XDerivedType >
+    XBaseType* KTTIRegistrar< XBaseType, XDerivedType, void >::Create() const
+    {
+        return dynamic_cast< XBaseType* >(new XDerivedType());
+    }
+
+
+} /* namespace Nymph */
+#endif /* KTTIFACTORY_HH_ */
diff --git a/Cpp/Library_v1/Utility/KTTime.cc b/Cpp/Library_v1/Utility/KTTime.cc
new file mode 100644
index 0000000..2861425
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTTime.cc
@@ -0,0 +1,93 @@
+/*
+ * KTTime.cc
+ *
+ *  Created on: Oct 08, 2014
+ *      Author: nsoblath
+ *
+ *      Copied from libthorax's thorax_time.c
+ */
+
+#include "KTTime.hh"
+
+char eDateTimeFormat[] = "%FT%TZ";
+
+#ifdef __MACH__
+double eTimebase = 0.0;
+uint64_t eTimeStart = 0;
+#endif
+
+int GetTimeMonotonic(struct timespec* time)
+{
+#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+    if (! eTimeStart)
+    {
+        mach_timebase_info_data_t tb = { .numer = 0, .denom = 1 };
+        mach_timebase_info(&tb);
+        eTimebase = tb.numer;
+        eTimebase /= tb.denom;
+        eTimeStart = mach_absolute_time();
+    }
+    double diff = (mach_absolute_time() - eTimeStart) * eTimebase;
+    time->tv_sec = diff * MACNANO;
+    time->tv_nsec = diff - (time->tv_sec * MACGIGA);
+    return 0;
+#else
+    return clock_gettime( CLOCK_MONOTONIC, time );
+#endif
+}
+
+int GetTimeCurrent(struct timespec* time)
+{
+#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
+    if (! eTimeStart)
+    {
+        mach_timebase_info_data_t tb = { .numer = 0, .denom = 1 };
+        mach_timebase_info(&tb);
+        eTimebase = tb.numer;
+        eTimebase /= tb.denom;
+        eTimeStart = mach_absolute_time();
+    }
+    double diff = (mach_absolute_time() - eTimeStart) * eTimebase;
+    time->tv_sec = diff * MACNANO;
+    time->tv_nsec = diff - (time->tv_sec * MACGIGA);
+    return 0;
+#else
+    return clock_gettime(CLOCK_PROCESS_CPUTIME_ID, time);
+#endif
+
+}
+
+uint64_t TimeToNSec(struct timespec time)
+{
+    return (long long int)time.tv_sec * (long long int)NSEC_PER_SEC + (long long int)time.tv_nsec;
+}
+
+double TimeToSec(struct timespec time)
+{
+    return (double)time.tv_sec + (double)time.tv_nsec / (double)NSEC_PER_SEC;
+}
+
+void TimeDiff(struct timespec start, struct timespec end, struct timespec* diff)
+{
+    if ((end.tv_nsec - start.tv_nsec < 0))
+    {
+        diff->tv_sec = end.tv_sec - start.tv_sec - 1;
+        diff->tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
+    }
+    else
+    {
+        diff->tv_sec = end.tv_sec - start.tv_sec;
+        diff->tv_nsec = end.tv_nsec - start.tv_nsec;
+    }
+    return;
+}
+
+size_t GetTimeAbsoluteStr(char* ptr)
+{
+    time_t raw_time;
+    struct tm* processed_time;
+
+    time(&raw_time);
+    processed_time = gmtime(&raw_time);
+    return strftime(ptr, 512, eDateTimeFormat, processed_time);
+}
diff --git a/Cpp/Library_v1/Utility/KTTime.hh b/Cpp/Library_v1/Utility/KTTime.hh
new file mode 100644
index 0000000..50e678e
--- /dev/null
+++ b/Cpp/Library_v1/Utility/KTTime.hh
@@ -0,0 +1,53 @@
+/*
+ * KTTime.hh
+ *
+ *  Created on: Oct 08, 2014
+ *      Author: nsoblath
+ *
+ *      Copied from libthorax's thorax_time.h
+ */
+
+#ifndef KTTIME_HH_
+#define KTTIME_HH_
+
+#include <inttypes.h>
+#include <sys/time.h>
+#include <time.h>
+
+#ifndef NSEC_PER_SEC
+#define NSEC_PER_SEC 1000000000
+#endif
+
+#ifndef SEC_PER_NSEC
+#define SEC_PER_NSEC 1.e-9
+#endif
+
+#ifdef __MACH__
+#include <mach/mach_time.h>
+
+#ifndef MACNANO
+#define MACNANO (+1.0E-9)
+#define MACGIGA UINT64_C(1000000000)
+#endif // MACNANO
+
+extern double eTimebase;
+extern uint64_t eTimestart;
+#endif // __MACH__
+
+
+extern char eDateTimeFormat[];
+
+
+int GetTimeMonotonic(struct timespec* time);
+
+int GetTimeCurrent(struct timespec* time);
+
+uint64_t TimeToNSec(struct timespec time);
+
+double TimeToSec(struct timespec time);
+
+void TimeDiff(struct timespec start, struct timespec end, struct timespec* diff);
+
+size_t GetTimeAbsoluteStr(char* ptr);
+
+#endif // KTTIME_HH_
diff --git a/Cpp/Templates/KTProcessorTemplate.cc b/Cpp/Templates/KTProcessorTemplate.cc
new file mode 100644
index 0000000..13d53fc
--- /dev/null
+++ b/Cpp/Templates/KTProcessorTemplate.cc
@@ -0,0 +1,46 @@
+/*
+ * KTProcessorTemplate.cc
+ *
+ *  Created on: [date]
+ *      Author: [name]
+ */
+
+#include "KTProcessorTemplate.hh"
+
+#include "KTLogger.hh"
+#include "KTNOFactory.hh"
+#include "scarab::param.hh"
+
+
+namespace Nymph
+{
+    KTLOGGER([logger], "KTProcessorTemplate");
+
+    // Register the processor
+    KT_REGISTER_PROCESSOR(KTProcessorTemplate, "[config-name]");
+
+    KTProcessorTemplate::KTProcessorTemplate(const std::string& name) :
+            KTProcessor(name)
+            // initialize all member variables
+            // initialize signals:
+            // f[SomeName]Signal("[signal-name]", this)
+            // initialize slots:
+            // fHeaderSlot("header", this, &KTProcessorTemplate::[function to call with header]),
+            // f[SomeName]Slot("[slot-name]", this, &KTProcessorTemplate::[function to call], &f[SomeName]Signal)
+    {
+    }
+
+    KTProcessorTemplate::~KTProcessorTemplate()
+    {
+    }
+
+    bool KTProcessorTemplate::Configure(const scarab::param_node& node)
+    {
+        // Configure parameters
+
+        return true;
+    }
+
+    // All the normal stuff goes here
+
+} /* namespace Nymph */
diff --git a/Cpp/Templates/KTProcessorTemplate.hh b/Cpp/Templates/KTProcessorTemplate.hh
new file mode 100644
index 0000000..593be45
--- /dev/null
+++ b/Cpp/Templates/KTProcessorTemplate.hh
@@ -0,0 +1,85 @@
+/**
+ @file KTProcessorTemplate.hh
+ @brief Contains KTProcessorTemplate
+ @details [does something]
+ @author: [name]
+ @date: [date]
+ */
+
+#ifndef KTPROCESSORTEMPLATE_HH_
+#define KTPROCESSORTEMPLATE_HH_
+
+#include "KTProcessor.hh"
+
+#include "KTSlot.hh"
+
+
+
+namespace Nymph
+{
+    // Forward declare whatever classes you can
+    // input data type . . .
+    // output data type . . .
+    class scarab::param_node;
+
+    /*!
+     @class KTProcessorTemplate
+     @author [name]
+
+     @brief [brief class description]
+
+     @details
+     [detailed class description]
+
+     Configuration name: "[config-name]"
+
+     Available configuration values:
+     - "some-name": [type] -- [what it does]
+
+     Slots:
+     - "[slot-name]": void (KTDataPtr) -- [what it does]; Requires [input data type]; Adds [output data type]; Emits signal "[signal-name]"
+
+     Signals:
+     - "[signal-name]": void (KTDataPtr) -- Emitted upon [whatever was done]; Guarantees [output data type].
+    */
+
+    class KTProcessorTemplate : public KTProcessor
+    {
+        public:
+            KTProcessorTemplate(const std::string& name = "[config-name]");
+            virtual ~KTProcessorTemplate();
+
+            bool Configure(const scarab::param_node& node);
+
+            // Getters and setters for configurable parameters go here
+        private:
+            // configurable member parameters go here
+
+        public:
+            // Functions to do the job of the processor go here
+            // These allow the processor to be used on data objects manually
+
+
+        private:
+            // Perhaps there are some non-public helper functions?
+
+            // And then any non-configurable member variables
+
+            //***************
+            // Signals
+            //***************
+
+        private:
+            KTSignalData f[SomeName]Signal;
+
+            //***************
+            // Slots
+            //***************
+
+        private:
+            KTSlotDataOneType< [Input Data Type] > f[SomeName]Slot;
+
+    };
+}
+ /* namespace Nymph */
+#endif /* KTPROCESSORTEMPLATE_HH_ */
diff --git a/Cpp/Templates/MainCMakeLists.txt b/Cpp/Templates/MainCMakeLists.txt
new file mode 100644
index 0000000..0c8fa6b
--- /dev/null
+++ b/Cpp/Templates/MainCMakeLists.txt
@@ -0,0 +1,24 @@
+# CMakeLists for [YOUR PACKAGE]
+# Author: [YOU]
+
+cmake_minimum_required (VERSION 3.0) # or newer
+
+# Define the project
+project ([YOUR PROJECT NAME] VERSION 1.11.0 )
+
+# Import Nymph features
+include (nymph/cmake/Nymph.cmake)
+nymph_prepare_project ()
+
+
+[DEAL WITH DEPENDENCIES]
+
+
+nymph_build_core_library()
+
+[ADD YOUR SUBDIRECTORIES HERE]
+
+nymph_build_core_executables()
+
+
+[WHATEVER ELSE YOU MIGHT NEED TO DO]
\ No newline at end of file
diff --git a/Python/nymph/__init__.py b/Python/nymph/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Testing/Cpp/Catch/catch.hpp b/Testing/Cpp/Catch/catch.hpp
new file mode 100644
index 0000000..db1fed3
--- /dev/null
+++ b/Testing/Cpp/Catch/catch.hpp
@@ -0,0 +1,17966 @@
+/*
+ *  Catch v2.13.8
+ *  Generated: 2022-01-03 21:20:09.589503
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 13
+#define CATCH_VERSION_PATCH 8
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+     // Because REQUIREs trigger GCC's -Wparentheses, and because still
+     // supported version of g++ have only buggy support for _Pragmas,
+     // Wparentheses have to be suppressed globally.
+#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#  define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+#  define CATCH_CONFIG_EXTERNAL_INTERFACES
+#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#    undef CATCH_CONFIG_DISABLE_MATCHERS
+#  endif
+#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+// See e.g.:
+// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
+#ifdef __APPLE__
+#  include <TargetConditionals.h>
+#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
+      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
+#    define CATCH_PLATFORM_MAC
+#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
+#    define CATCH_PLATFORM_IPHONE
+#  endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+    unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#endif
+
+// Only GCC compiler should be used in this block, so other compilers trying to
+// mask themselves as GCC should be ignored.
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
+
+#endif
+
+#if defined(__clang__)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
+// which results in calls to destructors being emitted for each temporary,
+// without a matching initialization. In practice, this can result in something
+// like `std::string::~string` being called on an uninitialized value.
+//
+// For example, this code will likely segfault under IBM XL:
+// ```
+// REQUIRE(std::string("12") + "34" == "1234")
+// ```
+//
+// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
+#  if !defined(__ibmxl__) && !defined(__CUDACC__)
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
+#  endif
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#if defined(_MSC_VER)
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#    define CATCH_CONFIG_COLOUR_NONE
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#    endif // MSVC_TRADITIONAL
+
+// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
+#  endif // __clang__
+
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// DJGPP
+#ifdef __DJGPP__
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    include <cstddef>
+  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
+  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #    endif
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+#   define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#  define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+
+// The goal of this macro is to avoid evaluation of the arguments, but
+// still have the compiler warn on problems inside...
+#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
+#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+
+    protected:
+        NonCopyable();
+        virtual ~NonCopyable();
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+        :   file( _file ),
+            line( _line )
+        {}
+
+        SourceLineInfo( SourceLineInfo const& other )            = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
+        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
+        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
+
+        bool empty() const noexcept { return file[0] == '\0'; }
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // Bring in operator<< from global namespace into Catch namespace
+    // This is necessary because the overload of operator<< above makes
+    // lookup stop at namespace Catch
+    using ::operator<<;
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() const;
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestInvoker {
+        virtual void invoke () const = 0;
+        virtual ~ITestInvoker();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+#include <cassert>
+
+namespace Catch {
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
+
+    private:
+        static constexpr char const* const s_empty = "";
+
+        char const* m_start = s_empty;
+        size_type m_size = 0;
+
+    public: // construction
+        constexpr StringRef() noexcept = default;
+
+        StringRef( char const* rawChars ) noexcept;
+
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
+
+    public: // operators
+        auto operator == ( StringRef const& other ) const noexcept -> bool;
+        auto operator != (StringRef const& other) const noexcept -> bool {
+            return !(*this == other);
+        }
+
+        auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns the current start pointer. If the StringRef is not
+        // null-terminated, throws std::domain_exception
+        auto c_str() const -> char const*;
+
+    public: // substrings and searches
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
+
+        // Returns the current start pointer. May not be null-terminated.
+        auto data() const noexcept -> char const*;
+
+        constexpr auto isNullTerminated() const noexcept -> bool {
+            return m_start[m_size] == '\0';
+        }
+
+    public: // iterators
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+    };
+
+    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
+// end catch_stringref.h
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+namespace Catch {
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template <typename> struct true_given : std::true_type {};
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
+        template <typename...>
+        std::false_type static test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here.
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
+#else
+    // Keep ::type here because we still support C++11
+    template <typename Func, typename... U>
+    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+// end catch_meta.hpp
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+    ~AutoReg();
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    int index = 0;                                    \
+                    using expander = int[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                int index = 0;                                    \
+                using expander = int[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+
+        // We want to delete this constructor but a compiler bug in 4.8 means
+        // the struct is then treated as non-aggregate
+        //AssertionInfo() = delete;
+    };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    class StringRef;
+
+    struct IStream {
+        virtual ~IStream();
+        virtual std::ostream& stream() const = 0;
+    };
+
+    auto makeStream( StringRef const &filename ) -> IStream const*;
+
+    class ReusableStringStream : NonCopyable {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        auto str() const -> std::string;
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+        auto get() -> std::ostream& { return *m_oss; }
+    };
+}
+
+// end catch_stream.h
+// start catch_interfaces_enum_values_registry.h
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    struct IMutableEnumValuesRegistry {
+        virtual ~IMutableEnumValuesRegistry();
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+// end catch_interfaces_enum_values_registry.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+namespace Catch {
+    namespace Detail {
+
+        extern const std::string unprintableString;
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename Stream, typename U>
+            static auto test(int)
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string>::type convertUnstreamable( T const& ) {
+            return Detail::unprintableString;
+        }
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string>::type convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+        template<typename T>
+        typename std::enable_if<
+            std::is_enum<T>::value
+        , std::string>::type convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+    // If we decide for C++14, change these to enable_if_ts
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif
+
+    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+    //      while keeping string semantics?
+    template<int SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return ::Catch::Detail::stringify(std::string{ str });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b);
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char c);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char c);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t);
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+        static int precision;
+    };
+
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+        static int precision;
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator, typename Sentinel = InputIterator>
+        std::string rangeToString(InputIterator first, Sentinel last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+#ifdef __OBJC__
+    template<>
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString * nsstring) {
+            if (!nsstring)
+                return "nil";
+            return std::string("@") + [nsstring UTF8String];
+        }
+    };
+    template<>
+    struct StringMaker<NSObject*> {
+        static std::string convert(NSObject* nsObject) {
+            return ::Catch::Detail::stringify([nsObject description]);
+        }
+
+    };
+    namespace Detail {
+        inline std::string stringify( NSString* nsstring ) {
+            return StringMaker<NSString*>::convert( nsstring );
+        }
+
+    } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            ReusableStringStream rss;
+            if (optional.has_value()) {
+                rss << ::Catch::Detail::stringify(*optional);
+            } else {
+                rss << "{ }";
+            }
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    // Import begin/ end from std here
+    using std::begin;
+    using std::end;
+
+    namespace detail {
+        template <typename...>
+        struct void_type {
+            using type = void;
+        };
+
+        template <typename T, typename = void>
+        struct is_range_impl : std::false_type {
+        };
+
+        template <typename T>
+        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
+        };
+    } // namespace detail
+
+    template <typename T>
+    struct is_range : detail::is_range_impl<T> {
+    };
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, int SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+    Catch::ReusableStringStream rss;
+    rss << '[' << Ratio::num << '/'
+        << Ratio::den << ']';
+    return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+    static std::string symbol();
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+namespace Catch {
+
+    struct ITransientExpression {
+        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        auto getResult() const -> bool { return m_result; }
+        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+        ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        // We don't actually need a virtual destructor, but many static analysers
+        // complain if it's not here :-(
+        virtual ~ITransientExpression();
+
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
+            m_lhs( lhs )
+        {}
+    };
+
+    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+    template<typename LhsT, typename RhsT>
+    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+    template<typename T>
+    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+    template<typename LhsT, typename RhsT>
+    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+    template<typename T>
+    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+        template<typename RhsT>
+        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+        }
+        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs == rhs, m_lhs, "==", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+        }
+        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs != rhs, m_lhs, "!=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+        }
+        template<typename RhsT>
+        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+        }
+        template<typename RhsT>
+        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+        }
+        template<typename RhsT>
+        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+        }
+        template <typename RhsT>
+        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
+        }
+        template <typename RhsT>
+        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
+        }
+        template <typename RhsT>
+        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    void handleExpression( ITransientExpression const& expr );
+
+    template<typename T>
+    void handleExpression( ExprLhs<T> const& expr ) {
+        handleExpression( expr.makeUnaryExpr() );
+    }
+
+    struct Decomposer {
+        template<typename T>
+        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<T const&>{ lhs };
+        }
+
+        auto operator <=( bool value ) -> ExprLhs<bool> {
+            return ExprLhs<bool>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+#include <chrono>
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct MessageBuilder;
+    struct Counts;
+    struct AssertionReaction;
+    struct SourceLineInfo;
+
+    struct ITransientExpression;
+    struct IGeneratorTracker;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo;
+    template <typename Duration = std::chrono::duration<double, std::nano>>
+    struct BenchmarkStats;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& name ) = 0;
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( std::string const& error ) = 0;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+    struct TestFailureException{};
+    struct AssertionResultData;
+    struct IResultCapture;
+    class RunContext;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated );
+        LazyExpression( LazyExpression const& other );
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const;
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef const& macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+        void setCompleted();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const;
+        bool operator < ( MessageInfo const& other ) const;
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( StringRef const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type );
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+        bool m_moved;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture = getResultCapture();
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
+    };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { \
+        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            static_cast<void>(__VA_ARGS__); \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+    varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::size_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::size_t passed = 0;
+        std::size_t failed = 0;
+        std::size_t failedButOk = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        int error = 0;
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name );
+
+        // Deprecated
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+        std::string name;
+        std::string description; // !Deprecated: this will always be empty
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+    auto getEstimatedClockResolution() -> uint64_t;
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_section.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+    struct IMutableEnumValuesRegistry;
+
+    class StartupExceptionRegistry;
+
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
+
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+        static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    struct IExceptionTranslator;
+    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                return "";
+#else
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+#endif
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+        // Validates the new margin (margin >= 0)
+        // out-of-line to avoid including stdexcept in the header
+        void setMargin(double margin);
+        // Validates the new epsilon (0 < epsilon < 1)
+        // out-of-line to avoid including stdexcept in the header
+        void setEpsilon(double epsilon);
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T const& value ) const {
+            Approx approx( static_cast<double>(value) );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T const& newEpsilon ) {
+            double epsilonAsDouble = static_cast<double>(newEpsilon);
+            setEpsilon(epsilonAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T const& newMargin ) {
+            double marginAsDouble = static_cast<double>(newMargin);
+            setMargin(marginAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val);
+    Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+    static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    //! Returns a new string without whitespace at the start/end
+    std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            MatcherUntypedBase() = default;
+            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+            std::string toString() const;
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        };
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
+        };
+#endif
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+
+        template<typename T>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<T> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename T>
+        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<T>() && *this && other;
+        }
+        template<typename T>
+        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<T>() || *this || other;
+        }
+        template<typename T>
+        MatchNotOf<T> MatcherBase<T>::operator ! () const {
+            return MatchNotOf<T>( *this );
+        }
+
+    } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_exception.hpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+class ExceptionMessageMatcher : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+} // namespace Exception
+
+Exception::ExceptionMessageMatcher Message(std::string const& message);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_exception.hpp
+// start catch_matchers_floating.h
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Floating {
+
+        enum class FloatingPointKind : uint8_t;
+
+        struct WithinAbsMatcher : MatcherBase<double> {
+            WithinAbsMatcher(double target, double margin);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_margin;
+        };
+
+        struct WithinUlpsMatcher : MatcherBase<double> {
+            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            uint64_t m_ulps;
+            FloatingPointKind m_type;
+        };
+
+        // Given IEEE-754 format for floats and doubles, we can assume
+        // that float -> double promotion is lossless. Given this, we can
+        // assume that if we do the standard relative comparison of
+        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+        // the same result if we do this for floats, as if we do this for
+        // doubles that were promoted from floats.
+        struct WithinRelMatcher : MatcherBase<double> {
+            WithinRelMatcher(double target, double epsilon);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_epsilon;
+        };
+
+    } // namespace Floating
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
+    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+    Floating::WithinRelMatcher WithinRel(double target, double eps);
+    // defaults epsilon to 100*numeric_limits<double>::epsilon()
+    Floating::WithinRelMatcher WithinRel(double target);
+    Floating::WithinRelMatcher WithinRel(float target, float eps);
+    // defaults epsilon to 100*numeric_limits<float>::epsilon()
+    Floating::WithinRelMatcher WithinRel(float target);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+    std::function<bool(T const&)> m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+        :m_predicate(std::move(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+} // namespace Generic
+
+    // The following functions create the actual matcher objects.
+    // The user has to explicitly specify type to the function, because
+    // inferring std::function<bool(T const&)> is hard (but possible) and
+    // requires a lot of TMP.
+    template<typename T>
+    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+        return Generic::PredicateMatcher<T>(predicate, description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            std::string describe() const override;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+
+        struct RegexMatcher : MatcherBase<std::string> {
+            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+            bool match( std::string const& matchee ) const override;
+            std::string describe() const override;
+
+        private:
+            std::string m_regex;
+            CaseSensitive::Choice m_caseSensitivity;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+        template<typename T, typename Alloc>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T, Alloc> const &v) const override {
+                for (auto const& el : v) {
+                    if (el == m_comparator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (auto const& comparator : m_comparator) {
+                    auto present = false;
+                    for (const auto& el : v) {
+                        if (el == comparator) {
+                            present = true;
+                            break;
+                        }
+                    }
+                    if (!present) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != approx(v[i]))
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& epsilon( T const& newEpsilon ) {
+                approx.epsilon(newEpsilon);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& margin( T const& newMargin ) {
+                approx.margin(newMargin);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& scale( T const& newScale ) {
+                approx.scale(newScale);
+                return *this;
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
+            bool match(std::vector<T, AllocMatch> const& vec) const override {
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+            }
+
+            std::string describe() const override {
+                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+            }
+        private:
+            std::vector<T, AllocComp> const& m_target;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename Alloc = std::allocator<T>>
+    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
+        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT const& m_arg;
+        MatcherT m_matcher;
+        StringRef m_matcherString;
+    public:
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
+        :   ITransientExpression{ true, matcher.match( arg ) },
+            m_arg( arg ),
+            m_matcher( matcher ),
+            m_matcherString( matcherString )
+        {}
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            auto matcherAsString = m_matcher.toString();
+            os << Catch::Detail::stringify( m_arg ) << ' ';
+            if( matcherAsString == Detail::unprintableString )
+                os << m_matcherString;
+            else
+                os << matcherAsString;
+        }
+    };
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+    }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+// end catch_capture_matchers.h
+#endif
+// start catch_generators.hpp
+
+// start catch_interfaces_generatortracker.h
+
+
+#include <memory>
+
+namespace Catch {
+
+    namespace Generators {
+        class GeneratorUntypedBase {
+        public:
+            GeneratorUntypedBase() = default;
+            virtual ~GeneratorUntypedBase();
+            // Attempts to move the generator to the next element
+             //
+             // Returns true iff the move succeeded (and a valid element
+             // can be retrieved).
+            virtual bool next() = 0;
+        };
+        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
+
+    } // namespace Generators
+
+    struct IGeneratorTracker {
+        virtual ~IGeneratorTracker();
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
+
+} // namespace Catch
+
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
+
+#include <exception>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
+
+} // namespace Catch;
+
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
+
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
+
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
+
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
+
+#include <utility>
+#include <exception>
+
+namespace Catch {
+
+class GeneratorException : public std::exception {
+    const char* const m_msg = "";
+
+public:
+    GeneratorException(const char* msg):
+        m_msg(msg)
+    {}
+
+    const char* what() const noexcept override final;
+};
+
+namespace Generators {
+
+    // !TBD move this into its own location?
+    namespace pf{
+        template<typename T, typename... Args>
+        std::unique_ptr<T> make_unique( Args&&... args ) {
+            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+        }
+    }
+
+    template<typename T>
+    struct IGenerator : GeneratorUntypedBase {
+        virtual ~IGenerator() = default;
+
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
+
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
+
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
+
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
+
+    template <typename T>
+    class GeneratorWrapper final {
+        std::unique_ptr<IGenerator<T>> m_generator;
+    public:
+        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+            m_generator(std::move(generator))
+        {}
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->next();
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> value(T&& value) {
+        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+    }
+
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
+
+        void populate(GeneratorWrapper<T>&& generator) {
+            m_generators.emplace_back(std::move(generator));
+        }
+        void populate(T&& val) {
+            m_generators.emplace_back(value(std::forward<T>(val)));
+        }
+        template<typename U>
+        void populate(U&& val) {
+            populate(T(std::forward<U>(val)));
+        }
+        template<typename U, typename... Gs>
+        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
+            populate(std::forward<U>(valueOrGenerator));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+    public:
+        template <typename... Gs>
+        Generators(Gs &&... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
+
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
+        }
+    };
+
+    template<typename... Ts>
+    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
+    }
+
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
+
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
+        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(std::move(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+    }
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
+
+    template<typename L>
+    // Note: The type after -> is weird, because VS2015 cannot parse
+    //       the expression used in the typedef inside, when it is in
+    //       return type. Yeah.
+    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
+        if (!tracker.hasGenerator()) {
+            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
+        }
+
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+        return generator.get();
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+#define GENERATE( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+
+// end catch_generators.hpp
+// start catch_generators_generic.hpp
+
+namespace Catch {
+namespace Generators {
+
+    template <typename T>
+    class TakeGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
+
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+    }
+
+    template <typename T, typename Predicate>
+    class FilterGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_predicate(std::forward<P>(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = nextImpl();
+                if (!has_initial_value) {
+                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
+                }
+            }
+        }
+
+        T const& get() const override {
+            return m_generator.get();
+        }
+
+        bool next() override {
+            return nextImpl();
+        }
+
+    private:
+        bool nextImpl() {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
+
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+    }
+
+    template <typename T>
+    class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
+
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
+
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
+
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
+                }
+                return m_current_repeat < m_target_repeats;
+            }
+
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+    }
+
+    template <typename T, typename U, typename Func>
+    class MapGenerator : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(std::move(generator)),
+            m_function(std::forward<F2>(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
+
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
+
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(std::move(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
+        );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_generic.hpp
+// start catch_generators_specific.hpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
+
+    private:
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
+    };
+
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *IMutableContext::currentContext;
+    }
+
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext();
+
+    class SimplePcg32;
+    SimplePcg32& rng();
+}
+
+// end catch_context.h
+// start catch_interfaces_config.h
+
+// start catch_option.hpp
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <chrono>
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01,
+        NoTests = 0x02
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : NonCopyable {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutNoTests() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual double minDuration() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
+    };
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// start catch_random_number_generator.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
+
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+// end catch_random_number_generator.h
+#include <random>
+
+namespace Catch {
+namespace Generators {
+
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_real_distribution<Float> m_dist;
+    Float m_current_number;
+public:
+
+    RandomFloatingGenerator(Float a, Float b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_int_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
+
+    RandomIntegerGenerator(Integer a, Integer b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+// TODO: Ideally this would be also constrained against the various char types,
+//       but I don't expect users to run into that in practice.
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
+
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
+    {
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
+
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
+
+    T const& get() const override {
+        return m_current;
+    }
+
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
+}
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
+}
+
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
+
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
+        }
+    }
+
+    T const& get() const override {
+        return m_elems[m_current];
+    }
+
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
+
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
+
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+}
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_specific.hpp
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestInvoker;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* str ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+// Benchmarking needs the externally-facing parts of reporters to work
+#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    struct IConfig;
+
+    class TestSpec {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
+        };
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidArgs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidArgs;
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100000;
+        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        double minDuration = -1;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        double minDuration() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool benchmarkNoAnalysis() const override;
+        int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+        std::chrono::milliseconds benchmarkWarmupTime() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_estimate.hpp
+
+ // Statistics estimates
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct Estimate {
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
+            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate.hpp
+// start catch_outlier_classification.hpp
+
+// Outlier information
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_outlier_classification.hpp
+
+#include <iterator>
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+#include <algorithm>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        bool shouldRedirectStdOut = false;
+        bool shouldReportAllAssertions = false;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    template <class Duration>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Duration> samples;
+        Benchmark::Estimate<Duration> mean;
+        Benchmark::Estimate<Duration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+
+        template <typename Duration2>
+        operator BenchmarkStats<Duration2>() const {
+            std::vector<Duration2> samples2;
+            samples2.reserve(samples.size());
+            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+            return {
+                info,
+                std::move(samples2),
+                mean,
+                standardDeviation,
+                outliers,
+                outlierVariance,
+            };
+        }
+    };
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void reportInvalidArguments(std::string const&) {}
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& ) {}
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
+        virtual void benchmarkFailed( std::string const& ) {}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    //! Should the reporter show
+    bool shouldShowDuration( IConfig const& config, double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& container );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void reportInvalidArguments(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed(std::string const& error) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+        void printTestFilters();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
+    };
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
+
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        void writeStylesheetRef( std::string const& url );
+
+        XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+    private:
+
+        void applyFormatting(XmlFormatting fmt);
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection( std::string const& className,
+                           std::string const& rootName,
+                           SectionNode const& sectionNode,
+                           bool testOkToFail );
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_benchmarking_all.hpp
+
+// A proxy header that includes all of the benchmarking headers to allow
+// concise include of the benchmarking features. You should prefer the
+// individual includes in standard use.
+
+// start catch_benchmark.hpp
+
+ // Benchmark
+
+// start catch_chronometer.hpp
+
+// User-facing chronometer
+
+
+// start catch_clock.hpp
+
+// Clocks
+
+
+#include <chrono>
+#include <ratio>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_clock.hpp
+// start catch_optimizer.hpp
+
+ // Hinting the optimizer
+
+
+#if defined(_MSC_VER)
+#   include <atomic> // atomic_thread_fence
+#endif
+
+namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
+
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER)
+
+#pragma optimize("", off)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#pragma optimize("", on)
+
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
+
+#endif
+
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
+            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
+            std::forward<Fn>(fn) (std::forward<Args...>(args...));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_optimizer.hpp
+// start catch_complete_invoke.hpp
+
+// Invoke with a special case for void
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                    return {};
+                }
+            };
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
+            }
+
+            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            CATCH_TRY{
+                return Detail::complete_invoke(std::forward<Fun>(fun));
+            } CATCH_CATCH_ALL{
+                getResultCapture().benchmarkFailed(translateActiveException());
+                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
+            }
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_complete_invoke.hpp
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept() = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
+
+                ClockDuration<Clock> elapsed() const { return finished - started; }
+
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
+
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return k; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int k)
+                : impl(&meter)
+                , k(k) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
+            }
+
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
+            }
+
+            Detail::ChronometerConcept* impl;
+            int k;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_chronometer.hpp
+// start catch_environment.hpp
+
+// Environment information
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct EnvironmentEstimate {
+            Duration mean;
+            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
+        };
+        template <typename Clock>
+        struct Environment {
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_environment.hpp
+// start catch_execution_plan.hpp
+
+ // Execution plan
+
+
+// start catch_benchmark_function.hpp
+
+ // Dumb std::function implementation for consistent call overhead
+
+
+#include <cassert>
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            using Decay = typename std::decay<T>::type;
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<Decay<T>, Decay<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual callable* clone() const = 0;
+                    virtual ~callable() = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun) : fun(std::move(fun)) {}
+                    model(Fun const& fun) : fun(fun) {}
+
+                    model<Fun>* clone() const override { return new model<Fun>(*this); }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
+
+                    Fun fun;
+                };
+
+                struct do_nothing { void operator()() const {} };
+
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
+
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
+
+                template <typename Fun,
+                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
+
+                BenchmarkFunction(BenchmarkFunction&& that)
+                    : f(std::move(that.f)) {}
+
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
+
+                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
+                    f = std::move(that.f);
+                    return *this;
+                }
+
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f.reset(that.f->clone());
+                    return *this;
+                }
+
+                void operator()(Chronometer meter) const { f->call(meter); }
+
+            private:
+                std::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_benchmark_function.hpp
+// start catch_repeat.hpp
+
+// repeat algorithm
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
+                return { std::forward<Fun>(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_repeat.hpp
+// start catch_run_for_at_least.hpp
+
+// Run a function for a minimum amount of time
+
+
+// start catch_measure.hpp
+
+// Measure
+
+
+// start catch_timing.hpp
+
+// Timing
+
+
+#include <tuple>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration, typename Result>
+        struct Timing {
+            Duration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Clock, typename Func, typename... Args>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_timing.hpp
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, std::forward<decltype(r)>(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_measure.hpp
+#include <utility>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
+
+                return { meter.elapsed(), std::move(result), iters };
+            }
+
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
+
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override {
+                    return "could not measure benchmark, maybe it was optimized away";
+                }
+            };
+
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
+                auto iters = seed;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
+
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, std::move(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                Catch::throw_exception(optimized_away_error{});
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_run_for_at_least.hpp
+#include <algorithm>
+#include <iterator>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            Duration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            Duration warmup_time;
+            int warmup_iterations;
+
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
+
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_execution_plan.hpp
+// start catch_estimate_clock.hpp
+
+ // Environment measurement
+
+
+// start catch_stats.hpp
+
+// Statistical analysis tools
+
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+#include <iterator>
+#include <numeric>
+#include <tuple>
+#include <cmath>
+#include <utility>
+#include <cstddef>
+#include <random>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
+
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);
+
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / count;
+            }
+
+            template <typename URng, typename Iterator, typename Estimator>
+            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
+                auto n = last - first;
+                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+                sample out;
+                out.reserve(resamples);
+                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+                    std::vector<double> resampled;
+                    resampled.reserve(n);
+                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+                    return estimator(resampled.begin(), resampled.end());
+                });
+                std::sort(out.begin(), out.end());
+                return out;
+            }
+
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = last - first;
+                auto second = std::next(first);
+                sample results;
+                results.reserve(n);
+
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
+
+                return results;
+            }
+
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }
+
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                int n = static_cast<int>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
+                // degenerate case with uniform samples
+                if (prob_n == 0) return { point, point, point, confidence_level };
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n](double x) -> int {
+                    return std::lround(normal_cdf(x) * n); };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = (std::max)(cumn(a1), 0);
+                auto hi = (std::min)(cumn(a2), n - 1);
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_stats.hpp
+#include <algorithm>
+#include <iterator>
+#include <tuple>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(k + 1);
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+
+                std::vector<double> deltas;
+                deltas.reserve(k);
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+
+                return deltas;
+            }
+
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+                auto time_limit = (std::min)(
+                    resolution * clock_cost_estimation_tick_limit,
+                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(nsamples);
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
+                return {
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
+                };
+            }
+
+            template <typename Clock>
+            Environment<FloatDuration<Clock>> measure_environment() {
+                static Environment<FloatDuration<Clock>>* env = nullptr;
+                if (env) {
+                    return *env;
+                }
+
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
+
+                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate_clock.hpp
+// start catch_analyse.hpp
+
+ // Run and analyse one benchmark
+
+
+// start catch_sample_analysis.hpp
+
+// Benchmark results
+
+
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <iterator>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct SampleAnalysis {
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    std::move(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_sample_analysis.hpp
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(last - first);
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        std::move(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(last - first);
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        std::move(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_analyse.hpp
+#include <algorithm>
+#include <functional>
+#include <string>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string &&name)
+                : name(std::move(name)) {}
+
+            template <class FUN>
+            Benchmark(std::string &&name, FUN &&func)
+                : fun(std::move(func)), name(std::move(name)) {}
+
+            template <typename Clock>
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+            }
+
+            template <typename Clock = default_clock>
+            void run() {
+                IConfigPtr cfg = getCurrentContext().getConfig();
+
+                auto env = Detail::measure_environment<Clock>();
+
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
+
+                    BenchmarkInfo info {
+                        name,
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
+
+                    getResultCapture().benchmarkStarting(info);
+
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
+
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
+
+                } CATCH_CATCH_ALL{
+                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
+                        std::rethrow_exception(std::current_exception());
+                }
+            }
+
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun,
+                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
+                Benchmark & operator=(Fun func) {
+                fun = Detail::BenchmarkFunction(func);
+                run();
+                return *this;
+            }
+
+            explicit operator bool() {
+                return true;
+            }
+
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
+
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
+
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
+
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
+
+// end catch_benchmark.hpp
+// start catch_constructor.hpp
+
+// Constructor and destructor helpers
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, bool Destruct>
+            struct ObjectStorage
+            {
+                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
+
+                ObjectStorage() : data() {}
+
+                ObjectStorage(const ObjectStorage& other)
+                {
+                    new(&data) T(other.stored_object());
+                }
+
+                ObjectStorage(ObjectStorage&& other)
+                {
+                    new(&data) T(std::move(other.stored_object()));
+                }
+
+                ~ObjectStorage() { destruct_on_exit<T>(); }
+
+                template <typename... Args>
+                void construct(Args&&... args)
+                {
+                    new (&data) T(std::forward<Args>(args)...);
+                }
+
+                template <bool AllowManualDestruction = !Destruct>
+                typename std::enable_if<AllowManualDestruction>::type destruct()
+                {
+                    stored_object().~T();
+                }
+
+            private:
+                // If this is a constructor benchmark, destruct the underlying object
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
+                // Otherwise, don't
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
+
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                T const& stored_object() const {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                TStorage data;
+            };
+        }
+
+        template <typename T>
+        using storage_for = Detail::ObjectStorage<T, true>;
+
+        template <typename T>
+        using destructable_object = Detail::ObjectStorage<T, false>;
+    }
+}
+
+// end catch_constructor.hpp
+// end catch_benchmarking_all.hpp
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
+            return lhs.name == rhs.name
+                && lhs.location == rhs.location;
+        }
+    };
+
+    class ITracker;
+
+    using ITrackerPtr = std::shared_ptr<ITracker>;
+
+    class  ITracker {
+        NameAndLocation m_nameAndLocation;
+
+    public:
+        ITracker(NameAndLocation const& nameAndLoc) :
+            m_nameAndLocation(nameAndLoc)
+        {}
+
+        // static queries
+        NameAndLocation const& nameAndLocation() const {
+            return m_nameAndLocation;
+        }
+
+        virtual ~ITracker();
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+        virtual bool hasStarted() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( ITrackerPtr const& child ) = 0;
+        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isGeneratorTracker() const = 0;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        ITracker& startRun();
+        void endRun();
+
+        void startCycle();
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker();
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        using Children = std::vector<ITrackerPtr>;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isComplete() const override;
+        bool isSuccessfullyCompleted() const override;
+        bool isOpen() const override;
+        bool hasChildren() const override;
+        bool hasStarted() const override {
+            return m_runState != NotStarted;
+        }
+
+        void addChild( ITrackerPtr const& child ) override;
+
+        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+        ITracker& parent() override;
+
+        void openChild() override;
+
+        bool isSectionTracker() const override;
+        bool isGeneratorTracker() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+        void markAsNeedingAnotherRun() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+        std::string m_trimmed_name;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        bool isComplete() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<std::string> const& filters );
+        //! Returns filters active in this tracker
+        std::vector<std::string> const& getFilters() const;
+        //! Returns whitespace-trimmed name of the tracked section
+        std::string const& trimmedName() const;
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+        ~LeakDetector();
+    };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_stats.cpp
+
+// Statistical analysis tools
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+
+#include <cassert>
+#include <random>
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace {
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
+            double diff = b - m;
+            return a + diff * diff;
+            }) / (last - first);
+            return std::sqrt(variance);
+    }
+
+}
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if (g == 0) return xj;
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;
+
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
+                };
+
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    return std::async(std::launch::async, [=] {
+                        std::mt19937 rng(seed);
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+// end catch_stats.cpp
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
+
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
+    }
+
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
+    }
+
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_debugger.h
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
+
+#elif defined(CATCH_PLATFORM_IPHONE)
+
+    // use inline assembler
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP()  __asm__("int $3")
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #elif defined(__arm__) && !defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
+    #elif defined(__arm__) &&  defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xde01")
+    #endif
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+    #ifdef CATCH_TRAP
+        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+    #else
+        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+    #endif
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+#include <cassert>
+
+namespace Catch {
+
+    // Wrapper for platform-specific fatal error (signals/SEH) handlers
+    //
+    // Tries to be cooperative with other handlers, and not step over
+    // other handlers. This means that unknown structured exceptions
+    // are passed on, previous signal handlers are called, and so on.
+    //
+    // Can only be instantiated once, and assumes that once a signal
+    // is caught, the binary will end up terminating. Thus, there
+    class FatalConditionHandler {
+        bool m_started = false;
+
+        // Install/disengage implementation for specific platform.
+        // Should be if-defed to work on current platform, can assume
+        // engage-disengage 1:1 pairing.
+        void engage_platform();
+        void disengage_platform();
+    public:
+        // Should also have platform-specific implementations as needed
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+
+        void engage() {
+            assert(!m_started && "Handler cannot be installed twice.");
+            m_started = true;
+            engage_platform();
+        }
+
+        void disengage() {
+            assert(m_started && "Handler cannot be uninstalled without being installed first");
+            m_started = false;
+            disengage_platform();
+        }
+    };
+
+    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
+    class FatalConditionHandlerGuard {
+        FatalConditionHandler* m_handler;
+    public:
+        FatalConditionHandlerGuard(FatalConditionHandler* handler):
+            m_handler(handler) {
+            m_handler->engage();
+        }
+        ~FatalConditionHandlerGuard() {
+            m_handler->disengage();
+        }
+    };
+
+} // end namespace Catch
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+    struct IMutableContext;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+        ~RunContext() override;
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+        Totals runTest(TestCase const& testCase);
+
+        IConfigPtr config() const;
+        IStreamingReporter& reporter() const;
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo const& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing( std::string const& name ) override;
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( std::string const& error ) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const final;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult const& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker = nullptr;
+        Option<AssertionResult> m_lastResult;
+
+        IConfigPtr m_config;
+        Totals m_totals;
+        IStreamingReporterPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        FatalConditionHandler m_fatalConditionhandler;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+    namespace {
+        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+            expr.streamReconstructedExpression( os );
+            return os;
+        }
+    }
+
+    LazyExpression::LazyExpression( bool isNegated )
+    :   m_isNegated( isNegated )
+    {}
+
+    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+    LazyExpression::operator bool() const {
+        return m_transientExpression != nullptr;
+    }
+
+    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+        if( lazyExpr.m_isNegated )
+            os << "!";
+
+        if( lazyExpr ) {
+            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+                os << "(" << *lazyExpr.m_transientExpression << ")";
+            else
+                os << *lazyExpr.m_transientExpression;
+        }
+        else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+    AssertionHandler::AssertionHandler
+        (   StringRef const& macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {}
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        setCompleted();
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+            throw Catch::TestFailureException();
+#else
+            CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+        }
+    }
+    void AssertionHandler::setCompleted() {
+        m_completed = true;
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+    }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return !m_info.capturedExpression.empty();
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        std::string expr;
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.5
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+namespace clara {
+namespace TextFlow {
+
+inline auto isWhitespace(char c) -> bool {
+	static std::string chars = " \t\n\r";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+	static std::string chars = "[({<|";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+	static std::string chars = "])}>.,:;*+-=&/\\";
+	return chars.find(c) != std::string::npos;
+}
+
+class Columns;
+
+class Column {
+	std::vector<std::string> m_strings;
+	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+	size_t m_indent = 0;
+	size_t m_initialIndent = std::string::npos;
+
+public:
+	class iterator {
+		friend Column;
+
+		Column const& m_column;
+		size_t m_stringIndex = 0;
+		size_t m_pos = 0;
+
+		size_t m_len = 0;
+		size_t m_end = 0;
+		bool m_suffix = false;
+
+		iterator(Column const& column, size_t stringIndex)
+			: m_column(column),
+			m_stringIndex(stringIndex) {}
+
+		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+		auto isBoundary(size_t at) const -> bool {
+			assert(at > 0);
+			assert(at <= line().size());
+
+			return at == line().size() ||
+				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+				isBreakableBefore(line()[at]) ||
+				isBreakableAfter(line()[at - 1]);
+		}
+
+		void calcLength() {
+			assert(m_stringIndex < m_column.m_strings.size());
+
+			m_suffix = false;
+			auto width = m_column.m_width - indent();
+			m_end = m_pos;
+			if (line()[m_pos] == '\n') {
+				++m_end;
+			}
+			while (m_end < line().size() && line()[m_end] != '\n')
+				++m_end;
+
+			if (m_end < m_pos + width) {
+				m_len = m_end - m_pos;
+			} else {
+				size_t len = width;
+				while (len > 0 && !isBoundary(m_pos + len))
+					--len;
+				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+					--len;
+
+				if (len > 0) {
+					m_len = len;
+				} else {
+					m_suffix = true;
+					m_len = width - 1;
+				}
+			}
+		}
+
+		auto indent() const -> size_t {
+			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+			return initial == std::string::npos ? m_column.m_indent : initial;
+		}
+
+		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Column const& column) : m_column(column) {
+			assert(m_column.m_width > m_column.m_indent);
+			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+			calcLength();
+			if (m_len == 0)
+				m_stringIndex++; // Empty string
+		}
+
+		auto operator *() const -> std::string {
+			assert(m_stringIndex < m_column.m_strings.size());
+			assert(m_pos <= m_end);
+			return addIndentAndSuffix(line().substr(m_pos, m_len));
+		}
+
+		auto operator ++() -> iterator& {
+			m_pos += m_len;
+			if (m_pos < line().size() && line()[m_pos] == '\n')
+				m_pos += 1;
+			else
+				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+					++m_pos;
+
+			if (m_pos == line().size()) {
+				m_pos = 0;
+				++m_stringIndex;
+			}
+			if (m_stringIndex < m_column.m_strings.size())
+				calcLength();
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return
+				m_pos == other.m_pos &&
+				m_stringIndex == other.m_stringIndex &&
+				&m_column == &other.m_column;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return !operator==(other);
+		}
+	};
+	using const_iterator = iterator;
+
+	explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+	auto width(size_t newWidth) -> Column& {
+		assert(newWidth > 0);
+		m_width = newWidth;
+		return *this;
+	}
+	auto indent(size_t newIndent) -> Column& {
+		m_indent = newIndent;
+		return *this;
+	}
+	auto initialIndent(size_t newIndent) -> Column& {
+		m_initialIndent = newIndent;
+		return *this;
+	}
+
+	auto width() const -> size_t { return m_width; }
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+		bool first = true;
+		for (auto line : col) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto operator + (Column const& other)->Columns;
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+class Spacer : public Column {
+
+public:
+	explicit Spacer(size_t spaceWidth) : Column("") {
+		width(spaceWidth);
+	}
+};
+
+class Columns {
+	std::vector<Column> m_columns;
+
+public:
+
+	class iterator {
+		friend Columns;
+		struct EndTag {};
+
+		std::vector<Column> const& m_columns;
+		std::vector<Column::iterator> m_iterators;
+		size_t m_activeIterators;
+
+		iterator(Columns const& columns, EndTag)
+			: m_columns(columns.m_columns),
+			m_activeIterators(0) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.end());
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Columns const& columns)
+			: m_columns(columns.m_columns),
+			m_activeIterators(m_columns.size()) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.begin());
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return m_iterators == other.m_iterators;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return m_iterators != other.m_iterators;
+		}
+		auto operator *() const -> std::string {
+			std::string row, padding;
+
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				auto width = m_columns[i].width();
+				if (m_iterators[i] != m_columns[i].end()) {
+					std::string col = *m_iterators[i];
+					row += padding + col;
+					if (col.size() < width)
+						padding = std::string(width - col.size(), ' ');
+					else
+						padding = "";
+				} else {
+					padding += std::string(width, ' ');
+				}
+			}
+			return row;
+		}
+		auto operator ++() -> iterator& {
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				if (m_iterators[i] != m_columns[i].end())
+					++m_iterators[i];
+			}
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+	};
+	using const_iterator = iterator;
+
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+	auto operator += (Column const& col) -> Columns& {
+		m_columns.push_back(col);
+		return *this;
+	}
+	auto operator + (Column const& col) -> Columns {
+		Columns combined = *this;
+		combined += col;
+		return combined;
+	}
+
+	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+		bool first = true;
+		for (auto line : cols) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+inline auto Column::operator + (Column const& other) -> Columns {
+	Columns cols;
+	cols += *this;
+	cols += other;
+	return cols;
+}
+}
+
+}
+}
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <cctype>
+#include <string>
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+    template<typename L>
+    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+    template<typename ClassT, typename ReturnT, typename... Args>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+        static const bool isValid = false;
+    };
+
+    template<typename ClassT, typename ReturnT, typename ArgT>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+        static const bool isValid = true;
+        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+        using ReturnType = ReturnT;
+    };
+
+    class TokenStream;
+
+    // Transport for raw args (copied from main args, or supplied via init list for testing)
+    class Args {
+        friend TokenStream;
+        std::string m_exeName;
+        std::vector<std::string> m_args;
+
+    public:
+        Args( int argc, char const* const* argv )
+            : m_exeName(argv[0]),
+              m_args(argv + 1, argv + argc) {}
+
+        Args( std::initializer_list<std::string> args )
+        :   m_exeName( *args.begin() ),
+            m_args( args.begin()+1, args.end() )
+        {}
+
+        auto exeName() const -> std::string {
+            return m_exeName;
+        }
+    };
+
+    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+    // may encode an option + its argument if the : or = form is used
+    enum class TokenType {
+        Option, Argument
+    };
+    struct Token {
+        TokenType type;
+        std::string token;
+    };
+
+    inline auto isOptPrefix( char c ) -> bool {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+            || c == '/'
+#endif
+        ;
+    }
+
+    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+    class TokenStream {
+        using Iterator = std::vector<std::string>::const_iterator;
+        Iterator it;
+        Iterator itEnd;
+        std::vector<Token> m_tokenBuffer;
+
+        void loadBuffer() {
+            m_tokenBuffer.resize( 0 );
+
+            // Skip any empty strings
+            while( it != itEnd && it->empty() )
+                ++it;
+
+            if( it != itEnd ) {
+                auto const &next = *it;
+                if( isOptPrefix( next[0] ) ) {
+                    auto delimiterPos = next.find_first_of( " :=" );
+                    if( delimiterPos != std::string::npos ) {
+                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+                    } else {
+                        if( next[1] != '-' && next.size() > 2 ) {
+                            std::string opt = "- ";
+                            for( size_t i = 1; i < next.size(); ++i ) {
+                                opt[1] = next[i];
+                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
+                            }
+                        } else {
+                            m_tokenBuffer.push_back( { TokenType::Option, next } );
+                        }
+                    }
+                } else {
+                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
+                }
+            }
+        }
+
+    public:
+        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+            loadBuffer();
+        }
+
+        explicit operator bool() const {
+            return !m_tokenBuffer.empty() || it != itEnd;
+        }
+
+        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+        auto operator*() const -> Token {
+            assert( !m_tokenBuffer.empty() );
+            return m_tokenBuffer.front();
+        }
+
+        auto operator->() const -> Token const * {
+            assert( !m_tokenBuffer.empty() );
+            return &m_tokenBuffer.front();
+        }
+
+        auto operator++() -> TokenStream & {
+            if( m_tokenBuffer.size() >= 2 ) {
+                m_tokenBuffer.erase( m_tokenBuffer.begin() );
+            } else {
+                if( it != itEnd )
+                    ++it;
+                loadBuffer();
+            }
+            return *this;
+        }
+    };
+
+    class ResultBase {
+    public:
+        enum Type {
+            Ok, LogicError, RuntimeError
+        };
+
+    protected:
+        ResultBase( Type type ) : m_type( type ) {}
+        virtual ~ResultBase() = default;
+
+        virtual void enforceOk() const = 0;
+
+        Type m_type;
+    };
+
+    template<typename T>
+    class ResultValueBase : public ResultBase {
+    public:
+        auto value() const -> T const & {
+            enforceOk();
+            return m_value;
+        }
+
+    protected:
+        ResultValueBase( Type type ) : ResultBase( type ) {}
+
+        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+        }
+
+        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+            new( &m_value ) T( value );
+        }
+
+        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+            if( m_type == ResultBase::Ok )
+                m_value.~T();
+            ResultBase::operator=(other);
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+            return *this;
+        }
+
+        ~ResultValueBase() override {
+            if( m_type == Ok )
+                m_value.~T();
+        }
+
+        union {
+            T m_value;
+        };
+    };
+
+    template<>
+    class ResultValueBase<void> : public ResultBase {
+    protected:
+        using ResultBase::ResultBase;
+    };
+
+    template<typename T = void>
+    class BasicResult : public ResultValueBase<T> {
+    public:
+        template<typename U>
+        explicit BasicResult( BasicResult<U> const &other )
+        :   ResultValueBase<T>( other.type() ),
+            m_errorMessage( other.errorMessage() )
+        {
+            assert( type() != ResultBase::Ok );
+        }
+
+        template<typename U>
+        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+        explicit operator bool() const { return m_type == ResultBase::Ok; }
+        auto type() const -> ResultBase::Type { return m_type; }
+        auto errorMessage() const -> std::string { return m_errorMessage; }
+
+    protected:
+        void enforceOk() const override {
+
+            // Errors shouldn't reach this point, but if they do
+            // the actual error message will be in m_errorMessage
+            assert( m_type != ResultBase::LogicError );
+            assert( m_type != ResultBase::RuntimeError );
+            if( m_type != ResultBase::Ok )
+                std::abort();
+        }
+
+        std::string m_errorMessage; // Only populated if resultType is an error
+
+        BasicResult( ResultBase::Type type, std::string const &message )
+        :   ResultValueBase<T>(type),
+            m_errorMessage(message)
+        {
+            assert( m_type != ResultBase::Ok );
+        }
+
+        using ResultValueBase<T>::ResultValueBase;
+        using ResultBase::m_type;
+    };
+
+    enum class ParseResultType {
+        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+    };
+
+    class ParseState {
+    public:
+
+        ParseState( ParseResultType type, TokenStream const &remainingTokens )
+        : m_type(type),
+          m_remainingTokens( remainingTokens )
+        {}
+
+        auto type() const -> ParseResultType { return m_type; }
+        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+    private:
+        ParseResultType m_type;
+        TokenStream m_remainingTokens;
+    };
+
+    using Result = BasicResult<void>;
+    using ParserResult = BasicResult<ParseResultType>;
+    using InternalParseResult = BasicResult<ParseState>;
+
+    struct HelpColumns {
+        std::string left;
+        std::string right;
+    };
+
+    template<typename T>
+    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+        std::stringstream ss;
+        ss << source;
+        ss >> target;
+        if( ss.fail() )
+            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+        else
+            return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+        target = source;
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+        std::string srcLC = source;
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
+        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+            target = true;
+        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+            target = false;
+        else
+            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+    template<typename T>
+    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+        T temp;
+        auto result = convertInto( source, temp );
+        if( result )
+            target = std::move(temp);
+        return result;
+    }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+    struct NonCopyable {
+        NonCopyable() = default;
+        NonCopyable( NonCopyable const & ) = delete;
+        NonCopyable( NonCopyable && ) = delete;
+        NonCopyable &operator=( NonCopyable const & ) = delete;
+        NonCopyable &operator=( NonCopyable && ) = delete;
+    };
+
+    struct BoundRef : NonCopyable {
+        virtual ~BoundRef() = default;
+        virtual auto isContainer() const -> bool { return false; }
+        virtual auto isFlag() const -> bool { return false; }
+    };
+    struct BoundValueRefBase : BoundRef {
+        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+    };
+    struct BoundFlagRefBase : BoundRef {
+        virtual auto setFlag( bool flag ) -> ParserResult = 0;
+        virtual auto isFlag() const -> bool { return true; }
+    };
+
+    template<typename T>
+    struct BoundValueRef : BoundValueRefBase {
+        T &m_ref;
+
+        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return convertInto( arg, m_ref );
+        }
+    };
+
+    template<typename T>
+    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+        std::vector<T> &m_ref;
+
+        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+        auto isContainer() const -> bool override { return true; }
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            T temp;
+            auto result = convertInto( arg, temp );
+            if( result )
+                m_ref.push_back( temp );
+            return result;
+        }
+    };
+
+    struct BoundFlagRef : BoundFlagRefBase {
+        bool &m_ref;
+
+        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            m_ref = flag;
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ReturnType>
+    struct LambdaInvoker {
+        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            return lambda( arg );
+        }
+    };
+
+    template<>
+    struct LambdaInvoker<void> {
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            lambda( arg );
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ArgType, typename L>
+    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+        ArgType temp{};
+        auto result = convertInto( arg, temp );
+        return !result
+           ? result
+           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+    }
+
+    template<typename L>
+    struct BoundLambda : BoundValueRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+        }
+    };
+
+    template<typename L>
+    struct BoundFlagLambda : BoundFlagRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+        }
+    };
+
+    enum class Optionality { Optional, Required };
+
+    struct Parser;
+
+    class ParserBase {
+    public:
+        virtual ~ParserBase() = default;
+        virtual auto validate() const -> Result { return Result::ok(); }
+        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
+        virtual auto cardinality() const -> size_t { return 1; }
+
+        auto parse( Args const &args ) const -> InternalParseResult {
+            return parse( args.exeName(), TokenStream( args ) );
+        }
+    };
+
+    template<typename DerivedT>
+    class ComposableParserImpl : public ParserBase {
+    public:
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser;
+
+		template<typename T>
+        auto operator+( T const &other ) const -> Parser;
+    };
+
+    // Common code and state for Args and Opts
+    template<typename DerivedT>
+    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+    protected:
+        Optionality m_optionality = Optionality::Optional;
+        std::shared_ptr<BoundRef> m_ref;
+        std::string m_hint;
+        std::string m_description;
+
+        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+    public:
+        template<typename T>
+        ParserRefImpl( T &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+            m_hint( hint )
+        {}
+
+        template<typename LambdaT>
+        ParserRefImpl( LambdaT const &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+            m_hint(hint)
+        {}
+
+        auto operator()( std::string const &description ) -> DerivedT & {
+            m_description = description;
+            return static_cast<DerivedT &>( *this );
+        }
+
+        auto optional() -> DerivedT & {
+            m_optionality = Optionality::Optional;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto required() -> DerivedT & {
+            m_optionality = Optionality::Required;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto isOptional() const -> bool {
+            return m_optionality == Optionality::Optional;
+        }
+
+        auto cardinality() const -> size_t override {
+            if( m_ref->isContainer() )
+                return 0;
+            else
+                return 1;
+        }
+
+        auto hint() const -> std::string { return m_hint; }
+    };
+
+    class ExeName : public ComposableParserImpl<ExeName> {
+        std::shared_ptr<std::string> m_name;
+        std::shared_ptr<BoundValueRefBase> m_ref;
+
+        template<typename LambdaT>
+        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+        }
+
+    public:
+        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+        explicit ExeName( std::string &ref ) : ExeName() {
+            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+        }
+
+        template<typename LambdaT>
+        explicit ExeName( LambdaT const& lambda ) : ExeName() {
+            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+        }
+
+        // The exe name is not parsed out of the normal tokens, but is handled specially
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+        }
+
+        auto name() const -> std::string { return *m_name; }
+        auto set( std::string const& newName ) -> ParserResult {
+
+            auto lastSlash = newName.find_last_of( "\\/" );
+            auto filename = ( lastSlash == std::string::npos )
+                    ? newName
+                    : newName.substr( lastSlash+1 );
+
+            *m_name = filename;
+            if( m_ref )
+                return m_ref->setValue( filename );
+            else
+                return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    class Arg : public ParserRefImpl<Arg> {
+    public:
+        using ParserRefImpl::ParserRefImpl;
+
+        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            auto const &token = *remainingTokens;
+            if( token.type != TokenType::Argument )
+                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+            assert( !m_ref->isFlag() );
+            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+            auto result = valueRef->setValue( remainingTokens->token );
+            if( !result )
+                return InternalParseResult( result );
+            else
+                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+        }
+    };
+
+    inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+        if( optName[0] == '/' )
+            return "-" + optName.substr( 1 );
+        else
+#endif
+            return optName;
+    }
+
+    class Opt : public ParserRefImpl<Opt> {
+    protected:
+        std::vector<std::string> m_optNames;
+
+    public:
+        template<typename LambdaT>
+        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+        template<typename LambdaT>
+        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        template<typename T>
+        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        auto operator[]( std::string const &optName ) -> Opt & {
+            m_optNames.push_back( optName );
+            return *this;
+        }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::ostringstream oss;
+            bool first = true;
+            for( auto const &opt : m_optNames ) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if( !m_hint.empty() )
+                oss << " <" << m_hint << ">";
+            return { { oss.str(), m_description } };
+        }
+
+        auto isMatch( std::string const &optToken ) const -> bool {
+            auto normalisedToken = normaliseOpt( optToken );
+            for( auto const &name : m_optNames ) {
+                if( normaliseOpt( name ) == normalisedToken )
+                    return true;
+            }
+            return false;
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+                auto const &token = *remainingTokens;
+                if( isMatch(token.token ) ) {
+                    if( m_ref->isFlag() ) {
+                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+                        auto result = flagRef->setFlag( true );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    } else {
+                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+                        ++remainingTokens;
+                        if( !remainingTokens )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto const &argToken = *remainingTokens;
+                        if( argToken.type != TokenType::Argument )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto result = valueRef->setValue( argToken.token );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    }
+                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+                }
+            }
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+        }
+
+        auto validate() const -> Result override {
+            if( m_optNames.empty() )
+                return Result::logicError( "No options supplied to Opt" );
+            for( auto const &name : m_optNames ) {
+                if( name.empty() )
+                    return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+                if( name[0] != '-' && name[0] != '/' )
+                    return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+                if( name[0] != '-' )
+                    return Result::logicError( "Option name must begin with '-'" );
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+    };
+
+    struct Help : Opt {
+        Help( bool &showHelpFlag )
+        :   Opt([&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            })
+        {
+            static_cast<Opt &>( *this )
+                    ("display usage information")
+                    ["-?"]["-h"]["--help"]
+                    .optional();
+        }
+    };
+
+    struct Parser : ParserBase {
+
+        mutable ExeName m_exeName;
+        std::vector<Opt> m_options;
+        std::vector<Arg> m_args;
+
+        auto operator|=( ExeName const &exeName ) -> Parser & {
+            m_exeName = exeName;
+            return *this;
+        }
+
+        auto operator|=( Arg const &arg ) -> Parser & {
+            m_args.push_back(arg);
+            return *this;
+        }
+
+        auto operator|=( Opt const &opt ) -> Parser & {
+            m_options.push_back(opt);
+            return *this;
+        }
+
+        auto operator|=( Parser const &other ) -> Parser & {
+            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+            return *this;
+        }
+
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser {
+            return Parser( *this ) |= other;
+        }
+
+        // Forward deprecated interface with '+' instead of '|'
+        template<typename T>
+        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+        template<typename T>
+        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::vector<HelpColumns> cols;
+            for (auto const &o : m_options) {
+                auto childCols = o.getHelpColumns();
+                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+            }
+            return cols;
+        }
+
+        void writeToStream( std::ostream &os ) const {
+            if (!m_exeName.name().empty()) {
+                os << "usage:\n" << "  " << m_exeName.name() << " ";
+                bool required = true, first = true;
+                for( auto const &arg : m_args ) {
+                    if (first)
+                        first = false;
+                    else
+                        os << " ";
+                    if( arg.isOptional() && required ) {
+                        os << "[";
+                        required = false;
+                    }
+                    os << "<" << arg.hint() << ">";
+                    if( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if( !required )
+                    os << "]";
+                if( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:" << std::endl;
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for( auto const &cols : rows )
+                optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+            optWidth = (std::min)(optWidth, consoleWidth/2);
+
+            for( auto const &cols : rows ) {
+                auto row =
+                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+                        TextFlow::Spacer(4) +
+                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+                os << row << std::endl;
+            }
+        }
+
+        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+            parser.writeToStream( os );
+            return os;
+        }
+
+        auto validate() const -> Result override {
+            for( auto const &opt : m_options ) {
+                auto result = opt.validate();
+                if( !result )
+                    return result;
+            }
+            for( auto const &arg : m_args ) {
+                auto result = arg.validate();
+                if( !result )
+                    return result;
+            }
+            return Result::ok();
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            const size_t totalParsers = m_options.size() + m_args.size();
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
+
+            {
+                size_t i = 0;
+                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+            while( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
+                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+                        if (!result)
+                            return result;
+                        if (result.value().type() != ParseResultType::NoMatch) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if( !tokenParsed )
+                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+    };
+
+    template<typename DerivedT>
+    template<typename T>
+    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+        return Parser() | static_cast<DerivedT const &>( *this ) | other;
+    }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+                auto warningSet = [&]() {
+                    if( warning == "NoAssertions" )
+                        return WarnAbout::NoAssertions;
+
+                    if ( warning == "NoTests" )
+                        return WarnAbout::NoTests;
+
+                    return WarnAbout::Nothing;
+                }();
+
+                if (warningSet == WarnAbout::Nothing)
+                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + line + '"';
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.emplace_back( "," );
+                    }
+                }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = RunTests::InDeclarationOrder;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = RunTests::InLexicographicalOrder;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = RunTests::InRandomOrder;
+                else
+                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed != "time" )
+                    return clara::detail::convertInto( seed, config.rngSeed );
+                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setColourUsage = [&]( std::string const& useColour ) {
+                    auto mode = toLower( useColour );
+
+                    if( mode == "yes" )
+                        config.useColour = UseColour::Yes;
+                    else if( mode == "no" )
+                        config.useColour = UseColour::No;
+                    else if( mode == "auto" )
+                        config.useColour = UseColour::Auto;
+                    else
+                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if (keypressLc == "never")
+                    config.waitForKeypress = WaitForKeypress::Never;
+                else if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setReporter = [&]( std::string const& reporter ) {
+            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+            auto lcReporter = toLower( reporter );
+            auto result = factories.find( lcReporter );
+
+            if( factories.end() != result )
+                config.reporterName = lcReporter;
+            else
+                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.listTests )
+                ["-l"]["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["-t"]["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.outputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "output filename" )
+            | Opt( setReporter, "name" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( config.minDuration, "seconds" )
+                ["-D"]["--min-duration"]
+                ( "show test durations for tests taking at least the given number of seconds" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTestNamesOnly )
+                ["--list-test-names-only"]
+                ( "list all/matching test cases names only" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all reporters" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setColourUsage, "yes|no" )
+                ["--use-colour"]
+                ( "should output be colourised" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "never|start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
+                ["--benchmark-warmup-time"]
+                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
+            | Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    std::string StreamEndStop::operator+() const {
+        return std::string();
+    }
+
+    NonCopyable::NonCopyable() = default;
+    NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+namespace Catch {
+
+    Config::Config( ConfigData const& data )
+    :   m_data( data ),
+        m_stream( openStream() )
+    {
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
+        }
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
+            m_hasTestFilters = true;
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
+        }
+        m_testSpec = parser.testSpec();
+    }
+
+    std::string const& Config::getFilename() const {
+        return m_data.outputFilename ;
+    }
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+
+    std::string Config::getProcessName() const { return m_data.processName; }
+    std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    std::ostream& Config::stream() const               { return m_stream->stream(); }
+    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
+    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    double Config::minDuration() const                 { return m_data.minDuration; }
+    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
+    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
+    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
+    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
+    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
+
+    IStream const* Config::openStream() {
+        return Catch::makeStream(m_data.outputFilename);
+    }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+// end catch_errno_guard.h
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#include <sstream>
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() = default;
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) override {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = UseColour::Yes;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            getCurrentContext().getConfig()->stream()
+                << '\033' << _escapeCode;
+        }
+    };
+
+    bool useColourOnPlatform() {
+        return
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+            !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+            isatty(STDOUT_FILENO)
+#else
+            false
+#endif
+            ;
+    }
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = useColourOnPlatform()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+    Colour::Colour( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved = true;
+    }
+    Colour& Colour::operator=( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved  = true;
+        return *this;
+    }
+
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != nullptr) {
+            impl->use( _colourCode );
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, Colour const& ) {
+        return os;
+    }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+    class Context : public IMutableContext, NonCopyable {
+
+    public: // IContext
+        IResultCapture* getResultCapture() override {
+            return m_resultCapture;
+        }
+        IRunner* getRunner() override {
+            return m_runner;
+        }
+
+        IConfigPtr const& getConfig() const override {
+            return m_config;
+        }
+
+        ~Context() override;
+
+    public: // IMutableContext
+        void setResultCapture( IResultCapture* resultCapture ) override {
+            m_resultCapture = resultCapture;
+        }
+        void setRunner( IRunner* runner ) override {
+            m_runner = runner;
+        }
+        void setConfig( IConfigPtr const& config ) override {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IConfigPtr m_config;
+        IRunner* m_runner = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+    };
+
+    IMutableContext *IMutableContext::currentContext = nullptr;
+
+    void IMutableContext::createContext()
+    {
+        currentContext = new Context();
+    }
+
+    void cleanUpContext() {
+        delete IMutableContext::currentContext;
+        IMutableContext::currentContext = nullptr;
+    }
+    IContext::~IContext() = default;
+    IMutableContext::~IMutableContext() = default;
+    Context::~Context() = default;
+
+    SimplePcg32& rng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+
+#  include <cassert>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstddef>
+#  include <ostream>
+
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
+
+    namespace Catch {
+        #ifdef __apple_build_version__
+        // The following function is taken directly from the following technical note:
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+    ITransientExpression::~ITransientExpression() = default;
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << " " << op << " " << rhs;
+        else
+            os << lhs << "\n" << op << "\n" << rhs;
+    }
+}
+// end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+#include <stdexcept>
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_enum_values_registry.cpp
+// start catch_enum_values_registry.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    namespace Detail {
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+// end catch_enum_values_registry.h
+
+#include <map>
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurrence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() {}
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.emplace_back(value, valueNames[i++]);
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+// end catch_enum_values_registry.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry();
+        virtual void registerTranslator( const IExceptionTranslator* translator );
+        std::string translateActiveException() const override;
+        std::string tryTranslators() const;
+
+    private:
+        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+    };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+    }
+
+    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        try {
+#ifdef __OBJC__
+            // In Objective-C try objective-c exceptions first
+            @try {
+                return tryTranslators();
+            }
+            @catch (NSException *exception) {
+                return Catch::Detail::stringify( [exception description] );
+            }
+#else
+            // Compiling a mixed mode project with MSVC means that CLR
+            // exceptions will be caught in (...) as well. However, these
+            // do not fill-in std::current_exception and thus lead to crash
+            // when attempting rethrow.
+            // /EHa switch also causes structured exceptions to be caught
+            // here, but they fill-in current_exception properly, so
+            // at worst the output should be a little weird, instead of
+            // causing a crash.
+            if (std::current_exception() == nullptr) {
+                return "Non C++ exception. Possibly a CLR exception.";
+            }
+            return tryTranslators();
+#endif
+        }
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception& ex ) {
+            return ex.what();
+        }
+        catch( std::string& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        if (m_translators.empty()) {
+            std::rethrow_exception(std::current_exception());
+        } else {
+            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+#endif
+
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#include <algorithm>
+
+#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    // If neither SEH nor signal handling is required, the handler impls
+    // do not have to do anything, and can be empty.
+    void FatalConditionHandler::engage_platform() {}
+    void FatalConditionHandler::disengage_platform() {}
+    FatalConditionHandler::FatalConditionHandler() = default;
+    FatalConditionHandler::~FatalConditionHandler() = default;
+
+} // end namespace Catch
+
+#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
+#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
+#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    //! Signals fatal error message to the run context
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+
+    //! Minimal size Catch2 needs for its own fatal error handling.
+    //! Picked anecdotally, so it might not be sufficient on all
+    //! platforms, and for all configurations.
+    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
+} // end unnamed namespace
+
+#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
+        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
+        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
+        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
+    };
+
+    static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    // Since we do not support multiple instantiations, we put these
+    // into global variables and rely on cleaning them up in outlined
+    // constructors/destructors
+    static PVOID exceptionHandlerHandle = nullptr;
+
+    // For MSVC, we reserve part of the stack memory for handling
+    // memory overflow structured exception.
+    FatalConditionHandler::FatalConditionHandler() {
+        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
+        if (!SetThreadStackGuarantee(&guaranteeSize)) {
+            // We do not want to fully error out, because needing
+            // the stack reserve should be rare enough anyway.
+            Catch::cerr()
+                << "Failed to reserve piece of stack."
+                << " Stack overflows will not be reported successfully.";
+        }
+    }
+
+    // We do not attempt to unset the stack guarantee, because
+    // Windows does not support lowering the stack size guarantee.
+    FatalConditionHandler::~FatalConditionHandler() = default;
+
+    void FatalConditionHandler::engage_platform() {
+        // Register as first handler in current chain
+        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+        if (!exceptionHandlerHandle) {
+            CATCH_RUNTIME_ERROR("Could not register vectored exception handler");
+        }
+    }
+
+    void FatalConditionHandler::disengage_platform() {
+        if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) {
+            CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler");
+        }
+        exceptionHandlerHandle = nullptr;
+    }
+
+} // end namespace Catch
+
+#endif // CATCH_CONFIG_WINDOWS_SEH
+
+#if defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
+// which is zero initialization, but not explicit. We want to avoid
+// that.
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+    static char* altStackMem = nullptr;
+    static std::size_t altStackSize = 0;
+    static stack_t oldSigStack{};
+    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
+
+    static void restorePreviousSignalHandlers() {
+        // We set signal handlers back to the previous ones. Hopefully
+        // nobody overwrote them in the meantime, and doesn't expect
+        // their signal handlers to live past ours given that they
+        // installed them after ours..
+        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+        }
+        // Return the old stack
+        sigaltstack(&oldSigStack, nullptr);
+    }
+
+    static void handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        // We need to restore previous signal handlers and let them do
+        // their thing, so that the users can have the debugger break
+        // when a signal is raised, and so on.
+        restorePreviousSignalHandlers();
+        reportFatal( name );
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
+        if (altStackSize == 0) {
+            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
+        }
+        altStackMem = new char[altStackSize]();
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        delete[] altStackMem;
+        // We signal that another instance can be constructed by zeroing
+        // out the pointer.
+        altStackMem = nullptr;
+    }
+
+    void FatalConditionHandler::engage_platform() {
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = altStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+
+    void FatalConditionHandler::disengage_platform() {
+        restorePreviousSignalHandlers();
+    }
+
+} // end namespace Catch
+
+#endif // CATCH_CONFIG_POSIX_SIGNALS
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
+
+#include <limits>
+#include <set>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+    return m_msg;
+}
+
+namespace Generators {
+
+    GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
+    }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+    class ListeningReporter : public IStreamingReporter {
+        using Reporters = std::vector<IStreamingReporterPtr>;
+        Reporters m_listeners;
+        IStreamingReporterPtr m_reporter = nullptr;
+        ReporterPreferences m_preferences;
+
+    public:
+        ListeningReporter();
+
+        void addListener( IStreamingReporterPtr&& listener );
+        void addReporter( IStreamingReporterPtr&& reporter );
+
+    public: // IStreamingReporter
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases( std::string const& spec ) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testGroupStarting( GroupInfo const& groupInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        // The return value indicates if the messages buffer should be cleared:
+        bool assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+        bool isMulti() const override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+    std::ostream& ReporterConfig::stream() const { return *m_stream; }
+    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+    GroupInfo::GroupInfo(  std::string const& _name,
+                           std::size_t _groupIndex,
+                           std::size_t _groupsCount )
+    :   name( _name ),
+        groupIndex( _groupIndex ),
+        groupsCounts( _groupsCount )
+    {}
+
+     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                     std::vector<MessageInfo> const& _infoMessages,
+                                     Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder << assertionResult.getMessage();
+            builder.m_info.message = builder.m_stream.str();
+
+            infoMessages.push_back( builder.m_info );
+        }
+    }
+
+     AssertionStats::~AssertionStats() = default;
+
+    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( _sectionInfo ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+    SectionStats::~SectionStats() = default;
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string const& _stdOut,
+                                   std::string const& _stdErr,
+                                   bool _aborting )
+    : testInfo( _testInfo ),
+        totals( _totals ),
+        stdOut( _stdOut ),
+        stdErr( _stdErr ),
+        aborting( _aborting )
+    {}
+
+    TestCaseStats::~TestCaseStats() = default;
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+                                    Totals const& _totals,
+                                    bool _aborting )
+    :   groupInfo( _groupInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+    :   groupInfo( _groupInfo ),
+        aborting( false )
+    {}
+
+    TestGroupStats::~TestGroupStats() = default;
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestRunStats::~TestRunStats() = default;
+
+    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+    bool IStreamingReporter::isMulti() const { return false; }
+
+    IReporterFactory::~IReporterFactory() = default;
+    IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+    IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+}
+
+#else
+
+    Catch::LeakDetector::LeakDetector() {}
+
+#endif
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config );
+
+    std::size_t listTestsNamesOnly( Config const& config );
+
+    struct TagInfo {
+        void add( std::string const& spelling );
+        std::string all() const;
+
+        std::set<std::string> spellings;
+        std::size_t count = 0;
+    };
+
+    std::size_t listTags( Config const& config );
+
+    std::size_t listReporters();
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+    using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+        }
+
+        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+            if( config.verbosity() >= Verbosity::High ) {
+                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Column( description ).indent(4) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+        }
+
+        if( !config.hasTestFilters() )
+            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+        return matchedTestCases.size();
+    }
+
+    std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            matchedTests++;
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.verbosity() >= Verbosity::High )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    void TagInfo::add( std::string const& spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
+        return out;
+    }
+
+    std::size_t listTags( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCase : matchedTestCases ) {
+            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+                std::string lcaseTagName = toLower( tagName );
+                auto countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( auto const& tagCount : tagCounts ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
+            auto str = rss.str();
+            auto wrapper = Column( tagCount.second.all() )
+                                                    .initialIndent( 0 )
+                                                    .indent( str.size() )
+                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+            Catch::cout() << str << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    std::size_t listReporters() {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        std::size_t maxNameLen = 0;
+        for( auto const& factoryKvp : factories )
+            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+        for( auto const& factoryKvp : factories ) {
+            Catch::cout()
+                    << Column( factoryKvp.first + ":" )
+                            .indent(2)
+                            .width( 5+maxNameLen )
+                    +  Column( factoryKvp.second->getDescription() )
+                            .initialIndent(0)
+                            .indent(2)
+                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+                    << "\n";
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
+        Option<std::size_t> listedCount;
+        getCurrentMutableContext().setConfig( config );
+        if( config->listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( *config );
+        if( config->listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
+        if( config->listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( *config );
+        if( config->listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters();
+        return listedCount;
+    }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        std::string MatcherUntypedBase::toString() const {
+            if( m_cachedToString.empty() )
+                m_cachedToString = describe();
+            return m_cachedToString;
+        }
+
+        MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+    } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_exception.cpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + "\"";
+}
+
+}
+Exception::ExceptionMessageMatcher Message(std::string const& message) {
+    return Exception::ExceptionMessageMatcher(message);
+}
+
+// namespace Exception
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_exception.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_polyfills.hpp
+
+namespace Catch {
+    bool isnan(float f);
+    bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <sstream>
+#include <type_traits>
+#include <iomanip>
+#include <limits>
+
+namespace Catch {
+namespace {
+
+    int32_t convert(float f) {
+        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+        int32_t i;
+        std::memcpy(&i, &f, sizeof(f));
+        return i;
+    }
+
+    int64_t convert(double d) {
+        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+        int64_t i;
+        std::memcpy(&i, &d, sizeof(d));
+        return i;
+    }
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        auto lc = convert(lhs);
+        auto rc = convert(rhs);
+
+        if ((lc < 0) != (rc < 0)) {
+            // Potentially we can have +0 and -0
+            return lhs == rhs;
+        }
+
+        // static cast as a workaround for IBM XLC
+        auto ulpDiff = std::abs(static_cast<FP>(lc - rc));
+        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
+    }
+
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+
+    float nextafter(float x, float y) {
+        return ::nextafterf(x, y);
+    }
+
+    double nextafter(double x, double y) {
+        return ::nextafter(x, y);
+    }
+
+#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
+
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+        start = Catch::nextafter(start, direction);
+#else
+        start = std::nextafter(start, direction);
+#endif
+    }
+    return start;
+}
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
+}
+
+} // end anonymous namespace
+
+namespace Matchers {
+namespace Floating {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        CATCH_ENFORCE(m_type == FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
+        }
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+    std::string WithinUlpsMatcher::describe() const {
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == FloatingPointKind::Double) {
+            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
+    }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+    return Floating::WithinAbsMatcher(target, margin);
+}
+
+Floating::WithinRelMatcher WithinRel(double target, double eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(double target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+Floating::WithinRelMatcher WithinRel(float target, float eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(float target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+        bool RegexMatcher::match(std::string const& matchee) const {
+            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+            if (m_caseSensitivity == CaseSensitive::Choice::No) {
+                flags |= std::regex::icase;
+            }
+            auto reg = std::regex(m_regex, flags);
+            return std::regex_match(matchee, reg);
+        }
+
+        std::string RegexMatcher::describe() const {
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+        return StdString::RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   StringRef const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    bool MessageInfo::operator==( MessageInfo const& other ) const {
+        return sequence == other.sequence;
+    }
+
+    bool MessageInfo::operator<( MessageInfo const& other ) const {
+        return sequence < other.sequence;
+    }
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
+                                           SourceLineInfo const& lineInfo,
+                                           ResultWas::OfType type )
+        :m_info(macroName, lineInfo, type) {}
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info ), m_moved()
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::ScopedMessage( ScopedMessage&& old )
+    : m_info( old.m_info ), m_moved()
+    {
+        old.m_moved = true;
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() && !m_moved ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.empty()) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            }
+        }
+        assert(openings.empty() && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w+")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+            }
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_polyfills.cpp
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
+
+namespace Catch {
+
+namespace {
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+}
+
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
+
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
+    }
+
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
+        }
+    }
+
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
+    }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+    class TestCase;
+    struct IConfig;
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        virtual ~TestRegistry() = default;
+
+        virtual void registerTest( TestCase const& testCase );
+
+        std::vector<TestCase> const& getAllTests() const override;
+        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        std::size_t m_unnamedCount = 0;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class TestInvokerAsFunction : public ITestInvoker {
+        void(*m_testAsFunction)();
+    public:
+        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+        void invoke() const override;
+    };
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+    ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        ~ReporterRegistry() override;
+
+        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+        void registerListener( IReporterFactoryPtr const& factory );
+
+        FactoryMap const& getFactories() const override;
+        Listeners const& getListeners() const override;
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+#endif
+    };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton();
+    };
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+                            private NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            void registerListener( IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerListener( factory );
+            }
+            void registerTest( TestCase const& testInfo ) override {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            void registerTranslator( const IExceptionTranslator* translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+        auto it =  m_factories.find( name );
+        if( it == m_factories.end() )
+            return nullptr;
+        return it->second->create( ReporterConfig( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+        m_factories.emplace(name, factory);
+    }
+    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+        m_listeners.push_back( factory );
+    }
+
+    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+        return m_factories;
+    }
+    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+        return m_listeners;
+    }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace Generators {
+        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+            GeneratorBasePtr m_generator;
+
+            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+            :   TrackerBase( nameAndLocation, ctx, parent )
+            {}
+            ~GeneratorTracker();
+
+            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+                std::shared_ptr<GeneratorTracker> tracker;
+
+                ITracker& currentTracker = ctx.currentTracker();
+                // Under specific circumstances, the generator we want
+                // to acquire is also the current tracker. If this is
+                // the case, we have to avoid looking through current
+                // tracker's children, and instead return the current
+                // tracker.
+                // A case where this check is important is e.g.
+                //     for (int i = 0; i < 5; ++i) {
+                //         int n = GENERATE(1, 2);
+                //     }
+                //
+                // without it, the code above creates 5 nested generators.
+                if (currentTracker.nameAndLocation() == nameAndLocation) {
+                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
+                    assert(thisTracker);
+                    assert(thisTracker->isGeneratorTracker());
+                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
+                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                    assert( childTracker );
+                    assert( childTracker->isGeneratorTracker() );
+                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+                } else {
+                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
+                    currentTracker.addChild( tracker );
+                }
+
+                if( !tracker->isComplete() ) {
+                    tracker->open();
+                }
+
+                return *tracker;
+            }
+
+            // TrackerBase interface
+            bool isGeneratorTracker() const override { return true; }
+            auto hasGenerator() const -> bool override {
+                return !!m_generator;
+            }
+            void close() override {
+                TrackerBase::close();
+                // If a generator has a child (it is followed by a section)
+                // and none of its children have started, then we must wait
+                // until later to start consuming its values.
+                // This catches cases where `GENERATE` is placed between two
+                // `SECTION`s.
+                // **The check for m_children.empty cannot be removed**.
+                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
+                const bool should_wait_for_child = [&]() {
+                    // No children -> nobody to wait for
+                    if ( m_children.empty() ) {
+                        return false;
+                    }
+                    // If at least one child started executing, don't wait
+                    if ( std::find_if(
+                             m_children.begin(),
+                             m_children.end(),
+                             []( TestCaseTracking::ITrackerPtr tracker ) {
+                                 return tracker->hasStarted();
+                             } ) != m_children.end() ) {
+                        return false;
+                    }
+
+                    // No children have started. We need to check if they _can_
+                    // start, and thus we should wait for them, or they cannot
+                    // start (due to filters), and we shouldn't wait for them
+                    auto* parent = m_parent;
+                    // This is safe: there is always at least one section
+                    // tracker in a test case tracking tree
+                    while ( !parent->isSectionTracker() ) {
+                        parent = &( parent->parent() );
+                    }
+                    assert( parent &&
+                            "Missing root (test case) level section" );
+
+                    auto const& parentSection =
+                        static_cast<SectionTracker&>( *parent );
+                    auto const& filters = parentSection.getFilters();
+                    // No filters -> no restrictions on running sections
+                    if ( filters.empty() ) {
+                        return true;
+                    }
+
+                    for ( auto const& child : m_children ) {
+                        if ( child->isSectionTracker() &&
+                             std::find( filters.begin(),
+                                        filters.end(),
+                                        static_cast<SectionTracker&>( *child )
+                                            .trimmedName() ) !=
+                                 filters.end() ) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }();
+
+                // This check is a bit tricky, because m_generator->next()
+                // has a side-effect, where it consumes generator's current
+                // value, but we do not want to invoke the side-effect if
+                // this generator is still waiting for any child to start.
+                if ( should_wait_for_child ||
+                     ( m_runState == CompletedSuccessfully &&
+                       m_generator->next() ) ) {
+                    m_children.clear();
+                    m_runState = Executing;
+                }
+            }
+
+            // IGeneratorTracker interface
+            auto getGenerator() const -> GeneratorBasePtr const& override {
+                return m_generator;
+            }
+            void setGenerator( GeneratorBasePtr&& generator ) override {
+                m_generator = std::move( generator );
+            }
+        };
+        GeneratorTracker::~GeneratorTracker() {}
+    }
+
+    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_context(getCurrentMutableContext()),
+        m_config(_config),
+        m_reporter(std::move(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        m_context.setRunner(this);
+        m_context.setConfig(m_config);
+        m_context.setResultCapture(this);
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+    }
+
+    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCase const& testCase) {
+        Totals prevTotals = m_totals;
+
+        std::string redirectedCout;
+        std::string redirectedCerr;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+
+        m_reporter->testCaseStarting(testInfo);
+
+        m_activeTestCase = &testCase;
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+            runCurrentTest(redirectedCout, redirectedCerr);
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  redirectedCout,
+                                  redirectedCerr,
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+    IConfigPtr RunContext::config() const {
+        return m_config;
+    }
+
+    IStreamingReporter& RunContext::reporter() const {
+        return *m_reporter;
+    }
+
+    void RunContext::assertionEnded(AssertionResult const & result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (!result.isOk()) {
+            m_lastAssertionPassed = false;
+            if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+        // and should be let to clear themselves out.
+        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+        if (result.getResultType() != ResultWas::Warning)
+            m_messageScopes.clear();
+
+        // Reset working state
+        resetAssertionInfo();
+        m_lastResult = result;
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+    }
+
+    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        using namespace Generators;
+        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
+                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+        m_messageScopes.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+        if (m_unfinishedSections.empty())
+            m_activeSections.back()->fail();
+        else
+            m_activeSections.back()->close();
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(endInfo);
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void RunContext::benchmarkPreparing(std::string const& name) {
+        m_reporter->benchmarkPreparing(name);
+    }
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+    void RunContext::benchmarkFailed(std::string const & error) {
+        m_reporter->benchmarkFailed(error);
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
+        m_messageScopes.emplace_back( builder );
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = static_cast<std::string>(message);
+        AssertionResult result(m_lastAssertionInfo, tempResult);
+
+        assertionEnded(result);
+
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        testGroupEnded(std::string(), m_totals, 1, 1);
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+        m_messageScopes.clear();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        seedRng(*m_config);
+
+        Timer timer;
+        CATCH_TRY {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
+
+                timer.start();
+                invokeActiveTestCase();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } CATCH_CATCH_ANON (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } CATCH_CATCH_ALL {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+        m_messageScopes.clear();
+
+        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
+        m_activeTestCase->invoke();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(*it);
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, data };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( assertionResult );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef const& message,
+            AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = static_cast<std::string>(message);
+        AssertionResult assertionResult{ m_lastAssertionInfo, data };
+        assertionEnded( assertionResult );
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string const& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+        populateReaction( reaction );
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+
+    void seedRng(IConfig const& config) {
+        if (config.rngSeed() != 0) {
+            std::srand(config.rngSeed());
+            rng().seed(config.rngSeed());
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+            if( uncaught_exceptions() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name )
+    :   name( _name ),
+        lineInfo( _lineInfo )
+    {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+    class Session : NonCopyable {
+    public:
+
+        Session();
+        ~Session() override;
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
+
+        void useConfigData( ConfigData const& configData );
+
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
+        int run();
+
+        clara::Parser const& cli() const;
+        void cli( clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        clara::Parser m_cli;
+        ConfigData m_configData;
+        std::shared_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+#include <set>
+#include <iterator>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+            return reporter;
+        }
+
+        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+                return createReporter(config->getReporterName(), config);
+            }
+
+            // On older platforms, returning std::unique_ptr<ListeningReporter>
+            // when the return type is std::unique_ptr<IStreamingReporter>
+            // doesn't compile without a std::move call. However, this causes
+            // a warning on newer platforms. Thus, we have to work around
+            // it a bit and downcast the pointer manually.
+            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+            auto& multi = static_cast<ListeningReporter&>(*ret);
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi.addListener(listener->create(Catch::ReporterConfig(config)));
+            }
+            multi.addReporter(createReporter(config->getReporterName(), config));
+            return ret;
+        }
+
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+
+                if (m_matches.empty() && invalidArgs.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
+            }
+
+            Totals execute() {
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
+                }
+
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+
+                if (!invalidArgs.empty()) {
+                    for (auto const& invalidArg: invalidArgs)
+                         m_context.reporter().reportInvalidArguments(invalidArg);
+                }
+
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
+            }
+
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
+
+        void applyFilenamesAsTags(Catch::IConfig const& config) {
+            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+            for (auto& testCase : tests) {
+                auto tags = testCase.tags;
+
+                std::string filename = testCase.lineInfo.file;
+                auto lastSlash = filename.find_last_of("\\/");
+                if (lastSlash != std::string::npos) {
+                    filename.erase(0, lastSlash);
+                    filename[0] = '#';
+                }
+
+                auto lastDot = filename.find_last_of('.');
+                if (lastDot != std::string::npos) {
+                    filename.erase(lastDot);
+                }
+
+                tags.push_back(std::move(filename));
+                setTags(testCase, tags);
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+
+            m_startupExceptions = true;
+            Colour colourGuard( Colour::Red );
+            Catch::cerr() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+#endif
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch v" << libraryVersion() << "\n"
+                << m_cli << std::endl
+                << "For more detailed usage please see the project docs\n" << std::endl;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( clara::Args( argc, argv ) );
+        if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+            Catch::cerr()
+                << Colour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            Catch::cerr() << "Run with -? for usage\n" << std::endl;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+        m_config.reset();
+        return 0;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
+        }
+
+        int returnCode = applyCommandLine( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = std::make_shared<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if (m_configData.showHelp || m_configData.libIdentify) {
+            return 0;
+        }
+
+        CATCH_TRY {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if( m_configData.filenamesAsTags )
+                applyFilenamesAsTags( *m_config );
+
+            // Handle list request
+            if( Option<std::size_t> listed = list( m_config ) )
+                return static_cast<int>( *listed );
+
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+        }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << std::endl;
+            return MaxExitCode;
+        }
+#endif
+    }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() {}
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+// end catch_singletons.cpp
+// start catch_startup_exception_registry.cpp
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+namespace Catch {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
+            m_exceptions.push_back(exception);
+        } CATCH_CATCH_ALL {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+
+} // end namespace Catch
+#endif
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+    namespace Detail { namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const&str ) {
+                writeToDebugConsole( str );
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream : public IStream {
+            mutable std::ofstream m_ofs;
+        public:
+            FileStream( StringRef filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+            }
+            ~FileStream() override = default;
+        public: // IStream
+            std::ostream& stream() const override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream : public IStream {
+            mutable std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+            ~CoutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream : public IStream {
+            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            mutable std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+            ~DebugOutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+    }} // namespace anon::detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( StringRef const &filename ) -> IStream const* {
+        if( filename.empty() )
+            return new Detail::CoutStream();
+        else if( filename[0] == '%' ) {
+            if( filename == "%debug" )
+                return new Detail::DebugOutStream();
+            else
+                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+        }
+        else
+            return new Detail::FileStream( filename );
+    }
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+    };
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        Singleton<StringStreams>::getMutable().release( m_index );
+    }
+
+    auto ReusableStringStream::str() const -> std::string {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+}
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
+        }
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+    {}
+
+    auto StringRef::c_str() const -> char const* {
+        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
+        return m_start;
+    }
+    auto StringRef::data() const noexcept -> char const* {
+        return m_start;
+    }
+
+    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+        if (start < m_size) {
+            return StringRef(m_start + start, (std::min)(m_size - start, size));
+        } else {
+            return StringRef();
+        }
+    }
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return m_size == other.m_size
+            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+    }
+
+    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+        return os.write(str.data(), str.size());
+    }
+
+    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+        lhs.append(rhs.data(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        CATCH_TRY {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+            if( startsWith( tag, '.' ) ||
+                tag == "!hide" )
+                return TestCaseInfo::IsHidden;
+            else if( tag == "!throws" )
+                return TestCaseInfo::Throws;
+            else if( tag == "!shouldfail" )
+                return TestCaseInfo::ShouldFail;
+            else if( tag == "!mayfail" )
+                return TestCaseInfo::MayFail;
+            else if( tag == "!nonportable" )
+                return TestCaseInfo::NonPortable;
+            else if( tag == "!benchmark" )
+                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+            else
+                return TestCaseInfo::None;
+        }
+        bool isReservedTag( std::string const& tag ) {
+            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
+                          << _lineInfo );
+        }
+    }
+
+    TestCase makeTestCase(  ITestInvoker* _testCase,
+                            std::string const& _className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden = false;
+
+        // Parse out tags
+        std::vector<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        for (char c : nameAndTags.tags) {
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    // Merged hide tags like `[.approvals]` should be added as
+                    // `[.][approvals]`. The `[.]` is added at later point, so
+                    // we only strip the prefix
+                    if (startsWith(tag, '.') && tag.size() > 1) {
+                        tag.erase(0, 1);
+                    }
+                    tags.push_back( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            // Add all "hidden" tags to make them behave identically
+            tags.insert( tags.end(), { ".", "!hide" } );
+        }
+
+        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, std::move(info) );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+        testCaseInfo.lcaseTags.clear();
+
+        for( auto const& tag : tags ) {
+            std::string lcaseTag = toLower( tag );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.push_back( lcaseTag );
+        }
+        testCaseInfo.tags = std::move(tags);
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::vector<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret.append(tag);
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        struct TestHasher {
+            using hash_t = uint64_t;
+
+            explicit TestHasher( hash_t hashSuffix ):
+                m_hashSuffix{ hashSuffix } {}
+
+            uint32_t operator()( TestCase const& t ) const {
+                // FNV-1a hash with multiplication fold.
+                const hash_t prime = 1099511628211u;
+                hash_t hash = 14695981039346656037u;
+                for ( const char c : t.name ) {
+                    hash ^= c;
+                    hash *= prime;
+                }
+                hash ^= m_hashSuffix;
+                hash *= prime;
+                const uint32_t low{ static_cast<uint32_t>( hash ) };
+                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
+                return low * high;
+            }
+
+        private:
+            hash_t m_hashSuffix;
+        };
+    } // end unnamed namespace
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+        switch( config.runOrder() ) {
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+
+            case RunTests::InLexicographicalOrder: {
+                std::vector<TestCase> sorted = unsortedTestCases;
+                std::sort( sorted.begin(), sorted.end() );
+                return sorted;
+            }
+
+            case RunTests::InRandomOrder: {
+                seedRng( config );
+                TestHasher h{ config.rngSeed() };
+
+                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
+                std::vector<hashedTest> indexed_tests;
+                indexed_tests.reserve( unsortedTestCases.size() );
+
+                for (auto const& testCase : unsortedTestCases) {
+                    indexed_tests.emplace_back(h(testCase), &testCase);
+                }
+
+                std::sort(indexed_tests.begin(), indexed_tests.end(),
+                          [](hashedTest const& lhs, hashedTest const& rhs) {
+                          if (lhs.first == rhs.first) {
+                              return lhs.second->name < rhs.second->name;
+                          }
+                          return lhs.first < rhs.first;
+                });
+
+                std::vector<TestCase> sorted;
+                sorted.reserve( indexed_tests.size() );
+
+                for (auto const& hashed : indexed_tests) {
+                    sorted.emplace_back(*hashed.second);
+                }
+
+                return sorted;
+            }
+        }
+        return unsortedTestCases;
+    }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
+    }
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( auto const& function : functions ) {
+            auto prev = seenFunctions.insert( function );
+            CATCH_ENFORCE( prev.second,
+                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    void TestRegistry::registerTest( TestCase const& testCase ) {
+        std::string name = testCase.getTestCaseInfo().name;
+        if( name.empty() ) {
+            ReusableStringStream rss;
+            rss << "Anonymous test case " << ++m_unnamedCount;
+            return registerTest( testCase.withName( rss.str() ) );
+        }
+        m_functions.push_back( testCase );
+    }
+
+    std::vector<TestCase> const& TestRegistry::getAllTests() const {
+        return m_functions;
+    }
+    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_functions );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_functions );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+    void TestInvokerAsFunction::invoke() const {
+        m_testAsFunction();
+    }
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+        std::string className(classOrQualifiedMethodName);
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+    :   name( _name ),
+        location( _location )
+    {}
+
+    ITracker::~ITracker() = default;
+
+    ITracker& TrackerContext::startRun() {
+        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::endRun() {
+        m_rootTracker.reset();
+        m_currentTracker = nullptr;
+        m_runState = NotStarted;
+    }
+
+    void TrackerContext::startCycle() {
+        m_currentTracker = m_rootTracker.get();
+        m_runState = Executing;
+    }
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    ITracker& TrackerContext::currentTracker() {
+        return *m_currentTracker;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
+        ITracker(nameAndLocation),
+        m_ctx( ctx ),
+        m_parent( parent )
+    {}
+
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+    bool TrackerBase::isSuccessfullyCompleted() const {
+        return m_runState == CompletedSuccessfully;
+    }
+    bool TrackerBase::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+    bool TrackerBase::hasChildren() const {
+        return !m_children.empty();
+    }
+
+    void TrackerBase::addChild( ITrackerPtr const& child ) {
+        m_children.push_back( child );
+    }
+
+    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+        auto it = std::find_if( m_children.begin(), m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ){
+                return
+                    tracker->nameAndLocation().location == nameAndLocation.location &&
+                    tracker->nameAndLocation().name == nameAndLocation.name;
+            } );
+        return( it != m_children.end() )
+            ? *it
+            : nullptr;
+    }
+    ITracker& TrackerBase::parent() {
+        assert( m_parent ); // Should always be non-null except for root
+        return *m_parent;
+    }
+
+    void TrackerBase::openChild() {
+        if( m_runState != ExecutingChildren ) {
+            m_runState = ExecutingChildren;
+            if( m_parent )
+                m_parent->openChild();
+        }
+    }
+
+    bool TrackerBase::isSectionTracker() const { return false; }
+    bool TrackerBase::isGeneratorTracker() const { return false; }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_trimmed_name(trim(nameAndLocation.name))
+    {
+        if( parent ) {
+            while( !parent->isSectionTracker() )
+                parent = &parent->parent();
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if (m_filters.empty()
+            || m_filters[0] == ""
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+        std::shared_ptr<SectionTracker> section;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            section = std::static_pointer_cast<SectionTracker>( childTracker );
+        }
+        else {
+            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
+            currentTracker.addChild( section );
+        }
+        if( !ctx.completedCycle() )
+            section->tryOpen();
+        return *section;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.emplace_back(""); // Root - should never be consulted
+            m_filters.emplace_back(""); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
+    }
+
+    std::vector<std::string> const& SectionTracker::getFilters() const {
+        return m_filters;
+    }
+
+    std::string const& SectionTracker::trimmedName() const {
+        return m_trimmed_name;
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+    }
+
+    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        CATCH_TRY {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCase(
+                            invoker,
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo));
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+    AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
+        return  (m_invalidArgs);
+    }
+
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidArgs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
+    }
+
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
+    }
+
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         m_realPatternPos = 0;
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
+
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
+        }
+
+        m_patternName.clear();
+        m_realPatternPos = 0;
+
+        return token;
+    }
+
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
+            if (m_exclusion)
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
+                if (m_exclusion) {
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+                }
+                m_currentFilter.m_patterns.push_back(pattern);
+            }
+
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
+
+            if (m_exclusion) {
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            }
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+    }
+
+    namespace {
+        auto estimateClockResolution() -> uint64_t {
+            uint64_t sum = 0;
+            static const uint64_t iterations = 1000000;
+
+            auto startTime = getCurrentNanosecondsSinceEpoch();
+
+            for( std::size_t i = 0; i < iterations; ++i ) {
+
+                uint64_t ticks;
+                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+                do {
+                    ticks = getCurrentNanosecondsSinceEpoch();
+                } while( ticks == baseTicks );
+
+                auto delta = ticks - baseTicks;
+                sum += delta;
+
+                // If we have been calibrating for over 3 seconds -- the clock
+                // is terrible and we should move on.
+                // TBD: How to signal that the measured resolution is probably wrong?
+                if (ticks > startTime + 3 * nanosecondsInSecond) {
+                    return sum / ( i + 1u );
+                }
+            }
+
+            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+            // - and potentially do more iterations if there's a high variance.
+            return sum/iterations;
+        }
+    }
+    auto getEstimatedClockResolution() -> uint64_t {
+        static auto s_resolution = estimateClockResolution();
+        return s_resolution;
+    }
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#    pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    if (Catch::isnan(value)) {
+        return "nan";
+    }
+
+    ReusableStringStream rss;
+    rss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = rss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    if (!getCurrentContext().getConfig()->showInvisibles()) {
+        return '"' + str + '"';
+    }
+
+    std::string s("\"");
+    for (char c : str) {
+        switch (c) {
+        case '\n':
+            s.append("\\n");
+            break;
+        case '\t':
+            s.append("\\t");
+            break;
+        default:
+            s.push_back(c);
+            break;
+        }
+    }
+    s.append("\"");
+    return s;
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return ::Catch::Detail::stringify(std::string{ str });
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+    return b ? "true" : "false";
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+    return "nullptr";
+}
+
+int StringMaker<float>::precision = 5;
+
+std::string StringMaker<float>::convert(float value) {
+    return fpToString(value, precision) + 'f';
+}
+
+int StringMaker<double>::precision = 10;
+
+std::string StringMaker<double>::convert(double value) {
+    return fpToString(value, precision);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        return *this;
+    }
+
+    std::size_t Counts::total() const {
+        return passed + failed + failedButOk;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+// start catch_config_uncaught_exceptions.hpp
+
+//              Copyright Catch2 Authors
+// Distributed under the Boost Software License, Version 1.0.
+//   (See accompanying file LICENSE_1_0.txt or copy at
+//        https://www.boost.org/LICENSE_1_0.txt)
+
+// SPDX-License-Identifier: BSL-1.0
+
+#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+
+#if defined(_MSC_VER)
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+#endif
+
+#include <exception>
+
+#if defined(__cpp_lib_uncaught_exceptions) \
+    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif // __cpp_lib_uncaught_exceptions
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
+    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
+// end catch_config_uncaught_exceptions.hpp
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        return false;
+#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 2, 13, 8, "", 0 );
+        return version;
+    }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive::Choice caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( normaliseString( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == normaliseString( str );
+            case WildcardAtStart:
+                return endsWith( normaliseString( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( normaliseString( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( normaliseString( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
+    }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+#include <type_traits>
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
+    }
+
+} // anonymous namespace
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            unsigned char c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    unsigned char nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
+        other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while (!m_tags.empty()) {
+            endElement();
+        }
+        newlineIfNecessary();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
+        m_tags.push_back( name );
+        m_tagIsOpen = true;
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << ">";
+        }
+        m_os << std::flush;
+        applyFormatting(fmt);
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if (tagWasOpen && shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << XmlEncode( text );
+            applyFormatting(fmt);
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
+        ensureTagClosed();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!--" << text << "-->";
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( std::string const& url ) {
+        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    }
+
+    XmlWriter& XmlWriter::writeBlankLine() {
+        ensureTagClosed();
+        m_os << '\n';
+        return *this;
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result) {
+        result.getExpandedExpression();
+    }
+
+    // Because formatting using c++ streams is stateful, drop down to C is required
+    // Alternatively we could use stringstream, but its performance is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        sprintf_s(buffer, "%.3f", duration);
+#else
+        std::sprintf(buffer, "%.3f", duration);
+#endif
+        return std::string(buffer);
+    }
+
+    bool shouldShowDuration( IConfig const& config, double duration ) {
+        if ( config.showDurations() == ShowDurations::Always ) {
+            return true;
+        }
+        if ( config.showDurations() == ShowDurations::Never ) {
+            return false;
+        }
+        const double min = config.minDuration();
+        return min >= 0 && duration >= min;
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& container ) {
+        ReusableStringStream oss;
+        bool first = true;
+        for (auto&& filter : container)
+        {
+            if (!first)
+                oss << ' ';
+            else
+                first = false;
+
+            oss << filter;
+        }
+        return oss.str();
+    }
+
+    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+        :StreamingReporterBase(_config) {}
+
+    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+    }
+
+    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+    const char* failedString() { return "FAILED"; }
+    const char* passedString() { return "PASSED"; }
+#else
+    const char* failedString() { return "failed"; }
+    const char* passedString() { return "passed"; }
+#endif
+
+    // Colour::LightGrey
+    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+    std::string bothOrAll( std::size_t count ) {
+        return count == 1 ? std::string() :
+               count == 2 ? "both " : "all " ;
+    }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+    if (totals.testCases.total() == 0) {
+        out << "No tests ran.";
+    } else if (totals.testCases.failed == totals.testCases.total()) {
+        Colour colour(Colour::ResultError);
+        const std::string qualify_assertions_failed =
+            totals.assertions.failed == totals.assertions.total() ?
+            bothOrAll(totals.assertions.failed) : std::string();
+        out <<
+            "Failed " << bothOrAll(totals.testCases.failed)
+            << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << qualify_assertions_failed <<
+            pluralise(totals.assertions.failed, "assertion") << '.';
+    } else if (totals.assertions.total() == 0) {
+        out <<
+            "Passed " << bothOrAll(totals.testCases.total())
+            << pluralise(totals.testCases.total(), "test case")
+            << " (no assertions).";
+    } else if (totals.assertions.failed) {
+        Colour colour(Colour::ResultError);
+        out <<
+            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+    } else {
+        Colour colour(Colour::ResultSuccess);
+        out <<
+            "Passed " << bothOrAll(totals.testCases.passed)
+            << pluralise(totals.testCases.passed, "test case") <<
+            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+    }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages) {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, passedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+            else
+                printResultType(Colour::Error, failedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, failedString());
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, failedString());
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, failedString());
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, failedString());
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+        if (!passOrFail.empty()) {
+            {
+                Colour colourGuard(colour);
+                stream << ' ' << passOrFail;
+            }
+            stream << ':';
+        }
+    }
+
+    void printIssue(std::string const& issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                Colour colour(dimColour());
+                stream << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            {
+                Colour colour(dimColour());
+                stream << " for: ";
+            }
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = dimColour()) {
+        if (itMessage == messages.end())
+            return;
+
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+        {
+            Colour colourGuard(colour);
+            stream << " with " << pluralise(N, "message") << ':';
+        }
+
+        while (itMessage != itEnd) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                printMessage();
+                if (itMessage != itEnd) {
+                    Colour colourGuard(dimColour());
+                    stream << " and";
+                }
+                continue;
+            }
+            ++itMessage;
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            double dur = _sectionStats.durationInSeconds;
+            if ( shouldShowDuration( *m_config, dur ) ) {
+                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( stream, _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() {}
+
+    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        message(result.getMessage()),
+        messages(_stats.infoMessages),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED";
+            //if( result.hasMessage() )
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok";
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED";
+            }
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to unexpected exception with ";
+            if (_stats.infoMessages.size() == 1)
+                messageLabel += "message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel += "messages";
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to a fatal error condition";
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "because no exception was thrown where one was expected";
+            break;
+        case ResultWas::Info:
+            messageLabel = "info";
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning";
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED";
+            colour = Colour::Error;
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "explicitly with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "explicitly with messages";
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **";
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            Colour colourGuard(colour);
+            stream << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            Colour colourGuard(Colour::OriginalExpression);
+            stream << "  ";
+            stream << result.getExpressionInMacro();
+            stream << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            Colour colourGuard(Colour::ReconstructedExpression);
+            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    std::string passOrFail;
+    std::string messageLabel;
+    std::string message;
+    std::vector<MessageInfo> messages;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+    if (i > j && i > k)
+        return i;
+    else if (j > k)
+        return j;
+    else
+        return k;
+}
+
+struct ColumnInfo {
+    enum Justification { Left, Right };
+    std::string name;
+    int width;
+    Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    double m_inNanoseconds;
+    Unit m_units;
+
+public:
+    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return m_inNanoseconds;
+        }
+    }
+    auto unitsAsString() const -> std::string {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns";
+        case Unit::Microseconds:
+            return "us";
+        case Unit::Milliseconds:
+            return "ms";
+        case Unit::Seconds:
+            return "s";
+        case Unit::Minutes:
+            return "m";
+        default:
+            return "** internal error **";
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << duration.value() << ' ' << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    std::ostringstream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( std::move( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+
+			Columns headerCols;
+			Spacer spacer(2);
+			for (auto const& info : m_columnInfos) {
+				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
+				headerCols += spacer;
+			}
+			m_os << headerCols << '\n';
+
+            m_os << Catch::getLineOfChars<'-'>() << '\n';
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << std::endl;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        const auto strSize = colStr.size();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << '\n';
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 1), ' ')
+            : std::string();
+        if (colInfo.justification == ColumnInfo::Left)
+            tp.m_os << colStr << padding << ' ';
+        else
+            tp.m_os << padding << colStr << ' ';
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << '\n';
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+    : StreamingReporterBase(config),
+    m_tablePrinter(new TablePrinter(config.stream(),
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "     samples", 14, ColumnInfo::Right },
+                { "  iterations", 14, ColumnInfo::Right },
+                { "        mean", 14, ColumnInfo::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "samples      mean       std dev", 14, ColumnInfo::Right },
+                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
+                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
+            };
+        }
+    }())) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+    stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::reportInvalidArguments(std::string const&arg){
+    stream << "Invalid Filter: " << arg << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    if (!includeResults && result.getResultType() != ResultWas::Warning)
+        return false;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+    printer.print();
+    stream << std::endl;
+    return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        Colour colour(Colour::ResultError);
+        if (m_sectionStack.size() > 1)
+            stream << "\nNo assertions in section";
+        else
+            stream << "\nNo assertions in test case";
+        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+    }
+    double dur = _sectionStats.durationInSeconds;
+    if (shouldShowDuration(*m_config, dur)) {
+        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+void ConsoleReporter::benchmarkPreparing(std::string const& name) {
+	lazyPrintWithoutClosingBenchmarkTable();
+
+	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
+
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if (!m_config->benchmarkNoAnalysis())
+        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
+    }
+}
+
+void ConsoleReporter::benchmarkFailed(std::string const& error) {
+	Colour colour(Colour::Red);
+    (*m_tablePrinter)
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
+}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+    if (currentGroupInfo.used) {
+        printSummaryDivider();
+        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+        printTotals(_testGroupStats.totals);
+        stream << '\n' << std::endl;
+    }
+    StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTotals(_testRunStats.totals);
+    stream << std::endl;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
+    StreamingReporterBase::testRunStarting(_testInfo);
+    printTestFilters();
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if (!currentTestRunInfo.used)
+        lazyPrintRunInfo();
+    if (!currentGroupInfo.used)
+        lazyPrintGroupInfo();
+
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    stream << '\n' << getLineOfChars<'~'>() << '\n';
+    Colour colour(Colour::SecondaryText);
+    stream << currentTestRunInfo->name
+        << " is a Catch v" << libraryVersion() << " host application.\n"
+        << "Run with -? for options\n\n";
+
+    if (m_config->rngSeed() != 0)
+        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+    currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+        printClosedHeader("Group: " + currentGroupInfo->name);
+        currentGroupInfo.used = true;
+    }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        Colour colourGuard(Colour::Headers);
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+    stream << getLineOfChars<'-'>() << '\n';
+    Colour colourGuard(Colour::FileName);
+    stream << lineInfo << '\n';
+    stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    stream << getLineOfChars<'-'>() << '\n';
+    {
+        Colour colourGuard(Colour::Headers);
+        printHeaderString(_name);
+    }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    std::size_t i = _string.find(": ");
+    if (i != std::string::npos)
+        i += 2;
+    else
+        i = 0;
+    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+    SummaryColumn( std::string _label, Colour::Code _colour )
+    :   label( std::move( _label ) ),
+        colour( _colour ) {}
+    SummaryColumn addRow( std::size_t count ) {
+        ReusableStringStream rss;
+        rss << count;
+        std::string row = rss.str();
+        for (auto& oldRow : rows) {
+            while (oldRow.size() < row.size())
+                oldRow = ' ' + oldRow;
+            while (oldRow.size() > row.size())
+                row = ' ' + row;
+        }
+        rows.push_back(row);
+        return *this;
+    }
+
+    std::string label;
+    Colour::Code colour;
+    std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+    if (totals.testCases.total() == 0) {
+        stream << Colour(Colour::Warning) << "No tests ran\n";
+    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+        stream << Colour(Colour::ResultSuccess) << "All tests passed";
+        stream << " ("
+            << pluralise(totals.assertions.passed, "assertion") << " in "
+            << pluralise(totals.testCases.passed, "test case") << ')'
+            << '\n';
+    } else {
+
+        std::vector<SummaryColumn> columns;
+        columns.push_back(SummaryColumn("", Colour::None)
+                          .addRow(totals.testCases.total())
+                          .addRow(totals.assertions.total()));
+        columns.push_back(SummaryColumn("passed", Colour::Success)
+                          .addRow(totals.testCases.passed)
+                          .addRow(totals.assertions.passed));
+        columns.push_back(SummaryColumn("failed", Colour::ResultError)
+                          .addRow(totals.testCases.failed)
+                          .addRow(totals.assertions.failed));
+        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+                          .addRow(totals.testCases.failedButOk)
+                          .addRow(totals.assertions.failedButOk));
+
+        printSummaryRow("test cases", columns, 0);
+        printSummaryRow("assertions", columns, 1);
+    }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+    for (auto col : cols) {
+        std::string value = col.rows[row];
+        if (col.label.empty()) {
+            stream << label << ": ";
+            if (value != "0")
+                stream << value;
+            else
+                stream << Colour(Colour::Warning) << "- none -";
+        } else if (value != "0") {
+            stream << Colour(Colour::LightGrey) << " | ";
+            stream << Colour(col.colour)
+                << value << ' ' << col.label;
+        }
+    }
+    stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+        if (totals.testCases.allPassed())
+            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+        else
+            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+    } else {
+        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+    }
+    stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+    stream << getLineOfChars<'-'>() << '\n';
+}
+
+void ConsoleReporter::printTestFilters() {
+    if (m_config->testSpec().hasFilters()) {
+        Colour guard(Colour::BrightYellow);
+        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
+    }
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp, timeStampSize-1);
+        }
+
+        std::string fileNameTag(const std::vector<std::string> &tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (std::string const& tag) {return tag.front() == '#'; });
+            if (it != tags.end())
+                return it->substr(1);
+            return std::string();
+        }
+
+        // Formats the duration in seconds to 3 decimal places.
+        // This is done because some genius defined Maven Surefire schema
+        // in a way that only accepts 3 decimal places, and tools like
+        // Jenkins use that schema for validation JUnit reporter output.
+        std::string formatDuration( double seconds ) {
+            ReusableStringStream rss;
+            rss << std::fixed << std::setprecision( 3 ) << seconds;
+            return rss.str();
+        }
+
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+            m_reporterPrefs.shouldReportAllAssertions = true;
+        }
+
+    JunitReporter::~JunitReporter() {}
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+    }
+
+    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+        CumulativeReporterBase::testGroupStarting( groupInfo );
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        return CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        double suiteTime = suiteTimer.getElapsedSeconds();
+        CumulativeReporterBase::testGroupEnded( testGroupStats );
+        writeGroup( *m_testGroups.back(), suiteTime );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        xml.endElement();
+    }
+
+    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
+        TestGroupStats const& stats = groupNode.value;
+        xml.writeAttribute( "name", stats.groupInfo.name );
+        xml.writeAttribute( "errors", unexpectedExceptions );
+        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "tests", stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname", "tbd" ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time", "" );
+        else
+            xml.writeAttribute( "time", formatDuration( suiteTime ) );
+        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+        // Write properties if there are any
+        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
+            auto properties = xml.scopedElement("properties");
+            if (m_config->hasTestFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "filters")
+                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
+            }
+            if (m_config->rngSeed() != 0) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "random-seed")
+                    .writeAttribute("value", m_config->rngSeed());
+            }
+        }
+
+        // Write test cases
+        for( auto const& child : groupNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className = stats.testInfo.className;
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo.tags);
+            if ( className.empty() )
+                className = "global";
+        }
+
+        if ( !m_config->name().empty() )
+            className = m_config->name() + "." + className;
+
+        writeSection( className, "", rootSection, stats.testInfo.okToFail() );
+    }
+
+    void JunitReporter::writeSection( std::string const& className,
+                                      std::string const& rootName,
+                                      SectionNode const& sectionNode,
+                                      bool testOkToFail) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( !sectionNode.assertions.empty() ||
+            !sectionNode.stdOut.empty() ||
+            !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname", name );
+                xml.writeAttribute( "name", "root" );
+            }
+            else {
+                xml.writeAttribute( "classname", className );
+                xml.writeAttribute( "name", name );
+            }
+            xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) );
+            // This is not ideal, but it should be enough to mimic gtest's
+            // junit output.
+            // Ideally the JUnit reporter would also handle `skipTest`
+            // events and write those out appropriately.
+            xml.writeAttribute( "status", "run" );
+
+            if (sectionNode.stats.assertions.failedButOk) {
+                xml.scopedElement("skipped")
+                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
+            }
+
+            writeAssertions( sectionNode );
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode, testOkToFail );
+            else
+                writeSection( className, name, *childNode, testOkToFail );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for( auto const& assertion : sectionNode.assertions )
+            writeAssertion( assertion );
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if( !result.isOk() ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                case ResultWas::ExpressionFailed:
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message", result.getExpression() );
+            xml.writeAttribute( "type", result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if (stats.totals.assertions.total() > 0) {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            } else {
+                rss << '\n';
+            }
+
+            if( !result.getMessage().empty() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), XmlFormatting::Newline );
+        }
+    }
+
+    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+    ListeningReporter::ListeningReporter() {
+        // We will assume that listeners will always want all assertions
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        m_listeners.push_back( std::move( listener ) );
+    }
+
+    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+        m_reporter = std::move( reporter );
+        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+    }
+
+    ReporterPreferences ListeningReporter::getPreferences() const {
+        return m_preferences;
+    }
+
+    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+        return std::set<Verbosity>{ };
+    }
+
+    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->noMatchingTestCases( spec );
+        }
+        m_reporter->noMatchingTestCases( spec );
+    }
+
+    void ListeningReporter::reportInvalidArguments(std::string const&arg){
+        for ( auto const& listener : m_listeners ) {
+            listener->reportInvalidArguments( arg );
+        }
+        m_reporter->reportInvalidArguments( arg );
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkPreparing(name);
+		}
+		m_reporter->benchmarkPreparing(name);
+	}
+    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkStarting( benchmarkInfo );
+        }
+        m_reporter->benchmarkStarting( benchmarkInfo );
+    }
+    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkEnded( benchmarkStats );
+        }
+        m_reporter->benchmarkEnded( benchmarkStats );
+    }
+
+	void ListeningReporter::benchmarkFailed( std::string const& error ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkFailed(error);
+		}
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunStarting( testRunInfo );
+        }
+        m_reporter->testRunStarting( testRunInfo );
+    }
+
+    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupStarting( groupInfo );
+        }
+        m_reporter->testGroupStarting( groupInfo );
+    }
+
+    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseStarting( testInfo );
+        }
+        m_reporter->testCaseStarting( testInfo );
+    }
+
+    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionStarting( sectionInfo );
+        }
+        m_reporter->sectionStarting( sectionInfo );
+    }
+
+    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->assertionStarting( assertionInfo );
+        }
+        m_reporter->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        for( auto const& listener : m_listeners ) {
+            static_cast<void>( listener->assertionEnded( assertionStats ) );
+        }
+        return m_reporter->assertionEnded( assertionStats );
+    }
+
+    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionEnded( sectionStats );
+        }
+        m_reporter->sectionEnded( sectionStats );
+    }
+
+    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseEnded( testCaseStats );
+        }
+        m_reporter->testCaseEnded( testCaseStats );
+    }
+
+    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupEnded( testGroupStats );
+        }
+        m_reporter->testGroupEnded( testGroupStats );
+    }
+
+    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunEnded( testRunStats );
+        }
+        m_reporter->testRunEnded( testRunStats );
+    }
+
+    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->skipTest( testInfo );
+        }
+        m_reporter->skipTest( testInfo );
+    }
+
+    bool ListeningReporter::isMulti() const {
+        return true;
+    }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig const& _config )
+    :   StreamingReporterBase( _config ),
+        m_xml(_config.stream())
+    {
+        m_reporterPrefs.shouldRedirectStdOut = true;
+        m_reporterPrefs.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename", sourceInfo.file )
+            .writeAttribute( "line", sourceInfo.line );
+    }
+
+    void XmlReporter::noMatchingTestCases( std::string const& s ) {
+        StreamingReporterBase::noMatchingTestCases( s );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement( "Catch" );
+        if( !m_config->name().empty() )
+            m_xml.writeAttribute( "name", m_config->name() );
+        if (m_config->testSpec().hasFilters())
+            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
+        if( m_config->rngSeed() != 0 )
+            m_xml.scopedElement( "Randomness" )
+                .writeAttribute( "seed", m_config->rngSeed() );
+    }
+
+    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        StreamingReporterBase::testGroupStarting( groupInfo );
+        m_xml.startElement( "Group" )
+            .writeAttribute( "name", groupInfo.name );
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name", trim( testInfo.name ) )
+            .writeAttribute( "description", testInfo.description )
+            .writeAttribute( "tags", testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name", trim( sectionInfo.name ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    m_xml.scopedElement( "Info" )
+                            .writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    m_xml.scopedElement( "Warning" )
+                            .writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if( !includeResults && result.getResultType() != ResultWas::Warning )
+            return true;
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success", result.succeeded() )
+                .writeAttribute( "type", result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                    .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+
+        return true;
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if( --m_sectionDepth > 0 ) {
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+            e.writeAttribute( "successes", sectionStats.assertions.passed );
+            e.writeAttribute( "failures", sectionStats.assertions.failed );
+            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        StreamingReporterBase::testGroupEnded( testGroupStats );
+        // TODO: Check testGroupStats.aborting and act accordingly.
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
+            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
+            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
+        m_xml.startElement("BenchmarkResults")
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
+            .writeAttribute("resamples", info.resamples)
+            .writeAttribute("iterations", info.iterations)
+            .writeAttribute("clockResolution", info.clockResolution)
+            .writeAttribute("estimatedDuration", info.estimatedDuration)
+            .writeComment("All values in nano seconds");
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.startElement("mean")
+            .writeAttribute("value", benchmarkStats.mean.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("standardDeviation")
+            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("outliers")
+            .writeAttribute("variance", benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(std::string const &error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message", error);
+        m_xml.endElement();
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+    LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... )        (void)(0)
+#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... )         (void)(0)
+#define CATCH_CHECK_FALSE( ... )   (void)(0)
+#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+#define CATCH_CHECK_THROWS( ... )  (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg )          (void)(0)
+#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg )          (void)(0)
+#define CATCH_CAPTURE( msg )       (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... )       (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... )  (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define UNSCOPED_INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... )       (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
+
+#define GIVEN( desc )
+#define AND_GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/Testing/Cpp/TestControlAccess.cc b/Testing/Cpp/TestControlAccess.cc
new file mode 100644
index 0000000..215981b
--- /dev/null
+++ b/Testing/Cpp/TestControlAccess.cc
@@ -0,0 +1,65 @@
+/*
+ * TestControlAccesss.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+
+#include "ControlAccess.hh"
+
+#include <thread>
+
+#include "catch.hpp"
+
+
+TEST_CASE( "control_access", "[control_access]" )
+{
+    using namespace Nymph;
+
+    ControlAccess control;
+
+    SECTION( "One Return" )
+    {
+        int intReturn = 5;
+
+        REQUIRE_THROWS( control.GetReturn< int >() );
+
+        control.SetReturn< int >( intReturn );
+
+        REQUIRE( std::get< 0 >(control.GetReturn< int >()) == intReturn );
+        REQUIRE_THROWS( control.GetReturn< unsigned >() );
+    }
+
+    SECTION( "Two Returns" )
+    {
+        int return1 = 5;
+        double return2 = 10.;
+
+        control.SetReturn< int, double >( return1, return2 );
+
+        REQUIRE( std::get< 0 >(control.GetReturn< int, double >()) == return1 );
+        REQUIRE( std::get< 1 >(control.GetReturn< int, double >()) == return2 );
+    }
+
+    SECTION( "Break" )
+    {
+        SharedControl* shared = SharedControl::create_instance();
+
+        std::thread thread( [&](){ 
+            shared->Break();
+        } );
+        
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+        REQUIRE( shared->GetBreakFlag() );
+
+        shared->Resume();
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+        REQUIRE_FALSE( shared->GetBreakFlag() );
+
+        thread.join();
+
+        REQUIRE_FALSE( shared->GetBreakFlag() );
+    }
+
+}
\ No newline at end of file
diff --git a/Testing/Cpp/TestData.cc b/Testing/Cpp/TestData.cc
new file mode 100644
index 0000000..8682488
--- /dev/null
+++ b/Testing/Cpp/TestData.cc
@@ -0,0 +1,28 @@
+/*
+ * TestData.cc
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "TestDataClasses.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "data", "[data]" )
+{
+    using namespace Nymph;
+
+    TestData1 data1;
+    REQUIRE( data1.GetIValue1() == 0 );
+    REQUIRE( data1.GetIValue2() == 5 );
+
+    data1.SetIValue1( 50 );
+    REQUIRE( data1.GetIValue1() == 50 );
+
+    TestData2 data2;
+    REQUIRE( data2.GetDValue1() == Approx( 0.0 ) );
+    REQUIRE( data2.GetDValue2() == Approx( 10.0 ) );
+
+}
diff --git a/Testing/Cpp/TestDataClasses.hh b/Testing/Cpp/TestDataClasses.hh
new file mode 100644
index 0000000..c23650a
--- /dev/null
+++ b/Testing/Cpp/TestDataClasses.hh
@@ -0,0 +1,54 @@
+/*
+ * TestDataClasses.hh
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_TESTING_TESTDATACLASSES
+#define NYMPH_TESTING_TESTDATACLASSES
+
+#include "Data.hh"
+#include "MemberVariable.hh"
+
+#include <iostream>
+namespace Nymph
+{
+    class TestData1 : public Data
+    {
+        public:
+            TestData1() :
+                    Data(),
+                    fIValue1( 0 ),
+                    fIValue2( 5 )
+            {
+                std::cerr << "in test data 1 constuctor" << std::endl;
+            }
+
+            virtual ~TestData1()
+            {}
+
+            MEMVAR( int, IValue1 );
+            MEMVAR( int, IValue2 );
+    };
+
+    class TestData2 : public Data
+    {
+        public:
+            TestData2() :
+                    Data(),
+                    fDValue1( 0. ),
+                    fDValue2( 10. )
+            {}
+
+            virtual ~TestData2()
+            {}
+
+            MEMVAR( double, DValue1 );
+            MEMVAR( double, DValue2 );
+    };
+
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_TESTING_TESTDATACLASSES */
diff --git a/Testing/Cpp/TestDataFrame.cc b/Testing/Cpp/TestDataFrame.cc
new file mode 100644
index 0000000..100ca62
--- /dev/null
+++ b/Testing/Cpp/TestDataFrame.cc
@@ -0,0 +1,72 @@
+/*
+ * TestDataFrame.cc
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "TestDataClasses.hh"
+
+#include "DataFrame.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "data_frame", "[data]" )
+{
+    using namespace Nymph;
+
+    DataFrame frame;
+    const DataFrame& cFrame = frame;
+
+    REQUIRE( frame.DataObjects().empty() );
+    REQUIRE( frame.Empty() );
+    REQUIRE_FALSE( frame.Has< TestData1 >() );
+    REQUIRE_FALSE( frame.Has< TestData2 >() );
+
+    // create a data object  with Get()
+    TestData1& data1 = frame.Get< TestData1 >();
+    REQUIRE( frame.Has< TestData1 >() );
+    // ensure TestData1 object was initialized correctly
+    REQUIRE( data1.GetIValue1() == 0 );
+    REQUIRE( data1.GetIValue2() == 5 );
+
+    // make sure that we haven't made a copy of the data object
+    data1.SetIValue1( 50 );
+    REQUIRE( data1.GetIValue1() == 50 );
+    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 50 );
+
+    // check const access
+    // currently has TestData1; does not have TestData2
+    REQUIRE( cFrame.Get< TestData1 >().GetIValue1() == 50 );
+    REQUIRE_THROWS_AS( cFrame.Get< TestData2 >(), DataFrameException );
+
+    // remove a data object
+    // currently has TestData1; does not have TestData2
+    REQUIRE_NOTHROW( frame.Remove< TestData2 >() );
+    REQUIRE_NOTHROW( frame.Remove< TestData1 >() );
+    REQUIRE_FALSE( frame.Has< TestData1 >() );
+    REQUIRE( frame.Empty() );
+
+    // set an object with a raw pointer
+    TestData2* newTestData2Ptr = new TestData2();
+    REQUIRE_NOTHROW( frame.Set( newTestData2Ptr ) );
+    REQUIRE( frame.Has< TestData2 >() );
+    REQUIRE( (Data*)newTestData2Ptr == frame.DataObjects()[typeid(TestData2)].get() ); // we did not make a copy
+
+    // set an object with a unique_ptr
+    std::unique_ptr< TestData1 > newTestData1Ptr( new TestData1 );
+    REQUIRE_NOTHROW( frame.Set( std::move(newTestData1Ptr) ) );
+    REQUIRE_FALSE( newTestData1Ptr );
+    REQUIRE( frame.Has< TestData1 >() );
+    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 0 ); // check that fIValue1 has the default value; we'll overwrite the data object next, and verify we have the new value
+
+    // set an object with a copy of an object
+    TestData1 anotherTestData1;
+    anotherTestData1.SetIValue1( 4000 );
+    REQUIRE_NOTHROW( frame.Set( anotherTestData1 ) );
+    REQUIRE( anotherTestData1.GetIValue1() == 4000 );
+    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 4000 );
+    REQUIRE_FALSE( (Data*)(&anotherTestData1) == frame.DataObjects()[typeid(TestData1)].get() ); // we made a copy
+
+}
diff --git a/Testing/Cpp/TestException.cc b/Testing/Cpp/TestException.cc
new file mode 100644
index 0000000..eb0785c
--- /dev/null
+++ b/Testing/Cpp/TestException.cc
@@ -0,0 +1,210 @@
+/*
+ * TestException.cc
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "Exception.hh"
+
+#include "catch.hpp"
+
+#include "logger.hh"
+
+LOGGER( testlog, "TestException" );
+
+TEST_CASE( "exception", "[utility]" )
+{
+    using namespace Nymph;
+
+    Exception blankEx;
+    REQUIRE( blankEx.what() == std::string() );
+    REQUIRE( blankEx.filename().empty() );
+    REQUIRE( blankEx.line() == 0 );
+
+    Exception testEx( "some_file", 1 );
+    REQUIRE( testEx.filename() == "some_file" );
+    REQUIRE( testEx.line() == 1 );
+
+    std::string testMessage("test message 2: ");
+    int testInt = 5;
+    testEx << testMessage << testInt;
+    REQUIRE( testEx.what() == testMessage + std::to_string(testInt) );
+
+    /*EXCEPT_HERE( Exception testEx );*/ 
+    // uses of __LINE__ need to be on the same line
+    testEx( __FILE__, __LINE__ ); std::string recordFile( __FILE__ ); int recordLine( __LINE__ );
+    REQUIRE( testEx.filename() == recordFile );
+    REQUIRE( testEx.line() == recordLine );
+
+    EXCEPT_HERE( testEx ); recordFile = std::string(__FILE__); recordLine = __LINE__;
+    REQUIRE( testEx.filename() == recordFile );
+    REQUIRE( testEx.line() == recordLine );
+}
+
+TEST_CASE( "throw", "[utility]" )
+{
+    using namespace Nymph;
+
+    try
+    {
+        throw Exception();
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string() );
+        REQUIRE( e.filename().empty() );
+        REQUIRE( e.line() == 0 );
+    }
+    
+    std::string recordFile;
+    int recordLine = 0;
+
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        throw Exception( __FILE__, __LINE__ ) << "test message";
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string("test message") );
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+    // Give CREATE_EXCEPT_HERE the class name
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        throw CREATE_EXCEPT_HERE( Exception );
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string() );
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+    // Give EXCEPT_HERE an exception
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        throw EXCEPT_HERE( Exception() << "test message" );
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string("test message") );
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+    // THROW macro
+    try
+    {
+        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        THROW_EXCEPT_HERE( Exception() << "test message" );
+    }
+    catch(const Exception& e)
+    {
+        REQUIRE( e.what() == std::string("test message") );
+        REQUIRE( e.filename() == recordFile );
+        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+    }
+    
+}
+
+const unsigned layers = 5;
+const std::string firstThrowText( "First throw" );
+const std::string nestedThrowText( "nested throw at layer " );
+
+void CatchThrow() 
+{
+    //const static unsigned layers = 5;
+    static unsigned count = 0;
+
+    try
+    {
+        if( count == layers )
+        {
+            throw CREATE_EXCEPT_HERE( Nymph::Exception ) << firstThrowText;
+        }
+        else
+        {
+            ++count;
+            CatchThrow();
+            return;
+        }
+    }
+    catch(const Nymph::Exception& e)
+    {
+        if( count == layers )
+        {
+            REQUIRE( e.what() == firstThrowText );
+        }
+        else
+        {
+            std::string what( e.what() );
+            REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
+        }
+        THROW_NESTED_EXCEPT_HERE( Nymph::Exception() << nestedThrowText << count-- ) ;
+    }
+}
+
+void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
+{
+    std::string prefix( count, ' ' );
+    LINFO( testlog, prefix << "Thrown at: " << e.where() );
+    LINFO( testlog, prefix << e.what() );
+    if( count == layers + 1 )
+    {
+        REQUIRE( e.what() == firstThrowText );
+    }
+    else
+    {
+        std::string what( e.what() );
+        REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
+    }
+
+    try
+    {
+        std::rethrow_if_nested( e );
+    }
+    catch(const Nymph::Exception& e)
+    {
+        PrintExceptionWithTests( e, ++count );
+    }
+    return;
+}
+
+TEST_CASE( "nested_throw", "[utility]" )
+{
+    using namespace Nymph;
+
+    try
+    {
+        CatchThrow();
+    }
+    catch(const Exception& e)
+    {
+
+        PrintExceptionWithTests(e);
+    }
+    
+}
+
+/* removed for trying home-grown exceptions, 1/10/22
+    auto throwException = []() {
+        BOOST_THROW_EXCEPTION( Exception() << "Test exception" << eom );
+    };
+
+    REQUIRE_THROWS_AS( throwException(), Exception );
+
+    try
+    {
+        throwException();
+    }
+    catch(const Exception& e)
+    {
+        LWARN( testlog, diagnostic_information(e) );
+    }
+*/  
diff --git a/Testing/Cpp/TestPrimaryProcessor.cc b/Testing/Cpp/TestPrimaryProcessor.cc
new file mode 100644
index 0000000..a33242f
--- /dev/null
+++ b/Testing/Cpp/TestPrimaryProcessor.cc
@@ -0,0 +1,55 @@
+/*
+ * TestPrimaryProcessor.cc
+ *
+ *  Created on: Sept 15, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProcessorClasses.hh"
+
+#include "logger.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestPrimaryProcessor" );
+
+REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
+
+
+TEST_CASE( "primary_processor", "[primary_processor]" )
+{
+    using namespace Nymph;
+
+    SharedControl::get_instance()->Reset();
+
+    TestPrimaryProc tester;
+    REQUIRE_FALSE( tester.ExceptionPtr() );
+
+    // SignalNewValue test
+    tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
+    tester.ConnectASlot( "value", tester, "value" );
+    tester();
+    REQUIRE( tester.GetValue() == tester.GetNewValue() );
+
+    // WaitTwoSec test
+    // -- no test implemented here right now --
+    //tester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
+
+    // ThrowExcept test
+    tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
+    REQUIRE_NOTHROW( tester() ); // the exception should be caught by operator() and stored as the exception ptr
+    REQUIRE( tester.ExceptionPtr() ); // the exception ptr should now be set
+    try
+    {
+        std::rethrow_exception( tester.ExceptionPtr() );
+    }
+    catch( const scarab::base_exception& e )
+    {
+        PrintException( e );
+        REQUIRE( std::string(e.what()) == std::string("PrimaryProcessor test function: throw Exception") );
+    }
+    
+    
+
+    //REQUIRE( tester.ValueSig().GetControl() == &control );
+}
diff --git a/Testing/Cpp/TestProcessor.cc b/Testing/Cpp/TestProcessor.cc
new file mode 100644
index 0000000..9766015
--- /dev/null
+++ b/Testing/Cpp/TestProcessor.cc
@@ -0,0 +1,152 @@
+/*
+ * TestProcessor.cc
+ *
+ *  Created on: Sept 12, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProcessorClasses.hh"
+
+#include "logger.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestProcessor" );
+
+REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
+
+
+TEST_CASE( "processor", "[signal],[slot],[processor]" )
+{
+    using namespace Nymph;
+
+    SharedControl::get_instance()->Reset();
+
+    TestProc tester;
+
+    SECTION( "Configuration" )
+    {
+        REQUIRE( tester.GetValue() == 0 );
+
+        // setup the config parameter
+        scarab::param_node config;
+        int configValue = 5;
+        config.add( "value", configValue );
+
+        // perform configuration with no value for "string"
+        REQUIRE_NOTHROW( tester.Configure( config ) );
+        // check that the value was set correctly
+        REQUIRE( tester.GetValue() == configValue );
+
+        // peform configuration with an illegal value for "string"
+        config.add( "string", "illegal value" );
+        REQUIRE_THROWS_AS( tester.Configure( config ), ConfigException );
+        try
+        {
+            tester.Configure( config );
+        }
+        catch( const ConfigException& e )
+        {
+            PrintException(e);
+        }
+        
+        // perform configuration with a legal value for "string"
+        config["string"]().set( "ok value 1" );
+        REQUIRE_NOTHROW( tester.Configure( config ) );
+        REQUIRE( tester.StringValue() == "ok 1" );
+
+    }
+
+    SECTION( "Signals and Slots" )
+    {
+        // check that the processor has the right number of signals and slots registered
+        REQUIRE( tester.Signals().size() == 2 );
+        REQUIRE( tester.Slots().size() == 3 );
+
+        //**************************
+        // Testing signal->slot
+        //**************************
+
+        // this is a slot using a lambda function to set a variable
+        int lambdaValue = 0;
+        Slot< int > lambdaSlot( "lambdaSlot", [&lambdaValue](int input){ lambdaValue = input; } );
+        tester.RegisterSlot( "lambdaSlot", &lambdaSlot );
+
+        // this slot is a member function of an object other than the processor
+        TestSlotOwner slotOwner;
+        Slot< int > slotOwnerSlot( "slotOwnerSlot", &tester, &slotOwner, &TestSlotOwner::TestSlotFunc );
+
+        // check initial value
+        REQUIRE( slotOwner.fValue == 0 );
+        REQUIRE( lambdaValue == 0 );
+
+        // we've added a couple more slots
+        REQUIRE( tester.Slots().size() == 5 );
+
+        // no connections yet
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 0 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 0 );
+
+        // make a connection
+        tester.ConnectASlot( "value", tester, "value" );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+
+        // repeat connection should be ignored
+        tester.ConnectASlot( "value", tester, "value" );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+
+        // connect the lambda slot to the signal
+        tester.ConnectASignal( tester, "value", "lambdaSlot" );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 2 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("lambdaSlot")->Connections().size() == 1 );
+
+        // connect the exteranlly-owned slot to the signal
+        Processor::ConnectSignalToSlot( tester.Signals().at("value"), tester.Slots().at("slotOwnerSlot") );
+
+        REQUIRE( tester.Signals().at("value")->Connections().size() == 3 );
+        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("slotOwnerSlot")->Connections().size() == 1 );
+
+        // now have "signal" connected to three slots:
+        //     value --> value
+        //     value --> lambdaSlot
+        //     value --> slotOwnerSlot
+
+        // emit the signal
+        int newValue = 10;
+        tester.ValueSig().Emit( newValue );
+
+        // check that all values have been changed
+        REQUIRE( tester.GetValue() == newValue );
+        REQUIRE( slotOwner.fValue == newValue );
+        REQUIRE( lambdaValue == newValue );
+
+        //*********************************
+        // testing slot->signal->slot
+        //*********************************
+
+        // check initial value
+        REQUIRE( tester.GetSecondValue() == 0 );
+
+        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed().size() == 1 );
+        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed()[0] == &tester.SecondValueSig() );
+
+        tester.ConnectASlot( "second-value", tester, "second-value-2" );
+
+        // now have second-value (slot) emits second-value --> second-value-2
+
+        REQUIRE( tester.Signals().at("second-value")->Connections().size() == 1 );
+        REQUIRE( tester.Slots().at("second-value-2")->Connections().size() == 1 );
+
+        tester.SecondValueSlotFunction( newValue );
+
+        REQUIRE( tester.GetSecondValue() == newValue );
+    }
+
+}
diff --git a/Testing/Cpp/TestProcessorClasses.hh b/Testing/Cpp/TestProcessorClasses.hh
new file mode 100644
index 0000000..313d0d7
--- /dev/null
+++ b/Testing/Cpp/TestProcessorClasses.hh
@@ -0,0 +1,175 @@
+/*
+ * TestProcessorClasses.hh
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "PrimaryProcessor.hh"
+#include "Processor.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "logger.hh"
+
+#include <chrono>
+#include <thread>
+
+LOGGER( testprocclasses_h_log, "TestProcessorClasses" );
+
+namespace Nymph
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestProc : public Processor
+    {
+        public:
+            TestProc( const std::string& name = "test" ) :
+                    Processor( name ),
+                    fValue( 0 ),
+                    fSecondValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestProc::SetValue ),
+                    fSecondValueSig( "second-value", this ),
+                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
+                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
+            {}
+
+            virtual ~TestProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                fValue = node.get_value( "value", fValue );
+
+                // we'll test configuration error throwing by having a string with restricted values
+                if( node.has("string") )
+                {
+                    if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
+                    else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
+                    else THROW_EXCEPT_HERE( ConfigException( node ) << "Invalid choice for \"string\"" );
+                }
+
+                return;
+            }
+
+            MEMVAR( int, Value );
+            MEMVAR( int, SecondValue );
+            MEMVAR_REF( std::string, StringValue );
+
+            void SecondValueSlotFunction( int newValue )
+            {
+                fSecondValueSig( newValue );
+            }
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+            MEMVAR_REF( Signal< int >, SecondValueSig );
+            MEMVAR_REF( Slot< int >, SecondValueSlot );
+            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
+
+    };
+
+    // external slot function owner
+    struct TestSlotOwner
+    {
+        int fValue = 0;
+        void TestSlotFunc( int input )
+        {
+            fValue = input;
+            return;
+        }
+    };
+
+
+    // concrete primary processor class that we can test
+    // implements Configure(), Run(), and has its own signal and slot
+    class TestPrimaryProc : public PrimaryProcessor
+    {
+        public:
+            enum class TestType
+            {
+                SignalNewValue,
+                WaitTwoSec,
+                ThrowExcept
+            };
+
+            TestPrimaryProc( const std::string& name = "test" ) :
+                    PrimaryProcessor( name ),
+                    fTestSelection( TestType::ThrowExcept ),
+                    fNewValue( 10 ),
+                    fValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
+            {}
+
+            virtual ~TestPrimaryProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                if( node.has("test") )
+                {
+                    std::string testSelectionStr( node["test"]().as_string() );
+                    if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
+                    else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
+                    else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
+                    else
+                    {
+                        LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
+                        THROW_EXCEPT_HERE( ConfigException() << "Invalid test selection: " << testSelectionStr );
+                    }
+                }
+                return;
+            }
+
+            void Run()
+            {
+                switch( fTestSelection )
+                {
+                    case TestType::SignalNewValue:
+                        TestSignalNewValue();
+                        return;
+                    case TestType::WaitTwoSec:
+                        TestWaitTwoSec();
+                        return;
+                    case TestType::ThrowExcept:
+                        TestThrowExcept();
+                        return;
+                    default:
+                        LERROR( testprocclasses_h_log, "Invalid test choice" );
+                        THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
+                }
+                return;
+            }
+
+            void TestSignalNewValue()
+            {
+                fValueSig( fNewValue );
+                return;
+            }
+
+            void TestWaitTwoSec()
+            {
+                std::this_thread::sleep_for(std::chrono::seconds(2));
+                return;
+            }
+
+            void TestThrowExcept()
+            {
+                THROW_EXCEPT_HERE( Exception() << "PrimaryProcessor test function: throw Exception" );
+                return;
+            }
+
+            MEMVAR( TestType, TestSelection );
+
+            MEMVAR( int, NewValue );
+            MEMVAR( int, Value );
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+    };
+
+}
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
new file mode 100644
index 0000000..f3a8d2e
--- /dev/null
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -0,0 +1,231 @@
+/*
+ * TestProcessorToolbox.cc
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProcessorClasses.hh"
+
+#include "ProcessorToolbox.hh"
+
+#include "logger.hh"
+#include "param_codec.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestProcessorToolbox" );
+
+
+namespace Nymph
+{
+    class ProcTBRevealer : public ProcessorToolbox
+    {
+        public:
+            using ProcessorToolbox::ProcessorToolbox;
+
+            bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
+            {
+                return ProcessorToolbox::ParseSignalSlotName( toParse, nameOfProc, nameOfSigSlot );
+            }
+
+            using ProcessorToolbox::ThreadSource;
+            using ProcessorToolbox::ThreadSourceGroup;
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
+            {
+                return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
+            }
+
+            void StartMultiThreadedRun()
+            {
+                return ProcessorToolbox::StartMultiThreadedRun();
+            }
+
+            using ProcessorToolbox::RunQueue;
+            RunQueue& GetRunQueue()
+            {
+                return fRunQueue;
+            }
+    };
+}
+
+
+TEST_CASE( "processor_toolbox" )
+{
+    using namespace Nymph;
+
+    SharedControl::get_instance()->Reset();
+
+    ProcTBRevealer toolbox;
+
+    SECTION( "AddRemoveProcessors" )
+    {
+        LINFO( testlog, "Add/Remove Processor tests" );
+
+        std::string procName1( "testproc-1" );
+        std::string procName2( "testproc-2" );
+
+        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
+
+        std::string config_str(
+            "processors:\n"
+            "- type: test-proc\n"
+            "  name: testproc-1"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        REQUIRE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
+
+        std::shared_ptr< Processor > tp1 = toolbox.ReleaseProcessor( procName1 );
+        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+
+        REQUIRE( toolbox.AddProcessor( procName1, tp1 ) );
+        REQUIRE( toolbox.GetProcessor( procName1 ) );
+
+        REQUIRE( toolbox.AddProcessor(  "test-proc", procName2 ) );
+        REQUIRE( toolbox.GetProcessor( procName2 ) );
+
+        REQUIRE( toolbox.RemoveProcessor( procName1 ) );
+        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE( toolbox.GetProcessor( procName2 ) );
+
+        toolbox.ClearProcessors();
+        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
+    }
+
+    SECTION( "Connections" )
+    {
+        LINFO( testlog, "Connections Tests");
+
+        std::string toParse( "proc:sigslot" );
+        std::string parsedProc, parsedSigSlot;
+
+        toolbox.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
+        REQUIRE( parsedProc == "proc" );
+        REQUIRE( parsedSigSlot == "sigslot" );
+
+        std::string procName1( "testproc-1" );
+        std::string procName2( "testproc-2" );
+
+        std::string config_str(
+            "processors:\n"
+            "- type: test-proc\n"
+            "  name: testproc-1\n"
+            "connections:\n"
+            "- signal: \"testproc-1:value\"\n"
+            "  slot: \"testproc-1:second-value\""
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        std::shared_ptr< Processor > tp1 = toolbox.GetProcessor( procName1 );
+
+        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
+        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
+
+        tp1->Signals().at("value")->DisconnectAll();
+        REQUIRE( tp1->Signals().at("value")->Connections().empty() );
+
+        toolbox.MakeConnection( "testproc-1:value", "testproc-1:second-value" );
+        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
+        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
+
+        tp1->Signals().at("value")->DisconnectAll();
+        REQUIRE( tp1->Signals().at("value")->Connections().empty() );
+
+        toolbox.MakeConnection( "testproc-1", "value", "testproc-1", "second-value" );
+        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
+        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
+    }
+
+    SECTION( "RunQueue" )
+    {
+        LINFO( "RunQueue Tests" );
+
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: testprimary-1\n"
+            "- type: test-primary\n"
+            "  name: testprimary-2\n"
+            "- type: test-proc\n"
+            "  name: testproc-1\n"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        ProcTBRevealer::ThreadSourceGroup group;
+        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
+        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "testproc-1", group ) );
+        REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary-1", group ) );
+        REQUIRE( group.size() == 1 );
+
+        REQUIRE_FALSE( toolbox.PushBackToRunQueue( "testproc-1" ) );
+        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-1" ) );
+        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
+        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-2" ) );
+        REQUIRE( toolbox.GetRunQueue().size() == 2 );
+        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
+        
+        toolbox.PopBackOfRunQueue();
+        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+
+        toolbox.ClearRunQueue();
+        REQUIRE( toolbox.GetRunQueue().empty() );
+        
+        REQUIRE( toolbox.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
+        REQUIRE( toolbox.GetRunQueue().size() == 1 );
+        REQUIRE( toolbox.GetRunQueue()[0].size() == 2 );
+
+    }
+
+    SECTION( "DoRun" )
+    {
+        std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: pp\n"
+            "connections:\n"
+            "- signal: \"pp:value\"\n"
+            "  slot: \"pp:value\"\n"
+            "run-queue:\n"
+            "- pp"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+
+        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
+        REQUIRE( ppProc );
+        ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
+
+        // do the run
+        REQUIRE_NOTHROW( toolbox.Run() );
+
+        // check the results
+        REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
+
+    }
+
+}
diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
new file mode 100644
index 0000000..dabb39b
--- /dev/null
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -0,0 +1,72 @@
+/*
+ * TestSigSlot.cc
+ *
+ *  Created on: Sept 7, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
+{
+    using namespace Nymph;
+
+    int testValue = 0;
+
+    Signal< int > signal( "signal" );
+    Slot< int > slot( "slot", [&](int aValue ){ testValue = aValue; } );
+
+    signal.Connect( &slot );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    signal.Emit( 5 );
+    REQUIRE( testValue == 5 );
+
+    signal( 10 );
+    REQUIRE( testValue == 10 );
+
+    signal.Disconnect( &slot );
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+    // connect and disconnect via slot
+    slot.ConnectTo( &signal );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    slot.Disconnect( &signal );
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+    // reconnect for testing SignalBase::DisconnectAll()
+    signal.Connect( &slot );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    signal.DisconnectAll();
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+    // reconnect for testing SlotBaseDisconnectAll()
+    slot.ConnectTo( &signal );
+
+    REQUIRE( signal.Connections().size() == 1 );
+    REQUIRE( slot.Connections().size() == 1 );
+
+    slot.DisconnectAll();
+
+    REQUIRE( signal.Connections().size() == 0 );
+    REQUIRE( slot.Connections().size() == 0 );
+
+}
diff --git a/Testing/Cpp/UseCatch.cc b/Testing/Cpp/UseCatch.cc
new file mode 100644
index 0000000..4cb169c
--- /dev/null
+++ b/Testing/Cpp/UseCatch.cc
@@ -0,0 +1,10 @@
+/*
+ * use_catch.cc
+ *
+ *  Created on: Aug 14, 2018
+ *      Author: N.S. Oblath
+ */
+
+// Tells Catch to provide a main()
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"

From 8159c1b72ee0b267fa9b4c3301bef174d78a6ef2 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 1 Feb 2022 08:03:31 -0500
Subject: [PATCH 272/521] more renaming files pain

---
 cpp/{ => Cpp}/Executables_v1/Main/CMakeLists.txt                  | 0
 cpp/{ => Cpp}/Executables_v1/Main/ConfigCheck.cc                  | 0
 cpp/{ => Cpp}/Executables_v1/Main/Nymph.cc                        | 0
 cpp/{ => Cpp}/Executables_v1/Validation/CMakeLists.txt            | 0
 .../Executables_v1/Validation/ConfigFiles/TestConfigurator.json   | 0
 .../Validation/ConfigFiles/TestParameterStoreConfig.json          | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTJSONReader.cc           | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTJSONReader.hh           | 0
 .../Executables_v1/Validation/KTJSONTypeWriterValidation.cc       | 0
 .../Executables_v1/Validation/KTJSONTypeWriterValidation.hh       | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTPyTestClass.cc          | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTPyTestClass.hh          | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTPyTestClassPybind.hh    | 0
 .../Executables_v1/Validation/KTRegisterNymphValidationExtData.hh | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestConfigurable.cc     | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestConfigurable.hh     | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestCuts.cc             | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestCuts.hh             | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestData.cc             | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestData.hh             | 0
 .../Executables_v1/Validation/KTTestDataPrimaryProcessor.cc       | 0
 .../Executables_v1/Validation/KTTestDataPrimaryProcessor.hh       | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.cc | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.hh | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestProcessor.cc        | 0
 cpp/{ => Cpp}/Executables_v1/Validation/KTTestProcessor.hh        | 0
 cpp/{ => Cpp}/Executables_v1/Validation/NymphValidationPybind.cc  | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestApplication.cc        | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestApplyCut.cc           | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestCacheDirectory.cc     | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestCut.cc                | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestCutFilter.cc          | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestData.cc               | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestExceptionInSlot.cc    | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestExt.cc                | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestExtSerialization.cc   | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestJSONWriter.cc         | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestJSONWriterViaSlot.cc  | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestLogger.cc             | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestParamBindings.py      | 0
 .../Executables_v1/Validation/TestPolymorphicSlotData.cc          | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestPrimaryProcessor.cc   | 0
 .../Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc  | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestPrintData.cc          | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestProcessorToolbox.py   | 0
 .../Executables_v1/Validation/TestProcessorToolbox2Threads.cc     | 0
 .../Validation/TestProcessorToolboxMultithreaded.cc               | 0
 .../Validation/TestProcessorToolboxSinglethreaded.cc              | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestPyTestClass.py        | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestPythonBasics.hh       | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestPythonBasics.py       | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestSerialization.cc      | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestSignalsAndSlots.cc    | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestSlotData.cc           | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestThroughputProfiler.cc | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestUseBreakpoint.cc      | 0
 cpp/{ => Cpp}/Executables_v1/Validation/TestWrapProcessor.py      | 0
 cpp/{ => Cpp}/Library/CMakeLists.txt                              | 0
 cpp/{ => Cpp}/Library/Data/Data.cc                                | 0
 cpp/{ => Cpp}/Library/Data/Data.hh                                | 0
 cpp/{ => Cpp}/Library/Data/DataFrame.cc                           | 0
 cpp/{ => Cpp}/Library/Data/DataFrame.hh                           | 0
 cpp/{ => Cpp}/Library/Data/DataManager.cc                         | 0
 cpp/{ => Cpp}/Library/Data/DataManager.hh                         | 0
 cpp/{ => Cpp}/Library/Processor/ControlAccess.cc                  | 0
 cpp/{ => Cpp}/Library/Processor/ControlAccess.hh                  | 0
 cpp/{ => Cpp}/Library/Processor/PrimaryProcessor.cc               | 0
 cpp/{ => Cpp}/Library/Processor/PrimaryProcessor.hh               | 0
 cpp/{ => Cpp}/Library/Processor/Processor.cc                      | 0
 cpp/{ => Cpp}/Library/Processor/Processor.hh                      | 0
 cpp/{ => Cpp}/Library/Processor/ProcessorToolbox.cc               | 0
 cpp/{ => Cpp}/Library/Processor/ProcessorToolbox.hh               | 0
 cpp/{ => Cpp}/Library/Processor/QuitThread.hh                     | 0
 cpp/{ => Cpp}/Library/Processor/ReturnBuffer.cc                   | 0
 cpp/{ => Cpp}/Library/Processor/ReturnBuffer.hh                   | 0
 cpp/{ => Cpp}/Library/Processor/Signal.hh                         | 0
 cpp/{ => Cpp}/Library/Processor/SignalSlotBase.cc                 | 0
 cpp/{ => Cpp}/Library/Processor/SignalSlotBase.hh                 | 0
 cpp/{ => Cpp}/Library/Processor/Slot.hh                           | 0
 cpp/{ => Cpp}/Library/Utility/Exception.cc                        | 0
 cpp/{ => Cpp}/Library/Utility/Exception.hh                        | 0
 cpp/{ => Cpp}/Library/Utility/MemberVariable.hh                   | 0
 cpp/{ => Cpp}/Library_v1/AddLibPythonPath.sh.in                   | 0
 cpp/{ => Cpp}/Library_v1/Application/KTApplication.cc             | 0
 cpp/{ => Cpp}/Library_v1/Application/KTApplication.hh             | 0
 cpp/{ => Cpp}/Library_v1/Application/KTCommandLineHandler.cc      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTCommandLineHandler.hh      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTCommandLineOption.hh       | 0
 cpp/{ => Cpp}/Library_v1/Application/KTConfigurator.cc            | 0
 cpp/{ => Cpp}/Library_v1/Application/KTConfigurator.hh            | 0
 cpp/{ => Cpp}/Library_v1/Application/KTDataQueueProcessor.cc      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTDataQueueProcessor.hh      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTFilenameParsers.cc         | 0
 cpp/{ => Cpp}/Library_v1/Application/KTFilenameParsers.hh         | 0
 cpp/{ => Cpp}/Library_v1/Application/KTPrintDataStructure.cc      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTPrintDataStructure.hh      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTProcessorToolbox.cc        | 0
 cpp/{ => Cpp}/Library_v1/Application/KTProcessorToolbox.hh        | 0
 cpp/{ => Cpp}/Library_v1/Application/KTProcessorToolboxPybind.hh  | 0
 cpp/{ => Cpp}/Library_v1/Application/KTRunNymph.cc                | 0
 cpp/{ => Cpp}/Library_v1/Application/KTRunNymph.hh                | 0
 cpp/{ => Cpp}/Library_v1/Application/KTThroughputProfiler.cc      | 0
 cpp/{ => Cpp}/Library_v1/Application/KTThroughputProfiler.hh      | 0
 cpp/{ => Cpp}/Library_v1/CMakeLists.txt                           | 0
 cpp/{ => Cpp}/Library_v1/Data/KTApplyCut.cc                       | 0
 cpp/{ => Cpp}/Library_v1/Data/KTApplyCut.hh                       | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCoreData.cc                       | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCoreData.hh                       | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCut.cc                            | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCut.hh                            | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCutFilter.cc                      | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCutFilter.hh                      | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCutResult.hh                      | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCutStatus.cc                      | 0
 cpp/{ => Cpp}/Library_v1/Data/KTCutStatus.hh                      | 0
 cpp/{ => Cpp}/Library_v1/Data/KTData.cc                           | 0
 cpp/{ => Cpp}/Library_v1/Data/KTData.hh                           | 0
 cpp/{ => Cpp}/Library_v1/Data/KTRegisterNymphExtData.hh           | 0
 cpp/{ => Cpp}/Library_v1/Data/KTTester.cc                         | 0
 cpp/{ => Cpp}/Library_v1/Data/KTTester.hh                         | 0
 cpp/{ => Cpp}/Library_v1/IO/KTJSONWriter.cc                       | 0
 cpp/{ => Cpp}/Library_v1/IO/KTJSONWriter.hh                       | 0
 cpp/{ => Cpp}/Library_v1/IO/KTReader.cc                           | 0
 cpp/{ => Cpp}/Library_v1/IO/KTReader.hh                           | 0
 cpp/{ => Cpp}/Library_v1/IO/KTWriter.cc                           | 0
 cpp/{ => Cpp}/Library_v1/IO/KTWriter.hh                           | 0
 cpp/{ => Cpp}/Library_v1/NymphPybind.cc                           | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTConnection.hh                | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTNymphSignals.hh              | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTNymphSlot.hh                 | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTPrimaryProcessor.cc          | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTPrimaryProcessor.hh          | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTProcessor.cc                 | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTProcessor.hh                 | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTProcessorPybind.cc           | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTProcessorPybind.hh           | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTPyProcessor.hh               | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSignal.hh                    | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSignalSlotBase.hh            | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSignalWrapper.cc             | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSignalWrapper.hh             | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSlot.hh                      | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSlotWrapper.cc               | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTSlotWrapper.hh               | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTThreadReference.cc           | 0
 cpp/{ => Cpp}/Library_v1/Processor/KTThreadReference.hh           | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTCacheDirectory.cc              | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTCacheDirectory.hh              | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTConcurrentQueue.hh             | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTConfigurable.cc                | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTConfigurable.hh                | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTConfigurablePybind.hh          | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTDirectory.cc                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTDirectory.hh                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTEventLoop.cc                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTEventLoop.hh                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTException.cc                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTException.hh                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTExtensible.hh                  | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTExtensibleStruct.hh            | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTExtensibleStructFactory.hh     | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTLogger.hh                      | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTMemberVariable.hh              | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTParamPybind.hh                 | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTPythonMacros.hh                | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTTIFactory.hh                   | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTTime.cc                        | 0
 cpp/{ => Cpp}/Library_v1/Utility/KTTime.hh                        | 0
 cpp/{ => Cpp}/Templates/KTProcessorTemplate.cc                    | 0
 cpp/{ => Cpp}/Templates/KTProcessorTemplate.hh                    | 0
 cpp/{ => Cpp}/Templates/MainCMakeLists.txt                        | 0
 python/{ => Python}/nymph/__init__.py                             | 0
 172 files changed, 0 insertions(+), 0 deletions(-)
 rename cpp/{ => Cpp}/Executables_v1/Main/CMakeLists.txt (100%)
 rename cpp/{ => Cpp}/Executables_v1/Main/ConfigCheck.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Main/Nymph.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/CMakeLists.txt (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/ConfigFiles/TestConfigurator.json (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTJSONReader.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTJSONReader.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTJSONTypeWriterValidation.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTJSONTypeWriterValidation.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTPyTestClass.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTPyTestClass.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTPyTestClassPybind.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestConfigurable.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestConfigurable.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestCuts.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestCuts.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestData.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestData.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestProcessor.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/KTTestProcessor.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/NymphValidationPybind.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestApplication.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestApplyCut.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestCacheDirectory.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestCut.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestCutFilter.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestData.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestExceptionInSlot.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestExt.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestExtSerialization.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestJSONWriter.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestJSONWriterViaSlot.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestLogger.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestParamBindings.py (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPolymorphicSlotData.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPrimaryProcessor.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPrintData.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestProcessorToolbox.py (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestProcessorToolbox2Threads.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPyTestClass.py (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPythonBasics.hh (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestPythonBasics.py (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestSerialization.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestSignalsAndSlots.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestSlotData.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestThroughputProfiler.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestUseBreakpoint.cc (100%)
 rename cpp/{ => Cpp}/Executables_v1/Validation/TestWrapProcessor.py (100%)
 rename cpp/{ => Cpp}/Library/CMakeLists.txt (100%)
 rename cpp/{ => Cpp}/Library/Data/Data.cc (100%)
 rename cpp/{ => Cpp}/Library/Data/Data.hh (100%)
 rename cpp/{ => Cpp}/Library/Data/DataFrame.cc (100%)
 rename cpp/{ => Cpp}/Library/Data/DataFrame.hh (100%)
 rename cpp/{ => Cpp}/Library/Data/DataManager.cc (100%)
 rename cpp/{ => Cpp}/Library/Data/DataManager.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/ControlAccess.cc (100%)
 rename cpp/{ => Cpp}/Library/Processor/ControlAccess.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/PrimaryProcessor.cc (100%)
 rename cpp/{ => Cpp}/Library/Processor/PrimaryProcessor.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/Processor.cc (100%)
 rename cpp/{ => Cpp}/Library/Processor/Processor.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/ProcessorToolbox.cc (100%)
 rename cpp/{ => Cpp}/Library/Processor/ProcessorToolbox.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/QuitThread.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/ReturnBuffer.cc (100%)
 rename cpp/{ => Cpp}/Library/Processor/ReturnBuffer.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/Signal.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/SignalSlotBase.cc (100%)
 rename cpp/{ => Cpp}/Library/Processor/SignalSlotBase.hh (100%)
 rename cpp/{ => Cpp}/Library/Processor/Slot.hh (100%)
 rename cpp/{ => Cpp}/Library/Utility/Exception.cc (100%)
 rename cpp/{ => Cpp}/Library/Utility/Exception.hh (100%)
 rename cpp/{ => Cpp}/Library/Utility/MemberVariable.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/AddLibPythonPath.sh.in (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTApplication.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTApplication.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTCommandLineHandler.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTCommandLineHandler.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTCommandLineOption.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTConfigurator.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTConfigurator.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTDataQueueProcessor.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTDataQueueProcessor.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTFilenameParsers.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTFilenameParsers.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTPrintDataStructure.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTPrintDataStructure.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTProcessorToolbox.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTProcessorToolbox.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTProcessorToolboxPybind.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTRunNymph.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTRunNymph.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTThroughputProfiler.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Application/KTThroughputProfiler.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/CMakeLists.txt (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTApplyCut.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTApplyCut.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCoreData.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCoreData.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCut.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCut.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCutFilter.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCutFilter.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCutResult.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCutStatus.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTCutStatus.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTData.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTData.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTRegisterNymphExtData.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTTester.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Data/KTTester.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/IO/KTJSONWriter.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/IO/KTJSONWriter.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/IO/KTReader.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/IO/KTReader.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/IO/KTWriter.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/IO/KTWriter.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/NymphPybind.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTConnection.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTNymphSignals.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTNymphSlot.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTPrimaryProcessor.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTPrimaryProcessor.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTProcessor.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTProcessor.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTProcessorPybind.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTProcessorPybind.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTPyProcessor.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSignal.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSignalSlotBase.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSignalWrapper.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSignalWrapper.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSlot.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSlotWrapper.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTSlotWrapper.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTThreadReference.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Processor/KTThreadReference.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTCacheDirectory.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTCacheDirectory.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTConcurrentQueue.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTConfigurable.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTConfigurable.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTConfigurablePybind.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTDirectory.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTDirectory.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTEventLoop.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTEventLoop.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTException.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTException.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTExtensible.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTExtensibleStruct.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTExtensibleStructFactory.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTLogger.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTMemberVariable.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTParamPybind.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTPythonMacros.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTTIFactory.hh (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTTime.cc (100%)
 rename cpp/{ => Cpp}/Library_v1/Utility/KTTime.hh (100%)
 rename cpp/{ => Cpp}/Templates/KTProcessorTemplate.cc (100%)
 rename cpp/{ => Cpp}/Templates/KTProcessorTemplate.hh (100%)
 rename cpp/{ => Cpp}/Templates/MainCMakeLists.txt (100%)
 rename python/{ => Python}/nymph/__init__.py (100%)

diff --git a/cpp/Executables_v1/Main/CMakeLists.txt b/cpp/Cpp/Executables_v1/Main/CMakeLists.txt
similarity index 100%
rename from cpp/Executables_v1/Main/CMakeLists.txt
rename to cpp/Cpp/Executables_v1/Main/CMakeLists.txt
diff --git a/cpp/Executables_v1/Main/ConfigCheck.cc b/cpp/Cpp/Executables_v1/Main/ConfigCheck.cc
similarity index 100%
rename from cpp/Executables_v1/Main/ConfigCheck.cc
rename to cpp/Cpp/Executables_v1/Main/ConfigCheck.cc
diff --git a/cpp/Executables_v1/Main/Nymph.cc b/cpp/Cpp/Executables_v1/Main/Nymph.cc
similarity index 100%
rename from cpp/Executables_v1/Main/Nymph.cc
rename to cpp/Cpp/Executables_v1/Main/Nymph.cc
diff --git a/cpp/Executables_v1/Validation/CMakeLists.txt b/cpp/Cpp/Executables_v1/Validation/CMakeLists.txt
similarity index 100%
rename from cpp/Executables_v1/Validation/CMakeLists.txt
rename to cpp/Cpp/Executables_v1/Validation/CMakeLists.txt
diff --git a/cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json b/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
rename to cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
diff --git a/cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json b/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/cpp/Executables_v1/Validation/KTJSONReader.cc b/cpp/Cpp/Executables_v1/Validation/KTJSONReader.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTJSONReader.cc
rename to cpp/Cpp/Executables_v1/Validation/KTJSONReader.cc
diff --git a/cpp/Executables_v1/Validation/KTJSONReader.hh b/cpp/Cpp/Executables_v1/Validation/KTJSONReader.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTJSONReader.hh
rename to cpp/Cpp/Executables_v1/Validation/KTJSONReader.hh
diff --git a/cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc b/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
rename to cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
diff --git a/cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh b/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
rename to cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
diff --git a/cpp/Executables_v1/Validation/KTPyTestClass.cc b/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTPyTestClass.cc
rename to cpp/Cpp/Executables_v1/Validation/KTPyTestClass.cc
diff --git a/cpp/Executables_v1/Validation/KTPyTestClass.hh b/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTPyTestClass.hh
rename to cpp/Cpp/Executables_v1/Validation/KTPyTestClass.hh
diff --git a/cpp/Executables_v1/Validation/KTPyTestClassPybind.hh b/cpp/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
rename to cpp/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
diff --git a/cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh b/cpp/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
rename to cpp/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
diff --git a/cpp/Executables_v1/Validation/KTTestConfigurable.cc b/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestConfigurable.cc
rename to cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
diff --git a/cpp/Executables_v1/Validation/KTTestConfigurable.hh b/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestConfigurable.hh
rename to cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
diff --git a/cpp/Executables_v1/Validation/KTTestCuts.cc b/cpp/Cpp/Executables_v1/Validation/KTTestCuts.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestCuts.cc
rename to cpp/Cpp/Executables_v1/Validation/KTTestCuts.cc
diff --git a/cpp/Executables_v1/Validation/KTTestCuts.hh b/cpp/Cpp/Executables_v1/Validation/KTTestCuts.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestCuts.hh
rename to cpp/Cpp/Executables_v1/Validation/KTTestCuts.hh
diff --git a/cpp/Executables_v1/Validation/KTTestData.cc b/cpp/Cpp/Executables_v1/Validation/KTTestData.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestData.cc
rename to cpp/Cpp/Executables_v1/Validation/KTTestData.cc
diff --git a/cpp/Executables_v1/Validation/KTTestData.hh b/cpp/Cpp/Executables_v1/Validation/KTTestData.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestData.hh
rename to cpp/Cpp/Executables_v1/Validation/KTTestData.hh
diff --git a/cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc b/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
rename to cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
diff --git a/cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh b/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
rename to cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
diff --git a/cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc b/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
rename to cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
diff --git a/cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh b/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
rename to cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
diff --git a/cpp/Executables_v1/Validation/KTTestProcessor.cc b/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestProcessor.cc
rename to cpp/Cpp/Executables_v1/Validation/KTTestProcessor.cc
diff --git a/cpp/Executables_v1/Validation/KTTestProcessor.hh b/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/KTTestProcessor.hh
rename to cpp/Cpp/Executables_v1/Validation/KTTestProcessor.hh
diff --git a/cpp/Executables_v1/Validation/NymphValidationPybind.cc b/cpp/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/NymphValidationPybind.cc
rename to cpp/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
diff --git a/cpp/Executables_v1/Validation/TestApplication.cc b/cpp/Cpp/Executables_v1/Validation/TestApplication.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestApplication.cc
rename to cpp/Cpp/Executables_v1/Validation/TestApplication.cc
diff --git a/cpp/Executables_v1/Validation/TestApplyCut.cc b/cpp/Cpp/Executables_v1/Validation/TestApplyCut.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestApplyCut.cc
rename to cpp/Cpp/Executables_v1/Validation/TestApplyCut.cc
diff --git a/cpp/Executables_v1/Validation/TestCacheDirectory.cc b/cpp/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestCacheDirectory.cc
rename to cpp/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
diff --git a/cpp/Executables_v1/Validation/TestCut.cc b/cpp/Cpp/Executables_v1/Validation/TestCut.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestCut.cc
rename to cpp/Cpp/Executables_v1/Validation/TestCut.cc
diff --git a/cpp/Executables_v1/Validation/TestCutFilter.cc b/cpp/Cpp/Executables_v1/Validation/TestCutFilter.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestCutFilter.cc
rename to cpp/Cpp/Executables_v1/Validation/TestCutFilter.cc
diff --git a/cpp/Executables_v1/Validation/TestData.cc b/cpp/Cpp/Executables_v1/Validation/TestData.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestData.cc
rename to cpp/Cpp/Executables_v1/Validation/TestData.cc
diff --git a/cpp/Executables_v1/Validation/TestExceptionInSlot.cc b/cpp/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestExceptionInSlot.cc
rename to cpp/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
diff --git a/cpp/Executables_v1/Validation/TestExt.cc b/cpp/Cpp/Executables_v1/Validation/TestExt.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestExt.cc
rename to cpp/Cpp/Executables_v1/Validation/TestExt.cc
diff --git a/cpp/Executables_v1/Validation/TestExtSerialization.cc b/cpp/Cpp/Executables_v1/Validation/TestExtSerialization.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestExtSerialization.cc
rename to cpp/Cpp/Executables_v1/Validation/TestExtSerialization.cc
diff --git a/cpp/Executables_v1/Validation/TestJSONWriter.cc b/cpp/Cpp/Executables_v1/Validation/TestJSONWriter.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestJSONWriter.cc
rename to cpp/Cpp/Executables_v1/Validation/TestJSONWriter.cc
diff --git a/cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc b/cpp/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
rename to cpp/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
diff --git a/cpp/Executables_v1/Validation/TestLogger.cc b/cpp/Cpp/Executables_v1/Validation/TestLogger.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestLogger.cc
rename to cpp/Cpp/Executables_v1/Validation/TestLogger.cc
diff --git a/cpp/Executables_v1/Validation/TestParamBindings.py b/cpp/Cpp/Executables_v1/Validation/TestParamBindings.py
similarity index 100%
rename from cpp/Executables_v1/Validation/TestParamBindings.py
rename to cpp/Cpp/Executables_v1/Validation/TestParamBindings.py
diff --git a/cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc b/cpp/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
rename to cpp/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
diff --git a/cpp/Executables_v1/Validation/TestPrimaryProcessor.cc b/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
rename to cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
diff --git a/cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc b/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
rename to cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
diff --git a/cpp/Executables_v1/Validation/TestPrintData.cc b/cpp/Cpp/Executables_v1/Validation/TestPrintData.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPrintData.cc
rename to cpp/Cpp/Executables_v1/Validation/TestPrintData.cc
diff --git a/cpp/Executables_v1/Validation/TestProcessorToolbox.py b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
similarity index 100%
rename from cpp/Executables_v1/Validation/TestProcessorToolbox.py
rename to cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
diff --git a/cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
rename to cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
diff --git a/cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
rename to cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
diff --git a/cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
rename to cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
diff --git a/cpp/Executables_v1/Validation/TestPyTestClass.py b/cpp/Cpp/Executables_v1/Validation/TestPyTestClass.py
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPyTestClass.py
rename to cpp/Cpp/Executables_v1/Validation/TestPyTestClass.py
diff --git a/cpp/Executables_v1/Validation/TestPythonBasics.hh b/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.hh
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPythonBasics.hh
rename to cpp/Cpp/Executables_v1/Validation/TestPythonBasics.hh
diff --git a/cpp/Executables_v1/Validation/TestPythonBasics.py b/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.py
similarity index 100%
rename from cpp/Executables_v1/Validation/TestPythonBasics.py
rename to cpp/Cpp/Executables_v1/Validation/TestPythonBasics.py
diff --git a/cpp/Executables_v1/Validation/TestSerialization.cc b/cpp/Cpp/Executables_v1/Validation/TestSerialization.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestSerialization.cc
rename to cpp/Cpp/Executables_v1/Validation/TestSerialization.cc
diff --git a/cpp/Executables_v1/Validation/TestSignalsAndSlots.cc b/cpp/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
rename to cpp/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
diff --git a/cpp/Executables_v1/Validation/TestSlotData.cc b/cpp/Cpp/Executables_v1/Validation/TestSlotData.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestSlotData.cc
rename to cpp/Cpp/Executables_v1/Validation/TestSlotData.cc
diff --git a/cpp/Executables_v1/Validation/TestThroughputProfiler.cc b/cpp/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestThroughputProfiler.cc
rename to cpp/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
diff --git a/cpp/Executables_v1/Validation/TestUseBreakpoint.cc b/cpp/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
similarity index 100%
rename from cpp/Executables_v1/Validation/TestUseBreakpoint.cc
rename to cpp/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
diff --git a/cpp/Executables_v1/Validation/TestWrapProcessor.py b/cpp/Cpp/Executables_v1/Validation/TestWrapProcessor.py
similarity index 100%
rename from cpp/Executables_v1/Validation/TestWrapProcessor.py
rename to cpp/Cpp/Executables_v1/Validation/TestWrapProcessor.py
diff --git a/cpp/Library/CMakeLists.txt b/cpp/Cpp/Library/CMakeLists.txt
similarity index 100%
rename from cpp/Library/CMakeLists.txt
rename to cpp/Cpp/Library/CMakeLists.txt
diff --git a/cpp/Library/Data/Data.cc b/cpp/Cpp/Library/Data/Data.cc
similarity index 100%
rename from cpp/Library/Data/Data.cc
rename to cpp/Cpp/Library/Data/Data.cc
diff --git a/cpp/Library/Data/Data.hh b/cpp/Cpp/Library/Data/Data.hh
similarity index 100%
rename from cpp/Library/Data/Data.hh
rename to cpp/Cpp/Library/Data/Data.hh
diff --git a/cpp/Library/Data/DataFrame.cc b/cpp/Cpp/Library/Data/DataFrame.cc
similarity index 100%
rename from cpp/Library/Data/DataFrame.cc
rename to cpp/Cpp/Library/Data/DataFrame.cc
diff --git a/cpp/Library/Data/DataFrame.hh b/cpp/Cpp/Library/Data/DataFrame.hh
similarity index 100%
rename from cpp/Library/Data/DataFrame.hh
rename to cpp/Cpp/Library/Data/DataFrame.hh
diff --git a/cpp/Library/Data/DataManager.cc b/cpp/Cpp/Library/Data/DataManager.cc
similarity index 100%
rename from cpp/Library/Data/DataManager.cc
rename to cpp/Cpp/Library/Data/DataManager.cc
diff --git a/cpp/Library/Data/DataManager.hh b/cpp/Cpp/Library/Data/DataManager.hh
similarity index 100%
rename from cpp/Library/Data/DataManager.hh
rename to cpp/Cpp/Library/Data/DataManager.hh
diff --git a/cpp/Library/Processor/ControlAccess.cc b/cpp/Cpp/Library/Processor/ControlAccess.cc
similarity index 100%
rename from cpp/Library/Processor/ControlAccess.cc
rename to cpp/Cpp/Library/Processor/ControlAccess.cc
diff --git a/cpp/Library/Processor/ControlAccess.hh b/cpp/Cpp/Library/Processor/ControlAccess.hh
similarity index 100%
rename from cpp/Library/Processor/ControlAccess.hh
rename to cpp/Cpp/Library/Processor/ControlAccess.hh
diff --git a/cpp/Library/Processor/PrimaryProcessor.cc b/cpp/Cpp/Library/Processor/PrimaryProcessor.cc
similarity index 100%
rename from cpp/Library/Processor/PrimaryProcessor.cc
rename to cpp/Cpp/Library/Processor/PrimaryProcessor.cc
diff --git a/cpp/Library/Processor/PrimaryProcessor.hh b/cpp/Cpp/Library/Processor/PrimaryProcessor.hh
similarity index 100%
rename from cpp/Library/Processor/PrimaryProcessor.hh
rename to cpp/Cpp/Library/Processor/PrimaryProcessor.hh
diff --git a/cpp/Library/Processor/Processor.cc b/cpp/Cpp/Library/Processor/Processor.cc
similarity index 100%
rename from cpp/Library/Processor/Processor.cc
rename to cpp/Cpp/Library/Processor/Processor.cc
diff --git a/cpp/Library/Processor/Processor.hh b/cpp/Cpp/Library/Processor/Processor.hh
similarity index 100%
rename from cpp/Library/Processor/Processor.hh
rename to cpp/Cpp/Library/Processor/Processor.hh
diff --git a/cpp/Library/Processor/ProcessorToolbox.cc b/cpp/Cpp/Library/Processor/ProcessorToolbox.cc
similarity index 100%
rename from cpp/Library/Processor/ProcessorToolbox.cc
rename to cpp/Cpp/Library/Processor/ProcessorToolbox.cc
diff --git a/cpp/Library/Processor/ProcessorToolbox.hh b/cpp/Cpp/Library/Processor/ProcessorToolbox.hh
similarity index 100%
rename from cpp/Library/Processor/ProcessorToolbox.hh
rename to cpp/Cpp/Library/Processor/ProcessorToolbox.hh
diff --git a/cpp/Library/Processor/QuitThread.hh b/cpp/Cpp/Library/Processor/QuitThread.hh
similarity index 100%
rename from cpp/Library/Processor/QuitThread.hh
rename to cpp/Cpp/Library/Processor/QuitThread.hh
diff --git a/cpp/Library/Processor/ReturnBuffer.cc b/cpp/Cpp/Library/Processor/ReturnBuffer.cc
similarity index 100%
rename from cpp/Library/Processor/ReturnBuffer.cc
rename to cpp/Cpp/Library/Processor/ReturnBuffer.cc
diff --git a/cpp/Library/Processor/ReturnBuffer.hh b/cpp/Cpp/Library/Processor/ReturnBuffer.hh
similarity index 100%
rename from cpp/Library/Processor/ReturnBuffer.hh
rename to cpp/Cpp/Library/Processor/ReturnBuffer.hh
diff --git a/cpp/Library/Processor/Signal.hh b/cpp/Cpp/Library/Processor/Signal.hh
similarity index 100%
rename from cpp/Library/Processor/Signal.hh
rename to cpp/Cpp/Library/Processor/Signal.hh
diff --git a/cpp/Library/Processor/SignalSlotBase.cc b/cpp/Cpp/Library/Processor/SignalSlotBase.cc
similarity index 100%
rename from cpp/Library/Processor/SignalSlotBase.cc
rename to cpp/Cpp/Library/Processor/SignalSlotBase.cc
diff --git a/cpp/Library/Processor/SignalSlotBase.hh b/cpp/Cpp/Library/Processor/SignalSlotBase.hh
similarity index 100%
rename from cpp/Library/Processor/SignalSlotBase.hh
rename to cpp/Cpp/Library/Processor/SignalSlotBase.hh
diff --git a/cpp/Library/Processor/Slot.hh b/cpp/Cpp/Library/Processor/Slot.hh
similarity index 100%
rename from cpp/Library/Processor/Slot.hh
rename to cpp/Cpp/Library/Processor/Slot.hh
diff --git a/cpp/Library/Utility/Exception.cc b/cpp/Cpp/Library/Utility/Exception.cc
similarity index 100%
rename from cpp/Library/Utility/Exception.cc
rename to cpp/Cpp/Library/Utility/Exception.cc
diff --git a/cpp/Library/Utility/Exception.hh b/cpp/Cpp/Library/Utility/Exception.hh
similarity index 100%
rename from cpp/Library/Utility/Exception.hh
rename to cpp/Cpp/Library/Utility/Exception.hh
diff --git a/cpp/Library/Utility/MemberVariable.hh b/cpp/Cpp/Library/Utility/MemberVariable.hh
similarity index 100%
rename from cpp/Library/Utility/MemberVariable.hh
rename to cpp/Cpp/Library/Utility/MemberVariable.hh
diff --git a/cpp/Library_v1/AddLibPythonPath.sh.in b/cpp/Cpp/Library_v1/AddLibPythonPath.sh.in
similarity index 100%
rename from cpp/Library_v1/AddLibPythonPath.sh.in
rename to cpp/Cpp/Library_v1/AddLibPythonPath.sh.in
diff --git a/cpp/Library_v1/Application/KTApplication.cc b/cpp/Cpp/Library_v1/Application/KTApplication.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTApplication.cc
rename to cpp/Cpp/Library_v1/Application/KTApplication.cc
diff --git a/cpp/Library_v1/Application/KTApplication.hh b/cpp/Cpp/Library_v1/Application/KTApplication.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTApplication.hh
rename to cpp/Cpp/Library_v1/Application/KTApplication.hh
diff --git a/cpp/Library_v1/Application/KTCommandLineHandler.cc b/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTCommandLineHandler.cc
rename to cpp/Cpp/Library_v1/Application/KTCommandLineHandler.cc
diff --git a/cpp/Library_v1/Application/KTCommandLineHandler.hh b/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTCommandLineHandler.hh
rename to cpp/Cpp/Library_v1/Application/KTCommandLineHandler.hh
diff --git a/cpp/Library_v1/Application/KTCommandLineOption.hh b/cpp/Cpp/Library_v1/Application/KTCommandLineOption.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTCommandLineOption.hh
rename to cpp/Cpp/Library_v1/Application/KTCommandLineOption.hh
diff --git a/cpp/Library_v1/Application/KTConfigurator.cc b/cpp/Cpp/Library_v1/Application/KTConfigurator.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTConfigurator.cc
rename to cpp/Cpp/Library_v1/Application/KTConfigurator.cc
diff --git a/cpp/Library_v1/Application/KTConfigurator.hh b/cpp/Cpp/Library_v1/Application/KTConfigurator.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTConfigurator.hh
rename to cpp/Cpp/Library_v1/Application/KTConfigurator.hh
diff --git a/cpp/Library_v1/Application/KTDataQueueProcessor.cc b/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTDataQueueProcessor.cc
rename to cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
diff --git a/cpp/Library_v1/Application/KTDataQueueProcessor.hh b/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTDataQueueProcessor.hh
rename to cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
diff --git a/cpp/Library_v1/Application/KTFilenameParsers.cc b/cpp/Cpp/Library_v1/Application/KTFilenameParsers.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTFilenameParsers.cc
rename to cpp/Cpp/Library_v1/Application/KTFilenameParsers.cc
diff --git a/cpp/Library_v1/Application/KTFilenameParsers.hh b/cpp/Cpp/Library_v1/Application/KTFilenameParsers.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTFilenameParsers.hh
rename to cpp/Cpp/Library_v1/Application/KTFilenameParsers.hh
diff --git a/cpp/Library_v1/Application/KTPrintDataStructure.cc b/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTPrintDataStructure.cc
rename to cpp/Cpp/Library_v1/Application/KTPrintDataStructure.cc
diff --git a/cpp/Library_v1/Application/KTPrintDataStructure.hh b/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTPrintDataStructure.hh
rename to cpp/Cpp/Library_v1/Application/KTPrintDataStructure.hh
diff --git a/cpp/Library_v1/Application/KTProcessorToolbox.cc b/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTProcessorToolbox.cc
rename to cpp/Cpp/Library_v1/Application/KTProcessorToolbox.cc
diff --git a/cpp/Library_v1/Application/KTProcessorToolbox.hh b/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTProcessorToolbox.hh
rename to cpp/Cpp/Library_v1/Application/KTProcessorToolbox.hh
diff --git a/cpp/Library_v1/Application/KTProcessorToolboxPybind.hh b/cpp/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
rename to cpp/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
diff --git a/cpp/Library_v1/Application/KTRunNymph.cc b/cpp/Cpp/Library_v1/Application/KTRunNymph.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTRunNymph.cc
rename to cpp/Cpp/Library_v1/Application/KTRunNymph.cc
diff --git a/cpp/Library_v1/Application/KTRunNymph.hh b/cpp/Cpp/Library_v1/Application/KTRunNymph.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTRunNymph.hh
rename to cpp/Cpp/Library_v1/Application/KTRunNymph.hh
diff --git a/cpp/Library_v1/Application/KTThroughputProfiler.cc b/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.cc
similarity index 100%
rename from cpp/Library_v1/Application/KTThroughputProfiler.cc
rename to cpp/Cpp/Library_v1/Application/KTThroughputProfiler.cc
diff --git a/cpp/Library_v1/Application/KTThroughputProfiler.hh b/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.hh
similarity index 100%
rename from cpp/Library_v1/Application/KTThroughputProfiler.hh
rename to cpp/Cpp/Library_v1/Application/KTThroughputProfiler.hh
diff --git a/cpp/Library_v1/CMakeLists.txt b/cpp/Cpp/Library_v1/CMakeLists.txt
similarity index 100%
rename from cpp/Library_v1/CMakeLists.txt
rename to cpp/Cpp/Library_v1/CMakeLists.txt
diff --git a/cpp/Library_v1/Data/KTApplyCut.cc b/cpp/Cpp/Library_v1/Data/KTApplyCut.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTApplyCut.cc
rename to cpp/Cpp/Library_v1/Data/KTApplyCut.cc
diff --git a/cpp/Library_v1/Data/KTApplyCut.hh b/cpp/Cpp/Library_v1/Data/KTApplyCut.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTApplyCut.hh
rename to cpp/Cpp/Library_v1/Data/KTApplyCut.hh
diff --git a/cpp/Library_v1/Data/KTCoreData.cc b/cpp/Cpp/Library_v1/Data/KTCoreData.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTCoreData.cc
rename to cpp/Cpp/Library_v1/Data/KTCoreData.cc
diff --git a/cpp/Library_v1/Data/KTCoreData.hh b/cpp/Cpp/Library_v1/Data/KTCoreData.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTCoreData.hh
rename to cpp/Cpp/Library_v1/Data/KTCoreData.hh
diff --git a/cpp/Library_v1/Data/KTCut.cc b/cpp/Cpp/Library_v1/Data/KTCut.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTCut.cc
rename to cpp/Cpp/Library_v1/Data/KTCut.cc
diff --git a/cpp/Library_v1/Data/KTCut.hh b/cpp/Cpp/Library_v1/Data/KTCut.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTCut.hh
rename to cpp/Cpp/Library_v1/Data/KTCut.hh
diff --git a/cpp/Library_v1/Data/KTCutFilter.cc b/cpp/Cpp/Library_v1/Data/KTCutFilter.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTCutFilter.cc
rename to cpp/Cpp/Library_v1/Data/KTCutFilter.cc
diff --git a/cpp/Library_v1/Data/KTCutFilter.hh b/cpp/Cpp/Library_v1/Data/KTCutFilter.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTCutFilter.hh
rename to cpp/Cpp/Library_v1/Data/KTCutFilter.hh
diff --git a/cpp/Library_v1/Data/KTCutResult.hh b/cpp/Cpp/Library_v1/Data/KTCutResult.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTCutResult.hh
rename to cpp/Cpp/Library_v1/Data/KTCutResult.hh
diff --git a/cpp/Library_v1/Data/KTCutStatus.cc b/cpp/Cpp/Library_v1/Data/KTCutStatus.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTCutStatus.cc
rename to cpp/Cpp/Library_v1/Data/KTCutStatus.cc
diff --git a/cpp/Library_v1/Data/KTCutStatus.hh b/cpp/Cpp/Library_v1/Data/KTCutStatus.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTCutStatus.hh
rename to cpp/Cpp/Library_v1/Data/KTCutStatus.hh
diff --git a/cpp/Library_v1/Data/KTData.cc b/cpp/Cpp/Library_v1/Data/KTData.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTData.cc
rename to cpp/Cpp/Library_v1/Data/KTData.cc
diff --git a/cpp/Library_v1/Data/KTData.hh b/cpp/Cpp/Library_v1/Data/KTData.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTData.hh
rename to cpp/Cpp/Library_v1/Data/KTData.hh
diff --git a/cpp/Library_v1/Data/KTRegisterNymphExtData.hh b/cpp/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTRegisterNymphExtData.hh
rename to cpp/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
diff --git a/cpp/Library_v1/Data/KTTester.cc b/cpp/Cpp/Library_v1/Data/KTTester.cc
similarity index 100%
rename from cpp/Library_v1/Data/KTTester.cc
rename to cpp/Cpp/Library_v1/Data/KTTester.cc
diff --git a/cpp/Library_v1/Data/KTTester.hh b/cpp/Cpp/Library_v1/Data/KTTester.hh
similarity index 100%
rename from cpp/Library_v1/Data/KTTester.hh
rename to cpp/Cpp/Library_v1/Data/KTTester.hh
diff --git a/cpp/Library_v1/IO/KTJSONWriter.cc b/cpp/Cpp/Library_v1/IO/KTJSONWriter.cc
similarity index 100%
rename from cpp/Library_v1/IO/KTJSONWriter.cc
rename to cpp/Cpp/Library_v1/IO/KTJSONWriter.cc
diff --git a/cpp/Library_v1/IO/KTJSONWriter.hh b/cpp/Cpp/Library_v1/IO/KTJSONWriter.hh
similarity index 100%
rename from cpp/Library_v1/IO/KTJSONWriter.hh
rename to cpp/Cpp/Library_v1/IO/KTJSONWriter.hh
diff --git a/cpp/Library_v1/IO/KTReader.cc b/cpp/Cpp/Library_v1/IO/KTReader.cc
similarity index 100%
rename from cpp/Library_v1/IO/KTReader.cc
rename to cpp/Cpp/Library_v1/IO/KTReader.cc
diff --git a/cpp/Library_v1/IO/KTReader.hh b/cpp/Cpp/Library_v1/IO/KTReader.hh
similarity index 100%
rename from cpp/Library_v1/IO/KTReader.hh
rename to cpp/Cpp/Library_v1/IO/KTReader.hh
diff --git a/cpp/Library_v1/IO/KTWriter.cc b/cpp/Cpp/Library_v1/IO/KTWriter.cc
similarity index 100%
rename from cpp/Library_v1/IO/KTWriter.cc
rename to cpp/Cpp/Library_v1/IO/KTWriter.cc
diff --git a/cpp/Library_v1/IO/KTWriter.hh b/cpp/Cpp/Library_v1/IO/KTWriter.hh
similarity index 100%
rename from cpp/Library_v1/IO/KTWriter.hh
rename to cpp/Cpp/Library_v1/IO/KTWriter.hh
diff --git a/cpp/Library_v1/NymphPybind.cc b/cpp/Cpp/Library_v1/NymphPybind.cc
similarity index 100%
rename from cpp/Library_v1/NymphPybind.cc
rename to cpp/Cpp/Library_v1/NymphPybind.cc
diff --git a/cpp/Library_v1/Processor/KTConnection.hh b/cpp/Cpp/Library_v1/Processor/KTConnection.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTConnection.hh
rename to cpp/Cpp/Library_v1/Processor/KTConnection.hh
diff --git a/cpp/Library_v1/Processor/KTNymphSignals.hh b/cpp/Cpp/Library_v1/Processor/KTNymphSignals.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTNymphSignals.hh
rename to cpp/Cpp/Library_v1/Processor/KTNymphSignals.hh
diff --git a/cpp/Library_v1/Processor/KTNymphSlot.hh b/cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTNymphSlot.hh
rename to cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh
diff --git a/cpp/Library_v1/Processor/KTPrimaryProcessor.cc b/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
similarity index 100%
rename from cpp/Library_v1/Processor/KTPrimaryProcessor.cc
rename to cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
diff --git a/cpp/Library_v1/Processor/KTPrimaryProcessor.hh b/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTPrimaryProcessor.hh
rename to cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
diff --git a/cpp/Library_v1/Processor/KTProcessor.cc b/cpp/Cpp/Library_v1/Processor/KTProcessor.cc
similarity index 100%
rename from cpp/Library_v1/Processor/KTProcessor.cc
rename to cpp/Cpp/Library_v1/Processor/KTProcessor.cc
diff --git a/cpp/Library_v1/Processor/KTProcessor.hh b/cpp/Cpp/Library_v1/Processor/KTProcessor.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTProcessor.hh
rename to cpp/Cpp/Library_v1/Processor/KTProcessor.hh
diff --git a/cpp/Library_v1/Processor/KTProcessorPybind.cc b/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.cc
similarity index 100%
rename from cpp/Library_v1/Processor/KTProcessorPybind.cc
rename to cpp/Cpp/Library_v1/Processor/KTProcessorPybind.cc
diff --git a/cpp/Library_v1/Processor/KTProcessorPybind.hh b/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTProcessorPybind.hh
rename to cpp/Cpp/Library_v1/Processor/KTProcessorPybind.hh
diff --git a/cpp/Library_v1/Processor/KTPyProcessor.hh b/cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTPyProcessor.hh
rename to cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh
diff --git a/cpp/Library_v1/Processor/KTSignal.hh b/cpp/Cpp/Library_v1/Processor/KTSignal.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTSignal.hh
rename to cpp/Cpp/Library_v1/Processor/KTSignal.hh
diff --git a/cpp/Library_v1/Processor/KTSignalSlotBase.hh b/cpp/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTSignalSlotBase.hh
rename to cpp/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
diff --git a/cpp/Library_v1/Processor/KTSignalWrapper.cc b/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.cc
similarity index 100%
rename from cpp/Library_v1/Processor/KTSignalWrapper.cc
rename to cpp/Cpp/Library_v1/Processor/KTSignalWrapper.cc
diff --git a/cpp/Library_v1/Processor/KTSignalWrapper.hh b/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTSignalWrapper.hh
rename to cpp/Cpp/Library_v1/Processor/KTSignalWrapper.hh
diff --git a/cpp/Library_v1/Processor/KTSlot.hh b/cpp/Cpp/Library_v1/Processor/KTSlot.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTSlot.hh
rename to cpp/Cpp/Library_v1/Processor/KTSlot.hh
diff --git a/cpp/Library_v1/Processor/KTSlotWrapper.cc b/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc
similarity index 100%
rename from cpp/Library_v1/Processor/KTSlotWrapper.cc
rename to cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc
diff --git a/cpp/Library_v1/Processor/KTSlotWrapper.hh b/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTSlotWrapper.hh
rename to cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh
diff --git a/cpp/Library_v1/Processor/KTThreadReference.cc b/cpp/Cpp/Library_v1/Processor/KTThreadReference.cc
similarity index 100%
rename from cpp/Library_v1/Processor/KTThreadReference.cc
rename to cpp/Cpp/Library_v1/Processor/KTThreadReference.cc
diff --git a/cpp/Library_v1/Processor/KTThreadReference.hh b/cpp/Cpp/Library_v1/Processor/KTThreadReference.hh
similarity index 100%
rename from cpp/Library_v1/Processor/KTThreadReference.hh
rename to cpp/Cpp/Library_v1/Processor/KTThreadReference.hh
diff --git a/cpp/Library_v1/Utility/KTCacheDirectory.cc b/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.cc
similarity index 100%
rename from cpp/Library_v1/Utility/KTCacheDirectory.cc
rename to cpp/Cpp/Library_v1/Utility/KTCacheDirectory.cc
diff --git a/cpp/Library_v1/Utility/KTCacheDirectory.hh b/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTCacheDirectory.hh
rename to cpp/Cpp/Library_v1/Utility/KTCacheDirectory.hh
diff --git a/cpp/Library_v1/Utility/KTConcurrentQueue.hh b/cpp/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTConcurrentQueue.hh
rename to cpp/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
diff --git a/cpp/Library_v1/Utility/KTConfigurable.cc b/cpp/Cpp/Library_v1/Utility/KTConfigurable.cc
similarity index 100%
rename from cpp/Library_v1/Utility/KTConfigurable.cc
rename to cpp/Cpp/Library_v1/Utility/KTConfigurable.cc
diff --git a/cpp/Library_v1/Utility/KTConfigurable.hh b/cpp/Cpp/Library_v1/Utility/KTConfigurable.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTConfigurable.hh
rename to cpp/Cpp/Library_v1/Utility/KTConfigurable.hh
diff --git a/cpp/Library_v1/Utility/KTConfigurablePybind.hh b/cpp/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTConfigurablePybind.hh
rename to cpp/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
diff --git a/cpp/Library_v1/Utility/KTDirectory.cc b/cpp/Cpp/Library_v1/Utility/KTDirectory.cc
similarity index 100%
rename from cpp/Library_v1/Utility/KTDirectory.cc
rename to cpp/Cpp/Library_v1/Utility/KTDirectory.cc
diff --git a/cpp/Library_v1/Utility/KTDirectory.hh b/cpp/Cpp/Library_v1/Utility/KTDirectory.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTDirectory.hh
rename to cpp/Cpp/Library_v1/Utility/KTDirectory.hh
diff --git a/cpp/Library_v1/Utility/KTEventLoop.cc b/cpp/Cpp/Library_v1/Utility/KTEventLoop.cc
similarity index 100%
rename from cpp/Library_v1/Utility/KTEventLoop.cc
rename to cpp/Cpp/Library_v1/Utility/KTEventLoop.cc
diff --git a/cpp/Library_v1/Utility/KTEventLoop.hh b/cpp/Cpp/Library_v1/Utility/KTEventLoop.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTEventLoop.hh
rename to cpp/Cpp/Library_v1/Utility/KTEventLoop.hh
diff --git a/cpp/Library_v1/Utility/KTException.cc b/cpp/Cpp/Library_v1/Utility/KTException.cc
similarity index 100%
rename from cpp/Library_v1/Utility/KTException.cc
rename to cpp/Cpp/Library_v1/Utility/KTException.cc
diff --git a/cpp/Library_v1/Utility/KTException.hh b/cpp/Cpp/Library_v1/Utility/KTException.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTException.hh
rename to cpp/Cpp/Library_v1/Utility/KTException.hh
diff --git a/cpp/Library_v1/Utility/KTExtensible.hh b/cpp/Cpp/Library_v1/Utility/KTExtensible.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTExtensible.hh
rename to cpp/Cpp/Library_v1/Utility/KTExtensible.hh
diff --git a/cpp/Library_v1/Utility/KTExtensibleStruct.hh b/cpp/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTExtensibleStruct.hh
rename to cpp/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
diff --git a/cpp/Library_v1/Utility/KTExtensibleStructFactory.hh b/cpp/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
rename to cpp/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
diff --git a/cpp/Library_v1/Utility/KTLogger.hh b/cpp/Cpp/Library_v1/Utility/KTLogger.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTLogger.hh
rename to cpp/Cpp/Library_v1/Utility/KTLogger.hh
diff --git a/cpp/Library_v1/Utility/KTMemberVariable.hh b/cpp/Cpp/Library_v1/Utility/KTMemberVariable.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTMemberVariable.hh
rename to cpp/Cpp/Library_v1/Utility/KTMemberVariable.hh
diff --git a/cpp/Library_v1/Utility/KTParamPybind.hh b/cpp/Cpp/Library_v1/Utility/KTParamPybind.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTParamPybind.hh
rename to cpp/Cpp/Library_v1/Utility/KTParamPybind.hh
diff --git a/cpp/Library_v1/Utility/KTPythonMacros.hh b/cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTPythonMacros.hh
rename to cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh
diff --git a/cpp/Library_v1/Utility/KTTIFactory.hh b/cpp/Cpp/Library_v1/Utility/KTTIFactory.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTTIFactory.hh
rename to cpp/Cpp/Library_v1/Utility/KTTIFactory.hh
diff --git a/cpp/Library_v1/Utility/KTTime.cc b/cpp/Cpp/Library_v1/Utility/KTTime.cc
similarity index 100%
rename from cpp/Library_v1/Utility/KTTime.cc
rename to cpp/Cpp/Library_v1/Utility/KTTime.cc
diff --git a/cpp/Library_v1/Utility/KTTime.hh b/cpp/Cpp/Library_v1/Utility/KTTime.hh
similarity index 100%
rename from cpp/Library_v1/Utility/KTTime.hh
rename to cpp/Cpp/Library_v1/Utility/KTTime.hh
diff --git a/cpp/Templates/KTProcessorTemplate.cc b/cpp/Cpp/Templates/KTProcessorTemplate.cc
similarity index 100%
rename from cpp/Templates/KTProcessorTemplate.cc
rename to cpp/Cpp/Templates/KTProcessorTemplate.cc
diff --git a/cpp/Templates/KTProcessorTemplate.hh b/cpp/Cpp/Templates/KTProcessorTemplate.hh
similarity index 100%
rename from cpp/Templates/KTProcessorTemplate.hh
rename to cpp/Cpp/Templates/KTProcessorTemplate.hh
diff --git a/cpp/Templates/MainCMakeLists.txt b/cpp/Cpp/Templates/MainCMakeLists.txt
similarity index 100%
rename from cpp/Templates/MainCMakeLists.txt
rename to cpp/Cpp/Templates/MainCMakeLists.txt
diff --git a/python/nymph/__init__.py b/python/Python/nymph/__init__.py
similarity index 100%
rename from python/nymph/__init__.py
rename to python/Python/nymph/__init__.py

From 5f7856070a7fd5c786ff80c7eeb8e931c500cec5 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 1 Feb 2022 08:05:03 -0500
Subject: [PATCH 273/521] deleted the extra directories from renaming mishaps

---
 cpp/Cpp/Executables_v1/Main/CMakeLists.txt    |  33 -
 cpp/Cpp/Executables_v1/Main/ConfigCheck.cc    |  29 -
 cpp/Cpp/Executables_v1/Main/Nymph.cc          |  68 --
 .../Executables_v1/Validation/CMakeLists.txt  |  91 --
 .../ConfigFiles/TestConfigurator.json         |  41 -
 .../ConfigFiles/TestParameterStoreConfig.json |  23 -
 .../Executables_v1/Validation/KTJSONReader.cc |  39 -
 .../Executables_v1/Validation/KTJSONReader.hh |  62 --
 .../Validation/KTJSONTypeWriterValidation.cc  |  32 -
 .../Validation/KTJSONTypeWriterValidation.hh  |  36 -
 .../Validation/KTPyTestClass.cc               |  22 -
 .../Validation/KTPyTestClass.hh               |  44 -
 .../Validation/KTPyTestClassPybind.hh         |  26 -
 .../KTRegisterNymphValidationExtData.hh       |  19 -
 .../Validation/KTTestConfigurable.cc          |  67 --
 .../Validation/KTTestConfigurable.hh          |  53 -
 .../Executables_v1/Validation/KTTestCuts.cc   |  69 --
 .../Executables_v1/Validation/KTTestCuts.hh   |  48 -
 .../Executables_v1/Validation/KTTestData.cc   |  38 -
 .../Executables_v1/Validation/KTTestData.hh   |  71 --
 .../Validation/KTTestDataPrimaryProcessor.cc  |  62 --
 .../Validation/KTTestDataPrimaryProcessor.hh  |  40 -
 .../Validation/KTTestPrimaryProcessor.cc      |  47 -
 .../Validation/KTTestPrimaryProcessor.hh      |  40 -
 .../Validation/KTTestProcessor.cc             | 151 ---
 .../Validation/KTTestProcessor.hh             | 108 --
 .../Validation/NymphValidationPybind.cc       |  20 -
 .../Validation/TestApplication.cc             | 102 --
 .../Executables_v1/Validation/TestApplyCut.cc |  71 --
 .../Validation/TestCacheDirectory.cc          |  48 -
 cpp/Cpp/Executables_v1/Validation/TestCut.cc  |  81 --
 .../Validation/TestCutFilter.cc               |  90 --
 cpp/Cpp/Executables_v1/Validation/TestData.cc |  25 -
 .../Validation/TestExceptionInSlot.cc         |  93 --
 cpp/Cpp/Executables_v1/Validation/TestExt.cc  |  79 --
 .../Validation/TestExtSerialization.cc        |  80 --
 .../Validation/TestJSONWriter.cc              |  52 -
 .../Validation/TestJSONWriterViaSlot.cc       |  84 --
 .../Executables_v1/Validation/TestLogger.cc   |  33 -
 .../Validation/TestParamBindings.py           |  51 -
 .../Validation/TestPolymorphicSlotData.cc     |  41 -
 .../Validation/TestPrimaryProcessor.cc        |  72 --
 .../TestPrimaryProcessorNoThreading.cc        |  45 -
 .../Validation/TestPrintData.cc               |  41 -
 .../Validation/TestProcessorToolbox.py        |  27 -
 .../TestProcessorToolbox2Threads.cc           | 114 --
 .../TestProcessorToolboxMultithreaded.cc      |  76 --
 .../TestProcessorToolboxSinglethreaded.cc     |  77 --
 .../Validation/TestPyTestClass.py             |  13 -
 .../Validation/TestPythonBasics.hh            |  26 -
 .../Validation/TestPythonBasics.py            |  10 -
 .../Validation/TestSerialization.cc           |  73 --
 .../Validation/TestSignalsAndSlots.cc         |  58 --
 .../Executables_v1/Validation/TestSlotData.cc |  43 -
 .../Validation/TestThroughputProfiler.cc      |  45 -
 .../Validation/TestUseBreakpoint.cc           |  93 --
 .../Validation/TestWrapProcessor.py           |  51 -
 cpp/Cpp/Library/CMakeLists.txt                |  63 --
 cpp/Cpp/Library/Data/Data.cc                  |  18 -
 cpp/Cpp/Library/Data/Data.hh                  |  24 -
 cpp/Cpp/Library/Data/DataFrame.cc             |  19 -
 cpp/Cpp/Library/Data/DataFrame.hh             | 153 ---
 cpp/Cpp/Library/Data/DataManager.cc           |  18 -
 cpp/Cpp/Library/Data/DataManager.hh           |  39 -
 cpp/Cpp/Library/Processor/ControlAccess.cc    | 122 ---
 cpp/Cpp/Library/Processor/ControlAccess.hh    | 146 ---
 cpp/Cpp/Library/Processor/PrimaryProcessor.cc |  58 --
 cpp/Cpp/Library/Processor/PrimaryProcessor.hh |  68 --
 cpp/Cpp/Library/Processor/Processor.cc        | 217 ----
 cpp/Cpp/Library/Processor/Processor.hh        | 122 ---
 cpp/Cpp/Library/Processor/ProcessorToolbox.cc | 758 --------------
 cpp/Cpp/Library/Processor/ProcessorToolbox.hh | 272 -----
 cpp/Cpp/Library/Processor/QuitThread.hh       |  27 -
 cpp/Cpp/Library/Processor/ReturnBuffer.cc     |  19 -
 cpp/Cpp/Library/Processor/ReturnBuffer.hh     |  63 --
 cpp/Cpp/Library/Processor/Signal.hh           | 257 -----
 cpp/Cpp/Library/Processor/SignalSlotBase.cc   |  52 -
 cpp/Cpp/Library/Processor/SignalSlotBase.hh   | 129 ---
 cpp/Cpp/Library/Processor/Slot.hh             | 241 -----
 cpp/Cpp/Library/Utility/Exception.cc          |  74 --
 cpp/Cpp/Library/Utility/Exception.hh          | 201 ----
 cpp/Cpp/Library/Utility/MemberVariable.hh     |  93 --
 cpp/Cpp/Library_v1/AddLibPythonPath.sh.in     |   3 -
 .../Library_v1/Application/KTApplication.cc   | 174 ----
 .../Library_v1/Application/KTApplication.hh   | 105 --
 .../Application/KTCommandLineHandler.cc       | 458 --------
 .../Application/KTCommandLineHandler.hh       | 339 ------
 .../Application/KTCommandLineOption.hh        |  89 --
 .../Library_v1/Application/KTConfigurator.cc  |  32 -
 .../Library_v1/Application/KTConfigurator.hh  | 123 ---
 .../Application/KTDataQueueProcessor.cc       |  53 -
 .../Application/KTDataQueueProcessor.hh       | 395 -------
 .../Application/KTFilenameParsers.cc          |  49 -
 .../Application/KTFilenameParsers.hh          |  27 -
 .../Application/KTPrintDataStructure.cc       | 121 ---
 .../Application/KTPrintDataStructure.hh       |  82 --
 .../Application/KTProcessorToolbox.cc         | 986 ------------------
 .../Application/KTProcessorToolbox.hh         | 331 ------
 .../Application/KTProcessorToolboxPybind.hh   | 100 --
 cpp/Cpp/Library_v1/Application/KTRunNymph.cc  |  69 --
 cpp/Cpp/Library_v1/Application/KTRunNymph.hh  |  21 -
 .../Application/KTThroughputProfiler.cc       | 166 ---
 .../Application/KTThroughputProfiler.hh       | 149 ---
 cpp/Cpp/Library_v1/CMakeLists.txt             | 121 ---
 cpp/Cpp/Library_v1/Data/KTApplyCut.cc         | 113 --
 cpp/Cpp/Library_v1/Data/KTApplyCut.hh         |  99 --
 cpp/Cpp/Library_v1/Data/KTCoreData.cc         |  33 -
 cpp/Cpp/Library_v1/Data/KTCoreData.hh         |  88 --
 cpp/Cpp/Library_v1/Data/KTCut.cc              |  21 -
 cpp/Cpp/Library_v1/Data/KTCut.hh              | 209 ----
 cpp/Cpp/Library_v1/Data/KTCutFilter.cc        | 100 --
 cpp/Cpp/Library_v1/Data/KTCutFilter.hh        | 139 ---
 cpp/Cpp/Library_v1/Data/KTCutResult.hh        |  36 -
 cpp/Cpp/Library_v1/Data/KTCutStatus.cc        |  94 --
 cpp/Cpp/Library_v1/Data/KTCutStatus.hh        | 316 ------
 cpp/Cpp/Library_v1/Data/KTData.cc             |  37 -
 cpp/Cpp/Library_v1/Data/KTData.hh             |  96 --
 .../Library_v1/Data/KTRegisterNymphExtData.hh |  29 -
 cpp/Cpp/Library_v1/Data/KTTester.cc           |  24 -
 cpp/Cpp/Library_v1/Data/KTTester.hh           |  41 -
 cpp/Cpp/Library_v1/IO/KTJSONWriter.cc         |  57 -
 cpp/Cpp/Library_v1/IO/KTJSONWriter.hh         | 107 --
 cpp/Cpp/Library_v1/IO/KTReader.cc             |  22 -
 cpp/Cpp/Library_v1/IO/KTReader.hh             |  29 -
 cpp/Cpp/Library_v1/IO/KTWriter.cc             |  34 -
 cpp/Cpp/Library_v1/IO/KTWriter.hh             | 140 ---
 cpp/Cpp/Library_v1/NymphPybind.cc             |  35 -
 cpp/Cpp/Library_v1/Processor/KTConnection.hh  |  17 -
 .../Library_v1/Processor/KTNymphSignals.hh    |  46 -
 cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh   | 398 -------
 .../Processor/KTPrimaryProcessor.cc           |  69 --
 .../Processor/KTPrimaryProcessor.hh           |  53 -
 cpp/Cpp/Library_v1/Processor/KTProcessor.cc   | 150 ---
 cpp/Cpp/Library_v1/Processor/KTProcessor.hh   | 161 ---
 .../Library_v1/Processor/KTProcessorPybind.cc |  48 -
 .../Library_v1/Processor/KTProcessorPybind.hh |  89 --
 cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh |  32 -
 cpp/Cpp/Library_v1/Processor/KTSignal.hh      | 250 -----
 .../Library_v1/Processor/KTSignalSlotBase.hh  |  52 -
 .../Library_v1/Processor/KTSignalWrapper.cc   |  23 -
 .../Library_v1/Processor/KTSignalWrapper.hh   |  82 --
 cpp/Cpp/Library_v1/Processor/KTSlot.hh        | 236 -----
 cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc |  27 -
 cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh | 152 ---
 .../Library_v1/Processor/KTThreadReference.cc |  86 --
 .../Library_v1/Processor/KTThreadReference.hh | 168 ---
 .../Library_v1/Utility/KTCacheDirectory.cc    |  34 -
 .../Library_v1/Utility/KTCacheDirectory.hh    |  42 -
 .../Library_v1/Utility/KTConcurrentQueue.hh   | 170 ---
 cpp/Cpp/Library_v1/Utility/KTConfigurable.cc  |  82 --
 cpp/Cpp/Library_v1/Utility/KTConfigurable.hh  |  96 --
 .../Utility/KTConfigurablePybind.hh           |  29 -
 cpp/Cpp/Library_v1/Utility/KTDirectory.cc     |  86 --
 cpp/Cpp/Library_v1/Utility/KTDirectory.hh     |  47 -
 cpp/Cpp/Library_v1/Utility/KTEventLoop.cc     |  24 -
 cpp/Cpp/Library_v1/Utility/KTEventLoop.hh     |  36 -
 cpp/Cpp/Library_v1/Utility/KTException.cc     |  30 -
 cpp/Cpp/Library_v1/Utility/KTException.hh     | 127 ---
 cpp/Cpp/Library_v1/Utility/KTExtensible.hh    | 393 -------
 .../Library_v1/Utility/KTExtensibleStruct.hh  | 384 -------
 .../Utility/KTExtensibleStructFactory.hh      | 201 ----
 cpp/Cpp/Library_v1/Utility/KTLogger.hh        |  51 -
 .../Library_v1/Utility/KTMemberVariable.hh    |  98 --
 cpp/Cpp/Library_v1/Utility/KTParamPybind.hh   | 101 --
 cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh  |  23 -
 cpp/Cpp/Library_v1/Utility/KTTIFactory.hh     | 364 -------
 cpp/Cpp/Library_v1/Utility/KTTime.cc          |  93 --
 cpp/Cpp/Library_v1/Utility/KTTime.hh          |  53 -
 cpp/Cpp/Templates/KTProcessorTemplate.cc      |  46 -
 cpp/Cpp/Templates/KTProcessorTemplate.hh      |  85 --
 cpp/Cpp/Templates/MainCMakeLists.txt          |  24 -
 python/Python/nymph/__init__.py               |   0
 172 files changed, 17176 deletions(-)
 delete mode 100644 cpp/Cpp/Executables_v1/Main/CMakeLists.txt
 delete mode 100644 cpp/Cpp/Executables_v1/Main/ConfigCheck.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Main/Nymph.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/CMakeLists.txt
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTJSONReader.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTJSONReader.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTPyTestClass.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTPyTestClass.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestCuts.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestCuts.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestData.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestData.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestProcessor.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/KTTestProcessor.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestApplication.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestApplyCut.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestCut.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestCutFilter.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestData.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestExt.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestExtSerialization.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestJSONWriter.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestLogger.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestParamBindings.py
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPrintData.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPyTestClass.py
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPythonBasics.hh
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestPythonBasics.py
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestSerialization.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestSlotData.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
 delete mode 100644 cpp/Cpp/Executables_v1/Validation/TestWrapProcessor.py
 delete mode 100644 cpp/Cpp/Library/CMakeLists.txt
 delete mode 100644 cpp/Cpp/Library/Data/Data.cc
 delete mode 100644 cpp/Cpp/Library/Data/Data.hh
 delete mode 100644 cpp/Cpp/Library/Data/DataFrame.cc
 delete mode 100644 cpp/Cpp/Library/Data/DataFrame.hh
 delete mode 100644 cpp/Cpp/Library/Data/DataManager.cc
 delete mode 100644 cpp/Cpp/Library/Data/DataManager.hh
 delete mode 100644 cpp/Cpp/Library/Processor/ControlAccess.cc
 delete mode 100644 cpp/Cpp/Library/Processor/ControlAccess.hh
 delete mode 100644 cpp/Cpp/Library/Processor/PrimaryProcessor.cc
 delete mode 100644 cpp/Cpp/Library/Processor/PrimaryProcessor.hh
 delete mode 100644 cpp/Cpp/Library/Processor/Processor.cc
 delete mode 100644 cpp/Cpp/Library/Processor/Processor.hh
 delete mode 100644 cpp/Cpp/Library/Processor/ProcessorToolbox.cc
 delete mode 100644 cpp/Cpp/Library/Processor/ProcessorToolbox.hh
 delete mode 100644 cpp/Cpp/Library/Processor/QuitThread.hh
 delete mode 100644 cpp/Cpp/Library/Processor/ReturnBuffer.cc
 delete mode 100644 cpp/Cpp/Library/Processor/ReturnBuffer.hh
 delete mode 100644 cpp/Cpp/Library/Processor/Signal.hh
 delete mode 100644 cpp/Cpp/Library/Processor/SignalSlotBase.cc
 delete mode 100644 cpp/Cpp/Library/Processor/SignalSlotBase.hh
 delete mode 100644 cpp/Cpp/Library/Processor/Slot.hh
 delete mode 100644 cpp/Cpp/Library/Utility/Exception.cc
 delete mode 100644 cpp/Cpp/Library/Utility/Exception.hh
 delete mode 100644 cpp/Cpp/Library/Utility/MemberVariable.hh
 delete mode 100644 cpp/Cpp/Library_v1/AddLibPythonPath.sh.in
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTApplication.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTApplication.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTCommandLineHandler.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTCommandLineHandler.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTCommandLineOption.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTConfigurator.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTConfigurator.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTFilenameParsers.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTFilenameParsers.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTPrintDataStructure.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTPrintDataStructure.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTProcessorToolbox.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTProcessorToolbox.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTRunNymph.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTRunNymph.hh
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTThroughputProfiler.cc
 delete mode 100644 cpp/Cpp/Library_v1/Application/KTThroughputProfiler.hh
 delete mode 100644 cpp/Cpp/Library_v1/CMakeLists.txt
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTApplyCut.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTApplyCut.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCoreData.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCoreData.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCut.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCut.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCutFilter.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCutFilter.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCutResult.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCutStatus.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTCutStatus.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTData.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTData.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTTester.cc
 delete mode 100644 cpp/Cpp/Library_v1/Data/KTTester.hh
 delete mode 100644 cpp/Cpp/Library_v1/IO/KTJSONWriter.cc
 delete mode 100644 cpp/Cpp/Library_v1/IO/KTJSONWriter.hh
 delete mode 100644 cpp/Cpp/Library_v1/IO/KTReader.cc
 delete mode 100644 cpp/Cpp/Library_v1/IO/KTReader.hh
 delete mode 100644 cpp/Cpp/Library_v1/IO/KTWriter.cc
 delete mode 100644 cpp/Cpp/Library_v1/IO/KTWriter.hh
 delete mode 100644 cpp/Cpp/Library_v1/NymphPybind.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTConnection.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTNymphSignals.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTProcessor.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTProcessor.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTProcessorPybind.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTProcessorPybind.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSignal.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSignalWrapper.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSignalWrapper.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSlot.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTThreadReference.cc
 delete mode 100644 cpp/Cpp/Library_v1/Processor/KTThreadReference.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTCacheDirectory.cc
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTCacheDirectory.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTConfigurable.cc
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTConfigurable.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTDirectory.cc
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTDirectory.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTEventLoop.cc
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTEventLoop.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTException.cc
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTException.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTExtensible.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTLogger.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTMemberVariable.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTParamPybind.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTTIFactory.hh
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTTime.cc
 delete mode 100644 cpp/Cpp/Library_v1/Utility/KTTime.hh
 delete mode 100644 cpp/Cpp/Templates/KTProcessorTemplate.cc
 delete mode 100644 cpp/Cpp/Templates/KTProcessorTemplate.hh
 delete mode 100644 cpp/Cpp/Templates/MainCMakeLists.txt
 delete mode 100644 python/Python/nymph/__init__.py

diff --git a/cpp/Cpp/Executables_v1/Main/CMakeLists.txt b/cpp/Cpp/Executables_v1/Main/CMakeLists.txt
deleted file mode 100644
index a7ba2b1..0000000
--- a/cpp/Cpp/Executables_v1/Main/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# CMakeLists for Nymph/Executables_v1/Main
-# Author: N. Oblath
-
-if( NOT Nymph_AS_SUBMODULE )
-    set( Nymph_package_libs
-        Nymph
-    )
-endif()
-
-set( Nymph_SOURCES
-#    ConfigCheck.cc
-)
-if( Nymph_BUILD_NYMPH_EXE )
-    set( Nymph_SOURCES
-        ${Nymph_SOURCES}
-        Nymph.cc
-    )
-endif( Nymph_BUILD_NYMPH_EXE )
-
-
-set( Nymph_PROGRAMS )
-pbuilder_executables( 
-    SOURCES ${Nymph_SOURCES}
-    TARGETS_VAR Nymph_PROGRAMS
-    PROJECT_LIBRARIES ${Nymph_package_libs}
-    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Executables
-    EXETARGETS ${Nymph_PROGRAMS}
-)
diff --git a/cpp/Cpp/Executables_v1/Main/ConfigCheck.cc b/cpp/Cpp/Executables_v1/Main/ConfigCheck.cc
deleted file mode 100644
index ac3e712..0000000
--- a/cpp/Cpp/Executables_v1/Main/ConfigCheck.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * ConfigCheck.cc
- *
- *  Created on: Jan 4, 2013
- *      Author: nsoblath
- *
- */
-
-#include "KTApplication.hh"
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER(cclog, "ConfigCheck");
-
-int main(int argc, char** argv)
-{
-    try
-    {
-        KTApplication app(argc, argv);
-    }
-    catch( std::exception& e )
-    {
-        KTERROR( cclog, "Something went wrong while processing the command line:\n" << e.what() );
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Main/Nymph.cc b/cpp/Cpp/Executables_v1/Main/Nymph.cc
deleted file mode 100644
index 8bbdd1f..0000000
--- a/cpp/Cpp/Executables_v1/Main/Nymph.cc
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Nymph.cc
- *
- *  Created on: Sep 28, 2012
- *      Author: nsoblath
- *
- *  This program will run any processor-based code in packages built with Nymph.
- *  All of the action is setup with a config file.
- *  See KTProcessorToolbox for details on the configuration option.
- */
-
-#include "KTApplication.hh"
-#include "KTLogger.hh"
-#include "KTRunNymph.hh"
-
-KTLOGGER( nymphlog, "Nymph" );
-
-
-int main( int argc, char** argv )
-{
-    KTPROG( nymphlog, "Welcome to Nymph!" );
-    KTDEBUG( nymphlog,
-            "\n" <<
-            "                                           Z                                 \n" <<
-            "                                            =M                               \n" <<
-            "                                             M                               \n" <<
-            "                                             M                               \n" <<
-            "                                            =M                               \n" <<
-            "                                            N                                \n" <<
-            "                                            M             NINMMMMMZ...M      \n" <<
-            "                                            M            $$                  \n" <<
-            "                        M:                  N.           IM                  \n" <<
-            "                          ZD.                 M?          M                  \n" <<
-            "                             $                M ?M       MM           .$     \n" <<
-            "                               DM               M  O      8       .+MZ       \n" <<
-            "                                 ~M                M~ 8  M~  MM:~M           \n" <<
-            "                                   O:MMIZ+,?DNMD$.... M,MM MZ ? D$=  .8MOM+  \n" <<
-            "                                      ,= MN ZZ D:  M:MM~MM==     MMZM        \n" <<
-            "                                           ...MM MMM8,M+ I:ND $MMM           \n" <<
-            "                                         MMMMO   ~M, ,MM7MOD$                \n" <<
-            "                                    MMMMMM ~~8M? ,O~= MDNM M ,               \n" <<
-            "                                MMMM:M   Z8 MMM :MNM = ..,  MZ               \n" <<
-            "                            MNMMNM MM IM NM,M    N M   MM    +M         .NM M\n" <<
-            "                        ~MMD8 :  D  MM=MM,     O MO    8=    + $     .IM     \n" <<
-            "               ONMMMMMM..?  8 :MMMMM          = M      N      M    :M        \n" <<
-            "   ..+M8=...:=MMMMMMMMMN OMM:M,             M  ~       7       MMM8          \n" <<
-            "ZM8         ~M+:MZMMM~ M                    OM         M                     \n" <<
-            "      .:M..$D..$D ? M,                    MM           MN                    \n" <<
-            "   $M7      M   M+                       M              NMMMM:..             \n" <<
-            "         M..M                          :N                       7M           \n" <<
-            "      MM,                             M                           D          \n" <<
-            "                                     M                                       \n" <<
-            "                                   M=                                        \n" <<
-            "                                   M                                         \n" <<
-            "                                  =                                          \n" <<
-            "                                  M                                          \n");
-
-    try
-    {
-        return Nymph::RunNymph( std::make_shared< Nymph::KTApplication >( argc, argv ) );
-    }
-    catch( std::exception& e )
-    {
-        KTERROR( nymphlog, "Exception caught:\n" << e.what() );
-        return -1;
-    }
-
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/CMakeLists.txt b/cpp/Cpp/Executables_v1/Validation/CMakeLists.txt
deleted file mode 100644
index 90bc734..0000000
--- a/cpp/Cpp/Executables_v1/Validation/CMakeLists.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-# CMakeLists for Nymph/Executables_v1/Validation
-# Author: N. Oblath
-
-############################
-# Config files
-############################
-
-set (VALIDATION_CONFIGFILES
-    ConfigFiles/TestConfigurator.json
-)
-
-pbuilder_install_config (${VALIDATION_CONFIGFILES})
-
-
-############################
-# NymphValidation library files
-############################
-
-set (VALIDATION_HEADERFILES
-    KTTestConfigurable.hh
-    KTTestCuts.hh
-    KTTestProcessor.hh
-)
-
-set (VALIDATION_SOURCEFILES
-    KTTestConfigurable.cc
-    KTTestCuts.cc
-    KTTestProcessor.cc
-)
-
-set( LIB_DEPENDENCIES
-    Nymph
-)
-
-############################
-# NymphValidation library 
-############################
-
-include_directories( BEFORE 
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-pbuilder_library( 
-    TARGET NymphValidation 
-    SOURCES ${VALIDATION_SOURCEFILES}
-    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Validation
-    LIBTARGETS NymphValidation
-)
-
-pbuilder_install_headers( ${VALIDATION_HEADERFILES} )
-
-
-############################
-# Executables
-############################
-
-set( LIB_DEPENDENCIES
-    NymphValidation
-)
-
-set( TEST_SOURCES
-    TestApplication.cc
-    TestApplyCut.cc
-    TestCacheDirectory.cc
-    TestCut.cc
-    TestCutFilter.cc
-    TestLogger.cc
-    TestPrintData.cc
-    TestSignalsAndSlots.cc
-    TestThroughputProfiler.cc
-)
-
-pbuilder_executables( TEST_PROGRAMS LIB_DEPENDENCIES )
-
-set( TEST_PROGRAMS )
-pbuilder_executables( 
-    SOURCES ${TEST_SOURCES}
-    TARGETS_VAR TEST_PROGRAMS
-    PROJECT_LIBRARIES ${LIB_DEPENDENCIES}
-    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Validation
-    EXETARGETS ${TEST_PROGRAMS}
-)
diff --git a/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json b/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
deleted file mode 100644
index 8a5d5a1..0000000
--- a/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "test-configurable":
-    {
-        "int-data": 5,
-        "double-data": 50,
-        "string-data": "It works!",
-        "comment": "This should not show up in the as-parsed configuration",
-        "comment":
-        {
-            "neither": "should this"
-        }
-        
-    },
-    
-    "nested-data":
-    {
-        "single-data": 222,
-        "single-data-2": -5000,
-        "#single-data-3": 1,
-        "single-data-3": 10,
-        
-        "sub-data":
-        {
-            "single-data":111,
-            "single-data-2": 6789,
-            "multi-data":
-            [ 345, 456, ["###", 567], 789 ]
-        }
-    },
-    
-    "nested-data-2":
-    {
-        "single-data-2": 212121,
-        "single-data-3": "this replaced an integer",
-        
-        "sub-data":
-        {
-            "single-data-2": 12345
-        }
-    }
-}
\ No newline at end of file
diff --git a/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json b/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
deleted file mode 100644
index a599ab0..0000000
--- a/cpp/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "test-configurable":
-    {
-        "int-data": 5,
-        "double-data": 50,
-        "string-data": "It works!"
-        
-    },
-    
-    "nested-data":
-    {
-        "single-data":222,
-        
-        "sub-data":
-        {
-            "single-data":111,
-            "multi-data":345,
-            "multi-data":567,
-            "multi-data":789
-        }
-        
-    }
-}
\ No newline at end of file
diff --git a/cpp/Cpp/Executables_v1/Validation/KTJSONReader.cc b/cpp/Cpp/Executables_v1/Validation/KTJSONReader.cc
deleted file mode 100644
index 2da348b..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTJSONReader.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * KTJSONReader.cc
- *
- *  Created on: Feb 1, 2018
- *      Author: N.S. Oblath
- */
-
-// Data classes need to be included before the archive header
-#include "KTTestData.hh"
-
-#include "KTJSONReader.hh"
-
-
-namespace Nymph
-{
-
-    KTJSONReader::KTJSONReader( const std::string& name) :
-            KTProcessor( name ),
-            fFilename( "json_reader_default_file.json" ),
-            fStreamInPtr( nullptr ),
-            fArchiveInPtr( nullptr )
-    {
-    }
-
-    KTJSONReader::~KTJSONReader()
-    {
-        // archive must be delete before the stream!
-        delete fArchiveInPtr;
-        delete fStreamInPtr;
-    }
-
-    bool KTJSONReader::Configure( const scarab::param_node& node )
-    {
-        SetFilename( node.get_value( "filename" , fFilename ));
-
-        return true;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTJSONReader.hh b/cpp/Cpp/Executables_v1/Validation/KTJSONReader.hh
deleted file mode 100644
index ca6506d..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTJSONReader.hh
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * KTJSONReader.hh
- *
- *  Created on: Feb 1, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTJSONREADER_HH_
-#define NYMPH_KTJSONREADER_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTLogger.hh"
-
-#include "cereal/archives/json.hpp"
-
-
-KTLOGGER( jsrlog_hh, "KTJSONReader" )
-
-
-namespace Nymph
-{
-
-    class KTJSONReader : public KTProcessor
-    {
-        public:
-            KTJSONReader( const std::string& name = "json-reader" );
-            virtual ~KTJSONReader();
-
-            bool Configure( const scarab::param_node& node );
-
-            MEMBERVARIABLE( std::string, Filename );
-
-        public:
-            template< class XDataType >
-            void ReadData( XDataType& data );
-
-        private:
-            std::ifstream* fStreamInPtr;
-            cereal::JSONInputArchive* fArchiveInPtr;
-
-    };
-
-    template< class XDataType >
-    void KTJSONReader::ReadData( XDataType& data )
-    {
-        if( fStreamInPtr == nullptr )
-        {
-            KTDEBUG( jsrlog_hh, "Creating stream and archive" );
-            fStreamInPtr = new std::ifstream( fFilename );
-            fArchiveInPtr = new cereal::JSONInputArchive( *fStreamInPtr );
-        }
-
-        KTDEBUG( jsrlog_hh, "Reading an object from JSON" );
-        (*fArchiveInPtr)( data );
-
-        return;
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTJSONREADER_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc b/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
deleted file mode 100644
index 3e9cc28..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * KTJSONWriterValidation.cc
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#include "KTJSONTypeWriterValidation.hh"
-#include "KTRegisterNymphValidationExtData.hh"
-
-namespace Nymph
-{
-    KT_REGISTER_TYPE_WRITER( KTJSONWriter, KTJSONTypeWriter, Validation );
-
-    KTJSONTypeWriterValidation::KTJSONTypeWriterValidation( KTJSONWriter* writer) :
-            KTJSONTypeWriter( writer ),
-            fTestSlot( "test", fWriter, &KTJSONWriter::WriteData< KTTestDataExt > ),
-            fTestDerived1Slot( "test-derived-1", fWriter, &KTJSONWriter::WriteData< KTTestDerived1DataExt > ),
-            fTestDerived2Slot( "test-derived-2", fWriter, &KTJSONWriter::WriteData< KTTestDerived2DataExt > )
-    {
-        std::cout << "Created a KTJSONWriterValidation" << std::endl;
-    }
-
-    KTJSONTypeWriterValidation::~KTJSONTypeWriterValidation()
-    {
-    }
-
-    void KTJSONTypeWriterValidation::RegisterSlots()
-    {
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh b/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
deleted file mode 100644
index 80436e5..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * KTJSONTypeWriterValidation.hh
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTJSONTYPEWRITERVALIDATION_HH_
-#define NYMPH_KTJSONTYPEWRITERVALIDATION_HH_
-
-#include "KTJSONWriter.hh"
-
-namespace Nymph
-{
-    class KTTestDataExt;
-    class KTTestDerived1DataExt;
-    class KTTestDerived2DataExt;
-
-    class KTJSONTypeWriterValidation : public KTJSONTypeWriter
-    {
-        public:
-            KTJSONTypeWriterValidation( KTJSONWriter* writer );
-            virtual ~KTJSONTypeWriterValidation();
-
-            virtual void RegisterSlots();
-
-        private:
-            KTSlotData< void, KTTestDataExt > fTestSlot;
-            KTSlotData< void, KTTestDerived1DataExt > fTestDerived1Slot;
-            KTSlotData< void, KTTestDerived2DataExt > fTestDerived2Slot;
-
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTJSONTYPEWRITERVALIDATION_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.cc b/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.cc
deleted file mode 100644
index 43c8f3b..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * KTPyTestClass.cc
- *
- *  Created on: Jan 24, 2018
- *      Author: obla999
- */
-
-#include "KTPyTestClass.hh"
-
-namespace Nymph
-{
-
-    KTPyTestClass::KTPyTestClass() :
-            fValue( 5 )
-    {
-    }
-
-    KTPyTestClass::~KTPyTestClass()
-    {
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.hh b/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.hh
deleted file mode 100644
index 9e6ad27..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTPyTestClass.hh
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * KTPyTestClass.hh
- *
- *  Created on: Jan 24, 2018
- *      Author: obla999
- */
-
-#ifndef NYMPH_KTPYTESTCLASS_HH_
-#define NYMPH_KTPYTESTCLASS_HH_
-
-#include <iostream>
-
-namespace Nymph
-{
-
-    class KTPyTestClass
-    {
-        public:
-            KTPyTestClass();
-            ~KTPyTestClass();
-
-            void SayHello()
-            {
-                std::cout << "Hello" << std::endl;
-            }
-
-            int GetValue()
-            {
-                return fValue;
-            }
-
-            void SetValue( int value )
-            {
-                fValue = value;
-                return;
-            }
-
-        private:
-            int fValue;
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTPYTESTCLASS_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh b/cpp/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
deleted file mode 100644
index 459ecce..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * KTPyTestClassPybind.cc
- *
- *  Created on: Jan 24, 2018
- *      Author: obla999
- */
-
-#include "KTPyTestClass.hh"
-#include "KTTestProcessor.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace Nymph
-{
-
-    void ExportKTPyTestClass( pybind11::module& mod )
-    {
-        pybind11::class_< Nymph::KTPyTestClass >( mod, "KTPyTestClass" )
-                .def( pybind11::init<>() )
-                .def( "SayHello", &Nymph::KTPyTestClass::SayHello )
-                .def( "GetValue", &Nymph::KTPyTestClass::GetValue )
-                .def( "SetValue", &Nymph::KTPyTestClass::SetValue )
-                ;
-    };
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh b/cpp/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
deleted file mode 100644
index efa5da6..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KTRegisterNymphValidationExtData.hh
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_
-#define NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_
-
-#include "KTRegisterNymphExtData.hh"
-
-#include "KTTestData.hh"
-
-CEREAL_REGISTER_TYPE( Nymph::KTTestDataExt );
-CEREAL_REGISTER_TYPE( Nymph::KTTestDerived1DataExt );
-CEREAL_REGISTER_TYPE( Nymph::KTTestDerived2DataExt );
-
-#endif /* NYMPH_KTREGISTERNYMPHVALIDATIONEXTDATA_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.cc b/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
deleted file mode 100644
index c5598b9..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * KTTestConfigurable.cc
- *
- *  Created on: Jul 25, 2012
- *      Author: nsoblath
- */
-
-#include "KTLogger.hh"
-#include "KTTestConfigurable.hh"
-#include "KTCommandLineOption.hh"
-
-#include "param.hh"
-
-using std::string;
-
-namespace Nymph
-{
-    static KTCommandLineOption< int > sTestConfigStringCLO("Test Configurable", "Command-line option for testing", "int-data", 'i');
-
-    KTLOGGER(testparamlog, "KTTestConfigurable");
-
-    KTTestConfigurable::KTTestConfigurable(const std::string& name) :
-            KTConfigurable(name),
-            fIntData(-9),
-            fDoubleData(-99.),
-            fStringData("not configured")
-    {
-    }
-
-    KTTestConfigurable::~KTTestConfigurable()
-    {
-    }
-
-    bool KTTestConfigurable::Configure(const scarab::param_node& node)
-    {
-        // Config-file options
-        // option: check for data before getting it from the node
-        if (node.has("int-data"))
-        {
-            fIntData = node.get_value< int >("int-data", fIntData);
-            KTINFO(testparamlog, "Configured integer (= existing value if not provided): " << fIntData);
-        }
-
-        // option: don't check for data before getting it from the node; rely on the default if it's not there.
-        fDoubleData = node.get_value< double >("double-data", fDoubleData);
-        KTINFO(testparamlog, "Configured double (= existing value if not provided): " << fDoubleData);
-        fStringData = node.get_value("string-data", fStringData);
-        KTINFO(testparamlog, "Configured string (= existing value if not provided): " << fStringData);
-
-        // Command-line options
-        fIntData = fCLHandler->GetCommandLineValue< int >("int-data", fIntData);
-        KTINFO(testparamlog, "Configured integer from CL (= existing value if not provided): " << fIntData);
-
-        return true;
-    }
-
-    void KTTestConfigurable::PrintConfig() const
-    {
-        KTINFO(testparamlog, "Final configuration of KTTestConfigurable:\n" <<
-                "\tInt data: " << fIntData << "\n" <<
-                "\tDouble data: " << fDoubleData << "\n" <<
-                "\tString data: " << fStringData);
-        return;
-    }
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.hh b/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
deleted file mode 100644
index 44c473f..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * KTTestConfigurable.hh
- *
- *  Created on: Jul 25, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTTESTCONFIGURABLE_HH_
-#define KTTESTCONFIGURABLE_HH_
-
-#include "KTConfigurable.hh"
-
-namespace Nymph
-{
-    class KTTestConfigurable : public KTConfigurable
-    {
-        public:
-            KTTestConfigurable(const std::string& name = "test-configurable");
-            virtual ~KTTestConfigurable();
-
-        public:
-            bool Configure(const scarab::param_node& node);
-
-        public:
-            int GetIntData() const;
-            double GetDoubleData() const;
-            const std::string& GetStringData() const;
-
-            void PrintConfig() const;
-
-        private:
-            int fIntData;
-            double fDoubleData;
-            std::string fStringData;
-    };
-
-    inline int KTTestConfigurable::GetIntData() const
-    {
-        return fIntData;
-    }
-
-    inline double KTTestConfigurable::GetDoubleData() const
-    {
-        return fDoubleData;
-    }
-
-    inline const std::string& KTTestConfigurable::GetStringData() const
-    {
-        return fStringData;
-    }
-
-} /* namespace Nymph */
-#endif /* KTTESTCONFIGURABLE_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestCuts.cc b/cpp/Cpp/Executables_v1/Validation/KTTestCuts.cc
deleted file mode 100644
index d78aeba..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestCuts.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * KTTestCuts.cc
- *
- *  Created on: Nov 2, 2016
- *      Author: obla999
- */
-
-#include "KTTestCuts.hh"
-
-#include "KTLogger.hh"
-#include "KTTestData.hh"
-
-namespace Nymph
-{
-    KTLOGGER(testlog, "KTTestCuts");
-
-    KT_REGISTER_CUT(KTAwesomeCut, "awesome-cut");
-    KT_REGISTER_CUT(KTNotAwesomeCut, "not-awesome-cut"  );
-
-
-    KTAwesomeCut::KTAwesomeCut(const std::string& name) :
-            KTCutOnData(name)
-    {
-        SetApplyFunc( this, &KTAwesomeCut::Apply );
-    }
-
-    KTAwesomeCut::~KTAwesomeCut()
-    {}
-
-    bool KTAwesomeCut::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    bool KTAwesomeCut::Apply(KTCoreData& data, const KTTestData& testData)
-    {
-        bool isCut = ! testData.GetIsAwesome();
-        KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
-        KTDEBUG(testlog, "Is data cut? " << isCut);
-        data.CutStatus().SetCutState(fConfigName, isCut);
-        return isCut;
-    }
-
-
-    KTNotAwesomeCut::KTNotAwesomeCut(const std::string& name) :
-            KTCutOnData(name)
-    {
-        SetApplyFunc( this, &KTNotAwesomeCut::Apply );
-    }
-
-    KTNotAwesomeCut::~KTNotAwesomeCut()
-    {}
-
-    bool KTNotAwesomeCut::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    bool KTNotAwesomeCut::Apply(KTCoreData& data, const KTTestData& testData)
-    {
-        bool isCut = testData.GetIsAwesome();
-        KTDEBUG(testlog, "Is data awesome? " << testData.GetIsAwesome());
-        KTDEBUG(testlog, "Is data cut? " << isCut);
-        data.CutStatus().SetCutState(fConfigName, isCut);
-        return isCut;
-    }
-
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestCuts.hh b/cpp/Cpp/Executables_v1/Validation/KTTestCuts.hh
deleted file mode 100644
index 5ebe0d6..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestCuts.hh
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * KTTestCuts.hh
- *
- *  Created on: Nov 2, 2016
- *      Author: obla999
- */
-
-#ifndef NYMPH_KTTESTCUTS_HH_
-#define NYMPH_KTTESTCUTS_HH_
-
-#include "KTCut.hh"
-#include "KTMemberVariable.hh"
-#include "KTCoreData.hh"
-
-
-namespace Nymph
-{
-    class KTTestData;
-    class KTTestDataExt;
-
-    // Cuts data that is NOT awesome
-    class KTAwesomeCut : public KTCutOnData< KTTestDataExt >
-    {
-        public:
-            KTAwesomeCut(const std::string& name = "default-awesome-cut");
-            virtual ~KTAwesomeCut();
-
-            bool Configure(const scarab::param_node& node);
-
-            bool Apply(KTCoreData& data, const KTTestData& testData);
-    };
-
-    // Cuts data that is IS awesome
-    class KTNotAwesomeCut : public KTCutOnData< KTTestDataExt >
-    {
-        public:
-            KTNotAwesomeCut(const std::string& name = "default-not-awesome-cut");
-            virtual ~KTNotAwesomeCut();
-
-            bool Configure(const scarab::param_node& node);
-
-            bool Apply(KTCoreData& data, const KTTestData& testData);
-    };
-
-}
-
-
-#endif /* NYMPH_KTTESTCUTS_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestData.cc b/cpp/Cpp/Executables_v1/Validation/KTTestData.cc
deleted file mode 100644
index 3bc6f32..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestData.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * KTTestData.cc
- *
- *  Created on: Jun 1, 2017
- *      Author: obla999
- */
-
-#include "KTTestData.hh"
-
-namespace Nymph
-{
-    KTTestData::KTTestData() :
-        KTData(),
-        fIsAwesome( false )
-    {
-        std::cout << "### KTTestData constructor" << std::endl;
-    }
-
-    KTTestData::~KTTestData()
-    {
-        std::cout << "### KTTestData destructor" << std::endl;
-    }
-
-    KTTestBaseData::KTTestBaseData() :
-        KTData(),
-        fFunniness(1000.)
-    {
-        std::cout << "### KTTestBaseData constructor" << std::endl;
-    }
-
-    KTTestBaseData::~KTTestBaseData()
-    {
-        std::cout << "### KTTestBaseData destructor" << std::endl;
-    }
-
-
-} /* namespace Nymph */
-
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestData.hh b/cpp/Cpp/Executables_v1/Validation/KTTestData.hh
deleted file mode 100644
index c28bf55..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestData.hh
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * KTTestData.hh
- *
- *  Created on: Jun 1, 2017
- *      Author: obla999
- */
-
-#ifndef NYMPH_KTTESTDATA_HH_
-#define NYMPH_KTTESTDATA_HH_
-
-#include "KTCoreData.hh"
-#include "KTMemberVariable.hh"
-
-
-namespace Nymph
-{
-
-    class KTTestData : public KTData
-    {
-        public:
-            KTTestData();
-            virtual ~KTTestData();
-
-            MEMBERVARIABLE(bool, IsAwesome);
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-    DEFINE_EXT_DATA( KTTestData, "test" ); // defines KTTestDataExt
-
-
-    class KTTestBaseData : public KTData
-    {
-        public:
-            KTTestBaseData();
-            virtual ~KTTestBaseData();
-
-            MEMBERVARIABLE(double, Funniness);
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-    DEFINE_EXT_DATA_2( KTTestDerived1DataExt, KTTestBaseData, "test-derived-1" );
-    DEFINE_EXT_DATA_2( KTTestDerived2DataExt, KTTestBaseData, "test-derived-2" );
-
-
-    template< class Archive >
-    void KTTestData::serialize( Archive& ar )
-    {
-            std::cout << "### serialize for KTTestData" << std::endl;
-            ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fIsAwesome) );
-    }
-
-    template< class Archive >
-    void KTTestBaseData::serialize( Archive& ar )
-    {
-            std::cout << "### serialize for KTTestBaseData" << std::endl;
-            ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fFunniness) );
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTTESTDATA_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc b/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
deleted file mode 100644
index 218f495..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * KTTestDataPrimaryProcessor.cc
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#include "KTTestDataPrimaryProcessor.hh"
-
-#include "KTTestData.hh"
-
-#include "KTLogger.hh"
-
-LOGGER( testlog, "KTTestDataPrimaryProcessor" );
-
-namespace Nymph
-{
-
-    KT_REGISTER_PROCESSOR( KTTestDataPrimaryProcessor, "test-data-p-proc" );
-
-    KTTestDataPrimaryProcessor::KTTestDataPrimaryProcessor( const std::string& name ) :
-            KTPrimaryProcessor( {"test-derived-1"}, name ),
-            fIterations(10),
-            fTheSignal("test-derived-1", this)
-    {
-    }
-
-    KTTestDataPrimaryProcessor::~KTTestDataPrimaryProcessor()
-    {
-    }
-
-    bool KTTestDataPrimaryProcessor::Configure( const scarab::param_node& node )
-    {
-        SetIterations( node.get_value( "iterations", GetIterations() ) );
-
-        return true;
-    }
-
-    bool KTTestDataPrimaryProcessor::Run()
-    {
-        unsigned funniness = 867;
-
-        for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
-        {
-            KTINFO( testlog, "Beginning iteration " << iIteration );
-
-            // e.g. for a real processor, do some work here instead of sleeping
-            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
-
-            if( fThreadRef && fThreadRef->GetCanceled() ) break;
-
-            KTDataHandle handle = CreateNewDataHandle();
-            KTTestDerived1DataExt& testData = handle->Of< KTTestDerived1DataExt >();
-            testData.SetFunniness( funniness++ );
-            KTINFO( testlog, "Test derived1 data funniness: " << testData.GetFunniness() );
-
-            fTheSignal( handle );
-        }
-        return true;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh b/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
deleted file mode 100644
index 96b6955..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * KTTestPrimaryProcessor.hh
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef KTTESTDATAPRIMARYPROCESSOR_HH_
-#define KTTESTDATAPRIMARYPROCESSOR_HH_
-
-#include "KTPrimaryProcessor.hh"
-
-#include "KTMemberVariable.hh"
-#include "KTSignal.hh"
-
-namespace Nymph
-{
-
-   class KTTestDataPrimaryProcessor : public KTPrimaryProcessor
-    {
-        public:
-            KTTestDataPrimaryProcessor( const std::string& name = "test-data-p-proc" );
-            virtual ~KTTestDataPrimaryProcessor();
-
-        public:
-            bool Configure( const scarab::param_node& node );
-
-            MEMBERVARIABLE( unsigned, Iterations );
-
-        public:
-            virtual bool Run();
-
-        private:
-            KTSignalData fTheSignal;
-
-    };
-
-} /* namespace Nymph */
-
-#endif /* KTTESTDATAPRIMARYPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc b/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
deleted file mode 100644
index 43692c1..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * KTTestPrimaryProcessor.cc
- *
- *  Created on: May 4, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTTestPrimaryProcessor.hh"
-
-namespace Nymph
-{
-
-    KT_REGISTER_PROCESSOR(KTTestPrimaryProcessor, "test-p-proc");
-
-    KTTestPrimaryProcessor::KTTestPrimaryProcessor( const std::string& name ) :
-            KTPrimaryProcessor( {"the-signal"}, name ),
-            fIterations(10),
-            fTheSignal("the-signal", this)
-    {
-    }
-
-    KTTestPrimaryProcessor::~KTTestPrimaryProcessor()
-    {
-    }
-
-    bool KTTestPrimaryProcessor::Configure( const scarab::param_node& node )
-    {
-        SetIterations( node.get_value( "iterations", GetIterations() ) );
-
-        return true;
-    }
-
-    bool KTTestPrimaryProcessor::Run()
-    {
-        for( unsigned iIteration = 0; iIteration < fIterations; ++iIteration )
-        {
-            // e.g. for a real processor, do some work here instead of sleeping
-            boost::this_thread::sleep_for( boost::chrono::milliseconds(1) );
-
-            if( fThreadRef && fThreadRef->GetCanceled() ) break;
-
-            fTheSignal( iIteration );
-        }
-        return true;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh b/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
deleted file mode 100644
index 4eb7639..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * KTTestPrimaryProcessor.hh
- *
- *  Created on: May 4, 2017
- *      Author: N.S. Oblath
- */
-
-#ifndef KTTESTPRIMARYPROCESSOR_HH_
-#define KTTESTPRIMARYPROCESSOR_HH_
-
-#include "KTPrimaryProcessor.hh"
-
-#include "KTMemberVariable.hh"
-#include "KTSignal.hh"
-
-namespace Nymph
-{
-
-   class KTTestPrimaryProcessor : public KTPrimaryProcessor
-    {
-        public:
-            KTTestPrimaryProcessor( const std::string& name = "test-p-proc" );
-            virtual ~KTTestPrimaryProcessor();
-
-        public:
-            bool Configure( const scarab::param_node& node );
-
-            MEMBERVARIABLE( unsigned, Iterations );
-
-        public:
-            virtual bool Run();
-
-        private:
-            KTSignal< int > fTheSignal;
-
-    };
-
-} /* namespace Nymph */
-
-#endif /* KTTESTPRIMARYPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.cc b/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.cc
deleted file mode 100644
index f19a3ee..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * KTTestProcessor.cc
- *
- *  Created on: Aug 15, 2012
- *      Author: nsoblath
- */
-
-#include "KTTestProcessor.hh"
-
-#include "KTException.hh"
-#include "KTLogger.hh"
-
-//#include "KTTestData.hh"
-
-namespace Nymph
-{
-    KTLOGGER(testsiglog, "KTTestProcessor")
-
-    KT_REGISTER_PROCESSOR(KTTestProcessorA, "test-proc-a");
-
-    KTTestProcessorA::KTTestProcessorA( const std::string& name ) :
-            KTProcessor( name ),
-            fTheSignal("the-signal", this)
-    {
-    }
-
-    KTTestProcessorA::~KTTestProcessorA()
-    {
-    }
-
-    bool KTTestProcessorA::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTTestProcessorA::EmitSignals(int value)
-    {
-        fTheSignal(value);
-        return;
-    }
-
-
-    KT_REGISTER_PROCESSOR(KTTestProcessorB, "test-proc-b");
-
-    KTTestProcessorB::KTTestProcessorB( const std::string& name ) :
-            KTProcessor( name ),
-            fSlot1("first-slot", this, &KTTestProcessorB::SlotFunc1),
-            fSlot2("second-slot", this, &KTTestProcessorB::SlotFunc2)
-    {
-        fSlot1Wrapper = GetSlot( "first-slot" );
-        fSlot2Wrapper = GetSlot( "second-slot" );
-    }
-
-    KTTestProcessorB::~KTTestProcessorB()
-    {
-    }
-
-    bool KTTestProcessorB::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTTestProcessorC::SlotFunc1(int input)
-    {
-        std::shared_ptr< KTThreadReference > ref = fSlot1.GetSlotWrapper()->GetThreadRef();
-
-        KTINFO(testsiglog, "Slot1: input is " << input);
-        BOOST_THROW_EXCEPTION( KTException() << "A HUGE problem occurred!!!! (just kidding, this is the expected result)" << eom );
-
-        return;
-    }
-
-
-    KT_REGISTER_PROCESSOR(KTTestProcessorD, "test-proc-d");
-
-    KTTestProcessorD::KTTestProcessorD( const std::string& name ) :
-            KTProcessor( name ),
-            fDataSlot("test", this, &KTTestProcessorD::AnalysisFunc),
-            fDataSignal("test", this)
-    {
-    }
-
-    KTTestProcessorD::~KTTestProcessorD()
-    {
-    }
-
-    bool KTTestProcessorD::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTTestProcessorD::EmitSignal(bool isAwesome)
-    {
-        KTDataHandle dataHandle = CreateNewDataHandle();
-        KTTestDataExt& data = dataHandle->Of< KTTestDataExt >();
-        data.SetIsAwesome(isAwesome);
-        fDataSignal(dataHandle);
-        return;
-    }
-
-    void KTTestProcessorD::AnalysisFunc(const KTTestData& data)
-    {
-        KTINFO(testsiglog, "Is the data awesome? " << data.GetIsAwesome());
-        return;
-    }
-
-
-    KT_REGISTER_PROCESSOR(KTTestProcessorE, "test-proc-e");
-
-    KTTestProcessorE::KTTestProcessorE( const std::string& name ) :
-            KTProcessor( name ),
-            fDerived1DataSlot("derived-1", this, &KTTestProcessorE::BaseAnalysisFunc),
-            fDerived2DataSlot("derived-2", this, &KTTestProcessorE::BaseAnalysisFunc),
-            fDerived1DataSignal("derived-1", this),
-            fDerived2DataSignal("derived-2", this)
-    {
-    }
-
-    KTTestProcessorE::~KTTestProcessorE()
-    {
-    }
-
-    bool KTTestProcessorE::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTTestProcessorE::EmitSignals()
-    {
-        KTDataHandle dataHandle = CreateNewDataHandle();
-
-        KTINFO(testsiglog, "Creating data objects");
-        dataHandle->Of< KTTestDerived1DataExt >();
-        dataHandle->Of< KTTestDerived2DataExt >();
-
-        KTINFO(testsiglog, "Emitting data-1 signal");
-        fDerived1DataSignal( dataHandle );
-
-        KTINFO(testsiglog, "Emitting data-2 signal");
-        fDerived2DataSignal( dataHandle );
-
-        return;
-    }
-
-    void KTTestProcessorE::BaseAnalysisFunc(const KTTestBaseData& data)
-    {
-        KTINFO(testsiglog, "Data funniness measured to be: <" << data.GetFunniness() << ">");
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.hh b/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.hh
deleted file mode 100644
index d704f9f..0000000
--- a/cpp/Cpp/Executables_v1/Validation/KTTestProcessor.hh
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * KTTestProcessor.hh
- *
- *  Created on: Aug 15, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTTESTPROCESSOR_HH_
-#define KTTESTPROCESSOR_HH_
-
-#include "KTProcessor.hh"
-#include "KTSlot.hh"
-
-//using namespace py;
-
-#include "KTTestData.hh"
-
-namespace Nymph
-{
-
-    /*!
-     * A simple test processor that emits a signal with an integer argument
-     */
-    class KTTestProcessorA : public KTProcessor
-    {
-        public:
-            KTTestProcessorA( const std::string& name = "test-proc-a" );
-            virtual ~KTTestProcessorA();
-
-            bool Configure(const scarab::param_node& node);
-
-            void EmitSignals(int);
-
-        private:
-            KTSignal< int > fTheSignal;
-    };
-
-    /*!
-     * A simple test processor that has two slots with integer arguments
-     */
-    class KTTestProcessorB : public KTProcessor
-    {
-        public:
-            KTTestProcessorB( const std::string& name = "test-proc-b" );
-            virtual ~KTTestProcessorB();
-
-            bool Configure(const scarab::param_node& node);
-
-        private:
-            KTSlot< int > fSlot1;
-    };
-
-
-//    class KTTestData;
-
-    /*!
-     * A simple test processor that has a slot for KTTestData
-     */
-    class KTTestProcessorD : public KTProcessor
-    {
-        public:
-            KTTestProcessorD( const std::string& name = "test-proc-d" );
-            virtual ~KTTestProcessorD();
-
-            bool Configure(const scarab::param_node& node);
-
-            // Creates a KTTestData object, sets the awesomeness to the given value, and emits fSignal
-            void EmitSignal(bool isAwesome = true);
-
-            void AnalysisFunc(const KTTestData& data);
-
-        private:
-            KTSlotData< void, KTTestDataExt > fDataSlot;
-
-            KTSignalData fDataSignal;
-    };
-
-
-//    template< class XDerivedDataType >
-//    class KTTestPolyDataBase< XDerivedDataType >;
-//    class KTTestDerived1Data;
-//    class KTTestDerived2Data;
-
-    /*!
-     * A simple test processor for testing polymorphic data, signals, and slots
-     */
-    class KTTestProcessorE : public KTProcessor
-    {
-        public:
-            KTTestProcessorE( const std::string& name = "test-proc-d" );
-            virtual ~KTTestProcessorE();
-
-            bool Configure(const scarab::param_node& node);
-
-            void EmitSignals();
-
-            void BaseAnalysisFunc(const KTTestBaseData& data);
-
-        private:
-            KTSlotData< void, KTTestDerived1DataExt > fDerived1DataSlot;
-            KTSlotData< void, KTTestDerived2DataExt > fDerived2DataSlot;
-
-            KTSignalData fDerived1DataSignal;
-            KTSignalData fDerived2DataSignal;
-    };
-
-} /* namespace Nymph */
-#endif /* KTTESTPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Executables_v1/Validation/NymphValidationPybind.cc b/cpp/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
deleted file mode 100644
index f281181..0000000
--- a/cpp/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * NymphValidationPy.cc
- *
- *  Created on: Jan 25, 2018
- *      Author: obla999
- */
-
-#include "KTPyTestClassPybind.hh"
-#include "TestPythonBasics.hh"
-#include "pybind11/pybind11.h"
-#include <memory>
-
-PYBIND11_MODULE( py_nymph_validation, mod )
-{
-    Nymph::ExportKTPyTestClass( mod );
-    Nymph::ExportTestPythonBasics( mod );
-
-}
-
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestApplication.cc b/cpp/Cpp/Executables_v1/Validation/TestApplication.cc
deleted file mode 100644
index f19c737..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestApplication.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * TestApplication.cc
- *
- *  Created on: Aug 1, 2012
- *      Author: nsoblath
- *
- *  To test the command-line interface:
- *    > TestApplication -c /path/to/TestConfigurator.json
- *    > TestApplication -c /path/to/TestConfigurator.json --test-app-opt=blah
- *    > TestApplication -c /path/to/TestConfigurator.json --int-data 20
- */
-
-
-#include "KTTestConfigurable.hh"
-#include "KTApplication.hh"
-#include "KTCommandLineOption.hh"
-
-#include "param.hh"
-
-using namespace Nymph;
-using namespace std;
-
-KTLOGGER(testapplog, "TestApplication");
-
-// Add an application-specific command-line option
-static KTCommandLineOption< string > sTestAppOption("TestApplication", "Application-specific command-line option", "test-app-opt", 'a');
-
-
-int main(int argc, char** argv)
-{
-    //****************************
-    // Create the app; this performs the initial command-line processing
-    //****************************
-
-    KTApplication* app = NULL;
-    try
-    {
-        app = new KTApplication(argc, argv);
-    }
-    catch (std::exception& e)
-    {
-        KTERROR(testapplog, "Exception caught from KTApplication constructor:\n"
-                << '\t' << e.what());
-        return 0;
-    }
-
-
-    //****************************
-    // Check basic command-line reading
-    //****************************
-
-    KTINFO(testapplog, "Application: " << app->GetCommandLineHandler()->GetExecutableName());
-    KTINFO(testapplog, "Config filename: " << app->GetCommandLineHandler()->GetConfigFilename());
-
-
-    //****************************
-    // Check reading of command-line options
-    //****************************
-
-    if (app->GetCommandLineHandler()->IsCommandLineOptSet("test-app-opt"))
-    {
-        KTINFO(testapplog, "Test application option is set to value <" << app->GetCommandLineHandler()->GetCommandLineValue< string >("test-app-opt") << ">");
-    }
-    else
-    {
-        KTINFO(testapplog, "Test application option was not set");
-    }
-
-    if (app->GetCommandLineHandler()->IsCommandLineOptSet("int-data"))
-    {
-        KTINFO(testapplog, "Test option <int-data> is set to value <" << app->GetCommandLineHandler()->GetCommandLineValue< int >("int-data") << ">");
-    }
-    else
-    {
-        KTINFO(testapplog, "Test option <int-data> was not set");
-    }
-
-
-    //****************************
-    // Check reading of the config file
-    //****************************
-
-    KTTestConfigurable* testObj = new KTTestConfigurable();
-
-    const scarab::param_node& topNode = app->GetConfigurator()->Config();
-
-    if (testObj->Configure(topNode[testObj->GetConfigName()].as_node()))
-    {
-        KTINFO(testapplog, "Configuration complete:\n"
-                << "\tInt data: " << testObj->GetIntData() << '\n'
-                << "\tDouble data: " << testObj->GetDoubleData() << '\n'
-                << "\tString data: " << testObj->GetStringData());
-    }
-    else
-    {
-        KTERROR(testapplog, "Something went wrong during the configuration");
-    }
-
-    delete testObj;
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestApplyCut.cc b/cpp/Cpp/Executables_v1/Validation/TestApplyCut.cc
deleted file mode 100644
index 8998ac9..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestApplyCut.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * TestApplyCut.cc
- *
- *  Created on: Oct 07, 2014
- *      Author: nsoblath
- */
-
-#include "KTTestCuts.hh"
-
-#include "KTApplyCut.hh"
-#include "KTLogger.hh"
-#include "KTTestData.hh"
-
-KTLOGGER(testlog, "TestApplyCut");
-
-using namespace Nymph;
-using namespace std;
-
-int main()
-{
-    KTDataHandle dataHandle = CreateNewDataHandle();
-    KTTestData& testData = dataHandle->Of< KTTestDataExt >();
-
-    KTCutStatus& cutStatus = dataHandle->CutStatus();
-    unsigned awesomeCutPos = 0;
-    string awesomeCutName("awesome-cut");
-    unsigned notAwesomeCutPos = 1;
-    string notAwesomeCutName("not-awesome-cut");
-    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
-    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
-    KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
-
-    KTApplyCut applyCut;
-
-    KTINFO(testlog, "Applying awesome cut");
-    applyCut.SetCut(new KTAwesomeCut());
-    applyCut.ApplyCut(dataHandle);
-
-    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
-    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-    KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
-
-    KTINFO(testlog, "Applying not-awesome cut");
-    applyCut.SelectCut("not-awesome-cut");
-    applyCut.ApplyCut(dataHandle);
-
-    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
-    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
-    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
-    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
-    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-    KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
-    KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
-    KTINFO(testlog, "Is cut with mask \"10\"? " << cutStatus.IsCut("10"));
-    KTINFO(testlog, "Is cut with mask \"11\"? " << cutStatus.IsCut("11"));
-    KTINFO(testlog, "Is cut with mask 0? " << cutStatus.IsCut(0));
-    KTINFO(testlog, "Is cut with mask 1? " << cutStatus.IsCut(1));
-    KTINFO(testlog, "Is cut with mask 2? " << cutStatus.IsCut(2));
-    KTINFO(testlog, "Is cut with mask 3? " << cutStatus.IsCut(3));
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestCacheDirectory.cc b/cpp/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
deleted file mode 100644
index 05b1761..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * TestCacheDirectory.cc
- *
- *  Created on: Dec 3, 2012
- *      Author: nsoblath
- *
- *      Usage:
- *      > TestCacheDirectory
- *
- *      Will first test if the current directory can be used as the cache (the default condition if no other directory is specified.
- *      Then tests if ./TestCacheDirectory can be used as the cache. This will pass if the directory exists and is read/writable.
- */
-
-#include "KTCacheDirectory.hh"
-
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER(testlog, "TestCacheDirectory");
-
-int main()
-{
-
-    KTCacheDirectory* cacheDir = KTCacheDirectory::get_instance();
-
-    KTINFO(testlog, "Testing ./ (should pass if the current directory is read/writeable)");
-    KTINFO(testlog, "Current cache directory is: " << cacheDir->GetPath());
-    KTWARN(testlog, "Is the cache directory OK? " << cacheDir->IsReady());
-
-    KTINFO(testlog, "Testing ./TestCacheDirectory (should pass if ./TestCacheDirectory exists and is read/writeable)");
-    if (! cacheDir->SetPath("./TestCacheDirectory"))
-    {
-        KTERROR(testlog, "Error setting the path");
-    }
-    KTINFO(testlog, "Current cache directory is: " << cacheDir->GetPath());
-    KTWARN(testlog, "Is the cache directory OK? " << cacheDir->IsReady());
-
-    KTINFO(testlog, "Testing /usr/local (should fail, assuming you're not running as root)");
-    if (! cacheDir->SetPath("/usr/local"))
-    {
-        KTERROR(testlog, "Error setting the path");
-    }
-    KTINFO(testlog, "Current cache directory is: " << cacheDir->GetPath());
-    KTWARN(testlog, "Is the cache directory OK? " << cacheDir->IsReady());
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestCut.cc b/cpp/Cpp/Executables_v1/Validation/TestCut.cc
deleted file mode 100644
index 37b55cd..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestCut.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * TestCut.cc
- *
- *  Created on: Sep 29, 2014
- *      Author: nsoblath
- */
-
-#include "KTTestCuts.hh"
-
-#include "KTLogger.hh"
-#include "KTTestData.hh"
-
-KTLOGGER(testlog, "TestCut");
-
-using namespace Nymph;
-using namespace std;
-
-int main()
-{
-    try
-    {
-        KTCoreDataExt data;
-        KTTestDataExt& testData = data.Of< KTTestDataExt >();
-
-        KTCutStatus& cutStatus = data.CutStatus();
-
-        KTINFO(testlog, "Assigning awesome-cut");
-        unsigned awesomeCutPos = 0;
-        string awesomeCutName("awesome-cut");
-        cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
-
-        KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
-
-        KTINFO(testlog, "Applying awesome cut");
-        KTAwesomeCut cut(awesomeCutName);
-        cut.Apply(data, testData);
-
-        KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-        KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-        KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-        KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
-        KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-        KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-        KTINFO(testlog, "Current cut status: " << cutStatus);
-        KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
-
-        KTINFO(testlog, "Assigning not-awesome-cut");
-        unsigned notAwesomeCutPos = 1;
-        string notAwesomeCutName("not-awesome-cut");
-        cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
-
-        KTINFO(testlog, "Applying not-awesome cut");
-        KTNotAwesomeCut naCut(notAwesomeCutName);
-        naCut.Apply(data, testData);
-
-        KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-        KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-        KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-        KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
-        KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-        KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
-        KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
-        KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
-        KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
-        KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-        KTINFO(testlog, "Is cut with mask \"00\"? " << cutStatus.IsCut("00"));
-        KTINFO(testlog, "Is cut with mask \"01\"? " << cutStatus.IsCut("01"));
-        KTINFO(testlog, "Is cut with mask \"10\"? " << cutStatus.IsCut("10"));
-        KTINFO(testlog, "Is cut with mask \"11\"? " << cutStatus.IsCut("11"));
-        KTINFO(testlog, "Is cut with mask 0? " << cutStatus.IsCut(0));
-        KTINFO(testlog, "Is cut with mask 1? " << cutStatus.IsCut(1));
-        KTINFO(testlog, "Is cut with mask 2? " << cutStatus.IsCut(2));
-        KTINFO(testlog, "Is cut with mask 3? " << cutStatus.IsCut(3));
-    }
-    catch(std::exception& e)
-    {
-        KTERROR(testlog, "Exception caught: " << e.what());
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestCutFilter.cc b/cpp/Cpp/Executables_v1/Validation/TestCutFilter.cc
deleted file mode 100644
index 04a96df..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestCutFilter.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * TestCutFilter.cc
- *
- *  Created on: Oct 07, 2014
- *      Author: nsoblath
- */
-
-#include "KTTestCuts.hh"
-
-#include "KTApplyCut.hh"
-#include "KTCutFilter.hh"
-#include "KTLogger.hh"
-#include "KTTestData.hh"
-
-KTLOGGER(testlog, "TestCutFilter");
-
-using namespace Nymph;
-using namespace std;
-
-int main()
-{
-    KTDataHandle dataHandle = CreateNewDataHandle();
-    KTTestData& testData = dataHandle->Of< KTTestDataExt >();
-
-    KTCutStatus& cutStatus = dataHandle->CutStatus();
-    unsigned awesomeCutPos = 0;
-    string awesomeCutName("awesome-cut");
-    unsigned notAwesomeCutPos = 1;
-    string notAwesomeCutName("not-awesome-cut");
-    cutStatus.AssignCutResult(awesomeCutPos, awesomeCutName);
-    cutStatus.AssignCutResult(notAwesomeCutPos, notAwesomeCutName);
-    KTINFO(testlog, "Initial cut state: " << cutStatus.IsCut());
-
-    KTApplyCut applyCut;
-
-    KTINFO(testlog, "Applying awesome cut");
-    applyCut.SetCut(new KTAwesomeCut());
-    applyCut.ApplyCut(dataHandle);
-
-    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << awesomeCutName << ">is: " << cutStatus.GetCutState(awesomeCutName));
-    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-    KTINFO(testlog, "Is cut (all results)? " << cutStatus.IsCut());
-    KTINFO(testlog, "Is cut (with mask \"0\")? " << cutStatus.IsCut("0"));
-
-    KTINFO(testlog, "Applying not-awesome cut");
-    applyCut.SelectCut("not-awesome-cut");
-    applyCut.ApplyCut(dataHandle);
-
-    KTINFO(testlog, "Cuts present: " << cutStatus.CutResultsPresent())
-    KTINFO(testlog, "Has cut result <" << awesomeCutName << ">? " << cutStatus.HasCutResult(awesomeCutName));
-    KTINFO(testlog, "Has cut result at " << awesomeCutPos << "? " << cutStatus.HasCutResult(awesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << awesomeCutName << "> is: " << cutStatus.GetCutState(awesomeCutName));
-    KTINFO(testlog, "Cut state at " << awesomeCutPos << " is: " << cutStatus.GetCutState(awesomeCutPos));
-    KTINFO(testlog, "Has cut result <" << notAwesomeCutName << ">? " << cutStatus.HasCutResult(notAwesomeCutName));
-    KTINFO(testlog, "Has cut result at " << notAwesomeCutPos << "? " << cutStatus.HasCutResult(notAwesomeCutPos));
-    KTINFO(testlog, "Cut state of <" << notAwesomeCutName << "> is: " << cutStatus.GetCutState(notAwesomeCutName));
-    KTINFO(testlog, "Cut state at " << notAwesomeCutPos << " is: " << cutStatus.GetCutState(notAwesomeCutPos));
-
-    KTCutFilter cutFilter;
-    KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
-
-    KTINFO(testlog, "Filtering with all cuts");
-    cutFilter.SetCutMaskAll();
-    KTINFO(testlog, "Is cut (all results)? " << cutFilter.Filter(data));
-
-    KTINFO(testlog, "Testing filter set with a string");
-    cutFilter.SetCutMask("00");
-    KTINFO(testlog, "Is cut with mask \"00\"? " << cutFilter.Filter(data));
-    cutFilter.SetCutMask("01");
-    KTINFO(testlog, "Is cut with mask \"01\"? " << cutFilter.Filter(data));
-    cutFilter.SetCutMask("10");
-    KTINFO(testlog, "Is cut with mask \"10\"? " << cutFilter.Filter(data));
-    cutFilter.SetCutMask("11");
-    KTINFO(testlog, "Is cut with mask \"11\"? " << cutFilter.Filter(data));
-
-    KTINFO(testlog, "Testing filter set with an integer");
-    cutFilter.SetCutMask(0);
-    KTINFO(testlog, "Is cut with mask 0? " << cutFilter.Filter(data));
-    cutFilter.SetCutMask(1);
-    KTINFO(testlog, "Is cut with mask 1? " << cutFilter.Filter(data));
-    cutFilter.SetCutMask(2);
-    KTINFO(testlog, "Is cut with mask 2? " << cutFilter.Filter(data));
-    cutFilter.SetCutMask(3);
-    KTINFO(testlog, "Is cut with mask 3? " << cutFilter.Filter(data));
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestData.cc b/cpp/Cpp/Executables_v1/Validation/TestData.cc
deleted file mode 100644
index 18ea6be..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestData.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * TestData.cc
- *
- *  Created on: Feb 10, 2018
- *      Author: obla999
- */
-
-#include "KTTestData.hh"
-
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-LOGGER(testlog, "TestData")
-
-int main()
-{
-
-    KTCoreDataExt data;
-    KTTestDataExt& testData = data.Of< KTTestDataExt >();
-    KTINFO(testlog, data.Name());
-    KTINFO(testlog, testData.Name());
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc b/cpp/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
deleted file mode 100644
index bc4887c..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * TestExceptionInSlot.cc
- *
- *  Created on: May 4, 2017
- *      Author: N. Oblath
- *
- *  Intended outcome: Exception is thrown in first-slot when the first signal (5) is emitted; the second signal should not be emitted.
- */
-
-#include "KTTestProcessor.hh"
-
-#include "KTException.hh"
-#include "KTLogger.hh"
-
-#include <boost/thread.hpp>
-#include <atomic>
-
-using namespace Nymph;
-
-KTLOGGER( testexclog, "TestExceptionInSlot" )
-
-int main()
-{
-
-    try
-    {
-        KTTestProcessorA tpA;
-        KTTestProcessorC tpC;
-
-        KTINFO( testexclog, "Connecting the-signal to first-slot" );
-        tpA.ConnectASlot( "the-signal", &tpC, "first-slot", 20 );
-
-        // setup to execute processors asynchronously
-        std::shared_ptr< KTThreadReference > exeThreadRef = std::make_shared< KTThreadReference >();
-        tpC.GetSlot( "first-slot" )->SetThreadRef( exeThreadRef );
-
-        std::atomic< bool > canceled( false );
-
-        auto exeFunc = [&]() {
-            try
-            {
-                boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread get to the std::future::wait() call
-
-                KTINFO( testexclog, "Emitting signals" );
-
-                if( canceled.load() ) return;
-                KTINFO( testexclog, "First test signal: 5" );
-                tpA.EmitSignals( 5 );
-
-                boost::this_thread::sleep_for( boost::chrono::milliseconds(1) ); // delay to let the main thread react to the exception
-
-                if( canceled.load() ) return;
-                KTINFO( testexclog, "Second test signal: 18" );
-                tpA.EmitSignals( 18 );
-            }
-            catch( boost::exception& e )
-            {
-                exeThreadRef->SetReturnException( boost::current_exception() );
-            }
-
-            return;
-        };
-
-        // run the thread
-        boost::thread thread( exeFunc );
-
-        // wait for a result to be set
-        exeThreadRef->GetDataPtrRetFuture().wait();
-
-        try
-        {
-            exeThreadRef->GetReturnValue();
-        }
-        catch( boost::exception& e )
-        {
-            canceled = true;
-            //ADD_ERROR_MSG( e, "Added error message!" );
-            e << KTErrorMsgInfo< struct testEIS_GetRetVal >( "Added error message!" );
-            KTERROR( testexclog, "An error occurred while running a processor: " << diagnostic_information( e ) );
-        }
-
-        thread.join();
-
-        KTINFO( testexclog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testexclog, "An unexpected exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestExt.cc b/cpp/Cpp/Executables_v1/Validation/TestExt.cc
deleted file mode 100644
index 7dcbdbb..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestExt.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * TestExt.cc
- *
- *  Created on: Feb 11, 2018
- *      Author: N.S. Oblath
- */
-
-#include "KTLogger.hh"
-
-#include "KTExtensible.hh"
-
-KTLOGGER( testlog, "KTExtTest" );
-
-using namespace Nymph;
-
-namespace Nymph
-{
-    class MyBaseClass
-    {
-        public:
-            MyBaseClass() {}
-            virtual ~MyBaseClass() {}
-    };
-
-    class MyClass1 : public KTExtensible< MyClass1, MyBaseClass >
-    {
-        public:
-            MyClass1() : KTExtensible< MyClass1, MyBaseClass >(), fValue() {}
-            MyClass1( const MyClass1& orig ) : KTExtensible< MyClass1, MyBaseClass >( orig ), fValue( orig.fValue ) {}
-            virtual ~MyClass1() {};
-        public:
-            int fValue;
-    };
-
-    class MyClass2 : public KTExtensible< MyClass2, MyBaseClass >
-    {
-        public:
-            MyClass2() : KTExtensible< MyClass2, MyBaseClass >(), fValue() {}
-            MyClass2( const MyClass2& orig ) : KTExtensible< MyClass2, MyBaseClass >( orig ), fValue( orig.fValue ) {}
-            virtual ~MyClass2() {};
-        public:
-            int fValue;
-    };
-
-}
-
-int main()
-{
-    std::shared_ptr< MyClass1 > data1 = std::make_shared< MyClass1 >();
-    data1->fValue = 5;
-
-    MyClass2& data2 = data1->Of< MyClass2 >();
-    data2.fValue = 3;
-
-    std::shared_ptr< MyClass2 > data2Shared = data1->Share< MyClass2 >();
-
-    KTINFO( testlog, "data1 has data1: " << data1->Has< MyClass1 >() );
-    KTINFO( testlog, "data1 has data2: " << data1->Has< MyClass2 >() );
-    KTINFO( testlog, "data2 has data1: " << data2.Has< MyClass1 >() );
-    KTINFO( testlog, "data2 has data2: " << data2.Has< MyClass2 >() );
-    KTINFO( testlog, "Value of data1: " << data1->fValue );
-    KTINFO( testlog, "Value of data2: " << data2.fValue );
-    KTINFO( testlog, "Value of data2Shared: " << data2Shared->fValue );
-    KTINFO( testlog, "Size of data1: " << data1->size() );
-    KTINFO( testlog, "Size of data2: " << data2.size() );
-
-    std::shared_ptr< MyClass1 > copyOfData1 = std::make_shared< MyClass1 >( *data1 );
-    MyClass2& copyOfData2 = copyOfData1->Of< MyClass2 >();
-
-    KTINFO( testlog, "Value of data1's copy: " << copyOfData1->fValue );
-    KTINFO( testlog, "Value of data2's copy: " << copyOfData2.fValue );
-
-    std::shared_ptr< MyClass2 > detatchedCoypOfData2 = copyOfData1->Detatch< MyClass2 >();
-
-    KTINFO( testlog, "Size of copy of data1 after detatch: " << copyOfData1->size() );
-    KTINFO( testlog, "Size of detatched copy of data2: " << detatchedCoypOfData2->size() );
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestExtSerialization.cc b/cpp/Cpp/Executables_v1/Validation/TestExtSerialization.cc
deleted file mode 100644
index ae14d30..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestExtSerialization.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * TestSerialization.cc
- *
- *  Created on: Jan 24, 2018
- *      Author: obla999
- */
-
-#include "KTLogger.hh"
-
-#include "KTTestData.hh"
-
-#include "cereal/archives/json.hpp"
-
-#include "KTRegisterNymphExtData.hh"
-
-#include <fstream>
-
-LOGGER( testlog, "TestSerialization" );
-
-using namespace Nymph;
-
-// register the data classes so they can be serialized from base-class pointers.
-// json archive is already included, so it has been registered before these classes.
-CEREAL_REGISTER_TYPE( KTTestDataExt );
-
-int main()
-{
-    const std::string filename( "test_ext_serialization_output.json" );
-
-    // save data to archive
-    {
-        std::shared_ptr< KTCoreDataExt > coreData = std::make_shared< KTCoreDataExt >();
-        std::shared_ptr< KTTestDataExt > testData = coreData->Share< KTTestDataExt >();
-        std::shared_ptr< KTTestDerived1DataExt > testD1Data = coreData->Share< KTTestDerived1DataExt >();
-
-        // change data values from their defaults
-        coreData->SetCounter( 5 );
-        testData->SetIsAwesome( true );
-        testD1Data->SetFunniness( 924 );
-
-        KTINFO( testlog, "KTCoreData counter: " << coreData->GetCounter() );
-        KTINFO( testlog, "KTTestData is-awesome: " << testData->GetIsAwesome() );
-        KTINFO( testlog, "KTTestDerived1Data funniness: " << testD1Data->GetFunniness() );
-
-        // create and open a file for output
-        std::ofstream fileOut( filename );
-
-        cereal::JSONOutputArchive archiveOut( fileOut );
-
-        KTINFO( testlog, "Writing data to JSON archive" );
-        archiveOut( coreData );
-
-        // archive and stream closed when destructors are called
-    }
-
-    // ... some time later restore the class instance to its original state
-    {
-        std::shared_ptr< KTCoreDataExt > newCoreData = std::make_shared< KTCoreDataExt >();
-
-         // create and open an archive for input
-        std::ifstream fileIn( filename );
-
-        cereal::JSONInputArchive archiveIn( fileIn );
-
-        KTINFO( testlog, "Reading data from JSON archive" );
-        archiveIn( newCoreData );
-
-        std::shared_ptr< KTTestDataExt > newTestData = newCoreData->Share< KTTestDataExt >();
-        std::shared_ptr< KTTestDerived1DataExt > newD1Data = newCoreData->Share< KTTestDerived1DataExt >();
-
-        KTINFO(testlog, "KTCoreData counter: " << newCoreData->GetCounter());
-        KTINFO(testlog, "KTTestData is-awesome: " << newTestData->GetIsAwesome());
-        KTINFO( testlog, "KTTestDerived1Data funniness: " << newD1Data->GetFunniness() );
-
-        // archive and stream closed when destructors are called
-    }
-
-    return 0;
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestJSONWriter.cc b/cpp/Cpp/Executables_v1/Validation/TestJSONWriter.cc
deleted file mode 100644
index 79f27bd..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestJSONWriter.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *	TestSerialWriter.cc
- *
- *	Created on: Feb 1, 2018
- * 		Author: E Zayas
- *
-*/
-
-#include "../../Library/IO/KTJSONWriter.hh"
-#include "KTJSONReader.hh"
-#include "KTTestData.hh" 
-
-KTLOGGER( testlog, "TestJSONWriter" );
-
-using namespace Nymph;
-
-int main()
-{
-    std::string filename( "test_json_writer_output.json" );
-
-    {
-        // Create the test data
-        KTTestData testData;
-        testData.SetIsAwesome( true ); // because it isn't by default :(
-
-        KTINFO( testlog, "KTTestData is awesome? " << testData.GetIsAwesome() );
-
-        // Create the writer
-        KTJSONWriter writer;
-        writer.SetFilename( filename );
-
-        KTINFO( testlog, "Writing data" );
-
-        writer.WriteData< KTTestData >( testData );
-
-        // destruction of the stream and archive (in the writer's destructor) properly closes the file
-    }
-/*
-    {
-        KTTestData newTestData;
-
-        KTJSONReader reader;
-        reader.SetFilename( filename );
-
-        reader.ReadData< KTTestData >( newTestData );
-
-        KTINFO( testlog, "Is the read data awesome? " << newTestData.GetIsAwesome() );
-    }
-*/
-    KTINFO( testlog, "Validation script concluded" );
-	return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc b/cpp/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
deleted file mode 100644
index d757587..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * TestJSONWriterViaSlot.cc
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#include "KTJSONTypeWriterValidation.hh"
-#include "KTTestDataPrimaryProcessor.hh"
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER( testlog, "TestJSONWriterViaSlot" )
-
-int main()
-{
-
-    try
-    {
-        KTPROG( testlog, "Testing single-data-object writing" );
-
-        KTINFO( testlog, "Creating processors" );
-        KTTestDataPrimaryProcessor tdpp;
-        KTJSONWriter jw;
-
-        KTINFO( testlog, "Configuring processors" );
-        scarab::param_node jwConfig;
-        jwConfig.add( "filename", scarab::param_value( "test_jsonwriter_slot_singleobj.json" ) );
-        jw.Configure( jwConfig );
-
-        KTINFO( testlog, "Connecting the-signal to first-slot" );
-        tdpp.ConnectASlot( "test-derived-1", &jw, "test-derived-1", 20 );
-
-        KTINFO( testlog, "Running the primary processor" )
-
-        if( ! tdpp.Run() )
-        {
-            KTERROR( testlog, "Something went wrong while running the primary processor" );
-            return -1;
-        }
-
-        KTINFO( testlog, "Test complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testlog, "An unexpected exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    try
-    {
-        KTPROG( testlog, "Testing extensible-data-object writing" );
-
-        KTINFO( testlog, "Creating processors" );
-        KTTestDataPrimaryProcessor tdpp;
-        KTJSONWriter jw;
-
-        KTINFO( testlog, "Configuring processors" );
-        scarab::param_node jwConfig;
-        jwConfig.add( "filename", scarab::param_value( "test_jsonwriter_slot_extdata.json" ) );
-        jw.Configure( jwConfig );
-
-        KTINFO( testlog, "Connecting the-signal to first-slot" );
-        tdpp.ConnectASlot( "test-derived-1", &jw, "ext-data", 20 );
-
-        KTINFO( testlog, "Running the primary processor" )
-
-        if( ! tdpp.Run() )
-        {
-            KTERROR( testlog, "Something went wrong while running the primary processor" );
-            return -1;
-        }
-
-        KTINFO( testlog, "Test complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testlog, "An unexpected exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestLogger.cc b/cpp/Cpp/Executables_v1/Validation/TestLogger.cc
deleted file mode 100644
index 4190f03..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestLogger.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * TestLogger.cc
- *
- *  Created on: May 01, 2012
- *      Author: nsoblath
- */
-
-#include "KTLogger.hh"
-
-#include <exception>
-#include <iostream>
-
-KTLOGGER(logger, "TestLogger")
-
-int main()
-{
-    try
-    {
-        KTTRACE(logger, "This is a TRACE message from Nymph");
-        KTDEBUG(logger, "This is a DEBUG message from Nymph");
-        KTINFO(logger, "This is an INFO message from Nymph");
-        KTPROG(logger, "This is a PROG message from Nymph");
-        KTWARN(logger, "This is a WARN message from Nymph");
-        KTERROR(logger, "This is an ERROR message from Nymph");
-        KTFATAL(logger, "This is a FATAL message from Nymph");
-    }
-    catch (std::exception& e)
-    {
-        std::cout << "Exception caught: " << e.what() << std::endl;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestParamBindings.py b/cpp/Cpp/Executables_v1/Validation/TestParamBindings.py
deleted file mode 100644
index 5608755..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestParamBindings.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Demonstrates access to param classes
-
-import py_nymph as nymph
-
-# want to instantiate this will enough values to test all types: 
-# # TypeError: get_value(): incompatible function arguments. The following argument types are supported:
-#     1. (self: py_nymph.ParamNodePybind, arg0: str) -> bool
-#     2. (self: py_nymph.ParamNodePybind, arg0: str) -> int
-#     3. (self: py_nymph.ParamNodePybind, arg0: str) -> int
-#     4. (self: py_nymph.ParamNodePybind, arg0: str) -> float
-#     5. (self: py_nymph.ParamNodePybind, arg0: str) -> str
-#     6. (self: py_nymph.ParamNodePybind, arg0: str, arg1: bool) -> bool
-#     7. (self: py_nymph.ParamNodePybind, arg0: str, arg1: int) -> int
-#     8. (self: py_nymph.ParamNodePybind, arg0: str, arg1: int) -> int
-#     9. (self: py_nymph.ParamNodePybind, arg0: str, arg1: float) -> float
-#     10. (self: py_nymph.ParamNodePybind, arg0: str, arg1: str) -> str
-
-
-# Value testing
-int_value = nymph.param_value(5)
-print("What type of value is stored? (bool, uint, int, double, string): ", int_value.is_bool(), int_value.is_uint(), int_value.is_int(), int_value.is_double(), int_value.is_string())
-print("Get value set to 5:", int_value.as_int())
-
-string_value = nymph.param_value("Hello!")
-print("What type of value is stored? (bool, uint, int, double, string): ", string_value.is_bool(), string_value.is_uint(), string_value.is_int(), string_value.is_double(), string_value.is_string())
-print("Get value set to \"Hello!\":", string_value.as_string())
-
-
-# Node testing
-a_node = nymph.param_node()
-a_node.add("int-value", int_value)
-a_node.add("string-value", string_value)
-
-print("Int value from node:", a_node.get_value_int("int-value"))
-print("String value from node:", a_node.get_value_string("string-value"))
-
-# Test the "get_value" function for all the different types: 
-print("Get int value from the node as different types (bool, uint, int, double, string): ", a_node.get_value_bool("int-value"), a_node.get_value_uint("int-value"), a_node.get_value_int("int-value"), a_node.get_value_double("int-value"), a_node.get_value_string("int-value"))
-
-
-# Array testing
-an_array = nymph.param_array()
-an_array.resize(2)
-an_array.assign(0, int_value)
-an_array.assign(1, string_value)
-
-print("Int value from array:", an_array.get_value_int(0))
-print("String value from array:", an_array.get_value_string(1))
-
-# Test the "get_value" function for all the different types: 
-print("Get int value from the array as different types (bool, uint, int, double, string): ", an_array.get_value_bool(0), an_array.get_value_uint(0), an_array.get_value_int(0), an_array.get_value_double(0), an_array.get_value_string(0))
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc b/cpp/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
deleted file mode 100644
index 76b03e8..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * TestSlotData.cc
- *
- *  Created on: Jun 1, 2017
- *      Author: obla999
- */
-
-
-#include "KTTestData.hh"
-#include "KTTestProcessor.hh"
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER(testslotdata, "TestPolymorphicSlotData")
-
-int main()
-{
-    try
-    {
-        KTTestProcessorE tpE;
-
-        KTINFO(testslotdata, "Connecting derived-1 to derived-1 and derived-2 to derived-2");
-        // for simplicity the signal and slot are in the same processor, but that need not be, of course
-        tpE.ConnectASlot("derived-1", &tpE, "derived-1" );
-        tpE.ConnectASlot("derived-2", &tpE, "derived-2" );
-
-        KTINFO(testslotdata, "Emitting signals");
-        tpE.EmitSignals();
-
-        KTINFO(testslotdata, "Tests complete");
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testslotdata, "An exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc b/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
deleted file mode 100644
index 0fc9499..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * TestPrimaryProcessor.cc
- *
- *  Created on: May 4, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTTestPrimaryProcessor.hh"
-#include "KTTestProcessor.hh"
-
-#include "KTLogger.hh"
-
-#include <boost/thread.hpp>
-
-using namespace Nymph;
-
-KTLOGGER( testpplog, "TestPrimaryProcessor" )
-
-int main()
-{
-
-    try
-    {
-        KTTestPrimaryProcessor tpp;
-        KTTestProcessorB tp;
-
-        KTINFO( testpplog, "Connecting the-signal to first-slot" );
-        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
-
-        // setup to execute processors asynchronously
-        std::shared_ptr< KTThreadReference > exeThreadRef( std::make_shared< KTThreadReference >() );
-        exeThreadRef->Name() = std::string( "tpp" );
-
-        // run the thread
-        boost::condition_variable threadStartedCV;
-        boost::mutex threadStartedMutex;
-        bool threadStartedFlag = false;
-
-        boost::unique_lock< boost::mutex > threadStartedLock( threadStartedMutex );
-        boost::thread thread( [&](){ tpp( exeThreadRef, threadStartedCV, threadStartedFlag ); } );
-
-        while( ! threadStartedFlag )
-        {
-            threadStartedCV.wait( threadStartedLock );
-        }
-        KTDEBUG( testpplog, "Thread has started" );
-
-        // wait for a result to be set
-        exeThreadRef->GetDataPtrRetFuture().wait();
-
-        try
-        {
-            exeThreadRef->GetReturnValue();
-        }
-        catch( boost::exception& e )
-        {
-            exeThreadRef->SetCanceled( true );
-            KTERROR( testpplog, "An error occurred while running a processor: " << diagnostic_information( e ) );
-        }
-
-        thread.join();
-
-        KTINFO( testpplog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testpplog, "Exception caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc b/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
deleted file mode 100644
index 4ee12de..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * TestPrimaryProcessorNoThreading.cc
- *
- *  Created on: May 5, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTTestPrimaryProcessor.hh"
-#include "KTTestProcessor.hh"
-
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER( testpplog, "TestPrimaryProcessorNoThreading" )
-
-int main()
-{
-
-    try
-    {
-        KTTestPrimaryProcessor tpp;
-        KTTestProcessorB tp;
-
-        KTINFO( testpplog, "Connecting the-signal to first-slot" );
-        tpp.ConnectASlot( "the-signal", &tp, "first-slot", 20 );
-
-        KTINFO( testpplog, "Running the primary processor" )
-
-        if( ! tpp.Run() )
-        {
-            KTERROR( testpplog, "Something went wrong while running the primary processor" );
-            return -1;
-        }
-
-        KTINFO( testpplog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testpplog, "An unexpected exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPrintData.cc b/cpp/Cpp/Executables_v1/Validation/TestPrintData.cc
deleted file mode 100644
index f22bf19..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPrintData.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * TestPrintData.cc
- *
- *  Created on: Oct 07, 2014
- *      Author: nsoblath
- */
-
-#include "KTLogger.hh"
-#include "KTPrintDataStructure.hh"
-
-#include "KTTestCuts.hh"
-
-KTLOGGER(testlog, "TestPrintData");
-
-using namespace Nymph;
-using namespace std;
-
-int main()
-{
-    KTDataHandle dataHandle = CreateNewDataHandle();
-    KTCoreDataExt& data = dataHandle->Of< KTCoreDataExt >();
-    KTTestDataExt& testData = dataHandle->Of< KTTestDataExt >();
-
-    KTINFO(testlog, "Applying awesome cut");
-    KTAwesomeCut cut;
-    cut.Apply(data, testData);
-
-    KTINFO(testlog, "Applying not-awesome cut");
-    KTNotAwesomeCut naCut;
-    naCut.Apply(data, testData);
-
-    KTPrintDataStructure printer;
-
-    KTINFO(testlog, "Printing data structure");
-    printer.PrintDataStructure(dataHandle);
-
-    KTINFO(testlog, "Printing cut structure");
-    printer.PrintCutStructure(dataHandle);
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox.py b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
deleted file mode 100644
index 8453a79..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# TestProcessorToolbox.py
-#  Created on: Jan 29, 2018
-#      Author: N.S. Oblath
-#
-#  Tests the ability to use the processor toolbox from a Python script
-
-import py_nymph as nymph
-import py_nymph_validation as nv
-
-
-ptb = nymph.KTProcessorToolbox('pt')
-
-print('Configuring')
-
-ptb.AddProcessor('test-p-proc', 'tpp')
-ptb.AddProcessor('test-proc-b', 'tp')
-ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
-ptb.MakeConnection('tpp:the-signal', 'tp:first-slot')
-
-
-ptb.PushBackToRunQueue('tpp')
-
-print('Running')
-
-ptb.Run()
-
-print('All done')
diff --git a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
deleted file mode 100644
index 65cb6dd..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * TestProcessorToolboxMultithreaded.cc
- *
- *  Created on: May 8, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTProcessorToolbox.hh"
-
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER( testptlog, "TestProcessorToolbox" )
-
-int main()
-{
-    try
-    {
-        KTINFO( testptlog, "Preparing to run" );
-
-        KTProcessorToolbox ptb;
-
-        // add the primary processor, thread 1
-        if( ! ptb.AddProcessor( "test-p-proc", "tpp1" ) )
-        {
-            KTERROR( testptlog, "Unable to create test primary processor (thread 1)" );
-            return -1;
-        }
-
-        // add processor b, thread 1
-        if( ! ptb.AddProcessor( "test-proc-b", "tp1" ) )
-        {
-            KTERROR( testptlog, "Unable to create test processor b (thread 1)" );
-            return -1;
-        }
-
-        // add the primary processor, thread 2
-        if( ! ptb.AddProcessor( "test-p-proc", "tpp2" ) )
-        {
-            KTERROR( testptlog, "Unable to create test primary processor (thread 2)" );
-            return -1;
-        }
-
-        // add processor b, thread 2
-        if( ! ptb.AddProcessor( "test-proc-b", "tp2" ) )
-        {
-            KTERROR( testptlog, "Unable to create test processor b (thread 2)" );
-            return -1;
-        }
-
-        // set breakpoint, thread 1
-        if( ! ptb.SetBreakpoint( "tp1", "first-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to set the breakpoint" );
-            return -1;
-        }
-
-        // no breakpoint, thread2
-
-        // make connections, thread 1
-        if( ! ptb.MakeConnection( "tpp1:the-signal", "tp1:first-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to connect tpp1 to tp1" );
-            return -1;
-        }
-
-        // make connections, thread 2
-        if( ! ptb.MakeConnection( "tpp2:the-signal", "tp2:second-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to connect tpp2 to tp2" );
-            return -1;
-        }
-
-        // set the run queue
-        if( ! ptb.PushBackToRunQueue( {"tpp1", "tpp2"} ) )
-        {
-            KTERROR( testptlog, "Unable to add {tpp1, tpp2} to the run queue" );
-            return -1;
-        }
-
-        // go!
-        KTINFO( testptlog, "Starting asynchronous run" );
-        ptb.AsyncRun();
-
-        KTINFO( testptlog, "Starting asynchronous breakpoint user" );
-        auto buFuture = boost::async( boost::launch::async, [&](){
-            KTINFO( testptlog, "In breakpoint user thread" );
-            while( ptb.WaitForBreak() )
-            {
-                KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
-                std::string temp;
-                KTPROG( testptlog, "Please press [return]" );
-                getline( std::cin, temp );
-                ptb.Continue();
-            }
-            KTINFO( testptlog, "Finished breakpoint user thread" );
-            return;
-        });
-
-        KTINFO( testptlog, "Waiting for the end of the run" );
-        ptb.WaitForEndOfRun();
-
-        KTINFO( testptlog, "Processing complete" );
-
-        KTINFO( testptlog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
deleted file mode 100644
index de583b9..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * TestProcessorToolboxMultithreaded.cc
- *
- *  Created on: May 8, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTProcessorToolbox.hh"
-
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER( testptlog, "TestProcessorToolboxMultithreaded" )
-
-int main()
-{
-    try
-    {
-        KTINFO( testptlog, "Preparing to run" );
-
-        KTProcessorToolbox ptb;
-
-        // set for multi-threaded running
-        ptb.SetRunSingleThreaded( false );
-
-        // add the primary processor
-        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
-        {
-            KTERROR( testptlog, "Unable to create test primary processor" );
-            return -1;
-        }
-
-        // add processor b
-        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
-        {
-            KTERROR( testptlog, "Unable to create test processor b" );
-            return -1;
-        }
-
-        // make connections
-        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to connect tpp to tp" );
-            return -1;
-        }
-
-        // set the run queue
-        if( ! ptb.PushBackToRunQueue( "tpp" ) )
-        {
-            KTERROR( testptlog, "Unable to add tpp to the run queue" );
-            return -1;
-        }
-
-        // go!
-        KTINFO( testptlog, "Starting asynchronous run" );
-        ptb.AsyncRun();
-
-        // wait for run completion, and ignore breakpoints
-        while( ptb.WaitForBreak() )
-        {
-            KTINFO( testptlog, "Reached breakpoint; continuing" );
-            ptb.Continue();
-        }
-
-        KTINFO( testptlog, "Processing complete" );
-
-        KTINFO( testptlog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc b/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
deleted file mode 100644
index 5e91926..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * TestProcessorToolboxSinglethreaded.cc
- *
- *  Created on: May 4, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTProcessorToolbox.hh"
-
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER( testptlog, "TestProcessorToolboxSinglethreaded" )
-
-int main()
-{
-    try
-    {
-        KTINFO( testptlog, "Preparing to run" );
-
-        KTProcessorToolbox ptb;
-
-        // set for single-threaded running
-        ptb.SetRunSingleThreaded( true );
-
-        // add the primary processor
-        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
-        {
-            KTERROR( testptlog, "Unable to create test primary processor" );
-            return -1;
-        }
-
-        // add processor b
-        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
-        {
-            KTERROR( testptlog, "Unable to create test processor b" );
-            return -1;
-        }
-
-        // make connections
-        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to connect tpp to tp" );
-            return -1;
-        }
-
-        // set the run queue
-        if( ! ptb.PushBackToRunQueue( "tpp" ) )
-        {
-            KTERROR( testptlog, "Unable to add tpp to the run queue" );
-            return -1;
-        }
-
-        // go!
-        KTINFO( testptlog, "Starting asynchronous run" );
-        ptb.AsyncRun();
-
-        // wait for run completion, and ignore breakpoints
-        while( ptb.WaitForBreak() )
-        {
-            KTINFO( testptlog, "Reached breakpoint; continuing" );
-            ptb.Continue();
-        }
-
-        KTINFO( testptlog, "Processing complete" );
-
-        KTINFO( testptlog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testptlog, "Exception caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPyTestClass.py b/cpp/Cpp/Executables_v1/Validation/TestPyTestClass.py
deleted file mode 100644
index 1db0264..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPyTestClass.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# TestPyTestClass.py
-#  Created on: Feb 1, 2018
-#      Author: C. Claessens
-#
-# Demonstrates access to KTPyTestClass
-
-import py_nymph_validation as nv
-
-ptc = nv.KTPyTestClass()
-
-print( 'Ok, KTPyTestClass, say hello . . .' )
-print( ptc.SayHello() )
-print( 'This should print the default value of KTPyTestClass::fValue, which is 5:', ptc.GetValue() )
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.hh b/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.hh
deleted file mode 100644
index f1f6ef0..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.hh
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * TestPythonBasics.hh
- *
- *  Created on: Jan 24, 2018
- *      Author: obla999
- */
-
-#include "pybind11/pybind11.h"
-
-
-namespace Nymph
-{
-    namespace PyTest
-    {
-        int add( int i, int j )
-        {
-            return i + j;
-        }
-    }
-
-    void ExportTestPythonBasics( pybind11::module& mod )
-    {
-        mod.def( "add", &PyTest::add, "A function that adds two integers" );
-    }
-
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.py b/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.py
deleted file mode 100644
index 0babf31..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestPythonBasics.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# TestPythonBasics.py
-#  Created on: Jan 29, 2018
-#      Author: N.S. Oblath
-#
-# Verifies that we can import Nymph python modules and call wrapped functions.
-# Uses Nymph::PyTest::add(), which is defined in TestPythonBasics.cc
-
-import py_nymph_validation
-
-print( '1 + 2 =', py_nymph_validation.add(1, 2) )
diff --git a/cpp/Cpp/Executables_v1/Validation/TestSerialization.cc b/cpp/Cpp/Executables_v1/Validation/TestSerialization.cc
deleted file mode 100644
index ab97d7b..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestSerialization.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * TestSerialization.cc
- *
- *  Created on: Jan 24, 2018
- *      Author: obla999
- */
-
-#include "KTLogger.hh"
-
-#include "KTTestData.hh"
-
-#include "cereal/archives/json.hpp"
-
-#include <fstream>
-
-LOGGER( testlog, "TestSerialization" );
-
-using namespace Nymph;
-
-int main()
-{
-    const std::string filename( "test_serialization_output.json" );
-
-    // save data to archive
-    {
-        KTCoreData coreData;
-        KTTestData testData;
-        KTTestBaseData testBaseData;
-
-        // change data values from their defaults
-        coreData.SetCounter( 5 );
-        testData.SetIsAwesome( true );
-        testBaseData.SetFunniness( 923 );
-
-        KTINFO( testlog, "KTCoreData counter: " << coreData.GetCounter() );
-        KTINFO( testlog, "KTTestData is-awesome: " << testData.GetIsAwesome() );
-        KTINFO( testlog, "KTTestBaseData funniness: " << testBaseData.GetFunniness() );
-
-        // create and open a file for output
-        std::ofstream fileOut( filename );
-
-        cereal::JSONOutputArchive archiveOut( fileOut );
-
-        KTINFO( testlog, "Writing data to JSON archive" );
-        archiveOut( CEREAL_NVP(coreData), CEREAL_NVP(testData), CEREAL_NVP(testBaseData) );
-
-        // archive and stream closed when destructors are called
-    }
-
-    // ... some time later restore the class instance to its original state
-    {
-        KTCoreData newCoreData;
-        KTTestData newTestData;
-        KTTestBaseData newTestBaseData;
-
-         // create and open an archive for input
-        std::ifstream fileIn( filename );
-
-        cereal::JSONInputArchive archiveIn( fileIn );
-
-        KTINFO( testlog, "Reading data from JSON archive" );
-        archiveIn( newCoreData, newTestData, newTestBaseData );
-
-        KTINFO( testlog, "KTCoreData counter: " << newCoreData.GetCounter() );
-        KTINFO( testlog, "KTTestData is-awesome: " << newTestData.GetIsAwesome() );
-        KTINFO( testlog, "KTTestBaseData funniness: " << newTestBaseData.GetFunniness() );
-
-        // archive and stream closed when destructors are called
-    }
-
-    return 0;
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc b/cpp/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
deleted file mode 100644
index 6d11dd2..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * TestSignalsAndSlots.cc
- *
- *  Created on: Aug 15, 2012
- *      Author: nsoblath
- */
-
-
-#include "KTTestProcessor.hh"
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER(testsiglog, "TestSignalsAndSlots")
-
-int main()
-{
-    try
-    {
-        KTTestProcessorA tpA;
-        KTTestProcessorB tpB;
-
-        /* Basic Test
-        KTSignalWrapper* signalPtr = tpA.GetSignal("the_signal");
-        KTSlotWrapper* slot1Ptr = tpB.GetSlot("first_slot");
-
-        slot1Ptr->SetConnection(signalPtr);
-
-        tpA.EmitSignals(5);
-
-        slot1Ptr->Disconnect();
-
-        return 0;
-        */
-
-        /* More Complicated Test */
-        KTINFO(testsiglog, "Connecting the-signal to first-slot and second-slot");
-        tpA.ConnectASlot("the-signal", &tpB, "first-slot", 20);
-        tpB.ConnectASignal(&tpA, "the-signal", "second-slot", 10);
-
-        KTINFO(testsiglog, "Emitting signals");
-        KTINFO(testsiglog, "First test signal: 5");
-        tpA.EmitSignals(5);
-        KTINFO(testsiglog, "Second test signal: 18");
-        tpA.EmitSignals(18);
-
-        KTINFO(testsiglog, "Tests complete");
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testsiglog, "An exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-    /**/
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestSlotData.cc b/cpp/Cpp/Executables_v1/Validation/TestSlotData.cc
deleted file mode 100644
index 52853d8..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestSlotData.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * TestSlotData.cc
- *
- *  Created on: Jun 1, 2017
- *      Author: obla999
- */
-
-
-#include "KTTestData.hh"
-#include "KTTestProcessor.hh"
-#include "KTLogger.hh"
-
-using namespace Nymph;
-
-KTLOGGER(testslotdata, "TestSlotData")
-
-int main()
-{
-    try
-    {
-        KTTestProcessorD tpD;
-
-        KTINFO(testslotdata, "Connecting test-data-signal to test-data-slot");
-        // for simplicity the signal and slot are in the same processor, but that need not be, of course
-        tpD.ConnectASlot("test", &tpD, "test" );
-
-        KTINFO(testslotdata, "Emitting signals");
-        KTINFO(testslotdata, "First test signal: true");
-        tpD.EmitSignal(true);
-        KTINFO(testslotdata, "Second test signal: false");
-        tpD.EmitSignal(false);
-
-        KTINFO(testslotdata, "Tests complete");
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testslotdata, "An exception was caught: " << diagnostic_information( e ) );
-        return -1;
-    }
-
-    return 0;
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc b/cpp/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
deleted file mode 100644
index a59d0d1..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * TestThroughputProfiler.cc
- *
- *  Created on: Dec 2, 2012
- *      Author: nsoblath
- */
-
-#include "KTLogger.hh"
-#include "KTThroughputProfiler.hh"
-
-using namespace Nymph;
-
-KTLOGGER(testlog, "TestThroughputProfiler");
-
-int main()
-{
-    KTThroughputProfiler prof;
-
-    unsigned nIterations = 1000000;
-    unsigned sum = 0;
-    KTINFO(testlog, "Test 1: " << nIterations << " iterations");
-    prof.Start();
-    for (unsigned i=0; i<nIterations; i++)
-    {
-        sum++;
-    }
-    prof.Stop();
-    timespec diff = prof.Elapsed();
-    KTINFO(testlog, "Elapsed time: " << diff.tv_sec << " sec and " << diff.tv_nsec << " nsec");
-
-    nIterations = 5000000;
-    sum = 0;
-    KTINFO(testlog, "Test 2: " << nIterations << " iterations");
-    prof.Start();
-    for (unsigned i=0; i<nIterations; i++)
-    {
-        sum++;
-    }
-    prof.Stop();
-    diff = prof.Elapsed();
-    KTINFO(testlog, "Elapsed time: " << diff.tv_sec << " sec and " << diff.tv_nsec << " nsec");
-
-    return 0;
-}
-
diff --git a/cpp/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc b/cpp/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
deleted file mode 100644
index e9f76f4..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * TestUseBreakpoint.cc
- *
- *  Created on: May 5, 2017
- *      Author: N.S. Oblath
- */
-
-#include "KTProcessorToolbox.hh"
-
-#include "KTLogger.hh"
-
-
-using namespace Nymph;
-
-KTLOGGER( testptlog, "TestUseBreakpoint" )
-
-int main()
-{
-    try
-    {
-        KTINFO( testptlog, "Preparing to run" );
-
-        KTProcessorToolbox ptb;
-
-        // add the primary processor
-        if( ! ptb.AddProcessor( "test-p-proc", "tpp" ) )
-        {
-            KTERROR( testptlog, "Unable to create test primary processor" );
-            return -1;
-        }
-
-        // add processor b
-        if( ! ptb.AddProcessor( "test-proc-b", "tp" ) )
-        {
-            KTERROR( testptlog, "Unable to create test processor b" );
-            return -1;
-        }
-        // set breakpoint
-        if( ! ptb.SetBreakpoint( "tp", "first-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to set the breakpoint" );
-            return -1;
-        }
-
-        // make connections
-        if( ! ptb.MakeConnection( "tpp:the-signal", "tp:first-slot" ) )
-        {
-            KTERROR( testptlog, "Unable to connect tpp to tp" );
-            return -1;
-        }
-
-        // set the run queue
-        if( ! ptb.PushBackToRunQueue( "tpp" ) )
-        {
-            KTERROR( testptlog, "Unable to add tpp to the run queue" );
-            return -1;
-        }
-
-        // go!
-        KTINFO( testptlog, "Starting asynchronous run" );
-        ptb.AsyncRun();
-
-        KTINFO( testptlog, "Starting asynchronous breakpoint user" );
-        auto buFuture = boost::async( boost::launch::async, [&](){
-            KTINFO( testptlog, "In breakpoint user thread" );
-            while( ptb.WaitForBreak() )
-            {
-                KTPROG( testptlog, "Reached breakpoint; waiting for user input" );
-                std::string temp;
-                KTPROG( testptlog, "Please press [return]" );
-                getline( std::cin, temp );
-                ptb.Continue();
-            }
-            KTINFO( testptlog, "Finished breakpoint user thread" );
-            return;
-        });
-
-        KTINFO( testptlog, "Waiting for the end of the run" );
-        ptb.WaitForEndOfRun();
-
-        KTINFO( testptlog, "Processing complete" );
-
-        ptb.JoinRunThread();
-
-        KTINFO( testptlog, "Tests complete" );
-    }
-    catch( boost::exception& e )
-    {
-        KTERROR( testptlog, "Caught exception: " << diagnostic_information( e ) );
-    }
-
-    return 0;
-}
diff --git a/cpp/Cpp/Executables_v1/Validation/TestWrapProcessor.py b/cpp/Cpp/Executables_v1/Validation/TestWrapProcessor.py
deleted file mode 100644
index 75337ad..0000000
--- a/cpp/Cpp/Executables_v1/Validation/TestWrapProcessor.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# TestWrapProcessor.py
-#  Created on: Feb 1, 2018
-#      Author: C. Claessens
-#
-#  Tests the ability to overwrite processor functions
-
-import py_nymph as nymph
-import py_nymph_validation as nv
-
-class WrappedProcessor(nymph.WrapProcessor):
-    pass
-
-print("\nMaking instace in python of class WrappedProcessor that inherits from nymph.WrapProcessor.\n")
-p = WrappedProcessor()
-
-
-ptb = nymph.KTProcessorToolbox('pt')
-
-print('Configuring')
-ptb.AddProcessor('test-p-proc', 'tpp')
-ptb.AddProcessor('bwp', p)
-ptb.MakeConnection('tpp:the-signal', 'bwp:wrap-slot')
-
-ptb.PushBackToRunQueue('tpp')
-
-
-print("\nBefore running: Overwrite WrapFunction that will be called from the slot function.\n")
-p.WrapFunction = lambda x: print("Hey, I'm a python processor. And by the way: fThreshold is {}".format(p.fThreshold))
-
-
-print("Add a new variable to the processor.\n")
-p.fThreshold = 6
-print('Property fThreshold from python processor is {}.\n'.format(p.fThreshold))
-
-
-print('Define new Configure method to set self.fThreshold.\n')
-def Configure(self, a):
-    print('In Configure: Setting new fThreshold.\n')
-    self.fThreshold = a
-    
-p.Configure = Configure
-p.Configure(p, 7)
-
-
-
-
-print('Running')
-
-ptb.Run()
-
-print('All done')
\ No newline at end of file
diff --git a/cpp/Cpp/Library/CMakeLists.txt b/cpp/Cpp/Library/CMakeLists.txt
deleted file mode 100644
index bf91763..0000000
--- a/cpp/Cpp/Library/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-# CMakeLists for Nymph/Cpp/Library
-# Author: N.S. Oblath
-
-set( UTIL_DIR Utility )
-set( DATA_DIR Data )
-set( PROC_DIR Processor )
-#set( IO_DIR IO )
-#set( APPL_DIR Application )
-
-include_directories( BEFORE 
-    ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${DATA_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
-    #${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
-    #${CMAKE_CURRENT_SOURCE_DIR}/${APPL_DIR}
-)
-
-set( NYMPH_HEADERFILES
-    ${UTIL_DIR}/Exception.hh
-    ${UTIL_DIR}/MemberVariable.hh
-
-    ${DATA_DIR}/Data.hh
-    ${DATA_DIR}/DataFrame.hh
-    
-    ${PROC_DIR}/ControlAccess.hh
-    ${PROC_DIR}/PrimaryProcessor.hh
-    ${PROC_DIR}/Processor.hh
-    ${PROC_DIR}/ProcessorToolbox.hh
-    ${PROC_DIR}/QuitThread.hh
-    ${PROC_DIR}/ReturnBuffer.hh
-    ${PROC_DIR}/SignalSlotBase.hh
-
-)
-
-set( NYMPH_SOURCEFILES
-    ${UTIL_DIR}/Exception.cc
-
-    ${DATA_DIR}/Data.cc
-    ${DATA_DIR}/DataFrame.cc
-    
-    ${PROC_DIR}/ControlAccess.cc
-    ${PROC_DIR}/PrimaryProcessor.cc
-    ${PROC_DIR}/Processor.cc
-    ${PROC_DIR}/ProcessorToolbox.cc
-    ${PROC_DIR}/ReturnBuffer.cc
-    ${PROC_DIR}/SignalSlotBase.cc
-)
-
-
-##################################################
-
-pbuilder_library( 
-    TARGET Nymph 
-    SOURCES ${NYMPH_SOURCEFILES}
-    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Library
-    LIBTARGETS Nymph
-)
-
-pbuilder_install_headers( ${NYMPH_HEADERFILES} )
diff --git a/cpp/Cpp/Library/Data/Data.cc b/cpp/Cpp/Library/Data/Data.cc
deleted file mode 100644
index 12be720..0000000
--- a/cpp/Cpp/Library/Data/Data.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  Data.cc
- *
- *  Created on: Nov 5, 2019
- *      Author: N.S. Oblath
- */
-
-#include "Data.hh"
-
-namespace Nymph
-{
-    Data::Data()
-    {}
-
-    Data::~Data()
-    {}
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Data/Data.hh b/cpp/Cpp/Library/Data/Data.hh
deleted file mode 100644
index 590deca..0000000
--- a/cpp/Cpp/Library/Data/Data.hh
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  Data.hh
- *
- *  Created on: Nov 5, 2019
- *      Author: N.S. Oblath
- */
-
-
-#ifndef NYMPH_DATA_HH_
-#define NYMPH_DATA_HH_
-
-namespace Nymph
-{
-
-    class Data
-    {
-        public:
-            Data();
-            virtual ~Data();
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_DATA_HH_ */
diff --git a/cpp/Cpp/Library/Data/DataFrame.cc b/cpp/Cpp/Library/Data/DataFrame.cc
deleted file mode 100644
index 1224059..0000000
--- a/cpp/Cpp/Library/Data/DataFrame.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  DataFrame.cc
- *
- *  Created on: Nov 5, 2019
- *      Author: N.S. Oblath
- */
-
-#include "DataFrame.hh"
-
-namespace Nymph
-{
-    DataFrame::DataFrame() :
-        fDataObjects()
-    {}
-
-    DataFrame::~DataFrame()
-    {}
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Data/DataFrame.hh b/cpp/Cpp/Library/Data/DataFrame.hh
deleted file mode 100644
index 1fb1944..0000000
--- a/cpp/Cpp/Library/Data/DataFrame.hh
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- *  DataFrame.hh
- *
- *  Created on: Nov 5, 2019
- *      Author: N.S. Oblath
- */
-
-
-#ifndef NYMPH_DATAFRAME_HH_
-#define NYMPH_DATAFRAME_HH_
-
-#include "Data.hh"
-#include "Exception.hh"
-
-#include "MemberVariable.hh"
-
-#include "typename.hh"
-
-#include <unordered_map>
-#include <memory>
-#include <typeindex>
-
-namespace Nymph
-{
-    class DataFrameException : public scarab::typed_exception< DataFrameException >
-    {
-        public:
-            using scarab::typed_exception< DataFrameException >::typed_exception;
-            ~DataFrameException() = default;
-    };
-
-    /*!
-     @class DataFrame
-
-     @author N. S. Oblath
-
-     @brief Container for Data objects used during data processing
-
-     @details
-     Individual Data objects are held in an unordered map, indexed by type.
-
-    */
-    class DataFrame
-    {
-        public:
-            DataFrame();
-            virtual ~DataFrame();
-
-            /// Returns true if the frame has no data objects
-            bool Empty() const;
-
-            /// Returns true if object of type XData exists in the frame; returns false otherwise
-            template< typename XData >
-            bool Has() const;
-
-            /// Returns a reference to the object of type XData if it exists in the frame.
-            /// Creates and returns a reference to an object of type XData if it does not exist.
-            template< typename XData >
-            XData& Get();
-
-            /// Returns a reference to the object of type XData if it exists in the frame.
-            /// Throws DataFrameException if it does not exist.
-            template< typename XData >
-            const XData& Get() const;
-
-            /// Inserts the provided object of type XData into the frame, taking ownership of the object.
-            /// If an object of this type exists, it is replaced.
-            template< typename XData >
-            void Set( XData* ptr );
-
-            /// Inserts the provided object of type XData into the frame, taking ownership of the object.
-            /// If an object of this type exists, it is replaced.
-            template< typename XData >
-            void Set( std::unique_ptr<XData>&& ptr );
-
-            /// Inserts a copy of the provided object of type XData into the frame.
-            /// If an object of this type exists, it is replaced.
-            template< typename XData >
-            void Set( const XData& obj );
-
-            /// Removes and destroys the object of type XData if it exists in the frame.
-            /// Does nothing if the object does not exist.
-            template< typename XData >
-            void Remove();
-
-            // typedef used to avoid problems with the comma in the MEMVAR macro
-            typedef std::unordered_map< std::type_index, std::unique_ptr<Data> > DataMap;
-            MEMVAR_REF( DataMap, DataObjects );
-    };
-
-
-    inline bool DataFrame::Empty() const
-    {
-        return fDataObjects.empty();
-    }
-
-    template< typename XData >
-    bool DataFrame::Has() const
-    {
-        return fDataObjects.count( typeid(XData) ) != 0;
-    }
-
-    template< typename XData >
-    XData& DataFrame::Get()
-    {
-        if( Has< XData >() )
-        {
-            return static_cast< XData& >( *fDataObjects[typeid(XData)] );
-        }
-
-        fDataObjects[ typeid(XData) ].reset( new XData() );
-        return static_cast< XData& >( *fDataObjects[typeid(XData)] );
-    }
-
-    template< typename XData >
-    const XData& DataFrame::Get() const
-    {
-        if( Has< XData >() )
-        {
-            return static_cast< const XData& >( *fDataObjects.at(typeid(XData) ));
-        }
-        THROW_EXCEPT_HERE( DataFrameException() << "Data type <" << scarab::type(XData()) << "> is not present when const Get() was called" );
-    }
-
-    template< typename XData >
-    void DataFrame::Set( XData* ptr )
-    {
-        fDataObjects[ typeid(XData) ].reset( ptr );  // take ownership of ptr
-    }
-
-    template< typename XData >
-    void DataFrame::Set( std::unique_ptr< XData >&& ptr )
-    {
-        fDataObjects[ typeid(XData) ] = std::move(ptr);  // take ownership of ptr
-        return;
-    }
-
-    template< typename XData >
-    void DataFrame::Set( const XData& obj )
-    {
-        fDataObjects[ typeid(XData) ].reset( new XData(obj) );  // make a copy of obj
-    }
-
-    template< typename XData >
-    void DataFrame::Remove()
-    {
-        fDataObjects.erase( typeid(XData) );
-        return;
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_DATAFRAME_HH_ */
diff --git a/cpp/Cpp/Library/Data/DataManager.cc b/cpp/Cpp/Library/Data/DataManager.cc
deleted file mode 100644
index 3fda7bc..0000000
--- a/cpp/Cpp/Library/Data/DataManager.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *  DataManager.cc
- *
- *  Created on: Nov 5, 2019
- *      Author: N.S. Oblath
- */
-
-#include "DataManager.hh"
-
-namespace Nymph
-{
-    DataManager::DataManager()
-    {}
-
-    DataManager::~DataManager()
-    {}
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Data/DataManager.hh b/cpp/Cpp/Library/Data/DataManager.hh
deleted file mode 100644
index 3552738..0000000
--- a/cpp/Cpp/Library/Data/DataManager.hh
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  DataManager.hh
- *
- *  Created on: Nov 5, 2019
- *      Author: N.S. Oblath
- */
-
-
-#ifndef NYMPH_DATAMANAGER_HH_
-#define NYMPH_DATAMANAGER_HH_
-
-#include "MemberVariable.hh"
-
-#include <typeindex>
-#include <unordered_map>
-
-namespace Nymph
-{
-    struct Holder
-    {}
-
-    template< typename XType >
-    struct TypedHolder
-    {
-        
-    }
-
-    class DataManager
-    {
-        public:
-            DataManager();
-            virtual ~DataManager();
-
-            MEMVAR_REF( std::map< std::type_index, std::list< Holder > >, DataStore );
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_DATAMANAGER_HH_ */
diff --git a/cpp/Cpp/Library/Processor/ControlAccess.cc b/cpp/Cpp/Library/Processor/ControlAccess.cc
deleted file mode 100644
index 05342ac..0000000
--- a/cpp/Cpp/Library/Processor/ControlAccess.cc
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * ControlAccess.cc
- *
- *  Created on: Sept 15, 2019
- *      Author: N.S. Oblath
- */
-
-#include "ControlAccess.hh"
-
-#include "logger.hh"
-
-//#include <boost/thread/locks.hpp>
-//#include <boost/thread/lock_types.hpp>
-
-LOGGER( contlog, "ControlAccess" );
-
-namespace Nymph
-{
-    SharedControl::SharedControl() :
-            fMutex(),
-            fCondVarContinue(),
-            fCondVarBreak(),
-            fBreakFlag( false ),
-            fCanceledFlag( false ),
-            fCycleTimeMS( 500 ),
-            fNActiveThreads( 0 )
-    {}
-
-    SharedControl::~SharedControl()
-    {}
-
-    void SharedControl::Reset()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "Reseting ControlAccess" );
-        fBreakFlag = false;
-        fCanceledFlag = false;
-        fCycleTimeMS = 500;
-        fNActiveThreads = 0;
-        return;
-    }
-
-    void SharedControl::Cancel()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "CANCEL called" );
-        fCanceledFlag = true;
-        fCondVarBreak.notify_all();
-        return;
-    }
-
-    bool SharedControl::IsAtBreak() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        return fBreakFlag;
-    }
-
-    bool SharedControl::IsCanceled() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        return fCanceledFlag;
-    }
-
-    bool SharedControl::WaitToContinue() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fBreakFlag )
-        {
-            while( fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
-            {
-                fCondVarContinue.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-            }
-        }
-        return (! fCanceledFlag) && (fNActiveThreads > 0); // returns true if the thread should continue; false if it should end
-    }
-
-    bool SharedControl::WaitForBreakOrCanceled() const
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        while( ! fBreakFlag && ! fCanceledFlag && fNActiveThreads > 0 )
-        {
-            fCondVarBreak.wait_for( lock, std::chrono::milliseconds(fCycleTimeMS) );
-        }
-        return fCanceledFlag || fNActiveThreads == 0 ? false : fBreakFlag;
-    }
-
-    void SharedControl::Resume()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        LDEBUG( contlog, "RESUME called" );
-        fBreakFlag = false;
-        fCondVarContinue.notify_all();
-    }
-
-    void SharedControl::IncrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        ++fNActiveThreads;
-        LDEBUG( contlog, "Incremented active threads: " << fNActiveThreads );
-        return;
-    }
-
-    void SharedControl::DecrementActiveThreads()
-    {
-        std::unique_lock< std::mutex > lock( fMutex );
-        if( fNActiveThreads > 0 ) --fNActiveThreads;
-        LDEBUG( contlog, "Decremented active threads: " << fNActiveThreads );
-        return;
-    }
-
-
-
-
-    ControlAccess::ControlAccess() :
-            fReturn( new ReturnBuffer< int >() )//,
-            //fControl()
-    {}
-
-    ControlAccess::~ControlAccess()
-    {}
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Processor/ControlAccess.hh b/cpp/Cpp/Library/Processor/ControlAccess.hh
deleted file mode 100644
index 3833c85..0000000
--- a/cpp/Cpp/Library/Processor/ControlAccess.hh
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * ControlAccess.hh
- *
- *  Created on: Sept 14, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_CONTROLACCESS_HH_
-#define NYMPH_CONTROLACCESS_HH_
-
-#include "Exception.hh"
-#include "MemberVariable.hh"
-#include "ReturnBuffer.hh"
-
-#include "cancelable.hh" // remove when ControlAccess is removed
-#include "singleton.hh"
-
-//#include <boost/thread/condition_variable.hpp>
-//#include <boost/thread/mutex.hpp>
-
-#include <condition_variable>
-#include <memory>
-#include <mutex>
-
-namespace Nymph
-{
-
-    class SharedControl : public scarab::singleton< SharedControl >
-    {
-        protected:
-            allow_singleton_access( SharedControl );
-
-            SharedControl();
-            virtual ~SharedControl();
-
-        public:
-            template< typename... Args >
-            std::tuple< Args&... >& GetReturn();
-
-            template< typename... Args >
-            void Break( Args&... args ); // to be called by a working thread
-
-            void Cancel(); // to be called by a working thread
-
-            bool IsAtBreak() const; // to be called by a working thread
-
-            bool IsCanceled() const; // to be called by a working thread
-
-            // return: true = continue; false = cancel
-            bool WaitToContinue() const; // to be called by a working thread
-
-            // return: true = was a break; false = cancel
-            bool WaitForBreakOrCanceled() const; // to be called by the processor toolbox
-
-            void Resume(); // to be called by the processor toolbox
-
-            void IncrementActiveThreads();
-            void DecrementActiveThreads();
-
-            MEMVAR_REF_MUTABLE( std::mutex, Mutex );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
-            MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
-            MEMVAR_NOSET( bool, BreakFlag );
-            MEMVAR_NOSET( bool, CanceledFlag );
-            MEMVAR( unsigned, CycleTimeMS );
-            MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
-            MEMVAR( unsigned, NActiveThreads );
-
-            // WARNING: This function resets the state of this class to a just-constructed state
-            //          It is intended for use with testing when a single application might use it multiple times
-            void Reset();
-
-    };
-
-    template< typename... Args >
-    void SharedControl::Break( Args&... args )
-    {
-        while( IsAtBreak() && ! IsCanceled() )
-        {
-            if( ! WaitToContinue() )
-            {
-                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
-            }
-        }
-
-        std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag = true;
-        fCondVarBreak.notify_all();
-        return;
-    }
-
-
-
-    template< typename... Args >
-    std::tuple< Args&... >& SharedControl::GetReturn()
-    {
-        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
-        std::unique_lock< std::mutex > lock( fMutex );
-        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
-        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
-        return buffer->GetReturn();
-    }
-
-
-
-    class ControlAccess : public scarab::cancelable
-    {
-        public:
-            ControlAccess();
-
-            virtual ~ControlAccess();
-
-            template< typename... Args >
-            void SetReturn( Args&... arg );
-
-            template< typename... Args >
-            std::tuple< Args&... >& GetReturn();
-
-        protected:
-            std::shared_ptr< ReturnBufferBase > fReturn;
-
-        public:
-            //MEM_VAR_SHARED_PTR( SharedControl, Control );
-    };
-
-    typedef std::shared_ptr< ControlAccess > ControlAccessPtr;
-
-
-    template< typename... Args >
-    void ControlAccess::SetReturn( Args&... args )
-    {
-        fReturn = std::make_shared< ReturnBuffer< Args... > >( args... );
-        return;
-    }
-
-    template< typename... Args >
-    std::tuple< Args&... >& ControlAccess::GetReturn()
-    {
-        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturn) );
-        if( buffer == nullptr ) throw std::exception();
-        return buffer->GetReturn();
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_CONTROLACCESS_HH_ */
diff --git a/cpp/Cpp/Library/Processor/PrimaryProcessor.cc b/cpp/Cpp/Library/Processor/PrimaryProcessor.cc
deleted file mode 100644
index 9e05508..0000000
--- a/cpp/Cpp/Library/Processor/PrimaryProcessor.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * PrimaryProcessor.cc
- *
- *  Created on: Oct 10, 2012
- *      Author: N.S. Oblath
- */
-
-#include "PrimaryProcessor.hh"
-
-#include "ControlAccess.hh"
-#include "QuitThread.hh"
-
-#include "logger.hh"
-
-namespace Nymph
-{
-    LOGGER( proclog, "PrimaryProcessor" );
-
-    PrimaryProcessor::PrimaryProcessor( const std::string& name ) :
-            Processor( name ),
-            fExceptionPtr()
-    {}
-
-    PrimaryProcessor::~PrimaryProcessor()
-    {}
-
-    void PrimaryProcessor::operator()()
-    {
-        // go!
-        try
-        {
-            Run();
-        }
-        catch( const QuitThread& e )
-        {
-            LINFO( proclog, "Processor thread started by <" << fName << "> is quitting" );
-            fExceptionPtr = std::current_exception(); // capture the exception
-            SharedControl::get_instance()->DecrementActiveThreads();
-            // we don't initiate cancellation on QuitThread; this type of quitting has been initiated elsewhere and detected in this thread.
-            return;
-        }
-        catch( const std::exception& e )
-        {
-            LERROR( proclog, "An error occurred during processor running: " << e.what() );
-            fExceptionPtr = std::current_exception(); // capture the exception
-            SharedControl* control = SharedControl::get_instance();
-            control->DecrementActiveThreads();
-            control->Cancel();
-            return;
-        }
-
-        SharedControl::get_instance()->DecrementActiveThreads();
-        LWARN( proclog, "Valid return" );
-
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Processor/PrimaryProcessor.hh b/cpp/Cpp/Library/Processor/PrimaryProcessor.hh
deleted file mode 100644
index 74287d8..0000000
--- a/cpp/Cpp/Library/Processor/PrimaryProcessor.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * PrimaryProcessor.hh
- *
- *  Created on: Oct 10, 2012
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_PRIMARYPROCESSOR_HH_
-#define NYMPH_PRIMARYPROCESSOR_HH_
-
-#include "Processor.hh"
-
-
-namespace Nymph
-{
-
-    class PrimaryProcessor : public Processor
-    {
-        public:
-            PrimaryProcessor( const std::string& name );
-            virtual ~PrimaryProcessor();
-
-        public:
-            /// Callable function used by std::thread
-            void operator()();// ControlAccessPtr control ); // SharedControl is now accessed in Signal::operator(), so we don't have to pass it from signal to slot to signal, etc
-
-            /// Starts the  main action of the processor
-            virtual void Run() = 0;
-
-            MEMVAR_REF( std::exception_ptr, ExceptionPtr );
-
-    };
-
-
-/*
-    class PrimaryProcessor : public Processor
-    {
-        public:
-            PrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
-            virtual ~PrimaryProcessor();
-
-        public:
-            /// Callable function used by std::thread
-            void operator()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag );
-
-            /// Starts the  main action of the processor
-            virtual bool Run() = 0;
-
-            std::shared_ptr< KTThreadReference > GetThreadRef();
-
-            MEMBERVARIABLE( bool, DoBreakpoint );
-
-        protected:
-            std::vector< std::string > fSignalsEmitted;
-
-            std::shared_ptr< KTThreadReference > fThreadRef;
-
-    };
-
-    inline std::shared_ptr< KTThreadReference > PrimaryProcessor::GetThreadRef()
-    {
-        return fThreadRef;
-    }
-*/
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_PRIMARYPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Library/Processor/Processor.cc b/cpp/Cpp/Library/Processor/Processor.cc
deleted file mode 100644
index f53bbe5..0000000
--- a/cpp/Cpp/Library/Processor/Processor.cc
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Processor.cc
- *
- *  Created on: Jan 5, 2012
- *      Author: N.S. Oblath
- */
-
-#include "Processor.hh"
-
-#include "Exception.hh"
-
-#include <utility>
-
-namespace Nymph
-{
-    //KTLOGGER(proclog, "Processor");
-
-    ConfigException::ConfigException() noexcept :
-            scarab::typed_exception< ConfigException >(),
-            fConfig(),
-            fConfigStr()
-    {}
-
-    ConfigException::ConfigException( const std::string& a_filename, int a_line ) noexcept :
-            scarab::typed_exception< ConfigException >( a_filename, a_line ),
-            fConfig(),
-            fConfigStr()
-    {}
-
-    ConfigException::ConfigException( const scarab::param_node& node ) noexcept :
-            scarab::typed_exception< ConfigException >(),
-            fConfig(),
-            fConfigStr()
-    {
-        try
-        {
-            fConfig.reset( new scarab::param_node(node) );
-        }
-        catch( ... )
-        {}
-    }
-
-    ConfigException::ConfigException( const ConfigException& orig ) noexcept :
-            scarab::typed_exception< ConfigException >( orig ),
-            fConfig(),
-            fConfigStr()
-    {
-        try
-        {
-            if( orig.fConfig ) fConfig.reset( new scarab::param_node(orig.fConfig->as_node()) );
-        }
-        catch( ... )
-        {}
-        
-    }
-
-    ConfigException::~ConfigException() noexcept
-    {}
-
-    const char* ConfigException::what() const noexcept
-    {
-        try
-        {
-            fConfigStr = f_what + '\n' + fConfig->to_string();
-            return fConfigStr.c_str();
-        }
-        catch( ... )
-        {
-            return f_what.c_str();
-        }
-    }
-
-
-
-    Processor::Processor( const std::string& name ) :
-            fName( name ),
-            fSignals(),
-            fSlots()
-    {
-    }
-
-    Processor::~Processor()
-    {}
-
-    void Processor::RegisterSignal( std::string name, SignalBase* signal )
-    {
-        LDEBUG( processorlog, "Registering signal <" << name << "> in processor <" << fName << ">" );
-        fSignals.insert( SigMapVal(name, signal) );
-
-        // give the signal to any slots that are waiting for it
-        //auto range = fSlotsWaitingForSignals.equal_range( name );
-        //for( auto rangeIt = range.first; rangeIt != range.second; ++rangeIt )
-        //{
-        //    rangeIt->second->SignalsUsed().push_back( signal );
-        //}
-
-        return;
-    }
-
-    void Processor::RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals )
-    {
-        LDEBUG( processorlog, "Registering slot <" << name << "> in processor <" << fName << ">" );
-        fSlots.insert( SlotMapVal(name, slot) );
-
-        /*
-        // take care of giving signal pointers to the slot, or saving them for later assignment
-        for( auto signalIt = signals.begin(); signalIt != signals.end(); ++signalIt )
-        {
-            auto signalPtrIt = fSignals.find( *signalIt );
-            if( signalPtrIt == fSignals.end() )
-            {
-                // don't have that signal yet, so the slot will wait
-                fSlotsWaitingForSignals.insert( std::make_pair( *signalIt, slot ) );
-            }
-            else
-            {
-                // have the signal; give it to the slot
-                slot->SignalsUsed().push_back( signalPtrIt->second );
-            }
-        }
-        */
-
-        return;
-    }
-
-    void Processor::ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum )
-    {
-        // get the signal and slot pointers
-        SigMapIt signalIt = fSignals.find(signalName);
-        if( signalIt == fSignals.end() )
-        {
-            THROW_EXCEPT_HERE( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
-                                                    "You may have the signal name wrong." );
-//       BOOST_THROW_EXCEPTION( SignalException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal.\n" <<
-//                                                        "You may have the signal name wrong." << eom );
-        }
-
-        SlotMapIt slotIt = processor.fSlots.find(slotName);
-        if( slotIt == processor.fSlots.end() )
-        {
-            THROW_EXCEPT_HERE( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
-                                                  "You may have the slot name wrong." );
-//            BOOST_THROW_EXCEPTION( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." << 
-//                                                      "You may have the slot name wrong." << eom );
-        }
-
-        try
-        {
-            // make the connection
-            ConnectSignalToSlot( signalIt->second, slotIt->second, groupNum );
-        }
-        catch( SignalException& e )
-        {
-            THROW_NESTED_EXCEPT_HERE( SignalException() << "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem with the signal." <<
-                                                           "\tYou may have the signal name wrong." );
-        }
-        catch( SlotException& e )
-        {
-            THROW_NESTED_EXCEPT_HERE( SlotException() << "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." <<
-                                                         "\tYou may have the slot name wrong." );
-        }
-        catch( ConnectionException& e )
-        {
-            THROW_NESTED_EXCEPT_HERE( ConnectionException() <<  "Unable to connect signal <" << signalName << "> to slot <" << slotName << "> due to a problem making the connection." <<
-                                                                "\tCheck that the signatures of the signal and slot match exactly." );
-        }
-        catch( std::exception& e )
-        {
-            THROW_NESTED_EXCEPT_HERE( Exception() <<  "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
-        }
-
-        LDEBUG(processorlog, "Connected signal <" << this->Name() << ":" << signalName << "> to slot <" << processor.Name() << ":" << slotName << ">");
-
-        return;
-    }
-
-    void Processor::ConnectSignalToSlot( SignalBase* signal, SlotBase* slot, int groupNum )
-    {
-        if( ! signal )
-        {
-            THROW_EXCEPT_HERE( SignalException() << "Signal pointer was NULL" );
-//            BOOST_THROW_EXCEPTION( SignalException() << "Signal pointer was NULL" << eom );
-        }
-        if( ! slot )
-        {
-            THROW_EXCEPT_HERE( SlotException() << "Slot pointer was NULL" );
-//            BOOST_THROW_EXCEPTION( SlotException() << "Slot pointer was NULL" << eom );
-        }
-
-        signal->Connect(slot, groupNum);
-
-        return;
-    }
-
-    bool Processor::GetDoBreakpoint( const std::string& signalName )
-    {
-        SignalBase* signal = fSignals.at(signalName  );
-        if (signal != nullptr)
-        {
-            return signal->GetDoBreakpoint();
-        }
-        THROW_EXCEPT_HERE( Exception() << "Signal <" << signalName << "> was not found" );
-        return false;
-    }
-
-    void Processor::SetDoBreakpoint( const std::string& signalName, bool flag )
-    {
-        SignalBase* signal = fSignals.at(signalName  );
-        if( signal != nullptr )
-        {
-            return signal->SetDoBreakpoint( flag );
-        }
-        THROW_EXCEPT_HERE( Exception() << "Signal <" << signalName << "> was not found" );
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Processor/Processor.hh b/cpp/Cpp/Library/Processor/Processor.hh
deleted file mode 100644
index bb7f09b..0000000
--- a/cpp/Cpp/Library/Processor/Processor.hh
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- @file Processor.hh
- @brief Base class for processors
- @author: N. S. Oblath
- @date: Jan 5, 2012
- */
-
-#ifndef NYMPH_PROCESSOR_HH_
-#define NYMPH_PROCESSOR_HH_
-
-#include "SignalSlotBase.hh"
-
-#include "factory.hh"
-#include "logger.hh"
-#include "param.hh"
-
-#include <map>
-
-namespace Nymph
-{
-    LOGGER(processorlog, "Processor.hh");
-
-    struct ProcessorException : virtual public Exception {};
-
-    class ConfigException : public scarab::typed_exception< ConfigException >
-    {
-        public:
-            ConfigException() noexcept;
-            ConfigException( const std::string& a_filename, int a_line ) noexcept;
-            ConfigException( const scarab::param_node& node ) noexcept;
-            ConfigException( const ConfigException& orig ) noexcept;
-            virtual ~ConfigException() noexcept;
-
-            virtual const char* what() const noexcept;
-
-            MEMVAR_REF( scarab::param_ptr_t, Config );
-
-        protected:
-            mutable std::string fConfigStr;
-    };
-
-
-    class Processor
-    {
-        protected:
-            typedef std::map< std::string, SignalBase* > SignalMap;
-            typedef SignalMap::iterator SigMapIt;
-            typedef SignalMap::value_type SigMapVal;
-
-            typedef std::map< std::string, SlotBase* > SlotMap;
-            typedef SlotMap::iterator SlotMapIt;
-            typedef SlotMap::value_type SlotMapVal;
-
-        public:
-            Processor( const std::string& name );
-            virtual ~Processor();
-
-            template< class XDerivedProc >
-            static scarab::registrar< Nymph::Processor, XDerivedProc, const std::string& >* RegisterProcessor( const std::string& name );
-
-        public:
-            /// Configure the processor with a param_node
-            virtual void Configure( const scarab::param_node& node ) = 0;
-
-            /// Utility function for connecting any signal to any slot
-            static void ConnectSignalToSlot( SignalBase* signal, SlotBase* slot, int groupNum=-1 );
-
-            /// Connect a signal in this processor to a slot in a different processor
-            void ConnectASlot( const std::string& signalName, Processor& processor, const std::string& slotName, int groupNum=-1 );
-            /// Connect a signal in a different processor to a slot in this processor
-            void ConnectASignal( Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum=-1 );
-
-            /// Register a signal object with this processor
-            void RegisterSignal( std::string name, SignalBase* signal );
-
-            /// Register a slot object with this processor
-            void RegisterSlot( std::string name, SlotBase* slot, std::initializer_list< std::string > signals = {} );
-
-            bool GetDoBreakpoint( const std::string& signalName );
-            void SetDoBreakpoint( const std::string& signalName, bool flag );
-
-            MEMVAR_REF( std::string, Name );
-
-            MEMVAR_REF_CONST( SignalMap, Signals );
-            MEMVAR_REF_CONST( SlotMap, Slots );
-
-            // this is used only to hold pointers to slots waiting for signals
-            // the keys are the names of the signals being waited for, and the values are the slot pointers
-            //typedef std::multimap< std::string, SlotBase* > WaitingSlotMap;
-            //MEMVAR_REF_CONST( WaitingSlotMap, SlotsWaitingForSignals );
-
-    };
-
-
-    inline void Processor::ConnectASignal(Processor& processor, const std::string& signalName, const std::string& slotName, int groupNum )
-    {
-        processor.ConnectASlot( signalName, *this, slotName, groupNum );
-        return;
-    }
-
-    template< class XDerivedProc >
-    scarab::registrar< Processor, XDerivedProc, const std::string& >* Processor::RegisterProcessor( const std::string& name )
-    {
-        return new scarab::registrar< Processor, XDerivedProc, const std::string& >( name );
-    }
-
-#define REGISTER_PROCESSOR_NONAMEPSACE(proc_class, proc_name) \
-        static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
-
-#define REGISTER_PROCESSOR_NAMESPACE(proc_namespace, proc_class, proc_name) \
-        static ::scarab::registrar< ::Nymph::Processor, ::proc_namespace::proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
-
-// Macro overloading trick from here: https://stackoverflow.com/a/11763277
-#define GET_MACRO(_1, _2, _3, NAME, ...) NAME
-/// Processors defined in a namespace need to specify the namespace first:
-///   [no namespace]: REGISTER_PROCESSOR( [class], [name in quotes] )
-///   [with namespace]: REGISTER_PROCESSOR( [namespace], [class], [name in quotes] )
-#define REGISTER_PROCESSOR(...) GET_MACRO(__VA_ARGS__, REGISTER_PROCESSOR_NAMESPACE, REGISTER_PROCESSOR_NONAMESPACE, )(__VA_ARGS__)
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_PROCESSOR_HH_ */
diff --git a/cpp/Cpp/Library/Processor/ProcessorToolbox.cc b/cpp/Cpp/Library/Processor/ProcessorToolbox.cc
deleted file mode 100644
index 88d72ec..0000000
--- a/cpp/Cpp/Library/Processor/ProcessorToolbox.cc
+++ /dev/null
@@ -1,758 +0,0 @@
-/*
- * ProcessorToolbox.cc
- *
- *  Created on: Sep 27, 2012
- *      Author: N.S. Oblath
- */
-
-#include "ProcessorToolbox.hh"
-
-#include "PrimaryProcessor.hh"
-#include "QuitThread.hh"
-
-#include "factory.hh"
-#include "logger.hh"
-#include "param_codec.hh"
-
-#include <map>
-#include <thread>
-
-//#include <boost/exception/get_error_info.hpp>
-//#include <boost/thread.hpp>
-
-using std::deque;
-using std::set;
-using std::string;
-using std::vector;
-
-namespace Nymph
-{
-    LOGGER(proclog, "ProcessorToolbox");
-
-    ProcessorToolbox::ProcessorToolbox( const std::string& name ) :
-            fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
-            fRunSingleThreaded( false ),
-            fRunQueue(),
-            fProcMap(),
-            //fControl( new SharedControl() ),
-            //fThreadReferences(),
-            //fContinueCV(),
-            //fDoContinue( false ),
-            //fBreakContMutex(),
-            fDoRunThread()//,
-            //fDoRunPromise(),
-            //fDoRunBreakFlag( false )
-    {
-    }
-
-    ProcessorToolbox::~ProcessorToolbox()
-    {
-        //CancelThreads();
-
-        //JoinRunThread();
-
-        ClearProcessors();
-    }
-
-    void ProcessorToolbox::Configure( const scarab::param_node& node )
-    {
-        LPROG( proclog, "Configuring . . ." );
-
-        // Deal with "processor" blocks
-        if( ! node.has("processors") )
-        {
-            LWARN( proclog, "No processors were specified" );
-        }
-        else
-        {
-            const scarab::param_array& procArray = node["processors"].as_array();
-            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
-            {
-                if( ! procIt->is_node() )
-                {
-                    LERROR( proclog, "Invalid processor entry (not a node): " << *procIt );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid processor entry (not a node): " << *procIt );
-                }
-                const scarab::param_node& procNode = procIt->as_node();
-
-                if( ! procNode.has("type") )
-                {
-                    LERROR( proclog, "Unable to create processor: no processor type given" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor: no processor type given" );
-                }
-                string procType = procNode["type"]().as_string();
-
-                string procName;
-                if( ! procNode.has("name") )
-                {
-                    LINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
-                    procName = procType;
-                }
-                else
-                {
-                    procName = procNode["name"]().as_string();
-                }
-                std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procName) );
-                if( newProc == nullptr )
-                {
-                    LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to create processor of type <" << procType << ">" );
-                }
-
-                if( ! AddProcessor( procName, newProc ) )
-                {
-                    LERROR( proclog, "Unable to add processor <" << procName << ">" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to add processor <" << procName << ">" );
-                }
-            }
-        }
-
-
-        // Then deal with connections"
-        if( ! node.has("connections") )
-        {
-            LWARN( proclog, "No connections were specified" );
-        }
-        else
-        {
-            const scarab::param_array& connArray = node["connections"].as_array();
-            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
-            {
-                if( ! connIt->is_node() )
-                {
-                    LERROR( proclog, "Invalid connection entry: not a node" << *connIt );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid connection entry: not a node" << *connIt );
-                }
-                const scarab::param_node& connNode = connIt->as_node();
-
-                if( ! connNode.has("signal") || ! connNode.has("slot") )
-                {
-                    LERROR( proclog, "Signal/Slot connection information is incomplete!" );
-                    std::string sigSlotMessage( "signal = " );
-                    if (connNode.has("signal"))
-                    {
-                        sigSlotMessage += connNode["signal"]().as_string();
-                    }
-                    else
-                    {
-                        sigSlotMessage += "MISSING";
-                    }
-
-                    sigSlotMessage += "\nslot = ";
-                    if (connNode.has("slot"))
-                    {
-                        sigSlotMessage += connNode["slot"]().as_string();
-                    }
-                    else
-                    {
-                        sigSlotMessage += "MISSING";
-                    }
-                    LERROR( proclog, sigSlotMessage );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Signal/Slot connection information is incomplete!\n" << sigSlotMessage );
-                }
-
-                bool connReturn = false;
-                if( connNode.has("order") )
-                {
-                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int() );
-                }
-                else
-                {
-                    connReturn = MakeConnection( connNode["signal"]().as_string(), connNode["slot"]().as_string() );
-                }
-                if( ! connReturn )
-                {
-                    LERROR( proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">" );
-                }
-
-                if( connNode.has("breakpoint") )
-                {
-                    if (! SetBreakpoint( connNode["slot"]().as_string() ) )
-                    {
-                        LERROR( proclog, "Unable to set breakpoint on <" << connNode["slot"]() );
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to set breakpoint on <" << connNode["slot"]() );
-                    }
-                }
-
-                LINFO( proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">" );
-            }
-        }
-
-
-        // Finally, deal with processor-run specifications
-        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
-        // If names are grouped (in another array), those in that group will be run in parallel.
-        // In single threaded mode all threads will be run sequentially in the order they were specified.
-        if( ! node.has("run-queue") )
-        {
-            LWARN( proclog, "Run queue was not specified" );
-        }
-        else
-        {
-            const scarab::param_array& rqArray = node["run-queue"].as_array();
-            for( scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt )
-            {
-                if( rqIt->is_value() )
-                {
-                    if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
-                    {
-                        LERROR( proclog, "Unable to process run-queue entry: could not add processor to the queue" );
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add processor to the queue" );
-                    }
-                }
-                else if( rqIt->is_array() )
-                {
-                    const scarab::param_array* rqNode = &( rqIt->as_array() );
-                    std::vector< std::string > names;
-
-                    for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
-                    {
-                        if( ! rqArrayIt->is_value() )
-                        {
-                            LERROR( proclog, "Invalid run-queue array entry: not a value" );
-                            THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue array entry: not a value" );
-                        }
-                        names.push_back( (*rqArrayIt)().as_string() );
-                    }
-
-                    if( ! PushBackToRunQueue(names) )
-                    {
-                        LERROR( proclog, "Unable to process run-queue entry: could not add list of processors to the queue" );
-                        THROW_EXCEPT_HERE( ConfigException(node) << "Unable to process run-queue entry: could not add list of processors to the queue" );
-                    }
-                }
-                else
-                {
-                    LERROR( proclog, "Invalid run-queue entry: not a value or array" );
-                    THROW_EXCEPT_HERE( ConfigException(node) << "Invalid run-queue entry: not a value or array" );
-                }
-            }
-        }
-
-        return;
-    }
-
-    bool ProcessorToolbox::ConfigureProcessors( const scarab::param_node& node )
-    {
-        for( ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); ++iter )
-        {
-            LDEBUG( proclog, "Attempting to configure processor <" << iter->first << ">" );
-            string procName = iter->first;
-            string nameUsed(procName);
-            if( ! node.has(nameUsed) )
-            {
-                nameUsed = iter->second.fProc->Name();
-                if( ! node.has(nameUsed) )
-                {
-                    LWARN( proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
-                            "\tProcessor <" << procName << "> was not configured." );
-                    continue;
-                }
-            }
-            const scarab::param_node& subNode = node[nameUsed].as_node();
-            try
-            {
-                iter->second.fProc->Configure(subNode);
-            }
-            catch( const Exception& e )
-            {
-                LERROR( proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">" );
-                LERROR( proclog, e.what() );
-                return false;
-            }
-        }
-        return true;
-    }
-
-    std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName )
-    {
-        ProcMapIt it = fProcMap.find( procName );
-        if( it == fProcMap.end() )
-        {
-            LWARN( proclog, "Processor <" << procName << "> was not found." );
-            return NULL;
-        }
-        return it->second.fProc;
-    }
-
-    const std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName ) const
-    {
-        ProcMapCIt it = fProcMap.find( procName );
-        if (it == fProcMap.end())
-        {
-            LWARN( proclog, "Processor <" << procName << "> was not found." );
-            return NULL;
-        }
-        return it->second.fProc;
-    }
-
-    bool ProcessorToolbox::AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc )
-    {
-        ProcMapIt it = fProcMap.find( procName);
-        if( it == fProcMap.end() )
-        {
-            ProcessorInfo pInfo;
-            pInfo.fProc = proc;
-            fProcMap.insert( ProcMapValue(procName, pInfo) );
-            LDEBUG( proclog, "Added processor <" << procName << "> (a.k.a. " << proc->Name() << ")" );
-            return true;
-        }
-        LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
-        return false;
-    }
-
-    bool ProcessorToolbox::AddProcessor( const std::string& procType, const std::string& procName )
-    {
-        ProcMapIt it = fProcMap.find( procName );
-        if( it == fProcMap.end() )
-        {
-            std::shared_ptr< Processor > newProc ( fProcFactory->create(procType, procType) );
-            if( newProc == NULL )
-            {
-                LERROR( proclog, "Unable to create processor of type <" << procType << ">" );
-                return false;
-            }
-            if( ! AddProcessor(procName, newProc) )
-            {
-                LERROR( proclog, "Unable to add processor <" << procName << ">" );
-                //delete newProc;
-                return false;
-            }
-            return true;
-        }
-        LWARN( proclog, "Processor <" << procName << "> already exists; new processor was not added." );
-        return false;
-    }
-
-    bool ProcessorToolbox::RemoveProcessor( const std::string& procName )
-    {
-        std::shared_ptr< Processor > procToRemove = ReleaseProcessor( procName );
-        if( procToRemove == NULL )
-        {
-            return false;
-        }
-        //delete procToRemove;
-        LDEBUG( proclog, "Processor <" << procName << "> deleted." );
-        return true;
-    }
-
-    std::shared_ptr< Processor > ProcessorToolbox::ReleaseProcessor( const std::string& procName )
-    {
-        ProcMapIt it = fProcMap.find( procName );
-        if( it == fProcMap.end() )
-        {
-            LWARN( proclog, "Processor <" << procName << "> was not found." );
-            return NULL;
-        }
-        std::shared_ptr< Processor > procToRelease = it->second.fProc;
-        fProcMap.erase( it );
-        return procToRelease;
-    }
-
-    void ProcessorToolbox::ClearProcessors()
-    {
-        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
-        {
-            delete it->second.fProc;
-        }*/ //not required for smart pointers
-        fProcMap.clear();
-        fRunQueue.clear();
-        return;
-    }
-
-
-    bool ProcessorToolbox::MakeConnection( const std::string& signal, const std::string& slot, int order )
-    {
-        string signalProcName, signalName;
-        if( ! ParseSignalSlotName( signal, signalProcName, signalName ) )
-        {
-            LERROR( proclog, "Unable to parse signal name: <" << signal << ">" );
-            return false;
-        }
-
-        string slotProcName, slotName;
-        if( ! ParseSignalSlotName( slot, slotProcName, slotName ) )
-        {
-            LERROR( proclog, "Unable to parse slot name: <" << slot << ">" );
-            return false;
-        }
-
-        return MakeConnection( signalProcName, signalName, slotProcName, slotName, order );
-    }
-
-    bool ProcessorToolbox::MakeConnection( const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order )
-    {
-        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
-        if( signalProc == nullptr )
-        {
-            LERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
-            return false;
-        }
-
-        std::shared_ptr< Processor > slotProc = GetProcessor( slotProcName );
-        if( slotProc == nullptr )
-        {
-            LERROR( proclog, "Processor named <" << slotProcName << "> was not found!" );
-            return false;
-        }
-
-        try
-        {
-            if( order != std::numeric_limits< int >::min() )
-            {
-                signalProc->ConnectASlot( signalName, *slotProc.get(), slotName, order );
-            }
-            else
-            {
-                signalProc->ConnectASlot(signalName, *slotProc.get(), slotName);
-            }
-        }
-        catch( scarab::base_exception& e )
-        {
-            LERROR( proclog, "An error occurred while connecting signals and slots:\n"
-                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->Name() << ")" << '\n'
-                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->Name() << ")" << '\n' );
-            PrintException( e );
-            return false;
-        }
-
-        return true;
-    }
-
-    bool ProcessorToolbox::SetBreakpoint( const std::string& signal )
-    {
-        string signalProcName, signalName;
-        if(! ParseSignalSlotName( signal, signalProcName, signalName ) )
-        {
-            LERROR(proclog, "Unable to parse signal name: <" << signal << ">");
-            return false;
-        }
-
-        return SetBreakpoint( signalProcName, signalName );
-    }
-
-    bool ProcessorToolbox::SetBreakpoint( const std::string& signalProcName, const std::string& signalName )
-    {
-        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
-        if( signalProc == nullptr )
-        {
-            LERROR( proclog, "Processor named <" << signalProcName << "> was not found!" );
-            return false;
-        }
-
-        try
-        {
-            signalProc->SetDoBreakpoint( signalName, true );
-            return true;
-        }
-        catch( scarab::base_exception& e )
-        {
-            LERROR( proclog, "Unable to set breakpoint: " );
-            PrintException( e );
-            return false;
-        }
-    }
-
-    bool ProcessorToolbox::RemoveBreakpoint( const std::string& signal )
-    {
-        string signalProcName, signalName;
-        if( ! ParseSignalSlotName( signal, signalProcName, signalName ) )
-        {
-            LERROR( proclog, "Unable to parse signal name: <" << signal << ">" );
-            return false;
-        }
-
-        return RemoveBreakpoint( signalProcName, signalName );
-    }
-
-    bool ProcessorToolbox::RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName )
-    {
-        std::shared_ptr< Processor > signalProc = GetProcessor( signalProcName );
-        if( signalProc == nullptr )
-        {
-            LERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
-            return false;
-        }
-
-        try
-        {
-            signalProc->SetDoBreakpoint( signalName, false );
-            return true;
-        }
-        catch( scarab::base_exception& e )
-        {
-            LERROR( proclog, "Unable to set breakpoint: " );
-            PrintException( e );
-            return false;
-        }
-    }
-
-    bool ProcessorToolbox::ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
-    {
-        size_t sepPos = toParse.find_first_of( fSigSlotNameSep );
-        if( sepPos == string::npos )
-        {
-            LERROR( proclog, "Unable to find separator between processor and signal/slot name in <" << toParse << ">" );
-            return false;
-        }
-        nameOfProc = toParse.substr( 0, sepPos );
-        nameOfSigSlot = toParse.substr( sepPos + 1 );
-        return true;
-    }
-
-
-    bool ProcessorToolbox::PushBackToRunQueue( const std::string& name )
-    {
-        ThreadSourceGroup threadGroup;
-
-        if( ! AddProcessorToThreadGroup( name, threadGroup ) )
-        {
-            LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
-            return false;
-        }
-
-        fRunQueue.push_back( threadGroup );
-
-        LINFO( proclog, "Added processor <" << name << "> to the run queue" );
-        return true;
-    }
-
-    bool ProcessorToolbox::PushBackToRunQueue( std::initializer_list< std::string > names )
-    {
-        return PushBackToRunQueue( std::vector< std::string >(names) );
-    }
-
-    bool ProcessorToolbox::PushBackToRunQueue( std::vector< std::string > names )
-    {
-        ThreadSourceGroup threadGroup;
-
-        std::stringstream toPrint;
-        for( const std::string& name : names )
-        {
-            if(! AddProcessorToThreadGroup( name, threadGroup ) )
-            {
-                LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
-                return false;
-            }
-            toPrint << name << ", "; // the extra comma at the end is removed below
-        }
-
-        fRunQueue.push_back( threadGroup );
-        std::string toPrintString = toPrint.str();
-        toPrintString.resize( toPrintString.size() - 2 );
-        LINFO( proclog, "Added processors <" << toPrintString << "> to the run queue" );
-        return true;
-    }
-
-    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
-    {
-        std::shared_ptr< Processor > procForRunQueue = GetProcessor( name );
-        LDEBUG( proclog, "Attempting to add processor <" << name << "> to the run queue" );
-        if( procForRunQueue == nullptr )
-        {
-            LERROR( proclog, "Unable to find processor <" << name << "> requested for the run queue" );
-            return false;
-        }
-
-        PrimaryProcessor* primaryProc = dynamic_cast< PrimaryProcessor* >( procForRunQueue.get() );
-        if( primaryProc == nullptr )
-        {
-            LERROR( proclog, "Processor <" << name << "> is not a primary processor." );
-            return false;
-        }
-        //group.insert(primaryProc);
-        group.insert( ThreadSource(primaryProc, name) );
-        return true;
-    }
-
-    void ProcessorToolbox::AsyncRun()
-    {
-        if( fDoRunThread.joinable() )
-        {
-            LERROR( proclog, "It appears that a run has already been started" );
-            return;
-        }
-
-        StartMultiThreadedRun();
-
-        return;
-    }
-
-    void ProcessorToolbox::StartMultiThreadedRun()
-    {
-        auto multiThreadRun = [&]()
-        {
-            try
-            {
-                LPROG( proclog, "Starting multi-threaded processing" );
-
-                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-                {
-                    SharedControl* control = SharedControl::get_instance();
-
-                    typedef std::pair< PrimaryProcessor*, std::thread > ThreadBundle;
-                    std::map< std::string, ThreadBundle > threads;
-
-                    // iterate over primary processors in this group and launch threads
-                    for (ThreadSourceGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                    {
-                        std::string procName( tgIter->fName );
-                        LINFO( proclog, "Starting processor <" << procName << ">" );
-
-                        threads.emplace( procName, ThreadBundle( tgIter->fProc, std::thread(&PrimaryProcessor::operator(), tgIter->fProc) ) );
-
-                        control->IncrementActiveThreads();
-                    }// end for loop over the thread group
-
-                    // wait here while things are still running
-                    bool stillRunning = true;
-                    while( stillRunning )
-                    {
-                        bool breakOrCanceled = control->WaitForBreakOrCanceled();
-                        if( breakOrCanceled )
-                        {
-                            // then at a breakpoint
-                            stillRunning = true;
-                            LDEBUG( proclog, "At a breakpoint" );
-                            // TODO: do we need to do anything while at a breakpoint?
-                            if( ! control->WaitToContinue() )
-                            {
-                                stillRunning = false;
-                                LDEBUG( proclog, "Detected cancelation while waiting at breakpoint" );
-                            }
-                        }
-                        else
-                        {
-                            // then canceled
-                            stillRunning = false;
-                            LDEBUG( proclog, "Detected cancelation while waiting during running" );
-                        }
-                    }
-
-                    // join threads and check for exceptions
-                    // break out of the run-queue iteration loop if there was an exception
-                    bool quitAfterThis = control->IsCanceled();
-                    for( auto threadIt = threads.begin(); threadIt != threads.end(); ++threadIt )
-                    {
-                        LINFO( proclog, "Cleaning up thread for processor <" << threadIt->first << ">" )
-                        LDEBUG( proclog, "Joining thread" );
-                        threadIt->second.second.join();
-                        if( threadIt->second.first->ExceptionPtr() )
-                        {
-                            try
-                            {
-                                std::rethrow_exception( threadIt->second.first->ExceptionPtr() );
-                            }
-                            catch( const QuitThread& e )
-                            {
-                                // not necessarily an error, so don't set quitAfterThis to true
-                                LINFO( proclog, "Thread exited with QuitThread" );
-                            }
-                            catch( const scarab::base_exception& e )
-                            {
-                                // this is an error, so set quitAfterThis to true
-                                LERROR( proclog, "Thread exited with an exception" );
-                                PrintException( e );
-                                quitAfterThis = true;
-                            }
-                        }
-                        else
-                        {
-                            // this thread did not have an exeption set, so it exited normally
-                            LINFO( proclog, "Thread exited normally" )
-                        }
-                    }
-
-                    if( quitAfterThis )
-                    {
-                        LWARN( proclog, "Exiting from run-queue loop under abnormal conditions" );
-                        break;
-                    }
-
-                } // end for loop over the run-queue
-
-                LPROG( proclog, "Processing is complete" );
-            }
-            catch( scarab::base_exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught scarab::base_exception thrown in a processor or in the multi-threaded run function" );
-                LERROR( proclog, "Diagnostic Information:\n" );
-                PrintException( e );
-                SharedControl::get_instance()->Cancel();
-                return;
-            }
-            catch( std::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                LERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                SharedControl::get_instance()->Cancel();
-                //LWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                //fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            return;
-        }; // end multi-threaded run lambda
-
-        fDoRunThread = std::thread( multiThreadRun );
-        return;
-    }
-
-
-    bool ProcessorToolbox::WaitForBreakOrCanceled()
-    {
-        return SharedControl::get_instance()->WaitForBreakOrCanceled();
-    }
-
-    bool ProcessorToolbox::WaitToContinue()
-    {
-        return SharedControl::get_instance()->WaitToContinue();
-    }
-
-    void ProcessorToolbox::WaitForEndOfRun()
-    {
-        LDEBUG( proclog, "Waiting for end-of-run" );
-        while( WaitForBreakOrCanceled() )
-        {
-            LDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            WaitToContinue();
-            LDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
-        }
-        LDEBUG( proclog, "End-of-run reached" );
-
-        return;
-    }
-
-    void ProcessorToolbox::Continue()
-    {
-        SharedControl::get_instance()->Resume();
-        return;
-    }
-
-   void ProcessorToolbox::JoinRunThread()
-   {
-       fDoRunThread.join();
-       return;
-   }
-
-    void ProcessorToolbox::CancelThreads()
-    {
-        SharedControl::get_instance()->Cancel();
-        return;
-    }
-
-    bool ProcessorToolbox::Run()
-    {
-        // can throw scarab::base_exception
-
-        AsyncRun();
-
-        WaitForEndOfRun();
-
-        JoinRunThread();
-
-        return true;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library/Processor/ProcessorToolbox.hh b/cpp/Cpp/Library/Processor/ProcessorToolbox.hh
deleted file mode 100644
index 81372b5..0000000
--- a/cpp/Cpp/Library/Processor/ProcessorToolbox.hh
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
- @file ProcessorToolbox.hh
- @brief Contains ProcessorToolbox
- @details Manages processors requested by the user at run time.
- @author: N. S. Oblath
- @date: Sep 27, 2012
- */
-
-#ifndef NYMPH_PROCESSORTOOLBOX_HH_
-#define NYMPH_PROCESSORTOOLBOX_HH_
-
-#include "ControlAccess.hh"
-#include "MemberVariable.hh"
-//#include "KTThreadReference.hh"
-
-#include "factory.hh"
-#include "param.hh"
-
-//#define BOOST_THREAD_PROVIDES_FUTURE
-//#include <boost/thread/future.hpp>
-//#include <boost/thread/mutex.hpp>
-//#include <boost/thread/thread.hpp>
-
-//#include <boost/iterator/iterator_adaptor.hpp>
-//#include <boost/type_traits/is_convertible.hpp>
-//#include <boost/utility/enable_if.hpp>
-
-#include <deque>
-#include <initializer_list>
-#include <limits>
-#include <set>
-#include <memory>
-#include <thread>
-
-
-namespace Nymph
-{
-    class PrimaryProcessor;
-    class Processor;
-
-    /*!
-     @class ProcessorToolbox
-     @author N. S. Oblath
-
-     @brief Manages processors requested by the user at run time.
-
-     @details
-     ProcessorToolbox allows the user to setup an application at runtime.
-
-     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
-     the program via a configuration file.
-
-     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
-
-     The following order should be used for configuring the processor toolbox:
-     <ol>
-         <li>Create processors</li>
-         <li>Connect signals and slots</li>
-         <li>Create the run queue</li>
-     </ol>
-
-     Available (nested) configuration values:
-     <ul>
-         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
-         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
-             <ul>
-                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
-                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
-             </ul>
-         </li>
-         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
-             <ul>
-                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
-                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
-                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
-             </ul>
-         </li>
-         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
-         The elements of this array specify processors that are run sequentially.
-         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
-             <ul>
-                 <li>processor name -- add a processor to the run queue, or </li>
-                 <li>array of processor names -- add a group of processors to the run queue.</li>
-             </ul>
-             In single-threaded mode, all processors will be run sequentially, in the order specified.
-         </li>
-     </ul>
-    */
-    class ProcessorToolbox
-    {
-        protected:
-            typedef std::unique_lock< std::mutex > unique_lock;
-
-        public:
-            ProcessorToolbox( const std::string& name = "processor-toolbox" );
-            virtual ~ProcessorToolbox();
-
-        protected:
-            scarab::factory< Processor, const std::string& >* fProcFactory; // singleton; not owned by ProcessorToolbox
-
-
-        public:
-            /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
-            void Configure( const scarab::param_node& node );
-
-            /// Configure processors (only those specified in the toolbox)
-            bool ConfigureProcessors( const scarab::param_node& node );
-
-            MEMVAR( bool, RunSingleThreaded );
-
-        protected:
-            struct ProcessorInfo
-            {
-                std::shared_ptr< Processor > fProc;
-            };
-            typedef std::map< std::string, ProcessorInfo > ProcessorMap;
-            typedef ProcessorMap::iterator ProcMapIt;
-            typedef ProcessorMap::const_iterator ProcMapCIt;
-            typedef ProcessorMap::value_type ProcMapValue;
-
-        public:
-            /// Get a pointer to a processor in the toolbox
-            std::shared_ptr< Processor > GetProcessor( const std::string& procName );
-            /// Get a pointer to a processor in the toolbox
-            const std::shared_ptr< Processor > GetProcessor( const std::string& procName ) const;
-
-            /// Add a processor to the toolbox
-            /// Toolbox takes ownership of the processor
-            bool AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc );
-            bool AddProcessor( const std::string& procType, const std::string& procName );
-
-            /// Remove a processor from the toolbox
-            bool RemoveProcessor( const std::string& procName );
-
-            /// Remove a processor from the toolbox and return it to the user
-            /// Ownership is passed to the user
-            std::shared_ptr< Processor > ReleaseProcessor( const std::string& procName );
-
-            /// Remove all processors from the toolbox
-            /// Also clears the run queue
-            void ClearProcessors();
-
-        protected:
-            ProcessorMap fProcMap;
-
-
-        public:
-            // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
-
-            /// Make a connection between the signal from one processor and the slot from another processor
-            /// Both processors should already have been added to the Toolbox
-            /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
-            bool MakeConnection(const std::string& signal, const std::string& slot, int order);
-            bool MakeConnection(const std::string& signal, const std::string& slot);
-
-            /// Make a connection between the signal from one processor and the slot from another processor
-            /// Both processors should already have been added to the Toolbox
-            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
-            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName);
-
-            /// Set a breakpoint on a signal
-            /// Slot string should be formatted as: [processor name]:[signal name]
-            bool SetBreakpoint( const std::string& signal );
-            /// Set a breakpoint on a signal
-            bool SetBreakpoint( const std::string& signalProcName, const std::string& signalName );
-
-            /// Remove a breakpoint from a signal
-            /// Slot string should be formatted as: [processor name]:[signal name]
-            bool RemoveBreakpoint( const std::string& signal );
-            /// Remove a breakpoint from a signal
-            bool RemoveBreakpoint( const std::string& signalProcName, const std::string& signalName );
-
-        protected:
-            bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
-            static const char fSigSlotNameSep = ':';
-
-
-        public:
-            /// Push a single processor to the back of the run queue
-            bool PushBackToRunQueue( const std::string& name );
-
-            /// Push a set of processors to be run in parallel to the back of the run queue
-            bool PushBackToRunQueue( std::initializer_list< std::string > names );
-            /// Push a set of processors to be run in parallel to the back of the run queue
-            bool PushBackToRunQueue( std::vector< std::string > names );
-
-            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
-            void PopBackOfRunQueue();
-
-            /// Clear the run queue
-            void ClearRunQueue();
-
-        protected:
-            struct ThreadSource
-            {
-                PrimaryProcessor* fProc;
-                std::string fName;
-                //ControlAccessPtr fControlAccess;
-                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
-                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
-                {}
-            };
-            struct CompareThreadSource
-            {
-                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
-                {
-                    return lhs.fProc < rhs.fProc;
-                }
-            };
-            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroup;
-            typedef std::deque< ThreadSourceGroup > RunQueue;
-            RunQueue fRunQueue;
-
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group );
-
-
-        public:
-            /// Process the run queue.
-            /// This will call Run() on all of the processors in the queue.
-            bool Run();
-
-            void AsyncRun();
-
-            bool WaitToContinue();
-
-            /// Returns when processing is completed or a breakpoint is reached
-            /// Throws a boost::exception if there's an error with the future object in use
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            bool WaitForBreakOrCanceled();
-
-            void WaitForEndOfRun();
-
-            void Continue();
-
-            void CancelThreads();
-
-            void JoinRunThread();
-
-            // TODO: return value access
-
-        protected:
-            void StartMultiThreadedRun();
-
-            std::thread fDoRunThread;
-
-    };
-
-    inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
-    {
-        return MakeConnection(signal, slot, std::numeric_limits< int >::min());
-    }
-
-    inline bool ProcessorToolbox::MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName)
-    {
-        return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min()); 
-    }
-
-    inline void ProcessorToolbox::PopBackOfRunQueue()
-    {
-        fRunQueue.pop_back();
-        return;
-    }
-
-    inline void ProcessorToolbox::ClearRunQueue()
-    {
-        fRunQueue.clear();
-        return;
-    }
-
-} /* namespace Nymph */
-#endif /* NYMPH_PROCESSORTOOLBOX_HH_ */
diff --git a/cpp/Cpp/Library/Processor/QuitThread.hh b/cpp/Cpp/Library/Processor/QuitThread.hh
deleted file mode 100644
index 10597ff..0000000
--- a/cpp/Cpp/Library/Processor/QuitThread.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * QuitThread.hh
- *
- *  Created on: Oct 22, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_QUITTHREAD_HH_
-#define NYMPH_QUITTHREAD_HH_
-
-#include <string>
-
-namespace Nymph
-{
-    class QuitThread : public scarab::typed_exception< QuitThread >
-    {
-        public:
-            using scarab::typed_exception< QuitThread >::typed_exception;
-            ~QuitThread() = default;
-    };
-
-    #define QUIT_THREAD  throw ::Nymph::QuitThread()(__FILE__, __LINE__)
-    //THROW_EXCEPT_HERE( ::Nymph::QuitThread() )
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_QUITTHREAD_HH_ */
diff --git a/cpp/Cpp/Library/Processor/ReturnBuffer.cc b/cpp/Cpp/Library/Processor/ReturnBuffer.cc
deleted file mode 100644
index 7e0bf57..0000000
--- a/cpp/Cpp/Library/Processor/ReturnBuffer.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * ReturnBuffer.cc
- *
- *  Created on: Oct 22, 2019
- *      Author: N.S. Oblath
- */
-
-#include "ReturnBuffer.hh"
-
-namespace Nymph
-{
-    
-    ReturnBufferBase::ReturnBufferBase()
-    {}
-
-    ReturnBufferBase::~ReturnBufferBase()
-    {}
-
-}
diff --git a/cpp/Cpp/Library/Processor/ReturnBuffer.hh b/cpp/Cpp/Library/Processor/ReturnBuffer.hh
deleted file mode 100644
index c29a146..0000000
--- a/cpp/Cpp/Library/Processor/ReturnBuffer.hh
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * ReturnBuffer.hh
- *
- *  Created on: Oct 22, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_RETURNBUFFER_HH_
-#define NYMPH_RETURNBUFFER_HH_
-
-#include <tuple>
-
-namespace Nymph
-{
-
-    class ReturnBufferBase
-    {
-        public:
-            ReturnBufferBase();
-            virtual ~ReturnBufferBase();
-    };
-
-    template< typename... Args >
-    struct ReturnBuffer : ReturnBufferBase
-    {
-        public:
-            ReturnBuffer() :
-                    fReturn( nullptr )
-            {}
-
-            ReturnBuffer( Args&... retval ) :
-                    fReturn( new std::tuple< Args&... >( retval... ) )
-            {}
-
-            virtual ~ReturnBuffer()
-            {}
-
-            std::tuple< Args&... >& GetReturn()
-            {
-                if( fReturn == nullptr ) throw std::exception();
-                return *fReturn;
-            }
-
-        protected:
-            std::tuple< Args&... >* fReturn;
-    };
-
-    template<>
-    struct ReturnBuffer< void > : ReturnBufferBase
-    {
-        ReturnBuffer() :
-                ReturnBufferBase()
-        {}
-
-        void GetReturn()
-        {
-            return;
-        }
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_RETURNBUFFER_HH_ */
diff --git a/cpp/Cpp/Library/Processor/Signal.hh b/cpp/Cpp/Library/Processor/Signal.hh
deleted file mode 100644
index e278f81..0000000
--- a/cpp/Cpp/Library/Processor/Signal.hh
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Signal.hh
- *
- *  Created on: Jan 15, 2013
- *      Author: N.S. Oblath
- * 
- *  Based on this implementation: https://schneegans.github.io/tutorials/2015/09/20/signal-slot
- */
-
-#ifndef NYMPH_SIGNAL_HH_
-#define NYMPH_SIGNAL_HH_
-
-#include "SignalSlotBase.hh"
-
-#include "ControlAccess.hh"
-#include "QuitThread.hh"
-
-#include "logger.hh"
-
-
-namespace Nymph
-{
-    LOGGER( signallog, "Signal" );
-
-    template< typename... XArgs >
-    class Slot;
-
-    /// A Signal object may call multiple slots with the
-    /// same signature. You can connect functions to the Signal
-    /// that will be called when the emit() method on the
-    /// Signal object is invoked. Any argument passed to emit()
-    /// will be passed to the given functions.
-    template< typename... XArgs >
-    class Signal : public SignalBase
-    {
-        public:
-            using signature = void( XArgs... );
-//            using full_signature = void( ControlAccessPtr, XArgs... );
-
-        public:
-            /// Unowned signal
-            Signal( const std::string& name );
-            /// Owned signal
-            template< typename XOwner >
-            Signal( const std::string& name, XOwner* owner );
-            Signal( const Signal& ) = delete;
-            Signal( Signal&& ) = delete;
-            virtual ~Signal();
-
-            virtual void Connect( SlotBase* slot, int group = -1 );
-
-            // calls all connected functions
-            void Emit( XArgs... args );
-            void operator()( XArgs... args );
-
-            // TODO: remove this  // 12/8/21, NSO: why remove this?  // NSO: oh, because we no longer need to pass ControlAccess between signals and slots before they're used
-            //MEMVAR_SHARED_PTR( ControlAccess, ControlAcc );
-    };
-
-
-    /*!
-     @class Signal
-     @author N. S. Oblath
-
-     @brief Creates a signal that takes 0 or more arguments.
-
-     @details
-     The signal is emitted by calling operator().
-     If a Slot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
-
-     Usage:
-     In your Processor's header add a member variable of type Signal< ArgumentTypes >.
-
-     Initialize the signal with the processor's 'this' pointer and the name of the signal.
-
-     To use the signal, call it as: fSignalObject(arg);
-    *//*
-    template< class... XSignalArguments >
-    class Signal
-    {
-        public:
-            typedef void (signature)( XSignalArguments... );
-            typedef boost::signals2::signal< signature > boost_signal;
-            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
-
-        public:
-            Signal();
-            Signal( const std::string& name, Processor* proc );
-            virtual ~Signal();
-
-        protected:
-            Signal( const Signal& );
-
-        public:
-            void operator()( XSignalArguments... args );
-
-            boost_signal* Signal();
-
-            const std::string& GetName() const;
-
-        protected:
-            boost_signal fSignal;
-
-            std::string fName;
-    };
-*/
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    template< typename... XArgs >
-    Signal< XArgs... >::Signal( const std::string& name ) :
-            SignalBase( name )
-    {}
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
-            SignalBase( name )
-    {
-        owner->RegisterSignal( name, this );
-    }
-
-    template< typename... XArgs >
-    Signal< XArgs... >::~Signal()
-    {
-        DisconnectAll();
-    }
-
-    template< typename... XArgs >
-    void Signal< XArgs... >::Connect( SlotBase* slot, int group )
-    {
-        if( fConnections.count( slot ) != 0 )
-        {
-            LWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
-            return;
-        }
-
-        // ensure that the slot is of the correct type
-        if( ! dynamic_cast< Slot< XArgs... >* >( slot ) )
-        {
-            THROW_EXCEPT_HERE( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
-                    "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
-                    "\tArgument types do not match" );
-
-            //BOOST_THROW_EXCEPTION( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
-            //        "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
-            //        "\tArgument types do not match" << eom );
-        }
-/*
-        Connection connection;
-        if( group >= 0 )
-        {
-            connection = fInternalSignal.connect( group, derivedSlot->Function() );
-        }
-        else
-        {
-            connection = fInternalSignal.connect( derivedSlot->Function() );
-        }
-*/
-        AddConnection( slot, group );
-
-        return;
-    }
-
-    // calls all connected functions
-    template< typename... XArgs >
-    inline void Signal< XArgs... >::Emit( XArgs... args )
-    {
-        (*this)( args... );
-        return;
-    }
-
-    template< typename... XArgs >
-    inline void Signal< XArgs... >::operator()( XArgs... args )
-    {
-        SharedControl* control = SharedControl::get_instance();
-
-        // Check for whether we need to quit from external input:
-        // - if we're canceled, then quit the thread
-        // - if we're at a break, then wait to continue;
-        //     once we continue, if we need to quit, then do so
-        if( control->IsCanceled() || (control->IsAtBreak() && ! control->WaitToContinue()) )
-        {
-            QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
-        }
-
-        // Check for whether this signal emission has a breakpoint
-        if( fDoBreakpoint )
-        {
-            // do the break
-            control->Break( args... );
-            // wait to continue; once we continue, if we need to quit, then do so
-            if( ! control->WaitToContinue() )
-            {
-                QUIT_THREAD; // throws QuitThread; should be caught by PrimaryProcessor::operator()
-            }
-        }
-
-        // Emit signal by calling all connected slots
-        for( auto connection : fConnections )
-        {
-//            static_cast< Slot< XArgs... >* >(connection)->operator()( fControlAcc, args... );
-            static_cast< Slot< XArgs... >* >(connection)->operator()( args... );
-        }
-        return;
-    }
-
-/*
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::Signal( const std::string& name, Processor* proc ) :
-            fSignal(),
-            fName( name )
-    {
-        proc->RegisterSignal(name, &fSignal);
-    }
-
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::Signal() :
-            fSignal(),
-            fName("none")
-    {}
-
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::Signal( const Signal& signal ) :
-            fSignal(),
-            fName( signal.fName )
-    {}
-
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::~Signal()
-    {
-    }
-
-    template< class... XSignalArguments >
-    inline void Signal< XSignalArguments... >::operator()( XSignalArguments... args )
-    {
-        fSignal( args... );
-    }
-
-    template< class... XSignalArguments >
-    inline typename Signal< XSignalArguments... >::boost_signal* Signal< XSignalArguments... >::Signal()
-    {
-        return &fSignal;
-    }
-
-    template< class... XSignalArguments >
-    inline const std::string& Signal< XSignalArguments... >::GetName() const
-    {
-        return fName;
-    }
-*/
-} /* namespace Nymph */
-
-#endif /* NYMPH_SIGNAL_HH_ */
diff --git a/cpp/Cpp/Library/Processor/SignalSlotBase.cc b/cpp/Cpp/Library/Processor/SignalSlotBase.cc
deleted file mode 100644
index ec234ce..0000000
--- a/cpp/Cpp/Library/Processor/SignalSlotBase.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * SignalSlotBase.cc
- *
- *  Created on: Sept 7, 2019
- *      Author: N.S. Oblath
- */
-
-#include "SignalSlotBase.hh"
-
-namespace Nymph
-{
-    SlotBase::SlotBase( const std::string& name ) :
-            fName( name ),
-            fConnections()//,
-            //fSignalsUsed()
-    {}
-
-    SlotBase::~SlotBase()
-    {}
-
-    void SlotBase::DisconnectAll()
-    {
-        while( ! fConnections.empty() )
-        {
-            Disconnect( *fConnections.begin() );
-        }
-        return;
-    }
-
-    SignalBase::SignalBase( const std::string& name ) :
-            fName( name ),
-            fConnections(),
-            //fControl( nullptr ),
-            fDoBreakpoint( false )
-    {}
-
-    SignalBase::~SignalBase()
-    {}
-
-    // disconnects all previously connected functions
-    void SignalBase::DisconnectAll()
-    {
-        while( ! fConnections.empty() )
-        {
-            Disconnect( *fConnections.begin() );
-        }
-        return;
-    }
-
-
-}
-
diff --git a/cpp/Cpp/Library/Processor/SignalSlotBase.hh b/cpp/Cpp/Library/Processor/SignalSlotBase.hh
deleted file mode 100644
index 1029317..0000000
--- a/cpp/Cpp/Library/Processor/SignalSlotBase.hh
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * SignalSlotBase.hh
- *
- *  Created on: Feb 25, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_SIGNALSLOTBASE_HH_
-#define NYMPH_SIGNALSLOTBASE_HH_
-
-//#include "ControlAccess.hh"
-#include "Exception.hh"
-#include "MemberVariable.hh"
-
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-namespace Nymph
-{
-
-    class SignalException : public scarab::typed_exception< SignalException >
-    {
-        public:
-            using scarab::typed_exception< SignalException >::typed_exception;
-            ~SignalException() = default;
-    };
-
-    class SlotException : public scarab::typed_exception< SlotException >
-    {
-        public:
-            using scarab::typed_exception< SlotException >::typed_exception;
-            ~SlotException() = default;
-    };
-
-    class ConnectionException : public scarab::typed_exception< ConnectionException >
-    {
-        public:
-            using scarab::typed_exception< ConnectionException >::typed_exception;
-            ~ConnectionException() = default;
-    };
-
-
-    class SignalBase;
-
-    class SlotBase
-    {
-        public:
-            SlotBase( const std::string& name );
-            //template< typename XOwner >
-            //SlotBase( const std::string& name, XOwner* owner );
-            virtual ~SlotBase();
-
-            virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
-
-            void Disconnect( SignalBase* signal);
-            void DisconnectAll();
-
-            MEMVAR_REF( std::string, Name );
-
-            typedef std::set< SignalBase* > SignalConnections; // to get around the problem of having a comma inside a macro function argument
-            MEMVAR_REF_MUTABLE( SignalConnections, Connections );
-
-            //MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
-
-        protected:
-            friend class SignalBase;
-            virtual void AddConnection( SignalBase* signal );
-    };
-
-
-    class SignalBase
-    {
-        public:
-            SignalBase( const std::string& name );
-            //template< typename XOwner >
-            //SignalBase( const std::string& name, XOwner* owner );
-            virtual ~SignalBase();
-
-            virtual void Connect( SlotBase* slot, int group = -1 ) = 0;
-
-            void Disconnect( SlotBase* slot );
-            void DisconnectAll();
-
-            MEMVAR_REF( std::string, Name );
-
-            typedef std::set< SlotBase* > SlotConnections; // to get around the problem of having a comma inside a macro function argument
-            MEMVAR_REF_MUTABLE_CONST( SlotConnections, Connections );
-
-            //MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
-
-            MEMVAR( bool, DoBreakpoint );
-
-        protected:
-            friend class SlotBase;
-            virtual void AddConnection( SlotBase* slot, int group );
-    };
-
-    inline void SlotBase::AddConnection( SignalBase* signal )
-    {
-        fConnections.insert( signal );
-        return;
-    }
-
-    inline void SlotBase::Disconnect( SignalBase* signal )
-    {
-        signal->Disconnect( this );
-        return;
-    }
-
-    inline void SignalBase::AddConnection( SlotBase* slot, int group )
-    {
-        fConnections.insert( slot );
-        slot->AddConnection( this );
-        return;
-    }
-
-    // disconnects a previously connected function
-    inline void SignalBase::Disconnect( SlotBase* slot )
-    {
-        slot->fConnections.erase( this );
-        fConnections.erase( slot );
-        return;
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_SIGNALSLOTBASE_HH_ */
diff --git a/cpp/Cpp/Library/Processor/Slot.hh b/cpp/Cpp/Library/Processor/Slot.hh
deleted file mode 100644
index 1eb33a8..0000000
--- a/cpp/Cpp/Library/Processor/Slot.hh
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Slot.hh
- *
- *  Created on: Jan 13, 2013
- *      Author: N.S. Oblath
- * 
- *  Based on this implementation: https://schneegans.github.io/tutorials/2015/09/20/signal-slot
- */
-
-#ifndef NYMPH_SLOT_HH_
-#define NYMPH_SLOT_HH_
-
-#include "SignalSlotBase.hh"
-
-//#include "Exception.hh"
-
-#include "logger.hh"
-
-#include <boost/function.hpp>
-
-#include <initializer_list>
-
-namespace Nymph
-{
-    LOGGER(slotlog, "Slot");
-
-    // Type XOwner is the class that owns the Slot object
-    template< typename... XArgs >
-    class Slot : public SlotBase
-    {
-        public:
-            using signature = void( XArgs... );
-//            using full_signature = void( ControlAccessPtr, XArgs... );
-            using signal_list = std::initializer_list< std::string >;
-
-        public:
-            /// Unowned slot
-            Slot( const std::string& name, const boost::function< signature >& func );
-            /// Owned slot, non-const member function
-            template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
-            /// Owned slot, const member function
-            template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
-            /// Owned slot, generic function
-            template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
-            /// Owned slot, non-const member fuction of another class
-            template< typename XOwner, typename XFuncClass >
-            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
-            /// Owned slot, const member fuction of another class
-            template< typename XOwner, typename XFuncClass >
-            Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
-            Slot( const Slot& ) = delete;
-            Slot( Slot&& ) = delete;
-            virtual ~Slot();
-
-            void ConnectTo( SignalBase* signal, int group = -1 );
-
-            /// execute fFunction without using a ControlAccess object
-            void operator()( XArgs... args );
-
-            /// execute fFunction with a ControlAccess object
-//            void operator()( ControlAccessPtr access, XArgs... args );
-
-            MEMVAR_REF( boost::function< signature >, Function );
-
-            MEMVAR( bool, DoBreakpoint );
-
-        protected:
-//            void SlotFuncWrapper( ControlAccessPtr access, XArgs... args );
-            void SlotFuncWrapper( XArgs... args );
-    };
-
-
-    /*!
-     @class Slot
-     @author N. S. Oblath
-
-     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
-
-     @details
-     Usage:
-     To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
-     The function should have the signature void (Args).
-
-     In your Processor's header add a member variable of type Slot< ProcessorType, ReturnType, Args >.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-    *//*
-    template< typename... Args >
-    class Slot
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            Slot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            Slot( const std::string& name, Processor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
-
-            virtual ~Slot();
-
-            const std::string& GetName() const;
-
-            SlotWrapper* GetSlotWrapper();
-
-        protected:
-            std::string fName;
-            SlotWrapper* fSlotWrapper;
-    };
-*/
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    // Slot
-
-    template< typename... XArgs >
-    Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func ) :
-            SlotBase( name ),
-            fFunction( func ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
-            fDoBreakpoint( false )
-    {}
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
-            SlotBase( name ),
-            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
-            SlotBase( name ),
-            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
-            SlotBase( name ),
-            fFunction( func ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner, typename XFuncClass >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
-            SlotBase( name ),
-            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner, typename XFuncClass >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
-            SlotBase( name ),
-            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            //fThreadRef( std::make_shared< ThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    Slot< XArgs... >::~Slot()
-    {
-        DisconnectAll();
-    }
-
-    template< typename... XArgs >
-    void Slot< XArgs... >::ConnectTo( SignalBase* signal, int group )
-    {
-        if( fConnections.count( signal ) != 0 )
-        {
-            LWARN( signallog, "Slot <" << fName << "> is already has connection to signal <" << signal->Name() << ">" );
-            return;
-        }
-
-        signal->Connect( this, group );
-
-        return;
-    }
-
-    template< typename... XArgs >
-    inline void Slot< XArgs... >::operator()( XArgs... args )
-    {
-//        fFunction( args... );
-        SlotFuncWrapper( args... );
-        return;
-    }
-/*
-    template< typename... XArgs >
-    inline void Slot< XArgs... >::operator()( ControlAccessPtr access, XArgs... args )
-    {
-        SlotFuncWrapper( access, args... );
-        return;
-    }
-*/
-    template< typename... XArgs >
-    inline void Slot< XArgs... >::SlotFuncWrapper( /*ControlAccessPtr access,*/ XArgs... args )
-    {
-        //TODO could do something with `access` here
-        //NOTE (12/9/21): instead of using `access`, get SharedControl and use that
-        //for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
-        //{
-        //    (*signalIt)->SetControl( access );
-        //}
-
-        fFunction( args... );
-
-        //TODO could do more with `access` here
-
-        return;
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_SLOT_HH_ */
diff --git a/cpp/Cpp/Library/Utility/Exception.cc b/cpp/Cpp/Library/Utility/Exception.cc
deleted file mode 100644
index 707d749..0000000
--- a/cpp/Cpp/Library/Utility/Exception.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Exception.cc
- *
- *  Created on: Feb 25, 2014
- *      Author: nsoblath
- */
-
-#include "Exception.hh"
-
-#include "logger.hh"
-
-LOGGER( exlog, "Exception" );
-
-namespace Nymph
-{
-    void PrintException( const scarab::base_exception& e, unsigned count )
-    {
-        std::string prefix = std::to_string(count) + ": ";
-        LINFO( exlog, prefix << "Thrown at: " << e.where() );
-        LINFO( exlog, prefix << e.what() );
-        try
-        {
-            std::rethrow_if_nested( e );
-        }
-        catch(const Nymph::Exception& e)
-        {
-            PrintException( e, ++count );
-        }
-        return;
-    }
-
-/*
-    BaseException::BaseException() :
-            std::exception(),
-            fAtFilename( "unknown" ),
-            fAtLineNumber( 0 ),
-            fBuffer()
-    {}
-
-    BaseException::~BaseException() noexcept
-    {}
-
-    const char* BaseException::where() const noexcept
-    {
-        try
-        {
-            fBuffer = fAtFilename + "(" + std::to_string(fAtLineNumber) + ")";
-        }
-        catch(const std::bad_alloc& e)
-        {
-            fBuffer = fAtFilename;
-        }
-        return fBuffer.c_str();
-    }
-*/
-/* removed for trying home-grown exceptions, 1/10/22
-    Exception::Exception() :
-            boost::exception(),
-            std::exception(),
-            fMsgBuffer()
-    {
-    }
-    Exception::Exception( const Exception& an_exception ) :
-            boost::exception( an_exception ),
-            std::exception( an_exception ),
-            fMsgBuffer( an_exception.fMsgBuffer )
-    {
-    }
-
-    Exception::~Exception() throw ()
-    {
-    }
-*/
-}
diff --git a/cpp/Cpp/Library/Utility/Exception.hh b/cpp/Cpp/Library/Utility/Exception.hh
deleted file mode 100644
index 479241a..0000000
--- a/cpp/Cpp/Library/Utility/Exception.hh
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Exception.hh
- *
- *  Created on: Feb 25, 2014
- *      Author: nsoblath
- */
-
-
-#ifndef NYMPH_EXCEPTION_HH_
-#define NYMPH_EXCEPTION_HH_
-
-#include "base_exception.hh"
-
-//#include <boost/exception/all.hpp>
-
-//#include <exception>
-//#include <sstream>
-//#include <string>
-
-namespace Nymph
-{
-    /*
-    class BaseException : virtual public std::exception
-    {
-        public:
-            BaseException();
-            ~BaseException() noexcept;
-
-            MEMVAR_REF( std::string, AtFilename );
-            MEMVAR( int, AtLineNumber );
-
-            virtual const char* where() const noexcept;
-
-        private:
-            mutable std::string fBuffer;
-    };
-
-    template< typename XDerived >
-    class TypedException : virtual public scarab::base_exception< XDerived >, public BaseException
-    {
-        public:
-            TypedException();
-            TypedException( const std::string& filename, int lineNum );
-            ~TypedException() noexcept;
-
-            XDerived& operator()( const std::string& filename, int lineNum );
-
-    };
-    */
-
-    class Exception : public scarab::typed_exception< Exception >
-    {
-        public:
-            using scarab::typed_exception< Exception >::typed_exception;
-            virtual ~Exception() noexcept = default;
-    };
-
-#define CREATE_EXCEPT_HERE( anException )  anException( __FILE__, __LINE__ )
-#define EXCEPT_HERE( anException )  (anException)( __FILE__, __LINE__ )
-
-#define THROW_EXCEPT_HERE( anException ) throw EXCEPT_HERE( anException )
-#define THROW_NESTED_EXCEPT_HERE( anException ) std::throw_with_nested( EXCEPT_HERE( anException ) )
-
-/// Recursive print function for potentially-nested exceptions
-void PrintException( const scarab::base_exception& e, unsigned count = 0 );
-
-/*
-    template< typename XDerived >
-    TypedException< XDerived >::TypedException() :
-            scarab::base_exception< XDerived >(),
-            BaseException()
-    {}
-
-    template< typename XDerived >
-    TypedException< XDerived >::TypedException( const std::string& filename, int lineNumber ) :
-            scarab::base_exception< XDerived >(),
-            BaseException()
-    {
-        fAtFilename = filename;
-        fAtLineNumber = lineNumber;
-    }
-
-    template< typename XDerived >
-    TypedException< XDerived >::~TypedException() noexcept
-    {}
-
-    template< typename XDerived >
-    XDerived& TypedException< XDerived >::operator()( const std::string& filename, int lineNumber )
-    {
-        fAtFilename = filename;
-        fAtLineNumber = lineNumber;
-        return *static_cast< XDerived* >(this);
-    }
-*/
-/* removed for trying home-grown exceptions, 1/10/22
-    struct MessageEnd {};
-    static const MessageEnd eom = MessageEnd();
-
-    //typedef boost::error_info<struct tag_errmsg, std::string> ErrorMsgInfo;
-
-    template< class XLabel >
-    using ErrorMsgInfo = boost::error_info< XLabel, std::string>;
-*/
-    /* // removed for trying home-grown exceptions, 1/10/22
-     @class Exception
-     @author N.S. Oblath
-
-     @brief Exception base class for Nymph and Nymph-based projects
-
-     @details
-
-     How to throw:
-
-     BOOST_THROW_EXCEPTION( Exception() << "[error message here]" << eom );
-
-     Why do it like this?
-      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
-      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
-      - Exception can be replaced with whatever derived exception class you're using.
-
-      How to catch, add information, and re-throw:
-
-      try
-      {
-          // code that throws a Exception
-      }
-      catch( boost::exception& e )
-      {
-          e << ErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
-          throw;
-      }
-
-
-      How to do the final catch
-
-      try
-      {
-          // code that throws a Exception
-      }
-      catch( boost::exception& e )
-      {
-          ERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
-      }
-    */
-/* removed for trying home-grown exceptions, 1/10/22
-    class Exception : virtual public boost::exception, virtual public std::exception
-    {
-        public:
-            Exception();
-            Exception( const Exception& );
-            ~Exception() throw ();
-
-            // adds to the message buffer
-            template< class XStreamable >
-            Exception& operator<<( XStreamable a_fragment );
-            // adds to the message buffer
-            Exception& operator<<( const std::string& a_fragment );
-            // adds to the message buffer
-            Exception& operator<<( const char* a_fragment );
-
-            // adds the current contents of the message buffer as a ErrorMsgInfo
-            Exception& operator<<( const MessageEnd& eom );
-
-        private:
-            mutable std::string fMsgBuffer;
-    };
-
-    template< class XStreamable >
-    Exception& Exception::operator<<( XStreamable a_fragment )
-    {
-        std::stringstream stream;
-        stream << a_fragment;
-        stream >> fMsgBuffer;
-        return *this;
-    }
-
-    inline Exception& Exception::operator<<( const std::string& a_fragment )
-    {
-        fMsgBuffer += a_fragment;
-        return *this;
-    }
-
-    inline Exception& Exception::operator<<( const char* a_fragment )
-    {
-        fMsgBuffer += std::string( a_fragment );
-        return *this;
-    }
-
-    inline Exception& Exception::operator<<( const MessageEnd& eom )
-    {
-        if( ! fMsgBuffer.empty() )
-        {
-            boost::operator<<( *this, ErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
-            fMsgBuffer.clear();
-        }
-        return *this;
-    }
-*/
-}
-
-#endif /* NYMPH_EXCEPTION_HH_ */
diff --git a/cpp/Cpp/Library/Utility/MemberVariable.hh b/cpp/Cpp/Library/Utility/MemberVariable.hh
deleted file mode 100644
index b48e3ef..0000000
--- a/cpp/Cpp/Library/Utility/MemberVariable.hh
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * MemberVariable.hh
- *
- *  Created on: Aug 5, 2014
- *      Author: nsoblath
- */
-
-#ifndef NYMPH_MEMBERVARIABLE_HH_
-#define NYMPH_MEMBERVARIABLE_HH_
-
-/**
- * Macros for class member variables
- *
- * In all cases remember to initialize the variables!
- *
- * For "normal" variables
- * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [type fMyVar]
- * The Set function is not available if the _NOSET macros are used
- *  - MEMVAR
- *  - MEMVAR_NOSET
- *  - MEMVAR_STATIC
- *  - MEMVAR_STATIC_NOSET
- *
- * For variables accessed by reference
- * Defines accessors [const type& MyVar() const], [type& MyVar()], and member variable [type fMyVar]
- * The non-const function is not available if the _CONST macros are used
- *  - MEMVAR_REF
- *  - MEMVAR_REF_CONST
- *  - MEMVAR_REF_STATIC
- *  - MEMVAR_REF_STATIC_CONST
- *
- * For pointer variables
- * Defines accessors [type* GetMyVar() const], [void SetMyVar( type* )], and member variable [type* fMyVar]
- * The Set function is not available if the _NOSET macros are used
- *  - MEMVAR_PTR
- *  - MEMVAR_PTR_NOSET
- *  - MEMVAR_PTR_STATIC
- *  - MEMVAR_PTR_STATIC_NOSET
- *
- * For shared_ptr's
- * Defines accessors [const std::shared_ptr< type > MyVar() const], [std::shared_ptr< type > MyVar()], and member variable [std::shared_ptr< type > fMyVar]
- * The non-const function is not available if the _CONST macros are used
- *  - MEMVAR_SHARED_PTR
- *  - MEMVAR_SHARED_PTR_CONST
- *  - MEMVAR_SHARED_PTR_STATIC
- *  - MEMVAR_SHARED_PTR_STATIC_CONST
- *
- * For atomic variables
- * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [std::atomic< type > fMyVar]
- * The Set function is not available if the _NOSET macros are used
- *  - MEMVAR_ATOMIC
- *  - MEMVAR_ATOMIC_NOSET
- *  - MEMVAR_ATOMIC_STATIC
- *  - MEMVAR_ATOMIC_STATIC_NOSET
- *
- */
-
-#include "_camel_case_member_variables.hh"
-
-#define MEMVAR                         camel_case_mv_accessible
-#define MEMVAR_NOSET                   camel_case_mv_accessible_noset
-#define MEMVAR_STATIC                  camel_case_mv_accessible_static
-#define MEMVAR_STATIC_NOSET            camel_case_mv_accessible_static_noset
-#define MEMVAR_MUTABLE                 camel_case_mv_accessible_mutable
-#define MEMVAR_MUTABLE_NOSET           camel_case_mv_accessible_mutable_noset
-
-#define MEMVAR_REF                     camel_case_mv_referrable
-#define MEMVAR_REF_CONST               camel_case_mv_referrable_const
-#define MEMVAR_REF_STATIC              camel_case_mv_referrable_static
-#define MEMVAR_REF_MUTABLE             camel_case_mv_referrable_mutable
-#define MEMVAR_REF_MUTABLE_CONST       camel_case_mv_referrable_mutable
-
-#define MEMVAR_PTR                     camel_case_mv_assignable
-#define MEMVAR_PTR_NOSET               camel_case_mv_assignable_noset
-#define MEMVAR_PTR_STATIC              camel_case_mv_assignable_static
-#define MEMVAR_PTR_STATIC_NOSET        camel_case_mv_assignable_static_noset
-#define MEMVAR_PTR_MUTABLE             camel_case_mv_assignable_mutable
-#define MEMVAR_PTR_MUTABLE_NOSET       camel_case_mv_assignable_mutable_noset
-
-#define MEMVAR_SHARED_PTR              camel_case_mv_shared_ptr
-#define MEMVAR_SHARED_PTR_CONST        camel_case_mv_shared_ptr_const
-#define MEMVAR_SHARED_PTR_STATIC       camel_case_mv_shared_ptr_static
-#define MEMVAR_SHARED_PTR_MUTABLE      camel_case_mv_shared_ptr_mutable
-#define MEMVAR_SHARED_PTR_MUTABLE_CONST camel_case_mv_shared_ptr_mutable
-
-#define MEMVAR_ATOMIC                  camel_case_mv_atomic
-#define MEMVAR_ATOMIC_NOSET            camel_case_mv_atomic_noset
-#define MEMVAR_ATOMIC_STATIC           camel_case_mv_atomic_static
-#define MEMVAR_ATOMIC_STATIC_NOSET     camel_case_mv_atomic_static_noset
-#define MEMVAR_ATOMIC_MUTABLE          camel_case_mv_atomic_mutable
-#define MEMVAR_ATOMIC_MUTABLE_NOSET    camel_case_mv_atomic_mutable_noset
-
-#endif /* NYMPH_MEMBERVARIABLE_HH_ */
diff --git a/cpp/Cpp/Library_v1/AddLibPythonPath.sh.in b/cpp/Cpp/Library_v1/AddLibPythonPath.sh.in
deleted file mode 100644
index 68aff4b..0000000
--- a/cpp/Cpp/Library_v1/AddLibPythonPath.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# Adds the lib install directory to the python path
-
-export PYTHONPATH=@LIB_INSTALL_DIR@:$PYTHONPATH
diff --git a/cpp/Cpp/Library_v1/Application/KTApplication.cc b/cpp/Cpp/Library_v1/Application/KTApplication.cc
deleted file mode 100644
index 4bc4e01..0000000
--- a/cpp/Cpp/Library_v1/Application/KTApplication.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * KTApplication.cc
- *
- *  Created on: Aug 5, 2012
- *      Author: nsoblath
- */
-
-#include "KTApplication.hh"
-
-#include "KTEventLoop.hh"
-#include "KTLogger.hh"
-
-#include "param_codec.hh"
-#include "param_json.hh"
-
-using std::set;
-using std::string;
-
-#include <iostream>
-
-namespace Nymph
-{
-    KTLOGGER(applog, "KTApplication");
-
-    KTApplication::KTApplication() :
-            KTConfigurable("app"),
-            fCLHandler(KTCommandLineHandler::get_instance()),
-            fConfigurator( KTConfigurator::get_instance() ),
-            fConfigFilename()
-    {
-    }
-
-    KTApplication::KTApplication(int argC, char** argV, bool requireArgs, const scarab::param_node& defaultConfig) :
-            KTConfigurable("app"),
-            fCLHandler(KTCommandLineHandler::get_instance()),
-            fConfigurator( KTConfigurator::get_instance() ),
-            fConfigFilename()
-    {
-        // process command-line arguments
-        fCLHandler->ProcessCommandLine(argC, argV);
-
-        // if requested, print help or version messages, and exit
-        if (fCLHandler->GetPrintHelpMessageFlag() || (requireArgs && fCLHandler->GetNArgs() == 1))
-        {
-            fCLHandler->PrintHelpMessage();
-            exit(0);
-        }
-        if (fCLHandler->GetPrintVersionMessage())
-        {
-            fCLHandler->PrintVersionMessage();
-            exit(0);
-        }
-
-        // get configuration information from the CLHandler
-        fConfigFilename = fCLHandler->GetConfigFilename();
-        string clJSON = fCLHandler->GetCommandLineJSON();
-        const scarab::param_node* clConfigOverride = fCLHandler->GetConfigOverride();
-
-        // Default configuration
-        fConfigurator->Merge(defaultConfig);
-
-        // JSON file configuration
-        if (! fConfigFilename.empty())
-        {
-            scarab::path configFilePath = scarab::expand_path( fConfigFilename );
-            scarab::param_translator translator;
-            scarab::param_ptr_t configFromFile = translator.read_file( configFilePath.native() );
-            if( configFromFile == NULL )
-            {
-                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] error parsing config file" << eom );
-            }
-            if( ! configFromFile->is_node() )
-            {
-                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] configuration file must consist of an object/node" << eom );
-            }
-            fConfigurator->Merge( configFromFile->as_node() );
-        }
-
-        // Command-line JSON configuration
-        if (! clJSON.empty())
-        {
-            scarab::param_input_json inputJSON;
-            scarab::param_ptr_t configFromJSON = inputJSON.read_string( clJSON );
-            if( ! configFromJSON->is_node() )
-            {
-                BOOST_THROW_EXCEPTION( KTException() << "[KTApplication] command line json must be an object" << eom );
-            }
-            fConfigurator->Merge( configFromJSON->as_node() );
-        }
-
-        // Command-line overrides
-        if (clConfigOverride != NULL)
-        {
-            fConfigurator->Merge( *clConfigOverride );
-        }
-
-        KTINFO( applog, "Final configuration:\n" << fConfigurator->Config() );
-
-        AddConfigOptionsToCLHandler(fConfigurator->Config(), "");
-        fCLHandler->FinalizeNewOptionGroups();
-
-        if (fCLHandler->GetPrintHelpMessageAfterConfigFlag())
-        {
-        	fCLHandler->PrintHelpMessage();
-        	exit(0);
-        }
-
-        fCLHandler->DelayedCommandLineProcessing();
-    }
-
-    KTApplication::~KTApplication()
-    {
-        for (set< KTEventLoop* >::iterator loopIt = fEventLoops.begin(); loopIt != fEventLoops.end(); ++loopIt)
-        {
-            // does NOT delete event loops
-            (*loopIt)->Stop();
-        }
-    }
-
-    void KTApplication::AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName)
-    {
-    	if (param.is_null())
-    	{
-    		fCLHandler->AddOption("Config File Options", "Configuration flag: " + rootName, rootName, false);
-    	}
-    	else if (param.is_value())
-    	{
-    		fCLHandler->AddOption< string >("Config File Options", "Configuration value: " + rootName, rootName, false);
-    	}
-    	else if (param.is_array())
-    	{
-        	string nextRootName(rootName);
-        	if (! rootName.empty() && rootName.back() != '.') nextRootName += ".";
-
-        	const scarab::param_array& paramArray = param.as_array();
-    		unsigned arraySize = paramArray.size();
-    		for (unsigned iParam = 0; iParam < arraySize; ++iParam)
-    		{
-    			AddConfigOptionsToCLHandler(paramArray[iParam], nextRootName + std::to_string(iParam));
-    		}
-    	}
-    	else if (param.is_node())
-    	{
-        	string nextRootName(rootName);
-        	if (! rootName.empty()) nextRootName += ".";
-
-        	const scarab::param_node& paramNode = param.as_node();
-    		for (scarab::param_node::const_iterator nodeIt = paramNode.begin(); nodeIt != paramNode.end(); ++nodeIt)
-    		{
-    			AddConfigOptionsToCLHandler(*nodeIt, nextRootName + nodeIt.name());
-    		}
-    	}
-
-    	return;
-    }
-
-    bool KTApplication::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTApplication::AddEventLoop(KTEventLoop* loop)
-    {
-        fEventLoops.insert(loop);
-        return;
-    }
-
-    void KTApplication::RemoveEventLoop(KTEventLoop* loop)
-    {
-        fEventLoops.erase(loop);
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Application/KTApplication.hh b/cpp/Cpp/Library_v1/Application/KTApplication.hh
deleted file mode 100644
index 0b2dfc7..0000000
--- a/cpp/Cpp/Library_v1/Application/KTApplication.hh
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- @file KTApplication.hh
- @brief Contains KTApplication
- @details Interface for the command-line handler and the parameter store
- @author: N. S. Oblath
- @date: Created on: Aug 5, 2012
- */
-
-#ifndef KTAPPLICATION_HH_
-#define KTAPPLICATION_HH_
-
-#include "KTCommandLineHandler.hh"
-#include "KTConfigurable.hh"
-#include "KTConfigurator.hh"
-
-#include "param.hh"
-
-#include <set>
-#include <string>
-
-namespace Nymph
-{
-    class KTEventLoop;
-    //class scarab::param_node;
-
-    /*!
-     @class KTApplication
-     @author N. S. Oblath
-
-     @brief Interface for the command-line handler and the configurator.
-
-     @details
-     The interface implemented here is meant to simplify the use of the command line and parameter store.
-
-     The basic format for the command line arguments are as follows:
-      - The first argument should be the configuration filename, if you're using one.
-      - All further arguments should either use the "long format" or the "short format":
-          o Long format: --long-option-name[=value]
-          o Short format: -s[value]
-        Strings with spaces should be put in quotation marks.
-
-     When creating an application, the user would perform the following steps:
-     1. Create the KTApplication and pass it the command-line arguments (argc and argv).
-        The configuration file will be automatically extracted from the command line.
-        If --help (-h) or --version (-v) were given, those will be handled immediately, and the program will exit.
-     2. Call KTApplication::ReadConfigFile() to read the config file and store the values in the parameter store.
-     3. Use KTAppilcation::GetNode(address) to get parameter-store nodes.
-
-     Event Loops:
-     KTApplication can oversee the running of event loops.  It takes a very light-handed approach to that oversight.
-     In the event that the KTApplication object is deleted, all loops it knows about will be stopped.
-     Event loops are not deleted.
-     If an event loop is going out of scope before the KTApplication object, the user should make sure to remove it from
-     KTApplication's oversight.
-    */
-    class KTApplication : public KTConfigurable
-    {
-        public:
-            KTApplication();
-            /// Constructor to use with command-line options; includes parsing of the command line by KTCommandLineHandler (except for config-file-dependent options)
-            KTApplication(int argC, char** argV, bool requireArgs=true, const scarab::param_node& defaultConfig=scarab::param_node());
-            virtual ~KTApplication();
-
-        private:
-            void AddConfigOptionsToCLHandler(const scarab::param& param, const std::string& rootName);
-
-        public:
-            virtual bool Configure(const scarab::param_node& node);
-
-        public:
-            KTCommandLineHandler* GetCommandLineHandler() const;
-            const KTConfigurator* GetConfigurator() const;
-
-            const std::string& GetConfigFilename() const;
-
-            void AddEventLoop(KTEventLoop* loop); /// Adds loop to the set of event loops overseen by KTApplication.  Does NOT assume ownership of an event loop
-            void RemoveEventLoop(KTEventLoop* loop); /// Removes loop from the set of event loops overseen by KTApplication. Does not stop the loop.
-
-        protected:
-            KTCommandLineHandler* fCLHandler;
-            KTConfigurator* fConfigurator;
-
-            std::string fConfigFilename;
-
-            std::set< KTEventLoop* > fEventLoops;
-
-    };
-
-    inline KTCommandLineHandler* KTApplication::GetCommandLineHandler() const
-    {
-        return fCLHandler;
-    }
-
-    inline const KTConfigurator* KTApplication::GetConfigurator() const
-    {
-        return fConfigurator;
-    }
-
-    inline const std::string& KTApplication::GetConfigFilename() const
-    {
-        return fConfigFilename;
-    }
-
-} /* namespace Nymph */
-#endif /* KTAPPLICATION_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.cc b/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.cc
deleted file mode 100644
index 5023633..0000000
--- a/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.cc
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
- * KTCommandLineHandler.cxx
- *
- *  Created on: Nov 21, 2011
- *      Author: nsoblath
- */
-
-#include "KTCommandLineHandler.hh"
-
-#include "KTCommandLineOption.hh"
-
-//#include "NymphConfig.hh"
-
-#include <sstream>
-
-#ifndef PACKAGE_STRING
-#define PACKAGE_STRING Nymph (unknown version)
-#endif
-#define STRINGIFY_1(x) #x
-#define STRINGIFY_2(x) STRINGIFY_1(x)
-
-using std::string;
-using std::vector;
-
-namespace Nymph
-{
-    KTLOGGER(utillog, "KTCommandLineHandler");
-
-    KTCommandLineHandler::KTCommandLineHandler() :
-            fExecutableName("NONE"),
-            fPackageString(STRINGIFY_2(PACKAGE_STRING)),
-            fNArgs(0),
-            fArgV(NULL),
-            fArgumentsTaken(false),
-            fCommandLineOptions(),
-            fPrintHelpOptions(),
-            fCommandLineParseLater(),
-            fParsedOptions(NULL),
-            fCommandLineVarMap(),
-            fConfigOverrideValues(),
-            fPrintHelpMessage(false),
-            fPrintVersionMessage(false),
-            fPrintHelpMessageAfterConfig(false),
-            fConfigFilename(),
-            fCommandLineJSON()
-    {
-    }
-
-    KTCommandLineHandler::~KTCommandLineHandler()
-    {
-        while (! fProposedGroups.empty())
-        {
-            OptDescMapIt tIter = fProposedGroups.begin();
-            delete tIter->second;
-            fProposedGroups.erase(tIter);
-        }
-    }
-
-    bool KTCommandLineHandler::TakeArguments(int argC, char** argV)
-    {
-        if (fArgumentsTaken) return false;
-
-        fNArgs = argC;
-        fArgV = argV;
-        fArgumentsTaken = true;
-
-        return true;
-    }
-
-    bool KTCommandLineHandler::ProcessCommandLine(int argC, char** argV)
-    {
-    	TakeArguments(argC, argV);
-
-        InitialCommandLineProcessing();
-
-        return DelayedCommandLineProcessing();
-    }
-
-    //**************
-
-    bool KTCommandLineHandler::GetArgumentsTaken()
-    {
-        return fArgumentsTaken;
-    }
-
-    int KTCommandLineHandler::GetNArgs()
-    {
-        return fNArgs;
-    }
-
-    char** KTCommandLineHandler::GetArgV()
-    {
-        return fArgV;
-    }
-
-    //**************
-
-    KTCommandLineHandler::OptDescMapIt KTCommandLineHandler::CreateNewOptionGroup(const string& aTitle)
-    {
-        po::options_description* tNewOpts = new po::options_description(aTitle);
-        std::pair< OptDescMapIt, bool > result = fProposedGroups.insert(OptDescMap::value_type(aTitle, tNewOpts));
-        if (! result.second)
-        {
-            KTWARN(utillog, "There is already an option group with title <" << aTitle << ">");
-            delete tNewOpts;
-        }
-
-        return result.first;
-    }
-
-    bool KTCommandLineHandler::AddOption(const string& aTitle, const string& aHelpMsg, const string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate)
-    {
-        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
-        {
-            if (aWarnOnDuplicate)
-                KTWARN(utillog, "There is already an option called <" << aLongOpt << ">");
-            return false;
-        }
-        if (aShortOpt != '#')
-        {
-            if (fAllOptionsShort.find(aShortOpt) != fAllOptionsShort.end())
-            {
-                if (aWarnOnDuplicate)
-                        KTWARN(utillog, "There is already a short option called <" << aShortOpt << ">");
-                return false;
-            }
-        }
-
-        // option is okay at this point
-
-        OptDescMapIt tIter = fProposedGroups.find(aTitle);
-        if (tIter == fProposedGroups.end())
-        {
-            tIter = CreateNewOptionGroup(aTitle);
-        }
-
-        string tOptionName = aLongOpt;
-        fAllOptionsLong.insert(aLongOpt);
-        if (aShortOpt != '#')
-        {
-            tOptionName += "," + string(&aShortOpt);
-            fAllOptionsShort.insert(aShortOpt);
-        }
-        tIter->second->add_options()(tOptionName.c_str(), aHelpMsg.c_str());
-
-        return true;
-    }
-
-    bool KTCommandLineHandler::AddOption(const string& aTitle, const string& aHelpMsg, const string& aLongOpt, bool aWarnOnDuplicate)
-    {
-        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
-        {
-            if (aWarnOnDuplicate)
-                KTWARN(utillog, "There is already an option called <" << aLongOpt << ">");
-            return false;
-        }
-
-        // option is okay at this point
-
-        OptDescMapIt tIter = fProposedGroups.find(aTitle);
-        if (tIter == fProposedGroups.end())
-        {
-            tIter = CreateNewOptionGroup(aTitle);
-        }
-
-        fAllOptionsLong.insert(aLongOpt);
-        tIter->second->add_options()(aLongOpt.c_str(), aHelpMsg.c_str());
-
-        return true;
-    }
-
-    po::options_description* KTCommandLineHandler::GetOptionsDescription(const string& aKey)
-    {
-        OptDescMapIt tIter = fProposedGroups.find(aKey);
-        if (tIter == fProposedGroups.end())
-        {
-            KTWARN(utillog, "There no proposed option group with key <" << aKey << ">");
-            return NULL;
-        }
-        return tIter->second;
-    }
-
-    //**************
-
-   bool KTCommandLineHandler::FinalizeNewOptionGroups()
-    {
-        for (OptDescMapIt tIter = fProposedGroups.begin(); tIter != fProposedGroups.end(); tIter++)
-        {
-            if (! AddCommandLineOptions(*(tIter->second)))
-            {
-                return false;
-            }
-            delete tIter->second;
-        }
-        fProposedGroups.clear();
-
-        return true;
-    }
-
-    bool KTCommandLineHandler::AddCommandLineOptions(const po::options_description& aSetOfOpts)
-    {
-        try
-        {
-            fCommandLineOptions.add(aSetOfOpts);
-            fPrintHelpOptions.add(aSetOfOpts);
-        }
-        catch (std::exception& e)
-        {
-            KTERROR(utillog, "Exception thrown while adding options: " << e.what());
-            return false;
-        }
-        catch (...)
-        {
-            KTERROR(utillog, "Exception was thrown, but caught in a generic way!");
-            return false;
-        }
-        return true;
-    }
-
-    //**************
-
-    bool KTCommandLineHandler::IsCommandLineOptSet(const string& aCLOption)
-    {
-        return fCommandLineVarMap.count(aCLOption) != 0;
-    }
-
-    //**************
-
-    bool KTCommandLineHandler::DelayedCommandLineProcessing()
-    {
-        if (! fProposedGroups.empty())
-        {
-            if (! this->FinalizeNewOptionGroups())
-            {
-                KTERROR(utillog, "An error occurred while adding the proposed option groups\n" <<
-                        "Command-line options were not parsed");
-                return false;
-            }
-        }
-
-        // Parse the command line options that remain after the initial parsing
-        try
-        {
-            fParsedOptions = po::command_line_parser(fCommandLineParseLater).options(fCommandLineOptions).allow_unregistered().run();
-        }
-        catch (std::exception& e)
-        {
-            KTERROR(utillog, "An error occurred while boost was parsing the command line options:\n" << e.what());
-            return false;
-        }
-
-        // these will be the unregistered items, which are assumed to be intended to edit the config file
-        vector< string > tRemainingToParse = po::collect_unrecognized(fParsedOptions.options, po::include_positional);
-
-        // Create the variable map from the parse options
-        po::store(fParsedOptions, fCommandLineVarMap);
-        po::notify(fCommandLineVarMap);
-
-        // now parse the remaining items into the config override param node
-        for (vector< string >::const_iterator tokenIt = tRemainingToParse.begin(); tokenIt != tRemainingToParse.end(); ++tokenIt)
-        {
-            string argument(*tokenIt);
-            size_t t_name_pos = argument.find_first_not_of( fDash );
-            size_t t_val_pos = argument.find_first_of( fSeparator );
-            // the name should have 2 dashes before it, and there should be a separator
-            if( t_name_pos == 2 && t_val_pos != string::npos )
-            {
-                string t_full_name(argument.substr( t_name_pos, t_val_pos-2 ));
-
-                size_t t_node_start_pos = 0;
-                size_t t_node_sep_pos = t_full_name.find_first_of( fNodeSeparator );
-                scarab::param_node& parentNode = fConfigOverrideValues;
-                while (t_node_sep_pos != string::npos)
-                {
-                    string nodeName(t_full_name.substr(t_node_start_pos, t_node_sep_pos));
-                    if (parentNode.has(nodeName))
-                    {
-<<<<<<< HEAD:Library_v1/Application/KTCommandLineHandler.cc
-                        parentNode = parentNode[nodeName]().as_node();
-                    }
-                    else
-                    {
-                        scarab::param_node* newChildNode = new scarab::param_node();
-                        parentNode.add(nodeName, newChildNode);
-                        parentNode = *newChildNode;
-=======
-                        parentNode = parentNode[nodeName].as_node();
-                    }
-                    else
-                    {
-                        parentNode.add(nodeName, scarab::param_ptr_t( new scarab::param_node()));
-                        parentNode = parentNode[nodeName].as_node();
->>>>>>> develop:Library/Application/KTCommandLineHandler.cc
-                    }
-                    t_node_start_pos = t_node_sep_pos + 1;
-                    t_node_sep_pos = t_full_name.find_first_of(fNodeSeparator, t_node_start_pos);
-                }
-
-                string valueName(t_full_name.substr(t_node_start_pos, t_val_pos));
-
-                scarab::param_value* new_value = new scarab::param_value();
-                new_value->set(argument.substr( t_val_pos + 1 ));
-
-                //std::cout << "(parser) adding < " << t_name << "<" << t_type << "> > = <" << new_value.value() << ">" << std::endl;
-
-                parentNode.replace( valueName, new_value );
-
-                continue;
-            }
-
-            KTERROR(utillog, "Argument <" << argument << "> does not match --<name>=<value> pattern");
-            return false;
-        }
-
-        return true;
-    }
-
-    void KTCommandLineHandler::InitialCommandLineProcessing()
-    {
-        if (fNArgs <= 0 || fArgV == NULL)
-        {
-            fNArgs = 0;
-            fArgV = NULL;
-            return;
-        }
-
-        // Get the executable name
-        if (fNArgs >= 1) fExecutableName = string(fArgV[0]);
-
-        // If no arguments were given, just return now
-        if (fNArgs == 1) return;
-
-        // Define general options, and add them to the complete option list
-        po::options_description tGeneralOpts("General options");
-        tGeneralOpts.add_options()("help,h", "Print help message")("help-config", "Print help message after reading config file")("version,v", "Print version information");
-        /* WHEN NOT USING POSITIONAL CONFIG FILE ARGUMENT */
-        tGeneralOpts.add_options()("config,c", po::value< string >(), "Configuration file");
-        tGeneralOpts.add_options()("json,j", po::value< string >(), "Command-Line JSON");
-        /**/
-        // We want to have the general options printed if --help is used
-        fPrintHelpOptions.add(tGeneralOpts);
-
-        // Fill in the duplication-checking sets
-        fAllGroupKeys.insert("General");
-        fAllOptionsLong.insert("help");
-        fAllOptionsShort.insert('h');
-        fAllOptionsLong.insert("help-config");
-        fAllOptionsLong.insert("version");
-        fAllOptionsShort.insert('v');
-
-        // Define the option for the user configuration file; this does not get printed in list of options when --help is used
-        po::options_description tHiddenOpts("Hidden options");
-        /* WHEN USING POSITIONAL CONFIG FILE ARGUMENT
-        tHiddenOpts.add_options()("config-file", po::value< string >(), "Configuration file");
-        */
-        // Add together any options that will be parsed here, in the initial command-line processing
-        po::options_description tInitialOptions("Initial options");
-        tInitialOptions.add(tGeneralOpts).add(tHiddenOpts);
-
-        // Allow the UserConfiguration file to be specified with the only positional option
-        /* WHEN USING POSITIONAL CONFIG FILE ARGUMENT
-        po::positional_options_description tPositionOpt;
-        tPositionOpt.add("config-file", 1);
-        */
-
-        // Add contributions of other options from elsewhere in Nymph
-        FinalizeNewOptionGroups();
-
-        // Command line style
-        po::command_line_style::style_t pstyle = po::command_line_style::unix_style;
-        /*
-        po::command_line_style::style_t pstyle = po::command_line_style::style_t(
-                po::command_line_style::allow_long |
-                po::command_line_style::allow_short |
-                po::command_line_style::allow_dash_for_short |
-                po::command_line_style::long_allow_next |
-                po::command_line_style::long_allow_adjacent |
-                po::command_line_style::short_allow_next |
-                po::command_line_style::short_allow_adjacent |
-                po::command_line_style::allow_guessing |
-                po::command_line_style::allow_sticky);
-        */
-
-        po::parsed_options tParsedOpts(NULL);
-        // Parse the command line looking only for the general options
-        try
-        {
-            tParsedOpts = po::command_line_parser(fNArgs, fArgV).style(pstyle).options(tInitialOptions).allow_unregistered().run();
-            /* WHEN USING POSITIONAL CONFIG FILE ARGUMENT
-            tParsedOpts = po::command_line_parser(fNArgs, fArgV).style(pstyle).options(tInitialOptions).positional(tPositionOpt).allow_unregistered().run();
-            */
-        }
-        catch (std::exception& e)
-        {
-            KTERROR(utillog, "Exception caught while performing initial CL parsing:\n"
-                    << '\t' << e.what());
-            BOOST_THROW_EXCEPTION( KTException() << e.what() << eom );
-        }
-        // Save the remaining command-line options for later parsing (after the full option list has been populated)
-        fCommandLineParseLater = po::collect_unrecognized(tParsedOpts.options, po::include_positional);
-        /* some debugging couts
-        std::cout << "there are " << fCommandLineParseLater.size() << " tokens to parse later." << std::endl;
-        for (unsigned i = 0; i < fCommandLineParseLater.size(); i++)
-        {
-            std::cout << "   " << fCommandLineParseLater[i] << std::endl;
-        }
-        */
-
-        // Create the variable map from the general options
-        po::variables_map tGeneralOptsVarMap;
-        po::store(tParsedOpts, tGeneralOptsVarMap);
-        po::notify(tGeneralOptsVarMap);
-
-        // Use the general options information
-        if (tGeneralOptsVarMap.count("help"))
-        {
-            fPrintHelpMessage = true;
-        }
-        if (tGeneralOptsVarMap.count("help-config"))
-        {
-            fPrintHelpMessageAfterConfig = true;
-        }
-        if (tGeneralOptsVarMap.count("version"))
-        {
-            fPrintVersionMessage = true;
-        }
-        if (tGeneralOptsVarMap.count("config"))
-        {
-            fConfigFilename = tGeneralOptsVarMap["config"].as< string >();
-        }
-        if (tGeneralOptsVarMap.count("json"))
-        {
-            fCommandLineJSON = tGeneralOptsVarMap["json"].as< string >();
-        }
-
-        return;
-    }
-
-    //**************
-
-    void KTCommandLineHandler::PrintHelpMessage()
-    {
-        KTPROG(utillog, "\nUsage: " << fExecutableName << " [options]\n\n" <<
-               "  If using a config file, it should be specified as:  -c config_file.json\n" <<
-               "  Config file options can be modified using:  --address.of.option=\"value\"\n" <<
-               fPrintHelpOptions);
-        return;
-    }
-
-    void KTCommandLineHandler::PrintVersionMessage()
-    {
-        KTPROG(utillog, fExecutableName << " -- Version Information\n" << "Built with: " << fPackageString);
-        return;
-    }
-
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.hh b/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.hh
deleted file mode 100644
index 6aca4b9..0000000
--- a/cpp/Cpp/Library_v1/Application/KTCommandLineHandler.hh
+++ /dev/null
@@ -1,339 +0,0 @@
-/**
- @file KTCommandLineHandler.hh
- @brief Contains KTCommandLineHandler
- @details Parses and stores command-line options
- @author: N. S. Oblath
- @date: Created on: Nov 21, 2011
- */
-
-#ifndef KTCOMMANDLINEHANDLER_H_
-#define KTCOMMANDLINEHANDLER_H_
-
-#include "KTException.hh"
-#include "KTLogger.hh"
-
-#include "param.hh"
-#include "singleton.hh"
-
-#include <boost/program_options.hpp>
-namespace po = boost::program_options;
-
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
-
-namespace Nymph
-{
-    KTLOGGER(utillog_clh, "KTCommandLineHandler.hh");
-
-    /*!
-     @class KTCommandLineHandler
-     @author N. S. Oblath
-
-     @brief Parses and stores command-line options
-
-     @details
-     The basic format for the command line arguments are as follows:
-      <!-- - The first argument should be the configuration filename, if you're using one. -->
-      - All further arguments should either use the "long format" or the "short format":
-          o Long format: --long-option-name[=value]
-                         --long-option-name [value]
-          o Short format: -s[value]
-                          -s [value]
-        Strings with spaces should be put in quotation marks.
-
-     The configuration file will be automatically extracted from the command line.
-     If --help (-h) or --version (-v) were given, those will be handled immediately, and the program will exit.
-    */
-
-    class KTCommandLineHandler : public scarab::singleton< KTCommandLineHandler >
-    {
-        protected:
-            typedef std::map< std::string, po::options_description* > OptDescMap;
-            typedef OptDescMap::iterator OptDescMapIt;
-            typedef OptDescMap::const_iterator OptDescMapCIt;
-
-            //**************
-            // Singleton
-            //**************
-
-        protected:
-            friend class scarab::singleton< KTCommandLineHandler >;
-            friend class scarab::destroyer< KTCommandLineHandler >;
-            KTCommandLineHandler();
-            virtual ~KTCommandLineHandler();
-
-            //**************
-            // Identification
-            //**************
-
-        public:
-            const std::string& GetExecutableName() const;
-            const std::string& GetPackageString() const;
-
-        private:
-            std::string fExecutableName; // from argv[0], if provided
-            std::string fPackageString; // Package name and version
-
-            //**************
-            // Command line arguments
-            //**************
-
-        public:
-            bool ProcessCommandLine(int argC, char** argV);
-
-            bool TakeArguments(int argC, char** argV);
-            bool GetArgumentsTaken();
-            int GetNArgs();
-            char** GetArgV();
-
-        private:
-            int fNArgs;
-            char** fArgV;
-            bool fArgumentsTaken;
-
-            //**************
-            // Option-adding interface
-            //**************
-
-        public:
-            /// Makes a new option group available for command line options.
-            OptDescMapIt CreateNewOptionGroup(const std::string& aTitle);
-
-            /// Simple option adding function, with short option (flag only; no values allowed)
-            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate=true);
-            /// Simple option adding function, without short option (flag only; no values allowed)
-            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, bool aWarnOnDuplicate=true);
-
-            /// Option-with-value adding function with short option
-            template< class XValueType >
-            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate=true);
-            /// Option-with-value adding function without short option
-            template< class XValueType >
-            bool AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, bool aWarnOnDuplicate=true);
-
-            /// Request access to the options description object for more freedom (and responsibility!) in adding options
-            po::options_description* GetOptionsDescription(const std::string& aKey);
-
-            /// Adds the groups of options to the set of usable options groups (note: this must be called to make the options in the groups usable)
-            bool FinalizeNewOptionGroups();
-
-        protected:
-            OptDescMap fProposedGroups;
-            std::set< std::string > fAllGroupKeys;
-            std::set< std::string > fAllOptionsLong;
-            std::set< char > fAllOptionsShort;
-
-            po::options_description fCommandLineOptions;
-            po::options_description fPrintHelpOptions;
-
-        protected:
-            /// Adds a set of command line options
-            bool AddCommandLineOptions(const po::options_description& aSetOfOpts);
-
-            //**************
-            // Parsing
-            //**************
-
-        public:
-            /// Parses the general options and stores the remaining options available for later parsing
-            void InitialCommandLineProcessing();
-
-            /// Parses the remaining command line options (those that weren't parsed during the InitialCommandLineProcessing
-            bool DelayedCommandLineProcessing();
-
-        private:
-            std::vector< std::string > fCommandLineParseLater;
-
-            //**************
-            // Access to values
-            //**************
-
-        public:
-            /// Check if a command line option was set
-            bool IsCommandLineOptSet(const std::string& aCLOption);
-
-            /// Return the value of a command line option; throws an exception if the value was not set
-            template< class XReturnType >
-            XReturnType GetCommandLineValue(const std::string& aCLOption);
-
-            /// Return the value of a command line option; returns the default if the value was not set
-            template< class XReturnType >
-            XReturnType GetCommandLineValue(const std::string& aCLOption, XReturnType defaultValue);
-
-            bool GetPrintHelpMessageFlag() const;
-            bool GetPrintHelpMessageAfterConfigFlag() const;
-            bool GetPrintVersionMessage() const;
-
-            /// Return the file name provided by the user on the command line for the config file
-            const std::string& GetConfigFilename() const;
-
-            /// Return the string of json provided by the user on the command line
-            const std::string& GetCommandLineJSON() const;
-
-            const po::parsed_options* GetParsedOptions() const;
-            const po::variables_map* GetVariablesMap() const;
-
-            const scarab::param_node* GetConfigOverride() const;
-
-        private:
-            po::parsed_options fParsedOptions;
-            po::variables_map fCommandLineVarMap;
-
-            scarab::param_node fConfigOverrideValues;
-            static const char fDash = '-';
-            static const char fSeparator = '=';
-            static const char fNodeSeparator = '.';
-
-            bool fPrintHelpMessage;
-            bool fPrintHelpMessageAfterConfig;
-            bool fPrintVersionMessage;
-
-            std::string fConfigFilename;
-            std::string fCommandLineJSON;
-
-            //**************
-            // Print useful information
-            //**************
-
-        public:
-            virtual void PrintHelpMessage();
-            virtual void PrintVersionMessage();
-    };
-
-    inline const std::string& KTCommandLineHandler::GetExecutableName() const
-    {
-        return fExecutableName;
-    }
-    inline const std::string& KTCommandLineHandler::GetPackageString() const
-    {
-        return fPackageString;
-    }
-
-    template< class XValueType >
-    bool KTCommandLineHandler::AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, char aShortOpt, bool aWarnOnDuplicate)
-    {
-        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
-        {
-            if (aWarnOnDuplicate)
-                KTWARN(utillog_clh, "There is already an option called <" << aLongOpt << ">");
-            return false;
-        }
-        if (fAllOptionsShort.find(aShortOpt) != fAllOptionsShort.end())
-        {
-            if (aWarnOnDuplicate)
-                KTWARN(utillog_clh, "There is already a short option called <" << aShortOpt << ">");
-            return false;
-        }
-
-        // option is okay at this point
-
-        OptDescMapIt tIter = fProposedGroups.find(aTitle);
-        if (tIter == fProposedGroups.end())
-        {
-            tIter = CreateNewOptionGroup(aTitle);
-        }
-
-        std::string tOptionName = aLongOpt;
-        fAllOptionsLong.insert(aLongOpt);
-        tOptionName += "," + std::string(&aShortOpt);
-        fAllOptionsShort.insert(aShortOpt);
-
-        tIter->second->add_options()(tOptionName.c_str(), po::value< XValueType >(), aHelpMsg.c_str());
-
-        return true;
-
-    }
-
-    template< class XValueType >
-    bool KTCommandLineHandler::AddOption(const std::string& aTitle, const std::string& aHelpMsg, const std::string& aLongOpt, bool aWarnOnDuplicate)
-    {
-        if (fAllOptionsLong.find(aLongOpt) != fAllOptionsLong.end())
-        {
-            if (aWarnOnDuplicate)
-                KTWARN(utillog_clh, "There is already an option called <" << aLongOpt << ">");
-            return false;
-        }
-
-        // option is okay at this point
-
-        OptDescMapIt tIter = fProposedGroups.find(aTitle);
-        if (tIter == fProposedGroups.end())
-        {
-            tIter = CreateNewOptionGroup(aTitle);
-        }
-
-        fAllOptionsLong.insert(aLongOpt);
-
-        tIter->second->add_options()(aLongOpt.c_str(), po::value< XValueType >(), aHelpMsg.c_str());
-
-        return true;
-
-    }
-
-
-    template< class XReturnType >
-    XReturnType KTCommandLineHandler::GetCommandLineValue(const std::string& aCLOption)
-    {
-        if (! IsCommandLineOptSet(aCLOption))
-        {
-            KTWARN(utillog_clh, "Command line option <" << aCLOption << "> was not set!\n"
-                   "Next time check whether it's set before calling this function.");
-            BOOST_THROW_EXCEPTION( KTException() << "Command line option " + aCLOption + " was not set!" << eom );
-        }
-        return fCommandLineVarMap[aCLOption].as< XReturnType >();
-    }
-
-    template< class XReturnType >
-    XReturnType KTCommandLineHandler::GetCommandLineValue(const std::string& aCLOption, XReturnType defaultValue)
-    {
-        if (! IsCommandLineOptSet(aCLOption))
-        {
-            return defaultValue;
-        }
-        return fCommandLineVarMap[aCLOption].as< XReturnType >();
-    }
-
-    inline const std::string& KTCommandLineHandler::GetConfigFilename() const
-    {
-        return fConfigFilename;
-    }
-
-    inline const std::string& KTCommandLineHandler::GetCommandLineJSON() const
-    {
-        return fCommandLineJSON;
-    }
-
-    inline bool KTCommandLineHandler::GetPrintVersionMessage() const
-    {
-        return fPrintVersionMessage;
-    }
-
-    inline bool KTCommandLineHandler::GetPrintHelpMessageFlag() const
-    {
-        return fPrintHelpMessage;
-    }
-
-    inline bool KTCommandLineHandler::GetPrintHelpMessageAfterConfigFlag() const
-    {
-        return fPrintHelpMessageAfterConfig;
-    }
-
-    inline const po::parsed_options* KTCommandLineHandler::GetParsedOptions() const
-    {
-        return &fParsedOptions;
-    }
-
-    inline const po::variables_map* KTCommandLineHandler::GetVariablesMap() const
-    {
-        return &fCommandLineVarMap;
-    }
-
-    inline const scarab::param_node* KTCommandLineHandler::GetConfigOverride() const
-    {
-        return &fConfigOverrideValues;
-    }
-
-} /* namespace Nymph */
-#endif /* KTCOMMANDLINEHANDLER_H_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTCommandLineOption.hh b/cpp/Cpp/Library_v1/Application/KTCommandLineOption.hh
deleted file mode 100644
index f932ea9..0000000
--- a/cpp/Cpp/Library_v1/Application/KTCommandLineOption.hh
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * KTCommandLineOption.hh
- *
- *  Created on: Aug 1, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTCOMMANDLINEOPTION_H_
-#define KTCOMMANDLINEOPTION_H_
-
-#include "KTCommandLineHandler.hh"
-
-#include <string>
-
-namespace Nymph
-{
-    //class KTCommandLineHandler;
-
-    template< typename XInputType >
-    class KTCommandLineOption
-    {
-        public:
-            KTCommandLineOption();
-            KTCommandLineOption(const std::string& group, const std::string& helpMsg, const std::string& longOpt, char shortOpt='#');
-            virtual ~KTCommandLineOption();
-
-        protected:
-            KTCommandLineHandler* fCLHandler;
-
-    };
-
-    template< typename XInputType >
-    KTCommandLineOption< XInputType >::KTCommandLineOption() :
-            fCLHandler(KTCommandLineHandler::get_instance())
-    {
-    }
-
-    template< typename XInputType >
-    KTCommandLineOption< XInputType >::KTCommandLineOption(const std::string& group, const std::string& helpMsg, const std::string& longOpt, char shortOpt) :
-            fCLHandler(KTCommandLineHandler::get_instance())
-    {
-        if (shortOpt == '#')
-        {
-            fCLHandler->AddOption< XInputType >(group, helpMsg, longOpt);
-        }
-        else
-        {
-            fCLHandler->AddOption< XInputType >(group, helpMsg, longOpt, shortOpt);
-        }
-    }
-
-    template< typename XInputType >
-    KTCommandLineOption< XInputType >::~KTCommandLineOption()
-    {
-    }
-
-
-    template< >
-    class KTCommandLineOption< bool >
-    {
-        public:
-            KTCommandLineOption() :
-                fCLHandler(KTCommandLineHandler::get_instance())
-            {
-            }
-            KTCommandLineOption(const std::string& group, const std::string& helpMsg, const std::string& longOpt, char shortOpt='#') :
-                fCLHandler(KTCommandLineHandler::get_instance())
-            {
-                if (shortOpt == '#')
-                {
-                    fCLHandler->AddOption(group, helpMsg, longOpt);
-                }
-                else
-                {
-                    fCLHandler->AddOption(group, helpMsg, longOpt, shortOpt);
-                }
-            }
-            virtual ~KTCommandLineOption()
-            {
-            }
-
-        protected:
-            KTCommandLineHandler* fCLHandler;
-
-    };
-
-} /* namespace Nymph */
-
-#endif /* KTCOMMANDLINEOPTION_H_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTConfigurator.cc b/cpp/Cpp/Library_v1/Application/KTConfigurator.cc
deleted file mode 100644
index 4207a39..0000000
--- a/cpp/Cpp/Library_v1/Application/KTConfigurator.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * KTConfigurator.cc
- *
- *  Created on: Nov 5, 2013
- *      Author: nsoblath
- */
-
-#include "KTConfigurator.hh"
-
-#include "KTLogger.hh"
-
-using std::string;
-
-namespace Nymph
-{
-    KTLOGGER( conflog, "KTConfigurator" );
-
-    KTConfigurator::KTConfigurator() :
-            fMasterConfig(),
-            fStringBuffer()
-    {
-    }
-
-    KTConfigurator::~KTConfigurator()
-    {
-<<<<<<< HEAD:Library_v1/Application/KTConfigurator.cc
-        delete fMasterConfig;
-=======
->>>>>>> develop:Library/Application/KTConfigurator.cc
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Application/KTConfigurator.hh b/cpp/Cpp/Library_v1/Application/KTConfigurator.hh
deleted file mode 100644
index 05b9f76..0000000
--- a/cpp/Cpp/Library_v1/Application/KTConfigurator.hh
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * KTConfigurator.hh
- *
- *  Created on: Nov 5, 2013
- *      Author: nsoblath
- */
-
-#ifndef KTCONFIGURATOR_HH_
-#define KTCONFIGURATOR_HH_
-
-#include "singleton.hh"
-#include "param.hh"
-
-#include "KTException.hh"
-
-#include <string>
-
-namespace Nymph
-{
-
-    class KTConfigurator : public scarab::singleton< KTConfigurator >
-    {
-        private:
-            friend class scarab::singleton< KTConfigurator >;
-            friend class scarab::destroyer< KTConfigurator >;
-
-            KTConfigurator();
-            virtual ~KTConfigurator();
-
-        public:
-            void Merge(const scarab::param_node& aNode);
-
-            scarab::param_node& Config();
-            const scarab::param_node& Config() const;
-
-            template< typename XReturnType >
-            XReturnType Get( const std::string& aName ) const;
-
-            template< typename XReturnType >
-            XReturnType Get( const std::string& aName, XReturnType aDefault ) const;
-
-        private:
-            scarab::param_node fMasterConfig;
-
-            std::string fStringBuffer;
-    };
-
-    template< typename XReturnType >
-    XReturnType KTConfigurator::Get( const std::string& aName ) const
-    {
-<<<<<<< HEAD:Library_v1/Application/KTConfigurator.hh
-        try
-        {
-            fParamBuffer = &const_cast< scarab::param& >( (*fMasterConfig)[aName] );
-            if( fParamBuffer->is_value() )
-            {
-                return (*fParamBuffer)().as< XReturnType >();
-            }
-        }
-        catch( std::exception& e )
-        {}
-        BOOST_THROW_EXCEPTION( KTException() << "configurator does not have a value for <" << aName << ">" << eom );
-=======
-        return fMasterConfig[ aName ]().as< XReturnType >();
->>>>>>> develop:Library/Application/KTConfigurator.hh
-    }
-
-    template< typename XReturnType >
-    XReturnType KTConfigurator::Get( const std::string& aName, XReturnType aDefault ) const
-    {
-<<<<<<< HEAD:Library_v1/Application/KTConfigurator.hh
-        try
-        {
-            fParamBuffer = &const_cast< scarab::param& >( (*fMasterConfig)[aName] );
-            if( fParamBuffer->is_value() )
-            {
-                return (*fParamBuffer)().as< XReturnType >();
-            }
-        }
-        catch( std::exception& e )
-        {}
-        return aDefault;
-    }
-
-    inline void KTConfigurator::Merge(const scarab::param_node& aNode)
-    {
-        fMasterConfig->merge(aNode);
-        return;
-    }
-
-    inline scarab::param_node& KTConfigurator::Config()
-    {
-        return *fMasterConfig;
-=======
-        return fMasterConfig.get_value< XReturnType >( aName, aDefault );
-    }
-
-    inline void KTConfigurator::Merge(const scarab::param_node& aNode)
-    {
-        fMasterConfig.merge(aNode);
-        return;
-    }
-
-    inline scarab::param_node& KTConfigurator::Config()
-    {
-        return fMasterConfig;
-    }
-
-    inline const scarab::param_node& KTConfigurator::Config() const
-    {
-        return fMasterConfig;
->>>>>>> develop:Library/Application/KTConfigurator.hh
-    }
-
-    inline const scarab::param_node& KTConfigurator::Config() const
-    {
-        return *fMasterConfig;
-    }
-
-
-
-} /* namespace Nymph */
-#endif /* KTCONFIGURATOR_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.cc b/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
deleted file mode 100644
index 4354dfd..0000000
--- a/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * KTDataQueueProcessor.cc
- *
- *  Created on: Feb 5, 2013
- *      Author: nsoblath
- */
-
-#include "KTDataQueueProcessor.hh"
-
-//using std::list;
-
-namespace Nymph
-{
-    KT_REGISTER_PROCESSOR(KTDataQueueProcessor, "data-queue");
-
-    KTDataQueueProcessor::KTDataQueueProcessor(const std::string& name) :
-        KTDataQueueProcessorTemplate< KTDataQueueProcessor >(name),
-        fDataSignal("data", this)
-    {
-        SetFuncPtr(&KTDataQueueProcessor::EmitDataSignal);
-        fQueueDataSW = RegisterSlot("data", this, &KTDataQueueProcessor::QueueData, {});
-        fSignalsEmitted.push_back("data");
-        //RegisterSlot("data-list", this, &KTDataQueueProcessor::QueueDataList);
-    }
-
-    KTDataQueueProcessor::~KTDataQueueProcessor()
-    {
-
-    }
-
-    bool KTDataQueueProcessor::ConfigureSubClass(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTDataQueueProcessor::EmitDataSignal(KTDataHandle data)
-    {
-        fDataSignal(data);
-        return;
-    }
-
-    void KTDataQueueProcessor::QueueData(KTDataHandle& data)
-    {
-        fQueueDataSW->GetThreadRef()->Break(data, fQueueDataSW->GetDoBreakpoint());
-        return DoQueueData(data);
-    }
-/*
-    void KTDataQueueProcessor::QueueDataList(list< KTDataHandle >* dataList)
-    {
-        return DoQueueDataList(dataList, &KTDataQueueProcessor::EmitDataSignal);
-    }
-*/
-}
diff --git a/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.hh b/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
deleted file mode 100644
index 8ce93cf..0000000
--- a/cpp/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * KTDataQueueProcessorTemplate.hh
- *
- *  Created on: Jan 10, 2013
- *      Author: nsoblath
- */
-
-#ifndef KTDATAQUEUEPROCESSOR_HH_
-#define KTDATAQUEUEPROCESSOR_HH_
-
-#include "KTPrimaryProcessor.hh"
-
-#include "KTConcurrentQueue.hh"
-#include "KTCoreData.hh"
-#include "KTLogger.hh"
-#include "KTSlot.hh"
-
-namespace Nymph
-{
-    KTLOGGER(eqplog, "KTDataQueueProcessor");
-
-    //***********************************
-    // Data Queue Processor Template
-    //***********************************
-
-    /*!
-     @class KTDataQueueProcessorTemplate
-     @author N. S. Oblath
-
-     @brief Template class for creating data queueing processors
-
-     @details
-
-     Available configuration values:
-     - "timeout": unsigned -- maximum time to wait for new data (integer number of milliseconds)
-
-     Slots:
-     - "use-timed-pop": void () -- Switch the queue-popping function to the TIMED version
-     - "use-untimed-pop": void () -- Switch the queue-popping function to the UNTIMED version
-     - "use-single-pop": void () -- Switch to the single-pop queue-popping function
-
-     Signals:
-     - "queue-done": void () -- Emitted when queue is emptied
-    */
-    template< class XProcessorType >
-    class KTDataQueueProcessorTemplate : public KTPrimaryProcessor
-    {
-        public:
-            typedef void (XProcessorType::*FuncPtrType)(KTDataHandle);
-
-            struct DataAndFunc
-            {
-                KTDataHandle fData;
-                FuncPtrType fFuncPtr;
-            };
-
-            typedef KTConcurrentQueue< DataAndFunc > Queue;
-
-            typedef bool (KTConcurrentQueue< DataAndFunc >::*QueuePoppingFunc)(DataAndFunc&);
-
-            enum Status
-            {
-                kStopped,
-                kRunning,
-                kContinue
-            };
-
-        public:
-            KTDataQueueProcessorTemplate(const std::string& name = "default-data-queue-proc-template-name");
-            virtual ~KTDataQueueProcessorTemplate();
-
-            bool Configure(const scarab::param_node& node);
-            virtual bool ConfigureSubClass(const scarab::param_node& node) = 0;
-
-            Status GetStatus() const;
-            void SetStatus(KTDataQueueProcessorTemplate< XProcessorType >::Status);
-
-        protected:
-            Status fStatus;
-
-            //**********************************************
-            // Derived Processor function pointer (optional)
-            //**********************************************
-        public:
-            void SetFuncPtr(FuncPtrType ptr);
-
-        protected:
-            FuncPtrType fFuncPtr;
-
-
-            //*********
-            // Queue
-            //*********
-        public:
-            /// Begins processing of queue (switches status from kStopped to kRunning)
-            bool Run();
-
-            /// Stops processing of queue (switches status to kStopped)
-            void Stop();
-
-            /// Begins processing of queue if status is already kRunning; otherwise does nothing.
-            bool ProcessQueue();
-
-            void ClearQueue();
-
-        protected:
-            Queue fQueue;
-            QueuePoppingFunc fPopFromQueue;
-
-            //*********
-            // Queueing functions for slots
-            //*********
-        protected:
-            /// Queue an data object with a provided function
-            /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataHandle& data, FuncPtrType func);
-
-            /// Queue an data object with fFuncPtr
-            /// Assumes ownership of the data; original shared pointer will be nullified
-            void DoQueueData(KTDataHandle& data);
-
-            /// Queue a list of data objects
-            /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
-            //void DoQueueDataList(std::list< KTDataHandle& >* dataList, void (XProcessorType::*fFuncPtr)(KTDataHandle));
-
-            //*********
-            // Slots
-            //*********
-        public:
-            void SwitchToTimedPop();
-            void SwitchToUntimedPop();
-            void SwitchToSinglePop();
-
-            //*********
-            // Signals
-            //*********
-        protected:
-            KTSignalDone fQueueDoneSignal;
-
-    };
-
-
-    //**************************
-    // Data Queue Processor
-    //**************************
-
-    /*!
-     @class KTDataQueueProcessor
-     @author N. S. Oblath
-
-     @brief Generic data queue for asynchronous processing
-
-     @details
-     Asynchronously emits a signal for each data object it receives.
-     Allows the user to start an asynchronous chain of processors.
-
-     Configuration name: "data-queue"
-
-     Available configuration values:
-
-     Slots:
-     - "data": void (KTDataHandle) -- Queue a data object for asynchronous processing; use signal "data"
-
-     Signals:
-     - "data": void (KTDataHandle) -- Emitted for each data object in the queue
-     - "queue-done": void () -- Emitted when queue is emptied (inherited from KTDataQueueProcessorTemplate)
-    */
-    class KTDataQueueProcessor : public KTDataQueueProcessorTemplate< KTDataQueueProcessor >
-    {
-        public:
-            KTDataQueueProcessor(const std::string& name = "data-queue");
-            virtual ~KTDataQueueProcessor();
-
-            bool ConfigureSubClass(const scarab::param_node& node);
-
-        public:
-            void EmitDataSignal(KTDataHandle data);
-
-            //***************
-            // Signals
-            //***************
-
-        private:
-            KTSignalData fDataSignal;
-
-            //*********
-            // Slots
-            //*********
-        public:
-            /// Queue an data object; will emit data signal
-            /// Assumes ownership of the data; original shared pointer will be nullified
-            void QueueData(KTDataHandle& data);
-            KTSlotWrapper* fQueueDataSW;
-
-            /// Queue a list of data objects; will emit data signal
-            /// Assumes ownership of all data objects and the list; original shared pointers will be nullified
-            //void QueueDataList(std::list< KTDataHandle >* dataList);
-
-    };
-
-
-    //**************************************************
-    // Data Queue Processor Template Implementation
-    //**************************************************
-
-
-    template< class XProcessorType >
-    KTDataQueueProcessorTemplate< XProcessorType >::KTDataQueueProcessorTemplate(const std::string& name) :
-            KTPrimaryProcessor({"queue-done"}, name),
-            fStatus(kStopped),
-            fFuncPtr(NULL),
-            fQueue(),
-            fPopFromQueue(&KTConcurrentQueue< DataAndFunc >::wait_and_pop),
-            fQueueDoneSignal("queue-done", this)
-    {
-        RegisterSlot("use-timed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToTimedPop, {});
-        RegisterSlot("use-untimed-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToUntimedPop, {});
-        RegisterSlot("use-single-pop", this, &KTDataQueueProcessorTemplate< XProcessorType >::SwitchToSinglePop, {});
-    }
-
-    template< class XProcessorType >
-    KTDataQueueProcessorTemplate< XProcessorType >::~KTDataQueueProcessorTemplate()
-    {
-        ClearQueue();
-    }
-
-    template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Configure(const scarab::param_node& node)
-    {
-        fQueue.set_timeout(node.get_value< unsigned >("timeout", fQueue.get_timeout()));
-
-        if (! ConfigureSubClass(node)) return false;
-        return true;
-    }
-
-    template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::Run()
-    {
-        fStatus = kRunning;
-        KTINFO(eqplog, "Queue started");
-        return ProcessQueue();
-    }
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::Stop()
-    {
-        fStatus = kStopped;
-        fQueue.interrupt();
-        KTINFO(eqplog, "Queue stopped");
-        return;
-    }
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::SetFuncPtr(FuncPtrType ptr)
-    {
-        fFuncPtr = ptr;
-        return;
-    }
-
-
-    template< class XProcessorType >
-    bool KTDataQueueProcessorTemplate< XProcessorType >::ProcessQueue()
-    {
-        KTINFO(eqplog, "Beginning to process queue");
-        while (fStatus != kStopped)
-        {
-            KTDEBUG(eqplog, "processing . . .");
-            DataAndFunc daf;
-            if ((fQueue.*fPopFromQueue)(daf))
-            {
-                KTDEBUG(eqplog, "Data acquired for processing");
-                (static_cast<XProcessorType*>(this)->*(daf.fFuncPtr))(daf.fData);
-                if (daf.fData->GetLastData()) fStatus = kStopped;
-            }
-            else
-            {
-                if (fStatus == kContinue)
-                {
-                    fStatus = kRunning;
-                }
-                else
-                {
-                    fStatus = kStopped;
-                }
-            }
-        }
-        fQueueDoneSignal();
-        KTINFO(eqplog, "Queue processing has ended");
-        return true;
-    }
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::ClearQueue()
-    {
-        while (! fQueue.empty())
-        {
-            DataAndFunc daf;
-            fQueue.try_pop(daf);
-        }
-        KTINFO(eqplog, "Queue cleared");
-        return;
-    }
-
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataHandle& data, FuncPtrType func)
-    {
-        KTDEBUG(eqplog, "Queueing data");
-        DataAndFunc daf;
-        daf.fData = data; // I'd like to use move semantics here (operator=(shared_ptr&&)), but they didn't work, so I bootstrapped with copy and reset.
-        data.reset();
-        daf.fFuncPtr = func;
-        fQueue.push(daf);
-        return;
-    }
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueData(KTDataHandle& data)
-    {
-        DoQueueData(data, fFuncPtr);
-        return;
-    }
-/*
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::DoQueueDataList(std::list< KTDataHandle& >* dataList, void (XProcessorType::*func)(KTDataHandle))
-    {
-        typedef std::list< KTDataHandle > DataList;
-
-        KTDEBUG(eqplog, "Queueing data objects");
-        DataAndFunc daf;
-        while (! dataList->empty())
-        {
-            daf.fData = &(dataList->front()); // using move semantics
-            daf.fFuncPtr = func;
-            dataList->pop_front();
-            fQueue.push(daf);
-        }
-        delete dataList;
-        return;
-    }
-*/
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::SwitchToTimedPop()
-    {
-        if (fPopFromQueue == &KTConcurrentQueue< DataAndFunc >::timed_wait_and_pop)
-            return;
-
-        KTDEBUG(eqplog, "Switching to timed pop function");
-        fPopFromQueue = &KTConcurrentQueue< DataAndFunc >::timed_wait_and_pop;
-        if (fStatus == kRunning)
-        {
-            fStatus = kContinue;
-            KTINFO(eqplog, "Pop function changed; interrupting queue");
-            fQueue.interrupt();
-        }
-        return;
-    }
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::SwitchToUntimedPop()
-    {
-        if (fPopFromQueue == &KTConcurrentQueue< DataAndFunc >::wait_and_pop)
-            return;
-
-        KTDEBUG(eqplog, "Switching to untimed pop function");
-        this->fPopFromQueue = &KTConcurrentQueue< DataAndFunc >::wait_and_pop;
-        if (fStatus == kRunning)
-        {
-            fStatus = kContinue;
-            KTINFO(eqplog, "Pop function changed; interrupting queue");
-            fQueue.interrupt();
-        }
-        return;
-    }
-
-    template< class XProcessorType >
-    void KTDataQueueProcessorTemplate< XProcessorType >::SwitchToSinglePop()
-    {
-        if (fPopFromQueue == &KTConcurrentQueue< DataAndFunc >::try_pop)
-            return;
-
-        KTDEBUG(eqplog, "Switching to single-pop function");
-        this->fPopFromQueue = &KTConcurrentQueue< DataAndFunc >::try_pop;
-        if (fStatus == kRunning)
-        {
-            fStatus = kContinue;
-            KTINFO(eqplog, "Pop function changed; interrupting queue");
-            fQueue.interrupt();
-        }
-        return;
-    }
-
-} /* namespace Nymph */
-#endif /* KTDATAQUEUEPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTFilenameParsers.cc b/cpp/Cpp/Library_v1/Application/KTFilenameParsers.cc
deleted file mode 100644
index bad43a9..0000000
--- a/cpp/Cpp/Library_v1/Application/KTFilenameParsers.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * KTFilenameParsers.cc
- *
- *  Created on: May 31, 2013
- *      Author: nsoblath
- */
-
-#include "KTFilenameParsers.hh"
-
-#include "KTLogger.hh"
-
-#include <boost/property_tree/ptree.hpp>
-
-#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
-
-// I can't just use boost::spirit::qi because of naming conflicts with std
-using boost::spirit::qi::int_;
-using boost::spirit::qi::double_;
-// I had to take this out because of a naming conflict with boost::bind
-//using boost::spirit::qi::_1;
-using boost::spirit::qi::phrase_parse;
-using boost::spirit::ascii::space;
-using boost::phoenix::ref;
-
-using std::string;
-
-namespace Nymph
-{
-    KTLOGGER(fnplog, "KTFilenameParsers");
-
-
-    KTLocustMCFilename::KTLocustMCFilename(const string& filename)
-    {
-        bool parsed = phrase_parse(filename.begin(), filename.end(),
-                (int_[ref(fNEvents)=boost::spirit::qi::_1] >> "events_" >>
-                 double_[ref(fEventLength) = boost::spirit::qi::_1] >> "dur_" >>
-                 double_[ref(fdfdt) = boost::spirit::qi::_1] >> "dfdt_" >>
-                 double_[ref(fSignalPower) = boost::spirit::qi::_1] >> "power.egg"
-                ), space);
-        if (! parsed)
-        {
-            KTERROR(fnplog, "Filename was not parsed correctly: " << filename);
-        }
-    }
-
-
-}
diff --git a/cpp/Cpp/Library_v1/Application/KTFilenameParsers.hh b/cpp/Cpp/Library_v1/Application/KTFilenameParsers.hh
deleted file mode 100644
index 85939cd..0000000
--- a/cpp/Cpp/Library_v1/Application/KTFilenameParsers.hh
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * KTFilenameParsers.hh
- *
- *  Created on: May 31, 2013
- *      Author: nsoblath
- */
-
-#ifndef KTFILENAMEPARSERS_HH_
-#define KTFILENAMEPARSERS_HH_
-
-#include <string>
-
-namespace Nymph
-{
-    struct KTLocustMCFilename
-    {
-            unsigned fNEvents;
-            double fEventLength; // sec
-            double fdfdt; // Hz/sec ?
-            double fSignalPower; // Watts
-            KTLocustMCFilename(const std::string& filename);
-    };
-
-
-} /* namespace Nymph */
-
-#endif /* KTFILENAMEPARSERS_HH_*/
diff --git a/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.cc b/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.cc
deleted file mode 100644
index c05e518..0000000
--- a/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.cc
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * KTPrintDataStructure.cc
- *
- *  Created on: Sept 12, 2014
- *      Author: N.S. Oblath
- */
-
-#include "KTPrintDataStructure.hh"
-
-#include "KTLogger.hh"
-
-#include <sstream>
-
-using boost::shared_ptr;
-
-namespace Nymph
-{
-    KTLOGGER(datalog, "KTPrintDataStructure");
-
-    // Register the processor
-    KT_REGISTER_PROCESSOR(KTPrintDataStructure, "print-data-structure");
-
-    KTPrintDataStructure::KTPrintDataStructure(const std::string& name) :
-            KTProcessor(name),
-            fDataSignal("data", this),
-            fDataStructSlot("print-data", this, &KTPrintDataStructure::PrintDataStructure, {"data"}),
-            fCutStructSlot("print-cuts", this, &KTPrintDataStructure::PrintCutStructure, {"data"}),
-            fDataAndCutStructSlot("print-data-and-cuts", this, &KTPrintDataStructure::PrintDataAndCutStructure, {"data"})
-    {
-    }
-
-    KTPrintDataStructure::~KTPrintDataStructure()
-    {
-    }
-
-    bool KTPrintDataStructure::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTPrintDataStructure::PrintDataStructure(KTDataHandle dataHandle)
-    {
-        DoPrintDataStructure(dataHandle);
-
-        KTSlotWrapper* slotWrap = fDataStructSlot.GetSlotWrapper();
-        slotWrap->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
-
-        fDataSignal(dataHandle);
-
-        return;
-    }
-
-    void KTPrintDataStructure::PrintCutStructure(KTDataHandle dataHandle)
-    {
-        DoPrintCutStructure(dataHandle);
-
-        KTSlotWrapper* slotWrap = fCutStructSlot.GetSlotWrapper();
-        fCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
-
-        fDataSignal(dataHandle);
-
-        return;
-    }
-
-
-    void KTPrintDataStructure::PrintDataAndCutStructure(KTDataHandle dataHandle)
-    {
-        DoPrintDataStructure(dataHandle);
-        DoPrintCutStructure(dataHandle);
-
-        KTSlotWrapper* slotWrap = fDataAndCutStructSlot.GetSlotWrapper();
-        fDataAndCutStructSlot.GetSlotWrapper()->GetThreadRef()->Break( dataHandle, slotWrap->GetDoBreakpoint() );
-
-        fDataSignal(dataHandle);
-
-        return;
-    }
-
-    void KTPrintDataStructure::DoPrintDataStructure(KTDataHandle dataHandle)
-    {
-        std::stringstream printbuf;
-
-        printbuf << "\nData Structure:\n";
-        printbuf << "\t- " << dataHandle->Name() << '\n';
-        KTDEBUG(datalog, "Found data type " << dataHandle->Name());
-        KTExtensibleCore< KTDataRider >::BasePtrType nextData = dataHandle->Next();
-        while (nextData != NULL)
-        {
-            printbuf << "\t- " << nextData->Name() << '\n';
-            KTDEBUG(datalog, "Found data type " << nextData->Name());
-            nextData = nextData->Next();
-        }
-
-        KTINFO(datalog, printbuf.str());
-
-        return;
-    }
-
-    void KTPrintDataStructure::DoPrintCutStructure(KTDataHandle dataHandle)
-    {
-        std::stringstream printbuf;
-
-        KTCutStatus& cutStatus = dataHandle->CutStatus();
-        printbuf << "\n" << cutStatus;
-
-        const KTCutStatus::CutResults_t cutResults = cutStatus.CutResults();
-        printbuf << "Cut Structure:\n";
-        unsigned nCuts = cutResults.size();
-        for (unsigned iCut = 0; iCut < nCuts; ++iCut)
-        {
-            if (! cutResults[iCut].fAssigned) continue;
-            printbuf << "\t" << iCut << " -- " << cutResults[iCut].fName << " -- is cut: " << cutResults[iCut].fState << '\n';
-            KTDEBUG(datalog, "Found cut type " << cutResults[iCut].fName << " at mask position " << iCut);
-        }
-
-        KTINFO(datalog, printbuf.str());
-
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.hh b/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.hh
deleted file mode 100644
index 10c171c..0000000
--- a/cpp/Cpp/Library_v1/Application/KTPrintDataStructure.hh
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- @file KTPrintDataStructure.hh
- @brief Contains KTPrintDataStructure
- @details Prints the structure of data objects
- @author: N.S. Oblath
- @date: Sept 12, 2014
- */
-
-#ifndef KTPRINTDATASTRUCTURE_HH_
-#define KTPRINTDATASTRUCTURE_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTSlot.hh"
-
-
-namespace Nymph
-{
-
-    /*!
-     @class KTPrintDataStructure
-     @author N.S. Oblath
-
-     @brief Prints the structure of data objects
-
-     @details
-
-     Configuration name: "print-data-structure"
-
-     Example usage:
-       "egg-processor:ts" --> "simple-fft:ts"
-       "simple-fft:fft-forward" --> "print-data-structure:print-data"
-     will show that the data consists of data, slice-header, raw-time-series, time-series, and frequency-spectrum-polar
-
-     Available configuration values: none
-
-     Slots:
-     - "print-data": void (KTDataHandle) -- Prints the structure of the data object; Does not modify the data or cuts; Emits signal "data"
-     - "print-cuts": void (KTDataHandle) -- Prints the structure of the data's cuts; Does not modify the data or cuts; Emits signal "data"
-     - "print-data-and-cuts": void (KTDataHandle) -- Prints the structure of the data object and its cuts; Does not modify the data or cuts; Emits signal "data"
-
-     Signals:
-     - "data": void (KTDataHandle) -- Emitted after structure information is printed
-    */
-
-    class KTPrintDataStructure : public KTProcessor
-    {
-        public:
-            KTPrintDataStructure(const std::string& name = "print-data-structure");
-            virtual ~KTPrintDataStructure();
-
-            bool Configure(const scarab::param_node& node);
-
-        public:
-            void PrintDataStructure(KTDataHandle dataHandle);
-            void PrintCutStructure(KTDataHandle dataHandle);
-            void PrintDataAndCutStructure(KTDataHandle dataHandle);
-
-        private:
-            void DoPrintDataStructure(KTDataHandle dataHandle);
-            void DoPrintCutStructure(KTDataHandle dataHandle);
-
-            //***************
-            // Signals
-            //***************
-
-        private:
-            KTSignalData fDataSignal;
-
-            //***************
-            // Slots
-            //***************
-
-        private:
-            KTSlot< KTDataHandle > fDataStructSlot;
-            KTSlot< KTDataHandle > fCutStructSlot;
-            KTSlot< KTDataHandle > fDataAndCutStructSlot;
-
-    };
-}
- /* namespace Nymph */
-#endif /* KTPRINTDATASTRUCTURE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.cc b/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.cc
deleted file mode 100644
index d483f1d..0000000
--- a/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.cc
+++ /dev/null
@@ -1,986 +0,0 @@
-/*
- * KTProcessorToolbox.cc
- *
- *  Created on: Sep 27, 2012
- *      Author: nsoblath
- */
-
-#include "KTProcessorToolbox.hh"
-
-#include "KTException.hh"
-#include "KTLogger.hh"
-#include "KTPrimaryProcessor.hh"
-
-#include "factory.hh"
-#include "param_codec.hh"
-
-#include <boost/exception/get_error_info.hpp>
-#include <boost/thread.hpp>
-
-using std::deque;
-using std::set;
-using std::string;
-using std::vector;
-
-namespace Nymph
-{
-    KTLOGGER(proclog, "KTProcessorToolbox");
-
-    KTProcessorToolbox::KTProcessorToolbox(const std::string& name) :
-            KTConfigurable(name),
-            fProcFactory(scarab::factory< KTProcessor, const std::string& >::get_instance()),
-            fRunSingleThreaded( false ),
-            fRunQueue(),
-            fProcMap(),
-            fThreadReferences(),
-            fContinueCV(),
-            fDoContinue( false ),
-            fBreakContMutex(),
-            fDoRunThread( nullptr ),
-            fDoRunPromise(),
-            fDoRunBreakFlag( false )
-    {
-    }
-
-    KTProcessorToolbox::~KTProcessorToolbox()
-    {
-        CancelThreads();
-
-        JoinRunThread();
-
-        ClearProcessors();
-    }
-
-    bool KTProcessorToolbox::Configure(const scarab::param_node& node)
-    {
-        KTPROG(proclog, "Configuring . . .");
-
-        SetRunSingleThreaded( node.get_value( "single-threaded", fRunSingleThreaded ) );
-
-        // Deal with "processor" blocks
-        if (! node.has("processors"))
-        {
-            KTWARN(proclog, "No processors were specified");
-        }
-        else
-        {
-            const scarab::param_array& procArray = node["processors"].as_array();
-            for( scarab::param_array::const_iterator procIt = procArray.begin(); procIt != procArray.end(); ++procIt )
-            {
-                if( ! procIt->is_node() )
-                {
-                    KTERROR( proclog, "Invalid processor entry: not a node" );
-                    return false;
-                }
-                const scarab::param_node& procNode = procIt->as_node();
-
-                if (! procNode.has("type"))
-                {
-                    KTERROR(proclog, "Unable to create processor: no processor type given");
-                    return false;
-                }
-                string procType = procNode["type"]().as_string();
-
-                string procName;
-                if (! procNode.has("name"))
-                {
-                    KTINFO(proclog, "No name given for processor of type <" << procType << ">; using type as name.");
-                    procName = procType;
-                }
-                else
-                {
-                    procName = procNode["name"]().as_string();
-                }
-                std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
-                if (newProc == NULL)
-                {
-                    KTERROR(proclog, "Unable to create processor of type <" << procType << ">");
-                    return false;
-                }
-
-                if (! AddProcessor(procName, newProc))
-                {
-                    KTERROR(proclog, "Unable to add processor <" << procName << ">");
-                    //delete newProc; //not required for smart pointers
-                    return false;
-                }
-            }
-        }
-
-
-        // Then deal with connections"
-        if (! node.has("connections"))
-        {
-            KTWARN(proclog, "No connections were specified");
-        }
-        else
-        {
-            const scarab::param_array& connArray = node["connections"].as_array();
-            for( scarab::param_array::const_iterator connIt = connArray.begin(); connIt != connArray.end(); ++connIt )
-            {
-                if( ! connIt->is_node() )
-                {
-                    KTERROR( proclog, "Invalid connection entry: not a node" );
-                    return false;
-                }
-                const scarab::param_node& connNode = connIt->as_node();
-
-                if ( ! connNode.has("signal") || ! connNode.has("slot") )
-                {
-                    KTERROR(proclog, "Signal/Slot connection information is incomplete!");
-                    if (connNode.has("signal"))
-                    {
-                        KTWARN(proclog, "signal = " << connNode["signal"]());
-                    }
-                    else
-                    {
-                        KTERROR(proclog, "signal = MISSING");
-                    }
-
-                    if (connNode.has("slot"))
-                    {
-                        KTWARN(proclog, "slot = " << connNode["slot"]());
-                    }
-                    else
-                    {
-                        KTERROR(proclog, "slot = MISSING");
-                    }
-                    return false;
-                }
-
-                bool connReturn = false;
-                if (connNode.has("order"))
-                {
-                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string(), connNode["order"]().as_int());
-                }
-                else
-                {
-                    connReturn = MakeConnection(connNode["signal"]().as_string(), connNode["slot"]().as_string());
-                }
-                if (! connReturn)
-                {
-                    KTERROR(proclog, "Unable to make connection <" << connNode["signal"]() << "> --> <" << connNode["slot"]() << ">");
-                    return false;
-                }
-
-                if (connNode.has("breakpoint"))
-                {
-                    if (! SetBreakpoint(connNode["slot"]().as_string()))
-                    {
-                        KTERROR(proclog, "Unable to set breakpoint on <" << connNode["slot"]());
-                        return false;
-                    }
-                }
-
-                KTINFO(proclog, "Signal <" << connNode["signal"]() << "> connected to slot <" << connNode["slot"]() << ">");
-            }
-        }
-
-
-        // Finally, deal with processor-run specifications
-        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
-        // If names are grouped (in another array), those in that group will be run in parallel.
-        // In single threaded mode all threads will be run sequentially in the order they were specified.
-        if (! node.has("run-queue"))
-        {
-            KTWARN(proclog, "Run queue was not specified");
-        }
-        else
-        {
-            const scarab::param_array& rqArray = node["run-queue"].as_array();
-            for (scarab::param_array::const_iterator rqIt = rqArray.begin(); rqIt != rqArray.end(); ++rqIt)
-            {
-                if (rqIt->is_value())
-                {
-                    if (! PushBackToRunQueue((*rqIt)().as_string()))
-                    {
-                        KTERROR(proclog, "Unable to process run-queue entry: could not add processor to the queue");
-                        return false;
-                    }
-                }
-                else if (rqIt->is_array())
-                {
-                    const scarab::param_array* rqNode = &( rqIt->as_array() );
-                    std::vector< std::string > names;
-
-                    for (scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt)
-                    {
-                        if (! rqArrayIt->is_value())
-                        {
-                            KTERROR(proclog, "Invalid run-queue array entry: not a value");
-                            return false;
-                        }
-                        names.push_back((*rqArrayIt)().as_string());
-                    }
-
-                    if (! PushBackToRunQueue(names))
-                    {
-                        KTERROR(proclog, "Unable to process run-queue entry: could not add list of processors to the queue");
-                        return false;
-                    }
-                }
-                else
-                {
-                    KTERROR(proclog, "Invalid run-queue entry: not a value or array");
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool KTProcessorToolbox::ConfigureProcessors(const scarab::param_node& node)
-    {
-        for (ProcMapIt iter = fProcMap.begin(); iter != fProcMap.end(); iter++)
-        {
-            KTDEBUG(proclog, "Attempting to configure processor <" << iter->first << ">");
-            string procName = iter->first;
-            string nameUsed(procName);
-            if (! node.has(nameUsed))
-            {
-                nameUsed = iter->second.fProc->GetConfigName();
-                if (! node.has(nameUsed))
-                {
-                    KTWARN(proclog, "Did not find a parameter node <" << procName << "> or <" << nameUsed << ">\n"
-                            "\tProcessor <" << procName << "> was not configured.");
-                    continue;
-                }
-            }
-            const scarab::param_node& subNode = node[nameUsed].as_node();
-            if (! iter->second.fProc->Configure(subNode))
-            {
-                KTERROR(proclog, "An error occurred while configuring processor <" << procName << "> with parameter node <" << nameUsed << ">");
-                return false;
-            }
-        }
-        return true;
-    }
-
-    bool KTProcessorToolbox::ConfigureProcessors(const std::string& config)
-    {
-        scarab::param_translator translator;
-        scarab::param_node optNode;
-        optNode.add( "encoding", new scarab::param_value( "json" ) );
-        return ConfigureProcessors( translator.read_string( config, optNode )->as_node() );
-    }
-
-    std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName)
-    {
-        ProcMapIt it = fProcMap.find(procName);
-        if (it == fProcMap.end())
-        {
-            KTWARN(proclog, "Processor <" << procName << "> was not found.");
-            return NULL;
-        }
-        return it->second.fProc;
-    }
-
-    const std::shared_ptr< KTProcessor > KTProcessorToolbox::GetProcessor(const std::string& procName) const
-    {
-        ProcMapCIt it = fProcMap.find(procName);
-        if (it == fProcMap.end())
-        {
-            KTWARN(proclog, "Processor <" << procName << "> was not found.");
-            return NULL;
-        }
-        return it->second.fProc;
-    }
-
-    bool KTProcessorToolbox::AddProcessor(const std::string& procName, std::shared_ptr< KTProcessor > proc)
-    {
-        ProcMapIt it = fProcMap.find(procName);
-        if (it == fProcMap.end())
-        {
-            ProcessorInfo pInfo;
-            pInfo.fProc = proc;
-            fProcMap.insert(ProcMapValue(procName, pInfo));
-            KTDEBUG(proclog, "Added processor <" << procName << "> (a.k.a. " << proc->GetConfigName() << ")");
-            return true;
-        }
-        KTWARN(proclog, "Processor <" << procName << "> already exists; new processor was not added.");
-        return false;
-    }
-
-    bool KTProcessorToolbox::AddProcessor(const std::string& procType, const std::string& procName)
-    {
-        ProcMapIt it = fProcMap.find(procName);
-        if (it == fProcMap.end())
-        {
-            std::shared_ptr< KTProcessor > newProc ( fProcFactory->create(procType, procType));
-            if (newProc == NULL)
-            {
-                KTERROR(proclog, "Unable to create processor of type <" << procType << ">");
-                return false;
-            }
-            if (! AddProcessor(procName, newProc))
-            {
-                KTERROR(proclog, "Unable to add processor <" << procName << ">");
-                //delete newProc;
-                return false;
-            }
-            return true;
-        }
-        KTWARN(proclog, "Processor <" << procName << "> already exists; new processor was not added.");
-        return false;
-    }
-
-    bool KTProcessorToolbox::RemoveProcessor(const std::string& procName)
-    {
-        std::shared_ptr< KTProcessor > procToRemove = ReleaseProcessor(procName);
-        if (procToRemove == NULL)
-        {
-            return false;
-        }
-        //delete procToRemove;
-        KTDEBUG(proclog, "Processor <" << procName << "> deleted.");
-        return true;
-    }
-
-    std::shared_ptr< KTProcessor > KTProcessorToolbox::ReleaseProcessor(const std::string& procName)
-    {
-        ProcMapIt it = fProcMap.find(procName);
-        if (it == fProcMap.end())
-        {
-            KTWARN(proclog, "Processor <" << procName << "> was not found.");
-            return NULL;
-        }
-        std::shared_ptr< KTProcessor > procToRelease = it->second.fProc;
-        fProcMap.erase(it);
-        return procToRelease;
-    }
-
-    void KTProcessorToolbox::ClearProcessors()
-    {
-        /*for (ProcMapIt it = fProcMap.begin(); it != fProcMap.end(); it++)
-        {
-            delete it->second.fProc;
-        }*/ //not required for smart pointers
-        fProcMap.clear();
-        fRunQueue.clear();
-        return;
-    }
-
-
-    bool KTProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot, int order)
-    {
-        string signalProcName, signalName;
-        if (! ParseSignalSlotName(signal, signalProcName, signalName))
-        {
-            KTERROR(proclog, "Unable to parse signal name: <" << signal << ">");
-            return false;
-        }
-
-        string slotProcName, slotName;
-        if (! ParseSignalSlotName(slot, slotProcName, slotName))
-        {
-            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
-            return false;
-        }
-
-        return MakeConnection(signalProcName, signalName, slotProcName, slotName, order);
-    }
-
-    bool KTProcessorToolbox::MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order)
-    {
-        std::shared_ptr< KTProcessor > signalProc = GetProcessor(signalProcName);
-        if (signalProc == NULL)
-        {
-            KTERROR(proclog, "Processor named <" << signalProcName << "> was not found!");
-            return false;
-        }
-
-        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
-        if (slotProc == NULL)
-        {
-            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
-            return false;
-        }
-
-        try
-        {
-            if (order != std::numeric_limits< int >::min())
-            {
-                signalProc->ConnectASlot(signalName, slotProc.get(), slotName, order);
-            }
-            else
-            {
-                signalProc->ConnectASlot(signalName, slotProc.get(), slotName);
-            }
-        }
-        catch (boost::exception& e)
-        {
-            KTERROR(proclog, "An error occurred while connecting signals and slots:\n"
-                    << "\tSignal " << signalName << " from processor " << signalProcName << " (a.k.a. " << signalProc->GetConfigName() << ")" << '\n'
-                    << "\tSlot " << slotName << " from processor " << slotProcName << " (a.k.a. " << slotProc->GetConfigName() << ")" << '\n'
-                    << '\t' << diagnostic_information( e ));
-            return false;
-        }
-
-        return true;
-    }
-
-    bool KTProcessorToolbox::SetBreakpoint(const std::string& slot)
-    {
-        string slotProcName, slotName;
-        if (! ParseSignalSlotName(slot, slotProcName, slotName))
-        {
-            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
-            return false;
-        }
-
-        return SetBreakpoint(slotProcName, slotName);
-    }
-
-    bool KTProcessorToolbox::SetBreakpoint(const std::string& slotProcName, const std::string& slotName)
-    {
-        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
-        if (slotProc == NULL)
-        {
-            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
-            return false;
-        }
-
-        try
-        {
-            slotProc->SetDoBreakpoint(slotName, true);
-            return true;
-        }
-        catch (boost::exception& e)
-        {
-            KTERROR(proclog, "Unable to set breakpoint: " << diagnostic_information( e ));
-            return false;
-        }
-    }
-
-    bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slot)
-    {
-        string slotProcName, slotName;
-        if (! ParseSignalSlotName(slot, slotProcName, slotName))
-        {
-            KTERROR(proclog, "Unable to parse slot name: <" << slot << ">");
-            return false;
-        }
-
-        return RemoveBreakpoint(slotProcName, slotName);
-    }
-
-    bool KTProcessorToolbox::RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName)
-    {
-        std::shared_ptr< KTProcessor > slotProc = GetProcessor(slotProcName);
-        if (slotProc == NULL)
-        {
-            KTERROR(proclog, "Processor named <" << slotProcName << "> was not found!");
-            return false;
-        }
-
-        try
-        {
-            slotProc->SetDoBreakpoint(slotName, false);
-            return true;
-        }
-        catch (boost::exception& e)
-        {
-            KTERROR(proclog, "Unable to set breakpoint: " << diagnostic_information( e ));
-            return false;
-        }
-    }
-
-    bool KTProcessorToolbox::ParseSignalSlotName(const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot) const
-    {
-        size_t sepPos = toParse.find_first_of(fSigSlotNameSep);
-        if (sepPos == string::npos)
-        {
-            KTERROR(proclog, "Unable to find separator between processor and signal/slot name in <" << toParse << ">");
-            return false;
-        }
-        nameOfProc = toParse.substr(0, sepPos);
-        nameOfSigSlot = toParse.substr(sepPos + 1);
-        return true;
-    }
-
-
-    bool KTProcessorToolbox::PushBackToRunQueue(const std::string& name)
-    {
-        ThreadGroup threadGroup;
-
-        if (! AddProcessorToThreadGroup( name, threadGroup))
-        {
-            KTERROR(proclog, "Unable to add processor <" << name << "> to thread group");
-            return false;
-        }
-
-        fRunQueue.push_back(threadGroup);
-
-        KTINFO(proclog, "Added processor <" << name << "> to the run queue");
-        return true;
-    }
-
-    bool KTProcessorToolbox::PushBackToRunQueue(std::initializer_list< std::string > names)
-    {
-        return PushBackToRunQueue(std::vector< std::string >(names));
-    }
-
-    bool KTProcessorToolbox::PushBackToRunQueue(std::vector< std::string > names)
-    {
-        ThreadGroup threadGroup;
-
-        std::stringstream toPrint;
-        for (const std::string& name : names)
-        {
-            if (! AddProcessorToThreadGroup(name, threadGroup))
-            {
-                KTERROR(proclog, "Unable to add processor <" << name << "> to thread group");
-                return false;
-            }
-            toPrint << name << ", "; // the extra comma at the end is removed below
-        }
-
-        fRunQueue.push_back(threadGroup);
-        std::string toPrintString = toPrint.str();
-        toPrintString.resize(toPrintString.size()-2);
-        KTINFO(proclog, "Added processors <" << toPrintString << "> to the run queue");
-        return true;
-    }
-
-    bool KTProcessorToolbox::AddProcessorToThreadGroup(const std::string& name, ThreadGroup& group)
-    {
-        std::shared_ptr< KTProcessor > procForRunQueue = GetProcessor(name);
-        KTDEBUG(proclog, "Attempting to add processor <" << name << "> to the run queue");
-        if (procForRunQueue == NULL)
-        {
-            KTERROR(proclog, "Unable to find processor <" << name << "> requested for the run queue");
-            return false;
-        }
-
-        KTPrimaryProcessor* primaryProc = dynamic_cast< KTPrimaryProcessor* >(procForRunQueue.get());
-        if (primaryProc == NULL)
-        {
-            KTERROR(proclog, "Processor <" << name << "> is not a primary processor.");
-            return false;
-        }
-        //group.insert(primaryProc);
-        group.insert(Thread(primaryProc, name));
-        return true;
-    }
-
-    void KTProcessorToolbox::AsyncRun()
-    {
-        if( fDoRunThread != nullptr )
-        {
-            KTERROR( proclog, "It appears that a run has already been started" );
-            return;
-        }
-
-        fDoRunPromise = boost::promise< void >();
-        fDoRunFuture = fDoRunPromise.get_future().share();
-
-        bool willRunSingleThreaded = fRunSingleThreaded;
-#ifdef SINGLETHREADED
-        willRunSingleThreaded = true;
-#endif
-
-        if( willRunSingleThreaded )
-        {
-            StartSingleThreadedRun();
-        }
-        else
-        {
-            StartMultiThreadedRun();
-        }
-
-        return;
-    }
-
-    void KTProcessorToolbox::StartSingleThreadedRun()
-    {
-        auto singleThreadRun = [&]()
-        {
-            try
-            {
-                KTPROG( proclog, "Starting single-threaded processing" );
-
-                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-                {
-                    for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                    {
-                        boost_unique_lock breakContLock( fBreakContMutex );
-
-                        std::string procName( tgIter->fName );
-                        KTINFO( proclog, "Starting processor <" << procName << ">" );
-
-                        std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                        thisThreadRef->Name() = procName;
-
-                        thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                        thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
-
-                        fThreadReferences.push_back( thisThreadRef );
-
-                        boost::condition_variable threadStartedCV;
-                        boost::mutex threadStartedMutex;
-                        bool threadStartedFlag = false;
-
-                        boost_unique_lock threadStartedLock( threadStartedMutex );
-                        boost::thread thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
-                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">; waiting for thread start" );
-                        while( ! threadStartedFlag )
-                        {
-                            threadStartedCV.wait( threadStartedLock );
-                        }
-                        KTDEBUG( proclog, "Thread has started" );
-
-                        KTDEBUG( proclog, "Thread ID is <" << thread.get_id() << ">" );
-
-                        bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
-                        do
-                        {
-                            boost::future_status status;
-                            do
-                            {
-                                status = fThreadReferences.back()->GetDataPtrRetFuture().wait_for( boost::chrono::milliseconds(500) );
-                            } while (status != boost::future_status::ready);
-
-                            stillRunning = false;
-                            if( fThreadReferences.back()->GetBreakFlag() )
-                            {
-                                KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << procName << ">; may not be where breakpoint is set)" );
-
-                                WaitForContinue( breakContLock );
-
-                                KTDEBUG( proclog, "Breakpoint finished" );
-                                stillRunning = true;
-                            }
-                            else
-                            {
-                                try
-                                {
-                                    fThreadReferences.back()->GetReturnValue();
-                                    KTINFO( proclog, "Thread <" << procName << "> has finished" );
-                                    fThreadReferences.pop_back();
-                                }
-                                catch( boost::exception& e )
-                                {
-                                    e << KTErrorMsgInfo< struct procTB_STRFinishing >( "There was an error while finishing thread <" + procName + "> and retrieving its results" );
-                                    throw;
-                                }
-                                stillRunning = false;
-                            }
-                        } while( stillRunning );
-
-                        KTINFO( proclog, "Processor <" << procName << "> has finished" );
-
-                        thread.join();
-                        fThreadReferences.clear();
-                    } // end for loop over the thread group
-                } // end for loop over the run-queue
-
-                KTPROG( proclog, "Processing is complete (single-threaded)" );
-            }
-            catch( std::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                KTERROR( proclog, "Caught std::exception thrown in a processor or in the single-threaded run function: " << e.what() );
-                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            catch( boost::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                KTERROR( proclog, "Caught boost::exception thrown in a processor or in the single-threaded run function" );
-                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartSingleThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            fDoRunPromise.set_value();
-            return;
-        }; // end single-threaded run lambda
-
-        fDoRunThread = new boost::thread( singleThreadRun );
-        return;
-    }
-    void KTProcessorToolbox::StartMultiThreadedRun()
-    {
-        auto multiThreadRun = [&]()
-        {
-            try
-            {
-                KTPROG( proclog, "Starting multi-threaded processing" );
-
-                for (RunQueue::iterator rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
-                {
-                    boost::thread_group threads;
-
-                    { // scope for threadFuturesLock
-                        boost_unique_lock breakContLock( fBreakContMutex );
-                        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
-
-                        for (ThreadGroup::iterator tgIter = rqIter->begin(); tgIter != rqIter->end(); ++tgIter)
-                        {
-                            std::string procName( tgIter->fName );
-                            KTINFO( proclog, "Starting processor <" << procName << ">" );
-
-                            std::shared_ptr< KTThreadReference > thisThreadRef = std::make_shared< KTThreadReference >();
-                            thisThreadRef->Name() = procName;
-
-                            thisThreadRef->SetInitiateBreakFunc( [&](){ this->InitiateBreak(); } );
-                            thisThreadRef->SetWaitForContinueFunc( [&]( boost_unique_lock& lock ){ this->WaitForContinue( lock ); } );
-                            fThreadReferences.push_back( thisThreadRef );
-
-                            boost::condition_variable threadStartedCV;
-                            boost::mutex threadStartedMutex;
-                            bool threadStartedFlag = false;
-
-                            boost_unique_lock threadStartedLock( threadStartedMutex );
-                            boost::thread* thisThread = new boost::thread( [&](){ tgIter->fProc->operator()( thisThreadRef, threadStartedCV, threadStartedFlag ); } );
-                            KTDEBUG( proclog, "Thread ID is <" << thisThread->get_id() << ">; waiting for thread start" );
-                            while( ! threadStartedFlag )
-                            {
-                                threadStartedCV.wait( threadStartedLock );
-                            }
-                            KTDEBUG( proclog, "Thread has started" );
-
-                            threads.add_thread( thisThread );
-
-                        }// end for loop over the thread group
-                    } // end scope for threadFuturesLock
-
-                    bool stillRunning = true; // determines behavior that depends on whether a return from the thread was temporary or from the thread completing
-                    do
-                    {
-                        auto finishedFuturePtr = boost::wait_for_any( KTThreadRefFutureIterator(fThreadReferences.begin()), KTThreadRefFutureIterator(fThreadReferences.end()) );
-                        boost_unique_lock breakContLock( fBreakContMutex );
-
-                        size_t iThread = finishedFuturePtr - KTThreadRefFutureIterator(fThreadReferences.begin());
-                        auto finishedReferencePtr = fThreadReferences.begin() + iThread;
-                        std::string threadName( (*finishedReferencePtr)->Name() );
-                        KTDEBUG( proclog, "Thread <" << iThread << " (" << threadName << ") > has stopped for some reason" );
-
-                        stillRunning = false;
-                        if( fDoRunBreakFlag )
-                        {
-                            // a breakpoint has been reached
-                            KTDEBUG( proclog, "Breakpoint reached (seen first in thread <" << threadName << ">; may not be where breakpoint is set)" );
-
-                            // wait here for the user to continue
-                            WaitForContinue( breakContLock );
-
-                            KTDEBUG( proclog, "Breakpoint finished" );
-                            stillRunning = true;
-                            //continueSignal = fMasterContSignal; // refresh the local copy of the shared future
-                        }
-                        else
-                        {
-                            // we're finished a thread; get its results
-                            try
-                            {
-                                KTINFO( proclog, "Thread <" << threadName << "> has finished" );
-                                finishedFuturePtr->get();
-                                fThreadReferences.erase( finishedReferencePtr );
-                            }
-                            catch( boost::exception& e )
-                            {
-                                e << KTErrorMsgInfo< struct procTB_MTRFinishing >( "There was an error while finishing thread <" + threadName + "> and retrieving its results" );
-                                throw;
-                            }
-
-                            if( fThreadReferences.empty() ) stillRunning = false;
-                            else stillRunning = true;
-                        }
-                    } while( stillRunning );
-
-                    KTDEBUG( proclog, "Joining threads" );
-                    threads.join_all();
-                    boost_unique_lock breakContLock( fBreakContMutex );
-                    fThreadReferences.clear();
-                } // end for loop over the run-queue
-
-                KTPROG( proclog, "Processing is complete (multi-threaded)" );
-            }
-            catch( std::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                KTERROR( proclog, "Caught std::exception thrown in a processor or in the multi-threaded run function: " << e.what() );
-                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            catch( boost::exception& e )
-            {
-                // exceptions thrown in this function or from within processors will end up here
-                KTERROR( proclog, "Caught boost::exception thrown in a processor or in the multi-threaded run function" );
-                KTWARN( proclog, "Setting boost::exception of do-run-promise in StartMultiThreadedRun" );
-                fDoRunPromise.set_exception( boost::current_exception() );
-                return;
-            }
-            KTWARN( proclog, "Setting value of do-run-promise in StartMultiThreadedRun" );
-            fDoRunPromise.set_value();
-            return;
-        }; // end multi-threaded run lambda
-
-        fDoRunThread = new boost::thread( multiThreadRun );
-        return;
-    }
-
-
-    bool KTProcessorToolbox::WaitForBreak()
-    {
-        boost_unique_lock breakContLock( fBreakContMutex );
-
-        if( fDoRunBreakFlag )
-        {
-            KTWARN( proclog, "Can't wait for a break; Already at a breakpoint" );
-            return true;
-        }
-
-        boost::shared_future< void > doRunFuture = fDoRunFuture;
-        if( ! doRunFuture.valid() )
-        {
-            BOOST_THROW_EXCEPTION( KTException() << "Cannot wait for a break in the current state (the \"DoRun\" future does not have a valid shared state)" << eom );
-        }
-
-        breakContLock.unlock();
-
-        // block here until there's a break
-        doRunFuture.wait();
-
-        if( fDoRunBreakFlag )
-        {
-            KTDEBUG( proclog, "Breakpoint reached (the wait is over)" );
-            return true;
-        }
-
-        try
-        {
-            doRunFuture.get();
-            KTDEBUG( proclog, "End-of-run reached (the wait-for-break is over)" );
-            return false;
-        }
-        catch( boost::exception& e )
-        {
-            KTERROR( proclog, "An error occurred during processing: " << boost::diagnostic_information( e ) );
-            return false;
-        }
-    }
-
-    void KTProcessorToolbox::WaitForEndOfRun()
-    {
-        // WaitForBreak() and WaitForContinue() throw boost::exception for problems with the future or promise objects
-
-        KTDEBUG( proclog, "Waiting for end-of-run" );
-        while( WaitForBreak() )
-        {
-            KTDEBUG( proclog, "Reached breakpoint; waiting for continue" );
-            boost::mutex localMutex;
-            boost_unique_lock localLock( localMutex );
-            WaitForContinue( localLock );
-            KTDEBUG( proclog, "Processing resuming; waiting for end-of-run" );
-        }
-        KTDEBUG( proclog, "End-of-run reached" );
-
-        return;
-    }
-
-    void KTProcessorToolbox::Continue()
-    {
-        if( ! fDoRunBreakFlag )
-        {
-            KTWARN( proclog, "Not currently at a breakpoint" );
-            return;
-        }
-
-        boost_unique_lock breakContLock( fBreakContMutex );
-
-        // reset all break flags
-        fDoRunBreakFlag = false;
-        std::vector< boost_unique_lock > trLocks;
-        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
-        {
-            trLocks.emplace_back( (*trIt)->Mutex() );
-            (*trIt)->SetBreakFlag( false );
-            (*trIt)->RefreshDataPtrRet();
-        }
-
-        // reset the do-run promise and future
-        fDoRunPromise = boost::promise< void >();
-        fDoRunFuture = fDoRunPromise.get_future().share();
-
-        KTINFO( proclog, "Continuing from breakpoint" );
-        // signal everything to resume
-        fDoContinue = true;
-        fContinueCV.notify_all();
-
-        return;
-    }
-
-    KTDataHandle KTProcessorToolbox::GetData( const std::string& threadName )
-    {
-        //boost_unique_lock threadFuturesLock( fThreadReferencesMutex );
-        boost_unique_lock breakContLock( fBreakContMutex );
-
-        auto trIt = fThreadReferences.begin();
-        for( ; trIt != fThreadReferences.end(); ++trIt )
-        {
-            if( (*trIt)->Name() == threadName ) break;
-        }
-        if( trIt == fThreadReferences.end() )
-        {
-            KTWARN( proclog, "Did not find thread <" << threadName << ">" );
-            BOOST_THROW_EXCEPTION( KTException() << "Did not find thread <" << threadName << ">" << eom );
-        }
-
-        boost_unique_lock lock( (*trIt)->Mutex() );
-        return (*trIt)->GetReturnValue();
-    }
-
-    void KTProcessorToolbox::InitiateBreak()
-    {
-        boost_unique_lock breakContLock( fBreakContMutex );
-        if( fDoRunBreakFlag ) return;
-
-        // set the continue flag to false so that things will wait for the continue
-        fDoContinue = false;
-
-        // set all break flags
-        // master break flag
-        fDoRunBreakFlag = true;
-        // thread break flags
-        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
-        {
-            boost_unique_lock lock( (*trIt)->Mutex() );
-            (*trIt)->SetBreakFlag( true );
-        }
-
-        // use the do-run promise to signal the break
-        KTWARN( proclog, "Setting value of do-run-promise" );
-        fDoRunPromise.set_value();
-
-        return;
-    }
-
-    void KTProcessorToolbox::CancelThreads()
-    {
-        boost_unique_lock breakContLock( fBreakContMutex );
-        for( auto trIt = fThreadReferences.begin(); trIt != fThreadReferences.end(); ++trIt )
-        {
-            boost_unique_lock lock( (*trIt)->Mutex() );
-            (*trIt)->SetCanceled( true );
-        }
-        return;
-    }
-
-    bool KTProcessorToolbox::Run()
-    {
-        // can throw boost::exception
-
-        AsyncRun();
-
-        WaitForEndOfRun();
-
-        JoinRunThread();
-
-        return true;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.hh b/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.hh
deleted file mode 100644
index e64c794..0000000
--- a/cpp/Cpp/Library_v1/Application/KTProcessorToolbox.hh
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- @file KTProcessorToolbox.hh
- @brief Contains KTProcessorToolbox
- @details Manages processors requested by the user at run time.
- @author: N. S. Oblath
- @date: Sep 27, 2012
- */
-
-#ifndef KTPROCESSORTOOLBOX_HH_
-#define KTPROCESSORTOOLBOX_HH_
-
-#include "KTConfigurable.hh"
-<<<<<<< HEAD:Library_v1/Application/KTProcessorToolbox.hh
-#include "KTMemberVariable.hh"
-#include "KTThreadReference.hh"
-
-#include "factory.hh"
-=======
->>>>>>> develop:Library/Application/KTProcessorToolbox.hh
-
-#define BOOST_THREAD_PROVIDES_FUTURE
-#include <boost/thread/future.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
-
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
-
-#include <deque>
-#include <initializer_list>
-#include <limits>
-#include <set>
-#include <memory>
-
-
-namespace Nymph
-{
-    class KTPrimaryProcessor;
-    class KTProcessor;
-
-    /*!
-     @class KTProcessorToolbox
-     @author N. S. Oblath
-
-     @brief Manages processors requested by the user at run time.
-
-     @details
-     KTProcessorToolbox allows the user to setup an application at runtime.
-
-     The user chooses the processors to be used, how they're linked with signals and slots, and what is used to "run"
-     the program via a configuration file.
-
-     While this does result in longer configuration files, it drastically simplifies the space of executables that are needed.
-
-     The following order should be used for configuring the processor toolbox:
-     <ol>
-         <li>Create processors</li>
-         <li>Connect signals and slots</li>
-         <li>Create the run queue</li>
-     </ol>
-
-     Available (nested) configuration values:
-     <ul>
-         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
-         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
-             <ul>
-                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
-                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
-             </ul>
-         </li>
-         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
-             <ul>
-                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
-                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
-                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
-             </ul>
-         </li>
-         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
-         The elements of this array specify processors that are run sequentially.
-         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
-             <ul>
-                 <li>processor name -- add a processor to the run queue, or </li>
-                 <li>array of processor names -- add a group of processors to the run queue.</li>
-             </ul>
-             In single-threaded mode, all processors will be run sequentially, in the order specified.
-         </li>
-     </ul>
-    */
-    class KTProcessorToolbox : public KTConfigurable
-    {
-        private:
-            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
-
-        public:
-            KTProcessorToolbox(const std::string& name = "processor-toolbox");
-            virtual ~KTProcessorToolbox();
-
-        public:
-            /// Configure the toolbox: create the processors; connnect signals and slots; and setup the run queue.
-            bool Configure(const scarab::param_node& node);
-
-            /// Configure processors (only those specified in the toolbox)
-            bool ConfigureProcessors(const scarab::param_node& node);
-            /// Configure processors from a json-encoding of their configurations
-            bool ConfigureProcessors(const std::string& config);
-
-            MEMBERVARIABLE( bool, RunSingleThreaded );
-
-        private:
-            struct ProcessorInfo
-            {
-                std::shared_ptr< KTProcessor > fProc;
-            };
-            typedef std::map< std::string, ProcessorInfo > ProcessorMap;
-            typedef ProcessorMap::iterator ProcMapIt;
-            typedef ProcessorMap::const_iterator ProcMapCIt;
-            typedef ProcessorMap::value_type ProcMapValue;
-
-        public:
-            /// Get a pointer to a processor in the toolbox
-            std::shared_ptr< KTProcessor > GetProcessor(const std::string& procName);
-            /// Get a pointer to a processor in the toolbox
-            const std::shared_ptr< KTProcessor > GetProcessor(const std::string& procName) const;
-
-            /// Add a processor to the toolbox
-            /// Toolbox takes ownership of the processor
-            bool AddProcessor(const std::string& procName, std::shared_ptr< KTProcessor > proc);
-            bool AddProcessor(const std::string& procType, const std::string& procName);
-
-            /// Remove a processor from the toolbox
-            bool RemoveProcessor(const std::string& procName);
-
-            /// Remove a processor from the toolbox and return it to the user
-            /// Ownership is passed to the user
-            std::shared_ptr< KTProcessor > ReleaseProcessor(const std::string& procName);
-
-            /// Remove all processors from the toolbox
-            /// Also clears the run queue
-            void ClearProcessors();
-
-        private:
-            ProcessorMap fProcMap;
-
-
-        public:
-            // for the MakeConnection overloading, extra overloading is used instead of default parameters so that the python interface works
-
-            /// Make a connection between the signal from one processor and the slot from another processor
-            /// Both processors should already have been added to the Toolbox
-            /// Signal and slot strings should be formatted as: [processor name]:[signal/slot name]
-            bool MakeConnection(const std::string& signal, const std::string& slot, int order);
-            bool MakeConnection(const std::string& signal, const std::string& slot) {return MakeConnection(signal, slot, std::numeric_limits< int >::min());}
-
-            /// Make a connection between the signal from one processor and the slot from another processor
-            /// Both processors should already have been added to the Toolbox
-            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName, int order);
-            bool MakeConnection(const std::string& signalProcName, const std::string& signalName, const std::string& slotProcName, const std::string& slotName)
-                    {return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min());}
-
-            /// Set a breakpoint on a slot
-            /// Slot string should be formatted as: [processor name]:[slot name]
-            bool SetBreakpoint(const std::string& slot);
-            /// Set a breakpoint on a slot
-            bool SetBreakpoint(const std::string& slotProcName, const std::string& slotName);
-
-            /// Remove a breakpoint from a slot
-            /// Slot string should be formatted as: [processor name]:[slot name]
-            bool RemoveBreakpoint(const std::string& slot);
-            /// Remove a breakpoint from a slot
-            bool RemoveBreakpoint(const std::string& slotProcName, const std::string& slotName);
-
-        private:
-            bool ParseSignalSlotName(const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot) const;
-            static const char fSigSlotNameSep = ':';
-
-
-        public:
-            /// Push a single processor to the back of the run queue
-            bool PushBackToRunQueue(const std::string& name);
-
-            /// Push a set of processors to be run in parallel to the back of the run queue
-            bool PushBackToRunQueue(std::initializer_list< std::string > names);
-            /// Push a set of processors to be run in parallel to the back of the run queue
-            bool PushBackToRunQueue(std::vector< std::string > names);
-
-            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
-            void PopBackOfRunQueue();
-
-            /// Clear the run queue
-            void ClearRunQueue();
-
-        private:
-            struct Thread
-            {
-                    KTPrimaryProcessor* fProc;
-                    std::string fName;
-                    Thread(KTPrimaryProcessor* proc, const std::string& name) : fProc(proc), fName(name)
-                    {}
-            };
-            struct CompareThread
-            {
-                bool operator() (const Thread& lhs, const Thread& rhs) const
-                {
-                    return lhs.fProc < rhs.fProc;
-                }
-            };
-            typedef std::set< Thread, CompareThread > ThreadGroup;
-            typedef std::deque< ThreadGroup > RunQueue;
-            bool AddProcessorToThreadGroup(const std::string& name, ThreadGroup& group);
-
-            RunQueue fRunQueue;
-
-        public:
-            /// Process the run queue.
-            /// This will call Run() on all of the processors in the queue.
-            bool Run();
-
-            void AsyncRun();
-
-            void WaitForContinue( boost_unique_lock& lock );
-
-            /// Returns when processing is completed or a breakpoint is reached
-            /// Throws a boost::exception if there's an error with the future object in use
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            bool WaitForBreak();
-
-            void WaitForEndOfRun();
-
-            void Continue();
-
-            void CancelThreads();
-
-            void JoinRunThread();
-
-            KTDataHandle GetData( const std::string& threadName );
-
-        private:
-            friend class KTThreadReference;
-
-            typedef boost::shared_future< KTDataHandle > Future;
-
-            void StartSingleThreadedRun();
-            void StartMultiThreadedRun();
-
-            // called from KTThreadReference::Break
-            void InitiateBreak();
-
-            std::vector< std::shared_ptr< KTThreadReference > > fThreadReferences;
-
-            boost::condition_variable fContinueCV;
-            bool fDoContinue;
-            boost::mutex fBreakContMutex;
-
-            boost::thread* fDoRunThread;
-            boost::promise< void > fDoRunPromise;
-            boost::shared_future< void > fDoRunFuture;
-            bool fDoRunBreakFlag;
-
-    };
-
-    template< class Value, class IIterator >
-    class KTThreadRefFutureIter : public boost::iterator_adaptor< KTThreadRefFutureIter< Value, IIterator >, IIterator, Value, boost::random_access_traversal_tag >
-    {
-        private:
-            // used for the conversion constructor below
-            struct enabler {};
-
-        public:
-            KTThreadRefFutureIter() :
-                    KTThreadRefFutureIter::iterator_adaptor_()
-            {}
-            KTThreadRefFutureIter( const IIterator& other ) :
-                    KTThreadRefFutureIter::iterator_adaptor_( other )
-            {}
-
-            // converts from Iterator to ConstIterator, but the enable_if business prevents converting from ConstIterator to Iterator
-            template< class OtherValue, class OtherIIterator >
-            KTThreadRefFutureIter( const KTThreadRefFutureIter< OtherValue, OtherIIterator > & other, typename boost::enable_if< boost::is_convertible< OtherValue, Value >, enabler >::type = enabler() ) :
-                    KTThreadRefFutureIter::iterator_adaptor_( other.base )
-            {}
-
-        private:
-            friend class boost::iterator_core_access;
-
-            Value& dereference() const
-            {
-                return (*(this->base_reference()))->GetDataPtrRetFuture();
-            }
-    };
-
-    typedef KTThreadRefFutureIter< boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::iterator > KTThreadRefFutureIterator;
-    typedef KTThreadRefFutureIter< const boost::unique_future< KTDataHandle >, std::vector< std::shared_ptr< KTThreadReference > >::const_iterator > KTThreadRefFutureConstIterator;
-
-
-    inline void KTProcessorToolbox::PopBackOfRunQueue()
-    {
-        fRunQueue.pop_back();
-        return;
-    }
-
-    inline void KTProcessorToolbox::ClearRunQueue()
-    {
-        fRunQueue.clear();
-        return;
-    }
-
-<<<<<<< HEAD:Library_v1/Application/KTProcessorToolbox.hh
-    inline void KTProcessorToolbox::WaitForContinue( boost_unique_lock& lock )
-    {
-        //fMasterContSignal.wait();
-        while( ! fDoContinue )
-        {
-            fContinueCV.wait( lock );
-        }
-        return;
-    }
-
-    inline void KTProcessorToolbox::JoinRunThread()
-    {
-        if( fDoRunThread == nullptr ) return;
-        fDoRunThread->join();
-        delete fDoRunThread;
-        fDoRunThread = nullptr;
-    }
-
-=======
->>>>>>> develop:Library/Application/KTProcessorToolbox.hh
-} /* namespace Nymph */
-#endif /* KTPROCESSORTOOLBOX_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh b/cpp/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
deleted file mode 100644
index a0dc85d..0000000
--- a/cpp/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * KTProcessorToolboxPybind.hh
- *
- *  Created on: Jan 29, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_
-#define NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_
-
-#include "KTProcessorToolbox.hh"
-
-#include "pybind11/pybind11.h"
-#include "pybind11/stl.h"
-
-namespace Nymph
-{
-    void ExportKTProcessorToolbox( pybind11::module& mod )
-    {
-        pybind11::class_< KTProcessorToolbox >( mod, "KTProcessorToolbox" )
-                .def( pybind11::init< const std::string & >() )
-
-                // members related to configuration
-                .def( "ConfigureProcessors", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::ConfigureProcessors,
-                        "Configure processors from a json dictionary. Top-level keys are processor names, values are dictionaries with their configurations" )
-
-                // processor access
-                // GetProcessor skipped because raw pointers are not supported by pybind11
-                .def( "AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::AddProcessor,
-                        "Create a processor by name and add it to the toolbox" )
-				.def("AddProcessor", (bool (KTProcessorToolbox::*)(const std::string&, std::shared_ptr< KTProcessor > proc)) &KTProcessorToolbox::AddProcessor,
-						                       "Create a processor and add it to the toolbox" )
-                .def( "RemoveProcessor", &KTProcessorToolbox::RemoveProcessor,
-                        "Remove a processor from the toolbox" )
-                // skipping ReleaseProcessor
-                .def( "ClearProcessor", &KTProcessorToolbox::ClearProcessors,
-                        "Remove all processors from the toolbox" )
-
-                // processor connections
-                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, int)) &KTProcessorToolbox::MakeConnection,
-                        "Make a connection between the signal of one processor and the slot of another processor; the signal and slot strings should be formatted as: [processor name]:[signal/slot name]" )
-                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::MakeConnection,
-                        "Make a connection between the signal of one processor and the slot of another processor; the signal and slot strings should be formatted as: [processor name]:[signal/slot name]" )
-                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, const std::string&, const std::string&, int)) &KTProcessorToolbox::MakeConnection,
-                        "Make a connection between the signal of one processor and the slot of another processor" )
-                .def( "MakeConnection", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&, const std::string&, const std::string&)) &KTProcessorToolbox::MakeConnection,
-                        "Make a connection between the signal of one processor and the slot of another processor" )
-
-                // breakpoints
-                .def( "SetBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::SetBreakpoint,
-                        "Set a breakpoint at a specific slot; slot string should be formatted as: [processor name]:[slot name]" )
-                .def( "SetBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::SetBreakpoint,
-                        "Set a breakpoint at a specific slot" )
-
-                .def( "RemoveBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::RemoveBreakpoint,
-                        "Remove a breakpoint; slot string should be formatted as: [processor name]:[slot name]" )
-                .def( "RemoveBreakpoint", (bool (KTProcessorToolbox::*)(const std::string&, const std::string&)) &KTProcessorToolbox::RemoveBreakpoint,
-                        "Remove a breakpoint" )
-
-                // run queue
-                .def( "PushBackToRunQueue", (bool (KTProcessorToolbox::*)(const std::string&)) &KTProcessorToolbox::PushBackToRunQueue,
-                        "Push one or more processors to the back of the run queue using a comma-separated string" )
-                .def( "PushBackToRunQueue", (bool (KTProcessorToolbox::*)(std::vector< std::string >)) &KTProcessorToolbox::PushBackToRunQueue,
-                        "Push one or more processors to the back of the run queue using a vector of strings" )
-
-                .def( "PopBackOfRunQueue", &KTProcessorToolbox::PopBackOfRunQueue,
-                        "Remove the last item in the run queue, whether it's a single processor or a group" )
-                .def( "ClearRunQueue", &KTProcessorToolbox::ClearRunQueue,
-                        "Remove all items from the run queue" )
-
-                // run methods
-                .def( "Run", &KTProcessorToolbox::Run, "Start the processors listed in the run queue (blocking)" )
-                .def( "AsyncRun", &KTProcessorToolbox::AsyncRun, "Non-blocking call to Run()" )
-                .def( "WaitForBreak", &KTProcessorToolbox::WaitForBreak, "Blocking call that waits until a breakpoint is reached; you must manually Continue() to proceed" )
-                .def( "WaitForEndOfRun", &KTProcessorToolbox::WaitForEndOfRun, "Blocking call to Continue() execution until the end of the run is reached; you must manually Continue() to proceed" )
-                .def( "Continue", &KTProcessorToolbox::Continue, "Resume execution (non-blocking)" )
-                .def( "CancelThreads", &KTProcessorToolbox::CancelThreads, "Kill any running thread at the next breakpoint check" )
-                .def( "JoinRunThread", &KTProcessorToolbox::JoinRunThread, "Blocking call to wait until Run() is complete; this should only be done by the owner of the thread (typically whoever called Run())" )
-
-                .def( "GetData", &KTProcessorToolbox::GetData, "Retrieve the data handle from a slot by thread name (i.e. the name of the primary processor for that thread)" );
-
-
-                /*
-                // these are implemented in the boost::python version but not yet here
-
-                PROPERTYMEMBER(KTProcessorToolbox, RunSingleThreaded)
-
-                // Processor access
-                .def("GetProcessor", GetProcessor_wrap, return_value_policy<reference_existing_object>(), "Get a pointer to a processor in the toolbox")
-                .def("AddProcessor", AddProcessor_Ref, "add a processor to the toolbox, toolbox takes ownership")
-                // TODO: Not 100% certain that the reference count for this processor is now correct, given the return_value_policy
-                .def("ReleaseProcessor", &KTProcessorToolbox::ReleaseProcessor, return_value_policy<reference_existing_object>(), "Remove a processor from the toolbox and return it to the user, ownership is passed")
-                */
-                ;
-
-    }
-
-}
-
-#endif /* NYMPH_KTPROCESSORTOOLBOXPYBIND_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTRunNymph.cc b/cpp/Cpp/Library_v1/Application/KTRunNymph.cc
deleted file mode 100644
index 7912d06..0000000
--- a/cpp/Cpp/Library_v1/Application/KTRunNymph.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * RunNymph.cc
- *
- *  Created on: Sep 13, 2016
- *      Author: obla999
- */
-
-#include "KTApplication.hh"
-#include "KTLogger.hh"
-#include "KTProcessorToolbox.hh"
-
-#include "param.hh"
-
-#include <string>
-
-KTLOGGER( nlog, "RunNymph" );
-
-namespace Nymph
-{
-    int RunNymph( std::shared_ptr< KTApplication > app )
-    {
-        try
-        {
-            const scarab::param_node& parentConfigNode = app->GetConfigurator()->Config();
-
-            if( ! app->Configure( parentConfigNode[app->GetConfigName()].as_node() ) )
-            {
-                KTERROR( nlog, "Unable to configure the application. Aborting." );
-                return -2;
-            }
-
-            // Create and configure the processor toolbox.
-            // This will create all of the requested processors, connect their signals and slots, and fill the run queue.
-            KTProcessorToolbox procTB;
-
-<<<<<<< HEAD:Library_v1/Application/KTRunNymph.cc
-            if ( ! procTB.Configure( parentConfigNode[procTB.GetConfigName()].as_node() ) )
-=======
-            if( ! procTB.Configure( parentConfigNode[procTB.GetConfigName()].as_node() ) )
->>>>>>> develop:Library/Application/KTRunNymph.cc
-            {
-                KTERROR( nlog, "Unable to configure processor toolbox. Aborting." );
-                return -3;
-            }
-
-            // Configure the processors
-            if( ! procTB.ConfigureProcessors( parentConfigNode ) )
-            {
-                KTERROR( nlog, "Unable to configure processors. Aborting." );
-                return -4;
-            }
-
-            // Execute the run queue!
-            bool success = procTB.Run();
-
-            procTB.ClearProcessors();
-
-            KTPROG( nlog, "That's all, folks!" );
-
-            if( ! success ) return -5;
-            return 0;
-        }
-        catch( std::exception& e )
-        {
-            KTERROR(  nlog, "Exception caught:\n" << e.what() );
-            return -1;
-        }
-    }
-}
diff --git a/cpp/Cpp/Library_v1/Application/KTRunNymph.hh b/cpp/Cpp/Library_v1/Application/KTRunNymph.hh
deleted file mode 100644
index dfdff17..0000000
--- a/cpp/Cpp/Library_v1/Application/KTRunNymph.hh
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * RunNymph.hh
- *
- *  Created on: Sep 13, 2016
- *      Author: obla999
- */
-
-#ifndef NYMPH_RUNNYMPH_HH_
-#define NYMPH_RUNNYMPH_HH_
-
-#include <memory>
-
-namespace Nymph
-{
-    class KTApplication;
-
-    int RunNymph( std::shared_ptr< KTApplication > aApp);
-}
-
-
-#endif /* NYMPH_RUNNYMPH_HH_ */
diff --git a/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.cc b/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.cc
deleted file mode 100644
index 2dc9fcd..0000000
--- a/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.cc
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * KTThroughputProfiler.cc
- *
- *  Created on: Nov 30, 2012
- *      Author: nsoblath
- */
-
-#include "KTThroughputProfiler.hh"
-
-#include <sstream>
-
-
-using std::string;
-using std::stringstream;
-using std::vector;
-
-namespace Nymph
-{
-    KTLOGGER(proflog, "KTThroughputProfiler");
-
-    KT_REGISTER_PROCESSOR(KTThroughputProfiler, "throughput-profiler");
-
-    KTThroughputProfiler::KTThroughputProfiler(const std::string& name) :
-            KTProcessor(name),
-            fOutputFileFlag(false),
-            fOutputFilename("throughput.json"),
-            fTimeStart(),
-            fTimeEnd(),
-            fNDataProcessed(0)
-    {
-        RegisterSlot("start", this, &KTThroughputProfiler::StartProfiling, {});
-        RegisterSlot("data", this, &KTThroughputProfiler::Data, {});
-        RegisterSlot("stop", this, &KTThroughputProfiler::Finish, {});
-    };
-
-    KTThroughputProfiler::~KTThroughputProfiler()
-    {
-    };
-
-    bool KTThroughputProfiler::Configure(const scarab::param_node& node)
-    {
-        SetOutputFileFlag(node.get_value< bool >("output-file-flag", fOutputFileFlag));
-        SetOutputFilename(node.get_value("output-filename-base", fOutputFilename));
-
-        return true;
-    }
-
-    void KTThroughputProfiler::Start()
-    {
-        fTimeStart = CurrentTime();
-        KTDEBUG(proflog, "Start time: " << fTimeStart.tv_sec << " sec and " << fTimeStart.tv_nsec << " nsec");
-        return;
-    }
-
-    void KTThroughputProfiler::Stop()
-    {
-        fTimeEnd = CurrentTime();
-        KTDEBUG(proflog, "End time: " << fTimeEnd.tv_sec << " sec and " << fTimeEnd.tv_nsec << " nsec");
-        return;
-    }
-
-    timespec KTThroughputProfiler::Elapsed()
-    {
-        return Diff(fTimeStart, fTimeEnd);
-    }
-
-    void KTThroughputProfiler::StartProfiling(KTDataHandle header)
-    {
-        KTINFO(proflog, "Profiling started");
-        fNDataProcessed = 0;
-        Start();
-        return;
-    }
-
-    void KTThroughputProfiler::Data(KTDataHandle data)
-    {
-        (void)data;
-        fNDataProcessed++;
-        return;
-    }
-
-    void KTThroughputProfiler::Finish()
-    {
-        Stop();
-        KTINFO(proflog, "Profiling stopped");
-        timespec diffTime = Elapsed();
-        KTPROG(proflog, fNDataProcessed << " slices processed");
-        double totalSeconds = TimeToSec(diffTime);
-        KTPROG(proflog, "Throughput time: " << diffTime.tv_sec << " sec and " << diffTime.tv_nsec << " nsec (" << totalSeconds << " sec)");
-
-        // Data production rate in bytes per second
-        //double dataProductionRate = double(fEggHeader.GetNChannels()) * fEggHeader.GetAcquisitionRate() * double(fEggHeader.GetDataTypeSize());
-
-        // Data throughput rate in bytes per second
-        //double dataThroughputRate = 0.;
-        //if (totalSeconds != 0)
-        //    dataThroughputRate = double(fEggHeader.GetSliceSize() * fEggHeader.GetNChannels() * fNDataProcessed * fEggHeader.GetDataTypeSize()) / totalSeconds;
-
-        //KTINFO(proflog, "Data production rate: " << dataProductionRate << " bytes per second");
-        //KTINFO(proflog, "Data throughput rate: " << dataThroughputRate << " bytes per second");
-        //KTPROG(proflog, "Analysis time factor: " << dataProductionRate / dataThroughputRate);
-
-        return;
-    }
-
-    timespec KTThroughputProfiler::CurrentTime()
-    {
-        timespec ts;
-        GetTimeCurrent(&ts);
-        return ts;
-    }
-
-    timespec KTThroughputProfiler::Diff(timespec start, timespec end) const
-    {
-        timespec diff;
-        TimeDiff(start, end, &diff);
-        return diff;
-    }
-
-#ifdef __MACH__
-    double KTThroughputProfiler::sTimebase = 0.0;
-    uint64_t KTThroughputProfiler::sTimestart = 0;
-#endif
-
-    int KTThroughputProfiler::GetTimeCurrent(struct timespec* time)
-    {
-    #ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
-        if (! sTimestart)
-        {
-            mach_timebase_info_data_t tb = { .numer = 0, .denom = 1 };
-            mach_timebase_info(&tb);
-            sTimebase = tb.numer;
-            sTimebase /= tb.denom;
-            sTimestart = mach_absolute_time();
-        }
-        double diff = (mach_absolute_time() - sTimestart) * sTimebase;
-        time->tv_sec = diff * MACNANO;
-        time->tv_nsec = diff - (time->tv_sec * MACGIGA);
-        return 0;
-    #else
-        return clock_gettime(CLOCK_PROCESS_CPUTIME_ID, time);
-    #endif
-
-    }
-
-    double KTThroughputProfiler::TimeToSec(struct timespec time)
-    {
-        return (double)time.tv_sec + (double)time.tv_nsec / (double)NSEC_PER_SEC;
-    }
-
-    void KTThroughputProfiler::TimeDiff(struct timespec start, struct timespec end, struct timespec* diff)
-    {
-        if ((end.tv_nsec - start.tv_nsec < 0))
-        {
-            diff->tv_sec = end.tv_sec - start.tv_sec - 1;
-            diff->tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
-        }
-        else
-        {
-            diff->tv_sec = end.tv_sec - start.tv_sec;
-            diff->tv_nsec = end.tv_nsec - start.tv_nsec;
-        }
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.hh b/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.hh
deleted file mode 100644
index 0d7509f..0000000
--- a/cpp/Cpp/Library_v1/Application/KTThroughputProfiler.hh
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * KTKTThroughputProfiler.hh
- *
- *  Created on: Nov 30, 2012
- *      Author: nsoblath
- *
- *      Portability for Mac OS X:
- *      Author: Jens Gustedt
- *      URL: http://stackoverflow.com/a/5167506
- */
-
-#ifndef KTTHROUGHPUTPROFILER_HH_
-#define KTTHROUGHPUTPROFILER_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTCoreData.hh"
-
-#include <string>
-#include <sys/time.h>
-#include <time.h>
-
-#ifndef NSEC_PER_SEC
-#define NSEC_PER_SEC 1000000000
-#endif
-
-#ifndef SEC_PER_NSEC
-#define SEC_PER_NSEC 1.e-9
-#endif
-
-#ifdef __MACH__
-#include <mach/mach_time.h>
-
-#ifndef MACNANO
-#define MACNANO (+1.0E-9)
-#define MACGIGA UINT64_C(1000000000)
-#endif // MACNANO
-#endif // __MACH__
-
-namespace Nymph
-{
-    /*!
-     @class KTThroughputProfiler
-     @author N. S. Oblath
-
-     @brief Measures the speed of data processing
-
-     @details
-
-     A single timer is used to count the total processing time.
-
-     The timer is started with a call to the Start function.
-     The ProcessHeader function is provided as a convenient timer-starting slot called "start", since the Egg processor emits a matching signal before slice processing starts.
-     If using the signal/slot interface, it's recommended to connect the "header" signal (e.g. from KTEggProcessor) to the "start" slot last (i.e. after any other processors have used the "header" signal).
-
-     The timer is stopped with a call to the Stop function.
-     The Finish function is provided as a convenient timer-stopping slot called "stop".
-     If using the signal/slot interface, it's recommended to connect the "egg-done" signal (e.g. from KTEggProcessor) to the "stop" slot first (i.e. before any other processors have used the "egg-done" signal).
-
-     Information printed:
-     - Number of slices processed
-     - Total throughput time -- time in seconds between calling the Start function and the Stop function
-     - Data production rate -- bytes per second calculated assuming the slices were recorded in real-time
-     - Data throughput rate -- bytes per second through the analysis
-     - Analysis time factor -- ratio of the data throughput rate to the data production rate.  If this is 1, then the code analyzes the data at the same speed it was produced.
-
-     Configuration name: "throughput-profiler"
-
-     Available configuration values:
-
-     Slots:
-     - "start": void (KTEggHeader*) -- Start the timer
-     - "data": void (KTDataHandle) -- Increment the counter on the number of data slices
-     - "stop": void () -- Stop the timer
-
-    */
-    class KTThroughputProfiler : public KTProcessor
-    {
-
-        public:
-            KTThroughputProfiler(const std::string& name = "throughput-profiler");
-            virtual ~KTThroughputProfiler();
-
-            bool Configure(const scarab::param_node& node);
-
-            void Start();
-            void Stop();
-
-            void StartProfiling(KTDataHandle data);
-
-            void Data(KTDataHandle data);
-
-            void Finish();
-
-            timespec Elapsed();
-
-            bool GetOutputFileFlag() const;
-            void SetOutputFileFlag(bool flag);
-
-            const std::string& GetOutputFilename() const;
-            void SetOutputFilename(const std::string& fname);
-
-        private:
-            timespec CurrentTime();
-            timespec Diff(timespec start, timespec end) const;
-
-            bool fOutputFileFlag;
-            std::string fOutputFilename;
-
-            timespec fTimeStart;
-            timespec fTimeEnd;
-
-            unsigned fNDataProcessed;
-
-            static int GetTimeCurrent(struct timespec* time);
-            static double TimeToSec(struct timespec time);
-            static void TimeDiff(struct timespec start, struct timespec end, struct timespec* diff);
-#ifdef __MACH__
-            static double sTimebase;
-            static uint64_t sTimestart;
-#endif
-
-
-    };
-
-    inline bool KTThroughputProfiler::GetOutputFileFlag() const
-    {
-        return fOutputFileFlag;
-    }
-
-    inline void KTThroughputProfiler::SetOutputFileFlag(bool flag)
-    {
-        fOutputFileFlag = flag;
-        return;
-    }
-
-    inline const std::string& KTThroughputProfiler::GetOutputFilename() const
-    {
-        return fOutputFilename;
-    }
-
-    inline void KTThroughputProfiler::SetOutputFilename(const std::string& fname)
-    {
-        fOutputFilename = fname;
-        return;
-    }
-
-} /* namespace Nymph */
-#endif /* KTTHROUGHPUTPROFILER_HH_ */
diff --git a/cpp/Cpp/Library_v1/CMakeLists.txt b/cpp/Cpp/Library_v1/CMakeLists.txt
deleted file mode 100644
index c03d325..0000000
--- a/cpp/Cpp/Library_v1/CMakeLists.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-# CMakeLists for Nymph/Library_v1
-# Author: N. Oblath
-
-include( PythonPackage )
-
-set( UTIL_DIR Utility )
-set( DATA_DIR Data )
-set( PROC_DIR Processor )
-set( IO_DIR IO )
-set( APPL_DIR Application )
-
-set( NYMPH_HEADERFILES
-#    ${UTIL_DIR}/KTCacheDirectory.hh
-#    ${UTIL_DIR}/KTConcurrentQueue.hh
-#    ${UTIL_DIR}/KTConfigurable.hh
-#    ${UTIL_DIR}/KTDirectory.hh
-#    ${UTIL_DIR}/KTEventLoop.hh
-#    ${UTIL_DIR}/KTException.hh
-#    ${UTIL_DIR}/KTExtensible.hh
-#    ${UTIL_DIR}/KTExtensibleStruct.hh
-#    ${UTIL_DIR}/KTExtensibleStructFactory.hh
-#    ${UTIL_DIR}/KTLogger.hh
-#    ${UTIL_DIR}/KTMemberVariable.hh
-#    ${UTIL_DIR}/KTTIFactory.hh
-#    ${UTIL_DIR}/KTTime.hh
-#    ${DATA_DIR}/KTApplyCut.hh
-#    ${DATA_DIR}/KTCoreData.hh
-#    ${DATA_DIR}/KTCut.hh
-#    ${DATA_DIR}/KTCutFilter.hh
-#    ${DATA_DIR}/KTCutResult.hh
-#    ${DATA_DIR}/KTCutStatus.hh
-#    ${DATA_DIR}/KTData.hh
-#    ${DATA_DIR}/KTRegisterNymphExtData.hh
-#    ${PROC_DIR}/KTConnection.hh
-#    ${PROC_DIR}/KTPrimaryProcessor.hh
-#    ${PROC_DIR}/KTProcessor.hh
-#    ${PROC_DIR}/KTSignal.hh
-#    ${PROC_DIR}/KTSignalWrapper.hh
-#    ${PROC_DIR}/KTSlot.hh
-#    ${PROC_DIR}/KTSlotWrapper.hh
-#    ${PROC_DIR}/KTThreadReference.hh
-#    ${IO_DIR}/KTJSONWriter.hh
-#    ${IO_DIR}/KTReader.hh
-#    ${IO_DIR}/KTWriter.hh
-#    ${APPL_DIR}/KTApplication.hh
-#    ${APPL_DIR}/KTCommandLineHandler.hh
-#    ${APPL_DIR}/KTCommandLineOption.hh
-#    ${APPL_DIR}/KTConfigurator.hh
-#    ${APPL_DIR}/KTDataQueueProcessor.hh
-#    ${APPL_DIR}/KTFilenameParsers.hh
-#    ${APPL_DIR}/KTPrintDataStructure.hh
-#    ${APPL_DIR}/KTProcessorToolbox.hh
-#    ${APPL_DIR}/KTRunNymph.hh
-#    ${APPL_DIR}/KTThroughputProfiler.hh
-    ${UTIL_DIR}/Exception.hh
-    ${UTIL_DIR}/MemberVariable.hh
-)
-
-set( NYMPH_SOURCEFILES
-#    ${UTIL_DIR}/KTCacheDirectory.cc
-#    ${UTIL_DIR}/KTConfigurable.cc
-#    ${UTIL_DIR}/KTDirectory.cc
-#    ${UTIL_DIR}/KTEventLoop.cc
-#    ${UTIL_DIR}/KTException.cc
-#    ${UTIL_DIR}/KTTime.cc
-#    ${DATA_DIR}/KTApplyCut.cc
-#    ${DATA_DIR}/KTCoreData.cc
-#    ${DATA_DIR}/KTCut.cc
-#    ${DATA_DIR}/KTCutFilter.cc
-#    ${DATA_DIR}/KTCutStatus.cc
-#    ${DATA_DIR}/KTData.cc
-#    ${PROC_DIR}/KTPrimaryProcessor.cc
-#    ${PROC_DIR}/KTProcessor.cc
-#    ${PROC_DIR}/KTSignalWrapper.cc
-#    ${PROC_DIR}/KTSlotWrapper.cc
-#    ${PROC_DIR}/KTThreadReference.cc
-#    ${IO_DIR}/KTJSONWriter.cc
-#    ${IO_DIR}/KTReader.cc
-#    ${IO_DIR}/KTWriter.cc
-#    ${APPL_DIR}/KTApplication.cc
-#    ${APPL_DIR}/KTCommandLineHandler.cc
-#    ${APPL_DIR}/KTConfigurator.cc
-#    ${APPL_DIR}/KTDataQueueProcessor.cc
-#    ${APPL_DIR}/KTFilenameParsers.cc
-#    ${APPL_DIR}/KTPrintDataStructure.cc
-#    ${APPL_DIR}/KTProcessorToolbox.cc
-#    ${APPL_DIR}/KTRunNymph.cc
-#    ${APPL_DIR}/KTThroughputProfiler.cc
-    ${UTIL_DIR}/Exception.cc
-)
-
-# Python binding headers
-set( NYMPH_PYBINDING_HEADERFILES
-    #${UTIL_DIR}/KTConfigurablePybind.hh
-    ${UTIL_DIR}/KTParamPybind.hh
-    ${PROC_DIR}/KTProcessorPybind.hh
-    ${PROC_DIR}/KTPyProcessor.hh
-)
-
-# Python bindings
-set( NYMPH_PYBINDING_SOURCEFILES
-    ${PROC_DIR}/KTProcessorPybind.cc
-    NymphPybind.cc
-)
-
-##################################################
-
-pbuilder_library( Nymph NYMPH_SOURCEFILES "" )
-pbuilder_install_headers( ${NYMPH_HEADERFILES} )
-
-if( Nymph_ENABLE_PYTHON )
-    set( LIB_DEPENDENCIES Nymph )
-
-    configure_file( AddLibPythonPath.sh.in AddLibPythonPath.sh @ONLY)
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/AddLibPythonPath.sh DESTINATION ${BIN_INSTALL_DIR} )
-    
-    pybind11_add_module( py_nymph MODULE ${NYMPH_PYBINDING_SOURCEFILES} )
-    target_link_libraries( py_nymph PRIVATE ${LIB_DEPENDENCIES} ${EXTERNAL_LIBRARIES} )
-    pbuilder_install_libraries( py_nymph )
-    pbuilder_install_headers( ${NYMPH_PYBINDING_HEADERFILES} )
-endif( Nymph_ENABLE_PYTHON )
diff --git a/cpp/Cpp/Library_v1/Data/KTApplyCut.cc b/cpp/Cpp/Library_v1/Data/KTApplyCut.cc
deleted file mode 100644
index fc57302..0000000
--- a/cpp/Cpp/Library_v1/Data/KTApplyCut.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * KTApplyCut.cc
- *
- *  Created on: Oct 06, 2014
- *      Author: nsoblath
- */
-
-#include "KTApplyCut.hh"
-
-#include "KTCut.hh"
-
-using std::string;
-
-
-namespace Nymph
-{
-    KTLOGGER(cutlog, "KTApplyCut");
-
-    KT_REGISTER_PROCESSOR(KTApplyCut, "apply-cut");
-
-    KTApplyCut::KTApplyCut(const std::string& name) :
-            KTProcessor(name),
-            fCut(NULL),
-            fAfterCutSignal("all", this),
-            fAfterCutPassSignal("pass", this),
-            fAfterCutFailSignal("fail", this)
-    {
-        fApplyCutSW = RegisterSlot("apply", this, &KTApplyCut::ApplyCut, {"all", "pass", "fail"});
-    }
-
-    KTApplyCut::~KTApplyCut()
-    {
-        delete fCut;
-    }
-
-    bool KTApplyCut::Configure(const scarab::param_node& node)
-    {
-        // Config-file settings
-
-        for (scarab::param_node::const_iterator nodeIt = node.begin(); nodeIt != node.end(); ++nodeIt)
-        {
-            // first do configuration values we know about
-            // as it happens, there aren't any
-
-            // any remaining should be cut names
-            // ignore any that don't work
-            if (SelectCut(nodeIt.name()))
-            {
-                if (nodeIt->is_node())
-                {
-                    fCut->Configure(nodeIt->as_node());
-                }
-                continue;
-            }
-        }
-
-        if (fCut == NULL)
-        {
-            KTERROR(cutlog, "No cut was selected");
-            return false;
-        }
-        return true;
-    }
-
-    void KTApplyCut::SetCut(KTCut* cut)
-    {
-        delete fCut;
-        fCut = cut;
-        return;
-    }
-
-    bool KTApplyCut::SelectCut(const string& cutName)
-    {
-        KTCut* tempCut = scarab::factory< KTCut, const std::string& >::get_instance()->create(cutName, cutName);
-        if (tempCut == NULL)
-        {
-            KTERROR(cutlog, "Invalid cut name given: <" << cutName << ">.");
-            return false;
-        }
-        SetCut(tempCut);
-        return true;
-    }
-
-
-    void KTApplyCut::ApplyCut(KTDataHandle dataHandle)
-    {
-        std::shared_ptr< KTThreadReference > ref = fApplyCutSW->GetThreadRef();
-
-        if (fCut == NULL)
-        {
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "No cut was specified" );
-            return;
-        }
-
-        bool cutFailed = fCut->Apply(dataHandle);
-
-        ref->Break( dataHandle, fApplyCutSW->GetDoBreakpoint() );
-
-        if (cutFailed)
-        {
-            fAfterCutFailSignal(dataHandle);
-        }
-        else
-        {
-            fAfterCutPassSignal(dataHandle);
-        }
-        fAfterCutSignal(dataHandle);
-        return;
-    }
-
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTApplyCut.hh b/cpp/Cpp/Library_v1/Data/KTApplyCut.hh
deleted file mode 100644
index e9d3b7e..0000000
--- a/cpp/Cpp/Library_v1/Data/KTApplyCut.hh
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- @file KTApplyCut.hh
- @brief Contains KTApplyCut
- @details Applies a cut to data
- @author: N. S. Oblath
- @date: Oct 6, 2014
- */
-
-#ifndef KTAPPLYCUT_HH_
-#define KTAPPLYCUT_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTLogger.hh"
-#include "KTMemberVariable.hh"
-#include "KTSlot.hh"
-
-#include <string>
-
-namespace Nymph
-{
-    class KTCut;
-
-    /*!
-     @class KTApplyCut
-     @author N. S. Oblath
-
-     @brief Applies a cut to data.
-
-     @details
-     KTApplyCut applies a cut to data -- the type of cut and its parameters are specified at runtime
-     from the set of cuts registered.
-
-     Only one cut can be applied by a given instance of KTApplyCut.  To apply more than one cut, add another instance.
-
-     Interpretation of boolean returned by KTCut::Apply
-     - TRUE means the cut was failed
-     - FALSE means the cut was passed
-
-     Configuration name: "apply-cut"
-
-     Available configuration values:
-     - "[cut name]": subtree -- specifies the cut to be used; parent node for the cut configuration
-
-     Slots:
-     - "apply": void (KTDataHandle) -- Applies the cut to the received data; Requirements are set by the cut; No data is added.
-
-     Signals:
-     - "all": void (KTDataHandle) -- Emitted upon application of the cut regardless of cut result.
-     - "pass": void (KTDataHandle) -- Emitted upon application of the cut if the cut passed.
-     - "fail": void (KTDataHandle) -- Emitted upon application of the cut if the cut failed.
-    */
-
-    class KTApplyCut : public KTProcessor
-    {
-        public:
-            KTApplyCut(const std::string& name = "apply-cut");
-            virtual ~KTApplyCut();
-
-            bool Configure(const scarab::param_node& node);
-
-            KTCut* GetCut() const;
-            void SetCut(KTCut* cut);
-            bool SelectCut(const std::string& cutName);
-
-        private:
-            KTCut* fCut;
-
-        public:
-            void ApplyCut(KTDataHandle dataHandle);
-
-
-            //***************
-            // Signals
-            //***************
-
-        private:
-            KTSignalData fAfterCutSignal;
-            KTSignalData fAfterCutPassSignal;
-            KTSignalData fAfterCutFailSignal;
-
-            //***************
-            // Slots
-            //***************
-
-            KTSlotWrapper* fApplyCutSW;
-
-        private:
-
-    };
-
-
-    inline KTCut* KTApplyCut::GetCut() const
-    {
-        return fCut;
-    }
-
-} /* namespace Nymph */
-#endif /* KTAPPLYCUT_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTCoreData.cc b/cpp/Cpp/Library_v1/Data/KTCoreData.cc
deleted file mode 100644
index 9b80e3b..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCoreData.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * KTCoreData.cc
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#include "KTCoreData.hh"
-
-namespace Nymph
-{
-    KTCoreData::KTCoreData() :
-            KTData(),
-            fCounter( 0 ),
-            fLastData( false ),
-            fCutStatus()
-    {
-        std::cout << "### KTCoreData constructor" << std::endl;
-    }
-
-    KTCoreData::~KTCoreData()
-    {
-        std::cout << "### KTCoreData destrutor" << std::endl;
-    }
-
-
-    KTDataHandle CreateNewDataHandle()
-    {
-        return std::make_shared< KTCoreDataExt >();
-    }
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTCoreData.hh b/cpp/Cpp/Library_v1/Data/KTCoreData.hh
deleted file mode 100644
index f6d6901..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCoreData.hh
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * KTCoreData.hh
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTCOREDATA_HH_
-#define KTCOREDATA_HH_
-
-#include "KTData.hh"
-
-#include "KTCutStatus.hh"
-#include "KTLogger.hh"
-#include "KTMemberVariable.hh"
-
-#include <memory>
-#include <string>
-
-namespace Nymph
-{
-    LOGGER( cdlog_h, "KTCoreData.hh" )
-
-    class KTCoreData : public KTData
-    {
-        public:
-            KTCoreData();
-            virtual ~KTCoreData();
-
-            MEMBERVARIABLE( unsigned, Counter );
-            MEMBERVARIABLE( bool, LastData );
-
-            MEMBERVARIABLE_REF( KTCutStatus, CutStatus );
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar )
-            {
-                std::cout << "### serialize for KTCoreData" << std::endl;
-                ar( cereal::base_class< KTData >( this ), CEREAL_NVP(fCounter), CEREAL_NVP(fLastData), CEREAL_NVP(fCutStatus) );
-            }
-    };
-
-    DEFINE_EXT_DATA( KTCoreData, "core" )
-
-
-    // Define KTDataHandle and a convenience function to create new handles
-    typedef std::shared_ptr< KTCoreDataExt > KTDataHandle;
-    KTDataHandle CreateNewDataHandle();
-
-
-    // Recursive helper structs for determining if data objects are present
-
-    // End of the recursion; this will only be used if NoOtherDataTypes has nothing in it
-    template< class... NoOtherDataTypes >
-    struct DataPresentHelper
-    {
-        static bool DataPresent( KTDataHandle );
-    };
-
-    template< class DataType, class... OtherDataTypes >
-    struct DataPresentHelper< DataType, OtherDataTypes... >
-    {
-        static bool DataPresent( KTDataHandle data );
-    };
-
-    template< class... NoOtherDataTypes >
-    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( KTDataHandle )
-    {
-        return true;
-    }
-
-    template< class DataType, class... OtherDataTypes >
-    bool DataPresentHelper< DataType, OtherDataTypes... >::DataPresent( KTDataHandle data )
-    {
-        if( ! data->Has< DataType >() )
-        {
-            KTERROR( cdlog_h, "Data not found with type <" << typeid( DataType ).name() << ">" );
-            return false;
-        }
-        return DataPresentHelper< OtherDataTypes... >::DataPresent( data );
-    }
-
-
-} /* namespace Nymph */
-#endif /* KTCOREDATA_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTCut.cc b/cpp/Cpp/Library_v1/Data/KTCut.cc
deleted file mode 100644
index 4b20a98..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCut.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * KTCut.cc
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#include "KTCut.hh"
-
-namespace Nymph
-{
-    KTCut::KTCut(const std::string& name) :
-            KTConfigurable(name)
-    {
-    }
-
-    KTCut::~KTCut()
-    {
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTCut.hh b/cpp/Cpp/Library_v1/Data/KTCut.hh
deleted file mode 100644
index 753d83a..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCut.hh
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * KTCut.hh
- *
- *  Created on: Sept 19, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTCUT_HH_
-#define KTCUT_HH_
-
-#include "KTConfigurable.hh"
-#include "KTCutResult.hh"
-#include "KTCoreData.hh"
-#include "KTException.hh"
-#include "KTExtensibleStructFactory.hh"
-#include "KTLogger.hh"
-#include "KTMemberVariable.hh"
-
-#include "factory.hh"
-#include "typename.hh"
-
-#include <functional>
-
-namespace Nymph
-{
-    KTLOGGER(cutlog_h, "KTCut.h");
-
-    /*!
-     @class KTCut
-     @author N. S. Oblath
-
-     @brief Base class for a cut that gets applied to data objects.
-
-     @details
-     A fully implemented cut MUST have the following:
-     - Public nested class called Result, inheriting from KTExtensibleCutResult< Result >, and containing a public static std::string name sName.
-     - Cut registration using the macro KT_REGISTER_CUT([class name])
-     - Implementation of bool Configure(const scarab::param_node*)
-     - Implementation of bool Apply(KTCoreData&, <DataType(s)>)
-
-     Your cut class should inherit from KTCutOneArg or KTCutTwoArgs, depending on the number of data types involved in your cut.
-
-     The existence of [class name]::Result and [class name]::Result::sName are enforces at compile time by the KT_REGISTER_CUT macro.
-
-     The functions bool Configure(const scarab::param_node*) and void Apply(KTCoreData&, <DataType(s)>) are abstract in the base classes, and therefore must be implemented.
-
-     Boolean return value interpretation:
-     - TRUE means the cut was failed
-     - FALSE means the cut was passed
-
-     --------------------------------------
-     ------- Example Cut Definition -------
-     --------------------------------------
-
-     class KTSomeData;
-     class KTSomeDataExt;
-
-     // Data must be at least as awesome as fAwesomenessThreshold to pass this cut
-     class KTAwesomenessCut : public KTCutOnData< KTSomeDataExt >
-     {
-         public:
-             struct Result : KTExtensibleCutResult< Result >
-             {
-                 static const std::string sName;
-             };
-
-         public:
-             KTAwesomenessCut(const std::string& name = "default-example-cut");
-             virtual ~KTAwesomenessCut();
-
-             bool Configure(const scarab::param_node* node);
-
-             MEMBERVARIABLE(double, AwesomenessThreshold);
-
-         public:
-             bool Apply(KTCoreData& data, KTSomeData& data);
-
-     };
-
-     --------------------------------------
-     ------- Example Implementation -------
-     --------------------------------------
-
-     const std::string KTAwesomenessCut::Result::sName = "awesomeness-cut";
-
-     KT_REGISTER_CUT(KTAwesomenessCut);
-
-     KTAwesomenessCut::KTAwesomenessCut(const std::string& name) :
-             KTCutOnData(name),
-             fAwesomenessThreshold(1000000.)
-     {
-         SetApplyFunc( this, &KTAwesomeCut::Apply );
-     }
-
-     KTAwesomenessCut::~KTExampleCut()
-     {}
-
-     bool KTAwesomenessCut::Configure(const scarab::param_node* node)
-     {
-         if (node == NULL) return true;
-         SetAwesomenessThreshold(node->get_value("awesomeness", GetAwesomenessThreshold()));
-         return true;
-     }
-
-     bool KTAwesomenessCut::Apply(KTCoreData& data, KTSomeData& someData)
-     {
-         bool isCut = someData.Awesomeness() < fAwesomenessThreshold;
-         data.GetCutStatus().AddCutResult< KTAwesomenessCut::Result >(isCut);
-         return isCut;
-     }
-
-    */
-
-    //************************************
-    // KTCut -- base class for all cuts
-    //************************************
-
-    class KTCut : public KTConfigurable
-    {
-        public:
-            KTCut(const std::string& name = "default-cut-name");
-            virtual ~KTCut();
-
-            virtual bool Apply(KTDataHandle) = 0;
-
-    };
-
-    //*******************************************************
-    // KTCutOnData -- cut applied to one or more data objects
-    //*******************************************************
-
-    template< class ... XExtDataTypes >
-    class KTCutOnData : public KTCut
-    {
-        public:
-            KTCutOnData( const std::string& name = "default-cut-name" );
-            virtual ~KTCutOnData();
-
-            virtual bool Apply( KTDataHandle dataHandle );
-
-        protected:
-            template< class... SomeExtDataTypes >
-            bool DataPresent( KTDataHandle data );
-
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            void SetApplyFunc( XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( KTCoreData&, const XFuncDataTypes&... ) );
-
-            std::function< bool ( KTCoreDataExt& data, const XExtDataTypes&... dataType ) > fFunc;
-
-    };
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    template< class ... XExtDataTypes >
-    KTCutOnData< XExtDataTypes... >::KTCutOnData( const std::string& name ) :
-            KTCut(name)
-    {
-    }
-
-    template< class ... XExtDataTypes >
-    KTCutOnData< XExtDataTypes... >::~KTCutOnData()
-    {}
-
-    template< class ... XExtDataTypes >
-    bool KTCutOnData< XExtDataTypes... >::Apply( KTDataHandle dataHandle )
-    {
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XExtDataTypes... >( dataHandle ) )
-        {
-            KTERROR( cutlog_h, "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." );
-            BOOST_THROW_EXCEPTION( KTException() << "Failed to find all of the necessary data types in slot <" << fConfigName << ">. Aborting." << eom );
-        }
-
-        try
-        {
-            return fFunc( dataHandle->Of< KTCoreDataExt >() , dataHandle->Of< XExtDataTypes >()... );
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fConfigName + ">. Aborting." );
-            throw;
-        }
-    }
-
-    template< class... XExtDataTypes >
-    template< typename... SomeExtDataTypes >
-    bool KTCutOnData< XExtDataTypes... >::DataPresent( KTDataHandle data )
-    {
-        return DataPresentHelper< SomeExtDataTypes... >::DataPresent( data );
-    }
-
-    template< class... XExtDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    void KTCutOnData< XExtDataTypes... >::SetApplyFunc( XFuncOwnerType* owner, bool (XFuncOwnerType::*func)( KTCoreData&, const XFuncDataTypes&... ) )
-    {
-        fFunc = [func, owner]( KTCoreDataExt& data, const XExtDataTypes&... testData )->bool {return (owner->*func)(data, testData...);};
-    }
-
-
-    // this macro enforces the existence of cut_class::Result and cut_class::Result::sName at compile time
-#define KT_REGISTER_CUT(cut_class, cut_name) \
-        static ::scarab::registrar< ::Nymph::KTCut, cut_class, const std::string& > sCut##cut_class##Registrar( cut_name );
-
-} /* namespace Nymph */
-
-#endif /* KTCUT_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTCutFilter.cc b/cpp/Cpp/Library_v1/Data/KTCutFilter.cc
deleted file mode 100644
index 05d1906..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCutFilter.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * KTCutFilter.cc
- *
- *  Created on: Oct 06, 2014
- *      Author: nsoblath
- */
-
-#include "KTCutFilter.hh"
-
-#include "KTCut.hh"
-
-using std::string;
-
-
-namespace Nymph
-{
-    KTLOGGER(cutlog, "KTCutFilter");
-
-    KT_REGISTER_PROCESSOR(KTCutFilter, "cut-filter");
-
-    KTCutFilter::KTCutFilter(const std::string& name) :
-            KTProcessor(name),
-            fCutMask(),
-            fCutMaskInt(0),
-            fConvertToBitset(false),
-            fAllBits(true),
-            fAfterCutSignal("all", this),
-            fAfterCutPassSignal("pass", this),
-            fAfterCutFailSignal("fail", this)
-    {
-        fFilterDataSW = RegisterSlot("filter", this, &KTCutFilter::FilterData, {"all", "pass", "fail"});
-    }
-
-    KTCutFilter::~KTCutFilter()
-    {
-    }
-
-    bool KTCutFilter::Configure(const scarab::param_node& node)
-    {
-        // Config-file settings
-        if (node.has("cut-mask-int"))
-        {
-            SetCutMask(node["cut-mask-int"]().as_uint());
-        }
-        if (node.has("cut-mask"))
-        {
-            SetCutMask(KTCutStatus::bitset_type(node["cut-mask"]().as_string()));
-        }
-        if (node.get_value("cut-mask-all", false))
-        {
-            SetCutMaskAll();
-        }
-
-        return true;
-    }
-
-    bool KTCutFilter::Filter(const KTCoreData& data)
-    {
-        if (fAllBits)
-        {
-            return data.CutStatus().IsCut();
-        }
-
-        const KTCutStatus& cutStatus = data.CutStatus();
-        if (fConvertToBitset)
-        {
-            fCutMask = cutStatus.ToBitset(fCutMaskInt);
-        }
-
-        if (fCutMask.size() != cutStatus.size()) fCutMask.resize(cutStatus.size());
-
-        return cutStatus.IsCut(fCutMask);
-    }
-
-    void KTCutFilter::FilterData(KTDataHandle dataHandle)
-    {
-        std::shared_ptr< KTThreadReference > ref = fFilterDataSW->GetThreadRef();
-
-        // all KTDataHandle's have KTCoreData, so we won't bother checking
-
-        bool failCut = Filter(dataHandle->Of< KTCoreDataExt >());
-
-        ref->Break( dataHandle, fFilterDataSW->GetDoBreakpoint() );
-
-        if (failCut)
-        {
-            fAfterCutFailSignal(dataHandle);
-        }
-        else
-        {
-            fAfterCutPassSignal(dataHandle);
-        }
-        fAfterCutSignal(dataHandle);
-
-        return;
-    }
-
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTCutFilter.hh b/cpp/Cpp/Library_v1/Data/KTCutFilter.hh
deleted file mode 100644
index dacd571..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCutFilter.hh
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- @file KTApplyCut.hh
- @brief Contains KTApplyCut
- @details Applies a cut to data
- @author: N. S. Oblath
- @date: Oct 6, 2014
- */
-
-#ifndef KTCUTFILTER_HH_
-#define KTCUTFILTER_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTCutStatus.hh"
-
-#include "KTLogger.hh"
-#include "KTMemberVariable.hh"
-#include "KTSlot.hh"
-
-#include <string>
-
-namespace Nymph
-{
-    class KTCut;
-
-    /*!
-     @class KTCutFilter
-     @author N. S. Oblath
-
-     @brief Filters data based on cuts already applied and a filter mask.
-
-     @details
-     KTCutFilter checks the status of cuts that have already been applied to a data.  If the bitwise AND of the cut status with
-     the configurable cut mask is non-zero, than the data fails the filter.
-
-     Interpretation of the boolean returned by Filter(KTCoreData&):
-     - TRUE means the data failed the cut filter.
-     - FALSE means the data passed the cut filter.
-
-     Configuration name: "cut-filter"
-
-     Available configuration values:
-     - "cut-mask-all": bool -- If true, filter will use all cuts. If this is present and true, it overrules other mask configurations.
-     - "cut-mask": string -- Set the cut mask with a string of 1's and 0's. The first character is the highest significant bit, and the last character is the least significant bit.
-                             If present, it overrules cut-mask-int.
-     - "cut-mask-int": unsigned int -- Set the cut mask with an unsigned integer's bit values.
-
-     Slots:
-     - "filter": void (KTDataHandle) -- Checks the cut status of the received data ANDed with the cut mask; No data is added.
-
-     Signals:
-     - "all": void (KTDataHandle) -- Emitted after cut status is checked for all data.
-     - "pass": void (KTDataHandle) -- Emitted after cut status is checked if the cut filter passed.
-     - "fail": void (KTDataHandle) -- Emitted after cut status is checked if the cut filter failed.
-    */
-
-    class KTCutFilter : public KTProcessor
-    {
-        public:
-            KTCutFilter(const std::string& name = "cut-filter");
-            virtual ~KTCutFilter();
-
-            bool Configure(const scarab::param_node& node);
-
-            void SetCutMask(KTCutStatus::bitset_type mask);
-            void SetCutMask(unsigned long long mask);
-            /// Set the mask with a string; String must consist of all 0's and 1's.
-            void SetCutMask(const std::string& mask);
-
-            /// Set the cut mask to use all cuts
-            void SetCutMaskAll();
-
-        private:
-            KTCutStatus::bitset_type fCutMask;
-            MEMBERVARIABLE_NOSET(unsigned long long, CutMaskInt);
-
-            bool fConvertToBitset;
-            bool fAllBits;
-
-        public:
-            bool Filter(const KTCoreData& data);
-
-            void FilterData(KTDataHandle dataHandle);
-
-
-            //***************
-            // Signals
-            //***************
-
-        private:
-            KTSignalData fAfterCutSignal;
-            KTSignalData fAfterCutPassSignal;
-            KTSignalData fAfterCutFailSignal;
-
-            //***************
-            // Slots
-            //***************
-
-            KTSlotWrapper* fFilterDataSW;
-
-        private:
-
-    };
-
-
-    inline void KTCutFilter::SetCutMask(KTCutStatus::bitset_type mask)
-    {
-        fCutMask = mask;
-        fConvertToBitset = false;
-        fAllBits = false;
-        return;
-    }
-
-    inline void KTCutFilter::SetCutMask(unsigned long long mask)
-    {
-        fCutMaskInt = mask;
-        fConvertToBitset = true;
-        fAllBits = false;
-        return;
-    }
-
-    inline void KTCutFilter::SetCutMask(const std::string& mask)
-    {
-        fCutMask = KTCutStatus::bitset_type(mask);
-        fConvertToBitset = false;
-        fAllBits = false;
-        return;
-    }
-
-    inline void KTCutFilter::SetCutMaskAll()
-    {
-        fCutMask.clear();
-        fConvertToBitset = false;
-        fAllBits = true;
-        return;
-    }
-
-} /* namespace Nymph */
-#endif /* KTCUTFILTER_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTCutResult.hh b/cpp/Cpp/Library_v1/Data/KTCutResult.hh
deleted file mode 100644
index dbc0438..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCutResult.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * KTCutResult.hh
- *
- *  Created on: Sept 19, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTCUTRESULT_HH_
-#define KTCUTRESULT_HH_
-
-#include <string>
-
-namespace Nymph
-{
-    struct KTCutResult
-    {
-        std::string fName;
-        bool fState;
-        bool fAssigned;
-        KTCutResult() : fName(), fState( false ), fAssigned( false ) {}
-        KTCutResult( const std::string& name, bool state ) : fName( name ), fState( state ), fAssigned( true ) {}
-    };
-
-    struct CheckCutResultName
-    {
-        std::string fName;
-        CheckCutResultName( const std::string& name ) : fName( name ) {}
-        bool operator()( const KTCutResult& result )
-        {
-            return result.fName == fName;
-        }
-    };
-
-} /* namespace Nymph */
-
-#endif /* KTCUTRESULT_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTCutStatus.cc b/cpp/Cpp/Library_v1/Data/KTCutStatus.cc
deleted file mode 100644
index 9396e76..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCutStatus.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * KTCut.cc
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#include "KTCutStatus.hh"
-
-#include "KTExtensibleStructFactory.hh"
-#include "KTLogger.hh"
-
-namespace Nymph
-{
-    KTLOGGER(cutlog, "KTCut");
-
-    KTCutStatus::KTCutStatus() :
-            fCutResults(),
-            fSummary()
-    {
-    }
-
-    KTCutStatus::KTCutStatus(const KTCutStatus& orig) :
-            fCutResults(orig.fCutResults),
-            fSummary()
-    {
-        UpdateStatus();
-    }
-
-    KTCutStatus::~KTCutStatus()
-    {}
-
-    KTCutStatus& KTCutStatus::operator=(const KTCutStatus& rhs)
-    {
-        fCutResults = rhs.fCutResults;
-        UpdateStatus();
-        return *this;
-    }
-
-    void KTCutStatus::AssignCutResult(unsigned maskPos, const std::string& name, bool state, bool doUpdateStatus)
-    {
-        KTDEBUG(cutlog, "Assigning cut result <" << name << "> to position <" << maskPos << "> with state <" << state << ">");
-        if( maskPos >= fCutResults.size() )
-        {
-            fCutResults.resize( maskPos + 1 );
-        }
-        KTDEBUG(cutlog, "Cut result size is now <" << fCutResults.size() << ">");
-        if( fCutResults[maskPos].fAssigned )
-        {
-            throw KTException() << "Mask position <" << maskPos << "> has already been assigned";
-        }
-        fCutResults[maskPos].fName = name;
-        fCutResults[maskPos].fState = state;
-        fCutResults[maskPos].fAssigned = true;
-        if( doUpdateStatus ) UpdateStatus();
-        return;
-    }
-
-    void KTCutStatus::UpdateStatus()
-    {
-        KTDEBUG(cutlog, "Updating cut summary");
-        unsigned nCuts = fCutResults.size();
-        fSummary.resize(nCuts, false);
-
-        // loop through to set cuts
-        for (unsigned iCut = 0; iCut < nCuts; ++iCut)
-        {
-            fSummary[iCut] = fCutResults[iCut].fAssigned && fCutResults[iCut].fState;
-        }
-        KTDEBUG(cutlog, "Cut summary bitset: " << fSummary);
-        return;
-    }
-
-    std::string KTCutStatus::CutResultsPresent() const
-    {
-        std::string cutsPresent;
-        for (auto cutIt = fCutResults.cbegin(); cutIt != fCutResults.cend(); ++cutIt)
-        {
-            if (! cutIt->fName.empty())
-            {
-                cutsPresent = cutIt->fName + " " + cutsPresent;
-            }
-        }
-        return cutsPresent;
-    }
-
-    std::ostream& operator<<(std::ostream& out, const KTCutStatus& status)
-    {
-        out << "Cut summary: " << status.fSummary << '\n';
-        return out;
-    }
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTCutStatus.hh b/cpp/Cpp/Library_v1/Data/KTCutStatus.hh
deleted file mode 100644
index 77c41ee..0000000
--- a/cpp/Cpp/Library_v1/Data/KTCutStatus.hh
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * KTCutStatus.hh
- *
- *  Created on: Sept 19, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTCUTSTATUS_HH_
-#define KTCUTSTATUS_HH_
-
-
-#include "KTCutResult.hh"
-
-#include "KTException.hh"
-
-#include "cereal/access.hpp"
-#include "cereal/types/string.hpp"
-#include "cereal/types/vector.hpp"
-
-#include <boost/dynamic_bitset.hpp>
-
-#include <algorithm>
-#include <memory>
-#include <vector>
-
-namespace Nymph
-{
-    /*!
-     @class KTCutStatus
-     @author N. S. Oblath
-
-     @brief Provides easy access to cut result information.
-
-     @details
-     The cut results can be imagined as an array of booleans, specifying whether the cut was passed: [true, false, false, true, . . . ].
-
-     Cuts are assigned both an array position (non-negative integer) and a name (string) before or when the results are set.
-
-     KTCutStatus is typically used as a member variable of KTCoreData, the top-level data object.
-
-     KTCutStatus owns the set of KTCutResults that have been added to a data object.
-     It also owns a summary of those cuts (implemented with boost::dynamic_bitset).
-
-     You can check if the data has been cut with the IsCut functions.
-     - IsCut() returns true if any cut results are true;
-     - IsCut(const bitset_type& mask), IsCut(unsigned int mask), and IsCut(const std::string& mask) allow you to specify
-       a cut mask, and return true if any of the cut results specified by the mask are true.
-
-     When specifying a cut mask, bits set to true specify cuts that should be used:
-     - bitset_type is boost::dynamic_bitset;
-     - unsigned integer masks use the bits of the integer;
-     - std::string masks are strings with each character either a 0 or 1.
-
-     With KTCutStatus you can interact with individual cut results in the following ways:
-     - Get the number of cut results with size(),
-     - Get a reference to the cut results with CutResults(),
-     - If you need to manually update the cut status bitset, use UpdateStatus(),
-     - Add cut results to a data object with AssignCutResult(),
-     - Remove a cut result with RemoveCutResult(),
-     - Check to see if a particular cut result is present using HasCutResult(),
-     - Get the value of a cut result with GetCutState(), and
-     - Set the value of a cut result with SetCutState(),
-
-     Cut results can typically be accessed by either name or mask position.
-     */
-
-    // external serialization function for KTCutResult
-    template< class Archive >
-    void serialize( Archive & archive, KTCutResult& cutResult )
-    {
-        archive( CEREAL_NVP(cutResult.fName), CEREAL_NVP(cutResult.fState), CEREAL_NVP(cutResult.fAssigned) );
-    }
-
-    class KTCutStatus
-    {
-        public:
-            typedef boost::dynamic_bitset< > bitset_type;
-
-            typedef std::vector< KTCutResult > CutResults_t;
-
-            typedef CutResults_t::iterator CutResultsIt;
-            typedef CutResults_t::const_iterator CutResultsCIt;
-
-        public:
-            KTCutStatus();
-            KTCutStatus(const KTCutStatus& orig);
-            ~KTCutStatus();
-
-            KTCutStatus& operator=(const KTCutStatus& rhs);
-
-            /// Returns the size of the cut results vector
-            size_t size() const;
-
-            /// Returns a reference to the cut results vector
-            const CutResults_t& CutResults() const;
-
-            /// Updates the summary bitset from the cut results vector
-            void UpdateStatus();
-
-            /// Adds a new cut result if it doesn't exist, and assigns the specified name and state at maskPos; throws KTException if maskPos is already assigned
-            void AssignCutResult(unsigned maskPos, const std::string& name, bool state=false, bool doUpdateStatus=true);
-
-            /// Removes the cut by erasing the name and setting the state to false
-            void RemoveCutResult(const std::string& cutName, bool doUpdateStatus=true);
-            /// Removes the cut by erasing the name and setting the state to false
-            void RemoveCutResult(unsigned maskPos, bool doUpdateStatus=true);
-
-            CutResultsIt FindCutResult(const std::string& cutName);
-            CutResultsCIt FindCutResultC(const std::string& cutName) const;
-
-            CutResultsIt  CutResultsEnd();
-            CutResultsCIt CutResultsEndC() const;
-
-            /// Returns whether or not the specified cut is present
-            bool HasCutResult(const std::string& cutName) const;
-            /// Returns whether or not the specified cut is present (whether or not it has been explicitly assigned)
-            bool HasCutResult(unsigned maskPos) const;
-
-            /// Returns the state of the named cut; throws KTException if it doesn't exist
-            bool GetCutState(const std::string& cutName) const;
-            /// Returns the state of the specified cut; throws KTException if it doesn't exist
-            bool GetCutState(unsigned maskPos) const;
-
-            /// Sets the state of the specified cut; throws KTException if it doesn't exist
-            void SetCutState(const std::string& cutName, bool state, bool doUpdateStatus=true);
-            /// Sets the state of the specified cut; throws KTException if it doesn't exist
-            void SetCutState(unsigned maskPos, bool state, bool doUpdateStatus=true);
-
-            /// Returns a string with the names of the cuts that are present in bitset order
-            std::string CutResultsPresent() const;
-
-        private:
-            friend std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
-
-            CutResults_t fCutResults;
-
-            bitset_type fSummary;
-
-        public:
-            bool IsCut() const;
-            bool IsCut(const bitset_type& mask) const;
-            bool IsCut(unsigned long long mask) const;
-            bool IsCut(const std::string& mask) const;
-
-            bitset_type ToBitset(unsigned long long mask) const;
-            bitset_type ToBitset(const std::string& mask) const;
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void save( Archive& ar ) const;
-
-            template< class Archive >
-            void load( Archive& ar );
-
-    };
-
-    std::ostream& operator<<(std::ostream& out, const KTCutStatus& status);
-
-
-    inline const KTCutStatus::CutResults_t& KTCutStatus::CutResults() const
-    {
-        return fCutResults;
-    }
-
-    inline KTCutStatus::CutResultsIt KTCutStatus::FindCutResult( const std::string& name )
-    {
-        if( name.empty() ) return fCutResults.end();
-        return std::find_if( fCutResults.begin(), fCutResults.end(), CheckCutResultName(name) );
-    }
-
-    inline KTCutStatus::CutResultsCIt KTCutStatus::FindCutResultC( const std::string& name ) const
-    {
-        if( name.empty() ) return fCutResults.cend();
-        return std::find_if( fCutResults.cbegin(), fCutResults.cend(), CheckCutResultName(name) );
-    }
-
-    inline KTCutStatus::CutResultsIt KTCutStatus::CutResultsEnd()
-    {
-        return fCutResults.end();
-    }
-
-    inline KTCutStatus::CutResultsCIt KTCutStatus::CutResultsEndC() const
-    {
-        return fCutResults.cend();
-    }
-
-    inline bool KTCutStatus::HasCutResult( const std::string& name ) const
-    {
-        return FindCutResultC(name) != std::end(fCutResults);
-    }
-
-    inline bool KTCutStatus::HasCutResult( unsigned maskPos ) const
-    {
-        return maskPos < fCutResults.size() && fCutResults[maskPos].fAssigned;
-    }
-
-    inline bool KTCutStatus::GetCutState( const std::string& name ) const
-    {
-        CutResultsCIt cutIt = FindCutResultC(name);
-        if (cutIt != fCutResults.cend())
-        {
-            return cutIt->fState;
-        }
-        throw KTException() << "Unable to find cut <" << name << ">";
-    }
-
-    inline bool KTCutStatus::GetCutState( unsigned maskPos ) const
-    {
-        if (maskPos < fCutResults.size())
-        {
-            return fCutResults[maskPos].fState;
-        }
-        throw KTException() << "Mask position <" << maskPos << "> is out of range (only " << size() << " cuts are present)";
-    }
-
-    inline void KTCutStatus::SetCutState(const std::string& name, bool state, bool doUpdateStatus)
-    {
-        CutResultsIt cutIt = FindCutResult(name);
-        if (cutIt != fCutResults.end())
-        {
-            cutIt->fState = state;
-            if (doUpdateStatus) UpdateStatus();
-            return;
-        }
-        throw KTException() << "Unable to find cut <" << name << ">";
-    }
-
-    inline void KTCutStatus::SetCutState(unsigned maskPos, bool state, bool doUpdateStatus)
-    {
-        if (maskPos < fCutResults.size())
-        {
-            fCutResults[maskPos].fState = state;
-            if (doUpdateStatus) UpdateStatus();
-            return;
-        }
-        throw KTException() << "Mask position <" << maskPos << "> is out of range (only "<< size() << " cuts are present)";
-    }
-
-    inline void KTCutStatus::RemoveCutResult(const std::string& name, bool doUpdateStatus)
-    {
-        CutResultsIt cutIt = FindCutResult(name);
-        if (cutIt != fCutResults.end())
-        {
-            cutIt->fName = "";
-            cutIt->fState = false;
-        }
-        if (doUpdateStatus) UpdateStatus();
-        return;
-    }
-
-    inline void KTCutStatus::RemoveCutResult(unsigned maskPos, bool doUpdateStatus)
-    {
-        if (maskPos < fCutResults.size())
-        {
-            fCutResults[maskPos].fName = "";
-            fCutResults[maskPos].fState = false;
-        }
-        if (doUpdateStatus) UpdateStatus();
-        return;
-    }
-
-    inline size_t KTCutStatus::size() const
-    {
-        return fSummary.size();
-    }
-
-    inline bool KTCutStatus::IsCut() const
-    {
-        return fSummary.any();
-    }
-
-    inline bool KTCutStatus::IsCut(const bitset_type& mask) const
-    {
-        return (fSummary & mask).any();
-    }
-
-    inline bool KTCutStatus::IsCut(unsigned long long mask) const
-    {
-        return IsCut(ToBitset(mask));
-    }
-
-    inline bool KTCutStatus::IsCut(const std::string& mask) const
-    {
-        return IsCut(ToBitset(mask));
-    }
-
-    inline KTCutStatus::bitset_type KTCutStatus::ToBitset(unsigned long long mask) const
-    {
-        return bitset_type(fSummary.size(), mask);
-    }
-
-    inline KTCutStatus::bitset_type KTCutStatus::ToBitset(const std::string& mask) const
-    {
-        return bitset_type(mask);
-    }
-
-    template< class Archive >
-    void KTCutStatus::save( Archive& ar ) const
-    {
-        std::cout << "### save for KTCutStatus" << std::endl;
-        ar( CEREAL_NVP(fCutResults) );
-    }
-
-    template< class Archive >
-    void KTCutStatus::load( Archive& ar )
-    {
-        std::cout << "### load for KTCutStatus" << std::endl;
-        ar( CEREAL_NVP(fCutResults) );
-        UpdateStatus();
-    }
-
-} /* namespace Nymph */
-
-#endif /* KTCUTSTATUS_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTData.cc b/cpp/Cpp/Library_v1/Data/KTData.cc
deleted file mode 100644
index 536cb8e..0000000
--- a/cpp/Cpp/Library_v1/Data/KTData.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * KTData.cc
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#include "KTData.hh"
-
-namespace Nymph
-{
-    KTData::KTData()
-    {
-        std::cout << "### KTData constructor" << std::endl;
-    }
-
-    KTData::~KTData()
-    {
-        std::cout << "### KTData destructor" << std::endl;
-    }
-
-    KTDataRider::KTDataRider() :
-            fName()
-    {
-        std::cout << "### KTDataRider for <" << fName << "> constructor" << std::endl;
-    }
-
-    KTDataRider::KTDataRider( const KTDataRider& orig ) :
-            fName( orig.fName )
-    {}
-
-    KTDataRider::~KTDataRider()
-    {
-        std::cout << "### KTDataRider for <" << fName << "> destructor" << std::endl;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTData.hh b/cpp/Cpp/Library_v1/Data/KTData.hh
deleted file mode 100644
index 90b3b6a..0000000
--- a/cpp/Cpp/Library_v1/Data/KTData.hh
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * KTData.hh
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTDATA_HH_
-#define KTDATA_HH_
-
-#include "KTExtensible.hh"
-
-#include "KTMemberVariable.hh"
-
-#include "cereal/types/polymorphic.hpp" // required to avoid compile error
-#include "cereal/types/base_class.hpp" // required for base-class specification
-#include "cereal/access.hpp" // required for private member access
-
-#include <string>
-
-namespace Nymph
-{
-
-    class KTData
-    {
-        public:
-            KTData();
-            virtual ~KTData();
-
-            template< class Archive >
-            void serialize( Archive& ar )
-            {
-                std::cout << "### serialize for KTData" << std::endl;
-            }
-    };
-
-    class KTDataRider
-    {
-        public:
-            KTDataRider();
-            KTDataRider( const KTDataRider& orig );
-            virtual ~KTDataRider();
-
-            MEMBERVARIABLE_REF( std::string, Name );
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-    template< class Archive >
-    void KTDataRider::serialize( Archive& ar )
-    {
-            std::cout << "### serialize for KTDataRider" << std::endl;
-            ar( fName );
-    }
-
-    template< class XDerivedType >
-    class KTExtensibleDataRider : public KTExtensible< XDerivedType, KTDataRider >
-    {
-        public:
-            KTExtensibleDataRider() = delete;
-            KTExtensibleDataRider( const std::string& name ) { KTDataRider::fName = name; }
-            KTExtensibleDataRider( const KTExtensibleDataRider< XDerivedType >& orig ) : KTExtensible< XDerivedType, KTDataRider >( *this ) {}
-            virtual ~KTExtensibleDataRider() {}
-
-            template< class Archive >
-            void serialize( Archive& ar )
-            {
-                std::cout << "### serialize for KTExtensibleDataRider< XDerivedType >" << std::endl;
-                ar( cereal::base_class< KTExtensible< XDerivedType, KTDataRider > >( this ) );
-            }
-    };
-
-#define DEFINE_EXT_DATA_2( ex_data_class_name, data_class_name, label ) \
-        class ex_data_class_name : public data_class_name, public KTExtensibleDataRider< ex_data_class_name > \
-        { \
-            public: \
-                ex_data_class_name() : data_class_name(), KTExtensibleDataRider< ex_data_class_name >( label ) {} \
-                ex_data_class_name( const ex_data_class_name& orig ) : data_class_name( *this ), KTExtensibleDataRider< ex_data_class_name >( *this ) {} \
-                virtual ~ex_data_class_name() {} \
-                \
-                template< class Archive > \
-                void serialize( Archive& ar ) \
-                { \
-                    std::cout << "### serialize for ex_data_class_name" << std::endl; \
-                    ar( cereal::base_class< data_class_name >( this ), cereal::base_class< KTExtensibleDataRider< ex_data_class_name > >( this ) ); \
-                } \
-        };
-
-#define DEFINE_EXT_DATA( data_class_name, label ) DEFINE_EXT_DATA_2( PASTE(data_class_name, Ext), data_class_name, label )
-
-} /* namespace Nymph */
-#endif /* KTDATA_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh b/cpp/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
deleted file mode 100644
index cc2c479..0000000
--- a/cpp/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * KTRegisterNymphExtData.hh
- *
- *  Created on: Feb 17, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTREGISTERNYMPHEXTDATA_HH_
-#define NYMPH_KTREGISTERNYMPHEXTDATA_HH_
-
-/**
- * @file KTRegisterNymphExtData.hh
- *
- * Register the extensible data objects that live in Nymph here.
- * This file should be included with registration headers packages using Nymph's extensible data setup.
- *
- * This header should be included _after_ the relevant archives are registered (after #include'ing the headers, generally)
- *
- */
-
-
-#include <cereal/types/polymorphic.hpp>
-
-#include "KTCoreData.hh"
-
-CEREAL_REGISTER_TYPE( Nymph::KTCoreDataExt );
-
-
-#endif /* NYMPH_KTREGISTERNYMPHEXTDATA_HH_ */
diff --git a/cpp/Cpp/Library_v1/Data/KTTester.cc b/cpp/Cpp/Library_v1/Data/KTTester.cc
deleted file mode 100644
index e0ce295..0000000
--- a/cpp/Cpp/Library_v1/Data/KTTester.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * KTTester.cc
- *
- *  Created on: Aug 26, 2019
- *      Author: obla999
- */
-
-#include "KTTester.hh"
-
-namespace Nymph
-{
-
-    KTTester::KTTester()
-    {
-        // TODO Auto-generated constructor stub
-
-    }
-
-    KTTester::~KTTester()
-    {
-        // TODO Auto-generated destructor stub
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Data/KTTester.hh b/cpp/Cpp/Library_v1/Data/KTTester.hh
deleted file mode 100644
index f0e3f5b..0000000
--- a/cpp/Cpp/Library_v1/Data/KTTester.hh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * KTTester.hh
- *
- *  Created on: Aug 26, 2019
- *      Author: obla999
- */
-
-#ifndef LIBRARY_DATA_KTTESTER_HH_
-#define LIBRARY_DATA_KTTESTER_HH_
-
-//#include "KTConfigurable.hh"
-
-#include "KTConnection.hh"
-//#include "KTLogger.hh"
-#include "KTSignalWrapper.hh"
-#include "KTSlotWrapper.hh"
-
-//#include "factory.hh"
-
-//#include <boost/signals2.hpp>
-
-//#include <exception>
-//#include <initializer_list>
-//#include <map>
-//#include <sstream>
-//#include <string>
-//#include <memory>
-
-namespace Nymph
-{
-
-    class KTTester
-    {
-        public:
-            KTTester();
-            virtual ~KTTester();
-    };
-
-} /* namespace Nymph */
-
-#endif /* LIBRARY_DATA_KTTESTER_HH_ */
diff --git a/cpp/Cpp/Library_v1/IO/KTJSONWriter.cc b/cpp/Cpp/Library_v1/IO/KTJSONWriter.cc
deleted file mode 100644
index 36add47..0000000
--- a/cpp/Cpp/Library_v1/IO/KTJSONWriter.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  KTJSONWriter.cc
- *
- *  Created on: Feb 1, 2018
- *      Author: N.S. Oblath
- *
-*/
-
-#include "KTJSONWriter.hh"
-
-#include "KTLogger.hh"
-
-
-namespace Nymph
-{
-    KT_REGISTER_PROCESSOR( KTJSONWriter, "json-writer" );
-
-    KTJSONWriter::KTJSONWriter( const std::string& name ) :
-        KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >( name ),
-        fFilename( "json_writer_default_file.json" ),
-        fStreamOutPtr( nullptr ),
-        fArchiveOutPtr( nullptr ),
-        fExtDataSlot( "ext-data", this, &KTJSONWriter::WriteExtData ),
-        fCoreDataSlot( "core", this, &KTJSONWriter::WriteData< KTCoreDataExt > )
-        {
-        }
-
-    KTJSONWriter::~KTJSONWriter()
-    {
-        // archive must be delete before the stream!
-        delete fArchiveOutPtr;
-        delete fStreamOutPtr;
-    }
-
-    bool KTJSONWriter::Configure( const scarab::param_node& node )
-    {
-        SetFilename( node.get_value( "filename", fFilename ) );
-
-        return true;
-    }
-
-    void KTJSONWriter::WriteExtData( KTDataHandle handle )
-    {
-        if( fStreamOutPtr == nullptr )
-        {
-            fStreamOutPtr = new std::ofstream( fFilename );
-            fArchiveOutPtr = new cereal::JSONOutputArchive( *fStreamOutPtr );
-        }
-
-        // Write to JSON archive
-        KTDEBUG( avlog_hh, "Writing extensible data to JSON archive" );
-        (*fArchiveOutPtr)( handle );
-
-        return;
-    }
-
-}
diff --git a/cpp/Cpp/Library_v1/IO/KTJSONWriter.hh b/cpp/Cpp/Library_v1/IO/KTJSONWriter.hh
deleted file mode 100644
index b6ba7a8..0000000
--- a/cpp/Cpp/Library_v1/IO/KTJSONWriter.hh
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  KTJSONWriter.hh
- *
- *  Created on: Feb 1, 2018
- *      Author: N.S. Oblath
- *
-*/
-
-#ifndef NYMPH_KTJSONWRITER_HH_
-#define NYMPH_KTJSONWRITER_HH_
-
-// included first so that the archive is registered before the data classes
-#include "cereal/archives/json.hpp"
-// then register the nymph extensible data classes
-#include "KTRegisterNymphExtData.hh"
-
-
-#include "KTWriter.hh"
-#include "KTSlot.hh"
-
-#include "KTLogger.hh"
-
-#include <fstream>
-
-KTLOGGER( avlog_hh, "KTJSONWriter" );
-
-namespace Nymph
-{
-    class KTJSONWriter;
-
-    typedef KTDerivedTypeWriter< KTJSONWriter > KTJSONTypeWriter;
-
-    /*!
-     @class KTJSONWriter
-     @author N. S. Oblath
-
-     @brief Writes data to a JSON file
-
-     @details
-     Can write single data objects or full extensible data objects.
-
-     The Cereal serialization library is used for this writer.
-     Data objects must have a serial or save function to be successfully serialized.
-
-     The slots for this writer can be extended in other compilation units using the type-writer system.
-     As an example, see Executables/Validation/KTJSONTypeWriterValidation and KTRegisterNymphValidationExtData.
-
-     Data objects must be registered after the Cereal JSON archive is included, and before any serialization takes place.
-     As an example when extending the writer, see KTRegisterNymphValidationExtData.
-
-     Configuration name: "json-writer"
-
-     Available configuration options:
-     - "filename": string -- JSON filename to write to
-
-     Signals: N/A
-
-     Slots:
-     - "ext-data": void (KTDataHandle) -- write a full extensible data object
-     - "core" void (KTDataHandle) -- write a KTCoreData object; requires KTCoreData
-
-   */
-    class KTJSONWriter : public KTWriterWithTypists< KTJSONWriter, KTJSONTypeWriter >
-    {
-        public:
-            KTJSONWriter( const std::string& name = "json-writer" );
-            virtual ~KTJSONWriter();
-
-            bool Configure( const scarab::param_node& node );
-
-            MEMBERVARIABLE( std::string, Filename );
-
-        public:
-            template< class XDataType >
-            void WriteData( const XDataType& data );
-
-            void WriteExtData( KTDataHandle handle );
-
-        private:
-            std::ofstream* fStreamOutPtr;
-            cereal::JSONOutputArchive* fArchiveOutPtr;
-
-        private:
-            KTSlot< KTDataHandle > fExtDataSlot;
-
-            KTSlotData< void, KTCoreDataExt > fCoreDataSlot;
-    };
-
-    template< class XDataType >
-    void KTJSONWriter::WriteData( const XDataType& data )
-    {
-        if( fStreamOutPtr == nullptr )
-        {
-            fStreamOutPtr = new std::ofstream( fFilename );
-            fArchiveOutPtr = new cereal::JSONOutputArchive( *fStreamOutPtr );
-        }
-
-        // Write to JSON archive
-        KTDEBUG( avlog_hh, "Writing data to JSON archive" );
-        (*fArchiveOutPtr)( data );
-
-        return;
-    }
-
-} // namespace Nymph
-
-#endif // NYMPH_KTJSONWRITER_HH_
diff --git a/cpp/Cpp/Library_v1/IO/KTReader.cc b/cpp/Cpp/Library_v1/IO/KTReader.cc
deleted file mode 100644
index 0aa7b2d..0000000
--- a/cpp/Cpp/Library_v1/IO/KTReader.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * KTReader.cc
- *
- *  Created on: Apr 11, 2013
- *      Author: nsoblath
- */
-
-#include "KTReader.hh"
-
-namespace Nymph
-{
-
-    KTReader::KTReader(const std::string& name) :
-            KTPrimaryProcessor({}, name)
-    {
-    }
-
-    KTReader::~KTReader()
-    {
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/IO/KTReader.hh b/cpp/Cpp/Library_v1/IO/KTReader.hh
deleted file mode 100644
index 86759ab..0000000
--- a/cpp/Cpp/Library_v1/IO/KTReader.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * KTReader.hh
- *
- *  Created on: Apr 11, 2013
- *      Author: nsoblath
- */
-
-#ifndef KTREADER_HH_
-#define KTREADER_HH_
-
-#include "KTPrimaryProcessor.hh"
-
-#include "factory.hh"
-
-namespace Nymph
-{
-    class KTReader : public KTPrimaryProcessor
-    {
-        public:
-            KTReader(const std::string& name = "default-reader-name");
-            virtual ~KTReader();
-
-    };
-
-#define KT_REGISTER_READER(reader_class, reader_name) \
-        static ::scarab::registrar< ::Nymph::KTReader, reader_class, const std::string& > s##reader_class##ReaderRegistrar(reader_name);
-
-} /* namespace Nymph */
-#endif /* KTREADER_HH_ */
diff --git a/cpp/Cpp/Library_v1/IO/KTWriter.cc b/cpp/Cpp/Library_v1/IO/KTWriter.cc
deleted file mode 100644
index 3e6f82e..0000000
--- a/cpp/Cpp/Library_v1/IO/KTWriter.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * KTWriter.cc
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#include "KTWriter.hh"
-
-namespace Nymph
-{
-
-    KTWriter::KTWriter(const std::string& name) :
-            KTProcessor(name)
-    {
-    }
-
-    KTWriter::~KTWriter()
-    {
-    }
-
-
-
-    KTTypeWriter::KTTypeWriter()
-    {
-    }
-
-    KTTypeWriter::~KTTypeWriter()
-    {
-    }
-
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/IO/KTWriter.hh b/cpp/Cpp/Library_v1/IO/KTWriter.hh
deleted file mode 100644
index 278e680..0000000
--- a/cpp/Cpp/Library_v1/IO/KTWriter.hh
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * KTWriter.hh
- *
- *  Created on: Aug 24, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTWRITER_HH_
-#define KTWRITER_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTTIFactory.hh"
-
-#include "factory.hh"
-
-#include <map>
-#include <typeinfo>
-
-namespace Nymph
-{
-    class KTTypeWriter
-    {
-        public:
-            KTTypeWriter();
-            virtual ~KTTypeWriter();
-
-            virtual void RegisterSlots() = 0;
-    };
-
-
-    template< class XWriter >
-    class KTDerivedTypeWriter : public KTTypeWriter
-    {
-        public:
-            KTDerivedTypeWriter(XWriter* writer);
-            virtual ~KTDerivedTypeWriter();
-
-            void SetWriter(XWriter* writer);
-
-        protected:
-            XWriter* fWriter;
-    };
-
-
-    template< class XWriter >
-    KTDerivedTypeWriter< XWriter >::KTDerivedTypeWriter(XWriter* writer) :
-            KTTypeWriter(),
-            fWriter(writer)
-    {
-    }
-
-    template< class XWriter >
-    KTDerivedTypeWriter< XWriter >::~KTDerivedTypeWriter()
-    {
-    }
-
-    template< class XWriter >
-    void KTDerivedTypeWriter< XWriter >::SetWriter(XWriter* writer)
-    {
-        fWriter = writer;
-        return;
-    }
-
-
-
-
-    class KTWriter : public KTProcessor
-    {
-        public:
-            KTWriter(const std::string& name = "default-writer-name");
-            virtual ~KTWriter();
-
-    };
-
-    template< class XWriter, class XTypist >
-    class KTWriterWithTypists : public KTWriter
-    {
-        protected:
-            typedef std::map< const std::type_info*, XTypist* > TypeWriterMap;
-        public:
-            KTWriterWithTypists(const std::string& name = "default-writer-with-typists-name");
-            virtual ~KTWriterWithTypists();
-
-            template< class XTypeWriter >
-            XTypeWriter* GetTypeWriter();
-
-        protected:
-            TypeWriterMap fTypeWriters;
-
-    };
-
-
-    template< class XWriter, class XTypist >
-    KTWriterWithTypists< XWriter, XTypist >::KTWriterWithTypists(const std::string& name) :
-            KTWriter(name),
-            fTypeWriters()
-    {
-        KTTIFactory< XTypist, XWriter* >* twFactory = KTTIFactory< XTypist, XWriter* >::get_instance();
-        for (typename KTTIFactory< XTypist, XWriter* >::FactoryCIt factoryIt = twFactory->GetFactoryMapBegin();
-                factoryIt != twFactory->GetFactoryMapEnd();
-                factoryIt++)
-        {
-            XTypist* newTypeWriter = twFactory->Create(factoryIt, static_cast< XWriter* >(this));
-            //newTypeWriter->SetWriter(static_cast< XWriter* >(this));
-            newTypeWriter->RegisterSlots();
-            fTypeWriters.insert(typename TypeWriterMap::value_type(factoryIt->first, newTypeWriter));
-        }
-    }
-
-    template< class XWriter, class XTypist >
-    KTWriterWithTypists< XWriter, XTypist >::~KTWriterWithTypists()
-    {
-        while (! fTypeWriters.empty())
-        {
-            delete fTypeWriters.begin()->second;
-            fTypeWriters.erase(fTypeWriters.begin());
-        }
-    }
-
-    template< class XWriter, class XTypist >
-    template< class XTypeWriter >
-    XTypeWriter* KTWriterWithTypists< XWriter, XTypist >::GetTypeWriter()
-    {
-        typename TypeWriterMap::const_iterator it = fTypeWriters.find(&typeid(XTypeWriter));
-        if (it == fTypeWriters.end())
-        {
-            return NULL;
-        }
-        return static_cast< XTypeWriter* >(it->second);
-    }
-
-#define KT_REGISTER_TYPE_WRITER(writer_class, type_writer_base_class, typist) \
-        static ::Nymph::KTTIRegistrar< type_writer_base_class, type_writer_base_class##typist, writer_class* > s##type_writer_base_class##typist##Registrar;
-
-#define KT_REGISTER_WRITER(writer_class, writer_name) \
-        static ::scarab::registrar< ::Nymph::KTWriter, writer_class, const std::string& > s##writer_class##WriterRegistrar(writer_name);
-
-} /* namespace Nymph */
-#endif /* KTWRITER_HH_ */
diff --git a/cpp/Cpp/Library_v1/NymphPybind.cc b/cpp/Cpp/Library_v1/NymphPybind.cc
deleted file mode 100644
index 39ceb7c..0000000
--- a/cpp/Cpp/Library_v1/NymphPybind.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * NymphPybind.cc
- *
- *  Created on: Jan 27, 2018
- *      Author: N.S. Oblath
- */
-
-#include "KTParamPybind.hh"
-
-#include "KTProcessorToolboxPybind.hh"
-#include "KTProcessorPybind.hh"
-
-#include <memory>
-
-//#include "Utility/KTConfigurablePybind.hh"
-
-PYBIND11_MODULE( py_nymph, mod )
-{
-    //Nymph::ExportKTConfigurable( mod );
-	//Nymph::ExportKTProcessor( mod );
-    Nymph::ExportKTProcessorToolbox( mod );
-    Nymph::ExportParamPybind( mod );
-
-    pybind11::class_< Nymph::KTProcessor, std::shared_ptr<Nymph::KTProcessor> >( mod, "KTProcessor" );
-
-    pybind11::class_< Nymph::KTWrapProcessor, Nymph::KTPyWrapProcessor, Nymph::KTProcessor, std::shared_ptr<Nymph::KTWrapProcessor> > wrap_processor(mod, "WrapProcessor", pybind11::dynamic_attr());
-    wrap_processor
-        .def(pybind11::init<>())
-        .def("WrapFunction", &Nymph::KTWrapProcessor::WrapFunction)
-        .def("Configure", &Nymph::KTWrapProcessor::Configure);
-
-}
-
-
-
diff --git a/cpp/Cpp/Library_v1/Processor/KTConnection.hh b/cpp/Cpp/Library_v1/Processor/KTConnection.hh
deleted file mode 100644
index 491a353..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTConnection.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KTConnection.hh
- *
- *  Created on: Aug 8, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTCONNECTION_HH_
-#define KTCONNECTION_HH_
-
-#include <boost/signals2.hpp>
-
-namespace Nymph
-{
-    typedef boost::signals2::connection KTConnection;
-} /* namespace Nymph */
-#endif /* KTCONNECTION_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTNymphSignals.hh b/cpp/Cpp/Library_v1/Processor/KTNymphSignals.hh
deleted file mode 100644
index aa52aba..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTNymphSignals.hh
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * KTNymphSignals.hh
- *
- *  Created on: Feb 25, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTNYMPHSIGNALS_HH_
-#define NYMPH_KTNYMPHSIGNALS_HH_
-
-#include "KTSignal.hh"
-
-#include "KTCoreData.hh"
-
-namespace Nymph
-{
-    /// Convenience typedef for done signals
-    typedef KTSignal<> KTSignalDone;
-
-    // Convenience typedef for backwards compatibility
-    template< typename XDataType >
-    using KTSignalOneArg = KTSignal< XDataType >;
-
-    /*!
-     @class KTSignalData
-     @author N. S. Oblath
-
-     @brief Creates a signal that takes a KTDataHandle object as its argument.
-
-     @details
-     The purpose of the signal is for passing KTCoreData pointers between Processors.
-     The signal is emitted by calling operator().
-     If a KTDataSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
-
-     Usage:
-     In your Processor's header add a member variable of type KTSignalData.
-
-     Initialize the signal with the processor's 'this' pointer and the name of the signal.
-
-     That's it!
-    */
-    typedef KTSignal< KTDataHandle > KTSignalData;
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTNYMPHSIGNALS_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh b/cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh
deleted file mode 100644
index a584b3c..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTNymphSlot.hh
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * KTNymphSlot.hh
- *
- *  Created on: Feb 25, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTNYMPHSLOT_HH_
-#define NYMPH_KTNYMPHSLOT_HH_
-
-#include "KTSlot.hh"
-
-#include "KTException.hh"
-#include "KTNymphSignals.hh"
-#include "KTProcessor.hh"
-
-namespace Nymph
-{
-    // Typedefs for backwards compatibility
-
-    typedef KTSlot<> KTSlotNoArg;
-
-    template < typename Arg1 >
-    using KTSlotOneArg = KTSlot< Arg1 >;
-
-    template< typename Arg1, typename Arg2 >
-    using KTSlotTwoArg = KTSlot< Arg1, Arg2 >;
-
-
-    template <typename... Types>
-    struct foo {};
-
-    template < typename... Types1, template <typename...> class T
-             , typename... Types2, template <typename...> class V
-             , typename U >
-    void
-    bar(const T<Types1...>&, const V<Types2...>&, const U& u)
-    {
-      std::cout << sizeof...(Types1) << std::endl;
-      std::cout << sizeof...(Types2) << std::endl;
-      std::cout << u << std::endl;
-    }
-
-
-    /*!
-     @class KTSlotData
-     @author N. S. Oblath
-
-     @brief Creates a slot that takes a KTDataHandle object as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
-
-     @details
-     Usage:
-     This slot type adds the slot function (signature void (KTDataHandle).
-     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
-     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
-
-     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-
-     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
-    */
-    template< class XReturnType, class... XDataArgs >
-    class KTSlotData : public KTSlot< KTDataHandle  >
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
-            virtual ~KTSlotData();
-
-            void operator()( KTDataHandle data );
-
-        protected:
-            template< typename... DataTypes >
-            bool DataPresent( KTDataHandle data );
-
-            //function_signature fFunc;
-            std::function< XReturnType (const XDataArgs&..., XReturnType&) > fFunc;
-
-            KTSignalData* fSignalPtr;
-    };
-
-    // partial specialization for no new data type
-    template< class... XDataArgs >
-    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
-
-            virtual ~KTSlotData();
-
-            void operator()( KTDataHandle data );
-
-        protected:
-            template< typename... DataTypes >
-            bool DataPresent( KTDataHandle data );
-
-            //function_signature fFunc;
-            std::function< void (const XDataArgs&...) > fFunc;
-
-            KTSignalData* fSignalPtr;
-    };
-
-
-    /*!
-     @class KTSlotDone
-     @author N. S. Oblath
-
-     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
-
-     @details
-     Usage:
-     This slot type adds the slot function (signature void ()).
-     Your processor (or, optionally, a different object) must have a member function with the signature void ().
-     The slot calls the member function.
-
-     In your Processor's header add a member variable of type KTDoneSlot.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-
-     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
-    */
-    class KTSlotDone : public KTSlot<>
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
-            virtual ~KTSlotDone();
-
-            void operator()();
-
-        protected:
-            std::function< void () > fFunc;
-
-            KTSignalDone* fSignalPtr;
-    };
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    // KTSlotData
-
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class XReturnType, class... XDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::~KTSlotData()
-    {
-    }
-
-    template< class XReturnType, class... XDataTypes >
-    void KTSlotData< XReturnType, XDataTypes... >::operator()( KTDataHandle dataHandle )
-    {
-        // Standard data slot pattern:
-
-        std::shared_ptr< KTThreadReference > ref = fThreadRef;
-
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataHandle ) )
-        {
-            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            return;
-        }
-
-        // Call the function
-        try
-        {
-            fFunc( dataHandle->Of< XDataTypes >()... , dataHandle->Of< XReturnType >() );
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
-            ref->SetReturnException( boost::current_exception() );
-        }
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        ref->Break( dataHandle, fDoBreakpoint );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)( dataHandle );
-        }
-        return;
-    }
-
-    template< class XReturnType, class... XDataTypes >
-    template< typename... DataTypes >
-    bool KTSlotData< XReturnType, XDataTypes... >::DataPresent( KTDataHandle data )
-    {
-        return DataPresentHelper< DataTypes... >::DataPresent( data );
-    }
-
-
-    // KTSlotData with no return type
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class... XDataTypes >
-    KTSlotData< void, XDataTypes... >::~KTSlotData()
-    {
-    }
-
-    template< class... XDataTypes >
-    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
-    {
-        // Standard data slot pattern:
-
-        std::shared_ptr< KTThreadReference > ref = fThreadRef;
-
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataHandle ) )
-        {
-            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            return;
-        }
-
-        // Call the function
-        try
-        {
-            fFunc( dataHandle->Of< XDataTypes >()... );
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
-            ref->SetReturnException( boost::current_exception() );
-        }
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        ref->Break( dataHandle, fDoBreakpoint );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)( dataHandle );
-        }
-        return;
-    }
-
-    template< class... XDataTypes >
-    template< typename... DataTypes >
-    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
-    {
-        return DataPresentHelper< DataTypes... >::DataPresent( data );
-    }
-
-
-    // KTSlotDone
-
-    template< class XFuncOwnerType >
-    KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner](){ return (owner->*func)(); } ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class XFuncOwnerType >
-    KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner](){ return (owner->*func)(); } ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    inline KTSlotDone::~KTSlotDone()
-    {
-    }
-
-    inline void KTSlotDone::operator()()
-    {
-        // Call the function
-        fFunc();
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        fThreadRef->Break( KTDataHandle(), fDoBreakpoint );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)();
-        }
-        return;
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTNYMPHSLOT_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc b/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
deleted file mode 100644
index babcccd..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * KTPrimaryProcessor.cc
- *
- *  Created on: Oct 10, 2012
- *      Author: nsoblath
- */
-
-#include "KTPrimaryProcessor.hh"
-
-#include "KTException.hh"
-#include "KTLogger.hh"
-
-namespace Nymph
-{
-    KTLOGGER( proclog, "KTPrimaryProcessor" );
-
-    KTPrimaryProcessor::KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name ) :
-            KTProcessor( name ),
-            fSignalsEmitted( signals ),
-            fThreadRef(),
-            fDoBreakpoint(false)
-    {
-
-    }
-
-    KTPrimaryProcessor::~KTPrimaryProcessor()
-    {
-    }
-
-    void KTPrimaryProcessor::operator ()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag )
-    {
-        fThreadRef = ref;
-
-        // pass updated thread reference to downstream slots
-        for( auto sigIt = fSignalsEmitted.begin(); sigIt != fSignalsEmitted.end(); ++sigIt )
-        {
-            // loop over all processor:slots called by this signal
-            auto sigConnRange = fSigConnMap.equal_range( *sigIt );
-            for( SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt )
-            {
-                // pass the update on to the connected-to processor
-                sigConnIt->second.first->PassThreadRefUpdate( sigConnIt->second.second, fThreadRef );
-            }
-        }
-
-        startedFlag = true;
-        startedCV.notify_all();
-
-        // go!
-        try
-        {
-            if( ! Run() )
-            {
-                KTERROR( proclog, "An error occurred during processor running." );
-                THROW_THREADREF_EXCEPTION( fThreadRef, KTException() << "An error occurred during processor running" );
-            }
-            else
-            {
-                fThreadRef->SetReturnValue( KTDataHandle() );
-            }
-        }
-        catch( boost::exception& e )
-        {
-            fThreadRef->SetReturnException( boost::current_exception() );
-        }
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh b/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
deleted file mode 100644
index 218eb0f..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * KTPrimaryProcessor.hh
- *
- *  Created on: Oct 10, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTPRIMARYPROCESSOR_HH_
-#define KTPRIMARYPROCESSOR_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTCoreData.hh"
-#include "KTThreadReference.hh"
-
-#include <boost/thread/condition_variable.hpp>
-
-#include <atomic>
-
-namespace Nymph
-{
-
-    class KTPrimaryProcessor : public KTProcessor
-    {
-        public:
-            KTPrimaryProcessor( std::initializer_list< std::string > signals, const std::string& name = "default-primary-processor-name" );
-            virtual ~KTPrimaryProcessor();
-
-        public:
-            /// Callable function used by std::thread
-            void operator()( std::shared_ptr< KTThreadReference > ref, boost::condition_variable& startedCV, bool& startedFlag );
-
-            /// Starts the  main action of the processor
-            virtual bool Run() = 0;
-
-            std::shared_ptr< KTThreadReference > GetThreadRef();
-
-            MEMBERVARIABLE( bool, DoBreakpoint );
-
-        protected:
-            std::vector< std::string > fSignalsEmitted;
-
-            std::shared_ptr< KTThreadReference > fThreadRef;
-
-    };
-
-    inline std::shared_ptr< KTThreadReference > KTPrimaryProcessor::GetThreadRef()
-    {
-        return fThreadRef;
-    }
-
-} /* namespace Nymph */
-#endif /* KTPRIMARYPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTProcessor.cc b/cpp/Cpp/Library_v1/Processor/KTProcessor.cc
deleted file mode 100644
index c28cfa9..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTProcessor.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * KTProcessor.cc
- *
- *  Created on: Jan 5, 2012
- *      Author: nsoblath
- */
-
-#include "KTProcessor.hh"
-
-#include "KTException.hh"
-//#include "KTLogger.hh"
-
-#include <string>
-
-using std::string;
-
-namespace Nymph
-{
-    //KTLOGGER(proclog, "KTProcessor");
-
-    KTProcessor::KTProcessor(const string& name) :
-            KTConfigurable(name),
-            fSignalMap(),
-            fSlotMap(),
-            fSlotToSigMap(),
-            fSigConnMap()
-    {
-    }
-
-    KTProcessor::~KTProcessor()
-    {
-        for (SlotMapIt iter = fSlotMap.begin(); iter != fSlotMap.end(); iter++)
-        {
-            delete iter->second;
-        }
-        for (SigMapIt iter = fSignalMap.begin(); iter != fSignalMap.end(); iter++)
-        {
-            delete iter->second;
-        }
-    }
-
-    void KTProcessor::PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef)
-    {
-        std::function< void(std::shared_ptr< KTThreadReference >) > funcObj = [this, &slotName](std::shared_ptr< KTThreadReference > ref){ GetSlot(slotName)->ThreadRef() = ref; };
-        PassToConnProcs(slotName, funcObj, threadRef);
-        return;
-    }
-
-    void KTProcessor::ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum)
-    {
-        // get the signal and slot wrapper pointers
-        KTSignalBase* signal = GetSignal(signalName);
-        KTSlotBase* slot = processor->GetSlot(slotName);
-
-        try
-        {
-            // make the connection
-            ConnectSignalToSlot(signal, slot, groupNum);
-        }
-        catch( KTSignalException& e )
-        {
-            e << KTErrorMsgInfo< struct proc_Sig_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the signal." );
-            e << KTErrorMsgInfo< struct proc_Sig_1 >( "You may have the signal name wrong." );
-            throw;
-        }
-        catch( KTSlotException& e )
-        {
-            e << KTErrorMsgInfo< struct proc_Slot_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem with the slot." );
-            e << KTErrorMsgInfo< struct proc_Slot_1 >( "You may have the slot name wrong." );
-            throw;
-        }
-        catch( KTConnectionException& e )
-        {
-            e << KTErrorMsgInfo< struct proc_Conn_0 >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> due to a problem making the connection." );
-            e << KTErrorMsgInfo< struct proc_Conn_1 >( "Check that the signatures of the signal and slot match exactly." );
-            throw;
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct proc_Unkn >( "Unable to connect signal <" + signalName + "> to slot <" + slotName + "> for an unknown reason." );
-            throw;
-        }
-
-        // record the connection in the signal-connection map
-        fSigConnMap.insert(SigConnMapVal(signalName, std::make_pair(processor, slotName)));
-
-        KTDEBUG(processorlog, "Connected signal <" << this->GetConfigName() << ":" << signalName << "> to slot <" << processor->GetConfigName() << ":" << slotName << ">");
-
-        return;
-    }
-
-    void KTProcessor::ConnectSignalToSlot(KTSignalBase* signal, KTSlotBase* slot, int groupNum)
-    {
-        if (signal == nullptr)
-        {
-            BOOST_THROW_EXCEPTION( KTSignalException() << "Signal pointer was NULL" << eom );
-        }
-        if (slot == nullptr)
-        {
-            BOOST_THROW_EXCEPTION( KTSlotException() << "Slot pointer was NULL" << eom );
-        }
-
-        signal->Connect(slot, groupNum);
-
-        return;
-    }
-
-    KTSignalBase* KTProcessor::GetSignal(const std::string& name)
-    {
-        SigMapIt iter = fSignalMap.find(name);
-        if (iter == fSignalMap.end())
-        {
-            return NULL;
-        }
-        return iter->second;
-    }
-
-    KTSlotBase* KTProcessor::GetSlot(const std::string& name)
-    {
-        SlotMapIt iter = fSlotMap.find(name);
-        if (iter == fSlotMap.end())
-        {
-            return NULL;
-        }
-        return iter->second;
-    }
-
-    bool KTProcessor::GetDoBreakpoint(const std::string& slotName)
-    {
-        KTSlotBase* slot = GetSlot(slotName);
-        if (slot != nullptr)
-        {
-            return slot->GetDoBreakpoint();
-        }
-        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
-        return false;
-    }
-
-    void KTProcessor::SetDoBreakpoint(const std::string& slotName, bool flag)
-    {
-        KTSlotBase* slot = GetSlot(slotName);
-        if (slot != nullptr)
-        {
-            return slot->SetDoBreakpoint(flag);
-        }
-        BOOST_THROW_EXCEPTION( KTException() << "Slot <" << slotName << "> was not found" << eom );
-        return;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Processor/KTProcessor.hh b/cpp/Cpp/Library_v1/Processor/KTProcessor.hh
deleted file mode 100644
index 2575131..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTProcessor.hh
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- @file KTProcessor.hh
- @brief Contains KTProcessor
- @details KTProcessor is the processor base class
- @author: N. S. Oblath
- @date: Jan 5, 2012
- */
-
-#ifndef KTPROCESSOR_HH_
-#define KTPROCESSOR_HH_
-
-#include "KTConfigurable.hh"
-
-#include "KTLogger.hh"
-#include "KTNymphSlot.hh"
-
-#include "factory.hh"
-
-#include <exception>
-#include <initializer_list>
-#include <map>
-#include <sstream>
-#include <memory>
-
-namespace Nymph
-{
-    KTLOGGER(processorlog, "KTProcessor.hh");
-
-    struct KTProcessorException : virtual public KTException
-    {};
-
-    struct KTSignalException : virtual public KTException {};
-    struct KTSlotException : virtual public KTException {};
-
-    class KTThreadReference;
-
-    class KTProcessor : public KTConfigurable
-    {
-        protected:
-            typedef std::map< std::string, KTSignalBase* > SignalMap;
-            typedef SignalMap::iterator SigMapIt;
-            typedef SignalMap::value_type SigMapVal;
-
-            typedef std::map< std::string, KTSlotBase* > SlotMap;
-            typedef SlotMap::iterator SlotMapIt;
-            typedef SlotMap::value_type SlotMapVal;
-
-            typedef std::multimap< std::string, std::string > SlotToSigMap;
-            typedef SlotToSigMap::iterator SlotToSigMapIt;
-            typedef SlotToSigMap::const_iterator SlotToSigMapCIt;
-            typedef SlotToSigMap::value_type SlotToSigMapVal;
-
-            typedef std::multimap< std::string, std::pair< KTProcessor*, std::string > > SigConnMap;
-            typedef SigConnMap::iterator SigConnMapIt;
-            typedef SigConnMap::const_iterator SigConnMapCIt;
-            typedef SigConnMap::value_type SigConnMapVal;
-
-        public:
-            KTProcessor(const std::string& name="default-proc-name");
-            virtual ~KTProcessor();
-
-            template< class XDerivedProc >
-            static scarab::registrar< Nymph::KTProcessor, XDerivedProc, const std::string& >* RegisterProcessor( const std::string& name );
-
-        public:
-            /// For a slot that is called, update the slot's ThreadRef, and pass the update to any slots that get called by signals emitted by this slot
-            void PassThreadRefUpdate(const std::string& slotName, std::shared_ptr< KTThreadReference > threadRef);
-
-            static void ConnectSignalToSlot(KTSignalBase* signal, KTSlotBase* slot, int groupNum=-1);
-
-            void ConnectASlot(const std::string& signalName, KTProcessor* processor, const std::string& slotName, int groupNum=-1);
-            void ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum=-1);
-
-            void RegisterSignal(std::string name, KTSignalBase* signal);
-
-            void RegisterSlot(std::string name, KTSlotBase* slot, std::initializer_list< std::string > signals = {});
-
-            KTSignalBase* GetSignal(const std::string& name);
-
-            KTSlotBase* GetSlot(const std::string& name);
-
-            bool GetDoBreakpoint(const std::string& slotName);
-            void SetDoBreakpoint(const std::string& slotName, bool flag);
-
-        protected:
-            template< typename XReturn, typename... XArgs >
-            void PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args);
-
-            SignalMap fSignalMap;
-
-            SlotMap fSlotMap;
-
-            // maps which slots call which signals in this processor
-            SlotToSigMap fSlotToSigMap;
-
-            // maps which signals get connected to which slots in other processors
-            SigConnMap fSigConnMap;
-    };
-
-
-    void KTProcessor::RegisterSignal(std::string name, KTSignalBase* signal)
-    {
-        KTDEBUG(processorlog, "Registering signal <" << name << "> in processor <" << fConfigName << ">");
-        fSignalMap.insert(SigMapVal(name, signal));
-        return;
-    }
-
-    void KTProcessor::RegisterSlot(std::string name, KTSlotBase* slot, std::initializer_list< std::string > signals)
-    {
-        KTDEBUG(processorlog, "Registering slot <" << name << "> in processor <" << fConfigName << ">");
-
-        fSlotMap.insert(SlotMapVal(name, slot));
-
-        for (auto sigIt = signals.begin(); sigIt != signals.end(); ++sigIt)
-        {
-            fSlotToSigMap.insert(SlotToSigMapVal(name, *sigIt));
-            KTDEBUG(processorlog, "Slot-to-signal connection <" << name << "> --> <" << *sigIt << ">");
-        }
-        return;
-    }
-
-    inline void KTProcessor::ConnectASignal(KTProcessor* processor, const std::string& signalName, const std::string& slotName, int groupNum)
-    {
-        processor->ConnectASlot(signalName, this, slotName, groupNum);
-        return;
-    }
-
-    template< typename XReturn, typename... XArgs >
-    void KTProcessor::PassToConnProcs(const std::string& slotName, std::function< XReturn(XArgs...) > function, XArgs... args)
-    {
-        // update this slot
-        function(args...);
-
-        // get the list of slot-to-signal connections for this slot
-        auto stsRange = fSlotToSigMap.equal_range(slotName);
-
-        // loop over signals called in the performance of slot slotName
-        for (SlotToSigMapCIt stsIt = stsRange.first; stsIt != stsRange.second; ++stsIt)
-        {
-            // loop over all processor:slots called by this signal
-            auto sigConnRange = fSigConnMap.equal_range(stsIt->second);
-            for (SigConnMapCIt sigConnIt = sigConnRange.first; sigConnIt != sigConnRange.second; ++sigConnIt)
-            {
-                // pass the update on to the connected-to processor
-                sigConnIt->second.first->PassToConnProcs(sigConnIt->second.second, function, args...);
-            }
-        }
-        return;
-    }
-
-    template< class XDerivedProc >
-    scarab::registrar< KTProcessor, XDerivedProc, const std::string& >* KTProcessor::RegisterProcessor( const std::string& name )
-    {
-        return new scarab::registrar< KTProcessor, XDerivedProc, const std::string& >( name );
-    }
-
-#define KT_REGISTER_PROCESSOR(proc_class, proc_name) \
-        static ::scarab::registrar< ::Nymph::KTProcessor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
-
-} /* namespace Nymph */
-#endif /* KTPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.cc b/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.cc
deleted file mode 100644
index 04cc151..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * KTProcessorPybind.cc
- *
- *  Created on: Feb 06, 2018
- *      Author: cclaessens
- */
-
-#include "KTProcessor.hh"
-#include "KTProcessorPybind.hh"
-
-
-#include "KTLogger.hh"
-
-namespace Nymph
-{
-
-	KTLOGGER(procpylog, "KTProcessorPybind");
-	KT_REGISTER_PROCESSOR(KTWrapProcessor, "base-wrap-proc");
-
-    KTWrapProcessor::KTWrapProcessor( const std::string& name ) :
-            KTProcessor( name ),
-            fSlot("wrap-slot", this, &KTWrapProcessor::SlotFunc)
-
-    {
-    }
-
-    KTWrapProcessor::~KTWrapProcessor()
-    {
-    }
-
-    bool KTWrapProcessor::Configure(const scarab::param_node&)
-    {
-        return true;
-    }
-
-    void KTWrapProcessor::SlotFunc(int input)
-    {
-        KTINFO(procpylog, "Calling wrap function ");
-        this->WrapFunction(input);
-        return;
-    }
-
-    void KTWrapProcessor::WrapFunction(int input)
-    {
-        KTINFO(procpylog, "Hey, I'm base class");
-        return;
-    }
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.hh b/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.hh
deleted file mode 100644
index 41bed4c..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTProcessorPybind.hh
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * KTProcessorPybind.hh
- *
- *  Created on: Jan 24, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTPROCESSORPYBIND_HH_
-#define NYMPH_KTPROCESSORPYBIND_HH_
-
-#include "KTPyProcessor.hh"
-#include "KTProcessor.hh"
-#include "KTSlot.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace Nymph
-{
-
-/*    void ExportKTProcessor( pybind11::module& mod )
-    {
-        pybind11::class_< KTProcessor, KTConfigurable >( mod, "KTProcessor" )
-                .def( pybind11::init< const std::string & >() )
-
-                .def( "ConnectASlot", &Nymph::KTProcessor::ConnectASlot )
-                .def( "ConnectASignal", &Nymph::KTProcessor::ConnectASignal )
-
-                .def( "GetDoBreakpoint", &Nymph::KTProcessor::GetDoBreakpoint )
-                .def( "SetDoBreakpoint", &Nymph::KTProcessor::SetDoBreakpoint )
-                ;
-
-        pybind11::class_< KTPyProcessor >( mod, "KTPyProcessor" )
-                .def( pybind11::init< const std::string & >() )
-                ;
-
-
-
-    }*/
-
-    // processor with wrapfunction
-    class KTWrapProcessor : public KTProcessor
-    {
-        public:
-            KTWrapProcessor( const std::string& name = "base-wrap-proc" );
-            virtual ~KTWrapProcessor();
-
-            bool Configure(const scarab::param_node& node);
-
-            void SlotFunc(int);
-            virtual void WrapFunction(int input);
-
-        private:
-            KTSlot< int > fSlot;
-
-    };
-
-	// helper class
-	class KTPyWrapProcessor: public KTWrapProcessor
-	{
-		public:
-			// Inherit the constructors
-			using KTWrapProcessor::KTWrapProcessor;
-
-			// Trampoline (need one for each virtual function)
-			void WrapFunction(int input) override {
-				// I dont know what these two lines do,
-				// but at least the first one is necessary or nymph hangs when calling this as python method
-				pybind11::gil_scoped_release release;
-				pybind11::gil_scoped_acquire acquire;
-				PYBIND11_OVERLOAD_PURE(
-						void, // Return type
-						KTWrapProcessor,      // Parent class
-						WrapFunction,          // Name of function in C++ (must match Python name)
-						input      // Argument(s)
-				);
-			}
-			bool Configure(const scarab::param_node& node) override {
-				PYBIND11_OVERLOAD(
-						bool, // Return type
-						KTWrapProcessor,      // Parent class
-						Configure,          // Name of function in C++ (must match Python name)
-						node      // Argument(s)
-				);
-			}
-	};
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTPROCESSORPYBIND_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh b/cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh
deleted file mode 100644
index 52f27b1..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTPyProcessor.hh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * KTPyProcessor.hh
- *
- *  Created on: Jan 29, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTPYPROCESSOR_HH_
-#define NYMPH_KTPYPROCESSOR_HH_
-
-#include "KTProcessor.hh"
-
-namespace Nymph
-{
-
-    class KTPyProcessor : public KTProcessor
-    {
-        public:
-            using KTProcessor::KTProcessor; // inherit constructors
-
-            // for now, override KTConfigurable::Configure(const scarab::param_node&) with a non-functional function
-            bool Configure(const scarab::param_node& )
-            {
-                return true;
-            }
-    };
-
-
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTPYPROCESSOR_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSignal.hh b/cpp/Cpp/Library_v1/Processor/KTSignal.hh
deleted file mode 100644
index c3a8f8b..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSignal.hh
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * KTSignal.hh
- *
- *  Created on: Jan 15, 2013
- *      Author: nsoblath
- */
-
-#ifndef KTSIGNAL_HH_
-#define KTSIGNAL_HH_
-
-#include "KTSignalSlotBase.hh"
-
-#include "KTConnection.hh"
-#include "KTException.hh"
-#include "KTLogger.hh"
-
-#include <map>
-
-namespace Nymph
-{
-    KTLOGGER( signallog, "KTSignal" );
-
-    struct KTConnectionException : public KTException
-    {};
-
-    /// A m_signal object may call multiple slots with the
-    /// same signature. You can connect functions to the m_signal
-    /// which will be called when the emit() method on the
-    /// m_signal object is invoked. Any argument passed to emit()
-    /// will be passed to the given functions.
-    /// The name "m_signal" was chosen to avoid conflicting with std::signal.
-    template< typename... XArgs >
-    class KTSignal : public KTSignalBase
-    {
-        public:
-            using signature = void( XArgs... );
-            using boost_signal = boost::signals2::signal< signature >;
-
-        public:
-            template< typename XOwner >
-            KTSignal( const std::string& name, XOwner* owner );
-            KTSignal( const KTSignal& ) = delete;
-            KTSignal( KTSignal&& ) = delete;
-            virtual ~KTSignal();
-
-            virtual void Connect( KTSlotBase* slot, int group );
-
-            // disconnects a previously connected function
-            void Disconnect( KTSlotBase* slot ) const;
-
-            // disconnects all previously connected functions
-            void DisconnectAll() const;
-
-            // calls all connected functions
-            void Emit( XArgs... args );
-            void operator()( XArgs... args );
-
-        private:
-            typedef std::map< KTSlotBase*, KTConnection > slot_map; // to get around the problem of having a comma inside a macro function argument
-            MEMBERVARIABLE_REF_MUTABLE_CONST( slot_map, Slots );
-
-            boost_signal fInternalSignal;
-    };
-
-
-    /*!
-     @class KTSignal
-     @author N. S. Oblath
-
-     @brief Creates a signal that takes 0 or more arguments.
-
-     @details
-     The signal is emitted by calling operator().
-     If a KTSlot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
-
-     Usage:
-     In your Processor's header add a member variable of type KTSignal< ArgumentTypes >.
-
-     Initialize the signal with the processor's 'this' pointer and the name of the signal.
-
-     To use the signal, call it as: fSignalObject(arg);
-    *//*
-    template< class... XSignalArguments >
-    class KTSignal
-    {
-        public:
-            typedef void (signature)( XSignalArguments... );
-            typedef boost::signals2::signal< signature > boost_signal;
-            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
-
-        public:
-            KTSignal();
-            KTSignal( const std::string& name, KTProcessor* proc );
-            virtual ~KTSignal();
-
-        protected:
-            KTSignal( const KTSignal& );
-
-        public:
-            void operator()( XSignalArguments... args );
-
-            boost_signal* Signal();
-
-            const std::string& GetName() const;
-
-        protected:
-            boost_signal fSignal;
-
-            std::string fName;
-    };
-*/
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    KTSignal< XArgs... >::KTSignal< XOwner >( const std::string& name, XOwner* owner ) :
-            fSlots(),
-            fInternalSignal()
-    {
-        owner->RegisterSignal( name, this );
-    }
-
-    template< typename... XArgs >
-    KTSignal< XArgs... >::~KTSignal()
-    {
-        DisconnectAll();
-    }
-
-    template< typename... XArgs >
-    void KTSignal< XArgs... >::Connect( KTSlotBase* slot, int group )
-    {
-        if( fSlots.count( slot ) != 0 )
-        {
-            KTWARN( signallog, "Signal <" << fName << "> is already connected to slot <" << slot->Name() << ">" );
-            return;
-        }
-
-        // ensure that the slot is of the correct type
-        KTSlot< XArgs... >* derivedSlot = dynamic_cast< KTSlot< XArgs... >* >( slot );
-        if( slot == nullptr )
-        {
-            BOOST_THROW_EXCEPTION( KTConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
-                    "\tUnable to cast from KTSlotBase to this signal's derived type." << eom );
-        }
-
-        KTConnection connection;
-        if( group >= 0 )
-        {
-            connection = fInternalSignal.connect( group, derivedSlot->Function() );
-        }
-        else
-        {
-            connection = fInternalSignal.connect( derivedSlot->Function() );
-        }
-
-        fSlots.insert( std::make_pair< KTSlotBase*, KTConnection >( slot, connection ) );
-        slot->AddConnection( this );
-
-        return;
-    }
-
-    // disconnects a previously connected function
-    template< typename... XArgs >
-    void KTSignal< XArgs... >::Disconnect( KTSlotBase* slot ) const
-    {
-        auto connectionIt = fSlots.find( slot );
-        if( connectionIt != fSlots.end() )
-        {
-            connectionIt->second.disconnect();
-            connectionIt->first->RemoveConnection( this );
-        }
-        return;
-    }
-
-    // disconnects all previously connected functions
-    template< typename... XArgs >
-    void KTSignal< XArgs... >::DisconnectAll() const
-    {
-        for( auto connection : fSlots )
-        {
-            connection.second.disconnect();
-            connection.first->RemoveConnection( this );
-        }
-        return;
-    }
-
-    // calls all connected functions
-    template< typename... XArgs >
-    void KTSignal< XArgs... >::Emit( XArgs... args )
-    {
-        (*this)( args );
-        return;
-    }
-
-    template< typename... XArgs >
-    void KTSignal< XArgs... >::operator()( XArgs... args )
-    {
-        fSignal( args );
-    }
-
-/*
-    template< class... XSignalArguments >
-    KTSignal< XSignalArguments... >::KTSignal( const std::string& name, KTProcessor* proc ) :
-            fSignal(),
-            fName( name )
-    {
-        proc->RegisterSignal(name, &fSignal);
-    }
-
-    template< class... XSignalArguments >
-    KTSignal< XSignalArguments... >::KTSignal() :
-            fSignal(),
-            fName("none")
-    {}
-
-    template< class... XSignalArguments >
-    KTSignal< XSignalArguments... >::KTSignal( const KTSignal& signal ) :
-            fSignal(),
-            fName( signal.fName )
-    {}
-
-    template< class... XSignalArguments >
-    KTSignal< XSignalArguments... >::~KTSignal()
-    {
-    }
-
-    template< class... XSignalArguments >
-    inline void KTSignal< XSignalArguments... >::operator()( XSignalArguments... args )
-    {
-        fSignal( args... );
-    }
-
-    template< class... XSignalArguments >
-    inline typename KTSignal< XSignalArguments... >::boost_signal* KTSignal< XSignalArguments... >::Signal()
-    {
-        return &fSignal;
-    }
-
-    template< class... XSignalArguments >
-    inline const std::string& KTSignal< XSignalArguments... >::GetName() const
-    {
-        return fName;
-    }
-*/
-} /* namespace Nymph */
-#endif /* KTSIGNAL_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSignalSlotBase.hh b/cpp/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
deleted file mode 100644
index 35a7db1..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * KTSignalSlotBase.hh
- *
- *  Created on: Feb 25, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTSIGNALSLOTBASE_HH_
-#define NYMPH_KTSIGNALSLOTBASE_HH_
-
-#include "KTMemberVariable.hh"
-
-#include <string>
-
-namespace Nymph
-{
-    class KTSignalBase;
-
-    class KTSlotBase
-    {
-        public:
-            KTSlotBase( const std::string& name );
-            template< typename XOwner >
-            KTSlotBase( const std::string& name, XOwner* owner );
-            virtual ~KTSlotBase();
-
-            virtual void AddConnection( KTSignalBase* ) const = 0;
-
-            virtual void RemoveConnection( KTSignalBase* ) const = 0;
-
-            MEMBERVARIABLE_REF( std::string, Name );
-    };
-
-
-    class KTSignalBase
-    {
-        public:
-            KTSignalBase( const std::string& name );
-            template< typename x_owner >
-            KTSignalBase( const std::string& name, x_owner* owner );
-            virtual ~KTSignalBase();
-
-            virtual void Connect( KTSlotBase* slot, int group ) = 0;
-
-            virtual void Disconnect( KTSlotBase* slot ) const = 0;
-
-            MEMBERVARIABLE_REF( std::string, Name );
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTSIGNALSLOTBASE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.cc b/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.cc
deleted file mode 100644
index 795fc2c..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * KTSignalWrapper.cc
- *
- *  Created on: Aug 8, 2012
- *      Author: nsoblath
- */
-
-#include "KTSignalWrapper.hh"
-
-namespace Nymph
-{
-
-    KTSignalWrapper::KTSignalWrapper() :
-            fSignalWrapper(NULL)
-    {
-    }
-
-    KTSignalWrapper::~KTSignalWrapper()
-    {
-        delete fSignalWrapper;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.hh b/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.hh
deleted file mode 100644
index aa4f658..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSignalWrapper.hh
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * KTSignalWrapper.hh
- *
- *  Created on: Aug 8, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTSIGNALWRAPPER_HH_
-#define KTSIGNALWRAPPER_HH_
-
-#include <boost/signals2.hpp>
-#include <boost/utility.hpp>
-
-#include <iostream>
-
-namespace Nymph
-{
-    template< typename Signature >
-    struct KTSignalConcept
-    {
-        typedef Signature signature;
-        typedef boost::signals2::signal< Signature > signal;
-        typedef typename boost::signals2::signal< Signature >::slot_type slot_type;
-    };
-
-    class KTSignalWrapper : public boost::noncopyable
-    {
-        public:
-            friend class KTSlotWrapper;
-
-        private:
-            class KTInternalSignalWrapper
-            {
-                public:
-                    KTInternalSignalWrapper() {}
-                    virtual ~KTInternalSignalWrapper() {}
-            };
-
-            template< typename XSignature >
-            class KTSpecifiedInternalSignalWrapper : public KTInternalSignalWrapper, public boost::noncopyable
-            {
-                public:
-                    KTSpecifiedInternalSignalWrapper(XSignature* signalPtr) : fSignal(signalPtr)
-                    {}
-                    virtual ~KTSpecifiedInternalSignalWrapper() {}
-
-                    XSignature* GetSignal() const
-                    {
-                        return fSignal;
-                    }
-                private:
-                    XSignature* fSignal; //not owned by this KTSpecifiedInternalSignalWrapper
-            };
-
-        public:
-            template< typename XSignature >
-            KTSignalWrapper(XSignature* signalPtr);
-            ~KTSignalWrapper();
-
-        private:
-            KTSignalWrapper();
-
-            KTInternalSignalWrapper* GetInternal() const;
-
-            KTInternalSignalWrapper* fSignalWrapper;
-
-    };
-
-    template< typename XSignature >
-    KTSignalWrapper::KTSignalWrapper(XSignature* signalPtr) :
-            fSignalWrapper(NULL)
-    {
-        fSignalWrapper = new KTSpecifiedInternalSignalWrapper< XSignature >(signalPtr);
-    }
-
-    inline KTSignalWrapper::KTInternalSignalWrapper* KTSignalWrapper::GetInternal() const
-    {
-        return fSignalWrapper;
-    }
-
-} /* namespace Nymph */
-#endif /* KTSIGNALWRAPPER_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSlot.hh b/cpp/Cpp/Library_v1/Processor/KTSlot.hh
deleted file mode 100644
index 0729eb0..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSlot.hh
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * KTSlot.hh
- *
- *  Created on: Jan 13, 2013
- *      Author: nsoblath
- */
-
-#ifndef KTSLOT_HH_
-#define KTSLOT_HH_
-
-#include "KTSignalSlotBase.hh"
-
-//#include "KTException.hh"
-#include "KTLogger.hh"
-#include "KTThreadReference.hh"
-
-#include <initializer_list>
-#include <set>
-
-namespace Nymph
-{
-    KTLOGGER(slotlog, "KTSlot");
-
-
-    // Type XOwner is the class that owns the KTSlot object
-    template< typename... XArgs >
-    class KTSlot : public KTSlotBase
-    {
-        public:
-            using signature = void( XArgs... );
-            using signal_list = std::initializer_list< std::string >;
-
-        public:
-            template< typename XOwner >
-            KTSlot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals = {} );
-            template< typename XOwner >
-            KTSlot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals = {} );
-            template< typename XOwner >
-            KTSlot( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals = {} );
-            template< typename XOwner, typename XFuncClass >
-            KTSlot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals = {} );
-            template< typename XOwner, typename XFuncClass >
-            KTSlot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals = {} );
-            KTSlot( const KTSlot& ) = delete;
-            KTSlot( KTSlot&& ) = delete;
-            virtual ~KTSlot();
-
-            void DisconnectAll() const;
-
-            void AddConnection( KTSignalBase* ) const;
-
-            void RemoveConnection( KTSignalBase* ) const;
-
-            MEMBERVARIABLE_REF( boost::function< signature >, Function );
-
-            typedef std::set< KTSignalBase* > signal_connections; // to get around the problem of having a comma inside a macro function argument
-            MEMBERVARIABLE_REF_MUTABLE( signal_connections, Connections );
-
-            // TODO: move fDoBreakpoint to KTSlot
-            // TODO: KTThreadReference should be a templated object, KTThreadReference< XArgs... >
-            // TODO: KTThreadReference< XArgs... > inherits from KTThreadReferenceBase
-            MEMBERVARIABLE( bool, DoBreakpoint );
-            MEMBERVARIABLE_SHARED_PTR_CONST( KTThreadReference, ThreadRef );
-
-    };
-
-
-    /*!
-     @class KTSlot
-     @author N. S. Oblath
-
-     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
-
-     @details
-     Usage:
-     To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
-     The function should have the signature void (Args).
-
-     In your Processor's header add a member variable of type KTSlot< ProcessorType, ReturnType, Args >.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-    *//*
-    template< typename... Args >
-    class KTSlot
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
-
-            virtual ~KTSlot();
-
-            const std::string& GetName() const;
-
-            KTSlotWrapper* GetSlotWrapper();
-
-        protected:
-            std::string fName;
-            KTSlotWrapper* fSlotWrapper;
-    };
-*/
-
-
-    //*******************
-    // Implementations
-    //*******************
-
-    // KTSlot
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ), signal_list signals ) :
-            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
-            fConnections(),
-            fThreadRef( std::make_shared< KTThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const, signal_list signals ) :
-            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
-            fConnections(),
-            fThreadRef( std::make_shared< KTThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner >
-    KTSlot< XArgs... >::KTSlot< XOwner >( const std::string& name, XOwner* owner, const boost::function< signature >& func, signal_list signals ) :
-            fFunction( func ),
-            fConnections(),
-            fThreadRef( std::make_shared< KTThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner, typename XFuncClass >
-    KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ), signal_list signals ) :
-            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            fConnections(),
-            fThreadRef( std::make_shared< KTThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    template< typename XOwner, typename XFuncClass >
-    KTSlot< XArgs... >::KTSlot< XOwner, XFuncClass >( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const, signal_list signals ) :
-            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            fConnections(),
-            fThreadRef( std::make_shared< KTThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this, signals );
-    }
-
-    template< typename... XArgs >
-    KTSlot< XArgs... >::~KTSlot()
-    {
-        DisconnectAll();
-    }
-
-    template< typename... XArgs >
-    void KTSlot< XArgs... >::DisconnectAll() const
-    {
-        for( auto connection : fConnections )
-        {
-            connection->Disconnect( this );
-        }
-        return;
-    }
-
-    template< typename... XArgs >
-    void KTSlot< XArgs... >::AddConnection( KTSignalBase* signal ) const
-    {
-        fConnections.insert( signal );
-        return;
-    }
-
-    template< typename... XArgs >
-    void KTSlot< XArgs... >::RemoveConnection( KTSignalBase* signal ) const
-    {
-        fConnections.erase( signal );
-        return;
-    }
-
-/*
-    template< typename... Args >
-    template< class XFuncOwnerType >
-    KTSlot< Args... >::KTSlot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ):
-            fName( name )
-    {
-        fSlotWrapper = owner->RegisterSlot( name, owner, func, signals );
-    }
-
-    template< typename... Args >
-    template< class XFuncOwnerType >
-    KTSlot< Args... >::KTSlot( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals ) :
-            fName( name )
-    {
-        fSlotWrapper = proc->RegisterSlot( name, owner, func, signals );
-    }
-
-    template< typename... Args >
-    KTSlot< Args... >::~KTSlot()
-    {
-    }
-
-    template< typename... Args >
-    inline const std::string& KTSlot< Args... >::GetName() const
-    {
-        return fName;
-    }
-
-    template< typename... Args >
-    inline KTSlotWrapper* KTSlot< Args... >::GetSlotWrapper()
-    {
-        return fSlotWrapper;
-    }
-*/
-} /* namespace Nymph */
-#endif /* KTSLOT_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc b/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc
deleted file mode 100644
index 66e12f1..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * KTSlotWrapper.cc
- *
- *  Created on: Feb 10, 2012
- *      Author: nsoblath
- */
-
-#include "KTSlotWrapper.hh"
-
-namespace Nymph
-{
-
-    KTSlotWrapper::KTSlotWrapper() :
-            fSlotWrapper(NULL),
-            fConnection(),
-            fThreadRef(),
-            fDoBreakpoint(false)
-    {
-    }
-
-    KTSlotWrapper::~KTSlotWrapper()
-    {
-        this->Disconnect();
-        delete fSlotWrapper;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh b/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh
deleted file mode 100644
index 70d3f3f..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTSlotWrapper.hh
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * KTSlotWrapper.hh
- *
- *  Created on: Feb 10, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTSLOTWRAPPER_HH_
-#define KTSLOTWRAPPER_HH_
-
-#include "KTConnection.hh"
-#include "KTException.hh"
-#include "KTSignalWrapper.hh"
-#include "KTThreadReference.hh"
-
-#include <boost/signals2.hpp>
-
-namespace Nymph
-{
-    struct KTConnectionException : public KTException
-    {};
-
-    class KTSlotWrapper : public boost::noncopyable
-    {
-        private:
-            class KTInternalSlotWrapper
-            {
-                public:
-                    KTInternalSlotWrapper() {}
-                    virtual ~KTInternalSlotWrapper() {}
-
-                    virtual KTConnection Connect(KTSignalWrapper* signalWrap, int groupNum=-1) = 0;
-            };
-
-            template< typename XSignature, typename XTypeContainer >
-            class KTSpecifiedInternalSlotWrapper : public KTInternalSlotWrapper, public boost::noncopyable
-            {
-                public:
-                    KTSpecifiedInternalSlotWrapper(XSignature funcPtr, XTypeContainer* typeCont=NULL) :
-                            fSlot(funcPtr)
-                    {
-                        (void)typeCont; // to suppress warnings
-                    }
-                    virtual ~KTSpecifiedInternalSlotWrapper()
-                    {
-                    }
-
-                    virtual KTConnection Connect(KTSignalWrapper* signalWrap, int groupNum=-1)
-                    {
-                        typedef KTSignalWrapper::KTInternalSignalWrapper SignalWrapperBase;
-                        typedef KTSignalWrapper::KTSpecifiedInternalSignalWrapper< typename XTypeContainer::signal > SignalWrapper;
-
-                        SignalWrapperBase* internalSignalWrap = signalWrap->GetInternal();
-                        SignalWrapper* derivedSignalWrapper = dynamic_cast< SignalWrapper* >(internalSignalWrap);
-                        if (derivedSignalWrapper == NULL)
-                        {
-                            BOOST_THROW_EXCEPTION( KTConnectionException() << "Cannot make connection: unable to cast from KTInternalSignalWrapper* to this slot's derived type." << eom );
-                        }
-                        if (groupNum >= 0)
-                        {
-                            return derivedSignalWrapper->GetSignal()->connect(groupNum, fSlot);
-                        }
-                        return derivedSignalWrapper->GetSignal()->connect(fSlot);
-                    }
-
-                private:
-                    XSignature fSlot;
-            };
-
-        public:
-            template< typename XSignature, typename XTypeContainer >
-            KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont);
-            ~KTSlotWrapper();
-
-        private:
-            KTSlotWrapper();
-
-            KTInternalSlotWrapper* fSlotWrapper;
-
-        public:
-            void SetConnection(KTConnection conn);
-            void SetConnection(KTSignalWrapper* signalWrap, int groupNum=-1); // can throw KTConnectionException
-            void Disconnect();
-
-        private:
-            KTConnection fConnection;
-
-        public:
-            std::shared_ptr< KTThreadReference > GetThreadRef() const;
-            void SetThreadRef(std::shared_ptr< KTThreadReference > ref);
-
-            bool GetDoBreakpoint() const;
-            void SetDoBreakpoint(bool flag);
-
-        private:
-            std::shared_ptr< KTThreadReference > fThreadRef;
-            bool fDoBreakpoint;
-
-    };
-
-    template< typename XSignature, typename XTypeContainer >
-    KTSlotWrapper::KTSlotWrapper(XSignature signalPtr, XTypeContainer* typeCont) :
-            fSlotWrapper(new KTSpecifiedInternalSlotWrapper< XSignature, XTypeContainer >(signalPtr, typeCont)),
-            fConnection(),
-            fThreadRef( std::make_shared< KTThreadReference >() ),
-            fDoBreakpoint(false)
-    {
-    }
-
-    inline void KTSlotWrapper::SetConnection(KTConnection conn)
-    {
-        fConnection = conn;
-        return;
-    }
-
-    inline void KTSlotWrapper::SetConnection(KTSignalWrapper* signalWrap, int groupNum)
-    {
-        fConnection = this->fSlotWrapper->Connect(signalWrap, groupNum);
-        return;
-    }
-
-    inline void KTSlotWrapper::Disconnect()
-    {
-        fConnection.disconnect();
-        return;
-    }
-
-    inline std::shared_ptr< KTThreadReference > KTSlotWrapper::GetThreadRef() const
-    {
-        return fThreadRef;
-    }
-
-    inline void KTSlotWrapper::SetThreadRef(std::shared_ptr< KTThreadReference > ref)
-    {
-        fThreadRef = ref;
-        return;
-    }
-
-    inline bool KTSlotWrapper::GetDoBreakpoint() const
-    {
-        return fDoBreakpoint;
-    }
-
-    inline void KTSlotWrapper::SetDoBreakpoint(bool flag)
-    {
-        fDoBreakpoint = flag;
-        return;
-    }
-
-
-} /* namespace Nymph */
-#endif /* KTSLOTWRAPPER_HH_ */
diff --git a/cpp/Cpp/Library_v1/Processor/KTThreadReference.cc b/cpp/Cpp/Library_v1/Processor/KTThreadReference.cc
deleted file mode 100644
index e42a16c..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTThreadReference.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * KTThreadReference.cc
- *
- *  Created on: May 2, 2017
- *      Author: obla999
- */
-
-#include "KTThreadReference.hh"
-
-#include "KTException.hh"
-#include "KTLogger.hh"
-
-KTLOGGER( trlog, "KTThreadReference" );
-
-namespace Nymph
-{
-
-    KTThreadReference::KTThreadReference() :
-            fName(),
-            fBreakFlag( false ),
-            fCanceled( false ),
-            fDataPtrRet(),
-            fDataPtrRetFuture( fDataPtrRet.get_future() ),
-            fInitiateBreakFunc( [](){return;} ),
-            fWaitForContinueFunc( []( boost_unique_lock& ){return;} ),
-            fMutex()
-    {
-        if( ! fDataPtrRetFuture.valid() )
-        {
-            KTERROR( trlog, "Invalid data-pointer-return future created" );
-            BOOST_THROW_EXCEPTION( KTException() << "Invalid data-pointer-return future created" << eom );
-        }
-    }
-
-    KTThreadReference::KTThreadReference( KTThreadReference&& orig ) :
-            fName( std::move( orig.fName ) ),
-            fBreakFlag( orig.fBreakFlag ),
-            fCanceled( orig.fCanceled ),
-            fDataPtrRet( std::move( orig.fDataPtrRet ) ),
-            fDataPtrRetFuture( std::move( orig.fDataPtrRetFuture ) ),
-            fInitiateBreakFunc( std::move( orig.fInitiateBreakFunc ) ),
-            fWaitForContinueFunc( std::move( orig.fWaitForContinueFunc ) ),
-            fMutex()
-    {
-        orig.fBreakFlag = false;
-        orig.fCanceled = false;
-    }
-
-    KTThreadReference& KTThreadReference::operator=( KTThreadReference&& orig )
-    {
-        fName = std::move( orig.fName );
-        fBreakFlag = orig.fBreakFlag;
-        fCanceled = orig.fCanceled;
-        fDataPtrRet = std::move( orig.fDataPtrRet );
-        fDataPtrRetFuture = std::move( orig.fDataPtrRetFuture );
-        fInitiateBreakFunc = std::move( orig.fInitiateBreakFunc );
-        fWaitForContinueFunc = std::move( orig.fWaitForContinueFunc );
-
-        orig.fBreakFlag = false;
-        orig.fCanceled = false;
-
-        return *this;
-    }
-
-    void KTThreadReference::Break( const KTDataHandle& dataHandle, bool doBreakpoint )
-    {
-        if( doBreakpoint )
-        {
-            KTDEBUG( trlog, "Initiating break (" << fName << ")" );
-            fInitiateBreakFunc();
-        }
-        boost_unique_lock lock( fMutex );
-        if( fBreakFlag || doBreakpoint )
-        {
-            KTDEBUG( trlog, "Reacting to break (" << fName << ")" );
-            // set the return for this thread
-            KTWARN( trlog, "Setting value of data-ptr-ret promise (" << fName << ")" );
-            fDataPtrRet.set_value( dataHandle );
-            // wait for continue signal
-            fWaitForContinueFunc( lock );
-        }
-        return;
-    }
-
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Processor/KTThreadReference.hh b/cpp/Cpp/Library_v1/Processor/KTThreadReference.hh
deleted file mode 100644
index b792c3f..0000000
--- a/cpp/Cpp/Library_v1/Processor/KTThreadReference.hh
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * KTThreadReference.hh
- *
- *  Created on: May 2, 2017
- *      Author: obla999
- */
-
-#ifndef KTTHREADREFERENCE_HH_
-#define KTTHREADREFERENCE_HH_
-
-#include "KTCoreData.hh"
-
-#include <boost/thread/future.hpp>
-
-#include <memory>
-
-namespace Nymph
-{
-    typedef boost::promise< KTDataHandle > KTDataPtrReturn;
-
-    class KTThreadReferenceBase
-    {
-        protected:
-            typedef boost::unique_lock< boost::mutex > boost_unique_lock;
-
-        public:
-            KTThreadReferenceBase();
-            KTThreadReferenceBase( const KTThreadReferenceBase& ) = delete;
-            KTThreadReferenceBase( KTThreadReferenceBase&& orig );
-
-            KTThreadReferenceBase& operator=( const KTThreadReferenceBase& ) = delete;
-            KTThreadReferenceBase& operator=( KTThreadReferenceBase&& );
-
-        public:
-            //**************************
-            // for use within the thread
-            //**************************
-
-            //void SetReturnException( boost::exception_ptr excPtr );
-
-        public:
-            //******************************
-            // for use outside of the thread
-            //******************************
-
-            void SetInitiateBreakFunc( const std::function< void() >& initBreakFunc );
-            void SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc );
-
-        public:
-            MEMBERVARIABLE_REF( std::string, Name );
-            MEMBERVARIABLE( bool, BreakFlag );
-            MEMBERVARIABLE( bool, Canceled );
-            MEMBERVARIABLE_REF( boost::mutex, Mutex );
-
-        private:
-            std::function< void() > fInitiateBreakFunc;
-            std::function< void( boost_unique_lock& ) > fWaitForContinueFunc;
-    };
-
-    template< typename... XArgs >
-    class KTThreadReference : public KTThreadReferenceBase
-    {
-        private:
-            typedef KTThreadReferenceBase::boost_unique_lock boost_unique_lock;
-
-        public:
-            KTThreadReference();
-            KTThreadReference( const KTThreadReference& ) = delete;
-            KTThreadReference( KTThreadReference&& orig );
-
-            KTThreadReference& operator=( const KTThreadReference& ) = delete;
-            KTThreadReference& operator=( KTThreadReference&& );
-
-        public:
-            //**************************
-            // for use within the thread
-            //**************************
-
-            void Break( bool doBreakpoint, const XArgs&... dataHandle );
-
-            void SetReturnValue( XArgs... dataHandle );
-
-        public:
-            //******************************
-            // for use outside of the thread
-            //******************************
-
-            void SetReturnException( boost::exception_ptr excPtr );
-
-            KTDataHandle GetReturnValue();
-            boost::unique_future< KTDataHandle >& GetDataPtrRetFuture();
-            const boost::unique_future< KTDataHandle >& GetDataPtrRetFuture() const;
-
-            void RefreshDataPtrRet();
-
-        private:
-            KTDataPtrReturn fDataPtrRet;
-            boost::unique_future< KTDataHandle > fDataPtrRetFuture;
-    };
-
-    template< typename... XArgs >
-    void KTThreadReference< XArgs... >::SetReturnException( boost::exception_ptr excPtr )
-    {
-        fDataPtrRet.set_exception( excPtr );
-        return;
-    }
-
-    template< typename... XArgs >
-    void KTThreadReference< XArgs... >::SetReturnValue( XArgs... dataHandle )
-    {
-        fDataPtrRet.set_value( dataHandle... );
-        return;
-    }
-
-    template< typename... XArgs >
-    KTDataHandle KTThreadReference< XArgs... >::GetReturnValue()
-    {
-        return fDataPtrRetFuture.get();
-    }
-
-    template< typename... XArgs >
-    boost::unique_future< KTDataHandle >& KTThreadReference< XArgs... >::GetDataPtrRetFuture()
-    {
-        return fDataPtrRetFuture;
-    }
-
-    template< typename... XArgs >
-    const boost::unique_future< KTDataHandle >& KTThreadReference< XArgs... >::GetDataPtrRetFuture() const
-    {
-        return fDataPtrRetFuture;
-    }
-
-    template< typename... XArgs >
-    void KTThreadReference< XArgs... >::RefreshDataPtrRet()
-    {
-        fDataPtrRet = KTDataPtrReturn();
-        fDataPtrRetFuture = fDataPtrRet.get_future();
-        return;
-    }
-
-    inline void KTThreadReferenceBase::SetInitiateBreakFunc( const std::function< void() >& initBreakFunc )
-    {
-        fInitiateBreakFunc = initBreakFunc;
-        return;
-    }
-
-    inline void KTThreadReferenceBase::SetWaitForContinueFunc( const std::function< void( boost_unique_lock& ) >& waitForContFunc )
-    {
-        fWaitForContinueFunc = waitForContFunc;
-        return;
-    }
-
-
-#ifndef THROW_THREADREF_EXCEPTION
-#define THROW_THREADREF_EXCEPTION( ref, exc ) \
-        try \
-        { \
-            BOOST_THROW_EXCEPTION( exc ); \
-        } \
-        catch( ::boost::exception& e ) \
-        { \
-            ref->SetReturnException( ::boost::current_exception() ); \
-        }
-#endif // THROW_THREADREF_EXCEPTION
-
-} /* namespace Nymph */
-
-#endif /* KTTHREADREFERENCE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.cc b/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.cc
deleted file mode 100644
index d36f6e8..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * KTCacheDirectory.cc
- *
- *  Created on: Dec 3, 2012
- *      Author: nsoblath
- */
-
-#include "KTCacheDirectory.hh"
-
-#include "KTLogger.hh"
-#include "param.hh"
-
-using std::string;
-
-namespace Nymph
-{
-    KTLOGGER(dirlog, "KTCacheDirectory");
-
-    KTCacheDirectory::KTCacheDirectory(const std::string& name) :
-            KTDirectory(),
-            KTSelfConfigurable(name)
-    {
-    }
-
-    KTCacheDirectory::~KTCacheDirectory()
-    {
-    }
-
-    bool KTCacheDirectory::Configure(const scarab::param_node& node)
-    {
-        return SetPath(node.get_value("path", fPath.string()));
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.hh b/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.hh
deleted file mode 100644
index d8d362d..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTCacheDirectory.hh
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * KTCacheDirectory.hh
- *
- *  Created on: Dec 3, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTCACHEDIRECTORY_HH_
-#define KTCACHEDIRECTORY_HH_
-
-#include "KTConfigurable.hh"
-#include "KTDirectory.hh"
-
-#include "singleton.hh"
-
-namespace Nymph
-{
-
-    class KTCacheDirectory : public KTDirectory, public scarab::singleton< KTCacheDirectory >, public KTSelfConfigurable
-    {
-        protected:
-            friend class scarab::singleton< KTCacheDirectory >;
-            friend class scarab::destroyer< KTCacheDirectory >;
-            KTCacheDirectory(const std::string& name = "cache-directory");
-            virtual ~KTCacheDirectory();
-
-        public:
-            using KTSelfConfigurable::Configure;
-
-            bool Configure(const scarab::param_node& node);
-
-            bool IsReady() const;
-
-    };
-
-    inline bool KTCacheDirectory::IsReady() const
-    {
-        return fPathExists && fAccess == eReadWrite;
-    }
-
-} /* namespace Nymph */
-#endif /* KTCACHEDIRECTORY_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTConcurrentQueue.hh b/cpp/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
deleted file mode 100644
index b32fe28..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * KTConcurrentQueue.hh
- *
- *  Created on: Oct 22, 2012
- *      Author: nsoblath
- *
- *      FIFO Queue
- *
- *      Based almost exactly on the class concurrent_queue from:
- *      http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html
- *      Post author: Anthony Williams
- *      Copyright  2005-2013 Just Software Solutions Ltd. All rights reserved.
- */
-
-#ifndef KTCONCURRENTQUEUE_HH_
-#define KTCONCURRENTQUEUE_HH_
-
-#include "KTLogger.hh"
-
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/thread.hpp>
-
-#include <deque>
-
-namespace Nymph
-{
-    KTLOGGER(queuelog, "KTConcurrentQueue");
-
-    template< class XDataType >
-    class KTConcurrentQueue
-    {
-        public:
-            typedef std::deque< XDataType > Queue;
-
-            struct QueueNotEmpty
-            {
-                Queue& fQueue;
-                QueueNotEmpty(Queue& aQueue) :
-                    fQueue(aQueue)
-                {}
-                bool operator()() const
-                {
-                    return ! fQueue.empty();
-                }
-            };
-
-            typedef boost::unique_lock< boost::mutex > ScopedLock;
-
-        public:
-            KTConcurrentQueue() :
-                fQueue(),
-                fInterrupt(false),
-                fTimeout(boost::posix_time::milliseconds(1000)),
-                fMutex(),
-                fConditionVar()
-            {
-            }
-
-            virtual ~KTConcurrentQueue()
-            {
-                fQueue.clear();
-            }
-
-        private:
-            Queue fQueue;
-            bool fInterrupt;
-
-            boost::posix_time::time_duration fTimeout; /// Timeout duration in milliseconds
-
-            mutable boost::mutex fMutex;
-            boost::condition_variable fConditionVar;
-
-        public:
-            void push(XDataType const& data)
-            {
-                KTDEBUG(queuelog, "Attempting to push to queue");
-                ScopedLock lock(fMutex);
-                KTDEBUG(queuelog, "Pushing to concurrent queue; size: " << fQueue.size());
-                fQueue.push_back(data);
-                lock.unlock();
-                fConditionVar.notify_one();
-                return;
-            }
-
-            bool empty() const
-            {
-                ScopedLock lock(fMutex);
-                return fQueue.empty();
-            }
-
-            bool size() const
-            {
-                ScopedLock lock(fMutex);
-                return fQueue.size();
-            }
-
-            bool try_pop(XDataType& popped_value)
-            {
-                ScopedLock lock(fMutex);
-                fInterrupt = false;
-                if(fQueue.empty())
-                {
-                    return false;
-                }
-
-                popped_value=fQueue.front();
-                fQueue.pop_front();
-                return true;
-            }
-
-            bool wait_and_pop(XDataType& popped_value)
-            {
-                ScopedLock lock(fMutex);
-                fInterrupt = false;
-                fConditionVar.wait(lock, QueueNotEmpty(fQueue));
-                if (fInterrupt)
-                {
-                    fInterrupt = false;
-                    return false;
-                }
-
-                popped_value=fQueue.front();
-                fQueue.pop_front();
-                KTDEBUG(queuelog, "Popping from concurrent queue; size: " << fQueue.size());
-                return true;
-            }
-
-            bool timed_wait_and_pop(XDataType& popped_value)
-            {
-                ScopedLock lock(fMutex);
-                fInterrupt = false;
-                boost::system_time const waitUntil = boost::get_system_time() + fTimeout;
-                if (! fConditionVar.timed_wait(lock, waitUntil, QueueNotEmpty(fQueue)))
-                {
-                    KTDEBUG(queuelog, "Queue wait has timed out");
-                    return false;
-                }
-                if (fInterrupt)
-                {
-                    fInterrupt = false;
-                    return false;
-                }
-
-                popped_value=fQueue.front();
-                fQueue.pop_front();
-                KTDEBUG(queuelog, "Popping from concurrent queue; size: " << fQueue.size());
-                return true;
-            }
-
-            void interrupt()
-            {
-                fInterrupt = true;
-                fConditionVar.notify_one();
-                return;
-            }
-
-            inline unsigned get_timeout() const
-            {
-                return fTimeout.total_milliseconds();
-            }
-
-            inline void set_timeout(unsigned duration)
-            {
-                fTimeout = boost::posix_time::milliseconds(duration);
-                return;
-            }
-    };
-
-} /* namespace Nymph */
-#endif /* KTCONCURRENTQUEUE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTConfigurable.cc b/cpp/Cpp/Library_v1/Utility/KTConfigurable.cc
deleted file mode 100644
index 7fae521..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTConfigurable.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * KTConfigurable.cc
- *
- *  Created on: Aug 21, 2012
- *      Author: nsoblath
- */
-
-#include "KTConfigurable.hh"
-
-#include "KTCommandLineHandler.hh"
-#include "KTLogger.hh"
-#include "KTConfigurator.hh"
-
-#include "param_codec.hh"
-
-using std::string;
-
-namespace Nymph
-{
-
-    KTLOGGER(conflog, "KTConfigurable");
-
-    //******************
-    // KTConfigurable
-    //******************
-
-    KTConfigurable::KTConfigurable(const string& name) :
-            fCLHandler(KTCommandLineHandler::get_instance()),
-            fConfigName(name)
-    {
-    }
-
-    KTConfigurable::~KTConfigurable()
-    {
-    }
-
-    bool KTConfigurable::Configure(const std::string& config)
-    {
-        scarab::param_translator translator;
-        scarab::param_node optNode;
-<<<<<<< HEAD:Library_v1/Utility/KTConfigurable.cc
-        optNode.add( "encoding", "json" );
-=======
-        optNode.add( "encoding", new scarab::param_value( "json" ) );
->>>>>>> develop:Library/Utility/KTConfigurable.cc
-        return Configure( translator.read_string( config, optNode )->as_node() );;
-    }
-
-
-    //**********************
-    // KTSelfConfigurable
-    //**********************
-
-    KTSelfConfigurable::KTSelfConfigurable(const string& name) :
-            KTConfigurable(name),
-            fIsConfigured(false)
-    {
-    }
-
-    KTSelfConfigurable::~KTSelfConfigurable()
-    {
-    }
-
-    bool KTSelfConfigurable::Configure()
-    {
-        if (fIsConfigured) return true;
-
-<<<<<<< HEAD:Library_v1/Utility/KTConfigurable.cc
-        if (! this->Configure(KTConfigurator::get_instance()->Config()))
-=======
-        const scarab::param_node& node = KTConfigurator::get_instance()->Config();
-        if (! this->Configure(node))
->>>>>>> develop:Library/Utility/KTConfigurable.cc
-        {
-            KTERROR(conflog, "An error occurred while configuring <" << fConfigName << ">");
-            return false;
-        }
-        fIsConfigured = IsReady();
-        return fIsConfigured;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Utility/KTConfigurable.hh b/cpp/Cpp/Library_v1/Utility/KTConfigurable.hh
deleted file mode 100644
index c93d6b8..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTConfigurable.hh
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * KTConfigurable.hh
- *
- *  Created on: Aug 21, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTCONFIGURABLE_HH_
-#define KTCONFIGURABLE_HH_
-
-#include "param.hh"
-
-#include <string>
-
-namespace Nymph
-{
-    class KTCommandLineHandler;
-
-
-    //******************
-    // KTConfigurable
-    //******************
-
-    class KTConfigurable
-    {
-        public:
-            KTConfigurable(const std::string& name="default-name");
-            virtual ~KTConfigurable();
-
-            /// Should perform parameter store and command-line configurations
-            virtual bool Configure(const scarab::param_node& node) = 0;
-            /// Implement the option for calling Configure without passing a parameter store node.
-            //virtual bool Configure();
-            /// Configure from a JSON string
-            bool Configure(const std::string& config);
-
-        protected:
-            KTCommandLineHandler* fCLHandler;
-
-        public:
-            const std::string& GetConfigName() const;
-            void SetConfigName(const std::string& name);
-
-        protected:
-            std::string fConfigName;
-
-    };
-/*
-    inline bool KTConfigurable::Configure()
-    {
-        return Configure(NULL);
-    }
-*/
-    inline const std::string& KTConfigurable::GetConfigName() const
-    {
-        return fConfigName;
-    }
-
-    inline void KTConfigurable::SetConfigName(const std::string& name)
-    {
-        fConfigName = name;
-    }
-
-
-    //**********************
-    // KTSelfConfigurable
-    //**********************
-
-    class KTSelfConfigurable : public KTConfigurable
-    {
-        public:
-            KTSelfConfigurable(const std::string& name="default-self-name");
-            virtual ~KTSelfConfigurable();
-
-            /// Should perform parameter store and command-line configurations
-            virtual bool Configure(const scarab::param_node& node) = 0;
-            /// Configure by getting the top-level node from the parameter store
-            virtual bool Configure();
-
-            /// Check if everything has been correctly configured
-            virtual bool IsReady() const = 0;
-
-            bool GetIsConfigured();
-
-        private:
-            bool fIsConfigured;
-
-    };
-
-    inline bool KTSelfConfigurable::GetIsConfigured()
-    {
-        return fIsConfigured;
-    }
-
-} /* namespace Nymph */
-#endif /* KTCONFIGURABLE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTConfigurablePybind.hh b/cpp/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
deleted file mode 100644
index 585a33f..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * KTConfigurablePybind.cc
- *
- *  Created on: Jan 27, 2018
- *      Author: N. Oblath
- */
-
-#include "KTConfigurable.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace Nymph
-{
-
-    void ExportKTConfigurable( pybind11::module& mod )
-    {
-/*        pybind11::class_< KTConfigurable >( mod, "KTConfigurable" )
-                .def( pybind11::init< const std::string & >() )
-
-                .def( "Configure", (bool (KTConfigurable::*)(const std::string&)) &KTConfigurable::Configure )
-                //.def( "Configure", (void (KTConfigurable::*)(const scarab::param_node&)) &KTConfigurable::Configure )
-
-                .def( "GetConfigName", &KTConfigurable::GetConfigName )
-                .def( "SetConfigName", &KTConfigurable::SetConfigName )
-                ;
-*/
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Utility/KTDirectory.cc b/cpp/Cpp/Library_v1/Utility/KTDirectory.cc
deleted file mode 100644
index b4a8895..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTDirectory.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * KTDirectory.cc
- *
- *  Created on: Dec 3, 2012
- *      Author: nsoblath
- */
-
-#include "KTDirectory.hh"
-
-#include "KTLogger.hh"
-
-#include <unistd.h>
-
-using std::string;
-
-using boost::filesystem::path;
-
-namespace Nymph
-{
-    KTLOGGER(dirlog, "KTDirectory");
-
-    KTDirectory::KTDirectory() :
-            fPath(""),
-            fPathExists(false),
-            fAccess(eNone)
-    {
-        SetPath("./");
-    }
-
-    KTDirectory::~KTDirectory()
-    {
-    }
-
-    const string& KTDirectory::GetPath() const
-    {
-        return fPath.string();
-    }
-
-    bool KTDirectory::GetPathExists() const
-    {
-        return fPathExists;
-    }
-
-    KTDirectory::Access KTDirectory::GetAccess() const
-    {
-        return fAccess;
-    }
-
-    bool KTDirectory::SetPath(const string& strPath)
-    {
-        path newPath(strPath);
-        if (! newPath.is_absolute())
-        {
-            newPath = absolute(newPath);
-        }
-        if (! exists(newPath))
-        {
-            KTERROR(dirlog, "Path does not exist: " << strPath);
-            return false;
-        }
-        if (! is_directory(newPath))
-        {
-            KTERROR(dirlog, "Path specified is not a directory: " << strPath);
-            return false;
-        }
-        fPathExists = true;
-        fPath = newPath;
-
-        // set access
-        if (access(strPath.c_str(), R_OK | W_OK) != -1)
-        {
-            fAccess = eReadWrite;
-        }
-        else if (access(strPath.c_str(), R_OK))
-        {
-            fAccess = eRead;
-        }
-        else
-        {
-            fAccess = eNone;
-        }
-
-        return true;
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Utility/KTDirectory.hh b/cpp/Cpp/Library_v1/Utility/KTDirectory.hh
deleted file mode 100644
index a379fc5..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTDirectory.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * KTDirectory.hh
- *
- *  Created on: Dec 3, 2012
- *      Author: nsoblath
- */
-
-#ifndef KTDIRECTORY_HH_
-#define KTDIRECTORY_HH_
-
-#include <boost/filesystem.hpp>
-
-#include <string>
-
-namespace Nymph
-{
-
-    class KTDirectory
-    {
-        public:
-            enum Access
-            {
-                eNone,
-                eRead,
-                eReadWrite
-            };
-
-        public:
-            KTDirectory();
-            virtual ~KTDirectory();
-
-        public:
-            const std::string& GetPath() const;
-            bool GetPathExists() const;
-            Access GetAccess() const;
-
-            bool SetPath(const std::string& strPath);
-
-        protected:
-            boost::filesystem::path fPath;
-            bool fPathExists;
-            Access fAccess;
-
-    };
-
-} /* namespace Nymph */
-#endif /* KTDIRECTORY_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTEventLoop.cc b/cpp/Cpp/Library_v1/Utility/KTEventLoop.cc
deleted file mode 100644
index 0c21b02..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTEventLoop.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * KTEventLoop.cc
- *
- *  Created on: Apr 22, 2014
- *      Author: nsoblath
- */
-
-#include "KTEventLoop.hh"
-
-#include "KTLogger.hh"
-
-namespace Nymph
-{
-    KTLOGGER(evlog, "KTEventLoop")
-
-    KTEventLoop::KTEventLoop()
-    {
-    }
-
-    KTEventLoop::~KTEventLoop()
-    {
-    }
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Utility/KTEventLoop.hh b/cpp/Cpp/Library_v1/Utility/KTEventLoop.hh
deleted file mode 100644
index 6859be5..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTEventLoop.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * KTEventLoop.hh
- *
- *  Created on: Apr 22, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTEVENTLOOP_HH_
-#define KTEVENTLOOP_HH_
-
-namespace Nymph
-{
-
-    /*!
-     @class KTEventLoop
-     @author N. S. Oblath
-
-     @brief Abstract base class for event loops
-
-     @details
-     */
-    class KTEventLoop
-    {
-        public:
-            KTEventLoop();
-            virtual ~KTEventLoop();
-
-            virtual void Go() = 0;
-
-            virtual void Stop() = 0;
-
-    };
-
-} /* namespace Nymph */
-
-#endif /* KTEVENTLOOP_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTException.cc b/cpp/Cpp/Library_v1/Utility/KTException.cc
deleted file mode 100644
index 96e8df5..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTException.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * KTException.cc
- *
- *  Created on: Feb 25, 2014
- *      Author: nsoblath
- */
-
-#include "KTException.hh"
-
-namespace Nymph
-{
-
-    KTException::KTException() :
-            boost::exception(),
-            std::exception(),
-            fMsgBuffer()
-    {
-    }
-    KTException::KTException( const KTException& an_exception ) :
-            boost::exception( an_exception ),
-            std::exception( an_exception ),
-            fMsgBuffer( an_exception.fMsgBuffer )
-    {
-    }
-
-    KTException::~KTException() throw ()
-    {
-    }
-
-}
diff --git a/cpp/Cpp/Library_v1/Utility/KTException.hh b/cpp/Cpp/Library_v1/Utility/KTException.hh
deleted file mode 100644
index 10ae966..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTException.hh
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * KTException.hh
- *
- *  Created on: Feb 25, 2014
- *      Author: nsoblath
- */
-
-
-#ifndef KTEXCEPTION_HH_
-#define KTEXCEPTION_HH_
-
-#include "macros.hh"
-
-#include <boost/exception/all.hpp>
-
-#include <exception>
-#include <sstream>
-#include <string>
-
-namespace Nymph
-{
-    struct KTMessageEnd {};
-    static const KTMessageEnd eom = KTMessageEnd();
-
-    //typedef boost::error_info<struct tag_errmsg, std::string> KTErrorMsgInfo;
-
-    template< class XLabel >
-    using KTErrorMsgInfo = boost::error_info< XLabel, std::string>;
-
-    /*!
-     @class KTException
-     @author N.S. Oblath
-
-     @brief Exception base class for Nymph and Nymph-based projects
-
-     @details
-
-     How to throw:
-
-     BOOST_THROW_EXCEPTION( KTException() << "[error message here]" << eom );
-
-     Why do it like this?
-      - BOOST_THROW_EXCEPTION will record the location that the exception was thrown.  This is incredibly useful in diagnosing problems.
-      - eom ensure that your error message is handled properly; until that's processed the message is stored in a buffer, and the eom takes that buffer and adds it to the boost::exception base class's storage.
-      - KTException can be replaced with whatever derived exception class you're using.
-
-      How to catch, add information, and re-throw:
-
-      try
-      {
-          // code that throws a KTException
-      }
-      catch( boost::exception& e )
-      {
-          e << KTErrorMsgInfo< struct UniqueLocationTag >( "Here's some information about the context in which the exception was thrown" );
-          throw;
-      }
-
-
-      How to do the final catch
-
-      try
-      {
-          // code that throws a KTException
-      }
-      catch( boost::exception& e )
-      {
-          KTERROR( my_log, "An exception was caught: " << diagnostic_information( e ) ):
-      }
-    */
-
-    class KTException : virtual public boost::exception, virtual public std::exception
-    {
-        public:
-            KTException();
-            KTException( const KTException& );
-            ~KTException() throw ();
-
-            // adds to the message buffer
-            template< class XStreamable >
-            KTException& operator<<( XStreamable a_fragment );
-            // adds to the message buffer
-            KTException& operator<<( const std::string& a_fragment );
-            // adds to the message buffer
-            KTException& operator<<( const char* a_fragment );
-
-            // adds the current contents of the message buffer as a KTErrorMsgInfo
-            KTException& operator<<( const KTMessageEnd& eom );
-
-        private:
-            mutable std::string fMsgBuffer;
-    };
-
-    template< class XStreamable >
-    KTException& KTException::operator<<( XStreamable a_fragment )
-    {
-        std::stringstream stream;
-        stream << a_fragment;
-        stream >> fMsgBuffer;
-        return *this;
-    }
-
-    inline KTException& KTException::operator<<( const std::string& a_fragment )
-    {
-        fMsgBuffer += a_fragment;
-        return *this;
-    }
-
-    inline KTException& KTException::operator<<( const char* a_fragment )
-    {
-        fMsgBuffer += std::string( a_fragment );
-        return *this;
-    }
-
-    inline KTException& KTException::operator<<( const KTMessageEnd& eom )
-    {
-        if( ! fMsgBuffer.empty() )
-        {
-            boost::operator<<( *this, KTErrorMsgInfo< struct ExcpMsg >{ fMsgBuffer } );
-            fMsgBuffer.clear();
-        }
-        return *this;
-    }
-
-}
-
-#endif /* KTEXCEPTION_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTExtensible.hh b/cpp/Cpp/Library_v1/Utility/KTExtensible.hh
deleted file mode 100644
index 73fe331..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTExtensible.hh
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * KTExtensible.hh
- *
- *  Created on: Feb 11, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_KTEXTENSIBLE_HH_
-#define NYMPH_KTEXTENSIBLE_HH_
-
-#include "KTException.hh"
-
-#include <cereal/types/polymorphic.hpp>
-
-#include <memory>
-
-namespace Nymph
-{
-
-    template< class XBaseType >
-    class KTExtensibleCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleCore< XBaseType > >
-    {
-        public:
-            typedef KTExtensibleCore< XBaseType > ExtCoreType;
-            typedef std::shared_ptr< ExtCoreType > BasePtrType;
-
-        private:
-            typedef std::enable_shared_from_this< KTExtensibleCore< XBaseType > > ESFTBaseType;
-
-        public:
-            KTExtensibleCore();
-            KTExtensibleCore( const ExtCoreType& orig ) = delete; // deleted because copy of KTExtensibleCore is done using operator=()
-            virtual ~KTExtensibleCore();
-
-            /// Copies extended object
-            ExtCoreType& operator=( const ExtCoreType& orig );
-
-            /// Copies the current object and only extended fields already present
-            virtual ExtCoreType& Pull( const ExtCoreType& orig ) = 0; // implemented in KTExtensible because it requires knowing the extended field type
-
-            /// Clones the extended object
-            virtual BasePtrType Clone() const = 0; // implemented in KTExtensible because it requires knowing the extended field type
-
-            /// Returns the size of the extended object, including this field and any extended below it
-            unsigned size() const;
-
-            /// Returns the object of the requested type or creates a new one if it's not present
-            template< class XRequestedType >
-            XRequestedType& Of();
-
-            /// Returns the object of the requested type or throws KTException if it's not present
-            template< class XRequestedType >
-            const XRequestedType& Of() const;
-
-            /// Returns a pointer to the object of the requested type or creates a new one if it's not present
-            template< class XRequestedType >
-            std::shared_ptr< XRequestedType > Share();
-
-            /// Returns a pointer to the object of the requested type or throws KTException if it's not present
-            template< class XRequestedType >
-            const std::shared_ptr< XRequestedType > Share() const;
-
-            /// Checks whether the requested type is present
-            template< class XRequestedType >
-            bool Has() const;
-
-            /// Extracts the data object of the requested type if it's present; returns an empty pointer if not
-            /// Note that if you detatch the first field without holding a pointer to any other extended fields, those fields will be destroyed.
-            template< class XRequestedType >
-            std::shared_ptr< XRequestedType > Detatch();
-
-            /// Returns a pointer to the next extended field
-            BasePtrType Next();
-
-        protected:
-            template< class XRequestedType >
-            std::shared_ptr< XRequestedType > _Detatch( BasePtrType prev = BasePtrType() );
-
-            BasePtrType fNext;
-
-            bool fDisableExtendedCopy; // internal variable used to determine whether operator= copies extended fields
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-    template< class XInstanceType, class XBaseType >
-    class KTExtensible : public KTExtensibleCore< XBaseType >
-    {
-        public:
-            typedef KTExtensible< XInstanceType, XBaseType > ExtType;
-            typedef KTExtensibleCore< XBaseType > ExtCoreType;
-            typedef std::shared_ptr< KTExtensibleCore< XBaseType > > BasePtrType;
-
-        public:
-            KTExtensible();
-            KTExtensible( const ExtType& orig );
-            virtual ~KTExtensible();
-
-            /// Copies the extended object
-            ExtType& operator=( const ExtType& orig );
-
-            /// Copies the current object and only extended fields already present
-            virtual ExtCoreType& Pull( const ExtCoreType& orig );
-
-            /// Clones the extended object
-            virtual BasePtrType Clone() const;
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-
-
-    //**************
-    // KTExtensibleCore implementation
-    //**************
-
-    template< class XBaseType >
-    KTExtensibleCore< XBaseType >::KTExtensibleCore() :
-            XBaseType(),
-            fNext(),
-            fDisableExtendedCopy( false )
-    {
-    }
-
-    template< class XBaseType >
-    KTExtensibleCore< XBaseType >::~KTExtensibleCore()
-    {
-    }
-
-    template< class XBaseType >
-    KTExtensibleCore< XBaseType >& KTExtensibleCore< XBaseType >::operator=( const KTExtensibleCore< XBaseType >& orig )
-    {
-        // must not call virtual functions on this because it's used in the copy constructor
-
-        if( this == &orig ) return *this;
-
-        fDisableExtendedCopy = false;
-
-        // remove any extended fields
-        fNext.reset();
-
-        // copy extended fields
-        // only do this if orig.fDisableExtendedCopy is false
-        if( ! orig.fDisableExtendedCopy && orig.fNext )
-        {
-            // duplicate extended fields with Clone()
-            fNext = orig.fNext->Clone();  // this's fNext points to the copy of orig's fNext
-        }
-
-        // duplicate base class
-        this->XBaseType::operator=( *this );
-
-        return *this;
-    }
-
-    template< class XBaseType >
-    unsigned KTExtensibleCore< XBaseType >::size() const
-    {
-        return fNext.operator bool() ? 1 + fNext->size() : 1;
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    XRequestedType& KTExtensibleCore< XBaseType >::Of()
-    {
-        XRequestedType* requested = dynamic_cast< XRequestedType* >( this );
-        if( requested != nullptr )
-        {
-            return *requested;
-        }
-
-        if( ! fNext )
-        {
-            std::shared_ptr< XRequestedType > requestedShared = std::make_shared< XRequestedType >();
-            fNext = requestedShared;
-            return *requestedShared;
-        }
-        return fNext->template Of< XRequestedType >();
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    const XRequestedType& KTExtensibleCore< XBaseType >::Of() const
-    {
-        const XRequestedType* requested = dynamic_cast< const XRequestedType* >( this );
-        if( requested != nullptr )
-        {
-            return *requested;
-        }
-
-        if( ! fNext )
-        {
-            throw KTException() << "Cannot add to a const extensible object";
-        }
-        return fNext->template Of< XRequestedType >();
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share()
-    {
-        std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
-        if( requested )
-        {
-            std::cout << "type match" << std::endl;
-            return requested;
-        }
-
-        if( ! fNext )
-        {
-            requested = std::make_shared< XRequestedType >();
-            fNext = requested;
-            return requested;
-        }
-        return fNext->template Share< XRequestedType >();
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    const std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Share() const
-    {
-        const std::shared_ptr< XRequestedType > requested = std::dynamic_pointer_cast< const XRequestedType >( ESFTBaseType::shared_from_this() );
-        if( requested )
-        {
-            return requested;
-        }
-
-        if( ! fNext )
-        {
-            throw KTException() << "Cannot add to a const extensible object";
-        }
-        return fNext->template Share< XRequestedType >();
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    bool KTExtensibleCore< XBaseType >::Has() const
-    {
-        if( dynamic_cast< const XRequestedType* >( this ) )
-        {
-            return true;
-        }
-        if( fNext )
-        {
-            return fNext->template Has< XRequestedType >();
-        }
-        return false;
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::Detatch()
-    {
-        return _Detatch< XRequestedType >();
-    }
-
-    template< class XBaseType >
-    std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensibleCore< XBaseType >::Next()
-    {
-        return fNext;
-    }
-
-    template< class XBaseType >
-    template< class XRequestedType >
-    std::shared_ptr< XRequestedType > KTExtensibleCore< XBaseType >::_Detatch( KTExtensibleCore< XBaseType >::BasePtrType prev )
-    {
-        if( dynamic_cast< XRequestedType* >( this ) )
-        {
-            // create a shared pointer to this here, so that when we reset prev.fNext (if it exists), that won't be the last reference to this
-            std::shared_ptr< XRequestedType > detatched = std::static_pointer_cast< XRequestedType >( ESFTBaseType::shared_from_this() );
-            if( prev )
-            {
-                // link prev and fNext if fNext exists; otherwise resets prev.fNext
-                prev->fNext = this->fNext;
-            }
-            fNext.reset();
-            return detatched;
-        }
-
-        if( fNext )
-        {
-            return fNext->template _Detatch< XRequestedType >( ESFTBaseType::shared_from_this() );
-        }
-
-        return std::shared_ptr< XRequestedType >();
-    }
-
-    template< class XBaseType >
-    template< class Archive >
-    void KTExtensibleCore< XBaseType >::serialize( Archive& ar )
-    {
-        std::cout << "### serialize for " << typeid(KTExtensibleCore< XBaseType >).name() << std::endl;
-        ar( cereal::base_class< XBaseType >( this ), fNext );
-    }
-
-
-    //**************
-    // KTExtensible implementation
-    //**************
-
-    template< class XInstanceType, class XBaseType >
-    KTExtensible< XInstanceType, XBaseType >::KTExtensible() :
-            KTExtensibleCore< XBaseType >()
-    {}
-
-    template< class XInstanceType, class XBaseType >
-    KTExtensible< XInstanceType, XBaseType >::KTExtensible( const KTExtensible< XInstanceType, XBaseType >& orig ) :
-            KTExtensibleCore< XBaseType >() // copy of KTExtensibleCore is done from operator=()
-    {
-        *this = orig;
-    }
-
-    template< class XInstanceType, class XBaseType >
-    KTExtensible< XInstanceType, XBaseType >::~KTExtensible()
-    {}
-
-    template< class XInstanceType, class XBaseType >
-    KTExtensible< XInstanceType, XBaseType >& KTExtensible< XInstanceType, XBaseType >::operator=( const KTExtensible< XInstanceType, XBaseType >& orig )
-    {
-        // must not call any virtual functions on `this` because it's called from the copy constructor
-
-        if( this == &orig ) return *this;
-
-        this->KTExtensibleCore< XBaseType >::operator=( orig );
-
-        return *this;
-    }
-
-    template< class XInstanceType, class XBaseType >
-    KTExtensibleCore< XBaseType >& KTExtensible< XInstanceType, XBaseType >::Pull( const KTExtensibleCore< XBaseType >& orig )
-    {
-        // copies information out from orig based on this's instance type and any extended fields present
-
-        if( this == &orig ) return *this;
-
-        this->fDisableExtendedCopy = true; // we're going to use operator=, so we need to disable copying of extended fields to only get the instance type
-        XInstanceType* instance = static_cast< XInstanceType* >( this ); // guaranteed to be ok by CRTP
-        // orig is const, so Of() will throw an exception if XInstanceType is not present
-        // in that case, make a copy of a new object
-        try
-        {
-            instance->operator=( orig.template Of< XInstanceType >() );
-        }
-        catch( KTException& )
-        {
-            instance->operator=( XInstanceType() );
-        }
-        this->fDisableExtendedCopy = false;
-
-        // continue the pull process for any extended fields present in this
-        if( this->fNext )
-        {
-            this->fNext->Pull( orig );
-        }
-
-        return *this;
-    }
-
-    template< class XInstanceType, class XBaseType >
-    std::shared_ptr< KTExtensibleCore< XBaseType > > KTExtensible< XInstanceType, XBaseType >::Clone() const
-    {
-        std::shared_ptr< XInstanceType > instancePtr = std::make_shared< XInstanceType >();
-        instancePtr->Pull(*this); // extracts just XInstanceType from this because instancePtr doesn't have any extended fields
-
-        // if there are extended fields, clone them
-        if( this->fNext )
-        {
-            instancePtr->fNext = this->fNext->Clone(); // instancePtr's fNext is a clone of this's fNext
-        }
-
-        return instancePtr;
-    }
-
-    template< class XInstanceType, class XBaseType >
-    template< class Archive >
-    void KTExtensible< XInstanceType, XBaseType >::serialize( Archive& ar )
-    {
-        std::cout << "### serialize for " << typeid(KTExtensible< XInstanceType, XBaseType >).name() << std::endl;
-        ar( cereal::base_class< ExtCoreType >( this ) );
-        return;
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_KTEXTENSIBLE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTExtensibleStruct.hh b/cpp/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
deleted file mode 100644
index 63deb64..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * KTExtensibleStruct.hh
- *
- *  Created on: Feb 14, 2013
- *      Author: nsoblath
- *      Original Author: Sanshiro Enomoto <sanshiro@uw.edu> (KDExternalStruct, from the KATRIN experiment)
- */
-
-#ifndef KTEXTENSIBLESTRUCT_HH_
-#define KTEXTENSIBLESTRUCT_HH_
-
-#include "KTException.hh"
-
-#include <cereal/types/polymorphic.hpp>
-
-#include <memory>
-
-namespace Nymph
-{
-
-    // *) operator= reallocates extended fields: to avoid this, use Pull().
-
-    /**
-     *
-     */
-
-    template< class XBaseType >
-    struct KTExtensibleStructCore : public XBaseType, public std::enable_shared_from_this< KTExtensibleStructCore< XBaseType > >
-    {
-        public:
-            typedef KTExtensibleStructCore< XBaseType > BasePtrType;
-            typedef std::shared_ptr< BasePtrType > BasePtr;
-            typedef std::weak_ptr< BasePtrType > WeakBasePtr;
-
-        private:
-            typedef std::enable_shared_from_this< KTExtensibleStructCore< XBaseType > > ESFTType;
-
-        public:
-            /// Default constructor
-            KTExtensibleStructCore();
-            /// Copy constructor; duplicates the extended object
-            KTExtensibleStructCore( const KTExtensibleStructCore& );
-            virtual ~KTExtensibleStructCore();
-            /// Duplicates the extended object
-            KTExtensibleStructCore& operator=( const KTExtensibleStructCore& );
-            /// Removes extended fields
-            virtual void Clear();
-            /// Returns a reference to the object of type XStructType; creates that object if it doesn't exist
-            template< class XStructType >
-            inline XStructType& Of();
-            /// Returns a const reference to the object of type XStructType; creates that object if it doesn't exist
-            template< class XStructType >
-            inline const XStructType& Of() const;
-            /// Returns true if XStructType is or is below this object
-            template< class XStructType >
-            inline bool Has() const;
-            /// Extracts object of type XStructType
-            template< class XStructType >
-            inline std::shared_ptr< XStructType > Detatch();
-            /// Duplicates the extended object
-            virtual BasePtr Clone() const = 0;
-            /// Duplicates object only
-            virtual void Pull( const BasePtrType& object ) = 0;
-            /// Returns the pointer to the next field
-            BasePtr Next() const;
-            /// Returns the pointer to the previous field
-            BasePtr Prev() const;
-            /// Returns the pointer to the last field
-            BasePtr Last() const;
-            /// Returns the pointer to the first field
-            BasePtr First() const;
-        protected:
-            void SetPrevPtrInNext();
-            mutable BasePtr fNext;
-            mutable WeakBasePtr fPrev;
-
-        private:
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-
-
-    template< class XInstanceType, class XBaseType >
-    struct KTExtensibleStruct : KTExtensibleStructCore< XBaseType >
-    {
-        public:
-            typedef typename KTExtensibleStructCore< XBaseType >::BasePtrType BasePtrType;
-            typedef typename KTExtensibleStructCore< XBaseType >::BasePtr BasePtr;
-
-        public:
-            /// Default constructor
-            KTExtensibleStruct();
-            /// Copy constructor; duplicates the extended object
-            KTExtensibleStruct( const KTExtensibleStruct& object );
-            virtual ~KTExtensibleStruct();
-            /// Duplicates the extended object
-            KTExtensibleStruct& operator=( const KTExtensibleStruct& object );
-            /// Duplicates the extended object
-            virtual BasePtr Clone() const;
-            /// Duplicates object only
-            virtual void Pull( const BasePtrType& object );
-            void SetIsCopyDisabled( bool flag );
-        private:
-            bool fIsCopyDisabled;
-            friend class cereal::access;
-
-            template< class Archive >
-            void serialize( Archive& ar );
-    };
-
-
-
-    template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore(void) :
-            fNext(),
-            fPrev()
-    {
-    }
-
-    template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>::KTExtensibleStructCore( const KTExtensibleStructCore& ) :
-            fNext(),
-            fPrev()
-    {
-    }
-
-    template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>::~KTExtensibleStructCore()
-    {
-    }
-
-    template<class XBaseType>
-    KTExtensibleStructCore<XBaseType>& KTExtensibleStructCore<XBaseType>::operator=( const KTExtensibleStructCore& )
-    {
-        fNext.reset();
-        return *this;
-    }
-
-    template<class XBaseType>
-    void KTExtensibleStructCore<XBaseType>::Clear()
-    {
-        fNext.reset();
-    }
-
-    template<class XBaseType>
-    template<class XStructType>
-    inline XStructType& KTExtensibleStructCore<XBaseType>::Of()
-    {
-        XStructType* target = dynamic_cast<XStructType*>(this);
-        if (target)
-        {
-            return *target;
-        }
-
-        if (! fNext)
-        {
-            fNext = std::make_shared< XStructType >();
-            fNext->fPrev = ESFTType::shared_from_this();
-        }
-
-        return fNext->template Of<XStructType>();
-    }
-
-    template<class XBaseType>
-    template<class XStructType>
-    inline const XStructType& KTExtensibleStructCore<XBaseType>::Of() const
-    {
-        const XStructType* target = dynamic_cast<const XStructType*>(this);
-        if (target)
-        {
-            return *target;
-        }
-
-        if (! fNext)
-        {
-            throw KTException() << "Requested component of (const) extensible struct not present";
-        }
-
-        return fNext->template Of<XStructType>();
-    }
-
-
-
-    template<class XBaseType>
-    template<class XStructType>
-    inline bool KTExtensibleStructCore<XBaseType>::Has() const
-    {
-        if (dynamic_cast<const XStructType*>(this))
-        {
-            return true;
-        }
-        if (fNext)
-        {
-            return fNext->template Has<XStructType>();
-        }
-
-        return false;
-    }
-
-
-
-    template<class XBaseType>
-    template<class XStructType>
-    inline std::shared_ptr< XStructType > KTExtensibleStructCore<XBaseType>::Detatch()
-    {
-        if (! fNext)
-        {
-            return std::shared_ptr< XStructType >();
-        }
-        std::shared_ptr< XStructType > next = std::dynamic_pointer_cast< XStructType >(fNext);
-        if (next)
-        {
-            if (next->fNext)
-            {
-                fNext = next->fNext;
-                fNext->fPrev = ESFTType::shared_from_this();
-                next->fNext.reset();
-            }
-            next->fPrev.reset();
-            return next;
-        }
-        return fNext->template Detatch<XStructType>();
-    }
-
-
-    template<class XBaseType>
-    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Next() const
-    {
-        return fNext;
-    }
-
-    template<class XBaseType>
-    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Prev() const
-    {
-        return fPrev.lock();
-    }
-
-    template<class XBaseType>
-    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::Last() const
-    {
-        if (fNext) return this;
-        return fNext->Last();
-    }
-
-    template<class XBaseType>
-    inline typename KTExtensibleStructCore<XBaseType>::BasePtr KTExtensibleStructCore<XBaseType>::First() const
-    {
-        if (! fPrev) return BasePtr(this);
-        return fPrev.lock()->First();
-    }
-
-    template<class XBaseType>
-    inline void KTExtensibleStructCore<XBaseType>::SetPrevPtrInNext()
-    {
-        fNext->fPrev = ESFTType::shared_from_this();
-        return;
-    }
-
-    template< class XBaseType >
-    template< class Archive >
-    void KTExtensibleStructCore<XBaseType>::serialize( Archive& ar )
-    {
-        std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
-        ar( this );
-
-        if( fNext == 0 ){ return; }
-        
-        // archive pointer ( fNext )?
-    }
-
-
-
-    template< class XInstanceType, class XBaseType >
-    template< class Archive >
-    void KTExtensibleStruct<XInstanceType, XBaseType>::serialize( Archive& ar )
-    {
-        std::cout << "### serialize for " << typeid(XBaseType).name() << std::endl;
-        ar( cereal::base_class< BasePtrType >( this ), fIsCopyDisabled );
-
-        return;
-    }
-
-    template<class XInstanceType, class XBaseType>
-    KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct() :
-            KTExtensibleStructCore< XBaseType >(),
-            fIsCopyDisabled( false )
-    {
-    }
-
-    template<class XInstanceType, class XBaseType>
-    KTExtensibleStruct<XInstanceType, XBaseType>::~KTExtensibleStruct()
-    {
-        fIsCopyDisabled = false;
-    }
-
-    template<class XInstanceType, class XBaseType>
-    KTExtensibleStruct<XInstanceType, XBaseType>::KTExtensibleStruct(const KTExtensibleStruct<XInstanceType, XBaseType>& object) :
-            KTExtensibleStructCore<XBaseType>(object)
-    {
-        // should this check fIsCopyDisabled in object?
-        fIsCopyDisabled = false;
-
-        if (object.fNext)
-        {
-            this->fNext = object.fNext->Clone();
-        }
-    }
-
-    template<class XInstanceType, class XBaseType>
-    KTExtensibleStruct<XInstanceType, XBaseType>& KTExtensibleStruct<XInstanceType, XBaseType>::operator=(const KTExtensibleStruct<XInstanceType, XBaseType>& object)
-    {
-        // should this check fIsCopyDisabled in object?
-        if ((&object == this) || fIsCopyDisabled)
-        {
-            return *this;
-        }
-
-        this->fNext.reset();
-
-        if (object.fNext)
-        {
-            this->fNext = object.fNext->Clone();
-            this->BasePtrType::SetPrevPtrInNext();
-            //this->fNext->fPrev = this;
-        }
-
-        return *this;
-    }
-
-    template<class XInstanceType, class XBaseType>
-    typename KTExtensibleStruct<XInstanceType, XBaseType>::BasePtr KTExtensibleStruct<XInstanceType, XBaseType>::Clone() const
-    {
-        // assume CRTP is used properly,
-        // otherwise compiling fails here (intended behavior)
-        typedef KTExtensibleStruct< XInstanceType, XBaseType > InstancePtrType;
-        typedef std::shared_ptr< InstancePtrType > InstancePtr;
-        InstancePtr instance = std::make_shared< InstancePtrType >( XInstanceType(dynamic_cast<const XInstanceType&>(*this)) );
-        if (this->fNext)
-        {
-            instance->fNext = this->fNext->Clone();
-            instance->SetPrevPtrInNext();
-            //instance->fNext->fPrev = instance->fNext;
-        }
-        return std::static_pointer_cast< BasePtrType, InstancePtrType >( instance );
-    }
-
-    template<class XInstanceType, class XBaseType>
-    void KTExtensibleStruct<XInstanceType, XBaseType>::Pull(const BasePtrType& object)
-    {
-        if (&object == this)
-        {
-            return;
-        }
-
-        fIsCopyDisabled = true;
-        XInstanceType* instance = dynamic_cast<XInstanceType*>(this);
-        if (object.template Has<XInstanceType>())
-        {
-            instance->operator=(object.template Of<XInstanceType>());
-        }
-        else
-        {
-            instance->operator=(XInstanceType());
-        }
-        fIsCopyDisabled = false;
-
-        if (this->fNext)
-        {
-            this->fNext->Pull(object);
-        }
-    }
-
-    template<class XInstanceType, class XBaseType>
-    inline void KTExtensibleStruct<XInstanceType, XBaseType>::SetIsCopyDisabled(bool flag)
-    {
-        fIsCopyDisabled = flag;
-        return;
-    }
-
-} /* namespace Nymph */
-#endif /* KTEXTENSIBLESTRUCT_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh b/cpp/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
deleted file mode 100644
index 46f6925..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * KTExtensibleStructFactory.hh
- *
- *  Created on: Sept 22, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTEXTENSIBLESTRUCTFACTORY_HH_
-#define KTEXTENSIBLESTRUCTFACTORY_HH_
-
-#include "KTExtensibleStruct.hh"
-#include "KTLogger.hh"
-
-#include "singleton.hh"
-
-#include <map>
-#include <string>
-
-namespace Nymph
-{
-    KTLOGGER(utillog_esfactory, "KTExtensibleStructFactory");
-
-    template< class XBaseType >
-    class KTExtensibleStructFactory;
-
-    template< class XBaseType >
-    class KTExtensibleStructRegistrarBase
-    {
-        public:
-            KTExtensibleStructRegistrarBase() {}
-            virtual ~KTExtensibleStructRegistrarBase() {}
-
-        public:
-            friend class KTExtensibleStructFactory< XBaseType >;
-
-        protected:
-            virtual KTExtensibleStructCore< XBaseType >* Create() const = 0;
-            virtual KTExtensibleStructCore< XBaseType >* Create(KTExtensibleStructCore< XBaseType >* object) const = 0;
-
-    };
-
-    template< class XBaseType, class XDerivedType >
-    class KTExtensibleStructRegistrar : public KTExtensibleStructRegistrarBase< XBaseType >
-    {
-        public:
-            KTExtensibleStructRegistrar(const std::string& className);
-            virtual ~KTExtensibleStructRegistrar();
-
-        protected:
-            void Register(const std::string& className) const;
-
-            KTExtensibleStructCore< XBaseType >* Create() const;
-            KTExtensibleStructCore< XBaseType >* Create(KTExtensibleStructCore< XBaseType >* object) const;
-
-    };
-
-
-    template< class XBaseType >
-    class KTExtensibleStructFactory : public scarab::singleton< KTExtensibleStructFactory< XBaseType > >
-    {
-        public:
-            typedef std::map< std::string, const KTExtensibleStructRegistrarBase< XBaseType >* > FactoryMap;
-            typedef typename FactoryMap::value_type FactoryEntry;
-            typedef typename FactoryMap::iterator FactoryIt;
-            typedef typename FactoryMap::const_iterator FactoryCIt;
-
-        public:
-            KTExtensibleStructCore< XBaseType >* Create(const std::string& className);
-            KTExtensibleStructCore< XBaseType >* Create(const FactoryCIt& iter);
-
-            KTExtensibleStructCore< XBaseType >* Create(const std::string& className, KTExtensibleStructCore< XBaseType >* object);
-            KTExtensibleStructCore< XBaseType >* Create(const FactoryCIt& iter, KTExtensibleStructCore< XBaseType >* object);
-
-            void Register(const std::string& className, const KTExtensibleStructRegistrarBase< XBaseType >* registrar);
-
-            FactoryCIt GetFactoryMapBegin() const;
-            FactoryCIt GetFactoryMapEnd() const;
-
-        protected:
-            FactoryMap* fMap;
-
-
-        protected:
-            friend class scarab::singleton< KTExtensibleStructFactory >;
-            friend class scarab::destroyer< KTExtensibleStructFactory >;
-            KTExtensibleStructFactory();
-            ~KTExtensibleStructFactory();
-    };
-
-    template< class XBaseType >
-    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const FactoryCIt& iter)
-    {
-        return iter->second->Create();
-    }
-
-    template< class XBaseType >
-    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const std::string& className)
-    {
-        FactoryCIt it = fMap->find(className);
-        if (it == fMap->end())
-        {
-            KTERROR(utillog_esfactory, "Did not find factory for <" << className << ">.");
-            return NULL;
-        }
-
-        return it->second->Create();
-    }
-
-    template< class XBaseType >
-    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const FactoryCIt& iter, KTExtensibleStructCore< XBaseType >* object)
-    {
-        return iter->second->Create(object);
-    }
-
-    template< class XBaseType >
-    KTExtensibleStructCore< XBaseType >* KTExtensibleStructFactory< XBaseType >::Create(const std::string& className, KTExtensibleStructCore< XBaseType >* object)
-    {
-        FactoryCIt it = fMap->find(className);
-        if (it == fMap->end())
-        {
-            KTERROR(utillog_esfactory, "Did not find factory for <" << className << ">.");
-            return NULL;
-        }
-
-        return it->second->Create(object);
-    }
-
-    template< class XBaseType >
-    void KTExtensibleStructFactory< XBaseType >::Register(const std::string& className, const KTExtensibleStructRegistrarBase< XBaseType >* registrar)
-    {
-        // A local (static) logger is created inside this function to avoid static initialization order problems
-        KTLOGGER(utillog_esfactory_reg, "KTExtensibleStructFactory-Register");
-
-        FactoryCIt it = fMap->find(className);
-        if (it != fMap->end())
-        {
-            KTERROR(utillog_esfactory_reg, "Already have factory registered for <" << className << ">.");
-            return;
-        }
-        fMap->insert(std::pair< std::string, const KTExtensibleStructRegistrarBase< XBaseType >* >(className, registrar));
-        KTDEBUG(utillog_esfactory_reg, "Registered a factory for class " << className << ", factory #" << fMap->size()-1);
-    }
-
-    template< class XBaseType >
-    KTExtensibleStructFactory< XBaseType >::KTExtensibleStructFactory() :
-        fMap(new FactoryMap())
-    {}
-
-    template< class XBaseType >
-    KTExtensibleStructFactory< XBaseType >::~KTExtensibleStructFactory()
-    {
-        delete fMap;
-    }
-
-    template< class XBaseType >
-    typename KTExtensibleStructFactory< XBaseType >::FactoryCIt KTExtensibleStructFactory< XBaseType >::GetFactoryMapBegin() const
-    {
-        return fMap->begin();
-    }
-
-    template< class XBaseType >
-    typename KTExtensibleStructFactory< XBaseType >::FactoryCIt KTExtensibleStructFactory< XBaseType >::GetFactoryMapEnd() const
-    {
-        return fMap->end();
-    }
-
-
-
-
-    template< class XBaseType, class XDerivedType >
-    KTExtensibleStructRegistrar< XBaseType, XDerivedType >::KTExtensibleStructRegistrar(const std::string& className) :
-            KTExtensibleStructRegistrarBase< XBaseType >()
-    {
-        Register(className);
-    }
-
-    template< class XBaseType, class XDerivedType >
-    KTExtensibleStructRegistrar< XBaseType, XDerivedType >::~KTExtensibleStructRegistrar()
-    {}
-
-    template< class XBaseType, class XDerivedType >
-    void KTExtensibleStructRegistrar< XBaseType, XDerivedType >::Register(const std::string& className) const
-    {
-        KTExtensibleStructFactory< XBaseType >::get_instance()->Register(className, this);
-        return;
-    }
-
-    template< class XBaseType, class XDerivedType >
-    KTExtensibleStructCore< XBaseType >* KTExtensibleStructRegistrar< XBaseType, XDerivedType >::Create() const
-    {
-        return dynamic_cast< KTExtensibleStructCore< XBaseType >* >(new XDerivedType());
-    }
-
-    template< class XBaseType, class XDerivedType >
-    KTExtensibleStructCore< XBaseType >* KTExtensibleStructRegistrar< XBaseType, XDerivedType >::Create(KTExtensibleStructCore< XBaseType >* object) const
-    {
-        return dynamic_cast< KTExtensibleStructCore< XBaseType >* >(&object->template Of< XDerivedType >());
-    }
-
-} /* namespace Nymph */
-#endif /* KTEXTENSIBLESTRUCTFACTORY_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTLogger.hh b/cpp/Cpp/Library_v1/Utility/KTLogger.hh
deleted file mode 100644
index adeee63..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTLogger.hh
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * KTLogger.hh
- * Based on KLogger.h, from KATRIN's Kasper
- *
- *  Created on: Jan 23, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTLOGGER_HH_
-#define KTLOGGER_HH_
-
-#include "logger.hh"
-
-/*
- * The Nymph logger is now a simple rebranding of the Scarab logger
- */
-
-// PUBLIC MACROS
-
-#define KTLOGGER(I,K)      static ::scarab::logger I(K);
-
-#define KTLOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
-#ifdef NDEBUG
-#define KTTRACE(...)
-#define KTDEBUG(...)
-#else
-#define KTTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
-#endif
-#define KTINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
-#define KTPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
-#define KTWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
-#define KTERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
-#define KTFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
-#define KTASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
-
-#define KTLOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#ifdef NDEBUG
-#define KTTRACE_ONCE(...)
-#define KTDEBUG_ONCE(...)
-#else
-#define KTTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#endif
-#define KTINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define KTFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-
-#endif /* KTLOGGER_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTMemberVariable.hh b/cpp/Cpp/Library_v1/Utility/KTMemberVariable.hh
deleted file mode 100644
index f9bdec1..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTMemberVariable.hh
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * KTMemberVariable.hh
- *
- *  Created on: Aug 5, 2014
- *      Author: nsoblath
- */
-
-#ifndef KTMEMBERVARIABLE_HH_
-#define KTMEMBERVARIABLE_HH_
-
-/**
- * Macros for class member variables
- *
- * In all cases remember to initialize the variables!
- *
- * For "normal" variables
- * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [type fMyVar]
- * The Set function is not available if the _NOSET macros are used
- *  - MEMBERVARIABLE
- *  - MEMBERVARIABLE_NOSET
- *  - MEMBERVARIABLE_STATIC
- *  - MEMBERVARIABLE_STATIC_NOSET
- *
- * For variables accessed by reference
- * Defines accessors [const type& MyVar() const], [type& MyVar()], and member variable [type fMyVar]
- * The non-const function is not available if the _CONST macros are used
- *  - MEMBERVARIABLE_REF
- *  - MEMBERVARIABLE_REF_CONST
- *  - MEMBERVARIABLE_REF_STATIC
- *  - MEMBERVARIABLE_REF_STATIC_CONST
- *
- * For pointer variables
- * Defines accessors [type* GetMyVar() const], [void SetMyVar( type* )], and member variable [type* fMyVar]
- * The Set function is not available if the _NOSET macros are used
- *  - MEMBERVARIABLE_PTR
- *  - MEMBERVARIABLE_PTR_NOSET
- *  - MEMBERVARIABLE_PTR_STATIC
- *  - MEMBERVARIABLE_PTR_STATIC_NOSET
- *
- * For shared_ptr's
- * Defines accessors [const std::shared_ptr< type > MyVar() const], [std::shared_ptr< type > MyVar()], and member variable [std::shared_ptr< type > fMyVar]
- * The non-const function is not available if the _CONST macros are used
- *  - MEMBERVARIABLE_SHARED_PTR
- *  - MEMBERVARIABLE_SHARED_PTR_CONST
- *  - MEMBERVARIABLE_SHARED_PTR_STATIC
- *  - MEMBERVARIABLE_SHARED_PTR_STATIC_CONST
- *
- * For atomic variables
- * Defines accessors [type GetMyVar() const], [void SetMyVar( type )], and member variable [std::atomic< type > fMyVar]
- * The Set function is not available if the _NOSET macros are used
- *  - MEMBERVARIABLE_ATOMIC
- *  - MEMBERVARIABLE_ATOMIC_NOSET
- *  - MEMBERVARIABLE_ATOMIC_STATIC
- *  - MEMBERVARIABLE_ATOMIC_STATIC_NOSET
- *
- */
-
-#define set_prefix Set
-#define get_prefix Get
-#define var_prefix f
-#define static_prefix s
-
-#include "_camel_case_member_variables.hh"
-
-#define MEMBERVARIABLE                         camel_case_mv_accessible
-#define MEMBERVARIABLE_NOSET                   camel_case_mv_accessible_noset
-#define MEMBERVARIABLE_STATIC                  camel_case_mv_accessible_static
-#define MEMBERVARIABLE_STATIC_NOSET            camel_case_mv_accessible_static_noset
-#define MEMBERVARIABLE_MUTABLE                 camel_case_mv_accessible_mutable
-#define MEMBERVARIABLE_MUTABLE_NOSET           camel_case_mv_accessible_mutable_noset
-
-#define MEMBERVARIABLE_REF                     camel_case_mv_referrable
-#define MEMBERVARIABLE_REF_CONST               camel_case_mv_referrable_const
-#define MEMBERVARIABLE_REF_STATIC              camel_case_mv_referrable_static
-#define MEMBERVARIABLE_REF_MUTABLE             camel_case_mv_referrable_mutable
-#define MEMBERVARIABLE_REF_MUTABLE_CONST       camel_case_mv_referrable_mutable
-
-#define MEMBERVARIABLE_PTR                     camel_case_mv_assignable
-#define MEMBERVARIABLE_PTR_NOSET               camel_case_mv_assignable_noset
-#define MEMBERVARIABLE_PTR_STATIC              camel_case_mv_assignable_static
-#define MEMBERVARIABLE_PTR_STATIC_NOSET        camel_case_mv_assignable_static_noset
-#define MEMBERVARIABLE_PTR_MUTABLE             camel_case_mv_assignable_mutable
-#define MEMBERVARIABLE_PTR_MUTABLE_NOSET       camel_case_mv_assignable_mutable_noset
-
-#define MEMBERVARIABLE_SHARED_PTR              camel_case_mv_shared_ptr
-#define MEMBERVARIABLE_SHARED_PTR_CONST        camel_case_mv_shared_ptr_const
-#define MEMBERVARIABLE_SHARED_PTR_STATIC       camel_case_mv_shared_ptr_static
-#define MEMBERVARIABLE_SHARED_PTR_MUTABLE      camel_case_mv_shared_ptr_mutable
-#define MEMBERVARIABLE_SHARED_PTR_MUTABLE_CONST camel_case_mv_shared_ptr_mutable
-
-#define MEMBERVARIABLE_ATOMIC                  camel_case_mv_atomic
-#define MEMBERVARIABLE_ATOMIC_NOSET            camel_case_mv_atomic_noset
-#define MEMBERVARIABLE_ATOMIC_STATIC           camel_case_mv_atomic_static
-#define MEMBERVARIABLE_ATOMIC_STATIC_NOSET     camel_case_mv_atomic_static_noset
-#define MEMBERVARIABLE_ATOMIC_MUTABLE          camel_case_mv_atomic_mutable
-#define MEMBERVARIABLE_ATOMIC_MUTABLE_NOSET    camel_case_mv_atomic_mutable_noset
-
-#endif /* KTMEMBERVARIABLE_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTParamPybind.hh b/cpp/Cpp/Library_v1/Utility/KTParamPybind.hh
deleted file mode 100644
index dbbf917..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTParamPybind.hh
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * KTPyNymph.cc
- *
- *  Created on: Feb 1, 2018
- *      Author: N. Oblath, L. Gladstone
- */
-
-#include "param.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace Nymph
-{
-
-    void ExportParamPybind( pybind11::module& mod )
-    {
-        // param
-        pybind11::class_< scarab::param >( mod, "param" );
-
-        // param_value
-        pybind11::class_< scarab::param_value, scarab::param >( mod, "param_value" )
-            .def( pybind11::init< bool >() )
-            .def( pybind11::init< unsigned >() )
-            .def( pybind11::init< int >() )
-            .def( pybind11::init< double >() )
-            .def( pybind11::init< const std::string& >() )
-            .def( pybind11::init< const char* >() )
-
-            .def( "is_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::is_bool, "Return whether the param_value stores a boolean value" )
-            .def( "is_uint", (bool (scarab::param_value::*)() const) &scarab::param_value::is_uint, "Return whether the param_value stores an unsigned integer value" )
-            .def( "is_int", (bool (scarab::param_value::*)() const) &scarab::param_value::is_int, "Return whether the param_value stores a signed integer value" )
-            .def( "is_double", (bool (scarab::param_value::*)() const) &scarab::param_value::is_double, "Return whether the param_value stores a double value" )
-            .def( "is_string", (bool (scarab::param_value::*)() const) &scarab::param_value::is_string, "Return whether the param_value stores a string value" )
-
-            .def( "as_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::as_bool, "Get parameter value as a bool" )
-            .def( "as_uint", (unsigned (scarab::param_value::*)() const) &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
-            .def( "as_int", (int (scarab::param_value::*)() const) &scarab::param_value::as_int, "Get parameter value as a signed integer" )
-            .def( "as_double", (double (scarab::param_value::*)() const) &scarab::param_value::as_double, "Get parameter value as a float" )
-            .def( "as_string", (const std::string& (scarab::param_value::*)() const) &scarab::param_value::as_string, "Get parameter value as a string" )
-
-            .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set, "Set a bool value" )
-            .def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set<uint64_t>, "Set an unsigned integer value" )
-            .def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set<int64_t>, "Set a signed integer value" )
-            .def( "set", (void (scarab::param_value::*)(double)) &scarab::param_value::set, "Set an float value" )
-            .def( "set", (void (scarab::param_value::*)(std::string)) &scarab::param_value::set, "Set an string value" )
-            ;
-
-        // param_node
-        pybind11::class_< scarab::param_node, scarab::param >( mod, "param_node" )
-            .def( pybind11::init<>() )
-            
-            .def( "add",(bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,
-                    "Add a param object to a node" )
-
-            .def( "at", (scarab::param& (scarab::param_node::*)(const std::string&)) &scarab::param_node::operator[],
-                    "Get the param object for a given key" )
-
-            // Get value of the parameter, bringing along the default value
-            .def( "get_value", (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
-                    "Get parameter node value as a bool" )
-            .def( "get_value", (unsigned (scarab::param_node::*)(const std::string&, unsigned) const) &scarab::param_node::get_value<uint>,
-                    "Get parameter node value as an unsigned integer" )
-            .def( "get_value", (int (scarab::param_node::*)(const std::string&, int) const) &scarab::param_node::get_value<int>,
-                    "Get parameter node value as a signed integer" )
-            .def( "get_value", (double (scarab::param_node::*)(const std::string&, double) const) &scarab::param_node::get_value<double>,
-                    "Get parameter node value as a float" )
-            .def( "get_value", (std::string (scarab::param_node::*)(const std::string&, const std::string& ) const) &scarab::param_node::get_value,
-                    "Get parameter node value as a string" )
-            ;
-
-        // param_array
-        pybind11::class_< scarab::param_array, scarab::param >( mod, "param_array" )
-            .def( pybind11::init<>() )
-
-            .def( "size", (unsigned (scarab::param_array::*)() const) &scarab::param_array::size,
-                    "Returns the size of the array" )
-
-            .def( "resize", (void (scarab::param_array::*)(unsigned)) &scarab::param_array::resize,
-                    "Sets the size of the array; if smaller than the current size, the extra elements are deleted")
-
-            .def( "assign", (void (scarab::param_array::*)(unsigned, const scarab::param&)) &scarab::param_array::assign,
-                    "Add a param object to the specified index in a array" )
-
-            .def( "at", (scarab::param& (scarab::param_array::*)(unsigned)) &scarab::param_array::operator[],
-                    "Get the param object for a given index" )
-
-            // Get value of the parameter, bringing along the default value
-            .def( "get_value", (bool (scarab::param_array::*)(unsigned, bool) const) &scarab::param_array::get_value<bool>,
-                    "Get parameter array value as a bool" )
-            .def( "get_value", (unsigned (scarab::param_array::*)(unsigned, unsigned) const) &scarab::param_array::get_value<uint>,
-                    "Get parameter array value as an unsigned integer" )
-            .def( "get_value", (int (scarab::param_array::*)(unsigned, int) const) &scarab::param_array::get_value<int>,
-                    "Get parameter array value as a signed integer" )
-            .def( "get_value", (double (scarab::param_array::*)(unsigned, double) const) &scarab::param_array::get_value<double>,
-                    "Get parameter array value as a float" )
-            .def( "get_value", (std::string (scarab::param_array::*)(unsigned, const std::string& ) const) &scarab::param_array::get_value,
-                    "Get parameter array value as a string" )
-            ;
-    }
-    
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh b/cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh
deleted file mode 100644
index b9567b1..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTPythonMacros.hh
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * KTPythonMacros.hh
- *
- * Created on: April 26, 2017
- *     Author: laroque
- */
-
-#ifndef KTPYTHONMACROS_HH_
-#define KTPYTHONMACROS_HH_
-
-#define PROPERTYMEMBER( CLASS, MEMBER ) \
-    .add_property( #MEMBER, &CLASS::Get##MEMBER, &CLASS::Set##MEMBER )
-
-#define PROPERTYMEMBER_NOSET( CLASS, MEMBER ) \
-    .add_property( #MEMBER, &CLASS::Get##MEMBER, boost::python::no_set )
-
-#define PROPERTYMEMBER_RETPOLICY( CLASS, MEMBER, RETPOLICY ) \
-    .add_property( #MEMBER, make_function( &CLASS::Get##MEMBER, return_value_policy<RETPOLICY>()), &CLASS::Set##MEMBER )
-
-#define PROPERTYMEMBER_RETPOLICY_NOSET( CLASS, MEMBER, RETPOLICY ) \
-    .add_property( #MEMBER, make_function( &CLASS::Get##MEMBER, return_value_policy<RETPOLICY>()), boost::python::no_set )
-
-#endif /* KTPYTHONMACROS_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTTIFactory.hh b/cpp/Cpp/Library_v1/Utility/KTTIFactory.hh
deleted file mode 100644
index 294bafe..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTTIFactory.hh
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * KTTIFactory.hh
- *
- *  Created on: Jan 2, 2013
- *      Author: nsoblath
- *
- *      Type-Indexed Factory and Registrars
- */
-
-#ifndef KTTIFACTORY_HH_
-#define KTTIFACTORY_HH_
-
-#include "KTLogger.hh"
-
-#include "singleton.hh"
-
-#include <map>
-#include <typeinfo>
-
-namespace Nymph
-{
-    KTLOGGER(utillog_ti_factory, "KTTIFactory");
-
-    //********************
-    // Class definitions
-    //********************
-
-    template< class XBaseType, typename ... XArgs >
-    class KTTIFactory;
-
-    template< class XBaseType, typename ... XArgs >
-    class KTTIRegistrarBase
-    {
-        public:
-            KTTIRegistrarBase() {}
-            virtual ~KTTIRegistrarBase() {}
-
-        public:
-            friend class KTTIFactory< XBaseType, XArgs... >;
-
-        protected:
-            virtual XBaseType* Create(XArgs ... args) const = 0;
-
-    };
-
-    template< class XBaseType, class XDerivedType, typename ... XArgs >
-    class KTTIRegistrar : public KTTIRegistrarBase< XBaseType, XArgs... >
-    {
-        public:
-            KTTIRegistrar();
-            virtual ~KTTIRegistrar();
-
-        protected:
-            void Register() const;
-
-            XBaseType* Create(XArgs ... args) const;
-
-    };
-
-
-    template< class XBaseType, typename ... XArgs >
-    class KTTIFactory : public scarab::singleton< KTTIFactory< XBaseType, XArgs... > >
-    {
-        public:
-            struct CompareTypeInfo
-            {
-                bool operator() (const std::type_info* lhs, const std::type_info* rhs)
-                {
-                    return lhs->before(*rhs);
-                }
-            };
-
-        public:
-            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType, XArgs... >* > FactoryMap;
-            typedef typename FactoryMap::value_type FactoryEntry;
-            typedef typename FactoryMap::iterator FactoryIt;
-            typedef typename FactoryMap::const_iterator FactoryCIt;
-
-        public:
-            template< class XDerivedType >
-            XBaseType* Create(XArgs ... args);
-
-            XBaseType* Create(const FactoryCIt& iter, XArgs ... args);
-
-            template< class XDerivedType >
-            void Register(const KTTIRegistrarBase< XBaseType, XArgs... >* registrar);
-
-            FactoryCIt GetFactoryMapBegin() const;
-            FactoryCIt GetFactoryMapEnd() const;
-
-        protected:
-            FactoryMap* fMap;
-
-
-        protected:
-            friend class scarab::singleton< KTTIFactory >;
-            friend class scarab::destroyer< KTTIFactory >;
-            KTTIFactory();
-            ~KTTIFactory();
-    };
-
-    //*****************************************
-    // Partial specialization for empty XArgs
-    //*****************************************
-
-    template< class XBaseType >
-    class KTTIRegistrarBase< XBaseType, void >
-    {
-        public:
-            KTTIRegistrarBase() {}
-            virtual ~KTTIRegistrarBase() {}
-
-        public:
-            friend class KTTIFactory< XBaseType >;
-
-        protected:
-            virtual XBaseType* Create() const = 0;
-
-    };
-
-    template< class XBaseType, class XDerivedType >
-    class KTTIRegistrar< XBaseType, XDerivedType, void > : public KTTIRegistrarBase< XBaseType, void >
-    {
-        public:
-            KTTIRegistrar();
-            virtual ~KTTIRegistrar();
-
-        protected:
-            void Register() const;
-
-            XBaseType* Create() const;
-
-    };
-
-
-    template< class XBaseType >
-    class KTTIFactory< XBaseType, void > : public scarab::singleton< KTTIFactory< XBaseType, void > >
-    {
-        public:
-            struct CompareTypeInfo
-            {
-                bool operator() (const std::type_info* lhs, const std::type_info* rhs)
-                {
-                    return lhs->before(*rhs);
-                }
-            };
-
-        public:
-            typedef std::map< const std::type_info*, const KTTIRegistrarBase< XBaseType, void >* > FactoryMap;
-            typedef typename FactoryMap::value_type FactoryEntry;
-            typedef typename FactoryMap::iterator FactoryIt;
-            typedef typename FactoryMap::const_iterator FactoryCIt;
-
-        public:
-            template< class XDerivedType >
-            XBaseType* Create();
-
-            XBaseType* Create(const FactoryCIt& iter);
-
-            template< class XDerivedType >
-            void Register(const KTTIRegistrarBase< XBaseType, void >* registrar);
-
-            FactoryCIt GetFactoryMapBegin() const;
-            FactoryCIt GetFactoryMapEnd() const;
-
-        protected:
-            FactoryMap* fMap;
-
-
-        protected:
-            friend class scarab::singleton< KTTIFactory >;
-            friend class scarab::destroyer< KTTIFactory >;
-            KTTIFactory();
-            ~KTTIFactory();
-    };
-
-
-    //******************
-    // Implementations
-    //******************
-
-    // Factory
-
-    template< class XBaseType, typename ... XArgs >
-    template< class XDerivedType >
-    XBaseType* KTTIFactory< XBaseType, XArgs... >::Create(XArgs ... args)
-    {
-        FactoryCIt it = fMap->find(&typeid(XDerivedType));
-        if (it == fMap->end())
-        {
-            KTERROR(utillog_ti_factory, "Did not find factory with type <" << typeid(XDerivedType).name() << ">.");
-            return NULL;
-        }
-
-        return it->second->Create(args...);
-    }
-
-    template< class XBaseType, typename ... XArgs >
-    XBaseType* KTTIFactory< XBaseType, XArgs... >::Create(const FactoryCIt& iter, XArgs ... args)
-    {
-        return iter->second->Create(args...);
-    }
-
-    template< class XBaseType, typename ... XArgs >
-    template< class XDerivedType >
-    void KTTIFactory< XBaseType, XArgs... >::Register(const KTTIRegistrarBase< XBaseType, XArgs... >* registrar)
-    {
-        // A local (static) logger is created inside this function to avoid static initialization order problems
-        KTLOGGER(utillog_ti_factory_reg, "KTTIFactory-Register");
-
-        FactoryCIt it = fMap->find(&typeid(XDerivedType));
-        if (it != fMap->end())
-        {
-            KTERROR(utillog_ti_factory_reg, "Already have factory registered for type <" << typeid(XDerivedType).name() << ">.");
-            return;
-        }
-        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType, XArgs... >* >(&typeid(XDerivedType), registrar));
-        KTDEBUG(utillog_ti_factory_reg, "Registered a factory for class type " << typeid(XDerivedType).name() << ", factory #" << fMap->size()-1);
-    }
-
-    template< class XBaseType, typename ... XArgs >
-    KTTIFactory< XBaseType, XArgs... >::KTTIFactory() :
-        fMap(new FactoryMap())
-    {}
-
-    template< class XBaseType, typename ... XArgs >
-    KTTIFactory< XBaseType, XArgs... >::~KTTIFactory()
-    {
-        delete fMap;
-    }
-
-    template< class XBaseType, typename ... XArgs >
-    typename KTTIFactory< XBaseType, XArgs... >::FactoryCIt KTTIFactory< XBaseType, XArgs... >::GetFactoryMapBegin() const
-    {
-        return fMap->begin();
-    }
-
-    template< class XBaseType, typename ... XArgs >
-    typename KTTIFactory< XBaseType, XArgs... >::FactoryCIt KTTIFactory< XBaseType, XArgs... >::GetFactoryMapEnd() const
-    {
-        return fMap->end();
-    }
-
-    // Registrar
-
-    template< class XBaseType, class XDerivedType, typename ... XArgs >
-    KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::KTTIRegistrar() :
-            KTTIRegistrarBase< XBaseType, XArgs... >()
-    {
-        Register();
-    }
-
-    template< class XBaseType, class XDerivedType, typename ... XArgs >
-    KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::~KTTIRegistrar()
-    {}
-
-    template< class XBaseType, class XDerivedType, typename ... XArgs >
-    void KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::Register() const
-    {
-        KTTIFactory< XBaseType, XArgs... >::get_instance()->template Register<XDerivedType>(this);
-        return;
-    }
-
-    template< class XBaseType, class XDerivedType, typename ... XArgs >
-    XBaseType* KTTIRegistrar< XBaseType, XDerivedType, XArgs... >::Create(XArgs ... args) const
-    {
-        return dynamic_cast< XBaseType* >(new XDerivedType(args...));
-    }
-
-    //*******************************************
-    // Implementations (partial specialization)
-    //*******************************************
-
-    // Factory
-
-    template< class XBaseType >
-    template< class XDerivedType >
-    XBaseType* KTTIFactory< XBaseType, void >::Create()
-    {
-        FactoryCIt it = fMap->find(&typeid(XDerivedType));
-        if (it == fMap->end())
-        {
-            KTERROR(utillog_ti_factory, "Did not find factory with type <" << typeid(XDerivedType).name() << ">.");
-            return NULL;
-        }
-
-        return it->second->Create();
-    }
-
-    template< class XBaseType >
-    XBaseType* KTTIFactory< XBaseType, void >::Create(const FactoryCIt& iter)
-    {
-        return iter->second->Create();
-    }
-
-    template< class XBaseType >
-    template< class XDerivedType >
-    void KTTIFactory< XBaseType, void >::Register(const KTTIRegistrarBase< XBaseType, void >* registrar)
-    {
-        // A local (static) logger is created inside this function to avoid static initialization order problems
-        KTLOGGER(utillog_ti_factory_reg, "KTTIFactory-Register");
-
-        FactoryCIt it = fMap->find(&typeid(XDerivedType));
-        if (it != fMap->end())
-        {
-            KTERROR(utillog_ti_factory_reg, "Already have factory registered for type <" << typeid(XDerivedType).name() << ">.");
-            return;
-        }
-        fMap->insert(std::pair< const std::type_info*, const KTTIRegistrarBase< XBaseType, void >* >(&typeid(XDerivedType), registrar));
-        KTDEBUG(utillog_ti_factory_reg, "Registered a factory for class type " << typeid(XDerivedType).name() << ", factory #" << fMap->size()-1);
-    }
-
-    template< class XBaseType >
-    KTTIFactory< XBaseType, void >::KTTIFactory() :
-        fMap(new FactoryMap())
-    {}
-
-    template< class XBaseType >
-    KTTIFactory< XBaseType, void >::~KTTIFactory()
-    {
-        delete fMap;
-    }
-
-    template< class XBaseType >
-    typename KTTIFactory< XBaseType, void >::FactoryCIt KTTIFactory< XBaseType, void >::GetFactoryMapBegin() const
-    {
-        return fMap->begin();
-    }
-
-    template< class XBaseType >
-    typename KTTIFactory< XBaseType, void >::FactoryCIt KTTIFactory< XBaseType, void >::GetFactoryMapEnd() const
-    {
-        return fMap->end();
-    }
-
-    // Registrar
-
-    template< class XBaseType, class XDerivedType >
-    KTTIRegistrar< XBaseType, XDerivedType, void >::KTTIRegistrar() :
-            KTTIRegistrarBase< XBaseType, void >()
-    {
-        Register();
-    }
-
-    template< class XBaseType, class XDerivedType >
-    KTTIRegistrar< XBaseType, XDerivedType, void >::~KTTIRegistrar()
-    {}
-
-    template< class XBaseType, class XDerivedType >
-    void KTTIRegistrar< XBaseType, XDerivedType, void >::Register() const
-    {
-        KTTIFactory< XBaseType, void >::get_instance()->template Register<XDerivedType>(this);
-        return;
-    }
-
-    template< class XBaseType, class XDerivedType >
-    XBaseType* KTTIRegistrar< XBaseType, XDerivedType, void >::Create() const
-    {
-        return dynamic_cast< XBaseType* >(new XDerivedType());
-    }
-
-
-} /* namespace Nymph */
-#endif /* KTTIFACTORY_HH_ */
diff --git a/cpp/Cpp/Library_v1/Utility/KTTime.cc b/cpp/Cpp/Library_v1/Utility/KTTime.cc
deleted file mode 100644
index 2861425..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTTime.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * KTTime.cc
- *
- *  Created on: Oct 08, 2014
- *      Author: nsoblath
- *
- *      Copied from libthorax's thorax_time.c
- */
-
-#include "KTTime.hh"
-
-char eDateTimeFormat[] = "%FT%TZ";
-
-#ifdef __MACH__
-double eTimebase = 0.0;
-uint64_t eTimeStart = 0;
-#endif
-
-int GetTimeMonotonic(struct timespec* time)
-{
-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
-    if (! eTimeStart)
-    {
-        mach_timebase_info_data_t tb = { .numer = 0, .denom = 1 };
-        mach_timebase_info(&tb);
-        eTimebase = tb.numer;
-        eTimebase /= tb.denom;
-        eTimeStart = mach_absolute_time();
-    }
-    double diff = (mach_absolute_time() - eTimeStart) * eTimebase;
-    time->tv_sec = diff * MACNANO;
-    time->tv_nsec = diff - (time->tv_sec * MACGIGA);
-    return 0;
-#else
-    return clock_gettime( CLOCK_MONOTONIC, time );
-#endif
-}
-
-int GetTimeCurrent(struct timespec* time)
-{
-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
-    if (! eTimeStart)
-    {
-        mach_timebase_info_data_t tb = { .numer = 0, .denom = 1 };
-        mach_timebase_info(&tb);
-        eTimebase = tb.numer;
-        eTimebase /= tb.denom;
-        eTimeStart = mach_absolute_time();
-    }
-    double diff = (mach_absolute_time() - eTimeStart) * eTimebase;
-    time->tv_sec = diff * MACNANO;
-    time->tv_nsec = diff - (time->tv_sec * MACGIGA);
-    return 0;
-#else
-    return clock_gettime(CLOCK_PROCESS_CPUTIME_ID, time);
-#endif
-
-}
-
-uint64_t TimeToNSec(struct timespec time)
-{
-    return (long long int)time.tv_sec * (long long int)NSEC_PER_SEC + (long long int)time.tv_nsec;
-}
-
-double TimeToSec(struct timespec time)
-{
-    return (double)time.tv_sec + (double)time.tv_nsec / (double)NSEC_PER_SEC;
-}
-
-void TimeDiff(struct timespec start, struct timespec end, struct timespec* diff)
-{
-    if ((end.tv_nsec - start.tv_nsec < 0))
-    {
-        diff->tv_sec = end.tv_sec - start.tv_sec - 1;
-        diff->tv_nsec = 1000000000 + end.tv_nsec - start.tv_nsec;
-    }
-    else
-    {
-        diff->tv_sec = end.tv_sec - start.tv_sec;
-        diff->tv_nsec = end.tv_nsec - start.tv_nsec;
-    }
-    return;
-}
-
-size_t GetTimeAbsoluteStr(char* ptr)
-{
-    time_t raw_time;
-    struct tm* processed_time;
-
-    time(&raw_time);
-    processed_time = gmtime(&raw_time);
-    return strftime(ptr, 512, eDateTimeFormat, processed_time);
-}
diff --git a/cpp/Cpp/Library_v1/Utility/KTTime.hh b/cpp/Cpp/Library_v1/Utility/KTTime.hh
deleted file mode 100644
index 50e678e..0000000
--- a/cpp/Cpp/Library_v1/Utility/KTTime.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * KTTime.hh
- *
- *  Created on: Oct 08, 2014
- *      Author: nsoblath
- *
- *      Copied from libthorax's thorax_time.h
- */
-
-#ifndef KTTIME_HH_
-#define KTTIME_HH_
-
-#include <inttypes.h>
-#include <sys/time.h>
-#include <time.h>
-
-#ifndef NSEC_PER_SEC
-#define NSEC_PER_SEC 1000000000
-#endif
-
-#ifndef SEC_PER_NSEC
-#define SEC_PER_NSEC 1.e-9
-#endif
-
-#ifdef __MACH__
-#include <mach/mach_time.h>
-
-#ifndef MACNANO
-#define MACNANO (+1.0E-9)
-#define MACGIGA UINT64_C(1000000000)
-#endif // MACNANO
-
-extern double eTimebase;
-extern uint64_t eTimestart;
-#endif // __MACH__
-
-
-extern char eDateTimeFormat[];
-
-
-int GetTimeMonotonic(struct timespec* time);
-
-int GetTimeCurrent(struct timespec* time);
-
-uint64_t TimeToNSec(struct timespec time);
-
-double TimeToSec(struct timespec time);
-
-void TimeDiff(struct timespec start, struct timespec end, struct timespec* diff);
-
-size_t GetTimeAbsoluteStr(char* ptr);
-
-#endif // KTTIME_HH_
diff --git a/cpp/Cpp/Templates/KTProcessorTemplate.cc b/cpp/Cpp/Templates/KTProcessorTemplate.cc
deleted file mode 100644
index 13d53fc..0000000
--- a/cpp/Cpp/Templates/KTProcessorTemplate.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * KTProcessorTemplate.cc
- *
- *  Created on: [date]
- *      Author: [name]
- */
-
-#include "KTProcessorTemplate.hh"
-
-#include "KTLogger.hh"
-#include "KTNOFactory.hh"
-#include "scarab::param.hh"
-
-
-namespace Nymph
-{
-    KTLOGGER([logger], "KTProcessorTemplate");
-
-    // Register the processor
-    KT_REGISTER_PROCESSOR(KTProcessorTemplate, "[config-name]");
-
-    KTProcessorTemplate::KTProcessorTemplate(const std::string& name) :
-            KTProcessor(name)
-            // initialize all member variables
-            // initialize signals:
-            // f[SomeName]Signal("[signal-name]", this)
-            // initialize slots:
-            // fHeaderSlot("header", this, &KTProcessorTemplate::[function to call with header]),
-            // f[SomeName]Slot("[slot-name]", this, &KTProcessorTemplate::[function to call], &f[SomeName]Signal)
-    {
-    }
-
-    KTProcessorTemplate::~KTProcessorTemplate()
-    {
-    }
-
-    bool KTProcessorTemplate::Configure(const scarab::param_node& node)
-    {
-        // Configure parameters
-
-        return true;
-    }
-
-    // All the normal stuff goes here
-
-} /* namespace Nymph */
diff --git a/cpp/Cpp/Templates/KTProcessorTemplate.hh b/cpp/Cpp/Templates/KTProcessorTemplate.hh
deleted file mode 100644
index 593be45..0000000
--- a/cpp/Cpp/Templates/KTProcessorTemplate.hh
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- @file KTProcessorTemplate.hh
- @brief Contains KTProcessorTemplate
- @details [does something]
- @author: [name]
- @date: [date]
- */
-
-#ifndef KTPROCESSORTEMPLATE_HH_
-#define KTPROCESSORTEMPLATE_HH_
-
-#include "KTProcessor.hh"
-
-#include "KTSlot.hh"
-
-
-
-namespace Nymph
-{
-    // Forward declare whatever classes you can
-    // input data type . . .
-    // output data type . . .
-    class scarab::param_node;
-
-    /*!
-     @class KTProcessorTemplate
-     @author [name]
-
-     @brief [brief class description]
-
-     @details
-     [detailed class description]
-
-     Configuration name: "[config-name]"
-
-     Available configuration values:
-     - "some-name": [type] -- [what it does]
-
-     Slots:
-     - "[slot-name]": void (KTDataPtr) -- [what it does]; Requires [input data type]; Adds [output data type]; Emits signal "[signal-name]"
-
-     Signals:
-     - "[signal-name]": void (KTDataPtr) -- Emitted upon [whatever was done]; Guarantees [output data type].
-    */
-
-    class KTProcessorTemplate : public KTProcessor
-    {
-        public:
-            KTProcessorTemplate(const std::string& name = "[config-name]");
-            virtual ~KTProcessorTemplate();
-
-            bool Configure(const scarab::param_node& node);
-
-            // Getters and setters for configurable parameters go here
-        private:
-            // configurable member parameters go here
-
-        public:
-            // Functions to do the job of the processor go here
-            // These allow the processor to be used on data objects manually
-
-
-        private:
-            // Perhaps there are some non-public helper functions?
-
-            // And then any non-configurable member variables
-
-            //***************
-            // Signals
-            //***************
-
-        private:
-            KTSignalData f[SomeName]Signal;
-
-            //***************
-            // Slots
-            //***************
-
-        private:
-            KTSlotDataOneType< [Input Data Type] > f[SomeName]Slot;
-
-    };
-}
- /* namespace Nymph */
-#endif /* KTPROCESSORTEMPLATE_HH_ */
diff --git a/cpp/Cpp/Templates/MainCMakeLists.txt b/cpp/Cpp/Templates/MainCMakeLists.txt
deleted file mode 100644
index 0c8fa6b..0000000
--- a/cpp/Cpp/Templates/MainCMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# CMakeLists for [YOUR PACKAGE]
-# Author: [YOU]
-
-cmake_minimum_required (VERSION 3.0) # or newer
-
-# Define the project
-project ([YOUR PROJECT NAME] VERSION 1.11.0 )
-
-# Import Nymph features
-include (nymph/cmake/Nymph.cmake)
-nymph_prepare_project ()
-
-
-[DEAL WITH DEPENDENCIES]
-
-
-nymph_build_core_library()
-
-[ADD YOUR SUBDIRECTORIES HERE]
-
-nymph_build_core_executables()
-
-
-[WHATEVER ELSE YOU MIGHT NEED TO DO]
\ No newline at end of file
diff --git a/python/Python/nymph/__init__.py b/python/Python/nymph/__init__.py
deleted file mode 100644
index e69de29..0000000

From 65d080bd2f649a61a082b6e1b3bb9d1bcf92dd7c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 11:03:38 -0800
Subject: [PATCH 274/521] Updated ReturnBuffer.hh and added TestReturnBuffer.cc

---
 Library/Control/ReturnBuffer.hh | 78 +++++++++++++++++++++------------
 Testing/CMakeLists.txt          |  1 +
 Testing/TestReturnBuffer.cc     | 55 +++++++++++++++++++++++
 3 files changed, 106 insertions(+), 28 deletions(-)
 create mode 100644 Testing/TestReturnBuffer.cc

diff --git a/Library/Control/ReturnBuffer.hh b/Library/Control/ReturnBuffer.hh
index 7113bca..bbacb63 100644
--- a/Library/Control/ReturnBuffer.hh
+++ b/Library/Control/ReturnBuffer.hh
@@ -8,6 +8,8 @@
 #ifndef NYMPH_RETURNBUFFER_HH_
 #define NYMPH_RETURNBUFFER_HH_
 
+#include "Exception.hh"
+
 #include <tuple>
 
 namespace Nymph
@@ -21,47 +23,59 @@ namespace Nymph
 
             template< class... XArgs >
             std::tuple< XArgs&... >& GetReturn();
+
+            template< class... XArgs >
+            const std::tuple< XArgs&... >& GetReturn() const;
     };
 
-    template< typename... Args >
-    struct ReturnBuffer : ReturnBufferBase
+    template< class... XArgs >
+    class ReturnBuffer : public ReturnBufferBase
     {
         public:
-            ReturnBuffer() :
-                    fReturn( nullptr )
-            {}
+            ReturnBuffer();
+            ReturnBuffer( XArgs&... retval );
+            virtual ~ReturnBuffer();
 
-            ReturnBuffer( Args&... retval ) :
-                    fReturn( new std::tuple< Args&... >( retval... ) )
-            {}
-
-            virtual ~ReturnBuffer()
-            {}
+            std::tuple< XArgs&... >& GetReturn();
 
-            std::tuple< Args&... >& GetReturn()
-            {
-                if( fReturn == nullptr ) throw std::exception();
-                return *fReturn;
-            }
+            const std::tuple< XArgs&... >& GetReturn() const;
 
         protected:
-            std::tuple< Args&... >* fReturn;
+            std::tuple< XArgs&... >* fReturn;
     };
 
-    template<>
-    struct ReturnBuffer< void > : ReturnBufferBase
+
+    // ReturnBuffer
+    template< class... XArgs >
+    ReturnBuffer< XArgs... >::ReturnBuffer() :
+            fReturn( nullptr )
+    {}
+
+    template< class... XArgs >
+    ReturnBuffer< XArgs... >::ReturnBuffer( XArgs&... retval ) :
+            fReturn( new std::tuple< XArgs&... >( retval... ) )
+    {}
+
+    template< class... XArgs >
+    ReturnBuffer< XArgs... >::~ReturnBuffer()
+    {}
+
+    template< class... XArgs >
+    std::tuple< XArgs&... >& ReturnBuffer< XArgs... >::GetReturn()
     {
-        ReturnBuffer() :
-                ReturnBufferBase()
-        {}
-
-        void GetReturn()
-        {
-            return;
-        }
-    };
+        if( fReturn == nullptr ) THROW_EXCEPT_HERE( Exception() << "No return is present" );
+        return *fReturn;
+    }
+
+    template< class... XArgs >
+    const std::tuple< XArgs&... >& ReturnBuffer< XArgs... >::GetReturn() const
+    {
+        if( fReturn == nullptr ) THROW_EXCEPT_HERE( Exception() << "No return is present" );
+        return *fReturn;
+    }
 
 
+    // Templated functions from ReturnBufferBase
     template< class... XArgs >
     std::tuple< XArgs&... >& ReturnBufferBase::GetReturn()
     {
@@ -70,6 +84,14 @@ namespace Nymph
         return typedBuffer->GetReturn();
     }
 
+    template< class... XArgs >
+    const std::tuple< XArgs&... >& ReturnBufferBase::GetReturn() const
+    {
+        ReturnBuffer< XArgs... >* typedBuffer = dynamic_cast< ReturnBuffer< XArgs... >* >(this);
+        if( ! typedBuffer ) THROW_EXCEPT_HERE( Exception() << "Invalid set of arguments for this return buffer" );
+        return typedBuffer->GetReturn();
+    }
+
 
 } /* namespace Nymph */
 
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 4ad50b0..fc1f260 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -21,6 +21,7 @@ set( testing_SOURCES
     TestPrimaryProcessor.cc
     TestProcessor.cc
     TestProcessorToolbox.cc
+    TestReturnBuffer.cc
     TestSignalSlot.cc
     TestSingleRunController.cc
     TestSlotData.cc
diff --git a/Testing/TestReturnBuffer.cc b/Testing/TestReturnBuffer.cc
new file mode 100644
index 0000000..89288e9
--- /dev/null
+++ b/Testing/TestReturnBuffer.cc
@@ -0,0 +1,55 @@
+/*
+ * TestReturnBuffer.cc
+ *
+ *  Created on: Feb 1, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "ReturnBuffer.hh"
+
+#include "catch.hpp"
+
+#include "logger.hh"
+
+LOGGER( testlog, "TestReturnBuffer" );
+
+TEST_CASE( "return_buffer_base", "[processor]" )
+{
+    using namespace Nymph;
+
+    ReturnBufferBase rbb;
+
+    REQUIRE_THROWS_AS( rbb.GetReturn<double>(), Exception );
+}
+
+TEST_CASE( "return_buffer", "[processor]" )
+{
+    using namespace Nymph;
+
+    SECTION( "empty" )
+    {
+        ReturnBuffer< double > buffer;
+        REQUIRE_THROWS_AS( buffer.GetReturn(), Exception );
+    }
+
+    SECTION( "full" )
+    {
+        int intData = 5;
+        double doubleData = 100.2;
+        std::string stringData( "I'm a string!" );
+        ReturnBuffer< int, double, std::string > buffer( intData, doubleData, stringData );
+
+        REQUIRE_NOTHROW( buffer.GetReturn() );
+        auto theReturn = buffer.GetReturn();
+        REQUIRE( std::get<0>( theReturn ) == 5 );
+        REQUIRE( std::get<1>( theReturn ) == Approx(100.2) );
+        REQUIRE( std::get<2>( theReturn ) == "I'm a string!" );
+
+        ReturnBufferBase& rbb = buffer;
+        auto theRBBReturn = rbb.GetReturn< int, double, std::string >();
+        REQUIRE( std::get<0>( theRBBReturn ) == 5 );
+        REQUIRE( std::get<1>( theRBBReturn ) == Approx(100.2) );
+        REQUIRE( std::get<2>( theRBBReturn ) == "I'm a string!" );
+
+    }
+}

From 8e3351cdce5e43254520f6582cea5693f5e35d20 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 11:04:57 -0800
Subject: [PATCH 275/521] Remove use of ControlInterface, and integrate use of
 ReturnBuffer

---
 Library/CMakeLists.txt                 |  4 +--
 Library/Control/ControlAccess.cc       |  5 ++--
 Library/Control/ControlAccess.hh       | 33 +++++++++++++------------
 Library/Control/Controller.cc          |  5 ++--
 Library/Control/Controller.hh          | 34 +++++++++++++++++++++++---
 Library/Control/ControllerInterface.hh |  2 +-
 Library/Control/SingleRunController.hh | 19 --------------
 Library/Processor/Signal.hh            |  4 +--
 8 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/Library/CMakeLists.txt b/Library/CMakeLists.txt
index 4584597..4db447e 100644
--- a/Library/CMakeLists.txt
+++ b/Library/CMakeLists.txt
@@ -39,7 +39,7 @@ set( NYMPH_HEADERFILES
 
     ${CONT_DIR}/ControlAccess.hh
     ${CONT_DIR}/Controller.hh
-    ${CONT_DIR}/ControllerInterface.hh
+#    ${CONT_DIR}/ControllerInterface.hh
     ${CONT_DIR}/ReturnBuffer.hh
     ${CONT_DIR}/SingleRunController.hh
 )
@@ -58,7 +58,7 @@ set( NYMPH_SOURCEFILES
 
     ${CONT_DIR}/ControlAccess.cc
     ${CONT_DIR}/Controller.cc
-    ${CONT_DIR}/ControllerInterface.cc
+#    ${CONT_DIR}/ControllerInterface.cc
     ${CONT_DIR}/ReturnBuffer.cc
     ${CONT_DIR}/SingleRunController.cc
 )
diff --git a/Library/Control/ControlAccess.cc b/Library/Control/ControlAccess.cc
index 8d0458f..97aaf9b 100644
--- a/Library/Control/ControlAccess.cc
+++ b/Library/Control/ControlAccess.cc
@@ -15,7 +15,6 @@ namespace Nymph
 {
     ControlAccess::ControlAccess() :
             scarab::singleton< ControlAccess >(),
-            ControllerInterface(),
             fControl( nullptr )
     {
 
@@ -84,7 +83,7 @@ namespace Nymph
     }
 
 
-
+/*
     ReturnAccess::ReturnAccess() :
             fReturn( new ReturnBuffer< int >() )//,
             //fControl()
@@ -92,5 +91,5 @@ namespace Nymph
 
     ReturnAccess::~ReturnAccess()
     {}
-
+*/
 } /* namespace Nymph */
diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index 5289cfa..ce3c4e7 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -19,7 +19,7 @@
 namespace Nymph
 {
 
-    class ControlAccess : public scarab::singleton< ControlAccess >, public ControllerInterface
+    class ControlAccess : public scarab::singleton< ControlAccess >
     {
         protected:
             allow_singleton_access( ControlAccess );
@@ -33,43 +33,46 @@ namespace Nymph
             /// Returns when processing is completed or a breakpoint is reached
             /// If the return is true, processing can continue after the break
             /// If the return is false, processing has ended (either normally or due to an error)
-            virtual bool WaitForBreakOrCanceled();
+            bool WaitForBreakOrCanceled();
 
             /// Use this to have a thread wait for the end of a run
-            virtual void WaitForEndOfRun();
+            void WaitForEndOfRun();
 
             /// Instruct the Controller to continue after a breakpoint
-            virtual void Continue();
+            void Continue();
 
             /// Cancel all threads and end the run
-            virtual void Cancel( int code = 0 );
+            void Cancel( int code = 0 );
 
             /// Reports whether controls is canceled
-            virtual bool IsCanceled() const;
+            bool IsCanceled() const;
 
             /// Initiate a break
-            virtual void InitiateBreak();
+            void Break();
 
+            /// Initiate a break with a return
             template< typename... Args >
-            void Break( Args&... args ); // to be called by a working thread
+            void BreakAndReturn( Args&... args );
 
             /// Reports whether control is at a breakpoint
-            virtual bool IsAtBreak() const;
+            bool IsAtBreak() const;
 
             /// Notify the control that a chain is quitting
-            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
+            void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
-            MEMVAR( ControllerInterface*, Control );
+            MEMVAR( Controller*, Control );
 
     };
 
     template< class... XArgs >
-    void ControlAccess::Break( Args&... args )
+    void ControlAccess::BreakAndReturn( XArgs&... args )
     {
-        
+        if( fControl ) fControl->BreakAndReturn( args... );
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
+        return;
     }
 
-
+/*
     class ReturnAccess : public scarab::cancelable
     {
         public:
@@ -107,7 +110,7 @@ namespace Nymph
         if( buffer == nullptr ) throw std::exception();
         return buffer->GetReturn();
     }
-
+*/
 } /* namespace Nymph */
 
 #endif /* NYMPH_CONTROLACCESS_HH_ */
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index a3965c9..eac672c 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -19,13 +19,14 @@ namespace Nymph
     LOGGER( contlog, "Controller" );
 
     Controller::Controller() :
-            ControllerInterface(),
             scarab::cancelable(),
             fCycleTimeMS( 500 ),
             fMutex(),
             fCondVarContinue(),
             fCondVarBreak(),
-            fBreakFlag( false )
+            fBreakFlag( false ),
+            fReturnBuffer(),
+            fReturnMutex()
     {
         ControlAccess::get_instance()->SetControl( this );
     }
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index fc352bf..eed951a 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -8,9 +8,8 @@
 #ifndef NYMPH_CONTROLLER_HH_
 #define NYMPH_CONTROLLER_HH_
 
-#include "ControllerInterface.hh"
-
 #include "MemberVariable.hh"
+#include "ReturnBuffer.hh"
 
 #include "cancelable.hh"
 #include "param.hh"
@@ -28,7 +27,7 @@ namespace Nymph
      @brief Base class for Controller classes, with basic break/continue/cancel functionality
 
     */
-    class Controller : public ControllerInterface, public scarab::cancelable
+    class Controller : public scarab::cancelable
     {
         public:
             Controller();
@@ -64,7 +63,11 @@ namespace Nymph
             virtual bool IsCanceled() const;
 
             /// Inititate a break
-            virtual void InitiateBreak();
+            virtual void Break();
+
+            /// Initiate a break with a return
+            template< typename... XArgs >
+            void BreakAndReturn( XArgs&... args );
 
             /// Reports whether control is at a breakpoint
             virtual bool IsAtBreak() const;
@@ -81,8 +84,31 @@ namespace Nymph
         protected:
             void do_cancellation( int code );
 
+        public:
+            template< typename... XArgs >
+            std::tuple< XArgs&... >& GetReturn();
+
+        protected:
+            std::unique_ptr< ReturnBufferBase > fReturnBuffer;
+            MEMVAR_REF_MUTABLE( std::mutex, ReturnMutex );
+
     };
 
+    template< typename... XArgs >
+    void Controller::BreakAndReturn( XArgs&... args )
+    {
+        this->Break();
+        fReturnBuffer.reset( new ReturnBuffer( args... ) );
+        return;
+    }
+
+    template< class... XArgs >
+    std::tuple< XArgs&... >& Controller::GetReturn()
+    {
+        std::unique_lock< std::mutex > lock( fReturnMutex );
+        return fReturnBuffer->GetReturn< XArgs... >();
+    }
+
 /*
     template< typename... Args >
     void SharedControl::Break( Args&... args )
diff --git a/Library/Control/ControllerInterface.hh b/Library/Control/ControllerInterface.hh
index 646e239..8a7502a 100644
--- a/Library/Control/ControllerInterface.hh
+++ b/Library/Control/ControllerInterface.hh
@@ -47,7 +47,7 @@ namespace Nymph
             virtual bool IsCanceled() const = 0;
 
             /// Initiate a break
-            virtual void InitiateBreak() = 0;
+            virtual void Break() = 0;
 
             /// Reports whether control is at a breakpoint
             virtual bool IsAtBreak() const = 0;
diff --git a/Library/Control/SingleRunController.hh b/Library/Control/SingleRunController.hh
index 50108fb..f08b9ab 100644
--- a/Library/Control/SingleRunController.hh
+++ b/Library/Control/SingleRunController.hh
@@ -68,16 +68,6 @@ namespace Nymph
             typedef std::tuple< PrimaryProcessor*, std::thread, std::exception_ptr > ThreadBundle;
             std::map< std::string, ThreadBundle > fChainThreads;
 
-        public:
-            template< typename... Args >
-            std::tuple< Args&... >& GetReturn();
-
-            template< typename... Args >
-            void Break( Args&... args ); // to be called by a working thread
-
-        protected:
-            std::unique_ptr< ReturnBufferBase > fReturnBuffer;
-
     };
 
    inline void SingleRunController::JoinRunThread()
@@ -86,15 +76,6 @@ namespace Nymph
         return;
     }
 
-    template< typename... XArgs >
-    void SingleRunController::Break( Args&... args )
-    {
-        Controller::InitiateBreak();
-        fReturnBuffer.reset( new ReturnBuffer( args... ) );
-        return;
-    }
-
-
 } /* namespace Nymph */
 
 #endif /* NYMPH_SINGLERUNCONTROLLER_HH_ */
diff --git a/Library/Processor/Signal.hh b/Library/Processor/Signal.hh
index 77787af..10b5a38 100644
--- a/Library/Processor/Signal.hh
+++ b/Library/Processor/Signal.hh
@@ -190,8 +190,8 @@ namespace Nymph
         if( fDoBreakpoint )
         {
             // do the break
-            //control->Break( args... );
-            control->Break();
+            control->BreakAndReturn( args... );
+            //control->Break();
             // wait to continue; once we continue, if we need to quit, then do so
             if( ! control->WaitToContinue() )
             {

From bdcfa84731b11311e8f9ddfe5e1382b5263d3ebe Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 11:06:00 -0800
Subject: [PATCH 276/521] Revert "Moved Executables to Executables_v1 and added
 a possibly-useless demo"

This reverts commit 2553f7e0031cd9595378f605c8445fe755b25c18.
---
 CMakeLists.txt                                |  5 +-
 Executables/Demos/CMakeLists.txt              | 26 -------
 Executables/Demos/Return.cc                   | 72 -------------------
 .../Main/CMakeLists.txt                       |  0
 .../Main/ConfigCheck.cc                       |  0
 {Executables_v1 => Executables}/Main/Nymph.cc |  0
 .../Validation/CMakeLists.txt                 |  0
 .../ConfigFiles/TestConfigurator.json         |  0
 .../ConfigFiles/TestParameterStoreConfig.json |  0
 .../Validation/KTJSONReader.cc                |  0
 .../Validation/KTJSONReader.hh                |  0
 .../Validation/KTJSONTypeWriterValidation.cc  |  0
 .../Validation/KTJSONTypeWriterValidation.hh  |  0
 .../Validation/KTPyTestClass.cc               |  0
 .../Validation/KTPyTestClass.hh               |  0
 .../Validation/KTPyTestClassPybind.hh         |  0
 .../KTRegisterNymphValidationExtData.hh       |  0
 .../Validation/KTTestConfigurable.cc          |  0
 .../Validation/KTTestConfigurable.hh          |  0
 .../Validation/KTTestCuts.cc                  |  0
 .../Validation/KTTestCuts.hh                  |  0
 .../Validation/KTTestData.cc                  |  0
 .../Validation/KTTestData.hh                  |  0
 .../Validation/KTTestDataPrimaryProcessor.cc  |  0
 .../Validation/KTTestDataPrimaryProcessor.hh  |  0
 .../Validation/KTTestPrimaryProcessor.cc      |  0
 .../Validation/KTTestPrimaryProcessor.hh      |  0
 .../Validation/KTTestProcessor.cc             |  0
 .../Validation/KTTestProcessor.hh             |  0
 .../Validation/NymphValidationPybind.cc       |  0
 .../Validation/TestApplication.cc             |  0
 .../Validation/TestApplyCut.cc                |  0
 .../Validation/TestCacheDirectory.cc          |  0
 .../Validation/TestCut.cc                     |  0
 .../Validation/TestCutFilter.cc               |  0
 .../Validation/TestData.cc                    |  0
 .../Validation/TestExceptionInSlot.cc         |  0
 .../Validation/TestExt.cc                     |  0
 .../Validation/TestExtSerialization.cc        |  0
 .../Validation/TestJSONWriter.cc              |  0
 .../Validation/TestJSONWriterViaSlot.cc       |  0
 .../Validation/TestLogger.cc                  |  0
 .../Validation/TestParamBindings.py           |  0
 .../Validation/TestPolymorphicSlotData.cc     |  0
 .../Validation/TestPrimaryProcessor.cc        |  0
 .../TestPrimaryProcessorNoThreading.cc        |  0
 .../Validation/TestPrintData.cc               |  0
 .../Validation/TestProcessorToolbox.py        |  0
 .../TestProcessorToolbox2Threads.cc           |  0
 .../TestProcessorToolboxMultithreaded.cc      |  0
 .../TestProcessorToolboxSinglethreaded.cc     |  0
 .../Validation/TestPyTestClass.py             |  0
 .../Validation/TestPythonBasics.hh            |  0
 .../Validation/TestPythonBasics.py            |  0
 .../Validation/TestSerialization.cc           |  0
 .../Validation/TestSignalsAndSlots.cc         |  0
 .../Validation/TestSlotData.cc                |  0
 .../Validation/TestThroughputProfiler.cc      |  0
 .../Validation/TestUseBreakpoint.cc           |  0
 .../Validation/TestWrapProcessor.py           |  0
 60 files changed, 2 insertions(+), 101 deletions(-)
 delete mode 100644 Executables/Demos/CMakeLists.txt
 delete mode 100644 Executables/Demos/Return.cc
 rename {Executables_v1 => Executables}/Main/CMakeLists.txt (100%)
 rename {Executables_v1 => Executables}/Main/ConfigCheck.cc (100%)
 rename {Executables_v1 => Executables}/Main/Nymph.cc (100%)
 rename {Executables_v1 => Executables}/Validation/CMakeLists.txt (100%)
 rename {Executables_v1 => Executables}/Validation/ConfigFiles/TestConfigurator.json (100%)
 rename {Executables_v1 => Executables}/Validation/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename {Executables_v1 => Executables}/Validation/KTJSONReader.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTJSONReader.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTJSONTypeWriterValidation.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTJSONTypeWriterValidation.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTPyTestClass.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTPyTestClass.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTPyTestClassPybind.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTRegisterNymphValidationExtData.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestConfigurable.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestConfigurable.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestCuts.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestCuts.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestData.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestData.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestDataPrimaryProcessor.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestDataPrimaryProcessor.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestPrimaryProcessor.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestPrimaryProcessor.hh (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestProcessor.cc (100%)
 rename {Executables_v1 => Executables}/Validation/KTTestProcessor.hh (100%)
 rename {Executables_v1 => Executables}/Validation/NymphValidationPybind.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestApplication.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestApplyCut.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestCacheDirectory.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestCut.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestCutFilter.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestData.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestExceptionInSlot.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestExt.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestExtSerialization.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestJSONWriter.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestJSONWriterViaSlot.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestLogger.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestParamBindings.py (100%)
 rename {Executables_v1 => Executables}/Validation/TestPolymorphicSlotData.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestPrimaryProcessor.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestPrimaryProcessorNoThreading.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestPrintData.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestProcessorToolbox.py (100%)
 rename {Executables_v1 => Executables}/Validation/TestProcessorToolbox2Threads.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestProcessorToolboxMultithreaded.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestProcessorToolboxSinglethreaded.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestPyTestClass.py (100%)
 rename {Executables_v1 => Executables}/Validation/TestPythonBasics.hh (100%)
 rename {Executables_v1 => Executables}/Validation/TestPythonBasics.py (100%)
 rename {Executables_v1 => Executables}/Validation/TestSerialization.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestSignalsAndSlots.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestSlotData.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestThroughputProfiler.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestUseBreakpoint.cc (100%)
 rename {Executables_v1 => Executables}/Validation/TestWrapProcessor.py (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b149f94..825ee68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -125,10 +125,9 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 add_subdirectory( Library )
 
-if (Nymph_ENABLE_EXECUTABLES)
+#if (Nymph_ENABLE_EXECUTABLES)
 #    add_subdirectory( Executables/Main )
-    add_subdirectory( Executables/Demos )
-endif (Nymph_ENABLE_EXECUTABLES )
+#endif (Nymph_ENABLE_EXECUTABLES )
 
 
 #########
diff --git a/Executables/Demos/CMakeLists.txt b/Executables/Demos/CMakeLists.txt
deleted file mode 100644
index b72887d..0000000
--- a/Executables/Demos/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# CMakeLists for Nymph/Executables/Demos
-# Author: N.S. Oblath
-
-if( NOT Nymph_AS_SUBMODULE )
-    set( Nymph_package_libs
-        Nymph
-    )
-endif()
-
-set( Nymph_SOURCES
-    Return.cc
-)
-
-set( Nymph_PROGRAMS )
-pbuilder_executables( 
-    SOURCES ${Nymph_SOURCES}
-    TARGETS_VAR Nymph_PROGRAMS
-    PROJECT_LIBRARIES ${Nymph_package_libs}
-    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Executables
-    EXETARGETS ${Nymph_PROGRAMS}
-)
diff --git a/Executables/Demos/Return.cc b/Executables/Demos/Return.cc
deleted file mode 100644
index 483452d..0000000
--- a/Executables/Demos/Return.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-#include <exception>
-#include <iostream>
-#include <vector>
-
-
-struct Typeless
-{
-    template< typename XGet >
-    XGet& Get()
-    {
-        HiddenType< XGet >* thisCast = dynamic_cast< XGet* >( this );
-        if( ! thisCast )
-        {
-            throw std::runtime_error( "Invalid cast type" );
-        }
-        return thisCast->fObj;
-    }
-};
-
-template< typename XHidden >
-struct HiddenType : Typeless
-{
-    XHidden fObj;
-};
-
-template< typename... XTypes >
-void ProcessVector( const std::vector< Typeless* >& captured )
-{
-    try
-    {
-        unsigned index = 0;
-        for( auto iter = captured.begin(); iter != captured.end(); ++iter )
-        {
-            std::cout << index << ": " << captured->Get< XType >() << std::endl;
-            ++index;
-        }
-    }
-    catch(const std::exception& e)
-    {
-        std::cerr << e.what() << '\n';
-    }
-    return;    
-}
-
-template< typename... XArgs >
-std::vector< Typeless* > ProcessArgs( XArgs... args )
-{
-    std::tuple< XArgs... > argsTuple{ args };
-
-    std::vector< Typeless* > captured;
-    const unsigned nArgs = sizeof...(args);
-    for( unsigned i = 0; i < nArgs; ++i)
-    {
-        captured[i] = new HiddenType< std::tuple_element<i, args...> >{std::get<i>(argsTuple)};
-    }
-
-}
-
-
-
-
-int main()
-{
-
-    auto vec = ProcessArgs( 1, 2.5, "hello" );
-
-    ProcessVector< int, double, std::string >( *vec );
-
-    return 0;
-}
\ No newline at end of file
diff --git a/Executables_v1/Main/CMakeLists.txt b/Executables/Main/CMakeLists.txt
similarity index 100%
rename from Executables_v1/Main/CMakeLists.txt
rename to Executables/Main/CMakeLists.txt
diff --git a/Executables_v1/Main/ConfigCheck.cc b/Executables/Main/ConfigCheck.cc
similarity index 100%
rename from Executables_v1/Main/ConfigCheck.cc
rename to Executables/Main/ConfigCheck.cc
diff --git a/Executables_v1/Main/Nymph.cc b/Executables/Main/Nymph.cc
similarity index 100%
rename from Executables_v1/Main/Nymph.cc
rename to Executables/Main/Nymph.cc
diff --git a/Executables_v1/Validation/CMakeLists.txt b/Executables/Validation/CMakeLists.txt
similarity index 100%
rename from Executables_v1/Validation/CMakeLists.txt
rename to Executables/Validation/CMakeLists.txt
diff --git a/Executables_v1/Validation/ConfigFiles/TestConfigurator.json b/Executables/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Executables_v1/Validation/ConfigFiles/TestConfigurator.json
rename to Executables/Validation/ConfigFiles/TestConfigurator.json
diff --git a/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json b/Executables/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to Executables/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Executables_v1/Validation/KTJSONReader.cc b/Executables/Validation/KTJSONReader.cc
similarity index 100%
rename from Executables_v1/Validation/KTJSONReader.cc
rename to Executables/Validation/KTJSONReader.cc
diff --git a/Executables_v1/Validation/KTJSONReader.hh b/Executables/Validation/KTJSONReader.hh
similarity index 100%
rename from Executables_v1/Validation/KTJSONReader.hh
rename to Executables/Validation/KTJSONReader.hh
diff --git a/Executables_v1/Validation/KTJSONTypeWriterValidation.cc b/Executables/Validation/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from Executables_v1/Validation/KTJSONTypeWriterValidation.cc
rename to Executables/Validation/KTJSONTypeWriterValidation.cc
diff --git a/Executables_v1/Validation/KTJSONTypeWriterValidation.hh b/Executables/Validation/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from Executables_v1/Validation/KTJSONTypeWriterValidation.hh
rename to Executables/Validation/KTJSONTypeWriterValidation.hh
diff --git a/Executables_v1/Validation/KTPyTestClass.cc b/Executables/Validation/KTPyTestClass.cc
similarity index 100%
rename from Executables_v1/Validation/KTPyTestClass.cc
rename to Executables/Validation/KTPyTestClass.cc
diff --git a/Executables_v1/Validation/KTPyTestClass.hh b/Executables/Validation/KTPyTestClass.hh
similarity index 100%
rename from Executables_v1/Validation/KTPyTestClass.hh
rename to Executables/Validation/KTPyTestClass.hh
diff --git a/Executables_v1/Validation/KTPyTestClassPybind.hh b/Executables/Validation/KTPyTestClassPybind.hh
similarity index 100%
rename from Executables_v1/Validation/KTPyTestClassPybind.hh
rename to Executables/Validation/KTPyTestClassPybind.hh
diff --git a/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh b/Executables/Validation/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
rename to Executables/Validation/KTRegisterNymphValidationExtData.hh
diff --git a/Executables_v1/Validation/KTTestConfigurable.cc b/Executables/Validation/KTTestConfigurable.cc
similarity index 100%
rename from Executables_v1/Validation/KTTestConfigurable.cc
rename to Executables/Validation/KTTestConfigurable.cc
diff --git a/Executables_v1/Validation/KTTestConfigurable.hh b/Executables/Validation/KTTestConfigurable.hh
similarity index 100%
rename from Executables_v1/Validation/KTTestConfigurable.hh
rename to Executables/Validation/KTTestConfigurable.hh
diff --git a/Executables_v1/Validation/KTTestCuts.cc b/Executables/Validation/KTTestCuts.cc
similarity index 100%
rename from Executables_v1/Validation/KTTestCuts.cc
rename to Executables/Validation/KTTestCuts.cc
diff --git a/Executables_v1/Validation/KTTestCuts.hh b/Executables/Validation/KTTestCuts.hh
similarity index 100%
rename from Executables_v1/Validation/KTTestCuts.hh
rename to Executables/Validation/KTTestCuts.hh
diff --git a/Executables_v1/Validation/KTTestData.cc b/Executables/Validation/KTTestData.cc
similarity index 100%
rename from Executables_v1/Validation/KTTestData.cc
rename to Executables/Validation/KTTestData.cc
diff --git a/Executables_v1/Validation/KTTestData.hh b/Executables/Validation/KTTestData.hh
similarity index 100%
rename from Executables_v1/Validation/KTTestData.hh
rename to Executables/Validation/KTTestData.hh
diff --git a/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc b/Executables/Validation/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
rename to Executables/Validation/KTTestDataPrimaryProcessor.cc
diff --git a/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh b/Executables/Validation/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
rename to Executables/Validation/KTTestDataPrimaryProcessor.hh
diff --git a/Executables_v1/Validation/KTTestPrimaryProcessor.cc b/Executables/Validation/KTTestPrimaryProcessor.cc
similarity index 100%
rename from Executables_v1/Validation/KTTestPrimaryProcessor.cc
rename to Executables/Validation/KTTestPrimaryProcessor.cc
diff --git a/Executables_v1/Validation/KTTestPrimaryProcessor.hh b/Executables/Validation/KTTestPrimaryProcessor.hh
similarity index 100%
rename from Executables_v1/Validation/KTTestPrimaryProcessor.hh
rename to Executables/Validation/KTTestPrimaryProcessor.hh
diff --git a/Executables_v1/Validation/KTTestProcessor.cc b/Executables/Validation/KTTestProcessor.cc
similarity index 100%
rename from Executables_v1/Validation/KTTestProcessor.cc
rename to Executables/Validation/KTTestProcessor.cc
diff --git a/Executables_v1/Validation/KTTestProcessor.hh b/Executables/Validation/KTTestProcessor.hh
similarity index 100%
rename from Executables_v1/Validation/KTTestProcessor.hh
rename to Executables/Validation/KTTestProcessor.hh
diff --git a/Executables_v1/Validation/NymphValidationPybind.cc b/Executables/Validation/NymphValidationPybind.cc
similarity index 100%
rename from Executables_v1/Validation/NymphValidationPybind.cc
rename to Executables/Validation/NymphValidationPybind.cc
diff --git a/Executables_v1/Validation/TestApplication.cc b/Executables/Validation/TestApplication.cc
similarity index 100%
rename from Executables_v1/Validation/TestApplication.cc
rename to Executables/Validation/TestApplication.cc
diff --git a/Executables_v1/Validation/TestApplyCut.cc b/Executables/Validation/TestApplyCut.cc
similarity index 100%
rename from Executables_v1/Validation/TestApplyCut.cc
rename to Executables/Validation/TestApplyCut.cc
diff --git a/Executables_v1/Validation/TestCacheDirectory.cc b/Executables/Validation/TestCacheDirectory.cc
similarity index 100%
rename from Executables_v1/Validation/TestCacheDirectory.cc
rename to Executables/Validation/TestCacheDirectory.cc
diff --git a/Executables_v1/Validation/TestCut.cc b/Executables/Validation/TestCut.cc
similarity index 100%
rename from Executables_v1/Validation/TestCut.cc
rename to Executables/Validation/TestCut.cc
diff --git a/Executables_v1/Validation/TestCutFilter.cc b/Executables/Validation/TestCutFilter.cc
similarity index 100%
rename from Executables_v1/Validation/TestCutFilter.cc
rename to Executables/Validation/TestCutFilter.cc
diff --git a/Executables_v1/Validation/TestData.cc b/Executables/Validation/TestData.cc
similarity index 100%
rename from Executables_v1/Validation/TestData.cc
rename to Executables/Validation/TestData.cc
diff --git a/Executables_v1/Validation/TestExceptionInSlot.cc b/Executables/Validation/TestExceptionInSlot.cc
similarity index 100%
rename from Executables_v1/Validation/TestExceptionInSlot.cc
rename to Executables/Validation/TestExceptionInSlot.cc
diff --git a/Executables_v1/Validation/TestExt.cc b/Executables/Validation/TestExt.cc
similarity index 100%
rename from Executables_v1/Validation/TestExt.cc
rename to Executables/Validation/TestExt.cc
diff --git a/Executables_v1/Validation/TestExtSerialization.cc b/Executables/Validation/TestExtSerialization.cc
similarity index 100%
rename from Executables_v1/Validation/TestExtSerialization.cc
rename to Executables/Validation/TestExtSerialization.cc
diff --git a/Executables_v1/Validation/TestJSONWriter.cc b/Executables/Validation/TestJSONWriter.cc
similarity index 100%
rename from Executables_v1/Validation/TestJSONWriter.cc
rename to Executables/Validation/TestJSONWriter.cc
diff --git a/Executables_v1/Validation/TestJSONWriterViaSlot.cc b/Executables/Validation/TestJSONWriterViaSlot.cc
similarity index 100%
rename from Executables_v1/Validation/TestJSONWriterViaSlot.cc
rename to Executables/Validation/TestJSONWriterViaSlot.cc
diff --git a/Executables_v1/Validation/TestLogger.cc b/Executables/Validation/TestLogger.cc
similarity index 100%
rename from Executables_v1/Validation/TestLogger.cc
rename to Executables/Validation/TestLogger.cc
diff --git a/Executables_v1/Validation/TestParamBindings.py b/Executables/Validation/TestParamBindings.py
similarity index 100%
rename from Executables_v1/Validation/TestParamBindings.py
rename to Executables/Validation/TestParamBindings.py
diff --git a/Executables_v1/Validation/TestPolymorphicSlotData.cc b/Executables/Validation/TestPolymorphicSlotData.cc
similarity index 100%
rename from Executables_v1/Validation/TestPolymorphicSlotData.cc
rename to Executables/Validation/TestPolymorphicSlotData.cc
diff --git a/Executables_v1/Validation/TestPrimaryProcessor.cc b/Executables/Validation/TestPrimaryProcessor.cc
similarity index 100%
rename from Executables_v1/Validation/TestPrimaryProcessor.cc
rename to Executables/Validation/TestPrimaryProcessor.cc
diff --git a/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc b/Executables/Validation/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
rename to Executables/Validation/TestPrimaryProcessorNoThreading.cc
diff --git a/Executables_v1/Validation/TestPrintData.cc b/Executables/Validation/TestPrintData.cc
similarity index 100%
rename from Executables_v1/Validation/TestPrintData.cc
rename to Executables/Validation/TestPrintData.cc
diff --git a/Executables_v1/Validation/TestProcessorToolbox.py b/Executables/Validation/TestProcessorToolbox.py
similarity index 100%
rename from Executables_v1/Validation/TestProcessorToolbox.py
rename to Executables/Validation/TestProcessorToolbox.py
diff --git a/Executables_v1/Validation/TestProcessorToolbox2Threads.cc b/Executables/Validation/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from Executables_v1/Validation/TestProcessorToolbox2Threads.cc
rename to Executables/Validation/TestProcessorToolbox2Threads.cc
diff --git a/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc b/Executables/Validation/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
rename to Executables/Validation/TestProcessorToolboxMultithreaded.cc
diff --git a/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc b/Executables/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
rename to Executables/Validation/TestProcessorToolboxSinglethreaded.cc
diff --git a/Executables_v1/Validation/TestPyTestClass.py b/Executables/Validation/TestPyTestClass.py
similarity index 100%
rename from Executables_v1/Validation/TestPyTestClass.py
rename to Executables/Validation/TestPyTestClass.py
diff --git a/Executables_v1/Validation/TestPythonBasics.hh b/Executables/Validation/TestPythonBasics.hh
similarity index 100%
rename from Executables_v1/Validation/TestPythonBasics.hh
rename to Executables/Validation/TestPythonBasics.hh
diff --git a/Executables_v1/Validation/TestPythonBasics.py b/Executables/Validation/TestPythonBasics.py
similarity index 100%
rename from Executables_v1/Validation/TestPythonBasics.py
rename to Executables/Validation/TestPythonBasics.py
diff --git a/Executables_v1/Validation/TestSerialization.cc b/Executables/Validation/TestSerialization.cc
similarity index 100%
rename from Executables_v1/Validation/TestSerialization.cc
rename to Executables/Validation/TestSerialization.cc
diff --git a/Executables_v1/Validation/TestSignalsAndSlots.cc b/Executables/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from Executables_v1/Validation/TestSignalsAndSlots.cc
rename to Executables/Validation/TestSignalsAndSlots.cc
diff --git a/Executables_v1/Validation/TestSlotData.cc b/Executables/Validation/TestSlotData.cc
similarity index 100%
rename from Executables_v1/Validation/TestSlotData.cc
rename to Executables/Validation/TestSlotData.cc
diff --git a/Executables_v1/Validation/TestThroughputProfiler.cc b/Executables/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from Executables_v1/Validation/TestThroughputProfiler.cc
rename to Executables/Validation/TestThroughputProfiler.cc
diff --git a/Executables_v1/Validation/TestUseBreakpoint.cc b/Executables/Validation/TestUseBreakpoint.cc
similarity index 100%
rename from Executables_v1/Validation/TestUseBreakpoint.cc
rename to Executables/Validation/TestUseBreakpoint.cc
diff --git a/Executables_v1/Validation/TestWrapProcessor.py b/Executables/Validation/TestWrapProcessor.py
similarity index 100%
rename from Executables_v1/Validation/TestWrapProcessor.py
rename to Executables/Validation/TestWrapProcessor.py

From dd972c1f6c69132aaf637a73a32562070da81b72 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 12:21:41 -0800
Subject: [PATCH 277/521] Working on adding a test of the return at a
 breakpoint.  Still needs debugging

---
 Library/Control/ControlAccess.hh |  5 +++--
 Library/Control/Controller.cc    |  2 ++
 Library/Control/Controller.hh    | 14 ++++++++++++++
 Testing/TestSignalSlot.cc        | 14 ++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Library/Control/ControlAccess.hh b/Library/Control/ControlAccess.hh
index ce3c4e7..e93db61 100644
--- a/Library/Control/ControlAccess.hh
+++ b/Library/Control/ControlAccess.hh
@@ -51,8 +51,8 @@ namespace Nymph
             void Break();
 
             /// Initiate a break with a return
-            template< typename... Args >
-            void BreakAndReturn( Args&... args );
+            template< typename... XArgs >
+            void BreakAndReturn( XArgs&... args );
 
             /// Reports whether control is at a breakpoint
             bool IsAtBreak() const;
@@ -67,6 +67,7 @@ namespace Nymph
     template< class... XArgs >
     void ControlAccess::BreakAndReturn( XArgs&... args )
     {
+        std::cerr << "#### ControlAccess::BreakAndReturn()" << std::endl;
         if( fControl ) fControl->BreakAndReturn( args... );
         else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
diff --git a/Library/Control/Controller.cc b/Library/Control/Controller.cc
index eac672c..1f4bda0 100644
--- a/Library/Control/Controller.cc
+++ b/Library/Control/Controller.cc
@@ -80,6 +80,8 @@ namespace Nymph
         std::unique_lock< std::mutex > lock( fMutex );
         LDEBUG( contlog, "RESUME called" );
         fBreakFlag = false;
+        std::unique_lock< std::mutex > retLock( fReturnMutex );
+        fReturnBuffer.reset();
         fCondVarContinue.notify_all();
         return;
     }
diff --git a/Library/Control/Controller.hh b/Library/Control/Controller.hh
index eed951a..60cec8b 100644
--- a/Library/Control/Controller.hh
+++ b/Library/Control/Controller.hh
@@ -17,6 +17,8 @@
 #include <condition_variable>
 #include <mutex>
 
+#include <iostream>
+
 namespace Nymph
 {
 
@@ -85,6 +87,10 @@ namespace Nymph
             void do_cancellation( int code );
 
         public:
+            /// Checks whether the return buffer has been filled
+            bool HasReturn() const;
+
+            /// Get the return buffer
             template< typename... XArgs >
             std::tuple< XArgs&... >& GetReturn();
 
@@ -94,11 +100,19 @@ namespace Nymph
 
     };
 
+    inline bool Controller::HasReturn() const
+    {
+        return fReturnBuffer.operator bool();
+    }
+
     template< typename... XArgs >
     void Controller::BreakAndReturn( XArgs&... args )
     {
+        std::cerr << "#### Controller::BreakAndReturn()" << std::endl;
         this->Break();
+        std::cerr << "#### Controller::BreakAndReturn() break initiated" << std::endl;
         fReturnBuffer.reset( new ReturnBuffer( args... ) );
+        std::cerr << "#### Controller::BreakAndReturn() return set" << std::endl;
         return;
     }
 
diff --git a/Testing/TestSignalSlot.cc b/Testing/TestSignalSlot.cc
index 92e17d7..b795d9e 100644
--- a/Testing/TestSignalSlot.cc
+++ b/Testing/TestSignalSlot.cc
@@ -78,6 +78,20 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
             controller.Cancel();
         } );
         REQUIRE_THROWS_AS( signal.Emit( 3 ), QuitChain );
+        controller.reset_cancel();
+
+        // test return from break
+        std::cerr << "#### TestSignalSlot starting return test" << std::endl;
+        asyncReturn = std::async( std::launch::async, [&controller](){
+            controller.WaitForBreakOrCanceled();
+            REQUIRE( controller.HasReturn() );
+            auto theReturn = controller.GetReturn< int >();
+            REQUIRE( std::get<0>( theReturn ) == 4 );
+            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+            controller.Cancel();
+        } );
+        REQUIRE_NOTHROW( signal.Emit( 4 ) );
+        controller.WaitForEndOfRun();
 
     }
 

From 6870c619415046f1f6b5bc08ddd30550715bfb51 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 12:23:44 -0800
Subject: [PATCH 278/521] Check that the controller is configured correctly

---
 Testing/TestController.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Testing/TestController.cc b/Testing/TestController.cc
index b9b152d..3b9f61b 100644
--- a/Testing/TestController.cc
+++ b/Testing/TestController.cc
@@ -78,6 +78,7 @@ TEST_CASE( "controller", "[control]" )
         auto config = translator.read_string( config_str, "yaml" );
 
         REQUIRE_NOTHROW( control.Configure( config->as_node() ) );
+        REQUIRE( control.GetCycleTimeMS() == 10 );
     }
 
     SECTION( "WaitToContinue" )

From 0ffc35bfbe2c12ccc1a02410b21e03d652b5a66d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 13:43:28 -0800
Subject: [PATCH 279/521] Fixing the controller test configuration

---
 Testing/TestController.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Testing/TestController.cc b/Testing/TestController.cc
index 3b9f61b..9888c32 100644
--- a/Testing/TestController.cc
+++ b/Testing/TestController.cc
@@ -71,8 +71,8 @@ TEST_CASE( "controller", "[control]" )
     SECTION( "Configure" )
     {
         std::string config_str(
-            "controller:\n"
-            "  cycle-time-ms: 10\n"        );
+            "cycle-time-ms: 10\n"
+        );
 
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );

From 6ac47a1bb01f785b98970a57968f82f087a9ff62 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 21:55:09 +0000
Subject: [PATCH 280/521] Removed unused directory

---
 Testing/cpp/Catch/catch.hpp         | 17966 --------------------------
 Testing/cpp/TestControlAccess.cc    |    65 -
 Testing/cpp/TestData.cc             |    28 -
 Testing/cpp/TestDataClasses.hh      |    54 -
 Testing/cpp/TestDataFrame.cc        |    72 -
 Testing/cpp/TestException.cc        |   210 -
 Testing/cpp/TestPrimaryProcessor.cc |    55 -
 Testing/cpp/TestProcessor.cc        |   152 -
 Testing/cpp/TestProcessorClasses.hh |   175 -
 Testing/cpp/TestProcessorToolbox.cc |   231 -
 Testing/cpp/TestSignalSlot.cc       |    72 -
 Testing/cpp/UseCatch.cc             |    10 -
 12 files changed, 19090 deletions(-)
 delete mode 100644 Testing/cpp/Catch/catch.hpp
 delete mode 100644 Testing/cpp/TestControlAccess.cc
 delete mode 100644 Testing/cpp/TestData.cc
 delete mode 100644 Testing/cpp/TestDataClasses.hh
 delete mode 100644 Testing/cpp/TestDataFrame.cc
 delete mode 100644 Testing/cpp/TestException.cc
 delete mode 100644 Testing/cpp/TestPrimaryProcessor.cc
 delete mode 100644 Testing/cpp/TestProcessor.cc
 delete mode 100644 Testing/cpp/TestProcessorClasses.hh
 delete mode 100644 Testing/cpp/TestProcessorToolbox.cc
 delete mode 100644 Testing/cpp/TestSignalSlot.cc
 delete mode 100644 Testing/cpp/UseCatch.cc

diff --git a/Testing/cpp/Catch/catch.hpp b/Testing/cpp/Catch/catch.hpp
deleted file mode 100644
index db1fed3..0000000
--- a/Testing/cpp/Catch/catch.hpp
+++ /dev/null
@@ -1,17966 +0,0 @@
-/*
- *  Catch v2.13.8
- *  Generated: 2022-01-03 21:20:09.589503
- *  ----------------------------------------------------------
- *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-// start catch.hpp
-
-
-#define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 8
-
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-// start catch_suppress_warnings.h
-
-#ifdef __clang__
-#   ifdef __ICC // icpc defines the __clang__ macro
-#       pragma warning(push)
-#       pragma warning(disable: 161 1682)
-#   else // __ICC
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wpadded"
-#       pragma clang diagnostic ignored "-Wswitch-enum"
-#       pragma clang diagnostic ignored "-Wcovered-switch-default"
-#    endif
-#elif defined __GNUC__
-     // Because REQUIREs trigger GCC's -Wparentheses, and because still
-     // supported version of g++ have only buggy support for _Pragmas,
-     // Wparentheses have to be suppressed globally.
-#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
-
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-variable"
-#    pragma GCC diagnostic ignored "-Wpadded"
-#endif
-// end catch_suppress_warnings.h
-#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
-#  define CATCH_IMPL
-#  define CATCH_CONFIG_ALL_PARTS
-#endif
-
-// In the impl file, we want to have access to all parts of the headers
-// Can also be used to sanely support PCHs
-#if defined(CATCH_CONFIG_ALL_PARTS)
-#  define CATCH_CONFIG_EXTERNAL_INTERFACES
-#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#    undef CATCH_CONFIG_DISABLE_MATCHERS
-#  endif
-#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  endif
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-// start catch_platform.h
-
-// See e.g.:
-// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
-#ifdef __APPLE__
-#  include <TargetConditionals.h>
-#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
-      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
-#    define CATCH_PLATFORM_MAC
-#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
-#    define CATCH_PLATFORM_IPHONE
-#  endif
-
-#elif defined(linux) || defined(__linux) || defined(__linux__)
-#  define CATCH_PLATFORM_LINUX
-
-#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
-#  define CATCH_PLATFORM_WINDOWS
-#endif
-
-// end catch_platform.h
-
-#ifdef CATCH_IMPL
-#  ifndef CLARA_CONFIG_MAIN
-#    define CLARA_CONFIG_MAIN_NOT_DEFINED
-#    define CLARA_CONFIG_MAIN
-#  endif
-#endif
-
-// start catch_user_interfaces.h
-
-namespace Catch {
-    unsigned int rngSeed();
-}
-
-// end catch_user_interfaces.h
-// start catch_tag_alias_autoregistrar.h
-
-// start catch_common.h
-
-// start catch_compiler_capabilities.h
-
-// Detect a number of compiler features - by compiler
-// The following features are defined:
-//
-// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
-// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
-// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
-// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
-// ****************
-// Note to maintainers: if new toggles are added please document them
-// in configuration.md, too
-// ****************
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-#ifdef __cplusplus
-
-#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
-#    define CATCH_CPP14_OR_GREATER
-#  endif
-
-#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#    define CATCH_CPP17_OR_GREATER
-#  endif
-
-#endif
-
-// Only GCC compiler should be used in this block, so other compilers trying to
-// mask themselves as GCC should be ignored.
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__)
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
-
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
-
-#endif
-
-#if defined(__clang__)
-
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
-
-// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
-// which results in calls to destructors being emitted for each temporary,
-// without a matching initialization. In practice, this can result in something
-// like `std::string::~string` being called on an uninitialized value.
-//
-// For example, this code will likely segfault under IBM XL:
-// ```
-// REQUIRE(std::string("12") + "34" == "1234")
-// ```
-//
-// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
-#  if !defined(__ibmxl__) && !defined(__CUDACC__)
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
-#  endif
-
-#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
-         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
-
-#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// Assume that non-Windows platforms support posix signals by default
-#if !defined(CATCH_PLATFORM_WINDOWS)
-    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// We know some environments not to support full POSIX signals
-#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
-    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#endif
-
-#ifdef __OS400__
-#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#       define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Android somehow still does not support std::to_string
-#if defined(__ANDROID__)
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Not all Windows environments support SEH properly
-#if defined(__MINGW32__)
-#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// PS4
-#if defined(__ORBIS__)
-#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
-
-// Required for some versions of Cygwin to declare gettimeofday
-// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
-#   define _BSD_SOURCE
-// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
-// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
-# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
-
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-
-# endif
-#endif // __CYGWIN__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#if defined(_MSC_VER)
-
-// Universal Windows platform does not support SEH
-// Or console colours (or console at all...)
-#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#    define CATCH_CONFIG_COLOUR_NONE
-#  else
-#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
-#  endif
-
-#  if !defined(__clang__) // Handle Clang masquerading for msvc
-
-// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
-// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
-// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
-#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
-#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#    endif // MSVC_TRADITIONAL
-
-// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
-#  endif // __clang__
-
-#endif // _MSC_VER
-
-#if defined(_REENTRANT) || defined(_MSC_VER)
-// Enable async processing, as -pthread is specified or no additional linking is required
-# define CATCH_INTERNAL_CONFIG_USE_ASYNC
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-// Check if we are compiled with -fno-exceptions or equivalent
-#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
-#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// DJGPP
-#ifdef __DJGPP__
-#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
-#endif // __DJGPP__
-
-////////////////////////////////////////////////////////////////////////////////
-// Embarcadero C++Build
-#if defined(__BORLANDC__)
-    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Use of __COUNTER__ is suppressed during code analysis in
-// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
-// handled by it.
-// Otherwise all supported compilers support COUNTER macro,
-// but user still might want to turn it off
-#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
-    #define CATCH_INTERNAL_CONFIG_COUNTER
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// RTX is a special version of Windows that is real time.
-// This means that it is detected as Windows, but does not provide
-// the same set of capabilities as real Windows does.
-#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
-    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
-    #define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
-#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Various stdlib support checks that require __has_include
-#if defined(__has_include)
-  // Check if string_view is available and usable
-  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
-  #endif
-
-  // Check if optional is available and usable
-  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
-  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if byte is available and usable
-  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-  #    include <cstddef>
-  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
-  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
-  #    endif
-  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if variant is available and usable
-  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-  #    if defined(__clang__) && (__clang_major__ < 8)
-         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
-         // fix should be in clang 8, workaround in libstdc++ 8.2
-  #      include <ciso646>
-  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #        define CATCH_CONFIG_NO_CPP17_VARIANT
-  #      else
-  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #    else
-  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #    endif // defined(__clang__) && (__clang_major__ < 8)
-  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-#endif // defined(__has_include)
-
-#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
-#   define CATCH_CONFIG_COUNTER
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
-#   define CATCH_CONFIG_WINDOWS_SEH
-#endif
-// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
-#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
-#   define CATCH_CONFIG_POSIX_SIGNALS
-#endif
-// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
-#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
-#   define CATCH_CONFIG_WCHAR
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
-#    define CATCH_CONFIG_CPP11_TO_STRING
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#  define CATCH_CONFIG_CPP17_OPTIONAL
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
-#  define CATCH_CONFIG_CPP17_STRING_VIEW
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
-#  define CATCH_CONFIG_CPP17_VARIANT
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
-#  define CATCH_CONFIG_CPP17_BYTE
-#endif
-
-#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
-#  define CATCH_CONFIG_NEW_CAPTURE
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-#  define CATCH_CONFIG_POLYFILL_ISNAN
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
-#  define CATCH_CONFIG_USE_ASYNC
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#  define CATCH_CONFIG_ANDROID_LOGWRITE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Even if we do not think the compiler has that warning, we still have
-// to provide a macro that can be used by the code.
-#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
-#endif
-
-// The goal of this macro is to avoid evaluation of the arguments, but
-// still have the compiler warn on problems inside...
-#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
-#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
-#endif
-
-#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#elif defined(__clang__) && (__clang_major__ < 5)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#define CATCH_TRY if ((true))
-#define CATCH_CATCH_ALL if ((false))
-#define CATCH_CATCH_ANON(type) if ((false))
-#else
-#define CATCH_TRY try
-#define CATCH_CATCH_ALL catch (...)
-#define CATCH_CATCH_ANON(type) catch (type)
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
-#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#endif
-
-// end catch_compiler_capabilities.h
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
-
-#include <iosfwd>
-#include <string>
-#include <cstdint>
-
-// We need a dummy global operator<< so we can bring it into Catch namespace later
-struct Catch_global_namespace_dummy {};
-std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
-
-namespace Catch {
-
-    struct CaseSensitive { enum Choice {
-        Yes,
-        No
-    }; };
-
-    class NonCopyable {
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-
-    protected:
-        NonCopyable();
-        virtual ~NonCopyable();
-    };
-
-    struct SourceLineInfo {
-
-        SourceLineInfo() = delete;
-        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
-        :   file( _file ),
-            line( _line )
-        {}
-
-        SourceLineInfo( SourceLineInfo const& other )            = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
-        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
-        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
-
-        bool empty() const noexcept { return file[0] == '\0'; }
-        bool operator == ( SourceLineInfo const& other ) const noexcept;
-        bool operator < ( SourceLineInfo const& other ) const noexcept;
-
-        char const* file;
-        std::size_t line;
-    };
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-
-    // Bring in operator<< from global namespace into Catch namespace
-    // This is necessary because the overload of operator<< above makes
-    // lookup stop at namespace Catch
-    using ::operator<<;
-
-    // Use this in variadic streaming macros to allow
-    //    >> +StreamEndStop
-    // as well as
-    //    >> stuff +StreamEndStop
-    struct StreamEndStop {
-        std::string operator+() const;
-    };
-    template<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-
-// end catch_common.h
-namespace Catch {
-
-    struct RegistrarForTagAliases {
-        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-    };
-
-} // end namespace Catch
-
-#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_tag_alias_autoregistrar.h
-// start catch_test_registry.h
-
-// start catch_interfaces_testcase.h
-
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestInvoker {
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-// end catch_interfaces_testcase.h
-// start catch_stringref.h
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-namespace Catch {
-
-    /// A non-owning string class (similar to the forthcoming std::string_view)
-    /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated.
-    class StringRef {
-    public:
-        using size_type = std::size_t;
-        using const_iterator = const char*;
-
-    private:
-        static constexpr char const* const s_empty = "";
-
-        char const* m_start = s_empty;
-        size_type m_size = 0;
-
-    public: // construction
-        constexpr StringRef() noexcept = default;
-
-        StringRef( char const* rawChars ) noexcept;
-
-        constexpr StringRef( char const* rawChars, size_type size ) noexcept
-        :   m_start( rawChars ),
-            m_size( size )
-        {}
-
-        StringRef( std::string const& stdString ) noexcept
-        :   m_start( stdString.c_str() ),
-            m_size( stdString.size() )
-        {}
-
-        explicit operator std::string() const {
-            return std::string(m_start, m_size);
-        }
-
-    public: // operators
-        auto operator == ( StringRef const& other ) const noexcept -> bool;
-        auto operator != (StringRef const& other) const noexcept -> bool {
-            return !(*this == other);
-        }
-
-        auto operator[] ( size_type index ) const noexcept -> char {
-            assert(index < m_size);
-            return m_start[index];
-        }
-
-    public: // named queries
-        constexpr auto empty() const noexcept -> bool {
-            return m_size == 0;
-        }
-        constexpr auto size() const noexcept -> size_type {
-            return m_size;
-        }
-
-        // Returns the current start pointer. If the StringRef is not
-        // null-terminated, throws std::domain_exception
-        auto c_str() const -> char const*;
-
-    public: // substrings and searches
-        // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, size()).
-        // If start > size(), then the substring is empty.
-        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
-
-        // Returns the current start pointer. May not be null-terminated.
-        auto data() const noexcept -> char const*;
-
-        constexpr auto isNullTerminated() const noexcept -> bool {
-            return m_start[m_size] == '\0';
-        }
-
-    public: // iterators
-        constexpr const_iterator begin() const { return m_start; }
-        constexpr const_iterator end() const { return m_start + m_size; }
-    };
-
-    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
-    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
-
-    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
-        return StringRef( rawChars, size );
-    }
-} // namespace Catch
-
-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
-    return Catch::StringRef( rawChars, size );
-}
-
-// end catch_stringref.h
-// start catch_preprocessor.hpp
-
-
-#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
-#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
-
-#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
-// MSVC needs more evaluations
-#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
-#else
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
-#endif
-
-#define CATCH_REC_END(...)
-#define CATCH_REC_OUT
-
-#define CATCH_EMPTY()
-#define CATCH_DEFER(id) id CATCH_EMPTY()
-
-#define CATCH_REC_GET_END2() 0, CATCH_REC_END
-#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
-#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
-#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
-#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
-#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
-
-#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-
-#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-
-// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
-// and passes userdata as the first parameter to each invocation,
-// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
-#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
-#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
-#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
-#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
-#else
-// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
-#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
-#endif
-
-#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
-#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
-
-#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
-#else
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
-#endif
-
-#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
-    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
-
-#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
-#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
-#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
-#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
-#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
-#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
-#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
-#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
-#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
-#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
-#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
-
-#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
-
-#define INTERNAL_CATCH_TYPE_GEN\
-    template<typename...> struct TypeList {};\
-    template<typename...Ts>\
-    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
-    template<template<typename...> class...> struct TemplateTypeList{};\
-    template<template<typename...> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
-    template<typename...>\
-    struct append;\
-    template<typename...>\
-    struct rewrap;\
-    template<template<typename...> class, typename...>\
-    struct create;\
-    template<template<typename...> class, typename>\
-    struct convert;\
-    \
-    template<typename T> \
-    struct append<T> { using type = T; };\
-    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
-    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
-    template< template<typename...> class L1, typename...E1, typename...Rest>\
-    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
-    \
-    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
-    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
-    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
-    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
-    \
-    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
-    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
-    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
-    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
-
-#define INTERNAL_CATCH_NTTP_1(signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
-    \
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
-    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
-    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
-    template<typename TestType> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
-    template<typename TestType> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_NTTP_0
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
-#else
-#define INTERNAL_CATCH_NTTP_0(signature)
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
-#endif
-
-// end catch_preprocessor.hpp
-// start catch_meta.hpp
-
-
-#include <type_traits>
-
-namespace Catch {
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template <typename> struct true_given : std::true_type {};
-    struct is_callable_tester {
-        template <typename Fun, typename... Args>
-        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
-        template <typename...>
-        std::false_type static test(...);
-    };
-
-    template <typename T>
-    struct is_callable;
-
-    template <typename Fun, typename... Args>
-    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
-
-#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
-    // replaced with std::invoke_result here.
-    template <typename Func, typename... U>
-    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
-#else
-    // Keep ::type here because we still support C++11
-    template <typename Func, typename... U>
-    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
-#endif
-
-} // namespace Catch
-
-namespace mpl_{
-    struct na;
-}
-
-// end catch_meta.hpp
-namespace Catch {
-
-template<typename C>
-class TestInvokerAsMethod : public ITestInvoker {
-    void (C::*m_testAsMethod)();
-public:
-    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
-
-    void invoke() const override {
-        C obj;
-        (obj.*m_testAsMethod)();
-    }
-};
-
-auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
-
-template<typename C>
-auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
-    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
-}
-
-struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
-    StringRef name;
-    StringRef tags;
-};
-
-struct AutoReg : NonCopyable {
-    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
-};
-
-} // end namespace Catch
-
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
-        namespace{                        \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test();              \
-            };                            \
-        }                                 \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
-        namespace{                                                                                  \
-            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        }                                                                                           \
-        }                                                                                           \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        } \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestName{\
-                TestName(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-            return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
-        template<typename TestType> static void TestFuncName();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
-            INTERNAL_CATCH_TYPE_GEN                                                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
-            template<typename... Types>                               \
-            struct TestName {                                         \
-                void reg_tests() {                                          \
-                    int index = 0;                                    \
-                    using expander = int[];                           \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
-                }                                                     \
-            };                                                        \
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }                                                             \
-        }                                                             \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFuncName()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> static void TestFunc();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-        INTERNAL_CATCH_TYPE_GEN\
-        template<typename... Types>                               \
-        struct TestName {                                         \
-            void reg_tests() {                                          \
-                int index = 0;                                    \
-                using expander = int[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
-            }                                                     \
-        };\
-        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename convert<TestName, TmplList>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFunc()
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
-
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestNameClass{\
-                TestNameClass(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-                return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-                void test();\
-            };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
-            INTERNAL_CATCH_TYPE_GEN                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-            void test();\
-        };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename convert<TestNameClass, TmplList>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
-
-// end catch_test_registry.h
-// start catch_capture.hpp
-
-// start catch_assertionhandler.h
-
-// start catch_assertioninfo.h
-
-// start catch_result_type.h
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    bool isOk( ResultWas::OfType resultType );
-    bool isJustInfo( int flags );
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
-
-    bool shouldContinueOnFailure( int flags );
-    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    bool shouldSuppressFailure( int flags );
-
-} // end namespace Catch
-
-// end catch_result_type.h
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
-    };
-
-} // end namespace Catch
-
-// end catch_assertioninfo.h
-// start catch_decomposer.h
-
-// start catch_tostring.h
-
-#include <vector>
-#include <cstddef>
-#include <type_traits>
-#include <string>
-// start catch_stream.h
-
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-    std::ostream& clog();
-
-    class StringRef;
-
-    struct IStream {
-        virtual ~IStream();
-        virtual std::ostream& stream() const = 0;
-    };
-
-    auto makeStream( StringRef const &filename ) -> IStream const*;
-
-    class ReusableStringStream : NonCopyable {
-        std::size_t m_index;
-        std::ostream* m_oss;
-    public:
-        ReusableStringStream();
-        ~ReusableStringStream();
-
-        auto str() const -> std::string;
-
-        template<typename T>
-        auto operator << ( T const& value ) -> ReusableStringStream& {
-            *m_oss << value;
-            return *this;
-        }
-        auto get() -> std::ostream& { return *m_oss; }
-    };
-}
-
-// end catch_stream.h
-// start catch_interfaces_enum_values_registry.h
-
-#include <vector>
-
-namespace Catch {
-
-    namespace Detail {
-        struct EnumInfo {
-            StringRef m_name;
-            std::vector<std::pair<int, StringRef>> m_values;
-
-            ~EnumInfo();
-
-            StringRef lookup( int value ) const;
-        };
-    } // namespace Detail
-
-    struct IMutableEnumValuesRegistry {
-        virtual ~IMutableEnumValuesRegistry();
-
-        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
-
-        template<typename E>
-        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
-            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
-            std::vector<int> intValues;
-            intValues.reserve( values.size() );
-            for( auto enumValue : values )
-                intValues.push_back( static_cast<int>( enumValue ) );
-            return registerEnum( enumName, allEnums, intValues );
-        }
-    };
-
-} // Catch
-
-// end catch_interfaces_enum_values_registry.h
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-#include <string_view>
-#endif
-
-#ifdef __OBJC__
-// start catch_objc_arc.hpp
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-// end catch_objc_arc.hpp
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
-#endif
-
-namespace Catch {
-    namespace Detail {
-
-        extern const std::string unprintableString;
-
-        std::string rawMemoryToString( const void *object, std::size_t size );
-
-        template<typename T>
-        std::string rawMemoryToString( const T& object ) {
-          return rawMemoryToString( &object, sizeof(object) );
-        }
-
-        template<typename T>
-        class IsStreamInsertable {
-            template<typename Stream, typename U>
-            static auto test(int)
-                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
-
-            template<typename, typename>
-            static auto test(...)->std::false_type;
-
-        public:
-            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
-        };
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e );
-
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
-        std::string>::type convertUnstreamable( T const& ) {
-            return Detail::unprintableString;
-        }
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
-         std::string>::type convertUnstreamable(T const& ex) {
-            return ex.what();
-        }
-
-        template<typename T>
-        typename std::enable_if<
-            std::is_enum<T>::value
-        , std::string>::type convertUnstreamable( T const& value ) {
-            return convertUnknownEnumToString( value );
-        }
-
-#if defined(_MANAGED)
-        //! Convert a CLR string to a utf8 std::string
-        template<typename T>
-        std::string clrReferenceToString( T^ ref ) {
-            if (ref == nullptr)
-                return std::string("null");
-            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
-            cli::pin_ptr<System::Byte> p = &bytes[0];
-            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
-        }
-#endif
-
-    } // namespace Detail
-
-    // If we decide for C++14, change these to enable_if_ts
-    template <typename T, typename = void>
-    struct StringMaker {
-        template <typename Fake = T>
-        static
-        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert(const Fake& value) {
-                ReusableStringStream rss;
-                // NB: call using the function-like syntax to avoid ambiguity with
-                // user-defined templated operator<< under clang.
-                rss.operator<<(value);
-                return rss.str();
-        }
-
-        template <typename Fake = T>
-        static
-        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert( const Fake& value ) {
-#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
-            return Detail::convertUnstreamable(value);
-#else
-            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
-#endif
-        }
-    };
-
-    namespace Detail {
-
-        // This function dispatches all stringification requests inside of Catch.
-        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
-        template <typename T>
-        std::string stringify(const T& e) {
-            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
-        }
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e ) {
-            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
-        }
-
-#if defined(_MANAGED)
-        template <typename T>
-        std::string stringify( T^ e ) {
-            return ::Catch::StringMaker<T^>::convert(e);
-        }
-#endif
-
-    } // namespace Detail
-
-    // Some predefined specializations
-
-    template<>
-    struct StringMaker<std::string> {
-        static std::string convert(const std::string& str);
-    };
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::string_view> {
-        static std::string convert(std::string_view str);
-    };
-#endif
-
-    template<>
-    struct StringMaker<char const *> {
-        static std::string convert(char const * str);
-    };
-    template<>
-    struct StringMaker<char *> {
-        static std::string convert(char * str);
-    };
-
-#ifdef CATCH_CONFIG_WCHAR
-    template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
-    };
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::wstring_view> {
-        static std::string convert(std::wstring_view str);
-    };
-# endif
-
-    template<>
-    struct StringMaker<wchar_t const *> {
-        static std::string convert(wchar_t const * str);
-    };
-    template<>
-    struct StringMaker<wchar_t *> {
-        static std::string convert(wchar_t * str);
-    };
-#endif
-
-    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
-    //      while keeping string semantics?
-    template<int SZ>
-    struct StringMaker<char[SZ]> {
-        static std::string convert(char const* str) {
-            return ::Catch::Detail::stringify(std::string{ str });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<signed char[SZ]> {
-        static std::string convert(signed char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<unsigned char[SZ]> {
-        static std::string convert(unsigned char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<std::byte> {
-        static std::string convert(std::byte value);
-    };
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<int> {
-        static std::string convert(int value);
-    };
-    template<>
-    struct StringMaker<long> {
-        static std::string convert(long value);
-    };
-    template<>
-    struct StringMaker<long long> {
-        static std::string convert(long long value);
-    };
-    template<>
-    struct StringMaker<unsigned int> {
-        static std::string convert(unsigned int value);
-    };
-    template<>
-    struct StringMaker<unsigned long> {
-        static std::string convert(unsigned long value);
-    };
-    template<>
-    struct StringMaker<unsigned long long> {
-        static std::string convert(unsigned long long value);
-    };
-
-    template<>
-    struct StringMaker<bool> {
-        static std::string convert(bool b);
-    };
-
-    template<>
-    struct StringMaker<char> {
-        static std::string convert(char c);
-    };
-    template<>
-    struct StringMaker<signed char> {
-        static std::string convert(signed char c);
-    };
-    template<>
-    struct StringMaker<unsigned char> {
-        static std::string convert(unsigned char c);
-    };
-
-    template<>
-    struct StringMaker<std::nullptr_t> {
-        static std::string convert(std::nullptr_t);
-    };
-
-    template<>
-    struct StringMaker<float> {
-        static std::string convert(float value);
-        static int precision;
-    };
-
-    template<>
-    struct StringMaker<double> {
-        static std::string convert(double value);
-        static int precision;
-    };
-
-    template <typename T>
-    struct StringMaker<T*> {
-        template <typename U>
-        static std::string convert(U* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-    template <typename R, typename C>
-    struct StringMaker<R C::*> {
-        static std::string convert(R C::* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-#if defined(_MANAGED)
-    template <typename T>
-    struct StringMaker<T^> {
-        static std::string convert( T^ ref ) {
-            return ::Catch::Detail::clrReferenceToString(ref);
-        }
-    };
-#endif
-
-    namespace Detail {
-        template<typename InputIterator, typename Sentinel = InputIterator>
-        std::string rangeToString(InputIterator first, Sentinel last) {
-            ReusableStringStream rss;
-            rss << "{ ";
-            if (first != last) {
-                rss << ::Catch::Detail::stringify(*first);
-                for (++first; first != last; ++first)
-                    rss << ", " << ::Catch::Detail::stringify(*first);
-            }
-            rss << " }";
-            return rss.str();
-        }
-    }
-
-#ifdef __OBJC__
-    template<>
-    struct StringMaker<NSString*> {
-        static std::string convert(NSString * nsstring) {
-            if (!nsstring)
-                return "nil";
-            return std::string("@") + [nsstring UTF8String];
-        }
-    };
-    template<>
-    struct StringMaker<NSObject*> {
-        static std::string convert(NSObject* nsObject) {
-            return ::Catch::Detail::stringify([nsObject description]);
-        }
-
-    };
-    namespace Detail {
-        inline std::string stringify( NSString* nsstring ) {
-            return StringMaker<NSString*>::convert( nsstring );
-        }
-
-    } // namespace Detail
-#endif // __OBJC__
-
-} // namespace Catch
-
-//////////////////////////////////////////////////////
-// Separate std-lib types stringification, so it can be selectively enabled
-// This means that we do not bring in
-
-#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
-#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#endif
-
-// Separate std::pair specialization
-#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
-#include <utility>
-namespace Catch {
-    template<typename T1, typename T2>
-    struct StringMaker<std::pair<T1, T2> > {
-        static std::string convert(const std::pair<T1, T2>& pair) {
-            ReusableStringStream rss;
-            rss << "{ "
-                << ::Catch::Detail::stringify(pair.first)
-                << ", "
-                << ::Catch::Detail::stringify(pair.second)
-                << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#include <optional>
-namespace Catch {
-    template<typename T>
-    struct StringMaker<std::optional<T> > {
-        static std::string convert(const std::optional<T>& optional) {
-            ReusableStringStream rss;
-            if (optional.has_value()) {
-                rss << ::Catch::Detail::stringify(*optional);
-            } else {
-                rss << "{ }";
-            }
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-
-// Separate std::tuple specialization
-#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
-#include <tuple>
-namespace Catch {
-    namespace Detail {
-        template<
-            typename Tuple,
-            std::size_t N = 0,
-            bool = (N < std::tuple_size<Tuple>::value)
-            >
-            struct TupleElementPrinter {
-            static void print(const Tuple& tuple, std::ostream& os) {
-                os << (N ? ", " : " ")
-                    << ::Catch::Detail::stringify(std::get<N>(tuple));
-                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
-            }
-        };
-
-        template<
-            typename Tuple,
-            std::size_t N
-        >
-            struct TupleElementPrinter<Tuple, N, false> {
-            static void print(const Tuple&, std::ostream&) {}
-        };
-
-    }
-
-    template<typename ...Types>
-    struct StringMaker<std::tuple<Types...>> {
-        static std::string convert(const std::tuple<Types...>& tuple) {
-            ReusableStringStream rss;
-            rss << '{';
-            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
-            rss << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
-#include <variant>
-namespace Catch {
-    template<>
-    struct StringMaker<std::monostate> {
-        static std::string convert(const std::monostate&) {
-            return "{ }";
-        }
-    };
-
-    template<typename... Elements>
-    struct StringMaker<std::variant<Elements...>> {
-        static std::string convert(const std::variant<Elements...>& variant) {
-            if (variant.valueless_by_exception()) {
-                return "{valueless variant}";
-            } else {
-                return std::visit(
-                    [](const auto& value) {
-                        return ::Catch::Detail::stringify(value);
-                    },
-                    variant
-                );
-            }
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-
-namespace Catch {
-    // Import begin/ end from std here
-    using std::begin;
-    using std::end;
-
-    namespace detail {
-        template <typename...>
-        struct void_type {
-            using type = void;
-        };
-
-        template <typename T, typename = void>
-        struct is_range_impl : std::false_type {
-        };
-
-        template <typename T>
-        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
-        };
-    } // namespace detail
-
-    template <typename T>
-    struct is_range : detail::is_range_impl<T> {
-    };
-
-#if defined(_MANAGED) // Managed types are never ranges
-    template <typename T>
-    struct is_range<T^> {
-        static const bool value = false;
-    };
-#endif
-
-    template<typename Range>
-    std::string rangeToString( Range const& range ) {
-        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
-    }
-
-    // Handle vector<bool> specially
-    template<typename Allocator>
-    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
-        ReusableStringStream rss;
-        rss << "{ ";
-        bool first = true;
-        for( bool b : v ) {
-            if( first )
-                first = false;
-            else
-                rss << ", ";
-            rss << ::Catch::Detail::stringify( b );
-        }
-        rss << " }";
-        return rss.str();
-    }
-
-    template<typename R>
-    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
-        static std::string convert( R const& range ) {
-            return rangeToString( range );
-        }
-    };
-
-    template <typename T, int SZ>
-    struct StringMaker<T[SZ]> {
-        static std::string convert(T const(&arr)[SZ]) {
-            return rangeToString(arr);
-        }
-    };
-
-} // namespace Catch
-
-// Separate std::chrono::duration specialization
-#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#include <ctime>
-#include <ratio>
-#include <chrono>
-
-namespace Catch {
-
-template <class Ratio>
-struct ratio_string {
-    static std::string symbol();
-};
-
-template <class Ratio>
-std::string ratio_string<Ratio>::symbol() {
-    Catch::ReusableStringStream rss;
-    rss << '[' << Ratio::num << '/'
-        << Ratio::den << ']';
-    return rss.str();
-}
-template <>
-struct ratio_string<std::atto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::femto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::pico> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::nano> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::micro> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::milli> {
-    static std::string symbol();
-};
-
-    ////////////
-    // std::chrono::duration specializations
-    template<typename Value, typename Ratio>
-    struct StringMaker<std::chrono::duration<Value, Ratio>> {
-        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " s";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " m";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " h";
-            return rss.str();
-        }
-    };
-
-    ////////////
-    // std::chrono::time_point specialization
-    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
-    template<typename Clock, typename Duration>
-    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
-        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
-            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
-        }
-    };
-    // std::chrono::time_point<system_clock> specialization
-    template<typename Duration>
-    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
-            auto converted = std::chrono::system_clock::to_time_t(time_point);
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &converted);
-#else
-            std::tm* timeInfo = std::gmtime(&converted);
-#endif
-
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-
-#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
-namespace Catch { \
-    template<> struct StringMaker<enumName> { \
-        static std::string convert( enumName value ) { \
-            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
-            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
-        } \
-    }; \
-}
-
-#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_tostring.h
-#include <iosfwd>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#pragma warning(disable:4018) // more "signed/unsigned mismatch"
-#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
-#pragma warning(disable:4180) // qualifier applied to function type has no meaning
-#pragma warning(disable:4800) // Forcing result to true or false
-#endif
-
-namespace Catch {
-
-    struct ITransientExpression {
-        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
-        auto getResult() const -> bool { return m_result; }
-        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
-
-        ITransientExpression( bool isBinaryExpression, bool result )
-        :   m_isBinaryExpression( isBinaryExpression ),
-            m_result( result )
-        {}
-
-        // We don't actually need a virtual destructor, but many static analysers
-        // complain if it's not here :-(
-        virtual ~ITransientExpression();
-
-        bool m_isBinaryExpression;
-        bool m_result;
-
-    };
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
-
-    template<typename LhsT, typename RhsT>
-    class BinaryExpr  : public ITransientExpression {
-        LhsT m_lhs;
-        StringRef m_op;
-        RhsT m_rhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            formatReconstructedExpression
-                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
-        }
-
-    public:
-        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
-        :   ITransientExpression{ true, comparisonResult },
-            m_lhs( lhs ),
-            m_op( op ),
-            m_rhs( rhs )
-        {}
-
-        template<typename T>
-        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-    };
-
-    template<typename LhsT>
-    class UnaryExpr : public ITransientExpression {
-        LhsT m_lhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            os << Catch::Detail::stringify( m_lhs );
-        }
-
-    public:
-        explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, static_cast<bool>(lhs) },
-            m_lhs( lhs )
-        {}
-    };
-
-    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
-    template<typename LhsT, typename RhsT>
-    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-    template<typename T>
-    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-
-    template<typename LhsT, typename RhsT>
-    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-    template<typename T>
-    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-
-    template<typename LhsT>
-    class ExprLhs {
-        LhsT m_lhs;
-    public:
-        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
-
-        template<typename RhsT>
-        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
-        }
-        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs == rhs, m_lhs, "==", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
-        }
-        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs != rhs, m_lhs, "!=", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
-        }
-        template<typename RhsT>
-        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
-        }
-        template<typename RhsT>
-        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
-        }
-        template<typename RhsT>
-        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
-        }
-        template <typename RhsT>
-        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
-        }
-        template <typename RhsT>
-        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
-        }
-        template <typename RhsT>
-        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator&& is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename RhsT>
-        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator|| is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
-            return UnaryExpr<LhsT>{ m_lhs };
-        }
-    };
-
-    void handleExpression( ITransientExpression const& expr );
-
-    template<typename T>
-    void handleExpression( ExprLhs<T> const& expr ) {
-        handleExpression( expr.makeUnaryExpr() );
-    }
-
-    struct Decomposer {
-        template<typename T>
-        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
-            return ExprLhs<T const&>{ lhs };
-        }
-
-        auto operator <=( bool value ) -> ExprLhs<bool> {
-            return ExprLhs<bool>{ value };
-        }
-    };
-
-} // end namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_decomposer.h
-// start catch_interfaces_capture.h
-
-#include <string>
-#include <chrono>
-
-namespace Catch {
-
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    struct MessageBuilder;
-    struct Counts;
-    struct AssertionReaction;
-    struct SourceLineInfo;
-
-    struct ITransientExpression;
-    struct IGeneratorTracker;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-
-        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& name ) = 0;
-        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
-        virtual void benchmarkFailed( std::string const& error ) = 0;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
-
-        virtual void handleFatalErrorCondition( StringRef message ) = 0;
-
-        virtual void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleIncomplete
-                (   AssertionInfo const& info ) = 0;
-        virtual void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) = 0;
-
-        virtual bool lastAssertionPassed() = 0;
-        virtual void assertionPassed() = 0;
-
-        // Deprecated, do not use:
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-        virtual void exceptionEarlyReported() = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// end catch_interfaces_capture.h
-namespace Catch {
-
-    struct TestFailureException{};
-    struct AssertionResultData;
-    struct IResultCapture;
-    class RunContext;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated );
-        LazyExpression( LazyExpression const& other );
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const;
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-    struct AssertionReaction {
-        bool shouldDebugBreak = false;
-        bool shouldThrow = false;
-    };
-
-    class AssertionHandler {
-        AssertionInfo m_assertionInfo;
-        AssertionReaction m_reaction;
-        bool m_completed = false;
-        IResultCapture& m_resultCapture;
-
-    public:
-        AssertionHandler
-            (   StringRef const& macroName,
-                SourceLineInfo const& lineInfo,
-                StringRef capturedExpression,
-                ResultDisposition::Flags resultDisposition );
-        ~AssertionHandler() {
-            if ( !m_completed ) {
-                m_resultCapture.handleIncomplete( m_assertionInfo );
-            }
-        }
-
-        template<typename T>
-        void handleExpr( ExprLhs<T> const& expr ) {
-            handleExpr( expr.makeUnaryExpr() );
-        }
-        void handleExpr( ITransientExpression const& expr );
-
-        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
-
-        void handleExceptionThrownAsExpected();
-        void handleUnexpectedExceptionNotThrown();
-        void handleExceptionNotThrownAsExpected();
-        void handleThrowingCallSkipped();
-        void handleUnexpectedInflightException();
-
-        void complete();
-        void setCompleted();
-
-        // query
-        auto allowThrows() const -> bool;
-    };
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
-
-} // namespace Catch
-
-// end catch_assertionhandler.h
-// start catch_message.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const;
-        bool operator < ( MessageInfo const& other ) const;
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageStream {
-
-        template<typename T>
-        MessageStream& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        ReusableStringStream m_stream;
-    };
-
-    struct MessageBuilder : MessageStream {
-        MessageBuilder( StringRef const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type );
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-    };
-
-    class ScopedMessage {
-    public:
-        explicit ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage& duplicate ) = delete;
-        ScopedMessage( ScopedMessage&& old );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-        bool m_moved;
-    };
-
-    class Capturer {
-        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
-        size_t m_captured = 0;
-    public:
-        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
-        ~Capturer();
-
-        void captureValue( size_t index, std::string const& value );
-
-        template<typename T>
-        void captureValues( size_t index, T const& value ) {
-            captureValue( index, Catch::Detail::stringify( value ) );
-        }
-
-        template<typename T, typename... Ts>
-        void captureValues( size_t index, T const& value, Ts const&... values ) {
-            captureValue( index, Catch::Detail::stringify(value) );
-            captureValues( index+1, values... );
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_message.h
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
-#endif
-
-#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-
-///////////////////////////////////////////////////////////////////////////////
-// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
-// macros.
-#define INTERNAL_CATCH_TRY
-#define INTERNAL_CATCH_CATCH( capturer )
-
-#else // CATCH_CONFIG_FAST_COMPILE
-
-#define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
-
-#endif
-
-#define INTERNAL_CATCH_REACT( handler ) handler.complete();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
-    do { \
-        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( !Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        try { \
-            static_cast<void>(__VA_ARGS__); \
-            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
-        } \
-        catch( ... ) { \
-            catchAssertionHandler.handleUnexpectedInflightException(); \
-        } \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(expr); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
-        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
-    varName.captureValues( 0, __VA_ARGS__ )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
-    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
-
-///////////////////////////////////////////////////////////////////////////////
-// Although this is matcher-based, it can be used with just a string
-#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_capture.hpp
-// start catch_section.h
-
-// start catch_section_info.h
-
-// start catch_totals.h
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
-
-        std::size_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
-
-        std::size_t passed = 0;
-        std::size_t failed = 0;
-        std::size_t failedButOk = 0;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
-
-        Totals delta( Totals const& prevTotals ) const;
-
-        int error = 0;
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-// end catch_totals.h
-#include <string>
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name );
-
-        // Deprecated
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
-
-        std::string name;
-        std::string description; // !Deprecated: this will always be empty
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// end catch_section_info.h
-// start catch_timer.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
-    auto getEstimatedClockResolution() -> uint64_t;
-
-    class Timer {
-        uint64_t m_nanoseconds = 0;
-    public:
-        void start();
-        auto getElapsedNanoseconds() const -> uint64_t;
-        auto getElapsedMicroseconds() const -> uint64_t;
-        auto getElapsedMilliseconds() const -> unsigned int;
-        auto getElapsedSeconds() const -> double;
-    };
-
-} // namespace Catch
-
-// end catch_timer.h
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        explicit operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_section.h
-// start catch_interfaces_exception.h
-
-// start catch_interfaces_registry_hub.h
-
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-    struct ITagAliasRegistry;
-    struct IMutableEnumValuesRegistry;
-
-    class StartupExceptionRegistry;
-
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-// end catch_interfaces_registry_hub.h
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
-        static std::string translatorName( signature )
-#endif
-
-#include <exception>
-#include <string>
-#include <vector>
-
-namespace Catch {
-    using exceptionTranslateFunction = std::string(*)();
-
-    struct IExceptionTranslator;
-    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                return "";
-#else
-                try {
-                    if( it == itEnd )
-                        std::rethrow_exception(std::current_exception());
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-#endif
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// end catch_interfaces_exception.h
-// start catch_approx.h
-
-#include <type_traits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    private:
-        bool equalityComparisonImpl(double other) const;
-        // Validates the new margin (margin >= 0)
-        // out-of-line to avoid including stdexcept in the header
-        void setMargin(double margin);
-        // Validates the new epsilon (0 < epsilon < 1)
-        // out-of-line to avoid including stdexcept in the header
-        void setEpsilon(double epsilon);
-
-    public:
-        explicit Approx ( double value );
-
-        static Approx custom();
-
-        Approx operator-() const;
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) const {
-            Approx approx( static_cast<double>(value) );
-            approx.m_epsilon = m_epsilon;
-            approx.m_margin = m_margin;
-            approx.m_scale = m_scale;
-            return approx;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        explicit Approx( T const& value ): Approx(static_cast<double>(value))
-        {}
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( const T& lhs, Approx const& rhs ) {
-            auto lhs_v = static_cast<double>(lhs);
-            return rhs.equalityComparisonImpl(lhs_v);
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( Approx const& lhs, const T& rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( T const& lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( Approx const& lhs, T const& rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& epsilon( T const& newEpsilon ) {
-            double epsilonAsDouble = static_cast<double>(newEpsilon);
-            setEpsilon(epsilonAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& margin( T const& newMargin ) {
-            double marginAsDouble = static_cast<double>(newMargin);
-            setMargin(marginAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& scale( T const& newScale ) {
-            m_scale = static_cast<double>(newScale);
-            return *this;
-        }
-
-        std::string toString() const;
-
-    private:
-        double m_epsilon;
-        double m_margin;
-        double m_scale;
-        double m_value;
-    };
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
-} // end namespace literals
-
-template<>
-struct StringMaker<Catch::Detail::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
-};
-
-} // end namespace Catch
-
-// end catch_approx.h
-// start catch_string_manip.h
-
-#include <string>
-#include <iosfwd>
-#include <vector>
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool startsWith( std::string const& s, char prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool endsWith( std::string const& s, char suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    //! Returns a new string without whitespace at the start/end
-    std::string trim( std::string const& str );
-    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
-    StringRef trim(StringRef ref);
-
-    // !!! Be aware, returns refs into original string - make sure original string outlives them
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-}
-
-// end catch_string_manip.h
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-// start catch_capture_matchers.h
-
-// start catch_matchers.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        template<typename ArgT> struct MatchAllOf;
-        template<typename ArgT> struct MatchAnyOf;
-        template<typename ArgT> struct MatchNotOf;
-
-        class MatcherUntypedBase {
-        public:
-            MatcherUntypedBase() = default;
-            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
-            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
-            std::string toString() const;
-
-        protected:
-            virtual ~MatcherUntypedBase();
-            virtual std::string describe() const = 0;
-            mutable std::string m_cachedToString;
-        };
-
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
-        template<typename ObjectT>
-        struct MatcherMethod {
-            virtual bool match( ObjectT const& arg ) const = 0;
-        };
-
-#if defined(__OBJC__)
-        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
-        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
-        template<>
-        struct MatcherMethod<NSString*> {
-            virtual bool match( NSString* arg ) const = 0;
-        };
-#endif
-
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
-
-        template<typename T>
-        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
-
-            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
-            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
-            MatchNotOf<T> operator ! () const;
-        };
-
-        template<typename ArgT>
-        struct MatchAllOf : MatcherBase<ArgT> {
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (!matcher->match(arg))
-                        return false;
-                }
-                return true;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " and ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-        template<typename ArgT>
-        struct MatchAnyOf : MatcherBase<ArgT> {
-
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (matcher->match(arg))
-                        return true;
-                }
-                return false;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " or ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-
-        template<typename ArgT>
-        struct MatchNotOf : MatcherBase<ArgT> {
-
-            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
-
-            bool match( ArgT const& arg ) const override {
-                return !m_underlyingMatcher.match( arg );
-            }
-
-            std::string describe() const override {
-                return "not " + m_underlyingMatcher.toString();
-            }
-            MatcherBase<ArgT> const& m_underlyingMatcher;
-        };
-
-        template<typename T>
-        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
-            return MatchAllOf<T>() && *this && other;
-        }
-        template<typename T>
-        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
-            return MatchAnyOf<T>() || *this || other;
-        }
-        template<typename T>
-        MatchNotOf<T> MatcherBase<T>::operator ! () const {
-            return MatchNotOf<T>( *this );
-        }
-
-    } // namespace Impl
-
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-
-// end catch_matchers.h
-// start catch_matchers_exception.hpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-class ExceptionMessageMatcher : public MatcherBase<std::exception> {
-    std::string m_message;
-public:
-
-    ExceptionMessageMatcher(std::string const& message):
-        m_message(message)
-    {}
-
-    bool match(std::exception const& ex) const override;
-
-    std::string describe() const override;
-};
-
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_exception.hpp
-// start catch_matchers_floating.h
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Floating {
-
-        enum class FloatingPointKind : uint8_t;
-
-        struct WithinAbsMatcher : MatcherBase<double> {
-            WithinAbsMatcher(double target, double margin);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_margin;
-        };
-
-        struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            uint64_t m_ulps;
-            FloatingPointKind m_type;
-        };
-
-        // Given IEEE-754 format for floats and doubles, we can assume
-        // that float -> double promotion is lossless. Given this, we can
-        // assume that if we do the standard relative comparison of
-        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
-        // the same result if we do this for floats, as if we do this for
-        // doubles that were promoted from floats.
-        struct WithinRelMatcher : MatcherBase<double> {
-            WithinRelMatcher(double target, double epsilon);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_epsilon;
-        };
-
-    } // namespace Floating
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
-    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
-    Floating::WithinRelMatcher WithinRel(double target, double eps);
-    // defaults epsilon to 100*numeric_limits<double>::epsilon()
-    Floating::WithinRelMatcher WithinRel(double target);
-    Floating::WithinRelMatcher WithinRel(float target, float eps);
-    // defaults epsilon to 100*numeric_limits<float>::epsilon()
-    Floating::WithinRelMatcher WithinRel(float target);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.h
-// start catch_matchers_generic.hpp
-
-#include <functional>
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-namespace Generic {
-
-namespace Detail {
-    std::string finalizeDescription(const std::string& desc);
-}
-
-template <typename T>
-class PredicateMatcher : public MatcherBase<T> {
-    std::function<bool(T const&)> m_predicate;
-    std::string m_description;
-public:
-
-    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
-        :m_predicate(std::move(elem)),
-        m_description(Detail::finalizeDescription(descr))
-    {}
-
-    bool match( T const& item ) const override {
-        return m_predicate(item);
-    }
-
-    std::string describe() const override {
-        return m_description;
-    }
-};
-
-} // namespace Generic
-
-    // The following functions create the actual matcher objects.
-    // The user has to explicitly specify type to the function, because
-    // inferring std::function<bool(T const&)> is hard (but possible) and
-    // requires a lot of TMP.
-    template<typename T>
-    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
-        return Generic::PredicateMatcher<T>(predicate, description);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_generic.hpp
-// start catch_matchers_string.h
-
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
-            std::string adjustString( std::string const& str ) const;
-            std::string caseSensitivitySuffix() const;
-
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct StringMatcherBase : MatcherBase<std::string> {
-            StringMatcherBase( std::string const& operation, CasedString const& comparator );
-            std::string describe() const override;
-
-            CasedString m_comparator;
-            std::string m_operation;
-        };
-
-        struct EqualsMatcher : StringMatcherBase {
-            EqualsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct ContainsMatcher : StringMatcherBase {
-            ContainsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct StartsWithMatcher : StringMatcherBase {
-            StartsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct EndsWithMatcher : StringMatcherBase {
-            EndsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-
-        struct RegexMatcher : MatcherBase<std::string> {
-            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
-            bool match( std::string const& matchee ) const override;
-            std::string describe() const override;
-
-        private:
-            std::string m_regex;
-            CaseSensitive::Choice m_caseSensitivity;
-        };
-
-    } // namespace StdString
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_string.h
-// start catch_matchers_vector.h
-
-#include <algorithm>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Vector {
-        template<typename T, typename Alloc>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
-
-            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
-
-            bool match(std::vector<T, Alloc> const &v) const override {
-                for (auto const& el : v) {
-                    if (el == m_comparator) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            T const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: see note in EqualsMatcher
-                if (m_comparator.size() > v.size())
-                    return false;
-                for (auto const& comparator : m_comparator) {
-                    auto present = false;
-                    for (const auto& el : v) {
-                        if (el == comparator) {
-                            present = true;
-                            break;
-                        }
-                    }
-                    if (!present) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: This currently works if all elements can be compared using !=
-                // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
-                // - then just call that directly
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != v[i])
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != approx(v[i]))
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& epsilon( T const& newEpsilon ) {
-                approx.epsilon(newEpsilon);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& margin( T const& newMargin ) {
-                approx.margin(newMargin);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& scale( T const& newScale ) {
-                approx.scale(newScale);
-                return *this;
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
-            bool match(std::vector<T, AllocMatch> const& vec) const override {
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
-            }
-
-            std::string describe() const override {
-                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
-            }
-        private:
-            std::vector<T, AllocComp> const& m_target;
-        };
-
-    } // namespace Vector
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename Alloc = std::allocator<T>>
-    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
-        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_vector.h
-namespace Catch {
-
-    template<typename ArgT, typename MatcherT>
-    class MatchExpr : public ITransientExpression {
-        ArgT const& m_arg;
-        MatcherT m_matcher;
-        StringRef m_matcherString;
-    public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
-        :   ITransientExpression{ true, matcher.match( arg ) },
-            m_arg( arg ),
-            m_matcher( matcher ),
-            m_matcherString( matcherString )
-        {}
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            auto matcherAsString = m_matcher.toString();
-            os << Catch::Detail::stringify( m_arg ) << ' ';
-            if( matcherAsString == Detail::unprintableString )
-                os << m_matcherString;
-            else
-                os << matcherAsString;
-        }
-    };
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
-
-    template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
-        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
-    }
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__ ); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-// end catch_capture_matchers.h
-#endif
-// start catch_generators.hpp
-
-// start catch_interfaces_generatortracker.h
-
-
-#include <memory>
-
-namespace Catch {
-
-    namespace Generators {
-        class GeneratorUntypedBase {
-        public:
-            GeneratorUntypedBase() = default;
-            virtual ~GeneratorUntypedBase();
-            // Attempts to move the generator to the next element
-             //
-             // Returns true iff the move succeeded (and a valid element
-             // can be retrieved).
-            virtual bool next() = 0;
-        };
-        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
-
-    } // namespace Generators
-
-    struct IGeneratorTracker {
-        virtual ~IGeneratorTracker();
-        virtual auto hasGenerator() const -> bool = 0;
-        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
-        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
-    };
-
-} // namespace Catch
-
-// end catch_interfaces_generatortracker.h
-// start catch_enforce.h
-
-#include <exception>
-
-namespace Catch {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    template <typename Ex>
-    [[noreturn]]
-    void throw_exception(Ex const& e) {
-        throw e;
-    }
-#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
-    [[noreturn]]
-    void throw_exception(std::exception const& e);
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg);
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg);
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg);
-
-} // namespace Catch;
-
-#define CATCH_MAKE_MSG(...) \
-    (Catch::ReusableStringStream() << __VA_ARGS__).str()
-
-#define CATCH_INTERNAL_ERROR(...) \
-    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
-
-#define CATCH_ERROR(...) \
-    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_RUNTIME_ERROR(...) \
-    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_ENFORCE( condition, ... ) \
-    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
-
-// end catch_enforce.h
-#include <memory>
-#include <vector>
-#include <cassert>
-
-#include <utility>
-#include <exception>
-
-namespace Catch {
-
-class GeneratorException : public std::exception {
-    const char* const m_msg = "";
-
-public:
-    GeneratorException(const char* msg):
-        m_msg(msg)
-    {}
-
-    const char* what() const noexcept override final;
-};
-
-namespace Generators {
-
-    // !TBD move this into its own location?
-    namespace pf{
-        template<typename T, typename... Args>
-        std::unique_ptr<T> make_unique( Args&&... args ) {
-            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-    }
-
-    template<typename T>
-    struct IGenerator : GeneratorUntypedBase {
-        virtual ~IGenerator() = default;
-
-        // Returns the current element of the generator
-        //
-        // \Precondition The generator is either freshly constructed,
-        // or the last call to `next()` returned true
-        virtual T const& get() const = 0;
-        using type = T;
-    };
-
-    template<typename T>
-    class SingleValueGenerator final : public IGenerator<T> {
-        T m_value;
-    public:
-        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
-
-        T const& get() const override {
-            return m_value;
-        }
-        bool next() override {
-            return false;
-        }
-    };
-
-    template<typename T>
-    class FixedValuesGenerator final : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "FixedValuesGenerator does not support bools because of std::vector<bool>"
-            "specialization, use SingleValue Generator instead.");
-        std::vector<T> m_values;
-        size_t m_idx = 0;
-    public:
-        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
-
-        T const& get() const override {
-            return m_values[m_idx];
-        }
-        bool next() override {
-            ++m_idx;
-            return m_idx < m_values.size();
-        }
-    };
-
-    template <typename T>
-    class GeneratorWrapper final {
-        std::unique_ptr<IGenerator<T>> m_generator;
-    public:
-        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
-            m_generator(std::move(generator))
-        {}
-        T const& get() const {
-            return m_generator->get();
-        }
-        bool next() {
-            return m_generator->next();
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> value(T&& value) {
-        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
-    }
-    template <typename T>
-    GeneratorWrapper<T> values(std::initializer_list<T> values) {
-        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
-    }
-
-    template<typename T>
-    class Generators : public IGenerator<T> {
-        std::vector<GeneratorWrapper<T>> m_generators;
-        size_t m_current = 0;
-
-        void populate(GeneratorWrapper<T>&& generator) {
-            m_generators.emplace_back(std::move(generator));
-        }
-        void populate(T&& val) {
-            m_generators.emplace_back(value(std::forward<T>(val)));
-        }
-        template<typename U>
-        void populate(U&& val) {
-            populate(T(std::forward<U>(val)));
-        }
-        template<typename U, typename... Gs>
-        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
-            populate(std::forward<U>(valueOrGenerator));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-    public:
-        template <typename... Gs>
-        Generators(Gs &&... moreGenerators) {
-            m_generators.reserve(sizeof...(Gs));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-        T const& get() const override {
-            return m_generators[m_current].get();
-        }
-
-        bool next() override {
-            if (m_current >= m_generators.size()) {
-                return false;
-            }
-            const bool current_status = m_generators[m_current].next();
-            if (!current_status) {
-                ++m_current;
-            }
-            return m_current < m_generators.size();
-        }
-    };
-
-    template<typename... Ts>
-    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
-        return values<std::tuple<Ts...>>( tuples );
-    }
-
-    // Tag type to signal that a generator sequence should convert arguments to a specific type
-    template <typename T>
-    struct as {};
-
-    template<typename T, typename... Gs>
-    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
-        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
-    }
-    template<typename T>
-    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
-        return Generators<T>(std::move(generator));
-    }
-    template<typename T, typename... Gs>
-    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
-    }
-    template<typename T, typename U, typename... Gs>
-    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
-    }
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
-
-    template<typename L>
-    // Note: The type after -> is weird, because VS2015 cannot parse
-    //       the expression used in the typedef inside, when it is in
-    //       return type. Yeah.
-    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
-        using UnderlyingType = typename decltype(generatorExpression())::type;
-
-        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
-        if (!tracker.hasGenerator()) {
-            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
-        }
-
-        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
-        return generator.get();
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-#define GENERATE( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_COPY( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_REF( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-
-// end catch_generators.hpp
-// start catch_generators_generic.hpp
-
-namespace Catch {
-namespace Generators {
-
-    template <typename T>
-    class TakeGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        size_t m_returned = 0;
-        size_t m_target;
-    public:
-        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target(target)
-        {
-            assert(target != 0 && "Empty generators are not allowed");
-        }
-        T const& get() const override {
-            return m_generator.get();
-        }
-        bool next() override {
-            ++m_returned;
-            if (m_returned >= m_target) {
-                return false;
-            }
-
-            const auto success = m_generator.next();
-            // If the underlying generator does not contain enough values
-            // then we cut short as well
-            if (!success) {
-                m_returned = m_target;
-            }
-            return success;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
-    }
-
-    template <typename T, typename Predicate>
-    class FilterGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        Predicate m_predicate;
-    public:
-        template <typename P = Predicate>
-        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_predicate(std::forward<P>(pred))
-        {
-            if (!m_predicate(m_generator.get())) {
-                // It might happen that there are no values that pass the
-                // filter. In that case we throw an exception.
-                auto has_initial_value = nextImpl();
-                if (!has_initial_value) {
-                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
-                }
-            }
-        }
-
-        T const& get() const override {
-            return m_generator.get();
-        }
-
-        bool next() override {
-            return nextImpl();
-        }
-
-    private:
-        bool nextImpl() {
-            bool success = m_generator.next();
-            if (!success) {
-                return false;
-            }
-            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
-            return success;
-        }
-    };
-
-    template <typename T, typename Predicate>
-    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
-    }
-
-    template <typename T>
-    class RepeatGenerator : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "RepeatGenerator currently does not support bools"
-            "because of std::vector<bool> specialization");
-        GeneratorWrapper<T> m_generator;
-        mutable std::vector<T> m_returned;
-        size_t m_target_repeats;
-        size_t m_current_repeat = 0;
-        size_t m_repeat_index = 0;
-    public:
-        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target_repeats(repeats)
-        {
-            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
-        }
-
-        T const& get() const override {
-            if (m_current_repeat == 0) {
-                m_returned.push_back(m_generator.get());
-                return m_returned.back();
-            }
-            return m_returned[m_repeat_index];
-        }
-
-        bool next() override {
-            // There are 2 basic cases:
-            // 1) We are still reading the generator
-            // 2) We are reading our own cache
-
-            // In the first case, we need to poke the underlying generator.
-            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
-            if (m_current_repeat == 0) {
-                const auto success = m_generator.next();
-                if (!success) {
-                    ++m_current_repeat;
-                }
-                return m_current_repeat < m_target_repeats;
-            }
-
-            // In the second case, we need to move indices forward and check that we haven't run up against the end
-            ++m_repeat_index;
-            if (m_repeat_index == m_returned.size()) {
-                m_repeat_index = 0;
-                ++m_current_repeat;
-            }
-            return m_current_repeat < m_target_repeats;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
-    }
-
-    template <typename T, typename U, typename Func>
-    class MapGenerator : public IGenerator<T> {
-        // TBD: provide static assert for mapping function, for friendly error message
-        GeneratorWrapper<U> m_generator;
-        Func m_function;
-        // To avoid returning dangling reference, we have to save the values
-        T m_cache;
-    public:
-        template <typename F2 = Func>
-        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
-            m_generator(std::move(generator)),
-            m_function(std::forward<F2>(function)),
-            m_cache(m_function(m_generator.get()))
-        {}
-
-        T const& get() const override {
-            return m_cache;
-        }
-        bool next() override {
-            const auto success = m_generator.next();
-            if (success) {
-                m_cache = m_function(m_generator.get());
-            }
-            return success;
-        }
-    };
-
-    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T, typename U, typename Func>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T>
-    class ChunkGenerator final : public IGenerator<std::vector<T>> {
-        std::vector<T> m_chunk;
-        size_t m_chunk_size;
-        GeneratorWrapper<T> m_generator;
-        bool m_used_up = false;
-    public:
-        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
-            m_chunk_size(size), m_generator(std::move(generator))
-        {
-            m_chunk.reserve(m_chunk_size);
-            if (m_chunk_size != 0) {
-                m_chunk.push_back(m_generator.get());
-                for (size_t i = 1; i < m_chunk_size; ++i) {
-                    if (!m_generator.next()) {
-                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                    }
-                    m_chunk.push_back(m_generator.get());
-                }
-            }
-        }
-        std::vector<T> const& get() const override {
-            return m_chunk;
-        }
-        bool next() override {
-            m_chunk.clear();
-            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
-                if (!m_generator.next()) {
-                    return false;
-                }
-                m_chunk.push_back(m_generator.get());
-            }
-            return true;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<std::vector<T>>(
-            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
-        );
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_generic.hpp
-// start catch_generators_specific.hpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
-
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext();
-
-    class SimplePcg32;
-    SimplePcg32& rng();
-}
-
-// end catch_context.h
-// start catch_interfaces_config.h
-
-// start catch_option.hpp
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
-
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-// end catch_option.hpp
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01,
-        NoTests = 0x02
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : NonCopyable {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutNoTests() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual double minDuration() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-}
-
-// end catch_interfaces_config.h
-// start catch_random_number_generator.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    // This is a simple implementation of C++11 Uniform Random Number
-    // Generator. It does not provide all operators, because Catch2
-    // does not use it, but it should behave as expected inside stdlib's
-    // distributions.
-    // The implementation is based on the PCG family (http://pcg-random.org)
-    class SimplePcg32 {
-        using state_type = std::uint64_t;
-    public:
-        using result_type = std::uint32_t;
-        static constexpr result_type (min)() {
-            return 0;
-        }
-        static constexpr result_type (max)() {
-            return static_cast<result_type>(-1);
-        }
-
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
-
-        explicit SimplePcg32(result_type seed_);
-
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
-
-        result_type operator()();
-
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
-
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
-
-} // end namespace Catch
-
-// end catch_random_number_generator.h
-#include <random>
-
-namespace Catch {
-namespace Generators {
-
-template <typename Float>
-class RandomFloatingGenerator final : public IGenerator<Float> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_real_distribution<Float> m_dist;
-    Float m_current_number;
-public:
-
-    RandomFloatingGenerator(Float a, Float b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Float const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-template <typename Integer>
-class RandomIntegerGenerator final : public IGenerator<Integer> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
-    Integer m_current_number;
-public:
-
-    RandomIntegerGenerator(Integer a, Integer b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Integer const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-// TODO: Ideally this would be also constrained against the various char types,
-//       but I don't expect users to run into that in practice.
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-class RangeGenerator final : public IGenerator<T> {
-    T m_current;
-    T m_end;
-    T m_step;
-    bool m_positive;
-
-public:
-    RangeGenerator(T const& start, T const& end, T const& step):
-        m_current(start),
-        m_end(end),
-        m_step(step),
-        m_positive(m_step > T(0))
-    {
-        assert(m_current != m_end && "Range start and end cannot be equal");
-        assert(m_step != T(0) && "Step size cannot be zero");
-        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
-    }
-
-    RangeGenerator(T const& start, T const& end):
-        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
-    {}
-
-    T const& get() const override {
-        return m_current;
-    }
-
-    bool next() override {
-        m_current += m_step;
-        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
-    }
-};
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
-    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
-}
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end) {
-    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
-}
-
-template <typename T>
-class IteratorGenerator final : public IGenerator<T> {
-    static_assert(!std::is_same<T, bool>::value,
-        "IteratorGenerator currently does not support bools"
-        "because of std::vector<bool> specialization");
-
-    std::vector<T> m_elems;
-    size_t m_current = 0;
-public:
-    template <typename InputIterator, typename InputSentinel>
-    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
-        if (m_elems.empty()) {
-            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
-        }
-    }
-
-    T const& get() const override {
-        return m_elems[m_current];
-    }
-
-    bool next() override {
-        ++m_current;
-        return m_current != m_elems.size();
-    }
-};
-
-template <typename InputIterator,
-          typename InputSentinel,
-          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
-GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
-}
-
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
-}
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_specific.hpp
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string tagsAsString() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
-
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
-
-namespace Catch {
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public ITestInvoker {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                bool match( NSString* str ) const override {
-                    return false;
-                }
-
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
-
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-// Benchmarking needs the externally-facing parts of reporters to work
-#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_external_interfaces.h
-
-// start catch_reporter_bases.hpp
-
-// start catch_interfaces_reporter.h
-
-// start catch_config.hpp
-
-// start catch_test_spec_parser.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_test_spec.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_wildcard_pattern.h
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
-
-    private:
-        std::string normaliseString( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
-    };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    struct IConfig;
-
-    class TestSpec {
-        class Pattern {
-        public:
-            explicit Pattern( std::string const& name );
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-            std::string const& name() const;
-        private:
-            std::string const m_name;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            explicit NamePattern( std::string const& name, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            explicit TagPattern( std::string const& tag, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const;
-            std::string name() const;
-        };
-
-    public:
-        struct FilterMatch {
-            std::string name;
-            std::vector<TestCase const*> tests;
-        };
-        using Matches = std::vector<FilterMatch>;
-        using vectorStrings = std::vector<std::string>;
-
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
-        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
-        const vectorStrings & getInvalidArgs() const;
-
-    private:
-        std::vector<Filter> m_filters;
-        std::vector<std::string> m_invalidArgs;
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        Mode lastMode = None;
-        bool m_exclusion = false;
-        std::size_t m_pos = 0;
-        std::size_t m_realPatternPos = 0;
-        std::string m_arg;
-        std::string m_substring;
-        std::string m_patternName;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
-
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
-
-    private:
-        bool visitChar( char c );
-        void startNewMode( Mode mode );
-        bool processNoneChar( char c );
-        void processNameChar( char c );
-        bool processOtherChar( char c );
-        void endMode();
-        void escape();
-        bool isControlChar( char c ) const;
-        void saveLastMode();
-        void revertBackToLastMode();
-        void addFilter();
-        bool separate();
-
-        // Handles common preprocessing of the pattern for name/tag patterns
-        std::string preprocessPattern();
-        // Adds the current pattern as a test name
-        void addNamePattern();
-        // Adds the current pattern as a tag
-        void addTagPattern();
-
-        inline void addCharToPattern(char c) {
-            m_substring += c;
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-
-    };
-    TestSpec parseTestSpec( std::string const& arg );
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
-
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
-
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
-
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-
-        bool benchmarkNoAnalysis = false;
-        unsigned int benchmarkSamples = 100;
-        double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
-        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
-
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        double minDuration = -1;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
-
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
-    };
-
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
-
-        std::vector<std::string> const& getTestsOrTags() const override;
-        std::vector<std::string> const& getSectionsToRun() const override;
-
-        TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
-
-        bool showHelp() const;
-
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        double minDuration() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
-        bool benchmarkNoAnalysis() const override;
-        int benchmarkSamples() const override;
-        double benchmarkConfidenceInterval() const override;
-        unsigned int benchmarkResamples() const override;
-        std::chrono::milliseconds benchmarkWarmupTime() const override;
-
-    private:
-
-        IStream const* openStream();
-        ConfigData m_data;
-
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
-
-} // end namespace Catch
-
-// end catch_config.hpp
-// start catch_assertionresult.h
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// end catch_assertionresult.h
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_estimate.hpp
-
- // Statistics estimates
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate.hpp
-// start catch_outlier_classification.hpp
-
-// Outlier information
-
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
-
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_outlier_classification.hpp
-
-#include <iterator>
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-#include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <memory>
-#include <algorithm>
-
-namespace Catch {
-
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
-
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
-
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
-
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        bool shouldRedirectStdOut = false;
-        bool shouldReportAllAssertions = false;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-        virtual ~AssertionStats();
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
-
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
-
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-            return {
-                info,
-                std::move(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
-
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void reportInvalidArguments(std::string const&) {}
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& ) {}
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
-        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
-        virtual void benchmarkFailed( std::string const& ) {}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
-
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
-
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
-
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
-
-    //! Should the reporter show
-    bool shouldShowDuration( IConfig const& config, double duration );
-
-    std::string serializeFilters( std::vector<std::string> const& container );
-
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        ~StreamingReporterBase() override = default;
-
-        void noMatchingTestCases(std::string const&) override {}
-
-        void reportInvalidArguments(std::string const&) override {}
-
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
-
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
-
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
-
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
-
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
-
-        private:
-            SectionInfo const& m_other;
-        };
-
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
-
-        void testCaseStarting( TestCaseInfo const& ) override {}
-
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
-
-        void assertionStarting(AssertionInfo const&) override {}
-
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
-
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        void skipTest(TestCaseInfo const&) override {}
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
-
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
-
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved = false;
-    };
-
-    std::ostream& operator << ( std::ostream& os, Colour const& );
-
-} // end namespace Catch
-
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
-
-
-namespace Catch {
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-
-            std::string getDescription() const override {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            std::string getDescription() const override {
-                return std::string();
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
-
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#else // CATCH_CONFIG_DISABLE
-
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
-
-        using StreamingReporterBase::StreamingReporterBase;
-
-        ~CompactReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
-
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
-
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats<> const& stats) override;
-        void benchmarkFailed(std::string const& error) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-        void testRunStarting(TestRunInfo const& _testRunInfo) override;
-    private:
-
-        void lazyPrint();
-
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
-
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
-
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
-
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
-        void printTestFilters();
-
-    private:
-        bool m_headerPrinted = false;
-    };
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
-
-// start catch_xmlwriter.h
-
-#include <vector>
-
-namespace Catch {
-    enum class XmlFormatting {
-        None = 0x00,
-        Indent = 0x01,
-        Newline = 0x02,
-    };
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
-
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-            XmlFormatting m_fmt;
-        };
-
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        void writeStylesheetRef( std::string const& url );
-
-        XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void applyFormatting(XmlFormatting fmt);
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-}
-
-// end catch_xmlwriter.h
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
-
-        ~JunitReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& /*spec*/) override;
-
-        void testRunStarting(TestRunInfo const& runInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEndedCumulative() override;
-
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
-
-        void writeTestCase(TestCaseNode const& testCaseNode);
-
-        void writeSection( std::string const& className,
-                           std::string const& rootName,
-                           SectionNode const& sectionNode,
-                           bool testOkToFail );
-
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
-
-        ~XmlReporter() override;
-
-        static std::string getDescription();
-
-        virtual std::string getStylesheetRef() const;
-
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
-
-    public: // StreamingReporterBase
-
-        void noMatchingTestCases(std::string const& s) override;
-
-        void testRunStarting(TestRunInfo const& testInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
-
-        void sectionStarting(SectionInfo const& sectionInfo) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void sectionEnded(SectionStats const& sectionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEnded(TestRunStats const& testRunStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const&) override;
-        void benchmarkEnded(BenchmarkStats<> const&) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_xml.h
-
-// end catch_external_interfaces.h
-#endif
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_benchmarking_all.hpp
-
-// A proxy header that includes all of the benchmarking headers to allow
-// concise include of the benchmarking features. You should prefer the
-// individual includes in standard use.
-
-// start catch_benchmark.hpp
-
- // Benchmark
-
-// start catch_chronometer.hpp
-
-// User-facing chronometer
-
-
-// start catch_clock.hpp
-
-// Clocks
-
-
-#include <chrono>
-#include <ratio>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
-
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
-
-        using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_clock.hpp
-// start catch_optimizer.hpp
-
- // Hinting the optimizer
-
-
-#if defined(_MSC_VER)
-#   include <atomic> // atomic_thread_fence
-#endif
-
-namespace Catch {
-    namespace Benchmark {
-#if defined(__GNUC__) || defined(__clang__)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            asm volatile("" : : "g"(p) : "memory");
-        }
-        inline void keep_memory() {
-            asm volatile("" : : : "memory");
-        }
-
-        namespace Detail {
-            inline void optimizer_barrier() { keep_memory(); }
-        } // namespace Detail
-#elif defined(_MSC_VER)
-
-#pragma optimize("", off)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            // thanks @milleniumbug
-            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
-        }
-        // TODO equivalent keep_memory()
-#pragma optimize("", on)
-
-        namespace Detail {
-            inline void optimizer_barrier() {
-                std::atomic_thread_fence(std::memory_order_seq_cst);
-            }
-        } // namespace Detail
-
-#endif
-
-        template <typename T>
-        inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
-            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
-            std::forward<Fn>(fn) (std::forward<Args...>(args...));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_optimizer.hpp
-// start catch_complete_invoke.hpp
-
-// Invoke with a special case for void
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                    return {};
-                }
-            };
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
-            }
-
-            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
-            CATCH_TRY{
-                return Detail::complete_invoke(std::forward<Fun>(fun));
-            } CATCH_CATCH_ALL{
-                getResultCapture().benchmarkFailed(translateActiveException());
-                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
-            }
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_complete_invoke.hpp
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            struct ChronometerConcept {
-                virtual void start() = 0;
-                virtual void finish() = 0;
-                virtual ~ChronometerConcept() = default;
-            };
-            template <typename Clock>
-            struct ChronometerModel final : public ChronometerConcept {
-                void start() override { started = Clock::now(); }
-                void finish() override { finished = Clock::now(); }
-
-                ClockDuration<Clock> elapsed() const { return finished - started; }
-
-                TimePoint<Clock> started;
-                TimePoint<Clock> finished;
-            };
-        } // namespace Detail
-
-        struct Chronometer {
-        public:
-            template <typename Fun>
-            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
-
-            int runs() const { return k; }
-
-            Chronometer(Detail::ChronometerConcept& meter, int k)
-                : impl(&meter)
-                , k(k) {}
-
-        private:
-            template <typename Fun>
-            void measure(Fun&& fun, std::false_type) {
-                measure([&fun](int) { return fun(); }, std::true_type());
-            }
-
-            template <typename Fun>
-            void measure(Fun&& fun, std::true_type) {
-                Detail::optimizer_barrier();
-                impl->start();
-                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
-                impl->finish();
-                Detail::optimizer_barrier();
-            }
-
-            Detail::ChronometerConcept* impl;
-            int k;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_chronometer.hpp
-// start catch_environment.hpp
-
-// Environment information
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_environment.hpp
-// start catch_execution_plan.hpp
-
- // Execution plan
-
-
-// start catch_benchmark_function.hpp
-
- // Dumb std::function implementation for consistent call overhead
-
-
-#include <cassert>
-#include <type_traits>
-#include <utility>
-#include <memory>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            using Decay = typename std::decay<T>::type;
-            template <typename T, typename U>
-            struct is_related
-                : std::is_same<Decay<T>, Decay<U>> {};
-
-            /// We need to reinvent std::function because every piece of code that might add overhead
-            /// in a measurement context needs to have consistent performance characteristics so that we
-            /// can account for it in the measurement.
-            /// Implementations of std::function with optimizations that aren't always applicable, like
-            /// small buffer optimizations, are not uncommon.
-            /// This is effectively an implementation of std::function without any such optimizations;
-            /// it may be slow, but it is consistently slow.
-            struct BenchmarkFunction {
-            private:
-                struct callable {
-                    virtual void call(Chronometer meter) const = 0;
-                    virtual callable* clone() const = 0;
-                    virtual ~callable() = default;
-                };
-                template <typename Fun>
-                struct model : public callable {
-                    model(Fun&& fun) : fun(std::move(fun)) {}
-                    model(Fun const& fun) : fun(fun) {}
-
-                    model<Fun>* clone() const override { return new model<Fun>(*this); }
-
-                    void call(Chronometer meter) const override {
-                        call(meter, is_callable<Fun(Chronometer)>());
-                    }
-                    void call(Chronometer meter, std::true_type) const {
-                        fun(meter);
-                    }
-                    void call(Chronometer meter, std::false_type) const {
-                        meter.measure(fun);
-                    }
-
-                    Fun fun;
-                };
-
-                struct do_nothing { void operator()() const {} };
-
-                template <typename T>
-                BenchmarkFunction(model<T>* c) : f(c) {}
-
-            public:
-                BenchmarkFunction()
-                    : f(new model<do_nothing>{ {} }) {}
-
-                template <typename Fun,
-                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
-                    BenchmarkFunction(Fun&& fun)
-                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
-
-                BenchmarkFunction(BenchmarkFunction&& that)
-                    : f(std::move(that.f)) {}
-
-                BenchmarkFunction(BenchmarkFunction const& that)
-                    : f(that.f->clone()) {}
-
-                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
-                    f = std::move(that.f);
-                    return *this;
-                }
-
-                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
-                    f.reset(that.f->clone());
-                    return *this;
-                }
-
-                void operator()(Chronometer meter) const { f->call(meter); }
-
-            private:
-                std::unique_ptr<callable> f;
-            };
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_benchmark_function.hpp
-// start catch_repeat.hpp
-
-// repeat algorithm
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Fun>
-            struct repeater {
-                void operator()(int k) const {
-                    for (int i = 0; i < k; ++i) {
-                        fun();
-                    }
-                }
-                Fun fun;
-            };
-            template <typename Fun>
-            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
-                return { std::forward<Fun>(fun) };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_repeat.hpp
-// start catch_run_for_at_least.hpp
-
-// Run a function for a minimum amount of time
-
-
-// start catch_measure.hpp
-
-// Measure
-
-
-// start catch_timing.hpp
-
-// Timing
-
-
-#include <tuple>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration, typename Result>
-        struct Timing {
-            Duration elapsed;
-            Result result;
-            int iterations;
-        };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_timing.hpp
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
-                auto start = Clock::now();
-                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
-                auto end = Clock::now();
-                auto delta = end - start;
-                return { delta, std::forward<decltype(r)>(r), 1 };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_measure.hpp
-#include <utility>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
-                return Detail::measure<Clock>(fun, iters);
-            }
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
-                Detail::ChronometerModel<Clock> meter;
-                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
-
-                return { meter.elapsed(), std::move(result), iters };
-            }
-
-            template <typename Clock, typename Fun>
-            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
-
-            struct optimized_away_error : std::exception {
-                const char* what() const noexcept override {
-                    return "could not measure benchmark, maybe it was optimized away";
-                }
-            };
-
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
-                auto iters = seed;
-                while (iters < (1 << 30)) {
-                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
-
-                    if (Timing.elapsed >= how_long) {
-                        return { Timing.elapsed, std::move(Timing.result), iters };
-                    }
-                    iters *= 2;
-                }
-                Catch::throw_exception(optimized_away_error{});
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_run_for_at_least.hpp
-#include <algorithm>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct ExecutionPlan {
-            int iterations_per_sample;
-            Duration estimated_duration;
-            Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
-            int warmup_iterations;
-
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
-            template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
-                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
-                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
-                return times;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_execution_plan.hpp
-// start catch_estimate_clock.hpp
-
- // Environment measurement
-
-
-// start catch_stats.hpp
-
-// Statistical analysis tools
-
-
-#include <algorithm>
-#include <functional>
-#include <vector>
-#include <iterator>
-#include <numeric>
-#include <tuple>
-#include <cmath>
-#include <utility>
-#include <cstddef>
-#include <random>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            using sample = std::vector<double>;
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / count;
-            }
-
-            template <typename URng, typename Iterator, typename Estimator>
-            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
-                auto n = last - first;
-                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-                sample out;
-                out.reserve(resamples);
-                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-                    std::vector<double> resampled;
-                    resampled.reserve(n);
-                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
-                    return estimator(resampled.begin(), resampled.end());
-                });
-                std::sort(out.begin(), out.end());
-                return out;
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = last - first;
-                auto second = std::next(first);
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
-
-            double erfc_inv(double x);
-
-            double normal_quantile(double p);
-
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                int n = static_cast<int>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
-                // degenerate case with uniform samples
-                if (prob_n == 0) return { point, point, point, confidence_level };
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n](double x) -> int {
-                    return std::lround(normal_cdf(x) * n); };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = (std::max)(cumn(a1), 0);
-                auto hi = (std::min)(cumn(a2), n - 1);
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
-
-            struct bootstrap_analysis {
-                Estimate<double> mean;
-                Estimate<double> standard_deviation;
-                double outlier_variance;
-            };
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_stats.hpp
-#include <algorithm>
-#include <iterator>
-#include <tuple>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock>
-            std::vector<double> resolution(int k) {
-                std::vector<TimePoint<Clock>> times;
-                times.reserve(k + 1);
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
-
-                std::vector<double> deltas;
-                deltas.reserve(k);
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
-
-                return deltas;
-            }
-
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
-
-            template <typename Clock>
-            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
-                    .iterations;
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
-                    .result;
-                return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
-                };
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
-                auto time_limit = (std::min)(
-                    resolution * clock_cost_estimation_tick_limit,
-                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
-                auto time_clock = [](int k) {
-                    return Detail::measure<Clock>([k] {
-                        for (int i = 0; i < k; ++i) {
-                            volatile auto ignored = Clock::now();
-                            (void)ignored;
-                        }
-                    }).elapsed;
-                };
-                time_clock(1);
-                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
-                std::vector<double> times;
-                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
-                times.reserve(nsamples);
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
-                return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
-                };
-            }
-
-            template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
-                static Environment<FloatDuration<Clock>>* env = nullptr;
-                if (env) {
-                    return *env;
-                }
-
-                auto iters = Detail::warmup<Clock>();
-                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
-                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
-
-                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
-                return *env;
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate_clock.hpp
-// start catch_analyse.hpp
-
- // Run and analyse one benchmark
-
-
-// start catch_sample_analysis.hpp
-
-// Benchmark results
-
-
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
-            OutlierClassification outliers;
-            double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    std::move(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_sample_analysis.hpp
-#include <algorithm>
-#include <iterator>
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(last - first);
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        std::move(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(last - first);
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        std::move(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_analyse.hpp
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        struct Benchmark {
-            Benchmark(std::string &&name)
-                : name(std::move(name)) {}
-
-            template <class FUN>
-            Benchmark(std::string &&name, FUN &&func)
-                : fun(std::move(func)), name(std::move(name)) {}
-
-            template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
-                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
-                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
-            }
-
-            template <typename Clock = default_clock>
-            void run() {
-                IConfigPtr cfg = getCurrentContext().getConfig();
-
-                auto env = Detail::measure_environment<Clock>();
-
-                getResultCapture().benchmarkPreparing(name);
-                CATCH_TRY{
-                    auto plan = user_code([&] {
-                        return prepare<Clock>(*cfg, env);
-                    });
-
-                    BenchmarkInfo info {
-                        name,
-                        plan.estimated_duration.count(),
-                        plan.iterations_per_sample,
-                        cfg->benchmarkSamples(),
-                        cfg->benchmarkResamples(),
-                        env.clock_resolution.mean.count(),
-                        env.clock_cost.mean.count()
-                    };
-
-                    getResultCapture().benchmarkStarting(info);
-
-                    auto samples = user_code([&] {
-                        return plan.template run<Clock>(*cfg, env);
-                    });
-
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
-                    getResultCapture().benchmarkEnded(stats);
-
-                } CATCH_CATCH_ALL{
-                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
-                        std::rethrow_exception(std::current_exception());
-                }
-            }
-
-            // sets lambda to be used in fun *and* executes benchmark!
-            template <typename Fun,
-                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
-                Benchmark & operator=(Fun func) {
-                fun = Detail::BenchmarkFunction(func);
-                run();
-                return *this;
-            }
-
-            explicit operator bool() {
-                return true;
-            }
-
-        private:
-            Detail::BenchmarkFunction fun;
-            std::string name;
-        };
-    }
-} // namespace Catch
-
-#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
-#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
-
-#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&](int benchmarkIndex)
-
-#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&]
-
-// end catch_benchmark.hpp
-// start catch_constructor.hpp
-
-// Constructor and destructor helpers
-
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T, bool Destruct>
-            struct ObjectStorage
-            {
-                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
-
-                ObjectStorage() : data() {}
-
-                ObjectStorage(const ObjectStorage& other)
-                {
-                    new(&data) T(other.stored_object());
-                }
-
-                ObjectStorage(ObjectStorage&& other)
-                {
-                    new(&data) T(std::move(other.stored_object()));
-                }
-
-                ~ObjectStorage() { destruct_on_exit<T>(); }
-
-                template <typename... Args>
-                void construct(Args&&... args)
-                {
-                    new (&data) T(std::forward<Args>(args)...);
-                }
-
-                template <bool AllowManualDestruction = !Destruct>
-                typename std::enable_if<AllowManualDestruction>::type destruct()
-                {
-                    stored_object().~T();
-                }
-
-            private:
-                // If this is a constructor benchmark, destruct the underlying object
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
-                // Otherwise, don't
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
-
-                T& stored_object() {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                T const& stored_object() const {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                TStorage data;
-            };
-        }
-
-        template <typename T>
-        using storage_for = Detail::ObjectStorage<T, true>;
-
-        template <typename T>
-        using destructable_object = Detail::ObjectStorage<T, false>;
-    }
-}
-
-// end catch_constructor.hpp
-// end catch_benchmarking_all.hpp
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#ifdef CATCH_IMPL
-// start catch_impl.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// Keep these here for external reporters
-// start catch_test_case_tracker.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct NameAndLocation {
-        std::string name;
-        SourceLineInfo location;
-
-        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
-        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
-            return lhs.name == rhs.name
-                && lhs.location == rhs.location;
-        }
-    };
-
-    class ITracker;
-
-    using ITrackerPtr = std::shared_ptr<ITracker>;
-
-    class  ITracker {
-        NameAndLocation m_nameAndLocation;
-
-    public:
-        ITracker(NameAndLocation const& nameAndLoc) :
-            m_nameAndLocation(nameAndLoc)
-        {}
-
-        // static queries
-        NameAndLocation const& nameAndLocation() const {
-            return m_nameAndLocation;
-        }
-
-        virtual ~ITracker();
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-        virtual bool hasStarted() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( ITrackerPtr const& child ) = 0;
-        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isGeneratorTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        ITrackerPtr m_rootTracker;
-        ITracker* m_currentTracker = nullptr;
-        RunState m_runState = NotStarted;
-
-    public:
-
-        ITracker& startRun();
-        void endRun();
-
-        void startCycle();
-        void completeCycle();
-
-        bool completedCycle() const;
-        ITracker& currentTracker();
-        void setCurrentTracker( ITracker* tracker );
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-
-        using Children = std::vector<ITrackerPtr>;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState = NotStarted;
-
-    public:
-        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isComplete() const override;
-        bool isSuccessfullyCompleted() const override;
-        bool isOpen() const override;
-        bool hasChildren() const override;
-        bool hasStarted() const override {
-            return m_runState != NotStarted;
-        }
-
-        void addChild( ITrackerPtr const& child ) override;
-
-        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
-        ITracker& parent() override;
-
-        void openChild() override;
-
-        bool isSectionTracker() const override;
-        bool isGeneratorTracker() const override;
-
-        void open();
-
-        void close() override;
-        void fail() override;
-        void markAsNeedingAnotherRun() override;
-
-    private:
-        void moveToParent();
-        void moveToThis();
-    };
-
-    class SectionTracker : public TrackerBase {
-        std::vector<std::string> m_filters;
-        std::string m_trimmed_name;
-    public:
-        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isSectionTracker() const override;
-
-        bool isComplete() const override;
-
-        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
-
-        void tryOpen();
-
-        void addInitialFilters( std::vector<std::string> const& filters );
-        void addNextFilters( std::vector<std::string> const& filters );
-        //! Returns filters active in this tracker
-        std::vector<std::string> const& getFilters() const;
-        //! Returns whitespace-trimmed name of the tracked section
-        std::string const& trimmedName() const;
-    };
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-// end catch_test_case_tracker.h
-
-// start catch_leak_detector.h
-
-namespace Catch {
-
-    struct LeakDetector {
-        LeakDetector();
-        ~LeakDetector();
-    };
-
-}
-// end catch_leak_detector.h
-// Cpp files will be included in the single-header file here
-// start catch_stats.cpp
-
-// Statistical analysis tools
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-
-#include <cassert>
-#include <random>
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-#include <future>
-#endif
-
-namespace {
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
-            double diff = b - m;
-            return a + diff * diff;
-            }) / (last - first);
-            return std::sqrt(variance);
-    }
-
-}
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                auto count = last - first;
-                double idx = (count - 1) * k / static_cast<double>(q);
-                int j = static_cast<int>(idx);
-                double g = idx - j;
-                std::nth_element(first, first + j, last);
-                auto xj = first[j];
-                if (g == 0) return xj;
-
-                auto xj1 = *std::min_element(first + (j + 1), last);
-                return xj + g * (xj1 - xj);
-            }
-
-            double erfc_inv(double x) {
-                return erf_inv(1.0 - x);
-            }
-
-            double normal_quantile(double p) {
-                static const double ROOT_TWO = std::sqrt(2.0);
-
-                double result = 0.0;
-                assert(p >= 0 && p <= 1);
-                if (p < 0 || p > 1) {
-                    return result;
-                }
-
-                result = -erfc_inv(2.0 * p);
-                // result *= normal distribution standard deviation (1.0) * sqrt(2)
-                result *= /*sd * */ ROOT_TWO;
-                // result += normal disttribution mean (0)
-                return result;
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
-                };
-
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
-
-                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
-                auto stddev = &standard_deviation;
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
-                        auto resampled = resample(rng, n_resamples, first, last, f);
-                        return bootstrap(confidence_level, first, last, resampled, f);
-                    });
-                };
-
-                auto mean_future = Estimate(mean);
-                auto stddev_future = Estimate(stddev);
-
-                auto mean_estimate = mean_future.get();
-                auto stddev_estimate = stddev_future.get();
-#else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
-                    auto resampled = resample(rng, n_resamples, first, last, f);
-                    return bootstrap(confidence_level, first, last, resampled, f);
-                };
-
-                auto mean_estimate = Estimate(mean);
-                auto stddev_estimate = Estimate(stddev);
-#endif // CATCH_USE_ASYNC
-
-                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
-
-                return { mean_estimate, stddev_estimate, outlier_variance };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-// end catch_stats.cpp
-// start catch_approx.cpp
-
-#include <cmath>
-#include <limits>
-
-namespace {
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-}
-
-namespace Catch {
-namespace Detail {
-
-    Approx::Approx ( double value )
-    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-        m_margin( 0.0 ),
-        m_scale( 0.0 ),
-        m_value( value )
-    {}
-
-    Approx Approx::custom() {
-        return Approx( 0 );
-    }
-
-    Approx Approx::operator-() const {
-        auto temp(*this);
-        temp.m_value = -temp.m_value;
-        return temp;
-    }
-
-    std::string Approx::toString() const {
-        ReusableStringStream rss;
-        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
-        return rss.str();
-    }
-
-    bool Approx::equalityComparisonImpl(const double other) const {
-        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
-        // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin)
-            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
-    }
-
-    void Approx::setMargin(double newMargin) {
-        CATCH_ENFORCE(newMargin >= 0,
-            "Invalid Approx::margin: " << newMargin << '.'
-            << " Approx::Margin has to be non-negative.");
-        m_margin = newMargin;
-    }
-
-    void Approx::setEpsilon(double newEpsilon) {
-        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
-            "Invalid Approx::epsilon: " << newEpsilon << '.'
-            << " Approx::epsilon has to be in [0, 1]");
-        m_epsilon = newEpsilon;
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_debugger.h
-
-namespace Catch {
-    bool isDebuggerActive();
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #endif
-
-#elif defined(CATCH_PLATFORM_IPHONE)
-
-    // use inline assembler
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP()  __asm__("int $3")
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #elif defined(__arm__) && !defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
-    #elif defined(__arm__) &&  defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xde01")
-    #endif
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    // If we can use inline assembler, do it because this allows us to break
-    // directly at the location of the failing check instead of breaking inside
-    // raise() called from it, i.e. one stack frame below.
-    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
-    #else // Fall back to the generic way.
-        #include <signal.h>
-
-        #define CATCH_TRAP() raise(SIGTRAP)
-    #endif
-#elif defined(_MSC_VER)
-    #define CATCH_TRAP() __debugbreak()
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_TRAP() DebugBreak()
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-    #ifdef CATCH_TRAP
-        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
-    #else
-        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
-    #endif
-#endif
-
-// end catch_debugger.h
-// start catch_run_context.h
-
-// start catch_fatal_condition.h
-
-#include <cassert>
-
-namespace Catch {
-
-    // Wrapper for platform-specific fatal error (signals/SEH) handlers
-    //
-    // Tries to be cooperative with other handlers, and not step over
-    // other handlers. This means that unknown structured exceptions
-    // are passed on, previous signal handlers are called, and so on.
-    //
-    // Can only be instantiated once, and assumes that once a signal
-    // is caught, the binary will end up terminating. Thus, there
-    class FatalConditionHandler {
-        bool m_started = false;
-
-        // Install/disengage implementation for specific platform.
-        // Should be if-defed to work on current platform, can assume
-        // engage-disengage 1:1 pairing.
-        void engage_platform();
-        void disengage_platform();
-    public:
-        // Should also have platform-specific implementations as needed
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-
-        void engage() {
-            assert(!m_started && "Handler cannot be installed twice.");
-            m_started = true;
-            engage_platform();
-        }
-
-        void disengage() {
-            assert(m_started && "Handler cannot be uninstalled without being installed first");
-            m_started = false;
-            disengage_platform();
-        }
-    };
-
-    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
-    class FatalConditionHandlerGuard {
-        FatalConditionHandler* m_handler;
-    public:
-        FatalConditionHandlerGuard(FatalConditionHandler* handler):
-            m_handler(handler) {
-            m_handler->engage();
-        }
-        ~FatalConditionHandlerGuard() {
-            m_handler->disengage();
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_fatal_condition.h
-#include <string>
-
-namespace Catch {
-
-    struct IMutableContext;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-    public:
-        RunContext( RunContext const& ) = delete;
-        RunContext& operator =( RunContext const& ) = delete;
-
-        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
-
-        ~RunContext() override;
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
-
-        Totals runTest(TestCase const& testCase);
-
-        IConfigPtr config() const;
-        IStreamingReporter& reporter() const;
-
-    public: // IResultCapture
-
-        // Assertion handlers
-        void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) override;
-        void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) override;
-        void handleIncomplete
-                (   AssertionInfo const& info ) override;
-        void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) override;
-
-        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
-
-        void sectionEnded( SectionEndInfo const& endInfo ) override;
-        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
-
-        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing( std::string const& name ) override;
-        void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
-        void benchmarkFailed( std::string const& error ) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
-
-        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
-
-        std::string getCurrentTestName() const override;
-
-        const AssertionResult* getLastResult() const override;
-
-        void exceptionEarlyReported() override;
-
-        void handleFatalErrorCondition( StringRef message ) override;
-
-        bool lastAssertionPassed() override;
-
-        void assertionPassed() override;
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const final;
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
-        void invokeActiveTestCase();
-
-        void resetAssertionInfo();
-        bool testForMissingAssertions( Counts& assertions );
-
-        void assertionEnded( AssertionResult const& result );
-        void reportExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    ITransientExpression const *expr,
-                    bool negated );
-
-        void populateReaction( AssertionReaction& reaction );
-
-    private:
-
-        void handleUnfinishedSections();
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
-
-        IConfigPtr m_config;
-        Totals m_totals;
-        IStreamingReporterPtr m_reporter;
-        std::vector<MessageInfo> m_messages;
-        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-        FatalConditionHandler m_fatalConditionhandler;
-        bool m_lastAssertionPassed = false;
-        bool m_shouldReportUnexpected = true;
-        bool m_includeSuccessfulResults;
-    };
-
-    void seedRng(IConfig const& config);
-    unsigned int rngSeed();
-} // end namespace Catch
-
-// end catch_run_context.h
-namespace Catch {
-
-    namespace {
-        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
-            expr.streamReconstructedExpression( os );
-            return os;
-        }
-    }
-
-    LazyExpression::LazyExpression( bool isNegated )
-    :   m_isNegated( isNegated )
-    {}
-
-    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
-
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
-    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
-        if( lazyExpr.m_isNegated )
-            os << "!";
-
-        if( lazyExpr ) {
-            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
-                os << "(" << *lazyExpr.m_transientExpression << ")";
-            else
-                os << *lazyExpr.m_transientExpression;
-        }
-        else {
-            os << "{** error - unchecked empty expression requested **}";
-        }
-        return os;
-    }
-
-    AssertionHandler::AssertionHandler
-        (   StringRef const& macroName,
-            SourceLineInfo const& lineInfo,
-            StringRef capturedExpression,
-            ResultDisposition::Flags resultDisposition )
-    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
-        m_resultCapture( getResultCapture() )
-    {}
-
-    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
-        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
-    }
-    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
-        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
-    }
-
-    auto AssertionHandler::allowThrows() const -> bool {
-        return getCurrentContext().getConfig()->allowThrows();
-    }
-
-    void AssertionHandler::complete() {
-        setCompleted();
-        if( m_reaction.shouldDebugBreak ) {
-
-            // If you find your debugger stopping you here then go one level up on the
-            // call-stack for the code that caused it (typically a failed assertion)
-
-            // (To go back to the test and change execution, jump over the throw, next)
-            CATCH_BREAK_INTO_DEBUGGER();
-        }
-        if (m_reaction.shouldThrow) {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-            throw Catch::TestFailureException();
-#else
-            CATCH_ERROR( "Test failure requires aborting test!" );
-#endif
-        }
-    }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
-
-    void AssertionHandler::handleUnexpectedInflightException() {
-        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
-    }
-
-    void AssertionHandler::handleExceptionThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-    void AssertionHandler::handleExceptionNotThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
-        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
-    }
-
-    void AssertionHandler::handleThrowingCallSkipped() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    // This is the overload that takes a string and infers the Equals matcher from it
-    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
-        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
-    }
-
-} // namespace Catch
-// end catch_assertionhandler.cpp
-// start catch_assertionresult.cpp
-
-namespace Catch {
-    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
-        lazyExpression(_lazyExpression),
-        resultType(_resultType) {}
-
-    std::string AssertionResultData::reconstructExpression() const {
-
-        if( reconstructedExpression.empty() ) {
-            if( lazyExpression ) {
-                ReusableStringStream rss;
-                rss << lazyExpression;
-                reconstructedExpression = rss.str();
-            }
-        }
-        return reconstructedExpression;
-    }
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        // Possibly overallocating by 3 characters should be basically free
-        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += "!(";
-        }
-        expr += m_info.capturedExpression;
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += ')';
-        }
-        return expr;
-    }
-
-    std::string AssertionResult::getExpressionInMacro() const {
-        std::string expr;
-        if( m_info.macroName.empty() )
-            expr = static_cast<std::string>(m_info.capturedExpression);
-        else {
-            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-            expr += m_info.macroName;
-            expr += "( ";
-            expr += m_info.capturedExpression;
-            expr += " )";
-        }
-        return expr;
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        std::string expr = m_resultData.reconstructExpression();
-        return expr.empty()
-                ? getExpression()
-                : expr;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    StringRef AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-// end catch_assertionresult.cpp
-// start catch_capture_matchers.cpp
-
-namespace Catch {
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    // This is the general overload that takes a any string matcher
-    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
-    // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
-        std::string exceptionMessage = Catch::translateActiveException();
-        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
-        handler.handleExpr( expr );
-    }
-
-} // namespace Catch
-// end catch_capture_matchers.cpp
-// start catch_commandline.cpp
-
-// start catch_commandline.h
-
-// start catch_clara.h
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#endif
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-// start clara.hpp
-// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See https://github.com/philsquared/Clara for more details
-
-// Clara v1.1.5
-
-
-#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#ifndef CLARA_CONFIG_OPTIONAL_TYPE
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#include <optional>
-#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
-#endif
-#endif
-#endif
-
-// ----------- #included from clara_textflow.hpp -----------
-
-// TextFlowCpp
-//
-// A single-header library for wrapping and laying out basic text, by Phil Nash
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// This project is hosted at https://github.com/philsquared/textflowcpp
-
-
-#include <cassert>
-#include <ostream>
-#include <sstream>
-#include <vector>
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-namespace clara {
-namespace TextFlow {
-
-inline auto isWhitespace(char c) -> bool {
-	static std::string chars = " \t\n\r";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableBefore(char c) -> bool {
-	static std::string chars = "[({<|";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableAfter(char c) -> bool {
-	static std::string chars = "])}>.,:;*+-=&/\\";
-	return chars.find(c) != std::string::npos;
-}
-
-class Columns;
-
-class Column {
-	std::vector<std::string> m_strings;
-	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-	size_t m_indent = 0;
-	size_t m_initialIndent = std::string::npos;
-
-public:
-	class iterator {
-		friend Column;
-
-		Column const& m_column;
-		size_t m_stringIndex = 0;
-		size_t m_pos = 0;
-
-		size_t m_len = 0;
-		size_t m_end = 0;
-		bool m_suffix = false;
-
-		iterator(Column const& column, size_t stringIndex)
-			: m_column(column),
-			m_stringIndex(stringIndex) {}
-
-		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-		auto isBoundary(size_t at) const -> bool {
-			assert(at > 0);
-			assert(at <= line().size());
-
-			return at == line().size() ||
-				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
-				isBreakableBefore(line()[at]) ||
-				isBreakableAfter(line()[at - 1]);
-		}
-
-		void calcLength() {
-			assert(m_stringIndex < m_column.m_strings.size());
-
-			m_suffix = false;
-			auto width = m_column.m_width - indent();
-			m_end = m_pos;
-			if (line()[m_pos] == '\n') {
-				++m_end;
-			}
-			while (m_end < line().size() && line()[m_end] != '\n')
-				++m_end;
-
-			if (m_end < m_pos + width) {
-				m_len = m_end - m_pos;
-			} else {
-				size_t len = width;
-				while (len > 0 && !isBoundary(m_pos + len))
-					--len;
-				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
-					--len;
-
-				if (len > 0) {
-					m_len = len;
-				} else {
-					m_suffix = true;
-					m_len = width - 1;
-				}
-			}
-		}
-
-		auto indent() const -> size_t {
-			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-			return initial == std::string::npos ? m_column.m_indent : initial;
-		}
-
-		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Column const& column) : m_column(column) {
-			assert(m_column.m_width > m_column.m_indent);
-			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
-			calcLength();
-			if (m_len == 0)
-				m_stringIndex++; // Empty string
-		}
-
-		auto operator *() const -> std::string {
-			assert(m_stringIndex < m_column.m_strings.size());
-			assert(m_pos <= m_end);
-			return addIndentAndSuffix(line().substr(m_pos, m_len));
-		}
-
-		auto operator ++() -> iterator& {
-			m_pos += m_len;
-			if (m_pos < line().size() && line()[m_pos] == '\n')
-				m_pos += 1;
-			else
-				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
-					++m_pos;
-
-			if (m_pos == line().size()) {
-				m_pos = 0;
-				++m_stringIndex;
-			}
-			if (m_stringIndex < m_column.m_strings.size())
-				calcLength();
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return
-				m_pos == other.m_pos &&
-				m_stringIndex == other.m_stringIndex &&
-				&m_column == &other.m_column;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return !operator==(other);
-		}
-	};
-	using const_iterator = iterator;
-
-	explicit Column(std::string const& text) { m_strings.push_back(text); }
-
-	auto width(size_t newWidth) -> Column& {
-		assert(newWidth > 0);
-		m_width = newWidth;
-		return *this;
-	}
-	auto indent(size_t newIndent) -> Column& {
-		m_indent = newIndent;
-		return *this;
-	}
-	auto initialIndent(size_t newIndent) -> Column& {
-		m_initialIndent = newIndent;
-		return *this;
-	}
-
-	auto width() const -> size_t { return m_width; }
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
-		bool first = true;
-		for (auto line : col) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto operator + (Column const& other)->Columns;
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-class Spacer : public Column {
-
-public:
-	explicit Spacer(size_t spaceWidth) : Column("") {
-		width(spaceWidth);
-	}
-};
-
-class Columns {
-	std::vector<Column> m_columns;
-
-public:
-
-	class iterator {
-		friend Columns;
-		struct EndTag {};
-
-		std::vector<Column> const& m_columns;
-		std::vector<Column::iterator> m_iterators;
-		size_t m_activeIterators;
-
-		iterator(Columns const& columns, EndTag)
-			: m_columns(columns.m_columns),
-			m_activeIterators(0) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.end());
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Columns const& columns)
-			: m_columns(columns.m_columns),
-			m_activeIterators(m_columns.size()) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.begin());
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return m_iterators == other.m_iterators;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return m_iterators != other.m_iterators;
-		}
-		auto operator *() const -> std::string {
-			std::string row, padding;
-
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				auto width = m_columns[i].width();
-				if (m_iterators[i] != m_columns[i].end()) {
-					std::string col = *m_iterators[i];
-					row += padding + col;
-					if (col.size() < width)
-						padding = std::string(width - col.size(), ' ');
-					else
-						padding = "";
-				} else {
-					padding += std::string(width, ' ');
-				}
-			}
-			return row;
-		}
-		auto operator ++() -> iterator& {
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				if (m_iterators[i] != m_columns[i].end())
-					++m_iterators[i];
-			}
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-	};
-	using const_iterator = iterator;
-
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
-
-	auto operator += (Column const& col) -> Columns& {
-		m_columns.push_back(col);
-		return *this;
-	}
-	auto operator + (Column const& col) -> Columns {
-		Columns combined = *this;
-		combined += col;
-		return combined;
-	}
-
-	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
-
-		bool first = true;
-		for (auto line : cols) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-inline auto Column::operator + (Column const& other) -> Columns {
-	Columns cols;
-	cols += *this;
-	cols += other;
-	return cols;
-}
-}
-
-}
-}
-
-// ----------- end of #include from clara_textflow.hpp -----------
-// ........... back in clara.hpp
-
-#include <cctype>
-#include <string>
-#include <memory>
-#include <set>
-#include <algorithm>
-
-#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-namespace Catch { namespace clara {
-namespace detail {
-
-    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
-    template<typename L>
-    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
-
-    template<typename ClassT, typename ReturnT, typename... Args>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
-        static const bool isValid = false;
-    };
-
-    template<typename ClassT, typename ReturnT, typename ArgT>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
-        static const bool isValid = true;
-        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
-        using ReturnType = ReturnT;
-    };
-
-    class TokenStream;
-
-    // Transport for raw args (copied from main args, or supplied via init list for testing)
-    class Args {
-        friend TokenStream;
-        std::string m_exeName;
-        std::vector<std::string> m_args;
-
-    public:
-        Args( int argc, char const* const* argv )
-            : m_exeName(argv[0]),
-              m_args(argv + 1, argv + argc) {}
-
-        Args( std::initializer_list<std::string> args )
-        :   m_exeName( *args.begin() ),
-            m_args( args.begin()+1, args.end() )
-        {}
-
-        auto exeName() const -> std::string {
-            return m_exeName;
-        }
-    };
-
-    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
-    // may encode an option + its argument if the : or = form is used
-    enum class TokenType {
-        Option, Argument
-    };
-    struct Token {
-        TokenType type;
-        std::string token;
-    };
-
-    inline auto isOptPrefix( char c ) -> bool {
-        return c == '-'
-#ifdef CATCH_PLATFORM_WINDOWS
-            || c == '/'
-#endif
-        ;
-    }
-
-    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
-    class TokenStream {
-        using Iterator = std::vector<std::string>::const_iterator;
-        Iterator it;
-        Iterator itEnd;
-        std::vector<Token> m_tokenBuffer;
-
-        void loadBuffer() {
-            m_tokenBuffer.resize( 0 );
-
-            // Skip any empty strings
-            while( it != itEnd && it->empty() )
-                ++it;
-
-            if( it != itEnd ) {
-                auto const &next = *it;
-                if( isOptPrefix( next[0] ) ) {
-                    auto delimiterPos = next.find_first_of( " :=" );
-                    if( delimiterPos != std::string::npos ) {
-                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
-                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
-                    } else {
-                        if( next[1] != '-' && next.size() > 2 ) {
-                            std::string opt = "- ";
-                            for( size_t i = 1; i < next.size(); ++i ) {
-                                opt[1] = next[i];
-                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
-                            }
-                        } else {
-                            m_tokenBuffer.push_back( { TokenType::Option, next } );
-                        }
-                    }
-                } else {
-                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
-                }
-            }
-        }
-
-    public:
-        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
-
-        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
-            loadBuffer();
-        }
-
-        explicit operator bool() const {
-            return !m_tokenBuffer.empty() || it != itEnd;
-        }
-
-        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
-
-        auto operator*() const -> Token {
-            assert( !m_tokenBuffer.empty() );
-            return m_tokenBuffer.front();
-        }
-
-        auto operator->() const -> Token const * {
-            assert( !m_tokenBuffer.empty() );
-            return &m_tokenBuffer.front();
-        }
-
-        auto operator++() -> TokenStream & {
-            if( m_tokenBuffer.size() >= 2 ) {
-                m_tokenBuffer.erase( m_tokenBuffer.begin() );
-            } else {
-                if( it != itEnd )
-                    ++it;
-                loadBuffer();
-            }
-            return *this;
-        }
-    };
-
-    class ResultBase {
-    public:
-        enum Type {
-            Ok, LogicError, RuntimeError
-        };
-
-    protected:
-        ResultBase( Type type ) : m_type( type ) {}
-        virtual ~ResultBase() = default;
-
-        virtual void enforceOk() const = 0;
-
-        Type m_type;
-    };
-
-    template<typename T>
-    class ResultValueBase : public ResultBase {
-    public:
-        auto value() const -> T const & {
-            enforceOk();
-            return m_value;
-        }
-
-    protected:
-        ResultValueBase( Type type ) : ResultBase( type ) {}
-
-        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-        }
-
-        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
-            new( &m_value ) T( value );
-        }
-
-        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
-            if( m_type == ResultBase::Ok )
-                m_value.~T();
-            ResultBase::operator=(other);
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-            return *this;
-        }
-
-        ~ResultValueBase() override {
-            if( m_type == Ok )
-                m_value.~T();
-        }
-
-        union {
-            T m_value;
-        };
-    };
-
-    template<>
-    class ResultValueBase<void> : public ResultBase {
-    protected:
-        using ResultBase::ResultBase;
-    };
-
-    template<typename T = void>
-    class BasicResult : public ResultValueBase<T> {
-    public:
-        template<typename U>
-        explicit BasicResult( BasicResult<U> const &other )
-        :   ResultValueBase<T>( other.type() ),
-            m_errorMessage( other.errorMessage() )
-        {
-            assert( type() != ResultBase::Ok );
-        }
-
-        template<typename U>
-        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
-        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
-        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
-        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
-
-        explicit operator bool() const { return m_type == ResultBase::Ok; }
-        auto type() const -> ResultBase::Type { return m_type; }
-        auto errorMessage() const -> std::string { return m_errorMessage; }
-
-    protected:
-        void enforceOk() const override {
-
-            // Errors shouldn't reach this point, but if they do
-            // the actual error message will be in m_errorMessage
-            assert( m_type != ResultBase::LogicError );
-            assert( m_type != ResultBase::RuntimeError );
-            if( m_type != ResultBase::Ok )
-                std::abort();
-        }
-
-        std::string m_errorMessage; // Only populated if resultType is an error
-
-        BasicResult( ResultBase::Type type, std::string const &message )
-        :   ResultValueBase<T>(type),
-            m_errorMessage(message)
-        {
-            assert( m_type != ResultBase::Ok );
-        }
-
-        using ResultValueBase<T>::ResultValueBase;
-        using ResultBase::m_type;
-    };
-
-    enum class ParseResultType {
-        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
-    };
-
-    class ParseState {
-    public:
-
-        ParseState( ParseResultType type, TokenStream const &remainingTokens )
-        : m_type(type),
-          m_remainingTokens( remainingTokens )
-        {}
-
-        auto type() const -> ParseResultType { return m_type; }
-        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
-
-    private:
-        ParseResultType m_type;
-        TokenStream m_remainingTokens;
-    };
-
-    using Result = BasicResult<void>;
-    using ParserResult = BasicResult<ParseResultType>;
-    using InternalParseResult = BasicResult<ParseState>;
-
-    struct HelpColumns {
-        std::string left;
-        std::string right;
-    };
-
-    template<typename T>
-    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
-        std::stringstream ss;
-        ss << source;
-        ss >> target;
-        if( ss.fail() )
-            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
-        else
-            return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
-        target = source;
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
-        std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
-        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
-            target = true;
-        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
-            target = false;
-        else
-            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-#ifdef CLARA_CONFIG_OPTIONAL_TYPE
-    template<typename T>
-    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
-        T temp;
-        auto result = convertInto( source, temp );
-        if( result )
-            target = std::move(temp);
-        return result;
-    }
-#endif // CLARA_CONFIG_OPTIONAL_TYPE
-
-    struct NonCopyable {
-        NonCopyable() = default;
-        NonCopyable( NonCopyable const & ) = delete;
-        NonCopyable( NonCopyable && ) = delete;
-        NonCopyable &operator=( NonCopyable const & ) = delete;
-        NonCopyable &operator=( NonCopyable && ) = delete;
-    };
-
-    struct BoundRef : NonCopyable {
-        virtual ~BoundRef() = default;
-        virtual auto isContainer() const -> bool { return false; }
-        virtual auto isFlag() const -> bool { return false; }
-    };
-    struct BoundValueRefBase : BoundRef {
-        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
-    };
-    struct BoundFlagRefBase : BoundRef {
-        virtual auto setFlag( bool flag ) -> ParserResult = 0;
-        virtual auto isFlag() const -> bool { return true; }
-    };
-
-    template<typename T>
-    struct BoundValueRef : BoundValueRefBase {
-        T &m_ref;
-
-        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return convertInto( arg, m_ref );
-        }
-    };
-
-    template<typename T>
-    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
-        std::vector<T> &m_ref;
-
-        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
-
-        auto isContainer() const -> bool override { return true; }
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            T temp;
-            auto result = convertInto( arg, temp );
-            if( result )
-                m_ref.push_back( temp );
-            return result;
-        }
-    };
-
-    struct BoundFlagRef : BoundFlagRefBase {
-        bool &m_ref;
-
-        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            m_ref = flag;
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ReturnType>
-    struct LambdaInvoker {
-        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
-
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            return lambda( arg );
-        }
-    };
-
-    template<>
-    struct LambdaInvoker<void> {
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            lambda( arg );
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ArgType, typename L>
-    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
-        ArgType temp{};
-        auto result = convertInto( arg, temp );
-        return !result
-           ? result
-           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
-    }
-
-    template<typename L>
-    struct BoundLambda : BoundValueRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
-        }
-    };
-
-    template<typename L>
-    struct BoundFlagLambda : BoundFlagRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
-
-        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
-        }
-    };
-
-    enum class Optionality { Optional, Required };
-
-    struct Parser;
-
-    class ParserBase {
-    public:
-        virtual ~ParserBase() = default;
-        virtual auto validate() const -> Result { return Result::ok(); }
-        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
-        virtual auto cardinality() const -> size_t { return 1; }
-
-        auto parse( Args const &args ) const -> InternalParseResult {
-            return parse( args.exeName(), TokenStream( args ) );
-        }
-    };
-
-    template<typename DerivedT>
-    class ComposableParserImpl : public ParserBase {
-    public:
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser;
-
-		template<typename T>
-        auto operator+( T const &other ) const -> Parser;
-    };
-
-    // Common code and state for Args and Opts
-    template<typename DerivedT>
-    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
-    protected:
-        Optionality m_optionality = Optionality::Optional;
-        std::shared_ptr<BoundRef> m_ref;
-        std::string m_hint;
-        std::string m_description;
-
-        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
-
-    public:
-        template<typename T>
-        ParserRefImpl( T &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
-            m_hint( hint )
-        {}
-
-        template<typename LambdaT>
-        ParserRefImpl( LambdaT const &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
-            m_hint(hint)
-        {}
-
-        auto operator()( std::string const &description ) -> DerivedT & {
-            m_description = description;
-            return static_cast<DerivedT &>( *this );
-        }
-
-        auto optional() -> DerivedT & {
-            m_optionality = Optionality::Optional;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto required() -> DerivedT & {
-            m_optionality = Optionality::Required;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto isOptional() const -> bool {
-            return m_optionality == Optionality::Optional;
-        }
-
-        auto cardinality() const -> size_t override {
-            if( m_ref->isContainer() )
-                return 0;
-            else
-                return 1;
-        }
-
-        auto hint() const -> std::string { return m_hint; }
-    };
-
-    class ExeName : public ComposableParserImpl<ExeName> {
-        std::shared_ptr<std::string> m_name;
-        std::shared_ptr<BoundValueRefBase> m_ref;
-
-        template<typename LambdaT>
-        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
-            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
-        }
-
-    public:
-        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
-
-        explicit ExeName( std::string &ref ) : ExeName() {
-            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
-        }
-
-        template<typename LambdaT>
-        explicit ExeName( LambdaT const& lambda ) : ExeName() {
-            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
-        }
-
-        // The exe name is not parsed out of the normal tokens, but is handled specially
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-        }
-
-        auto name() const -> std::string { return *m_name; }
-        auto set( std::string const& newName ) -> ParserResult {
-
-            auto lastSlash = newName.find_last_of( "\\/" );
-            auto filename = ( lastSlash == std::string::npos )
-                    ? newName
-                    : newName.substr( lastSlash+1 );
-
-            *m_name = filename;
-            if( m_ref )
-                return m_ref->setValue( filename );
-            else
-                return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    class Arg : public ParserRefImpl<Arg> {
-    public:
-        using ParserRefImpl::ParserRefImpl;
-
-        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            auto const &token = *remainingTokens;
-            if( token.type != TokenType::Argument )
-                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-
-            assert( !m_ref->isFlag() );
-            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-
-            auto result = valueRef->setValue( remainingTokens->token );
-            if( !result )
-                return InternalParseResult( result );
-            else
-                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-        }
-    };
-
-    inline auto normaliseOpt( std::string const &optName ) -> std::string {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
-#endif
-            return optName;
-    }
-
-    class Opt : public ParserRefImpl<Opt> {
-    protected:
-        std::vector<std::string> m_optNames;
-
-    public:
-        template<typename LambdaT>
-        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
-
-        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
-
-        template<typename LambdaT>
-        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        template<typename T>
-        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        auto operator[]( std::string const &optName ) -> Opt & {
-            m_optNames.push_back( optName );
-            return *this;
-        }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::ostringstream oss;
-            bool first = true;
-            for( auto const &opt : m_optNames ) {
-                if (first)
-                    first = false;
-                else
-                    oss << ", ";
-                oss << opt;
-            }
-            if( !m_hint.empty() )
-                oss << " <" << m_hint << ">";
-            return { { oss.str(), m_description } };
-        }
-
-        auto isMatch( std::string const &optToken ) const -> bool {
-            auto normalisedToken = normaliseOpt( optToken );
-            for( auto const &name : m_optNames ) {
-                if( normaliseOpt( name ) == normalisedToken )
-                    return true;
-            }
-            return false;
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
-                auto const &token = *remainingTokens;
-                if( isMatch(token.token ) ) {
-                    if( m_ref->isFlag() ) {
-                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
-                        auto result = flagRef->setFlag( true );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    } else {
-                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-                        ++remainingTokens;
-                        if( !remainingTokens )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto const &argToken = *remainingTokens;
-                        if( argToken.type != TokenType::Argument )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto result = valueRef->setValue( argToken.token );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    }
-                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-                }
-            }
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-        }
-
-        auto validate() const -> Result override {
-            if( m_optNames.empty() )
-                return Result::logicError( "No options supplied to Opt" );
-            for( auto const &name : m_optNames ) {
-                if( name.empty() )
-                    return Result::logicError( "Option name cannot be empty" );
-#ifdef CATCH_PLATFORM_WINDOWS
-                if( name[0] != '-' && name[0] != '/' )
-                    return Result::logicError( "Option name must begin with '-' or '/'" );
-#else
-                if( name[0] != '-' )
-                    return Result::logicError( "Option name must begin with '-'" );
-#endif
-            }
-            return ParserRefImpl::validate();
-        }
-    };
-
-    struct Help : Opt {
-        Help( bool &showHelpFlag )
-        :   Opt([&]( bool flag ) {
-                showHelpFlag = flag;
-                return ParserResult::ok( ParseResultType::ShortCircuitAll );
-            })
-        {
-            static_cast<Opt &>( *this )
-                    ("display usage information")
-                    ["-?"]["-h"]["--help"]
-                    .optional();
-        }
-    };
-
-    struct Parser : ParserBase {
-
-        mutable ExeName m_exeName;
-        std::vector<Opt> m_options;
-        std::vector<Arg> m_args;
-
-        auto operator|=( ExeName const &exeName ) -> Parser & {
-            m_exeName = exeName;
-            return *this;
-        }
-
-        auto operator|=( Arg const &arg ) -> Parser & {
-            m_args.push_back(arg);
-            return *this;
-        }
-
-        auto operator|=( Opt const &opt ) -> Parser & {
-            m_options.push_back(opt);
-            return *this;
-        }
-
-        auto operator|=( Parser const &other ) -> Parser & {
-            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
-            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
-            return *this;
-        }
-
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser {
-            return Parser( *this ) |= other;
-        }
-
-        // Forward deprecated interface with '+' instead of '|'
-        template<typename T>
-        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
-        template<typename T>
-        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::vector<HelpColumns> cols;
-            for (auto const &o : m_options) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
-            }
-            return cols;
-        }
-
-        void writeToStream( std::ostream &os ) const {
-            if (!m_exeName.name().empty()) {
-                os << "usage:\n" << "  " << m_exeName.name() << " ";
-                bool required = true, first = true;
-                for( auto const &arg : m_args ) {
-                    if (first)
-                        first = false;
-                    else
-                        os << " ";
-                    if( arg.isOptional() && required ) {
-                        os << "[";
-                        required = false;
-                    }
-                    os << "<" << arg.hint() << ">";
-                    if( arg.cardinality() == 0 )
-                        os << " ... ";
-                }
-                if( !required )
-                    os << "]";
-                if( !m_options.empty() )
-                    os << " options";
-                os << "\n\nwhere options are:" << std::endl;
-            }
-
-            auto rows = getHelpColumns();
-            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
-            size_t optWidth = 0;
-            for( auto const &cols : rows )
-                optWidth = (std::max)(optWidth, cols.left.size() + 2);
-
-            optWidth = (std::min)(optWidth, consoleWidth/2);
-
-            for( auto const &cols : rows ) {
-                auto row =
-                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
-                        TextFlow::Spacer(4) +
-                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
-                os << row << std::endl;
-            }
-        }
-
-        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
-            parser.writeToStream( os );
-            return os;
-        }
-
-        auto validate() const -> Result override {
-            for( auto const &opt : m_options ) {
-                auto result = opt.validate();
-                if( !result )
-                    return result;
-            }
-            for( auto const &arg : m_args ) {
-                auto result = arg.validate();
-                if( !result )
-                    return result;
-            }
-            return Result::ok();
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
-
-            struct ParserInfo {
-                ParserBase const* parser = nullptr;
-                size_t count = 0;
-            };
-            const size_t totalParsers = m_options.size() + m_args.size();
-            assert( totalParsers < 512 );
-            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
-            ParserInfo parseInfos[512];
-
-            {
-                size_t i = 0;
-                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
-                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
-            }
-
-            m_exeName.set( exeName );
-
-            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-            while( result.value().remainingTokens() ) {
-                bool tokenParsed = false;
-
-                for( size_t i = 0; i < totalParsers; ++i ) {
-                    auto&  parseInfo = parseInfos[i];
-                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
-                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
-                        if (!result)
-                            return result;
-                        if (result.value().type() != ParseResultType::NoMatch) {
-                            tokenParsed = true;
-                            ++parseInfo.count;
-                            break;
-                        }
-                    }
-                }
-
-                if( result.value().type() == ParseResultType::ShortCircuitAll )
-                    return result;
-                if( !tokenParsed )
-                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
-            }
-            // !TBD Check missing required options
-            return result;
-        }
-    };
-
-    template<typename DerivedT>
-    template<typename T>
-    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
-        return Parser() | static_cast<DerivedT const &>( *this ) | other;
-    }
-} // namespace detail
-
-// A Combined parser
-using detail::Parser;
-
-// A parser for options
-using detail::Opt;
-
-// A parser for arguments
-using detail::Arg;
-
-// Wrapper for argc, argv from main()
-using detail::Args;
-
-// Specifies the name of the executable
-using detail::ExeName;
-
-// Convenience wrapper for option parser that specifies the help option
-using detail::Help;
-
-// enum of result types from a parse
-using detail::ParseResultType;
-
-// Result type for parser operation
-using detail::ParserResult;
-
-}} // namespace Catch::clara
-
-// end clara.hpp
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-// end catch_clara.h
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config );
-
-} // end namespace Catch
-
-// end catch_commandline.h
-#include <fstream>
-#include <ctime>
-
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config ) {
-
-        using namespace clara;
-
-        auto const setWarning = [&]( std::string const& warning ) {
-                auto warningSet = [&]() {
-                    if( warning == "NoAssertions" )
-                        return WarnAbout::NoAssertions;
-
-                    if ( warning == "NoTests" )
-                        return WarnAbout::NoTests;
-
-                    return WarnAbout::Nothing;
-                }();
-
-                if (warningSet == WarnAbout::Nothing)
-                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
-                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
-                std::ifstream f( filename.c_str() );
-                if( !f.is_open() )
-                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
-
-                std::string line;
-                while( std::getline( f, line ) ) {
-                    line = trim(line);
-                    if( !line.empty() && !startsWith( line, '#' ) ) {
-                        if( !startsWith( line, '"' ) )
-                            line = '"' + line + '"';
-                        config.testsOrTags.push_back( line );
-                        config.testsOrTags.emplace_back( "," );
-                    }
-                }
-                //Remove comma in the end
-                if(!config.testsOrTags.empty())
-                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
-
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setTestOrder = [&]( std::string const& order ) {
-                if( startsWith( "declared", order ) )
-                    config.runOrder = RunTests::InDeclarationOrder;
-                else if( startsWith( "lexical", order ) )
-                    config.runOrder = RunTests::InLexicographicalOrder;
-                else if( startsWith( "random", order ) )
-                    config.runOrder = RunTests::InRandomOrder;
-                else
-                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setRngSeed = [&]( std::string const& seed ) {
-                if( seed != "time" )
-                    return clara::detail::convertInto( seed, config.rngSeed );
-                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setColourUsage = [&]( std::string const& useColour ) {
-                    auto mode = toLower( useColour );
-
-                    if( mode == "yes" )
-                        config.useColour = UseColour::Yes;
-                    else if( mode == "no" )
-                        config.useColour = UseColour::No;
-                    else if( mode == "auto" )
-                        config.useColour = UseColour::Auto;
-                    else
-                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
-                auto keypressLc = toLower( keypress );
-                if (keypressLc == "never")
-                    config.waitForKeypress = WaitForKeypress::Never;
-                else if( keypressLc == "start" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStart;
-                else if( keypressLc == "exit" )
-                    config.waitForKeypress = WaitForKeypress::BeforeExit;
-                else if( keypressLc == "both" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
-                else
-                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
-            return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setVerbosity = [&]( std::string const& verbosity ) {
-            auto lcVerbosity = toLower( verbosity );
-            if( lcVerbosity == "quiet" )
-                config.verbosity = Verbosity::Quiet;
-            else if( lcVerbosity == "normal" )
-                config.verbosity = Verbosity::Normal;
-            else if( lcVerbosity == "high" )
-                config.verbosity = Verbosity::High;
-            else
-                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-        auto const setReporter = [&]( std::string const& reporter ) {
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-
-            auto lcReporter = toLower( reporter );
-            auto result = factories.find( lcReporter );
-
-            if( factories.end() != result )
-                config.reporterName = lcReporter;
-            else
-                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-
-        auto cli
-            = ExeName( config.processName )
-            | Help( config.showHelp )
-            | Opt( config.listTests )
-                ["-l"]["--list-tests"]
-                ( "list all/matching test cases" )
-            | Opt( config.listTags )
-                ["-t"]["--list-tags"]
-                ( "list all/matching tags" )
-            | Opt( config.showSuccessfulTests )
-                ["-s"]["--success"]
-                ( "include successful tests in output" )
-            | Opt( config.shouldDebugBreak )
-                ["-b"]["--break"]
-                ( "break into debugger on failure" )
-            | Opt( config.noThrow )
-                ["-e"]["--nothrow"]
-                ( "skip exception tests" )
-            | Opt( config.showInvisibles )
-                ["-i"]["--invisibles"]
-                ( "show invisibles (tabs, newlines)" )
-            | Opt( config.outputFilename, "filename" )
-                ["-o"]["--out"]
-                ( "output filename" )
-            | Opt( setReporter, "name" )
-                ["-r"]["--reporter"]
-                ( "reporter to use (defaults to console)" )
-            | Opt( config.name, "name" )
-                ["-n"]["--name"]
-                ( "suite name" )
-            | Opt( [&]( bool ){ config.abortAfter = 1; } )
-                ["-a"]["--abort"]
-                ( "abort at first failure" )
-            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
-                ["-x"]["--abortx"]
-                ( "abort after x failures" )
-            | Opt( setWarning, "warning name" )
-                ["-w"]["--warn"]
-                ( "enable warnings" )
-            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
-                ["-d"]["--durations"]
-                ( "show test durations" )
-            | Opt( config.minDuration, "seconds" )
-                ["-D"]["--min-duration"]
-                ( "show test durations for tests taking at least the given number of seconds" )
-            | Opt( loadTestNamesFromFile, "filename" )
-                ["-f"]["--input-file"]
-                ( "load test names to run from a file" )
-            | Opt( config.filenamesAsTags )
-                ["-#"]["--filenames-as-tags"]
-                ( "adds a tag for the filename" )
-            | Opt( config.sectionsToRun, "section name" )
-                ["-c"]["--section"]
-                ( "specify section to run" )
-            | Opt( setVerbosity, "quiet|normal|high" )
-                ["-v"]["--verbosity"]
-                ( "set output verbosity" )
-            | Opt( config.listTestNamesOnly )
-                ["--list-test-names-only"]
-                ( "list all/matching test cases names only" )
-            | Opt( config.listReporters )
-                ["--list-reporters"]
-                ( "list all reporters" )
-            | Opt( setTestOrder, "decl|lex|rand" )
-                ["--order"]
-                ( "test case order (defaults to decl)" )
-            | Opt( setRngSeed, "'time'|number" )
-                ["--rng-seed"]
-                ( "set a specific seed for random numbers" )
-            | Opt( setColourUsage, "yes|no" )
-                ["--use-colour"]
-                ( "should output be colourised" )
-            | Opt( config.libIdentify )
-                ["--libidentify"]
-                ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "never|start|exit|both" )
-                ["--wait-for-keypress"]
-                ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkSamples, "samples" )
-                ["--benchmark-samples"]
-                ( "number of samples to collect (default: 100)" )
-            | Opt( config.benchmarkResamples, "resamples" )
-                ["--benchmark-resamples"]
-                ( "number of resamples for the bootstrap (default: 100000)" )
-            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
-                ["--benchmark-confidence-interval"]
-                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
-            | Opt( config.benchmarkNoAnalysis )
-                ["--benchmark-no-analysis"]
-                ( "perform only measurements; do not perform any analysis" )
-            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
-                ["--benchmark-warmup-time"]
-                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
-            | Arg( config.testsOrTags, "test name|pattern|tags" )
-                ( "which test or tests to use" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-// end catch_commandline.cpp
-// start catch_common.cpp
-
-#include <cstring>
-#include <ostream>
-
-namespace Catch {
-
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
-        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        // We can assume that the same file will usually have the same pointer.
-        // Thus, if the pointers are the same, there is no point in calling the strcmp
-        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << '(' << info.line << ')';
-#else
-        os << info.file << ':' << info.line;
-#endif
-        return os;
-    }
-
-    std::string StreamEndStop::operator+() const {
-        return std::string();
-    }
-
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
-// end catch_common.cpp
-// start catch_config.cpp
-
-namespace Catch {
-
-    Config::Config( ConfigData const& data )
-    :   m_data( data ),
-        m_stream( openStream() )
-    {
-        // We need to trim filter specs to avoid trouble with superfluous
-        // whitespace (esp. important for bdd macros, as those are manually
-        // aligned with whitespace).
-
-        for (auto& elem : m_data.testsOrTags) {
-            elem = trim(elem);
-        }
-        for (auto& elem : m_data.sectionsToRun) {
-            elem = trim(elem);
-        }
-
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (!m_data.testsOrTags.empty()) {
-            m_hasTestFilters = true;
-            for (auto const& testOrTags : m_data.testsOrTags) {
-                parser.parse(testOrTags);
-            }
-        }
-        m_testSpec = parser.testSpec();
-    }
-
-    std::string const& Config::getFilename() const {
-        return m_data.outputFilename ;
-    }
-
-    bool Config::listTests() const          { return m_data.listTests; }
-    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
-    bool Config::listTags() const           { return m_data.listTags; }
-    bool Config::listReporters() const      { return m_data.listReporters; }
-
-    std::string Config::getProcessName() const { return m_data.processName; }
-    std::string const& Config::getReporterName() const { return m_data.reporterName; }
-
-    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
-    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
-
-    TestSpec const& Config::testSpec() const { return m_testSpec; }
-    bool Config::hasTestFilters() const { return m_hasTestFilters; }
-
-    bool Config::showHelp() const { return m_data.showHelp; }
-
-    // IConfig interface
-    bool Config::allowThrows() const                   { return !m_data.noThrow; }
-    std::ostream& Config::stream() const               { return m_stream->stream(); }
-    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
-    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
-    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
-    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
-    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
-    double Config::minDuration() const                 { return m_data.minDuration; }
-    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
-    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
-    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
-    int Config::abortAfter() const                     { return m_data.abortAfter; }
-    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
-    Verbosity Config::verbosity() const                { return m_data.verbosity; }
-
-    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
-    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
-    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
-    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
-    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
-
-    IStream const* Config::openStream() {
-        return Catch::makeStream(m_data.outputFilename);
-    }
-
-} // end namespace Catch
-// end catch_config.cpp
-// start catch_console_colour.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-// start catch_errno_guard.h
-
-namespace Catch {
-
-    class ErrnoGuard {
-    public:
-        ErrnoGuard();
-        ~ErrnoGuard();
-    private:
-        int m_oldErrno;
-    };
-
-}
-
-// end catch_errno_guard.h
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#include <sstream>
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() = default;
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) override {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-
-                default:
-                    CATCH_ERROR( "Unknown colour requested" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = UseColour::Yes;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0;34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-                case Colour::BrightYellow:  return setColour( "[1;33m" );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            getCurrentContext().getConfig()->stream()
-                << '\033' << _escapeCode;
-        }
-    };
-
-    bool useColourOnPlatform() {
-        return
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-            !isDebuggerActive() &&
-#endif
-#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
-            isatty(STDOUT_FILENO)
-#else
-            false
-#endif
-            ;
-    }
-    IColourImpl* platformColourInstance() {
-        ErrnoGuard guard;
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = useColourOnPlatform()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved = true;
-    }
-    Colour& Colour::operator=( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved  = true;
-        return *this;
-    }
-
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        // Strictly speaking, this cannot possibly happen.
-        // However, under some conditions it does happen (see #1626),
-        // and this change is small enough that we can let practicality
-        // triumph over purity in this case.
-        if (impl != nullptr) {
-            impl->use( _colourCode );
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, Colour const& ) {
-        return os;
-    }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_console_colour.cpp
-// start catch_context.cpp
-
-namespace Catch {
-
-    class Context : public IMutableContext, NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-        IRunner* getRunner() override {
-            return m_runner;
-        }
-
-        IConfigPtr const& getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setRunner( IRunner* runner ) override {
-            m_runner = runner;
-        }
-        void setConfig( IConfigPtr const& config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfigPtr m_config;
-        IRunner* m_runner = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
-        currentContext = new Context();
-    }
-
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
-    }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
-
-    SimplePcg32& rng() {
-        static SimplePcg32 s_rng;
-        return s_rng;
-    }
-
-}
-// end catch_context.cpp
-// start catch_debug_console.cpp
-
-// start catch_debug_console.h
-
-#include <string>
-
-namespace Catch {
-    void writeToDebugConsole( std::string const& text );
-}
-
-// end catch_debug_console.h
-#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#include <android/log.h>
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
-        }
-    }
-
-#elif defined(CATCH_PLATFORM_WINDOWS)
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-
-#else
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-
-#endif // Platform
-// end catch_debug_console.cpp
-// start catch_debugger.cpp
-
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-
-#  include <cassert>
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <cstddef>
-#  include <ostream>
-
-#ifdef __apple_build_version__
-    // These headers will only compile with AppleClang (XCode)
-    // For other compilers (Clang, GCC, ... ) we need to exclude them
-#  include <sys/sysctl.h>
-#endif
-
-    namespace Catch {
-        #ifdef __apple_build_version__
-        // The following function is taken directly from the following technical note:
-        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-            int                 mib[4];
-            struct kinfo_proc   info;
-            std::size_t         size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-        #else
-        bool isDebuggerActive() {
-            // We need to find another way to determine this for non-appleclang compilers on macOS
-            return false;
-        }
-        #endif
-    } // namespace Catch
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    #include <fstream>
-    #include <string>
-
-    namespace Catch{
-        // The standard POSIX way of detecting a debugger is to attempt to
-        // ptrace() the process, but this needs to be done from a child and not
-        // this process itself to still allow attaching to this process later
-        // if wanted, so is rather heavy. Under Linux we have the PID of the
-        // "debugger" (which doesn't need to be gdb, of course, it could also
-        // be strace, for example) in /proc/$PID/status, so just get it from
-        // there instead.
-        bool isDebuggerActive(){
-            // Libstdc++ has a bug, where std::ifstream sets errno to 0
-            // This way our users can properly assert over errno values
-            ErrnoGuard guard;
-            std::ifstream in("/proc/self/status");
-            for( std::string line; std::getline(in, line); ) {
-                static const int PREFIX_LEN = 11;
-                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
-                    // We're traced if the PID is not 0 and no other PID starts
-                    // with 0 digit, so it's enough to check for just a single
-                    // character.
-                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-                }
-            }
-
-            return false;
-        }
-    } // namespace Catch
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-// end catch_debugger.cpp
-// start catch_decomposer.cpp
-
-namespace Catch {
-
-    ITransientExpression::~ITransientExpression() = default;
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
-        if( lhs.size() + rhs.size() < 40 &&
-                lhs.find('\n') == std::string::npos &&
-                rhs.find('\n') == std::string::npos )
-            os << lhs << " " << op << " " << rhs;
-        else
-            os << lhs << "\n" << op << "\n" << rhs;
-    }
-}
-// end catch_decomposer.cpp
-// start catch_enforce.cpp
-
-#include <stdexcept>
-
-namespace Catch {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
-    [[noreturn]]
-    void throw_exception(std::exception const& e) {
-        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
-                      << "The message was: " << e.what() << '\n';
-        std::terminate();
-    }
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg) {
-        throw_exception(std::logic_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg) {
-        throw_exception(std::domain_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg) {
-        throw_exception(std::runtime_error(msg));
-    }
-
-} // namespace Catch;
-// end catch_enforce.cpp
-// start catch_enum_values_registry.cpp
-// start catch_enum_values_registry.h
-
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    namespace Detail {
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
-
-        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
-
-            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
-
-            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
-        };
-
-        std::vector<StringRef> parseEnums( StringRef enums );
-
-    } // Detail
-
-} // Catch
-
-// end catch_enum_values_registry.h
-
-#include <map>
-#include <cassert>
-
-namespace Catch {
-
-    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
-
-    namespace Detail {
-
-        namespace {
-            // Extracts the actual name part of an enum instance
-            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
-            StringRef extractInstanceName(StringRef enumInstance) {
-                // Find last occurrence of ":"
-                size_t name_start = enumInstance.size();
-                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
-                    --name_start;
-                }
-                return enumInstance.substr(name_start, enumInstance.size() - name_start);
-            }
-        }
-
-        std::vector<StringRef> parseEnums( StringRef enums ) {
-            auto enumValues = splitStringRef( enums, ',' );
-            std::vector<StringRef> parsed;
-            parsed.reserve( enumValues.size() );
-            for( auto const& enumValue : enumValues ) {
-                parsed.push_back(trim(extractInstanceName(enumValue)));
-            }
-            return parsed;
-        }
-
-        EnumInfo::~EnumInfo() {}
-
-        StringRef EnumInfo::lookup( int value ) const {
-            for( auto const& valueToName : m_values ) {
-                if( valueToName.first == value )
-                    return valueToName.second;
-            }
-            return "{** unexpected enum value **}"_sr;
-        }
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
-            enumInfo->m_name = enumName;
-            enumInfo->m_values.reserve( values.size() );
-
-            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
-            assert( valueNames.size() == values.size() );
-            std::size_t i = 0;
-            for( auto value : values )
-                enumInfo->m_values.emplace_back(value, valueNames[i++]);
-
-            return enumInfo;
-        }
-
-        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
-            return *m_enumInfos.back();
-        }
-
-    } // Detail
-} // Catch
-
-// end catch_enum_values_registry.cpp
-// start catch_errno_guard.cpp
-
-#include <cerrno>
-
-namespace Catch {
-        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
-        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
-}
-// end catch_errno_guard.cpp
-// start catch_exception_translator_registry.cpp
-
-// start catch_exception_translator_registry.h
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry();
-        virtual void registerTranslator( const IExceptionTranslator* translator );
-        std::string translateActiveException() const override;
-        std::string tryTranslators() const;
-
-    private:
-        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
-    };
-}
-
-// end catch_exception_translator_registry.h
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
-    }
-
-    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
-        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        try {
-#ifdef __OBJC__
-            // In Objective-C try objective-c exceptions first
-            @try {
-                return tryTranslators();
-            }
-            @catch (NSException *exception) {
-                return Catch::Detail::stringify( [exception description] );
-            }
-#else
-            // Compiling a mixed mode project with MSVC means that CLR
-            // exceptions will be caught in (...) as well. However, these
-            // do not fill-in std::current_exception and thus lead to crash
-            // when attempting rethrow.
-            // /EHa switch also causes structured exceptions to be caught
-            // here, but they fill-in current_exception properly, so
-            // at worst the output should be a little weird, instead of
-            // causing a crash.
-            if (std::current_exception() == nullptr) {
-                return "Non C++ exception. Possibly a CLR exception.";
-            }
-            return tryTranslators();
-#endif
-        }
-        catch( TestFailureException& ) {
-            std::rethrow_exception(std::current_exception());
-        }
-        catch( std::exception& ex ) {
-            return ex.what();
-        }
-        catch( std::string& msg ) {
-            return msg;
-        }
-        catch( const char* msg ) {
-            return msg;
-        }
-        catch(...) {
-            return "Unknown exception";
-        }
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
-#else // ^^ Exceptions are enabled // Exceptions are disabled vv
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-#endif
-
-}
-// end catch_exception_translator_registry.cpp
-// start catch_fatal_condition.cpp
-
-#include <algorithm>
-
-#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace Catch {
-
-    // If neither SEH nor signal handling is required, the handler impls
-    // do not have to do anything, and can be empty.
-    void FatalConditionHandler::engage_platform() {}
-    void FatalConditionHandler::disengage_platform() {}
-    FatalConditionHandler::FatalConditionHandler() = default;
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-} // end namespace Catch
-
-#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
-#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
-#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace {
-    //! Signals fatal error message to the run context
-    void reportFatal( char const * const message ) {
-        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
-    }
-
-    //! Minimal size Catch2 needs for its own fatal error handling.
-    //! Picked anecdotally, so it might not be sufficient on all
-    //! platforms, and for all configurations.
-    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
-} // end unnamed namespace
-
-#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-
-    struct SignalDefs { DWORD id; const char* name; };
-
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    static SignalDefs signalDefs[] = {
-        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
-        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
-        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
-        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
-    };
-
-    static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-        for (auto const& def : signalDefs) {
-            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
-                reportFatal(def.name);
-            }
-        }
-        // If its not an exception we care about, pass it along.
-        // This stops us from eating debugger breaks etc.
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    // Since we do not support multiple instantiations, we put these
-    // into global variables and rely on cleaning them up in outlined
-    // constructors/destructors
-    static PVOID exceptionHandlerHandle = nullptr;
-
-    // For MSVC, we reserve part of the stack memory for handling
-    // memory overflow structured exception.
-    FatalConditionHandler::FatalConditionHandler() {
-        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
-        if (!SetThreadStackGuarantee(&guaranteeSize)) {
-            // We do not want to fully error out, because needing
-            // the stack reserve should be rare enough anyway.
-            Catch::cerr()
-                << "Failed to reserve piece of stack."
-                << " Stack overflows will not be reported successfully.";
-        }
-    }
-
-    // We do not attempt to unset the stack guarantee, because
-    // Windows does not support lowering the stack size guarantee.
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-    void FatalConditionHandler::engage_platform() {
-        // Register as first handler in current chain
-        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        if (!exceptionHandlerHandle) {
-            CATCH_RUNTIME_ERROR("Could not register vectored exception handler");
-        }
-    }
-
-    void FatalConditionHandler::disengage_platform() {
-        if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) {
-            CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler");
-        }
-        exceptionHandlerHandle = nullptr;
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_WINDOWS_SEH
-
-#if defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct SignalDefs {
-        int id;
-        const char* name;
-    };
-
-    static SignalDefs signalDefs[] = {
-        { SIGINT,  "SIGINT - Terminal interrupt signal" },
-        { SIGILL,  "SIGILL - Illegal instruction signal" },
-        { SIGFPE,  "SIGFPE - Floating point error signal" },
-        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-        { SIGTERM, "SIGTERM - Termination request signal" },
-        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-    };
-
-// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
-// which is zero initialization, but not explicit. We want to avoid
-// that.
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-    static char* altStackMem = nullptr;
-    static std::size_t altStackSize = 0;
-    static stack_t oldSigStack{};
-    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
-
-    static void restorePreviousSignalHandlers() {
-        // We set signal handlers back to the previous ones. Hopefully
-        // nobody overwrote them in the meantime, and doesn't expect
-        // their signal handlers to live past ours given that they
-        // installed them after ours..
-        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-        }
-        // Return the old stack
-        sigaltstack(&oldSigStack, nullptr);
-    }
-
-    static void handleSignal( int sig ) {
-        char const * name = "<unknown signal>";
-        for (auto const& def : signalDefs) {
-            if (sig == def.id) {
-                name = def.name;
-                break;
-            }
-        }
-        // We need to restore previous signal handlers and let them do
-        // their thing, so that the users can have the debugger break
-        // when a signal is raised, and so on.
-        restorePreviousSignalHandlers();
-        reportFatal( name );
-        raise( sig );
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
-        if (altStackSize == 0) {
-            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
-        }
-        altStackMem = new char[altStackSize]();
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        delete[] altStackMem;
-        // We signal that another instance can be constructed by zeroing
-        // out the pointer.
-        altStackMem = nullptr;
-    }
-
-    void FatalConditionHandler::engage_platform() {
-        stack_t sigStack;
-        sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = altStackSize;
-        sigStack.ss_flags = 0;
-        sigaltstack(&sigStack, &oldSigStack);
-        struct sigaction sa = { };
-
-        sa.sa_handler = handleSignal;
-        sa.sa_flags = SA_ONSTACK;
-        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-        }
-    }
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-
-    void FatalConditionHandler::disengage_platform() {
-        restorePreviousSignalHandlers();
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_POSIX_SIGNALS
-// end catch_fatal_condition.cpp
-// start catch_generators.cpp
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-const char* GeneratorException::what() const noexcept {
-    return m_msg;
-}
-
-namespace Generators {
-
-    GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
-    }
-
-} // namespace Generators
-} // namespace Catch
-// end catch_generators.cpp
-// start catch_interfaces_capture.cpp
-
-namespace Catch {
-    IResultCapture::~IResultCapture() = default;
-}
-// end catch_interfaces_capture.cpp
-// start catch_interfaces_config.cpp
-
-namespace Catch {
-    IConfig::~IConfig() = default;
-}
-// end catch_interfaces_config.cpp
-// start catch_interfaces_exception.cpp
-
-namespace Catch {
-    IExceptionTranslator::~IExceptionTranslator() = default;
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
-// end catch_interfaces_exception.cpp
-// start catch_interfaces_registry_hub.cpp
-
-namespace Catch {
-    IRegistryHub::~IRegistryHub() = default;
-    IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
-// end catch_interfaces_registry_hub.cpp
-// start catch_interfaces_reporter.cpp
-
-// start catch_reporter_listening.h
-
-namespace Catch {
-
-    class ListeningReporter : public IStreamingReporter {
-        using Reporters = std::vector<IStreamingReporterPtr>;
-        Reporters m_listeners;
-        IStreamingReporterPtr m_reporter = nullptr;
-        ReporterPreferences m_preferences;
-
-    public:
-        ListeningReporter();
-
-        void addListener( IStreamingReporterPtr&& listener );
-        void addReporter( IStreamingReporterPtr&& reporter );
-
-    public: // IStreamingReporter
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases( std::string const& spec ) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testRunStarting( TestRunInfo const& testRunInfo ) override;
-        void testGroupStarting( GroupInfo const& groupInfo ) override;
-        void testCaseStarting( TestCaseInfo const& testInfo ) override;
-        void sectionStarting( SectionInfo const& sectionInfo ) override;
-        void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-        // The return value indicates if the messages buffer should be cleared:
-        bool assertionEnded( AssertionStats const& assertionStats ) override;
-        void sectionEnded( SectionStats const& sectionStats ) override;
-        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-        void testRunEnded( TestRunStats const& testRunStats ) override;
-
-        void skipTest( TestCaseInfo const& testInfo ) override;
-        bool isMulti() const override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_listening.h
-namespace Catch {
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
-    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
-    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-    std::ostream& ReporterConfig::stream() const { return *m_stream; }
-    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
-
-    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
-
-    GroupInfo::GroupInfo(  std::string const& _name,
-                           std::size_t _groupIndex,
-                           std::size_t _groupsCount )
-    :   name( _name ),
-        groupIndex( _groupIndex ),
-        groupsCounts( _groupsCount )
-    {}
-
-     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
-                                     std::vector<MessageInfo> const& _infoMessages,
-                                     Totals const& _totals )
-    :   assertionResult( _assertionResult ),
-        infoMessages( _infoMessages ),
-        totals( _totals )
-    {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
-        if( assertionResult.hasMessage() ) {
-            // Copy message into messages list.
-            // !TBD This should have been done earlier, somewhere
-            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-            builder << assertionResult.getMessage();
-            builder.m_info.message = builder.m_stream.str();
-
-            infoMessages.push_back( builder.m_info );
-        }
-    }
-
-     AssertionStats::~AssertionStats() = default;
-
-    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
-                                 Counts const& _assertions,
-                                 double _durationInSeconds,
-                                 bool _missingAssertions )
-    :   sectionInfo( _sectionInfo ),
-        assertions( _assertions ),
-        durationInSeconds( _durationInSeconds ),
-        missingAssertions( _missingAssertions )
-    {}
-
-    SectionStats::~SectionStats() = default;
-
-    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
-                                   Totals const& _totals,
-                                   std::string const& _stdOut,
-                                   std::string const& _stdErr,
-                                   bool _aborting )
-    : testInfo( _testInfo ),
-        totals( _totals ),
-        stdOut( _stdOut ),
-        stdErr( _stdErr ),
-        aborting( _aborting )
-    {}
-
-    TestCaseStats::~TestCaseStats() = default;
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
-                                    Totals const& _totals,
-                                    bool _aborting )
-    :   groupInfo( _groupInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
-    :   groupInfo( _groupInfo ),
-        aborting( false )
-    {}
-
-    TestGroupStats::~TestGroupStats() = default;
-
-    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
-                    Totals const& _totals,
-                    bool _aborting )
-    :   runInfo( _runInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestRunStats::~TestRunStats() = default;
-
-    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
-    bool IStreamingReporter::isMulti() const { return false; }
-
-    IReporterFactory::~IReporterFactory() = default;
-    IReporterRegistry::~IReporterRegistry() = default;
-
-} // end namespace Catch
-// end catch_interfaces_reporter.cpp
-// start catch_interfaces_runner.cpp
-
-namespace Catch {
-    IRunner::~IRunner() = default;
-}
-// end catch_interfaces_runner.cpp
-// start catch_interfaces_testcase.cpp
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
-    ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
-// end catch_interfaces_testcase.cpp
-// start catch_leak_detector.cpp
-
-#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
-#include <crtdbg.h>
-
-namespace Catch {
-
-    LeakDetector::LeakDetector() {
-        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-        flag |= _CRTDBG_LEAK_CHECK_DF;
-        flag |= _CRTDBG_ALLOC_MEM_DF;
-        _CrtSetDbgFlag(flag);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        // Change this to leaking allocation's number to break there
-        _CrtSetBreakAlloc(-1);
-    }
-}
-
-#else
-
-    Catch::LeakDetector::LeakDetector() {}
-
-#endif
-
-Catch::LeakDetector::~LeakDetector() {
-    Catch::cleanUp();
-}
-// end catch_leak_detector.cpp
-// start catch_list.cpp
-
-// start catch_list.h
-
-#include <set>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config );
-
-    std::size_t listTestsNamesOnly( Config const& config );
-
-    struct TagInfo {
-        void add( std::string const& spelling );
-        std::string all() const;
-
-        std::set<std::string> spellings;
-        std::size_t count = 0;
-    };
-
-    std::size_t listTags( Config const& config );
-
-    std::size_t listReporters();
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config );
-
-} // end namespace Catch
-
-// end catch_list.h
-// start catch_text.h
-
-namespace Catch {
-    using namespace clara::TextFlow;
-}
-
-// end catch_text.h
-#include <limits>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-        }
-
-        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
-            if( config.verbosity() >= Verbosity::High ) {
-                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
-                std::string description = testCaseInfo.description;
-                if( description.empty() )
-                    description = "(NO DESCRIPTION)";
-                Catch::cout() << Column( description ).indent(4) << std::endl;
-            }
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
-        }
-
-        if( !config.hasTestFilters() )
-            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
-        return matchedTestCases.size();
-    }
-
-    std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            matchedTests++;
-            if( startsWith( testCaseInfo.name, '#' ) )
-               Catch::cout() << '"' << testCaseInfo.name << '"';
-            else
-               Catch::cout() << testCaseInfo.name;
-            if ( config.verbosity() >= Verbosity::High )
-                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
-            Catch::cout() << std::endl;
-        }
-        return matchedTests;
-    }
-
-    void TagInfo::add( std::string const& spelling ) {
-        ++count;
-        spellings.insert( spelling );
-    }
-
-    std::string TagInfo::all() const {
-        size_t size = 0;
-        for (auto const& spelling : spellings) {
-            // Add 2 for the brackes
-            size += spelling.size() + 2;
-        }
-
-        std::string out; out.reserve(size);
-        for (auto const& spelling : spellings) {
-            out += '[';
-            out += spelling;
-            out += ']';
-        }
-        return out;
-    }
-
-    std::size_t listTags( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCase : matchedTestCases ) {
-            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
-                std::string lcaseTagName = toLower( tagName );
-                auto countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( auto const& tagCount : tagCounts ) {
-            ReusableStringStream rss;
-            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
-            auto str = rss.str();
-            auto wrapper = Column( tagCount.second.all() )
-                                                    .initialIndent( 0 )
-                                                    .indent( str.size() )
-                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
-            Catch::cout() << str << wrapper << '\n';
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
-        return tagCounts.size();
-    }
-
-    std::size_t listReporters() {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        std::size_t maxNameLen = 0;
-        for( auto const& factoryKvp : factories )
-            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
-
-        for( auto const& factoryKvp : factories ) {
-            Catch::cout()
-                    << Column( factoryKvp.first + ":" )
-                            .indent(2)
-                            .width( 5+maxNameLen )
-                    +  Column( factoryKvp.second->getDescription() )
-                            .initialIndent(0)
-                            .indent(2)
-                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
-                    << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
-        Option<std::size_t> listedCount;
-        getCurrentMutableContext().setConfig( config );
-        if( config->listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( *config );
-        if( config->listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
-        if( config->listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( *config );
-        if( config->listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters();
-        return listedCount;
-    }
-
-} // end namespace Catch
-// end catch_list.cpp
-// start catch_matchers.cpp
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        std::string MatcherUntypedBase::toString() const {
-            if( m_cachedToString.empty() )
-                m_cachedToString = describe();
-            return m_cachedToString;
-        }
-
-        MatcherUntypedBase::~MatcherUntypedBase() = default;
-
-    } // namespace Impl
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-// end catch_matchers.cpp
-// start catch_matchers_exception.cpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-bool ExceptionMessageMatcher::match(std::exception const& ex) const {
-    return ex.what() == m_message;
-}
-
-std::string ExceptionMessageMatcher::describe() const {
-    return "exception message matches \"" + m_message + "\"";
-}
-
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
-}
-
-// namespace Exception
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_exception.cpp
-// start catch_matchers_floating.cpp
-
-// start catch_polyfills.hpp
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-// end catch_polyfills.hpp
-// start catch_to_string.hpp
-
-#include <string>
-
-namespace Catch {
-    template <typename T>
-    std::string to_string(T const& t) {
-#if defined(CATCH_CONFIG_CPP11_TO_STRING)
-        return std::to_string(t);
-#else
-        ReusableStringStream rss;
-        rss << t;
-        return rss.str();
-#endif
-    }
-} // end namespace Catch
-
-// end catch_to_string.hpp
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <type_traits>
-#include <iomanip>
-#include <limits>
-
-namespace Catch {
-namespace {
-
-    int32_t convert(float f) {
-        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-        int32_t i;
-        std::memcpy(&i, &f, sizeof(f));
-        return i;
-    }
-
-    int64_t convert(double d) {
-        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-        int64_t i;
-        std::memcpy(&i, &d, sizeof(d));
-        return i;
-    }
-
-    template <typename FP>
-    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
-        // Comparison with NaN should always be false.
-        // This way we can rule it out before getting into the ugly details
-        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
-            return false;
-        }
-
-        auto lc = convert(lhs);
-        auto rc = convert(rhs);
-
-        if ((lc < 0) != (rc < 0)) {
-            // Potentially we can have +0 and -0
-            return lhs == rhs;
-        }
-
-        // static cast as a workaround for IBM XLC
-        auto ulpDiff = std::abs(static_cast<FP>(lc - rc));
-        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
-    }
-
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
-
-template <typename FP>
-FP step(FP start, FP direction, uint64_t steps) {
-    for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-        start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
-    }
-    return start;
-}
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-template <typename FloatingPoint>
-void write(std::ostream& out, FloatingPoint num) {
-    out << std::scientific
-        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
-        << num;
-}
-
-} // end anonymous namespace
-
-namespace Matchers {
-namespace Floating {
-
-    enum class FloatingPointKind : uint8_t {
-        Float,
-        Double
-    };
-
-    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
-        :m_target{ target }, m_margin{ margin } {
-        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
-            << " Margin has to be non-negative.");
-    }
-
-    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
-    // But without the subtraction to allow for INFINITY in comparison
-    bool WithinAbsMatcher::match(double const& matchee) const {
-        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
-    }
-
-    std::string WithinAbsMatcher::describe() const {
-        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
-    }
-
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
-        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        CATCH_ENFORCE(m_type == FloatingPointKind::Double
-                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
-            "Provided ULP is impossibly large for a float comparison.");
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-// Clang <3.5 reports on the default branch in the switch below
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-
-    bool WithinUlpsMatcher::match(double const& matchee) const {
-        switch (m_type) {
-        case FloatingPointKind::Float:
-            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
-        case FloatingPointKind::Double:
-            return almostEqualUlps<double>(matchee, m_target, m_ulps);
-        default:
-            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
-        }
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-    std::string WithinUlpsMatcher::describe() const {
-        std::stringstream ret;
-
-        ret << "is within " << m_ulps << " ULPs of ";
-
-        if (m_type == FloatingPointKind::Float) {
-            write(ret, static_cast<float>(m_target));
-            ret << 'f';
-        } else {
-            write(ret, m_target);
-        }
-
-        ret << " ([";
-        if (m_type == FloatingPointKind::Double) {
-            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
-        } else {
-            // We have to cast INFINITY to float because of MinGW, see #1782
-            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
-        }
-        ret << "])";
-
-        return ret.str();
-    }
-
-    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
-        m_target(target),
-        m_epsilon(epsilon){
-        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
-        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
-    }
-
-    bool WithinRelMatcher::match(double const& matchee) const {
-        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
-        return marginComparison(matchee, m_target,
-                                std::isinf(relMargin)? 0 : relMargin);
-    }
-
-    std::string WithinRelMatcher::describe() const {
-        Catch::ReusableStringStream sstr;
-        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
-        return sstr.str();
-    }
-
-}// namespace Floating
-
-Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
-}
-
-Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
-}
-
-Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
-    return Floating::WithinAbsMatcher(target, margin);
-}
-
-Floating::WithinRelMatcher WithinRel(double target, double eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(double target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
-}
-
-Floating::WithinRelMatcher WithinRel(float target, float eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(float target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
-}
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_floating.cpp
-// start catch_matchers_generic.cpp
-
-std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
-    if (desc.empty()) {
-        return "matches undescribed predicate";
-    } else {
-        return "matches predicate: \"" + desc + '"';
-    }
-}
-// end catch_matchers_generic.cpp
-// start catch_matchers_string.cpp
-
-#include <regex>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_str( adjustString( str ) )
-        {}
-        std::string CasedString::adjustString( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? toLower( str )
-                   : str;
-        }
-        std::string CasedString::caseSensitivitySuffix() const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
-                   : std::string();
-        }
-
-        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
-        : m_comparator( comparator ),
-          m_operation( operation ) {
-        }
-
-        std::string StringMatcherBase::describe() const {
-            std::string description;
-            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
-                                        m_comparator.caseSensitivitySuffix().size());
-            description += m_operation;
-            description += ": \"";
-            description += m_comparator.m_str;
-            description += "\"";
-            description += m_comparator.caseSensitivitySuffix();
-            return description;
-        }
-
-        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
-
-        bool EqualsMatcher::match( std::string const& source ) const {
-            return m_comparator.adjustString( source ) == m_comparator.m_str;
-        }
-
-        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
-
-        bool ContainsMatcher::match( std::string const& source ) const {
-            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
-
-        bool StartsWithMatcher::match( std::string const& source ) const {
-            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
-
-        bool EndsWithMatcher::match( std::string const& source ) const {
-            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
-
-        bool RegexMatcher::match(std::string const& matchee) const {
-            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
-            if (m_caseSensitivity == CaseSensitive::Choice::No) {
-                flags |= std::regex::icase;
-            }
-            auto reg = std::regex(m_regex, flags);
-            return std::regex_match(matchee, reg);
-        }
-
-        std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
-        }
-
-    } // namespace StdString
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-
-    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
-        return StdString::RegexMatcher(regex, caseSensitivity);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_string.cpp
-// start catch_message.cpp
-
-// start catch_uncaught_exceptions.h
-
-namespace Catch {
-    bool uncaught_exceptions();
-} // end namespace Catch
-
-// end catch_uncaught_exceptions.h
-#include <cassert>
-#include <stack>
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   StringRef const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    bool MessageInfo::operator==( MessageInfo const& other ) const {
-        return sequence == other.sequence;
-    }
-
-    bool MessageInfo::operator<( MessageInfo const& other ) const {
-        return sequence < other.sequence;
-    }
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
-                                           SourceLineInfo const& lineInfo,
-                                           ResultWas::OfType type )
-        :m_info(macroName, lineInfo, type) {}
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info ), m_moved()
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-
-    ScopedMessage::ScopedMessage( ScopedMessage&& old )
-    : m_info( old.m_info ), m_moved()
-    {
-        old.m_moved = true;
-    }
-
-    ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() && !m_moved ){
-            getResultCapture().popScopedMessage(m_info);
-        }
-    }
-
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
-        auto trimmed = [&] (size_t start, size_t end) {
-            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
-                ++start;
-            }
-            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
-                --end;
-            }
-            return names.substr(start, end - start + 1);
-        };
-        auto skipq = [&] (size_t start, char quote) {
-            for (auto i = start + 1; i < names.size() ; ++i) {
-                if (names[i] == quote)
-                    return i;
-                if (names[i] == '\\')
-                    ++i;
-            }
-            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
-        };
-
-        size_t start = 0;
-        std::stack<char> openings;
-        for (size_t pos = 0; pos < names.size(); ++pos) {
-            char c = names[pos];
-            switch (c) {
-            case '[':
-            case '{':
-            case '(':
-            // It is basically impossible to disambiguate between
-            // comparison and start of template args in this context
-//            case '<':
-                openings.push(c);
-                break;
-            case ']':
-            case '}':
-            case ')':
-//           case '>':
-                openings.pop();
-                break;
-            case '"':
-            case '\'':
-                pos = skipq(pos, c);
-                break;
-            case ',':
-                if (start != pos && openings.empty()) {
-                    m_messages.emplace_back(macroName, lineInfo, resultType);
-                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
-                    m_messages.back().message += " := ";
-                    start = pos;
-                }
-            }
-        }
-        assert(openings.empty() && "Mismatched openings");
-        m_messages.emplace_back(macroName, lineInfo, resultType);
-        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
-        m_messages.back().message += " := ";
-    }
-    Capturer::~Capturer() {
-        if ( !uncaught_exceptions() ){
-            assert( m_captured == m_messages.size() );
-            for( size_t i = 0; i < m_captured; ++i  )
-                m_resultCapture.popScopedMessage( m_messages[i] );
-        }
-    }
-
-    void Capturer::captureValue( size_t index, std::string const& value ) {
-        assert( index < m_messages.size() );
-        m_messages[index].message += value;
-        m_resultCapture.pushScopedMessage( m_messages[index] );
-        m_captured++;
-    }
-
-} // end namespace Catch
-// end catch_message.cpp
-// start catch_output_redirect.cpp
-
-// start catch_output_redirect.h
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-
-#include <cstdio>
-#include <iosfwd>
-#include <string>
-
-namespace Catch {
-
-    class RedirectedStream {
-        std::ostream& m_originalStream;
-        std::ostream& m_redirectionStream;
-        std::streambuf* m_prevBuf;
-
-    public:
-        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
-        ~RedirectedStream();
-    };
-
-    class RedirectedStdOut {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cout;
-    public:
-        RedirectedStdOut();
-        auto str() const -> std::string;
-    };
-
-    // StdErr has two constituent streams in C++, std::cerr and std::clog
-    // This means that we need to redirect 2 streams into 1 to keep proper
-    // order of writes
-    class RedirectedStdErr {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cerr;
-        RedirectedStream m_clog;
-    public:
-        RedirectedStdErr();
-        auto str() const -> std::string;
-    };
-
-    class RedirectedStreams {
-    public:
-        RedirectedStreams(RedirectedStreams const&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
-        RedirectedStreams(RedirectedStreams&&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
-
-        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
-        ~RedirectedStreams();
-    private:
-        std::string& m_redirectedCout;
-        std::string& m_redirectedCerr;
-        RedirectedStdOut m_redirectedStdOut;
-        RedirectedStdErr m_redirectedStdErr;
-    };
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-    // Windows's implementation of std::tmpfile is terrible (it tries
-    // to create a file inside system folder, thus requiring elevated
-    // privileges for the binary), so we have to use tmpnam(_s) and
-    // create the file ourselves there.
-    class TempFile {
-    public:
-        TempFile(TempFile const&) = delete;
-        TempFile& operator=(TempFile const&) = delete;
-        TempFile(TempFile&&) = delete;
-        TempFile& operator=(TempFile&&) = delete;
-
-        TempFile();
-        ~TempFile();
-
-        std::FILE* getFile();
-        std::string getContents();
-
-    private:
-        std::FILE* m_file = nullptr;
-    #if defined(_MSC_VER)
-        char m_buffer[L_tmpnam] = { 0 };
-    #endif
-    };
-
-    class OutputRedirect {
-    public:
-        OutputRedirect(OutputRedirect const&) = delete;
-        OutputRedirect& operator=(OutputRedirect const&) = delete;
-        OutputRedirect(OutputRedirect&&) = delete;
-        OutputRedirect& operator=(OutputRedirect&&) = delete;
-
-        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
-        ~OutputRedirect();
-
-    private:
-        int m_originalStdout = -1;
-        int m_originalStderr = -1;
-        TempFile m_stdoutFile;
-        TempFile m_stderrFile;
-        std::string& m_stdoutDest;
-        std::string& m_stderrDest;
-    };
-
-#endif
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-// end catch_output_redirect.h
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #include <io.h>      //_dup and _dup2
-    #define dup _dup
-    #define dup2 _dup2
-    #define fileno _fileno
-    #else
-    #include <unistd.h>  // dup and dup2
-    #endif
-#endif
-
-namespace Catch {
-
-    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
-    :   m_originalStream( originalStream ),
-        m_redirectionStream( redirectionStream ),
-        m_prevBuf( m_originalStream.rdbuf() )
-    {
-        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
-    }
-
-    RedirectedStream::~RedirectedStream() {
-        m_originalStream.rdbuf( m_prevBuf );
-    }
-
-    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
-    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStdErr::RedirectedStdErr()
-    :   m_cerr( Catch::cerr(), m_rss.get() ),
-        m_clog( Catch::clog(), m_rss.get() )
-    {}
-    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
-    :   m_redirectedCout(redirectedCout),
-        m_redirectedCerr(redirectedCerr)
-    {}
-
-    RedirectedStreams::~RedirectedStreams() {
-        m_redirectedCout += m_redirectedStdOut.str();
-        m_redirectedCerr += m_redirectedStdErr.str();
-    }
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-#if defined(_MSC_VER)
-    TempFile::TempFile() {
-        if (tmpnam_s(m_buffer)) {
-            CATCH_RUNTIME_ERROR("Could not get a temp filename");
-        }
-        if (fopen_s(&m_file, m_buffer, "w+")) {
-            char buffer[100];
-            if (strerror_s(buffer, errno)) {
-                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
-            }
-            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
-        }
-    }
-#else
-    TempFile::TempFile() {
-        m_file = std::tmpfile();
-        if (!m_file) {
-            CATCH_RUNTIME_ERROR("Could not create a temp file.");
-        }
-    }
-
-#endif
-
-    TempFile::~TempFile() {
-         // TBD: What to do about errors here?
-         std::fclose(m_file);
-         // We manually create the file on Windows only, on Linux
-         // it will be autodeleted
-#if defined(_MSC_VER)
-         std::remove(m_buffer);
-#endif
-    }
-
-    FILE* TempFile::getFile() {
-        return m_file;
-    }
-
-    std::string TempFile::getContents() {
-        std::stringstream sstr;
-        char buffer[100] = {};
-        std::rewind(m_file);
-        while (std::fgets(buffer, sizeof(buffer), m_file)) {
-            sstr << buffer;
-        }
-        return sstr.str();
-    }
-
-    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
-        m_originalStdout(dup(1)),
-        m_originalStderr(dup(2)),
-        m_stdoutDest(stdout_dest),
-        m_stderrDest(stderr_dest) {
-        dup2(fileno(m_stdoutFile.getFile()), 1);
-        dup2(fileno(m_stderrFile.getFile()), 2);
-    }
-
-    OutputRedirect::~OutputRedirect() {
-        Catch::cout() << std::flush;
-        fflush(stdout);
-        // Since we support overriding these streams, we flush cerr
-        // even though std::cerr is unbuffered
-        Catch::cerr() << std::flush;
-        Catch::clog() << std::flush;
-        fflush(stderr);
-
-        dup2(m_originalStdout, 1);
-        dup2(m_originalStderr, 2);
-
-        m_stdoutDest += m_stdoutFile.getContents();
-        m_stderrDest += m_stderrFile.getContents();
-    }
-
-#endif // CATCH_CONFIG_NEW_CAPTURE
-
-} // namespace Catch
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #undef dup
-    #undef dup2
-    #undef fileno
-    #endif
-#endif
-// end catch_output_redirect.cpp
-// start catch_polyfills.cpp
-
-#include <cmath>
-
-namespace Catch {
-
-#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-    bool isnan(float f) {
-        return std::isnan(f);
-    }
-    bool isnan(double d) {
-        return std::isnan(d);
-    }
-#else
-    // For now we only use this for embarcadero
-    bool isnan(float f) {
-        return std::_isnan(f);
-    }
-    bool isnan(double d) {
-        return std::_isnan(d);
-    }
-#endif
-
-} // end namespace Catch
-// end catch_polyfills.cpp
-// start catch_random_number_generator.cpp
-
-namespace Catch {
-
-namespace {
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4146) // we negate uint32 during the rotate
-#endif
-        // Safe rotr implementation thanks to John Regehr
-        uint32_t rotate_right(uint32_t val, uint32_t count) {
-            const uint32_t mask = 31;
-            count &= mask;
-            return (val >> count) | (val << (-count & mask));
-        }
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-}
-
-    SimplePcg32::SimplePcg32(result_type seed_) {
-        seed(seed_);
-    }
-
-    void SimplePcg32::seed(result_type seed_) {
-        m_state = 0;
-        (*this)();
-        m_state += seed_;
-        (*this)();
-    }
-
-    void SimplePcg32::discard(uint64_t skip) {
-        // We could implement this to run in O(log n) steps, but this
-        // should suffice for our use case.
-        for (uint64_t s = 0; s < skip; ++s) {
-            static_cast<void>((*this)());
-        }
-    }
-
-    SimplePcg32::result_type SimplePcg32::operator()() {
-        // prepare the output value
-        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
-        const auto output = rotate_right(xorshifted, m_state >> 59u);
-
-        // advance state
-        m_state = m_state * 6364136223846793005ULL + s_inc;
-
-        return output;
-    }
-
-    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state == rhs.m_state;
-    }
-
-    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state != rhs.m_state;
-    }
-}
-// end catch_random_number_generator.cpp
-// start catch_registry_hub.cpp
-
-// start catch_test_case_registry_impl.h
-
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <ios>
-
-namespace Catch {
-
-    class TestCase;
-    struct IConfig;
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        virtual ~TestRegistry() = default;
-
-        virtual void registerTest( TestCase const& testCase );
-
-        std::vector<TestCase> const& getAllTests() const override;
-        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        std::size_t m_unnamedCount = 0;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class TestInvokerAsFunction : public ITestInvoker {
-        void(*m_testAsFunction)();
-    public:
-        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
-
-        void invoke() const override;
-    };
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
-
-    ///////////////////////////////////////////////////////////////////////////
-
-} // end namespace Catch
-
-// end catch_test_case_registry_impl.h
-// start catch_reporter_registry.h
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        ~ReporterRegistry() override;
-
-        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
-
-        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
-        void registerListener( IReporterFactoryPtr const& factory );
-
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// end catch_reporter_registry.h
-// start catch_tag_alias_registry.h
-
-// start catch_tag_alias.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias.h
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        ~TagAliasRegistry() override;
-        TagAlias const* find( std::string const& alias ) const override;
-        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
-        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias_registry.h
-// start catch_startup_exception_registry.h
-
-#include <vector>
-#include <exception>
-
-namespace Catch {
-
-    class StartupExceptionRegistry {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    public:
-        void add(std::exception_ptr const& exception) noexcept;
-        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
-    private:
-        std::vector<std::exception_ptr> m_exceptions;
-#endif
-    };
-
-} // end namespace Catch
-
-// end catch_startup_exception_registry.h
-// start catch_singletons.hpp
-
-namespace Catch {
-
-    struct ISingleton {
-        virtual ~ISingleton();
-    };
-
-    void addSingleton( ISingleton* singleton );
-    void cleanupSingletons();
-
-    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
-    class Singleton : SingletonImplT, public ISingleton {
-
-        static auto getInternal() -> Singleton* {
-            static Singleton* s_instance = nullptr;
-            if( !s_instance ) {
-                s_instance = new Singleton;
-                addSingleton( s_instance );
-            }
-            return s_instance;
-        }
-
-    public:
-        static auto get() -> InterfaceT const& {
-            return *getInternal();
-        }
-        static auto getMutable() -> MutableInterfaceT& {
-            return *getInternal();
-        }
-    };
-
-} // namespace Catch
-
-// end catch_singletons.hpp
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
-                            private NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            void registerListener( IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerListener( factory );
-            }
-            void registerTest( TestCase const& testInfo ) override {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            void registerTranslator( const IExceptionTranslator* translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                m_exceptionRegistry.add(std::current_exception());
-#else
-                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-#endif
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-// end catch_registry_hub.cpp
-// start catch_reporter_registry.cpp
-
-namespace Catch {
-
-    ReporterRegistry::~ReporterRegistry() = default;
-
-    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( ReporterConfig( config ) );
-    }
-
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
-        m_factories.emplace(name, factory);
-    }
-    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
-        m_listeners.push_back( factory );
-    }
-
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
-    }
-
-}
-// end catch_reporter_registry.cpp
-// start catch_result_type.cpp
-
-namespace Catch {
-
-    bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-// end catch_result_type.cpp
-// start catch_run_context.cpp
-
-#include <cassert>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( nameAndLocation, ctx, parent )
-            {}
-            ~GeneratorTracker();
-
-            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
-                std::shared_ptr<GeneratorTracker> tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if (currentTracker.nameAndLocation() == nameAndLocation) {
-                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
-                    assert(thisTracker);
-                    assert(thisTracker->isGeneratorTracker());
-                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
-                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
-                } else {
-                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
-                    currentTracker.addChild( tracker );
-                }
-
-                if( !tracker->isComplete() ) {
-                    tracker->open();
-                }
-
-                return *tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // If a generator has a child (it is followed by a section)
-                // and none of its children have started, then we must wait
-                // until later to start consuming its values.
-                // This catches cases where `GENERATE` is placed between two
-                // `SECTION`s.
-                // **The check for m_children.empty cannot be removed**.
-                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
-                const bool should_wait_for_child = [&]() {
-                    // No children -> nobody to wait for
-                    if ( m_children.empty() ) {
-                        return false;
-                    }
-                    // If at least one child started executing, don't wait
-                    if ( std::find_if(
-                             m_children.begin(),
-                             m_children.end(),
-                             []( TestCaseTracking::ITrackerPtr tracker ) {
-                                 return tracker->hasStarted();
-                             } ) != m_children.end() ) {
-                        return false;
-                    }
-
-                    // No children have started. We need to check if they _can_
-                    // start, and thus we should wait for them, or they cannot
-                    // start (due to filters), and we shouldn't wait for them
-                    auto* parent = m_parent;
-                    // This is safe: there is always at least one section
-                    // tracker in a test case tracking tree
-                    while ( !parent->isSectionTracker() ) {
-                        parent = &( parent->parent() );
-                    }
-                    assert( parent &&
-                            "Missing root (test case) level section" );
-
-                    auto const& parentSection =
-                        static_cast<SectionTracker&>( *parent );
-                    auto const& filters = parentSection.getFilters();
-                    // No filters -> no restrictions on running sections
-                    if ( filters.empty() ) {
-                        return true;
-                    }
-
-                    for ( auto const& child : m_children ) {
-                        if ( child->isSectionTracker() &&
-                             std::find( filters.begin(),
-                                        filters.end(),
-                                        static_cast<SectionTracker&>( *child )
-                                            .trimmedName() ) !=
-                                 filters.end() ) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }();
-
-                // This check is a bit tricky, because m_generator->next()
-                // has a side-effect, where it consumes generator's current
-                // value, but we do not want to invoke the side-effect if
-                // this generator is still waiting for any child to start.
-                if ( should_wait_for_child ||
-                     ( m_runState == CompletedSuccessfully &&
-                       m_generator->next() ) ) {
-                    m_children.clear();
-                    m_runState = Executing;
-                }
-            }
-
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = std::move( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() {}
-    }
-
-    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
-    :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
-        m_config(_config),
-        m_reporter(std::move(reporter)),
-        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
-        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
-    {
-        m_context.setRunner(this);
-        m_context.setConfig(m_config);
-        m_context.setResultCapture(this);
-        m_reporter->testRunStarting(m_runInfo);
-    }
-
-    RunContext::~RunContext() {
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
-    }
-
-    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
-    }
-
-    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
-    }
-
-    Totals RunContext::runTest(TestCase const& testCase) {
-        Totals prevTotals = m_totals;
-
-        std::string redirectedCout;
-        std::string redirectedCerr;
-
-        auto const& testInfo = testCase.getTestCaseInfo();
-
-        m_reporter->testCaseStarting(testInfo);
-
-        m_activeTestCase = &testCase;
-
-        ITracker& rootTracker = m_trackerContext.startRun();
-        assert(rootTracker.isSectionTracker());
-        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
-        do {
-            m_trackerContext.startCycle();
-            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
-            runCurrentTest(redirectedCout, redirectedCerr);
-        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
-
-        Totals deltaTotals = m_totals.delta(prevTotals);
-        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
-            deltaTotals.assertions.failed++;
-            deltaTotals.testCases.passed--;
-            deltaTotals.testCases.failed++;
-        }
-        m_totals.testCases += deltaTotals.testCases;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  redirectedCout,
-                                  redirectedCerr,
-                                  aborting()));
-
-        m_activeTestCase = nullptr;
-        m_testCaseTracker = nullptr;
-
-        return deltaTotals;
-    }
-
-    IConfigPtr RunContext::config() const {
-        return m_config;
-    }
-
-    IStreamingReporter& RunContext::reporter() const {
-        return *m_reporter;
-    }
-
-    void RunContext::assertionEnded(AssertionResult const & result) {
-        if (result.getResultType() == ResultWas::Ok) {
-            m_totals.assertions.passed++;
-            m_lastAssertionPassed = true;
-        } else if (!result.isOk()) {
-            m_lastAssertionPassed = false;
-            if( m_activeTestCase->getTestCaseInfo().okToFail() )
-                m_totals.assertions.failedButOk++;
-            else
-                m_totals.assertions.failed++;
-        }
-        else {
-            m_lastAssertionPassed = true;
-        }
-
-        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
-        // and should be let to clear themselves out.
-        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
-
-        if (result.getResultType() != ResultWas::Warning)
-            m_messageScopes.clear();
-
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
-    }
-    void RunContext::resetAssertionInfo() {
-        m_lastAssertionInfo.macroName = StringRef();
-        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
-    }
-
-    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
-        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
-        if (!sectionTracker.isOpen())
-            return false;
-        m_activeSections.push_back(&sectionTracker);
-
-        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-        m_reporter->sectionStarting(sectionInfo);
-
-        assertions = m_totals.assertions;
-
-        return true;
-    }
-    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        using namespace Generators;
-        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
-                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
-        m_lastAssertionInfo.lineInfo = lineInfo;
-        return tracker;
-    }
-
-    bool RunContext::testForMissingAssertions(Counts& assertions) {
-        if (assertions.total() != 0)
-            return false;
-        if (!m_config->warnAboutMissingAssertions())
-            return false;
-        if (m_trackerContext.currentTracker().hasChildren())
-            return false;
-        m_totals.assertions.failed++;
-        assertions.failed++;
-        return true;
-    }
-
-    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
-        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        if (!m_activeSections.empty()) {
-            m_activeSections.back()->close();
-            m_activeSections.pop_back();
-        }
-
-        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
-        m_messages.clear();
-        m_messageScopes.clear();
-    }
-
-    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
-        if (m_unfinishedSections.empty())
-            m_activeSections.back()->fail();
-        else
-            m_activeSections.back()->close();
-        m_activeSections.pop_back();
-
-        m_unfinishedSections.push_back(endInfo);
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void RunContext::benchmarkPreparing(std::string const& name) {
-        m_reporter->benchmarkPreparing(name);
-    }
-    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
-        m_reporter->benchmarkStarting( info );
-    }
-    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
-        m_reporter->benchmarkEnded( stats );
-    }
-    void RunContext::benchmarkFailed(std::string const & error) {
-        m_reporter->benchmarkFailed(error);
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void RunContext::pushScopedMessage(MessageInfo const & message) {
-        m_messages.push_back(message);
-    }
-
-    void RunContext::popScopedMessage(MessageInfo const & message) {
-        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
-    }
-
-    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
-        m_messageScopes.emplace_back( builder );
-    }
-
-    std::string RunContext::getCurrentTestName() const {
-        return m_activeTestCase
-            ? m_activeTestCase->getTestCaseInfo().name
-            : std::string();
-    }
-
-    const AssertionResult * RunContext::getLastResult() const {
-        return &(*m_lastResult);
-    }
-
-    void RunContext::exceptionEarlyReported() {
-        m_shouldReportUnexpected = false;
-    }
-
-    void RunContext::handleFatalErrorCondition( StringRef message ) {
-        // First notify reporter that bad things happened
-        m_reporter->fatalErrorEncountered(message);
-
-        // Don't rebuild the result -- the stringification itself can cause more fatal errors
-        // Instead, fake a result data.
-        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = static_cast<std::string>(message);
-        AssertionResult result(m_lastAssertionInfo, tempResult);
-
-        assertionEnded(result);
-
-        handleUnfinishedSections();
-
-        // Recreate section for test case (as we will lose the one that was in scope)
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-
-        Counts assertions;
-        assertions.failed = 1;
-        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
-        m_reporter->sectionEnded(testCaseSectionStats);
-
-        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
-
-        Totals deltaTotals;
-        deltaTotals.testCases.failed = 1;
-        deltaTotals.assertions.failed = 1;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  std::string(),
-                                  std::string(),
-                                  false));
-        m_totals.testCases.failed++;
-        testGroupEnded(std::string(), m_totals, 1, 1);
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
-    }
-
-    bool RunContext::lastAssertionPassed() {
-         return m_lastAssertionPassed;
-    }
-
-    void RunContext::assertionPassed() {
-        m_lastAssertionPassed = true;
-        ++m_totals.assertions.passed;
-        resetAssertionInfo();
-        m_messageScopes.clear();
-    }
-
-    bool RunContext::aborting() const {
-        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
-    }
-
-    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-        m_reporter->sectionStarting(testCaseSection);
-        Counts prevAssertions = m_totals.assertions;
-        double duration = 0;
-        m_shouldReportUnexpected = true;
-        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
-
-        seedRng(*m_config);
-
-        Timer timer;
-        CATCH_TRY {
-            if (m_reporter->getPreferences().shouldRedirectStdOut) {
-#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
-
-                timer.start();
-                invokeActiveTestCase();
-#else
-                OutputRedirect r(redirectedCout, redirectedCerr);
-                timer.start();
-                invokeActiveTestCase();
-#endif
-            } else {
-                timer.start();
-                invokeActiveTestCase();
-            }
-            duration = timer.getElapsedSeconds();
-        } CATCH_CATCH_ANON (TestFailureException&) {
-            // This just means the test was aborted due to failure
-        } CATCH_CATCH_ALL {
-            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
-            // are reported without translation at the point of origin.
-            if( m_shouldReportUnexpected ) {
-                AssertionReaction dummyReaction;
-                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
-            }
-        }
-        Counts assertions = m_totals.assertions - prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        m_testCaseTracker->close();
-        handleUnfinishedSections();
-        m_messages.clear();
-        m_messageScopes.clear();
-
-        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
-        m_reporter->sectionEnded(testCaseSectionStats);
-    }
-
-    void RunContext::invokeActiveTestCase() {
-        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
-        m_activeTestCase->invoke();
-    }
-
-    void RunContext::handleUnfinishedSections() {
-        // If sections ended prematurely due to an exception we stored their
-        // infos here so we can tear them down outside the unwind process.
-        for (auto it = m_unfinishedSections.rbegin(),
-             itEnd = m_unfinishedSections.rend();
-             it != itEnd;
-             ++it)
-            sectionEnded(*it);
-        m_unfinishedSections.clear();
-    }
-
-    void RunContext::handleExpr(
-        AssertionInfo const& info,
-        ITransientExpression const& expr,
-        AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        bool negated = isFalseTest( info.resultDisposition );
-        bool result = expr.getResult() != negated;
-
-        if( result ) {
-            if (!m_includeSuccessfulResults) {
-                assertionPassed();
-            }
-            else {
-                reportExpr(info, ResultWas::Ok, &expr, negated);
-            }
-        }
-        else {
-            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
-            populateReaction( reaction );
-        }
-    }
-    void RunContext::reportExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            ITransientExpression const *expr,
-            bool negated ) {
-
-        m_lastAssertionInfo = info;
-        AssertionResultData data( resultType, LazyExpression( negated ) );
-
-        AssertionResult assertionResult{ info, data };
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
-
-        assertionEnded( assertionResult );
-    }
-
-    void RunContext::handleMessage(
-            AssertionInfo const& info,
-            ResultWas::OfType resultType,
-            StringRef const& message,
-            AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = static_cast<std::string>(message);
-        AssertionResult assertionResult{ m_lastAssertionInfo, data };
-        assertionEnded( assertionResult );
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-    void RunContext::handleUnexpectedExceptionNotThrown(
-            AssertionInfo const& info,
-            AssertionReaction& reaction
-    ) {
-        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
-    }
-
-    void RunContext::handleUnexpectedInflightException(
-            AssertionInfo const& info,
-            std::string const& message,
-            AssertionReaction& reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-        populateReaction( reaction );
-    }
-
-    void RunContext::populateReaction( AssertionReaction& reaction ) {
-        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
-        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
-    }
-
-    void RunContext::handleIncomplete(
-            AssertionInfo const& info
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-    }
-    void RunContext::handleNonExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            AssertionReaction &reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-
-    IResultCapture& getResultCapture() {
-        if (auto* capture = getCurrentContext().getResultCapture())
-            return *capture;
-        else
-            CATCH_INTERNAL_ERROR("No result capture instance");
-    }
-
-    void seedRng(IConfig const& config) {
-        if (config.rngSeed() != 0) {
-            std::srand(config.rngSeed());
-            rng().seed(config.rngSeed());
-        }
-    }
-
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-}
-// end catch_run_context.cpp
-// start catch_section.cpp
-
-namespace Catch {
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
-            if( uncaught_exceptions() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-// end catch_section.cpp
-// start catch_section_info.cpp
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name )
-    :   name( _name ),
-        lineInfo( _lineInfo )
-    {}
-
-} // end namespace Catch
-// end catch_section_info.cpp
-// start catch_session.cpp
-
-// start catch_session.h
-
-#include <memory>
-
-namespace Catch {
-
-    class Session : NonCopyable {
-    public:
-
-        Session();
-        ~Session() override;
-
-        void showHelp() const;
-        void libIdentify();
-
-        int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-        int applyCommandLine( int argc, wchar_t const * const * argv );
-    #endif
-
-        void useConfigData( ConfigData const& configData );
-
-        template<typename CharT>
-        int run(int argc, CharT const * const argv[]) {
-            if (m_startupExceptions)
-                return 1;
-            int returnCode = applyCommandLine(argc, argv);
-            if (returnCode == 0)
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run();
-
-        clara::Parser const& cli() const;
-        void cli( clara::Parser const& newParser );
-        ConfigData& configData();
-        Config& config();
-    private:
-        int runInternal();
-
-        clara::Parser m_cli;
-        ConfigData m_configData;
-        std::shared_ptr<Config> m_config;
-        bool m_startupExceptions = false;
-    };
-
-} // end namespace Catch
-
-// end catch_session.h
-// start catch_version.h
-
-#include <iosfwd>
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version( Version const& ) = delete;
-        Version& operator=( Version const& ) = delete;
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    char const * const _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        char const * const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-    };
-
-    Version const& libraryVersion();
-}
-
-// end catch_version.h
-#include <cstdlib>
-#include <iomanip>
-#include <set>
-#include <iterator>
-
-namespace Catch {
-
-    namespace {
-        const int MaxExitCode = 255;
-
-        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
-            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
-            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
-
-            return reporter;
-        }
-
-        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
-            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
-                return createReporter(config->getReporterName(), config);
-            }
-
-            // On older platforms, returning std::unique_ptr<ListeningReporter>
-            // when the return type is std::unique_ptr<IStreamingReporter>
-            // doesn't compile without a std::move call. However, this causes
-            // a warning on newer platforms. Thus, we have to work around
-            // it a bit and downcast the pointer manually.
-            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-            auto& multi = static_cast<ListeningReporter&>(*ret);
-            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
-            for (auto const& listener : listeners) {
-                multi.addListener(listener->create(Catch::ReporterConfig(config)));
-            }
-            multi.addReporter(createReporter(config->getReporterName(), config));
-            return ret;
-        }
-
-        class TestGroup {
-        public:
-            explicit TestGroup(std::shared_ptr<Config> const& config)
-            : m_config{config}
-            , m_context{config, makeReporter(config)}
-            {
-                auto const& allTestCases = getAllTestCasesSorted(*m_config);
-                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-
-                if (m_matches.empty() && invalidArgs.empty()) {
-                    for (auto const& test : allTestCases)
-                        if (!test.isHidden())
-                            m_tests.emplace(&test);
-                } else {
-                    for (auto const& match : m_matches)
-                        m_tests.insert(match.tests.begin(), match.tests.end());
-                }
-            }
-
-            Totals execute() {
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-                Totals totals;
-                m_context.testGroupStarting(m_config->name(), 1, 1);
-                for (auto const& testCase : m_tests) {
-                    if (!m_context.aborting())
-                        totals += m_context.runTest(*testCase);
-                    else
-                        m_context.reporter().skipTest(*testCase);
-                }
-
-                for (auto const& match : m_matches) {
-                    if (match.tests.empty()) {
-                        m_context.reporter().noMatchingTestCases(match.name);
-                        totals.error = -1;
-                    }
-                }
-
-                if (!invalidArgs.empty()) {
-                    for (auto const& invalidArg: invalidArgs)
-                         m_context.reporter().reportInvalidArguments(invalidArg);
-                }
-
-                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
-                return totals;
-            }
-
-        private:
-            using Tests = std::set<TestCase const*>;
-
-            std::shared_ptr<Config> m_config;
-            RunContext m_context;
-            Tests m_tests;
-            TestSpec::Matches m_matches;
-        };
-
-        void applyFilenamesAsTags(Catch::IConfig const& config) {
-            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
-            for (auto& testCase : tests) {
-                auto tags = testCase.tags;
-
-                std::string filename = testCase.lineInfo.file;
-                auto lastSlash = filename.find_last_of("\\/");
-                if (lastSlash != std::string::npos) {
-                    filename.erase(0, lastSlash);
-                    filename[0] = '#';
-                }
-
-                auto lastDot = filename.find_last_of('.');
-                if (lastDot != std::string::npos) {
-                    filename.erase(lastDot);
-                }
-
-                tags.push_back(std::move(filename));
-                setTags(testCase, tags);
-            }
-        }
-
-    } // anon namespace
-
-    Session::Session() {
-        static bool alreadyInstantiated = false;
-        if( alreadyInstantiated ) {
-            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
-        }
-
-        // There cannot be exceptions at startup in no-exception mode.
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
-        if ( !exceptions.empty() ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-
-            m_startupExceptions = true;
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << "Errors occurred during startup!" << '\n';
-            // iterate over all exceptions and notify user
-            for ( const auto& ex_ptr : exceptions ) {
-                try {
-                    std::rethrow_exception(ex_ptr);
-                } catch ( std::exception const& ex ) {
-                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
-                }
-            }
-        }
-#endif
-
-        alreadyInstantiated = true;
-        m_cli = makeCommandLineParser( m_configData );
-    }
-    Session::~Session() {
-        Catch::cleanUp();
-    }
-
-    void Session::showHelp() const {
-        Catch::cout()
-                << "\nCatch v" << libraryVersion() << "\n"
-                << m_cli << std::endl
-                << "For more detailed usage please see the project docs\n" << std::endl;
-    }
-    void Session::libIdentify() {
-        Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
-                << std::left << std::setw(16) << "category: " << "testframework\n"
-                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
-                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
-    }
-
-    int Session::applyCommandLine( int argc, char const * const * argv ) {
-        if( m_startupExceptions )
-            return 1;
-
-        auto result = m_cli.parse( clara::Args( argc, argv ) );
-        if( !result ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-            Catch::cerr()
-                << Colour( Colour::Red )
-                << "\nError(s) in input:\n"
-                << Column( result.errorMessage() ).indent( 2 )
-                << "\n\n";
-            Catch::cerr() << "Run with -? for usage\n" << std::endl;
-            return MaxExitCode;
-        }
-
-        if( m_configData.showHelp )
-            showHelp();
-        if( m_configData.libIdentify )
-            libIdentify();
-        m_config.reset();
-        return 0;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
-
-        char **utf8Argv = new char *[ argc ];
-
-        for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
-
-            utf8Argv[ i ] = new char[ bufSize ];
-
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
-        }
-
-        int returnCode = applyCommandLine( argc, utf8Argv );
-
-        for ( int i = 0; i < argc; ++i )
-            delete [] utf8Argv[ i ];
-
-        delete [] utf8Argv;
-
-        return returnCode;
-    }
-#endif
-
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run() {
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        int exitCode = runInternal();
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        return exitCode;
-    }
-
-    clara::Parser const& Session::cli() const {
-        return m_cli;
-    }
-    void Session::cli( clara::Parser const& newParser ) {
-        m_cli = newParser;
-    }
-    ConfigData& Session::configData() {
-        return m_configData;
-    }
-    Config& Session::config() {
-        if( !m_config )
-            m_config = std::make_shared<Config>( m_configData );
-        return *m_config;
-    }
-
-    int Session::runInternal() {
-        if( m_startupExceptions )
-            return 1;
-
-        if (m_configData.showHelp || m_configData.libIdentify) {
-            return 0;
-        }
-
-        CATCH_TRY {
-            config(); // Force config to be constructed
-
-            seedRng( *m_config );
-
-            if( m_configData.filenamesAsTags )
-                applyFilenamesAsTags( *m_config );
-
-            // Handle list request
-            if( Option<std::size_t> listed = list( m_config ) )
-                return static_cast<int>( *listed );
-
-            TestGroup tests { m_config };
-            auto const totals = tests.execute();
-
-            if( m_config->warnAboutNoTests() && totals.error == -1 )
-                return 2;
-
-            // Note that on unices only the lower 8 bits are usually used, clamping
-            // the return value to 255 prevents false negative when some multiple
-            // of 256 tests has failed
-            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
-        }
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        catch( std::exception& ex ) {
-            Catch::cerr() << ex.what() << std::endl;
-            return MaxExitCode;
-        }
-#endif
-    }
-
-} // end namespace Catch
-// end catch_session.cpp
-// start catch_singletons.cpp
-
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        static auto getSingletons() -> std::vector<ISingleton*>*& {
-            static std::vector<ISingleton*>* g_singletons = nullptr;
-            if( !g_singletons )
-                g_singletons = new std::vector<ISingleton*>();
-            return g_singletons;
-        }
-    }
-
-    ISingleton::~ISingleton() {}
-
-    void addSingleton(ISingleton* singleton ) {
-        getSingletons()->push_back( singleton );
-    }
-    void cleanupSingletons() {
-        auto& singletons = getSingletons();
-        for( auto singleton : *singletons )
-            delete singleton;
-        delete singletons;
-        singletons = nullptr;
-    }
-
-} // namespace Catch
-// end catch_singletons.cpp
-// start catch_startup_exception_registry.cpp
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-namespace Catch {
-void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        CATCH_TRY {
-            m_exceptions.push_back(exception);
-        } CATCH_CATCH_ALL {
-            // If we run out of memory during start-up there's really not a lot more we can do about it
-            std::terminate();
-        }
-    }
-
-    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
-        return m_exceptions;
-    }
-
-} // end namespace Catch
-#endif
-// end catch_startup_exception_registry.cpp
-// start catch_stream.cpp
-
-#include <cstdio>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    Catch::IStream::~IStream() = default;
-
-    namespace Detail { namespace {
-        template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
-            char data[bufferSize];
-            WriterF m_writer;
-
-        public:
-            StreamBufImpl() {
-                setp( data, data + sizeof(data) );
-            }
-
-            ~StreamBufImpl() noexcept {
-                StreamBufImpl::sync();
-            }
-
-        private:
-            int overflow( int c ) override {
-                sync();
-
-                if( c != EOF ) {
-                    if( pbase() == epptr() )
-                        m_writer( std::string( 1, static_cast<char>( c ) ) );
-                    else
-                        sputc( static_cast<char>( c ) );
-                }
-                return 0;
-            }
-
-            int sync() override {
-                if( pbase() != pptr() ) {
-                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                    setp( pbase(), epptr() );
-                }
-                return 0;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        struct OutputDebugWriter {
-
-            void operator()( std::string const&str ) {
-                writeToDebugConsole( str );
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class FileStream : public IStream {
-            mutable std::ofstream m_ofs;
-        public:
-            FileStream( StringRef filename ) {
-                m_ofs.open( filename.c_str() );
-                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
-            }
-            ~FileStream() override = default;
-        public: // IStream
-            std::ostream& stream() const override {
-                return m_ofs;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class CoutStream : public IStream {
-            mutable std::ostream m_os;
-        public:
-            // Store the streambuf from cout up-front because
-            // cout may get redirected when running tests
-            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class DebugOutStream : public IStream {
-            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
-            mutable std::ostream m_os;
-        public:
-            DebugOutStream()
-            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-                m_os( m_streamBuf.get() )
-            {}
-
-            ~DebugOutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-    }} // namespace anon::detail
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    auto makeStream( StringRef const &filename ) -> IStream const* {
-        if( filename.empty() )
-            return new Detail::CoutStream();
-        else if( filename[0] == '%' ) {
-            if( filename == "%debug" )
-                return new Detail::DebugOutStream();
-            else
-                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
-        }
-        else
-            return new Detail::FileStream( filename );
-    }
-
-    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
-    struct StringStreams {
-        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
-        std::vector<std::size_t> m_unused;
-        std::ostringstream m_referenceStream; // Used for copy state/ flags from
-
-        auto add() -> std::size_t {
-            if( m_unused.empty() ) {
-                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
-                return m_streams.size()-1;
-            }
-            else {
-                auto index = m_unused.back();
-                m_unused.pop_back();
-                return index;
-            }
-        }
-
-        void release( std::size_t index ) {
-            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
-            m_unused.push_back(index);
-        }
-    };
-
-    ReusableStringStream::ReusableStringStream()
-    :   m_index( Singleton<StringStreams>::getMutable().add() ),
-        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
-    {}
-
-    ReusableStringStream::~ReusableStringStream() {
-        static_cast<std::ostringstream*>( m_oss )->str("");
-        m_oss->clear();
-        Singleton<StringStreams>::getMutable().release( m_index );
-    }
-
-    auto ReusableStringStream::str() const -> std::string {
-        return static_cast<std::ostringstream*>( m_oss )->str();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() { return std::cout; }
-    std::ostream& cerr() { return std::cerr; }
-    std::ostream& clog() { return std::clog; }
-#endif
-}
-// end catch_stream.cpp
-// start catch_string_manip.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cctype>
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
-        }
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
-    }
-    bool startsWith( std::string const& s, char prefix ) {
-        return !s.empty() && s[0] == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    }
-    bool endsWith( std::string const& s, char suffix ) {
-        return !s.empty() && s[s.size()-1] == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
-    }
-
-    StringRef trim(StringRef ref) {
-        const auto is_ws = [](char c) {
-            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-        };
-        size_t real_begin = 0;
-        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
-        size_t real_end = ref.size();
-        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
-
-        return ref.substr(real_begin, real_end - real_begin);
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
-        std::vector<StringRef> subStrings;
-        std::size_t start = 0;
-        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
-            if( str[pos] == delimiter ) {
-                if( pos - start > 1 )
-                    subStrings.push_back( str.substr( start, pos-start ) );
-                start = pos+1;
-            }
-        }
-        if( start < str.size() )
-            subStrings.push_back( str.substr( start, str.size()-start ) );
-        return subStrings;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << ' ' << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << 's';
-        return os;
-    }
-
-}
-// end catch_string_manip.cpp
-// start catch_stringref.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cstdint>
-
-namespace Catch {
-    StringRef::StringRef( char const* rawChars ) noexcept
-    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
-    {}
-
-    auto StringRef::c_str() const -> char const* {
-        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
-        return m_start;
-    }
-    auto StringRef::data() const noexcept -> char const* {
-        return m_start;
-    }
-
-    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if (start < m_size) {
-            return StringRef(m_start + start, (std::min)(m_size - start, size));
-        } else {
-            return StringRef();
-        }
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return m_size == other.m_size
-            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-    }
-
-    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.data(), str.size());
-    }
-
-    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.data(), rhs.size());
-        return lhs;
-    }
-
-} // namespace Catch
-// end catch_stringref.cpp
-// start catch_tag_alias.cpp
-
-namespace Catch {
-    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
-}
-// end catch_tag_alias.cpp
-// start catch_tag_alias_autoregistrar.cpp
-
-namespace Catch {
-
-    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        CATCH_TRY {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-}
-// end catch_tag_alias_autoregistrar.cpp
-// start catch_tag_alias_registry.cpp
-
-#include <sstream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
-        auto it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return &(it->second);
-        else
-            return nullptr;
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( auto const& registryKvp : m_registry ) {
-            std::size_t pos = expandedTestSpec.find( registryKvp.first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    registryKvp.second.tag +
-                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
-        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
-                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
-
-        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
-                      "error: tag alias, '" << alias << "' already registered.\n"
-                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
-                      << "\tRedefined at: " << lineInfo );
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-
-    ITagAliasRegistry const& ITagAliasRegistry::get() {
-        return getRegistryHub().getTagAliasRegistry();
-    }
-
-} // end namespace Catch
-// end catch_tag_alias_registry.cpp
-// start catch_test_case_info.cpp
-
-#include <cctype>
-#include <exception>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-            if( startsWith( tag, '.' ) ||
-                tag == "!hide" )
-                return TestCaseInfo::IsHidden;
-            else if( tag == "!throws" )
-                return TestCaseInfo::Throws;
-            else if( tag == "!shouldfail" )
-                return TestCaseInfo::ShouldFail;
-            else if( tag == "!mayfail" )
-                return TestCaseInfo::MayFail;
-            else if( tag == "!nonportable" )
-                return TestCaseInfo::NonPortable;
-            else if( tag == "!benchmark" )
-                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
-            else
-                return TestCaseInfo::None;
-        }
-        bool isReservedTag( std::string const& tag ) {
-            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
-        }
-        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-            CATCH_ENFORCE( !isReservedTag(tag),
-                          "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alphanumeric characters are reserved\n"
-                          << _lineInfo );
-        }
-    }
-
-    TestCase makeTestCase(  ITestInvoker* _testCase,
-                            std::string const& _className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden = false;
-
-        // Parse out tags
-        std::vector<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for (char c : nameAndTags.tags) {
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    // Merged hide tags like `[.approvals]` should be added as
-                    // `[.][approvals]`. The `[.]` is added at later point, so
-                    // we only strip the prefix
-                    if (startsWith(tag, '.') && tag.size() > 1) {
-                        tag.erase(0, 1);
-                    }
-                    tags.push_back( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            // Add all "hidden" tags to make them behave identically
-            tags.insert( tags.end(), { ".", "!hide" } );
-        }
-
-        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, std::move(info) );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
-        std::sort(begin(tags), end(tags));
-        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
-        testCaseInfo.lcaseTags.clear();
-
-        for( auto const& tag : tags ) {
-            std::string lcaseTag = toLower( tag );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.push_back( lcaseTag );
-        }
-        testCaseInfo.tags = std::move(tags);
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::vector<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    std::string TestCaseInfo::tagsAsString() const {
-        std::string ret;
-        // '[' and ']' per tag
-        std::size_t full_size = 2 * tags.size();
-        for (const auto& tag : tags) {
-            full_size += tag.size();
-        }
-        ret.reserve(full_size);
-        for (const auto& tag : tags) {
-            ret.push_back('[');
-            ret.append(tag);
-            ret.push_back(']');
-        }
-
-        return ret;
-    }
-
-    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-// end catch_test_case_info.cpp
-// start catch_test_case_registry_impl.cpp
-
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        struct TestHasher {
-            using hash_t = uint64_t;
-
-            explicit TestHasher( hash_t hashSuffix ):
-                m_hashSuffix{ hashSuffix } {}
-
-            uint32_t operator()( TestCase const& t ) const {
-                // FNV-1a hash with multiplication fold.
-                const hash_t prime = 1099511628211u;
-                hash_t hash = 14695981039346656037u;
-                for ( const char c : t.name ) {
-                    hash ^= c;
-                    hash *= prime;
-                }
-                hash ^= m_hashSuffix;
-                hash *= prime;
-                const uint32_t low{ static_cast<uint32_t>( hash ) };
-                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
-                return low * high;
-            }
-
-        private:
-            hash_t m_hashSuffix;
-        };
-    } // end unnamed namespace
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        switch( config.runOrder() ) {
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-
-            case RunTests::InLexicographicalOrder: {
-                std::vector<TestCase> sorted = unsortedTestCases;
-                std::sort( sorted.begin(), sorted.end() );
-                return sorted;
-            }
-
-            case RunTests::InRandomOrder: {
-                seedRng( config );
-                TestHasher h{ config.rngSeed() };
-
-                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
-                std::vector<hashedTest> indexed_tests;
-                indexed_tests.reserve( unsortedTestCases.size() );
-
-                for (auto const& testCase : unsortedTestCases) {
-                    indexed_tests.emplace_back(h(testCase), &testCase);
-                }
-
-                std::sort(indexed_tests.begin(), indexed_tests.end(),
-                          [](hashedTest const& lhs, hashedTest const& rhs) {
-                          if (lhs.first == rhs.first) {
-                              return lhs.second->name < rhs.second->name;
-                          }
-                          return lhs.first < rhs.first;
-                });
-
-                std::vector<TestCase> sorted;
-                sorted.reserve( indexed_tests.size() );
-
-                for (auto const& hashed : indexed_tests) {
-                    sorted.emplace_back(*hashed.second);
-                }
-
-                return sorted;
-            }
-        }
-        return unsortedTestCases;
-    }
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
-        return !testCase.throws() || config.allowThrows();
-    }
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( auto const& function : functions ) {
-            auto prev = seenFunctions.insert( function );
-            CATCH_ENFORCE( prev.second,
-                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
-                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for (auto const& testCase : testCases) {
-            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
-                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
-                filtered.push_back(testCase);
-            }
-        }
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    void TestRegistry::registerTest( TestCase const& testCase ) {
-        std::string name = testCase.getTestCaseInfo().name;
-        if( name.empty() ) {
-            ReusableStringStream rss;
-            rss << "Anonymous test case " << ++m_unnamedCount;
-            return registerTest( testCase.withName( rss.str() ) );
-        }
-        m_functions.push_back( testCase );
-    }
-
-    std::vector<TestCase> const& TestRegistry::getAllTests() const {
-        return m_functions;
-    }
-    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
-        if( m_sortedFunctions.empty() )
-            enforceNoDuplicateTestCases( m_functions );
-
-        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-            m_sortedFunctions = sortTests( config, m_functions );
-            m_currentSortOrder = config.runOrder();
-        }
-        return m_sortedFunctions;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
-
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className(classOrQualifiedMethodName);
-        if( startsWith( className, '&' ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-} // end namespace Catch
-// end catch_test_case_registry_impl.cpp
-// start catch_test_case_tracker.cpp
-
-#include <algorithm>
-#include <cassert>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
-    :   name( _name ),
-        location( _location )
-    {}
-
-    ITracker::~ITracker() = default;
-
-    ITracker& TrackerContext::startRun() {
-        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
-        m_currentTracker = nullptr;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-    void TrackerContext::endRun() {
-        m_rootTracker.reset();
-        m_currentTracker = nullptr;
-        m_runState = NotStarted;
-    }
-
-    void TrackerContext::startCycle() {
-        m_currentTracker = m_rootTracker.get();
-        m_runState = Executing;
-    }
-    void TrackerContext::completeCycle() {
-        m_runState = CompletedCycle;
-    }
-
-    bool TrackerContext::completedCycle() const {
-        return m_runState == CompletedCycle;
-    }
-    ITracker& TrackerContext::currentTracker() {
-        return *m_currentTracker;
-    }
-    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
-        m_currentTracker = tracker;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
-        ITracker(nameAndLocation),
-        m_ctx( ctx ),
-        m_parent( parent )
-    {}
-
-    bool TrackerBase::isComplete() const {
-        return m_runState == CompletedSuccessfully || m_runState == Failed;
-    }
-    bool TrackerBase::isSuccessfullyCompleted() const {
-        return m_runState == CompletedSuccessfully;
-    }
-    bool TrackerBase::isOpen() const {
-        return m_runState != NotStarted && !isComplete();
-    }
-    bool TrackerBase::hasChildren() const {
-        return !m_children.empty();
-    }
-
-    void TrackerBase::addChild( ITrackerPtr const& child ) {
-        m_children.push_back( child );
-    }
-
-    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(),
-            [&nameAndLocation]( ITrackerPtr const& tracker ){
-                return
-                    tracker->nameAndLocation().location == nameAndLocation.location &&
-                    tracker->nameAndLocation().name == nameAndLocation.name;
-            } );
-        return( it != m_children.end() )
-            ? *it
-            : nullptr;
-    }
-    ITracker& TrackerBase::parent() {
-        assert( m_parent ); // Should always be non-null except for root
-        return *m_parent;
-    }
-
-    void TrackerBase::openChild() {
-        if( m_runState != ExecutingChildren ) {
-            m_runState = ExecutingChildren;
-            if( m_parent )
-                m_parent->openChild();
-        }
-    }
-
-    bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isGeneratorTracker() const { return false; }
-
-    void TrackerBase::open() {
-        m_runState = Executing;
-        moveToThis();
-        if( m_parent )
-            m_parent->openChild();
-    }
-
-    void TrackerBase::close() {
-
-        // Close any still open children (e.g. generators)
-        while( &m_ctx.currentTracker() != this )
-            m_ctx.currentTracker().close();
-
-        switch( m_runState ) {
-            case NeedsAnotherRun:
-                break;
-
-            case Executing:
-                m_runState = CompletedSuccessfully;
-                break;
-            case ExecutingChildren:
-                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
-                    m_runState = CompletedSuccessfully;
-                break;
-
-            case NotStarted:
-            case CompletedSuccessfully:
-            case Failed:
-                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
-
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
-        }
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::fail() {
-        m_runState = Failed;
-        if( m_parent )
-            m_parent->markAsNeedingAnotherRun();
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::markAsNeedingAnotherRun() {
-        m_runState = NeedsAnotherRun;
-    }
-
-    void TrackerBase::moveToParent() {
-        assert( m_parent );
-        m_ctx.setCurrentTracker( m_parent );
-    }
-    void TrackerBase::moveToThis() {
-        m_ctx.setCurrentTracker( this );
-    }
-
-    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_trimmed_name(trim(nameAndLocation.name))
-    {
-        if( parent ) {
-            while( !parent->isSectionTracker() )
-                parent = &parent->parent();
-
-            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
-            addNextFilters( parentSection.m_filters );
-        }
-    }
-
-    bool SectionTracker::isComplete() const {
-        bool complete = true;
-
-        if (m_filters.empty()
-            || m_filters[0] == ""
-            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
-            complete = TrackerBase::isComplete();
-        }
-        return complete;
-    }
-
-    bool SectionTracker::isSectionTracker() const { return true; }
-
-    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
-        std::shared_ptr<SectionTracker> section;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isSectionTracker() );
-            section = std::static_pointer_cast<SectionTracker>( childTracker );
-        }
-        else {
-            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
-            currentTracker.addChild( section );
-        }
-        if( !ctx.completedCycle() )
-            section->tryOpen();
-        return *section;
-    }
-
-    void SectionTracker::tryOpen() {
-        if( !isComplete() )
-            open();
-    }
-
-    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
-        if( !filters.empty() ) {
-            m_filters.reserve( m_filters.size() + filters.size() + 2 );
-            m_filters.emplace_back(""); // Root - should never be consulted
-            m_filters.emplace_back(""); // Test Case - not a section filter
-            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
-        }
-    }
-    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
-        if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
-    }
-
-    std::vector<std::string> const& SectionTracker::getFilters() const {
-        return m_filters;
-    }
-
-    std::string const& SectionTracker::trimmedName() const {
-        return m_trimmed_name;
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-// end catch_test_case_tracker.cpp
-// start catch_test_registry.cpp
-
-namespace Catch {
-
-    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
-        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
-    }
-
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
-    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        CATCH_TRY {
-            getMutableRegistryHub()
-                    .registerTest(
-                        makeTestCase(
-                            invoker,
-                            extractClassName( classOrMethod ),
-                            nameAndTags,
-                            lineInfo));
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-    AutoReg::~AutoReg() = default;
-}
-// end catch_test_registry.cpp
-// start catch_test_spec.cpp
-
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    TestSpec::Pattern::Pattern( std::string const& name )
-    : m_name( name )
-    {}
-
-    TestSpec::Pattern::~Pattern() = default;
-
-    std::string const& TestSpec::Pattern::name() const {
-        return m_name;
-    }
-
-    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
-    : Pattern( filterString )
-    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
-    {}
-
-    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( testCase.name );
-    }
-
-    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
-    : Pattern( filterString )
-    , m_tag( toLower( tag ) )
-    {}
-
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
-    }
-
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
-    : Pattern( underlyingPattern->name() )
-    , m_underlyingPattern( underlyingPattern )
-    {}
-
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
-        return !m_underlyingPattern->matches( testCase );
-    }
-
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
-    }
-
-    std::string TestSpec::Filter::name() const {
-        std::string name;
-        for( auto const& p : m_patterns )
-            name += p->name();
-        return name;
-    }
-
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
-    }
-
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
-            std::vector<TestCase const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test ) )
-                    currentMatches.emplace_back( &test );
-            return FilterMatch{ filter.name(), currentMatches };
-        } );
-        return matches;
-    }
-
-    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
-        return  (m_invalidArgs);
-    }
-
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
-
-namespace Catch {
-
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
-        m_exclusion = false;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        m_substring.reserve(m_arg.size());
-        m_patternName.reserve(m_arg.size());
-        m_realPatternPos = 0;
-
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-          //if visitChar fails
-           if( !visitChar( m_arg[m_pos] ) ){
-               m_testSpec.m_invalidArgs.push_back(arg);
-               break;
-           }
-        endMode();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
-    }
-    bool TestSpecParser::visitChar( char c ) {
-        if( (m_mode != EscapedName) && (c == '\\') ) {
-            escape();
-            addCharToPattern(c);
-            return true;
-        }else if((m_mode != EscapedName) && (c == ',') )  {
-            return separate();
-        }
-
-        switch( m_mode ) {
-        case None:
-            if( processNoneChar( c ) )
-                return true;
-            break;
-        case Name:
-            processNameChar( c );
-            break;
-        case EscapedName:
-            endMode();
-            addCharToPattern(c);
-            return true;
-        default:
-        case Tag:
-        case QuotedName:
-            if( processOtherChar( c ) )
-                return true;
-            break;
-        }
-
-        m_substring += c;
-        if( !isControlChar( c ) ) {
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-        return true;
-    }
-    // Two of the processing methods return true to signal the caller to return
-    // without adding the given character to the current pattern strings
-    bool TestSpecParser::processNoneChar( char c ) {
-        switch( c ) {
-        case ' ':
-            return true;
-        case '~':
-            m_exclusion = true;
-            return false;
-        case '[':
-            startNewMode( Tag );
-            return false;
-        case '"':
-            startNewMode( QuotedName );
-            return false;
-        default:
-            startNewMode( Name );
-            return false;
-        }
-    }
-    void TestSpecParser::processNameChar( char c ) {
-        if( c == '[' ) {
-            if( m_substring == "exclude:" )
-                m_exclusion = true;
-            else
-                endMode();
-            startNewMode( Tag );
-        }
-    }
-    bool TestSpecParser::processOtherChar( char c ) {
-        if( !isControlChar( c ) )
-            return false;
-        m_substring += c;
-        endMode();
-        return true;
-    }
-    void TestSpecParser::startNewMode( Mode mode ) {
-        m_mode = mode;
-    }
-    void TestSpecParser::endMode() {
-        switch( m_mode ) {
-        case Name:
-        case QuotedName:
-            return addNamePattern();
-        case Tag:
-            return addTagPattern();
-        case EscapedName:
-            revertBackToLastMode();
-            return;
-        case None:
-        default:
-            return startNewMode( None );
-        }
-    }
-    void TestSpecParser::escape() {
-        saveLastMode();
-        m_mode = EscapedName;
-        m_escapeChars.push_back(m_realPatternPos);
-    }
-    bool TestSpecParser::isControlChar( char c ) const {
-        switch( m_mode ) {
-            default:
-                return false;
-            case None:
-                return c == '~';
-            case Name:
-                return c == '[';
-            case EscapedName:
-                return true;
-            case QuotedName:
-                return c == '"';
-            case Tag:
-                return c == '[' || c == ']';
-        }
-    }
-
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
-        }
-    }
-
-    void TestSpecParser::saveLastMode() {
-      lastMode = m_mode;
-    }
-
-    void TestSpecParser::revertBackToLastMode() {
-      m_mode = lastMode;
-    }
-
-    bool TestSpecParser::separate() {
-      if( (m_mode==QuotedName) || (m_mode==Tag) ){
-         //invalid argument, signal failure to previous scope.
-         m_mode = None;
-         m_pos = m_arg.size();
-         m_substring.clear();
-         m_patternName.clear();
-         m_realPatternPos = 0;
-         return false;
-      }
-      endMode();
-      addFilter();
-      return true; //success
-    }
-
-    std::string TestSpecParser::preprocessPattern() {
-        std::string token = m_patternName;
-        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
-            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
-        m_escapeChars.clear();
-        if (startsWith(token, "exclude:")) {
-            m_exclusion = true;
-            token = token.substr(8);
-        }
-
-        m_patternName.clear();
-        m_realPatternPos = 0;
-
-        return token;
-    }
-
-    void TestSpecParser::addNamePattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
-            if (m_exclusion)
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    void TestSpecParser::addTagPattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
-            // we have to create a separate hide tag and shorten the real one
-            if (token.size() > 1 && token[0] == '.') {
-                token.erase(token.begin());
-                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
-                if (m_exclusion) {
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-                }
-                m_currentFilter.m_patterns.push_back(pattern);
-            }
-
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
-
-            if (m_exclusion) {
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            }
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-// end catch_test_spec_parser.cpp
-// start catch_timer.cpp
-
-#include <chrono>
-
-static const uint64_t nanosecondsInSecond = 1000000000;
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
-        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
-    }
-
-    namespace {
-        auto estimateClockResolution() -> uint64_t {
-            uint64_t sum = 0;
-            static const uint64_t iterations = 1000000;
-
-            auto startTime = getCurrentNanosecondsSinceEpoch();
-
-            for( std::size_t i = 0; i < iterations; ++i ) {
-
-                uint64_t ticks;
-                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
-                do {
-                    ticks = getCurrentNanosecondsSinceEpoch();
-                } while( ticks == baseTicks );
-
-                auto delta = ticks - baseTicks;
-                sum += delta;
-
-                // If we have been calibrating for over 3 seconds -- the clock
-                // is terrible and we should move on.
-                // TBD: How to signal that the measured resolution is probably wrong?
-                if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / ( i + 1u );
-                }
-            }
-
-            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
-            // - and potentially do more iterations if there's a high variance.
-            return sum/iterations;
-        }
-    }
-    auto getEstimatedClockResolution() -> uint64_t {
-        static auto s_resolution = estimateClockResolution();
-        return s_resolution;
-    }
-
-    void Timer::start() {
-       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
-    }
-    auto Timer::getElapsedNanoseconds() const -> uint64_t {
-        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
-    }
-    auto Timer::getElapsedMicroseconds() const -> uint64_t {
-        return getElapsedNanoseconds()/1000;
-    }
-    auto Timer::getElapsedMilliseconds() const -> unsigned int {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    auto Timer::getElapsedSeconds() const -> double {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-// end catch_timer.cpp
-// start catch_tostring.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#    pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-// Enable specific decls locally
-#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#endif
-
-#include <cmath>
-#include <iomanip>
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                int one = 1;
-                // If the lowest byte we read is non-zero, we can assume
-                // that little endian format is used.
-                auto value = *reinterpret_cast<char*>(&one);
-                return value ? Little : Big;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size ) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        ReusableStringStream rss;
-        rss << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return rss.str();
-    }
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    if (Catch::isnan(value)) {
-        return "nan";
-    }
-
-    ReusableStringStream rss;
-    rss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = rss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-//// ======================================================= ////
-//
-//   Out-of-line defs for full specialization of StringMaker
-//
-//// ======================================================= ////
-
-std::string StringMaker<std::string>::convert(const std::string& str) {
-    if (!getCurrentContext().getConfig()->showInvisibles()) {
-        return '"' + str + '"';
-    }
-
-    std::string s("\"");
-    for (char c : str) {
-        switch (c) {
-        case '\n':
-            s.append("\\n");
-            break;
-        case '\t':
-            s.append("\\t");
-            break;
-        default:
-            s.push_back(c);
-            break;
-        }
-    }
-    s.append("\"");
-    return s;
-}
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::string_view>::convert(std::string_view str) {
-    return ::Catch::Detail::stringify(std::string{ str });
-}
-#endif
-
-std::string StringMaker<char const*>::convert(char const* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<char*>::convert(char* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
-}
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
-    return StringMaker<std::wstring>::convert(std::wstring(str));
-}
-# endif
-
-std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-#endif
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-#include <cstddef>
-std::string StringMaker<std::byte>::convert(std::byte value) {
-    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
-}
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-
-std::string StringMaker<int>::convert(int value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long>::convert(long value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long long>::convert(long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<unsigned int>::convert(unsigned int value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long>::convert(unsigned long value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<bool>::convert(bool b) {
-    return b ? "true" : "false";
-}
-
-std::string StringMaker<signed char>::convert(signed char value) {
-    if (value == '\r') {
-        return "'\\r'";
-    } else if (value == '\f') {
-        return "'\\f'";
-    } else if (value == '\n') {
-        return "'\\n'";
-    } else if (value == '\t') {
-        return "'\\t'";
-    } else if ('\0' <= value && value < ' ') {
-        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
-    } else {
-        char chstr[] = "' '";
-        chstr[1] = value;
-        return chstr;
-    }
-}
-std::string StringMaker<char>::convert(char c) {
-    return ::Catch::Detail::stringify(static_cast<signed char>(c));
-}
-std::string StringMaker<unsigned char>::convert(unsigned char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
-}
-
-std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
-    return "nullptr";
-}
-
-int StringMaker<float>::precision = 5;
-
-std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, precision) + 'f';
-}
-
-int StringMaker<double>::precision = 10;
-
-std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, precision);
-}
-
-std::string ratio_string<std::atto>::symbol() { return "a"; }
-std::string ratio_string<std::femto>::symbol() { return "f"; }
-std::string ratio_string<std::pico>::symbol() { return "p"; }
-std::string ratio_string<std::nano>::symbol() { return "n"; }
-std::string ratio_string<std::micro>::symbol() { return "u"; }
-std::string ratio_string<std::milli>::symbol() { return "m"; }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_tostring.cpp
-// start catch_totals.cpp
-
-namespace Catch {
-
-    Counts Counts::operator - ( Counts const& other ) const {
-        Counts diff;
-        diff.passed = passed - other.passed;
-        diff.failed = failed - other.failed;
-        diff.failedButOk = failedButOk - other.failedButOk;
-        return diff;
-    }
-
-    Counts& Counts::operator += ( Counts const& other ) {
-        passed += other.passed;
-        failed += other.failed;
-        failedButOk += other.failedButOk;
-        return *this;
-    }
-
-    std::size_t Counts::total() const {
-        return passed + failed + failedButOk;
-    }
-    bool Counts::allPassed() const {
-        return failed == 0 && failedButOk == 0;
-    }
-    bool Counts::allOk() const {
-        return failed == 0;
-    }
-
-    Totals Totals::operator - ( Totals const& other ) const {
-        Totals diff;
-        diff.assertions = assertions - other.assertions;
-        diff.testCases = testCases - other.testCases;
-        return diff;
-    }
-
-    Totals& Totals::operator += ( Totals const& other ) {
-        assertions += other.assertions;
-        testCases += other.testCases;
-        return *this;
-    }
-
-    Totals Totals::delta( Totals const& prevTotals ) const {
-        Totals diff = *this - prevTotals;
-        if( diff.assertions.failed > 0 )
-            ++diff.testCases.failed;
-        else if( diff.assertions.failedButOk > 0 )
-            ++diff.testCases.failedButOk;
-        else
-            ++diff.testCases.passed;
-        return diff;
-    }
-
-}
-// end catch_totals.cpp
-// start catch_uncaught_exceptions.cpp
-
-// start catch_config_uncaught_exceptions.hpp
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE_1_0.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-
-#if defined(_MSC_VER)
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
-#endif
-
-#include <exception>
-
-#if defined(__cpp_lib_uncaught_exceptions) \
-    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif // __cpp_lib_uncaught_exceptions
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
-
-#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-// end catch_config_uncaught_exceptions.hpp
-#include <exception>
-
-namespace Catch {
-    bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        return false;
-#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-        return std::uncaught_exceptions() > 0;
-#else
-        return std::uncaught_exception();
-#endif
-  }
-} // end namespace Catch
-// end catch_uncaught_exceptions.cpp
-// start catch_version.cpp
-
-#include <ostream>
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            char const * const _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << '.'
-            << version.minorVersion << '.'
-            << version.patchNumber;
-        // branchName is never null -> 0th char is \0 if it is empty
-        if (version.branchName[0]) {
-            os << '-' << version.branchName
-               << '.' << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version const& libraryVersion() {
-        static Version version( 2, 13, 8, "", 0 );
-        return version;
-    }
-
-}
-// end catch_version.cpp
-// start catch_wildcard_pattern.cpp
-
-namespace Catch {
-
-    WildcardPattern::WildcardPattern( std::string const& pattern,
-                                      CaseSensitive::Choice caseSensitivity )
-    :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( normaliseString( pattern ) )
-    {
-        if( startsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 1 );
-            m_wildcard = WildcardAtStart;
-        }
-        if( endsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-        }
-    }
-
-    bool WildcardPattern::matches( std::string const& str ) const {
-        switch( m_wildcard ) {
-            case NoWildcard:
-                return m_pattern == normaliseString( str );
-            case WildcardAtStart:
-                return endsWith( normaliseString( str ), m_pattern );
-            case WildcardAtEnd:
-                return startsWith( normaliseString( str ), m_pattern );
-            case WildcardAtBothEnds:
-                return contains( normaliseString( str ), m_pattern );
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown enum" );
-        }
-    }
-
-    std::string WildcardPattern::normaliseString( std::string const& str ) const {
-        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
-    }
-}
-// end catch_wildcard_pattern.cpp
-// start catch_xmlwriter.cpp
-
-#include <iomanip>
-#include <type_traits>
-
-namespace Catch {
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-    bool shouldNewline(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
-    }
-
-    bool shouldIndent(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
-    }
-
-} // anonymous namespace
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: http://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            unsigned char c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: http://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    unsigned char nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
-    :   m_writer( writer ),
-        m_fmt(fmt)
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ),
-        m_fmt(other.m_fmt)
-    {
-        other.m_writer = nullptr;
-        other.m_fmt = XmlFormatting::None;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        m_fmt = other.m_fmt;
-        other.m_fmt = XmlFormatting::None;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if (m_writer) {
-            m_writer->endElement(m_fmt);
-        }
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
-        m_writer->writeText( text, fmt );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while (!m_tags.empty()) {
-            endElement();
-        }
-        newlineIfNecessary();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-            m_indent += "  ";
-        }
-        m_os << '<' << name;
-        m_tags.push_back( name );
-        m_tagIsOpen = true;
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
-        ScopedElement scoped( this, fmt );
-        startElement( name, fmt );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
-        m_indent = m_indent.substr(0, m_indent.size() - 2);
-
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        } else {
-            newlineIfNecessary();
-            if (shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << "</" << m_tags.back() << ">";
-        }
-        m_os << std::flush;
-        applyFormatting(fmt);
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if (tagWasOpen && shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << XmlEncode( text );
-            applyFormatting(fmt);
-        }
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
-        ensureTagClosed();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-        }
-        m_os << "<!--" << text << "-->";
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    void XmlWriter::writeStylesheetRef( std::string const& url ) {
-        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    }
-
-    XmlWriter& XmlWriter::writeBlankLine() {
-        ensureTagClosed();
-        m_os << '\n';
-        return *this;
-    }
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << '>' << std::flush;
-            newlineIfNecessary();
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::applyFormatting(XmlFormatting fmt) {
-        m_needsNewline = shouldNewline(fmt);
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-}
-// end catch_xmlwriter.cpp
-// start catch_reporter_bases.cpp
-
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result) {
-        result.getExpandedExpression();
-    }
-
-    // Because formatting using c++ streams is stateful, drop down to C is required
-    // Alternatively we could use stringstream, but its performance is... not good.
-    std::string getFormattedDuration( double duration ) {
-        // Max exponent + 1 is required to represent the whole part
-        // + 1 for decimal point
-        // + 3 for the 3 decimal places
-        // + 1 for null terminator
-        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
-        char buffer[maxDoubleSize];
-
-        // Save previous errno, to prevent sprintf from overwriting it
-        ErrnoGuard guard;
-#ifdef _MSC_VER
-        sprintf_s(buffer, "%.3f", duration);
-#else
-        std::sprintf(buffer, "%.3f", duration);
-#endif
-        return std::string(buffer);
-    }
-
-    bool shouldShowDuration( IConfig const& config, double duration ) {
-        if ( config.showDurations() == ShowDurations::Always ) {
-            return true;
-        }
-        if ( config.showDurations() == ShowDurations::Never ) {
-            return false;
-        }
-        const double min = config.minDuration();
-        return min >= 0 && duration >= min;
-    }
-
-    std::string serializeFilters( std::vector<std::string> const& container ) {
-        ReusableStringStream oss;
-        bool first = true;
-        for (auto&& filter : container)
-        {
-            if (!first)
-                oss << ' ';
-            else
-                first = false;
-
-            oss << filter;
-        }
-        return oss.str();
-    }
-
-    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
-        :StreamingReporterBase(_config) {}
-
-    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
-        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
-    }
-
-    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
-
-    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_reporter_bases.cpp
-// start catch_reporter_compact.cpp
-
-namespace {
-
-#ifdef CATCH_PLATFORM_MAC
-    const char* failedString() { return "FAILED"; }
-    const char* passedString() { return "PASSED"; }
-#else
-    const char* failedString() { return "failed"; }
-    const char* passedString() { return "passed"; }
-#endif
-
-    // Colour::LightGrey
-    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
-
-    std::string bothOrAll( std::size_t count ) {
-        return count == 1 ? std::string() :
-               count == 2 ? "both " : "all " ;
-    }
-
-} // anon namespace
-
-namespace Catch {
-namespace {
-// Colour, message variants:
-// - white: No tests ran.
-// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-// - white: Passed [both/all] N test cases (no assertions).
-// -   red: Failed N tests cases, failed M assertions.
-// - green: Passed [both/all] N tests cases with M assertions.
-void printTotals(std::ostream& out, const Totals& totals) {
-    if (totals.testCases.total() == 0) {
-        out << "No tests ran.";
-    } else if (totals.testCases.failed == totals.testCases.total()) {
-        Colour colour(Colour::ResultError);
-        const std::string qualify_assertions_failed =
-            totals.assertions.failed == totals.assertions.total() ?
-            bothOrAll(totals.assertions.failed) : std::string();
-        out <<
-            "Failed " << bothOrAll(totals.testCases.failed)
-            << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << qualify_assertions_failed <<
-            pluralise(totals.assertions.failed, "assertion") << '.';
-    } else if (totals.assertions.total() == 0) {
-        out <<
-            "Passed " << bothOrAll(totals.testCases.total())
-            << pluralise(totals.testCases.total(), "test case")
-            << " (no assertions).";
-    } else if (totals.assertions.failed) {
-        Colour colour(Colour::ResultError);
-        out <<
-            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
-    } else {
-        Colour colour(Colour::ResultSuccess);
-        out <<
-            "Passed " << bothOrAll(totals.testCases.passed)
-            << pluralise(totals.testCases.passed, "test case") <<
-            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
-    }
-}
-
-// Implementation of CompactReporter formatting
-class AssertionPrinter {
-public:
-    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
-    AssertionPrinter(AssertionPrinter const&) = delete;
-    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream)
-        , result(_stats.assertionResult)
-        , messages(_stats.infoMessages)
-        , itMessage(_stats.infoMessages.begin())
-        , printInfoMessages(_printInfoMessages) {}
-
-    void print() {
-        printSourceInfo();
-
-        itMessage = messages.begin();
-
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            printResultType(Colour::ResultSuccess, passedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            if (!result.hasExpression())
-                printRemainingMessages(Colour::None);
-            else
-                printRemainingMessages();
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk())
-                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
-            else
-                printResultType(Colour::Error, failedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            printRemainingMessages();
-            break;
-        case ResultWas::ThrewException:
-            printResultType(Colour::Error, failedString());
-            printIssue("unexpected exception with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::FatalErrorCondition:
-            printResultType(Colour::Error, failedString());
-            printIssue("fatal error condition with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::DidntThrowException:
-            printResultType(Colour::Error, failedString());
-            printIssue("expected exception, got none");
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::Info:
-            printResultType(Colour::None, "info");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::Warning:
-            printResultType(Colour::None, "warning");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::ExplicitFailure:
-            printResultType(Colour::Error, failedString());
-            printIssue("explicitly");
-            printRemainingMessages(Colour::None);
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            printResultType(Colour::Error, "** internal error **");
-            break;
-        }
-    }
-
-private:
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ':';
-    }
-
-    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
-        if (!passOrFail.empty()) {
-            {
-                Colour colourGuard(colour);
-                stream << ' ' << passOrFail;
-            }
-            stream << ':';
-        }
-    }
-
-    void printIssue(std::string const& issue) const {
-        stream << ' ' << issue;
-    }
-
-    void printExpressionWas() {
-        if (result.hasExpression()) {
-            stream << ';';
-            {
-                Colour colour(dimColour());
-                stream << " expression was:";
-            }
-            printOriginalExpression();
-        }
-    }
-
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            stream << ' ' << result.getExpression();
-        }
-    }
-
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            {
-                Colour colour(dimColour());
-                stream << " for: ";
-            }
-            stream << result.getExpandedExpression();
-        }
-    }
-
-    void printMessage() {
-        if (itMessage != messages.end()) {
-            stream << " '" << itMessage->message << '\'';
-            ++itMessage;
-        }
-    }
-
-    void printRemainingMessages(Colour::Code colour = dimColour()) {
-        if (itMessage == messages.end())
-            return;
-
-        const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
-
-        {
-            Colour colourGuard(colour);
-            stream << " with " << pluralise(N, "message") << ':';
-        }
-
-        while (itMessage != itEnd) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                printMessage();
-                if (itMessage != itEnd) {
-                    Colour colourGuard(dimColour());
-                    stream << " and";
-                }
-                continue;
-            }
-            ++itMessage;
-        }
-    }
-
-private:
-    std::ostream& stream;
-    AssertionResult const& result;
-    std::vector<MessageInfo> messages;
-    std::vector<MessageInfo>::const_iterator itMessage;
-    bool printInfoMessages;
-};
-
-} // anon namespace
-
-        std::string CompactReporter::getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << '\'' << std::endl;
-        }
-
-        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
-
-        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            double dur = _sectionStats.durationInSeconds;
-            if ( shouldShowDuration( *m_config, dur ) ) {
-                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-            }
-        }
-
-        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( stream, _testRunStats.totals );
-            stream << '\n' << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-        CompactReporter::~CompactReporter() {}
-
-    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-// end catch_reporter_compact.cpp
-// start catch_reporter_console.cpp
-
-#include <cfloat>
-#include <cstdio>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled and default is missing) is enabled
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic push
-// For simplicity, benchmarking-only helpers are always enabled
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-namespace Catch {
-
-namespace {
-
-// Formatter impl for ConsoleReporter
-class ConsoleAssertionPrinter {
-public:
-    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream),
-        stats(_stats),
-        result(_stats.assertionResult),
-        colour(Colour::None),
-        message(result.getMessage()),
-        messages(_stats.infoMessages),
-        printInfoMessages(_printInfoMessages) {
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            colour = Colour::Success;
-            passOrFail = "PASSED";
-            //if( result.hasMessage() )
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk()) {
-                colour = Colour::Success;
-                passOrFail = "FAILED - but was ok";
-            } else {
-                colour = Colour::Error;
-                passOrFail = "FAILED";
-            }
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ThrewException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to unexpected exception with ";
-            if (_stats.infoMessages.size() == 1)
-                messageLabel += "message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel += "messages";
-            break;
-        case ResultWas::FatalErrorCondition:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to a fatal error condition";
-            break;
-        case ResultWas::DidntThrowException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "because no exception was thrown where one was expected";
-            break;
-        case ResultWas::Info:
-            messageLabel = "info";
-            break;
-        case ResultWas::Warning:
-            messageLabel = "warning";
-            break;
-        case ResultWas::ExplicitFailure:
-            passOrFail = "FAILED";
-            colour = Colour::Error;
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "explicitly with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "explicitly with messages";
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            passOrFail = "** internal error **";
-            colour = Colour::Error;
-            break;
-        }
-    }
-
-    void print() const {
-        printSourceInfo();
-        if (stats.totals.assertions.total() > 0) {
-            printResultType();
-            printOriginalExpression();
-            printReconstructedExpression();
-        } else {
-            stream << '\n';
-        }
-        printMessage();
-    }
-
-private:
-    void printResultType() const {
-        if (!passOrFail.empty()) {
-            Colour colourGuard(colour);
-            stream << passOrFail << ":\n";
-        }
-    }
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            Colour colourGuard(Colour::OriginalExpression);
-            stream << "  ";
-            stream << result.getExpressionInMacro();
-            stream << '\n';
-        }
-    }
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            stream << "with expansion:\n";
-            Colour colourGuard(Colour::ReconstructedExpression);
-            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
-        }
-    }
-    void printMessage() const {
-        if (!messageLabel.empty())
-            stream << messageLabel << ':' << '\n';
-        for (auto const& msg : messages) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || msg.type != ResultWas::Info)
-                stream << Column(msg.message).indent(2) << '\n';
-        }
-    }
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ": ";
-    }
-
-    std::ostream& stream;
-    AssertionStats const& stats;
-    AssertionResult const& result;
-    Colour::Code colour;
-    std::string passOrFail;
-    std::string messageLabel;
-    std::string message;
-    std::vector<MessageInfo> messages;
-    bool printInfoMessages;
-};
-
-std::size_t makeRatio(std::size_t number, std::size_t total) {
-    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
-    return (ratio == 0 && number > 0) ? 1 : ratio;
-}
-
-std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
-    if (i > j && i > k)
-        return i;
-    else if (j > k)
-        return j;
-    else
-        return k;
-}
-
-struct ColumnInfo {
-    enum Justification { Left, Right };
-    std::string name;
-    int width;
-    Justification justification;
-};
-struct ColumnBreak {};
-struct RowBreak {};
-
-class Duration {
-    enum class Unit {
-        Auto,
-        Nanoseconds,
-        Microseconds,
-        Milliseconds,
-        Seconds,
-        Minutes
-    };
-    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
-    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
-    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
-    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
-
-    double m_inNanoseconds;
-    Unit m_units;
-
-public:
-    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
-        : m_inNanoseconds(inNanoseconds),
-        m_units(units) {
-        if (m_units == Unit::Auto) {
-            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
-                m_units = Unit::Nanoseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
-                m_units = Unit::Microseconds;
-            else if (m_inNanoseconds < s_nanosecondsInASecond)
-                m_units = Unit::Milliseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMinute)
-                m_units = Unit::Seconds;
-            else
-                m_units = Unit::Minutes;
-        }
-
-    }
-
-    auto value() const -> double {
-        switch (m_units) {
-        case Unit::Microseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
-        case Unit::Milliseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
-        case Unit::Seconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
-        case Unit::Minutes:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
-        default:
-            return m_inNanoseconds;
-        }
-    }
-    auto unitsAsString() const -> std::string {
-        switch (m_units) {
-        case Unit::Nanoseconds:
-            return "ns";
-        case Unit::Microseconds:
-            return "us";
-        case Unit::Milliseconds:
-            return "ms";
-        case Unit::Seconds:
-            return "s";
-        case Unit::Minutes:
-            return "m";
-        default:
-            return "** internal error **";
-        }
-
-    }
-    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << duration.value() << ' ' << duration.unitsAsString();
-    }
-};
-} // end anon namespace
-
-class TablePrinter {
-    std::ostream& m_os;
-    std::vector<ColumnInfo> m_columnInfos;
-    std::ostringstream m_oss;
-    int m_currentColumn = -1;
-    bool m_isOpen = false;
-
-public:
-    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
-    :   m_os( os ),
-        m_columnInfos( std::move( columnInfos ) ) {}
-
-    auto columnInfos() const -> std::vector<ColumnInfo> const& {
-        return m_columnInfos;
-    }
-
-    void open() {
-        if (!m_isOpen) {
-            m_isOpen = true;
-            *this << RowBreak();
-
-			Columns headerCols;
-			Spacer spacer(2);
-			for (auto const& info : m_columnInfos) {
-				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
-				headerCols += spacer;
-			}
-			m_os << headerCols << '\n';
-
-            m_os << Catch::getLineOfChars<'-'>() << '\n';
-        }
-    }
-    void close() {
-        if (m_isOpen) {
-            *this << RowBreak();
-            m_os << std::endl;
-            m_isOpen = false;
-        }
-    }
-
-    template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
-        tp.m_oss << value;
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
-        auto colStr = tp.m_oss.str();
-        const auto strSize = colStr.size();
-        tp.m_oss.str("");
-        tp.open();
-        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
-            tp.m_currentColumn = -1;
-            tp.m_os << '\n';
-        }
-        tp.m_currentColumn++;
-
-        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 1), ' ')
-            : std::string();
-        if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << ' ';
-        else
-            tp.m_os << padding << colStr << ' ';
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
-        if (tp.m_currentColumn > 0) {
-            tp.m_os << '\n';
-            tp.m_currentColumn = -1;
-        }
-        return tp;
-    }
-};
-
-ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
-    : StreamingReporterBase(config),
-    m_tablePrinter(new TablePrinter(config.stream(),
-        [&config]() -> std::vector<ColumnInfo> {
-        if (config.fullConfig()->benchmarkNoAnalysis())
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "     samples", 14, ColumnInfo::Right },
-                { "  iterations", 14, ColumnInfo::Right },
-                { "        mean", 14, ColumnInfo::Right }
-            };
-        }
-        else
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "samples      mean       std dev", 14, ColumnInfo::Right },
-                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
-                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
-            };
-        }
-    }())) {}
-ConsoleReporter::~ConsoleReporter() = default;
-
-std::string ConsoleReporter::getDescription() {
-    return "Reports test results as plain lines of text";
-}
-
-void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
-    stream << "No test cases matched '" << spec << '\'' << std::endl;
-}
-
-void ConsoleReporter::reportInvalidArguments(std::string const&arg){
-    stream << "Invalid Filter: " << arg << std::endl;
-}
-
-void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
-
-bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
-    AssertionResult const& result = _assertionStats.assertionResult;
-
-    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-    // Drop out if result was successful but we're not printing them.
-    if (!includeResults && result.getResultType() != ResultWas::Warning)
-        return false;
-
-    lazyPrint();
-
-    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
-    printer.print();
-    stream << std::endl;
-    return true;
-}
-
-void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
-    m_tablePrinter->close();
-    m_headerPrinted = false;
-    StreamingReporterBase::sectionStarting(_sectionInfo);
-}
-void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
-    m_tablePrinter->close();
-    if (_sectionStats.missingAssertions) {
-        lazyPrint();
-        Colour colour(Colour::ResultError);
-        if (m_sectionStack.size() > 1)
-            stream << "\nNo assertions in section";
-        else
-            stream << "\nNo assertions in test case";
-        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-    }
-    double dur = _sectionStats.durationInSeconds;
-    if (shouldShowDuration(*m_config, dur)) {
-        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-    }
-    if (m_headerPrinted) {
-        m_headerPrinted = false;
-    }
-    StreamingReporterBase::sectionEnded(_sectionStats);
-}
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-void ConsoleReporter::benchmarkPreparing(std::string const& name) {
-	lazyPrintWithoutClosingBenchmarkTable();
-
-	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
-
-	bool firstLine = true;
-	for (auto line : nameCol) {
-		if (!firstLine)
-			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-		else
-			firstLine = false;
-
-		(*m_tablePrinter) << line << ColumnBreak();
-	}
-}
-
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    (*m_tablePrinter) << info.samples << ColumnBreak()
-        << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
-}
-void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
-    if (m_config->benchmarkNoAnalysis())
-    {
-        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
-    }
-    else
-    {
-        (*m_tablePrinter) << ColumnBreak()
-            << Duration(stats.mean.point.count()) << ColumnBreak()
-            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
-            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
-    }
-}
-
-void ConsoleReporter::benchmarkFailed(std::string const& error) {
-	Colour colour(Colour::Red);
-    (*m_tablePrinter)
-        << "Benchmark failed (" << error << ')'
-        << ColumnBreak() << RowBreak();
-}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
-    m_tablePrinter->close();
-    StreamingReporterBase::testCaseEnded(_testCaseStats);
-    m_headerPrinted = false;
-}
-void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
-    if (currentGroupInfo.used) {
-        printSummaryDivider();
-        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-        printTotals(_testGroupStats.totals);
-        stream << '\n' << std::endl;
-    }
-    StreamingReporterBase::testGroupEnded(_testGroupStats);
-}
-void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
-    printTotalsDivider(_testRunStats.totals);
-    printTotals(_testRunStats.totals);
-    stream << std::endl;
-    StreamingReporterBase::testRunEnded(_testRunStats);
-}
-void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-    StreamingReporterBase::testRunStarting(_testInfo);
-    printTestFilters();
-}
-
-void ConsoleReporter::lazyPrint() {
-
-    m_tablePrinter->close();
-    lazyPrintWithoutClosingBenchmarkTable();
-}
-
-void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
-
-    if (!currentTestRunInfo.used)
-        lazyPrintRunInfo();
-    if (!currentGroupInfo.used)
-        lazyPrintGroupInfo();
-
-    if (!m_headerPrinted) {
-        printTestCaseAndSectionHeader();
-        m_headerPrinted = true;
-    }
-}
-void ConsoleReporter::lazyPrintRunInfo() {
-    stream << '\n' << getLineOfChars<'~'>() << '\n';
-    Colour colour(Colour::SecondaryText);
-    stream << currentTestRunInfo->name
-        << " is a Catch v" << libraryVersion() << " host application.\n"
-        << "Run with -? for options\n\n";
-
-    if (m_config->rngSeed() != 0)
-        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-    currentTestRunInfo.used = true;
-}
-void ConsoleReporter::lazyPrintGroupInfo() {
-    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
-        printClosedHeader("Group: " + currentGroupInfo->name);
-        currentGroupInfo.used = true;
-    }
-}
-void ConsoleReporter::printTestCaseAndSectionHeader() {
-    assert(!m_sectionStack.empty());
-    printOpenHeader(currentTestCaseInfo->name);
-
-    if (m_sectionStack.size() > 1) {
-        Colour colourGuard(Colour::Headers);
-
-        auto
-            it = m_sectionStack.begin() + 1, // Skip first section (test case)
-            itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
-    }
-
-    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
-
-    stream << getLineOfChars<'-'>() << '\n';
-    Colour colourGuard(Colour::FileName);
-    stream << lineInfo << '\n';
-    stream << getLineOfChars<'.'>() << '\n' << std::endl;
-}
-
-void ConsoleReporter::printClosedHeader(std::string const& _name) {
-    printOpenHeader(_name);
-    stream << getLineOfChars<'.'>() << '\n';
-}
-void ConsoleReporter::printOpenHeader(std::string const& _name) {
-    stream << getLineOfChars<'-'>() << '\n';
-    {
-        Colour colourGuard(Colour::Headers);
-        printHeaderString(_name);
-    }
-}
-
-// if string has a : in first line will set indent to follow it on
-// subsequent lines
-void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
-    std::size_t i = _string.find(": ");
-    if (i != std::string::npos)
-        i += 2;
-    else
-        i = 0;
-    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
-}
-
-struct SummaryColumn {
-
-    SummaryColumn( std::string _label, Colour::Code _colour )
-    :   label( std::move( _label ) ),
-        colour( _colour ) {}
-    SummaryColumn addRow( std::size_t count ) {
-        ReusableStringStream rss;
-        rss << count;
-        std::string row = rss.str();
-        for (auto& oldRow : rows) {
-            while (oldRow.size() < row.size())
-                oldRow = ' ' + oldRow;
-            while (oldRow.size() > row.size())
-                row = ' ' + row;
-        }
-        rows.push_back(row);
-        return *this;
-    }
-
-    std::string label;
-    Colour::Code colour;
-    std::vector<std::string> rows;
-
-};
-
-void ConsoleReporter::printTotals( Totals const& totals ) {
-    if (totals.testCases.total() == 0) {
-        stream << Colour(Colour::Warning) << "No tests ran\n";
-    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
-        stream << Colour(Colour::ResultSuccess) << "All tests passed";
-        stream << " ("
-            << pluralise(totals.assertions.passed, "assertion") << " in "
-            << pluralise(totals.testCases.passed, "test case") << ')'
-            << '\n';
-    } else {
-
-        std::vector<SummaryColumn> columns;
-        columns.push_back(SummaryColumn("", Colour::None)
-                          .addRow(totals.testCases.total())
-                          .addRow(totals.assertions.total()));
-        columns.push_back(SummaryColumn("passed", Colour::Success)
-                          .addRow(totals.testCases.passed)
-                          .addRow(totals.assertions.passed));
-        columns.push_back(SummaryColumn("failed", Colour::ResultError)
-                          .addRow(totals.testCases.failed)
-                          .addRow(totals.assertions.failed));
-        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
-                          .addRow(totals.testCases.failedButOk)
-                          .addRow(totals.assertions.failedButOk));
-
-        printSummaryRow("test cases", columns, 0);
-        printSummaryRow("assertions", columns, 1);
-    }
-}
-void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
-    for (auto col : cols) {
-        std::string value = col.rows[row];
-        if (col.label.empty()) {
-            stream << label << ": ";
-            if (value != "0")
-                stream << value;
-            else
-                stream << Colour(Colour::Warning) << "- none -";
-        } else if (value != "0") {
-            stream << Colour(Colour::LightGrey) << " | ";
-            stream << Colour(col.colour)
-                << value << ' ' << col.label;
-        }
-    }
-    stream << '\n';
-}
-
-void ConsoleReporter::printTotalsDivider(Totals const& totals) {
-    if (totals.testCases.total() > 0) {
-        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
-        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
-        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
-        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)++;
-        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)--;
-
-        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
-        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
-        if (totals.testCases.allPassed())
-            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
-        else
-            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
-    } else {
-        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
-    }
-    stream << '\n';
-}
-void ConsoleReporter::printSummaryDivider() {
-    stream << getLineOfChars<'-'>() << '\n';
-}
-
-void ConsoleReporter::printTestFilters() {
-    if (m_config->testSpec().hasFilters()) {
-        Colour guard(Colour::BrightYellow);
-        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
-    }
-}
-
-CATCH_REGISTER_REPORTER("console", ConsoleReporter)
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic pop
-#endif
-// end catch_reporter_console.cpp
-// start catch_reporter_junit.cpp
-
-#include <cassert>
-#include <sstream>
-#include <ctime>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    namespace {
-        std::string getCurrentTimestamp() {
-            // Beware, this is not reentrant because of backward compatibility issues
-            // Also, UTC only, again because of backward compatibility (%z is C++11)
-            time_t rawtime;
-            std::time(&rawtime);
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &rawtime);
-#else
-            std::tm* timeInfo;
-            timeInfo = std::gmtime(&rawtime);
-#endif
-
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp, timeStampSize-1);
-        }
-
-        std::string fileNameTag(const std::vector<std::string> &tags) {
-            auto it = std::find_if(begin(tags),
-                                   end(tags),
-                                   [] (std::string const& tag) {return tag.front() == '#'; });
-            if (it != tags.end())
-                return it->substr(1);
-            return std::string();
-        }
-
-        // Formats the duration in seconds to 3 decimal places.
-        // This is done because some genius defined Maven Surefire schema
-        // in a way that only accepts 3 decimal places, and tools like
-        // Jenkins use that schema for validation JUnit reporter output.
-        std::string formatDuration( double seconds ) {
-            ReusableStringStream rss;
-            rss << std::fixed << std::setprecision( 3 ) << seconds;
-            return rss.str();
-        }
-
-    } // anonymous namespace
-
-    JunitReporter::JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-            m_reporterPrefs.shouldReportAllAssertions = true;
-        }
-
-    JunitReporter::~JunitReporter() {}
-
-    std::string JunitReporter::getDescription() {
-        return "Reports test results in an XML format that looks like Ant's junitreport target";
-    }
-
-    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
-
-    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
-        CumulativeReporterBase::testRunStarting( runInfo );
-        xml.startElement( "testsuites" );
-    }
-
-    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        suiteTimer.start();
-        stdOutForSuite.clear();
-        stdErrForSuite.clear();
-        unexpectedExceptions = 0;
-        CumulativeReporterBase::testGroupStarting( groupInfo );
-    }
-
-    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
-        m_okToFail = testCaseInfo.okToFail();
-    }
-
-    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
-            unexpectedExceptions++;
-        return CumulativeReporterBase::assertionEnded( assertionStats );
-    }
-
-    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        stdOutForSuite += testCaseStats.stdOut;
-        stdErrForSuite += testCaseStats.stdErr;
-        CumulativeReporterBase::testCaseEnded( testCaseStats );
-    }
-
-    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        double suiteTime = suiteTimer.getElapsedSeconds();
-        CumulativeReporterBase::testGroupEnded( testGroupStats );
-        writeGroup( *m_testGroups.back(), suiteTime );
-    }
-
-    void JunitReporter::testRunEndedCumulative() {
-        xml.endElement();
-    }
-
-    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-
-        TestGroupStats const& stats = groupNode.value;
-        xml.writeAttribute( "name", stats.groupInfo.name );
-        xml.writeAttribute( "errors", unexpectedExceptions );
-        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-        xml.writeAttribute( "tests", stats.totals.assertions.total() );
-        xml.writeAttribute( "hostname", "tbd" ); // !TBD
-        if( m_config->showDurations() == ShowDurations::Never )
-            xml.writeAttribute( "time", "" );
-        else
-            xml.writeAttribute( "time", formatDuration( suiteTime ) );
-        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
-
-        // Write properties if there are any
-        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
-            auto properties = xml.scopedElement("properties");
-            if (m_config->hasTestFilters()) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "filters")
-                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
-            }
-            if (m_config->rngSeed() != 0) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "random-seed")
-                    .writeAttribute("value", m_config->rngSeed());
-            }
-        }
-
-        // Write test cases
-        for( auto const& child : groupNode.children )
-            writeTestCase( *child );
-
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
-    }
-
-    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
-        TestCaseStats const& stats = testCaseNode.value;
-
-        // All test cases have exactly one section - which represents the
-        // test case itself. That section may have 0-n nested sections
-        assert( testCaseNode.children.size() == 1 );
-        SectionNode const& rootSection = *testCaseNode.children.front();
-
-        std::string className = stats.testInfo.className;
-
-        if( className.empty() ) {
-            className = fileNameTag(stats.testInfo.tags);
-            if ( className.empty() )
-                className = "global";
-        }
-
-        if ( !m_config->name().empty() )
-            className = m_config->name() + "." + className;
-
-        writeSection( className, "", rootSection, stats.testInfo.okToFail() );
-    }
-
-    void JunitReporter::writeSection( std::string const& className,
-                                      std::string const& rootName,
-                                      SectionNode const& sectionNode,
-                                      bool testOkToFail) {
-        std::string name = trim( sectionNode.stats.sectionInfo.name );
-        if( !rootName.empty() )
-            name = rootName + '/' + name;
-
-        if( !sectionNode.assertions.empty() ||
-            !sectionNode.stdOut.empty() ||
-            !sectionNode.stdErr.empty() ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-            if( className.empty() ) {
-                xml.writeAttribute( "classname", name );
-                xml.writeAttribute( "name", "root" );
-            }
-            else {
-                xml.writeAttribute( "classname", className );
-                xml.writeAttribute( "name", name );
-            }
-            xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) );
-            // This is not ideal, but it should be enough to mimic gtest's
-            // junit output.
-            // Ideally the JUnit reporter would also handle `skipTest`
-            // events and write those out appropriately.
-            xml.writeAttribute( "status", "run" );
-
-            if (sectionNode.stats.assertions.failedButOk) {
-                xml.scopedElement("skipped")
-                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
-            }
-
-            writeAssertions( sectionNode );
-
-            if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
-            if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
-        }
-        for( auto const& childNode : sectionNode.childSections )
-            if( className.empty() )
-                writeSection( name, "", *childNode, testOkToFail );
-            else
-                writeSection( className, name, *childNode, testOkToFail );
-    }
-
-    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
-        for( auto const& assertion : sectionNode.assertions )
-            writeAssertion( assertion );
-    }
-
-    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
-        AssertionResult const& result = stats.assertionResult;
-        if( !result.isOk() ) {
-            std::string elementName;
-            switch( result.getResultType() ) {
-                case ResultWas::ThrewException:
-                case ResultWas::FatalErrorCondition:
-                    elementName = "error";
-                    break;
-                case ResultWas::ExplicitFailure:
-                case ResultWas::ExpressionFailed:
-                case ResultWas::DidntThrowException:
-                    elementName = "failure";
-                    break;
-
-                // We should never see these here:
-                case ResultWas::Info:
-                case ResultWas::Warning:
-                case ResultWas::Ok:
-                case ResultWas::Unknown:
-                case ResultWas::FailureBit:
-                case ResultWas::Exception:
-                    elementName = "internalError";
-                    break;
-            }
-
-            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-            xml.writeAttribute( "message", result.getExpression() );
-            xml.writeAttribute( "type", result.getTestMacroName() );
-
-            ReusableStringStream rss;
-            if (stats.totals.assertions.total() > 0) {
-                rss << "FAILED" << ":\n";
-                if (result.hasExpression()) {
-                    rss << "  ";
-                    rss << result.getExpressionInMacro();
-                    rss << '\n';
-                }
-                if (result.hasExpandedExpression()) {
-                    rss << "with expansion:\n";
-                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
-                }
-            } else {
-                rss << '\n';
-            }
-
-            if( !result.getMessage().empty() )
-                rss << result.getMessage() << '\n';
-            for( auto const& msg : stats.infoMessages )
-                if( msg.type == ResultWas::Info )
-                    rss << msg.message << '\n';
-
-            rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), XmlFormatting::Newline );
-        }
-    }
-
-    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-// end catch_reporter_junit.cpp
-// start catch_reporter_listening.cpp
-
-#include <cassert>
-
-namespace Catch {
-
-    ListeningReporter::ListeningReporter() {
-        // We will assume that listeners will always want all assertions
-        m_preferences.shouldReportAllAssertions = true;
-    }
-
-    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
-        m_listeners.push_back( std::move( listener ) );
-    }
-
-    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
-        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
-        m_reporter = std::move( reporter );
-        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
-    }
-
-    ReporterPreferences ListeningReporter::getPreferences() const {
-        return m_preferences;
-    }
-
-    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
-        return std::set<Verbosity>{ };
-    }
-
-    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->noMatchingTestCases( spec );
-        }
-        m_reporter->noMatchingTestCases( spec );
-    }
-
-    void ListeningReporter::reportInvalidArguments(std::string const&arg){
-        for ( auto const& listener : m_listeners ) {
-            listener->reportInvalidArguments( arg );
-        }
-        m_reporter->reportInvalidArguments( arg );
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkPreparing(name);
-		}
-		m_reporter->benchmarkPreparing(name);
-	}
-    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkStarting( benchmarkInfo );
-        }
-        m_reporter->benchmarkStarting( benchmarkInfo );
-    }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkEnded( benchmarkStats );
-        }
-        m_reporter->benchmarkEnded( benchmarkStats );
-    }
-
-	void ListeningReporter::benchmarkFailed( std::string const& error ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkFailed(error);
-		}
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunStarting( testRunInfo );
-        }
-        m_reporter->testRunStarting( testRunInfo );
-    }
-
-    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupStarting( groupInfo );
-        }
-        m_reporter->testGroupStarting( groupInfo );
-    }
-
-    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseStarting( testInfo );
-        }
-        m_reporter->testCaseStarting( testInfo );
-    }
-
-    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionStarting( sectionInfo );
-        }
-        m_reporter->sectionStarting( sectionInfo );
-    }
-
-    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->assertionStarting( assertionInfo );
-        }
-        m_reporter->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        for( auto const& listener : m_listeners ) {
-            static_cast<void>( listener->assertionEnded( assertionStats ) );
-        }
-        return m_reporter->assertionEnded( assertionStats );
-    }
-
-    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionEnded( sectionStats );
-        }
-        m_reporter->sectionEnded( sectionStats );
-    }
-
-    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseEnded( testCaseStats );
-        }
-        m_reporter->testCaseEnded( testCaseStats );
-    }
-
-    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupEnded( testGroupStats );
-        }
-        m_reporter->testGroupEnded( testGroupStats );
-    }
-
-    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunEnded( testRunStats );
-        }
-        m_reporter->testRunEnded( testRunStats );
-    }
-
-    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->skipTest( testInfo );
-        }
-        m_reporter->skipTest( testInfo );
-    }
-
-    bool ListeningReporter::isMulti() const {
-        return true;
-    }
-
-} // end namespace Catch
-// end catch_reporter_listening.cpp
-// start catch_reporter_xml.cpp
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    XmlReporter::XmlReporter( ReporterConfig const& _config )
-    :   StreamingReporterBase( _config ),
-        m_xml(_config.stream())
-    {
-        m_reporterPrefs.shouldRedirectStdOut = true;
-        m_reporterPrefs.shouldReportAllAssertions = true;
-    }
-
-    XmlReporter::~XmlReporter() = default;
-
-    std::string XmlReporter::getDescription() {
-        return "Reports test results as an XML document";
-    }
-
-    std::string XmlReporter::getStylesheetRef() const {
-        return std::string();
-    }
-
-    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
-        m_xml
-            .writeAttribute( "filename", sourceInfo.file )
-            .writeAttribute( "line", sourceInfo.line );
-    }
-
-    void XmlReporter::noMatchingTestCases( std::string const& s ) {
-        StreamingReporterBase::noMatchingTestCases( s );
-    }
-
-    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
-        StreamingReporterBase::testRunStarting( testInfo );
-        std::string stylesheetRef = getStylesheetRef();
-        if( !stylesheetRef.empty() )
-            m_xml.writeStylesheetRef( stylesheetRef );
-        m_xml.startElement( "Catch" );
-        if( !m_config->name().empty() )
-            m_xml.writeAttribute( "name", m_config->name() );
-        if (m_config->testSpec().hasFilters())
-            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
-        if( m_config->rngSeed() != 0 )
-            m_xml.scopedElement( "Randomness" )
-                .writeAttribute( "seed", m_config->rngSeed() );
-    }
-
-    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        StreamingReporterBase::testGroupStarting( groupInfo );
-        m_xml.startElement( "Group" )
-            .writeAttribute( "name", groupInfo.name );
-    }
-
-    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        StreamingReporterBase::testCaseStarting(testInfo);
-        m_xml.startElement( "TestCase" )
-            .writeAttribute( "name", trim( testInfo.name ) )
-            .writeAttribute( "description", testInfo.description )
-            .writeAttribute( "tags", testInfo.tagsAsString() );
-
-        writeSourceInfo( testInfo.lineInfo );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            m_testCaseTimer.start();
-        m_xml.ensureTagClosed();
-    }
-
-    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        StreamingReporterBase::sectionStarting( sectionInfo );
-        if( m_sectionDepth++ > 0 ) {
-            m_xml.startElement( "Section" )
-                .writeAttribute( "name", trim( sectionInfo.name ) );
-            writeSourceInfo( sectionInfo.lineInfo );
-            m_xml.ensureTagClosed();
-        }
-    }
-
-    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
-
-    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
-
-        AssertionResult const& result = assertionStats.assertionResult;
-
-        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-        if( includeResults || result.getResultType() == ResultWas::Warning ) {
-            // Print any info messages in <Info> tags.
-            for( auto const& msg : assertionStats.infoMessages ) {
-                if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
-                } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
-                }
-            }
-        }
-
-        // Drop out if result was successful but we're not printing them.
-        if( !includeResults && result.getResultType() != ResultWas::Warning )
-            return true;
-
-        // Print the expression if there is one.
-        if( result.hasExpression() ) {
-            m_xml.startElement( "Expression" )
-                .writeAttribute( "success", result.succeeded() )
-                .writeAttribute( "type", result.getTestMacroName() );
-
-            writeSourceInfo( result.getSourceInfo() );
-
-            m_xml.scopedElement( "Original" )
-                .writeText( result.getExpression() );
-            m_xml.scopedElement( "Expanded" )
-                .writeText( result.getExpandedExpression() );
-        }
-
-        // And... Print a result applicable to each result type.
-        switch( result.getResultType() ) {
-            case ResultWas::ThrewException:
-                m_xml.startElement( "Exception" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::FatalErrorCondition:
-                m_xml.startElement( "FatalErrorCondition" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::Info:
-                m_xml.scopedElement( "Info" )
-                    .writeText( result.getMessage() );
-                break;
-            case ResultWas::Warning:
-                // Warning will already have been written
-                break;
-            case ResultWas::ExplicitFailure:
-                m_xml.startElement( "Failure" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            default:
-                break;
-        }
-
-        if( result.hasExpression() )
-            m_xml.endElement();
-
-        return true;
-    }
-
-    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
-        StreamingReporterBase::sectionEnded( sectionStats );
-        if( --m_sectionDepth > 0 ) {
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-            e.writeAttribute( "successes", sectionStats.assertions.passed );
-            e.writeAttribute( "failures", sectionStats.assertions.failed );
-            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-            m_xml.endElement();
-        }
-    }
-
-    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        StreamingReporterBase::testCaseEnded( testCaseStats );
-        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-        if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
-        if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
-
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        StreamingReporterBase::testGroupEnded( testGroupStats );
-        // TODO: Check testGroupStats.aborting and act accordingly.
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
-            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        StreamingReporterBase::testRunEnded( testRunStats );
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
-            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkPreparing(std::string const& name) {
-        m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", name);
-    }
-
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
-        m_xml.writeAttribute("samples", info.samples)
-            .writeAttribute("resamples", info.resamples)
-            .writeAttribute("iterations", info.iterations)
-            .writeAttribute("clockResolution", info.clockResolution)
-            .writeAttribute("estimatedDuration", info.estimatedDuration)
-            .writeComment("All values in nano seconds");
-    }
-
-    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
-            .writeAttribute("value", benchmarkStats.mean.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
-            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
-            .writeAttribute("variance", benchmarkStats.outlierVariance)
-            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
-            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
-            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
-            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
-        m_xml.endElement();
-        m_xml.endElement();
-    }
-
-    void XmlReporter::benchmarkFailed(std::string const &error) {
-        m_xml.scopedElement("failed").
-            writeAttribute("message", error);
-        m_xml.endElement();
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-// end catch_reporter_xml.cpp
-
-namespace Catch {
-    LeakDetector leakDetector;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_impl.hpp
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// start catch_default_main.hpp
-
-#ifndef __OBJC__
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
-// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
-#else
-// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
-#endif
-
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char**)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-// end catch_default_main.hpp
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#if !defined(CATCH_CONFIG_DISABLE)
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
-#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
-#else
-#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
-#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
-#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
-#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
-
-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
-#else
-#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-
-#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-using Catch::Detail::Approx;
-
-#else // CATCH_CONFIG_DISABLE
-
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... )        (void)(0)
-#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
-
-#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CATCH_CHECK( ... )         (void)(0)
-#define CATCH_CHECK_FALSE( ... )   (void)(0)
-#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
-#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
-#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
-
-#define CATCH_CHECK_THROWS( ... )  (void)(0)
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg )          (void)(0)
-#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
-#define CATCH_WARN( msg )          (void)(0)
-#define CATCH_CAPTURE( msg )       (void)(0)
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_METHOD_AS_TEST_CASE( method, ... )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define CATCH_SECTION( ... )
-#define CATCH_DYNAMIC_SECTION( ... )
-#define CATCH_FAIL( ... ) (void)(0)
-#define CATCH_FAIL_CHECK( ... ) (void)(0)
-#define CATCH_SUCCEED( ... ) (void)(0)
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-#define CATCH_GIVEN( desc )
-#define CATCH_AND_GIVEN( desc )
-#define CATCH_WHEN( desc )
-#define CATCH_AND_WHEN( desc )
-#define CATCH_THEN( desc )
-#define CATCH_AND_THEN( desc )
-
-#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... )       (void)(0)
-#define REQUIRE_FALSE( ... ) (void)(0)
-
-#define REQUIRE_THROWS( ... ) (void)(0)
-#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CHECK( ... ) (void)(0)
-#define CHECK_FALSE( ... ) (void)(0)
-#define CHECKED_IF( ... ) if (__VA_ARGS__)
-#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
-#define CHECK_NOFAIL( ... ) (void)(0)
-
-#define CHECK_THROWS( ... )  (void)(0)
-#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) (void)(0)
-
-#define REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) (void)(0)
-#define UNSCOPED_INFO( msg ) (void)(0)
-#define WARN( msg ) (void)(0)
-#define CAPTURE( msg ) (void)(0)
-
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define METHOD_AS_TEST_CASE( method, ... )
-#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define SECTION( ... )
-#define DYNAMIC_SECTION( ... )
-#define FAIL( ... ) (void)(0)
-#define FAIL_CHECK( ... ) (void)(0)
-#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-#define STATIC_REQUIRE( ... )       (void)(0)
-#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-
-#define GIVEN( desc )
-#define AND_GIVEN( desc )
-#define WHEN( desc )
-#define AND_WHEN( desc )
-#define THEN( desc )
-#define AND_THEN( desc )
-
-using Catch::Detail::Approx;
-
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-// start catch_reenable_warnings.h
-
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-// end catch_reenable_warnings.h
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
diff --git a/Testing/cpp/TestControlAccess.cc b/Testing/cpp/TestControlAccess.cc
deleted file mode 100644
index 215981b..0000000
--- a/Testing/cpp/TestControlAccess.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * TestControlAccesss.cc
- *
- *  Created on: Sept 15, 2019
- *      Author: N.S. Oblath
- */
-
-
-#include "ControlAccess.hh"
-
-#include <thread>
-
-#include "catch.hpp"
-
-
-TEST_CASE( "control_access", "[control_access]" )
-{
-    using namespace Nymph;
-
-    ControlAccess control;
-
-    SECTION( "One Return" )
-    {
-        int intReturn = 5;
-
-        REQUIRE_THROWS( control.GetReturn< int >() );
-
-        control.SetReturn< int >( intReturn );
-
-        REQUIRE( std::get< 0 >(control.GetReturn< int >()) == intReturn );
-        REQUIRE_THROWS( control.GetReturn< unsigned >() );
-    }
-
-    SECTION( "Two Returns" )
-    {
-        int return1 = 5;
-        double return2 = 10.;
-
-        control.SetReturn< int, double >( return1, return2 );
-
-        REQUIRE( std::get< 0 >(control.GetReturn< int, double >()) == return1 );
-        REQUIRE( std::get< 1 >(control.GetReturn< int, double >()) == return2 );
-    }
-
-    SECTION( "Break" )
-    {
-        SharedControl* shared = SharedControl::create_instance();
-
-        std::thread thread( [&](){ 
-            shared->Break();
-        } );
-        
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE( shared->GetBreakFlag() );
-
-        shared->Resume();
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE_FALSE( shared->GetBreakFlag() );
-
-        thread.join();
-
-        REQUIRE_FALSE( shared->GetBreakFlag() );
-    }
-
-}
\ No newline at end of file
diff --git a/Testing/cpp/TestData.cc b/Testing/cpp/TestData.cc
deleted file mode 100644
index 8682488..0000000
--- a/Testing/cpp/TestData.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * TestData.cc
- *
- *  Created on: Jan 6, 2022
- *      Author: N.S. Oblath
- */
-
-#include "TestDataClasses.hh"
-
-#include "catch.hpp"
-
-
-TEST_CASE( "data", "[data]" )
-{
-    using namespace Nymph;
-
-    TestData1 data1;
-    REQUIRE( data1.GetIValue1() == 0 );
-    REQUIRE( data1.GetIValue2() == 5 );
-
-    data1.SetIValue1( 50 );
-    REQUIRE( data1.GetIValue1() == 50 );
-
-    TestData2 data2;
-    REQUIRE( data2.GetDValue1() == Approx( 0.0 ) );
-    REQUIRE( data2.GetDValue2() == Approx( 10.0 ) );
-
-}
diff --git a/Testing/cpp/TestDataClasses.hh b/Testing/cpp/TestDataClasses.hh
deleted file mode 100644
index c23650a..0000000
--- a/Testing/cpp/TestDataClasses.hh
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * TestDataClasses.hh
- *
- *  Created on: Jan 6, 2022
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_TESTING_TESTDATACLASSES
-#define NYMPH_TESTING_TESTDATACLASSES
-
-#include "Data.hh"
-#include "MemberVariable.hh"
-
-#include <iostream>
-namespace Nymph
-{
-    class TestData1 : public Data
-    {
-        public:
-            TestData1() :
-                    Data(),
-                    fIValue1( 0 ),
-                    fIValue2( 5 )
-            {
-                std::cerr << "in test data 1 constuctor" << std::endl;
-            }
-
-            virtual ~TestData1()
-            {}
-
-            MEMVAR( int, IValue1 );
-            MEMVAR( int, IValue2 );
-    };
-
-    class TestData2 : public Data
-    {
-        public:
-            TestData2() :
-                    Data(),
-                    fDValue1( 0. ),
-                    fDValue2( 10. )
-            {}
-
-            virtual ~TestData2()
-            {}
-
-            MEMVAR( double, DValue1 );
-            MEMVAR( double, DValue2 );
-    };
-
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_TESTING_TESTDATACLASSES */
diff --git a/Testing/cpp/TestDataFrame.cc b/Testing/cpp/TestDataFrame.cc
deleted file mode 100644
index 100ca62..0000000
--- a/Testing/cpp/TestDataFrame.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * TestDataFrame.cc
- *
- *  Created on: Jan 6, 2022
- *      Author: N.S. Oblath
- */
-
-#include "TestDataClasses.hh"
-
-#include "DataFrame.hh"
-
-#include "catch.hpp"
-
-
-TEST_CASE( "data_frame", "[data]" )
-{
-    using namespace Nymph;
-
-    DataFrame frame;
-    const DataFrame& cFrame = frame;
-
-    REQUIRE( frame.DataObjects().empty() );
-    REQUIRE( frame.Empty() );
-    REQUIRE_FALSE( frame.Has< TestData1 >() );
-    REQUIRE_FALSE( frame.Has< TestData2 >() );
-
-    // create a data object  with Get()
-    TestData1& data1 = frame.Get< TestData1 >();
-    REQUIRE( frame.Has< TestData1 >() );
-    // ensure TestData1 object was initialized correctly
-    REQUIRE( data1.GetIValue1() == 0 );
-    REQUIRE( data1.GetIValue2() == 5 );
-
-    // make sure that we haven't made a copy of the data object
-    data1.SetIValue1( 50 );
-    REQUIRE( data1.GetIValue1() == 50 );
-    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 50 );
-
-    // check const access
-    // currently has TestData1; does not have TestData2
-    REQUIRE( cFrame.Get< TestData1 >().GetIValue1() == 50 );
-    REQUIRE_THROWS_AS( cFrame.Get< TestData2 >(), DataFrameException );
-
-    // remove a data object
-    // currently has TestData1; does not have TestData2
-    REQUIRE_NOTHROW( frame.Remove< TestData2 >() );
-    REQUIRE_NOTHROW( frame.Remove< TestData1 >() );
-    REQUIRE_FALSE( frame.Has< TestData1 >() );
-    REQUIRE( frame.Empty() );
-
-    // set an object with a raw pointer
-    TestData2* newTestData2Ptr = new TestData2();
-    REQUIRE_NOTHROW( frame.Set( newTestData2Ptr ) );
-    REQUIRE( frame.Has< TestData2 >() );
-    REQUIRE( (Data*)newTestData2Ptr == frame.DataObjects()[typeid(TestData2)].get() ); // we did not make a copy
-
-    // set an object with a unique_ptr
-    std::unique_ptr< TestData1 > newTestData1Ptr( new TestData1 );
-    REQUIRE_NOTHROW( frame.Set( std::move(newTestData1Ptr) ) );
-    REQUIRE_FALSE( newTestData1Ptr );
-    REQUIRE( frame.Has< TestData1 >() );
-    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 0 ); // check that fIValue1 has the default value; we'll overwrite the data object next, and verify we have the new value
-
-    // set an object with a copy of an object
-    TestData1 anotherTestData1;
-    anotherTestData1.SetIValue1( 4000 );
-    REQUIRE_NOTHROW( frame.Set( anotherTestData1 ) );
-    REQUIRE( anotherTestData1.GetIValue1() == 4000 );
-    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 4000 );
-    REQUIRE_FALSE( (Data*)(&anotherTestData1) == frame.DataObjects()[typeid(TestData1)].get() ); // we made a copy
-
-}
diff --git a/Testing/cpp/TestException.cc b/Testing/cpp/TestException.cc
deleted file mode 100644
index eb0785c..0000000
--- a/Testing/cpp/TestException.cc
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * TestException.cc
- *
- *  Created on: Jan 6, 2022
- *      Author: N.S. Oblath
- */
-
-#include "Exception.hh"
-
-#include "catch.hpp"
-
-#include "logger.hh"
-
-LOGGER( testlog, "TestException" );
-
-TEST_CASE( "exception", "[utility]" )
-{
-    using namespace Nymph;
-
-    Exception blankEx;
-    REQUIRE( blankEx.what() == std::string() );
-    REQUIRE( blankEx.filename().empty() );
-    REQUIRE( blankEx.line() == 0 );
-
-    Exception testEx( "some_file", 1 );
-    REQUIRE( testEx.filename() == "some_file" );
-    REQUIRE( testEx.line() == 1 );
-
-    std::string testMessage("test message 2: ");
-    int testInt = 5;
-    testEx << testMessage << testInt;
-    REQUIRE( testEx.what() == testMessage + std::to_string(testInt) );
-
-    /*EXCEPT_HERE( Exception testEx );*/ 
-    // uses of __LINE__ need to be on the same line
-    testEx( __FILE__, __LINE__ ); std::string recordFile( __FILE__ ); int recordLine( __LINE__ );
-    REQUIRE( testEx.filename() == recordFile );
-    REQUIRE( testEx.line() == recordLine );
-
-    EXCEPT_HERE( testEx ); recordFile = std::string(__FILE__); recordLine = __LINE__;
-    REQUIRE( testEx.filename() == recordFile );
-    REQUIRE( testEx.line() == recordLine );
-}
-
-TEST_CASE( "throw", "[utility]" )
-{
-    using namespace Nymph;
-
-    try
-    {
-        throw Exception();
-    }
-    catch(const Exception& e)
-    {
-        REQUIRE( e.what() == std::string() );
-        REQUIRE( e.filename().empty() );
-        REQUIRE( e.line() == 0 );
-    }
-    
-    std::string recordFile;
-    int recordLine = 0;
-
-    try
-    {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
-        throw Exception( __FILE__, __LINE__ ) << "test message";
-    }
-    catch(const Exception& e)
-    {
-        REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
-    }
-    
-    // Give CREATE_EXCEPT_HERE the class name
-    try
-    {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
-        throw CREATE_EXCEPT_HERE( Exception );
-    }
-    catch(const Exception& e)
-    {
-        REQUIRE( e.what() == std::string() );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
-    }
-    
-    // Give EXCEPT_HERE an exception
-    try
-    {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
-        throw EXCEPT_HERE( Exception() << "test message" );
-    }
-    catch(const Exception& e)
-    {
-        REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
-    }
-    
-    // THROW macro
-    try
-    {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
-        THROW_EXCEPT_HERE( Exception() << "test message" );
-    }
-    catch(const Exception& e)
-    {
-        REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
-    }
-    
-}
-
-const unsigned layers = 5;
-const std::string firstThrowText( "First throw" );
-const std::string nestedThrowText( "nested throw at layer " );
-
-void CatchThrow() 
-{
-    //const static unsigned layers = 5;
-    static unsigned count = 0;
-
-    try
-    {
-        if( count == layers )
-        {
-            throw CREATE_EXCEPT_HERE( Nymph::Exception ) << firstThrowText;
-        }
-        else
-        {
-            ++count;
-            CatchThrow();
-            return;
-        }
-    }
-    catch(const Nymph::Exception& e)
-    {
-        if( count == layers )
-        {
-            REQUIRE( e.what() == firstThrowText );
-        }
-        else
-        {
-            std::string what( e.what() );
-            REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
-        }
-        THROW_NESTED_EXCEPT_HERE( Nymph::Exception() << nestedThrowText << count-- ) ;
-    }
-}
-
-void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
-{
-    std::string prefix( count, ' ' );
-    LINFO( testlog, prefix << "Thrown at: " << e.where() );
-    LINFO( testlog, prefix << e.what() );
-    if( count == layers + 1 )
-    {
-        REQUIRE( e.what() == firstThrowText );
-    }
-    else
-    {
-        std::string what( e.what() );
-        REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
-    }
-
-    try
-    {
-        std::rethrow_if_nested( e );
-    }
-    catch(const Nymph::Exception& e)
-    {
-        PrintExceptionWithTests( e, ++count );
-    }
-    return;
-}
-
-TEST_CASE( "nested_throw", "[utility]" )
-{
-    using namespace Nymph;
-
-    try
-    {
-        CatchThrow();
-    }
-    catch(const Exception& e)
-    {
-
-        PrintExceptionWithTests(e);
-    }
-    
-}
-
-/* removed for trying home-grown exceptions, 1/10/22
-    auto throwException = []() {
-        BOOST_THROW_EXCEPTION( Exception() << "Test exception" << eom );
-    };
-
-    REQUIRE_THROWS_AS( throwException(), Exception );
-
-    try
-    {
-        throwException();
-    }
-    catch(const Exception& e)
-    {
-        LWARN( testlog, diagnostic_information(e) );
-    }
-*/  
diff --git a/Testing/cpp/TestPrimaryProcessor.cc b/Testing/cpp/TestPrimaryProcessor.cc
deleted file mode 100644
index a33242f..0000000
--- a/Testing/cpp/TestPrimaryProcessor.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * TestPrimaryProcessor.cc
- *
- *  Created on: Sept 15, 2019
- *      Author: N.S. Oblath
- */
-
-#include "TestProcessorClasses.hh"
-
-#include "logger.hh"
-
-#include "catch.hpp"
-
-LOGGER( testlog, "TestPrimaryProcessor" );
-
-REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
-
-
-TEST_CASE( "primary_processor", "[primary_processor]" )
-{
-    using namespace Nymph;
-
-    SharedControl::get_instance()->Reset();
-
-    TestPrimaryProc tester;
-    REQUIRE_FALSE( tester.ExceptionPtr() );
-
-    // SignalNewValue test
-    tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
-    tester.ConnectASlot( "value", tester, "value" );
-    tester();
-    REQUIRE( tester.GetValue() == tester.GetNewValue() );
-
-    // WaitTwoSec test
-    // -- no test implemented here right now --
-    //tester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
-
-    // ThrowExcept test
-    tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
-    REQUIRE_NOTHROW( tester() ); // the exception should be caught by operator() and stored as the exception ptr
-    REQUIRE( tester.ExceptionPtr() ); // the exception ptr should now be set
-    try
-    {
-        std::rethrow_exception( tester.ExceptionPtr() );
-    }
-    catch( const scarab::base_exception& e )
-    {
-        PrintException( e );
-        REQUIRE( std::string(e.what()) == std::string("PrimaryProcessor test function: throw Exception") );
-    }
-    
-    
-
-    //REQUIRE( tester.ValueSig().GetControl() == &control );
-}
diff --git a/Testing/cpp/TestProcessor.cc b/Testing/cpp/TestProcessor.cc
deleted file mode 100644
index 9766015..0000000
--- a/Testing/cpp/TestProcessor.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * TestProcessor.cc
- *
- *  Created on: Sept 12, 2019
- *      Author: N.S. Oblath
- */
-
-#include "TestProcessorClasses.hh"
-
-#include "logger.hh"
-
-#include "catch.hpp"
-
-LOGGER( testlog, "TestProcessor" );
-
-REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
-
-
-TEST_CASE( "processor", "[signal],[slot],[processor]" )
-{
-    using namespace Nymph;
-
-    SharedControl::get_instance()->Reset();
-
-    TestProc tester;
-
-    SECTION( "Configuration" )
-    {
-        REQUIRE( tester.GetValue() == 0 );
-
-        // setup the config parameter
-        scarab::param_node config;
-        int configValue = 5;
-        config.add( "value", configValue );
-
-        // perform configuration with no value for "string"
-        REQUIRE_NOTHROW( tester.Configure( config ) );
-        // check that the value was set correctly
-        REQUIRE( tester.GetValue() == configValue );
-
-        // peform configuration with an illegal value for "string"
-        config.add( "string", "illegal value" );
-        REQUIRE_THROWS_AS( tester.Configure( config ), ConfigException );
-        try
-        {
-            tester.Configure( config );
-        }
-        catch( const ConfigException& e )
-        {
-            PrintException(e);
-        }
-        
-        // perform configuration with a legal value for "string"
-        config["string"]().set( "ok value 1" );
-        REQUIRE_NOTHROW( tester.Configure( config ) );
-        REQUIRE( tester.StringValue() == "ok 1" );
-
-    }
-
-    SECTION( "Signals and Slots" )
-    {
-        // check that the processor has the right number of signals and slots registered
-        REQUIRE( tester.Signals().size() == 2 );
-        REQUIRE( tester.Slots().size() == 3 );
-
-        //**************************
-        // Testing signal->slot
-        //**************************
-
-        // this is a slot using a lambda function to set a variable
-        int lambdaValue = 0;
-        Slot< int > lambdaSlot( "lambdaSlot", [&lambdaValue](int input){ lambdaValue = input; } );
-        tester.RegisterSlot( "lambdaSlot", &lambdaSlot );
-
-        // this slot is a member function of an object other than the processor
-        TestSlotOwner slotOwner;
-        Slot< int > slotOwnerSlot( "slotOwnerSlot", &tester, &slotOwner, &TestSlotOwner::TestSlotFunc );
-
-        // check initial value
-        REQUIRE( slotOwner.fValue == 0 );
-        REQUIRE( lambdaValue == 0 );
-
-        // we've added a couple more slots
-        REQUIRE( tester.Slots().size() == 5 );
-
-        // no connections yet
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 0 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 0 );
-
-        // make a connection
-        tester.ConnectASlot( "value", tester, "value" );
-
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
-
-        // repeat connection should be ignored
-        tester.ConnectASlot( "value", tester, "value" );
-
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
-
-        // connect the lambda slot to the signal
-        tester.ConnectASignal( tester, "value", "lambdaSlot" );
-
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 2 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("lambdaSlot")->Connections().size() == 1 );
-
-        // connect the exteranlly-owned slot to the signal
-        Processor::ConnectSignalToSlot( tester.Signals().at("value"), tester.Slots().at("slotOwnerSlot") );
-
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 3 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("slotOwnerSlot")->Connections().size() == 1 );
-
-        // now have "signal" connected to three slots:
-        //     value --> value
-        //     value --> lambdaSlot
-        //     value --> slotOwnerSlot
-
-        // emit the signal
-        int newValue = 10;
-        tester.ValueSig().Emit( newValue );
-
-        // check that all values have been changed
-        REQUIRE( tester.GetValue() == newValue );
-        REQUIRE( slotOwner.fValue == newValue );
-        REQUIRE( lambdaValue == newValue );
-
-        //*********************************
-        // testing slot->signal->slot
-        //*********************************
-
-        // check initial value
-        REQUIRE( tester.GetSecondValue() == 0 );
-
-        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed().size() == 1 );
-        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed()[0] == &tester.SecondValueSig() );
-
-        tester.ConnectASlot( "second-value", tester, "second-value-2" );
-
-        // now have second-value (slot) emits second-value --> second-value-2
-
-        REQUIRE( tester.Signals().at("second-value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("second-value-2")->Connections().size() == 1 );
-
-        tester.SecondValueSlotFunction( newValue );
-
-        REQUIRE( tester.GetSecondValue() == newValue );
-    }
-
-}
diff --git a/Testing/cpp/TestProcessorClasses.hh b/Testing/cpp/TestProcessorClasses.hh
deleted file mode 100644
index 313d0d7..0000000
--- a/Testing/cpp/TestProcessorClasses.hh
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * TestProcessorClasses.hh
- *
- *  Created on: Nov 25, 2021
- *      Author: N.S. Oblath
- */
-
-#include "PrimaryProcessor.hh"
-#include "Processor.hh"
-#include "Signal.hh"
-#include "Slot.hh"
-
-#include "logger.hh"
-
-#include <chrono>
-#include <thread>
-
-LOGGER( testprocclasses_h_log, "TestProcessorClasses" );
-
-namespace Nymph
-{
-    // concrete processor class that we can test
-    // implements Configure() and has its own signal and slot
-    class TestProc : public Processor
-    {
-        public:
-            TestProc( const std::string& name = "test" ) :
-                    Processor( name ),
-                    fValue( 0 ),
-                    fSecondValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestProc::SetValue ),
-                    fSecondValueSig( "second-value", this ),
-                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction, {"second-value"} ),
-                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
-            {}
-
-            virtual ~TestProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                fValue = node.get_value( "value", fValue );
-
-                // we'll test configuration error throwing by having a string with restricted values
-                if( node.has("string") )
-                {
-                    if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
-                    else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
-                    else THROW_EXCEPT_HERE( ConfigException( node ) << "Invalid choice for \"string\"" );
-                }
-
-                return;
-            }
-
-            MEMVAR( int, Value );
-            MEMVAR( int, SecondValue );
-            MEMVAR_REF( std::string, StringValue );
-
-            void SecondValueSlotFunction( int newValue )
-            {
-                fSecondValueSig( newValue );
-            }
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-            MEMVAR_REF( Signal< int >, SecondValueSig );
-            MEMVAR_REF( Slot< int >, SecondValueSlot );
-            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
-
-    };
-
-    // external slot function owner
-    struct TestSlotOwner
-    {
-        int fValue = 0;
-        void TestSlotFunc( int input )
-        {
-            fValue = input;
-            return;
-        }
-    };
-
-
-    // concrete primary processor class that we can test
-    // implements Configure(), Run(), and has its own signal and slot
-    class TestPrimaryProc : public PrimaryProcessor
-    {
-        public:
-            enum class TestType
-            {
-                SignalNewValue,
-                WaitTwoSec,
-                ThrowExcept
-            };
-
-            TestPrimaryProc( const std::string& name = "test" ) :
-                    PrimaryProcessor( name ),
-                    fTestSelection( TestType::ThrowExcept ),
-                    fNewValue( 10 ),
-                    fValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
-            {}
-
-            virtual ~TestPrimaryProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                if( node.has("test") )
-                {
-                    std::string testSelectionStr( node["test"]().as_string() );
-                    if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
-                    else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
-                    else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
-                    else
-                    {
-                        LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
-                        THROW_EXCEPT_HERE( ConfigException() << "Invalid test selection: " << testSelectionStr );
-                    }
-                }
-                return;
-            }
-
-            void Run()
-            {
-                switch( fTestSelection )
-                {
-                    case TestType::SignalNewValue:
-                        TestSignalNewValue();
-                        return;
-                    case TestType::WaitTwoSec:
-                        TestWaitTwoSec();
-                        return;
-                    case TestType::ThrowExcept:
-                        TestThrowExcept();
-                        return;
-                    default:
-                        LERROR( testprocclasses_h_log, "Invalid test choice" );
-                        THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
-                }
-                return;
-            }
-
-            void TestSignalNewValue()
-            {
-                fValueSig( fNewValue );
-                return;
-            }
-
-            void TestWaitTwoSec()
-            {
-                std::this_thread::sleep_for(std::chrono::seconds(2));
-                return;
-            }
-
-            void TestThrowExcept()
-            {
-                THROW_EXCEPT_HERE( Exception() << "PrimaryProcessor test function: throw Exception" );
-                return;
-            }
-
-            MEMVAR( TestType, TestSelection );
-
-            MEMVAR( int, NewValue );
-            MEMVAR( int, Value );
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-    };
-
-}
diff --git a/Testing/cpp/TestProcessorToolbox.cc b/Testing/cpp/TestProcessorToolbox.cc
deleted file mode 100644
index f3a8d2e..0000000
--- a/Testing/cpp/TestProcessorToolbox.cc
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * TestProcessorToolbox.cc
- *
- *  Created on: Nov 25, 2021
- *      Author: N.S. Oblath
- */
-
-#include "TestProcessorClasses.hh"
-
-#include "ProcessorToolbox.hh"
-
-#include "logger.hh"
-#include "param_codec.hh"
-
-#include "catch.hpp"
-
-LOGGER( testlog, "TestProcessorToolbox" );
-
-
-namespace Nymph
-{
-    class ProcTBRevealer : public ProcessorToolbox
-    {
-        public:
-            using ProcessorToolbox::ProcessorToolbox;
-
-            bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
-            {
-                return ProcessorToolbox::ParseSignalSlotName( toParse, nameOfProc, nameOfSigSlot );
-            }
-
-            using ProcessorToolbox::ThreadSource;
-            using ProcessorToolbox::ThreadSourceGroup;
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroup& group )
-            {
-                return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
-            }
-
-            void StartMultiThreadedRun()
-            {
-                return ProcessorToolbox::StartMultiThreadedRun();
-            }
-
-            using ProcessorToolbox::RunQueue;
-            RunQueue& GetRunQueue()
-            {
-                return fRunQueue;
-            }
-    };
-}
-
-
-TEST_CASE( "processor_toolbox" )
-{
-    using namespace Nymph;
-
-    SharedControl::get_instance()->Reset();
-
-    ProcTBRevealer toolbox;
-
-    SECTION( "AddRemoveProcessors" )
-    {
-        LINFO( testlog, "Add/Remove Processor tests" );
-
-        std::string procName1( "testproc-1" );
-        std::string procName2( "testproc-2" );
-
-        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
-        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
-
-        std::string config_str(
-            "processors:\n"
-            "- type: test-proc\n"
-            "  name: testproc-1"
-        );
-
-        scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
-
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
-
-        REQUIRE( toolbox.GetProcessor( procName1 ) );
-        REQUIRE( toolbox.GetProcessor( procName1 )->Name() == procName1 );
-
-        std::shared_ptr< Processor > tp1 = toolbox.ReleaseProcessor( procName1 );
-        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
-
-        REQUIRE( toolbox.AddProcessor( procName1, tp1 ) );
-        REQUIRE( toolbox.GetProcessor( procName1 ) );
-
-        REQUIRE( toolbox.AddProcessor(  "test-proc", procName2 ) );
-        REQUIRE( toolbox.GetProcessor( procName2 ) );
-
-        REQUIRE( toolbox.RemoveProcessor( procName1 ) );
-        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
-        REQUIRE( toolbox.GetProcessor( procName2 ) );
-
-        toolbox.ClearProcessors();
-        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
-    }
-
-    SECTION( "Connections" )
-    {
-        LINFO( testlog, "Connections Tests");
-
-        std::string toParse( "proc:sigslot" );
-        std::string parsedProc, parsedSigSlot;
-
-        toolbox.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
-        REQUIRE( parsedProc == "proc" );
-        REQUIRE( parsedSigSlot == "sigslot" );
-
-        std::string procName1( "testproc-1" );
-        std::string procName2( "testproc-2" );
-
-        std::string config_str(
-            "processors:\n"
-            "- type: test-proc\n"
-            "  name: testproc-1\n"
-            "connections:\n"
-            "- signal: \"testproc-1:value\"\n"
-            "  slot: \"testproc-1:second-value\""
-        );
-
-        scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
-
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
-
-        std::shared_ptr< Processor > tp1 = toolbox.GetProcessor( procName1 );
-
-        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
-        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
-        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
-
-        tp1->Signals().at("value")->DisconnectAll();
-        REQUIRE( tp1->Signals().at("value")->Connections().empty() );
-
-        toolbox.MakeConnection( "testproc-1:value", "testproc-1:second-value" );
-        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
-        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
-        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
-
-        tp1->Signals().at("value")->DisconnectAll();
-        REQUIRE( tp1->Signals().at("value")->Connections().empty() );
-
-        toolbox.MakeConnection( "testproc-1", "value", "testproc-1", "second-value" );
-        REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
-        REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
-        REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
-    }
-
-    SECTION( "RunQueue" )
-    {
-        LINFO( "RunQueue Tests" );
-
-        std::string config_str(
-            "processors:\n"
-            "- type: test-primary\n"
-            "  name: testprimary-1\n"
-            "- type: test-primary\n"
-            "  name: testprimary-2\n"
-            "- type: test-proc\n"
-            "  name: testproc-1\n"
-        );
-
-        scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
-
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
-
-        ProcTBRevealer::ThreadSourceGroup group;
-        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
-        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "testproc-1", group ) );
-        REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary-1", group ) );
-        REQUIRE( group.size() == 1 );
-
-        REQUIRE_FALSE( toolbox.PushBackToRunQueue( "testproc-1" ) );
-        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-1" ) );
-        REQUIRE( toolbox.GetRunQueue().size() == 1 );
-        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
-        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-2" ) );
-        REQUIRE( toolbox.GetRunQueue().size() == 2 );
-        REQUIRE( toolbox.GetRunQueue().begin()[0].size() == 1 );
-        
-        toolbox.PopBackOfRunQueue();
-        REQUIRE( toolbox.GetRunQueue().size() == 1 );
-
-        toolbox.ClearRunQueue();
-        REQUIRE( toolbox.GetRunQueue().empty() );
-        
-        REQUIRE( toolbox.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
-        REQUIRE( toolbox.GetRunQueue().size() == 1 );
-        REQUIRE( toolbox.GetRunQueue()[0].size() == 2 );
-
-    }
-
-    SECTION( "DoRun" )
-    {
-        std::string config_str(
-            "processors:\n"
-            "- type: test-primary\n"
-            "  name: pp\n"
-            "connections:\n"
-            "- signal: \"pp:value\"\n"
-            "  slot: \"pp:value\"\n"
-            "run-queue:\n"
-            "- pp"
-        );
-
-        scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
-
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
-
-        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
-        REQUIRE( ppProc );
-        ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
-
-        // do the run
-        REQUIRE_NOTHROW( toolbox.Run() );
-
-        // check the results
-        REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
-
-    }
-
-}
diff --git a/Testing/cpp/TestSignalSlot.cc b/Testing/cpp/TestSignalSlot.cc
deleted file mode 100644
index dabb39b..0000000
--- a/Testing/cpp/TestSignalSlot.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * TestSigSlot.cc
- *
- *  Created on: Sept 7, 2019
- *      Author: N.S. Oblath
- */
-
-#include "Signal.hh"
-#include "Slot.hh"
-
-#include "catch.hpp"
-
-
-TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
-{
-    using namespace Nymph;
-
-    int testValue = 0;
-
-    Signal< int > signal( "signal" );
-    Slot< int > slot( "slot", [&](int aValue ){ testValue = aValue; } );
-
-    signal.Connect( &slot );
-
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
-
-    signal.Emit( 5 );
-    REQUIRE( testValue == 5 );
-
-    signal( 10 );
-    REQUIRE( testValue == 10 );
-
-    signal.Disconnect( &slot );
-
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
-
-    // connect and disconnect via slot
-    slot.ConnectTo( &signal );
-
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
-
-    slot.Disconnect( &signal );
-
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
-
-    // reconnect for testing SignalBase::DisconnectAll()
-    signal.Connect( &slot );
-
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
-
-    signal.DisconnectAll();
-
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
-
-    // reconnect for testing SlotBaseDisconnectAll()
-    slot.ConnectTo( &signal );
-
-    REQUIRE( signal.Connections().size() == 1 );
-    REQUIRE( slot.Connections().size() == 1 );
-
-    slot.DisconnectAll();
-
-    REQUIRE( signal.Connections().size() == 0 );
-    REQUIRE( slot.Connections().size() == 0 );
-
-}
diff --git a/Testing/cpp/UseCatch.cc b/Testing/cpp/UseCatch.cc
deleted file mode 100644
index 4cb169c..0000000
--- a/Testing/cpp/UseCatch.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * use_catch.cc
- *
- *  Created on: Aug 14, 2018
- *      Author: N.S. Oblath
- */
-
-// Tells Catch to provide a main()
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"

From bfd15c74fa56df43fe74ea2f9f0e68137c1ac745 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 14:23:19 -0800
Subject: [PATCH 281/521] Implemented TestControlAccess

---
 Testing/CMakeLists.txt       |  2 +-
 Testing/TestControlAccess.cc | 91 ++++++++++++++++++++++++------------
 Testing/TestController.cc    |  2 -
 3 files changed, 63 insertions(+), 32 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index b60f8e2..aaf4e0b 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -13,7 +13,7 @@ set( testing_HEADERS
 )
 
 set( testing_SOURCES
-#    TestControlAccess.cc
+    TestControlAccess.cc
     TestController.cc
     TestData.cc
     TestDataFrame.cc
diff --git a/Testing/TestControlAccess.cc b/Testing/TestControlAccess.cc
index 3ba2dd5..c97a79c 100644
--- a/Testing/TestControlAccess.cc
+++ b/Testing/TestControlAccess.cc
@@ -8,59 +8,92 @@
 
 #include "ControlAccess.hh"
 
-#include <thread>
-
 #include "catch.hpp"
 
-/*
-TEST_CASE( "control_access", "[control_access]" )
+#include <thread>
+
+TEST_CASE( "control_access", "[control]" )
 {
     using namespace Nymph;
 
-    ControlAccess control;
+    ControlAccess* access = ControlAccess::get_instance();
 
-    SECTION( "One Return" )
+    SECTION( "no_controller" )
     {
-        int intReturn = 5;
-
-        REQUIRE_THROWS( control.GetReturn< int >() );
+        REQUIRE_FALSE( access->GetControl() );
+        REQUIRE_THROWS_AS( access->WaitToContinue(), Exception );
+        REQUIRE_THROWS_AS( access->WaitForBreakOrCanceled(), Exception );
+        REQUIRE_THROWS_AS( access->WaitForEndOfRun(), Exception );
+        REQUIRE_THROWS_AS( access->Continue(), Exception );
+        REQUIRE_THROWS_AS( access->Cancel(), Exception );
+        REQUIRE_THROWS_AS( access->IsCanceled(), Exception );
+        REQUIRE_THROWS_AS( access->Break(), Exception );
+        REQUIRE_THROWS_AS( access->IsAtBreak(), Exception );
+        REQUIRE_THROWS_AS( access->ChainIsQuitting( "blah" ), Exception );
+    }
 
-        control.SetReturn< int >( intReturn );
+    Controller control;
 
-        REQUIRE( std::get< 0 >(control.GetReturn< int >()) == intReturn );
-        REQUIRE_THROWS( control.GetReturn< unsigned >() );
+    SECTION( "Basics" )
+    {
+        REQUIRE_FALSE( access->IsCanceled() );
+        access->Cancel( 5 );
+        REQUIRE( access->IsCanceled() );
     }
 
-    SECTION( "Two Returns" )
+    SECTION( "WaitToContinue" )
     {
-        int return1 = 5;
-        double return2 = 10.;
-
-        control.SetReturn< int, double >( return1, return2 );
+        REQUIRE( access->WaitToContinue() );
+    }
 
-        REQUIRE( std::get< 0 >(control.GetReturn< int, double >()) == return1 );
-        REQUIRE( std::get< 1 >(control.GetReturn< int, double >()) == return2 );
+    SECTION( "WaitForBreakOrCanceled" )
+    {
+        access->Break();
+        REQUIRE( access->WaitForBreakOrCanceled() == true );
     }
-*/
 
-    SECTION( "Break" )
+    SECTION( "BreakContinue" )
     {
-        SharedControl* shared = SharedControl::create_instance();
+        REQUIRE_FALSE( access->IsCanceled() );
 
+        // This thread will do the breaking and continuing
         std::thread thread( [&](){ 
-            shared->Break();
+            std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
+
+            access->Break(); // step 1
+
+            std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
+
+            access->Continue(); // step 2
+
+            std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
+
+            access->Cancel( 0 ); // step 3
         } );
         
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE( shared->GetBreakFlag() );
+        // Waiting for break (step 1)
+        REQUIRE( access->WaitForBreakOrCanceled() );
+        REQUIRE_FALSE( access->IsCanceled() );
+
+        // Waiting for continue (step 2)
+        access->WaitToContinue();
+        REQUIRE_FALSE( access->IsCanceled() );
 
-        shared->Resume();
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-        REQUIRE_FALSE( shared->GetBreakFlag() );
+        // Waiting for cancelation (step 3)
+        REQUIRE_FALSE( access->WaitForBreakOrCanceled() );
+        REQUIRE( access->IsCanceled() );
 
         thread.join();
 
-        REQUIRE_FALSE( shared->GetBreakFlag() );
     }
 
+    SECTION( "ChainIsQuitting" )
+    {
+        // As if an error is thrown
+        std::exception_ptr exceptPtr = std::make_exception_ptr( Exception() << "Test: ChainIsQuitting, throwing Exception" );
+        REQUIRE_NOTHROW( access->ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/Testing/TestController.cc b/Testing/TestController.cc
index 9888c32..0b31ac2 100644
--- a/Testing/TestController.cc
+++ b/Testing/TestController.cc
@@ -90,8 +90,6 @@ TEST_CASE( "controller", "[control]" )
         control.SetBreakFlag( true );
         control.SetCanceled( true );
         REQUIRE_FALSE( control.WaitToContinue() );    
-
-        // TODO: test with fBreakFlag==true && cancelled==false requires a thread
     }
 
     SECTION( "WaitForBreakOrCanceled" )

From dc98bb1bd689d6f0e48dcf06c82bc9d9b997dc13 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 16:09:13 -0800
Subject: [PATCH 282/521] Test files that were moved to the wrong location

---
 Testing/{ => Cpp}/TestController.cc          | 0
 Testing/{ => Cpp}/TestControllerClasses.hh   | 0
 Testing/{ => Cpp}/TestSingleRunController.cc | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename Testing/{ => Cpp}/TestController.cc (100%)
 rename Testing/{ => Cpp}/TestControllerClasses.hh (100%)
 rename Testing/{ => Cpp}/TestSingleRunController.cc (100%)

diff --git a/Testing/TestController.cc b/Testing/Cpp/TestController.cc
similarity index 100%
rename from Testing/TestController.cc
rename to Testing/Cpp/TestController.cc
diff --git a/Testing/TestControllerClasses.hh b/Testing/Cpp/TestControllerClasses.hh
similarity index 100%
rename from Testing/TestControllerClasses.hh
rename to Testing/Cpp/TestControllerClasses.hh
diff --git a/Testing/TestSingleRunController.cc b/Testing/Cpp/TestSingleRunController.cc
similarity index 100%
rename from Testing/TestSingleRunController.cc
rename to Testing/Cpp/TestSingleRunController.cc

From 6e3b92ab8ee9b1da830e7b583804262836ee79a8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 16:57:11 -0800
Subject: [PATCH 283/521] Moving misplaced files

---
 Testing/{ => Cpp}/TestDataProcessorClasses.hh | 0
 Testing/{ => Cpp}/TestSlotData.cc             | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename Testing/{ => Cpp}/TestDataProcessorClasses.hh (100%)
 rename Testing/{ => Cpp}/TestSlotData.cc (100%)

diff --git a/Testing/TestDataProcessorClasses.hh b/Testing/Cpp/TestDataProcessorClasses.hh
similarity index 100%
rename from Testing/TestDataProcessorClasses.hh
rename to Testing/Cpp/TestDataProcessorClasses.hh
diff --git a/Testing/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
similarity index 100%
rename from Testing/TestSlotData.cc
rename to Testing/Cpp/TestSlotData.cc

From ba2a2181e8f5f8220cbc4a12cbddb4de20e17100 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 16:58:15 -0800
Subject: [PATCH 284/521] Moving a misplaced file

---
 Testing/{ => Cpp}/TestReturnBuffer.cc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Testing/{ => Cpp}/TestReturnBuffer.cc (100%)

diff --git a/Testing/TestReturnBuffer.cc b/Testing/Cpp/TestReturnBuffer.cc
similarity index 100%
rename from Testing/TestReturnBuffer.cc
rename to Testing/Cpp/TestReturnBuffer.cc

From c10223e984a6dd178f4b6f9494693fc7b5f5eec4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 1 Feb 2022 16:59:35 -0800
Subject: [PATCH 285/521] Moving a misplaced file

---
 Testing/{ => Cpp}/TestRunNymph.cc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Testing/{ => Cpp}/TestRunNymph.cc (100%)

diff --git a/Testing/TestRunNymph.cc b/Testing/Cpp/TestRunNymph.cc
similarity index 100%
rename from Testing/TestRunNymph.cc
rename to Testing/Cpp/TestRunNymph.cc

From 8d4055bfce672e17656021ac4d71c22b15fbe7e2 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 7 Feb 2022 07:35:29 -0500
Subject: [PATCH 286/521] Created the basic files required for python packaging

---
 Python/CMakeLists.txt |  27 +++++++++++
 pyproject.toml        |   9 ++++
 setup.cfg             |  23 ++++++++++
 setup.py              | 103 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 162 insertions(+)
 create mode 100644 Python/CMakeLists.txt
 create mode 100644 pyproject.toml
 create mode 100644 setup.cfg
 create mode 100644 setup.py

diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt
new file mode 100644
index 0000000..49b68c6
--- /dev/null
+++ b/Python/CMakeLists.txt
@@ -0,0 +1,27 @@
+# CMakeLists.txt file for Nymph/Python
+# Author: A. Ziegler
+# Created on: Feb 4, 2022
+
+if( Nymph_ENABLE_PYTHON)
+    message( "Building Python bindings")
+
+    set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+    # Python binding headers
+    set( PYBINDING_HEADERFILES
+
+    )
+
+    # Python bindings
+    set( PYBINDING_SOURCEFILES
+
+    )
+
+    set( PROJECT_LIBRARIES Scarab )
+
+    pbuilder_add_pybind11_module( scarab ${PROJECT_LIBRARIES} )
+
+    pbuilder_install_headers( ${PYBINDING_HEADERFILES} )z
+
+    message( "Done with Python bindings" )
+endif (Nymph_ENABLE_PYTHON)
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..1542d03
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,9 @@
+[build-system]
+requires = [
+    "setuptools>=42", 
+    "wheel",
+    "cmake>=3.12",
+    "pybind11>=2.3.0",
+
+]
+build-backend = "setuptools.build_meta"
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..20aaaaf
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,23 @@
+[metadata]
+name = nymph
+version = 2.0.0
+author = Project 8
+
+description = A C++/python based data analysis framework.
+long_description = file: README.md 
+url = https://github.com/project8/nymph
+classsifiers = 
+    License :: Other/Proprietary License
+    Operating System :: MacOS
+    Operating System :: Unix
+    Programming Language :: C++
+    Programming Language :: Python
+
+[options]
+package_dir =
+    = Python
+packages = find:
+python_requiires = >= 3.6
+
+[options.packages.find]
+where = Python
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..1f82fe1
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,103 @@
+import os
+import re
+import sys
+import platform
+import subprocess
+
+from setuptools import setup, find_packages, Extension
+from setuptools.command.build_ext import build_ext
+from distutils.version import LooseVersion
+
+
+class CMakeExtension(Extension):
+    def __init__(self, name, sourcedir=''):
+        Extension.__init__(self, name, sources=[])
+        self.sourcedir = os.path.abspath(sourcedir)
+
+
+class CMakeBuild(build_ext):
+    def run(self):
+        try:
+            out = subprocess.check_output(['cmake', '--version'])
+        except OSError:
+            raise RuntimeError("CMake must be installed to build the following extensions: " +
+                               ", ".join(e.name for e in self.extensions))
+
+        if platform.system() == "Windows":
+            cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+            if cmake_version < '3.1.0':
+                raise RuntimeError("CMake >= 3.1.0 is required on Windows")
+
+        for ext in self.extensions:
+            self.build_extension(ext)
+
+    def build_extension(self, ext):
+        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+                      '-DPYTHON_EXECUTABLE=' + sys.executable,
+                      '-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
+                      '-DNymph_ENABLE_PYTHON:bool=1',
+                     ]
+
+        cfg = 'Debug' if self.debug else 'Release'
+        #cfg = 'DEBUG'
+        build_args = ['--config', cfg]
+
+        else:
+            cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
+            build_args += ['--', '-j2', 'VERBOSE=1']
+
+        env = os.environ.copy()
+        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
+                                                              self.distribution.get_version())
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        # We need to remove the cache file because pip makes new /tmp source directories each time
+        print('remove cache')
+        subprocess.check_call(['rm', '-f', 'CMakeCache.txt'], cwd=self.build_temp, env=env)
+        print("should make a cmake call:")
+        print(' '.join(['cmake', ext.sourcedir] + cmake_args), 'cwd={}'.format(self.build_temp), 'env={}'.format(env))
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
+        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
+        print("should make a build call:")
+        print(['cmake', '--build', '.'] + build_args, 'cwd={}'.format(self.build_temp))
+        #subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
+        subprocess.check_call(['make', 'install', 'VERBOSE=1'], cwd=self.build_temp)
+
+'''
+requirements = [
+    'PyYAML',
+    'asteval',
+    'setuptools_scm',
+    #these two for postgreSQL, move to plugin?
+    'sqlalchemy',
+    'psycopg2',
+    'colorlog', #we could make this optional if we wnat to minimize dependencies
+]
+
+packages = ["dripline"] + ["dripline."+i_package for i_package in find_packages("dripline")]
+print('packages are: {}'.format(packages))
+
+setup(
+    name='dripline',
+    use_scm_version={
+        "root": ".",
+        "write_to": "./dripline/version.py",
+        'version_scheme': lambda x: "v{}".format(x.tag),
+        'local_scheme': lambda x: '',
+    },
+    #version='4.0.0-beta',
+    author='us',
+    author_email='driplineorg@email.tld',
+    description='a description would be good',
+    long_description='',
+    setup_requires=["pytest-runner"],
+    tests_require=["pytest"],
+    ext_modules=[CMakeExtension('dripline_python')],
+    cmdclass=dict(build_ext=CMakeBuild),
+    zip_safe=False,
+    install_requires=requirements,
+    packages=packages,
+    scripts=["bin/dl-serve"]
+)
+'''
\ No newline at end of file

From 06234e61ffaf5387df838461133a49470b4f44ae Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 7 Feb 2022 10:24:57 -0800
Subject: [PATCH 287/521] Break signal-slot tests into nested sections to avoid
 deadlocking and make sure tests happen in a fresh state

---
 Testing/Cpp/TestSignalSlot.cc | 121 +++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 54 deletions(-)

diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index b795d9e..621e6d7 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -33,66 +33,79 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
         // this section tests all of the paths in Signal::operator()()
         // nothing is listening to the signal, and instead we verify whether exceptions are thrown
 
-        // test successful throw, no unusual circumstances
-        REQUIRE_NOTHROW( signal.Emit( 1 ) );
-
-        // test successful throw after breakpoint not set by the signal
-        auto asyncReturn = std::async( std::launch::async, [&controller](){
-            controller.WaitForBreakOrCanceled();
-            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-            controller.Continue();
-        } );
-        controller.Break();
-        REQUIRE_NOTHROW( signal.Emit( 2 ) );
-
-        // test successful throw after breakpoint set by the signal
-        signal.SetDoBreakpoint( true );
-        asyncReturn = std::async( std::launch::async, [&controller](){
-            controller.WaitForBreakOrCanceled();
-            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-            controller.Continue();
-        } );
-        REQUIRE_NOTHROW( signal.Emit( 3 ) );
-        signal.SetDoBreakpoint( false );
-
-        // test behavior for canceled controller
-        controller.Cancel();
-        REQUIRE_THROWS_AS( signal.Emit( 1 ), QuitChain );
-        controller.reset_cancel();
-
-        // test behavior for controller canceled during break
-        asyncReturn = std::async( std::launch::async, [&controller](){
-            controller.WaitForBreakOrCanceled();
-            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+        SECTION( "basic emit and after break" )
+        {
+            // test successful throw, no unusual circumstances
+            REQUIRE_NOTHROW( signal.Emit( 1 ) );
+
+            // test successful throw after breakpoint not set by the signal
+            auto asyncReturn = std::async( std::launch::async, [&controller](){
+                controller.WaitForBreakOrCanceled();
+                std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+                controller.Continue();
+            } );
+            controller.Break();
+            REQUIRE_NOTHROW( signal.Emit( 2 ) );
+        }
+
+        SECTION( "throw after break by signal" )
+        {
+            // test successful throw after breakpoint set by the signal
+            signal.SetDoBreakpoint( true );
+            auto asyncReturn = std::async( std::launch::async, [&controller](){
+                controller.WaitForBreakOrCanceled();
+                std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+                controller.Continue();
+            } );
+            REQUIRE_NOTHROW( signal.Emit( 3 ) );
+        }
+
+        SECTION( "canceled controller" )
+        {
+            // test behavior for canceled controller
             controller.Cancel();
-        } );
-        controller.Break();
-        REQUIRE_THROWS_AS( signal.Emit( 2 ), QuitChain );
-        controller.reset_cancel();
-
-        // test behavior for signal starting the break, and controller is canceled during the break
-        signal.SetDoBreakpoint( true );
-        asyncReturn = std::async( std::launch::async, [&controller](){
-            controller.WaitForBreakOrCanceled();
-            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-            controller.Cancel();
-        } );
-        REQUIRE_THROWS_AS( signal.Emit( 3 ), QuitChain );
-        controller.reset_cancel();
-
-        // test return from break
-        std::cerr << "#### TestSignalSlot starting return test" << std::endl;
-        asyncReturn = std::async( std::launch::async, [&controller](){
-            controller.WaitForBreakOrCanceled();
+            REQUIRE_THROWS_AS( signal.Emit( 1 ), QuitChain );
+        }
+
+        SECTION( "cancel during break" )
+        {
+            // test behavior for controller canceled during break
+            auto asyncReturn = std::async( std::launch::async, [&controller](){
+                controller.WaitForBreakOrCanceled();
+                std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+                controller.Cancel();
+            } );
+            controller.Break();
+            REQUIRE_THROWS_AS( signal.Emit( 2 ), QuitChain );
+        }
+
+        SECTION( "cancel during break" )
+        {
+            // test behavior for signal starting the break, and controller is canceled during the break
+            signal.SetDoBreakpoint( true );
+            auto asyncReturn = std::async( std::launch::async, [&controller](){
+                controller.WaitForBreakOrCanceled();
+                std::this_thread::sleep_for( std::chrono::milliseconds(200) );
+                controller.Cancel();
+            } );
+            REQUIRE_THROWS_AS( signal.Emit( 3 ), QuitChain );
+        }
+
+        SECTION( "return from break" )
+        {
+            // test return from break
+            signal.SetDoBreakpoint( true );
+            auto asyncReturn = std::async( std::launch::async, [&signal, &controller](){
+                signal.Emit( 4 ); // cannot test this with REQUIRE() because tests can currently only be done in one thread
+                controller.WaitForEndOfRun();
+            } );
+            REQUIRE( controller.WaitForBreakOrCanceled() );
             REQUIRE( controller.HasReturn() );
             auto theReturn = controller.GetReturn< int >();
             REQUIRE( std::get<0>( theReturn ) == 4 );
             std::this_thread::sleep_for( std::chrono::milliseconds(200) );
             controller.Cancel();
-        } );
-        REQUIRE_NOTHROW( signal.Emit( 4 ) );
-        controller.WaitForEndOfRun();
-
+        }
     }
 
     SECTION( "connections" )

From 5db0533d27541e641aa4ce6c8d6021a4694e55f0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 7 Feb 2022 10:25:09 -0800
Subject: [PATCH 288/521] Cleanup debug printing

---
 Cpp/Library/Control/ControlAccess.hh | 1 -
 Cpp/Library/Control/Controller.hh    | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/Cpp/Library/Control/ControlAccess.hh b/Cpp/Library/Control/ControlAccess.hh
index e93db61..0d09516 100644
--- a/Cpp/Library/Control/ControlAccess.hh
+++ b/Cpp/Library/Control/ControlAccess.hh
@@ -67,7 +67,6 @@ namespace Nymph
     template< class... XArgs >
     void ControlAccess::BreakAndReturn( XArgs&... args )
     {
-        std::cerr << "#### ControlAccess::BreakAndReturn()" << std::endl;
         if( fControl ) fControl->BreakAndReturn( args... );
         else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
         return;
diff --git a/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
index 60cec8b..fd70084 100644
--- a/Cpp/Library/Control/Controller.hh
+++ b/Cpp/Library/Control/Controller.hh
@@ -108,11 +108,8 @@ namespace Nymph
     template< typename... XArgs >
     void Controller::BreakAndReturn( XArgs&... args )
     {
-        std::cerr << "#### Controller::BreakAndReturn()" << std::endl;
         this->Break();
-        std::cerr << "#### Controller::BreakAndReturn() break initiated" << std::endl;
         fReturnBuffer.reset( new ReturnBuffer( args... ) );
-        std::cerr << "#### Controller::BreakAndReturn() return set" << std::endl;
         return;
     }
 

From 2db7772e6422a03ae8ec36cbb5a5a248fe4075d4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 7 Feb 2022 13:26:52 -0800
Subject: [PATCH 289/521] Updated Catch in Scarab to v2.13.8

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 89d2073..a20a6db 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 89d20734cee198b6e7d4258db030b4250e7a85d7
+Subproject commit a20a6dbe4cdd1ef489515a21f7987cc6867a753c

From 8c1c83450b369ce693f126f1d7f9dc18f58b8c99 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 7 Feb 2022 13:31:00 -0800
Subject: [PATCH 290/521] Removing local copy of Nymph

---
 Testing/Cpp/Catch/catch.hpp | 17966 ----------------------------------
 1 file changed, 17966 deletions(-)
 delete mode 100644 Testing/Cpp/Catch/catch.hpp

diff --git a/Testing/Cpp/Catch/catch.hpp b/Testing/Cpp/Catch/catch.hpp
deleted file mode 100644
index db1fed3..0000000
--- a/Testing/Cpp/Catch/catch.hpp
+++ /dev/null
@@ -1,17966 +0,0 @@
-/*
- *  Catch v2.13.8
- *  Generated: 2022-01-03 21:20:09.589503
- *  ----------------------------------------------------------
- *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-// start catch.hpp
-
-
-#define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 8
-
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-// start catch_suppress_warnings.h
-
-#ifdef __clang__
-#   ifdef __ICC // icpc defines the __clang__ macro
-#       pragma warning(push)
-#       pragma warning(disable: 161 1682)
-#   else // __ICC
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wpadded"
-#       pragma clang diagnostic ignored "-Wswitch-enum"
-#       pragma clang diagnostic ignored "-Wcovered-switch-default"
-#    endif
-#elif defined __GNUC__
-     // Because REQUIREs trigger GCC's -Wparentheses, and because still
-     // supported version of g++ have only buggy support for _Pragmas,
-     // Wparentheses have to be suppressed globally.
-#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
-
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-variable"
-#    pragma GCC diagnostic ignored "-Wpadded"
-#endif
-// end catch_suppress_warnings.h
-#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
-#  define CATCH_IMPL
-#  define CATCH_CONFIG_ALL_PARTS
-#endif
-
-// In the impl file, we want to have access to all parts of the headers
-// Can also be used to sanely support PCHs
-#if defined(CATCH_CONFIG_ALL_PARTS)
-#  define CATCH_CONFIG_EXTERNAL_INTERFACES
-#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#    undef CATCH_CONFIG_DISABLE_MATCHERS
-#  endif
-#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  endif
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-// start catch_platform.h
-
-// See e.g.:
-// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h.auto.html
-#ifdef __APPLE__
-#  include <TargetConditionals.h>
-#  if (defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1) || \
-      (defined(TARGET_OS_MAC) && TARGET_OS_MAC == 1)
-#    define CATCH_PLATFORM_MAC
-#  elif (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE == 1)
-#    define CATCH_PLATFORM_IPHONE
-#  endif
-
-#elif defined(linux) || defined(__linux) || defined(__linux__)
-#  define CATCH_PLATFORM_LINUX
-
-#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
-#  define CATCH_PLATFORM_WINDOWS
-#endif
-
-// end catch_platform.h
-
-#ifdef CATCH_IMPL
-#  ifndef CLARA_CONFIG_MAIN
-#    define CLARA_CONFIG_MAIN_NOT_DEFINED
-#    define CLARA_CONFIG_MAIN
-#  endif
-#endif
-
-// start catch_user_interfaces.h
-
-namespace Catch {
-    unsigned int rngSeed();
-}
-
-// end catch_user_interfaces.h
-// start catch_tag_alias_autoregistrar.h
-
-// start catch_common.h
-
-// start catch_compiler_capabilities.h
-
-// Detect a number of compiler features - by compiler
-// The following features are defined:
-//
-// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
-// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
-// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
-// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
-// ****************
-// Note to maintainers: if new toggles are added please document them
-// in configuration.md, too
-// ****************
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-#ifdef __cplusplus
-
-#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
-#    define CATCH_CPP14_OR_GREATER
-#  endif
-
-#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#    define CATCH_CPP17_OR_GREATER
-#  endif
-
-#endif
-
-// Only GCC compiler should be used in this block, so other compilers trying to
-// mask themselves as GCC should be ignored.
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC) && !defined(__CUDACC__) && !defined(__LCC__)
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
-
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
-
-#endif
-
-#if defined(__clang__)
-
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
-
-// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
-// which results in calls to destructors being emitted for each temporary,
-// without a matching initialization. In practice, this can result in something
-// like `std::string::~string` being called on an uninitialized value.
-//
-// For example, this code will likely segfault under IBM XL:
-// ```
-// REQUIRE(std::string("12") + "34" == "1234")
-// ```
-//
-// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
-#  if !defined(__ibmxl__) && !defined(__CUDACC__)
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
-#  endif
-
-#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
-         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
-
-#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// Assume that non-Windows platforms support posix signals by default
-#if !defined(CATCH_PLATFORM_WINDOWS)
-    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// We know some environments not to support full POSIX signals
-#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
-    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#endif
-
-#ifdef __OS400__
-#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#       define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Android somehow still does not support std::to_string
-#if defined(__ANDROID__)
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Not all Windows environments support SEH properly
-#if defined(__MINGW32__)
-#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// PS4
-#if defined(__ORBIS__)
-#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
-
-// Required for some versions of Cygwin to declare gettimeofday
-// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
-#   define _BSD_SOURCE
-// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
-// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
-# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
-
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-
-# endif
-#endif // __CYGWIN__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#if defined(_MSC_VER)
-
-// Universal Windows platform does not support SEH
-// Or console colours (or console at all...)
-#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#    define CATCH_CONFIG_COLOUR_NONE
-#  else
-#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
-#  endif
-
-#  if !defined(__clang__) // Handle Clang masquerading for msvc
-
-// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
-// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
-// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
-#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
-#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#    endif // MSVC_TRADITIONAL
-
-// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
-#  endif // __clang__
-
-#endif // _MSC_VER
-
-#if defined(_REENTRANT) || defined(_MSC_VER)
-// Enable async processing, as -pthread is specified or no additional linking is required
-# define CATCH_INTERNAL_CONFIG_USE_ASYNC
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-// Check if we are compiled with -fno-exceptions or equivalent
-#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
-#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// DJGPP
-#ifdef __DJGPP__
-#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
-#endif // __DJGPP__
-
-////////////////////////////////////////////////////////////////////////////////
-// Embarcadero C++Build
-#if defined(__BORLANDC__)
-    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Use of __COUNTER__ is suppressed during code analysis in
-// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
-// handled by it.
-// Otherwise all supported compilers support COUNTER macro,
-// but user still might want to turn it off
-#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
-    #define CATCH_INTERNAL_CONFIG_COUNTER
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// RTX is a special version of Windows that is real time.
-// This means that it is detected as Windows, but does not provide
-// the same set of capabilities as real Windows does.
-#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
-    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
-    #define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
-#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Various stdlib support checks that require __has_include
-#if defined(__has_include)
-  // Check if string_view is available and usable
-  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
-  #endif
-
-  // Check if optional is available and usable
-  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
-  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if byte is available and usable
-  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-  #    include <cstddef>
-  #    if defined(__cpp_lib_byte) && (__cpp_lib_byte > 0)
-  #      define CATCH_INTERNAL_CONFIG_CPP17_BYTE
-  #    endif
-  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if variant is available and usable
-  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-  #    if defined(__clang__) && (__clang_major__ < 8)
-         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
-         // fix should be in clang 8, workaround in libstdc++ 8.2
-  #      include <ciso646>
-  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #        define CATCH_CONFIG_NO_CPP17_VARIANT
-  #      else
-  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #    else
-  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #    endif // defined(__clang__) && (__clang_major__ < 8)
-  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-#endif // defined(__has_include)
-
-#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
-#   define CATCH_CONFIG_COUNTER
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
-#   define CATCH_CONFIG_WINDOWS_SEH
-#endif
-// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
-#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
-#   define CATCH_CONFIG_POSIX_SIGNALS
-#endif
-// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
-#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
-#   define CATCH_CONFIG_WCHAR
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
-#    define CATCH_CONFIG_CPP11_TO_STRING
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#  define CATCH_CONFIG_CPP17_OPTIONAL
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
-#  define CATCH_CONFIG_CPP17_STRING_VIEW
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
-#  define CATCH_CONFIG_CPP17_VARIANT
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
-#  define CATCH_CONFIG_CPP17_BYTE
-#endif
-
-#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
-#  define CATCH_CONFIG_NEW_CAPTURE
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-#  define CATCH_CONFIG_POLYFILL_ISNAN
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
-#  define CATCH_CONFIG_USE_ASYNC
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#  define CATCH_CONFIG_ANDROID_LOGWRITE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Even if we do not think the compiler has that warning, we still have
-// to provide a macro that can be used by the code.
-#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
-#endif
-
-// The goal of this macro is to avoid evaluation of the arguments, but
-// still have the compiler warn on problems inside...
-#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
-#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
-#endif
-
-#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#elif defined(__clang__) && (__clang_major__ < 5)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#define CATCH_TRY if ((true))
-#define CATCH_CATCH_ALL if ((false))
-#define CATCH_CATCH_ANON(type) if ((false))
-#else
-#define CATCH_TRY try
-#define CATCH_CATCH_ALL catch (...)
-#define CATCH_CATCH_ANON(type) catch (type)
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
-#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#endif
-
-// end catch_compiler_capabilities.h
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
-
-#include <iosfwd>
-#include <string>
-#include <cstdint>
-
-// We need a dummy global operator<< so we can bring it into Catch namespace later
-struct Catch_global_namespace_dummy {};
-std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
-
-namespace Catch {
-
-    struct CaseSensitive { enum Choice {
-        Yes,
-        No
-    }; };
-
-    class NonCopyable {
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-
-    protected:
-        NonCopyable();
-        virtual ~NonCopyable();
-    };
-
-    struct SourceLineInfo {
-
-        SourceLineInfo() = delete;
-        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
-        :   file( _file ),
-            line( _line )
-        {}
-
-        SourceLineInfo( SourceLineInfo const& other )            = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
-        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
-        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
-
-        bool empty() const noexcept { return file[0] == '\0'; }
-        bool operator == ( SourceLineInfo const& other ) const noexcept;
-        bool operator < ( SourceLineInfo const& other ) const noexcept;
-
-        char const* file;
-        std::size_t line;
-    };
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-
-    // Bring in operator<< from global namespace into Catch namespace
-    // This is necessary because the overload of operator<< above makes
-    // lookup stop at namespace Catch
-    using ::operator<<;
-
-    // Use this in variadic streaming macros to allow
-    //    >> +StreamEndStop
-    // as well as
-    //    >> stuff +StreamEndStop
-    struct StreamEndStop {
-        std::string operator+() const;
-    };
-    template<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-
-// end catch_common.h
-namespace Catch {
-
-    struct RegistrarForTagAliases {
-        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-    };
-
-} // end namespace Catch
-
-#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_tag_alias_autoregistrar.h
-// start catch_test_registry.h
-
-// start catch_interfaces_testcase.h
-
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestInvoker {
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-// end catch_interfaces_testcase.h
-// start catch_stringref.h
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-namespace Catch {
-
-    /// A non-owning string class (similar to the forthcoming std::string_view)
-    /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated.
-    class StringRef {
-    public:
-        using size_type = std::size_t;
-        using const_iterator = const char*;
-
-    private:
-        static constexpr char const* const s_empty = "";
-
-        char const* m_start = s_empty;
-        size_type m_size = 0;
-
-    public: // construction
-        constexpr StringRef() noexcept = default;
-
-        StringRef( char const* rawChars ) noexcept;
-
-        constexpr StringRef( char const* rawChars, size_type size ) noexcept
-        :   m_start( rawChars ),
-            m_size( size )
-        {}
-
-        StringRef( std::string const& stdString ) noexcept
-        :   m_start( stdString.c_str() ),
-            m_size( stdString.size() )
-        {}
-
-        explicit operator std::string() const {
-            return std::string(m_start, m_size);
-        }
-
-    public: // operators
-        auto operator == ( StringRef const& other ) const noexcept -> bool;
-        auto operator != (StringRef const& other) const noexcept -> bool {
-            return !(*this == other);
-        }
-
-        auto operator[] ( size_type index ) const noexcept -> char {
-            assert(index < m_size);
-            return m_start[index];
-        }
-
-    public: // named queries
-        constexpr auto empty() const noexcept -> bool {
-            return m_size == 0;
-        }
-        constexpr auto size() const noexcept -> size_type {
-            return m_size;
-        }
-
-        // Returns the current start pointer. If the StringRef is not
-        // null-terminated, throws std::domain_exception
-        auto c_str() const -> char const*;
-
-    public: // substrings and searches
-        // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, size()).
-        // If start > size(), then the substring is empty.
-        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
-
-        // Returns the current start pointer. May not be null-terminated.
-        auto data() const noexcept -> char const*;
-
-        constexpr auto isNullTerminated() const noexcept -> bool {
-            return m_start[m_size] == '\0';
-        }
-
-    public: // iterators
-        constexpr const_iterator begin() const { return m_start; }
-        constexpr const_iterator end() const { return m_start + m_size; }
-    };
-
-    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
-    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
-
-    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
-        return StringRef( rawChars, size );
-    }
-} // namespace Catch
-
-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
-    return Catch::StringRef( rawChars, size );
-}
-
-// end catch_stringref.h
-// start catch_preprocessor.hpp
-
-
-#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
-#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
-
-#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
-// MSVC needs more evaluations
-#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
-#else
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
-#endif
-
-#define CATCH_REC_END(...)
-#define CATCH_REC_OUT
-
-#define CATCH_EMPTY()
-#define CATCH_DEFER(id) id CATCH_EMPTY()
-
-#define CATCH_REC_GET_END2() 0, CATCH_REC_END
-#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
-#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
-#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
-#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
-#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
-
-#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-
-#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-
-// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
-// and passes userdata as the first parameter to each invocation,
-// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
-#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
-#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
-#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
-#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
-#else
-// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
-#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
-#endif
-
-#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
-#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
-
-#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
-#else
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
-#endif
-
-#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
-    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
-
-#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
-#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
-#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
-#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
-#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
-#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
-#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
-#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
-#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
-#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
-#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
-
-#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
-
-#define INTERNAL_CATCH_TYPE_GEN\
-    template<typename...> struct TypeList {};\
-    template<typename...Ts>\
-    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
-    template<template<typename...> class...> struct TemplateTypeList{};\
-    template<template<typename...> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
-    template<typename...>\
-    struct append;\
-    template<typename...>\
-    struct rewrap;\
-    template<template<typename...> class, typename...>\
-    struct create;\
-    template<template<typename...> class, typename>\
-    struct convert;\
-    \
-    template<typename T> \
-    struct append<T> { using type = T; };\
-    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
-    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
-    template< template<typename...> class L1, typename...E1, typename...Rest>\
-    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
-    \
-    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
-    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
-    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
-    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
-    \
-    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
-    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
-    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
-    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
-
-#define INTERNAL_CATCH_NTTP_1(signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
-    \
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
-    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
-    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
-    template<typename TestType> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
-    template<typename TestType> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_NTTP_0
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
-#else
-#define INTERNAL_CATCH_NTTP_0(signature)
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
-#endif
-
-// end catch_preprocessor.hpp
-// start catch_meta.hpp
-
-
-#include <type_traits>
-
-namespace Catch {
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template <typename> struct true_given : std::true_type {};
-    struct is_callable_tester {
-        template <typename Fun, typename... Args>
-        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
-        template <typename...>
-        std::false_type static test(...);
-    };
-
-    template <typename T>
-    struct is_callable;
-
-    template <typename Fun, typename... Args>
-    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
-
-#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
-    // replaced with std::invoke_result here.
-    template <typename Func, typename... U>
-    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
-#else
-    // Keep ::type here because we still support C++11
-    template <typename Func, typename... U>
-    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
-#endif
-
-} // namespace Catch
-
-namespace mpl_{
-    struct na;
-}
-
-// end catch_meta.hpp
-namespace Catch {
-
-template<typename C>
-class TestInvokerAsMethod : public ITestInvoker {
-    void (C::*m_testAsMethod)();
-public:
-    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
-
-    void invoke() const override {
-        C obj;
-        (obj.*m_testAsMethod)();
-    }
-};
-
-auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
-
-template<typename C>
-auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
-    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
-}
-
-struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
-    StringRef name;
-    StringRef tags;
-};
-
-struct AutoReg : NonCopyable {
-    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
-};
-
-} // end namespace Catch
-
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
-        namespace{                        \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test();              \
-            };                            \
-        }                                 \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
-        namespace{                                                                                  \
-            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        }                                                                                           \
-        }                                                                                           \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        } \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestName{\
-                TestName(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-            return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
-        template<typename TestType> static void TestFuncName();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
-            INTERNAL_CATCH_TYPE_GEN                                                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
-            template<typename... Types>                               \
-            struct TestName {                                         \
-                void reg_tests() {                                          \
-                    int index = 0;                                    \
-                    using expander = int[];                           \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
-                }                                                     \
-            };                                                        \
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }                                                             \
-        }                                                             \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFuncName()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> static void TestFunc();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-        INTERNAL_CATCH_TYPE_GEN\
-        template<typename... Types>                               \
-        struct TestName {                                         \
-            void reg_tests() {                                          \
-                int index = 0;                                    \
-                using expander = int[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
-            }                                                     \
-        };\
-        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename convert<TestName, TmplList>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFunc()
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
-
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestNameClass{\
-                TestNameClass(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-                return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-                void test();\
-            };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
-            INTERNAL_CATCH_TYPE_GEN                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-            void test();\
-        };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename convert<TestNameClass, TmplList>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
-
-// end catch_test_registry.h
-// start catch_capture.hpp
-
-// start catch_assertionhandler.h
-
-// start catch_assertioninfo.h
-
-// start catch_result_type.h
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    bool isOk( ResultWas::OfType resultType );
-    bool isJustInfo( int flags );
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
-
-    bool shouldContinueOnFailure( int flags );
-    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    bool shouldSuppressFailure( int flags );
-
-} // end namespace Catch
-
-// end catch_result_type.h
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
-    };
-
-} // end namespace Catch
-
-// end catch_assertioninfo.h
-// start catch_decomposer.h
-
-// start catch_tostring.h
-
-#include <vector>
-#include <cstddef>
-#include <type_traits>
-#include <string>
-// start catch_stream.h
-
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-    std::ostream& clog();
-
-    class StringRef;
-
-    struct IStream {
-        virtual ~IStream();
-        virtual std::ostream& stream() const = 0;
-    };
-
-    auto makeStream( StringRef const &filename ) -> IStream const*;
-
-    class ReusableStringStream : NonCopyable {
-        std::size_t m_index;
-        std::ostream* m_oss;
-    public:
-        ReusableStringStream();
-        ~ReusableStringStream();
-
-        auto str() const -> std::string;
-
-        template<typename T>
-        auto operator << ( T const& value ) -> ReusableStringStream& {
-            *m_oss << value;
-            return *this;
-        }
-        auto get() -> std::ostream& { return *m_oss; }
-    };
-}
-
-// end catch_stream.h
-// start catch_interfaces_enum_values_registry.h
-
-#include <vector>
-
-namespace Catch {
-
-    namespace Detail {
-        struct EnumInfo {
-            StringRef m_name;
-            std::vector<std::pair<int, StringRef>> m_values;
-
-            ~EnumInfo();
-
-            StringRef lookup( int value ) const;
-        };
-    } // namespace Detail
-
-    struct IMutableEnumValuesRegistry {
-        virtual ~IMutableEnumValuesRegistry();
-
-        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
-
-        template<typename E>
-        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
-            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
-            std::vector<int> intValues;
-            intValues.reserve( values.size() );
-            for( auto enumValue : values )
-                intValues.push_back( static_cast<int>( enumValue ) );
-            return registerEnum( enumName, allEnums, intValues );
-        }
-    };
-
-} // Catch
-
-// end catch_interfaces_enum_values_registry.h
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-#include <string_view>
-#endif
-
-#ifdef __OBJC__
-// start catch_objc_arc.hpp
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-// end catch_objc_arc.hpp
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
-#endif
-
-namespace Catch {
-    namespace Detail {
-
-        extern const std::string unprintableString;
-
-        std::string rawMemoryToString( const void *object, std::size_t size );
-
-        template<typename T>
-        std::string rawMemoryToString( const T& object ) {
-          return rawMemoryToString( &object, sizeof(object) );
-        }
-
-        template<typename T>
-        class IsStreamInsertable {
-            template<typename Stream, typename U>
-            static auto test(int)
-                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
-
-            template<typename, typename>
-            static auto test(...)->std::false_type;
-
-        public:
-            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
-        };
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e );
-
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
-        std::string>::type convertUnstreamable( T const& ) {
-            return Detail::unprintableString;
-        }
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
-         std::string>::type convertUnstreamable(T const& ex) {
-            return ex.what();
-        }
-
-        template<typename T>
-        typename std::enable_if<
-            std::is_enum<T>::value
-        , std::string>::type convertUnstreamable( T const& value ) {
-            return convertUnknownEnumToString( value );
-        }
-
-#if defined(_MANAGED)
-        //! Convert a CLR string to a utf8 std::string
-        template<typename T>
-        std::string clrReferenceToString( T^ ref ) {
-            if (ref == nullptr)
-                return std::string("null");
-            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
-            cli::pin_ptr<System::Byte> p = &bytes[0];
-            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
-        }
-#endif
-
-    } // namespace Detail
-
-    // If we decide for C++14, change these to enable_if_ts
-    template <typename T, typename = void>
-    struct StringMaker {
-        template <typename Fake = T>
-        static
-        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert(const Fake& value) {
-                ReusableStringStream rss;
-                // NB: call using the function-like syntax to avoid ambiguity with
-                // user-defined templated operator<< under clang.
-                rss.operator<<(value);
-                return rss.str();
-        }
-
-        template <typename Fake = T>
-        static
-        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert( const Fake& value ) {
-#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
-            return Detail::convertUnstreamable(value);
-#else
-            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
-#endif
-        }
-    };
-
-    namespace Detail {
-
-        // This function dispatches all stringification requests inside of Catch.
-        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
-        template <typename T>
-        std::string stringify(const T& e) {
-            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
-        }
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e ) {
-            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
-        }
-
-#if defined(_MANAGED)
-        template <typename T>
-        std::string stringify( T^ e ) {
-            return ::Catch::StringMaker<T^>::convert(e);
-        }
-#endif
-
-    } // namespace Detail
-
-    // Some predefined specializations
-
-    template<>
-    struct StringMaker<std::string> {
-        static std::string convert(const std::string& str);
-    };
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::string_view> {
-        static std::string convert(std::string_view str);
-    };
-#endif
-
-    template<>
-    struct StringMaker<char const *> {
-        static std::string convert(char const * str);
-    };
-    template<>
-    struct StringMaker<char *> {
-        static std::string convert(char * str);
-    };
-
-#ifdef CATCH_CONFIG_WCHAR
-    template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
-    };
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::wstring_view> {
-        static std::string convert(std::wstring_view str);
-    };
-# endif
-
-    template<>
-    struct StringMaker<wchar_t const *> {
-        static std::string convert(wchar_t const * str);
-    };
-    template<>
-    struct StringMaker<wchar_t *> {
-        static std::string convert(wchar_t * str);
-    };
-#endif
-
-    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
-    //      while keeping string semantics?
-    template<int SZ>
-    struct StringMaker<char[SZ]> {
-        static std::string convert(char const* str) {
-            return ::Catch::Detail::stringify(std::string{ str });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<signed char[SZ]> {
-        static std::string convert(signed char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<unsigned char[SZ]> {
-        static std::string convert(unsigned char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<std::byte> {
-        static std::string convert(std::byte value);
-    };
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<int> {
-        static std::string convert(int value);
-    };
-    template<>
-    struct StringMaker<long> {
-        static std::string convert(long value);
-    };
-    template<>
-    struct StringMaker<long long> {
-        static std::string convert(long long value);
-    };
-    template<>
-    struct StringMaker<unsigned int> {
-        static std::string convert(unsigned int value);
-    };
-    template<>
-    struct StringMaker<unsigned long> {
-        static std::string convert(unsigned long value);
-    };
-    template<>
-    struct StringMaker<unsigned long long> {
-        static std::string convert(unsigned long long value);
-    };
-
-    template<>
-    struct StringMaker<bool> {
-        static std::string convert(bool b);
-    };
-
-    template<>
-    struct StringMaker<char> {
-        static std::string convert(char c);
-    };
-    template<>
-    struct StringMaker<signed char> {
-        static std::string convert(signed char c);
-    };
-    template<>
-    struct StringMaker<unsigned char> {
-        static std::string convert(unsigned char c);
-    };
-
-    template<>
-    struct StringMaker<std::nullptr_t> {
-        static std::string convert(std::nullptr_t);
-    };
-
-    template<>
-    struct StringMaker<float> {
-        static std::string convert(float value);
-        static int precision;
-    };
-
-    template<>
-    struct StringMaker<double> {
-        static std::string convert(double value);
-        static int precision;
-    };
-
-    template <typename T>
-    struct StringMaker<T*> {
-        template <typename U>
-        static std::string convert(U* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-    template <typename R, typename C>
-    struct StringMaker<R C::*> {
-        static std::string convert(R C::* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-#if defined(_MANAGED)
-    template <typename T>
-    struct StringMaker<T^> {
-        static std::string convert( T^ ref ) {
-            return ::Catch::Detail::clrReferenceToString(ref);
-        }
-    };
-#endif
-
-    namespace Detail {
-        template<typename InputIterator, typename Sentinel = InputIterator>
-        std::string rangeToString(InputIterator first, Sentinel last) {
-            ReusableStringStream rss;
-            rss << "{ ";
-            if (first != last) {
-                rss << ::Catch::Detail::stringify(*first);
-                for (++first; first != last; ++first)
-                    rss << ", " << ::Catch::Detail::stringify(*first);
-            }
-            rss << " }";
-            return rss.str();
-        }
-    }
-
-#ifdef __OBJC__
-    template<>
-    struct StringMaker<NSString*> {
-        static std::string convert(NSString * nsstring) {
-            if (!nsstring)
-                return "nil";
-            return std::string("@") + [nsstring UTF8String];
-        }
-    };
-    template<>
-    struct StringMaker<NSObject*> {
-        static std::string convert(NSObject* nsObject) {
-            return ::Catch::Detail::stringify([nsObject description]);
-        }
-
-    };
-    namespace Detail {
-        inline std::string stringify( NSString* nsstring ) {
-            return StringMaker<NSString*>::convert( nsstring );
-        }
-
-    } // namespace Detail
-#endif // __OBJC__
-
-} // namespace Catch
-
-//////////////////////////////////////////////////////
-// Separate std-lib types stringification, so it can be selectively enabled
-// This means that we do not bring in
-
-#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
-#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#endif
-
-// Separate std::pair specialization
-#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
-#include <utility>
-namespace Catch {
-    template<typename T1, typename T2>
-    struct StringMaker<std::pair<T1, T2> > {
-        static std::string convert(const std::pair<T1, T2>& pair) {
-            ReusableStringStream rss;
-            rss << "{ "
-                << ::Catch::Detail::stringify(pair.first)
-                << ", "
-                << ::Catch::Detail::stringify(pair.second)
-                << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#include <optional>
-namespace Catch {
-    template<typename T>
-    struct StringMaker<std::optional<T> > {
-        static std::string convert(const std::optional<T>& optional) {
-            ReusableStringStream rss;
-            if (optional.has_value()) {
-                rss << ::Catch::Detail::stringify(*optional);
-            } else {
-                rss << "{ }";
-            }
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-
-// Separate std::tuple specialization
-#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
-#include <tuple>
-namespace Catch {
-    namespace Detail {
-        template<
-            typename Tuple,
-            std::size_t N = 0,
-            bool = (N < std::tuple_size<Tuple>::value)
-            >
-            struct TupleElementPrinter {
-            static void print(const Tuple& tuple, std::ostream& os) {
-                os << (N ? ", " : " ")
-                    << ::Catch::Detail::stringify(std::get<N>(tuple));
-                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
-            }
-        };
-
-        template<
-            typename Tuple,
-            std::size_t N
-        >
-            struct TupleElementPrinter<Tuple, N, false> {
-            static void print(const Tuple&, std::ostream&) {}
-        };
-
-    }
-
-    template<typename ...Types>
-    struct StringMaker<std::tuple<Types...>> {
-        static std::string convert(const std::tuple<Types...>& tuple) {
-            ReusableStringStream rss;
-            rss << '{';
-            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
-            rss << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
-#include <variant>
-namespace Catch {
-    template<>
-    struct StringMaker<std::monostate> {
-        static std::string convert(const std::monostate&) {
-            return "{ }";
-        }
-    };
-
-    template<typename... Elements>
-    struct StringMaker<std::variant<Elements...>> {
-        static std::string convert(const std::variant<Elements...>& variant) {
-            if (variant.valueless_by_exception()) {
-                return "{valueless variant}";
-            } else {
-                return std::visit(
-                    [](const auto& value) {
-                        return ::Catch::Detail::stringify(value);
-                    },
-                    variant
-                );
-            }
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-
-namespace Catch {
-    // Import begin/ end from std here
-    using std::begin;
-    using std::end;
-
-    namespace detail {
-        template <typename...>
-        struct void_type {
-            using type = void;
-        };
-
-        template <typename T, typename = void>
-        struct is_range_impl : std::false_type {
-        };
-
-        template <typename T>
-        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
-        };
-    } // namespace detail
-
-    template <typename T>
-    struct is_range : detail::is_range_impl<T> {
-    };
-
-#if defined(_MANAGED) // Managed types are never ranges
-    template <typename T>
-    struct is_range<T^> {
-        static const bool value = false;
-    };
-#endif
-
-    template<typename Range>
-    std::string rangeToString( Range const& range ) {
-        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
-    }
-
-    // Handle vector<bool> specially
-    template<typename Allocator>
-    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
-        ReusableStringStream rss;
-        rss << "{ ";
-        bool first = true;
-        for( bool b : v ) {
-            if( first )
-                first = false;
-            else
-                rss << ", ";
-            rss << ::Catch::Detail::stringify( b );
-        }
-        rss << " }";
-        return rss.str();
-    }
-
-    template<typename R>
-    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
-        static std::string convert( R const& range ) {
-            return rangeToString( range );
-        }
-    };
-
-    template <typename T, int SZ>
-    struct StringMaker<T[SZ]> {
-        static std::string convert(T const(&arr)[SZ]) {
-            return rangeToString(arr);
-        }
-    };
-
-} // namespace Catch
-
-// Separate std::chrono::duration specialization
-#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#include <ctime>
-#include <ratio>
-#include <chrono>
-
-namespace Catch {
-
-template <class Ratio>
-struct ratio_string {
-    static std::string symbol();
-};
-
-template <class Ratio>
-std::string ratio_string<Ratio>::symbol() {
-    Catch::ReusableStringStream rss;
-    rss << '[' << Ratio::num << '/'
-        << Ratio::den << ']';
-    return rss.str();
-}
-template <>
-struct ratio_string<std::atto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::femto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::pico> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::nano> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::micro> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::milli> {
-    static std::string symbol();
-};
-
-    ////////////
-    // std::chrono::duration specializations
-    template<typename Value, typename Ratio>
-    struct StringMaker<std::chrono::duration<Value, Ratio>> {
-        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " s";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " m";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " h";
-            return rss.str();
-        }
-    };
-
-    ////////////
-    // std::chrono::time_point specialization
-    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
-    template<typename Clock, typename Duration>
-    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
-        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
-            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
-        }
-    };
-    // std::chrono::time_point<system_clock> specialization
-    template<typename Duration>
-    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
-            auto converted = std::chrono::system_clock::to_time_t(time_point);
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &converted);
-#else
-            std::tm* timeInfo = std::gmtime(&converted);
-#endif
-
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-
-#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
-namespace Catch { \
-    template<> struct StringMaker<enumName> { \
-        static std::string convert( enumName value ) { \
-            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
-            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
-        } \
-    }; \
-}
-
-#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_tostring.h
-#include <iosfwd>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#pragma warning(disable:4018) // more "signed/unsigned mismatch"
-#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
-#pragma warning(disable:4180) // qualifier applied to function type has no meaning
-#pragma warning(disable:4800) // Forcing result to true or false
-#endif
-
-namespace Catch {
-
-    struct ITransientExpression {
-        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
-        auto getResult() const -> bool { return m_result; }
-        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
-
-        ITransientExpression( bool isBinaryExpression, bool result )
-        :   m_isBinaryExpression( isBinaryExpression ),
-            m_result( result )
-        {}
-
-        // We don't actually need a virtual destructor, but many static analysers
-        // complain if it's not here :-(
-        virtual ~ITransientExpression();
-
-        bool m_isBinaryExpression;
-        bool m_result;
-
-    };
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
-
-    template<typename LhsT, typename RhsT>
-    class BinaryExpr  : public ITransientExpression {
-        LhsT m_lhs;
-        StringRef m_op;
-        RhsT m_rhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            formatReconstructedExpression
-                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
-        }
-
-    public:
-        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
-        :   ITransientExpression{ true, comparisonResult },
-            m_lhs( lhs ),
-            m_op( op ),
-            m_rhs( rhs )
-        {}
-
-        template<typename T>
-        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-    };
-
-    template<typename LhsT>
-    class UnaryExpr : public ITransientExpression {
-        LhsT m_lhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            os << Catch::Detail::stringify( m_lhs );
-        }
-
-    public:
-        explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, static_cast<bool>(lhs) },
-            m_lhs( lhs )
-        {}
-    };
-
-    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
-    template<typename LhsT, typename RhsT>
-    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-    template<typename T>
-    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-
-    template<typename LhsT, typename RhsT>
-    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-    template<typename T>
-    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-
-    template<typename LhsT>
-    class ExprLhs {
-        LhsT m_lhs;
-    public:
-        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
-
-        template<typename RhsT>
-        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
-        }
-        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs == rhs, m_lhs, "==", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
-        }
-        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs != rhs, m_lhs, "!=", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
-        }
-        template<typename RhsT>
-        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
-        }
-        template<typename RhsT>
-        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
-        }
-        template<typename RhsT>
-        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
-        }
-        template <typename RhsT>
-        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
-        }
-        template <typename RhsT>
-        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
-        }
-        template <typename RhsT>
-        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator&& is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename RhsT>
-        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator|| is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
-            return UnaryExpr<LhsT>{ m_lhs };
-        }
-    };
-
-    void handleExpression( ITransientExpression const& expr );
-
-    template<typename T>
-    void handleExpression( ExprLhs<T> const& expr ) {
-        handleExpression( expr.makeUnaryExpr() );
-    }
-
-    struct Decomposer {
-        template<typename T>
-        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
-            return ExprLhs<T const&>{ lhs };
-        }
-
-        auto operator <=( bool value ) -> ExprLhs<bool> {
-            return ExprLhs<bool>{ value };
-        }
-    };
-
-} // end namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_decomposer.h
-// start catch_interfaces_capture.h
-
-#include <string>
-#include <chrono>
-
-namespace Catch {
-
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    struct MessageBuilder;
-    struct Counts;
-    struct AssertionReaction;
-    struct SourceLineInfo;
-
-    struct ITransientExpression;
-    struct IGeneratorTracker;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-
-        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& name ) = 0;
-        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
-        virtual void benchmarkFailed( std::string const& error ) = 0;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
-
-        virtual void handleFatalErrorCondition( StringRef message ) = 0;
-
-        virtual void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleIncomplete
-                (   AssertionInfo const& info ) = 0;
-        virtual void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) = 0;
-
-        virtual bool lastAssertionPassed() = 0;
-        virtual void assertionPassed() = 0;
-
-        // Deprecated, do not use:
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-        virtual void exceptionEarlyReported() = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// end catch_interfaces_capture.h
-namespace Catch {
-
-    struct TestFailureException{};
-    struct AssertionResultData;
-    struct IResultCapture;
-    class RunContext;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated );
-        LazyExpression( LazyExpression const& other );
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const;
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-    struct AssertionReaction {
-        bool shouldDebugBreak = false;
-        bool shouldThrow = false;
-    };
-
-    class AssertionHandler {
-        AssertionInfo m_assertionInfo;
-        AssertionReaction m_reaction;
-        bool m_completed = false;
-        IResultCapture& m_resultCapture;
-
-    public:
-        AssertionHandler
-            (   StringRef const& macroName,
-                SourceLineInfo const& lineInfo,
-                StringRef capturedExpression,
-                ResultDisposition::Flags resultDisposition );
-        ~AssertionHandler() {
-            if ( !m_completed ) {
-                m_resultCapture.handleIncomplete( m_assertionInfo );
-            }
-        }
-
-        template<typename T>
-        void handleExpr( ExprLhs<T> const& expr ) {
-            handleExpr( expr.makeUnaryExpr() );
-        }
-        void handleExpr( ITransientExpression const& expr );
-
-        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
-
-        void handleExceptionThrownAsExpected();
-        void handleUnexpectedExceptionNotThrown();
-        void handleExceptionNotThrownAsExpected();
-        void handleThrowingCallSkipped();
-        void handleUnexpectedInflightException();
-
-        void complete();
-        void setCompleted();
-
-        // query
-        auto allowThrows() const -> bool;
-    };
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
-
-} // namespace Catch
-
-// end catch_assertionhandler.h
-// start catch_message.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const;
-        bool operator < ( MessageInfo const& other ) const;
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageStream {
-
-        template<typename T>
-        MessageStream& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        ReusableStringStream m_stream;
-    };
-
-    struct MessageBuilder : MessageStream {
-        MessageBuilder( StringRef const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type );
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-    };
-
-    class ScopedMessage {
-    public:
-        explicit ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage& duplicate ) = delete;
-        ScopedMessage( ScopedMessage&& old );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-        bool m_moved;
-    };
-
-    class Capturer {
-        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
-        size_t m_captured = 0;
-    public:
-        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
-        ~Capturer();
-
-        void captureValue( size_t index, std::string const& value );
-
-        template<typename T>
-        void captureValues( size_t index, T const& value ) {
-            captureValue( index, Catch::Detail::stringify( value ) );
-        }
-
-        template<typename T, typename... Ts>
-        void captureValues( size_t index, T const& value, Ts const&... values ) {
-            captureValue( index, Catch::Detail::stringify(value) );
-            captureValues( index+1, values... );
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_message.h
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
-#endif
-
-#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-
-///////////////////////////////////////////////////////////////////////////////
-// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
-// macros.
-#define INTERNAL_CATCH_TRY
-#define INTERNAL_CATCH_CATCH( capturer )
-
-#else // CATCH_CONFIG_FAST_COMPILE
-
-#define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
-
-#endif
-
-#define INTERNAL_CATCH_REACT( handler ) handler.complete();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
-    do { \
-        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( !Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        try { \
-            static_cast<void>(__VA_ARGS__); \
-            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
-        } \
-        catch( ... ) { \
-            catchAssertionHandler.handleUnexpectedInflightException(); \
-        } \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(expr); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
-        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
-    varName.captureValues( 0, __VA_ARGS__ )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
-    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
-
-///////////////////////////////////////////////////////////////////////////////
-// Although this is matcher-based, it can be used with just a string
-#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_capture.hpp
-// start catch_section.h
-
-// start catch_section_info.h
-
-// start catch_totals.h
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
-
-        std::size_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
-
-        std::size_t passed = 0;
-        std::size_t failed = 0;
-        std::size_t failedButOk = 0;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
-
-        Totals delta( Totals const& prevTotals ) const;
-
-        int error = 0;
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-// end catch_totals.h
-#include <string>
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name );
-
-        // Deprecated
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
-
-        std::string name;
-        std::string description; // !Deprecated: this will always be empty
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// end catch_section_info.h
-// start catch_timer.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
-    auto getEstimatedClockResolution() -> uint64_t;
-
-    class Timer {
-        uint64_t m_nanoseconds = 0;
-    public:
-        void start();
-        auto getElapsedNanoseconds() const -> uint64_t;
-        auto getElapsedMicroseconds() const -> uint64_t;
-        auto getElapsedMilliseconds() const -> unsigned int;
-        auto getElapsedSeconds() const -> double;
-    };
-
-} // namespace Catch
-
-// end catch_timer.h
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        explicit operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_section.h
-// start catch_interfaces_exception.h
-
-// start catch_interfaces_registry_hub.h
-
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-    struct ITagAliasRegistry;
-    struct IMutableEnumValuesRegistry;
-
-    class StartupExceptionRegistry;
-
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-// end catch_interfaces_registry_hub.h
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
-        static std::string translatorName( signature )
-#endif
-
-#include <exception>
-#include <string>
-#include <vector>
-
-namespace Catch {
-    using exceptionTranslateFunction = std::string(*)();
-
-    struct IExceptionTranslator;
-    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                return "";
-#else
-                try {
-                    if( it == itEnd )
-                        std::rethrow_exception(std::current_exception());
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-#endif
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// end catch_interfaces_exception.h
-// start catch_approx.h
-
-#include <type_traits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    private:
-        bool equalityComparisonImpl(double other) const;
-        // Validates the new margin (margin >= 0)
-        // out-of-line to avoid including stdexcept in the header
-        void setMargin(double margin);
-        // Validates the new epsilon (0 < epsilon < 1)
-        // out-of-line to avoid including stdexcept in the header
-        void setEpsilon(double epsilon);
-
-    public:
-        explicit Approx ( double value );
-
-        static Approx custom();
-
-        Approx operator-() const;
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) const {
-            Approx approx( static_cast<double>(value) );
-            approx.m_epsilon = m_epsilon;
-            approx.m_margin = m_margin;
-            approx.m_scale = m_scale;
-            return approx;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        explicit Approx( T const& value ): Approx(static_cast<double>(value))
-        {}
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( const T& lhs, Approx const& rhs ) {
-            auto lhs_v = static_cast<double>(lhs);
-            return rhs.equalityComparisonImpl(lhs_v);
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( Approx const& lhs, const T& rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( T const& lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( Approx const& lhs, T const& rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& epsilon( T const& newEpsilon ) {
-            double epsilonAsDouble = static_cast<double>(newEpsilon);
-            setEpsilon(epsilonAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& margin( T const& newMargin ) {
-            double marginAsDouble = static_cast<double>(newMargin);
-            setMargin(marginAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& scale( T const& newScale ) {
-            m_scale = static_cast<double>(newScale);
-            return *this;
-        }
-
-        std::string toString() const;
-
-    private:
-        double m_epsilon;
-        double m_margin;
-        double m_scale;
-        double m_value;
-    };
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
-} // end namespace literals
-
-template<>
-struct StringMaker<Catch::Detail::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
-};
-
-} // end namespace Catch
-
-// end catch_approx.h
-// start catch_string_manip.h
-
-#include <string>
-#include <iosfwd>
-#include <vector>
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool startsWith( std::string const& s, char prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool endsWith( std::string const& s, char suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    //! Returns a new string without whitespace at the start/end
-    std::string trim( std::string const& str );
-    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
-    StringRef trim(StringRef ref);
-
-    // !!! Be aware, returns refs into original string - make sure original string outlives them
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-}
-
-// end catch_string_manip.h
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-// start catch_capture_matchers.h
-
-// start catch_matchers.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        template<typename ArgT> struct MatchAllOf;
-        template<typename ArgT> struct MatchAnyOf;
-        template<typename ArgT> struct MatchNotOf;
-
-        class MatcherUntypedBase {
-        public:
-            MatcherUntypedBase() = default;
-            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
-            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
-            std::string toString() const;
-
-        protected:
-            virtual ~MatcherUntypedBase();
-            virtual std::string describe() const = 0;
-            mutable std::string m_cachedToString;
-        };
-
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
-        template<typename ObjectT>
-        struct MatcherMethod {
-            virtual bool match( ObjectT const& arg ) const = 0;
-        };
-
-#if defined(__OBJC__)
-        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
-        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
-        template<>
-        struct MatcherMethod<NSString*> {
-            virtual bool match( NSString* arg ) const = 0;
-        };
-#endif
-
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
-
-        template<typename T>
-        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
-
-            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
-            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
-            MatchNotOf<T> operator ! () const;
-        };
-
-        template<typename ArgT>
-        struct MatchAllOf : MatcherBase<ArgT> {
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (!matcher->match(arg))
-                        return false;
-                }
-                return true;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " and ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-        template<typename ArgT>
-        struct MatchAnyOf : MatcherBase<ArgT> {
-
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (matcher->match(arg))
-                        return true;
-                }
-                return false;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " or ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-
-        template<typename ArgT>
-        struct MatchNotOf : MatcherBase<ArgT> {
-
-            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
-
-            bool match( ArgT const& arg ) const override {
-                return !m_underlyingMatcher.match( arg );
-            }
-
-            std::string describe() const override {
-                return "not " + m_underlyingMatcher.toString();
-            }
-            MatcherBase<ArgT> const& m_underlyingMatcher;
-        };
-
-        template<typename T>
-        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
-            return MatchAllOf<T>() && *this && other;
-        }
-        template<typename T>
-        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
-            return MatchAnyOf<T>() || *this || other;
-        }
-        template<typename T>
-        MatchNotOf<T> MatcherBase<T>::operator ! () const {
-            return MatchNotOf<T>( *this );
-        }
-
-    } // namespace Impl
-
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-
-// end catch_matchers.h
-// start catch_matchers_exception.hpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-class ExceptionMessageMatcher : public MatcherBase<std::exception> {
-    std::string m_message;
-public:
-
-    ExceptionMessageMatcher(std::string const& message):
-        m_message(message)
-    {}
-
-    bool match(std::exception const& ex) const override;
-
-    std::string describe() const override;
-};
-
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_exception.hpp
-// start catch_matchers_floating.h
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Floating {
-
-        enum class FloatingPointKind : uint8_t;
-
-        struct WithinAbsMatcher : MatcherBase<double> {
-            WithinAbsMatcher(double target, double margin);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_margin;
-        };
-
-        struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            uint64_t m_ulps;
-            FloatingPointKind m_type;
-        };
-
-        // Given IEEE-754 format for floats and doubles, we can assume
-        // that float -> double promotion is lossless. Given this, we can
-        // assume that if we do the standard relative comparison of
-        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
-        // the same result if we do this for floats, as if we do this for
-        // doubles that were promoted from floats.
-        struct WithinRelMatcher : MatcherBase<double> {
-            WithinRelMatcher(double target, double epsilon);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_epsilon;
-        };
-
-    } // namespace Floating
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
-    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
-    Floating::WithinRelMatcher WithinRel(double target, double eps);
-    // defaults epsilon to 100*numeric_limits<double>::epsilon()
-    Floating::WithinRelMatcher WithinRel(double target);
-    Floating::WithinRelMatcher WithinRel(float target, float eps);
-    // defaults epsilon to 100*numeric_limits<float>::epsilon()
-    Floating::WithinRelMatcher WithinRel(float target);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.h
-// start catch_matchers_generic.hpp
-
-#include <functional>
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-namespace Generic {
-
-namespace Detail {
-    std::string finalizeDescription(const std::string& desc);
-}
-
-template <typename T>
-class PredicateMatcher : public MatcherBase<T> {
-    std::function<bool(T const&)> m_predicate;
-    std::string m_description;
-public:
-
-    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
-        :m_predicate(std::move(elem)),
-        m_description(Detail::finalizeDescription(descr))
-    {}
-
-    bool match( T const& item ) const override {
-        return m_predicate(item);
-    }
-
-    std::string describe() const override {
-        return m_description;
-    }
-};
-
-} // namespace Generic
-
-    // The following functions create the actual matcher objects.
-    // The user has to explicitly specify type to the function, because
-    // inferring std::function<bool(T const&)> is hard (but possible) and
-    // requires a lot of TMP.
-    template<typename T>
-    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
-        return Generic::PredicateMatcher<T>(predicate, description);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_generic.hpp
-// start catch_matchers_string.h
-
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
-            std::string adjustString( std::string const& str ) const;
-            std::string caseSensitivitySuffix() const;
-
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct StringMatcherBase : MatcherBase<std::string> {
-            StringMatcherBase( std::string const& operation, CasedString const& comparator );
-            std::string describe() const override;
-
-            CasedString m_comparator;
-            std::string m_operation;
-        };
-
-        struct EqualsMatcher : StringMatcherBase {
-            EqualsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct ContainsMatcher : StringMatcherBase {
-            ContainsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct StartsWithMatcher : StringMatcherBase {
-            StartsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct EndsWithMatcher : StringMatcherBase {
-            EndsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-
-        struct RegexMatcher : MatcherBase<std::string> {
-            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
-            bool match( std::string const& matchee ) const override;
-            std::string describe() const override;
-
-        private:
-            std::string m_regex;
-            CaseSensitive::Choice m_caseSensitivity;
-        };
-
-    } // namespace StdString
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_string.h
-// start catch_matchers_vector.h
-
-#include <algorithm>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Vector {
-        template<typename T, typename Alloc>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
-
-            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
-
-            bool match(std::vector<T, Alloc> const &v) const override {
-                for (auto const& el : v) {
-                    if (el == m_comparator) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            T const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: see note in EqualsMatcher
-                if (m_comparator.size() > v.size())
-                    return false;
-                for (auto const& comparator : m_comparator) {
-                    auto present = false;
-                    for (const auto& el : v) {
-                        if (el == comparator) {
-                            present = true;
-                            break;
-                        }
-                    }
-                    if (!present) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: This currently works if all elements can be compared using !=
-                // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
-                // - then just call that directly
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != v[i])
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != approx(v[i]))
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& epsilon( T const& newEpsilon ) {
-                approx.epsilon(newEpsilon);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& margin( T const& newMargin ) {
-                approx.margin(newMargin);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& scale( T const& newScale ) {
-                approx.scale(newScale);
-                return *this;
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
-            bool match(std::vector<T, AllocMatch> const& vec) const override {
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
-            }
-
-            std::string describe() const override {
-                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
-            }
-        private:
-            std::vector<T, AllocComp> const& m_target;
-        };
-
-    } // namespace Vector
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename Alloc = std::allocator<T>>
-    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
-        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_vector.h
-namespace Catch {
-
-    template<typename ArgT, typename MatcherT>
-    class MatchExpr : public ITransientExpression {
-        ArgT const& m_arg;
-        MatcherT m_matcher;
-        StringRef m_matcherString;
-    public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
-        :   ITransientExpression{ true, matcher.match( arg ) },
-            m_arg( arg ),
-            m_matcher( matcher ),
-            m_matcherString( matcherString )
-        {}
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            auto matcherAsString = m_matcher.toString();
-            os << Catch::Detail::stringify( m_arg ) << ' ';
-            if( matcherAsString == Detail::unprintableString )
-                os << m_matcherString;
-            else
-                os << matcherAsString;
-        }
-    };
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
-
-    template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
-        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
-    }
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__ ); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-// end catch_capture_matchers.h
-#endif
-// start catch_generators.hpp
-
-// start catch_interfaces_generatortracker.h
-
-
-#include <memory>
-
-namespace Catch {
-
-    namespace Generators {
-        class GeneratorUntypedBase {
-        public:
-            GeneratorUntypedBase() = default;
-            virtual ~GeneratorUntypedBase();
-            // Attempts to move the generator to the next element
-             //
-             // Returns true iff the move succeeded (and a valid element
-             // can be retrieved).
-            virtual bool next() = 0;
-        };
-        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
-
-    } // namespace Generators
-
-    struct IGeneratorTracker {
-        virtual ~IGeneratorTracker();
-        virtual auto hasGenerator() const -> bool = 0;
-        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
-        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
-    };
-
-} // namespace Catch
-
-// end catch_interfaces_generatortracker.h
-// start catch_enforce.h
-
-#include <exception>
-
-namespace Catch {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    template <typename Ex>
-    [[noreturn]]
-    void throw_exception(Ex const& e) {
-        throw e;
-    }
-#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
-    [[noreturn]]
-    void throw_exception(std::exception const& e);
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg);
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg);
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg);
-
-} // namespace Catch;
-
-#define CATCH_MAKE_MSG(...) \
-    (Catch::ReusableStringStream() << __VA_ARGS__).str()
-
-#define CATCH_INTERNAL_ERROR(...) \
-    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
-
-#define CATCH_ERROR(...) \
-    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_RUNTIME_ERROR(...) \
-    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_ENFORCE( condition, ... ) \
-    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
-
-// end catch_enforce.h
-#include <memory>
-#include <vector>
-#include <cassert>
-
-#include <utility>
-#include <exception>
-
-namespace Catch {
-
-class GeneratorException : public std::exception {
-    const char* const m_msg = "";
-
-public:
-    GeneratorException(const char* msg):
-        m_msg(msg)
-    {}
-
-    const char* what() const noexcept override final;
-};
-
-namespace Generators {
-
-    // !TBD move this into its own location?
-    namespace pf{
-        template<typename T, typename... Args>
-        std::unique_ptr<T> make_unique( Args&&... args ) {
-            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-    }
-
-    template<typename T>
-    struct IGenerator : GeneratorUntypedBase {
-        virtual ~IGenerator() = default;
-
-        // Returns the current element of the generator
-        //
-        // \Precondition The generator is either freshly constructed,
-        // or the last call to `next()` returned true
-        virtual T const& get() const = 0;
-        using type = T;
-    };
-
-    template<typename T>
-    class SingleValueGenerator final : public IGenerator<T> {
-        T m_value;
-    public:
-        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
-
-        T const& get() const override {
-            return m_value;
-        }
-        bool next() override {
-            return false;
-        }
-    };
-
-    template<typename T>
-    class FixedValuesGenerator final : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "FixedValuesGenerator does not support bools because of std::vector<bool>"
-            "specialization, use SingleValue Generator instead.");
-        std::vector<T> m_values;
-        size_t m_idx = 0;
-    public:
-        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
-
-        T const& get() const override {
-            return m_values[m_idx];
-        }
-        bool next() override {
-            ++m_idx;
-            return m_idx < m_values.size();
-        }
-    };
-
-    template <typename T>
-    class GeneratorWrapper final {
-        std::unique_ptr<IGenerator<T>> m_generator;
-    public:
-        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
-            m_generator(std::move(generator))
-        {}
-        T const& get() const {
-            return m_generator->get();
-        }
-        bool next() {
-            return m_generator->next();
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> value(T&& value) {
-        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
-    }
-    template <typename T>
-    GeneratorWrapper<T> values(std::initializer_list<T> values) {
-        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
-    }
-
-    template<typename T>
-    class Generators : public IGenerator<T> {
-        std::vector<GeneratorWrapper<T>> m_generators;
-        size_t m_current = 0;
-
-        void populate(GeneratorWrapper<T>&& generator) {
-            m_generators.emplace_back(std::move(generator));
-        }
-        void populate(T&& val) {
-            m_generators.emplace_back(value(std::forward<T>(val)));
-        }
-        template<typename U>
-        void populate(U&& val) {
-            populate(T(std::forward<U>(val)));
-        }
-        template<typename U, typename... Gs>
-        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
-            populate(std::forward<U>(valueOrGenerator));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-    public:
-        template <typename... Gs>
-        Generators(Gs &&... moreGenerators) {
-            m_generators.reserve(sizeof...(Gs));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-        T const& get() const override {
-            return m_generators[m_current].get();
-        }
-
-        bool next() override {
-            if (m_current >= m_generators.size()) {
-                return false;
-            }
-            const bool current_status = m_generators[m_current].next();
-            if (!current_status) {
-                ++m_current;
-            }
-            return m_current < m_generators.size();
-        }
-    };
-
-    template<typename... Ts>
-    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
-        return values<std::tuple<Ts...>>( tuples );
-    }
-
-    // Tag type to signal that a generator sequence should convert arguments to a specific type
-    template <typename T>
-    struct as {};
-
-    template<typename T, typename... Gs>
-    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
-        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
-    }
-    template<typename T>
-    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
-        return Generators<T>(std::move(generator));
-    }
-    template<typename T, typename... Gs>
-    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
-    }
-    template<typename T, typename U, typename... Gs>
-    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
-    }
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
-
-    template<typename L>
-    // Note: The type after -> is weird, because VS2015 cannot parse
-    //       the expression used in the typedef inside, when it is in
-    //       return type. Yeah.
-    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
-        using UnderlyingType = typename decltype(generatorExpression())::type;
-
-        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
-        if (!tracker.hasGenerator()) {
-            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
-        }
-
-        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
-        return generator.get();
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-#define GENERATE( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_COPY( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_REF( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-
-// end catch_generators.hpp
-// start catch_generators_generic.hpp
-
-namespace Catch {
-namespace Generators {
-
-    template <typename T>
-    class TakeGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        size_t m_returned = 0;
-        size_t m_target;
-    public:
-        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target(target)
-        {
-            assert(target != 0 && "Empty generators are not allowed");
-        }
-        T const& get() const override {
-            return m_generator.get();
-        }
-        bool next() override {
-            ++m_returned;
-            if (m_returned >= m_target) {
-                return false;
-            }
-
-            const auto success = m_generator.next();
-            // If the underlying generator does not contain enough values
-            // then we cut short as well
-            if (!success) {
-                m_returned = m_target;
-            }
-            return success;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
-    }
-
-    template <typename T, typename Predicate>
-    class FilterGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        Predicate m_predicate;
-    public:
-        template <typename P = Predicate>
-        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_predicate(std::forward<P>(pred))
-        {
-            if (!m_predicate(m_generator.get())) {
-                // It might happen that there are no values that pass the
-                // filter. In that case we throw an exception.
-                auto has_initial_value = nextImpl();
-                if (!has_initial_value) {
-                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
-                }
-            }
-        }
-
-        T const& get() const override {
-            return m_generator.get();
-        }
-
-        bool next() override {
-            return nextImpl();
-        }
-
-    private:
-        bool nextImpl() {
-            bool success = m_generator.next();
-            if (!success) {
-                return false;
-            }
-            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
-            return success;
-        }
-    };
-
-    template <typename T, typename Predicate>
-    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
-    }
-
-    template <typename T>
-    class RepeatGenerator : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "RepeatGenerator currently does not support bools"
-            "because of std::vector<bool> specialization");
-        GeneratorWrapper<T> m_generator;
-        mutable std::vector<T> m_returned;
-        size_t m_target_repeats;
-        size_t m_current_repeat = 0;
-        size_t m_repeat_index = 0;
-    public:
-        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target_repeats(repeats)
-        {
-            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
-        }
-
-        T const& get() const override {
-            if (m_current_repeat == 0) {
-                m_returned.push_back(m_generator.get());
-                return m_returned.back();
-            }
-            return m_returned[m_repeat_index];
-        }
-
-        bool next() override {
-            // There are 2 basic cases:
-            // 1) We are still reading the generator
-            // 2) We are reading our own cache
-
-            // In the first case, we need to poke the underlying generator.
-            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
-            if (m_current_repeat == 0) {
-                const auto success = m_generator.next();
-                if (!success) {
-                    ++m_current_repeat;
-                }
-                return m_current_repeat < m_target_repeats;
-            }
-
-            // In the second case, we need to move indices forward and check that we haven't run up against the end
-            ++m_repeat_index;
-            if (m_repeat_index == m_returned.size()) {
-                m_repeat_index = 0;
-                ++m_current_repeat;
-            }
-            return m_current_repeat < m_target_repeats;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
-    }
-
-    template <typename T, typename U, typename Func>
-    class MapGenerator : public IGenerator<T> {
-        // TBD: provide static assert for mapping function, for friendly error message
-        GeneratorWrapper<U> m_generator;
-        Func m_function;
-        // To avoid returning dangling reference, we have to save the values
-        T m_cache;
-    public:
-        template <typename F2 = Func>
-        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
-            m_generator(std::move(generator)),
-            m_function(std::forward<F2>(function)),
-            m_cache(m_function(m_generator.get()))
-        {}
-
-        T const& get() const override {
-            return m_cache;
-        }
-        bool next() override {
-            const auto success = m_generator.next();
-            if (success) {
-                m_cache = m_function(m_generator.get());
-            }
-            return success;
-        }
-    };
-
-    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T, typename U, typename Func>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T>
-    class ChunkGenerator final : public IGenerator<std::vector<T>> {
-        std::vector<T> m_chunk;
-        size_t m_chunk_size;
-        GeneratorWrapper<T> m_generator;
-        bool m_used_up = false;
-    public:
-        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
-            m_chunk_size(size), m_generator(std::move(generator))
-        {
-            m_chunk.reserve(m_chunk_size);
-            if (m_chunk_size != 0) {
-                m_chunk.push_back(m_generator.get());
-                for (size_t i = 1; i < m_chunk_size; ++i) {
-                    if (!m_generator.next()) {
-                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                    }
-                    m_chunk.push_back(m_generator.get());
-                }
-            }
-        }
-        std::vector<T> const& get() const override {
-            return m_chunk;
-        }
-        bool next() override {
-            m_chunk.clear();
-            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
-                if (!m_generator.next()) {
-                    return false;
-                }
-                m_chunk.push_back(m_generator.get());
-            }
-            return true;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<std::vector<T>>(
-            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
-        );
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_generic.hpp
-// start catch_generators_specific.hpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
-
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext();
-
-    class SimplePcg32;
-    SimplePcg32& rng();
-}
-
-// end catch_context.h
-// start catch_interfaces_config.h
-
-// start catch_option.hpp
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
-
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-// end catch_option.hpp
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01,
-        NoTests = 0x02
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : NonCopyable {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutNoTests() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual double minDuration() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-}
-
-// end catch_interfaces_config.h
-// start catch_random_number_generator.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    // This is a simple implementation of C++11 Uniform Random Number
-    // Generator. It does not provide all operators, because Catch2
-    // does not use it, but it should behave as expected inside stdlib's
-    // distributions.
-    // The implementation is based on the PCG family (http://pcg-random.org)
-    class SimplePcg32 {
-        using state_type = std::uint64_t;
-    public:
-        using result_type = std::uint32_t;
-        static constexpr result_type (min)() {
-            return 0;
-        }
-        static constexpr result_type (max)() {
-            return static_cast<result_type>(-1);
-        }
-
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
-
-        explicit SimplePcg32(result_type seed_);
-
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
-
-        result_type operator()();
-
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
-
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
-
-} // end namespace Catch
-
-// end catch_random_number_generator.h
-#include <random>
-
-namespace Catch {
-namespace Generators {
-
-template <typename Float>
-class RandomFloatingGenerator final : public IGenerator<Float> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_real_distribution<Float> m_dist;
-    Float m_current_number;
-public:
-
-    RandomFloatingGenerator(Float a, Float b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Float const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-template <typename Integer>
-class RandomIntegerGenerator final : public IGenerator<Integer> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
-    Integer m_current_number;
-public:
-
-    RandomIntegerGenerator(Integer a, Integer b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Integer const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-// TODO: Ideally this would be also constrained against the various char types,
-//       but I don't expect users to run into that in practice.
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-class RangeGenerator final : public IGenerator<T> {
-    T m_current;
-    T m_end;
-    T m_step;
-    bool m_positive;
-
-public:
-    RangeGenerator(T const& start, T const& end, T const& step):
-        m_current(start),
-        m_end(end),
-        m_step(step),
-        m_positive(m_step > T(0))
-    {
-        assert(m_current != m_end && "Range start and end cannot be equal");
-        assert(m_step != T(0) && "Step size cannot be zero");
-        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
-    }
-
-    RangeGenerator(T const& start, T const& end):
-        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
-    {}
-
-    T const& get() const override {
-        return m_current;
-    }
-
-    bool next() override {
-        m_current += m_step;
-        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
-    }
-};
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
-    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
-}
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end) {
-    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
-}
-
-template <typename T>
-class IteratorGenerator final : public IGenerator<T> {
-    static_assert(!std::is_same<T, bool>::value,
-        "IteratorGenerator currently does not support bools"
-        "because of std::vector<bool> specialization");
-
-    std::vector<T> m_elems;
-    size_t m_current = 0;
-public:
-    template <typename InputIterator, typename InputSentinel>
-    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
-        if (m_elems.empty()) {
-            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
-        }
-    }
-
-    T const& get() const override {
-        return m_elems[m_current];
-    }
-
-    bool next() override {
-        ++m_current;
-        return m_current != m_elems.size();
-    }
-};
-
-template <typename InputIterator,
-          typename InputSentinel,
-          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
-GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
-}
-
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
-}
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_specific.hpp
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string tagsAsString() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
-
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
-
-namespace Catch {
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public ITestInvoker {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                bool match( NSString* str ) const override {
-                    return false;
-                }
-
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
-
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-// Benchmarking needs the externally-facing parts of reporters to work
-#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_external_interfaces.h
-
-// start catch_reporter_bases.hpp
-
-// start catch_interfaces_reporter.h
-
-// start catch_config.hpp
-
-// start catch_test_spec_parser.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_test_spec.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_wildcard_pattern.h
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
-
-    private:
-        std::string normaliseString( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
-    };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    struct IConfig;
-
-    class TestSpec {
-        class Pattern {
-        public:
-            explicit Pattern( std::string const& name );
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-            std::string const& name() const;
-        private:
-            std::string const m_name;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            explicit NamePattern( std::string const& name, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            explicit TagPattern( std::string const& tag, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const;
-            std::string name() const;
-        };
-
-    public:
-        struct FilterMatch {
-            std::string name;
-            std::vector<TestCase const*> tests;
-        };
-        using Matches = std::vector<FilterMatch>;
-        using vectorStrings = std::vector<std::string>;
-
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
-        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
-        const vectorStrings & getInvalidArgs() const;
-
-    private:
-        std::vector<Filter> m_filters;
-        std::vector<std::string> m_invalidArgs;
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        Mode lastMode = None;
-        bool m_exclusion = false;
-        std::size_t m_pos = 0;
-        std::size_t m_realPatternPos = 0;
-        std::string m_arg;
-        std::string m_substring;
-        std::string m_patternName;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
-
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
-
-    private:
-        bool visitChar( char c );
-        void startNewMode( Mode mode );
-        bool processNoneChar( char c );
-        void processNameChar( char c );
-        bool processOtherChar( char c );
-        void endMode();
-        void escape();
-        bool isControlChar( char c ) const;
-        void saveLastMode();
-        void revertBackToLastMode();
-        void addFilter();
-        bool separate();
-
-        // Handles common preprocessing of the pattern for name/tag patterns
-        std::string preprocessPattern();
-        // Adds the current pattern as a test name
-        void addNamePattern();
-        // Adds the current pattern as a tag
-        void addTagPattern();
-
-        inline void addCharToPattern(char c) {
-            m_substring += c;
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-
-    };
-    TestSpec parseTestSpec( std::string const& arg );
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
-
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
-
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
-
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-
-        bool benchmarkNoAnalysis = false;
-        unsigned int benchmarkSamples = 100;
-        double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
-        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
-
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        double minDuration = -1;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
-
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
-    };
-
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
-
-        std::vector<std::string> const& getTestsOrTags() const override;
-        std::vector<std::string> const& getSectionsToRun() const override;
-
-        TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
-
-        bool showHelp() const;
-
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        double minDuration() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
-        bool benchmarkNoAnalysis() const override;
-        int benchmarkSamples() const override;
-        double benchmarkConfidenceInterval() const override;
-        unsigned int benchmarkResamples() const override;
-        std::chrono::milliseconds benchmarkWarmupTime() const override;
-
-    private:
-
-        IStream const* openStream();
-        ConfigData m_data;
-
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
-
-} // end namespace Catch
-
-// end catch_config.hpp
-// start catch_assertionresult.h
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// end catch_assertionresult.h
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_estimate.hpp
-
- // Statistics estimates
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate.hpp
-// start catch_outlier_classification.hpp
-
-// Outlier information
-
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
-
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_outlier_classification.hpp
-
-#include <iterator>
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-#include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <memory>
-#include <algorithm>
-
-namespace Catch {
-
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
-
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
-
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
-
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        bool shouldRedirectStdOut = false;
-        bool shouldReportAllAssertions = false;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-        virtual ~AssertionStats();
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
-
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
-
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-            return {
-                info,
-                std::move(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
-
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void reportInvalidArguments(std::string const&) {}
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& ) {}
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
-        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
-        virtual void benchmarkFailed( std::string const& ) {}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
-
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
-
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
-
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
-
-    //! Should the reporter show
-    bool shouldShowDuration( IConfig const& config, double duration );
-
-    std::string serializeFilters( std::vector<std::string> const& container );
-
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        ~StreamingReporterBase() override = default;
-
-        void noMatchingTestCases(std::string const&) override {}
-
-        void reportInvalidArguments(std::string const&) override {}
-
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
-
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
-
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
-
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
-
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
-
-        private:
-            SectionInfo const& m_other;
-        };
-
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
-
-        void testCaseStarting( TestCaseInfo const& ) override {}
-
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
-
-        void assertionStarting(AssertionInfo const&) override {}
-
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
-
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        void skipTest(TestCaseInfo const&) override {}
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
-
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
-
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved = false;
-    };
-
-    std::ostream& operator << ( std::ostream& os, Colour const& );
-
-} // end namespace Catch
-
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
-
-
-namespace Catch {
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-
-            std::string getDescription() const override {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            std::string getDescription() const override {
-                return std::string();
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
-
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#else // CATCH_CONFIG_DISABLE
-
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
-
-        using StreamingReporterBase::StreamingReporterBase;
-
-        ~CompactReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
-
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
-
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats<> const& stats) override;
-        void benchmarkFailed(std::string const& error) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-        void testRunStarting(TestRunInfo const& _testRunInfo) override;
-    private:
-
-        void lazyPrint();
-
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
-
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
-
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
-
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
-        void printTestFilters();
-
-    private:
-        bool m_headerPrinted = false;
-    };
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
-
-// start catch_xmlwriter.h
-
-#include <vector>
-
-namespace Catch {
-    enum class XmlFormatting {
-        None = 0x00,
-        Indent = 0x01,
-        Newline = 0x02,
-    };
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
-
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-            XmlFormatting m_fmt;
-        };
-
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        void writeStylesheetRef( std::string const& url );
-
-        XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void applyFormatting(XmlFormatting fmt);
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-}
-
-// end catch_xmlwriter.h
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
-
-        ~JunitReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& /*spec*/) override;
-
-        void testRunStarting(TestRunInfo const& runInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEndedCumulative() override;
-
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
-
-        void writeTestCase(TestCaseNode const& testCaseNode);
-
-        void writeSection( std::string const& className,
-                           std::string const& rootName,
-                           SectionNode const& sectionNode,
-                           bool testOkToFail );
-
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
-
-        ~XmlReporter() override;
-
-        static std::string getDescription();
-
-        virtual std::string getStylesheetRef() const;
-
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
-
-    public: // StreamingReporterBase
-
-        void noMatchingTestCases(std::string const& s) override;
-
-        void testRunStarting(TestRunInfo const& testInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
-
-        void sectionStarting(SectionInfo const& sectionInfo) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void sectionEnded(SectionStats const& sectionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEnded(TestRunStats const& testRunStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const&) override;
-        void benchmarkEnded(BenchmarkStats<> const&) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_xml.h
-
-// end catch_external_interfaces.h
-#endif
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_benchmarking_all.hpp
-
-// A proxy header that includes all of the benchmarking headers to allow
-// concise include of the benchmarking features. You should prefer the
-// individual includes in standard use.
-
-// start catch_benchmark.hpp
-
- // Benchmark
-
-// start catch_chronometer.hpp
-
-// User-facing chronometer
-
-
-// start catch_clock.hpp
-
-// Clocks
-
-
-#include <chrono>
-#include <ratio>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
-
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
-
-        using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_clock.hpp
-// start catch_optimizer.hpp
-
- // Hinting the optimizer
-
-
-#if defined(_MSC_VER)
-#   include <atomic> // atomic_thread_fence
-#endif
-
-namespace Catch {
-    namespace Benchmark {
-#if defined(__GNUC__) || defined(__clang__)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            asm volatile("" : : "g"(p) : "memory");
-        }
-        inline void keep_memory() {
-            asm volatile("" : : : "memory");
-        }
-
-        namespace Detail {
-            inline void optimizer_barrier() { keep_memory(); }
-        } // namespace Detail
-#elif defined(_MSC_VER)
-
-#pragma optimize("", off)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            // thanks @milleniumbug
-            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
-        }
-        // TODO equivalent keep_memory()
-#pragma optimize("", on)
-
-        namespace Detail {
-            inline void optimizer_barrier() {
-                std::atomic_thread_fence(std::memory_order_seq_cst);
-            }
-        } // namespace Detail
-
-#endif
-
-        template <typename T>
-        inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
-            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
-            std::forward<Fn>(fn) (std::forward<Args...>(args...));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_optimizer.hpp
-// start catch_complete_invoke.hpp
-
-// Invoke with a special case for void
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                    return {};
-                }
-            };
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
-            }
-
-            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
-            CATCH_TRY{
-                return Detail::complete_invoke(std::forward<Fun>(fun));
-            } CATCH_CATCH_ALL{
-                getResultCapture().benchmarkFailed(translateActiveException());
-                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
-            }
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_complete_invoke.hpp
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            struct ChronometerConcept {
-                virtual void start() = 0;
-                virtual void finish() = 0;
-                virtual ~ChronometerConcept() = default;
-            };
-            template <typename Clock>
-            struct ChronometerModel final : public ChronometerConcept {
-                void start() override { started = Clock::now(); }
-                void finish() override { finished = Clock::now(); }
-
-                ClockDuration<Clock> elapsed() const { return finished - started; }
-
-                TimePoint<Clock> started;
-                TimePoint<Clock> finished;
-            };
-        } // namespace Detail
-
-        struct Chronometer {
-        public:
-            template <typename Fun>
-            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
-
-            int runs() const { return k; }
-
-            Chronometer(Detail::ChronometerConcept& meter, int k)
-                : impl(&meter)
-                , k(k) {}
-
-        private:
-            template <typename Fun>
-            void measure(Fun&& fun, std::false_type) {
-                measure([&fun](int) { return fun(); }, std::true_type());
-            }
-
-            template <typename Fun>
-            void measure(Fun&& fun, std::true_type) {
-                Detail::optimizer_barrier();
-                impl->start();
-                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
-                impl->finish();
-                Detail::optimizer_barrier();
-            }
-
-            Detail::ChronometerConcept* impl;
-            int k;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_chronometer.hpp
-// start catch_environment.hpp
-
-// Environment information
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_environment.hpp
-// start catch_execution_plan.hpp
-
- // Execution plan
-
-
-// start catch_benchmark_function.hpp
-
- // Dumb std::function implementation for consistent call overhead
-
-
-#include <cassert>
-#include <type_traits>
-#include <utility>
-#include <memory>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            using Decay = typename std::decay<T>::type;
-            template <typename T, typename U>
-            struct is_related
-                : std::is_same<Decay<T>, Decay<U>> {};
-
-            /// We need to reinvent std::function because every piece of code that might add overhead
-            /// in a measurement context needs to have consistent performance characteristics so that we
-            /// can account for it in the measurement.
-            /// Implementations of std::function with optimizations that aren't always applicable, like
-            /// small buffer optimizations, are not uncommon.
-            /// This is effectively an implementation of std::function without any such optimizations;
-            /// it may be slow, but it is consistently slow.
-            struct BenchmarkFunction {
-            private:
-                struct callable {
-                    virtual void call(Chronometer meter) const = 0;
-                    virtual callable* clone() const = 0;
-                    virtual ~callable() = default;
-                };
-                template <typename Fun>
-                struct model : public callable {
-                    model(Fun&& fun) : fun(std::move(fun)) {}
-                    model(Fun const& fun) : fun(fun) {}
-
-                    model<Fun>* clone() const override { return new model<Fun>(*this); }
-
-                    void call(Chronometer meter) const override {
-                        call(meter, is_callable<Fun(Chronometer)>());
-                    }
-                    void call(Chronometer meter, std::true_type) const {
-                        fun(meter);
-                    }
-                    void call(Chronometer meter, std::false_type) const {
-                        meter.measure(fun);
-                    }
-
-                    Fun fun;
-                };
-
-                struct do_nothing { void operator()() const {} };
-
-                template <typename T>
-                BenchmarkFunction(model<T>* c) : f(c) {}
-
-            public:
-                BenchmarkFunction()
-                    : f(new model<do_nothing>{ {} }) {}
-
-                template <typename Fun,
-                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
-                    BenchmarkFunction(Fun&& fun)
-                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
-
-                BenchmarkFunction(BenchmarkFunction&& that)
-                    : f(std::move(that.f)) {}
-
-                BenchmarkFunction(BenchmarkFunction const& that)
-                    : f(that.f->clone()) {}
-
-                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
-                    f = std::move(that.f);
-                    return *this;
-                }
-
-                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
-                    f.reset(that.f->clone());
-                    return *this;
-                }
-
-                void operator()(Chronometer meter) const { f->call(meter); }
-
-            private:
-                std::unique_ptr<callable> f;
-            };
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_benchmark_function.hpp
-// start catch_repeat.hpp
-
-// repeat algorithm
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Fun>
-            struct repeater {
-                void operator()(int k) const {
-                    for (int i = 0; i < k; ++i) {
-                        fun();
-                    }
-                }
-                Fun fun;
-            };
-            template <typename Fun>
-            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
-                return { std::forward<Fun>(fun) };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_repeat.hpp
-// start catch_run_for_at_least.hpp
-
-// Run a function for a minimum amount of time
-
-
-// start catch_measure.hpp
-
-// Measure
-
-
-// start catch_timing.hpp
-
-// Timing
-
-
-#include <tuple>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration, typename Result>
-        struct Timing {
-            Duration elapsed;
-            Result result;
-            int iterations;
-        };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_timing.hpp
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
-                auto start = Clock::now();
-                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
-                auto end = Clock::now();
-                auto delta = end - start;
-                return { delta, std::forward<decltype(r)>(r), 1 };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_measure.hpp
-#include <utility>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
-                return Detail::measure<Clock>(fun, iters);
-            }
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
-                Detail::ChronometerModel<Clock> meter;
-                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
-
-                return { meter.elapsed(), std::move(result), iters };
-            }
-
-            template <typename Clock, typename Fun>
-            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
-
-            struct optimized_away_error : std::exception {
-                const char* what() const noexcept override {
-                    return "could not measure benchmark, maybe it was optimized away";
-                }
-            };
-
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
-                auto iters = seed;
-                while (iters < (1 << 30)) {
-                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
-
-                    if (Timing.elapsed >= how_long) {
-                        return { Timing.elapsed, std::move(Timing.result), iters };
-                    }
-                    iters *= 2;
-                }
-                Catch::throw_exception(optimized_away_error{});
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_run_for_at_least.hpp
-#include <algorithm>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct ExecutionPlan {
-            int iterations_per_sample;
-            Duration estimated_duration;
-            Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
-            int warmup_iterations;
-
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
-            template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
-                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
-                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
-                return times;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_execution_plan.hpp
-// start catch_estimate_clock.hpp
-
- // Environment measurement
-
-
-// start catch_stats.hpp
-
-// Statistical analysis tools
-
-
-#include <algorithm>
-#include <functional>
-#include <vector>
-#include <iterator>
-#include <numeric>
-#include <tuple>
-#include <cmath>
-#include <utility>
-#include <cstddef>
-#include <random>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            using sample = std::vector<double>;
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / count;
-            }
-
-            template <typename URng, typename Iterator, typename Estimator>
-            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
-                auto n = last - first;
-                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-                sample out;
-                out.reserve(resamples);
-                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-                    std::vector<double> resampled;
-                    resampled.reserve(n);
-                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
-                    return estimator(resampled.begin(), resampled.end());
-                });
-                std::sort(out.begin(), out.end());
-                return out;
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = last - first;
-                auto second = std::next(first);
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
-
-            double erfc_inv(double x);
-
-            double normal_quantile(double p);
-
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                int n = static_cast<int>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
-                // degenerate case with uniform samples
-                if (prob_n == 0) return { point, point, point, confidence_level };
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n](double x) -> int {
-                    return std::lround(normal_cdf(x) * n); };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = (std::max)(cumn(a1), 0);
-                auto hi = (std::min)(cumn(a2), n - 1);
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
-
-            struct bootstrap_analysis {
-                Estimate<double> mean;
-                Estimate<double> standard_deviation;
-                double outlier_variance;
-            };
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_stats.hpp
-#include <algorithm>
-#include <iterator>
-#include <tuple>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock>
-            std::vector<double> resolution(int k) {
-                std::vector<TimePoint<Clock>> times;
-                times.reserve(k + 1);
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
-
-                std::vector<double> deltas;
-                deltas.reserve(k);
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
-
-                return deltas;
-            }
-
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
-
-            template <typename Clock>
-            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
-                    .iterations;
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
-                    .result;
-                return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
-                };
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
-                auto time_limit = (std::min)(
-                    resolution * clock_cost_estimation_tick_limit,
-                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
-                auto time_clock = [](int k) {
-                    return Detail::measure<Clock>([k] {
-                        for (int i = 0; i < k; ++i) {
-                            volatile auto ignored = Clock::now();
-                            (void)ignored;
-                        }
-                    }).elapsed;
-                };
-                time_clock(1);
-                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
-                std::vector<double> times;
-                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
-                times.reserve(nsamples);
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
-                return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
-                };
-            }
-
-            template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
-                static Environment<FloatDuration<Clock>>* env = nullptr;
-                if (env) {
-                    return *env;
-                }
-
-                auto iters = Detail::warmup<Clock>();
-                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
-                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
-
-                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
-                return *env;
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate_clock.hpp
-// start catch_analyse.hpp
-
- // Run and analyse one benchmark
-
-
-// start catch_sample_analysis.hpp
-
-// Benchmark results
-
-
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
-            OutlierClassification outliers;
-            double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    std::move(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_sample_analysis.hpp
-#include <algorithm>
-#include <iterator>
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(last - first);
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        std::move(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(last - first);
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        std::move(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_analyse.hpp
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        struct Benchmark {
-            Benchmark(std::string &&name)
-                : name(std::move(name)) {}
-
-            template <class FUN>
-            Benchmark(std::string &&name, FUN &&func)
-                : fun(std::move(func)), name(std::move(name)) {}
-
-            template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
-                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
-                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
-            }
-
-            template <typename Clock = default_clock>
-            void run() {
-                IConfigPtr cfg = getCurrentContext().getConfig();
-
-                auto env = Detail::measure_environment<Clock>();
-
-                getResultCapture().benchmarkPreparing(name);
-                CATCH_TRY{
-                    auto plan = user_code([&] {
-                        return prepare<Clock>(*cfg, env);
-                    });
-
-                    BenchmarkInfo info {
-                        name,
-                        plan.estimated_duration.count(),
-                        plan.iterations_per_sample,
-                        cfg->benchmarkSamples(),
-                        cfg->benchmarkResamples(),
-                        env.clock_resolution.mean.count(),
-                        env.clock_cost.mean.count()
-                    };
-
-                    getResultCapture().benchmarkStarting(info);
-
-                    auto samples = user_code([&] {
-                        return plan.template run<Clock>(*cfg, env);
-                    });
-
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
-                    getResultCapture().benchmarkEnded(stats);
-
-                } CATCH_CATCH_ALL{
-                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
-                        std::rethrow_exception(std::current_exception());
-                }
-            }
-
-            // sets lambda to be used in fun *and* executes benchmark!
-            template <typename Fun,
-                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
-                Benchmark & operator=(Fun func) {
-                fun = Detail::BenchmarkFunction(func);
-                run();
-                return *this;
-            }
-
-            explicit operator bool() {
-                return true;
-            }
-
-        private:
-            Detail::BenchmarkFunction fun;
-            std::string name;
-        };
-    }
-} // namespace Catch
-
-#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
-#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
-
-#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&](int benchmarkIndex)
-
-#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&]
-
-// end catch_benchmark.hpp
-// start catch_constructor.hpp
-
-// Constructor and destructor helpers
-
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T, bool Destruct>
-            struct ObjectStorage
-            {
-                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
-
-                ObjectStorage() : data() {}
-
-                ObjectStorage(const ObjectStorage& other)
-                {
-                    new(&data) T(other.stored_object());
-                }
-
-                ObjectStorage(ObjectStorage&& other)
-                {
-                    new(&data) T(std::move(other.stored_object()));
-                }
-
-                ~ObjectStorage() { destruct_on_exit<T>(); }
-
-                template <typename... Args>
-                void construct(Args&&... args)
-                {
-                    new (&data) T(std::forward<Args>(args)...);
-                }
-
-                template <bool AllowManualDestruction = !Destruct>
-                typename std::enable_if<AllowManualDestruction>::type destruct()
-                {
-                    stored_object().~T();
-                }
-
-            private:
-                // If this is a constructor benchmark, destruct the underlying object
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
-                // Otherwise, don't
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
-
-                T& stored_object() {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                T const& stored_object() const {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                TStorage data;
-            };
-        }
-
-        template <typename T>
-        using storage_for = Detail::ObjectStorage<T, true>;
-
-        template <typename T>
-        using destructable_object = Detail::ObjectStorage<T, false>;
-    }
-}
-
-// end catch_constructor.hpp
-// end catch_benchmarking_all.hpp
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#ifdef CATCH_IMPL
-// start catch_impl.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// Keep these here for external reporters
-// start catch_test_case_tracker.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct NameAndLocation {
-        std::string name;
-        SourceLineInfo location;
-
-        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
-        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
-            return lhs.name == rhs.name
-                && lhs.location == rhs.location;
-        }
-    };
-
-    class ITracker;
-
-    using ITrackerPtr = std::shared_ptr<ITracker>;
-
-    class  ITracker {
-        NameAndLocation m_nameAndLocation;
-
-    public:
-        ITracker(NameAndLocation const& nameAndLoc) :
-            m_nameAndLocation(nameAndLoc)
-        {}
-
-        // static queries
-        NameAndLocation const& nameAndLocation() const {
-            return m_nameAndLocation;
-        }
-
-        virtual ~ITracker();
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-        virtual bool hasStarted() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( ITrackerPtr const& child ) = 0;
-        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isGeneratorTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        ITrackerPtr m_rootTracker;
-        ITracker* m_currentTracker = nullptr;
-        RunState m_runState = NotStarted;
-
-    public:
-
-        ITracker& startRun();
-        void endRun();
-
-        void startCycle();
-        void completeCycle();
-
-        bool completedCycle() const;
-        ITracker& currentTracker();
-        void setCurrentTracker( ITracker* tracker );
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-
-        using Children = std::vector<ITrackerPtr>;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState = NotStarted;
-
-    public:
-        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isComplete() const override;
-        bool isSuccessfullyCompleted() const override;
-        bool isOpen() const override;
-        bool hasChildren() const override;
-        bool hasStarted() const override {
-            return m_runState != NotStarted;
-        }
-
-        void addChild( ITrackerPtr const& child ) override;
-
-        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
-        ITracker& parent() override;
-
-        void openChild() override;
-
-        bool isSectionTracker() const override;
-        bool isGeneratorTracker() const override;
-
-        void open();
-
-        void close() override;
-        void fail() override;
-        void markAsNeedingAnotherRun() override;
-
-    private:
-        void moveToParent();
-        void moveToThis();
-    };
-
-    class SectionTracker : public TrackerBase {
-        std::vector<std::string> m_filters;
-        std::string m_trimmed_name;
-    public:
-        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isSectionTracker() const override;
-
-        bool isComplete() const override;
-
-        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
-
-        void tryOpen();
-
-        void addInitialFilters( std::vector<std::string> const& filters );
-        void addNextFilters( std::vector<std::string> const& filters );
-        //! Returns filters active in this tracker
-        std::vector<std::string> const& getFilters() const;
-        //! Returns whitespace-trimmed name of the tracked section
-        std::string const& trimmedName() const;
-    };
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-// end catch_test_case_tracker.h
-
-// start catch_leak_detector.h
-
-namespace Catch {
-
-    struct LeakDetector {
-        LeakDetector();
-        ~LeakDetector();
-    };
-
-}
-// end catch_leak_detector.h
-// Cpp files will be included in the single-header file here
-// start catch_stats.cpp
-
-// Statistical analysis tools
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-
-#include <cassert>
-#include <random>
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-#include <future>
-#endif
-
-namespace {
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
-            double diff = b - m;
-            return a + diff * diff;
-            }) / (last - first);
-            return std::sqrt(variance);
-    }
-
-}
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                auto count = last - first;
-                double idx = (count - 1) * k / static_cast<double>(q);
-                int j = static_cast<int>(idx);
-                double g = idx - j;
-                std::nth_element(first, first + j, last);
-                auto xj = first[j];
-                if (g == 0) return xj;
-
-                auto xj1 = *std::min_element(first + (j + 1), last);
-                return xj + g * (xj1 - xj);
-            }
-
-            double erfc_inv(double x) {
-                return erf_inv(1.0 - x);
-            }
-
-            double normal_quantile(double p) {
-                static const double ROOT_TWO = std::sqrt(2.0);
-
-                double result = 0.0;
-                assert(p >= 0 && p <= 1);
-                if (p < 0 || p > 1) {
-                    return result;
-                }
-
-                result = -erfc_inv(2.0 * p);
-                // result *= normal distribution standard deviation (1.0) * sqrt(2)
-                result *= /*sd * */ ROOT_TWO;
-                // result += normal disttribution mean (0)
-                return result;
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
-                };
-
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
-
-                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
-                auto stddev = &standard_deviation;
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
-                        auto resampled = resample(rng, n_resamples, first, last, f);
-                        return bootstrap(confidence_level, first, last, resampled, f);
-                    });
-                };
-
-                auto mean_future = Estimate(mean);
-                auto stddev_future = Estimate(stddev);
-
-                auto mean_estimate = mean_future.get();
-                auto stddev_estimate = stddev_future.get();
-#else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
-                    auto resampled = resample(rng, n_resamples, first, last, f);
-                    return bootstrap(confidence_level, first, last, resampled, f);
-                };
-
-                auto mean_estimate = Estimate(mean);
-                auto stddev_estimate = Estimate(stddev);
-#endif // CATCH_USE_ASYNC
-
-                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
-
-                return { mean_estimate, stddev_estimate, outlier_variance };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-// end catch_stats.cpp
-// start catch_approx.cpp
-
-#include <cmath>
-#include <limits>
-
-namespace {
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-}
-
-namespace Catch {
-namespace Detail {
-
-    Approx::Approx ( double value )
-    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-        m_margin( 0.0 ),
-        m_scale( 0.0 ),
-        m_value( value )
-    {}
-
-    Approx Approx::custom() {
-        return Approx( 0 );
-    }
-
-    Approx Approx::operator-() const {
-        auto temp(*this);
-        temp.m_value = -temp.m_value;
-        return temp;
-    }
-
-    std::string Approx::toString() const {
-        ReusableStringStream rss;
-        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
-        return rss.str();
-    }
-
-    bool Approx::equalityComparisonImpl(const double other) const {
-        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
-        // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin)
-            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
-    }
-
-    void Approx::setMargin(double newMargin) {
-        CATCH_ENFORCE(newMargin >= 0,
-            "Invalid Approx::margin: " << newMargin << '.'
-            << " Approx::Margin has to be non-negative.");
-        m_margin = newMargin;
-    }
-
-    void Approx::setEpsilon(double newEpsilon) {
-        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
-            "Invalid Approx::epsilon: " << newEpsilon << '.'
-            << " Approx::epsilon has to be in [0, 1]");
-        m_epsilon = newEpsilon;
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_debugger.h
-
-namespace Catch {
-    bool isDebuggerActive();
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #endif
-
-#elif defined(CATCH_PLATFORM_IPHONE)
-
-    // use inline assembler
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP()  __asm__("int $3")
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #elif defined(__arm__) && !defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
-    #elif defined(__arm__) &&  defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xde01")
-    #endif
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    // If we can use inline assembler, do it because this allows us to break
-    // directly at the location of the failing check instead of breaking inside
-    // raise() called from it, i.e. one stack frame below.
-    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
-    #else // Fall back to the generic way.
-        #include <signal.h>
-
-        #define CATCH_TRAP() raise(SIGTRAP)
-    #endif
-#elif defined(_MSC_VER)
-    #define CATCH_TRAP() __debugbreak()
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_TRAP() DebugBreak()
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-    #ifdef CATCH_TRAP
-        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
-    #else
-        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
-    #endif
-#endif
-
-// end catch_debugger.h
-// start catch_run_context.h
-
-// start catch_fatal_condition.h
-
-#include <cassert>
-
-namespace Catch {
-
-    // Wrapper for platform-specific fatal error (signals/SEH) handlers
-    //
-    // Tries to be cooperative with other handlers, and not step over
-    // other handlers. This means that unknown structured exceptions
-    // are passed on, previous signal handlers are called, and so on.
-    //
-    // Can only be instantiated once, and assumes that once a signal
-    // is caught, the binary will end up terminating. Thus, there
-    class FatalConditionHandler {
-        bool m_started = false;
-
-        // Install/disengage implementation for specific platform.
-        // Should be if-defed to work on current platform, can assume
-        // engage-disengage 1:1 pairing.
-        void engage_platform();
-        void disengage_platform();
-    public:
-        // Should also have platform-specific implementations as needed
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-
-        void engage() {
-            assert(!m_started && "Handler cannot be installed twice.");
-            m_started = true;
-            engage_platform();
-        }
-
-        void disengage() {
-            assert(m_started && "Handler cannot be uninstalled without being installed first");
-            m_started = false;
-            disengage_platform();
-        }
-    };
-
-    //! Simple RAII guard for (dis)engaging the FatalConditionHandler
-    class FatalConditionHandlerGuard {
-        FatalConditionHandler* m_handler;
-    public:
-        FatalConditionHandlerGuard(FatalConditionHandler* handler):
-            m_handler(handler) {
-            m_handler->engage();
-        }
-        ~FatalConditionHandlerGuard() {
-            m_handler->disengage();
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_fatal_condition.h
-#include <string>
-
-namespace Catch {
-
-    struct IMutableContext;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-    public:
-        RunContext( RunContext const& ) = delete;
-        RunContext& operator =( RunContext const& ) = delete;
-
-        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
-
-        ~RunContext() override;
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
-
-        Totals runTest(TestCase const& testCase);
-
-        IConfigPtr config() const;
-        IStreamingReporter& reporter() const;
-
-    public: // IResultCapture
-
-        // Assertion handlers
-        void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) override;
-        void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) override;
-        void handleIncomplete
-                (   AssertionInfo const& info ) override;
-        void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) override;
-
-        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
-
-        void sectionEnded( SectionEndInfo const& endInfo ) override;
-        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
-
-        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing( std::string const& name ) override;
-        void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
-        void benchmarkFailed( std::string const& error ) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
-
-        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
-
-        std::string getCurrentTestName() const override;
-
-        const AssertionResult* getLastResult() const override;
-
-        void exceptionEarlyReported() override;
-
-        void handleFatalErrorCondition( StringRef message ) override;
-
-        bool lastAssertionPassed() override;
-
-        void assertionPassed() override;
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const final;
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
-        void invokeActiveTestCase();
-
-        void resetAssertionInfo();
-        bool testForMissingAssertions( Counts& assertions );
-
-        void assertionEnded( AssertionResult const& result );
-        void reportExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    ITransientExpression const *expr,
-                    bool negated );
-
-        void populateReaction( AssertionReaction& reaction );
-
-    private:
-
-        void handleUnfinishedSections();
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
-
-        IConfigPtr m_config;
-        Totals m_totals;
-        IStreamingReporterPtr m_reporter;
-        std::vector<MessageInfo> m_messages;
-        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-        FatalConditionHandler m_fatalConditionhandler;
-        bool m_lastAssertionPassed = false;
-        bool m_shouldReportUnexpected = true;
-        bool m_includeSuccessfulResults;
-    };
-
-    void seedRng(IConfig const& config);
-    unsigned int rngSeed();
-} // end namespace Catch
-
-// end catch_run_context.h
-namespace Catch {
-
-    namespace {
-        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
-            expr.streamReconstructedExpression( os );
-            return os;
-        }
-    }
-
-    LazyExpression::LazyExpression( bool isNegated )
-    :   m_isNegated( isNegated )
-    {}
-
-    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
-
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
-    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
-        if( lazyExpr.m_isNegated )
-            os << "!";
-
-        if( lazyExpr ) {
-            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
-                os << "(" << *lazyExpr.m_transientExpression << ")";
-            else
-                os << *lazyExpr.m_transientExpression;
-        }
-        else {
-            os << "{** error - unchecked empty expression requested **}";
-        }
-        return os;
-    }
-
-    AssertionHandler::AssertionHandler
-        (   StringRef const& macroName,
-            SourceLineInfo const& lineInfo,
-            StringRef capturedExpression,
-            ResultDisposition::Flags resultDisposition )
-    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
-        m_resultCapture( getResultCapture() )
-    {}
-
-    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
-        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
-    }
-    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
-        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
-    }
-
-    auto AssertionHandler::allowThrows() const -> bool {
-        return getCurrentContext().getConfig()->allowThrows();
-    }
-
-    void AssertionHandler::complete() {
-        setCompleted();
-        if( m_reaction.shouldDebugBreak ) {
-
-            // If you find your debugger stopping you here then go one level up on the
-            // call-stack for the code that caused it (typically a failed assertion)
-
-            // (To go back to the test and change execution, jump over the throw, next)
-            CATCH_BREAK_INTO_DEBUGGER();
-        }
-        if (m_reaction.shouldThrow) {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-            throw Catch::TestFailureException();
-#else
-            CATCH_ERROR( "Test failure requires aborting test!" );
-#endif
-        }
-    }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
-
-    void AssertionHandler::handleUnexpectedInflightException() {
-        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
-    }
-
-    void AssertionHandler::handleExceptionThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-    void AssertionHandler::handleExceptionNotThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
-        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
-    }
-
-    void AssertionHandler::handleThrowingCallSkipped() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    // This is the overload that takes a string and infers the Equals matcher from it
-    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
-        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
-    }
-
-} // namespace Catch
-// end catch_assertionhandler.cpp
-// start catch_assertionresult.cpp
-
-namespace Catch {
-    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
-        lazyExpression(_lazyExpression),
-        resultType(_resultType) {}
-
-    std::string AssertionResultData::reconstructExpression() const {
-
-        if( reconstructedExpression.empty() ) {
-            if( lazyExpression ) {
-                ReusableStringStream rss;
-                rss << lazyExpression;
-                reconstructedExpression = rss.str();
-            }
-        }
-        return reconstructedExpression;
-    }
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        // Possibly overallocating by 3 characters should be basically free
-        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += "!(";
-        }
-        expr += m_info.capturedExpression;
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += ')';
-        }
-        return expr;
-    }
-
-    std::string AssertionResult::getExpressionInMacro() const {
-        std::string expr;
-        if( m_info.macroName.empty() )
-            expr = static_cast<std::string>(m_info.capturedExpression);
-        else {
-            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-            expr += m_info.macroName;
-            expr += "( ";
-            expr += m_info.capturedExpression;
-            expr += " )";
-        }
-        return expr;
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        std::string expr = m_resultData.reconstructExpression();
-        return expr.empty()
-                ? getExpression()
-                : expr;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    StringRef AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-// end catch_assertionresult.cpp
-// start catch_capture_matchers.cpp
-
-namespace Catch {
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    // This is the general overload that takes a any string matcher
-    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
-    // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
-        std::string exceptionMessage = Catch::translateActiveException();
-        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
-        handler.handleExpr( expr );
-    }
-
-} // namespace Catch
-// end catch_capture_matchers.cpp
-// start catch_commandline.cpp
-
-// start catch_commandline.h
-
-// start catch_clara.h
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#endif
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-// start clara.hpp
-// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See https://github.com/philsquared/Clara for more details
-
-// Clara v1.1.5
-
-
-#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#ifndef CLARA_CONFIG_OPTIONAL_TYPE
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#include <optional>
-#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
-#endif
-#endif
-#endif
-
-// ----------- #included from clara_textflow.hpp -----------
-
-// TextFlowCpp
-//
-// A single-header library for wrapping and laying out basic text, by Phil Nash
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// This project is hosted at https://github.com/philsquared/textflowcpp
-
-
-#include <cassert>
-#include <ostream>
-#include <sstream>
-#include <vector>
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-namespace clara {
-namespace TextFlow {
-
-inline auto isWhitespace(char c) -> bool {
-	static std::string chars = " \t\n\r";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableBefore(char c) -> bool {
-	static std::string chars = "[({<|";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableAfter(char c) -> bool {
-	static std::string chars = "])}>.,:;*+-=&/\\";
-	return chars.find(c) != std::string::npos;
-}
-
-class Columns;
-
-class Column {
-	std::vector<std::string> m_strings;
-	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-	size_t m_indent = 0;
-	size_t m_initialIndent = std::string::npos;
-
-public:
-	class iterator {
-		friend Column;
-
-		Column const& m_column;
-		size_t m_stringIndex = 0;
-		size_t m_pos = 0;
-
-		size_t m_len = 0;
-		size_t m_end = 0;
-		bool m_suffix = false;
-
-		iterator(Column const& column, size_t stringIndex)
-			: m_column(column),
-			m_stringIndex(stringIndex) {}
-
-		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-		auto isBoundary(size_t at) const -> bool {
-			assert(at > 0);
-			assert(at <= line().size());
-
-			return at == line().size() ||
-				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
-				isBreakableBefore(line()[at]) ||
-				isBreakableAfter(line()[at - 1]);
-		}
-
-		void calcLength() {
-			assert(m_stringIndex < m_column.m_strings.size());
-
-			m_suffix = false;
-			auto width = m_column.m_width - indent();
-			m_end = m_pos;
-			if (line()[m_pos] == '\n') {
-				++m_end;
-			}
-			while (m_end < line().size() && line()[m_end] != '\n')
-				++m_end;
-
-			if (m_end < m_pos + width) {
-				m_len = m_end - m_pos;
-			} else {
-				size_t len = width;
-				while (len > 0 && !isBoundary(m_pos + len))
-					--len;
-				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
-					--len;
-
-				if (len > 0) {
-					m_len = len;
-				} else {
-					m_suffix = true;
-					m_len = width - 1;
-				}
-			}
-		}
-
-		auto indent() const -> size_t {
-			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-			return initial == std::string::npos ? m_column.m_indent : initial;
-		}
-
-		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Column const& column) : m_column(column) {
-			assert(m_column.m_width > m_column.m_indent);
-			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
-			calcLength();
-			if (m_len == 0)
-				m_stringIndex++; // Empty string
-		}
-
-		auto operator *() const -> std::string {
-			assert(m_stringIndex < m_column.m_strings.size());
-			assert(m_pos <= m_end);
-			return addIndentAndSuffix(line().substr(m_pos, m_len));
-		}
-
-		auto operator ++() -> iterator& {
-			m_pos += m_len;
-			if (m_pos < line().size() && line()[m_pos] == '\n')
-				m_pos += 1;
-			else
-				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
-					++m_pos;
-
-			if (m_pos == line().size()) {
-				m_pos = 0;
-				++m_stringIndex;
-			}
-			if (m_stringIndex < m_column.m_strings.size())
-				calcLength();
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return
-				m_pos == other.m_pos &&
-				m_stringIndex == other.m_stringIndex &&
-				&m_column == &other.m_column;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return !operator==(other);
-		}
-	};
-	using const_iterator = iterator;
-
-	explicit Column(std::string const& text) { m_strings.push_back(text); }
-
-	auto width(size_t newWidth) -> Column& {
-		assert(newWidth > 0);
-		m_width = newWidth;
-		return *this;
-	}
-	auto indent(size_t newIndent) -> Column& {
-		m_indent = newIndent;
-		return *this;
-	}
-	auto initialIndent(size_t newIndent) -> Column& {
-		m_initialIndent = newIndent;
-		return *this;
-	}
-
-	auto width() const -> size_t { return m_width; }
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
-		bool first = true;
-		for (auto line : col) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto operator + (Column const& other)->Columns;
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-class Spacer : public Column {
-
-public:
-	explicit Spacer(size_t spaceWidth) : Column("") {
-		width(spaceWidth);
-	}
-};
-
-class Columns {
-	std::vector<Column> m_columns;
-
-public:
-
-	class iterator {
-		friend Columns;
-		struct EndTag {};
-
-		std::vector<Column> const& m_columns;
-		std::vector<Column::iterator> m_iterators;
-		size_t m_activeIterators;
-
-		iterator(Columns const& columns, EndTag)
-			: m_columns(columns.m_columns),
-			m_activeIterators(0) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.end());
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Columns const& columns)
-			: m_columns(columns.m_columns),
-			m_activeIterators(m_columns.size()) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.begin());
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return m_iterators == other.m_iterators;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return m_iterators != other.m_iterators;
-		}
-		auto operator *() const -> std::string {
-			std::string row, padding;
-
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				auto width = m_columns[i].width();
-				if (m_iterators[i] != m_columns[i].end()) {
-					std::string col = *m_iterators[i];
-					row += padding + col;
-					if (col.size() < width)
-						padding = std::string(width - col.size(), ' ');
-					else
-						padding = "";
-				} else {
-					padding += std::string(width, ' ');
-				}
-			}
-			return row;
-		}
-		auto operator ++() -> iterator& {
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				if (m_iterators[i] != m_columns[i].end())
-					++m_iterators[i];
-			}
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-	};
-	using const_iterator = iterator;
-
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
-
-	auto operator += (Column const& col) -> Columns& {
-		m_columns.push_back(col);
-		return *this;
-	}
-	auto operator + (Column const& col) -> Columns {
-		Columns combined = *this;
-		combined += col;
-		return combined;
-	}
-
-	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
-
-		bool first = true;
-		for (auto line : cols) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-inline auto Column::operator + (Column const& other) -> Columns {
-	Columns cols;
-	cols += *this;
-	cols += other;
-	return cols;
-}
-}
-
-}
-}
-
-// ----------- end of #include from clara_textflow.hpp -----------
-// ........... back in clara.hpp
-
-#include <cctype>
-#include <string>
-#include <memory>
-#include <set>
-#include <algorithm>
-
-#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-namespace Catch { namespace clara {
-namespace detail {
-
-    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
-    template<typename L>
-    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
-
-    template<typename ClassT, typename ReturnT, typename... Args>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
-        static const bool isValid = false;
-    };
-
-    template<typename ClassT, typename ReturnT, typename ArgT>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
-        static const bool isValid = true;
-        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
-        using ReturnType = ReturnT;
-    };
-
-    class TokenStream;
-
-    // Transport for raw args (copied from main args, or supplied via init list for testing)
-    class Args {
-        friend TokenStream;
-        std::string m_exeName;
-        std::vector<std::string> m_args;
-
-    public:
-        Args( int argc, char const* const* argv )
-            : m_exeName(argv[0]),
-              m_args(argv + 1, argv + argc) {}
-
-        Args( std::initializer_list<std::string> args )
-        :   m_exeName( *args.begin() ),
-            m_args( args.begin()+1, args.end() )
-        {}
-
-        auto exeName() const -> std::string {
-            return m_exeName;
-        }
-    };
-
-    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
-    // may encode an option + its argument if the : or = form is used
-    enum class TokenType {
-        Option, Argument
-    };
-    struct Token {
-        TokenType type;
-        std::string token;
-    };
-
-    inline auto isOptPrefix( char c ) -> bool {
-        return c == '-'
-#ifdef CATCH_PLATFORM_WINDOWS
-            || c == '/'
-#endif
-        ;
-    }
-
-    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
-    class TokenStream {
-        using Iterator = std::vector<std::string>::const_iterator;
-        Iterator it;
-        Iterator itEnd;
-        std::vector<Token> m_tokenBuffer;
-
-        void loadBuffer() {
-            m_tokenBuffer.resize( 0 );
-
-            // Skip any empty strings
-            while( it != itEnd && it->empty() )
-                ++it;
-
-            if( it != itEnd ) {
-                auto const &next = *it;
-                if( isOptPrefix( next[0] ) ) {
-                    auto delimiterPos = next.find_first_of( " :=" );
-                    if( delimiterPos != std::string::npos ) {
-                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
-                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
-                    } else {
-                        if( next[1] != '-' && next.size() > 2 ) {
-                            std::string opt = "- ";
-                            for( size_t i = 1; i < next.size(); ++i ) {
-                                opt[1] = next[i];
-                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
-                            }
-                        } else {
-                            m_tokenBuffer.push_back( { TokenType::Option, next } );
-                        }
-                    }
-                } else {
-                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
-                }
-            }
-        }
-
-    public:
-        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
-
-        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
-            loadBuffer();
-        }
-
-        explicit operator bool() const {
-            return !m_tokenBuffer.empty() || it != itEnd;
-        }
-
-        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
-
-        auto operator*() const -> Token {
-            assert( !m_tokenBuffer.empty() );
-            return m_tokenBuffer.front();
-        }
-
-        auto operator->() const -> Token const * {
-            assert( !m_tokenBuffer.empty() );
-            return &m_tokenBuffer.front();
-        }
-
-        auto operator++() -> TokenStream & {
-            if( m_tokenBuffer.size() >= 2 ) {
-                m_tokenBuffer.erase( m_tokenBuffer.begin() );
-            } else {
-                if( it != itEnd )
-                    ++it;
-                loadBuffer();
-            }
-            return *this;
-        }
-    };
-
-    class ResultBase {
-    public:
-        enum Type {
-            Ok, LogicError, RuntimeError
-        };
-
-    protected:
-        ResultBase( Type type ) : m_type( type ) {}
-        virtual ~ResultBase() = default;
-
-        virtual void enforceOk() const = 0;
-
-        Type m_type;
-    };
-
-    template<typename T>
-    class ResultValueBase : public ResultBase {
-    public:
-        auto value() const -> T const & {
-            enforceOk();
-            return m_value;
-        }
-
-    protected:
-        ResultValueBase( Type type ) : ResultBase( type ) {}
-
-        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-        }
-
-        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
-            new( &m_value ) T( value );
-        }
-
-        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
-            if( m_type == ResultBase::Ok )
-                m_value.~T();
-            ResultBase::operator=(other);
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-            return *this;
-        }
-
-        ~ResultValueBase() override {
-            if( m_type == Ok )
-                m_value.~T();
-        }
-
-        union {
-            T m_value;
-        };
-    };
-
-    template<>
-    class ResultValueBase<void> : public ResultBase {
-    protected:
-        using ResultBase::ResultBase;
-    };
-
-    template<typename T = void>
-    class BasicResult : public ResultValueBase<T> {
-    public:
-        template<typename U>
-        explicit BasicResult( BasicResult<U> const &other )
-        :   ResultValueBase<T>( other.type() ),
-            m_errorMessage( other.errorMessage() )
-        {
-            assert( type() != ResultBase::Ok );
-        }
-
-        template<typename U>
-        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
-        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
-        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
-        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
-
-        explicit operator bool() const { return m_type == ResultBase::Ok; }
-        auto type() const -> ResultBase::Type { return m_type; }
-        auto errorMessage() const -> std::string { return m_errorMessage; }
-
-    protected:
-        void enforceOk() const override {
-
-            // Errors shouldn't reach this point, but if they do
-            // the actual error message will be in m_errorMessage
-            assert( m_type != ResultBase::LogicError );
-            assert( m_type != ResultBase::RuntimeError );
-            if( m_type != ResultBase::Ok )
-                std::abort();
-        }
-
-        std::string m_errorMessage; // Only populated if resultType is an error
-
-        BasicResult( ResultBase::Type type, std::string const &message )
-        :   ResultValueBase<T>(type),
-            m_errorMessage(message)
-        {
-            assert( m_type != ResultBase::Ok );
-        }
-
-        using ResultValueBase<T>::ResultValueBase;
-        using ResultBase::m_type;
-    };
-
-    enum class ParseResultType {
-        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
-    };
-
-    class ParseState {
-    public:
-
-        ParseState( ParseResultType type, TokenStream const &remainingTokens )
-        : m_type(type),
-          m_remainingTokens( remainingTokens )
-        {}
-
-        auto type() const -> ParseResultType { return m_type; }
-        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
-
-    private:
-        ParseResultType m_type;
-        TokenStream m_remainingTokens;
-    };
-
-    using Result = BasicResult<void>;
-    using ParserResult = BasicResult<ParseResultType>;
-    using InternalParseResult = BasicResult<ParseState>;
-
-    struct HelpColumns {
-        std::string left;
-        std::string right;
-    };
-
-    template<typename T>
-    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
-        std::stringstream ss;
-        ss << source;
-        ss >> target;
-        if( ss.fail() )
-            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
-        else
-            return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
-        target = source;
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
-        std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
-        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
-            target = true;
-        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
-            target = false;
-        else
-            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-#ifdef CLARA_CONFIG_OPTIONAL_TYPE
-    template<typename T>
-    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
-        T temp;
-        auto result = convertInto( source, temp );
-        if( result )
-            target = std::move(temp);
-        return result;
-    }
-#endif // CLARA_CONFIG_OPTIONAL_TYPE
-
-    struct NonCopyable {
-        NonCopyable() = default;
-        NonCopyable( NonCopyable const & ) = delete;
-        NonCopyable( NonCopyable && ) = delete;
-        NonCopyable &operator=( NonCopyable const & ) = delete;
-        NonCopyable &operator=( NonCopyable && ) = delete;
-    };
-
-    struct BoundRef : NonCopyable {
-        virtual ~BoundRef() = default;
-        virtual auto isContainer() const -> bool { return false; }
-        virtual auto isFlag() const -> bool { return false; }
-    };
-    struct BoundValueRefBase : BoundRef {
-        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
-    };
-    struct BoundFlagRefBase : BoundRef {
-        virtual auto setFlag( bool flag ) -> ParserResult = 0;
-        virtual auto isFlag() const -> bool { return true; }
-    };
-
-    template<typename T>
-    struct BoundValueRef : BoundValueRefBase {
-        T &m_ref;
-
-        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return convertInto( arg, m_ref );
-        }
-    };
-
-    template<typename T>
-    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
-        std::vector<T> &m_ref;
-
-        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
-
-        auto isContainer() const -> bool override { return true; }
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            T temp;
-            auto result = convertInto( arg, temp );
-            if( result )
-                m_ref.push_back( temp );
-            return result;
-        }
-    };
-
-    struct BoundFlagRef : BoundFlagRefBase {
-        bool &m_ref;
-
-        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            m_ref = flag;
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ReturnType>
-    struct LambdaInvoker {
-        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
-
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            return lambda( arg );
-        }
-    };
-
-    template<>
-    struct LambdaInvoker<void> {
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            lambda( arg );
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ArgType, typename L>
-    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
-        ArgType temp{};
-        auto result = convertInto( arg, temp );
-        return !result
-           ? result
-           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
-    }
-
-    template<typename L>
-    struct BoundLambda : BoundValueRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
-        }
-    };
-
-    template<typename L>
-    struct BoundFlagLambda : BoundFlagRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
-
-        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
-        }
-    };
-
-    enum class Optionality { Optional, Required };
-
-    struct Parser;
-
-    class ParserBase {
-    public:
-        virtual ~ParserBase() = default;
-        virtual auto validate() const -> Result { return Result::ok(); }
-        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
-        virtual auto cardinality() const -> size_t { return 1; }
-
-        auto parse( Args const &args ) const -> InternalParseResult {
-            return parse( args.exeName(), TokenStream( args ) );
-        }
-    };
-
-    template<typename DerivedT>
-    class ComposableParserImpl : public ParserBase {
-    public:
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser;
-
-		template<typename T>
-        auto operator+( T const &other ) const -> Parser;
-    };
-
-    // Common code and state for Args and Opts
-    template<typename DerivedT>
-    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
-    protected:
-        Optionality m_optionality = Optionality::Optional;
-        std::shared_ptr<BoundRef> m_ref;
-        std::string m_hint;
-        std::string m_description;
-
-        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
-
-    public:
-        template<typename T>
-        ParserRefImpl( T &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
-            m_hint( hint )
-        {}
-
-        template<typename LambdaT>
-        ParserRefImpl( LambdaT const &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
-            m_hint(hint)
-        {}
-
-        auto operator()( std::string const &description ) -> DerivedT & {
-            m_description = description;
-            return static_cast<DerivedT &>( *this );
-        }
-
-        auto optional() -> DerivedT & {
-            m_optionality = Optionality::Optional;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto required() -> DerivedT & {
-            m_optionality = Optionality::Required;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto isOptional() const -> bool {
-            return m_optionality == Optionality::Optional;
-        }
-
-        auto cardinality() const -> size_t override {
-            if( m_ref->isContainer() )
-                return 0;
-            else
-                return 1;
-        }
-
-        auto hint() const -> std::string { return m_hint; }
-    };
-
-    class ExeName : public ComposableParserImpl<ExeName> {
-        std::shared_ptr<std::string> m_name;
-        std::shared_ptr<BoundValueRefBase> m_ref;
-
-        template<typename LambdaT>
-        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
-            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
-        }
-
-    public:
-        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
-
-        explicit ExeName( std::string &ref ) : ExeName() {
-            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
-        }
-
-        template<typename LambdaT>
-        explicit ExeName( LambdaT const& lambda ) : ExeName() {
-            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
-        }
-
-        // The exe name is not parsed out of the normal tokens, but is handled specially
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-        }
-
-        auto name() const -> std::string { return *m_name; }
-        auto set( std::string const& newName ) -> ParserResult {
-
-            auto lastSlash = newName.find_last_of( "\\/" );
-            auto filename = ( lastSlash == std::string::npos )
-                    ? newName
-                    : newName.substr( lastSlash+1 );
-
-            *m_name = filename;
-            if( m_ref )
-                return m_ref->setValue( filename );
-            else
-                return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    class Arg : public ParserRefImpl<Arg> {
-    public:
-        using ParserRefImpl::ParserRefImpl;
-
-        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            auto const &token = *remainingTokens;
-            if( token.type != TokenType::Argument )
-                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-
-            assert( !m_ref->isFlag() );
-            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-
-            auto result = valueRef->setValue( remainingTokens->token );
-            if( !result )
-                return InternalParseResult( result );
-            else
-                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-        }
-    };
-
-    inline auto normaliseOpt( std::string const &optName ) -> std::string {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
-#endif
-            return optName;
-    }
-
-    class Opt : public ParserRefImpl<Opt> {
-    protected:
-        std::vector<std::string> m_optNames;
-
-    public:
-        template<typename LambdaT>
-        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
-
-        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
-
-        template<typename LambdaT>
-        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        template<typename T>
-        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        auto operator[]( std::string const &optName ) -> Opt & {
-            m_optNames.push_back( optName );
-            return *this;
-        }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::ostringstream oss;
-            bool first = true;
-            for( auto const &opt : m_optNames ) {
-                if (first)
-                    first = false;
-                else
-                    oss << ", ";
-                oss << opt;
-            }
-            if( !m_hint.empty() )
-                oss << " <" << m_hint << ">";
-            return { { oss.str(), m_description } };
-        }
-
-        auto isMatch( std::string const &optToken ) const -> bool {
-            auto normalisedToken = normaliseOpt( optToken );
-            for( auto const &name : m_optNames ) {
-                if( normaliseOpt( name ) == normalisedToken )
-                    return true;
-            }
-            return false;
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
-                auto const &token = *remainingTokens;
-                if( isMatch(token.token ) ) {
-                    if( m_ref->isFlag() ) {
-                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
-                        auto result = flagRef->setFlag( true );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    } else {
-                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-                        ++remainingTokens;
-                        if( !remainingTokens )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto const &argToken = *remainingTokens;
-                        if( argToken.type != TokenType::Argument )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto result = valueRef->setValue( argToken.token );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    }
-                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-                }
-            }
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-        }
-
-        auto validate() const -> Result override {
-            if( m_optNames.empty() )
-                return Result::logicError( "No options supplied to Opt" );
-            for( auto const &name : m_optNames ) {
-                if( name.empty() )
-                    return Result::logicError( "Option name cannot be empty" );
-#ifdef CATCH_PLATFORM_WINDOWS
-                if( name[0] != '-' && name[0] != '/' )
-                    return Result::logicError( "Option name must begin with '-' or '/'" );
-#else
-                if( name[0] != '-' )
-                    return Result::logicError( "Option name must begin with '-'" );
-#endif
-            }
-            return ParserRefImpl::validate();
-        }
-    };
-
-    struct Help : Opt {
-        Help( bool &showHelpFlag )
-        :   Opt([&]( bool flag ) {
-                showHelpFlag = flag;
-                return ParserResult::ok( ParseResultType::ShortCircuitAll );
-            })
-        {
-            static_cast<Opt &>( *this )
-                    ("display usage information")
-                    ["-?"]["-h"]["--help"]
-                    .optional();
-        }
-    };
-
-    struct Parser : ParserBase {
-
-        mutable ExeName m_exeName;
-        std::vector<Opt> m_options;
-        std::vector<Arg> m_args;
-
-        auto operator|=( ExeName const &exeName ) -> Parser & {
-            m_exeName = exeName;
-            return *this;
-        }
-
-        auto operator|=( Arg const &arg ) -> Parser & {
-            m_args.push_back(arg);
-            return *this;
-        }
-
-        auto operator|=( Opt const &opt ) -> Parser & {
-            m_options.push_back(opt);
-            return *this;
-        }
-
-        auto operator|=( Parser const &other ) -> Parser & {
-            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
-            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
-            return *this;
-        }
-
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser {
-            return Parser( *this ) |= other;
-        }
-
-        // Forward deprecated interface with '+' instead of '|'
-        template<typename T>
-        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
-        template<typename T>
-        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::vector<HelpColumns> cols;
-            for (auto const &o : m_options) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
-            }
-            return cols;
-        }
-
-        void writeToStream( std::ostream &os ) const {
-            if (!m_exeName.name().empty()) {
-                os << "usage:\n" << "  " << m_exeName.name() << " ";
-                bool required = true, first = true;
-                for( auto const &arg : m_args ) {
-                    if (first)
-                        first = false;
-                    else
-                        os << " ";
-                    if( arg.isOptional() && required ) {
-                        os << "[";
-                        required = false;
-                    }
-                    os << "<" << arg.hint() << ">";
-                    if( arg.cardinality() == 0 )
-                        os << " ... ";
-                }
-                if( !required )
-                    os << "]";
-                if( !m_options.empty() )
-                    os << " options";
-                os << "\n\nwhere options are:" << std::endl;
-            }
-
-            auto rows = getHelpColumns();
-            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
-            size_t optWidth = 0;
-            for( auto const &cols : rows )
-                optWidth = (std::max)(optWidth, cols.left.size() + 2);
-
-            optWidth = (std::min)(optWidth, consoleWidth/2);
-
-            for( auto const &cols : rows ) {
-                auto row =
-                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
-                        TextFlow::Spacer(4) +
-                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
-                os << row << std::endl;
-            }
-        }
-
-        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
-            parser.writeToStream( os );
-            return os;
-        }
-
-        auto validate() const -> Result override {
-            for( auto const &opt : m_options ) {
-                auto result = opt.validate();
-                if( !result )
-                    return result;
-            }
-            for( auto const &arg : m_args ) {
-                auto result = arg.validate();
-                if( !result )
-                    return result;
-            }
-            return Result::ok();
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
-
-            struct ParserInfo {
-                ParserBase const* parser = nullptr;
-                size_t count = 0;
-            };
-            const size_t totalParsers = m_options.size() + m_args.size();
-            assert( totalParsers < 512 );
-            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
-            ParserInfo parseInfos[512];
-
-            {
-                size_t i = 0;
-                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
-                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
-            }
-
-            m_exeName.set( exeName );
-
-            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-            while( result.value().remainingTokens() ) {
-                bool tokenParsed = false;
-
-                for( size_t i = 0; i < totalParsers; ++i ) {
-                    auto&  parseInfo = parseInfos[i];
-                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
-                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
-                        if (!result)
-                            return result;
-                        if (result.value().type() != ParseResultType::NoMatch) {
-                            tokenParsed = true;
-                            ++parseInfo.count;
-                            break;
-                        }
-                    }
-                }
-
-                if( result.value().type() == ParseResultType::ShortCircuitAll )
-                    return result;
-                if( !tokenParsed )
-                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
-            }
-            // !TBD Check missing required options
-            return result;
-        }
-    };
-
-    template<typename DerivedT>
-    template<typename T>
-    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
-        return Parser() | static_cast<DerivedT const &>( *this ) | other;
-    }
-} // namespace detail
-
-// A Combined parser
-using detail::Parser;
-
-// A parser for options
-using detail::Opt;
-
-// A parser for arguments
-using detail::Arg;
-
-// Wrapper for argc, argv from main()
-using detail::Args;
-
-// Specifies the name of the executable
-using detail::ExeName;
-
-// Convenience wrapper for option parser that specifies the help option
-using detail::Help;
-
-// enum of result types from a parse
-using detail::ParseResultType;
-
-// Result type for parser operation
-using detail::ParserResult;
-
-}} // namespace Catch::clara
-
-// end clara.hpp
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-// end catch_clara.h
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config );
-
-} // end namespace Catch
-
-// end catch_commandline.h
-#include <fstream>
-#include <ctime>
-
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config ) {
-
-        using namespace clara;
-
-        auto const setWarning = [&]( std::string const& warning ) {
-                auto warningSet = [&]() {
-                    if( warning == "NoAssertions" )
-                        return WarnAbout::NoAssertions;
-
-                    if ( warning == "NoTests" )
-                        return WarnAbout::NoTests;
-
-                    return WarnAbout::Nothing;
-                }();
-
-                if (warningSet == WarnAbout::Nothing)
-                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
-                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
-                std::ifstream f( filename.c_str() );
-                if( !f.is_open() )
-                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
-
-                std::string line;
-                while( std::getline( f, line ) ) {
-                    line = trim(line);
-                    if( !line.empty() && !startsWith( line, '#' ) ) {
-                        if( !startsWith( line, '"' ) )
-                            line = '"' + line + '"';
-                        config.testsOrTags.push_back( line );
-                        config.testsOrTags.emplace_back( "," );
-                    }
-                }
-                //Remove comma in the end
-                if(!config.testsOrTags.empty())
-                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
-
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setTestOrder = [&]( std::string const& order ) {
-                if( startsWith( "declared", order ) )
-                    config.runOrder = RunTests::InDeclarationOrder;
-                else if( startsWith( "lexical", order ) )
-                    config.runOrder = RunTests::InLexicographicalOrder;
-                else if( startsWith( "random", order ) )
-                    config.runOrder = RunTests::InRandomOrder;
-                else
-                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setRngSeed = [&]( std::string const& seed ) {
-                if( seed != "time" )
-                    return clara::detail::convertInto( seed, config.rngSeed );
-                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setColourUsage = [&]( std::string const& useColour ) {
-                    auto mode = toLower( useColour );
-
-                    if( mode == "yes" )
-                        config.useColour = UseColour::Yes;
-                    else if( mode == "no" )
-                        config.useColour = UseColour::No;
-                    else if( mode == "auto" )
-                        config.useColour = UseColour::Auto;
-                    else
-                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
-                auto keypressLc = toLower( keypress );
-                if (keypressLc == "never")
-                    config.waitForKeypress = WaitForKeypress::Never;
-                else if( keypressLc == "start" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStart;
-                else if( keypressLc == "exit" )
-                    config.waitForKeypress = WaitForKeypress::BeforeExit;
-                else if( keypressLc == "both" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
-                else
-                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
-            return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setVerbosity = [&]( std::string const& verbosity ) {
-            auto lcVerbosity = toLower( verbosity );
-            if( lcVerbosity == "quiet" )
-                config.verbosity = Verbosity::Quiet;
-            else if( lcVerbosity == "normal" )
-                config.verbosity = Verbosity::Normal;
-            else if( lcVerbosity == "high" )
-                config.verbosity = Verbosity::High;
-            else
-                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-        auto const setReporter = [&]( std::string const& reporter ) {
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-
-            auto lcReporter = toLower( reporter );
-            auto result = factories.find( lcReporter );
-
-            if( factories.end() != result )
-                config.reporterName = lcReporter;
-            else
-                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-
-        auto cli
-            = ExeName( config.processName )
-            | Help( config.showHelp )
-            | Opt( config.listTests )
-                ["-l"]["--list-tests"]
-                ( "list all/matching test cases" )
-            | Opt( config.listTags )
-                ["-t"]["--list-tags"]
-                ( "list all/matching tags" )
-            | Opt( config.showSuccessfulTests )
-                ["-s"]["--success"]
-                ( "include successful tests in output" )
-            | Opt( config.shouldDebugBreak )
-                ["-b"]["--break"]
-                ( "break into debugger on failure" )
-            | Opt( config.noThrow )
-                ["-e"]["--nothrow"]
-                ( "skip exception tests" )
-            | Opt( config.showInvisibles )
-                ["-i"]["--invisibles"]
-                ( "show invisibles (tabs, newlines)" )
-            | Opt( config.outputFilename, "filename" )
-                ["-o"]["--out"]
-                ( "output filename" )
-            | Opt( setReporter, "name" )
-                ["-r"]["--reporter"]
-                ( "reporter to use (defaults to console)" )
-            | Opt( config.name, "name" )
-                ["-n"]["--name"]
-                ( "suite name" )
-            | Opt( [&]( bool ){ config.abortAfter = 1; } )
-                ["-a"]["--abort"]
-                ( "abort at first failure" )
-            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
-                ["-x"]["--abortx"]
-                ( "abort after x failures" )
-            | Opt( setWarning, "warning name" )
-                ["-w"]["--warn"]
-                ( "enable warnings" )
-            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
-                ["-d"]["--durations"]
-                ( "show test durations" )
-            | Opt( config.minDuration, "seconds" )
-                ["-D"]["--min-duration"]
-                ( "show test durations for tests taking at least the given number of seconds" )
-            | Opt( loadTestNamesFromFile, "filename" )
-                ["-f"]["--input-file"]
-                ( "load test names to run from a file" )
-            | Opt( config.filenamesAsTags )
-                ["-#"]["--filenames-as-tags"]
-                ( "adds a tag for the filename" )
-            | Opt( config.sectionsToRun, "section name" )
-                ["-c"]["--section"]
-                ( "specify section to run" )
-            | Opt( setVerbosity, "quiet|normal|high" )
-                ["-v"]["--verbosity"]
-                ( "set output verbosity" )
-            | Opt( config.listTestNamesOnly )
-                ["--list-test-names-only"]
-                ( "list all/matching test cases names only" )
-            | Opt( config.listReporters )
-                ["--list-reporters"]
-                ( "list all reporters" )
-            | Opt( setTestOrder, "decl|lex|rand" )
-                ["--order"]
-                ( "test case order (defaults to decl)" )
-            | Opt( setRngSeed, "'time'|number" )
-                ["--rng-seed"]
-                ( "set a specific seed for random numbers" )
-            | Opt( setColourUsage, "yes|no" )
-                ["--use-colour"]
-                ( "should output be colourised" )
-            | Opt( config.libIdentify )
-                ["--libidentify"]
-                ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "never|start|exit|both" )
-                ["--wait-for-keypress"]
-                ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkSamples, "samples" )
-                ["--benchmark-samples"]
-                ( "number of samples to collect (default: 100)" )
-            | Opt( config.benchmarkResamples, "resamples" )
-                ["--benchmark-resamples"]
-                ( "number of resamples for the bootstrap (default: 100000)" )
-            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
-                ["--benchmark-confidence-interval"]
-                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
-            | Opt( config.benchmarkNoAnalysis )
-                ["--benchmark-no-analysis"]
-                ( "perform only measurements; do not perform any analysis" )
-            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
-                ["--benchmark-warmup-time"]
-                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
-            | Arg( config.testsOrTags, "test name|pattern|tags" )
-                ( "which test or tests to use" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-// end catch_commandline.cpp
-// start catch_common.cpp
-
-#include <cstring>
-#include <ostream>
-
-namespace Catch {
-
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
-        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        // We can assume that the same file will usually have the same pointer.
-        // Thus, if the pointers are the same, there is no point in calling the strcmp
-        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << '(' << info.line << ')';
-#else
-        os << info.file << ':' << info.line;
-#endif
-        return os;
-    }
-
-    std::string StreamEndStop::operator+() const {
-        return std::string();
-    }
-
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
-// end catch_common.cpp
-// start catch_config.cpp
-
-namespace Catch {
-
-    Config::Config( ConfigData const& data )
-    :   m_data( data ),
-        m_stream( openStream() )
-    {
-        // We need to trim filter specs to avoid trouble with superfluous
-        // whitespace (esp. important for bdd macros, as those are manually
-        // aligned with whitespace).
-
-        for (auto& elem : m_data.testsOrTags) {
-            elem = trim(elem);
-        }
-        for (auto& elem : m_data.sectionsToRun) {
-            elem = trim(elem);
-        }
-
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (!m_data.testsOrTags.empty()) {
-            m_hasTestFilters = true;
-            for (auto const& testOrTags : m_data.testsOrTags) {
-                parser.parse(testOrTags);
-            }
-        }
-        m_testSpec = parser.testSpec();
-    }
-
-    std::string const& Config::getFilename() const {
-        return m_data.outputFilename ;
-    }
-
-    bool Config::listTests() const          { return m_data.listTests; }
-    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
-    bool Config::listTags() const           { return m_data.listTags; }
-    bool Config::listReporters() const      { return m_data.listReporters; }
-
-    std::string Config::getProcessName() const { return m_data.processName; }
-    std::string const& Config::getReporterName() const { return m_data.reporterName; }
-
-    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
-    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
-
-    TestSpec const& Config::testSpec() const { return m_testSpec; }
-    bool Config::hasTestFilters() const { return m_hasTestFilters; }
-
-    bool Config::showHelp() const { return m_data.showHelp; }
-
-    // IConfig interface
-    bool Config::allowThrows() const                   { return !m_data.noThrow; }
-    std::ostream& Config::stream() const               { return m_stream->stream(); }
-    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
-    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
-    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
-    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
-    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
-    double Config::minDuration() const                 { return m_data.minDuration; }
-    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
-    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
-    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
-    int Config::abortAfter() const                     { return m_data.abortAfter; }
-    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
-    Verbosity Config::verbosity() const                { return m_data.verbosity; }
-
-    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
-    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
-    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
-    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
-    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
-
-    IStream const* Config::openStream() {
-        return Catch::makeStream(m_data.outputFilename);
-    }
-
-} // end namespace Catch
-// end catch_config.cpp
-// start catch_console_colour.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-// start catch_errno_guard.h
-
-namespace Catch {
-
-    class ErrnoGuard {
-    public:
-        ErrnoGuard();
-        ~ErrnoGuard();
-    private:
-        int m_oldErrno;
-    };
-
-}
-
-// end catch_errno_guard.h
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#include <sstream>
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() = default;
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) override {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-
-                default:
-                    CATCH_ERROR( "Unknown colour requested" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = UseColour::Yes;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0;34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-                case Colour::BrightYellow:  return setColour( "[1;33m" );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            getCurrentContext().getConfig()->stream()
-                << '\033' << _escapeCode;
-        }
-    };
-
-    bool useColourOnPlatform() {
-        return
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-            !isDebuggerActive() &&
-#endif
-#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
-            isatty(STDOUT_FILENO)
-#else
-            false
-#endif
-            ;
-    }
-    IColourImpl* platformColourInstance() {
-        ErrnoGuard guard;
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = useColourOnPlatform()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved = true;
-    }
-    Colour& Colour::operator=( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved  = true;
-        return *this;
-    }
-
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        // Strictly speaking, this cannot possibly happen.
-        // However, under some conditions it does happen (see #1626),
-        // and this change is small enough that we can let practicality
-        // triumph over purity in this case.
-        if (impl != nullptr) {
-            impl->use( _colourCode );
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, Colour const& ) {
-        return os;
-    }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_console_colour.cpp
-// start catch_context.cpp
-
-namespace Catch {
-
-    class Context : public IMutableContext, NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-        IRunner* getRunner() override {
-            return m_runner;
-        }
-
-        IConfigPtr const& getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setRunner( IRunner* runner ) override {
-            m_runner = runner;
-        }
-        void setConfig( IConfigPtr const& config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfigPtr m_config;
-        IRunner* m_runner = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
-        currentContext = new Context();
-    }
-
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
-    }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
-
-    SimplePcg32& rng() {
-        static SimplePcg32 s_rng;
-        return s_rng;
-    }
-
-}
-// end catch_context.cpp
-// start catch_debug_console.cpp
-
-// start catch_debug_console.h
-
-#include <string>
-
-namespace Catch {
-    void writeToDebugConsole( std::string const& text );
-}
-
-// end catch_debug_console.h
-#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#include <android/log.h>
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
-        }
-    }
-
-#elif defined(CATCH_PLATFORM_WINDOWS)
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-
-#else
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-
-#endif // Platform
-// end catch_debug_console.cpp
-// start catch_debugger.cpp
-
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-
-#  include <cassert>
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <cstddef>
-#  include <ostream>
-
-#ifdef __apple_build_version__
-    // These headers will only compile with AppleClang (XCode)
-    // For other compilers (Clang, GCC, ... ) we need to exclude them
-#  include <sys/sysctl.h>
-#endif
-
-    namespace Catch {
-        #ifdef __apple_build_version__
-        // The following function is taken directly from the following technical note:
-        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-            int                 mib[4];
-            struct kinfo_proc   info;
-            std::size_t         size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-        #else
-        bool isDebuggerActive() {
-            // We need to find another way to determine this for non-appleclang compilers on macOS
-            return false;
-        }
-        #endif
-    } // namespace Catch
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    #include <fstream>
-    #include <string>
-
-    namespace Catch{
-        // The standard POSIX way of detecting a debugger is to attempt to
-        // ptrace() the process, but this needs to be done from a child and not
-        // this process itself to still allow attaching to this process later
-        // if wanted, so is rather heavy. Under Linux we have the PID of the
-        // "debugger" (which doesn't need to be gdb, of course, it could also
-        // be strace, for example) in /proc/$PID/status, so just get it from
-        // there instead.
-        bool isDebuggerActive(){
-            // Libstdc++ has a bug, where std::ifstream sets errno to 0
-            // This way our users can properly assert over errno values
-            ErrnoGuard guard;
-            std::ifstream in("/proc/self/status");
-            for( std::string line; std::getline(in, line); ) {
-                static const int PREFIX_LEN = 11;
-                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
-                    // We're traced if the PID is not 0 and no other PID starts
-                    // with 0 digit, so it's enough to check for just a single
-                    // character.
-                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-                }
-            }
-
-            return false;
-        }
-    } // namespace Catch
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-// end catch_debugger.cpp
-// start catch_decomposer.cpp
-
-namespace Catch {
-
-    ITransientExpression::~ITransientExpression() = default;
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
-        if( lhs.size() + rhs.size() < 40 &&
-                lhs.find('\n') == std::string::npos &&
-                rhs.find('\n') == std::string::npos )
-            os << lhs << " " << op << " " << rhs;
-        else
-            os << lhs << "\n" << op << "\n" << rhs;
-    }
-}
-// end catch_decomposer.cpp
-// start catch_enforce.cpp
-
-#include <stdexcept>
-
-namespace Catch {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
-    [[noreturn]]
-    void throw_exception(std::exception const& e) {
-        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
-                      << "The message was: " << e.what() << '\n';
-        std::terminate();
-    }
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg) {
-        throw_exception(std::logic_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg) {
-        throw_exception(std::domain_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg) {
-        throw_exception(std::runtime_error(msg));
-    }
-
-} // namespace Catch;
-// end catch_enforce.cpp
-// start catch_enum_values_registry.cpp
-// start catch_enum_values_registry.h
-
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    namespace Detail {
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
-
-        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
-
-            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
-
-            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
-        };
-
-        std::vector<StringRef> parseEnums( StringRef enums );
-
-    } // Detail
-
-} // Catch
-
-// end catch_enum_values_registry.h
-
-#include <map>
-#include <cassert>
-
-namespace Catch {
-
-    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
-
-    namespace Detail {
-
-        namespace {
-            // Extracts the actual name part of an enum instance
-            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
-            StringRef extractInstanceName(StringRef enumInstance) {
-                // Find last occurrence of ":"
-                size_t name_start = enumInstance.size();
-                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
-                    --name_start;
-                }
-                return enumInstance.substr(name_start, enumInstance.size() - name_start);
-            }
-        }
-
-        std::vector<StringRef> parseEnums( StringRef enums ) {
-            auto enumValues = splitStringRef( enums, ',' );
-            std::vector<StringRef> parsed;
-            parsed.reserve( enumValues.size() );
-            for( auto const& enumValue : enumValues ) {
-                parsed.push_back(trim(extractInstanceName(enumValue)));
-            }
-            return parsed;
-        }
-
-        EnumInfo::~EnumInfo() {}
-
-        StringRef EnumInfo::lookup( int value ) const {
-            for( auto const& valueToName : m_values ) {
-                if( valueToName.first == value )
-                    return valueToName.second;
-            }
-            return "{** unexpected enum value **}"_sr;
-        }
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
-            enumInfo->m_name = enumName;
-            enumInfo->m_values.reserve( values.size() );
-
-            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
-            assert( valueNames.size() == values.size() );
-            std::size_t i = 0;
-            for( auto value : values )
-                enumInfo->m_values.emplace_back(value, valueNames[i++]);
-
-            return enumInfo;
-        }
-
-        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
-            return *m_enumInfos.back();
-        }
-
-    } // Detail
-} // Catch
-
-// end catch_enum_values_registry.cpp
-// start catch_errno_guard.cpp
-
-#include <cerrno>
-
-namespace Catch {
-        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
-        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
-}
-// end catch_errno_guard.cpp
-// start catch_exception_translator_registry.cpp
-
-// start catch_exception_translator_registry.h
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry();
-        virtual void registerTranslator( const IExceptionTranslator* translator );
-        std::string translateActiveException() const override;
-        std::string tryTranslators() const;
-
-    private:
-        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
-    };
-}
-
-// end catch_exception_translator_registry.h
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
-    }
-
-    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
-        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        try {
-#ifdef __OBJC__
-            // In Objective-C try objective-c exceptions first
-            @try {
-                return tryTranslators();
-            }
-            @catch (NSException *exception) {
-                return Catch::Detail::stringify( [exception description] );
-            }
-#else
-            // Compiling a mixed mode project with MSVC means that CLR
-            // exceptions will be caught in (...) as well. However, these
-            // do not fill-in std::current_exception and thus lead to crash
-            // when attempting rethrow.
-            // /EHa switch also causes structured exceptions to be caught
-            // here, but they fill-in current_exception properly, so
-            // at worst the output should be a little weird, instead of
-            // causing a crash.
-            if (std::current_exception() == nullptr) {
-                return "Non C++ exception. Possibly a CLR exception.";
-            }
-            return tryTranslators();
-#endif
-        }
-        catch( TestFailureException& ) {
-            std::rethrow_exception(std::current_exception());
-        }
-        catch( std::exception& ex ) {
-            return ex.what();
-        }
-        catch( std::string& msg ) {
-            return msg;
-        }
-        catch( const char* msg ) {
-            return msg;
-        }
-        catch(...) {
-            return "Unknown exception";
-        }
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
-#else // ^^ Exceptions are enabled // Exceptions are disabled vv
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-#endif
-
-}
-// end catch_exception_translator_registry.cpp
-// start catch_fatal_condition.cpp
-
-#include <algorithm>
-
-#if !defined( CATCH_CONFIG_WINDOWS_SEH ) && !defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace Catch {
-
-    // If neither SEH nor signal handling is required, the handler impls
-    // do not have to do anything, and can be empty.
-    void FatalConditionHandler::engage_platform() {}
-    void FatalConditionHandler::disengage_platform() {}
-    FatalConditionHandler::FatalConditionHandler() = default;
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-} // end namespace Catch
-
-#endif // !CATCH_CONFIG_WINDOWS_SEH && !CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) && defined( CATCH_CONFIG_POSIX_SIGNALS )
-#error "Inconsistent configuration: Windows' SEH handling and POSIX signals cannot be enabled at the same time"
-#endif // CATCH_CONFIG_WINDOWS_SEH && CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace {
-    //! Signals fatal error message to the run context
-    void reportFatal( char const * const message ) {
-        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
-    }
-
-    //! Minimal size Catch2 needs for its own fatal error handling.
-    //! Picked anecdotally, so it might not be sufficient on all
-    //! platforms, and for all configurations.
-    constexpr std::size_t minStackSizeForErrors = 32 * 1024;
-} // end unnamed namespace
-
-#endif // CATCH_CONFIG_WINDOWS_SEH || CATCH_CONFIG_POSIX_SIGNALS
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-
-    struct SignalDefs { DWORD id; const char* name; };
-
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    static SignalDefs signalDefs[] = {
-        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
-        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
-        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
-        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
-    };
-
-    static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-        for (auto const& def : signalDefs) {
-            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
-                reportFatal(def.name);
-            }
-        }
-        // If its not an exception we care about, pass it along.
-        // This stops us from eating debugger breaks etc.
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    // Since we do not support multiple instantiations, we put these
-    // into global variables and rely on cleaning them up in outlined
-    // constructors/destructors
-    static PVOID exceptionHandlerHandle = nullptr;
-
-    // For MSVC, we reserve part of the stack memory for handling
-    // memory overflow structured exception.
-    FatalConditionHandler::FatalConditionHandler() {
-        ULONG guaranteeSize = static_cast<ULONG>(minStackSizeForErrors);
-        if (!SetThreadStackGuarantee(&guaranteeSize)) {
-            // We do not want to fully error out, because needing
-            // the stack reserve should be rare enough anyway.
-            Catch::cerr()
-                << "Failed to reserve piece of stack."
-                << " Stack overflows will not be reported successfully.";
-        }
-    }
-
-    // We do not attempt to unset the stack guarantee, because
-    // Windows does not support lowering the stack size guarantee.
-    FatalConditionHandler::~FatalConditionHandler() = default;
-
-    void FatalConditionHandler::engage_platform() {
-        // Register as first handler in current chain
-        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        if (!exceptionHandlerHandle) {
-            CATCH_RUNTIME_ERROR("Could not register vectored exception handler");
-        }
-    }
-
-    void FatalConditionHandler::disengage_platform() {
-        if (!RemoveVectoredExceptionHandler(exceptionHandlerHandle)) {
-            CATCH_RUNTIME_ERROR("Could not unregister vectored exception handler");
-        }
-        exceptionHandlerHandle = nullptr;
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_WINDOWS_SEH
-
-#if defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct SignalDefs {
-        int id;
-        const char* name;
-    };
-
-    static SignalDefs signalDefs[] = {
-        { SIGINT,  "SIGINT - Terminal interrupt signal" },
-        { SIGILL,  "SIGILL - Illegal instruction signal" },
-        { SIGFPE,  "SIGFPE - Floating point error signal" },
-        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-        { SIGTERM, "SIGTERM - Termination request signal" },
-        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-    };
-
-// Older GCCs trigger -Wmissing-field-initializers for T foo = {}
-// which is zero initialization, but not explicit. We want to avoid
-// that.
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-    static char* altStackMem = nullptr;
-    static std::size_t altStackSize = 0;
-    static stack_t oldSigStack{};
-    static struct sigaction oldSigActions[sizeof(signalDefs) / sizeof(SignalDefs)]{};
-
-    static void restorePreviousSignalHandlers() {
-        // We set signal handlers back to the previous ones. Hopefully
-        // nobody overwrote them in the meantime, and doesn't expect
-        // their signal handlers to live past ours given that they
-        // installed them after ours..
-        for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-        }
-        // Return the old stack
-        sigaltstack(&oldSigStack, nullptr);
-    }
-
-    static void handleSignal( int sig ) {
-        char const * name = "<unknown signal>";
-        for (auto const& def : signalDefs) {
-            if (sig == def.id) {
-                name = def.name;
-                break;
-            }
-        }
-        // We need to restore previous signal handlers and let them do
-        // their thing, so that the users can have the debugger break
-        // when a signal is raised, and so on.
-        restorePreviousSignalHandlers();
-        reportFatal( name );
-        raise( sig );
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        assert(!altStackMem && "Cannot initialize POSIX signal handler when one already exists");
-        if (altStackSize == 0) {
-            altStackSize = std::max(static_cast<size_t>(SIGSTKSZ), minStackSizeForErrors);
-        }
-        altStackMem = new char[altStackSize]();
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        delete[] altStackMem;
-        // We signal that another instance can be constructed by zeroing
-        // out the pointer.
-        altStackMem = nullptr;
-    }
-
-    void FatalConditionHandler::engage_platform() {
-        stack_t sigStack;
-        sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = altStackSize;
-        sigStack.ss_flags = 0;
-        sigaltstack(&sigStack, &oldSigStack);
-        struct sigaction sa = { };
-
-        sa.sa_handler = handleSignal;
-        sa.sa_flags = SA_ONSTACK;
-        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-        }
-    }
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-
-    void FatalConditionHandler::disengage_platform() {
-        restorePreviousSignalHandlers();
-    }
-
-} // end namespace Catch
-
-#endif // CATCH_CONFIG_POSIX_SIGNALS
-// end catch_fatal_condition.cpp
-// start catch_generators.cpp
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-const char* GeneratorException::what() const noexcept {
-    return m_msg;
-}
-
-namespace Generators {
-
-    GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
-    }
-
-} // namespace Generators
-} // namespace Catch
-// end catch_generators.cpp
-// start catch_interfaces_capture.cpp
-
-namespace Catch {
-    IResultCapture::~IResultCapture() = default;
-}
-// end catch_interfaces_capture.cpp
-// start catch_interfaces_config.cpp
-
-namespace Catch {
-    IConfig::~IConfig() = default;
-}
-// end catch_interfaces_config.cpp
-// start catch_interfaces_exception.cpp
-
-namespace Catch {
-    IExceptionTranslator::~IExceptionTranslator() = default;
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
-// end catch_interfaces_exception.cpp
-// start catch_interfaces_registry_hub.cpp
-
-namespace Catch {
-    IRegistryHub::~IRegistryHub() = default;
-    IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
-// end catch_interfaces_registry_hub.cpp
-// start catch_interfaces_reporter.cpp
-
-// start catch_reporter_listening.h
-
-namespace Catch {
-
-    class ListeningReporter : public IStreamingReporter {
-        using Reporters = std::vector<IStreamingReporterPtr>;
-        Reporters m_listeners;
-        IStreamingReporterPtr m_reporter = nullptr;
-        ReporterPreferences m_preferences;
-
-    public:
-        ListeningReporter();
-
-        void addListener( IStreamingReporterPtr&& listener );
-        void addReporter( IStreamingReporterPtr&& reporter );
-
-    public: // IStreamingReporter
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases( std::string const& spec ) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testRunStarting( TestRunInfo const& testRunInfo ) override;
-        void testGroupStarting( GroupInfo const& groupInfo ) override;
-        void testCaseStarting( TestCaseInfo const& testInfo ) override;
-        void sectionStarting( SectionInfo const& sectionInfo ) override;
-        void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-        // The return value indicates if the messages buffer should be cleared:
-        bool assertionEnded( AssertionStats const& assertionStats ) override;
-        void sectionEnded( SectionStats const& sectionStats ) override;
-        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-        void testRunEnded( TestRunStats const& testRunStats ) override;
-
-        void skipTest( TestCaseInfo const& testInfo ) override;
-        bool isMulti() const override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_listening.h
-namespace Catch {
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
-    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
-    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-    std::ostream& ReporterConfig::stream() const { return *m_stream; }
-    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
-
-    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
-
-    GroupInfo::GroupInfo(  std::string const& _name,
-                           std::size_t _groupIndex,
-                           std::size_t _groupsCount )
-    :   name( _name ),
-        groupIndex( _groupIndex ),
-        groupsCounts( _groupsCount )
-    {}
-
-     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
-                                     std::vector<MessageInfo> const& _infoMessages,
-                                     Totals const& _totals )
-    :   assertionResult( _assertionResult ),
-        infoMessages( _infoMessages ),
-        totals( _totals )
-    {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
-        if( assertionResult.hasMessage() ) {
-            // Copy message into messages list.
-            // !TBD This should have been done earlier, somewhere
-            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-            builder << assertionResult.getMessage();
-            builder.m_info.message = builder.m_stream.str();
-
-            infoMessages.push_back( builder.m_info );
-        }
-    }
-
-     AssertionStats::~AssertionStats() = default;
-
-    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
-                                 Counts const& _assertions,
-                                 double _durationInSeconds,
-                                 bool _missingAssertions )
-    :   sectionInfo( _sectionInfo ),
-        assertions( _assertions ),
-        durationInSeconds( _durationInSeconds ),
-        missingAssertions( _missingAssertions )
-    {}
-
-    SectionStats::~SectionStats() = default;
-
-    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
-                                   Totals const& _totals,
-                                   std::string const& _stdOut,
-                                   std::string const& _stdErr,
-                                   bool _aborting )
-    : testInfo( _testInfo ),
-        totals( _totals ),
-        stdOut( _stdOut ),
-        stdErr( _stdErr ),
-        aborting( _aborting )
-    {}
-
-    TestCaseStats::~TestCaseStats() = default;
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
-                                    Totals const& _totals,
-                                    bool _aborting )
-    :   groupInfo( _groupInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
-    :   groupInfo( _groupInfo ),
-        aborting( false )
-    {}
-
-    TestGroupStats::~TestGroupStats() = default;
-
-    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
-                    Totals const& _totals,
-                    bool _aborting )
-    :   runInfo( _runInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestRunStats::~TestRunStats() = default;
-
-    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
-    bool IStreamingReporter::isMulti() const { return false; }
-
-    IReporterFactory::~IReporterFactory() = default;
-    IReporterRegistry::~IReporterRegistry() = default;
-
-} // end namespace Catch
-// end catch_interfaces_reporter.cpp
-// start catch_interfaces_runner.cpp
-
-namespace Catch {
-    IRunner::~IRunner() = default;
-}
-// end catch_interfaces_runner.cpp
-// start catch_interfaces_testcase.cpp
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
-    ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
-// end catch_interfaces_testcase.cpp
-// start catch_leak_detector.cpp
-
-#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
-#include <crtdbg.h>
-
-namespace Catch {
-
-    LeakDetector::LeakDetector() {
-        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-        flag |= _CRTDBG_LEAK_CHECK_DF;
-        flag |= _CRTDBG_ALLOC_MEM_DF;
-        _CrtSetDbgFlag(flag);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        // Change this to leaking allocation's number to break there
-        _CrtSetBreakAlloc(-1);
-    }
-}
-
-#else
-
-    Catch::LeakDetector::LeakDetector() {}
-
-#endif
-
-Catch::LeakDetector::~LeakDetector() {
-    Catch::cleanUp();
-}
-// end catch_leak_detector.cpp
-// start catch_list.cpp
-
-// start catch_list.h
-
-#include <set>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config );
-
-    std::size_t listTestsNamesOnly( Config const& config );
-
-    struct TagInfo {
-        void add( std::string const& spelling );
-        std::string all() const;
-
-        std::set<std::string> spellings;
-        std::size_t count = 0;
-    };
-
-    std::size_t listTags( Config const& config );
-
-    std::size_t listReporters();
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config );
-
-} // end namespace Catch
-
-// end catch_list.h
-// start catch_text.h
-
-namespace Catch {
-    using namespace clara::TextFlow;
-}
-
-// end catch_text.h
-#include <limits>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-        }
-
-        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
-            if( config.verbosity() >= Verbosity::High ) {
-                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
-                std::string description = testCaseInfo.description;
-                if( description.empty() )
-                    description = "(NO DESCRIPTION)";
-                Catch::cout() << Column( description ).indent(4) << std::endl;
-            }
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
-        }
-
-        if( !config.hasTestFilters() )
-            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
-        return matchedTestCases.size();
-    }
-
-    std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            matchedTests++;
-            if( startsWith( testCaseInfo.name, '#' ) )
-               Catch::cout() << '"' << testCaseInfo.name << '"';
-            else
-               Catch::cout() << testCaseInfo.name;
-            if ( config.verbosity() >= Verbosity::High )
-                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
-            Catch::cout() << std::endl;
-        }
-        return matchedTests;
-    }
-
-    void TagInfo::add( std::string const& spelling ) {
-        ++count;
-        spellings.insert( spelling );
-    }
-
-    std::string TagInfo::all() const {
-        size_t size = 0;
-        for (auto const& spelling : spellings) {
-            // Add 2 for the brackes
-            size += spelling.size() + 2;
-        }
-
-        std::string out; out.reserve(size);
-        for (auto const& spelling : spellings) {
-            out += '[';
-            out += spelling;
-            out += ']';
-        }
-        return out;
-    }
-
-    std::size_t listTags( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCase : matchedTestCases ) {
-            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
-                std::string lcaseTagName = toLower( tagName );
-                auto countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( auto const& tagCount : tagCounts ) {
-            ReusableStringStream rss;
-            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
-            auto str = rss.str();
-            auto wrapper = Column( tagCount.second.all() )
-                                                    .initialIndent( 0 )
-                                                    .indent( str.size() )
-                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
-            Catch::cout() << str << wrapper << '\n';
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
-        return tagCounts.size();
-    }
-
-    std::size_t listReporters() {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        std::size_t maxNameLen = 0;
-        for( auto const& factoryKvp : factories )
-            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
-
-        for( auto const& factoryKvp : factories ) {
-            Catch::cout()
-                    << Column( factoryKvp.first + ":" )
-                            .indent(2)
-                            .width( 5+maxNameLen )
-                    +  Column( factoryKvp.second->getDescription() )
-                            .initialIndent(0)
-                            .indent(2)
-                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
-                    << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
-        Option<std::size_t> listedCount;
-        getCurrentMutableContext().setConfig( config );
-        if( config->listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( *config );
-        if( config->listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
-        if( config->listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( *config );
-        if( config->listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters();
-        return listedCount;
-    }
-
-} // end namespace Catch
-// end catch_list.cpp
-// start catch_matchers.cpp
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        std::string MatcherUntypedBase::toString() const {
-            if( m_cachedToString.empty() )
-                m_cachedToString = describe();
-            return m_cachedToString;
-        }
-
-        MatcherUntypedBase::~MatcherUntypedBase() = default;
-
-    } // namespace Impl
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-// end catch_matchers.cpp
-// start catch_matchers_exception.cpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-bool ExceptionMessageMatcher::match(std::exception const& ex) const {
-    return ex.what() == m_message;
-}
-
-std::string ExceptionMessageMatcher::describe() const {
-    return "exception message matches \"" + m_message + "\"";
-}
-
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
-}
-
-// namespace Exception
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_exception.cpp
-// start catch_matchers_floating.cpp
-
-// start catch_polyfills.hpp
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-// end catch_polyfills.hpp
-// start catch_to_string.hpp
-
-#include <string>
-
-namespace Catch {
-    template <typename T>
-    std::string to_string(T const& t) {
-#if defined(CATCH_CONFIG_CPP11_TO_STRING)
-        return std::to_string(t);
-#else
-        ReusableStringStream rss;
-        rss << t;
-        return rss.str();
-#endif
-    }
-} // end namespace Catch
-
-// end catch_to_string.hpp
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <type_traits>
-#include <iomanip>
-#include <limits>
-
-namespace Catch {
-namespace {
-
-    int32_t convert(float f) {
-        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-        int32_t i;
-        std::memcpy(&i, &f, sizeof(f));
-        return i;
-    }
-
-    int64_t convert(double d) {
-        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-        int64_t i;
-        std::memcpy(&i, &d, sizeof(d));
-        return i;
-    }
-
-    template <typename FP>
-    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
-        // Comparison with NaN should always be false.
-        // This way we can rule it out before getting into the ugly details
-        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
-            return false;
-        }
-
-        auto lc = convert(lhs);
-        auto rc = convert(rhs);
-
-        if ((lc < 0) != (rc < 0)) {
-            // Potentially we can have +0 and -0
-            return lhs == rhs;
-        }
-
-        // static cast as a workaround for IBM XLC
-        auto ulpDiff = std::abs(static_cast<FP>(lc - rc));
-        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
-    }
-
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
-
-template <typename FP>
-FP step(FP start, FP direction, uint64_t steps) {
-    for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-        start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
-    }
-    return start;
-}
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-template <typename FloatingPoint>
-void write(std::ostream& out, FloatingPoint num) {
-    out << std::scientific
-        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
-        << num;
-}
-
-} // end anonymous namespace
-
-namespace Matchers {
-namespace Floating {
-
-    enum class FloatingPointKind : uint8_t {
-        Float,
-        Double
-    };
-
-    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
-        :m_target{ target }, m_margin{ margin } {
-        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
-            << " Margin has to be non-negative.");
-    }
-
-    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
-    // But without the subtraction to allow for INFINITY in comparison
-    bool WithinAbsMatcher::match(double const& matchee) const {
-        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
-    }
-
-    std::string WithinAbsMatcher::describe() const {
-        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
-    }
-
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
-        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        CATCH_ENFORCE(m_type == FloatingPointKind::Double
-                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
-            "Provided ULP is impossibly large for a float comparison.");
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-// Clang <3.5 reports on the default branch in the switch below
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-
-    bool WithinUlpsMatcher::match(double const& matchee) const {
-        switch (m_type) {
-        case FloatingPointKind::Float:
-            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
-        case FloatingPointKind::Double:
-            return almostEqualUlps<double>(matchee, m_target, m_ulps);
-        default:
-            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
-        }
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-    std::string WithinUlpsMatcher::describe() const {
-        std::stringstream ret;
-
-        ret << "is within " << m_ulps << " ULPs of ";
-
-        if (m_type == FloatingPointKind::Float) {
-            write(ret, static_cast<float>(m_target));
-            ret << 'f';
-        } else {
-            write(ret, m_target);
-        }
-
-        ret << " ([";
-        if (m_type == FloatingPointKind::Double) {
-            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
-        } else {
-            // We have to cast INFINITY to float because of MinGW, see #1782
-            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
-        }
-        ret << "])";
-
-        return ret.str();
-    }
-
-    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
-        m_target(target),
-        m_epsilon(epsilon){
-        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
-        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
-    }
-
-    bool WithinRelMatcher::match(double const& matchee) const {
-        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
-        return marginComparison(matchee, m_target,
-                                std::isinf(relMargin)? 0 : relMargin);
-    }
-
-    std::string WithinRelMatcher::describe() const {
-        Catch::ReusableStringStream sstr;
-        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
-        return sstr.str();
-    }
-
-}// namespace Floating
-
-Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
-}
-
-Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
-}
-
-Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
-    return Floating::WithinAbsMatcher(target, margin);
-}
-
-Floating::WithinRelMatcher WithinRel(double target, double eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(double target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
-}
-
-Floating::WithinRelMatcher WithinRel(float target, float eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(float target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
-}
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_floating.cpp
-// start catch_matchers_generic.cpp
-
-std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
-    if (desc.empty()) {
-        return "matches undescribed predicate";
-    } else {
-        return "matches predicate: \"" + desc + '"';
-    }
-}
-// end catch_matchers_generic.cpp
-// start catch_matchers_string.cpp
-
-#include <regex>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_str( adjustString( str ) )
-        {}
-        std::string CasedString::adjustString( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? toLower( str )
-                   : str;
-        }
-        std::string CasedString::caseSensitivitySuffix() const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
-                   : std::string();
-        }
-
-        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
-        : m_comparator( comparator ),
-          m_operation( operation ) {
-        }
-
-        std::string StringMatcherBase::describe() const {
-            std::string description;
-            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
-                                        m_comparator.caseSensitivitySuffix().size());
-            description += m_operation;
-            description += ": \"";
-            description += m_comparator.m_str;
-            description += "\"";
-            description += m_comparator.caseSensitivitySuffix();
-            return description;
-        }
-
-        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
-
-        bool EqualsMatcher::match( std::string const& source ) const {
-            return m_comparator.adjustString( source ) == m_comparator.m_str;
-        }
-
-        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
-
-        bool ContainsMatcher::match( std::string const& source ) const {
-            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
-
-        bool StartsWithMatcher::match( std::string const& source ) const {
-            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
-
-        bool EndsWithMatcher::match( std::string const& source ) const {
-            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
-
-        bool RegexMatcher::match(std::string const& matchee) const {
-            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
-            if (m_caseSensitivity == CaseSensitive::Choice::No) {
-                flags |= std::regex::icase;
-            }
-            auto reg = std::regex(m_regex, flags);
-            return std::regex_match(matchee, reg);
-        }
-
-        std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
-        }
-
-    } // namespace StdString
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-
-    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
-        return StdString::RegexMatcher(regex, caseSensitivity);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_string.cpp
-// start catch_message.cpp
-
-// start catch_uncaught_exceptions.h
-
-namespace Catch {
-    bool uncaught_exceptions();
-} // end namespace Catch
-
-// end catch_uncaught_exceptions.h
-#include <cassert>
-#include <stack>
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   StringRef const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    bool MessageInfo::operator==( MessageInfo const& other ) const {
-        return sequence == other.sequence;
-    }
-
-    bool MessageInfo::operator<( MessageInfo const& other ) const {
-        return sequence < other.sequence;
-    }
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
-                                           SourceLineInfo const& lineInfo,
-                                           ResultWas::OfType type )
-        :m_info(macroName, lineInfo, type) {}
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info ), m_moved()
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-
-    ScopedMessage::ScopedMessage( ScopedMessage&& old )
-    : m_info( old.m_info ), m_moved()
-    {
-        old.m_moved = true;
-    }
-
-    ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() && !m_moved ){
-            getResultCapture().popScopedMessage(m_info);
-        }
-    }
-
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
-        auto trimmed = [&] (size_t start, size_t end) {
-            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
-                ++start;
-            }
-            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
-                --end;
-            }
-            return names.substr(start, end - start + 1);
-        };
-        auto skipq = [&] (size_t start, char quote) {
-            for (auto i = start + 1; i < names.size() ; ++i) {
-                if (names[i] == quote)
-                    return i;
-                if (names[i] == '\\')
-                    ++i;
-            }
-            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
-        };
-
-        size_t start = 0;
-        std::stack<char> openings;
-        for (size_t pos = 0; pos < names.size(); ++pos) {
-            char c = names[pos];
-            switch (c) {
-            case '[':
-            case '{':
-            case '(':
-            // It is basically impossible to disambiguate between
-            // comparison and start of template args in this context
-//            case '<':
-                openings.push(c);
-                break;
-            case ']':
-            case '}':
-            case ')':
-//           case '>':
-                openings.pop();
-                break;
-            case '"':
-            case '\'':
-                pos = skipq(pos, c);
-                break;
-            case ',':
-                if (start != pos && openings.empty()) {
-                    m_messages.emplace_back(macroName, lineInfo, resultType);
-                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
-                    m_messages.back().message += " := ";
-                    start = pos;
-                }
-            }
-        }
-        assert(openings.empty() && "Mismatched openings");
-        m_messages.emplace_back(macroName, lineInfo, resultType);
-        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
-        m_messages.back().message += " := ";
-    }
-    Capturer::~Capturer() {
-        if ( !uncaught_exceptions() ){
-            assert( m_captured == m_messages.size() );
-            for( size_t i = 0; i < m_captured; ++i  )
-                m_resultCapture.popScopedMessage( m_messages[i] );
-        }
-    }
-
-    void Capturer::captureValue( size_t index, std::string const& value ) {
-        assert( index < m_messages.size() );
-        m_messages[index].message += value;
-        m_resultCapture.pushScopedMessage( m_messages[index] );
-        m_captured++;
-    }
-
-} // end namespace Catch
-// end catch_message.cpp
-// start catch_output_redirect.cpp
-
-// start catch_output_redirect.h
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-
-#include <cstdio>
-#include <iosfwd>
-#include <string>
-
-namespace Catch {
-
-    class RedirectedStream {
-        std::ostream& m_originalStream;
-        std::ostream& m_redirectionStream;
-        std::streambuf* m_prevBuf;
-
-    public:
-        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
-        ~RedirectedStream();
-    };
-
-    class RedirectedStdOut {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cout;
-    public:
-        RedirectedStdOut();
-        auto str() const -> std::string;
-    };
-
-    // StdErr has two constituent streams in C++, std::cerr and std::clog
-    // This means that we need to redirect 2 streams into 1 to keep proper
-    // order of writes
-    class RedirectedStdErr {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cerr;
-        RedirectedStream m_clog;
-    public:
-        RedirectedStdErr();
-        auto str() const -> std::string;
-    };
-
-    class RedirectedStreams {
-    public:
-        RedirectedStreams(RedirectedStreams const&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
-        RedirectedStreams(RedirectedStreams&&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
-
-        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
-        ~RedirectedStreams();
-    private:
-        std::string& m_redirectedCout;
-        std::string& m_redirectedCerr;
-        RedirectedStdOut m_redirectedStdOut;
-        RedirectedStdErr m_redirectedStdErr;
-    };
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-    // Windows's implementation of std::tmpfile is terrible (it tries
-    // to create a file inside system folder, thus requiring elevated
-    // privileges for the binary), so we have to use tmpnam(_s) and
-    // create the file ourselves there.
-    class TempFile {
-    public:
-        TempFile(TempFile const&) = delete;
-        TempFile& operator=(TempFile const&) = delete;
-        TempFile(TempFile&&) = delete;
-        TempFile& operator=(TempFile&&) = delete;
-
-        TempFile();
-        ~TempFile();
-
-        std::FILE* getFile();
-        std::string getContents();
-
-    private:
-        std::FILE* m_file = nullptr;
-    #if defined(_MSC_VER)
-        char m_buffer[L_tmpnam] = { 0 };
-    #endif
-    };
-
-    class OutputRedirect {
-    public:
-        OutputRedirect(OutputRedirect const&) = delete;
-        OutputRedirect& operator=(OutputRedirect const&) = delete;
-        OutputRedirect(OutputRedirect&&) = delete;
-        OutputRedirect& operator=(OutputRedirect&&) = delete;
-
-        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
-        ~OutputRedirect();
-
-    private:
-        int m_originalStdout = -1;
-        int m_originalStderr = -1;
-        TempFile m_stdoutFile;
-        TempFile m_stderrFile;
-        std::string& m_stdoutDest;
-        std::string& m_stderrDest;
-    };
-
-#endif
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-// end catch_output_redirect.h
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #include <io.h>      //_dup and _dup2
-    #define dup _dup
-    #define dup2 _dup2
-    #define fileno _fileno
-    #else
-    #include <unistd.h>  // dup and dup2
-    #endif
-#endif
-
-namespace Catch {
-
-    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
-    :   m_originalStream( originalStream ),
-        m_redirectionStream( redirectionStream ),
-        m_prevBuf( m_originalStream.rdbuf() )
-    {
-        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
-    }
-
-    RedirectedStream::~RedirectedStream() {
-        m_originalStream.rdbuf( m_prevBuf );
-    }
-
-    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
-    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStdErr::RedirectedStdErr()
-    :   m_cerr( Catch::cerr(), m_rss.get() ),
-        m_clog( Catch::clog(), m_rss.get() )
-    {}
-    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
-    :   m_redirectedCout(redirectedCout),
-        m_redirectedCerr(redirectedCerr)
-    {}
-
-    RedirectedStreams::~RedirectedStreams() {
-        m_redirectedCout += m_redirectedStdOut.str();
-        m_redirectedCerr += m_redirectedStdErr.str();
-    }
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-#if defined(_MSC_VER)
-    TempFile::TempFile() {
-        if (tmpnam_s(m_buffer)) {
-            CATCH_RUNTIME_ERROR("Could not get a temp filename");
-        }
-        if (fopen_s(&m_file, m_buffer, "w+")) {
-            char buffer[100];
-            if (strerror_s(buffer, errno)) {
-                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
-            }
-            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
-        }
-    }
-#else
-    TempFile::TempFile() {
-        m_file = std::tmpfile();
-        if (!m_file) {
-            CATCH_RUNTIME_ERROR("Could not create a temp file.");
-        }
-    }
-
-#endif
-
-    TempFile::~TempFile() {
-         // TBD: What to do about errors here?
-         std::fclose(m_file);
-         // We manually create the file on Windows only, on Linux
-         // it will be autodeleted
-#if defined(_MSC_VER)
-         std::remove(m_buffer);
-#endif
-    }
-
-    FILE* TempFile::getFile() {
-        return m_file;
-    }
-
-    std::string TempFile::getContents() {
-        std::stringstream sstr;
-        char buffer[100] = {};
-        std::rewind(m_file);
-        while (std::fgets(buffer, sizeof(buffer), m_file)) {
-            sstr << buffer;
-        }
-        return sstr.str();
-    }
-
-    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
-        m_originalStdout(dup(1)),
-        m_originalStderr(dup(2)),
-        m_stdoutDest(stdout_dest),
-        m_stderrDest(stderr_dest) {
-        dup2(fileno(m_stdoutFile.getFile()), 1);
-        dup2(fileno(m_stderrFile.getFile()), 2);
-    }
-
-    OutputRedirect::~OutputRedirect() {
-        Catch::cout() << std::flush;
-        fflush(stdout);
-        // Since we support overriding these streams, we flush cerr
-        // even though std::cerr is unbuffered
-        Catch::cerr() << std::flush;
-        Catch::clog() << std::flush;
-        fflush(stderr);
-
-        dup2(m_originalStdout, 1);
-        dup2(m_originalStderr, 2);
-
-        m_stdoutDest += m_stdoutFile.getContents();
-        m_stderrDest += m_stderrFile.getContents();
-    }
-
-#endif // CATCH_CONFIG_NEW_CAPTURE
-
-} // namespace Catch
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #undef dup
-    #undef dup2
-    #undef fileno
-    #endif
-#endif
-// end catch_output_redirect.cpp
-// start catch_polyfills.cpp
-
-#include <cmath>
-
-namespace Catch {
-
-#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-    bool isnan(float f) {
-        return std::isnan(f);
-    }
-    bool isnan(double d) {
-        return std::isnan(d);
-    }
-#else
-    // For now we only use this for embarcadero
-    bool isnan(float f) {
-        return std::_isnan(f);
-    }
-    bool isnan(double d) {
-        return std::_isnan(d);
-    }
-#endif
-
-} // end namespace Catch
-// end catch_polyfills.cpp
-// start catch_random_number_generator.cpp
-
-namespace Catch {
-
-namespace {
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4146) // we negate uint32 during the rotate
-#endif
-        // Safe rotr implementation thanks to John Regehr
-        uint32_t rotate_right(uint32_t val, uint32_t count) {
-            const uint32_t mask = 31;
-            count &= mask;
-            return (val >> count) | (val << (-count & mask));
-        }
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-}
-
-    SimplePcg32::SimplePcg32(result_type seed_) {
-        seed(seed_);
-    }
-
-    void SimplePcg32::seed(result_type seed_) {
-        m_state = 0;
-        (*this)();
-        m_state += seed_;
-        (*this)();
-    }
-
-    void SimplePcg32::discard(uint64_t skip) {
-        // We could implement this to run in O(log n) steps, but this
-        // should suffice for our use case.
-        for (uint64_t s = 0; s < skip; ++s) {
-            static_cast<void>((*this)());
-        }
-    }
-
-    SimplePcg32::result_type SimplePcg32::operator()() {
-        // prepare the output value
-        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
-        const auto output = rotate_right(xorshifted, m_state >> 59u);
-
-        // advance state
-        m_state = m_state * 6364136223846793005ULL + s_inc;
-
-        return output;
-    }
-
-    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state == rhs.m_state;
-    }
-
-    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state != rhs.m_state;
-    }
-}
-// end catch_random_number_generator.cpp
-// start catch_registry_hub.cpp
-
-// start catch_test_case_registry_impl.h
-
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <ios>
-
-namespace Catch {
-
-    class TestCase;
-    struct IConfig;
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        virtual ~TestRegistry() = default;
-
-        virtual void registerTest( TestCase const& testCase );
-
-        std::vector<TestCase> const& getAllTests() const override;
-        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        std::size_t m_unnamedCount = 0;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class TestInvokerAsFunction : public ITestInvoker {
-        void(*m_testAsFunction)();
-    public:
-        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
-
-        void invoke() const override;
-    };
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
-
-    ///////////////////////////////////////////////////////////////////////////
-
-} // end namespace Catch
-
-// end catch_test_case_registry_impl.h
-// start catch_reporter_registry.h
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        ~ReporterRegistry() override;
-
-        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
-
-        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
-        void registerListener( IReporterFactoryPtr const& factory );
-
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// end catch_reporter_registry.h
-// start catch_tag_alias_registry.h
-
-// start catch_tag_alias.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias.h
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        ~TagAliasRegistry() override;
-        TagAlias const* find( std::string const& alias ) const override;
-        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
-        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias_registry.h
-// start catch_startup_exception_registry.h
-
-#include <vector>
-#include <exception>
-
-namespace Catch {
-
-    class StartupExceptionRegistry {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    public:
-        void add(std::exception_ptr const& exception) noexcept;
-        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
-    private:
-        std::vector<std::exception_ptr> m_exceptions;
-#endif
-    };
-
-} // end namespace Catch
-
-// end catch_startup_exception_registry.h
-// start catch_singletons.hpp
-
-namespace Catch {
-
-    struct ISingleton {
-        virtual ~ISingleton();
-    };
-
-    void addSingleton( ISingleton* singleton );
-    void cleanupSingletons();
-
-    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
-    class Singleton : SingletonImplT, public ISingleton {
-
-        static auto getInternal() -> Singleton* {
-            static Singleton* s_instance = nullptr;
-            if( !s_instance ) {
-                s_instance = new Singleton;
-                addSingleton( s_instance );
-            }
-            return s_instance;
-        }
-
-    public:
-        static auto get() -> InterfaceT const& {
-            return *getInternal();
-        }
-        static auto getMutable() -> MutableInterfaceT& {
-            return *getInternal();
-        }
-    };
-
-} // namespace Catch
-
-// end catch_singletons.hpp
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
-                            private NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            void registerListener( IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerListener( factory );
-            }
-            void registerTest( TestCase const& testInfo ) override {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            void registerTranslator( const IExceptionTranslator* translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                m_exceptionRegistry.add(std::current_exception());
-#else
-                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-#endif
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-// end catch_registry_hub.cpp
-// start catch_reporter_registry.cpp
-
-namespace Catch {
-
-    ReporterRegistry::~ReporterRegistry() = default;
-
-    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( ReporterConfig( config ) );
-    }
-
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
-        m_factories.emplace(name, factory);
-    }
-    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
-        m_listeners.push_back( factory );
-    }
-
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
-    }
-
-}
-// end catch_reporter_registry.cpp
-// start catch_result_type.cpp
-
-namespace Catch {
-
-    bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-// end catch_result_type.cpp
-// start catch_run_context.cpp
-
-#include <cassert>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( nameAndLocation, ctx, parent )
-            {}
-            ~GeneratorTracker();
-
-            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
-                std::shared_ptr<GeneratorTracker> tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if (currentTracker.nameAndLocation() == nameAndLocation) {
-                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
-                    assert(thisTracker);
-                    assert(thisTracker->isGeneratorTracker());
-                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
-                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
-                } else {
-                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
-                    currentTracker.addChild( tracker );
-                }
-
-                if( !tracker->isComplete() ) {
-                    tracker->open();
-                }
-
-                return *tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // If a generator has a child (it is followed by a section)
-                // and none of its children have started, then we must wait
-                // until later to start consuming its values.
-                // This catches cases where `GENERATE` is placed between two
-                // `SECTION`s.
-                // **The check for m_children.empty cannot be removed**.
-                // doing so would break `GENERATE` _not_ followed by `SECTION`s.
-                const bool should_wait_for_child = [&]() {
-                    // No children -> nobody to wait for
-                    if ( m_children.empty() ) {
-                        return false;
-                    }
-                    // If at least one child started executing, don't wait
-                    if ( std::find_if(
-                             m_children.begin(),
-                             m_children.end(),
-                             []( TestCaseTracking::ITrackerPtr tracker ) {
-                                 return tracker->hasStarted();
-                             } ) != m_children.end() ) {
-                        return false;
-                    }
-
-                    // No children have started. We need to check if they _can_
-                    // start, and thus we should wait for them, or they cannot
-                    // start (due to filters), and we shouldn't wait for them
-                    auto* parent = m_parent;
-                    // This is safe: there is always at least one section
-                    // tracker in a test case tracking tree
-                    while ( !parent->isSectionTracker() ) {
-                        parent = &( parent->parent() );
-                    }
-                    assert( parent &&
-                            "Missing root (test case) level section" );
-
-                    auto const& parentSection =
-                        static_cast<SectionTracker&>( *parent );
-                    auto const& filters = parentSection.getFilters();
-                    // No filters -> no restrictions on running sections
-                    if ( filters.empty() ) {
-                        return true;
-                    }
-
-                    for ( auto const& child : m_children ) {
-                        if ( child->isSectionTracker() &&
-                             std::find( filters.begin(),
-                                        filters.end(),
-                                        static_cast<SectionTracker&>( *child )
-                                            .trimmedName() ) !=
-                                 filters.end() ) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }();
-
-                // This check is a bit tricky, because m_generator->next()
-                // has a side-effect, where it consumes generator's current
-                // value, but we do not want to invoke the side-effect if
-                // this generator is still waiting for any child to start.
-                if ( should_wait_for_child ||
-                     ( m_runState == CompletedSuccessfully &&
-                       m_generator->next() ) ) {
-                    m_children.clear();
-                    m_runState = Executing;
-                }
-            }
-
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = std::move( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() {}
-    }
-
-    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
-    :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
-        m_config(_config),
-        m_reporter(std::move(reporter)),
-        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
-        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
-    {
-        m_context.setRunner(this);
-        m_context.setConfig(m_config);
-        m_context.setResultCapture(this);
-        m_reporter->testRunStarting(m_runInfo);
-    }
-
-    RunContext::~RunContext() {
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
-    }
-
-    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
-    }
-
-    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
-    }
-
-    Totals RunContext::runTest(TestCase const& testCase) {
-        Totals prevTotals = m_totals;
-
-        std::string redirectedCout;
-        std::string redirectedCerr;
-
-        auto const& testInfo = testCase.getTestCaseInfo();
-
-        m_reporter->testCaseStarting(testInfo);
-
-        m_activeTestCase = &testCase;
-
-        ITracker& rootTracker = m_trackerContext.startRun();
-        assert(rootTracker.isSectionTracker());
-        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
-        do {
-            m_trackerContext.startCycle();
-            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
-            runCurrentTest(redirectedCout, redirectedCerr);
-        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
-
-        Totals deltaTotals = m_totals.delta(prevTotals);
-        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
-            deltaTotals.assertions.failed++;
-            deltaTotals.testCases.passed--;
-            deltaTotals.testCases.failed++;
-        }
-        m_totals.testCases += deltaTotals.testCases;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  redirectedCout,
-                                  redirectedCerr,
-                                  aborting()));
-
-        m_activeTestCase = nullptr;
-        m_testCaseTracker = nullptr;
-
-        return deltaTotals;
-    }
-
-    IConfigPtr RunContext::config() const {
-        return m_config;
-    }
-
-    IStreamingReporter& RunContext::reporter() const {
-        return *m_reporter;
-    }
-
-    void RunContext::assertionEnded(AssertionResult const & result) {
-        if (result.getResultType() == ResultWas::Ok) {
-            m_totals.assertions.passed++;
-            m_lastAssertionPassed = true;
-        } else if (!result.isOk()) {
-            m_lastAssertionPassed = false;
-            if( m_activeTestCase->getTestCaseInfo().okToFail() )
-                m_totals.assertions.failedButOk++;
-            else
-                m_totals.assertions.failed++;
-        }
-        else {
-            m_lastAssertionPassed = true;
-        }
-
-        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
-        // and should be let to clear themselves out.
-        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
-
-        if (result.getResultType() != ResultWas::Warning)
-            m_messageScopes.clear();
-
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
-    }
-    void RunContext::resetAssertionInfo() {
-        m_lastAssertionInfo.macroName = StringRef();
-        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
-    }
-
-    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
-        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
-        if (!sectionTracker.isOpen())
-            return false;
-        m_activeSections.push_back(&sectionTracker);
-
-        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-        m_reporter->sectionStarting(sectionInfo);
-
-        assertions = m_totals.assertions;
-
-        return true;
-    }
-    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        using namespace Generators;
-        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
-                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
-        m_lastAssertionInfo.lineInfo = lineInfo;
-        return tracker;
-    }
-
-    bool RunContext::testForMissingAssertions(Counts& assertions) {
-        if (assertions.total() != 0)
-            return false;
-        if (!m_config->warnAboutMissingAssertions())
-            return false;
-        if (m_trackerContext.currentTracker().hasChildren())
-            return false;
-        m_totals.assertions.failed++;
-        assertions.failed++;
-        return true;
-    }
-
-    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
-        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        if (!m_activeSections.empty()) {
-            m_activeSections.back()->close();
-            m_activeSections.pop_back();
-        }
-
-        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
-        m_messages.clear();
-        m_messageScopes.clear();
-    }
-
-    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
-        if (m_unfinishedSections.empty())
-            m_activeSections.back()->fail();
-        else
-            m_activeSections.back()->close();
-        m_activeSections.pop_back();
-
-        m_unfinishedSections.push_back(endInfo);
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void RunContext::benchmarkPreparing(std::string const& name) {
-        m_reporter->benchmarkPreparing(name);
-    }
-    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
-        m_reporter->benchmarkStarting( info );
-    }
-    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
-        m_reporter->benchmarkEnded( stats );
-    }
-    void RunContext::benchmarkFailed(std::string const & error) {
-        m_reporter->benchmarkFailed(error);
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void RunContext::pushScopedMessage(MessageInfo const & message) {
-        m_messages.push_back(message);
-    }
-
-    void RunContext::popScopedMessage(MessageInfo const & message) {
-        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
-    }
-
-    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
-        m_messageScopes.emplace_back( builder );
-    }
-
-    std::string RunContext::getCurrentTestName() const {
-        return m_activeTestCase
-            ? m_activeTestCase->getTestCaseInfo().name
-            : std::string();
-    }
-
-    const AssertionResult * RunContext::getLastResult() const {
-        return &(*m_lastResult);
-    }
-
-    void RunContext::exceptionEarlyReported() {
-        m_shouldReportUnexpected = false;
-    }
-
-    void RunContext::handleFatalErrorCondition( StringRef message ) {
-        // First notify reporter that bad things happened
-        m_reporter->fatalErrorEncountered(message);
-
-        // Don't rebuild the result -- the stringification itself can cause more fatal errors
-        // Instead, fake a result data.
-        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = static_cast<std::string>(message);
-        AssertionResult result(m_lastAssertionInfo, tempResult);
-
-        assertionEnded(result);
-
-        handleUnfinishedSections();
-
-        // Recreate section for test case (as we will lose the one that was in scope)
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-
-        Counts assertions;
-        assertions.failed = 1;
-        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
-        m_reporter->sectionEnded(testCaseSectionStats);
-
-        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
-
-        Totals deltaTotals;
-        deltaTotals.testCases.failed = 1;
-        deltaTotals.assertions.failed = 1;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  std::string(),
-                                  std::string(),
-                                  false));
-        m_totals.testCases.failed++;
-        testGroupEnded(std::string(), m_totals, 1, 1);
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
-    }
-
-    bool RunContext::lastAssertionPassed() {
-         return m_lastAssertionPassed;
-    }
-
-    void RunContext::assertionPassed() {
-        m_lastAssertionPassed = true;
-        ++m_totals.assertions.passed;
-        resetAssertionInfo();
-        m_messageScopes.clear();
-    }
-
-    bool RunContext::aborting() const {
-        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
-    }
-
-    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-        m_reporter->sectionStarting(testCaseSection);
-        Counts prevAssertions = m_totals.assertions;
-        double duration = 0;
-        m_shouldReportUnexpected = true;
-        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
-
-        seedRng(*m_config);
-
-        Timer timer;
-        CATCH_TRY {
-            if (m_reporter->getPreferences().shouldRedirectStdOut) {
-#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
-
-                timer.start();
-                invokeActiveTestCase();
-#else
-                OutputRedirect r(redirectedCout, redirectedCerr);
-                timer.start();
-                invokeActiveTestCase();
-#endif
-            } else {
-                timer.start();
-                invokeActiveTestCase();
-            }
-            duration = timer.getElapsedSeconds();
-        } CATCH_CATCH_ANON (TestFailureException&) {
-            // This just means the test was aborted due to failure
-        } CATCH_CATCH_ALL {
-            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
-            // are reported without translation at the point of origin.
-            if( m_shouldReportUnexpected ) {
-                AssertionReaction dummyReaction;
-                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
-            }
-        }
-        Counts assertions = m_totals.assertions - prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        m_testCaseTracker->close();
-        handleUnfinishedSections();
-        m_messages.clear();
-        m_messageScopes.clear();
-
-        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
-        m_reporter->sectionEnded(testCaseSectionStats);
-    }
-
-    void RunContext::invokeActiveTestCase() {
-        FatalConditionHandlerGuard _(&m_fatalConditionhandler);
-        m_activeTestCase->invoke();
-    }
-
-    void RunContext::handleUnfinishedSections() {
-        // If sections ended prematurely due to an exception we stored their
-        // infos here so we can tear them down outside the unwind process.
-        for (auto it = m_unfinishedSections.rbegin(),
-             itEnd = m_unfinishedSections.rend();
-             it != itEnd;
-             ++it)
-            sectionEnded(*it);
-        m_unfinishedSections.clear();
-    }
-
-    void RunContext::handleExpr(
-        AssertionInfo const& info,
-        ITransientExpression const& expr,
-        AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        bool negated = isFalseTest( info.resultDisposition );
-        bool result = expr.getResult() != negated;
-
-        if( result ) {
-            if (!m_includeSuccessfulResults) {
-                assertionPassed();
-            }
-            else {
-                reportExpr(info, ResultWas::Ok, &expr, negated);
-            }
-        }
-        else {
-            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
-            populateReaction( reaction );
-        }
-    }
-    void RunContext::reportExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            ITransientExpression const *expr,
-            bool negated ) {
-
-        m_lastAssertionInfo = info;
-        AssertionResultData data( resultType, LazyExpression( negated ) );
-
-        AssertionResult assertionResult{ info, data };
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
-
-        assertionEnded( assertionResult );
-    }
-
-    void RunContext::handleMessage(
-            AssertionInfo const& info,
-            ResultWas::OfType resultType,
-            StringRef const& message,
-            AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = static_cast<std::string>(message);
-        AssertionResult assertionResult{ m_lastAssertionInfo, data };
-        assertionEnded( assertionResult );
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-    void RunContext::handleUnexpectedExceptionNotThrown(
-            AssertionInfo const& info,
-            AssertionReaction& reaction
-    ) {
-        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
-    }
-
-    void RunContext::handleUnexpectedInflightException(
-            AssertionInfo const& info,
-            std::string const& message,
-            AssertionReaction& reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-        populateReaction( reaction );
-    }
-
-    void RunContext::populateReaction( AssertionReaction& reaction ) {
-        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
-        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
-    }
-
-    void RunContext::handleIncomplete(
-            AssertionInfo const& info
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-    }
-    void RunContext::handleNonExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            AssertionReaction &reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-
-    IResultCapture& getResultCapture() {
-        if (auto* capture = getCurrentContext().getResultCapture())
-            return *capture;
-        else
-            CATCH_INTERNAL_ERROR("No result capture instance");
-    }
-
-    void seedRng(IConfig const& config) {
-        if (config.rngSeed() != 0) {
-            std::srand(config.rngSeed());
-            rng().seed(config.rngSeed());
-        }
-    }
-
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-}
-// end catch_run_context.cpp
-// start catch_section.cpp
-
-namespace Catch {
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
-            if( uncaught_exceptions() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-// end catch_section.cpp
-// start catch_section_info.cpp
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name )
-    :   name( _name ),
-        lineInfo( _lineInfo )
-    {}
-
-} // end namespace Catch
-// end catch_section_info.cpp
-// start catch_session.cpp
-
-// start catch_session.h
-
-#include <memory>
-
-namespace Catch {
-
-    class Session : NonCopyable {
-    public:
-
-        Session();
-        ~Session() override;
-
-        void showHelp() const;
-        void libIdentify();
-
-        int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-        int applyCommandLine( int argc, wchar_t const * const * argv );
-    #endif
-
-        void useConfigData( ConfigData const& configData );
-
-        template<typename CharT>
-        int run(int argc, CharT const * const argv[]) {
-            if (m_startupExceptions)
-                return 1;
-            int returnCode = applyCommandLine(argc, argv);
-            if (returnCode == 0)
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run();
-
-        clara::Parser const& cli() const;
-        void cli( clara::Parser const& newParser );
-        ConfigData& configData();
-        Config& config();
-    private:
-        int runInternal();
-
-        clara::Parser m_cli;
-        ConfigData m_configData;
-        std::shared_ptr<Config> m_config;
-        bool m_startupExceptions = false;
-    };
-
-} // end namespace Catch
-
-// end catch_session.h
-// start catch_version.h
-
-#include <iosfwd>
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version( Version const& ) = delete;
-        Version& operator=( Version const& ) = delete;
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    char const * const _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        char const * const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-    };
-
-    Version const& libraryVersion();
-}
-
-// end catch_version.h
-#include <cstdlib>
-#include <iomanip>
-#include <set>
-#include <iterator>
-
-namespace Catch {
-
-    namespace {
-        const int MaxExitCode = 255;
-
-        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
-            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
-            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
-
-            return reporter;
-        }
-
-        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
-            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
-                return createReporter(config->getReporterName(), config);
-            }
-
-            // On older platforms, returning std::unique_ptr<ListeningReporter>
-            // when the return type is std::unique_ptr<IStreamingReporter>
-            // doesn't compile without a std::move call. However, this causes
-            // a warning on newer platforms. Thus, we have to work around
-            // it a bit and downcast the pointer manually.
-            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-            auto& multi = static_cast<ListeningReporter&>(*ret);
-            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
-            for (auto const& listener : listeners) {
-                multi.addListener(listener->create(Catch::ReporterConfig(config)));
-            }
-            multi.addReporter(createReporter(config->getReporterName(), config));
-            return ret;
-        }
-
-        class TestGroup {
-        public:
-            explicit TestGroup(std::shared_ptr<Config> const& config)
-            : m_config{config}
-            , m_context{config, makeReporter(config)}
-            {
-                auto const& allTestCases = getAllTestCasesSorted(*m_config);
-                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-
-                if (m_matches.empty() && invalidArgs.empty()) {
-                    for (auto const& test : allTestCases)
-                        if (!test.isHidden())
-                            m_tests.emplace(&test);
-                } else {
-                    for (auto const& match : m_matches)
-                        m_tests.insert(match.tests.begin(), match.tests.end());
-                }
-            }
-
-            Totals execute() {
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-                Totals totals;
-                m_context.testGroupStarting(m_config->name(), 1, 1);
-                for (auto const& testCase : m_tests) {
-                    if (!m_context.aborting())
-                        totals += m_context.runTest(*testCase);
-                    else
-                        m_context.reporter().skipTest(*testCase);
-                }
-
-                for (auto const& match : m_matches) {
-                    if (match.tests.empty()) {
-                        m_context.reporter().noMatchingTestCases(match.name);
-                        totals.error = -1;
-                    }
-                }
-
-                if (!invalidArgs.empty()) {
-                    for (auto const& invalidArg: invalidArgs)
-                         m_context.reporter().reportInvalidArguments(invalidArg);
-                }
-
-                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
-                return totals;
-            }
-
-        private:
-            using Tests = std::set<TestCase const*>;
-
-            std::shared_ptr<Config> m_config;
-            RunContext m_context;
-            Tests m_tests;
-            TestSpec::Matches m_matches;
-        };
-
-        void applyFilenamesAsTags(Catch::IConfig const& config) {
-            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
-            for (auto& testCase : tests) {
-                auto tags = testCase.tags;
-
-                std::string filename = testCase.lineInfo.file;
-                auto lastSlash = filename.find_last_of("\\/");
-                if (lastSlash != std::string::npos) {
-                    filename.erase(0, lastSlash);
-                    filename[0] = '#';
-                }
-
-                auto lastDot = filename.find_last_of('.');
-                if (lastDot != std::string::npos) {
-                    filename.erase(lastDot);
-                }
-
-                tags.push_back(std::move(filename));
-                setTags(testCase, tags);
-            }
-        }
-
-    } // anon namespace
-
-    Session::Session() {
-        static bool alreadyInstantiated = false;
-        if( alreadyInstantiated ) {
-            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
-        }
-
-        // There cannot be exceptions at startup in no-exception mode.
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
-        if ( !exceptions.empty() ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-
-            m_startupExceptions = true;
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << "Errors occurred during startup!" << '\n';
-            // iterate over all exceptions and notify user
-            for ( const auto& ex_ptr : exceptions ) {
-                try {
-                    std::rethrow_exception(ex_ptr);
-                } catch ( std::exception const& ex ) {
-                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
-                }
-            }
-        }
-#endif
-
-        alreadyInstantiated = true;
-        m_cli = makeCommandLineParser( m_configData );
-    }
-    Session::~Session() {
-        Catch::cleanUp();
-    }
-
-    void Session::showHelp() const {
-        Catch::cout()
-                << "\nCatch v" << libraryVersion() << "\n"
-                << m_cli << std::endl
-                << "For more detailed usage please see the project docs\n" << std::endl;
-    }
-    void Session::libIdentify() {
-        Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
-                << std::left << std::setw(16) << "category: " << "testframework\n"
-                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
-                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
-    }
-
-    int Session::applyCommandLine( int argc, char const * const * argv ) {
-        if( m_startupExceptions )
-            return 1;
-
-        auto result = m_cli.parse( clara::Args( argc, argv ) );
-        if( !result ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-            Catch::cerr()
-                << Colour( Colour::Red )
-                << "\nError(s) in input:\n"
-                << Column( result.errorMessage() ).indent( 2 )
-                << "\n\n";
-            Catch::cerr() << "Run with -? for usage\n" << std::endl;
-            return MaxExitCode;
-        }
-
-        if( m_configData.showHelp )
-            showHelp();
-        if( m_configData.libIdentify )
-            libIdentify();
-        m_config.reset();
-        return 0;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
-
-        char **utf8Argv = new char *[ argc ];
-
-        for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
-
-            utf8Argv[ i ] = new char[ bufSize ];
-
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
-        }
-
-        int returnCode = applyCommandLine( argc, utf8Argv );
-
-        for ( int i = 0; i < argc; ++i )
-            delete [] utf8Argv[ i ];
-
-        delete [] utf8Argv;
-
-        return returnCode;
-    }
-#endif
-
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run() {
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        int exitCode = runInternal();
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        return exitCode;
-    }
-
-    clara::Parser const& Session::cli() const {
-        return m_cli;
-    }
-    void Session::cli( clara::Parser const& newParser ) {
-        m_cli = newParser;
-    }
-    ConfigData& Session::configData() {
-        return m_configData;
-    }
-    Config& Session::config() {
-        if( !m_config )
-            m_config = std::make_shared<Config>( m_configData );
-        return *m_config;
-    }
-
-    int Session::runInternal() {
-        if( m_startupExceptions )
-            return 1;
-
-        if (m_configData.showHelp || m_configData.libIdentify) {
-            return 0;
-        }
-
-        CATCH_TRY {
-            config(); // Force config to be constructed
-
-            seedRng( *m_config );
-
-            if( m_configData.filenamesAsTags )
-                applyFilenamesAsTags( *m_config );
-
-            // Handle list request
-            if( Option<std::size_t> listed = list( m_config ) )
-                return static_cast<int>( *listed );
-
-            TestGroup tests { m_config };
-            auto const totals = tests.execute();
-
-            if( m_config->warnAboutNoTests() && totals.error == -1 )
-                return 2;
-
-            // Note that on unices only the lower 8 bits are usually used, clamping
-            // the return value to 255 prevents false negative when some multiple
-            // of 256 tests has failed
-            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
-        }
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        catch( std::exception& ex ) {
-            Catch::cerr() << ex.what() << std::endl;
-            return MaxExitCode;
-        }
-#endif
-    }
-
-} // end namespace Catch
-// end catch_session.cpp
-// start catch_singletons.cpp
-
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        static auto getSingletons() -> std::vector<ISingleton*>*& {
-            static std::vector<ISingleton*>* g_singletons = nullptr;
-            if( !g_singletons )
-                g_singletons = new std::vector<ISingleton*>();
-            return g_singletons;
-        }
-    }
-
-    ISingleton::~ISingleton() {}
-
-    void addSingleton(ISingleton* singleton ) {
-        getSingletons()->push_back( singleton );
-    }
-    void cleanupSingletons() {
-        auto& singletons = getSingletons();
-        for( auto singleton : *singletons )
-            delete singleton;
-        delete singletons;
-        singletons = nullptr;
-    }
-
-} // namespace Catch
-// end catch_singletons.cpp
-// start catch_startup_exception_registry.cpp
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-namespace Catch {
-void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        CATCH_TRY {
-            m_exceptions.push_back(exception);
-        } CATCH_CATCH_ALL {
-            // If we run out of memory during start-up there's really not a lot more we can do about it
-            std::terminate();
-        }
-    }
-
-    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
-        return m_exceptions;
-    }
-
-} // end namespace Catch
-#endif
-// end catch_startup_exception_registry.cpp
-// start catch_stream.cpp
-
-#include <cstdio>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    Catch::IStream::~IStream() = default;
-
-    namespace Detail { namespace {
-        template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
-            char data[bufferSize];
-            WriterF m_writer;
-
-        public:
-            StreamBufImpl() {
-                setp( data, data + sizeof(data) );
-            }
-
-            ~StreamBufImpl() noexcept {
-                StreamBufImpl::sync();
-            }
-
-        private:
-            int overflow( int c ) override {
-                sync();
-
-                if( c != EOF ) {
-                    if( pbase() == epptr() )
-                        m_writer( std::string( 1, static_cast<char>( c ) ) );
-                    else
-                        sputc( static_cast<char>( c ) );
-                }
-                return 0;
-            }
-
-            int sync() override {
-                if( pbase() != pptr() ) {
-                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                    setp( pbase(), epptr() );
-                }
-                return 0;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        struct OutputDebugWriter {
-
-            void operator()( std::string const&str ) {
-                writeToDebugConsole( str );
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class FileStream : public IStream {
-            mutable std::ofstream m_ofs;
-        public:
-            FileStream( StringRef filename ) {
-                m_ofs.open( filename.c_str() );
-                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
-            }
-            ~FileStream() override = default;
-        public: // IStream
-            std::ostream& stream() const override {
-                return m_ofs;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class CoutStream : public IStream {
-            mutable std::ostream m_os;
-        public:
-            // Store the streambuf from cout up-front because
-            // cout may get redirected when running tests
-            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class DebugOutStream : public IStream {
-            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
-            mutable std::ostream m_os;
-        public:
-            DebugOutStream()
-            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-                m_os( m_streamBuf.get() )
-            {}
-
-            ~DebugOutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-    }} // namespace anon::detail
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    auto makeStream( StringRef const &filename ) -> IStream const* {
-        if( filename.empty() )
-            return new Detail::CoutStream();
-        else if( filename[0] == '%' ) {
-            if( filename == "%debug" )
-                return new Detail::DebugOutStream();
-            else
-                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
-        }
-        else
-            return new Detail::FileStream( filename );
-    }
-
-    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
-    struct StringStreams {
-        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
-        std::vector<std::size_t> m_unused;
-        std::ostringstream m_referenceStream; // Used for copy state/ flags from
-
-        auto add() -> std::size_t {
-            if( m_unused.empty() ) {
-                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
-                return m_streams.size()-1;
-            }
-            else {
-                auto index = m_unused.back();
-                m_unused.pop_back();
-                return index;
-            }
-        }
-
-        void release( std::size_t index ) {
-            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
-            m_unused.push_back(index);
-        }
-    };
-
-    ReusableStringStream::ReusableStringStream()
-    :   m_index( Singleton<StringStreams>::getMutable().add() ),
-        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
-    {}
-
-    ReusableStringStream::~ReusableStringStream() {
-        static_cast<std::ostringstream*>( m_oss )->str("");
-        m_oss->clear();
-        Singleton<StringStreams>::getMutable().release( m_index );
-    }
-
-    auto ReusableStringStream::str() const -> std::string {
-        return static_cast<std::ostringstream*>( m_oss )->str();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() { return std::cout; }
-    std::ostream& cerr() { return std::cerr; }
-    std::ostream& clog() { return std::clog; }
-#endif
-}
-// end catch_stream.cpp
-// start catch_string_manip.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cctype>
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
-        }
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
-    }
-    bool startsWith( std::string const& s, char prefix ) {
-        return !s.empty() && s[0] == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    }
-    bool endsWith( std::string const& s, char suffix ) {
-        return !s.empty() && s[s.size()-1] == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
-    }
-
-    StringRef trim(StringRef ref) {
-        const auto is_ws = [](char c) {
-            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-        };
-        size_t real_begin = 0;
-        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
-        size_t real_end = ref.size();
-        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
-
-        return ref.substr(real_begin, real_end - real_begin);
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
-        std::vector<StringRef> subStrings;
-        std::size_t start = 0;
-        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
-            if( str[pos] == delimiter ) {
-                if( pos - start > 1 )
-                    subStrings.push_back( str.substr( start, pos-start ) );
-                start = pos+1;
-            }
-        }
-        if( start < str.size() )
-            subStrings.push_back( str.substr( start, str.size()-start ) );
-        return subStrings;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << ' ' << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << 's';
-        return os;
-    }
-
-}
-// end catch_string_manip.cpp
-// start catch_stringref.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cstdint>
-
-namespace Catch {
-    StringRef::StringRef( char const* rawChars ) noexcept
-    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
-    {}
-
-    auto StringRef::c_str() const -> char const* {
-        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
-        return m_start;
-    }
-    auto StringRef::data() const noexcept -> char const* {
-        return m_start;
-    }
-
-    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if (start < m_size) {
-            return StringRef(m_start + start, (std::min)(m_size - start, size));
-        } else {
-            return StringRef();
-        }
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return m_size == other.m_size
-            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-    }
-
-    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.data(), str.size());
-    }
-
-    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.data(), rhs.size());
-        return lhs;
-    }
-
-} // namespace Catch
-// end catch_stringref.cpp
-// start catch_tag_alias.cpp
-
-namespace Catch {
-    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
-}
-// end catch_tag_alias.cpp
-// start catch_tag_alias_autoregistrar.cpp
-
-namespace Catch {
-
-    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        CATCH_TRY {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-}
-// end catch_tag_alias_autoregistrar.cpp
-// start catch_tag_alias_registry.cpp
-
-#include <sstream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
-        auto it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return &(it->second);
-        else
-            return nullptr;
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( auto const& registryKvp : m_registry ) {
-            std::size_t pos = expandedTestSpec.find( registryKvp.first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    registryKvp.second.tag +
-                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
-        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
-                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
-
-        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
-                      "error: tag alias, '" << alias << "' already registered.\n"
-                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
-                      << "\tRedefined at: " << lineInfo );
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-
-    ITagAliasRegistry const& ITagAliasRegistry::get() {
-        return getRegistryHub().getTagAliasRegistry();
-    }
-
-} // end namespace Catch
-// end catch_tag_alias_registry.cpp
-// start catch_test_case_info.cpp
-
-#include <cctype>
-#include <exception>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-            if( startsWith( tag, '.' ) ||
-                tag == "!hide" )
-                return TestCaseInfo::IsHidden;
-            else if( tag == "!throws" )
-                return TestCaseInfo::Throws;
-            else if( tag == "!shouldfail" )
-                return TestCaseInfo::ShouldFail;
-            else if( tag == "!mayfail" )
-                return TestCaseInfo::MayFail;
-            else if( tag == "!nonportable" )
-                return TestCaseInfo::NonPortable;
-            else if( tag == "!benchmark" )
-                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
-            else
-                return TestCaseInfo::None;
-        }
-        bool isReservedTag( std::string const& tag ) {
-            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
-        }
-        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-            CATCH_ENFORCE( !isReservedTag(tag),
-                          "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alphanumeric characters are reserved\n"
-                          << _lineInfo );
-        }
-    }
-
-    TestCase makeTestCase(  ITestInvoker* _testCase,
-                            std::string const& _className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden = false;
-
-        // Parse out tags
-        std::vector<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for (char c : nameAndTags.tags) {
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    // Merged hide tags like `[.approvals]` should be added as
-                    // `[.][approvals]`. The `[.]` is added at later point, so
-                    // we only strip the prefix
-                    if (startsWith(tag, '.') && tag.size() > 1) {
-                        tag.erase(0, 1);
-                    }
-                    tags.push_back( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            // Add all "hidden" tags to make them behave identically
-            tags.insert( tags.end(), { ".", "!hide" } );
-        }
-
-        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, std::move(info) );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
-        std::sort(begin(tags), end(tags));
-        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
-        testCaseInfo.lcaseTags.clear();
-
-        for( auto const& tag : tags ) {
-            std::string lcaseTag = toLower( tag );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.push_back( lcaseTag );
-        }
-        testCaseInfo.tags = std::move(tags);
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::vector<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    std::string TestCaseInfo::tagsAsString() const {
-        std::string ret;
-        // '[' and ']' per tag
-        std::size_t full_size = 2 * tags.size();
-        for (const auto& tag : tags) {
-            full_size += tag.size();
-        }
-        ret.reserve(full_size);
-        for (const auto& tag : tags) {
-            ret.push_back('[');
-            ret.append(tag);
-            ret.push_back(']');
-        }
-
-        return ret;
-    }
-
-    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-// end catch_test_case_info.cpp
-// start catch_test_case_registry_impl.cpp
-
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        struct TestHasher {
-            using hash_t = uint64_t;
-
-            explicit TestHasher( hash_t hashSuffix ):
-                m_hashSuffix{ hashSuffix } {}
-
-            uint32_t operator()( TestCase const& t ) const {
-                // FNV-1a hash with multiplication fold.
-                const hash_t prime = 1099511628211u;
-                hash_t hash = 14695981039346656037u;
-                for ( const char c : t.name ) {
-                    hash ^= c;
-                    hash *= prime;
-                }
-                hash ^= m_hashSuffix;
-                hash *= prime;
-                const uint32_t low{ static_cast<uint32_t>( hash ) };
-                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
-                return low * high;
-            }
-
-        private:
-            hash_t m_hashSuffix;
-        };
-    } // end unnamed namespace
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        switch( config.runOrder() ) {
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-
-            case RunTests::InLexicographicalOrder: {
-                std::vector<TestCase> sorted = unsortedTestCases;
-                std::sort( sorted.begin(), sorted.end() );
-                return sorted;
-            }
-
-            case RunTests::InRandomOrder: {
-                seedRng( config );
-                TestHasher h{ config.rngSeed() };
-
-                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
-                std::vector<hashedTest> indexed_tests;
-                indexed_tests.reserve( unsortedTestCases.size() );
-
-                for (auto const& testCase : unsortedTestCases) {
-                    indexed_tests.emplace_back(h(testCase), &testCase);
-                }
-
-                std::sort(indexed_tests.begin(), indexed_tests.end(),
-                          [](hashedTest const& lhs, hashedTest const& rhs) {
-                          if (lhs.first == rhs.first) {
-                              return lhs.second->name < rhs.second->name;
-                          }
-                          return lhs.first < rhs.first;
-                });
-
-                std::vector<TestCase> sorted;
-                sorted.reserve( indexed_tests.size() );
-
-                for (auto const& hashed : indexed_tests) {
-                    sorted.emplace_back(*hashed.second);
-                }
-
-                return sorted;
-            }
-        }
-        return unsortedTestCases;
-    }
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
-        return !testCase.throws() || config.allowThrows();
-    }
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( auto const& function : functions ) {
-            auto prev = seenFunctions.insert( function );
-            CATCH_ENFORCE( prev.second,
-                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
-                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for (auto const& testCase : testCases) {
-            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
-                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
-                filtered.push_back(testCase);
-            }
-        }
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    void TestRegistry::registerTest( TestCase const& testCase ) {
-        std::string name = testCase.getTestCaseInfo().name;
-        if( name.empty() ) {
-            ReusableStringStream rss;
-            rss << "Anonymous test case " << ++m_unnamedCount;
-            return registerTest( testCase.withName( rss.str() ) );
-        }
-        m_functions.push_back( testCase );
-    }
-
-    std::vector<TestCase> const& TestRegistry::getAllTests() const {
-        return m_functions;
-    }
-    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
-        if( m_sortedFunctions.empty() )
-            enforceNoDuplicateTestCases( m_functions );
-
-        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-            m_sortedFunctions = sortTests( config, m_functions );
-            m_currentSortOrder = config.runOrder();
-        }
-        return m_sortedFunctions;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
-
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className(classOrQualifiedMethodName);
-        if( startsWith( className, '&' ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-} // end namespace Catch
-// end catch_test_case_registry_impl.cpp
-// start catch_test_case_tracker.cpp
-
-#include <algorithm>
-#include <cassert>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
-    :   name( _name ),
-        location( _location )
-    {}
-
-    ITracker::~ITracker() = default;
-
-    ITracker& TrackerContext::startRun() {
-        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
-        m_currentTracker = nullptr;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-    void TrackerContext::endRun() {
-        m_rootTracker.reset();
-        m_currentTracker = nullptr;
-        m_runState = NotStarted;
-    }
-
-    void TrackerContext::startCycle() {
-        m_currentTracker = m_rootTracker.get();
-        m_runState = Executing;
-    }
-    void TrackerContext::completeCycle() {
-        m_runState = CompletedCycle;
-    }
-
-    bool TrackerContext::completedCycle() const {
-        return m_runState == CompletedCycle;
-    }
-    ITracker& TrackerContext::currentTracker() {
-        return *m_currentTracker;
-    }
-    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
-        m_currentTracker = tracker;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
-        ITracker(nameAndLocation),
-        m_ctx( ctx ),
-        m_parent( parent )
-    {}
-
-    bool TrackerBase::isComplete() const {
-        return m_runState == CompletedSuccessfully || m_runState == Failed;
-    }
-    bool TrackerBase::isSuccessfullyCompleted() const {
-        return m_runState == CompletedSuccessfully;
-    }
-    bool TrackerBase::isOpen() const {
-        return m_runState != NotStarted && !isComplete();
-    }
-    bool TrackerBase::hasChildren() const {
-        return !m_children.empty();
-    }
-
-    void TrackerBase::addChild( ITrackerPtr const& child ) {
-        m_children.push_back( child );
-    }
-
-    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(),
-            [&nameAndLocation]( ITrackerPtr const& tracker ){
-                return
-                    tracker->nameAndLocation().location == nameAndLocation.location &&
-                    tracker->nameAndLocation().name == nameAndLocation.name;
-            } );
-        return( it != m_children.end() )
-            ? *it
-            : nullptr;
-    }
-    ITracker& TrackerBase::parent() {
-        assert( m_parent ); // Should always be non-null except for root
-        return *m_parent;
-    }
-
-    void TrackerBase::openChild() {
-        if( m_runState != ExecutingChildren ) {
-            m_runState = ExecutingChildren;
-            if( m_parent )
-                m_parent->openChild();
-        }
-    }
-
-    bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isGeneratorTracker() const { return false; }
-
-    void TrackerBase::open() {
-        m_runState = Executing;
-        moveToThis();
-        if( m_parent )
-            m_parent->openChild();
-    }
-
-    void TrackerBase::close() {
-
-        // Close any still open children (e.g. generators)
-        while( &m_ctx.currentTracker() != this )
-            m_ctx.currentTracker().close();
-
-        switch( m_runState ) {
-            case NeedsAnotherRun:
-                break;
-
-            case Executing:
-                m_runState = CompletedSuccessfully;
-                break;
-            case ExecutingChildren:
-                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
-                    m_runState = CompletedSuccessfully;
-                break;
-
-            case NotStarted:
-            case CompletedSuccessfully:
-            case Failed:
-                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
-
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
-        }
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::fail() {
-        m_runState = Failed;
-        if( m_parent )
-            m_parent->markAsNeedingAnotherRun();
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::markAsNeedingAnotherRun() {
-        m_runState = NeedsAnotherRun;
-    }
-
-    void TrackerBase::moveToParent() {
-        assert( m_parent );
-        m_ctx.setCurrentTracker( m_parent );
-    }
-    void TrackerBase::moveToThis() {
-        m_ctx.setCurrentTracker( this );
-    }
-
-    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_trimmed_name(trim(nameAndLocation.name))
-    {
-        if( parent ) {
-            while( !parent->isSectionTracker() )
-                parent = &parent->parent();
-
-            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
-            addNextFilters( parentSection.m_filters );
-        }
-    }
-
-    bool SectionTracker::isComplete() const {
-        bool complete = true;
-
-        if (m_filters.empty()
-            || m_filters[0] == ""
-            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
-            complete = TrackerBase::isComplete();
-        }
-        return complete;
-    }
-
-    bool SectionTracker::isSectionTracker() const { return true; }
-
-    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
-        std::shared_ptr<SectionTracker> section;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isSectionTracker() );
-            section = std::static_pointer_cast<SectionTracker>( childTracker );
-        }
-        else {
-            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
-            currentTracker.addChild( section );
-        }
-        if( !ctx.completedCycle() )
-            section->tryOpen();
-        return *section;
-    }
-
-    void SectionTracker::tryOpen() {
-        if( !isComplete() )
-            open();
-    }
-
-    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
-        if( !filters.empty() ) {
-            m_filters.reserve( m_filters.size() + filters.size() + 2 );
-            m_filters.emplace_back(""); // Root - should never be consulted
-            m_filters.emplace_back(""); // Test Case - not a section filter
-            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
-        }
-    }
-    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
-        if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
-    }
-
-    std::vector<std::string> const& SectionTracker::getFilters() const {
-        return m_filters;
-    }
-
-    std::string const& SectionTracker::trimmedName() const {
-        return m_trimmed_name;
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-// end catch_test_case_tracker.cpp
-// start catch_test_registry.cpp
-
-namespace Catch {
-
-    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
-        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
-    }
-
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
-    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        CATCH_TRY {
-            getMutableRegistryHub()
-                    .registerTest(
-                        makeTestCase(
-                            invoker,
-                            extractClassName( classOrMethod ),
-                            nameAndTags,
-                            lineInfo));
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-    AutoReg::~AutoReg() = default;
-}
-// end catch_test_registry.cpp
-// start catch_test_spec.cpp
-
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    TestSpec::Pattern::Pattern( std::string const& name )
-    : m_name( name )
-    {}
-
-    TestSpec::Pattern::~Pattern() = default;
-
-    std::string const& TestSpec::Pattern::name() const {
-        return m_name;
-    }
-
-    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
-    : Pattern( filterString )
-    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
-    {}
-
-    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( testCase.name );
-    }
-
-    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
-    : Pattern( filterString )
-    , m_tag( toLower( tag ) )
-    {}
-
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
-    }
-
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
-    : Pattern( underlyingPattern->name() )
-    , m_underlyingPattern( underlyingPattern )
-    {}
-
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
-        return !m_underlyingPattern->matches( testCase );
-    }
-
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
-    }
-
-    std::string TestSpec::Filter::name() const {
-        std::string name;
-        for( auto const& p : m_patterns )
-            name += p->name();
-        return name;
-    }
-
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
-    }
-
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
-            std::vector<TestCase const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test ) )
-                    currentMatches.emplace_back( &test );
-            return FilterMatch{ filter.name(), currentMatches };
-        } );
-        return matches;
-    }
-
-    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
-        return  (m_invalidArgs);
-    }
-
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
-
-namespace Catch {
-
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
-        m_exclusion = false;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        m_substring.reserve(m_arg.size());
-        m_patternName.reserve(m_arg.size());
-        m_realPatternPos = 0;
-
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-          //if visitChar fails
-           if( !visitChar( m_arg[m_pos] ) ){
-               m_testSpec.m_invalidArgs.push_back(arg);
-               break;
-           }
-        endMode();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
-    }
-    bool TestSpecParser::visitChar( char c ) {
-        if( (m_mode != EscapedName) && (c == '\\') ) {
-            escape();
-            addCharToPattern(c);
-            return true;
-        }else if((m_mode != EscapedName) && (c == ',') )  {
-            return separate();
-        }
-
-        switch( m_mode ) {
-        case None:
-            if( processNoneChar( c ) )
-                return true;
-            break;
-        case Name:
-            processNameChar( c );
-            break;
-        case EscapedName:
-            endMode();
-            addCharToPattern(c);
-            return true;
-        default:
-        case Tag:
-        case QuotedName:
-            if( processOtherChar( c ) )
-                return true;
-            break;
-        }
-
-        m_substring += c;
-        if( !isControlChar( c ) ) {
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-        return true;
-    }
-    // Two of the processing methods return true to signal the caller to return
-    // without adding the given character to the current pattern strings
-    bool TestSpecParser::processNoneChar( char c ) {
-        switch( c ) {
-        case ' ':
-            return true;
-        case '~':
-            m_exclusion = true;
-            return false;
-        case '[':
-            startNewMode( Tag );
-            return false;
-        case '"':
-            startNewMode( QuotedName );
-            return false;
-        default:
-            startNewMode( Name );
-            return false;
-        }
-    }
-    void TestSpecParser::processNameChar( char c ) {
-        if( c == '[' ) {
-            if( m_substring == "exclude:" )
-                m_exclusion = true;
-            else
-                endMode();
-            startNewMode( Tag );
-        }
-    }
-    bool TestSpecParser::processOtherChar( char c ) {
-        if( !isControlChar( c ) )
-            return false;
-        m_substring += c;
-        endMode();
-        return true;
-    }
-    void TestSpecParser::startNewMode( Mode mode ) {
-        m_mode = mode;
-    }
-    void TestSpecParser::endMode() {
-        switch( m_mode ) {
-        case Name:
-        case QuotedName:
-            return addNamePattern();
-        case Tag:
-            return addTagPattern();
-        case EscapedName:
-            revertBackToLastMode();
-            return;
-        case None:
-        default:
-            return startNewMode( None );
-        }
-    }
-    void TestSpecParser::escape() {
-        saveLastMode();
-        m_mode = EscapedName;
-        m_escapeChars.push_back(m_realPatternPos);
-    }
-    bool TestSpecParser::isControlChar( char c ) const {
-        switch( m_mode ) {
-            default:
-                return false;
-            case None:
-                return c == '~';
-            case Name:
-                return c == '[';
-            case EscapedName:
-                return true;
-            case QuotedName:
-                return c == '"';
-            case Tag:
-                return c == '[' || c == ']';
-        }
-    }
-
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
-        }
-    }
-
-    void TestSpecParser::saveLastMode() {
-      lastMode = m_mode;
-    }
-
-    void TestSpecParser::revertBackToLastMode() {
-      m_mode = lastMode;
-    }
-
-    bool TestSpecParser::separate() {
-      if( (m_mode==QuotedName) || (m_mode==Tag) ){
-         //invalid argument, signal failure to previous scope.
-         m_mode = None;
-         m_pos = m_arg.size();
-         m_substring.clear();
-         m_patternName.clear();
-         m_realPatternPos = 0;
-         return false;
-      }
-      endMode();
-      addFilter();
-      return true; //success
-    }
-
-    std::string TestSpecParser::preprocessPattern() {
-        std::string token = m_patternName;
-        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
-            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
-        m_escapeChars.clear();
-        if (startsWith(token, "exclude:")) {
-            m_exclusion = true;
-            token = token.substr(8);
-        }
-
-        m_patternName.clear();
-        m_realPatternPos = 0;
-
-        return token;
-    }
-
-    void TestSpecParser::addNamePattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
-            if (m_exclusion)
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    void TestSpecParser::addTagPattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
-            // we have to create a separate hide tag and shorten the real one
-            if (token.size() > 1 && token[0] == '.') {
-                token.erase(token.begin());
-                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
-                if (m_exclusion) {
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-                }
-                m_currentFilter.m_patterns.push_back(pattern);
-            }
-
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
-
-            if (m_exclusion) {
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            }
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-// end catch_test_spec_parser.cpp
-// start catch_timer.cpp
-
-#include <chrono>
-
-static const uint64_t nanosecondsInSecond = 1000000000;
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
-        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
-    }
-
-    namespace {
-        auto estimateClockResolution() -> uint64_t {
-            uint64_t sum = 0;
-            static const uint64_t iterations = 1000000;
-
-            auto startTime = getCurrentNanosecondsSinceEpoch();
-
-            for( std::size_t i = 0; i < iterations; ++i ) {
-
-                uint64_t ticks;
-                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
-                do {
-                    ticks = getCurrentNanosecondsSinceEpoch();
-                } while( ticks == baseTicks );
-
-                auto delta = ticks - baseTicks;
-                sum += delta;
-
-                // If we have been calibrating for over 3 seconds -- the clock
-                // is terrible and we should move on.
-                // TBD: How to signal that the measured resolution is probably wrong?
-                if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / ( i + 1u );
-                }
-            }
-
-            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
-            // - and potentially do more iterations if there's a high variance.
-            return sum/iterations;
-        }
-    }
-    auto getEstimatedClockResolution() -> uint64_t {
-        static auto s_resolution = estimateClockResolution();
-        return s_resolution;
-    }
-
-    void Timer::start() {
-       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
-    }
-    auto Timer::getElapsedNanoseconds() const -> uint64_t {
-        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
-    }
-    auto Timer::getElapsedMicroseconds() const -> uint64_t {
-        return getElapsedNanoseconds()/1000;
-    }
-    auto Timer::getElapsedMilliseconds() const -> unsigned int {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    auto Timer::getElapsedSeconds() const -> double {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-// end catch_timer.cpp
-// start catch_tostring.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#    pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-// Enable specific decls locally
-#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#endif
-
-#include <cmath>
-#include <iomanip>
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                int one = 1;
-                // If the lowest byte we read is non-zero, we can assume
-                // that little endian format is used.
-                auto value = *reinterpret_cast<char*>(&one);
-                return value ? Little : Big;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size ) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        ReusableStringStream rss;
-        rss << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return rss.str();
-    }
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    if (Catch::isnan(value)) {
-        return "nan";
-    }
-
-    ReusableStringStream rss;
-    rss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = rss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-//// ======================================================= ////
-//
-//   Out-of-line defs for full specialization of StringMaker
-//
-//// ======================================================= ////
-
-std::string StringMaker<std::string>::convert(const std::string& str) {
-    if (!getCurrentContext().getConfig()->showInvisibles()) {
-        return '"' + str + '"';
-    }
-
-    std::string s("\"");
-    for (char c : str) {
-        switch (c) {
-        case '\n':
-            s.append("\\n");
-            break;
-        case '\t':
-            s.append("\\t");
-            break;
-        default:
-            s.push_back(c);
-            break;
-        }
-    }
-    s.append("\"");
-    return s;
-}
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::string_view>::convert(std::string_view str) {
-    return ::Catch::Detail::stringify(std::string{ str });
-}
-#endif
-
-std::string StringMaker<char const*>::convert(char const* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<char*>::convert(char* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
-}
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
-    return StringMaker<std::wstring>::convert(std::wstring(str));
-}
-# endif
-
-std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-#endif
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-#include <cstddef>
-std::string StringMaker<std::byte>::convert(std::byte value) {
-    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
-}
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-
-std::string StringMaker<int>::convert(int value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long>::convert(long value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long long>::convert(long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<unsigned int>::convert(unsigned int value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long>::convert(unsigned long value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<bool>::convert(bool b) {
-    return b ? "true" : "false";
-}
-
-std::string StringMaker<signed char>::convert(signed char value) {
-    if (value == '\r') {
-        return "'\\r'";
-    } else if (value == '\f') {
-        return "'\\f'";
-    } else if (value == '\n') {
-        return "'\\n'";
-    } else if (value == '\t') {
-        return "'\\t'";
-    } else if ('\0' <= value && value < ' ') {
-        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
-    } else {
-        char chstr[] = "' '";
-        chstr[1] = value;
-        return chstr;
-    }
-}
-std::string StringMaker<char>::convert(char c) {
-    return ::Catch::Detail::stringify(static_cast<signed char>(c));
-}
-std::string StringMaker<unsigned char>::convert(unsigned char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
-}
-
-std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
-    return "nullptr";
-}
-
-int StringMaker<float>::precision = 5;
-
-std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, precision) + 'f';
-}
-
-int StringMaker<double>::precision = 10;
-
-std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, precision);
-}
-
-std::string ratio_string<std::atto>::symbol() { return "a"; }
-std::string ratio_string<std::femto>::symbol() { return "f"; }
-std::string ratio_string<std::pico>::symbol() { return "p"; }
-std::string ratio_string<std::nano>::symbol() { return "n"; }
-std::string ratio_string<std::micro>::symbol() { return "u"; }
-std::string ratio_string<std::milli>::symbol() { return "m"; }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_tostring.cpp
-// start catch_totals.cpp
-
-namespace Catch {
-
-    Counts Counts::operator - ( Counts const& other ) const {
-        Counts diff;
-        diff.passed = passed - other.passed;
-        diff.failed = failed - other.failed;
-        diff.failedButOk = failedButOk - other.failedButOk;
-        return diff;
-    }
-
-    Counts& Counts::operator += ( Counts const& other ) {
-        passed += other.passed;
-        failed += other.failed;
-        failedButOk += other.failedButOk;
-        return *this;
-    }
-
-    std::size_t Counts::total() const {
-        return passed + failed + failedButOk;
-    }
-    bool Counts::allPassed() const {
-        return failed == 0 && failedButOk == 0;
-    }
-    bool Counts::allOk() const {
-        return failed == 0;
-    }
-
-    Totals Totals::operator - ( Totals const& other ) const {
-        Totals diff;
-        diff.assertions = assertions - other.assertions;
-        diff.testCases = testCases - other.testCases;
-        return diff;
-    }
-
-    Totals& Totals::operator += ( Totals const& other ) {
-        assertions += other.assertions;
-        testCases += other.testCases;
-        return *this;
-    }
-
-    Totals Totals::delta( Totals const& prevTotals ) const {
-        Totals diff = *this - prevTotals;
-        if( diff.assertions.failed > 0 )
-            ++diff.testCases.failed;
-        else if( diff.assertions.failedButOk > 0 )
-            ++diff.testCases.failedButOk;
-        else
-            ++diff.testCases.passed;
-        return diff;
-    }
-
-}
-// end catch_totals.cpp
-// start catch_uncaught_exceptions.cpp
-
-// start catch_config_uncaught_exceptions.hpp
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE_1_0.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
-#ifndef CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-#define CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-
-#if defined(_MSC_VER)
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
-#endif
-
-#include <exception>
-
-#if defined(__cpp_lib_uncaught_exceptions) \
-    && !defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif // __cpp_lib_uncaught_exceptions
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) \
-    && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
-
-#endif // CATCH_CONFIG_UNCAUGHT_EXCEPTIONS_HPP
-// end catch_config_uncaught_exceptions.hpp
-#include <exception>
-
-namespace Catch {
-    bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        return false;
-#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-        return std::uncaught_exceptions() > 0;
-#else
-        return std::uncaught_exception();
-#endif
-  }
-} // end namespace Catch
-// end catch_uncaught_exceptions.cpp
-// start catch_version.cpp
-
-#include <ostream>
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            char const * const _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << '.'
-            << version.minorVersion << '.'
-            << version.patchNumber;
-        // branchName is never null -> 0th char is \0 if it is empty
-        if (version.branchName[0]) {
-            os << '-' << version.branchName
-               << '.' << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version const& libraryVersion() {
-        static Version version( 2, 13, 8, "", 0 );
-        return version;
-    }
-
-}
-// end catch_version.cpp
-// start catch_wildcard_pattern.cpp
-
-namespace Catch {
-
-    WildcardPattern::WildcardPattern( std::string const& pattern,
-                                      CaseSensitive::Choice caseSensitivity )
-    :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( normaliseString( pattern ) )
-    {
-        if( startsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 1 );
-            m_wildcard = WildcardAtStart;
-        }
-        if( endsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-        }
-    }
-
-    bool WildcardPattern::matches( std::string const& str ) const {
-        switch( m_wildcard ) {
-            case NoWildcard:
-                return m_pattern == normaliseString( str );
-            case WildcardAtStart:
-                return endsWith( normaliseString( str ), m_pattern );
-            case WildcardAtEnd:
-                return startsWith( normaliseString( str ), m_pattern );
-            case WildcardAtBothEnds:
-                return contains( normaliseString( str ), m_pattern );
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown enum" );
-        }
-    }
-
-    std::string WildcardPattern::normaliseString( std::string const& str ) const {
-        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
-    }
-}
-// end catch_wildcard_pattern.cpp
-// start catch_xmlwriter.cpp
-
-#include <iomanip>
-#include <type_traits>
-
-namespace Catch {
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-    bool shouldNewline(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
-    }
-
-    bool shouldIndent(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
-    }
-
-} // anonymous namespace
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: http://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            unsigned char c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: http://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    unsigned char nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
-    :   m_writer( writer ),
-        m_fmt(fmt)
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ),
-        m_fmt(other.m_fmt)
-    {
-        other.m_writer = nullptr;
-        other.m_fmt = XmlFormatting::None;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        m_fmt = other.m_fmt;
-        other.m_fmt = XmlFormatting::None;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if (m_writer) {
-            m_writer->endElement(m_fmt);
-        }
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
-        m_writer->writeText( text, fmt );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while (!m_tags.empty()) {
-            endElement();
-        }
-        newlineIfNecessary();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-            m_indent += "  ";
-        }
-        m_os << '<' << name;
-        m_tags.push_back( name );
-        m_tagIsOpen = true;
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
-        ScopedElement scoped( this, fmt );
-        startElement( name, fmt );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
-        m_indent = m_indent.substr(0, m_indent.size() - 2);
-
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        } else {
-            newlineIfNecessary();
-            if (shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << "</" << m_tags.back() << ">";
-        }
-        m_os << std::flush;
-        applyFormatting(fmt);
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if (tagWasOpen && shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << XmlEncode( text );
-            applyFormatting(fmt);
-        }
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
-        ensureTagClosed();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-        }
-        m_os << "<!--" << text << "-->";
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    void XmlWriter::writeStylesheetRef( std::string const& url ) {
-        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    }
-
-    XmlWriter& XmlWriter::writeBlankLine() {
-        ensureTagClosed();
-        m_os << '\n';
-        return *this;
-    }
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << '>' << std::flush;
-            newlineIfNecessary();
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::applyFormatting(XmlFormatting fmt) {
-        m_needsNewline = shouldNewline(fmt);
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-}
-// end catch_xmlwriter.cpp
-// start catch_reporter_bases.cpp
-
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result) {
-        result.getExpandedExpression();
-    }
-
-    // Because formatting using c++ streams is stateful, drop down to C is required
-    // Alternatively we could use stringstream, but its performance is... not good.
-    std::string getFormattedDuration( double duration ) {
-        // Max exponent + 1 is required to represent the whole part
-        // + 1 for decimal point
-        // + 3 for the 3 decimal places
-        // + 1 for null terminator
-        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
-        char buffer[maxDoubleSize];
-
-        // Save previous errno, to prevent sprintf from overwriting it
-        ErrnoGuard guard;
-#ifdef _MSC_VER
-        sprintf_s(buffer, "%.3f", duration);
-#else
-        std::sprintf(buffer, "%.3f", duration);
-#endif
-        return std::string(buffer);
-    }
-
-    bool shouldShowDuration( IConfig const& config, double duration ) {
-        if ( config.showDurations() == ShowDurations::Always ) {
-            return true;
-        }
-        if ( config.showDurations() == ShowDurations::Never ) {
-            return false;
-        }
-        const double min = config.minDuration();
-        return min >= 0 && duration >= min;
-    }
-
-    std::string serializeFilters( std::vector<std::string> const& container ) {
-        ReusableStringStream oss;
-        bool first = true;
-        for (auto&& filter : container)
-        {
-            if (!first)
-                oss << ' ';
-            else
-                first = false;
-
-            oss << filter;
-        }
-        return oss.str();
-    }
-
-    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
-        :StreamingReporterBase(_config) {}
-
-    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
-        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
-    }
-
-    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
-
-    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_reporter_bases.cpp
-// start catch_reporter_compact.cpp
-
-namespace {
-
-#ifdef CATCH_PLATFORM_MAC
-    const char* failedString() { return "FAILED"; }
-    const char* passedString() { return "PASSED"; }
-#else
-    const char* failedString() { return "failed"; }
-    const char* passedString() { return "passed"; }
-#endif
-
-    // Colour::LightGrey
-    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
-
-    std::string bothOrAll( std::size_t count ) {
-        return count == 1 ? std::string() :
-               count == 2 ? "both " : "all " ;
-    }
-
-} // anon namespace
-
-namespace Catch {
-namespace {
-// Colour, message variants:
-// - white: No tests ran.
-// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-// - white: Passed [both/all] N test cases (no assertions).
-// -   red: Failed N tests cases, failed M assertions.
-// - green: Passed [both/all] N tests cases with M assertions.
-void printTotals(std::ostream& out, const Totals& totals) {
-    if (totals.testCases.total() == 0) {
-        out << "No tests ran.";
-    } else if (totals.testCases.failed == totals.testCases.total()) {
-        Colour colour(Colour::ResultError);
-        const std::string qualify_assertions_failed =
-            totals.assertions.failed == totals.assertions.total() ?
-            bothOrAll(totals.assertions.failed) : std::string();
-        out <<
-            "Failed " << bothOrAll(totals.testCases.failed)
-            << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << qualify_assertions_failed <<
-            pluralise(totals.assertions.failed, "assertion") << '.';
-    } else if (totals.assertions.total() == 0) {
-        out <<
-            "Passed " << bothOrAll(totals.testCases.total())
-            << pluralise(totals.testCases.total(), "test case")
-            << " (no assertions).";
-    } else if (totals.assertions.failed) {
-        Colour colour(Colour::ResultError);
-        out <<
-            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
-    } else {
-        Colour colour(Colour::ResultSuccess);
-        out <<
-            "Passed " << bothOrAll(totals.testCases.passed)
-            << pluralise(totals.testCases.passed, "test case") <<
-            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
-    }
-}
-
-// Implementation of CompactReporter formatting
-class AssertionPrinter {
-public:
-    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
-    AssertionPrinter(AssertionPrinter const&) = delete;
-    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream)
-        , result(_stats.assertionResult)
-        , messages(_stats.infoMessages)
-        , itMessage(_stats.infoMessages.begin())
-        , printInfoMessages(_printInfoMessages) {}
-
-    void print() {
-        printSourceInfo();
-
-        itMessage = messages.begin();
-
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            printResultType(Colour::ResultSuccess, passedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            if (!result.hasExpression())
-                printRemainingMessages(Colour::None);
-            else
-                printRemainingMessages();
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk())
-                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
-            else
-                printResultType(Colour::Error, failedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            printRemainingMessages();
-            break;
-        case ResultWas::ThrewException:
-            printResultType(Colour::Error, failedString());
-            printIssue("unexpected exception with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::FatalErrorCondition:
-            printResultType(Colour::Error, failedString());
-            printIssue("fatal error condition with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::DidntThrowException:
-            printResultType(Colour::Error, failedString());
-            printIssue("expected exception, got none");
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::Info:
-            printResultType(Colour::None, "info");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::Warning:
-            printResultType(Colour::None, "warning");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::ExplicitFailure:
-            printResultType(Colour::Error, failedString());
-            printIssue("explicitly");
-            printRemainingMessages(Colour::None);
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            printResultType(Colour::Error, "** internal error **");
-            break;
-        }
-    }
-
-private:
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ':';
-    }
-
-    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
-        if (!passOrFail.empty()) {
-            {
-                Colour colourGuard(colour);
-                stream << ' ' << passOrFail;
-            }
-            stream << ':';
-        }
-    }
-
-    void printIssue(std::string const& issue) const {
-        stream << ' ' << issue;
-    }
-
-    void printExpressionWas() {
-        if (result.hasExpression()) {
-            stream << ';';
-            {
-                Colour colour(dimColour());
-                stream << " expression was:";
-            }
-            printOriginalExpression();
-        }
-    }
-
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            stream << ' ' << result.getExpression();
-        }
-    }
-
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            {
-                Colour colour(dimColour());
-                stream << " for: ";
-            }
-            stream << result.getExpandedExpression();
-        }
-    }
-
-    void printMessage() {
-        if (itMessage != messages.end()) {
-            stream << " '" << itMessage->message << '\'';
-            ++itMessage;
-        }
-    }
-
-    void printRemainingMessages(Colour::Code colour = dimColour()) {
-        if (itMessage == messages.end())
-            return;
-
-        const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
-
-        {
-            Colour colourGuard(colour);
-            stream << " with " << pluralise(N, "message") << ':';
-        }
-
-        while (itMessage != itEnd) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                printMessage();
-                if (itMessage != itEnd) {
-                    Colour colourGuard(dimColour());
-                    stream << " and";
-                }
-                continue;
-            }
-            ++itMessage;
-        }
-    }
-
-private:
-    std::ostream& stream;
-    AssertionResult const& result;
-    std::vector<MessageInfo> messages;
-    std::vector<MessageInfo>::const_iterator itMessage;
-    bool printInfoMessages;
-};
-
-} // anon namespace
-
-        std::string CompactReporter::getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << '\'' << std::endl;
-        }
-
-        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
-
-        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            double dur = _sectionStats.durationInSeconds;
-            if ( shouldShowDuration( *m_config, dur ) ) {
-                stream << getFormattedDuration( dur ) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-            }
-        }
-
-        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( stream, _testRunStats.totals );
-            stream << '\n' << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-        CompactReporter::~CompactReporter() {}
-
-    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-// end catch_reporter_compact.cpp
-// start catch_reporter_console.cpp
-
-#include <cfloat>
-#include <cstdio>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled and default is missing) is enabled
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic push
-// For simplicity, benchmarking-only helpers are always enabled
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-namespace Catch {
-
-namespace {
-
-// Formatter impl for ConsoleReporter
-class ConsoleAssertionPrinter {
-public:
-    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream),
-        stats(_stats),
-        result(_stats.assertionResult),
-        colour(Colour::None),
-        message(result.getMessage()),
-        messages(_stats.infoMessages),
-        printInfoMessages(_printInfoMessages) {
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            colour = Colour::Success;
-            passOrFail = "PASSED";
-            //if( result.hasMessage() )
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk()) {
-                colour = Colour::Success;
-                passOrFail = "FAILED - but was ok";
-            } else {
-                colour = Colour::Error;
-                passOrFail = "FAILED";
-            }
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ThrewException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to unexpected exception with ";
-            if (_stats.infoMessages.size() == 1)
-                messageLabel += "message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel += "messages";
-            break;
-        case ResultWas::FatalErrorCondition:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to a fatal error condition";
-            break;
-        case ResultWas::DidntThrowException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "because no exception was thrown where one was expected";
-            break;
-        case ResultWas::Info:
-            messageLabel = "info";
-            break;
-        case ResultWas::Warning:
-            messageLabel = "warning";
-            break;
-        case ResultWas::ExplicitFailure:
-            passOrFail = "FAILED";
-            colour = Colour::Error;
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "explicitly with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "explicitly with messages";
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            passOrFail = "** internal error **";
-            colour = Colour::Error;
-            break;
-        }
-    }
-
-    void print() const {
-        printSourceInfo();
-        if (stats.totals.assertions.total() > 0) {
-            printResultType();
-            printOriginalExpression();
-            printReconstructedExpression();
-        } else {
-            stream << '\n';
-        }
-        printMessage();
-    }
-
-private:
-    void printResultType() const {
-        if (!passOrFail.empty()) {
-            Colour colourGuard(colour);
-            stream << passOrFail << ":\n";
-        }
-    }
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            Colour colourGuard(Colour::OriginalExpression);
-            stream << "  ";
-            stream << result.getExpressionInMacro();
-            stream << '\n';
-        }
-    }
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            stream << "with expansion:\n";
-            Colour colourGuard(Colour::ReconstructedExpression);
-            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
-        }
-    }
-    void printMessage() const {
-        if (!messageLabel.empty())
-            stream << messageLabel << ':' << '\n';
-        for (auto const& msg : messages) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || msg.type != ResultWas::Info)
-                stream << Column(msg.message).indent(2) << '\n';
-        }
-    }
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ": ";
-    }
-
-    std::ostream& stream;
-    AssertionStats const& stats;
-    AssertionResult const& result;
-    Colour::Code colour;
-    std::string passOrFail;
-    std::string messageLabel;
-    std::string message;
-    std::vector<MessageInfo> messages;
-    bool printInfoMessages;
-};
-
-std::size_t makeRatio(std::size_t number, std::size_t total) {
-    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
-    return (ratio == 0 && number > 0) ? 1 : ratio;
-}
-
-std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
-    if (i > j && i > k)
-        return i;
-    else if (j > k)
-        return j;
-    else
-        return k;
-}
-
-struct ColumnInfo {
-    enum Justification { Left, Right };
-    std::string name;
-    int width;
-    Justification justification;
-};
-struct ColumnBreak {};
-struct RowBreak {};
-
-class Duration {
-    enum class Unit {
-        Auto,
-        Nanoseconds,
-        Microseconds,
-        Milliseconds,
-        Seconds,
-        Minutes
-    };
-    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
-    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
-    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
-    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
-
-    double m_inNanoseconds;
-    Unit m_units;
-
-public:
-    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
-        : m_inNanoseconds(inNanoseconds),
-        m_units(units) {
-        if (m_units == Unit::Auto) {
-            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
-                m_units = Unit::Nanoseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
-                m_units = Unit::Microseconds;
-            else if (m_inNanoseconds < s_nanosecondsInASecond)
-                m_units = Unit::Milliseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMinute)
-                m_units = Unit::Seconds;
-            else
-                m_units = Unit::Minutes;
-        }
-
-    }
-
-    auto value() const -> double {
-        switch (m_units) {
-        case Unit::Microseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
-        case Unit::Milliseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
-        case Unit::Seconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
-        case Unit::Minutes:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
-        default:
-            return m_inNanoseconds;
-        }
-    }
-    auto unitsAsString() const -> std::string {
-        switch (m_units) {
-        case Unit::Nanoseconds:
-            return "ns";
-        case Unit::Microseconds:
-            return "us";
-        case Unit::Milliseconds:
-            return "ms";
-        case Unit::Seconds:
-            return "s";
-        case Unit::Minutes:
-            return "m";
-        default:
-            return "** internal error **";
-        }
-
-    }
-    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << duration.value() << ' ' << duration.unitsAsString();
-    }
-};
-} // end anon namespace
-
-class TablePrinter {
-    std::ostream& m_os;
-    std::vector<ColumnInfo> m_columnInfos;
-    std::ostringstream m_oss;
-    int m_currentColumn = -1;
-    bool m_isOpen = false;
-
-public:
-    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
-    :   m_os( os ),
-        m_columnInfos( std::move( columnInfos ) ) {}
-
-    auto columnInfos() const -> std::vector<ColumnInfo> const& {
-        return m_columnInfos;
-    }
-
-    void open() {
-        if (!m_isOpen) {
-            m_isOpen = true;
-            *this << RowBreak();
-
-			Columns headerCols;
-			Spacer spacer(2);
-			for (auto const& info : m_columnInfos) {
-				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
-				headerCols += spacer;
-			}
-			m_os << headerCols << '\n';
-
-            m_os << Catch::getLineOfChars<'-'>() << '\n';
-        }
-    }
-    void close() {
-        if (m_isOpen) {
-            *this << RowBreak();
-            m_os << std::endl;
-            m_isOpen = false;
-        }
-    }
-
-    template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
-        tp.m_oss << value;
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
-        auto colStr = tp.m_oss.str();
-        const auto strSize = colStr.size();
-        tp.m_oss.str("");
-        tp.open();
-        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
-            tp.m_currentColumn = -1;
-            tp.m_os << '\n';
-        }
-        tp.m_currentColumn++;
-
-        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 1), ' ')
-            : std::string();
-        if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << ' ';
-        else
-            tp.m_os << padding << colStr << ' ';
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
-        if (tp.m_currentColumn > 0) {
-            tp.m_os << '\n';
-            tp.m_currentColumn = -1;
-        }
-        return tp;
-    }
-};
-
-ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
-    : StreamingReporterBase(config),
-    m_tablePrinter(new TablePrinter(config.stream(),
-        [&config]() -> std::vector<ColumnInfo> {
-        if (config.fullConfig()->benchmarkNoAnalysis())
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "     samples", 14, ColumnInfo::Right },
-                { "  iterations", 14, ColumnInfo::Right },
-                { "        mean", 14, ColumnInfo::Right }
-            };
-        }
-        else
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "samples      mean       std dev", 14, ColumnInfo::Right },
-                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
-                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
-            };
-        }
-    }())) {}
-ConsoleReporter::~ConsoleReporter() = default;
-
-std::string ConsoleReporter::getDescription() {
-    return "Reports test results as plain lines of text";
-}
-
-void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
-    stream << "No test cases matched '" << spec << '\'' << std::endl;
-}
-
-void ConsoleReporter::reportInvalidArguments(std::string const&arg){
-    stream << "Invalid Filter: " << arg << std::endl;
-}
-
-void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
-
-bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
-    AssertionResult const& result = _assertionStats.assertionResult;
-
-    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-    // Drop out if result was successful but we're not printing them.
-    if (!includeResults && result.getResultType() != ResultWas::Warning)
-        return false;
-
-    lazyPrint();
-
-    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
-    printer.print();
-    stream << std::endl;
-    return true;
-}
-
-void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
-    m_tablePrinter->close();
-    m_headerPrinted = false;
-    StreamingReporterBase::sectionStarting(_sectionInfo);
-}
-void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
-    m_tablePrinter->close();
-    if (_sectionStats.missingAssertions) {
-        lazyPrint();
-        Colour colour(Colour::ResultError);
-        if (m_sectionStack.size() > 1)
-            stream << "\nNo assertions in section";
-        else
-            stream << "\nNo assertions in test case";
-        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-    }
-    double dur = _sectionStats.durationInSeconds;
-    if (shouldShowDuration(*m_config, dur)) {
-        stream << getFormattedDuration(dur) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-    }
-    if (m_headerPrinted) {
-        m_headerPrinted = false;
-    }
-    StreamingReporterBase::sectionEnded(_sectionStats);
-}
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-void ConsoleReporter::benchmarkPreparing(std::string const& name) {
-	lazyPrintWithoutClosingBenchmarkTable();
-
-	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
-
-	bool firstLine = true;
-	for (auto line : nameCol) {
-		if (!firstLine)
-			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-		else
-			firstLine = false;
-
-		(*m_tablePrinter) << line << ColumnBreak();
-	}
-}
-
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    (*m_tablePrinter) << info.samples << ColumnBreak()
-        << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
-}
-void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
-    if (m_config->benchmarkNoAnalysis())
-    {
-        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
-    }
-    else
-    {
-        (*m_tablePrinter) << ColumnBreak()
-            << Duration(stats.mean.point.count()) << ColumnBreak()
-            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
-            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
-    }
-}
-
-void ConsoleReporter::benchmarkFailed(std::string const& error) {
-	Colour colour(Colour::Red);
-    (*m_tablePrinter)
-        << "Benchmark failed (" << error << ')'
-        << ColumnBreak() << RowBreak();
-}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
-    m_tablePrinter->close();
-    StreamingReporterBase::testCaseEnded(_testCaseStats);
-    m_headerPrinted = false;
-}
-void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
-    if (currentGroupInfo.used) {
-        printSummaryDivider();
-        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-        printTotals(_testGroupStats.totals);
-        stream << '\n' << std::endl;
-    }
-    StreamingReporterBase::testGroupEnded(_testGroupStats);
-}
-void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
-    printTotalsDivider(_testRunStats.totals);
-    printTotals(_testRunStats.totals);
-    stream << std::endl;
-    StreamingReporterBase::testRunEnded(_testRunStats);
-}
-void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-    StreamingReporterBase::testRunStarting(_testInfo);
-    printTestFilters();
-}
-
-void ConsoleReporter::lazyPrint() {
-
-    m_tablePrinter->close();
-    lazyPrintWithoutClosingBenchmarkTable();
-}
-
-void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
-
-    if (!currentTestRunInfo.used)
-        lazyPrintRunInfo();
-    if (!currentGroupInfo.used)
-        lazyPrintGroupInfo();
-
-    if (!m_headerPrinted) {
-        printTestCaseAndSectionHeader();
-        m_headerPrinted = true;
-    }
-}
-void ConsoleReporter::lazyPrintRunInfo() {
-    stream << '\n' << getLineOfChars<'~'>() << '\n';
-    Colour colour(Colour::SecondaryText);
-    stream << currentTestRunInfo->name
-        << " is a Catch v" << libraryVersion() << " host application.\n"
-        << "Run with -? for options\n\n";
-
-    if (m_config->rngSeed() != 0)
-        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-    currentTestRunInfo.used = true;
-}
-void ConsoleReporter::lazyPrintGroupInfo() {
-    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
-        printClosedHeader("Group: " + currentGroupInfo->name);
-        currentGroupInfo.used = true;
-    }
-}
-void ConsoleReporter::printTestCaseAndSectionHeader() {
-    assert(!m_sectionStack.empty());
-    printOpenHeader(currentTestCaseInfo->name);
-
-    if (m_sectionStack.size() > 1) {
-        Colour colourGuard(Colour::Headers);
-
-        auto
-            it = m_sectionStack.begin() + 1, // Skip first section (test case)
-            itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
-    }
-
-    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
-
-    stream << getLineOfChars<'-'>() << '\n';
-    Colour colourGuard(Colour::FileName);
-    stream << lineInfo << '\n';
-    stream << getLineOfChars<'.'>() << '\n' << std::endl;
-}
-
-void ConsoleReporter::printClosedHeader(std::string const& _name) {
-    printOpenHeader(_name);
-    stream << getLineOfChars<'.'>() << '\n';
-}
-void ConsoleReporter::printOpenHeader(std::string const& _name) {
-    stream << getLineOfChars<'-'>() << '\n';
-    {
-        Colour colourGuard(Colour::Headers);
-        printHeaderString(_name);
-    }
-}
-
-// if string has a : in first line will set indent to follow it on
-// subsequent lines
-void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
-    std::size_t i = _string.find(": ");
-    if (i != std::string::npos)
-        i += 2;
-    else
-        i = 0;
-    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
-}
-
-struct SummaryColumn {
-
-    SummaryColumn( std::string _label, Colour::Code _colour )
-    :   label( std::move( _label ) ),
-        colour( _colour ) {}
-    SummaryColumn addRow( std::size_t count ) {
-        ReusableStringStream rss;
-        rss << count;
-        std::string row = rss.str();
-        for (auto& oldRow : rows) {
-            while (oldRow.size() < row.size())
-                oldRow = ' ' + oldRow;
-            while (oldRow.size() > row.size())
-                row = ' ' + row;
-        }
-        rows.push_back(row);
-        return *this;
-    }
-
-    std::string label;
-    Colour::Code colour;
-    std::vector<std::string> rows;
-
-};
-
-void ConsoleReporter::printTotals( Totals const& totals ) {
-    if (totals.testCases.total() == 0) {
-        stream << Colour(Colour::Warning) << "No tests ran\n";
-    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
-        stream << Colour(Colour::ResultSuccess) << "All tests passed";
-        stream << " ("
-            << pluralise(totals.assertions.passed, "assertion") << " in "
-            << pluralise(totals.testCases.passed, "test case") << ')'
-            << '\n';
-    } else {
-
-        std::vector<SummaryColumn> columns;
-        columns.push_back(SummaryColumn("", Colour::None)
-                          .addRow(totals.testCases.total())
-                          .addRow(totals.assertions.total()));
-        columns.push_back(SummaryColumn("passed", Colour::Success)
-                          .addRow(totals.testCases.passed)
-                          .addRow(totals.assertions.passed));
-        columns.push_back(SummaryColumn("failed", Colour::ResultError)
-                          .addRow(totals.testCases.failed)
-                          .addRow(totals.assertions.failed));
-        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
-                          .addRow(totals.testCases.failedButOk)
-                          .addRow(totals.assertions.failedButOk));
-
-        printSummaryRow("test cases", columns, 0);
-        printSummaryRow("assertions", columns, 1);
-    }
-}
-void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
-    for (auto col : cols) {
-        std::string value = col.rows[row];
-        if (col.label.empty()) {
-            stream << label << ": ";
-            if (value != "0")
-                stream << value;
-            else
-                stream << Colour(Colour::Warning) << "- none -";
-        } else if (value != "0") {
-            stream << Colour(Colour::LightGrey) << " | ";
-            stream << Colour(col.colour)
-                << value << ' ' << col.label;
-        }
-    }
-    stream << '\n';
-}
-
-void ConsoleReporter::printTotalsDivider(Totals const& totals) {
-    if (totals.testCases.total() > 0) {
-        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
-        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
-        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
-        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)++;
-        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)--;
-
-        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
-        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
-        if (totals.testCases.allPassed())
-            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
-        else
-            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
-    } else {
-        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
-    }
-    stream << '\n';
-}
-void ConsoleReporter::printSummaryDivider() {
-    stream << getLineOfChars<'-'>() << '\n';
-}
-
-void ConsoleReporter::printTestFilters() {
-    if (m_config->testSpec().hasFilters()) {
-        Colour guard(Colour::BrightYellow);
-        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
-    }
-}
-
-CATCH_REGISTER_REPORTER("console", ConsoleReporter)
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic pop
-#endif
-// end catch_reporter_console.cpp
-// start catch_reporter_junit.cpp
-
-#include <cassert>
-#include <sstream>
-#include <ctime>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    namespace {
-        std::string getCurrentTimestamp() {
-            // Beware, this is not reentrant because of backward compatibility issues
-            // Also, UTC only, again because of backward compatibility (%z is C++11)
-            time_t rawtime;
-            std::time(&rawtime);
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &rawtime);
-#else
-            std::tm* timeInfo;
-            timeInfo = std::gmtime(&rawtime);
-#endif
-
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp, timeStampSize-1);
-        }
-
-        std::string fileNameTag(const std::vector<std::string> &tags) {
-            auto it = std::find_if(begin(tags),
-                                   end(tags),
-                                   [] (std::string const& tag) {return tag.front() == '#'; });
-            if (it != tags.end())
-                return it->substr(1);
-            return std::string();
-        }
-
-        // Formats the duration in seconds to 3 decimal places.
-        // This is done because some genius defined Maven Surefire schema
-        // in a way that only accepts 3 decimal places, and tools like
-        // Jenkins use that schema for validation JUnit reporter output.
-        std::string formatDuration( double seconds ) {
-            ReusableStringStream rss;
-            rss << std::fixed << std::setprecision( 3 ) << seconds;
-            return rss.str();
-        }
-
-    } // anonymous namespace
-
-    JunitReporter::JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-            m_reporterPrefs.shouldReportAllAssertions = true;
-        }
-
-    JunitReporter::~JunitReporter() {}
-
-    std::string JunitReporter::getDescription() {
-        return "Reports test results in an XML format that looks like Ant's junitreport target";
-    }
-
-    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
-
-    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
-        CumulativeReporterBase::testRunStarting( runInfo );
-        xml.startElement( "testsuites" );
-    }
-
-    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        suiteTimer.start();
-        stdOutForSuite.clear();
-        stdErrForSuite.clear();
-        unexpectedExceptions = 0;
-        CumulativeReporterBase::testGroupStarting( groupInfo );
-    }
-
-    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
-        m_okToFail = testCaseInfo.okToFail();
-    }
-
-    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
-            unexpectedExceptions++;
-        return CumulativeReporterBase::assertionEnded( assertionStats );
-    }
-
-    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        stdOutForSuite += testCaseStats.stdOut;
-        stdErrForSuite += testCaseStats.stdErr;
-        CumulativeReporterBase::testCaseEnded( testCaseStats );
-    }
-
-    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        double suiteTime = suiteTimer.getElapsedSeconds();
-        CumulativeReporterBase::testGroupEnded( testGroupStats );
-        writeGroup( *m_testGroups.back(), suiteTime );
-    }
-
-    void JunitReporter::testRunEndedCumulative() {
-        xml.endElement();
-    }
-
-    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-
-        TestGroupStats const& stats = groupNode.value;
-        xml.writeAttribute( "name", stats.groupInfo.name );
-        xml.writeAttribute( "errors", unexpectedExceptions );
-        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-        xml.writeAttribute( "tests", stats.totals.assertions.total() );
-        xml.writeAttribute( "hostname", "tbd" ); // !TBD
-        if( m_config->showDurations() == ShowDurations::Never )
-            xml.writeAttribute( "time", "" );
-        else
-            xml.writeAttribute( "time", formatDuration( suiteTime ) );
-        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
-
-        // Write properties if there are any
-        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
-            auto properties = xml.scopedElement("properties");
-            if (m_config->hasTestFilters()) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "filters")
-                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
-            }
-            if (m_config->rngSeed() != 0) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "random-seed")
-                    .writeAttribute("value", m_config->rngSeed());
-            }
-        }
-
-        // Write test cases
-        for( auto const& child : groupNode.children )
-            writeTestCase( *child );
-
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
-    }
-
-    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
-        TestCaseStats const& stats = testCaseNode.value;
-
-        // All test cases have exactly one section - which represents the
-        // test case itself. That section may have 0-n nested sections
-        assert( testCaseNode.children.size() == 1 );
-        SectionNode const& rootSection = *testCaseNode.children.front();
-
-        std::string className = stats.testInfo.className;
-
-        if( className.empty() ) {
-            className = fileNameTag(stats.testInfo.tags);
-            if ( className.empty() )
-                className = "global";
-        }
-
-        if ( !m_config->name().empty() )
-            className = m_config->name() + "." + className;
-
-        writeSection( className, "", rootSection, stats.testInfo.okToFail() );
-    }
-
-    void JunitReporter::writeSection( std::string const& className,
-                                      std::string const& rootName,
-                                      SectionNode const& sectionNode,
-                                      bool testOkToFail) {
-        std::string name = trim( sectionNode.stats.sectionInfo.name );
-        if( !rootName.empty() )
-            name = rootName + '/' + name;
-
-        if( !sectionNode.assertions.empty() ||
-            !sectionNode.stdOut.empty() ||
-            !sectionNode.stdErr.empty() ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-            if( className.empty() ) {
-                xml.writeAttribute( "classname", name );
-                xml.writeAttribute( "name", "root" );
-            }
-            else {
-                xml.writeAttribute( "classname", className );
-                xml.writeAttribute( "name", name );
-            }
-            xml.writeAttribute( "time", formatDuration( sectionNode.stats.durationInSeconds ) );
-            // This is not ideal, but it should be enough to mimic gtest's
-            // junit output.
-            // Ideally the JUnit reporter would also handle `skipTest`
-            // events and write those out appropriately.
-            xml.writeAttribute( "status", "run" );
-
-            if (sectionNode.stats.assertions.failedButOk) {
-                xml.scopedElement("skipped")
-                    .writeAttribute("message", "TEST_CASE tagged with !mayfail");
-            }
-
-            writeAssertions( sectionNode );
-
-            if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
-            if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
-        }
-        for( auto const& childNode : sectionNode.childSections )
-            if( className.empty() )
-                writeSection( name, "", *childNode, testOkToFail );
-            else
-                writeSection( className, name, *childNode, testOkToFail );
-    }
-
-    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
-        for( auto const& assertion : sectionNode.assertions )
-            writeAssertion( assertion );
-    }
-
-    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
-        AssertionResult const& result = stats.assertionResult;
-        if( !result.isOk() ) {
-            std::string elementName;
-            switch( result.getResultType() ) {
-                case ResultWas::ThrewException:
-                case ResultWas::FatalErrorCondition:
-                    elementName = "error";
-                    break;
-                case ResultWas::ExplicitFailure:
-                case ResultWas::ExpressionFailed:
-                case ResultWas::DidntThrowException:
-                    elementName = "failure";
-                    break;
-
-                // We should never see these here:
-                case ResultWas::Info:
-                case ResultWas::Warning:
-                case ResultWas::Ok:
-                case ResultWas::Unknown:
-                case ResultWas::FailureBit:
-                case ResultWas::Exception:
-                    elementName = "internalError";
-                    break;
-            }
-
-            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-            xml.writeAttribute( "message", result.getExpression() );
-            xml.writeAttribute( "type", result.getTestMacroName() );
-
-            ReusableStringStream rss;
-            if (stats.totals.assertions.total() > 0) {
-                rss << "FAILED" << ":\n";
-                if (result.hasExpression()) {
-                    rss << "  ";
-                    rss << result.getExpressionInMacro();
-                    rss << '\n';
-                }
-                if (result.hasExpandedExpression()) {
-                    rss << "with expansion:\n";
-                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
-                }
-            } else {
-                rss << '\n';
-            }
-
-            if( !result.getMessage().empty() )
-                rss << result.getMessage() << '\n';
-            for( auto const& msg : stats.infoMessages )
-                if( msg.type == ResultWas::Info )
-                    rss << msg.message << '\n';
-
-            rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), XmlFormatting::Newline );
-        }
-    }
-
-    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-// end catch_reporter_junit.cpp
-// start catch_reporter_listening.cpp
-
-#include <cassert>
-
-namespace Catch {
-
-    ListeningReporter::ListeningReporter() {
-        // We will assume that listeners will always want all assertions
-        m_preferences.shouldReportAllAssertions = true;
-    }
-
-    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
-        m_listeners.push_back( std::move( listener ) );
-    }
-
-    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
-        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
-        m_reporter = std::move( reporter );
-        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
-    }
-
-    ReporterPreferences ListeningReporter::getPreferences() const {
-        return m_preferences;
-    }
-
-    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
-        return std::set<Verbosity>{ };
-    }
-
-    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->noMatchingTestCases( spec );
-        }
-        m_reporter->noMatchingTestCases( spec );
-    }
-
-    void ListeningReporter::reportInvalidArguments(std::string const&arg){
-        for ( auto const& listener : m_listeners ) {
-            listener->reportInvalidArguments( arg );
-        }
-        m_reporter->reportInvalidArguments( arg );
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkPreparing(name);
-		}
-		m_reporter->benchmarkPreparing(name);
-	}
-    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkStarting( benchmarkInfo );
-        }
-        m_reporter->benchmarkStarting( benchmarkInfo );
-    }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkEnded( benchmarkStats );
-        }
-        m_reporter->benchmarkEnded( benchmarkStats );
-    }
-
-	void ListeningReporter::benchmarkFailed( std::string const& error ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkFailed(error);
-		}
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunStarting( testRunInfo );
-        }
-        m_reporter->testRunStarting( testRunInfo );
-    }
-
-    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupStarting( groupInfo );
-        }
-        m_reporter->testGroupStarting( groupInfo );
-    }
-
-    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseStarting( testInfo );
-        }
-        m_reporter->testCaseStarting( testInfo );
-    }
-
-    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionStarting( sectionInfo );
-        }
-        m_reporter->sectionStarting( sectionInfo );
-    }
-
-    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->assertionStarting( assertionInfo );
-        }
-        m_reporter->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        for( auto const& listener : m_listeners ) {
-            static_cast<void>( listener->assertionEnded( assertionStats ) );
-        }
-        return m_reporter->assertionEnded( assertionStats );
-    }
-
-    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionEnded( sectionStats );
-        }
-        m_reporter->sectionEnded( sectionStats );
-    }
-
-    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseEnded( testCaseStats );
-        }
-        m_reporter->testCaseEnded( testCaseStats );
-    }
-
-    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupEnded( testGroupStats );
-        }
-        m_reporter->testGroupEnded( testGroupStats );
-    }
-
-    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunEnded( testRunStats );
-        }
-        m_reporter->testRunEnded( testRunStats );
-    }
-
-    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->skipTest( testInfo );
-        }
-        m_reporter->skipTest( testInfo );
-    }
-
-    bool ListeningReporter::isMulti() const {
-        return true;
-    }
-
-} // end namespace Catch
-// end catch_reporter_listening.cpp
-// start catch_reporter_xml.cpp
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    XmlReporter::XmlReporter( ReporterConfig const& _config )
-    :   StreamingReporterBase( _config ),
-        m_xml(_config.stream())
-    {
-        m_reporterPrefs.shouldRedirectStdOut = true;
-        m_reporterPrefs.shouldReportAllAssertions = true;
-    }
-
-    XmlReporter::~XmlReporter() = default;
-
-    std::string XmlReporter::getDescription() {
-        return "Reports test results as an XML document";
-    }
-
-    std::string XmlReporter::getStylesheetRef() const {
-        return std::string();
-    }
-
-    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
-        m_xml
-            .writeAttribute( "filename", sourceInfo.file )
-            .writeAttribute( "line", sourceInfo.line );
-    }
-
-    void XmlReporter::noMatchingTestCases( std::string const& s ) {
-        StreamingReporterBase::noMatchingTestCases( s );
-    }
-
-    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
-        StreamingReporterBase::testRunStarting( testInfo );
-        std::string stylesheetRef = getStylesheetRef();
-        if( !stylesheetRef.empty() )
-            m_xml.writeStylesheetRef( stylesheetRef );
-        m_xml.startElement( "Catch" );
-        if( !m_config->name().empty() )
-            m_xml.writeAttribute( "name", m_config->name() );
-        if (m_config->testSpec().hasFilters())
-            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
-        if( m_config->rngSeed() != 0 )
-            m_xml.scopedElement( "Randomness" )
-                .writeAttribute( "seed", m_config->rngSeed() );
-    }
-
-    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        StreamingReporterBase::testGroupStarting( groupInfo );
-        m_xml.startElement( "Group" )
-            .writeAttribute( "name", groupInfo.name );
-    }
-
-    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        StreamingReporterBase::testCaseStarting(testInfo);
-        m_xml.startElement( "TestCase" )
-            .writeAttribute( "name", trim( testInfo.name ) )
-            .writeAttribute( "description", testInfo.description )
-            .writeAttribute( "tags", testInfo.tagsAsString() );
-
-        writeSourceInfo( testInfo.lineInfo );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            m_testCaseTimer.start();
-        m_xml.ensureTagClosed();
-    }
-
-    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        StreamingReporterBase::sectionStarting( sectionInfo );
-        if( m_sectionDepth++ > 0 ) {
-            m_xml.startElement( "Section" )
-                .writeAttribute( "name", trim( sectionInfo.name ) );
-            writeSourceInfo( sectionInfo.lineInfo );
-            m_xml.ensureTagClosed();
-        }
-    }
-
-    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
-
-    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
-
-        AssertionResult const& result = assertionStats.assertionResult;
-
-        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-        if( includeResults || result.getResultType() == ResultWas::Warning ) {
-            // Print any info messages in <Info> tags.
-            for( auto const& msg : assertionStats.infoMessages ) {
-                if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
-                } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
-                }
-            }
-        }
-
-        // Drop out if result was successful but we're not printing them.
-        if( !includeResults && result.getResultType() != ResultWas::Warning )
-            return true;
-
-        // Print the expression if there is one.
-        if( result.hasExpression() ) {
-            m_xml.startElement( "Expression" )
-                .writeAttribute( "success", result.succeeded() )
-                .writeAttribute( "type", result.getTestMacroName() );
-
-            writeSourceInfo( result.getSourceInfo() );
-
-            m_xml.scopedElement( "Original" )
-                .writeText( result.getExpression() );
-            m_xml.scopedElement( "Expanded" )
-                .writeText( result.getExpandedExpression() );
-        }
-
-        // And... Print a result applicable to each result type.
-        switch( result.getResultType() ) {
-            case ResultWas::ThrewException:
-                m_xml.startElement( "Exception" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::FatalErrorCondition:
-                m_xml.startElement( "FatalErrorCondition" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::Info:
-                m_xml.scopedElement( "Info" )
-                    .writeText( result.getMessage() );
-                break;
-            case ResultWas::Warning:
-                // Warning will already have been written
-                break;
-            case ResultWas::ExplicitFailure:
-                m_xml.startElement( "Failure" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            default:
-                break;
-        }
-
-        if( result.hasExpression() )
-            m_xml.endElement();
-
-        return true;
-    }
-
-    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
-        StreamingReporterBase::sectionEnded( sectionStats );
-        if( --m_sectionDepth > 0 ) {
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-            e.writeAttribute( "successes", sectionStats.assertions.passed );
-            e.writeAttribute( "failures", sectionStats.assertions.failed );
-            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-            m_xml.endElement();
-        }
-    }
-
-    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        StreamingReporterBase::testCaseEnded( testCaseStats );
-        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-        if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
-        if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
-
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        StreamingReporterBase::testGroupEnded( testGroupStats );
-        // TODO: Check testGroupStats.aborting and act accordingly.
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
-            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        StreamingReporterBase::testRunEnded( testRunStats );
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
-            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkPreparing(std::string const& name) {
-        m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", name);
-    }
-
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
-        m_xml.writeAttribute("samples", info.samples)
-            .writeAttribute("resamples", info.resamples)
-            .writeAttribute("iterations", info.iterations)
-            .writeAttribute("clockResolution", info.clockResolution)
-            .writeAttribute("estimatedDuration", info.estimatedDuration)
-            .writeComment("All values in nano seconds");
-    }
-
-    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
-            .writeAttribute("value", benchmarkStats.mean.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
-            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
-            .writeAttribute("variance", benchmarkStats.outlierVariance)
-            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
-            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
-            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
-            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
-        m_xml.endElement();
-        m_xml.endElement();
-    }
-
-    void XmlReporter::benchmarkFailed(std::string const &error) {
-        m_xml.scopedElement("failed").
-            writeAttribute("message", error);
-        m_xml.endElement();
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-// end catch_reporter_xml.cpp
-
-namespace Catch {
-    LeakDetector leakDetector;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_impl.hpp
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// start catch_default_main.hpp
-
-#ifndef __OBJC__
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
-// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
-#else
-// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
-#endif
-
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char**)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-// end catch_default_main.hpp
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#if !defined(CATCH_CONFIG_DISABLE)
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
-#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
-#else
-#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
-#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
-#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
-#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
-
-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
-#else
-#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-
-#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-using Catch::Detail::Approx;
-
-#else // CATCH_CONFIG_DISABLE
-
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... )        (void)(0)
-#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
-
-#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CATCH_CHECK( ... )         (void)(0)
-#define CATCH_CHECK_FALSE( ... )   (void)(0)
-#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
-#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
-#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
-
-#define CATCH_CHECK_THROWS( ... )  (void)(0)
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg )          (void)(0)
-#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
-#define CATCH_WARN( msg )          (void)(0)
-#define CATCH_CAPTURE( msg )       (void)(0)
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_METHOD_AS_TEST_CASE( method, ... )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define CATCH_SECTION( ... )
-#define CATCH_DYNAMIC_SECTION( ... )
-#define CATCH_FAIL( ... ) (void)(0)
-#define CATCH_FAIL_CHECK( ... ) (void)(0)
-#define CATCH_SUCCEED( ... ) (void)(0)
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-#define CATCH_GIVEN( desc )
-#define CATCH_AND_GIVEN( desc )
-#define CATCH_WHEN( desc )
-#define CATCH_AND_WHEN( desc )
-#define CATCH_THEN( desc )
-#define CATCH_AND_THEN( desc )
-
-#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... )       (void)(0)
-#define REQUIRE_FALSE( ... ) (void)(0)
-
-#define REQUIRE_THROWS( ... ) (void)(0)
-#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CHECK( ... ) (void)(0)
-#define CHECK_FALSE( ... ) (void)(0)
-#define CHECKED_IF( ... ) if (__VA_ARGS__)
-#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
-#define CHECK_NOFAIL( ... ) (void)(0)
-
-#define CHECK_THROWS( ... )  (void)(0)
-#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) (void)(0)
-
-#define REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) (void)(0)
-#define UNSCOPED_INFO( msg ) (void)(0)
-#define WARN( msg ) (void)(0)
-#define CAPTURE( msg ) (void)(0)
-
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-#define METHOD_AS_TEST_CASE( method, ... )
-#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define SECTION( ... )
-#define DYNAMIC_SECTION( ... )
-#define FAIL( ... ) (void)(0)
-#define FAIL_CHECK( ... ) (void)(0)
-#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-#define STATIC_REQUIRE( ... )       (void)(0)
-#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
-
-#define GIVEN( desc )
-#define AND_GIVEN( desc )
-#define WHEN( desc )
-#define AND_WHEN( desc )
-#define THEN( desc )
-#define AND_THEN( desc )
-
-using Catch::Detail::Approx;
-
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-// start catch_reenable_warnings.h
-
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-// end catch_reenable_warnings.h
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-

From a07a0786f5790ce67d0f86649bf1692c8ec5ce79 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 7 Feb 2022 13:31:15 -0800
Subject: [PATCH 291/521] Use Scarab's version of Catch instead of the local
 one

---
 Testing/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 961fd3e..98dbb05 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -50,7 +50,7 @@ set( lib_dependencies
 # https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
 
 add_library( Catch INTERFACE )
-target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${CPP_DIR}/Catch )
+target_include_directories( Catch INTERFACE ${Scarab_LOCATION}/testing/catch )
 
 add_executable( RunTests ${testing_SOURCES} )
 target_link_libraries( RunTests ${lib_dependencies} )

From 181cd4f9717ef389a7a8a46d4090f22901543beb Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 8 Feb 2022 11:20:56 -0800
Subject: [PATCH 292/521] Clarified variable names in PrintException()

---
 Cpp/Library/Utility/Exception.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cpp/Library/Utility/Exception.cc b/Cpp/Library/Utility/Exception.cc
index 43b0c57..57e911f 100644
--- a/Cpp/Library/Utility/Exception.cc
+++ b/Cpp/Library/Utility/Exception.cc
@@ -22,13 +22,13 @@ namespace Nymph
         {
             std::rethrow_if_nested( e );
         }
-        catch(const scarab::base_exception& e)
+        catch(const scarab::base_exception& eNext)
         {
-            PrintException( e, ++count );
+            PrintException( eNext, ++count );
         }
-        catch(const std::exception& e)
+        catch(const std::exception& eNext)
         {
-            PrintException( e, ++count );
+            PrintException( eNext, ++count );
         }
         return;
     }
@@ -41,13 +41,13 @@ namespace Nymph
         {
             std::rethrow_if_nested( e );
         }
-        catch(const scarab::base_exception& e)
+        catch(const scarab::base_exception& eNext)
         {
-            PrintException( e, ++count );
+            PrintException( eNext, ++count );
         }
-        catch(const std::exception& e)
+        catch(const std::exception& eNext)
         {
-            PrintException( e, ++count );
+            PrintException( eNext, ++count );
         }
         return;
     }

From 6002796c48c1d67d4662859eeb99c0ccd21f1a3c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 8 Feb 2022 11:42:10 -0800
Subject: [PATCH 293/521] Removed ControllerInterface files

---
 Cpp/Library/CMakeLists.txt                 |  2 -
 Cpp/Library/Control/ControllerInterface.cc | 19 -------
 Cpp/Library/Control/ControllerInterface.hh | 61 ----------------------
 3 files changed, 82 deletions(-)
 delete mode 100644 Cpp/Library/Control/ControllerInterface.cc
 delete mode 100644 Cpp/Library/Control/ControllerInterface.hh

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index cf47e24..c99c80c 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -37,7 +37,6 @@ set( NYMPH_HEADERFILES
     
     ${CONT_DIR}/ControlAccess.hh
     ${CONT_DIR}/Controller.hh
-#    ${CONT_DIR}/ControllerInterface.hh
     ${CONT_DIR}/ReturnBuffer.hh
     ${CONT_DIR}/SingleRunController.hh
 
@@ -58,7 +57,6 @@ set( NYMPH_SOURCEFILES
 
     ${CONT_DIR}/ControlAccess.cc
     ${CONT_DIR}/Controller.cc
-#    ${CONT_DIR}/ControllerInterface.cc
     ${CONT_DIR}/ReturnBuffer.cc
     ${CONT_DIR}/SingleRunController.cc
 
diff --git a/Cpp/Library/Control/ControllerInterface.cc b/Cpp/Library/Control/ControllerInterface.cc
deleted file mode 100644
index 075718a..0000000
--- a/Cpp/Library/Control/ControllerInterface.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * ControllerInterface.cc
- *
- *  Created on: Jan 13, 2022
- *      Author: N.S. Oblath
- */
-
-#include "ControllerInterface.hh"
-
-namespace Nymph
-{
-    ControllerInterface::ControllerInterface()
-    {}
-
-    ControllerInterface::~ControllerInterface()
-    {}
-
-
-} /* namespace Nymph */
diff --git a/Cpp/Library/Control/ControllerInterface.hh b/Cpp/Library/Control/ControllerInterface.hh
deleted file mode 100644
index 8a7502a..0000000
--- a/Cpp/Library/Control/ControllerInterface.hh
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * ControllerInterface.hh
- *
- *  Created on: Jan 24, 2022
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_CONTROLLERINTERFACE_HH_
-#define NYMPH_CONTROLLERINTERFACE_HH_
-
-#include <exception>
-#include <string>
-
-namespace Nymph
-{
-
-    /*!
-     @class ControllerInterface
-     @author N. S. Oblath
-
-     @brief Interface for controller classes: break/continue/cancel functionality
-
-    */
-    class ControllerInterface
-    {
-        public:
-            ControllerInterface();
-            virtual ~ControllerInterface();
-
-            virtual bool WaitToContinue() = 0;
-
-            /// Returns when processing is completed or a breakpoint is reached
-            /// If the return is true, processing can continue after the break
-            /// If the return is false, processing has ended (either normally or due to an error)
-            virtual bool WaitForBreakOrCanceled() = 0;
-
-            /// Use this to have a thread wait for the end of a run
-            virtual void WaitForEndOfRun() = 0;
-
-            /// Instruct the Controller to continue after a breakpoint
-            virtual void Continue() = 0;
-
-            /// Cancel all threads and end the run
-            virtual void Cancel( int code = 0 ) = 0;
-
-            /// Reports whether controls is canceled
-            virtual bool IsCanceled() const = 0;
-
-            /// Initiate a break
-            virtual void Break() = 0;
-
-            /// Reports whether control is at a breakpoint
-            virtual bool IsAtBreak() const = 0;
-
-            /// Notify the control that a chain is quitting
-            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr ) = 0;
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_CONTROLLERINTERFACE_HH_ */

From 5fd07eab024af88974046d3af38d2ac3ebdb4d7c Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 14 Feb 2022 19:25:58 +0100
Subject: [PATCH 294/521] Add pybind11 setup for nymph module

---
 CMakeLists.txt                 |  2 ++
 Python/Bindings/CMakeLists.txt | 10 ++++++++++
 Python/Bindings/NymphPybind.cc | 17 +++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 Python/Bindings/CMakeLists.txt
 create mode 100644 Python/Bindings/NymphPybind.cc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61c6f94..cdc1e09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,6 +81,8 @@ add_definitions( -DBOOST_ALL_DYN_LINK )
 
 if( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON TRUE )
+    find_package( pybind11 REQUIRED )
+    add_subdirectory( Python/Bindings )
 else( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON FALSE )
 endif( Nymph_ENABLE_PYTHON )
diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
new file mode 100644
index 0000000..1e5e7d8
--- /dev/null
+++ b/Python/Bindings/CMakeLists.txt
@@ -0,0 +1,10 @@
+# CMakeLists for Nymph/Python/Bindings
+# Author: F. Thomas
+
+set( NYMPH_BINDING_SOURCEFILES
+    NymphPybind.cc
+)
+
+pybind11_add_module( _nymph ${NYMPH_BINDING_SOURCEFILES} )
+
+
diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
new file mode 100644
index 0000000..5396a2f
--- /dev/null
+++ b/Python/Bindings/NymphPybind.cc
@@ -0,0 +1,17 @@
+/*
+ * NymphPybind.cc
+ *
+ *  Created on: Feb 14, 2022
+ *      Author: F. Thomas
+ */
+
+#include <pybind11/pybind11.h>
+
+namespace py = pybind11;
+
+PYBIND11_MODULE(_nymph, m) {
+	m.doc() = "nymph module";
+
+
+
+}

From d3e88b35df1d9fea0b857c10b9bcdf73babd0825 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 15 Feb 2022 19:23:12 +0100
Subject: [PATCH 295/521] Add pybind11 submodules

---
 Python/Bindings/NymphPybind.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 5396a2f..c2fa29c 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -9,9 +9,13 @@
 
 namespace py = pybind11;
 
-PYBIND11_MODULE(_nymph, m) {
-	m.doc() = "nymph module";
-
+PYBIND11_MODULE(_nymph, nymphToplvl) {
 
+	nymphToplvl.doc() = "Nymph package";
 
+	auto nymphControl = nymphToplvl.def_submodule("control", "Control module");
+	auto nymphData = nymphToplvl.def_submodule("data", "Data module");
+	auto nymphImplementation = nymphToplvl.def_submodule("implementation", "Implementation module");
+	auto nymphProcessor = nymphToplvl.def_submodule("processor", "Processor module");
+	auto nymphUtility = nymphToplvl.def_submodule("utility", "Utility module");
 }

From e07d49b8ebc5b914730141afe716d692664ac9b4 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 15 Feb 2022 21:21:48 +0100
Subject: [PATCH 296/521] Modify build of bindings

Builds nymph library first and makes it visible to the build of the
bindings later.
---
 CMakeLists.txt                 | 4 +++-
 Python/Bindings/CMakeLists.txt | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdc1e09..e65ec8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,6 @@ add_definitions( -DBOOST_ALL_DYN_LINK )
 if( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON TRUE )
     find_package( pybind11 REQUIRED )
-    add_subdirectory( Python/Bindings )
 else( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON FALSE )
 endif( Nymph_ENABLE_PYTHON )
@@ -131,6 +130,9 @@ add_subdirectory( Cpp/Library )
 #    add_subdirectory( Cpp/Executables_v1 )
 #endif (Nymph_ENABLE_EXECUTABLES )
 
+if( Nymph_ENABLE_PYTHON )
+	add_subdirectory( Python/Bindings )
+endif( Nymph_ENABLE_PYTHON )
 
 #########
 # Tests #
diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 1e5e7d8..8125933 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -5,6 +5,10 @@ set( NYMPH_BINDING_SOURCEFILES
     NymphPybind.cc
 )
 
-pybind11_add_module( _nymph ${NYMPH_BINDING_SOURCEFILES} )
+set( lib_dependencies 
+    Nymph
+)
 
+pybind11_add_module( _nymph ${NYMPH_BINDING_SOURCEFILES} )
 
+target_link_libraries( _nymph PRIVATE Nymph )
\ No newline at end of file

From 45c66094b1b468812d16f022d1b4bf86522e76aa Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 15 Feb 2022 21:24:04 +0100
Subject: [PATCH 297/521] Add bindings for Processor class

Does not compile yet
---
 Python/Bindings/NymphPybind.cc               |  4 +++
 Python/Bindings/Processor/ProcessorPybind.hh | 37 ++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 Python/Bindings/Processor/ProcessorPybind.hh

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index c2fa29c..fe181d5 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -7,8 +7,11 @@
 
 #include <pybind11/pybind11.h>
 
+#include "Processor/ProcessorPybind.hh"
+
 namespace py = pybind11;
 
+
 PYBIND11_MODULE(_nymph, nymphToplvl) {
 
 	nymphToplvl.doc() = "Nymph package";
@@ -17,5 +20,6 @@ PYBIND11_MODULE(_nymph, nymphToplvl) {
 	auto nymphData = nymphToplvl.def_submodule("data", "Data module");
 	auto nymphImplementation = nymphToplvl.def_submodule("implementation", "Implementation module");
 	auto nymphProcessor = nymphToplvl.def_submodule("processor", "Processor module");
+	NymphPybind::ExportProcessor(nymphProcessor);
 	auto nymphUtility = nymphToplvl.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
new file mode 100644
index 0000000..00a63b4
--- /dev/null
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -0,0 +1,37 @@
+/*
+ * ProcessorPybind.hh
+ *
+ *  Created on: Feb 15, 2022
+ *      Author: F. Thomas
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_PROCESSORPYBIND_HH_
+#define PYTHON_BINDINGS_PROCESSOR_PROCESSORPYBIND_HH_
+
+#include <pybind11/pybind11.h>
+
+#include "Processor.hh"
+
+namespace py = pybind11;
+
+namespace NymphPybind
+{
+
+	void ExportProcessor( py::module_& nymphProcessor)
+	{
+	    py::class_< Nymph::Processor>(nymphProcessor, "_Processor")
+	    		.def(py::init<const std::string& >())
+				.def("configure", &Nymph::Processor::Configure)
+				.def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
+				.def("connect_a_slot", &Nymph::Processor::ConnectASlot)
+				.def("connect_a_signal", &Nymph::Processor::ConnectASignal)
+				.def("register_signal", &Nymph::Processor::RegisterSignal)
+				.def("register_slot", &Nymph::Processor::RegisterSlot)
+				.def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
+				.def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint)
+				.def_property_readonly("name", &Nymph::Processor::Name);
+	}
+
+}
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_PROCESSORPYBIND_HH_ */

From 434573cd25771896b6c4baa8121a976f1e088e69 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 16 Feb 2022 14:49:58 -0800
Subject: [PATCH 298/521] Some cleanup

---
 Cpp/Library/Control/Controller.hh          | 32 ----------------------
 Cpp/Library/Control/SingleRunController.hh |  2 --
 2 files changed, 34 deletions(-)

diff --git a/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
index fd70084..902b0cf 100644
--- a/Cpp/Library/Control/Controller.hh
+++ b/Cpp/Library/Control/Controller.hh
@@ -81,7 +81,6 @@ namespace Nymph
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarContinue );
             MEMVAR_REF_MUTABLE( std::condition_variable, CondVarBreak );
             MEMVAR_NOSET( bool, BreakFlag );
-            //MEMVAR_SHARED_PTR_CONST( ReturnBufferBase, ReturnPtr );
 
         protected:
             void do_cancellation( int code );
@@ -120,37 +119,6 @@ namespace Nymph
         return fReturnBuffer->GetReturn< XArgs... >();
     }
 
-/*
-    template< typename... Args >
-    void SharedControl::Break( Args&... args )
-    {
-        while( IsAtBreak() && ! IsCanceled() )
-        {
-            if( ! WaitToContinue() )
-            {
-                THROW_EXCEPT_HERE( Exception() << "Canceled while waiting to initiate a breakpoint" );
-            }
-        }
-
-        std::unique_lock< std::mutex > lock( fMutex );
-        fBreakFlag = true;
-        fCondVarBreak.notify_all();
-        return;
-    }
-
-
-
-    template< typename... Args >
-    std::tuple< Args&... >& SharedControl::GetReturn()
-    {
-        if( ! fReturnPtr ) THROW_EXCEPT_HERE( Exception() << "No return available" );
-        std::unique_lock< std::mutex > lock( fMutex );
-        std::shared_ptr< ReturnBuffer< Args... > > buffer( std::dynamic_pointer_cast< ReturnBuffer< Args... > >(fReturnPtr) );
-        if( buffer == nullptr ) THROW_EXCEPT_HERE( Exception() << "Incorrect types used to get return" );
-        return buffer->GetReturn();
-    }
-*/
-
 } /* namespace Nymph */
 
 #endif /* NYMPH_CONTROLLER_HH_ */
diff --git a/Cpp/Library/Control/SingleRunController.hh b/Cpp/Library/Control/SingleRunController.hh
index f08b9ab..a6842c5 100644
--- a/Cpp/Library/Control/SingleRunController.hh
+++ b/Cpp/Library/Control/SingleRunController.hh
@@ -58,8 +58,6 @@ namespace Nymph
             /// Notify the control that a chain is quitting
             virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
-            // TODO: return value access
-
             MEMVAR( unsigned, NActiveThreads );
 
         protected:

From 9ac33c3fc034b4f3285e56c5af88d57402a52fb1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 16 Feb 2022 14:50:11 -0800
Subject: [PATCH 299/521] Adding class documentation

---
 Cpp/Library/Control/ControlAccess.hh | 17 +++++++++++++++++
 Cpp/Library/Control/Controller.hh    |  7 +++++++
 Cpp/Library/Control/ReturnBuffer.hh  | 28 ++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/Cpp/Library/Control/ControlAccess.hh b/Cpp/Library/Control/ControlAccess.hh
index 0d09516..a985464 100644
--- a/Cpp/Library/Control/ControlAccess.hh
+++ b/Cpp/Library/Control/ControlAccess.hh
@@ -19,6 +19,23 @@
 namespace Nymph
 {
 
+    /*!
+     @class ControlAccess
+     @author N. S. Oblath
+
+     @brief Global access to primary control functionality
+
+     @details
+     This is a singleton class that allows access to the active Controller from anywhere in a Nymph-based application.
+
+     Specific functionatity includes:
+     * Initiating a break and (optionally) returning parameters
+     * Continuing from a break
+     * Canceling operations
+     * Waiting for a break/continuation/cancelation
+     * Notifying the Controller that a Processor chain is quitting
+
+    */
     class ControlAccess : public scarab::singleton< ControlAccess >
     {
         protected:
diff --git a/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
index 902b0cf..3c3e968 100644
--- a/Cpp/Library/Control/Controller.hh
+++ b/Cpp/Library/Control/Controller.hh
@@ -28,6 +28,13 @@ namespace Nymph
 
      @brief Base class for Controller classes, with basic break/continue/cancel functionality
 
+     @details
+     A Controller can:
+
+     * Cancel operations: typically used by either a Processor chain's thread (usually via ControlAccess) or the client of the Controller, this will result in the full cancelation, from the top down, of all Nymph-based operations
+     * Initiate a break: used mostly by a Processor chain's thread where a breakpoint is set, a breakpoint can be initiated with control returned to the client; parameters (e.g. data) can be returned at the break to provide access to the client
+     * Waiting on a break/cancellation/continuation: the Controller can be used to cause a thread to wait on any of those conditions; cancellation will interupt all wait conditions
+     * Be notified of a quitting Processor chain: when a Processor chain quits, it notifies the Controller (via ControlAccess) that it is quitting; if there's an exception, that should be provided to properly forward error conditions
     */
     class Controller : public scarab::cancelable
     {
diff --git a/Cpp/Library/Control/ReturnBuffer.hh b/Cpp/Library/Control/ReturnBuffer.hh
index bbacb63..94ec5c7 100644
--- a/Cpp/Library/Control/ReturnBuffer.hh
+++ b/Cpp/Library/Control/ReturnBuffer.hh
@@ -15,19 +15,43 @@
 namespace Nymph
 {
 
+    /*!
+     @class ReturnBufferBase
+     @author N. S. Oblath
+
+     @brief Base class for ReturnBuffers, providing access to the returned parameters
+
+     @details
+     ReturnBuffers are a type-erasure mechanism for returning parameters at a breakpoint in Nymph operations.
+
+     This base class provides the type erasure while grating access to the returned paramters via a templated GetREturn() function.
+    */
     class ReturnBufferBase
     {
         public:
             ReturnBufferBase();
             virtual ~ReturnBufferBase();
 
+            /// Provides access to the returned parameters
+            /// Throws Nymph::Exception if the buffer is empty or if XArgs... does not match the stored contents
             template< class... XArgs >
             std::tuple< XArgs&... >& GetReturn();
 
+            /// Provides const access to the returned parameters
+            /// Throws Nymph::Exception if the buffer is empty or if XArgs... does not match the stored contents
             template< class... XArgs >
             const std::tuple< XArgs&... >& GetReturn() const;
     };
 
+    /*!
+     @class ReturnBuffer<XArgs...>
+     @author N. S. Oblath
+
+     @brief Provides storage for returned parameters
+
+     @details
+     Parameters are stored as a `std::tuple<XArgs...>`.
+    */
     template< class... XArgs >
     class ReturnBuffer : public ReturnBufferBase
     {
@@ -36,8 +60,12 @@ namespace Nymph
             ReturnBuffer( XArgs&... retval );
             virtual ~ReturnBuffer();
 
+            /// Provides access to the returned parameters
+            /// Throws Nymph::Exception if the buffer is empty
             std::tuple< XArgs&... >& GetReturn();
 
+            /// Provides const access to the returned parameters
+            /// Throws Nymph::Exception if the buffer is empty
             const std::tuple< XArgs&... >& GetReturn() const;
 
         protected:

From f7ba1d53de838b91af63e90917cbc88416b024d9 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 7 Mar 2022 08:54:34 -0500
Subject: [PATCH 300/521] reorganized directories again to help with python
 packaging organization

---
 .gitmodules                                   |     8 +-
 CMakeLists.txt                                |    16 +-
 External/cereal                               |     1 -
 MANIFEST.in                                   |    11 +
 NymphConfig.cmake.in                          |     2 +-
 Python/CMakeLists.txt                         |    27 -
 Scarab                                        |     1 -
 .../Cpp}/Executables_v1/Main/CMakeLists.txt   |     0
 .../Cpp}/Executables_v1/Main/ConfigCheck.cc   |     0
 {Cpp => Src/Cpp}/Executables_v1/Main/Nymph.cc |     0
 .../Executables_v1/Validation/CMakeLists.txt  |     0
 .../ConfigFiles/TestConfigurator.json         |     0
 .../ConfigFiles/TestParameterStoreConfig.json |     0
 .../Executables_v1/Validation/KTJSONReader.cc |     0
 .../Executables_v1/Validation/KTJSONReader.hh |     0
 .../Validation/KTJSONTypeWriterValidation.cc  |     0
 .../Validation/KTJSONTypeWriterValidation.hh  |     0
 .../Validation/KTPyTestClass.cc               |     0
 .../Validation/KTPyTestClass.hh               |     0
 .../Validation/KTPyTestClassPybind.hh         |     0
 .../KTRegisterNymphValidationExtData.hh       |     0
 .../Validation/KTTestConfigurable.cc          |     0
 .../Validation/KTTestConfigurable.hh          |     0
 .../Executables_v1/Validation/KTTestCuts.cc   |     0
 .../Executables_v1/Validation/KTTestCuts.hh   |     0
 .../Executables_v1/Validation/KTTestData.cc   |     0
 .../Executables_v1/Validation/KTTestData.hh   |     0
 .../Validation/KTTestDataPrimaryProcessor.cc  |     0
 .../Validation/KTTestDataPrimaryProcessor.hh  |     0
 .../Validation/KTTestPrimaryProcessor.cc      |     0
 .../Validation/KTTestPrimaryProcessor.hh      |     0
 .../Validation/KTTestProcessor.cc             |     0
 .../Validation/KTTestProcessor.hh             |     0
 .../Validation/NymphValidationPybind.cc       |     0
 .../Validation/TestApplication.cc             |     0
 .../Executables_v1/Validation/TestApplyCut.cc |     0
 .../Validation/TestCacheDirectory.cc          |     0
 .../Cpp}/Executables_v1/Validation/TestCut.cc |     0
 .../Validation/TestCutFilter.cc               |     0
 .../Executables_v1/Validation/TestData.cc     |     0
 .../Validation/TestExceptionInSlot.cc         |     0
 .../Cpp}/Executables_v1/Validation/TestExt.cc |     0
 .../Validation/TestExtSerialization.cc        |     0
 .../Validation/TestJSONWriter.cc              |     0
 .../Validation/TestJSONWriterViaSlot.cc       |     0
 .../Executables_v1/Validation/TestLogger.cc   |     0
 .../Validation/TestParamBindings.py           |     0
 .../Validation/TestPolymorphicSlotData.cc     |     0
 .../Validation/TestPrimaryProcessor.cc        |     0
 .../TestPrimaryProcessorNoThreading.cc        |     0
 .../Validation/TestPrintData.cc               |     0
 .../Validation/TestProcessorToolbox.py        |     0
 .../TestProcessorToolbox2Threads.cc           |     0
 .../TestProcessorToolboxMultithreaded.cc      |     0
 .../TestProcessorToolboxSinglethreaded.cc     |     0
 .../Validation/TestPyTestClass.py             |     0
 .../Validation/TestPythonBasics.hh            |     0
 .../Validation/TestPythonBasics.py            |     0
 .../Validation/TestSerialization.cc           |     0
 .../Validation/TestSignalsAndSlots.cc         |     0
 .../Executables_v1/Validation/TestSlotData.cc |     0
 .../Validation/TestThroughputProfiler.cc      |     0
 .../Validation/TestUseBreakpoint.cc           |     0
 .../Validation/TestWrapProcessor.py           |     0
 {Cpp => Src/Cpp}/Library/CMakeLists.txt       |     2 +-
 .../Cpp}/Library/Control/ControlAccess.cc     |     0
 .../Cpp}/Library/Control/ControlAccess.hh     |     0
 .../Cpp}/Library/Control/Controller.cc        |     0
 .../Cpp}/Library/Control/Controller.hh        |     0
 .../Library/Control/ControllerInterface.cc    |     0
 .../Library/Control/ControllerInterface.hh    |     0
 .../Cpp}/Library/Control/ReturnBuffer.cc      |     0
 .../Cpp}/Library/Control/ReturnBuffer.hh      |     0
 .../Library/Control/SingleRunController.cc    |     0
 .../Library/Control/SingleRunController.hh    |     0
 {Cpp => Src/Cpp}/Library/Data/Data.cc         |     0
 {Cpp => Src/Cpp}/Library/Data/Data.hh         |     0
 {Cpp => Src/Cpp}/Library/Data/DataFrame.cc    |     0
 {Cpp => Src/Cpp}/Library/Data/DataFrame.hh    |     0
 {Cpp => Src/Cpp}/Library/Data/DataManager.cc  |     0
 {Cpp => Src/Cpp}/Library/Data/DataManager.hh  |     0
 .../Library/Processor/PrimaryProcessor.cc     |     0
 .../Library/Processor/PrimaryProcessor.hh     |     0
 .../Cpp}/Library/Processor/Processor.cc       |     0
 .../Cpp}/Library/Processor/Processor.hh       |     0
 .../Library/Processor/ProcessorToolbox.cc     |     0
 .../Library/Processor/ProcessorToolbox.hh     |     0
 .../Cpp}/Library/Processor/QuitChain.hh       |     0
 {Cpp => Src/Cpp}/Library/Processor/Signal.hh  |     0
 .../Cpp}/Library/Processor/SignalSlotBase.cc  |     0
 .../Cpp}/Library/Processor/SignalSlotBase.hh  |     0
 {Cpp => Src/Cpp}/Library/Processor/Slot.hh    |     0
 {Cpp => Src/Cpp}/Library/Utility/Exception.cc |     0
 {Cpp => Src/Cpp}/Library/Utility/Exception.hh |     0
 .../Cpp}/Library/Utility/MemberVariable.hh    |     0
 .../Cpp}/Library_v1/AddLibPythonPath.sh.in    |     0
 .../Library_v1/Application/KTApplication.cc   |     0
 .../Library_v1/Application/KTApplication.hh   |     0
 .../Application/KTCommandLineHandler.cc       |     0
 .../Application/KTCommandLineHandler.hh       |     0
 .../Application/KTCommandLineOption.hh        |     0
 .../Library_v1/Application/KTConfigurator.cc  |     0
 .../Library_v1/Application/KTConfigurator.hh  |     0
 .../Application/KTDataQueueProcessor.cc       |     0
 .../Application/KTDataQueueProcessor.hh       |     0
 .../Application/KTFilenameParsers.cc          |     0
 .../Application/KTFilenameParsers.hh          |     0
 .../Application/KTPrintDataStructure.cc       |     0
 .../Application/KTPrintDataStructure.hh       |     0
 .../Application/KTProcessorToolbox.cc         |     0
 .../Application/KTProcessorToolbox.hh         |     0
 .../Application/KTProcessorToolboxPybind.hh   |     0
 .../Cpp}/Library_v1/Application/KTRunNymph.cc |     0
 .../Cpp}/Library_v1/Application/KTRunNymph.hh |     0
 .../Application/KTThroughputProfiler.cc       |     0
 .../Application/KTThroughputProfiler.hh       |     0
 {Cpp => Src/Cpp}/Library_v1/CMakeLists.txt    |     0
 .../Cpp}/Library_v1/Data/KTApplyCut.cc        |     0
 .../Cpp}/Library_v1/Data/KTApplyCut.hh        |     0
 .../Cpp}/Library_v1/Data/KTCoreData.cc        |     0
 .../Cpp}/Library_v1/Data/KTCoreData.hh        |     0
 {Cpp => Src/Cpp}/Library_v1/Data/KTCut.cc     |     0
 {Cpp => Src/Cpp}/Library_v1/Data/KTCut.hh     |     0
 .../Cpp}/Library_v1/Data/KTCutFilter.cc       |     0
 .../Cpp}/Library_v1/Data/KTCutFilter.hh       |     0
 .../Cpp}/Library_v1/Data/KTCutResult.hh       |     0
 .../Cpp}/Library_v1/Data/KTCutStatus.cc       |     0
 .../Cpp}/Library_v1/Data/KTCutStatus.hh       |     0
 {Cpp => Src/Cpp}/Library_v1/Data/KTData.cc    |     0
 {Cpp => Src/Cpp}/Library_v1/Data/KTData.hh    |     0
 .../Library_v1/Data/KTRegisterNymphExtData.hh |     0
 {Cpp => Src/Cpp}/Library_v1/Data/KTTester.cc  |     0
 {Cpp => Src/Cpp}/Library_v1/Data/KTTester.hh  |     0
 .../Cpp}/Library_v1/IO/KTJSONWriter.cc        |     0
 .../Cpp}/Library_v1/IO/KTJSONWriter.hh        |     0
 {Cpp => Src/Cpp}/Library_v1/IO/KTReader.cc    |     0
 {Cpp => Src/Cpp}/Library_v1/IO/KTReader.hh    |     0
 {Cpp => Src/Cpp}/Library_v1/IO/KTWriter.cc    |     0
 {Cpp => Src/Cpp}/Library_v1/IO/KTWriter.hh    |     0
 {Cpp => Src/Cpp}/Library_v1/NymphPybind.cc    |     0
 .../Cpp}/Library_v1/Processor/KTConnection.hh |     0
 .../Library_v1/Processor/KTNymphSignals.hh    |     0
 .../Cpp}/Library_v1/Processor/KTNymphSlot.hh  |     0
 .../Processor/KTPrimaryProcessor.cc           |     0
 .../Processor/KTPrimaryProcessor.hh           |     0
 .../Cpp}/Library_v1/Processor/KTProcessor.cc  |     0
 .../Cpp}/Library_v1/Processor/KTProcessor.hh  |     0
 .../Library_v1/Processor/KTProcessorPybind.cc |     0
 .../Library_v1/Processor/KTProcessorPybind.hh |     0
 .../Library_v1/Processor/KTPyProcessor.hh     |     0
 .../Cpp}/Library_v1/Processor/KTSignal.hh     |     0
 .../Library_v1/Processor/KTSignalSlotBase.hh  |     0
 .../Library_v1/Processor/KTSignalWrapper.cc   |     0
 .../Library_v1/Processor/KTSignalWrapper.hh   |     0
 .../Cpp}/Library_v1/Processor/KTSlot.hh       |     0
 .../Library_v1/Processor/KTSlotWrapper.cc     |     0
 .../Library_v1/Processor/KTSlotWrapper.hh     |     0
 .../Library_v1/Processor/KTThreadReference.cc |     0
 .../Library_v1/Processor/KTThreadReference.hh |     0
 .../Library_v1/Utility/KTCacheDirectory.cc    |     0
 .../Library_v1/Utility/KTCacheDirectory.hh    |     0
 .../Library_v1/Utility/KTConcurrentQueue.hh   |     0
 .../Cpp}/Library_v1/Utility/KTConfigurable.cc |     0
 .../Cpp}/Library_v1/Utility/KTConfigurable.hh |     0
 .../Utility/KTConfigurablePybind.hh           |     0
 .../Cpp}/Library_v1/Utility/KTDirectory.cc    |     0
 .../Cpp}/Library_v1/Utility/KTDirectory.hh    |     0
 .../Cpp}/Library_v1/Utility/KTEventLoop.cc    |     0
 .../Cpp}/Library_v1/Utility/KTEventLoop.hh    |     0
 .../Cpp}/Library_v1/Utility/KTException.cc    |     0
 .../Cpp}/Library_v1/Utility/KTException.hh    |     0
 .../Cpp}/Library_v1/Utility/KTExtensible.hh   |     0
 .../Library_v1/Utility/KTExtensibleStruct.hh  |     0
 .../Utility/KTExtensibleStructFactory.hh      |     0
 .../Cpp}/Library_v1/Utility/KTLogger.hh       |     0
 .../Library_v1/Utility/KTMemberVariable.hh    |     0
 .../Cpp}/Library_v1/Utility/KTParamPybind.hh  |     0
 .../Cpp}/Library_v1/Utility/KTPythonMacros.hh |     0
 .../Cpp}/Library_v1/Utility/KTTIFactory.hh    |     0
 {Cpp => Src/Cpp}/Library_v1/Utility/KTTime.cc |     0
 {Cpp => Src/Cpp}/Library_v1/Utility/KTTime.hh |     0
 .../Cpp}/Templates/KTProcessorTemplate.cc     |     0
 .../Cpp}/Templates/KTProcessorTemplate.hh     |     0
 {Cpp => Src/Cpp}/Templates/MainCMakeLists.txt |     0
 Src/External/cereal/.gitignore                |    49 +
 Src/External/cereal/.travis.yml               |    39 +
 Src/External/cereal/CMakeLists.txt            |    66 +
 Src/External/cereal/LICENSE                   |    24 +
 Src/External/cereal/README.md                 |    85 +
 Src/External/cereal/appveyor.yml              |    35 +
 Src/External/cereal/doc/CMakeLists.txt        |    18 +
 Src/External/cereal/doc/DoxygenLayout.xml     |   190 +
 Src/External/cereal/doc/doxygen.in            |  1870 ++
 Src/External/cereal/doc/footer.html           |    31 +
 Src/External/cereal/doc/mainpage.dox          |    47 +
 Src/External/cereal/include/cereal/access.hpp |   448 +
 .../include/cereal/archives/adapters.hpp      |   163 +
 .../cereal/include/cereal/archives/binary.hpp |   169 +
 .../cereal/include/cereal/archives/json.hpp   |   981 +
 .../cereal/archives/portable_binary.hpp       |   334 +
 .../cereal/include/cereal/archives/xml.hpp    |   897 +
 Src/External/cereal/include/cereal/cereal.hpp |   987 +
 .../cereal/include/cereal/details/helpers.hpp |   383 +
 .../cereal/details/polymorphic_impl.hpp       |   764 +
 .../cereal/details/polymorphic_impl_fwd.hpp   |    65 +
 .../include/cereal/details/static_object.hpp  |   127 +
 .../cereal/include/cereal/details/traits.hpp  |  1389 ++
 .../cereal/include/cereal/details/util.hpp    |    84 +
 .../cereal/include/cereal/external/base64.hpp |   127 +
 .../cereal/external/rapidjson/allocators.h    |   271 +
 .../cereal/external/rapidjson/document.h      |  2575 +++
 .../cereal/external/rapidjson/encodedstream.h |   299 +
 .../cereal/external/rapidjson/encodings.h     |   716 +
 .../cereal/external/rapidjson/error/en.h      |    74 +
 .../cereal/external/rapidjson/error/error.h   |   155 +
 .../external/rapidjson/filereadstream.h       |    99 +
 .../external/rapidjson/filewritestream.h      |   104 +
 .../include/cereal/external/rapidjson/fwd.h   |   151 +
 .../external/rapidjson/internal/biginteger.h  |   290 +
 .../external/rapidjson/internal/diyfp.h       |   258 +
 .../cereal/external/rapidjson/internal/dtoa.h |   245 +
 .../external/rapidjson/internal/ieee754.h     |    78 +
 .../cereal/external/rapidjson/internal/itoa.h |   304 +
 .../cereal/external/rapidjson/internal/meta.h |   181 +
 .../external/rapidjson/internal/pow10.h       |    55 +
 .../external/rapidjson/internal/regex.h       |   701 +
 .../external/rapidjson/internal/stack.h       |   230 +
 .../external/rapidjson/internal/strfunc.h     |    55 +
 .../external/rapidjson/internal/strtod.h      |   269 +
 .../cereal/external/rapidjson/internal/swap.h |    46 +
 .../external/rapidjson/istreamwrapper.h       |   116 +
 .../cereal/external/rapidjson/memorybuffer.h  |    70 +
 .../cereal/external/rapidjson/memorystream.h  |    76 +
 .../external/rapidjson/msinttypes/inttypes.h  |   316 +
 .../external/rapidjson/msinttypes/stdint.h    |   300 +
 .../external/rapidjson/ostreamwrapper.h       |    81 +
 .../cereal/external/rapidjson/pointer.h       |  1358 ++
 .../cereal/external/rapidjson/prettywriter.h  |   255 +
 .../cereal/external/rapidjson/rapidjson.h     |   615 +
 .../cereal/external/rapidjson/reader.h        |  1879 ++
 .../cereal/external/rapidjson/schema.h        |  2006 ++
 .../cereal/external/rapidjson/stream.h        |   179 +
 .../cereal/external/rapidjson/stringbuffer.h  |   117 +
 .../cereal/external/rapidjson/writer.h        |   610 +
 .../cereal/external/rapidxml/license.txt      |    52 +
 .../cereal/external/rapidxml/manual.html      |   406 +
 .../cereal/external/rapidxml/rapidxml.hpp     |  2624 +++
 .../external/rapidxml/rapidxml_iterators.hpp  |   175 +
 .../external/rapidxml/rapidxml_print.hpp      |   426 +
 .../external/rapidxml/rapidxml_utils.hpp      |   123 +
 Src/External/cereal/include/cereal/macros.hpp |   135 +
 .../cereal/include/cereal/types/array.hpp     |    79 +
 .../include/cereal/types/base_class.hpp       |   201 +
 .../cereal/include/cereal/types/bitset.hpp    |   176 +
 .../include/cereal/types/boost_variant.hpp    |   106 +
 .../cereal/include/cereal/types/chrono.hpp    |    72 +
 .../cereal/include/cereal/types/common.hpp    |   129 +
 .../cereal/include/cereal/types/complex.hpp   |    56 +
 .../concepts/pair_associative_container.hpp   |    73 +
 .../cereal/include/cereal/types/deque.hpp     |    62 +
 .../include/cereal/types/forward_list.hpp     |    68 +
 .../include/cereal/types/functional.hpp       |    43 +
 .../cereal/include/cereal/types/list.hpp      |    62 +
 .../cereal/include/cereal/types/map.hpp       |    36 +
 .../cereal/include/cereal/types/memory.hpp    |   425 +
 .../include/cereal/types/polymorphic.hpp      |   481 +
 .../cereal/include/cereal/types/queue.hpp     |   132 +
 .../cereal/include/cereal/types/set.hpp       |   103 +
 .../cereal/include/cereal/types/stack.hpp     |    76 +
 .../cereal/include/cereal/types/string.hpp    |    61 +
 .../cereal/include/cereal/types/tuple.hpp     |   123 +
 .../include/cereal/types/unordered_map.hpp    |    36 +
 .../include/cereal/types/unordered_set.hpp    |    99 +
 .../cereal/include/cereal/types/utility.hpp   |    47 +
 .../cereal/include/cereal/types/valarray.hpp  |    89 +
 .../cereal/include/cereal/types/vector.hpp    |   112 +
 Src/External/cereal/sandbox/CMakeLists.txt    |    17 +
 Src/External/cereal/sandbox/performance.cpp   |   469 +
 Src/External/cereal/sandbox/sandbox.cpp       |   820 +
 Src/External/cereal/sandbox/sandbox_json.cpp  |   446 +
 Src/External/cereal/sandbox/sandbox_rtti.cpp  |   231 +
 .../sandbox/sandbox_shared_lib/CMakeLists.txt |     1 +
 .../sandbox/sandbox_shared_lib/base.cpp       |     9 +
 .../sandbox/sandbox_shared_lib/base.hpp       |    43 +
 .../sandbox/sandbox_shared_lib/derived.cpp    |    10 +
 .../sandbox/sandbox_shared_lib/derived.hpp    |    19 +
 Src/External/cereal/sandbox/sandbox_vs.cpp    |   278 +
 .../cereal/scripts/add_rapidjson_prefix.sh    |     4 +
 Src/External/cereal/scripts/appveyor.bat      |    75 +
 Src/External/cereal/scripts/renameincludes.sh |    12 +
 Src/External/cereal/scripts/updatecoverage.sh |    33 +
 Src/External/cereal/scripts/updatedoc.in      |    25 +
 Src/External/cereal/unittests/CMakeLists.txt  |    92 +
 Src/External/cereal/unittests/array.cpp       |    52 +
 Src/External/cereal/unittests/array.hpp       |    95 +
 .../cereal/unittests/basic_string.cpp         |   171 +
 .../cereal/unittests/basic_string.hpp         |   114 +
 Src/External/cereal/unittests/bitset.cpp      |    52 +
 Src/External/cereal/unittests/bitset.hpp      |    87 +
 .../cereal/unittests/boost_variant.cpp        |    52 +
 .../cereal/unittests/boost_variant.hpp        |    70 +
 Src/External/cereal/unittests/chrono.cpp      |    52 +
 Src/External/cereal/unittests/chrono.hpp      |   105 +
 .../unittests/cmake-config-module.cmake       |   123 +
 Src/External/cereal/unittests/common.hpp      |   223 +
 Src/External/cereal/unittests/complex.cpp     |    52 +
 Src/External/cereal/unittests/complex.hpp     |    77 +
 Src/External/cereal/unittests/deque.cpp       |    52 +
 Src/External/cereal/unittests/deque.hpp       |   101 +
 Src/External/cereal/unittests/doctest.h       |  3374 +++
 .../cereal/unittests/forward_list.cpp         |    52 +
 .../cereal/unittests/forward_list.hpp         |    95 +
 Src/External/cereal/unittests/list.cpp        |    52 +
 Src/External/cereal/unittests/list.hpp        |    95 +
 .../cereal/unittests/load_construct.cpp       |    52 +
 .../cereal/unittests/load_construct.hpp       |   260 +
 Src/External/cereal/unittests/map.cpp         |    72 +
 Src/External/cereal/unittests/map.hpp         |   169 +
 Src/External/cereal/unittests/memory.cpp      |    72 +
 Src/External/cereal/unittests/memory.hpp      |   116 +
 .../cereal/unittests/memory_cycles.cpp        |    52 +
 .../cereal/unittests/memory_cycles.hpp        |   142 +
 Src/External/cereal/unittests/multimap.cpp    |    52 +
 Src/External/cereal/unittests/multimap.hpp    |   129 +
 Src/External/cereal/unittests/multiset.cpp    |    52 +
 Src/External/cereal/unittests/multiset.hpp    |   134 +
 Src/External/cereal/unittests/pair.cpp        |    51 +
 Src/External/cereal/unittests/pair.hpp        |    92 +
 Src/External/cereal/unittests/pod.cpp         |    52 +
 Src/External/cereal/unittests/pod.hpp         |   147 +
 Src/External/cereal/unittests/polymorphic.cpp |    74 +
 Src/External/cereal/unittests/polymorphic.hpp |   359 +
 .../cereal/unittests/portability_test.cpp     |   202 +
 .../unittests/portable_binary_archive.cpp     |   134 +
 .../unittests/portable_binary_archive.hpp     |   156 +
 .../cereal/unittests/priority_queue.cpp       |    52 +
 .../cereal/unittests/priority_queue.hpp       |   107 +
 Src/External/cereal/unittests/queue.cpp       |    52 +
 Src/External/cereal/unittests/queue.hpp       |   107 +
 .../unittests/run_portability_test.cmake      |    16 +
 Src/External/cereal/unittests/run_valgrind.sh |    10 +
 Src/External/cereal/unittests/set.cpp         |    52 +
 Src/External/cereal/unittests/set.hpp         |    95 +
 Src/External/cereal/unittests/stack.cpp       |    52 +
 Src/External/cereal/unittests/stack.hpp       |   107 +
 Src/External/cereal/unittests/structs.cpp     |    52 +
 Src/External/cereal/unittests/structs.hpp     |    68 +
 .../cereal/unittests/structs_minimal.cpp      |    52 +
 .../cereal/unittests/structs_minimal.hpp      |   254 +
 .../cereal/unittests/structs_specialized.cpp  |    52 +
 .../cereal/unittests/structs_specialized.hpp  |   461 +
 Src/External/cereal/unittests/tuple.cpp       |    52 +
 Src/External/cereal/unittests/tuple.hpp       |   101 +
 .../cereal/unittests/unordered_loads.cpp      |    42 +
 .../cereal/unittests/unordered_loads.hpp      |   149 +
 .../cereal/unittests/unordered_map.cpp        |    52 +
 .../cereal/unittests/unordered_map.hpp        |   124 +
 .../cereal/unittests/unordered_multimap.cpp   |    52 +
 .../cereal/unittests/unordered_multimap.hpp   |   155 +
 .../cereal/unittests/unordered_multiset.cpp   |    52 +
 .../cereal/unittests/unordered_multiset.hpp   |   134 +
 .../cereal/unittests/unordered_set.cpp        |    52 +
 .../cereal/unittests/unordered_set.hpp        |   114 +
 .../cereal/unittests/user_data_adapters.cpp   |    52 +
 .../cereal/unittests/user_data_adapters.hpp   |   120 +
 Src/External/cereal/unittests/valarray.cpp    |    52 +
 Src/External/cereal/unittests/valarray.hpp    |   101 +
 Src/External/cereal/unittests/vector.cpp      |    52 +
 Src/External/cereal/unittests/vector.hpp      |   110 +
 Src/External/cereal/unittests/versioning.cpp  |    74 +
 Src/External/cereal/unittests/versioning.hpp  |   217 +
 Src/External/cereal/vs2013/.gitignore         |     3 +
 .../cereal/vs2013/sandbox/sandbox.vcxproj     |   256 +
 .../vs2013/sandbox/sandbox.vcxproj.filters    |    22 +
 .../vs2013/sandbox_json/sandbox_json.vcxproj  |   248 +
 .../sandbox_json/sandbox_json.vcxproj.filters |    22 +
 .../vs2013/sandbox_rtti/sandbox_rtti.vcxproj  |   252 +
 .../sandbox_rtti/sandbox_rtti.vcxproj.filters |    22 +
 .../vs2013/sandbox_vs/sandbox_vs.vcxproj      |   266 +
 .../sandbox_vs/sandbox_vs.vcxproj.filters     |    22 +
 .../sandbox_vs_dll/sandbox_vs_dll.vcxproj     |   261 +
 .../sandbox_vs_dll.vcxproj.filters            |    33 +
 Src/External/cereal/vs2013/unittests/main.cpp |    30 +
 .../cereal/vs2013/unittests/unittests.vcxproj |   327 +
 .../unittests/unittests.vcxproj.filters       |   127 +
 Src/External/cereal/vs2013/vs2013.sln         |   147 +
 Src/Python/CMakeLists.txt                     |    41 +
 Src/Python/README.md                          |    49 +
 {Python => Src/Python}/nymph/__init__.py      |     0
 Src/Scarab/.github/workflows/run_tests.yaml   |    69 +
 Src/Scarab/.gitignore                         |    13 +
 Src/Scarab/.gitmodules                        |     0
 Src/Scarab/.travis.yml                        |    74 +
 Src/Scarab/AUTHORS                            |    12 +
 Src/Scarab/CMakeLists.txt                     |   181 +
 Src/Scarab/LICENSE                            |    28 +
 Src/Scarab/README.md                          |    16 +
 Src/Scarab/ScarabConfig.cmake.in              |    29 +
 Src/Scarab/VERSION                            |     1 +
 Src/Scarab/cmake/FindEigen3.cmake             |    80 +
 Src/Scarab/cmake/FindFFTW.cmake               |   163 +
 Src/Scarab/cmake/FindSphinx.cmake             |    14 +
 Src/Scarab/cmake/GetVersion.cmake             |    33 +
 Src/Scarab/cmake/PackageBuilder.cmake         |   171 +
 Src/Scarab/cmake/PackageBuilderMacros.cmake   |   541 +
 Src/Scarab/documentation/README.md            |    24 +
 .../documentation/application_building.rst    |   223 +
 Src/Scarab/documentation/cpp/Doxyfile         |  1534 ++
 Src/Scarab/documentation/cpp/README.md        |    57 +
 .../cpp/Scarab_CMakeOverview.rst              |     2 +
 .../cpp/Scarab_LibraryOverview.rst            |    34 +
 Src/Scarab/documentation/cpp/conf.py          |   317 +
 .../documentation/cpp/doxfiles/mainpage.dox   |     5 +
 Src/Scarab/documentation/cpp/favicon.ico      |   Bin 0 -> 1150 bytes
 Src/Scarab/documentation/cpp/index.rst        |    12 +
 Src/Scarab/documentation/cpp/requirements.txt |     1 +
 .../documentation/cpp/scarab_logo_small.png   |   Bin 0 -> 4236 bytes
 Src/Scarab/documentation/package_builder.rst  |   336 +
 Src/Scarab/documentation/python/README.md     |    77 +
 .../documentation/python/_templates/README.md |     3 +
 .../python/_templates/module.rst              |    79 +
 .../python/_templates/package.rst             |    89 +
 Src/Scarab/documentation/python/conf.py       |   298 +
 Src/Scarab/documentation/python/index.rst     |     9 +
 Src/Scarab/executables/CMakeLists.txt         |    27 +
 Src/Scarab/executables/scarab-parse.cc        |   106 +
 Src/Scarab/library/CMakeLists.txt             |    72 +
 Src/Scarab/library/README.md                  |    45 +
 .../library/authentication/CMakeLists.txt     |    13 +
 .../library/authentication/authentication.cc  |    94 +
 .../library/authentication/authentication.hh  |    35 +
 Src/Scarab/library/cli/CMakeLists.txt         |    15 +
 Src/Scarab/library/cli/application.cc         |   261 +
 Src/Scarab/library/cli/application.hh         |   396 +
 Src/Scarab/library/cli/nonoption_parser.cc    |    67 +
 Src/Scarab/library/cli/nonoption_parser.hh    |    33 +
 Src/Scarab/library/external/CMakeLists.txt    |    15 +
 Src/Scarab/library/external/cli11/CLI11.hpp   |  6778 ++++++
 Src/Scarab/library/external/date/date.h       |  8010 +++++++
 Src/Scarab/library/logger/CMakeLists.txt      |    13 +
 Src/Scarab/library/logger/logger.cc           |   349 +
 Src/Scarab/library/logger/logger.hh           |   445 +
 Src/Scarab/library/param/CMakeLists.txt       |    25 +
 .../library/param/codec/json/CMakeLists.txt   |    13 +
 .../library/param/codec/json/param_json.cc    |   276 +
 .../library/param/codec/json/param_json.hh    |   202 +
 .../library/param/codec/yaml/CMakeLists.txt   |    13 +
 .../library/param/codec/yaml/param_yaml.cc    |   309 +
 .../library/param/codec/yaml/param_yaml.hh    |    79 +
 Src/Scarab/library/param/param.hh             |    18 +
 Src/Scarab/library/param/param_array.cc       |   172 +
 Src/Scarab/library/param/param_array.hh       |   347 +
 Src/Scarab/library/param/param_base.cc        |    65 +
 Src/Scarab/library/param/param_base.hh        |   107 +
 Src/Scarab/library/param/param_base_impl.hh   |   173 +
 Src/Scarab/library/param/param_codec.cc       |   133 +
 Src/Scarab/library/param/param_codec.hh       |    72 +
 Src/Scarab/library/param/param_helpers.cc     |   171 +
 Src/Scarab/library/param/param_helpers.hh     |    34 +
 Src/Scarab/library/param/param_node.cc        |   149 +
 Src/Scarab/library/param/param_node.hh        |   352 +
 Src/Scarab/library/param/param_value.cc       |   187 +
 Src/Scarab/library/param/param_value.hh       |   566 +
 Src/Scarab/library/utility/CMakeLists.txt     |    58 +
 .../library/utility/_member_variables.hh.in   |   337 +
 Src/Scarab/library/utility/base_exception.hh  |   207 +
 Src/Scarab/library/utility/cancelable.cc      |    83 +
 Src/Scarab/library/utility/cancelable.hh      |   142 +
 .../library/utility/concurrent_queue.hh       |   171 +
 Src/Scarab/library/utility/destroyer.hh       |    52 +
 Src/Scarab/library/utility/digital.cc         |    46 +
 Src/Scarab/library/utility/digital.hh         |   106 +
 Src/Scarab/library/utility/error.hh           |    20 +
 .../library/utility/exponential_backoff.hh    |    87 +
 Src/Scarab/library/utility/factory.hh         |    36 +
 Src/Scarab/library/utility/indexed_factory.hh |   402 +
 Src/Scarab/library/utility/macros.hh          |    35 +
 Src/Scarab/library/utility/map_at_default.hh  |    30 +
 .../library/utility/member_variables.hh       |    94 +
 Src/Scarab/library/utility/path.cc            |    50 +
 Src/Scarab/library/utility/path.hh            |    35 +
 Src/Scarab/library/utility/scarab_api.hh      |    29 +
 Src/Scarab/library/utility/signal_handler.cc  |   464 +
 Src/Scarab/library/utility/signal_handler.hh  |   200 +
 Src/Scarab/library/utility/singleton.hh       |   147 +
 .../library/utility/thread_singleton.hh       |   149 +
 Src/Scarab/library/utility/time.cc            |    27 +
 Src/Scarab/library/utility/time.hh            |    17 +
 Src/Scarab/library/utility/typename.cc        |    66 +
 Src/Scarab/library/utility/typename.hh        |    32 +
 Src/Scarab/library/utility/unique_typelist.hh |   175 +
 Src/Scarab/library/version/CMakeLists.txt     |    25 +
 .../library/version/scarab_version.cc.in      |    34 +
 Src/Scarab/library/version/scarab_version.hh  |    25 +
 Src/Scarab/library/version/version_ifc.cc     |    28 +
 Src/Scarab/library/version/version_ifc.hh     |    45 +
 .../library/version/version_semantic.cc       |   286 +
 .../library/version/version_semantic.hh       |    92 +
 Src/Scarab/library/version/version_wrapper.hh |    84 +
 Src/Scarab/python/CMakeLists.txt              |    56 +
 Src/Scarab/python/add_lib_python_path.sh.in   |     3 +
 Src/Scarab/python/application_pybind.hh       |   136 +
 Src/Scarab/python/cancelable_pybind.hh        |    29 +
 Src/Scarab/python/param_array_pybind.hh       |   108 +
 Src/Scarab/python/param_binding_helpers.hh    |   125 +
 Src/Scarab/python/param_node_pybind.hh        |    83 +
 Src/Scarab/python/param_pybind.hh             |    76 +
 Src/Scarab/python/param_value_pybind.hh       |    77 +
 Src/Scarab/python/scarab_binding_helpers.hh   |    15 +
 Src/Scarab/python/scarab_namespace_pybind.cc  |    46 +
 Src/Scarab/python/signal_handler_pybind.hh    |    28 +
 Src/Scarab/python/version_pybind.hh           |    57 +
 Src/Scarab/testing/CMakeLists.txt             |    93 +
 Src/Scarab/testing/Doxyfile                   |  1534 ++
 Src/Scarab/testing/README.md                  |    67 +
 .../testing/applications/CMakeLists.txt       |    36 +
 .../applications/test_app_with_callback.cc    |    85 +
 .../applications/test_app_with_options.cc     |    76 +
 .../applications/test_app_with_subcommands.cc |   102 +
 .../applications/test_basic_application.cc    |    56 +
 .../applications/test_raise_sigabrt.cc        |    49 +
 .../testing/applications/test_raise_sigint.cc |    36 +
 .../applications/test_raise_sigquit.cc        |    36 +
 .../applications/test_raise_sigterm.cc        |    49 +
 .../applications/test_unhandled_exception.cc  |    52 +
 Src/Scarab/testing/catch/catch.hpp            | 17758 ++++++++++++++++
 Src/Scarab/testing/glob_path/README.md        |     1 +
 .../glob_path/sub1/sub1sub1/glob_sub1sub1.txt |     0
 .../glob_path/sub1/sub1sub2/glob_sub1sub2.txt |     0
 .../glob_path/sub1/sub1sub3/glob_sub1sub3.txt |     0
 .../sub2sub1sub1/glob_sub2sub1sub1_1.txt      |     0
 .../sub2sub1sub1/glob_sub2sub1sub1_2.txt      |     0
 .../sub2sub1sub1/glob_sub2sub1sub1_3.txt      |     0
 .../sub2sub1sub2/glob_sub2sub1sub2.txt        |     0
 .../sub2sub1sub3/glob_sub2sub1sub3.txt        |     0
 .../NestedPBTest/CMakeLists.txt               |   112 +
 .../NestedPBTest/NestedPBTestConfig.cmake.in  |    17 +
 .../package_builder/NestedPBTest/README.md    |    29 +
 .../NestedPBTest/create_nesting.sh.in         |    10 +
 .../executable/nested_do_print.cc             |    14 +
 .../NestedPBTest/library/nested_print.cc      |    18 +
 .../NestedPBTest/library/nested_print.hh      |    17 +
 .../package_builder/PBTest/CMakeLists.txt     |   111 +
 .../PBTest/PBTestConfig.cmake.in              |    16 +
 .../testing/package_builder/PBTest/README.md  |    29 +
 .../package_builder/PBTest/copy_scarab.sh.in  |     4 +
 .../PBTest/executable/do_print.cc             |    12 +
 .../package_builder/PBTest/library/print.cc   |    18 +
 .../package_builder/PBTest/library/print.hh   |    17 +
 Src/Scarab/testing/stream_check.cc            |    26 +
 Src/Scarab/testing/stream_check.hh            |    24 +
 Src/Scarab/testing/test_digital.cc            |   123 +
 .../testing/test_exponential_backoff.cc       |    90 +
 Src/Scarab/testing/test_json.cc               |    74 +
 Src/Scarab/testing/test_logger.cc             |    84 +
 Src/Scarab/testing/test_member_variables.cc   |    94 +
 Src/Scarab/testing/test_member_variables.hh   |   164 +
 Src/Scarab/testing/test_nonoption_parser.cc   |   106 +
 Src/Scarab/testing/test_param_array.cc        |   137 +
 Src/Scarab/testing/test_param_by_pointer.cc   |    45 +
 Src/Scarab/testing/test_param_node.cc         |    86 +
 Src/Scarab/testing/test_param_translator.cc   |    92 +
 Src/Scarab/testing/test_param_value.cc        |   183 +
 Src/Scarab/testing/test_path.cc.in            |    42 +
 Src/Scarab/testing/test_signal_handler.cc     |   147 +
 Src/Scarab/testing/test_time.cc               |    18 +
 Src/Scarab/testing/test_verbosity.cc          |    78 +
 Src/Scarab/testing/test_yaml.cc               |    74 +
 Src/Scarab/testing/use_catch.cc               |    10 +
 cmake/Nymph.cmake                             |     2 +-
 pyproject.toml                                |     3 +-
 setup.cfg                                     |    11 +-
 setup.py                                      |    52 +-
 573 files changed, 98983 insertions(+), 88 deletions(-)
 delete mode 160000 External/cereal
 create mode 100644 MANIFEST.in
 delete mode 100644 Python/CMakeLists.txt
 delete mode 160000 Scarab
 rename {Cpp => Src/Cpp}/Executables_v1/Main/CMakeLists.txt (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Main/ConfigCheck.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Main/Nymph.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/CMakeLists.txt (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/ConfigFiles/TestConfigurator.json (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTJSONReader.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTJSONReader.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTJSONTypeWriterValidation.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTJSONTypeWriterValidation.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTPyTestClass.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTPyTestClass.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTPyTestClassPybind.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestConfigurable.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestConfigurable.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestCuts.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestCuts.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestData.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestData.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/KTTestProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/NymphValidationPybind.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestApplication.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestApplyCut.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestCacheDirectory.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestCut.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestCutFilter.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestData.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestExceptionInSlot.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestExt.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestExtSerialization.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestJSONWriter.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestJSONWriterViaSlot.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestLogger.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestParamBindings.py (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPolymorphicSlotData.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPrimaryProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPrintData.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestProcessorToolbox.py (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestProcessorToolbox2Threads.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPyTestClass.py (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPythonBasics.hh (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestPythonBasics.py (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestSerialization.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestSignalsAndSlots.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestSlotData.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestThroughputProfiler.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestUseBreakpoint.cc (100%)
 rename {Cpp => Src/Cpp}/Executables_v1/Validation/TestWrapProcessor.py (100%)
 rename {Cpp => Src/Cpp}/Library/CMakeLists.txt (97%)
 rename {Cpp => Src/Cpp}/Library/Control/ControlAccess.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Control/ControlAccess.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Control/Controller.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Control/Controller.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Control/ControllerInterface.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Control/ControllerInterface.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Control/ReturnBuffer.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Control/ReturnBuffer.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Control/SingleRunController.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Control/SingleRunController.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Data/Data.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Data/Data.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Data/DataFrame.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Data/DataFrame.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Data/DataManager.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Data/DataManager.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/PrimaryProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/PrimaryProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/Processor.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/Processor.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/ProcessorToolbox.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/ProcessorToolbox.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/QuitChain.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/Signal.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/SignalSlotBase.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/SignalSlotBase.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Processor/Slot.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Utility/Exception.cc (100%)
 rename {Cpp => Src/Cpp}/Library/Utility/Exception.hh (100%)
 rename {Cpp => Src/Cpp}/Library/Utility/MemberVariable.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/AddLibPythonPath.sh.in (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTApplication.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTApplication.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTCommandLineHandler.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTCommandLineHandler.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTCommandLineOption.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTConfigurator.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTConfigurator.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTDataQueueProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTDataQueueProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTFilenameParsers.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTFilenameParsers.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTPrintDataStructure.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTPrintDataStructure.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTProcessorToolbox.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTProcessorToolbox.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTProcessorToolboxPybind.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTRunNymph.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTRunNymph.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTThroughputProfiler.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Application/KTThroughputProfiler.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/CMakeLists.txt (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTApplyCut.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTApplyCut.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCoreData.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCoreData.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCut.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCut.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCutFilter.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCutFilter.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCutResult.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCutStatus.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTCutStatus.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTData.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTData.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTRegisterNymphExtData.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTTester.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Data/KTTester.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/IO/KTJSONWriter.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/IO/KTJSONWriter.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/IO/KTReader.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/IO/KTReader.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/IO/KTWriter.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/IO/KTWriter.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/NymphPybind.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTConnection.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTNymphSignals.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTNymphSlot.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTPrimaryProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTPrimaryProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTProcessor.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTProcessorPybind.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTProcessorPybind.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTPyProcessor.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSignal.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSignalSlotBase.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSignalWrapper.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSignalWrapper.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSlot.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSlotWrapper.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTSlotWrapper.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTThreadReference.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Processor/KTThreadReference.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTCacheDirectory.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTCacheDirectory.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTConcurrentQueue.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTConfigurable.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTConfigurable.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTConfigurablePybind.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTDirectory.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTDirectory.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTEventLoop.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTEventLoop.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTException.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTException.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTExtensible.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTExtensibleStruct.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTExtensibleStructFactory.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTLogger.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTMemberVariable.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTParamPybind.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTPythonMacros.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTTIFactory.hh (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTTime.cc (100%)
 rename {Cpp => Src/Cpp}/Library_v1/Utility/KTTime.hh (100%)
 rename {Cpp => Src/Cpp}/Templates/KTProcessorTemplate.cc (100%)
 rename {Cpp => Src/Cpp}/Templates/KTProcessorTemplate.hh (100%)
 rename {Cpp => Src/Cpp}/Templates/MainCMakeLists.txt (100%)
 create mode 100644 Src/External/cereal/.gitignore
 create mode 100644 Src/External/cereal/.travis.yml
 create mode 100644 Src/External/cereal/CMakeLists.txt
 create mode 100644 Src/External/cereal/LICENSE
 create mode 100644 Src/External/cereal/README.md
 create mode 100644 Src/External/cereal/appveyor.yml
 create mode 100644 Src/External/cereal/doc/CMakeLists.txt
 create mode 100644 Src/External/cereal/doc/DoxygenLayout.xml
 create mode 100644 Src/External/cereal/doc/doxygen.in
 create mode 100644 Src/External/cereal/doc/footer.html
 create mode 100644 Src/External/cereal/doc/mainpage.dox
 create mode 100644 Src/External/cereal/include/cereal/access.hpp
 create mode 100644 Src/External/cereal/include/cereal/archives/adapters.hpp
 create mode 100644 Src/External/cereal/include/cereal/archives/binary.hpp
 create mode 100644 Src/External/cereal/include/cereal/archives/json.hpp
 create mode 100644 Src/External/cereal/include/cereal/archives/portable_binary.hpp
 create mode 100644 Src/External/cereal/include/cereal/archives/xml.hpp
 create mode 100644 Src/External/cereal/include/cereal/cereal.hpp
 create mode 100644 Src/External/cereal/include/cereal/details/helpers.hpp
 create mode 100644 Src/External/cereal/include/cereal/details/polymorphic_impl.hpp
 create mode 100644 Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
 create mode 100644 Src/External/cereal/include/cereal/details/static_object.hpp
 create mode 100644 Src/External/cereal/include/cereal/details/traits.hpp
 create mode 100644 Src/External/cereal/include/cereal/details/util.hpp
 create mode 100644 Src/External/cereal/include/cereal/external/base64.hpp
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/allocators.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/document.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/encodings.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/error/en.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/error/error.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/fwd.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/memorystream.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/pointer.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/reader.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/schema.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/stream.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidjson/writer.h
 create mode 100644 Src/External/cereal/include/cereal/external/rapidxml/license.txt
 create mode 100644 Src/External/cereal/include/cereal/external/rapidxml/manual.html
 create mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp
 create mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
 create mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
 create mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
 create mode 100644 Src/External/cereal/include/cereal/macros.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/array.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/base_class.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/bitset.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/boost_variant.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/chrono.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/common.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/complex.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/deque.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/forward_list.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/functional.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/list.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/map.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/memory.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/polymorphic.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/queue.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/set.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/stack.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/string.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/tuple.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/unordered_map.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/unordered_set.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/utility.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/valarray.hpp
 create mode 100644 Src/External/cereal/include/cereal/types/vector.hpp
 create mode 100644 Src/External/cereal/sandbox/CMakeLists.txt
 create mode 100644 Src/External/cereal/sandbox/performance.cpp
 create mode 100644 Src/External/cereal/sandbox/sandbox.cpp
 create mode 100644 Src/External/cereal/sandbox/sandbox_json.cpp
 create mode 100644 Src/External/cereal/sandbox/sandbox_rtti.cpp
 create mode 100644 Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt
 create mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp
 create mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp
 create mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp
 create mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp
 create mode 100644 Src/External/cereal/sandbox/sandbox_vs.cpp
 create mode 100755 Src/External/cereal/scripts/add_rapidjson_prefix.sh
 create mode 100644 Src/External/cereal/scripts/appveyor.bat
 create mode 100755 Src/External/cereal/scripts/renameincludes.sh
 create mode 100755 Src/External/cereal/scripts/updatecoverage.sh
 create mode 100755 Src/External/cereal/scripts/updatedoc.in
 create mode 100644 Src/External/cereal/unittests/CMakeLists.txt
 create mode 100644 Src/External/cereal/unittests/array.cpp
 create mode 100644 Src/External/cereal/unittests/array.hpp
 create mode 100644 Src/External/cereal/unittests/basic_string.cpp
 create mode 100644 Src/External/cereal/unittests/basic_string.hpp
 create mode 100644 Src/External/cereal/unittests/bitset.cpp
 create mode 100644 Src/External/cereal/unittests/bitset.hpp
 create mode 100644 Src/External/cereal/unittests/boost_variant.cpp
 create mode 100644 Src/External/cereal/unittests/boost_variant.hpp
 create mode 100644 Src/External/cereal/unittests/chrono.cpp
 create mode 100644 Src/External/cereal/unittests/chrono.hpp
 create mode 100644 Src/External/cereal/unittests/cmake-config-module.cmake
 create mode 100644 Src/External/cereal/unittests/common.hpp
 create mode 100644 Src/External/cereal/unittests/complex.cpp
 create mode 100644 Src/External/cereal/unittests/complex.hpp
 create mode 100644 Src/External/cereal/unittests/deque.cpp
 create mode 100644 Src/External/cereal/unittests/deque.hpp
 create mode 100644 Src/External/cereal/unittests/doctest.h
 create mode 100644 Src/External/cereal/unittests/forward_list.cpp
 create mode 100644 Src/External/cereal/unittests/forward_list.hpp
 create mode 100644 Src/External/cereal/unittests/list.cpp
 create mode 100644 Src/External/cereal/unittests/list.hpp
 create mode 100644 Src/External/cereal/unittests/load_construct.cpp
 create mode 100644 Src/External/cereal/unittests/load_construct.hpp
 create mode 100644 Src/External/cereal/unittests/map.cpp
 create mode 100644 Src/External/cereal/unittests/map.hpp
 create mode 100644 Src/External/cereal/unittests/memory.cpp
 create mode 100644 Src/External/cereal/unittests/memory.hpp
 create mode 100644 Src/External/cereal/unittests/memory_cycles.cpp
 create mode 100644 Src/External/cereal/unittests/memory_cycles.hpp
 create mode 100644 Src/External/cereal/unittests/multimap.cpp
 create mode 100644 Src/External/cereal/unittests/multimap.hpp
 create mode 100644 Src/External/cereal/unittests/multiset.cpp
 create mode 100644 Src/External/cereal/unittests/multiset.hpp
 create mode 100644 Src/External/cereal/unittests/pair.cpp
 create mode 100644 Src/External/cereal/unittests/pair.hpp
 create mode 100644 Src/External/cereal/unittests/pod.cpp
 create mode 100644 Src/External/cereal/unittests/pod.hpp
 create mode 100644 Src/External/cereal/unittests/polymorphic.cpp
 create mode 100644 Src/External/cereal/unittests/polymorphic.hpp
 create mode 100644 Src/External/cereal/unittests/portability_test.cpp
 create mode 100644 Src/External/cereal/unittests/portable_binary_archive.cpp
 create mode 100644 Src/External/cereal/unittests/portable_binary_archive.hpp
 create mode 100644 Src/External/cereal/unittests/priority_queue.cpp
 create mode 100644 Src/External/cereal/unittests/priority_queue.hpp
 create mode 100644 Src/External/cereal/unittests/queue.cpp
 create mode 100644 Src/External/cereal/unittests/queue.hpp
 create mode 100644 Src/External/cereal/unittests/run_portability_test.cmake
 create mode 100755 Src/External/cereal/unittests/run_valgrind.sh
 create mode 100644 Src/External/cereal/unittests/set.cpp
 create mode 100644 Src/External/cereal/unittests/set.hpp
 create mode 100644 Src/External/cereal/unittests/stack.cpp
 create mode 100644 Src/External/cereal/unittests/stack.hpp
 create mode 100644 Src/External/cereal/unittests/structs.cpp
 create mode 100644 Src/External/cereal/unittests/structs.hpp
 create mode 100644 Src/External/cereal/unittests/structs_minimal.cpp
 create mode 100644 Src/External/cereal/unittests/structs_minimal.hpp
 create mode 100644 Src/External/cereal/unittests/structs_specialized.cpp
 create mode 100644 Src/External/cereal/unittests/structs_specialized.hpp
 create mode 100644 Src/External/cereal/unittests/tuple.cpp
 create mode 100644 Src/External/cereal/unittests/tuple.hpp
 create mode 100644 Src/External/cereal/unittests/unordered_loads.cpp
 create mode 100644 Src/External/cereal/unittests/unordered_loads.hpp
 create mode 100644 Src/External/cereal/unittests/unordered_map.cpp
 create mode 100644 Src/External/cereal/unittests/unordered_map.hpp
 create mode 100644 Src/External/cereal/unittests/unordered_multimap.cpp
 create mode 100644 Src/External/cereal/unittests/unordered_multimap.hpp
 create mode 100644 Src/External/cereal/unittests/unordered_multiset.cpp
 create mode 100644 Src/External/cereal/unittests/unordered_multiset.hpp
 create mode 100644 Src/External/cereal/unittests/unordered_set.cpp
 create mode 100644 Src/External/cereal/unittests/unordered_set.hpp
 create mode 100644 Src/External/cereal/unittests/user_data_adapters.cpp
 create mode 100644 Src/External/cereal/unittests/user_data_adapters.hpp
 create mode 100644 Src/External/cereal/unittests/valarray.cpp
 create mode 100644 Src/External/cereal/unittests/valarray.hpp
 create mode 100644 Src/External/cereal/unittests/vector.cpp
 create mode 100644 Src/External/cereal/unittests/vector.hpp
 create mode 100644 Src/External/cereal/unittests/versioning.cpp
 create mode 100644 Src/External/cereal/unittests/versioning.hpp
 create mode 100644 Src/External/cereal/vs2013/.gitignore
 create mode 100644 Src/External/cereal/vs2013/sandbox/sandbox.vcxproj
 create mode 100644 Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters
 create mode 100644 Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj
 create mode 100644 Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters
 create mode 100644 Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj
 create mode 100644 Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters
 create mode 100644 Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj
 create mode 100644 Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters
 create mode 100755 Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj
 create mode 100755 Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters
 create mode 100755 Src/External/cereal/vs2013/unittests/main.cpp
 create mode 100644 Src/External/cereal/vs2013/unittests/unittests.vcxproj
 create mode 100644 Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters
 create mode 100644 Src/External/cereal/vs2013/vs2013.sln
 create mode 100644 Src/Python/CMakeLists.txt
 create mode 100644 Src/Python/README.md
 rename {Python => Src/Python}/nymph/__init__.py (100%)
 create mode 100644 Src/Scarab/.github/workflows/run_tests.yaml
 create mode 100644 Src/Scarab/.gitignore
 create mode 100644 Src/Scarab/.gitmodules
 create mode 100644 Src/Scarab/.travis.yml
 create mode 100644 Src/Scarab/AUTHORS
 create mode 100644 Src/Scarab/CMakeLists.txt
 create mode 100644 Src/Scarab/LICENSE
 create mode 100644 Src/Scarab/README.md
 create mode 100644 Src/Scarab/ScarabConfig.cmake.in
 create mode 100644 Src/Scarab/VERSION
 create mode 100644 Src/Scarab/cmake/FindEigen3.cmake
 create mode 100644 Src/Scarab/cmake/FindFFTW.cmake
 create mode 100644 Src/Scarab/cmake/FindSphinx.cmake
 create mode 100644 Src/Scarab/cmake/GetVersion.cmake
 create mode 100644 Src/Scarab/cmake/PackageBuilder.cmake
 create mode 100644 Src/Scarab/cmake/PackageBuilderMacros.cmake
 create mode 100644 Src/Scarab/documentation/README.md
 create mode 100644 Src/Scarab/documentation/application_building.rst
 create mode 100644 Src/Scarab/documentation/cpp/Doxyfile
 create mode 100644 Src/Scarab/documentation/cpp/README.md
 create mode 100644 Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst
 create mode 100644 Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst
 create mode 100644 Src/Scarab/documentation/cpp/conf.py
 create mode 100644 Src/Scarab/documentation/cpp/doxfiles/mainpage.dox
 create mode 100644 Src/Scarab/documentation/cpp/favicon.ico
 create mode 100644 Src/Scarab/documentation/cpp/index.rst
 create mode 100644 Src/Scarab/documentation/cpp/requirements.txt
 create mode 100644 Src/Scarab/documentation/cpp/scarab_logo_small.png
 create mode 100644 Src/Scarab/documentation/package_builder.rst
 create mode 100644 Src/Scarab/documentation/python/README.md
 create mode 100644 Src/Scarab/documentation/python/_templates/README.md
 create mode 100644 Src/Scarab/documentation/python/_templates/module.rst
 create mode 100644 Src/Scarab/documentation/python/_templates/package.rst
 create mode 100644 Src/Scarab/documentation/python/conf.py
 create mode 100644 Src/Scarab/documentation/python/index.rst
 create mode 100644 Src/Scarab/executables/CMakeLists.txt
 create mode 100644 Src/Scarab/executables/scarab-parse.cc
 create mode 100644 Src/Scarab/library/CMakeLists.txt
 create mode 100644 Src/Scarab/library/README.md
 create mode 100644 Src/Scarab/library/authentication/CMakeLists.txt
 create mode 100644 Src/Scarab/library/authentication/authentication.cc
 create mode 100644 Src/Scarab/library/authentication/authentication.hh
 create mode 100644 Src/Scarab/library/cli/CMakeLists.txt
 create mode 100644 Src/Scarab/library/cli/application.cc
 create mode 100644 Src/Scarab/library/cli/application.hh
 create mode 100644 Src/Scarab/library/cli/nonoption_parser.cc
 create mode 100644 Src/Scarab/library/cli/nonoption_parser.hh
 create mode 100644 Src/Scarab/library/external/CMakeLists.txt
 create mode 100644 Src/Scarab/library/external/cli11/CLI11.hpp
 create mode 100644 Src/Scarab/library/external/date/date.h
 create mode 100644 Src/Scarab/library/logger/CMakeLists.txt
 create mode 100644 Src/Scarab/library/logger/logger.cc
 create mode 100644 Src/Scarab/library/logger/logger.hh
 create mode 100644 Src/Scarab/library/param/CMakeLists.txt
 create mode 100644 Src/Scarab/library/param/codec/json/CMakeLists.txt
 create mode 100644 Src/Scarab/library/param/codec/json/param_json.cc
 create mode 100644 Src/Scarab/library/param/codec/json/param_json.hh
 create mode 100644 Src/Scarab/library/param/codec/yaml/CMakeLists.txt
 create mode 100644 Src/Scarab/library/param/codec/yaml/param_yaml.cc
 create mode 100644 Src/Scarab/library/param/codec/yaml/param_yaml.hh
 create mode 100644 Src/Scarab/library/param/param.hh
 create mode 100644 Src/Scarab/library/param/param_array.cc
 create mode 100644 Src/Scarab/library/param/param_array.hh
 create mode 100644 Src/Scarab/library/param/param_base.cc
 create mode 100644 Src/Scarab/library/param/param_base.hh
 create mode 100644 Src/Scarab/library/param/param_base_impl.hh
 create mode 100644 Src/Scarab/library/param/param_codec.cc
 create mode 100644 Src/Scarab/library/param/param_codec.hh
 create mode 100644 Src/Scarab/library/param/param_helpers.cc
 create mode 100644 Src/Scarab/library/param/param_helpers.hh
 create mode 100644 Src/Scarab/library/param/param_node.cc
 create mode 100644 Src/Scarab/library/param/param_node.hh
 create mode 100644 Src/Scarab/library/param/param_value.cc
 create mode 100644 Src/Scarab/library/param/param_value.hh
 create mode 100644 Src/Scarab/library/utility/CMakeLists.txt
 create mode 100644 Src/Scarab/library/utility/_member_variables.hh.in
 create mode 100644 Src/Scarab/library/utility/base_exception.hh
 create mode 100644 Src/Scarab/library/utility/cancelable.cc
 create mode 100644 Src/Scarab/library/utility/cancelable.hh
 create mode 100644 Src/Scarab/library/utility/concurrent_queue.hh
 create mode 100644 Src/Scarab/library/utility/destroyer.hh
 create mode 100644 Src/Scarab/library/utility/digital.cc
 create mode 100644 Src/Scarab/library/utility/digital.hh
 create mode 100644 Src/Scarab/library/utility/error.hh
 create mode 100644 Src/Scarab/library/utility/exponential_backoff.hh
 create mode 100644 Src/Scarab/library/utility/factory.hh
 create mode 100644 Src/Scarab/library/utility/indexed_factory.hh
 create mode 100644 Src/Scarab/library/utility/macros.hh
 create mode 100644 Src/Scarab/library/utility/map_at_default.hh
 create mode 100644 Src/Scarab/library/utility/member_variables.hh
 create mode 100644 Src/Scarab/library/utility/path.cc
 create mode 100644 Src/Scarab/library/utility/path.hh
 create mode 100644 Src/Scarab/library/utility/scarab_api.hh
 create mode 100644 Src/Scarab/library/utility/signal_handler.cc
 create mode 100644 Src/Scarab/library/utility/signal_handler.hh
 create mode 100644 Src/Scarab/library/utility/singleton.hh
 create mode 100644 Src/Scarab/library/utility/thread_singleton.hh
 create mode 100644 Src/Scarab/library/utility/time.cc
 create mode 100644 Src/Scarab/library/utility/time.hh
 create mode 100644 Src/Scarab/library/utility/typename.cc
 create mode 100644 Src/Scarab/library/utility/typename.hh
 create mode 100644 Src/Scarab/library/utility/unique_typelist.hh
 create mode 100644 Src/Scarab/library/version/CMakeLists.txt
 create mode 100644 Src/Scarab/library/version/scarab_version.cc.in
 create mode 100644 Src/Scarab/library/version/scarab_version.hh
 create mode 100644 Src/Scarab/library/version/version_ifc.cc
 create mode 100644 Src/Scarab/library/version/version_ifc.hh
 create mode 100644 Src/Scarab/library/version/version_semantic.cc
 create mode 100644 Src/Scarab/library/version/version_semantic.hh
 create mode 100644 Src/Scarab/library/version/version_wrapper.hh
 create mode 100644 Src/Scarab/python/CMakeLists.txt
 create mode 100644 Src/Scarab/python/add_lib_python_path.sh.in
 create mode 100644 Src/Scarab/python/application_pybind.hh
 create mode 100644 Src/Scarab/python/cancelable_pybind.hh
 create mode 100644 Src/Scarab/python/param_array_pybind.hh
 create mode 100644 Src/Scarab/python/param_binding_helpers.hh
 create mode 100644 Src/Scarab/python/param_node_pybind.hh
 create mode 100644 Src/Scarab/python/param_pybind.hh
 create mode 100644 Src/Scarab/python/param_value_pybind.hh
 create mode 100644 Src/Scarab/python/scarab_binding_helpers.hh
 create mode 100644 Src/Scarab/python/scarab_namespace_pybind.cc
 create mode 100644 Src/Scarab/python/signal_handler_pybind.hh
 create mode 100644 Src/Scarab/python/version_pybind.hh
 create mode 100644 Src/Scarab/testing/CMakeLists.txt
 create mode 100644 Src/Scarab/testing/Doxyfile
 create mode 100644 Src/Scarab/testing/README.md
 create mode 100644 Src/Scarab/testing/applications/CMakeLists.txt
 create mode 100644 Src/Scarab/testing/applications/test_app_with_callback.cc
 create mode 100644 Src/Scarab/testing/applications/test_app_with_options.cc
 create mode 100644 Src/Scarab/testing/applications/test_app_with_subcommands.cc
 create mode 100644 Src/Scarab/testing/applications/test_basic_application.cc
 create mode 100644 Src/Scarab/testing/applications/test_raise_sigabrt.cc
 create mode 100644 Src/Scarab/testing/applications/test_raise_sigint.cc
 create mode 100644 Src/Scarab/testing/applications/test_raise_sigquit.cc
 create mode 100644 Src/Scarab/testing/applications/test_raise_sigterm.cc
 create mode 100644 Src/Scarab/testing/applications/test_unhandled_exception.cc
 create mode 100644 Src/Scarab/testing/catch/catch.hpp
 create mode 100644 Src/Scarab/testing/glob_path/README.md
 create mode 100644 Src/Scarab/testing/glob_path/sub1/sub1sub1/glob_sub1sub1.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub1/sub1sub2/glob_sub1sub2.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub1/sub1sub3/glob_sub1sub3.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_3.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt
 create mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub3/glob_sub2sub1sub3.txt
 create mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt
 create mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in
 create mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/README.md
 create mode 100755 Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in
 create mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc
 create mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc
 create mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh
 create mode 100644 Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt
 create mode 100644 Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in
 create mode 100644 Src/Scarab/testing/package_builder/PBTest/README.md
 create mode 100755 Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in
 create mode 100644 Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc
 create mode 100644 Src/Scarab/testing/package_builder/PBTest/library/print.cc
 create mode 100644 Src/Scarab/testing/package_builder/PBTest/library/print.hh
 create mode 100644 Src/Scarab/testing/stream_check.cc
 create mode 100644 Src/Scarab/testing/stream_check.hh
 create mode 100644 Src/Scarab/testing/test_digital.cc
 create mode 100644 Src/Scarab/testing/test_exponential_backoff.cc
 create mode 100644 Src/Scarab/testing/test_json.cc
 create mode 100644 Src/Scarab/testing/test_logger.cc
 create mode 100644 Src/Scarab/testing/test_member_variables.cc
 create mode 100644 Src/Scarab/testing/test_member_variables.hh
 create mode 100644 Src/Scarab/testing/test_nonoption_parser.cc
 create mode 100644 Src/Scarab/testing/test_param_array.cc
 create mode 100644 Src/Scarab/testing/test_param_by_pointer.cc
 create mode 100644 Src/Scarab/testing/test_param_node.cc
 create mode 100644 Src/Scarab/testing/test_param_translator.cc
 create mode 100644 Src/Scarab/testing/test_param_value.cc
 create mode 100644 Src/Scarab/testing/test_path.cc.in
 create mode 100644 Src/Scarab/testing/test_signal_handler.cc
 create mode 100644 Src/Scarab/testing/test_time.cc
 create mode 100644 Src/Scarab/testing/test_verbosity.cc
 create mode 100644 Src/Scarab/testing/test_yaml.cc
 create mode 100644 Src/Scarab/testing/use_catch.cc

diff --git a/.gitmodules b/.gitmodules
index 4a11728..e8c94fd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "Scarab"]
-	path = Scarab
+[submodule "Src/Scarab"]
+	path = Src/Scarab
 	url = https://github.com/project8/scarab
-[submodule "External/cereal"]
-	path = External/cereal
+[submodule "Src/External/cereal"]
+	path = Src/External/cereal
 	url = https://github.com/USCiLab/cereal.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e376976..6bcf820 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ cmake_minimum_required (VERSION 3.12)
 cmake_policy( SET CMP0048 NEW ) # version in project()
 project( Nymph VERSION 1.5.2 )
 
-list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )
+list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Src/Scarab/cmake )
 include( PackageBuilder )
 
 # Nymph CMake files
@@ -90,8 +90,8 @@ endif( Nymph_ENABLE_PYTHON )
 ########
 
 set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
-add_subdirectory( External/cereal )
-include_directories( External/cereal/include )
+add_subdirectory( Src/External/cereal )
+include_directories( Src/External/cereal/include )
 
 
 #####################
@@ -109,13 +109,13 @@ pbuilder_prepare_project()
 # Scarab
 ########
 
-pbuilder_add_submodule( Scarab Scarab )
+pbuilder_add_submodule( Scarab Src/Scarab )
 
 # all parts of midge use Scarab, so include it here
-pbuilder_use_sm_library( Scarab Scarab )
+pbuilder_use_sm_library( Scarab Src/Scarab )
 
 # this is needed for anything that wants to read or write JSON files
-get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
+get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Src/Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
 set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 
@@ -123,10 +123,10 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 # Build Nymph #
 ###############
 
-add_subdirectory( Cpp/Library )
+add_subdirectory( Src/Cpp/Library )
 
 #if (Nymph_ENABLE_EXECUTABLES)
-#    add_subdirectory( Cpp/Executables_v1 )
+#    add_subdirectory( Src/Cpp/Executables_v1 )
 #endif (Nymph_ENABLE_EXECUTABLES )
 
 
diff --git a/External/cereal b/External/cereal
deleted file mode 160000
index 51cbda5..0000000
--- a/External/cereal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..0d287ce
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,11 @@
+graft Src/Scarab
+graft Src/External
+graft Src/Cpp
+graft Testing
+graft cmake
+include CMakeLists.txt
+include NymphConfig.cmake.in
+
+
+
+
diff --git a/NymphConfig.cmake.in b/NymphConfig.cmake.in
index 9791851..52fc373 100644
--- a/NymphConfig.cmake.in
+++ b/NymphConfig.cmake.in
@@ -4,7 +4,7 @@ get_filename_component( Nymph_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
 
 # Find the dependencies
 include( CMakeFindDependencyMacro )
-find_dependency( Scarab REQUIRED PATHS ${Nymph_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
+find_dependency( Scarab REQUIRED PATHS ${Nymph_CMAKE_DIR}/Src/Scarab @Scarab_BINARY_LOCATION@ )
 
 # Import library targets if they're not already present
 if( NOT TARGET Nymph::@Nymph_FULL_TARGET_NAME@ )
diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt
deleted file mode 100644
index 49b68c6..0000000
--- a/Python/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# CMakeLists.txt file for Nymph/Python
-# Author: A. Ziegler
-# Created on: Feb 4, 2022
-
-if( Nymph_ENABLE_PYTHON)
-    message( "Building Python bindings")
-
-    set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-    # Python binding headers
-    set( PYBINDING_HEADERFILES
-
-    )
-
-    # Python bindings
-    set( PYBINDING_SOURCEFILES
-
-    )
-
-    set( PROJECT_LIBRARIES Scarab )
-
-    pbuilder_add_pybind11_module( scarab ${PROJECT_LIBRARIES} )
-
-    pbuilder_install_headers( ${PYBINDING_HEADERFILES} )z
-
-    message( "Done with Python bindings" )
-endif (Nymph_ENABLE_PYTHON)
\ No newline at end of file
diff --git a/Scarab b/Scarab
deleted file mode 160000
index 89d2073..0000000
--- a/Scarab
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 89d20734cee198b6e7d4258db030b4250e7a85d7
diff --git a/Cpp/Executables_v1/Main/CMakeLists.txt b/Src/Cpp/Executables_v1/Main/CMakeLists.txt
similarity index 100%
rename from Cpp/Executables_v1/Main/CMakeLists.txt
rename to Src/Cpp/Executables_v1/Main/CMakeLists.txt
diff --git a/Cpp/Executables_v1/Main/ConfigCheck.cc b/Src/Cpp/Executables_v1/Main/ConfigCheck.cc
similarity index 100%
rename from Cpp/Executables_v1/Main/ConfigCheck.cc
rename to Src/Cpp/Executables_v1/Main/ConfigCheck.cc
diff --git a/Cpp/Executables_v1/Main/Nymph.cc b/Src/Cpp/Executables_v1/Main/Nymph.cc
similarity index 100%
rename from Cpp/Executables_v1/Main/Nymph.cc
rename to Src/Cpp/Executables_v1/Main/Nymph.cc
diff --git a/Cpp/Executables_v1/Validation/CMakeLists.txt b/Src/Cpp/Executables_v1/Validation/CMakeLists.txt
similarity index 100%
rename from Cpp/Executables_v1/Validation/CMakeLists.txt
rename to Src/Cpp/Executables_v1/Validation/CMakeLists.txt
diff --git a/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json b/Src/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
rename to Src/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
diff --git a/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json b/Src/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to Src/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Cpp/Executables_v1/Validation/KTJSONReader.cc b/Src/Cpp/Executables_v1/Validation/KTJSONReader.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTJSONReader.cc
rename to Src/Cpp/Executables_v1/Validation/KTJSONReader.cc
diff --git a/Cpp/Executables_v1/Validation/KTJSONReader.hh b/Src/Cpp/Executables_v1/Validation/KTJSONReader.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTJSONReader.hh
rename to Src/Cpp/Executables_v1/Validation/KTJSONReader.hh
diff --git a/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc b/Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
rename to Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
diff --git a/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh b/Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
rename to Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
diff --git a/Cpp/Executables_v1/Validation/KTPyTestClass.cc b/Src/Cpp/Executables_v1/Validation/KTPyTestClass.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTPyTestClass.cc
rename to Src/Cpp/Executables_v1/Validation/KTPyTestClass.cc
diff --git a/Cpp/Executables_v1/Validation/KTPyTestClass.hh b/Src/Cpp/Executables_v1/Validation/KTPyTestClass.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTPyTestClass.hh
rename to Src/Cpp/Executables_v1/Validation/KTPyTestClass.hh
diff --git a/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh b/Src/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
rename to Src/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
diff --git a/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh b/Src/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
rename to Src/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
diff --git a/Cpp/Executables_v1/Validation/KTTestConfigurable.cc b/Src/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestConfigurable.cc
rename to Src/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
diff --git a/Cpp/Executables_v1/Validation/KTTestConfigurable.hh b/Src/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestConfigurable.hh
rename to Src/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
diff --git a/Cpp/Executables_v1/Validation/KTTestCuts.cc b/Src/Cpp/Executables_v1/Validation/KTTestCuts.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestCuts.cc
rename to Src/Cpp/Executables_v1/Validation/KTTestCuts.cc
diff --git a/Cpp/Executables_v1/Validation/KTTestCuts.hh b/Src/Cpp/Executables_v1/Validation/KTTestCuts.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestCuts.hh
rename to Src/Cpp/Executables_v1/Validation/KTTestCuts.hh
diff --git a/Cpp/Executables_v1/Validation/KTTestData.cc b/Src/Cpp/Executables_v1/Validation/KTTestData.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestData.cc
rename to Src/Cpp/Executables_v1/Validation/KTTestData.cc
diff --git a/Cpp/Executables_v1/Validation/KTTestData.hh b/Src/Cpp/Executables_v1/Validation/KTTestData.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestData.hh
rename to Src/Cpp/Executables_v1/Validation/KTTestData.hh
diff --git a/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc b/Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
rename to Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
diff --git a/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh b/Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
rename to Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
diff --git a/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc b/Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
rename to Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
diff --git a/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh b/Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
rename to Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
diff --git a/Cpp/Executables_v1/Validation/KTTestProcessor.cc b/Src/Cpp/Executables_v1/Validation/KTTestProcessor.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestProcessor.cc
rename to Src/Cpp/Executables_v1/Validation/KTTestProcessor.cc
diff --git a/Cpp/Executables_v1/Validation/KTTestProcessor.hh b/Src/Cpp/Executables_v1/Validation/KTTestProcessor.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/KTTestProcessor.hh
rename to Src/Cpp/Executables_v1/Validation/KTTestProcessor.hh
diff --git a/Cpp/Executables_v1/Validation/NymphValidationPybind.cc b/Src/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/NymphValidationPybind.cc
rename to Src/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
diff --git a/Cpp/Executables_v1/Validation/TestApplication.cc b/Src/Cpp/Executables_v1/Validation/TestApplication.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestApplication.cc
rename to Src/Cpp/Executables_v1/Validation/TestApplication.cc
diff --git a/Cpp/Executables_v1/Validation/TestApplyCut.cc b/Src/Cpp/Executables_v1/Validation/TestApplyCut.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestApplyCut.cc
rename to Src/Cpp/Executables_v1/Validation/TestApplyCut.cc
diff --git a/Cpp/Executables_v1/Validation/TestCacheDirectory.cc b/Src/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestCacheDirectory.cc
rename to Src/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
diff --git a/Cpp/Executables_v1/Validation/TestCut.cc b/Src/Cpp/Executables_v1/Validation/TestCut.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestCut.cc
rename to Src/Cpp/Executables_v1/Validation/TestCut.cc
diff --git a/Cpp/Executables_v1/Validation/TestCutFilter.cc b/Src/Cpp/Executables_v1/Validation/TestCutFilter.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestCutFilter.cc
rename to Src/Cpp/Executables_v1/Validation/TestCutFilter.cc
diff --git a/Cpp/Executables_v1/Validation/TestData.cc b/Src/Cpp/Executables_v1/Validation/TestData.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestData.cc
rename to Src/Cpp/Executables_v1/Validation/TestData.cc
diff --git a/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc b/Src/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
rename to Src/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
diff --git a/Cpp/Executables_v1/Validation/TestExt.cc b/Src/Cpp/Executables_v1/Validation/TestExt.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestExt.cc
rename to Src/Cpp/Executables_v1/Validation/TestExt.cc
diff --git a/Cpp/Executables_v1/Validation/TestExtSerialization.cc b/Src/Cpp/Executables_v1/Validation/TestExtSerialization.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestExtSerialization.cc
rename to Src/Cpp/Executables_v1/Validation/TestExtSerialization.cc
diff --git a/Cpp/Executables_v1/Validation/TestJSONWriter.cc b/Src/Cpp/Executables_v1/Validation/TestJSONWriter.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestJSONWriter.cc
rename to Src/Cpp/Executables_v1/Validation/TestJSONWriter.cc
diff --git a/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc b/Src/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
rename to Src/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
diff --git a/Cpp/Executables_v1/Validation/TestLogger.cc b/Src/Cpp/Executables_v1/Validation/TestLogger.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestLogger.cc
rename to Src/Cpp/Executables_v1/Validation/TestLogger.cc
diff --git a/Cpp/Executables_v1/Validation/TestParamBindings.py b/Src/Cpp/Executables_v1/Validation/TestParamBindings.py
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestParamBindings.py
rename to Src/Cpp/Executables_v1/Validation/TestParamBindings.py
diff --git a/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc b/Src/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
rename to Src/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
diff --git a/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc b/Src/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
rename to Src/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
diff --git a/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc b/Src/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
rename to Src/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
diff --git a/Cpp/Executables_v1/Validation/TestPrintData.cc b/Src/Cpp/Executables_v1/Validation/TestPrintData.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPrintData.cc
rename to Src/Cpp/Executables_v1/Validation/TestPrintData.cc
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolbox.py b/Src/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestProcessorToolbox.py
rename to Src/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc b/Src/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
rename to Src/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc b/Src/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
rename to Src/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
diff --git a/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc b/Src/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
rename to Src/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
diff --git a/Cpp/Executables_v1/Validation/TestPyTestClass.py b/Src/Cpp/Executables_v1/Validation/TestPyTestClass.py
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPyTestClass.py
rename to Src/Cpp/Executables_v1/Validation/TestPyTestClass.py
diff --git a/Cpp/Executables_v1/Validation/TestPythonBasics.hh b/Src/Cpp/Executables_v1/Validation/TestPythonBasics.hh
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPythonBasics.hh
rename to Src/Cpp/Executables_v1/Validation/TestPythonBasics.hh
diff --git a/Cpp/Executables_v1/Validation/TestPythonBasics.py b/Src/Cpp/Executables_v1/Validation/TestPythonBasics.py
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestPythonBasics.py
rename to Src/Cpp/Executables_v1/Validation/TestPythonBasics.py
diff --git a/Cpp/Executables_v1/Validation/TestSerialization.cc b/Src/Cpp/Executables_v1/Validation/TestSerialization.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestSerialization.cc
rename to Src/Cpp/Executables_v1/Validation/TestSerialization.cc
diff --git a/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc b/Src/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
rename to Src/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
diff --git a/Cpp/Executables_v1/Validation/TestSlotData.cc b/Src/Cpp/Executables_v1/Validation/TestSlotData.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestSlotData.cc
rename to Src/Cpp/Executables_v1/Validation/TestSlotData.cc
diff --git a/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc b/Src/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
rename to Src/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
diff --git a/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc b/Src/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
rename to Src/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
diff --git a/Cpp/Executables_v1/Validation/TestWrapProcessor.py b/Src/Cpp/Executables_v1/Validation/TestWrapProcessor.py
similarity index 100%
rename from Cpp/Executables_v1/Validation/TestWrapProcessor.py
rename to Src/Cpp/Executables_v1/Validation/TestWrapProcessor.py
diff --git a/Cpp/Library/CMakeLists.txt b/Src/Cpp/Library/CMakeLists.txt
similarity index 97%
rename from Cpp/Library/CMakeLists.txt
rename to Src/Cpp/Library/CMakeLists.txt
index 160284b..ab23244 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Src/Cpp/Library/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for Nymph/Cpp/Library
+# CMakeLists for Nymph/Src/Cpp/Library
 # Author: N.S. Oblath
 
 set( UTIL_DIR Utility )
diff --git a/Cpp/Library/Control/ControlAccess.cc b/Src/Cpp/Library/Control/ControlAccess.cc
similarity index 100%
rename from Cpp/Library/Control/ControlAccess.cc
rename to Src/Cpp/Library/Control/ControlAccess.cc
diff --git a/Cpp/Library/Control/ControlAccess.hh b/Src/Cpp/Library/Control/ControlAccess.hh
similarity index 100%
rename from Cpp/Library/Control/ControlAccess.hh
rename to Src/Cpp/Library/Control/ControlAccess.hh
diff --git a/Cpp/Library/Control/Controller.cc b/Src/Cpp/Library/Control/Controller.cc
similarity index 100%
rename from Cpp/Library/Control/Controller.cc
rename to Src/Cpp/Library/Control/Controller.cc
diff --git a/Cpp/Library/Control/Controller.hh b/Src/Cpp/Library/Control/Controller.hh
similarity index 100%
rename from Cpp/Library/Control/Controller.hh
rename to Src/Cpp/Library/Control/Controller.hh
diff --git a/Cpp/Library/Control/ControllerInterface.cc b/Src/Cpp/Library/Control/ControllerInterface.cc
similarity index 100%
rename from Cpp/Library/Control/ControllerInterface.cc
rename to Src/Cpp/Library/Control/ControllerInterface.cc
diff --git a/Cpp/Library/Control/ControllerInterface.hh b/Src/Cpp/Library/Control/ControllerInterface.hh
similarity index 100%
rename from Cpp/Library/Control/ControllerInterface.hh
rename to Src/Cpp/Library/Control/ControllerInterface.hh
diff --git a/Cpp/Library/Control/ReturnBuffer.cc b/Src/Cpp/Library/Control/ReturnBuffer.cc
similarity index 100%
rename from Cpp/Library/Control/ReturnBuffer.cc
rename to Src/Cpp/Library/Control/ReturnBuffer.cc
diff --git a/Cpp/Library/Control/ReturnBuffer.hh b/Src/Cpp/Library/Control/ReturnBuffer.hh
similarity index 100%
rename from Cpp/Library/Control/ReturnBuffer.hh
rename to Src/Cpp/Library/Control/ReturnBuffer.hh
diff --git a/Cpp/Library/Control/SingleRunController.cc b/Src/Cpp/Library/Control/SingleRunController.cc
similarity index 100%
rename from Cpp/Library/Control/SingleRunController.cc
rename to Src/Cpp/Library/Control/SingleRunController.cc
diff --git a/Cpp/Library/Control/SingleRunController.hh b/Src/Cpp/Library/Control/SingleRunController.hh
similarity index 100%
rename from Cpp/Library/Control/SingleRunController.hh
rename to Src/Cpp/Library/Control/SingleRunController.hh
diff --git a/Cpp/Library/Data/Data.cc b/Src/Cpp/Library/Data/Data.cc
similarity index 100%
rename from Cpp/Library/Data/Data.cc
rename to Src/Cpp/Library/Data/Data.cc
diff --git a/Cpp/Library/Data/Data.hh b/Src/Cpp/Library/Data/Data.hh
similarity index 100%
rename from Cpp/Library/Data/Data.hh
rename to Src/Cpp/Library/Data/Data.hh
diff --git a/Cpp/Library/Data/DataFrame.cc b/Src/Cpp/Library/Data/DataFrame.cc
similarity index 100%
rename from Cpp/Library/Data/DataFrame.cc
rename to Src/Cpp/Library/Data/DataFrame.cc
diff --git a/Cpp/Library/Data/DataFrame.hh b/Src/Cpp/Library/Data/DataFrame.hh
similarity index 100%
rename from Cpp/Library/Data/DataFrame.hh
rename to Src/Cpp/Library/Data/DataFrame.hh
diff --git a/Cpp/Library/Data/DataManager.cc b/Src/Cpp/Library/Data/DataManager.cc
similarity index 100%
rename from Cpp/Library/Data/DataManager.cc
rename to Src/Cpp/Library/Data/DataManager.cc
diff --git a/Cpp/Library/Data/DataManager.hh b/Src/Cpp/Library/Data/DataManager.hh
similarity index 100%
rename from Cpp/Library/Data/DataManager.hh
rename to Src/Cpp/Library/Data/DataManager.hh
diff --git a/Cpp/Library/Processor/PrimaryProcessor.cc b/Src/Cpp/Library/Processor/PrimaryProcessor.cc
similarity index 100%
rename from Cpp/Library/Processor/PrimaryProcessor.cc
rename to Src/Cpp/Library/Processor/PrimaryProcessor.cc
diff --git a/Cpp/Library/Processor/PrimaryProcessor.hh b/Src/Cpp/Library/Processor/PrimaryProcessor.hh
similarity index 100%
rename from Cpp/Library/Processor/PrimaryProcessor.hh
rename to Src/Cpp/Library/Processor/PrimaryProcessor.hh
diff --git a/Cpp/Library/Processor/Processor.cc b/Src/Cpp/Library/Processor/Processor.cc
similarity index 100%
rename from Cpp/Library/Processor/Processor.cc
rename to Src/Cpp/Library/Processor/Processor.cc
diff --git a/Cpp/Library/Processor/Processor.hh b/Src/Cpp/Library/Processor/Processor.hh
similarity index 100%
rename from Cpp/Library/Processor/Processor.hh
rename to Src/Cpp/Library/Processor/Processor.hh
diff --git a/Cpp/Library/Processor/ProcessorToolbox.cc b/Src/Cpp/Library/Processor/ProcessorToolbox.cc
similarity index 100%
rename from Cpp/Library/Processor/ProcessorToolbox.cc
rename to Src/Cpp/Library/Processor/ProcessorToolbox.cc
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Src/Cpp/Library/Processor/ProcessorToolbox.hh
similarity index 100%
rename from Cpp/Library/Processor/ProcessorToolbox.hh
rename to Src/Cpp/Library/Processor/ProcessorToolbox.hh
diff --git a/Cpp/Library/Processor/QuitChain.hh b/Src/Cpp/Library/Processor/QuitChain.hh
similarity index 100%
rename from Cpp/Library/Processor/QuitChain.hh
rename to Src/Cpp/Library/Processor/QuitChain.hh
diff --git a/Cpp/Library/Processor/Signal.hh b/Src/Cpp/Library/Processor/Signal.hh
similarity index 100%
rename from Cpp/Library/Processor/Signal.hh
rename to Src/Cpp/Library/Processor/Signal.hh
diff --git a/Cpp/Library/Processor/SignalSlotBase.cc b/Src/Cpp/Library/Processor/SignalSlotBase.cc
similarity index 100%
rename from Cpp/Library/Processor/SignalSlotBase.cc
rename to Src/Cpp/Library/Processor/SignalSlotBase.cc
diff --git a/Cpp/Library/Processor/SignalSlotBase.hh b/Src/Cpp/Library/Processor/SignalSlotBase.hh
similarity index 100%
rename from Cpp/Library/Processor/SignalSlotBase.hh
rename to Src/Cpp/Library/Processor/SignalSlotBase.hh
diff --git a/Cpp/Library/Processor/Slot.hh b/Src/Cpp/Library/Processor/Slot.hh
similarity index 100%
rename from Cpp/Library/Processor/Slot.hh
rename to Src/Cpp/Library/Processor/Slot.hh
diff --git a/Cpp/Library/Utility/Exception.cc b/Src/Cpp/Library/Utility/Exception.cc
similarity index 100%
rename from Cpp/Library/Utility/Exception.cc
rename to Src/Cpp/Library/Utility/Exception.cc
diff --git a/Cpp/Library/Utility/Exception.hh b/Src/Cpp/Library/Utility/Exception.hh
similarity index 100%
rename from Cpp/Library/Utility/Exception.hh
rename to Src/Cpp/Library/Utility/Exception.hh
diff --git a/Cpp/Library/Utility/MemberVariable.hh b/Src/Cpp/Library/Utility/MemberVariable.hh
similarity index 100%
rename from Cpp/Library/Utility/MemberVariable.hh
rename to Src/Cpp/Library/Utility/MemberVariable.hh
diff --git a/Cpp/Library_v1/AddLibPythonPath.sh.in b/Src/Cpp/Library_v1/AddLibPythonPath.sh.in
similarity index 100%
rename from Cpp/Library_v1/AddLibPythonPath.sh.in
rename to Src/Cpp/Library_v1/AddLibPythonPath.sh.in
diff --git a/Cpp/Library_v1/Application/KTApplication.cc b/Src/Cpp/Library_v1/Application/KTApplication.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTApplication.cc
rename to Src/Cpp/Library_v1/Application/KTApplication.cc
diff --git a/Cpp/Library_v1/Application/KTApplication.hh b/Src/Cpp/Library_v1/Application/KTApplication.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTApplication.hh
rename to Src/Cpp/Library_v1/Application/KTApplication.hh
diff --git a/Cpp/Library_v1/Application/KTCommandLineHandler.cc b/Src/Cpp/Library_v1/Application/KTCommandLineHandler.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTCommandLineHandler.cc
rename to Src/Cpp/Library_v1/Application/KTCommandLineHandler.cc
diff --git a/Cpp/Library_v1/Application/KTCommandLineHandler.hh b/Src/Cpp/Library_v1/Application/KTCommandLineHandler.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTCommandLineHandler.hh
rename to Src/Cpp/Library_v1/Application/KTCommandLineHandler.hh
diff --git a/Cpp/Library_v1/Application/KTCommandLineOption.hh b/Src/Cpp/Library_v1/Application/KTCommandLineOption.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTCommandLineOption.hh
rename to Src/Cpp/Library_v1/Application/KTCommandLineOption.hh
diff --git a/Cpp/Library_v1/Application/KTConfigurator.cc b/Src/Cpp/Library_v1/Application/KTConfigurator.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTConfigurator.cc
rename to Src/Cpp/Library_v1/Application/KTConfigurator.cc
diff --git a/Cpp/Library_v1/Application/KTConfigurator.hh b/Src/Cpp/Library_v1/Application/KTConfigurator.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTConfigurator.hh
rename to Src/Cpp/Library_v1/Application/KTConfigurator.hh
diff --git a/Cpp/Library_v1/Application/KTDataQueueProcessor.cc b/Src/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTDataQueueProcessor.cc
rename to Src/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
diff --git a/Cpp/Library_v1/Application/KTDataQueueProcessor.hh b/Src/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTDataQueueProcessor.hh
rename to Src/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
diff --git a/Cpp/Library_v1/Application/KTFilenameParsers.cc b/Src/Cpp/Library_v1/Application/KTFilenameParsers.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTFilenameParsers.cc
rename to Src/Cpp/Library_v1/Application/KTFilenameParsers.cc
diff --git a/Cpp/Library_v1/Application/KTFilenameParsers.hh b/Src/Cpp/Library_v1/Application/KTFilenameParsers.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTFilenameParsers.hh
rename to Src/Cpp/Library_v1/Application/KTFilenameParsers.hh
diff --git a/Cpp/Library_v1/Application/KTPrintDataStructure.cc b/Src/Cpp/Library_v1/Application/KTPrintDataStructure.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTPrintDataStructure.cc
rename to Src/Cpp/Library_v1/Application/KTPrintDataStructure.cc
diff --git a/Cpp/Library_v1/Application/KTPrintDataStructure.hh b/Src/Cpp/Library_v1/Application/KTPrintDataStructure.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTPrintDataStructure.hh
rename to Src/Cpp/Library_v1/Application/KTPrintDataStructure.hh
diff --git a/Cpp/Library_v1/Application/KTProcessorToolbox.cc b/Src/Cpp/Library_v1/Application/KTProcessorToolbox.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTProcessorToolbox.cc
rename to Src/Cpp/Library_v1/Application/KTProcessorToolbox.cc
diff --git a/Cpp/Library_v1/Application/KTProcessorToolbox.hh b/Src/Cpp/Library_v1/Application/KTProcessorToolbox.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTProcessorToolbox.hh
rename to Src/Cpp/Library_v1/Application/KTProcessorToolbox.hh
diff --git a/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh b/Src/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
rename to Src/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
diff --git a/Cpp/Library_v1/Application/KTRunNymph.cc b/Src/Cpp/Library_v1/Application/KTRunNymph.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTRunNymph.cc
rename to Src/Cpp/Library_v1/Application/KTRunNymph.cc
diff --git a/Cpp/Library_v1/Application/KTRunNymph.hh b/Src/Cpp/Library_v1/Application/KTRunNymph.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTRunNymph.hh
rename to Src/Cpp/Library_v1/Application/KTRunNymph.hh
diff --git a/Cpp/Library_v1/Application/KTThroughputProfiler.cc b/Src/Cpp/Library_v1/Application/KTThroughputProfiler.cc
similarity index 100%
rename from Cpp/Library_v1/Application/KTThroughputProfiler.cc
rename to Src/Cpp/Library_v1/Application/KTThroughputProfiler.cc
diff --git a/Cpp/Library_v1/Application/KTThroughputProfiler.hh b/Src/Cpp/Library_v1/Application/KTThroughputProfiler.hh
similarity index 100%
rename from Cpp/Library_v1/Application/KTThroughputProfiler.hh
rename to Src/Cpp/Library_v1/Application/KTThroughputProfiler.hh
diff --git a/Cpp/Library_v1/CMakeLists.txt b/Src/Cpp/Library_v1/CMakeLists.txt
similarity index 100%
rename from Cpp/Library_v1/CMakeLists.txt
rename to Src/Cpp/Library_v1/CMakeLists.txt
diff --git a/Cpp/Library_v1/Data/KTApplyCut.cc b/Src/Cpp/Library_v1/Data/KTApplyCut.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTApplyCut.cc
rename to Src/Cpp/Library_v1/Data/KTApplyCut.cc
diff --git a/Cpp/Library_v1/Data/KTApplyCut.hh b/Src/Cpp/Library_v1/Data/KTApplyCut.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTApplyCut.hh
rename to Src/Cpp/Library_v1/Data/KTApplyCut.hh
diff --git a/Cpp/Library_v1/Data/KTCoreData.cc b/Src/Cpp/Library_v1/Data/KTCoreData.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTCoreData.cc
rename to Src/Cpp/Library_v1/Data/KTCoreData.cc
diff --git a/Cpp/Library_v1/Data/KTCoreData.hh b/Src/Cpp/Library_v1/Data/KTCoreData.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTCoreData.hh
rename to Src/Cpp/Library_v1/Data/KTCoreData.hh
diff --git a/Cpp/Library_v1/Data/KTCut.cc b/Src/Cpp/Library_v1/Data/KTCut.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTCut.cc
rename to Src/Cpp/Library_v1/Data/KTCut.cc
diff --git a/Cpp/Library_v1/Data/KTCut.hh b/Src/Cpp/Library_v1/Data/KTCut.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTCut.hh
rename to Src/Cpp/Library_v1/Data/KTCut.hh
diff --git a/Cpp/Library_v1/Data/KTCutFilter.cc b/Src/Cpp/Library_v1/Data/KTCutFilter.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTCutFilter.cc
rename to Src/Cpp/Library_v1/Data/KTCutFilter.cc
diff --git a/Cpp/Library_v1/Data/KTCutFilter.hh b/Src/Cpp/Library_v1/Data/KTCutFilter.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTCutFilter.hh
rename to Src/Cpp/Library_v1/Data/KTCutFilter.hh
diff --git a/Cpp/Library_v1/Data/KTCutResult.hh b/Src/Cpp/Library_v1/Data/KTCutResult.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTCutResult.hh
rename to Src/Cpp/Library_v1/Data/KTCutResult.hh
diff --git a/Cpp/Library_v1/Data/KTCutStatus.cc b/Src/Cpp/Library_v1/Data/KTCutStatus.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTCutStatus.cc
rename to Src/Cpp/Library_v1/Data/KTCutStatus.cc
diff --git a/Cpp/Library_v1/Data/KTCutStatus.hh b/Src/Cpp/Library_v1/Data/KTCutStatus.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTCutStatus.hh
rename to Src/Cpp/Library_v1/Data/KTCutStatus.hh
diff --git a/Cpp/Library_v1/Data/KTData.cc b/Src/Cpp/Library_v1/Data/KTData.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTData.cc
rename to Src/Cpp/Library_v1/Data/KTData.cc
diff --git a/Cpp/Library_v1/Data/KTData.hh b/Src/Cpp/Library_v1/Data/KTData.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTData.hh
rename to Src/Cpp/Library_v1/Data/KTData.hh
diff --git a/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh b/Src/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
rename to Src/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
diff --git a/Cpp/Library_v1/Data/KTTester.cc b/Src/Cpp/Library_v1/Data/KTTester.cc
similarity index 100%
rename from Cpp/Library_v1/Data/KTTester.cc
rename to Src/Cpp/Library_v1/Data/KTTester.cc
diff --git a/Cpp/Library_v1/Data/KTTester.hh b/Src/Cpp/Library_v1/Data/KTTester.hh
similarity index 100%
rename from Cpp/Library_v1/Data/KTTester.hh
rename to Src/Cpp/Library_v1/Data/KTTester.hh
diff --git a/Cpp/Library_v1/IO/KTJSONWriter.cc b/Src/Cpp/Library_v1/IO/KTJSONWriter.cc
similarity index 100%
rename from Cpp/Library_v1/IO/KTJSONWriter.cc
rename to Src/Cpp/Library_v1/IO/KTJSONWriter.cc
diff --git a/Cpp/Library_v1/IO/KTJSONWriter.hh b/Src/Cpp/Library_v1/IO/KTJSONWriter.hh
similarity index 100%
rename from Cpp/Library_v1/IO/KTJSONWriter.hh
rename to Src/Cpp/Library_v1/IO/KTJSONWriter.hh
diff --git a/Cpp/Library_v1/IO/KTReader.cc b/Src/Cpp/Library_v1/IO/KTReader.cc
similarity index 100%
rename from Cpp/Library_v1/IO/KTReader.cc
rename to Src/Cpp/Library_v1/IO/KTReader.cc
diff --git a/Cpp/Library_v1/IO/KTReader.hh b/Src/Cpp/Library_v1/IO/KTReader.hh
similarity index 100%
rename from Cpp/Library_v1/IO/KTReader.hh
rename to Src/Cpp/Library_v1/IO/KTReader.hh
diff --git a/Cpp/Library_v1/IO/KTWriter.cc b/Src/Cpp/Library_v1/IO/KTWriter.cc
similarity index 100%
rename from Cpp/Library_v1/IO/KTWriter.cc
rename to Src/Cpp/Library_v1/IO/KTWriter.cc
diff --git a/Cpp/Library_v1/IO/KTWriter.hh b/Src/Cpp/Library_v1/IO/KTWriter.hh
similarity index 100%
rename from Cpp/Library_v1/IO/KTWriter.hh
rename to Src/Cpp/Library_v1/IO/KTWriter.hh
diff --git a/Cpp/Library_v1/NymphPybind.cc b/Src/Cpp/Library_v1/NymphPybind.cc
similarity index 100%
rename from Cpp/Library_v1/NymphPybind.cc
rename to Src/Cpp/Library_v1/NymphPybind.cc
diff --git a/Cpp/Library_v1/Processor/KTConnection.hh b/Src/Cpp/Library_v1/Processor/KTConnection.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTConnection.hh
rename to Src/Cpp/Library_v1/Processor/KTConnection.hh
diff --git a/Cpp/Library_v1/Processor/KTNymphSignals.hh b/Src/Cpp/Library_v1/Processor/KTNymphSignals.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTNymphSignals.hh
rename to Src/Cpp/Library_v1/Processor/KTNymphSignals.hh
diff --git a/Cpp/Library_v1/Processor/KTNymphSlot.hh b/Src/Cpp/Library_v1/Processor/KTNymphSlot.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTNymphSlot.hh
rename to Src/Cpp/Library_v1/Processor/KTNymphSlot.hh
diff --git a/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc b/Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
similarity index 100%
rename from Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
rename to Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
diff --git a/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh b/Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
rename to Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
diff --git a/Cpp/Library_v1/Processor/KTProcessor.cc b/Src/Cpp/Library_v1/Processor/KTProcessor.cc
similarity index 100%
rename from Cpp/Library_v1/Processor/KTProcessor.cc
rename to Src/Cpp/Library_v1/Processor/KTProcessor.cc
diff --git a/Cpp/Library_v1/Processor/KTProcessor.hh b/Src/Cpp/Library_v1/Processor/KTProcessor.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTProcessor.hh
rename to Src/Cpp/Library_v1/Processor/KTProcessor.hh
diff --git a/Cpp/Library_v1/Processor/KTProcessorPybind.cc b/Src/Cpp/Library_v1/Processor/KTProcessorPybind.cc
similarity index 100%
rename from Cpp/Library_v1/Processor/KTProcessorPybind.cc
rename to Src/Cpp/Library_v1/Processor/KTProcessorPybind.cc
diff --git a/Cpp/Library_v1/Processor/KTProcessorPybind.hh b/Src/Cpp/Library_v1/Processor/KTProcessorPybind.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTProcessorPybind.hh
rename to Src/Cpp/Library_v1/Processor/KTProcessorPybind.hh
diff --git a/Cpp/Library_v1/Processor/KTPyProcessor.hh b/Src/Cpp/Library_v1/Processor/KTPyProcessor.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTPyProcessor.hh
rename to Src/Cpp/Library_v1/Processor/KTPyProcessor.hh
diff --git a/Cpp/Library_v1/Processor/KTSignal.hh b/Src/Cpp/Library_v1/Processor/KTSignal.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSignal.hh
rename to Src/Cpp/Library_v1/Processor/KTSignal.hh
diff --git a/Cpp/Library_v1/Processor/KTSignalSlotBase.hh b/Src/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSignalSlotBase.hh
rename to Src/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
diff --git a/Cpp/Library_v1/Processor/KTSignalWrapper.cc b/Src/Cpp/Library_v1/Processor/KTSignalWrapper.cc
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSignalWrapper.cc
rename to Src/Cpp/Library_v1/Processor/KTSignalWrapper.cc
diff --git a/Cpp/Library_v1/Processor/KTSignalWrapper.hh b/Src/Cpp/Library_v1/Processor/KTSignalWrapper.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSignalWrapper.hh
rename to Src/Cpp/Library_v1/Processor/KTSignalWrapper.hh
diff --git a/Cpp/Library_v1/Processor/KTSlot.hh b/Src/Cpp/Library_v1/Processor/KTSlot.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSlot.hh
rename to Src/Cpp/Library_v1/Processor/KTSlot.hh
diff --git a/Cpp/Library_v1/Processor/KTSlotWrapper.cc b/Src/Cpp/Library_v1/Processor/KTSlotWrapper.cc
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSlotWrapper.cc
rename to Src/Cpp/Library_v1/Processor/KTSlotWrapper.cc
diff --git a/Cpp/Library_v1/Processor/KTSlotWrapper.hh b/Src/Cpp/Library_v1/Processor/KTSlotWrapper.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTSlotWrapper.hh
rename to Src/Cpp/Library_v1/Processor/KTSlotWrapper.hh
diff --git a/Cpp/Library_v1/Processor/KTThreadReference.cc b/Src/Cpp/Library_v1/Processor/KTThreadReference.cc
similarity index 100%
rename from Cpp/Library_v1/Processor/KTThreadReference.cc
rename to Src/Cpp/Library_v1/Processor/KTThreadReference.cc
diff --git a/Cpp/Library_v1/Processor/KTThreadReference.hh b/Src/Cpp/Library_v1/Processor/KTThreadReference.hh
similarity index 100%
rename from Cpp/Library_v1/Processor/KTThreadReference.hh
rename to Src/Cpp/Library_v1/Processor/KTThreadReference.hh
diff --git a/Cpp/Library_v1/Utility/KTCacheDirectory.cc b/Src/Cpp/Library_v1/Utility/KTCacheDirectory.cc
similarity index 100%
rename from Cpp/Library_v1/Utility/KTCacheDirectory.cc
rename to Src/Cpp/Library_v1/Utility/KTCacheDirectory.cc
diff --git a/Cpp/Library_v1/Utility/KTCacheDirectory.hh b/Src/Cpp/Library_v1/Utility/KTCacheDirectory.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTCacheDirectory.hh
rename to Src/Cpp/Library_v1/Utility/KTCacheDirectory.hh
diff --git a/Cpp/Library_v1/Utility/KTConcurrentQueue.hh b/Src/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTConcurrentQueue.hh
rename to Src/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
diff --git a/Cpp/Library_v1/Utility/KTConfigurable.cc b/Src/Cpp/Library_v1/Utility/KTConfigurable.cc
similarity index 100%
rename from Cpp/Library_v1/Utility/KTConfigurable.cc
rename to Src/Cpp/Library_v1/Utility/KTConfigurable.cc
diff --git a/Cpp/Library_v1/Utility/KTConfigurable.hh b/Src/Cpp/Library_v1/Utility/KTConfigurable.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTConfigurable.hh
rename to Src/Cpp/Library_v1/Utility/KTConfigurable.hh
diff --git a/Cpp/Library_v1/Utility/KTConfigurablePybind.hh b/Src/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTConfigurablePybind.hh
rename to Src/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
diff --git a/Cpp/Library_v1/Utility/KTDirectory.cc b/Src/Cpp/Library_v1/Utility/KTDirectory.cc
similarity index 100%
rename from Cpp/Library_v1/Utility/KTDirectory.cc
rename to Src/Cpp/Library_v1/Utility/KTDirectory.cc
diff --git a/Cpp/Library_v1/Utility/KTDirectory.hh b/Src/Cpp/Library_v1/Utility/KTDirectory.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTDirectory.hh
rename to Src/Cpp/Library_v1/Utility/KTDirectory.hh
diff --git a/Cpp/Library_v1/Utility/KTEventLoop.cc b/Src/Cpp/Library_v1/Utility/KTEventLoop.cc
similarity index 100%
rename from Cpp/Library_v1/Utility/KTEventLoop.cc
rename to Src/Cpp/Library_v1/Utility/KTEventLoop.cc
diff --git a/Cpp/Library_v1/Utility/KTEventLoop.hh b/Src/Cpp/Library_v1/Utility/KTEventLoop.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTEventLoop.hh
rename to Src/Cpp/Library_v1/Utility/KTEventLoop.hh
diff --git a/Cpp/Library_v1/Utility/KTException.cc b/Src/Cpp/Library_v1/Utility/KTException.cc
similarity index 100%
rename from Cpp/Library_v1/Utility/KTException.cc
rename to Src/Cpp/Library_v1/Utility/KTException.cc
diff --git a/Cpp/Library_v1/Utility/KTException.hh b/Src/Cpp/Library_v1/Utility/KTException.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTException.hh
rename to Src/Cpp/Library_v1/Utility/KTException.hh
diff --git a/Cpp/Library_v1/Utility/KTExtensible.hh b/Src/Cpp/Library_v1/Utility/KTExtensible.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTExtensible.hh
rename to Src/Cpp/Library_v1/Utility/KTExtensible.hh
diff --git a/Cpp/Library_v1/Utility/KTExtensibleStruct.hh b/Src/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTExtensibleStruct.hh
rename to Src/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
diff --git a/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh b/Src/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
rename to Src/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
diff --git a/Cpp/Library_v1/Utility/KTLogger.hh b/Src/Cpp/Library_v1/Utility/KTLogger.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTLogger.hh
rename to Src/Cpp/Library_v1/Utility/KTLogger.hh
diff --git a/Cpp/Library_v1/Utility/KTMemberVariable.hh b/Src/Cpp/Library_v1/Utility/KTMemberVariable.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTMemberVariable.hh
rename to Src/Cpp/Library_v1/Utility/KTMemberVariable.hh
diff --git a/Cpp/Library_v1/Utility/KTParamPybind.hh b/Src/Cpp/Library_v1/Utility/KTParamPybind.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTParamPybind.hh
rename to Src/Cpp/Library_v1/Utility/KTParamPybind.hh
diff --git a/Cpp/Library_v1/Utility/KTPythonMacros.hh b/Src/Cpp/Library_v1/Utility/KTPythonMacros.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTPythonMacros.hh
rename to Src/Cpp/Library_v1/Utility/KTPythonMacros.hh
diff --git a/Cpp/Library_v1/Utility/KTTIFactory.hh b/Src/Cpp/Library_v1/Utility/KTTIFactory.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTTIFactory.hh
rename to Src/Cpp/Library_v1/Utility/KTTIFactory.hh
diff --git a/Cpp/Library_v1/Utility/KTTime.cc b/Src/Cpp/Library_v1/Utility/KTTime.cc
similarity index 100%
rename from Cpp/Library_v1/Utility/KTTime.cc
rename to Src/Cpp/Library_v1/Utility/KTTime.cc
diff --git a/Cpp/Library_v1/Utility/KTTime.hh b/Src/Cpp/Library_v1/Utility/KTTime.hh
similarity index 100%
rename from Cpp/Library_v1/Utility/KTTime.hh
rename to Src/Cpp/Library_v1/Utility/KTTime.hh
diff --git a/Cpp/Templates/KTProcessorTemplate.cc b/Src/Cpp/Templates/KTProcessorTemplate.cc
similarity index 100%
rename from Cpp/Templates/KTProcessorTemplate.cc
rename to Src/Cpp/Templates/KTProcessorTemplate.cc
diff --git a/Cpp/Templates/KTProcessorTemplate.hh b/Src/Cpp/Templates/KTProcessorTemplate.hh
similarity index 100%
rename from Cpp/Templates/KTProcessorTemplate.hh
rename to Src/Cpp/Templates/KTProcessorTemplate.hh
diff --git a/Cpp/Templates/MainCMakeLists.txt b/Src/Cpp/Templates/MainCMakeLists.txt
similarity index 100%
rename from Cpp/Templates/MainCMakeLists.txt
rename to Src/Cpp/Templates/MainCMakeLists.txt
diff --git a/Src/External/cereal/.gitignore b/Src/External/cereal/.gitignore
new file mode 100644
index 0000000..44c7498
--- /dev/null
+++ b/Src/External/cereal/.gitignore
@@ -0,0 +1,49 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# Visual studio cruft
+*.opensdf
+*.sdf
+*.suo
+*.user
+*/x64
+*/Debug*
+*/Release*
+*.log
+*.tlog*
+*.obj
+*.VC.db
+*.VC.VC.opendb
+*.pdb
+
+# misc files mostly used for testing
+out.txt
+ptr.txt
+test.txt
+boost_serialize
+arr.txt
+performance
+include_renamed
+.ycm_extra_conf.py*
+doc/html
+rtti.txt
+doc/latex
+portability64
+portability32
+file.json
+out.xml
+cereal_version.out
+xml_ordering.out
+build
+/out/
\ No newline at end of file
diff --git a/Src/External/cereal/.travis.yml b/Src/External/cereal/.travis.yml
new file mode 100644
index 0000000..ae12dbc
--- /dev/null
+++ b/Src/External/cereal/.travis.yml
@@ -0,0 +1,39 @@
+language: cpp
+dist: trusty
+sudo: false
+group: beta
+
+addons:
+  apt:
+    sources:
+      - 'ubuntu-toolchain-r-test'
+      - 'boost-latest'
+    packages:
+      - 'g++-multilib'
+      - 'libboost-serialization-dev'
+#      - 'libboost-test-dev'
+
+compiler:
+  - gcc
+
+matrix:
+  include:
+    - os: linux
+      compiler: clang
+      env: CMAKE_OPTIONS="-DSKIP_PORTABILITY_TEST=ON"
+
+    # TODO: Add an entry for valgrind
+    #  after_script: make valgrind
+
+    - os: osx
+      osx_image: xcode8
+      compiler: clang
+
+script:
+  - mkdir build && cd build
+  - cmake ${CMAKE_OPTIONS} .. && make -j4
+  - ctest . --output-on-failure
+
+branches:
+  only:
+    - develop
diff --git a/Src/External/cereal/CMakeLists.txt b/Src/External/cereal/CMakeLists.txt
new file mode 100644
index 0000000..dcb9cd6
--- /dev/null
+++ b/Src/External/cereal/CMakeLists.txt
@@ -0,0 +1,66 @@
+cmake_minimum_required (VERSION 2.6.2)
+project (cereal)
+
+option(SKIP_PORTABILITY_TEST "Skip portability (32 bit) tests" OFF)
+if(NOT CMAKE_VERSION VERSION_LESS 3.0) # installing cereal requires INTERFACE lib
+    option(JUST_INSTALL_CEREAL "Don't do anything besides installing the library" OFF)
+endif()
+
+option(THREAD_SAFE "Use mutexes to ensure thread safety" OFF)
+if(THREAD_SAFE)
+    add_definitions(-DCEREAL_THREAD_SAFE=1)
+    set(CEREAL_THREAD_LIBS "pthread")
+else()
+    set(CEREAL_THREAD_LIBS "")
+endif()
+
+if(MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /W3 /WX")
+else()
+    set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")
+    option(WITH_WERROR "Compile with '-Werror' C++ compiler flag" ON)
+    if(WITH_WERROR)
+        set(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+    endif(WITH_WERROR)
+    if(CMAKE_VERSION VERSION_LESS 3.1)
+        set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+    else()
+        if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD STREQUAL "98")
+            set(CMAKE_CXX_STANDARD 11)
+        endif()
+        set(CMAKE_CXX_STANDARD_REQUIRED ON)
+    endif()
+endif()
+
+if(NOT CMAKE_VERSION VERSION_LESS 3.0)
+    add_library(cereal INTERFACE)
+    target_include_directories(cereal INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+    )
+    install(TARGETS cereal EXPORT cereal
+        DESTINATION lib) # ignored
+    install(EXPORT cereal FILE cereal-config.cmake
+        DESTINATION share/cmake/cereal)
+    install(DIRECTORY include/cereal DESTINATION include)
+endif()
+
+if(JUST_INSTALL_CEREAL)
+    return()
+endif()
+
+include_directories(./include)
+
+# Boost serialization for performance sandbox
+find_package(Boost COMPONENTS serialization)
+
+if(Boost_FOUND)
+  include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+endif(Boost_FOUND)
+  
+enable_testing()
+add_subdirectory(unittests)
+
+add_subdirectory(sandbox)
+
+add_subdirectory(doc)
diff --git a/Src/External/cereal/LICENSE b/Src/External/cereal/LICENSE
new file mode 100644
index 0000000..acc4fd8
--- /dev/null
+++ b/Src/External/cereal/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2014, Randolph Voorhies, Shane Grant
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of cereal nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Src/External/cereal/README.md b/Src/External/cereal/README.md
new file mode 100644
index 0000000..1001f50
--- /dev/null
+++ b/Src/External/cereal/README.md
@@ -0,0 +1,85 @@
+cereal - A C++11 library for serialization
+==========================================
+
+<img src="http://uscilab.github.io/cereal/assets/img/cerealboxside.png" align="right"/><p>cereal is a header-only C++11 serialization library.  cereal takes arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.  cereal was designed to be fast, light-weight, and easy to extend - it has no external dependencies and can be easily bundled with other code or used standalone.</p>
+
+### cereal has great documentation
+
+Looking for more information on how cereal works and its documentation?  Visit [cereal's web page](http://USCiLab.github.com/cereal) to get the latest information.
+
+### cereal is easy to use
+
+Installation and use of of cereal is fully documented on the [main web page](http://USCiLab.github.com/cereal), but this is a quick and dirty version:
+
+* Download cereal and place the headers somewhere your code can see them
+* Write serialization functions for your custom types or use the built in support for the standard library cereal provides
+* Use the serialization archives to load and save data
+
+```cpp
+#include <cereal/types/unordered_map.hpp>
+#include <cereal/types/memory.hpp>
+#include <cereal/archives/binary.hpp>
+#include <fstream>
+    
+struct MyRecord
+{
+  uint8_t x, y;
+  float z;
+  
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( x, y, z );
+  }
+};
+    
+struct SomeData
+{
+  int32_t id;
+  std::shared_ptr<std::unordered_map<uint32_t, MyRecord>> data;
+  
+  template <class Archive>
+  void save( Archive & ar ) const
+  {
+    ar( data );
+  }
+      
+  template <class Archive>
+  void load( Archive & ar )
+  {
+    static int32_t idGen = 0;
+    id = idGen++;
+    ar( data );
+  }
+};
+
+int main()
+{
+  std::ofstream os("out.cereal", std::ios::binary);
+  cereal::BinaryOutputArchive archive( os );
+
+  SomeData myData;
+  archive( myData );
+
+  return 0;
+}
+```    
+
+### cereal has a mailing list
+
+Either get in touch over <a href="mailto:cerealcpp@googlegroups.com">email</a> or [on the web](https://groups.google.com/forum/#!forum/cerealcpp).
+
+
+
+## cereal has a permissive license
+
+cereal is licensed under the [BSD license](http://opensource.org/licenses/BSD-3-Clause).
+
+## cereal build status
+
+* develop : [![Build Status](https://travis-ci.org/USCiLab/cereal.png?branch=develop)](https://travis-ci.org/USCiLab/cereal)
+[![Build status](https://ci.appveyor.com/api/projects/status/91aou6smj36or0vb/branch/develop?svg=true)](https://ci.appveyor.com/project/AzothAmmo/cereal/branch/develop)
+
+---
+
+Were you looking for the Haskell cereal?  Go <a href="https://github.com/GaloisInc/cereal">here</a>.
diff --git a/Src/External/cereal/appveyor.yml b/Src/External/cereal/appveyor.yml
new file mode 100644
index 0000000..121eba1
--- /dev/null
+++ b/Src/External/cereal/appveyor.yml
@@ -0,0 +1,35 @@
+# can use variables like {build} and {branch}
+version: 1.2.{build}
+pull_requests:
+  do_not_increment_build_number: true
+
+branches:
+  only:
+    - develop
+
+configuration:
+  - Debug
+  - Release
+
+environment:
+  matrix:
+    - VS_VERSION_MAJOR: 12
+    - VS_VERSION_MAJOR: 14
+      BOOST_ROOT: C:\Libraries\boost_1_59_0
+
+platform:
+  - Win32
+  - x64
+
+before_build: "scripts\\appveyor.bat"
+
+build:
+  parallel: true
+  project: build/cereal.sln
+  verbosity: minimal
+
+test_script: "scripts\\appveyor.bat test"
+
+artifacts:
+  - path: build\Testing
+  - path: out
diff --git a/Src/External/cereal/doc/CMakeLists.txt b/Src/External/cereal/doc/CMakeLists.txt
new file mode 100644
index 0000000..ec0316e
--- /dev/null
+++ b/Src/External/cereal/doc/CMakeLists.txt
@@ -0,0 +1,18 @@
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doxygen.in" "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg" @ONLY)
+  add_custom_target(doc
+    COMMAND ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
+    COMMENT "Generating API documentation with Doxygen" VERBATIM
+    )
+
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../scripts/updatedoc.in" "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh" @ONLY)
+  add_custom_target(update-doc
+    COMMAND "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh"
+    DEPENDS doc
+    COMMENT "Copying documentation to gh-pages branch" VERBATIM
+    )
+
+endif(DOXYGEN_FOUND)
\ No newline at end of file
diff --git a/Src/External/cereal/doc/DoxygenLayout.xml b/Src/External/cereal/doc/DoxygenLayout.xml
new file mode 100644
index 0000000..819c4f4
--- /dev/null
+++ b/Src/External/cereal/doc/DoxygenLayout.xml
@@ -0,0 +1,190 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.3.1-20130402 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="user" visible="true" title="cereal" url="../../index.html"/>
+    <tab type="mainpage" visible="yes" title="Doxygen Documentation"/>
+    <tab type="pages" visible="no" title="" intro=""/>
+    <tab type="modules" visible="yes" title="Code Modules" intro=""/>
+    <tab type="namespaces" visible="no" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="no" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="Source File Documentation">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="no" title="" intro=""/>
+    <tab type="user" visible="true" title="Github" url="https://github.com/USCiLab/cereal"/>
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>
diff --git a/Src/External/cereal/doc/doxygen.in b/Src/External/cereal/doc/doxygen.in
new file mode 100644
index 0000000..ddf1398
--- /dev/null
+++ b/Src/External/cereal/doc/doxygen.in
@@ -0,0 +1,1870 @@
+# Doxyfile 1.8.3.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or sequence of words) that should
+# identify the project. Note that if you do not use Doxywizard you need
+# to put quotes around the project name if it contains spaces.
+
+PROJECT_NAME           = "cereal"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "A C++11 library for serialization"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip. Note that you specify absolute paths here, but also
+# relative paths, which will be relative from the directory where doxygen is
+# started.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = include
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 2
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding
+# "class=itcl::class" will allow you to use the command class in the
+# itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension,
+# and language is one of the parsers supported by doxygen: IDL, Java,
+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
+# C++. For instance to make doxygen treat .inc files as Fortran files (default
+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
+# files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
+# comments according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you
+# can mix doxygen, HTML, and XML commands with Markdown formatting.
+# Disable only in case of backward compatibilities issues.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented classes,
+# or namespaces to their corresponding documentation. Such a link can be
+# prevented in individual cases by by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES (the
+# default) will make doxygen replace the get and set methods by a property in
+# the documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
+# unions with only public data fields will be shown inline in the documentation
+# of the scope in which they are defined (i.e. file, namespace, or group
+# documentation), provided this scope is documented. If set to NO (the default),
+# structs, classes, and unions are shown on a separate page (for HTML and Man
+# pages) or section (for LaTeX and RTF).
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+#SYMBOL_CACHE_SIZE      = 0
+
+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
+# their name and scope. Since this can be an expensive process and often the
+# same symbol appear multiple times in the code, doxygen keeps a cache of
+# pre-resolved symbols. If the cache is too small doxygen will become slower.
+# If the cache is too large, memory is wasted. The cache size is given by this
+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if section-label ... \endif
+# and \cond section-label ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            = "@CMAKE_CURRENT_SOURCE_DIR@/DoxygenLayout.xml"
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files
+# containing the references data. This must be a list of .bib files. The
+# .bib extension is automatically appended if omitted. Using this command
+# requires the bibtex tool to be installed. See also
+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
+# feature you need bibtex and perl available in the search path. Do not use
+# file names with spaces, bibtex cannot handle them.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = NO
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../include @CMAKE_CURRENT_SOURCE_DIR@/
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          = *.hpp
+FILE_PATTERNS          += *.dox
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/../external
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = .* *.cpp */external/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page (index.html).
+# This can be useful if you have a project on for instance GitHub and want reuse
+# the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C, C++ and Fortran comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+#  for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when
+# changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            ="@CMAKE_CURRENT_SOURCE_DIR@/footer.html"
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If left blank doxygen will
+# generate a default style sheet. Note that it is recommended to use
+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
+# tag will in the future become obsolete.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
+# user-defined cascading style sheet that is included after the standard
+# style sheets created by doxygen. Using this option one can overrule
+# certain style aspects. This is preferred over using HTML_STYLESHEET
+# since it does not replace the standard style sheet and is therefor more
+# robust against future updates. Doxygen will copy the style sheet file to
+# the output directory.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the style sheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
+# entries shown in the various tree structured indices initially; the user
+# can expand and collapse entries dynamically later on. Doxygen will expand
+# the tree to such a level that at most the specified number of entries are
+# visible (unless a fully collapsed tree already exceeds this amount).
+# So setting the number of entries 1 will produce a full collapsed tree by
+# default. 0 is a special value representing an infinite number of entries
+# and will result in a full expanded tree by default.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
+# identify the documentation publisher. This should be a reverse domain-name
+# style string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
+# at top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it. Since the tabs have the same information as the
+# navigation tree you can set this option to NO if you already set
+# GENERATE_TREEVIEW to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+# Since the tree basically has the same information as the tab index you
+# could consider to set DISABLE_INDEX to NO when enabling this option.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you may also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
+# SVG. The default value is HTML-CSS, which is slower, but has the best
+# compatibility.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to
+# the MathJax Content Delivery Network so you can quickly see the result without
+# installing MathJax.
+# However, it is strongly recommended to install a local
+# copy of MathJax from http://www.mathjax.org before deployment.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript.
+# There are two flavours of web server based search depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools.
+# See the manual for details.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
+# the search results. Doxygen ships with an example indexer (doxyindexer) and
+# search engine (doxysearch.cgi) which are based on the open source search engine
+# library Xapian. See the manual for configuration details.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will returned the search results when EXTERNAL_SEARCH is enabled.
+# Doxygen ships with an example search engine (doxysearch) which is based on
+# the open source search engine library Xapian. See the manual for configuration
+# details.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
+# of to a relative location where the documentation can be found.
+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
+# http://en.wikipedia.org/wiki/BibTeX for more info.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load style sheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+# XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+# XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. For each
+# tag file the location of the external documentation should be added. The
+# format of a tag file without this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths
+# or URLs. Note that each tag file must have a unique name (where the name does
+# NOT include the path). If a tag file is not located in the directory in which
+# doxygen is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = cereal.doxytags
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will use the Helvetica font for all dot files that
+# doxygen generates. When you want a differently looking font you can specify
+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
+# the font, which can be done by putting it in a standard location or by setting
+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the Helvetica font.
+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
+# set the path where dot can find it.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
+# the class node. If there are many fields or methods and many nodes the
+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
+# threshold limits the number of items for each type to make the size more
+# managable. Set this to 0 for no limit. Note that the threshold may be
+# exceeded by 50% before the limit is enforced.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used. If you choose svg you need to set
+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible in IE 9+ (other browsers do not have this requirement).
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# Note that this requires a modern browser other than Internet Explorer.
+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
+# visible. Older versions of IE do not have SVG support.
+
+INTERACTIVE_SVG        = NO
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
diff --git a/Src/External/cereal/doc/footer.html b/Src/External/cereal/doc/footer.html
new file mode 100644
index 0000000..e76312e
--- /dev/null
+++ b/Src/External/cereal/doc/footer.html
@@ -0,0 +1,31 @@
+<!-- HTML footer for doxygen 1.8.3.1-->
+<!-- start footer part -->
+<!--BEGIN GENERATE_TREEVIEW-->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    $navpath
+    <li class="footer">$generatedby
+    <a href="http://www.doxygen.org/index.html">
+    <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
+  </ul>
+</div>
+<!--END GENERATE_TREEVIEW-->
+<!--BEGIN !GENERATE_TREEVIEW-->
+<hr class="footer"/><address class="footer"><small>
+$generatedby &#160;<a href="http://www.doxygen.org/index.html">
+<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
+</a> $doxygenversion
+</small></address>
+<!--END !GENERATE_TREEVIEW-->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-42360142-1', 'uscilab.github.io');
+  ga('send', 'pageview');
+
+</script>
+</body>
+</html>
diff --git a/Src/External/cereal/doc/mainpage.dox b/Src/External/cereal/doc/mainpage.dox
new file mode 100644
index 0000000..066c83c
--- /dev/null
+++ b/Src/External/cereal/doc/mainpage.dox
@@ -0,0 +1,47 @@
+/**
+\mainpage cereal code documentation
+
+\tableofcontents
+
+Aside from the <a href="../../index.html">documentation</a> presented on the main cereal site, this doxygen
+page offers code level documentation.
+
+\section modules Browse modules
+
+cereal's code is organized into modules of similar functionality.  Take a look at the <a href="modules.html">modules</a>
+section to learn more.  Average users will not need to understand the workings of any code that falls under the
+<i>internal</i> module.
+
+\section files Browse files
+
+If you need reference on a specific file, the <a href="files.html">files</a> page lists all files in cereal.
+*/
+
+  //! \defgroup Archives Input and Output Archive Types
+
+  /*! \defgroup Access Access Control and Disambiguation
+      Provides ways to give cereal access to protected member functions, disambiguate
+      which serialization function cereal should use, and provide ways of using smart
+      pointers with types that have no default constructor. */
+
+  /*! \defgroup Utility Utility Functionality
+      Name-value pairs, binary data wrappers, exceptions, and other utility functions */
+
+  /*! \defgroup TypeSupport Support for Serializing Various Types
+      Serialization of many types is shipped with cereal, including most of the standard library as well as a few others.  */
+
+  /*! \defgroup STLSupport Standard Library Support
+      Serialization methods for nearly all types found in the C++ standard library.
+      \ingroup TypeSupport */
+  
+  /*! \defgroup TypeConcepts Abstract Type Concept Support
+      Serialization methods for more abstract type concepts that can generalize over many types.
+      \ingroup TypeSupport */
+
+  /*! \defgroup OtherTypes Miscellaneous Types Support
+      Support for various other types such as smart pointers to polymorphic base classes, boost::variant, etc.
+      \ingroup TypeSupport */
+
+  /*! \defgroup Internal Internal Functionality
+      Various classes and functions that are critical for the operation of cereal but of no
+      interest to users */
diff --git a/Src/External/cereal/include/cereal/access.hpp b/Src/External/cereal/include/cereal/access.hpp
new file mode 100644
index 0000000..63c1f74
--- /dev/null
+++ b/Src/External/cereal/include/cereal/access.hpp
@@ -0,0 +1,448 @@
+/*! \file access.hpp
+    \brief Access control, default construction, and serialization disambiguation */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_ACCESS_HPP_
+#define CEREAL_ACCESS_HPP_
+
+#include <type_traits>
+#include <iostream>
+#include <cstdint>
+#include <functional>
+
+#include "cereal/macros.hpp"
+#include "cereal/details/helpers.hpp"
+
+namespace cereal
+{
+  // ######################################################################
+  //! A class that allows cereal to load smart pointers to types that have no default constructor
+  /*! If your class does not have a default constructor, cereal will not be able
+      to load any smart pointers to it unless you overload LoadAndConstruct
+      for your class, and provide an appropriate load_and_construct method.  You can also
+      choose to define a member static function instead of specializing this class.
+
+      The specialization of LoadAndConstruct must be placed within the cereal namespace:
+
+      @code{.cpp}
+      struct MyType
+      {
+        MyType( int x ); // note: no default ctor
+        int myX;
+
+        // Define a serialize or load/save pair as you normally would
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( myX );
+        }
+      };
+
+      // Provide a specialization for LoadAndConstruct for your type
+      namespace cereal
+      {
+        template <> struct LoadAndConstruct<MyType>
+        {
+          // load_and_construct will be passed the archive that you will be loading
+          // from as well as a construct object which you can use as if it were the
+          // constructor for your type.  cereal will handle all memory management for you.
+          template <class Archive>
+          static void load_and_construct( Archive & ar, cereal::construct<MyType> & construct )
+          {
+            int x;
+            ar( x );
+            construct( x );
+          }
+
+          // if you require versioning, simply add a const std::uint32_t as the final parameter, e.g.:
+          // load_and_construct( Archive & ar, cereal::construct<MyType> & construct, std::uint32_t const version )
+        };
+      } // end namespace cereal
+      @endcode
+
+      Please note that just as in using external serialization functions, you cannot get
+      access to non-public members of your class by befriending cereal::access.  If you
+      have the ability to modify the class you wish to serialize, it is recommended that you
+      use member serialize functions and a static member load_and_construct function.
+
+      load_and_construct functions, regardless of whether they are static members of your class or
+      whether you create one in the LoadAndConstruct specialization, have the following signature:
+
+      @code{.cpp}
+      // generally Archive will be templated, but it can be specific if desired
+      template <class Archive>
+      static void load_and_construct( Archive & ar, cereal::construct<MyType> & construct );
+      // with an optional last parameter specifying the version: const std::uint32_t version
+      @endcode
+
+      Versioning behaves the same way as it does for standard serialization functions.
+
+      @tparam T The type to specialize for
+      @ingroup Access */
+  template <class T>
+  struct LoadAndConstruct
+  { };
+
+  // forward decl for construct
+  //! @cond PRIVATE_NEVERDEFINED
+  namespace memory_detail{ template <class Ar, class T> struct LoadAndConstructLoadWrapper; }
+  //! @endcond
+
+  //! Used to construct types with no default constructor
+  /*! When serializing a type that has no default constructor, cereal
+      will attempt to call either the class static function load_and_construct
+      or the appropriate template specialization of LoadAndConstruct.  cereal
+      will pass that function a reference to the archive as well as a reference
+      to a construct object which should be used to perform the allocation once
+      data has been appropriately loaded.
+
+      @code{.cpp}
+      struct MyType
+      {
+        // note the lack of default constructor
+        MyType( int xx, int yy );
+
+        int x, y;
+        double notInConstructor;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( x, y );
+          ar( notInConstructor );
+        }
+
+        template <class Archive>
+        static void load_and_construct( Archive & ar, cereal::construct<MyType> & construct )
+        {
+          int x, y;
+          ar( x, y );
+
+          // use construct object to initialize with loaded data
+          construct( x, y );
+
+          // access to member variables and functions via -> operator
+          ar( construct->notInConstructor );
+
+          // could also do the above section by:
+          double z;
+          ar( z );
+          construct->notInConstructor = z;
+        }
+      };
+      @endcode
+
+      @tparam T The class type being serialized
+      */
+  template <class T>
+  class construct
+  {
+    public:
+      //! Construct and initialize the type T with the given arguments
+      /*! This will forward all arguments to the underlying type T,
+          calling an appropriate constructor.
+
+          Calling this function more than once will result in an exception
+          being thrown.
+
+          @param args The arguments to the constructor for T
+          @throw Exception If called more than once */
+      template <class ... Args>
+      void operator()( Args && ... args );
+      // implementation deferred due to reliance on cereal::access
+
+      //! Get a reference to the initialized underlying object
+      /*! This must be called after the object has been initialized.
+
+          @return A reference to the initialized object
+          @throw Exception If called before initialization */
+      T * operator->()
+      {
+        if( !itsValid )
+          throw Exception("Object must be initialized prior to accessing members");
+
+        return itsPtr;
+      }
+
+      //! Returns a raw pointer to the initialized underlying object
+      /*! This is mainly intended for use with passing an instance of
+          a constructed object to cereal::base_class.
+
+          It is strongly recommended to avoid using this function in
+          any other circumstance.
+
+          @return A raw pointer to the initialized type */
+      T * ptr()
+      {
+        return operator->();
+      }
+
+    private:
+      template <class A, class B> friend struct ::cereal::memory_detail::LoadAndConstructLoadWrapper;
+
+      construct( T * p ) : itsPtr( p ), itsEnableSharedRestoreFunction( [](){} ), itsValid( false ) {}
+      construct( T * p, std::function<void()> enableSharedFunc ) : // g++4.7 ice with default lambda to std func
+        itsPtr( p ), itsEnableSharedRestoreFunction( enableSharedFunc ), itsValid( false ) {}
+      construct( construct const & ) = delete;
+      construct & operator=( construct const & ) = delete;
+
+      T * itsPtr;
+      std::function<void()> itsEnableSharedRestoreFunction;
+      bool itsValid;
+  };
+
+  // ######################################################################
+  //! A class that can be made a friend to give cereal access to non public functions
+  /*! If you desire non-public serialization functions within a class, cereal can only
+      access these if you declare cereal::access a friend.
+
+      @code{.cpp}
+      class MyClass
+      {
+        private:
+          friend class cereal::access; // gives access to the private serialize
+
+          template <class Archive>
+          void serialize( Archive & ar )
+          {
+            // some code
+          }
+      };
+      @endcode
+      @ingroup Access */
+  class access
+  {
+    public:
+      // ####### Standard Serialization ########################################
+      template<class Archive, class T> inline
+      static auto member_serialize(Archive & ar, T & t) -> decltype(t.CEREAL_SERIALIZE_FUNCTION_NAME(ar))
+      { return t.CEREAL_SERIALIZE_FUNCTION_NAME(ar); }
+
+      template<class Archive, class T> inline
+      static auto member_save(Archive & ar, T const & t) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar))
+      { return t.CEREAL_SAVE_FUNCTION_NAME(ar); }
+
+      template<class Archive, class T> inline
+      static auto member_save_non_const(Archive & ar, T & t) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar))
+      { return t.CEREAL_SAVE_FUNCTION_NAME(ar); }
+
+      template<class Archive, class T> inline
+      static auto member_load(Archive & ar, T & t) -> decltype(t.CEREAL_LOAD_FUNCTION_NAME(ar))
+      { return t.CEREAL_LOAD_FUNCTION_NAME(ar); }
+
+      template<class Archive, class T> inline
+      static auto member_save_minimal(Archive const & ar, T const & t) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar))
+      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar); }
+
+      template<class Archive, class T> inline
+      static auto member_save_minimal_non_const(Archive const & ar, T & t) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar))
+      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar); }
+
+      template<class Archive, class T, class U> inline
+      static auto member_load_minimal(Archive const & ar, T & t, U && u) -> decltype(t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u)))
+      { return t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u)); }
+
+      // ####### Versioned Serialization #######################################
+      template<class Archive, class T> inline
+      static auto member_serialize(Archive & ar, T & t, const std::uint32_t version ) -> decltype(t.CEREAL_SERIALIZE_FUNCTION_NAME(ar, version))
+      { return t.CEREAL_SERIALIZE_FUNCTION_NAME(ar, version); }
+
+      template<class Archive, class T> inline
+      static auto member_save(Archive & ar, T const & t, const std::uint32_t version ) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar, version))
+      { return t.CEREAL_SAVE_FUNCTION_NAME(ar, version); }
+
+      template<class Archive, class T> inline
+      static auto member_save_non_const(Archive & ar, T & t, const std::uint32_t version ) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar, version))
+      { return t.CEREAL_SAVE_FUNCTION_NAME(ar, version); }
+
+      template<class Archive, class T> inline
+      static auto member_load(Archive & ar, T & t, const std::uint32_t version ) -> decltype(t.CEREAL_LOAD_FUNCTION_NAME(ar, version))
+      { return t.CEREAL_LOAD_FUNCTION_NAME(ar, version); }
+
+      template<class Archive, class T> inline
+      static auto member_save_minimal(Archive const & ar, T const & t, const std::uint32_t version) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version))
+      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version); }
+
+      template<class Archive, class T> inline
+      static auto member_save_minimal_non_const(Archive const & ar, T & t, const std::uint32_t version) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version))
+      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version); }
+
+      template<class Archive, class T, class U> inline
+      static auto member_load_minimal(Archive const & ar, T & t, U && u, const std::uint32_t version) -> decltype(t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u), version))
+      { return t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u), version); }
+
+      // ####### Other Functionality ##########################################
+      // for detecting inheritance from enable_shared_from_this
+      template <class T> inline
+      static auto shared_from_this(T & t) -> decltype(t.shared_from_this());
+
+      // for placement new
+      template <class T, class ... Args> inline
+      static void construct( T *& ptr, Args && ... args )
+      {
+        new (ptr) T( std::forward<Args>( args )... );
+      }
+
+      // for non-placement new with a default constructor
+      template <class T> inline
+      static T * construct()
+      {
+        return new T();
+      }
+
+      template <class T> inline
+      static std::false_type load_and_construct(...)
+      { return std::false_type(); }
+
+      template<class T, class Archive> inline
+      static auto load_and_construct(Archive & ar, ::cereal::construct<T> & construct) -> decltype(T::load_and_construct(ar, construct))
+      {
+        T::load_and_construct( ar, construct );
+      }
+
+      template<class T, class Archive> inline
+      static auto load_and_construct(Archive & ar, ::cereal::construct<T> & construct, const std::uint32_t version) -> decltype(T::load_and_construct(ar, construct, version))
+      {
+        T::load_and_construct( ar, construct, version );
+      }
+  }; // end class access
+
+  // ######################################################################
+  //! A specifier used in conjunction with cereal::specialize to disambiguate
+  //! serialization in special cases
+  /*! @relates specialize
+      @ingroup Access */
+  enum class specialization
+  {
+    member_serialize,            //!< Force the use of a member serialize function
+    member_load_save,            //!< Force the use of a member load/save pair
+    member_load_save_minimal,    //!< Force the use of a member minimal load/save pair
+    non_member_serialize,        //!< Force the use of a non-member serialize function
+    non_member_load_save,        //!< Force the use of a non-member load/save pair
+    non_member_load_save_minimal //!< Force the use of a non-member minimal load/save pair
+  };
+
+  //! A class used to disambiguate cases where cereal cannot detect a unique way of serializing a class
+  /*! cereal attempts to figure out which method of serialization (member vs. non-member serialize
+      or load/save pair) at compile time.  If for some reason cereal cannot find a non-ambiguous way
+      of serializing a type, it will produce a static assertion complaining about this.
+
+      This can happen because you have both a serialize and load/save pair, or even because a base
+      class has a serialize (public or private with friend access) and a derived class does not
+      overwrite this due to choosing some other serialization type.
+
+      Specializing this class will tell cereal to explicitly use the serialization type you specify
+      and it will not complain about ambiguity in its compile time selection.  However, if cereal detects
+      an ambiguity in specializations, it will continue to issue a static assertion.
+
+      @code{.cpp}
+      class MyParent
+      {
+        friend class cereal::access;
+        template <class Archive>
+        void serialize( Archive & ar ) {}
+      };
+
+      // Although serialize is private in MyParent, to cereal::access it will look public,
+      // even through MyDerived
+      class MyDerived : public MyParent
+      {
+        public:
+          template <class Archive>
+          void load( Archive & ar ) {}
+
+          template <class Archive>
+          void save( Archive & ar ) {}
+      };
+
+      // The load/save pair in MyDerived is ambiguous because serialize in MyParent can
+      // be accessed from cereal::access.  This looks the same as making serialize public
+      // in MyParent, making it seem as though MyDerived has both a serialize and a load/save pair.
+      // cereal will complain about this at compile time unless we disambiguate:
+
+      namespace cereal
+      {
+        // This struct specialization will tell cereal which is the right way to serialize the ambiguity
+        template <class Archive> struct specialize<Archive, MyDerived, cereal::specialization::member_load_save> {};
+
+        // If we only had a disambiguation for a specific archive type, it would look something like this
+        template <> struct specialize<cereal::BinaryOutputArchive, MyDerived, cereal::specialization::member_load_save> {};
+      }
+      @endcode
+
+      You can also choose to use the macros CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES or
+      CEREAL_SPECIALIZE_FOR_ARCHIVE if you want to type a little bit less.
+
+      @tparam T The type to specialize the serialization for
+      @tparam S The specialization type to use for T
+      @ingroup Access */
+  template <class Archive, class T, specialization S>
+  struct specialize : public std::false_type {};
+
+  //! Convenient macro for performing specialization for all archive types
+  /*! This performs specialization for the specific type for all types of archives.
+      This macro should be placed at the global namespace.
+
+      @code{cpp}
+      struct MyType {};
+      CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES( MyType, cereal::specialization::member_load_save );
+      @endcode
+
+      @relates specialize
+      @ingroup Access */
+  #define CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES( Type, Specialization )                                \
+  namespace cereal { template <class Archive> struct specialize<Archive, Type, Specialization> {}; }
+
+  //! Convenient macro for performing specialization for a single archive type
+  /*! This performs specialization for the specific type for a single type of archive.
+      This macro should be placed at the global namespace.
+
+      @code{cpp}
+      struct MyType {};
+      CEREAL_SPECIALIZE_FOR_ARCHIVE( cereal::XMLInputArchive, MyType, cereal::specialization::member_load_save );
+      @endcode
+
+      @relates specialize
+      @ingroup Access */
+  #define CEREAL_SPECIALIZE_FOR_ARCHIVE( Archive, Type, Specialization )               \
+  namespace cereal { template <> struct specialize<Archive, Type, Specialization> {}; }
+
+  // ######################################################################
+  // Deferred Implementation, see construct for more information
+  template <class T> template <class ... Args> inline
+  void construct<T>::operator()( Args && ... args )
+  {
+    if( itsValid )
+      throw Exception("Attempting to construct an already initialized object");
+
+    ::cereal::access::construct( itsPtr, std::forward<Args>( args )... );
+    itsEnableSharedRestoreFunction();
+    itsValid = true;
+  }
+} // namespace cereal
+
+#endif // CEREAL_ACCESS_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/adapters.hpp b/Src/External/cereal/include/cereal/archives/adapters.hpp
new file mode 100644
index 0000000..0191e32
--- /dev/null
+++ b/Src/External/cereal/include/cereal/archives/adapters.hpp
@@ -0,0 +1,163 @@
+/*! \file adapters.hpp
+    \brief Archive adapters that provide additional functionality
+           on top of an existing archive */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_ARCHIVES_ADAPTERS_HPP_
+#define CEREAL_ARCHIVES_ADAPTERS_HPP_
+
+#include "cereal/details/helpers.hpp"
+#include <utility>
+
+namespace cereal
+{
+  #ifdef CEREAL_FUTURE_EXPERIMENTAL
+
+  // Forward declaration for friend access
+  template <class U, class A> U & get_user_data( A & );
+
+  //! Wraps an archive and gives access to user data
+  /*! This adapter is useful if you require access to
+      either raw pointers or references within your
+      serialization functions.
+
+      While cereal does not directly support serialization
+      raw pointers or references, it is sometimes the case
+      that you may want to supply something such as a raw
+      pointer or global reference to some constructor.
+      In this situation this adapter would likely be used
+      with the construct class to allow for non-default
+      constructors.
+
+      @note This feature is experimental and may be altered or removed in a future release. See issue #46.
+
+      @code{.cpp}
+      struct MyUserData
+      {
+        int * myRawPointer;
+        std::reference_wrapper<MyOtherType> myReference;
+      };
+
+      struct MyClass
+      {
+        // Note the raw pointer parameter
+        MyClass( int xx, int * rawP );
+
+        int x;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        { ar( x ); }
+
+        template <class Archive>
+        static void load_and_construct( Archive & ar, cereal::construct<MyClass> & construct )
+        {
+          int xx;
+          ar( xx );
+          // note the need to use get_user_data to retrieve user data from the archive
+          construct( xx, cereal::get_user_data<MyUserData>( ar ).myRawPointer );
+        }
+      };
+
+      int main()
+      {
+        {
+          MyUserData md;
+          md.myRawPointer = &something;
+          md.myReference = someInstanceOfType;
+
+          std::ifstream is( "data.xml" );
+          cereal::UserDataAdapter<MyUserData, cereal::XMLInputArchive> ar( md, is );
+
+          std::unique_ptr<MyClass> sc;
+          ar( sc ); // use as normal
+        }
+
+        return 0;
+      }
+      @endcode
+
+      @relates get_user_data
+
+      @tparam UserData The type to give the archive access to
+      @tparam Archive The archive to wrap */
+  template <class UserData, class Archive>
+  class UserDataAdapter : public Archive
+  {
+    public:
+      //! Construct the archive with some user data struct
+      /*! This will forward all arguments (other than the user
+          data) to the wrapped archive type.  The UserDataAdapter
+          can then be used identically to the wrapped archive type
+
+          @tparam Args The arguments to pass to the constructor of
+                       the archive. */
+      template <class ... Args>
+      UserDataAdapter( UserData & ud, Args && ... args ) :
+        Archive( std::forward<Args>( args )... ),
+        userdata( ud )
+      { }
+
+    private:
+      //! Overload the rtti function to enable dynamic_cast
+      void rtti() {}
+      friend UserData & get_user_data<UserData>( Archive & ar );
+      UserData & userdata; //!< The actual user data
+  };
+
+  //! Retrieves user data from an archive wrapped by UserDataAdapter
+  /*! This will attempt to retrieve the user data associated with
+      some archive wrapped by UserDataAdapter.  If this is used on
+      an archive that is not wrapped, a run-time exception will occur.
+
+      @note This feature is experimental and may be altered or removed in a future release. See issue #46.
+
+      @note The correct use of this function cannot be enforced at compile
+            time.
+
+      @relates UserDataAdapter
+      @tparam UserData The data struct contained in the archive
+      @tparam Archive The archive, which should be wrapped by UserDataAdapter
+      @param ar The archive
+      @throws Exception if the archive this is used upon is not wrapped with
+                        UserDataAdapter. */
+  template <class UserData, class Archive>
+  UserData & get_user_data( Archive & ar )
+  {
+    try
+    {
+      return dynamic_cast<UserDataAdapter<UserData, Archive> &>( ar ).userdata;
+    }
+    catch( std::bad_cast const & )
+    {
+      throw ::cereal::Exception("Attempting to get user data from archive not wrapped in UserDataAdapter");
+    }
+  }
+  #endif // CEREAL_FUTURE_EXPERIMENTAL
+} // namespace cereal
+
+#endif // CEREAL_ARCHIVES_ADAPTERS_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/binary.hpp b/Src/External/cereal/include/cereal/archives/binary.hpp
new file mode 100644
index 0000000..7e00322
--- /dev/null
+++ b/Src/External/cereal/include/cereal/archives/binary.hpp
@@ -0,0 +1,169 @@
+/*! \file binary.hpp
+    \brief Binary input and output archives */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_ARCHIVES_BINARY_HPP_
+#define CEREAL_ARCHIVES_BINARY_HPP_
+
+#include "cereal/cereal.hpp"
+#include <sstream>
+
+namespace cereal
+{
+  // ######################################################################
+  //! An output archive designed to save data in a compact binary representation
+  /*! This archive outputs data to a stream in an extremely compact binary
+      representation with as little extra metadata as possible.
+
+      This archive does nothing to ensure that the endianness of the saved
+      and loaded data is the same.  If you need to have portability over
+      architectures with different endianness, use PortableBinaryOutputArchive.
+
+      When using a binary archive and a file stream, you must use the
+      std::ios::binary format flag to avoid having your data altered
+      inadvertently.
+
+      \ingroup Archives */
+  class BinaryOutputArchive : public OutputArchive<BinaryOutputArchive, AllowEmptyClassElision>
+  {
+    public:
+      //! Construct, outputting to the provided stream
+      /*! @param stream The stream to output to.  Can be a stringstream, a file stream, or
+                        even cout! */
+      BinaryOutputArchive(std::ostream & stream) :
+        OutputArchive<BinaryOutputArchive, AllowEmptyClassElision>(this),
+        itsStream(stream)
+      { }
+
+      ~BinaryOutputArchive() CEREAL_NOEXCEPT = default;
+
+      //! Writes size bytes of data to the output stream
+      void saveBinary( const void * data, std::size_t size )
+      {
+        auto const writtenSize = static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ), size ) );
+
+        if(writtenSize != size)
+          throw Exception("Failed to write " + std::to_string(size) + " bytes to output stream! Wrote " + std::to_string(writtenSize));
+      }
+
+    private:
+      std::ostream & itsStream;
+  };
+
+  // ######################################################################
+  //! An input archive designed to load data saved using BinaryOutputArchive
+  /*  This archive does nothing to ensure that the endianness of the saved
+      and loaded data is the same.  If you need to have portability over
+      architectures with different endianness, use PortableBinaryOutputArchive.
+
+      When using a binary archive and a file stream, you must use the
+      std::ios::binary format flag to avoid having your data altered
+      inadvertently.
+
+      \ingroup Archives */
+  class BinaryInputArchive : public InputArchive<BinaryInputArchive, AllowEmptyClassElision>
+  {
+    public:
+      //! Construct, loading from the provided stream
+      BinaryInputArchive(std::istream & stream) :
+        InputArchive<BinaryInputArchive, AllowEmptyClassElision>(this),
+        itsStream(stream)
+      { }
+
+      ~BinaryInputArchive() CEREAL_NOEXCEPT = default;
+
+      //! Reads size bytes of data from the input stream
+      void loadBinary( void * const data, std::size_t size )
+      {
+        auto const readSize = static_cast<std::size_t>( itsStream.rdbuf()->sgetn( reinterpret_cast<char*>( data ), size ) );
+
+        if(readSize != size)
+          throw Exception("Failed to read " + std::to_string(size) + " bytes from input stream! Read " + std::to_string(readSize));
+      }
+
+    private:
+      std::istream & itsStream;
+  };
+
+  // ######################################################################
+  // Common BinaryArchive serialization functions
+
+  //! Saving for POD types to binary
+  template<class T> inline
+  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME(BinaryOutputArchive & ar, T const & t)
+  {
+    ar.saveBinary(std::addressof(t), sizeof(t));
+  }
+
+  //! Loading for POD types from binary
+  template<class T> inline
+  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME(BinaryInputArchive & ar, T & t)
+  {
+    ar.loadBinary(std::addressof(t), sizeof(t));
+  }
+
+  //! Serializing NVP types to binary
+  template <class Archive, class T> inline
+  CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
+  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, NameValuePair<T> & t )
+  {
+    ar( t.value );
+  }
+
+  //! Serializing SizeTags to binary
+  template <class Archive, class T> inline
+  CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
+  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, SizeTag<T> & t )
+  {
+    ar( t.size );
+  }
+
+  //! Saving binary data
+  template <class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME(BinaryOutputArchive & ar, BinaryData<T> const & bd)
+  {
+    ar.saveBinary( bd.data, static_cast<std::size_t>( bd.size ) );
+  }
+
+  //! Loading binary data
+  template <class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME(BinaryInputArchive & ar, BinaryData<T> & bd)
+  {
+    ar.loadBinary(bd.data, static_cast<std::size_t>(bd.size));
+  }
+} // namespace cereal
+
+// register archives for polymorphic support
+CEREAL_REGISTER_ARCHIVE(cereal::BinaryOutputArchive)
+CEREAL_REGISTER_ARCHIVE(cereal::BinaryInputArchive)
+
+// tie input and output archives together
+CEREAL_SETUP_ARCHIVE_TRAITS(cereal::BinaryInputArchive, cereal::BinaryOutputArchive)
+
+#endif // CEREAL_ARCHIVES_BINARY_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/json.hpp b/Src/External/cereal/include/cereal/archives/json.hpp
new file mode 100644
index 0000000..9d57434
--- /dev/null
+++ b/Src/External/cereal/include/cereal/archives/json.hpp
@@ -0,0 +1,981 @@
+/*! \file json.hpp
+    \brief JSON input and output archives */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_ARCHIVES_JSON_HPP_
+#define CEREAL_ARCHIVES_JSON_HPP_
+
+#include "cereal/cereal.hpp"
+#include "cereal/details/util.hpp"
+
+namespace cereal
+{
+  //! An exception thrown when rapidjson fails an internal assertion
+  /*! @ingroup Utility */
+  struct RapidJSONException : Exception
+  { RapidJSONException( const char * what_ ) : Exception( what_ ) {} };
+}
+
+// Override rapidjson assertions to throw exceptions by default
+#ifndef CEREAL_RAPIDJSON_ASSERT
+#define CEREAL_RAPIDJSON_ASSERT(x) if(!(x)){ \
+  throw ::cereal::RapidJSONException("rapidjson internal assertion failure: " #x); }
+#endif // RAPIDJSON_ASSERT
+
+// Enable support for parsing of nan, inf, -inf
+#define CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNanAndInfFlag
+#define CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag | kParseNanAndInfFlag
+
+#include "cereal/external/rapidjson/prettywriter.h"
+#include "cereal/external/rapidjson/ostreamwrapper.h"
+#include "cereal/external/rapidjson/istreamwrapper.h"
+#include "cereal/external/rapidjson/document.h"
+#include "cereal/external/base64.hpp"
+
+#include <limits>
+#include <sstream>
+#include <stack>
+#include <vector>
+#include <string>
+
+namespace cereal
+{
+  // ######################################################################
+  //! An output archive designed to save data to JSON
+  /*! This archive uses RapidJSON to build serialize data to JSON.
+
+      JSON archives provides a human readable output but at decreased
+      performance (both in time and space) compared to binary archives.
+
+      JSON archives are only guaranteed to finish flushing their contents
+      upon destruction and should thus be used in an RAII fashion.
+
+      JSON benefits greatly from name-value pairs, which if present, will
+      name the nodes in the output.  If these are not present, each level
+      of the output will be given an automatically generated delimited name.
+
+      The precision of the output archive controls the number of decimals output
+      for floating point numbers and should be sufficiently large (i.e. at least 20)
+      if there is a desire to have binary equality between the numbers output and
+      those read in.  In general you should expect a loss of precision when going
+      from floating point to text and back.
+
+      JSON archives do not output the size information for any dynamically sized structure
+      and instead infer it from the number of children for a node.  This means that data
+      can be hand edited for dynamic sized structures and will still be readable.  This
+      is accomplished through the cereal::SizeTag object, which will cause the archive
+      to output the data as a JSON array (e.g. marked by [] instead of {}), which indicates
+      that the container is variable sized and may be edited.
+
+      \ingroup Archives */
+  class JSONOutputArchive : public OutputArchive<JSONOutputArchive>, public traits::TextArchive
+  {
+    enum class NodeType { StartObject, InObject, StartArray, InArray };
+
+    using WriteStream = CEREAL_RAPIDJSON_NAMESPACE::OStreamWrapper;
+    using JSONWriter = CEREAL_RAPIDJSON_NAMESPACE::PrettyWriter<WriteStream>;
+
+    public:
+      /*! @name Common Functionality
+          Common use cases for directly interacting with an JSONOutputArchive */
+      //! @{
+
+      //! A class containing various advanced options for the JSON archive
+      class Options
+      {
+        public:
+          //! Default options
+          static Options Default(){ return Options(); }
+
+          //! Default options with no indentation
+          static Options NoIndent(){ return Options( JSONWriter::kDefaultMaxDecimalPlaces, IndentChar::space, 0 ); }
+
+          //! The character to use for indenting
+          enum class IndentChar : char
+          {
+            space = ' ',
+            tab = '\t',
+            newline = '\n',
+            carriage_return = '\r'
+          };
+
+          //! Specify specific options for the JSONOutputArchive
+          /*! @param precision The precision used for floating point numbers
+              @param indentChar The type of character to indent with
+              @param indentLength The number of indentChar to use for indentation
+                             (0 corresponds to no indentation) */
+          explicit Options( int precision = JSONWriter::kDefaultMaxDecimalPlaces,
+                            IndentChar indentChar = IndentChar::space,
+                            unsigned int indentLength = 4 ) :
+            itsPrecision( precision ),
+            itsIndentChar( static_cast<char>(indentChar) ),
+            itsIndentLength( indentLength ) { }
+
+        private:
+          friend class JSONOutputArchive;
+          int itsPrecision;
+          char itsIndentChar;
+          unsigned int itsIndentLength;
+      };
+
+      //! Construct, outputting to the provided stream
+      /*! @param stream The stream to output to.
+          @param options The JSON specific options to use.  See the Options struct
+                         for the values of default parameters */
+      JSONOutputArchive(std::ostream & stream, Options const & options = Options::Default() ) :
+        OutputArchive<JSONOutputArchive>(this),
+        itsWriteStream(stream),
+        itsWriter(itsWriteStream),
+        itsNextName(nullptr)
+      {
+        itsWriter.SetMaxDecimalPlaces( options.itsPrecision );
+        itsWriter.SetIndent( options.itsIndentChar, options.itsIndentLength );
+        itsNameCounter.push(0);
+        itsNodeStack.push(NodeType::StartObject);
+      }
+
+      //! Destructor, flushes the JSON
+      ~JSONOutputArchive() CEREAL_NOEXCEPT
+      {
+        if (itsNodeStack.top() == NodeType::InObject)
+          itsWriter.EndObject();
+        else if (itsNodeStack.top() == NodeType::InArray)
+          itsWriter.EndArray();
+      }
+
+      //! Saves some binary data, encoded as a base64 string, with an optional name
+      /*! This will create a new node, optionally named, and insert a value that consists of
+          the data encoded as a base64 string */
+      void saveBinaryValue( const void * data, size_t size, const char * name = nullptr )
+      {
+        setNextName( name );
+        writeName();
+
+        auto base64string = base64::encode( reinterpret_cast<const unsigned char *>( data ), size );
+        saveValue( base64string );
+      };
+
+      //! @}
+      /*! @name Internal Functionality
+          Functionality designed for use by those requiring control over the inner mechanisms of
+          the JSONOutputArchive */
+      //! @{
+
+      //! Starts a new node in the JSON output
+      /*! The node can optionally be given a name by calling setNextName prior
+          to creating the node
+
+          Nodes only need to be started for types that are themselves objects or arrays */
+      void startNode()
+      {
+        writeName();
+        itsNodeStack.push(NodeType::StartObject);
+        itsNameCounter.push(0);
+      }
+
+      //! Designates the most recently added node as finished
+      void finishNode()
+      {
+        // if we ended up serializing an empty object or array, writeName
+        // will never have been called - so start and then immediately end
+        // the object/array.
+        //
+        // We'll also end any object/arrays we happen to be in
+        switch(itsNodeStack.top())
+        {
+          case NodeType::StartArray:
+            itsWriter.StartArray();
+          case NodeType::InArray:
+            itsWriter.EndArray();
+            break;
+          case NodeType::StartObject:
+            itsWriter.StartObject();
+          case NodeType::InObject:
+            itsWriter.EndObject();
+            break;
+        }
+
+        itsNodeStack.pop();
+        itsNameCounter.pop();
+      }
+
+      //! Sets the name for the next node created with startNode
+      void setNextName( const char * name )
+      {
+        itsNextName = name;
+      }
+
+      //! Saves a bool to the current node
+      void saveValue(bool b)                { itsWriter.Bool(b);                                                         }
+      //! Saves an int to the current node
+      void saveValue(int i)                 { itsWriter.Int(i);                                                          }
+      //! Saves a uint to the current node
+      void saveValue(unsigned u)            { itsWriter.Uint(u);                                                         }
+      //! Saves an int64 to the current node
+      void saveValue(int64_t i64)           { itsWriter.Int64(i64);                                                      }
+      //! Saves a uint64 to the current node
+      void saveValue(uint64_t u64)          { itsWriter.Uint64(u64);                                                     }
+      //! Saves a double to the current node
+      void saveValue(double d)              { itsWriter.Double(d);                                                       }
+      //! Saves a string to the current node
+      void saveValue(std::string const & s) { itsWriter.String(s.c_str(), static_cast<CEREAL_RAPIDJSON_NAMESPACE::SizeType>( s.size() )); }
+      //! Saves a const char * to the current node
+      void saveValue(char const * s)        { itsWriter.String(s);                                                       }
+      //! Saves a nullptr to the current node
+      void saveValue(std::nullptr_t)        { itsWriter.Null();                                                          }
+
+    private:
+      // Some compilers/OS have difficulty disambiguating the above for various flavors of longs, so we provide
+      // special overloads to handle these cases.
+
+      //! 32 bit signed long saving to current node
+      template <class T, traits::EnableIf<sizeof(T) == sizeof(std::int32_t),
+                                          std::is_signed<T>::value> = traits::sfinae> inline
+      void saveLong(T l){ saveValue( static_cast<std::int32_t>( l ) ); }
+
+      //! non 32 bit signed long saving to current node
+      template <class T, traits::EnableIf<sizeof(T) != sizeof(std::int32_t),
+                                          std::is_signed<T>::value> = traits::sfinae> inline
+      void saveLong(T l){ saveValue( static_cast<std::int64_t>( l ) ); }
+
+      //! 32 bit unsigned long saving to current node
+      template <class T, traits::EnableIf<sizeof(T) == sizeof(std::int32_t),
+                                          std::is_unsigned<T>::value> = traits::sfinae> inline
+      void saveLong(T lu){ saveValue( static_cast<std::uint32_t>( lu ) ); }
+
+      //! non 32 bit unsigned long saving to current node
+      template <class T, traits::EnableIf<sizeof(T) != sizeof(std::int32_t),
+                                          std::is_unsigned<T>::value> = traits::sfinae> inline
+      void saveLong(T lu){ saveValue( static_cast<std::uint64_t>( lu ) ); }
+
+    public:
+#ifdef _MSC_VER
+      //! MSVC only long overload to current node
+      void saveValue( unsigned long lu ){ saveLong( lu ); };
+#else // _MSC_VER
+      //! Serialize a long if it would not be caught otherwise
+      template <class T, traits::EnableIf<std::is_same<T, long>::value,
+                                          !std::is_same<T, std::int32_t>::value,
+                                          !std::is_same<T, std::int64_t>::value> = traits::sfinae> inline
+      void saveValue( T t ){ saveLong( t ); }
+
+      //! Serialize an unsigned long if it would not be caught otherwise
+      template <class T, traits::EnableIf<std::is_same<T, unsigned long>::value,
+                                          !std::is_same<T, std::uint32_t>::value,
+                                          !std::is_same<T, std::uint64_t>::value> = traits::sfinae> inline
+      void saveValue( T t ){ saveLong( t ); }
+#endif // _MSC_VER
+
+      //! Save exotic arithmetic as strings to current node
+      /*! Handles long long (if distinct from other types), unsigned long (if distinct), and long double */
+      template <class T, traits::EnableIf<std::is_arithmetic<T>::value,
+                                          !std::is_same<T, long>::value,
+                                          !std::is_same<T, unsigned long>::value,
+                                          !std::is_same<T, std::int64_t>::value,
+                                          !std::is_same<T, std::uint64_t>::value,
+                                          (sizeof(T) >= sizeof(long double) || sizeof(T) >= sizeof(long long))> = traits::sfinae> inline
+      void saveValue(T const & t)
+      {
+        std::stringstream ss; ss.precision( std::numeric_limits<long double>::max_digits10 );
+        ss << t;
+        saveValue( ss.str() );
+      }
+
+      //! Write the name of the upcoming node and prepare object/array state
+      /*! Since writeName is called for every value that is output, regardless of
+          whether it has a name or not, it is the place where we will do a deferred
+          check of our node state and decide whether we are in an array or an object.
+
+          The general workflow of saving to the JSON archive is:
+
+            1. (optional) Set the name for the next node to be created, usually done by an NVP
+            2. Start the node
+            3. (if there is data to save) Write the name of the node (this function)
+            4. (if there is data to save) Save the data (with saveValue)
+            5. Finish the node
+          */
+      void writeName()
+      {
+        NodeType const & nodeType = itsNodeStack.top();
+
+        // Start up either an object or an array, depending on state
+        if(nodeType == NodeType::StartArray)
+        {
+          itsWriter.StartArray();
+          itsNodeStack.top() = NodeType::InArray;
+        }
+        else if(nodeType == NodeType::StartObject)
+        {
+          itsNodeStack.top() = NodeType::InObject;
+          itsWriter.StartObject();
+        }
+
+        // Array types do not output names
+        if(nodeType == NodeType::InArray) return;
+
+        if(itsNextName == nullptr)
+        {
+          std::string name = "value" + std::to_string( itsNameCounter.top()++ ) + "\0";
+          saveValue(name);
+        }
+        else
+        {
+          saveValue(itsNextName);
+          itsNextName = nullptr;
+        }
+      }
+
+      //! Designates that the current node should be output as an array, not an object
+      void makeArray()
+      {
+        itsNodeStack.top() = NodeType::StartArray;
+      }
+
+      //! @}
+
+    private:
+      WriteStream itsWriteStream;          //!< Rapidjson write stream
+      JSONWriter itsWriter;                //!< Rapidjson writer
+      char const * itsNextName;            //!< The next name
+      std::stack<uint32_t> itsNameCounter; //!< Counter for creating unique names for unnamed nodes
+      std::stack<NodeType> itsNodeStack;
+  }; // JSONOutputArchive
+
+  // ######################################################################
+  //! An input archive designed to load data from JSON
+  /*! This archive uses RapidJSON to read in a JSON archive.
+
+      As with the output JSON archive, the preferred way to use this archive is in
+      an RAII fashion, ensuring its destruction after all data has been read.
+
+      Input JSON should have been produced by the JSONOutputArchive.  Data can
+      only be added to dynamically sized containers (marked by JSON arrays) -
+      the input archive will determine their size by looking at the number of child nodes.
+      Only JSON originating from a JSONOutputArchive is officially supported, but data
+      from other sources may work if properly formatted.
+
+      The JSONInputArchive does not require that nodes are loaded in the same
+      order they were saved by JSONOutputArchive.  Using name value pairs (NVPs),
+      it is possible to load in an out of order fashion or otherwise skip/select
+      specific nodes to load.
+
+      The default behavior of the input archive is to read sequentially starting
+      with the first node and exploring its children.  When a given NVP does
+      not match the read in name for a node, the archive will search for that
+      node at the current level and load it if it exists.  After loading an out of
+      order node, the archive will then proceed back to loading sequentially from
+      its new position.
+
+      Consider this simple example where loading of some data is skipped:
+
+      @code{cpp}
+      // imagine the input file has someData(1-9) saved in order at the top level node
+      ar( someData1, someData2, someData3 );        // XML loads in the order it sees in the file
+      ar( cereal::make_nvp( "hello", someData6 ) ); // NVP given does not
+                                                    // match expected NVP name, so we search
+                                                    // for the given NVP and load that value
+      ar( someData7, someData8, someData9 );        // with no NVP given, loading resumes at its
+                                                    // current location, proceeding sequentially
+      @endcode
+
+      \ingroup Archives */
+  class JSONInputArchive : public InputArchive<JSONInputArchive>, public traits::TextArchive
+  {
+    private:
+      using ReadStream = CEREAL_RAPIDJSON_NAMESPACE::IStreamWrapper;
+      typedef CEREAL_RAPIDJSON_NAMESPACE::GenericValue<CEREAL_RAPIDJSON_NAMESPACE::UTF8<>> JSONValue;
+      typedef JSONValue::ConstMemberIterator MemberIterator;
+      typedef JSONValue::ConstValueIterator ValueIterator;
+      typedef CEREAL_RAPIDJSON_NAMESPACE::Document::GenericValue GenericValue;
+
+    public:
+      /*! @name Common Functionality
+          Common use cases for directly interacting with an JSONInputArchive */
+      //! @{
+
+      //! Construct, reading from the provided stream
+      /*! @param stream The stream to read from */
+      JSONInputArchive(std::istream & stream) :
+        InputArchive<JSONInputArchive>(this),
+        itsNextName( nullptr ),
+        itsReadStream(stream)
+      {
+        itsDocument.ParseStream<>(itsReadStream);
+        if (itsDocument.IsArray())
+          itsIteratorStack.emplace_back(itsDocument.Begin(), itsDocument.End());
+        else
+          itsIteratorStack.emplace_back(itsDocument.MemberBegin(), itsDocument.MemberEnd());
+      }
+
+      ~JSONInputArchive() CEREAL_NOEXCEPT = default;
+
+      //! Loads some binary data, encoded as a base64 string
+      /*! This will automatically start and finish a node to load the data, and can be called directly by
+          users.
+
+          Note that this follows the same ordering rules specified in the class description in regards
+          to loading in/out of order */
+      void loadBinaryValue( void * data, size_t size, const char * name = nullptr )
+      {
+        itsNextName = name;
+
+        std::string encoded;
+        loadValue( encoded );
+        auto decoded = base64::decode( encoded );
+
+        if( size != decoded.size() )
+          throw Exception("Decoded binary data size does not match specified size");
+
+        std::memcpy( data, decoded.data(), decoded.size() );
+        itsNextName = nullptr;
+      };
+
+    private:
+      //! @}
+      /*! @name Internal Functionality
+          Functionality designed for use by those requiring control over the inner mechanisms of
+          the JSONInputArchive */
+      //! @{
+
+      //! An internal iterator that handles both array and object types
+      /*! This class is a variant and holds both types of iterators that
+          rapidJSON supports - one for arrays and one for objects. */
+      class Iterator
+      {
+        public:
+          Iterator() : itsIndex( 0 ), itsType(Null_) {}
+
+          Iterator(MemberIterator begin, MemberIterator end) :
+            itsMemberItBegin(begin), itsMemberItEnd(end), itsIndex(0), itsType(Member)
+          {
+            if( std::distance( begin, end ) == 0 )
+              itsType = Null_;
+          }
+
+          Iterator(ValueIterator begin, ValueIterator end) :
+            itsValueItBegin(begin), itsValueItEnd(end), itsIndex(0), itsType(Value)
+          {
+            if( std::distance( begin, end ) == 0 )
+              itsType = Null_;
+          }
+
+          //! Advance to the next node
+          Iterator & operator++()
+          {
+            ++itsIndex;
+            return *this;
+          }
+
+          //! Get the value of the current node
+          GenericValue const & value()
+          {
+            switch(itsType)
+            {
+              case Value : return itsValueItBegin[itsIndex];
+              case Member: return itsMemberItBegin[itsIndex].value;
+              default: throw cereal::Exception("JSONInputArchive internal error: null or empty iterator to object or array!");
+            }
+          }
+
+          //! Get the name of the current node, or nullptr if it has no name
+          const char * name() const
+          {
+            if( itsType == Member && (itsMemberItBegin + itsIndex) != itsMemberItEnd )
+              return itsMemberItBegin[itsIndex].name.GetString();
+            else
+              return nullptr;
+          }
+
+          //! Adjust our position such that we are at the node with the given name
+          /*! @throws Exception if no such named node exists */
+          inline void search( const char * searchName )
+          {
+            const auto len = std::strlen( searchName );
+            size_t index = 0;
+            for( auto it = itsMemberItBegin; it != itsMemberItEnd; ++it, ++index )
+            {
+              const auto currentName = it->name.GetString();
+              if( ( std::strncmp( searchName, currentName, len ) == 0 ) &&
+                  ( std::strlen( currentName ) == len ) )
+              {
+                itsIndex = index;
+                return;
+              }
+            }
+
+            throw Exception("JSON Parsing failed - provided NVP (" + std::string(searchName) + ") not found");
+          }
+
+        private:
+          MemberIterator itsMemberItBegin, itsMemberItEnd; //!< The member iterator (object)
+          ValueIterator itsValueItBegin, itsValueItEnd;    //!< The value iterator (array)
+          size_t itsIndex;                                 //!< The current index of this iterator
+          enum Type {Value, Member, Null_} itsType;        //!< Whether this holds values (array) or members (objects) or nothing
+      };
+
+      //! Searches for the expectedName node if it doesn't match the actualName
+      /*! This needs to be called before every load or node start occurs.  This function will
+          check to see if an NVP has been provided (with setNextName) and if so, see if that name matches the actual
+          next name given.  If the names do not match, it will search in the current level of the JSON for that name.
+          If the name is not found, an exception will be thrown.
+
+          Resets the NVP name after called.
+
+          @throws Exception if an expectedName is given and not found */
+      inline void search()
+      {
+        // The name an NVP provided with setNextName()
+        if( itsNextName )
+        {
+          // The actual name of the current node
+          auto const actualName = itsIteratorStack.back().name();
+
+          // Do a search if we don't see a name coming up, or if the names don't match
+          if( !actualName || std::strcmp( itsNextName, actualName ) != 0 )
+            itsIteratorStack.back().search( itsNextName );
+        }
+
+        itsNextName = nullptr;
+      }
+
+    public:
+      //! Starts a new node, going into its proper iterator
+      /*! This places an iterator for the next node to be parsed onto the iterator stack.  If the next
+          node is an array, this will be a value iterator, otherwise it will be a member iterator.
+
+          By default our strategy is to start with the document root node and then recursively iterate through
+          all children in the order they show up in the document.
+          We don't need to know NVPs to do this; we'll just blindly load in the order things appear in.
+
+          If we were given an NVP, we will search for it if it does not match our the name of the next node
+          that would normally be loaded.  This functionality is provided by search(). */
+      void startNode()
+      {
+        search();
+
+        if(itsIteratorStack.back().value().IsArray())
+          itsIteratorStack.emplace_back(itsIteratorStack.back().value().Begin(), itsIteratorStack.back().value().End());
+        else
+          itsIteratorStack.emplace_back(itsIteratorStack.back().value().MemberBegin(), itsIteratorStack.back().value().MemberEnd());
+      }
+
+      //! Finishes the most recently started node
+      void finishNode()
+      {
+        itsIteratorStack.pop_back();
+        ++itsIteratorStack.back();
+      }
+
+      //! Retrieves the current node name
+      /*! @return nullptr if no name exists */
+      const char * getNodeName() const
+      {
+        return itsIteratorStack.back().name();
+      }
+
+      //! Sets the name for the next node created with startNode
+      void setNextName( const char * name )
+      {
+        itsNextName = name;
+      }
+
+      //! Loads a value from the current node - small signed overload
+      template <class T, traits::EnableIf<std::is_signed<T>::value,
+                                          sizeof(T) < sizeof(int64_t)> = traits::sfinae> inline
+      void loadValue(T & val)
+      {
+        search();
+
+        val = static_cast<T>( itsIteratorStack.back().value().GetInt() );
+        ++itsIteratorStack.back();
+      }
+
+      //! Loads a value from the current node - small unsigned overload
+      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
+                                          sizeof(T) < sizeof(uint64_t),
+                                          !std::is_same<bool, T>::value> = traits::sfinae> inline
+      void loadValue(T & val)
+      {
+        search();
+
+        val = static_cast<T>( itsIteratorStack.back().value().GetUint() );
+        ++itsIteratorStack.back();
+      }
+
+      //! Loads a value from the current node - bool overload
+      void loadValue(bool & val)        { search(); val = itsIteratorStack.back().value().GetBool(); ++itsIteratorStack.back(); }
+      //! Loads a value from the current node - int64 overload
+      void loadValue(int64_t & val)     { search(); val = itsIteratorStack.back().value().GetInt64(); ++itsIteratorStack.back(); }
+      //! Loads a value from the current node - uint64 overload
+      void loadValue(uint64_t & val)    { search(); val = itsIteratorStack.back().value().GetUint64(); ++itsIteratorStack.back(); }
+      //! Loads a value from the current node - float overload
+      void loadValue(float & val)       { search(); val = static_cast<float>(itsIteratorStack.back().value().GetDouble()); ++itsIteratorStack.back(); }
+      //! Loads a value from the current node - double overload
+      void loadValue(double & val)      { search(); val = itsIteratorStack.back().value().GetDouble(); ++itsIteratorStack.back(); }
+      //! Loads a value from the current node - string overload
+      void loadValue(std::string & val) { search(); val = itsIteratorStack.back().value().GetString(); ++itsIteratorStack.back(); }
+      //! Loads a nullptr from the current node
+      void loadValue(std::nullptr_t&)   { search(); CEREAL_RAPIDJSON_ASSERT(itsIteratorStack.back().value().IsNull()); ++itsIteratorStack.back(); }
+
+      // Special cases to handle various flavors of long, which tend to conflict with
+      // the int32_t or int64_t on various compiler/OS combinations.  MSVC doesn't need any of this.
+      #ifndef _MSC_VER
+    private:
+      //! 32 bit signed long loading from current node
+      template <class T> inline
+      typename std::enable_if<sizeof(T) == sizeof(std::int32_t) && std::is_signed<T>::value, void>::type
+      loadLong(T & l){ loadValue( reinterpret_cast<std::int32_t&>( l ) ); }
+
+      //! non 32 bit signed long loading from current node
+      template <class T> inline
+      typename std::enable_if<sizeof(T) == sizeof(std::int64_t) && std::is_signed<T>::value, void>::type
+      loadLong(T & l){ loadValue( reinterpret_cast<std::int64_t&>( l ) ); }
+
+      //! 32 bit unsigned long loading from current node
+      template <class T> inline
+      typename std::enable_if<sizeof(T) == sizeof(std::uint32_t) && !std::is_signed<T>::value, void>::type
+      loadLong(T & lu){ loadValue( reinterpret_cast<std::uint32_t&>( lu ) ); }
+
+      //! non 32 bit unsigned long loading from current node
+      template <class T> inline
+      typename std::enable_if<sizeof(T) == sizeof(std::uint64_t) && !std::is_signed<T>::value, void>::type
+      loadLong(T & lu){ loadValue( reinterpret_cast<std::uint64_t&>( lu ) ); }
+
+    public:
+      //! Serialize a long if it would not be caught otherwise
+      template <class T> inline
+      typename std::enable_if<std::is_same<T, long>::value &&
+                              sizeof(T) >= sizeof(std::int64_t) &&
+                              !std::is_same<T, std::int64_t>::value, void>::type
+      loadValue( T & t ){ loadLong(t); }
+
+      //! Serialize an unsigned long if it would not be caught otherwise
+      template <class T> inline
+      typename std::enable_if<std::is_same<T, unsigned long>::value &&
+                              sizeof(T) >= sizeof(std::uint64_t) &&
+                              !std::is_same<T, std::uint64_t>::value, void>::type
+      loadValue( T & t ){ loadLong(t); }
+      #endif // _MSC_VER
+
+    private:
+      //! Convert a string to a long long
+      void stringToNumber( std::string const & str, long long & val ) { val = std::stoll( str ); }
+      //! Convert a string to an unsigned long long
+      void stringToNumber( std::string const & str, unsigned long long & val ) { val = std::stoull( str ); }
+      //! Convert a string to a long double
+      void stringToNumber( std::string const & str, long double & val ) { val = std::stold( str ); }
+
+    public:
+      //! Loads a value from the current node - long double and long long overloads
+      template <class T, traits::EnableIf<std::is_arithmetic<T>::value,
+                                          !std::is_same<T, long>::value,
+                                          !std::is_same<T, unsigned long>::value,
+                                          !std::is_same<T, std::int64_t>::value,
+                                          !std::is_same<T, std::uint64_t>::value,
+                                          (sizeof(T) >= sizeof(long double) || sizeof(T) >= sizeof(long long))> = traits::sfinae>
+      inline void loadValue(T & val)
+      {
+        std::string encoded;
+        loadValue( encoded );
+        stringToNumber( encoded, val );
+      }
+
+      //! Loads the size for a SizeTag
+      void loadSize(size_type & size)
+      {
+        if (itsIteratorStack.size() == 1)
+          size = itsDocument.Size();
+        else
+          size = (itsIteratorStack.rbegin() + 1)->value().Size();
+      }
+
+      //! @}
+
+    private:
+      const char * itsNextName;               //!< Next name set by NVP
+      ReadStream itsReadStream;               //!< Rapidjson write stream
+      std::vector<Iterator> itsIteratorStack; //!< 'Stack' of rapidJSON iterators
+      CEREAL_RAPIDJSON_NAMESPACE::Document itsDocument; //!< Rapidjson document
+  };
+
+  // ######################################################################
+  // JSONArchive prologue and epilogue functions
+  // ######################################################################
+
+  // ######################################################################
+  //! Prologue for NVPs for JSON archives
+  /*! NVPs do not start or finish nodes - they just set up the names */
+  template <class T> inline
+  void prologue( JSONOutputArchive &, NameValuePair<T> const & )
+  { }
+
+  //! Prologue for NVPs for JSON archives
+  template <class T> inline
+  void prologue( JSONInputArchive &, NameValuePair<T> const & )
+  { }
+
+  // ######################################################################
+  //! Epilogue for NVPs for JSON archives
+  /*! NVPs do not start or finish nodes - they just set up the names */
+  template <class T> inline
+  void epilogue( JSONOutputArchive &, NameValuePair<T> const & )
+  { }
+
+  //! Epilogue for NVPs for JSON archives
+  /*! NVPs do not start or finish nodes - they just set up the names */
+  template <class T> inline
+  void epilogue( JSONInputArchive &, NameValuePair<T> const & )
+  { }
+
+  // ######################################################################
+  //! Prologue for SizeTags for JSON archives
+  /*! SizeTags are strictly ignored for JSON, they just indicate
+      that the current node should be made into an array */
+  template <class T> inline
+  void prologue( JSONOutputArchive & ar, SizeTag<T> const & )
+  {
+    ar.makeArray();
+  }
+
+  //! Prologue for SizeTags for JSON archives
+  template <class T> inline
+  void prologue( JSONInputArchive &, SizeTag<T> const & )
+  { }
+
+  // ######################################################################
+  //! Epilogue for SizeTags for JSON archives
+  /*! SizeTags are strictly ignored for JSON */
+  template <class T> inline
+  void epilogue( JSONOutputArchive &, SizeTag<T> const & )
+  { }
+
+  //! Epilogue for SizeTags for JSON archives
+  template <class T> inline
+  void epilogue( JSONInputArchive &, SizeTag<T> const & )
+  { }
+
+  // ######################################################################
+  //! Prologue for all other types for JSON archives (except minimal types)
+  /*! Starts a new node, named either automatically or by some NVP,
+      that may be given data by the type about to be archived
+
+      Minimal types do not start or finish nodes */
+  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
+                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, JSONOutputArchive>::value,
+                                      !traits::has_minimal_output_serialization<T, JSONOutputArchive>::value> = traits::sfinae>
+  inline void prologue( JSONOutputArchive & ar, T const & )
+  {
+    ar.startNode();
+  }
+
+  //! Prologue for all other types for JSON archives
+  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
+                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, JSONInputArchive>::value,
+                                      !traits::has_minimal_input_serialization<T, JSONInputArchive>::value> = traits::sfinae>
+  inline void prologue( JSONInputArchive & ar, T const & )
+  {
+    ar.startNode();
+  }
+
+  // ######################################################################
+  //! Epilogue for all other types other for JSON archives (except minimal types)
+  /*! Finishes the node created in the prologue
+
+      Minimal types do not start or finish nodes */
+  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
+                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, JSONOutputArchive>::value,
+                                      !traits::has_minimal_output_serialization<T, JSONOutputArchive>::value> = traits::sfinae>
+  inline void epilogue( JSONOutputArchive & ar, T const & )
+  {
+    ar.finishNode();
+  }
+
+  //! Epilogue for all other types other for JSON archives
+  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
+                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, JSONInputArchive>::value,
+                                      !traits::has_minimal_input_serialization<T, JSONInputArchive>::value> = traits::sfinae>
+  inline void epilogue( JSONInputArchive & ar, T const & )
+  {
+    ar.finishNode();
+  }
+
+  // ######################################################################
+  //! Prologue for arithmetic types for JSON archives
+  inline
+  void prologue( JSONOutputArchive & ar, std::nullptr_t const & )
+  {
+    ar.writeName();
+  }
+
+  //! Prologue for arithmetic types for JSON archives
+  inline
+  void prologue( JSONInputArchive &, std::nullptr_t const & )
+  { }
+
+  // ######################################################################
+  //! Epilogue for arithmetic types for JSON archives
+  inline
+  void epilogue( JSONOutputArchive &, std::nullptr_t const & )
+  { }
+
+  //! Epilogue for arithmetic types for JSON archives
+  inline
+  void epilogue( JSONInputArchive &, std::nullptr_t const & )
+  { }
+
+  // ######################################################################
+  //! Prologue for arithmetic types for JSON archives
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void prologue( JSONOutputArchive & ar, T const & )
+  {
+    ar.writeName();
+  }
+
+  //! Prologue for arithmetic types for JSON archives
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void prologue( JSONInputArchive &, T const & )
+  { }
+
+  // ######################################################################
+  //! Epilogue for arithmetic types for JSON archives
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void epilogue( JSONOutputArchive &, T const & )
+  { }
+
+  //! Epilogue for arithmetic types for JSON archives
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void epilogue( JSONInputArchive &, T const & )
+  { }
+
+  // ######################################################################
+  //! Prologue for strings for JSON archives
+  template<class CharT, class Traits, class Alloc> inline
+  void prologue(JSONOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const &)
+  {
+    ar.writeName();
+  }
+
+  //! Prologue for strings for JSON archives
+  template<class CharT, class Traits, class Alloc> inline
+  void prologue(JSONInputArchive &, std::basic_string<CharT, Traits, Alloc> const &)
+  { }
+
+  // ######################################################################
+  //! Epilogue for strings for JSON archives
+  template<class CharT, class Traits, class Alloc> inline
+  void epilogue(JSONOutputArchive &, std::basic_string<CharT, Traits, Alloc> const &)
+  { }
+
+  //! Epilogue for strings for JSON archives
+  template<class CharT, class Traits, class Alloc> inline
+  void epilogue(JSONInputArchive &, std::basic_string<CharT, Traits, Alloc> const &)
+  { }
+
+  // ######################################################################
+  // Common JSONArchive serialization functions
+  // ######################################################################
+  //! Serializing NVP types to JSON
+  template <class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME( JSONOutputArchive & ar, NameValuePair<T> const & t )
+  {
+    ar.setNextName( t.name );
+    ar( t.value );
+  }
+
+  template <class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME( JSONInputArchive & ar, NameValuePair<T> & t )
+  {
+    ar.setNextName( t.name );
+    ar( t.value );
+  }
+
+  //! Saving for nullptr to JSON
+  inline
+  void CEREAL_SAVE_FUNCTION_NAME(JSONOutputArchive & ar, std::nullptr_t const & t)
+  {
+    ar.saveValue( t );
+  }
+
+  //! Loading arithmetic from JSON
+  inline
+  void CEREAL_LOAD_FUNCTION_NAME(JSONInputArchive & ar, std::nullptr_t & t)
+  {
+    ar.loadValue( t );
+  }
+
+  //! Saving for arithmetic to JSON
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void CEREAL_SAVE_FUNCTION_NAME(JSONOutputArchive & ar, T const & t)
+  {
+    ar.saveValue( t );
+  }
+
+  //! Loading arithmetic from JSON
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void CEREAL_LOAD_FUNCTION_NAME(JSONInputArchive & ar, T & t)
+  {
+    ar.loadValue( t );
+  }
+
+  //! saving string to JSON
+  template<class CharT, class Traits, class Alloc> inline
+  void CEREAL_SAVE_FUNCTION_NAME(JSONOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
+  {
+    ar.saveValue( str );
+  }
+
+  //! loading string from JSON
+  template<class CharT, class Traits, class Alloc> inline
+  void CEREAL_LOAD_FUNCTION_NAME(JSONInputArchive & ar, std::basic_string<CharT, Traits, Alloc> & str)
+  {
+    ar.loadValue( str );
+  }
+
+  // ######################################################################
+  //! Saving SizeTags to JSON
+  template <class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME( JSONOutputArchive &, SizeTag<T> const & )
+  {
+    // nothing to do here, we don't explicitly save the size
+  }
+
+  //! Loading SizeTags from JSON
+  template <class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME( JSONInputArchive & ar, SizeTag<T> & st )
+  {
+    ar.loadSize( st.size );
+  }
+} // namespace cereal
+
+// register archives for polymorphic support
+CEREAL_REGISTER_ARCHIVE(cereal::JSONInputArchive)
+CEREAL_REGISTER_ARCHIVE(cereal::JSONOutputArchive)
+
+// tie input and output archives together
+CEREAL_SETUP_ARCHIVE_TRAITS(cereal::JSONInputArchive, cereal::JSONOutputArchive)
+
+#endif // CEREAL_ARCHIVES_JSON_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/portable_binary.hpp b/Src/External/cereal/include/cereal/archives/portable_binary.hpp
new file mode 100644
index 0000000..76e634b
--- /dev/null
+++ b/Src/External/cereal/include/cereal/archives/portable_binary.hpp
@@ -0,0 +1,334 @@
+/*! \file binary.hpp
+    \brief Binary input and output archives */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_ARCHIVES_PORTABLE_BINARY_HPP_
+#define CEREAL_ARCHIVES_PORTABLE_BINARY_HPP_
+
+#include "cereal/cereal.hpp"
+#include <sstream>
+#include <limits>
+
+namespace cereal
+{
+  namespace portable_binary_detail
+  {
+    //! Returns true if the current machine is little endian
+    /*! @ingroup Internal */
+    inline std::uint8_t is_little_endian()
+    {
+      static std::int32_t test = 1;
+      return *reinterpret_cast<std::int8_t*>( &test ) == 1;
+    }
+
+    //! Swaps the order of bytes for some chunk of memory
+    /*! @param data The data as a uint8_t pointer
+        @tparam DataSize The true size of the data
+        @ingroup Internal */
+    template <std::size_t DataSize>
+    inline void swap_bytes( std::uint8_t * data )
+    {
+      for( std::size_t i = 0, end = DataSize / 2; i < end; ++i )
+        std::swap( data[i], data[DataSize - i - 1] );
+    }
+  } // end namespace portable_binary_detail
+
+  // ######################################################################
+  //! An output archive designed to save data in a compact binary representation portable over different architectures
+  /*! This archive outputs data to a stream in an extremely compact binary
+      representation with as little extra metadata as possible.
+
+      This archive will record the endianness of the data as well as the desired in/out endianness
+      and assuming that the user takes care of ensuring serialized types are the same size
+      across machines, is portable over different architectures.
+
+      When using a binary archive and a file stream, you must use the
+      std::ios::binary format flag to avoid having your data altered
+      inadvertently.
+
+      \warning This archive has not been thoroughly tested across different architectures.
+               Please report any issues, optimizations, or feature requests at
+               <a href="www.github.com/USCiLab/cereal">the project github</a>.
+
+    \ingroup Archives */
+  class PortableBinaryOutputArchive : public OutputArchive<PortableBinaryOutputArchive, AllowEmptyClassElision>
+  {
+    public:
+      //! A class containing various advanced options for the PortableBinaryOutput archive
+      class Options
+      {
+        public:
+          //! Represents desired endianness
+          enum class Endianness : std::uint8_t
+          { big, little };
+
+          //! Default options, preserve system endianness
+          static Options Default(){ return Options(); }
+
+          //! Save as little endian
+          static Options LittleEndian(){ return Options( Endianness::little ); }
+
+          //! Save as big endian
+          static Options BigEndian(){ return Options( Endianness::big ); }
+
+          //! Specify specific options for the PortableBinaryOutputArchive
+          /*! @param outputEndian The desired endianness of saved (output) data */
+          explicit Options( Endianness outputEndian = getEndianness() ) :
+            itsOutputEndianness( outputEndian ) { }
+
+        private:
+          //! Gets the endianness of the system
+          inline static Endianness getEndianness()
+          { return portable_binary_detail::is_little_endian() ? Endianness::little : Endianness::big; }
+
+          //! Checks if Options is set for little endian
+          inline std::uint8_t is_little_endian() const
+          { return itsOutputEndianness == Endianness::little; }
+
+          friend class PortableBinaryOutputArchive;
+          Endianness itsOutputEndianness;
+      };
+
+      //! Construct, outputting to the provided stream
+      /*! @param stream The stream to output to. Should be opened with std::ios::binary flag.
+          @param options The PortableBinary specific options to use.  See the Options struct
+                         for the values of default parameters */
+      PortableBinaryOutputArchive(std::ostream & stream, Options const & options = Options::Default()) :
+        OutputArchive<PortableBinaryOutputArchive, AllowEmptyClassElision>(this),
+        itsStream(stream),
+        itsConvertEndianness( portable_binary_detail::is_little_endian() ^ options.is_little_endian() )
+      {
+        this->operator()( options.is_little_endian() );
+      }
+
+      ~PortableBinaryOutputArchive() CEREAL_NOEXCEPT = default;
+
+      //! Writes size bytes of data to the output stream
+      template <std::size_t DataSize> inline
+      void saveBinary( const void * data, std::size_t size )
+      {
+        std::size_t writtenSize = 0;
+
+        if( itsConvertEndianness )
+        {
+          for( std::size_t i = 0; i < size; i += DataSize )
+            for( std::size_t j = 0; j < DataSize; ++j )
+              writtenSize += static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ) + DataSize - j - 1 + i, 1 ) );
+        }
+        else
+          writtenSize = static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ), size ) );
+
+        if(writtenSize != size)
+          throw Exception("Failed to write " + std::to_string(size) + " bytes to output stream! Wrote " + std::to_string(writtenSize));
+      }
+
+    private:
+      std::ostream & itsStream;
+      const uint8_t itsConvertEndianness; //!< If set to true, we will need to swap bytes upon saving
+  };
+
+  // ######################################################################
+  //! An input archive designed to load data saved using PortableBinaryOutputArchive
+  /*! This archive outputs data to a stream in an extremely compact binary
+      representation with as little extra metadata as possible.
+
+      This archive will load the endianness of the serialized data and
+      if necessary transform it to match that of the local machine.  This comes
+      at a significant performance cost compared to non portable archives if
+      the transformation is necessary, and also causes a small performance hit
+      even if it is not necessary.
+
+      It is recommended to use portable archives only if you know that you will
+      be sending binary data to machines with different endianness.
+
+      The archive will do nothing to ensure types are the same size - that is
+      the responsibility of the user.
+
+      When using a binary archive and a file stream, you must use the
+      std::ios::binary format flag to avoid having your data altered
+      inadvertently.
+
+      \warning This archive has not been thoroughly tested across different architectures.
+               Please report any issues, optimizations, or feature requests at
+               <a href="www.github.com/USCiLab/cereal">the project github</a>.
+
+    \ingroup Archives */
+  class PortableBinaryInputArchive : public InputArchive<PortableBinaryInputArchive, AllowEmptyClassElision>
+  {
+    public:
+      //! A class containing various advanced options for the PortableBinaryInput archive
+      class Options
+      {
+        public:
+          //! Represents desired endianness
+          enum class Endianness : std::uint8_t
+          { big, little };
+
+          //! Default options, preserve system endianness
+          static Options Default(){ return Options(); }
+
+          //! Load into little endian
+          static Options LittleEndian(){ return Options( Endianness::little ); }
+
+          //! Load into big endian
+          static Options BigEndian(){ return Options( Endianness::big ); }
+
+          //! Specify specific options for the PortableBinaryInputArchive
+          /*! @param inputEndian The desired endianness of loaded (input) data */
+          explicit Options( Endianness inputEndian = getEndianness() ) :
+            itsInputEndianness( inputEndian ) { }
+
+        private:
+          //! Gets the endianness of the system
+          inline static Endianness getEndianness()
+          { return portable_binary_detail::is_little_endian() ? Endianness::little : Endianness::big; }
+
+          //! Checks if Options is set for little endian
+          inline std::uint8_t is_little_endian() const
+          { return itsInputEndianness == Endianness::little; }
+
+          friend class PortableBinaryInputArchive;
+          Endianness itsInputEndianness;
+      };
+
+      //! Construct, loading from the provided stream
+      /*! @param stream The stream to read from. Should be opened with std::ios::binary flag.
+          @param options The PortableBinary specific options to use.  See the Options struct
+                         for the values of default parameters */
+      PortableBinaryInputArchive(std::istream & stream, Options const & options = Options::Default()) :
+        InputArchive<PortableBinaryInputArchive, AllowEmptyClassElision>(this),
+        itsStream(stream),
+        itsConvertEndianness( false )
+      {
+        uint8_t streamLittleEndian;
+        this->operator()( streamLittleEndian );
+        itsConvertEndianness = options.is_little_endian() ^ streamLittleEndian;
+      }
+
+      ~PortableBinaryInputArchive() CEREAL_NOEXCEPT = default;
+
+      //! Reads size bytes of data from the input stream
+      /*! @param data The data to save
+          @param size The number of bytes in the data
+          @tparam DataSize T The size of the actual type of the data elements being loaded */
+      template <std::size_t DataSize> inline
+      void loadBinary( void * const data, std::size_t size )
+      {
+        // load data
+        auto const readSize = static_cast<std::size_t>( itsStream.rdbuf()->sgetn( reinterpret_cast<char*>( data ), size ) );
+
+        if(readSize != size)
+          throw Exception("Failed to read " + std::to_string(size) + " bytes from input stream! Read " + std::to_string(readSize));
+
+        // flip bits if needed
+        if( itsConvertEndianness )
+        {
+          std::uint8_t * ptr = reinterpret_cast<std::uint8_t*>( data );
+          for( std::size_t i = 0; i < size; i += DataSize )
+            portable_binary_detail::swap_bytes<DataSize>( ptr + i );
+        }
+      }
+
+    private:
+      std::istream & itsStream;
+      uint8_t itsConvertEndianness; //!< If set to true, we will need to swap bytes upon loading
+  };
+
+  // ######################################################################
+  // Common BinaryArchive serialization functions
+
+  //! Saving for POD types to portable binary
+  template<class T> inline
+  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME(PortableBinaryOutputArchive & ar, T const & t)
+  {
+    static_assert( !std::is_floating_point<T>::value ||
+                   (std::is_floating_point<T>::value && std::numeric_limits<T>::is_iec559),
+                   "Portable binary only supports IEEE 754 standardized floating point" );
+    ar.template saveBinary<sizeof(T)>(std::addressof(t), sizeof(t));
+  }
+
+  //! Loading for POD types from portable binary
+  template<class T> inline
+  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME(PortableBinaryInputArchive & ar, T & t)
+  {
+    static_assert( !std::is_floating_point<T>::value ||
+                   (std::is_floating_point<T>::value && std::numeric_limits<T>::is_iec559),
+                   "Portable binary only supports IEEE 754 standardized floating point" );
+    ar.template loadBinary<sizeof(T)>(std::addressof(t), sizeof(t));
+  }
+
+  //! Serializing NVP types to portable binary
+  template <class Archive, class T> inline
+  CEREAL_ARCHIVE_RESTRICT(PortableBinaryInputArchive, PortableBinaryOutputArchive)
+  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, NameValuePair<T> & t )
+  {
+    ar( t.value );
+  }
+
+  //! Serializing SizeTags to portable binary
+  template <class Archive, class T> inline
+  CEREAL_ARCHIVE_RESTRICT(PortableBinaryInputArchive, PortableBinaryOutputArchive)
+  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, SizeTag<T> & t )
+  {
+    ar( t.size );
+  }
+
+  //! Saving binary data to portable binary
+  template <class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME(PortableBinaryOutputArchive & ar, BinaryData<T> const & bd)
+  {
+    typedef typename std::remove_pointer<T>::type TT;
+    static_assert( !std::is_floating_point<TT>::value ||
+                   (std::is_floating_point<TT>::value && std::numeric_limits<TT>::is_iec559),
+                   "Portable binary only supports IEEE 754 standardized floating point" );
+
+    ar.template saveBinary<sizeof(TT)>( bd.data, static_cast<std::size_t>( bd.size ) );
+  }
+
+  //! Loading binary data from portable binary
+  template <class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME(PortableBinaryInputArchive & ar, BinaryData<T> & bd)
+  {
+    typedef typename std::remove_pointer<T>::type TT;
+    static_assert( !std::is_floating_point<TT>::value ||
+                   (std::is_floating_point<TT>::value && std::numeric_limits<TT>::is_iec559),
+                   "Portable binary only supports IEEE 754 standardized floating point" );
+
+    ar.template loadBinary<sizeof(TT)>( bd.data, static_cast<std::size_t>( bd.size ) );
+  }
+} // namespace cereal
+
+// register archives for polymorphic support
+CEREAL_REGISTER_ARCHIVE(cereal::PortableBinaryOutputArchive)
+CEREAL_REGISTER_ARCHIVE(cereal::PortableBinaryInputArchive)
+
+// tie input and output archives together
+CEREAL_SETUP_ARCHIVE_TRAITS(cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive)
+
+#endif // CEREAL_ARCHIVES_PORTABLE_BINARY_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/xml.hpp b/Src/External/cereal/include/cereal/archives/xml.hpp
new file mode 100644
index 0000000..c520f02
--- /dev/null
+++ b/Src/External/cereal/include/cereal/archives/xml.hpp
@@ -0,0 +1,897 @@
+/*! \file xml.hpp
+    \brief XML input and output archives */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_ARCHIVES_XML_HPP_
+#define CEREAL_ARCHIVES_XML_HPP_
+#include "cereal/cereal.hpp"
+#include "cereal/details/util.hpp"
+
+#include "cereal/external/rapidxml/rapidxml.hpp"
+#include "cereal/external/rapidxml/rapidxml_print.hpp"
+#include "cereal/external/base64.hpp"
+
+#include <sstream>
+#include <stack>
+#include <vector>
+#include <limits>
+#include <string>
+#include <cstring>
+#include <cmath>
+
+namespace cereal
+{
+  namespace xml_detail
+  {
+    #ifndef CEREAL_XML_STRING_VALUE
+    //! The default name for the root node in a cereal xml archive.
+    /*! You can define CEREAL_XML_STRING_VALUE to be different assuming you do so
+        before this file is included. */
+    #define CEREAL_XML_STRING_VALUE "cereal"
+    #endif // CEREAL_XML_STRING_VALUE
+
+    //! The name given to the root node in a cereal xml archive
+    static const char * CEREAL_XML_STRING = CEREAL_XML_STRING_VALUE;
+
+    //! Returns true if the character is whitespace
+    inline bool isWhitespace( char c )
+    {
+      return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+    }
+  }
+
+  // ######################################################################
+  //! An output archive designed to save data to XML
+  /*! This archive uses RapidXML to build an in memory XML tree of the
+      data it serializes before outputting it to its stream upon destruction.
+      This archive should be used in an RAII fashion, letting
+      the automatic destruction of the object cause the flush to its stream.
+
+      XML archives provides a human readable output but at decreased
+      performance (both in time and space) compared to binary archives.
+
+      XML benefits greatly from name-value pairs, which if present, will
+      name the nodes in the output.  If these are not present, each level
+      of the output tree will be given an automatically generated delimited name.
+
+      The precision of the output archive controls the number of decimals output
+      for floating point numbers and should be sufficiently large (i.e. at least 20)
+      if there is a desire to have binary equality between the numbers output and
+      those read in.  In general you should expect a loss of precision when going
+      from floating point to text and back.
+
+      XML archives can optionally print the type of everything they serialize, which
+      adds an attribute to each node.
+
+      XML archives do not output the size information for any dynamically sized structure
+      and instead infer it from the number of children for a node.  This means that data
+      can be hand edited for dynamic sized structures and will still be readable.  This
+      is accomplished through the cereal::SizeTag object, which will also add an attribute
+      to its parent field.
+      \ingroup Archives */
+  class XMLOutputArchive : public OutputArchive<XMLOutputArchive>, public traits::TextArchive
+  {
+    public:
+      /*! @name Common Functionality
+          Common use cases for directly interacting with an XMLOutputArchive */
+      //! @{
+
+      //! A class containing various advanced options for the XML archive
+      class Options
+      {
+        public:
+          //! Default options
+          static Options Default(){ return Options(); }
+
+          //! Default options with no indentation
+          static Options NoIndent(){ return Options( std::numeric_limits<double>::max_digits10, false ); }
+
+          //! Specify specific options for the XMLOutputArchive
+          /*! @param precision The precision used for floating point numbers
+              @param indent Whether to indent each line of XML
+              @param outputType Whether to output the type of each serialized object as an attribute */
+          explicit Options( int precision = std::numeric_limits<double>::max_digits10,
+                            bool indent = true,
+                            bool outputType = false ) :
+            itsPrecision( precision ),
+            itsIndent( indent ),
+            itsOutputType( outputType ) { }
+
+        private:
+          friend class XMLOutputArchive;
+          int itsPrecision;
+          bool itsIndent;
+          bool itsOutputType;
+      };
+
+      //! Construct, outputting to the provided stream upon destruction
+      /*! @param stream  The stream to output to.  Note that XML is only guaranteed to flush
+                         its output to the stream upon destruction.
+          @param options The XML specific options to use.  See the Options struct
+                         for the values of default parameters */
+      XMLOutputArchive( std::ostream & stream, Options const & options = Options::Default() ) :
+        OutputArchive<XMLOutputArchive>(this),
+        itsStream(stream),
+        itsOutputType( options.itsOutputType ),
+        itsIndent( options.itsIndent )
+      {
+        // rapidxml will delete all allocations when xml_document is cleared
+        auto node = itsXML.allocate_node( rapidxml::node_declaration );
+        node->append_attribute( itsXML.allocate_attribute( "version", "1.0" ) );
+        node->append_attribute( itsXML.allocate_attribute( "encoding", "utf-8" ) );
+        itsXML.append_node( node );
+
+        // allocate root node
+        auto root = itsXML.allocate_node( rapidxml::node_element, xml_detail::CEREAL_XML_STRING );
+        itsXML.append_node( root );
+        itsNodes.emplace( root );
+
+        // set attributes on the streams
+        itsStream << std::boolalpha;
+        itsStream.precision( options.itsPrecision );
+        itsOS << std::boolalpha;
+        itsOS.precision( options.itsPrecision );
+      }
+
+      //! Destructor, flushes the XML
+      ~XMLOutputArchive() CEREAL_NOEXCEPT
+      {
+        const int flags = itsIndent ? 0x0 : rapidxml::print_no_indenting;
+        rapidxml::print( itsStream, itsXML, flags );
+        itsXML.clear();
+      }
+
+      //! Saves some binary data, encoded as a base64 string, with an optional name
+      /*! This can be called directly by users and it will automatically create a child node for
+          the current XML node, populate it with a base64 encoded string, and optionally name
+          it.  The node will be finished after it has been populated.  */
+      void saveBinaryValue( const void * data, size_t size, const char * name = nullptr )
+      {
+        itsNodes.top().name = name;
+
+        startNode();
+
+        auto base64string = base64::encode( reinterpret_cast<const unsigned char *>( data ), size );
+        saveValue( base64string );
+
+        if( itsOutputType )
+          itsNodes.top().node->append_attribute( itsXML.allocate_attribute( "type", "cereal binary data" ) );
+
+        finishNode();
+      };
+
+      //! @}
+      /*! @name Internal Functionality
+          Functionality designed for use by those requiring control over the inner mechanisms of
+          the XMLOutputArchive */
+      //! @{
+
+      //! Creates a new node that is a child of the node at the top of the stack
+      /*! Nodes will be given a name that has either been pre-set by a name value pair,
+          or generated based upon a counter unique to the parent node.  If you want to
+          give a node a specific name, use setNextName prior to calling startNode.
+
+          The node will then be pushed onto the node stack. */
+      void startNode()
+      {
+        // generate a name for this new node
+        const auto nameString = itsNodes.top().getValueName();
+
+        // allocate strings for all of the data in the XML object
+        auto namePtr = itsXML.allocate_string( nameString.data(), nameString.length() + 1 );
+
+        // insert into the XML
+        auto node = itsXML.allocate_node( rapidxml::node_element, namePtr, nullptr, nameString.size() );
+        itsNodes.top().node->append_node( node );
+        itsNodes.emplace( node );
+      }
+
+      //! Designates the most recently added node as finished
+      void finishNode()
+      {
+        itsNodes.pop();
+      }
+
+      //! Sets the name for the next node created with startNode
+      void setNextName( const char * name )
+      {
+        itsNodes.top().name = name;
+      }
+
+      //! Saves some data, encoded as a string, into the current top level node
+      /*! The data will be be named with the most recent name if one exists,
+          otherwise it will be given some default delimited value that depends upon
+          the parent node */
+      template <class T> inline
+      void saveValue( T const & value )
+      {
+        itsOS.clear(); itsOS.seekp( 0, std::ios::beg );
+        itsOS << value << std::ends;
+
+        auto strValue = itsOS.str();
+
+        // itsOS.str() may contain data from previous calls after the first '\0' that was just inserted
+        // and this data is counted in the length call. We make sure to remove that section so that the
+        // whitespace validation is done properly
+        strValue.resize(std::strlen(strValue.c_str()));
+
+        // If the first or last character is a whitespace, add xml:space attribute
+        const auto len = strValue.length();
+        if ( len > 0 && ( xml_detail::isWhitespace( strValue[0] ) || xml_detail::isWhitespace( strValue[len - 1] ) ) )
+        {
+          itsNodes.top().node->append_attribute( itsXML.allocate_attribute( "xml:space", "preserve" ) );
+        }
+
+        // allocate strings for all of the data in the XML object
+        auto dataPtr = itsXML.allocate_string(strValue.c_str(), strValue.length() + 1 );
+
+        // insert into the XML
+        itsNodes.top().node->append_node( itsXML.allocate_node( rapidxml::node_data, nullptr, dataPtr ) );
+      }
+
+      //! Overload for uint8_t prevents them from being serialized as characters
+      void saveValue( uint8_t const & value )
+      {
+        saveValue( static_cast<uint32_t>( value ) );
+      }
+
+      //! Overload for int8_t prevents them from being serialized as characters
+      void saveValue( int8_t const & value )
+      {
+        saveValue( static_cast<int32_t>( value ) );
+      }
+
+      //! Causes the type to be appended as an attribute to the most recently made node if output type is set to true
+      template <class T> inline
+      void insertType()
+      {
+        if( !itsOutputType )
+          return;
+
+        // generate a name for this new node
+        const auto nameString = util::demangledName<T>();
+
+        // allocate strings for all of the data in the XML object
+        auto namePtr = itsXML.allocate_string( nameString.data(), nameString.length() + 1 );
+
+        itsNodes.top().node->append_attribute( itsXML.allocate_attribute( "type", namePtr ) );
+      }
+
+      //! Appends an attribute to the current top level node
+      void appendAttribute( const char * name, const char * value )
+      {
+        auto namePtr =  itsXML.allocate_string( name );
+        auto valuePtr = itsXML.allocate_string( value );
+        itsNodes.top().node->append_attribute( itsXML.allocate_attribute( namePtr, valuePtr ) );
+      }
+
+    protected:
+      //! A struct that contains metadata about a node
+      struct NodeInfo
+      {
+        NodeInfo( rapidxml::xml_node<> * n = nullptr,
+                  const char * nm = nullptr ) :
+          node( n ),
+          counter( 0 ),
+          name( nm )
+        { }
+
+        rapidxml::xml_node<> * node; //!< A pointer to this node
+        size_t counter;              //!< The counter for naming child nodes
+        const char * name;           //!< The name for the next child node
+
+        //! Gets the name for the next child node created from this node
+        /*! The name will be automatically generated using the counter if
+            a name has not been previously set.  If a name has been previously
+            set, that name will be returned only once */
+        std::string getValueName()
+        {
+          if( name )
+          {
+            auto n = name;
+            name = nullptr;
+            return {n};
+          }
+          else
+            return "value" + std::to_string( counter++ ) + "\0";
+        }
+      }; // NodeInfo
+
+      //! @}
+
+    private:
+      std::ostream & itsStream;        //!< The output stream
+      rapidxml::xml_document<> itsXML; //!< The XML document
+      std::stack<NodeInfo> itsNodes;   //!< A stack of nodes added to the document
+      std::ostringstream itsOS;        //!< Used to format strings internally
+      bool itsOutputType;              //!< Controls whether type information is printed
+      bool itsIndent;                  //!< Controls whether indenting is used
+  }; // XMLOutputArchive
+
+  // ######################################################################
+  //! An output archive designed to load data from XML
+  /*! This archive uses RapidXML to build an in memory XML tree of the
+      data in the stream it is given before loading any types serialized.
+
+      As with the output XML archive, the preferred way to use this archive is in
+      an RAII fashion, ensuring its destruction after all data has been read.
+
+      Input XML should have been produced by the XMLOutputArchive.  Data can
+      only be added to dynamically sized containers - the input archive will
+      determine their size by looking at the number of child nodes.  Data that
+      did not originate from an XMLOutputArchive is not officially supported,
+      but may be possible to use if properly formatted.
+
+      The XMLInputArchive does not require that nodes are loaded in the same
+      order they were saved by XMLOutputArchive.  Using name value pairs (NVPs),
+      it is possible to load in an out of order fashion or otherwise skip/select
+      specific nodes to load.
+
+      The default behavior of the input archive is to read sequentially starting
+      with the first node and exploring its children.  When a given NVP does
+      not match the read in name for a node, the archive will search for that
+      node at the current level and load it if it exists.  After loading an out of
+      order node, the archive will then proceed back to loading sequentially from
+      its new position.
+
+      Consider this simple example where loading of some data is skipped:
+
+      @code{cpp}
+      // imagine the input file has someData(1-9) saved in order at the top level node
+      ar( someData1, someData2, someData3 );        // XML loads in the order it sees in the file
+      ar( cereal::make_nvp( "hello", someData6 ) ); // NVP given does not
+                                                    // match expected NVP name, so we search
+                                                    // for the given NVP and load that value
+      ar( someData7, someData8, someData9 );        // with no NVP given, loading resumes at its
+                                                    // current location, proceeding sequentially
+      @endcode
+
+      \ingroup Archives */
+  class XMLInputArchive : public InputArchive<XMLInputArchive>, public traits::TextArchive
+  {
+    public:
+      /*! @name Common Functionality
+          Common use cases for directly interacting with an XMLInputArchive */
+      //! @{
+
+      //! Construct, reading in from the provided stream
+      /*! Reads in an entire XML document from some stream and parses it as soon
+          as serialization starts
+
+          @param stream The stream to read from.  Can be a stringstream or a file. */
+      XMLInputArchive( std::istream & stream ) :
+        InputArchive<XMLInputArchive>( this ),
+        itsData( std::istreambuf_iterator<char>( stream ), std::istreambuf_iterator<char>() )
+      {
+        try
+        {
+          itsData.push_back('\0'); // rapidxml will do terrible things without the data being null terminated
+          itsXML.parse<rapidxml::parse_trim_whitespace | rapidxml::parse_no_data_nodes | rapidxml::parse_declaration_node>( reinterpret_cast<char *>( itsData.data() ) );
+        }
+        catch( rapidxml::parse_error const & )
+        {
+          //std::cerr << "-----Original-----" << std::endl;
+          //stream.seekg(0);
+          //std::cout << std::string( std::istreambuf_iterator<char>( stream ), std::istreambuf_iterator<char>() ) << std::endl;
+
+          //std::cerr << "-----Error-----" << std::endl;
+          //std::cerr << e.what() << std::endl;
+          //std::cerr << e.where<char>() << std::endl;
+          throw Exception("XML Parsing failed - likely due to invalid characters or invalid naming");
+        }
+
+        // Parse the root
+        auto root = itsXML.first_node( xml_detail::CEREAL_XML_STRING );
+        if( root == nullptr )
+          throw Exception("Could not detect cereal root node - likely due to empty or invalid input");
+        else
+          itsNodes.emplace( root );
+      }
+
+      ~XMLInputArchive() CEREAL_NOEXCEPT = default;
+
+      //! Loads some binary data, encoded as a base64 string, optionally specified by some name
+      /*! This will automatically start and finish a node to load the data, and can be called directly by
+          users.
+
+          Note that this follows the same ordering rules specified in the class description in regards
+          to loading in/out of order */
+      void loadBinaryValue( void * data, size_t size, const char * name = nullptr )
+      {
+        setNextName( name );
+        startNode();
+
+        std::string encoded;
+        loadValue( encoded );
+
+        auto decoded = base64::decode( encoded );
+
+        if( size != decoded.size() )
+          throw Exception("Decoded binary data size does not match specified size");
+
+        std::memcpy( data, decoded.data(), decoded.size() );
+
+        finishNode();
+      };
+
+      //! @}
+      /*! @name Internal Functionality
+          Functionality designed for use by those requiring control over the inner mechanisms of
+          the XMLInputArchive */
+      //! @{
+
+      //! Prepares to start reading the next node
+      /*! This places the next node to be parsed onto the nodes stack.
+
+          By default our strategy is to start with the document root node and then
+          recursively iterate through all children in the order they show up in the document.
+          We don't need to know NVPs do to this; we'll just blindly load in the order things appear in.
+
+          We check to see if the specified NVP matches what the next automatically loaded node is.  If they
+          match, we just continue as normal, going in order.  If they don't match, we attempt to find a node
+          named after the NVP that is being loaded.  If that NVP does not exist, we throw an exception. */
+      void startNode()
+      {
+        auto next = itsNodes.top().child; // By default we would move to the next child node
+        auto const expectedName = itsNodes.top().name; // this is the expected name from the NVP, if provided
+
+        // If we were given an NVP name, look for it in the current level of the document.
+        //    We only need to do this if either we have exhausted the siblings of the current level or
+        //    the NVP name does not match the name of the node we would normally read next
+        if( expectedName && ( next == nullptr || std::strcmp( next->name(), expectedName ) != 0 ) )
+        {
+          next = itsNodes.top().search( expectedName );
+
+          if( next == nullptr )
+            throw Exception("XML Parsing failed - provided NVP (" + std::string(expectedName) + ") not found");
+        }
+
+        itsNodes.emplace( next );
+      }
+
+      //! Finishes reading the current node
+      void finishNode()
+      {
+        // remove current
+        itsNodes.pop();
+
+        // advance parent
+        itsNodes.top().advance();
+
+        // Reset name
+        itsNodes.top().name = nullptr;
+      }
+
+      //! Retrieves the current node name
+      //! will return @c nullptr if the node does not have a name
+      const char * getNodeName() const
+      {
+        return itsNodes.top().getChildName();
+      }
+
+      //! Sets the name for the next node created with startNode
+      void setNextName( const char * name )
+      {
+        itsNodes.top().name = name;
+      }
+
+      //! Loads a bool from the current top node
+      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
+                                          std::is_same<T, bool>::value> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        std::istringstream is( itsNodes.top().node->value() );
+        is.setf( std::ios::boolalpha );
+        is >> value;
+      }
+
+      //! Loads a char (signed or unsigned) from the current top node
+      template <class T, traits::EnableIf<std::is_integral<T>::value,
+                                          !std::is_same<T, bool>::value,
+                                          sizeof(T) == sizeof(char)> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        value = *reinterpret_cast<T*>( itsNodes.top().node->value() );
+      }
+
+      //! Load an int8_t from the current top node (ensures we parse entire number)
+      void loadValue( int8_t & value )
+      {
+        int32_t val; loadValue( val ); value = static_cast<int8_t>( val );
+      }
+
+      //! Load a uint8_t from the current top node (ensures we parse entire number)
+      void loadValue( uint8_t & value )
+      {
+        uint32_t val; loadValue( val ); value = static_cast<uint8_t>( val );
+      }
+
+      //! Loads a type best represented as an unsigned long from the current top node
+      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
+                                          !std::is_same<T, bool>::value,
+                                          !std::is_same<T, char>::value,
+                                          !std::is_same<T, unsigned char>::value,
+                                          sizeof(T) < sizeof(long long)> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        value = static_cast<T>( std::stoul( itsNodes.top().node->value() ) );
+      }
+
+      //! Loads a type best represented as an unsigned long long from the current top node
+      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
+                                          !std::is_same<T, bool>::value,
+                                          sizeof(T) >= sizeof(long long)> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        value = static_cast<T>( std::stoull( itsNodes.top().node->value() ) );
+      }
+
+      //! Loads a type best represented as an int from the current top node
+      template <class T, traits::EnableIf<std::is_signed<T>::value,
+                                          !std::is_same<T, char>::value,
+                                          sizeof(T) <= sizeof(int)> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        value = static_cast<T>( std::stoi( itsNodes.top().node->value() ) );
+      }
+
+      //! Loads a type best represented as a long from the current top node
+      template <class T, traits::EnableIf<std::is_signed<T>::value,
+                                          (sizeof(T) > sizeof(int)),
+                                          sizeof(T) <= sizeof(long)> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        value = static_cast<T>( std::stol( itsNodes.top().node->value() ) );
+      }
+
+      //! Loads a type best represented as a long long from the current top node
+      template <class T, traits::EnableIf<std::is_signed<T>::value,
+                                          (sizeof(T) > sizeof(long)),
+                                          sizeof(T) <= sizeof(long long)> = traits::sfinae> inline
+      void loadValue( T & value )
+      {
+        value = static_cast<T>( std::stoll( itsNodes.top().node->value() ) );
+      }
+
+      //! Loads a type best represented as a float from the current top node
+      void loadValue( float & value )
+      {
+        try
+        {
+          value = std::stof( itsNodes.top().node->value() );
+        }
+        catch( std::out_of_range const & )
+        {
+          // special case for denormalized values
+          std::istringstream is( itsNodes.top().node->value() );
+          is >> value;
+          if( std::fpclassify( value ) != FP_SUBNORMAL )
+            throw;
+        }
+      }
+
+      //! Loads a type best represented as a double from the current top node
+      void loadValue( double & value )
+      {
+        try
+        {
+          value = std::stod( itsNodes.top().node->value() );
+        }
+        catch( std::out_of_range const & )
+        {
+          // special case for denormalized values
+          std::istringstream is( itsNodes.top().node->value() );
+          is >> value;
+          if( std::fpclassify( value ) != FP_SUBNORMAL )
+            throw;
+        }
+      }
+
+      //! Loads a type best represented as a long double from the current top node
+      void loadValue( long double & value )
+      {
+        try
+        {
+          value = std::stold( itsNodes.top().node->value() );
+        }
+        catch( std::out_of_range const & )
+        {
+          // special case for denormalized values
+          std::istringstream is( itsNodes.top().node->value() );
+          is >> value;
+          if( std::fpclassify( value ) != FP_SUBNORMAL )
+            throw;
+        }
+      }
+
+      //! Loads a string from the current node from the current top node
+      template<class CharT, class Traits, class Alloc> inline
+      void loadValue( std::basic_string<CharT, Traits, Alloc> & str )
+      {
+        std::basic_istringstream<CharT, Traits> is( itsNodes.top().node->value() );
+
+        str.assign( std::istreambuf_iterator<CharT, Traits>( is ),
+                    std::istreambuf_iterator<CharT, Traits>() );
+      }
+
+      //! Loads the size of the current top node
+      template <class T> inline
+      void loadSize( T & value )
+      {
+        value = getNumChildren( itsNodes.top().node );
+      }
+
+    protected:
+      //! Gets the number of children (usually interpreted as size) for the specified node
+      static size_t getNumChildren( rapidxml::xml_node<> * node )
+      {
+        size_t size = 0;
+        node = node->first_node(); // get first child
+
+        while( node != nullptr )
+        {
+          ++size;
+          node = node->next_sibling();
+        }
+
+        return size;
+      }
+
+      //! A struct that contains metadata about a node
+      /*! Keeps track of some top level node, its number of
+          remaining children, and the current active child node */
+      struct NodeInfo
+      {
+        NodeInfo( rapidxml::xml_node<> * n = nullptr ) :
+          node( n ),
+          child( n->first_node() ),
+          size( XMLInputArchive::getNumChildren( n ) ),
+          name( nullptr )
+        { }
+
+        //! Advances to the next sibling node of the child
+        /*! If this is the last sibling child will be null after calling */
+        void advance()
+        {
+          if( size > 0 )
+          {
+            --size;
+            child = child->next_sibling();
+          }
+        }
+
+        //! Searches for a child with the given name in this node
+        /*! @param searchName The name to search for (must be null terminated)
+            @return The node if found, nullptr otherwise */
+        rapidxml::xml_node<> * search( const char * searchName )
+        {
+          if( searchName )
+          {
+            size_t new_size = XMLInputArchive::getNumChildren( node );
+            const size_t name_size = rapidxml::internal::measure( searchName );
+
+            for( auto new_child = node->first_node(); new_child != nullptr; new_child = new_child->next_sibling() )
+            {
+              if( rapidxml::internal::compare( new_child->name(), new_child->name_size(), searchName, name_size, true ) )
+              {
+                size = new_size;
+                child = new_child;
+
+                return new_child;
+              }
+              --new_size;
+            }
+          }
+
+          return nullptr;
+        }
+
+        //! Returns the actual name of the next child node, if it exists
+        const char * getChildName() const
+        {
+          return child ? child->name() : nullptr;
+        }
+
+        rapidxml::xml_node<> * node;  //!< A pointer to this node
+        rapidxml::xml_node<> * child; //!< A pointer to its current child
+        size_t size;                  //!< The remaining number of children for this node
+        const char * name;            //!< The NVP name for next child node
+      }; // NodeInfo
+
+      //! @}
+
+    private:
+      std::vector<char> itsData;       //!< The raw data loaded
+      rapidxml::xml_document<> itsXML; //!< The XML document
+      std::stack<NodeInfo> itsNodes;   //!< A stack of nodes read from the document
+  };
+
+  // ######################################################################
+  // XMLArchive prologue and epilogue functions
+  // ######################################################################
+
+  // ######################################################################
+  //! Prologue for NVPs for XML output archives
+  /*! NVPs do not start or finish nodes - they just set up the names */
+  template <class T> inline
+  void prologue( XMLOutputArchive &, NameValuePair<T> const & )
+  { }
+
+  //! Prologue for NVPs for XML input archives
+  template <class T> inline
+  void prologue( XMLInputArchive &, NameValuePair<T> const & )
+  { }
+
+  // ######################################################################
+  //! Epilogue for NVPs for XML output archives
+  /*! NVPs do not start or finish nodes - they just set up the names */
+  template <class T> inline
+  void epilogue( XMLOutputArchive &, NameValuePair<T> const & )
+  { }
+
+  //! Epilogue for NVPs for XML input archives
+  template <class T> inline
+  void epilogue( XMLInputArchive &, NameValuePair<T> const & )
+  { }
+
+  // ######################################################################
+  //! Prologue for SizeTags for XML output archives
+  /*! SizeTags do not start or finish nodes */
+  template <class T> inline
+  void prologue( XMLOutputArchive & ar, SizeTag<T> const & )
+  {
+    ar.appendAttribute( "size", "dynamic" );
+  }
+
+  template <class T> inline
+  void prologue( XMLInputArchive &, SizeTag<T> const & )
+  { }
+
+  //! Epilogue for SizeTags for XML output archives
+  /*! SizeTags do not start or finish nodes */
+  template <class T> inline
+  void epilogue( XMLOutputArchive &, SizeTag<T> const & )
+  { }
+
+  template <class T> inline
+  void epilogue( XMLInputArchive &, SizeTag<T> const & )
+  { }
+
+  // ######################################################################
+  //! Prologue for all other types for XML output archives (except minimal types)
+  /*! Starts a new node, named either automatically or by some NVP,
+      that may be given data by the type about to be archived
+
+      Minimal types do not start or end nodes */
+  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, XMLOutputArchive>::value ||
+                                       traits::has_minimal_output_serialization<T, XMLOutputArchive>::value> = traits::sfinae> inline
+  void prologue( XMLOutputArchive & ar, T const & )
+  {
+    ar.startNode();
+    ar.insertType<T>();
+  }
+
+  //! Prologue for all other types for XML input archives (except minimal types)
+  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, XMLInputArchive>::value ||
+                                       traits::has_minimal_input_serialization<T, XMLInputArchive>::value> = traits::sfinae> inline
+  void prologue( XMLInputArchive & ar, T const & )
+  {
+    ar.startNode();
+  }
+
+  // ######################################################################
+  //! Epilogue for all other types other for XML output archives (except minimal types)
+  /*! Finishes the node created in the prologue
+
+      Minimal types do not start or end nodes */
+  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, XMLOutputArchive>::value ||
+                                       traits::has_minimal_output_serialization<T, XMLOutputArchive>::value> = traits::sfinae> inline
+  void epilogue( XMLOutputArchive & ar, T const & )
+  {
+    ar.finishNode();
+  }
+
+  //! Epilogue for all other types other for XML output archives (except minimal types)
+  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, XMLInputArchive>::value ||
+                                       traits::has_minimal_input_serialization<T, XMLInputArchive>::value> = traits::sfinae> inline
+  void epilogue( XMLInputArchive & ar, T const & )
+  {
+    ar.finishNode();
+  }
+
+  // ######################################################################
+  // Common XMLArchive serialization functions
+  // ######################################################################
+
+  //! Saving NVP types to XML
+  template <class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME( XMLOutputArchive & ar, NameValuePair<T> const & t )
+  {
+    ar.setNextName( t.name );
+    ar( t.value );
+  }
+
+  //! Loading NVP types from XML
+  template <class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME( XMLInputArchive & ar, NameValuePair<T> & t )
+  {
+    ar.setNextName( t.name );
+    ar( t.value );
+  }
+
+  // ######################################################################
+  //! Saving SizeTags to XML
+  template <class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME( XMLOutputArchive &, SizeTag<T> const & )
+  { }
+
+  //! Loading SizeTags from XML
+  template <class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME( XMLInputArchive & ar, SizeTag<T> & st )
+  {
+    ar.loadSize( st.size );
+  }
+
+  // ######################################################################
+  //! Saving for POD types to xml
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void CEREAL_SAVE_FUNCTION_NAME(XMLOutputArchive & ar, T const & t)
+  {
+    ar.saveValue( t );
+  }
+
+  //! Loading for POD types from xml
+  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
+  void CEREAL_LOAD_FUNCTION_NAME(XMLInputArchive & ar, T & t)
+  {
+    ar.loadValue( t );
+  }
+
+  // ######################################################################
+  //! saving string to xml
+  template<class CharT, class Traits, class Alloc> inline
+  void CEREAL_SAVE_FUNCTION_NAME(XMLOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
+  {
+    ar.saveValue( str );
+  }
+
+  //! loading string from xml
+  template<class CharT, class Traits, class Alloc> inline
+  void CEREAL_LOAD_FUNCTION_NAME(XMLInputArchive & ar, std::basic_string<CharT, Traits, Alloc> & str)
+  {
+    ar.loadValue( str );
+  }
+} // namespace cereal
+
+// register archives for polymorphic support
+CEREAL_REGISTER_ARCHIVE(cereal::XMLOutputArchive)
+CEREAL_REGISTER_ARCHIVE(cereal::XMLInputArchive)
+
+// tie input and output archives together
+CEREAL_SETUP_ARCHIVE_TRAITS(cereal::XMLInputArchive, cereal::XMLOutputArchive)
+
+#endif // CEREAL_ARCHIVES_XML_HPP_
diff --git a/Src/External/cereal/include/cereal/cereal.hpp b/Src/External/cereal/include/cereal/cereal.hpp
new file mode 100644
index 0000000..a777010
--- /dev/null
+++ b/Src/External/cereal/include/cereal/cereal.hpp
@@ -0,0 +1,987 @@
+/*! \file cereal.hpp
+    \brief Main cereal functionality */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_CEREAL_HPP_
+#define CEREAL_CEREAL_HPP_
+
+#include <type_traits>
+#include <string>
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+
+#include "cereal/macros.hpp"
+#include "cereal/details/traits.hpp"
+#include "cereal/details/helpers.hpp"
+#include "cereal/types/base_class.hpp"
+
+namespace cereal
+{
+  // ######################################################################
+  //! Creates a name value pair
+  /*! @relates NameValuePair
+      @ingroup Utility */
+  template <class T> inline
+  NameValuePair<T> make_nvp( std::string const & name, T && value )
+  {
+    return {name.c_str(), std::forward<T>(value)};
+  }
+
+  //! Creates a name value pair
+  /*! @relates NameValuePair
+      @ingroup Utility */
+  template <class T> inline
+  NameValuePair<T> make_nvp( const char * name, T && value )
+  {
+    return {name, std::forward<T>(value)};
+  }
+
+  //! Creates a name value pair for the variable T with the same name as the variable
+  /*! @relates NameValuePair
+      @ingroup Utility */
+  #define CEREAL_NVP(T) ::cereal::make_nvp(#T, T)
+
+  // ######################################################################
+  //! Convenience function to create binary data for both const and non const pointers
+  /*! @param data Pointer to beginning of the data
+      @param size The size in bytes of the data
+      @relates BinaryData
+      @ingroup Utility */
+  template <class T> inline
+  BinaryData<T> binary_data( T && data, size_t size )
+  {
+    return {std::forward<T>(data), size};
+  }
+
+  // ######################################################################
+  //! Creates a size tag from some variable.
+  /*! Will normally be used to serialize size (e.g. size()) information for
+      variable size containers.  If you have a variable sized container,
+      the very first thing it serializes should be its size, wrapped in
+      a SizeTag.
+
+      @relates SizeTag
+      @ingroup Utility */
+  template <class T> inline
+  SizeTag<T> make_size_tag( T && sz )
+  {
+    return {std::forward<T>(sz)};
+  }
+
+  // ######################################################################
+  //! Called before a type is serialized to set up any special archive state
+  //! for processing some type
+  /*! If designing a serializer that needs to set up any kind of special
+      state or output extra information for a type, specialize this function
+      for the archive type and the types that require the extra information.
+      @ingroup Internal */
+  template <class Archive, class T> inline
+  void prologue( Archive & /* archive */, T const & /* data */)
+  { }
+
+  //! Called after a type is serialized to tear down any special archive state
+  //! for processing some type
+  /*! @ingroup Internal */
+  template <class Archive, class T> inline
+  void epilogue( Archive & /* archive */, T const & /* data */)
+  { }
+
+  // ######################################################################
+  //! Special flags for archives
+  /*! AllowEmptyClassElision
+        This allows for empty classes to be serialized even if they do not provide
+        a serialization function.  Classes with no data members are considered to be
+        empty.  Be warned that if this is enabled and you attempt to serialize an
+        empty class with improperly formed serialize or load/save functions, no
+        static error will occur - the error will propogate silently and your
+        intended serialization functions may not be called.  You can manually
+        ensure that your classes that have custom serialization are correct
+        by using the traits is_output_serializable and is_input_serializable
+        in cereal/details/traits.hpp.
+      @ingroup Internal */
+  enum Flags { AllowEmptyClassElision = 1 };
+
+  // ######################################################################
+  //! Registers a specific Archive type with cereal
+  /*! This registration should be done once per archive.  A good place to
+      put this is immediately following the definition of your archive.
+      Archive registration is only strictly necessary if you wish to
+      support pointers to polymorphic data types.  All archives that
+      come with cereal are already registered.
+      @ingroup Internal */
+  #define CEREAL_REGISTER_ARCHIVE(Archive)                              \
+  namespace cereal { namespace detail {                                 \
+  template <class T, class BindingTag>                                  \
+  typename polymorphic_serialization_support<Archive, T>::type          \
+  instantiate_polymorphic_binding( T*, Archive*, BindingTag, adl_tag ); \
+  } } /* end namespaces */
+
+  // ######################################################################
+  //! Defines a class version for some type
+  /*! Versioning information is optional and adds some small amount of
+      overhead to serialization.  This overhead will occur both in terms of
+      space in the archive (the version information for each class will be
+      stored exactly once) as well as runtime (versioned serialization functions
+      must check to see if they need to load or store version information).
+
+      Versioning is useful if you plan on fundamentally changing the way some
+      type is serialized in the future.  Versioned serialization functions
+      cannot be used to load non-versioned data.
+
+      By default, all types have an assumed version value of zero.  By
+      using this macro, you may change the version number associated with
+      some type.  cereal will then use this value as a second parameter
+      to your serialization functions.
+
+      The interface for the serialization functions is nearly identical
+      to non-versioned serialization with the addition of a second parameter,
+      const std::uint32_t version, which will be supplied with the correct
+      version number.  Serializing the version number on a save happens
+      automatically.
+
+      Versioning cannot be mixed with non-versioned serialization functions.
+      Having both types will result result in a compile time error.  Data
+      serialized without versioning cannot be loaded by a serialization
+      function with added versioning support.
+
+      Example interface for versioning on a non-member serialize function:
+
+      @code{cpp}
+      CEREAL_CLASS_VERSION( Mytype, 77 ); // register class version
+
+      template <class Archive>
+      void serialize( Archive & ar, Mytype & t, const std::uint32_t version )
+      {
+        // When performing a load, the version associated with the class
+        // is whatever it was when that data was originally serialized
+        //
+        // When we save, we'll use the version that is defined in the macro
+
+        if( version >= some_number )
+          // do this
+        else
+          // do that
+      }
+      @endcode
+
+      Interfaces for other forms of serialization functions is similar.  This
+      macro should be placed at global scope.
+      @ingroup Utility */
+  #define CEREAL_CLASS_VERSION(TYPE, VERSION_NUMBER)                             \
+  namespace cereal { namespace detail {                                          \
+    template <> struct Version<TYPE>                                             \
+    {                                                                            \
+      static const std::uint32_t version;                                        \
+      static std::uint32_t registerVersion()                                     \
+      {                                                                          \
+        ::cereal::detail::StaticObject<Versions>::getInstance().mapping.emplace( \
+             std::type_index(typeid(TYPE)).hash_code(), VERSION_NUMBER );        \
+        return VERSION_NUMBER;                                                   \
+      }                                                                          \
+      static void unused() { (void)version; }                                    \
+    }; /* end Version */                                                         \
+    const std::uint32_t Version<TYPE>::version =                                 \
+      Version<TYPE>::registerVersion();                                          \
+  } } // end namespaces
+
+  // ######################################################################
+  //! The base output archive class
+  /*! This is the base output archive for all output archives.  If you create
+      a custom archive class, it should derive from this, passing itself as
+      a template parameter for the ArchiveType.
+
+      The base class provides all of the functionality necessary to
+      properly forward data to the correct serialization functions.
+
+      Individual archives should use a combination of prologue and
+      epilogue functions together with specializations of serialize, save,
+      and load to alter the functionality of their serialization.
+
+      @tparam ArchiveType The archive type that derives from OutputArchive
+      @tparam Flags Flags to control advanced functionality.  See the Flags
+                    enum for more information.
+      @ingroup Internal */
+  template<class ArchiveType, std::uint32_t Flags = 0>
+  class OutputArchive : public detail::OutputArchiveBase
+  {
+    public:
+      //! Construct the output archive
+      /*! @param derived A pointer to the derived ArchiveType (pass this from the derived archive) */
+      OutputArchive(ArchiveType * const derived) : self(derived), itsCurrentPointerId(1), itsCurrentPolymorphicTypeId(1)
+      { }
+
+      OutputArchive & operator=( OutputArchive const & ) = delete;
+
+      //! Serializes all passed in data
+      /*! This is the primary interface for serializing data with an archive */
+      template <class ... Types> inline
+      ArchiveType & operator()( Types && ... args )
+      {
+        self->process( std::forward<Types>( args )... );
+        return *self;
+      }
+
+      /*! @name Boost Transition Layer
+          Functionality that mirrors the syntax for Boost.  This is useful if you are transitioning
+          a large project from Boost to cereal.  The preferred interface for cereal is using operator(). */
+      //! @{
+
+      //! Indicates this archive is not intended for loading
+      /*! This ensures compatibility with boost archive types.  If you are transitioning
+          from boost, you can check this value within a member or external serialize function
+          (i.e., Archive::is_loading::value) to disable behavior specific to loading, until 
+          you can transition to split save/load or save_minimal/load_minimal functions */
+      using is_loading = std::false_type;
+
+      //! Indicates this archive is intended for saving
+      /*! This ensures compatibility with boost archive types.  If you are transitioning
+          from boost, you can check this value within a member or external serialize function
+          (i.e., Archive::is_saving::value) to enable behavior specific to loading, until 
+          you can transition to split save/load or save_minimal/load_minimal functions */
+      using is_saving = std::true_type;
+
+      //! Serializes passed in data
+      /*! This is a boost compatability layer and is not the preferred way of using
+          cereal.  If you are transitioning from boost, use this until you can
+          transition to the operator() overload */
+      template <class T> inline
+      ArchiveType & operator&( T && arg )
+      {
+        self->process( std::forward<T>( arg ) );
+        return *self;
+      }
+
+      //! Serializes passed in data
+      /*! This is a boost compatability layer and is not the preferred way of using
+          cereal.  If you are transitioning from boost, use this until you can
+          transition to the operator() overload */
+      template <class T> inline
+      ArchiveType & operator<<( T && arg )
+      {
+        self->process( std::forward<T>( arg ) );
+        return *self;
+      }
+
+      //! @}
+
+      //! Registers a shared pointer with the archive
+      /*! This function is used to track shared pointer targets to prevent
+          unnecessary saves from taking place if multiple shared pointers
+          point to the same data.
+
+          @internal
+          @param addr The address (see shared_ptr get()) pointed to by the shared pointer
+          @return A key that uniquely identifies the pointer */
+      inline std::uint32_t registerSharedPointer( void const * addr )
+      {
+        // Handle null pointers by just returning 0
+        if(addr == 0) return 0;
+
+        auto id = itsSharedPointerMap.find( addr );
+        if( id == itsSharedPointerMap.end() )
+        {
+          auto ptrId = itsCurrentPointerId++;
+          itsSharedPointerMap.insert( {addr, ptrId} );
+          return ptrId | detail::msb_32bit; // mask MSB to be 1
+        }
+        else
+          return id->second;
+      }
+
+      //! Registers a polymorphic type name with the archive
+      /*! This function is used to track polymorphic types to prevent
+          unnecessary saves of identifying strings used by the polymorphic
+          support functionality.
+
+          @internal
+          @param name The name to associate with a polymorphic type
+          @return A key that uniquely identifies the polymorphic type name */
+      inline std::uint32_t registerPolymorphicType( char const * name )
+      {
+        auto id = itsPolymorphicTypeMap.find( name );
+        if( id == itsPolymorphicTypeMap.end() )
+        {
+          auto polyId = itsCurrentPolymorphicTypeId++;
+          itsPolymorphicTypeMap.insert( {name, polyId} );
+          return polyId | detail::msb_32bit; // mask MSB to be 1
+        }
+        else
+          return id->second;
+      }
+
+    private:
+      //! Serializes data after calling prologue, then calls epilogue
+      template <class T> inline
+      void process( T && head )
+      {
+        prologue( *self, head );
+        self->processImpl( head );
+        epilogue( *self, head );
+      }
+
+      //! Unwinds to process all data
+      template <class T, class ... Other> inline
+      void process( T && head, Other && ... tail )
+      {
+        self->process( std::forward<T>( head ) );
+        self->process( std::forward<Other>( tail )... );
+      }
+
+      //! Serialization of a virtual_base_class wrapper
+      /*! \sa virtual_base_class */
+      template <class T> inline
+      ArchiveType & processImpl(virtual_base_class<T> const & b)
+      {
+        traits::detail::base_class_id id(b.base_ptr);
+        if(itsBaseClassSet.count(id) == 0)
+        {
+          itsBaseClassSet.insert(id);
+          self->processImpl( *b.base_ptr );
+        }
+        return *self;
+      }
+
+      //! Serialization of a base_class wrapper
+      /*! \sa base_class */
+      template <class T> inline
+      ArchiveType & processImpl(base_class<T> const & b)
+      {
+        self->processImpl( *b.base_ptr );
+        return *self;
+      }
+
+      //! Helper macro that expands the requirements for activating an overload
+      /*! Requirements:
+            Has the requested serialization function
+            Does not have version and unversioned at the same time
+            Is output serializable AND
+              is specialized for this type of function OR
+              has no specialization at all */
+      #define PROCESS_IF(name)                                                             \
+      traits::EnableIf<traits::has_##name<T, ArchiveType>::value,                          \
+                       !traits::has_invalid_output_versioning<T, ArchiveType>::value,      \
+                       (traits::is_output_serializable<T, ArchiveType>::value &&           \
+                        (traits::is_specialized_##name<T, ArchiveType>::value ||           \
+                         !traits::is_specialized<T, ArchiveType>::value))> = traits::sfinae
+
+      //! Member serialization
+      template <class T, PROCESS_IF(member_serialize)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        access::member_serialize(*self, const_cast<T &>(t));
+        return *self;
+      }
+
+      //! Non member serialization
+      template <class T, PROCESS_IF(non_member_serialize)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        CEREAL_SERIALIZE_FUNCTION_NAME(*self, const_cast<T &>(t));
+        return *self;
+      }
+
+      //! Member split (save)
+      template <class T, PROCESS_IF(member_save)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        access::member_save(*self, t);
+        return *self;
+      }
+
+      //! Non member split (save)
+      template <class T, PROCESS_IF(non_member_save)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        CEREAL_SAVE_FUNCTION_NAME(*self, t);
+        return *self;
+      }
+
+      //! Member split (save_minimal)
+      template <class T, PROCESS_IF(member_save_minimal)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        self->process( access::member_save_minimal(*self, t) );
+        return *self;
+      }
+
+      //! Non member split (save_minimal)
+      template <class T, PROCESS_IF(non_member_save_minimal)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        self->process( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(*self, t) );
+        return *self;
+      }
+
+      //! Empty class specialization
+      template <class T, traits::EnableIf<(Flags & AllowEmptyClassElision),
+                                          !traits::is_output_serializable<T, ArchiveType>::value,
+                                          std::is_empty<T>::value> = traits::sfinae> inline
+      ArchiveType & processImpl(T const &)
+      {
+        return *self;
+      }
+
+      //! No matching serialization
+      /*! Invalid if we have invalid output versioning or
+          we are not output serializable, and either
+          don't allow empty class ellision or allow it but are not serializing an empty class */
+      template <class T, traits::EnableIf<traits::has_invalid_output_versioning<T, ArchiveType>::value ||
+                                          (!traits::is_output_serializable<T, ArchiveType>::value &&
+                                           (!(Flags & AllowEmptyClassElision) || ((Flags & AllowEmptyClassElision) && !std::is_empty<T>::value)))> = traits::sfinae> inline
+      ArchiveType & processImpl(T const &)
+      {
+        static_assert(traits::detail::count_output_serializers<T, ArchiveType>::value != 0,
+            "cereal could not find any output serialization functions for the provided type and archive combination. \n\n "
+            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
+            "Serialize functions generally have the following signature: \n\n "
+            "template<class Archive> \n "
+            "  void serialize(Archive & ar) \n "
+            "  { \n "
+            "    ar( member1, member2, member3 ); \n "
+            "  } \n\n " );
+
+        static_assert(traits::detail::count_output_serializers<T, ArchiveType>::value < 2,
+            "cereal found more than one compatible output serialization function for the provided type and archive combination. \n\n "
+            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
+            "Use specialization (see access.hpp) if you need to disambiguate between serialize vs load/save functions.  \n "
+            "Note that serialization functions can be inherited which may lead to the aforementioned ambiguities. \n "
+            "In addition, you may not mix versioned with non-versioned serialization functions. \n\n ");
+
+        return *self;
+      }
+
+      //! Registers a class version with the archive and serializes it if necessary
+      /*! If this is the first time this class has been serialized, we will record its
+          version number and serialize that.
+
+          @tparam T The type of the class being serialized
+          @param version The version number associated with it */
+      template <class T> inline
+      std::uint32_t registerClassVersion()
+      {
+        static const auto hash = std::type_index(typeid(T)).hash_code();
+        const auto insertResult = itsVersionedTypes.insert( hash );
+        const auto lock = detail::StaticObject<detail::Versions>::lock();
+        const auto version =
+          detail::StaticObject<detail::Versions>::getInstance().find( hash, detail::Version<T>::version );
+
+        if( insertResult.second ) // insertion took place, serialize the version number
+          process( make_nvp<ArchiveType>("cereal_class_version", version) );
+
+        return version;
+      }
+
+      //! Member serialization
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(member_versioned_serialize)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        access::member_serialize(*self, const_cast<T &>(t), registerClassVersion<T>());
+        return *self;
+      }
+
+      //! Non member serialization
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(non_member_versioned_serialize)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        CEREAL_SERIALIZE_FUNCTION_NAME(*self, const_cast<T &>(t), registerClassVersion<T>());
+        return *self;
+      }
+
+      //! Member split (save)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(member_versioned_save)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        access::member_save(*self, t, registerClassVersion<T>());
+        return *self;
+      }
+
+      //! Non member split (save)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(non_member_versioned_save)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        CEREAL_SAVE_FUNCTION_NAME(*self, t, registerClassVersion<T>());
+        return *self;
+      }
+
+      //! Member split (save_minimal)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(member_versioned_save_minimal)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        self->process( access::member_save_minimal(*self, t, registerClassVersion<T>()) );
+        return *self;
+      }
+
+      //! Non member split (save_minimal)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(non_member_versioned_save_minimal)> inline
+      ArchiveType & processImpl(T const & t)
+      {
+        self->process( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(*self, t, registerClassVersion<T>()) );
+        return *self;
+      }
+
+    #undef PROCESS_IF
+
+    private:
+      ArchiveType * const self;
+
+      //! A set of all base classes that have been serialized
+      std::unordered_set<traits::detail::base_class_id, traits::detail::base_class_id_hash> itsBaseClassSet;
+
+      //! Maps from addresses to pointer ids
+      std::unordered_map<void const *, std::uint32_t> itsSharedPointerMap;
+
+      //! The id to be given to the next pointer
+      std::uint32_t itsCurrentPointerId;
+
+      //! Maps from polymorphic type name strings to ids
+      std::unordered_map<char const *, std::uint32_t> itsPolymorphicTypeMap;
+
+      //! The id to be given to the next polymorphic type name
+      std::uint32_t itsCurrentPolymorphicTypeId;
+
+      //! Keeps track of classes that have versioning information associated with them
+      std::unordered_set<size_type> itsVersionedTypes;
+  }; // class OutputArchive
+
+  // ######################################################################
+  //! The base input archive class
+  /*! This is the base input archive for all input archives.  If you create
+      a custom archive class, it should derive from this, passing itself as
+      a template parameter for the ArchiveType.
+
+      The base class provides all of the functionality necessary to
+      properly forward data to the correct serialization functions.
+
+      Individual archives should use a combination of prologue and
+      epilogue functions together with specializations of serialize, save,
+      and load to alter the functionality of their serialization.
+
+      @tparam ArchiveType The archive type that derives from InputArchive
+      @tparam Flags Flags to control advanced functionality.  See the Flags
+                    enum for more information.
+      @ingroup Internal */
+  template<class ArchiveType, std::uint32_t Flags = 0>
+  class InputArchive : public detail::InputArchiveBase
+  {
+    public:
+      //! Construct the output archive
+      /*! @param derived A pointer to the derived ArchiveType (pass this from the derived archive) */
+      InputArchive(ArchiveType * const derived) :
+        self(derived),
+        itsBaseClassSet(),
+        itsSharedPointerMap(),
+        itsPolymorphicTypeMap(),
+        itsVersionedTypes()
+      { }
+
+      InputArchive & operator=( InputArchive const & ) = delete;
+
+      //! Serializes all passed in data
+      /*! This is the primary interface for serializing data with an archive */
+      template <class ... Types> inline
+      ArchiveType & operator()( Types && ... args )
+      {
+        process( std::forward<Types>( args )... );
+        return *self;
+      }
+
+      /*! @name Boost Transition Layer
+          Functionality that mirrors the syntax for Boost.  This is useful if you are transitioning
+          a large project from Boost to cereal.  The preferred interface for cereal is using operator(). */
+      //! @{
+
+      //! Indicates this archive is intended for loading
+      /*! This ensures compatibility with boost archive types.  If you are transitioning
+          from boost, you can check this value within a member or external serialize function
+          (i.e., Archive::is_loading::value) to enable behavior specific to loading, until 
+          you can transition to split save/load or save_minimal/load_minimal functions */
+      using is_loading = std::true_type;
+
+      //! Indicates this archive is not intended for saving
+      /*! This ensures compatibility with boost archive types.  If you are transitioning
+          from boost, you can check this value within a member or external serialize function
+          (i.e., Archive::is_saving::value) to disable behavior specific to loading, until 
+          you can transition to split save/load or save_minimal/load_minimal functions */
+      using is_saving = std::false_type;
+
+      //! Serializes passed in data
+      /*! This is a boost compatability layer and is not the preferred way of using
+          cereal.  If you are transitioning from boost, use this until you can
+          transition to the operator() overload */
+      template <class T> inline
+      ArchiveType & operator&( T && arg )
+      {
+        self->process( std::forward<T>( arg ) );
+        return *self;
+      }
+
+      //! Serializes passed in data
+      /*! This is a boost compatability layer and is not the preferred way of using
+          cereal.  If you are transitioning from boost, use this until you can
+          transition to the operator() overload */
+      template <class T> inline
+      ArchiveType & operator>>( T && arg )
+      {
+        self->process( std::forward<T>( arg ) );
+        return *self;
+      }
+
+      //! @}
+
+      //! Retrieves a shared pointer given a unique key for it
+      /*! This is used to retrieve a previously registered shared_ptr
+          which has already been loaded.
+
+          @param id The unique id that was serialized for the pointer
+          @return A shared pointer to the data
+          @throw Exception if the id does not exist */
+      inline std::shared_ptr<void> getSharedPointer(std::uint32_t const id)
+      {
+        if(id == 0) return std::shared_ptr<void>(nullptr);
+
+        auto iter = itsSharedPointerMap.find( id );
+        if(iter == itsSharedPointerMap.end())
+          throw Exception("Error while trying to deserialize a smart pointer. Could not find id " + std::to_string(id));
+
+        return iter->second;
+      }
+
+      //! Registers a shared pointer to its unique identifier
+      /*! After a shared pointer has been allocated for the first time, it should
+          be registered with its loaded id for future references to it.
+
+          @param id The unique identifier for the shared pointer
+          @param ptr The actual shared pointer */
+      inline void registerSharedPointer(std::uint32_t const id, std::shared_ptr<void> ptr)
+      {
+        std::uint32_t const stripped_id = id & ~detail::msb_32bit;
+        itsSharedPointerMap[stripped_id] = ptr;
+      }
+
+      //! Retrieves the string for a polymorphic type given a unique key for it
+      /*! This is used to retrieve a string previously registered during
+          a polymorphic load.
+
+          @param id The unique id that was serialized for the polymorphic type
+          @return The string identifier for the tyep */
+      inline std::string getPolymorphicName(std::uint32_t const id)
+      {
+        auto name = itsPolymorphicTypeMap.find( id );
+        if(name == itsPolymorphicTypeMap.end())
+        {
+          throw Exception("Error while trying to deserialize a polymorphic pointer. Could not find type id " + std::to_string(id));
+        }
+        return name->second;
+      }
+
+      //! Registers a polymorphic name string to its unique identifier
+      /*! After a polymorphic type has been loaded for the first time, it should
+          be registered with its loaded id for future references to it.
+
+          @param id The unique identifier for the polymorphic type
+          @param name The name associated with the tyep */
+      inline void registerPolymorphicName(std::uint32_t const id, std::string const & name)
+      {
+        std::uint32_t const stripped_id = id & ~detail::msb_32bit;
+        itsPolymorphicTypeMap.insert( {stripped_id, name} );
+      }
+
+    private:
+      //! Serializes data after calling prologue, then calls epilogue
+      template <class T> inline
+      void process( T && head )
+      {
+        prologue( *self, head );
+        self->processImpl( head );
+        epilogue( *self, head );
+      }
+
+      //! Unwinds to process all data
+      template <class T, class ... Other> inline
+      void process( T && head, Other && ... tail )
+      {
+        process( std::forward<T>( head ) );
+        process( std::forward<Other>( tail )... );
+      }
+
+      //! Serialization of a virtual_base_class wrapper
+      /*! \sa virtual_base_class */
+      template <class T> inline
+      ArchiveType & processImpl(virtual_base_class<T> & b)
+      {
+        traits::detail::base_class_id id(b.base_ptr);
+        if(itsBaseClassSet.count(id) == 0)
+        {
+          itsBaseClassSet.insert(id);
+          self->processImpl( *b.base_ptr );
+        }
+        return *self;
+      }
+
+      //! Serialization of a base_class wrapper
+      /*! \sa base_class */
+      template <class T> inline
+      ArchiveType & processImpl(base_class<T> & b)
+      {
+        self->processImpl( *b.base_ptr );
+        return *self;
+      }
+
+      //! Helper macro that expands the requirements for activating an overload
+      /*! Requirements:
+            Has the requested serialization function
+            Does not have version and unversioned at the same time
+            Is input serializable AND
+              is specialized for this type of function OR
+              has no specialization at all */
+      #define PROCESS_IF(name)                                                              \
+      traits::EnableIf<traits::has_##name<T, ArchiveType>::value,                           \
+                       !traits::has_invalid_input_versioning<T, ArchiveType>::value,        \
+                       (traits::is_input_serializable<T, ArchiveType>::value &&             \
+                        (traits::is_specialized_##name<T, ArchiveType>::value ||            \
+                         !traits::is_specialized<T, ArchiveType>::value))> = traits::sfinae
+
+      //! Member serialization
+      template <class T, PROCESS_IF(member_serialize)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        access::member_serialize(*self, t);
+        return *self;
+      }
+
+      //! Non member serialization
+      template <class T, PROCESS_IF(non_member_serialize)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        CEREAL_SERIALIZE_FUNCTION_NAME(*self, t);
+        return *self;
+      }
+
+      //! Member split (load)
+      template <class T, PROCESS_IF(member_load)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        access::member_load(*self, t);
+        return *self;
+      }
+
+      //! Non member split (load)
+      template <class T, PROCESS_IF(non_member_load)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        CEREAL_LOAD_FUNCTION_NAME(*self, t);
+        return *self;
+      }
+
+      //! Member split (load_minimal)
+      template <class T, PROCESS_IF(member_load_minimal)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
+        typename traits::has_member_save_minimal<T, OutArchiveType>::type value;
+        self->process( value );
+        access::member_load_minimal(*self, t, value);
+        return *self;
+      }
+
+      //! Non member split (load_minimal)
+      template <class T, PROCESS_IF(non_member_load_minimal)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
+        typename traits::has_non_member_save_minimal<T, OutArchiveType>::type value;
+        self->process( value );
+        CEREAL_LOAD_MINIMAL_FUNCTION_NAME(*self, t, value);
+        return *self;
+      }
+
+      //! Empty class specialization
+      template <class T, traits::EnableIf<(Flags & AllowEmptyClassElision),
+                                          !traits::is_input_serializable<T, ArchiveType>::value,
+                                          std::is_empty<T>::value> = traits::sfinae> inline
+      ArchiveType & processImpl(T const &)
+      {
+        return *self;
+      }
+
+      //! No matching serialization
+      /*! Invalid if we have invalid input versioning or
+          we are not input serializable, and either
+          don't allow empty class ellision or allow it but are not serializing an empty class */
+      template <class T, traits::EnableIf<traits::has_invalid_input_versioning<T, ArchiveType>::value ||
+                                          (!traits::is_input_serializable<T, ArchiveType>::value &&
+                                           (!(Flags & AllowEmptyClassElision) || ((Flags & AllowEmptyClassElision) && !std::is_empty<T>::value)))> = traits::sfinae> inline
+      ArchiveType & processImpl(T const &)
+      {
+        static_assert(traits::detail::count_input_serializers<T, ArchiveType>::value != 0,
+            "cereal could not find any input serialization functions for the provided type and archive combination. \n\n "
+            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
+            "Serialize functions generally have the following signature: \n\n "
+            "template<class Archive> \n "
+            "  void serialize(Archive & ar) \n "
+            "  { \n "
+            "    ar( member1, member2, member3 ); \n "
+            "  } \n\n " );
+
+        static_assert(traits::detail::count_input_serializers<T, ArchiveType>::value < 2,
+            "cereal found more than one compatible input serialization function for the provided type and archive combination. \n\n "
+            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
+            "Use specialization (see access.hpp) if you need to disambiguate between serialize vs load/save functions.  \n "
+            "Note that serialization functions can be inherited which may lead to the aforementioned ambiguities. \n "
+            "In addition, you may not mix versioned with non-versioned serialization functions. \n\n ");
+
+        return *self;
+      }
+
+      //! Befriend for versioning in load_and_construct
+      template <class A, class B, bool C, bool D, bool E, bool F> friend struct detail::Construct;
+
+      //! Registers a class version with the archive and serializes it if necessary
+      /*! If this is the first time this class has been serialized, we will record its
+          version number and serialize that.
+
+          @tparam T The type of the class being serialized
+          @param version The version number associated with it */
+      template <class T> inline
+      std::uint32_t loadClassVersion()
+      {
+        static const auto hash = std::type_index(typeid(T)).hash_code();
+        auto lookupResult = itsVersionedTypes.find( hash );
+
+        if( lookupResult != itsVersionedTypes.end() ) // already exists
+          return lookupResult->second;
+        else // need to load
+        {
+          std::uint32_t version;
+
+          process( make_nvp<ArchiveType>("cereal_class_version", version) );
+          itsVersionedTypes.emplace_hint( lookupResult, hash, version );
+
+          return version;
+        }
+      }
+
+      //! Member serialization
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(member_versioned_serialize)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        const auto version = loadClassVersion<T>();
+        access::member_serialize(*self, t, version);
+        return *self;
+      }
+
+      //! Non member serialization
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(non_member_versioned_serialize)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        const auto version = loadClassVersion<T>();
+        CEREAL_SERIALIZE_FUNCTION_NAME(*self, t, version);
+        return *self;
+      }
+
+      //! Member split (load)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(member_versioned_load)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        const auto version = loadClassVersion<T>();
+        access::member_load(*self, t, version);
+        return *self;
+      }
+
+      //! Non member split (load)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(non_member_versioned_load)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        const auto version = loadClassVersion<T>();
+        CEREAL_LOAD_FUNCTION_NAME(*self, t, version);
+        return *self;
+      }
+
+      //! Member split (load_minimal)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(member_versioned_load_minimal)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
+        const auto version = loadClassVersion<T>();
+        typename traits::has_member_versioned_save_minimal<T, OutArchiveType>::type value;
+        self->process(value);
+        access::member_load_minimal(*self, t, value, version);
+        return *self;
+      }
+
+      //! Non member split (load_minimal)
+      /*! Versioning implementation */
+      template <class T, PROCESS_IF(non_member_versioned_load_minimal)> inline
+      ArchiveType & processImpl(T & t)
+      {
+        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
+        const auto version = loadClassVersion<T>();
+        typename traits::has_non_member_versioned_save_minimal<T, OutArchiveType>::type value;
+        self->process(value);
+        CEREAL_LOAD_MINIMAL_FUNCTION_NAME(*self, t, value, version);
+        return *self;
+      }
+
+      #undef PROCESS_IF
+
+    private:
+      ArchiveType * const self;
+
+      //! A set of all base classes that have been serialized
+      std::unordered_set<traits::detail::base_class_id, traits::detail::base_class_id_hash> itsBaseClassSet;
+
+      //! Maps from pointer ids to metadata
+      std::unordered_map<std::uint32_t, std::shared_ptr<void>> itsSharedPointerMap;
+
+      //! Maps from name ids to names
+      std::unordered_map<std::uint32_t, std::string> itsPolymorphicTypeMap;
+
+      //! Maps from type hash codes to version numbers
+      std::unordered_map<std::size_t, std::uint32_t> itsVersionedTypes;
+  }; // class InputArchive
+} // namespace cereal
+
+// This include needs to come after things such as binary_data, make_nvp, etc
+#include "cereal/types/common.hpp"
+
+#endif // CEREAL_CEREAL_HPP_
diff --git a/Src/External/cereal/include/cereal/details/helpers.hpp b/Src/External/cereal/include/cereal/details/helpers.hpp
new file mode 100644
index 0000000..9092688
--- /dev/null
+++ b/Src/External/cereal/include/cereal/details/helpers.hpp
@@ -0,0 +1,383 @@
+/*! \file helpers.hpp
+    \brief Internal helper functionality
+    \ingroup Internal */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_DETAILS_HELPERS_HPP_
+#define CEREAL_DETAILS_HELPERS_HPP_
+
+#include <type_traits>
+#include <cstdint>
+#include <utility>
+#include <memory>
+#include <unordered_map>
+#include <stdexcept>
+
+#include "cereal/macros.hpp"
+#include "cereal/details/static_object.hpp"
+
+namespace cereal
+{
+  // ######################################################################
+  //! An exception class thrown when things go wrong at runtime
+  /*! @ingroup Utility */
+  struct Exception : public std::runtime_error
+  {
+    explicit Exception( const std::string & what_ ) : std::runtime_error(what_) {}
+    explicit Exception( const char * what_ ) : std::runtime_error(what_) {}
+  };
+
+  // ######################################################################
+  //! The size type used by cereal
+  /*! To ensure compatability between 32, 64, etc bit machines, we need to use
+      a fixed size type instead of size_t, which may vary from machine to
+      machine.
+
+      The default value for CEREAL_SIZE_TYPE is specified in cereal/macros.hpp */
+  using size_type = CEREAL_SIZE_TYPE;
+
+  // forward decls
+  class BinaryOutputArchive;
+  class BinaryInputArchive;
+
+  // ######################################################################
+  namespace detail
+  {
+    struct NameValuePairCore {}; //!< Traits struct for NVPs
+  }
+
+  //! For holding name value pairs
+  /*! This pairs a name (some string) with some value such that an archive
+      can potentially take advantage of the pairing.
+
+      In serialization functions, NameValuePairs are usually created like so:
+      @code{.cpp}
+      struct MyStruct
+      {
+        int a, b, c, d, e;
+
+        template<class Archive>
+        void serialize(Archive & archive)
+        {
+          archive( CEREAL_NVP(a),
+                   CEREAL_NVP(b),
+                   CEREAL_NVP(c),
+                   CEREAL_NVP(d),
+                   CEREAL_NVP(e) );
+        }
+      };
+      @endcode
+
+      Alternatively, you can give you data members custom names like so:
+      @code{.cpp}
+      struct MyStruct
+      {
+        int a, b, my_embarrassing_variable_name, d, e;
+
+        template<class Archive>
+        void serialize(Archive & archive)
+        {
+          archive( CEREAL_NVP(a),
+                   CEREAL_NVP(b),
+                   cereal::make_nvp("var", my_embarrassing_variable_name) );
+                   CEREAL_NVP(d),
+                   CEREAL_NVP(e) );
+        }
+      };
+      @endcode
+
+      There is a slight amount of overhead to creating NameValuePairs, so there
+      is a third method which will elide the names when they are not used by
+      the Archive:
+
+      @code{.cpp}
+      struct MyStruct
+      {
+        int a, b;
+
+        template<class Archive>
+        void serialize(Archive & archive)
+        {
+          archive( cereal::make_nvp<Archive>(a),
+                   cereal::make_nvp<Archive>(b) );
+        }
+      };
+      @endcode
+
+      This third method is generally only used when providing generic type
+      support.  Users writing their own serialize functions will normally
+      explicitly control whether they want to use NVPs or not.
+
+      @internal */
+  template <class T>
+  class NameValuePair : detail::NameValuePairCore
+  {
+    private:
+      // If we get passed an array, keep the type as is, otherwise store
+      // a reference if we were passed an l value reference, else copy the value
+      using Type = typename std::conditional<std::is_array<typename std::remove_reference<T>::type>::value,
+                                             typename std::remove_cv<T>::type,
+                                             typename std::conditional<std::is_lvalue_reference<T>::value,
+                                                                       T,
+                                                                       typename std::decay<T>::type>::type>::type;
+
+      // prevent nested nvps
+      static_assert( !std::is_base_of<detail::NameValuePairCore, T>::value,
+                     "Cannot pair a name to a NameValuePair" );
+
+      NameValuePair & operator=( NameValuePair const & ) = delete;
+
+    public:
+      //! Constructs a new NameValuePair
+      /*! @param n The name of the pair
+          @param v The value to pair.  Ideally this should be an l-value reference so that
+                   the value can be both loaded and saved to.  If you pass an r-value reference,
+                   the NameValuePair will store a copy of it instead of a reference.  Thus you should
+                   only pass r-values in cases where this makes sense, such as the result of some
+                   size() call.
+          @internal */
+      NameValuePair( char const * n, T && v ) : name(n), value(std::forward<T>(v)) {}
+
+      char const * name;
+      Type value;
+  };
+
+  //! A specialization of make_nvp<> that simply forwards the value for binary archives
+  /*! @relates NameValuePair
+      @internal */
+  template<class Archive, class T> inline
+  typename
+  std::enable_if<std::is_same<Archive, ::cereal::BinaryInputArchive>::value ||
+                 std::is_same<Archive, ::cereal::BinaryOutputArchive>::value,
+  T && >::type
+  make_nvp( const char *, T && value )
+  {
+    return std::forward<T>(value);
+  }
+
+  //! A specialization of make_nvp<> that actually creates an nvp for non-binary archives
+  /*! @relates NameValuePair
+      @internal */
+  template<class Archive, class T> inline
+  typename
+  std::enable_if<!std::is_same<Archive, ::cereal::BinaryInputArchive>::value &&
+                 !std::is_same<Archive, ::cereal::BinaryOutputArchive>::value,
+  NameValuePair<T> >::type
+  make_nvp( const char * name, T && value)
+  {
+    return {name, std::forward<T>(value)};
+  }
+
+  //! Convenience for creating a templated NVP
+  /*! For use in internal generic typing functions which have an
+      Archive type declared
+      @internal */
+  #define CEREAL_NVP_(name, value) ::cereal::make_nvp<Archive>(name, value)
+
+  // ######################################################################
+  //! A wrapper around data that can be serialized in a binary fashion
+  /*! This class is used to demarcate data that can safely be serialized
+      as a binary chunk of data.  Individual archives can then choose how
+      best represent this during serialization.
+
+      @internal */
+  template <class T>
+  struct BinaryData
+  {
+    //! Internally store the pointer as a void *, keeping const if created with
+    //! a const pointer
+    using PT = typename std::conditional<std::is_const<typename std::remove_pointer<T>::type>::value,
+                                         const void *,
+                                         void *>::type;
+
+    BinaryData( T && d, uint64_t s ) : data(std::forward<T>(d)), size(s) {}
+
+    PT data;       //!< pointer to beginning of data
+    uint64_t size; //!< size in bytes
+  };
+
+  // ######################################################################
+  namespace detail
+  {
+    // base classes for type checking
+    /* The rtti virtual function only exists to enable an archive to
+       be used in a polymorphic fashion, if necessary.  See the
+       archive adapters for an example of this */
+    class OutputArchiveBase
+    {
+      public:
+        OutputArchiveBase() = default;
+        OutputArchiveBase( OutputArchiveBase && ) CEREAL_NOEXCEPT {}
+        OutputArchiveBase & operator=( OutputArchiveBase && ) CEREAL_NOEXCEPT { return *this; }
+        virtual ~OutputArchiveBase() CEREAL_NOEXCEPT = default;
+
+      private:
+        virtual void rtti() {}
+    };
+
+    class InputArchiveBase
+    {
+      public:
+        InputArchiveBase() = default;
+        InputArchiveBase( InputArchiveBase && ) CEREAL_NOEXCEPT {}
+        InputArchiveBase & operator=( InputArchiveBase && ) CEREAL_NOEXCEPT { return *this; }
+        virtual ~InputArchiveBase() CEREAL_NOEXCEPT = default;
+
+      private:
+        virtual void rtti() {}
+    };
+
+    // forward decls for polymorphic support
+    template <class Archive, class T> struct polymorphic_serialization_support;
+    struct adl_tag;
+
+    // used during saving pointers
+    static const int32_t msb_32bit  = 0x80000000;
+    static const int32_t msb2_32bit = 0x40000000;
+  }
+
+  // ######################################################################
+  //! A wrapper around size metadata
+  /*! This class provides a way for archives to have more flexibility over how
+      they choose to serialize size metadata for containers.  For some archive
+      types, the size may be implicitly encoded in the output (e.g. JSON) and
+      not need an explicit entry.  Specializing serialize or load/save for
+      your archive and SizeTags allows you to choose what happens.
+
+      @internal */
+  template <class T>
+  class SizeTag
+  {
+    private:
+      // Store a reference if passed an lvalue reference, otherwise
+      // make a copy of the data
+      using Type = typename std::conditional<std::is_lvalue_reference<T>::value,
+                                             T,
+                                             typename std::decay<T>::type>::type;
+
+      SizeTag & operator=( SizeTag const & ) = delete;
+
+    public:
+      SizeTag( T && sz ) : size(std::forward<T>(sz)) {}
+
+      Type size;
+  };
+
+  // ######################################################################
+  //! A wrapper around a key and value for serializing data into maps.
+  /*! This class just provides a grouping of keys and values into a struct for
+      human readable archives. For example, XML archives will use this wrapper
+      to write maps like so:
+
+      @code{.xml}
+      <mymap>
+        <item0>
+          <key>MyFirstKey</key>
+          <value>MyFirstValue</value>
+        </item0>
+        <item1>
+          <key>MySecondKey</key>
+          <value>MySecondValue</value>
+        </item1>
+      </mymap>
+      @endcode
+
+      \sa make_map_item
+      @internal */
+  template <class Key, class Value>
+  struct MapItem
+  {
+    using KeyType = typename std::conditional<
+      std::is_lvalue_reference<Key>::value,
+      Key,
+      typename std::decay<Key>::type>::type;
+
+    using ValueType = typename std::conditional<
+      std::is_lvalue_reference<Value>::value,
+      Value,
+      typename std::decay<Value>::type>::type;
+
+    //! Construct a MapItem from a key and a value
+    /*! @internal */
+    MapItem( Key && key_, Value && value_ ) : key(std::forward<Key>(key_)), value(std::forward<Value>(value_)) {}
+
+    MapItem & operator=( MapItem const & ) = delete;
+
+    KeyType key;
+    ValueType value;
+
+    //! Serialize the MapItem with the NVPs "key" and "value"
+    template <class Archive> inline
+    void CEREAL_SERIALIZE_FUNCTION_NAME(Archive & archive)
+    {
+      archive( make_nvp<Archive>("key",   key),
+               make_nvp<Archive>("value", value) );
+    }
+  };
+
+  //! Create a MapItem so that human readable archives will group keys and values together
+  /*! @internal
+      @relates MapItem */
+  template <class KeyType, class ValueType> inline
+  MapItem<KeyType, ValueType> make_map_item(KeyType && key, ValueType && value)
+  {
+    return {std::forward<KeyType>(key), std::forward<ValueType>(value)};
+  }
+
+  namespace detail
+  {
+    //! Tag for Version, which due to its anonymous namespace, becomes a different
+    //! type in each translation unit
+    /*! This allows CEREAL_CLASS_VERSION to be safely called in a header file */
+    namespace{ struct version_binding_tag {}; }
+
+    // ######################################################################
+    //! Version information class
+    /*! This is the base case for classes that have not been explicitly
+        registered */
+    template <class T, class BindingTag = version_binding_tag> struct Version
+    {
+      static const std::uint32_t version = 0;
+      // we don't need to explicitly register these types since they
+      // always get a version number of 0
+    };
+
+    //! Holds all registered version information
+    struct Versions
+    {
+      std::unordered_map<std::size_t, std::uint32_t> mapping;
+
+      std::uint32_t find( std::size_t hash, std::uint32_t version )
+      {
+        const auto result = mapping.emplace( hash, version );
+        return result.first->second;
+      }
+    }; // struct Versions
+  } // namespace detail
+} // namespace cereal
+
+#endif // CEREAL_DETAILS_HELPERS_HPP_
diff --git a/Src/External/cereal/include/cereal/details/polymorphic_impl.hpp b/Src/External/cereal/include/cereal/details/polymorphic_impl.hpp
new file mode 100644
index 0000000..81128c8
--- /dev/null
+++ b/Src/External/cereal/include/cereal/details/polymorphic_impl.hpp
@@ -0,0 +1,764 @@
+/*! \file polymorphic_impl.hpp
+    \brief Internal polymorphism support
+    \ingroup Internal */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* This code is heavily inspired by the boost serialization implementation by the following authors
+
+   (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+   Use, modification and distribution is subject to the Boost Software
+   License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)
+
+    See http://www.boost.org for updates, documentation, and revision history.
+
+   (C) Copyright 2006 David Abrahams - http://www.boost.org.
+
+   See /boost/serialization/export.hpp, /boost/archive/detail/register_archive.hpp,
+   and /boost/serialization/void_cast.hpp for their implementation. Additional details
+   found in other files split across serialization and archive.
+*/
+#ifndef CEREAL_DETAILS_POLYMORPHIC_IMPL_HPP_
+#define CEREAL_DETAILS_POLYMORPHIC_IMPL_HPP_
+
+#include "cereal/details/polymorphic_impl_fwd.hpp"
+#include "cereal/details/static_object.hpp"
+#include "cereal/types/memory.hpp"
+#include "cereal/types/string.hpp"
+#include <functional>
+#include <typeindex>
+#include <map>
+#include <limits>
+#include <set>
+#include <stack>
+
+//! Binds a polymorhic type to all registered archives
+/*! This binds a polymorphic type to all compatible registered archives that
+    have been registered with CEREAL_REGISTER_ARCHIVE.  This must be called
+    after all archives are registered (usually after the archives themselves
+    have been included). */
+#define CEREAL_BIND_TO_ARCHIVES(...)                                     \
+    namespace cereal {                                                   \
+    namespace detail {                                                   \
+    template<>                                                           \
+    struct init_binding<__VA_ARGS__> {                                   \
+        static bind_to_archives<__VA_ARGS__> const & b;                  \
+        static void unused() { (void)b; }                                \
+    };                                                                   \
+    bind_to_archives<__VA_ARGS__> const & init_binding<__VA_ARGS__>::b = \
+        ::cereal::detail::StaticObject<                                  \
+            bind_to_archives<__VA_ARGS__>                                \
+        >::getInstance().bind();                                         \
+    }} /* end namespaces */
+
+namespace cereal
+{
+  /* Polymorphic casting support */
+  namespace detail
+  {
+    //! Base type for polymorphic void casting
+    /*! Contains functions for casting between registered base and derived types.
+
+        This is necessary so that cereal can properly cast between polymorphic types
+        even though void pointers are used, which normally have no type information.
+        Runtime type information is used instead to index a compile-time made mapping
+        that can perform the proper cast. In the case of multiple levels of inheritance,
+        cereal will attempt to find the shortest path by using registered relationships to
+        perform the cast.
+
+        This class will be allocated as a StaticObject and only referenced by pointer,
+        allowing a templated derived version of it to define strongly typed functions
+        that cast between registered base and derived types. */
+    struct PolymorphicCaster
+    {
+      PolymorphicCaster() = default;
+      PolymorphicCaster( const PolymorphicCaster & ) = default;
+      PolymorphicCaster & operator=( const PolymorphicCaster & ) = default;
+      PolymorphicCaster( PolymorphicCaster && ) CEREAL_NOEXCEPT {}
+      PolymorphicCaster & operator=( PolymorphicCaster && ) CEREAL_NOEXCEPT { return *this; }
+      virtual ~PolymorphicCaster() CEREAL_NOEXCEPT = default;
+
+      //! Downcasts to the proper derived type
+      virtual void const * downcast( void const * const ptr ) const = 0;
+      //! Upcast to proper base type
+      virtual void * upcast( void * const ptr ) const = 0;
+      //! Upcast to proper base type, shared_ptr version
+      virtual std::shared_ptr<void> upcast( std::shared_ptr<void> const & ptr ) const = 0;
+    };
+
+    //! Holds registered mappings between base and derived types for casting
+    /*! This will be allocated as a StaticObject and holds a map containing
+        all registered mappings between base and derived types. */
+    struct PolymorphicCasters
+    {
+      //! Maps from base type index to a map from derived type index to caster
+      std::map<std::type_index, std::map<std::type_index, std::vector<PolymorphicCaster const*>>> map;
+
+      std::multimap<std::type_index, std::type_index> reverseMap;
+
+      //! Error message used for unregistered polymorphic casts
+      #define UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(LoadSave)                                                                                                                \
+        throw cereal::Exception("Trying to " #LoadSave " a registered polymorphic type with an unregistered polymorphic cast.\n"                                               \
+                                "Could not find a path to a base class (" + util::demangle(baseInfo.name()) + ") for type: " + ::cereal::util::demangledName<Derived>() + "\n" \
+                                "Make sure you either serialize the base class at some point via cereal::base_class or cereal::virtual_base_class.\n"                          \
+                                "Alternatively, manually register the association with CEREAL_REGISTER_POLYMORPHIC_RELATION.");
+
+      //! Checks if the mapping object that can perform the upcast or downcast
+      /*! Uses the type index from the base and derived class to find the matching
+          registered caster. If no matching caster exists, returns false. */
+      static bool exists( std::type_index const & baseIndex, std::type_index const & derivedIndex )
+      {
+        // First phase of lookup - match base type index
+        auto const & baseMap = StaticObject<PolymorphicCasters>::getInstance().map;
+        auto baseIter = baseMap.find( baseIndex );
+        if (baseIter == baseMap.end())
+          return false;
+
+        // Second phase - find a match from base to derived
+        auto & derivedMap = baseIter->second;
+        auto derivedIter = derivedMap.find( derivedIndex );
+        if (derivedIter == derivedMap.end())
+          return false;
+
+        return true;
+      }
+
+      //! Gets the mapping object that can perform the upcast or downcast
+      /*! Uses the type index from the base and derived class to find the matching
+          registered caster. If no matching caster exists, calls the exception function.
+
+          The returned PolymorphicCaster is capable of upcasting or downcasting between the two types. */
+      template <class F> inline
+      static std::vector<PolymorphicCaster const *> const & lookup( std::type_index const & baseIndex, std::type_index const & derivedIndex, F && exceptionFunc )
+      {
+        // First phase of lookup - match base type index
+        auto const & baseMap = StaticObject<PolymorphicCasters>::getInstance().map;
+        auto baseIter = baseMap.find( baseIndex );
+        if( baseIter == baseMap.end() )
+          exceptionFunc();
+
+        // Second phase - find a match from base to derived
+        auto & derivedMap = baseIter->second;
+        auto derivedIter = derivedMap.find( derivedIndex );
+        if( derivedIter == derivedMap.end() )
+          exceptionFunc();
+
+        return derivedIter->second;
+      }
+
+      //! Performs a downcast to the derived type using a registered mapping
+      template <class Derived> inline
+      static const Derived * downcast( const void * dptr, std::type_info const & baseInfo )
+      {
+        auto const & mapping = lookup( baseInfo, typeid(Derived), [&](){ UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(save) } );
+
+        for( auto const * map : mapping )
+          dptr = map->downcast( dptr );
+
+        return static_cast<Derived const *>( dptr );
+      }
+
+      //! Performs an upcast to the registered base type using the given a derived type
+      /*! The return is untyped because the final casting to the base type must happen in the polymorphic
+          serialization function, where the type is known at compile time */
+      template <class Derived> inline
+      static void * upcast( Derived * const dptr, std::type_info const & baseInfo )
+      {
+        auto const & mapping = lookup( baseInfo, typeid(Derived), [&](){ UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(load) } );
+
+        void * uptr = dptr;
+        for( auto mIter = mapping.rbegin(), mEnd = mapping.rend(); mIter != mEnd; ++mIter )
+          uptr = (*mIter)->upcast( uptr );
+
+        return uptr;
+      }
+
+      //! Upcasts for shared pointers
+      template <class Derived> inline
+      static std::shared_ptr<void> upcast( std::shared_ptr<Derived> const & dptr, std::type_info const & baseInfo )
+      {
+        auto const & mapping = lookup( baseInfo, typeid(Derived), [&](){ UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(load) } );
+
+        std::shared_ptr<void> uptr = dptr;
+        for( auto mIter = mapping.rbegin(), mEnd = mapping.rend(); mIter != mEnd; ++mIter )
+          uptr = (*mIter)->upcast( uptr );
+
+        return uptr;
+      }
+
+      #undef UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION
+    };
+
+    //! Strongly typed derivation of PolymorphicCaster
+    template <class Base, class Derived>
+    struct PolymorphicVirtualCaster : PolymorphicCaster
+    {
+      //! Inserts an entry in the polymorphic casting map for this pairing
+      /*! Creates an explicit mapping between Base and Derived in both upwards and
+          downwards directions, allowing void pointers to either to be properly cast
+          assuming dynamic type information is available */
+      PolymorphicVirtualCaster()
+      {
+        const auto baseKey = std::type_index(typeid(Base));
+        const auto derivedKey = std::type_index(typeid(Derived));
+
+        // First insert the relation Base->Derived
+        const auto lock = StaticObject<PolymorphicCasters>::lock();
+        auto & baseMap = StaticObject<PolymorphicCasters>::getInstance().map;
+        auto lb = baseMap.lower_bound(baseKey);
+
+        {
+          auto & derivedMap = baseMap.insert( lb, {baseKey, {}} )->second;
+          auto lbd = derivedMap.lower_bound(derivedKey);
+          auto & derivedVec = derivedMap.insert( lbd, { std::move(derivedKey), {}} )->second;
+          derivedVec.push_back( this );
+        }
+
+        // Insert reverse relation Derived->Base
+        auto & reverseMap = StaticObject<PolymorphicCasters>::getInstance().reverseMap;
+        reverseMap.insert( {derivedKey, baseKey} );
+
+        // Find all chainable unregistered relations
+        /* The strategy here is to process only the nodes in the class hierarchy graph that have been
+           affected by the new insertion. The aglorithm iteratively processes a node an ensures that it
+           is updated with all new shortest length paths. It then rocesses the parents of the active node,
+           with the knowledge that all children have already been processed.
+
+           Note that for the following, we'll use the nomenclature of parent and child to not confuse with
+           the inserted base derived relationship */
+        {
+          // Checks whether there is a path from parent->child and returns a <dist, path> pair
+          // dist is set to MAX if the path does not exist
+          auto checkRelation = [](std::type_index const & parentInfo, std::type_index const & childInfo) ->
+            std::pair<size_t, std::vector<PolymorphicCaster const *>>
+          {
+            if( PolymorphicCasters::exists( parentInfo, childInfo ) )
+            {
+              auto const & path = PolymorphicCasters::lookup( parentInfo, childInfo, [](){} );
+              return {path.size(), path};
+            }
+            else
+              return {std::numeric_limits<size_t>::max(), {}};
+          };
+
+          std::stack<std::type_index> parentStack;      // Holds the parent nodes to be processed
+          std::set<std::type_index>   dirtySet;         // Marks child nodes that have been changed
+          std::set<std::type_index>   processedParents; // Marks parent nodes that have been processed
+
+          // Begin processing the base key and mark derived as dirty
+          parentStack.push( baseKey );
+          dirtySet.insert( derivedKey );
+
+          while( !parentStack.empty() )
+          {
+            using Relations = std::multimap<std::type_index, std::pair<std::type_index, std::vector<PolymorphicCaster const *>>>;
+            Relations unregisteredRelations; // Defer insertions until after main loop to prevent iterator invalidation
+
+            const auto parent = parentStack.top();
+            parentStack.pop();
+
+            // Update paths to all children marked dirty
+            for( auto const & childPair : baseMap[parent] )
+            {
+              const auto child = childPair.first;
+              if( dirtySet.count( child ) && baseMap.count( child ) )
+              {
+                auto parentChildPath = checkRelation( parent, child );
+
+                // Search all paths from the child to its own children (finalChild),
+                // looking for a shorter parth from parent to finalChild
+                for( auto const & finalChildPair : baseMap[child] )
+                {
+                  const auto finalChild = finalChildPair.first;
+
+                  auto parentFinalChildPath = checkRelation( parent, finalChild );
+                  auto childFinalChildPath  = checkRelation( child, finalChild );
+
+                  const size_t newLength = 1u + parentChildPath.first;
+
+                  if( newLength < parentFinalChildPath.first )
+                  {
+                    std::vector<PolymorphicCaster const *> path = parentChildPath.second;
+                    path.insert( path.end(), childFinalChildPath.second.begin(), childFinalChildPath.second.end() );
+
+                    // Check to see if we have a previous uncommitted path in unregisteredRelations
+                    // that is shorter. If so, ignore this path
+                    auto hintRange = unregisteredRelations.equal_range( parent );
+                    auto hint = hintRange.first;
+                    for( ; hint != hintRange.second; ++hint )
+                      if( hint->second.first == finalChild )
+                        break;
+
+                    const bool uncommittedExists = hint != unregisteredRelations.end();
+                    if( uncommittedExists && (hint->second.second.size() <= newLength) )
+                      continue;
+
+                    auto newPath = std::pair<std::type_index, std::vector<PolymorphicCaster const *>>{finalChild, std::move(path)};
+
+                    // Insert the new path if it doesn't exist, otherwise this will just lookup where to do the
+                    // replacement
+                    #ifdef CEREAL_OLDER_GCC
+                    auto old = unregisteredRelations.insert( hint, std::make_pair(parent, newPath) );
+                    #else // NOT CEREAL_OLDER_GCC
+                    auto old = unregisteredRelations.emplace_hint( hint, parent, newPath );
+                    #endif // NOT CEREAL_OLDER_GCC
+
+                    // If there was an uncommitted path, we need to perform a replacement
+                    if( uncommittedExists )
+                      old->second = newPath;
+                  }
+                } // end loop over child's children
+              } // end if dirty and child has children
+            } // end loop over children
+
+            // Insert chained relations
+            for( auto const & it : unregisteredRelations )
+            {
+              auto & derivedMap = baseMap.find( it.first )->second;
+              derivedMap[it.second.first] = it.second.second;
+              reverseMap.insert( {it.second.first, it.first} );
+            }
+
+            // Mark current parent as modified
+            dirtySet.insert( parent );
+
+            // Insert all parents of the current parent node that haven't yet been processed
+            auto parentRange = reverseMap.equal_range( parent );
+            for( auto pIter = parentRange.first; pIter != parentRange.second; ++pIter )
+            {
+              const auto pParent = pIter->second;
+              if( !processedParents.count( pParent ) )
+              {
+                parentStack.push( pParent );
+                processedParents.insert( pParent );
+              }
+            }
+          } // end loop over parent stack
+        } // end chainable relations
+      } // end PolymorphicVirtualCaster()
+
+      //! Performs the proper downcast with the templated types
+      void const * downcast( void const * const ptr ) const override
+      {
+        return dynamic_cast<Derived const*>( static_cast<Base const*>( ptr ) );
+      }
+
+      //! Performs the proper upcast with the templated types
+      void * upcast( void * const ptr ) const override
+      {
+        return dynamic_cast<Base*>( static_cast<Derived*>( ptr ) );
+      }
+
+      //! Performs the proper upcast with the templated types (shared_ptr version)
+      std::shared_ptr<void> upcast( std::shared_ptr<void> const & ptr ) const override
+      {
+        return std::dynamic_pointer_cast<Base>( std::static_pointer_cast<Derived>( ptr ) );
+      }
+    };
+
+    //! Registers a polymorphic casting relation between a Base and Derived type
+    /*! Registering a relation allows cereal to properly cast between the two types
+        given runtime type information and void pointers.
+
+        Registration happens automatically via cereal::base_class and cereal::virtual_base_class
+        instantiations. For cases where neither is called, see the CEREAL_REGISTER_POLYMORPHIC_RELATION
+        macro */
+    template <class Base, class Derived>
+    struct RegisterPolymorphicCaster
+    {
+      static PolymorphicCaster const * bind( std::true_type /* is_polymorphic<Base> */)
+      {
+        return &StaticObject<PolymorphicVirtualCaster<Base, Derived>>::getInstance();
+      }
+
+      static PolymorphicCaster const * bind( std::false_type /* is_polymorphic<Base> */ )
+      { return nullptr; }
+
+      //! Performs registration (binding) between Base and Derived
+      /*! If the type is not polymorphic, nothing will happen */
+      static PolymorphicCaster const * bind()
+      { return bind( typename std::is_polymorphic<Base>::type() ); }
+    };
+  }
+
+  /* General polymorphism support */
+  namespace detail
+  {
+    //! Binds a compile time type with a user defined string
+    template <class T>
+    struct binding_name {};
+
+    //! A structure holding a map from type_indices to output serializer functions
+    /*! A static object of this map should be created for each registered archive
+        type, containing entries for every registered type that describe how to
+        properly cast the type to its real type in polymorphic scenarios for
+        shared_ptr, weak_ptr, and unique_ptr. */
+    template <class Archive>
+    struct OutputBindingMap
+    {
+      //! A serializer function
+      /*! Serializer functions return nothing and take an archive as
+          their first parameter (will be cast properly inside the function,
+          a pointer to actual data (contents of smart_ptr's get() function)
+          as their second parameter, and the type info of the owning smart_ptr
+          as their final parameter */
+      typedef std::function<void(void*, void const *, std::type_info const &)> Serializer;
+
+      //! Struct containing the serializer functions for all pointer types
+      struct Serializers
+      {
+        Serializer shared_ptr, //!< Serializer function for shared/weak pointers
+                   unique_ptr; //!< Serializer function for unique pointers
+      };
+
+      //! A map of serializers for pointers of all registered types
+      std::map<std::type_index, Serializers> map;
+    };
+
+    //! An empty noop deleter
+    template<class T> struct EmptyDeleter { void operator()(T *) const {} };
+
+    //! A structure holding a map from type name strings to input serializer functions
+    /*! A static object of this map should be created for each registered archive
+        type, containing entries for every registered type that describe how to
+        properly cast the type to its real type in polymorphic scenarios for
+        shared_ptr, weak_ptr, and unique_ptr. */
+    template <class Archive>
+    struct InputBindingMap
+    {
+      //! Shared ptr serializer function
+      /*! Serializer functions return nothing and take an archive as
+          their first parameter (will be cast properly inside the function,
+          a shared_ptr (or unique_ptr for the unique case) of any base
+          type, and the type id of said base type as the third parameter.
+          Internally it will properly be loaded and cast to the correct type. */
+      typedef std::function<void(void*, std::shared_ptr<void> &, std::type_info const &)> SharedSerializer;
+      //! Unique ptr serializer function
+      typedef std::function<void(void*, std::unique_ptr<void, EmptyDeleter<void>> &, std::type_info const &)> UniqueSerializer;
+
+      //! Struct containing the serializer functions for all pointer types
+      struct Serializers
+      {
+        SharedSerializer shared_ptr; //!< Serializer function for shared/weak pointers
+        UniqueSerializer unique_ptr; //!< Serializer function for unique pointers
+      };
+
+      //! A map of serializers for pointers of all registered types
+      std::map<std::string, Serializers> map;
+    };
+
+    // forward decls for archives from cereal.hpp
+    class InputArchiveBase;
+    class OutputArchiveBase;
+
+    //! Creates a binding (map entry) between an input archive type and a polymorphic type
+    /*! Bindings are made when types are registered, assuming that at least one
+        archive has already been registered.  When this struct is created,
+        it will insert (at run time) an entry into a map that properly handles
+        casting for serializing polymorphic objects */
+    template <class Archive, class T> struct InputBindingCreator
+    {
+      //! Initialize the binding
+      InputBindingCreator()
+      {
+        auto & map = StaticObject<InputBindingMap<Archive>>::getInstance().map;
+        auto lock = StaticObject<InputBindingMap<Archive>>::lock();
+        auto key = std::string(binding_name<T>::name());
+        auto lb = map.lower_bound(key);
+
+        if (lb != map.end() && lb->first == key)
+          return;
+
+        typename InputBindingMap<Archive>::Serializers serializers;
+
+        serializers.shared_ptr =
+          [](void * arptr, std::shared_ptr<void> & dptr, std::type_info const & baseInfo)
+          {
+            Archive & ar = *static_cast<Archive*>(arptr);
+            std::shared_ptr<T> ptr;
+
+            ar( CEREAL_NVP_("ptr_wrapper", ::cereal::memory_detail::make_ptr_wrapper(ptr)) );
+
+            dptr = PolymorphicCasters::template upcast<T>( ptr, baseInfo );
+          };
+
+        serializers.unique_ptr =
+          [](void * arptr, std::unique_ptr<void, EmptyDeleter<void>> & dptr, std::type_info const & baseInfo)
+          {
+            Archive & ar = *static_cast<Archive*>(arptr);
+            std::unique_ptr<T> ptr;
+
+            ar( CEREAL_NVP_("ptr_wrapper", ::cereal::memory_detail::make_ptr_wrapper(ptr)) );
+
+            dptr.reset( PolymorphicCasters::template upcast<T>( ptr.release(), baseInfo ));
+          };
+
+        map.insert( lb, { std::move(key), std::move(serializers) } );
+      }
+    };
+
+    //! Creates a binding (map entry) between an output archive type and a polymorphic type
+    /*! Bindings are made when types are registered, assuming that at least one
+        archive has already been registered.  When this struct is created,
+        it will insert (at run time) an entry into a map that properly handles
+        casting for serializing polymorphic objects */
+    template <class Archive, class T> struct OutputBindingCreator
+    {
+      //! Writes appropriate metadata to the archive for this polymorphic type
+      static void writeMetadata(Archive & ar)
+      {
+        // Register the polymorphic type name with the archive, and get the id
+        char const * name = binding_name<T>::name();
+        std::uint32_t id = ar.registerPolymorphicType(name);
+
+        // Serialize the id
+        ar( CEREAL_NVP_("polymorphic_id", id) );
+
+        // If the msb of the id is 1, then the type name is new, and we should serialize it
+        if( id & detail::msb_32bit )
+        {
+          std::string namestring(name);
+          ar( CEREAL_NVP_("polymorphic_name", namestring) );
+        }
+      }
+
+      //! Holds a properly typed shared_ptr to the polymorphic type
+      class PolymorphicSharedPointerWrapper
+      {
+        public:
+          /*! Wrap a raw polymorphic pointer in a shared_ptr to its true type
+
+              The wrapped pointer will not be responsible for ownership of the held pointer
+              so it will not attempt to destroy it; instead the refcount of the wrapped
+              pointer will be tied to a fake 'ownership pointer' that will do nothing
+              when it ultimately goes out of scope.
+
+              The main reason for doing this, other than not to destroy the true object
+              with our wrapper pointer, is to avoid meddling with the internal reference
+              count in a polymorphic type that inherits from std::enable_shared_from_this.
+
+              @param dptr A void pointer to the contents of the shared_ptr to serialize */
+          PolymorphicSharedPointerWrapper( T const * dptr ) : refCount(), wrappedPtr( refCount, dptr )
+          { }
+
+          //! Get the wrapped shared_ptr */
+          inline std::shared_ptr<T const> const & operator()() const { return wrappedPtr; }
+
+        private:
+          std::shared_ptr<void> refCount;      //!< The ownership pointer
+          std::shared_ptr<T const> wrappedPtr; //!< The wrapped pointer
+      };
+
+      //! Does the actual work of saving a polymorphic shared_ptr
+      /*! This function will properly create a shared_ptr from the void * that is passed in
+          before passing it to the archive for serialization.
+
+          In addition, this will also preserve the state of any internal enable_shared_from_this mechanisms
+
+          @param ar The archive to serialize to
+          @param dptr Pointer to the actual data held by the shared_ptr */
+      static inline void savePolymorphicSharedPtr( Archive & ar, T const * dptr, std::true_type /* has_shared_from_this */ )
+      {
+        ::cereal::memory_detail::EnableSharedStateHelper<T> state( const_cast<T *>(dptr) );
+        PolymorphicSharedPointerWrapper psptr( dptr );
+        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( psptr() ) ) );
+      }
+
+      //! Does the actual work of saving a polymorphic shared_ptr
+      /*! This function will properly create a shared_ptr from the void * that is passed in
+          before passing it to the archive for serialization.
+
+          This version is for types that do not inherit from std::enable_shared_from_this.
+
+          @param ar The archive to serialize to
+          @param dptr Pointer to the actual data held by the shared_ptr */
+      static inline void savePolymorphicSharedPtr( Archive & ar, T const * dptr, std::false_type /* has_shared_from_this */ )
+      {
+        PolymorphicSharedPointerWrapper psptr( dptr );
+        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( psptr() ) ) );
+      }
+
+      //! Initialize the binding
+      OutputBindingCreator()
+      {
+        auto & map = StaticObject<OutputBindingMap<Archive>>::getInstance().map;
+        auto key = std::type_index(typeid(T));
+        auto lb = map.lower_bound(key);
+
+        if (lb != map.end() && lb->first == key)
+          return;
+
+        typename OutputBindingMap<Archive>::Serializers serializers;
+
+        serializers.shared_ptr =
+          [&](void * arptr, void const * dptr, std::type_info const & baseInfo)
+          {
+            Archive & ar = *static_cast<Archive*>(arptr);
+            writeMetadata(ar);
+
+            auto ptr = PolymorphicCasters::template downcast<T>( dptr, baseInfo );
+
+            #ifdef _MSC_VER
+            savePolymorphicSharedPtr( ar, ptr, ::cereal::traits::has_shared_from_this<T>::type() ); // MSVC doesn't like typename here
+            #else // not _MSC_VER
+            savePolymorphicSharedPtr( ar, ptr, typename ::cereal::traits::has_shared_from_this<T>::type() );
+            #endif // _MSC_VER
+          };
+
+        serializers.unique_ptr =
+          [&](void * arptr, void const * dptr, std::type_info const & baseInfo)
+          {
+            Archive & ar = *static_cast<Archive*>(arptr);
+            writeMetadata(ar);
+
+            std::unique_ptr<T const, EmptyDeleter<T const>> const ptr( PolymorphicCasters::template downcast<T>( dptr, baseInfo ) );
+
+            ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
+          };
+
+        map.insert( { std::move(key), std::move(serializers) } );
+      }
+    };
+
+    //! Used to help out argument dependent lookup for finding potential overloads
+    //! of instantiate_polymorphic_binding
+    struct adl_tag {};
+
+    //! Tag for init_binding, bind_to_archives and instantiate_polymorphic_binding. Due to the use of anonymous
+    //! namespace it becomes a different type in each translation unit.
+    namespace { struct polymorphic_binding_tag {}; }
+
+    //! Causes the static object bindings between an archive type and a serializable type T
+    template <class Archive, class T>
+    struct create_bindings
+    {
+      static const InputBindingCreator<Archive, T> &
+      load(std::true_type)
+      {
+        return cereal::detail::StaticObject<InputBindingCreator<Archive, T>>::getInstance();
+      }
+
+      static const OutputBindingCreator<Archive, T> &
+      save(std::true_type)
+      {
+        return cereal::detail::StaticObject<OutputBindingCreator<Archive, T>>::getInstance();
+      }
+
+      inline static void load(std::false_type) {}
+      inline static void save(std::false_type) {}
+    };
+
+    //! When specialized, causes the compiler to instantiate its parameter
+    template <void(*)()>
+    struct instantiate_function {};
+
+    /*! This struct is used as the return type of instantiate_polymorphic_binding
+        for specific Archive types.  When the compiler looks for overloads of
+        instantiate_polymorphic_binding, it will be forced to instantiate this
+        struct during overload resolution, even though it will not be part of a valid
+        overload */
+    template <class Archive, class T>
+    struct polymorphic_serialization_support
+    {
+      #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+      //! Creates the appropriate bindings depending on whether the archive supports
+      //! saving or loading
+      virtual CEREAL_DLL_EXPORT void instantiate() CEREAL_USED;
+      #else // NOT _MSC_VER
+      //! Creates the appropriate bindings depending on whether the archive supports
+      //! saving or loading
+      static CEREAL_DLL_EXPORT void instantiate() CEREAL_USED;
+      //! This typedef causes the compiler to instantiate this static function
+      typedef instantiate_function<instantiate> unused;
+      #endif // _MSC_VER
+    };
+
+    // instantiate implementation
+    template <class Archive, class T>
+    CEREAL_DLL_EXPORT void polymorphic_serialization_support<Archive,T>::instantiate()
+    {
+      create_bindings<Archive,T>::save( std::integral_constant<bool,
+                                          std::is_base_of<detail::OutputArchiveBase, Archive>::value &&
+                                          traits::is_output_serializable<T, Archive>::value>{} );
+
+      create_bindings<Archive,T>::load( std::integral_constant<bool,
+                                          std::is_base_of<detail::InputArchiveBase, Archive>::value &&
+                                          traits::is_input_serializable<T, Archive>::value>{} );
+    }
+
+    //! Begins the binding process of a type to all registered archives
+    /*! Archives need to be registered prior to this struct being instantiated via
+        the CEREAL_REGISTER_ARCHIVE macro.  Overload resolution will then force
+        several static objects to be made that allow us to bind together all
+        registered archive types with the parameter type T. */
+    template <class T, class Tag = polymorphic_binding_tag>
+    struct bind_to_archives
+    {
+      //! Binding for non abstract types
+      void bind(std::false_type) const
+      {
+        instantiate_polymorphic_binding(static_cast<T*>(nullptr), 0, Tag{}, adl_tag{});
+      }
+
+      //! Binding for abstract types
+      void bind(std::true_type) const
+      { }
+
+      //! Binds the type T to all registered archives
+      /*! If T is abstract, we will not serialize it and thus
+          do not need to make a binding */
+      bind_to_archives const & bind() const
+      {
+        static_assert( std::is_polymorphic<T>::value,
+                       "Attempting to register non polymorphic type" );
+        bind( std::is_abstract<T>() );
+        return *this;
+      }
+    };
+
+    //! Used to hide the static object used to bind T to registered archives
+    template <class T, class Tag = polymorphic_binding_tag>
+    struct init_binding;
+
+    //! Base case overload for instantiation
+    /*! This will end up always being the best overload due to the second
+        parameter always being passed as an int.  All other overloads will
+        accept pointers to archive types and have lower precedence than int.
+
+        Since the compiler needs to check all possible overloads, the
+        other overloads created via CEREAL_REGISTER_ARCHIVE, which will have
+        lower precedence due to requring a conversion from int to (Archive*),
+        will cause their return types to be instantiated through the static object
+        mechanisms even though they are never called.
+
+        See the documentation for the other functions to try and understand this */
+    template <class T, typename BindingTag>
+    void instantiate_polymorphic_binding( T*, int, BindingTag, adl_tag ) {}
+  } // namespace detail
+} // namespace cereal
+
+#endif // CEREAL_DETAILS_POLYMORPHIC_IMPL_HPP_
diff --git a/Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp b/Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
new file mode 100644
index 0000000..c13ce23
--- /dev/null
+++ b/Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
@@ -0,0 +1,65 @@
+/*! \file polymorphic_impl_fwd.hpp
+    \brief Internal polymorphism support forward declarations
+    \ingroup Internal */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/* This code is heavily inspired by the boost serialization implementation by the following authors
+
+   (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+   Use, modification and distribution is subject to the Boost Software
+   License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)
+
+    See http://www.boost.org for updates, documentation, and revision history.
+
+   (C) Copyright 2006 David Abrahams - http://www.boost.org.
+
+   See /boost/serialization/export.hpp and /boost/archive/detail/register_archive.hpp for their
+   implementation.
+*/
+
+#ifndef CEREAL_DETAILS_POLYMORPHIC_IMPL_FWD_HPP_
+#define CEREAL_DETAILS_POLYMORPHIC_IMPL_FWD_HPP_
+
+namespace cereal
+{
+  namespace detail
+  {
+    //! Forward declaration, see polymorphic_impl.hpp for more information
+    template <class Base, class Derived>
+    struct RegisterPolymorphicCaster;
+
+    //! Forward declaration, see polymorphic_impl.hpp for more information
+    struct PolymorphicCasters;
+
+    //! Forward declaration, see polymorphic_impl.hpp for more information
+    template <class Base, class Derived>
+    struct PolymorphicRelation;
+  } // namespace detail
+} // namespace cereal
+
+#endif // CEREAL_DETAILS_POLYMORPHIC_IMPL_FWD_HPP_
diff --git a/Src/External/cereal/include/cereal/details/static_object.hpp b/Src/External/cereal/include/cereal/details/static_object.hpp
new file mode 100644
index 0000000..c9c888d
--- /dev/null
+++ b/Src/External/cereal/include/cereal/details/static_object.hpp
@@ -0,0 +1,127 @@
+/*! \file static_object.hpp
+    \brief Internal polymorphism static object support
+    \ingroup Internal */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_DETAILS_STATIC_OBJECT_HPP_
+#define CEREAL_DETAILS_STATIC_OBJECT_HPP_
+
+#include "cereal/macros.hpp"
+
+#if CEREAL_THREAD_SAFE
+#include <mutex>
+#endif
+
+//! Prevent link optimization from removing non-referenced static objects
+/*! Especially for polymorphic support, we create static objects which
+    may not ever be explicitly referenced.  Most linkers will detect this
+    and remove the code causing various unpleasant runtime errors.  These
+    macros, adopted from Boost (see force_include.hpp) prevent this
+    (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
+    Use, modification and distribution is subject to the Boost Software
+    License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+    http://www.boost.org/LICENSE_1_0.txt) */
+
+#ifdef _MSC_VER
+#   define CEREAL_DLL_EXPORT __declspec(dllexport)
+#   define CEREAL_USED
+#else // clang or gcc
+#   define CEREAL_DLL_EXPORT
+#   define CEREAL_USED __attribute__ ((__used__))
+#endif
+
+namespace cereal
+{
+  namespace detail
+  {
+    //! A static, pre-execution object
+    /*! This class will create a single copy (singleton) of some
+        type and ensures that merely referencing this type will
+        cause it to be instantiated and initialized pre-execution.
+        For example, this is used heavily in the polymorphic pointer
+        serialization mechanisms to bind various archive types with
+        different polymorphic classes */
+    template <class T>
+    class CEREAL_DLL_EXPORT StaticObject
+    {
+      private:
+        //! Forces instantiation at pre-execution time
+        static void instantiate( T const & ) {}
+
+        static T & create()
+        {
+          static T t;
+          instantiate(instance);
+          return t;
+        }
+
+        StaticObject( StaticObject const & /*other*/ ) {}
+
+      public:
+        static T & getInstance()
+        {
+          return create();
+        }
+
+        //! A class that acts like std::lock_guard
+        class LockGuard
+        {
+          #if CEREAL_THREAD_SAFE
+          public:
+            LockGuard(std::mutex & m) : lock(m) {}
+          private:
+            std::unique_lock<std::mutex> lock;
+          #else
+          public:
+            ~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used
+          #endif
+        };
+
+        //! Attempts to lock this static object for the current scope
+        /*! @note This function is a no-op if cereal is not compiled with
+                  thread safety enabled (CEREAL_THREAD_SAFE = 1).
+
+            This function returns an object that holds a lock for
+            this StaticObject that will release its lock upon destruction. This
+            call will block until the lock is available. */
+        static LockGuard lock()
+        {
+          #if CEREAL_THREAD_SAFE
+          static std::mutex instanceMutex;
+          return LockGuard{instanceMutex};
+          #else
+          return LockGuard{};
+          #endif
+        }
+
+      private:
+        static T & instance;
+    };
+
+    template <class T> T & StaticObject<T>::instance = StaticObject<T>::create();
+  } // namespace detail
+} // namespace cereal
+
+#endif // CEREAL_DETAILS_STATIC_OBJECT_HPP_
diff --git a/Src/External/cereal/include/cereal/details/traits.hpp b/Src/External/cereal/include/cereal/details/traits.hpp
new file mode 100644
index 0000000..3390bbd
--- /dev/null
+++ b/Src/External/cereal/include/cereal/details/traits.hpp
@@ -0,0 +1,1389 @@
+/*! \file traits.hpp
+    \brief Internal type trait support
+    \ingroup Internal */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_DETAILS_TRAITS_HPP_
+#define CEREAL_DETAILS_TRAITS_HPP_
+
+#ifndef __clang__
+#if (__GNUC__ == 4 && __GNUC_MINOR__ <= 7)
+#define CEREAL_OLDER_GCC
+#endif // gcc 4.7 or earlier
+#endif // __clang__
+
+#include <type_traits>
+#include <typeindex>
+
+#include "cereal/macros.hpp"
+#include "cereal/access.hpp"
+
+namespace cereal
+{
+  namespace traits
+  {
+    using yes = std::true_type;
+    using no  = std::false_type;
+
+    namespace detail
+    {
+      // ######################################################################
+      //! Used to delay a static_assert until template instantiation
+      template <class T>
+      struct delay_static_assert : std::false_type {};
+
+      // ######################################################################
+      // SFINAE Helpers
+      #ifdef CEREAL_OLDER_GCC // when VS supports better SFINAE, we can use this as the default
+      template<typename> struct Void { typedef void type; };
+      #endif // CEREAL_OLDER_GCC
+
+      //! Return type for SFINAE Enablers
+      enum class sfinae {};
+
+      // ######################################################################
+      // Helper functionality for boolean integral constants and Enable/DisableIf
+      template <bool H, bool ... T> struct meta_bool_and : std::integral_constant<bool, H && meta_bool_and<T...>::value> {};
+      template <bool B> struct meta_bool_and<B> : std::integral_constant<bool, B> {};
+
+      template <bool H, bool ... T> struct meta_bool_or : std::integral_constant<bool, H || meta_bool_or<T...>::value> {};
+      template <bool B> struct meta_bool_or<B> : std::integral_constant<bool, B> {};
+
+      // workaround needed due to bug in MSVC 2013, see
+      // http://connect.microsoft.com/VisualStudio/feedback/details/800231/c-11-alias-template-issue
+      template <bool ... Conditions>
+      struct EnableIfHelper : std::enable_if<meta_bool_and<Conditions...>::value, sfinae> {};
+
+      template <bool ... Conditions>
+      struct DisableIfHelper : std::enable_if<!meta_bool_or<Conditions...>::value, sfinae> {};
+    } // namespace detail
+
+    //! Used as the default value for EnableIf and DisableIf template parameters
+    /*! @relates EnableIf
+        @relates DisableIf */
+    static const detail::sfinae sfinae = {};
+
+    // ######################################################################
+    //! Provides a way to enable a function if conditions are met
+    /*! This is intended to be used in a near identical fashion to std::enable_if
+        while being significantly easier to read at the cost of not allowing for as
+        complicated of a condition.
+
+        This will compile (allow the function) if every condition evaluates to true.
+        at compile time.  This should be used with SFINAE to ensure that at least
+        one other candidate function works when one fails due to an EnableIf.
+
+        This should be used as the las template parameter to a function as
+        an unnamed parameter with a default value of cereal::traits::sfinae:
+
+        @code{cpp}
+        // using by making the last template argument variadic
+        template <class T, EnableIf<std::is_same<T, bool>::value> = sfinae>
+        void func(T t );
+        @endcode
+
+        Note that this performs a logical AND of all conditions, so you will need
+        to construct more complicated requirements with this fact in mind.
+
+        @relates DisableIf
+        @relates sfinae
+        @tparam Conditions The conditions which will be logically ANDed to enable the function. */
+    template <bool ... Conditions>
+    using EnableIf = typename detail::EnableIfHelper<Conditions...>::type;
+
+    // ######################################################################
+    //! Provides a way to disable a function if conditions are met
+    /*! This is intended to be used in a near identical fashion to std::enable_if
+        while being significantly easier to read at the cost of not allowing for as
+        complicated of a condition.
+
+        This will compile (allow the function) if every condition evaluates to false.
+        This should be used with SFINAE to ensure that at least one other candidate
+        function works when one fails due to a DisableIf.
+
+        This should be used as the las template parameter to a function as
+        an unnamed parameter with a default value of cereal::traits::sfinae:
+
+        @code{cpp}
+        // using by making the last template argument variadic
+        template <class T, DisableIf<std::is_same<T, bool>::value> = sfinae>
+        void func(T t );
+        @endcode
+
+        This is often used in conjunction with EnableIf to form an enable/disable pair of
+        overloads.
+
+        Note that this performs a logical AND of all conditions, so you will need
+        to construct more complicated requirements with this fact in mind.  If all conditions
+        hold, the function will be disabled.
+
+        @relates EnableIf
+        @relates sfinae
+        @tparam Conditions The conditions which will be logically ANDed to disable the function. */
+    template <bool ... Conditions>
+    using DisableIf = typename detail::DisableIfHelper<Conditions...>::type;
+
+    // ######################################################################
+    namespace detail
+    {
+      template <class InputArchive>
+      struct get_output_from_input : no
+      {
+        static_assert( detail::delay_static_assert<InputArchive>::value,
+            "Could not find an associated output archive for input archive." );
+      };
+
+      template <class OutputArchive>
+      struct get_input_from_output : no
+      {
+        static_assert( detail::delay_static_assert<OutputArchive>::value,
+            "Could not find an associated input archive for output archive." );
+      };
+    }
+
+    //! Sets up traits that relate an input archive to an output archive
+    #define CEREAL_SETUP_ARCHIVE_TRAITS(InputArchive, OutputArchive)  \
+    namespace cereal { namespace traits { namespace detail {          \
+      template <> struct get_output_from_input<InputArchive>          \
+      { using type = OutputArchive; };                                \
+      template <> struct get_input_from_output<OutputArchive>         \
+      { using type = InputArchive; }; } } } /* end namespaces */
+
+    // ######################################################################
+    //! Used to convert a MAKE_HAS_XXX macro into a versioned variant
+    #define CEREAL_MAKE_VERSIONED_TEST ,0
+
+    // ######################################################################
+    //! Creates a test for whether a non const member function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        @param name The name of the function to test for (e.g. serialize, load, save)
+        @param test_name The name to give the test for the function being tested for (e.g. serialize, versioned_serialize)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #ifdef CEREAL_OLDER_GCC
+    #define CEREAL_MAKE_HAS_MEMBER_TEST(name, test_name, versioned)                                                                         \
+    template <class T, class A, class SFINAE = void>                                                                                        \
+    struct has_member_##test_name : no {};                                                                                                  \
+    template <class T, class A>                                                                                                             \
+    struct has_member_##test_name<T, A,                                                                                                     \
+      typename detail::Void< decltype( cereal::access::member_##name( std::declval<A&>(), std::declval<T&>() versioned ) ) >::type> : yes {}
+    #else // NOT CEREAL_OLDER_GCC
+    #define CEREAL_MAKE_HAS_MEMBER_TEST(name, test_name, versioned)                                                                     \
+    namespace detail                                                                                                                    \
+    {                                                                                                                                   \
+      template <class T, class A>                                                                                                       \
+      struct has_member_##name##_##versioned##_impl                                                                                     \
+      {                                                                                                                                 \
+        template <class TT, class AA>                                                                                                   \
+        static auto test(int) -> decltype( cereal::access::member_##name( std::declval<AA&>(), std::declval<TT&>() versioned ), yes()); \
+        template <class, class>                                                                                                         \
+        static no test(...);                                                                                                            \
+        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                                    \
+      };                                                                                                                                \
+    } /* end namespace detail */                                                                                                        \
+    template <class T, class A>                                                                                                         \
+    struct has_member_##test_name : std::integral_constant<bool, detail::has_member_##name##_##versioned##_impl<T, A>::value> {}
+    #endif // NOT CEREAL_OLDER_GCC
+
+    // ######################################################################
+    //! Creates a test for whether a non const non-member function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper non-member function for the given archive. */
+    #define CEREAL_MAKE_HAS_NON_MEMBER_TEST(test_name, func, versioned)                                                         \
+    namespace detail                                                                                                            \
+    {                                                                                                                           \
+      template <class T, class A>                                                                                               \
+      struct has_non_member_##test_name##_impl                                                                                  \
+      {                                                                                                                         \
+        template <class TT, class AA>                                                                                           \
+        static auto test(int) -> decltype( func( std::declval<AA&>(), std::declval<TT&>() versioned ), yes());                  \
+        template <class, class>                                                                                                 \
+        static no test( ... );                                                                                                  \
+        static const bool value = std::is_same<decltype( test<T, A>( 0 ) ), yes>::value;                                        \
+      };                                                                                                                        \
+    } /* end namespace detail */                                                                                                \
+    template <class T, class A>                                                                                                 \
+    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> {}
+
+    // ######################################################################
+    // Member Serialize
+    CEREAL_MAKE_HAS_MEMBER_TEST(serialize, serialize,);
+
+    // ######################################################################
+    // Member Serialize (versioned)
+    CEREAL_MAKE_HAS_MEMBER_TEST(serialize, versioned_serialize, CEREAL_MAKE_VERSIONED_TEST);
+
+    // ######################################################################
+    // Non Member Serialize
+    CEREAL_MAKE_HAS_NON_MEMBER_TEST(serialize, CEREAL_SERIALIZE_FUNCTION_NAME,);
+
+    // ######################################################################
+    // Non Member Serialize (versioned)
+    CEREAL_MAKE_HAS_NON_MEMBER_TEST(versioned_serialize, CEREAL_SERIALIZE_FUNCTION_NAME, CEREAL_MAKE_VERSIONED_TEST);
+
+    // ######################################################################
+    // Member Load
+    CEREAL_MAKE_HAS_MEMBER_TEST(load, load,);
+
+    // ######################################################################
+    // Member Load (versioned)
+    CEREAL_MAKE_HAS_MEMBER_TEST(load, versioned_load, CEREAL_MAKE_VERSIONED_TEST);
+
+    // ######################################################################
+    // Non Member Load
+    CEREAL_MAKE_HAS_NON_MEMBER_TEST(load, CEREAL_LOAD_FUNCTION_NAME,);
+
+    // ######################################################################
+    // Non Member Load (versioned)
+    CEREAL_MAKE_HAS_NON_MEMBER_TEST(versioned_load, CEREAL_LOAD_FUNCTION_NAME, CEREAL_MAKE_VERSIONED_TEST);
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_NON_MEMBER_TEST
+    #undef CEREAL_MAKE_HAS_MEMBER_TEST
+
+    // ######################################################################
+    //! Creates a test for whether a member save function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        @param test_name The name to give the test (e.g. save or versioned_save)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #ifdef CEREAL_OLDER_GCC
+    #define CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(test_name, versioned)                                                                  \
+    namespace detail                                                                                                                \
+    {                                                                                                                               \
+    template <class T, class A>                                                                                                     \
+    struct has_member_##test_name##_impl                                                                                            \
+      {                                                                                                                             \
+        template <class TT, class AA, class SFINAE = void> struct test : no {};                                                     \
+        template <class TT, class AA>                                                                                               \
+        struct test<TT, AA,                                                                                                         \
+          typename detail::Void< decltype( cereal::access::member_save( std::declval<AA&>(),                                        \
+                                                                        std::declval<TT const &>() versioned ) ) >::type> : yes {}; \
+        static const bool value = test<T, A>();                                                                                     \
+                                                                                                                                    \
+        template <class TT, class AA, class SFINAE = void> struct test2 : no {};                                                    \
+        template <class TT, class AA>                                                                                               \
+        struct test2<TT, AA,                                                                                                        \
+          typename detail::Void< decltype( cereal::access::member_save_non_const(                                                   \
+                                            std::declval<AA&>(),                                                                    \
+                                            std::declval<typename std::remove_const<TT>::type&>() versioned ) ) >::type> : yes {};  \
+        static const bool not_const_type = test2<T, A>();                                                                           \
+      };                                                                                                                            \
+    } /* end namespace detail */
+    #else /* NOT CEREAL_OLDER_GCC =================================== */
+    #define CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(test_name, versioned)                                                                  \
+    namespace detail                                                                                                                \
+    {                                                                                                                               \
+    template <class T, class A>                                                                                                     \
+    struct has_member_##test_name##_impl                                                                                            \
+      {                                                                                                                             \
+        template <class TT, class AA>                                                                                               \
+        static auto test(int) -> decltype( cereal::access::member_save( std::declval<AA&>(),                                        \
+                                                                        std::declval<TT const &>() versioned ), yes());             \
+        template <class, class> static no test(...);                                                                                \
+        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                                \
+                                                                                                                                    \
+        template <class TT, class AA>                                                                                               \
+        static auto test2(int) -> decltype( cereal::access::member_save_non_const(                                                  \
+                                              std::declval<AA &>(),                                                                 \
+                                              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());            \
+        template <class, class> static no test2(...);                                                                               \
+        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value;                                      \
+      };                                                                                                                            \
+    } /* end namespace detail */
+    #endif /* NOT CEREAL_OLDER_GCC */
+
+    // ######################################################################
+    // Member Save
+    CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(save, )
+
+    template <class T, class A>
+    struct has_member_save : std::integral_constant<bool, detail::has_member_save_impl<T, A>::value>
+    {
+      typedef typename detail::has_member_save_impl<T, A> check;
+      static_assert( check::value || !check::not_const_type,
+        "cereal detected a non-const save. \n "
+        "save member functions must always be const" );
+    };
+
+    // ######################################################################
+    // Member Save (versioned)
+    CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(versioned_save, CEREAL_MAKE_VERSIONED_TEST)
+
+    template <class T, class A>
+    struct has_member_versioned_save : std::integral_constant<bool, detail::has_member_versioned_save_impl<T, A>::value>
+    {
+      typedef typename detail::has_member_versioned_save_impl<T, A> check;
+      static_assert( check::value || !check::not_const_type,
+        "cereal detected a versioned non-const save. \n "
+        "save member functions must always be const" );
+    };
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL
+
+    // ######################################################################
+    //! Creates a test for whether a non-member save function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper non-member function for the given archive.
+
+        @param test_name The name to give the test (e.g. save or versioned_save)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #define CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST(test_name, versioned)                                                       \
+    namespace detail                                                                                                         \
+    {                                                                                                                        \
+      template <class T, class A>                                                                                            \
+      struct has_non_member_##test_name##_impl                                                                               \
+      {                                                                                                                      \
+        template <class TT, class AA>                                                                                        \
+        static auto test(int) -> decltype( CEREAL_SAVE_FUNCTION_NAME(                                                        \
+                                              std::declval<AA&>(),                                                           \
+                                              std::declval<TT const &>() versioned ), yes());                                \
+        template <class, class> static no test(...);                                                                         \
+        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                         \
+                                                                                                                             \
+        template <class TT, class AA>                                                                                        \
+        static auto test2(int) -> decltype( CEREAL_SAVE_FUNCTION_NAME(                                                       \
+                                              std::declval<AA &>(),                                                          \
+                                              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());     \
+        template <class, class> static no test2(...);                                                                        \
+        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value;                               \
+      };                                                                                                                     \
+    } /* end namespace detail */                                                                                             \
+                                                                                                                             \
+    template <class T, class A>                                                                                              \
+    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> \
+    {                                                                                                                        \
+      using check = typename detail::has_non_member_##test_name##_impl<T, A>;                                                \
+      static_assert( check::value || !check::not_const_type,                                                                 \
+        "cereal detected a non-const type parameter in non-member " #test_name ". \n "                                       \
+        #test_name " non-member functions must always pass their types as const" );                                          \
+    };
+
+    // ######################################################################
+    // Non Member Save
+    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST(save, )
+
+    // ######################################################################
+    // Non Member Save (versioned)
+    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST(versioned_save, CEREAL_MAKE_VERSIONED_TEST)
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST
+
+    // ######################################################################
+    // Minimal Utilities
+    namespace detail
+    {
+      // Determines if the provided type is an std::string
+      template <class> struct is_string : std::false_type {};
+
+      template <class CharT, class Traits, class Alloc>
+      struct is_string<std::basic_string<CharT, Traits, Alloc>> : std::true_type {};
+    }
+
+    // Determines if the type is valid for use with a minimal serialize function
+    template <class T>
+    struct is_minimal_type : std::integral_constant<bool,
+      detail::is_string<T>::value || std::is_arithmetic<T>::value> {};
+
+    // ######################################################################
+    //! Creates implementation details for whether a member save_minimal function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #ifdef CEREAL_OLDER_GCC
+    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(test_name, versioned)                                                                        \
+    namespace detail                                                                                                                              \
+    {                                                                                                                                             \
+      template <class T, class A>                                                                                                                 \
+      struct has_member_##test_name##_impl                                                                                                        \
+      {                                                                                                                                           \
+        template <class TT, class AA, class SFINAE = void> struct test : no {};                                                                   \
+        template <class TT, class AA>                                                                                                             \
+        struct test<TT, AA, typename detail::Void< decltype(                                                                                      \
+            cereal::access::member_save_minimal( std::declval<AA const &>(),                                                                      \
+                                                 std::declval<TT const &>() versioned ) ) >::type> : yes {};                                      \
+                                                                                                                                                  \
+        static const bool value = test<T, A>();                                                                                                   \
+                                                                                                                                                  \
+        template <class TT, class AA, class SFINAE = void> struct test2 : no {};                                                                  \
+        template <class TT, class AA>                                                                                                             \
+        struct test2<TT, AA, typename detail::Void< decltype(                                                                                     \
+            cereal::access::member_save_minimal_non_const( std::declval<AA const &>(),                                                            \
+                                                           std::declval<typename std::remove_const<TT>::type&>() versioned ) ) >::type> : yes {}; \
+        static const bool not_const_type = test2<T, A>();                                                                                         \
+                                                                                                                                                  \
+        static const bool valid = value || !not_const_type;                                                                                       \
+      };                                                                                                                                          \
+    } /* end namespace detail */
+    #else /* NOT CEREAL_OLDER_GCC =================================== */
+    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(test_name, versioned)                     \
+    namespace detail                                                                           \
+    {                                                                                          \
+      template <class T, class A>                                                              \
+      struct has_member_##test_name##_impl                                                     \
+      {                                                                                        \
+        template <class TT, class AA>                                                          \
+        static auto test(int) -> decltype( cereal::access::member_save_minimal(                \
+              std::declval<AA const &>(),                                                      \
+              std::declval<TT const &>() versioned ), yes());                                  \
+        template <class, class> static no test(...);                                           \
+        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;           \
+                                                                                               \
+        template <class TT, class AA>                                                          \
+        static auto test2(int) -> decltype( cereal::access::member_save_minimal_non_const(     \
+              std::declval<AA const &>(),                                                      \
+              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());       \
+        template <class, class> static no test2(...);                                          \
+        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value; \
+                                                                                               \
+        static const bool valid = value || !not_const_type;                                    \
+      };                                                                                       \
+    } /* end namespace detail */
+    #endif // NOT CEREAL_OLDER_GCC
+
+    // ######################################################################
+    //! Creates helpers for minimal save functions
+    /*! The get_member_*_type structs allow access to the return type of a save_minimal,
+        assuming that the function actually exists.  If the function does not
+        exist, the type will be void.
+
+        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL(test_name, versioned)                           \
+    namespace detail                                                                                         \
+    {                                                                                                        \
+      template <class T, class A, bool Valid>                                                                \
+      struct get_member_##test_name##_type { using type = void; };                                           \
+                                                                                                             \
+      template <class T, class A>                                                                            \
+      struct get_member_##test_name##_type<T, A, true>                                                       \
+      {                                                                                                      \
+        using type = decltype( cereal::access::member_save_minimal( std::declval<A const &>(),               \
+                                                                    std::declval<T const &>() versioned ) ); \
+      };                                                                                                     \
+    } /* end namespace detail */
+
+    // ######################################################################
+    //! Creates a test for whether a member save_minimal function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal) */
+    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST(test_name)                                                      \
+    template <class T, class A>                                                                                      \
+    struct has_member_##test_name : std::integral_constant<bool, detail::has_member_##test_name##_impl<T, A>::value> \
+    {                                                                                                                \
+      using check = typename detail::has_member_##test_name##_impl<T, A>;                                            \
+      static_assert( check::valid,                                                                                   \
+        "cereal detected a non-const member " #test_name ". \n "                                                     \
+        #test_name " member functions must always be const" );                                                       \
+                                                                                                                     \
+      using type = typename detail::get_member_##test_name##_type<T, A, check::value>::type;                         \
+      static_assert( (check::value && is_minimal_type<type>::value) || !check::value,                                \
+        "cereal detected a member " #test_name " with an invalid return type. \n "                                   \
+        "return type must be arithmetic or string" );                                                                \
+    };
+
+    // ######################################################################
+    // Member Save Minimal
+    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(save_minimal, )
+    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL(save_minimal, )
+    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST(save_minimal)
+
+    // ######################################################################
+    // Member Save Minimal (versioned)
+    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
+    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL(versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
+    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST(versioned_save_minimal)
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL
+    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL
+    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST
+
+    // ######################################################################
+    //! Creates a test for whether a non-member save_minimal function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #define CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST(test_name, versioned)                                               \
+    namespace detail                                                                                                         \
+    {                                                                                                                        \
+      template <class T, class A>                                                                                            \
+      struct has_non_member_##test_name##_impl                                                                               \
+      {                                                                                                                      \
+        template <class TT, class AA>                                                                                        \
+        static auto test(int) -> decltype( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(                                                \
+              std::declval<AA const &>(),                                                                                    \
+              std::declval<TT const &>() versioned ), yes());                                                                \
+        template <class, class> static no test(...);                                                                         \
+        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                         \
+                                                                                                                             \
+        template <class TT, class AA>                                                                                        \
+        static auto test2(int) -> decltype( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(                                               \
+              std::declval<AA const &>(),                                                                                    \
+              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());                                     \
+        template <class, class> static no test2(...);                                                                        \
+        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value;                               \
+                                                                                                                             \
+        static const bool valid = value || !not_const_type;                                                                  \
+      };                                                                                                                     \
+                                                                                                                             \
+      template <class T, class A, bool Valid>                                                                                \
+      struct get_non_member_##test_name##_type { using type = void; };                                                       \
+                                                                                                                             \
+      template <class T, class A>                                                                                            \
+      struct get_non_member_##test_name##_type <T, A, true>                                                                  \
+      {                                                                                                                      \
+        using type = decltype( CEREAL_SAVE_MINIMAL_FUNCTION_NAME( std::declval<A const &>(),                                 \
+                                                                  std::declval<T const &>() versioned ) );                   \
+      };                                                                                                                     \
+    } /* end namespace detail */                                                                                             \
+                                                                                                                             \
+    template <class T, class A>                                                                                              \
+    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> \
+    {                                                                                                                        \
+      using check = typename detail::has_non_member_##test_name##_impl<T, A>;                                                \
+      static_assert( check::valid,                                                                                           \
+        "cereal detected a non-const type parameter in non-member " #test_name ". \n "                                       \
+        #test_name " non-member functions must always pass their types as const" );                                          \
+                                                                                                                             \
+      using type = typename detail::get_non_member_##test_name##_type<T, A, check::value>::type;                             \
+      static_assert( (check::value && is_minimal_type<type>::value) || !check::value,                                        \
+        "cereal detected a non-member " #test_name " with an invalid return type. \n "                                       \
+        "return type must be arithmetic or string" );                                                                        \
+    };
+
+    // ######################################################################
+    // Non-Member Save Minimal
+    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST(save_minimal, )
+
+    // ######################################################################
+    // Non-Member Save Minimal (versioned)
+    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST(versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST
+
+    // ######################################################################
+    // Load Minimal Utilities
+    namespace detail
+    {
+      //! Used to help strip away conversion wrappers
+      /*! If someone writes a non-member load/save minimal function that accepts its
+          parameter as some generic template type and needs to perform trait checks
+          on that type, our NoConvert wrappers will interfere with this.  Using
+          the struct strip_minmal, users can strip away our wrappers to get to
+          the underlying type, allowing traits to work properly */
+      struct NoConvertBase {};
+
+      //! A struct that prevents implicit conversion
+      /*! Any type instantiated with this struct will be unable to implicitly convert
+          to another type.  Is designed to only allow conversion to Source const &.
+
+          @tparam Source the type of the original source */
+      template <class Source>
+      struct NoConvertConstRef : NoConvertBase
+      {
+        using type = Source; //!< Used to get underlying type easily
+
+        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
+        operator Dest () = delete;
+
+        //! only allow conversion if the types are the same and we are converting into a const reference
+        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
+        operator Dest const & ();
+      };
+
+      //! A struct that prevents implicit conversion
+      /*! Any type instantiated with this struct will be unable to implicitly convert
+          to another type.  Is designed to only allow conversion to Source &.
+
+          @tparam Source the type of the original source */
+      template <class Source>
+      struct NoConvertRef : NoConvertBase
+      {
+        using type = Source; //!< Used to get underlying type easily
+
+        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
+        operator Dest () = delete;
+
+        #ifdef __clang__
+        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
+        operator Dest const & () = delete;
+        #endif // __clang__
+
+        //! only allow conversion if the types are the same and we are converting into a const reference
+        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
+        operator Dest & ();
+      };
+
+      //! A type that can implicitly convert to anything else
+      struct AnyConvert
+      {
+        template <class Dest>
+        operator Dest & ();
+
+        template <class Dest>
+        operator Dest const & () const;
+      };
+    } // namespace detail
+
+    // ######################################################################
+    //! Creates a test for whether a member load_minimal function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        Our strategy here is to first check if a function matching the signature more or less exists
+        (allow anything like load_minimal(xxx) using AnyConvert, and then secondly enforce
+        that it has the correct signature using NoConvertConstRef
+
+        @param test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #ifdef CEREAL_OLDER_GCC
+    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(test_name, versioned)                                                    \
+    namespace detail                                                                                                          \
+    {                                                                                                                         \
+      template <class T, class A, class SFINAE = void> struct has_member_##test_name##_impl : no {};                          \
+      template <class T, class A>                                                                                             \
+      struct has_member_##test_name##_impl<T, A, typename detail::Void< decltype(                                             \
+          cereal::access::member_load_minimal( std::declval<A const &>(),                                                     \
+                                               std::declval<T &>(), AnyConvert() versioned ) ) >::type> : yes {};             \
+                                                                                                                              \
+        template <class T, class A, class U, class SFINAE = void> struct has_member_##test_name##_type_impl : no {};          \
+        template <class T, class A, class U>                                                                                  \
+        struct has_member_##test_name##_type_impl<T, A, U, typename detail::Void< decltype(                                   \
+            cereal::access::member_load_minimal( std::declval<A const &>(),                                                   \
+                                                 std::declval<T &>(), NoConvertConstRef<U>() versioned ) ) >::type> : yes {}; \
+    } /* end namespace detail */
+    #else /* NOT CEREAL_OLDER_GCC =================================== */
+    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(test_name, versioned)              \
+    namespace detail                                                                    \
+    {                                                                                   \
+      template <class T, class A>                                                       \
+      struct has_member_##test_name##_impl                                              \
+      {                                                                                 \
+        template <class TT, class AA>                                                   \
+        static auto test(int) -> decltype( cereal::access::member_load_minimal(         \
+              std::declval<AA const &>(),                                               \
+              std::declval<TT &>(), AnyConvert() versioned ), yes());                   \
+        template <class, class> static no test(...);                                    \
+        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;    \
+      };                                                                                \
+      template <class T, class A, class U>                                              \
+      struct has_member_##test_name##_type_impl                                         \
+      {                                                                                 \
+        template <class TT, class AA, class UU>                                         \
+        static auto test(int) -> decltype( cereal::access::member_load_minimal(         \
+              std::declval<AA const &>(),                                               \
+              std::declval<TT &>(), NoConvertConstRef<UU>() versioned ), yes());        \
+        template <class, class, class> static no test(...);                             \
+        static const bool value = std::is_same<decltype(test<T, A, U>(0)), yes>::value; \
+                                                                                        \
+      };                                                                                \
+    } /* end namespace detail */
+    #endif // NOT CEREAL_OLDER_GCC
+
+    // ######################################################################
+    //! Creates helpers for minimal load functions
+    /*! The has_member_*_wrapper structs ensure that the load and save types for the
+        requested function type match appropriately.
+
+        @param load_test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
+        @param save_test_name The name to give the test (e.g. save_minimal or versioned_save_minimal,
+                              should match the load name.
+        @param save_test_prefix The name to give the test (e.g. save_minimal or versioned_save_minimal,
+                              should match the load name, without the trailing "_minimal" (e.g.
+                              save or versioned_save).  Needed because the preprocessor is an abomination.
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL(load_test_name, save_test_name, save_test_prefix, versioned) \
+    namespace detail                                                                                                      \
+    {                                                                                                                     \
+      template <class T, class A, bool Valid>                                                                             \
+      struct has_member_##load_test_name##_wrapper : std::false_type {};                                                  \
+                                                                                                                          \
+      template <class T, class A>                                                                                         \
+      struct has_member_##load_test_name##_wrapper<T, A, true>                                                            \
+      {                                                                                                                   \
+        using AOut = typename detail::get_output_from_input<A>::type;                                                     \
+                                                                                                                          \
+        static_assert( has_member_##save_test_prefix##_minimal<T, AOut>::value,                                           \
+          "cereal detected member " #load_test_name " but no valid member " #save_test_name ". \n "                       \
+          "cannot evaluate correctness of " #load_test_name " without valid " #save_test_name "." );                      \
+                                                                                                                          \
+        using SaveType = typename detail::get_member_##save_test_prefix##_minimal_type<T, AOut, true>::type;              \
+        const static bool value = has_member_##load_test_name##_impl<T, A>::value;                                        \
+        const static bool valid = has_member_##load_test_name##_type_impl<T, A, SaveType>::value;                         \
+                                                                                                                          \
+        static_assert( valid || !value, "cereal detected different or invalid types in corresponding member "             \
+            #load_test_name " and " #save_test_name " functions. \n "                                                     \
+            "the paramater to " #load_test_name " must be a constant reference to the type that "                         \
+            #save_test_name " returns." );                                                                                \
+      };                                                                                                                  \
+    } /* end namespace detail */
+
+    // ######################################################################
+    //! Creates a test for whether a member load_minimal function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        @param load_test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
+        @param load_test_prefix The above parameter minus the trailing "_minimal" */
+    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST(load_test_name, load_test_prefix)                                         \
+    template <class T, class A>                                                                                                \
+    struct has_member_##load_test_prefix##_minimal : std::integral_constant<bool,                                              \
+      detail::has_member_##load_test_name##_wrapper<T, A, detail::has_member_##load_test_name##_impl<T, A>::value>::value> {};
+
+    // ######################################################################
+    // Member Load Minimal
+    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(load_minimal, )
+    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL(load_minimal, save_minimal, save, )
+    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST(load_minimal, load)
+
+    // ######################################################################
+    // Member Load Minimal (versioned)
+    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(versioned_load_minimal, CEREAL_MAKE_VERSIONED_TEST)
+    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL(versioned_load_minimal, versioned_save_minimal, versioned_save, CEREAL_MAKE_VERSIONED_TEST)
+    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST(versioned_load_minimal, versioned_load)
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL
+    #undef CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL
+    #undef CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST
+
+    // ######################################################################
+    // Non-Member Load Minimal
+    namespace detail
+    {
+      #ifdef CEREAL_OLDER_GCC
+      void CEREAL_LOAD_MINIMAL_FUNCTION_NAME(); // prevents nonsense complaining about not finding this
+      void CEREAL_SAVE_MINIMAL_FUNCTION_NAME();
+      #endif // CEREAL_OLDER_GCC
+    } // namespace detail
+
+    // ######################################################################
+    //! Creates a test for whether a non-member load_minimal function exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper member function for the given archive.
+
+        See notes from member load_minimal implementation.
+
+        @param test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
+        @param save_name The corresponding name the save test would have (e.g. save_minimal or versioned_save_minimal)
+        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
+    #define CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST(test_name, save_name, versioned)                                    \
+    namespace detail                                                                                                         \
+    {                                                                                                                        \
+      template <class T, class A, class U = void>                                                                            \
+      struct has_non_member_##test_name##_impl                                                                               \
+      {                                                                                                                      \
+        template <class TT, class AA>                                                                                        \
+        static auto test(int) -> decltype( CEREAL_LOAD_MINIMAL_FUNCTION_NAME(                                                \
+              std::declval<AA const &>(), std::declval<TT&>(), AnyConvert() versioned ), yes() );                            \
+        template <class, class> static no test( ... );                                                                       \
+        static const bool exists = std::is_same<decltype( test<T, A>( 0 ) ), yes>::value;                                    \
+                                                                                                                             \
+        template <class TT, class AA, class UU>                                                                              \
+        static auto test2(int) -> decltype( CEREAL_LOAD_MINIMAL_FUNCTION_NAME(                                               \
+              std::declval<AA const &>(), std::declval<TT&>(), NoConvertConstRef<UU>() versioned ), yes() );                 \
+        template <class, class, class> static no test2( ... );                                                               \
+        static const bool valid = std::is_same<decltype( test2<T, A, U>( 0 ) ), yes>::value;                                 \
+                                                                                                                             \
+        template <class TT, class AA>                                                                                        \
+        static auto test3(int) -> decltype( CEREAL_LOAD_MINIMAL_FUNCTION_NAME(                                               \
+              std::declval<AA const &>(), NoConvertRef<TT>(), AnyConvert() versioned ), yes() );                             \
+        template <class, class> static no test3( ... );                                                                      \
+        static const bool const_valid = std::is_same<decltype( test3<T, A>( 0 ) ), yes>::value;                              \
+      };                                                                                                                     \
+                                                                                                                             \
+      template <class T, class A, bool Valid>                                                                                \
+      struct has_non_member_##test_name##_wrapper : std::false_type {};                                                      \
+                                                                                                                             \
+      template <class T, class A>                                                                                            \
+      struct has_non_member_##test_name##_wrapper<T, A, true>                                                                \
+      {                                                                                                                      \
+        using AOut = typename detail::get_output_from_input<A>::type;                                                        \
+                                                                                                                             \
+        static_assert( detail::has_non_member_##save_name##_impl<T, AOut>::valid,                                            \
+          "cereal detected non-member " #test_name " but no valid non-member " #save_name ". \n "                            \
+          "cannot evaluate correctness of " #test_name " without valid " #save_name "." );                                   \
+                                                                                                                             \
+        using SaveType = typename detail::get_non_member_##save_name##_type<T, AOut, true>::type;                            \
+        using check = has_non_member_##test_name##_impl<T, A, SaveType>;                                                     \
+        static const bool value = check::exists;                                                                             \
+                                                                                                                             \
+        static_assert( check::valid || !check::exists, "cereal detected different types in corresponding non-member "        \
+            #test_name " and " #save_name " functions. \n "                                                                  \
+            "the paramater to " #test_name " must be a constant reference to the type that " #save_name " returns." );       \
+        static_assert( check::const_valid || !check::exists,                                                                 \
+            "cereal detected an invalid serialization type parameter in non-member " #test_name ".  "                        \
+            #test_name " non-member functions must accept their serialization type by non-const reference" );                \
+      };                                                                                                                     \
+    } /* namespace detail */                                                                                                 \
+                                                                                                                             \
+    template <class T, class A>                                                                                              \
+    struct has_non_member_##test_name : std::integral_constant<bool,                                                         \
+      detail::has_non_member_##test_name##_wrapper<T, A, detail::has_non_member_##test_name##_impl<T, A>::exists>::value> {};
+
+    // ######################################################################
+    // Non-Member Load Minimal
+    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST(load_minimal, save_minimal, )
+
+    // ######################################################################
+    // Non-Member Load Minimal (versioned)
+    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST(versioned_load_minimal, versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST
+
+    // ######################################################################
+    //! Member load and construct check
+    template<typename T, typename A>
+    struct has_member_load_and_construct : std::integral_constant<bool,
+      std::is_same<decltype( access::load_and_construct<T>( std::declval<A&>(), std::declval< ::cereal::construct<T>&>() ) ), void>::value>
+    { };
+
+    // ######################################################################
+    //! Member load and construct check (versioned)
+    template<typename T, typename A>
+    struct has_member_versioned_load_and_construct : std::integral_constant<bool,
+      std::is_same<decltype( access::load_and_construct<T>( std::declval<A&>(), std::declval< ::cereal::construct<T>&>(), 0 ) ), void>::value>
+    { };
+
+    // ######################################################################
+    //! Creates a test for whether a non-member load_and_construct specialization exists
+    /*! This creates a class derived from std::integral_constant that will be true if
+        the type has the proper non-member function for the given archive. */
+    #define CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST(test_name, versioned)                                            \
+    namespace detail                                                                                                            \
+    {                                                                                                                           \
+      template <class T, class A>                                                                                               \
+      struct has_non_member_##test_name##_impl                                                                                  \
+      {                                                                                                                         \
+        template <class TT, class AA>                                                                                           \
+        static auto test(int) -> decltype( LoadAndConstruct<TT>::load_and_construct(                                            \
+                                           std::declval<AA&>(), std::declval< ::cereal::construct<TT>&>() versioned ), yes());  \
+        template <class, class>                                                                                                 \
+        static no test( ... );                                                                                                  \
+        static const bool value = std::is_same<decltype( test<T, A>( 0 ) ), yes>::value;                                        \
+      };                                                                                                                        \
+    } /* end namespace detail */                                                                                                \
+    template <class T, class A>                                                                                                 \
+    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> {};
+
+    // ######################################################################
+    //! Non member load and construct check
+    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST(load_and_construct, )
+
+    // ######################################################################
+    //! Non member load and construct check (versioned)
+    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST(versioned_load_and_construct, CEREAL_MAKE_VERSIONED_TEST)
+
+    // ######################################################################
+    //! Has either a member or non member load and construct
+    template<typename T, typename A>
+    struct has_load_and_construct : std::integral_constant<bool,
+      has_member_load_and_construct<T, A>::value || has_non_member_load_and_construct<T, A>::value ||
+      has_member_versioned_load_and_construct<T, A>::value || has_non_member_versioned_load_and_construct<T, A>::value>
+    { };
+
+    // ######################################################################
+    #undef CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST
+
+    // ######################################################################
+    // End of serialization existence tests
+    #undef CEREAL_MAKE_VERSIONED_TEST
+
+    // ######################################################################
+    template <class T, class InputArchive, class OutputArchive>
+    struct has_member_split : std::integral_constant<bool,
+      (has_member_load<T, InputArchive>::value && has_member_save<T, OutputArchive>::value) ||
+      (has_member_versioned_load<T, InputArchive>::value && has_member_versioned_save<T, OutputArchive>::value)> {};
+
+    // ######################################################################
+    template <class T, class InputArchive, class OutputArchive>
+    struct has_non_member_split : std::integral_constant<bool,
+      (has_non_member_load<T, InputArchive>::value && has_non_member_save<T, OutputArchive>::value) ||
+      (has_non_member_versioned_load<T, InputArchive>::value && has_non_member_versioned_save<T, OutputArchive>::value)> {};
+
+    // ######################################################################
+    template <class T, class OutputArchive>
+    struct has_invalid_output_versioning : std::integral_constant<bool,
+      (has_member_versioned_save<T, OutputArchive>::value && has_member_save<T, OutputArchive>::value) ||
+      (has_non_member_versioned_save<T, OutputArchive>::value && has_non_member_save<T, OutputArchive>::value) ||
+      (has_member_versioned_serialize<T, OutputArchive>::value && has_member_serialize<T, OutputArchive>::value) ||
+      (has_non_member_versioned_serialize<T, OutputArchive>::value && has_non_member_serialize<T, OutputArchive>::value) ||
+      (has_member_versioned_save_minimal<T, OutputArchive>::value && has_member_save_minimal<T, OutputArchive>::value) ||
+      (has_non_member_versioned_save_minimal<T, OutputArchive>::value &&  has_non_member_save_minimal<T, OutputArchive>::value)> {};
+
+    // ######################################################################
+    template <class T, class InputArchive>
+    struct has_invalid_input_versioning : std::integral_constant<bool,
+      (has_member_versioned_load<T, InputArchive>::value && has_member_load<T, InputArchive>::value) ||
+      (has_non_member_versioned_load<T, InputArchive>::value && has_non_member_load<T, InputArchive>::value) ||
+      (has_member_versioned_serialize<T, InputArchive>::value && has_member_serialize<T, InputArchive>::value) ||
+      (has_non_member_versioned_serialize<T, InputArchive>::value && has_non_member_serialize<T, InputArchive>::value) ||
+      (has_member_versioned_load_minimal<T, InputArchive>::value && has_member_load_minimal<T, InputArchive>::value) ||
+      (has_non_member_versioned_load_minimal<T, InputArchive>::value &&  has_non_member_load_minimal<T, InputArchive>::value)> {};
+
+    // ######################################################################
+    namespace detail
+    {
+      //! Create a test for a cereal::specialization entry
+      #define CEREAL_MAKE_IS_SPECIALIZED_IMPL(name)                                          \
+      template <class T, class A>                                                            \
+      struct is_specialized_##name : std::integral_constant<bool,                            \
+        !std::is_base_of<std::false_type, specialize<A, T, specialization::name>>::value> {}
+
+      CEREAL_MAKE_IS_SPECIALIZED_IMPL(member_serialize);
+      CEREAL_MAKE_IS_SPECIALIZED_IMPL(member_load_save);
+      CEREAL_MAKE_IS_SPECIALIZED_IMPL(member_load_save_minimal);
+      CEREAL_MAKE_IS_SPECIALIZED_IMPL(non_member_serialize);
+      CEREAL_MAKE_IS_SPECIALIZED_IMPL(non_member_load_save);
+      CEREAL_MAKE_IS_SPECIALIZED_IMPL(non_member_load_save_minimal);
+
+      #undef CEREAL_MAKE_IS_SPECIALIZED_IMPL
+
+      //! Number of specializations detected
+      template <class T, class A>
+      struct count_specializations : std::integral_constant<int,
+        is_specialized_member_serialize<T, A>::value +
+        is_specialized_member_load_save<T, A>::value +
+        is_specialized_member_load_save_minimal<T, A>::value +
+        is_specialized_non_member_serialize<T, A>::value +
+        is_specialized_non_member_load_save<T, A>::value +
+        is_specialized_non_member_load_save_minimal<T, A>::value> {};
+    } // namespace detail
+
+    //! Check if any specialization exists for a type
+    template <class T, class A>
+    struct is_specialized : std::integral_constant<bool,
+      detail::is_specialized_member_serialize<T, A>::value ||
+      detail::is_specialized_member_load_save<T, A>::value ||
+      detail::is_specialized_member_load_save_minimal<T, A>::value ||
+      detail::is_specialized_non_member_serialize<T, A>::value ||
+      detail::is_specialized_non_member_load_save<T, A>::value ||
+      detail::is_specialized_non_member_load_save_minimal<T, A>::value>
+    {
+      static_assert(detail::count_specializations<T, A>::value <= 1, "More than one explicit specialization detected for type.");
+    };
+
+    //! Create the static assertion for some specialization
+    /*! This assertion will fail if the type is indeed specialized and does not have the appropriate
+        type of serialization functions */
+    #define CEREAL_MAKE_IS_SPECIALIZED_ASSERT(name, versioned_name, print_name, spec_name)                      \
+    static_assert( (is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value &&           \
+                   (has_##name<T, A>::value || has_##versioned_name<T, A>::value))                              \
+                   || !(is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value),        \
+                   "cereal detected " #print_name " specialization but no " #print_name " serialize function" )
+
+    //! Generates a test for specialization for versioned and unversioned functions
+    /*! This creates checks that can be queried to see if a given type of serialization function
+        has been specialized for this type */
+    #define CEREAL_MAKE_IS_SPECIALIZED(name, versioned_name, spec_name)                     \
+    template <class T, class A>                                                             \
+    struct is_specialized_##name : std::integral_constant<bool,                             \
+      is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value>       \
+    { CEREAL_MAKE_IS_SPECIALIZED_ASSERT(name, versioned_name, name, spec_name); };          \
+    template <class T, class A>                                                             \
+    struct is_specialized_##versioned_name : std::integral_constant<bool,                   \
+      is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value>       \
+    { CEREAL_MAKE_IS_SPECIALIZED_ASSERT(name, versioned_name, versioned_name, spec_name); }
+
+    CEREAL_MAKE_IS_SPECIALIZED(member_serialize, member_versioned_serialize, member_serialize);
+    CEREAL_MAKE_IS_SPECIALIZED(non_member_serialize, non_member_versioned_serialize, non_member_serialize);
+
+    CEREAL_MAKE_IS_SPECIALIZED(member_save, member_versioned_save, member_load_save);
+    CEREAL_MAKE_IS_SPECIALIZED(non_member_save, non_member_versioned_save, non_member_load_save);
+    CEREAL_MAKE_IS_SPECIALIZED(member_load, member_versioned_load, member_load_save);
+    CEREAL_MAKE_IS_SPECIALIZED(non_member_load, non_member_versioned_load, non_member_load_save);
+
+    CEREAL_MAKE_IS_SPECIALIZED(member_save_minimal, member_versioned_save_minimal, member_load_save_minimal);
+    CEREAL_MAKE_IS_SPECIALIZED(non_member_save_minimal, non_member_versioned_save_minimal, non_member_load_save_minimal);
+    CEREAL_MAKE_IS_SPECIALIZED(member_load_minimal, member_versioned_load_minimal, member_load_save_minimal);
+    CEREAL_MAKE_IS_SPECIALIZED(non_member_load_minimal, non_member_versioned_load_minimal, non_member_load_save_minimal);
+
+    #undef CEREAL_MAKE_IS_SPECIALIZED_ASSERT
+    #undef CEREAL_MAKE_IS_SPECIALIZED
+
+    // ######################################################################
+    // detects if a type has any active minimal output serialization
+    template <class T, class OutputArchive>
+    struct has_minimal_output_serialization : std::integral_constant<bool,
+      is_specialized_member_save_minimal<T, OutputArchive>::value ||
+      ((has_member_save_minimal<T, OutputArchive>::value ||
+        has_non_member_save_minimal<T, OutputArchive>::value ||
+        has_member_versioned_save_minimal<T, OutputArchive>::value ||
+        has_non_member_versioned_save_minimal<T, OutputArchive>::value) &&
+       !(is_specialized_member_serialize<T, OutputArchive>::value ||
+         is_specialized_member_save<T, OutputArchive>::value))> {};
+
+    // ######################################################################
+    // detects if a type has any active minimal input serialization
+    template <class T, class InputArchive>
+    struct has_minimal_input_serialization : std::integral_constant<bool,
+      is_specialized_member_load_minimal<T, InputArchive>::value ||
+      ((has_member_load_minimal<T, InputArchive>::value ||
+        has_non_member_load_minimal<T, InputArchive>::value ||
+        has_member_versioned_load_minimal<T, InputArchive>::value ||
+        has_non_member_versioned_load_minimal<T, InputArchive>::value) &&
+       !(is_specialized_member_serialize<T, InputArchive>::value ||
+         is_specialized_member_load<T, InputArchive>::value))> {};
+
+    // ######################################################################
+    namespace detail
+    {
+      //! The number of output serialization functions available
+      /*! If specialization is being used, we'll count only those; otherwise we'll count everything */
+      template <class T, class OutputArchive>
+      struct count_output_serializers : std::integral_constant<int,
+        count_specializations<T, OutputArchive>::value ? count_specializations<T, OutputArchive>::value :
+        has_member_save<T, OutputArchive>::value +
+        has_non_member_save<T, OutputArchive>::value +
+        has_member_serialize<T, OutputArchive>::value +
+        has_non_member_serialize<T, OutputArchive>::value +
+        has_member_save_minimal<T, OutputArchive>::value +
+        has_non_member_save_minimal<T, OutputArchive>::value +
+        /*-versioned---------------------------------------------------------*/
+        has_member_versioned_save<T, OutputArchive>::value +
+        has_non_member_versioned_save<T, OutputArchive>::value +
+        has_member_versioned_serialize<T, OutputArchive>::value +
+        has_non_member_versioned_serialize<T, OutputArchive>::value +
+        has_member_versioned_save_minimal<T, OutputArchive>::value +
+        has_non_member_versioned_save_minimal<T, OutputArchive>::value> {};
+    }
+
+    template <class T, class OutputArchive>
+    struct is_output_serializable : std::integral_constant<bool,
+      detail::count_output_serializers<T, OutputArchive>::value == 1> {};
+
+    // ######################################################################
+    namespace detail
+    {
+      //! The number of input serialization functions available
+      /*! If specialization is being used, we'll count only those; otherwise we'll count everything */
+      template <class T, class InputArchive>
+      struct count_input_serializers : std::integral_constant<int,
+        count_specializations<T, InputArchive>::value ? count_specializations<T, InputArchive>::value :
+        has_member_load<T, InputArchive>::value +
+        has_non_member_load<T, InputArchive>::value +
+        has_member_serialize<T, InputArchive>::value +
+        has_non_member_serialize<T, InputArchive>::value +
+        has_member_load_minimal<T, InputArchive>::value +
+        has_non_member_load_minimal<T, InputArchive>::value +
+        /*-versioned---------------------------------------------------------*/
+        has_member_versioned_load<T, InputArchive>::value +
+        has_non_member_versioned_load<T, InputArchive>::value +
+        has_member_versioned_serialize<T, InputArchive>::value +
+        has_non_member_versioned_serialize<T, InputArchive>::value +
+        has_member_versioned_load_minimal<T, InputArchive>::value +
+        has_non_member_versioned_load_minimal<T, InputArchive>::value> {};
+    }
+
+    template <class T, class InputArchive>
+    struct is_input_serializable : std::integral_constant<bool,
+      detail::count_input_serializers<T, InputArchive>::value == 1> {};
+
+    // ######################################################################
+    // Base Class Support
+    namespace detail
+    {
+      struct base_class_id
+      {
+        template<class T>
+          base_class_id(T const * const t) :
+          type(typeid(T)),
+          ptr(t),
+          hash(std::hash<std::type_index>()(typeid(T)) ^ (std::hash<void const *>()(t) << 1))
+          { }
+
+          bool operator==(base_class_id const & other) const
+          { return (type == other.type) && (ptr == other.ptr); }
+
+          std::type_index type;
+          void const * ptr;
+          size_t hash;
+      };
+      struct base_class_id_hash { size_t operator()(base_class_id const & id) const { return id.hash; }  };
+    } // namespace detail
+
+    namespace detail
+    {
+      //! Common base type for base class casting
+      struct BaseCastBase {};
+
+      template <class>
+      struct get_base_class;
+
+      template <template<typename> class Cast, class Base>
+      struct get_base_class<Cast<Base>>
+      {
+        using type = Base;
+      };
+
+      //! Base class cast, behave as the test
+      template <class Cast, template<class, class> class Test, class Archive,
+                bool IsBaseCast = std::is_base_of<BaseCastBase, Cast>::value>
+      struct has_minimal_base_class_serialization_impl : Test<typename get_base_class<Cast>::type, Archive>
+      { };
+
+      //! Not a base class cast
+      template <class Cast, template<class, class> class Test, class Archive>
+      struct has_minimal_base_class_serialization_impl<Cast,Test, Archive, false> : std::false_type
+      { };
+    }
+
+    //! Checks to see if the base class used in a cast has a minimal serialization
+    /*! @tparam Cast Either base_class or virtual_base_class wrapped type
+        @tparam Test A has_minimal test (for either input or output)
+        @tparam Archive The archive to use with the test */
+    template <class Cast, template<class, class> class Test, class Archive>
+    struct has_minimal_base_class_serialization : detail::has_minimal_base_class_serialization_impl<Cast, Test, Archive>
+    { };
+
+
+    // ######################################################################
+    namespace detail
+    {
+      struct shared_from_this_wrapper
+      {
+        template <class U>
+        static auto (check)( U const & t ) -> decltype( ::cereal::access::shared_from_this(t), std::true_type() );
+
+        static auto (check)( ... ) -> decltype( std::false_type() );
+
+        template <class U>
+        static auto get( U const & t ) -> decltype( t.shared_from_this() );
+      };
+    }
+
+    //! Determine if T or any base class of T has inherited from std::enable_shared_from_this
+    template<class T>
+    struct has_shared_from_this : decltype((detail::shared_from_this_wrapper::check)(std::declval<T>()))
+    { };
+
+    //! Get the type of the base class of T which inherited from std::enable_shared_from_this
+    template <class T>
+    struct get_shared_from_this_base
+    {
+      private:
+        using PtrType = decltype(detail::shared_from_this_wrapper::get(std::declval<T>()));
+      public:
+        //! The type of the base of T that inherited from std::enable_shared_from_this
+        using type = typename std::decay<typename PtrType::element_type>::type;
+    };
+
+    // ######################################################################
+    //! Extracts the true type from something possibly wrapped in a cereal NoConvert
+    /*! Internally cereal uses some wrapper classes to test the validity of non-member
+        minimal load and save functions.  This can interfere with user type traits on
+        templated load and save minimal functions.  To get to the correct underlying type,
+        users should use strip_minimal when performing any enable_if type type trait checks.
+
+        See the enum serialization in types/common.hpp for an example of using this */
+    template <class T, bool IsCerealMinimalTrait = std::is_base_of<detail::NoConvertBase, T>::value>
+    struct strip_minimal
+    {
+      using type = T;
+    };
+
+    //! Specialization for types wrapped in a NoConvert
+    template <class T>
+    struct strip_minimal<T, true>
+    {
+      using type = typename T::type;
+    };
+
+    // ######################################################################
+    //! Determines whether the class T can be default constructed by cereal::access
+    template <class T>
+    struct is_default_constructible
+    {
+      #ifdef CEREAL_OLDER_GCC
+      template <class TT, class SFINAE = void>
+      struct test : no {};
+      template <class TT>
+      struct test<TT, typename detail::Void< decltype( cereal::access::construct<TT>() ) >::type> : yes {};
+      static const bool value = test<T>();
+      #else // NOT CEREAL_OLDER_GCC =========================================
+      template <class TT>
+      static auto test(int) -> decltype( cereal::access::construct<TT>(), yes());
+      template <class>
+      static no test(...);
+      static const bool value = std::is_same<decltype(test<T>(0)), yes>::value;
+      #endif // NOT CEREAL_OLDER_GCC
+    };
+
+    // ######################################################################
+    namespace detail
+    {
+      //! Removes all qualifiers and minimal wrappers from an archive
+      template <class A>
+      using decay_archive = typename std::decay<typename strip_minimal<A>::type>::type;
+    }
+
+    //! Checks if the provided archive type is equal to some cereal archive type
+    /*! This automatically does things such as std::decay and removing any other wrappers that may be
+        on the Archive template parameter.
+
+        Example use:
+        @code{cpp}
+        // example use to disable a serialization function
+        template <class Archive, EnableIf<cereal::traits::is_same_archive<Archive, cereal::BinaryOutputArchive>::value> = sfinae>
+        void save( Archive & ar, MyType const & mt );
+        @endcode */
+    template <class ArchiveT, class CerealArchiveT>
+    struct is_same_archive : std::integral_constant<bool,
+      std::is_same<detail::decay_archive<ArchiveT>, CerealArchiveT>::value>
+    { };
+
+    // ######################################################################
+    //! A macro to use to restrict which types of archives your function will work for.
+    /*! This requires you to have a template class parameter named Archive and replaces the void return
+        type for your function.
+
+        INTYPE refers to the input archive type you wish to restrict on.
+        OUTTYPE refers to the output archive type you wish to restrict on.
+
+        For example, if we want to limit a serialize to only work with binary serialization:
+
+        @code{.cpp}
+        template <class Archive>
+        CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
+        serialize( Archive & ar, MyCoolType & m )
+        {
+          ar & m;
+        }
+        @endcode
+
+        If you need to do more restrictions in your enable_if, you will need to do this by hand.
+     */
+    #define CEREAL_ARCHIVE_RESTRICT(INTYPE, OUTTYPE) \
+    typename std::enable_if<cereal::traits::is_same_archive<Archive, INTYPE>::value || cereal::traits::is_same_archive<Archive, OUTTYPE>::value, void>::type
+
+    //! Type traits only struct used to mark an archive as human readable (text based)
+    /*! Archives that wish to identify as text based/human readable should inherit from
+        this struct */
+    struct TextArchive {};
+
+    //! Checks if an archive is a text archive (human readable)
+    template <class A>
+    struct is_text_archive : std::integral_constant<bool,
+      std::is_base_of<TextArchive, detail::decay_archive<A>>::value>
+    { };
+  } // namespace traits
+
+  // ######################################################################
+  namespace detail
+  {
+    template <class T, class A,
+              bool Member = traits::has_member_load_and_construct<T, A>::value,
+              bool MemberVersioned = traits::has_member_versioned_load_and_construct<T, A>::value,
+              bool NonMember = traits::has_non_member_load_and_construct<T, A>::value,
+              bool NonMemberVersioned = traits::has_non_member_versioned_load_and_construct<T, A>::value>
+    struct Construct
+    {
+      static_assert( cereal::traits::detail::delay_static_assert<T>::value,
+        "cereal found more than one compatible load_and_construct function for the provided type and archive combination. \n\n "
+        "Types must either have a member load_and_construct function or a non-member specialization of LoadAndConstruct (you may not mix these). \n "
+        "In addition, you may not mix versioned with non-versioned load_and_construct functions. \n\n " );
+      static T * load_andor_construct( A & /*ar*/, construct<T> & /*construct*/ )
+      { return nullptr; }
+    };
+
+    // no load and construct case
+    template <class T, class A>
+    struct Construct<T, A, false, false, false, false>
+    {
+      static_assert( ::cereal::traits::is_default_constructible<T>::value,
+                     "Trying to serialize a an object with no default constructor. \n\n "
+                     "Types must either be default constructible or define either a member or non member Construct function. \n "
+                     "Construct functions generally have the signature: \n\n "
+                     "template <class Archive> \n "
+                     "static void load_and_construct(Archive & ar, cereal::construct<T> & construct) \n "
+                     "{ \n "
+                     "  var a; \n "
+                     "  ar( a ) \n "
+                     "  construct( a ); \n "
+                     "} \n\n" );
+      static T * load_andor_construct()
+      { return ::cereal::access::construct<T>(); }
+    };
+
+    // member non-versioned
+    template <class T, class A>
+    struct Construct<T, A, true, false, false, false>
+    {
+      static void load_andor_construct( A & ar, construct<T> & construct )
+      {
+        access::load_and_construct<T>( ar, construct );
+      }
+    };
+
+    // member versioned
+    template <class T, class A>
+    struct Construct<T, A, false, true, false, false>
+    {
+      static void load_andor_construct( A & ar, construct<T> & construct )
+      {
+        const auto version = ar.template loadClassVersion<T>();
+        access::load_and_construct<T>( ar, construct, version );
+      }
+    };
+
+    // non-member non-versioned
+    template <class T, class A>
+    struct Construct<T, A, false, false, true, false>
+    {
+      static void load_andor_construct( A & ar, construct<T> & construct )
+      {
+        LoadAndConstruct<T>::load_and_construct( ar, construct );
+      }
+    };
+
+    // non-member versioned
+    template <class T, class A>
+    struct Construct<T, A, false, false, false, true>
+    {
+      static void load_andor_construct( A & ar, construct<T> & construct )
+      {
+        const auto version = ar.template loadClassVersion<T>();
+        LoadAndConstruct<T>::load_and_construct( ar, construct, version );
+      }
+    };
+  } // namespace detail
+} // namespace cereal
+
+#endif // CEREAL_DETAILS_TRAITS_HPP_
diff --git a/Src/External/cereal/include/cereal/details/util.hpp b/Src/External/cereal/include/cereal/details/util.hpp
new file mode 100644
index 0000000..ba24813
--- /dev/null
+++ b/Src/External/cereal/include/cereal/details/util.hpp
@@ -0,0 +1,84 @@
+/*! \file util.hpp
+    \brief Internal misc utilities
+    \ingroup Internal */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_DETAILS_UTIL_HPP_
+#define CEREAL_DETAILS_UTIL_HPP_
+
+#include <typeinfo>
+#include <string>
+
+#ifdef _MSC_VER
+namespace cereal
+{
+  namespace util
+  {
+    //! Demangles the type encoded in a string
+    /*! @internal */
+    inline std::string demangle( std::string const & name )
+    { return name; }
+
+    //! Gets the demangled name of a type
+    /*! @internal */
+    template <class T> inline
+    std::string demangledName()
+    { return typeid( T ).name(); }
+  } // namespace util
+} // namespace cereal
+#else // clang or gcc
+#include <cxxabi.h>
+#include <cstdlib>
+namespace cereal
+{
+  namespace util
+  {
+    //! Demangles the type encoded in a string
+    /*! @internal */
+    inline std::string demangle(std::string mangledName)
+    {
+      int status = 0;
+      char *demangledName = nullptr;
+      std::size_t len;
+
+      demangledName = abi::__cxa_demangle(mangledName.c_str(), 0, &len, &status);
+
+      std::string retName(demangledName);
+      free(demangledName);
+
+      return retName;
+    }
+
+    //! Gets the demangled name of a type
+    /*! @internal */
+    template<class T> inline
+    std::string demangledName()
+    { return demangle(typeid(T).name()); }
+  }
+} // namespace cereal
+#endif // clang or gcc branch of _MSC_VER
+#endif // CEREAL_DETAILS_UTIL_HPP_
diff --git a/Src/External/cereal/include/cereal/external/base64.hpp b/Src/External/cereal/include/cereal/external/base64.hpp
new file mode 100644
index 0000000..7eee003
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/base64.hpp
@@ -0,0 +1,127 @@
+/*
+   Copyright (C) 2004-2008 René Nyffenegger
+
+   This source code is provided 'as-is', without any express or implied
+   warranty. In no event will the author be held liable for any damages
+   arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this source code must not be misrepresented; you must not
+      claim that you wrote the original source code. If you use this source code
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original source code.
+
+   3. This notice may not be removed or altered from any source distribution.
+
+   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+*/
+
+#ifndef CEREAL_EXTERNAL_BASE64_HPP_
+#define CEREAL_EXTERNAL_BASE64_HPP_
+
+#include <string>
+
+namespace cereal
+{
+  namespace base64
+  {
+    static const std::string chars =
+      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+      "abcdefghijklmnopqrstuvwxyz"
+      "0123456789+/";
+
+    static inline bool is_base64(unsigned char c) {
+      return (isalnum(c) || (c == '+') || (c == '/'));
+    }
+
+    inline std::string encode(unsigned char const* bytes_to_encode, size_t in_len) {
+      std::string ret;
+      int i = 0;
+      int j = 0;
+      unsigned char char_array_3[3];
+      unsigned char char_array_4[4];
+
+      while (in_len--) {
+        char_array_3[i++] = *(bytes_to_encode++);
+        if (i == 3) {
+          char_array_4[0] = static_cast<unsigned char>((char_array_3[0] & 0xfc) >> 2);
+          char_array_4[1] = static_cast<unsigned char>( ( ( char_array_3[0] & 0x03 ) << 4 ) + ( ( char_array_3[1] & 0xf0 ) >> 4 ) );
+          char_array_4[2] = static_cast<unsigned char>( ( ( char_array_3[1] & 0x0f ) << 2 ) + ( ( char_array_3[2] & 0xc0 ) >> 6 ) );
+          char_array_4[3] = static_cast<unsigned char>( char_array_3[2] & 0x3f );
+
+          for(i = 0; (i <4) ; i++)
+            ret += chars[char_array_4[i]];
+          i = 0;
+        }
+      }
+
+      if (i)
+      {
+        for(j = i; j < 3; j++)
+          char_array_3[j] = '\0';
+
+        char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+        char_array_4[3] = char_array_3[2] & 0x3f;
+
+        for (j = 0; (j < i + 1); j++)
+          ret += chars[char_array_4[j]];
+
+        while((i++ < 3))
+          ret += '=';
+      }
+
+      return ret;
+    }
+
+    inline std::string decode(std::string const& encoded_string) {
+      size_t in_len = encoded_string.size();
+      size_t i = 0;
+      size_t j = 0;
+      int in_ = 0;
+      unsigned char char_array_4[4], char_array_3[3];
+      std::string ret;
+
+      while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
+        char_array_4[i++] = encoded_string[in_]; in_++;
+        if (i ==4) {
+          for (i = 0; i <4; i++)
+            char_array_4[i] = static_cast<unsigned char>(chars.find( char_array_4[i] ));
+
+          char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+          char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+          char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+          for (i = 0; (i < 3); i++)
+            ret += char_array_3[i];
+          i = 0;
+        }
+      }
+
+      if (i) {
+        for (j = i; j <4; j++)
+          char_array_4[j] = 0;
+
+        for (j = 0; j <4; j++)
+          char_array_4[j] = static_cast<unsigned char>(chars.find( char_array_4[j] ));
+
+        char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+        char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+        char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+        for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
+      }
+
+      return ret;
+    }
+  } // namespace base64
+} // namespace cereal
+
+#endif // CEREAL_EXTERNAL_BASE64_HPP_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/allocators.h b/Src/External/cereal/include/cereal/external/rapidjson/allocators.h
new file mode 100644
index 0000000..554dc4a
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/allocators.h
@@ -0,0 +1,271 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ALLOCATORS_H_
+#define CEREAL_RAPIDJSON_ALLOCATORS_H_
+
+#include "rapidjson.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Allocator
+
+/*! \class rapidjson::Allocator
+    \brief Concept for allocating, resizing and freeing memory block.
+    
+    Note that Malloc() and Realloc() are non-static but Free() is static.
+    
+    So if an allocator need to support Free(), it needs to put its pointer in 
+    the header of memory block.
+
+\code
+concept Allocator {
+    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
+
+    // Allocate a memory block.
+    // \param size of the memory block in bytes.
+    // \returns pointer to the memory block.
+    void* Malloc(size_t size);
+
+    // Resize a memory block.
+    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
+    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
+    // \param newSize the new size in bytes.
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
+
+    // Free a memory block.
+    // \param pointer to the memory block. Null pointer is permitted.
+    static void Free(void *ptr);
+};
+\endcode
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+// CrtAllocator
+
+//! C-runtime library allocator.
+/*! This class is just wrapper for standard C library memory routines.
+    \note implements Allocator concept
+*/
+class CrtAllocator {
+public:
+    static const bool kNeedFree = true;
+    void* Malloc(size_t size) { 
+        if (size) //  behavior of malloc(0) is implementation defined.
+            return std::malloc(size);
+        else
+            return NULL; // standardize to returning NULL.
+    }
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
+        (void)originalSize;
+        if (newSize == 0) {
+            std::free(originalPtr);
+            return NULL;
+        }
+        return std::realloc(originalPtr, newSize);
+    }
+    static void Free(void *ptr) { std::free(ptr); }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// MemoryPoolAllocator
+
+//! Default memory allocator used by the parser and DOM.
+/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
+
+    It does not free memory blocks. And Realloc() only allocate new memory.
+
+    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
+
+    User may also supply a buffer as the first chunk.
+
+    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
+
+    The user-buffer is not deallocated by this allocator.
+
+    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
+    \note implements Allocator concept
+*/
+template <typename BaseAllocator = CrtAllocator>
+class MemoryPoolAllocator {
+public:
+    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
+
+    //! Constructor with chunkSize.
+    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
+        \param baseAllocator The allocator for allocating memory chunks.
+    */
+    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
+        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+    {
+    }
+
+    //! Constructor with user-supplied buffer.
+    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
+
+        The user buffer will not be deallocated when this allocator is destructed.
+
+        \param buffer User supplied buffer.
+        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
+        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
+        \param baseAllocator The allocator for allocating memory chunks.
+    */
+    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
+        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
+    {
+        CEREAL_RAPIDJSON_ASSERT(buffer != 0);
+        CEREAL_RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
+        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
+        chunkHead_->capacity = size - sizeof(ChunkHeader);
+        chunkHead_->size = 0;
+        chunkHead_->next = 0;
+    }
+
+    //! Destructor.
+    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
+    */
+    ~MemoryPoolAllocator() {
+        Clear();
+        CEREAL_RAPIDJSON_DELETE(ownBaseAllocator_);
+    }
+
+    //! Deallocates all memory chunks, excluding the user-supplied buffer.
+    void Clear() {
+        while (chunkHead_ && chunkHead_ != userBuffer_) {
+            ChunkHeader* next = chunkHead_->next;
+            baseAllocator_->Free(chunkHead_);
+            chunkHead_ = next;
+        }
+        if (chunkHead_ && chunkHead_ == userBuffer_)
+            chunkHead_->size = 0; // Clear user buffer
+    }
+
+    //! Computes the total capacity of allocated memory chunks.
+    /*! \return total capacity in bytes.
+    */
+    size_t Capacity() const {
+        size_t capacity = 0;
+        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+            capacity += c->capacity;
+        return capacity;
+    }
+
+    //! Computes the memory blocks allocated.
+    /*! \return total used bytes.
+    */
+    size_t Size() const {
+        size_t size = 0;
+        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
+            size += c->size;
+        return size;
+    }
+
+    //! Allocates a memory block. (concept Allocator)
+    void* Malloc(size_t size) {
+        if (!size)
+            return NULL;
+
+        size = CEREAL_RAPIDJSON_ALIGN(size);
+        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
+            if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
+                return NULL;
+
+        void *buffer = reinterpret_cast<char *>(chunkHead_) + CEREAL_RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
+        chunkHead_->size += size;
+        return buffer;
+    }
+
+    //! Resizes a memory block (concept Allocator)
+    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
+        if (originalPtr == 0)
+            return Malloc(newSize);
+
+        if (newSize == 0)
+            return NULL;
+
+        originalSize = CEREAL_RAPIDJSON_ALIGN(originalSize);
+        newSize = CEREAL_RAPIDJSON_ALIGN(newSize);
+
+        // Do not shrink if new size is smaller than original
+        if (originalSize >= newSize)
+            return originalPtr;
+
+        // Simply expand it if it is the last allocation and there is sufficient space
+        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + CEREAL_RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
+            size_t increment = static_cast<size_t>(newSize - originalSize);
+            if (chunkHead_->size + increment <= chunkHead_->capacity) {
+                chunkHead_->size += increment;
+                return originalPtr;
+            }
+        }
+
+        // Realloc process: allocate and copy memory, do not free original buffer.
+        if (void* newBuffer = Malloc(newSize)) {
+            if (originalSize)
+                std::memcpy(newBuffer, originalPtr, originalSize);
+            return newBuffer;
+        }
+        else
+            return NULL;
+    }
+
+    //! Frees a memory block (concept Allocator)
+    static void Free(void *ptr) { (void)ptr; } // Do nothing
+
+private:
+    //! Copy constructor is not permitted.
+    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
+    //! Copy assignment operator is not permitted.
+    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
+
+    //! Creates a new chunk.
+    /*! \param capacity Capacity of the chunk in bytes.
+        \return true if success.
+    */
+    bool AddChunk(size_t capacity) {
+        if (!baseAllocator_)
+            ownBaseAllocator_ = baseAllocator_ = CEREAL_RAPIDJSON_NEW(BaseAllocator());
+        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(CEREAL_RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
+            chunk->capacity = capacity;
+            chunk->size = 0;
+            chunk->next = chunkHead_;
+            chunkHead_ =  chunk;
+            return true;
+        }
+        else
+            return false;
+    }
+
+    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
+
+    //! Chunk header for perpending to each chunk.
+    /*! Chunks are stored as a singly linked list.
+    */
+    struct ChunkHeader {
+        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
+        size_t size;        //!< Current size of allocated memory in bytes.
+        ChunkHeader *next;  //!< Next chunk in the linked list.
+    };
+
+    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
+    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
+    void *userBuffer_;          //!< User supplied buffer.
+    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
+    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_ENCODINGS_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/document.h b/Src/External/cereal/include/cereal/external/rapidjson/document.h
new file mode 100644
index 0000000..46faeb1
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/document.h
@@ -0,0 +1,2575 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_DOCUMENT_H_
+#define CEREAL_RAPIDJSON_DOCUMENT_H_
+
+/*! \file document.h */
+
+#include "reader.h"
+#include "internal/meta.h"
+#include "internal/strfunc.h"
+#include "memorystream.h"
+#include "encodedstream.h"
+#include <new>      // placement new
+#include <limits>
+
+CEREAL_RAPIDJSON_DIAG_PUSH
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
+CEREAL_RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
+CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#if __GNUC__ >= 6
+CEREAL_RAPIDJSON_DIAG_OFF(terminate) // ignore throwing CEREAL_RAPIDJSON_ASSERT in CEREAL_RAPIDJSON_NOEXCEPT functions
+#endif
+#endif // __GNUC__
+
+#ifndef CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
+#include <iterator> // std::iterator, std::random_access_iterator_tag
+#endif
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#include <utility> // std::move
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+// Forward declaration.
+template <typename Encoding, typename Allocator>
+class GenericValue;
+
+template <typename Encoding, typename Allocator, typename StackAllocator>
+class GenericDocument;
+
+//! Name-value pair in a JSON object value.
+/*!
+    This class was internal to GenericValue. It used to be a inner struct.
+    But a compiler (IBM XL C/C++ for AIX) have reported to have problem with that so it moved as a namespace scope struct.
+    https://code.google.com/p/rapidjson/issues/detail?id=64
+*/
+template <typename Encoding, typename Allocator> 
+struct GenericMember { 
+    GenericValue<Encoding, Allocator> name;     //!< name of member (must be a string)
+    GenericValue<Encoding, Allocator> value;    //!< value of member.
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericMemberIterator
+
+#ifndef CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
+
+//! (Constant) member iterator for a JSON object value
+/*!
+    \tparam Const Is this a constant iterator?
+    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
+    \tparam Allocator   Allocator type for allocating memory of object, array and string.
+
+    This class implements a Random Access Iterator for GenericMember elements
+    of a GenericValue, see ISO/IEC 14882:2003(E) C++ standard, 24.1 [lib.iterator.requirements].
+
+    \note This iterator implementation is mainly intended to avoid implicit
+        conversions from iterator values to \c NULL,
+        e.g. from GenericValue::FindMember.
+
+    \note Define \c CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS to fall back to a
+        pointer-based implementation, if your platform doesn't provide
+        the C++ <iterator> header.
+
+    \see GenericMember, GenericValue::MemberIterator, GenericValue::ConstMemberIterator
+ */
+template <bool Const, typename Encoding, typename Allocator>
+class GenericMemberIterator
+    : public std::iterator<std::random_access_iterator_tag
+        , typename internal::MaybeAddConst<Const,GenericMember<Encoding,Allocator> >::Type> {
+
+    friend class GenericValue<Encoding,Allocator>;
+    template <bool, typename, typename> friend class GenericMemberIterator;
+
+    typedef GenericMember<Encoding,Allocator> PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef std::iterator<std::random_access_iterator_tag,ValueType> BaseType;
+
+public:
+    //! Iterator type itself
+    typedef GenericMemberIterator Iterator;
+    //! Constant iterator type
+    typedef GenericMemberIterator<true,Encoding,Allocator>  ConstIterator;
+    //! Non-constant iterator type
+    typedef GenericMemberIterator<false,Encoding,Allocator> NonConstIterator;
+
+    //! Pointer to (const) GenericMember
+    typedef typename BaseType::pointer         Pointer;
+    //! Reference to (const) GenericMember
+    typedef typename BaseType::reference       Reference;
+    //! Signed integer type (e.g. \c ptrdiff_t)
+    typedef typename BaseType::difference_type DifferenceType;
+
+    //! Default constructor (singular value)
+    /*! Creates an iterator pointing to no element.
+        \note All operations, except for comparisons, are undefined on such values.
+     */
+    GenericMemberIterator() : ptr_() {}
+
+    //! Iterator conversions to more const
+    /*!
+        \param it (Non-const) iterator to copy from
+
+        Allows the creation of an iterator from another GenericMemberIterator
+        that is "less const".  Especially, creating a non-constant iterator
+        from a constant iterator are disabled:
+        \li const -> non-const (not ok)
+        \li const -> const (ok)
+        \li non-const -> const (ok)
+        \li non-const -> non-const (ok)
+
+        \note If the \c Const template parameter is already \c false, this
+            constructor effectively defines a regular copy-constructor.
+            Otherwise, the copy constructor is implicitly defined.
+    */
+    GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
+    Iterator& operator=(const NonConstIterator & it) { ptr_ = it.ptr_; return *this; }
+
+    //! @name stepping
+    //@{
+    Iterator& operator++(){ ++ptr_; return *this; }
+    Iterator& operator--(){ --ptr_; return *this; }
+    Iterator  operator++(int){ Iterator old(*this); ++ptr_; return old; }
+    Iterator  operator--(int){ Iterator old(*this); --ptr_; return old; }
+    //@}
+
+    //! @name increment/decrement
+    //@{
+    Iterator operator+(DifferenceType n) const { return Iterator(ptr_+n); }
+    Iterator operator-(DifferenceType n) const { return Iterator(ptr_-n); }
+
+    Iterator& operator+=(DifferenceType n) { ptr_+=n; return *this; }
+    Iterator& operator-=(DifferenceType n) { ptr_-=n; return *this; }
+    //@}
+
+    //! @name relations
+    //@{
+    bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
+    bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
+    bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
+    bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
+    bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
+    bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
+    //@}
+
+    //! @name dereference
+    //@{
+    Reference operator*() const { return *ptr_; }
+    Pointer   operator->() const { return ptr_; }
+    Reference operator[](DifferenceType n) const { return ptr_[n]; }
+    //@}
+
+    //! Distance
+    DifferenceType operator-(ConstIterator that) const { return ptr_-that.ptr_; }
+
+private:
+    //! Internal constructor from plain pointer
+    explicit GenericMemberIterator(Pointer p) : ptr_(p) {}
+
+    Pointer ptr_; //!< raw pointer
+};
+
+#else // CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
+
+// class-based member iterator implementation disabled, use plain pointers
+
+template <bool Const, typename Encoding, typename Allocator>
+struct GenericMemberIterator;
+
+//! non-const GenericMemberIterator
+template <typename Encoding, typename Allocator>
+struct GenericMemberIterator<false,Encoding,Allocator> {
+    //! use plain pointer as iterator type
+    typedef GenericMember<Encoding,Allocator>* Iterator;
+};
+//! const GenericMemberIterator
+template <typename Encoding, typename Allocator>
+struct GenericMemberIterator<true,Encoding,Allocator> {
+    //! use plain const pointer as iterator type
+    typedef const GenericMember<Encoding,Allocator>* Iterator;
+};
+
+#endif // CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericStringRef
+
+//! Reference to a constant string (not taking a copy)
+/*!
+    \tparam CharType character type of the string
+
+    This helper class is used to automatically infer constant string
+    references for string literals, especially from \c const \b (!)
+    character arrays.
+
+    The main use is for creating JSON string values without copying the
+    source string via an \ref Allocator.  This requires that the referenced
+    string pointers have a sufficient lifetime, which exceeds the lifetime
+    of the associated GenericValue.
+
+    \b Example
+    \code
+    Value v("foo");   // ok, no need to copy & calculate length
+    const char foo[] = "foo";
+    v.SetString(foo); // ok
+
+    const char* bar = foo;
+    // Value x(bar); // not ok, can't rely on bar's lifetime
+    Value x(StringRef(bar)); // lifetime explicitly guaranteed by user
+    Value y(StringRef(bar, 3));  // ok, explicitly pass length
+    \endcode
+
+    \see StringRef, GenericValue::SetString
+*/
+template<typename CharType>
+struct GenericStringRef {
+    typedef CharType Ch; //!< character type of the string
+
+    //! Create string reference from \c const character array
+#ifndef __clang__ // -Wdocumentation
+    /*!
+        This constructor implicitly creates a constant string reference from
+        a \c const character array.  It has better performance than
+        \ref StringRef(const CharType*) by inferring the string \ref length
+        from the array length, and also supports strings containing null
+        characters.
+
+        \tparam N length of the string, automatically inferred
+
+        \param str Constant character array, lifetime assumed to be longer
+            than the use of the string in e.g. a GenericValue
+
+        \post \ref s == str
+
+        \note Constant complexity.
+        \note There is a hidden, private overload to disallow references to
+            non-const character arrays to be created via this constructor.
+            By this, e.g. function-scope arrays used to be filled via
+            \c snprintf are excluded from consideration.
+            In such cases, the referenced string should be \b copied to the
+            GenericValue instead.
+     */
+#endif
+    template<SizeType N>
+    GenericStringRef(const CharType (&str)[N]) CEREAL_RAPIDJSON_NOEXCEPT
+        : s(str), length(N-1) {}
+
+    //! Explicitly create string reference from \c const character pointer
+#ifndef __clang__ // -Wdocumentation
+    /*!
+        This constructor can be used to \b explicitly  create a reference to
+        a constant string pointer.
+
+        \see StringRef(const CharType*)
+
+        \param str Constant character pointer, lifetime assumed to be longer
+            than the use of the string in e.g. a GenericValue
+
+        \post \ref s == str
+
+        \note There is a hidden, private overload to disallow references to
+            non-const character arrays to be created via this constructor.
+            By this, e.g. function-scope arrays used to be filled via
+            \c snprintf are excluded from consideration.
+            In such cases, the referenced string should be \b copied to the
+            GenericValue instead.
+     */
+#endif
+    explicit GenericStringRef(const CharType* str)
+        : s(str), length(internal::StrLen(str)){ CEREAL_RAPIDJSON_ASSERT(s != 0); }
+
+    //! Create constant string reference from pointer and length
+#ifndef __clang__ // -Wdocumentation
+    /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
+        \param len length of the string, excluding the trailing NULL terminator
+
+        \post \ref s == str && \ref length == len
+        \note Constant complexity.
+     */
+#endif
+    GenericStringRef(const CharType* str, SizeType len)
+        : s(str), length(len) { CEREAL_RAPIDJSON_ASSERT(s != 0); }
+
+    GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+
+    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
+
+    //! implicit conversion to plain CharType pointer
+    operator const Ch *() const { return s; }
+
+    const Ch* const s; //!< plain CharType pointer
+    const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
+
+private:
+    //! Disallow construction from non-const array
+    template<SizeType N>
+    GenericStringRef(CharType (&str)[N]) /* = delete */;
+};
+
+//! Mark a character pointer as constant string
+/*! Mark a plain character pointer as a "string literal".  This function
+    can be used to avoid copying a character string to be referenced as a
+    value in a JSON GenericValue object, if the string's lifetime is known
+    to be valid long enough.
+    \tparam CharType Character type of the string
+    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
+    \return GenericStringRef string reference object
+    \relatesalso GenericStringRef
+
+    \see GenericValue::GenericValue(StringRefType), GenericValue::operator=(StringRefType), GenericValue::SetString(StringRefType), GenericValue::PushBack(StringRefType, Allocator&), GenericValue::AddMember
+*/
+template<typename CharType>
+inline GenericStringRef<CharType> StringRef(const CharType* str) {
+    return GenericStringRef<CharType>(str, internal::StrLen(str));
+}
+
+//! Mark a character pointer as constant string
+/*! Mark a plain character pointer as a "string literal".  This function
+    can be used to avoid copying a character string to be referenced as a
+    value in a JSON GenericValue object, if the string's lifetime is known
+    to be valid long enough.
+
+    This version has better performance with supplied length, and also
+    supports string containing null characters.
+
+    \tparam CharType character type of the string
+    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
+    \param length The length of source string.
+    \return GenericStringRef string reference object
+    \relatesalso GenericStringRef
+*/
+template<typename CharType>
+inline GenericStringRef<CharType> StringRef(const CharType* str, size_t length) {
+    return GenericStringRef<CharType>(str, SizeType(length));
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+//! Mark a string object as constant string
+/*! Mark a string object (e.g. \c std::string) as a "string literal".
+    This function can be used to avoid copying a string to be referenced as a
+    value in a JSON GenericValue object, if the string's lifetime is known
+    to be valid long enough.
+
+    \tparam CharType character type of the string
+    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
+    \return GenericStringRef string reference object
+    \relatesalso GenericStringRef
+    \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
+*/
+template<typename CharType>
+inline GenericStringRef<CharType> StringRef(const std::basic_string<CharType>& str) {
+    return GenericStringRef<CharType>(str.data(), SizeType(str.size()));
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericValue type traits
+namespace internal {
+
+template <typename T, typename Encoding = void, typename Allocator = void>
+struct IsGenericValueImpl : FalseType {};
+
+// select candidates according to nested encoding and allocator types
+template <typename T> struct IsGenericValueImpl<T, typename Void<typename T::EncodingType>::Type, typename Void<typename T::AllocatorType>::Type>
+    : IsBaseOf<GenericValue<typename T::EncodingType, typename T::AllocatorType>, T>::Type {};
+
+// helper to match arbitrary GenericValue instantiations, including derived classes
+template <typename T> struct IsGenericValue : IsGenericValueImpl<T>::Type {};
+
+} // namespace internal
+
+///////////////////////////////////////////////////////////////////////////////
+// TypeHelper
+
+namespace internal {
+
+template <typename ValueType, typename T>
+struct TypeHelper {};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, bool> {
+    static bool Is(const ValueType& v) { return v.IsBool(); }
+    static bool Get(const ValueType& v) { return v.GetBool(); }
+    static ValueType& Set(ValueType& v, bool data) { return v.SetBool(data); }
+    static ValueType& Set(ValueType& v, bool data, typename ValueType::AllocatorType&) { return v.SetBool(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, int> {
+    static bool Is(const ValueType& v) { return v.IsInt(); }
+    static int Get(const ValueType& v) { return v.GetInt(); }
+    static ValueType& Set(ValueType& v, int data) { return v.SetInt(data); }
+    static ValueType& Set(ValueType& v, int data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, unsigned> {
+    static bool Is(const ValueType& v) { return v.IsUint(); }
+    static unsigned Get(const ValueType& v) { return v.GetUint(); }
+    static ValueType& Set(ValueType& v, unsigned data) { return v.SetUint(data); }
+    static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, int64_t> {
+    static bool Is(const ValueType& v) { return v.IsInt64(); }
+    static int64_t Get(const ValueType& v) { return v.GetInt64(); }
+    static ValueType& Set(ValueType& v, int64_t data) { return v.SetInt64(data); }
+    static ValueType& Set(ValueType& v, int64_t data, typename ValueType::AllocatorType&) { return v.SetInt64(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, uint64_t> {
+    static bool Is(const ValueType& v) { return v.IsUint64(); }
+    static uint64_t Get(const ValueType& v) { return v.GetUint64(); }
+    static ValueType& Set(ValueType& v, uint64_t data) { return v.SetUint64(data); }
+    static ValueType& Set(ValueType& v, uint64_t data, typename ValueType::AllocatorType&) { return v.SetUint64(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, double> {
+    static bool Is(const ValueType& v) { return v.IsDouble(); }
+    static double Get(const ValueType& v) { return v.GetDouble(); }
+    static ValueType& Set(ValueType& v, double data) { return v.SetDouble(data); }
+    static ValueType& Set(ValueType& v, double data, typename ValueType::AllocatorType&) { return v.SetDouble(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, float> {
+    static bool Is(const ValueType& v) { return v.IsFloat(); }
+    static float Get(const ValueType& v) { return v.GetFloat(); }
+    static ValueType& Set(ValueType& v, float data) { return v.SetFloat(data); }
+    static ValueType& Set(ValueType& v, float data, typename ValueType::AllocatorType&) { return v.SetFloat(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, const typename ValueType::Ch*> {
+    typedef const typename ValueType::Ch* StringType;
+    static bool Is(const ValueType& v) { return v.IsString(); }
+    static StringType Get(const ValueType& v) { return v.GetString(); }
+    static ValueType& Set(ValueType& v, const StringType data) { return v.SetString(typename ValueType::StringRefType(data)); }
+    static ValueType& Set(ValueType& v, const StringType data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
+};
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template<typename ValueType> 
+struct TypeHelper<ValueType, std::basic_string<typename ValueType::Ch> > {
+    typedef std::basic_string<typename ValueType::Ch> StringType;
+    static bool Is(const ValueType& v) { return v.IsString(); }
+    static StringType Get(const ValueType& v) { return StringType(v.GetString(), v.GetStringLength()); }
+    static ValueType& Set(ValueType& v, const StringType& data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
+};
+#endif
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::Array> {
+    typedef typename ValueType::Array ArrayType;
+    static bool Is(const ValueType& v) { return v.IsArray(); }
+    static ArrayType Get(ValueType& v) { return v.GetArray(); }
+    static ValueType& Set(ValueType& v, ArrayType data) { return v = data; }
+    static ValueType& Set(ValueType& v, ArrayType data, typename ValueType::AllocatorType&) { return v = data; }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::ConstArray> {
+    typedef typename ValueType::ConstArray ArrayType;
+    static bool Is(const ValueType& v) { return v.IsArray(); }
+    static ArrayType Get(const ValueType& v) { return v.GetArray(); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::Object> {
+    typedef typename ValueType::Object ObjectType;
+    static bool Is(const ValueType& v) { return v.IsObject(); }
+    static ObjectType Get(ValueType& v) { return v.GetObject(); }
+    static ValueType& Set(ValueType& v, ObjectType data) { return v = data; }
+    static ValueType& Set(ValueType& v, ObjectType data, typename ValueType::AllocatorType&) { v = data; }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::ConstObject> {
+    typedef typename ValueType::ConstObject ObjectType;
+    static bool Is(const ValueType& v) { return v.IsObject(); }
+    static ObjectType Get(const ValueType& v) { return v.GetObject(); }
+};
+
+} // namespace internal
+
+// Forward declarations
+template <bool, typename> class GenericArray;
+template <bool, typename> class GenericObject;
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericValue
+
+//! Represents a JSON value. Use Value for UTF8 encoding and default allocator.
+/*!
+    A JSON value can be one of 7 types. This class is a variant type supporting
+    these types.
+
+    Use the Value if UTF8 and default allocator
+
+    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
+    \tparam Allocator   Allocator type for allocating memory of object, array and string.
+*/
+template <typename Encoding, typename Allocator = MemoryPoolAllocator<> > 
+class GenericValue {
+public:
+    //! Name-value pair in an object.
+    typedef GenericMember<Encoding, Allocator> Member;
+    typedef Encoding EncodingType;                  //!< Encoding type from template parameter.
+    typedef Allocator AllocatorType;                //!< Allocator type from template parameter.
+    typedef typename Encoding::Ch Ch;               //!< Character type derived from Encoding.
+    typedef GenericStringRef<Ch> StringRefType;     //!< Reference to a constant string
+    typedef typename GenericMemberIterator<false,Encoding,Allocator>::Iterator MemberIterator;  //!< Member iterator for iterating in object.
+    typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator;  //!< Constant member iterator for iterating in object.
+    typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
+    typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
+    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of itself.
+    typedef GenericArray<false, ValueType> Array;
+    typedef GenericArray<true, ValueType> ConstArray;
+    typedef GenericObject<false, ValueType> Object;
+    typedef GenericObject<true, ValueType> ConstObject;
+
+    //!@name Constructors and destructor.
+    //@{
+
+    //! Default constructor creates a null value.
+    GenericValue() CEREAL_RAPIDJSON_NOEXCEPT : data_() { data_.f.flags = kNullFlag; }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move constructor in C++11
+    GenericValue(GenericValue&& rhs) CEREAL_RAPIDJSON_NOEXCEPT : data_(rhs.data_) {
+        rhs.data_.f.flags = kNullFlag; // give up contents
+    }
+#endif
+
+private:
+    //! Copy constructor is not permitted.
+    GenericValue(const GenericValue& rhs);
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Moving from a GenericDocument is not permitted.
+    template <typename StackAllocator>
+    GenericValue(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
+
+    //! Move assignment from a GenericDocument is not permitted.
+    template <typename StackAllocator>
+    GenericValue& operator=(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
+#endif
+
+public:
+
+    //! Constructor with JSON value type.
+    /*! This creates a Value of specified type with default content.
+        \param type Type of the value.
+        \note Default content for number is zero.
+    */
+    explicit GenericValue(Type type) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
+        static const uint16_t defaultFlags[7] = {
+            kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
+            kNumberAnyFlag
+        };
+        CEREAL_RAPIDJSON_ASSERT(type <= kNumberType);
+        data_.f.flags = defaultFlags[type];
+
+        // Use ShortString to store empty string.
+        if (type == kStringType)
+            data_.ss.SetLength(0);
+    }
+
+    //! Explicit copy constructor (with allocator)
+    /*! Creates a copy of a Value by using the given Allocator
+        \tparam SourceAllocator allocator of \c rhs
+        \param rhs Value to copy from (read-only)
+        \param allocator Allocator for allocating copied elements and buffers. Commonly use GenericDocument::GetAllocator().
+        \see CopyFrom()
+    */
+    template< typename SourceAllocator >
+    GenericValue(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator & allocator);
+
+    //! Constructor for boolean value.
+    /*! \param b Boolean value
+        \note This constructor is limited to \em real boolean values and rejects
+            implicitly converted types like arbitrary pointers.  Use an explicit cast
+            to \c bool, if you want to construct a boolean JSON value in such cases.
+     */
+#ifndef CEREAL_RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
+    template <typename T>
+    explicit GenericValue(T b, CEREAL_RAPIDJSON_ENABLEIF((internal::IsSame<bool, T>))) CEREAL_RAPIDJSON_NOEXCEPT  // See #472
+#else
+    explicit GenericValue(bool b) CEREAL_RAPIDJSON_NOEXCEPT
+#endif
+        : data_() {
+            // safe-guard against failing SFINAE
+            CEREAL_RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
+            data_.f.flags = b ? kTrueFlag : kFalseFlag;
+    }
+
+    //! Constructor for int value.
+    explicit GenericValue(int i) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
+        data_.n.i64 = i;
+        data_.f.flags = (i >= 0) ? (kNumberIntFlag | kUintFlag | kUint64Flag) : kNumberIntFlag;
+    }
+
+    //! Constructor for unsigned value.
+    explicit GenericValue(unsigned u) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
+        data_.n.u64 = u; 
+        data_.f.flags = (u & 0x80000000) ? kNumberUintFlag : (kNumberUintFlag | kIntFlag | kInt64Flag);
+    }
+
+    //! Constructor for int64_t value.
+    explicit GenericValue(int64_t i64) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
+        data_.n.i64 = i64;
+        data_.f.flags = kNumberInt64Flag;
+        if (i64 >= 0) {
+            data_.f.flags |= kNumberUint64Flag;
+            if (!(static_cast<uint64_t>(i64) & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
+                data_.f.flags |= kUintFlag;
+            if (!(static_cast<uint64_t>(i64) & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
+                data_.f.flags |= kIntFlag;
+        }
+        else if (i64 >= static_cast<int64_t>(CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
+            data_.f.flags |= kIntFlag;
+    }
+
+    //! Constructor for uint64_t value.
+    explicit GenericValue(uint64_t u64) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
+        data_.n.u64 = u64;
+        data_.f.flags = kNumberUint64Flag;
+        if (!(u64 & CEREAL_RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
+            data_.f.flags |= kInt64Flag;
+        if (!(u64 & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
+            data_.f.flags |= kUintFlag;
+        if (!(u64 & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
+            data_.f.flags |= kIntFlag;
+    }
+
+    //! Constructor for double value.
+    explicit GenericValue(double d) CEREAL_RAPIDJSON_NOEXCEPT : data_() { data_.n.d = d; data_.f.flags = kNumberDoubleFlag; }
+
+    //! Constructor for constant string (i.e. do not make a copy of string)
+    GenericValue(const Ch* s, SizeType length) CEREAL_RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(StringRef(s, length)); }
+
+    //! Constructor for constant string (i.e. do not make a copy of string)
+    explicit GenericValue(StringRefType s) CEREAL_RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(s); }
+
+    //! Constructor for copy-string (i.e. do make a copy of string)
+    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_() { SetStringRaw(StringRef(s, length), allocator); }
+
+    //! Constructor for copy-string (i.e. do make a copy of string)
+    GenericValue(const Ch*s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Constructor for copy-string from a string object (i.e. do make a copy of string)
+    /*! \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
+     */
+    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
+#endif
+
+    //! Constructor for Array.
+    /*!
+        \param a An array obtained by \c GetArray().
+        \note \c Array is always pass-by-value.
+        \note the source array is moved into this value and the sourec array becomes empty.
+    */
+    GenericValue(Array a) CEREAL_RAPIDJSON_NOEXCEPT : data_(a.value_.data_) {
+        a.value_.data_ = Data();
+        a.value_.data_.f.flags = kArrayFlag;
+    }
+
+    //! Constructor for Object.
+    /*!
+        \param o An object obtained by \c GetObject().
+        \note \c Object is always pass-by-value.
+        \note the source object is moved into this value and the sourec object becomes empty.
+    */
+    GenericValue(Object o) CEREAL_RAPIDJSON_NOEXCEPT : data_(o.value_.data_) {
+        o.value_.data_ = Data();
+        o.value_.data_.f.flags = kObjectFlag;
+    }
+
+    //! Destructor.
+    /*! Need to destruct elements of array, members of object, or copy-string.
+    */
+    ~GenericValue() {
+        if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
+            switch(data_.f.flags) {
+            case kArrayFlag:
+                {
+                    GenericValue* e = GetElementsPointer();
+                    for (GenericValue* v = e; v != e + data_.a.size; ++v)
+                        v->~GenericValue();
+                    Allocator::Free(e);
+                }
+                break;
+
+            case kObjectFlag:
+                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
+                    m->~Member();
+                Allocator::Free(GetMembersPointer());
+                break;
+
+            case kCopyStringFlag:
+                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
+                break;
+
+            default:
+                break;  // Do nothing for other types.
+            }
+        }
+    }
+
+    //@}
+
+    //!@name Assignment operators
+    //@{
+
+    //! Assignment with move semantics.
+    /*! \param rhs Source of the assignment. It will become a null value after assignment.
+    */
+    GenericValue& operator=(GenericValue& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
+        CEREAL_RAPIDJSON_ASSERT(this != &rhs);
+        this->~GenericValue();
+        RawAssign(rhs);
+        return *this;
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move assignment in C++11
+    GenericValue& operator=(GenericValue&& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
+        return *this = rhs.Move();
+    }
+#endif
+
+    //! Assignment of constant string reference (no copy)
+    /*! \param str Constant string reference to be assigned
+        \note This overload is needed to avoid clashes with the generic primitive type assignment overload below.
+        \see GenericStringRef, operator=(T)
+    */
+    GenericValue& operator=(StringRefType str) CEREAL_RAPIDJSON_NOEXCEPT {
+        GenericValue s(str);
+        return *this = s;
+    }
+
+    //! Assignment with primitive types.
+    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
+        \param value The value to be assigned.
+
+        \note The source type \c T explicitly disallows all pointer types,
+            especially (\c const) \ref Ch*.  This helps avoiding implicitly
+            referencing character strings with insufficient lifetime, use
+            \ref SetString(const Ch*, Allocator&) (for copying) or
+            \ref StringRef() (to explicitly mark the pointer as constant) instead.
+            All other pointer types would implicitly convert to \c bool,
+            use \ref SetBool() instead.
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsPointer<T>), (GenericValue&))
+    operator=(T value) {
+        GenericValue v(value);
+        return *this = v;
+    }
+
+    //! Deep-copy assignment from Value
+    /*! Assigns a \b copy of the Value to the current Value object
+        \tparam SourceAllocator Allocator type of \c rhs
+        \param rhs Value to copy from (read-only)
+        \param allocator Allocator to use for copying
+     */
+    template <typename SourceAllocator>
+    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator) {
+        CEREAL_RAPIDJSON_ASSERT(static_cast<void*>(this) != static_cast<void const*>(&rhs));
+        this->~GenericValue();
+        new (this) GenericValue(rhs, allocator);
+        return *this;
+    }
+
+    //! Exchange the contents of this value with those of other.
+    /*!
+        \param other Another value.
+        \note Constant complexity.
+    */
+    GenericValue& Swap(GenericValue& other) CEREAL_RAPIDJSON_NOEXCEPT {
+        GenericValue temp;
+        temp.RawAssign(*this);
+        RawAssign(other);
+        other.RawAssign(temp);
+        return *this;
+    }
+
+    //! free-standing swap function helper
+    /*!
+        Helper function to enable support for common swap implementation pattern based on \c std::swap:
+        \code
+        void swap(MyClass& a, MyClass& b) {
+            using std::swap;
+            swap(a.value, b.value);
+            // ...
+        }
+        \endcode
+        \see Swap()
+     */
+    friend inline void swap(GenericValue& a, GenericValue& b) CEREAL_RAPIDJSON_NOEXCEPT { a.Swap(b); }
+
+    //! Prepare Value for move semantics
+    /*! \return *this */
+    GenericValue& Move() CEREAL_RAPIDJSON_NOEXCEPT { return *this; }
+    //@}
+
+    //!@name Equal-to and not-equal-to operators
+    //@{
+    //! Equal-to operator
+    /*!
+        \note If an object contains duplicated named member, comparing equality with any object is always \c false.
+        \note Linear time complexity (number of all values in the subtree and total lengths of all strings).
+    */
+    template <typename SourceAllocator>
+    bool operator==(const GenericValue<Encoding, SourceAllocator>& rhs) const {
+        typedef GenericValue<Encoding, SourceAllocator> RhsType;
+        if (GetType() != rhs.GetType())
+            return false;
+
+        switch (GetType()) {
+        case kObjectType: // Warning: O(n^2) inner-loop
+            if (data_.o.size != rhs.data_.o.size)
+                return false;           
+            for (ConstMemberIterator lhsMemberItr = MemberBegin(); lhsMemberItr != MemberEnd(); ++lhsMemberItr) {
+                typename RhsType::ConstMemberIterator rhsMemberItr = rhs.FindMember(lhsMemberItr->name);
+                if (rhsMemberItr == rhs.MemberEnd() || lhsMemberItr->value != rhsMemberItr->value)
+                    return false;
+            }
+            return true;
+            
+        case kArrayType:
+            if (data_.a.size != rhs.data_.a.size)
+                return false;
+            for (SizeType i = 0; i < data_.a.size; i++)
+                if ((*this)[i] != rhs[i])
+                    return false;
+            return true;
+
+        case kStringType:
+            return StringEqual(rhs);
+
+        case kNumberType:
+            if (IsDouble() || rhs.IsDouble()) {
+                double a = GetDouble();     // May convert from integer to double.
+                double b = rhs.GetDouble(); // Ditto
+                return a >= b && a <= b;    // Prevent -Wfloat-equal
+            }
+            else
+                return data_.n.u64 == rhs.data_.n.u64;
+
+        default:
+            return true;
+        }
+    }
+
+    //! Equal-to operator with const C-string pointer
+    bool operator==(const Ch* rhs) const { return *this == GenericValue(StringRef(rhs)); }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Equal-to operator with string object
+    /*! \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
+     */
+    bool operator==(const std::basic_string<Ch>& rhs) const { return *this == GenericValue(StringRef(rhs)); }
+#endif
+
+    //! Equal-to operator with primitive types
+    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c true, \c false
+    */
+    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
+
+    //! Not-equal-to operator
+    /*! \return !(*this == rhs)
+     */
+    template <typename SourceAllocator>
+    bool operator!=(const GenericValue<Encoding, SourceAllocator>& rhs) const { return !(*this == rhs); }
+
+    //! Not-equal-to operator with const C-string pointer
+    bool operator!=(const Ch* rhs) const { return !(*this == rhs); }
+
+    //! Not-equal-to operator with arbitrary types
+    /*! \return !(*this == rhs)
+     */
+    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
+
+    //! Equal-to operator with arbitrary types (symmetric version)
+    /*! \return (rhs == lhs)
+     */
+    template <typename T> friend CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator==(const T& lhs, const GenericValue& rhs) { return rhs == lhs; }
+
+    //! Not-Equal-to operator with arbitrary types (symmetric version)
+    /*! \return !(rhs == lhs)
+     */
+    template <typename T> friend CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); }
+    //@}
+
+    //!@name Type
+    //@{
+
+    Type GetType()  const { return static_cast<Type>(data_.f.flags & kTypeMask); }
+    bool IsNull()   const { return data_.f.flags == kNullFlag; }
+    bool IsFalse()  const { return data_.f.flags == kFalseFlag; }
+    bool IsTrue()   const { return data_.f.flags == kTrueFlag; }
+    bool IsBool()   const { return (data_.f.flags & kBoolFlag) != 0; }
+    bool IsObject() const { return data_.f.flags == kObjectFlag; }
+    bool IsArray()  const { return data_.f.flags == kArrayFlag; }
+    bool IsNumber() const { return (data_.f.flags & kNumberFlag) != 0; }
+    bool IsInt()    const { return (data_.f.flags & kIntFlag) != 0; }
+    bool IsUint()   const { return (data_.f.flags & kUintFlag) != 0; }
+    bool IsInt64()  const { return (data_.f.flags & kInt64Flag) != 0; }
+    bool IsUint64() const { return (data_.f.flags & kUint64Flag) != 0; }
+    bool IsDouble() const { return (data_.f.flags & kDoubleFlag) != 0; }
+    bool IsString() const { return (data_.f.flags & kStringFlag) != 0; }
+
+    // Checks whether a number can be losslessly converted to a double.
+    bool IsLosslessDouble() const {
+        if (!IsNumber()) return false;
+        if (IsUint64()) {
+            uint64_t u = GetUint64();
+            volatile double d = static_cast<double>(u);
+            return (d >= 0.0)
+                && (d < static_cast<double>(std::numeric_limits<uint64_t>::max()))
+                && (u == static_cast<uint64_t>(d));
+        }
+        if (IsInt64()) {
+            int64_t i = GetInt64();
+            volatile double d = static_cast<double>(i);
+            return (d >= static_cast<double>(std::numeric_limits<int64_t>::min()))
+                && (d < static_cast<double>(std::numeric_limits<int64_t>::max()))
+                && (i == static_cast<int64_t>(d));
+        }
+        return true; // double, int, uint are always lossless
+    }
+
+    // Checks whether a number is a float (possible lossy).
+    bool IsFloat() const  {
+        if ((data_.f.flags & kDoubleFlag) == 0)
+            return false;
+        double d = GetDouble();
+        return d >= -3.4028234e38 && d <= 3.4028234e38;
+    }
+    // Checks whether a number can be losslessly converted to a float.
+    bool IsLosslessFloat() const {
+        if (!IsNumber()) return false;
+        double a = GetDouble();
+        if (a < static_cast<double>(-std::numeric_limits<float>::max())
+                || a > static_cast<double>(std::numeric_limits<float>::max()))
+            return false;
+        double b = static_cast<double>(static_cast<float>(a));
+        return a >= b && a <= b;    // Prevent -Wfloat-equal
+    }
+
+    //@}
+
+    //!@name Null
+    //@{
+
+    GenericValue& SetNull() { this->~GenericValue(); new (this) GenericValue(); return *this; }
+
+    //@}
+
+    //!@name Bool
+    //@{
+
+    bool GetBool() const { CEREAL_RAPIDJSON_ASSERT(IsBool()); return data_.f.flags == kTrueFlag; }
+    //!< Set boolean value
+    /*! \post IsBool() == true */
+    GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
+
+    //@}
+
+    //!@name Object
+    //@{
+
+    //! Set this value as an empty object.
+    /*! \post IsObject() == true */
+    GenericValue& SetObject() { this->~GenericValue(); new (this) GenericValue(kObjectType); return *this; }
+
+    //! Get the number of members in the object.
+    SizeType MemberCount() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return data_.o.size; }
+
+    //! Check whether the object is empty.
+    bool ObjectEmpty() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; }
+
+    //! Get a value from an object associated with the name.
+    /*! \pre IsObject() == true
+        \tparam T Either \c Ch or \c const \c Ch (template used for disambiguation with \ref operator[](SizeType))
+        \note In version 0.1x, if the member is not found, this function returns a null value. This makes issue 7.
+        Since 0.2, if the name is not correct, it will assert.
+        If user is unsure whether a member exists, user should use HasMember() first.
+        A better approach is to use FindMember().
+        \note Linear time complexity.
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(GenericValue&)) operator[](T* name) {
+        GenericValue n(StringRef(name));
+        return (*this)[n];
+    }
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(const GenericValue&)) operator[](T* name) const { return const_cast<GenericValue&>(*this)[name]; }
+
+    //! Get a value from an object associated with the name.
+    /*! \pre IsObject() == true
+        \tparam SourceAllocator Allocator of the \c name value
+
+        \note Compared to \ref operator[](T*), this version is faster because it does not need a StrLen().
+        And it can also handle strings with embedded null characters.
+
+        \note Linear time complexity.
+    */
+    template <typename SourceAllocator>
+    GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) {
+        MemberIterator member = FindMember(name);
+        if (member != MemberEnd())
+            return member->value;
+        else {
+            CEREAL_RAPIDJSON_ASSERT(false);    // see above note
+
+            // This will generate -Wexit-time-destructors in clang
+            // static GenericValue NullValue;
+            // return NullValue;
+
+            // Use static buffer and placement-new to prevent destruction
+            static char buffer[sizeof(GenericValue)];
+            return *new (buffer) GenericValue();
+        }
+    }
+    template <typename SourceAllocator>
+    const GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this)[name]; }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Get a value from an object associated with name (string object).
+    GenericValue& operator[](const std::basic_string<Ch>& name) { return (*this)[GenericValue(StringRef(name))]; }
+    const GenericValue& operator[](const std::basic_string<Ch>& name) const { return (*this)[GenericValue(StringRef(name))]; }
+#endif
+
+    //! Const member iterator
+    /*! \pre IsObject() == true */
+    ConstMemberIterator MemberBegin() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer()); }
+    //! Const \em past-the-end member iterator
+    /*! \pre IsObject() == true */
+    ConstMemberIterator MemberEnd() const   { CEREAL_RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer() + data_.o.size); }
+    //! Member iterator
+    /*! \pre IsObject() == true */
+    MemberIterator MemberBegin()            { CEREAL_RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer()); }
+    //! \em Past-the-end member iterator
+    /*! \pre IsObject() == true */
+    MemberIterator MemberEnd()              { CEREAL_RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer() + data_.o.size); }
+
+    //! Check whether a member exists in the object.
+    /*!
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Whether a member with that name exists.
+        \note It is better to use FindMember() directly if you need the obtain the value as well.
+        \note Linear time complexity.
+    */
+    bool HasMember(const Ch* name) const { return FindMember(name) != MemberEnd(); }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Check whether a member exists in the object with string object.
+    /*!
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Whether a member with that name exists.
+        \note It is better to use FindMember() directly if you need the obtain the value as well.
+        \note Linear time complexity.
+    */
+    bool HasMember(const std::basic_string<Ch>& name) const { return FindMember(name) != MemberEnd(); }
+#endif
+
+    //! Check whether a member exists in the object with GenericValue name.
+    /*!
+        This version is faster because it does not need a StrLen(). It can also handle string with null character.
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Whether a member with that name exists.
+        \note It is better to use FindMember() directly if you need the obtain the value as well.
+        \note Linear time complexity.
+    */
+    template <typename SourceAllocator>
+    bool HasMember(const GenericValue<Encoding, SourceAllocator>& name) const { return FindMember(name) != MemberEnd(); }
+
+    //! Find member by name.
+    /*!
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Iterator to member, if it exists.
+            Otherwise returns \ref MemberEnd().
+
+        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
+            the requested member doesn't exist. For consistency with e.g.
+            \c std::map, this has been changed to MemberEnd() now.
+        \note Linear time complexity.
+    */
+    MemberIterator FindMember(const Ch* name) {
+        GenericValue n(StringRef(name));
+        return FindMember(n);
+    }
+
+    ConstMemberIterator FindMember(const Ch* name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
+
+    //! Find member by name.
+    /*!
+        This version is faster because it does not need a StrLen(). It can also handle string with null character.
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Iterator to member, if it exists.
+            Otherwise returns \ref MemberEnd().
+
+        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
+            the requested member doesn't exist. For consistency with e.g.
+            \c std::map, this has been changed to MemberEnd() now.
+        \note Linear time complexity.
+    */
+    template <typename SourceAllocator>
+    MemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) {
+        CEREAL_RAPIDJSON_ASSERT(IsObject());
+        CEREAL_RAPIDJSON_ASSERT(name.IsString());
+        MemberIterator member = MemberBegin();
+        for ( ; member != MemberEnd(); ++member)
+            if (name.StringEqual(member->name))
+                break;
+        return member;
+    }
+    template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Find member by string object name.
+    /*!
+        \param name Member name to be searched.
+        \pre IsObject() == true
+        \return Iterator to member, if it exists.
+            Otherwise returns \ref MemberEnd().
+    */
+    MemberIterator FindMember(const std::basic_string<Ch>& name) { return FindMember(GenericValue(StringRef(name))); }
+    ConstMemberIterator FindMember(const std::basic_string<Ch>& name) const { return FindMember(GenericValue(StringRef(name))); }
+#endif
+
+    //! Add a member (name-value pair) to the object.
+    /*! \param name A string value as name of member.
+        \param value Value of any type.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \note The ownership of \c name and \c value will be transferred to this object on success.
+        \pre  IsObject() && name.IsString()
+        \post name.IsNull() && value.IsNull()
+        \note Amortized Constant time complexity.
+    */
+    GenericValue& AddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
+        CEREAL_RAPIDJSON_ASSERT(IsObject());
+        CEREAL_RAPIDJSON_ASSERT(name.IsString());
+
+        ObjectData& o = data_.o;
+        if (o.size >= o.capacity) {
+            if (o.capacity == 0) {
+                o.capacity = kDefaultObjectCapacity;
+                SetMembersPointer(reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member))));
+            }
+            else {
+                SizeType oldCapacity = o.capacity;
+                o.capacity += (oldCapacity + 1) / 2; // grow by factor 1.5
+                SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), oldCapacity * sizeof(Member), o.capacity * sizeof(Member))));
+            }
+        }
+        Member* members = GetMembersPointer();
+        members[o.size].name.RawAssign(name);
+        members[o.size].value.RawAssign(value);
+        o.size++;
+        return *this;
+    }
+
+    //! Add a constant string value as member (name-value pair) to the object.
+    /*! \param name A string value as name of member.
+        \param value constant string reference as value of member.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \pre  IsObject()
+        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
+        \note Amortized Constant time complexity.
+    */
+    GenericValue& AddMember(GenericValue& name, StringRefType value, Allocator& allocator) {
+        GenericValue v(value);
+        return AddMember(name, v, allocator);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Add a string object as member (name-value pair) to the object.
+    /*! \param name A string value as name of member.
+        \param value constant string reference as value of member.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \pre  IsObject()
+        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
+        \note Amortized Constant time complexity.
+    */
+    GenericValue& AddMember(GenericValue& name, std::basic_string<Ch>& value, Allocator& allocator) {
+        GenericValue v(value, allocator);
+        return AddMember(name, v, allocator);
+    }
+#endif
+
+    //! Add any primitive value as member (name-value pair) to the object.
+    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
+        \param name A string value as name of member.
+        \param value Value of primitive type \c T as value of member
+        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \pre  IsObject()
+
+        \note The source type \c T explicitly disallows all pointer types,
+            especially (\c const) \ref Ch*.  This helps avoiding implicitly
+            referencing character strings with insufficient lifetime, use
+            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
+            AddMember(StringRefType, StringRefType, Allocator&).
+            All other pointer types would implicitly convert to \c bool,
+            use an explicit cast instead, if needed.
+        \note Amortized Constant time complexity.
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
+    AddMember(GenericValue& name, T value, Allocator& allocator) {
+        GenericValue v(value);
+        return AddMember(name, v, allocator);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericValue& AddMember(GenericValue&& name, GenericValue&& value, Allocator& allocator) {
+        return AddMember(name, value, allocator);
+    }
+    GenericValue& AddMember(GenericValue&& name, GenericValue& value, Allocator& allocator) {
+        return AddMember(name, value, allocator);
+    }
+    GenericValue& AddMember(GenericValue& name, GenericValue&& value, Allocator& allocator) {
+        return AddMember(name, value, allocator);
+    }
+    GenericValue& AddMember(StringRefType name, GenericValue&& value, Allocator& allocator) {
+        GenericValue n(name);
+        return AddMember(n, value, allocator);
+    }
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+
+
+    //! Add a member (name-value pair) to the object.
+    /*! \param name A constant string reference as name of member.
+        \param value Value of any type.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \note The ownership of \c value will be transferred to this object on success.
+        \pre  IsObject()
+        \post value.IsNull()
+        \note Amortized Constant time complexity.
+    */
+    GenericValue& AddMember(StringRefType name, GenericValue& value, Allocator& allocator) {
+        GenericValue n(name);
+        return AddMember(n, value, allocator);
+    }
+
+    //! Add a constant string value as member (name-value pair) to the object.
+    /*! \param name A constant string reference as name of member.
+        \param value constant string reference as value of member.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \pre  IsObject()
+        \note This overload is needed to avoid clashes with the generic primitive type AddMember(StringRefType,T,Allocator&) overload below.
+        \note Amortized Constant time complexity.
+    */
+    GenericValue& AddMember(StringRefType name, StringRefType value, Allocator& allocator) {
+        GenericValue v(value);
+        return AddMember(name, v, allocator);
+    }
+
+    //! Add any primitive value as member (name-value pair) to the object.
+    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
+        \param name A constant string reference as name of member.
+        \param value Value of primitive type \c T as value of member
+        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \pre  IsObject()
+
+        \note The source type \c T explicitly disallows all pointer types,
+            especially (\c const) \ref Ch*.  This helps avoiding implicitly
+            referencing character strings with insufficient lifetime, use
+            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
+            AddMember(StringRefType, StringRefType, Allocator&).
+            All other pointer types would implicitly convert to \c bool,
+            use an explicit cast instead, if needed.
+        \note Amortized Constant time complexity.
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
+    AddMember(StringRefType name, T value, Allocator& allocator) {
+        GenericValue n(name);
+        return AddMember(n, value, allocator);
+    }
+
+    //! Remove all members in the object.
+    /*! This function do not deallocate memory in the object, i.e. the capacity is unchanged.
+        \note Linear time complexity.
+    */
+    void RemoveAllMembers() {
+        CEREAL_RAPIDJSON_ASSERT(IsObject()); 
+        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
+            m->~Member();
+        data_.o.size = 0;
+    }
+
+    //! Remove a member in object by its name.
+    /*! \param name Name of member to be removed.
+        \return Whether the member existed.
+        \note This function may reorder the object members. Use \ref
+            EraseMember(ConstMemberIterator) if you need to preserve the
+            relative order of the remaining members.
+        \note Linear time complexity.
+    */
+    bool RemoveMember(const Ch* name) {
+        GenericValue n(StringRef(name));
+        return RemoveMember(n);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool RemoveMember(const std::basic_string<Ch>& name) { return RemoveMember(GenericValue(StringRef(name))); }
+#endif
+
+    template <typename SourceAllocator>
+    bool RemoveMember(const GenericValue<Encoding, SourceAllocator>& name) {
+        MemberIterator m = FindMember(name);
+        if (m != MemberEnd()) {
+            RemoveMember(m);
+            return true;
+        }
+        else
+            return false;
+    }
+
+    //! Remove a member in object by iterator.
+    /*! \param m member iterator (obtained by FindMember() or MemberBegin()).
+        \return the new iterator after removal.
+        \note This function may reorder the object members. Use \ref
+            EraseMember(ConstMemberIterator) if you need to preserve the
+            relative order of the remaining members.
+        \note Constant time complexity.
+    */
+    MemberIterator RemoveMember(MemberIterator m) {
+        CEREAL_RAPIDJSON_ASSERT(IsObject());
+        CEREAL_RAPIDJSON_ASSERT(data_.o.size > 0);
+        CEREAL_RAPIDJSON_ASSERT(GetMembersPointer() != 0);
+        CEREAL_RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
+
+        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
+        if (data_.o.size > 1 && m != last)
+            *m = *last; // Move the last one to this place
+        else
+            m->~Member(); // Only one left, just destroy
+        --data_.o.size;
+        return m;
+    }
+
+    //! Remove a member from an object by iterator.
+    /*! \param pos iterator to the member to remove
+        \pre IsObject() == true && \ref MemberBegin() <= \c pos < \ref MemberEnd()
+        \return Iterator following the removed element.
+            If the iterator \c pos refers to the last element, the \ref MemberEnd() iterator is returned.
+        \note This function preserves the relative order of the remaining object
+            members. If you do not need this, use the more efficient \ref RemoveMember(MemberIterator).
+        \note Linear time complexity.
+    */
+    MemberIterator EraseMember(ConstMemberIterator pos) {
+        return EraseMember(pos, pos +1);
+    }
+
+    //! Remove members in the range [first, last) from an object.
+    /*! \param first iterator to the first member to remove
+        \param last  iterator following the last member to remove
+        \pre IsObject() == true && \ref MemberBegin() <= \c first <= \c last <= \ref MemberEnd()
+        \return Iterator following the last removed element.
+        \note This function preserves the relative order of the remaining object
+            members.
+        \note Linear time complexity.
+    */
+    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
+        CEREAL_RAPIDJSON_ASSERT(IsObject());
+        CEREAL_RAPIDJSON_ASSERT(data_.o.size > 0);
+        CEREAL_RAPIDJSON_ASSERT(GetMembersPointer() != 0);
+        CEREAL_RAPIDJSON_ASSERT(first >= MemberBegin());
+        CEREAL_RAPIDJSON_ASSERT(first <= last);
+        CEREAL_RAPIDJSON_ASSERT(last <= MemberEnd());
+
+        MemberIterator pos = MemberBegin() + (first - MemberBegin());
+        for (MemberIterator itr = pos; itr != last; ++itr)
+            itr->~Member();
+        std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
+        data_.o.size -= static_cast<SizeType>(last - first);
+        return pos;
+    }
+
+    //! Erase a member in object by its name.
+    /*! \param name Name of member to be removed.
+        \return Whether the member existed.
+        \note Linear time complexity.
+    */
+    bool EraseMember(const Ch* name) {
+        GenericValue n(StringRef(name));
+        return EraseMember(n);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool EraseMember(const std::basic_string<Ch>& name) { return EraseMember(GenericValue(StringRef(name))); }
+#endif
+
+    template <typename SourceAllocator>
+    bool EraseMember(const GenericValue<Encoding, SourceAllocator>& name) {
+        MemberIterator m = FindMember(name);
+        if (m != MemberEnd()) {
+            EraseMember(m);
+            return true;
+        }
+        else
+            return false;
+    }
+
+    Object GetObject() { CEREAL_RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
+    ConstObject GetObject() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
+
+    //@}
+
+    //!@name Array
+    //@{
+
+    //! Set this value as an empty array.
+    /*! \post IsArray == true */
+    GenericValue& SetArray() { this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
+
+    //! Get the number of elements in array.
+    SizeType Size() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
+
+    //! Get the capacity of array.
+    SizeType Capacity() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return data_.a.capacity; }
+
+    //! Check whether the array is empty.
+    bool Empty() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return data_.a.size == 0; }
+
+    //! Remove all elements in the array.
+    /*! This function do not deallocate memory in the array, i.e. the capacity is unchanged.
+        \note Linear time complexity.
+    */
+    void Clear() {
+        CEREAL_RAPIDJSON_ASSERT(IsArray()); 
+        GenericValue* e = GetElementsPointer();
+        for (GenericValue* v = e; v != e + data_.a.size; ++v)
+            v->~GenericValue();
+        data_.a.size = 0;
+    }
+
+    //! Get an element from array by index.
+    /*! \pre IsArray() == true
+        \param index Zero-based index of element.
+        \see operator[](T*)
+    */
+    GenericValue& operator[](SizeType index) {
+        CEREAL_RAPIDJSON_ASSERT(IsArray());
+        CEREAL_RAPIDJSON_ASSERT(index < data_.a.size);
+        return GetElementsPointer()[index];
+    }
+    const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
+
+    //! Element iterator
+    /*! \pre IsArray() == true */
+    ValueIterator Begin() { CEREAL_RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer(); }
+    //! \em Past-the-end element iterator
+    /*! \pre IsArray() == true */
+    ValueIterator End() { CEREAL_RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer() + data_.a.size; }
+    //! Constant element iterator
+    /*! \pre IsArray() == true */
+    ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
+    //! Constant \em past-the-end element iterator
+    /*! \pre IsArray() == true */
+    ConstValueIterator End() const { return const_cast<GenericValue&>(*this).End(); }
+
+    //! Request the array to have enough capacity to store elements.
+    /*! \param newCapacity  The capacity that the array at least need to have.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \note Linear time complexity.
+    */
+    GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
+        CEREAL_RAPIDJSON_ASSERT(IsArray());
+        if (newCapacity > data_.a.capacity) {
+            SetElementsPointer(reinterpret_cast<GenericValue*>(allocator.Realloc(GetElementsPointer(), data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue))));
+            data_.a.capacity = newCapacity;
+        }
+        return *this;
+    }
+
+    //! Append a GenericValue at the end of the array.
+    /*! \param value        Value to be appended.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \pre IsArray() == true
+        \post value.IsNull() == true
+        \return The value itself for fluent API.
+        \note The ownership of \c value will be transferred to this array on success.
+        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
+        \note Amortized constant time complexity.
+    */
+    GenericValue& PushBack(GenericValue& value, Allocator& allocator) {
+        CEREAL_RAPIDJSON_ASSERT(IsArray());
+        if (data_.a.size >= data_.a.capacity)
+            Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
+        GetElementsPointer()[data_.a.size++].RawAssign(value);
+        return *this;
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericValue& PushBack(GenericValue&& value, Allocator& allocator) {
+        return PushBack(value, allocator);
+    }
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+
+    //! Append a constant string reference at the end of the array.
+    /*! \param value        Constant string reference to be appended.
+        \param allocator    Allocator for reallocating memory. It must be the same one used previously. Commonly use GenericDocument::GetAllocator().
+        \pre IsArray() == true
+        \return The value itself for fluent API.
+        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
+        \note Amortized constant time complexity.
+        \see GenericStringRef
+    */
+    GenericValue& PushBack(StringRefType value, Allocator& allocator) {
+        return (*this).template PushBack<StringRefType>(value, allocator);
+    }
+
+    //! Append a primitive value at the end of the array.
+    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
+        \param value Value of primitive type T to be appended.
+        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
+        \pre IsArray() == true
+        \return The value itself for fluent API.
+        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
+
+        \note The source type \c T explicitly disallows all pointer types,
+            especially (\c const) \ref Ch*.  This helps avoiding implicitly
+            referencing character strings with insufficient lifetime, use
+            \ref PushBack(GenericValue&, Allocator&) or \ref
+            PushBack(StringRefType, Allocator&).
+            All other pointer types would implicitly convert to \c bool,
+            use an explicit cast instead, if needed.
+        \note Amortized constant time complexity.
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
+    PushBack(T value, Allocator& allocator) {
+        GenericValue v(value);
+        return PushBack(v, allocator);
+    }
+
+    //! Remove the last element in the array.
+    /*!
+        \note Constant time complexity.
+    */
+    GenericValue& PopBack() {
+        CEREAL_RAPIDJSON_ASSERT(IsArray());
+        CEREAL_RAPIDJSON_ASSERT(!Empty());
+        GetElementsPointer()[--data_.a.size].~GenericValue();
+        return *this;
+    }
+
+    //! Remove an element of array by iterator.
+    /*!
+        \param pos iterator to the element to remove
+        \pre IsArray() == true && \ref Begin() <= \c pos < \ref End()
+        \return Iterator following the removed element. If the iterator pos refers to the last element, the End() iterator is returned.
+        \note Linear time complexity.
+    */
+    ValueIterator Erase(ConstValueIterator pos) {
+        return Erase(pos, pos + 1);
+    }
+
+    //! Remove elements in the range [first, last) of the array.
+    /*!
+        \param first iterator to the first element to remove
+        \param last  iterator following the last element to remove
+        \pre IsArray() == true && \ref Begin() <= \c first <= \c last <= \ref End()
+        \return Iterator following the last removed element.
+        \note Linear time complexity.
+    */
+    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
+        CEREAL_RAPIDJSON_ASSERT(IsArray());
+        CEREAL_RAPIDJSON_ASSERT(data_.a.size > 0);
+        CEREAL_RAPIDJSON_ASSERT(GetElementsPointer() != 0);
+        CEREAL_RAPIDJSON_ASSERT(first >= Begin());
+        CEREAL_RAPIDJSON_ASSERT(first <= last);
+        CEREAL_RAPIDJSON_ASSERT(last <= End());
+        ValueIterator pos = Begin() + (first - Begin());
+        for (ValueIterator itr = pos; itr != last; ++itr)
+            itr->~GenericValue();       
+        std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
+        data_.a.size -= static_cast<SizeType>(last - first);
+        return pos;
+    }
+
+    Array GetArray() { CEREAL_RAPIDJSON_ASSERT(IsArray()); return Array(*this); }
+    ConstArray GetArray() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return ConstArray(*this); }
+
+    //@}
+
+    //!@name Number
+    //@{
+
+    int GetInt() const          { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kIntFlag);   return data_.n.i.i;   }
+    unsigned GetUint() const    { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kUintFlag);  return data_.n.u.u;   }
+    int64_t GetInt64() const    { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kInt64Flag); return data_.n.i64; }
+    uint64_t GetUint64() const  { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; }
+
+    //! Get the value as double type.
+    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless.
+    */
+    double GetDouble() const {
+        CEREAL_RAPIDJSON_ASSERT(IsNumber());
+        if ((data_.f.flags & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
+        if ((data_.f.flags & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
+        if ((data_.f.flags & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
+        if ((data_.f.flags & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
+        CEREAL_RAPIDJSON_ASSERT((data_.f.flags & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
+    }
+
+    //! Get the value as float type.
+    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless.
+    */
+    float GetFloat() const {
+        return static_cast<float>(GetDouble());
+    }
+
+    GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
+    GenericValue& SetUint(unsigned u)       { this->~GenericValue(); new (this) GenericValue(u);    return *this; }
+    GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
+    GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
+    GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
+    GenericValue& SetFloat(float f)         { this->~GenericValue(); new (this) GenericValue(f);    return *this; }
+
+    //@}
+
+    //!@name String
+    //@{
+
+    const Ch* GetString() const { CEREAL_RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
+
+    //! Get the length of string.
+    /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
+    */
+    SizeType GetStringLength() const { CEREAL_RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
+
+    //! Set this value as a string without copying source string.
+    /*! This version has better performance with supplied length, and also support string containing null character.
+        \param s source string pointer. 
+        \param length The length of source string, excluding the trailing null terminator.
+        \return The value itself for fluent API.
+        \post IsString() == true && GetString() == s && GetStringLength() == length
+        \see SetString(StringRefType)
+    */
+    GenericValue& SetString(const Ch* s, SizeType length) { return SetString(StringRef(s, length)); }
+
+    //! Set this value as a string without copying source string.
+    /*! \param s source string reference
+        \return The value itself for fluent API.
+        \post IsString() == true && GetString() == s && GetStringLength() == s.length
+    */
+    GenericValue& SetString(StringRefType s) { this->~GenericValue(); SetStringRaw(s); return *this; }
+
+    //! Set this value as a string by copying from source string.
+    /*! This version has better performance with supplied length, and also support string containing null character.
+        \param s source string. 
+        \param length The length of source string, excluding the trailing null terminator.
+        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
+    */
+    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { this->~GenericValue(); SetStringRaw(StringRef(s, length), allocator); return *this; }
+
+    //! Set this value as a string by copying from source string.
+    /*! \param s source string. 
+        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
+    */
+    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(s, internal::StrLen(s), allocator); }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Set this value as a string by copying from source string.
+    /*! \param s source string.
+        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
+        \return The value itself for fluent API.
+        \post IsString() == true && GetString() != s.data() && strcmp(GetString(),s.data() == 0 && GetStringLength() == s.size()
+        \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
+    */
+    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(s.data(), SizeType(s.size()), allocator); }
+#endif
+
+    //@}
+
+    //!@name Array
+    //@{
+
+    //! Templated version for checking whether this value is type T.
+    /*!
+        \tparam T Either \c bool, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c float, \c const \c char*, \c std::basic_string<Ch>
+    */
+    template <typename T>
+    bool Is() const { return internal::TypeHelper<ValueType, T>::Is(*this); }
+
+    template <typename T>
+    T Get() const { return internal::TypeHelper<ValueType, T>::Get(*this); }
+
+    template <typename T>
+    T Get() { return internal::TypeHelper<ValueType, T>::Get(*this); }
+
+    template<typename T>
+    ValueType& Set(const T& data) { return internal::TypeHelper<ValueType, T>::Set(*this, data); }
+
+    template<typename T>
+    ValueType& Set(const T& data, AllocatorType& allocator) { return internal::TypeHelper<ValueType, T>::Set(*this, data, allocator); }
+
+    //@}
+
+    //! Generate events of this value to a Handler.
+    /*! This function adopts the GoF visitor pattern.
+        Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
+        It can also be used to deep clone this value via GenericDocument, which is also a Handler.
+        \tparam Handler type of handler.
+        \param handler An object implementing concept Handler.
+    */
+    template <typename Handler>
+    bool Accept(Handler& handler) const {
+        switch(GetType()) {
+        case kNullType:     return handler.Null();
+        case kFalseType:    return handler.Bool(false);
+        case kTrueType:     return handler.Bool(true);
+
+        case kObjectType:
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartObject()))
+                return false;
+            for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
+                CEREAL_RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
+                if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.data_.f.flags & kCopyFlag) != 0)))
+                    return false;
+                if (CEREAL_RAPIDJSON_UNLIKELY(!m->value.Accept(handler)))
+                    return false;
+            }
+            return handler.EndObject(data_.o.size);
+
+        case kArrayType:
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartArray()))
+                return false;
+            for (const GenericValue* v = Begin(); v != End(); ++v)
+                if (CEREAL_RAPIDJSON_UNLIKELY(!v->Accept(handler)))
+                    return false;
+            return handler.EndArray(data_.a.size);
+    
+        case kStringType:
+            return handler.String(GetString(), GetStringLength(), (data_.f.flags & kCopyFlag) != 0);
+    
+        default:
+            CEREAL_RAPIDJSON_ASSERT(GetType() == kNumberType);
+            if (IsDouble())         return handler.Double(data_.n.d);
+            else if (IsInt())       return handler.Int(data_.n.i.i);
+            else if (IsUint())      return handler.Uint(data_.n.u.u);
+            else if (IsInt64())     return handler.Int64(data_.n.i64);
+            else                    return handler.Uint64(data_.n.u64);
+        }
+    }
+
+private:
+    template <typename, typename> friend class GenericValue;
+    template <typename, typename, typename> friend class GenericDocument;
+
+    enum {
+        kBoolFlag       = 0x0008,
+        kNumberFlag     = 0x0010,
+        kIntFlag        = 0x0020,
+        kUintFlag       = 0x0040,
+        kInt64Flag      = 0x0080,
+        kUint64Flag     = 0x0100,
+        kDoubleFlag     = 0x0200,
+        kStringFlag     = 0x0400,
+        kCopyFlag       = 0x0800,
+        kInlineStrFlag  = 0x1000,
+
+        // Initial flags of different types.
+        kNullFlag = kNullType,
+        kTrueFlag = kTrueType | kBoolFlag,
+        kFalseFlag = kFalseType | kBoolFlag,
+        kNumberIntFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag,
+        kNumberUintFlag = kNumberType | kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag,
+        kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
+        kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
+        kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
+        kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
+        kConstStringFlag = kStringType | kStringFlag,
+        kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
+        kShortStringFlag = kStringType | kStringFlag | kCopyFlag | kInlineStrFlag,
+        kObjectFlag = kObjectType,
+        kArrayFlag = kArrayType,
+
+        kTypeMask = 0x07
+    };
+
+    static const SizeType kDefaultArrayCapacity = 16;
+    static const SizeType kDefaultObjectCapacity = 16;
+
+    struct Flag {
+#if CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
+        char payload[sizeof(SizeType) * 2 + 6];     // 2 x SizeType + lower 48-bit pointer
+#elif CEREAL_RAPIDJSON_64BIT
+        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 6]; // 6 padding bytes
+#else
+        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 2]; // 2 padding bytes
+#endif
+        uint16_t flags;
+    };
+
+    struct String {
+        SizeType length;
+        SizeType hashcode;  //!< reserved
+        const Ch* str;
+    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+
+    // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
+    // (excluding the terminating zero) and store a value to determine the length of the contained
+    // string in the last character str[LenPos] by storing "MaxSize - length" there. If the string
+    // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
+    // the string terminator as well. For getting the string length back from that value just use
+    // "MaxSize - str[LenPos]".
+    // This allows to store 13-chars strings in 32-bit mode, 21-chars strings in 64-bit mode,
+    // 13-chars strings for CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION=1 inline (for `UTF8`-encoded strings).
+    struct ShortString {
+        enum { MaxChars = sizeof(static_cast<Flag*>(0)->payload) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
+        Ch str[MaxChars];
+
+        inline static bool Usable(SizeType len) { return                       (MaxSize >= len); }
+        inline void     SetLength(SizeType len) { str[LenPos] = static_cast<Ch>(MaxSize -  len); }
+        inline SizeType GetLength() const       { return  static_cast<SizeType>(MaxSize -  str[LenPos]); }
+    };  // at most as many bytes as "String" above => 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+
+    // By using proper binary layout, retrieval of different integer types do not need conversions.
+    union Number {
+#if CEREAL_RAPIDJSON_ENDIAN == CEREAL_RAPIDJSON_LITTLEENDIAN
+        struct I {
+            int i;
+            char padding[4];
+        }i;
+        struct U {
+            unsigned u;
+            char padding2[4];
+        }u;
+#else
+        struct I {
+            char padding[4];
+            int i;
+        }i;
+        struct U {
+            char padding2[4];
+            unsigned u;
+        }u;
+#endif
+        int64_t i64;
+        uint64_t u64;
+        double d;
+    };  // 8 bytes
+
+    struct ObjectData {
+        SizeType size;
+        SizeType capacity;
+        Member* members;
+    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+
+    struct ArrayData {
+        SizeType size;
+        SizeType capacity;
+        GenericValue* elements;
+    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+
+    union Data {
+        String s;
+        ShortString ss;
+        Number n;
+        ObjectData o;
+        ArrayData a;
+        Flag f;
+    };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+    CEREAL_RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return CEREAL_RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
+    CEREAL_RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return CEREAL_RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
+    CEREAL_RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return CEREAL_RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
+    CEREAL_RAPIDJSON_FORCEINLINE GenericValue* SetElementsPointer(GenericValue* elements) { return CEREAL_RAPIDJSON_SETPOINTER(GenericValue, data_.a.elements, elements); }
+    CEREAL_RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return CEREAL_RAPIDJSON_GETPOINTER(Member, data_.o.members); }
+    CEREAL_RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return CEREAL_RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
+
+    // Initialize this value as array with initial data, without calling destructor.
+    void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
+        data_.f.flags = kArrayFlag;
+        if (count) {
+            GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
+            SetElementsPointer(e);
+            std::memcpy(e, values, count * sizeof(GenericValue));
+        }
+        else
+            SetElementsPointer(0);
+        data_.a.size = data_.a.capacity = count;
+    }
+
+    //! Initialize this value as object with initial data, without calling destructor.
+    void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
+        data_.f.flags = kObjectFlag;
+        if (count) {
+            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
+            SetMembersPointer(m);
+            std::memcpy(m, members, count * sizeof(Member));
+        }
+        else
+            SetMembersPointer(0);
+        data_.o.size = data_.o.capacity = count;
+    }
+
+    //! Initialize this value as constant string, without calling destructor.
+    void SetStringRaw(StringRefType s) CEREAL_RAPIDJSON_NOEXCEPT {
+        data_.f.flags = kConstStringFlag;
+        SetStringPointer(s);
+        data_.s.length = s.length;
+    }
+
+    //! Initialize this value as copy string with initial data, without calling destructor.
+    void SetStringRaw(StringRefType s, Allocator& allocator) {
+        Ch* str = 0;
+        if (ShortString::Usable(s.length)) {
+            data_.f.flags = kShortStringFlag;
+            data_.ss.SetLength(s.length);
+            str = data_.ss.str;
+        } else {
+            data_.f.flags = kCopyStringFlag;
+            data_.s.length = s.length;
+            str = static_cast<Ch *>(allocator.Malloc((s.length + 1) * sizeof(Ch)));
+            SetStringPointer(str);
+        }
+        std::memcpy(str, s, s.length * sizeof(Ch));
+        str[s.length] = '\0';
+    }
+
+    //! Assignment without calling destructor
+    void RawAssign(GenericValue& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
+        data_ = rhs.data_;
+        // data_.f.flags = rhs.data_.f.flags;
+        rhs.data_.f.flags = kNullFlag;
+    }
+
+    template <typename SourceAllocator>
+    bool StringEqual(const GenericValue<Encoding, SourceAllocator>& rhs) const {
+        CEREAL_RAPIDJSON_ASSERT(IsString());
+        CEREAL_RAPIDJSON_ASSERT(rhs.IsString());
+
+        const SizeType len1 = GetStringLength();
+        const SizeType len2 = rhs.GetStringLength();
+        if(len1 != len2) { return false; }
+
+        const Ch* const str1 = GetString();
+        const Ch* const str2 = rhs.GetString();
+        if(str1 == str2) { return true; } // fast path for constant string
+
+        return (std::memcmp(str1, str2, sizeof(Ch) * len1) == 0);
+    }
+
+    Data data_;
+};
+
+//! GenericValue with UTF8 encoding
+typedef GenericValue<UTF8<> > Value;
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericDocument 
+
+//! A document for parsing JSON text as DOM.
+/*!
+    \note implements Handler concept
+    \tparam Encoding Encoding for both parsing and string storage.
+    \tparam Allocator Allocator for allocating memory for the DOM
+    \tparam StackAllocator Allocator for allocating memory for stack during parsing.
+    \warning Although GenericDocument inherits from GenericValue, the API does \b not provide any virtual functions, especially no virtual destructor.  To avoid memory leaks, do not \c delete a GenericDocument object via a pointer to a GenericValue.
+*/
+template <typename Encoding, typename Allocator = MemoryPoolAllocator<>, typename StackAllocator = CrtAllocator>
+class GenericDocument : public GenericValue<Encoding, Allocator> {
+public:
+    typedef typename Encoding::Ch Ch;                       //!< Character type derived from Encoding.
+    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of the document.
+    typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
+
+    //! Constructor
+    /*! Creates an empty document of specified type.
+        \param type             Mandatory type of object to create.
+        \param allocator        Optional allocator for allocating memory.
+        \param stackCapacity    Optional initial capacity of stack in bytes.
+        \param stackAllocator   Optional allocator for allocating memory for stack.
+    */
+    explicit GenericDocument(Type type, Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) :
+        GenericValue<Encoding, Allocator>(type),  allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
+    {
+        if (!allocator_)
+            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
+    }
+
+    //! Constructor
+    /*! Creates an empty document which type is Null. 
+        \param allocator        Optional allocator for allocating memory.
+        \param stackCapacity    Optional initial capacity of stack in bytes.
+        \param stackAllocator   Optional allocator for allocating memory for stack.
+    */
+    GenericDocument(Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) : 
+        allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
+    {
+        if (!allocator_)
+            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move constructor in C++11
+    GenericDocument(GenericDocument&& rhs) CEREAL_RAPIDJSON_NOEXCEPT
+        : ValueType(std::forward<ValueType>(rhs)), // explicit cast to avoid prohibited move from Document
+          allocator_(rhs.allocator_),
+          ownAllocator_(rhs.ownAllocator_),
+          stack_(std::move(rhs.stack_)),
+          parseResult_(rhs.parseResult_)
+    {
+        rhs.allocator_ = 0;
+        rhs.ownAllocator_ = 0;
+        rhs.parseResult_ = ParseResult();
+    }
+#endif
+
+    ~GenericDocument() {
+        Destroy();
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move assignment in C++11
+    GenericDocument& operator=(GenericDocument&& rhs) CEREAL_RAPIDJSON_NOEXCEPT
+    {
+        // The cast to ValueType is necessary here, because otherwise it would
+        // attempt to call GenericValue's templated assignment operator.
+        ValueType::operator=(std::forward<ValueType>(rhs));
+
+        // Calling the destructor here would prematurely call stack_'s destructor
+        Destroy();
+
+        allocator_ = rhs.allocator_;
+        ownAllocator_ = rhs.ownAllocator_;
+        stack_ = std::move(rhs.stack_);
+        parseResult_ = rhs.parseResult_;
+
+        rhs.allocator_ = 0;
+        rhs.ownAllocator_ = 0;
+        rhs.parseResult_ = ParseResult();
+
+        return *this;
+    }
+#endif
+
+    //! Exchange the contents of this document with those of another.
+    /*!
+        \param rhs Another document.
+        \note Constant complexity.
+        \see GenericValue::Swap
+    */
+    GenericDocument& Swap(GenericDocument& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
+        ValueType::Swap(rhs);
+        stack_.Swap(rhs.stack_);
+        internal::Swap(allocator_, rhs.allocator_);
+        internal::Swap(ownAllocator_, rhs.ownAllocator_);
+        internal::Swap(parseResult_, rhs.parseResult_);
+        return *this;
+    }
+
+    //! free-standing swap function helper
+    /*!
+        Helper function to enable support for common swap implementation pattern based on \c std::swap:
+        \code
+        void swap(MyClass& a, MyClass& b) {
+            using std::swap;
+            swap(a.doc, b.doc);
+            // ...
+        }
+        \endcode
+        \see Swap()
+     */
+    friend inline void swap(GenericDocument& a, GenericDocument& b) CEREAL_RAPIDJSON_NOEXCEPT { a.Swap(b); }
+
+    //! Populate this document by a generator which produces SAX events.
+    /*! \tparam Generator A functor with <tt>bool f(Handler)</tt> prototype.
+        \param g Generator functor which sends SAX events to the parameter.
+        \return The document itself for fluent API.
+    */
+    template <typename Generator>
+    GenericDocument& Populate(Generator& g) {
+        ClearStackOnExit scope(*this);
+        if (g(*this)) {
+            CEREAL_RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
+            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
+        }
+        return *this;
+    }
+
+    //!@name Parse from stream
+    //!@{
+
+    //! Parse JSON text from an input stream (with Encoding conversion)
+    /*! \tparam parseFlags Combination of \ref ParseFlag.
+        \tparam SourceEncoding Encoding of input stream
+        \tparam InputStream Type of input stream, implementing Stream concept
+        \param is Input stream to be parsed.
+        \return The document itself for fluent API.
+    */
+    template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
+    GenericDocument& ParseStream(InputStream& is) {
+        GenericReader<SourceEncoding, Encoding, StackAllocator> reader(
+            stack_.HasAllocator() ? &stack_.GetAllocator() : 0);
+        ClearStackOnExit scope(*this);
+        parseResult_ = reader.template Parse<parseFlags>(is, *this);
+        if (parseResult_) {
+            CEREAL_RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
+            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
+        }
+        return *this;
+    }
+
+    //! Parse JSON text from an input stream
+    /*! \tparam parseFlags Combination of \ref ParseFlag.
+        \tparam InputStream Type of input stream, implementing Stream concept
+        \param is Input stream to be parsed.
+        \return The document itself for fluent API.
+    */
+    template <unsigned parseFlags, typename InputStream>
+    GenericDocument& ParseStream(InputStream& is) {
+        return ParseStream<parseFlags, Encoding, InputStream>(is);
+    }
+
+    //! Parse JSON text from an input stream (with \ref kParseDefaultFlags)
+    /*! \tparam InputStream Type of input stream, implementing Stream concept
+        \param is Input stream to be parsed.
+        \return The document itself for fluent API.
+    */
+    template <typename InputStream>
+    GenericDocument& ParseStream(InputStream& is) {
+        return ParseStream<kParseDefaultFlags, Encoding, InputStream>(is);
+    }
+    //!@}
+
+    //!@name Parse in-place from mutable string
+    //!@{
+
+    //! Parse JSON text from a mutable string
+    /*! \tparam parseFlags Combination of \ref ParseFlag.
+        \param str Mutable zero-terminated string to be parsed.
+        \return The document itself for fluent API.
+    */
+    template <unsigned parseFlags>
+    GenericDocument& ParseInsitu(Ch* str) {
+        GenericInsituStringStream<Encoding> s(str);
+        return ParseStream<parseFlags | kParseInsituFlag>(s);
+    }
+
+    //! Parse JSON text from a mutable string (with \ref kParseDefaultFlags)
+    /*! \param str Mutable zero-terminated string to be parsed.
+        \return The document itself for fluent API.
+    */
+    GenericDocument& ParseInsitu(Ch* str) {
+        return ParseInsitu<kParseDefaultFlags>(str);
+    }
+    //!@}
+
+    //!@name Parse from read-only string
+    //!@{
+
+    //! Parse JSON text from a read-only string (with Encoding conversion)
+    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
+        \tparam SourceEncoding Transcoding from input Encoding
+        \param str Read-only zero-terminated string to be parsed.
+    */
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const typename SourceEncoding::Ch* str) {
+        CEREAL_RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
+        GenericStringStream<SourceEncoding> s(str);
+        return ParseStream<parseFlags, SourceEncoding>(s);
+    }
+
+    //! Parse JSON text from a read-only string
+    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
+        \param str Read-only zero-terminated string to be parsed.
+    */
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const Ch* str) {
+        return Parse<parseFlags, Encoding>(str);
+    }
+
+    //! Parse JSON text from a read-only string (with \ref kParseDefaultFlags)
+    /*! \param str Read-only zero-terminated string to be parsed.
+    */
+    GenericDocument& Parse(const Ch* str) {
+        return Parse<kParseDefaultFlags>(str);
+    }
+
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const typename SourceEncoding::Ch* str, size_t length) {
+        CEREAL_RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
+        MemoryStream ms(static_cast<const char*>(str), length * sizeof(typename SourceEncoding::Ch));
+        EncodedInputStream<SourceEncoding, MemoryStream> is(ms);
+        ParseStream<parseFlags, SourceEncoding>(is);
+        return *this;
+    }
+
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const Ch* str, size_t length) {
+        return Parse<parseFlags, Encoding>(str, length);
+    }
+    
+    GenericDocument& Parse(const Ch* str, size_t length) {
+        return Parse<kParseDefaultFlags>(str, length);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const std::basic_string<typename SourceEncoding::Ch>& str) {
+        // c_str() is constant complexity according to standard. Should be faster than Parse(const char*, size_t)
+        return Parse<parseFlags, SourceEncoding>(str.c_str());
+    }
+
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const std::basic_string<Ch>& str) {
+        return Parse<parseFlags, Encoding>(str.c_str());
+    }
+
+    GenericDocument& Parse(const std::basic_string<Ch>& str) {
+        return Parse<kParseDefaultFlags>(str);
+    }
+#endif // CEREAL_RAPIDJSON_HAS_STDSTRING    
+
+    //!@}
+
+    //!@name Handling parse errors
+    //!@{
+
+    //! Whether a parse error has occured in the last parsing.
+    bool HasParseError() const { return parseResult_.IsError(); }
+
+    //! Get the \ref ParseErrorCode of last parsing.
+    ParseErrorCode GetParseError() const { return parseResult_.Code(); }
+
+    //! Get the position of last parsing error in input, 0 otherwise.
+    size_t GetErrorOffset() const { return parseResult_.Offset(); }
+
+    //! Implicit conversion to get the last parse result
+#ifndef __clang // -Wdocumentation
+    /*! \return \ref ParseResult of the last parse operation
+
+        \code
+          Document doc;
+          ParseResult ok = doc.Parse(json);
+          if (!ok)
+            printf( "JSON parse error: %s (%u)\n", GetParseError_En(ok.Code()), ok.Offset());
+        \endcode
+     */
+#endif
+    operator ParseResult() const { return parseResult_; }
+    //!@}
+
+    //! Get the allocator of this document.
+    Allocator& GetAllocator() {
+        CEREAL_RAPIDJSON_ASSERT(allocator_);
+        return *allocator_;
+    }
+
+    //! Get the capacity of stack in bytes.
+    size_t GetStackCapacity() const { return stack_.GetCapacity(); }
+
+private:
+    // clear stack on any exit from ParseStream, e.g. due to exception
+    struct ClearStackOnExit {
+        explicit ClearStackOnExit(GenericDocument& d) : d_(d) {}
+        ~ClearStackOnExit() { d_.ClearStack(); }
+    private:
+        ClearStackOnExit(const ClearStackOnExit&);
+        ClearStackOnExit& operator=(const ClearStackOnExit&);
+        GenericDocument& d_;
+    };
+
+    // callers of the following private Handler functions
+    // template <typename,typename,typename> friend class GenericReader; // for parsing
+    template <typename, typename> friend class GenericValue; // for deep copying
+
+public:
+    // Implementation of Handler
+    bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
+    bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
+    bool Int(int i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
+    bool Uint(unsigned i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
+    bool Int64(int64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
+    bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
+    bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
+
+    bool RawNumber(const Ch* str, SizeType length, bool copy) { 
+        if (copy) 
+            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
+        else
+            new (stack_.template Push<ValueType>()) ValueType(str, length);
+        return true;
+    }
+
+    bool String(const Ch* str, SizeType length, bool copy) { 
+        if (copy) 
+            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
+        else
+            new (stack_.template Push<ValueType>()) ValueType(str, length);
+        return true;
+    }
+
+    bool StartObject() { new (stack_.template Push<ValueType>()) ValueType(kObjectType); return true; }
+    
+    bool Key(const Ch* str, SizeType length, bool copy) { return String(str, length, copy); }
+
+    bool EndObject(SizeType memberCount) {
+        typename ValueType::Member* members = stack_.template Pop<typename ValueType::Member>(memberCount);
+        stack_.template Top<ValueType>()->SetObjectRaw(members, memberCount, GetAllocator());
+        return true;
+    }
+
+    bool StartArray() { new (stack_.template Push<ValueType>()) ValueType(kArrayType); return true; }
+    
+    bool EndArray(SizeType elementCount) {
+        ValueType* elements = stack_.template Pop<ValueType>(elementCount);
+        stack_.template Top<ValueType>()->SetArrayRaw(elements, elementCount, GetAllocator());
+        return true;
+    }
+
+private:
+    //! Prohibit copying
+    GenericDocument(const GenericDocument&);
+    //! Prohibit assignment
+    GenericDocument& operator=(const GenericDocument&);
+
+    void ClearStack() {
+        if (Allocator::kNeedFree)
+            while (stack_.GetSize() > 0)    // Here assumes all elements in stack array are GenericValue (Member is actually 2 GenericValue objects)
+                (stack_.template Pop<ValueType>(1))->~ValueType();
+        else
+            stack_.Clear();
+        stack_.ShrinkToFit();
+    }
+
+    void Destroy() {
+        CEREAL_RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    static const size_t kDefaultStackCapacity = 1024;
+    Allocator* allocator_;
+    Allocator* ownAllocator_;
+    internal::Stack<StackAllocator> stack_;
+    ParseResult parseResult_;
+};
+
+//! GenericDocument with UTF8 encoding
+typedef GenericDocument<UTF8<> > Document;
+
+// defined here due to the dependency on GenericDocument
+template <typename Encoding, typename Allocator>
+template <typename SourceAllocator>
+inline
+GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
+{
+    switch (rhs.GetType()) {
+    case kObjectType:
+    case kArrayType: { // perform deep copy via SAX Handler
+            GenericDocument<Encoding,Allocator> d(&allocator);
+            rhs.Accept(d);
+            RawAssign(*d.stack_.template Pop<GenericValue>(1));
+        }
+        break;
+    case kStringType:
+        if (rhs.data_.f.flags == kConstStringFlag) {
+            data_.f.flags = rhs.data_.f.flags;
+            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+        } else {
+            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
+        }
+        break;
+    default:
+        data_.f.flags = rhs.data_.f.flags;
+        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
+        break;
+    }
+}
+
+//! Helper class for accessing Value of array type.
+/*!
+    Instance of this helper class is obtained by \c GenericValue::GetArray().
+    In addition to all APIs for array type, it provides range-based for loop if \c CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
+*/
+template <bool Const, typename ValueT>
+class GenericArray {
+public:
+    typedef GenericArray<true, ValueT> ConstArray;
+    typedef GenericArray<false, ValueT> Array;
+    typedef ValueT PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef ValueType* ValueIterator;  // This may be const or non-const iterator
+    typedef const ValueT* ConstValueIterator;
+    typedef typename ValueType::AllocatorType AllocatorType;
+    typedef typename ValueType::StringRefType StringRefType;
+
+    template <typename, typename>
+    friend class GenericValue;
+
+    GenericArray(const GenericArray& rhs) : value_(rhs.value_) {}
+    GenericArray& operator=(const GenericArray& rhs) { value_ = rhs.value_; return *this; }
+    ~GenericArray() {}
+
+    SizeType Size() const { return value_.Size(); }
+    SizeType Capacity() const { return value_.Capacity(); }
+    bool Empty() const { return value_.Empty(); }
+    void Clear() const { value_.Clear(); }
+    ValueType& operator[](SizeType index) const {  return value_[index]; }
+    ValueIterator Begin() const { return value_.Begin(); }
+    ValueIterator End() const { return value_.End(); }
+    GenericArray Reserve(SizeType newCapacity, AllocatorType &allocator) const { value_.Reserve(newCapacity, allocator); return *this; }
+    GenericArray PushBack(ValueType& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericArray PushBack(ValueType&& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericArray PushBack(StringRefType value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (const GenericArray&)) PushBack(T value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+    GenericArray PopBack() const { value_.PopBack(); return *this; }
+    ValueIterator Erase(ConstValueIterator pos) const { return value_.Erase(pos); }
+    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) const { return value_.Erase(first, last); }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
+    ValueIterator begin() const { return value_.Begin(); }
+    ValueIterator end() const { return value_.End(); }
+#endif
+
+private:
+    GenericArray();
+    GenericArray(ValueType& value) : value_(value) {}
+    ValueType& value_;
+};
+
+//! Helper class for accessing Value of object type.
+/*!
+    Instance of this helper class is obtained by \c GenericValue::GetObject().
+    In addition to all APIs for array type, it provides range-based for loop if \c CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
+*/
+template <bool Const, typename ValueT>
+class GenericObject {
+public:
+    typedef GenericObject<true, ValueT> ConstObject;
+    typedef GenericObject<false, ValueT> Object;
+    typedef ValueT PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef GenericMemberIterator<Const, typename ValueT::EncodingType, typename ValueT::AllocatorType> MemberIterator;  // This may be const or non-const iterator
+    typedef GenericMemberIterator<true, typename ValueT::EncodingType, typename ValueT::AllocatorType> ConstMemberIterator;
+    typedef typename ValueType::AllocatorType AllocatorType;
+    typedef typename ValueType::StringRefType StringRefType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename ValueType::Ch Ch;
+
+    template <typename, typename>
+    friend class GenericValue;
+
+    GenericObject(const GenericObject& rhs) : value_(rhs.value_) {}
+    GenericObject& operator=(const GenericObject& rhs) { value_ = rhs.value_; return *this; }
+    ~GenericObject() {}
+
+    SizeType MemberCount() const { return value_.MemberCount(); }
+    bool ObjectEmpty() const { return value_.ObjectEmpty(); }
+    template <typename T> ValueType& operator[](T* name) const { return value_[name]; }
+    template <typename SourceAllocator> ValueType& operator[](const GenericValue<EncodingType, SourceAllocator>& name) const { return value_[name]; }
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    ValueType& operator[](const std::basic_string<Ch>& name) const { return value_[name]; }
+#endif
+    MemberIterator MemberBegin() const { return value_.MemberBegin(); }
+    MemberIterator MemberEnd() const { return value_.MemberEnd(); }
+    bool HasMember(const Ch* name) const { return value_.HasMember(name); }
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool HasMember(const std::basic_string<Ch>& name) const { return value_.HasMember(name); }
+#endif
+    template <typename SourceAllocator> bool HasMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.HasMember(name); }
+    MemberIterator FindMember(const Ch* name) const { return value_.FindMember(name); }
+    template <typename SourceAllocator> MemberIterator FindMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.FindMember(name); }
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    MemberIterator FindMember(const std::basic_string<Ch>& name) const { return value_.FindMember(name); }
+#endif
+    GenericObject AddMember(ValueType& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType& name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    GenericObject AddMember(ValueType& name, std::basic_string<Ch>& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#endif
+    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&)) AddMember(ValueType& name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericObject AddMember(ValueType&& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType&& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(StringRefType name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericObject AddMember(StringRefType name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(StringRefType name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericObject)) AddMember(StringRefType name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    void RemoveAllMembers() { return value_.RemoveAllMembers(); }
+    bool RemoveMember(const Ch* name) const { return value_.RemoveMember(name); }
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool RemoveMember(const std::basic_string<Ch>& name) const { return value_.RemoveMember(name); }
+#endif
+    template <typename SourceAllocator> bool RemoveMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.RemoveMember(name); }
+    MemberIterator RemoveMember(MemberIterator m) const { return value_.RemoveMember(m); }
+    MemberIterator EraseMember(ConstMemberIterator pos) const { return value_.EraseMember(pos); }
+    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) const { return value_.EraseMember(first, last); }
+    bool EraseMember(const Ch* name) const { return value_.EraseMember(name); }
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool EraseMember(const std::basic_string<Ch>& name) const { return EraseMember(ValueType(StringRef(name))); }
+#endif
+    template <typename SourceAllocator> bool EraseMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.EraseMember(name); }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
+    MemberIterator begin() const { return value_.MemberBegin(); }
+    MemberIterator end() const { return value_.MemberEnd(); }
+#endif
+
+private:
+    GenericObject();
+    GenericObject(ValueType& value) : value_(value) {}
+    ValueType& value_;
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+CEREAL_RAPIDJSON_DIAG_POP
+
+#endif // CEREAL_RAPIDJSON_DOCUMENT_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h b/Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h
new file mode 100644
index 0000000..9671394
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h
@@ -0,0 +1,299 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ENCODEDSTREAM_H_
+#define CEREAL_RAPIDJSON_ENCODEDSTREAM_H_
+
+#include "stream.h"
+#include "memorystream.h"
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Input byte stream wrapper with a statically bound encoding.
+/*!
+    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
+    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
+*/
+template <typename Encoding, typename InputByteStream>
+class EncodedInputStream {
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+public:
+    typedef typename Encoding::Ch Ch;
+
+    EncodedInputStream(InputByteStream& is) : is_(is) { 
+        current_ = Encoding::TakeBOM(is_);
+    }
+
+    Ch Peek() const { return current_; }
+    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
+    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+
+    InputByteStream& is_;
+    Ch current_;
+};
+
+//! Specialized for UTF8 MemoryStream.
+template <>
+class EncodedInputStream<UTF8<>, MemoryStream> {
+public:
+    typedef UTF8<>::Ch Ch;
+
+    EncodedInputStream(MemoryStream& is) : is_(is) {
+        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
+    }
+    Ch Peek() const { return is_.Peek(); }
+    Ch Take() { return is_.Take(); }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) {}
+    void Flush() {} 
+    Ch* PutBegin() { return 0; }
+    size_t PutEnd(Ch*) { return 0; }
+
+    MemoryStream& is_;
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+};
+
+//! Output byte stream wrapper with statically bound encoding.
+/*!
+    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
+    \tparam OutputByteStream Type of input byte stream. For example, FileWriteStream.
+*/
+template <typename Encoding, typename OutputByteStream>
+class EncodedOutputStream {
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+public:
+    typedef typename Encoding::Ch Ch;
+
+    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
+        if (putBOM)
+            Encoding::PutBOM(os_);
+    }
+
+    void Put(Ch c) { Encoding::Put(os_, c);  }
+    void Flush() { os_.Flush(); }
+
+    // Not implemented
+    Ch Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
+    Ch Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
+    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false);  return 0; }
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    EncodedOutputStream(const EncodedOutputStream&);
+    EncodedOutputStream& operator=(const EncodedOutputStream&);
+
+    OutputByteStream& os_;
+};
+
+#define CEREAL_RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
+
+//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
+/*!
+    \tparam CharType Type of character for reading.
+    \tparam InputByteStream type of input byte stream to be wrapped.
+*/
+template <typename CharType, typename InputByteStream>
+class AutoUTFInputStream {
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+public:
+    typedef CharType Ch;
+
+    //! Constructor.
+    /*!
+        \param is input stream to be wrapped.
+        \param type UTF encoding type if it is not detected from the stream.
+    */
+    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
+        CEREAL_RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
+        DetectType();
+        static const TakeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Take) };
+        takeFunc_ = f[type_];
+        current_ = takeFunc_(*is_);
+    }
+
+    UTFType GetType() const { return type_; }
+    bool HasBOM() const { return hasBOM_; }
+
+    Ch Peek() const { return current_; }
+    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
+    size_t Tell() const { return is_->Tell(); }
+
+    // Not implemented
+    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
+    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    AutoUTFInputStream(const AutoUTFInputStream&);
+    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
+
+    // Detect encoding type with BOM or RFC 4627
+    void DetectType() {
+        // BOM (Byte Order Mark):
+        // 00 00 FE FF  UTF-32BE
+        // FF FE 00 00  UTF-32LE
+        // FE FF        UTF-16BE
+        // FF FE        UTF-16LE
+        // EF BB BF     UTF-8
+
+        const unsigned char* c = reinterpret_cast<const unsigned char *>(is_->Peek4());
+        if (!c)
+            return;
+
+        unsigned bom = static_cast<unsigned>(c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24));
+        hasBOM_ = false;
+        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
+        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
+        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
+        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
+        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
+
+        // RFC 4627: Section 3
+        // "Since the first two characters of a JSON text will always be ASCII
+        // characters [RFC0020], it is possible to determine whether an octet
+        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
+        // at the pattern of nulls in the first four octets."
+        // 00 00 00 xx  UTF-32BE
+        // 00 xx 00 xx  UTF-16BE
+        // xx 00 00 00  UTF-32LE
+        // xx 00 xx 00  UTF-16LE
+        // xx xx xx xx  UTF-8
+
+        if (!hasBOM_) {
+            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
+            switch (pattern) {
+            case 0x08: type_ = kUTF32BE; break;
+            case 0x0A: type_ = kUTF16BE; break;
+            case 0x01: type_ = kUTF32LE; break;
+            case 0x05: type_ = kUTF16LE; break;
+            case 0x0F: type_ = kUTF8;    break;
+            default: break; // Use type defined by user.
+            }
+        }
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
+    }
+
+    typedef Ch (*TakeFunc)(InputByteStream& is);
+    InputByteStream* is_;
+    UTFType type_;
+    Ch current_;
+    TakeFunc takeFunc_;
+    bool hasBOM_;
+};
+
+//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
+/*!
+    \tparam CharType Type of character for writing.
+    \tparam OutputByteStream type of output byte stream to be wrapped.
+*/
+template <typename CharType, typename OutputByteStream>
+class AutoUTFOutputStream {
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+public:
+    typedef CharType Ch;
+
+    //! Constructor.
+    /*!
+        \param os output stream to be wrapped.
+        \param type UTF encoding type.
+        \param putBOM Whether to write BOM at the beginning of the stream.
+    */
+    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
+        CEREAL_RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
+
+        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
+        if (type_ == kUTF16LE || type_ == kUTF16BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
+        if (type_ == kUTF32LE || type_ == kUTF32BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
+
+        static const PutFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Put) };
+        putFunc_ = f[type_];
+
+        if (putBOM)
+            PutBOM();
+    }
+
+    UTFType GetType() const { return type_; }
+
+    void Put(Ch c) { putFunc_(*os_, c); }
+    void Flush() { os_->Flush(); } 
+
+    // Not implemented
+    Ch Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
+    Ch Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
+    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    AutoUTFOutputStream(const AutoUTFOutputStream&);
+    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
+
+    void PutBOM() { 
+        typedef void (*PutBOMFunc)(OutputByteStream&);
+        static const PutBOMFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
+        f[type_](*os_);
+    }
+
+    typedef void (*PutFunc)(OutputByteStream&, Ch);
+
+    OutputByteStream* os_;
+    UTFType type_;
+    PutFunc putFunc_;
+};
+
+#undef CEREAL_RAPIDJSON_ENCODINGS_FUNC
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_FILESTREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/encodings.h b/Src/External/cereal/include/cereal/external/rapidjson/encodings.h
new file mode 100644
index 0000000..ed00b97
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/encodings.h
@@ -0,0 +1,716 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ENCODINGS_H_
+#define CEREAL_RAPIDJSON_ENCODINGS_H_
+
+#include "rapidjson.h"
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
+CEREAL_RAPIDJSON_DIAG_OFF(4702)  // unreachable code
+#elif defined(__GNUC__)
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+CEREAL_RAPIDJSON_DIAG_OFF(overflow)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Encoding
+
+/*! \class rapidjson::Encoding
+    \brief Concept for encoding of Unicode characters.
+
+\code
+concept Encoding {
+    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
+
+    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
+
+    //! \brief Encode a Unicode codepoint to an output stream.
+    //! \param os Output stream.
+    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint);
+
+    //! \brief Decode a Unicode codepoint from an input stream.
+    //! \param is Input stream.
+    //! \param codepoint Output of the unicode codepoint.
+    //! \return true if a valid codepoint can be decoded from the stream.
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint);
+
+    //! \brief Validate one Unicode codepoint from an encoded stream.
+    //! \param is Input stream to obtain codepoint.
+    //! \param os Output for copying one codepoint.
+    //! \return true if it is valid.
+    //! \note This function just validating and copying the codepoint without actually decode it.
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os);
+
+    // The following functions are deal with byte streams.
+
+    //! Take a character from input byte stream, skip BOM if exist.
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is);
+
+    //! Take a character from input byte stream.
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is);
+
+    //! Put BOM to output byte stream.
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os);
+
+    //! Put a character to output byte stream.
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c);
+};
+\endcode
+*/
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF8
+
+//! UTF-8 encoding.
+/*! http://en.wikipedia.org/wiki/UTF-8
+    http://tools.ietf.org/html/rfc3629
+    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
+    \note implements Encoding concept
+*/
+template<typename CharType = char>
+struct UTF8 {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            os.Put(static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
+#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
+#define TAIL() COPY(); TRANS(0x70)
+        typename InputStream::Ch c = is.Take();
+        if (!(c & 0x80)) {
+            *codepoint = static_cast<unsigned char>(c);
+            return true;
+        }
+
+        unsigned char type = GetRange(static_cast<unsigned char>(c));
+        if (type >= 32) {
+            *codepoint = 0;
+        } else {
+            *codepoint = (0xFF >> type) & static_cast<unsigned char>(c);
+        }
+        bool result = true;
+        switch (type) {
+        case 2: TAIL(); return result;
+        case 3: TAIL(); TAIL(); return result;
+        case 4: COPY(); TRANS(0x50); TAIL(); return result;
+        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
+        case 6: TAIL(); TAIL(); TAIL(); return result;
+        case 10: COPY(); TRANS(0x20); TAIL(); return result;
+        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        default: return false;
+        }
+#undef COPY
+#undef TRANS
+#undef TAIL
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+#define COPY() os.Put(c = is.Take())
+#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
+#define TAIL() COPY(); TRANS(0x70)
+        Ch c;
+        COPY();
+        if (!(c & 0x80))
+            return true;
+
+        bool result = true;
+        switch (GetRange(static_cast<unsigned char>(c))) {
+        case 2: TAIL(); return result;
+        case 3: TAIL(); TAIL(); return result;
+        case 4: COPY(); TRANS(0x50); TAIL(); return result;
+        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
+        case 6: TAIL(); TAIL(); TAIL(); return result;
+        case 10: COPY(); TRANS(0x20); TAIL(); return result;
+        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
+        default: return false;
+        }
+#undef COPY
+#undef TRANS
+#undef TAIL
+    }
+
+    static unsigned char GetRange(unsigned char c) {
+        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
+        static const unsigned char type[] = {
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
+            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
+            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
+        };
+        return type[c];
+    }
+
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        typename InputByteStream::Ch c = Take(is);
+        if (static_cast<unsigned char>(c) != 0xEFu) return c;
+        c = is.Take();
+        if (static_cast<unsigned char>(c) != 0xBBu) return c;
+        c = is.Take();
+        if (static_cast<unsigned char>(c) != 0xBFu) return c;
+        c = is.Take();
+        return c;
+    }
+
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        return static_cast<Ch>(is.Take());
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xEFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xBBu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xBFu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF16
+
+//! UTF-16 encoding.
+/*! http://en.wikipedia.org/wiki/UTF-16
+    http://tools.ietf.org/html/rfc2781
+    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
+    \note implements Encoding concept
+
+    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
+    For streaming, use UTF16LE and UTF16BE, which handle endianness.
+*/
+template<typename CharType = wchar_t>
+struct UTF16 {
+    typedef CharType Ch;
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            CEREAL_RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            os.Put((v & 0x3FF) | 0xDC00);
+        }
+    }
+
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            CEREAL_RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            PutUnsafe(os, (v & 0x3FF) | 0xDC00);
+        }
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
+        typename InputStream::Ch c = is.Take();
+        if (c < 0xD800 || c > 0xDFFF) {
+            *codepoint = static_cast<unsigned>(c);
+            return true;
+        }
+        else if (c <= 0xDBFF) {
+            *codepoint = (static_cast<unsigned>(c) & 0x3FF) << 10;
+            c = is.Take();
+            *codepoint |= (static_cast<unsigned>(c) & 0x3FF);
+            *codepoint += 0x10000;
+            return c >= 0xDC00 && c <= 0xDFFF;
+        }
+        return false;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        typename InputStream::Ch c;
+        os.Put(static_cast<typename OutputStream::Ch>(c = is.Take()));
+        if (c < 0xD800 || c > 0xDFFF)
+            return true;
+        else if (c <= 0xDBFF) {
+            os.Put(c = is.Take());
+            return c >= 0xDC00 && c <= 0xDFFF;
+        }
+        return false;
+    }
+};
+
+//! UTF-16 little endian encoding.
+template<typename CharType = wchar_t>
+struct UTF16LE : UTF16<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<uint8_t>(is.Take());
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
+    }
+};
+
+//! UTF-16 big endian encoding.
+template<typename CharType = wchar_t>
+struct UTF16BE : UTF16<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<uint8_t>(is.Take());
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// UTF32
+
+//! UTF-32 encoding. 
+/*! http://en.wikipedia.org/wiki/UTF-32
+    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
+    \note implements Encoding concept
+
+    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
+    For streaming, use UTF32LE and UTF32BE, which handle endianness.
+*/
+template<typename CharType = unsigned>
+struct UTF32 {
+    typedef CharType Ch;
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
+
+    enum { supportUnicode = 1 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        os.Put(codepoint);
+    }
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        PutUnsafe(os, codepoint);
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
+        Ch c = is.Take();
+        *codepoint = c;
+        return c <= 0x10FFFF;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
+        Ch c;
+        os.Put(c = is.Take());
+        return c <= 0x10FFFF;
+    }
+};
+
+//! UTF-32 little endian enocoding.
+template<typename CharType = unsigned>
+struct UTF32LE : UTF32<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c;
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<uint8_t>(is.Take());
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
+    }
+};
+
+//! UTF-32 big endian encoding.
+template<typename CharType = unsigned>
+struct UTF32BE : UTF32<CharType> {
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        CharType c = Take(is);
+        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c; 
+    }
+
+    template <typename InputByteStream>
+    static CharType Take(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
+        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
+        return static_cast<CharType>(c);
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, CharType c) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
+        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// ASCII
+
+//! ASCII encoding.
+/*! http://en.wikipedia.org/wiki/ASCII
+    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
+    \note implements Encoding concept
+*/
+template<typename CharType = char>
+struct ASCII {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 0 };
+
+    template<typename OutputStream>
+    static void Encode(OutputStream& os, unsigned codepoint) {
+        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        os.Put(static_cast<Ch>(codepoint & 0xFF));
+    }
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+    }
+
+    template <typename InputStream>
+    static bool Decode(InputStream& is, unsigned* codepoint) {
+        uint8_t c = static_cast<uint8_t>(is.Take());
+        *codepoint = c;
+        return c <= 0X7F;
+    }
+
+    template <typename InputStream, typename OutputStream>
+    static bool Validate(InputStream& is, OutputStream& os) {
+        uint8_t c = static_cast<uint8_t>(is.Take());
+        os.Put(static_cast<typename OutputStream::Ch>(c));
+        return c <= 0x7F;
+    }
+
+    template <typename InputByteStream>
+    static CharType TakeBOM(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        uint8_t c = static_cast<uint8_t>(Take(is));
+        return static_cast<Ch>(c);
+    }
+
+    template <typename InputByteStream>
+    static Ch Take(InputByteStream& is) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
+        return static_cast<Ch>(is.Take());
+    }
+
+    template <typename OutputByteStream>
+    static void PutBOM(OutputByteStream& os) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        (void)os;
+    }
+
+    template <typename OutputByteStream>
+    static void Put(OutputByteStream& os, Ch c) {
+        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
+        os.Put(static_cast<typename OutputByteStream::Ch>(c));
+    }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// AutoUTF
+
+//! Runtime-specified UTF encoding type of a stream.
+enum UTFType {
+    kUTF8 = 0,      //!< UTF-8.
+    kUTF16LE = 1,   //!< UTF-16 little endian.
+    kUTF16BE = 2,   //!< UTF-16 big endian.
+    kUTF32LE = 3,   //!< UTF-32 little endian.
+    kUTF32BE = 4    //!< UTF-32 big endian.
+};
+
+//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
+/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
+*/
+template<typename CharType>
+struct AutoUTF {
+    typedef CharType Ch;
+
+    enum { supportUnicode = 1 };
+
+#define CEREAL_RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
+
+    template<typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Encode) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
+    template<typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
+    template <typename InputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
+        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
+        static const DecodeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Decode) };
+        return (*f[is.GetType()])(is, codepoint);
+    }
+
+    template <typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
+        static const ValidateFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Validate) };
+        return (*f[is.GetType()])(is, os);
+    }
+
+#undef CEREAL_RAPIDJSON_ENCODINGS_FUNC
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Transcoder
+
+//! Encoding conversion.
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder {
+    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
+    template<typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::Encode(os, codepoint);
+        return true;
+    }
+
+    template<typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::EncodeUnsafe(os, codepoint);
+        return true;
+    }
+
+    //! Validate one Unicode codepoint from an encoded stream.
+    template<typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
+    }
+};
+
+// Forward declaration.
+template<typename Stream>
+inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
+
+//! Specialization of Transcoder with same source and target encoding.
+template<typename Encoding>
+struct Transcoder<Encoding, Encoding> {
+    template<typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
+        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
+        return Encoding::Validate(is, os);  // source/target encoding are the same
+    }
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#if defined(__GNUC__) || defined(_MSC_VER)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_ENCODINGS_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/error/en.h b/Src/External/cereal/include/cereal/external/rapidjson/error/en.h
new file mode 100644
index 0000000..ea93bf8
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/error/en.h
@@ -0,0 +1,74 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ERROR_EN_H_
+#define CEREAL_RAPIDJSON_ERROR_EN_H_
+
+#include "error.h"
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
+CEREAL_RAPIDJSON_DIAG_OFF(covered-switch-default)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Maps error code of parsing into error message.
+/*!
+    \ingroup CEREAL_RAPIDJSON_ERRORS
+    \param parseErrorCode Error code obtained in parsing.
+    \return the error message.
+    \note User can make a copy of this function for localization.
+        Using switch-case is safer for future modification of error codes.
+*/
+inline const CEREAL_RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
+    switch (parseErrorCode) {
+        case kParseErrorNone:                           return CEREAL_RAPIDJSON_ERROR_STRING("No error.");
+
+        case kParseErrorDocumentEmpty:                  return CEREAL_RAPIDJSON_ERROR_STRING("The document is empty.");
+        case kParseErrorDocumentRootNotSingular:        return CEREAL_RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
+    
+        case kParseErrorValueInvalid:                   return CEREAL_RAPIDJSON_ERROR_STRING("Invalid value.");
+    
+        case kParseErrorObjectMissName:                 return CEREAL_RAPIDJSON_ERROR_STRING("Missing a name for object member.");
+        case kParseErrorObjectMissColon:                return CEREAL_RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
+        case kParseErrorObjectMissCommaOrCurlyBracket:  return CEREAL_RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
+    
+        case kParseErrorArrayMissCommaOrSquareBracket:  return CEREAL_RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
+
+        case kParseErrorStringUnicodeEscapeInvalidHex:  return CEREAL_RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
+        case kParseErrorStringUnicodeSurrogateInvalid:  return CEREAL_RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
+        case kParseErrorStringEscapeInvalid:            return CEREAL_RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
+        case kParseErrorStringMissQuotationMark:        return CEREAL_RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
+        case kParseErrorStringInvalidEncoding:          return CEREAL_RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
+
+        case kParseErrorNumberTooBig:                   return CEREAL_RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
+        case kParseErrorNumberMissFraction:             return CEREAL_RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
+        case kParseErrorNumberMissExponent:             return CEREAL_RAPIDJSON_ERROR_STRING("Miss exponent in number.");
+
+        case kParseErrorTermination:                    return CEREAL_RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
+        case kParseErrorUnspecificSyntaxError:          return CEREAL_RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
+
+        default:                                        return CEREAL_RAPIDJSON_ERROR_STRING("Unknown error.");
+    }
+}
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_ERROR_EN_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/error/error.h b/Src/External/cereal/include/cereal/external/rapidjson/error/error.h
new file mode 100644
index 0000000..c2638f1
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/error/error.h
@@ -0,0 +1,155 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ERROR_ERROR_H_
+#define CEREAL_RAPIDJSON_ERROR_ERROR_H_
+
+#include "../rapidjson.h"
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+/*! \file error.h */
+
+/*! \defgroup CEREAL_RAPIDJSON_ERRORS RapidJSON error handling */
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_ERROR_CHARTYPE
+
+//! Character type of error messages.
+/*! \ingroup CEREAL_RAPIDJSON_ERRORS
+    The default character type is \c char.
+    On Windows, user can define this macro as \c TCHAR for supporting both
+    unicode/non-unicode settings.
+*/
+#ifndef CEREAL_RAPIDJSON_ERROR_CHARTYPE
+#define CEREAL_RAPIDJSON_ERROR_CHARTYPE char
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_ERROR_STRING
+
+//! Macro for converting string literial to \ref CEREAL_RAPIDJSON_ERROR_CHARTYPE[].
+/*! \ingroup CEREAL_RAPIDJSON_ERRORS
+    By default this conversion macro does nothing.
+    On Windows, user can define this macro as \c _T(x) for supporting both
+    unicode/non-unicode settings.
+*/
+#ifndef CEREAL_RAPIDJSON_ERROR_STRING
+#define CEREAL_RAPIDJSON_ERROR_STRING(x) x
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// ParseErrorCode
+
+//! Error code of parsing.
+/*! \ingroup CEREAL_RAPIDJSON_ERRORS
+    \see GenericReader::Parse, GenericReader::GetParseErrorCode
+*/
+enum ParseErrorCode {
+    kParseErrorNone = 0,                        //!< No error.
+
+    kParseErrorDocumentEmpty,                   //!< The document is empty.
+    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
+
+    kParseErrorValueInvalid,                    //!< Invalid value.
+
+    kParseErrorObjectMissName,                  //!< Missing a name for object member.
+    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
+    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
+
+    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
+
+    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
+    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
+    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
+    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
+    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
+
+    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
+    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
+    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
+
+    kParseErrorTermination,                     //!< Parsing was terminated.
+    kParseErrorUnspecificSyntaxError            //!< Unspecific syntax error.
+};
+
+//! Result of parsing (wraps ParseErrorCode)
+/*!
+    \ingroup CEREAL_RAPIDJSON_ERRORS
+    \code
+        Document doc;
+        ParseResult ok = doc.Parse("[42]");
+        if (!ok) {
+            fprintf(stderr, "JSON parse error: %s (%u)",
+                    GetParseError_En(ok.Code()), ok.Offset());
+            exit(EXIT_FAILURE);
+        }
+    \endcode
+    \see GenericReader::Parse, GenericDocument::Parse
+*/
+struct ParseResult {
+public:
+    //! Default constructor, no error.
+    ParseResult() : code_(kParseErrorNone), offset_(0) {}
+    //! Constructor to set an error.
+    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
+
+    //! Get the error code.
+    ParseErrorCode Code() const { return code_; }
+    //! Get the error offset, if \ref IsError(), 0 otherwise.
+    size_t Offset() const { return offset_; }
+
+    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
+    operator bool() const { return !IsError(); }
+    //! Whether the result is an error.
+    bool IsError() const { return code_ != kParseErrorNone; }
+
+    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
+    bool operator==(ParseErrorCode code) const { return code_ == code; }
+    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
+
+    //! Reset error code.
+    void Clear() { Set(kParseErrorNone); }
+    //! Update error code and offset.
+    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
+
+private:
+    ParseErrorCode code_;
+    size_t offset_;
+};
+
+//! Function pointer type of GetParseError().
+/*! \ingroup CEREAL_RAPIDJSON_ERRORS
+
+    This is the prototype for \c GetParseError_X(), where \c X is a locale.
+    User can dynamically change locale in runtime, e.g.:
+\code
+    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
+    const CEREAL_RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
+\endcode
+*/
+typedef const CEREAL_RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_ERROR_ERROR_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h b/Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h
new file mode 100644
index 0000000..abafb54
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h
@@ -0,0 +1,99 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_FILEREADSTREAM_H_
+#define CEREAL_RAPIDJSON_FILEREADSTREAM_H_
+
+#include "stream.h"
+#include <cstdio>
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
+CEREAL_RAPIDJSON_DIAG_OFF(missing-noreturn)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! File byte stream for input using fread().
+/*!
+    \note implements Stream concept
+*/
+class FileReadStream {
+public:
+    typedef char Ch;    //!< Character type (byte).
+
+    //! Constructor.
+    /*!
+        \param fp File pointer opened for read.
+        \param buffer user-supplied buffer.
+        \param bufferSize size of buffer in bytes. Must >=4 bytes.
+    */
+    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
+        CEREAL_RAPIDJSON_ASSERT(fp_ != 0);
+        CEREAL_RAPIDJSON_ASSERT(bufferSize >= 4);
+        Read();
+    }
+
+    Ch Peek() const { return *current_; }
+    Ch Take() { Ch c = *current_; Read(); return c; }
+    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
+
+    // Not implemented
+    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
+    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); } 
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        return (current_ + 4 <= bufferLast_) ? current_ : 0;
+    }
+
+private:
+    void Read() {
+        if (current_ < bufferLast_)
+            ++current_;
+        else if (!eof_) {
+            count_ += readCount_;
+            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
+            bufferLast_ = buffer_ + readCount_ - 1;
+            current_ = buffer_;
+
+            if (readCount_ < bufferSize_) {
+                buffer_[readCount_] = '\0';
+                ++bufferLast_;
+                eof_ = true;
+            }
+        }
+    }
+
+    std::FILE* fp_;
+    Ch *buffer_;
+    size_t bufferSize_;
+    Ch *bufferLast_;
+    Ch *current_;
+    size_t readCount_;
+    size_t count_;  //!< Number of characters read
+    bool eof_;
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_FILESTREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h b/Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h
new file mode 100644
index 0000000..9a60099
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h
@@ -0,0 +1,104 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_FILEWRITESTREAM_H_
+#define CEREAL_RAPIDJSON_FILEWRITESTREAM_H_
+
+#include "stream.h"
+#include <cstdio>
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of C file stream for input using fread().
+/*!
+    \note implements Stream concept
+*/
+class FileWriteStream {
+public:
+    typedef char Ch;    //!< Character type. Only support char.
+
+    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
+        CEREAL_RAPIDJSON_ASSERT(fp_ != 0);
+    }
+
+    void Put(char c) { 
+        if (current_ >= bufferEnd_)
+            Flush();
+
+        *current_++ = c;
+    }
+
+    void PutN(char c, size_t n) {
+        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
+        while (n > avail) {
+            std::memset(current_, c, avail);
+            current_ += avail;
+            Flush();
+            n -= avail;
+            avail = static_cast<size_t>(bufferEnd_ - current_);
+        }
+
+        if (n > 0) {
+            std::memset(current_, c, n);
+            current_ += n;
+        }
+    }
+
+    void Flush() {
+        if (current_ != buffer_) {
+            size_t result = fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
+            if (result < static_cast<size_t>(current_ - buffer_)) {
+                // failure deliberately ignored at this time
+                // added to avoid warn_unused_result build errors
+            }
+            current_ = buffer_;
+        }
+    }
+
+    // Not implemented
+    char Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    char Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    char* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(char*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    FileWriteStream(const FileWriteStream&);
+    FileWriteStream& operator=(const FileWriteStream&);
+
+    std::FILE* fp_;
+    char *buffer_;
+    char *bufferEnd_;
+    char *current_;
+};
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(FileWriteStream& stream, char c, size_t n) {
+    stream.PutN(c, n);
+}
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_FILESTREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/fwd.h b/Src/External/cereal/include/cereal/external/rapidjson/fwd.h
new file mode 100644
index 0000000..1b15c66
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/fwd.h
@@ -0,0 +1,151 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_FWD_H_
+#define CEREAL_RAPIDJSON_FWD_H_
+
+#include "rapidjson.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+// encodings.h
+
+template<typename CharType> struct UTF8;
+template<typename CharType> struct UTF16;
+template<typename CharType> struct UTF16BE;
+template<typename CharType> struct UTF16LE;
+template<typename CharType> struct UTF32;
+template<typename CharType> struct UTF32BE;
+template<typename CharType> struct UTF32LE;
+template<typename CharType> struct ASCII;
+template<typename CharType> struct AutoUTF;
+
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder;
+
+// allocators.h
+
+class CrtAllocator;
+
+template <typename BaseAllocator>
+class MemoryPoolAllocator;
+
+// stream.h
+
+template <typename Encoding>
+struct GenericStringStream;
+
+typedef GenericStringStream<UTF8<char> > StringStream;
+
+template <typename Encoding>
+struct GenericInsituStringStream;
+
+typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
+
+// stringbuffer.h
+
+template <typename Encoding, typename Allocator>
+class GenericStringBuffer;
+
+typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
+
+// filereadstream.h
+
+class FileReadStream;
+
+// filewritestream.h
+
+class FileWriteStream;
+
+// memorybuffer.h
+
+template <typename Allocator>
+struct GenericMemoryBuffer;
+
+typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
+
+// memorystream.h
+
+struct MemoryStream;
+
+// reader.h
+
+template<typename Encoding, typename Derived>
+struct BaseReaderHandler;
+
+template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
+class GenericReader;
+
+typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
+
+// writer.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class Writer;
+
+// prettywriter.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class PrettyWriter;
+
+// document.h
+
+template <typename Encoding, typename Allocator> 
+struct GenericMember;
+
+template <bool Const, typename Encoding, typename Allocator>
+class GenericMemberIterator;
+
+template<typename CharType>
+struct GenericStringRef;
+
+template <typename Encoding, typename Allocator> 
+class GenericValue;
+
+typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
+
+template <typename Encoding, typename Allocator, typename StackAllocator>
+class GenericDocument;
+
+typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
+
+// pointer.h
+
+template <typename ValueType, typename Allocator>
+class GenericPointer;
+
+typedef GenericPointer<Value, CrtAllocator> Pointer;
+
+// schema.h
+
+template <typename SchemaDocumentType>
+class IGenericRemoteSchemaDocumentProvider;
+
+template <typename ValueT, typename Allocator>
+class GenericSchemaDocument;
+
+typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
+typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
+
+template <
+    typename SchemaDocumentType,
+    typename OutputHandler,
+    typename StateAllocator>
+class GenericSchemaValidator;
+
+typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_RAPIDJSONFWD_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h
new file mode 100644
index 0000000..f8a5a50
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h
@@ -0,0 +1,290 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_BIGINTEGER_H_
+#define CEREAL_RAPIDJSON_BIGINTEGER_H_
+
+#include "../rapidjson.h"
+
+#if defined(_MSC_VER) && defined(_M_AMD64)
+#include <intrin.h> // for _umul128
+#pragma intrinsic(_umul128)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+class BigInteger {
+public:
+    typedef uint64_t Type;
+
+    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
+        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
+    }
+
+    explicit BigInteger(uint64_t u) : count_(1) {
+        digits_[0] = u;
+    }
+
+    BigInteger(const char* decimals, size_t length) : count_(1) {
+        CEREAL_RAPIDJSON_ASSERT(length > 0);
+        digits_[0] = 0;
+        size_t i = 0;
+        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
+        while (length >= kMaxDigitPerIteration) {
+            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
+            length -= kMaxDigitPerIteration;
+            i += kMaxDigitPerIteration;
+        }
+
+        if (length > 0)
+            AppendDecimal64(decimals + i, decimals + i + length);
+    }
+    
+    BigInteger& operator=(const BigInteger &rhs)
+    {
+        if (this != &rhs) {
+            count_ = rhs.count_;
+            std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
+        }
+        return *this;
+    }
+    
+    BigInteger& operator=(uint64_t u) {
+        digits_[0] = u;            
+        count_ = 1;
+        return *this;
+    }
+
+    BigInteger& operator+=(uint64_t u) {
+        Type backup = digits_[0];
+        digits_[0] += u;
+        for (size_t i = 0; i < count_ - 1; i++) {
+            if (digits_[i] >= backup)
+                return *this; // no carry
+            backup = digits_[i + 1];
+            digits_[i + 1] += 1;
+        }
+
+        // Last carry
+        if (digits_[count_ - 1] < backup)
+            PushBack(1);
+
+        return *this;
+    }
+
+    BigInteger& operator*=(uint64_t u) {
+        if (u == 0) return *this = 0;
+        if (u == 1) return *this;
+        if (*this == 1) return *this = u;
+
+        uint64_t k = 0;
+        for (size_t i = 0; i < count_; i++) {
+            uint64_t hi;
+            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
+            k = hi;
+        }
+        
+        if (k > 0)
+            PushBack(k);
+
+        return *this;
+    }
+
+    BigInteger& operator*=(uint32_t u) {
+        if (u == 0) return *this = 0;
+        if (u == 1) return *this;
+        if (*this == 1) return *this = u;
+
+        uint64_t k = 0;
+        for (size_t i = 0; i < count_; i++) {
+            const uint64_t c = digits_[i] >> 32;
+            const uint64_t d = digits_[i] & 0xFFFFFFFF;
+            const uint64_t uc = u * c;
+            const uint64_t ud = u * d;
+            const uint64_t p0 = ud + k;
+            const uint64_t p1 = uc + (p0 >> 32);
+            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
+            k = p1 >> 32;
+        }
+        
+        if (k > 0)
+            PushBack(k);
+
+        return *this;
+    }
+
+    BigInteger& operator<<=(size_t shift) {
+        if (IsZero() || shift == 0) return *this;
+
+        size_t offset = shift / kTypeBit;
+        size_t interShift = shift % kTypeBit;
+        CEREAL_RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
+
+        if (interShift == 0) {
+            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
+            count_ += offset;
+        }
+        else {
+            digits_[count_] = 0;
+            for (size_t i = count_; i > 0; i--)
+                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
+            digits_[offset] = digits_[0] << interShift;
+            count_ += offset;
+            if (digits_[count_])
+                count_++;
+        }
+
+        std::memset(digits_, 0, offset * sizeof(Type));
+
+        return *this;
+    }
+
+    bool operator==(const BigInteger& rhs) const {
+        return count_ == rhs.count_ && std::memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
+    }
+
+    bool operator==(const Type rhs) const {
+        return count_ == 1 && digits_[0] == rhs;
+    }
+
+    BigInteger& MultiplyPow5(unsigned exp) {
+        static const uint32_t kPow5[12] = {
+            5,
+            5 * 5,
+            5 * 5 * 5,
+            5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
+            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
+        };
+        if (exp == 0) return *this;
+        for (; exp >= 27; exp -= 27) *this *= CEREAL_RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
+        for (; exp >= 13; exp -= 13) *this *= static_cast<uint32_t>(1220703125u); // 5^13
+        if (exp > 0)                 *this *= kPow5[exp - 1];
+        return *this;
+    }
+
+    // Compute absolute difference of this and rhs.
+    // Assume this != rhs
+    bool Difference(const BigInteger& rhs, BigInteger* out) const {
+        int cmp = Compare(rhs);
+        CEREAL_RAPIDJSON_ASSERT(cmp != 0);
+        const BigInteger *a, *b;  // Makes a > b
+        bool ret;
+        if (cmp < 0) { a = &rhs; b = this; ret = true; }
+        else         { a = this; b = &rhs; ret = false; }
+
+        Type borrow = 0;
+        for (size_t i = 0; i < a->count_; i++) {
+            Type d = a->digits_[i] - borrow;
+            if (i < b->count_)
+                d -= b->digits_[i];
+            borrow = (d > a->digits_[i]) ? 1 : 0;
+            out->digits_[i] = d;
+            if (d != 0)
+                out->count_ = i + 1;
+        }
+
+        return ret;
+    }
+
+    int Compare(const BigInteger& rhs) const {
+        if (count_ != rhs.count_)
+            return count_ < rhs.count_ ? -1 : 1;
+
+        for (size_t i = count_; i-- > 0;)
+            if (digits_[i] != rhs.digits_[i])
+                return digits_[i] < rhs.digits_[i] ? -1 : 1;
+
+        return 0;
+    }
+
+    size_t GetCount() const { return count_; }
+    Type GetDigit(size_t index) const { CEREAL_RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
+    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
+
+private:
+    void AppendDecimal64(const char* begin, const char* end) {
+        uint64_t u = ParseUint64(begin, end);
+        if (IsZero())
+            *this = u;
+        else {
+            unsigned exp = static_cast<unsigned>(end - begin);
+            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
+        }
+    }
+
+    void PushBack(Type digit) {
+        CEREAL_RAPIDJSON_ASSERT(count_ < kCapacity);
+        digits_[count_++] = digit;
+    }
+
+    static uint64_t ParseUint64(const char* begin, const char* end) {
+        uint64_t r = 0;
+        for (const char* p = begin; p != end; ++p) {
+            CEREAL_RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
+            r = r * 10u + static_cast<unsigned>(*p - '0');
+        }
+        return r;
+    }
+
+    // Assume a * b + k < 2^128
+    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        uint64_t low = _umul128(a, b, outHigh) + k;
+        if (low < k)
+            (*outHigh)++;
+        return low;
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
+        p += k;
+        *outHigh = static_cast<uint64_t>(p >> 64);
+        return static_cast<uint64_t>(p);
+#else
+        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
+        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
+        x1 += (x0 >> 32); // can't give carry
+        x1 += x2;
+        if (x1 < x2)
+            x3 += (static_cast<uint64_t>(1) << 32);
+        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
+        uint64_t hi = x3 + (x1 >> 32);
+
+        lo += k;
+        if (lo < k)
+            hi++;
+        *outHigh = hi;
+        return lo;
+#endif
+    }
+
+    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
+    static const size_t kCapacity = kBitCount / sizeof(Type);
+    static const size_t kTypeBit = sizeof(Type) * 8;
+
+    Type digits_[kCapacity];
+    size_t count_;
+};
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_BIGINTEGER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h
new file mode 100644
index 0000000..ab7d66b
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h
@@ -0,0 +1,258 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
+// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
+// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
+
+#ifndef CEREAL_RAPIDJSON_DIYFP_H_
+#define CEREAL_RAPIDJSON_DIYFP_H_
+
+#include "../rapidjson.h"
+
+#if defined(_MSC_VER) && defined(_M_AMD64)
+#include <intrin.h>
+#pragma intrinsic(_BitScanReverse64)
+#pragma intrinsic(_umul128)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+struct DiyFp {
+    DiyFp() : f(), e() {}
+
+    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
+
+    explicit DiyFp(double d) {
+        union {
+            double d;
+            uint64_t u64;
+        } u = { d };
+
+        int biased_e = static_cast<int>((u.u64 & kDpExponentMask) >> kDpSignificandSize);
+        uint64_t significand = (u.u64 & kDpSignificandMask);
+        if (biased_e != 0) {
+            f = significand + kDpHiddenBit;
+            e = biased_e - kDpExponentBias;
+        } 
+        else {
+            f = significand;
+            e = kDpMinExponent + 1;
+        }
+    }
+
+    DiyFp operator-(const DiyFp& rhs) const {
+        return DiyFp(f - rhs.f, e);
+    }
+
+    DiyFp operator*(const DiyFp& rhs) const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        uint64_t h;
+        uint64_t l = _umul128(f, rhs.f, &h);
+        if (l & (uint64_t(1) << 63)) // rounding
+            h++;
+        return DiyFp(h, e + rhs.e + 64);
+#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+        __extension__ typedef unsigned __int128 uint128;
+        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
+        uint64_t h = static_cast<uint64_t>(p >> 64);
+        uint64_t l = static_cast<uint64_t>(p);
+        if (l & (uint64_t(1) << 63)) // rounding
+            h++;
+        return DiyFp(h, e + rhs.e + 64);
+#else
+        const uint64_t M32 = 0xFFFFFFFF;
+        const uint64_t a = f >> 32;
+        const uint64_t b = f & M32;
+        const uint64_t c = rhs.f >> 32;
+        const uint64_t d = rhs.f & M32;
+        const uint64_t ac = a * c;
+        const uint64_t bc = b * c;
+        const uint64_t ad = a * d;
+        const uint64_t bd = b * d;
+        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
+        tmp += 1U << 31;  /// mult_round
+        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
+#endif
+    }
+
+    DiyFp Normalize() const {
+#if defined(_MSC_VER) && defined(_M_AMD64)
+        unsigned long index;
+        _BitScanReverse64(&index, f);
+        return DiyFp(f << (63 - index), e - (63 - index));
+#elif defined(__GNUC__) && __GNUC__ >= 4
+        int s = __builtin_clzll(f);
+        return DiyFp(f << s, e - s);
+#else
+        DiyFp res = *this;
+        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
+            res.f <<= 1;
+            res.e--;
+        }
+        return res;
+#endif
+    }
+
+    DiyFp NormalizeBoundary() const {
+        DiyFp res = *this;
+        while (!(res.f & (kDpHiddenBit << 1))) {
+            res.f <<= 1;
+            res.e--;
+        }
+        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
+        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
+        return res;
+    }
+
+    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
+        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
+        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
+        mi.f <<= mi.e - pl.e;
+        mi.e = pl.e;
+        *plus = pl;
+        *minus = mi;
+    }
+
+    double ToDouble() const {
+        union {
+            double d;
+            uint64_t u64;
+        }u;
+        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 : 
+            static_cast<uint64_t>(e + kDpExponentBias);
+        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
+        return u.d;
+    }
+
+    static const int kDiySignificandSize = 64;
+    static const int kDpSignificandSize = 52;
+    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
+    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
+    static const int kDpMinExponent = -kDpExponentBias;
+    static const int kDpDenormalExponent = -kDpExponentBias + 1;
+    static const uint64_t kDpExponentMask = CEREAL_RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
+    static const uint64_t kDpSignificandMask = CEREAL_RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
+    static const uint64_t kDpHiddenBit = CEREAL_RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
+
+    uint64_t f;
+    int e;
+};
+
+inline DiyFp GetCachedPowerByIndex(size_t index) {
+    // 10^-348, 10^-340, ..., 10^340
+    static const uint64_t kCachedPowers_F[] = {
+        CEREAL_RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), CEREAL_RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
+        CEREAL_RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), CEREAL_RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
+        CEREAL_RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), CEREAL_RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
+        CEREAL_RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), CEREAL_RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
+        CEREAL_RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), CEREAL_RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
+        CEREAL_RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), CEREAL_RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
+        CEREAL_RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), CEREAL_RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
+        CEREAL_RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), CEREAL_RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
+        CEREAL_RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), CEREAL_RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
+        CEREAL_RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), CEREAL_RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
+        CEREAL_RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), CEREAL_RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
+        CEREAL_RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), CEREAL_RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
+        CEREAL_RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), CEREAL_RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
+        CEREAL_RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), CEREAL_RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
+        CEREAL_RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), CEREAL_RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
+        CEREAL_RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), CEREAL_RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
+        CEREAL_RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), CEREAL_RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
+        CEREAL_RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), CEREAL_RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
+        CEREAL_RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), CEREAL_RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
+        CEREAL_RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), CEREAL_RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
+        CEREAL_RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), CEREAL_RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
+        CEREAL_RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), CEREAL_RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
+        CEREAL_RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), CEREAL_RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
+        CEREAL_RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), CEREAL_RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
+        CEREAL_RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), CEREAL_RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
+        CEREAL_RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), CEREAL_RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
+        CEREAL_RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), CEREAL_RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
+        CEREAL_RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), CEREAL_RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
+        CEREAL_RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), CEREAL_RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
+        CEREAL_RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), CEREAL_RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
+        CEREAL_RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), CEREAL_RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
+        CEREAL_RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), CEREAL_RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
+        CEREAL_RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), CEREAL_RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
+        CEREAL_RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), CEREAL_RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
+        CEREAL_RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), CEREAL_RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
+        CEREAL_RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), CEREAL_RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
+        CEREAL_RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), CEREAL_RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
+        CEREAL_RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), CEREAL_RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
+        CEREAL_RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), CEREAL_RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
+        CEREAL_RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), CEREAL_RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
+        CEREAL_RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), CEREAL_RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
+        CEREAL_RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), CEREAL_RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
+        CEREAL_RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), CEREAL_RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
+        CEREAL_RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
+    };
+    static const int16_t kCachedPowers_E[] = {
+        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
+        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
+        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
+        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
+        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
+        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
+        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
+        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
+        907,   933,   960,   986,  1013,  1039,  1066
+    };
+    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
+}
+    
+inline DiyFp GetCachedPower(int e, int* K) {
+
+    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
+    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
+    int k = static_cast<int>(dk);
+    if (dk - k > 0.0)
+        k++;
+
+    unsigned index = static_cast<unsigned>((k >> 3) + 1);
+    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
+
+    return GetCachedPowerByIndex(index);
+}
+
+inline DiyFp GetCachedPower10(int exp, int *outExp) {
+     unsigned index = (static_cast<unsigned>(exp) + 348u) / 8u;
+     *outExp = -348 + static_cast<int>(index) * 8;
+     return GetCachedPowerByIndex(index);
+ }
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_DIYFP_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h
new file mode 100644
index 0000000..c59c92e
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h
@@ -0,0 +1,245 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
+// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
+// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
+
+#ifndef CEREAL_RAPIDJSON_DTOA_
+#define CEREAL_RAPIDJSON_DTOA_
+
+#include "itoa.h" // GetDigitsLut()
+#include "diyfp.h"
+#include "ieee754.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+CEREAL_RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
+#endif
+
+inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
+    while (rest < wp_w && delta - rest >= ten_kappa &&
+           (rest + ten_kappa < wp_w ||  /// closer
+            wp_w - rest > rest + ten_kappa - wp_w)) {
+        buffer[len - 1]--;
+        rest += ten_kappa;
+    }
+}
+
+inline unsigned CountDecimalDigit32(uint32_t n) {
+    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
+    if (n < 10) return 1;
+    if (n < 100) return 2;
+    if (n < 1000) return 3;
+    if (n < 10000) return 4;
+    if (n < 100000) return 5;
+    if (n < 1000000) return 6;
+    if (n < 10000000) return 7;
+    if (n < 100000000) return 8;
+    // Will not reach 10 digits in DigitGen()
+    //if (n < 1000000000) return 9;
+    //return 10;
+    return 9;
+}
+
+inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
+    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
+    const DiyFp wp_w = Mp - W;
+    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
+    uint64_t p2 = Mp.f & (one.f - 1);
+    unsigned kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
+    *len = 0;
+
+    while (kappa > 0) {
+        uint32_t d = 0;
+        switch (kappa) {
+            case  9: d = p1 /  100000000; p1 %=  100000000; break;
+            case  8: d = p1 /   10000000; p1 %=   10000000; break;
+            case  7: d = p1 /    1000000; p1 %=    1000000; break;
+            case  6: d = p1 /     100000; p1 %=     100000; break;
+            case  5: d = p1 /      10000; p1 %=      10000; break;
+            case  4: d = p1 /       1000; p1 %=       1000; break;
+            case  3: d = p1 /        100; p1 %=        100; break;
+            case  2: d = p1 /         10; p1 %=         10; break;
+            case  1: d = p1;              p1 =           0; break;
+            default:;
+        }
+        if (d || *len)
+            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
+        kappa--;
+        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
+        if (tmp <= delta) {
+            *K += kappa;
+            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
+            return;
+        }
+    }
+
+    // kappa = 0
+    for (;;) {
+        p2 *= 10;
+        delta *= 10;
+        char d = static_cast<char>(p2 >> -one.e);
+        if (d || *len)
+            buffer[(*len)++] = static_cast<char>('0' + d);
+        p2 &= one.f - 1;
+        kappa--;
+        if (p2 < delta) {
+            *K += kappa;
+            int index = -static_cast<int>(kappa);
+            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[-static_cast<int>(kappa)] : 0));
+            return;
+        }
+    }
+}
+
+inline void Grisu2(double value, char* buffer, int* length, int* K) {
+    const DiyFp v(value);
+    DiyFp w_m, w_p;
+    v.NormalizedBoundaries(&w_m, &w_p);
+
+    const DiyFp c_mk = GetCachedPower(w_p.e, K);
+    const DiyFp W = v.Normalize() * c_mk;
+    DiyFp Wp = w_p * c_mk;
+    DiyFp Wm = w_m * c_mk;
+    Wm.f++;
+    Wp.f--;
+    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
+}
+
+inline char* WriteExponent(int K, char* buffer) {
+    if (K < 0) {
+        *buffer++ = '-';
+        K = -K;
+    }
+
+    if (K >= 100) {
+        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
+        K %= 100;
+        const char* d = GetDigitsLut() + K * 2;
+        *buffer++ = d[0];
+        *buffer++ = d[1];
+    }
+    else if (K >= 10) {
+        const char* d = GetDigitsLut() + K * 2;
+        *buffer++ = d[0];
+        *buffer++ = d[1];
+    }
+    else
+        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
+
+    return buffer;
+}
+
+inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
+    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
+
+    if (0 <= k && kk <= 21) {
+        // 1234e7 -> 12340000000
+        for (int i = length; i < kk; i++)
+            buffer[i] = '0';
+        buffer[kk] = '.';
+        buffer[kk + 1] = '0';
+        return &buffer[kk + 2];
+    }
+    else if (0 < kk && kk <= 21) {
+        // 1234e-2 -> 12.34
+        std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
+        buffer[kk] = '.';
+        if (0 > k + maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[kk + 2]; // Reserve one zero
+        }
+        else
+            return &buffer[length + 1];
+    }
+    else if (-6 < kk && kk <= 0) {
+        // 1234e-6 -> 0.001234
+        const int offset = 2 - kk;
+        std::memmove(&buffer[offset], &buffer[0], static_cast<size_t>(length));
+        buffer[0] = '0';
+        buffer[1] = '.';
+        for (int i = 2; i < offset; i++)
+            buffer[i] = '0';
+        if (length - kk > maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = maxDecimalPlaces + 1; i > 2; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[3]; // Reserve one zero
+        }
+        else
+            return &buffer[length + offset];
+    }
+    else if (kk < -maxDecimalPlaces) {
+        // Truncate to zero
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
+    }
+    else if (length == 1) {
+        // 1e30
+        buffer[1] = 'e';
+        return WriteExponent(kk - 1, &buffer[2]);
+    }
+    else {
+        // 1234e30 -> 1.234e33
+        std::memmove(&buffer[2], &buffer[1], static_cast<size_t>(length - 1));
+        buffer[1] = '.';
+        buffer[length + 1] = 'e';
+        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
+    }
+}
+
+inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
+    CEREAL_RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
+    Double d(value);
+    if (d.IsZero()) {
+        if (d.Sign())
+            *buffer++ = '-';     // -0.0, Issue #289
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
+    }
+    else {
+        if (value < 0) {
+            *buffer++ = '-';
+            value = -value;
+        }
+        int length, K;
+        Grisu2(value, buffer, &length, &K);
+        return Prettify(buffer, length, K, maxDecimalPlaces);
+    }
+}
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_DTOA_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h
new file mode 100644
index 0000000..35845a1
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h
@@ -0,0 +1,78 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_IEEE754_
+#define CEREAL_RAPIDJSON_IEEE754_
+
+#include "../rapidjson.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+class Double {
+public:
+    Double() {}
+    Double(double d) : d_(d) {}
+    Double(uint64_t u) : u_(u) {}
+
+    double Value() const { return d_; }
+    uint64_t Uint64Value() const { return u_; }
+
+    double NextPositiveDouble() const {
+        CEREAL_RAPIDJSON_ASSERT(!Sign());
+        return Double(u_ + 1).Value();
+    }
+
+    bool Sign() const { return (u_ & kSignMask) != 0; }
+    uint64_t Significand() const { return u_ & kSignificandMask; }
+    int Exponent() const { return static_cast<int>(((u_ & kExponentMask) >> kSignificandSize) - kExponentBias); }
+
+    bool IsNan() const { return (u_ & kExponentMask) == kExponentMask && Significand() != 0; }
+    bool IsInf() const { return (u_ & kExponentMask) == kExponentMask && Significand() == 0; }
+    bool IsNanOrInf() const { return (u_ & kExponentMask) == kExponentMask; }
+    bool IsNormal() const { return (u_ & kExponentMask) != 0 || Significand() == 0; }
+    bool IsZero() const { return (u_ & (kExponentMask | kSignificandMask)) == 0; }
+
+    uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
+    int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
+    uint64_t ToBias() const { return (u_ & kSignMask) ? ~u_ + 1 : u_ | kSignMask; }
+
+    static unsigned EffectiveSignificandSize(int order) {
+        if (order >= -1021)
+            return 53;
+        else if (order <= -1074)
+            return 0;
+        else
+            return static_cast<unsigned>(order) + 1074;
+    }
+
+private:
+    static const int kSignificandSize = 52;
+    static const int kExponentBias = 0x3FF;
+    static const int kDenormalExponent = 1 - kExponentBias;
+    static const uint64_t kSignMask = CEREAL_RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
+    static const uint64_t kExponentMask = CEREAL_RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
+    static const uint64_t kSignificandMask = CEREAL_RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
+    static const uint64_t kHiddenBit = CEREAL_RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
+
+    union {
+        double d_;
+        uint64_t u_;
+    };
+};
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_IEEE754_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h
new file mode 100644
index 0000000..3e83658
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h
@@ -0,0 +1,304 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ITOA_
+#define CEREAL_RAPIDJSON_ITOA_
+
+#include "../rapidjson.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+inline const char* GetDigitsLut() {
+    static const char cDigitsLut[200] = {
+        '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9',
+        '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9',
+        '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9',
+        '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9',
+        '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9',
+        '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9',
+        '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9',
+        '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9',
+        '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9',
+        '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9'
+    };
+    return cDigitsLut;
+}
+
+inline char* u32toa(uint32_t value, char* buffer) {
+    const char* cDigitsLut = GetDigitsLut();
+
+    if (value < 10000) {
+        const uint32_t d1 = (value / 100) << 1;
+        const uint32_t d2 = (value % 100) << 1;
+        
+        if (value >= 1000)
+            *buffer++ = cDigitsLut[d1];
+        if (value >= 100)
+            *buffer++ = cDigitsLut[d1 + 1];
+        if (value >= 10)
+            *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+    }
+    else if (value < 100000000) {
+        // value = bbbbcccc
+        const uint32_t b = value / 10000;
+        const uint32_t c = value % 10000;
+        
+        const uint32_t d1 = (b / 100) << 1;
+        const uint32_t d2 = (b % 100) << 1;
+        
+        const uint32_t d3 = (c / 100) << 1;
+        const uint32_t d4 = (c % 100) << 1;
+        
+        if (value >= 10000000)
+            *buffer++ = cDigitsLut[d1];
+        if (value >= 1000000)
+            *buffer++ = cDigitsLut[d1 + 1];
+        if (value >= 100000)
+            *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+        
+        *buffer++ = cDigitsLut[d3];
+        *buffer++ = cDigitsLut[d3 + 1];
+        *buffer++ = cDigitsLut[d4];
+        *buffer++ = cDigitsLut[d4 + 1];
+    }
+    else {
+        // value = aabbbbcccc in decimal
+        
+        const uint32_t a = value / 100000000; // 1 to 42
+        value %= 100000000;
+        
+        if (a >= 10) {
+            const unsigned i = a << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+        }
+        else
+            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
+
+        const uint32_t b = value / 10000; // 0 to 9999
+        const uint32_t c = value % 10000; // 0 to 9999
+        
+        const uint32_t d1 = (b / 100) << 1;
+        const uint32_t d2 = (b % 100) << 1;
+        
+        const uint32_t d3 = (c / 100) << 1;
+        const uint32_t d4 = (c % 100) << 1;
+        
+        *buffer++ = cDigitsLut[d1];
+        *buffer++ = cDigitsLut[d1 + 1];
+        *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+        *buffer++ = cDigitsLut[d3];
+        *buffer++ = cDigitsLut[d3 + 1];
+        *buffer++ = cDigitsLut[d4];
+        *buffer++ = cDigitsLut[d4 + 1];
+    }
+    return buffer;
+}
+
+inline char* i32toa(int32_t value, char* buffer) {
+    uint32_t u = static_cast<uint32_t>(value);
+    if (value < 0) {
+        *buffer++ = '-';
+        u = ~u + 1;
+    }
+
+    return u32toa(u, buffer);
+}
+
+inline char* u64toa(uint64_t value, char* buffer) {
+    const char* cDigitsLut = GetDigitsLut();
+    const uint64_t  kTen8 = 100000000;
+    const uint64_t  kTen9 = kTen8 * 10;
+    const uint64_t kTen10 = kTen8 * 100;
+    const uint64_t kTen11 = kTen8 * 1000;
+    const uint64_t kTen12 = kTen8 * 10000;
+    const uint64_t kTen13 = kTen8 * 100000;
+    const uint64_t kTen14 = kTen8 * 1000000;
+    const uint64_t kTen15 = kTen8 * 10000000;
+    const uint64_t kTen16 = kTen8 * kTen8;
+    
+    if (value < kTen8) {
+        uint32_t v = static_cast<uint32_t>(value);
+        if (v < 10000) {
+            const uint32_t d1 = (v / 100) << 1;
+            const uint32_t d2 = (v % 100) << 1;
+            
+            if (v >= 1000)
+                *buffer++ = cDigitsLut[d1];
+            if (v >= 100)
+                *buffer++ = cDigitsLut[d1 + 1];
+            if (v >= 10)
+                *buffer++ = cDigitsLut[d2];
+            *buffer++ = cDigitsLut[d2 + 1];
+        }
+        else {
+            // value = bbbbcccc
+            const uint32_t b = v / 10000;
+            const uint32_t c = v % 10000;
+            
+            const uint32_t d1 = (b / 100) << 1;
+            const uint32_t d2 = (b % 100) << 1;
+            
+            const uint32_t d3 = (c / 100) << 1;
+            const uint32_t d4 = (c % 100) << 1;
+            
+            if (value >= 10000000)
+                *buffer++ = cDigitsLut[d1];
+            if (value >= 1000000)
+                *buffer++ = cDigitsLut[d1 + 1];
+            if (value >= 100000)
+                *buffer++ = cDigitsLut[d2];
+            *buffer++ = cDigitsLut[d2 + 1];
+            
+            *buffer++ = cDigitsLut[d3];
+            *buffer++ = cDigitsLut[d3 + 1];
+            *buffer++ = cDigitsLut[d4];
+            *buffer++ = cDigitsLut[d4 + 1];
+        }
+    }
+    else if (value < kTen16) {
+        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
+        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
+        
+        const uint32_t b0 = v0 / 10000;
+        const uint32_t c0 = v0 % 10000;
+        
+        const uint32_t d1 = (b0 / 100) << 1;
+        const uint32_t d2 = (b0 % 100) << 1;
+        
+        const uint32_t d3 = (c0 / 100) << 1;
+        const uint32_t d4 = (c0 % 100) << 1;
+
+        const uint32_t b1 = v1 / 10000;
+        const uint32_t c1 = v1 % 10000;
+        
+        const uint32_t d5 = (b1 / 100) << 1;
+        const uint32_t d6 = (b1 % 100) << 1;
+        
+        const uint32_t d7 = (c1 / 100) << 1;
+        const uint32_t d8 = (c1 % 100) << 1;
+
+        if (value >= kTen15)
+            *buffer++ = cDigitsLut[d1];
+        if (value >= kTen14)
+            *buffer++ = cDigitsLut[d1 + 1];
+        if (value >= kTen13)
+            *buffer++ = cDigitsLut[d2];
+        if (value >= kTen12)
+            *buffer++ = cDigitsLut[d2 + 1];
+        if (value >= kTen11)
+            *buffer++ = cDigitsLut[d3];
+        if (value >= kTen10)
+            *buffer++ = cDigitsLut[d3 + 1];
+        if (value >= kTen9)
+            *buffer++ = cDigitsLut[d4];
+        if (value >= kTen8)
+            *buffer++ = cDigitsLut[d4 + 1];
+        
+        *buffer++ = cDigitsLut[d5];
+        *buffer++ = cDigitsLut[d5 + 1];
+        *buffer++ = cDigitsLut[d6];
+        *buffer++ = cDigitsLut[d6 + 1];
+        *buffer++ = cDigitsLut[d7];
+        *buffer++ = cDigitsLut[d7 + 1];
+        *buffer++ = cDigitsLut[d8];
+        *buffer++ = cDigitsLut[d8 + 1];
+    }
+    else {
+        const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
+        value %= kTen16;
+        
+        if (a < 10)
+            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
+        else if (a < 100) {
+            const uint32_t i = a << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+        }
+        else if (a < 1000) {
+            *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
+            
+            const uint32_t i = (a % 100) << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+        }
+        else {
+            const uint32_t i = (a / 100) << 1;
+            const uint32_t j = (a % 100) << 1;
+            *buffer++ = cDigitsLut[i];
+            *buffer++ = cDigitsLut[i + 1];
+            *buffer++ = cDigitsLut[j];
+            *buffer++ = cDigitsLut[j + 1];
+        }
+        
+        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
+        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
+        
+        const uint32_t b0 = v0 / 10000;
+        const uint32_t c0 = v0 % 10000;
+        
+        const uint32_t d1 = (b0 / 100) << 1;
+        const uint32_t d2 = (b0 % 100) << 1;
+        
+        const uint32_t d3 = (c0 / 100) << 1;
+        const uint32_t d4 = (c0 % 100) << 1;
+        
+        const uint32_t b1 = v1 / 10000;
+        const uint32_t c1 = v1 % 10000;
+        
+        const uint32_t d5 = (b1 / 100) << 1;
+        const uint32_t d6 = (b1 % 100) << 1;
+        
+        const uint32_t d7 = (c1 / 100) << 1;
+        const uint32_t d8 = (c1 % 100) << 1;
+        
+        *buffer++ = cDigitsLut[d1];
+        *buffer++ = cDigitsLut[d1 + 1];
+        *buffer++ = cDigitsLut[d2];
+        *buffer++ = cDigitsLut[d2 + 1];
+        *buffer++ = cDigitsLut[d3];
+        *buffer++ = cDigitsLut[d3 + 1];
+        *buffer++ = cDigitsLut[d4];
+        *buffer++ = cDigitsLut[d4 + 1];
+        *buffer++ = cDigitsLut[d5];
+        *buffer++ = cDigitsLut[d5 + 1];
+        *buffer++ = cDigitsLut[d6];
+        *buffer++ = cDigitsLut[d6 + 1];
+        *buffer++ = cDigitsLut[d7];
+        *buffer++ = cDigitsLut[d7 + 1];
+        *buffer++ = cDigitsLut[d8];
+        *buffer++ = cDigitsLut[d8 + 1];
+    }
+    
+    return buffer;
+}
+
+inline char* i64toa(int64_t value, char* buffer) {
+    uint64_t u = static_cast<uint64_t>(value);
+    if (value < 0) {
+        *buffer++ = '-';
+        u = ~u + 1;
+    }
+
+    return u64toa(u, buffer);
+}
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_ITOA_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h
new file mode 100644
index 0000000..c98db90
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h
@@ -0,0 +1,181 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_INTERNAL_META_H_
+#define CEREAL_RAPIDJSON_INTERNAL_META_H_
+
+#include "../rapidjson.h"
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+#if defined(_MSC_VER)
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(6334)
+#endif
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
+#include <type_traits>
+#endif
+
+//@cond CEREAL_RAPIDJSON_INTERNAL
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+// Helper to wrap/convert arbitrary types to void, useful for arbitrary type matching
+template <typename T> struct Void { typedef void Type; };
+
+///////////////////////////////////////////////////////////////////////////////
+// BoolType, TrueType, FalseType
+//
+template <bool Cond> struct BoolType {
+    static const bool Value = Cond;
+    typedef BoolType Type;
+};
+typedef BoolType<true> TrueType;
+typedef BoolType<false> FalseType;
+
+
+///////////////////////////////////////////////////////////////////////////////
+// SelectIf, BoolExpr, NotExpr, AndExpr, OrExpr
+//
+
+template <bool C> struct SelectIfImpl { template <typename T1, typename T2> struct Apply { typedef T1 Type; }; };
+template <> struct SelectIfImpl<false> { template <typename T1, typename T2> struct Apply { typedef T2 Type; }; };
+template <bool C, typename T1, typename T2> struct SelectIfCond : SelectIfImpl<C>::template Apply<T1,T2> {};
+template <typename C, typename T1, typename T2> struct SelectIf : SelectIfCond<C::Value, T1, T2> {};
+
+template <bool Cond1, bool Cond2> struct AndExprCond : FalseType {};
+template <> struct AndExprCond<true, true> : TrueType {};
+template <bool Cond1, bool Cond2> struct OrExprCond : TrueType {};
+template <> struct OrExprCond<false, false> : FalseType {};
+
+template <typename C> struct BoolExpr : SelectIf<C,TrueType,FalseType>::Type {};
+template <typename C> struct NotExpr  : SelectIf<C,FalseType,TrueType>::Type {};
+template <typename C1, typename C2> struct AndExpr : AndExprCond<C1::Value, C2::Value>::Type {};
+template <typename C1, typename C2> struct OrExpr  : OrExprCond<C1::Value, C2::Value>::Type {};
+
+
+///////////////////////////////////////////////////////////////////////////////
+// AddConst, MaybeAddConst, RemoveConst
+template <typename T> struct AddConst { typedef const T Type; };
+template <bool Constify, typename T> struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
+template <typename T> struct RemoveConst { typedef T Type; };
+template <typename T> struct RemoveConst<const T> { typedef T Type; };
+
+
+///////////////////////////////////////////////////////////////////////////////
+// IsSame, IsConst, IsMoreConst, IsPointer
+//
+template <typename T, typename U> struct IsSame : FalseType {};
+template <typename T> struct IsSame<T, T> : TrueType {};
+
+template <typename T> struct IsConst : FalseType {};
+template <typename T> struct IsConst<const T> : TrueType {};
+
+template <typename CT, typename T>
+struct IsMoreConst
+    : AndExpr<IsSame<typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>,
+              BoolType<IsConst<CT>::Value >= IsConst<T>::Value> >::Type {};
+
+template <typename T> struct IsPointer : FalseType {};
+template <typename T> struct IsPointer<T*> : TrueType {};
+
+///////////////////////////////////////////////////////////////////////////////
+// IsBaseOf
+//
+#if CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
+
+template <typename B, typename D> struct IsBaseOf
+    : BoolType< ::std::is_base_of<B,D>::value> {};
+
+#else // simplified version adopted from Boost
+
+template<typename B, typename D> struct IsBaseOfImpl {
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(B) != 0);
+    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(D) != 0);
+
+    typedef char (&Yes)[1];
+    typedef char (&No) [2];
+
+    template <typename T>
+    static Yes Check(const D*, T);
+    static No  Check(const B*, int);
+
+    struct Host {
+        operator const B*() const;
+        operator const D*();
+    };
+
+    enum { Value = (sizeof(Check(Host(), 0)) == sizeof(Yes)) };
+};
+
+template <typename B, typename D> struct IsBaseOf
+    : OrExpr<IsSame<B, D>, BoolExpr<IsBaseOfImpl<B, D> > >::Type {};
+
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
+
+
+//////////////////////////////////////////////////////////////////////////
+// EnableIf / DisableIf
+//
+template <bool Condition, typename T = void> struct EnableIfCond  { typedef T Type; };
+template <typename T> struct EnableIfCond<false, T> { /* empty */ };
+
+template <bool Condition, typename T = void> struct DisableIfCond { typedef T Type; };
+template <typename T> struct DisableIfCond<true, T> { /* empty */ };
+
+template <typename Condition, typename T = void>
+struct EnableIf : EnableIfCond<Condition::Value, T> {};
+
+template <typename Condition, typename T = void>
+struct DisableIf : DisableIfCond<Condition::Value, T> {};
+
+// SFINAE helpers
+struct SfinaeTag {};
+template <typename T> struct RemoveSfinaeTag;
+template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
+
+#define CEREAL_RAPIDJSON_REMOVEFPTR_(type) \
+    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
+        < ::CEREAL_RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
+
+#define CEREAL_RAPIDJSON_ENABLEIF(cond) \
+    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::EnableIf \
+        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
+
+#define CEREAL_RAPIDJSON_DISABLEIF(cond) \
+    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::DisableIf \
+        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
+
+#define CEREAL_RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
+    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::EnableIf \
+        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond), \
+         CEREAL_RAPIDJSON_REMOVEFPTR_(returntype)>::Type
+
+#define CEREAL_RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
+    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::DisableIf \
+        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond), \
+         CEREAL_RAPIDJSON_REMOVEFPTR_(returntype)>::Type
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+//@endcond
+
+#if defined(__GNUC__) || defined(_MSC_VER)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_INTERNAL_META_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h
new file mode 100644
index 0000000..7f796a1
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h
@@ -0,0 +1,55 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_POW10_
+#define CEREAL_RAPIDJSON_POW10_
+
+#include "../rapidjson.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Computes integer powers of 10 in double (10.0^n).
+/*! This function uses lookup table for fast and accurate results.
+    \param n non-negative exponent. Must <= 308.
+    \return 10.0^n
+*/
+inline double Pow10(int n) {
+    static const double e[] = { // 1e-0...1e308: 309 * 8 bytes = 2472 bytes
+        1e+0,  
+        1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
+        1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
+        1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
+        1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
+        1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
+        1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
+        1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
+        1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
+        1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
+        1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
+        1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
+        1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
+        1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
+        1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
+        1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
+        1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
+    };
+    CEREAL_RAPIDJSON_ASSERT(n >= 0 && n <= 308);
+    return e[n];
+}
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_POW10_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h
new file mode 100644
index 0000000..3bfa3ec
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h
@@ -0,0 +1,701 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_INTERNAL_REGEX_H_
+#define CEREAL_RAPIDJSON_INTERNAL_REGEX_H_
+
+#include "../allocators.h"
+#include "../stream.h"
+#include "stack.h"
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
+CEREAL_RAPIDJSON_DIAG_OFF(implicit-fallthrough)
+#endif
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+#ifndef CEREAL_RAPIDJSON_REGEX_VERBOSE
+#define CEREAL_RAPIDJSON_REGEX_VERBOSE 0
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericRegex
+
+static const SizeType kRegexInvalidState = ~SizeType(0);  //!< Represents an invalid index in GenericRegex::State::out, out1
+static const SizeType kRegexInvalidRange = ~SizeType(0);
+
+//! Regular expression engine with subset of ECMAscript grammar.
+/*!
+    Supported regular expression syntax:
+    - \c ab     Concatenation
+    - \c a|b    Alternation
+    - \c a?     Zero or one
+    - \c a*     Zero or more
+    - \c a+     One or more
+    - \c a{3}   Exactly 3 times
+    - \c a{3,}  At least 3 times
+    - \c a{3,5} 3 to 5 times
+    - \c (ab)   Grouping
+    - \c ^a     At the beginning
+    - \c a$     At the end
+    - \c .      Any character
+    - \c [abc]  Character classes
+    - \c [a-c]  Character class range
+    - \c [a-z0-9_] Character class combination
+    - \c [^abc] Negated character classes
+    - \c [^a-c] Negated character class range
+    - \c [\b]   Backspace (U+0008)
+    - \c \\| \\\\ ...  Escape characters
+    - \c \\f Form feed (U+000C)
+    - \c \\n Line feed (U+000A)
+    - \c \\r Carriage return (U+000D)
+    - \c \\t Tab (U+0009)
+    - \c \\v Vertical tab (U+000B)
+
+    \note This is a Thompson NFA engine, implemented with reference to 
+        Cox, Russ. "Regular Expression Matching Can Be Simple And Fast (but is slow in Java, Perl, PHP, Python, Ruby,...).", 
+        https://swtch.com/~rsc/regexp/regexp1.html 
+*/
+template <typename Encoding, typename Allocator = CrtAllocator>
+class GenericRegex {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    GenericRegex(const Ch* source, Allocator* allocator = 0) : 
+        states_(allocator, 256), ranges_(allocator, 256), root_(kRegexInvalidState), stateCount_(), rangeCount_(), 
+        stateSet_(), state0_(allocator, 0), state1_(allocator, 0), anchorBegin_(), anchorEnd_()
+    {
+        GenericStringStream<Encoding> ss(source);
+        DecodedStream<GenericStringStream<Encoding> > ds(ss);
+        Parse(ds);
+    }
+
+    ~GenericRegex() {
+        Allocator::Free(stateSet_);
+    }
+
+    bool IsValid() const {
+        return root_ != kRegexInvalidState;
+    }
+
+    template <typename InputStream>
+    bool Match(InputStream& is) const {
+        return SearchWithAnchoring(is, true, true);
+    }
+
+    bool Match(const Ch* s) const {
+        GenericStringStream<Encoding> is(s);
+        return Match(is);
+    }
+
+    template <typename InputStream>
+    bool Search(InputStream& is) const {
+        return SearchWithAnchoring(is, anchorBegin_, anchorEnd_);
+    }
+
+    bool Search(const Ch* s) const {
+        GenericStringStream<Encoding> is(s);
+        return Search(is);
+    }
+
+private:
+    enum Operator {
+        kZeroOrOne,
+        kZeroOrMore,
+        kOneOrMore,
+        kConcatenation,
+        kAlternation,
+        kLeftParenthesis
+    };
+
+    static const unsigned kAnyCharacterClass = 0xFFFFFFFF;   //!< For '.'
+    static const unsigned kRangeCharacterClass = 0xFFFFFFFE;
+    static const unsigned kRangeNegationFlag = 0x80000000;
+
+    struct Range {
+        unsigned start; // 
+        unsigned end;
+        SizeType next;
+    };
+
+    struct State {
+        SizeType out;     //!< Equals to kInvalid for matching state
+        SizeType out1;    //!< Equals to non-kInvalid for split
+        SizeType rangeStart;
+        unsigned codepoint;
+    };
+
+    struct Frag {
+        Frag(SizeType s, SizeType o, SizeType m) : start(s), out(o), minIndex(m) {}
+        SizeType start;
+        SizeType out; //!< link-list of all output states
+        SizeType minIndex;
+    };
+
+    template <typename SourceStream>
+    class DecodedStream {
+    public:
+        DecodedStream(SourceStream& ss) : ss_(ss), codepoint_() { Decode(); }
+        unsigned Peek() { return codepoint_; }
+        unsigned Take() {
+            unsigned c = codepoint_;
+            if (c) // No further decoding when '\0'
+                Decode();
+            return c;
+        }
+
+    private:
+        void Decode() {
+            if (!Encoding::Decode(ss_, &codepoint_))
+                codepoint_ = 0;
+        }
+
+        SourceStream& ss_;
+        unsigned codepoint_;
+    };
+
+    State& GetState(SizeType index) {
+        CEREAL_RAPIDJSON_ASSERT(index < stateCount_);
+        return states_.template Bottom<State>()[index];
+    }
+
+    const State& GetState(SizeType index) const {
+        CEREAL_RAPIDJSON_ASSERT(index < stateCount_);
+        return states_.template Bottom<State>()[index];
+    }
+
+    Range& GetRange(SizeType index) {
+        CEREAL_RAPIDJSON_ASSERT(index < rangeCount_);
+        return ranges_.template Bottom<Range>()[index];
+    }
+
+    const Range& GetRange(SizeType index) const {
+        CEREAL_RAPIDJSON_ASSERT(index < rangeCount_);
+        return ranges_.template Bottom<Range>()[index];
+    }
+
+    template <typename InputStream>
+    void Parse(DecodedStream<InputStream>& ds) {
+        Allocator allocator;
+        Stack<Allocator> operandStack(&allocator, 256);     // Frag
+        Stack<Allocator> operatorStack(&allocator, 256);    // Operator
+        Stack<Allocator> atomCountStack(&allocator, 256);   // unsigned (Atom per parenthesis)
+
+        *atomCountStack.template Push<unsigned>() = 0;
+
+        unsigned codepoint;
+        while (ds.Peek() != 0) {
+            switch (codepoint = ds.Take()) {
+                case '^':
+                    anchorBegin_ = true;
+                    break;
+
+                case '$':
+                    anchorEnd_ = true;
+                    break;
+
+                case '|':
+                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() < kAlternation)
+                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                            return;
+                    *operatorStack.template Push<Operator>() = kAlternation;
+                    *atomCountStack.template Top<unsigned>() = 0;
+                    break;
+
+                case '(':
+                    *operatorStack.template Push<Operator>() = kLeftParenthesis;
+                    *atomCountStack.template Push<unsigned>() = 0;
+                    break;
+
+                case ')':
+                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() != kLeftParenthesis)
+                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                            return;
+                    if (operatorStack.Empty())
+                        return;
+                    operatorStack.template Pop<Operator>(1);
+                    atomCountStack.template Pop<unsigned>(1);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '?':
+                    if (!Eval(operandStack, kZeroOrOne))
+                        return;
+                    break;
+
+                case '*':
+                    if (!Eval(operandStack, kZeroOrMore))
+                        return;
+                    break;
+
+                case '+':
+                    if (!Eval(operandStack, kOneOrMore))
+                        return;
+                    break;
+
+                case '{':
+                    {
+                        unsigned n, m;
+                        if (!ParseUnsigned(ds, &n))
+                            return;
+
+                        if (ds.Peek() == ',') {
+                            ds.Take();
+                            if (ds.Peek() == '}')
+                                m = kInfinityQuantifier;
+                            else if (!ParseUnsigned(ds, &m) || m < n)
+                                return;
+                        }
+                        else
+                            m = n;
+
+                        if (!EvalQuantifier(operandStack, n, m) || ds.Peek() != '}')
+                            return;
+                        ds.Take();
+                    }
+                    break;
+
+                case '.':
+                    PushOperand(operandStack, kAnyCharacterClass);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '[':
+                    {
+                        SizeType range;
+                        if (!ParseRange(ds, &range))
+                            return;
+                        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, kRangeCharacterClass);
+                        GetState(s).rangeStart = range;
+                        *operandStack.template Push<Frag>() = Frag(s, s, s);
+                    }
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '\\': // Escape character
+                    if (!CharacterEscape(ds, &codepoint))
+                        return; // Unsupported escape character
+                    // fall through to default
+
+                default: // Pattern character
+                    PushOperand(operandStack, codepoint);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+            }
+        }
+
+        while (!operatorStack.Empty())
+            if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                return;
+
+        // Link the operand to matching state.
+        if (operandStack.GetSize() == sizeof(Frag)) {
+            Frag* e = operandStack.template Pop<Frag>(1);
+            Patch(e->out, NewState(kRegexInvalidState, kRegexInvalidState, 0));
+            root_ = e->start;
+
+#if CEREAL_RAPIDJSON_REGEX_VERBOSE
+            printf("root: %d\n", root_);
+            for (SizeType i = 0; i < stateCount_ ; i++) {
+                State& s = GetState(i);
+                printf("[%2d] out: %2d out1: %2d c: '%c'\n", i, s.out, s.out1, (char)s.codepoint);
+            }
+            printf("\n");
+#endif
+        }
+
+        // Preallocate buffer for SearchWithAnchoring()
+        CEREAL_RAPIDJSON_ASSERT(stateSet_ == 0);
+        if (stateCount_ > 0) {
+            stateSet_ = static_cast<unsigned*>(states_.GetAllocator().Malloc(GetStateSetSize()));
+            state0_.template Reserve<SizeType>(stateCount_);
+            state1_.template Reserve<SizeType>(stateCount_);
+        }
+    }
+
+    SizeType NewState(SizeType out, SizeType out1, unsigned codepoint) {
+        State* s = states_.template Push<State>();
+        s->out = out;
+        s->out1 = out1;
+        s->codepoint = codepoint;
+        s->rangeStart = kRegexInvalidRange;
+        return stateCount_++;
+    }
+
+    void PushOperand(Stack<Allocator>& operandStack, unsigned codepoint) {
+        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, codepoint);
+        *operandStack.template Push<Frag>() = Frag(s, s, s);
+    }
+
+    void ImplicitConcatenation(Stack<Allocator>& atomCountStack, Stack<Allocator>& operatorStack) {
+        if (*atomCountStack.template Top<unsigned>())
+            *operatorStack.template Push<Operator>() = kConcatenation;
+        (*atomCountStack.template Top<unsigned>())++;
+    }
+
+    SizeType Append(SizeType l1, SizeType l2) {
+        SizeType old = l1;
+        while (GetState(l1).out != kRegexInvalidState)
+            l1 = GetState(l1).out;
+        GetState(l1).out = l2;
+        return old;
+    }
+
+    void Patch(SizeType l, SizeType s) {
+        for (SizeType next; l != kRegexInvalidState; l = next) {
+            next = GetState(l).out;
+            GetState(l).out = s;
+        }
+    }
+
+    bool Eval(Stack<Allocator>& operandStack, Operator op) {
+        switch (op) {
+            case kConcatenation:
+                CEREAL_RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag) * 2);
+                {
+                    Frag e2 = *operandStack.template Pop<Frag>(1);
+                    Frag e1 = *operandStack.template Pop<Frag>(1);
+                    Patch(e1.out, e2.start);
+                    *operandStack.template Push<Frag>() = Frag(e1.start, e2.out, Min(e1.minIndex, e2.minIndex));
+                }
+                return true;
+
+            case kAlternation:
+                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
+                    Frag e2 = *operandStack.template Pop<Frag>(1);
+                    Frag e1 = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(e1.start, e2.start, 0);
+                    *operandStack.template Push<Frag>() = Frag(s, Append(e1.out, e2.out), Min(e1.minIndex, e2.minIndex));
+                    return true;
+                }
+                return false;
+
+            case kZeroOrOne:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    *operandStack.template Push<Frag>() = Frag(s, Append(e.out, s), e.minIndex);
+                    return true;
+                }
+                return false;
+
+            case kZeroOrMore:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    Patch(e.out, s);
+                    *operandStack.template Push<Frag>() = Frag(s, s, e.minIndex);
+                    return true;
+                }
+                return false;
+
+            default: 
+                CEREAL_RAPIDJSON_ASSERT(op == kOneOrMore);
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    Patch(e.out, s);
+                    *operandStack.template Push<Frag>() = Frag(e.start, s, e.minIndex);
+                    return true;
+                }
+                return false;
+        }
+    }
+
+    bool EvalQuantifier(Stack<Allocator>& operandStack, unsigned n, unsigned m) {
+        CEREAL_RAPIDJSON_ASSERT(n <= m);
+        CEREAL_RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag));
+
+        if (n == 0) {
+            if (m == 0)                             // a{0} not support
+                return false;
+            else if (m == kInfinityQuantifier)
+                Eval(operandStack, kZeroOrMore);    // a{0,} -> a*
+            else {
+                Eval(operandStack, kZeroOrOne);         // a{0,5} -> a?
+                for (unsigned i = 0; i < m - 1; i++)
+                    CloneTopOperand(operandStack);      // a{0,5} -> a? a? a? a? a?
+                for (unsigned i = 0; i < m - 1; i++)
+                    Eval(operandStack, kConcatenation); // a{0,5} -> a?a?a?a?a?
+            }
+            return true;
+        }
+
+        for (unsigned i = 0; i < n - 1; i++)        // a{3} -> a a a
+            CloneTopOperand(operandStack);
+
+        if (m == kInfinityQuantifier)
+            Eval(operandStack, kOneOrMore);         // a{3,} -> a a a+
+        else if (m > n) {
+            CloneTopOperand(operandStack);          // a{3,5} -> a a a a
+            Eval(operandStack, kZeroOrOne);         // a{3,5} -> a a a a?
+            for (unsigned i = n; i < m - 1; i++)
+                CloneTopOperand(operandStack);      // a{3,5} -> a a a a? a?
+            for (unsigned i = n; i < m; i++)
+                Eval(operandStack, kConcatenation); // a{3,5} -> a a aa?a?
+        }
+
+        for (unsigned i = 0; i < n - 1; i++)
+            Eval(operandStack, kConcatenation);     // a{3} -> aaa, a{3,} -> aaa+, a{3.5} -> aaaa?a?
+
+        return true;
+    }
+
+    static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
+
+    void CloneTopOperand(Stack<Allocator>& operandStack) {
+        const Frag src = *operandStack.template Top<Frag>(); // Copy constructor to prevent invalidation
+        SizeType count = stateCount_ - src.minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
+        State* s = states_.template Push<State>(count);
+        memcpy(s, &GetState(src.minIndex), count * sizeof(State));
+        for (SizeType j = 0; j < count; j++) {
+            if (s[j].out != kRegexInvalidState)
+                s[j].out += count;
+            if (s[j].out1 != kRegexInvalidState)
+                s[j].out1 += count;
+        }
+        *operandStack.template Push<Frag>() = Frag(src.start + count, src.out + count, src.minIndex + count);
+        stateCount_ += count;
+    }
+
+    template <typename InputStream>
+    bool ParseUnsigned(DecodedStream<InputStream>& ds, unsigned* u) {
+        unsigned r = 0;
+        if (ds.Peek() < '0' || ds.Peek() > '9')
+            return false;
+        while (ds.Peek() >= '0' && ds.Peek() <= '9') {
+            if (r >= 429496729 && ds.Peek() > '5') // 2^32 - 1 = 4294967295
+                return false; // overflow
+            r = r * 10 + (ds.Take() - '0');
+        }
+        *u = r;
+        return true;
+    }
+
+    template <typename InputStream>
+    bool ParseRange(DecodedStream<InputStream>& ds, SizeType* range) {
+        bool isBegin = true;
+        bool negate = false;
+        int step = 0;
+        SizeType start = kRegexInvalidRange;
+        SizeType current = kRegexInvalidRange;
+        unsigned codepoint;
+        while ((codepoint = ds.Take()) != 0) {
+            if (isBegin) {
+                isBegin = false;
+                if (codepoint == '^') {
+                    negate = true;
+                    continue;
+                }
+            }
+
+            switch (codepoint) {
+            case ']':
+                if (start == kRegexInvalidRange)
+                    return false;   // Error: nothing inside []
+                if (step == 2) { // Add trailing '-'
+                    SizeType r = NewRange('-');
+                    CEREAL_RAPIDJSON_ASSERT(current != kRegexInvalidRange);
+                    GetRange(current).next = r;
+                }
+                if (negate)
+                    GetRange(start).start |= kRangeNegationFlag;
+                *range = start;
+                return true;
+
+            case '\\':
+                if (ds.Peek() == 'b') {
+                    ds.Take();
+                    codepoint = 0x0008; // Escape backspace character
+                }
+                else if (!CharacterEscape(ds, &codepoint))
+                    return false;
+                // fall through to default
+
+            default:
+                switch (step) {
+                case 1:
+                    if (codepoint == '-') {
+                        step++;
+                        break;
+                    }
+                    // fall through to step 0 for other characters
+
+                case 0:
+                    {
+                        SizeType r = NewRange(codepoint);
+                        if (current != kRegexInvalidRange)
+                            GetRange(current).next = r;
+                        if (start == kRegexInvalidRange)
+                            start = r;
+                        current = r;
+                    }
+                    step = 1;
+                    break;
+
+                default:
+                    CEREAL_RAPIDJSON_ASSERT(step == 2);
+                    GetRange(current).end = codepoint;
+                    step = 0;
+                }
+            }
+        }
+        return false;
+    }
+    
+    SizeType NewRange(unsigned codepoint) {
+        Range* r = ranges_.template Push<Range>();
+        r->start = r->end = codepoint;
+        r->next = kRegexInvalidRange;
+        return rangeCount_++;
+    }
+
+    template <typename InputStream>
+    bool CharacterEscape(DecodedStream<InputStream>& ds, unsigned* escapedCodepoint) {
+        unsigned codepoint;
+        switch (codepoint = ds.Take()) {
+            case '^':
+            case '$':
+            case '|':
+            case '(':
+            case ')':
+            case '?':
+            case '*':
+            case '+':
+            case '.':
+            case '[':
+            case ']':
+            case '{':
+            case '}':
+            case '\\':
+                *escapedCodepoint = codepoint; return true;
+            case 'f': *escapedCodepoint = 0x000C; return true;
+            case 'n': *escapedCodepoint = 0x000A; return true;
+            case 'r': *escapedCodepoint = 0x000D; return true;
+            case 't': *escapedCodepoint = 0x0009; return true;
+            case 'v': *escapedCodepoint = 0x000B; return true;
+            default:
+                return false; // Unsupported escape character
+        }
+    }
+
+    template <typename InputStream>
+    bool SearchWithAnchoring(InputStream& is, bool anchorBegin, bool anchorEnd) const {
+        CEREAL_RAPIDJSON_ASSERT(IsValid());
+        DecodedStream<InputStream> ds(is);
+
+        state0_.Clear();
+        Stack<Allocator> *current = &state0_, *next = &state1_;
+        const size_t stateSetSize = GetStateSetSize();
+        std::memset(stateSet_, 0, stateSetSize);
+
+        bool matched = AddState(*current, root_);
+        unsigned codepoint;
+        while (!current->Empty() && (codepoint = ds.Take()) != 0) {
+            std::memset(stateSet_, 0, stateSetSize);
+            next->Clear();
+            matched = false;
+            for (const SizeType* s = current->template Bottom<SizeType>(); s != current->template End<SizeType>(); ++s) {
+                const State& sr = GetState(*s);
+                if (sr.codepoint == codepoint ||
+                    sr.codepoint == kAnyCharacterClass || 
+                    (sr.codepoint == kRangeCharacterClass && MatchRange(sr.rangeStart, codepoint)))
+                {
+                    matched = AddState(*next, sr.out) || matched;
+                    if (!anchorEnd && matched)
+                        return true;
+                }
+                if (!anchorBegin)
+                    AddState(*next, root_);
+            }
+            internal::Swap(current, next);
+        }
+
+        return matched;
+    }
+
+    size_t GetStateSetSize() const {
+        return (stateCount_ + 31) / 32 * 4;
+    }
+
+    // Return whether the added states is a match state
+    bool AddState(Stack<Allocator>& l, SizeType index) const {
+        CEREAL_RAPIDJSON_ASSERT(index != kRegexInvalidState);
+
+        const State& s = GetState(index);
+        if (s.out1 != kRegexInvalidState) { // Split
+            bool matched = AddState(l, s.out);
+            return AddState(l, s.out1) || matched;
+        }
+        else if (!(stateSet_[index >> 5] & (1 << (index & 31)))) {
+            stateSet_[index >> 5] |= (1 << (index & 31));
+            *l.template PushUnsafe<SizeType>() = index;
+        }
+        return s.out == kRegexInvalidState; // by using PushUnsafe() above, we can ensure s is not validated due to reallocation.
+    }
+
+    bool MatchRange(SizeType rangeIndex, unsigned codepoint) const {
+        bool yes = (GetRange(rangeIndex).start & kRangeNegationFlag) == 0;
+        while (rangeIndex != kRegexInvalidRange) {
+            const Range& r = GetRange(rangeIndex);
+            if (codepoint >= (r.start & ~kRangeNegationFlag) && codepoint <= r.end)
+                return yes;
+            rangeIndex = r.next;
+        }
+        return !yes;
+    }
+
+    Stack<Allocator> states_;
+    Stack<Allocator> ranges_;
+    SizeType root_;
+    SizeType stateCount_;
+    SizeType rangeCount_;
+
+    static const unsigned kInfinityQuantifier = ~0u;
+
+    // For SearchWithAnchoring()
+    uint32_t* stateSet_;        // allocated by states_.GetAllocator()
+    mutable Stack<Allocator> state0_;
+    mutable Stack<Allocator> state1_;
+    bool anchorBegin_;
+    bool anchorEnd_;
+};
+
+typedef GenericRegex<UTF8<> > Regex;
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_INTERNAL_REGEX_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h
new file mode 100644
index 0000000..768551e
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h
@@ -0,0 +1,230 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_INTERNAL_STACK_H_
+#define CEREAL_RAPIDJSON_INTERNAL_STACK_H_
+
+#include "../allocators.h"
+#include "swap.h"
+
+#if defined(__clang__)
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+///////////////////////////////////////////////////////////////////////////////
+// Stack
+
+//! A type-unsafe stack for storing different types of data.
+/*! \tparam Allocator Allocator for allocating stack memory.
+*/
+template <typename Allocator>
+class Stack {
+public:
+    // Optimization note: Do not allocate memory for stack_ in constructor.
+    // Do it lazily when first Push() -> Expand() -> Resize().
+    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    Stack(Stack&& rhs)
+        : allocator_(rhs.allocator_),
+          ownAllocator_(rhs.ownAllocator_),
+          stack_(rhs.stack_),
+          stackTop_(rhs.stackTop_),
+          stackEnd_(rhs.stackEnd_),
+          initialCapacity_(rhs.initialCapacity_)
+    {
+        rhs.allocator_ = 0;
+        rhs.ownAllocator_ = 0;
+        rhs.stack_ = 0;
+        rhs.stackTop_ = 0;
+        rhs.stackEnd_ = 0;
+        rhs.initialCapacity_ = 0;
+    }
+#endif
+
+    ~Stack() {
+        Destroy();
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    Stack& operator=(Stack&& rhs) {
+        if (&rhs != this)
+        {
+            Destroy();
+
+            allocator_ = rhs.allocator_;
+            ownAllocator_ = rhs.ownAllocator_;
+            stack_ = rhs.stack_;
+            stackTop_ = rhs.stackTop_;
+            stackEnd_ = rhs.stackEnd_;
+            initialCapacity_ = rhs.initialCapacity_;
+
+            rhs.allocator_ = 0;
+            rhs.ownAllocator_ = 0;
+            rhs.stack_ = 0;
+            rhs.stackTop_ = 0;
+            rhs.stackEnd_ = 0;
+            rhs.initialCapacity_ = 0;
+        }
+        return *this;
+    }
+#endif
+
+    void Swap(Stack& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
+        internal::Swap(allocator_, rhs.allocator_);
+        internal::Swap(ownAllocator_, rhs.ownAllocator_);
+        internal::Swap(stack_, rhs.stack_);
+        internal::Swap(stackTop_, rhs.stackTop_);
+        internal::Swap(stackEnd_, rhs.stackEnd_);
+        internal::Swap(initialCapacity_, rhs.initialCapacity_);
+    }
+
+    void Clear() { stackTop_ = stack_; }
+
+    void ShrinkToFit() { 
+        if (Empty()) {
+            // If the stack is empty, completely deallocate the memory.
+            Allocator::Free(stack_);
+            stack_ = 0;
+            stackTop_ = 0;
+            stackEnd_ = 0;
+        }
+        else
+            Resize(GetSize());
+    }
+
+    // Optimization note: try to minimize the size of this function for force inline.
+    // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
+    template<typename T>
+    CEREAL_RAPIDJSON_FORCEINLINE void Reserve(size_t count = 1) {
+         // Expand the stack if needed
+        if (CEREAL_RAPIDJSON_UNLIKELY(stackTop_ + sizeof(T) * count > stackEnd_))
+            Expand<T>(count);
+    }
+
+    template<typename T>
+    CEREAL_RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
+        Reserve<T>(count);
+        return PushUnsafe<T>(count);
+    }
+
+    template<typename T>
+    CEREAL_RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
+        CEREAL_RAPIDJSON_ASSERT(stackTop_ + sizeof(T) * count <= stackEnd_);
+        T* ret = reinterpret_cast<T*>(stackTop_);
+        stackTop_ += sizeof(T) * count;
+        return ret;
+    }
+
+    template<typename T>
+    T* Pop(size_t count) {
+        CEREAL_RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
+        stackTop_ -= count * sizeof(T);
+        return reinterpret_cast<T*>(stackTop_);
+    }
+
+    template<typename T>
+    T* Top() { 
+        CEREAL_RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
+        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
+    }
+
+    template<typename T>
+    const T* Top() const {
+        CEREAL_RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
+        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
+    }
+
+    template<typename T>
+    T* End() { return reinterpret_cast<T*>(stackTop_); }
+
+    template<typename T>
+    const T* End() const { return reinterpret_cast<T*>(stackTop_); }
+
+    template<typename T>
+    T* Bottom() { return reinterpret_cast<T*>(stack_); }
+
+    template<typename T>
+    const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
+
+    bool HasAllocator() const {
+        return allocator_ != 0;
+    }
+
+    Allocator& GetAllocator() {
+        CEREAL_RAPIDJSON_ASSERT(allocator_);
+        return *allocator_;
+    }
+
+    bool Empty() const { return stackTop_ == stack_; }
+    size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
+    size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
+
+private:
+    template<typename T>
+    void Expand(size_t count) {
+        // Only expand the capacity if the current stack exists. Otherwise just create a stack with initial capacity.
+        size_t newCapacity;
+        if (stack_ == 0) {
+            if (!allocator_)
+                ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
+            newCapacity = initialCapacity_;
+        } else {
+            newCapacity = GetCapacity();
+            newCapacity += (newCapacity + 1) / 2;
+        }
+        size_t newSize = GetSize() + sizeof(T) * count;
+        if (newCapacity < newSize)
+            newCapacity = newSize;
+
+        Resize(newCapacity);
+    }
+
+    void Resize(size_t newCapacity) {
+        const size_t size = GetSize();  // Backup the current size
+        stack_ = static_cast<char*>(allocator_->Realloc(stack_, GetCapacity(), newCapacity));
+        stackTop_ = stack_ + size;
+        stackEnd_ = stack_ + newCapacity;
+    }
+
+    void Destroy() {
+        Allocator::Free(stack_);
+        CEREAL_RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
+    }
+
+    // Prohibit copy constructor & assignment operator.
+    Stack(const Stack&);
+    Stack& operator=(const Stack&);
+
+    Allocator* allocator_;
+    Allocator* ownAllocator_;
+    char *stack_;
+    char *stackTop_;
+    char *stackEnd_;
+    size_t initialCapacity_;
+};
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_STACK_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h
new file mode 100644
index 0000000..0c6973c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h
@@ -0,0 +1,55 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_INTERNAL_STRFUNC_H_
+#define CEREAL_RAPIDJSON_INTERNAL_STRFUNC_H_
+
+#include "../stream.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Custom strlen() which works on different character types.
+/*! \tparam Ch Character type (e.g. char, wchar_t, short)
+    \param s Null-terminated input string.
+    \return Number of characters in the string. 
+    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
+*/
+template <typename Ch>
+inline SizeType StrLen(const Ch* s) {
+    const Ch* p = s;
+    while (*p) ++p;
+    return SizeType(p - s);
+}
+
+//! Returns number of code points in a encoded string.
+template<typename Encoding>
+bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
+    GenericStringStream<Encoding> is(s);
+    const typename Encoding::Ch* end = s + length;
+    SizeType count = 0;
+    while (is.src_ < end) {
+        unsigned codepoint;
+        if (!Encoding::Decode(is, &codepoint))
+            return false;
+        count++;
+    }
+    *outCount = count;
+    return true;
+}
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_INTERNAL_STRFUNC_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h
new file mode 100644
index 0000000..076434c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h
@@ -0,0 +1,269 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_STRTOD_
+#define CEREAL_RAPIDJSON_STRTOD_
+
+#include "ieee754.h"
+#include "biginteger.h"
+#include "diyfp.h"
+#include "pow10.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+inline double FastPath(double significand, int exp) {
+    if (exp < -308)
+        return 0.0;
+    else if (exp >= 0)
+        return significand * internal::Pow10(exp);
+    else
+        return significand / internal::Pow10(-exp);
+}
+
+inline double StrtodNormalPrecision(double d, int p) {
+    if (p < -308) {
+        // Prevent expSum < -308, making Pow10(p) = 0
+        d = FastPath(d, -308);
+        d = FastPath(d, p + 308);
+    }
+    else
+        d = FastPath(d, p);
+    return d;
+}
+
+template <typename T>
+inline T Min3(T a, T b, T c) {
+    T m = a;
+    if (m > b) m = b;
+    if (m > c) m = c;
+    return m;
+}
+
+inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp) {
+    const Double db(b);
+    const uint64_t bInt = db.IntegerSignificand();
+    const int bExp = db.IntegerExponent();
+    const int hExp = bExp - 1;
+
+    int dS_Exp2 = 0, dS_Exp5 = 0, bS_Exp2 = 0, bS_Exp5 = 0, hS_Exp2 = 0, hS_Exp5 = 0;
+
+    // Adjust for decimal exponent
+    if (dExp >= 0) {
+        dS_Exp2 += dExp;
+        dS_Exp5 += dExp;
+    }
+    else {
+        bS_Exp2 -= dExp;
+        bS_Exp5 -= dExp;
+        hS_Exp2 -= dExp;
+        hS_Exp5 -= dExp;
+    }
+
+    // Adjust for binary exponent
+    if (bExp >= 0)
+        bS_Exp2 += bExp;
+    else {
+        dS_Exp2 -= bExp;
+        hS_Exp2 -= bExp;
+    }
+
+    // Adjust for half ulp exponent
+    if (hExp >= 0)
+        hS_Exp2 += hExp;
+    else {
+        dS_Exp2 -= hExp;
+        bS_Exp2 -= hExp;
+    }
+
+    // Remove common power of two factor from all three scaled values
+    int common_Exp2 = Min3(dS_Exp2, bS_Exp2, hS_Exp2);
+    dS_Exp2 -= common_Exp2;
+    bS_Exp2 -= common_Exp2;
+    hS_Exp2 -= common_Exp2;
+
+    BigInteger dS = d;
+    dS.MultiplyPow5(static_cast<unsigned>(dS_Exp5)) <<= static_cast<unsigned>(dS_Exp2);
+
+    BigInteger bS(bInt);
+    bS.MultiplyPow5(static_cast<unsigned>(bS_Exp5)) <<= static_cast<unsigned>(bS_Exp2);
+
+    BigInteger hS(1);
+    hS.MultiplyPow5(static_cast<unsigned>(hS_Exp5)) <<= static_cast<unsigned>(hS_Exp2);
+
+    BigInteger delta(0);
+    dS.Difference(bS, &delta);
+
+    return delta.Compare(hS);
+}
+
+inline bool StrtodFast(double d, int p, double* result) {
+    // Use fast path for string-to-double conversion if possible
+    // see http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
+    if (p > 22  && p < 22 + 16) {
+        // Fast Path Cases In Disguise
+        d *= internal::Pow10(p - 22);
+        p = 22;
+    }
+
+    if (p >= -22 && p <= 22 && d <= 9007199254740991.0) { // 2^53 - 1
+        *result = FastPath(d, p);
+        return true;
+    }
+    else
+        return false;
+}
+
+// Compute an approximation and see if it is within 1/2 ULP
+inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosition, int exp, double* result) {
+    uint64_t significand = 0;
+    size_t i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
+    for (; i < length; i++) {
+        if (significand  >  CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
+            (significand == CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
+            break;
+        significand = significand * 10u + static_cast<unsigned>(decimals[i] - '0');
+    }
+    
+    if (i < length && decimals[i] >= '5') // Rounding
+        significand++;
+
+    size_t remaining = length - i;
+    const unsigned kUlpShift = 3;
+    const unsigned kUlp = 1 << kUlpShift;
+    int64_t error = (remaining == 0) ? 0 : kUlp / 2;
+
+    DiyFp v(significand, 0);
+    v = v.Normalize();
+    error <<= -v.e;
+
+    const int dExp = static_cast<int>(decimalPosition) - static_cast<int>(i) + exp;
+
+    int actualExp;
+    DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
+    if (actualExp != dExp) {
+        static const DiyFp kPow10[] = {
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xa0000000, 00000000), -60),  // 10^1
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xc8000000, 00000000), -57),  // 10^2
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xfa000000, 00000000), -54),  // 10^3
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0x9c400000, 00000000), -50),  // 10^4
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xc3500000, 00000000), -47),  // 10^5
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44),  // 10^6
+            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40)   // 10^7
+        };
+        int  adjustment = dExp - actualExp - 1;
+        CEREAL_RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
+        v = v * kPow10[adjustment];
+        if (length + static_cast<unsigned>(adjustment)> 19u) // has more digits than decimal digits in 64-bit
+            error += kUlp / 2;
+    }
+
+    v = v * cachedPower;
+
+    error += kUlp + (error == 0 ? 0 : 1);
+
+    const int oldExp = v.e;
+    v = v.Normalize();
+    error <<= oldExp - v.e;
+
+    const unsigned effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
+    unsigned precisionSize = 64 - effectiveSignificandSize;
+    if (precisionSize + kUlpShift >= 64) {
+        unsigned scaleExp = (precisionSize + kUlpShift) - 63;
+        v.f >>= scaleExp;
+        v.e += scaleExp; 
+        error = (error >> scaleExp) + 1 + static_cast<int>(kUlp);
+        precisionSize -= scaleExp;
+    }
+
+    DiyFp rounded(v.f >> precisionSize, v.e + static_cast<int>(precisionSize));
+    const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
+    const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
+    if (precisionBits >= halfWay + static_cast<unsigned>(error)) {
+        rounded.f++;
+        if (rounded.f & (DiyFp::kDpHiddenBit << 1)) { // rounding overflows mantissa (issue #340)
+            rounded.f >>= 1;
+            rounded.e++;
+        }
+    }
+
+    *result = rounded.ToDouble();
+
+    return halfWay - static_cast<unsigned>(error) >= precisionBits || precisionBits >= halfWay + static_cast<unsigned>(error);
+}
+
+inline double StrtodBigInteger(double approx, const char* decimals, size_t length, size_t decimalPosition, int exp) {
+    const BigInteger dInt(decimals, length);
+    const int dExp = static_cast<int>(decimalPosition) - static_cast<int>(length) + exp;
+    Double a(approx);
+    int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp);
+    if (cmp < 0)
+        return a.Value();  // within half ULP
+    else if (cmp == 0) {
+        // Round towards even
+        if (a.Significand() & 1)
+            return a.NextPositiveDouble();
+        else
+            return a.Value();
+    }
+    else // adjustment
+        return a.NextPositiveDouble();
+}
+
+inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
+    CEREAL_RAPIDJSON_ASSERT(d >= 0.0);
+    CEREAL_RAPIDJSON_ASSERT(length >= 1);
+
+    double result;
+    if (StrtodFast(d, p, &result))
+        return result;
+
+    // Trim leading zeros
+    while (*decimals == '0' && length > 1) {
+        length--;
+        decimals++;
+        decimalPosition--;
+    }
+
+    // Trim trailing zeros
+    while (decimals[length - 1] == '0' && length > 1) {
+        length--;
+        decimalPosition--;
+        exp++;
+    }
+
+    // Trim right-most digits
+    const int kMaxDecimalDigit = 780;
+    if (static_cast<int>(length) > kMaxDecimalDigit) {
+        int delta = (static_cast<int>(length) - kMaxDecimalDigit);
+        exp += delta;
+        decimalPosition -= static_cast<unsigned>(delta);
+        length = kMaxDecimalDigit;
+    }
+
+    // If too small, underflow to zero
+    if (int(length) + exp < -324)
+        return 0.0;
+
+    if (StrtodDiyFp(decimals, length, decimalPosition, exp, &result))
+        return result;
+
+    // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
+    return StrtodBigInteger(result, decimals, length, decimalPosition, exp);
+}
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_STRTOD_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h
new file mode 100644
index 0000000..5d8910c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h
@@ -0,0 +1,46 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_INTERNAL_SWAP_H_
+#define CEREAL_RAPIDJSON_INTERNAL_SWAP_H_
+
+#include "../rapidjson.h"
+
+#if defined(__clang__)
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Custom swap() to avoid dependency on C++ <algorithm> header
+/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.
+    \note This has the same semantics as std::swap().
+*/
+template <typename T>
+inline void Swap(T& a, T& b) CEREAL_RAPIDJSON_NOEXCEPT {
+    T tmp = a;
+        a = b;
+        b = tmp;
+}
+
+} // namespace internal
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_INTERNAL_SWAP_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h b/Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h
new file mode 100644
index 0000000..e1c7ea8
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h
@@ -0,0 +1,116 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_ISTREAMWRAPPER_H_
+#define CEREAL_RAPIDJSON_ISTREAMWRAPPER_H_
+
+#include "stream.h"
+#include <iosfwd>
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
+CEREAL_RAPIDJSON_DIAG_OFF(4127) // ignore assert(false) for triggering exception
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of \c std::basic_istream into RapidJSON's Stream concept.
+/*!
+    The classes can be wrapped including but not limited to:
+
+    - \c std::istringstream
+    - \c std::stringstream
+    - \c std::wistringstream
+    - \c std::wstringstream
+    - \c std::ifstream
+    - \c std::fstream
+    - \c std::wifstream
+    - \c std::wfstream
+
+    \tparam StreamType Class derived from \c std::basic_istream.
+*/
+
+template <typename StreamType>
+class BasicIStreamWrapper {
+public:
+    typedef typename StreamType::char_type Ch;
+    BasicIStreamWrapper(StreamType& stream) : stream_(stream), count_(), peekBuffer_() {}
+
+    Ch Peek() const {
+        typename StreamType::int_type c = stream_.peek();
+        return CEREAL_RAPIDJSON_LIKELY(c != StreamType::traits_type::eof()) ? static_cast<Ch>(c) : '\0';
+    }
+
+    Ch Take() {
+        typename StreamType::int_type c = stream_.get();
+        if (CEREAL_RAPIDJSON_LIKELY(c != StreamType::traits_type::eof())) {
+            count_++;
+            return static_cast<Ch>(c);
+        }
+        else
+            return '\0';
+    }
+
+    // tellg() may return -1 when failed. So we count by ourself.
+    size_t Tell() const { return count_; }
+
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
+    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) == 1); // Only usable for byte stream.
+        int i;
+        bool hasError = false;
+        for (i = 0; i < 4; ++i) {
+            typename StreamType::int_type c = stream_.get();
+            if (c == StreamType::traits_type::eof()) {
+                hasError = true;
+                stream_.clear();
+                break;
+            }
+            peekBuffer_[i] = static_cast<Ch>(c);
+        }
+        for (--i; i >= 0; --i)
+            stream_.putback(peekBuffer_[i]);
+        return !hasError ? peekBuffer_ : 0;
+    }
+
+private:
+    BasicIStreamWrapper(const BasicIStreamWrapper&);
+    BasicIStreamWrapper& operator=(const BasicIStreamWrapper&);
+
+    StreamType& stream_;
+    size_t count_;  //!< Number of characters read. Note:
+    mutable Ch peekBuffer_[4];
+};
+
+typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
+typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
+
+#if defined(__clang__) || defined(_MSC_VER)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_ISTREAMWRAPPER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h b/Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h
new file mode 100644
index 0000000..0cd75cf
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h
@@ -0,0 +1,70 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_MEMORYBUFFER_H_
+#define CEREAL_RAPIDJSON_MEMORYBUFFER_H_
+
+#include "stream.h"
+#include "internal/stack.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Represents an in-memory output byte stream.
+/*!
+    This class is mainly for being wrapped by EncodedOutputStream or AutoUTFOutputStream.
+
+    It is similar to FileWriteBuffer but the destination is an in-memory buffer instead of a file.
+
+    Differences between MemoryBuffer and StringBuffer:
+    1. StringBuffer has Encoding but MemoryBuffer is only a byte buffer. 
+    2. StringBuffer::GetString() returns a null-terminated string. MemoryBuffer::GetBuffer() returns a buffer without terminator.
+
+    \tparam Allocator type for allocating memory buffer.
+    \note implements Stream concept
+*/
+template <typename Allocator = CrtAllocator>
+struct GenericMemoryBuffer {
+    typedef char Ch; // byte
+
+    GenericMemoryBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
+
+    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
+    void Flush() {}
+
+    void Clear() { stack_.Clear(); }
+    void ShrinkToFit() { stack_.ShrinkToFit(); }
+    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
+    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
+
+    const Ch* GetBuffer() const {
+        return stack_.template Bottom<Ch>();
+    }
+
+    size_t GetSize() const { return stack_.GetSize(); }
+
+    static const size_t kDefaultCapacity = 256;
+    mutable internal::Stack<Allocator> stack_;
+};
+
+typedef GenericMemoryBuffer<> MemoryBuffer;
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(MemoryBuffer& memoryBuffer, char c, size_t n) {
+    std::memset(memoryBuffer.stack_.Push<char>(n), c, n * sizeof(c));
+}
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_MEMORYBUFFER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/memorystream.h b/Src/External/cereal/include/cereal/external/rapidjson/memorystream.h
new file mode 100644
index 0000000..e48988c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/memorystream.h
@@ -0,0 +1,76 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_MEMORYSTREAM_H_
+#define CEREAL_RAPIDJSON_MEMORYSTREAM_H_
+
+#include "stream.h"
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
+CEREAL_RAPIDJSON_DIAG_OFF(missing-noreturn)
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF( 4127 ) // ignore assert(false) for triggering exception
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Represents an in-memory input byte stream.
+/*!
+    This class is mainly for being wrapped by EncodedInputStream or AutoUTFInputStream.
+
+    It is similar to FileReadBuffer but the source is an in-memory buffer instead of a file.
+
+    Differences between MemoryStream and StringStream:
+    1. StringStream has encoding but MemoryStream is a byte stream.
+    2. MemoryStream needs size of the source buffer and the buffer don't need to be null terminated. StringStream assume null-terminated string as source.
+    3. MemoryStream supports Peek4() for encoding detection. StringStream is specified with an encoding so it should not have Peek4().
+    \note implements Stream concept
+*/
+struct MemoryStream {
+    typedef char Ch; // byte
+
+    MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
+
+    Ch Peek() const { return CEREAL_RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_; }
+    Ch Take() { return CEREAL_RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_++; }
+    size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
+
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
+    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        return Tell() + 4 <= size_ ? src_ : 0;
+    }
+
+    const Ch* src_;     //!< Current read position.
+    const Ch* begin_;   //!< Original head of the string.
+    const Ch* end_;     //!< End of stream.
+    size_t size_;       //!< Size of the stream.
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__) || defined(_MSC_VER)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_MEMORYBUFFER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h b/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
new file mode 100644
index 0000000..1811128
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
@@ -0,0 +1,316 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2013 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. Neither the name of the product nor the names of its contributors may
+//      be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+// The above software in this distribution may have been modified by 
+// THL A29 Limited ("Tencent Modifications"). 
+// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include "stdint.h"
+
+// miloyip: VC supports inttypes.h since VC2013
+#if _MSC_VER >= 1800
+#include <inttypes.h>
+#else
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+#endif // __STDC_FORMAT_MACROS ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+#endif // _MSC_VER >= 1800
+
+#endif // _MSC_INTTYPES_H_ ]
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h b/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
new file mode 100644
index 0000000..3d4477b
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
@@ -0,0 +1,300 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2013 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. Neither the name of the product nor the names of its contributors may
+//      be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+// The above software in this distribution may have been modified by 
+// THL A29 Limited ("Tencent Modifications"). 
+// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
+#if _MSC_VER >= 1600 // [
+#include <stdint.h>
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+#undef INT8_C
+#undef INT16_C
+#undef INT32_C
+#undef INT64_C
+#undef UINT8_C
+#undef UINT16_C
+#undef UINT32_C
+#undef UINT64_C
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
+// Check out Issue 9 for the details.
+#ifndef INTMAX_C //   [
+#  define INTMAX_C   INT64_C
+#endif // INTMAX_C    ]
+#ifndef UINTMAX_C //  [
+#  define UINTMAX_C  UINT64_C
+#endif // UINTMAX_C   ]
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+#else // ] _MSC_VER >= 1700 [
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler would give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#if defined(__cplusplus) && !defined(_M_ARM)
+extern "C" {
+#endif
+#  include <wchar.h>
+#if defined(__cplusplus) && !defined(_M_ARM)
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
+// Check out Issue 9 for the details.
+#ifndef INTMAX_C //   [
+#  define INTMAX_C   INT64_C
+#endif // INTMAX_C    ]
+#ifndef UINTMAX_C //  [
+#  define UINTMAX_C  UINT64_C
+#endif // UINTMAX_C   ]
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+#endif // _MSC_VER >= 1600 ]
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h b/Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
new file mode 100644
index 0000000..58c034a
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
@@ -0,0 +1,81 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_OSTREAMWRAPPER_H_
+#define CEREAL_RAPIDJSON_OSTREAMWRAPPER_H_
+
+#include "stream.h"
+#include <iosfwd>
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of \c std::basic_ostream into RapidJSON's Stream concept.
+/*!
+    The classes can be wrapped including but not limited to:
+
+    - \c std::ostringstream
+    - \c std::stringstream
+    - \c std::wpstringstream
+    - \c std::wstringstream
+    - \c std::ifstream
+    - \c std::fstream
+    - \c std::wofstream
+    - \c std::wfstream
+
+    \tparam StreamType Class derived from \c std::basic_ostream.
+*/
+   
+template <typename StreamType>
+class BasicOStreamWrapper {
+public:
+    typedef typename StreamType::char_type Ch;
+    BasicOStreamWrapper(StreamType& stream) : stream_(stream) {}
+
+    void Put(Ch c) {
+        stream_.put(c);
+    }
+
+    void Flush() {
+        stream_.flush();
+    }
+
+    // Not implemented
+    char Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    char Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    char* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(char*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    BasicOStreamWrapper(const BasicOStreamWrapper&);
+    BasicOStreamWrapper& operator=(const BasicOStreamWrapper&);
+
+    StreamType& stream_;
+};
+
+typedef BasicOStreamWrapper<std::ostream> OStreamWrapper;
+typedef BasicOStreamWrapper<std::wostream> WOStreamWrapper;
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_OSTREAMWRAPPER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/pointer.h b/Src/External/cereal/include/cereal/external/rapidjson/pointer.h
new file mode 100644
index 0000000..1e4836c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/pointer.h
@@ -0,0 +1,1358 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_POINTER_H_
+#define CEREAL_RAPIDJSON_POINTER_H_
+
+#include "document.h"
+#include "internal/itoa.h"
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
+
+//! Error code of parsing.
+/*! \ingroup CEREAL_RAPIDJSON_ERRORS
+    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
+*/
+enum PointerParseErrorCode {
+    kPointerParseErrorNone = 0,                     //!< The parse is successful
+
+    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
+    kPointerParseErrorInvalidEscape,                //!< Invalid escape
+    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
+    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericPointer
+
+//! Represents a JSON Pointer. Use Pointer for UTF8 encoding and default allocator.
+/*!
+    This class implements RFC 6901 "JavaScript Object Notation (JSON) Pointer" 
+    (https://tools.ietf.org/html/rfc6901).
+
+    A JSON pointer is for identifying a specific value in a JSON document
+    (GenericDocument). It can simplify coding of DOM tree manipulation, because it
+    can access multiple-level depth of DOM tree with single API call.
+
+    After it parses a string representation (e.g. "/foo/0" or URI fragment 
+    representation (e.g. "#/foo/0") into its internal representation (tokens),
+    it can be used to resolve a specific value in multiple documents, or sub-tree 
+    of documents.
+
+    Contrary to GenericValue, Pointer can be copy constructed and copy assigned.
+    Apart from assignment, a Pointer cannot be modified after construction.
+
+    Although Pointer is very convenient, please aware that constructing Pointer
+    involves parsing and dynamic memory allocation. A special constructor with user-
+    supplied tokens eliminates these.
+
+    GenericPointer depends on GenericDocument and GenericValue.
+    
+    \tparam ValueType The value type of the DOM tree. E.g. GenericValue<UTF8<> >
+    \tparam Allocator The allocator type for allocating memory for internal representation.
+    
+    \note GenericPointer uses same encoding of ValueType.
+    However, Allocator of GenericPointer is independent of Allocator of Value.
+*/
+template <typename ValueType, typename Allocator = CrtAllocator>
+class GenericPointer {
+public:
+    typedef typename ValueType::EncodingType EncodingType;  //!< Encoding type from Value
+    typedef typename ValueType::Ch Ch;                      //!< Character type from Value
+
+    //! A token is the basic units of internal representation.
+    /*!
+        A JSON pointer string representation "/foo/123" is parsed to two tokens: 
+        "foo" and 123. 123 will be represented in both numeric form and string form.
+        They are resolved according to the actual value type (object or array).
+
+        For token that are not numbers, or the numeric value is out of bound
+        (greater than limits of SizeType), they are only treated as string form
+        (i.e. the token's index will be equal to kPointerInvalidIndex).
+
+        This struct is public so that user can create a Pointer without parsing and 
+        allocation, using a special constructor.
+    */
+    struct Token {
+        const Ch* name;             //!< Name of the token. It has null character at the end but it can contain null character.
+        SizeType length;            //!< Length of the name.
+        SizeType index;             //!< A valid array index, if it is not equal to kPointerInvalidIndex.
+    };
+
+    //!@name Constructors and destructor.
+    //@{
+
+    //! Default constructor.
+    GenericPointer(Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
+
+    //! Constructor that parses a string or URI fragment representation.
+    /*!
+        \param source A null-terminated, string or URI fragment representation of JSON pointer.
+        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
+    */
+    explicit GenericPointer(const Ch* source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        Parse(source, internal::StrLen(source));
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Constructor that parses a string or URI fragment representation.
+    /*!
+        \param source A string or URI fragment representation of JSON pointer.
+        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
+        \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
+    */
+    explicit GenericPointer(const std::basic_string<Ch>& source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        Parse(source.c_str(), source.size());
+    }
+#endif
+
+    //! Constructor that parses a string or URI fragment representation, with length of the source string.
+    /*!
+        \param source A string or URI fragment representation of JSON pointer.
+        \param length Length of source.
+        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
+        \note Slightly faster than the overload without length.
+    */
+    GenericPointer(const Ch* source, size_t length, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        Parse(source, length);
+    }
+
+    //! Constructor with user-supplied tokens.
+    /*!
+        This constructor let user supplies const array of tokens.
+        This prevents the parsing process and eliminates allocation.
+        This is preferred for memory constrained environments.
+
+        \param tokens An constant array of tokens representing the JSON pointer.
+        \param tokenCount Number of tokens.
+
+        \b Example
+        \code
+        #define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
+        #define INDEX(i) { #i, sizeof(#i) - 1, i }
+
+        static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
+        static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
+        // Equivalent to static const Pointer p("/foo/123");
+
+        #undef NAME
+        #undef INDEX
+        \endcode
+    */
+    GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
+
+    //! Copy constructor.
+    GenericPointer(const GenericPointer& rhs, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+        *this = rhs;
+    }
+
+    //! Destructor.
+    ~GenericPointer() {
+        if (nameBuffer_)    // If user-supplied tokens constructor is used, nameBuffer_ is nullptr and tokens_ are not deallocated.
+            Allocator::Free(tokens_);
+        CEREAL_RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    //! Assignment operator.
+    GenericPointer& operator=(const GenericPointer& rhs) {
+        if (this != &rhs) {
+            // Do not delete ownAllcator
+            if (nameBuffer_)
+                Allocator::Free(tokens_);
+
+            tokenCount_ = rhs.tokenCount_;
+            parseErrorOffset_ = rhs.parseErrorOffset_;
+            parseErrorCode_ = rhs.parseErrorCode_;
+
+            if (rhs.nameBuffer_)
+                CopyFromRaw(rhs); // Normally parsed tokens.
+            else {
+                tokens_ = rhs.tokens_; // User supplied const tokens.
+                nameBuffer_ = 0;
+            }
+        }
+        return *this;
+    }
+
+    //@}
+
+    //!@name Append token
+    //@{
+
+    //! Append a token and return a new Pointer
+    /*!
+        \param token Token to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const Token& token, Allocator* allocator = 0) const {
+        GenericPointer r;
+        r.allocator_ = allocator;
+        Ch *p = r.CopyFromRaw(*this, 1, token.length + 1);
+        std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch));
+        r.tokens_[tokenCount_].name = p;
+        r.tokens_[tokenCount_].length = token.length;
+        r.tokens_[tokenCount_].index = token.index;
+        return r;
+    }
+
+    //! Append a name token with length, and return a new Pointer
+    /*!
+        \param name Name to be appended.
+        \param length Length of name.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const Ch* name, SizeType length, Allocator* allocator = 0) const {
+        Token token = { name, length, kPointerInvalidIndex };
+        return Append(token, allocator);
+    }
+
+    //! Append a name token without length, and return a new Pointer
+    /*!
+        \param name Name (const Ch*) to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >), (GenericPointer))
+    Append(T* name, Allocator* allocator = 0) const {
+        return Append(name, StrLen(name), allocator);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Append a name token, and return a new Pointer
+    /*!
+        \param name Name to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const std::basic_string<Ch>& name, Allocator* allocator = 0) const {
+        return Append(name.c_str(), static_cast<SizeType>(name.size()), allocator);
+    }
+#endif
+
+    //! Append a index token, and return a new Pointer
+    /*!
+        \param index Index to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(SizeType index, Allocator* allocator = 0) const {
+        char buffer[21];
+        char* end = sizeof(SizeType) == 4 ? internal::u32toa(index, buffer) : internal::u64toa(index, buffer);
+        SizeType length = static_cast<SizeType>(end - buffer);
+        buffer[length] = '\0';
+
+        if (sizeof(Ch) == 1) {
+            Token token = { reinterpret_cast<Ch*>(buffer), length, index };
+            return Append(token, allocator);
+        }
+        else {
+            Ch name[21];
+            for (size_t i = 0; i <= length; i++)
+                name[i] = buffer[i];
+            Token token = { name, length, index };
+            return Append(token, allocator);
+        }
+    }
+
+    //! Append a token by value, and return a new Pointer
+    /*!
+        \param token token to be appended.
+        \param allocator Allocator for the newly return Pointer.
+        \return A new Pointer with appended token.
+    */
+    GenericPointer Append(const ValueType& token, Allocator* allocator = 0) const {
+        if (token.IsString())
+            return Append(token.GetString(), token.GetStringLength(), allocator);
+        else {
+            CEREAL_RAPIDJSON_ASSERT(token.IsUint64());
+            CEREAL_RAPIDJSON_ASSERT(token.GetUint64() <= SizeType(~0));
+            return Append(static_cast<SizeType>(token.GetUint64()), allocator);
+        }
+    }
+
+    //!@name Handling Parse Error
+    //@{
+
+    //! Check whether this is a valid pointer.
+    bool IsValid() const { return parseErrorCode_ == kPointerParseErrorNone; }
+
+    //! Get the parsing error offset in code unit.
+    size_t GetParseErrorOffset() const { return parseErrorOffset_; }
+
+    //! Get the parsing error code.
+    PointerParseErrorCode GetParseErrorCode() const { return parseErrorCode_; }
+
+    //@}
+
+    //! Get the allocator of this pointer.
+    Allocator& GetAllocator() { return *allocator_; }
+
+    //!@name Tokens
+    //@{
+
+    //! Get the token array (const version only).
+    const Token* GetTokens() const { return tokens_; }
+
+    //! Get the number of tokens.
+    size_t GetTokenCount() const { return tokenCount_; }
+
+    //@}
+
+    //!@name Equality/inequality operators
+    //@{
+
+    //! Equality operator.
+    /*!
+        \note When any pointers are invalid, always returns false.
+    */
+    bool operator==(const GenericPointer& rhs) const {
+        if (!IsValid() || !rhs.IsValid() || tokenCount_ != rhs.tokenCount_)
+            return false;
+
+        for (size_t i = 0; i < tokenCount_; i++) {
+            if (tokens_[i].index != rhs.tokens_[i].index ||
+                tokens_[i].length != rhs.tokens_[i].length || 
+                (tokens_[i].length != 0 && std::memcmp(tokens_[i].name, rhs.tokens_[i].name, sizeof(Ch)* tokens_[i].length) != 0))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    //! Inequality operator.
+    /*!
+        \note When any pointers are invalid, always returns true.
+    */
+    bool operator!=(const GenericPointer& rhs) const { return !(*this == rhs); }
+
+    //@}
+
+    //!@name Stringify
+    //@{
+
+    //! Stringify the pointer into string representation.
+    /*!
+        \tparam OutputStream Type of output stream.
+        \param os The output stream.
+    */
+    template<typename OutputStream>
+    bool Stringify(OutputStream& os) const {
+        return Stringify<false, OutputStream>(os);
+    }
+
+    //! Stringify the pointer into URI fragment representation.
+    /*!
+        \tparam OutputStream Type of output stream.
+        \param os The output stream.
+    */
+    template<typename OutputStream>
+    bool StringifyUriFragment(OutputStream& os) const {
+        return Stringify<true, OutputStream>(os);
+    }
+
+    //@}
+
+    //!@name Create value
+    //@{
+
+    //! Create a value in a subtree.
+    /*!
+        If the value is not exist, it creates all parent values and a JSON Null value.
+        So it always succeed and return the newly created or existing value.
+
+        Remind that it may change types of parents according to tokens, so it 
+        potentially removes previously stored values. For example, if a document 
+        was an array, and "/foo" is used to create a value, then the document 
+        will be changed to an object, and all existing array elements are lost.
+
+        \param root Root value of a DOM subtree to be resolved. It can be any value other than document root.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
+        \return The resolved newly created (a JSON Null value), or already exists value.
+    */
+    ValueType& Create(ValueType& root, typename ValueType::AllocatorType& allocator, bool* alreadyExist = 0) const {
+        CEREAL_RAPIDJSON_ASSERT(IsValid());
+        ValueType* v = &root;
+        bool exist = true;
+        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            if (v->IsArray() && t->name[0] == '-' && t->length == 1) {
+                v->PushBack(ValueType().Move(), allocator);
+                v = &((*v)[v->Size() - 1]);
+                exist = false;
+            }
+            else {
+                if (t->index == kPointerInvalidIndex) { // must be object name
+                    if (!v->IsObject())
+                        v->SetObject(); // Change to Object
+                }
+                else { // object name or array index
+                    if (!v->IsArray() && !v->IsObject())
+                        v->SetArray(); // Change to Array
+                }
+
+                if (v->IsArray()) {
+                    if (t->index >= v->Size()) {
+                        v->Reserve(t->index + 1, allocator);
+                        while (t->index >= v->Size())
+                            v->PushBack(ValueType().Move(), allocator);
+                        exist = false;
+                    }
+                    v = &((*v)[t->index]);
+                }
+                else {
+                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
+                    if (m == v->MemberEnd()) {
+                        v->AddMember(ValueType(t->name, t->length, allocator).Move(), ValueType().Move(), allocator);
+                        v = &(--v->MemberEnd())->value; // Assumes AddMember() appends at the end
+                        exist = false;
+                    }
+                    else
+                        v = &m->value;
+                }
+            }
+        }
+
+        if (alreadyExist)
+            *alreadyExist = exist;
+
+        return *v;
+    }
+
+    //! Creates a value in a document.
+    /*!
+        \param document A document to be resolved.
+        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
+        \return The resolved newly created, or already exists value.
+    */
+    template <typename stackAllocator>
+    ValueType& Create(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, bool* alreadyExist = 0) const {
+        return Create(document, document.GetAllocator(), alreadyExist);
+    }
+
+    //@}
+
+    //!@name Query value
+    //@{
+
+    //! Query a value in a subtree.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
+        \return Pointer to the value if it can be resolved. Otherwise null.
+
+        \note
+        There are only 3 situations when a value cannot be resolved:
+        1. A value in the path is not an array nor object.
+        2. An object value does not contain the token.
+        3. A token is out of range of an array value.
+
+        Use unresolvedTokenIndex to retrieve the token index.
+    */
+    ValueType* Get(ValueType& root, size_t* unresolvedTokenIndex = 0) const {
+        CEREAL_RAPIDJSON_ASSERT(IsValid());
+        ValueType* v = &root;
+        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            switch (v->GetType()) {
+            case kObjectType:
+                {
+                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
+                    if (m == v->MemberEnd())
+                        break;
+                    v = &m->value;
+                }
+                continue;
+            case kArrayType:
+                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
+                    break;
+                v = &((*v)[t->index]);
+                continue;
+            default:
+                break;
+            }
+
+            // Error: unresolved token
+            if (unresolvedTokenIndex)
+                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
+            return 0;
+        }
+        return v;
+    }
+
+    //! Query a const value in a const subtree.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \return Pointer to the value if it can be resolved. Otherwise null.
+    */
+    const ValueType* Get(const ValueType& root, size_t* unresolvedTokenIndex = 0) const { 
+        return Get(const_cast<ValueType&>(root), unresolvedTokenIndex);
+    }
+
+    //@}
+
+    //!@name Query a value with default
+    //@{
+
+    //! Query a value in a subtree with default value.
+    /*!
+        Similar to Get(), but if the specified value do not exists, it creates all parents and clone the default value.
+        So that this function always succeed.
+
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param defaultValue Default value to be cloned if the value was not exists.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \see Create()
+    */
+    ValueType& GetWithDefault(ValueType& root, const ValueType& defaultValue, typename ValueType::AllocatorType& allocator) const {
+        bool alreadyExist;
+        Value& v = Create(root, allocator, &alreadyExist);
+        return alreadyExist ? v : v.CopyFrom(defaultValue, allocator);
+    }
+
+    //! Query a value in a subtree with default null-terminated string.
+    ValueType& GetWithDefault(ValueType& root, const Ch* defaultValue, typename ValueType::AllocatorType& allocator) const {
+        bool alreadyExist;
+        Value& v = Create(root, allocator, &alreadyExist);
+        return alreadyExist ? v : v.SetString(defaultValue, allocator);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Query a value in a subtree with default std::basic_string.
+    ValueType& GetWithDefault(ValueType& root, const std::basic_string<Ch>& defaultValue, typename ValueType::AllocatorType& allocator) const {
+        bool alreadyExist;
+        Value& v = Create(root, allocator, &alreadyExist);
+        return alreadyExist ? v : v.SetString(defaultValue, allocator);
+    }
+#endif
+
+    //! Query a value in a subtree with default primitive value.
+    /*!
+        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+    GetWithDefault(ValueType& root, T defaultValue, typename ValueType::AllocatorType& allocator) const {
+        return GetWithDefault(root, ValueType(defaultValue).Move(), allocator);
+    }
+
+    //! Query a value in a document with default value.
+    template <typename stackAllocator>
+    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+
+    //! Query a value in a document with default null-terminated string.
+    template <typename stackAllocator>
+    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+    
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Query a value in a document with default std::basic_string.
+    template <typename stackAllocator>
+    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+#endif
+
+    //! Query a value in a document with default primitive value.
+    /*!
+        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T, typename stackAllocator>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+    GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T defaultValue) const {
+        return GetWithDefault(document, defaultValue, document.GetAllocator());
+    }
+
+    //@}
+
+    //!@name Set a value
+    //@{
+
+    //! Set a value in a subtree, with move semantics.
+    /*!
+        It creates all parents if they are not exist or types are different to the tokens.
+        So this function always succeeds but potentially remove existing values.
+
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param value Value to be set.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \see Create()
+    */
+    ValueType& Set(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = value;
+    }
+
+    //! Set a value in a subtree, with copy semantics.
+    ValueType& Set(ValueType& root, const ValueType& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator).CopyFrom(value, allocator);
+    }
+
+    //! Set a null-terminated string in a subtree.
+    ValueType& Set(ValueType& root, const Ch* value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = ValueType(value, allocator).Move();
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Set a std::basic_string in a subtree.
+    ValueType& Set(ValueType& root, const std::basic_string<Ch>& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = ValueType(value, allocator).Move();
+    }
+#endif
+
+    //! Set a primitive value in a subtree.
+    /*!
+        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+    Set(ValueType& root, T value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator) = ValueType(value).Move();
+    }
+
+    //! Set a value in a document, with move semantics.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
+        return Create(document) = value;
+    }
+
+    //! Set a value in a document, with copy semantics.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& value) const {
+        return Create(document).CopyFrom(value, document.GetAllocator());
+    }
+
+    //! Set a null-terminated string in a document.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* value) const {
+        return Create(document) = ValueType(value, document.GetAllocator()).Move();
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    //! Sets a std::basic_string in a document.
+    template <typename stackAllocator>
+    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& value) const {
+        return Create(document) = ValueType(value, document.GetAllocator()).Move();
+    }
+#endif
+
+    //! Set a primitive value in a document.
+    /*!
+    \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
+    */
+    template <typename T, typename stackAllocator>
+    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
+        Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T value) const {
+            return Create(document) = value;
+    }
+
+    //@}
+
+    //!@name Swap a value
+    //@{
+
+    //! Swap a value with a value in a subtree.
+    /*!
+        It creates all parents if they are not exist or types are different to the tokens.
+        So this function always succeeds but potentially remove existing values.
+
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param value Value to be swapped.
+        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
+        \see Create()
+    */
+    ValueType& Swap(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
+        return Create(root, allocator).Swap(value);
+    }
+
+    //! Swap a value with a value in a document.
+    template <typename stackAllocator>
+    ValueType& Swap(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
+        return Create(document).Swap(value);
+    }
+
+    //@}
+
+    //! Erase a value in a subtree.
+    /*!
+        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \return Whether the resolved value is found and erased.
+
+        \note Erasing with an empty pointer \c Pointer(""), i.e. the root, always fail and return false.
+    */
+    bool Erase(ValueType& root) const {
+        CEREAL_RAPIDJSON_ASSERT(IsValid());
+        if (tokenCount_ == 0) // Cannot erase the root
+            return false;
+
+        ValueType* v = &root;
+        const Token* last = tokens_ + (tokenCount_ - 1);
+        for (const Token *t = tokens_; t != last; ++t) {
+            switch (v->GetType()) {
+            case kObjectType:
+                {
+                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
+                    if (m == v->MemberEnd())
+                        return false;
+                    v = &m->value;
+                }
+                break;
+            case kArrayType:
+                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
+                    return false;
+                v = &((*v)[t->index]);
+                break;
+            default:
+                return false;
+            }
+        }
+
+        switch (v->GetType()) {
+        case kObjectType:
+            return v->EraseMember(GenericStringRef<Ch>(last->name, last->length));
+        case kArrayType:
+            if (last->index == kPointerInvalidIndex || last->index >= v->Size())
+                return false;
+            v->Erase(v->Begin() + last->index);
+            return true;
+        default:
+            return false;
+        }
+    }
+
+private:
+    //! Clone the content from rhs to this.
+    /*!
+        \param rhs Source pointer.
+        \param extraToken Extra tokens to be allocated.
+        \param extraNameBufferSize Extra name buffer size (in number of Ch) to be allocated.
+        \return Start of non-occupied name buffer, for storing extra names.
+    */
+    Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) {
+        if (!allocator_) // allocator is independently owned.
+            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
+
+        size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens
+        for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t)
+            nameBufferSize += t->length;
+
+        tokenCount_ = rhs.tokenCount_ + extraToken;
+        tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + (nameBufferSize + extraNameBufferSize) * sizeof(Ch)));
+        nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
+        if (rhs.tokenCount_ > 0) {
+            std::memcpy(tokens_, rhs.tokens_, rhs.tokenCount_ * sizeof(Token));
+        }
+        if (nameBufferSize > 0) {
+            std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
+        }
+
+        // Adjust pointers to name buffer
+        std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
+        for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
+            t->name += diff;
+
+        return nameBuffer_ + nameBufferSize;
+    }
+
+    //! Check whether a character should be percent-encoded.
+    /*!
+        According to RFC 3986 2.3 Unreserved Characters.
+        \param c The character (code unit) to be tested.
+    */
+    bool NeedPercentEncode(Ch c) const {
+        return !((c >= '0' && c <= '9') || (c >= 'A' && c <='Z') || (c >= 'a' && c <= 'z') || c == '-' || c == '.' || c == '_' || c =='~');
+    }
+
+    //! Parse a JSON String or its URI fragment representation into tokens.
+#ifndef __clang__ // -Wdocumentation
+    /*!
+        \param source Either a JSON Pointer string, or its URI fragment representation. Not need to be null terminated.
+        \param length Length of the source string.
+        \note Source cannot be JSON String Representation of JSON Pointer, e.g. In "/\u0000", \u0000 will not be unescaped.
+    */
+#endif
+    void Parse(const Ch* source, size_t length) {
+        CEREAL_RAPIDJSON_ASSERT(source != NULL);
+        CEREAL_RAPIDJSON_ASSERT(nameBuffer_ == 0);
+        CEREAL_RAPIDJSON_ASSERT(tokens_ == 0);
+
+        // Create own allocator if user did not supply.
+        if (!allocator_)
+            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
+
+        // Count number of '/' as tokenCount
+        tokenCount_ = 0;
+        for (const Ch* s = source; s != source + length; s++) 
+            if (*s == '/')
+                tokenCount_++;
+
+        Token* token = tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + length * sizeof(Ch)));
+        Ch* name = nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
+        size_t i = 0;
+
+        // Detect if it is a URI fragment
+        bool uriFragment = false;
+        if (source[i] == '#') {
+            uriFragment = true;
+            i++;
+        }
+
+        if (i != length && source[i] != '/') {
+            parseErrorCode_ = kPointerParseErrorTokenMustBeginWithSolidus;
+            goto error;
+        }
+
+        while (i < length) {
+            CEREAL_RAPIDJSON_ASSERT(source[i] == '/');
+            i++; // consumes '/'
+
+            token->name = name;
+            bool isNumber = true;
+
+            while (i < length && source[i] != '/') {
+                Ch c = source[i];
+                if (uriFragment) {
+                    // Decoding percent-encoding for URI fragment
+                    if (c == '%') {
+                        PercentDecodeStream is(&source[i], source + length);
+                        GenericInsituStringStream<EncodingType> os(name);
+                        Ch* begin = os.PutBegin();
+                        if (!Transcoder<UTF8<>, EncodingType>().Validate(is, os) || !is.IsValid()) {
+                            parseErrorCode_ = kPointerParseErrorInvalidPercentEncoding;
+                            goto error;
+                        }
+                        size_t len = os.PutEnd(begin);
+                        i += is.Tell() - 1;
+                        if (len == 1)
+                            c = *name;
+                        else {
+                            name += len;
+                            isNumber = false;
+                            i++;
+                            continue;
+                        }
+                    }
+                    else if (NeedPercentEncode(c)) {
+                        parseErrorCode_ = kPointerParseErrorCharacterMustPercentEncode;
+                        goto error;
+                    }
+                }
+
+                i++;
+                
+                // Escaping "~0" -> '~', "~1" -> '/'
+                if (c == '~') {
+                    if (i < length) {
+                        c = source[i];
+                        if (c == '0')       c = '~';
+                        else if (c == '1')  c = '/';
+                        else {
+                            parseErrorCode_ = kPointerParseErrorInvalidEscape;
+                            goto error;
+                        }
+                        i++;
+                    }
+                    else {
+                        parseErrorCode_ = kPointerParseErrorInvalidEscape;
+                        goto error;
+                    }
+                }
+
+                // First check for index: all of characters are digit
+                if (c < '0' || c > '9')
+                    isNumber = false;
+
+                *name++ = c;
+            }
+            token->length = static_cast<SizeType>(name - token->name);
+            if (token->length == 0)
+                isNumber = false;
+            *name++ = '\0'; // Null terminator
+
+            // Second check for index: more than one digit cannot have leading zero
+            if (isNumber && token->length > 1 && token->name[0] == '0')
+                isNumber = false;
+
+            // String to SizeType conversion
+            SizeType n = 0;
+            if (isNumber) {
+                for (size_t j = 0; j < token->length; j++) {
+                    SizeType m = n * 10 + static_cast<SizeType>(token->name[j] - '0');
+                    if (m < n) {   // overflow detection
+                        isNumber = false;
+                        break;
+                    }
+                    n = m;
+                }
+            }
+
+            token->index = isNumber ? n : kPointerInvalidIndex;
+            token++;
+        }
+
+        CEREAL_RAPIDJSON_ASSERT(name <= nameBuffer_ + length); // Should not overflow buffer
+        parseErrorCode_ = kPointerParseErrorNone;
+        return;
+
+    error:
+        Allocator::Free(tokens_);
+        nameBuffer_ = 0;
+        tokens_ = 0;
+        tokenCount_ = 0;
+        parseErrorOffset_ = i;
+        return;
+    }
+
+    //! Stringify to string or URI fragment representation.
+    /*!
+        \tparam uriFragment True for stringifying to URI fragment representation. False for string representation.
+        \tparam OutputStream type of output stream.
+        \param os The output stream.
+    */
+    template<bool uriFragment, typename OutputStream>
+    bool Stringify(OutputStream& os) const {
+        CEREAL_RAPIDJSON_ASSERT(IsValid());
+
+        if (uriFragment)
+            os.Put('#');
+
+        for (Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
+            os.Put('/');
+            for (size_t j = 0; j < t->length; j++) {
+                Ch c = t->name[j];
+                if (c == '~') {
+                    os.Put('~');
+                    os.Put('0');
+                }
+                else if (c == '/') {
+                    os.Put('~');
+                    os.Put('1');
+                }
+                else if (uriFragment && NeedPercentEncode(c)) { 
+                    // Transcode to UTF8 sequence
+                    GenericStringStream<typename ValueType::EncodingType> source(&t->name[j]);
+                    PercentEncodeStream<OutputStream> target(os);
+                    if (!Transcoder<EncodingType, UTF8<> >().Validate(source, target))
+                        return false;
+                    j += source.Tell() - 1;
+                }
+                else
+                    os.Put(c);
+            }
+        }
+        return true;
+    }
+
+    //! A helper stream for decoding a percent-encoded sequence into code unit.
+    /*!
+        This stream decodes %XY triplet into code unit (0-255).
+        If it encounters invalid characters, it sets output code unit as 0 and 
+        mark invalid, and to be checked by IsValid().
+    */
+    class PercentDecodeStream {
+    public:
+        typedef typename ValueType::Ch Ch;
+
+        //! Constructor
+        /*!
+            \param source Start of the stream
+            \param end Past-the-end of the stream.
+        */
+        PercentDecodeStream(const Ch* source, const Ch* end) : src_(source), head_(source), end_(end), valid_(true) {}
+
+        Ch Take() {
+            if (*src_ != '%' || src_ + 3 > end_) { // %XY triplet
+                valid_ = false;
+                return 0;
+            }
+            src_++;
+            Ch c = 0;
+            for (int j = 0; j < 2; j++) {
+                c = static_cast<Ch>(c << 4);
+                Ch h = *src_;
+                if      (h >= '0' && h <= '9') c = static_cast<Ch>(c + h - '0');
+                else if (h >= 'A' && h <= 'F') c = static_cast<Ch>(c + h - 'A' + 10);
+                else if (h >= 'a' && h <= 'f') c = static_cast<Ch>(c + h - 'a' + 10);
+                else {
+                    valid_ = false;
+                    return 0;
+                }
+                src_++;
+            }
+            return c;
+        }
+
+        size_t Tell() const { return static_cast<size_t>(src_ - head_); }
+        bool IsValid() const { return valid_; }
+
+    private:
+        const Ch* src_;     //!< Current read position.
+        const Ch* head_;    //!< Original head of the string.
+        const Ch* end_;     //!< Past-the-end position.
+        bool valid_;        //!< Whether the parsing is valid.
+    };
+
+    //! A helper stream to encode character (UTF-8 code unit) into percent-encoded sequence.
+    template <typename OutputStream>
+    class PercentEncodeStream {
+    public:
+        PercentEncodeStream(OutputStream& os) : os_(os) {}
+        void Put(char c) { // UTF-8 must be byte
+            unsigned char u = static_cast<unsigned char>(c);
+            static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+            os_.Put('%');
+            os_.Put(hexDigits[u >> 4]);
+            os_.Put(hexDigits[u & 15]);
+        }
+    private:
+        OutputStream& os_;
+    };
+
+    Allocator* allocator_;                  //!< The current allocator. It is either user-supplied or equal to ownAllocator_.
+    Allocator* ownAllocator_;               //!< Allocator owned by this Pointer.
+    Ch* nameBuffer_;                        //!< A buffer containing all names in tokens.
+    Token* tokens_;                         //!< A list of tokens.
+    size_t tokenCount_;                     //!< Number of tokens in tokens_.
+    size_t parseErrorOffset_;               //!< Offset in code unit when parsing fail.
+    PointerParseErrorCode parseErrorCode_;  //!< Parsing error code.
+};
+
+//! GenericPointer for Value (UTF-8, default allocator).
+typedef GenericPointer<Value> Pointer;
+
+//!@name Helper functions for GenericPointer
+//@{
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& CreateValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::AllocatorType& a) {
+    return pointer.Create(root, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& CreateValueByPointer(T& root, const CharType(&source)[N], typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Create(root, a);
+}
+
+// No allocator parameter
+
+template <typename DocumentType>
+typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer) {
+    return pointer.Create(document);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const CharType(&source)[N]) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Create(document);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
+    return pointer.Get(root, unresolvedTokenIndex);
+}
+
+template <typename T>
+const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
+    return pointer.Get(root, unresolvedTokenIndex);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N], size_t* unresolvedTokenIndex = 0) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
+}
+
+template <typename T, typename CharType, size_t N>
+const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N], size_t* unresolvedTokenIndex = 0) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+
+template <typename T>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename T>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+#endif
+
+template <typename T, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 defaultValue, typename T::AllocatorType& a) {
+    return pointer.GetWithDefault(root, defaultValue, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+#endif
+
+template <typename T, typename CharType, size_t N, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+GetValueByPointerWithDefault(T& root, const CharType(&source)[N], T2 defaultValue, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
+}
+
+// No allocator parameter
+
+template <typename DocumentType>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+#endif
+
+template <typename DocumentType, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 defaultValue) {
+    return pointer.GetWithDefault(document, defaultValue);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+#endif
+
+template <typename DocumentType, typename CharType, size_t N, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], T2 defaultValue) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename T>
+typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+#endif
+
+template <typename T, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 value, typename T::AllocatorType& a) {
+    return pointer.Set(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::ValueType& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::Ch* value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+#endif
+
+template <typename T, typename CharType, size_t N, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
+SetValueByPointer(T& root, const CharType(&source)[N], T2 value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
+}
+
+// No allocator parameter
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
+    return pointer.Set(document, value);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& value) {
+    return pointer.Set(document, value);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* value) {
+    return pointer.Set(document, value);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& value) {
+    return pointer.Set(document, value);
+}
+#endif
+
+template <typename DocumentType, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 value) {
+    return pointer.Set(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+#endif
+
+template <typename DocumentType, typename CharType, size_t N, typename T2>
+CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
+SetValueByPointer(DocumentType& document, const CharType(&source)[N], T2 value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+typename T::ValueType& SwapValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
+    return pointer.Swap(root, value, a);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType& SwapValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Swap(root, value, a);
+}
+
+template <typename DocumentType>
+typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
+    return pointer.Swap(document, value);
+}
+
+template <typename DocumentType, typename CharType, size_t N>
+typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
+    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Swap(document, value);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+template <typename T>
+bool EraseValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer) {
+    return pointer.Erase(root);
+}
+
+template <typename T, typename CharType, size_t N>
+bool EraseValueByPointer(T& root, const CharType(&source)[N]) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Erase(root);
+}
+
+//@}
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_POINTER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h b/Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h
new file mode 100644
index 0000000..50a24fc
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h
@@ -0,0 +1,255 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_PRETTYWRITER_H_
+#define CEREAL_RAPIDJSON_PRETTYWRITER_H_
+
+#include "writer.h"
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Combination of PrettyWriter format flags.
+/*! \see PrettyWriter::SetFormatOptions
+ */
+enum PrettyFormatOptions {
+    kFormatDefault = 0,         //!< Default pretty formatting.
+    kFormatSingleLineArray = 1  //!< Format arrays on a single line.
+};
+
+//! Writer with indentation and spacing.
+/*!
+    \tparam OutputStream Type of ouptut os.
+    \tparam SourceEncoding Encoding of source string.
+    \tparam TargetEncoding Encoding of output stream.
+    \tparam StackAllocator Type of allocator for allocating memory of stack.
+*/
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
+class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
+public:
+    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
+    typedef typename Base::Ch Ch;
+
+    //! Constructor
+    /*! \param os Output stream.
+        \param allocator User supplied allocator. If it is null, it will create a private one.
+        \param levelDepth Initial capacity of stack.
+    */
+    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
+
+
+    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
+
+    //! Set custom indentation.
+    /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
+        \param indentCharCount  Number of indent characters for each indentation level.
+        \note The default indentation is 4 spaces.
+    */
+    PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
+        CEREAL_RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
+        indentChar_ = indentChar;
+        indentCharCount_ = indentCharCount;
+        return *this;
+    }
+
+    //! Set pretty writer formatting options.
+    /*! \param options Formatting options.
+    */
+    PrettyWriter& SetFormatOptions(PrettyFormatOptions options) {
+        formatOptions_ = options;
+        return *this;
+    }
+
+    /*! @name Implementation of Handler
+        \see Handler
+    */
+    //@{
+
+    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
+    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
+    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
+    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
+    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
+    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
+    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
+
+    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        PrettyPrefix(kNumberType);
+        return Base::WriteString(str, length);
+    }
+
+    bool String(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        PrettyPrefix(kStringType);
+        return Base::WriteString(str, length);
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool String(const std::basic_string<Ch>& str) {
+        return String(str.data(), SizeType(str.size()));
+    }
+#endif
+
+    bool StartObject() {
+        PrettyPrefix(kObjectType);
+        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
+        return Base::WriteStartObject();
+    }
+
+    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool Key(const std::basic_string<Ch>& str) {
+        return Key(str.data(), SizeType(str.size()));
+    }
+#endif
+	
+    bool EndObject(SizeType memberCount = 0) {
+        (void)memberCount;
+        CEREAL_RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
+        CEREAL_RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
+        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
+
+        if (!empty) {
+            Base::os_->Put('\n');
+            WriteIndent();
+        }
+        bool ret = Base::WriteEndObject();
+        (void)ret;
+        CEREAL_RAPIDJSON_ASSERT(ret == true);
+        if (Base::level_stack_.Empty()) // end of json text
+            Base::os_->Flush();
+        return true;
+    }
+
+    bool StartArray() {
+        PrettyPrefix(kArrayType);
+        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
+        return Base::WriteStartArray();
+    }
+
+    bool EndArray(SizeType memberCount = 0) {
+        (void)memberCount;
+        CEREAL_RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
+        CEREAL_RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
+        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
+
+        if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
+            Base::os_->Put('\n');
+            WriteIndent();
+        }
+        bool ret = Base::WriteEndArray();
+        (void)ret;
+        CEREAL_RAPIDJSON_ASSERT(ret == true);
+        if (Base::level_stack_.Empty()) // end of json text
+            Base::os_->Flush();
+        return true;
+    }
+
+    //@}
+
+    /*! @name Convenience extensions */
+    //@{
+
+    //! Simpler but slower overload.
+    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
+    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
+
+    //@}
+
+    //! Write a raw JSON value.
+    /*!
+        For user to write a stringified JSON as a value.
+
+        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
+        \param length Length of the json.
+        \param type Type of the root of json.
+        \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
+    */
+    bool RawValue(const Ch* json, size_t length, Type type) { PrettyPrefix(type); return Base::WriteRawValue(json, length); }
+
+protected:
+    void PrettyPrefix(Type type) {
+        (void)type;
+        if (Base::level_stack_.GetSize() != 0) { // this value is not at root
+            typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
+
+            if (level->inArray) {
+                if (level->valueCount > 0) {
+                    Base::os_->Put(','); // add comma if it is not the first element in array
+                    if (formatOptions_ & kFormatSingleLineArray)
+                        Base::os_->Put(' ');
+                }
+
+                if (!(formatOptions_ & kFormatSingleLineArray)) {
+                    Base::os_->Put('\n');
+                    WriteIndent();
+                }
+            }
+            else {  // in object
+                if (level->valueCount > 0) {
+                    if (level->valueCount % 2 == 0) {
+                        Base::os_->Put(',');
+                        Base::os_->Put('\n');
+                    }
+                    else {
+                        Base::os_->Put(':');
+                        Base::os_->Put(' ');
+                    }
+                }
+                else
+                    Base::os_->Put('\n');
+
+                if (level->valueCount % 2 == 0)
+                    WriteIndent();
+            }
+            if (!level->inArray && level->valueCount % 2 == 0)
+                CEREAL_RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
+            level->valueCount++;
+        }
+        else {
+            CEREAL_RAPIDJSON_ASSERT(!Base::hasRoot_);  // Should only has one and only one root.
+            Base::hasRoot_ = true;
+        }
+    }
+
+    void WriteIndent()  {
+        size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
+        PutN(*Base::os_, static_cast<typename TargetEncoding::Ch>(indentChar_), count);
+    }
+
+    Ch indentChar_;
+    unsigned indentCharCount_;
+    PrettyFormatOptions formatOptions_;
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    PrettyWriter(const PrettyWriter&);
+    PrettyWriter& operator=(const PrettyWriter&);
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h b/Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h
new file mode 100644
index 0000000..b79023c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h
@@ -0,0 +1,615 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
+#define CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
+
+/*!\file rapidjson.h
+    \brief common definitions and configuration
+    
+    \see CEREAL_RAPIDJSON_CONFIG
+ */
+
+/*! \defgroup CEREAL_RAPIDJSON_CONFIG RapidJSON configuration
+    \brief Configuration macros for library features
+
+    Some RapidJSON features are configurable to adapt the library to a wide
+    variety of platforms, environments and usage scenarios.  Most of the
+    features can be configured in terms of overriden or predefined
+    preprocessor macros at compile-time.
+
+    Some additional customization is available in the \ref CEREAL_RAPIDJSON_ERRORS APIs.
+
+    \note These macros should be given on the compiler command-line
+          (where applicable)  to avoid inconsistent values when compiling
+          different translation units of a single application.
+ */
+
+#include <cstdlib>  // malloc(), realloc(), free(), size_t
+#include <cstring>  // memset(), memcpy(), memmove(), memcmp()
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_VERSION_STRING
+//
+// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.
+//
+
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+// token stringification
+#define CEREAL_RAPIDJSON_STRINGIFY(x) CEREAL_RAPIDJSON_DO_STRINGIFY(x)
+#define CEREAL_RAPIDJSON_DO_STRINGIFY(x) #x
+//!@endcond
+
+/*! \def CEREAL_RAPIDJSON_MAJOR_VERSION
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Major version of RapidJSON in integer.
+*/
+/*! \def CEREAL_RAPIDJSON_MINOR_VERSION
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Minor version of RapidJSON in integer.
+*/
+/*! \def CEREAL_RAPIDJSON_PATCH_VERSION
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Patch version of RapidJSON in integer.
+*/
+/*! \def CEREAL_RAPIDJSON_VERSION_STRING
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.
+*/
+#define CEREAL_RAPIDJSON_MAJOR_VERSION 1
+#define CEREAL_RAPIDJSON_MINOR_VERSION 0
+#define CEREAL_RAPIDJSON_PATCH_VERSION 2
+#define CEREAL_RAPIDJSON_VERSION_STRING \
+    CEREAL_RAPIDJSON_STRINGIFY(CEREAL_RAPIDJSON_MAJOR_VERSION.CEREAL_RAPIDJSON_MINOR_VERSION.CEREAL_RAPIDJSON_PATCH_VERSION)
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_NAMESPACE_(BEGIN|END)
+/*! \def CEREAL_RAPIDJSON_NAMESPACE
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief   provide custom rapidjson namespace
+
+    In order to avoid symbol clashes and/or "One Definition Rule" errors
+    between multiple inclusions of (different versions of) RapidJSON in
+    a single binary, users can customize the name of the main RapidJSON
+    namespace.
+
+    In case of a single nesting level, defining \c CEREAL_RAPIDJSON_NAMESPACE
+    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple
+    levels are needed, both \ref CEREAL_RAPIDJSON_NAMESPACE_BEGIN and \ref
+    CEREAL_RAPIDJSON_NAMESPACE_END need to be defined as well:
+
+    \code
+    // in some .cpp file
+    #define CEREAL_RAPIDJSON_NAMESPACE my::rapidjson
+    #define CEREAL_RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {
+    #define CEREAL_RAPIDJSON_NAMESPACE_END   } }
+    #include "rapidjson/..."
+    \endcode
+
+    \see rapidjson
+ */
+/*! \def CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief   provide custom rapidjson namespace (opening expression)
+    \see CEREAL_RAPIDJSON_NAMESPACE
+*/
+/*! \def CEREAL_RAPIDJSON_NAMESPACE_END
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief   provide custom rapidjson namespace (closing expression)
+    \see CEREAL_RAPIDJSON_NAMESPACE
+*/
+#ifndef CEREAL_RAPIDJSON_NAMESPACE
+#define CEREAL_RAPIDJSON_NAMESPACE rapidjson
+#endif
+#ifndef CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+#define CEREAL_RAPIDJSON_NAMESPACE_BEGIN namespace CEREAL_RAPIDJSON_NAMESPACE {
+#endif
+#ifndef CEREAL_RAPIDJSON_NAMESPACE_END
+#define CEREAL_RAPIDJSON_NAMESPACE_END }
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_HAS_STDSTRING
+
+#ifndef CEREAL_RAPIDJSON_HAS_STDSTRING
+#ifdef CEREAL_RAPIDJSON_DOXYGEN_RUNNING
+#define CEREAL_RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
+#else
+#define CEREAL_RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
+#endif
+/*! \def CEREAL_RAPIDJSON_HAS_STDSTRING
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Enable RapidJSON support for \c std::string
+
+    By defining this preprocessor symbol to \c 1, several convenience functions for using
+    \ref rapidjson::GenericValue with \c std::string are enabled, especially
+    for construction and comparison.
+
+    \hideinitializer
+*/
+#endif // !defined(CEREAL_RAPIDJSON_HAS_STDSTRING)
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+#include <string>
+#endif // CEREAL_RAPIDJSON_HAS_STDSTRING
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_NO_INT64DEFINE
+
+/*! \def CEREAL_RAPIDJSON_NO_INT64DEFINE
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Use external 64-bit integer types.
+
+    RapidJSON requires the 64-bit integer types \c int64_t and  \c uint64_t types
+    to be available at global scope.
+
+    If users have their own definition, define CEREAL_RAPIDJSON_NO_INT64DEFINE to
+    prevent RapidJSON from defining its own types.
+*/
+#ifndef CEREAL_RAPIDJSON_NO_INT64DEFINE
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
+#include "msinttypes/stdint.h"
+#include "msinttypes/inttypes.h"
+#else
+// Other compilers should have this.
+#include <stdint.h>
+#include <inttypes.h>
+#endif
+//!@endcond
+#ifdef CEREAL_RAPIDJSON_DOXYGEN_RUNNING
+#define CEREAL_RAPIDJSON_NO_INT64DEFINE
+#endif
+#endif // CEREAL_RAPIDJSON_NO_INT64TYPEDEF
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_FORCEINLINE
+
+#ifndef CEREAL_RAPIDJSON_FORCEINLINE
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#if defined(_MSC_VER) && defined(NDEBUG)
+#define CEREAL_RAPIDJSON_FORCEINLINE __forceinline
+#elif defined(__GNUC__) && __GNUC__ >= 4 && defined(NDEBUG)
+#define CEREAL_RAPIDJSON_FORCEINLINE __attribute__((always_inline))
+#else
+#define CEREAL_RAPIDJSON_FORCEINLINE
+#endif
+//!@endcond
+#endif // CEREAL_RAPIDJSON_FORCEINLINE
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_ENDIAN
+#define CEREAL_RAPIDJSON_LITTLEENDIAN  0   //!< Little endian machine
+#define CEREAL_RAPIDJSON_BIGENDIAN     1   //!< Big endian machine
+
+//! Endianness of the machine.
+/*!
+    \def CEREAL_RAPIDJSON_ENDIAN
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+
+    GCC 4.6 provided macro for detecting endianness of the target machine. But other
+    compilers may not have this. User can define CEREAL_RAPIDJSON_ENDIAN to either
+    \ref CEREAL_RAPIDJSON_LITTLEENDIAN or \ref CEREAL_RAPIDJSON_BIGENDIAN.
+
+    Default detection implemented with reference to
+    \li https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
+    \li http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
+*/
+#ifndef CEREAL_RAPIDJSON_ENDIAN
+// Detect with GCC 4.6's macro
+#  ifdef __BYTE_ORDER__
+#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
+#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
+#    else
+#      error Unknown machine endianess detected. User needs to define CEREAL_RAPIDJSON_ENDIAN.
+#    endif // __BYTE_ORDER__
+// Detect with GLIBC's endian.h
+#  elif defined(__GLIBC__)
+#    include <endian.h>
+#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
+#    elif (__BYTE_ORDER == __BIG_ENDIAN)
+#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
+#    else
+#      error Unknown machine endianess detected. User needs to define CEREAL_RAPIDJSON_ENDIAN.
+#   endif // __GLIBC__
+// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
+#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
+#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
+#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
+#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
+// Detect with architecture macros
+#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
+#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
+#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
+#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
+#  elif defined(_MSC_VER) && defined(_M_ARM)
+#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
+#  elif defined(CEREAL_RAPIDJSON_DOXYGEN_RUNNING)
+#    define CEREAL_RAPIDJSON_ENDIAN
+#  else
+#    error Unknown machine endianess detected. User needs to define CEREAL_RAPIDJSON_ENDIAN.   
+#  endif
+#endif // CEREAL_RAPIDJSON_ENDIAN
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_64BIT
+
+//! Whether using 64-bit architecture
+#ifndef CEREAL_RAPIDJSON_64BIT
+#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
+#define CEREAL_RAPIDJSON_64BIT 1
+#else
+#define CEREAL_RAPIDJSON_64BIT 0
+#endif
+#endif // CEREAL_RAPIDJSON_64BIT
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_ALIGN
+
+//! Data alignment of the machine.
+/*! \ingroup CEREAL_RAPIDJSON_CONFIG
+    \param x pointer to align
+
+    Some machines require strict data alignment. Currently the default uses 4 bytes
+    alignment on 32-bit platforms and 8 bytes alignment for 64-bit platforms.
+    User can customize by defining the CEREAL_RAPIDJSON_ALIGN function macro.
+*/
+#ifndef CEREAL_RAPIDJSON_ALIGN
+#if CEREAL_RAPIDJSON_64BIT == 1
+#define CEREAL_RAPIDJSON_ALIGN(x) (((x) + static_cast<uint64_t>(7u)) & ~static_cast<uint64_t>(7u))
+#else
+#define CEREAL_RAPIDJSON_ALIGN(x) (((x) + 3u) & ~3u)
+#endif
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_UINT64_C2
+
+//! Construct a 64-bit literal by a pair of 32-bit integer.
+/*!
+    64-bit literal with or without ULL suffix is prone to compiler warnings.
+    UINT64_C() is C macro which cause compilation problems.
+    Use this macro to define 64-bit constants by a pair of 32-bit integer.
+*/
+#ifndef CEREAL_RAPIDJSON_UINT64_C2
+#define CEREAL_RAPIDJSON_UINT64_C2(high32, low32) ((static_cast<uint64_t>(high32) << 32) | static_cast<uint64_t>(low32))
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+//! Use only lower 48-bit address for some pointers.
+/*!
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+
+    This optimization uses the fact that current X86-64 architecture only implement lower 48-bit virtual address.
+    The higher 16-bit can be used for storing other data.
+    \c GenericValue uses this optimization to reduce its size form 24 bytes to 16 bytes in 64-bit architecture.
+*/
+#ifndef CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+#define CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION 1
+#else
+#define CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
+#endif
+#endif // CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+#if CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION == 1
+#if CEREAL_RAPIDJSON_64BIT != 1
+#error CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION can only be set to 1 when CEREAL_RAPIDJSON_64BIT=1
+#endif
+#define CEREAL_RAPIDJSON_SETPOINTER(type, p, x) (p = reinterpret_cast<type *>((reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(CEREAL_RAPIDJSON_UINT64_C2(0xFFFF0000, 0x00000000))) | reinterpret_cast<uintptr_t>(reinterpret_cast<const void*>(x))))
+#define CEREAL_RAPIDJSON_GETPOINTER(type, p) (reinterpret_cast<type *>(reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(CEREAL_RAPIDJSON_UINT64_C2(0x0000FFFF, 0xFFFFFFFF))))
+#else
+#define CEREAL_RAPIDJSON_SETPOINTER(type, p, x) (p = (x))
+#define CEREAL_RAPIDJSON_GETPOINTER(type, p) (p)
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_SSE2/CEREAL_RAPIDJSON_SSE42/CEREAL_RAPIDJSON_SIMD
+
+/*! \def CEREAL_RAPIDJSON_SIMD
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief Enable SSE2/SSE4.2 optimization.
+
+    RapidJSON supports optimized implementations for some parsing operations
+    based on the SSE2 or SSE4.2 SIMD extensions on modern Intel-compatible
+    processors.
+
+    To enable these optimizations, two different symbols can be defined;
+    \code
+    // Enable SSE2 optimization.
+    #define CEREAL_RAPIDJSON_SSE2
+
+    // Enable SSE4.2 optimization.
+    #define CEREAL_RAPIDJSON_SSE42
+    \endcode
+
+    \c CEREAL_RAPIDJSON_SSE42 takes precedence, if both are defined.
+
+    If any of these symbols is defined, RapidJSON defines the macro
+    \c CEREAL_RAPIDJSON_SIMD to indicate the availability of the optimized code.
+*/
+#if defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42) \
+    || defined(CEREAL_RAPIDJSON_DOXYGEN_RUNNING)
+#define CEREAL_RAPIDJSON_SIMD
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
+
+#ifndef CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
+/*! \def CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief User-provided \c SizeType definition.
+
+    In order to avoid using 32-bit size types for indexing strings and arrays,
+    define this preprocessor symbol and provide the type rapidjson::SizeType
+    before including RapidJSON:
+    \code
+    #define CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
+    namespace rapidjson { typedef ::std::size_t SizeType; }
+    #include "rapidjson/..."
+    \endcode
+
+    \see rapidjson::SizeType
+*/
+#ifdef CEREAL_RAPIDJSON_DOXYGEN_RUNNING
+#define CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
+#endif
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+//! Size type (for string lengths, array sizes, etc.)
+/*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,
+    instead of using \c size_t. Users may override the SizeType by defining
+    \ref CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE.
+*/
+typedef unsigned SizeType;
+CEREAL_RAPIDJSON_NAMESPACE_END
+#endif
+
+// always import std::size_t to rapidjson namespace
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+using std::size_t;
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_ASSERT
+
+//! Assertion.
+/*! \ingroup CEREAL_RAPIDJSON_CONFIG
+    By default, rapidjson uses C \c assert() for internal assertions.
+    User can override it by defining CEREAL_RAPIDJSON_ASSERT(x) macro.
+
+    \note Parsing errors are handled and can be customized by the
+          \ref CEREAL_RAPIDJSON_ERRORS APIs.
+*/
+#ifndef CEREAL_RAPIDJSON_ASSERT
+#include <cassert>
+#define CEREAL_RAPIDJSON_ASSERT(x) assert(x)
+#endif // CEREAL_RAPIDJSON_ASSERT
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_STATIC_ASSERT
+
+// Adopt from boost
+#ifndef CEREAL_RAPIDJSON_STATIC_ASSERT
+#ifndef __clang__
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#endif
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+template <bool x> struct STATIC_ASSERTION_FAILURE;
+template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
+template<int x> struct StaticAssertTest {};
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#define CEREAL_RAPIDJSON_JOIN(X, Y) CEREAL_RAPIDJSON_DO_JOIN(X, Y)
+#define CEREAL_RAPIDJSON_DO_JOIN(X, Y) CEREAL_RAPIDJSON_DO_JOIN2(X, Y)
+#define CEREAL_RAPIDJSON_DO_JOIN2(X, Y) X##Y
+
+#if defined(__GNUC__)
+#define CEREAL_RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
+#else
+#define CEREAL_RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
+#endif
+#ifndef __clang__
+//!@endcond
+#endif
+
+/*! \def CEREAL_RAPIDJSON_STATIC_ASSERT
+    \brief (Internal) macro to check for conditions at compile-time
+    \param x compile-time condition
+    \hideinitializer
+ */
+#define CEREAL_RAPIDJSON_STATIC_ASSERT(x) \
+    typedef ::CEREAL_RAPIDJSON_NAMESPACE::StaticAssertTest< \
+      sizeof(::CEREAL_RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
+    CEREAL_RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) CEREAL_RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_LIKELY, CEREAL_RAPIDJSON_UNLIKELY
+
+//! Compiler branching hint for expression with high probability to be true.
+/*!
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \param x Boolean expression likely to be true.
+*/
+#ifndef CEREAL_RAPIDJSON_LIKELY
+#if defined(__GNUC__) || defined(__clang__)
+#define CEREAL_RAPIDJSON_LIKELY(x) __builtin_expect(!!(x), 1)
+#else
+#define CEREAL_RAPIDJSON_LIKELY(x) (x)
+#endif
+#endif
+
+//! Compiler branching hint for expression with low probability to be true.
+/*!
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \param x Boolean expression unlikely to be true.
+*/
+#ifndef CEREAL_RAPIDJSON_UNLIKELY
+#if defined(__GNUC__) || defined(__clang__)
+#define CEREAL_RAPIDJSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+#define CEREAL_RAPIDJSON_UNLIKELY(x) (x)
+#endif
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Helpers
+
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+
+#define CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN do {  
+#define CEREAL_RAPIDJSON_MULTILINEMACRO_END \
+} while((void)0, 0)
+
+// adopted from Boost
+#define CEREAL_RAPIDJSON_VERSION_CODE(x,y,z) \
+  (((x)*100000) + ((y)*100) + (z))
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_DIAG_PUSH/POP, CEREAL_RAPIDJSON_DIAG_OFF
+
+#if defined(__GNUC__)
+#define CEREAL_RAPIDJSON_GNUC \
+    CEREAL_RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__)
+#endif
+
+#if defined(__clang__) || (defined(CEREAL_RAPIDJSON_GNUC) && CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,2,0))
+
+#define CEREAL_RAPIDJSON_PRAGMA(x) _Pragma(CEREAL_RAPIDJSON_STRINGIFY(x))
+#define CEREAL_RAPIDJSON_DIAG_PRAGMA(x) CEREAL_RAPIDJSON_PRAGMA(GCC diagnostic x)
+#define CEREAL_RAPIDJSON_DIAG_OFF(x) \
+    CEREAL_RAPIDJSON_DIAG_PRAGMA(ignored CEREAL_RAPIDJSON_STRINGIFY(CEREAL_RAPIDJSON_JOIN(-W,x)))
+
+// push/pop support in Clang and GCC>=4.6
+#if defined(__clang__) || (defined(CEREAL_RAPIDJSON_GNUC) && CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,6,0))
+#define CEREAL_RAPIDJSON_DIAG_PUSH CEREAL_RAPIDJSON_DIAG_PRAGMA(push)
+#define CEREAL_RAPIDJSON_DIAG_POP  CEREAL_RAPIDJSON_DIAG_PRAGMA(pop)
+#else // GCC >= 4.2, < 4.6
+#define CEREAL_RAPIDJSON_DIAG_PUSH /* ignored */
+#define CEREAL_RAPIDJSON_DIAG_POP /* ignored */
+#endif
+
+#elif defined(_MSC_VER)
+
+// pragma (MSVC specific)
+#define CEREAL_RAPIDJSON_PRAGMA(x) __pragma(x)
+#define CEREAL_RAPIDJSON_DIAG_PRAGMA(x) CEREAL_RAPIDJSON_PRAGMA(warning(x))
+
+#define CEREAL_RAPIDJSON_DIAG_OFF(x) CEREAL_RAPIDJSON_DIAG_PRAGMA(disable: x)
+#define CEREAL_RAPIDJSON_DIAG_PUSH CEREAL_RAPIDJSON_DIAG_PRAGMA(push)
+#define CEREAL_RAPIDJSON_DIAG_POP  CEREAL_RAPIDJSON_DIAG_PRAGMA(pop)
+
+#else
+
+#define CEREAL_RAPIDJSON_DIAG_OFF(x) /* ignored */
+#define CEREAL_RAPIDJSON_DIAG_PUSH   /* ignored */
+#define CEREAL_RAPIDJSON_DIAG_POP    /* ignored */
+
+#endif // CEREAL_RAPIDJSON_DIAG_*
+
+///////////////////////////////////////////////////////////////////////////////
+// C++11 features
+
+#ifndef CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#if defined(__clang__)
+#if __has_feature(cxx_rvalue_references) && \
+    (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
+#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
+#else
+#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
+#endif
+#elif (defined(CEREAL_RAPIDJSON_GNUC) && (CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+      (defined(_MSC_VER) && _MSC_VER >= 1600)
+
+#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
+#else
+#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
+#endif
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+
+#ifndef CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT
+#if defined(__clang__)
+#define CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
+#elif (defined(CEREAL_RAPIDJSON_GNUC) && (CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
+//    (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
+#define CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT 1
+#else
+#define CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT 0
+#endif
+#endif
+#if CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT
+#define CEREAL_RAPIDJSON_NOEXCEPT noexcept
+#else
+#define CEREAL_RAPIDJSON_NOEXCEPT /* noexcept */
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT
+
+// no automatic detection, yet
+#ifndef CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
+#define CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS 0
+#endif
+
+#ifndef CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
+#if defined(__clang__)
+#define CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR __has_feature(cxx_range_for)
+#elif (defined(CEREAL_RAPIDJSON_GNUC) && (CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+      (defined(_MSC_VER) && _MSC_VER >= 1700)
+#define CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR 1
+#else
+#define CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR 0
+#endif
+#endif // CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
+
+//!@endcond
+
+///////////////////////////////////////////////////////////////////////////////
+// new/delete
+
+#ifndef CEREAL_RAPIDJSON_NEW
+///! customization point for global \c new
+#define CEREAL_RAPIDJSON_NEW(x) new x
+#endif
+#ifndef CEREAL_RAPIDJSON_DELETE
+///! customization point for global \c delete
+#define CEREAL_RAPIDJSON_DELETE(x) delete x
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+// Type
+
+/*! \namespace rapidjson
+    \brief main RapidJSON namespace
+    \see CEREAL_RAPIDJSON_NAMESPACE
+*/
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Type of JSON value
+enum Type {
+    kNullType = 0,      //!< null
+    kFalseType = 1,     //!< false
+    kTrueType = 2,      //!< true
+    kObjectType = 3,    //!< object
+    kArrayType = 4,     //!< array 
+    kStringType = 5,    //!< string
+    kNumberType = 6     //!< number
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/reader.h b/Src/External/cereal/include/cereal/external/rapidjson/reader.h
new file mode 100644
index 0000000..ad8ff33
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/reader.h
@@ -0,0 +1,1879 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+//
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_READER_H_
+#define CEREAL_RAPIDJSON_READER_H_
+
+/*! \file reader.h */
+
+#include "allocators.h"
+#include "stream.h"
+#include "encodedstream.h"
+#include "internal/meta.h"
+#include "internal/stack.h"
+#include "internal/strtod.h"
+#include <limits>
+
+#if defined(CEREAL_RAPIDJSON_SIMD) && defined(_MSC_VER)
+#include <intrin.h>
+#pragma intrinsic(_BitScanForward)
+#endif
+#ifdef CEREAL_RAPIDJSON_SSE42
+#include <nmmintrin.h>
+#elif defined(CEREAL_RAPIDJSON_SSE2)
+#include <emmintrin.h>
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
+CEREAL_RAPIDJSON_DIAG_OFF(4702)  // unreachable code
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(old-style-cast)
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
+#endif
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#define CEREAL_RAPIDJSON_NOTHING /* deliberately empty */
+#ifndef CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN
+#define CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(value) \
+    CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN \
+    if (CEREAL_RAPIDJSON_UNLIKELY(HasParseError())) { return value; } \
+    CEREAL_RAPIDJSON_MULTILINEMACRO_END
+#endif
+#define CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID \
+    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(CEREAL_RAPIDJSON_NOTHING)
+//!@endcond
+
+/*! \def CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN
+    \ingroup CEREAL_RAPIDJSON_ERRORS
+    \brief Macro to indicate a parse error.
+    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
+    \param offset  position of the error in JSON input (\c size_t)
+
+    This macros can be used as a customization point for the internal
+    error handling mechanism of RapidJSON.
+
+    A common usage model is to throw an exception instead of requiring the
+    caller to explicitly check the \ref rapidjson::GenericReader::Parse's
+    return value:
+
+    \code
+    #define CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode,offset) \
+       throw ParseException(parseErrorCode, #parseErrorCode, offset)
+
+    #include <stdexcept>               // std::runtime_error
+    #include "rapidjson/error/error.h" // rapidjson::ParseResult
+
+    struct ParseException : std::runtime_error, rapidjson::ParseResult {
+      ParseException(rapidjson::ParseErrorCode code, const char* msg, size_t offset)
+        : std::runtime_error(msg), ParseResult(code, offset) {}
+    };
+
+    #include "rapidjson/reader.h"
+    \endcode
+
+    \see CEREAL_RAPIDJSON_PARSE_ERROR, rapidjson::GenericReader::Parse
+ */
+#ifndef CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN
+#define CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset) \
+    CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN \
+    CEREAL_RAPIDJSON_ASSERT(!HasParseError()); /* Error can only be assigned once */ \
+    SetParseError(parseErrorCode, offset); \
+    CEREAL_RAPIDJSON_MULTILINEMACRO_END
+#endif
+
+/*! \def CEREAL_RAPIDJSON_PARSE_ERROR
+    \ingroup CEREAL_RAPIDJSON_ERRORS
+    \brief (Internal) macro to indicate and handle a parse error.
+    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
+    \param offset  position of the error in JSON input (\c size_t)
+
+    Invokes CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN and stops the parsing.
+
+    \see CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN
+    \hideinitializer
+ */
+#ifndef CEREAL_RAPIDJSON_PARSE_ERROR
+#define CEREAL_RAPIDJSON_PARSE_ERROR(parseErrorCode, offset) \
+    CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN \
+    CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset); \
+    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID; \
+    CEREAL_RAPIDJSON_MULTILINEMACRO_END
+#endif
+
+#include "error/error.h" // ParseErrorCode, ParseResult
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// ParseFlag
+
+/*! \def CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief User-defined kParseDefaultFlags definition.
+
+    User can define this as any \c ParseFlag combinations.
+*/
+#ifndef CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS
+#define CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS kParseNoFlags
+#endif
+
+//! Combination of parseFlags
+/*! \see Reader::Parse, Document::Parse, Document::ParseInsitu, Document::ParseStream
+ */
+enum ParseFlag {
+    kParseNoFlags = 0,              //!< No flags are set.
+    kParseInsituFlag = 1,           //!< In-situ(destructive) parsing.
+    kParseValidateEncodingFlag = 2, //!< Validate encoding of JSON strings.
+    kParseIterativeFlag = 4,        //!< Iterative(constant complexity in terms of function call stack size) parsing.
+    kParseStopWhenDoneFlag = 8,     //!< After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate kParseErrorDocumentRootNotSingular error.
+    kParseFullPrecisionFlag = 16,   //!< Parse number in full precision (but slower).
+    kParseCommentsFlag = 32,        //!< Allow one-line (//) and multi-line (/**/) comments.
+    kParseNumbersAsStringsFlag = 64,    //!< Parse all numbers (ints/doubles) as strings.
+    kParseTrailingCommasFlag = 128, //!< Allow trailing commas at the end of objects and arrays.
+    kParseNanAndInfFlag = 256,      //!< Allow parsing NaN, Inf, Infinity, -Inf and -Infinity as doubles.
+    kParseDefaultFlags = CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Handler
+
+/*! \class rapidjson::Handler
+    \brief Concept for receiving events from GenericReader upon parsing.
+    The functions return true if no error occurs. If they return false,
+    the event publisher should terminate the process.
+\code
+concept Handler {
+    typename Ch;
+
+    bool Null();
+    bool Bool(bool b);
+    bool Int(int i);
+    bool Uint(unsigned i);
+    bool Int64(int64_t i);
+    bool Uint64(uint64_t i);
+    bool Double(double d);
+    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
+    bool RawNumber(const Ch* str, SizeType length, bool copy);
+    bool String(const Ch* str, SizeType length, bool copy);
+    bool StartObject();
+    bool Key(const Ch* str, SizeType length, bool copy);
+    bool EndObject(SizeType memberCount);
+    bool StartArray();
+    bool EndArray(SizeType elementCount);
+};
+\endcode
+*/
+///////////////////////////////////////////////////////////////////////////////
+// BaseReaderHandler
+
+//! Default implementation of Handler.
+/*! This can be used as base class of any reader handler.
+    \note implements Handler concept
+*/
+template<typename Encoding = UTF8<>, typename Derived = void>
+struct BaseReaderHandler {
+    typedef typename Encoding::Ch Ch;
+
+    typedef typename internal::SelectIf<internal::IsSame<Derived, void>, BaseReaderHandler, Derived>::Type Override;
+
+    bool Default() { return true; }
+    bool Null() { return static_cast<Override&>(*this).Default(); }
+    bool Bool(bool) { return static_cast<Override&>(*this).Default(); }
+    bool Int(int) { return static_cast<Override&>(*this).Default(); }
+    bool Uint(unsigned) { return static_cast<Override&>(*this).Default(); }
+    bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
+    bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
+    bool Double(double) { return static_cast<Override&>(*this).Default(); }
+    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
+    bool RawNumber(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
+    bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
+    bool StartObject() { return static_cast<Override&>(*this).Default(); }
+    bool Key(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
+    bool EndObject(SizeType) { return static_cast<Override&>(*this).Default(); }
+    bool StartArray() { return static_cast<Override&>(*this).Default(); }
+    bool EndArray(SizeType) { return static_cast<Override&>(*this).Default(); }
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// StreamLocalCopy
+
+namespace internal {
+
+template<typename Stream, int = StreamTraits<Stream>::copyOptimization>
+class StreamLocalCopy;
+
+//! Do copy optimization.
+template<typename Stream>
+class StreamLocalCopy<Stream, 1> {
+public:
+    StreamLocalCopy(Stream& original) : s(original), original_(original) {}
+    ~StreamLocalCopy() { original_ = s; }
+
+    Stream s;
+
+private:
+    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
+
+    Stream& original_;
+};
+
+//! Keep reference.
+template<typename Stream>
+class StreamLocalCopy<Stream, 0> {
+public:
+    StreamLocalCopy(Stream& original) : s(original) {}
+
+    Stream& s;
+
+private:
+    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
+};
+
+} // namespace internal
+
+///////////////////////////////////////////////////////////////////////////////
+// SkipWhitespace
+
+//! Skip the JSON white spaces in a stream.
+/*! \param is A input stream for skipping white spaces.
+    \note This function has SSE2/SSE4.2 specialization.
+*/
+template<typename InputStream>
+void SkipWhitespace(InputStream& is) {
+    internal::StreamLocalCopy<InputStream> copy(is);
+    InputStream& s(copy.s);
+
+    typename InputStream::Ch c;
+    while ((c = s.Peek()) == ' ' || c == '\n' || c == '\r' || c == '\t')
+        s.Take();
+}
+
+inline const char* SkipWhitespace(const char* p, const char* end) {
+    while (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    return p;
+}
+
+#ifdef CEREAL_RAPIDJSON_SSE42
+//! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
+inline const char *SkipWhitespace_SIMD(const char* p) {
+    // Fast return for single non-whitespace
+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+        ++p;
+    else
+        return p;
+
+    // 16-byte align to the next boundary
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    while (p != nextAligned)
+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+            ++p;
+        else
+            return p;
+
+    // The rest of string using SIMD
+    static const char whitespace[16] = " \n\r\t";
+    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
+
+    for (;; p += 16) {
+        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+        const int r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
+        if (r != 0) {   // some of characters is non-whitespace
+#ifdef _MSC_VER         // Find the index of first non-whitespace
+            unsigned long offset;
+            _BitScanForward(&offset, r);
+            return p + offset;
+#else
+            return p + __builtin_ffs(r) - 1;
+#endif
+        }
+    }
+}
+
+inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
+    // Fast return for single non-whitespace
+    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    else
+        return p;
+
+    // The middle of string using SIMD
+    static const char whitespace[16] = " \n\r\t";
+    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
+
+    for (; p <= end - 16; p += 16) {
+        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
+        const int r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
+        if (r != 0) {   // some of characters is non-whitespace
+#ifdef _MSC_VER         // Find the index of first non-whitespace
+            unsigned long offset;
+            _BitScanForward(&offset, r);
+            return p + offset;
+#else
+            return p + __builtin_ffs(r) - 1;
+#endif
+        }
+    }
+
+    return SkipWhitespace(p, end);
+}
+
+#elif defined(CEREAL_RAPIDJSON_SSE2)
+
+//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
+inline const char *SkipWhitespace_SIMD(const char* p) {
+    // Fast return for single non-whitespace
+    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+        ++p;
+    else
+        return p;
+
+    // 16-byte align to the next boundary
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    while (p != nextAligned)
+        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
+            ++p;
+        else
+            return p;
+
+    // The rest of string
+    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
+    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
+    #undef C16
+
+    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
+    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
+    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
+    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
+
+    for (;; p += 16) {
+        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+        __m128i x = _mm_cmpeq_epi8(s, w0);
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
+        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
+        if (r != 0) {   // some of characters may be non-whitespace
+#ifdef _MSC_VER         // Find the index of first non-whitespace
+            unsigned long offset;
+            _BitScanForward(&offset, r);
+            return p + offset;
+#else
+            return p + __builtin_ffs(r) - 1;
+#endif
+        }
+    }
+}
+
+inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
+    // Fast return for single non-whitespace
+    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
+        ++p;
+    else
+        return p;
+
+    // The rest of string
+    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
+    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
+    #undef C16
+
+    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
+    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
+    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
+    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
+
+    for (; p <= end - 16; p += 16) {
+        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
+        __m128i x = _mm_cmpeq_epi8(s, w0);
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
+        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
+        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
+        if (r != 0) {   // some of characters may be non-whitespace
+#ifdef _MSC_VER         // Find the index of first non-whitespace
+            unsigned long offset;
+            _BitScanForward(&offset, r);
+            return p + offset;
+#else
+            return p + __builtin_ffs(r) - 1;
+#endif
+        }
+    }
+
+    return SkipWhitespace(p, end);
+}
+
+#endif // CEREAL_RAPIDJSON_SSE2
+
+#ifdef CEREAL_RAPIDJSON_SIMD
+//! Template function specialization for InsituStringStream
+template<> inline void SkipWhitespace(InsituStringStream& is) {
+    is.src_ = const_cast<char*>(SkipWhitespace_SIMD(is.src_));
+}
+
+//! Template function specialization for StringStream
+template<> inline void SkipWhitespace(StringStream& is) {
+    is.src_ = SkipWhitespace_SIMD(is.src_);
+}
+
+template<> inline void SkipWhitespace(EncodedInputStream<UTF8<>, MemoryStream>& is) {
+    is.is_.src_ = SkipWhitespace_SIMD(is.is_.src_, is.is_.end_);
+}
+#endif // CEREAL_RAPIDJSON_SIMD
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericReader
+
+//! SAX-style JSON parser. Use \ref Reader for UTF8 encoding and default allocator.
+/*! GenericReader parses JSON text from a stream, and send events synchronously to an
+    object implementing Handler concept.
+
+    It needs to allocate a stack for storing a single decoded string during
+    non-destructive parsing.
+
+    For in-situ parsing, the decoded string is directly written to the source
+    text string, no temporary buffer is required.
+
+    A GenericReader object can be reused for parsing multiple JSON text.
+
+    \tparam SourceEncoding Encoding of the input stream.
+    \tparam TargetEncoding Encoding of the parse output.
+    \tparam StackAllocator Allocator type for stack.
+*/
+template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator = CrtAllocator>
+class GenericReader {
+public:
+    typedef typename SourceEncoding::Ch Ch; //!< SourceEncoding character type
+
+    //! Constructor.
+    /*! \param stackAllocator Optional allocator for allocating stack memory. (Only use for non-destructive parsing)
+        \param stackCapacity stack capacity in bytes for storing a single decoded string.  (Only use for non-destructive parsing)
+    */
+    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) : stack_(stackAllocator, stackCapacity), parseResult_() {}
+
+    //! Parse JSON text.
+    /*! \tparam parseFlags Combination of \ref ParseFlag.
+        \tparam InputStream Type of input stream, implementing Stream concept.
+        \tparam Handler Type of handler, implementing Handler concept.
+        \param is Input stream to be parsed.
+        \param handler The handler to receive events.
+        \return Whether the parsing is successful.
+    */
+    template <unsigned parseFlags, typename InputStream, typename Handler>
+    ParseResult Parse(InputStream& is, Handler& handler) {
+        if (parseFlags & kParseIterativeFlag)
+            return IterativeParse<parseFlags>(is, handler);
+
+        parseResult_.Clear();
+
+        ClearStackOnExit scope(*this);
+
+        SkipWhitespaceAndComments<parseFlags>(is);
+        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+
+        if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() == '\0')) {
+            CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentEmpty, is.Tell());
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+        }
+        else {
+            ParseValue<parseFlags>(is, handler);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+
+            if (!(parseFlags & kParseStopWhenDoneFlag)) {
+                SkipWhitespaceAndComments<parseFlags>(is);
+                CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+
+                if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() != '\0')) {
+                    CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentRootNotSingular, is.Tell());
+                    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+                }
+            }
+        }
+
+        return parseResult_;
+    }
+
+    //! Parse JSON text (with \ref kParseDefaultFlags)
+    /*! \tparam InputStream Type of input stream, implementing Stream concept
+        \tparam Handler Type of handler, implementing Handler concept.
+        \param is Input stream to be parsed.
+        \param handler The handler to receive events.
+        \return Whether the parsing is successful.
+    */
+    template <typename InputStream, typename Handler>
+    ParseResult Parse(InputStream& is, Handler& handler) {
+        return Parse<kParseDefaultFlags>(is, handler);
+    }
+
+    //! Whether a parse error has occured in the last parsing.
+    bool HasParseError() const { return parseResult_.IsError(); }
+
+    //! Get the \ref ParseErrorCode of last parsing.
+    ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); }
+
+    //! Get the position of last parsing error in input, 0 otherwise.
+    size_t GetErrorOffset() const { return parseResult_.Offset(); }
+
+protected:
+    void SetParseError(ParseErrorCode code, size_t offset) { parseResult_.Set(code, offset); }
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    GenericReader(const GenericReader&);
+    GenericReader& operator=(const GenericReader&);
+
+    void ClearStack() { stack_.Clear(); }
+
+    // clear stack on any exit from ParseStream, e.g. due to exception
+    struct ClearStackOnExit {
+        explicit ClearStackOnExit(GenericReader& r) : r_(r) {}
+        ~ClearStackOnExit() { r_.ClearStack(); }
+    private:
+        GenericReader& r_;
+        ClearStackOnExit(const ClearStackOnExit&);
+        ClearStackOnExit& operator=(const ClearStackOnExit&);
+    };
+
+    template<unsigned parseFlags, typename InputStream>
+    void SkipWhitespaceAndComments(InputStream& is) {
+        SkipWhitespace(is);
+
+        if (parseFlags & kParseCommentsFlag) {
+            while (CEREAL_RAPIDJSON_UNLIKELY(Consume(is, '/'))) {
+                if (Consume(is, '*')) {
+                    while (true) {
+                        if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() == '\0'))
+                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
+                        else if (Consume(is, '*')) {
+                            if (Consume(is, '/'))
+                                break;
+                        }
+                        else
+                            is.Take();
+                    }
+                }
+                else if (CEREAL_RAPIDJSON_LIKELY(Consume(is, '/')))
+                    while (is.Peek() != '\0' && is.Take() != '\n');
+                else
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
+
+                SkipWhitespace(is);
+            }
+        }
+    }
+
+    // Parse object: { string : value, ... }
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseObject(InputStream& is, Handler& handler) {
+        CEREAL_RAPIDJSON_ASSERT(is.Peek() == '{');
+        is.Take();  // Skip '{'
+
+        if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartObject()))
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+
+        SkipWhitespaceAndComments<parseFlags>(is);
+        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+        if (Consume(is, '}')) {
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndObject(0)))  // empty object
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+            return;
+        }
+
+        for (SizeType memberCount = 0;;) {
+            if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() != '"'))
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
+
+            ParseString<parseFlags>(is, handler, true);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            SkipWhitespaceAndComments<parseFlags>(is);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            if (CEREAL_RAPIDJSON_UNLIKELY(!Consume(is, ':')))
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
+
+            SkipWhitespaceAndComments<parseFlags>(is);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            ParseValue<parseFlags>(is, handler);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            SkipWhitespaceAndComments<parseFlags>(is);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            ++memberCount;
+
+            switch (is.Peek()) {
+                case ',':
+                    is.Take();
+                    SkipWhitespaceAndComments<parseFlags>(is);
+                    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+                    break;
+                case '}':
+                    is.Take();
+                    if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
+                        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                    return;
+                default:
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); break; // This useless break is only for making warning and coverage happy
+            }
+
+            if (parseFlags & kParseTrailingCommasFlag) {
+                if (is.Peek() == '}') {
+                    if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
+                        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                    is.Take();
+                    return;
+                }
+            }
+        }
+    }
+
+    // Parse array: [ value, ... ]
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseArray(InputStream& is, Handler& handler) {
+        CEREAL_RAPIDJSON_ASSERT(is.Peek() == '[');
+        is.Take();  // Skip '['
+
+        if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartArray()))
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+
+        SkipWhitespaceAndComments<parseFlags>(is);
+        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+        if (Consume(is, ']')) {
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndArray(0))) // empty array
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+            return;
+        }
+
+        for (SizeType elementCount = 0;;) {
+            ParseValue<parseFlags>(is, handler);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            ++elementCount;
+            SkipWhitespaceAndComments<parseFlags>(is);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+
+            if (Consume(is, ',')) {
+                SkipWhitespaceAndComments<parseFlags>(is);
+                CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+            }
+            else if (Consume(is, ']')) {
+                if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                return;
+            }
+            else
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
+
+            if (parseFlags & kParseTrailingCommasFlag) {
+                if (is.Peek() == ']') {
+                    if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
+                        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+                    is.Take();
+                    return;
+                }
+            }
+        }
+    }
+
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseNull(InputStream& is, Handler& handler) {
+        CEREAL_RAPIDJSON_ASSERT(is.Peek() == 'n');
+        is.Take();
+
+        if (CEREAL_RAPIDJSON_LIKELY(Consume(is, 'u') && Consume(is, 'l') && Consume(is, 'l'))) {
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Null()))
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+        }
+        else
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
+    }
+
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseTrue(InputStream& is, Handler& handler) {
+        CEREAL_RAPIDJSON_ASSERT(is.Peek() == 't');
+        is.Take();
+
+        if (CEREAL_RAPIDJSON_LIKELY(Consume(is, 'r') && Consume(is, 'u') && Consume(is, 'e'))) {
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Bool(true)))
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+        }
+        else
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
+    }
+
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseFalse(InputStream& is, Handler& handler) {
+        CEREAL_RAPIDJSON_ASSERT(is.Peek() == 'f');
+        is.Take();
+
+        if (CEREAL_RAPIDJSON_LIKELY(Consume(is, 'a') && Consume(is, 'l') && Consume(is, 's') && Consume(is, 'e'))) {
+            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Bool(false)))
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
+        }
+        else
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
+    }
+
+    template<typename InputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE static bool Consume(InputStream& is, typename InputStream::Ch expect) {
+        if (CEREAL_RAPIDJSON_LIKELY(is.Peek() == expect)) {
+            is.Take();
+            return true;
+        }
+        else
+            return false;
+    }
+
+    // Helper function to parse four hexidecimal digits in \uXXXX in ParseString().
+    template<typename InputStream>
+    unsigned ParseHex4(InputStream& is, size_t escapeOffset) {
+        unsigned codepoint = 0;
+        for (int i = 0; i < 4; i++) {
+            Ch c = is.Peek();
+            codepoint <<= 4;
+            codepoint += static_cast<unsigned>(c);
+            if (c >= '0' && c <= '9')
+                codepoint -= '0';
+            else if (c >= 'A' && c <= 'F')
+                codepoint -= 'A' - 10;
+            else if (c >= 'a' && c <= 'f')
+                codepoint -= 'a' - 10;
+            else {
+                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, escapeOffset);
+                CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(0);
+            }
+            is.Take();
+        }
+        return codepoint;
+    }
+
+    template <typename CharType>
+    class StackStream {
+    public:
+        typedef CharType Ch;
+
+        StackStream(internal::Stack<StackAllocator>& stack) : stack_(stack), length_(0) {}
+        CEREAL_RAPIDJSON_FORCEINLINE void Put(Ch c) {
+            *stack_.template Push<Ch>() = c;
+            ++length_;
+        }
+
+        CEREAL_RAPIDJSON_FORCEINLINE void* Push(SizeType count) {
+            length_ += count;
+            return stack_.template Push<Ch>(count);
+        }
+
+        size_t Length() const { return length_; }
+
+        Ch* Pop() {
+            return stack_.template Pop<Ch>(length_);
+        }
+
+    private:
+        StackStream(const StackStream&);
+        StackStream& operator=(const StackStream&);
+
+        internal::Stack<StackAllocator>& stack_;
+        SizeType length_;
+    };
+
+    // Parse string and generate String event. Different code paths for kParseInsituFlag.
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseString(InputStream& is, Handler& handler, bool isKey = false) {
+        internal::StreamLocalCopy<InputStream> copy(is);
+        InputStream& s(copy.s);
+
+        CEREAL_RAPIDJSON_ASSERT(s.Peek() == '\"');
+        s.Take();  // Skip '\"'
+
+        bool success = false;
+        if (parseFlags & kParseInsituFlag) {
+            typename InputStream::Ch *head = s.PutBegin();
+            ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(s, s);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+            size_t length = s.PutEnd(head) - 1;
+            CEREAL_RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
+            const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
+            success = (isKey ? handler.Key(str, SizeType(length), false) : handler.String(str, SizeType(length), false));
+        }
+        else {
+            StackStream<typename TargetEncoding::Ch> stackStream(stack_);
+            ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(s, stackStream);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+            SizeType length = static_cast<SizeType>(stackStream.Length()) - 1;
+            const typename TargetEncoding::Ch* const str = stackStream.Pop();
+            success = (isKey ? handler.Key(str, length, true) : handler.String(str, length, true));
+        }
+        if (CEREAL_RAPIDJSON_UNLIKELY(!success))
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
+    }
+
+    // Parse string to an output is
+    // This function handles the prefix/suffix double quotes, escaping, and optional encoding validation.
+    template<unsigned parseFlags, typename SEncoding, typename TEncoding, typename InputStream, typename OutputStream>
+    CEREAL_RAPIDJSON_FORCEINLINE void ParseStringToStream(InputStream& is, OutputStream& os) {
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+        static const char escape[256] = {
+            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/',
+            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0,
+            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0,
+            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16
+        };
+#undef Z16
+//!@endcond
+
+        for (;;) {
+            // Scan and copy string before "\\\"" or < 0x20. This is an optional optimzation.
+            if (!(parseFlags & kParseValidateEncodingFlag))
+                ScanCopyUnescapedString(is, os);
+
+            Ch c = is.Peek();
+            if (CEREAL_RAPIDJSON_UNLIKELY(c == '\\')) {    // Escape
+                size_t escapeOffset = is.Tell();    // For invalid escaping, report the inital '\\' as error offset
+                is.Take();
+                Ch e = is.Peek();
+                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && CEREAL_RAPIDJSON_LIKELY(escape[static_cast<unsigned char>(e)])) {
+                    is.Take();
+                    os.Put(static_cast<typename TEncoding::Ch>(escape[static_cast<unsigned char>(e)]));
+                }
+                else if (CEREAL_RAPIDJSON_LIKELY(e == 'u')) {    // Unicode
+                    is.Take();
+                    unsigned codepoint = ParseHex4(is, escapeOffset);
+                    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+                    if (CEREAL_RAPIDJSON_UNLIKELY(codepoint >= 0xD800 && codepoint <= 0xDBFF)) {
+                        // Handle UTF-16 surrogate pair
+                        if (CEREAL_RAPIDJSON_UNLIKELY(!Consume(is, '\\') || !Consume(is, 'u')))
+                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
+                        unsigned codepoint2 = ParseHex4(is, escapeOffset);
+                        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
+                        if (CEREAL_RAPIDJSON_UNLIKELY(codepoint2 < 0xDC00 || codepoint2 > 0xDFFF))
+                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
+                        codepoint = (((codepoint - 0xD800) << 10) | (codepoint2 - 0xDC00)) + 0x10000;
+                    }
+                    TEncoding::Encode(os, codepoint);
+                }
+                else
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, escapeOffset);
+            }
+            else if (CEREAL_RAPIDJSON_UNLIKELY(c == '"')) {    // Closing double quote
+                is.Take();
+                os.Put('\0');   // null-terminate the string
+                return;
+            }
+            else if (CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(c) < 0x20)) { // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
+                if (c == '\0')
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell());
+                else
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell());
+            }
+            else {
+                size_t offset = is.Tell();
+                if (CEREAL_RAPIDJSON_UNLIKELY((parseFlags & kParseValidateEncodingFlag ?
+                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) :
+                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))))
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, offset);
+            }
+        }
+    }
+
+    template<typename InputStream, typename OutputStream>
+    static CEREAL_RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InputStream&, OutputStream&) {
+            // Do nothing for generic version
+    }
+
+#if defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42)
+    // StringStream -> StackStream<char>
+    static CEREAL_RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
+        const char* p = is.src_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        while (p != nextAligned)
+            if (CEREAL_RAPIDJSON_UNLIKELY(*p == '\"') || CEREAL_RAPIDJSON_UNLIKELY(*p == '\\') || CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = p;
+                return;
+            }
+            else
+                os.Put(*p++);
+
+        // The rest of string using SIMD
+        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+        static const char space[16]  = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
+        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+        for (;; p += 16) {
+            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
+            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+            if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+                SizeType length;
+    #ifdef _MSC_VER         // Find the index of first escaped
+                unsigned long offset;
+                _BitScanForward(&offset, r);
+                length = offset;
+    #else
+                length = static_cast<SizeType>(__builtin_ffs(r) - 1);
+    #endif
+                char* q = reinterpret_cast<char*>(os.Push(length));
+                for (size_t i = 0; i < length; i++)
+                    q[i] = p[i];
+
+                p += length;
+                break;
+            }
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(os.Push(16)), s);
+        }
+
+        is.src_ = p;
+    }
+
+    // InsituStringStream -> InsituStringStream
+    static CEREAL_RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
+        CEREAL_RAPIDJSON_ASSERT(&is == &os);
+        (void)os;
+
+        if (is.src_ == is.dst_) {
+            SkipUnescapedString(is);
+            return;
+        }
+
+        char* p = is.src_;
+        char *q = is.dst_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        while (p != nextAligned)
+            if (CEREAL_RAPIDJSON_UNLIKELY(*p == '\"') || CEREAL_RAPIDJSON_UNLIKELY(*p == '\\') || CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = p;
+                is.dst_ = q;
+                return;
+            }
+            else
+                *q++ = *p++;
+
+        // The rest of string using SIMD
+        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+        static const char space[16] = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
+        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+        for (;; p += 16, q += 16) {
+            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
+            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+            if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+                size_t length;
+#ifdef _MSC_VER         // Find the index of first escaped
+                unsigned long offset;
+                _BitScanForward(&offset, r);
+                length = offset;
+#else
+                length = static_cast<size_t>(__builtin_ffs(r) - 1);
+#endif
+                for (const char* pend = p + length; p != pend; )
+                    *q++ = *p++;
+                break;
+            }
+            _mm_storeu_si128(reinterpret_cast<__m128i *>(q), s);
+        }
+
+        is.src_ = p;
+        is.dst_ = q;
+    }
+
+    // When read/write pointers are the same for insitu stream, just skip unescaped characters
+    static CEREAL_RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
+        CEREAL_RAPIDJSON_ASSERT(is.src_ == is.dst_);
+        char* p = is.src_;
+
+        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
+        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+        for (; p != nextAligned; p++)
+            if (CEREAL_RAPIDJSON_UNLIKELY(*p == '\"') || CEREAL_RAPIDJSON_UNLIKELY(*p == '\\') || CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
+                is.src_ = is.dst_ = p;
+                return;
+            }
+
+        // The rest of string using SIMD
+        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+        static const char space[16] = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
+        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+        for (;; p += 16) {
+            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
+            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+            if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+                size_t length;
+#ifdef _MSC_VER         // Find the index of first escaped
+                unsigned long offset;
+                _BitScanForward(&offset, r);
+                length = offset;
+#else
+                length = static_cast<size_t>(__builtin_ffs(r) - 1);
+#endif
+                p += length;
+                break;
+            }
+        }
+
+        is.src_ = is.dst_ = p;
+    }
+#endif
+
+    template<typename InputStream, bool backup, bool pushOnTake>
+    class NumberStream;
+
+    template<typename InputStream>
+    class NumberStream<InputStream, false, false> {
+    public:
+        typedef typename InputStream::Ch Ch;
+
+        NumberStream(GenericReader& reader, InputStream& s) : is(s) { (void)reader;  }
+        ~NumberStream() {}
+
+        CEREAL_RAPIDJSON_FORCEINLINE Ch Peek() const { return is.Peek(); }
+        CEREAL_RAPIDJSON_FORCEINLINE Ch TakePush() { return is.Take(); }
+        CEREAL_RAPIDJSON_FORCEINLINE Ch Take() { return is.Take(); }
+		  CEREAL_RAPIDJSON_FORCEINLINE void Push(char) {}
+
+        size_t Tell() { return is.Tell(); }
+        size_t Length() { return 0; }
+        const char* Pop() { return 0; }
+
+    protected:
+        NumberStream& operator=(const NumberStream&);
+
+        InputStream& is;
+    };
+
+    template<typename InputStream>
+    class NumberStream<InputStream, true, false> : public NumberStream<InputStream, false, false> {
+        typedef NumberStream<InputStream, false, false> Base;
+    public:
+        NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s), stackStream(reader.stack_) {}
+        ~NumberStream() {}
+
+        CEREAL_RAPIDJSON_FORCEINLINE Ch TakePush() {
+            stackStream.Put(static_cast<char>(Base::is.Peek()));
+            return Base::is.Take();
+        }
+
+        CEREAL_RAPIDJSON_FORCEINLINE void Push(char c) {
+            stackStream.Put(c);
+        }
+
+        size_t Length() { return stackStream.Length(); }
+
+        const char* Pop() {
+            stackStream.Put('\0');
+            return stackStream.Pop();
+        }
+
+    private:
+        StackStream<char> stackStream;
+    };
+
+    template<typename InputStream>
+    class NumberStream<InputStream, true, true> : public NumberStream<InputStream, true, false> {
+        typedef NumberStream<InputStream, true, false> Base;
+    public:
+        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
+        ~NumberStream() {}
+
+        CEREAL_RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
+    };
+
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseNumber(InputStream& is, Handler& handler) {
+        internal::StreamLocalCopy<InputStream> copy(is);
+        NumberStream<InputStream,
+            ((parseFlags & kParseNumbersAsStringsFlag) != 0) ?
+                ((parseFlags & kParseInsituFlag) == 0) :
+                ((parseFlags & kParseFullPrecisionFlag) != 0),
+            (parseFlags & kParseNumbersAsStringsFlag) != 0 &&
+                (parseFlags & kParseInsituFlag) == 0> s(*this, copy.s);
+
+        size_t startOffset = s.Tell();
+        double d = 0.0;
+        bool useNanOrInf = false;
+
+        // Parse minus
+        bool minus = Consume(s, '-');
+
+        // Parse int: zero / ( digit1-9 *DIGIT )
+        unsigned i = 0;
+        uint64_t i64 = 0;
+        bool use64bit = false;
+        int significandDigit = 0;
+        if (CEREAL_RAPIDJSON_UNLIKELY(s.Peek() == '0')) {
+            i = 0;
+            s.TakePush();
+        }
+        else if (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '1' && s.Peek() <= '9')) {
+            i = static_cast<unsigned>(s.TakePush() - '0');
+
+            if (minus)
+                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (CEREAL_RAPIDJSON_UNLIKELY(i >= 214748364)) { // 2^31 = 2147483648
+                        if (CEREAL_RAPIDJSON_LIKELY(i != 214748364 || s.Peek() > '8')) {
+                            i64 = i;
+                            use64bit = true;
+                            break;
+                        }
+                    }
+                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
+                    significandDigit++;
+                }
+            else
+                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (CEREAL_RAPIDJSON_UNLIKELY(i >= 429496729)) { // 2^32 - 1 = 4294967295
+                        if (CEREAL_RAPIDJSON_LIKELY(i != 429496729 || s.Peek() > '5')) {
+                            i64 = i;
+                            use64bit = true;
+                            break;
+                        }
+                    }
+                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
+                    significandDigit++;
+                }
+        }
+        // Parse NaN or Infinity here
+        else if ((parseFlags & kParseNanAndInfFlag) && CEREAL_RAPIDJSON_LIKELY((s.Peek() == 'I' || s.Peek() == 'N'))) {
+            useNanOrInf = true;
+            if (CEREAL_RAPIDJSON_LIKELY(Consume(s, 'N') && Consume(s, 'a') && Consume(s, 'N'))) {
+                d = std::numeric_limits<double>::quiet_NaN();
+            }
+            else if (CEREAL_RAPIDJSON_LIKELY(Consume(s, 'I') && Consume(s, 'n') && Consume(s, 'f'))) {
+                d = (minus ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
+                if (CEREAL_RAPIDJSON_UNLIKELY(s.Peek() == 'i' && !(Consume(s, 'i') && Consume(s, 'n')
+                                                            && Consume(s, 'i') && Consume(s, 't') && Consume(s, 'y'))))
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
+            }
+            else
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
+        }
+        else
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
+
+        // Parse 64bit int
+        bool useDouble = false;
+        if (use64bit) {
+            if (minus)
+                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                     if (CEREAL_RAPIDJSON_UNLIKELY(i64 >= CEREAL_RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC))) // 2^63 = 9223372036854775808
+                        if (CEREAL_RAPIDJSON_LIKELY(i64 != CEREAL_RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8')) {
+                            d = static_cast<double>(i64);
+                            useDouble = true;
+                            break;
+                        }
+                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
+                    significandDigit++;
+                }
+            else
+                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (CEREAL_RAPIDJSON_UNLIKELY(i64 >= CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999))) // 2^64 - 1 = 18446744073709551615
+                        if (CEREAL_RAPIDJSON_LIKELY(i64 != CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5')) {
+                            d = static_cast<double>(i64);
+                            useDouble = true;
+                            break;
+                        }
+                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
+                    significandDigit++;
+                }
+        }
+
+        // Force double for big integer
+        if (useDouble) {
+            while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                if (CEREAL_RAPIDJSON_UNLIKELY(d >= 1.7976931348623157e307)) // DBL_MAX / 10.0
+                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
+                d = d * 10 + (s.TakePush() - '0');
+            }
+        }
+
+        // Parse frac = decimal-point 1*DIGIT
+        int expFrac = 0;
+        size_t decimalPosition;
+        if (Consume(s, '.')) {
+            decimalPosition = s.Length();
+
+            if (CEREAL_RAPIDJSON_UNLIKELY(!(s.Peek() >= '0' && s.Peek() <= '9')))
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, s.Tell());
+
+            if (!useDouble) {
+#if CEREAL_RAPIDJSON_64BIT
+                // Use i64 to store significand in 64-bit architecture
+                if (!use64bit)
+                    i64 = i;
+
+                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                    if (i64 > CEREAL_RAPIDJSON_UINT64_C2(0x1FFFFF, 0xFFFFFFFF)) // 2^53 - 1 for fast path
+                        break;
+                    else {
+                        i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
+                        --expFrac;
+                        if (i64 != 0)
+                            significandDigit++;
+                    }
+                }
+
+                d = static_cast<double>(i64);
+#else
+                // Use double to store significand in 32-bit architecture
+                d = static_cast<double>(use64bit ? i64 : i);
+#endif
+                useDouble = true;
+            }
+
+            while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                if (significandDigit < 17) {
+                    d = d * 10.0 + (s.TakePush() - '0');
+                    --expFrac;
+                    if (CEREAL_RAPIDJSON_LIKELY(d > 0.0))
+                        significandDigit++;
+                }
+                else
+                    s.TakePush();
+            }
+        }
+        else
+            decimalPosition = s.Length(); // decimal position at the end of integer.
+
+        // Parse exp = e [ minus / plus ] 1*DIGIT
+        int exp = 0;
+        if (Consume(s, 'e') || Consume(s, 'E')) {
+            if (!useDouble) {
+                d = static_cast<double>(use64bit ? i64 : i);
+                useDouble = true;
+            }
+
+            bool expMinus = false;
+            if (Consume(s, '+'))
+                ;
+            else if (Consume(s, '-'))
+                expMinus = true;
+
+            if (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                exp = static_cast<int>(s.Take() - '0');
+                if (expMinus) {
+                    while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
+                        if (exp >= 214748364) {                         // Issue #313: prevent overflow exponent
+                            while (CEREAL_RAPIDJSON_UNLIKELY(s.Peek() >= '0' && s.Peek() <= '9'))  // Consume the rest of exponent
+                                s.Take();
+                        }
+                    }
+                }
+                else {  // positive exp
+                    int maxExp = 308 - expFrac;
+                    while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
+                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
+                        if (CEREAL_RAPIDJSON_UNLIKELY(exp > maxExp))
+                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
+                    }
+                }
+            }
+            else
+                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissExponent, s.Tell());
+
+            if (expMinus)
+                exp = -exp;
+        }
+
+        // Finish parsing, call event according to the type of number.
+        bool cont = true;
+
+        if (parseFlags & kParseNumbersAsStringsFlag) {
+            if (parseFlags & kParseInsituFlag) {
+                s.Pop();  // Pop stack no matter if it will be used or not.
+                typename InputStream::Ch* head = is.PutBegin();
+                const size_t length = s.Tell() - startOffset;
+                CEREAL_RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
+                // unable to insert the \0 character here, it will erase the comma after this number
+                const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
+                cont = handler.RawNumber(str, SizeType(length), false);
+            }
+            else {
+                SizeType numCharsToCopy = static_cast<SizeType>(s.Length());
+                StringStream srcStream(s.Pop());
+                StackStream<typename TargetEncoding::Ch> dstStream(stack_);
+                while (numCharsToCopy--) {
+                    Transcoder<UTF8<>, TargetEncoding>::Transcode(srcStream, dstStream);
+                }
+                dstStream.Put('\0');
+                const typename TargetEncoding::Ch* str = dstStream.Pop();
+                const SizeType length = static_cast<SizeType>(dstStream.Length()) - 1;
+                cont = handler.RawNumber(str, SizeType(length), true);
+            }
+        }
+        else {
+           size_t length = s.Length();
+           const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
+
+           if (useDouble) {
+               int p = exp + expFrac;
+               if (parseFlags & kParseFullPrecisionFlag)
+                   d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
+               else
+                   d = internal::StrtodNormalPrecision(d, p);
+
+               cont = handler.Double(minus ? -d : d);
+           }
+           else if (useNanOrInf) {
+               cont = handler.Double(d);
+           }
+           else {
+               if (use64bit) {
+                   if (minus)
+                       cont = handler.Int64(static_cast<int64_t>(~i64 + 1));
+                   else
+                       cont = handler.Uint64(i64);
+               }
+               else {
+                   if (minus)
+                       cont = handler.Int(static_cast<int32_t>(~i + 1));
+                   else
+                       cont = handler.Uint(i);
+               }
+           }
+        }
+        if (CEREAL_RAPIDJSON_UNLIKELY(!cont))
+            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, startOffset);
+    }
+
+    // Parse any JSON value
+    template<unsigned parseFlags, typename InputStream, typename Handler>
+    void ParseValue(InputStream& is, Handler& handler) {
+        switch (is.Peek()) {
+            case 'n': ParseNull  <parseFlags>(is, handler); break;
+            case 't': ParseTrue  <parseFlags>(is, handler); break;
+            case 'f': ParseFalse <parseFlags>(is, handler); break;
+            case '"': ParseString<parseFlags>(is, handler); break;
+            case '{': ParseObject<parseFlags>(is, handler); break;
+            case '[': ParseArray <parseFlags>(is, handler); break;
+            default :
+                      ParseNumber<parseFlags>(is, handler);
+                      break;
+
+        }
+    }
+
+    // Iterative Parsing
+
+    // States
+    enum IterativeParsingState {
+        IterativeParsingStartState = 0,
+        IterativeParsingFinishState,
+        IterativeParsingErrorState,
+
+        // Object states
+        IterativeParsingObjectInitialState,
+        IterativeParsingMemberKeyState,
+        IterativeParsingKeyValueDelimiterState,
+        IterativeParsingMemberValueState,
+        IterativeParsingMemberDelimiterState,
+        IterativeParsingObjectFinishState,
+
+        // Array states
+        IterativeParsingArrayInitialState,
+        IterativeParsingElementState,
+        IterativeParsingElementDelimiterState,
+        IterativeParsingArrayFinishState,
+
+        // Single value state
+        IterativeParsingValueState
+    };
+
+    enum { cIterativeParsingStateCount = IterativeParsingValueState + 1 };
+
+    // Tokens
+    enum Token {
+        LeftBracketToken = 0,
+        RightBracketToken,
+
+        LeftCurlyBracketToken,
+        RightCurlyBracketToken,
+
+        CommaToken,
+        ColonToken,
+
+        StringToken,
+        FalseToken,
+        TrueToken,
+        NullToken,
+        NumberToken,
+
+        kTokenCount
+    };
+
+    CEREAL_RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) {
+
+//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
+#define N NumberToken
+#define N16 N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N
+        // Maps from ASCII to Token
+        static const unsigned char tokenMap[256] = {
+            N16, // 00~0F
+            N16, // 10~1F
+            N, N, StringToken, N, N, N, N, N, N, N, N, N, CommaToken, N, N, N, // 20~2F
+            N, N, N, N, N, N, N, N, N, N, ColonToken, N, N, N, N, N, // 30~3F
+            N16, // 40~4F
+            N, N, N, N, N, N, N, N, N, N, N, LeftBracketToken, N, RightBracketToken, N, N, // 50~5F
+            N, N, N, N, N, N, FalseToken, N, N, N, N, N, N, N, NullToken, N, // 60~6F
+            N, N, N, N, TrueToken, N, N, N, N, N, N, LeftCurlyBracketToken, N, RightCurlyBracketToken, N, N, // 70~7F
+            N16, N16, N16, N16, N16, N16, N16, N16 // 80~FF
+        };
+#undef N
+#undef N16
+//!@endcond
+
+        if (sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256)
+            return static_cast<Token>(tokenMap[static_cast<unsigned char>(c)]);
+        else
+            return NumberToken;
+    }
+
+    CEREAL_RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) {
+        // current state x one lookahead token -> new state
+        static const char G[cIterativeParsingStateCount][kTokenCount] = {
+            // Start
+            {
+                IterativeParsingArrayInitialState,  // Left bracket
+                IterativeParsingErrorState,         // Right bracket
+                IterativeParsingObjectInitialState, // Left curly bracket
+                IterativeParsingErrorState,         // Right curly bracket
+                IterativeParsingErrorState,         // Comma
+                IterativeParsingErrorState,         // Colon
+                IterativeParsingValueState,         // String
+                IterativeParsingValueState,         // False
+                IterativeParsingValueState,         // True
+                IterativeParsingValueState,         // Null
+                IterativeParsingValueState          // Number
+            },
+            // Finish(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
+            // Error(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
+            // ObjectInitial
+            {
+                IterativeParsingErrorState,         // Left bracket
+                IterativeParsingErrorState,         // Right bracket
+                IterativeParsingErrorState,         // Left curly bracket
+                IterativeParsingObjectFinishState,  // Right curly bracket
+                IterativeParsingErrorState,         // Comma
+                IterativeParsingErrorState,         // Colon
+                IterativeParsingMemberKeyState,     // String
+                IterativeParsingErrorState,         // False
+                IterativeParsingErrorState,         // True
+                IterativeParsingErrorState,         // Null
+                IterativeParsingErrorState          // Number
+            },
+            // MemberKey
+            {
+                IterativeParsingErrorState,             // Left bracket
+                IterativeParsingErrorState,             // Right bracket
+                IterativeParsingErrorState,             // Left curly bracket
+                IterativeParsingErrorState,             // Right curly bracket
+                IterativeParsingErrorState,             // Comma
+                IterativeParsingKeyValueDelimiterState, // Colon
+                IterativeParsingErrorState,             // String
+                IterativeParsingErrorState,             // False
+                IterativeParsingErrorState,             // True
+                IterativeParsingErrorState,             // Null
+                IterativeParsingErrorState              // Number
+            },
+            // KeyValueDelimiter
+            {
+                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
+                IterativeParsingErrorState,             // Right bracket
+                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
+                IterativeParsingErrorState,             // Right curly bracket
+                IterativeParsingErrorState,             // Comma
+                IterativeParsingErrorState,             // Colon
+                IterativeParsingMemberValueState,       // String
+                IterativeParsingMemberValueState,       // False
+                IterativeParsingMemberValueState,       // True
+                IterativeParsingMemberValueState,       // Null
+                IterativeParsingMemberValueState        // Number
+            },
+            // MemberValue
+            {
+                IterativeParsingErrorState,             // Left bracket
+                IterativeParsingErrorState,             // Right bracket
+                IterativeParsingErrorState,             // Left curly bracket
+                IterativeParsingObjectFinishState,      // Right curly bracket
+                IterativeParsingMemberDelimiterState,   // Comma
+                IterativeParsingErrorState,             // Colon
+                IterativeParsingErrorState,             // String
+                IterativeParsingErrorState,             // False
+                IterativeParsingErrorState,             // True
+                IterativeParsingErrorState,             // Null
+                IterativeParsingErrorState              // Number
+            },
+            // MemberDelimiter
+            {
+                IterativeParsingErrorState,         // Left bracket
+                IterativeParsingErrorState,         // Right bracket
+                IterativeParsingErrorState,         // Left curly bracket
+                IterativeParsingObjectFinishState,  // Right curly bracket
+                IterativeParsingErrorState,         // Comma
+                IterativeParsingErrorState,         // Colon
+                IterativeParsingMemberKeyState,     // String
+                IterativeParsingErrorState,         // False
+                IterativeParsingErrorState,         // True
+                IterativeParsingErrorState,         // Null
+                IterativeParsingErrorState          // Number
+            },
+            // ObjectFinish(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
+            // ArrayInitial
+            {
+                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
+                IterativeParsingArrayFinishState,       // Right bracket
+                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
+                IterativeParsingErrorState,             // Right curly bracket
+                IterativeParsingErrorState,             // Comma
+                IterativeParsingErrorState,             // Colon
+                IterativeParsingElementState,           // String
+                IterativeParsingElementState,           // False
+                IterativeParsingElementState,           // True
+                IterativeParsingElementState,           // Null
+                IterativeParsingElementState            // Number
+            },
+            // Element
+            {
+                IterativeParsingErrorState,             // Left bracket
+                IterativeParsingArrayFinishState,       // Right bracket
+                IterativeParsingErrorState,             // Left curly bracket
+                IterativeParsingErrorState,             // Right curly bracket
+                IterativeParsingElementDelimiterState,  // Comma
+                IterativeParsingErrorState,             // Colon
+                IterativeParsingErrorState,             // String
+                IterativeParsingErrorState,             // False
+                IterativeParsingErrorState,             // True
+                IterativeParsingErrorState,             // Null
+                IterativeParsingErrorState              // Number
+            },
+            // ElementDelimiter
+            {
+                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
+                IterativeParsingArrayFinishState,       // Right bracket
+                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
+                IterativeParsingErrorState,             // Right curly bracket
+                IterativeParsingErrorState,             // Comma
+                IterativeParsingErrorState,             // Colon
+                IterativeParsingElementState,           // String
+                IterativeParsingElementState,           // False
+                IterativeParsingElementState,           // True
+                IterativeParsingElementState,           // Null
+                IterativeParsingElementState            // Number
+            },
+            // ArrayFinish(sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            },
+            // Single Value (sink state)
+            {
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
+                IterativeParsingErrorState
+            }
+        }; // End of G
+
+        return static_cast<IterativeParsingState>(G[state][token]);
+    }
+
+    // Make an advance in the token stream and state based on the candidate destination state which was returned by Transit().
+    // May return a new state on state pop.
+    template <unsigned parseFlags, typename InputStream, typename Handler>
+    CEREAL_RAPIDJSON_FORCEINLINE IterativeParsingState Transit(IterativeParsingState src, Token token, IterativeParsingState dst, InputStream& is, Handler& handler) {
+        (void)token;
+
+        switch (dst) {
+        case IterativeParsingErrorState:
+            return dst;
+
+        case IterativeParsingObjectInitialState:
+        case IterativeParsingArrayInitialState:
+        {
+            // Push the state(Element or MemeberValue) if we are nested in another array or value of member.
+            // In this way we can get the correct state on ObjectFinish or ArrayFinish by frame pop.
+            IterativeParsingState n = src;
+            if (src == IterativeParsingArrayInitialState || src == IterativeParsingElementDelimiterState)
+                n = IterativeParsingElementState;
+            else if (src == IterativeParsingKeyValueDelimiterState)
+                n = IterativeParsingMemberValueState;
+            // Push current state.
+            *stack_.template Push<SizeType>(1) = n;
+            // Initialize and push the member/element count.
+            *stack_.template Push<SizeType>(1) = 0;
+            // Call handler
+            bool hr = (dst == IterativeParsingObjectInitialState) ? handler.StartObject() : handler.StartArray();
+            // On handler short circuits the parsing.
+            if (!hr) {
+                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
+                return IterativeParsingErrorState;
+            }
+            else {
+                is.Take();
+                return dst;
+            }
+        }
+
+        case IterativeParsingMemberKeyState:
+            ParseString<parseFlags>(is, handler, true);
+            if (HasParseError())
+                return IterativeParsingErrorState;
+            else
+                return dst;
+
+        case IterativeParsingKeyValueDelimiterState:
+            CEREAL_RAPIDJSON_ASSERT(token == ColonToken);
+            is.Take();
+            return dst;
+
+        case IterativeParsingMemberValueState:
+            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
+            ParseValue<parseFlags>(is, handler);
+            if (HasParseError()) {
+                return IterativeParsingErrorState;
+            }
+            return dst;
+
+        case IterativeParsingElementState:
+            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
+            ParseValue<parseFlags>(is, handler);
+            if (HasParseError()) {
+                return IterativeParsingErrorState;
+            }
+            return dst;
+
+        case IterativeParsingMemberDelimiterState:
+        case IterativeParsingElementDelimiterState:
+            is.Take();
+            // Update member/element count.
+            *stack_.template Top<SizeType>() = *stack_.template Top<SizeType>() + 1;
+            return dst;
+
+        case IterativeParsingObjectFinishState:
+        {
+            // Transit from delimiter is only allowed when trailing commas are enabled
+            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingMemberDelimiterState) {
+                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorObjectMissName, is.Tell());
+                return IterativeParsingErrorState;
+            }
+            // Get member count.
+            SizeType c = *stack_.template Pop<SizeType>(1);
+            // If the object is not empty, count the last member.
+            if (src == IterativeParsingMemberValueState)
+                ++c;
+            // Restore the state.
+            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
+            // Transit to Finish state if this is the topmost scope.
+            if (n == IterativeParsingStartState)
+                n = IterativeParsingFinishState;
+            // Call handler
+            bool hr = handler.EndObject(c);
+            // On handler short circuits the parsing.
+            if (!hr) {
+                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
+                return IterativeParsingErrorState;
+            }
+            else {
+                is.Take();
+                return n;
+            }
+        }
+
+        case IterativeParsingArrayFinishState:
+        {
+            // Transit from delimiter is only allowed when trailing commas are enabled
+            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingElementDelimiterState) {
+                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorValueInvalid, is.Tell());
+                return IterativeParsingErrorState;
+            }
+            // Get element count.
+            SizeType c = *stack_.template Pop<SizeType>(1);
+            // If the array is not empty, count the last element.
+            if (src == IterativeParsingElementState)
+                ++c;
+            // Restore the state.
+            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
+            // Transit to Finish state if this is the topmost scope.
+            if (n == IterativeParsingStartState)
+                n = IterativeParsingFinishState;
+            // Call handler
+            bool hr = handler.EndArray(c);
+            // On handler short circuits the parsing.
+            if (!hr) {
+                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
+                return IterativeParsingErrorState;
+            }
+            else {
+                is.Take();
+                return n;
+            }
+        }
+
+        default:
+            // This branch is for IterativeParsingValueState actually.
+            // Use `default:` rather than
+            // `case IterativeParsingValueState:` is for code coverage.
+
+            // The IterativeParsingStartState is not enumerated in this switch-case.
+            // It is impossible for that case. And it can be caught by following assertion.
+
+            // The IterativeParsingFinishState is not enumerated in this switch-case either.
+            // It is a "derivative" state which cannot triggered from Predict() directly.
+            // Therefore it cannot happen here. And it can be caught by following assertion.
+            CEREAL_RAPIDJSON_ASSERT(dst == IterativeParsingValueState);
+
+            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
+            ParseValue<parseFlags>(is, handler);
+            if (HasParseError()) {
+                return IterativeParsingErrorState;
+            }
+            return IterativeParsingFinishState;
+        }
+    }
+
+    template <typename InputStream>
+    void HandleError(IterativeParsingState src, InputStream& is) {
+        if (HasParseError()) {
+            // Error flag has been set.
+            return;
+        }
+
+        switch (src) {
+        case IterativeParsingStartState:            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell()); return;
+        case IterativeParsingFinishState:           CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell()); return;
+        case IterativeParsingObjectInitialState:
+        case IterativeParsingMemberDelimiterState:  CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell()); return;
+        case IterativeParsingMemberKeyState:        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return;
+        case IterativeParsingMemberValueState:      CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return;
+        case IterativeParsingKeyValueDelimiterState:
+        case IterativeParsingArrayInitialState:
+        case IterativeParsingElementDelimiterState: CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell()); return;
+        default: CEREAL_RAPIDJSON_ASSERT(src == IterativeParsingElementState); CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return;
+        }
+    }
+
+    template <unsigned parseFlags, typename InputStream, typename Handler>
+    ParseResult IterativeParse(InputStream& is, Handler& handler) {
+        parseResult_.Clear();
+        ClearStackOnExit scope(*this);
+        IterativeParsingState state = IterativeParsingStartState;
+
+        SkipWhitespaceAndComments<parseFlags>(is);
+        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+        while (is.Peek() != '\0') {
+            Token t = Tokenize(is.Peek());
+            IterativeParsingState n = Predict(state, t);
+            IterativeParsingState d = Transit<parseFlags>(state, t, n, is, handler);
+
+            if (d == IterativeParsingErrorState) {
+                HandleError(state, is);
+                break;
+            }
+
+            state = d;
+
+            // Do not further consume streams if a root JSON has been parsed.
+            if ((parseFlags & kParseStopWhenDoneFlag) && state == IterativeParsingFinishState)
+                break;
+
+            SkipWhitespaceAndComments<parseFlags>(is);
+            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
+        }
+
+        // Handle the end of file.
+        if (state != IterativeParsingFinishState)
+            HandleError(state, is);
+
+        return parseResult_;
+    }
+
+    static const size_t kDefaultStackCapacity = 256;    //!< Default stack capacity in bytes for storing a single decoded string.
+    internal::Stack<StackAllocator> stack_;  //!< A stack for storing decoded string temporarily during non-destructive parsing.
+    ParseResult parseResult_;
+}; // class GenericReader
+
+//! Reader with UTF8 encoding and default allocator.
+typedef GenericReader<UTF8<>, UTF8<> > Reader;
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+
+#ifdef __GNUC__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_READER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/schema.h b/Src/External/cereal/include/cereal/external/rapidjson/schema.h
new file mode 100644
index 0000000..1298755
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/schema.h
@@ -0,0 +1,2006 @@
+// Tencent is pleased to support the open source community by making RapidJSON available->
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License-> You may obtain a copy of the License at
+//
+// http://opensource->org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied-> See the License for the 
+// specific language governing permissions and limitations under the License->
+
+#ifndef CEREAL_RAPIDJSON_SCHEMA_H_
+#define CEREAL_RAPIDJSON_SCHEMA_H_
+
+#include "document.h"
+#include "pointer.h"
+#include <cmath> // abs, floor
+
+#if !defined(CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX)
+#define CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX 1
+#else
+#define CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
+#endif
+
+#if !CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX && !defined(CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX) && (__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
+#define CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX 1
+#else
+#define CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX 0
+#endif
+
+#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX
+#include "internal/regex.h"
+#elif CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
+#include <regex>
+#endif
+
+#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX || CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
+#define CEREAL_RAPIDJSON_SCHEMA_HAS_REGEX 1
+#else
+#define CEREAL_RAPIDJSON_SCHEMA_HAS_REGEX 0
+#endif
+
+#ifndef CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+#define CEREAL_RAPIDJSON_SCHEMA_VERBOSE 0
+#endif
+
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+#include "stringbuffer.h"
+#endif
+
+CEREAL_RAPIDJSON_DIAG_PUSH
+
+#if defined(__GNUC__)
+CEREAL_RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_OFF(weak-vtables)
+CEREAL_RAPIDJSON_DIAG_OFF(exit-time-destructors)
+CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat-pedantic)
+CEREAL_RAPIDJSON_DIAG_OFF(variadic-macros)
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// Verbose Utilities
+
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+
+namespace internal {
+
+inline void PrintInvalidKeyword(const char* keyword) {
+    printf("Fail keyword: %s\n", keyword);
+}
+
+inline void PrintInvalidKeyword(const wchar_t* keyword) {
+    wprintf(L"Fail keyword: %ls\n", keyword);
+}
+
+inline void PrintInvalidDocument(const char* document) {
+    printf("Fail document: %s\n\n", document);
+}
+
+inline void PrintInvalidDocument(const wchar_t* document) {
+    wprintf(L"Fail document: %ls\n\n", document);
+}
+
+inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
+    printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
+}
+
+inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
+    wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
+}
+
+} // namespace internal
+
+#endif // CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+
+///////////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN
+
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+#define CEREAL_RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
+#else
+#define CEREAL_RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
+#endif
+
+#define CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(keyword)\
+CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN\
+    context.invalidKeyword = keyword.GetString();\
+    CEREAL_RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword.GetString());\
+    return false;\
+CEREAL_RAPIDJSON_MULTILINEMACRO_END
+
+///////////////////////////////////////////////////////////////////////////////
+// Forward declarations
+
+template <typename ValueType, typename Allocator>
+class GenericSchemaDocument;
+
+namespace internal {
+
+template <typename SchemaDocumentType>
+class Schema;
+
+///////////////////////////////////////////////////////////////////////////////
+// ISchemaValidator
+
+class ISchemaValidator {
+public:
+    virtual ~ISchemaValidator() {}
+    virtual bool IsValid() const = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// ISchemaStateFactory
+
+template <typename SchemaType>
+class ISchemaStateFactory {
+public:
+    virtual ~ISchemaStateFactory() {}
+    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType&) = 0;
+    virtual void DestroySchemaValidator(ISchemaValidator* validator) = 0;
+    virtual void* CreateHasher() = 0;
+    virtual uint64_t GetHashCode(void* hasher) = 0;
+    virtual void DestroryHasher(void* hasher) = 0;
+    virtual void* MallocState(size_t size) = 0;
+    virtual void FreeState(void* p) = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Hasher
+
+// For comparison of compound value
+template<typename Encoding, typename Allocator>
+class Hasher {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    Hasher(Allocator* allocator = 0, size_t stackCapacity = kDefaultSize) : stack_(allocator, stackCapacity) {}
+
+    bool Null() { return WriteType(kNullType); }
+    bool Bool(bool b) { return WriteType(b ? kTrueType : kFalseType); }
+    bool Int(int i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
+    bool Uint(unsigned u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
+    bool Int64(int64_t i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
+    bool Uint64(uint64_t u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
+    bool Double(double d) { 
+        Number n; 
+        if (d < 0) n.u.i = static_cast<int64_t>(d);
+        else       n.u.u = static_cast<uint64_t>(d); 
+        n.d = d;
+        return WriteNumber(n);
+    }
+
+    bool RawNumber(const Ch* str, SizeType len, bool) {
+        WriteBuffer(kNumberType, str, len * sizeof(Ch));
+        return true;
+    }
+
+    bool String(const Ch* str, SizeType len, bool) {
+        WriteBuffer(kStringType, str, len * sizeof(Ch));
+        return true;
+    }
+
+    bool StartObject() { return true; }
+    bool Key(const Ch* str, SizeType len, bool copy) { return String(str, len, copy); }
+    bool EndObject(SizeType memberCount) { 
+        uint64_t h = Hash(0, kObjectType);
+        uint64_t* kv = stack_.template Pop<uint64_t>(memberCount * 2);
+        for (SizeType i = 0; i < memberCount; i++)
+            h ^= Hash(kv[i * 2], kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
+        *stack_.template Push<uint64_t>() = h;
+        return true;
+    }
+    
+    bool StartArray() { return true; }
+    bool EndArray(SizeType elementCount) { 
+        uint64_t h = Hash(0, kArrayType);
+        uint64_t* e = stack_.template Pop<uint64_t>(elementCount);
+        for (SizeType i = 0; i < elementCount; i++)
+            h = Hash(h, e[i]); // Use hash to achieve element order sensitive
+        *stack_.template Push<uint64_t>() = h;
+        return true;
+    }
+
+    bool IsValid() const { return stack_.GetSize() == sizeof(uint64_t); }
+
+    uint64_t GetHashCode() const {
+        CEREAL_RAPIDJSON_ASSERT(IsValid());
+        return *stack_.template Top<uint64_t>();
+    }
+
+private:
+    static const size_t kDefaultSize = 256;
+    struct Number {
+        union U {
+            uint64_t u;
+            int64_t i;
+        }u;
+        double d;
+    };
+
+    bool WriteType(Type type) { return WriteBuffer(type, 0, 0); }
+    
+    bool WriteNumber(const Number& n) { return WriteBuffer(kNumberType, &n, sizeof(n)); }
+    
+    bool WriteBuffer(Type type, const void* data, size_t len) {
+        // FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
+        uint64_t h = Hash(CEREAL_RAPIDJSON_UINT64_C2(0x84222325, 0xcbf29ce4), type);
+        const unsigned char* d = static_cast<const unsigned char*>(data);
+        for (size_t i = 0; i < len; i++)
+            h = Hash(h, d[i]);
+        *stack_.template Push<uint64_t>() = h;
+        return true;
+    }
+
+    static uint64_t Hash(uint64_t h, uint64_t d) {
+        static const uint64_t kPrime = CEREAL_RAPIDJSON_UINT64_C2(0x00000100, 0x000001b3);
+        h ^= d;
+        h *= kPrime;
+        return h;
+    }
+
+    Stack<Allocator> stack_;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// SchemaValidationContext
+
+template <typename SchemaDocumentType>
+struct SchemaValidationContext {
+    typedef Schema<SchemaDocumentType> SchemaType;
+    typedef ISchemaStateFactory<SchemaType> SchemaValidatorFactoryType;
+    typedef typename SchemaType::ValueType ValueType;
+    typedef typename ValueType::Ch Ch;
+
+    enum PatternValidatorType {
+        kPatternValidatorOnly,
+        kPatternValidatorWithProperty,
+        kPatternValidatorWithAdditionalProperty
+    };
+
+    SchemaValidationContext(SchemaValidatorFactoryType& f, const SchemaType* s) :
+        factory(f),
+        schema(s),
+        valueSchema(),
+        invalidKeyword(),
+        hasher(),
+        arrayElementHashCodes(),
+        validators(),
+        validatorCount(),
+        patternPropertiesValidators(),
+        patternPropertiesValidatorCount(),
+        patternPropertiesSchemas(),
+        patternPropertiesSchemaCount(),
+        valuePatternValidatorType(kPatternValidatorOnly),
+        propertyExist(),
+        inArray(false),
+        valueUniqueness(false),
+        arrayUniqueness(false)
+    {
+    }
+
+    ~SchemaValidationContext() {
+        if (hasher)
+            factory.DestroryHasher(hasher);
+        if (validators) {
+            for (SizeType i = 0; i < validatorCount; i++)
+                factory.DestroySchemaValidator(validators[i]);
+            factory.FreeState(validators);
+        }
+        if (patternPropertiesValidators) {
+            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
+                factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+            factory.FreeState(patternPropertiesValidators);
+        }
+        if (patternPropertiesSchemas)
+            factory.FreeState(patternPropertiesSchemas);
+        if (propertyExist)
+            factory.FreeState(propertyExist);
+    }
+
+    SchemaValidatorFactoryType& factory;
+    const SchemaType* schema;
+    const SchemaType* valueSchema;
+    const Ch* invalidKeyword;
+    void* hasher; // Only validator access
+    void* arrayElementHashCodes; // Only validator access this
+    ISchemaValidator** validators;
+    SizeType validatorCount;
+    ISchemaValidator** patternPropertiesValidators;
+    SizeType patternPropertiesValidatorCount;
+    const SchemaType** patternPropertiesSchemas;
+    SizeType patternPropertiesSchemaCount;
+    PatternValidatorType valuePatternValidatorType;
+    PatternValidatorType objectPatternValidatorType;
+    SizeType arrayElementIndex;
+    bool* propertyExist;
+    bool inArray;
+    bool valueUniqueness;
+    bool arrayUniqueness;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// Schema
+
+template <typename SchemaDocumentType>
+class Schema {
+public:
+    typedef typename SchemaDocumentType::ValueType ValueType;
+    typedef typename SchemaDocumentType::AllocatorType AllocatorType;
+    typedef typename SchemaDocumentType::PointerType PointerType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename EncodingType::Ch Ch;
+    typedef SchemaValidationContext<SchemaDocumentType> Context;
+    typedef Schema<SchemaDocumentType> SchemaType;
+    typedef GenericValue<EncodingType, AllocatorType> SValue;
+    friend class GenericSchemaDocument<ValueType, AllocatorType>;
+
+    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator) :
+        allocator_(allocator),
+        enum_(),
+        enumCount_(),
+        not_(),
+        type_((1 << kTotalSchemaType) - 1), // typeless
+        validatorCount_(),
+        properties_(),
+        additionalPropertiesSchema_(),
+        patternProperties_(),
+        patternPropertyCount_(),
+        propertyCount_(),
+        minProperties_(),
+        maxProperties_(SizeType(~0)),
+        additionalProperties_(true),
+        hasDependencies_(),
+        hasRequired_(),
+        hasSchemaDependencies_(),
+        additionalItemsSchema_(),
+        itemsList_(),
+        itemsTuple_(),
+        itemsTupleCount_(),
+        minItems_(),
+        maxItems_(SizeType(~0)),
+        additionalItems_(true),
+        uniqueItems_(false),
+        pattern_(),
+        minLength_(0),
+        maxLength_(~SizeType(0)),
+        exclusiveMinimum_(false),
+        exclusiveMaximum_(false)
+    {
+        typedef typename SchemaDocumentType::ValueType ValueType;
+        typedef typename ValueType::ConstValueIterator ConstValueIterator;
+        typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
+
+        if (!value.IsObject())
+            return;
+
+        if (const ValueType* v = GetMember(value, GetTypeString())) {
+            type_ = 0;
+            if (v->IsString())
+                AddType(*v);
+            else if (v->IsArray())
+                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr)
+                    AddType(*itr);
+        }
+
+        if (const ValueType* v = GetMember(value, GetEnumString()))
+            if (v->IsArray() && v->Size() > 0) {
+                enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
+                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
+                    typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
+                    char buffer[256 + 24];
+                    MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
+                    EnumHasherType h(&hasherAllocator, 256);
+                    itr->Accept(h);
+                    enum_[enumCount_++] = h.GetHashCode();
+                }
+            }
+
+        if (schemaDocument) {
+            AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
+            AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
+            AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
+        }
+
+        if (const ValueType* v = GetMember(value, GetNotString())) {
+            schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
+            notValidatorIndex_ = validatorCount_;
+            validatorCount_++;
+        }
+
+        // Object
+
+        const ValueType* properties = GetMember(value, GetPropertiesString());
+        const ValueType* required = GetMember(value, GetRequiredString());
+        const ValueType* dependencies = GetMember(value, GetDependenciesString());
+        {
+            // Gather properties from properties/required/dependencies
+            SValue allProperties(kArrayType);
+
+            if (properties && properties->IsObject())
+                for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr)
+                    AddUniqueElement(allProperties, itr->name);
+            
+            if (required && required->IsArray())
+                for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
+                    if (itr->IsString())
+                        AddUniqueElement(allProperties, *itr);
+
+            if (dependencies && dependencies->IsObject())
+                for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
+                    AddUniqueElement(allProperties, itr->name);
+                    if (itr->value.IsArray())
+                        for (ConstValueIterator i = itr->value.Begin(); i != itr->value.End(); ++i)
+                            if (i->IsString())
+                                AddUniqueElement(allProperties, *i);
+                }
+
+            if (allProperties.Size() > 0) {
+                propertyCount_ = allProperties.Size();
+                properties_ = static_cast<Property*>(allocator_->Malloc(sizeof(Property) * propertyCount_));
+                for (SizeType i = 0; i < propertyCount_; i++) {
+                    new (&properties_[i]) Property();
+                    properties_[i].name = allProperties[i];
+                    properties_[i].schema = GetTypeless();
+                }
+            }
+        }
+
+        if (properties && properties->IsObject()) {
+            PointerType q = p.Append(GetPropertiesString(), allocator_);
+            for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr) {
+                SizeType index;
+                if (FindPropertyIndex(itr->name, &index))
+                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document);
+            }
+        }
+
+        if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
+            PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
+            patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
+            patternPropertyCount_ = 0;
+
+            for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
+                new (&patternProperties_[patternPropertyCount_]) PatternProperty();
+                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
+                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document);
+                patternPropertyCount_++;
+            }
+        }
+
+        if (required && required->IsArray())
+            for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
+                if (itr->IsString()) {
+                    SizeType index;
+                    if (FindPropertyIndex(*itr, &index)) {
+                        properties_[index].required = true;
+                        hasRequired_ = true;
+                    }
+                }
+
+        if (dependencies && dependencies->IsObject()) {
+            PointerType q = p.Append(GetDependenciesString(), allocator_);
+            hasDependencies_ = true;
+            for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
+                SizeType sourceIndex;
+                if (FindPropertyIndex(itr->name, &sourceIndex)) {
+                    if (itr->value.IsArray()) {
+                        properties_[sourceIndex].dependencies = static_cast<bool*>(allocator_->Malloc(sizeof(bool) * propertyCount_));
+                        std::memset(properties_[sourceIndex].dependencies, 0, sizeof(bool)* propertyCount_);
+                        for (ConstValueIterator targetItr = itr->value.Begin(); targetItr != itr->value.End(); ++targetItr) {
+                            SizeType targetIndex;
+                            if (FindPropertyIndex(*targetItr, &targetIndex))
+                                properties_[sourceIndex].dependencies[targetIndex] = true;
+                        }
+                    }
+                    else if (itr->value.IsObject()) {
+                        hasSchemaDependencies_ = true;
+                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document);
+                        properties_[sourceIndex].dependenciesValidatorIndex = validatorCount_;
+                        validatorCount_++;
+                    }
+                }
+            }
+        }
+
+        if (const ValueType* v = GetMember(value, GetAdditionalPropertiesString())) {
+            if (v->IsBool())
+                additionalProperties_ = v->GetBool();
+            else if (v->IsObject())
+                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document);
+        }
+
+        AssignIfExist(minProperties_, value, GetMinPropertiesString());
+        AssignIfExist(maxProperties_, value, GetMaxPropertiesString());
+
+        // Array
+        if (const ValueType* v = GetMember(value, GetItemsString())) {
+            PointerType q = p.Append(GetItemsString(), allocator_);
+            if (v->IsObject()) // List validation
+                schemaDocument->CreateSchema(&itemsList_, q, *v, document);
+            else if (v->IsArray()) { // Tuple validation
+                itemsTuple_ = static_cast<const Schema**>(allocator_->Malloc(sizeof(const Schema*) * v->Size()));
+                SizeType index = 0;
+                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr, index++)
+                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document);
+            }
+        }
+
+        AssignIfExist(minItems_, value, GetMinItemsString());
+        AssignIfExist(maxItems_, value, GetMaxItemsString());
+
+        if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
+            if (v->IsBool())
+                additionalItems_ = v->GetBool();
+            else if (v->IsObject())
+                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document);
+        }
+
+        AssignIfExist(uniqueItems_, value, GetUniqueItemsString());
+
+        // String
+        AssignIfExist(minLength_, value, GetMinLengthString());
+        AssignIfExist(maxLength_, value, GetMaxLengthString());
+
+        if (const ValueType* v = GetMember(value, GetPatternString()))
+            pattern_ = CreatePattern(*v);
+
+        // Number
+        if (const ValueType* v = GetMember(value, GetMinimumString()))
+            if (v->IsNumber())
+                minimum_.CopyFrom(*v, *allocator_);
+
+        if (const ValueType* v = GetMember(value, GetMaximumString()))
+            if (v->IsNumber())
+                maximum_.CopyFrom(*v, *allocator_);
+
+        AssignIfExist(exclusiveMinimum_, value, GetExclusiveMinimumString());
+        AssignIfExist(exclusiveMaximum_, value, GetExclusiveMaximumString());
+
+        if (const ValueType* v = GetMember(value, GetMultipleOfString()))
+            if (v->IsNumber() && v->GetDouble() > 0.0)
+                multipleOf_.CopyFrom(*v, *allocator_);
+    }
+
+    ~Schema() {
+        if (allocator_) {
+            allocator_->Free(enum_);
+        }
+        if (properties_) {
+            for (SizeType i = 0; i < propertyCount_; i++)
+                properties_[i].~Property();
+            AllocatorType::Free(properties_);
+        }
+        if (patternProperties_) {
+            for (SizeType i = 0; i < patternPropertyCount_; i++)
+                patternProperties_[i].~PatternProperty();
+            AllocatorType::Free(patternProperties_);
+        }
+        AllocatorType::Free(itemsTuple_);
+#if CEREAL_RAPIDJSON_SCHEMA_HAS_REGEX
+        if (pattern_) {
+            pattern_->~RegexType();
+            allocator_->Free(pattern_);
+        }
+#endif
+    }
+
+    bool BeginValue(Context& context) const {
+        if (context.inArray) {
+            if (uniqueItems_)
+                context.valueUniqueness = true;
+
+            if (itemsList_)
+                context.valueSchema = itemsList_;
+            else if (itemsTuple_) {
+                if (context.arrayElementIndex < itemsTupleCount_)
+                    context.valueSchema = itemsTuple_[context.arrayElementIndex];
+                else if (additionalItemsSchema_)
+                    context.valueSchema = additionalItemsSchema_;
+                else if (additionalItems_)
+                    context.valueSchema = GetTypeless();
+                else
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetItemsString());
+            }
+            else
+                context.valueSchema = GetTypeless();
+
+            context.arrayElementIndex++;
+        }
+        return true;
+    }
+
+    CEREAL_RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
+        if (context.patternPropertiesValidatorCount > 0) {
+            bool otherValid = false;
+            SizeType count = context.patternPropertiesValidatorCount;
+            if (context.objectPatternValidatorType != Context::kPatternValidatorOnly)
+                otherValid = context.patternPropertiesValidators[--count]->IsValid();
+
+            bool patternValid = true;
+            for (SizeType i = 0; i < count; i++)
+                if (!context.patternPropertiesValidators[i]->IsValid()) {
+                    patternValid = false;
+                    break;
+                }
+
+            if (context.objectPatternValidatorType == Context::kPatternValidatorOnly) {
+                if (!patternValid)
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
+            }
+            else if (context.objectPatternValidatorType == Context::kPatternValidatorWithProperty) {
+                if (!patternValid || !otherValid)
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
+            }
+            else if (!patternValid && !otherValid) // kPatternValidatorWithAdditionalProperty)
+                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
+        }
+
+        if (enum_) {
+            const uint64_t h = context.factory.GetHashCode(context.hasher);
+            for (SizeType i = 0; i < enumCount_; i++)
+                if (enum_[i] == h)
+                    goto foundEnum;
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetEnumString());
+            foundEnum:;
+        }
+
+        if (allOf_.schemas)
+            for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
+                if (!context.validators[i]->IsValid())
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetAllOfString());
+        
+        if (anyOf_.schemas) {
+            for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
+                if (context.validators[i]->IsValid())
+                    goto foundAny;
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetAnyOfString());
+            foundAny:;
+        }
+
+        if (oneOf_.schemas) {
+            bool oneValid = false;
+            for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
+                if (context.validators[i]->IsValid()) {
+                    if (oneValid)
+                        CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
+                    else
+                        oneValid = true;
+                }
+            if (!oneValid)
+                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
+        }
+
+        if (not_ && context.validators[notValidatorIndex_]->IsValid())
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetNotString());
+
+        return true;
+    }
+
+    bool Null(Context& context) const { 
+        if (!(type_ & (1 << kNullSchemaType)))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        return CreateParallelValidator(context);
+    }
+    
+    bool Bool(Context& context, bool) const { 
+        if (!(type_ & (1 << kBooleanSchemaType)))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+        return CreateParallelValidator(context);
+    }
+
+    bool Int(Context& context, int i) const {
+        if (!CheckInt(context, i))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Uint(Context& context, unsigned u) const {
+        if (!CheckUint(context, u))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Int64(Context& context, int64_t i) const {
+        if (!CheckInt(context, i))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Uint64(Context& context, uint64_t u) const {
+        if (!CheckUint(context, u))
+            return false;
+        return CreateParallelValidator(context);
+    }
+
+    bool Double(Context& context, double d) const {
+        if (!(type_ & (1 << kNumberSchemaType)))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+
+        if (!minimum_.IsNull() && !CheckDoubleMinimum(context, d))
+            return false;
+
+        if (!maximum_.IsNull() && !CheckDoubleMaximum(context, d))
+            return false;
+        
+        if (!multipleOf_.IsNull() && !CheckDoubleMultipleOf(context, d))
+            return false;
+        
+        return CreateParallelValidator(context);
+    }
+    
+    bool String(Context& context, const Ch* str, SizeType length, bool) const {
+        if (!(type_ & (1 << kStringSchemaType)))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+
+        if (minLength_ != 0 || maxLength_ != SizeType(~0)) {
+            SizeType count;
+            if (internal::CountStringCodePoint<EncodingType>(str, length, &count)) {
+                if (count < minLength_)
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinLengthString());
+                if (count > maxLength_)
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxLengthString());
+            }
+        }
+
+        if (pattern_ && !IsPatternMatch(pattern_, str, length))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternString());
+
+        return CreateParallelValidator(context);
+    }
+
+    bool StartObject(Context& context) const { 
+        if (!(type_ & (1 << kObjectSchemaType)))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+
+        if (hasDependencies_ || hasRequired_) {
+            context.propertyExist = static_cast<bool*>(context.factory.MallocState(sizeof(bool) * propertyCount_));
+            std::memset(context.propertyExist, 0, sizeof(bool) * propertyCount_);
+        }
+
+        if (patternProperties_) { // pre-allocate schema array
+            SizeType count = patternPropertyCount_ + 1; // extra for valuePatternValidatorType
+            context.patternPropertiesSchemas = static_cast<const SchemaType**>(context.factory.MallocState(sizeof(const SchemaType*) * count));
+            context.patternPropertiesSchemaCount = 0;
+            std::memset(context.patternPropertiesSchemas, 0, sizeof(SchemaType*) * count);
+        }
+
+        return CreateParallelValidator(context);
+    }
+    
+    bool Key(Context& context, const Ch* str, SizeType len, bool) const {
+        if (patternProperties_) {
+            context.patternPropertiesSchemaCount = 0;
+            for (SizeType i = 0; i < patternPropertyCount_; i++)
+                if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len))
+                    context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema;
+        }
+
+        SizeType index;
+        if (FindPropertyIndex(ValueType(str, len).Move(), &index)) {
+            if (context.patternPropertiesSchemaCount > 0) {
+                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = properties_[index].schema;
+                context.valueSchema = GetTypeless();
+                context.valuePatternValidatorType = Context::kPatternValidatorWithProperty;
+            }
+            else
+                context.valueSchema = properties_[index].schema;
+
+            if (context.propertyExist)
+                context.propertyExist[index] = true;
+
+            return true;
+        }
+
+        if (additionalPropertiesSchema_) {
+            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
+                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
+                context.valueSchema = GetTypeless();
+                context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;
+            }
+            else
+                context.valueSchema = additionalPropertiesSchema_;
+            return true;
+        }
+        else if (additionalProperties_) {
+            context.valueSchema = GetTypeless();
+            return true;
+        }
+
+        if (context.patternPropertiesSchemaCount == 0) // patternProperties are not additional properties
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetAdditionalPropertiesString());
+
+        return true;
+    }
+
+    bool EndObject(Context& context, SizeType memberCount) const {
+        if (hasRequired_)
+            for (SizeType index = 0; index < propertyCount_; index++)
+                if (properties_[index].required)
+                    if (!context.propertyExist[index])
+                        CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetRequiredString());
+
+        if (memberCount < minProperties_)
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinPropertiesString());
+
+        if (memberCount > maxProperties_)
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxPropertiesString());
+
+        if (hasDependencies_) {
+            for (SizeType sourceIndex = 0; sourceIndex < propertyCount_; sourceIndex++)
+                if (context.propertyExist[sourceIndex]) {
+                    if (properties_[sourceIndex].dependencies) {
+                        for (SizeType targetIndex = 0; targetIndex < propertyCount_; targetIndex++)
+                            if (properties_[sourceIndex].dependencies[targetIndex] && !context.propertyExist[targetIndex])
+                                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
+                    }
+                    else if (properties_[sourceIndex].dependenciesSchema)
+                        if (!context.validators[properties_[sourceIndex].dependenciesValidatorIndex]->IsValid())
+                            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
+                }
+        }
+
+        return true;
+    }
+
+    bool StartArray(Context& context) const { 
+        if (!(type_ & (1 << kArraySchemaType)))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+
+        context.arrayElementIndex = 0;
+        context.inArray = true;
+
+        return CreateParallelValidator(context);
+    }
+
+    bool EndArray(Context& context, SizeType elementCount) const { 
+        context.inArray = false;
+        
+        if (elementCount < minItems_)
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinItemsString());
+        
+        if (elementCount > maxItems_)
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxItemsString());
+
+        return true;
+    }
+
+    // Generate functions for string literal according to Ch
+#define CEREAL_RAPIDJSON_STRING_(name, ...) \
+    static const ValueType& Get##name##String() {\
+        static const Ch s[] = { __VA_ARGS__, '\0' };\
+        static const ValueType v(s, sizeof(s) / sizeof(Ch) - 1);\
+        return v;\
+    }
+
+    CEREAL_RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
+    CEREAL_RAPIDJSON_STRING_(Boolean, 'b', 'o', 'o', 'l', 'e', 'a', 'n')
+    CEREAL_RAPIDJSON_STRING_(Object, 'o', 'b', 'j', 'e', 'c', 't')
+    CEREAL_RAPIDJSON_STRING_(Array, 'a', 'r', 'r', 'a', 'y')
+    CEREAL_RAPIDJSON_STRING_(String, 's', 't', 'r', 'i', 'n', 'g')
+    CEREAL_RAPIDJSON_STRING_(Number, 'n', 'u', 'm', 'b', 'e', 'r')
+    CEREAL_RAPIDJSON_STRING_(Integer, 'i', 'n', 't', 'e', 'g', 'e', 'r')
+    CEREAL_RAPIDJSON_STRING_(Type, 't', 'y', 'p', 'e')
+    CEREAL_RAPIDJSON_STRING_(Enum, 'e', 'n', 'u', 'm')
+    CEREAL_RAPIDJSON_STRING_(AllOf, 'a', 'l', 'l', 'O', 'f')
+    CEREAL_RAPIDJSON_STRING_(AnyOf, 'a', 'n', 'y', 'O', 'f')
+    CEREAL_RAPIDJSON_STRING_(OneOf, 'o', 'n', 'e', 'O', 'f')
+    CEREAL_RAPIDJSON_STRING_(Not, 'n', 'o', 't')
+    CEREAL_RAPIDJSON_STRING_(Properties, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    CEREAL_RAPIDJSON_STRING_(Required, 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd')
+    CEREAL_RAPIDJSON_STRING_(Dependencies, 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'i', 'e', 's')
+    CEREAL_RAPIDJSON_STRING_(PatternProperties, 'p', 'a', 't', 't', 'e', 'r', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    CEREAL_RAPIDJSON_STRING_(AdditionalProperties, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    CEREAL_RAPIDJSON_STRING_(MinProperties, 'm', 'i', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    CEREAL_RAPIDJSON_STRING_(MaxProperties, 'm', 'a', 'x', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
+    CEREAL_RAPIDJSON_STRING_(Items, 'i', 't', 'e', 'm', 's')
+    CEREAL_RAPIDJSON_STRING_(MinItems, 'm', 'i', 'n', 'I', 't', 'e', 'm', 's')
+    CEREAL_RAPIDJSON_STRING_(MaxItems, 'm', 'a', 'x', 'I', 't', 'e', 'm', 's')
+    CEREAL_RAPIDJSON_STRING_(AdditionalItems, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'I', 't', 'e', 'm', 's')
+    CEREAL_RAPIDJSON_STRING_(UniqueItems, 'u', 'n', 'i', 'q', 'u', 'e', 'I', 't', 'e', 'm', 's')
+    CEREAL_RAPIDJSON_STRING_(MinLength, 'm', 'i', 'n', 'L', 'e', 'n', 'g', 't', 'h')
+    CEREAL_RAPIDJSON_STRING_(MaxLength, 'm', 'a', 'x', 'L', 'e', 'n', 'g', 't', 'h')
+    CEREAL_RAPIDJSON_STRING_(Pattern, 'p', 'a', 't', 't', 'e', 'r', 'n')
+    CEREAL_RAPIDJSON_STRING_(Minimum, 'm', 'i', 'n', 'i', 'm', 'u', 'm')
+    CEREAL_RAPIDJSON_STRING_(Maximum, 'm', 'a', 'x', 'i', 'm', 'u', 'm')
+    CEREAL_RAPIDJSON_STRING_(ExclusiveMinimum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm')
+    CEREAL_RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
+    CEREAL_RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
+
+#undef CEREAL_RAPIDJSON_STRING_
+
+private:
+    enum SchemaValueType {
+        kNullSchemaType,
+        kBooleanSchemaType,
+        kObjectSchemaType,
+        kArraySchemaType,
+        kStringSchemaType,
+        kNumberSchemaType,
+        kIntegerSchemaType,
+        kTotalSchemaType
+    };
+
+#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX
+        typedef internal::GenericRegex<EncodingType> RegexType;
+#elif CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
+        typedef std::basic_regex<Ch> RegexType;
+#else
+        typedef char RegexType;
+#endif
+
+    struct SchemaArray {
+        SchemaArray() : schemas(), count() {}
+        ~SchemaArray() { AllocatorType::Free(schemas); }
+        const SchemaType** schemas;
+        SizeType begin; // begin index of context.validators
+        SizeType count;
+    };
+
+    static const SchemaType* GetTypeless() {
+        static SchemaType typeless(0, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), 0);
+        return &typeless;
+    }
+
+    template <typename V1, typename V2>
+    void AddUniqueElement(V1& a, const V2& v) {
+        for (typename V1::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
+            if (*itr == v)
+                return;
+        V1 c(v, *allocator_);
+        a.PushBack(c, *allocator_);
+    }
+
+    static const ValueType* GetMember(const ValueType& value, const ValueType& name) {
+        typename ValueType::ConstMemberIterator itr = value.FindMember(name);
+        return itr != value.MemberEnd() ? &(itr->value) : 0;
+    }
+
+    static void AssignIfExist(bool& out, const ValueType& value, const ValueType& name) {
+        if (const ValueType* v = GetMember(value, name))
+            if (v->IsBool())
+                out = v->GetBool();
+    }
+
+    static void AssignIfExist(SizeType& out, const ValueType& value, const ValueType& name) {
+        if (const ValueType* v = GetMember(value, name))
+            if (v->IsUint64() && v->GetUint64() <= SizeType(~0))
+                out = static_cast<SizeType>(v->GetUint64());
+    }
+
+    void AssignIfExist(SchemaArray& out, SchemaDocumentType& schemaDocument, const PointerType& p, const ValueType& value, const ValueType& name, const ValueType& document) {
+        if (const ValueType* v = GetMember(value, name)) {
+            if (v->IsArray() && v->Size() > 0) {
+                PointerType q = p.Append(name, allocator_);
+                out.count = v->Size();
+                out.schemas = static_cast<const Schema**>(allocator_->Malloc(out.count * sizeof(const Schema*)));
+                memset(out.schemas, 0, sizeof(Schema*)* out.count);
+                for (SizeType i = 0; i < out.count; i++)
+                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document);
+                out.begin = validatorCount_;
+                validatorCount_ += out.count;
+            }
+        }
+    }
+
+#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX
+    template <typename ValueType>
+    RegexType* CreatePattern(const ValueType& value) {
+        if (value.IsString()) {
+            RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString());
+            if (!r->IsValid()) {
+                r->~RegexType();
+                AllocatorType::Free(r);
+                r = 0;
+            }
+            return r;
+        }
+        return 0;
+    }
+
+    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType) {
+        return pattern->Search(str);
+    }
+#elif CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
+    template <typename ValueType>
+    RegexType* CreatePattern(const ValueType& value) {
+        if (value.IsString())
+            try {
+                return new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
+            }
+            catch (const std::regex_error&) {
+            }
+        return 0;
+    }
+
+    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType length) {
+        std::match_results<const Ch*> r;
+        return std::regex_search(str, str + length, r, *pattern);
+    }
+#else
+    template <typename ValueType>
+    RegexType* CreatePattern(const ValueType&) { return 0; }
+
+    static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
+#endif // CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
+
+    void AddType(const ValueType& type) {
+        if      (type == GetNullString()   ) type_ |= 1 << kNullSchemaType;
+        else if (type == GetBooleanString()) type_ |= 1 << kBooleanSchemaType;
+        else if (type == GetObjectString() ) type_ |= 1 << kObjectSchemaType;
+        else if (type == GetArrayString()  ) type_ |= 1 << kArraySchemaType;
+        else if (type == GetStringString() ) type_ |= 1 << kStringSchemaType;
+        else if (type == GetIntegerString()) type_ |= 1 << kIntegerSchemaType;
+        else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
+    }
+
+    bool CreateParallelValidator(Context& context) const {
+        if (enum_ || context.arrayUniqueness)
+            context.hasher = context.factory.CreateHasher();
+
+        if (validatorCount_) {
+            CEREAL_RAPIDJSON_ASSERT(context.validators == 0);
+            context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
+            context.validatorCount = validatorCount_;
+
+            if (allOf_.schemas)
+                CreateSchemaValidators(context, allOf_);
+
+            if (anyOf_.schemas)
+                CreateSchemaValidators(context, anyOf_);
+            
+            if (oneOf_.schemas)
+                CreateSchemaValidators(context, oneOf_);
+            
+            if (not_)
+                context.validators[notValidatorIndex_] = context.factory.CreateSchemaValidator(*not_);
+            
+            if (hasSchemaDependencies_) {
+                for (SizeType i = 0; i < propertyCount_; i++)
+                    if (properties_[i].dependenciesSchema)
+                        context.validators[properties_[i].dependenciesValidatorIndex] = context.factory.CreateSchemaValidator(*properties_[i].dependenciesSchema);
+            }
+        }
+
+        return true;
+    }
+
+    void CreateSchemaValidators(Context& context, const SchemaArray& schemas) const {
+        for (SizeType i = 0; i < schemas.count; i++)
+            context.validators[schemas.begin + i] = context.factory.CreateSchemaValidator(*schemas.schemas[i]);
+    }
+
+    // O(n)
+    bool FindPropertyIndex(const ValueType& name, SizeType* outIndex) const {
+        SizeType len = name.GetStringLength();
+        const Ch* str = name.GetString();
+        for (SizeType index = 0; index < propertyCount_; index++)
+            if (properties_[index].name.GetStringLength() == len && 
+                (std::memcmp(properties_[index].name.GetString(), str, sizeof(Ch) * len) == 0))
+            {
+                *outIndex = index;
+                return true;
+            }
+        return false;
+    }
+
+    bool CheckInt(Context& context, int64_t i) const {
+        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType))))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+
+        if (!minimum_.IsNull()) {
+            if (minimum_.IsInt64()) {
+                if (exclusiveMinimum_ ? i <= minimum_.GetInt64() : i < minimum_.GetInt64())
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
+            }
+            else if (minimum_.IsUint64()) {
+                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString()); // i <= max(int64_t) < minimum.GetUint64()
+            }
+            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!maximum_.IsNull()) {
+            if (maximum_.IsInt64()) {
+                if (exclusiveMaximum_ ? i >= maximum_.GetInt64() : i > maximum_.GetInt64())
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
+            }
+            else if (maximum_.IsUint64())
+                /* do nothing */; // i <= max(int64_t) < maximum_.GetUint64()
+            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!multipleOf_.IsNull()) {
+            if (multipleOf_.IsUint64()) {
+                if (static_cast<uint64_t>(i >= 0 ? i : -i) % multipleOf_.GetUint64() != 0)
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
+            }
+            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
+                return false;
+        }
+
+        return true;
+    }
+
+    bool CheckUint(Context& context, uint64_t i) const {
+        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType))))
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
+
+        if (!minimum_.IsNull()) {
+            if (minimum_.IsUint64()) {
+                if (exclusiveMinimum_ ? i <= minimum_.GetUint64() : i < minimum_.GetUint64())
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
+            }
+            else if (minimum_.IsInt64())
+                /* do nothing */; // i >= 0 > minimum.Getint64()
+            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!maximum_.IsNull()) {
+            if (maximum_.IsUint64()) {
+                if (exclusiveMaximum_ ? i >= maximum_.GetUint64() : i > maximum_.GetUint64())
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
+            }
+            else if (maximum_.IsInt64())
+                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString()); // i >= 0 > maximum_
+            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
+                return false;
+        }
+
+        if (!multipleOf_.IsNull()) {
+            if (multipleOf_.IsUint64()) {
+                if (i % multipleOf_.GetUint64() != 0)
+                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
+            }
+            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
+                return false;
+        }
+
+        return true;
+    }
+
+    bool CheckDoubleMinimum(Context& context, double d) const {
+        if (exclusiveMinimum_ ? d <= minimum_.GetDouble() : d < minimum_.GetDouble())
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
+        return true;
+    }
+
+    bool CheckDoubleMaximum(Context& context, double d) const {
+        if (exclusiveMaximum_ ? d >= maximum_.GetDouble() : d > maximum_.GetDouble())
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
+        return true;
+    }
+
+    bool CheckDoubleMultipleOf(Context& context, double d) const {
+        double a = std::abs(d), b = std::abs(multipleOf_.GetDouble());
+        double q = std::floor(a / b);
+        double r = a - q * b;
+        if (r > 0.0)
+            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
+        return true;
+    }
+
+    struct Property {
+        Property() : schema(), dependenciesSchema(), dependenciesValidatorIndex(), dependencies(), required(false) {}
+        ~Property() { AllocatorType::Free(dependencies); }
+        SValue name;
+        const SchemaType* schema;
+        const SchemaType* dependenciesSchema;
+        SizeType dependenciesValidatorIndex;
+        bool* dependencies;
+        bool required;
+    };
+
+    struct PatternProperty {
+        PatternProperty() : schema(), pattern() {}
+        ~PatternProperty() { 
+            if (pattern) {
+                pattern->~RegexType();
+                AllocatorType::Free(pattern);
+            }
+        }
+        const SchemaType* schema;
+        RegexType* pattern;
+    };
+
+    AllocatorType* allocator_;
+    uint64_t* enum_;
+    SizeType enumCount_;
+    SchemaArray allOf_;
+    SchemaArray anyOf_;
+    SchemaArray oneOf_;
+    const SchemaType* not_;
+    unsigned type_; // bitmask of kSchemaType
+    SizeType validatorCount_;
+    SizeType notValidatorIndex_;
+
+    Property* properties_;
+    const SchemaType* additionalPropertiesSchema_;
+    PatternProperty* patternProperties_;
+    SizeType patternPropertyCount_;
+    SizeType propertyCount_;
+    SizeType minProperties_;
+    SizeType maxProperties_;
+    bool additionalProperties_;
+    bool hasDependencies_;
+    bool hasRequired_;
+    bool hasSchemaDependencies_;
+
+    const SchemaType* additionalItemsSchema_;
+    const SchemaType* itemsList_;
+    const SchemaType** itemsTuple_;
+    SizeType itemsTupleCount_;
+    SizeType minItems_;
+    SizeType maxItems_;
+    bool additionalItems_;
+    bool uniqueItems_;
+
+    RegexType* pattern_;
+    SizeType minLength_;
+    SizeType maxLength_;
+
+    SValue minimum_;
+    SValue maximum_;
+    SValue multipleOf_;
+    bool exclusiveMinimum_;
+    bool exclusiveMaximum_;
+};
+
+template<typename Stack, typename Ch>
+struct TokenHelper {
+    CEREAL_RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
+        *documentStack.template Push<Ch>() = '/';
+        char buffer[21];
+        size_t length = static_cast<size_t>((sizeof(SizeType) == 4 ? u32toa(index, buffer) : u64toa(index, buffer)) - buffer);
+        for (size_t i = 0; i < length; i++)
+            *documentStack.template Push<Ch>() = buffer[i];
+    }
+};
+
+// Partial specialized version for char to prevent buffer copying.
+template <typename Stack>
+struct TokenHelper<Stack, char> {
+    CEREAL_RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
+        if (sizeof(SizeType) == 4) {
+            char *buffer = documentStack.template Push<char>(1 + 10); // '/' + uint
+            *buffer++ = '/';
+            const char* end = internal::u32toa(index, buffer);
+             documentStack.template Pop<char>(static_cast<size_t>(10 - (end - buffer)));
+        }
+        else {
+            char *buffer = documentStack.template Push<char>(1 + 20); // '/' + uint64
+            *buffer++ = '/';
+            const char* end = internal::u64toa(index, buffer);
+            documentStack.template Pop<char>(static_cast<size_t>(20 - (end - buffer)));
+        }
+    }
+};
+
+} // namespace internal
+
+///////////////////////////////////////////////////////////////////////////////
+// IGenericRemoteSchemaDocumentProvider
+
+template <typename SchemaDocumentType>
+class IGenericRemoteSchemaDocumentProvider {
+public:
+    typedef typename SchemaDocumentType::Ch Ch;
+
+    virtual ~IGenericRemoteSchemaDocumentProvider() {}
+    virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericSchemaDocument
+
+//! JSON schema document.
+/*!
+    A JSON schema document is a compiled version of a JSON schema.
+    It is basically a tree of internal::Schema.
+
+    \note This is an immutable class (i.e. its instance cannot be modified after construction).
+    \tparam ValueT Type of JSON value (e.g. \c Value ), which also determine the encoding.
+    \tparam Allocator Allocator type for allocating memory of this document.
+*/
+template <typename ValueT, typename Allocator = CrtAllocator>
+class GenericSchemaDocument {
+public:
+    typedef ValueT ValueType;
+    typedef IGenericRemoteSchemaDocumentProvider<GenericSchemaDocument> IRemoteSchemaDocumentProviderType;
+    typedef Allocator AllocatorType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename EncodingType::Ch Ch;
+    typedef internal::Schema<GenericSchemaDocument> SchemaType;
+    typedef GenericPointer<ValueType, Allocator> PointerType;
+    friend class internal::Schema<GenericSchemaDocument>;
+    template <typename, typename, typename>
+    friend class GenericSchemaValidator;
+
+    //! Constructor.
+    /*!
+        Compile a JSON document into schema document.
+
+        \param document A JSON document as source.
+        \param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
+        \param allocator An optional allocator instance for allocating memory. Can be null.
+    */
+    explicit GenericSchemaDocument(const ValueType& document, IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0) :
+        remoteProvider_(remoteProvider),
+        allocator_(allocator),
+        ownAllocator_(),
+        root_(),
+        schemaMap_(allocator, kInitialSchemaMapSize),
+        schemaRef_(allocator, kInitialSchemaRefSize)
+    {
+        if (!allocator_)
+            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
+
+        // Generate root schema, it will call CreateSchema() to create sub-schemas,
+        // And call AddRefSchema() if there are $ref.
+        CreateSchemaRecursive(&root_, PointerType(), document, document);
+
+        // Resolve $ref
+        while (!schemaRef_.Empty()) {
+            SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
+            if (const SchemaType* s = GetSchema(refEntry->target)) {
+                if (refEntry->schema)
+                    *refEntry->schema = s;
+
+                // Create entry in map if not exist
+                if (!GetSchema(refEntry->source)) {
+                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false, allocator_);
+                }
+            }
+            refEntry->~SchemaRefEntry();
+        }
+
+        CEREAL_RAPIDJSON_ASSERT(root_ != 0);
+
+        schemaRef_.ShrinkToFit(); // Deallocate all memory for ref
+    }
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    //! Move constructor in C++11
+    GenericSchemaDocument(GenericSchemaDocument&& rhs) CEREAL_RAPIDJSON_NOEXCEPT :
+        remoteProvider_(rhs.remoteProvider_),
+        allocator_(rhs.allocator_),
+        ownAllocator_(rhs.ownAllocator_),
+        root_(rhs.root_),
+        schemaMap_(std::move(rhs.schemaMap_)),
+        schemaRef_(std::move(rhs.schemaRef_))
+    {
+        rhs.remoteProvider_ = 0;
+        rhs.allocator_ = 0;
+        rhs.ownAllocator_ = 0;
+    }
+#endif
+
+    //! Destructor
+    ~GenericSchemaDocument() {
+        while (!schemaMap_.Empty())
+            schemaMap_.template Pop<SchemaEntry>(1)->~SchemaEntry();
+
+        CEREAL_RAPIDJSON_DELETE(ownAllocator_);
+    }
+
+    //! Get the root schema.
+    const SchemaType& GetRoot() const { return *root_; }
+
+private:
+    //! Prohibit copying
+    GenericSchemaDocument(const GenericSchemaDocument&);
+    //! Prohibit assignment
+    GenericSchemaDocument& operator=(const GenericSchemaDocument&);
+
+    struct SchemaRefEntry {
+        SchemaRefEntry(const PointerType& s, const PointerType& t, const SchemaType** outSchema, Allocator *allocator) : source(s, allocator), target(t, allocator), schema(outSchema) {}
+        PointerType source;
+        PointerType target;
+        const SchemaType** schema;
+    };
+
+    struct SchemaEntry {
+        SchemaEntry(const PointerType& p, SchemaType* s, bool o, Allocator* allocator) : pointer(p, allocator), schema(s), owned(o) {}
+        ~SchemaEntry() {
+            if (owned) {
+                schema->~SchemaType();
+                Allocator::Free(schema);
+            }
+        }
+        PointerType pointer;
+        SchemaType* schema;
+        bool owned;
+    };
+
+    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
+        if (schema)
+            *schema = SchemaType::GetTypeless();
+
+        if (v.GetType() == kObjectType) {
+            const SchemaType* s = GetSchema(pointer);
+            if (!s)
+                CreateSchema(schema, pointer, v, document);
+
+            for (typename ValueType::ConstMemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
+                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document);
+        }
+        else if (v.GetType() == kArrayType)
+            for (SizeType i = 0; i < v.Size(); i++)
+                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document);
+    }
+
+    void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
+        CEREAL_RAPIDJSON_ASSERT(pointer.IsValid());
+        if (v.IsObject()) {
+            if (!HandleRefSchema(pointer, schema, v, document)) {
+                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_);
+                new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true, allocator_);
+                if (schema)
+                    *schema = s;
+            }
+        }
+    }
+
+    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document) {
+        static const Ch kRefString[] = { '$', 'r', 'e', 'f', '\0' };
+        static const ValueType kRefValue(kRefString, 4);
+
+        typename ValueType::ConstMemberIterator itr = v.FindMember(kRefValue);
+        if (itr == v.MemberEnd())
+            return false;
+
+        if (itr->value.IsString()) {
+            SizeType len = itr->value.GetStringLength();
+            if (len > 0) {
+                const Ch* s = itr->value.GetString();
+                SizeType i = 0;
+                while (i < len && s[i] != '#') // Find the first #
+                    i++;
+
+                if (i > 0) { // Remote reference, resolve immediately
+                    if (remoteProvider_) {
+                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(s, i - 1)) {
+                            PointerType pointer(&s[i], len - i, allocator_);
+                            if (pointer.IsValid()) {
+                                if (const SchemaType* sc = remoteDocument->GetSchema(pointer)) {
+                                    if (schema)
+                                        *schema = sc;
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (s[i] == '#') { // Local reference, defer resolution
+                    PointerType pointer(&s[i], len - i, allocator_);
+                    if (pointer.IsValid()) {
+                        if (const ValueType* nv = pointer.Get(document))
+                            if (HandleRefSchema(source, schema, *nv, document))
+                                return true;
+
+                        new (schemaRef_.template Push<SchemaRefEntry>()) SchemaRefEntry(source, pointer, schema, allocator_);
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    const SchemaType* GetSchema(const PointerType& pointer) const {
+        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
+            if (pointer == target->pointer)
+                return target->schema;
+        return 0;
+    }
+
+    PointerType GetPointer(const SchemaType* schema) const {
+        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
+            if (schema == target->schema)
+                return target->pointer;
+        return PointerType();
+    }
+
+    static const size_t kInitialSchemaMapSize = 64;
+    static const size_t kInitialSchemaRefSize = 64;
+
+    IRemoteSchemaDocumentProviderType* remoteProvider_;
+    Allocator *allocator_;
+    Allocator *ownAllocator_;
+    const SchemaType* root_;                //!< Root schema.
+    internal::Stack<Allocator> schemaMap_;  // Stores created Pointer -> Schemas
+    internal::Stack<Allocator> schemaRef_;  // Stores Pointer from $ref and schema which holds the $ref
+};
+
+//! GenericSchemaDocument using Value type.
+typedef GenericSchemaDocument<Value> SchemaDocument;
+//! IGenericRemoteSchemaDocumentProvider using SchemaDocument.
+typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericSchemaValidator
+
+//! JSON Schema Validator.
+/*!
+    A SAX style JSON schema validator.
+    It uses a \c GenericSchemaDocument to validate SAX events.
+    It delegates the incoming SAX events to an output handler.
+    The default output handler does nothing.
+    It can be reused multiple times by calling \c Reset().
+
+    \tparam SchemaDocumentType Type of schema document.
+    \tparam OutputHandler Type of output handler. Default handler does nothing.
+    \tparam StateAllocator Allocator for storing the internal validation states.
+*/
+template <
+    typename SchemaDocumentType,
+    typename OutputHandler = BaseReaderHandler<typename SchemaDocumentType::SchemaType::EncodingType>,
+    typename StateAllocator = CrtAllocator>
+class GenericSchemaValidator :
+    public internal::ISchemaStateFactory<typename SchemaDocumentType::SchemaType>, 
+    public internal::ISchemaValidator
+{
+public:
+    typedef typename SchemaDocumentType::SchemaType SchemaType;
+    typedef typename SchemaDocumentType::PointerType PointerType;
+    typedef typename SchemaType::EncodingType EncodingType;
+    typedef typename EncodingType::Ch Ch;
+
+    //! Constructor without output handler.
+    /*!
+        \param schemaDocument The schema document to conform to.
+        \param allocator Optional allocator for storing internal validation states.
+        \param schemaStackCapacity Optional initial capacity of schema path stack.
+        \param documentStackCapacity Optional initial capacity of document path stack.
+    */
+    GenericSchemaValidator(
+        const SchemaDocumentType& schemaDocument,
+        StateAllocator* allocator = 0, 
+        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
+        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
+        :
+        schemaDocument_(&schemaDocument),
+        root_(schemaDocument.GetRoot()),
+        outputHandler_(GetNullHandler()),
+        stateAllocator_(allocator),
+        ownStateAllocator_(0),
+        schemaStack_(allocator, schemaStackCapacity),
+        documentStack_(allocator, documentStackCapacity),
+        valid_(true)
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+        , depth_(0)
+#endif
+    {
+    }
+
+    //! Constructor with output handler.
+    /*!
+        \param schemaDocument The schema document to conform to.
+        \param allocator Optional allocator for storing internal validation states.
+        \param schemaStackCapacity Optional initial capacity of schema path stack.
+        \param documentStackCapacity Optional initial capacity of document path stack.
+    */
+    GenericSchemaValidator(
+        const SchemaDocumentType& schemaDocument,
+        OutputHandler& outputHandler,
+        StateAllocator* allocator = 0, 
+        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
+        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
+        :
+        schemaDocument_(&schemaDocument),
+        root_(schemaDocument.GetRoot()),
+        outputHandler_(outputHandler),
+        stateAllocator_(allocator),
+        ownStateAllocator_(0),
+        schemaStack_(allocator, schemaStackCapacity),
+        documentStack_(allocator, documentStackCapacity),
+        valid_(true)
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+        , depth_(0)
+#endif
+    {
+    }
+
+    //! Destructor.
+    ~GenericSchemaValidator() {
+        Reset();
+        CEREAL_RAPIDJSON_DELETE(ownStateAllocator_);
+    }
+
+    //! Reset the internal states.
+    void Reset() {
+        while (!schemaStack_.Empty())
+            PopSchema();
+        documentStack_.Clear();
+        valid_ = true;
+    }
+
+    //! Checks whether the current state is valid.
+    // Implementation of ISchemaValidator
+    virtual bool IsValid() const { return valid_; }
+
+    //! Gets the JSON pointer pointed to the invalid schema.
+    PointerType GetInvalidSchemaPointer() const {
+        return schemaStack_.Empty() ? PointerType() : schemaDocument_->GetPointer(&CurrentSchema());
+    }
+
+    //! Gets the keyword of invalid schema.
+    const Ch* GetInvalidSchemaKeyword() const {
+        return schemaStack_.Empty() ? 0 : CurrentContext().invalidKeyword;
+    }
+
+    //! Gets the JSON pointer pointed to the invalid value.
+    PointerType GetInvalidDocumentPointer() const {
+        return documentStack_.Empty() ? PointerType() : PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch));
+    }
+
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
+CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN\
+    *documentStack_.template Push<Ch>() = '\0';\
+    documentStack_.template Pop<Ch>(1);\
+    internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
+CEREAL_RAPIDJSON_MULTILINEMACRO_END
+#else
+#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
+#endif
+
+#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
+    if (!valid_) return false; \
+    if (!BeginValue() || !CurrentSchema().method arg1) {\
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
+        return valid_ = false;\
+    }
+
+#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
+    for (Context* context = schemaStack_.template Bottom<Context>(); context != schemaStack_.template End<Context>(); context++) {\
+        if (context->hasher)\
+            static_cast<HasherType*>(context->hasher)->method arg2;\
+        if (context->validators)\
+            for (SizeType i_ = 0; i_ < context->validatorCount; i_++)\
+                static_cast<GenericSchemaValidator*>(context->validators[i_])->method arg2;\
+        if (context->patternPropertiesValidators)\
+            for (SizeType i_ = 0; i_ < context->patternPropertiesValidatorCount; i_++)\
+                static_cast<GenericSchemaValidator*>(context->patternPropertiesValidators[i_])->method arg2;\
+    }
+
+#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_(method, arg2)\
+    return valid_ = EndValue() && outputHandler_.method arg2
+
+#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(method, arg1, arg2) \
+    CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_   (method, arg1);\
+    CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2);\
+    CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_     (method, arg2)
+
+    bool Null()             { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Null,   (CurrentContext()   ), ( )); }
+    bool Bool(bool b)       { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Bool,   (CurrentContext(), b), (b)); }
+    bool Int(int i)         { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int,    (CurrentContext(), i), (i)); }
+    bool Uint(unsigned u)   { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint,   (CurrentContext(), u), (u)); }
+    bool Int64(int64_t i)   { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int64,  (CurrentContext(), i), (i)); }
+    bool Uint64(uint64_t u) { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint64, (CurrentContext(), u), (u)); }
+    bool Double(double d)   { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Double, (CurrentContext(), d), (d)); }
+    bool RawNumber(const Ch* str, SizeType length, bool copy)
+                                    { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
+    bool String(const Ch* str, SizeType length, bool copy)
+                                    { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
+
+    bool StartObject() {
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
+        return valid_ = outputHandler_.StartObject();
+    }
+    
+    bool Key(const Ch* str, SizeType len, bool copy) {
+        if (!valid_) return false;
+        AppendToken(str, len);
+        if (!CurrentSchema().Key(CurrentContext(), str, len, copy)) return valid_ = false;
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
+        return valid_ = outputHandler_.Key(str, len, copy);
+    }
+    
+    bool EndObject(SizeType memberCount) { 
+        if (!valid_) return false;
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
+        if (!CurrentSchema().EndObject(CurrentContext(), memberCount)) return valid_ = false;
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
+    }
+
+    bool StartArray() {
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
+        return valid_ = outputHandler_.StartArray();
+    }
+    
+    bool EndArray(SizeType elementCount) {
+        if (!valid_) return false;
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
+        if (!CurrentSchema().EndArray(CurrentContext(), elementCount)) return valid_ = false;
+        CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
+    }
+
+#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
+#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_
+#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
+#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_
+
+    // Implementation of ISchemaStateFactory<SchemaType>
+    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root) {
+        return new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root,
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+        depth_ + 1,
+#endif
+        &GetStateAllocator());
+    }
+
+    virtual void DestroySchemaValidator(ISchemaValidator* validator) {
+        GenericSchemaValidator* v = static_cast<GenericSchemaValidator*>(validator);
+        v->~GenericSchemaValidator();
+        StateAllocator::Free(v);
+    }
+
+    virtual void* CreateHasher() {
+        return new (GetStateAllocator().Malloc(sizeof(HasherType))) HasherType(&GetStateAllocator());
+    }
+
+    virtual uint64_t GetHashCode(void* hasher) {
+        return static_cast<HasherType*>(hasher)->GetHashCode();
+    }
+
+    virtual void DestroryHasher(void* hasher) {
+        HasherType* h = static_cast<HasherType*>(hasher);
+        h->~HasherType();
+        StateAllocator::Free(h);
+    }
+
+    virtual void* MallocState(size_t size) {
+        return GetStateAllocator().Malloc(size);
+    }
+
+    virtual void FreeState(void* p) {
+        return StateAllocator::Free(p);
+    }
+
+private:
+    typedef typename SchemaType::Context Context;
+    typedef GenericValue<UTF8<>, StateAllocator> HashCodeArray;
+    typedef internal::Hasher<EncodingType, StateAllocator> HasherType;
+
+    GenericSchemaValidator( 
+        const SchemaDocumentType& schemaDocument,
+        const SchemaType& root,
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+        unsigned depth,
+#endif
+        StateAllocator* allocator = 0,
+        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
+        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
+        :
+        schemaDocument_(&schemaDocument),
+        root_(root),
+        outputHandler_(GetNullHandler()),
+        stateAllocator_(allocator),
+        ownStateAllocator_(0),
+        schemaStack_(allocator, schemaStackCapacity),
+        documentStack_(allocator, documentStackCapacity),
+        valid_(true)
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+        , depth_(depth)
+#endif
+    {
+    }
+
+    StateAllocator& GetStateAllocator() {
+        if (!stateAllocator_)
+            stateAllocator_ = ownStateAllocator_ = CEREAL_RAPIDJSON_NEW(StateAllocator());
+        return *stateAllocator_;
+    }
+
+    bool BeginValue() {
+        if (schemaStack_.Empty())
+            PushSchema(root_);
+        else {
+            if (CurrentContext().inArray)
+                internal::TokenHelper<internal::Stack<StateAllocator>, Ch>::AppendIndexToken(documentStack_, CurrentContext().arrayElementIndex);
+
+            if (!CurrentSchema().BeginValue(CurrentContext()))
+                return false;
+
+            SizeType count = CurrentContext().patternPropertiesSchemaCount;
+            const SchemaType** sa = CurrentContext().patternPropertiesSchemas;
+            typename Context::PatternValidatorType patternValidatorType = CurrentContext().valuePatternValidatorType;
+            bool valueUniqueness = CurrentContext().valueUniqueness;
+            if (CurrentContext().valueSchema)
+                PushSchema(*CurrentContext().valueSchema);
+
+            if (count > 0) {
+                CurrentContext().objectPatternValidatorType = patternValidatorType;
+                ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
+                SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
+                va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
+                for (SizeType i = 0; i < count; i++)
+                    va[validatorCount++] = CreateSchemaValidator(*sa[i]);
+            }
+
+            CurrentContext().arrayUniqueness = valueUniqueness;
+        }
+        return true;
+    }
+
+    bool EndValue() {
+        if (!CurrentSchema().EndValue(CurrentContext()))
+            return false;
+
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+        GenericStringBuffer<EncodingType> sb;
+        schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
+
+        *documentStack_.template Push<Ch>() = '\0';
+        documentStack_.template Pop<Ch>(1);
+        internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
+#endif
+
+        uint64_t h = CurrentContext().arrayUniqueness ? static_cast<HasherType*>(CurrentContext().hasher)->GetHashCode() : 0;
+        
+        PopSchema();
+
+        if (!schemaStack_.Empty()) {
+            Context& context = CurrentContext();
+            if (context.valueUniqueness) {
+                HashCodeArray* a = static_cast<HashCodeArray*>(context.arrayElementHashCodes);
+                if (!a)
+                    CurrentContext().arrayElementHashCodes = a = new (GetStateAllocator().Malloc(sizeof(HashCodeArray))) HashCodeArray(kArrayType);
+                for (typename HashCodeArray::ConstValueIterator itr = a->Begin(); itr != a->End(); ++itr)
+                    if (itr->GetUint64() == h)
+                        CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(SchemaType::GetUniqueItemsString());
+                a->PushBack(h, GetStateAllocator());
+            }
+        }
+
+        // Remove the last token of document pointer
+        while (!documentStack_.Empty() && *documentStack_.template Pop<Ch>(1) != '/')
+            ;
+
+        return true;
+    }
+
+    void AppendToken(const Ch* str, SizeType len) {
+        documentStack_.template Reserve<Ch>(1 + len * 2); // worst case all characters are escaped as two characters
+        *documentStack_.template PushUnsafe<Ch>() = '/';
+        for (SizeType i = 0; i < len; i++) {
+            if (str[i] == '~') {
+                *documentStack_.template PushUnsafe<Ch>() = '~';
+                *documentStack_.template PushUnsafe<Ch>() = '0';
+            }
+            else if (str[i] == '/') {
+                *documentStack_.template PushUnsafe<Ch>() = '~';
+                *documentStack_.template PushUnsafe<Ch>() = '1';
+            }
+            else
+                *documentStack_.template PushUnsafe<Ch>() = str[i];
+        }
+    }
+
+    CEREAL_RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, &schema); }
+    
+    CEREAL_RAPIDJSON_FORCEINLINE void PopSchema() {
+        Context* c = schemaStack_.template Pop<Context>(1);
+        if (HashCodeArray* a = static_cast<HashCodeArray*>(c->arrayElementHashCodes)) {
+            a->~HashCodeArray();
+            StateAllocator::Free(a);
+        }
+        c->~Context();
+    }
+
+    const SchemaType& CurrentSchema() const { return *schemaStack_.template Top<Context>()->schema; }
+    Context& CurrentContext() { return *schemaStack_.template Top<Context>(); }
+    const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); }
+
+    static OutputHandler& GetNullHandler() {
+        static OutputHandler nullHandler;
+        return nullHandler;
+    }
+
+    static const size_t kDefaultSchemaStackCapacity = 1024;
+    static const size_t kDefaultDocumentStackCapacity = 256;
+    const SchemaDocumentType* schemaDocument_;
+    const SchemaType& root_;
+    OutputHandler& outputHandler_;
+    StateAllocator* stateAllocator_;
+    StateAllocator* ownStateAllocator_;
+    internal::Stack<StateAllocator> schemaStack_;    //!< stack to store the current path of schema (BaseSchemaType *)
+    internal::Stack<StateAllocator> documentStack_;  //!< stack to store the current path of validating document (Ch)
+    bool valid_;
+#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
+    unsigned depth_;
+#endif
+};
+
+typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
+
+///////////////////////////////////////////////////////////////////////////////
+// SchemaValidatingReader
+
+//! A helper class for parsing with validation.
+/*!
+    This helper class is a functor, designed as a parameter of \ref GenericDocument::Populate().
+
+    \tparam parseFlags Combination of \ref ParseFlag.
+    \tparam InputStream Type of input stream, implementing Stream concept.
+    \tparam SourceEncoding Encoding of the input stream.
+    \tparam SchemaDocumentType Type of schema document.
+    \tparam StackAllocator Allocator type for stack.
+*/
+template <
+    unsigned parseFlags,
+    typename InputStream,
+    typename SourceEncoding,
+    typename SchemaDocumentType = SchemaDocument,
+    typename StackAllocator = CrtAllocator>
+class SchemaValidatingReader {
+public:
+    typedef typename SchemaDocumentType::PointerType PointerType;
+    typedef typename InputStream::Ch Ch;
+
+    //! Constructor
+    /*!
+        \param is Input stream.
+        \param sd Schema document.
+    */
+    SchemaValidatingReader(InputStream& is, const SchemaDocumentType& sd) : is_(is), sd_(sd), invalidSchemaKeyword_(), isValid_(true) {}
+
+    template <typename Handler>
+    bool operator()(Handler& handler) {
+        GenericReader<SourceEncoding, typename SchemaDocumentType::EncodingType, StackAllocator> reader;
+        GenericSchemaValidator<SchemaDocumentType, Handler> validator(sd_, handler);
+        parseResult_ = reader.template Parse<parseFlags>(is_, validator);
+
+        isValid_ = validator.IsValid();
+        if (isValid_) {
+            invalidSchemaPointer_ = PointerType();
+            invalidSchemaKeyword_ = 0;
+            invalidDocumentPointer_ = PointerType();
+        }
+        else {
+            invalidSchemaPointer_ = validator.GetInvalidSchemaPointer();
+            invalidSchemaKeyword_ = validator.GetInvalidSchemaKeyword();
+            invalidDocumentPointer_ = validator.GetInvalidDocumentPointer();
+        }
+
+        return parseResult_;
+    }
+
+    const ParseResult& GetParseResult() const { return parseResult_; }
+    bool IsValid() const { return isValid_; }
+    const PointerType& GetInvalidSchemaPointer() const { return invalidSchemaPointer_; }
+    const Ch* GetInvalidSchemaKeyword() const { return invalidSchemaKeyword_; }
+    const PointerType& GetInvalidDocumentPointer() const { return invalidDocumentPointer_; }
+
+private:
+    InputStream& is_;
+    const SchemaDocumentType& sd_;
+
+    ParseResult parseResult_;
+    PointerType invalidSchemaPointer_;
+    const Ch* invalidSchemaKeyword_;
+    PointerType invalidDocumentPointer_;
+    bool isValid_;
+};
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+CEREAL_RAPIDJSON_DIAG_POP
+
+#endif // CEREAL_RAPIDJSON_SCHEMA_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/stream.h b/Src/External/cereal/include/cereal/external/rapidjson/stream.h
new file mode 100644
index 0000000..c05c2d4
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/stream.h
@@ -0,0 +1,179 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#include "rapidjson.h"
+
+#ifndef CEREAL_RAPIDJSON_STREAM_H_
+#define CEREAL_RAPIDJSON_STREAM_H_
+
+#include "encodings.h"
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+//  Stream
+
+/*! \class rapidjson::Stream
+    \brief Concept for reading and writing characters.
+
+    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
+
+    For write-only stream, only need to implement Put() and Flush().
+
+\code
+concept Stream {
+    typename Ch;    //!< Character type of the stream.
+
+    //! Read the current character from stream without moving the read cursor.
+    Ch Peek() const;
+
+    //! Read the current character from stream and moving the read cursor to next character.
+    Ch Take();
+
+    //! Get the current read cursor.
+    //! \return Number of characters read from start.
+    size_t Tell();
+
+    //! Begin writing operation at the current read pointer.
+    //! \return The begin writer pointer.
+    Ch* PutBegin();
+
+    //! Write a character.
+    void Put(Ch c);
+
+    //! Flush the buffer.
+    void Flush();
+
+    //! End the writing operation.
+    //! \param begin The begin write pointer returned by PutBegin().
+    //! \return Number of characters written.
+    size_t PutEnd(Ch* begin);
+}
+\endcode
+*/
+
+//! Provides additional information for stream.
+/*!
+    By using traits pattern, this type provides a default configuration for stream.
+    For custom stream, this type can be specialized for other configuration.
+    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
+*/
+template<typename Stream>
+struct StreamTraits {
+    //! Whether to make local copy of stream for optimization during parsing.
+    /*!
+        By default, for safety, streams do not use local copy optimization.
+        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
+    */
+    enum { copyOptimization = 0 };
+};
+
+//! Reserve n characters for writing to a stream.
+template<typename Stream>
+inline void PutReserve(Stream& stream, size_t count) {
+    (void)stream;
+    (void)count;
+}
+
+//! Write character to a stream, presuming buffer is reserved.
+template<typename Stream>
+inline void PutUnsafe(Stream& stream, typename Stream::Ch c) {
+    stream.Put(c);
+}
+
+//! Put N copies of a character to a stream.
+template<typename Stream, typename Ch>
+inline void PutN(Stream& stream, Ch c, size_t n) {
+    PutReserve(stream, n);
+    for (size_t i = 0; i < n; i++)
+        PutUnsafe(stream, c);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// StringStream
+
+//! Read-only string stream.
+/*! \note implements Stream concept
+*/
+template <typename Encoding>
+struct GenericStringStream {
+    typedef typename Encoding::Ch Ch;
+
+    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
+
+    Ch Peek() const { return *src_; }
+    Ch Take() { return *src_++; }
+    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
+
+    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
+    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
+
+    const Ch* src_;     //!< Current read position.
+    const Ch* head_;    //!< Original head of the string.
+};
+
+template <typename Encoding>
+struct StreamTraits<GenericStringStream<Encoding> > {
+    enum { copyOptimization = 1 };
+};
+
+//! String stream with UTF8 encoding.
+typedef GenericStringStream<UTF8<> > StringStream;
+
+///////////////////////////////////////////////////////////////////////////////
+// InsituStringStream
+
+//! A read-write string stream.
+/*! This string stream is particularly designed for in-situ parsing.
+    \note implements Stream concept
+*/
+template <typename Encoding>
+struct GenericInsituStringStream {
+    typedef typename Encoding::Ch Ch;
+
+    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
+
+    // Read
+    Ch Peek() { return *src_; }
+    Ch Take() { return *src_++; }
+    size_t Tell() { return static_cast<size_t>(src_ - head_); }
+
+    // Write
+    void Put(Ch c) { CEREAL_RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
+
+    Ch* PutBegin() { return dst_ = src_; }
+    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
+    void Flush() {}
+
+    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
+    void Pop(size_t count) { dst_ -= count; }
+
+    Ch* src_;
+    Ch* dst_;
+    Ch* head_;
+};
+
+template <typename Encoding>
+struct StreamTraits<GenericInsituStringStream<Encoding> > {
+    enum { copyOptimization = 1 };
+};
+
+//! Insitu string stream with UTF8 encoding.
+typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#endif // CEREAL_RAPIDJSON_STREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h b/Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h
new file mode 100644
index 0000000..76eb730
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h
@@ -0,0 +1,117 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_STRINGBUFFER_H_
+#define CEREAL_RAPIDJSON_STRINGBUFFER_H_
+
+#include "stream.h"
+#include "internal/stack.h"
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+#include <utility> // std::move
+#endif
+
+#include "internal/stack.h"
+
+#if defined(__clang__)
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+//! Represents an in-memory output stream.
+/*!
+    \tparam Encoding Encoding of the stream.
+    \tparam Allocator type for allocating memory buffer.
+    \note implements Stream concept
+*/
+template <typename Encoding, typename Allocator = CrtAllocator>
+class GenericStringBuffer {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
+
+#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericStringBuffer(GenericStringBuffer&& rhs) : stack_(std::move(rhs.stack_)) {}
+    GenericStringBuffer& operator=(GenericStringBuffer&& rhs) {
+        if (&rhs != this)
+            stack_ = std::move(rhs.stack_);
+        return *this;
+    }
+#endif
+
+    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
+    void PutUnsafe(Ch c) { *stack_.template PushUnsafe<Ch>() = c; }
+    void Flush() {}
+
+    void Clear() { stack_.Clear(); }
+    void ShrinkToFit() {
+        // Push and pop a null terminator. This is safe.
+        *stack_.template Push<Ch>() = '\0';
+        stack_.ShrinkToFit();
+        stack_.template Pop<Ch>(1);
+    }
+
+    void Reserve(size_t count) { stack_.template Reserve<Ch>(count); }
+    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
+    Ch* PushUnsafe(size_t count) { return stack_.template PushUnsafe<Ch>(count); }
+    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
+
+    const Ch* GetString() const {
+        // Push and pop a null terminator. This is safe.
+        *stack_.template Push<Ch>() = '\0';
+        stack_.template Pop<Ch>(1);
+
+        return stack_.template Bottom<Ch>();
+    }
+
+    size_t GetSize() const { return stack_.GetSize(); }
+
+    static const size_t kDefaultCapacity = 256;
+    mutable internal::Stack<Allocator> stack_;
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    GenericStringBuffer(const GenericStringBuffer&);
+    GenericStringBuffer& operator=(const GenericStringBuffer&);
+};
+
+//! String buffer with UTF8 encoding
+typedef GenericStringBuffer<UTF8<> > StringBuffer;
+
+template<typename Encoding, typename Allocator>
+inline void PutReserve(GenericStringBuffer<Encoding, Allocator>& stream, size_t count) {
+    stream.Reserve(count);
+}
+
+template<typename Encoding, typename Allocator>
+inline void PutUnsafe(GenericStringBuffer<Encoding, Allocator>& stream, typename Encoding::Ch c) {
+    stream.PutUnsafe(c);
+}
+
+//! Implement specialized version of PutN() with memset() for better performance.
+template<>
+inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
+    std::memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
+}
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__)
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_STRINGBUFFER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/writer.h b/Src/External/cereal/include/cereal/external/rapidjson/writer.h
new file mode 100644
index 0000000..ae86cb5
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidjson/writer.h
@@ -0,0 +1,610 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef CEREAL_RAPIDJSON_WRITER_H_
+#define CEREAL_RAPIDJSON_WRITER_H_
+
+#include "stream.h"
+#include "internal/stack.h"
+#include "internal/strfunc.h"
+#include "internal/dtoa.h"
+#include "internal/itoa.h"
+#include "stringbuffer.h"
+#include <new>      // placement new
+
+#if defined(CEREAL_RAPIDJSON_SIMD) && defined(_MSC_VER)
+#include <intrin.h>
+#pragma intrinsic(_BitScanForward)
+#endif
+#ifdef CEREAL_RAPIDJSON_SSE42
+#include <nmmintrin.h>
+#elif defined(CEREAL_RAPIDJSON_SSE2)
+#include <emmintrin.h>
+#endif
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_PUSH
+CEREAL_RAPIDJSON_DIAG_OFF(padded)
+CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
+#endif
+
+CEREAL_RAPIDJSON_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////
+// WriteFlag
+
+/*! \def CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS 
+    \ingroup CEREAL_RAPIDJSON_CONFIG
+    \brief User-defined kWriteDefaultFlags definition.
+
+    User can define this as any \c WriteFlag combinations.
+*/
+#ifndef CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS
+#define CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNoFlags
+#endif
+
+//! Combination of writeFlags
+enum WriteFlag {
+    kWriteNoFlags = 0,              //!< No flags are set.
+    kWriteValidateEncodingFlag = 1, //!< Validate encoding of JSON strings.
+    kWriteNanAndInfFlag = 2,        //!< Allow writing of Inf, -Inf and NaN.
+    kWriteDefaultFlags = CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS  //!< Default write flags. Can be customized by defining CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS
+};
+
+//! JSON writer
+/*! Writer implements the concept Handler.
+    It generates JSON text by events to an output os.
+
+    User may programmatically calls the functions of a writer to generate JSON text.
+
+    On the other side, a writer can also be passed to objects that generates events, 
+
+    for example Reader::Parse() and Document::Accept().
+
+    \tparam OutputStream Type of output stream.
+    \tparam SourceEncoding Encoding of source string.
+    \tparam TargetEncoding Encoding of output stream.
+    \tparam StackAllocator Type of allocator for allocating memory of stack.
+    \note implements Handler concept
+*/
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
+class Writer {
+public:
+    typedef typename SourceEncoding::Ch Ch;
+
+    static const int kDefaultMaxDecimalPlaces = 324;
+
+    //! Constructor
+    /*! \param os Output stream.
+        \param stackAllocator User supplied allocator. If it is null, it will create a private one.
+        \param levelDepth Initial capacity of stack.
+    */
+    explicit
+    Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
+        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
+
+    explicit
+    Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
+        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
+
+    //! Reset the writer with a new stream.
+    /*!
+        This function reset the writer with a new stream and default settings,
+        in order to make a Writer object reusable for output multiple JSONs.
+
+        \param os New output stream.
+        \code
+        Writer<OutputStream> writer(os1);
+        writer.StartObject();
+        // ...
+        writer.EndObject();
+
+        writer.Reset(os2);
+        writer.StartObject();
+        // ...
+        writer.EndObject();
+        \endcode
+    */
+    void Reset(OutputStream& os) {
+        os_ = &os;
+        hasRoot_ = false;
+        level_stack_.Clear();
+    }
+
+    //! Checks whether the output is a complete JSON.
+    /*!
+        A complete JSON has a complete root object or array.
+    */
+    bool IsComplete() const {
+        return hasRoot_ && level_stack_.Empty();
+    }
+
+    int GetMaxDecimalPlaces() const {
+        return maxDecimalPlaces_;
+    }
+
+    //! Sets the maximum number of decimal places for double output.
+    /*!
+        This setting truncates the output with specified number of decimal places.
+
+        For example, 
+
+        \code
+        writer.SetMaxDecimalPlaces(3);
+        writer.StartArray();
+        writer.Double(0.12345);                 // "0.123"
+        writer.Double(0.0001);                  // "0.0"
+        writer.Double(1.234567890123456e30);    // "1.234567890123456e30" (do not truncate significand for positive exponent)
+        writer.Double(1.23e-4);                 // "0.0"                  (do truncate significand for negative exponent)
+        writer.EndArray();
+        \endcode
+
+        The default setting does not truncate any decimal places. You can restore to this setting by calling
+        \code
+        writer.SetMaxDecimalPlaces(Writer::kDefaultMaxDecimalPlaces);
+        \endcode
+    */
+    void SetMaxDecimalPlaces(int maxDecimalPlaces) {
+        maxDecimalPlaces_ = maxDecimalPlaces;
+    }
+
+    /*!@name Implementation of Handler
+        \see Handler
+    */
+    //@{
+
+    bool Null()                 { Prefix(kNullType);   return EndValue(WriteNull()); }
+    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return EndValue(WriteBool(b)); }
+    bool Int(int i)             { Prefix(kNumberType); return EndValue(WriteInt(i)); }
+    bool Uint(unsigned u)       { Prefix(kNumberType); return EndValue(WriteUint(u)); }
+    bool Int64(int64_t i64)     { Prefix(kNumberType); return EndValue(WriteInt64(i64)); }
+    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return EndValue(WriteUint64(u64)); }
+
+    //! Writes the given \c double value to the stream
+    /*!
+        \param d The value to be written.
+        \return Whether it is succeed.
+    */
+    bool Double(double d)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
+
+    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        Prefix(kNumberType);
+        return EndValue(WriteString(str, length));
+    }
+
+    bool String(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        Prefix(kStringType);
+        return EndValue(WriteString(str, length));
+    }
+
+#if CEREAL_RAPIDJSON_HAS_STDSTRING
+    bool String(const std::basic_string<Ch>& str) {
+        return String(str.data(), SizeType(str.size()));
+    }
+#endif
+
+    bool StartObject() {
+        Prefix(kObjectType);
+        new (level_stack_.template Push<Level>()) Level(false);
+        return WriteStartObject();
+    }
+
+    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
+
+    bool EndObject(SizeType memberCount = 0) {
+        (void)memberCount;
+        CEREAL_RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
+        CEREAL_RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
+        level_stack_.template Pop<Level>(1);
+        return EndValue(WriteEndObject());
+    }
+
+    bool StartArray() {
+        Prefix(kArrayType);
+        new (level_stack_.template Push<Level>()) Level(true);
+        return WriteStartArray();
+    }
+
+    bool EndArray(SizeType elementCount = 0) {
+        (void)elementCount;
+        CEREAL_RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
+        CEREAL_RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
+        level_stack_.template Pop<Level>(1);
+        return EndValue(WriteEndArray());
+    }
+    //@}
+
+    /*! @name Convenience extensions */
+    //@{
+
+    //! Simpler but slower overload.
+    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
+    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
+
+    //@}
+
+    //! Write a raw JSON value.
+    /*!
+        For user to write a stringified JSON as a value.
+
+        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
+        \param length Length of the json.
+        \param type Type of the root of json.
+    */
+    bool RawValue(const Ch* json, size_t length, Type type) { Prefix(type); return EndValue(WriteRawValue(json, length)); }
+
+protected:
+    //! Information for each nested level
+    struct Level {
+        Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
+        size_t valueCount;  //!< number of values in this level
+        bool inArray;       //!< true if in array, otherwise in object
+    };
+
+    static const size_t kDefaultLevelDepth = 32;
+
+    bool WriteNull()  {
+        PutReserve(*os_, 4);
+        PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
+    }
+
+    bool WriteBool(bool b)  {
+        if (b) {
+            PutReserve(*os_, 4);
+            PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'r'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'e');
+        }
+        else {
+            PutReserve(*os_, 5);
+            PutUnsafe(*os_, 'f'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 's'); PutUnsafe(*os_, 'e');
+        }
+        return true;
+    }
+
+    bool WriteInt(int i) {
+        char buffer[11];
+        const char* end = internal::i32toa(i, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
+        for (const char* p = buffer; p != end; ++p)
+            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
+        return true;
+    }
+
+    bool WriteUint(unsigned u) {
+        char buffer[10];
+        const char* end = internal::u32toa(u, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
+        for (const char* p = buffer; p != end; ++p)
+            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
+        return true;
+    }
+
+    bool WriteInt64(int64_t i64) {
+        char buffer[21];
+        const char* end = internal::i64toa(i64, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
+        for (const char* p = buffer; p != end; ++p)
+            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
+        return true;
+    }
+
+    bool WriteUint64(uint64_t u64) {
+        char buffer[20];
+        char* end = internal::u64toa(u64, buffer);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
+        for (char* p = buffer; p != end; ++p)
+            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
+        return true;
+    }
+
+    bool WriteDouble(double d) {
+        if (internal::Double(d).IsNanOrInf()) {
+            if (!(writeFlags & kWriteNanAndInfFlag))
+                return false;
+            if (internal::Double(d).IsNan()) {
+                PutReserve(*os_, 3);
+                PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
+                return true;
+            }
+            if (internal::Double(d).Sign()) {
+                PutReserve(*os_, 9);
+                PutUnsafe(*os_, '-');
+            }
+            else
+                PutReserve(*os_, 8);
+            PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
+            PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
+            return true;
+        }
+
+        char buffer[25];
+        char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
+        PutReserve(*os_, static_cast<size_t>(end - buffer));
+        for (char* p = buffer; p != end; ++p)
+            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
+        return true;
+    }
+
+    bool WriteString(const Ch* str, SizeType length)  {
+        static const typename TargetEncoding::Ch hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+        static const char escape[256] = {
+#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
+            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
+              0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
+            Z16, Z16,                                                                       // 30~4F
+              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
+            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16                                // 60~FF
+#undef Z16
+        };
+
+        if (TargetEncoding::supportUnicode)
+            PutReserve(*os_, 2 + length * 6); // "\uxxxx..."
+        else
+            PutReserve(*os_, 2 + length * 12);  // "\uxxxx\uyyyy..."
+
+        PutUnsafe(*os_, '\"');
+        GenericStringStream<SourceEncoding> is(str);
+        while (ScanWriteUnescapedString(is, length)) {
+            const Ch c = is.Peek();
+            if (!TargetEncoding::supportUnicode && static_cast<unsigned>(c) >= 0x80) {
+                // Unicode escaping
+                unsigned codepoint;
+                if (CEREAL_RAPIDJSON_UNLIKELY(!SourceEncoding::Decode(is, &codepoint)))
+                    return false;
+                PutUnsafe(*os_, '\\');
+                PutUnsafe(*os_, 'u');
+                if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
+                    PutUnsafe(*os_, hexDigits[(codepoint >> 12) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint >>  8) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint >>  4) & 15]);
+                    PutUnsafe(*os_, hexDigits[(codepoint      ) & 15]);
+                }
+                else {
+                    CEREAL_RAPIDJSON_ASSERT(codepoint >= 0x010000 && codepoint <= 0x10FFFF);
+                    // Surrogate pair
+                    unsigned s = codepoint - 0x010000;
+                    unsigned lead = (s >> 10) + 0xD800;
+                    unsigned trail = (s & 0x3FF) + 0xDC00;
+                    PutUnsafe(*os_, hexDigits[(lead >> 12) & 15]);
+                    PutUnsafe(*os_, hexDigits[(lead >>  8) & 15]);
+                    PutUnsafe(*os_, hexDigits[(lead >>  4) & 15]);
+                    PutUnsafe(*os_, hexDigits[(lead      ) & 15]);
+                    PutUnsafe(*os_, '\\');
+                    PutUnsafe(*os_, 'u');
+                    PutUnsafe(*os_, hexDigits[(trail >> 12) & 15]);
+                    PutUnsafe(*os_, hexDigits[(trail >>  8) & 15]);
+                    PutUnsafe(*os_, hexDigits[(trail >>  4) & 15]);
+                    PutUnsafe(*os_, hexDigits[(trail      ) & 15]);                    
+                }
+            }
+            else if ((sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256) && CEREAL_RAPIDJSON_UNLIKELY(escape[static_cast<unsigned char>(c)]))  {
+                is.Take();
+                PutUnsafe(*os_, '\\');
+                PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(escape[static_cast<unsigned char>(c)]));
+                if (escape[static_cast<unsigned char>(c)] == 'u') {
+                    PutUnsafe(*os_, '0');
+                    PutUnsafe(*os_, '0');
+                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) >> 4]);
+                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) & 0xF]);
+                }
+            }
+            else if (CEREAL_RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
+                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
+                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
+                return false;
+        }
+        PutUnsafe(*os_, '\"');
+        return true;
+    }
+
+    bool ScanWriteUnescapedString(GenericStringStream<SourceEncoding>& is, size_t length) {
+        return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
+    }
+
+    bool WriteStartObject() { os_->Put('{'); return true; }
+    bool WriteEndObject()   { os_->Put('}'); return true; }
+    bool WriteStartArray()  { os_->Put('['); return true; }
+    bool WriteEndArray()    { os_->Put(']'); return true; }
+
+    bool WriteRawValue(const Ch* json, size_t length) {
+        PutReserve(*os_, length);
+        for (size_t i = 0; i < length; i++) {
+            CEREAL_RAPIDJSON_ASSERT(json[i] != '\0');
+            PutUnsafe(*os_, json[i]);
+        }
+        return true;
+    }
+
+    void Prefix(Type type) {
+        (void)type;
+        if (CEREAL_RAPIDJSON_LIKELY(level_stack_.GetSize() != 0)) { // this value is not at root
+            Level* level = level_stack_.template Top<Level>();
+            if (level->valueCount > 0) {
+                if (level->inArray) 
+                    os_->Put(','); // add comma if it is not the first element in array
+                else  // in object
+                    os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
+            }
+            if (!level->inArray && level->valueCount % 2 == 0)
+                CEREAL_RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
+            level->valueCount++;
+        }
+        else {
+            CEREAL_RAPIDJSON_ASSERT(!hasRoot_);    // Should only has one and only one root.
+            hasRoot_ = true;
+        }
+    }
+
+    // Flush the value if it is the top level one.
+    bool EndValue(bool ret) {
+        if (CEREAL_RAPIDJSON_UNLIKELY(level_stack_.Empty()))   // end of json text
+            os_->Flush();
+        return ret;
+    }
+
+    OutputStream* os_;
+    internal::Stack<StackAllocator> level_stack_;
+    int maxDecimalPlaces_;
+    bool hasRoot_;
+
+private:
+    // Prohibit copy constructor & assignment operator.
+    Writer(const Writer&);
+    Writer& operator=(const Writer&);
+};
+
+// Full specialization for StringStream to prevent memory copying
+
+template<>
+inline bool Writer<StringBuffer>::WriteInt(int i) {
+    char *buffer = os_->Push(11);
+    const char* end = internal::i32toa(i, buffer);
+    os_->Pop(static_cast<size_t>(11 - (end - buffer)));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
+    char *buffer = os_->Push(10);
+    const char* end = internal::u32toa(u, buffer);
+    os_->Pop(static_cast<size_t>(10 - (end - buffer)));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
+    char *buffer = os_->Push(21);
+    const char* end = internal::i64toa(i64, buffer);
+    os_->Pop(static_cast<size_t>(21 - (end - buffer)));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
+    char *buffer = os_->Push(20);
+    const char* end = internal::u64toa(u, buffer);
+    os_->Pop(static_cast<size_t>(20 - (end - buffer)));
+    return true;
+}
+
+template<>
+inline bool Writer<StringBuffer>::WriteDouble(double d) {
+    if (internal::Double(d).IsNanOrInf()) {
+        // Note: This code path can only be reached if (CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS & kWriteNanAndInfFlag).
+        if (!(kWriteDefaultFlags & kWriteNanAndInfFlag))
+            return false;
+        if (internal::Double(d).IsNan()) {
+            PutReserve(*os_, 3);
+            PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
+            return true;
+        }
+        if (internal::Double(d).Sign()) {
+            PutReserve(*os_, 9);
+            PutUnsafe(*os_, '-');
+        }
+        else
+            PutReserve(*os_, 8);
+        PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
+        PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
+        return true;
+    }
+    
+    char *buffer = os_->Push(25);
+    char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
+    os_->Pop(static_cast<size_t>(25 - (end - buffer)));
+    return true;
+}
+
+#if defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42)
+template<>
+inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
+    if (length < 16)
+        return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
+
+    if (!CEREAL_RAPIDJSON_LIKELY(is.Tell() < length))
+        return false;
+
+    const char* p = is.src_;
+    const char* end = is.head_ + length;
+    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
+    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
+    if (nextAligned > end)
+        return true;
+
+    while (p != nextAligned)
+        if (*p < 0x20 || *p == '\"' || *p == '\\') {
+            is.src_ = p;
+            return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
+        }
+        else
+            os_->PutUnsafe(*p++);
+
+    // The rest of string using SIMD
+    static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
+    static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
+    static const char space[16]  = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
+    const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
+    const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
+    const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
+
+    for (; p != endAligned; p += 16) {
+        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
+        const __m128i t1 = _mm_cmpeq_epi8(s, dq);
+        const __m128i t2 = _mm_cmpeq_epi8(s, bs);
+        const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
+        const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
+        unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
+        if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
+            SizeType len;
+#ifdef _MSC_VER         // Find the index of first escaped
+            unsigned long offset;
+            _BitScanForward(&offset, r);
+            len = offset;
+#else
+            len = static_cast<SizeType>(__builtin_ffs(r) - 1);
+#endif
+            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
+            for (size_t i = 0; i < len; i++)
+                q[i] = p[i];
+
+            p += len;
+            break;
+        }
+        _mm_storeu_si128(reinterpret_cast<__m128i *>(os_->PushUnsafe(16)), s);
+    }
+
+    is.src_ = p;
+    return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
+}
+#endif // defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42)
+
+CEREAL_RAPIDJSON_NAMESPACE_END
+
+#ifdef _MSC_VER
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef __clang__
+CEREAL_RAPIDJSON_DIAG_POP
+#endif
+
+#endif // CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/license.txt b/Src/External/cereal/include/cereal/external/rapidxml/license.txt
new file mode 100644
index 0000000..0095bc7
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidxml/license.txt
@@ -0,0 +1,52 @@
+Use of this software is granted under one of the following two licenses,
+to be chosen freely by the user.
+
+1. Boost Software License - Version 1.0 - August 17th, 2003
+===============================================================================
+
+Copyright (c) 2006, 2007 Marcin Kalicinski
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+2. The MIT License
+===============================================================================
+
+Copyright (c) 2006, 2007 Marcin Kalicinski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
+IN THE SOFTWARE.
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/manual.html b/Src/External/cereal/include/cereal/external/rapidxml/manual.html
new file mode 100644
index 0000000..4e6a5f1
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidxml/manual.html
@@ -0,0 +1,406 @@
+<html><head><style type="text/css">
+
+          body
+          {
+          font-family: sans-serif;
+          font-size: 90%;
+          margin: 8pt 8pt 8pt 8pt;
+          text-align: justify;
+          background-color: White;
+          }
+
+          h1 { font-weight: bold; text-align: left;  }
+          h2 { font: 140% sans-serif; font-weight: bold; text-align: left;  }
+          h3 { font: 120% sans-serif; font-weight: bold; text-align: left;  }
+          h4 { font: bold 100% sans-serif; font-weight: bold; text-align: left;  }
+          h5 { font: italic 100% sans-serif; font-weight: bold; text-align: left;  }
+          h6 { font: small-caps 100% sans-serif; font-weight: bold; text-align: left;  }
+
+          code
+          {
+          font-family: &quot;Courier New&quot;, Courier, mono;
+          }
+
+          pre
+          {
+          border-top: gray 0.5pt solid;
+          border-right: gray 0.5pt solid;
+          border-left: gray 0.5pt solid;
+          border-bottom: gray 0.5pt solid;
+          padding-top: 2pt;
+          padding-right: 2pt;
+          padding-left: 2pt;
+          padding-bottom: 2pt;
+          display: block;
+          font-family: &quot;courier new&quot;, courier, mono;
+          background-color: #eeeeee;
+          }
+
+          a
+          {
+          color: #000080;
+          text-decoration: none;
+          }
+
+          a:hover
+          {
+          text-decoration: underline;
+          }
+
+          .reference-header
+          {
+          border-top: gray 0.5pt solid;
+          border-right: gray 0.5pt solid;
+          border-left: gray 0.5pt solid;
+          border-bottom: gray 0.5pt solid;
+          padding-top: 2pt;
+          padding-right: 2pt;
+          padding-left: 2pt;
+          padding-bottom: 2pt;
+          background-color: #dedede;
+          }
+
+          .parameter-name
+          {
+          font-style: italic;
+          }
+
+          .indented
+          {
+          margin-left: 0.5cm;
+          }
+
+          a.toc1
+          {
+          margin-left: 0.0cm;
+          }
+
+          a.toc2
+          {
+          margin-left: 0.75cm;
+          }
+
+          a.toc3
+          {
+          margin-left: 1.5cm;
+          }
+
+        </style></head><body><h1>RAPIDXML Manual</h1><h3>Version 1.13</h3><detaileddescription xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><para><i>Copyright (C) 2006, 2009 Marcin Kalicinski</i><br/><i>See accompanying file <a href="license.txt">license.txt</a> for license information.</i><hr/><h2 level="2">Table of Contents</h2></para><para><toc><toc-contents><a href="#namespacerapidxml_1what_is_rapidxml" class="toc1">1. What is RapidXml?</a><br/><a href="#namespacerapidxml_1dependencies_and_compatibility" class="toc2">1.1 Dependencies And Compatibility</a><br/><a href="#namespacerapidxml_1character_types_and_encodings" class="toc2">1.2 Character Types And Encodings</a><br/><a href="#namespacerapidxml_1error_handling" class="toc2">1.3 Error Handling</a><br/><a href="#namespacerapidxml_1memory_allocation" class="toc2">1.4 Memory Allocation</a><br/><a href="#namespacerapidxml_1w3c_compliance" class="toc2">1.5 W3C Compliance</a><br/><a href="#namespacerapidxml_1api_design" class="toc2">1.6 API Design</a><br/><a href="#namespacerapidxml_1reliability" class="toc2">1.7 Reliability</a><br/><a href="#namespacerapidxml_1acknowledgements" class="toc2">1.8 Acknowledgements</a><br/><a href="#namespacerapidxml_1two_minute_tutorial" class="toc1">2. Two Minute Tutorial</a><br/><a href="#namespacerapidxml_1parsing" class="toc2">2.1 Parsing</a><br/><a href="#namespacerapidxml_1accessing_dom_tree" class="toc2">2.2 Accessing The DOM Tree</a><br/><a href="#namespacerapidxml_1modifying_dom_tree" class="toc2">2.3 Modifying The DOM Tree</a><br/><a href="#namespacerapidxml_1printing" class="toc2">2.4 Printing XML</a><br/><a href="#namespacerapidxml_1differences" class="toc1">3. Differences From Regular XML Parsers</a><br/><a href="#namespacerapidxml_1lifetime_of_source_text" class="toc2">3.1 Lifetime Of Source Text</a><br/><a href="#namespacerapidxml_1ownership_of_strings" class="toc2">3.2 Ownership Of Strings</a><br/><a href="#namespacerapidxml_1destructive_non_destructive" class="toc2">3.3 Destructive Vs Non-Destructive Mode</a><br/><a href="#namespacerapidxml_1performance" class="toc1">4. Performance</a><br/><a href="#namespacerapidxml_1performance_charts" class="toc2">4.1 Comparison With Other Parsers</a><br/><a href="#namespacerapidxml_1reference" class="toc1">5. Reference</a><br/></toc-contents></toc><br/></para><sect1><h2 id="namespacerapidxml_1what_is_rapidxml">1. What is RapidXml?</h2><para><a href="http://rapidxml.sourceforge.net">RapidXml</a> is an attempt to create the fastest XML DOM parser possible, while retaining useability, portability and reasonable W3C compatibility. It is an in-situ parser written in C++, with parsing speed approaching that of <code>strlen()</code> function executed on the same data. <br/><br/>
+ Entire parser is contained in a single header file, so no building or linking is neccesary. To use it you just need to copy <code>rapidxml.hpp</code> file to a convenient place (such as your project directory), and include it where needed. You may also want to use printing functions contained in header <code>rapidxml_print.hpp</code>.</para><sect2><h3 id="namespacerapidxml_1dependencies_and_compatibility">1.1 Dependencies And Compatibility</h3><para>RapidXml has <i>no dependencies</i> other than a very small subset of standard C++ library (<code>&lt;cassert&gt;</code>, <code>&lt;cstdlib&gt;</code>, <code>&lt;new&gt;</code> and <code>&lt;exception&gt;</code>, unless exceptions are disabled). It should compile on any reasonably conformant compiler, and was tested on Visual C++ 2003, Visual C++ 2005, Visual C++ 2008, gcc 3, gcc 4, and Comeau 4.3.3. Care was taken that no warnings are produced on these compilers, even with highest warning levels enabled.</para></sect2><sect2><h3 id="namespacerapidxml_1character_types_and_encodings">1.2 Character Types And Encodings</h3><para>RapidXml is character type agnostic, and can work both with narrow and wide characters. Current version does not fully support UTF-16 or UTF-32, so use of wide characters is somewhat incapacitated. However, it should succesfully parse <code>wchar_t</code> strings containing UTF-16 or UTF-32 if endianness of the data matches that of the machine. UTF-8 is fully supported, including all numeric character references, which are expanded into appropriate UTF-8 byte sequences (unless you enable parse_no_utf8 flag). <br/><br/>
+ Note that RapidXml performs no decoding - strings returned by name() and value() functions will contain text encoded using the same encoding as source file. Rapidxml understands and expands the following character references: <code>&amp;apos; &amp;amp; &amp;quot; &amp;lt; &amp;gt; &amp;#...;</code> Other character references are not expanded.</para></sect2><sect2><h3 id="namespacerapidxml_1error_handling">1.3 Error Handling</h3><para>By default, RapidXml uses C++ exceptions to report errors. If this behaviour is undesirable, RAPIDXML_NO_EXCEPTIONS can be defined to suppress exception code. See <a href="#classrapidxml_1_1parse__error" kindref="compound">parse_error</a> class and <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">parse_error_handler()</a> function for more information.</para></sect2><sect2><h3 id="namespacerapidxml_1memory_allocation">1.4 Memory Allocation</h3><para>RapidXml uses a special memory pool object to allocate nodes and attributes, because direct allocation using <code>new</code> operator would be far too slow. Underlying memory allocations performed by the pool can be customized by use of <a href="#classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a" kindref="member">memory_pool::set_allocator()</a> function. See class <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> for more information.</para></sect2><sect2><h3 id="namespacerapidxml_1w3c_compliance">1.5 W3C Compliance</h3><para>RapidXml is not a W3C compliant parser, primarily because it ignores DOCTYPE declarations. There is a number of other, minor incompatibilities as well. Still, it can successfully parse and produce complete trees of all valid XML files in W3C conformance suite (over 1000 files specially designed to find flaws in XML processors). In destructive mode it performs whitespace normalization and character entity substitution for a small set of built-in entities.</para></sect2><sect2><h3 id="namespacerapidxml_1api_design">1.6 API Design</h3><para>RapidXml API is minimalistic, to reduce code size as much as possible, and facilitate use in embedded environments. Additional convenience functions are provided in separate headers: <code>rapidxml_utils.hpp</code> and <code><a href="#rapidxml__print_8hpp" kindref="compound">rapidxml_print.hpp</a></code>. Contents of these headers is not an essential part of the library, and is currently not documented (otherwise than with comments in code).</para></sect2><sect2><h3 id="namespacerapidxml_1reliability">1.7 Reliability</h3><para>RapidXml is very robust and comes with a large harness of unit tests. Special care has been taken to ensure stability of the parser no matter what source text is thrown at it. One of the unit tests produces 100,000 randomly corrupted variants of XML document, which (when uncorrupted) contains all constructs recognized by RapidXml. RapidXml passes this test when it correctly recognizes that errors have been introduced, and does not crash or loop indefinitely. <br/><br/>
+ Another unit test puts RapidXml head-to-head with another, well estabilished XML parser, and verifies that their outputs match across a wide variety of small and large documents. <br/><br/>
+ Yet another test feeds RapidXml with over 1000 test files from W3C compliance suite, and verifies that correct results are obtained. There are also additional tests that verify each API function separately, and test that various parsing modes work as expected.</para></sect2><sect2><h3 id="namespacerapidxml_1acknowledgements">1.8 Acknowledgements</h3><para>I would like to thank Arseny Kapoulkine for his work on <a href="http://code.google.com/p/pugixml">pugixml</a>, which was an inspiration for this project. Additional thanks go to Kristen Wegner for creating <a href="http://www.codeproject.com/soap/pugxml.asp">pugxml</a>, from which pugixml was derived. Janusz Wohlfeil kindly ran RapidXml speed tests on hardware that I did not have access to, allowing me to expand performance comparison table.</para></sect2></sect1><sect1><h2 id="namespacerapidxml_1two_minute_tutorial">2. Two Minute Tutorial</h2><sect2><h3 id="namespacerapidxml_1parsing">2.1 Parsing</h3><para>The following code causes RapidXml to parse a zero-terminated string named <code>text</code>: <pre>using namespace rapidxml;
+xml_document&lt;&gt; doc;    // character type defaults to char
+doc.parse&lt;0&gt;(text);    // 0 means default parse flags
+</pre><code>doc</code> object is now a root of DOM tree containing representation of the parsed XML. Because all RapidXml interface is contained inside namespace <code>rapidxml</code>, users must either bring contents of this namespace into scope, or fully qualify all the names. Class <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> represents a root of the DOM hierarchy. By means of public inheritance, it is also an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and a <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a>. Template parameter of <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function is used to specify parsing flags, with which you can fine-tune behaviour of the parser. Note that flags must be a compile-time constant.</para></sect2><sect2><h3 id="namespacerapidxml_1accessing_dom_tree">2.2 Accessing The DOM Tree</h3><para>To access the DOM tree, use methods of <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and <a href="#classrapidxml_1_1xml__attribute" kindref="compound">xml_attribute</a> classes: <pre>cout &lt;&lt; &quot;Name of my first node is: &quot; &lt;&lt; doc.first_node()-&gt;name() &lt;&lt; &quot;\n&quot;;
+xml_node&lt;&gt; *node = doc.first_node(&quot;foobar&quot;);
+cout &lt;&lt; &quot;Node foobar has value &quot; &lt;&lt; node-&gt;value() &lt;&lt; &quot;\n&quot;;
+for (xml_attribute&lt;&gt; *attr = node-&gt;first_attribute();
+     attr; attr = attr-&gt;next_attribute())
+{
+    cout &lt;&lt; &quot;Node foobar has attribute &quot; &lt;&lt; attr-&gt;name() &lt;&lt; &quot; &quot;;
+    cout &lt;&lt; &quot;with value &quot; &lt;&lt; attr-&gt;value() &lt;&lt; &quot;\n&quot;;
+}
+</pre></para></sect2><sect2><h3 id="namespacerapidxml_1modifying_dom_tree">2.3 Modifying The DOM Tree</h3><para>DOM tree produced by the parser is fully modifiable. Nodes and attributes can be added/removed, and their contents changed. The below example creates a HTML document, whose sole contents is a link to google.com website: <pre>xml_document&lt;&gt; doc;
+xml_node&lt;&gt; *node = doc.allocate_node(node_element, &quot;a&quot;, &quot;Google&quot;);
+doc.append_node(node);
+xml_attribute&lt;&gt; *attr = doc.allocate_attribute(&quot;href&quot;, &quot;google.com&quot;);
+node-&gt;append_attribute(attr);
+</pre> One quirk is that nodes and attributes <i>do not own</i> the text of their names and values. This is because normally they only store pointers to the source text. So, when assigning a new name or value to the node, care must be taken to ensure proper lifetime of the string. The easiest way to achieve it is to allocate the string from the <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> memory pool. In the above example this is not necessary, because we are only assigning character constants. But the code below uses <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859" kindref="member">memory_pool::allocate_string()</a> function to allocate node name (which will have the same lifetime as the document), and assigns it to a new node: <pre>xml_document&lt;&gt; doc;
+char *node_name = doc.allocate_string(name);        // Allocate string and copy name into it
+xml_node&lt;&gt; *node = doc.allocate_node(node_element, node_name);  // Set node name to node_name
+</pre> Check <a href="#namespacerapidxml_1reference" kindref="member">Reference</a>  section for description of the entire interface.</para></sect2><sect2><h3 id="namespacerapidxml_1printing">2.4 Printing XML</h3><para>You can print <code><a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a></code> and <code><a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a></code> objects into an XML string. Use <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1" kindref="member">print()</a> function or operator &lt;&lt;, which are defined in <code><a href="#rapidxml__print_8hpp" kindref="compound">rapidxml_print.hpp</a></code> header. <pre>using namespace rapidxml;
+xml_document&lt;&gt; doc;    // character type defaults to char
+// ... some code to fill the document
+
+// Print to stream using operator &lt;&lt;
+std::cout &lt;&lt; doc;   
+
+// Print to stream using print function, specifying printing flags
+print(std::cout, doc, 0);   // 0 means default printing flags
+
+// Print to string using output iterator
+std::string s;
+print(std::back_inserter(s), doc, 0);
+
+// Print to memory buffer using output iterator
+char buffer[4096];                      // You are responsible for making the buffer large enough!
+char *end = print(buffer, doc, 0);      // end contains pointer to character after last printed character
+*end = 0;                               // Add string terminator after XML
+</pre></para></sect2></sect1><sect1><h2 id="namespacerapidxml_1differences">3. Differences From Regular XML Parsers</h2><para>RapidXml is an <i>in-situ parser</i>, which allows it to achieve very high parsing speed. In-situ means that parser does not make copies of strings. Instead, it places pointers to the <i>source text</i> in the DOM hierarchy.</para><sect2><h3 id="namespacerapidxml_1lifetime_of_source_text">3.1 Lifetime Of Source Text</h3><para>In-situ parsing requires that source text lives at least as long as the document object. If source text is destroyed, names and values of nodes in DOM tree will become destroyed as well. Additionally, whitespace processing, character entity translation, and zero-termination of strings require that source text be modified during parsing (but see non-destructive mode). This makes the text useless for further processing once it was parsed by RapidXml. <br/><br/>
+ In many cases however, these are not serious issues.</para></sect2><sect2><h3 id="namespacerapidxml_1ownership_of_strings">3.2 Ownership Of Strings</h3><para>Nodes and attributes produced by RapidXml do not own their name and value strings. They merely hold the pointers to them. This means you have to be careful when setting these values manually, by using <a href="#classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e" kindref="member">xml_base::name(const Ch *)</a> or <a href="#classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c" kindref="member">xml_base::value(const Ch *)</a> functions. Care must be taken to ensure that lifetime of the string passed is at least as long as lifetime of the node/attribute. The easiest way to achieve it is to allocate the string from <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> owned by the document. Use <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859" kindref="member">memory_pool::allocate_string()</a> function for this purpose.</para></sect2><sect2><h3 id="namespacerapidxml_1destructive_non_destructive">3.3 Destructive Vs Non-Destructive Mode</h3><para>By default, the parser modifies source text during the parsing process. This is required to achieve character entity translation, whitespace normalization, and zero-termination of strings. <br/><br/>
+ In some cases this behaviour may be undesirable, for example if source text resides in read only memory, or is mapped to memory directly from file. By using appropriate parser flags (parse_non_destructive), source text modifications can be disabled. However, because RapidXml does in-situ parsing, it obviously has the following side-effects:<ul><li><para>no whitespace normalization is done</para></li><li><para>no entity reference translation is done</para></li><li><para>names and values are not zero-terminated, you must use <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">xml_base::name_size()</a> and <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">xml_base::value_size()</a> functions to tell where they end</para></li></ul></para></sect2></sect1><sect1><h2 id="namespacerapidxml_1performance">4. Performance</h2><para>RapidXml achieves its speed through use of several techniques:<ul><li><para>In-situ parsing. When building DOM tree, RapidXml does not make copies of string data, such as node names and values. Instead, it stores pointers to interior of the source text.</para></li><li><para>Use of template metaprogramming techniques. This allows it to move much of the work to compile time. Through magic of the templates, C++ compiler generates a separate copy of parsing code for any combination of parser flags you use. In each copy, all possible decisions are made at compile time and all unused code is omitted.</para></li><li><para>Extensive use of lookup tables for parsing.</para></li><li><para>Hand-tuned C++ with profiling done on several most popular CPUs.</para></li></ul></para><para>This results in a very small and fast code: a parser which is custom tailored to exact needs with each invocation.</para><sect2><h3 id="namespacerapidxml_1performance_charts">4.1 Comparison With Other Parsers</h3><para>The table below compares speed of RapidXml to some other parsers, and to <code>strlen()</code> function executed on the same data. On a modern CPU (as of 2007), you can expect parsing throughput to be close to 1 GB/s. As a rule of thumb, parsing speed is about 50-100x faster than Xerces DOM, 30-60x faster than TinyXml, 3-12x faster than pugxml, and about 5% - 30% faster than pugixml, the fastest XML parser I know of.</para><para><ul><li><para>The test file is a real-world, 50kB large, moderately dense XML file. </para></li><li><para>All timing is done by using RDTSC instruction present in Pentium-compatible CPUs. </para></li><li><para>No profile-guided optimizations are used. </para></li><li><para>All parsers are running in their fastest modes. </para></li><li><para>The results are given in CPU cycles per character, so frequency of CPUs is irrelevant. </para></li><li><para>The results are minimum values from a large number of runs, to minimize effects of operating system activity, task switching, interrupt handling etc. </para></li><li><para>A single parse of the test file takes about 1/10th of a millisecond, so with large number of runs there is a good chance of hitting at least one no-interrupt streak, and obtaining undisturbed results. </para></li></ul><table rows="9" cols="7" border="1" cellpadding="3pt"><tr><th thead="yes"><para><center>Platform</center></para></th><th thead="yes"><para><center>Compiler</center></para></th><th thead="yes"><para>strlen() </para></th><th thead="yes"><para>RapidXml </para></th><th thead="yes"><para>pugixml 0.3 </para></th><th thead="yes"><para>pugxml </para></th><th thead="yes"><para>TinyXml  </para></th></tr><tr><td thead="no"><para><center>Pentium 4</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>2.5</center></para></td><td thead="no"><para><center>5.4</center></para></td><td thead="no"><para><center>7.0</center></para></td><td thead="no"><para><center>61.7</center></para></td><td thead="no"><para><center>298.8</center></para></td></tr><tr><td thead="no"><para><center>Pentium 4</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>0.8</center></para></td><td thead="no"><para><center>6.1</center></para></td><td thead="no"><para><center>9.5</center></para></td><td thead="no"><para><center>67.0</center></para></td><td thead="no"><para><center>413.2</center></para></td></tr><tr><td thead="no"><para><center>Core 2</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>1.0</center></para></td><td thead="no"><para><center>4.5</center></para></td><td thead="no"><para><center>5.0</center></para></td><td thead="no"><para><center>24.6</center></para></td><td thead="no"><para><center>154.8</center></para></td></tr><tr><td thead="no"><para><center>Core 2</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>0.6</center></para></td><td thead="no"><para><center>4.6</center></para></td><td thead="no"><para><center>5.4</center></para></td><td thead="no"><para><center>28.3</center></para></td><td thead="no"><para><center>229.3</center></para></td></tr><tr><td thead="no"><para><center>Athlon XP</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>3.1</center></para></td><td thead="no"><para><center>7.7</center></para></td><td thead="no"><para><center>8.0</center></para></td><td thead="no"><para><center>25.5</center></para></td><td thead="no"><para><center>182.6</center></para></td></tr><tr><td thead="no"><para><center>Athlon XP</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>0.9</center></para></td><td thead="no"><para><center>8.2</center></para></td><td thead="no"><para><center>9.2</center></para></td><td thead="no"><para><center>33.7</center></para></td><td thead="no"><para><center>265.2</center></para></td></tr><tr><td thead="no"><para><center>Pentium 3</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>2.0</center></para></td><td thead="no"><para><center>6.3</center></para></td><td thead="no"><para><center>7.0</center></para></td><td thead="no"><para><center>30.9</center></para></td><td thead="no"><para><center>211.9</center></para></td></tr><tr><td thead="no"><para><center>Pentium 3</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>1.0</center></para></td><td thead="no"><para><center>6.7</center></para></td><td thead="no"><para><center>8.9</center></para></td><td thead="no"><para><center>35.3</center></para></td><td thead="no"><para><center>316.0</center></para></td></tr></table><i>(*) All results are in CPU cycles per character of source text</i></para></sect2></sect1><sect1><h2 id="namespacerapidxml_1reference">5. Reference</h2><para>This section lists all classes, functions, constants etc. and describes them in detail. </para></sect1></detaileddescription><dl><dt>class
+								  template
+							   <a href="#classrapidxml_1_1memory__pool">rapidxml::memory_pool</a></dt><dt class="indented">
+				constructor
+			 <a href="#classrapidxml_1_1memory__pool_f8fb3c8f1a564f8045c40bcd07a89866_1f8fb3c8f1a564f8045c40bcd07a89866">memory_pool()</a></dt><dt class="indented">
+				destructor
+			 <a href="#classrapidxml_1_1memory__pool_6f8c7990d9ec1ed2acf6558b238570eb_16f8c7990d9ec1ed2acf6558b238570eb">~memory_pool()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_750ba3c610b129ac057d817509d08f41_1750ba3c610b129ac057d817509d08f41">allocate_node(node_type type, const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_462de142669e0ff649e8e615b82bf457_1462de142669e0ff649e8e615b82bf457">allocate_attribute(const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859">allocate_string(const Ch *source=0, std::size_t size=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_95c49fcb056e9103ec906a59e3e01d76_195c49fcb056e9103ec906a59e3e01d76">clone_node(const xml_node&lt; Ch &gt; *source, xml_node&lt; Ch &gt; *result=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">clear()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a">set_allocator(alloc_func *af, free_func *ff)</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><p/><dt>class <a href="#classrapidxml_1_1parse__error">rapidxml::parse_error</a></dt><dt class="indented">
+				constructor
+			 <a href="#classrapidxml_1_1parse__error_4dd8d1bdbd9221df4dcb90cafaee3332_14dd8d1bdbd9221df4dcb90cafaee3332">parse_error(const char *what, void *where)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1parse__error_ff06f49065b54a8a86e02e9a2441a8ba_1ff06f49065b54a8a86e02e9a2441a8ba">what() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1parse__error_377be7d201d95221c318682c35377aca_1377be7d201d95221c318682c35377aca">where() const </a></dt><dt class="indented"/><dt class="indented"/><p/><dt>class
+								  template
+							   <a href="#classrapidxml_1_1xml__attribute">rapidxml::xml_attribute</a></dt><dt class="indented">
+				constructor
+			 <a href="#classrapidxml_1_1xml__attribute_d5464aadf08269a886b730993525db34_1d5464aadf08269a886b730993525db34">xml_attribute()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__attribute_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">document() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__attribute_5c4a98d2b75f9b41b12c110108fd55ab_15c4a98d2b75f9b41b12c110108fd55ab">previous_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__attribute_1b8a814d0d3a7165396b08433eee8a91_11b8a814d0d3a7165396b08433eee8a91">next_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><dt>class
+								  template
+							   <a href="#classrapidxml_1_1xml__base">rapidxml::xml_base</a></dt><dt class="indented">
+				constructor
+			 <a href="#classrapidxml_1_1xml__base_23630d2c130a9e0e3f3afa7584a9b218_123630d2c130a9e0e3f3afa7584a9b218">xml_base()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707">name() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c">name_size() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f">value() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db">value_size() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_4e7e23d06d48126c65b1f6266acfba5c_14e7e23d06d48126c65b1f6266acfba5c">name(const Ch *name, std::size_t size)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e">name(const Ch *name)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_d9640aa3f5374673cb72a5289b6c91eb_1d9640aa3f5374673cb72a5289b6c91eb">value(const Ch *value, std::size_t size)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c">value(const Ch *value)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e">parent() const </a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><dt>class
+								  template
+							   <a href="#classrapidxml_1_1xml__document">rapidxml::xml_document</a></dt><dt class="indented">
+				constructor
+			 <a href="#classrapidxml_1_1xml__document_6ce266cc52d549c42abe3a3d5e8af9ba_16ce266cc52d549c42abe3a3d5e8af9ba">xml_document()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c">parse(Ch *text)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__document_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">clear()</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><p/><p/><p/><p/><p/><p/><p/><p/><dt>class
+								  template
+							   <a href="#classrapidxml_1_1xml__node">rapidxml::xml_node</a></dt><dt class="indented">
+				constructor
+			 <a href="#classrapidxml_1_1xml__node_34c55af3504549a475e5b9dfcaa6adf5_134c55af3504549a475e5b9dfcaa6adf5">xml_node(node_type type)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0">type() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">document() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a">first_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_fcb6e2209b591a36d2dadba20d2bc7cc_1fcb6e2209b591a36d2dadba20d2bc7cc">last_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_ac2f6886c0107e9d5f156e9542546df6_1ac2f6886c0107e9d5f156e9542546df6">previous_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_b3ead2cefecc03a813836203e3f6f38f_1b3ead2cefecc03a813836203e3f6f38f">next_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83">first_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_16953d66751b5b949ee4ee2d9c0bc63a_116953d66751b5b949ee4ee2d9c0bc63a">last_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_a78759bfa429fa2ab6bc5fe617cfa3cf_1a78759bfa429fa2ab6bc5fe617cfa3cf">type(node_type type)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_0c39df6617e709eb2fba11300dea63f2_10c39df6617e709eb2fba11300dea63f2">prepend_node(xml_node&lt; Ch &gt; *child)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_86de2e22276826089b7baed2599f8dee_186de2e22276826089b7baed2599f8dee">append_node(xml_node&lt; Ch &gt; *child)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_780972a57fc447250ab47cc8f421b65e_1780972a57fc447250ab47cc8f421b65e">insert_node(xml_node&lt; Ch &gt; *where, xml_node&lt; Ch &gt; *child)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_9a31d861e1bddc710839c551a5d2b3a4_19a31d861e1bddc710839c551a5d2b3a4">remove_first_node()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_87addf2bc127ee31aa4b5295d3c9b530_187addf2bc127ee31aa4b5295d3c9b530">remove_last_node()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_9316463a2201631e7e2062b17729f9cd_19316463a2201631e7e2062b17729f9cd">remove_node(xml_node&lt; Ch &gt; *where)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_0218147d13e41d5fa60ced4e7a7e9726_10218147d13e41d5fa60ced4e7a7e9726">remove_all_nodes()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_f6dffa513da74cc0be71a7ba84f8265e_1f6dffa513da74cc0be71a7ba84f8265e">prepend_attribute(xml_attribute&lt; Ch &gt; *attribute)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_8fbd4f5ef7169d493da9f8d87ac04b77_18fbd4f5ef7169d493da9f8d87ac04b77">append_attribute(xml_attribute&lt; Ch &gt; *attribute)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_070d5888b0557fe06a5b24961de1b988_1070d5888b0557fe06a5b24961de1b988">insert_attribute(xml_attribute&lt; Ch &gt; *where, xml_attribute&lt; Ch &gt; *attribute)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_4eea4a7f6cb484ca9944f7eafe6e1843_14eea4a7f6cb484ca9944f7eafe6e1843">remove_first_attribute()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_37d87c4d5d89fa0cf05b72ee8d4cba3b_137d87c4d5d89fa0cf05b72ee8d4cba3b">remove_last_attribute()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_c75154db2e768c0e5b541fc8cd0775ab_1c75154db2e768c0e5b541fc8cd0775ab">remove_attribute(xml_attribute&lt; Ch &gt; *where)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_59e6ad4cfd5e8096c052e71d79561eda_159e6ad4cfd5e8096c052e71d79561eda">remove_all_attributes()</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><dt>namespace <a href="#namespacerapidxml">rapidxml</a></dt><dt class="indented">enum <a href="#namespacerapidxml_6a276b85e2da28c5f9c3dbce61c55682_16a276b85e2da28c5f9c3dbce61c55682">node_type</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented">function <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1">parse_error_handler(const char *what, void *where)</a></dt><dt class="indented">function <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1">print(OutIt out, const xml_node&lt; Ch &gt; &amp;node, int flags=0)</a></dt><dt class="indented">function <a href="#namespacerapidxml_13bc37d6d1047acb0efdbc1689221a5e_113bc37d6d1047acb0efdbc1689221a5e">print(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node, int flags=0)</a></dt><dt class="indented">function <a href="#namespacerapidxml_5619b38000d967fb223b2b0a8c17463a_15619b38000d967fb223b2b0a8c17463a">operator&lt;&lt;(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node)</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9">parse_no_data_nodes</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_97e2c4fdc04fae17126f9971a4fc993e_197e2c4fdc04fae17126f9971a4fc993e">parse_no_element_values</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c">parse_no_string_terminators</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_7223b7815c4fb8b42e6e4e77e1ea6b97_17223b7815c4fb8b42e6e4e77e1ea6b97">parse_no_entity_translation</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_ccde57f6054857ee4042a1b4d98c83b9_1ccde57f6054857ee4042a1b4d98c83b9">parse_no_utf8</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_52e2c934ad9c845a5f4cc49570470556_152e2c934ad9c845a5f4cc49570470556">parse_declaration_node</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_0f7479dacbc868456d07897a8c072784_10f7479dacbc868456d07897a8c072784">parse_comment_nodes</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_8e187746ba1ca04f107951ad32df962e_18e187746ba1ca04f107951ad32df962e">parse_doctype_node</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_1c20b2b2b75711cd76423e119c49f830_11c20b2b2b75711cd76423e119c49f830">parse_pi_nodes</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_a5daff9d61c7d4eaf98e4d42efe628ee_1a5daff9d61c7d4eaf98e4d42efe628ee">parse_validate_closing_tags</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_ac1f06b1afd47b812732fb521b146fd9_1ac1f06b1afd47b812732fb521b146fd9">parse_trim_whitespace</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_88f95d4e275ba01408fefde83078651b_188f95d4e275ba01408fefde83078651b">parse_normalize_whitespace</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_45751cf2f38fd6915f35b3122b46d5b6_145751cf2f38fd6915f35b3122b46d5b6">parse_default</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_a97ba1a0a79a6d66f4eef3612508d943_1a97ba1a0a79a6d66f4eef3612508d943">parse_non_destructive</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_398c5476e76102f8bd76c10bb0abbe10_1398c5476e76102f8bd76c10bb0abbe10">parse_fastest</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_b4f2515265facb42291570307924bd57_1b4f2515265facb42291570307924bd57">parse_full</a></dt><dt class="indented">
+				constant
+			 <a href="#namespacerapidxml_b08b8d4293c203b69ed6c5ae77ac1907_1b08b8d4293c203b69ed6c5ae77ac1907">print_no_indenting</a></dt><p/><p/><p/><p/></dl><hr/><h3 class="reference-header" id="classrapidxml_1_1memory__pool">class
+									  template
+								   rapidxml::memory_pool</h3>
+
+							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
+								  Base class for
+								  <a href="#classrapidxml_1_1xml__document">xml_document</a> <h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">This class is used by the parser to create new nodes and attributes, without overheads of dynamic memory allocation. In most cases, you will not need to use this class directly. However, if you need to create nodes manually or modify names/values of nodes, you are encouraged to use <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of relevant <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> to allocate the memory. Not only is this faster than allocating them by using <code>new</code> operator, but also their lifetime will be tied to the lifetime of document, possibly simplyfing memory management. <br/><br/>
+ Call <a href="#classrapidxml_1_1memory__pool_750ba3c610b129ac057d817509d08f41_1750ba3c610b129ac057d817509d08f41" kindref="member">allocate_node()</a> or <a href="#classrapidxml_1_1memory__pool_462de142669e0ff649e8e615b82bf457_1462de142669e0ff649e8e615b82bf457" kindref="member">allocate_attribute()</a> functions to obtain new nodes or attributes from the pool. You can also call <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859" kindref="member">allocate_string()</a> function to allocate strings. Such strings can then be used as names or values of nodes without worrying about their lifetime. Note that there is no <code>free()</code> function -- all allocations are freed at once when <a href="#classrapidxml_1_1memory__pool_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204" kindref="member">clear()</a> function is called, or when the pool is destroyed. <br/><br/>
+ It is also possible to create a standalone <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a>, and use it to allocate nodes, whose lifetime will not be tied to any document. <br/><br/>
+ Pool maintains <code>RAPIDXML_STATIC_POOL_SIZE</code> bytes of statically allocated memory. Until static memory is exhausted, no dynamic memory allocations are done. When static memory is exhausted, pool allocates additional blocks of memory of size <code>RAPIDXML_DYNAMIC_POOL_SIZE</code> each, by using global <code>new[]</code> and <code>delete[]</code> operators. This behaviour can be changed by setting custom allocation routines. Use <a href="#classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a" kindref="member">set_allocator()</a> function to set them. <br/><br/>
+ Allocations for nodes, attributes and strings are aligned at <code>RAPIDXML_ALIGNMENT</code> bytes. This value defaults to the size of pointer on target architecture. <br/><br/>
+ To obtain absolutely top performance from the parser, it is important that all nodes are allocated from a single, contiguous block of memory. Otherwise, cache misses when jumping between two (or more) disjoint blocks of memory can slow down parsing quite considerably. If required, you can tweak <code>RAPIDXML_STATIC_POOL_SIZE</code>, <code>RAPIDXML_DYNAMIC_POOL_SIZE</code> and <code>RAPIDXML_ALIGNMENT</code> to obtain best wasted memory to performance compromise. To do it, define their values before <a href="#rapidxml_8hpp" kindref="compound">rapidxml.hpp</a> file is included. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type of created nodes. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_f8fb3c8f1a564f8045c40bcd07a89866_1f8fb3c8f1a564f8045c40bcd07a89866">
+				constructor
+			 memory_pool::memory_pool</h3><h4>Synopsis</h4><code class="synopsis">memory_pool();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs empty pool with default allocator functions. </para><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_6f8c7990d9ec1ed2acf6558b238570eb_16f8c7990d9ec1ed2acf6558b238570eb">
+				destructor
+			 memory_pool::~memory_pool</h3><h4>Synopsis</h4><code class="synopsis">~memory_pool();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Destroys pool and frees all the memory. This causes memory occupied by nodes allocated by the pool to be freed. Nodes allocated from the pool are no longer valid. </para><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_750ba3c610b129ac057d817509d08f41_1750ba3c610b129ac057d817509d08f41">function memory_pool::allocate_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* allocate_node(node_type type, const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Allocates a new node from the pool, and optionally assigns name and value to it. If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>. If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function will call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function. </para><h4>Parameters</h4><dl><dt class="parameter-name">type</dt><dd class="parameter-def">Type of node to create. </dd></dl><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name to assign to the node, or 0 to assign no name. </dd></dl><dl><dt class="parameter-name">value</dt><dd class="parameter-def">Value to assign to the node, or 0 to assign no value. </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name to assign, or 0 to automatically calculate size from name string. </dd></dl><dl><dt class="parameter-name">value_size</dt><dd class="parameter-def">Size of value to assign, or 0 to automatically calculate size from value string. </dd></dl><h4>Returns</h4>Pointer to allocated node. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_462de142669e0ff649e8e615b82bf457_1462de142669e0ff649e8e615b82bf457">function memory_pool::allocate_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* allocate_attribute(const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Allocates a new attribute from the pool, and optionally assigns name and value to it. If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>. If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function will call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name to assign to the attribute, or 0 to assign no name. </dd></dl><dl><dt class="parameter-name">value</dt><dd class="parameter-def">Value to assign to the attribute, or 0 to assign no value. </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name to assign, or 0 to automatically calculate size from name string. </dd></dl><dl><dt class="parameter-name">value_size</dt><dd class="parameter-def">Size of value to assign, or 0 to automatically calculate size from value string. </dd></dl><h4>Returns</h4>Pointer to allocated attribute. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859">function memory_pool::allocate_string</h3><h4>Synopsis</h4><code class="synopsis">Ch* allocate_string(const Ch *source=0, std::size_t size=0);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Allocates a char array of given size from the pool, and optionally copies a given string to it. If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>. If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function will call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function. </para><h4>Parameters</h4><dl><dt class="parameter-name">source</dt><dd class="parameter-def">String to initialize the allocated memory with, or 0 to not initialize it. </dd></dl><dl><dt class="parameter-name">size</dt><dd class="parameter-def">Number of characters to allocate, or zero to calculate it automatically from source string length; if size is 0, source string must be specified and null terminated. </dd></dl><h4>Returns</h4>Pointer to allocated char array. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_95c49fcb056e9103ec906a59e3e01d76_195c49fcb056e9103ec906a59e3e01d76">function memory_pool::clone_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* clone_node(const xml_node&lt; Ch &gt; *source, xml_node&lt; Ch &gt; *result=0);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Clones an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and its hierarchy of child nodes and attributes. Nodes and attributes are allocated from this memory pool. Names and values are not cloned, they are shared between the clone and the source. Result node can be optionally specified as a second parameter, in which case its contents will be replaced with cloned source node. This is useful when you want to clone entire document. </para><h4>Parameters</h4><dl><dt class="parameter-name">source</dt><dd class="parameter-def">Node to clone. </dd></dl><dl><dt class="parameter-name">result</dt><dd class="parameter-def">Node to put results in, or 0 to automatically allocate result node </dd></dl><h4>Returns</h4>Pointer to cloned node. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">function memory_pool::clear</h3><h4>Synopsis</h4><code class="synopsis">void clear();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Clears the pool. This causes memory occupied by nodes allocated by the pool to be freed. Any nodes or strings allocated from the pool will no longer be valid. </para><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a">function memory_pool::set_allocator</h3><h4>Synopsis</h4><code class="synopsis">void set_allocator(alloc_func *af, free_func *ff);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets or resets the user-defined memory allocation functions for the pool. This can only be called when no memory is allocated from the pool yet, otherwise results are undefined. Allocation function must not return invalid pointer on failure. It should either throw, stop the program, or use <code>longjmp()</code> function to pass control to other place of program. If it returns invalid pointer, results are undefined. <br/><br/>
+ User defined allocation functions must have the following forms: <br/><code><br/>
+void *allocate(std::size_t size); <br/>
+void free(void *pointer); </code><br/></para><h4>Parameters</h4><dl><dt class="parameter-name">af</dt><dd class="parameter-def">Allocation function, or 0 to restore default function </dd></dl><dl><dt class="parameter-name">ff</dt><dd class="parameter-def">Free function, or 0 to restore default function </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1parse__error">class rapidxml::parse_error</h3>
+
+							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse error exception. This exception is thrown by the parser when an error occurs. Use <a href="#classrapidxml_1_1parse__error_ff06f49065b54a8a86e02e9a2441a8ba_1ff06f49065b54a8a86e02e9a2441a8ba" kindref="member">what()</a> function to get human-readable error message. Use <a href="#classrapidxml_1_1parse__error_377be7d201d95221c318682c35377aca_1377be7d201d95221c318682c35377aca" kindref="member">where()</a> function to get a pointer to position within source text where error was detected. <br/><br/>
+ If throwing exceptions by the parser is undesirable, it can be disabled by defining RAPIDXML_NO_EXCEPTIONS macro before <a href="#rapidxml_8hpp" kindref="compound">rapidxml.hpp</a> is included. This will cause the parser to call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function instead of throwing an exception. This function must be defined by the user. <br/><br/>
+ This class derives from <code>std::exception</code> class. </para><p/><h3 class="reference-header" id="classrapidxml_1_1parse__error_4dd8d1bdbd9221df4dcb90cafaee3332_14dd8d1bdbd9221df4dcb90cafaee3332">
+				constructor
+			 parse_error::parse_error</h3><h4>Synopsis</h4><code class="synopsis">parse_error(const char *what, void *where);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs parse error. </para><p/><h3 class="reference-header" id="classrapidxml_1_1parse__error_ff06f49065b54a8a86e02e9a2441a8ba_1ff06f49065b54a8a86e02e9a2441a8ba">function parse_error::what</h3><h4>Synopsis</h4><code class="synopsis">virtual const char* what() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets human readable description of error. </para><h4>Returns</h4>Pointer to null terminated description of the error. <p/><h3 class="reference-header" id="classrapidxml_1_1parse__error_377be7d201d95221c318682c35377aca_1377be7d201d95221c318682c35377aca">function parse_error::where</h3><h4>Synopsis</h4><code class="synopsis">Ch* where() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets pointer to character data where error happened. Ch should be the same as char type of <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> that produced the error. </para><h4>Returns</h4>Pointer to location within the parsed string where error occured. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute">class
+									  template
+								   rapidxml::xml_attribute</h3>
+
+							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
+								  Inherits from
+								  <a href="#classrapidxml_1_1xml__base">xml_base</a> <br/><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Class representing attribute node of XML document. Each attribute has name and value strings, which are available through <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707" kindref="member">name()</a> and <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f" kindref="member">value()</a> functions (inherited from <a href="#classrapidxml_1_1xml__base" kindref="compound">xml_base</a>). Note that after parse, both name and value of attribute will point to interior of source text used for parsing. Thus, this text must persist in memory for the lifetime of attribute. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_d5464aadf08269a886b730993525db34_1d5464aadf08269a886b730993525db34">
+				constructor
+			 xml_attribute::xml_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs an empty attribute with the specified type. Consider using <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of appropriate <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> if allocating attributes manually. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">function xml_attribute::document</h3><h4>Synopsis</h4><code class="synopsis">xml_document&lt;Ch&gt;* document() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets document of which attribute is a child. </para><h4>Returns</h4>Pointer to document that contains this attribute, or 0 if there is no parent document. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_5c4a98d2b75f9b41b12c110108fd55ab_15c4a98d2b75f9b41b12c110108fd55ab">function xml_attribute::previous_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* previous_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets previous attribute, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return previous attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_1b8a814d0d3a7165396b08433eee8a91_11b8a814d0d3a7165396b08433eee8a91">function xml_attribute::next_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* next_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets next attribute, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return next attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base">class
+									  template
+								   rapidxml::xml_base</h3>
+
+							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
+								  Base class for
+								  <a href="#classrapidxml_1_1xml__attribute">xml_attribute</a> <a href="#classrapidxml_1_1xml__node">xml_node</a> <h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Base class for <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and <a href="#classrapidxml_1_1xml__attribute" kindref="compound">xml_attribute</a> implementing common functions: <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707" kindref="member">name()</a>, <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">name_size()</a>, <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f" kindref="member">value()</a>, <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">value_size()</a> and <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e" kindref="member">parent()</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_23630d2c130a9e0e3f3afa7584a9b218_123630d2c130a9e0e3f3afa7584a9b218">
+				constructor
+			 xml_base::xml_base</h3><h4>Synopsis</h4><code class="synopsis">xml_base();
+									  </code><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707">function xml_base::name</h3><h4>Synopsis</h4><code class="synopsis">Ch* name() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets name of the node. Interpretation of name depends on type of node. Note that name will not be zero-terminated if <a href="#namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c" kindref="member">rapidxml::parse_no_string_terminators</a> option was selected during parse. <br/><br/>
+ Use <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">name_size()</a> function to determine length of the name. </para><h4>Returns</h4>Name of node, or empty string if node has no name. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c">function xml_base::name_size</h3><h4>Synopsis</h4><code class="synopsis">std::size_t name_size() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets size of node name, not including terminator character. This function works correctly irrespective of whether name is or is not zero terminated. </para><h4>Returns</h4>Size of node name, in characters. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f">function xml_base::value</h3><h4>Synopsis</h4><code class="synopsis">Ch* value() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets value of node. Interpretation of value depends on type of node. Note that value will not be zero-terminated if <a href="#namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c" kindref="member">rapidxml::parse_no_string_terminators</a> option was selected during parse. <br/><br/>
+ Use <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">value_size()</a> function to determine length of the value. </para><h4>Returns</h4>Value of node, or empty string if node has no value. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db">function xml_base::value_size</h3><h4>Synopsis</h4><code class="synopsis">std::size_t value_size() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets size of node value, not including terminator character. This function works correctly irrespective of whether value is or is not zero terminated. </para><h4>Returns</h4>Size of node value, in characters. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_4e7e23d06d48126c65b1f6266acfba5c_14e7e23d06d48126c65b1f6266acfba5c">function xml_base::name</h3><h4>Synopsis</h4><code class="synopsis">void name(const Ch *name, std::size_t size);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets name of node to a non zero-terminated string. See <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a> . <br/><br/>
+ Note that node does not own its name or value, it only stores a pointer to it. It will not delete or otherwise free the pointer on destruction. It is reponsibility of the user to properly manage lifetime of the string. The easiest way to achieve it is to use <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of the document to allocate the string - on destruction of the document the string will be automatically freed. <br/><br/>
+ Size of name must be specified separately, because name does not have to be zero terminated. Use <a href="#classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e" kindref="member">name(const Ch *)</a> function to have the length automatically calculated (string must be zero terminated). </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of node to set. Does not have to be zero terminated. </dd></dl><dl><dt class="parameter-name">size</dt><dd class="parameter-def">Size of name, in characters. This does not include zero terminator, if one is present. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e">function xml_base::name</h3><h4>Synopsis</h4><code class="synopsis">void name(const Ch *name);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets name of node to a zero-terminated string. See also <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a>  and <a href="#classrapidxml_1_1xml__base_4e7e23d06d48126c65b1f6266acfba5c_14e7e23d06d48126c65b1f6266acfba5c" kindref="member">xml_node::name(const Ch *, std::size_t)</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of node to set. Must be zero terminated. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_d9640aa3f5374673cb72a5289b6c91eb_1d9640aa3f5374673cb72a5289b6c91eb">function xml_base::value</h3><h4>Synopsis</h4><code class="synopsis">void value(const Ch *value, std::size_t size);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets value of node to a non zero-terminated string. See <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a> . <br/><br/>
+ Note that node does not own its name or value, it only stores a pointer to it. It will not delete or otherwise free the pointer on destruction. It is reponsibility of the user to properly manage lifetime of the string. The easiest way to achieve it is to use <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of the document to allocate the string - on destruction of the document the string will be automatically freed. <br/><br/>
+ Size of value must be specified separately, because it does not have to be zero terminated. Use <a href="#classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c" kindref="member">value(const Ch *)</a> function to have the length automatically calculated (string must be zero terminated). <br/><br/>
+ If an element has a child node of type node_data, it will take precedence over element value when printing. If you want to manipulate data of elements using values, use parser flag <a href="#namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9" kindref="member">rapidxml::parse_no_data_nodes</a> to prevent creation of data nodes by the parser. </para><h4>Parameters</h4><dl><dt class="parameter-name">value</dt><dd class="parameter-def">value of node to set. Does not have to be zero terminated. </dd></dl><dl><dt class="parameter-name">size</dt><dd class="parameter-def">Size of value, in characters. This does not include zero terminator, if one is present. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c">function xml_base::value</h3><h4>Synopsis</h4><code class="synopsis">void value(const Ch *value);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets value of node to a zero-terminated string. See also <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a>  and <a href="#classrapidxml_1_1xml__base_d9640aa3f5374673cb72a5289b6c91eb_1d9640aa3f5374673cb72a5289b6c91eb" kindref="member">xml_node::value(const Ch *, std::size_t)</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">value</dt><dd class="parameter-def">Vame of node to set. Must be zero terminated. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e">function xml_base::parent</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* parent() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets node parent. </para><h4>Returns</h4>Pointer to parent node, or 0 if there is no parent. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__document">class
+									  template
+								   rapidxml::xml_document</h3>
+
+							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
+								  Inherits from
+								  <a href="#classrapidxml_1_1xml__node">xml_node</a> <a href="#classrapidxml_1_1memory__pool">memory_pool</a> <br/><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">This class represents root of the DOM hierarchy. It is also an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and a <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> through public inheritance. Use <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">parse()</a> function to build a DOM tree from a zero-terminated XML text string. <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">parse()</a> function allocates memory for nodes and attributes by using functions of <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a>, which are inherited from <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a>. To access root node of the document, use the document itself, as if it was an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__document_6ce266cc52d549c42abe3a3d5e8af9ba_16ce266cc52d549c42abe3a3d5e8af9ba">
+				constructor
+			 xml_document::xml_document</h3><h4>Synopsis</h4><code class="synopsis">xml_document();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs empty XML document. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c">function xml_document::parse</h3><h4>Synopsis</h4><code class="synopsis">void parse(Ch *text);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parses zero-terminated XML string according to given flags. Passed string will be modified by the parser, unless <a href="#namespacerapidxml_a97ba1a0a79a6d66f4eef3612508d943_1a97ba1a0a79a6d66f4eef3612508d943" kindref="member">rapidxml::parse_non_destructive</a> flag is used. The string must persist for the lifetime of the document. In case of error, <a href="#classrapidxml_1_1parse__error" kindref="compound">rapidxml::parse_error</a> exception will be thrown. <br/><br/>
+ If you want to parse contents of a file, you must first load the file into the memory, and pass pointer to its beginning. Make sure that data is zero-terminated. <br/><br/>
+ Document can be parsed into multiple times. Each new call to parse removes previous nodes and attributes (if any), but does not clear memory pool. </para><h4>Parameters</h4><dl><dt class="parameter-name">text</dt><dd class="parameter-def">XML data to parse; pointer is non-const to denote fact that this data may be modified by the parser. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__document_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">function xml_document::clear</h3><h4>Synopsis</h4><code class="synopsis">void clear();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Clears the document by deleting all nodes and clearing the memory pool. All nodes owned by document pool are destroyed. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node">class
+									  template
+								   rapidxml::xml_node</h3>
+
+							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
+								  Inherits from
+								  <a href="#classrapidxml_1_1xml__base">xml_base</a> <br/>
+								  Base class for
+								  <a href="#classrapidxml_1_1xml__document">xml_document</a> <h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Class representing a node of XML document. Each node may have associated name and value strings, which are available through <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707" kindref="member">name()</a> and <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f" kindref="member">value()</a> functions. Interpretation of name and value depends on type of the node. Type of node can be determined by using <a href="#classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0" kindref="member">type()</a> function. <br/><br/>
+ Note that after parse, both name and value of node, if any, will point interior of source text used for parsing. Thus, this text must persist in the memory for the lifetime of node. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_34c55af3504549a475e5b9dfcaa6adf5_134c55af3504549a475e5b9dfcaa6adf5">
+				constructor
+			 xml_node::xml_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node(node_type type);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs an empty node with the specified type. Consider using <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of appropriate document to allocate nodes manually. </para><h4>Parameters</h4><dl><dt class="parameter-name">type</dt><dd class="parameter-def">Type of node to construct. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0">function xml_node::type</h3><h4>Synopsis</h4><code class="synopsis">node_type type() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets type of node. </para><h4>Returns</h4>Type of node. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">function xml_node::document</h3><h4>Synopsis</h4><code class="synopsis">xml_document&lt;Ch&gt;* document() const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets document of which node is a child. </para><h4>Returns</h4>Pointer to document that contains this node, or 0 if there is no parent document. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a">function xml_node::first_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* first_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets first child node, optionally matching node name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of child to find, or 0 to return first child regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found child, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_fcb6e2209b591a36d2dadba20d2bc7cc_1fcb6e2209b591a36d2dadba20d2bc7cc">function xml_node::last_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* last_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets last child node, optionally matching node name. Behaviour is undefined if node has no children. Use <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a" kindref="member">first_node()</a> to test if node has children. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of child to find, or 0 to return last child regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found child, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_ac2f6886c0107e9d5f156e9542546df6_1ac2f6886c0107e9d5f156e9542546df6">function xml_node::previous_sibling</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* previous_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets previous sibling node, optionally matching node name. Behaviour is undefined if node has no parent. Use <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e" kindref="member">parent()</a> to test if node has a parent. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of sibling to find, or 0 to return previous sibling regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found sibling, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_b3ead2cefecc03a813836203e3f6f38f_1b3ead2cefecc03a813836203e3f6f38f">function xml_node::next_sibling</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* next_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets next sibling node, optionally matching node name. Behaviour is undefined if node has no parent. Use <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e" kindref="member">parent()</a> to test if node has a parent. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of sibling to find, or 0 to return next sibling regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found sibling, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83">function xml_node::first_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* first_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets first attribute of node, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return first attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_16953d66751b5b949ee4ee2d9c0bc63a_116953d66751b5b949ee4ee2d9c0bc63a">function xml_node::last_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* last_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets last attribute of node, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return last attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_a78759bfa429fa2ab6bc5fe617cfa3cf_1a78759bfa429fa2ab6bc5fe617cfa3cf">function xml_node::type</h3><h4>Synopsis</h4><code class="synopsis">void type(node_type type);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets type of node. </para><h4>Parameters</h4><dl><dt class="parameter-name">type</dt><dd class="parameter-def">Type of node to set. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_0c39df6617e709eb2fba11300dea63f2_10c39df6617e709eb2fba11300dea63f2">function xml_node::prepend_node</h3><h4>Synopsis</h4><code class="synopsis">void prepend_node(xml_node&lt; Ch &gt; *child);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prepends a new child node. The prepended child becomes the first child, and all existing children are moved one position back. </para><h4>Parameters</h4><dl><dt class="parameter-name">child</dt><dd class="parameter-def">Node to prepend. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_86de2e22276826089b7baed2599f8dee_186de2e22276826089b7baed2599f8dee">function xml_node::append_node</h3><h4>Synopsis</h4><code class="synopsis">void append_node(xml_node&lt; Ch &gt; *child);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Appends a new child node. The appended child becomes the last child. </para><h4>Parameters</h4><dl><dt class="parameter-name">child</dt><dd class="parameter-def">Node to append. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_780972a57fc447250ab47cc8f421b65e_1780972a57fc447250ab47cc8f421b65e">function xml_node::insert_node</h3><h4>Synopsis</h4><code class="synopsis">void insert_node(xml_node&lt; Ch &gt; *where, xml_node&lt; Ch &gt; *child);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Inserts a new child node at specified place inside the node. All children after and including the specified node are moved one position back. </para><h4>Parameters</h4><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Place where to insert the child, or 0 to insert at the back. </dd></dl><dl><dt class="parameter-name">child</dt><dd class="parameter-def">Node to insert. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_9a31d861e1bddc710839c551a5d2b3a4_19a31d861e1bddc710839c551a5d2b3a4">function xml_node::remove_first_node</h3><h4>Synopsis</h4><code class="synopsis">void remove_first_node();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes first child node. If node has no children, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a" kindref="member">first_node()</a> to test if node has children. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_87addf2bc127ee31aa4b5295d3c9b530_187addf2bc127ee31aa4b5295d3c9b530">function xml_node::remove_last_node</h3><h4>Synopsis</h4><code class="synopsis">void remove_last_node();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes last child of the node. If node has no children, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a" kindref="member">first_node()</a> to test if node has children. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_9316463a2201631e7e2062b17729f9cd_19316463a2201631e7e2062b17729f9cd">function xml_node::remove_node</h3><h4>Synopsis</h4><code class="synopsis">void remove_node(xml_node&lt; Ch &gt; *where);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes specified child from the node. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_0218147d13e41d5fa60ced4e7a7e9726_10218147d13e41d5fa60ced4e7a7e9726">function xml_node::remove_all_nodes</h3><h4>Synopsis</h4><code class="synopsis">void remove_all_nodes();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes all child nodes (but not attributes). </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_f6dffa513da74cc0be71a7ba84f8265e_1f6dffa513da74cc0be71a7ba84f8265e">function xml_node::prepend_attribute</h3><h4>Synopsis</h4><code class="synopsis">void prepend_attribute(xml_attribute&lt; Ch &gt; *attribute);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prepends a new attribute to the node. </para><h4>Parameters</h4><dl><dt class="parameter-name">attribute</dt><dd class="parameter-def">Attribute to prepend. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_8fbd4f5ef7169d493da9f8d87ac04b77_18fbd4f5ef7169d493da9f8d87ac04b77">function xml_node::append_attribute</h3><h4>Synopsis</h4><code class="synopsis">void append_attribute(xml_attribute&lt; Ch &gt; *attribute);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Appends a new attribute to the node. </para><h4>Parameters</h4><dl><dt class="parameter-name">attribute</dt><dd class="parameter-def">Attribute to append. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_070d5888b0557fe06a5b24961de1b988_1070d5888b0557fe06a5b24961de1b988">function xml_node::insert_attribute</h3><h4>Synopsis</h4><code class="synopsis">void insert_attribute(xml_attribute&lt; Ch &gt; *where, xml_attribute&lt; Ch &gt; *attribute);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Inserts a new attribute at specified place inside the node. All attributes after and including the specified attribute are moved one position back. </para><h4>Parameters</h4><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Place where to insert the attribute, or 0 to insert at the back. </dd></dl><dl><dt class="parameter-name">attribute</dt><dd class="parameter-def">Attribute to insert. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_4eea4a7f6cb484ca9944f7eafe6e1843_14eea4a7f6cb484ca9944f7eafe6e1843">function xml_node::remove_first_attribute</h3><h4>Synopsis</h4><code class="synopsis">void remove_first_attribute();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes first attribute of the node. If node has no attributes, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83" kindref="member">first_attribute()</a> to test if node has attributes. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_37d87c4d5d89fa0cf05b72ee8d4cba3b_137d87c4d5d89fa0cf05b72ee8d4cba3b">function xml_node::remove_last_attribute</h3><h4>Synopsis</h4><code class="synopsis">void remove_last_attribute();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes last attribute of the node. If node has no attributes, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83" kindref="member">first_attribute()</a> to test if node has attributes. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_c75154db2e768c0e5b541fc8cd0775ab_1c75154db2e768c0e5b541fc8cd0775ab">function xml_node::remove_attribute</h3><h4>Synopsis</h4><code class="synopsis">void remove_attribute(xml_attribute&lt; Ch &gt; *where);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes specified attribute from node. </para><h4>Parameters</h4><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Pointer to attribute to be removed. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_59e6ad4cfd5e8096c052e71d79561eda_159e6ad4cfd5e8096c052e71d79561eda">function xml_node::remove_all_attributes</h3><h4>Synopsis</h4><code class="synopsis">void remove_all_attributes();
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes all attributes of node. </para><p/><h3 class="reference-header" id="namespacerapidxml_6a276b85e2da28c5f9c3dbce61c55682_16a276b85e2da28c5f9c3dbce61c55682">enum node_type</h3><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Enumeration listing all node types produced by the parser. Use <a href="#classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0" kindref="member">xml_node::type()</a> function to query node type. </para><h4>Values</h4><dl><dt class="parameter-name">node_document</dt><dd class="parameter-def">A document node. Name and value are empty. </dd></dl><dl><dt class="parameter-name">node_element</dt><dd class="parameter-def">An element node. Name contains element name. Value contains text of first data node. </dd></dl><dl><dt class="parameter-name">node_data</dt><dd class="parameter-def">A data node. Name is empty. Value contains data text. </dd></dl><dl><dt class="parameter-name">node_cdata</dt><dd class="parameter-def">A CDATA node. Name is empty. Value contains data text. </dd></dl><dl><dt class="parameter-name">node_comment</dt><dd class="parameter-def">A comment node. Name is empty. Value contains comment text. </dd></dl><dl><dt class="parameter-name">node_declaration</dt><dd class="parameter-def">A declaration node. Name and value are empty. Declaration parameters (version, encoding and standalone) are in node attributes. </dd></dl><dl><dt class="parameter-name">node_doctype</dt><dd class="parameter-def">A DOCTYPE node. Name is empty. Value contains DOCTYPE text. </dd></dl><dl><dt class="parameter-name">node_pi</dt><dd class="parameter-def">A PI node. Name contains target. Value contains instructions. </dd></dl><p/><h3 class="reference-header" id="namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1">function parse_error_handler</h3><h4>Synopsis</h4><code class="synopsis">void rapidxml::parse_error_handler(const char *what, void *where);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">When exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function is called to notify user about the error. It must be defined by the user. <br/><br/>
+ This function cannot return. If it does, the results are undefined. <br/><br/>
+ A very simple definition might look like that: <preformatted>
+        void rapidxml::parse_error_handler(const char *what, void *where)
+        {
+            std::cout &lt;&lt; &quot;Parse error: &quot; &lt;&lt; what &lt;&lt; &quot;\n&quot;;
+            std::abort();
+        }
+        </preformatted></para><h4>Parameters</h4><dl><dt class="parameter-name">what</dt><dd class="parameter-def">Human readable description of the error. </dd></dl><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Pointer to character data where error was detected. </dd></dl><p/><h3 class="reference-header" id="namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1">function print</h3><h4>Synopsis</h4><code class="synopsis">OutIt rapidxml::print(OutIt out, const xml_node&lt; Ch &gt; &amp;node, int flags=0);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prints XML to given output iterator. </para><h4>Parameters</h4><dl><dt class="parameter-name">out</dt><dd class="parameter-def">Output iterator to print to. </dd></dl><dl><dt class="parameter-name">node</dt><dd class="parameter-def">Node to be printed. Pass xml_document to print entire document. </dd></dl><dl><dt class="parameter-name">flags</dt><dd class="parameter-def">Flags controlling how XML is printed. </dd></dl><h4>Returns</h4>Output iterator pointing to position immediately after last character of printed text. <p/><h3 class="reference-header" id="namespacerapidxml_13bc37d6d1047acb0efdbc1689221a5e_113bc37d6d1047acb0efdbc1689221a5e">function print</h3><h4>Synopsis</h4><code class="synopsis">std::basic_ostream&lt;Ch&gt;&amp; rapidxml::print(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node, int flags=0);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prints XML to given output stream. </para><h4>Parameters</h4><dl><dt class="parameter-name">out</dt><dd class="parameter-def">Output stream to print to. </dd></dl><dl><dt class="parameter-name">node</dt><dd class="parameter-def">Node to be printed. Pass xml_document to print entire document. </dd></dl><dl><dt class="parameter-name">flags</dt><dd class="parameter-def">Flags controlling how XML is printed. </dd></dl><h4>Returns</h4>Output stream. <p/><h3 class="reference-header" id="namespacerapidxml_5619b38000d967fb223b2b0a8c17463a_15619b38000d967fb223b2b0a8c17463a">function operator&lt;&lt;</h3><h4>Synopsis</h4><code class="synopsis">std::basic_ostream&lt;Ch&gt;&amp; rapidxml::operator&lt;&lt;(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node);
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prints formatted XML to given output stream. Uses default printing flags. Use <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1" kindref="member">print()</a> function to customize printing process. </para><h4>Parameters</h4><dl><dt class="parameter-name">out</dt><dd class="parameter-def">Output stream to print to. </dd></dl><dl><dt class="parameter-name">node</dt><dd class="parameter-def">Node to be printed. </dd></dl><h4>Returns</h4>Output stream. <p/><h3 class="reference-header" id="namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9">
+				constant
+			 parse_no_data_nodes</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_data_nodes
+											  = 0x1;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not create data nodes. Text of first data node will still be placed in value of parent element, unless <a href="#namespacerapidxml_97e2c4fdc04fae17126f9971a4fc993e_197e2c4fdc04fae17126f9971a4fc993e" kindref="member">rapidxml::parse_no_element_values</a> flag is also specified. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_97e2c4fdc04fae17126f9971a4fc993e_197e2c4fdc04fae17126f9971a4fc993e">
+				constant
+			 parse_no_element_values</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_element_values
+											  = 0x2;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not use text of first data node as a value of parent element. Can be combined with other flags by use of | operator. Note that child data nodes of element node take precendence over its value when printing. That is, if element has one or more child data nodes <i>and</i> a value, the value will be ignored. Use <a href="#namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9" kindref="member">rapidxml::parse_no_data_nodes</a> flag to prevent creation of data nodes if you want to manipulate data using values of elements. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c">
+				constant
+			 parse_no_string_terminators</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_string_terminators
+											  = 0x4;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not place zero terminators after strings in the source text. By default zero terminators are placed, modifying source text. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_7223b7815c4fb8b42e6e4e77e1ea6b97_17223b7815c4fb8b42e6e4e77e1ea6b97">
+				constant
+			 parse_no_entity_translation</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_entity_translation
+											  = 0x8;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not translate entities in the source text. By default entities are translated, modifying source text. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_ccde57f6054857ee4042a1b4d98c83b9_1ccde57f6054857ee4042a1b4d98c83b9">
+				constant
+			 parse_no_utf8</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_utf8
+											  = 0x10;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to disable UTF-8 handling and assume plain 8 bit characters. By default, UTF-8 handling is enabled. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_52e2c934ad9c845a5f4cc49570470556_152e2c934ad9c845a5f4cc49570470556">
+				constant
+			 parse_declaration_node</h3><h4>Synopsis</h4><code class="synopsis">const int parse_declaration_node
+											  = 0x20;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create XML declaration node. By default, declaration node is not created. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_0f7479dacbc868456d07897a8c072784_10f7479dacbc868456d07897a8c072784">
+				constant
+			 parse_comment_nodes</h3><h4>Synopsis</h4><code class="synopsis">const int parse_comment_nodes
+											  = 0x40;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create comments nodes. By default, comment nodes are not created. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_8e187746ba1ca04f107951ad32df962e_18e187746ba1ca04f107951ad32df962e">
+				constant
+			 parse_doctype_node</h3><h4>Synopsis</h4><code class="synopsis">const int parse_doctype_node
+											  = 0x80;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create DOCTYPE node. By default, doctype node is not created. Although W3C specification allows at most one DOCTYPE node, RapidXml will silently accept documents with more than one. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_1c20b2b2b75711cd76423e119c49f830_11c20b2b2b75711cd76423e119c49f830">
+				constant
+			 parse_pi_nodes</h3><h4>Synopsis</h4><code class="synopsis">const int parse_pi_nodes
+											  = 0x100;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create PI nodes. By default, PI nodes are not created. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_a5daff9d61c7d4eaf98e4d42efe628ee_1a5daff9d61c7d4eaf98e4d42efe628ee">
+				constant
+			 parse_validate_closing_tags</h3><h4>Synopsis</h4><code class="synopsis">const int parse_validate_closing_tags
+											  = 0x200;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to validate closing tag names. If not set, name inside closing tag is irrelevant to the parser. By default, closing tags are not validated. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_ac1f06b1afd47b812732fb521b146fd9_1ac1f06b1afd47b812732fb521b146fd9">
+				constant
+			 parse_trim_whitespace</h3><h4>Synopsis</h4><code class="synopsis">const int parse_trim_whitespace
+											  = 0x400;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to trim all leading and trailing whitespace of data nodes. By default, whitespace is not trimmed. This flag does not cause the parser to modify source text. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_88f95d4e275ba01408fefde83078651b_188f95d4e275ba01408fefde83078651b">
+				constant
+			 parse_normalize_whitespace</h3><h4>Synopsis</h4><code class="synopsis">const int parse_normalize_whitespace
+											  = 0x800;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to condense all whitespace runs of data nodes to a single space character. Trimming of leading and trailing whitespace of data is controlled by <a href="#namespacerapidxml_ac1f06b1afd47b812732fb521b146fd9_1ac1f06b1afd47b812732fb521b146fd9" kindref="member">rapidxml::parse_trim_whitespace</a> flag. By default, whitespace is not normalized. If this flag is specified, source text will be modified. Can be combined with other flags by use of | operator. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_45751cf2f38fd6915f35b3122b46d5b6_145751cf2f38fd6915f35b3122b46d5b6">
+				constant
+			 parse_default</h3><h4>Synopsis</h4><code class="synopsis">const int parse_default
+											  = 0;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flags which represent default behaviour of the parser. This is always equal to 0, so that all other flags can be simply ored together. Normally there is no need to inconveniently disable flags by anding with their negated (~) values. This also means that meaning of each flag is a <i>negation</i> of the default setting. For example, if flag name is <a href="#namespacerapidxml_ccde57f6054857ee4042a1b4d98c83b9_1ccde57f6054857ee4042a1b4d98c83b9" kindref="member">rapidxml::parse_no_utf8</a>, it means that utf-8 is <i>enabled</i> by default, and using the flag will disable it. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_a97ba1a0a79a6d66f4eef3612508d943_1a97ba1a0a79a6d66f4eef3612508d943">
+				constant
+			 parse_non_destructive</h3><h4>Synopsis</h4><code class="synopsis">const int parse_non_destructive
+											  = parse_no_string_terminators | parse_no_entity_translation;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">A combination of parse flags that forbids any modifications of the source text. This also results in faster parsing. However, note that the following will occur: <ul><li><para>names and values of nodes will not be zero terminated, you have to use <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">xml_base::name_size()</a> and <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">xml_base::value_size()</a> functions to determine where name and value ends </para></li><li><para>entities will not be translated </para></li><li><para>whitespace will not be normalized </para></li></ul>
+See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_398c5476e76102f8bd76c10bb0abbe10_1398c5476e76102f8bd76c10bb0abbe10">
+				constant
+			 parse_fastest</h3><h4>Synopsis</h4><code class="synopsis">const int parse_fastest
+											  = parse_non_destructive | parse_no_data_nodes;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">A combination of parse flags resulting in fastest possible parsing, without sacrificing important data. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_b4f2515265facb42291570307924bd57_1b4f2515265facb42291570307924bd57">
+				constant
+			 parse_full</h3><h4>Synopsis</h4><code class="synopsis">const int parse_full
+											  = parse_declaration_node | parse_comment_nodes | parse_doctype_node | parse_pi_nodes | parse_validate_closing_tags;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">A combination of parse flags resulting in largest amount of data being extracted. This usually results in slowest parsing. <br/><br/>
+ See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_b08b8d4293c203b69ed6c5ae77ac1907_1b08b8d4293c203b69ed6c5ae77ac1907">
+				constant
+			 print_no_indenting</h3><h4>Synopsis</h4><code class="synopsis">const int print_no_indenting
+											  = 0x1;
+									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Printer flag instructing the printer to suppress indenting of XML. See <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1" kindref="member">print()</a> function. </para><p/></body></html>
\ No newline at end of file
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp
new file mode 100644
index 0000000..61013a9
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp
@@ -0,0 +1,2624 @@
+#ifndef CEREAL_RAPIDXML_HPP_INCLUDED
+#define CEREAL_RAPIDXML_HPP_INCLUDED
+
+// Copyright (C) 2006, 2009 Marcin Kalicinski
+// Version 1.13
+// Revision $DateTime: 2009/05/13 01:46:17 $
+
+// If standard library is disabled, user must provide implementations of required functions and typedefs
+#if !defined(CEREAL_RAPIDXML_NO_STDLIB)
+    #include <cstdlib>      // For std::size_t
+    #include <cassert>      // For assert
+    #include <new>          // For placement new
+#endif
+
+// On MSVC, disable "conditional expression is constant" warning (level 4).
+// This warning is almost impossible to avoid with certain types of templated code
+#ifdef _MSC_VER
+    #pragma warning(push)
+    #pragma warning(disable:4127)   // Conditional expression is constant
+    #pragma warning(disable:4100)   // unreferenced formal parameter
+#endif
+
+///////////////////////////////////////////////////////////////////////////
+// CEREAL_RAPIDXML_PARSE_ERROR
+
+#if defined(CEREAL_RAPIDXML_NO_EXCEPTIONS)
+
+#define CEREAL_RAPIDXML_PARSE_ERROR(what, where) { parse_error_handler(what, where); assert(0); }
+
+namespace cereal {
+namespace rapidxml
+{
+    //! When exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS,
+    //! this function is called to notify user about the error.
+    //! It must be defined by the user.
+    //! <br><br>
+    //! This function cannot return. If it does, the results are undefined.
+    //! <br><br>
+    //! A very simple definition might look like that:
+    //! <pre>
+    //! void %rapidxml::%parse_error_handler(const char *what, void *where)
+    //! {
+    //!     std::cout << "Parse error: " << what << "\n";
+    //!     std::abort();
+    //! }
+    //! </pre>
+    //! \param what Human readable description of the error.
+    //! \param where Pointer to character data where error was detected.
+    void parse_error_handler(const char *what, void *where);
+}
+} // end namespace cereal
+
+#else
+
+#include <exception>    // For std::exception
+
+#define CEREAL_RAPIDXML_PARSE_ERROR(what, where) throw parse_error(what, where)
+
+namespace cereal {
+namespace rapidxml
+{
+
+    //! Parse error exception.
+    //! This exception is thrown by the parser when an error occurs.
+    //! Use what() function to get human-readable error message.
+    //! Use where() function to get a pointer to position within source text where error was detected.
+    //! <br><br>
+    //! If throwing exceptions by the parser is undesirable,
+    //! it can be disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS macro before rapidxml.hpp is included.
+    //! This will cause the parser to call rapidxml::parse_error_handler() function instead of throwing an exception.
+    //! This function must be defined by the user.
+    //! <br><br>
+    //! This class derives from <code>std::exception</code> class.
+    class parse_error: public std::exception
+    {
+
+    public:
+
+        //! Constructs parse error
+        parse_error(const char *what_, void *where_)
+            : m_what(what_)
+            , m_where(where_)
+        {
+        }
+
+        //! Gets human readable description of error.
+        //! \return Pointer to null terminated description of the error.
+        virtual const char *what() const throw()
+        {
+            return m_what;
+        }
+
+        //! Gets pointer to character data where error happened.
+        //! Ch should be the same as char type of xml_document that produced the error.
+        //! \return Pointer to location within the parsed string where error occured.
+        template<class Ch>
+        Ch *where() const
+        {
+            return reinterpret_cast<Ch *>(m_where);
+        }
+
+    private:
+
+        const char *m_what;
+        void *m_where;
+
+    };
+}
+} // end namespace cereal
+
+#endif
+
+///////////////////////////////////////////////////////////////////////////
+// Pool sizes
+
+#ifndef CEREAL_RAPIDXML_STATIC_POOL_SIZE
+    // Size of static memory block of memory_pool.
+    // Define CEREAL_RAPIDXML_STATIC_POOL_SIZE before including rapidxml.hpp if you want to override the default value.
+    // No dynamic memory allocations are performed by memory_pool until static memory is exhausted.
+    #define CEREAL_RAPIDXML_STATIC_POOL_SIZE (64 * 1024)
+#endif
+
+#ifndef CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE
+    // Size of dynamic memory block of memory_pool.
+    // Define CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE before including rapidxml.hpp if you want to override the default value.
+    // After the static block is exhausted, dynamic blocks with approximately this size are allocated by memory_pool.
+    #define CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE (64 * 1024)
+#endif
+
+#ifndef CEREAL_RAPIDXML_ALIGNMENT
+    // Memory allocation alignment.
+    // Define CEREAL_RAPIDXML_ALIGNMENT before including rapidxml.hpp if you want to override the default value, which is the size of pointer.
+    // All memory allocations for nodes, attributes and strings will be aligned to this value.
+    // This must be a power of 2 and at least 1, otherwise memory_pool will not work.
+    #define CEREAL_RAPIDXML_ALIGNMENT sizeof(void *)
+#endif
+
+namespace cereal {
+namespace rapidxml
+{
+    // Forward declarations
+    template<class Ch> class xml_node;
+    template<class Ch> class xml_attribute;
+    template<class Ch> class xml_document;
+
+    //! Enumeration listing all node types produced by the parser.
+    //! Use xml_node::type() function to query node type.
+    enum node_type
+    {
+        node_document,      //!< A document node. Name and value are empty.
+        node_element,       //!< An element node. Name contains element name. Value contains text of first data node.
+        node_data,          //!< A data node. Name is empty. Value contains data text.
+        node_cdata,         //!< A CDATA node. Name is empty. Value contains data text.
+        node_comment,       //!< A comment node. Name is empty. Value contains comment text.
+        node_declaration,   //!< A declaration node. Name and value are empty. Declaration parameters (version, encoding and standalone) are in node attributes.
+        node_doctype,       //!< A DOCTYPE node. Name is empty. Value contains DOCTYPE text.
+        node_pi             //!< A PI node. Name contains target. Value contains instructions.
+    };
+
+    ///////////////////////////////////////////////////////////////////////
+    // Parsing flags
+
+    //! Parse flag instructing the parser to not create data nodes.
+    //! Text of first data node will still be placed in value of parent element, unless rapidxml::parse_no_element_values flag is also specified.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_no_data_nodes = 0x1;
+
+    //! Parse flag instructing the parser to not use text of first data node as a value of parent element.
+    //! Can be combined with other flags by use of | operator.
+    //! Note that child data nodes of element node take precendence over its value when printing.
+    //! That is, if element has one or more child data nodes <em>and</em> a value, the value will be ignored.
+    //! Use rapidxml::parse_no_data_nodes flag to prevent creation of data nodes if you want to manipulate data using values of elements.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_no_element_values = 0x2;
+
+    //! Parse flag instructing the parser to not place zero terminators after strings in the source text.
+    //! By default zero terminators are placed, modifying source text.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_no_string_terminators = 0x4;
+
+    //! Parse flag instructing the parser to not translate entities in the source text.
+    //! By default entities are translated, modifying source text.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_no_entity_translation = 0x8;
+
+    //! Parse flag instructing the parser to disable UTF-8 handling and assume plain 8 bit characters.
+    //! By default, UTF-8 handling is enabled.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_no_utf8 = 0x10;
+
+    //! Parse flag instructing the parser to create XML declaration node.
+    //! By default, declaration node is not created.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_declaration_node = 0x20;
+
+    //! Parse flag instructing the parser to create comments nodes.
+    //! By default, comment nodes are not created.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_comment_nodes = 0x40;
+
+    //! Parse flag instructing the parser to create DOCTYPE node.
+    //! By default, doctype node is not created.
+    //! Although W3C specification allows at most one DOCTYPE node, RapidXml will silently accept documents with more than one.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_doctype_node = 0x80;
+
+    //! Parse flag instructing the parser to create PI nodes.
+    //! By default, PI nodes are not created.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_pi_nodes = 0x100;
+
+    //! Parse flag instructing the parser to validate closing tag names.
+    //! If not set, name inside closing tag is irrelevant to the parser.
+    //! By default, closing tags are not validated.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_validate_closing_tags = 0x200;
+
+    //! Parse flag instructing the parser to trim all leading and trailing whitespace of data nodes.
+    //! By default, whitespace is not trimmed.
+    //! This flag does not cause the parser to modify source text.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_trim_whitespace = 0x400;
+
+    //! Parse flag instructing the parser to condense all whitespace runs of data nodes to a single space character.
+    //! Trimming of leading and trailing whitespace of data is controlled by rapidxml::parse_trim_whitespace flag.
+    //! By default, whitespace is not normalized.
+    //! If this flag is specified, source text will be modified.
+    //! Can be combined with other flags by use of | operator.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_normalize_whitespace = 0x800;
+
+    // Compound flags
+
+    //! Parse flags which represent default behaviour of the parser.
+    //! This is always equal to 0, so that all other flags can be simply ored together.
+    //! Normally there is no need to inconveniently disable flags by anding with their negated (~) values.
+    //! This also means that meaning of each flag is a <i>negation</i> of the default setting.
+    //! For example, if flag name is rapidxml::parse_no_utf8, it means that utf-8 is <i>enabled</i> by default,
+    //! and using the flag will disable it.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_default = 0;
+
+    //! A combination of parse flags that forbids any modifications of the source text.
+    //! This also results in faster parsing. However, note that the following will occur:
+    //! <ul>
+    //! <li>names and values of nodes will not be zero terminated, you have to use xml_base::name_size() and xml_base::value_size() functions to determine where name and value ends</li>
+    //! <li>entities will not be translated</li>
+    //! <li>whitespace will not be normalized</li>
+    //! </ul>
+    //! See xml_document::parse() function.
+    const int parse_non_destructive = parse_no_string_terminators | parse_no_entity_translation;
+
+    //! A combination of parse flags resulting in fastest possible parsing, without sacrificing important data.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_fastest = parse_non_destructive | parse_no_data_nodes;
+
+    //! A combination of parse flags resulting in largest amount of data being extracted.
+    //! This usually results in slowest parsing.
+    //! <br><br>
+    //! See xml_document::parse() function.
+    const int parse_full = parse_declaration_node | parse_comment_nodes | parse_doctype_node | parse_pi_nodes | parse_validate_closing_tags;
+
+    ///////////////////////////////////////////////////////////////////////
+    // Internals
+
+    //! \cond internal
+    namespace internal
+    {
+
+        // Struct that contains lookup tables for the parser
+        // It must be a template to allow correct linking (because it has static data members, which are defined in a header file).
+        template<int Dummy>
+        struct lookup_tables
+        {
+            static const unsigned char lookup_whitespace[256];              // Whitespace table
+            static const unsigned char lookup_node_name[256];               // Node name table
+            static const unsigned char lookup_text[256];                    // Text table
+            static const unsigned char lookup_text_pure_no_ws[256];         // Text table
+            static const unsigned char lookup_text_pure_with_ws[256];       // Text table
+            static const unsigned char lookup_attribute_name[256];          // Attribute name table
+            static const unsigned char lookup_attribute_data_1[256];        // Attribute data table with single quote
+            static const unsigned char lookup_attribute_data_1_pure[256];   // Attribute data table with single quote
+            static const unsigned char lookup_attribute_data_2[256];        // Attribute data table with double quotes
+            static const unsigned char lookup_attribute_data_2_pure[256];   // Attribute data table with double quotes
+            static const unsigned char lookup_digits[256];                  // Digits
+            static const unsigned char lookup_upcase[256];                  // To uppercase conversion table for ASCII characters
+        };
+
+        // Find length of the string
+        template<class Ch>
+        inline std::size_t measure(const Ch *p)
+        {
+            const Ch *tmp = p;
+            while (*tmp)
+                ++tmp;
+            return tmp - p;
+        }
+
+        // Compare strings for equality
+        template<class Ch>
+        inline bool compare(const Ch *p1, std::size_t size1, const Ch *p2, std::size_t size2, bool case_sensitive)
+        {
+            if (size1 != size2)
+                return false;
+            if (case_sensitive)
+            {
+                for (const Ch *end = p1 + size1; p1 < end; ++p1, ++p2)
+                    if (*p1 != *p2)
+                        return false;
+            }
+            else
+            {
+                for (const Ch *end = p1 + size1; p1 < end; ++p1, ++p2)
+                    if (lookup_tables<0>::lookup_upcase[static_cast<unsigned char>(*p1)] != lookup_tables<0>::lookup_upcase[static_cast<unsigned char>(*p2)])
+                        return false;
+            }
+            return true;
+        }
+
+        template<class Ch>
+        inline bool preserve_space(xml_node<Ch>* node)
+        {
+            const Ch preserve_value[] = { Ch('p'), Ch('r'), Ch('e'), Ch('s'), Ch('e'), Ch('r'), Ch('v'), Ch('e') };
+            const xml_attribute<Ch>* space = node->first_attribute("xml:space");
+            return space && internal::compare(space->value(), space->value_size(), preserve_value, sizeof(preserve_value) / sizeof(Ch), true);
+        }
+    }
+    //! \endcond
+
+    ///////////////////////////////////////////////////////////////////////
+    // Memory pool
+
+    //! This class is used by the parser to create new nodes and attributes, without overheads of dynamic memory allocation.
+    //! In most cases, you will not need to use this class directly.
+    //! However, if you need to create nodes manually or modify names/values of nodes,
+    //! you are encouraged to use memory_pool of relevant xml_document to allocate the memory.
+    //! Not only is this faster than allocating them by using <code>new</code> operator,
+    //! but also their lifetime will be tied to the lifetime of document,
+    //! possibly simplyfing memory management.
+    //! <br><br>
+    //! Call allocate_node() or allocate_attribute() functions to obtain new nodes or attributes from the pool.
+    //! You can also call allocate_string() function to allocate strings.
+    //! Such strings can then be used as names or values of nodes without worrying about their lifetime.
+    //! Note that there is no <code>free()</code> function -- all allocations are freed at once when clear() function is called,
+    //! or when the pool is destroyed.
+    //! <br><br>
+    //! It is also possible to create a standalone memory_pool, and use it
+    //! to allocate nodes, whose lifetime will not be tied to any document.
+    //! <br><br>
+    //! Pool maintains <code>CEREAL_RAPIDXML_STATIC_POOL_SIZE</code> bytes of statically allocated memory.
+    //! Until static memory is exhausted, no dynamic memory allocations are done.
+    //! When static memory is exhausted, pool allocates additional blocks of memory of size <code>CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE</code> each,
+    //! by using global <code>new[]</code> and <code>delete[]</code> operators.
+    //! This behaviour can be changed by setting custom allocation routines.
+    //! Use set_allocator() function to set them.
+    //! <br><br>
+    //! Allocations for nodes, attributes and strings are aligned at <code>CEREAL_RAPIDXML_ALIGNMENT</code> bytes.
+    //! This value defaults to the size of pointer on target architecture.
+    //! <br><br>
+    //! To obtain absolutely top performance from the parser,
+    //! it is important that all nodes are allocated from a single, contiguous block of memory.
+    //! Otherwise, cache misses when jumping between two (or more) disjoint blocks of memory can slow down parsing quite considerably.
+    //! If required, you can tweak <code>CEREAL_RAPIDXML_STATIC_POOL_SIZE</code>, <code>CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE</code> and <code>CEREAL_RAPIDXML_ALIGNMENT</code>
+    //! to obtain best wasted memory to performance compromise.
+    //! To do it, define their values before rapidxml.hpp file is included.
+    //! \param Ch Character type of created nodes.
+    template<class Ch = char>
+    class memory_pool
+    {
+
+    public:
+
+        //! \cond internal
+        typedef void *(alloc_func)(std::size_t);       // Type of user-defined function used to allocate memory
+        typedef void (free_func)(void *);              // Type of user-defined function used to free memory
+        //! \endcond
+
+        //! Constructs empty pool with default allocator functions.
+        memory_pool()
+            : m_alloc_func(0)
+            , m_free_func(0)
+        {
+            init();
+        }
+
+        //! Destroys pool and frees all the memory.
+        //! This causes memory occupied by nodes allocated by the pool to be freed.
+        //! Nodes allocated from the pool are no longer valid.
+        ~memory_pool()
+        {
+            clear();
+        }
+
+        //! Allocates a new node from the pool, and optionally assigns name and value to it.
+        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
+        //! If exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS, this function
+        //! will call rapidxml::parse_error_handler() function.
+        //! \param type Type of node to create.
+        //! \param name Name to assign to the node, or 0 to assign no name.
+        //! \param value Value to assign to the node, or 0 to assign no value.
+        //! \param name_size Size of name to assign, or 0 to automatically calculate size from name string.
+        //! \param value_size Size of value to assign, or 0 to automatically calculate size from value string.
+        //! \return Pointer to allocated node. This pointer will never be NULL.
+        xml_node<Ch> *allocate_node(node_type type,
+                                    const Ch *name = 0, const Ch *value = 0,
+                                    std::size_t name_size = 0, std::size_t value_size = 0)
+        {
+            void *memory = allocate_aligned(sizeof(xml_node<Ch>));
+            xml_node<Ch> *node = new(memory) xml_node<Ch>(type);
+            if (name)
+            {
+                if (name_size > 0)
+                    node->name(name, name_size);
+                else
+                    node->name(name);
+            }
+            if (value)
+            {
+                if (value_size > 0)
+                    node->value(value, value_size);
+                else
+                    node->value(value);
+            }
+            return node;
+        }
+
+        //! Allocates a new attribute from the pool, and optionally assigns name and value to it.
+        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
+        //! If exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS, this function
+        //! will call rapidxml::parse_error_handler() function.
+        //! \param name Name to assign to the attribute, or 0 to assign no name.
+        //! \param value Value to assign to the attribute, or 0 to assign no value.
+        //! \param name_size Size of name to assign, or 0 to automatically calculate size from name string.
+        //! \param value_size Size of value to assign, or 0 to automatically calculate size from value string.
+        //! \return Pointer to allocated attribute. This pointer will never be NULL.
+        xml_attribute<Ch> *allocate_attribute(const Ch *name = 0, const Ch *value = 0,
+                                              std::size_t name_size = 0, std::size_t value_size = 0)
+        {
+            void *memory = allocate_aligned(sizeof(xml_attribute<Ch>));
+            xml_attribute<Ch> *attribute = new(memory) xml_attribute<Ch>;
+            if (name)
+            {
+                if (name_size > 0)
+                    attribute->name(name, name_size);
+                else
+                    attribute->name(name);
+            }
+            if (value)
+            {
+                if (value_size > 0)
+                    attribute->value(value, value_size);
+                else
+                    attribute->value(value);
+            }
+            return attribute;
+        }
+
+        //! Allocates a char array of given size from the pool, and optionally copies a given string to it.
+        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
+        //! If exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS, this function
+        //! will call rapidxml::parse_error_handler() function.
+        //! \param source String to initialize the allocated memory with, or 0 to not initialize it.
+        //! \param size Number of characters to allocate, or zero to calculate it automatically from source string length; if size is 0, source string must be specified and null terminated.
+        //! \return Pointer to allocated char array. This pointer will never be NULL.
+        Ch *allocate_string(const Ch *source = 0, std::size_t size = 0)
+        {
+            assert(source || size);     // Either source or size (or both) must be specified
+            if (size == 0)
+                size = internal::measure(source) + 1;
+            Ch *result = static_cast<Ch *>(allocate_aligned(size * sizeof(Ch)));
+            if (source)
+                for (std::size_t i = 0; i < size; ++i)
+                    result[i] = source[i];
+            return result;
+        }
+
+        //! Clones an xml_node and its hierarchy of child nodes and attributes.
+        //! Nodes and attributes are allocated from this memory pool.
+        //! Names and values are not cloned, they are shared between the clone and the source.
+        //! Result node can be optionally specified as a second parameter,
+        //! in which case its contents will be replaced with cloned source node.
+        //! This is useful when you want to clone entire document.
+        //! \param source Node to clone.
+        //! \param result Node to put results in, or 0 to automatically allocate result node
+        //! \return Pointer to cloned node. This pointer will never be NULL.
+        xml_node<Ch> *clone_node(const xml_node<Ch> *source, xml_node<Ch> *result = 0)
+        {
+            // Prepare result node
+            if (result)
+            {
+                result->remove_all_attributes();
+                result->remove_all_nodes();
+                result->type(source->type());
+            }
+            else
+                result = allocate_node(source->type());
+
+            // Clone name and value
+            result->name(source->name(), source->name_size());
+            result->value(source->value(), source->value_size());
+
+            // Clone child nodes and attributes
+            for (xml_node<Ch> *child = source->first_node(); child; child = child->next_sibling())
+                result->append_node(clone_node(child));
+            for (xml_attribute<Ch> *attr = source->first_attribute(); attr; attr = attr->next_attribute())
+                result->append_attribute(allocate_attribute(attr->name(), attr->value(), attr->name_size(), attr->value_size()));
+
+            return result;
+        }
+
+        //! Clears the pool.
+        //! This causes memory occupied by nodes allocated by the pool to be freed.
+        //! Any nodes or strings allocated from the pool will no longer be valid.
+        void clear()
+        {
+            while (m_begin != m_static_memory)
+            {
+                char *previous_begin = reinterpret_cast<header *>(align(m_begin))->previous_begin;
+                if (m_free_func)
+                    m_free_func(m_begin);
+                else
+                    delete[] m_begin;
+                m_begin = previous_begin;
+            }
+            init();
+        }
+
+        //! Sets or resets the user-defined memory allocation functions for the pool.
+        //! This can only be called when no memory is allocated from the pool yet, otherwise results are undefined.
+        //! Allocation function must not return invalid pointer on failure. It should either throw,
+        //! stop the program, or use <code>longjmp()</code> function to pass control to other place of program.
+        //! If it returns invalid pointer, results are undefined.
+        //! <br><br>
+        //! User defined allocation functions must have the following forms:
+        //! <br><code>
+        //! <br>void *allocate(std::size_t size);
+        //! <br>void free(void *pointer);
+        //! </code><br>
+        //! \param af Allocation function, or 0 to restore default function
+        //! \param ff Free function, or 0 to restore default function
+        void set_allocator(alloc_func *af, free_func *ff)
+        {
+            assert(m_begin == m_static_memory && m_ptr == align(m_begin));    // Verify that no memory is allocated yet
+            m_alloc_func = af;
+            m_free_func = ff;
+        }
+
+    private:
+
+        struct header
+        {
+            char *previous_begin;
+        };
+
+        void init()
+        {
+            m_begin = m_static_memory;
+            m_ptr = align(m_begin);
+            m_end = m_static_memory + sizeof(m_static_memory);
+        }
+
+        char *align(char *ptr)
+        {
+            std::size_t alignment = ((CEREAL_RAPIDXML_ALIGNMENT - (std::size_t(ptr) & (CEREAL_RAPIDXML_ALIGNMENT - 1))) & (CEREAL_RAPIDXML_ALIGNMENT - 1));
+            return ptr + alignment;
+        }
+
+        char *allocate_raw(std::size_t size)
+        {
+            // Allocate
+            void *memory;
+            if (m_alloc_func)   // Allocate memory using either user-specified allocation function or global operator new[]
+            {
+                memory = m_alloc_func(size);
+                assert(memory); // Allocator is not allowed to return 0, on failure it must either throw, stop the program or use longjmp
+            }
+            else
+            {
+                memory = new char[size];
+#ifdef CEREAL_RAPIDXML_NO_EXCEPTIONS
+                if (!memory)            // If exceptions are disabled, verify memory allocation, because new will not be able to throw bad_alloc
+                    CEREAL_RAPIDXML_PARSE_ERROR("out of memory", 0);
+#endif
+            }
+            return static_cast<char *>(memory);
+        }
+
+        void *allocate_aligned(std::size_t size)
+        {
+            // Calculate aligned pointer
+            char *result = align(m_ptr);
+
+            // If not enough memory left in current pool, allocate a new pool
+            if (result + size > m_end)
+            {
+                // Calculate required pool size (may be bigger than CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE)
+                std::size_t pool_size = CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE;
+                if (pool_size < size)
+                    pool_size = size;
+
+                // Allocate
+                std::size_t alloc_size = sizeof(header) + (2 * CEREAL_RAPIDXML_ALIGNMENT - 2) + pool_size;     // 2 alignments required in worst case: one for header, one for actual allocation
+                char *raw_memory = allocate_raw(alloc_size);
+
+                // Setup new pool in allocated memory
+                char *pool = align(raw_memory);
+                header *new_header = reinterpret_cast<header *>(pool);
+                new_header->previous_begin = m_begin;
+                m_begin = raw_memory;
+                m_ptr = pool + sizeof(header);
+                m_end = raw_memory + alloc_size;
+
+                // Calculate aligned pointer again using new pool
+                result = align(m_ptr);
+            }
+
+            // Update pool and return aligned pointer
+            m_ptr = result + size;
+            return result;
+        }
+
+        char *m_begin;                                      // Start of raw memory making up current pool
+        char *m_ptr;                                        // First free byte in current pool
+        char *m_end;                                        // One past last available byte in current pool
+        char m_static_memory[CEREAL_RAPIDXML_STATIC_POOL_SIZE];    // Static raw memory
+        alloc_func *m_alloc_func;                           // Allocator function, or 0 if default is to be used
+        free_func *m_free_func;                             // Free function, or 0 if default is to be used
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    // XML base
+
+    //! Base class for xml_node and xml_attribute implementing common functions:
+    //! name(), name_size(), value(), value_size() and parent().
+    //! \param Ch Character type to use
+    template<class Ch = char>
+    class xml_base
+    {
+
+    public:
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Construction & destruction
+
+        // Construct a base with empty name, value and parent
+        xml_base()
+            : m_name(0)
+            , m_value(0)
+            , m_parent(0)
+        {
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Node data access
+
+        //! Gets name of the node.
+        //! Interpretation of name depends on type of node.
+        //! Note that name will not be zero-terminated if rapidxml::parse_no_string_terminators option was selected during parse.
+        //! <br><br>
+        //! Use name_size() function to determine length of the name.
+        //! \return Name of node, or empty string if node has no name.
+        Ch *name() const
+        {
+            return m_name ? m_name : nullstr();
+        }
+
+        //! Gets size of node name, not including terminator character.
+        //! This function works correctly irrespective of whether name is or is not zero terminated.
+        //! \return Size of node name, in characters.
+        std::size_t name_size() const
+        {
+            return m_name ? m_name_size : 0;
+        }
+
+        //! Gets value of node.
+        //! Interpretation of value depends on type of node.
+        //! Note that value will not be zero-terminated if rapidxml::parse_no_string_terminators option was selected during parse.
+        //! <br><br>
+        //! Use value_size() function to determine length of the value.
+        //! \return Value of node, or empty string if node has no value.
+        Ch *value() const
+        {
+            return m_value ? m_value : nullstr();
+        }
+
+        //! Gets size of node value, not including terminator character.
+        //! This function works correctly irrespective of whether value is or is not zero terminated.
+        //! \return Size of node value, in characters.
+        std::size_t value_size() const
+        {
+            return m_value ? m_value_size : 0;
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Node modification
+
+        //! Sets name of node to a non zero-terminated string.
+        //! See \ref ownership_of_strings.
+        //! <br><br>
+        //! Note that node does not own its name or value, it only stores a pointer to it.
+        //! It will not delete or otherwise free the pointer on destruction.
+        //! It is reponsibility of the user to properly manage lifetime of the string.
+        //! The easiest way to achieve it is to use memory_pool of the document to allocate the string -
+        //! on destruction of the document the string will be automatically freed.
+        //! <br><br>
+        //! Size of name must be specified separately, because name does not have to be zero terminated.
+        //! Use name(const Ch *) function to have the length automatically calculated (string must be zero terminated).
+        //! \param name Name of node to set. Does not have to be zero terminated.
+        //! \param size Size of name, in characters. This does not include zero terminator, if one is present.
+        void name(const Ch *name_, std::size_t size)
+        {
+            m_name = const_cast<Ch *>(name_);
+            m_name_size = size;
+        }
+
+        //! Sets name of node to a zero-terminated string.
+        //! See also \ref ownership_of_strings and xml_node::name(const Ch *, std::size_t).
+        //! \param name Name of node to set. Must be zero terminated.
+        void name(const Ch *name_)
+        {
+            this->name(name_, internal::measure(name_));
+        }
+
+        //! Sets value of node to a non zero-terminated string.
+        //! See \ref ownership_of_strings.
+        //! <br><br>
+        //! Note that node does not own its name or value, it only stores a pointer to it.
+        //! It will not delete or otherwise free the pointer on destruction.
+        //! It is reponsibility of the user to properly manage lifetime of the string.
+        //! The easiest way to achieve it is to use memory_pool of the document to allocate the string -
+        //! on destruction of the document the string will be automatically freed.
+        //! <br><br>
+        //! Size of value must be specified separately, because it does not have to be zero terminated.
+        //! Use value(const Ch *) function to have the length automatically calculated (string must be zero terminated).
+        //! <br><br>
+        //! If an element has a child node of type node_data, it will take precedence over element value when printing.
+        //! If you want to manipulate data of elements using values, use parser flag rapidxml::parse_no_data_nodes to prevent creation of data nodes by the parser.
+        //! \param value value of node to set. Does not have to be zero terminated.
+        //! \param size Size of value, in characters. This does not include zero terminator, if one is present.
+        void value(const Ch *value_, std::size_t size)
+        {
+            m_value = const_cast<Ch *>(value_);
+            m_value_size = size;
+        }
+
+        //! Sets value of node to a zero-terminated string.
+        //! See also \ref ownership_of_strings and xml_node::value(const Ch *, std::size_t).
+        //! \param value Vame of node to set. Must be zero terminated.
+        void value(const Ch *value_)
+        {
+            this->value(value_, internal::measure(value_));
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Related nodes access
+
+        //! Gets node parent.
+        //! \return Pointer to parent node, or 0 if there is no parent.
+        xml_node<Ch> *parent() const
+        {
+            return m_parent;
+        }
+
+    protected:
+
+        // Return empty string
+        static Ch *nullstr()
+        {
+            static Ch zero = Ch('\0');
+            return &zero;
+        }
+
+        Ch *m_name;                         // Name of node, or 0 if no name
+        Ch *m_value;                        // Value of node, or 0 if no value
+        std::size_t m_name_size;            // Length of node name, or undefined of no name
+        std::size_t m_value_size;           // Length of node value, or undefined if no value
+        xml_node<Ch> *m_parent;             // Pointer to parent node, or 0 if none
+
+    };
+
+    //! Class representing attribute node of XML document.
+    //! Each attribute has name and value strings, which are available through name() and value() functions (inherited from xml_base).
+    //! Note that after parse, both name and value of attribute will point to interior of source text used for parsing.
+    //! Thus, this text must persist in memory for the lifetime of attribute.
+    //! \param Ch Character type to use.
+    template<class Ch = char>
+    class xml_attribute: public xml_base<Ch>
+    {
+
+        friend class xml_node<Ch>;
+
+    public:
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Construction & destruction
+
+        //! Constructs an empty attribute with the specified type.
+        //! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
+        xml_attribute()
+        {
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Related nodes access
+
+        //! Gets document of which attribute is a child.
+        //! \return Pointer to document that contains this attribute, or 0 if there is no parent document.
+        xml_document<Ch> *document() const
+        {
+            if (xml_node<Ch> *node = this->parent())
+            {
+                while (node->parent())
+                    node = node->parent();
+                return node->type() == node_document ? static_cast<xml_document<Ch> *>(node) : 0;
+            }
+            else
+                return 0;
+        }
+
+        //! Gets previous attribute, optionally matching attribute name.
+        //! \param name Name of attribute to find, or 0 to return previous attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found attribute, or 0 if not found.
+        xml_attribute<Ch> *previous_attribute(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
+        {
+            if (name)
+            {
+                if (name_size == 0)
+                    name_size = internal::measure(name);
+                for (xml_attribute<Ch> *attribute = m_prev_attribute; attribute; attribute = attribute->m_prev_attribute)
+                    if (internal::compare(attribute->name(), attribute->name_size(), name, name_size, case_sensitive))
+                        return attribute;
+                return 0;
+            }
+            else
+                return this->m_parent ? m_prev_attribute : 0;
+        }
+
+        //! Gets next attribute, optionally matching attribute name.
+        //! \param name Name of attribute to find, or 0 to return next attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found attribute, or 0 if not found.
+        xml_attribute<Ch> *next_attribute(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
+        {
+            if (name_)
+            {
+                if (name_size_ == 0)
+                    name_size_ = internal::measure(name_);
+                for (xml_attribute<Ch> *attribute = m_next_attribute; attribute; attribute = attribute->m_next_attribute)
+                    if (internal::compare(attribute->name(), attribute->name_size(), name_, name_size_, case_sensitive))
+                        return attribute;
+                return 0;
+            }
+            else
+                return this->m_parent ? m_next_attribute : 0;
+        }
+
+    private:
+
+        xml_attribute<Ch> *m_prev_attribute;        // Pointer to previous sibling of attribute, or 0 if none; only valid if parent is non-zero
+        xml_attribute<Ch> *m_next_attribute;        // Pointer to next sibling of attribute, or 0 if none; only valid if parent is non-zero
+
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    // XML node
+
+    //! Class representing a node of XML document.
+    //! Each node may have associated name and value strings, which are available through name() and value() functions.
+    //! Interpretation of name and value depends on type of the node.
+    //! Type of node can be determined by using type() function.
+    //! <br><br>
+    //! Note that after parse, both name and value of node, if any, will point interior of source text used for parsing.
+    //! Thus, this text must persist in the memory for the lifetime of node.
+    //! \param Ch Character type to use.
+    template<class Ch = char>
+    class xml_node: public xml_base<Ch>
+    {
+
+    public:
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Construction & destruction
+
+        //! Constructs an empty node with the specified type.
+        //! Consider using memory_pool of appropriate document to allocate nodes manually.
+        //! \param type Type of node to construct.
+        xml_node(node_type type_)
+            : m_type(type_)
+            , m_first_node(0)
+            , m_first_attribute(0)
+        {
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Node data access
+
+        //! Gets type of node.
+        //! \return Type of node.
+        node_type type() const
+        {
+            return m_type;
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Related nodes access
+
+        //! Gets document of which node is a child.
+        //! \return Pointer to document that contains this node, or 0 if there is no parent document.
+        xml_document<Ch> *document() const
+        {
+            xml_node<Ch> *node = const_cast<xml_node<Ch> *>(this);
+            while (node->parent())
+                node = node->parent();
+            return node->type() == node_document ? static_cast<xml_document<Ch> *>(node) : 0;
+        }
+
+        //! Gets first child node, optionally matching node name.
+        //! \param name Name of child to find, or 0 to return first child regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found child, or 0 if not found.
+        xml_node<Ch> *first_node(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
+        {
+            if (name_)
+            {
+                if (name_size_ == 0)
+                    name_size_ = internal::measure(name_);
+                for (xml_node<Ch> *child = m_first_node; child; child = child->next_sibling())
+                    if (internal::compare(child->name(), child->name_size(), name_, name_size_, case_sensitive))
+                        return child;
+                return 0;
+            }
+            else
+                return m_first_node;
+        }
+
+        //! Gets last child node, optionally matching node name.
+        //! Behaviour is undefined if node has no children.
+        //! Use first_node() to test if node has children.
+        //! \param name Name of child to find, or 0 to return last child regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found child, or 0 if not found.
+        xml_node<Ch> *last_node(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
+        {
+            assert(m_first_node);  // Cannot query for last child if node has no children
+            if (name)
+            {
+                if (name_size == 0)
+                    name_size = internal::measure(name);
+                for (xml_node<Ch> *child = m_last_node; child; child = child->previous_sibling())
+                    if (internal::compare(child->name(), child->name_size(), name, name_size, case_sensitive))
+                        return child;
+                return 0;
+            }
+            else
+                return m_last_node;
+        }
+
+        //! Gets previous sibling node, optionally matching node name.
+        //! Behaviour is undefined if node has no parent.
+        //! Use parent() to test if node has a parent.
+        //! \param name Name of sibling to find, or 0 to return previous sibling regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found sibling, or 0 if not found.
+        xml_node<Ch> *previous_sibling(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
+        {
+            assert(this->m_parent);     // Cannot query for siblings if node has no parent
+            if (name)
+            {
+                if (name_size == 0)
+                    name_size = internal::measure(name);
+                for (xml_node<Ch> *sibling = m_prev_sibling; sibling; sibling = sibling->m_prev_sibling)
+                    if (internal::compare(sibling->name(), sibling->name_size(), name, name_size, case_sensitive))
+                        return sibling;
+                return 0;
+            }
+            else
+                return m_prev_sibling;
+        }
+
+        //! Gets next sibling node, optionally matching node name.
+        //! Behaviour is undefined if node has no parent.
+        //! Use parent() to test if node has a parent.
+        //! \param name Name of sibling to find, or 0 to return next sibling regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found sibling, or 0 if not found.
+        xml_node<Ch> *next_sibling(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
+        {
+            assert(this->m_parent);     // Cannot query for siblings if node has no parent
+            if (name_)
+            {
+                if (name_size_ == 0)
+                    name_size_ = internal::measure(name_);
+                for (xml_node<Ch> *sibling = m_next_sibling; sibling; sibling = sibling->m_next_sibling)
+                    if (internal::compare(sibling->name(), sibling->name_size(), name_, name_size_, case_sensitive))
+                        return sibling;
+                return 0;
+            }
+            else
+                return m_next_sibling;
+        }
+
+        //! Gets first attribute of node, optionally matching attribute name.
+        //! \param name Name of attribute to find, or 0 to return first attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found attribute, or 0 if not found.
+        xml_attribute<Ch> *first_attribute(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
+        {
+            if (name_)
+            {
+                if (name_size_ == 0)
+                    name_size_ = internal::measure(name_);
+                for (xml_attribute<Ch> *attribute = m_first_attribute; attribute; attribute = attribute->m_next_attribute)
+                    if (internal::compare(attribute->name(), attribute->name_size(), name_, name_size_, case_sensitive))
+                        return attribute;
+                return 0;
+            }
+            else
+                return m_first_attribute;
+        }
+
+        //! Gets last attribute of node, optionally matching attribute name.
+        //! \param name Name of attribute to find, or 0 to return last attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
+        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
+        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
+        //! \return Pointer to found attribute, or 0 if not found.
+        xml_attribute<Ch> *last_attribute(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
+        {
+            if (name)
+            {
+                if (name_size == 0)
+                    name_size = internal::measure(name);
+                for (xml_attribute<Ch> *attribute = m_last_attribute; attribute; attribute = attribute->m_prev_attribute)
+                    if (internal::compare(attribute->name(), attribute->name_size(), name, name_size, case_sensitive))
+                        return attribute;
+                return 0;
+            }
+            else
+                return m_first_attribute ? m_last_attribute : 0;
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Node modification
+
+        //! Sets type of node.
+        //! \param type Type of node to set.
+        void type(node_type type_)
+        {
+            m_type = type_;
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Node manipulation
+
+        //! Prepends a new child node.
+        //! The prepended child becomes the first child, and all existing children are moved one position back.
+        //! \param child Node to prepend.
+        void prepend_node(xml_node<Ch> *child)
+        {
+            assert(child && !child->parent() && child->type() != node_document);
+            if (first_node())
+            {
+                child->m_next_sibling = m_first_node;
+                m_first_node->m_prev_sibling = child;
+            }
+            else
+            {
+                child->m_next_sibling = 0;
+                m_last_node = child;
+            }
+            m_first_node = child;
+            child->m_parent = this;
+            child->m_prev_sibling = 0;
+        }
+
+        //! Appends a new child node.
+        //! The appended child becomes the last child.
+        //! \param child Node to append.
+        void append_node(xml_node<Ch> *child)
+        {
+            assert(child && !child->parent() && child->type() != node_document);
+            if (first_node())
+            {
+                child->m_prev_sibling = m_last_node;
+                m_last_node->m_next_sibling = child;
+            }
+            else
+            {
+                child->m_prev_sibling = 0;
+                m_first_node = child;
+            }
+            m_last_node = child;
+            child->m_parent = this;
+            child->m_next_sibling = 0;
+        }
+
+        //! Inserts a new child node at specified place inside the node.
+        //! All children after and including the specified node are moved one position back.
+        //! \param where Place where to insert the child, or 0 to insert at the back.
+        //! \param child Node to insert.
+        void insert_node(xml_node<Ch> *where, xml_node<Ch> *child)
+        {
+            assert(!where || where->parent() == this);
+            assert(child && !child->parent() && child->type() != node_document);
+            if (where == m_first_node)
+                prepend_node(child);
+            else if (where == 0)
+                append_node(child);
+            else
+            {
+                child->m_prev_sibling = where->m_prev_sibling;
+                child->m_next_sibling = where;
+                where->m_prev_sibling->m_next_sibling = child;
+                where->m_prev_sibling = child;
+                child->m_parent = this;
+            }
+        }
+
+        //! Removes first child node.
+        //! If node has no children, behaviour is undefined.
+        //! Use first_node() to test if node has children.
+        void remove_first_node()
+        {
+            assert(first_node());
+            xml_node<Ch> *child = m_first_node;
+            m_first_node = child->m_next_sibling;
+            if (child->m_next_sibling)
+                child->m_next_sibling->m_prev_sibling = 0;
+            else
+                m_last_node = 0;
+            child->m_parent = 0;
+        }
+
+        //! Removes last child of the node.
+        //! If node has no children, behaviour is undefined.
+        //! Use first_node() to test if node has children.
+        void remove_last_node()
+        {
+            assert(first_node());
+            xml_node<Ch> *child = m_last_node;
+            if (child->m_prev_sibling)
+            {
+                m_last_node = child->m_prev_sibling;
+                child->m_prev_sibling->m_next_sibling = 0;
+            }
+            else
+                m_first_node = 0;
+            child->m_parent = 0;
+        }
+
+        //! Removes specified child from the node
+        // \param where Pointer to child to be removed.
+        void remove_node(xml_node<Ch> *where)
+        {
+            assert(where && where->parent() == this);
+            assert(first_node());
+            if (where == m_first_node)
+                remove_first_node();
+            else if (where == m_last_node)
+                remove_last_node();
+            else
+            {
+                where->m_prev_sibling->m_next_sibling = where->m_next_sibling;
+                where->m_next_sibling->m_prev_sibling = where->m_prev_sibling;
+                where->m_parent = 0;
+            }
+        }
+
+        //! Removes all child nodes (but not attributes).
+        void remove_all_nodes()
+        {
+            for (xml_node<Ch> *node = first_node(); node; node = node->m_next_sibling)
+                node->m_parent = 0;
+            m_first_node = 0;
+        }
+
+        //! Prepends a new attribute to the node.
+        //! \param attribute Attribute to prepend.
+        void prepend_attribute(xml_attribute<Ch> *attribute)
+        {
+            assert(attribute && !attribute->parent());
+            if (first_attribute())
+            {
+                attribute->m_next_attribute = m_first_attribute;
+                m_first_attribute->m_prev_attribute = attribute;
+            }
+            else
+            {
+                attribute->m_next_attribute = 0;
+                m_last_attribute = attribute;
+            }
+            m_first_attribute = attribute;
+            attribute->m_parent = this;
+            attribute->m_prev_attribute = 0;
+        }
+
+        //! Appends a new attribute to the node.
+        //! \param attribute Attribute to append.
+        void append_attribute(xml_attribute<Ch> *attribute)
+        {
+            assert(attribute && !attribute->parent());
+            if (first_attribute())
+            {
+                attribute->m_prev_attribute = m_last_attribute;
+                m_last_attribute->m_next_attribute = attribute;
+            }
+            else
+            {
+                attribute->m_prev_attribute = 0;
+                m_first_attribute = attribute;
+            }
+            m_last_attribute = attribute;
+            attribute->m_parent = this;
+            attribute->m_next_attribute = 0;
+        }
+
+        //! Inserts a new attribute at specified place inside the node.
+        //! All attributes after and including the specified attribute are moved one position back.
+        //! \param where Place where to insert the attribute, or 0 to insert at the back.
+        //! \param attribute Attribute to insert.
+        void insert_attribute(xml_attribute<Ch> *where, xml_attribute<Ch> *attribute)
+        {
+            assert(!where || where->parent() == this);
+            assert(attribute && !attribute->parent());
+            if (where == m_first_attribute)
+                prepend_attribute(attribute);
+            else if (where == 0)
+                append_attribute(attribute);
+            else
+            {
+                attribute->m_prev_attribute = where->m_prev_attribute;
+                attribute->m_next_attribute = where;
+                where->m_prev_attribute->m_next_attribute = attribute;
+                where->m_prev_attribute = attribute;
+                attribute->m_parent = this;
+            }
+        }
+
+        //! Removes first attribute of the node.
+        //! If node has no attributes, behaviour is undefined.
+        //! Use first_attribute() to test if node has attributes.
+        void remove_first_attribute()
+        {
+            assert(first_attribute());
+            xml_attribute<Ch> *attribute = m_first_attribute;
+            if (attribute->m_next_attribute)
+            {
+                attribute->m_next_attribute->m_prev_attribute = 0;
+            }
+            else
+                m_last_attribute = 0;
+            attribute->m_parent = 0;
+            m_first_attribute = attribute->m_next_attribute;
+        }
+
+        //! Removes last attribute of the node.
+        //! If node has no attributes, behaviour is undefined.
+        //! Use first_attribute() to test if node has attributes.
+        void remove_last_attribute()
+        {
+            assert(first_attribute());
+            xml_attribute<Ch> *attribute = m_last_attribute;
+            if (attribute->m_prev_attribute)
+            {
+                attribute->m_prev_attribute->m_next_attribute = 0;
+                m_last_attribute = attribute->m_prev_attribute;
+            }
+            else
+                m_first_attribute = 0;
+            attribute->m_parent = 0;
+        }
+
+        //! Removes specified attribute from node.
+        //! \param where Pointer to attribute to be removed.
+        void remove_attribute(xml_attribute<Ch> *where)
+        {
+            assert(first_attribute() && where->parent() == this);
+            if (where == m_first_attribute)
+                remove_first_attribute();
+            else if (where == m_last_attribute)
+                remove_last_attribute();
+            else
+            {
+                where->m_prev_attribute->m_next_attribute = where->m_next_attribute;
+                where->m_next_attribute->m_prev_attribute = where->m_prev_attribute;
+                where->m_parent = 0;
+            }
+        }
+
+        //! Removes all attributes of node.
+        void remove_all_attributes()
+        {
+            for (xml_attribute<Ch> *attribute = first_attribute(); attribute; attribute = attribute->m_next_attribute)
+                attribute->m_parent = 0;
+            m_first_attribute = 0;
+        }
+
+    private:
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Restrictions
+
+        // No copying
+        xml_node(const xml_node &);
+        void operator =(const xml_node &);
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Data members
+
+        // Note that some of the pointers below have UNDEFINED values if certain other pointers are 0.
+        // This is required for maximum performance, as it allows the parser to omit initialization of
+        // unneded/redundant values.
+        //
+        // The rules are as follows:
+        // 1. first_node and first_attribute contain valid pointers, or 0 if node has no children/attributes respectively
+        // 2. last_node and last_attribute are valid only if node has at least one child/attribute respectively, otherwise they contain garbage
+        // 3. prev_sibling and next_sibling are valid only if node has a parent, otherwise they contain garbage
+
+        node_type m_type;                       // Type of node; always valid
+        xml_node<Ch> *m_first_node;             // Pointer to first child node, or 0 if none; always valid
+        xml_node<Ch> *m_last_node;              // Pointer to last child node, or 0 if none; this value is only valid if m_first_node is non-zero
+        xml_attribute<Ch> *m_first_attribute;   // Pointer to first attribute of node, or 0 if none; always valid
+        xml_attribute<Ch> *m_last_attribute;    // Pointer to last attribute of node, or 0 if none; this value is only valid if m_first_attribute is non-zero
+        xml_node<Ch> *m_prev_sibling;           // Pointer to previous sibling of node, or 0 if none; this value is only valid if m_parent is non-zero
+        xml_node<Ch> *m_next_sibling;           // Pointer to next sibling of node, or 0 if none; this value is only valid if m_parent is non-zero
+
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    // XML document
+
+    //! This class represents root of the DOM hierarchy.
+    //! It is also an xml_node and a memory_pool through public inheritance.
+    //! Use parse() function to build a DOM tree from a zero-terminated XML text string.
+    //! parse() function allocates memory for nodes and attributes by using functions of xml_document,
+    //! which are inherited from memory_pool.
+    //! To access root node of the document, use the document itself, as if it was an xml_node.
+    //! \param Ch Character type to use.
+    template<class Ch = char>
+    class xml_document: public xml_node<Ch>, public memory_pool<Ch>
+    {
+
+    public:
+
+        //! Constructs empty XML document
+        xml_document()
+            : xml_node<Ch>(node_document)
+        {
+        }
+
+        //! Parses zero-terminated XML string according to given flags.
+        //! Passed string will be modified by the parser, unless rapidxml::parse_non_destructive flag is used.
+        //! The string must persist for the lifetime of the document.
+        //! In case of error, rapidxml::parse_error exception will be thrown.
+        //! <br><br>
+        //! If you want to parse contents of a file, you must first load the file into the memory, and pass pointer to its beginning.
+        //! Make sure that data is zero-terminated.
+        //! <br><br>
+        //! Document can be parsed into multiple times.
+        //! Each new call to parse removes previous nodes and attributes (if any), but does not clear memory pool.
+        //! \param text XML data to parse; pointer is non-const to denote fact that this data may be modified by the parser.
+        template<int Flags>
+        void parse(Ch *text)
+        {
+            assert(text);
+
+            // Remove current contents
+            this->remove_all_nodes();
+            this->remove_all_attributes();
+
+            // Parse BOM, if any
+            parse_bom<Flags>(text);
+
+            // Parse children
+            while (1)
+            {
+                // Skip whitespace before node
+                skip<whitespace_pred, Flags>(text);
+                if (*text == 0)
+                    break;
+
+                // Parse and append new child
+                if (*text == Ch('<'))
+                {
+                    ++text;     // Skip '<'
+                    if (xml_node<Ch> *node = parse_node<Flags>(text))
+                        this->append_node(node);
+                }
+                else
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected <", text);
+            }
+
+        }
+
+        //! Clears the document by deleting all nodes and clearing the memory pool.
+        //! All nodes owned by document pool are destroyed.
+        void clear()
+        {
+            this->remove_all_nodes();
+            this->remove_all_attributes();
+            memory_pool<Ch>::clear();
+        }
+
+    private:
+
+        ///////////////////////////////////////////////////////////////////////
+        // Internal character utility functions
+
+        // Detect whitespace character
+        struct whitespace_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                return internal::lookup_tables<0>::lookup_whitespace[static_cast<unsigned char>(ch)];
+            }
+        };
+
+        // Detect node name character
+        struct node_name_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                return internal::lookup_tables<0>::lookup_node_name[static_cast<unsigned char>(ch)];
+            }
+        };
+
+        // Detect attribute name character
+        struct attribute_name_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                return internal::lookup_tables<0>::lookup_attribute_name[static_cast<unsigned char>(ch)];
+            }
+        };
+
+        // Detect text character (PCDATA)
+        struct text_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                return internal::lookup_tables<0>::lookup_text[static_cast<unsigned char>(ch)];
+            }
+        };
+
+        // Detect text character (PCDATA) that does not require processing
+        struct text_pure_no_ws_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                return internal::lookup_tables<0>::lookup_text_pure_no_ws[static_cast<unsigned char>(ch)];
+            }
+        };
+
+        // Detect text character (PCDATA) that does not require processing
+        struct text_pure_with_ws_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                return internal::lookup_tables<0>::lookup_text_pure_with_ws[static_cast<unsigned char>(ch)];
+            }
+        };
+
+        // Detect attribute value character
+        template<Ch Quote>
+        struct attribute_value_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                if (Quote == Ch('\''))
+                    return internal::lookup_tables<0>::lookup_attribute_data_1[static_cast<unsigned char>(ch)];
+                if (Quote == Ch('\"'))
+                    return internal::lookup_tables<0>::lookup_attribute_data_2[static_cast<unsigned char>(ch)];
+                return 0;       // Should never be executed, to avoid warnings on Comeau
+            }
+        };
+
+        // Detect attribute value character
+        template<Ch Quote>
+        struct attribute_value_pure_pred
+        {
+            static unsigned char test(Ch ch)
+            {
+                if (Quote == Ch('\''))
+                    return internal::lookup_tables<0>::lookup_attribute_data_1_pure[static_cast<unsigned char>(ch)];
+                if (Quote == Ch('\"'))
+                    return internal::lookup_tables<0>::lookup_attribute_data_2_pure[static_cast<unsigned char>(ch)];
+                return 0;       // Should never be executed, to avoid warnings on Comeau
+            }
+        };
+
+        // Insert coded character, using UTF8 or 8-bit ASCII
+        template<int Flags>
+        static void insert_coded_character(Ch *&text, unsigned long code)
+        {
+            if (Flags & parse_no_utf8)
+            {
+                // Insert 8-bit ASCII character
+                // Todo: possibly verify that code is less than 256 and use replacement char otherwise?
+                text[0] = static_cast<unsigned char>(code);
+                text += 1;
+            }
+            else
+            {
+                // Insert UTF8 sequence
+                if (code < 0x80)    // 1 byte sequence
+                {
+	                text[0] = static_cast<unsigned char>(code);
+                    text += 1;
+                }
+                else if (code < 0x800)  // 2 byte sequence
+                {
+	                text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+	                text[0] = static_cast<unsigned char>(code | 0xC0);
+                    text += 2;
+                }
+	            else if (code < 0x10000)    // 3 byte sequence
+                {
+	                text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+	                text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+	                text[0] = static_cast<unsigned char>(code | 0xE0);
+                    text += 3;
+                }
+	            else if (code < 0x110000)   // 4 byte sequence
+                {
+	                text[3] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+	                text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+	                text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
+	                text[0] = static_cast<unsigned char>(code | 0xF0);
+                    text += 4;
+                }
+                else    // Invalid, only codes up to 0x10FFFF are allowed in Unicode
+                {
+                    CEREAL_RAPIDXML_PARSE_ERROR("invalid numeric character entity", text);
+                }
+            }
+        }
+
+        // Skip characters until predicate evaluates to true
+        template<class StopPred, int Flags>
+        static void skip(Ch *&text)
+        {
+            Ch *tmp = text;
+            while (StopPred::test(*tmp))
+                ++tmp;
+            text = tmp;
+        }
+
+        // Skip characters until predicate evaluates to true while doing the following:
+        // - replacing XML character entity references with proper characters (&apos; &amp; &quot; &lt; &gt; &#...;)
+        // - condensing whitespace sequences to single space character
+        template<class StopPred, class StopPredPure, int Flags>
+        static Ch *skip_and_expand_character_refs(Ch *&text, bool preserve_space)
+        {
+            // If entity translation, whitespace condense and whitespace trimming is disabled, use plain skip
+            if (Flags & parse_no_entity_translation &&
+                !(Flags & parse_normalize_whitespace) &&
+                !(Flags & parse_trim_whitespace))
+            {
+                skip<StopPred, Flags>(text);
+                return text;
+            }
+
+            // Use simple skip until first modification is detected
+            skip<StopPredPure, Flags>(text);
+
+            // Use translation skip
+            Ch *src = text;
+            Ch *dest = src;
+            while (StopPred::test(*src))
+            {
+                // If entity translation is enabled
+                if (!(Flags & parse_no_entity_translation))
+                {
+                    // Test if replacement is needed
+                    if (src[0] == Ch('&'))
+                    {
+                        switch (src[1])
+                        {
+
+                        // &amp; &apos;
+                        case Ch('a'):
+                            if (src[2] == Ch('m') && src[3] == Ch('p') && src[4] == Ch(';'))
+                            {
+                                *dest = Ch('&');
+                                ++dest;
+                                src += 5;
+                                continue;
+                            }
+                            if (src[2] == Ch('p') && src[3] == Ch('o') && src[4] == Ch('s') && src[5] == Ch(';'))
+                            {
+                                *dest = Ch('\'');
+                                ++dest;
+                                src += 6;
+                                continue;
+                            }
+                            break;
+
+                        // &quot;
+                        case Ch('q'):
+                            if (src[2] == Ch('u') && src[3] == Ch('o') && src[4] == Ch('t') && src[5] == Ch(';'))
+                            {
+                                *dest = Ch('"');
+                                ++dest;
+                                src += 6;
+                                continue;
+                            }
+                            break;
+
+                        // &gt;
+                        case Ch('g'):
+                            if (src[2] == Ch('t') && src[3] == Ch(';'))
+                            {
+                                *dest = Ch('>');
+                                ++dest;
+                                src += 4;
+                                continue;
+                            }
+                            break;
+
+                        // &lt;
+                        case Ch('l'):
+                            if (src[2] == Ch('t') && src[3] == Ch(';'))
+                            {
+                                *dest = Ch('<');
+                                ++dest;
+                                src += 4;
+                                continue;
+                            }
+                            break;
+
+                        // &#...; - assumes ASCII
+                        case Ch('#'):
+                            if (src[2] == Ch('x'))
+                            {
+                                unsigned long code = 0;
+                                src += 3;   // Skip &#x
+                                while (1)
+                                {
+                                    unsigned char digit = internal::lookup_tables<0>::lookup_digits[static_cast<unsigned char>(*src)];
+                                    if (digit == 0xFF)
+                                        break;
+                                    code = code * 16 + digit;
+                                    ++src;
+                                }
+                                insert_coded_character<Flags>(dest, code);    // Put character in output
+                            }
+                            else
+                            {
+                                unsigned long code = 0;
+                                src += 2;   // Skip &#
+                                while (1)
+                                {
+                                    unsigned char digit = internal::lookup_tables<0>::lookup_digits[static_cast<unsigned char>(*src)];
+                                    if (digit == 0xFF)
+                                        break;
+                                    code = code * 10 + digit;
+                                    ++src;
+                                }
+                                insert_coded_character<Flags>(dest, code);    // Put character in output
+                            }
+                            if (*src == Ch(';'))
+                                ++src;
+                            else
+                                CEREAL_RAPIDXML_PARSE_ERROR("expected ;", src);
+                            continue;
+
+                        // Something else
+                        default:
+                            // Ignore, just copy '&' verbatim
+                            break;
+
+                        }
+                    }
+                }
+
+                // If whitespace condensing is enabled
+                if ((Flags & parse_normalize_whitespace) && !preserve_space)
+                {
+                    // Test if condensing is needed
+                    if (whitespace_pred::test(*src))
+                    {
+                        *dest = Ch(' '); ++dest;    // Put single space in dest
+                        ++src;                      // Skip first whitespace char
+                        // Skip remaining whitespace chars
+                        while (whitespace_pred::test(*src))
+                            ++src;
+                        continue;
+                    }
+                }
+
+                // No replacement, only copy character
+                *dest++ = *src++;
+
+            }
+
+            // Return new end
+            text = src;
+            return dest;
+
+        }
+
+        ///////////////////////////////////////////////////////////////////////
+        // Internal parsing functions
+
+        // Parse BOM, if any
+        template<int Flags>
+        void parse_bom(Ch *&text)
+        {
+            // UTF-8?
+            if (static_cast<unsigned char>(text[0]) == 0xEF &&
+                static_cast<unsigned char>(text[1]) == 0xBB &&
+                static_cast<unsigned char>(text[2]) == 0xBF)
+            {
+                text += 3;      // Skup utf-8 bom
+            }
+        }
+
+        // Parse XML declaration (<?xml...)
+        template<int Flags>
+        xml_node<Ch> *parse_xml_declaration(Ch *&text)
+        {
+            // If parsing of declaration is disabled
+            if (!(Flags & parse_declaration_node))
+            {
+                // Skip until end of declaration
+                while (text[0] != Ch('?') || text[1] != Ch('>'))
+                {
+                    if (!text[0])
+                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                    ++text;
+                }
+                text += 2;    // Skip '?>'
+                return 0;
+            }
+
+            // Create declaration
+            xml_node<Ch> *declaration = this->allocate_node(node_declaration);
+
+            // Skip whitespace before attributes or ?>
+            skip<whitespace_pred, Flags>(text);
+
+            // Parse declaration attributes
+            parse_node_attributes<Flags>(text, declaration);
+
+            // Skip ?>
+            if (text[0] != Ch('?') || text[1] != Ch('>'))
+                CEREAL_RAPIDXML_PARSE_ERROR("expected ?>", text);
+            text += 2;
+
+            return declaration;
+        }
+
+        // Parse XML comment (<!--...)
+        template<int Flags>
+        xml_node<Ch> *parse_comment(Ch *&text)
+        {
+            // If parsing of comments is disabled
+            if (!(Flags & parse_comment_nodes))
+            {
+                // Skip until end of comment
+                while (text[0] != Ch('-') || text[1] != Ch('-') || text[2] != Ch('>'))
+                {
+                    if (!text[0])
+                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                    ++text;
+                }
+                text += 3;     // Skip '-->'
+                return 0;      // Do not produce comment node
+            }
+
+            // Remember value start
+            Ch *value_ = text;
+
+            // Skip until end of comment
+            while (text[0] != Ch('-') || text[1] != Ch('-') || text[2] != Ch('>'))
+            {
+                if (!text[0])
+                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                ++text;
+            }
+
+            // Create comment node
+            xml_node<Ch> *comment = this->allocate_node(node_comment);
+            comment->value(value_, text - value_);
+
+            // Place zero terminator after comment value
+            if (!(Flags & parse_no_string_terminators))
+                *text = Ch('\0');
+
+            text += 3;     // Skip '-->'
+            return comment;
+        }
+
+        // Parse DOCTYPE
+        template<int Flags>
+        xml_node<Ch> *parse_doctype(Ch *&text)
+        {
+            // Remember value start
+            Ch *value_ = text;
+
+            // Skip to >
+            while (*text != Ch('>'))
+            {
+                // Determine character type
+                switch (*text)
+                {
+
+                // If '[' encountered, scan for matching ending ']' using naive algorithm with depth
+                // This works for all W3C test files except for 2 most wicked
+                case Ch('['):
+                {
+                    ++text;     // Skip '['
+                    int depth = 1;
+                    while (depth > 0)
+                    {
+                        switch (*text)
+                        {
+                            case Ch('['): ++depth; break;
+                            case Ch(']'): --depth; break;
+                            case 0: CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                        }
+                        ++text;
+                    }
+                    break;
+                }
+
+                // Error on end of text
+                case Ch('\0'):
+                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+
+                // Other character, skip it
+                default:
+                    ++text;
+
+                }
+            }
+
+            // If DOCTYPE nodes enabled
+            if (Flags & parse_doctype_node)
+            {
+                // Create a new doctype node
+                xml_node<Ch> *doctype = this->allocate_node(node_doctype);
+                doctype->value(value_, text - value_);
+
+                // Place zero terminator after value
+                if (!(Flags & parse_no_string_terminators))
+                    *text = Ch('\0');
+
+                text += 1;      // skip '>'
+                return doctype;
+            }
+            else
+            {
+                text += 1;      // skip '>'
+                return 0;
+            }
+
+        }
+
+        // Parse PI
+        template<int Flags>
+        xml_node<Ch> *parse_pi(Ch *&text)
+        {
+            // If creation of PI nodes is enabled
+            if (Flags & parse_pi_nodes)
+            {
+                // Create pi node
+                xml_node<Ch> *pi = this->allocate_node(node_pi);
+
+                // Extract PI target name
+                Ch *name_ = text;
+                skip<node_name_pred, Flags>(text);
+                if (text == name_)
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected PI target", text);
+                pi->name(name_, text - name_);
+
+                // Skip whitespace between pi target and pi
+                skip<whitespace_pred, Flags>(text);
+
+                // Remember start of pi
+                Ch *value_ = text;
+
+                // Skip to '?>'
+                while (text[0] != Ch('?') || text[1] != Ch('>'))
+                {
+                    if (*text == Ch('\0'))
+                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                    ++text;
+                }
+
+                // Set pi value (verbatim, no entity expansion or whitespace normalization)
+                pi->value(value_, text - value_);
+
+                // Place zero terminator after name and value
+                if (!(Flags & parse_no_string_terminators))
+                {
+                    pi->name()[pi->name_size()] = Ch('\0');
+                    pi->value()[pi->value_size()] = Ch('\0');
+                }
+
+                text += 2;                          // Skip '?>'
+                return pi;
+            }
+            else
+            {
+                // Skip to '?>'
+                while (text[0] != Ch('?') || text[1] != Ch('>'))
+                {
+                    if (*text == Ch('\0'))
+                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                    ++text;
+                }
+                text += 2;    // Skip '?>'
+                return 0;
+            }
+        }
+
+        // Parse and append data
+        // Return character that ends data.
+        // This is necessary because this character might have been overwritten by a terminating 0
+        template<int Flags>
+        Ch parse_and_append_data(xml_node<Ch> *node, Ch *&text, Ch *contents_start)
+        {
+            // Backup to contents start if whitespace trimming is disabled
+            if (!(Flags & parse_trim_whitespace))
+                text = contents_start;
+
+            const bool preserve_space =  internal::preserve_space(node);
+
+            // Skip until end of data
+            Ch *value_ = text, *end;
+            if ((Flags & parse_normalize_whitespace) && !preserve_space)
+                end = skip_and_expand_character_refs<text_pred, text_pure_with_ws_pred, Flags>(text, false);
+            else
+                end = skip_and_expand_character_refs<text_pred, text_pure_no_ws_pred, Flags>(text, preserve_space);
+
+            // Trim trailing whitespace if flag is set; leading was already trimmed by whitespace skip after >
+            if ((Flags & parse_trim_whitespace) && !preserve_space)
+            {
+                if (Flags & parse_normalize_whitespace)
+                {
+                    // Whitespace is already condensed to single space characters by skipping function, so just trim 1 char off the end
+                    if (*(end - 1) == Ch(' '))
+                        --end;
+                }
+                else
+                {
+                    // Backup until non-whitespace character is found
+                    while (whitespace_pred::test(*(end - 1)))
+                        --end;
+                }
+            }
+
+            // If characters are still left between end and value (this test is only necessary if normalization is enabled)
+            // Create new data node
+            if (!(Flags & parse_no_data_nodes))
+            {
+                xml_node<Ch> *data = this->allocate_node(node_data);
+                data->value(value_, end - value_);
+                node->append_node(data);
+            }
+
+            // Add data to parent node if no data exists yet
+            if (!(Flags & parse_no_element_values))
+                if (*node->value() == Ch('\0'))
+                    node->value(value_, end - value_);
+
+            // Place zero terminator after value
+            if (!(Flags & parse_no_string_terminators))
+            {
+                Ch ch = *text;
+                *end = Ch('\0');
+                return ch;      // Return character that ends data; this is required because zero terminator overwritten it
+            }
+
+            // Return character that ends data
+            return *text;
+        }
+
+        // Parse CDATA
+        template<int Flags>
+        xml_node<Ch> *parse_cdata(Ch *&text)
+        {
+            // If CDATA is disabled
+            if (Flags & parse_no_data_nodes)
+            {
+                // Skip until end of cdata
+                while (text[0] != Ch(']') || text[1] != Ch(']') || text[2] != Ch('>'))
+                {
+                    if (!text[0])
+                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                    ++text;
+                }
+                text += 3;      // Skip ]]>
+                return 0;       // Do not produce CDATA node
+            }
+
+            // Skip until end of cdata
+            Ch *value_ = text;
+            while (text[0] != Ch(']') || text[1] != Ch(']') || text[2] != Ch('>'))
+            {
+                if (!text[0])
+                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                ++text;
+            }
+
+            // Create new cdata node
+            xml_node<Ch> *cdata = this->allocate_node(node_cdata);
+            cdata->value(value_, text - value_);
+
+            // Place zero terminator after value
+            if (!(Flags & parse_no_string_terminators))
+                *text = Ch('\0');
+
+            text += 3;      // Skip ]]>
+            return cdata;
+        }
+
+        // Parse element node
+        template<int Flags>
+        xml_node<Ch> *parse_element(Ch *&text)
+        {
+            // Create element node
+            xml_node<Ch> *element = this->allocate_node(node_element);
+
+            // Extract element name
+            Ch *name_ = text;
+            skip<node_name_pred, Flags>(text);
+            if (text == name_)
+                CEREAL_RAPIDXML_PARSE_ERROR("expected element name", text);
+            element->name(name_, text - name_);
+
+            // Skip whitespace between element name and attributes or >
+            skip<whitespace_pred, Flags>(text);
+
+            // Parse attributes, if any
+            parse_node_attributes<Flags>(text, element);
+
+            // Determine ending type
+            if (*text == Ch('>'))
+            {
+                ++text;
+                parse_node_contents<Flags>(text, element);
+            }
+            else if (*text == Ch('/'))
+            {
+                ++text;
+                if (*text != Ch('>'))
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected >", text);
+                ++text;
+            }
+            else
+                CEREAL_RAPIDXML_PARSE_ERROR("expected >", text);
+
+            // Place zero terminator after name
+            if (!(Flags & parse_no_string_terminators))
+                element->name()[element->name_size()] = Ch('\0');
+
+            // Return parsed element
+            return element;
+        }
+
+        // Determine node type, and parse it
+        template<int Flags>
+        xml_node<Ch> *parse_node(Ch *&text)
+        {
+            // Parse proper node type
+            switch (text[0])
+            {
+
+            // <...
+            default:
+                // Parse and append element node
+                return parse_element<Flags>(text);
+
+            // <?...
+            case Ch('?'):
+                ++text;     // Skip ?
+                if ((text[0] == Ch('x') || text[0] == Ch('X')) &&
+                    (text[1] == Ch('m') || text[1] == Ch('M')) &&
+                    (text[2] == Ch('l') || text[2] == Ch('L')) &&
+                    whitespace_pred::test(text[3]))
+                {
+                    // '<?xml ' - xml declaration
+                    text += 4;      // Skip 'xml '
+                    return parse_xml_declaration<Flags>(text);
+                }
+                else
+                {
+                    // Parse PI
+                    return parse_pi<Flags>(text);
+                }
+
+            // <!...
+            case Ch('!'):
+
+                // Parse proper subset of <! node
+                switch (text[1])
+                {
+
+                // <!-
+                case Ch('-'):
+                    if (text[2] == Ch('-'))
+                    {
+                        // '<!--' - xml comment
+                        text += 3;     // Skip '!--'
+                        return parse_comment<Flags>(text);
+                    }
+                    break;
+
+                // <![
+                case Ch('['):
+                    if (text[2] == Ch('C') && text[3] == Ch('D') && text[4] == Ch('A') &&
+                        text[5] == Ch('T') && text[6] == Ch('A') && text[7] == Ch('['))
+                    {
+                        // '<![CDATA[' - cdata
+                        text += 8;     // Skip '![CDATA['
+                        return parse_cdata<Flags>(text);
+                    }
+                    break;
+
+                // <!D
+                case Ch('D'):
+                    if (text[2] == Ch('O') && text[3] == Ch('C') && text[4] == Ch('T') &&
+                        text[5] == Ch('Y') && text[6] == Ch('P') && text[7] == Ch('E') &&
+                        whitespace_pred::test(text[8]))
+                    {
+                        // '<!DOCTYPE ' - doctype
+                        text += 9;      // skip '!DOCTYPE '
+                        return parse_doctype<Flags>(text);
+                    }
+
+                }   // switch
+
+                // Attempt to skip other, unrecognized node types starting with <!
+                ++text;     // Skip !
+                while (*text != Ch('>'))
+                {
+                    if (*text == 0)
+                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+                    ++text;
+                }
+                ++text;     // Skip '>'
+                return 0;   // No node recognized
+
+            }
+        }
+
+        // Parse contents of the node - children, data etc.
+        template<int Flags>
+        void parse_node_contents(Ch *&text, xml_node<Ch> *node)
+        {
+            // For all children and text
+            while (1)
+            {
+                // Skip whitespace between > and node contents
+                Ch *contents_start = text;      // Store start of node contents before whitespace is skipped
+                skip<whitespace_pred, Flags>(text);
+                Ch next_char = *text;
+
+            // After data nodes, instead of continuing the loop, control jumps here.
+            // This is because zero termination inside parse_and_append_data() function
+            // would wreak havoc with the above code.
+            // Also, skipping whitespace after data nodes is unnecessary.
+            after_data_node:
+
+                // Determine what comes next: node closing, child node, data node, or 0?
+                switch (next_char)
+                {
+
+                // Node closing or child node
+                case Ch('<'):
+                    if (text[1] == Ch('/'))
+                    {
+                        Ch *contents_end = 0;
+                        if (internal::preserve_space(node))
+                        {
+                            contents_end = text;
+                        }
+
+                        // Node closing
+                        text += 2;      // Skip '</'
+                        if (Flags & parse_validate_closing_tags)
+                        {
+                            // Skip and validate closing tag name
+                            Ch *closing_name = text;
+                            skip<node_name_pred, Flags>(text);
+                            if (!internal::compare(node->name(), node->name_size(), closing_name, text - closing_name, true))
+                                CEREAL_RAPIDXML_PARSE_ERROR("invalid closing tag name", text);
+                        }
+                        else
+                        {
+                            // No validation, just skip name
+                            skip<node_name_pred, Flags>(text);
+                        }
+                        // Skip remaining whitespace after node name
+                        skip<whitespace_pred, Flags>(text);
+                        if (*text != Ch('>'))
+                            CEREAL_RAPIDXML_PARSE_ERROR("expected >", text);
+                        ++text;     // Skip '>'
+
+                        if (contents_end && contents_end != contents_start)
+                        {
+                            node->value(contents_start, contents_end - contents_start);
+                            node->value()[node->value_size()] = Ch('\0');
+                        }
+                        return;     // Node closed, finished parsing contents
+                    }
+                    else
+                    {
+                        // Child node
+                        ++text;     // Skip '<'
+                        if (xml_node<Ch> *child = parse_node<Flags>(text))
+                            node->append_node(child);
+                    }
+                    break;
+
+                // End of data - error
+                case Ch('\0'):
+                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
+
+                // Data node
+                default:
+                    next_char = parse_and_append_data<Flags>(node, text, contents_start);
+                    goto after_data_node;   // Bypass regular processing after data nodes
+
+                }
+            }
+        }
+
+        // Parse XML attributes of the node
+        template<int Flags>
+        void parse_node_attributes(Ch *&text, xml_node<Ch> *node)
+        {
+            // For all attributes
+            while (attribute_name_pred::test(*text))
+            {
+                // Extract attribute name
+                Ch *name_ = text;
+                ++text;     // Skip first character of attribute name
+                skip<attribute_name_pred, Flags>(text);
+                if (text == name_)
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected attribute name", name_);
+
+                // Create new attribute
+                xml_attribute<Ch> *attribute = this->allocate_attribute();
+                attribute->name(name_, text - name_);
+                node->append_attribute(attribute);
+
+                // Skip whitespace after attribute name
+                skip<whitespace_pred, Flags>(text);
+
+                // Skip =
+                if (*text != Ch('='))
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected =", text);
+                ++text;
+
+                // Add terminating zero after name
+                if (!(Flags & parse_no_string_terminators))
+                    attribute->name()[attribute->name_size()] = 0;
+
+                // Skip whitespace after =
+                skip<whitespace_pred, Flags>(text);
+
+                // Skip quote and remember if it was ' or "
+                Ch quote = *text;
+                if (quote != Ch('\'') && quote != Ch('"'))
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected ' or \"", text);
+                ++text;
+
+                // Extract attribute value and expand char refs in it
+                Ch *value_ = text, *end;
+                const int AttFlags = Flags & ~parse_normalize_whitespace;   // No whitespace normalization in attributes
+                if (quote == Ch('\''))
+                    end = skip_and_expand_character_refs<attribute_value_pred<Ch('\'')>, attribute_value_pure_pred<Ch('\'')>, AttFlags>(text, false);
+                else
+                    end = skip_and_expand_character_refs<attribute_value_pred<Ch('"')>, attribute_value_pure_pred<Ch('"')>, AttFlags>(text, false);
+
+                // Set attribute value
+                attribute->value(value_, end - value_);
+
+                // Make sure that end quote is present
+                if (*text != quote)
+                    CEREAL_RAPIDXML_PARSE_ERROR("expected ' or \"", text);
+                ++text;     // Skip quote
+
+                // Add terminating zero after value
+                if (!(Flags & parse_no_string_terminators))
+                    attribute->value()[attribute->value_size()] = 0;
+
+                // Skip whitespace after attribute value
+                skip<whitespace_pred, Flags>(text);
+            }
+        }
+
+    };
+
+    //! \cond internal
+    namespace internal
+    {
+
+        // Whitespace (space \n \r \t)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_whitespace[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,  // 0
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 1
+             1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 2
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 3
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 4
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 5
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 6
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 7
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 8
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 9
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // A
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // B
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // C
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // D
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // E
+             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   // F
+        };
+
+        // Node name (anything but space \n \r \t / > ? \0)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_node_name[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  0,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Text (i.e. PCDATA) (anything but < \0)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_text[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Text (i.e. PCDATA) that does not require processing when ws normalization is disabled
+        // (anything but < \0 &)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_text_pure_no_ws[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Text (i.e. PCDATA) that does not require processing when ws normalizationis is enabled
+        // (anything but < \0 & space \n \r \t)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_text_pure_with_ws[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  0,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Attribute name (anything but space \n \r \t / < > = ? ! \0)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_attribute_name[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  0,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Attribute data with single quote (anything but ' \0)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_1[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Attribute data with single quote that does not require processing (anything but ' \0 &)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_1_pure[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Attribute data with double quote (anything but " \0)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_2[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Attribute data with double quote that does not require processing (anything but " \0 &)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_2_pure[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
+             1,  1,  0,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
+             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
+        };
+
+        // Digits (dec and hex, 255 denotes end of numeric character reference)
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_digits[256] =
+        {
+          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 0
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 1
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 2
+             0,  1,  2,  3,  4,  5,  6,  7,  8,  9,255,255,255,255,255,255,  // 3
+           255, 10, 11, 12, 13, 14, 15,255,255,255,255,255,255,255,255,255,  // 4
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 5
+           255, 10, 11, 12, 13, 14, 15,255,255,255,255,255,255,255,255,255,  // 6
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 7
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 8
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 9
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // A
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // B
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // C
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // D
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // E
+           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255   // F
+        };
+
+        // Upper case conversion
+        template<int Dummy>
+        const unsigned char lookup_tables<Dummy>::lookup_upcase[256] =
+        {
+          // 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  A   B   C   D   E   F
+           0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,   // 0
+           16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,   // 1
+           32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,   // 2
+           48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,   // 3
+           64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,   // 4
+           80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,   // 5
+           96, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,   // 6
+           80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 123,124,125,126,127,  // 7
+           128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,  // 8
+           144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,  // 9
+           160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,  // A
+           176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,  // B
+           192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,  // C
+           208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,  // D
+           224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,  // E
+           240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255   // F
+        };
+    }
+    //! \endcond
+
+}
+} // end namespace cereal
+
+// Undefine internal macros
+#undef CEREAL_RAPIDXML_PARSE_ERROR
+
+// On MSVC, restore warnings state
+#ifdef _MSC_VER
+    #pragma warning(pop)
+#endif
+
+#endif
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
new file mode 100644
index 0000000..736d46c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
@@ -0,0 +1,175 @@
+#ifndef CEREAL_RAPIDXML_ITERATORS_HPP_INCLUDED
+#define CEREAL_RAPIDXML_ITERATORS_HPP_INCLUDED
+
+// Copyright (C) 2006, 2009 Marcin Kalicinski
+// Version 1.13
+// Revision $DateTime: 2009/05/13 01:46:17 $
+
+#include "rapidxml.hpp"
+
+namespace cereal {
+namespace rapidxml
+{
+
+    //! Iterator of child nodes of xml_node
+    template<class Ch>
+    class node_iterator
+    {
+
+    public:
+
+        typedef typename xml_node<Ch> value_type;
+        typedef typename xml_node<Ch> &reference;
+        typedef typename xml_node<Ch> *pointer;
+        typedef std::ptrdiff_t difference_type;
+        typedef std::bidirectional_iterator_tag iterator_category;
+
+        node_iterator()
+            : m_node(0)
+        {
+        }
+
+        node_iterator(xml_node<Ch> *node)
+            : m_node(node->first_node())
+        {
+        }
+
+        reference operator *() const
+        {
+            assert(m_node);
+            return *m_node;
+        }
+
+        pointer operator->() const
+        {
+            assert(m_node);
+            return m_node;
+        }
+
+        node_iterator& operator++()
+        {
+            assert(m_node);
+            m_node = m_node->next_sibling();
+            return *this;
+        }
+
+        node_iterator operator++(int)
+        {
+            node_iterator tmp = *this;
+            ++this;
+            return tmp;
+        }
+
+        node_iterator& operator--()
+        {
+            assert(m_node && m_node->previous_sibling());
+            m_node = m_node->previous_sibling();
+            return *this;
+        }
+
+        node_iterator operator--(int)
+        {
+            node_iterator tmp = *this;
+            ++this;
+            return tmp;
+        }
+
+        bool operator ==(const node_iterator<Ch> &rhs)
+        {
+            return m_node == rhs.m_node;
+        }
+
+        bool operator !=(const node_iterator<Ch> &rhs)
+        {
+            return m_node != rhs.m_node;
+        }
+
+    private:
+
+        xml_node<Ch> *m_node;
+
+    };
+
+    //! Iterator of child attributes of xml_node
+    template<class Ch>
+    class attribute_iterator
+    {
+
+    public:
+
+        typedef typename xml_attribute<Ch> value_type;
+        typedef typename xml_attribute<Ch> &reference;
+        typedef typename xml_attribute<Ch> *pointer;
+        typedef std::ptrdiff_t difference_type;
+        typedef std::bidirectional_iterator_tag iterator_category;
+
+        attribute_iterator()
+            : m_attribute(0)
+        {
+        }
+
+        attribute_iterator(xml_node<Ch> *node)
+            : m_attribute(node->first_attribute())
+        {
+        }
+
+        reference operator *() const
+        {
+            assert(m_attribute);
+            return *m_attribute;
+        }
+
+        pointer operator->() const
+        {
+            assert(m_attribute);
+            return m_attribute;
+        }
+
+        attribute_iterator& operator++()
+        {
+            assert(m_attribute);
+            m_attribute = m_attribute->next_attribute();
+            return *this;
+        }
+
+        attribute_iterator operator++(int)
+        {
+            attribute_iterator tmp = *this;
+            ++this;
+            return tmp;
+        }
+
+        attribute_iterator& operator--()
+        {
+            assert(m_attribute && m_attribute->previous_attribute());
+            m_attribute = m_attribute->previous_attribute();
+            return *this;
+        }
+
+        attribute_iterator operator--(int)
+        {
+            attribute_iterator tmp = *this;
+            ++this;
+            return tmp;
+        }
+
+        bool operator ==(const attribute_iterator<Ch> &rhs)
+        {
+            return m_attribute == rhs.m_attribute;
+        }
+
+        bool operator !=(const attribute_iterator<Ch> &rhs)
+        {
+            return m_attribute != rhs.m_attribute;
+        }
+
+    private:
+
+        xml_attribute<Ch> *m_attribute;
+
+    };
+
+}
+} // namespace cereal
+
+#endif
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
new file mode 100644
index 0000000..ce10dbb
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
@@ -0,0 +1,426 @@
+#ifndef CEREAL_RAPIDXML_PRINT_HPP_INCLUDED
+#define CEREAL_RAPIDXML_PRINT_HPP_INCLUDED
+
+// Copyright (C) 2006, 2009 Marcin Kalicinski
+// Version 1.13
+// Revision $DateTime: 2009/05/13 01:46:17 $
+
+#include "rapidxml.hpp"
+
+// Only include streams if not disabled
+#ifndef CEREAL_RAPIDXML_NO_STREAMS
+    #include <ostream>
+    #include <iterator>
+#endif
+
+namespace cereal {
+namespace rapidxml
+{
+
+    ///////////////////////////////////////////////////////////////////////
+    // Printing flags
+
+    const int print_no_indenting = 0x1;   //!< Printer flag instructing the printer to suppress indenting of XML. See print() function.
+
+    ///////////////////////////////////////////////////////////////////////
+    // Internal
+
+    //! \cond internal
+    namespace internal
+    {
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Internal character operations
+
+        // Copy characters from given range to given output iterator
+        template<class OutIt, class Ch>
+        inline OutIt copy_chars(const Ch *begin, const Ch *end, OutIt out)
+        {
+            while (begin != end)
+                *out++ = *begin++;
+            return out;
+        }
+
+        // Copy characters from given range to given output iterator and expand
+        // characters into references (&lt; &gt; &apos; &quot; &amp;)
+        template<class OutIt, class Ch>
+        inline OutIt copy_and_expand_chars(const Ch *begin, const Ch *end, Ch noexpand, OutIt out)
+        {
+            while (begin != end)
+            {
+                if (*begin == noexpand)
+                {
+                    *out++ = *begin;    // No expansion, copy character
+                }
+                else
+                {
+                    switch (*begin)
+                    {
+                    case Ch('<'):
+                        *out++ = Ch('&'); *out++ = Ch('l'); *out++ = Ch('t'); *out++ = Ch(';');
+                        break;
+                    case Ch('>'):
+                        *out++ = Ch('&'); *out++ = Ch('g'); *out++ = Ch('t'); *out++ = Ch(';');
+                        break;
+                    case Ch('\''):
+                        *out++ = Ch('&'); *out++ = Ch('a'); *out++ = Ch('p'); *out++ = Ch('o'); *out++ = Ch('s'); *out++ = Ch(';');
+                        break;
+                    case Ch('"'):
+                        *out++ = Ch('&'); *out++ = Ch('q'); *out++ = Ch('u'); *out++ = Ch('o'); *out++ = Ch('t'); *out++ = Ch(';');
+                        break;
+                    case Ch('&'):
+                        *out++ = Ch('&'); *out++ = Ch('a'); *out++ = Ch('m'); *out++ = Ch('p'); *out++ = Ch(';');
+                        break;
+                    default:
+                        *out++ = *begin;    // No expansion, copy character
+                    }
+                }
+                ++begin;    // Step to next character
+            }
+            return out;
+        }
+
+        // Fill given output iterator with repetitions of the same character
+        template<class OutIt, class Ch>
+        inline OutIt fill_chars(OutIt out, int n, Ch ch)
+        {
+            for (int i = 0; i < n; ++i)
+                *out++ = ch;
+            return out;
+        }
+
+        // Find character
+        template<class Ch, Ch ch>
+        inline bool find_char(const Ch *begin, const Ch *end)
+        {
+            while (begin != end)
+                if (*begin++ == ch)
+                    return true;
+            return false;
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        // Internal printing operations
+
+        // Print node
+        template<class OutIt, class Ch>
+        inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
+
+        // Print children of the node
+        template<class OutIt, class Ch>
+        inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            for (xml_node<Ch> *child = node->first_node(); child; child = child->next_sibling())
+                out = print_node(out, child, flags, indent);
+            return out;
+        }
+
+        // Print attributes of the node
+        template<class OutIt, class Ch>
+        inline OutIt print_attributes(OutIt out, const xml_node<Ch> *node, int /*flags*/)
+        {
+            for (xml_attribute<Ch> *attribute = node->first_attribute(); attribute; attribute = attribute->next_attribute())
+            {
+                if (attribute->name() && attribute->value())
+                {
+                    // Print attribute name
+                    *out = Ch(' '), ++out;
+                    out = copy_chars(attribute->name(), attribute->name() + attribute->name_size(), out);
+                    *out = Ch('='), ++out;
+                    // Print attribute value using appropriate quote type
+                    if (find_char<Ch, Ch('"')>(attribute->value(), attribute->value() + attribute->value_size()))
+                    {
+                        *out = Ch('\''), ++out;
+                        out = copy_and_expand_chars(attribute->value(), attribute->value() + attribute->value_size(), Ch('"'), out);
+                        *out = Ch('\''), ++out;
+                    }
+                    else
+                    {
+                        *out = Ch('"'), ++out;
+                        out = copy_and_expand_chars(attribute->value(), attribute->value() + attribute->value_size(), Ch('\''), out);
+                        *out = Ch('"'), ++out;
+                    }
+                }
+            }
+            return out;
+        }
+
+        // Print data node
+        template<class OutIt, class Ch>
+        inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            assert(node->type() == node_data);
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            out = copy_and_expand_chars(node->value(), node->value() + node->value_size(), Ch(0), out);
+            return out;
+        }
+
+        // Print data node
+        template<class OutIt, class Ch>
+        inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            assert(node->type() == node_cdata);
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            *out = Ch('<'); ++out;
+            *out = Ch('!'); ++out;
+            *out = Ch('['); ++out;
+            *out = Ch('C'); ++out;
+            *out = Ch('D'); ++out;
+            *out = Ch('A'); ++out;
+            *out = Ch('T'); ++out;
+            *out = Ch('A'); ++out;
+            *out = Ch('['); ++out;
+            out = copy_chars(node->value(), node->value() + node->value_size(), out);
+            *out = Ch(']'); ++out;
+            *out = Ch(']'); ++out;
+            *out = Ch('>'); ++out;
+            return out;
+        }
+
+        // Print element node
+        template<class OutIt, class Ch>
+        inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            assert(node->type() == node_element);
+
+            // Print element name and attributes, if any
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            *out = Ch('<'), ++out;
+            out = copy_chars(node->name(), node->name() + node->name_size(), out);
+            out = print_attributes(out, node, flags);
+
+            // If node is childless
+            if (node->value_size() == 0 && !node->first_node())
+            {
+                // Print childless node tag ending
+                *out = Ch('/'), ++out;
+                *out = Ch('>'), ++out;
+            }
+            else
+            {
+                // Print normal node tag ending
+                *out = Ch('>'), ++out;
+
+                // Test if node contains a single data node only (and no other nodes)
+                xml_node<Ch> *child = node->first_node();
+                if (!child)
+                {
+                    // If node has no children, only print its value without indenting
+                    out = copy_and_expand_chars(node->value(), node->value() + node->value_size(), Ch(0), out);
+                }
+                else if (child->next_sibling() == 0 && child->type() == node_data)
+                {
+                    // If node has a sole data child, only print its value without indenting
+                    out = copy_and_expand_chars(child->value(), child->value() + child->value_size(), Ch(0), out);
+                }
+                else
+                {
+                    // Print all children with full indenting
+                    if (!(flags & print_no_indenting))
+                        *out = Ch('\n'), ++out;
+                    out = print_children(out, node, flags, indent + 1);
+                    if (!(flags & print_no_indenting))
+                        out = fill_chars(out, indent, Ch('\t'));
+                }
+
+                // Print node end
+                *out = Ch('<'), ++out;
+                *out = Ch('/'), ++out;
+                out = copy_chars(node->name(), node->name() + node->name_size(), out);
+                *out = Ch('>'), ++out;
+            }
+            return out;
+        }
+
+        // Print declaration node
+        template<class OutIt, class Ch>
+        inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            // Print declaration start
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            *out = Ch('<'), ++out;
+            *out = Ch('?'), ++out;
+            *out = Ch('x'), ++out;
+            *out = Ch('m'), ++out;
+            *out = Ch('l'), ++out;
+
+            // Print attributes
+            out = print_attributes(out, node, flags);
+
+            // Print declaration end
+            *out = Ch('?'), ++out;
+            *out = Ch('>'), ++out;
+
+            return out;
+        }
+
+        // Print comment node
+        template<class OutIt, class Ch>
+        inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            assert(node->type() == node_comment);
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            *out = Ch('<'), ++out;
+            *out = Ch('!'), ++out;
+            *out = Ch('-'), ++out;
+            *out = Ch('-'), ++out;
+            out = copy_chars(node->value(), node->value() + node->value_size(), out);
+            *out = Ch('-'), ++out;
+            *out = Ch('-'), ++out;
+            *out = Ch('>'), ++out;
+            return out;
+        }
+
+        // Print doctype node
+        template<class OutIt, class Ch>
+        inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            assert(node->type() == node_doctype);
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            *out = Ch('<'), ++out;
+            *out = Ch('!'), ++out;
+            *out = Ch('D'), ++out;
+            *out = Ch('O'), ++out;
+            *out = Ch('C'), ++out;
+            *out = Ch('T'), ++out;
+            *out = Ch('Y'), ++out;
+            *out = Ch('P'), ++out;
+            *out = Ch('E'), ++out;
+            *out = Ch(' '), ++out;
+            out = copy_chars(node->value(), node->value() + node->value_size(), out);
+            *out = Ch('>'), ++out;
+            return out;
+        }
+
+        // Print pi node
+        template<class OutIt, class Ch>
+        inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            assert(node->type() == node_pi);
+            if (!(flags & print_no_indenting))
+                out = fill_chars(out, indent, Ch('\t'));
+            *out = Ch('<'), ++out;
+            *out = Ch('?'), ++out;
+            out = copy_chars(node->name(), node->name() + node->name_size(), out);
+            *out = Ch(' '), ++out;
+            out = copy_chars(node->value(), node->value() + node->value_size(), out);
+            *out = Ch('?'), ++out;
+            *out = Ch('>'), ++out;
+            return out;
+        }
+
+        // Print node
+        template<class OutIt, class Ch>
+        inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
+        {
+            // Print proper node type
+            switch (node->type())
+            {
+
+            // Document
+            case node_document:
+                out = print_children(out, node, flags, indent);
+                break;
+
+            // Element
+            case node_element:
+                out = print_element_node(out, node, flags, indent);
+                break;
+
+            // Data
+            case node_data:
+                out = print_data_node(out, node, flags, indent);
+                break;
+
+            // CDATA
+            case node_cdata:
+                out = print_cdata_node(out, node, flags, indent);
+                break;
+
+            // Declaration
+            case node_declaration:
+                out = print_declaration_node(out, node, flags, indent);
+                break;
+
+            // Comment
+            case node_comment:
+                out = print_comment_node(out, node, flags, indent);
+                break;
+
+            // Doctype
+            case node_doctype:
+                out = print_doctype_node(out, node, flags, indent);
+                break;
+
+            // Pi
+            case node_pi:
+                out = print_pi_node(out, node, flags, indent);
+                break;
+
+                // Unknown
+            default:
+                assert(0);
+                break;
+            }
+
+            // If indenting not disabled, add line break after node
+            if (!(flags & print_no_indenting))
+                *out = Ch('\n'), ++out;
+
+            // Return modified iterator
+            return out;
+        }
+
+    }
+    //! \endcond
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Printing
+
+    //! Prints XML to given output iterator.
+    //! \param out Output iterator to print to.
+    //! \param node Node to be printed. Pass xml_document to print entire document.
+    //! \param flags Flags controlling how XML is printed.
+    //! \return Output iterator pointing to position immediately after last character of printed text.
+    template<class OutIt, class Ch>
+    inline OutIt print(OutIt out, const xml_node<Ch> &node, int flags = 0)
+    {
+        return internal::print_node(out, &node, flags, 0);
+    }
+
+#ifndef CEREAL_RAPIDXML_NO_STREAMS
+
+    //! Prints XML to given output stream.
+    //! \param out Output stream to print to.
+    //! \param node Node to be printed. Pass xml_document to print entire document.
+    //! \param flags Flags controlling how XML is printed.
+    //! \return Output stream.
+    template<class Ch>
+    inline std::basic_ostream<Ch> &print(std::basic_ostream<Ch> &out, const xml_node<Ch> &node, int flags = 0)
+    {
+        print(std::ostream_iterator<Ch>(out), node, flags);
+        return out;
+    }
+
+    //! Prints formatted XML to given output stream. Uses default printing flags. Use print() function to customize printing process.
+    //! \param out Output stream to print to.
+    //! \param node Node to be printed.
+    //! \return Output stream.
+    template<class Ch>
+    inline std::basic_ostream<Ch> &operator <<(std::basic_ostream<Ch> &out, const xml_node<Ch> &node)
+    {
+        return print(out, node);
+    }
+
+#endif
+
+}
+} // namespace cereal
+
+#endif
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
new file mode 100644
index 0000000..e11ecf3
--- /dev/null
+++ b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
@@ -0,0 +1,123 @@
+#ifndef CEREAL_RAPIDXML_UTILS_HPP_INCLUDED
+#define CEREAL_RAPIDXML_UTILS_HPP_INCLUDED
+
+// Copyright (C) 2006, 2009 Marcin Kalicinski
+// Version 1.13
+// Revision $DateTime: 2009/05/13 01:46:17 $
+//! in certain simple scenarios. They should probably not be used if maximizing performance is the main objective.
+
+#include "rapidxml.hpp"
+#include <vector>
+#include <string>
+#include <fstream>
+#include <stdexcept>
+
+namespace cereal {
+namespace rapidxml
+{
+
+    //! Represents data loaded from a file
+    template<class Ch = char>
+    class file
+    {
+
+    public:
+
+        //! Loads file into the memory. Data will be automatically destroyed by the destructor.
+        //! \param filename Filename to load.
+        file(const char *filename)
+        {
+            using namespace std;
+
+            // Open stream
+            basic_ifstream<Ch> stream(filename, ios::binary);
+            if (!stream)
+                throw runtime_error(string("cannot open file ") + filename);
+            stream.unsetf(ios::skipws);
+
+            // Determine stream size
+            stream.seekg(0, ios::end);
+            size_t size = stream.tellg();
+            stream.seekg(0);
+
+            // Load data and add terminating 0
+            m_data.resize(size + 1);
+            stream.read(&m_data.front(), static_cast<streamsize>(size));
+            m_data[size] = 0;
+        }
+
+        //! Loads file into the memory. Data will be automatically destroyed by the destructor
+        //! \param stream Stream to load from
+        file(std::basic_istream<Ch> &stream)
+        {
+            using namespace std;
+
+            // Load data and add terminating 0
+            stream.unsetf(ios::skipws);
+            m_data.assign(istreambuf_iterator<Ch>(stream), istreambuf_iterator<Ch>());
+            if (stream.fail() || stream.bad())
+                throw runtime_error("error reading stream");
+            m_data.push_back(0);
+        }
+
+        //! Gets file data.
+        //! \return Pointer to data of file.
+        Ch *data()
+        {
+            return &m_data.front();
+        }
+
+        //! Gets file data.
+        //! \return Pointer to data of file.
+        const Ch *data() const
+        {
+            return &m_data.front();
+        }
+
+        //! Gets file data size.
+        //! \return Size of file data, in characters.
+        std::size_t size() const
+        {
+            return m_data.size();
+        }
+
+    private:
+
+        std::vector<Ch> m_data;   // File data
+
+    };
+
+    //! Counts children of node. Time complexity is O(n).
+    //! \return Number of children of node
+    template<class Ch>
+    inline std::size_t count_children(xml_node<Ch> *node)
+    {
+        xml_node<Ch> *child = node->first_node();
+        std::size_t count = 0;
+        while (child)
+        {
+            ++count;
+            child = child->next_sibling();
+        }
+        return count;
+    }
+
+    //! Counts attributes of node. Time complexity is O(n).
+    //! \return Number of attributes of node
+    template<class Ch>
+    inline std::size_t count_attributes(xml_node<Ch> *node)
+    {
+        xml_attribute<Ch> *attr = node->first_attribute();
+        std::size_t count = 0;
+        while (attr)
+        {
+            ++count;
+            attr = attr->next_attribute();
+        }
+        return count;
+    }
+
+}
+} // namespace cereal
+
+#endif
diff --git a/Src/External/cereal/include/cereal/macros.hpp b/Src/External/cereal/include/cereal/macros.hpp
new file mode 100644
index 0000000..cfdc14c
--- /dev/null
+++ b/Src/External/cereal/include/cereal/macros.hpp
@@ -0,0 +1,135 @@
+/*! \file macros.hpp
+    \brief Preprocessor macros that can customise the cereal library
+
+    By default, cereal looks for serialization functions with very
+    specific names, that is: serialize, load, save, load_minimal,
+    or save_minimal.
+
+    This file allows an advanced user to change these names to conform
+    to some other style or preference.  This is implemented using
+    preprocessor macros.
+
+    As a result of this, in internal cereal code you will see macros
+    used for these function names.  In user code, you should name
+    the functions like you normally would and not use the macros
+    to improve readability.
+    \ingroup utility */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef CEREAL_MACROS_HPP_
+#define CEREAL_MACROS_HPP_
+
+#ifndef CEREAL_THREAD_SAFE
+//! Whether cereal should be compiled for a threaded environment
+/*! This macro causes cereal to use mutexes to control access to
+    global internal state in a thread safe manner.
+
+    Note that even with this enabled you must still ensure that
+    archives are accessed by only one thread at a time; it is safe
+    to use multiple archives in paralel, but not to access one archive
+    from many places simultaneously. */
+#define CEREAL_THREAD_SAFE 0
+#endif // CEREAL_THREAD_SAFE
+
+#ifndef CEREAL_SIZE_TYPE
+//! Determines the data type used for size_type
+/*! cereal uses size_type to ensure that the serialized size of
+    dynamic containers is compatible across different architectures
+    (e.g. 32 vs 64 bit), which may use different underlying types for
+    std::size_t.
+
+    More information can be found in cereal/details/helpers.hpp.
+
+    If you choose to modify this type, ensure that you use a fixed
+    size type (e.g. uint32_t). */
+#define CEREAL_SIZE_TYPE uint64_t
+#endif // CEREAL_SIZE_TYPE
+
+// ######################################################################
+#ifndef CEREAL_SERIALIZE_FUNCTION_NAME
+//! The serialization/deserialization function name to search for.
+/*! You can define @c CEREAL_SERIALIZE_FUNCTION_NAME to be different assuming
+    you do so before this file is included. */
+#define CEREAL_SERIALIZE_FUNCTION_NAME serialize
+#endif // CEREAL_SERIALIZE_FUNCTION_NAME
+
+#ifndef CEREAL_LOAD_FUNCTION_NAME
+//! The deserialization (load) function name to search for.
+/*! You can define @c CEREAL_LOAD_FUNCTION_NAME to be different assuming you do so
+    before this file is included. */
+#define CEREAL_LOAD_FUNCTION_NAME load
+#endif // CEREAL_LOAD_FUNCTION_NAME
+
+#ifndef CEREAL_SAVE_FUNCTION_NAME
+//! The serialization (save) function name to search for.
+/*! You can define @c CEREAL_SAVE_FUNCTION_NAME to be different assuming you do so
+    before this file is included. */
+#define CEREAL_SAVE_FUNCTION_NAME save
+#endif // CEREAL_SAVE_FUNCTION_NAME
+
+#ifndef CEREAL_LOAD_MINIMAL_FUNCTION_NAME
+//! The deserialization (load_minimal) function name to search for.
+/*! You can define @c CEREAL_LOAD_MINIMAL_FUNCTION_NAME to be different assuming you do so
+    before this file is included. */
+#define CEREAL_LOAD_MINIMAL_FUNCTION_NAME load_minimal
+#endif // CEREAL_LOAD_MINIMAL_FUNCTION_NAME
+
+#ifndef CEREAL_SAVE_MINIMAL_FUNCTION_NAME
+//! The serialization (save_minimal) function name to search for.
+/*! You can define @c CEREAL_SAVE_MINIMAL_FUNCTION_NAME to be different assuming you do so
+    before this file is included. */
+#define CEREAL_SAVE_MINIMAL_FUNCTION_NAME save_minimal
+#endif // CEREAL_SAVE_MINIMAL_FUNCTION_NAME
+
+// ######################################################################
+//! Defines the CEREAL_NOEXCEPT macro to use instead of noexcept
+/*! If a compiler we support does not support noexcept, this macro
+    will detect this and define CEREAL_NOEXCEPT as a no-op
+    @internal */
+#if !defined(CEREAL_HAS_NOEXCEPT)
+  #if defined(__clang__)
+    #if __has_feature(cxx_noexcept)
+      #define CEREAL_HAS_NOEXCEPT
+    #endif
+  #else // NOT clang
+    #if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46 || \
+        defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026
+      #define CEREAL_HAS_NOEXCEPT
+    #endif // end GCC/MSVC check
+  #endif // end NOT clang block
+
+  #ifndef CEREAL_NOEXCEPT
+    #ifdef CEREAL_HAS_NOEXCEPT
+      #define CEREAL_NOEXCEPT noexcept
+    #else
+      #define CEREAL_NOEXCEPT
+    #endif // end CEREAL_HAS_NOEXCEPT
+  #endif // end !defined(CEREAL_HAS_NOEXCEPT)
+#endif // ifndef CEREAL_NOEXCEPT
+
+#endif // CEREAL_MACROS_HPP_
diff --git a/Src/External/cereal/include/cereal/types/array.hpp b/Src/External/cereal/include/cereal/types/array.hpp
new file mode 100644
index 0000000..f5d510a
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/array.hpp
@@ -0,0 +1,79 @@
+/*! \file array.hpp
+    \brief Support for types found in \<array\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_ARRAY_HPP_
+#define CEREAL_TYPES_ARRAY_HPP_
+
+#include "cereal/cereal.hpp"
+#include <array>
+
+namespace cereal
+{
+  //! Saving for std::array primitive types
+  //! using binary serialization, if supported
+  template <class Archive, class T, size_t N> inline
+  typename std::enable_if<traits::is_output_serializable<BinaryData<T>, Archive>::value
+                          && std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::array<T, N> const & array )
+  {
+    ar( binary_data( array.data(), sizeof(array) ) );
+  }
+
+  //! Loading for std::array primitive types
+  //! using binary serialization, if supported
+  template <class Archive, class T, size_t N> inline
+  typename std::enable_if<traits::is_input_serializable<BinaryData<T>, Archive>::value
+                          && std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::array<T, N> & array )
+  {
+    ar( binary_data( array.data(), sizeof(array) ) );
+  }
+
+  //! Saving for std::array all other types
+  template <class Archive, class T, size_t N> inline
+  typename std::enable_if<!traits::is_output_serializable<BinaryData<T>, Archive>::value
+                          || !std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::array<T, N> const & array )
+  {
+    for( auto const & i : array )
+      ar( i );
+  }
+
+  //! Loading for std::array all other types
+  template <class Archive, class T, size_t N> inline
+  typename std::enable_if<!traits::is_input_serializable<BinaryData<T>, Archive>::value
+                          || !std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::array<T, N> & array )
+  {
+    for( auto & i : array )
+      ar( i );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_ARRAY_HPP_
diff --git a/Src/External/cereal/include/cereal/types/base_class.hpp b/Src/External/cereal/include/cereal/types/base_class.hpp
new file mode 100644
index 0000000..37b551e
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/base_class.hpp
@@ -0,0 +1,201 @@
+/*! \file base_class.hpp
+    \brief Support for base classes (virtual and non-virtual)
+    \ingroup OtherTypes */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_BASE_CLASS_HPP_
+#define CEREAL_TYPES_BASE_CLASS_HPP_
+
+#include "cereal/details/traits.hpp"
+#include "cereal/details/polymorphic_impl_fwd.hpp"
+
+namespace cereal
+{
+  namespace base_class_detail
+  {
+    //! Used to register polymorphic relations and avoid the need to include
+    //! polymorphic.hpp when no polymorphism is used
+    /*! @internal */
+    template <class Base, class Derived, bool IsPolymorphic = std::is_polymorphic<Base>::value>
+    struct RegisterPolymorphicBaseClass
+    {
+      static void bind()
+      { }
+    };
+
+    //! Polymorphic version
+    /*! @internal */
+    template <class Base, class Derived>
+    struct RegisterPolymorphicBaseClass<Base, Derived, true>
+    {
+      static void bind()
+      { detail::RegisterPolymorphicCaster<Base, Derived>::bind(); }
+    };
+  }
+
+  //! Casts a derived class to its non-virtual base class in a way that safely supports abstract classes
+  /*! This should be used in cases when a derived type needs to serialize its base type. This is better than directly
+      using static_cast, as it allows for serialization of pure virtual (abstract) base classes.
+
+      This also automatically registers polymorphic relation between the base and derived class, assuming they
+      are indeed polymorphic. Note this is not the same as polymorphic type registration. For more information
+      see the documentation on polymorphism.
+
+      \sa virtual_base_class
+
+      @code{.cpp}
+      struct MyBase
+      {
+        int x;
+
+        virtual void foo() = 0;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( x );
+        }
+      };
+
+      struct MyDerived : public MyBase //<-- Note non-virtual inheritance
+      {
+        int y;
+
+        virtual void foo() {};
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( cereal::base_class<MyBase>(this) );
+          ar( y );
+        }
+      };
+      @endcode */
+  template<class Base>
+    struct base_class : private traits::detail::BaseCastBase
+    {
+      template<class Derived>
+        base_class(Derived const * derived) :
+          base_ptr(const_cast<Base*>(static_cast<Base const *>(derived)))
+      {
+        static_assert( std::is_base_of<Base, Derived>::value, "Can only use base_class on a valid base class" );
+        base_class_detail::RegisterPolymorphicBaseClass<Base, Derived>::bind();
+      }
+
+        Base * base_ptr;
+    };
+
+  //! Casts a derived class to its virtual base class in a way that allows cereal to track inheritance
+  /*! This should be used in cases when a derived type features virtual inheritance from some
+      base type.  This allows cereal to track the inheritance and to avoid making duplicate copies
+      during serialization.
+
+      It is safe to use virtual_base_class in all circumstances for serializing base classes, even in cases
+      where virtual inheritance does not take place, though it may be slightly faster to utilize
+      cereal::base_class<> if you do not need to worry about virtual inheritance.
+
+      This also automatically registers polymorphic relation between the base and derived class, assuming they
+      are indeed polymorphic. Note this is not the same as polymorphic type registration. For more information
+      see the documentation on polymorphism.
+
+      \sa base_class
+
+      @code{.cpp}
+      struct MyBase
+      {
+        int x;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( x );
+        }
+      };
+
+      struct MyLeft : virtual MyBase //<-- Note the virtual inheritance
+      {
+        int y;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( cereal::virtual_base_class<MyBase>( this ) );
+          ar( y );
+        }
+      };
+
+      struct MyRight : virtual MyBase
+      {
+        int z;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( cereal::virtual_base_clas<MyBase>( this ) );
+          ar( z );
+        }
+      };
+
+      // diamond virtual inheritance; contains one copy of each base class
+      struct MyDerived : virtual MyLeft, virtual MyRight
+      {
+        int a;
+
+        template <class Archive>
+        void serialize( Archive & ar )
+        {
+          ar( cereal::virtual_base_class<MyLeft>( this ) );  // safely serialize data members in MyLeft
+          ar( cereal::virtual_base_class<MyRight>( this ) ); // safely serialize data members in MyRight
+          ar( a );
+
+          // Because we used virtual_base_class, cereal will ensure that only one instance of MyBase is
+          // serialized as we traverse the inheritance heirarchy. This means that there will be one copy
+          // each of the variables x, y, z, and a
+
+          // If we had chosen to use static_cast<> instead, cereal would perform no tracking and
+          // assume that every base class should be serialized (in this case leading to a duplicate
+          // serialization of MyBase due to diamond inheritance
+      };
+     }
+     @endcode */
+  template<class Base>
+    struct virtual_base_class : private traits::detail::BaseCastBase
+    {
+      template<class Derived>
+        virtual_base_class(Derived const * derived) :
+          base_ptr(const_cast<Base*>(static_cast<Base const *>(derived)))
+      {
+        static_assert( std::is_base_of<Base, Derived>::value, "Can only use virtual_base_class on a valid base class" );
+        base_class_detail::RegisterPolymorphicBaseClass<Base, Derived>::bind();
+      }
+
+        Base * base_ptr;
+    };
+
+} // namespace cereal
+
+#endif // CEREAL_TYPES_BASE_CLASS_HPP_
diff --git a/Src/External/cereal/include/cereal/types/bitset.hpp b/Src/External/cereal/include/cereal/types/bitset.hpp
new file mode 100644
index 0000000..12d3a82
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/bitset.hpp
@@ -0,0 +1,176 @@
+/*! \file bitset.hpp
+    \brief Support for types found in \<bitset\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_BITSET_HPP_
+#define CEREAL_TYPES_BITSET_HPP_
+
+#include "cereal/cereal.hpp"
+#include "cereal/types/string.hpp"
+#include <bitset>
+
+namespace cereal
+{
+  namespace bitset_detail
+  {
+    //! The type the bitset is encoded with
+    /*! @internal */
+    enum class type : uint8_t
+    {
+      ulong,
+      ullong,
+      string,
+      bits
+    };
+  }
+
+  //! Serializing (save) for std::bitset when BinaryData optimization supported
+  template <class Archive, size_t N,
+            traits::EnableIf<traits::is_output_serializable<BinaryData<std::uint32_t>, Archive>::value>
+            = traits::sfinae> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::bitset<N> const & bits )
+  {
+    ar( CEREAL_NVP_("type", bitset_detail::type::bits) );
+
+    // Serialize 8 bit chunks
+    std::uint8_t chunk = 0;
+    std::uint8_t mask = 0x80;
+
+    // Set each chunk using a rotating mask for the current bit
+    for( std::size_t i = 0; i < N; ++i )
+    {
+      if( bits[i] )
+        chunk |= mask;
+
+      mask >>= 1;
+
+      // output current chunk when mask is empty (8 bits)
+      if( mask == 0 )
+      {
+        ar( chunk );
+        chunk = 0;
+        mask = 0x80;
+      }
+    }
+
+    // serialize remainder, if it exists
+    if( mask != 0x80 )
+      ar( chunk );
+  }
+
+  //! Serializing (save) for std::bitset when BinaryData is not supported
+  template <class Archive, size_t N,
+            traits::DisableIf<traits::is_output_serializable<BinaryData<std::uint32_t>, Archive>::value>
+            = traits::sfinae> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::bitset<N> const & bits )
+  {
+    try
+    {
+      auto const b = bits.to_ulong();
+      ar( CEREAL_NVP_("type", bitset_detail::type::ulong) );
+      ar( CEREAL_NVP_("data", b) );
+    }
+    catch( std::overflow_error const & )
+    {
+      try
+      {
+        auto const b = bits.to_ullong();
+        ar( CEREAL_NVP_("type", bitset_detail::type::ullong) );
+        ar( CEREAL_NVP_("data", b) );
+      }
+      catch( std::overflow_error const & )
+      {
+        ar( CEREAL_NVP_("type", bitset_detail::type::string) );
+        ar( CEREAL_NVP_("data", bits.to_string()) );
+      }
+    }
+  }
+
+  //! Serializing (load) for std::bitset
+  template <class Archive, size_t N> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::bitset<N> & bits )
+  {
+    bitset_detail::type t;
+    ar( CEREAL_NVP_("type", t) );
+
+    switch( t )
+    {
+      case bitset_detail::type::ulong:
+      {
+        unsigned long b;
+        ar( CEREAL_NVP_("data", b) );
+        bits = std::bitset<N>( b );
+        break;
+      }
+      case bitset_detail::type::ullong:
+      {
+        unsigned long long b;
+        ar( CEREAL_NVP_("data", b) );
+        bits = std::bitset<N>( b );
+        break;
+      }
+      case bitset_detail::type::string:
+      {
+        std::string b;
+        ar( CEREAL_NVP_("data", b) );
+        bits = std::bitset<N>( b );
+        break;
+      }
+      case bitset_detail::type::bits:
+      {
+        // Normally we would use BinaryData to route this at compile time,
+        // but doing this at runtime doesn't break any old serialization
+        std::uint8_t chunk = 0;
+        std::uint8_t mask  = 0;
+
+        bits.reset();
+
+        // Load one chunk at a time, rotating through the chunk
+        // to set bits in the bitset
+        for( std::size_t i = 0; i < N; ++i )
+        {
+          if( mask == 0 )
+          {
+            ar( chunk );
+            mask = 0x80;
+          }
+
+          if( chunk & mask )
+            bits[i] = 1;
+
+          mask >>= 1;
+        }
+        break;
+      }
+      default:
+        throw Exception("Invalid bitset data representation");
+    }
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_BITSET_HPP_
diff --git a/Src/External/cereal/include/cereal/types/boost_variant.hpp b/Src/External/cereal/include/cereal/types/boost_variant.hpp
new file mode 100644
index 0000000..e1863c1
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/boost_variant.hpp
@@ -0,0 +1,106 @@
+/*! \file boost_variant.hpp
+    \brief Support for boost::variant
+    \ingroup OtherTypes */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_BOOST_VARIANT_HPP_
+#define CEREAL_TYPES_BOOST_VARIANT_HPP_
+
+#include "cereal/cereal.hpp"
+#include <boost/variant.hpp>
+#include <boost/mpl/size.hpp>
+
+namespace cereal
+{
+  namespace variant_detail
+  {
+    //! @internal
+    template <class Archive>
+    struct variant_save_visitor : boost::static_visitor<>
+    {
+      variant_save_visitor(Archive & ar_) : ar(ar_) {}
+
+      template<class T>
+        void operator()(T const & value) const
+        {
+          ar( CEREAL_NVP_("data", value) );
+        }
+
+      Archive & ar;
+    };
+
+    //! @internal
+    template<int N, class Variant, class ... Args, class Archive>
+    typename std::enable_if<N == boost::mpl::size<typename Variant::types>::value, void>::type
+    load_variant(Archive & /*ar*/, int /*target*/, Variant & /*variant*/)
+    {
+      throw ::cereal::Exception("Error traversing variant during load");
+    }
+
+    //! @internal
+    template<int N, class Variant, class H, class ... T, class Archive>
+    typename std::enable_if<N < boost::mpl::size<typename Variant::types>::value, void>::type
+    load_variant(Archive & ar, int target, Variant & variant)
+    {
+      if(N == target)
+      {
+        H value;
+        ar( CEREAL_NVP_("data", value) );
+        variant = value;
+      }
+      else
+        load_variant<N+1, Variant, T...>(ar, target, variant);
+    }
+
+  } // namespace variant_detail
+
+  //! Saving for boost::variant
+  template <class Archive, typename VariantType1, typename... VariantTypes> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, boost::variant<VariantType1, VariantTypes...> const & variant )
+  {
+    int32_t which = variant.which();
+    ar( CEREAL_NVP_("which", which) );
+    variant_detail::variant_save_visitor<Archive> visitor(ar);
+    variant.apply_visitor(visitor);
+  }
+
+  //! Loading for boost::variant
+  template <class Archive, typename VariantType1, typename... VariantTypes> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, boost::variant<VariantType1, VariantTypes...> & variant )
+  {
+    typedef typename boost::variant<VariantType1, VariantTypes...>::types types;
+
+    int32_t which;
+    ar( CEREAL_NVP_("which", which) );
+    if(which >= boost::mpl::size<types>::value)
+      throw Exception("Invalid 'which' selector when deserializing boost::variant");
+
+    variant_detail::load_variant<0, boost::variant<VariantType1, VariantTypes...>, VariantType1, VariantTypes...>(ar, which, variant);
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_BOOST_VARIANT_HPP_
diff --git a/Src/External/cereal/include/cereal/types/chrono.hpp b/Src/External/cereal/include/cereal/types/chrono.hpp
new file mode 100644
index 0000000..12ee4cb
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/chrono.hpp
@@ -0,0 +1,72 @@
+/*! \file chrono.hpp
+    \brief Support for types found in \<chrono\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_CHRONO_HPP_
+#define CEREAL_TYPES_CHRONO_HPP_
+
+#include <chrono>
+
+namespace cereal
+{
+  //! Saving std::chrono::duration
+  template <class Archive, class R, class P> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::chrono::duration<R, P> const & dur )
+  {
+    ar( CEREAL_NVP_("count", dur.count()) );
+  }
+
+  //! Loading std::chrono::duration
+  template <class Archive, class R, class P> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::chrono::duration<R, P> & dur )
+  {
+    R count;
+    ar( CEREAL_NVP_("count", count) );
+
+    dur = std::chrono::duration<R, P>{count};
+  }
+
+  //! Saving std::chrono::time_point
+  template <class Archive, class C, class D> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::chrono::time_point<C, D> const & dur )
+  {
+    ar( CEREAL_NVP_("time_since_epoch", dur.time_since_epoch()) );
+  }
+
+  //! Loading std::chrono::time_point
+  template <class Archive, class C, class D> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::chrono::time_point<C, D> & dur )
+  {
+    D elapsed;
+    ar( CEREAL_NVP_("time_since_epoch", elapsed) );
+
+    dur = std::chrono::time_point<C, D>{elapsed};
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_CHRONO_HPP_
diff --git a/Src/External/cereal/include/cereal/types/common.hpp b/Src/External/cereal/include/cereal/types/common.hpp
new file mode 100644
index 0000000..b239daa
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/common.hpp
@@ -0,0 +1,129 @@
+/*! \file common.hpp
+    \brief Support common types - always included automatically
+    \ingroup OtherTypes */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_COMMON_HPP_
+#define CEREAL_TYPES_COMMON_HPP_
+
+#include "cereal/cereal.hpp"
+
+namespace cereal
+{
+  namespace common_detail
+  {
+    //! Serialization for arrays if BinaryData is supported and we are arithmetic
+    /*! @internal */
+    template <class Archive, class T> inline
+    void serializeArray( Archive & ar, T & array, std::true_type /* binary_supported */ )
+    {
+      ar( binary_data( array, sizeof(array) ) );
+    }
+
+    //! Serialization for arrays if BinaryData is not supported or we are not arithmetic
+    /*! @internal */
+    template <class Archive, class T> inline
+    void serializeArray( Archive & ar, T & array, std::false_type /* binary_supported */ )
+    {
+      for( auto & i : array )
+        ar( i );
+    }
+
+    namespace
+    {
+      //! Gets the underlying type of an enum
+      /*! @internal */
+      template <class T, bool IsEnum>
+      struct enum_underlying_type : std::false_type {};
+
+      //! Gets the underlying type of an enum
+      /*! Specialization for when we actually have an enum
+          @internal */
+      template <class T>
+      struct enum_underlying_type<T, true> { using type = typename std::underlying_type<T>::type; };
+    } // anon namespace
+
+    //! Checks if a type is an enum
+    /*! This is needed over simply calling std::is_enum because the type
+        traits checking at compile time will attempt to call something like
+        load_minimal with a special NoConvertRef struct that wraps up the true type.
+
+        This will strip away any of that and also expose the true underlying type.
+        @internal */
+    template <class T>
+    class is_enum
+    {
+      private:
+        using DecayedT  = typename std::decay<T>::type;
+        using StrippedT = typename ::cereal::traits::strip_minimal<DecayedT>::type;
+
+      public:
+        static const bool value = std::is_enum<StrippedT>::value;
+        using type = StrippedT;
+        using base_type = typename enum_underlying_type<StrippedT, value>::type;
+    };
+  }
+
+  //! Saving for enum types
+  template <class Archive, class T> inline
+  typename std::enable_if<common_detail::is_enum<T>::value,
+                          typename common_detail::is_enum<T>::base_type>::type
+  CEREAL_SAVE_MINIMAL_FUNCTION_NAME( Archive const &, T const & t )
+  {
+    return static_cast<typename common_detail::is_enum<T>::base_type>(t);
+  }
+
+  //! Loading for enum types
+  template <class Archive, class T> inline
+  typename std::enable_if<common_detail::is_enum<T>::value, void>::type
+  CEREAL_LOAD_MINIMAL_FUNCTION_NAME( Archive const &, T && t,
+                                     typename common_detail::is_enum<T>::base_type const & value )
+  {
+    t = reinterpret_cast<typename common_detail::is_enum<T>::type const &>( value );
+  }
+
+  //! Serialization for raw pointers
+  /*! This exists only to throw a static_assert to let users know we don't support raw pointers. */
+  template <class Archive, class T> inline
+  void CEREAL_SERIALIZE_FUNCTION_NAME( Archive &, T * & )
+  {
+    static_assert(cereal::traits::detail::delay_static_assert<T>::value,
+      "Cereal does not support serializing raw pointers - please use a smart pointer");
+  }
+
+  //! Serialization for C style arrays
+  template <class Archive, class T> inline
+  typename std::enable_if<std::is_array<T>::value, void>::type
+  CEREAL_SERIALIZE_FUNCTION_NAME(Archive & ar, T & array)
+  {
+    common_detail::serializeArray( ar, array,
+        std::integral_constant<bool, traits::is_output_serializable<BinaryData<T>, Archive>::value &&
+                                     std::is_arithmetic<typename std::remove_all_extents<T>::type>::value>() );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_COMMON_HPP_
diff --git a/Src/External/cereal/include/cereal/types/complex.hpp b/Src/External/cereal/include/cereal/types/complex.hpp
new file mode 100644
index 0000000..7e6ff54
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/complex.hpp
@@ -0,0 +1,56 @@
+/*! \file complex.hpp
+    \brief Support for types found in \<complex\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_COMPLEX_HPP_
+#define CEREAL_TYPES_COMPLEX_HPP_
+
+#include <complex>
+
+namespace cereal
+{
+  //! Serializing (save) for std::complex
+  template <class Archive, class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::complex<T> const & comp )
+  {
+    ar( CEREAL_NVP_("real", comp.real()),
+        CEREAL_NVP_("imag", comp.imag()) );
+  }
+
+  //! Serializing (load) for std::complex
+  template <class Archive, class T> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::complex<T> & bits )
+  {
+    T real, imag;
+    ar( CEREAL_NVP_("real", real),
+        CEREAL_NVP_("imag", imag) );
+    bits = {real, imag};
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_COMPLEX_HPP_
diff --git a/Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp b/Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp
new file mode 100644
index 0000000..5f0fd74
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp
@@ -0,0 +1,73 @@
+/*! \file pair_associative_container.hpp
+    \brief Support for the PairAssociativeContainer refinement of the
+    AssociativeContainer concept.
+    \ingroup TypeConcepts */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_CONCEPTS_PAIR_ASSOCIATIVE_CONTAINER_HPP_
+#define CEREAL_CONCEPTS_PAIR_ASSOCIATIVE_CONTAINER_HPP_
+
+#include "cereal/cereal.hpp"
+
+namespace cereal
+{
+  //! Saving for std-like pair associative containers
+  template <class Archive, template <typename...> class Map, typename... Args, typename = typename Map<Args...>::mapped_type> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, Map<Args...> const & map )
+  {
+    ar( make_size_tag( static_cast<size_type>(map.size()) ) );
+
+    for( const auto & i : map )
+      ar( make_map_item(i.first, i.second) );
+  }
+
+  //! Loading for std-like pair associative containers
+  template <class Archive, template <typename...> class Map, typename... Args, typename = typename Map<Args...>::mapped_type> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, Map<Args...> & map )
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+
+    map.clear();
+
+    auto hint = map.begin();
+    for( size_t i = 0; i < size; ++i )
+    {
+      typename Map<Args...>::key_type key;
+      typename Map<Args...>::mapped_type value;
+
+      ar( make_map_item(key, value) );
+      #ifdef CEREAL_OLDER_GCC
+      hint = map.insert( hint, std::make_pair(std::move(key), std::move(value)) );
+      #else // NOT CEREAL_OLDER_GCC
+      hint = map.emplace_hint( hint, std::move( key ), std::move( value ) );
+      #endif // NOT CEREAL_OLDER_GCC
+    }
+  }
+} // namespace cereal
+
+#endif // CEREAL_CONCEPTS_PAIR_ASSOCIATIVE_CONTAINER_HPP_
diff --git a/Src/External/cereal/include/cereal/types/deque.hpp b/Src/External/cereal/include/cereal/types/deque.hpp
new file mode 100644
index 0000000..0491d28
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/deque.hpp
@@ -0,0 +1,62 @@
+/*! \file deque.hpp
+    \brief Support for types found in \<deque\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_DEQUE_HPP_
+#define CEREAL_TYPES_DEQUE_HPP_
+
+#include "cereal/cereal.hpp"
+#include <deque>
+
+namespace cereal
+{
+  //! Saving for std::deque
+  template <class Archive, class T, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::deque<T, A> const & deque )
+  {
+    ar( make_size_tag( static_cast<size_type>(deque.size()) ) );
+
+    for( auto const & i : deque )
+      ar( i );
+  }
+
+  //! Loading for std::deque
+  template <class Archive, class T, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::deque<T, A> & deque )
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+
+    deque.resize( static_cast<size_t>( size ) );
+
+    for( auto & i : deque )
+      ar( i );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_DEQUE_HPP_
diff --git a/Src/External/cereal/include/cereal/types/forward_list.hpp b/Src/External/cereal/include/cereal/types/forward_list.hpp
new file mode 100644
index 0000000..db87e1f
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/forward_list.hpp
@@ -0,0 +1,68 @@
+/*! \file forward_list.hpp
+    \brief Support for types found in \<forward_list\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_FORWARD_LIST_HPP_
+#define CEREAL_TYPES_FORWARD_LIST_HPP_
+
+#include "cereal/cereal.hpp"
+#include <forward_list>
+
+namespace cereal
+{
+  //! Saving for std::forward_list all other types
+  template <class Archive, class T, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::forward_list<T, A> const & forward_list )
+  {
+    // write the size - note that this is slow because we need to traverse
+    // the entire list. there are ways we could avoid this but this was chosen
+    // since it works in the most general fashion with any archive type
+    size_type const size = std::distance( forward_list.begin(), forward_list.end() );
+
+    ar( make_size_tag( size ) );
+
+    // write the list
+    for( const auto & i : forward_list )
+      ar( i );
+  }
+
+  //! Loading for std::forward_list all other types from
+  template <class Archive, class T, class A>
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::forward_list<T, A> & forward_list )
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+
+    forward_list.resize( static_cast<size_t>( size ) );
+
+    for( auto & i : forward_list )
+      ar( i );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_FORWARD_LIST_HPP_
diff --git a/Src/External/cereal/include/cereal/types/functional.hpp b/Src/External/cereal/include/cereal/types/functional.hpp
new file mode 100644
index 0000000..0023ec4
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/functional.hpp
@@ -0,0 +1,43 @@
+/*! \file functional.hpp
+    \brief Support for types found in \<functional\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2016, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_FUNCTIONAL_HPP_
+#define CEREAL_TYPES_FUNCTIONAL_HPP_
+
+#include <functional>
+
+namespace cereal
+{
+  //! Saving for std::less
+  template <class Archive, class T> inline
+  void serialize( Archive &, std::less<T> & )
+  { }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_FUNCTIONAL_HPP_
diff --git a/Src/External/cereal/include/cereal/types/list.hpp b/Src/External/cereal/include/cereal/types/list.hpp
new file mode 100644
index 0000000..6008204
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/list.hpp
@@ -0,0 +1,62 @@
+/*! \file list.hpp
+    \brief Support for types found in \<list\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_LIST_HPP_
+#define CEREAL_TYPES_LIST_HPP_
+
+#include "cereal/cereal.hpp"
+#include <list>
+
+namespace cereal
+{
+  //! Saving for std::list
+  template <class Archive, class T, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::list<T, A> const & list )
+  {
+    ar( make_size_tag( static_cast<size_type>(list.size()) ) );
+
+    for( auto const & i : list )
+      ar( i );
+  }
+
+  //! Loading for std::list
+  template <class Archive, class T, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::list<T, A> & list )
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+
+    list.resize( static_cast<size_t>( size ) );
+
+    for( auto & i : list )
+      ar( i );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_LIST_HPP_
diff --git a/Src/External/cereal/include/cereal/types/map.hpp b/Src/External/cereal/include/cereal/types/map.hpp
new file mode 100644
index 0000000..41845e9
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/map.hpp
@@ -0,0 +1,36 @@
+/*! \file map.hpp
+    \brief Support for types found in \<map\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_MAP_HPP_
+#define CEREAL_TYPES_MAP_HPP_
+
+#include "cereal/types/concepts/pair_associative_container.hpp"
+#include <map>
+
+#endif // CEREAL_TYPES_MAP_HPP_
diff --git a/Src/External/cereal/include/cereal/types/memory.hpp b/Src/External/cereal/include/cereal/types/memory.hpp
new file mode 100644
index 0000000..40c965a
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/memory.hpp
@@ -0,0 +1,425 @@
+/*! \file memory.hpp
+    \brief Support for types found in \<memory\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_SHARED_PTR_HPP_
+#define CEREAL_TYPES_SHARED_PTR_HPP_
+
+#include "cereal/cereal.hpp"
+#include <memory>
+#include <cstring>
+
+// Work around MSVC not having alignof
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define CEREAL_ALIGNOF __alignof
+#else // not MSVC 2013 or older
+#define CEREAL_ALIGNOF alignof
+#endif // end MSVC check
+
+namespace cereal
+{
+  namespace memory_detail
+  {
+    //! A wrapper class to notify cereal that it is ok to serialize the contained pointer
+    /*! This mechanism allows us to intercept and properly handle polymorphic pointers
+        @internal */
+    template<class T>
+    struct PtrWrapper
+    {
+      PtrWrapper(T && p) : ptr(std::forward<T>(p)) {}
+      T & ptr;
+
+      PtrWrapper & operator=( PtrWrapper const & ) = delete;
+    };
+
+    //! Make a PtrWrapper
+    /*! @internal */
+    template<class T> inline
+    PtrWrapper<T> make_ptr_wrapper(T && t)
+    {
+      return {std::forward<T>(t)};
+    }
+
+    //! A struct that acts as a wrapper around calling load_andor_construct
+    /*! The purpose of this is to allow a load_and_construct call to properly enter into the
+        'data' NVP of the ptr_wrapper
+        @internal */
+    template <class Archive, class T>
+    struct LoadAndConstructLoadWrapper
+    {
+      LoadAndConstructLoadWrapper( T * ptr ) :
+        construct( ptr )
+      { }
+
+      //! Constructor for embedding an early call for restoring shared_from_this
+      template <class F>
+      LoadAndConstructLoadWrapper( T * ptr, F && sharedFromThisFunc ) :
+        construct( ptr, sharedFromThisFunc )
+      { }
+
+      inline void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar )
+      {
+        ::cereal::detail::Construct<T, Archive>::load_andor_construct( ar, construct );
+      }
+
+      ::cereal::construct<T> construct;
+    };
+
+    //! A helper struct for saving and restoring the state of types that derive from
+    //! std::enable_shared_from_this
+    /*! This special struct is necessary because when a user uses load_and_construct,
+        the weak_ptr (or whatever implementation defined variant) that allows
+        enable_shared_from_this to function correctly will not be initialized properly.
+
+        This internal weak_ptr can also be modified by the shared_ptr that is created
+        during the serialization of a polymorphic pointer, where cereal creates a
+        wrapper shared_ptr out of a void pointer to the real data.
+
+        In the case of load_and_construct, this happens because it is the allocation
+        of shared_ptr that perform this initialization, which we let happen on a buffer
+        of memory (aligned_storage).  This buffer is then used for placement new
+        later on, effectively overwriting any initialized weak_ptr with a default
+        initialized one, eventually leading to issues when the user calls shared_from_this.
+
+        To get around these issues, we will store the memory for the enable_shared_from_this
+        portion of the class and replace it after whatever happens to modify it (e.g. the
+        user performing construction or the wrapper shared_ptr in saving).
+
+        Example usage:
+
+        @code{.cpp}
+        T * myActualPointer;
+        {
+          EnableSharedStateHelper<T> helper( myActualPointer ); // save the state
+          std::shared_ptr<T> myPtr( myActualPointer ); // modifies the internal weak_ptr
+          // helper restores state when it goes out of scope
+        }
+        @endcode
+
+        When possible, this is designed to be used in an RAII fashion - it will save state on
+        construction and restore it on destruction. The restore can be done at an earlier time
+        (e.g. after construct() is called in load_and_construct) in which case the destructor will
+        do nothing. Performing the restore immediately following construct() allows a user to call
+        shared_from_this within their load_and_construct function.
+
+        @tparam T Type pointed to by shared_ptr
+        @internal */
+    template <class T>
+    class EnableSharedStateHelper
+    {
+      // typedefs for parent type and storage type
+      using BaseType = typename ::cereal::traits::get_shared_from_this_base<T>::type;
+      using ParentType = std::enable_shared_from_this<BaseType>;
+      using StorageType = typename std::aligned_storage<sizeof(ParentType), CEREAL_ALIGNOF(ParentType)>::type;
+      
+      public:
+        //! Saves the state of some type inheriting from enable_shared_from_this
+        /*! @param ptr The raw pointer held by the shared_ptr */
+        inline EnableSharedStateHelper( T * ptr ) :
+          itsPtr( static_cast<ParentType *>( ptr ) ),
+          itsState(),
+          itsRestored( false )
+        {
+          std::memcpy( &itsState, itsPtr, sizeof(ParentType) );
+        }
+
+        //! Restores the state of the held pointer (can only be done once)
+        inline void restore()
+        {
+          if( !itsRestored )
+          {
+            std::memcpy( itsPtr, &itsState, sizeof(ParentType) );
+            itsRestored = true;
+          }
+        }
+
+        //! Restores the state of the held pointer if not done previously
+        inline ~EnableSharedStateHelper()
+        {
+          restore();
+        }
+
+      private:
+        ParentType * itsPtr;
+        StorageType itsState;
+        bool itsRestored;
+    }; // end EnableSharedStateHelper
+
+    //! Performs loading and construction for a shared pointer that is derived from
+    //! std::enable_shared_from_this
+    /*! @param ar The archive
+        @param ptr Raw pointer held by the shared_ptr
+        @internal */
+    template <class Archive, class T> inline
+    void loadAndConstructSharedPtr( Archive & ar, T * ptr, std::true_type /* has_shared_from_this */ )
+    {
+      memory_detail::EnableSharedStateHelper<T> state( ptr );
+      memory_detail::LoadAndConstructLoadWrapper<Archive, T> loadWrapper( ptr, [&](){ state.restore(); } );
+
+      // let the user perform their initialization, shared state will be restored as soon as construct()
+      // is called
+      ar( CEREAL_NVP_("data", loadWrapper) );
+    }
+
+    //! Performs loading and construction for a shared pointer that is NOT derived from
+    //! std::enable_shared_from_this
+    /*! This is the typical case, where we simply pass the load wrapper to the
+        archive.
+
+        @param ar The archive
+        @param ptr Raw pointer held by the shared_ptr
+        @internal */
+    template <class Archive, class T> inline
+    void loadAndConstructSharedPtr( Archive & ar, T * ptr, std::false_type /* has_shared_from_this */ )
+    {
+      memory_detail::LoadAndConstructLoadWrapper<Archive, T> loadWrapper( ptr );
+      ar( CEREAL_NVP_("data", loadWrapper) );
+    }
+  } // end namespace memory_detail
+
+  //! Saving std::shared_ptr for non polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> const & ptr )
+  {
+    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
+  }
+
+  //! Loading std::shared_ptr, case when no user load and construct for non polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> & ptr )
+  {
+    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
+  }
+
+  //! Saving std::weak_ptr for non polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> const & ptr )
+  {
+    auto const sptr = ptr.lock();
+    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( sptr )) );
+  }
+
+  //! Loading std::weak_ptr for non polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> & ptr )
+  {
+    std::shared_ptr<T> sptr;
+    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( sptr )) );
+    ptr = sptr;
+  }
+
+  //! Saving std::unique_ptr for non polymorphic types
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> const & ptr )
+  {
+    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
+  }
+
+  //! Loading std::unique_ptr, case when user provides load_and_construct for non polymorphic types
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> & ptr )
+  {
+    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
+  }
+
+  // ######################################################################
+  // Pointer wrapper implementations follow below
+
+  //! Saving std::shared_ptr (wrapper implementation)
+  /*! @internal */
+  template <class Archive, class T> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::shared_ptr<T> const &> const & wrapper )
+  {
+    auto & ptr = wrapper.ptr;
+
+    uint32_t id = ar.registerSharedPointer( ptr.get() );
+    ar( CEREAL_NVP_("id", id) );
+
+    if( id & detail::msb_32bit )
+    {
+      ar( CEREAL_NVP_("data", *ptr) );
+    }
+  }
+
+  //! Loading std::shared_ptr, case when user load and construct (wrapper implementation)
+  /*! @internal */
+  template <class Archive, class T> inline
+  typename std::enable_if<traits::has_load_and_construct<T, Archive>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::shared_ptr<T> &> & wrapper )
+  {
+    auto & ptr = wrapper.ptr;
+
+    uint32_t id;
+
+    ar( CEREAL_NVP_("id", id) );
+
+    if( id & detail::msb_32bit )
+    {
+      // Storage type for the pointer - since we can't default construct this type,
+      // we'll allocate it using std::aligned_storage and use a custom deleter
+      using ST = typename std::aligned_storage<sizeof(T), CEREAL_ALIGNOF(T)>::type;
+
+      // Valid flag - set to true once construction finishes
+      //  This prevents us from calling the destructor on
+      //  uninitialized data.
+      auto valid = std::make_shared<bool>( false );
+
+      // Allocate our storage, which we will treat as
+      //  uninitialized until initialized with placement new
+      ptr.reset( reinterpret_cast<T *>( new ST() ),
+          [=]( T * t )
+          {
+            if( *valid )
+              t->~T();
+
+            delete reinterpret_cast<ST *>( t );
+          } );
+
+      // Register the pointer
+      ar.registerSharedPointer( id, ptr );
+
+      // Perform the actual loading and allocation
+      memory_detail::loadAndConstructSharedPtr( ar, ptr.get(), typename ::cereal::traits::has_shared_from_this<T>::type() );
+
+      // Mark pointer as valid (initialized)
+      *valid = true;
+    }
+    else
+      ptr = std::static_pointer_cast<T>(ar.getSharedPointer(id));
+  }
+
+  //! Loading std::shared_ptr, case when no user load and construct (wrapper implementation)
+  /*! @internal */
+  template <class Archive, class T> inline
+  typename std::enable_if<!traits::has_load_and_construct<T, Archive>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::shared_ptr<T> &> & wrapper )
+  {
+    auto & ptr = wrapper.ptr;
+
+    uint32_t id;
+
+    ar( CEREAL_NVP_("id", id) );
+
+    if( id & detail::msb_32bit )
+    {
+      ptr.reset( detail::Construct<T, Archive>::load_andor_construct() );
+      ar.registerSharedPointer( id, ptr );
+      ar( CEREAL_NVP_("data", *ptr) );
+    }
+    else
+      ptr = std::static_pointer_cast<T>(ar.getSharedPointer(id));
+  }
+
+  //! Saving std::unique_ptr (wrapper implementation)
+  /*! @internal */
+  template <class Archive, class T, class D> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::unique_ptr<T, D> const &> const & wrapper )
+  {
+    auto & ptr = wrapper.ptr;
+
+    // unique_ptr get one byte of metadata which signifies whether they were a nullptr
+    // 0 == nullptr
+    // 1 == not null
+
+    if( !ptr )
+      ar( CEREAL_NVP_("valid", uint8_t(0)) );
+    else
+    {
+      ar( CEREAL_NVP_("valid", uint8_t(1)) );
+      ar( CEREAL_NVP_("data", *ptr) );
+    }
+  }
+
+  //! Loading std::unique_ptr, case when user provides load_and_construct (wrapper implementation)
+  /*! @internal */
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<traits::has_load_and_construct<T, Archive>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::unique_ptr<T, D> &> & wrapper )
+  {
+    uint8_t isValid;
+    ar( CEREAL_NVP_("valid", isValid) );
+
+    auto & ptr = wrapper.ptr;
+
+    if( isValid )
+    {
+      // Storage type for the pointer - since we can't default construct this type,
+      // we'll allocate it using std::aligned_storage
+      using ST = typename std::aligned_storage<sizeof(T), CEREAL_ALIGNOF(T)>::type;
+
+      // Allocate storage - note the ST type so that deleter is correct if
+      //                    an exception is thrown before we are initialized
+      std::unique_ptr<ST> stPtr( new ST() );
+
+      // Use wrapper to enter into "data" nvp of ptr_wrapper
+      memory_detail::LoadAndConstructLoadWrapper<Archive, T> loadWrapper( reinterpret_cast<T *>( stPtr.get() ) );
+
+      // Initialize storage
+      ar( CEREAL_NVP_("data", loadWrapper) );
+
+      // Transfer ownership to correct unique_ptr type
+      ptr.reset( reinterpret_cast<T *>( stPtr.release() ) );
+    }
+    else
+      ptr.reset( nullptr );
+  }
+
+  //! Loading std::unique_ptr, case when no load_and_construct (wrapper implementation)
+  /*! @internal */
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<!traits::has_load_and_construct<T, Archive>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::unique_ptr<T, D> &> & wrapper )
+  {
+    uint8_t isValid;
+    ar( CEREAL_NVP_("valid", isValid) );
+
+    auto & ptr = wrapper.ptr;
+
+    if( isValid )
+    {
+      ptr.reset( detail::Construct<T, Archive>::load_andor_construct() );
+      ar( CEREAL_NVP_( "data", *ptr ) );
+    }
+    else
+    {
+      ptr.reset( nullptr );
+    }
+  }
+} // namespace cereal
+
+// automatically include polymorphic support
+#include "cereal/types/polymorphic.hpp"
+
+#undef CEREAL_ALIGNOF
+#endif // CEREAL_TYPES_SHARED_PTR_HPP_
\ No newline at end of file
diff --git a/Src/External/cereal/include/cereal/types/polymorphic.hpp b/Src/External/cereal/include/cereal/types/polymorphic.hpp
new file mode 100644
index 0000000..5acc11f
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/polymorphic.hpp
@@ -0,0 +1,481 @@
+/*! \file polymorphic.hpp
+    \brief Support for pointers to polymorphic base classes
+    \ingroup OtherTypes */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_POLYMORPHIC_HPP_
+#define CEREAL_TYPES_POLYMORPHIC_HPP_
+
+#include "cereal/cereal.hpp"
+#include "cereal/types/memory.hpp"
+
+#include "cereal/details/util.hpp"
+#include "cereal/details/helpers.hpp"
+#include "cereal/details/traits.hpp"
+#include "cereal/details/polymorphic_impl.hpp"
+
+#ifdef _MSC_VER
+#define CEREAL_STATIC_CONSTEXPR static
+#else
+#define CEREAL_STATIC_CONSTEXPR static constexpr
+#endif
+
+//! Registers a derived polymorphic type with cereal
+/*! Polymorphic types must be registered before smart
+    pointers to them can be serialized.  Note that base
+    classes do not need to be registered.
+
+    Registering a type lets cereal know how to properly
+    serialize it when a smart pointer to a base object is
+    used in conjunction with a derived class.
+
+    This assumes that all relevant archives have also
+    previously been registered.  Registration for archives
+    is usually done in the header file in which they are
+    defined.  This means that type registration needs to
+    happen after specific archives to be used are included.
+
+    It is recommended that type registration be done in
+    the header file in which the type is declared.
+
+    Registration can also be placed in a source file,
+    but this may require the use of the
+    CEREAL_REGISTER_DYNAMIC_INIT macro (see below).
+
+    Registration may be called repeatedly for the same
+    type in different translation units to add support
+    for additional archives if they are not initially
+    available (included and registered).
+
+    When building serialization support as a DLL on
+    Windows, registration must happen in the header file.
+    On Linux and Mac things should still work properly
+    if placed in a source file, but see the above comments
+    on registering in source files.
+
+    Polymorphic support in cereal requires RTTI to be
+    enabled */
+#define CEREAL_REGISTER_TYPE(...)                                        \
+  namespace cereal {                                                     \
+  namespace detail {                                                     \
+  template <>                                                            \
+  struct binding_name<__VA_ARGS__>                                       \
+  {                                                                      \
+    CEREAL_STATIC_CONSTEXPR char const * name() { return #__VA_ARGS__; } \
+  };                                                                     \
+  } } /* end namespaces */                                               \
+  CEREAL_BIND_TO_ARCHIVES(__VA_ARGS__)
+
+//! Registers a polymorphic type with cereal, giving it a
+//! user defined name
+/*! In some cases the default name used with
+    CEREAL_REGISTER_TYPE (the name of the type) may not be
+    suitable.  This macro allows any name to be associated
+    with the type.  The name should be unique */
+#define CEREAL_REGISTER_TYPE_WITH_NAME(T, Name)                     \
+  namespace cereal {                                                \
+  namespace detail {                                                \
+  template <>                                                       \
+  struct binding_name<T>                                            \
+  { CEREAL_STATIC_CONSTEXPR char const * name() { return Name; } }; \
+  } } /* end namespaces */                                          \
+  CEREAL_BIND_TO_ARCHIVES(T)
+
+//! Registers the base-derived relationship for a polymorphic type
+/*! When polymorphic serialization occurs, cereal needs to know how to
+    properly cast between derived and base types for the polymorphic
+    type. Normally this happens automatically whenever cereal::base_class
+    or cereal::virtual_base_class are used to serialize a base class. In
+    cases where neither of these is ever called but a base class still
+    exists, this explicit registration is required.
+
+    The Derived class should be the most derived type that will be serialized,
+    and the Base type any possible base that has not been covered under a base
+    class serialization that will be used to store a Derived pointer.
+
+    Placement of this is the same as for CEREAL_REGISTER_TYPE. */
+#define CEREAL_REGISTER_POLYMORPHIC_RELATION(Base, Derived)                     \
+  namespace cereal {                                                            \
+  namespace detail {                                                            \
+  template <>                                                                   \
+  struct PolymorphicRelation<Base, Derived>                                     \
+  { static void bind() { RegisterPolymorphicCaster<Base, Derived>::bind(); } }; \
+  } } /* end namespaces */
+
+//! Adds a way to force initialization of a translation unit containing
+//! calls to CEREAL_REGISTER_TYPE
+/*! In C++, dynamic initialization of non-local variables of a translation
+    unit may be deferred until "the first odr-use of any function or variable
+    defined in the same translation unit as the variable to be initialized."
+
+    Informally, odr-use means that your program takes the address of or binds
+    a reference directly to an object, which must have a definition.
+
+    Since polymorphic type support in cereal relies on the dynamic
+    initialization of certain global objects happening before
+    serialization is performed, it is important to ensure that something
+    from files that call CEREAL_REGISTER_TYPE is odr-used before serialization
+    occurs, otherwise the registration will never take place.  This may often
+    be the case when serialization is built as a shared library external from
+    your main program.
+
+    This macro, with any name of your choosing, should be placed into the
+    source file that contains calls to CEREAL_REGISTER_TYPE.
+
+    Its counterpart, CEREAL_FORCE_DYNAMIC_INIT, should be placed in its
+    associated header file such that it is included in the translation units
+    (source files) in which you want the registration to appear.
+
+    @relates CEREAL_FORCE_DYNAMIC_INIT
+    */
+#define CEREAL_REGISTER_DYNAMIC_INIT(LibName)                \
+  namespace cereal {                                         \
+  namespace detail {                                         \
+    void CEREAL_DLL_EXPORT dynamic_init_dummy_##LibName() {} \
+  } } /* end namespaces */
+
+//! Forces dynamic initialization of polymorphic support in a
+//! previously registered source file
+/*! @sa CEREAL_REGISTER_DYNAMIC_INIT
+
+    See CEREAL_REGISTER_DYNAMIC_INIT for detailed explanation
+    of how this macro should be used.  The name used should
+    match that for CEREAL_REGISTER_DYNAMIC_INIT. */
+#define CEREAL_FORCE_DYNAMIC_INIT(LibName)              \
+  namespace cereal {                                    \
+  namespace detail {                                    \
+    void dynamic_init_dummy_##LibName();                \
+  } /* end detail */                                    \
+  namespace {                                           \
+    void dynamic_init_##LibName()                       \
+    {                                                   \
+      ::cereal::detail::dynamic_init_dummy_##LibName(); \
+    }                                                   \
+  } } /* end namespaces */
+
+namespace cereal
+{
+  namespace polymorphic_detail
+  {
+    //! Error message used for unregistered polymorphic types
+    /*! @internal */
+    #define UNREGISTERED_POLYMORPHIC_EXCEPTION(LoadSave, Name)                                                                                      \
+      throw cereal::Exception("Trying to " #LoadSave " an unregistered polymorphic type (" + Name + ").\n"                                          \
+                              "Make sure your type is registered with CEREAL_REGISTER_TYPE and that the archive "                                   \
+                              "you are using was included (and registered with CEREAL_REGISTER_ARCHIVE) prior to calling CEREAL_REGISTER_TYPE.\n"   \
+                              "If your type is already registered and you still see this error, you may need to use CEREAL_REGISTER_DYNAMIC_INIT.");
+
+    //! Get an input binding from the given archive by deserializing the type meta data
+    /*! @internal */
+    template<class Archive> inline
+    typename ::cereal::detail::InputBindingMap<Archive>::Serializers getInputBinding(Archive & ar, std::uint32_t const nameid)
+    {
+      // If the nameid is zero, we serialized a null pointer
+      if(nameid == 0)
+      {
+        typename ::cereal::detail::InputBindingMap<Archive>::Serializers emptySerializers;
+        emptySerializers.shared_ptr = [](void*, std::shared_ptr<void> & ptr, std::type_info const &) { ptr.reset(); };
+        emptySerializers.unique_ptr = [](void*, std::unique_ptr<void, ::cereal::detail::EmptyDeleter<void>> & ptr, std::type_info const &) { ptr.reset( nullptr ); };
+        return emptySerializers;
+      }
+
+      std::string name;
+      if(nameid & detail::msb_32bit)
+      {
+        ar( CEREAL_NVP_("polymorphic_name", name) );
+        ar.registerPolymorphicName(nameid, name);
+      }
+      else
+        name = ar.getPolymorphicName(nameid);
+
+      auto const & bindingMap = detail::StaticObject<detail::InputBindingMap<Archive>>::getInstance().map;
+
+      auto binding = bindingMap.find(name);
+      if(binding == bindingMap.end())
+        UNREGISTERED_POLYMORPHIC_EXCEPTION(load, name)
+      return binding->second;
+    }
+
+    //! Serialize a shared_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
+    /*! This check lets us try and skip doing polymorphic machinery if we can get away with
+        using the derived class serialize function
+
+        Note that on MSVC 2013 preview, is_default_constructible<T> returns true for abstract classes with
+        default constructors, but on clang/gcc this will return false.  So we also need to check for that here.
+        @internal */
+    template<class Archive, class T> inline
+    typename std::enable_if<(traits::is_default_constructible<T>::value
+                             || traits::has_load_and_construct<T, Archive>::value)
+                             && !std::is_abstract<T>::value, bool>::type
+    serialize_wrapper(Archive & ar, std::shared_ptr<T> & ptr, std::uint32_t const nameid)
+    {
+      if(nameid & detail::msb2_32bit)
+      {
+        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
+        return true;
+      }
+      return false;
+    }
+
+    //! Serialize a unique_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
+    /*! This check lets us try and skip doing polymorphic machinery if we can get away with
+        using the derived class serialize function
+        @internal */
+    template<class Archive, class T, class D> inline
+    typename std::enable_if<(traits::is_default_constructible<T>::value
+                             || traits::has_load_and_construct<T, Archive>::value)
+                             && !std::is_abstract<T>::value, bool>::type
+    serialize_wrapper(Archive & ar, std::unique_ptr<T, D> & ptr, std::uint32_t const nameid)
+    {
+      if(nameid & detail::msb2_32bit)
+      {
+        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
+        return true;
+      }
+      return false;
+    }
+
+    //! Serialize a shared_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
+    /*! This case is for when we can't actually construct the shared pointer.  Normally this would be caught
+        as the pointer itself is serialized, but since this is a polymorphic pointer, if we tried to serialize
+        the pointer we'd end up back here recursively.  So we have to catch the error here as well, if
+        this was a polymorphic type serialized by its proper pointer type
+        @internal */
+    template<class Archive, class T> inline
+    typename std::enable_if<(!traits::is_default_constructible<T>::value
+                             && !traits::has_load_and_construct<T, Archive>::value)
+                             || std::is_abstract<T>::value, bool>::type
+    serialize_wrapper(Archive &, std::shared_ptr<T> &, std::uint32_t const nameid)
+    {
+      if(nameid & detail::msb2_32bit)
+        throw cereal::Exception("Cannot load a polymorphic type that is not default constructable and does not have a load_and_construct function");
+      return false;
+    }
+
+    //! Serialize a unique_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
+    /*! This case is for when we can't actually construct the unique pointer.  Normally this would be caught
+        as the pointer itself is serialized, but since this is a polymorphic pointer, if we tried to serialize
+        the pointer we'd end up back here recursively.  So we have to catch the error here as well, if
+        this was a polymorphic type serialized by its proper pointer type
+        @internal */
+    template<class Archive, class T, class D> inline
+     typename std::enable_if<(!traits::is_default_constructible<T>::value
+                               && !traits::has_load_and_construct<T, Archive>::value)
+                               || std::is_abstract<T>::value, bool>::type
+    serialize_wrapper(Archive &, std::unique_ptr<T, D> &, std::uint32_t const nameid)
+    {
+      if(nameid & detail::msb2_32bit)
+        throw cereal::Exception("Cannot load a polymorphic type that is not default constructable and does not have a load_and_construct function");
+      return false;
+    }
+  } // polymorphic_detail
+
+  // ######################################################################
+  // Pointer serialization for polymorphic types
+
+  //! Saving std::shared_ptr for polymorphic types, abstract
+  template <class Archive, class T> inline
+  typename std::enable_if<std::is_polymorphic<T>::value && std::is_abstract<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> const & ptr )
+  {
+    if(!ptr)
+    {
+      // same behavior as nullptr in memory implementation
+      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
+      return;
+    }
+
+    std::type_info const & ptrinfo = typeid(*ptr.get());
+    static std::type_info const & tinfo = typeid(T);
+    // ptrinfo can never be equal to T info since we can't have an instance
+    // of an abstract object
+    //  this implies we need to do the lookup
+
+    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
+
+    auto binding = bindingMap.find(std::type_index(ptrinfo));
+    if(binding == bindingMap.end())
+      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
+
+    binding->second.shared_ptr(&ar, ptr.get(), tinfo);
+  }
+
+  //! Saving std::shared_ptr for polymorphic types, not abstract
+  template <class Archive, class T> inline
+  typename std::enable_if<std::is_polymorphic<T>::value && !std::is_abstract<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> const & ptr )
+  {
+    if(!ptr)
+    {
+      // same behavior as nullptr in memory implementation
+      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
+      return;
+    }
+
+    std::type_info const & ptrinfo = typeid(*ptr.get());
+    static std::type_info const & tinfo = typeid(T);
+
+    if(ptrinfo == tinfo)
+    {
+      // The 2nd msb signals that the following pointer does not need to be
+      // cast with our polymorphic machinery
+      ar( CEREAL_NVP_("polymorphic_id", detail::msb2_32bit) );
+
+      ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
+
+      return;
+    }
+
+    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
+
+    auto binding = bindingMap.find(std::type_index(ptrinfo));
+    if(binding == bindingMap.end())
+      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
+
+    binding->second.shared_ptr(&ar, ptr.get(), tinfo);
+  }
+
+  //! Loading std::shared_ptr for polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> & ptr )
+  {
+    std::uint32_t nameid;
+    ar( CEREAL_NVP_("polymorphic_id", nameid) );
+
+    // Check to see if we can skip all of this polymorphism business
+    if(polymorphic_detail::serialize_wrapper(ar, ptr, nameid))
+      return;
+
+    auto binding = polymorphic_detail::getInputBinding(ar, nameid);
+    std::shared_ptr<void> result;
+    binding.shared_ptr(&ar, result, typeid(T));
+    ptr = std::static_pointer_cast<T>(result);
+  }
+
+  //! Saving std::weak_ptr for polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> const & ptr )
+  {
+    auto const sptr = ptr.lock();
+    ar( CEREAL_NVP_("locked_ptr", sptr) );
+  }
+
+  //! Loading std::weak_ptr for polymorphic types
+  template <class Archive, class T> inline
+  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> & ptr )
+  {
+    std::shared_ptr<T> sptr;
+    ar( CEREAL_NVP_("locked_ptr", sptr) );
+    ptr = sptr;
+  }
+
+  //! Saving std::unique_ptr for polymorphic types that are abstract
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<std::is_polymorphic<T>::value && std::is_abstract<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> const & ptr )
+  {
+    if(!ptr)
+    {
+      // same behavior as nullptr in memory implementation
+      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
+      return;
+    }
+
+    std::type_info const & ptrinfo = typeid(*ptr.get());
+    static std::type_info const & tinfo = typeid(T);
+    // ptrinfo can never be equal to T info since we can't have an instance
+    // of an abstract object
+    //  this implies we need to do the lookup
+
+    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
+
+    auto binding = bindingMap.find(std::type_index(ptrinfo));
+    if(binding == bindingMap.end())
+      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
+
+    binding->second.unique_ptr(&ar, ptr.get(), tinfo);
+  }
+
+  //! Saving std::unique_ptr for polymorphic types, not abstract
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<std::is_polymorphic<T>::value && !std::is_abstract<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> const & ptr )
+  {
+    if(!ptr)
+    {
+      // same behavior as nullptr in memory implementation
+      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
+      return;
+    }
+
+    std::type_info const & ptrinfo = typeid(*ptr.get());
+    static std::type_info const & tinfo = typeid(T);
+
+    if(ptrinfo == tinfo)
+    {
+      // The 2nd msb signals that the following pointer does not need to be
+      // cast with our polymorphic machinery
+      ar( CEREAL_NVP_("polymorphic_id", detail::msb2_32bit) );
+
+      ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
+
+      return;
+    }
+
+    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
+
+    auto binding = bindingMap.find(std::type_index(ptrinfo));
+    if(binding == bindingMap.end())
+      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
+
+    binding->second.unique_ptr(&ar, ptr.get(), tinfo);
+  }
+
+  //! Loading std::unique_ptr, case when user provides load_and_construct for polymorphic types
+  template <class Archive, class T, class D> inline
+  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> & ptr )
+  {
+    std::uint32_t nameid;
+    ar( CEREAL_NVP_("polymorphic_id", nameid) );
+
+    // Check to see if we can skip all of this polymorphism business
+    if(polymorphic_detail::serialize_wrapper(ar, ptr, nameid))
+      return;
+
+    auto binding = polymorphic_detail::getInputBinding(ar, nameid);
+    std::unique_ptr<void, ::cereal::detail::EmptyDeleter<void>> result;
+    binding.unique_ptr(&ar, result, typeid(T));
+    ptr.reset(static_cast<T*>(result.release()));
+  }
+
+  #undef UNREGISTERED_POLYMORPHIC_EXCEPTION
+} // namespace cereal
+#endif // CEREAL_TYPES_POLYMORPHIC_HPP_
diff --git a/Src/External/cereal/include/cereal/types/queue.hpp b/Src/External/cereal/include/cereal/types/queue.hpp
new file mode 100644
index 0000000..52d26a2
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/queue.hpp
@@ -0,0 +1,132 @@
+/*! \file queue.hpp
+    \brief Support for types found in \<queue\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_QUEUE_HPP_
+#define CEREAL_TYPES_QUEUE_HPP_
+
+#include "cereal/details/helpers.hpp"
+#include <queue>
+
+// The default container for queue is deque, so let's include that too
+#include "cereal/types/deque.hpp"
+// The default comparator for queue is less
+#include "cereal/types/functional.hpp"
+
+namespace cereal
+{
+  namespace queue_detail
+  {
+    //! Allows access to the protected container in queue
+    /*! @internal */
+    template <class T, class C> inline
+    C const & container( std::queue<T, C> const & queue )
+    {
+      struct H : public std::queue<T, C>
+      {
+        static C const & get( std::queue<T, C> const & q )
+        {
+          return q.*(&H::c);
+        }
+      };
+
+      return H::get( queue );
+    }
+
+    //! Allows access to the protected container in priority queue
+    /*! @internal */
+    template <class T, class C, class Comp> inline
+    C const & container( std::priority_queue<T, C, Comp> const & priority_queue )
+    {
+      struct H : public std::priority_queue<T, C, Comp>
+      {
+        static C const & get( std::priority_queue<T, C, Comp> const & pq )
+        {
+          return pq.*(&H::c);
+        }
+      };
+
+      return H::get( priority_queue );
+    }
+
+    //! Allows access to the protected comparator in priority queue
+    /*! @internal */
+    template <class T, class C, class Comp> inline
+    Comp const & comparator( std::priority_queue<T, C, Comp> const & priority_queue )
+    {
+      struct H : public std::priority_queue<T, C, Comp>
+      {
+        static Comp const & get( std::priority_queue<T, C, Comp> const & pq )
+        {
+          return pq.*(&H::comp);
+        }
+      };
+
+      return H::get( priority_queue );
+    }
+  }
+
+  //! Saving for std::queue
+  template <class Archive, class T, class C> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::queue<T, C> const & queue )
+  {
+    ar( CEREAL_NVP_("container", queue_detail::container( queue )) );
+  }
+
+  //! Loading for std::queue
+  template <class Archive, class T, class C> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::queue<T, C> & queue )
+  {
+    C container;
+    ar( CEREAL_NVP_("container", container) );
+    queue = std::queue<T, C>( std::move( container ) );
+  }
+
+  //! Saving for std::priority_queue
+  template <class Archive, class T, class C, class Comp> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::priority_queue<T, C, Comp> const & priority_queue )
+  {
+    ar( CEREAL_NVP_("comparator", queue_detail::comparator( priority_queue )) );
+    ar( CEREAL_NVP_("container", queue_detail::container( priority_queue )) );
+  }
+
+  //! Loading for std::priority_queue
+  template <class Archive, class T, class C, class Comp> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::priority_queue<T, C, Comp> & priority_queue )
+  {
+    Comp comparator;
+    ar( CEREAL_NVP_("comparator", comparator) );
+
+    C container;
+    ar( CEREAL_NVP_("container", container) );
+
+    priority_queue = std::priority_queue<T, C, Comp>( comparator, std::move( container ) );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_QUEUE_HPP_
diff --git a/Src/External/cereal/include/cereal/types/set.hpp b/Src/External/cereal/include/cereal/types/set.hpp
new file mode 100644
index 0000000..149a5b4
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/set.hpp
@@ -0,0 +1,103 @@
+/*! \file set.hpp
+    \brief Support for types found in \<set\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_SET_HPP_
+#define CEREAL_TYPES_SET_HPP_
+
+#include "cereal/cereal.hpp"
+#include <set>
+
+namespace cereal
+{
+  namespace set_detail
+  {
+    //! @internal
+    template <class Archive, class SetT> inline
+    void save( Archive & ar, SetT const & set )
+    {
+      ar( make_size_tag( static_cast<size_type>(set.size()) ) );
+
+      for( const auto & i : set )
+        ar( i );
+    }
+
+    //! @internal
+    template <class Archive, class SetT> inline
+    void load( Archive & ar, SetT & set )
+    {
+      size_type size;
+      ar( make_size_tag( size ) );
+
+      set.clear();
+
+      auto hint = set.begin();
+      for( size_type i = 0; i < size; ++i )
+      {
+        typename SetT::key_type key;
+
+        ar( key );
+        #ifdef CEREAL_OLDER_GCC
+        hint = set.insert( hint, std::move( key ) );
+        #else // NOT CEREAL_OLDER_GCC
+        hint = set.emplace_hint( hint, std::move( key ) );
+        #endif // NOT CEREAL_OLDER_GCC
+      }
+    }
+  }
+
+  //! Saving for std::set
+  template <class Archive, class K, class C, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::set<K, C, A> const & set )
+  {
+    set_detail::save( ar, set );
+  }
+
+  //! Loading for std::set
+  template <class Archive, class K, class C, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::set<K, C, A> & set )
+  {
+    set_detail::load( ar, set );
+  }
+
+  //! Saving for std::multiset
+  template <class Archive, class K, class C, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::multiset<K, C, A> const & multiset )
+  {
+    set_detail::save( ar, multiset );
+  }
+
+  //! Loading for std::multiset
+  template <class Archive, class K, class C, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::multiset<K, C, A> & multiset )
+  {
+    set_detail::load( ar, multiset );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_SET_HPP_
diff --git a/Src/External/cereal/include/cereal/types/stack.hpp b/Src/External/cereal/include/cereal/types/stack.hpp
new file mode 100644
index 0000000..b69b660
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/stack.hpp
@@ -0,0 +1,76 @@
+/*! \file stack.hpp
+    \brief Support for types found in \<stack\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_STACK_HPP_
+#define CEREAL_TYPES_STACK_HPP_
+
+#include "cereal/cereal.hpp"
+#include <stack>
+
+// The default container for stack is deque, so let's include that too
+#include "cereal/types/deque.hpp"
+
+namespace cereal
+{
+  namespace stack_detail
+  {
+    //! Allows access to the protected container in stack
+    template <class T, class C> inline
+    C const & container( std::stack<T, C> const & stack )
+    {
+      struct H : public std::stack<T, C>
+      {
+        static C const & get( std::stack<T, C> const & s )
+        {
+          return s.*(&H::c);
+        }
+      };
+
+      return H::get( stack );
+    }
+  }
+
+  //! Saving for std::stack
+  template <class Archive, class T, class C> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::stack<T, C> const & stack )
+  {
+    ar( CEREAL_NVP_("container", stack_detail::container( stack )) );
+  }
+
+  //! Loading for std::stack
+  template <class Archive, class T, class C> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::stack<T, C> & stack )
+  {
+    C container;
+    ar( CEREAL_NVP_("container", container) );
+    stack = std::stack<T, C>( std::move( container ) );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_STACK_HPP_
diff --git a/Src/External/cereal/include/cereal/types/string.hpp b/Src/External/cereal/include/cereal/types/string.hpp
new file mode 100644
index 0000000..e7488a9
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/string.hpp
@@ -0,0 +1,61 @@
+/*! \file string.hpp
+    \brief Support for types found in \<string\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_STRING_HPP_
+#define CEREAL_TYPES_STRING_HPP_
+
+#include "cereal/cereal.hpp"
+#include <string>
+
+namespace cereal
+{
+  //! Serialization for basic_string types, if binary data is supported
+  template<class Archive, class CharT, class Traits, class Alloc> inline
+  typename std::enable_if<traits::is_output_serializable<BinaryData<CharT>, Archive>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME(Archive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
+  {
+    // Save number of chars + the data
+    ar( make_size_tag( static_cast<size_type>(str.size()) ) );
+    ar( binary_data( str.data(), str.size() * sizeof(CharT) ) );
+  }
+
+  //! Serialization for basic_string types, if binary data is supported
+  template<class Archive, class CharT, class Traits, class Alloc> inline
+  typename std::enable_if<traits::is_input_serializable<BinaryData<CharT>, Archive>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME(Archive & ar, std::basic_string<CharT, Traits, Alloc> & str)
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+    str.resize(static_cast<std::size_t>(size));
+    ar( binary_data( const_cast<CharT *>( str.data() ), static_cast<std::size_t>(size) * sizeof(CharT) ) );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_STRING_HPP_
+
diff --git a/Src/External/cereal/include/cereal/types/tuple.hpp b/Src/External/cereal/include/cereal/types/tuple.hpp
new file mode 100644
index 0000000..7e56f0d
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/tuple.hpp
@@ -0,0 +1,123 @@
+/*! \file tuple.hpp
+    \brief Support for types found in \<tuple\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_TUPLE_HPP_
+#define CEREAL_TYPES_TUPLE_HPP_
+
+#include "cereal/cereal.hpp"
+#include <tuple>
+
+namespace cereal
+{
+  namespace tuple_detail
+  {
+    //! Creates a c string from a sequence of characters
+    /*! The c string created will alwas be prefixed by "tuple_element"
+        Based on code from: http://stackoverflow/a/20973438/710791
+        @internal */
+    template<char...Cs>
+    struct char_seq_to_c_str
+    {
+      static const int size = 14;// Size of array for the word: tuple_element
+      typedef const char (&arr_type)[sizeof...(Cs) + size];
+      static const char str[sizeof...(Cs) + size];
+    };
+
+    // the word tuple_element plus a number
+    //! @internal
+    template<char...Cs>
+    const char char_seq_to_c_str<Cs...>::str[sizeof...(Cs) + size] =
+      {'t','u','p','l','e','_','e','l','e','m','e','n','t', Cs..., '\0'};
+
+    //! Converts a number into a sequence of characters
+    /*! @tparam Q The quotient of dividing the original number by 10
+        @tparam R The remainder of dividing the original number by 10
+        @tparam C The sequence built so far
+        @internal */
+    template <size_t Q, size_t R, char ... C>
+    struct to_string_impl
+    {
+      using type = typename to_string_impl<Q/10, Q%10, R+'0', C...>::type;
+    };
+
+    //! Base case with no quotient
+    /*! @internal */
+    template <size_t R, char ... C>
+    struct to_string_impl<0, R, C...>
+    {
+      using type = char_seq_to_c_str<R+'0', C...>;
+    };
+
+    //! Generates a c string for a given index of a tuple
+    /*! Example use:
+        @code{cpp}
+        tuple_element_name<3>::c_str();// returns "tuple_element3"
+        @endcode
+        @internal */
+    template<size_t T>
+    struct tuple_element_name
+    {
+      using type = typename to_string_impl<T/10, T%10>::type;
+      static const typename type::arr_type c_str(){ return type::str; };
+    };
+
+    // unwinds a tuple to save it
+    //! @internal
+    template <size_t Height>
+    struct serialize
+    {
+      template <class Archive, class ... Types> inline
+      static void apply( Archive & ar, std::tuple<Types...> & tuple )
+      {
+        serialize<Height - 1>::template apply( ar, tuple );
+        ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(),
+            std::get<Height - 1>( tuple )) );
+      }
+    };
+
+    // Zero height specialization - nothing to do here
+    //! @internal
+    template <>
+    struct serialize<0>
+    {
+      template <class Archive, class ... Types> inline
+      static void apply( Archive &, std::tuple<Types...> & )
+      { }
+    };
+  }
+
+  //! Serializing for std::tuple
+  template <class Archive, class ... Types> inline
+  void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple )
+  {
+    tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_TUPLE_HPP_
diff --git a/Src/External/cereal/include/cereal/types/unordered_map.hpp b/Src/External/cereal/include/cereal/types/unordered_map.hpp
new file mode 100644
index 0000000..3b0f80b
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/unordered_map.hpp
@@ -0,0 +1,36 @@
+/*! \file unordered_map.hpp
+    \brief Support for types found in \<unordered_map\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_UNORDERED_MAP_HPP_
+#define CEREAL_TYPES_UNORDERED_MAP_HPP_
+
+#include "cereal/types/concepts/pair_associative_container.hpp"
+#include <unordered_map>
+
+#endif // CEREAL_TYPES_UNORDERED_MAP_HPP_
diff --git a/Src/External/cereal/include/cereal/types/unordered_set.hpp b/Src/External/cereal/include/cereal/types/unordered_set.hpp
new file mode 100644
index 0000000..b86d8e5
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/unordered_set.hpp
@@ -0,0 +1,99 @@
+/*! \file unordered_set.hpp
+    \brief Support for types found in \<unordered_set\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_UNORDERED_SET_HPP_
+#define CEREAL_TYPES_UNORDERED_SET_HPP_
+
+#include "cereal/cereal.hpp"
+#include <unordered_set>
+
+namespace cereal
+{
+  namespace unordered_set_detail
+  {
+    //! @internal
+    template <class Archive, class SetT> inline
+    void save( Archive & ar, SetT const & set )
+    {
+      ar( make_size_tag( static_cast<size_type>(set.size()) ) );
+
+      for( const auto & i : set )
+        ar( i );
+    }
+
+    //! @internal
+    template <class Archive, class SetT> inline
+    void load( Archive & ar, SetT & set )
+    {
+      size_type size;
+      ar( make_size_tag( size ) );
+
+      set.clear();
+      set.reserve( static_cast<std::size_t>( size ) );
+
+      for( size_type i = 0; i < size; ++i )
+      {
+        typename SetT::key_type key;
+
+        ar( key );
+        set.emplace( std::move( key ) );
+      }
+    }
+  }
+
+  //! Saving for std::unordered_set
+  template <class Archive, class K, class H, class KE, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unordered_set<K, H, KE, A> const & unordered_set )
+  {
+    unordered_set_detail::save( ar, unordered_set );
+  }
+
+  //! Loading for std::unordered_set
+  template <class Archive, class K, class H, class KE, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unordered_set<K, H, KE, A> & unordered_set )
+  {
+    unordered_set_detail::load( ar, unordered_set );
+  }
+
+  //! Saving for std::unordered_multiset
+  template <class Archive, class K, class H, class KE, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unordered_multiset<K, H, KE, A> const & unordered_multiset )
+  {
+    unordered_set_detail::save( ar, unordered_multiset );
+  }
+
+  //! Loading for std::unordered_multiset
+  template <class Archive, class K, class H, class KE, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unordered_multiset<K, H, KE, A> & unordered_multiset )
+  {
+    unordered_set_detail::load( ar, unordered_multiset );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_UNORDERED_SET_HPP_
diff --git a/Src/External/cereal/include/cereal/types/utility.hpp b/Src/External/cereal/include/cereal/types/utility.hpp
new file mode 100644
index 0000000..076bea8
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/utility.hpp
@@ -0,0 +1,47 @@
+/*! \file utility.hpp
+    \brief Support for types found in \<utility\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_UTILITY_HPP_
+#define CEREAL_TYPES_UTILITY_HPP_
+
+#include "cereal/cereal.hpp"
+#include <utility>
+
+namespace cereal
+{
+  //! Serializing for std::pair
+  template <class Archive, class T1, class T2> inline
+  void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::pair<T1, T2> & pair )
+  {
+    ar( CEREAL_NVP_("first",  pair.first),
+        CEREAL_NVP_("second", pair.second) );
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_UTILITY_HPP_
diff --git a/Src/External/cereal/include/cereal/types/valarray.hpp b/Src/External/cereal/include/cereal/types/valarray.hpp
new file mode 100644
index 0000000..dcc471d
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/valarray.hpp
@@ -0,0 +1,89 @@
+/*! \file valarray.hpp
+\brief Support for types found in \<valarray\>
+\ingroup STLSupport */
+
+/*
+Copyright (c) 2014, Randolph Voorhies, Shane Grant
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+* Neither the name of cereal nor the
+names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef CEREAL_TYPES_VALARRAY_HPP_
+#define CEREAL_TYPES_VALARRAY_HPP_
+
+#include "cereal/cereal.hpp"
+#include <valarray>
+
+namespace cereal
+{
+  //! Saving for std::valarray arithmetic types, using binary serialization, if supported
+  template <class Archive, class T> inline
+  typename std::enable_if<traits::is_output_serializable<BinaryData<T>, Archive>::value
+                          && std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::valarray<T> const & valarray )
+  {
+    ar( make_size_tag( static_cast<size_type>(valarray.size()) ) ); // number of elements
+    ar( binary_data( &valarray[0], valarray.size() * sizeof(T) ) ); // &valarray[0] ok since guaranteed contiguous
+  }
+
+  //! Loading for std::valarray arithmetic types, using binary serialization, if supported
+  template <class Archive, class T> inline
+  typename std::enable_if<traits::is_input_serializable<BinaryData<T>, Archive>::value
+                          && std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::valarray<T> & valarray )
+  {
+    size_type valarraySize;
+    ar( make_size_tag( valarraySize ) );
+
+    valarray.resize( static_cast<std::size_t>( valarraySize ) );
+    ar( binary_data( &valarray[0], static_cast<std::size_t>( valarraySize ) * sizeof(T) ) );
+  }
+
+  //! Saving for std::valarray all other types
+  template <class Archive, class T> inline
+  typename std::enable_if<!traits::is_output_serializable<BinaryData<T>, Archive>::value
+                          || !std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::valarray<T> const & valarray )
+  {
+    ar( make_size_tag( static_cast<size_type>(valarray.size()) ) ); // number of elements
+    for(auto && v : valarray)
+      ar(v);
+  }
+
+  //! Loading for std::valarray all other types
+  template <class Archive, class T> inline
+  typename std::enable_if<!traits::is_input_serializable<BinaryData<T>, Archive>::value
+                          || !std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::valarray<T> & valarray )
+  {
+    size_type valarraySize;
+    ar( make_size_tag( valarraySize ) );
+
+    valarray.resize( static_cast<size_t>( valarraySize ) );
+    for(auto && v : valarray)
+      ar(v);
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_VALARRAY_HPP_
diff --git a/Src/External/cereal/include/cereal/types/vector.hpp b/Src/External/cereal/include/cereal/types/vector.hpp
new file mode 100644
index 0000000..8302cb9
--- /dev/null
+++ b/Src/External/cereal/include/cereal/types/vector.hpp
@@ -0,0 +1,112 @@
+/*! \file vector.hpp
+    \brief Support for types found in \<vector\>
+    \ingroup STLSupport */
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TYPES_VECTOR_HPP_
+#define CEREAL_TYPES_VECTOR_HPP_
+
+#include "cereal/cereal.hpp"
+#include <vector>
+
+namespace cereal
+{
+  //! Serialization for std::vectors of arithmetic (but not bool) using binary serialization, if supported
+  template <class Archive, class T, class A> inline
+  typename std::enable_if<traits::is_output_serializable<BinaryData<T>, Archive>::value
+                          && std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::vector<T, A> const & vector )
+  {
+    ar( make_size_tag( static_cast<size_type>(vector.size()) ) ); // number of elements
+    ar( binary_data( vector.data(), vector.size() * sizeof(T) ) );
+  }
+
+  //! Serialization for std::vectors of arithmetic (but not bool) using binary serialization, if supported
+  template <class Archive, class T, class A> inline
+  typename std::enable_if<traits::is_input_serializable<BinaryData<T>, Archive>::value
+                          && std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::vector<T, A> & vector )
+  {
+    size_type vectorSize;
+    ar( make_size_tag( vectorSize ) );
+
+    vector.resize( static_cast<std::size_t>( vectorSize ) );
+    ar( binary_data( vector.data(), static_cast<std::size_t>( vectorSize ) * sizeof(T) ) );
+  }
+
+  //! Serialization for non-arithmetic vector types
+  template <class Archive, class T, class A> inline
+  typename std::enable_if<!traits::is_output_serializable<BinaryData<T>, Archive>::value
+                          || !std::is_arithmetic<T>::value, void>::type
+  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::vector<T, A> const & vector )
+  {
+    ar( make_size_tag( static_cast<size_type>(vector.size()) ) ); // number of elements
+    for(auto && v : vector)
+      ar( v );
+  }
+
+  //! Serialization for non-arithmetic vector types
+  template <class Archive, class T, class A> inline
+  typename std::enable_if<!traits::is_input_serializable<BinaryData<T>, Archive>::value
+                          || !std::is_arithmetic<T>::value, void>::type
+  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::vector<T, A> & vector )
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+
+    vector.resize( static_cast<std::size_t>( size ) );
+    for(auto && v : vector)
+      ar( v );
+  }
+
+  //! Serialization for bool vector types
+  template <class Archive, class A> inline
+  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::vector<bool, A> const & vector )
+  {
+    ar( make_size_tag( static_cast<size_type>(vector.size()) ) ); // number of elements
+    for(auto && v : vector)
+      ar( static_cast<bool>(v) );
+  }
+
+  //! Serialization for bool vector types
+  template <class Archive, class A> inline
+  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::vector<bool, A> & vector )
+  {
+    size_type size;
+    ar( make_size_tag( size ) );
+
+    vector.resize( static_cast<std::size_t>( size ) );
+    for(auto && v : vector)
+    {
+      bool b;
+      ar( b );
+      v = b;
+    }
+  }
+} // namespace cereal
+
+#endif // CEREAL_TYPES_VECTOR_HPP_
diff --git a/Src/External/cereal/sandbox/CMakeLists.txt b/Src/External/cereal/sandbox/CMakeLists.txt
new file mode 100644
index 0000000..52c8df8
--- /dev/null
+++ b/Src/External/cereal/sandbox/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_subdirectory(sandbox_shared_lib)
+
+add_executable(sandbox sandbox.cpp)
+add_executable(sandbox_json sandbox_json.cpp)
+add_executable(sandbox_rtti sandbox_rtti.cpp)
+
+add_executable(sandbox_vs sandbox_vs.cpp)
+target_link_libraries(sandbox_vs sandbox_vs_dll)
+include_directories(sandbox_shared_lib)
+
+if(Boost_FOUND)
+  add_executable(performance performance.cpp)
+  if(MSVC)
+    set_target_properties(performance PROPERTIES COMPILE_DEFINITIONS "BOOST_SERIALIZATION_DYN_LINK")
+  endif()
+  target_link_libraries(performance ${Boost_LIBRARIES})
+endif(Boost_FOUND)
diff --git a/Src/External/cereal/sandbox/performance.cpp b/Src/External/cereal/sandbox/performance.cpp
new file mode 100644
index 0000000..e5d61f0
--- /dev/null
+++ b/Src/External/cereal/sandbox/performance.cpp
@@ -0,0 +1,469 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable : 4244 4267)
+#endif
+
+#include <sstream>
+#include <iostream>
+#include <chrono>
+#include <random>
+
+#include <boost/format.hpp>
+
+#include <boost/serialization/serialization.hpp>
+#include <boost/archive/binary_oarchive.hpp>
+#include <boost/archive/binary_iarchive.hpp>
+#include <boost/serialization/vector.hpp>
+#include <boost/serialization/map.hpp>
+#include <boost/serialization/string.hpp>
+#include <boost/serialization/base_object.hpp>
+
+#include <cereal/archives/binary.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/map.hpp>
+
+//! Runs serialization to save data to an ostringstream
+/*! Used to time how long it takes to save data to an ostringstream.
+    Everything that happens within the save function will be timed, including
+    any set-up necessary to perform the serialization.
+
+    @param data The data to save
+    @param saveFunction A function taking in an ostringstream and the data and returning void
+    @return The ostringstream and the time it took to save the data */
+template <class T>
+std::chrono::nanoseconds
+saveData( T const & data, std::function<void(std::ostringstream &, T const&)> saveFunction, std::ostringstream & os )
+{
+  auto start = std::chrono::high_resolution_clock::now();
+  saveFunction( os, data );
+  return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - start );
+}
+
+//! Runs serialization to load data to from an istringstream
+/*! Used to time how long it takes to load data from an istringstream.
+    Everything that happens within the load function will be timed, including
+    any set-up necessary to perform the serialization.
+
+    @param dataStream The saved data stream
+    @param loadFunction A function taking in an istringstream and a data reference and returning void
+    @return The loaded data and the time it took to save the data */
+template <class T>
+std::pair<T, std::chrono::nanoseconds>
+loadData( std::ostringstream const & dataStream, std::function<void(std::istringstream &, T &)> loadFunction )
+{
+  T data;
+  std::istringstream os( dataStream.str() );
+
+  auto start = std::chrono::high_resolution_clock::now();
+  loadFunction( os, data );
+
+  return {data, std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - start )};
+}
+
+struct cerealBinary
+{
+  //! Saves data to a cereal binary archive
+  template <class T>
+  static void save( std::ostringstream & os, T const & data )
+  {
+    cereal::BinaryOutputArchive oar(os);
+    oar(data);
+  }
+
+  //! Loads data to a cereal binary archive
+  template <class T>
+  static void load( std::istringstream & is, T & data )
+  {
+    cereal::BinaryInputArchive iar(is);
+    iar(data);
+  }
+};
+
+struct boostBinary
+{
+  //! Saves data to a boost binary archive
+  template <class T>
+  static void save( std::ostringstream & os, T const & data )
+  {
+    boost::archive::binary_oarchive oar(os);
+    oar & data;
+  }
+
+  //! Loads data to a boost binary archive
+  template <class T>
+  static void load( std::istringstream & is, T & data )
+  {
+    boost::archive::binary_iarchive iar(is);
+    iar & data;
+  }
+};
+
+struct binary
+{
+  typedef boostBinary  boost;
+  typedef cerealBinary cereal;
+};
+
+//! Times how long it takes to serialize (load and store) some data
+/*! Times how long and the size of the serialization object used to serialize
+    some data.  Result is output to standard out.
+
+    @tparam SerializationT The serialization struct that has all save and load functions
+    @tparam DataTCereal The type of data to test for cereal
+    @tparam DataTBoost The type of data to test for boost
+    @param name The name for this test
+    @param data The data to serialize for cereal
+    @param data The data to serialize for boost
+    @param numAverages The number of times to average
+    @param validateData Whether data should be validated (input == output) */
+template <class SerializationT, class DataTCereal, class DataTBoost>
+void test( std::string const & name,
+            DataTCereal const & dataC,
+            DataTBoost const & dataB,
+            size_t numAverages = 100,
+            bool validateData = false );
+
+template <class SerializationT, class DataTCereal, class DataTBoost>
+void test( std::string const & name,
+            DataTCereal const & dataC,
+            DataTBoost const & dataB,
+            size_t numAverages,
+            bool /*validateData*/ )
+{
+  std::cout << "-----------------------------------" << std::endl;
+  std::cout << "Running test: " << name << std::endl;
+
+  std::chrono::nanoseconds totalBoostSave{0};
+  std::chrono::nanoseconds totalBoostLoad{0};
+
+  std::chrono::nanoseconds totalCerealSave{0};
+  std::chrono::nanoseconds totalCerealLoad{0};
+
+  size_t boostSize = 0;
+  size_t cerealSize = 0;
+
+  for(size_t i = 0; i < numAverages; ++i)
+  {
+    // Boost
+    {
+      std::ostringstream os;
+      auto saveResult = saveData<DataTBoost>( dataB, {SerializationT::boost::template save<DataTBoost>}, os );
+      totalBoostSave += saveResult;
+      if(!boostSize)
+        boostSize = os.tellp();
+
+      auto loadResult = loadData<DataTBoost>( os, {SerializationT::boost::template load<DataTBoost>} );
+      totalBoostLoad += loadResult.second;
+    }
+
+    // Cereal
+    {
+      std::ostringstream os;
+      auto saveResult = saveData<DataTCereal>( dataC, {SerializationT::cereal::template save<DataTCereal>}, os );
+      totalCerealSave += saveResult;
+      if(!cerealSize)
+        cerealSize = os.tellp();
+
+      auto loadResult = loadData<DataTCereal>( os, {SerializationT::cereal::template load<DataTCereal>} );
+      totalCerealLoad += loadResult.second;
+    }
+  }
+
+  // Averages
+  double averageBoostSave = std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostSave).count() / static_cast<double>( numAverages );
+  double averageBoostLoad = std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostLoad).count() / static_cast<double>( numAverages );
+
+  double averageCerealSave = std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealSave).count() / static_cast<double>( numAverages );
+  double averageCerealLoad = std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealLoad).count() / static_cast<double>( numAverages );
+
+  // Percentages relative to boost
+  double cerealSaveP = averageCerealSave / averageBoostSave;
+  double cerealLoadP = averageCerealLoad / averageBoostLoad;
+  double cerealSizeP = cerealSize / static_cast<double>( boostSize );
+
+  std::cout << "  Boost results:" << std::endl;
+  std::cout << boost::format("\tsave | time: %06.4fms (%1.2f) size: %20.8fkb (%1.8f) total: %6.1fms")
+    % averageBoostSave % 1.0 % (boostSize / 1024.0) % 1.0 % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostSave).count() );
+  std::cout << std::endl;
+  std::cout << boost::format("\tload | time: %06.4fms (%1.2f) total: %6.1fms")
+    % averageBoostLoad % 1.0 % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostLoad).count() );
+  std::cout << std::endl;
+
+  std::cout << "  Cereal results:" << std::endl;
+  std::cout << boost::format("\tsave | time: %06.4fms (%1.2f) size: %20.8fkb (%1.8f) total: %6.1fms")
+    % averageCerealSave % cerealSaveP % (cerealSize / 1024.0) % cerealSizeP % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealSave).count() );
+  std::cout << std::endl;
+  std::cout << boost::format("\tload | time: %06.4fms (%1.2f) total: %6.1fms")
+    % averageCerealLoad % cerealLoadP % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealLoad).count() );
+  std::cout << std::endl;
+}
+
+template <class SerializationT, class DataT>
+void test( std::string const & name,
+            DataT const & data,
+            size_t numAverages = 100,
+            bool validateData = false )
+{
+  return test<SerializationT, DataT, DataT>( name, data, data, numAverages, validateData );
+}
+
+template<class T>
+typename std::enable_if<std::is_floating_point<T>::value, T>::type
+random_value(std::mt19937 & gen)
+{ return std::uniform_real_distribution<T>(-10000.0, 10000.0)(gen); }
+
+template<class T>
+typename std::enable_if<std::is_integral<T>::value && sizeof(T) != sizeof(char), T>::type
+random_value(std::mt19937 & gen)
+{ return std::uniform_int_distribution<T>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen); }
+
+template<class T>
+typename std::enable_if<std::is_integral<T>::value && sizeof(T) == sizeof(char), T>::type
+random_value(std::mt19937 & gen)
+{ return static_cast<T>( std::uniform_int_distribution<int64_t>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen) ); }
+
+template<class T>
+typename std::enable_if<std::is_same<T, std::string>::value, std::string>::type
+random_value(std::mt19937 & gen)
+{
+  std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
+  for(char & c : s)
+    c = std::uniform_int_distribution<char>(' ', '~')(gen);
+  return s;
+}
+
+template<class C>
+std::basic_string<C> random_basic_string(std::mt19937 & gen, size_t maxSize = 30)
+{
+  std::basic_string<C> s(std::uniform_int_distribution<int>(3, maxSize)(gen), ' ');
+  for(C & c : s)
+    c = static_cast<C>( std::uniform_int_distribution<int>( '~', '~' )(gen) );
+  return s;
+  return s;
+}
+
+template <size_t N>
+std::string random_binary_string(std::mt19937 & gen)
+{
+  std::string s(N, ' ');
+  for(auto & c : s )
+    c = std::uniform_int_distribution<char>('0', '1')(gen);
+  return s;
+}
+
+struct PoDStructCereal
+{
+  int32_t a;
+  int64_t b;
+  float c;
+  double d;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar(a, b, c, d);
+  }
+};
+
+struct PoDStructBoost
+{
+  int32_t a;
+  int64_t b;
+  float c;
+  double d;
+
+  template <class Archive>
+  void serialize( Archive & ar, const unsigned int /*version*/ )
+  {
+    ar & a & b & c & d;
+  }
+};
+
+struct PoDChildCereal : virtual PoDStructCereal
+{
+  PoDChildCereal() : v(1024)
+  { }
+
+  std::vector<float> v;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( cereal::virtual_base_class<PoDStructCereal>(this), v );
+  }
+};
+
+struct PoDChildBoost : virtual PoDStructBoost
+{
+  PoDChildBoost() : v(1024)
+  { }
+
+  std::vector<float> v;
+
+  template <class Archive>
+  void serialize( Archive & ar, const unsigned int /*version*/ )
+  {
+    ar & boost::serialization::base_object<PoDStructBoost>(*this);
+    ar & v;
+  }
+};
+
+int main()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+  auto rngC = [&](){ return random_value<uint8_t>(gen); };
+  auto rngD = [&](){ return random_value<double>(gen); };
+  const bool randomize = false;
+
+  //########################################
+  auto vectorDoubleTest = [&](size_t s, bool randomize_)
+  {
+    std::ostringstream name;
+    name << "Vector(double) size " << s;
+
+    std::vector<double> data(s);
+    if(randomize_)
+      for( auto & d : data )
+        d = rngD();
+
+    test<binary>( name.str(), data );
+  };
+
+  vectorDoubleTest(1, randomize); // 8B
+  vectorDoubleTest(16, randomize); // 128B
+  vectorDoubleTest(1024, randomize); // 8KB
+  vectorDoubleTest(1024*1024, randomize); // 8MB
+
+  //########################################
+  auto vectorCharTest = [&](size_t s, bool randomize_)
+  {
+    std::ostringstream name;
+    name << "Vector(uint8_t) size " << s;
+
+    std::vector<uint8_t> data(s);
+    if(randomize_)
+      for( auto & d : data )
+        d = rngC();
+
+    test<binary>( name.str(), data );
+  };
+
+  vectorCharTest(1024*1024*64, randomize);
+
+  //########################################
+  auto vectorPoDStructTest = [&](size_t s)
+  {
+    std::ostringstream name;
+    name << "Vector(PoDStruct) size " << s;
+
+    std::vector<PoDStructCereal> dataC(s);
+    std::vector<PoDStructBoost> dataB(s);
+    test<binary>( name.str(), dataC, dataB );
+  };
+
+  vectorPoDStructTest(1);
+  vectorPoDStructTest(64);
+  vectorPoDStructTest(1024);
+  vectorPoDStructTest(1024*1024);
+  vectorPoDStructTest(1024*1024*2);
+
+  //########################################
+  auto vectorPoDChildTest = [&](size_t s)
+  {
+    std::ostringstream name;
+    name << "Vector(PoDChild) size " << s;
+
+    std::vector<PoDChildCereal> dataC(s);
+    std::vector<PoDChildBoost> dataB(s);
+    test<binary>( name.str(), dataC, dataB );
+  };
+
+  vectorPoDChildTest(1024);
+  vectorPoDChildTest(1024*32);
+
+  //########################################
+  auto stringTest = [&](size_t s)
+  {
+    std::ostringstream name;
+    name << "String size " << s;
+
+    std::string data = random_basic_string<char>(gen, s);
+    std::cout << "data.size " << data.size() << std::endl;
+    test<binary>( name.str(), data );
+  };
+
+  stringTest(200000);
+  stringTest(2000000);
+  stringTest(20000000);
+
+  //########################################
+  auto vectorStringTest = [&](size_t s)
+  {
+    std::ostringstream name;
+    name << "Vector(String) size " << s;
+
+    std::vector<std::string> data(s);
+    for(size_t i=0; i<data.size(); ++i)
+      data[i] = random_basic_string<char>(gen);
+
+    test<binary>( name.str(), data );
+  };
+
+  vectorStringTest(512);
+  vectorStringTest(1024);
+  vectorStringTest(1024*64);
+  vectorStringTest(1024*128);
+
+  //########################################
+  auto mapPoDStructTest = [&](size_t s)
+  {
+    std::ostringstream name;
+    name << "Map(PoDStruct) size " <<s;
+
+    std::map<std::string, PoDStructCereal> mC;
+    std::map<std::string, PoDStructBoost> mB;
+    for(size_t i=0; i<s; ++i)
+    {
+      mC[std::to_string( i )] = PoDStructCereal();
+      mB[std::to_string( i )] = PoDStructBoost();
+    }
+    test<binary>(name.str(), mC, mB);
+  };
+
+  mapPoDStructTest(1024);
+  mapPoDStructTest(1024*64);
+
+  return 0;
+}
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
diff --git a/Src/External/cereal/sandbox/sandbox.cpp b/Src/External/cereal/sandbox/sandbox.cpp
new file mode 100644
index 0000000..af28b22
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox.cpp
@@ -0,0 +1,820 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <cereal/cereal.hpp>
+#include <cereal/archives/binary.hpp>
+#include <cereal/archives/portable_binary.hpp>
+#include <cereal/archives/xml.hpp>
+
+#include <cereal/types/string.hpp>
+#include <cereal/types/utility.hpp>
+#include <cereal/types/memory.hpp>
+#include <cereal/types/complex.hpp>
+#include <cereal/types/base_class.hpp>
+#include <cereal/types/array.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/map.hpp>
+#include <cereal/types/utility.hpp>
+#include <cereal/types/bitset.hpp>
+#include <cereal/types/polymorphic.hpp>
+
+//#include <cxxabi.h>
+#include <sstream>
+#include <fstream>
+#include <cassert>
+#include <complex>
+#include <iostream>
+#include <random>
+
+class Base
+{
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void serialize( Archive & ar )
+    {
+      std::cout << "Base serialize" << std::endl;
+      ar( x );
+    }
+
+    virtual void foo() = 0;
+
+  public:
+    int x;
+};
+
+class Derived : public Base
+{
+  public:
+    using Base::x;
+    Derived() : Base(), y() {}
+    Derived( int d, int b )
+    {
+      y = d;
+      x = b;
+    }
+
+    template <class Archive>
+    void save( Archive & ar ) const
+    {
+      ar( cereal::virtual_base_class<Base>(this) );
+      std::cout << "Derived save" << std::endl;
+      ar( y );
+    }
+
+    template <class Archive>
+    void load( Archive & ar )
+    {
+      ar( cereal::virtual_base_class<Base>(this) );
+      std::cout << "Derived load" << std::endl;
+      ar( y );
+    }
+
+    void foo() {}
+
+    int y;
+};
+
+namespace cereal
+{
+  template <class Archive> struct specialize<Archive, Derived, cereal::specialization::member_load_save> {};
+}
+
+CEREAL_REGISTER_TYPE(Derived)
+
+// ###################################
+struct Test1
+{
+  int a;
+
+  private:
+    friend class cereal::access;
+    template<class Archive>
+    void serialize(Archive & ar)
+    {
+      ar(CEREAL_NVP(a));
+    }
+};
+
+// ###################################
+class Test2
+{
+  public:
+    Test2() {}
+    Test2( int x ) : a( x ) {}
+    int a;
+
+  private:
+    friend class cereal::access;
+
+    template<class Archive>
+      void save(Archive & ar) const
+      {
+        ar(a);
+      }
+
+    template<class Archive>
+      void load(Archive & ar)
+      {
+        ar(a);
+      }
+};
+
+// ###################################
+struct Test3
+{
+  int a;
+};
+
+template<class Archive>
+void serialize(Archive & ar, Test3 & t)
+{
+  ar(CEREAL_NVP(t.a));
+}
+
+namespace test4
+{
+  // ###################################
+  struct Test4
+  {
+    int a;
+  };
+
+  template<class Archive>
+  void save(Archive & ar, Test4 const & t)
+  {
+    ar(CEREAL_NVP(t.a));
+  }
+
+  template<class Archive>
+  void load(Archive & ar, Test4 & t)
+  {
+    ar(CEREAL_NVP(t.a));
+  }
+}
+
+class Private
+{
+  public:
+    Private() : a('z') {}
+
+  private:
+    char a;
+
+    friend class cereal::access;
+
+    template<class Archive>
+      void serialize(Archive & ar)
+      {
+        ar(a);
+      }
+};
+
+struct Everything
+{
+  int x;
+  int y;
+  Test1 t1;
+  Test2 t2;
+  Test3 t3;
+  test4::Test4 t4;
+  std::string s;
+
+  template<class Archive>
+  void serialize(Archive & ar)
+  {
+    ar(CEREAL_NVP(x));
+    ar(CEREAL_NVP(y));
+    ar(CEREAL_NVP(t1));
+    ar(CEREAL_NVP(t2));
+    ar(CEREAL_NVP(t3));
+    ar(CEREAL_NVP(t4));
+    ar(CEREAL_NVP(s));
+  }
+
+  bool operator==(Everything const & o)
+  {
+    return
+      x == o.x &&
+      y == o.y &&
+      t1.a == o.t1.a &&
+      t2.a == o.t2.a &&
+      t3.a == o.t3.a &&
+      t4.a == o.t4.a &&
+      s == o.s;
+  }
+};
+
+struct EmptyStruct
+{
+  template<class Archive>
+  void serialize(Archive &)
+  {
+    std::cout << "Side effects!" << std::endl;
+  }
+};
+
+struct NonEmptyStruct
+{
+  int x, y, z;
+};
+
+struct NoDefaultCtor
+{
+private:
+  NoDefaultCtor() {};
+  int z;
+  NoDefaultCtor( int x, bool ) :y(x) {}
+public:
+  NoDefaultCtor(int x) : y(x)
+  { }
+
+  friend class cereal::access;
+
+  int y;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( y );
+  }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<NoDefaultCtor> & construct )
+  {
+    int yy;
+    ar( yy );
+    construct( yy, true );
+    construct->z = 33;
+    construct.ptr()->z = 33;
+  }
+};
+
+//namespace cereal
+//{
+//  template <>
+//  struct LoadAndConstruct<NoDefaultCtor>
+//  {
+//    template <class Archive>
+//    static void load_and_construct( Archive & ar, cereal::construct<NoDefaultCtor> & construct )
+//    {
+//      int y;
+//      ar( y );
+//      construct( y );
+//    }
+//  };
+//}
+
+struct unordered_naming
+{
+  int x;
+  int y;
+  int z;
+
+  template <class Archive>
+  void save( Archive & ar ) const
+  {
+    ar( CEREAL_NVP(x),
+        CEREAL_NVP(z),
+        CEREAL_NVP(y) );
+  }
+
+  template <class Archive>
+  void load( Archive & ar )
+  {
+    ar( x,
+        CEREAL_NVP(y),
+        CEREAL_NVP(z) );
+  }
+
+  bool operator==( unordered_naming const & other ) const
+  {
+    return x == other.x && y == other.y && z == other.z;
+  }
+};
+
+std::ostream& operator<<(std::ostream& os, unordered_naming const & s)
+{
+  os << "[x: " << s.x << " y: " << s.y << " z: " << s.z << "]";
+  return os;
+}
+
+template <class IArchive, class OArchive>
+void test_unordered_loads()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rngI = [](){ return 1; };
+  auto rngF = [](){ return 2.0f; };
+  auto rngD = [](){ return 3.2; };
+
+  for(int i=0; i<100; ++i)
+  {
+    auto const name1 = "1";
+    auto const name2 = "2";
+    auto const name3 = "3";
+    auto const name4 = "4";
+    auto const name5 = "5";
+    auto const name6 = "6";
+    auto const name7 = "7";
+
+    int o_int1 = rngI();
+    double o_double2 = rngD();
+    std::vector<bool> o_vecbool3 = { true, false, true, false, true };
+    int o_int4 = rngI();
+    int o_int5 = rngI();
+    int o_int6 = rngI();
+    std::pair<float, unordered_naming> o_un7;
+    o_un7.first = rngF();
+    o_un7.second.x = rngI();
+    o_un7.second.y = rngI();
+    o_un7.second.z = rngI();
+
+    {
+      std::ofstream os("test.xml");
+      OArchive oar(os);
+
+      oar( cereal::make_nvp( name1, o_int1 ),
+           cereal::make_nvp( name2, o_double2 ),
+           cereal::make_nvp( name3, o_vecbool3 ),
+           cereal::make_nvp( name4, o_int4 ),
+           cereal::make_nvp( name5, o_int5 ),
+           cereal::make_nvp( name6, o_int6 ),
+           cereal::make_nvp( name7, o_un7 ) );
+    }
+
+    decltype(o_int1) i_int1;
+    decltype(o_double2) i_double2;
+    decltype(o_vecbool3) i_vecbool3;
+    decltype(o_int4) i_int4;
+    decltype(o_int5) i_int5;
+    decltype(o_int6) i_int6;
+    decltype(o_un7) i_un7;
+
+    std::ifstream is("test.xml");
+    {
+      IArchive iar(is);
+
+      iar( cereal::make_nvp( name7, o_un7 ),
+           cereal::make_nvp( name2, i_double2 ),
+           cereal::make_nvp( name4, i_int4 ),
+           cereal::make_nvp( name3, i_vecbool3 ),
+           cereal::make_nvp( name1, i_int1 ),
+           cereal::make_nvp( name5, i_int5 ),
+           i_int6 );
+    }
+  }
+}
+
+class BoostTransitionMS
+{
+  public:
+    BoostTransitionMS() {}
+    BoostTransitionMS( int xx ) : x(xx) {}
+
+    int getX(){ return x; }
+    void setX( int xx ){ x = xx; }
+
+  private:
+    friend class cereal::access;
+    int x;
+
+    template <class Archive>
+    void serialize( Archive & ar, const std::uint32_t /*version*/ )
+    { ar( x ); }
+};
+
+class BoostTransitionSplit
+{
+  public:
+    BoostTransitionSplit() {}
+    BoostTransitionSplit( int xx ) : x(xx) {}
+
+    int getX(){ return x; }
+    void setX( int xx ){ x = xx; }
+
+  private:
+    friend class cereal::access;
+    int x;
+
+    template <class Archive>
+    void save( Archive & ar, const std::uint32_t /*version*/ ) const
+    { ar( x ); }
+
+    template <class Archive>
+    void load( Archive & ar, const std::uint32_t /*version*/ )
+    { ar( x ); }
+};
+
+class BoostTransitionNMS
+{
+  public:
+    BoostTransitionNMS() {}
+    BoostTransitionNMS( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void serialize( Archive & ar, BoostTransitionNMS & bnms, const std::uint32_t version )
+{ ar( bnms.x ); std::cout << "NMS version: " << version << std::endl; }
+
+struct BoostTransitionNMSplit
+{
+  public:
+    BoostTransitionNMSplit() {}
+    BoostTransitionNMSplit( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void save( Archive & ar, BoostTransitionNMSplit const & bnsplit, const std::uint32_t version )
+{ ar( bnsplit.x ); std::cout << "NMsave version: " << version << std::endl; }
+
+template <class Archive>
+void load( Archive & ar, BoostTransitionNMSplit & bnsplit, const std::uint32_t version )
+{ ar( bnsplit.x ); std::cout << "NMload version: " << version << std::endl; }
+
+// ######################################################################
+int main()
+{
+  std::cout << std::boolalpha << std::endl;
+
+  Everything e_out;
+  e_out.x = 99;
+  e_out.y = 100;
+  e_out.t1 = {1};
+  e_out.t2 = {2};
+  e_out.t3 = {3};
+  e_out.t4 = {4};
+  e_out.s = "Hello, World!";
+  std::unique_ptr<NoDefaultCtor> nodefault( new NoDefaultCtor( 3 ) );
+
+  Test2 t2 = {22};
+
+  {
+    std::ofstream os("out.txt", std::ios::binary);
+    cereal::BinaryOutputArchive archive(os);
+    archive(CEREAL_NVP(e_out));
+    archive(t2);
+    archive(nodefault);
+  }
+
+  Everything e_in;
+
+  std::unique_ptr<NoDefaultCtor> nodefaultin( new NoDefaultCtor( 1 ) );
+
+  {
+    std::ifstream is("out.txt", std::ios::binary);
+    cereal::BinaryInputArchive archive(is);
+    archive(CEREAL_NVP(e_in));
+    archive(t2);
+    archive(nodefaultin);
+    std::remove("out.txt");
+  }
+
+  assert(e_in == e_out);
+  assert(nodefault->y == nodefaultin->y);
+
+  {
+    cereal::BinaryOutputArchive archive(std::cout);
+    int xxx[] = {-1, 95, 3};
+    archive( xxx );
+
+    cereal::XMLOutputArchive archive2(std::cout, cereal::XMLOutputArchive::Options(std::numeric_limits<double>::max_digits10, true, true));
+    archive2( xxx );
+
+    std::vector<int> yyy = {1, 2, 3};
+    archive2( yyy );
+
+    archive2.saveBinaryValue( xxx, sizeof(int)*3 );
+  }
+
+  {
+    std::ofstream os("out.xml");
+    cereal::XMLOutputArchive oar( os );
+    //cereal::XMLOutputArchive oar( std::cout );
+
+    oar( cereal::make_nvp("hello", 5 ) );
+
+    std::string bla("bla");
+    oar( bla );
+
+    auto intptr = std::make_shared<int>(99);
+    oar( CEREAL_NVP(intptr) );
+
+    std::map<std::string, int> map1 =
+    {
+      {"one",   1},
+      {"two",   2},
+      {"three", 3}
+    };
+
+    oar( CEREAL_NVP(map1) );
+
+    int x = 3;
+    oar( CEREAL_NVP(x) );
+    oar( 5 );
+    oar( 3.3 );
+    oar( 3.2f );
+    oar( true );
+
+    std::array<int,5> arr = {{1, 2, 3, 4, 5}};
+    oar( arr );
+
+    std::vector<std::string> vec = {"hey",
+                                    "there",
+                                    "buddy"};
+
+    std::vector<std::vector<std::string>> vec2 = {vec, vec, vec};
+
+    oar( cereal::make_nvp("EVERYTHING", e_out) );
+    oar( vec );
+    oar( vec2 );
+
+    int xxx[] = {-1, 95, 3};
+    oar.saveBinaryValue( xxx, sizeof(int)*3, "xxxbinary" );
+    //oar.saveBinaryValue( xxx, sizeof(int)*3 );
+
+    std::unique_ptr<Derived> d1( new Derived(3, 4) );
+    std::unique_ptr<Base> d2( new Derived(4, 5) );
+    std::shared_ptr<Base> d3( new Derived(5, 6) );
+    oar( d1 );
+    oar( d2 );
+    oar( d3 );
+  }
+
+  {
+    std::ifstream is("out.xml");
+    cereal::XMLInputArchive iar( is );
+
+    int hello;
+    iar( cereal::make_nvp("hello", hello) );
+    assert( hello == 5 );
+
+    std::string bla;
+    iar( bla );
+    assert( bla == "bla" );
+
+    std::shared_ptr<int> intptr;
+    iar( CEREAL_NVP(intptr) );
+    assert( *intptr == 99 );
+
+    std::map<std::string, int> map1;
+
+    iar( CEREAL_NVP(map1) );
+    assert( map1["one"]   == 1 );
+    assert( map1["two"]   == 2 );
+    assert( map1["three"] == 3 );
+
+
+    int x;
+    iar( CEREAL_NVP(x) );
+    assert( x == 3 );
+
+    int x5;
+    iar( x5 );
+    assert( x5 == 5 );
+
+    double x33;
+    iar( x33 );
+    assert( x33 == 3.3 );
+
+    float x32;
+    iar( x32 );
+    assert( x32 == 3.2f );
+
+    bool xtrue;
+    iar( xtrue );
+    assert( xtrue == true );
+
+    std::array<int,5> arr;
+    iar( arr );
+    for( int i = 0; i < 5; ++i )
+      assert( arr[i] == (i+1) );
+
+    Everything e;
+    iar( cereal::make_nvp("EVERYTHING", e) );
+    assert( e == e_out );
+
+    std::vector<std::string> vec;
+    iar( vec );
+    assert( vec[0] == "hey" );
+    assert( vec[1] == "there" );
+    assert( vec[2] == "buddy" );
+
+    std::vector<std::vector<std::string>> vec2;
+    iar( vec2 );
+    for( auto & v : vec2 )
+    {
+      assert( v[0] == "hey" );
+      assert( v[1] == "there" );
+      assert( v[2] == "buddy" );
+    }
+
+    int xxx[3];
+    iar.loadBinaryValue( xxx, sizeof(int)*3 );
+    assert( xxx[0] == -1 );
+    assert( xxx[1] == 95 );
+    assert( xxx[2] == 3 );
+
+    std::unique_ptr<Derived> d1;
+    std::unique_ptr<Base> d2;
+    std::shared_ptr<Base> d3;
+
+    iar( d1 );
+    assert( d1->x == 4 && d1->y == 3 );
+    iar( d2 );
+    assert( dynamic_cast<Derived*>(d2.get())->x == 5 && dynamic_cast<Derived*>(d2.get())->y == 4 );
+    iar( d3 );
+    assert( dynamic_cast<Derived*>(d3.get())->x == 6 && dynamic_cast<Derived*>(d3.get())->y == 5 );
+  }
+
+  {
+    std::ofstream b("endian.out", std::ios::binary);
+    cereal::PortableBinaryOutputArchive oar(b);
+
+    bool bb = true;
+    char a = 'a';
+    int x = 1234;
+    float y = 1.324f;
+    double z = 3.1452;
+    long double d = 1.123451234512345;
+    long long j = 2394873298472343;
+
+    oar( bb, a, x, y, z, d, j );
+    std::cout << bb << " " << a << " " << x << " " << y << " " << z << " " << d << " " << j << std::endl;
+    // valgrind will complain about uninitialized bytes here - seems to be the padding caused by the long double and
+    // long long allocations (this padding just exists on the stack and is never used anywhere)
+    // see https://bugs.kde.org/show_bug.cgi?id=197915
+  }
+  {
+    std::ifstream b("endian.out", std::ios::binary);
+    cereal::PortableBinaryInputArchive iar(b);
+
+    bool bb;
+    char a;
+    int x;
+    float y;
+    double z;
+    long double d;
+    long long j;
+
+    iar( bb, a, x, y, z, d, j );
+
+    std::cout << bb << " " << a << " " << x << " " << y << " " << z << " " << d << " " << j << std::endl;
+
+    std::remove("endian.out");
+  }
+
+  {
+    std::ofstream ss("xml_ordering.out");
+    cereal::XMLOutputArchive ar(ss);
+
+    double one = 1;
+    double two = 2;
+    double three = 3;
+    std::vector<int> four = {1, 2, 3, 4};
+
+    // Output is ordered 3 2 1 4
+    ar( three, CEREAL_NVP(two), one, cereal::make_nvp("five", four) );
+  }
+
+  {
+    std::ifstream ss("xml_ordering.out");
+    cereal::XMLInputArchive ar(ss);
+
+    // Output prodered out of order, try to load in order 1 2 3 4
+    double one;
+    double two;
+    double three;
+    std::vector<int> four;
+
+    ar( one ); // cereal can only give warnings if you used an NVP!
+    ar( CEREAL_NVP( two ) );
+    ar( three );
+
+    try
+    {
+      ar( CEREAL_NVP( three ) );
+    }
+    catch( cereal::Exception const & e )
+    {
+      std::cout << e.what() << std::endl;
+      std::cout << "Looked for three but we didn't use an NVP when saving" << std::endl;
+    }
+    ar( cereal::make_nvp("five", four) );
+    ar( cereal::make_nvp("five", four) ); // do it a second time since it shouldn't matter as we provide the name
+
+    std::cout << one << std::endl;
+    std::cout << two << std::endl;
+    std::cout << three << std::endl;
+    for( auto i : four ) std::cout << i << " ";
+    std::cout << std::endl;
+  }
+
+  {
+    // Boost transition layer stuff
+    std::ofstream ss("cereal_version.out");
+    cereal::XMLOutputArchive ar(ss);
+
+    BoostTransitionMS b(3);
+    ar( b, b );
+
+    BoostTransitionSplit c(4);
+    ar( c, c );
+
+    BoostTransitionNMS d(5);
+    ar( d, d );
+
+    BoostTransitionNMSplit e(32);
+    ar( e, e );
+  }
+
+  {
+    // Boost transition layer stuff
+    std::ifstream ss("cereal_version.out");
+    cereal::XMLInputArchive ar(ss);
+
+    BoostTransitionMS b;
+    ar( b );
+    assert( b.getX() == 3 );
+    b.setX( 0 );
+    ar( b );
+    assert( b.getX() == 3 );
+
+    BoostTransitionSplit c;
+    ar( c );
+    assert( c.getX() == 4 );
+    c.setX( 0 );
+    ar( c );
+    assert( c.getX() == 4 );
+
+    BoostTransitionNMS d;
+    ar( d );
+    assert( d.x == 5 );
+    d.x = 0;
+    ar( d );
+    assert( d.x == 5 );
+
+    BoostTransitionNMSplit e;
+    ar( e );
+    assert( e.x == 32 );
+    e.x = 0;
+    ar( e );
+    assert( e.x == 32 );
+  }
+
+#ifdef CEREAL_FUTURE_EXPERIMENTAL
+  {
+    // Any testing
+    int x = 32;
+    int * xx = &x;
+    std::string y("hello");
+    cereal::detail::Any a(xx);
+    auto b = a;
+
+    std::cout << *((int *)a) << std::endl;
+    *((int*)a) = 44;
+    std::cout << *((int *)b) << std::endl;
+    std::cout << *((int *)a) << std::endl;
+
+    a = cereal::detail::Any(y);
+    std::string a_out = a;
+    std::cout << a_out << std::endl;
+  }
+#endif // CEREAL_FUTURE_EXPERIMENTAL
+
+  return 0;
+}
+
+CEREAL_CLASS_VERSION(BoostTransitionMS, 1)
+CEREAL_CLASS_VERSION(BoostTransitionSplit, 2)
+CEREAL_CLASS_VERSION(BoostTransitionNMS, 3)
+// keep the other at default version (0)
diff --git a/Src/External/cereal/sandbox/sandbox_json.cpp b/Src/External/cereal/sandbox/sandbox_json.cpp
new file mode 100644
index 0000000..e767ca5
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_json.cpp
@@ -0,0 +1,446 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <cereal/cereal.hpp>
+#include <cereal/archives/binary.hpp>
+#include <cereal/archives/json.hpp>
+
+#include <cereal/types/string.hpp>
+#include <cereal/types/utility.hpp>
+#include <cereal/types/memory.hpp>
+#include <cereal/types/complex.hpp>
+#include <cereal/types/base_class.hpp>
+#include <cereal/types/array.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/map.hpp>
+
+#include <sstream>
+#include <fstream>
+#include <cassert>
+#include <complex>
+#include <iostream>
+#include <iomanip>
+#include <string>
+
+// ###################################
+struct Test1
+{
+  int a;
+
+  private:
+    friend class cereal::access;
+    template<class Archive>
+    void serialize(Archive & ar)
+    {
+      ar(CEREAL_NVP(a));
+    }
+};
+
+// ###################################
+class Test2
+{
+  public:
+    Test2() {}
+    Test2( int x ) : a( x ) {}
+    int a;
+
+  private:
+    friend class cereal::access;
+
+    template<class Archive>
+      void save(Archive & ar) const
+      {
+        ar(a);
+      }
+
+    template<class Archive>
+      void load(Archive & ar)
+      {
+        ar(a);
+      }
+};
+
+// ###################################
+struct Test3
+{
+  int a;
+};
+
+template<class Archive>
+void serialize(Archive & ar, Test3 & t)
+{
+  ar(CEREAL_NVP(t.a));
+}
+
+namespace test4
+{
+  // ###################################
+  struct Test4
+  {
+    int a;
+  };
+
+  template<class Archive>
+  void save(Archive & ar, Test4 const & t)
+  {
+    ar(CEREAL_NVP(t.a));
+  }
+
+  template<class Archive>
+  void load(Archive & ar, Test4 & t)
+  {
+    ar(CEREAL_NVP(t.a));
+  }
+}
+
+class Private
+{
+  public:
+    Private() : a('z') {}
+
+  private:
+    char a;
+
+    friend class cereal::access;
+
+    template<class Archive>
+      void serialize(Archive & ar)
+      {
+        ar(a);
+      }
+};
+
+struct Everything
+{
+  int x;
+  int y;
+  Test1 t1;
+  Test2 t2;
+  Test3 t3;
+  test4::Test4 t4;
+  std::string s;
+
+  template<class Archive>
+  void serialize(Archive & ar)
+  {
+    ar(CEREAL_NVP(x));
+    ar(CEREAL_NVP(y));
+    ar(CEREAL_NVP(t1));
+    ar(CEREAL_NVP(t2));
+    ar(CEREAL_NVP(t3));
+    ar(CEREAL_NVP(t4));
+    ar(CEREAL_NVP(s));
+  }
+
+  bool operator==(Everything const & o)
+  {
+    return
+      x == o.x &&
+      y == o.y &&
+      t1.a == o.t1.a &&
+      t2.a == o.t2.a &&
+      t3.a == o.t3.a &&
+      t4.a == o.t4.a &&
+      s == o.s;
+  }
+};
+
+
+struct SubFixture
+{
+  SubFixture() : a( 3 ),
+    b( 9999 ),
+    c( 100.1f ),
+    d( 2000.9 ),
+    s( "hello, world!" )
+  {}
+
+  int a;
+  uint64_t b;
+  float c;
+  double d;
+  std::string s;
+
+    template<class Archive>
+      void serialize(Archive & ar)
+      {
+        ar( CEREAL_NVP(a),
+            b,
+            c,
+            CEREAL_NVP(d),
+            CEREAL_NVP(s) );
+      }
+    void change()
+    {
+      a = 4;
+      b = 4;
+      c = 4;
+      d = 4;
+      s = "4";
+    }
+};
+
+struct Fixture
+{
+  SubFixture f1, f2, f3;
+  int array[4];
+
+  Fixture()
+  {
+    array[0] = 1;
+    array[1] = 2;
+    array[2] = 3;
+    array[3] = 4;
+  }
+
+  template<class Archive>
+  void save(Archive & ar) const
+  {
+    ar( f1,
+        CEREAL_NVP(f2),
+        f3 );
+    ar.saveBinaryValue( array, sizeof(int)*4, "cool array man" );
+  }
+
+  template<class Archive>
+  void load(Archive & ar)
+  {
+    ar( f1,
+        CEREAL_NVP(f2),
+        f3 );
+    ar.loadBinaryValue( array, sizeof(int)*4 );
+  }
+
+    void change()
+    {
+      f1.change();
+      f2.change();
+      f3.change();
+    }
+};
+
+struct AAA
+{
+  AAA() : one( 1 ), two( 2 ), three( { {1, 2, 3}, { 4, 5, 6 }, {} } ) {}
+  int one, two;
+
+  std::vector<std::vector<int>> three;
+
+  template<class Archive>
+    void serialize(Archive & ar)
+    {
+      ar( CEREAL_NVP(one), CEREAL_NVP(two) );
+      //ar( CEREAL_NVP(three) );
+    }
+};
+
+class Stuff
+{
+  public:
+    Stuff() {}
+
+    void fillData()
+    {
+      std::vector<std::complex<float>> t1{ {0, -1.0f},
+                          { 0, -2.9932f },
+                          { 0, -3.5f } };
+      std::vector<std::complex<float>> t2{ {1.0f, 0},
+                     { 2.2f, 0 },
+                     { 3.3f, 0 } };
+      data["imaginary"] = t1;
+      data["real"] = t2;
+    }
+
+  private:
+    std::map<std::string, std::vector<std::complex<float>>> data;
+
+    friend class cereal::access;
+
+    template <class Archive>
+    void serialize( Archive & ar )
+    {
+      ar( CEREAL_NVP(data) );
+    }
+};
+
+struct OOJson
+{
+  OOJson() = default;
+  OOJson( int aa, int bb, bool cc, double dd ) :
+    a( aa ), b( bb ), c{ cc, dd }
+  {
+    d[0] = 0; d[1] = 1; d[2] = 2;
+  }
+
+  int a;
+  int b;
+  std::pair<bool, double> c;
+  float d[3];
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( CEREAL_NVP(c) );
+    ar( CEREAL_NVP(a) );
+    ar( b );
+    ar( CEREAL_NVP(d) );
+  }
+};
+
+// ######################################################################
+int main()
+{
+  std::cout << std::boolalpha << std::endl;
+
+  {
+    std::ofstream os("file.json");
+    cereal::JSONOutputArchive oar( os );
+
+    //auto f = std::make_shared<Fixture>();
+    //auto f2 = f;
+    //oar( f );
+    //oar( f2 );
+    Stuff s; s.fillData();
+    oar( cereal::make_nvp("best data ever", s) );
+  }
+
+  {
+    std::ifstream is("file.json");
+    std::string str((std::istreambuf_iterator<char>(is)), std::istreambuf_iterator<char>());
+    std::cout << "---------------------" << std::endl << str << std::endl << "---------------------" << std::endl;
+  }
+
+  // playground
+  {
+    cereal::JSONOutputArchive archive( std::cout );
+    bool arr[] = {true, false};
+    std::vector<int> vec = {1, 2, 3, 4, 5};
+    archive( CEREAL_NVP(vec),
+        arr );
+    auto f = std::make_shared<Fixture>();
+    auto f2 = f;
+    archive( f );
+    archive( f2 );
+  }
+
+  // test out of order
+  std::stringstream oos;
+  {
+    cereal::JSONOutputArchive ar(oos);
+    cereal::JSONOutputArchive ar2(std::cout,
+        cereal::JSONOutputArchive::Options(2, cereal::JSONOutputArchive::Options::IndentChar::space, 2) );
+
+    ar( cereal::make_nvp( "1", 1 ),
+        cereal::make_nvp( "2", 2 ),
+        3,
+        0, // unused
+        cereal::make_nvp( "4", 4 ),
+        cereal::make_nvp( "5", 5 ) );
+
+    int x = 33;
+    ar.saveBinaryValue( &x, sizeof(int), "bla" );
+
+    ar2( cereal::make_nvp( "1", 1 ),
+         cereal::make_nvp( "2", 2 ),
+         3,
+         0, // unused
+         cereal::make_nvp( "4", 4 ),
+         cereal::make_nvp( "5", 5 ) );
+    ar2.saveBinaryValue( &x, sizeof(int), "bla" );
+
+    OOJson oo( 1, 2, true, 4.2 );
+    ar( CEREAL_NVP(oo) );
+    ar2( CEREAL_NVP(oo) );
+
+    // boost stuff
+    ar & cereal::make_nvp("usingop&", oo ) & 6;
+    ar << 5 << 4 << 3;
+
+    ar2 & cereal::make_nvp("usingop&", oo ) & 6;
+    ar2 << 5 << 4 << 3;
+
+    long double ld = std::numeric_limits<long double>::max();
+    long long ll = std::numeric_limits<long long>::max();
+    unsigned long long ull = std::numeric_limits<unsigned long long>::max();
+
+    ar( CEREAL_NVP(ld),
+        CEREAL_NVP(ll),
+        CEREAL_NVP(ull) );
+
+    ar2( CEREAL_NVP(ld),
+         CEREAL_NVP(ll),
+         CEREAL_NVP(ull) );
+  }
+
+  {
+    cereal::JSONInputArchive ar(oos);
+    int i1, i2, i3, i4, i5, x;
+
+    ar( i1 );
+    ar( cereal::make_nvp( "2", i2 ), i3 );
+
+    ar( cereal::make_nvp( "4", i4 ),
+        i5 );
+
+    ar.loadBinaryValue( &x, sizeof(int) );
+
+    OOJson ii;
+    ar( cereal::make_nvp("oo", ii) );
+    ar( cereal::make_nvp( "2", i2 ) );
+
+    std::cout << i1 << " " << i2 << " " << i3 << " " << i4 << " " << i5 << std::endl;
+    std::cout << x << std::endl;
+    std::cout << ii.a << " " << ii.b << " " << ii.c.first << " " << ii.c.second << " ";
+    for( auto z : ii.d )
+      std::cout << z << " ";
+    std::cout << std::endl;
+
+    OOJson oo;
+    ar >> cereal::make_nvp("usingop&", oo );
+    std::cout << oo.a << " " << oo.b << " " << oo.c.first << " " << oo.c.second << " ";
+    for( auto z : oo.d )
+      std::cout << z << " ";
+
+    int aa, a, b, c;
+    ar & aa & a & b & c;
+    std::cout << aa << " " << a << " " << b << " " << c << std::endl;
+
+    long double ld;
+    long long ll;
+    unsigned long long ull;
+
+    ar( CEREAL_NVP(ld),
+        CEREAL_NVP(ll),
+        CEREAL_NVP(ull) );
+
+    std::cout << (ld  == std::numeric_limits<long double>::max()) << std::endl;
+    std::cout << (ll  == std::numeric_limits<long long>::max()) << std::endl;
+    std::cout << (ull == std::numeric_limits<unsigned long long>::max()) << std::endl;
+  }
+
+  return 0;
+}
diff --git a/Src/External/cereal/sandbox/sandbox_rtti.cpp b/Src/External/cereal/sandbox/sandbox_rtti.cpp
new file mode 100644
index 0000000..896d033
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_rtti.cpp
@@ -0,0 +1,231 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <type_traits>
+#include <cereal/archives/binary.hpp>
+#include <cereal/archives/xml.hpp>
+#include <cereal/types/polymorphic.hpp>
+#include <sstream>
+#include <fstream>
+#include <iostream>
+
+struct Base
+{
+  int y;
+  virtual void foo() = 0;
+
+  template<class Archive>
+    void save(Archive & ar) const
+    {
+      std::cout << "Saving Base" << std::endl;
+      ar( y );
+    }
+
+  template<class Archive>
+    void load(Archive & ar)
+    {
+      std::cout << "Loading Base" << std::endl;
+      ar( y );
+    }
+};
+
+struct MyType : public Base
+{
+  int x;
+
+  void foo() {}
+
+  template<class Archive>
+    void save(Archive & ar) const
+    {
+      std::cout << "Saving MyType" << std::endl;
+      ar( cereal::virtual_base_class<Base>( this ) );
+    }
+
+  template<class Archive>
+    void load(Archive & ar)
+    {
+      std::cout << "Loading MyType" << std::endl;
+      ar( cereal::base_class<Base>( this ) );
+    }
+};
+CEREAL_REGISTER_TYPE(MyType)
+
+struct YourType : public Base
+{
+  YourType(int xx) : x(xx) {}
+  YourType() : x(-1) {}
+  int x;
+
+  void foo() {}
+
+  template<class Archive>
+    void save(Archive & ar) const
+    {
+      std::cout << "Saving YourType" << std::endl;
+      ar( x );
+    }
+
+  template<class Archive>
+    void load(Archive & ar)
+    {
+      std::cout << "Loading YourType" << std::endl;
+      ar( x );
+    }
+};
+
+CEREAL_REGISTER_TYPE(YourType)
+CEREAL_REGISTER_POLYMORPHIC_RELATION(Base, YourType)
+
+struct OurBase
+{
+  virtual void foo() {}
+
+  template<class Archive>
+    void serialize(Archive &)
+    { }
+};
+
+struct OurType : public OurBase
+{
+  OurType() : OurBase(), x() {}
+  OurType(int x_) : x(x_) {}
+  void foo() {}
+
+  int x;
+
+  template<class Archive>
+    void serialize(Archive & ar)
+    {
+      ar( x );
+    }
+};
+
+struct BaseVirtual
+{
+  int x;
+  template <class Archive>
+  void serialize( Archive & ar )
+  { ar( x ); }
+  virtual void foo() = 0;
+};
+
+struct DerivedVirtual : public virtual BaseVirtual
+{
+  int y;
+  virtual void foo() {}
+
+  template <class Archive>
+  void save( Archive & ar ) const
+  {
+    ar( cereal::virtual_base_class<BaseVirtual>( this ) );
+    ar( y );
+  }
+
+  template <class Archive>
+  void load( Archive & ar )
+  {
+    ar( cereal::virtual_base_class<BaseVirtual>( this ) );
+    ar( y );
+  }
+};
+
+struct TestType
+{
+  int x;
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( x );
+  }
+};
+
+namespace cereal
+{
+  template <class Archive> struct specialize<Archive, DerivedVirtual, cereal::specialization::member_load_save> {};
+  template <class Archive> struct specialize<Archive, TestType, cereal::specialization::member_serialize> {};
+}
+
+struct AAA
+{
+  virtual void foo() = 0;
+};
+
+struct BBB : AAA
+{
+  void foo() {}
+  template <class Archive>
+  void serialize( Archive & ) {}
+};
+
+CEREAL_REGISTER_TYPE(BBB)
+
+template <class T> void nop(T&&) {}
+
+int main()
+{
+  {
+    std::ofstream ostream("rtti.txt");
+    //cereal::BinaryOutputArchive oarchive(ostream);
+    cereal::XMLOutputArchive oarchive(ostream);
+
+    std::shared_ptr<Base> ptr1 = std::make_shared<MyType>();
+    std::shared_ptr<Base> ptr2 = std::make_shared<YourType>(33);
+    std::unique_ptr<Base> ptr3(new MyType());
+    std::weak_ptr<Base>   ptr4 = ptr2;
+
+    std::shared_ptr<OurType> ptr5 = std::make_shared<OurType>(99);
+
+    oarchive(ptr1);
+    oarchive(ptr2);
+    oarchive(ptr3);
+    oarchive(ptr4);
+    oarchive(ptr5);
+
+    //std::shared_ptr<AAA> a = std::make_shared<BBB>();
+    //oarchive(a);
+  }
+
+  {
+    std::ifstream istream("rtti.txt");
+    //cereal::BinaryInputArchive iarchive(istream);
+    cereal::XMLInputArchive iarchive(istream);
+
+    std::shared_ptr<Base> ptr1;
+    std::shared_ptr<Base> ptr2;
+    std::unique_ptr<Base> ptr3;
+    std::weak_ptr<Base>   ptr4;
+
+    std::shared_ptr<OurType> ptr5;
+
+    iarchive(ptr1);
+    iarchive(ptr2);
+    iarchive(ptr3);
+    iarchive(ptr4);
+    iarchive(ptr5);
+  }
+}
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt b/Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt
new file mode 100644
index 0000000..5d8ea08
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt
@@ -0,0 +1 @@
+add_library(sandbox_vs_dll SHARED base.cpp derived.cpp)
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp b/Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp
new file mode 100755
index 0000000..9d8e360
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp
@@ -0,0 +1,9 @@
+#ifndef CEREAL_DLL_USE
+#define CEREAL_DLL_MAKE
+#endif
+#include "base.hpp"
+
+template void Base::serialize<cereal::XMLOutputArchive>
+    ( cereal::XMLOutputArchive & ar, std::uint32_t const version );
+template void Base::serialize<cereal::XMLInputArchive>
+    ( cereal::XMLInputArchive & ar, std::uint32_t const version );
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp b/Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp
new file mode 100755
index 0000000..388a015
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <memory>
+#include <cereal/cereal.hpp>
+#include <cereal/archives/xml.hpp>
+#include <cereal/types/polymorphic.hpp>
+
+#if defined (_WINDLL)
+#define DECLSPECIFIER __declspec(dllexport)
+#elif defined(MSC_VER)
+#define DECLSPECIFIER __declspec(dllimport)
+#else
+#define DECLSPECIFIER
+#endif
+
+int doit();
+
+class VersionTest
+{
+  public:
+    int x;
+    template <class Archive>
+    void serialize( Archive & ar, const std::uint32_t /* version */ )
+    { ar( x ); }
+};
+
+class Base
+{
+  public:
+    friend class cereal::access;
+
+    template < class Archive >
+    void serialize(Archive &, std::uint32_t const) {}
+    virtual ~Base() {}
+};
+
+extern template DECLSPECIFIER void Base::serialize<cereal::XMLInputArchive>
+( cereal::XMLInputArchive & ar, std::uint32_t const version );
+
+extern template DECLSPECIFIER void Base::serialize<cereal::XMLOutputArchive>
+( cereal::XMLOutputArchive & ar, std::uint32_t const version );
+
+CEREAL_CLASS_VERSION(VersionTest, 1)
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp b/Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp
new file mode 100755
index 0000000..52043e2
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp
@@ -0,0 +1,10 @@
+#ifndef CEREAL_DLL_USE
+#define CEREAL_DLL_MAKE
+#endif
+#include "derived.hpp"
+
+template void Derived::serialize<cereal::XMLOutputArchive>
+    ( cereal::XMLOutputArchive & ar, std::uint32_t const version );
+
+template void Derived::serialize<cereal::XMLInputArchive>
+    ( cereal::XMLInputArchive & ar, std::uint32_t const version );
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp b/Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp
new file mode 100755
index 0000000..6f6cfb6
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp
@@ -0,0 +1,19 @@
+#pragma once
+#include "base.hpp"
+class Derived : public Base
+{
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void serialize(Archive & ar, std::uint32_t const)
+    {
+      ar(cereal::base_class<Base>(this));
+    }
+};
+
+extern template DECLSPECIFIER void Derived::serialize<cereal::XMLOutputArchive>
+    ( cereal::XMLOutputArchive & ar, std::uint32_t const version );
+extern template DECLSPECIFIER void Derived::serialize<cereal::XMLInputArchive>
+    ( cereal::XMLInputArchive & ar, std::uint32_t const version );
+
+CEREAL_REGISTER_TYPE(Derived)
diff --git a/Src/External/cereal/sandbox/sandbox_vs.cpp b/Src/External/cereal/sandbox/sandbox_vs.cpp
new file mode 100644
index 0000000..fb7fceb
--- /dev/null
+++ b/Src/External/cereal/sandbox/sandbox_vs.cpp
@@ -0,0 +1,278 @@
+#include <base.hpp>
+#include <derived.hpp>
+
+#include <cereal/access.hpp>
+#include <cereal/details/traits.hpp>
+#include <cereal/details/helpers.hpp>
+#include <cereal/types/base_class.hpp>
+#include <cereal/cereal.hpp>
+
+#include <cereal/types/array.hpp>
+#include <cereal/types/bitset.hpp>
+#include <cereal/types/chrono.hpp>
+#include <cereal/types/common.hpp>
+#include <cereal/types/complex.hpp>
+#include <cereal/types/deque.hpp>
+#include <cereal/types/forward_list.hpp>
+#include <cereal/types/list.hpp>
+#include <cereal/types/map.hpp>
+#include <cereal/types/memory.hpp>
+
+#include <cereal/details/util.hpp>
+
+#include <cereal/details/polymorphic_impl.hpp>
+#include <cereal/types/polymorphic.hpp>
+
+#include <cereal/types/queue.hpp>
+#include <cereal/types/set.hpp>
+#include <cereal/types/stack.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/tuple.hpp>
+#include <cereal/types/unordered_map.hpp>
+#include <cereal/types/unordered_set.hpp>
+#include <cereal/types/utility.hpp>
+#include <cereal/types/vector.hpp>
+
+#include <cereal/archives/binary.hpp>
+#include <cereal/archives/portable_binary.hpp>
+#include <cereal/archives/xml.hpp>
+#include <cereal/archives/json.hpp>
+
+#include <iostream>
+#include <type_traits>
+#include <functional>
+
+//CEREAL_FORCE_LINK_SHARED_LIBRARY(Sandbox)
+
+struct Archive {};
+CEREAL_SETUP_ARCHIVE_TRAITS(Archive, Archive)
+
+struct Test
+{
+  template <class Archive>
+  void serialzize( Archive & )
+  {
+    std::cout << "hey there" << std::endl;
+  }
+
+  template <class Archive>
+  void save( Archive & ) const
+  {
+    std::cout << "saved by the bell" << std::endl;
+  }
+
+  template <class Archive>
+  void load( Archive & )
+  {
+    std::cout << "locked and loaded" << std::endl;
+  }
+
+  template <class Archive>
+  static void load_and_construct( Archive &, cereal::construct<Test> & )
+  {
+  }
+
+  template <class Archive>
+  int save_minimal() const
+  {
+    return 0;
+  }
+
+  template <class Archive>
+  int save_minimal(const std::uint32_t) const
+  {
+    return 1;
+  }
+
+  template <class Archive>
+  void load_minimal( int & )
+  { }
+};
+
+template <class Archive>
+void serialize( Archive &, Test & )
+{ }
+
+template <class Archive>
+void load( Archive &, Test & )
+{ }
+
+template <class Archive>
+void save( Archive &, Test const & )
+{ }
+
+template <class Archive>
+int save_minimal( Test const & )
+{ return 0; }
+
+template <class Archive>
+int save_minimal( Test const &, const std::uint32_t )
+{ return 0; }
+
+namespace cereal
+{
+  template <>
+  struct LoadAndConstruct<Test>
+  {
+    template <class Archive>
+    static void load_and_construct( Archive &, cereal::construct<Test> & construct )
+    {
+      construct();
+    }
+  };
+}
+
+struct A
+{
+  virtual void foo() = 0;
+};
+
+struct B : A
+{
+  void foo() {}
+
+  template <class Archive>
+  void serialize( Archive & )
+  {
+    std::cout << "i'm in your b" << std::endl;
+  }
+};
+
+struct C
+{
+  char a;
+};
+
+CEREAL_REGISTER_TYPE(B)
+CEREAL_REGISTER_POLYMORPHIC_RELATION(A, B)
+
+class MemberMinimal
+{
+  public:
+    MemberMinimal() = default;
+    template <class Archive>
+    int save_minimal( Archive const & ) const
+    {
+      return x;
+    }
+
+    template <class Archive>
+    void load_minimal( Archive const &, int const & str )
+    {
+      x = str;
+    }
+
+  public:
+    int x;
+};
+
+int main()
+{
+  typedef Test T;
+  std::cout << std::boolalpha;
+
+  // Test Load and Construct internal/external
+  std::cout << "\tload_and_construct" << std::endl;
+  std::cout << cereal::traits::has_member_load_and_construct<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_load_and_construct<T, Archive>::value << std::endl;
+
+  // serialize
+  std::cout << "\tserialize" << std::endl;
+  std::cout << cereal::traits::has_member_serialize<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_serialize<T, Archive>::value << std::endl;
+
+  // load
+  std::cout << "\tload" << std::endl;
+  std::cout << cereal::traits::has_member_load<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_load<T, Archive>::value << std::endl;
+
+  // load minimal
+  std::cout << "\tload minimal" << std::endl;
+  std::cout << cereal::traits::has_member_load<T, Archive>::value << std::endl;
+
+  // save
+  std::cout << "\tsave" << std::endl;
+  std::cout << cereal::traits::has_member_save<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_save<T, Archive>::value << std::endl;
+
+  // save_minimal
+  std::cout << "\tsave_minimal" << std::endl;
+  std::cout << cereal::traits::has_member_save_minimal<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_save_minimal<T, Archive>::value << std::endl;
+
+  // save_minimal_versioned
+  std::cout << "\tsave_minimal versioned" << std::endl;
+  std::cout << cereal::traits::has_member_versioned_save_minimal<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_versioned_save_minimal<T, Archive>::value << std::endl;
+
+  // splittable
+  std::cout << "\t splittable" << std::endl;
+  std::cout << cereal::traits::has_member_split<T, Archive, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_non_member_split<T, Archive, Archive>::value << std::endl;
+
+  // serialiable
+  std::cout << "\toutput serializable" << std::endl;
+  std::cout << cereal::traits::is_output_serializable<T, Archive>::value << std::endl;
+
+#if !defined(__INTEL_COMPILER)
+  //! TODO: This causes icc to crash
+  std::cout << cereal::traits::is_input_serializable<T, Archive>::value << std::endl;
+#endif
+
+  // specialized
+  std::cout << "\tspecialized" << std::endl;
+  std::cout << cereal::traits::detail::is_specialized_member_serialize<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::detail::is_specialized_member_load_save<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::detail::is_specialized_non_member_serialize<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::detail::is_specialized_non_member_load_save<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::detail::count_specializations<T, Archive>::value << std::endl;
+  std::cout << cereal::traits::is_specialized<T, Archive>::value << std::endl;
+
+  // array size
+  std::cout << typeid(A).name() << std::endl;
+  std::cout << typeid(cereal::traits::has_load_and_construct<int, bool>).name() << std::endl;
+
+  // extra testing
+  std::cout << "\textra" << std::endl;
+  std::cout << cereal::traits::has_member_save_minimal<MemberMinimal, Archive>::value << std::endl;
+  std::cout << cereal::traits::has_member_load_minimal<MemberMinimal, Archive>::value << std::endl;
+
+  // DLL testing
+  std::cout << "------DLL TESTING------" << std::endl;
+  std::stringstream dllSS1;
+  std::stringstream dllSS2;
+  {
+    cereal::XMLOutputArchive out(dllSS1);
+    VersionTest x{1};
+    std::shared_ptr<Base> p = std::make_shared<Derived>();
+    out(x);
+    out( p );
+
+    std::shared_ptr<A> ay = std::make_shared<B>();
+    out(ay);
+  }
+
+  std::cout << dllSS1.str() << std::endl;
+
+  {
+    VersionTest x;
+    std::shared_ptr<Base> p;
+    std::shared_ptr<A> ay;
+    {
+      cereal::XMLInputArchive in(dllSS1);
+      in(x);
+      in( p );
+      in( ay );
+    }
+    {
+      cereal::XMLOutputArchive out(dllSS2);
+      out( x );
+      out( p );
+      out( ay );
+    }
+  }
+
+  std::cout << dllSS2.str() << std::endl;
+
+  return 0;
+}
diff --git a/Src/External/cereal/scripts/add_rapidjson_prefix.sh b/Src/External/cereal/scripts/add_rapidjson_prefix.sh
new file mode 100755
index 0000000..c5b3980
--- /dev/null
+++ b/Src/External/cereal/scripts/add_rapidjson_prefix.sh
@@ -0,0 +1,4 @@
+# Applies renaming within all of the rapidjson source files to add a cereal prefix
+find ./../include/cereal/external/rapidjson/ -type f -name \*.h -exec sed -i "s/RAPIDJSON_/CEREAL_RAPIDJSON_/g" {} \;
+echo "Remember to backport any cereal specific changes not in this version of RapidJSON!"
+echo "See https://github.com/USCiLab/cereal/commits/develop/include/cereal/external/rapidjson"
diff --git a/Src/External/cereal/scripts/appveyor.bat b/Src/External/cereal/scripts/appveyor.bat
new file mode 100644
index 0000000..5e478de
--- /dev/null
+++ b/Src/External/cereal/scripts/appveyor.bat
@@ -0,0 +1,75 @@
+@echo off
+setlocal enabledelayedexpansion
+
+if not defined APPVEYOR (
+    @echo This script is meant to be used with AppVeyor CI. This can be used as reference.
+    @echo I sincerely recommend not using it for building/testing cereal locally.
+    exit /b 0
+)
+
+if not defined BOOST_ROOT (
+    set BOOST_ROOT=C:\Libraries\boost
+)
+if not defined VS_VERSION_MAJOR (
+    set VS_VERSION_MAJOR=14
+)
+if not defined VS_VERSION_YEAR (
+    if "%VS_VERSION_MAJOR%" == "12" (
+        set VS_VERSION_YEAR=2013
+    ) else if "%VS_VERSION_MAJOR%" == "14" (
+        set VS_VERSION_YEAR=2015
+    ) else (
+        @echo Cannot use Visual Studio version %VS_VERSION_MAJOR%
+        exit /b 1
+    )
+)
+if not defined CMAKE_GENERATOR_PREFIX (
+    set CMAKE_GENERATOR_PREFIX=Visual Studio %VS_VERSION_MAJOR% %VS_VERSION_YEAR%
+)
+
+@rem CONFIGURATION is (one of the entries) defined in appveyor.yml
+if not defined CONFIGURATION (
+    set CONFIGURATION=Release
+)
+@rem PLATFORM is (one of the entries) defined in appveyor.yml
+if "%PLATFORM%"=="x64" (
+    set BIT_COUNT=64
+    set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_PREFIX% Win64
+) else (
+    set BIT_COUNT=32
+    set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_PREFIX%
+)
+
+set BOOST_LIBRARYDIR=%BOOST_ROOT%\lib%BIT_COUNT%-msvc-%VS_VERSION_MAJOR%.0
+
+set START_DIR=%CD%
+
+if not exist build\NUL mkdir build
+cd build
+
+if "%~1" == "test" (
+    @rem overloading the batch script; Run tests if the first argument is `test` (without quotes).
+    @rem   Cereal uses Boost Unit test framework. Rather than modifying the code to load boost test
+    @rem dll from its location OR copying the boost dlls to the directory of every test being run,
+    @rem we use another option Windows leaves us - modify the PATH.
+    for %%i in (ctest.exe) do set CTEST_EXE=%%~$PATH:i
+    PATH %BOOST_LIBRARYDIR%
+    "!CTEST_EXE!" -C %CONFIGURATION%
+    if %errorlevel% neq 0 exit /b %errorlevel%
+    goto done
+)
+
+if "%PLATFORM%" == "x64" (
+    @rem please excuse the hack - CMake is unable to produce multiarch MSVC projects
+    cmake -G "%CMAKE_GENERATOR_PREFIX%" -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ..
+    cmake --build . --config %CONFIGURATION% --target portability_test32
+    del CMakeCache.txt
+    rmdir /s /q CMakeFiles
+)
+
+cmake -G "%CMAKE_GENERATOR_NAME%" -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ..
+@rem left the actual build for later - AppVeyor enables parallel jobs in a much cleaner way than msbuild
+
+:done
+@REM go back home
+cd %START_DIR%
diff --git a/Src/External/cereal/scripts/renameincludes.sh b/Src/External/cereal/scripts/renameincludes.sh
new file mode 100755
index 0000000..acc2fa2
--- /dev/null
+++ b/Src/External/cereal/scripts/renameincludes.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+destdir="include_renamed"
+
+echo -n "New prefix: "
+read newprefix
+
+cp -r include ${destdir}
+
+newprefix=$(echo ${newprefix} | sed -e 's/\//\\\//')
+
+find ${destdir} -name '*.hpp' -exec sed -i "s/#include <cereal/#include <${newprefix}\/cereal/" {} \;
diff --git a/Src/External/cereal/scripts/updatecoverage.sh b/Src/External/cereal/scripts/updatecoverage.sh
new file mode 100755
index 0000000..a3ec4ad
--- /dev/null
+++ b/Src/External/cereal/scripts/updatecoverage.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# Updates the coverage documentation, and copies it into the appropriate place
+# in the gh-pages-develop branch.
+#   $1 from CMAKE will contain the root directory of cereal
+
+# this requires lcov 1.10 or newer
+
+set -e
+
+COVERAGE_TESTS=./coverage_*
+
+# run tests
+for f in $COVERAGE_TESTS
+  do
+    echo $f
+    $f
+  done
+
+# build coverage output
+tempdir=`mktemp -d`
+
+lcov --capture --directory $1 --output-file coverage.info --no-external
+lcov --remove coverage.info '*/external/*' 'cereal/details/util.hpp' 'sandbox/*' 'unittests/*' -o coverage.info
+genhtml --demangle-cpp coverage.info --output-directory ${tempdir}
+
+# copy over to gh pages
+git checkout gh-pages-develop
+
+rm -rf $1/assets/coverage
+mkdir $1/assets/coverage
+cp -r ${tempdir}/* $1/assets/coverage/
+rm -rf ${tempdir}
diff --git a/Src/External/cereal/scripts/updatedoc.in b/Src/External/cereal/scripts/updatedoc.in
new file mode 100755
index 0000000..7f6a4a6
--- /dev/null
+++ b/Src/External/cereal/scripts/updatedoc.in
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Updates the doxygen documentation, and copies it into the appropriate place
+# in the gh-pages branch.
+
+set -e
+
+tempdir=`mktemp -d`
+branch=`git rev-parse --abbrev-ref HEAD`
+
+cp -r @PROJECT_BINARY_DIR@/doc/html/ ${tempdir}
+
+git stash
+git checkout gh-pages-develop
+
+rm -rf @PROJECT_SOURCE_DIR@/assets/doxygen
+mkdir @PROJECT_SOURCE_DIR@/assets/doxygen
+cp -r ${tempdir}/html/* @PROJECT_SOURCE_DIR@/assets/doxygen/
+
+rm -rf ${tempdir}
+
+git commit @PROJECT_SOURCE_DIR@/assets/doxygen
+
+git checkout ${branch}
+git stash apply
diff --git a/Src/External/cereal/unittests/CMakeLists.txt b/Src/External/cereal/unittests/CMakeLists.txt
new file mode 100644
index 0000000..b7a769b
--- /dev/null
+++ b/Src/External/cereal/unittests/CMakeLists.txt
@@ -0,0 +1,92 @@
+file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+
+# A semi-colon separated list of test sources that should not be automatically built with doctest 
+set(SPECIAL_TESTS "portability_test.cpp")
+
+if(CMAKE_VERSION VERSION_LESS 2.8)
+  # Portability test uses the `TARGET_FILE_DIR` generator expression which is available from CMake 2.8.
+  set(SKIP_PORTABILITY_TEST ON)
+endif()
+
+if(NOT SKIP_PORTABILITY_TEST)
+  # Build the portability test only if we are on a 64-bit machine (void* is 8 bytes)
+  if((${CMAKE_SIZEOF_VOID_P} EQUAL 8))
+    if(NOT MSVC)
+      add_executable(portability_test32 portability_test.cpp)
+      set_target_properties(portability_test32 PROPERTIES COMPILE_FLAGS "-m32")
+      set_target_properties(portability_test32 PROPERTIES LINK_FLAGS "-m32")
+    endif()
+
+    add_executable(portability_test64 portability_test.cpp)
+
+    add_test(NAME portability_test
+            COMMAND ${CMAKE_COMMAND}
+              -DPORTABILITY_TEST_DIR=$<TARGET_FILE_DIR:portability_test64>
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/run_portability_test.cmake")
+
+  elseif(MSVC)
+    add_executable(portability_test32 portability_test.cpp)
+  endif()
+endif()
+
+# Build all of the non-special tests
+foreach(TEST_SOURCE ${TESTS})
+
+  string(REPLACE ".cpp" "" TEST_TARGET "${TEST_SOURCE}")
+  set(TEST_TARGET "test_${TEST_TARGET}")
+
+  # Check to see if our target is listed in "SPECIAL_TESTS"
+  list(FIND SPECIAL_TESTS "${TEST_SOURCE}" IS_SPECIAL_TEST)
+
+  if(IS_SPECIAL_TEST EQUAL -1)
+
+    add_executable(${TEST_TARGET} ${TEST_SOURCE})
+    target_link_libraries(${TEST_TARGET} ${CEREAL_THREAD_LIBS})
+    add_test("${TEST_TARGET}" "${TEST_TARGET}")
+
+    # If we are on a 64-bit machine, create an extra 32-bit version of the test if portability testing is enabled
+    if((NOT MSVC) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST))
+      add_executable(${TEST_TARGET}_32 ${TEST_SOURCE})
+      set_target_properties(${TEST_TARGET}_32 PROPERTIES
+        COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+      add_test("${TEST_TARGET}_32" "${TEST_TARGET}_32")
+    endif()
+
+  endif()
+
+endforeach()
+
+# Add the valgrind target
+if(NOT MSVC)
+  add_custom_target(valgrind
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_valgrind.sh")
+
+  # Add the coverage target
+  add_custom_target(coverage)
+  add_custom_command(TARGET coverage
+    COMMAND "${CMAKE_SOURCE_DIR}/scripts/updatecoverage.sh" ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/coverage")
+
+  # add tests to coverage
+  foreach(TEST_SOURCE ${TESTS})
+    string(REPLACE ".cpp" "" COVERAGE_TARGET "${TEST_SOURCE}")
+    set(COVERAGE_TARGET "coverage_${COVERAGE_TARGET}")
+
+    # Check to see if our target is listed in "SPECIAL_TESTS"
+    list(FIND SPECIAL_TESTS "${TEST_SOURCE}" IS_SPECIAL_TEST)
+
+    if(IS_SPECIAL_TEST EQUAL -1)
+      add_dependencies(coverage ${COVERAGE_TARGET})
+
+      add_executable(${COVERAGE_TARGET} EXCLUDE_FROM_ALL ${TEST_SOURCE})
+      set_target_properties(${COVERAGE_TARGET} PROPERTIES COMPILE_FLAGS "-coverage")
+      set_target_properties(${COVERAGE_TARGET} PROPERTIES LINK_FLAGS "-coverage")
+      set_target_properties(${COVERAGE_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/coverage")
+      target_link_libraries(${COVERAGE_TARGET} ${CEREAL_THREAD_LIBS})
+    endif()
+  endforeach()
+endif(NOT MSVC)
+
+if(NOT CMAKE_VERSION VERSION_LESS 3.0)
+  add_test(test_cmake_config_module ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake-config-module.cmake)
+endif()
diff --git a/Src/External/cereal/unittests/array.cpp b/Src/External/cereal/unittests/array.cpp
new file mode 100644
index 0000000..5cd1c39
--- /dev/null
+++ b/Src/External/cereal/unittests/array.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "array.hpp"
+
+TEST_SUITE("array");
+
+TEST_CASE("binary_array")
+{
+  test_array<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_array")
+{
+  test_array<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_array")
+{
+  test_array<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_array")
+{
+  test_array<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/array.hpp b/Src/External/cereal/unittests/array.hpp
new file mode 100644
index 0000000..766225b
--- /dev/null
+++ b/Src/External/cereal/unittests/array.hpp
@@ -0,0 +1,95 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_ARRAY_H_
+#define CEREAL_TEST_ARRAY_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_array()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::array<int, 100> o_podarray;
+    for(auto & elem : o_podarray)
+      elem = random_value<int>(gen);
+
+    std::array<StructInternalSerialize, 100> o_iserarray;
+    for(auto & elem : o_iserarray)
+      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::array<StructInternalSplit, 100> o_isplarray;
+    for(auto & elem : o_isplarray)
+      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::array<StructExternalSerialize, 100> o_eserarray;
+    for(auto & elem : o_eserarray)
+      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::array<StructExternalSplit, 100> o_esplarray;
+    for(auto & elem : o_esplarray)
+      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podarray);
+      oar(o_iserarray);
+      oar(o_isplarray);
+      oar(o_eserarray);
+      oar(o_esplarray);
+    }
+
+    std::array<int, 100> i_podarray;
+    std::array<StructInternalSerialize, 100> i_iserarray;
+    std::array<StructInternalSplit, 100>     i_isplarray;
+    std::array<StructExternalSerialize, 100> i_eserarray;
+    std::array<StructExternalSplit, 100>     i_esplarray;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podarray);
+      iar(i_iserarray);
+      iar(i_isplarray);
+      iar(i_eserarray);
+      iar(i_esplarray);
+    }
+
+    check_collection( i_podarray, o_podarray );
+    check_collection( i_iserarray, o_iserarray );
+    check_collection( i_isplarray, o_isplarray );
+    check_collection( i_eserarray, o_eserarray );
+    check_collection( i_esplarray, o_esplarray );
+  }
+}
+
+#endif // CEREAL_TEST_ARRAY_H_
diff --git a/Src/External/cereal/unittests/basic_string.cpp b/Src/External/cereal/unittests/basic_string.cpp
new file mode 100644
index 0000000..245530e
--- /dev/null
+++ b/Src/External/cereal/unittests/basic_string.cpp
@@ -0,0 +1,171 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "basic_string.hpp"
+
+TEST_SUITE("basic_string");
+
+TEST_CASE("binary_string")
+{
+  test_string_all<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_string")
+{
+  test_string_all<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_string_basic")
+{
+  test_string_basic<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_string_basic")
+{
+  test_string_basic<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+template <class IArchive, class OArchive, class Out, class In = Out>
+void test_ws_in_out(Out const & o_value_with_ws)
+{
+  std::ostringstream os;
+  {
+    OArchive oar(os);
+    oar(o_value_with_ws);
+  }
+
+  In i_value_with_ws;
+
+  std::istringstream is(os.str());
+  {
+    IArchive iar(is);
+    iar(i_value_with_ws);
+  }
+
+  CHECK(i_value_with_ws == o_value_with_ws);
+}
+
+TEST_CASE("xml_string_issue109")
+{
+  char strings[][20] = {
+    "some text",
+    "some text ",
+    " some text",
+    " some text ",
+    "  ",
+    "    text    ",
+    " ]]> ",
+    " &gt; > ]]> ",
+    " < <]>] &lt; ",
+    " &amp; &   "
+  };
+
+  for( size_t i=0; i<( sizeof( strings ) / sizeof( strings[0] ) ); ++i )
+  {
+    std::basic_string<char> o_string = strings[i];
+
+    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( o_string );
+  }
+}
+
+TEST_CASE("xml_char_issue109")
+{
+  uint8_t chars[] = {
+    ' ',
+    '\t',
+    '\n',
+    '\r',
+    '&',
+    '>',
+    '<',
+    '\'',
+    '"',
+    '!',
+    '|'
+  };
+
+  for( size_t i=0; i<( sizeof( chars ) / sizeof( chars[0] ) ); ++i )
+  {
+    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( chars[i] );
+  }
+
+  for( size_t i=0; i<( sizeof( chars ) / sizeof( chars[0] ) ); ++i )
+  {
+    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( int8_t( chars[i] ) );
+  }
+
+  for( size_t i=0; i<( sizeof( chars ) / sizeof( chars[0] ) ); ++i )
+  {
+    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( char( chars[i] ) );
+  }
+}
+
+template <class IArchive, class OArchive, class Out, size_t Nb, class In = Out>
+void test_ws_in_out_array(Out const (&o_a_value_with_ws)[Nb])
+{
+    std::ostringstream os;
+    {
+        OArchive oar(os);
+        for (const auto& o_value_with_ws : o_a_value_with_ws)
+        {
+            oar(o_value_with_ws);
+        }
+    }
+
+    In i_a_value_with_ws[Nb];
+
+    std::istringstream is(os.str());
+    {
+        IArchive iar(is);
+        for (In& i_value_with_ws : i_a_value_with_ws)
+        {
+            iar(i_value_with_ws);
+        }
+    }
+
+    for (size_t uiIndex = 0; uiIndex < Nb; ++uiIndex)
+    {
+        CHECK(i_a_value_with_ws[uiIndex] == o_a_value_with_ws[uiIndex]);
+    }
+}
+
+TEST_CASE("xml_string_issue_consecutive_calls")
+{
+    std::string strings[] = {
+        "some text",
+        " some text",
+        " some text ",
+        "Long text without ws at the end",
+        "some text ",
+        " some text",
+        " some text ",
+    };
+
+    test_ws_in_out_array<cereal::XMLInputArchive, cereal::XMLOutputArchive>(strings);
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/basic_string.hpp b/Src/External/cereal/unittests/basic_string.hpp
new file mode 100644
index 0000000..5ee37aa
--- /dev/null
+++ b/Src/External/cereal/unittests/basic_string.hpp
@@ -0,0 +1,114 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_BASIC_STRING_H_
+#define CEREAL_TEST_BASIC_STRING_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_string_basic()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(size_t i=0; i<100; ++i)
+  {
+    std::basic_string<char> o_string  = random_basic_string<char>(gen);
+    std::basic_string<char> o_string2 = "";
+    std::basic_string<char> o_string3;
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+      oar(o_string);
+      oar(o_string2);
+      oar(o_string3);
+    }
+
+    std::basic_string<char> i_string;
+    std::basic_string<char> i_string2;
+    std::basic_string<char> i_string3;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_string);
+      iar(i_string2);
+      iar(i_string3);
+    }
+
+    CHECK_EQ(i_string, o_string);
+    CHECK_EQ(i_string2, o_string2);
+    CHECK_EQ(i_string3, o_string3);
+  }
+}
+
+template <class IArchive, class OArchive> inline
+void test_string_all()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(size_t i=0; i<100; ++i)
+  {
+    std::basic_string<char> o_string        = random_basic_string<char>(gen);
+    std::basic_string<wchar_t> o_wstring    = random_basic_string<wchar_t>(gen);
+    std::basic_string<char16_t> o_u16string = random_basic_string<char16_t>(gen);
+    std::basic_string<char32_t> o_u32string = random_basic_string<char32_t>(gen);
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+      oar(o_string);
+      oar(o_wstring);
+      oar(o_u16string);
+      oar(o_u32string);
+    }
+
+    std::basic_string<char> i_string;
+    std::basic_string<wchar_t> i_wstring;
+    std::basic_string<char16_t> i_u16string;
+    std::basic_string<char32_t> i_u32string;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_string);
+      iar(i_wstring);
+      iar(i_u16string);
+      iar(i_u32string);
+    }
+
+    CHECK_EQ(i_string, o_string);
+    check_collection( i_wstring, o_wstring );
+    check_collection( i_u16string, o_u16string );
+    check_collection( i_u32string, o_u32string );
+  }
+}
+
+#endif // CEREAL_TEST_BASIC_STRING_H_
diff --git a/Src/External/cereal/unittests/bitset.cpp b/Src/External/cereal/unittests/bitset.cpp
new file mode 100644
index 0000000..912c22c
--- /dev/null
+++ b/Src/External/cereal/unittests/bitset.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "bitset.hpp"
+
+TEST_SUITE("bitset");
+
+TEST_CASE("binary_bitset")
+{
+  test_bitset<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_bitset")
+{
+  test_bitset<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_bitset")
+{
+  test_bitset<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_bitset")
+{
+  test_bitset<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/bitset.hpp b/Src/External/cereal/unittests/bitset.hpp
new file mode 100644
index 0000000..09f597c
--- /dev/null
+++ b/Src/External/cereal/unittests/bitset.hpp
@@ -0,0 +1,87 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_BITSET_H_
+#define CEREAL_TEST_BITSET_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_bitset()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rng32  = [&](){ return random_binary_string<32>( gen ); };
+  auto rng65  = [&](){ return random_binary_string<65>( gen ); };
+  auto rng256 = [&](){ return random_binary_string<256>( gen ); };
+  auto rng512 = [&](){ return random_binary_string<512>( gen ); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::bitset<32> o_bit32( rng32() );
+    std::bitset<65> o_bit65( rng65() );
+    std::bitset<256> o_bit256( rng256() );
+    std::bitset<512> o_bit512( rng512() );
+    std::bitset<32>  o_bit32_low( 0 );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_bit32);
+      oar(o_bit65);
+      oar(o_bit256);
+      oar(o_bit512);
+      oar(o_bit32_low);
+    }
+
+    std::bitset<32>  i_bit32;
+    std::bitset<65>  i_bit65;
+    std::bitset<256> i_bit256;
+    std::bitset<512> i_bit512;
+    std::bitset<32>  i_bit32_low( 0xffffffff );
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_bit32);
+      iar(i_bit65);
+      iar(i_bit256);
+      iar(i_bit512);
+      iar(i_bit32_low);
+    }
+
+    CHECK_EQ( o_bit32, i_bit32 );
+    CHECK_EQ( o_bit65, i_bit65 );
+    CHECK_EQ( o_bit256, i_bit256 );
+    CHECK_EQ( o_bit512, i_bit512 );
+
+    CHECK_EQ( o_bit32_low, i_bit32_low );
+  }
+}
+
+#endif // CEREAL_TEST_BITSET_H_
diff --git a/Src/External/cereal/unittests/boost_variant.cpp b/Src/External/cereal/unittests/boost_variant.cpp
new file mode 100644
index 0000000..7e073b8
--- /dev/null
+++ b/Src/External/cereal/unittests/boost_variant.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2015, Kyle Fleming
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "boost_variant.hpp"
+
+TEST_SUITE("boost_variant");
+
+TEST_CASE("binary_boost_variant")
+{
+  test_boost_variant<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_boost_variant")
+{
+  test_boost_variant<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_boost_variant")
+{
+  test_boost_variant<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_boost_variant")
+{
+  test_boost_variant<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/boost_variant.hpp b/Src/External/cereal/unittests/boost_variant.hpp
new file mode 100644
index 0000000..bedb6a8
--- /dev/null
+++ b/Src/External/cereal/unittests/boost_variant.hpp
@@ -0,0 +1,70 @@
+/*
+  Copyright (c) 2015, Kyle Fleming
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_BOOST_VARIANT_H_
+#define CEREAL_TEST_BOOST_VARIANT_H_
+
+#include "common.hpp"
+#include <cereal/types/boost_variant.hpp>
+
+template <class IArchive, class OArchive> inline
+void test_boost_variant()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  boost::variant<int, double, std::string> o_bv1 = random_value<int>(gen);
+  boost::variant<int, double, std::string> o_bv2 = random_value<double>(gen);
+  boost::variant<int, double, std::string> o_bv3 = random_basic_string<char>(gen);
+
+  std::ostringstream os;
+  {
+    OArchive oar(os);
+
+    oar(o_bv1);
+    oar(o_bv2);
+    oar(o_bv3);
+  }
+
+  decltype(o_bv1) i_bv1;
+  decltype(o_bv2) i_bv2;
+  decltype(o_bv3) i_bv3;
+
+  std::istringstream is(os.str());
+  {
+    IArchive iar(is);
+
+    iar(i_bv1);
+    iar(i_bv2);
+    iar(i_bv3);
+  }
+
+  CHECK_EQ( boost::get<int>(i_bv1), boost::get<int>(o_bv1) );
+  CHECK_EQ( boost::get<double>(i_bv2), doctest::Approx(boost::get<double>(o_bv2)).epsilon(1e-5) );
+  CHECK_EQ( boost::get<std::string>(i_bv3), boost::get<std::string>(o_bv3) );
+}
+
+#endif // CEREAL_TEST_BOOST_VARIANT_H_
diff --git a/Src/External/cereal/unittests/chrono.cpp b/Src/External/cereal/unittests/chrono.cpp
new file mode 100644
index 0000000..b175dec
--- /dev/null
+++ b/Src/External/cereal/unittests/chrono.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "chrono.hpp"
+
+TEST_SUITE("chrono");
+
+TEST_CASE("binary_chrono")
+{
+  test_chrono<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_chrono")
+{
+  test_chrono<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_chrono")
+{
+  test_chrono<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_chrono")
+{
+  test_chrono<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/chrono.hpp b/Src/External/cereal/unittests/chrono.hpp
new file mode 100644
index 0000000..3e66623
--- /dev/null
+++ b/Src/External/cereal/unittests/chrono.hpp
@@ -0,0 +1,105 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_CHRONO_H_
+#define CEREAL_TEST_CHRONO_H_
+
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_chrono()
+{
+  for(int ii=0; ii<100; ++ii)
+  {
+    auto o_timePoint1 = std::chrono::system_clock::now();
+    #ifndef CEREAL_OLDER_GCC
+    auto o_timePoint2 = std::chrono::steady_clock::now();
+    #endif // CEREAL_OLDER_GCC
+    auto o_timePoint3 = std::chrono::high_resolution_clock::now();
+
+    auto o_duration1 = std::chrono::system_clock::now() - o_timePoint1;
+    #ifndef CEREAL_OLDER_GCC
+    auto o_duration2 = std::chrono::steady_clock::now() - o_timePoint2;
+    #endif // CEREAL_OLDER_GCC
+    auto o_duration3 = std::chrono::high_resolution_clock::now() - o_timePoint3;
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_timePoint1);
+      #ifndef CEREAL_OLDER_GCC
+      oar(o_timePoint2);
+      #endif // CEREAL_OLDER_GCC
+      oar(o_timePoint3);
+      oar(o_duration1);
+      #ifndef CEREAL_OLDER_GCC
+      oar(o_duration2);
+      #endif // CEREAL_OLDER_GCC
+      oar(o_duration3);
+    }
+
+    decltype(o_timePoint1) i_timePoint1;
+    #ifndef CEREAL_OLDER_GCC
+    decltype(o_timePoint2) i_timePoint2;
+    #endif // CEREAL_OLDER_GCC
+    decltype(o_timePoint3) i_timePoint3;
+    decltype(o_duration1) i_duration1;
+    #ifndef CEREAL_OLDER_GCC
+    decltype(o_duration2) i_duration2;
+    #endif // CEREAL_OLDER_GCC
+    decltype(o_duration3) i_duration3;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_timePoint1);
+      #ifndef CEREAL_OLDER_GCC
+      iar(i_timePoint2);
+      #endif // CEREAL_OLDER_GCC
+      iar(i_timePoint3);
+      iar(i_duration1);
+      #ifndef CEREAL_OLDER_GCC
+      iar(i_duration2);
+      #endif // CEREAL_OLDER_GCC
+      iar(i_duration3);
+    }
+
+    CHECK_EQ( o_timePoint1, i_timePoint1 );
+    #ifndef CEREAL_OLDER_GCC
+    CHECK_EQ( o_timePoint2, i_timePoint2 );
+    #endif // CEREAL_OLDER_GCC
+    CHECK_EQ( o_timePoint3, i_timePoint3 );
+    CHECK_EQ( o_duration1, i_duration1 );
+    #ifndef CEREAL_OLDER_GCC
+    CHECK_EQ( o_duration2, i_duration2 );
+    #endif // CEREAL_OLDER_GCC
+    CHECK_EQ( o_duration3, i_duration3 );
+  }
+}
+
+#endif // CEREAL_TEST_CHRONO_H_
diff --git a/Src/External/cereal/unittests/cmake-config-module.cmake b/Src/External/cereal/unittests/cmake-config-module.cmake
new file mode 100644
index 0000000..1b2f464
--- /dev/null
+++ b/Src/External/cereal/unittests/cmake-config-module.cmake
@@ -0,0 +1,123 @@
+if(CMAKE_VERSION LESS 3.0)
+  message(FATAL_ERROR "Cereal can't be installed with CMake < 3.0")
+endif()
+
+get_filename_component(BINARY_DIR ${CMAKE_CURRENT_LIST_DIR}/../build ABSOLUTE)
+get_filename_component(INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/../out ABSOLUTE)
+
+# cmake configure step for cereal
+file(MAKE_DIRECTORY ${BINARY_DIR}/cereal)
+execute_process(
+  COMMAND ${CMAKE_COMMAND}
+    -DJUST_INSTALL_CEREAL=1
+    -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
+    ${CMAKE_CURRENT_LIST_DIR}/..
+  WORKING_DIRECTORY ${BINARY_DIR}/cereal
+  RESULT_VARIABLE result
+)
+if(result)
+  message(FATAL_ERROR "Cereal cmake configure-step failed")
+endif()
+
+# cmake install cereal
+execute_process(
+  COMMAND ${CMAKE_COMMAND}
+    --build ${BINARY_DIR}/cereal
+    --target install
+  RESULT_VARIABLE result
+)
+if(result)
+  message(FATAL_ERROR "Cereal cmake install-step failed")
+endif()
+
+# create test project sources
+file(WRITE ${BINARY_DIR}/test_source/CMakeLists.txt "
+  cmake_minimum_required(VERSION ${CMAKE_VERSION})
+  project(cereal-test-config-module)
+  if(NOT MSVC)
+      if(CMAKE_VERSION VERSION_LESS 3.1)
+          set(CMAKE_CXX_FLAGS \"-std=c++11 \${CMAKE_CXX_FLAGS}\")
+      else()
+          set(CMAKE_CXX_STANDARD 11)
+          set(CMAKE_CXX_STANDARD_REQUIRED ON)
+      endif()
+  endif()
+  find_package(cereal REQUIRED)
+  add_executable(cereal-test-config-module main.cpp)
+  target_link_libraries(cereal-test-config-module cereal)
+  enable_testing()
+  add_test(test-cereal-test-config-module cereal-test-config-module)
+")
+file(WRITE ${BINARY_DIR}/test_source/main.cpp "
+  #include <cereal/archives/binary.hpp>
+  #include <sstream>
+  #include <cstdlib>
+  struct MyData
+  {
+    int x = 0, y = 0, z = 0;
+    void set() { x = 1; y = 2; z = 3; }
+    bool is_set() const { return x == 1 && y == 2 && z == 3; }
+
+    // This method lets cereal know which data members to serialize
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+      archive( x, y, z ); // serialize things by passing them to the archive
+    }
+  };
+  int main()
+  {
+    std::stringstream ss; // any stream can be used
+
+    {
+      cereal::BinaryOutputArchive oarchive(ss); // Create an output archive
+
+      MyData m1, m2, m3;
+      m1.set();
+      m2.set();
+      m3.set();
+      oarchive(m1, m2, m3); // Write the data to the archive
+    }
+
+    {
+      cereal::BinaryInputArchive iarchive(ss); // Create an input archive
+
+      MyData m1, m2, m3;
+      iarchive(m1, m2, m3); // Read the data from the archive
+
+      return (m1.is_set() && m2.is_set() && m3.is_set())
+      ? EXIT_SUCCESS : EXIT_FAILURE;
+    }
+  }"
+)
+file(MAKE_DIRECTORY ${BINARY_DIR}/test)
+execute_process(
+  COMMAND ${CMAKE_COMMAND}
+    -DCMAKE_PREFIX_PATH=${INSTALL_DIR}
+    ${BINARY_DIR}/test_source
+  WORKING_DIRECTORY ${BINARY_DIR}/test
+  RESULT_VARIABLE result
+)
+if(result)
+  message(FATAL_ERROR "Test cmake configure-step failed")
+endif()
+
+# cmake install cereal
+execute_process(
+  COMMAND ${CMAKE_COMMAND}
+    --build ${BINARY_DIR}/test
+  RESULT_VARIABLE result
+)
+if(result)
+  message(FATAL_ERROR "Test cmake build-step failed")
+endif()
+
+execute_process(
+  COMMAND ${CMAKE_CTEST_COMMAND}
+  WORKING_DIRECTORY ${BINARY_DIR}/test
+  RESULT_VARIABLE result
+)
+
+if(result)
+  message(FATAL_ERROR "Test run failed")
+endif()
diff --git a/Src/External/cereal/unittests/common.hpp b/Src/External/cereal/unittests/common.hpp
new file mode 100644
index 0000000..5376d0a
--- /dev/null
+++ b/Src/External/cereal/unittests/common.hpp
@@ -0,0 +1,223 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_COMMON_H_
+#define CEREAL_TEST_COMMON_H_
+
+#include <cereal/types/memory.hpp>
+#include <cereal/types/array.hpp>
+#include <cereal/types/valarray.hpp>
+#include <cereal/types/vector.hpp>
+#include <cereal/types/deque.hpp>
+#include <cereal/types/forward_list.hpp>
+#include <cereal/types/list.hpp>
+#include <cereal/types/string.hpp>
+#include <cereal/types/map.hpp>
+#include <cereal/types/queue.hpp>
+#include <cereal/types/set.hpp>
+#include <cereal/types/stack.hpp>
+#include <cereal/types/unordered_map.hpp>
+#include <cereal/types/unordered_set.hpp>
+#include <cereal/types/utility.hpp>
+#include <cereal/types/tuple.hpp>
+#include <cereal/types/bitset.hpp>
+#include <cereal/types/complex.hpp>
+#include <cereal/types/chrono.hpp>
+#include <cereal/types/polymorphic.hpp>
+
+#include <cereal/archives/binary.hpp>
+#include <cereal/archives/portable_binary.hpp>
+#include <cereal/archives/xml.hpp>
+#include <cereal/archives/json.hpp>
+#include <limits>
+#include <random>
+
+#include "doctest.h"
+
+namespace std
+{
+  // Ostream overload for std::pair
+  template<class F, class S> inline
+  ::std::ostream & operator<<(::std::ostream & os, ::std::pair<F, S> const & p)
+  {
+    os << "([" << p.first << "], [" << p.second << "])";
+    return os;
+  }
+}
+
+// Checks that collections have equal size and all elements are the same
+template <class T> inline
+void check_collection( T const & a, T const & b )
+{
+  auto aIter = std::begin(a);
+  auto aEnd  = std::end(a);
+  auto bIter = std::begin(b);
+  auto bEnd  = std::end(b);
+
+  CHECK_EQ( std::distance(aIter, aEnd), std::distance(bIter, bEnd) );
+
+  for( ; aIter != aEnd; ++aIter, ++bIter )
+    CHECK_EQ( *aIter, *bIter );
+}
+
+// Random Number Generation ===============================================
+template<class T> inline
+typename std::enable_if<std::is_floating_point<T>::value, T>::type
+random_value(std::mt19937 & gen)
+{ return std::uniform_real_distribution<T>(-10000.0, 10000.0)(gen); }
+
+template<class T> inline
+typename std::enable_if<std::is_integral<T>::value && sizeof(T) != sizeof(char), T>::type
+random_value(std::mt19937 & gen)
+{ return std::uniform_int_distribution<T>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen); }
+
+template<class T> inline
+typename std::enable_if<std::is_integral<T>::value && sizeof(T) == sizeof(char), T>::type
+random_value(std::mt19937 & gen)
+{ return static_cast<T>( std::uniform_int_distribution<int64_t>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen) ); }
+
+template<class T> inline
+typename std::enable_if<std::is_same<T, std::string>::value, std::string>::type
+random_value(std::mt19937 & gen)
+{
+  std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
+  for(char & c : s)
+    c = static_cast<char>( std::uniform_int_distribution<int>( 'A', 'Z' )(gen) );
+  return s;
+}
+
+template<class C> inline
+std::basic_string<C> random_basic_string(std::mt19937 & gen)
+{
+  std::basic_string<C> s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
+  for(C & c : s)
+    c = static_cast<C>( std::uniform_int_distribution<int>( 'A', 'Z' )(gen) );
+  return s;
+}
+
+template <size_t N> inline
+std::string random_binary_string(std::mt19937 & gen)
+{
+  std::string s(N, ' ');
+  for(auto & c : s )
+     c = static_cast<char>( std::uniform_int_distribution<int>( '0', '1' )(gen) );
+  return s;
+}
+
+// Generic struct useful for testing many serialization functions
+struct StructBase
+{
+  StructBase() {}
+  StructBase( int xx, int yy ) : x( xx ), y( yy ) {}
+  int x, y;
+  bool operator==(StructBase const & other) const
+  { return x == other.x && y == other.y; }
+  bool operator!=(StructBase const & other) const
+  { return x != other.x || y != other.y; }
+  bool operator<(StructBase const & other) const
+  {
+    if (x < other.x) return true;
+    else if(other.x < x) return false;
+    else return (y < other.y);
+  }
+};
+
+inline std::ostream& operator<<(std::ostream& os, StructBase const & s)
+{
+    os << "[x: " << s.x << " y: " << s.y << "]";
+    return os;
+}
+
+struct StructInternalSerialize : StructBase
+{
+  StructInternalSerialize() : StructBase{0,0} {}
+  StructInternalSerialize(int x_, int y_) : StructBase{x_,y_} {}
+  template<class Archive>
+    void serialize(Archive & ar)
+    {
+      ar(x, y);
+    }
+};
+
+struct StructInternalSplit : StructBase
+{
+  StructInternalSplit() : StructBase{0,0} {}
+  StructInternalSplit(int x_, int y_) : StructBase{x_,y_} {}
+  template<class Archive>
+    void save(Archive & ar) const
+    {
+      ar(x, y);
+    }
+
+  template<class Archive>
+    void load(Archive & ar)
+    {
+      ar(x, y);
+    }
+};
+
+struct StructExternalSerialize : StructBase
+{
+  StructExternalSerialize() : StructBase{0,0} {}
+  StructExternalSerialize(int x_, int y_) : StructBase{x_,y_} {}
+};
+
+template<class Archive>
+void serialize(Archive & ar, StructExternalSerialize & s)
+{
+  ar(s.x, s.y);
+}
+
+struct StructExternalSplit : StructBase
+{
+  StructExternalSplit() : StructBase{0,0} {}
+  StructExternalSplit(int x_, int y_) : StructBase{x_,y_} {}
+};
+
+template<class Archive> inline
+void save(Archive & ar, StructExternalSplit const & s)
+{
+  ar(s.x, s.y);
+}
+
+template<class Archive> inline
+void load(Archive & ar, StructExternalSplit & s)
+{
+  ar(s.x, s.y);
+}
+
+template<class T>
+struct StructHash {
+  public:
+    size_t operator()(const T & s) const
+    {
+      size_t h1 = std::hash<int>()(s.x);
+      size_t h2 = std::hash<int>()(s.y);
+      return h1 ^ ( h2 << 1 );
+    }
+};
+
+#endif // CEREAL_TEST_COMMON_H_
diff --git a/Src/External/cereal/unittests/complex.cpp b/Src/External/cereal/unittests/complex.cpp
new file mode 100644
index 0000000..168d103
--- /dev/null
+++ b/Src/External/cereal/unittests/complex.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "complex.hpp"
+
+TEST_SUITE("complex");
+
+TEST_CASE("binary_complex")
+{
+  test_complex<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_complex")
+{
+  test_complex<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_complex")
+{
+  test_complex<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_complex")
+{
+  test_complex<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/complex.hpp b/Src/External/cereal/unittests/complex.hpp
new file mode 100644
index 0000000..ebd7e35
--- /dev/null
+++ b/Src/External/cereal/unittests/complex.hpp
@@ -0,0 +1,77 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_COMPLEX_H_
+#define CEREAL_TEST_COMPLEX_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_complex()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rngF = [&](){ return random_value<float>(gen); };
+  auto rngD = [&](){ return random_value<double>(gen); };
+  auto rngLD = [&](){ return random_value<long double>(gen); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::complex<float> o_float( rngF(), rngF() );
+    std::complex<double> o_double( rngD(), rngD() );
+    std::complex<long double> o_ldouble( rngLD(), rngLD() );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_float);
+      oar(o_double);
+      oar(o_ldouble);
+    }
+
+    std::complex<float> i_float;
+    std::complex<double> i_double;
+    std::complex<long double> i_ldouble;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_float);
+      iar(i_double);
+      iar(i_ldouble);
+    }
+
+    CHECK_EQ( o_float, i_float );
+    CHECK_EQ( o_double.real(), doctest::Approx(i_double.real()).epsilon(1e-5) );
+    CHECK_EQ( o_double.imag(), doctest::Approx(i_double.imag()).epsilon(1e-5) );
+    CHECK_EQ( o_ldouble.real(), doctest::Approx(i_ldouble.real()).epsilon(1e-5L) );
+    CHECK_EQ( o_ldouble.imag(), doctest::Approx(i_ldouble.imag()).epsilon(1e-5L) );
+  }
+}
+
+#endif // CEREAL_TEST_COMPLEX_H_
diff --git a/Src/External/cereal/unittests/deque.cpp b/Src/External/cereal/unittests/deque.cpp
new file mode 100644
index 0000000..cbfaea1
--- /dev/null
+++ b/Src/External/cereal/unittests/deque.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "deque.hpp"
+
+TEST_SUITE("deque");
+
+TEST_CASE("binary_dequeue")
+{
+  test_deque<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_dequeue")
+{
+  test_deque<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_dequeue")
+{
+  test_deque<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_dequeue")
+{
+  test_deque<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/deque.hpp b/Src/External/cereal/unittests/deque.hpp
new file mode 100644
index 0000000..b129a1e
--- /dev/null
+++ b/Src/External/cereal/unittests/deque.hpp
@@ -0,0 +1,101 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_DEQUE_H_
+#define CEREAL_TEST_DEQUE_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive>
+void test_deque()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::deque<int> o_poddeque(100);
+    for(auto & elem : o_poddeque)
+      elem = random_value<int>(gen);
+
+    std::deque<StructInternalSerialize> o_iserdeque(100);
+    for(auto & elem : o_iserdeque)
+      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::deque<StructInternalSplit> o_ispldeque(100);
+    for(auto & elem : o_ispldeque)
+      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::deque<StructExternalSerialize> o_eserdeque(100);
+    for(auto & elem : o_eserdeque)
+      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::deque<StructExternalSplit> o_espldeque(100);
+    for(auto & elem : o_espldeque)
+      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_poddeque);
+      oar(o_iserdeque);
+      oar(o_ispldeque);
+      oar(o_eserdeque);
+      oar(o_espldeque);
+    }
+
+    std::deque<int> i_poddeque;
+    std::deque<StructInternalSerialize> i_iserdeque;
+    std::deque<StructInternalSplit>     i_ispldeque;
+    std::deque<StructExternalSerialize> i_eserdeque;
+    std::deque<StructExternalSplit>     i_espldeque;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_poddeque);
+      iar(i_iserdeque);
+      iar(i_ispldeque);
+      iar(i_eserdeque);
+      iar(i_espldeque);
+    }
+
+    CHECK_EQ(i_poddeque.size(),  o_poddeque.size());
+    CHECK_EQ(i_iserdeque.size(), o_iserdeque.size());
+    CHECK_EQ(i_ispldeque.size(), o_ispldeque.size());
+    CHECK_EQ(i_eserdeque.size(), o_eserdeque.size());
+    CHECK_EQ(i_espldeque.size(), o_espldeque.size());
+
+    check_collection(i_poddeque,  o_poddeque );
+    check_collection(i_iserdeque, o_iserdeque);
+    check_collection(i_ispldeque, o_ispldeque);
+    check_collection(i_eserdeque, o_eserdeque);
+    check_collection(i_espldeque, o_espldeque);
+  }
+}
+
+#endif // CEREAL_TEST_DEQUE_H_
diff --git a/Src/External/cereal/unittests/doctest.h b/Src/External/cereal/unittests/doctest.h
new file mode 100644
index 0000000..2edf604
--- /dev/null
+++ b/Src/External/cereal/unittests/doctest.h
@@ -0,0 +1,3374 @@
+// ======================================================================
+// == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! ==
+// ======================================================================
+//
+// doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
+//
+// Copyright (c) 2016 Viktor Kirilov
+//
+// Distributed under the MIT Software License
+// See accompanying file LICENSE.txt or copy at
+// https://opensource.org/licenses/MIT
+//
+// The documentation can be found at the library's page:
+// https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md
+//
+// =================================================================================================
+// =================================================================================================
+// =================================================================================================
+//
+// The library is heavily influenced by Catch - https://github.com/philsquared/Catch
+// which uses the Boost Software License - Version 1.0
+// see here - https://github.com/philsquared/Catch/blob/master/LICENSE_1_0.txt
+//
+// The concept of subcases (sections in Catch) and expression decomposition are from there.
+// Some parts of the code are taken directly:
+// - stringification - the detection of "ostream& operator<<(ostream&, const T&)" and StringMaker<>
+// - the Approx() helper class for floating point comparison
+// - colors in the console
+// - breaking into a debugger
+//
+// The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest
+// which uses the Boost Software License - Version 1.0
+// see here - https://github.com/martinmoene/lest/blob/master/LICENSE_1_0.txt
+//
+// =================================================================================================
+// =================================================================================================
+// =================================================================================================
+
+// Suppress this globally (without push/pop) - there is no way to silence it in the
+// expression decomposition macros _Pragma() in macros doesn't work for the c++ front-end of g++
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69543
+// Also the warning is completely worthless nowadays - http://stackoverflow.com/questions/14016993
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic ignored "-Waggregate-return"
+#endif
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wpadded"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif // __clang__
+
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic push
+#endif // > gcc 4.6
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Weffc++"
+#pragma GCC diagnostic ignored "-Wstrict-overflow"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma GCC diagnostic ignored "-Winline"
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif // > gcc 4.6
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif // > gcc 4.7
+#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3)
+#pragma GCC diagnostic ignored "-Wuseless-cast"
+#endif // > gcc 5.3
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration
+#pragma warning(disable : 4706) // assignment within conditional expression
+#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif                          // _MSC_VER
+
+#ifndef DOCTEST_LIBRARY_INCLUDED
+#define DOCTEST_LIBRARY_INCLUDED
+
+#define DOCTEST_VERSION_MAJOR 1
+#define DOCTEST_VERSION_MINOR 1
+#define DOCTEST_VERSION_PATCH 2
+#define DOCTEST_VERSION_STR "1.1.2"
+
+#define DOCTEST_VERSION                                                                            \
+    (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
+
+// =================================================================================================
+// == MODERN C++ FEATURE DETECTION =================================================================
+// =================================================================================================
+
+#if __cplusplus >= 201103L
+#ifndef DOCTEST_CONFIG_WITH_NULLPTR
+#define DOCTEST_CONFIG_WITH_NULLPTR
+#endif // DOCTEST_CONFIG_WITH_NULLPTR
+#ifndef DOCTEST_CONFIG_WITH_LONG_LONG
+#define DOCTEST_CONFIG_WITH_LONG_LONG
+#endif // DOCTEST_CONFIG_WITH_LONG_LONG
+#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#endif // __cplusplus >= 201103L
+
+// nullptr
+
+#ifndef DOCTEST_CONFIG_WITH_NULLPTR
+#ifdef __clang__
+#if __has_feature(cxx_nullptr)
+#define DOCTEST_CONFIG_WITH_NULLPTR
+#endif // __has_feature(cxx_nullptr)
+#endif // __clang__
+
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define DOCTEST_CONFIG_WITH_NULLPTR
+#endif // __GNUC__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010
+#define DOCTEST_CONFIG_WITH_NULLPTR
+#endif // _MSC_VER
+#endif // DOCTEST_CONFIG_WITH_NULLPTR
+
+#if defined(DOCTEST_CONFIG_NO_NULLPTR) && defined(DOCTEST_CONFIG_WITH_NULLPTR)
+#undef DOCTEST_CONFIG_WITH_NULLPTR
+#endif // DOCTEST_CONFIG_NO_NULLPTR
+
+// long long
+
+#ifndef DOCTEST_CONFIG_WITH_LONG_LONG
+#if !defined(DOCTEST_CONFIG_WITH_LONG_LONG) && defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define DOCTEST_CONFIG_WITH_LONG_LONG
+#endif // _MSC_VER
+#endif // DOCTEST_CONFIG_WITH_LONG_LONG
+
+#if defined(DOCTEST_CONFIG_NO_LONG_LONG) && defined(DOCTEST_CONFIG_WITH_LONG_LONG)
+#undef DOCTEST_CONFIG_WITH_LONG_LONG
+#endif // DOCTEST_CONFIG_NO_LONG_LONG
+
+// static_assert
+
+#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#ifdef __clang__
+#if __has_feature(cxx_static_assert)
+#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#endif // __has_feature(cxx_static_assert)
+#endif // __clang__
+
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 3 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#endif // __GNUC__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010
+#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#endif // _MSC_VER
+#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
+
+#if defined(DOCTEST_CONFIG_NO_STATIC_ASSERT) && defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT)
+#undef DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#endif // DOCTEST_CONFIG_NO_STATIC_ASSERT
+
+#if defined(DOCTEST_CONFIG_WITH_NULLPTR) || defined(DOCTEST_CONFIG_WITH_LONG_LONG) ||              \
+        defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT)
+#define DOCTEST_NO_CPP11_COMPAT
+#endif // c++11 stuff
+
+#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT)
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT
+
+// =================================================================================================
+// == MODERN C++ FEATURE DETECTION END =============================================================
+// =================================================================================================
+
+// internal macros for string concatenation and anonymous variable name generation
+#define DOCTEST_CAT_IMPL(s1, s2) s1##s2
+#define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2)
+#ifdef __COUNTER__ // not standard and may be missing for some compilers
+#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __COUNTER__)
+#else // __COUNTER__
+#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__)
+#endif // __COUNTER__
+
+// macro for making a string out of an identifier
+#define DOCTEST_TOSTR_IMPL(x) #x
+#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x)
+
+// for concatenating literals and making the result a string
+#define DOCTEST_STR_CONCAT_TOSTR(s1, s2) DOCTEST_TOSTR(s1) DOCTEST_TOSTR(s2)
+
+// counts the number of elements in a C string
+#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0]))
+
+#ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
+#define DOCTEST_REF_WRAP(x) x&
+#else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
+#define DOCTEST_REF_WRAP(x) x
+#endif // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
+
+// not using __APPLE__ because... this is how Catch does it
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#define DOCTEST_PLATFORM_MAC
+#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#define DOCTEST_PLATFORM_IPHONE
+#elif defined(_WIN32) || defined(_MSC_VER)
+#define DOCTEST_PLATFORM_WINDOWS
+#else
+#define DOCTEST_PLATFORM_LINUX
+#endif
+
+#define DOCTEST_GCS() (*doctest::detail::getTestsContextState())
+
+// should probably take a look at https://github.com/scottt/debugbreak
+#ifdef DOCTEST_PLATFORM_MAC
+// The following code snippet based on:
+// http://cocoawithlove.com/2008/03/break-into-debugger.html
+#if defined(__ppc64__) || defined(__ppc__)
+#define DOCTEST_BREAK_INTO_DEBUGGER()                                                              \
+    __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" : : : "memory", "r0", "r3", "r4")
+#else // __ppc64__ || __ppc__
+#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :)
+#endif // __ppc64__ || __ppc__
+#elif defined(_MSC_VER)
+#define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak()
+#elif defined(__MINGW32__)
+extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+#define DOCTEST_BREAK_INTO_DEBUGGER() ::DebugBreak()
+#else // linux
+#define DOCTEST_BREAK_INTO_DEBUGGER() ((void)0)
+#endif // linux
+
+#define DOCTEST_BREAK_INTO_DEBUGGER_CHECKED()                                                      \
+    if(doctest::detail::isDebuggerActive() && !DOCTEST_GCS().no_breaks)                            \
+        DOCTEST_BREAK_INTO_DEBUGGER();
+
+#ifdef __clang__
+// to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier)
+#include <ciso646>
+#endif // __clang__
+
+#ifdef _LIBCPP_VERSION
+// not forward declaring ostream for libc++ because I had some problems (inline namespaces vs c++98)
+// so the <iosfwd> header is used - also it is very light and doesn't drag a ton of stuff
+#include <iosfwd>
+#else // _LIBCPP_VERSION
+#ifndef DOCTEST_CONFIG_USE_IOSFWD
+namespace std
+{
+template <class charT>
+struct char_traits;
+template <>
+struct char_traits<char>;
+template <class charT, class traits>
+class basic_ostream;
+typedef basic_ostream<char, char_traits<char> > ostream;
+}
+#else // DOCTEST_CONFIG_USE_IOSFWD
+#include <iosfwd>
+#endif // DOCTEST_CONFIG_USE_IOSFWD
+#endif // _LIBCPP_VERSION
+
+// static assert macro - because of the c++98 support requires that the message is an
+// identifier (no spaces and not a C string) - example without quotes: I_am_a_message
+// taken from here: http://stackoverflow.com/a/1980156/3162383
+#ifdef DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#define DOCTEST_STATIC_ASSERT(expression, message) static_assert(expression, #message)
+#else // DOCTEST_CONFIG_WITH_STATIC_ASSERT
+#define DOCTEST_STATIC_ASSERT(expression, message)                                                 \
+    struct DOCTEST_CAT(__static_assertion_at_line_, __LINE__)                                      \
+    {                                                                                              \
+        doctest::detail::static_assert_impl::StaticAssertion<static_cast<bool>((expression))>      \
+                DOCTEST_CAT(DOCTEST_CAT(DOCTEST_CAT(STATIC_ASSERTION_FAILED_AT_LINE_, __LINE__),   \
+                                        _),                                                        \
+                            message);                                                              \
+    };                                                                                             \
+    typedef doctest::detail::static_assert_impl::StaticAssertionTest<sizeof(                       \
+            DOCTEST_CAT(__static_assertion_at_line_, __LINE__))>                                   \
+            DOCTEST_CAT(__static_assertion_test_at_line_, __LINE__)
+#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
+
+#ifdef DOCTEST_CONFIG_WITH_NULLPTR
+#ifdef _LIBCPP_VERSION
+#include <cstddef>
+#else  // _LIBCPP_VERSION
+namespace std
+{ typedef decltype(nullptr) nullptr_t; }
+#endif // _LIBCPP_VERSION
+#endif // DOCTEST_CONFIG_WITH_NULLPTR
+
+namespace doctest
+{
+class String
+{
+    char* m_str;
+
+    void copy(const String& other);
+
+public:
+    String(const char* in = "");
+    String(const String& other);
+    ~String();
+
+    String& operator=(const String& other);
+
+    String operator+(const String& other) const;
+    String& operator+=(const String& other);
+
+    char& operator[](unsigned pos) { return m_str[pos]; }
+    const char& operator[](unsigned pos) const { return m_str[pos]; }
+
+    char*       c_str() { return m_str; }
+    const char* c_str() const { return m_str; }
+
+    unsigned size() const;
+    unsigned length() const;
+
+    int compare(const char* other, bool no_case = false) const;
+    int compare(const String& other, bool no_case = false) const;
+};
+
+// clang-format off
+inline bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; }
+inline bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; }
+inline bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; }
+inline bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; }
+inline bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; }
+inline bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; }
+// clang-format on
+
+std::ostream& operator<<(std::ostream& stream, const String& in);
+
+namespace detail
+{
+#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
+    namespace static_assert_impl
+    {
+        template <bool>
+        struct StaticAssertion;
+
+        template <>
+        struct StaticAssertion<true>
+        {};
+
+        template <int i>
+        struct StaticAssertionTest
+        {};
+    }  // namespace static_assert_impl
+#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
+
+    template <typename T>
+    struct deferred_false
+    { static const bool value = false; };
+
+    namespace has_insertion_operator_impl
+    {
+        typedef char no;
+        typedef char yes[2];
+
+        struct any_t
+        {
+            template <typename T>
+            any_t(const DOCTEST_REF_WRAP(T));
+        };
+
+        yes& testStreamable(std::ostream&);
+        no   testStreamable(no);
+
+        no operator<<(const std::ostream&, const any_t&);
+
+        template <typename T>
+        struct has_insertion_operator
+        {
+            static std::ostream& s;
+            static const DOCTEST_REF_WRAP(T) t;
+            static const bool value = sizeof(testStreamable(s << t)) == sizeof(yes);
+        };
+    } // namespace has_insertion_operator_impl
+
+    template <typename T>
+    struct has_insertion_operator : has_insertion_operator_impl::has_insertion_operator<T>
+    {};
+
+    std::ostream* createStream();
+    String        getStreamResult(std::ostream*);
+    void          freeStream(std::ostream*);
+
+    template <bool C>
+    struct StringMakerBase
+    {
+        template <typename T>
+        static String convert(const DOCTEST_REF_WRAP(T)) {
+            return "{?}";
+        }
+    };
+
+    template <>
+    struct StringMakerBase<true>
+    {
+        template <typename T>
+        static String convert(const DOCTEST_REF_WRAP(T) in) {
+            std::ostream* stream = createStream();
+            *stream << in;
+            String result = getStreamResult(stream);
+            freeStream(stream);
+            return result;
+        }
+    };
+
+    String rawMemoryToString(const void* object, unsigned size);
+
+    template <typename T>
+    String rawMemoryToString(const DOCTEST_REF_WRAP(T) object) {
+        return rawMemoryToString(&object, sizeof(object));
+    }
+} // namespace detail
+
+template <typename T>
+struct StringMaker : detail::StringMakerBase<detail::has_insertion_operator<T>::value>
+{};
+
+template <typename T>
+struct StringMaker<T*>
+{
+    template <typename U>
+    static String convert(U* p) {
+        if(!p)
+            return "NULL";
+        else
+            return detail::rawMemoryToString(p);
+    }
+};
+
+template <typename R, typename C>
+struct StringMaker<R C::*>
+{
+    static String convert(R C::*p) {
+        if(!p)
+            return "NULL";
+        else
+            return detail::rawMemoryToString(p);
+    }
+};
+
+template <typename T>
+String toString(const DOCTEST_REF_WRAP(T) value) {
+    return StringMaker<T>::convert(value);
+}
+
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+String toString(char* in);
+String toString(const char* in);
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+String toString(bool in);
+String toString(float in);
+String toString(double in);
+String toString(double long in);
+
+String toString(char in);
+String toString(char unsigned in);
+String toString(int short in);
+String toString(int short unsigned in);
+String toString(int in);
+String toString(int unsigned in);
+String toString(int long in);
+String toString(int long unsigned in);
+
+#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
+String toString(int long long in);
+String toString(int long long unsigned in);
+#endif // DOCTEST_CONFIG_WITH_LONG_LONG
+
+#ifdef DOCTEST_CONFIG_WITH_NULLPTR
+String toString(std::nullptr_t in);
+#endif // DOCTEST_CONFIG_WITH_NULLPTR
+
+class Approx
+{
+public:
+    explicit Approx(double value);
+
+    Approx(Approx const& other)
+            : m_epsilon(other.m_epsilon)
+            , m_scale(other.m_scale)
+            , m_value(other.m_value) {}
+
+    Approx operator()(double value) {
+        Approx approx(value);
+        approx.epsilon(m_epsilon);
+        approx.scale(m_scale);
+        return approx;
+    }
+
+    friend bool operator==(double lhs, Approx const& rhs);
+    friend bool operator==(Approx const& lhs, double rhs) { return operator==(rhs, lhs); }
+    friend bool operator!=(double lhs, Approx const& rhs) { return !operator==(lhs, rhs); }
+    friend bool operator!=(Approx const& lhs, double rhs) { return !operator==(rhs, lhs); }
+
+    Approx& epsilon(double newEpsilon) {
+        m_epsilon = newEpsilon;
+        return *this;
+    }
+
+    Approx& scale(double newScale) {
+        m_scale = newScale;
+        return *this;
+    }
+
+    String toString() const;
+
+private:
+    double m_epsilon;
+    double m_scale;
+    double m_value;
+};
+
+template <>
+inline String toString<Approx>(const DOCTEST_REF_WRAP(Approx) value) {
+    return value.toString();
+}
+
+#if !defined(DOCTEST_CONFIG_DISABLE)
+
+namespace detail
+{
+    // the function type this library works with
+    typedef void (*funcType)(void);
+
+    namespace assertType
+    {
+        enum Enum
+        {
+            // macro traits
+
+            is_warn    = 1,
+            is_check   = 2,
+            is_require = 4,
+
+            is_throws    = 8,
+            is_throws_as = 16,
+            is_nothrow   = 32,
+
+            is_fast  = 64, // not checked anywhere - used just to distinguish the types
+            is_false = 128,
+            is_unary = 256,
+
+            is_eq = 512,
+            is_ne = 1024,
+
+            is_lt = 2048,
+            is_gt = 4096,
+
+            is_ge = 8192,
+            is_le = 16384,
+
+            // macro types
+
+            DT_WARN    = is_warn,
+            DT_CHECK   = is_check,
+            DT_REQUIRE = is_require,
+
+            DT_WARN_FALSE    = is_false | is_warn,
+            DT_CHECK_FALSE   = is_false | is_check,
+            DT_REQUIRE_FALSE = is_false | is_require,
+
+            DT_WARN_THROWS    = is_throws | is_warn,
+            DT_CHECK_THROWS   = is_throws | is_check,
+            DT_REQUIRE_THROWS = is_throws | is_require,
+
+            DT_WARN_THROWS_AS    = is_throws_as | is_warn,
+            DT_CHECK_THROWS_AS   = is_throws_as | is_check,
+            DT_REQUIRE_THROWS_AS = is_throws_as | is_require,
+
+            DT_WARN_NOTHROW    = is_nothrow | is_warn,
+            DT_CHECK_NOTHROW   = is_nothrow | is_check,
+            DT_REQUIRE_NOTHROW = is_nothrow | is_require,
+
+            DT_WARN_EQ    = is_eq | is_warn,
+            DT_CHECK_EQ   = is_eq | is_check,
+            DT_REQUIRE_EQ = is_eq | is_require,
+
+            DT_WARN_NE    = is_ne | is_warn,
+            DT_CHECK_NE   = is_ne | is_check,
+            DT_REQUIRE_NE = is_ne | is_require,
+
+            DT_WARN_GT    = is_gt | is_warn,
+            DT_CHECK_GT   = is_gt | is_check,
+            DT_REQUIRE_GT = is_gt | is_require,
+
+            DT_WARN_LT    = is_lt | is_warn,
+            DT_CHECK_LT   = is_lt | is_check,
+            DT_REQUIRE_LT = is_lt | is_require,
+
+            DT_WARN_GE    = is_ge | is_warn,
+            DT_CHECK_GE   = is_ge | is_check,
+            DT_REQUIRE_GE = is_ge | is_require,
+
+            DT_WARN_LE    = is_le | is_warn,
+            DT_CHECK_LE   = is_le | is_check,
+            DT_REQUIRE_LE = is_le | is_require,
+
+            DT_WARN_UNARY    = is_unary | is_warn,
+            DT_CHECK_UNARY   = is_unary | is_check,
+            DT_REQUIRE_UNARY = is_unary | is_require,
+
+            DT_WARN_UNARY_FALSE    = is_false | is_unary | is_warn,
+            DT_CHECK_UNARY_FALSE   = is_false | is_unary | is_check,
+            DT_REQUIRE_UNARY_FALSE = is_false | is_unary | is_require,
+
+            DT_FAST_WARN_EQ    = is_fast | is_eq | is_warn,
+            DT_FAST_CHECK_EQ   = is_fast | is_eq | is_check,
+            DT_FAST_REQUIRE_EQ = is_fast | is_eq | is_require,
+
+            DT_FAST_WARN_NE    = is_fast | is_ne | is_warn,
+            DT_FAST_CHECK_NE   = is_fast | is_ne | is_check,
+            DT_FAST_REQUIRE_NE = is_fast | is_ne | is_require,
+
+            DT_FAST_WARN_GT    = is_fast | is_gt | is_warn,
+            DT_FAST_CHECK_GT   = is_fast | is_gt | is_check,
+            DT_FAST_REQUIRE_GT = is_fast | is_gt | is_require,
+
+            DT_FAST_WARN_LT    = is_fast | is_lt | is_warn,
+            DT_FAST_CHECK_LT   = is_fast | is_lt | is_check,
+            DT_FAST_REQUIRE_LT = is_fast | is_lt | is_require,
+
+            DT_FAST_WARN_GE    = is_fast | is_ge | is_warn,
+            DT_FAST_CHECK_GE   = is_fast | is_ge | is_check,
+            DT_FAST_REQUIRE_GE = is_fast | is_ge | is_require,
+
+            DT_FAST_WARN_LE    = is_fast | is_le | is_warn,
+            DT_FAST_CHECK_LE   = is_fast | is_le | is_check,
+            DT_FAST_REQUIRE_LE = is_fast | is_le | is_require,
+
+            DT_FAST_WARN_UNARY    = is_fast | is_unary | is_warn,
+            DT_FAST_CHECK_UNARY   = is_fast | is_unary | is_check,
+            DT_FAST_REQUIRE_UNARY = is_fast | is_unary | is_require,
+
+            DT_FAST_WARN_UNARY_FALSE    = is_fast | is_false | is_unary | is_warn,
+            DT_FAST_CHECK_UNARY_FALSE   = is_fast | is_false | is_unary | is_check,
+            DT_FAST_REQUIRE_UNARY_FALSE = is_fast | is_false | is_unary | is_require
+        };
+    } // namespace assertType
+
+    const char* getAssertString(assertType::Enum val);
+
+    // clang-format off
+    template<class T>               struct decay_array       { typedef T type; };
+    template<class T, unsigned N>   struct decay_array<T[N]> { typedef T* type; };
+    template<class T>               struct decay_array<T[]>  { typedef T* type; };
+
+    template<class T>   struct not_char_pointer              { enum { value = true }; };
+    template<>          struct not_char_pointer<char*>       { enum { value = false }; };
+    template<>          struct not_char_pointer<const char*> { enum { value = false }; };
+
+    template<class T> struct can_use_op : not_char_pointer<typename decay_array<T>::type> {};
+
+    template<bool, class = void> struct enable_if {};
+    template<class T> struct enable_if<true, T> { typedef T type; };
+    // clang-format on
+
+    struct TestFailureException
+    {};
+
+    bool checkIfShouldThrow(assertType::Enum assert_type);
+    void fastAssertThrowIfFlagSet(int flags);
+    void throwException();
+    bool always_false();
+
+    // a struct defining a registered test callback
+    struct TestData
+    {
+        // not used for determining uniqueness
+        const char* m_suite; // the test suite in which the test was added
+        const char* m_name;  // name of the test function
+        funcType    m_f;     // a function pointer to the test function
+
+        // fields by which uniqueness of test cases shall be determined
+        const char* m_file; // the file in which the test was registered
+        unsigned    m_line; // the line where the test was registered
+
+        TestData(const char* suite, const char* name, funcType f, const char* file, unsigned line)
+                : m_suite(suite)
+                , m_name(name)
+                , m_f(f)
+                , m_file(file)
+                , m_line(line) {}
+
+        bool operator<(const TestData& other) const;
+    };
+
+    struct SubcaseSignature
+    {
+        const char* m_name;
+        const char* m_file;
+        int         m_line;
+
+        SubcaseSignature(const char* name, const char* file, int line)
+                : m_name(name)
+                , m_file(file)
+                , m_line(line) {}
+
+        bool operator<(const SubcaseSignature& other) const;
+    };
+
+    struct Subcase
+    {
+        SubcaseSignature m_signature;
+        bool             m_entered;
+
+        Subcase(const char* name, const char* file, int line);
+        Subcase(const Subcase& other);
+        ~Subcase();
+
+        operator bool() const { return m_entered; }
+    };
+
+    template <typename L, typename R>
+    String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op,
+                               const DOCTEST_REF_WRAP(R) rhs) {
+        return toString(lhs) + op + toString(rhs);
+    }
+
+    struct Result
+    {
+        bool   m_passed;
+        String m_decomposition;
+
+// to fix gcc 4.7 "-Winline" warnings
+#if defined(__GNUC__) && !defined(__clang__)
+        __attribute__((noinline))
+#endif
+        ~Result() {
+        }
+
+        Result(bool passed = false, const String& decomposition = String())
+                : m_passed(passed)
+                , m_decomposition(decomposition) {}
+
+        Result(const Result& other)
+                : m_passed(other.m_passed)
+                , m_decomposition(other.m_decomposition) {}
+
+// to fix gcc 4.7 "-Winline" warnings
+#if defined(__GNUC__) && !defined(__clang__)
+        __attribute__((noinline))
+#endif
+        Result&
+        operator=(const Result& other) {
+            m_passed        = other.m_passed;
+            m_decomposition = other.m_decomposition;
+
+            return *this;
+        }
+
+        operator bool() { return !m_passed; }
+
+        void invert() { m_passed = !m_passed; }
+
+        // clang-format off
+        // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence
+        template <typename R> Result operator&  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator^  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator|  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator&& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator|| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator== (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator!= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator<  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator>  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator<= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator>= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator=  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator+= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator-= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator*= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator/= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator%= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator<<=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator>>=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator&= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator^= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        template <typename R> Result operator|= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
+        // clang-format on
+    };
+
+#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wsign-compare"
+#pragma clang diagnostic ignored "-Wdouble-promotion"
+//#pragma clang diagnostic ignored "-Wconversion"
+//#pragma clang diagnostic ignored "-Wfloat-equal"
+#endif // __clang__
+
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic push
+#endif // > gcc 4.6
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5)
+#pragma GCC diagnostic ignored "-Wdouble-promotion"
+#endif // > gcc 4.5
+//#pragma GCC diagnostic ignored "-Wconversion"
+//#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#pragma warning(push)
+// http://stackoverflow.com/questions/39479163 what's the difference between C4018 and C4389
+#pragma warning(disable : 4389) // 'operator' : signed/unsigned mismatch
+#pragma warning(disable : 4018) // 'expression' : signed/unsigned mismatch
+//#pragma warning(disable : 4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation
+#endif // _MSC_VER
+
+#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+// clang-format off
+#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+#define DOCTEST_COMPARISON_RETURN_TYPE bool
+#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+#define DOCTEST_COMPARISON_RETURN_TYPE typename enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
+    inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); }
+    inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); }
+    inline bool lt(const char* lhs, const char* rhs) { return String(lhs) <  String(rhs); }
+    inline bool gt(const char* lhs, const char* rhs) { return String(lhs) >  String(rhs); }
+    inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); }
+    inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); }
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+
+    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE eq(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs == rhs; }
+    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE ne(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs != rhs; }
+    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE lt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <  rhs; }
+    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE gt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >  rhs; }
+    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE le(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <= rhs; }
+    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE ge(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >= rhs; }
+    // clang-format on
+
+    template <typename L>
+    struct Expression_lhs
+    {
+        L lhs;
+
+        Expression_lhs(L in)
+                : lhs(in) {}
+
+        Expression_lhs(const Expression_lhs& other)
+                : lhs(other.lhs) {}
+
+        operator Result() { return Result(!!lhs, toString(lhs)); }
+
+// clang-format off
+#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+        template <typename R> Result operator==(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs == rhs, stringifyBinaryExpr(lhs, " == ", rhs)); }
+        template <typename R> Result operator!=(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs != rhs, stringifyBinaryExpr(lhs, " != ", rhs)); }
+        template <typename R> Result operator< (const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs <  rhs, stringifyBinaryExpr(lhs, " < " , rhs)); }
+        template <typename R> Result operator<=(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs <= rhs, stringifyBinaryExpr(lhs, " <= ", rhs)); }
+        template <typename R> Result operator> (const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs >  rhs, stringifyBinaryExpr(lhs, " > " , rhs)); }
+        template <typename R> Result operator>=(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs >= rhs, stringifyBinaryExpr(lhs, " >= ", rhs)); }
+#else  // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+        template <typename R> Result operator==(const DOCTEST_REF_WRAP(R) rhs) { return Result(eq(lhs, rhs), stringifyBinaryExpr(lhs, " == ", rhs)); }
+        template <typename R> Result operator!=(const DOCTEST_REF_WRAP(R) rhs) { return Result(ne(lhs, rhs), stringifyBinaryExpr(lhs, " != ", rhs)); }
+        template <typename R> Result operator< (const DOCTEST_REF_WRAP(R) rhs) { return Result(lt(lhs, rhs), stringifyBinaryExpr(lhs, " < " , rhs)); }
+        template <typename R> Result operator<=(const DOCTEST_REF_WRAP(R) rhs) { return Result(le(lhs, rhs), stringifyBinaryExpr(lhs, " <= ", rhs)); }
+        template <typename R> Result operator> (const DOCTEST_REF_WRAP(R) rhs) { return Result(gt(lhs, rhs), stringifyBinaryExpr(lhs, " > " , rhs)); }
+        template <typename R> Result operator>=(const DOCTEST_REF_WRAP(R) rhs) { return Result(ge(lhs, rhs), stringifyBinaryExpr(lhs, " >= ", rhs)); }
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+        // clang-format on
+
+        // clang-format off
+        // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence
+        template <typename R> int operator&  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator^  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator|  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator&& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator|| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator=  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator+= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator-= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator*= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator/= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator%= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator<<=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator>>=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator&= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator^= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        template <typename R> int operator|= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
+        // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the
+        // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression...
+        template <typename R> int operator<< (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Please_Surround_The_Left_Shift_Operation_With_Parenthesis); return int(); }
+        template <typename R> int operator>> (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Please_Surround_The_Right_Shift_Operation_With_Parenthesis); return int(); }
+        // clang-format on
+    };
+
+#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic pop
+#endif // > gcc 4.6
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif // _MSC_VER
+
+#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
+
+    struct ExpressionDecomposer
+    {
+        template <typename L>
+        Expression_lhs<const DOCTEST_REF_WRAP(L)> operator<<(const DOCTEST_REF_WRAP(L) operand) {
+            return Expression_lhs<const DOCTEST_REF_WRAP(L)>(operand);
+        }
+    };
+
+    // forward declarations of functions used by the macros
+    int regTest(void (*f)(void), unsigned line, const char* file, const char* name);
+    int setTestSuiteName(const char* name);
+
+    void addFailedAssert(assertType::Enum assert_type);
+
+    void logTestStart(const char* name, const char* file, unsigned line);
+    void logTestEnd();
+
+    void logTestCrashed();
+
+    void logAssert(bool passed, const char* decomposition, bool threw, const char* expr,
+                   assertType::Enum assert_type, const char* file, int line);
+
+    void logAssertThrows(bool threw, const char* expr, assertType::Enum assert_type,
+                         const char* file, int line);
+
+    void logAssertThrowsAs(bool threw, bool threw_as, const char* as, const char* expr,
+                           assertType::Enum assert_type, const char* file, int line);
+
+    void logAssertNothrow(bool threw, const char* expr, assertType::Enum assert_type,
+                          const char* file, int line);
+
+    bool isDebuggerActive();
+    void writeToDebugConsole(const String&);
+
+    struct TestAccessibleContextState
+    {
+        bool            success;   // include successful assertions in output
+        bool            no_throw;  // to skip exceptions-related assertion macros
+        bool            no_breaks; // to not break into the debugger
+        const TestData* currentTest;
+        bool            hasLoggedCurrentTestStart;
+        int             numAssertionsForCurrentTestcase;
+    };
+
+    struct ContextState;
+
+    TestAccessibleContextState* getTestsContextState();
+
+    namespace binaryAssertComparison
+    {
+        enum Enum
+        {
+            eq = 0,
+            ne,
+            gt,
+            lt,
+            ge,
+            le
+        };
+    } // namespace binaryAssertComparison
+
+    // clang-format off
+    template <int, class L, class R> struct RelationalComparator     { bool operator()(const DOCTEST_REF_WRAP(L),     const DOCTEST_REF_WRAP(R)    ) const { return false;        } };
+    template <class L, class R> struct RelationalComparator<0, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return eq(lhs, rhs); } };
+    template <class L, class R> struct RelationalComparator<1, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ne(lhs, rhs); } };
+    template <class L, class R> struct RelationalComparator<2, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return gt(lhs, rhs); } };
+    template <class L, class R> struct RelationalComparator<3, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return lt(lhs, rhs); } };
+    template <class L, class R> struct RelationalComparator<4, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ge(lhs, rhs); } };
+    template <class L, class R> struct RelationalComparator<5, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return le(lhs, rhs); } };
+    // clang-format on
+
+    struct ResultBuilder
+    {
+        assertType::Enum m_assert_type;
+        const char*      m_file;
+        int              m_line;
+        const char*      m_expr;
+        const char*      m_exception_type;
+
+        Result m_result;
+        bool   m_threw;
+        bool   m_threw_as;
+        bool   m_failed;
+
+        ResultBuilder(assertType::Enum assert_type, const char* file, int line, const char* expr,
+                      const char* exception_type = "");
+
+// to fix gcc 4.7 "-Winline" warnings
+#if defined(__GNUC__) && !defined(__clang__)
+        __attribute__((noinline))
+#endif
+        ~ResultBuilder() {
+        }
+
+        void setResult(const Result& res) { m_result = res; }
+
+        template <int comparison, typename L, typename R>
+        void          binary_assert(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) {
+            m_result.m_passed        = RelationalComparator<comparison, L, R>()(lhs, rhs);
+            m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs);
+        }
+
+        template <typename L>
+        void unary_assert(const DOCTEST_REF_WRAP(L) val) {
+            m_result.m_passed        = !!val;
+            m_result.m_decomposition = toString(val);
+        }
+
+        bool log();
+        void react() const;
+    };
+
+    namespace assertAction
+    {
+        enum Enum
+        {
+            nothing     = 0,
+            dbgbreak    = 1,
+            shouldthrow = 2
+        };
+    } // namespace assertAction
+
+    template <int comparison, typename L, typename R>
+    int fast_binary_assert(assertType::Enum assert_type, const char* file, int line,
+                           const char* lhs_str, const char* rhs_str, const DOCTEST_REF_WRAP(L) lhs,
+                           const DOCTEST_REF_WRAP(R) rhs) {
+        String        expr     = String(lhs_str) + ", " + rhs_str;
+        const char*   expr_str = expr.c_str();
+        ResultBuilder rb(assert_type, file, line, expr_str);
+
+        rb.m_result.m_passed        = RelationalComparator<comparison, L, R>()(lhs, rhs);
+        rb.m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs);
+
+        int res = 0;
+
+        if(rb.log())
+            res |= assertAction::dbgbreak;
+
+        if(rb.m_failed && checkIfShouldThrow(assert_type))
+            res |= assertAction::shouldthrow;
+
+#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+        // #########################################################################################
+        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION
+        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
+        // #########################################################################################
+        if(res & assertAction::dbgbreak)
+            DOCTEST_BREAK_INTO_DEBUGGER();
+        fastAssertThrowIfFlagSet(res);
+#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+        return res;
+    }
+
+    template <typename L>
+    int fast_unary_assert(assertType::Enum assert_type, const char* file, int line,
+                          const char* val_str, const DOCTEST_REF_WRAP(L) val) {
+        ResultBuilder rb(assert_type, file, line, val_str);
+
+        rb.m_result.m_passed        = !!val;
+        rb.m_result.m_decomposition = toString(val);
+
+        int res = 0;
+
+        if(rb.log())
+            res |= assertAction::dbgbreak;
+
+        if(rb.m_failed && checkIfShouldThrow(assert_type))
+            res |= assertAction::shouldthrow;
+
+#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+        // #########################################################################################
+        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION
+        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
+        // #########################################################################################
+        if(res & assertAction::dbgbreak)
+            DOCTEST_BREAK_INTO_DEBUGGER();
+        fastAssertThrowIfFlagSet(res);
+#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+        return res;
+    }
+} // namespace detail
+
+#endif // DOCTEST_CONFIG_DISABLE
+
+class Context
+{
+#if !defined(DOCTEST_CONFIG_DISABLE)
+    detail::ContextState* p;
+
+    void parseArgs(int argc, const char* const* argv, bool withDefaults = false);
+
+#endif // DOCTEST_CONFIG_DISABLE
+
+public:
+    Context(int argc = 0, const char* const* argv = 0);
+
+// to fix gcc 4.7 "-Winline" warnings
+#if defined(__GNUC__) && !defined(__clang__)
+    __attribute__((noinline))
+#endif
+    ~Context();
+
+    void applyCommandLine(int argc, const char* const* argv);
+
+    void addFilter(const char* filter, const char* value);
+    void clearFilters();
+    void setOption(const char* option, int value);
+    void setOption(const char* option, const char* value);
+
+    bool shouldExit();
+
+    int run();
+};
+
+} // namespace doctest
+
+// if registering is not disabled
+#if !defined(DOCTEST_CONFIG_DISABLE)
+
+// registers the test by initializing a dummy var with a function
+#if defined(__GNUC__) && !defined(__clang__)
+#define DOCTEST_REGISTER_FUNCTION(f, name)                                                         \
+    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) __attribute__((unused)) =                     \
+            doctest::detail::regTest(f, __LINE__, __FILE__, name);
+#elif defined(__clang__)
+#define DOCTEST_REGISTER_FUNCTION(f, name)                                                         \
+    _Pragma("clang diagnostic push")                                                               \
+            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int               \
+                    DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) =                                        \
+                            doctest::detail::regTest(f, __LINE__, __FILE__, name);                 \
+    _Pragma("clang diagnostic pop")
+#else // MSVC
+#define DOCTEST_REGISTER_FUNCTION(f, name)                                                         \
+    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) =                                             \
+            doctest::detail::regTest(f, __LINE__, __FILE__, name);
+#endif // MSVC
+
+#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
+    namespace                                                                                      \
+    {                                                                                              \
+        struct der : base                                                                          \
+        { void f(); };                                                                             \
+        static void func() {                                                                       \
+            der v;                                                                                 \
+            v.f();                                                                                 \
+        }                                                                                          \
+        DOCTEST_REGISTER_FUNCTION(func, name)                                                      \
+    }                                                                                              \
+    inline void der::f()
+
+#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
+    static void f();                                                                               \
+    DOCTEST_REGISTER_FUNCTION(f, name)                                                             \
+    inline void f()
+
+// for registering tests
+#define DOCTEST_TEST_CASE(name)                                                                    \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+
+// for registering tests with a fixture
+#define DOCTEST_TEST_CASE_FIXTURE(c, name)                                                         \
+    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), c,                          \
+                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+
+// for subcases
+#if defined(__GNUC__)
+#define DOCTEST_SUBCASE(name)                                                                      \
+    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_)                  \
+                                                __attribute__((unused)) =                          \
+               doctest::detail::Subcase(name, __FILE__, __LINE__))
+#else // __GNUC__
+#define DOCTEST_SUBCASE(name)                                                                      \
+    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) =                \
+               doctest::detail::Subcase(name, __FILE__, __LINE__))
+#endif // __GNUC__
+
+// for starting a testsuite block
+#if defined(__GNUC__) && !defined(__clang__)
+#define DOCTEST_TEST_SUITE(name)                                                                   \
+    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) __attribute__((unused)) =                     \
+            doctest::detail::setTestSuiteName(name);                                               \
+    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#elif defined(__clang__)
+#define DOCTEST_TEST_SUITE(name)                                                                   \
+    _Pragma("clang diagnostic push")                                                               \
+            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int               \
+                    DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) =                                        \
+                            doctest::detail::setTestSuiteName(name);                               \
+    _Pragma("clang diagnostic pop") typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#else // MSVC
+#define DOCTEST_TEST_SUITE(name)                                                                   \
+    static int  DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) = doctest::detail::setTestSuiteName(name);   \
+    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#endif // MSVC
+
+// for ending a testsuite block
+#if defined(__GNUC__) && !defined(__clang__)
+#define DOCTEST_TEST_SUITE_END                                                                     \
+    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) __attribute__((unused)) =                     \
+            doctest::detail::setTestSuiteName("");                                                 \
+    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#elif defined(__clang__)
+#define DOCTEST_TEST_SUITE_END                                                                                                 \
+    _Pragma("clang diagnostic push")                                                                                           \
+            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int                                           \
+                                                DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) = doctest::detail::setTestSuiteName(""); \
+    _Pragma("clang diagnostic pop") typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#else // MSVC
+#define DOCTEST_TEST_SUITE_END                                                                     \
+    static int  DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) = doctest::detail::setTestSuiteName("");     \
+    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+#endif // MSVC
+
+#define DOCTEST_ASSERT_LOG_AND_REACT(rb)                                                           \
+    if(rb.log())                                                                                   \
+        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
+    rb.react()
+
+#define DOCTEST_ASSERT_IMPLEMENT(expr, assert_type)                                                \
+    doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type, __FILE__, \
+                                               __LINE__, #expr);                                   \
+    try {                                                                                          \
+        _DOCTEST_RB.setResult(doctest::detail::ExpressionDecomposer() << expr);                    \
+    } catch(...) { _DOCTEST_RB.m_threw = true; }                                                   \
+    DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);
+
+#if defined(__clang__)
+#define DOCTEST_ASSERT_PROXY(expr, assert_type)                                                    \
+    do {                                                                                           \
+        _Pragma("clang diagnostic push")                                                           \
+                _Pragma("clang diagnostic ignored \"-Woverloaded-shift-op-parentheses\"")          \
+                        DOCTEST_ASSERT_IMPLEMENT(expr, assert_type)                                \
+                                _Pragma("clang diagnostic pop")                                    \
+    } while(doctest::detail::always_false())
+#else // __clang__
+#define DOCTEST_ASSERT_PROXY(expr, assert_type)                                                    \
+    do {                                                                                           \
+        DOCTEST_ASSERT_IMPLEMENT(expr, assert_type)                                                \
+    } while(doctest::detail::always_false())
+#endif // __clang__
+
+#define DOCTEST_WARN(expr) DOCTEST_ASSERT_PROXY(expr, DT_WARN)
+#define DOCTEST_CHECK(expr) DOCTEST_ASSERT_PROXY(expr, DT_CHECK)
+#define DOCTEST_REQUIRE(expr) DOCTEST_ASSERT_PROXY(expr, DT_REQUIRE)
+
+#define DOCTEST_WARN_FALSE(expr) DOCTEST_ASSERT_PROXY(expr, DT_WARN_FALSE)
+#define DOCTEST_CHECK_FALSE(expr) DOCTEST_ASSERT_PROXY(expr, DT_CHECK_FALSE)
+#define DOCTEST_REQUIRE_FALSE(expr) DOCTEST_ASSERT_PROXY(expr, DT_REQUIRE_FALSE)
+
+#define DOCTEST_ASSERT_THROWS(expr, assert_type)                                                   \
+    do {                                                                                           \
+        if(!DOCTEST_GCS().no_throw) {                                                              \
+            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
+                                                       __FILE__, __LINE__, #expr);                 \
+            try {                                                                                  \
+                expr;                                                                              \
+            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
+            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
+        }                                                                                          \
+    } while(doctest::detail::always_false())
+
+#define DOCTEST_ASSERT_THROWS_AS(expr, as, assert_type)                                            \
+    do {                                                                                           \
+        if(!DOCTEST_GCS().no_throw) {                                                              \
+            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
+                                                       __FILE__, __LINE__, #expr, #as);            \
+            try {                                                                                  \
+                expr;                                                                              \
+            } catch(as) {                                                                          \
+                _DOCTEST_RB.m_threw    = true;                                                     \
+                _DOCTEST_RB.m_threw_as = true;                                                     \
+            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
+            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
+        }                                                                                          \
+    } while(doctest::detail::always_false())
+
+#define DOCTEST_ASSERT_NOTHROW(expr, assert_type)                                                  \
+    do {                                                                                           \
+        if(!DOCTEST_GCS().no_throw) {                                                              \
+            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
+                                                       __FILE__, __LINE__, #expr);                 \
+            try {                                                                                  \
+                expr;                                                                              \
+            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
+            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
+        }                                                                                          \
+    } while(doctest::detail::always_false())
+
+#define DOCTEST_WARN_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_WARN_THROWS)
+#define DOCTEST_CHECK_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_CHECK_THROWS)
+#define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS)
+
+#define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS)
+#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS)
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS)
+
+#define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW)
+#define DOCTEST_CHECK_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_CHECK_NOTHROW)
+#define DOCTEST_REQUIRE_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_REQUIRE_NOTHROW)
+
+#define DOCTEST_BINARY_ASSERT(assert_type, lhs, rhs, comp)                                         \
+    do {                                                                                           \
+        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,       \
+                                                   __FILE__, __LINE__, #lhs ", " #rhs);            \
+        try {                                                                                      \
+            _DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(lhs, rhs);    \
+        } catch(...) { _DOCTEST_RB.m_threw = true; }                                               \
+        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
+    } while(doctest::detail::always_false())
+
+#define DOCTEST_UNARY_ASSERT(assert_type, val)                                                     \
+    do {                                                                                           \
+        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,       \
+                                                   __FILE__, __LINE__, #val);                      \
+        try {                                                                                      \
+            _DOCTEST_RB.unary_assert(val);                                                         \
+        } catch(...) { _DOCTEST_RB.m_threw = true; }                                               \
+        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
+    } while(doctest::detail::always_false())
+
+#define DOCTEST_WARN_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, lhs, rhs, eq)
+#define DOCTEST_CHECK_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, lhs, rhs, eq)
+#define DOCTEST_REQUIRE_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, lhs, rhs, eq)
+#define DOCTEST_WARN_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_NE, lhs, rhs, ne)
+#define DOCTEST_CHECK_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, lhs, rhs, ne)
+#define DOCTEST_REQUIRE_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, lhs, rhs, ne)
+#define DOCTEST_WARN_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GT, lhs, rhs, gt)
+#define DOCTEST_CHECK_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, lhs, rhs, gt)
+#define DOCTEST_REQUIRE_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, lhs, rhs, gt)
+#define DOCTEST_WARN_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lhs, rhs, lt)
+#define DOCTEST_CHECK_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lhs, rhs, lt)
+#define DOCTEST_REQUIRE_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lhs, rhs, lt)
+#define DOCTEST_WARN_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GE, lhs, rhs, ge)
+#define DOCTEST_CHECK_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, lhs, rhs, ge)
+#define DOCTEST_REQUIRE_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, lhs, rhs, ge)
+#define DOCTEST_WARN_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LE, lhs, rhs, le)
+#define DOCTEST_CHECK_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, lhs, rhs, le)
+#define DOCTEST_REQUIRE_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, lhs, rhs, le)
+
+#define DOCTEST_WARN_UNARY(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, v)
+#define DOCTEST_CHECK_UNARY(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, v)
+#define DOCTEST_REQUIRE_UNARY(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, v)
+#define DOCTEST_WARN_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, v)
+#define DOCTEST_CHECK_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, v)
+#define DOCTEST_REQUIRE_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, v)
+
+#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison)                              \
+    do {                                                                                           \
+        int _DOCTEST_FAST_RES = doctest::detail::fast_binary_assert<                               \
+                doctest::detail::binaryAssertComparison::comparison>(                              \
+                doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs, #rhs, lhs,     \
+                rhs);                                                                              \
+        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
+            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
+        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
+    } while(doctest::detail::always_false())
+
+#define DOCTEST_FAST_UNARY_ASSERT(assert_type, val)                                                \
+    do {                                                                                           \
+        int _DOCTEST_FAST_RES = doctest::detail::fast_unary_assert(                                \
+                doctest::detail::assertType::assert_type, __FILE__, __LINE__, #val, val);          \
+        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
+            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
+        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
+    } while(doctest::detail::always_false())
+
+#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison)                              \
+    doctest::detail::fast_binary_assert<doctest::detail::binaryAssertComparison::comparison>(      \
+            doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs, #rhs, lhs, rhs)
+
+#define DOCTEST_FAST_UNARY_ASSERT(assert_type, val)                                                \
+    doctest::detail::fast_unary_assert(doctest::detail::assertType::assert_type, __FILE__,         \
+                                       __LINE__, #val, val)
+
+#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
+
+#define DOCTEST_FAST_WARN_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, l, r, eq)
+#define DOCTEST_FAST_CHECK_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, l, r, eq)
+#define DOCTEST_FAST_REQUIRE_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, l, r, eq)
+#define DOCTEST_FAST_WARN_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, l, r, ne)
+#define DOCTEST_FAST_CHECK_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, l, r, ne)
+#define DOCTEST_FAST_REQUIRE_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, l, r, ne)
+#define DOCTEST_FAST_WARN_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, l, r, gt)
+#define DOCTEST_FAST_CHECK_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, l, r, gt)
+#define DOCTEST_FAST_REQUIRE_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, l, r, gt)
+#define DOCTEST_FAST_WARN_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, l, r, lt)
+#define DOCTEST_FAST_CHECK_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, l, r, lt)
+#define DOCTEST_FAST_REQUIRE_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, l, r, lt)
+#define DOCTEST_FAST_WARN_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, l, r, ge)
+#define DOCTEST_FAST_CHECK_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, l, r, ge)
+#define DOCTEST_FAST_REQUIRE_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, l, r, ge)
+#define DOCTEST_FAST_WARN_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, l, r, le)
+#define DOCTEST_FAST_CHECK_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, l, r, le)
+#define DOCTEST_FAST_REQUIRE_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, l, r, le)
+
+#define DOCTEST_FAST_WARN_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, v)
+#define DOCTEST_FAST_CHECK_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, v)
+#define DOCTEST_FAST_REQUIRE_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, v)
+#define DOCTEST_FAST_WARN_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, v)
+#define DOCTEST_FAST_CHECK_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, v)
+#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(v)                                                        \
+    DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, v)
+
+// =================================================================================================
+// == WHAT FOLLOWS IS VERSIONS OF THE MACROS THAT DO NOT DO ANY REGISTERING!                      ==
+// == THIS CAN BE ENABLED BY DEFINING DOCTEST_CONFIG_DISABLE GLOBALLY!                            ==
+// =================================================================================================
+#else // DOCTEST_CONFIG_DISABLE
+
+#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
+    namespace                                                                                      \
+    {                                                                                              \
+        template <typename T>                                                                      \
+        struct der : base                                                                          \
+        { void f(); };                                                                             \
+    }                                                                                              \
+    template <typename T>                                                                          \
+    inline void der<T>::f()
+
+#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
+    template <typename T>                                                                          \
+    static inline void f()
+
+// for registering tests
+#define DOCTEST_TEST_CASE(name)                                                                    \
+    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+
+// for registering tests with a fixture
+#define DOCTEST_TEST_CASE_FIXTURE(x, name)                                                         \
+    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), x,                          \
+                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
+
+// for subcases
+#define DOCTEST_SUBCASE(name)
+
+// for starting a testsuite block
+#define DOCTEST_TEST_SUITE(name) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+
+// for ending a testsuite block
+#define DOCTEST_TEST_SUITE_END typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
+
+#define DOCTEST_WARN(expr) ((void)0)
+#define DOCTEST_WARN_FALSE(expr) ((void)0)
+#define DOCTEST_WARN_THROWS(expr) ((void)0)
+#define DOCTEST_WARN_THROWS_AS(expr, ex) ((void)0)
+#define DOCTEST_WARN_NOTHROW(expr) ((void)0)
+#define DOCTEST_CHECK(expr) ((void)0)
+#define DOCTEST_CHECK_FALSE(expr) ((void)0)
+#define DOCTEST_CHECK_THROWS(expr) ((void)0)
+#define DOCTEST_CHECK_THROWS_AS(expr, ex) ((void)0)
+#define DOCTEST_CHECK_NOTHROW(expr) ((void)0)
+#define DOCTEST_REQUIRE(expr) ((void)0)
+#define DOCTEST_REQUIRE_FALSE(expr) ((void)0)
+#define DOCTEST_REQUIRE_THROWS(expr) ((void)0)
+#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) ((void)0)
+#define DOCTEST_REQUIRE_NOTHROW(expr) ((void)0)
+
+#define DOCTEST_WARN_EQ(lhs, rhs) ((void)0)
+#define DOCTEST_CHECK_EQ(lhs, rhs) ((void)0)
+#define DOCTEST_REQUIRE_EQ(lhs, rhs) ((void)0)
+#define DOCTEST_WARN_NE(lhs, rhs) ((void)0)
+#define DOCTEST_CHECK_NE(lhs, rhs) ((void)0)
+#define DOCTEST_REQUIRE_NE(lhs, rhs) ((void)0)
+#define DOCTEST_WARN_GT(lhs, rhs) ((void)0)
+#define DOCTEST_CHECK_GT(lhs, rhs) ((void)0)
+#define DOCTEST_REQUIRE_GT(lhs, rhs) ((void)0)
+#define DOCTEST_WARN_LT(lhs, rhs) ((void)0)
+#define DOCTEST_CHECK_LT(lhs, rhs) ((void)0)
+#define DOCTEST_REQUIRE_LT(lhs, rhs) ((void)0)
+#define DOCTEST_WARN_GE(lhs, rhs) ((void)0)
+#define DOCTEST_CHECK_GE(lhs, rhs) ((void)0)
+#define DOCTEST_REQUIRE_GE(lhs, rhs) ((void)0)
+#define DOCTEST_WARN_LE(lhs, rhs) ((void)0)
+#define DOCTEST_CHECK_LE(lhs, rhs) ((void)0)
+#define DOCTEST_REQUIRE_LE(lhs, rhs) ((void)0)
+
+#define DOCTEST_WARN_UNARY(val) ((void)0)
+#define DOCTEST_CHECK_UNARY(val) ((void)0)
+#define DOCTEST_REQUIRE_UNARY(val) ((void)0)
+#define DOCTEST_WARN_UNARY_FALSE(val) ((void)0)
+#define DOCTEST_CHECK_UNARY_FALSE(val) ((void)0)
+#define DOCTEST_REQUIRE_UNARY_FALSE(val) ((void)0)
+
+#define DOCTEST_FAST_WARN_EQ(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_CHECK_EQ(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_REQUIRE_EQ(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_WARN_NE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_CHECK_NE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_REQUIRE_NE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_WARN_GT(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_CHECK_GT(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_REQUIRE_GT(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_WARN_LT(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_CHECK_LT(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_REQUIRE_LT(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_WARN_GE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_CHECK_GE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_REQUIRE_GE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_WARN_LE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_CHECK_LE(lhs, rhs) ((void)0)
+#define DOCTEST_FAST_REQUIRE_LE(lhs, rhs) ((void)0)
+
+#define DOCTEST_FAST_WARN_UNARY(val) ((void)0)
+#define DOCTEST_FAST_CHECK_UNARY(val) ((void)0)
+#define DOCTEST_FAST_REQUIRE_UNARY(val) ((void)0)
+#define DOCTEST_FAST_WARN_UNARY_FALSE(val) ((void)0)
+#define DOCTEST_FAST_CHECK_UNARY_FALSE(val) ((void)0)
+#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(val) ((void)0)
+
+#endif // DOCTEST_CONFIG_DISABLE
+
+// BDD style macros
+// clang-format off
+#define DOCTEST_SCENARIO(name)  TEST_CASE("  Scenario: " name)
+#define DOCTEST_GIVEN(name)     SUBCASE("   Given: " name)
+#define DOCTEST_WHEN(name)      SUBCASE("    When: " name)
+#define DOCTEST_AND_WHEN(name)  SUBCASE("And when: " name)
+#define DOCTEST_THEN(name)      SUBCASE("    Then: " name)
+#define DOCTEST_AND_THEN(name)  SUBCASE("     And: " name)
+// clang-format on
+
+// == SHORT VERSIONS OF THE MACROS
+#if !defined(DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES)
+
+#define TEST_CASE DOCTEST_TEST_CASE
+#define TEST_CASE_FIXTURE DOCTEST_TEST_CASE_FIXTURE
+#define SUBCASE DOCTEST_SUBCASE
+#define TEST_SUITE DOCTEST_TEST_SUITE
+#define TEST_SUITE_END DOCTEST_TEST_SUITE_END
+#define WARN DOCTEST_WARN
+#define WARN_FALSE DOCTEST_WARN_FALSE
+#define WARN_THROWS DOCTEST_WARN_THROWS
+#define WARN_THROWS_AS DOCTEST_WARN_THROWS_AS
+#define WARN_NOTHROW DOCTEST_WARN_NOTHROW
+#define CHECK DOCTEST_CHECK
+#define CHECK_FALSE DOCTEST_CHECK_FALSE
+#define CHECK_THROWS DOCTEST_CHECK_THROWS
+#define CHECK_THROWS_AS DOCTEST_CHECK_THROWS_AS
+#define CHECK_NOTHROW DOCTEST_CHECK_NOTHROW
+#define REQUIRE DOCTEST_REQUIRE
+#define REQUIRE_FALSE DOCTEST_REQUIRE_FALSE
+#define REQUIRE_THROWS DOCTEST_REQUIRE_THROWS
+#define REQUIRE_THROWS_AS DOCTEST_REQUIRE_THROWS_AS
+#define REQUIRE_NOTHROW DOCTEST_REQUIRE_NOTHROW
+
+#define SCENARIO DOCTEST_SCENARIO
+#define GIVEN DOCTEST_GIVEN
+#define WHEN DOCTEST_WHEN
+#define AND_WHEN DOCTEST_AND_WHEN
+#define THEN DOCTEST_THEN
+#define AND_THEN DOCTEST_AND_THEN
+
+#define WARN_EQ DOCTEST_WARN_EQ
+#define CHECK_EQ DOCTEST_CHECK_EQ
+#define REQUIRE_EQ DOCTEST_REQUIRE_EQ
+#define WARN_NE DOCTEST_WARN_NE
+#define CHECK_NE DOCTEST_CHECK_NE
+#define REQUIRE_NE DOCTEST_REQUIRE_NE
+#define WARN_GT DOCTEST_WARN_GT
+#define CHECK_GT DOCTEST_CHECK_GT
+#define REQUIRE_GT DOCTEST_REQUIRE_GT
+#define WARN_LT DOCTEST_WARN_LT
+#define CHECK_LT DOCTEST_CHECK_LT
+#define REQUIRE_LT DOCTEST_REQUIRE_LT
+#define WARN_GE DOCTEST_WARN_GE
+#define CHECK_GE DOCTEST_CHECK_GE
+#define REQUIRE_GE DOCTEST_REQUIRE_GE
+#define WARN_LE DOCTEST_WARN_LE
+#define CHECK_LE DOCTEST_CHECK_LE
+#define REQUIRE_LE DOCTEST_REQUIRE_LE
+#define WARN_UNARY DOCTEST_WARN_UNARY
+#define CHECK_UNARY DOCTEST_CHECK_UNARY
+#define REQUIRE_UNARY DOCTEST_REQUIRE_UNARY
+#define WARN_UNARY_FALSE DOCTEST_WARN_UNARY_FALSE
+#define CHECK_UNARY_FALSE DOCTEST_CHECK_UNARY_FALSE
+#define REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE
+
+#define FAST_WARN_EQ DOCTEST_FAST_WARN_EQ
+#define FAST_CHECK_EQ DOCTEST_FAST_CHECK_EQ
+#define FAST_REQUIRE_EQ DOCTEST_FAST_REQUIRE_EQ
+#define FAST_WARN_NE DOCTEST_FAST_WARN_NE
+#define FAST_CHECK_NE DOCTEST_FAST_CHECK_NE
+#define FAST_REQUIRE_NE DOCTEST_FAST_REQUIRE_NE
+#define FAST_WARN_GT DOCTEST_FAST_WARN_GT
+#define FAST_CHECK_GT DOCTEST_FAST_CHECK_GT
+#define FAST_REQUIRE_GT DOCTEST_FAST_REQUIRE_GT
+#define FAST_WARN_LT DOCTEST_FAST_WARN_LT
+#define FAST_CHECK_LT DOCTEST_FAST_CHECK_LT
+#define FAST_REQUIRE_LT DOCTEST_FAST_REQUIRE_LT
+#define FAST_WARN_GE DOCTEST_FAST_WARN_GE
+#define FAST_CHECK_GE DOCTEST_FAST_CHECK_GE
+#define FAST_REQUIRE_GE DOCTEST_FAST_REQUIRE_GE
+#define FAST_WARN_LE DOCTEST_FAST_WARN_LE
+#define FAST_CHECK_LE DOCTEST_FAST_CHECK_LE
+#define FAST_REQUIRE_LE DOCTEST_FAST_REQUIRE_LE
+#define FAST_WARN_UNARY DOCTEST_FAST_WARN_UNARY
+#define FAST_CHECK_UNARY DOCTEST_FAST_CHECK_UNARY
+#define FAST_REQUIRE_UNARY DOCTEST_FAST_REQUIRE_UNARY
+#define FAST_WARN_UNARY_FALSE DOCTEST_FAST_WARN_UNARY_FALSE
+#define FAST_CHECK_UNARY_FALSE DOCTEST_FAST_CHECK_UNARY_FALSE
+#define FAST_REQUIRE_UNARY_FALSE DOCTEST_FAST_REQUIRE_UNARY_FALSE
+
+#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
+
+// this is here to clear the 'current test suite' for the current translation unit - at the top
+DOCTEST_TEST_SUITE_END();
+
+#endif // DOCTEST_LIBRARY_INCLUDED
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic pop
+#endif // > gcc 4.6
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif // _MSC_VER
+
+#ifndef DOCTEST_SINGLE_HEADER
+#define DOCTEST_SINGLE_HEADER
+#endif // DOCTEST_SINGLE_HEADER
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-pragmas"
+#pragma clang diagnostic ignored "-Wpadded"
+#pragma clang diagnostic ignored "-Wglobal-constructors"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wmissing-prototypes"
+#pragma clang diagnostic ignored "-Wsign-conversion"
+#pragma clang diagnostic ignored "-Wshorten-64-to-32"
+#pragma clang diagnostic ignored "-Wmissing-variable-declarations"
+#pragma clang diagnostic ignored "-Wswitch"
+#pragma clang diagnostic ignored "-Wswitch-enum"
+#pragma clang diagnostic ignored "-Wcovered-switch-default"
+#pragma clang diagnostic ignored "-Wmissing-noreturn"
+#pragma clang diagnostic ignored "-Wunused-local-typedef"
+#endif // __clang__
+
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic push
+#endif // > gcc 4.6
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Weffc++"
+#pragma GCC diagnostic ignored "-Wsign-conversion"
+#pragma GCC diagnostic ignored "-Wstrict-overflow"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma GCC diagnostic ignored "-Winline"
+#pragma GCC diagnostic ignored "-Wswitch"
+#pragma GCC diagnostic ignored "-Wswitch-enum"
+#pragma GCC diagnostic ignored "-Wswitch-default"
+#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif // > gcc 4.6
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif // > gcc 4.7
+#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3)
+#pragma GCC diagnostic ignored "-Wuseless-cast"
+#endif // > gcc 5.3
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration
+#pragma warning(disable : 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
+#pragma warning(disable : 4706) // assignment within conditional expression
+#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated
+#pragma warning(disable : 4127) // conditional expression is constant
+#endif                          // _MSC_VER
+
+#if defined(DOCTEST_CONFIG_IMPLEMENT) || defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) ||            \
+        !defined(DOCTEST_SINGLE_HEADER)
+#ifndef DOCTEST_LIBRARY_IMPLEMENTATION
+#define DOCTEST_LIBRARY_IMPLEMENTATION
+
+#ifndef DOCTEST_SINGLE_HEADER
+#include "doctest_fwd.h"
+#endif // DOCTEST_SINGLE_HEADER
+
+#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT)
+#pragma clang diagnostic ignored "-Wc++98-compat"
+#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT
+
+// snprintf() not in the C++98 standard
+#ifdef _MSC_VER
+#define DOCTEST_SNPRINTF _snprintf
+#else
+#define DOCTEST_SNPRINTF snprintf
+#endif
+
+#define DOCTEST_LOG_START()                                                                        \
+    do {                                                                                           \
+        if(!DOCTEST_GCS().hasLoggedCurrentTestStart) {                                             \
+            doctest::detail::logTestStart(DOCTEST_GCS().currentTest->m_name,                       \
+                                          DOCTEST_GCS().currentTest->m_file,                       \
+                                          DOCTEST_GCS().currentTest->m_line);                      \
+            DOCTEST_GCS().hasLoggedCurrentTestStart = true;                                        \
+        }                                                                                          \
+    } while(doctest::detail::always_false())
+
+// required includes - will go only in one translation unit!
+#include <ctime>
+#include <cmath>
+// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/onqtam/doctest/pull/37
+#ifdef __BORLANDC__
+#include <math.h>
+#endif // __BORLANDC__
+#include <new>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <limits>
+#include <utility>
+#include <sstream>
+#include <iomanip>
+#include <vector>
+#include <set>
+
+namespace doctest
+{
+namespace detail
+{
+    // not using std::strlen() because of valgrind errors when optimizations are turned on
+    // 'Invalid read of size 4' when the test suite len (with '\0') is not a multiple of 4
+    // for details see http://stackoverflow.com/questions/35671155
+    size_t my_strlen(const char* in) {
+        const char* temp = in;
+        while(temp && *temp)
+            ++temp;
+        return temp - in;
+    }
+
+    template <typename T>
+    T my_max(const T& lhs, const T& rhs) {
+        return lhs > rhs ? lhs : rhs;
+    }
+
+    // case insensitive strcmp
+    int stricmp(char const* a, char const* b) {
+        for(;; a++, b++) {
+            int d = tolower(*a) - tolower(*b);
+            if(d != 0 || !*a)
+                return d;
+        }
+    }
+
+    template <typename T>
+    String fpToString(T value, int precision) {
+        std::ostringstream oss;
+        oss << std::setprecision(precision) << std::fixed << value;
+        std::string d = oss.str();
+        size_t      i = d.find_last_not_of('0');
+        if(i != std::string::npos && i != d.size() - 1) {
+            if(d[i] == '.')
+                i++;
+            d = d.substr(0, i + 1);
+        }
+        return d.c_str();
+    }
+
+    struct Endianness
+    {
+        enum Arch
+        {
+            Big,
+            Little
+        };
+
+        static Arch which() {
+            union _
+            {
+                int  asInt;
+                char asChar[sizeof(int)];
+            } u;
+
+            u.asInt = 1;
+            return (u.asChar[sizeof(int) - 1] == 1) ? Big : Little;
+        }
+    };
+
+    String rawMemoryToString(const void* object, unsigned size) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>(size), inc = 1;
+        if(Endianness::which() == Endianness::Little) {
+            i   = end - 1;
+            end = inc = -1;
+        }
+
+        unsigned char const* bytes = static_cast<unsigned char const*>(object);
+        std::ostringstream   os;
+        os << "0x" << std::setfill('0') << std::hex;
+        for(; i != end; i += inc)
+            os << std::setw(2) << static_cast<unsigned>(bytes[i]);
+        return os.str().c_str();
+    }
+
+    std::ostream* createStream() { return new std::ostringstream(); }
+    String getStreamResult(std::ostream* in) {
+        return static_cast<std::ostringstream*>(in)->str().c_str();
+    }
+    void freeStream(std::ostream* in) { delete in; }
+
+#ifndef DOCTEST_CONFIG_DISABLE
+
+    // this holds both parameters for the command line and runtime data for tests
+    struct ContextState : TestAccessibleContextState
+    {
+        // == parameters from the command line
+
+        std::vector<std::vector<String> > filters;
+
+        String   order_by;  // how tests should be ordered
+        unsigned rand_seed; // the seed for rand ordering
+
+        unsigned first; // the first (matching) test to be executed
+        unsigned last;  // the last (matching) test to be executed
+
+        int  abort_after;    // stop tests after this many failed assertions
+        bool case_sensitive; // if filtering should be case sensitive
+        bool exit;           // if the program should be exited after the tests are ran/whatever
+        bool no_exitcode;    // if the framework should return 0 as the exitcode
+        bool no_run;         // to not run the tests at all (can be done with an "*" exclude)
+        bool no_colors;      // if output to the console should be colorized
+        bool no_path_in_filenames; // if the path to files should be removed from the output
+
+        bool help;             // to print the help
+        bool version;          // to print the version
+        bool count;            // if only the count of matching tests is to be retreived
+        bool list_test_cases;  // to list all tests matching the filters
+        bool list_test_suites; // to list all suites matching the filters
+
+        // == data for the tests being ran
+
+        int numAssertions;
+        int numFailedAssertions;
+        int numFailedAssertionsForCurrentTestcase;
+
+        // stuff for subcases
+        std::set<SubcaseSignature> subcasesPassed;
+        std::set<int>              subcasesEnteredLevels;
+        std::vector<Subcase>       subcasesStack;
+        int                        subcasesCurrentLevel;
+        bool                       subcasesHasSkipped;
+
+        void resetRunData() {
+            numAssertions       = 0;
+            numFailedAssertions = 0;
+        }
+
+        ContextState()
+                : filters(6) // 6 different filters total
+        {
+            resetRunData();
+        }
+    };
+
+    ContextState*& getContextState();
+#endif // DOCTEST_CONFIG_DISABLE
+} // namespace detail
+
+String::String(const char* in)
+        : m_str(static_cast<char*>(malloc(detail::my_strlen(in) + 1))) {
+    if(in)
+        strcpy(m_str, in);
+    else
+        m_str[0] = '\0';
+}
+
+String::String(const String& other)
+        : m_str(0) {
+    copy(other);
+}
+
+void String::copy(const String& other) {
+    if(m_str)
+        free(m_str);
+    m_str = static_cast<char*>(malloc(detail::my_strlen(other.m_str) + 1));
+    strcpy(m_str, other.m_str);
+}
+
+String::~String() { free(m_str); }
+
+String& String::operator=(const String& other) {
+    if(this != &other)
+        copy(other);
+    return *this;
+}
+
+String String::operator+(const String& other) const { return String(m_str) += other; }
+
+String& String::operator+=(const String& other) {
+    using namespace detail;
+    if(other.m_str != 0) {
+        char* newStr = static_cast<char*>(malloc(my_strlen(m_str) + my_strlen(other.m_str) + 1));
+        strcpy(newStr, m_str);
+        strcpy(newStr + my_strlen(m_str), other.m_str);
+        free(m_str);
+        m_str = newStr;
+    }
+    return *this;
+}
+
+unsigned String::size() const { return m_str ? detail::my_strlen(m_str) : 0; }
+unsigned String::length() const { return size(); }
+
+int String::compare(const char* other, bool no_case) const {
+    if(no_case)
+        return detail::stricmp(m_str, other);
+    return strcmp(m_str, other);
+}
+
+int String::compare(const String& other, bool no_case) const {
+    if(no_case)
+        return detail::stricmp(m_str, other.m_str);
+    return strcmp(m_str, other.m_str);
+}
+
+std::ostream& operator<<(std::ostream& stream, const String& in) {
+    stream << in.c_str();
+    return stream;
+}
+
+Approx::Approx(double value)
+        : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100)
+        , m_scale(1.0)
+        , m_value(value) {}
+
+bool operator==(double lhs, Approx const& rhs) {
+    // Thanks to Richard Harris for his help refining this formula
+    return fabs(lhs - rhs.m_value) <
+           rhs.m_epsilon * (rhs.m_scale + detail::my_max(fabs(lhs), fabs(rhs.m_value)));
+}
+
+String Approx::toString() const { return String("Approx( ") + doctest::toString(m_value) + " )"; }
+
+#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+String toString(char* in) { return toString(static_cast<const char*>(in)); }
+String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; }
+#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
+String toString(bool in) { return in ? "true" : "false"; }
+String toString(float in) { return detail::fpToString(in, 5) + "f"; }
+String toString(double in) { return detail::fpToString(in, 10); }
+String toString(double long in) { return detail::fpToString(in, 15); }
+
+String toString(char in) {
+    char buf[64];
+    sprintf(buf, "%d", in);
+    return buf;
+}
+
+String toString(char unsigned in) {
+    char buf[64];
+    sprintf(buf, "%ud", in);
+    return buf;
+}
+
+String toString(int short in) {
+    char buf[64];
+    sprintf(buf, "%d", in);
+    return buf;
+}
+
+String toString(int short unsigned in) {
+    char buf[64];
+    sprintf(buf, "%u", in);
+    return buf;
+}
+
+String toString(int in) {
+    char buf[64];
+    sprintf(buf, "%d", in);
+    return buf;
+}
+
+String toString(int unsigned in) {
+    char buf[64];
+    sprintf(buf, "%u", in);
+    return buf;
+}
+
+String toString(int long in) {
+    char buf[64];
+    sprintf(buf, "%ld", in);
+    return buf;
+}
+
+String toString(int long unsigned in) {
+    char buf[64];
+    sprintf(buf, "%lu", in);
+    return buf;
+}
+
+#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
+String toString(int long long in) {
+    char buf[64];
+    sprintf(buf, "%lld", in);
+    return buf;
+}
+String toString(int long long unsigned in) {
+    char buf[64];
+    sprintf(buf, "%llu", in);
+    return buf;
+}
+#endif // DOCTEST_CONFIG_WITH_LONG_LONG
+
+#ifdef DOCTEST_CONFIG_WITH_NULLPTR
+String toString(std::nullptr_t) { return "nullptr"; }
+#endif // DOCTEST_CONFIG_WITH_NULLPTR
+
+} // namespace doctest
+
+#if defined(DOCTEST_CONFIG_DISABLE)
+namespace doctest
+{
+Context::Context(int, const char* const*) {}
+Context::~Context() {}
+void Context::applyCommandLine(int, const char* const*) {}
+void Context::addFilter(const char*, const char*) {}
+void Context::clearFilters() {}
+void Context::setOption(const char*, int) {}
+void Context::setOption(const char*, const char*) {}
+bool Context::shouldExit() { return false; }
+int  Context::run() { return 0; }
+} // namespace doctest
+#else // DOCTEST_CONFIG_DISABLE
+
+#if !defined(DOCTEST_CONFIG_COLORS_NONE)
+#if !defined(DOCTEST_CONFIG_COLORS_WINDOWS) && !defined(DOCTEST_CONFIG_COLORS_ANSI)
+#ifdef DOCTEST_PLATFORM_WINDOWS
+#define DOCTEST_CONFIG_COLORS_WINDOWS
+#else // linux
+#define DOCTEST_CONFIG_COLORS_ANSI
+#endif // platform
+#endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI
+#endif // DOCTEST_CONFIG_COLORS_NONE
+
+#define DOCTEST_PRINTF_COLORED(buffer, color)                                                      \
+    do {                                                                                           \
+        if(buffer[0] != 0) {                                                                       \
+            doctest::detail::Color col(color);                                                     \
+            printf("%s", buffer);                                                                  \
+        }                                                                                          \
+    } while(doctest::detail::always_false())
+
+// the buffer size used for snprintf() calls
+#if !defined(DOCTEST_SNPRINTF_BUFFER_LENGTH)
+#define DOCTEST_SNPRINTF_BUFFER_LENGTH 1024
+#endif // DOCTEST_SNPRINTF_BUFFER_LENGTH
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#if defined(_MSC_VER) && _MSC_VER >= 1700
+#define DOCTEST_WINDOWS_SAL_IN_OPT _In_opt_
+#else // _MSC_VER
+#define DOCTEST_WINDOWS_SAL_IN_OPT
+#endif // _MSC_VER
+extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(
+        DOCTEST_WINDOWS_SAL_IN_OPT const char*);
+extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+#endif // _MSC_VER || __MINGW32__
+
+#ifdef DOCTEST_CONFIG_COLORS_ANSI
+#include <unistd.h>
+#endif // DOCTEST_CONFIG_COLORS_ANSI
+
+#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
+
+// defines for a leaner windows.h
+#ifndef WIN32_MEAN_AND_LEAN
+#define WIN32_MEAN_AND_LEAN
+#endif // WIN32_MEAN_AND_LEAN
+#ifndef VC_EXTRA_LEAN
+#define VC_EXTRA_LEAN
+#endif // VC_EXTRA_LEAN
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif // NOMINMAX
+
+// not sure what AfxWin.h is for - here I do what Catch does
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#endif // DOCTEST_CONFIG_COLORS_WINDOWS
+
+namespace doctest
+{
+namespace detail
+{
+    bool TestData::operator<(const TestData& other) const {
+        if(m_line != other.m_line)
+            return m_line < other.m_line;
+        return strcmp(m_file, other.m_file) < 0;
+    }
+
+    const char* getAssertString(assertType::Enum val) {
+        switch(val) {
+            // clang-format off
+            case assertType::DT_WARN                    : return "WARN";
+            case assertType::DT_CHECK                   : return "CHECK";
+            case assertType::DT_REQUIRE                 : return "REQUIRE";
+
+            case assertType::DT_WARN_FALSE              : return "WARN_FALSE";
+            case assertType::DT_CHECK_FALSE             : return "CHECK_FALSE";
+            case assertType::DT_REQUIRE_FALSE           : return "REQUIRE_FALSE";
+
+            case assertType::DT_WARN_THROWS             : return "WARN_THROWS";
+            case assertType::DT_CHECK_THROWS            : return "CHECK_THROWS";
+            case assertType::DT_REQUIRE_THROWS          : return "REQUIRE_THROWS";
+
+            case assertType::DT_WARN_THROWS_AS          : return "WARN_THROWS_AS";
+            case assertType::DT_CHECK_THROWS_AS         : return "CHECK_THROWS_AS";
+            case assertType::DT_REQUIRE_THROWS_AS       : return "REQUIRE_THROWS_AS";
+
+            case assertType::DT_WARN_NOTHROW            : return "WARN_NOTHROW";
+            case assertType::DT_CHECK_NOTHROW           : return "CHECK_NOTHROW";
+            case assertType::DT_REQUIRE_NOTHROW         : return "REQUIRE_NOTHROW";
+
+            case assertType::DT_WARN_EQ                 : return "WARN_EQ";
+            case assertType::DT_CHECK_EQ                : return "CHECK_EQ";
+            case assertType::DT_REQUIRE_EQ              : return "REQUIRE_EQ";
+            case assertType::DT_WARN_NE                 : return "WARN_NE";
+            case assertType::DT_CHECK_NE                : return "CHECK_NE";
+            case assertType::DT_REQUIRE_NE              : return "REQUIRE_NE";
+            case assertType::DT_WARN_GT                 : return "WARN_GT";
+            case assertType::DT_CHECK_GT                : return "CHECK_GT";
+            case assertType::DT_REQUIRE_GT              : return "REQUIRE_GT";
+            case assertType::DT_WARN_LT                 : return "WARN_LT";
+            case assertType::DT_CHECK_LT                : return "CHECK_LT";
+            case assertType::DT_REQUIRE_LT              : return "REQUIRE_LT";
+            case assertType::DT_WARN_GE                 : return "WARN_GE";
+            case assertType::DT_CHECK_GE                : return "CHECK_GE";
+            case assertType::DT_REQUIRE_GE              : return "REQUIRE_GE";
+            case assertType::DT_WARN_LE                 : return "WARN_LE";
+            case assertType::DT_CHECK_LE                : return "CHECK_LE";
+            case assertType::DT_REQUIRE_LE              : return "REQUIRE_LE";
+
+            case assertType::DT_WARN_UNARY              : return "WARN_UNARY";
+            case assertType::DT_CHECK_UNARY             : return "CHECK_UNARY";
+            case assertType::DT_REQUIRE_UNARY           : return "REQUIRE_UNARY";
+            case assertType::DT_WARN_UNARY_FALSE        : return "WARN_UNARY_FALSE";
+            case assertType::DT_CHECK_UNARY_FALSE       : return "CHECK_UNARY_FALSE";
+            case assertType::DT_REQUIRE_UNARY_FALSE     : return "REQUIRE_UNARY_FALSE";
+
+            case assertType::DT_FAST_WARN_EQ            : return "FAST_WARN_EQ";
+            case assertType::DT_FAST_CHECK_EQ           : return "FAST_CHECK_EQ";
+            case assertType::DT_FAST_REQUIRE_EQ         : return "FAST_REQUIRE_EQ";
+            case assertType::DT_FAST_WARN_NE            : return "FAST_WARN_NE";
+            case assertType::DT_FAST_CHECK_NE           : return "FAST_CHECK_NE";
+            case assertType::DT_FAST_REQUIRE_NE         : return "FAST_REQUIRE_NE";
+            case assertType::DT_FAST_WARN_GT            : return "FAST_WARN_GT";
+            case assertType::DT_FAST_CHECK_GT           : return "FAST_CHECK_GT";
+            case assertType::DT_FAST_REQUIRE_GT         : return "FAST_REQUIRE_GT";
+            case assertType::DT_FAST_WARN_LT            : return "FAST_WARN_LT";
+            case assertType::DT_FAST_CHECK_LT           : return "FAST_CHECK_LT";
+            case assertType::DT_FAST_REQUIRE_LT         : return "FAST_REQUIRE_LT";
+            case assertType::DT_FAST_WARN_GE            : return "FAST_WARN_GE";
+            case assertType::DT_FAST_CHECK_GE           : return "FAST_CHECK_GE";
+            case assertType::DT_FAST_REQUIRE_GE         : return "FAST_REQUIRE_GE";
+            case assertType::DT_FAST_WARN_LE            : return "FAST_WARN_LE";
+            case assertType::DT_FAST_CHECK_LE           : return "FAST_CHECK_LE";
+            case assertType::DT_FAST_REQUIRE_LE         : return "FAST_REQUIRE_LE";
+
+            case assertType::DT_FAST_WARN_UNARY         : return "FAST_WARN_UNARY";
+            case assertType::DT_FAST_CHECK_UNARY        : return "FAST_CHECK_UNARY";
+            case assertType::DT_FAST_REQUIRE_UNARY      : return "FAST_REQUIRE_UNARY";
+            case assertType::DT_FAST_WARN_UNARY_FALSE   : return "FAST_WARN_UNARY_FALSE";
+            case assertType::DT_FAST_CHECK_UNARY_FALSE  : return "FAST_CHECK_UNARY_FALSE";
+            case assertType::DT_FAST_REQUIRE_UNARY_FALSE: return "FAST_REQUIRE_UNARY_FALSE";
+                // clang-format on
+        }
+        return "";
+    }
+
+    bool checkIfShouldThrow(assertType::Enum assert_type) {
+        if(assert_type & assertType::is_require)
+            return true;
+
+        if((assert_type & assertType::is_check) && getContextState()->abort_after > 0) {
+            if(getContextState()->numFailedAssertions >= getContextState()->abort_after)
+                return true;
+        }
+
+        return false;
+    }
+    void fastAssertThrowIfFlagSet(int flags) {
+        if(flags & assertAction::shouldthrow)
+            throwException();
+    }
+    void throwException() { throw TestFailureException(); }
+    bool always_false() { return false; }
+
+    // lowers ascii letters
+    char tolower(const char c) { return ((c >= 'A' && c <= 'Z') ? static_cast<char>(c + 32) : c); }
+
+    // matching of a string against a wildcard mask (case sensitivity configurable) taken from
+    // http://www.emoticode.net/c/simple-wildcard-string-compare-globbing-function.html
+    int wildcmp(const char* str, const char* wild, bool caseSensitive) {
+        const char* cp = 0;
+        const char* mp = 0;
+
+        // rolled my own tolower() to not include more headers
+        while((*str) && (*wild != '*')) {
+            if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) &&
+               (*wild != '?')) {
+                return 0;
+            }
+            wild++;
+            str++;
+        }
+
+        while(*str) {
+            if(*wild == '*') {
+                if(!*++wild) {
+                    return 1;
+                }
+                mp = wild;
+                cp = str + 1;
+            } else if((caseSensitive ? (*wild == *str) : (tolower(*wild) == tolower(*str))) ||
+                      (*wild == '?')) {
+                wild++;
+                str++;
+            } else {
+                wild = mp;
+                str  = cp++;
+            }
+        }
+
+        while(*wild == '*') {
+            wild++;
+        }
+        return !*wild;
+    }
+
+    //// C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
+    //unsigned hashStr(unsigned const char* str) {
+    //    unsigned long hash = 5381;
+    //    char          c;
+    //    while((c = *str++))
+    //        hash = ((hash << 5) + hash) + c; // hash * 33 + c
+    //    return hash;
+    //}
+
+    // checks if the name matches any of the filters (and can be configured what to do when empty)
+    int matchesAny(const char* name, std::vector<String> filters, int matchEmpty,
+                   bool caseSensitive) {
+        if(filters.size() == 0 && matchEmpty)
+            return 1;
+        for(unsigned i = 0; i < filters.size(); ++i)
+            if(wildcmp(name, filters[i].c_str(), caseSensitive))
+                return 1;
+        return 0;
+    }
+
+    // the current ContextState with which tests are being executed
+    ContextState*& getContextState() {
+        static ContextState* data = 0;
+        return data;
+    }
+
+    TestAccessibleContextState* getTestsContextState() { return getContextState(); }
+
+    bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
+        if(m_line != other.m_line)
+            return m_line < other.m_line;
+        if(strcmp(m_file, other.m_file) != 0)
+            return strcmp(m_file, other.m_file) < 0;
+        return strcmp(m_name, other.m_name) < 0;
+    }
+
+    Subcase::Subcase(const char* name, const char* file, int line)
+            : m_signature(name, file, line)
+            , m_entered(false) {
+        ContextState* s = getContextState();
+
+        // if we have already completed it
+        if(s->subcasesPassed.count(m_signature) != 0)
+            return;
+
+        // if a Subcase on the same level has already been entered
+        if(s->subcasesEnteredLevels.count(s->subcasesCurrentLevel) != 0) {
+            s->subcasesHasSkipped = true;
+            return;
+        }
+
+        s->subcasesStack.push_back(*this);
+        if(s->hasLoggedCurrentTestStart)
+            logTestEnd();
+        s->hasLoggedCurrentTestStart = false;
+
+        s->subcasesEnteredLevels.insert(s->subcasesCurrentLevel++);
+        m_entered = true;
+    }
+
+    Subcase::Subcase(const Subcase& other)
+            : m_signature(other.m_signature.m_name, other.m_signature.m_file,
+                          other.m_signature.m_line)
+            , m_entered(other.m_entered) {}
+
+    Subcase::~Subcase() {
+        if(m_entered) {
+            ContextState* s = getContextState();
+
+            s->subcasesCurrentLevel--;
+            // only mark the subcase as passed if no subcases have been skipped
+            if(s->subcasesHasSkipped == false)
+                s->subcasesPassed.insert(m_signature);
+
+            if(s->subcasesStack.size() > 0)
+                s->subcasesStack.pop_back();
+            if(s->hasLoggedCurrentTestStart)
+                logTestEnd();
+            s->hasLoggedCurrentTestStart = false;
+        }
+    }
+
+    // for sorting tests by file/line
+    int fileOrderComparator(const void* a, const void* b) {
+        const TestData* lhs = *static_cast<TestData* const*>(a);
+        const TestData* rhs = *static_cast<TestData* const*>(b);
+#ifdef _MSC_VER
+        // this is needed because MSVC gives different case for drive letters
+        // for __FILE__ when evaluated in a header and a source file
+        int res = stricmp(lhs->m_file, rhs->m_file);
+#else  // _MSC_VER
+        int res = strcmp(lhs->m_file, rhs->m_file);
+#endif // _MSC_VER
+        if(res != 0)
+            return res;
+        return static_cast<int>(lhs->m_line - rhs->m_line);
+    }
+
+    // for sorting tests by suite/file/line
+    int suiteOrderComparator(const void* a, const void* b) {
+        const TestData* lhs = *static_cast<TestData* const*>(a);
+        const TestData* rhs = *static_cast<TestData* const*>(b);
+
+        int res = strcmp(lhs->m_suite, rhs->m_suite);
+        if(res != 0)
+            return res;
+        return fileOrderComparator(a, b);
+    }
+
+    // for sorting tests by name/suite/file/line
+    int nameOrderComparator(const void* a, const void* b) {
+        const TestData* lhs = *static_cast<TestData* const*>(a);
+        const TestData* rhs = *static_cast<TestData* const*>(b);
+
+        int res = strcmp(lhs->m_name, rhs->m_name);
+        if(res != 0)
+            return res;
+        return suiteOrderComparator(a, b);
+    }
+
+    // holds the current test suite
+    const char*& getCurrentTestSuite() {
+        static const char* data = 0;
+        return data;
+    }
+
+    // sets the current test suite
+    int setTestSuiteName(const char* name) {
+        getCurrentTestSuite() = name;
+        return 0;
+    }
+
+    // all the registered tests
+    std::set<TestData>& getRegisteredTests() {
+        static std::set<TestData> data;
+        return data;
+    }
+
+    // used by the macros for registering tests
+    int regTest(funcType f, unsigned line, const char* file, const char* name) {
+        getRegisteredTests().insert(TestData(getCurrentTestSuite(), name, f, file, line));
+        return 0;
+    }
+
+    struct Color
+    {
+        enum Code
+        {
+            None = 0,
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed   = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey   = Bright | Grey,
+            BrightWhite = Bright | White
+        };
+        Color(Code code) { use(code); }
+        ~Color() { use(None); }
+
+        void use(Code code);
+
+    private:
+        Color(Color const& other);
+    };
+
+    void Color::use(Code
+#ifndef DOCTEST_CONFIG_COLORS_NONE
+                            code
+#endif // DOCTEST_CONFIG_COLORS_NONE
+                    ) {
+        ContextState* p = getContextState();
+        if(p->no_colors)
+            return;
+#ifdef DOCTEST_CONFIG_COLORS_ANSI
+        if(isatty(STDOUT_FILENO)) {
+            const char* col = "";
+            // clang-format off
+            switch(code) {
+                case Color::Red:         col = "[0;31m"; break;
+                case Color::Green:       col = "[0;32m"; break;
+                case Color::Blue:        col = "[0;34m"; break;
+                case Color::Cyan:        col = "[0;36m"; break;
+                case Color::Yellow:      col = "[0;33m"; break;
+                case Color::Grey:        col = "[1;30m"; break;
+                case Color::LightGrey:   col = "[0;37m"; break;
+                case Color::BrightRed:   col = "[1;31m"; break;
+                case Color::BrightGreen: col = "[1;32m"; break;
+                case Color::BrightWhite: col = "[1;37m"; break;
+                case Color::Bright: // invalid
+                case Color::None:
+                case Color::White:
+                default:                 col = "[0m";
+            }
+            // clang-format on
+            printf("\033%s", col);
+        }
+#endif // DOCTEST_CONFIG_COLORS_ANSI
+
+#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
+        static HANDLE stdoutHandle(GetStdHandle(STD_OUTPUT_HANDLE));
+        static WORD   originalForegroundAttributes;
+        static WORD   originalBackgroundAttributes;
+        static bool   attrsInitted = false;
+        if(!attrsInitted) {
+            attrsInitted = true;
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo(stdoutHandle, &csbiInfo);
+            originalForegroundAttributes =
+                    csbiInfo.wAttributes &
+                    ~(BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY);
+            originalBackgroundAttributes =
+                    csbiInfo.wAttributes &
+                    ~(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY);
+        }
+
+#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(stdoutHandle, x | originalBackgroundAttributes)
+
+        // clang-format off
+        switch (code) {
+            case Color::White:       DOCTEST_SET_ATTR(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
+            case Color::Red:         DOCTEST_SET_ATTR(FOREGROUND_RED);                                      break;
+            case Color::Green:       DOCTEST_SET_ATTR(FOREGROUND_GREEN);                                    break;
+            case Color::Blue:        DOCTEST_SET_ATTR(FOREGROUND_BLUE);                                     break;
+            case Color::Cyan:        DOCTEST_SET_ATTR(FOREGROUND_BLUE | FOREGROUND_GREEN);                  break;
+            case Color::Yellow:      DOCTEST_SET_ATTR(FOREGROUND_RED | FOREGROUND_GREEN);                   break;
+            case Color::Grey:        DOCTEST_SET_ATTR(0);                                                   break;
+            case Color::LightGrey:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY);                                break;
+            case Color::BrightRed:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_RED);               break;
+            case Color::BrightGreen: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN);             break;
+            case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
+            case Color::None:
+            case Color::Bright: // invalid
+            default:                 DOCTEST_SET_ATTR(originalForegroundAttributes);
+        }
+// clang-format on
+#undef DOCTEST_SET_ATTR
+#endif // DOCTEST_CONFIG_COLORS_WINDOWS
+    }
+
+    // this is needed because MSVC does not permit mixing 2 exception handling schemes in a function
+    int callTestFunc(funcType f) {
+        int res = EXIT_SUCCESS;
+        try {
+            f();
+            if(getContextState()->numFailedAssertionsForCurrentTestcase)
+                res = EXIT_FAILURE;
+        } catch(const TestFailureException&) { res = EXIT_FAILURE; } catch(...) {
+            DOCTEST_LOG_START();
+            logTestCrashed();
+            res = EXIT_FAILURE;
+        }
+        return res;
+    }
+
+    // depending on the current options this will remove the path of filenames
+    const char* fileForOutput(const char* file) {
+        if(getContextState()->no_path_in_filenames) {
+            const char* back    = strrchr(file, '\\');
+            const char* forward = strrchr(file, '/');
+            if(back || forward) {
+                if(back > forward)
+                    forward = back;
+                return forward + 1;
+            }
+        }
+        return file;
+    }
+
+#ifdef DOCTEST_PLATFORM_MAC
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/sysctl.h>
+    // The following function is taken directly from the following technical note:
+    // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
+    // Returns true if the current process is being debugged (either
+    // running under the debugger or has a debugger attached post facto).
+    bool isDebuggerActive() {
+        int               mib[4];
+        struct kinfo_proc info;
+        size_t            size;
+        // Initialize the flags so that, if sysctl fails for some bizarre
+        // reason, we get a predictable result.
+        info.kp_proc.p_flag = 0;
+        // Initialize mib, which tells sysctl the info we want, in this case
+        // we're looking for information about a specific process ID.
+        mib[0] = CTL_KERN;
+        mib[1] = KERN_PROC;
+        mib[2] = KERN_PROC_PID;
+        mib[3] = getpid();
+        // Call sysctl.
+        size = sizeof(info);
+        if(sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, 0, 0) != 0) {
+            fprintf(stderr, "\n** Call to sysctl failed - unable to determine if debugger is "
+                            "active **\n\n");
+            return false;
+        }
+        // We're being debugged if the P_TRACED flag is set.
+        return ((info.kp_proc.p_flag & P_TRACED) != 0);
+    }
+#elif defined(_MSC_VER) || defined(__MINGW32__)
+    bool    isDebuggerActive() { return ::IsDebuggerPresent() != 0; }
+#else
+    bool isDebuggerActive() { return false; }
+#endif // Platform
+
+#ifdef DOCTEST_PLATFORM_WINDOWS
+    void myOutputDebugString(const String& text) { ::OutputDebugStringA(text.c_str()); }
+#else
+    // TODO: integration with XCode and other IDEs
+    void myOutputDebugString(const String&) {}
+#endif // Platform
+
+    const char* getSeparator() {
+        return "===============================================================================\n";
+    }
+
+    void printToDebugConsole(const String& text) {
+        if(isDebuggerActive())
+            myOutputDebugString(text.c_str());
+    }
+
+    void addFailedAssert(assertType::Enum assert_type) {
+        if((assert_type & assertType::is_warn) == 0) {
+            getContextState()->numFailedAssertionsForCurrentTestcase++;
+            getContextState()->numFailedAssertions++;
+        }
+    }
+
+    void logTestStart(const char* name, const char* file, unsigned line) {
+        const char* newLine = "\n";
+
+        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)\n", fileForOutput(file), line);
+
+        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "%s\n", name);
+
+        DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow);
+        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
+        DOCTEST_PRINTF_COLORED(msg, Color::None);
+
+        String                subcaseStuff  = "";
+        std::vector<Subcase>& subcasesStack = getContextState()->subcasesStack;
+        for(unsigned i = 0; i < subcasesStack.size(); ++i) {
+            char subcase[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+            DOCTEST_SNPRINTF(subcase, DOCTEST_COUNTOF(loc), "  %s\n",
+                             subcasesStack[i].m_signature.m_name);
+            DOCTEST_PRINTF_COLORED(subcase, Color::None);
+            subcaseStuff += subcase;
+        }
+
+        DOCTEST_PRINTF_COLORED(newLine, Color::None);
+
+        printToDebugConsole(String(getSeparator()) + loc + msg + subcaseStuff.c_str() + newLine);
+    }
+
+    void logTestEnd() {}
+
+    void logTestCrashed() {
+        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+
+        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "TEST CASE FAILED! (threw exception)\n\n");
+
+        DOCTEST_PRINTF_COLORED(msg, Color::Red);
+
+        printToDebugConsole(String(msg));
+    }
+
+    void logAssert(bool passed, const char* decomposition, bool threw, const char* expr,
+                   assertType::Enum assert_type, const char* file, int line) {
+        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
+
+        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        if(passed)
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
+        else
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED! %s\n",
+                             (threw ? "(threw exception)" : ""));
+
+        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n",
+                         getAssertString(assert_type), expr);
+
+        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        info2[0] = 0;
+        info3[0] = 0;
+        if(!threw) {
+            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "with expansion:\n");
+            DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), "  %s( %s )\n",
+                             getAssertString(assert_type), decomposition);
+        }
+
+        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
+        DOCTEST_PRINTF_COLORED(msg, passed ? Color::BrightGreen : Color::Red);
+        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
+        DOCTEST_PRINTF_COLORED(info2, Color::None);
+        DOCTEST_PRINTF_COLORED(info3, Color::Cyan);
+        DOCTEST_PRINTF_COLORED("\n", Color::None);
+
+        printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + "\n");
+    }
+
+    void logAssertThrows(bool threw, const char* expr, assertType::Enum assert_type,
+                         const char* file, int line) {
+        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
+
+        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        if(threw)
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
+        else
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED!\n");
+
+        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n\n",
+                         getAssertString(assert_type), expr);
+
+        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
+        DOCTEST_PRINTF_COLORED(msg, threw ? Color::BrightGreen : Color::Red);
+        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
+
+        printToDebugConsole(String(loc) + msg + info1);
+    }
+
+    void logAssertThrowsAs(bool threw, bool threw_as, const char* as, const char* expr,
+                           assertType::Enum assert_type, const char* file, int line) {
+        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
+
+        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        if(threw_as)
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
+        else
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED! %s\n",
+                             (threw ? "(threw something else)" : "(didn't throw at all)"));
+
+        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s, %s )\n\n",
+                         getAssertString(assert_type), expr, as);
+
+        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
+        DOCTEST_PRINTF_COLORED(msg, threw_as ? Color::BrightGreen : Color::Red);
+        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
+
+        printToDebugConsole(String(loc) + msg + info1);
+    }
+
+    void logAssertNothrow(bool threw, const char* expr, assertType::Enum assert_type,
+                          const char* file, int line) {
+        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
+
+        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        if(!threw)
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
+        else
+            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED!\n");
+
+        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n\n",
+                         getAssertString(assert_type), expr);
+
+        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
+        DOCTEST_PRINTF_COLORED(msg, !threw ? Color::BrightGreen : Color::Red);
+        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
+
+        printToDebugConsole(String(loc) + msg + info1);
+    }
+
+    ResultBuilder::ResultBuilder(assertType::Enum assert_type, const char* file, int line,
+                                 const char* expr, const char* exception_type)
+            : m_assert_type(assert_type)
+            , m_file(file)
+            , m_line(line)
+            , m_expr(expr)
+            , m_exception_type(exception_type)
+            , m_threw(false)
+            , m_threw_as(false)
+            , m_failed(false) {}
+
+    bool ResultBuilder::log() {
+        if((m_assert_type & assertType::is_warn) == 0)
+            DOCTEST_GCS().numAssertionsForCurrentTestcase++;
+
+        if(m_assert_type & assertType::is_false) {
+            m_result.invert();
+            m_failed = m_result;
+        } else if(m_assert_type & assertType::is_throws) {
+            m_failed = !m_threw;
+        } else if(m_assert_type & assertType::is_throws_as) {
+            m_failed = !m_threw_as;
+        } else if(m_assert_type & assertType::is_nothrow) {
+            m_failed = m_threw;
+        } else {
+            m_failed = m_result;
+        }
+
+        if(m_failed || DOCTEST_GCS().success) {
+            DOCTEST_LOG_START();
+
+            if(m_assert_type & assertType::is_throws) {
+                logAssertThrows(m_threw, m_expr, m_assert_type, m_file, m_line);
+            } else if(m_assert_type & assertType::is_throws_as) {
+                logAssertThrowsAs(m_threw, m_threw_as, m_exception_type, m_expr, m_assert_type,
+                                  m_file, m_line);
+            } else if(m_assert_type & assertType::is_nothrow) {
+                logAssertNothrow(m_threw, m_expr, m_assert_type, m_file, m_line);
+            } else {
+                logAssert(m_result.m_passed, m_result.m_decomposition.c_str(), m_threw, m_expr,
+                          m_assert_type, m_file, m_line);
+            }
+        }
+
+        if(m_failed) {
+            addFailedAssert(m_assert_type);
+            if(isDebuggerActive() && !DOCTEST_GCS().no_breaks)
+                return true; // should break into the debugger
+        }
+        return false;
+    }
+
+    void ResultBuilder::react() const {
+        if(m_failed && checkIfShouldThrow(m_assert_type))
+            throwException();
+    }
+
+    // the implementation of parseFlag()
+    bool parseFlagImpl(int argc, const char* const* argv, const char* pattern) {
+        for(int i = argc - 1; i >= 0; --i) {
+            const char* temp = strstr(argv[i], pattern);
+            if(temp && my_strlen(temp) == my_strlen(pattern)) {
+                // eliminate strings in which the chars before the option are not '-'
+                bool noBadCharsFound = true;
+                while(temp != argv[i]) {
+                    if(*--temp != '-') {
+                        noBadCharsFound = false;
+                        break;
+                    }
+                }
+                if(noBadCharsFound && argv[i][0] == '-')
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    // locates a flag on the command line
+    bool parseFlag(int argc, const char* const* argv, const char* pattern) {
+#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+        if(!parseFlagImpl(argc, argv, pattern))
+            return parseFlagImpl(argc, argv, pattern + 3); // 3 for "dt-"
+        return true;
+#else  // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+        return parseFlagImpl(argc, argv, pattern);
+#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+    }
+
+    // the implementation of parseOption()
+    bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String& res) {
+        for(int i = argc - 1; i >= 0; --i) {
+            const char* temp = strstr(argv[i], pattern);
+            if(temp) {
+                // eliminate matches in which the chars before the option are not '-'
+                bool        noBadCharsFound = true;
+                const char* curr            = argv[i];
+                while(curr != temp) {
+                    if(*curr++ != '-') {
+                        noBadCharsFound = false;
+                        break;
+                    }
+                }
+                if(noBadCharsFound && argv[i][0] == '-') {
+                    temp += my_strlen(pattern);
+                    unsigned len = my_strlen(temp);
+                    if(len) {
+                        res = temp;
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    // parses an option and returns the string after the '=' character
+    bool parseOption(int argc, const char* const* argv, const char* pattern, String& res,
+                     const String& defaultVal = String()) {
+        res = defaultVal;
+#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+        if(!parseOptionImpl(argc, argv, pattern, res))
+            return parseOptionImpl(argc, argv, pattern + 3, res); // 3 for "dt-"
+        return true;
+#else // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+        return parseOptionImpl(argc, argv, pattern, res);
+#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
+    }
+
+    // parses a comma separated list of words after a pattern in one of the arguments in argv
+    bool parseCommaSepArgs(int argc, const char* const* argv, const char* pattern,
+                           std::vector<String>& res) {
+        String filtersString;
+        if(parseOption(argc, argv, pattern, filtersString)) {
+            // tokenize with "," as a separator
+            char* pch = strtok(filtersString.c_str(), ","); // modifies the string
+            while(pch != 0) {
+                if(my_strlen(pch))
+                    res.push_back(pch);
+                pch = strtok(0, ","); // uses the strtok() internal state to go to the next token
+            }
+            return true;
+        }
+        return false;
+    }
+
+    enum optionType
+    {
+        option_bool,
+        option_int
+    };
+
+    // parses an int/bool option from the command line
+    bool parseIntOption(int argc, const char* const* argv, const char* pattern, optionType type,
+                        int& res) {
+        String parsedValue;
+        if(parseOption(argc, argv, pattern, parsedValue)) {
+            if(type == 0) {
+                // boolean
+                const char positive[][5] = {"1", "true", "on", "yes"};  // 5 - strlen("true") + 1
+                const char negative[][6] = {"0", "false", "off", "no"}; // 6 - strlen("false") + 1
+
+                // if the value matches any of the positive/negative possibilities
+                for(unsigned i = 0; i < 4; i++) {
+                    if(parsedValue.compare(positive[i], true) == 0) {
+                        res = 1;
+                        return true;
+                    }
+                    if(parsedValue.compare(negative[i], true) == 0) {
+                        res = 0;
+                        return true;
+                    }
+                }
+            } else {
+                // integer
+                int theInt = atoi(parsedValue.c_str());
+                if(theInt != 0) {
+                    res = theInt;
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    void printVersion() {
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("doctest version is \"%s\"\n", DOCTEST_VERSION_STR);
+    }
+
+    void printHelp() {
+        printVersion();
+        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n");
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("filter  values: \"str1,str2,str3\" (comma separated strings)\n");
+        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("filters use wildcards for matching strings\n");
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("something passes a filter if any of the strings in a filter matches\n");
+        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"dt-\" PREFIX!!!\n");
+        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("Query flags - the program quits after them. Available:\n\n");
+        printf(" -?,   --help, -h                      prints this message\n");
+        printf(" -v,   --version                       prints the version\n");
+        printf(" -c,   --count                         prints the number of matching tests\n");
+        printf(" -ltc, --list-test-cases               lists all matching tests by name\n");
+        printf(" -lts, --list-test-suites              lists all matching test suites\n\n");
+        // ==================================================================================== << 79
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("The available <int>/<string> options/filters are:\n\n");
+        printf(" -tc,  --test-case=<filters>           filters     tests by their name\n");
+        printf(" -tce, --test-case-exclude=<filters>   filters OUT tests by their name\n");
+        printf(" -sf,  --source-file=<filters>         filters     tests by their file\n");
+        printf(" -sfe, --source-file-exclude=<filters> filters OUT tests by their file\n");
+        printf(" -ts,  --test-suite=<filters>          filters     tests by their test suite\n");
+        printf(" -tse, --test-suite-exclude=<filters>  filters OUT tests by their test suite\n");
+        printf(" -ob,  --order-by=<string>             how the tests should be ordered\n");
+        printf("                                       <string> - by [file/suite/name/rand]\n");
+        printf(" -rs,  --rand-seed=<int>               seed for random ordering\n");
+        printf(" -f,   --first=<int>                   the first test passing the filters to\n");
+        printf("                                       execute - for range-based execution\n");
+        printf(" -l,   --last=<int>                    the last test passing the filters to\n");
+        printf("                                       execute - for range-based execution\n");
+        printf(" -aa,  --abort-after=<int>             stop after <int> failed assertions\n\n");
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("Bool options - can be used like flags and true is assumed. Available:\n\n");
+        printf(" -s,   --success=<bool>                include successful assertions in output\n");
+        printf(" -cs,  --case-sensitive=<bool>         filters being treated as case sensitive\n");
+        printf(" -e,   --exit=<bool>                   exits after the tests finish\n");
+        printf(" -nt,  --no-throw=<bool>               skips exceptions-related assert checks\n");
+        printf(" -ne,  --no-exitcode=<bool>            returns (or exits) always with success\n");
+        printf(" -nr,  --no-run=<bool>                 skips all runtime doctest operations\n");
+        printf(" -nc,  --no-colors=<bool>              disables colors in output\n");
+        printf(" -nb,  --no-breaks=<bool>              disables breakpoints in debuggers\n");
+        printf(" -npf, --no-path-filenames=<bool>      only filenames and no paths in output\n\n");
+        // ==================================================================================== << 79
+
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("for more information visit the project documentation\n\n");
+    }
+} // namespace detail
+
+Context::Context(int argc, const char* const* argv)
+        : p(new detail::ContextState) {
+    parseArgs(argc, argv, true);
+}
+
+Context::~Context() { delete p; }
+
+void Context::applyCommandLine(int argc, const char* const* argv) { parseArgs(argc, argv); }
+
+// parses args
+void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) {
+    using namespace detail;
+
+    // clang-format off
+    parseCommaSepArgs(argc, argv, "dt-source-file=",        p->filters[0]);
+    parseCommaSepArgs(argc, argv, "dt-sf=",                 p->filters[0]);
+    parseCommaSepArgs(argc, argv, "dt-source-file-exclude=",p->filters[1]);
+    parseCommaSepArgs(argc, argv, "dt-sfe=",                p->filters[1]);
+    parseCommaSepArgs(argc, argv, "dt-test-suite=",         p->filters[2]);
+    parseCommaSepArgs(argc, argv, "dt-ts=",                 p->filters[2]);
+    parseCommaSepArgs(argc, argv, "dt-test-suite-exclude=", p->filters[3]);
+    parseCommaSepArgs(argc, argv, "dt-tse=",                p->filters[3]);
+    parseCommaSepArgs(argc, argv, "dt-test-case=",          p->filters[4]);
+    parseCommaSepArgs(argc, argv, "dt-tc=",                 p->filters[4]);
+    parseCommaSepArgs(argc, argv, "dt-test-case-exclude=",  p->filters[5]);
+    parseCommaSepArgs(argc, argv, "dt-tce=",                p->filters[5]);
+    // clang-format on
+
+    int    intRes = 0;
+    String strRes;
+
+#define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default)                                   \
+    if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_bool, intRes) ||       \
+       parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_bool, intRes))        \
+        p->var = !!intRes;                                                                         \
+    else if(parseFlag(argc, argv, #name) || parseFlag(argc, argv, #sname))                         \
+        p->var = 1;                                                                                \
+    else if(withDefaults)                                                                          \
+    p->var = default
+
+#define DOCTEST_PARSE_INT_OPTION(name, sname, var, default)                                        \
+    if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_int, intRes) ||        \
+       parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_int, intRes))         \
+        p->var = intRes;                                                                           \
+    else if(withDefaults)                                                                          \
+    p->var = default
+
+#define DOCTEST_PARSE_STR_OPTION(name, sname, var, default)                                        \
+    if(parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), strRes, default) ||              \
+       parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), strRes, default) ||             \
+       withDefaults)                                                                               \
+    p->var = strRes
+
+    // clang-format off
+    DOCTEST_PARSE_STR_OPTION(dt-order-by, dt-ob, order_by, "file");
+    DOCTEST_PARSE_INT_OPTION(dt-rand-seed, dt-rs, rand_seed, 0);
+
+    DOCTEST_PARSE_INT_OPTION(dt-first, dt-f, first, 1);
+    DOCTEST_PARSE_INT_OPTION(dt-last, dt-l, last, 0);
+
+    DOCTEST_PARSE_INT_OPTION(dt-abort-after, dt-aa, abort_after, 0);
+
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-success, dt-s, success, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-case-sensitive, dt-cs, case_sensitive, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-exit, dt-e, exit, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-throw, dt-nt, no_throw, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-exitcode, dt-ne, no_exitcode, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-run, dt-nr, no_run, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-colors, dt-nc, no_colors, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-breaks, dt-nb, no_breaks, 0);
+    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-path-filenames, dt-npf, no_path_in_filenames, 0);
+// clang-format on
+
+#undef DOCTEST_PARSE_STR_OPTION
+#undef DOCTEST_PARSE_INT_OPTION
+#undef DOCTEST_PARSE_AS_BOOL_OR_FLAG
+
+    if(withDefaults) {
+        p->help             = false;
+        p->version          = false;
+        p->count            = false;
+        p->list_test_cases  = false;
+        p->list_test_suites = false;
+    }
+    if(parseFlag(argc, argv, "dt-help") || parseFlag(argc, argv, "dt-h") ||
+       parseFlag(argc, argv, "dt-?")) {
+        p->help = true;
+        p->exit = true;
+    }
+    if(parseFlag(argc, argv, "dt-version") || parseFlag(argc, argv, "dt-v")) {
+        p->version = true;
+        p->exit    = true;
+    }
+    if(parseFlag(argc, argv, "dt-count") || parseFlag(argc, argv, "dt-c")) {
+        p->count = true;
+        p->exit  = true;
+    }
+    if(parseFlag(argc, argv, "dt-list-test-cases") || parseFlag(argc, argv, "dt-ltc")) {
+        p->list_test_cases = true;
+        p->exit            = true;
+    }
+    if(parseFlag(argc, argv, "dt-list-test-suites") || parseFlag(argc, argv, "dt-lts")) {
+        p->list_test_suites = true;
+        p->exit             = true;
+    }
+}
+
+// allows the user to add procedurally to the filters from the command line
+void Context::addFilter(const char* filter, const char* value) { setOption(filter, value); }
+
+// allows the user to clear all filters from the command line
+void Context::clearFilters() {
+    for(unsigned i = 0; i < p->filters.size(); ++i)
+        p->filters[i].clear();
+}
+
+// allows the user to override procedurally the int/bool options from the command line
+void Context::setOption(const char* option, int value) {
+    setOption(option, toString(value).c_str());
+}
+
+// allows the user to override procedurally the string options from the command line
+void Context::setOption(const char* option, const char* value) {
+    String      argv   = String("-") + option + "=" + value;
+    const char* lvalue = argv.c_str();
+    parseArgs(1, &lvalue);
+}
+
+// users should query this in their main() and exit the program if true
+bool Context::shouldExit() { return p->exit; }
+
+// the main function that does all the filtering and test running
+int Context::run() {
+    using namespace detail;
+
+    getContextState() = p;
+    p->resetRunData();
+
+    // handle version, help and no_run
+    if(p->no_run || p->version || p->help) {
+        if(p->version)
+            printVersion();
+        if(p->help)
+            printHelp();
+
+        getContextState() = 0;
+
+        return EXIT_SUCCESS;
+    }
+
+    printVersion();
+    DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+    printf("run with \"--help\" for options\n");
+
+    unsigned i = 0; // counter used for loops - here for VC6
+
+    std::set<TestData>& registeredTests = getRegisteredTests();
+
+    std::vector<const TestData*> testArray;
+    for(std::set<TestData>::iterator it = registeredTests.begin(); it != registeredTests.end();
+        ++it)
+        testArray.push_back(&(*it));
+
+    // sort the collected records
+    if(testArray.size() > 0) {
+        if(p->order_by.compare("file", true) == 0) {
+            qsort(&testArray[0], testArray.size(), sizeof(TestData*), fileOrderComparator);
+        } else if(p->order_by.compare("suite", true) == 0) {
+            qsort(&testArray[0], testArray.size(), sizeof(TestData*), suiteOrderComparator);
+        } else if(p->order_by.compare("name", true) == 0) {
+            qsort(&testArray[0], testArray.size(), sizeof(TestData*), nameOrderComparator);
+        } else if(p->order_by.compare("rand", true) == 0) {
+            srand(p->rand_seed);
+
+            // random_shuffle implementation
+            const TestData** first = &testArray[0];
+            for(i = testArray.size() - 1; i > 0; --i) {
+                int idxToSwap = rand() % (i + 1);
+
+                const TestData* temp = first[i];
+
+                first[i]         = first[idxToSwap];
+                first[idxToSwap] = temp;
+            }
+        }
+    }
+
+    if(p->list_test_cases) {
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("listing all test case names\n");
+    }
+
+    std::set<String> testSuitesPassingFilters;
+    if(p->list_test_suites) {
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("listing all test suites\n");
+    }
+
+    unsigned numTestsPassingFilters = 0;
+    unsigned numFailed              = 0;
+    // invoke the registered functions if they match the filter criteria (or just count them)
+    for(i = 0; i < testArray.size(); i++) {
+        const TestData& data = *testArray[i];
+        if(!matchesAny(data.m_file, p->filters[0], 1, p->case_sensitive))
+            continue;
+        if(matchesAny(data.m_file, p->filters[1], 0, p->case_sensitive))
+            continue;
+        if(!matchesAny(data.m_suite, p->filters[2], 1, p->case_sensitive))
+            continue;
+        if(matchesAny(data.m_suite, p->filters[3], 0, p->case_sensitive))
+            continue;
+        if(!matchesAny(data.m_name, p->filters[4], 1, p->case_sensitive))
+            continue;
+        if(matchesAny(data.m_name, p->filters[5], 0, p->case_sensitive))
+            continue;
+
+        numTestsPassingFilters++;
+
+        // do not execute the test if we are to only count the number of filter passing tests
+        if(p->count)
+            continue;
+
+        // print the name of the test and don't execute it
+        if(p->list_test_cases) {
+            printf("%s\n", data.m_name);
+            continue;
+        }
+
+        // print the name of the test suite if not done already and don't execute it
+        if(p->list_test_suites) {
+            if(testSuitesPassingFilters.count(data.m_suite) == 0) {
+                printf("%s\n", data.m_suite);
+                testSuitesPassingFilters.insert(data.m_suite);
+            }
+            continue;
+        }
+
+        // skip the test if it is not in the execution range
+        if((p->last < numTestsPassingFilters && p->first <= p->last) ||
+           (p->first > numTestsPassingFilters))
+            continue;
+
+        // execute the test if it passes all the filtering
+        {
+#ifdef _MSC_VER
+//__try {
+#endif // _MSC_VER
+
+            p->currentTest = &data;
+
+            // if logging successful tests - force the start log
+            p->hasLoggedCurrentTestStart = false;
+            if(p->success)
+                DOCTEST_LOG_START();
+
+            unsigned didFail = 0;
+            p->subcasesPassed.clear();
+            do {
+                // reset the assertion state
+                p->numAssertionsForCurrentTestcase       = 0;
+                p->numFailedAssertionsForCurrentTestcase = 0;
+
+                // reset some of the fields for subcases (except for the set of fully passed ones)
+                p->subcasesHasSkipped   = false;
+                p->subcasesCurrentLevel = 0;
+                p->subcasesEnteredLevels.clear();
+
+                // execute the test
+                didFail += callTestFunc(data.m_f);
+                p->numAssertions += p->numAssertionsForCurrentTestcase;
+
+                // exit this loop if enough assertions have failed
+                if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after)
+                    p->subcasesHasSkipped = false;
+
+                // if the start has been logged
+                if(p->hasLoggedCurrentTestStart)
+                    logTestEnd();
+                p->hasLoggedCurrentTestStart = false;
+
+            } while(p->subcasesHasSkipped == true);
+
+            if(didFail > 0)
+                numFailed++;
+
+            // stop executing tests if enough assertions have failed
+            if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after)
+                break;
+
+#ifdef _MSC_VER
+//} __except(1) {
+//    printf("Unknown SEH exception caught!\n");
+//    numFailed++;
+//}
+#endif // _MSC_VER
+        }
+    }
+
+    DOCTEST_PRINTF_COLORED(getSeparator(), numFailed > 0 ? Color::Red : Color::Green);
+    if(p->count || p->list_test_cases || p->list_test_suites) {
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+        printf("number of tests passing the current filters: %d\n", numTestsPassingFilters);
+    } else {
+        char buff[DOCTEST_SNPRINTF_BUFFER_LENGTH];
+
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "test cases: %4d", numTestsPassingFilters);
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d passed",
+                         numTestsPassingFilters - numFailed);
+        DOCTEST_PRINTF_COLORED(buff, numFailed > 0 ? Color::None : Color::Green);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d failed", numFailed);
+        DOCTEST_PRINTF_COLORED(buff, numFailed > 0 ? Color::Red : Color::None);
+
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d skipped\n",
+                         static_cast<unsigned>(testArray.size()) - numTestsPassingFilters);
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+
+        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
+
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "assertions: %4d", p->numAssertions);
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d passed",
+                         p->numAssertions - p->numFailedAssertions);
+        DOCTEST_PRINTF_COLORED(buff, numFailed > 0 ? Color::None : Color::Green);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d failed", p->numFailedAssertions);
+        DOCTEST_PRINTF_COLORED(buff, p->numFailedAssertions > 0 ? Color::Red : Color::None);
+
+        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " |\n");
+        DOCTEST_PRINTF_COLORED(buff, Color::None);
+    }
+
+    // remove any coloring
+    DOCTEST_PRINTF_COLORED("", Color::None);
+
+    getContextState() = 0;
+
+    if(numFailed && !p->no_exitcode)
+        return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}
+} // namespace doctest
+
+#endif // DOCTEST_CONFIG_DISABLE
+#endif // DOCTEST_LIBRARY_IMPLEMENTATION
+#endif // DOCTEST_CONFIG_IMPLEMENT
+
+// == THIS SUPPLIES A MAIN FUNCTION AND SHOULD BE DONE ONLY IN ONE TRANSLATION UNIT
+#if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_MAIN_CONFIGURED)
+#define DOCTEST_MAIN_CONFIGURED
+int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); }
+#endif // DOCTEST_MAIN_CONFIGURED
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif // __clang__
+
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
+#pragma GCC diagnostic pop
+#endif // > gcc 4.6
+#endif // __GNUC__
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif // _MSC_VER
diff --git a/Src/External/cereal/unittests/forward_list.cpp b/Src/External/cereal/unittests/forward_list.cpp
new file mode 100644
index 0000000..aefef2e
--- /dev/null
+++ b/Src/External/cereal/unittests/forward_list.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "forward_list.hpp"
+
+TEST_SUITE("forward_list");
+
+TEST_CASE("binary_forward_list")
+{
+  test_forward_list<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_forward_list")
+{
+  test_forward_list<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_forward_list")
+{
+  test_forward_list<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_forward_list")
+{
+  test_forward_list<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/forward_list.hpp b/Src/External/cereal/unittests/forward_list.hpp
new file mode 100644
index 0000000..c0f568b
--- /dev/null
+++ b/Src/External/cereal/unittests/forward_list.hpp
@@ -0,0 +1,95 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_FORWARD_LIST_H_
+#define CEREAL_TEST_FORWARD_LIST_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_forward_list()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::forward_list<int> o_podforward_list(100);
+    for(auto & elem : o_podforward_list)
+      elem = random_value<int>(gen);
+
+    std::forward_list<StructInternalSerialize> o_iserforward_list(100);
+    for(auto & elem : o_iserforward_list)
+      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::forward_list<StructInternalSplit> o_isplforward_list(100);
+    for(auto & elem : o_isplforward_list)
+      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::forward_list<StructExternalSerialize> o_eserforward_list(100);
+    for(auto & elem : o_eserforward_list)
+      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::forward_list<StructExternalSplit> o_esplforward_list(100);
+    for(auto & elem : o_esplforward_list)
+      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podforward_list);
+      oar(o_iserforward_list);
+      oar(o_isplforward_list);
+      oar(o_eserforward_list);
+      oar(o_esplforward_list);
+    }
+
+    std::forward_list<int> i_podforward_list;
+    std::forward_list<StructInternalSerialize> i_iserforward_list;
+    std::forward_list<StructInternalSplit>     i_isplforward_list;
+    std::forward_list<StructExternalSerialize> i_eserforward_list;
+    std::forward_list<StructExternalSplit>     i_esplforward_list;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podforward_list);
+      iar(i_iserforward_list);
+      iar(i_isplforward_list);
+      iar(i_eserforward_list);
+      iar(i_esplforward_list);
+    }
+
+    check_collection(i_podforward_list,  o_podforward_list );
+    check_collection(i_iserforward_list, o_iserforward_list);
+    check_collection(i_isplforward_list, o_isplforward_list);
+    check_collection(i_eserforward_list, o_eserforward_list);
+    check_collection(i_esplforward_list, o_esplforward_list);
+  }
+}
+
+#endif // CEREAL_TEST_FORWARD_LIST_H_
diff --git a/Src/External/cereal/unittests/list.cpp b/Src/External/cereal/unittests/list.cpp
new file mode 100644
index 0000000..099f530
--- /dev/null
+++ b/Src/External/cereal/unittests/list.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "list.hpp"
+
+TEST_SUITE("list");
+
+TEST_CASE("binary_list")
+{
+  test_list<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_list")
+{
+  test_list<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_list")
+{
+  test_list<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_list")
+{
+  test_list<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/list.hpp b/Src/External/cereal/unittests/list.hpp
new file mode 100644
index 0000000..9e8a7dd
--- /dev/null
+++ b/Src/External/cereal/unittests/list.hpp
@@ -0,0 +1,95 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_LIST_H_
+#define CEREAL_TEST_LIST_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_list()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::list<int> o_podlist(100);
+    for(auto & elem : o_podlist)
+      elem = random_value<int>(gen);
+
+    std::list<StructInternalSerialize> o_iserlist(100);
+    for(auto & elem : o_iserlist)
+      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::list<StructInternalSplit> o_ispllist(100);
+    for(auto & elem : o_ispllist)
+      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::list<StructExternalSerialize> o_eserlist(100);
+    for(auto & elem : o_eserlist)
+      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::list<StructExternalSplit> o_espllist(100);
+    for(auto & elem : o_espllist)
+      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podlist);
+      oar(o_iserlist);
+      oar(o_ispllist);
+      oar(o_eserlist);
+      oar(o_espllist);
+    }
+
+    std::list<int> i_podlist;
+    std::list<StructInternalSerialize> i_iserlist;
+    std::list<StructInternalSplit>     i_ispllist;
+    std::list<StructExternalSerialize> i_eserlist;
+    std::list<StructExternalSplit>     i_espllist;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podlist);
+      iar(i_iserlist);
+      iar(i_ispllist);
+      iar(i_eserlist);
+      iar(i_espllist);
+    }
+
+    check_collection(i_podlist,  o_podlist);
+    check_collection(i_iserlist, o_iserlist);
+    check_collection(i_ispllist, o_ispllist);
+    check_collection(i_eserlist, o_eserlist);
+    check_collection(i_espllist, o_espllist);
+  }
+}
+
+#endif // CEREAL_TEST_LIST_H_
diff --git a/Src/External/cereal/unittests/load_construct.cpp b/Src/External/cereal/unittests/load_construct.cpp
new file mode 100644
index 0000000..923e19a
--- /dev/null
+++ b/Src/External/cereal/unittests/load_construct.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "load_construct.hpp"
+
+TEST_SUITE("load_construct");
+
+TEST_CASE("binary_memory_load_construct")
+{
+  test_memory_load_construct<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_memory_load_construct")
+{
+  test_memory_load_construct<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_memory_load_construct")
+{
+  test_memory_load_construct<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_memory_load_construct")
+{
+  test_memory_load_construct<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/load_construct.hpp b/Src/External/cereal/unittests/load_construct.hpp
new file mode 100644
index 0000000..97b37c1
--- /dev/null
+++ b/Src/External/cereal/unittests/load_construct.hpp
@@ -0,0 +1,260 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_LOAD_CONSTRUCT_H_
+#define CEREAL_TEST_LOAD_CONSTRUCT_H_
+#include "common.hpp"
+
+struct OneLA
+{
+  OneLA( int xx ) : x( xx ) {}
+
+  int x;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  { ar( x ); }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<OneLA> & construct )
+  {
+    int xx;
+    ar( xx );
+    construct( xx );
+  }
+
+  bool operator==( OneLA const & other ) const
+  { return x == other.x; }
+};
+
+std::ostream& operator<<(std::ostream& os, OneLA const & s)
+{
+  os << "[" << s.x << "]";
+  return os;
+}
+
+struct OneLAVersioned
+{
+  OneLAVersioned( int xx ) : x( xx ), v() {}
+  OneLAVersioned( int xx, int vv ) : x( xx ), v( vv ) {}
+
+  int x;
+  std::uint32_t v;
+
+  template <class Archive>
+  void serialize( Archive & ar, const std::uint32_t version )
+  { ar( x ); v = version; }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<OneLAVersioned> & construct, const std::uint32_t version )
+  {
+    int xx;
+    ar( xx );
+    construct( xx, version );
+  }
+
+  bool operator==( OneLAVersioned const & other ) const
+  { return x == other.x; }
+};
+
+std::ostream& operator<<(std::ostream& os, OneLAVersioned const & s)
+{
+  os << "[" << s.x << "]";
+  return os;
+}
+
+CEREAL_CLASS_VERSION( OneLAVersioned, 13 )
+
+struct TwoLA
+{
+  TwoLA( int xx ) : x( xx ) {}
+
+  int x;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  { ar( x ); }
+
+  bool operator==( TwoLA const & other ) const
+  { return x == other.x; }
+};
+
+std::ostream& operator<<(std::ostream& os, TwoLA const & s)
+{
+  os << "[" << s.x << "]";
+  return os;
+}
+
+namespace cereal
+{
+  template <>
+  struct LoadAndConstruct<TwoLA>
+  {
+    template <class Archive>
+    static void load_and_construct( Archive & ar, cereal::construct<TwoLA> & construct )
+    {
+      int xx;
+      ar( xx );
+      construct( xx );
+    }
+  };
+}
+
+struct TwoLAVersioned
+{
+  TwoLAVersioned( int xx ) : x( xx ), v() {}
+  TwoLAVersioned( int xx, int vv ) : x( xx ), v( vv ) {}
+
+  int x;
+  std::uint32_t v;
+
+  template <class Archive>
+  void serialize( Archive & ar, const std::uint32_t version )
+  { ar( x ); v = version; }
+
+  bool operator==( TwoLAVersioned const & other ) const
+  { return x == other.x; }
+};
+
+std::ostream& operator<<(std::ostream& os, TwoLAVersioned const & s)
+{
+  os << "[" << s.x << "]";
+  return os;
+}
+
+namespace cereal
+{
+  template <>
+  struct LoadAndConstruct<TwoLAVersioned>
+  {
+    template <class Archive>
+    static void load_and_construct( Archive & ar, cereal::construct<TwoLAVersioned> & construct, const std::uint32_t version )
+    {
+      int xx;
+      ar( xx );
+      construct( xx, version );
+    }
+  };
+}
+
+CEREAL_CLASS_VERSION( TwoLAVersioned, 1 )
+
+struct ThreeLA : std::enable_shared_from_this<ThreeLA>
+{
+  ThreeLA( int xx ) : x( xx ) {}
+
+  int x;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  { ar( x ); }
+
+  bool operator==( ThreeLA const & other ) const
+  { return x == other.x; }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<ThreeLA> & construct )
+  {
+    int xx;
+    ar( xx );
+    construct( xx );
+  }
+};
+
+std::ostream& operator<<(std::ostream& os, ThreeLA const & s)
+{
+  os << "[" << s.x << "]";
+  return os;
+}
+
+template <class IArchive, class OArchive>
+void test_memory_load_construct()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    auto o_shared1 = std::make_shared<OneLA>( random_value<int>(gen) );
+    auto o_shared2 = std::make_shared<TwoLA>( random_value<int>(gen) );
+    std::unique_ptr<OneLA> o_unique1( new OneLA( random_value<int>(gen) ) );
+    std::unique_ptr<TwoLA> o_unique2( new TwoLA( random_value<int>(gen) ) );
+    auto o_shared3 = std::make_shared<ThreeLA>( random_value<int>(gen) );
+    auto o_shared1v = std::make_shared<OneLAVersioned>( random_value<int>(gen) );
+    auto o_shared2v = std::make_shared<TwoLAVersioned>( random_value<int>(gen) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( o_shared1 );
+      oar( o_shared2 );
+      oar( o_unique1 );
+      oar( o_unique2 );
+      oar( o_shared3 );
+      oar( o_shared1v );
+      oar( o_shared2v );
+    }
+
+    o_shared3->shared_from_this(); // tests github issue #68
+
+    decltype(o_shared1) i_shared1;
+    decltype(o_shared2) i_shared2;
+    decltype(o_unique1) i_unique1;
+    decltype(o_unique2) i_unique2;
+    decltype(o_shared3) i_shared3;
+    decltype(o_shared1v) i_shared1v;
+    decltype(o_shared2v) i_shared2v;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( i_shared1 );
+      iar( i_shared2 );
+      iar( i_unique1 );
+      iar( i_unique2 );
+      iar( i_shared3 );
+      iar( i_shared1v );
+      iar( i_shared2v );
+    }
+
+    CHECK_EQ( *o_shared1, *i_shared1 );
+    CHECK_EQ( *o_shared2, *i_shared2 );
+    CHECK_EQ( *o_unique1, *i_unique1 );
+    CHECK_EQ( *o_unique2, *i_unique2 );
+    CHECK_EQ( *o_shared3, *i_shared3 );
+    CHECK_EQ( *o_shared1v, *i_shared1v );
+    CHECK_EQ(i_shared1v->v, 13u);
+    CHECK_EQ( *o_shared2v, *i_shared2v );
+    CHECK_EQ(i_shared2v->v, 1u);
+
+    auto i_shared3_2 = i_shared3->shared_from_this();
+    CHECK_EQ( *o_shared3, *i_shared3_2 );
+  }
+}
+
+#endif // CEREAL_TEST_LOAD_CONSTRUCT_H_
diff --git a/Src/External/cereal/unittests/map.cpp b/Src/External/cereal/unittests/map.cpp
new file mode 100644
index 0000000..40e1b84
--- /dev/null
+++ b/Src/External/cereal/unittests/map.cpp
@@ -0,0 +1,72 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "map.hpp"
+
+TEST_SUITE("map");
+
+TEST_CASE("binary_map")
+{
+  test_map<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_map")
+{
+  test_map<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_map")
+{
+  test_map<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_map")
+{
+  test_map<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_CASE("binary_map_memory")
+{
+  test_map_memory<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_map_memory")
+{
+  test_map_memory<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_map_memory")
+{
+  test_map_memory<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_map_memory")
+{
+  test_map_memory<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/map.hpp b/Src/External/cereal/unittests/map.hpp
new file mode 100644
index 0000000..20b7c62
--- /dev/null
+++ b/Src/External/cereal/unittests/map.hpp
@@ -0,0 +1,169 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_MAP_H_
+#define CEREAL_TEST_MAP_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_map()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::map<size_t, std::vector<StructInternalSerialize>> o_vectormap;
+    for(int j=0; j<10; ++j)
+    {
+      size_t id = random_value<size_t>(gen);
+      for(int k=0; k<100; ++k)
+        o_vectormap[id].emplace_back(random_value<int>(gen), random_value<int>(gen));
+    }
+
+    std::map<std::string, int> o_podmap;
+    for(int j=0; j<100; ++j)
+      o_podmap.insert({random_value<std::string>(gen), random_value<int>(gen)});
+
+    std::map<int, StructInternalSerialize> o_isermap;
+    for(int j=0; j<100; ++j)
+      o_isermap.insert({random_value<int>(gen), { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::map<int, StructInternalSplit> o_isplmap;
+    for(int j=0; j<100; ++j)
+      o_isplmap.insert({random_value<int>(gen), { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::map<uint32_t, StructExternalSerialize> o_esermap;
+    for(int j=0; j<100; ++j)
+      o_esermap.insert({random_value<uint32_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::map<int8_t, StructExternalSplit> o_esplmap;
+    for(int j=0; j<100; ++j)
+      o_esplmap.insert({random_value<char>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_vectormap);
+      oar(o_podmap);
+      oar(o_isermap);
+      oar(o_isplmap);
+      oar(o_esermap);
+      oar(o_esplmap);
+    }
+
+    std::map<size_t, std::vector<StructInternalSerialize>> i_vectormap;
+    std::map<std::string, int> i_podmap;
+    std::map<int, StructInternalSerialize>   i_isermap;
+    std::map<int, StructInternalSplit>        i_isplmap;
+    std::map<uint32_t, StructExternalSerialize> i_esermap;
+    std::map<int8_t, StructExternalSplit>       i_esplmap;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_vectormap);
+      iar(i_podmap);
+      iar(i_isermap);
+      iar(i_isplmap);
+      iar(i_esermap);
+      iar(i_esplmap);
+    }
+
+    CHECK_EQ(i_vectormap.size(), o_vectormap.size());
+    auto o_v_it = o_vectormap.begin();
+    auto i_v_it = i_vectormap.begin();
+    for(;o_v_it != o_vectormap.end(); ++o_v_it, ++i_v_it)
+    {
+      CHECK_EQ(i_v_it->second.size(), o_v_it->second.size());
+      check_collection(i_v_it->second, o_v_it->second);
+    }
+
+    check_collection(i_podmap,  o_podmap);
+    check_collection(i_isermap, o_isermap);
+    check_collection(i_isplmap, o_isplmap);
+    check_collection(i_esermap, o_esermap);
+    check_collection(i_esplmap, o_esplmap);
+  }
+}
+
+template <class IArchive, class OArchive> inline
+void test_map_memory()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::map<int, std::unique_ptr<int>> o_uniqueptrMap;
+    std::map<int, std::shared_ptr<int>> o_sharedptrMap;
+
+    for(int j=0; j<100; ++j)
+    {
+      #ifdef CEREAL_OLDER_GCC
+      o_uniqueptrMap.insert( std::make_pair(random_value<int>(gen), std::unique_ptr<int>( new int( random_value<int>(gen) ) )) );
+      o_sharedptrMap.insert( std::make_pair(random_value<int>(gen), std::make_shared<int>( random_value<int>(gen) )) );
+      #else // NOT CEREAL_OLDER_GCC
+      o_uniqueptrMap.emplace( random_value<int>(gen), std::unique_ptr<int>( new int( random_value<int>(gen) ) ) );
+      o_sharedptrMap.emplace( random_value<int>(gen), std::make_shared<int>( random_value<int>(gen) ) );
+      #endif // NOT CEREAL_OLDER_GCC
+    }
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( o_uniqueptrMap );
+      oar( o_sharedptrMap );
+    }
+
+    decltype( o_uniqueptrMap ) i_uniqueptrMap;
+    decltype( o_sharedptrMap ) i_sharedptrMap;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( i_uniqueptrMap );
+      iar( i_sharedptrMap );
+    }
+
+    CHECK_EQ(o_sharedptrMap.size(), i_sharedptrMap.size());
+    CHECK_EQ(o_uniqueptrMap.size(), i_uniqueptrMap.size());
+
+    auto o_v_it = o_uniqueptrMap.begin();
+    auto i_v_it = i_uniqueptrMap.begin();
+    for(;o_v_it != o_uniqueptrMap.end(); ++o_v_it, ++i_v_it)
+    {
+      CHECK_EQ(i_v_it->first, o_v_it->first);
+      CHECK_EQ(*i_v_it->second, *o_v_it->second);
+    }
+  }
+}
+
+#endif // CEREAL_TEST_MAP_H_
diff --git a/Src/External/cereal/unittests/memory.cpp b/Src/External/cereal/unittests/memory.cpp
new file mode 100644
index 0000000..8c62592
--- /dev/null
+++ b/Src/External/cereal/unittests/memory.cpp
@@ -0,0 +1,72 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "memory.hpp"
+
+TEST_SUITE("memory");
+
+TEST_CASE("binary_memory")
+{
+  test_memory<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_memory")
+{
+  test_memory<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_memory")
+{
+  test_memory<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_memory")
+{
+  test_memory<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_CASE("binary_default_construction")
+{
+  test_default_construction<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_default_construction")
+{
+  test_default_construction<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_default_construction")
+{
+  test_default_construction<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_default_construction")
+{
+  test_default_construction<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/memory.hpp b/Src/External/cereal/unittests/memory.hpp
new file mode 100644
index 0000000..19ec2bb
--- /dev/null
+++ b/Src/External/cereal/unittests/memory.hpp
@@ -0,0 +1,116 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_MEMORY_H_
+#define CEREAL_TEST_MEMORY_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_memory()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::shared_ptr<int> o_xptr1 = std::make_shared<int>(random_value<int>(gen));
+    std::shared_ptr<int> o_xptr2 = o_xptr1;
+    std::shared_ptr<int> o_yptr1 = std::make_shared<int>(random_value<int>(gen));
+    std::shared_ptr<int> o_yptr2 = o_yptr1;
+    std::shared_ptr<int> o_nullptr1;
+    std::shared_ptr<int> o_nullptr2;
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( o_xptr1, o_xptr2 );
+      oar( o_yptr1, o_yptr2 );
+      oar( o_nullptr1, o_nullptr2 );
+    }
+
+    std::shared_ptr<int> i_xptr1;
+    std::shared_ptr<int> i_xptr2;
+    std::shared_ptr<int> i_yptr1;
+    std::shared_ptr<int> i_yptr2;
+    std::shared_ptr<int> i_nullptr1;
+    std::shared_ptr<int> i_nullptr2;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( i_xptr1, i_xptr2);
+      iar( i_yptr1, i_yptr2);
+      iar( i_nullptr1, i_nullptr2 );
+    }
+
+    CHECK_EQ(o_xptr1.get(), o_xptr2.get());
+    CHECK_EQ(i_xptr1.get(), i_xptr2.get());
+    CHECK_EQ(*i_xptr1,      *i_xptr2);
+
+    CHECK_EQ(o_yptr1.get(), o_yptr2.get());
+    CHECK_EQ(i_yptr1.get(), i_yptr2.get());
+    CHECK_EQ(*i_yptr1,      *i_yptr2);
+    CHECK_UNARY_FALSE(i_nullptr1);
+    CHECK_UNARY_FALSE(i_nullptr2);
+  }
+}
+
+class TestClass
+{
+  public:
+    TestClass(int v) : x(v) { }
+    int x;
+
+  private:
+    friend class cereal::access;
+    TestClass() { };
+
+    template<class Archive>
+      void serialize(Archive & ar) { ar(x); }
+};
+
+template <class IArchive, class OArchive> inline
+void test_default_construction()
+{
+  auto o_ptr = std::make_shared<TestClass>(1);
+  std::shared_ptr<TestClass> i_ptr;
+
+  std::ostringstream os;
+  {
+    OArchive oar(os);
+    oar(o_ptr);
+  }
+  {
+    std::istringstream is(os.str());
+    IArchive iar(is);
+    iar(i_ptr);
+  }
+  CHECK_EQ(o_ptr->x, i_ptr->x);
+}
+
+#endif // CEREAL_TEST_LOAD_CONSTRUCT_H_
diff --git a/Src/External/cereal/unittests/memory_cycles.cpp b/Src/External/cereal/unittests/memory_cycles.cpp
new file mode 100644
index 0000000..461decc
--- /dev/null
+++ b/Src/External/cereal/unittests/memory_cycles.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "memory_cycles.hpp"
+
+TEST_SUITE("memory_cycles");
+
+TEST_CASE("binary_memory_cycles")
+{
+  test_memory_cycles<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_memory_cycles")
+{
+  test_memory_cycles<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_memory_cycles")
+{
+  test_memory_cycles<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_memory_cycles")
+{
+  test_memory_cycles<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/memory_cycles.hpp b/Src/External/cereal/unittests/memory_cycles.hpp
new file mode 100644
index 0000000..9009723
--- /dev/null
+++ b/Src/External/cereal/unittests/memory_cycles.hpp
@@ -0,0 +1,142 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_MEMORY_CYCLES_H_
+#define CEREAL_TEST_MEMORY_CYCLES_H_
+#include "common.hpp"
+
+struct MemoryCycle
+{
+  MemoryCycle() = default;
+
+  MemoryCycle( int v ) :
+    value( v )
+  { }
+
+  int value;
+  std::weak_ptr<MemoryCycle> ptr;
+
+  bool operator==( MemoryCycle const & other ) const
+  {
+    return value == other.value && ptr.lock() == other.ptr.lock();
+  }
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( value, ptr );
+  }
+};
+
+std::ostream& operator<<(std::ostream& os, MemoryCycle const & s)
+{
+  os << "[value: " << s.value << " ptr: " << s.ptr.lock() << "]";
+  return os;
+}
+
+class MemoryCycleLoadAndConstruct
+{
+  public:
+    MemoryCycleLoadAndConstruct( int v ) :
+      value( v )
+    { }
+
+    MemoryCycleLoadAndConstruct( int v,
+        std::weak_ptr<MemoryCycleLoadAndConstruct> p ) :
+      value( v ),
+      ptr( p )
+    { }
+
+    bool operator==( MemoryCycleLoadAndConstruct const & other ) const
+    {
+      return value == other.value && ptr.lock() == other.ptr.lock();
+    }
+
+    template <class Archive>
+    void serialize( Archive & ar )
+    {
+      ar( value, ptr );
+    }
+
+    template <class Archive>
+    static void load_and_construct( Archive & ar, cereal::construct<MemoryCycleLoadAndConstruct> & construct )
+    {
+      int val;
+      std::weak_ptr<MemoryCycleLoadAndConstruct> p;
+
+      ar( val, p );
+      construct( val, p );
+    }
+
+    int value;
+    std::weak_ptr<MemoryCycleLoadAndConstruct> ptr;
+};
+
+std::ostream& operator<<(std::ostream& os, MemoryCycleLoadAndConstruct const & s)
+{
+  os << "[value: " << s.value << " ptr: " << s.ptr.lock() << "]";
+  return os;
+}
+
+template <class IArchive, class OArchive> inline
+void test_memory_cycles()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    auto o_ptr1 = std::make_shared<MemoryCycle>( random_value<int>(gen) );
+    o_ptr1->ptr = o_ptr1;
+    auto o_ptr2 = std::make_shared<MemoryCycleLoadAndConstruct>( random_value<int>(gen) );
+    o_ptr2->ptr = o_ptr2;
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( o_ptr1 );
+      oar( o_ptr2 );
+    }
+
+    decltype(o_ptr1) i_ptr1;
+    decltype(o_ptr2) i_ptr2;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( i_ptr1 );
+      iar( i_ptr2 );
+    }
+
+    CHECK_EQ( o_ptr1->value, i_ptr1->value );
+    CHECK_EQ( i_ptr1.get(), i_ptr1->ptr.lock().get() );
+    CHECK_EQ( o_ptr2->value, i_ptr2->value );
+    CHECK_EQ( i_ptr2.get(), i_ptr2->ptr.lock().get() );
+  }
+}
+#endif // CEREAL_TEST_MEMORY_CYCLES_H_
diff --git a/Src/External/cereal/unittests/multimap.cpp b/Src/External/cereal/unittests/multimap.cpp
new file mode 100644
index 0000000..8df857e
--- /dev/null
+++ b/Src/External/cereal/unittests/multimap.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "multimap.hpp"
+
+TEST_SUITE("multimap");
+
+TEST_CASE("binary_multimap")
+{
+  test_multimap<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_multimap")
+{
+  test_multimap<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_multimap")
+{
+  test_multimap<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_multimap")
+{
+  test_multimap<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/multimap.hpp b/Src/External/cereal/unittests/multimap.hpp
new file mode 100644
index 0000000..1426769
--- /dev/null
+++ b/Src/External/cereal/unittests/multimap.hpp
@@ -0,0 +1,129 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_MULTIMAP_H_
+#define CEREAL_TEST_MULTIMAP_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_multimap()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::multimap<std::string, int> o_podmultimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<std::string>(gen);
+      o_podmultimap.insert({key, random_value<int>(gen)});
+      o_podmultimap.insert({key, random_value<int>(gen)});
+    }
+
+    std::multimap<uint8_t, StructInternalSerialize> o_isermultimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<uint8_t>(gen);
+      o_isermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+      o_isermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::multimap<int16_t, StructInternalSplit> o_isplmultimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<int16_t>(gen);
+      o_isplmultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+      o_isplmultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::multimap<uint32_t, StructExternalSerialize> o_esermultimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<uint32_t>(gen);
+      o_esermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+      o_esermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::multimap<int8_t, StructExternalSplit> o_esplmultimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<char>(gen);
+      o_esplmultimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+      o_esplmultimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podmultimap);
+      oar(o_isermultimap);
+      oar(o_isplmultimap);
+      oar(o_esermultimap);
+      oar(o_esplmultimap);
+    }
+
+    std::multimap<std::string, int> i_podmultimap;
+    std::multimap<uint8_t, StructInternalSerialize>   i_isermultimap;
+    std::multimap<int16_t, StructInternalSplit>        i_isplmultimap;
+    std::multimap<uint32_t, StructExternalSerialize> i_esermultimap;
+    std::multimap<int8_t, StructExternalSplit>       i_esplmultimap;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podmultimap);
+      iar(i_isermultimap);
+      iar(i_isplmultimap);
+      iar(i_esermultimap);
+      iar(i_esplmultimap);
+    }
+
+#define MULTIMAP_CHECK(InMap, OutMap) \
+    for( auto & pair : OutMap ) \
+    { \
+      auto const count = InMap.count( pair.first ); \
+      CHECK_EQ( count, OutMap.count( pair.first ) ); \
+      auto find = InMap.find( pair.first ); \
+      bool found = false; \
+      for( size_t i = 0; i < count; ++i, ++find ) \
+        found |= find->second == pair.second; \
+      CHECK_UNARY( found ); \
+    }
+
+    MULTIMAP_CHECK( i_podmultimap, o_podmultimap );
+    MULTIMAP_CHECK( i_isermultimap, o_isermultimap );
+    MULTIMAP_CHECK( i_isplmultimap, o_isplmultimap );
+    MULTIMAP_CHECK( i_esermultimap, o_esermultimap );
+    MULTIMAP_CHECK( i_esplmultimap, o_esplmultimap );
+
+#undef MULTIMAP_CHECK
+  }
+}
+
+#endif // CEREAL_TEST_MULTIMAP_H_
diff --git a/Src/External/cereal/unittests/multiset.cpp b/Src/External/cereal/unittests/multiset.cpp
new file mode 100644
index 0000000..de53d2a
--- /dev/null
+++ b/Src/External/cereal/unittests/multiset.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "multiset.hpp"
+
+TEST_SUITE("multiset");
+
+TEST_CASE("binary_multiset")
+{
+  test_multiset<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_multiset")
+{
+  test_multiset<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_multiset")
+{
+  test_multiset<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_multiset")
+{
+  test_multiset<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/multiset.hpp b/Src/External/cereal/unittests/multiset.hpp
new file mode 100644
index 0000000..89ad7a1
--- /dev/null
+++ b/Src/External/cereal/unittests/multiset.hpp
@@ -0,0 +1,134 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_MULTISET_H_
+#define CEREAL_TEST_MULTISET_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_multiset()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::multiset<int> o_podmultiset;
+    for(int j=0; j<100; ++j)
+    {
+      int value = random_value<int>(gen);
+      o_podmultiset.insert(value);
+      o_podmultiset.insert(value);
+    }
+
+    std::multiset<StructInternalSerialize> o_isermultiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructInternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
+      o_isermultiset.insert(value);
+      o_isermultiset.insert(value);
+    }
+
+    std::multiset<StructInternalSplit> o_isplmultiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructInternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
+      o_isplmultiset.insert(value);
+      o_isplmultiset.insert(value);
+    }
+
+    std::multiset<StructExternalSerialize> o_esermultiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructExternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
+      o_esermultiset.insert(value);
+      o_esermultiset.insert(value);
+    }
+
+    std::multiset<StructExternalSplit> o_esplmultiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructExternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
+      o_esplmultiset.insert(value);
+      o_esplmultiset.insert(value);
+    }
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podmultiset);
+      oar(o_isermultiset);
+      oar(o_isplmultiset);
+      oar(o_esermultiset);
+      oar(o_esplmultiset);
+    }
+
+    std::multiset<int> i_podmultiset;
+    std::multiset<StructInternalSerialize> i_isermultiset;
+    std::multiset<StructInternalSplit>     i_isplmultiset;
+    std::multiset<StructExternalSerialize> i_esermultiset;
+    std::multiset<StructExternalSplit>     i_esplmultiset;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podmultiset);
+      iar(i_isermultiset);
+      iar(i_isplmultiset);
+      iar(i_esermultiset);
+      iar(i_esplmultiset);
+    }
+
+    for(auto const & p : i_podmultiset)
+    {
+      CHECK_EQ(o_podmultiset.count(p), i_podmultiset.count(p));
+    }
+
+    for(auto const & p : i_isermultiset)
+    {
+      CHECK_EQ(o_isermultiset.count(p), i_isermultiset.count(p));
+    }
+
+    for(auto const & p : i_isplmultiset)
+    {
+      CHECK_EQ(o_isplmultiset.count(p), i_isplmultiset.count(p));
+    }
+
+    for(auto const & p : i_esermultiset)
+    {
+      CHECK_EQ(o_esermultiset.count(p), i_esermultiset.count(p));
+    }
+
+    for(auto const & p : i_esplmultiset)
+    {
+      CHECK_EQ(o_esplmultiset.count(p), i_esplmultiset.count(p));
+    }
+  }
+}
+
+#endif // CEREAL_TEST_MULTISET_H_
diff --git a/Src/External/cereal/unittests/pair.cpp b/Src/External/cereal/unittests/pair.cpp
new file mode 100644
index 0000000..063237b
--- /dev/null
+++ b/Src/External/cereal/unittests/pair.cpp
@@ -0,0 +1,51 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "pair.hpp"
+
+TEST_SUITE("pair");
+
+TEST_CASE("binary_pair")
+{
+  test_pair<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_pair")
+{
+  test_pair<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_pair")
+{
+  test_pair<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+TEST_CASE("json_pair")
+{
+  test_pair<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/pair.hpp b/Src/External/cereal/unittests/pair.hpp
new file mode 100644
index 0000000..fe60931
--- /dev/null
+++ b/Src/External/cereal/unittests/pair.hpp
@@ -0,0 +1,92 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_PAIR_H_
+#define CEREAL_TEST_PAIR_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_pair()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rng = [&](){ return random_value<int>(gen); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::pair<int, int> o_podpair = {rng(), rng()};
+    std::pair<StructInternalSerialize, StructInternalSerialize> o_iserpair = {{rng(), rng()}, {rng(), rng()}};
+    std::pair<StructInternalSplit, StructInternalSplit> o_isplpair = {{rng(), rng()}, {rng(), rng()}};
+    std::pair<StructExternalSerialize, StructExternalSerialize> o_eserpair = {{rng(), rng()}, {rng(), rng()}};
+    std::pair<StructExternalSplit, StructExternalSplit> o_esplpair = {{rng(), rng()}, {rng(), rng()}};
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podpair);
+      oar(o_iserpair);
+      oar(o_isplpair);
+      oar(o_eserpair);
+      oar(o_esplpair);
+    }
+
+    std::pair<int, int> i_podpair;
+    std::pair<StructInternalSerialize, StructInternalSerialize> i_iserpair;
+    std::pair<StructInternalSplit, StructInternalSplit> i_isplpair;
+    std::pair<StructExternalSerialize, StructExternalSerialize> i_eserpair;
+    std::pair<StructExternalSplit, StructExternalSplit> i_esplpair;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podpair);
+      iar(i_iserpair);
+      iar(i_isplpair);
+      iar(i_eserpair);
+      iar(i_esplpair);
+    }
+
+    CHECK_EQ( i_podpair.first, o_podpair.first );
+    CHECK_EQ( i_podpair.second, o_podpair.second );
+
+    CHECK_EQ( i_iserpair.first, o_iserpair.first );
+    CHECK_EQ( i_iserpair.second, o_iserpair.second );
+
+    CHECK_EQ( i_isplpair.first, o_isplpair.first );
+    CHECK_EQ( i_isplpair.second, o_isplpair.second );
+
+    CHECK_EQ( i_eserpair.first, o_eserpair.first );
+    CHECK_EQ( i_eserpair.second, o_eserpair.second );
+
+    CHECK_EQ( i_esplpair.first, o_esplpair.first );
+    CHECK_EQ( i_esplpair.second, o_esplpair.second );
+  }
+}
+
+#endif // CEREAL_TEST_PAIR_H_
diff --git a/Src/External/cereal/unittests/pod.cpp b/Src/External/cereal/unittests/pod.cpp
new file mode 100644
index 0000000..b2450e7
--- /dev/null
+++ b/Src/External/cereal/unittests/pod.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "pod.hpp"
+
+TEST_SUITE("pod");
+
+TEST_CASE("binary_pod")
+{
+  test_pod<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_pod")
+{
+  test_pod<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_pod")
+{
+  test_pod<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_pod")
+{
+  test_pod<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/pod.hpp b/Src/External/cereal/unittests/pod.hpp
new file mode 100644
index 0000000..876d819
--- /dev/null
+++ b/Src/External/cereal/unittests/pod.hpp
@@ -0,0 +1,147 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_POD_H_
+#define CEREAL_TEST_POD_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_pod()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(size_t i=0; i<100; ++i)
+  {
+    bool          const o_bool   = random_value<uint8_t>(gen) % 2 ? true : false;
+    char          const o_char   = random_value<char>(gen);
+    unsigned char const o_uchar  = random_value<unsigned char>(gen);
+    uint8_t       const o_uint8  = random_value<uint8_t>(gen);
+    int8_t        const o_int8   = random_value<int8_t>(gen);
+    uint16_t      const o_uint16 = random_value<uint16_t>(gen);
+    int16_t       const o_int16  = random_value<int16_t>(gen);
+    uint32_t      const o_uint32 = random_value<uint32_t>(gen);
+    int32_t       const o_int32  = random_value<int32_t>(gen);
+    uint64_t      const o_uint64 = random_value<uint64_t>(gen);
+    int64_t       const o_int64  = random_value<int64_t>(gen);
+    float         const o_float  = random_value<float>(gen);
+    double        const o_double = random_value<double>(gen);
+
+    long double const o_long_double = random_value<long double>(gen);
+    long const o_long = random_value<long>(gen);
+    unsigned long const o_ulong = random_value<unsigned long>(gen);
+    long long const o_long_long = random_value<long long>(gen);
+    unsigned long long const o_ulong_long = random_value<unsigned long long>(gen);
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+      oar(o_bool);
+      oar(o_char);
+      oar(o_uchar);
+      oar(o_uint8);
+      oar(o_int8);
+      oar(o_uint16);
+      oar(o_int16);
+      oar(o_uint32);
+      oar(o_int32);
+      oar(o_uint64);
+      oar(o_int64);
+      oar(o_float);
+      oar(o_double);
+      oar(o_long_double);
+      oar(o_long);
+      oar(o_ulong);
+      oar(o_long_long);
+      oar(o_ulong_long);
+    }
+
+    bool          i_bool                       = false;
+    char          i_char                       = 0;
+    unsigned char i_uchar                      = 0;
+    uint8_t       i_uint8                      = 0;
+    int8_t        i_int8                       = 0;
+    uint16_t      i_uint16                     = 0;
+    int16_t       i_int16                      = 0;
+    uint32_t      i_uint32                     = 0;
+    int32_t       i_int32                      = 0;
+    uint64_t      i_uint64                     = 0;
+    int64_t       i_int64                      = 0;
+    float         i_float                      = 0;
+    double        i_double                     = 0;
+
+    long double i_long_double       = 0;
+    long i_long                     = 0;
+    unsigned long i_ulong           = 0;
+    long long i_long_long           = 0;
+    unsigned long long i_ulong_long = 0;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+      iar(i_bool);
+      iar(i_char);
+      iar(i_uchar);
+      iar(i_uint8);
+      iar(i_int8);
+      iar(i_uint16);
+      iar(i_int16);
+      iar(i_uint32);
+      iar(i_int32);
+      iar(i_uint64);
+      iar(i_int64);
+      iar(i_float);
+      iar(i_double);
+      iar(i_long_double);
+      iar(i_long);
+      iar(i_ulong);
+      iar(i_long_long);
+      iar(i_ulong_long);
+    }
+
+    CHECK_EQ(i_bool   , o_bool);
+    CHECK_EQ(i_char   , o_char);
+    CHECK_EQ(i_uchar  , o_uchar);
+    CHECK_EQ(i_uint8  , o_uint8);
+    CHECK_EQ(i_int8   , o_int8);
+    CHECK_EQ(i_uint16 , o_uint16);
+    CHECK_EQ(i_int16  , o_int16);
+    CHECK_EQ(i_uint32 , o_uint32);
+    CHECK_EQ(i_int32  , o_int32);
+    CHECK_EQ(i_uint64 , o_uint64);
+    CHECK_EQ(i_int64  , o_int64);
+    CHECK_EQ(i_float  , doctest::Approx(o_float).epsilon(1e-5F));
+    CHECK_EQ(i_double , doctest::Approx(o_double).epsilon(1e-5));
+
+    CHECK_EQ(i_long_double, doctest::Approx(o_long_double).epsilon(1e-5L));
+    CHECK_EQ(i_long,        o_long);
+    CHECK_EQ(i_ulong,       o_ulong);
+    CHECK_EQ(i_long_long,   o_long_long);
+    CHECK_EQ(i_ulong_long,  o_ulong_long);
+  }
+}
+
+#endif // CEREAL_TEST_POD_H_
diff --git a/Src/External/cereal/unittests/polymorphic.cpp b/Src/External/cereal/unittests/polymorphic.cpp
new file mode 100644
index 0000000..87e6de4
--- /dev/null
+++ b/Src/External/cereal/unittests/polymorphic.cpp
@@ -0,0 +1,74 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "polymorphic.hpp"
+
+TEST_SUITE("polymorphic");
+
+TEST_CASE("binary_polymorphic")
+{
+  test_polymorphic<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_polymorphic")
+{
+  test_polymorphic<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_polymorphic")
+{
+  test_polymorphic<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_polymorphic")
+{
+  test_polymorphic<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+#if CEREAL_THREAD_SAFE
+TEST_CASE("binary_polymorphic_threading")
+{
+  test_polymorphic_threading<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_polymorphic_threading")
+{
+  test_polymorphic_threading<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_polymorphic_threading")
+{
+  test_polymorphic_threading<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_polymorphic_threading")
+{
+  test_polymorphic_threading<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+#endif // CEREAL_THREAD_SAFE
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/polymorphic.hpp b/Src/External/cereal/unittests/polymorphic.hpp
new file mode 100644
index 0000000..9309ac4
--- /dev/null
+++ b/Src/External/cereal/unittests/polymorphic.hpp
@@ -0,0 +1,359 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_POLYMORPHIC_H_
+#define CEREAL_TEST_POLYMORPHIC_H_
+#include "common.hpp"
+
+#if CEREAL_THREAD_SAFE
+#include <future>
+#endif
+
+struct PolyBaseA
+{
+  virtual void foo() = 0;
+  virtual ~PolyBaseA() {}
+};
+
+struct PolyBaseAA : PolyBaseA
+{
+  PolyBaseAA() {}
+  PolyBaseAA( long ww ) : w(ww) {}
+  virtual ~PolyBaseAA() {}
+  long w;
+
+  void foo() {}
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( w );
+  }
+
+  bool operator==( PolyBaseAA const & other ) const
+  {
+    return w == other.w;
+  }
+};
+
+CEREAL_REGISTER_POLYMORPHIC_RELATION(PolyBaseA, PolyBaseAA)
+
+struct PolyBaseB : virtual PolyBaseAA
+{
+  PolyBaseB() {}
+  PolyBaseB( int xx, long ww ) : PolyBaseAA(ww), x(xx) {}
+  virtual ~PolyBaseB() {}
+  int x;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( cereal::virtual_base_class<PolyBaseAA>( this ) );
+    ar( x );
+  }
+
+  bool operator==( PolyBaseB const & other ) const
+  {
+    return PolyBaseAA::operator==( other ) &&
+           x == other.x;
+  }
+};
+
+struct PolyBaseC : virtual PolyBaseAA
+{
+  PolyBaseC() {}
+  PolyBaseC( double yy, long ww ) : PolyBaseAA(ww), y(yy) {}
+  virtual ~PolyBaseC() {}
+  double y;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( cereal::virtual_base_class<PolyBaseAA>( this ) );
+    ar( y );
+  }
+
+  bool operator==( PolyBaseC const & other ) const
+  {
+    return PolyBaseAA::operator==( other ) &&
+           std::abs(y - other.y) < 1e-5;
+  }
+};
+
+struct PolyDerivedD : PolyBaseB, PolyBaseC
+{
+  PolyDerivedD() {}
+  PolyDerivedD( std::string const & zz, double yy, int xx, long ww ) :
+    PolyBaseAA( ww ), PolyBaseB( xx, ww ), PolyBaseC( yy, ww ), z(zz) {}
+  virtual ~PolyDerivedD() {}
+  std::string z;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( cereal::base_class<PolyBaseB>( this ) );
+    ar( cereal::base_class<PolyBaseC>( this ) );
+    ar( z );
+  }
+
+  bool operator==( PolyDerivedD const & other ) const
+  {
+    return PolyBaseB::operator==( other ) &&
+           PolyBaseC::operator==( other ) &&
+           z == other.z;
+  }
+};
+
+CEREAL_REGISTER_TYPE(PolyDerivedD)
+
+struct PolyBase
+{
+  PolyBase() {}
+  PolyBase( int xx, float yy ) : x(xx), y(yy) {}
+  virtual ~PolyBase() {}
+  int x;
+  float y;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( x, y );
+  }
+
+  virtual void foo() = 0;
+
+  bool operator==( PolyBase const & other ) const
+  {
+    return x == other.x && std::abs(y - other.y) < 1e-5;
+  }
+};
+
+struct PolyDerived : PolyBase
+{
+  PolyDerived() {}
+  PolyDerived( int xx, float yy, bool aa, double bb ) :
+    PolyBase( xx, yy ), a(aa), b(bb) {}
+  virtual ~PolyDerived() {}
+
+  bool a;
+  double b;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( cereal::base_class<PolyBase>( this ),
+        a, b );
+  }
+
+  bool operator==( PolyDerived const & other ) const
+  {
+    return PolyBase::operator==( other ) && a == other.a && std::abs(b - other.b) < 1e-5;
+  }
+
+  void foo() {}
+};
+
+CEREAL_REGISTER_TYPE(PolyDerived)
+
+struct PolyLA : std::enable_shared_from_this<PolyLA>
+{
+  PolyLA() {}
+  virtual ~PolyLA() {}
+  virtual void foo() = 0;
+};
+
+struct PolyDerivedLA : public PolyLA
+{
+  PolyDerivedLA( int xx ) : x( xx ) { }
+  virtual ~PolyDerivedLA() {}
+
+  int x;
+  std::vector<std::shared_ptr<PolyLA>> vec;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( x );
+    ar( vec );
+  }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<PolyDerivedLA> & construct )
+  {
+    int xx;
+    ar( xx );
+    construct( xx );
+    ar( construct->vec );
+  }
+
+  void foo() {}
+
+  bool operator==( PolyDerivedLA const & other ) const
+  {
+    if( x != other.x )
+      return false;
+    if( vec.size() != other.vec.size() )
+      return false;
+    for( size_t i = 0; i < vec.size(); ++i )
+      if( !(*std::dynamic_pointer_cast<PolyDerivedLA>(vec[i]) == *std::dynamic_pointer_cast<PolyDerivedLA>(other.vec[i])) )
+        return false;
+
+    return true;
+  }
+};
+
+CEREAL_REGISTER_TYPE(PolyDerivedLA)
+CEREAL_REGISTER_POLYMORPHIC_RELATION(PolyLA, PolyDerivedLA)
+
+std::ostream& operator<<(std::ostream& os, PolyDerivedLA const & s)
+{
+    os << "[x: " << s.x << "] ";
+    for( auto const & v : s.vec )
+      os << " child: " << (*std::dynamic_pointer_cast<PolyDerivedLA>(v));
+    return os;
+}
+
+std::ostream& operator<<(std::ostream& os, PolyDerived const & s)
+{
+    os << "[x: " << s.x << " y: " << s.y << " a: " << s.a << " b: " << s.b << "]";
+    return os;
+}
+
+std::ostream& operator<<(std::ostream& os, PolyDerivedD const & s)
+{
+    os << "[w: " << s.w << " x: " << s.x << " y: " << s.y << " z: " << s.z << "]";
+    return os;
+}
+
+template <class IArchive, class OArchive> inline
+void test_polymorphic()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  #if CEREAL_THREAD_SAFE
+  static std::mutex testMutex;
+  #endif
+
+  auto rngB = [&](){ return random_value<int>( gen ) % 2 == 0; };
+  auto rngI = [&](){ return random_value<int>( gen ); };
+  auto rngL = [&](){ return random_value<long>( gen ); };
+  auto rngF = [&](){ return random_value<float>( gen ); };
+  auto rngD = [&](){ return random_value<double>( gen ); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::shared_ptr<PolyBase> o_shared = std::make_shared<PolyDerived>( rngI(), rngF(), rngB(), rngD() );
+    std::weak_ptr<PolyBase>   o_weak = o_shared;
+    std::unique_ptr<PolyBase> o_unique( new PolyDerived( rngI(), rngF(), rngB(), rngD() ) );
+
+    std::shared_ptr<PolyBaseA> o_sharedA = std::make_shared<PolyDerivedD>( random_basic_string<char>(gen),
+                                                                           rngD(), rngI(), rngL() );
+
+    std::weak_ptr<PolyBaseA>   o_weakA = o_sharedA;
+    std::unique_ptr<PolyBaseA> o_uniqueA( new PolyDerivedD( random_basic_string<char>(gen),
+                                                            rngD(), rngI(), rngL() ) );
+
+    auto pda = std::make_shared<PolyDerivedLA>( rngI() );
+    pda->vec.emplace_back( std::make_shared<PolyDerivedLA>( rngI() ) );
+    std::shared_ptr<PolyLA>   o_sharedLA = pda;
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( o_shared, o_weak, o_unique );
+      oar( o_sharedLA );
+
+      oar( o_sharedA, o_weakA, o_uniqueA );
+    }
+
+    decltype(o_shared) i_shared;
+    decltype(o_weak) i_weak;
+    decltype(o_unique) i_unique;
+
+    decltype(o_sharedLA) i_sharedLA;
+
+    decltype(o_sharedA) i_sharedA;
+    decltype(o_weakA) i_weakA;
+    decltype(o_uniqueA) i_uniqueA;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( i_shared, i_weak, i_unique );
+      iar( i_sharedLA );
+      iar( i_sharedA, i_weakA, i_uniqueA );
+    }
+
+    auto i_locked = i_weak.lock();
+    auto o_locked = o_weak.lock();
+
+    auto i_sharedLA2 = i_sharedLA->shared_from_this();
+
+    auto i_lockedA = i_weakA.lock();
+    auto o_lockedA = o_weakA.lock();
+
+    #if CEREAL_THREAD_SAFE
+    std::lock_guard<std::mutex> lock( testMutex );
+    #endif
+
+    CHECK_EQ(i_shared.get(), i_locked.get());
+    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_shared.get()), *dynamic_cast<PolyDerived*>(o_shared.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_shared.get()), *dynamic_cast<PolyDerived*>(i_locked.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_locked.get()), *dynamic_cast<PolyDerived*>(o_locked.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_unique.get()), *dynamic_cast<PolyDerived*>(o_unique.get()));
+
+    CHECK_EQ(*dynamic_cast<PolyDerivedLA*>(i_sharedLA.get()), *dynamic_cast<PolyDerivedLA*>(o_sharedLA.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerivedLA*>(i_sharedLA2.get()), *dynamic_cast<PolyDerivedLA*>(o_sharedLA.get()));
+
+    CHECK_EQ(i_sharedA.get(), i_lockedA.get());
+    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_sharedA.get()), *dynamic_cast<PolyDerivedD*>(o_sharedA.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_sharedA.get()), *dynamic_cast<PolyDerivedD*>(i_lockedA.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_lockedA.get()), *dynamic_cast<PolyDerivedD*>(o_lockedA.get()));
+    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_uniqueA.get()), *dynamic_cast<PolyDerivedD*>(o_uniqueA.get()));
+  }
+}
+
+#if CEREAL_THREAD_SAFE
+template <class IArchive, class OArchive> inline
+void test_polymorphic_threading()
+{
+  std::vector<std::future<bool>> pool;
+  for( size_t i = 0; i < 100; ++i )
+    pool.emplace_back( std::async( std::launch::async,
+                                   [](){ test_polymorphic<IArchive, OArchive>(); return true; } ) );
+
+  for( auto & future : pool )
+    future.wait();
+
+  for( auto & future : pool )
+    CHECK_UNARY( future.get() );
+}
+#endif // CEREAL_THREAD_SAFE
+
+#endif // CEREAL_TEST_POLYMORPHIC_H_
diff --git a/Src/External/cereal/unittests/portability_test.cpp b/Src/External/cereal/unittests/portability_test.cpp
new file mode 100644
index 0000000..f3a7edb
--- /dev/null
+++ b/Src/External/cereal/unittests/portability_test.cpp
@@ -0,0 +1,202 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <cereal/archives/portable_binary.hpp>
+
+#include <cereal/types/memory.hpp>
+#include <cereal/types/map.hpp>
+#include <cereal/types/vector.hpp>
+
+#include <fstream>
+#include <iostream>
+
+struct Data : std::enable_shared_from_this<Data>
+{
+  int32_t x;
+  int64_t y;
+
+  Data( int32_t xx, int64_t yy ) : x(xx), y(yy) {}
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( x, y );
+  }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<Data> & construct )
+  {
+    int32_t xx;
+    int64_t yy;
+    ar( xx, yy );
+    construct( xx, yy );
+  }
+
+  bool operator==( Data const & other ) const
+  {
+    if( x != other.x )
+    {
+      std::cerr << "x=" << x << ", other.x=" << other.x << std::endl;
+      return false;
+    }
+    if( y != other.y )
+    {
+      std::cerr << "y=" << y << ", other.y=" << other.y << std::endl;
+      return false;
+    }
+
+    return true;
+  }
+};
+
+struct Data2
+{
+  int32_t x;
+  int64_t y;
+
+  Data2() = default;
+  Data2( int32_t xx, int64_t yy ) : x(xx), y(yy) {}
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( x, y );
+  }
+
+  bool operator==( Data2 const & other ) const
+  {
+    if( x != other.x )
+    {
+      std::cerr << "x=" << x << ", other.x=" << other.x << std::endl;
+      return false;
+    }
+    if( y != other.y )
+    {
+      std::cerr << "y=" << y << ", other.y=" << other.y << std::endl;
+      return false;
+    }
+
+    return true;
+  }
+};
+
+const uint32_t AnotherCount = 32;
+
+struct Another
+{
+  Another() = default;
+
+  Another( bool )
+  {
+    for( uint32_t i = 0; i < AnotherCount; ++i )
+      data[i] = Data2( i, i+1 );
+  }
+
+  std::map<std::uint32_t, Data2> data;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( data );
+  }
+
+  bool operator==( Another const & other ) const
+  {
+    auto iter  = data.begin();
+    auto oiter = other.data.begin();
+    for( ; iter != data.end(); ++iter, ++oiter )
+    {
+      if( !(iter->second == oiter->second) )
+      {
+        std::cerr << "Data mismatch at i=" << iter->first << std::endl;
+        return false;
+      }
+    }
+
+    return true;
+  }
+};
+
+int main( int, char ** argv )
+{
+  std::vector<Another> vec_o;
+  for( int i = 0; i < 5; ++i )
+    vec_o.emplace_back( true );
+
+  auto data_o = std::make_shared<Data>( 33, 64 );
+  int32_t int_o = 7;
+
+  std::cerr << "Portability test: " << argv[2] << "bit" << std::endl;
+
+  if( std::string(argv[1]) == "load" )
+  {
+    std::ifstream is("portable.cereal", std::ios::binary);
+    cereal::PortableBinaryInputArchive ar( is );
+
+    std::vector<Another> vec_i;
+    std::shared_ptr<Data> data_i;
+    int32_t int_i;
+
+    ar( int_i );
+
+    if( int_i != int_o )
+    {
+      std::cerr << "in " << int_i << ", out: " << int_o << std::endl;
+      return -1;
+    }
+
+    ar( vec_i );
+    ar( data_i );
+
+    if( vec_i != vec_o )
+    {
+      std::cerr << "Input vector did not equal output vector" << std::endl;
+      return -1;
+    }
+
+    if( !(*data_i == *data_o) )
+    {
+      std::cerr << "Data did not match" << std::endl;
+      return -1;
+    }
+  }
+  else if( std::string(argv[1]) == "save" )
+  {
+    std::ofstream os("portable.cereal", std::ios::binary);
+    cereal::PortableBinaryOutputArchive ar( os );
+
+    ar( int_o );
+    ar( vec_o );
+    ar( data_o );
+  }
+  else // clean
+  {
+    std::remove( "portable.cereal" );
+  }
+
+  return 0;
+}
diff --git a/Src/External/cereal/unittests/portable_binary_archive.cpp b/Src/External/cereal/unittests/portable_binary_archive.cpp
new file mode 100644
index 0000000..3b64b0b
--- /dev/null
+++ b/Src/External/cereal/unittests/portable_binary_archive.cpp
@@ -0,0 +1,134 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "portable_binary_archive.hpp"
+
+TEST_SUITE("portable_binary_archive");
+
+#ifdef _MSC_VER
+TEST_CASE("util")
+{
+  CHECK_EQ( cereal::util::demangledName<mynamespace::MyCustomClass>(), "struct mynamespace::MyCustomClass" );
+}
+#else
+TEST_CASE("util")
+{
+  CHECK_EQ( cereal::util::demangledName<mynamespace::MyCustomClass>(), "mynamespace::MyCustomClass" );
+}
+#endif
+
+TEST_CASE("portable_binary_archive_endian_conversions")
+{
+  // (last parameter is whether we load as little endian)
+  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
+      cereal::PortableBinaryInputArchive::Options::BigEndian(), cereal::PortableBinaryOutputArchive::Options::BigEndian(), false );
+  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
+      cereal::PortableBinaryInputArchive::Options::LittleEndian(), cereal::PortableBinaryOutputArchive::Options::BigEndian(), true );
+  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
+      cereal::PortableBinaryInputArchive::Options::BigEndian(), cereal::PortableBinaryOutputArchive::Options::LittleEndian(), false );
+  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
+      cereal::PortableBinaryInputArchive::Options::LittleEndian(), cereal::PortableBinaryOutputArchive::Options::LittleEndian(), true );
+}
+
+// Tests the default behavior to swap bytes to current machine's endianness
+TEST_CASE("portable_binary_archive_default_behavior")
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(size_t i=0; i<100; ++i)
+  {
+    bool     o_bool   = random_value<uint8_t>(gen) % 2 ? true : false;
+    uint8_t  o_uint8  = random_value<uint8_t>(gen);
+    int8_t   o_int8   = random_value<int8_t>(gen);
+    uint16_t o_uint16 = random_value<uint16_t>(gen);
+    int16_t  o_int16  = random_value<int16_t>(gen);
+    uint32_t o_uint32 = random_value<uint32_t>(gen);
+    int32_t  o_int32  = random_value<int32_t>(gen);
+    uint64_t o_uint64 = random_value<uint64_t>(gen);
+    int64_t  o_int64  = random_value<int64_t>(gen);
+    float    o_float  = random_value<float>(gen);
+    double   o_double = random_value<double>(gen);
+
+    // swap the bytes on all of the data
+    CEREAL_TEST_SWAP_OUTPUT
+
+    std::ostringstream os;
+    {
+      cereal::BinaryOutputArchive oar(os);
+      // manually insert incorrect endian encoding
+      oar(!cereal::portable_binary_detail::is_little_endian());
+
+      oar(o_bool);
+      oar(o_uint8);
+      oar(o_int8);
+      oar(o_uint16);
+      oar(o_int16);
+      oar(o_uint32);
+      oar(o_int32);
+      oar(o_uint64);
+      oar(o_int64);
+      oar(o_float);
+      oar(o_double);
+    }
+
+    // swap back to original values
+    CEREAL_TEST_SWAP_OUTPUT
+
+    bool     i_bool   = false;
+    uint8_t  i_uint8  = 0;
+    int8_t   i_int8   = 0;
+    uint16_t i_uint16 = 0;
+    int16_t  i_int16  = 0;
+    uint32_t i_uint32 = 0;
+    int32_t  i_int32  = 0;
+    uint64_t i_uint64 = 0;
+    int64_t  i_int64  = 0;
+    float    i_float  = 0;
+    double   i_double = 0;
+
+    std::istringstream is(os.str());
+    {
+      cereal::PortableBinaryInputArchive iar(is);
+      iar(i_bool);
+      iar(i_uint8);
+      iar(i_int8);
+      iar(i_uint16);
+      iar(i_int16);
+      iar(i_uint32);
+      iar(i_int32);
+      iar(i_uint64);
+      iar(i_int64);
+      iar(i_float);
+      iar(i_double);
+    }
+
+    CEREAL_TEST_CHECK_EQUAL
+  }
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/portable_binary_archive.hpp b/Src/External/cereal/unittests/portable_binary_archive.hpp
new file mode 100644
index 0000000..b74c4f9
--- /dev/null
+++ b/Src/External/cereal/unittests/portable_binary_archive.hpp
@@ -0,0 +1,156 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_PORTABLE_BINARY_ARCHIVE_H_
+#define CEREAL_TEST_PORTABLE_BINARY_ARCHIVE_H_
+#include "common.hpp"
+
+#include <cmath>
+
+namespace mynamespace { struct MyCustomClass {}; }
+
+template <class T>
+inline void swapBytes( T & t )
+{
+  cereal::portable_binary_detail::swap_bytes<sizeof(T)>( reinterpret_cast<std::uint8_t*>(&t) );
+}
+
+// swaps all output data
+#define CEREAL_TEST_SWAP_OUTPUT \
+    swapBytes(o_bool);          \
+    swapBytes(o_uint8);         \
+    swapBytes(o_int8);          \
+    swapBytes(o_uint16);        \
+    swapBytes(o_int16);         \
+    swapBytes(o_uint32);        \
+    swapBytes(o_int32);         \
+    swapBytes(o_uint64);        \
+    swapBytes(o_int64);         \
+    swapBytes(o_float);         \
+    swapBytes(o_double);
+
+#define CEREAL_TEST_CHECK_EQUAL                 \
+    CHECK_EQ(i_bool   , o_bool);                \
+    CHECK_EQ(i_uint8  , o_uint8);               \
+    CHECK_EQ(i_int8   , o_int8);                \
+    CHECK_EQ(i_uint16 , o_uint16);              \
+    CHECK_EQ(i_int16  , o_int16);               \
+    CHECK_EQ(i_uint32 , o_uint32);              \
+    CHECK_EQ(i_int32  , o_int32);               \
+    CHECK_EQ(i_uint64 , o_uint64);              \
+    CHECK_EQ(i_int64  , o_int64);               \
+    if( !std::isnan(i_float) && !std::isnan(o_float) ) CHECK_EQ(i_float , doctest::Approx(o_float).epsilon(1e-5F)); \
+    if( !std::isnan(i_float) && !std::isnan(o_float) ) CHECK_EQ(i_double, doctest::Approx(o_double).epsilon(1e-5));
+
+// Last parameter exists to keep everything hidden in options
+template <class IArchive, class OArchive> inline
+void test_endian_serialization( typename IArchive::Options const & iOptions, typename OArchive::Options const & oOptions, const std::uint8_t inputLittleEndian )
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(size_t i=0; i<100; ++i)
+  {
+    bool     o_bool   = random_value<uint8_t>(gen) % 2 ? true : false;
+    uint8_t  o_uint8  = random_value<uint8_t>(gen);
+    int8_t   o_int8   = random_value<int8_t>(gen);
+    uint16_t o_uint16 = random_value<uint16_t>(gen);
+    int16_t  o_int16  = random_value<int16_t>(gen);
+    uint32_t o_uint32 = random_value<uint32_t>(gen);
+    int32_t  o_int32  = random_value<int32_t>(gen);
+    uint64_t o_uint64 = random_value<uint64_t>(gen);
+    int64_t  o_int64  = random_value<int64_t>(gen);
+    float    o_float  = random_value<float>(gen);
+    double   o_double = random_value<double>(gen);
+
+    std::vector<int32_t> o_vector(100);
+    for(auto & elem : o_vector)
+      elem = random_value<uint32_t>(gen);
+
+    std::ostringstream os;
+    {
+      OArchive oar(os, oOptions);
+      oar(o_bool);
+      oar(o_uint8);
+      oar(o_int8);
+      oar(o_uint16);
+      oar(o_int16);
+      oar(o_uint32);
+      oar(o_int32);
+      oar(o_uint64);
+      oar(o_int64);
+      oar(o_float);
+      oar(o_double);
+      // We can't test vector directly here since we are artificially interfering with the endianness,
+      // which can result in the size being incorrect
+      oar(cereal::binary_data( o_vector.data(), static_cast<std::size_t>( o_vector.size() * sizeof(int32_t) ) ));
+    }
+
+    bool     i_bool   = false;
+    uint8_t  i_uint8  = 0;
+    int8_t   i_int8   = 0;
+    uint16_t i_uint16 = 0;
+    int16_t  i_int16  = 0;
+    uint32_t i_uint32 = 0;
+    int32_t  i_int32  = 0;
+    uint64_t i_uint64 = 0;
+    int64_t  i_int64  = 0;
+    float    i_float  = 0;
+    double   i_double = 0;
+    std::vector<int32_t> i_vector(100);
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is, iOptions);
+      iar(i_bool);
+      iar(i_uint8);
+      iar(i_int8);
+      iar(i_uint16);
+      iar(i_int16);
+      iar(i_uint32);
+      iar(i_int32);
+      iar(i_uint64);
+      iar(i_int64);
+      iar(i_float);
+      iar(i_double);
+      iar(cereal::binary_data( i_vector.data(), static_cast<std::size_t>( i_vector.size() * sizeof(int32_t) ) ));
+    }
+
+    // Convert to big endian if we expect to read big and didn't start big
+    if( cereal::portable_binary_detail::is_little_endian() ^ inputLittleEndian ) // Convert to little endian if
+    {
+      CEREAL_TEST_SWAP_OUTPUT
+      for( auto & val : o_vector )
+        swapBytes(val);
+    }
+
+    CEREAL_TEST_CHECK_EQUAL
+
+    check_collection(i_vector, o_vector);
+  }
+}
+
+#endif // CEREAL_TEST_PORTABLE_BINARY_ARCHIVE_H_
diff --git a/Src/External/cereal/unittests/priority_queue.cpp b/Src/External/cereal/unittests/priority_queue.cpp
new file mode 100644
index 0000000..e8b997f
--- /dev/null
+++ b/Src/External/cereal/unittests/priority_queue.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "priority_queue.hpp"
+
+TEST_SUITE("priority_queue");
+
+TEST_CASE("binary_priority_queue")
+{
+  test_priority_queue<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_priority_queue")
+{
+  test_priority_queue<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_priority_queue")
+{
+  test_priority_queue<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_priority_queue")
+{
+  test_priority_queue<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/priority_queue.hpp b/Src/External/cereal/unittests/priority_queue.hpp
new file mode 100644
index 0000000..27d31a5
--- /dev/null
+++ b/Src/External/cereal/unittests/priority_queue.hpp
@@ -0,0 +1,107 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_PRIORITY_QUEUE_H_
+#define CEREAL_TEST_PRIORITY_QUEUE_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_priority_queue()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::priority_queue<int> o_podpriority_queue;
+    for(int j=0; j<100; ++j)
+      o_podpriority_queue.push(random_value<int>(gen));
+
+    std::priority_queue<StructInternalSerialize> o_iserpriority_queue;
+    for(int j=0; j<100; ++j)
+      o_iserpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::priority_queue<StructInternalSplit> o_isplpriority_queue;
+    for(int j=0; j<100; ++j)
+      o_isplpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::priority_queue<StructExternalSerialize> o_eserpriority_queue;
+    for(int j=0; j<100; ++j)
+      o_eserpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::priority_queue<StructExternalSplit> o_esplpriority_queue;
+    for(int j=0; j<100; ++j)
+      o_esplpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podpriority_queue);
+      oar(o_iserpriority_queue);
+      oar(o_isplpriority_queue);
+      oar(o_eserpriority_queue);
+      oar(o_esplpriority_queue);
+    }
+
+    std::priority_queue<int> i_podpriority_queue;
+    std::priority_queue<StructInternalSerialize> i_iserpriority_queue;
+    std::priority_queue<StructInternalSplit>     i_isplpriority_queue;
+    std::priority_queue<StructExternalSerialize> i_eserpriority_queue;
+    std::priority_queue<StructExternalSplit>     i_esplpriority_queue;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podpriority_queue);
+      iar(i_iserpriority_queue);
+      iar(i_isplpriority_queue);
+      iar(i_eserpriority_queue);
+      iar(i_esplpriority_queue);
+    }
+
+    auto & i_podpriority_queue_c  = cereal::queue_detail::container(i_podpriority_queue);
+    auto & i_iserpriority_queue_c = cereal::queue_detail::container(i_iserpriority_queue);
+    auto & i_isplpriority_queue_c = cereal::queue_detail::container(i_isplpriority_queue);
+    auto & i_eserpriority_queue_c = cereal::queue_detail::container(i_eserpriority_queue);
+    auto & i_esplpriority_queue_c = cereal::queue_detail::container(i_esplpriority_queue);
+
+    auto & o_podpriority_queue_c  = cereal::queue_detail::container(o_podpriority_queue);
+    auto & o_iserpriority_queue_c = cereal::queue_detail::container(o_iserpriority_queue);
+    auto & o_isplpriority_queue_c = cereal::queue_detail::container(o_isplpriority_queue);
+    auto & o_eserpriority_queue_c = cereal::queue_detail::container(o_eserpriority_queue);
+    auto & o_esplpriority_queue_c = cereal::queue_detail::container(o_esplpriority_queue);
+
+    check_collection(i_podpriority_queue_c,  o_podpriority_queue_c);
+    check_collection(i_iserpriority_queue_c, o_iserpriority_queue_c);
+    check_collection(i_isplpriority_queue_c, o_isplpriority_queue_c);
+    check_collection(i_eserpriority_queue_c, o_eserpriority_queue_c);
+    check_collection(i_esplpriority_queue_c, o_esplpriority_queue_c);
+  }
+}
+
+#endif // CEREAL_TEST_PRIORITY_QUEUE_H_
diff --git a/Src/External/cereal/unittests/queue.cpp b/Src/External/cereal/unittests/queue.cpp
new file mode 100644
index 0000000..5f87705
--- /dev/null
+++ b/Src/External/cereal/unittests/queue.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "queue.hpp"
+
+TEST_SUITE("queue");
+
+TEST_CASE("binary_queue")
+{
+  test_queue<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_queue")
+{
+  test_queue<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_queue")
+{
+  test_queue<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_queue")
+{
+  test_queue<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/queue.hpp b/Src/External/cereal/unittests/queue.hpp
new file mode 100644
index 0000000..3b0484d
--- /dev/null
+++ b/Src/External/cereal/unittests/queue.hpp
@@ -0,0 +1,107 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_QUEUE_H_
+#define CEREAL_TEST_QUEUE_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_queue()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::queue<int> o_podqueue;
+    for(int j=0; j<100; ++j)
+      o_podqueue.push(random_value<int>(gen));
+
+    std::queue<StructInternalSerialize> o_iserqueue;
+    for(int j=0; j<100; ++j)
+      o_iserqueue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::queue<StructInternalSplit> o_isplqueue;
+    for(int j=0; j<100; ++j)
+      o_isplqueue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::queue<StructExternalSerialize> o_eserqueue;
+    for(int j=0; j<100; ++j)
+      o_eserqueue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::queue<StructExternalSplit> o_esplqueue;
+    for(int j=0; j<100; ++j)
+      o_esplqueue.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podqueue);
+      oar(o_iserqueue);
+      oar(o_isplqueue);
+      oar(o_eserqueue);
+      oar(o_esplqueue);
+    }
+
+    std::queue<int> i_podqueue;
+    std::queue<StructInternalSerialize> i_iserqueue;
+    std::queue<StructInternalSplit>     i_isplqueue;
+    std::queue<StructExternalSerialize> i_eserqueue;
+    std::queue<StructExternalSplit>     i_esplqueue;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podqueue);
+      iar(i_iserqueue);
+      iar(i_isplqueue);
+      iar(i_eserqueue);
+      iar(i_esplqueue);
+    }
+
+    auto & i_podqueue_c  = cereal::queue_detail::container(i_podqueue);
+    auto & i_iserqueue_c = cereal::queue_detail::container(i_iserqueue);
+    auto & i_isplqueue_c = cereal::queue_detail::container(i_isplqueue);
+    auto & i_eserqueue_c = cereal::queue_detail::container(i_eserqueue);
+    auto & i_esplqueue_c = cereal::queue_detail::container(i_esplqueue);
+
+    auto & o_podqueue_c  = cereal::queue_detail::container(o_podqueue);
+    auto & o_iserqueue_c = cereal::queue_detail::container(o_iserqueue);
+    auto & o_isplqueue_c = cereal::queue_detail::container(o_isplqueue);
+    auto & o_eserqueue_c = cereal::queue_detail::container(o_eserqueue);
+    auto & o_esplqueue_c = cereal::queue_detail::container(o_esplqueue);
+
+    check_collection(i_podqueue_c,  o_podqueue_c);
+    check_collection(i_iserqueue_c, o_iserqueue_c);
+    check_collection(i_isplqueue_c, o_isplqueue_c);
+    check_collection(i_eserqueue_c, o_eserqueue_c);
+    check_collection(i_esplqueue_c, o_esplqueue_c);
+  }
+}
+
+#endif // CEREAL_TEST_QUEUE_H_
diff --git a/Src/External/cereal/unittests/run_portability_test.cmake b/Src/External/cereal/unittests/run_portability_test.cmake
new file mode 100644
index 0000000..2841e6c
--- /dev/null
+++ b/Src/External/cereal/unittests/run_portability_test.cmake
@@ -0,0 +1,16 @@
+macro(EXEC_CMD_CHECK)
+  message("running ${ARGN}")
+  execute_process(COMMAND ${ARGN} RESULT_VARIABLE CMD_RESULT)
+  if(CMD_RESULT)
+    message(FATAL_ERROR "Error running ${ARGN}")
+  endif()
+endmacro()
+
+set(PORTABILITY_TEST_32 "${PORTABILITY_TEST_DIR}/portability_test32")
+set(PORTABILITY_TEST_64 "${PORTABILITY_TEST_DIR}/portability_test64")
+
+exec_cmd_check(${PORTABILITY_TEST_64} save 64)
+exec_cmd_check(${PORTABILITY_TEST_32} load 32)
+exec_cmd_check(${PORTABILITY_TEST_32} save 32)
+exec_cmd_check(${PORTABILITY_TEST_64} load 64)
+exec_cmd_check(${PORTABILITY_TEST_64} remove 64)
diff --git a/Src/External/cereal/unittests/run_valgrind.sh b/Src/External/cereal/unittests/run_valgrind.sh
new file mode 100755
index 0000000..022b1b0
--- /dev/null
+++ b/Src/External/cereal/unittests/run_valgrind.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+TESTS=./test_*
+
+for f in $TESTS
+  do
+    valgrind --tool=memcheck --leak-check=full $f
+  done
diff --git a/Src/External/cereal/unittests/set.cpp b/Src/External/cereal/unittests/set.cpp
new file mode 100644
index 0000000..cc2e00c
--- /dev/null
+++ b/Src/External/cereal/unittests/set.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "set.hpp"
+
+TEST_SUITE("set");
+
+TEST_CASE("binary_set")
+{
+  test_set<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_set")
+{
+  test_set<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_set")
+{
+  test_set<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_set")
+{
+  test_set<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/set.hpp b/Src/External/cereal/unittests/set.hpp
new file mode 100644
index 0000000..6e39942
--- /dev/null
+++ b/Src/External/cereal/unittests/set.hpp
@@ -0,0 +1,95 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_SET_H_
+#define CEREAL_TEST_SET_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_set()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::set<int> o_podset;
+    for(int j=0; j<100; ++j)
+      o_podset.insert(random_value<int>(gen));
+
+    std::set<StructInternalSerialize> o_iserset;
+    for(int j=0; j<100; ++j)
+      o_iserset.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::set<StructInternalSplit> o_isplset;
+    for(int j=0; j<100; ++j)
+      o_isplset.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::set<StructExternalSerialize> o_eserset;
+    for(int j=0; j<100; ++j)
+      o_eserset.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::set<StructExternalSplit> o_esplset;
+    for(int j=0; j<100; ++j)
+      o_esplset.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podset);
+      oar(o_iserset);
+      oar(o_isplset);
+      oar(o_eserset);
+      oar(o_esplset);
+    }
+
+    std::set<int> i_podset;
+    std::set<StructInternalSerialize>   i_iserset;
+    std::set<StructInternalSplit>        i_isplset;
+    std::set<StructExternalSerialize> i_eserset;
+    std::set<StructExternalSplit>       i_esplset;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podset);
+      iar(i_iserset);
+      iar(i_isplset);
+      iar(i_eserset);
+      iar(i_esplset);
+    }
+
+    check_collection(i_podset,  o_podset);
+    check_collection(i_iserset, o_iserset);
+    check_collection(i_isplset, o_isplset);
+    check_collection(i_eserset, o_eserset);
+    check_collection(i_esplset, o_esplset);
+  }
+}
+
+#endif // CEREAL_TEST_SET_H_
diff --git a/Src/External/cereal/unittests/stack.cpp b/Src/External/cereal/unittests/stack.cpp
new file mode 100644
index 0000000..3e4212c
--- /dev/null
+++ b/Src/External/cereal/unittests/stack.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "stack.hpp"
+
+TEST_SUITE("stack");
+
+TEST_CASE("binary_stack")
+{
+  test_stack<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_stack")
+{
+  test_stack<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_stack")
+{
+  test_stack<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_stack")
+{
+  test_stack<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/stack.hpp b/Src/External/cereal/unittests/stack.hpp
new file mode 100644
index 0000000..4ea1ae3
--- /dev/null
+++ b/Src/External/cereal/unittests/stack.hpp
@@ -0,0 +1,107 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_STACK_H_
+#define CEREAL_TEST_STACK_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_stack()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::stack<int> o_podstack;
+    for(int j=0; j<100; ++j)
+      o_podstack.push(random_value<int>(gen));
+
+    std::stack<StructInternalSerialize> o_iserstack;
+    for(int j=0; j<100; ++j)
+      o_iserstack.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::stack<StructInternalSplit> o_isplstack;
+    for(int j=0; j<100; ++j)
+      o_isplstack.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::stack<StructExternalSerialize> o_eserstack;
+    for(int j=0; j<100; ++j)
+      o_eserstack.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::stack<StructExternalSplit> o_esplstack;
+    for(int j=0; j<100; ++j)
+      o_esplstack.push({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podstack);
+      oar(o_iserstack);
+      oar(o_isplstack);
+      oar(o_eserstack);
+      oar(o_esplstack);
+    }
+
+    std::stack<int> i_podstack;
+    std::stack<StructInternalSerialize> i_iserstack;
+    std::stack<StructInternalSplit>     i_isplstack;
+    std::stack<StructExternalSerialize> i_eserstack;
+    std::stack<StructExternalSplit>     i_esplstack;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podstack);
+      iar(i_iserstack);
+      iar(i_isplstack);
+      iar(i_eserstack);
+      iar(i_esplstack);
+    }
+
+    auto & i_podstack_c  = cereal::stack_detail::container(i_podstack);
+    auto & i_iserstack_c = cereal::stack_detail::container(i_iserstack);
+    auto & i_isplstack_c = cereal::stack_detail::container(i_isplstack);
+    auto & i_eserstack_c = cereal::stack_detail::container(i_eserstack);
+    auto & i_esplstack_c = cereal::stack_detail::container(i_esplstack);
+
+    auto & o_podstack_c  = cereal::stack_detail::container(o_podstack);
+    auto & o_iserstack_c = cereal::stack_detail::container(o_iserstack);
+    auto & o_isplstack_c = cereal::stack_detail::container(o_isplstack);
+    auto & o_eserstack_c = cereal::stack_detail::container(o_eserstack);
+    auto & o_esplstack_c = cereal::stack_detail::container(o_esplstack);
+
+    check_collection(i_podstack_c,  o_podstack_c );
+    check_collection(i_iserstack_c, o_iserstack_c);
+    check_collection(i_isplstack_c, o_isplstack_c);
+    check_collection(i_eserstack_c, o_eserstack_c);
+    check_collection(i_esplstack_c, o_esplstack_c);
+  }
+}
+
+#endif // CEREAL_TEST_STACK_H_
diff --git a/Src/External/cereal/unittests/structs.cpp b/Src/External/cereal/unittests/structs.cpp
new file mode 100644
index 0000000..117e7cc
--- /dev/null
+++ b/Src/External/cereal/unittests/structs.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "structs.hpp"
+
+TEST_SUITE("structs");
+
+TEST_CASE("binary_structs")
+{
+  test_structs<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_structs")
+{
+  test_structs<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_structs")
+{
+  test_structs<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_structs")
+{
+  test_structs<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/structs.hpp b/Src/External/cereal/unittests/structs.hpp
new file mode 100644
index 0000000..db7ce13
--- /dev/null
+++ b/Src/External/cereal/unittests/structs.hpp
@@ -0,0 +1,68 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_STRUCTS_H_
+#define CEREAL_TEST_STRUCTS_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_structs()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    StructInternalSerialize o_iser = { random_value<int>(gen), random_value<int>(gen) };
+    StructInternalSplit     o_ispl = { random_value<int>(gen), random_value<int>(gen) };
+    StructExternalSerialize o_eser = { random_value<int>(gen), random_value<int>(gen) };
+    StructExternalSplit     o_espl = { random_value<int>(gen), random_value<int>(gen) };
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+      oar( o_iser, o_ispl, o_eser, o_espl);
+    }
+
+    StructInternalSerialize i_iser;
+    StructInternalSplit     i_ispl;
+    StructExternalSerialize i_eser;
+    StructExternalSplit     i_espl;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+      iar( i_iser, i_ispl, i_eser, i_espl);
+    }
+
+    CHECK_EQ(i_iser, o_iser);
+    CHECK_EQ(i_ispl, o_ispl);
+    CHECK_EQ(i_eser, o_eser);
+    CHECK_EQ(i_espl, o_espl);
+  }
+}
+
+#endif // CEREAL_TEST_STRUCTS_H_
diff --git a/Src/External/cereal/unittests/structs_minimal.cpp b/Src/External/cereal/unittests/structs_minimal.cpp
new file mode 100644
index 0000000..d78f819
--- /dev/null
+++ b/Src/External/cereal/unittests/structs_minimal.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "structs_minimal.hpp"
+
+TEST_SUITE("structs_minimal");
+
+TEST_CASE("binary_structs_minimal")
+{
+  test_structs_minimal<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_structs_minimal")
+{
+  test_structs_minimal<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_structs_minimal")
+{
+  test_structs_minimal<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_structs_minimal")
+{
+  test_structs_minimal<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/structs_minimal.hpp b/Src/External/cereal/unittests/structs_minimal.hpp
new file mode 100644
index 0000000..57ccd49
--- /dev/null
+++ b/Src/External/cereal/unittests/structs_minimal.hpp
@@ -0,0 +1,254 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_STRUCTS_MINIMAL_H_
+#define CEREAL_TEST_STRUCTS_MINIMAL_H_
+#include "common.hpp"
+
+class MemberMinimal
+{
+  public:
+    MemberMinimal() = default;
+    MemberMinimal( std::string const & str ) : x( str ) {}
+
+  protected:
+    friend class cereal::access;
+
+    template <class Archive>
+    std::string save_minimal( Archive const & ) const
+    {
+      return x;
+    }
+
+    template <class Archive>
+    void load_minimal( Archive const &, std::string const & str )
+    {
+      x = str;
+    }
+
+  public:
+    std::string x;
+};
+
+class MemberMinimalVersioned
+{
+  public:
+    MemberMinimalVersioned() = default;
+    MemberMinimalVersioned( double d ) : x( d ) {}
+
+  protected:
+    friend class cereal::access;
+
+    template <class Archive>
+    double save_minimal( Archive const &, const std::uint32_t ) const
+    {
+      return x;
+    }
+
+    template <class Archive>
+    void load_minimal( Archive const &, double const & d, const std::uint32_t )
+    {
+      x = d;
+    }
+
+  public:
+    double x;
+};
+
+struct NonMemberMinimal
+{
+  NonMemberMinimal() = default;
+  NonMemberMinimal( std::uint32_t xx ) : x(xx) {}
+  std::uint32_t x;
+};
+
+template <class Archive> inline
+std::uint32_t save_minimal( Archive const &, NonMemberMinimal const & nmm )
+{
+  return nmm.x;
+}
+
+template <class Archive> inline
+void load_minimal( Archive const &, NonMemberMinimal & nmm, std::uint32_t const & data )
+{
+  nmm.x = data;
+}
+
+struct NonMemberMinimalVersioned
+{
+  NonMemberMinimalVersioned() = default;
+  NonMemberMinimalVersioned( bool xx ) : x(xx) {}
+  bool x;
+};
+
+template <class Archive> inline
+bool save_minimal( Archive const &, NonMemberMinimalVersioned const & nmm, std::uint32_t const )
+{
+  return nmm.x;
+}
+
+template <class Archive> inline
+void load_minimal( Archive const &, NonMemberMinimalVersioned & nmm, bool const & data, std::uint32_t const )
+{
+  nmm.x = data;
+}
+
+struct TestStruct
+{
+  TestStruct() = default;
+  TestStruct( std::string const & s, double d, std::uint32_t u, bool b ) :
+    mm(s), mmv(d), nmm(u), nmmv(b) {}
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( mm, mmv );
+    ar( nmm, nmmv );
+  }
+
+  MemberMinimal mm;
+  MemberMinimalVersioned mmv;
+  NonMemberMinimal nmm;
+  NonMemberMinimalVersioned nmmv;
+};
+
+struct Issue79Struct
+{
+  Issue79Struct() = default;
+  Issue79Struct( std::int32_t xx ) : x(xx) {}
+  std::int32_t x;
+};
+
+template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
+                                                   std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
+inline std::string save_minimal( Archive const &, Issue79Struct const & val )
+{
+  return std::to_string( val.x );
+}
+
+template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
+                                                   std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
+inline void load_minimal( Archive const &, Issue79Struct & val, std::string const & str )
+{
+  val.x = std::stoi( str );
+}
+
+template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
+                                                  std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
+inline std::int32_t save_minimal( Archive const &, Issue79Struct const & val )
+{
+  return val.x;
+}
+
+template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
+                                                  std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
+inline void load_minimal( Archive const &, Issue79Struct & val, std::int32_t const & xx )
+{
+  val.x = xx;
+}
+
+struct Issue79StructInternal
+{
+  Issue79StructInternal() = default;
+  Issue79StructInternal( std::int32_t xx ) : x(xx) {}
+  std::int32_t x;
+
+  template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
+                                                     std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
+  inline std::string save_minimal( Archive const & ) const
+  {
+    return std::to_string( x );
+  }
+
+  template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
+                                                     std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
+  inline void load_minimal( Archive const &, std::string const & str )
+  {
+    x = std::stoi( str );
+  }
+
+  template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
+                                                    std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
+  inline std::int32_t save_minimal( Archive const & ) const
+  {
+    return x;
+  }
+
+  template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
+                                                    std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
+  inline void load_minimal( Archive const &, std::int32_t const & xx )
+  {
+    x = xx;
+  }
+};
+
+template <class IArchive, class OArchive> inline
+void test_structs_minimal()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    TestStruct o_struct = { random_basic_string<char>(gen), random_value<double>(gen),
+                            random_value<std::uint32_t>(gen), random_value<uint8_t>(gen) % 2 ? true : false };
+
+    Issue79Struct o_struct2 = { random_value<std::int32_t>(gen) };
+    Issue79StructInternal o_struct3 = { random_value<std::int32_t>(gen) };
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+      oar( o_struct );
+      oar( o_struct2 );
+      oar( o_struct3 );
+    }
+
+    decltype(o_struct) i_struct;
+    decltype(o_struct2) i_struct2;
+    decltype(o_struct3) i_struct3;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+      iar( i_struct );
+      iar( i_struct2 );
+      iar( i_struct3 );
+    }
+
+    CHECK_EQ(o_struct.mm.x, i_struct.mm.x);
+    CHECK_EQ(o_struct.mmv.x, doctest::Approx(i_struct.mmv.x).epsilon(1e-5));
+
+    CHECK_EQ(o_struct.nmm.x, i_struct.nmm.x);
+    CHECK_EQ(o_struct.nmmv.x, i_struct.nmmv.x);
+
+    CHECK_EQ(o_struct2.x, i_struct2.x);
+
+    CHECK_EQ(o_struct3.x, i_struct3.x);
+  }
+}
+
+#endif // CEREAL_TEST_STRUCTS_MINIMAL_H_
diff --git a/Src/External/cereal/unittests/structs_specialized.cpp b/Src/External/cereal/unittests/structs_specialized.cpp
new file mode 100644
index 0000000..1aa3e67
--- /dev/null
+++ b/Src/External/cereal/unittests/structs_specialized.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "structs_specialized.hpp"
+
+TEST_SUITE("structs_specialized");
+
+TEST_CASE("binary_structs_specialized")
+{
+  test_structs_specialized<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_structs_specialized")
+{
+  test_structs_specialized<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_structs_specialized")
+{
+  test_structs_specialized<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_structs_specialized")
+{
+  test_structs_specialized<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/structs_specialized.hpp b/Src/External/cereal/unittests/structs_specialized.hpp
new file mode 100644
index 0000000..8daec99
--- /dev/null
+++ b/Src/External/cereal/unittests/structs_specialized.hpp
@@ -0,0 +1,461 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_STRUCTS_MINIMAL_H_
+#define CEREAL_TEST_STRUCTS_MINIMAL_H_
+#include "common.hpp"
+
+struct BogusBase
+{
+  template <class Archive>
+  void serialize( Archive & ) {}
+
+  template <class Archive>
+  void save( Archive & ) const {}
+
+  template <class Archive>
+  void load( Archive & ) {}
+
+  template <class Archive>
+  int save_minimal( Archive const & ) const { return 0; }
+
+  template <class Archive>
+  void load_minimal( Archive const &, int const & ) {}
+};
+
+struct BogusBaseVersioned
+{
+  template <class Archive>
+  void serialize( Archive &, const std::uint32_t ) {}
+
+  template <class Archive>
+  void save( Archive &, const std::uint32_t ) const {}
+
+  template <class Archive>
+  void load( Archive &, const std::uint32_t ) {}
+
+  template <class Archive>
+  int save_minimal( Archive const &, const std::uint32_t ) const { return 0; }
+
+  template <class Archive>
+  void load_minimal( Archive const &, int const &, const std::uint32_t ) {}
+};
+
+struct BogusBasePolymorphic
+{
+  template <class Archive>
+  void serialize( Archive & ) {}
+
+  virtual void doesNothing() {}
+};
+
+class SpecializedMSerialize : public BogusBase
+{
+  public:
+    SpecializedMSerialize() = default;
+    SpecializedMSerialize( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void serialize( Archive & ar )
+    {
+      ar( x );
+    }
+};
+
+class SpecializedMSerializeVersioned : public BogusBaseVersioned
+{
+  public:
+    SpecializedMSerializeVersioned() = default;
+    SpecializedMSerializeVersioned( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void serialize( Archive & ar, const std::uint32_t )
+    {
+      ar( x );
+    }
+};
+
+class SpecializedMSplit : public BogusBase
+{
+  public:
+    SpecializedMSplit() = default;
+    SpecializedMSplit( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void save( Archive & ar ) const
+    {
+      ar( x );
+    }
+
+    template <class Archive>
+    void load( Archive & ar )
+    {
+      ar( x );
+    }
+};
+
+class SpecializedMSplitVersioned : public BogusBaseVersioned
+{
+  public:
+    SpecializedMSplitVersioned() = default;
+    SpecializedMSplitVersioned( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void save( Archive & ar, const std::uint32_t ) const
+    {
+      ar( x );
+    }
+
+    template <class Archive>
+    void load( Archive & ar, const std::uint32_t )
+    {
+      ar( x );
+    }
+};
+
+class SpecializedMSplitPolymorphic : public BogusBasePolymorphic
+{
+  public:
+    SpecializedMSplitPolymorphic() = default;
+    SpecializedMSplitPolymorphic( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void save( Archive & ar ) const
+    {
+      ar( x );
+    }
+
+    template <class Archive>
+    void load( Archive & ar )
+    {
+      ar( x );
+    }
+};
+
+class SpecializedMSplitMinimal : public BogusBase
+{
+  public:
+    SpecializedMSplitMinimal() = default;
+    SpecializedMSplitMinimal( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    int save_minimal( Archive const & ) const
+    {
+      return x;
+    }
+
+    template <class Archive>
+    void load_minimal( Archive const &, int const & value )
+    {
+      x = value;
+    }
+};
+
+class SpecializedMSplitVersionedMinimal : public BogusBaseVersioned
+{
+  public:
+    SpecializedMSplitVersionedMinimal() = default;
+    SpecializedMSplitVersionedMinimal( int xx ) : x(xx) {}
+
+    int x;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    int save_minimal( Archive const &, const std::uint32_t ) const
+    {
+      return x;
+    }
+
+    template <class Archive>
+    void load_minimal( Archive const &, int const & value, const std::uint32_t )
+    {
+      x = value;
+    }
+};
+
+class SpecializedNMSerialize : public BogusBase
+{
+  public:
+    SpecializedNMSerialize() = default;
+    SpecializedNMSerialize( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void serialize( Archive & ar, SpecializedNMSerialize & s )
+{
+  ar( s.x );
+}
+
+class SpecializedNMSerializeVersioned : public BogusBaseVersioned
+{
+  public:
+    SpecializedNMSerializeVersioned() = default;
+    SpecializedNMSerializeVersioned( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void serialize( Archive & ar, SpecializedNMSerializeVersioned & s )
+{
+  ar( s.x );
+}
+
+class SpecializedNMSplit : public BogusBase
+{
+  public:
+    SpecializedNMSplit() = default;
+    SpecializedNMSplit( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void load( Archive & ar, SpecializedNMSplit & s )
+{
+  ar( s.x );
+}
+
+template <class Archive>
+void save( Archive & ar, SpecializedNMSplit const & s )
+{
+  ar( s.x );
+}
+
+class SpecializedNMSplitVersioned : public BogusBaseVersioned
+{
+  public:
+    SpecializedNMSplitVersioned() = default;
+    SpecializedNMSplitVersioned( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void load( Archive & ar, SpecializedNMSplitVersioned & s, const std::uint32_t )
+{
+  ar( s.x );
+}
+
+template <class Archive>
+void save( Archive & ar, SpecializedNMSplitVersioned const & s, const std::uint32_t )
+{
+  ar( s.x );
+}
+
+class SpecializedNMSplitMinimal : public BogusBase
+{
+  public:
+    SpecializedNMSplitMinimal() = default;
+    SpecializedNMSplitMinimal( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void load_minimal( Archive const &, SpecializedNMSplitMinimal & s, int const & value )
+{
+  s.x = value;
+}
+
+template <class Archive>
+int save_minimal( Archive const &, SpecializedNMSplitMinimal const & s )
+{
+  return s.x;
+}
+
+class SpecializedNMSplitVersionedMinimal : public BogusBaseVersioned
+{
+  public:
+    SpecializedNMSplitVersionedMinimal() = default;
+    SpecializedNMSplitVersionedMinimal( int xx ) : x(xx) {}
+
+    int x;
+};
+
+template <class Archive>
+void load_minimal( Archive const &, SpecializedNMSplitVersionedMinimal & s, int const & value, const std::uint32_t )
+{
+  s.x = value;
+}
+
+template <class Archive>
+int save_minimal( Archive const &, SpecializedNMSplitVersionedMinimal const & s, const std::uint32_t )
+{
+  return s.x;
+}
+
+namespace cereal
+{
+  template <class Archive> struct specialize<Archive, SpecializedMSerialize, cereal::specialization::member_serialize> {};
+  template <class Archive> struct specialize<Archive, SpecializedMSerializeVersioned, cereal::specialization::member_serialize> {};
+
+  template <class Archive> struct specialize<Archive, SpecializedMSplit, cereal::specialization::member_load_save> {};
+  template <class Archive> struct specialize<Archive, SpecializedMSplitVersioned, cereal::specialization::member_load_save> {};
+  template <class Archive> struct specialize<Archive, SpecializedMSplitPolymorphic, cereal::specialization::member_load_save> {};
+
+  template <class Archive> struct specialize<Archive, SpecializedMSplitMinimal, cereal::specialization::member_load_save_minimal> {};
+  template <class Archive> struct specialize<Archive, SpecializedMSplitVersionedMinimal, cereal::specialization::member_load_save_minimal> {};
+
+  template <class Archive> struct specialize<Archive, SpecializedNMSerialize, cereal::specialization::non_member_serialize> {};
+  template <class Archive> struct specialize<Archive, SpecializedNMSerializeVersioned, cereal::specialization::non_member_serialize> {};
+
+  template <class Archive> struct specialize<Archive, SpecializedNMSplit, cereal::specialization::non_member_load_save> {};
+  template <class Archive> struct specialize<Archive, SpecializedNMSplitVersioned, cereal::specialization::non_member_load_save> {};
+
+  template <class Archive> struct specialize<Archive, SpecializedNMSplitMinimal,
+           cereal::specialization::non_member_load_save_minimal> {};
+  template <class Archive> struct specialize<Archive, SpecializedNMSplitVersionedMinimal,
+           cereal::specialization::non_member_load_save_minimal> {};
+}
+
+CEREAL_REGISTER_TYPE(SpecializedMSplitPolymorphic)
+CEREAL_REGISTER_POLYMORPHIC_RELATION(BogusBasePolymorphic, SpecializedMSplitPolymorphic)
+
+template <class IArchive, class OArchive> inline
+void test_structs_specialized()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    SpecializedMSerialize               o_iser          = { random_value<int>(gen) };
+    SpecializedMSerializeVersioned      o_iserv         = { random_value<int>(gen) };
+
+    SpecializedMSplit                   o_ispl          = { random_value<int>(gen) };
+    SpecializedMSplitVersioned          o_isplv         = { random_value<int>(gen) };
+
+    // added re: issue #180
+    std::shared_ptr<BogusBasePolymorphic> o_shared_ispl = std::make_shared<SpecializedMSplitPolymorphic>( random_value<int>(gen) );
+
+    SpecializedMSplitMinimal            o_isplm         = { random_value<int>(gen) };
+    SpecializedMSplitVersionedMinimal   o_isplvm        = { random_value<int>(gen) };
+
+    SpecializedNMSerialize              o_eser          = { random_value<int>(gen) };
+    SpecializedNMSerializeVersioned     o_eserv         = { random_value<int>(gen) };
+
+    SpecializedNMSplit                  o_espl          = { random_value<int>(gen) };
+    SpecializedNMSplitVersioned         o_esplv         = { random_value<int>(gen) };
+
+    SpecializedNMSplitMinimal           o_esplm         = { random_value<int>(gen) };
+    SpecializedNMSplitVersionedMinimal  o_esplvm        = { random_value<int>(gen) };
+
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( o_iser, o_iserv,
+           o_ispl, o_isplv, o_shared_ispl,
+           o_isplm, o_isplvm,
+           o_eser, o_eserv,
+           o_espl, o_esplv,
+           o_esplm, o_esplvm );
+    }
+
+    decltype(o_iser) i_iser;
+    decltype(o_iserv) i_iserv;
+
+    decltype(o_ispl) i_ispl;
+    decltype(o_isplv) i_isplv;
+
+    decltype(o_shared_ispl) i_shared_ispl;
+
+    decltype(o_isplm) i_isplm;
+    decltype(o_isplvm) i_isplvm;
+
+    decltype(o_eser) i_eser;
+    decltype(o_eserv) i_eserv;
+
+    decltype(o_espl) i_espl;
+    decltype(o_esplv) i_esplv;
+
+    decltype(o_esplm) i_esplm;
+    decltype(o_esplvm) i_esplvm;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( i_iser, i_iserv,
+           i_ispl, i_isplv, i_shared_ispl,
+           i_isplm, i_isplvm,
+           i_eser, i_eserv,
+           i_espl, i_esplv,
+           i_esplm, i_esplvm );
+    }
+
+    CHECK_EQ(i_iser.x, o_iser.x);
+    CHECK_EQ(i_iserv.x, o_iserv.x);
+
+    CHECK_EQ(i_ispl.x, o_ispl.x);
+    CHECK_EQ(i_isplv.x, o_isplv.x);
+
+    CHECK_EQ(dynamic_cast<SpecializedMSplitPolymorphic*>(i_shared_ispl.get())->x, dynamic_cast<SpecializedMSplitPolymorphic*>(o_shared_ispl.get())->x);
+
+    CHECK_EQ(i_isplm.x, o_isplm.x);
+    CHECK_EQ(i_isplvm.x, o_isplvm.x);
+
+    CHECK_EQ(i_eser.x, o_eser.x);
+    CHECK_EQ(i_eserv.x, o_eserv.x);
+
+    CHECK_EQ(i_espl.x, o_espl.x);
+    CHECK_EQ(i_esplv.x, o_esplv.x);
+
+    CHECK_EQ(i_esplm.x, o_esplm.x);
+    CHECK_EQ(i_esplvm.x, o_esplvm.x);
+  }
+}
+
+#endif // CEREAL_TEST_STRUCTS_SPECIALIZED_H_
diff --git a/Src/External/cereal/unittests/tuple.cpp b/Src/External/cereal/unittests/tuple.cpp
new file mode 100644
index 0000000..d3ea635
--- /dev/null
+++ b/Src/External/cereal/unittests/tuple.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "tuple.hpp"
+
+TEST_SUITE("tuple");
+
+TEST_CASE("binary_tuple")
+{
+  test_tuple<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_tuple")
+{
+  test_tuple<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_tuple")
+{
+  test_tuple<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_tuple")
+{
+  test_tuple<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/tuple.hpp b/Src/External/cereal/unittests/tuple.hpp
new file mode 100644
index 0000000..edb25b2
--- /dev/null
+++ b/Src/External/cereal/unittests/tuple.hpp
@@ -0,0 +1,101 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_TUPLE_H_
+#define CEREAL_TEST_TUPLE_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_tuple()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rng = [&](){ return random_value<int>(gen); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    auto o_podtuple = std::make_tuple( rng(), rng(), rng(), rng() );
+    auto o_podtuple11 = std::make_tuple( rng(), rng(), rng(), rng(), rng(), rng(),
+                                         rng(), rng(), rng(), rng(), rng() );
+    auto o_isertuple = std::make_tuple( StructInternalSerialize( rng(), rng() ),
+        StructInternalSerialize( rng(), rng() ),
+        StructInternalSerialize( rng(), rng() ),
+        StructInternalSerialize( rng(), rng() ) );
+    auto o_ispltuple = std::make_tuple( StructInternalSplit( rng(), rng() ),
+        StructInternalSplit( rng(), rng() ),
+        StructInternalSplit( rng(), rng() ),
+        StructInternalSplit( rng(), rng() ) );
+    auto o_esertuple = std::make_tuple( StructExternalSerialize( rng(), rng() ),
+        StructExternalSerialize( rng(), rng() ),
+        StructExternalSerialize( rng(), rng() ),
+        StructExternalSerialize( rng(), rng() ) );
+    auto o_espltuple = std::make_tuple( StructExternalSerialize( rng(), rng() ),
+        StructExternalSerialize( rng(), rng() ),
+        StructExternalSerialize( rng(), rng() ),
+        StructExternalSerialize( rng(), rng() ) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podtuple);
+      oar(o_podtuple11);
+      oar(o_isertuple);
+      oar(o_ispltuple);
+      oar(o_esertuple);
+      oar(o_espltuple);
+    }
+
+    decltype( o_podtuple   ) i_podtuple;
+    decltype( o_podtuple11 ) i_podtuple11;
+    decltype( o_isertuple  ) i_isertuple;
+    decltype( o_ispltuple  ) i_ispltuple;
+    decltype( o_esertuple  ) i_esertuple;
+    decltype( o_espltuple  ) i_espltuple;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podtuple);
+      iar(i_podtuple11);
+      iar(i_isertuple);
+      iar(i_ispltuple);
+      iar(i_esertuple);
+      iar(i_espltuple);
+    }
+
+    CHECK_EQ( i_podtuple,   o_podtuple);
+    CHECK_EQ( i_podtuple11, o_podtuple11);
+    CHECK_EQ( i_isertuple,  o_isertuple);
+    CHECK_EQ( i_ispltuple,  o_ispltuple);
+    CHECK_EQ( i_esertuple,  o_esertuple);
+    CHECK_EQ( i_espltuple,  o_espltuple);
+  }
+}
+
+#endif // CEREAL_TEST_TUPLE_H_
diff --git a/Src/External/cereal/unittests/unordered_loads.cpp b/Src/External/cereal/unittests/unordered_loads.cpp
new file mode 100644
index 0000000..9377276
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_loads.cpp
@@ -0,0 +1,42 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "unordered_loads.hpp"
+
+TEST_SUITE("unordered_loads");
+
+TEST_CASE("xml_unordered_loads")
+{
+  test_unordered_loads<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_unordered_loads")
+{
+  test_unordered_loads<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_loads.hpp b/Src/External/cereal/unittests/unordered_loads.hpp
new file mode 100644
index 0000000..278fb65
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_loads.hpp
@@ -0,0 +1,149 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_UNORDERED_LOADS_H_
+#define CEREAL_TEST_UNORDERED_LOADS_H_
+#include "common.hpp"
+
+struct unordered_naming
+{
+  int x;
+  int xx;
+  int y;
+  int z;
+
+  template <class Archive>
+  void save( Archive & ar ) const
+  {
+    ar( CEREAL_NVP(x),
+        CEREAL_NVP(z),
+        CEREAL_NVP(y),
+        CEREAL_NVP(xx) );
+  }
+
+  template <class Archive>
+  void load( Archive & ar )
+  {
+    ar( x,
+        CEREAL_NVP(y),
+        CEREAL_NVP(z),
+        CEREAL_NVP(xx) );
+  }
+
+  bool operator==( unordered_naming const & other ) const
+  {
+    return x == other.x && xx == other.xx && y == other.y && z == other.z;
+  }
+};
+
+std::ostream& operator<<(std::ostream& os, unordered_naming const & s)
+{
+  os << "[x: " << s.x << " xx: " << s.xx << " y: " << s.y << " z: " << s.z << "]";
+  return os;
+}
+
+template <class IArchive, class OArchive> inline
+void test_unordered_loads()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rngB = [&](){ return random_value<int>( gen ) % 2 == 0; };
+  auto rngI = [&](){ return random_value<int>( gen ); };
+  auto rngF = [&](){ return random_value<float>( gen ); };
+  auto rngD = [&](){ return random_value<double>( gen ); };
+  auto rngS = [&](){ return random_basic_string<char>( gen ); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    auto const name1 = rngS();
+    auto const name2 = rngS();
+    auto const name3 = rngS();
+    auto const name4 = rngS();
+    auto const name5 = rngS();
+    auto const name6 = rngS();
+    auto const name7 = rngS();
+
+    int o_int1 = rngI();
+    double o_double2 = rngD();
+    std::vector<bool> o_vecbool3 = { rngB(), rngB(), rngB(), rngB(), rngB() };
+    int o_int4 = rngI();
+    int o_int5 = rngI();
+    int o_int6 = rngI();
+    std::pair<float, unordered_naming> o_un7;
+    o_un7.first = rngF();
+    o_un7.second.x = rngI();
+    o_un7.second.xx = rngI();
+    o_un7.second.y = rngI();
+    o_un7.second.z = rngI();
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar( cereal::make_nvp( name1, o_int1 ),
+           cereal::make_nvp( name2, o_double2 ),
+           cereal::make_nvp( name3, o_vecbool3 ),
+           cereal::make_nvp( name4, o_int4 ),
+           cereal::make_nvp( name5, o_int5 ),
+           cereal::make_nvp( name6, o_int6 ),
+           cereal::make_nvp( name7, o_un7 ) );
+    }
+
+    decltype(o_int1) i_int1;
+    decltype(o_double2) i_double2;
+    decltype(o_vecbool3) i_vecbool3;
+    decltype(o_int4) i_int4;
+    decltype(o_int5) i_int5;
+    decltype(o_int6) i_int6;
+    decltype(o_un7) i_un7;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar( cereal::make_nvp( name7, i_un7 ),
+           cereal::make_nvp( name2, i_double2 ),
+           cereal::make_nvp( name4, i_int4 ),
+           cereal::make_nvp( name3, i_vecbool3 ),
+           cereal::make_nvp( name1, i_int1 ),
+           cereal::make_nvp( name5, i_int5 ),
+           i_int6 );
+    }
+
+    CHECK_EQ(o_int1, i_int1);
+    CHECK_EQ(o_double2, doctest::Approx(o_double2).epsilon(1e-5));
+    CHECK_EQ(o_vecbool3.size(), i_vecbool3.size());
+    check_collection(i_vecbool3, o_vecbool3);
+    CHECK_EQ(o_int4, i_int4);
+    CHECK_EQ(o_int5, i_int5);
+    CHECK_EQ(o_int6, i_int6);
+    CHECK_EQ(o_un7.first, i_un7.first);
+    CHECK_EQ(o_un7.second, i_un7.second);
+  }
+}
+
+#endif // CEREAL_TEST_UNORDERED_LOADS_H_
diff --git a/Src/External/cereal/unittests/unordered_map.cpp b/Src/External/cereal/unittests/unordered_map.cpp
new file mode 100644
index 0000000..a0c0cbb
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_map.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "unordered_map.hpp"
+
+TEST_SUITE("unordered_map");
+
+TEST_CASE("binary_unordered_map")
+{
+  test_unordered_map<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_unordered_map")
+{
+  test_unordered_map<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_unordered_map")
+{
+  test_unordered_map<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_unordered_map")
+{
+  test_unordered_map<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_map.hpp b/Src/External/cereal/unittests/unordered_map.hpp
new file mode 100644
index 0000000..7896197
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_map.hpp
@@ -0,0 +1,124 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_UNORDERED_MAP_H_
+#define CEREAL_TEST_UNORDERED_MAP_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_unordered_map()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::unordered_map<std::string, int> o_podunordered_map;
+    for(int j=0; j<100; ++j)
+      o_podunordered_map.insert({random_value<std::string>(gen), random_value<int>(gen)});
+
+    std::unordered_map<uint16_t, StructInternalSerialize> o_iserunordered_map;
+    for(int j=0; j<100; ++j)
+      o_iserunordered_map.insert({random_value<uint16_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::unordered_map<uint16_t, StructInternalSplit> o_isplunordered_map;
+    for(int j=0; j<100; ++j)
+      o_isplunordered_map.insert({random_value<uint16_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::unordered_map<uint32_t, StructExternalSerialize> o_eserunordered_map;
+    for(int j=0; j<100; ++j)
+      o_eserunordered_map.insert({random_value<uint32_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::unordered_map<int8_t, StructExternalSplit> o_esplunordered_map;
+    for(int j=0; j<100; ++j)
+      o_esplunordered_map.insert({random_value<char>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podunordered_map);
+      oar(o_iserunordered_map);
+      oar(o_isplunordered_map);
+      oar(o_eserunordered_map);
+      oar(o_esplunordered_map);
+    }
+
+    std::unordered_map<std::string, int> i_podunordered_map;
+    std::unordered_map<uint16_t, StructInternalSerialize>   i_iserunordered_map;
+    std::unordered_map<uint16_t, StructInternalSplit>        i_isplunordered_map;
+    std::unordered_map<uint32_t, StructExternalSerialize> i_eserunordered_map;
+    std::unordered_map<int8_t, StructExternalSplit>       i_esplunordered_map;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podunordered_map);
+      iar(i_iserunordered_map);
+      iar(i_isplunordered_map);
+      iar(i_eserunordered_map);
+      iar(i_esplunordered_map);
+    }
+
+    for(auto const & p : i_podunordered_map)
+    {
+      auto v = o_podunordered_map.find(p.first);
+      CHECK_NE(v, o_podunordered_map.end());
+      CHECK_EQ(p.second, v->second);
+    }
+
+    for(auto const & p : i_iserunordered_map)
+    {
+      auto v = o_iserunordered_map.find(p.first);
+      CHECK_NE(v, o_iserunordered_map.end());
+      CHECK_EQ(p.second, v->second);
+    }
+
+    for(auto const & p : i_isplunordered_map)
+    {
+      auto v = o_isplunordered_map.find(p.first);
+      CHECK_NE(v, o_isplunordered_map.end());
+      CHECK_EQ(p.second, v->second);
+    }
+
+    for(auto const & p : i_eserunordered_map)
+    {
+      auto v = o_eserunordered_map.find(p.first);
+      CHECK_NE(v, o_eserunordered_map.end());
+      CHECK_EQ(p.second, v->second);
+    }
+
+    for(auto const & p : i_esplunordered_map)
+    {
+      auto v = o_esplunordered_map.find(p.first);
+      CHECK_NE(v, o_esplunordered_map.end());
+      CHECK_EQ(p.second, v->second);
+    }
+  }
+}
+
+#endif // CEREAL_TEST_UNORDERED_MAP_H_
diff --git a/Src/External/cereal/unittests/unordered_multimap.cpp b/Src/External/cereal/unittests/unordered_multimap.cpp
new file mode 100644
index 0000000..4d9a7c3
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_multimap.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "unordered_multimap.hpp"
+
+TEST_SUITE("unordered_multimap");
+
+TEST_CASE("binary_unordered_multimap")
+{
+  test_unordered_multimap<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_unordered_multimap")
+{
+  test_unordered_multimap<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_unordered_multimap")
+{
+  test_unordered_multimap<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_unordered_multimap")
+{
+  test_unordered_multimap<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_multimap.hpp b/Src/External/cereal/unittests/unordered_multimap.hpp
new file mode 100644
index 0000000..6f000e6
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_multimap.hpp
@@ -0,0 +1,155 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_UNORDERED_MULTIMAP_H_
+#define CEREAL_TEST_UNORDERED_MULTIMAP_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_unordered_multimap()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::unordered_multimap<std::string, int> o_podunordered_multimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<std::string>(gen);
+      o_podunordered_multimap.insert({key, random_value<int>(gen)});
+      o_podunordered_multimap.insert({key, random_value<int>(gen)});
+    }
+
+    std::unordered_multimap<int, StructInternalSerialize> o_iserunordered_multimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<int>(gen);
+      o_iserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+      o_iserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::unordered_multimap<int, StructInternalSplit> o_isplunordered_multimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<int>(gen);
+      o_isplunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+      o_isplunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::unordered_multimap<uint32_t, StructExternalSerialize> o_eserunordered_multimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<uint32_t>(gen);
+      o_eserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+      o_eserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::unordered_multimap<int8_t, StructExternalSplit> o_esplunordered_multimap;
+    for(int j=0; j<100; ++j)
+    {
+      auto key = random_value<char>(gen);
+      o_esplunordered_multimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+      o_esplunordered_multimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
+    }
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podunordered_multimap);
+      oar(o_iserunordered_multimap);
+      oar(o_isplunordered_multimap);
+      oar(o_eserunordered_multimap);
+      oar(o_esplunordered_multimap);
+    }
+
+    std::unordered_multimap<std::string, int> i_podunordered_multimap;
+    std::unordered_multimap<int, StructInternalSerialize>   i_iserunordered_multimap;
+    std::unordered_multimap<int, StructInternalSplit>        i_isplunordered_multimap;
+    std::unordered_multimap<uint32_t, StructExternalSerialize> i_eserunordered_multimap;
+    std::unordered_multimap<int8_t, StructExternalSplit>       i_esplunordered_multimap;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podunordered_multimap);
+      iar(i_iserunordered_multimap);
+      iar(i_isplunordered_multimap);
+      iar(i_eserunordered_multimap);
+      iar(i_esplunordered_multimap);
+    }
+
+    CHECK_EQ(i_podunordered_multimap.size(),  o_podunordered_multimap.size());
+    CHECK_EQ(i_iserunordered_multimap.size(), o_iserunordered_multimap.size());
+    CHECK_EQ(i_isplunordered_multimap.size(), o_isplunordered_multimap.size());
+    CHECK_EQ(i_eserunordered_multimap.size(), o_eserunordered_multimap.size());
+    CHECK_EQ(i_esplunordered_multimap.size(), o_esplunordered_multimap.size());
+
+    for(auto const & p : i_podunordered_multimap)
+    {
+      size_t const bucket = o_podunordered_multimap.bucket(p.first);
+      auto bucket_begin   = o_podunordered_multimap.begin(bucket);
+      auto bucket_end     = o_podunordered_multimap.end(bucket);
+      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
+    }
+
+    for(auto const & p : i_iserunordered_multimap)
+    {
+      size_t const bucket = o_iserunordered_multimap.bucket(p.first);
+      auto bucket_begin   = o_iserunordered_multimap.begin(bucket);
+      auto bucket_end     = o_iserunordered_multimap.end(bucket);
+      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
+    }
+
+    for(auto const & p : i_isplunordered_multimap)
+    {
+      size_t const bucket = o_isplunordered_multimap.bucket(p.first);
+      auto bucket_begin   = o_isplunordered_multimap.begin(bucket);
+      auto bucket_end     = o_isplunordered_multimap.end(bucket);
+      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
+    }
+
+    for(auto const & p : i_eserunordered_multimap)
+    {
+      size_t const bucket = o_eserunordered_multimap.bucket(p.first);
+      auto bucket_begin   = o_eserunordered_multimap.begin(bucket);
+      auto bucket_end     = o_eserunordered_multimap.end(bucket);
+      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
+    }
+
+    for(auto const & p : i_esplunordered_multimap)
+    {
+      size_t const bucket = o_esplunordered_multimap.bucket(p.first);
+      auto bucket_begin   = o_esplunordered_multimap.begin(bucket);
+      auto bucket_end     = o_esplunordered_multimap.end(bucket);
+      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
+    }
+  }
+}
+
+#endif // CEREAL_TEST_UNORDERED_MULTIMAP_H_
diff --git a/Src/External/cereal/unittests/unordered_multiset.cpp b/Src/External/cereal/unittests/unordered_multiset.cpp
new file mode 100644
index 0000000..a98ffa1
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_multiset.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "unordered_multiset.hpp"
+
+TEST_SUITE("unordered_multiset");
+
+TEST_CASE("binary_unordered_multiset")
+{
+  test_unordered_multiset<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_unordered_multiset")
+{
+  test_unordered_multiset<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_unordered_multiset")
+{
+  test_unordered_multiset<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_unordered_multiset")
+{
+  test_unordered_multiset<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_multiset.hpp b/Src/External/cereal/unittests/unordered_multiset.hpp
new file mode 100644
index 0000000..ae9d072
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_multiset.hpp
@@ -0,0 +1,134 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_UNORDERED_MULTISET_H_
+#define CEREAL_TEST_UNORDERED_MULTISET_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_unordered_multiset()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::unordered_multiset<int> o_podunordered_multiset;
+    for(int j=0; j<100; ++j)
+    {
+      int value = random_value<int>(gen);
+      o_podunordered_multiset.insert(value);
+      o_podunordered_multiset.insert(value);
+    }
+
+    std::unordered_multiset<StructInternalSerialize, StructHash<StructInternalSerialize>> o_iserunordered_multiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructInternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
+      o_iserunordered_multiset.insert(value);
+      o_iserunordered_multiset.insert(value);
+    }
+
+    std::unordered_multiset<StructInternalSplit, StructHash<StructInternalSplit>> o_isplunordered_multiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructInternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
+      o_isplunordered_multiset.insert(value);
+      o_isplunordered_multiset.insert(value);
+    }
+
+    std::unordered_multiset<StructExternalSerialize, StructHash<StructExternalSerialize>> o_eserunordered_multiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructExternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
+      o_eserunordered_multiset.insert(value);
+      o_eserunordered_multiset.insert(value);
+    }
+
+    std::unordered_multiset<StructExternalSplit, StructHash<StructExternalSplit>> o_esplunordered_multiset;
+    for(int j=0; j<100; ++j)
+    {
+      StructExternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
+      o_esplunordered_multiset.insert(value);
+      o_esplunordered_multiset.insert(value);
+    }
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podunordered_multiset);
+      oar(o_iserunordered_multiset);
+      oar(o_isplunordered_multiset);
+      oar(o_eserunordered_multiset);
+      oar(o_esplunordered_multiset);
+    }
+
+    std::unordered_multiset<int> i_podunordered_multiset;
+    std::unordered_multiset<StructInternalSerialize, StructHash<StructInternalSerialize>> i_iserunordered_multiset;
+    std::unordered_multiset<StructInternalSplit, StructHash<StructInternalSplit>>         i_isplunordered_multiset;
+    std::unordered_multiset<StructExternalSerialize, StructHash<StructExternalSerialize>> i_eserunordered_multiset;
+    std::unordered_multiset<StructExternalSplit, StructHash<StructExternalSplit>>         i_esplunordered_multiset;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podunordered_multiset);
+      iar(i_iserunordered_multiset);
+      iar(i_isplunordered_multiset);
+      iar(i_eserunordered_multiset);
+      iar(i_esplunordered_multiset);
+    }
+
+    for(auto const & p : i_podunordered_multiset)
+    {
+      CHECK_EQ(o_podunordered_multiset.count(p), i_podunordered_multiset.count(p));
+    }
+
+    for(auto const & p : i_iserunordered_multiset)
+    {
+      CHECK_EQ(o_iserunordered_multiset.count(p), i_iserunordered_multiset.count(p));
+    }
+
+    for(auto const & p : i_isplunordered_multiset)
+    {
+      CHECK_EQ(o_isplunordered_multiset.count(p), i_isplunordered_multiset.count(p));
+    }
+
+    for(auto const & p : i_eserunordered_multiset)
+    {
+      CHECK_EQ(o_eserunordered_multiset.count(p), i_eserunordered_multiset.count(p));
+    }
+
+    for(auto const & p : i_esplunordered_multiset)
+    {
+      CHECK_EQ(o_esplunordered_multiset.count(p), i_esplunordered_multiset.count(p));
+    }
+  }
+}
+
+#endif // CEREAL_TEST_UNORDERED_MULTISET_H_
diff --git a/Src/External/cereal/unittests/unordered_set.cpp b/Src/External/cereal/unittests/unordered_set.cpp
new file mode 100644
index 0000000..0c8be14
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_set.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "unordered_set.hpp"
+
+TEST_SUITE("unordered_set");
+
+TEST_CASE("binary_unordered_set")
+{
+  test_unordered_set<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_unordered_set")
+{
+  test_unordered_set<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_unordered_set")
+{
+  test_unordered_set<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_unordered_set")
+{
+  test_unordered_set<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_set.hpp b/Src/External/cereal/unittests/unordered_set.hpp
new file mode 100644
index 0000000..3347313
--- /dev/null
+++ b/Src/External/cereal/unittests/unordered_set.hpp
@@ -0,0 +1,114 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_UNORDERED_SET_H_
+#define CEREAL_TEST_UNORDERED_SET_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_unordered_set()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::unordered_set<int> o_podunordered_set;
+    for(int j=0; j<100; ++j)
+      o_podunordered_set.insert(random_value<int>(gen));
+
+    std::unordered_set<StructInternalSerialize, StructHash<StructInternalSerialize>> o_iserunordered_set;
+    for(int j=0; j<100; ++j)
+      o_iserunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::unordered_set<StructInternalSplit, StructHash<StructInternalSplit>> o_isplunordered_set;
+    for(int j=0; j<100; ++j)
+      o_isplunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::unordered_set<StructExternalSerialize, StructHash<StructExternalSerialize>> o_eserunordered_set;
+    for(int j=0; j<100; ++j)
+      o_eserunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::unordered_set<StructExternalSplit, StructHash<StructExternalSplit>> o_esplunordered_set;
+    for(int j=0; j<100; ++j)
+      o_esplunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podunordered_set);
+      oar(o_iserunordered_set);
+      oar(o_isplunordered_set);
+      oar(o_eserunordered_set);
+      oar(o_esplunordered_set);
+    }
+
+    std::unordered_set<int> i_podunordered_set;
+    std::unordered_set<StructInternalSerialize, StructHash<StructInternalSerialize>>   i_iserunordered_set;
+    std::unordered_set<StructInternalSplit, StructHash<StructInternalSplit>>           i_isplunordered_set;
+    std::unordered_set<StructExternalSerialize, StructHash<StructExternalSerialize>>   i_eserunordered_set;
+    std::unordered_set<StructExternalSplit, StructHash<StructExternalSplit>>           i_esplunordered_set;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podunordered_set);
+      iar(i_iserunordered_set);
+      iar(i_isplunordered_set);
+      iar(i_eserunordered_set);
+      iar(i_esplunordered_set);
+    }
+
+    for(auto const & p : i_podunordered_set)
+    {
+      CHECK_EQ(o_podunordered_set.count(p), 1lu);
+    }
+
+    for(auto const & p : i_iserunordered_set)
+    {
+      CHECK_EQ(o_iserunordered_set.count(p), 1lu);
+    }
+
+    for(auto const & p : i_isplunordered_set)
+    {
+      CHECK_EQ(o_isplunordered_set.count(p), 1lu);
+    }
+
+    for(auto const & p : i_eserunordered_set)
+    {
+      CHECK_EQ(o_eserunordered_set.count(p), 1lu);
+    }
+
+    for(auto const & p : i_esplunordered_set)
+    {
+      CHECK_EQ(o_esplunordered_set.count(p), 1lu);
+    }
+  }
+}
+
+#endif // CEREAL_TEST_UNORDERED_SET_H_
diff --git a/Src/External/cereal/unittests/user_data_adapters.cpp b/Src/External/cereal/unittests/user_data_adapters.cpp
new file mode 100644
index 0000000..9a88848
--- /dev/null
+++ b/Src/External/cereal/unittests/user_data_adapters.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "user_data_adapters.hpp"
+
+TEST_SUITE("user_data_adapters");
+
+TEST_CASE("binary_user_data_adapters")
+{
+  test_user_data_adapters<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_user_data_adapters")
+{
+  test_user_data_adapters<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_user_data_adapters")
+{
+  test_user_data_adapters<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_user_data_adapters")
+{
+  test_user_data_adapters<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/user_data_adapters.hpp b/Src/External/cereal/unittests/user_data_adapters.hpp
new file mode 100644
index 0000000..23a2510
--- /dev/null
+++ b/Src/External/cereal/unittests/user_data_adapters.hpp
@@ -0,0 +1,120 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_USER_DATA_ADAPTERS_H_
+#define CEREAL_TEST_USER_DATA_ADAPTERS_H_
+
+#include "common.hpp"
+#define CEREAL_FUTURE_EXPERIMENTAL
+#include <cereal/archives/adapters.hpp>
+
+struct SomeStruct {};
+
+struct UserData
+{
+  UserData( SomeStruct * pp, SomeStruct & r ) :
+    p(pp), ref(r) {}
+
+  SomeStruct * p;
+  std::reference_wrapper<SomeStruct> ref;
+};
+
+struct UserStruct
+{
+  UserStruct( std::int32_t i,
+              SomeStruct * pointer,
+              SomeStruct & reference ) :
+    i32( i ),
+    p( pointer ),
+    ref( reference )
+  { }
+
+  UserStruct & operator=( UserStruct const & ) = delete;
+
+  std::int32_t i32;
+  SomeStruct const * p;
+  SomeStruct & ref;
+
+  template <class Archive>
+  void serialize( Archive & ar )
+  {
+    ar( i32 );
+  }
+
+  template <class Archive>
+  static void load_and_construct( Archive & ar, cereal::construct<UserStruct> & construct )
+  {
+    std::int32_t ii;
+    ar( ii );
+    auto & data = cereal::get_user_data<UserData>( ar );
+    construct( ii, data.p, data.ref.get() );
+  }
+};
+
+template <class IArchive, class OArchive> inline
+void test_user_data_adapters()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  auto rng = [&](){ return random_value<int>(gen); };
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    SomeStruct ss;
+    std::unique_ptr<UserStruct> o_ptr( new UserStruct( rng(), &ss, ss ) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_ptr);
+    }
+
+    decltype( o_ptr  ) i_ptr;
+
+    std::istringstream is(os.str());
+    {
+      UserData ud(&ss, ss);
+      cereal::UserDataAdapter<UserData, IArchive> iar(ud, is);
+
+      iar(i_ptr);
+    }
+
+    CHECK_EQ( i_ptr->p, o_ptr->p );
+    CHECK_EQ( std::addressof(i_ptr->ref), std::addressof(o_ptr->ref) );
+    CHECK_EQ( i_ptr->i32, o_ptr->i32 );
+
+    std::istringstream bad_is(os.str());
+    {
+      IArchive iar(bad_is);
+
+      CHECK_THROWS_AS( iar(i_ptr), ::cereal::Exception );
+    }
+  }
+}
+
+#endif // CEREAL_TEST_USER_DATA_ADAPTERS_H_
diff --git a/Src/External/cereal/unittests/valarray.cpp b/Src/External/cereal/unittests/valarray.cpp
new file mode 100644
index 0000000..4866c02
--- /dev/null
+++ b/Src/External/cereal/unittests/valarray.cpp
@@ -0,0 +1,52 @@
+/*
+Copyright (c) 2014, Randolph Voorhies, Shane Grant
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+* Neither the name of cereal nor the
+names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "valarray.hpp"
+
+TEST_SUITE("valarray");
+
+TEST_CASE("binary_valarray")
+{
+  test_valarray<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_valarray")
+{
+  test_valarray<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_valarray")
+{
+  test_valarray<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_valarray")
+{
+  test_valarray<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/valarray.hpp b/Src/External/cereal/unittests/valarray.hpp
new file mode 100644
index 0000000..19df153
--- /dev/null
+++ b/Src/External/cereal/unittests/valarray.hpp
@@ -0,0 +1,101 @@
+/*
+Copyright (c) 2014, Randolph Voorhies, Shane Grant
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+* Neither the name of cereal nor the
+names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_VALARRAY_H_
+#define CEREAL_TEST_VALARRAY_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_valarray()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for (int ii = 0; ii<100; ++ii)
+  {
+    std::valarray<int> o_podvalarray(100);
+    for (auto & elem : o_podvalarray)
+      elem = random_value<int>(gen);
+
+    std::valarray<StructInternalSerialize> o_iservalarray(100);
+    for (auto & elem : o_iservalarray)
+      elem = StructInternalSerialize(random_value<int>(gen), random_value<int>(gen));
+
+    std::valarray<StructInternalSplit> o_isplvalarray(100);
+    for (auto & elem : o_isplvalarray)
+      elem = StructInternalSplit(random_value<int>(gen), random_value<int>(gen));
+
+    std::valarray<StructExternalSerialize> o_eservalarray(100);
+    for (auto & elem : o_eservalarray)
+      elem = StructExternalSerialize(random_value<int>(gen), random_value<int>(gen));
+
+    std::valarray<StructExternalSplit> o_esplvalarray(100);
+    for (auto & elem : o_esplvalarray)
+      elem = StructExternalSplit(random_value<int>(gen), random_value<int>(gen));
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podvalarray);
+      oar(o_iservalarray);
+      oar(o_isplvalarray);
+      oar(o_eservalarray);
+      oar(o_esplvalarray);
+    }
+
+    std::valarray<int> i_podvalarray;
+    std::valarray<StructInternalSerialize> i_iservalarray;
+    std::valarray<StructInternalSplit>     i_isplvalarray;
+    std::valarray<StructExternalSerialize> i_eservalarray;
+    std::valarray<StructExternalSplit>     i_esplvalarray;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podvalarray);
+      iar(i_iservalarray);
+      iar(i_isplvalarray);
+      iar(i_eservalarray);
+      iar(i_esplvalarray);
+    }
+
+    CHECK_EQ(i_podvalarray.size(), o_podvalarray.size());
+    CHECK_EQ(i_iservalarray.size(), o_iservalarray.size());
+    CHECK_EQ(i_isplvalarray.size(), o_isplvalarray.size());
+    CHECK_EQ(i_eservalarray.size(), o_eservalarray.size());
+    CHECK_EQ(i_esplvalarray.size(), o_esplvalarray.size());
+
+    check_collection(i_podvalarray , o_podvalarray );
+    check_collection(i_iservalarray, o_iservalarray);
+    check_collection(i_isplvalarray, o_isplvalarray);
+    check_collection(i_eservalarray, o_eservalarray);
+    check_collection(i_esplvalarray, o_esplvalarray);
+  }
+}
+
+#endif // CEREAL_TEST_VALARRAY_H_
diff --git a/Src/External/cereal/unittests/vector.cpp b/Src/External/cereal/unittests/vector.cpp
new file mode 100644
index 0000000..be172ba
--- /dev/null
+++ b/Src/External/cereal/unittests/vector.cpp
@@ -0,0 +1,52 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "vector.hpp"
+
+TEST_SUITE("vector");
+
+TEST_CASE("binary_vector")
+{
+  test_vector<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_vector")
+{
+  test_vector<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_vector")
+{
+  test_vector<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_vector")
+{
+  test_vector<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/vector.hpp b/Src/External/cereal/unittests/vector.hpp
new file mode 100644
index 0000000..a029790
--- /dev/null
+++ b/Src/External/cereal/unittests/vector.hpp
@@ -0,0 +1,110 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_VECTOR_H_
+#define CEREAL_TEST_VECTOR_H_
+#include "common.hpp"
+
+template <class IArchive, class OArchive> inline
+void test_vector()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  for(int ii=0; ii<100; ++ii)
+  {
+    std::vector<int> o_podvector(100);
+    for(auto & elem : o_podvector)
+      elem = random_value<int>(gen);
+
+    std::vector<bool> o_boolvector; o_boolvector.resize(100);
+    for( size_t i = 0; i < 100; ++i )
+      o_boolvector[i] = (random_value<int>(gen) % 2) == 0;
+
+    std::vector<StructInternalSerialize> o_iservector(100);
+    for(auto & elem : o_iservector)
+      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::vector<StructInternalSplit> o_isplvector(100);
+    for(auto & elem : o_isplvector)
+      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::vector<StructExternalSerialize> o_eservector(100);
+    for(auto & elem : o_eservector)
+      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
+
+    std::vector<StructExternalSplit> o_esplvector(100);
+    for(auto & elem : o_esplvector)
+      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+
+      oar(o_podvector);
+      oar(o_boolvector);
+      oar(o_iservector);
+      oar(o_isplvector);
+      oar(o_eservector);
+      oar(o_esplvector);
+    }
+
+    std::vector<int> i_podvector;
+    std::vector<bool> i_boolvector;
+    std::vector<StructInternalSerialize> i_iservector;
+    std::vector<StructInternalSplit>     i_isplvector;
+    std::vector<StructExternalSerialize> i_eservector;
+    std::vector<StructExternalSplit>     i_esplvector;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+
+      iar(i_podvector);
+      iar(i_boolvector);
+      iar(i_iservector);
+      iar(i_isplvector);
+      iar(i_eservector);
+      iar(i_esplvector);
+    }
+
+    CHECK_EQ(i_podvector.size(),  o_podvector.size());
+    CHECK_EQ(i_boolvector.size(),  o_boolvector.size());
+    CHECK_EQ(i_iservector.size(), o_iservector.size());
+    CHECK_EQ(i_isplvector.size(), o_isplvector.size());
+    CHECK_EQ(i_eservector.size(), o_eservector.size());
+    CHECK_EQ(i_esplvector.size(), o_esplvector.size());
+
+    check_collection(i_podvector,  o_podvector );
+    check_collection(i_boolvector, o_boolvector);
+    check_collection(i_iservector, o_iservector);
+    check_collection(i_isplvector, o_isplvector);
+    check_collection(i_eservector, o_eservector);
+    check_collection(i_esplvector, o_esplvector);
+  }
+}
+
+#endif // CEREAL_TEST_VECTOR_H_
diff --git a/Src/External/cereal/unittests/versioning.cpp b/Src/External/cereal/unittests/versioning.cpp
new file mode 100644
index 0000000..8727426
--- /dev/null
+++ b/Src/External/cereal/unittests/versioning.cpp
@@ -0,0 +1,74 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "versioning.hpp"
+
+TEST_SUITE("versioning");
+
+TEST_CASE("binary_versioning")
+{
+  test_versioning<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_versioning")
+{
+  test_versioning<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_versioning")
+{
+  test_versioning<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_versioning")
+{
+  test_versioning<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+
+#if CEREAL_THREAD_SAFE
+TEST_CASE("binary_versioning_threading")
+{
+  test_versioning_threading<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
+}
+
+TEST_CASE("portable_binary_versioning_threading")
+{
+  test_versioning_threading<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
+}
+
+TEST_CASE("xml_versioning_threading")
+{
+  test_versioning_threading<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
+}
+
+TEST_CASE("json_versioning_threading")
+{
+  test_versioning_threading<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
+}
+#endif // CEREAL_THREAD_SAFE
+
+TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/versioning.hpp b/Src/External/cereal/unittests/versioning.hpp
new file mode 100644
index 0000000..33e21d2
--- /dev/null
+++ b/Src/External/cereal/unittests/versioning.hpp
@@ -0,0 +1,217 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#ifndef CEREAL_TEST_VERSIONING_H_
+#define CEREAL_TEST_VERSIONING_H_
+#include "common.hpp"
+
+#if CEREAL_THREAD_SAFE
+#include <future>
+#endif
+
+namespace Nested
+{
+  struct NestedClass
+  {
+    int x;
+
+    template <class Archive>
+    void serialize( Archive & ar )
+    { ar( x ); }
+  };
+}
+
+CEREAL_CLASS_VERSION( Nested::NestedClass, 1 )
+
+class VersionStructMS
+{
+  public:
+    bool x;
+    std::uint32_t v;
+
+  private:
+    friend class cereal::access;
+    template <class Archive>
+    void serialize( Archive & ar, std::uint32_t const version )
+    {
+      ar( x );
+      v = version;
+    }
+};
+
+struct VersionStructMSP
+{
+  uint8_t x;
+  std::uint32_t v;
+  template <class Archive>
+  void save( Archive & ar, std::uint32_t const /*version*/ ) const
+  {
+    ar( x );
+  }
+
+  template <class Archive>
+  void load( Archive & ar, std::uint32_t const version )
+  {
+    ar( x );
+    v = version;
+  }
+};
+
+struct VersionStructNMS
+{
+  std::int32_t x;
+  std::uint32_t v;
+};
+
+template <class Archive>
+void serialize( Archive & ar, VersionStructNMS & vnms, const std::uint32_t version )
+{
+  ar( vnms.x );
+  vnms.v = version;
+}
+
+struct VersionStructNMSP
+{
+  double x;
+  std::uint32_t v;
+};
+
+template <class Archive>
+void save( Archive & ar, VersionStructNMSP const & vnms, const std::uint32_t /*version*/ )
+{
+  ar( vnms.x );
+}
+
+template <class Archive>
+void load( Archive & ar, VersionStructNMSP & vnms, const std::uint32_t version )
+{
+  ar( vnms.x );
+  vnms.v = version;
+}
+
+CEREAL_CLASS_VERSION( VersionStructMSP, 33 )
+CEREAL_CLASS_VERSION( VersionStructNMS, 66 )
+CEREAL_CLASS_VERSION( VersionStructNMSP, 99 )
+
+template <class IArchive, class OArchive> inline
+void test_versioning()
+{
+  std::random_device rd;
+  std::mt19937 gen(rd());
+
+  #if CEREAL_THREAD_SAFE
+  #include <future>
+  static std::mutex testMutex;
+  #endif
+
+  for(size_t i=0; i<100; ++i)
+  {
+    VersionStructMS o_MS      = {random_value<uint8_t>(gen) % 2 ? true : false, 1};
+    VersionStructMSP o_MSP    = {random_value<uint8_t>(gen), 1};
+    VersionStructNMS o_NMS    = {random_value<int32_t>(gen), 1};
+    VersionStructNMSP o_NMSP  = {random_value<double>(gen), 1};
+    VersionStructMS o_MS2     = {random_value<uint8_t>(gen) % 2 ? true : false, 1};
+    VersionStructMSP o_MSP2   = {random_value<uint8_t>(gen), 1};
+    VersionStructNMS o_NMS2   = {random_value<int32_t>(gen), 1};
+    VersionStructNMSP o_NMSP2 = {random_value<double>(gen), 1};
+
+    std::ostringstream os;
+    {
+      OArchive oar(os);
+      oar( o_MS );
+      oar( o_MSP );
+      oar( o_NMS );
+      oar( o_NMSP );
+      oar( o_MS2 );
+      oar( o_MSP2 );
+      oar( o_NMS2 );
+      oar( o_NMSP2 );
+    }
+
+    decltype(o_MS) i_MS;
+    decltype(o_MSP) i_MSP;
+    decltype(o_NMS) i_NMS;
+    decltype(o_NMSP) i_NMSP;
+    decltype(o_MS2) i_MS2;
+    decltype(o_MSP2) i_MSP2;
+    decltype(o_NMS2) i_NMS2;
+    decltype(o_NMSP2) i_NMSP2;
+
+    std::istringstream is(os.str());
+    {
+      IArchive iar(is);
+      iar( i_MS );
+      iar( i_MSP );
+      iar( i_NMS );
+      iar( i_NMSP );
+      iar( i_MS2 );
+      iar( i_MSP2 );
+      iar( i_NMS2 );
+      iar( i_NMSP2 );
+    }
+
+    #if CEREAL_THREAD_SAFE
+    std::lock_guard<std::mutex> lock( testMutex );
+    #endif
+
+    CHECK_EQ(o_MS.x, i_MS.x);
+    CHECK_EQ(i_MS.v, 0u);
+    CHECK_EQ(o_MSP.x, i_MSP.x);
+    CHECK_EQ(i_MSP.v, 33u);
+    CHECK_EQ(o_NMS.x, i_NMS.x);
+    CHECK_EQ(i_NMS.v, 66u);
+    CHECK_EQ(o_NMSP.x, doctest::Approx(i_NMSP.x).epsilon(1e-5));
+    CHECK_EQ(i_NMSP.v, 99u);
+
+    CHECK_EQ(o_MS2.x, i_MS2.x);
+    CHECK_EQ(i_MS2.v, 0u);
+    CHECK_EQ(o_MSP2.x, i_MSP2.x);
+    CHECK_EQ(i_MSP2.v, 33u);
+    CHECK_EQ(o_NMS2.x, i_NMS2.x);
+    CHECK_EQ(i_NMS2.v, 66u);
+    CHECK_EQ(o_NMSP2.x, doctest::Approx(i_NMSP2.x).epsilon(1e-5));
+    CHECK_EQ(i_NMSP2.v, 99u);
+    }
+}
+
+#if CEREAL_THREAD_SAFE
+template <class IArchive, class OArchive> inline
+void test_versioning_threading()
+{
+  std::vector<std::future<bool>> pool;
+  for( size_t i = 0; i < 100; ++i )
+    pool.emplace_back( std::async( std::launch::async,
+                                   [](){ test_versioning<IArchive, OArchive>(); return true; } ) );
+
+  for( auto & future : pool )
+    future.wait();
+
+  for( auto & future : pool )
+    CHECK_UNARY( future.get() );
+}
+#endif // CEREAL_THREAD_SAFE
+
+#endif // CEREAL_TEST_VERSIONING_H_
diff --git a/Src/External/cereal/vs2013/.gitignore b/Src/External/cereal/vs2013/.gitignore
new file mode 100644
index 0000000..c6eec7a
--- /dev/null
+++ b/Src/External/cereal/vs2013/.gitignore
@@ -0,0 +1,3 @@
+*/Debug
+*/Release
+*/x64
diff --git a/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj b/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj
new file mode 100644
index 0000000..89da192
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DEBUG_VS2015|x64">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|Win32">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|x64">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DAC23DBB-630B-46B9-B115-F1449697898A}</ProjectGuid>
+    <RootNamespace>sandbox</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters b/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters
new file mode 100644
index 0000000..90e0f7d
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj b/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj
new file mode 100644
index 0000000..fc18258
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DEBUG_VS2015|x64">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|Win32">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|x64">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_json.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{52E96EC3-125A-4525-BC72-F3C524F24640}</ProjectGuid>
+    <RootNamespace>sandbox_json</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters
new file mode 100644
index 0000000..3edef0a
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_json.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj b/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj
new file mode 100644
index 0000000..035a8ca
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DEBUG_VS2015|x64">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|Win32">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|x64">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_rtti.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C81EF3F9-7849-4506-898C-85D0D564CD6A}</ProjectGuid>
+    <RootNamespace>sandbox_rtti</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters
new file mode 100644
index 0000000..813de5f
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_rtti.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj b/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj
new file mode 100644
index 0000000..4615581
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DEBUG_VS2015|x64">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|Win32">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|x64">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}</ProjectGuid>
+    <RootNamespace>sandbox_vs</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\Debug;E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\Debug;E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\x64\Debug;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\x64\Debug;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\Release;E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\Release;E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\x64\Release;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
+    <LibraryPath>$(SolutionDir)\x64\Release;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <TreatWarningAsError>false</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <TreatWarningAsError>false</TreatWarningAsError>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_vs.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters
new file mode 100644
index 0000000..70ecf39
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_vs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj b/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj
new file mode 100755
index 0000000..a335650
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DEBUG_VS2015|x64">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|Win32">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|x64">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\base.cpp" />
+    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\derived.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\base.hpp" />
+    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\derived.hpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{95D6662F-4166-40D2-87D7-CABFB60C199A}</ProjectGuid>
+    <RootNamespace>sandbox_vs_dll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters
new file mode 100755
index 0000000..d61909d
--- /dev/null
+++ b/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\base.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\derived.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\base.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\derived.hpp">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/unittests/main.cpp b/Src/External/cereal/vs2013/unittests/main.cpp
new file mode 100755
index 0000000..fa91267
--- /dev/null
+++ b/Src/External/cereal/vs2013/unittests/main.cpp
@@ -0,0 +1,30 @@
+/*
+  Copyright (c) 2014, Randolph Voorhies, Shane Grant
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+      * Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+      * Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+      * Neither the name of cereal nor the
+        names of its contributors may be used to endorse or promote products
+        derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#define BOOST_TEST_MODULE Cereal
+#include <common.hpp>
+#include <boost/test/unit_test.hpp>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/unittests/unittests.vcxproj b/Src/External/cereal/vs2013/unittests/unittests.vcxproj
new file mode 100644
index 0000000..d3c82ca
--- /dev/null
+++ b/Src/External/cereal/vs2013/unittests/unittests.vcxproj
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DEBUG_VS2015|x64">
+      <Configuration>DEBUG_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|Win32">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release_VS2015|x64">
+      <Configuration>Release_VS2015</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\unittests\array.cpp" />
+    <ClCompile Include="..\..\unittests\basic_string.cpp" />
+    <ClCompile Include="..\..\unittests\bitset.cpp" />
+    <ClCompile Include="..\..\unittests\chrono.cpp" />
+    <ClCompile Include="..\..\unittests\complex.cpp" />
+    <ClCompile Include="..\..\unittests\deque.cpp" />
+    <ClCompile Include="..\..\unittests\forward_list.cpp" />
+    <ClCompile Include="..\..\unittests\list.cpp" />
+    <ClCompile Include="..\..\unittests\load_construct.cpp" />
+    <ClCompile Include="..\..\unittests\map.cpp" />
+    <ClCompile Include="..\..\unittests\memory.cpp" />
+    <ClCompile Include="..\..\unittests\memory_cycles.cpp" />
+    <ClCompile Include="..\..\unittests\multimap.cpp" />
+    <ClCompile Include="..\..\unittests\multiset.cpp" />
+    <ClCompile Include="..\..\unittests\pair.cpp" />
+    <ClCompile Include="..\..\unittests\pod.cpp" />
+    <ClCompile Include="..\..\unittests\polymorphic.cpp" />
+    <ClCompile Include="..\..\unittests\portable_binary_archive.cpp" />
+    <ClCompile Include="..\..\unittests\priority_queue.cpp" />
+    <ClCompile Include="..\..\unittests\queue.cpp" />
+    <ClCompile Include="..\..\unittests\set.cpp" />
+    <ClCompile Include="..\..\unittests\stack.cpp" />
+    <ClCompile Include="..\..\unittests\structs.cpp" />
+    <ClCompile Include="..\..\unittests\structs_minimal.cpp" />
+    <ClCompile Include="..\..\unittests\structs_specialized.cpp" />
+    <ClCompile Include="..\..\unittests\tuple.cpp" />
+    <ClCompile Include="..\..\unittests\unordered_loads.cpp" />
+    <ClCompile Include="..\..\unittests\unordered_map.cpp" />
+    <ClCompile Include="..\..\unittests\unordered_multimap.cpp" />
+    <ClCompile Include="..\..\unittests\unordered_multiset.cpp" />
+    <ClCompile Include="..\..\unittests\unordered_set.cpp" />
+    <ClCompile Include="..\..\unittests\user_data_adapters.cpp" />
+    <ClCompile Include="..\..\unittests\vector.cpp" />
+    <ClCompile Include="..\..\unittests\valarray.cpp" />
+    <ClCompile Include="..\..\unittests\versioning.cpp" />
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}</ProjectGuid>
+    <RootNamespace>unittests</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
+    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <EnablePREfast>false</EnablePREfast>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <EnablePREfast>false</EnablePREfast>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters b/Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters
new file mode 100644
index 0000000..902b535
--- /dev/null
+++ b/Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\unittests\array.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\basic_string.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\bitset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\chrono.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\complex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\deque.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\forward_list.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\list.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\load_construct.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\memory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\memory_cycles.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\multimap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\multiset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\pair.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\pod.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\polymorphic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\portable_binary_archive.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\priority_queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\queue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\stack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\structs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\structs_specialized.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\tuple.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\unordered_loads.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\unordered_map.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\unordered_multimap.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\unordered_multiset.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\unordered_set.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\vector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+     <ClCompile Include="..\..\unittests\valarray.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\versioning.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\structs_minimal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\unittests\user_data_adapters.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/vs2013.sln b/Src/External/cereal/vs2013/vs2013.sln
new file mode 100644
index 0000000..d0ed26a
--- /dev/null
+++ b/Src/External/cereal/vs2013/vs2013.sln
@@ -0,0 +1,147 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_vs", "sandbox_vs\sandbox_vs.vcxproj", "{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}"
+	ProjectSection(ProjectDependencies) = postProject
+		{95D6662F-4166-40D2-87D7-CABFB60C199A} = {95D6662F-4166-40D2-87D7-CABFB60C199A}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_json", "sandbox_json\sandbox_json.vcxproj", "{52E96EC3-125A-4525-BC72-F3C524F24640}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "sandbox\sandbox.vcxproj", "{DAC23DBB-630B-46B9-B115-F1449697898A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_rtti", "sandbox_rtti\sandbox_rtti.vcxproj", "{C81EF3F9-7849-4506-898C-85D0D564CD6A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "unittests\unittests.vcxproj", "{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance", "performance\performance.vcxproj", "{2F374733-FCA8-4CBB-91A0-2B0B34393D86}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_vs_dll", "sandbox_vs_dll\sandbox_vs_dll.vcxproj", "{95D6662F-4166-40D2-87D7-CABFB60C199A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug_VS2013|Win32 = Debug_VS2013|Win32
+		Debug_VS2013|x64 = Debug_VS2013|x64
+		Debug_VS2015|Win32 = Debug_VS2015|Win32
+		Debug_VS2015|x64 = Debug_VS2015|x64
+		Release_VS2013|Win32 = Release_VS2013|Win32
+		Release_VS2013|x64 = Release_VS2013|x64
+		Release_VS2015|Win32 = Release_VS2015|Win32
+		Release_VS2015|x64 = Release_VS2015|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|x64.Build.0 = Debug|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|x64.Build.0 = Release|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|x64.Build.0 = Debug|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|x64.Build.0 = Release|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|x64.Build.0 = Debug|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|x64.Build.0 = Release|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|x64.Build.0 = Debug|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|x64.Build.0 = Release|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|x64.Build.0 = Debug|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|x64.Build.0 = Release|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2013|Win32.Build.0 = Debug|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2013|x64.ActiveCfg = Debug|x64
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2013|Win32.ActiveCfg = Release|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2013|Win32.Build.0 = Release|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2013|x64.ActiveCfg = Release|x64
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
+		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Src/Python/CMakeLists.txt b/Src/Python/CMakeLists.txt
new file mode 100644
index 0000000..74046ef
--- /dev/null
+++ b/Src/Python/CMakeLists.txt
@@ -0,0 +1,41 @@
+# CMakeLists.txt file for Nymph/Python
+# Author: A. Ziegler
+# Created on: Feb 4, 2022
+
+# Minimum cmake verison 3.12 required by Scarab
+cmake_minimum_required (VERSION 3.12)
+
+#########
+# Setup #
+#########
+cmake_policy( SET CMP0048 NEW ) # version in project()
+project( NymphPy VERSION 2.0.0 )
+
+list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../Src/Scarab/cmake )
+include( PackageBuilder )
+
+###############
+# Build NymphPy #
+###############
+
+message( "Building Python bindings")
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+# Python binding headers
+set( PYBINDING_HEADERFILES
+
+)
+
+# Python bindings
+set( PYBINDING_SOURCEFILES
+
+)
+
+set( PROJECT_LIBRARIES Scarab )
+
+pbuilder_add_pybind11_module( scarab ${PROJECT_LIBRARIES} )
+
+pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
+
+message( "Done with Python bindings" )
\ No newline at end of file
diff --git a/Src/Python/README.md b/Src/Python/README.md
new file mode 100644
index 0000000..7c3720e
--- /dev/null
+++ b/Src/Python/README.md
@@ -0,0 +1,49 @@
+NymphPy
+=====
+
+NymphPy is a Python extension of the C++-based Nymph data analysis framework.
+
+
+Dependencies
+------------
+
+- CMake (3.12 or better)
+- Boost (date_time, filesystem, program_options, system, thread; 1.46 or better)
+- RapidJSON (optional; required for JSON processing)
+- yaml-cpp (optional; required for YAML processing)
+
+
+Operating System Support
+------------------------
+
+* Mac OS X (usually tested on OS X 10.10)
+* Linux (usually tested on Ubuntu)
+
+
+Directory Structure
+-------------------
+
+*  nymph - nymph-py modules.
+
+Installing
+----------
+python -m build
+
+Instructions for Use
+--------------------
+
+
+Documentation
+-------------
+
+
+
+Development
+-----------
+
+The Git workflow used is git-flow:
+* http://nvie.com/posts/a-successful-git-branching-model/
+We suggest that you use the aptly-named git extension, git-flow, which is available from commonly-used package managers:
+* https://github.com/nvie/gitflow
+
+Issues should be posted via [GitHub](https://github.com/project8/nymph/issues).
\ No newline at end of file
diff --git a/Python/nymph/__init__.py b/Src/Python/nymph/__init__.py
similarity index 100%
rename from Python/nymph/__init__.py
rename to Src/Python/nymph/__init__.py
diff --git a/Src/Scarab/.github/workflows/run_tests.yaml b/Src/Scarab/.github/workflows/run_tests.yaml
new file mode 100644
index 0000000..166527c
--- /dev/null
+++ b/Src/Scarab/.github/workflows/run_tests.yaml
@@ -0,0 +1,69 @@
+name: Run Tests
+
+on:
+  push:
+    branches: [ 'main', 'develop' ]
+  pull_request:
+
+  workflow_dispatch:
+
+jobs:
+
+  RunTests:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        fail-fast: [false]
+        os: [ubuntu-20.04, macos-10.15]
+
+    steps:
+
+      - name: Checkout the repo 
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install dependencies -- Mac
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          brew install \
+            boost \
+            pybind11 \
+            rabbitmq-c \
+            rapidjson \
+            yaml-cpp
+
+      - name: Install dependencies -- Linux
+        # pybind11 is manually installed because the minimum version is 2.6.2, and Ubuntu 20.04 only has v2.4.3
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo apt-get update
+          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
+            libboost-all-dev \
+            rapidjson-dev \
+            libyaml-cpp-dev
+          git clone https://github.com/pybind/pybind11.git
+          cd pybind11
+          git checkout v2.7.0
+          mkdir build
+          cd build
+          sudo cmake -DPYBIND11_TEST=FALSE ..
+          sudo make -j2 install
+
+      - name: Configure
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DScarab_ENABLE_TESTING=TRUE -DScarab_BUILD_PYTHON=TRUE
+
+      - name: Build
+        run: |
+          cd build
+          make -j2 install
+
+      - name: Run tests
+        run: |
+          cd build
+          ctest --output-on-failure
diff --git a/Src/Scarab/.gitignore b/Src/Scarab/.gitignore
new file mode 100644
index 0000000..20eae96
--- /dev/null
+++ b/Src/Scarab/.gitignore
@@ -0,0 +1,13 @@
+*.swp
+
+# Eclipse
+.project
+.cproject
+
+# Build directories
+build*/
+
+# PackageBuilder test submodule
+testing/package_builder/PBTest/scarab
+testing/package_builder/NestedPBTest/PBTest
+testing/package_builder/NestedPBTest/scarab
diff --git a/Src/Scarab/.gitmodules b/Src/Scarab/.gitmodules
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/.travis.yml b/Src/Scarab/.travis.yml
new file mode 100644
index 0000000..443bace
--- /dev/null
+++ b/Src/Scarab/.travis.yml
@@ -0,0 +1,74 @@
+language: cpp
+
+stages:
+- name: Testing
+  if: branch = main OR 
+    branch = develop OR 
+    branch =~ /.*\.(?i:build)$/ OR 
+    type = pull_request 
+
+jobs:
+  include:
+  - stage: Testing
+    os: osx
+    compiler: clang
+    osx_image: xcode11.3
+    addons:
+      homebrew:
+        packages:
+        - rapidjson
+        - yaml-cpp
+        - pybind11
+#        update: true
+    before_install:
+    - mkdir build
+    install:
+    - cd build
+    - cmake .. -DScarab_ENABLE_TESTING=TRUE
+    - make -j2 install
+    script: testing/run_tests
+  - stage: Testing
+    os: linux
+    dist: focal
+    compiler: gcc
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - python3-all
+        - libboost-all-dev
+        - rapidjson-dev
+        - libyaml-cpp-dev
+        - pybind11-dev
+    before_install:
+    - cmake --version
+    - export CC=gcc && export CXX=g++
+    - mkdir build
+    install:
+    - cd build
+    - cmake .. -DScarab_ENABLE_TESTING=TRUE -DPYTHON_EXECUTABLE=$(which python)
+    - make -j2 install
+    script: testing/run_tests
+  - stage: Testing
+    os: linux
+    dist: focal
+    compiler: clang
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - python3-all
+        - libboost-all-dev
+        - rapidjson-dev
+        - libyaml-cpp-dev
+        - pybind11-dev
+    before_install:
+    - export CC=clang && export CXX=clang++
+    - mkdir build
+    install:
+    - cd build
+    - cmake .. -DScarab_ENABLE_TESTING=TRUE -DPYTHON_EXECUTABLE=$(which python)
+    - make -j2 install
+    script: testing/run_tests
diff --git a/Src/Scarab/AUTHORS b/Src/Scarab/AUTHORS
new file mode 100644
index 0000000..f2e1dd6
--- /dev/null
+++ b/Src/Scarab/AUTHORS
@@ -0,0 +1,12 @@
+Authors and Copyright Holders for Scarab
+----------------------------------------
+
+Individuals
+-----------
+Benjamin H. LaRoque [1]
+Noah S. Oblath [1]
+
+
+Institutions
+------------
+1. Pacific Northwest National Laboratory, Richland, WA
diff --git a/Src/Scarab/CMakeLists.txt b/Src/Scarab/CMakeLists.txt
new file mode 100644
index 0000000..66cd219
--- /dev/null
+++ b/Src/Scarab/CMakeLists.txt
@@ -0,0 +1,181 @@
+# CMakeLists.txt for Scarab
+# Author: N. Oblath
+# Created: Jan 4, 2016
+
+# Minimum cmake verison 3.12 required for FindPython3
+cmake_minimum_required (VERSION 3.12)
+
+#########
+# setup #
+#########
+
+# load the version number from the Scarab/VERSION file
+file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION scarab_version_from_file )
+string( REPLACE " " "." scarab_version ${scarab_version_from_file} )
+
+cmake_policy( SET CMP0048 NEW ) # version in project()
+project( Scarab VERSION ${scarab_version} )
+
+list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
+include( PackageBuilder )
+
+
+##################
+# Scarab options #
+##################
+
+option( Scarab_BUILD_CODEC_JSON "Flag to enable building the JSON codec (requires Scarab_BUILD_PARAM)" TRUE )
+
+option( Scarab_BUILD_CODEC_YAML "Flag to enable building the YAML codec (requires Scarab_BUILD_PARAM)" TRUE )
+
+option( Scarab_BUILD_AUTHENTICATION "Flag to enable building of the authentication class (requires Scarab_BUILD_CODEC_JSON)" TRUE )
+
+option( Scarab_BUILD_PARAM "Flag to enable building of the param class" TRUE )
+
+option( Scarab_BUILD_CLI "Flag to enable the building of the command-line interface class" TRUE )
+
+option( Scarab_BUILD_PYTHON "Build python bindings" TRUE )
+
+if( (Scarab_BUILD_CODEC_JSON OR Scarab_BUILD_CODEC_MSGPACK OR Scarab_BUILD_CODEC_YAML OR Scarab_BUILD_AUTHENTICATION OR Scarab_BUILD_CLI) AND NOT Scarab_BUILD_PARAM )
+    message( FATAL_ERROR "Invalid combination of build options.  Building the Codecs, Authentication, and CLI requires Param.  If you want these elements, turn on Param.  If you want Param off, turn these elements off." )
+endif()
+
+if( Scarab_BUILD_AUTHENTICATION AND NOT Scarab_BUILD_CODEC_JSON )
+    message( FATAL_ERROR "Invalid combination of build options.  Building Authentication requires the JSON Codec.  If you want Authentication, turn on the JSON Codec.  If you want the JSON Codec off, turn Authentication off.")
+endif()
+
+if( Scarab_ENABLE_TESTING )
+    enable_testing()
+endif()
+
+# Scarab needs C++11
+set( CMAKE_CXX_STANDARD 11 )
+
+
+#######################
+# Scarab dependencies #
+#######################
+
+set( PUBLIC_EXT_LIBS )
+set( PRIVATE_EXT_LIBS )
+
+if( Scarab_BUILD_CODEC_JSON )
+    set( RAPIDJSON_FILE_BUFFER_SIZE 65536 CACHE STRING "Buffer size for reading and writing files using RapidJSON (in Bytes)" )
+    
+    add_definitions( -DRAPIDJSON_FILE_BUFFER_SIZE=${RAPIDJSON_FILE_BUFFER_SIZE} )
+    add_definitions( -DUSE_CODEC_JSON )
+    
+    find_package( RapidJSON 1.0 REQUIRED )
+
+    # The config file that comes with RapidJSON does not define an interface target, so we'll do so here.
+    # We use the name `rapidjson` to match the post-v1.1.0 version.
+    # The v1-1.1 include-dir variable is RAPIDJSON_INCLUDE_DIRS.
+    if( NOT TARGET rapidjson )
+        add_library(rapidjson INTERFACE IMPORTED)
+        set_target_properties(rapidjson PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${RAPIDJSON_INCLUDE_DIRS}"
+        )
+    endif()
+
+    list( APPEND PUBLIC_EXT_LIBS rapidjson )
+else( Scarab_BUILD_CODEC_JSON )
+    remove_definitions( -DUSE_CODEC_JSON )
+endif( Scarab_BUILD_CODEC_JSON )
+
+if( Scarab_BUILD_CODEC_YAML )
+    find_package( yaml-cpp CONFIG REQUIRED )
+
+    list( APPEND PUBLIC_EXT_LIBS yaml-cpp )
+
+    add_definitions( -DUSE_CODEC_YAML )
+else( Scarab_BUILD_CODEC_YAML )
+    removed_definitions( -DUSE_CODEC_YAML )
+endif( Scarab_BUILD_CODEC_YAML )
+
+# Create a cache variable for boost components that can be set from dependent projects
+set( Scarab_BOOST_COMPONENTS "${Scarab_BOOST_COMPONENTS};filesystem;system" CACHE INTERNAL "Boost components to be found by Scarab" )
+
+#list( APPEND Scarab_BOOST_COMPONENTS filesystem system )
+list( APPEND PUBLIC_EXT_LIBS Boost::filesystem )
+
+# making sure Scarab_BOOST_COMPONENTS is not empty and remove duplicate
+if( Scarab_BOOST_COMPONENTS )
+    list( REMOVE_DUPLICATES Scarab_BOOST_COMPONENTS )
+endif( Scarab_BOOST_COMPONENTS )
+
+# Boost (1.46 required for filesystem version 3)
+find_package( Boost 1.46.0 REQUIRED COMPONENTS ${Scarab_BOOST_COMPONENTS} )
+# make sure dynamic linking is assumed for all boost libraries
+set( Boost_USE_STATIC_LIBS OFF )
+set( Boost_USE_STATIC_RUNTIME OFF )
+set( Boost_ALL_DYN_LINK ON )
+    
+# For gethostname in version_semantic
+if( WIN32 )
+    pbuilder_add_ext_libraries( "Ws2_32.lib" )
+endif( WIN32 )
+
+# Pybind11
+if( Scarab_BUILD_PYTHON )
+    find_package( Python3 REQUIRED COMPONENTS Interpreter Development )
+    set(PYBIND11_PYTHON_VERSION ${Python3_VERSION} CACHE STRING "")
+    find_package( pybind11 REQUIRED )
+    #if( TARGET Python3::Python )
+    #    message( STATUS "%%%%% Found Python::Python" )
+    #else()
+    #    message( STATUS "%%%%% Did NOT find Python::Python" )
+    #endif()
+    include_directories( ${Python3_INCLUDE_DIRS} )
+endif( Scarab_BUILD_PYTHON )
+
+
+###################
+# Process options #
+###################
+
+pbuilder_prepare_project()
+
+
+########################
+# Build Scarab library #
+########################
+
+add_subdirectory( library )
+
+
+##########
+# Python #
+##########
+
+if( Scarab_BUILD_PYTHON )
+    list( APPEND Scarab_SOURCE_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/python )
+    add_subdirectory( python )
+endif( Scarab_BUILD_PYTHON )
+
+
+###############
+# Executables #
+###############
+
+if( Scarab_ENABLE_EXECUTABLES )
+    add_subdirectory( executables )
+endif( Scarab_ENABLE_EXECUTABLES )
+
+
+###########
+# Testing #
+###########
+
+if( Scarab_ENABLE_TESTING )
+    add_subdirectory( testing )
+endif()
+
+
+##################
+# Package Config #
+##################
+
+configure_file( ${PROJECT_SOURCE_DIR}/ScarabConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/ScarabConfig.cmake @ONLY )
+
+pbuilder_do_package_config()
+
diff --git a/Src/Scarab/LICENSE b/Src/Scarab/LICENSE
new file mode 100644
index 0000000..2edbae6
--- /dev/null
+++ b/Src/Scarab/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) the Copyright Holders of Scarab and the Project 8 Collaboration, 2016.
+See the file AUTHORS for details on the copyright holders.
+All rights not expressly granted under this license are reserved.
+
+Installation, use, reproduction, display, modification and redistribution of this software, with or without modification, in source and binary forms, are permitted on a non-exclusive basis. Any exercise of rights by you under this license is subject to the following conditions:
+
+1. Redistributions of this software, in whole or in part, with or without modification, must reproduce the above copyright notice and these license conditions in this software, the user documentation and any other materials provided with the redistributed software.  By using, copying,  modifying or distributing the software (or any work based on the software) you agree to acknowledge its use in resulting scientific publications.
+
+2. The user documentation, if any, included with a redistribution, must include the following notice:
+"This product includes software developed by the Copyright Holders of Scarab and the Project 8 Collaboration"
+
+If that is where third-party acknowledgments normally appear, this acknowledgment must be reproduced in the modified version of this software itself.
+ 
+3. The names "Scarab" and "Project 8" may not be used to endorse or promote software, or products derived therefrom, except with prior written permission by the Project 8 Collaboration. If this software is redistributed in modified form, the name and reference of the modified version must be clearly distinguishable from that of this software.
+
+4. You are under no obligation to provide anyone with any modifications of this software that you may develop, including but not limited to bug fixes, patches, upgrades or other enhancements or derivatives of the features, functionality or performance of this software. However, if you publish or distribute your modifications without contemporaneously requiring users to enter into a separate written license agreement, then you are deemed to have granted all Copyright Holders and members of the Project 8 Collaboration a license to your modifications, including modifications protected by any patent owned by you, under the conditions of this license.
+
+5. You may not include this software in whole or in part in any patent or patent application in respect of any modification of this software developed by you.
+
+6. DISCLAIMER
+ 
+THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE PROJECT 8 COLLABORATION AND THE COPYRIGHT HOLDERS OF THE NYMPH AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT HOLDERS AND THE PROJECT 8 COLLABORATION MAKE NO REPRESENTATION THAT THE SOFTWARE AND MODIFICATIONS THEREOF, WILL NOT INFRINGE ANY PATENT, COPYRIGHT, TRADE SECRET OR OTHER PROPRIETARY RIGHT.
+
+7. LIMITATION OF LIABILITY
+
+THE COPYRIGHT HOLDERS AND THE MEMBERS OF THE PROJECT 8 COLLABORATION SHALL HAVE NO LIABILITY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA OR PROFITS, OR BUSINESS INTERRUPTION, HOWEVER CAUSED AND ON ANY THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUCT LIABILITY OR OTHERWISE, ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+8. This license shall terminate with immediate effect and without notice if you fail to comply with any of the terms of this license, or if you institute litigation against any Copyright Holder or member of the Project 8 Collaboration with regard to this software.
diff --git a/Src/Scarab/README.md b/Src/Scarab/README.md
new file mode 100644
index 0000000..4ad1c26
--- /dev/null
+++ b/Src/Scarab/README.md
@@ -0,0 +1,16 @@
+Scarab includes a variety of utilities primarily aimed at the C++ packages developed by the Project 8 collaboration.
+
+It contains three main components:
+* cmake: common CMake modules and scripts
+  * PackageBuilder framework
+  * Find-module scripts for Eigen3, FFTW, ROOT, and Sphinx
+* Documentation
+  * C++ system
+  * Python system
+* library: C++ library of common utilities
+  * Param system
+  * Logger
+  * Authentication class
+  * A variety of utilities
+* python: Python bindings for a subset of the C++ library
+  * Requires pybind11 v2.3.0 or greater
diff --git a/Src/Scarab/ScarabConfig.cmake.in b/Src/Scarab/ScarabConfig.cmake.in
new file mode 100644
index 0000000..e980ac1
--- /dev/null
+++ b/Src/Scarab/ScarabConfig.cmake.in
@@ -0,0 +1,29 @@
+# ScarabConfig.cmake
+
+get_filename_component( Scarab_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
+
+# Find the dependencies
+include( CMakeFindDependencyMacro )
+find_dependency( Boost 1.46 REQUIRED COMPONENTS @Scarab_BOOST_COMPONENTS@ )
+if( @Scarab_BUILD_CODEC_JSON@ ) #Scarab_BUILD_CODEC_JSON
+    find_dependency( RapidJSON REQUIRED )
+    if(NOT TARGET rapidjson)
+        add_library(rapidjson INTERFACE IMPORTED)
+        set_property(TARGET rapidjson PROPERTY  INTERFACE_INCLUDE_DIRECTORIES ${RapidJSON_INCLUDE_DIRS})
+    endif()
+endif()
+if( @Scarab_BUILD_CODEC_YAML@ ) # Scarab_BUILD_CODEC_YAML
+    find_dependency( yaml-cpp REQUIRED )
+endif()
+if( @Scarab_BUILD_PYTHON@ ) # Scarab_BUILD_PYTHON
+    find_dependency( Python REQUIRED COMPONENTS Development )
+endif()
+
+# Import library targets if it's not already present (usable at build time or as installed)
+if( NOT TARGET Scarab::@Scarab_FULL_TARGET_NAME@ )
+    if( TARGET @Scarab_FULL_TARGET_NAME@ )
+        add_library( Scarab::@Scarab_FULL_TARGET_NAME@ ALIAS @Scarab_FULL_TARGET_NAME@ )
+    else()
+        include( "${Scarab_CMAKE_DIR}/Scarab_Library_Targets.cmake" )
+    endif()
+endif()
diff --git a/Src/Scarab/VERSION b/Src/Scarab/VERSION
new file mode 100644
index 0000000..346c262
--- /dev/null
+++ b/Src/Scarab/VERSION
@@ -0,0 +1 @@
+3 9 1
diff --git a/Src/Scarab/cmake/FindEigen3.cmake b/Src/Scarab/cmake/FindEigen3.cmake
new file mode 100644
index 0000000..9bd3474
--- /dev/null
+++ b/Src/Scarab/cmake/FindEigen3.cmake
@@ -0,0 +1,80 @@
+# - Try to find Eigen3 lib
+#
+# This module supports requiring a minimum version, e.g. you can do
+#   find_package(Eigen3 3.1.2)
+# to require version 3.1.2 or newer of Eigen3.
+#
+# Once done this will define
+#
+#  EIGEN3_FOUND - system has eigen lib with correct version
+#  EIGEN3_INCLUDE_DIR - the eigen include directory
+#  EIGEN3_VERSION - eigen version
+
+# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
+# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
+# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
+# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
+
+if(NOT Eigen3_FIND_VERSION)
+  if(NOT Eigen3_FIND_VERSION_MAJOR)
+    set(Eigen3_FIND_VERSION_MAJOR 2)
+  endif(NOT Eigen3_FIND_VERSION_MAJOR)
+  if(NOT Eigen3_FIND_VERSION_MINOR)
+    set(Eigen3_FIND_VERSION_MINOR 91)
+  endif(NOT Eigen3_FIND_VERSION_MINOR)
+  if(NOT Eigen3_FIND_VERSION_PATCH)
+    set(Eigen3_FIND_VERSION_PATCH 0)
+  endif(NOT Eigen3_FIND_VERSION_PATCH)
+
+  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
+endif(NOT Eigen3_FIND_VERSION)
+
+macro(_eigen3_check_version)
+  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
+
+  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
+  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
+  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
+  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
+
+  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
+  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+    set(EIGEN3_VERSION_OK FALSE)
+  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+    set(EIGEN3_VERSION_OK TRUE)
+  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
+
+  if(NOT EIGEN3_VERSION_OK)
+
+    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
+                   "but at least version ${Eigen3_FIND_VERSION} is required")
+  endif(NOT EIGEN3_VERSION_OK)
+endmacro(_eigen3_check_version)
+
+if (EIGEN3_INCLUDE_DIR)
+
+  # in cache already
+  _eigen3_check_version()
+  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
+
+else (EIGEN3_INCLUDE_DIR)
+
+  find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
+      PATHS
+      ${CMAKE_INSTALL_PREFIX}/include
+      ${KDE4_INCLUDE_DIR}
+      PATH_SUFFIXES eigen3 eigen
+    )
+
+  if(EIGEN3_INCLUDE_DIR)
+    _eigen3_check_version()
+  endif(EIGEN3_INCLUDE_DIR)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
+
+  mark_as_advanced(EIGEN3_INCLUDE_DIR)
+
+endif(EIGEN3_INCLUDE_DIR)
\ No newline at end of file
diff --git a/Src/Scarab/cmake/FindFFTW.cmake b/Src/Scarab/cmake/FindFFTW.cmake
new file mode 100644
index 0000000..348c992
--- /dev/null
+++ b/Src/Scarab/cmake/FindFFTW.cmake
@@ -0,0 +1,163 @@
+# Find the FFTW includes and library.
+# 
+# The default and primary FFTW installation uses double-precision floating-point values.
+# FFTW can provide single- and long-double-precision versions as well.
+# 
+# The different versions of FFTW can be found using the COMPONENTS argument of find_package().
+# The available components are:
+#   DOUBLE
+#     NOTE: This is the default.  If you don't specify any COMPONENTS, this is what you'll get.
+#     include: fftw3.h
+#     lib: fftw3
+#     threads lib: fftw3_threads
+#   SINGLE
+#     include: fftw3.h
+#     lib: fftw3f
+#     threads lib: fftw3f_threads
+#   LONGDOUBLE
+#     include: fftw3.h
+#     lib: fftw3l
+#     threads lib: fftw3l_threads
+#
+# This module defines
+# FFTW_FOUND.  If true, you can use the FFTW routines
+# FFTW_INCLUDE_DIR, where to locate fftw3.h file
+# FFTW_LIBRARIES, the libraries to link against to use fftw3
+# FFTW_LIBRARY_DIRS, the directories containing the FFTW libraries
+# FFTW_THREADS_FOUND, If true, can use multithreaded FFTW routines
+# FFTW_THREADS_LIBRARIES, where to find the FFTW threads libraries
+#
+
+# The default component is DOUBLE
+# If the components list is empty, put "DOUBLE" in
+# Otherwise just use the components specified
+if( NOT FFTW_FIND_COMPONENTS )
+    list( APPEND FFTW_FIND_COMPONENTS "DOUBLE" )
+endif( NOT FFTW_FIND_COMPONENTS )
+message( STATUS "Will look for these FFTW components ${FFTW_FIND_COMPONENTS}" )
+
+set( FFTW_FOUND TRUE )
+set( FFTW_THREADS_FOUND TRUE )
+
+# The include file is the same for all FFTW components
+find_path( FFTW_INCLUDE_DIR fftw3.h
+    $ENV{FFTW_DIR}/include
+    $ENV{FFTW3} $ENV{FFTW3}/include $ENV{FFTW3}/api
+    /usr/local/include
+    /usr/include
+    /opt/fftw3/include
+    DOC "Find the directory containing fftw3.h"
+)
+
+if( NOT FFTW_INCLUDE_DIR )
+    message( WARNING "Did not find fftw3.h" )
+    set( FFTW_FOUND FALSE )
+endif( NOT FFTW_INCLUDE_DIR )
+
+set( FFTW_LIBRARY_DIRS )
+set( FFTW_LIBRARY )
+set( FFTW_LIBRARIES )
+
+# Loop over the requested components
+foreach( COMPONENT ${FFTW_FIND_COMPONENTS} )
+    string( TOUPPER ${COMPONENT} UPPERCOMPONENT )
+
+    if( COMPONENT STREQUAL "DOUBLE" )
+        message( STATUS "Looking for the double-precision FFTW library" )
+        set( LIB_NAMES fftw3 fftw3-3 )
+        set( THREAD_LIB_NAMES fftw3_threads fftw3-3_threads )
+    elseif( COMPONENT STREQUAL "SINGLE" )
+        message( STATUS "Looking for the single-precision FFTW library" )
+        set( LIB_NAMES fftw3f fftw3-3f )
+        set( THREAD_LIB_NAMES fftw3f_threads fftw3-3f_threads )
+    elseif( COMPONENT STREQUAL "LONGDOUBLE" )
+        message( STATUS "Looking for the long-double-precision FFTW library" )
+        set( LIB_NAMES fftw3l fftw3-3l )
+        set( THREAD_LIB_NAMES fftw3l_threads fftw3-3l_threads )
+    else()
+        message( WARNING "Invalid COMPONENT <${COMPONENT}> will be ignored" )
+        unset( LIB_NAMES )
+        unset( THREAD_LIB_NAMES )
+    endif()
+
+    if( LIB_NAMES AND THREAD_LIB_NAMES )
+
+        # FFTW library
+        unset( COMP_LIBRARY CACHE )
+        find_library( COMP_LIBRARY NAMES ${LIB_NAMES} PATHS
+            ${FFTW_LIBRARY_DIRS}
+            $ENV{FFTW_DIR}/lib
+            $ENV{FFTW3} $ENV{FFTW3}/lib $ENV{FFTW3}/.libs
+            /usr/local/lib
+            /usr/lib 
+            /opt/local/lib
+            /opt/fftw3/lib
+            DOC "Find the fftw3 library"
+        )
+        
+        if( COMP_LIBRARY )
+            list( APPEND FFTW_LIBRARIES ${COMP_LIBRARY} )
+            get_filename_component( LIBRARY_DIR ${COMP_LIBRARY} DIRECTORY )
+            list( APPEND FFTW_LIBRARY_DIRS ${LIBRARY_DIR} )
+        else( COMP_LIBRARY )
+            message( WARNING "Did not find the FFTW library" )
+            set( FFTW_FOUND FALSE )
+        endif( COMP_LIBRARY )
+            
+        # Threads library
+        unset( COMP_THREADS_LIBRARY CACHE )
+        find_library( COMP_THREADS_LIBRARY NAMES ${THREAD_LIB_NAMES} PATHS
+            ${FFTW_LIBRARY_DIRS}
+            $ENV{FFTW_DIR}/lib
+            $ENV{FFTW3} $ENV{FFTW3}/lib $ENV{FFTW3}/.libs
+            /usr/local/lib
+            /usr/lib 
+            /opt/local/lib
+            /opt/fftw3/lib
+            DOC "Specify the fftw3 threads library here."
+        )
+    
+        if( COMP_THREADS_LIBRARY )
+            list( APPEND FFTW_THREADS_LIBRARIES ${COMP_THREADS_LIBRARY} )
+            get_filename_component( LIBRARY_DIR ${COMP_THREADS_LIBRARY} DIRECTORY )
+            list( APPEND FFTW_LIBRARY_DIRS ${LIBRARY_DIR} )
+        else( COMP_THREADS_LIBRARY )
+            message( WARNING "Did not find the FFTW threads library" )
+            set( FFTW_THREADS_FOUND FALSE )
+        endif( COMP_THREADS_LIBRARY )
+    
+        # get a thread library if necessary (not necessary for C++11 if using std::threads)
+        if( FFTW_THREADS_FOUND )
+            find_package( Threads )
+            # since a library is not necessary under C++11, sometimes there won't be one here
+            if( CMAKE_THREAD_LIBS_INIT )
+                list( APPEND FFTW_THREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
+                get_filename_component( LIBRARY_DIR ${CMAKE_THREAD_LIBS_INIT} DIRECTORY )
+                list( APPEND FFTW_LIBRARY_DIRS ${LIBRARY_DIR} )
+            endif( CMAKE_THREAD_LIBS_INIT )
+        endif( FFTW_THREADS_FOUND )
+         
+    endif( LIB_NAMES AND THREAD_LIB_NAMES )   
+endforeach( COMPONENT ${FFTW_FIND_COMPONENTS} )
+
+list( REMOVE_DUPLICATES FFTW_LIBRARY_DIRS )
+
+# Wrap up
+if( FFTW_FOUND )
+  if( NOT FFTW_FIND_QUIETLY )
+     message( STATUS "Found fftw3 includes at ${FFTW_INCLUDE_DIR}" )
+     message( STATUS "Found fftw3 libraries: ${FFTW_LIBRARIES}" )
+     message( STATUS "Found fftw3 libraries at ${FFTW_LIBRARY_DIRS}" )
+  endif()
+endif( FFTW_FOUND )
+  
+if( FFTW_THREADS_FOUND )
+    if( NOT FFTW_FIND_QUIETLY )
+        message( STATUS "Found fftw3 threads and threads libraries at ${FFTW_THREADS_LIBRARIES}" )
+    endif( NOT FFTW_FIND_QUIETLY )
+endif( FFTW_THREADS_FOUND )
+
+mark_as_advanced(FFTW_FOUND FFTW_LIBRARIES FFTW_INCLUDE_DIR FFTW_LIBRARY_DIRS FFTW_THREADS_FOUND)
+if( FFTW_THREADS_FOUND )
+  mark_as_advanced(FFTW_THREADS_LIBRARIES)
+endif( FFTW_THREADS_FOUND )
diff --git a/Src/Scarab/cmake/FindSphinx.cmake b/Src/Scarab/cmake/FindSphinx.cmake
new file mode 100644
index 0000000..267764b
--- /dev/null
+++ b/Src/Scarab/cmake/FindSphinx.cmake
@@ -0,0 +1,14 @@
+find_program(SPHINX_EXECUTABLE NAMES sphinx-build
+    HINTS
+    $ENV{SPHINX_DIR}
+    PATH_SUFFIXES bin
+    DOC "Sphinx documentation generator"
+)
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(Sphinx DEFAULT_MSG
+    SPHINX_EXECUTABLE
+)
+
+mark_as_advanced(SPHINX_EXECUTABLE)
diff --git a/Src/Scarab/cmake/GetVersion.cmake b/Src/Scarab/cmake/GetVersion.cmake
new file mode 100644
index 0000000..5865697
--- /dev/null
+++ b/Src/Scarab/cmake/GetVersion.cmake
@@ -0,0 +1,33 @@
+# GetVersion.cmake
+# Author: N. Oblath
+#
+# Usage in top CMakeLists.txt: include GetVersion.cmake
+#
+# Expects the version to be in the file VERSION in the top source directory, 
+# with the major version, minor version, and revision numbers as the only 
+# contents of the file, separated by spaces.
+#
+# Sets the following variables:
+#   PROJECT_VERSION_MAJOR
+#   PROJECT_VERSION_MINOR
+#   PROJECT_REVISION
+
+
+# Make sure we have the VERSION file
+find_file( VERSION_FILE VERSION ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH )
+if( NOT EXISTS ${VERSION_FILE} )
+    message( FATAL_ERROR "Did not find VERSION file" )
+endif( NOT EXISTS ${VERSION_FILE} )
+
+# Read the contents of VERSION
+file( READ ${VERSION_FILE} VERSION_STRING )
+
+# Parse the version string into a list
+separate_arguments( VERSION_LIST UNIX_COMMAND ${VERSION_STRING} )
+
+# Put the version numbers into separate variables
+list( GET VERSION_LIST 0 PROJECT_VERSION_MAJOR )
+list( GET VERSION_LIST 1 PROJECT_VERSION_MINOR )
+list( GET VERSION_LIST 2 PROJECT_REVISION )
+
+message( STATUS "Project version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_REVISION}")
diff --git a/Src/Scarab/cmake/PackageBuilder.cmake b/Src/Scarab/cmake/PackageBuilder.cmake
new file mode 100644
index 0000000..2ba4806
--- /dev/null
+++ b/Src/Scarab/cmake/PackageBuilder.cmake
@@ -0,0 +1,171 @@
+# PackageBuilder.cmake
+# Author: Noah Oblath
+#
+# Default settings and macros for PackageBuilder builds
+#
+# Parts of this script are based on work done by Sebastian Voecking and Marco Haag in the Kasper package
+#
+# Requires: CMake v3.12 or better (FindPython3)
+
+# CMake policies
+cmake_policy( SET CMP0011 NEW )
+cmake_policy( SET CMP0012 NEW ) # how if-statements work
+cmake_policy( SET CMP0042 NEW ) # rpath on mac os x
+cmake_policy( SET CMP0048 NEW ) # version in project()
+
+include ( PackageBuilderMacros )
+
+include( CMakeParseArguments ) # required until cmake v3.5, when this was added as a built-in command
+
+# check if this is a stand-alone build
+set( PBUILDER_STANDALONE FALSE CACHE INTERNAL "Flag for whether or not this is a stand-alone build" )
+set( PBUILDER_CHILD_NAME_EXTENSION "${PROJECT_NAME}" CACHE INTERNAL "Submodule library name modifier" )
+if( ${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} )
+    set( PBUILDER_STANDALONE TRUE )
+    
+    if( CMAKE_GENERATOR MATCHES ".*(Make|Ninja).*" AND NOT CMAKE_BUILD_TYPE )
+  		set( CMAKE_BUILD_TYPE "DEBUG" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel" FORCE )
+  		message( STATUS "CMAKE_BUILD_TYPE not specified. Using ${CMAKE_BUILD_TYPE} build" )
+    endif()
+
+    # option to force linking when using g++
+    if( CMAKE_COMPILER_IS_GNUCXX )
+        option( GCC_FORCE_LINKING "Fix linker errors with some GCC versions by adding the --no-as-needed flag" ON )
+        if( GCC_FORCE_LINKING )
+            set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" )
+        endif( GCC_FORCE_LINKING )
+    endif( CMAKE_COMPILER_IS_GNUCXX )
+endif( ${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} )
+
+# define a variable pointing to the directory containing this file
+set( PBUILDER_DIR ${CMAKE_CURRENT_LIST_DIR} )
+
+# preprocessor defintion for debug build
+if( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
+    add_definitions(-D${PROJECT_NAME}_DEBUG )
+else( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
+    remove_definitions(-D${PROJECT_NAME}_DEBUG )    
+endif( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
+
+message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
+
+# Setup the default install prefix
+# This gets set to the binary directory upon first configuring.
+# If the user changes the prefix, but leaves the flag OFF, then it will remain as the user specified.
+# If the user wants to reset the prefix to the default (i.e. the binary directory), then the flag should be set ON.
+if( NOT DEFINED SET_INSTALL_PREFIX_TO_DEFAULT )
+    set( SET_INSTALL_PREFIX_TO_DEFAULT ON )
+endif( NOT DEFINED SET_INSTALL_PREFIX_TO_DEFAULT )
+if( SET_INSTALL_PREFIX_TO_DEFAULT )
+    set( CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR} CACHE PATH "Install prefix" FORCE )
+    set( SET_INSTALL_PREFIX_TO_DEFAULT OFF CACHE BOOL "Reset default install path when when configuring" FORCE )
+endif( SET_INSTALL_PREFIX_TO_DEFAULT )
+
+# install subdirectories
+set( INCLUDE_INSTALL_SUBDIR "include/${PROJECT_NAME}" CACHE PATH "Install subdirectory for headers" )
+if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+    set( LIB_INSTALL_SUBDIR "bin" CACHE PATH "Install subdirectory for libraries" )
+else( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+    set( LIB_INSTALL_SUBDIR "lib" CACHE PATH "Install subdirectory for libraries" )
+endif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+set( PACKAGE_CONFIG_SUBDIR "${LIB_INSTALL_SUBDIR}/cmake/${PROJECT_NAME}" CACHE PATH "Install subdirectory for CMake config files" )
+set( BIN_INSTALL_SUBDIR "bin" CACHE PATH "Install subdirectory for binaries" )
+set( CONFIG_INSTALL_SUBDIR "config" CACHE PATH "Install subdirectory for config files" )
+set( DATA_INSTALL_SUBDIR "data" CACHE PATH "Install subdirectory for data files" )
+
+set( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_SUBDIR}" )
+set( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_SUBDIR}" )
+set( PACKAGE_CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}/${PACKAGE_CONFIG_SUBDIR}" )
+set( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_SUBDIR}" )
+set( CONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_SUBDIR}" )
+set( DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_SUBDIR}" )
+
+#if( NOT DEFINED TOP_PROJECT_INCLUDE_INSTALL_DIR )
+if( PBUILDER_STANDALONE )
+    # this is for standalone builds, but has to be done down here rather than in the standalone if block above
+    set( TOP_PROJECT_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}" CACHE INTERNAL "Top-project include installation path" )
+    set( TOP_PROJECT_INCLUDE_INSTALL_SUBDIR "${INCLUDE_INSTALL_SUBDIR}" CACHE INTERNAL "Top-project include installation subdirectory" )
+    message( STATUS "TOP_PROJECT_INCLUDE_INSTALL_DIR being set to ${TOP_PROJECT_INCLUDE_INSTALL_DIR}" )
+
+    set( TOP_PROJECT_CMAKE_CONFIG_DIR "${PACKAGE_CONFIG_PREFIX}" CACHE INTERNAL "Top-project CMake config installation path" )
+    message( STATUS "TOP_PROJECT_CMAKE_CONFIG_DIR being set to ${TOP_PROJECT_CMAKE_CONFIG_DIR}" )
+    set( ${PROJECT_NAME}_CMAKE_CONFIG_DIR "${PACKAGE_CONFIG_PREFIX}" CACHE INTERNAL "${PROJECT_NAME} CMake config installation path" )
+    message( STATUS "${PROJECT_NAME}_CMAKE_CONFIG_DIR being set to ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}" )
+endif()
+
+
+# flag for building test programs
+option( ${PROJECT_NAME}_ENABLE_TESTING "Turn on or off the building of test programs" OFF )
+
+# flag for building executables (other than test programs)
+# this is particularly useful if a project is used multiple times and installed in a general location, where executables would overwrite each other.
+option( ${PROJECT_NAME}_ENABLE_EXECUTABLES "Turn on or off the building of executables (other than test programs)" ON )
+
+# default version of C++
+# acceptable values are any used by the CXX_STANDARD property of your CMake
+set( CMAKE_CXX_STANDARD 11 )
+
+# build shared libraries
+set( BUILD_SHARED_LIBS ON )
+
+# turn on RPATH for Mac OSX
+set( CMAKE_MACOSX_RPATH ON )
+
+# add the library install directory to the rpath
+SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
+
+set( LIB_POSTFIX )
+set( INC_PREFIX )
+
+# in windows, disable the min and max macros
+if( WIN32 )
+    # disable the min and max macros
+    add_definitions( -DNOMINMAX )
+	# libraries and linking
+	set( CMAKE_SHARED_LIBRARY_PREFIX "" )
+	set( CMAKE_IMPORT_LIBRARY_PREFIX "" )
+	set( CMAKE_LINK_DEF_FILE_FLAG "" )
+	add_definitions( -DBOOST_ALL_DYN_LINK )
+endif( WIN32 )
+
+# default package name is the project name
+set( ${PROJECT_NAME}_PACKAGE_NAME "${PROJECT_NAME}" )
+
+# Full project name, expanded according to the submodule hierarchy
+pbuilder_expand_lib_name( ${PROJECT_NAME} )
+set( ${PROJECT_NAME}_FULL_PROJECT_NAME ${FULL_LIB_NAME} )
+message( STATUS "Full project name: ${PROJECT_NAME}_FULL_PROJECT_NAME = ${${PROJECT_NAME}_FULL_PROJECT_NAME}" )
+
+# if git is used, get the commit SHA1
+find_package( Git )
+if( GIT_FOUND )
+    # check whether this is a git repo
+    execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-git-dir WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE IS_GIT_REPO )
+    if( IS_GIT_REPO )
+        execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse -q HEAD  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE ${PROJECT_NAME}_GIT_COMMIT  OUTPUT_STRIP_TRAILING_WHITESPACE )
+        execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --long  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE ${PROJECT_NAME}_GIT_DESCRIBE  OUTPUT_STRIP_TRAILING_WHITESPACE )
+        execute_process( COMMAND ${GIT_EXECUTABLE} remote get-url origin WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE GIT_ORIGIN OUTPUT_STRIP_TRAILING_WHITESPACE )
+        if( GIT_ORIGIN )
+            message( STATUS "Git origin: ${GIT_ORIGIN}")
+            string( REGEX MATCH "[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+$" GIT_PACKAGE ${GIT_ORIGIN} )
+        else( GIT_ORIGIN )
+            execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --show-toplevel WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE TOP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE )
+            execute_process( COMMAND basename ${TOP_DIR} OUTPUT_VARIABLE GIT_PACKAGE )
+        endif( GIT_ORIGIN )
+        message( STATUS "Git package: ${GIT_PACKAGE}" )
+
+        # override package name with git package
+        set( ${PROJECT_NAME}_PACKAGE_NAME "${GIT_PACKAGE}" )
+    endif( IS_GIT_REPO )
+endif( GIT_FOUND )
+# check if we set the _PACKAGE_NAME variable; if we didn't, then we'll use an alternate setting
+if( NOT ${PROJECT_NAME}_PACKAGE_NAME )
+    set( ${PROJECT_NAME}_PACKAGE_NAME "${PROJECT_NAME}" )
+endif()
+
+# define the variables to describe the package (will go in the [ProjectName]Config.hh file)
+set( ${PROJECT_NAME}_PACKAGE_STRING "${PROJECT_NAME} ${${PROJECT_NAME}_VERSION}" )
diff --git a/Src/Scarab/cmake/PackageBuilderMacros.cmake b/Src/Scarab/cmake/PackageBuilderMacros.cmake
new file mode 100644
index 0000000..728706f
--- /dev/null
+++ b/Src/Scarab/cmake/PackageBuilderMacros.cmake
@@ -0,0 +1,541 @@
+# PackageBuilderMacros.cmake
+# Author: Noah Oblath
+#
+# Convenient macros for PackageBuilder builds
+#
+# Requires: CMake v3.12 or better (FindPython3)
+
+# Conveniece function for overriding the value of an option (aka a cached bool variable)
+macro( set_option VARIABLE VALUE )
+    set( ${VARIABLE} ${VALUE} CACHE BOOL "" FORCE )
+endmacro()
+
+# This should be called after setting options, and before adding submodules and building the project
+macro( pbuilder_prepare_project )
+
+    # Deprecated C++ version options
+    if( DEFINED USE_CPP17 )
+        message( AUTHOR_WARNING "USE_CPP%% variables are deprecated as of Scarab v3.4; Please set CMAKE_CXX_STANDARD directly" )
+        set( CMAKE_CXX_STANDARD 17 )
+    elseif( DEFINED USE_CPP14 )
+        message( AUTHOR_WARNING "USE_CPP%% variables are deprecated as of Scarab v3.4; Please set CMAKE_CXX_STANDARD directly" )
+        set( CMAKE_CXX_STANDARD 14 )
+    elseif( DEFINED USE_CPP11 )
+        message( AUTHOR_WARNING "USE_CPP%% variables are deprecated as of Scarab v3.4; Please set CMAKE_CXX_STANDARD directly" )
+        set( CMAKE_CXX_STANDARD 11 )
+    endif()
+
+    # Add/remove C++ version macros
+    if( CMAKE_CXX_STANDARD GREATER 20 AND NOT CMAKE_CXX_STANDARD EQUAL 98 )
+        add_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
+        message( AUTHOR_WARNING "PackageBuilder does not currently include \"USE_CPP%%\" macros for higher that C++20" )
+    elseif( CMAKE_CXX_STANDARD EQUAL 20 )
+        add_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
+    elseif( CMAKE_CXX_STANDARD EQUAL 17 )
+        remove_definitions( -DUSE_CPP20 )
+        add_definitions( -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
+    elseif( CMAKE_CXX_STANDARD EQUAL 14 )
+        remove_definitions( -DUSE_CPP20 -DUSE_CPP17 )
+        add_definitions( -DUSE_CPP14 -DUSE_CPP11 )
+    elseif( CMAKE_CXX_STANDARD EQUAL 11 )
+        remove_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 )
+        add_definitions( -DUSE_CPP11 )
+    elseif( CMAKE_CXX_STANDARD EQUAL 98 )
+        remove_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
+    endif()
+
+
+endmacro()
+
+macro( pbuilder_add_submodule SM_NAME SM_LOCATION )
+    if( NOT IS_ABSOLUTE ${SM_LOCATION} )
+        set( SM_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/${SM_LOCATION}" )
+    endif()
+
+    # Conditions that let us in this loop:
+    #  1. Submodule SM_NAME has not yet been found
+    #  2. This is the location of the submodule SM_NAME
+    message( STATUS "${SM_NAME}_LOCATION: ${${SM_NAME}_LOCATION}" )
+    message( STATUS "CMAKE_CURRENT_LIST_DIR/SM_LOCATION: ${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
+    if( NOT ${SM_NAME}_FOUND OR "${${SM_NAME}_LOCATION}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
+        message( "Adding submodule ${SM_NAME} in location ${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
+
+        set( ${SM_NAME}_FOUND TRUE CACHE INTERNAL "" )
+        set( ${SM_NAME}_LOCATION ${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION} CACHE INTERNAL "" )
+        set( ${SM_NAME}_BINARY_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION} CACHE INTERNAL "" )
+
+        # Determine the library name suffix for this submodule with respect to its parent if it's not already defined
+        if( NOT DEFINED ${SM_NAME}_PARENT_LIB_NAME_SUFFIX )
+            set( ${SM_NAME}_PARENT_LIB_NAME_SUFFIX "_${PROJECT_NAME}${${PROJECT_NAME}_PARENT_LIB_NAME_SUFFIX}" CACHE INTERNAL "Scoped library name suffix for submodule ${SM_NAME}" )
+            message( STATUS "PARENT_LIB_NAME_SUFFIX being set for SM ${SM_NAME}: ${${SM_NAME}_PARENT_LIB_NAME_SUFFIX}" )
+        endif()
+
+        # Set submodule include subdirectory
+        set( SM_INCLUDE_SUBDIR "/${SM_NAME}" )
+        message( STATUS "Include files for submodule ${SM_NAME} will be installed in ${TOP_PROJECT_INCLUDE_INSTALL_DIR}${SM_INCLUDE_SUBDIR}" )
+
+        # Set CMake config subdirectory
+        set( ${SM_NAME}_CMAKE_CONFIG_DIR "${PACKAGE_CONFIG_PREFIX}/${SM_NAME}" CACHE INTERNAL "${SM_NAME} CMake config installation path" )
+    
+        message( STATUS "SM ${SM_NAME} cached variables:" )
+        message( STATUS "${SM_NAME}_FOUND: ${${SM_NAME}_FOUND}" )
+        message( STATUS "${SM_NAME}_LOCATION: ${${SM_NAME}_LOCATION}" )
+        message( STATUS "${SM_NAME}_BINARY_LOCATION: ${${SM_NAME}_BINARY_LOCATION}" )
+        message( STATUS "${SM_NAME}_PARENT_LIB_NAME_SUFFIX: ${${SM_NAME}_PARENT_LIB_NAME_SUFFIX}")
+        message( STATUS "${SM_NAME}_CMAKE_CONFIG_DIR: ${${SM_NAME}_CMAKE_CONFIG_DIR}" )
+
+        message( STATUS "Proceeding into subdirectory: ${SM_LOCATION}" )
+        add_subdirectory( ${SM_LOCATION} )
+
+        if( EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION}/${SM_NAME}Config.cmake )
+            message( STATUS "Loading config file for submodule ${SM_NAME}" )
+            include( ${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION}/${SM_NAME}Config.cmake )
+        else()
+            message( STATUS "No config file present for submodule ${SM_NAME} (${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION}/${SM_NAME}Config.cmake)" )
+        endif()
+
+        # Need to unset the submodule subdirectories since we're in a macro
+        unset( SM_INCLUDE_SUBDIR )
+        unset( SM_CMAKE_CONFIG_SUBDIR )
+
+    endif( NOT ${SM_NAME}_FOUND OR "${${SM_NAME}_LOCATION}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
+endmacro()
+
+macro( pbuilder_expand_lib_name_2 LIB_NAME SM_NAME )
+    # Output is in the form of the variable FULL_LIB_NAME
+    set( FULL_LIB_NAME "${LIB_NAME}${${SM_NAME}_PARENT_LIB_NAME_SUFFIX}" )
+endmacro()
+
+macro( pbuilder_expand_lib_name LIB_NAME )
+    # Output is in the form of the variable FULL_LIB_NAME
+    pbuilder_expand_lib_name_2( ${LIB_NAME} ${PROJECT_NAME} )
+endmacro()
+
+macro( pbuilder_expand_lib_names )
+    # Supply library targets as additional macro arguments
+    # Output is in the form of the variable FULL_LIB_NAMES
+    set( LIB_NAMES ${ARGN} )
+    #message( STATUS "expanding these project libraries: ${LIB_NAMES}" )
+    set( FULL_LIB_NAMES )
+    foreach( lib ${LIB_NAMES} )
+        pbuilder_expand_lib_name( ${lib} )
+        list( APPEND FULL_LIB_NAMES ${FULL_LIB_NAME} )
+    endforeach( lib )
+    message( STATUS "expanded to full project library names: ${FULL_LIB_NAMES}" )
+endmacro()
+
+macro( pbuilder_use_sm_library LIB_NAME SM_NAME )
+    pbuilder_expand_lib_name_2( ${LIB_NAME} ${SM_NAME} )
+    list( APPEND ${PROJECT_NAME}_SM_LIBRARIES ${FULL_LIB_NAME} )
+    #message( STATUS "Added SM library ${FULL_LIB_NAME} to ${PROJECT_NAME}_SM_LIBRARIES" )
+endmacro()
+
+function( pbuilder_library )
+    # Builds a shared-object library
+    #
+    # Combines pbuilder_add_library() and pbuilder_link_library()
+    #
+    # Parameters:
+    #     TARGET: library target name
+    #     SOURCES: source files to include
+    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
+    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
+    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
+    #     COMPILE_DEFINITIONS: compile definitions to add to this target
+
+    set( OPTIONS )
+    set( ONEVALUEARGS TARGET )
+    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES COMPILE_DEFINITIONS )
+    cmake_parse_arguments( LIB "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
+
+    message( "Building library ${LIB_TARGET}" )
+    message( STATUS "${PROJECT_NAME}_PARENT_LIB_NAME_SUFFIX is ${${PROJECT_NAME}_PARENT_LIB_NAME_SUFFIX}" )
+
+    pbuilder_add_library(
+        TARGET ${LIB_TARGET}
+        SOURCES ${LIB_SOURCES}
+    )
+
+    pbuilder_link_library(
+        TARGET ${LIB_TARGET}
+        PROJECT_LIBRARIES ${LIB_PROJECT_LIBRARIES}
+        PUBLIC_EXTERNAL_LIBRARIES ${LIB_PUBLIC_EXTERNAL_LIBRARIES}
+        PRIVATE_EXTERNAL_LIBRARIES ${LIB_PRIVATE_EXTERNAL_LIBRARIES}
+        COMPILE_DEFINITIONS ${LIB_COMPILE_DEFINITIONS}
+    )
+
+endfunction()
+
+function( pbuilder_add_library )
+    # Adding a shared-object library
+    #
+    # Parameters:
+    #     TARGET: library target name
+    #     SOURCES: source files to include
+
+    set( OPTIONS )
+    set( ONEVALUEARGS TARGET )
+    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES COMPILE_DEFINITIONS )
+    cmake_parse_arguments( LIB "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
+
+    message( "Adding library ${LIB_TARGET}" )
+
+    pbuilder_expand_lib_name( ${LIB_TARGET} )
+    set( FULL_LIB_TARGET ${FULL_LIB_NAME} )
+    set( ${LIB_TARGET}_FULL_TARGET_NAME  ${FULL_LIB_NAME} CACHE INTERNAL "Full target name for library ${LIB_TARGET}" )
+    message( STATUS "lib target: ${LIB_TARGET}" )
+    message( STATUS "full lib target: ${FULL_LIB_TARGET}" )
+    message( STATUS "internal cache ${LIB_TARGET}_FULL_TARGET_NAME: ${${LIB_TARGET}_FULL_TARGET_NAME}" )
+    message( STATUS "SM library dependencies (public): ${${PROJECT_NAME}_SM_LIBRARIES}" )
+    message( STATUS "external library dependencies (public): ${LIB_PUBLIC_EXTERNAL_LIBRARIES}" )
+    message( STATUS "external library dependencies (private): ${LIB_PRIVATE_EXTERNAL_LIBRARIES}" )
+
+    message( STATUS "pbuilder: will build library <${FULL_LIB_TARGET}>" )
+    add_library( ${FULL_LIB_TARGET} ${LIB_SOURCES} )
+
+    # Set the version of the library
+    set_target_properties( ${FULL_LIB_TARGET} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} )
+
+    # Grab the include directories, which will be used for the build-interface target includes
+    get_target_property( SOURCE_TREE_INCLUDE_DIRS ${FULL_LIB_TARGET} INCLUDE_DIRECTORIES )
+    message( STATUS "Adding install interface include dir: ${TOP_PROJECT_INCLUDE_INSTALL_SUBDIR}${SM_INCLUDE_SUBDIR}" )
+    message( STATUS "Adding build interface include dirs: ${SOURCE_TREE_INCLUDE_DIRS}" )
+    
+    # this will set the INTERFACE_INCLUDE_DIRECTORIES property using the INTERFACE option
+    # it's assumed that the include_directories() command was used to set the INCLUDE_DIRECTORIES property for the private side.
+    target_include_directories( ${FULL_LIB_TARGET} 
+        INTERFACE 
+            "$<BUILD_INTERFACE:${SOURCE_TREE_INCLUDE_DIRS}>"
+            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${TOP_PROJECT_INCLUDE_INSTALL_SUBDIR}${SM_INCLUDE_SUBDIR}>"
+    )
+
+
+endfunction()
+
+function( pbuilder_link_library )
+    # Linking a shared-object library
+    #
+    # Parameters:
+    #     TARGET: library target name
+    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
+    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
+    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
+    #     COMPILE_DEFINITIONS: compile definitions to add to this target
+
+    set( OPTIONS )
+    set( ONEVALUEARGS TARGET )
+    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES COMPILE_DEFINITIONS )
+    cmake_parse_arguments( LIB "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
+
+    message( "Linking library ${LIB_TARGET}" )
+
+    pbuilder_expand_lib_name( ${LIB_TARGET} )
+    set( FULL_LIB_TARGET ${FULL_LIB_NAME} )
+
+    pbuilder_expand_lib_names( ${LIB_PROJECT_LIBRARIES} )
+    set( FULL_PROJECT_LIBRARIES ${FULL_LIB_NAMES} )
+    message( STATUS "full project library dependencies (lib): ${FULL_PROJECT_LIBRARIES}" )
+
+    target_link_libraries( ${FULL_LIB_TARGET} 
+        PUBLIC
+            ${FULL_PROJECT_LIBRARIES} ${${PROJECT_NAME}_SM_LIBRARIES} ${LIB_PUBLIC_EXTERNAL_LIBRARIES}
+        PRIVATE
+            ${LIB_PRIVATE_EXTERNAL_LIBRARIES} 
+    )
+
+    # Add target compile definitions
+    if( LIB_COMPILE_DEFINITIONS )
+        target_compile_definitions( ${FULL_LIB_TARGET}
+            PUBLIC
+                ${LIB_COMPILE_DEFINITIONS}
+        )
+    endif()
+
+endfunction()
+
+function( pbuilder_executables )
+    # Builds multiple executables, assuming one executable per source file
+    # Strips extensino from source file and uses that as the executable name (target and file)
+    #
+    # Parameters
+    #     TARGETS_VAR (output, optional): variable in which to store the names of the executables created
+    #     SOURCES: source files to be builT
+    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
+    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
+    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
+
+
+    set( OPTIONS )
+    set( ONEVALUEARGS TARGETS_VAR )
+    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES )
+    cmake_parse_arguments( EXES "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
+
+    message( "Building multiple executables" )
+    message( STATUS "executable source files: ${EXES_SOURCES}" )
+    message( STATUS "project library dependencies: ${EXES_PROJECT_LIBRARIES}" )
+    message( STATUS "submodule library dependencies (public): ${${PROJECT_NAME}_SM_LIBRARIES}" )
+    message( STATUS "external library dependencies (public): ${EXES_PUBLIC_EXTERNAL_LIBRARIES}" )
+    message( STATUS "external library dependencies (private): ${EXES_PRIVATE_EXTERNAL_LIBRARIES}" )
+
+    set( targets )
+
+    foreach( source ${EXES_SOURCES} )
+        get_filename_component( program ${source} NAME_WE )
+        if( NOT TARGET ${program} )
+            pbuilder_executable( EXECUTABLE ${program} 
+                SOURCES ${source} 
+                PROJECT_LIBRARIES ${EXES_PROJECT_LIBRARIES} 
+                PUBLIC_EXTERNAL_LIBRARIES ${EXES_PUBLIC_EXTERNAL_LIBRARIES} 
+                PRIVATE_EXTERNAL_LIBRARIES ${EXES_PRIVATE_EXTERNAL_LIBRARIES} 
+            )
+            list( APPEND targets ${program} )
+        else()
+            message( FATAL "Duplicate target: ${program}" )
+        endif()
+    endforeach( source )
+
+    message( STATUS "Targets produced: ${targets}" )
+    if( EXES_TARGETS_VAR )
+        message( STATUS "output var for targets: ${EXES_TARGETS_VAR}" )
+        set( ${EXES_TARGETS_VAR} ${targets} PARENT_SCOPE )
+    endif()
+
+endfunction()
+
+function( pbuilder_executable )
+    # Builds a single executable from one or more source files
+    #
+    # Parameters
+    #     EXECUTABLE: executable target
+    #     SOURCES: list of sources to be built into one executable
+    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
+    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
+    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
+
+    set( OPTIONS )
+    set( ONEVALUEARGS EXECUTABLE )
+    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES )
+    cmake_parse_arguments( EXE "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
+
+    message( "Building executable ${EXE_EXECUTABLE} with ${EXE_SOURCES}" )
+    message( STATUS "\tlinking with: (project) ${EXE_PROJECT_LIBRARIES} -- (submodule) ${${PROJECT_NAME}_SM_LIBRARIES} --  (public ext) ${EXE_PUBLIC_EXTERNAL_LIBRARIES} -- (private ext) ${EXE_PRIVATE_EXTERNAL_LIBRARIES}")
+
+    add_executable( ${EXE_EXECUTABLE} ${EXE_SOURCES} )
+
+    pbuilder_expand_lib_names( ${EXE_PROJECT_LIBRARIES} )
+    set( FULL_PROJECT_LIBRARIES ${FULL_LIB_NAMES} )
+    message( STATUS "full project library dependencies (exe): ${FULL_PROJECT_LIBRARIES}" )
+
+    target_link_libraries( ${EXE_EXECUTABLE} 
+        PUBLIC
+            ${FULL_PROJECT_LIBRARIES} ${${PROJECT_NAME}_SM_LIBRARIES} ${EXE_PUBLIC_EXTERNAL_LIBRARIES}
+        PRIVATE
+            ${EXE_PRIVATE_EXTERNAL_LIBRARIES} 
+    )
+
+endfunction()
+
+function( pbuilder_component_install_and_export )
+    # This function installs library and executable targets, and makes sure they're exported correctly.
+    #
+    # Parameters:
+    #     COMPONENT: build component being installed; required if this function is used multiple times in a project
+    #                if a build does not actually have multiple components, a name still needs to be given (e.g. "library")
+    #     LIBTARGETS: all library targets to be installed
+    #     EXETARGETS: all executable targets to be installed
+
+    set( OPTIONS )
+    set( ONEVALUEARGS COMPONENT )
+    set( MULTIVALUEARGS LIBTARGETS EXETARGETS )
+    cmake_parse_arguments( CIE "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
+
+    if( CIE_COMPONENT )
+        set( INSERT_COMPONENT "_${CIE_COMPONENT}" )
+    endif()
+
+    # Libraries
+    if( CIE_LIBTARGETS )
+        message( "Installing and exporting libraries for component <${CIE_COMPONENT}>" )
+        message( STATUS "Targets are: ${CIE_LIBTARGETS}" )
+
+        # expand library names
+        pbuilder_expand_lib_names( ${CIE_LIBTARGETS} )
+        set( FULL_LIBTARGETS ${FULL_LIB_NAMES} )
+        message( STATUS "Expanded lib names: ${FULL_LIBTARGETS}" )
+
+        # make targets available at build time
+        export( TARGETS ${FULL_LIBTARGETS}
+            APPEND
+            FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake
+        )
+
+        # install libraries and add to export for installation
+        install( TARGETS ${FULL_LIBTARGETS} 
+            EXPORT ${PROJECT_NAME}${INSERT_COMPONENT}_Targets
+            COMPONENT ${CIE_COMPONENT}
+            LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+        )
+    endif()
+
+    # Executables
+    if( CIE_EXETARGETS )
+        message( "Installing and exporting executables for component <${CIE_COMPONENT}>" )
+        message( STATUS "Targets are: ${CIE_EXETARGETS}" )
+
+        # make targets available at build time
+        #message( STATUS "******* build-time exe targets file: ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake" )
+        export( TARGETS ${CIE_EXETARGETS}
+            APPEND
+            FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake
+        )
+        
+        # install executables and add to export for installation
+        #message( STATUS "******* installed exe targets export: ${PROJECT_NAME}${INSERT_COMPONENT}_Targets")
+        install( TARGETS ${CIE_EXETARGETS}
+            EXPORT ${PROJECT_NAME}${INSERT_COMPONENT}_Targets
+            COMPONENT ${CIE_COMPONENT}
+            RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+        )
+    endif()
+
+    # Export installation
+    message( "Installing export ${PROJECT_NAME}${INSERT_COMPONENT}_Targets" )
+    message( STATUS "Output file will be ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake" )
+    install( EXPORT ${PROJECT_NAME}${INSERT_COMPONENT}_Targets
+        NAMESPACE
+            ${PROJECT_NAME}::
+        DESTINATION
+            ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}
+    )
+
+
+endfunction()
+
+macro( pbuilder_install_headers )
+    #message( STATUS "installing headers in ${INCLUDE_INSTALL_DIR}${${PROJECT_NAME}_PARENT_INC_DIR_PATH}" )
+    install( FILES ${ARGN} 
+        DESTINATION ${TOP_PROJECT_INCLUDE_INSTALL_DIR}${SM_INCLUDE_SUBDIR}
+    )
+endmacro()
+
+macro( pbuilder_install_header_dirs FILE_PATTERN )
+    install( DIRECTORY ${ARGN} 
+        DESTINATION ${INCLUDE_INSTALL_DIR}${${PROJECT_NAME}_PARENT_INC_DIR_PATH} 
+        FILES_MATCHING PATTERN "${FILE_PATTERN}" 
+    )
+endmacro()
+
+macro( pbuilder_install_config )
+    install( FILES ${ARGN} 
+        DESTINATION ${CONFIG_INSTALL_DIR} 
+    )
+endmacro()
+
+macro( pbuilder_install_data )
+    install( FILES ${ARGN} 
+        DESTINATION ${DATA_INSTALL_DIR} 
+    )
+endmacro()
+
+macro( pbuilder_install_files DEST_DIR )
+    install( FILES ${ARGN} 
+        DESTINATION ${DEST_DIR} 
+    )
+endmacro()
+
+function( pbuilder_do_package_config )
+    # This macro sets up and installs the configuration files used tospecify the install information for the project.
+    # It installs an already-created "config" file.
+    # It creates and installs the "version-config" and "targets" files.
+    # Arguments: 
+    #   
+    #   CONFIG_LOCATION -- Directory in which to find the already-created config file.
+    #                      If not specified, the default is ${PROJECT_BINARY_DIR}.
+    #   FILE_PREFIX -- Portion of the filename that preceeds `Config.cmake`, `Targets.cmake`, and `ConfigVersion.cmake` for the 
+    #                  config, targets, and config-version files, respectively.  If not specified, the default is ${PROJECT_NAME}.
+    #   CONFIG_FILENAME -- Optional specification of the full config filename.  If specified, overrules the default described above.
+    #   VERSION_FILENAME -- Optional specification of the full version-config filename.  If specified, overrules the default described above.
+
+    # Parse macro arguments
+    set( oneValueArgs CONFIG_LOCATION FILE_PREFIX CONFIG_FILENAME VERSION_FILENAME )
+    cmake_parse_arguments( PKG_CONF "" "${oneValueArgs}" "" ${ARGN} )
+
+    # Handle arguments and apply defaults
+
+    if( NOT PKG_CONF_CONFIG_LOCATION )
+        set( PKG_CONF_CONFIG_LOCATION ${PROJECT_BINARY_DIR} )
+    endif()
+
+    if( NOT PKG_CONF_FILE_PREFIX )
+        set( PKG_CONF_FILE_PREFIX ${PROJECT_NAME} )
+    endif()
+
+    if( NOT PKG_CONF_CONFIG_FILENAME )
+        set( PKG_CONF_CONFIG_FILENAME ${PKG_CONF_FILE_PREFIX}Config.cmake )
+    endif()
+    set( CONFIG_PATH ${PKG_CONF_CONFIG_LOCATION}/${PKG_CONF_CONFIG_FILENAME} )
+    message( STATUS "Config file path: ${CONFIG_PATH}" )
+
+    if( NOT PKG_CONF_VERSION_FILENAME )
+        set( PKG_CONF_VERSION_FILENAME ${PKG_CONF_FILE_PREFIX}ConfigVersion.cmake )
+    endif()
+    set( CONFIG_VERSION_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PKG_CONF_VERSION_FILENAME} )
+    message( STATUS "Config version file path: ${CONFIG_VERSION_PATH}" )
+
+    # Config file must exist already
+    if( NOT EXISTS ${CONFIG_PATH} )
+        message( FATAL_ERROR "Package config file does not exist: ${CONFIG_PATH}" )
+    endif()
+
+    include( CMakePackageConfigHelpers )
+    write_basic_package_version_file(
+        ${CONFIG_VERSION_PATH}
+        COMPATIBILITY SameMajorVersion
+    )
+
+    install( 
+        FILES 
+            ${CONFIG_VERSION_PATH}
+            ${CONFIG_PATH}
+        DESTINATION 
+            ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}
+    )
+
+endfunction()
+
+function( pbuilder_add_pybind11_module PY_MODULE_NAME PROJECT_LIBRARIES )
+    # Adds a pybind11 module that is linked to the specified project libraries, PUBLIC_EXT_LIBS, and PRIVATE_EXT_LIBS
+    # Installs the library in the standard lib directory unless indicated by the definition of the variable PBUILDER_PY_INSTALL_IN_SITELIB
+
+    pbuilder_expand_lib_names( ${PROJECT_LIBRARIES} )
+    set( FULL_PROJECT_LIBRARIES ${FULL_LIB_NAMES} )
+    message( STATUS "full project libraries (pybind11): ${FULL_PROJECT_LIBRARIES}" )
+
+    message( STATUS "submodule libraries (pybind11): ${${PROJECT_NAME}_SM_LIBRARIES}" )
+
+    # Potential point of confusion: the C++ library is "Scarab" and the python library is "scarab"
+    # Other possible naming schemes seemed less desirable, and we'll hopefully avoid confusion with these comments
+    pybind11_add_module( ${PY_MODULE_NAME} ${PYBINDING_SOURCEFILES} )
+
+    get_target_property( SOURCE_TREE_INCLUDE_DIRS ${PY_MODULE_NAME} INCLUDE_DIRECTORIES )
+    message( STATUS "Adding install interface include dir: ${INCLUDE_INSTALL_SUBDIR}" )
+    message( STATUS "Adding build interface include dirs: ${SOURCE_TREE_INCLUDE_DIRS}" )
+
+    target_include_directories( ${PY_MODULE_NAME}
+        INTERFACE 
+            "$<BUILD_INTERFACE:${SOURCE_TREE_INCLUDE_DIRS}>"
+            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_SUBDIR}>"
+    )
+
+    target_link_libraries( ${PY_MODULE_NAME} PRIVATE ${FULL_PROJECT_LIBRARIES} ${${PROJECT_NAME}_SM_LIBRARIES} ${PUBLIC_EXT_LIBS} ${PRIVATE_EXT_LIBS} )
+
+    set( PY_MODULE_INSTALL_DIR ${LIB_INSTALL_DIR} )
+    # Override that install location if specified by the user
+    if( DEFINED PBUILDER_PY_INSTALL_IN_SITELIB AND DEFINED Python3_SITELIB )
+        set( PY_MODULE_INSTALL_DIR ${Python3_SITELIB} )
+    endif( DEFINED PBUILDER_PY_INSTALL_IN_SITELIB AND DEFINED Python3_SITELIB )
+    message( STATUS "Installing module ${PY_MODULE_NAME} in ${PY_MODULE_INSTALL_DIR}" )
+
+    install( TARGETS ${PY_MODULE_NAME} DESTINATION ${PY_MODULE_INSTALL_DIR} )
+    
+endfunction()
diff --git a/Src/Scarab/documentation/README.md b/Src/Scarab/documentation/README.md
new file mode 100644
index 0000000..411c1c3
--- /dev/null
+++ b/Src/Scarab/documentation/README.md
@@ -0,0 +1,24 @@
+We use sphinx (and deployment to RTD) for nearly all of our documentation within Project 8.
+Here we collect the files and instructions needing for setting up the above; these are very language specific.
+
+# General Notes
+- In many cases, you will not actually use/include these files in a project, but will instead copy and modify them as a starting template. This means that changes to the template will *not* propagate to other packages automatically.
+- The template files provided are intended as a working starting point, but modification and additions are expected. It may also be required to make changes to how builds are done on the RTD site using their advanced admin options. This action is currently restricted to the primary maintainers for each (contact Noah if you believe you need access).
+
+# Subdirectories
+Subdirectories here contain instructions (in their README.md files) and an example files needed for various languages.
+Depending on the repo, scarab may or may not be expected to be an available submodule.
+The cpp subdirectory also contains the actual documentation for scarab (it is an used as the example for other cpp packages)
+
+# Generic building notes
+For a complete understanding of how documentation is built on RTD, you should go look at their documentation.
+For our purposes, it is usually reasonable to consider the following steps:
+
+1. Github sends an HTTP POST on certain events (generally pushes and releases) and RTD may trigger a build, depending on the details of the event and its configuration.
+1. If a build is triggered, RTD spins up their standard build container and clones the desired commit
+1. RTD installs their default python environment
+1. If configured to do so, RTD installs python packages using pip and a named requirements.txt file from within the repo
+1. If configured to do so, RTD attempts to install the provided python package (based on a setup.py file)
+1. RTD cats the conf.py file which will be used for building the webpage (this is done to ease some debugging)
+1. RTD builds the sphinx documentation based on the conf.py file
+1. RTD moves the build output to their hosting location so that the webpage is served.
diff --git a/Src/Scarab/documentation/application_building.rst b/Src/Scarab/documentation/application_building.rst
new file mode 100644
index 0000000..295c6cb
--- /dev/null
+++ b/Src/Scarab/documentation/application_building.rst
@@ -0,0 +1,223 @@
+Applications built with Scarab
+==============================
+
+An application essentially encapsulates some behavior or capability with a user interface.  Scarab provides tools to create an interface that allows the user to easily and repeatably configure and run an application.
+
+The main set of classes that a developer will encounter are:
+
+    * ``main_app``: the top-level application class
+    * ``app``: application base class; used for subcommands
+    * The set of ``param`` classes: data structure classes that hold the configuration information
+
+Configuring an Application
+--------------------------
+
+The user tells the application how to run using its configuration.  The primary configuration can be put together using several stages of input:
+
+    #. Default configuration: the developer of the application can provide a default hard-coded configuration via ``main_app::default_config()``
+    #. Configuration file: supplied via the command line (``-c`` or ``--config``)
+    #. Non-option command-line arguments (see below)
+    #. Option arguments setup to modify the configuration
+
+Starting from the top down, successive stages of configuration will add to or overwrite (for duplicated configuration keys) the primary configuration.  The configuration can be accessed with ``main_app::primary_config()``.
+
+Using the Command Line
+----------------------
+
+Components of a command::
+
+    > my_exe [subcommand] [options] [non-option arguments]
+
+Subcommands
+    An executable using subcommands typically has multiple main modes of operation, each of which is identified by a subcommand.
+
+Options
+    An option modifies the behavior of the executable in some predefined way (unknown options are not allowed).  Options are indicated by a hyphen and a single character (e.g. ``-c``) or two hyphens and a string name (e.g. ``--config``).  Options can either be flags, indicating some meaning just by their presence, or they can have some value attached to them.  Options can be given as:
+
+    *    ``-a`` (flag)
+    *    ``-abc`` (flags can be combined)
+    *    ``-f filename`` (option)
+    *    ``-ffilename`` (no space required)
+    *    ``-abcf filename`` (flags and option can be combined)
+    *    ``--long`` (long flag)
+    *    ``--file filename`` (space)
+    *    ``--file=filename`` (equals)
+
+    Several options are available with any scarab-based application:
+
+    * ``-h`` or ``--help`` will print the usage message and exit
+    * ``-V`` or ``--version`` will print the version information and exit
+    * ``-c`` or ``--config`` allows the user to provide a configuration file
+    * ``--verbosity`` allows the user to set the global maximum verbosity on a scale of 0 (trace) to 6 (fatal)
+
+Non-Option Arguments
+    Arguments that do not start with one or two hyphens are called non-option arguments.  They are parsed in two ways, and made available through the ``main-app`` class:
+
+    * Keyword arguments have a key and a value separated by a ``'='``.  They're merged into the global configuration, and they are also made available in a map-like structure, ``main-app.nonoption_kw_args()``.  The syntax options are:
+ 
+        *    ``key=`` (NULL value)
+        *    ``key={true|false}`` (boolean value)
+        *    ``key=string`` (string value)
+        *    ``key=[numeric]`` (numeric value, either integer, unsigned integer, or float; scientific notation, e.g. ``1e7``, is allowed for floats)
+
+      The key can be a simple string, which indicates a key/value pair in a flat map, or it can indicate a value within a nested hierarchical structure of maps and arrays.  The only requirement on the structure is that the top level is a map with a string key.  For example, the keyword argument ``key_one.2.key_two=true`` would indicate the following structure (using YAML notation for convenience)::
+
+        ---
+        key_one:
+            - NULL
+            - NULL
+            - key_two: true
+
+    * Ordered arguments have a value (NULL, boolean, string, or numeric) but no key.  They are not merged with the global configuration, and are made available in an array-like structure: ``main_app::nonoption_ord_args()``.
+
+Creating an Application
+-----------------------
+
+Several examples are included below to demonstrate how one can create an application using Scarab.
+
+CLI Library
+###########
+
+Scarab uses the CLI11 library to do command-line argument parsing.  The ``CLI::App`` class has been typedef'd as ``scarab::app`` for convenience, and there is a derived class ``scarab::main_app`` that takes care of parsing the non-option arguments.
+
+Here are some useful resource for learning how to use the CLI11 library:
+
+*  `GitHub repo and README <https://github.com/CLIUtils/CLI11>`_
+*  `User manual <https://cliutils.gitlab.io/CLI11Tutorial/>`_
+*  `API reference <https://cliutils.github.io/CLI11/index.html>`_
+
+The simplest example
+####################
+
+::
+
+    #include "application.hh"
+
+    using namespace scarab;
+
+    int main( int argc, char **argv )
+    {
+        main_app the_main( false );
+
+        CLI11_PARSE( the_main, argc, argv );
+
+        return 0;
+    }
+
+In this example we create the app (``main_app``), parse the CL input, and then return.  Note that the ``main_app`` constructor 
+includes a single argument, passing ``false`` to disable the use of a config file.  
+
+Example with a callback
+#######################
+
+This example captures the behavior of the application in a class, and then runs the ``execute()`` function with a callback.
+
+::
+
+    #include "application.hh"
+    #include "logger.hh"
+
+    LOGGER( testlog, "test_app_with_callback" );
+
+    namespace scarab
+    {
+        struct do_a_thing
+        {
+            do_a_thing() : f_value( 5 ) {}
+
+            void execute( const main_app& an_app )
+            {
+                // configure to run
+                f_value = an_app.primary_config().get_value( "value", f_value );
+
+                // do a thing!
+                LPROG( testlog, "My value is: " << f_value );
+
+                return;
+            }
+
+            int f_value;
+        };
+    }
+
+    using namespace scarab;
+
+    int main( int argc, char **argv )
+    {
+        main_app the_main;
+
+        auto t_dat_callback = [&](){
+            do_a_thing t_dat;
+            t_dat.execute( the_main );
+        };
+
+        the_main.callback( t_dat_callback );
+
+        CLI11_PARSE( the_main, argc, argv );
+
+        return 0;
+    }
+
+Note that in the ``main_app`` constructor we did not pass an argument as we did in the previous example.  
+In this case we use the default value, which enables the use of a config file.
+
+
+Example with subcommands
+########################
+
+This example uses a class with two functions that are implemented as subcommands called by callback.  Note that ``app.fallthrough()`` is used in the main function to allow non-option arguments to be collected by the main app.
+
+::
+
+    #include "application.hh"
+    #include "logger.hh"
+
+    LOGGER( testlog, "test_app_with_subcommands" );
+
+    namespace scarab
+    {
+        struct get_or_set
+        {
+            get_or_set() : f_value( 5 ) {}
+
+            void setup_subcommands( main_app& an_app )
+            {
+                app* t_sc_get = an_app.add_subcommand( "get", "Get the value" );
+                t_sc_get->callback([this]() { this->get(); } );
+
+                app* t_sc_set = an_app.add_subcommand( "set", "Set the value" );
+                t_sc_set->callback([&an_app, this]() { this->set( an_app ); } );
+
+                return;
+            }
+
+            void get()
+            {
+                LPROG( testlog, "Value is: " << f_value );
+                return;
+            }
+
+            void set( const main_app& an_app )
+            {
+                f_value = an_app.primary_config().get_value( "value", f_value );
+                LPROG( testlog, "Just to check: " << f_value );
+                return;
+            }
+
+            int f_value;
+        };
+    }
+
+    using namespace scarab;
+    int main( int argc, char **argv )
+    {    
+        main_app the_main;
+        the_main.require_subcommand();
+        the_main.fallthrough();
+
+        get_or_set t_gos;
+        t_gos.setup_subcommands( the_main );
+
+        CLI11_PARSE( the_main, argc, argv );
+        return 0;
+    }
diff --git a/Src/Scarab/documentation/cpp/Doxyfile b/Src/Scarab/documentation/cpp/Doxyfile
new file mode 100644
index 0000000..b95077a
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/Doxyfile
@@ -0,0 +1,1534 @@
+# Doxyfile 1.5.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME = $(PROJECT_NAME)
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER = $(PROJECT_NUMBER)
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = $(PROJECT_BRIEF_DESC)
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+PROJECT_LOGO           =  $(PROJECT_LOGO)
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = ./user_doxygen_out
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING = 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST = YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+#
+INPUT = $(DOXYGEN_INPUT) 
+
+
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py *.f90 *.f *.vhd *.vhdl
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE = $(DOXYGEN_EXCLUDE)
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX = KT
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET = 
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION = 
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
+
+GENERATE_TREEVIEW = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = YES
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the
+# mathjax.org site, so you can quickly see the result without installing
+# MathJax, but it is strongly recommended to install a local copy of MathJax
+# before deployment.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH = $(PREPROC_INCLUDE_PATH)
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME = 
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = NO
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = NO
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 2
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP = YES
+
+#---------------------------------------------------------------------------
+# Options related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE = YES
diff --git a/Src/Scarab/documentation/cpp/README.md b/Src/Scarab/documentation/cpp/README.md
new file mode 100644
index 0000000..e2c63b6
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/README.md
@@ -0,0 +1,57 @@
+# Scarab/documentation
+
+This directory contains the files necessary to setup automated documentation for a C++ project.  
+If you are here for that purpose, rather than looking at Scarab-specific documentation, ignore files that start with `Scarab_`.
+
+The documentation system will create a documentation website hosted and automatically generated by readthedocs.org (RTD).
+You will be able to access the documentation at these URLs:
+* www.project8.org/[github repo name]
+* [RTD project name].readthedocs.io
+* [RTD project name].rtfd.io
+
+The software stack used to generate the documentation is:
+* Doxygen -- C++ source parsing and API website generation
+* Sphinx -- Python-based documentation website generation
+* readthedocs.org -- Website generation and hosting
+
+
+## Instructions for setting up documentation for a C++ project.
+
+### In your project repo
+1. Create a documentation directory.
+1. Copy into it the files `index.rst` and `conf.py`.  You do not need to copy `requirements.txt` or `Doxyfile`.
+1. Create a `doxfiles` or `DoxFiles` directory in your documentation directory, and copy `doxfiles/mainpage.dox` into it.
+1. If you have rst documentation files, put them in the documentation directory; otherwise it's recommended to create a placeholder rst file for use or descriptive documentation.
+1. Put the filename(s) for any rst documentation files (minus .rst extension) in `_index.rst` after the initial lines defining the table of contents.
+1. Customize `index.rst` and `conf.py` with the name and description of your project.
+1. Customize `conf.py` with the relevant directories in your project (`DOXYGEN_INPUT`, `DOXYGEN_EXCLUDE`, and `PREPROC_INCLUDE_PATH`).
+1. If you have a favicon file, put it in the documentation directory and specify it in `conf.py`; otherwise comment out the `html_favicon` variable in that file.
+1. Recommendation: don't merge these changes into the main branch just yet; test the creation of the documentation (described below) first.
+
+### On readthedocs
+1. Create an RTD project for your software project by importing from GitHub (this will automatically create a webhook directed to RTD).
+1. As you change each settings in each category below, be sure to press the Submit button so the changes are saved.
+1. Under Admin:Settings, change the programming language to C++.
+1. Under Admin:Advanced Settings:
+    1. Specify the location of the requirements.txt file (in Scarab) under "Requirements file".
+    1. Specify the location of conf.py under "Python configuration file".
+    1. Specify the branch where your documentation currently resides as "Default branch".
+1. Under Admin:Maintainers, add Noah as an additional maintainer so we can maintain access if you're unavailable.
+1. Under Builds you should see the `latest` build building.  Once it's done, check the documentation to make sure it worked.  If it worked great, carry on. If not, go back and fix whatever's wrong.
+1. Under Admin:Advanced Settings, switch the "Default branch" to `main`.
+
+### In your project repo
+1. Merge your changes to the main branch with a new release; this should trigger a new build of the documentation, which you should then go and check.
+1. If it doesn't already exist, create an orphan branch in your repo called `gh-pages` and clear it of all files.
+1. Populate the `gh-pages` branch with an empty file called `.nojekyll` and the following in `index.html`:
+    ```
+    <html>
+        <head>
+            <meta http-equiv="refresh" content="0; url=https://scarab.readthedocs.io/">
+        </head>
+    </html>
+    ```
+    with your RTD project name replacing `scarab`.
+1. Commit and push `gh-pages` to GitHub.
+1. In the settings for your repo, under GitHub Pages, make sure that the Source drop-down menu has `gh-pages` selected.
+1. Check that if you go to `http://www.project8.org/[github repo name]` it redirects to the RTD documentation.
diff --git a/Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst b/Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst
new file mode 100644
index 0000000..9525ea3
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst
@@ -0,0 +1,2 @@
+Scarab/CMake Overview
+=====================
diff --git a/Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst b/Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst
new file mode 100644
index 0000000..50d433c
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst
@@ -0,0 +1,34 @@
+Scarab/Library Overview
+=======================
+
+* Utilities
+* Logger
+* Param
+
+  * Core Param classes
+  * Codecs for translation to/from various data-storage standards
+  * Application configuration
+
+* Authentication
+
+Build Options
+-------------
+
+* Scarab_BUILD_PARAM 
+ 
+  * Build the core param and application configuration classes
+
+* Scarab_BUILD_CODEC_JSON
+
+  * Build the JSON codec
+  * Requires Scarab_BUILD_PARAM
+
+* Scarab_BUILD_CODEC_YAML
+
+  * Build the YAML codec
+  * Requires Scarab_BUILD_PARAM
+
+* Scarab_BUILD_AUTHENTICATION
+
+  * Build the authentication class 
+  * Requires Scarab_BUILD_PARAM and Scarab_BUILD_CODEC_JSON
diff --git a/Src/Scarab/documentation/cpp/conf.py b/Src/Scarab/documentation/cpp/conf.py
new file mode 100644
index 0000000..1a2f852
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/conf.py
@@ -0,0 +1,317 @@
+# -*- coding: utf-8 -*-
+#
+# Monarch documentation build configuration file, created by
+# sphinx-quickstart on Thu Apr 23 11:11:03 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# Customize the following:
+#  * the doxygen-related environment variables
+#  * the project, copyright, and author variables
+#  * the arguments used to assign variables htmlhelp_basename, latex_documents, man_pages, and texinfo_documents
+
+import sys
+import os
+from subprocess import call, check_output
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# version
+this_version = 'v?.?.?'
+try:
+    this_version = check_output(['git', 'describe', '--abbrev=0', '--tags'])
+except:
+    pass
+
+# environment variables used by Doxygen
+os.environ['PROJECT_NAME'] = 'Scarab'
+os.environ['PROJECT_NUMBER'] = this_version
+os.environ['PROJECT_BRIEF_DESC'] = 'Project 8 C++ Utility Library'
+# located in your documentation directory, or give the relative path from the documentation directory
+os.environ['PROJECT_LOGO'] = 'scarab_logo_small.png'
+
+# directories in which doxygen should look for source files; if you have a `doxfiles` directory in your documentation, that should go here; string with space-separated directories
+os.environ['DOXYGEN_INPUT'] = 'doxfiles ../../library'
+# directories within DOXYGEN_INPUT that you want to exclude from doxygen (e.g. if there's  a submodule included that you don't want to index); string with space-separated directories
+os.environ['DOXYGEN_EXCLUDE'] = '../../library/param/codec/json/rapidjson ../../library/param/codec/msgpack/msgpack-c ../../library/param/codec/yaml/yaml-cpp'
+# directories outside of DOXYGEN_INPUT that you want the C preprocessor to look in for macro definitions (e.g. if there's a submodule not included that has relevant macros); string with space-separated directories
+os.environ['PREPROC_INCLUDE_PATH'] = ''
+
+# Doxygen
+call(['doxygen', 'Doxyfile'])
+call(['mv', './user_doxygen_out/html', './_static'])
+
+
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+if on_rtd:
+  html_theme = 'default'
+else:
+  import sphinx_rtd_theme
+  html_theme = "sphinx_rtd_theme"
+  html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Scarab'
+copyright = u'2018, Scarab Authors'
+author = u'Project 8 Collaboration'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = this_version
+# The full version, including alpha/beta/rc tags.
+release = this_version
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+html_favicon = 'favicon.ico'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Scarabdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+  (master_doc, 'Scarab.tex', u'Scarab Documentation',
+   u'Project 8 Collaboration', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'scarab', u'Scarab Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  (master_doc, 'Scarab', u'Scarab Documentation',
+   author, 'Scarab', 'Utility library for Project 8 C++ Software',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
diff --git a/Src/Scarab/documentation/cpp/doxfiles/mainpage.dox b/Src/Scarab/documentation/cpp/doxfiles/mainpage.dox
new file mode 100644
index 0000000..ccb2455
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/doxfiles/mainpage.dox
@@ -0,0 +1,5 @@
+/*!
+ * \mainpage
+ *
+ * Go to the <A HREF="../index.html">main documentation page</A>.
+*/
\ No newline at end of file
diff --git a/Src/Scarab/documentation/cpp/favicon.ico b/Src/Scarab/documentation/cpp/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4c6c946ac7f5fc0f1dfadc3629ddcdf84ef9bad7
GIT binary patch
literal 1150
zcmb7EOG_J36ut#vbR*(xBL$cK5Er5~Mv9G(y|@rv=)#4oK9Cf5D$)|WsG=ZNCB7dq
zi3m2KT9P=#sI7&@gg$IdREVN}J!j(e5uCBk@XeX~o$ot$?md?g;t}0hS%RL0q9IL)
zd?7>;fhb~<JOv>rmwJT`fm8%z7yrej`s8?c?YHJv|DI!mz`W$7#whkJN74Ll3z?>I
zWR{Pi(G~)8Mjn~#b?o7(H2|f;0j1<a5+;Yn^(=%9Yi!0ZQ1QZp{JItLJIOni1ik0g
zuE6x%1J=m7ZbtRs9G`xiqPX3QbhAr?QaS;K9COYaJppTPdR@E6Xd4K@6G_0_;k(i+
zPiDc8eshN(tKo#Eb$&g*Rb%PP5eB`#V0v}!&#^eckpA+QJ`9m&ar^L=SANUL=Y6#H
z?;xYnMeAQe?z08t5%`_CmiIdtS>M0YD{ENo-|)D0`g-p#dr(j_1*?76(91Qre+|9V
zKiRv>Sl{E<a&jKM*iAj=9$7m5P|Bt>RK4~gNF3+%e3EbOQ!x{aVLT8=w#AK{YBxrG
zG0bho(PUHa^>@vOVRJ{Z{__;}jRQ=oF|5(KV6JQayP@9`Il&ueL|5~cav%2+y7|DL
WGu`va>*Ia#lSZzUW9t9lq2qsK=T3+K

literal 0
HcmV?d00001

diff --git a/Src/Scarab/documentation/cpp/index.rst b/Src/Scarab/documentation/cpp/index.rst
new file mode 100644
index 0000000..75062ae
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/index.rst
@@ -0,0 +1,12 @@
+Scarab Use and API Documentation
+================================
+
+.. toctree::
+   :maxdepth: 2
+
+   Scarab_LibraryOverview
+   Scarab_CMakeOverview
+
+.. end of toc
+.. (you must not remove or modify the above comment line, it is required by the API Doc generation)
+`Full Doxygen API Reference <_static/index.html>`_
diff --git a/Src/Scarab/documentation/cpp/requirements.txt b/Src/Scarab/documentation/cpp/requirements.txt
new file mode 100644
index 0000000..d6497e6
--- /dev/null
+++ b/Src/Scarab/documentation/cpp/requirements.txt
@@ -0,0 +1 @@
+sphinxcontrib-contentui
diff --git a/Src/Scarab/documentation/cpp/scarab_logo_small.png b/Src/Scarab/documentation/cpp/scarab_logo_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..7212aeb6a03a107a06d4eaed0c869403797a1211
GIT binary patch
literal 4236
zcmV;75OeQ|P)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;sFy8EDXi>FDd{45E)5C
zK~#9!?VNdZRArjRf8V{gwxlYRJ%mNUKoHqMngG&DBX%S9$l?ZP?6zB68Ew&NdR)47
z6qnKNaX?(!ahKx;$|j<sz$n-Xh)A>3LRdoxS!=mfb+`GWLP$teNJ3Ri`tY4oC+FO{
zxplwizRUAI-}_x*`F2^H9jzYHSqRPocox930Ln7k-kO72UJA0(erGGogsLmp{?0s*
z<%C=^VY7|YRPo_&e~K$BmvM8J;qaulE9}BGm3%gHBEjQF=`?5*2+@u#&@dQ0;}OO^
zvm7npW8>U=L1{;pD9P+u`Wg{m6=UZvW%Q$OfUdW*7-;BtyYv8{WWyQ|ayxQeg+0q&
z2T3BMYtMv%mrxf55VDLO(ZMo-_Czl&j7S(E6oi!6yqVxEEXW@`0?TNB`NJ|zQgS*$
z`v%aW@6<anoA8jZud*4>A;xVrW8&fJ^0?ob8VtJm0kEw03?O6-9DyW*;rGP^c=5F(
ziTJAGKLQKBe`z-1>WaE!TF}SFx%V|06m&Jf;;EysVgY0tSO(;e_<08)(rSRz{Cxb!
z4%Awc07Ue!BL!!c7kfr_JU`?8N#}FH)H`u_GwTl9QalWrem@^f>VpwhV+V7$7w<XU
z5Ozny-vok35902U2U<Ac(-p}O6OL?HjlX0+g;Q>3$<>3gd(uEasNxvo-~1Y<!`0}2
zw4k34e{&I+zw#xHRL@E9E$R}IrUqE{s}W3i`3oFrjd^B7*Z6SiP+VDgU_~wW@)tkn
z&^IfIR8>+q@i!f#l<Pe5=j>a#fQ45SVCW&#ic-|_Qc^p0iwT~gMfl*Vp%@V}3ZAS`
zy?Zm?KYAnIKRz9`^dJZcTZ$XY6fB-PoQS`=(RJ*Kjhw#2P|J^^R+OTLR2EMg#`d@8
zQFzU*9jF%8BBXaeA4yi~g0>_pT=wk8v1yts6$HpOK|~Gk_a|><(;u&;YR3kuwy)=J
zcU;QO=kEncM#vUs1neGf%xjH)bUs41)x}&%QOM}o7b4*f1R!9U2Gmwdrmit;=96H=
zNzb~*Rg1PDgka5eL#WvNC6e8F5@3gu(sdv5$rS}iz~qI0i%&DPFr)5!4y)d8Sw`}B
zRnh=74FeEZra{jM*VE-EW1F}OiQtjFq@&_UbH+W*ndT&2(om1=1u1@|liPndy|2El
z4#W-#;E9`8oGA>t>*@H#yO5~b`VAXqO+?t8r_XveJKsHgJ>}o7iq8#&px;e@#No}V
z^MH<Lfw~TsMXyQI!FMb^>nT0Jw-5X)vcuW@n^x?6|Jcp=_HB=UlCP4&t8T$EO*A#o
zq{X&B03``s4G{51D7bV=eCtc`u=S}KD5=gC|Ag#xvgNUxz?~7-3VV&8Mz}^pSAz*J
z;gSrXj1~&u&d<TowO148IjGpOGfq|A_;czA96Sbr>iF*N@siW0H@fQYXcj1Ar~z{O
z7eP1>|GYp2qyD-GPuHGk2KY3KnutYJ*rGgSQC9mY4_Q=(qu=>73(d4h$?i<i|GWcI
z6T)anC9BV1^iTlg<V;mbnhS>lxN<tjr!GzxHG8(Q{exF2J#-jdvl>~MsAF?rSkVta
z*Z_Z7CHj)r>7zJE?>h|CK+GCACA%|v5@TTU091q6-I-vTF*)Mb|2dugYd*#9b~FI1
zd7>GZ;UFdJS8-tV3OWxT&B*(nL$=vZ0nkMDWJa^FWpyAI76Mb(kWQTt5IkPO2UGe{
zvhj;L@Xln|QXQ0S-N2%22I4zh+<1a^IjP!iasafzvaANx06-+@=cAj)A`}~mot1^8
z*!c9034{U-Wi(5V68es1fhQ`oP@n;YSu%BKv_4MK5VFkD>n@Czk+q&+g+d@Kl4XWT
zb76o;O?fT<5>)Qlifng~?4dXvl&oJJy$4AmTys3Rgd<5x0+M1QSau}3&~CT$**#Ne
ztFiWx8DO)6Boiz@8a2KItpm3WfQEtH?WJtn2C%#F74JsKZP!I2I~6K+YyyXiid~zL
zohcp6h4l!o?0f>HH4v;KaCASCVrw%1g(MRyF9jh{vAdX*tUS;n9f$`S2CnQpY^hMP
zVKruwZoWw|LyJ(c>Hkn%;O^W#X#gh8uQChzA|#oz?HjN;Q`#Ir#o?lK%hyOYnbf?l
z$+PyPb*Q>?S#o7}!Zp=c7P!(pn0lnHG)pus6XIkwBiWs(Rn-W<mg-{C@`K<n?*IS_
z5iQ+LWIVeAv<Tnce>MKS+Z(i$2|%|%Ge9*g%og5-B)}yL>@vurVT!N}4Nv#J40-fD
zgwqA#&`E|bq=Y`b!~rPDeDZJO@g3Yx;ly9l|AtwJ)O6P0b`k2){VlteHxJX$F?6%`
z(h{=G231E}bQwoR9!0Ng1ht0kZ_Q!b+b@ukmC1xx*Me!Z9{|JtYCgL05{BINFpAT`
zy4iOi*(B0)^RW4kw@eAKOvvsY`@6E@mI<SliI$p4by*pPW-#oI*|>7@`Ref*jDP-9
zT$#CN%n#2PK+`Z-eC;6mUw=2fCfx{@g%+q`<=vBT_{vaPnx;$>a(cwzZ32$(Z<%aU
zD}$+yOve6Y0nW@^uq+O&S;{wm`FAG1y9t{s^+(LY?sQiF;aV~Z2hi*4TceY=ENm$r
zE}y@x<>1v<BVwc5atkpuCcL`~XL@$s{hc#*GM$Sq<@0-{fZO}y0r-!1=b@G#Wz5`<
zV=P=p(1W2?+>xm5FO1>ZwA|gyumORRQ;5FCsK?#|EVjS=_>Tl&iihw1cQ(By-vqwn
zjdj008)J5<HN$3NXGzO!RlJgHf{M*wH2%VOjKWFN**bp?oI#b;Y5>3b)2|UgYIc5u
zi3Q4|eK2at0fgMj09{qm5G)~LKBVSJToS>OVnUT=1S*a-xTZU|3qpdm58c?tNyL@P
z!tv)4sWzClc7GkuGA)xO*A2zeHPSLOv8k1`(hR|q4ffg!MhijBu~vpt3r%rR?F%5u
z3Rk|j`J~mjvv_-CHZ~Vr^~nJUscmC{-^{)RNs{UL%YT9TZ4-)ut_JaR=|Q;W48Q}7
znlg?bD(3j1Vj@+?S|6l@Ko6^=<m97kVXXSQ2h?hMPo9cocd+WNiEZG*u2j^DW0Y)I
zgP}(#yz;kDuWiDTWMrF-aW8&OzhC|Sj9MyG9fS}FAqeZOXIhqNaNhW7jDK}44o^nI
z4t+zXaME=2P?+j{JMbOe2Py6Zt1*fVgy8GPW>C86OVmmqjx;CvLoXq{_h5*G8YBQM
zsDTzCv+srcU>L0q&_+GX&ZK6r44w4C!C>k{YAT3Smf_0CImyJj6>#2VQ#kO&hpf2e
z7bq?V`4^6%=-y`#vT|A#C%y%`(>S(uJ*)1X%v%@tK*%yffA<8#@0m@+A7bc?M@|6`
z%&KxEJLvvuJm>Xmb+^6%^m<IjFk3@lP5@|;*5d+9HHe{GgeuBTVOwDa+%SuXFHGO5
zw^Q^V^H7{l-Wl7Al`|$#vgwQX?ITTD;GtEE2$bw+=<N^V?Kc`il~`Jsg%kTT@a8|@
z%E@mS|A25!1(MB<7WAX!6tp@7o>&5^zp&mq78qqe&VoUN4(>#8DA7)S(U2<Hy_pov
zdV-Df9$?D*Tj@M}EW_@9otho%IJ$Wqk&oWw+>3u1lU~IIu<Nj&oum@}Xb=xpRp9QF
z&-s&XYy{qkj3)rY(0~w1s=LwBW^+bRYY3JAd|`_;N6R5pT=u#eMhGc(m1CN8A9po-
zmc35R{@r-H_Xht_(z+Fp)~z54TpR^QYEqhNaHhnz*Zzy~FReMP9Q60so&w9jk(t*z
zaUzDc)!H~{^JD-z#h<*}G!Zv+#?4vA*7;927C)N!zvercY4VeqPsQ(bsrPITulpFZ
z2;RaWt#Z7Wg-9zCaazxTplfV<=b2LiLri6aQ4hS(BB?8(l78J5S0M-<-iN!OFP7Od
z7Z!1(gx09omSy589E4V08Z}|7_8t?ch9?w2IU@%INH#mw#k<KKbTNk7GA<alnsV)y
z3JDQ1`xa5YYcsMlx~T8zT0kNZOelcD&=IxUT({2uZ=5}faAdS><8>ese{un>WfPYa
z8P9-ADgJC>T^twgv_wuh@c>%2Qq=LCyD+Qw(&>^ZEmBd;1iDwJOD038oV}lZTpL*g
zQi8X8B^E$g!IjymHXhn3UcHpO(N|zbLW%p07E~a)qpsl4m&<W@qt%ckyATO(v`p-}
zuw^mwzIoAo8A7o4qc`#N8&k`_PCuGc@~X{Dkfx@SS#&vjSIkF95|(LDH0#eKdL(>d
z-CH;iTkU4S<2$$G+wm3se*fGV$G;OJ)J$Pvz^rEpANhg9-+UcSaCRqoBQ9(I01{To
zzF;U=7WPyJyOz8{_Jw0H)YH3hb8<v;@H5m9S%WWT$ATAdq(!r@_ncm_`>5L;fWXLy
zUyCXkz`m6WAtjqZ559cb<k6h?CYq6G&cE$pMEW`WuzY@<q%~&l(qv3ENxd;@fMIt$
ziV+DT+w82LeFK^OFKXQ)QwxU{2$6ruReby8bdaLG+Wn^81!}MZ0SI&*Gm);N#)Bkr
zXx$1(aWnF-tK(7{)o4C{sg782t+i;*a)djLgI_L3l4Lp!xrpA=?o8SPOJ3Kb7GcB#
z&y$kV4J?Z-&p(JOyEC~XufRHG>w_SwKsR?7W^4wKIbbyIZaw*7(MuSS2o7%!7d`X}
zgw+lRAV4_8xVek5yS*G*`w>VIeP%w5GpnIW)8gfF(NM7lkW<|B|I@1=1iRjU5yjzT
z+`MH8eaTMS11JQtBy-twEASmTf+Yl~0g7Jv9>sNX?LjwNzR{*WfRf$GMQ{Bhnq?I`
zfn!IwY~BiNc4yLhquU0+S`h8tEQAER7rYQX<}YK^TYFGay<nNGD&KT7>b8>I$>?|Y
z)``9cR=tm@gDbCV(!pyR0Bhq@ZvP9}^2Xeg$Na|_^~QH(4ftt`MFIf7X5sBMkkM~%
z1AkeaZEl!zFDbb>wAHJp+6F*fW9aXmKyfOV^)o=wN55ImGUn+;X#VCG`I<k>*eBm%
z(1UM6(BGi`m1TwDGymLRxiy)i&E8QbD>f`$2bZf+BT{<T0<QgdH~#XYe17{c2-O6U
z9THOQ+c!*8#|RnNQ|(;(;wn7p*|m%I4Xw;{I5ABFcbD^$wzca=1JIS8jiyF8_~`=9
z9dl*l30fBJ%sj4qe;WvaZ|`=(HPP2U+1*~!diIavRVPO^?jNk)wgEj9#-8eKt7)|z
zfWq!1{k#J9tz5vlKbu6{MdR9qY){t$JQSQfe!BO*NP^u<U&WQ3i{eg8I(=!|7zkh*
z47ueYs*86f=lumjqVk7r^uK;)>?PL@51?g{)qgmls+#0XPzZcS4s!0eYuYUSwJm^v
zWP#%HCRCxW@A?8K!qD4tN=e*k6KD8J_T$RTMTzkevNJMp)1Z9UX0rPX{pSYopKY9d
illfTy&jQ$?$NvKvUz9eZ&zjW$0000<MNUMnLSTYOA|u8C

literal 0
HcmV?d00001

diff --git a/Src/Scarab/documentation/package_builder.rst b/Src/Scarab/documentation/package_builder.rst
new file mode 100644
index 0000000..5d961e9
--- /dev/null
+++ b/Src/Scarab/documentation/package_builder.rst
@@ -0,0 +1,336 @@
+Package Builder
+===============
+
+What is the Package Builder (PB)?
+---------------------------------
+
+Package Builder (PB) is a framework built on top of CMake for putting together software packages that specializes in nesting packages.
+
+PB is implemented in a series of CMake macros that standardize how things like building a library, or building an executable.  
+Part of the motivation behind PB is to simplify the process of making a software package.  
+
+While CMake is extremely powerful, it has a lot of options for how to make a software package, 
+and those choices can make the process more complicated.  PB tries to find a particular balance between how complicated or 
+simple it is to build a package, and how many choices are left available to the user or are made by PB.  
+For cases not handled by the vanilla PB interface, the user always has the option to use the raw CMake interface.
+
+Submodules
+^^^^^^^^^^
+
+The nesting infrastructure in PB assumes one is using git submodules, or something similar.  
+It assumes packages will use submodules for internal (i.e. within the same codebase) dependencies.  
+For example, the Scarab package in which PB lives is the base utility package for all of the C++ packages used by Project 8, 
+and Scarab is included as a submodule (or as a nested submodule) in all of the organization's C++ packages.
+
+
+Requirements
+------------
+
+PB requires CMake v3.12 because it uses FindPython3.
+
+
+Basic Usage
+-----------
+
+This section will explain the basic usage of PB by setting up an example software package called Insecta.
+
+
+Package Structure
+^^^^^^^^^^^^^^^^^
+
+Since Insecta is a PB-based package, it requires Scarab.  So Scarab should be setup as a submodule of Insecta.  
+The file structure should look like this::
+
+    Insecta
+    |
+    + Scarab
+    |  |
+    |  + cmake
+    |  |  | . . .
+    |  |
+    |  + library
+    |  |  | . . .
+    |  |
+    |  + CMakeLists.txt
+    |
+    + Source
+    |  | . . .
+    |
+    + CMakeLists.txt
+    
+Note that the Scarab directory listing is incomplete, and there are probably going to be more files and directories in Insecta as well.
+
+
+Install Structure
+^^^^^^^^^^^^^^^^^
+
+PB uses the variable ``CMAKE_INSTALL_PREFIX`` to control where headers/libraries/binaries/etc are installed.  
+The default install prefix is set to ``${PROJECT_BINARY_DIR}``.
+
+A number of different types of installed files are handled specifically by PB:
+
+- Headers are installed in ``<prefix>/${INCLUDE_INSTALL_SUBDIR}``
+- Libraries are installed in ``<prefix>/${LIB_INSTALL_SUBDIR}``
+- CMake package configuration files are installed in ``<prefix>/${PACKAGE_CONFIG_SUBDIR}``
+- Executables are installed in ``<prefix>/${BIN_INSTALL_SUBDIR}``
+- Runtime configuration files are installed in ``<prefix>/${CONFIG_INSTALL_SUBDIR}``
+- Data files are installed in ``<prefix>/${DATA_INSTALL_SUBDIR}``
+
+Default subdirectories are:
+
+- ``INCLUDE_INSTALL_SUBDIR``: ``include/${PROJECT_NAME}``
+- ``LIB_INSTALL_SUBDIR`` (non-Windows): ``lib``
+- ``LIB_INSTALL_SUBDIR`` (Windows): ``bin``
+- ``PACKAGE_CONFIG_SUBDIR``: ``${LIB_INSTALL_SUBDIR}/cmake/${PROJECT_NAME}``
+- ``BIN_INSTALL_SUBDIR``: ``bin``
+- ``CONFIG_INSTALL_SUBDIR``: ``config``
+- ``DATA_INSTALL_SUBDIR``: ``data``
+
+
+Initial Setup
+^^^^^^^^^^^^^
+
+The initial part of the CMakeList file should be setup as follows::
+
+    cmake_minimum_version( VERSION 3.12 )  # Minimum CMake version mentioned above
+    cmake_policy( SET CMP0048 NEW )  # Package version to be specified in the project() command (optional but recommended)
+    project( Insecta VERSION 1.0.0 )  # Setup the package.  Package name is `Insecta`
+
+    list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )  # This is required so that PB can be included
+    include( PackageBuilder )  # Loads the PackageBuilder.cmake file
+
+    # Create options or set options from submodules
+
+    # Find other dependencies
+
+    pbuilder_prepare_project()  # Processes PB options
+
+    pbuilder_add_submodule( Scarab Scarab )  # Insecta will use the Scarab library.  See below for more details on this macro.
+
+Building a Library
+^^^^^^^^^^^^^^^^^^
+
+Depending on the size and organization of a project, the library definition might be in the main CMakeList file, 
+or it might be in a subdirectory with its own CMakeList file.
+
+Directory inclusion should be setup in the main CMakeList file::
+
+    include_directories( BEFORE Source )
+
+The remainder should go wherever the library is being defined::
+
+    pbuilder_use_sm_library( Scarab Scarab )  # This library depends on the Scarab library;
+    # The first argument is the submodule name
+    # The second argument is the target name for the library
+
+    set( PACKAGE_LIBS )  # If there were other libraries in this package on which this library depends, then they would be put in this variable
+    set( PUBLIC_EXT_LIBS )  # If there were public external dependencies, the targets would go here
+    set( PRIVATE_EXT_LIBS )  # If there were private external dependencies, the targets would go here
+
+    # It's convenient to put the header and source files in their own respective lists
+    set( Insecta_HEADERS 
+        file1.hh
+        file2.hh
+    )
+
+    set( Insecta_SOURCES
+        file1.cc
+        file2.cc
+    )
+
+    # This function adds the library, sets the include directories as a target property and links the library.
+    pbuilder_library( 
+        TARGET Insecta 
+        SOURCES ${Insecta_SOURCES}
+        PACKAGE_LIBRARIES ${PACKAGE_LIBS}
+        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS} 
+    )
+
+    # If the build does not actually use components, but this function is being used multiple times in the project (we'll use it below), 
+    # then specifying a component is required.  Here, since we're building the library, we'll call it ``Library``.
+    pbuilder_component_install_and_export( 
+        COMPONENT Library
+        LIBTARGETS Insecta
+    )
+
+    # Headers are passed as a list, so we pass the value of the HEADERS variable
+    # This function installs the headers
+    pbuilder_install_headers( ${Insecta_HEADERS} )
+
+
+Building an Executable
+^^^^^^^^^^^^^^^^^^^^^^
+
+CMake provides a flag variable ``${PROJECT_NAME}_ENABLE_EXECUTABLES`` that should be used to control whether executables are built.
+
+For the Insecta project, the executable section of the build (again, in its own file or in the main CMakeList file) looks like this::
+
+    if( Insecta_ENABLE_EXECUTABLES )
+
+        # Package libraries required by these executables
+        set( PACKAGE_LIBS
+            Insecta
+        )
+        # Public external dependencies
+        set( PUBLIC_EXT_LIBS )  # Public external dependencies
+        set( PRIVATE_EXT_LIBS )  # Private external dependencies
+
+        # Storing the relevant source files in a variable
+        set( Insecta_SOURCES
+            executable1.cc
+            executable2.cc
+        )
+
+        # All variables are passed as variables, not their contents
+        # This will create the executables and link it
+        set( programs )
+        pbuilder_executables( 
+            TARGETS_VAR programs
+            SOURCES ${Insecta_SOURCES}
+            PACKAGE_LIBRARIES ${PACKAGE_LIBS}
+            PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+            PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS} 
+        )
+
+    # If the build does not actually use components, but this function is being used multiple times in the project (we used it above), 
+    # then specifying a component is required.  Here, since we're building the executables, we'll call it ``Library``.
+    pbuilder_component_install_and_export( 
+        COMPONENT Executables
+        LIBTARGETS ${programs}
+    )
+
+    endif( Insecta_ENABLE_EXECUTABLES )
+
+Nesting with Submodules
+-----------------------
+
+PB was designed with submodules in mind.  It takes care of avoiding conflicts between repeated submodules (i.e. diamond dependency pattern).  
+It also avoids conflicting library names and include installation between packages with the same submodules, as is explained in the following sections.
+
+Submodules are added with a PB macro::
+
+    pbuilder_add_submodule( [submodule package name], [submodule location] )
+
+This macro will make PB aware of the submodule, and take care of determining the names and install locations as mentioned below.
+
+
+Repeated Submodules
+^^^^^^^^^^^^^^^^^^^
+
+Imagine a situation where Package A includes packages B and C as submodules, and both B and C include package D as a submodule.  
+PB defines which version of package D is used: whichever is encountered by CMake first.  So if A's CMakeList file includes this::
+
+    pbuilder_add_submodule( B B )
+    pbuilder_add_submodule( C C )
+
+then package A's version of D will be used.  It's up to the developer to ensure that the version of D is usable by packages A, B, and C.
+
+Library Names
+^^^^^^^^^^^^^
+
+PB manages library file names to avoid conflicts between libraries installed as submodules of different packages.  
+For example, if both packages B and C have package D as a submodule, they both would generate libD.so (assuming a system that uses .so libraries).  
+So PB renames the library file according to the parent packages.  If a user builds and installs packages B and C, 
+if they install to a common location, they will find these libraries:
+
+- ``libB.so``
+- ``libD_B.so``
+- ``libC``
+- ``libD_C.so``
+
+They could also separately build and install package D, which would build ``libD.so``.
+
+PB supports arbitrary levels of nesting for library names.  In the example in the section above, package A would build these libraries:
+
+- ``libA.so``
+- ``libB_A.so``
+- ``libD_B_A.so``
+- ``libC_A.so``
+
+
+Include Install Directories
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+PB manages include install directories to avoid conflicts between headers installed as submodules of different packages.  
+Headers from all submodules of a parent project are installed in subdirectories of the parent project's header install directory.
+
+Continuing the A/B/C/D example from above, the include directories would be structured like this::
+
+    <prefix>
+    |
+    + include
+      |
+      + A
+        |
+        + <A's header files>
+        |
+        + B
+        | + <B's header files>
+        |
+        + C
+        | + <C's header files>
+        |
+        + D
+          + <D's header files>
+
+Unlike with the library naming, the submodule include-directory structure does not follow the structure of the submodule nesting: 
+all submodules are setup as subdirectories of the top parent project's include directory.  Unlike with libraries, 
+which tend to be installed in a single directory (if using a common install prefix), header files are installed in 
+project-specific subdirectories of the ``include`` directory, so submodule include subdirectories will avoid conflicts by being 
+all within the parent project's directory.
+
+
+CMake Configure Scripts
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Please refer to the next section.
+
+
+CMake Configuration Setup
+-------------------------
+
+In modern CMake usage, package configurations for installed packages are discovered by loading ``.cmake`` files describing the installed package, 
+rather than by using ``FindPackage`` scripts.  PB supports the creation of CMake configuration scripts.  
+PB uses one of the standard configuration-file locations for installing the package-config files:  ``<prefix>/${LIB_INSTALL_SUBDIR}/cmake/${PROJECT_NAME}``.
+
+The package author is responsible for creating a configurable package-config file (apologies for the confusing wording).  
+The file is "configurable" in that CMake will customize the file using the ``configure_file()`` command during the CMake configure stage.  
+The user should include this in their main CMakeList file::
+
+    configure_file( ${PROJECT_SOURCE_DIR}/[project name]Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/[project name]Config.cmake @ONLY )
+
+Then the user calls a PB macro that will install the above configuration file, and create configuration files that 
+describe the version and targets of the package::
+
+    pbuilder_do_package_config()
+
+Here is an example of a simple package-config template file, taken from the PBTest package that comes with Scarab (in the ``testing`` directory)::
+
+    # PBTestConfig.cmake
+
+    get_filename_component( PBTest_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
+
+    # Find the dependencies
+    include( CMakeFindDependencyMacro )
+    find_dependency( Scarab REQUIRED PATHS ${PBTest_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
+
+    # Import targets if they're not already present
+    # This nested setup allows the import to be used both in the build tree (i.e. as a submodule) and after installation
+    if( NOT TARGET PBTest::@PBTest_FULL_PROJECT_NAME@ )
+        if( TARGET @PBTest_FULL_PROJECT_NAME@ )
+            add_library( PBTest::@PBTest_FULL_PROJECT_NAME@ ALIAS @PBTest_FULL_PROJECT_NAME@ )
+        else()
+            include("${PBTest_CMAKE_DIR}/PBTestTargets.cmake")
+        endif()
+    endif()
+
+For packages that include PB-based submodules, those are considered dependencies in this context.  
+In the above example, Scarab is a subumodule of PBTest, and it required to be found by PBTest.  
+It provides two path hints: ``${PBTest_CMAKE_DIR}/Scarab`` for occasions when PBTest has been installed, and ``@Scarab_BINARY_LOCATION@`` 
+for occasions when PBTest is itself being used as a submodule.
+
+The last section ensures that all of the expected library targets are present.  If they're not there, then usually the ``Targets`` 
+config file is included.  If, for some reason, the library target is present but not with the expected namespace, 
+then an alias target with the namespace is created.  For a project with multiple libraries, only one ``Targets`` 
+config file would be included, but multiple alias libraries would need to be created, one per real library.
diff --git a/Src/Scarab/documentation/python/README.md b/Src/Scarab/documentation/python/README.md
new file mode 100644
index 0000000..3bbd6cf
--- /dev/null
+++ b/Src/Scarab/documentation/python/README.md
@@ -0,0 +1,77 @@
+# Scarab/documentation
+
+This directory contains the files necessary to setup automated documentation for a python project.
+
+The documentation system will create a documentation website hosted and automatically generated by readthedocs.org (RTD).
+You will be able to access the documentation at these URLs:
+* www.project8.org/[github repo name]
+* [RTD project name].readthedocs.io
+* [RTD project name].rtfd.io
+
+The software stack used to generate the documentation is:
+* Sphinx -- Python-based documentation website generation
+* Breathe -- Sphinx extension for Doxygen (confirm that we actually use this?)
+* better_apidoc -- tool for automatically walking through python packages and generating rst files for the API (confirm that we need this one)
+* readthedocs.org -- Website generation and hosting
+
+
+## Instructions for setting up documentation for a python project.
+
+### In your project repo
+1. Create a documentation directory.
+1. Copy into it the file `conf.py` and `index.rst` and the entire directory `_templates`.
+1. If you have rst documentation files, put them in the documentation directory; otherwise it's recommended to create a placeholder rst file for use or descriptive documentation.
+1. Put the filename(s) for any rst documentation files (minus .rst extension) in `index.rst` after the initial lines defining the table of contents (above the line `better_apidoc_out/modules`).
+1. Customize `index.rst` and `conf.py` with the name and description of your project.
+1. Customize (if needed) the logic used to assign the `version` and `release` variables in `conf.py`. (Default is to derive values from git tags)
+1. If you have a favicon file, put it in the documentation directory and specify it in `conf.py`; otherwise comment out the `html_favicon` variable in that file.
+1. Recommendation: don't merge these changes into the master branch just yet; test the creation of the documentation (described below) first.
+1. The package `better-apidoc` is required for building the documentation, but if you add it as an optional dependency RTD won't install it. You have two options:
+    1. Create a `docs_build_requirements.txt` file (named as you please) which lists that package *and* configure RTD (under admin) to install dependencies from that file.
+    1. Add the following lines of logic to your setup.py file
+    ```
+        on_rtd  os.environ.get("READTHEDOCS", None) == 'True'
+        requirements = list()
+        if not on_rtd:
+            # requirements.append(<'the_name_of_first_required_dependency'>)
+            ...
+        else:
+            requirements.append('better-apidoc')
+
+        ...
+        setup( # this line will already exist, but it is shown to indicate where the next line goes
+            install_requires=requirements
+            ...
+        )
+    ```
+1. RTD is going to try and install your project and the automatic documentation of API docs expects to be able to import the package and inspect the contents. You need to ensure that the above works, which means either installing your dependencies or making them optional (at least for importing the package, obviously they can be required at runtime). In practice, you should see if your docs build and deploy and if not debug based on the output available on readthedocs.org site.
+
+### On readthedocs
+1. Create an RTD project for your software project by importing from GitHub (this will automatically create a webhook directed to RTD).
+1. As you change each settings in each category below, be sure to press the Submit button so the changes are saved.
+1. Under Admin:Advanced Settings:
+    1. Check the box to "Install your project inside a virtualenv using setup.py install"
+    1. If using one, specify the location of the requirements.txt file under "Requirements file".
+    1. Specify the location of conf.py under "Python configuration file".
+    1. Specify the branch where your documentation currently resides as "Default branch".
+    1. Deselct "Enable PDF build" and "Enable EPUB build" (we don't currently use these, if someone shows that are builds work we can turn them on, if there's a reason to do so).
+    1. Determine if you want to enable "use system packages" (this may depend on the install set for your package).
+1. Under Admin:Maintainers, add Noah as an additional maintainer so we can maintain access if you're unavailable.
+1. Under Builds you should see the `latest` build building.  Once it's done, check the documentation to make sure it worked.  If it worked great, carry on. If not, go back and fix whatever's wrong.
+1. Under Admin:Advanced Settings, switch the "Default branch" to `master`.
+
+### In your project repo
+1. Merge your changes to the master branch with a new release; this should trigger a new build of the documentation, which you should then go and check.
+1. If it doesn't already exist, create an orphan branch in your repo called `gh-pages` and clear it of all files.
+1. Populate the `gh-pages` branch with an empty file called `.nojekyll` and the following in `index.html`:
+    ```
+    <html>
+        <head>
+            <meta http-equiv="refresh" content="0; url=https://scarab.readthedocs.io/">
+        </head>
+    </html>
+    ```
+    with your RTD project name replacing `scarab`.
+1. Commit and push `gh-pages` to GitHub.
+1. In the settings for your repo, under GitHub Pages, make sure that the Source drop-down menu has `gh-pages` selected.
+1. Check that if you go to `http://www.project8.org/[github repo name]` it redirects to the RTD documentation.
diff --git a/Src/Scarab/documentation/python/_templates/README.md b/Src/Scarab/documentation/python/_templates/README.md
new file mode 100644
index 0000000..b1bfd33
--- /dev/null
+++ b/Src/Scarab/documentation/python/_templates/README.md
@@ -0,0 +1,3 @@
+better-apidocs uses the two template files in this directory to generate python package documentation.
+
+It is based on jinja2 and you'll have to go check their documentation for more details.
diff --git a/Src/Scarab/documentation/python/_templates/module.rst b/Src/Scarab/documentation/python/_templates/module.rst
new file mode 100644
index 0000000..fa154b5
--- /dev/null
+++ b/Src/Scarab/documentation/python/_templates/module.rst
@@ -0,0 +1,79 @@
+{{ fullname }} module
+{% for item in range(7 + fullname|length) -%}={%- endfor %}
+
+
+.. currentmodule:: {{ fullname }}
+
+Some template vars
+==================
+Members: {{ members|join(" ") }}
+Functions: {{ functions|join(" ") }}
+Classes: {{ classes|join(" ") }}
+
+.. automodule:: {{ fullname }}
+    {% if members -%}
+    :members: {{ members|join(", ") }}
+    :undoc-members:
+    :show-inheritance:
+    :member-order: bysource
+
+    Summary
+    -------
+
+    {%- if exceptions %}
+
+    Exceptions:
+
+    .. autosummary::
+
+{% for item in exceptions %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+
+    {%- if classes %}
+
+    Classes:
+
+    .. autosummary::
+        :nosignature:
+{% for item in classes %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+
+    {%- if functions %}
+
+    Functions:
+
+    .. autosummary::
+        :nosignature:
+{% for item in functions %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+{%- endif %}
+End of modules condition
+
+    {%- if data %}
+
+    Data:
+
+    .. autosummary::
+        :nosignature:
+{% for item in data %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+End of data condition
+
+{% if all_refs %}
+    ``__all__``: {{ all_refs|join(", ") }}
+{%- endif %}
+
+
+{% if members %}
+    Reference
+    ---------
+
+{%- endif %}
diff --git a/Src/Scarab/documentation/python/_templates/package.rst b/Src/Scarab/documentation/python/_templates/package.rst
new file mode 100644
index 0000000..5d0b903
--- /dev/null
+++ b/Src/Scarab/documentation/python/_templates/package.rst
@@ -0,0 +1,89 @@
+{{ fullname }} package
+{% for item in range(8 + fullname|length) -%}={%- endfor %}
+
+.. automodule:: {{ fullname }}
+    {% if members -%}
+    :members: {{ members|join(", ") }}
+    :undoc-members:
+    :show-inheritance:
+    {%- endif %}
+
+{% if submodules %}
+    Submodules:
+
+    .. toctree::
+       :maxdepth: 1
+{% for item in submodules %}
+       {{ fullname }}.{{ item }}
+       {%- endfor %}
+    {%- endif -%}
+
+{% if subpackages %}
+    Subpackages:
+
+    .. toctree::
+       :maxdepth: 1
+{% for item in subpackages %}
+       {{ fullname }}.{{ item }}
+       {%- endfor %}
+    {%- endif %}
+
+{% if members %}
+    Summary
+    -------
+
+    {%- if exceptions %}
+
+    Exceptions:
+
+    .. autosummary::
+        :nosignatures:
+{% for item in exceptions %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+
+    {%- if classes %}
+
+    Classes:
+
+    .. autosummary::
+        :nosignatures:
+{% for item in classes %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+
+    {%- if functions %}
+
+    Functions:
+
+    .. autosummary::
+        :nosignatures:
+{% for item in functions %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+{%- endif %}
+
+    {%- if data %}
+
+    Data:
+
+    .. autosummary::
+        :nosignatures:
+{% for item in data %}
+        {{ item }}
+{%- endfor %}
+    {%- endif %}
+
+{% if all_refs %}
+    ``__all__``: {{ all_refs|join(", ") }}
+{%- endif %}
+
+
+{% if members %}
+    Reference
+    ---------
+
+{%- endif %}
diff --git a/Src/Scarab/documentation/python/conf.py b/Src/Scarab/documentation/python/conf.py
new file mode 100644
index 0000000..bf55007
--- /dev/null
+++ b/Src/Scarab/documentation/python/conf.py
@@ -0,0 +1,298 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# dripline documentation build configuration file, created by
+# sphinx-quickstart on Mon Aug 25 15:26:40 2014.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    #'sphinx.ext.autodoc',
+    'sphinx.ext.todo',
+    'sphinx.ext.viewcode',
+    #'sphinxcontrib.programoutput',
+    #'sphinx.ext.napoleon',
+    #'sphinxarg.ext',
+]
+
+import better_apidoc
+better_apidoc.main([
+    'better_apidoc',
+    '-t', '_templates', # path to jinja templates for generated package and module rst files
+    '--force', # overwrite existing files
+    '--separate', # split the modules into their own files
+    '-o', 'better_apidoc_out', # output location, be sure to update index.rst if you change this
+    '../dripline', # path to the package containing modules to document ##TODO update this with your path
+    ])
+
+todo_include_todos = True
+
+#autoclass_content = "both"
+
+# Add any paths that contain templates here, relative to this directory.
+#templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+## TODO change this line to match the package name
+project = 'dripline'
+copyright = '2018, The Project 8 Collaboration'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+#version = #'0.0.1'
+#import pkg_resources
+# release: The full version, including alpha/beta/rc tags.
+try:
+    import subprocess
+    release = subprocess.check_output(['git', 'describe', '--long']).decode('utf-8').strip()
+    version = subprocess.check_output(['git', 'describe', '--abbrev=0']).decode('utf-8').strip()
+except Exception as e:
+    print("error message is:\n{}".format(e.message))
+    version = "unknown"
+    release = "unknown"
+print('version/release are: {}/{}'.format(version,release))
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+try:
+    import sphinx_rtd_theme
+    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+    html_theme = 'sphinx_rtd_theme'
+except ImportError:
+    html_theme = 'haiku'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+
+## TODO put your favicon here
+html_favicon = 'dripline_favicon.ico'
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+#html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'driplinedoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, #  author, documentclass [howto, manual, or own class]).
+#latex_documents = [
+#  ('index', 'dripline.tex', 'dripline Documentation',
+#   'The Project 8 Collaboration', 'manual'),
+#]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+#man_pages = [
+#    ('index', 'dripline', 'dripline Documentation',
+#     ['The Project 8 Collaboration'], 1)
+#]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+#texinfo_documents = [
+#  ('index', 'dripline', 'dripline Documentation',
+#   'The Project 8 Collaboration', 'dripline', 'One line description of project.',
+#   'Miscellaneous'),
+#]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False
diff --git a/Src/Scarab/documentation/python/index.rst b/Src/Scarab/documentation/python/index.rst
new file mode 100644
index 0000000..904ea86
--- /dev/null
+++ b/Src/Scarab/documentation/python/index.rst
@@ -0,0 +1,9 @@
+Welcome to dripline's documentation!
+====================================
+
+Contents:
+
+.. toctree::
+    :maxdepth: 2
+
+    better_apidoc_out/modules
diff --git a/Src/Scarab/executables/CMakeLists.txt b/Src/Scarab/executables/CMakeLists.txt
new file mode 100644
index 0000000..810c949
--- /dev/null
+++ b/Src/Scarab/executables/CMakeLists.txt
@@ -0,0 +1,27 @@
+# CMakeLists.txt for scarab/executables
+# Author: N. Oblath
+# Created: Jul 13, 2020
+
+##########
+
+set( lib_dependencies 
+    Scarab
+)
+
+set( sources
+    scarab-parse.cc
+)
+
+set( programs )
+pbuilder_executables( 
+    SOURCES ${sources}
+    TARGETS_VAR programs
+    PROJECT_LIBRARIES ${lib_dependencies}
+    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Executables
+    EXETARGETS ${programs}
+)
diff --git a/Src/Scarab/executables/scarab-parse.cc b/Src/Scarab/executables/scarab-parse.cc
new file mode 100644
index 0000000..8050d01
--- /dev/null
+++ b/Src/Scarab/executables/scarab-parse.cc
@@ -0,0 +1,106 @@
+/*!
+   @file scarab-parse.cc
+   @author N.S. Oblath
+  
+   @brief Parser: Parse a file and verify its conversion to a param structure
+  
+   @details
+   Usage:
+   ~~~~
+   $> scarab-parse [format] [file]
+   ~~~~
+  
+   Use `scarab-parse -h` to get the full help information.
+*/
+
+
+#include "application.hh"
+#include "logger.hh"
+#include "param_json.hh"
+#include "param_yaml.hh"
+#include "scarab_version.hh"
+
+LOGGER( parselog, "scarab-parse" );
+
+namespace scarab
+{
+    struct do_parse
+    {
+        do_parse() :
+                f_return( 0 )
+        {}
+
+        void setup_subcommands( main_app& an_app )
+        {
+            scarab::config_decorator* t_sc_json = an_app.add_config_subcommand( "json",  "Parse a JSON file" );
+            t_sc_json->add_config_option< std::string >( "filename", "filename", "File to parse" )->required();
+            t_sc_json->this_app()->callback([&an_app,  this]() { this->json( an_app.primary_config() ); } );
+
+            scarab::config_decorator* t_sc_yaml = an_app.add_config_subcommand( "yaml", "Parse a YAML file" );
+            t_sc_yaml->add_config_option< std::string >( "filename", "filename", "File to parse" )->required();
+            t_sc_yaml->this_app()->callback([&an_app, this]() { this->yaml( an_app.primary_config() ); } );
+
+            return;
+        }
+
+        void json( const param_node& a_config )
+        {
+            parse< param_input_json >( a_config );
+            return;
+        }
+
+        void yaml( const param_node& a_config )
+        {
+            parse< param_input_yaml >( a_config );
+            return;
+        }
+
+        template< typename parser >
+        void parse( const param_node& a_config )
+        {
+            parser t_input;
+            if( ! a_config.has( "filename" ) )
+            {
+                LERROR( parselog, "Filename was not specified" );
+                f_return = -1;
+                return;
+            }
+
+            param_ptr_t t_param_location( t_input.read_file( a_config["filename"]().as_string() ) );
+
+            if( ! t_param_location )
+            {
+                LERROR( parselog, "File did not parse!" );
+                f_return = -1;
+                return;
+            }
+
+            LPROG( parselog, "Parsed file:\n" << *t_param_location );
+
+            return;
+        }
+
+        int f_return;
+    };
+}
+
+
+using namespace scarab;
+
+int main( int argc, char **argv )
+{
+    main_app the_main;
+    the_main.require_subcommand();
+    the_main.fallthrough();
+
+    do_parse t_parse;
+    t_parse.setup_subcommands( the_main );
+
+    // Package version
+    the_main.set_version( version_semantic_ptr_t( new version() ) );
+
+    // Parse CL options and run the application
+    CLI11_PARSE( the_main, argc, argv );
+
+    return t_parse.f_return;
+}
diff --git a/Src/Scarab/library/CMakeLists.txt b/Src/Scarab/library/CMakeLists.txt
new file mode 100644
index 0000000..3b7e6d6
--- /dev/null
+++ b/Src/Scarab/library/CMakeLists.txt
@@ -0,0 +1,72 @@
+# CMakeLists.txt for Scarab/library
+# Author: N. Oblath
+# Created: Jan 4, 2016
+
+
+set( Scarab_HEADERS )
+set( Scarab_SOURCES )
+
+include_directories( BEFORE
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/date
+)
+if( Scarab_BUILD_CLI )
+    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/external/cli11 )
+endif( Scarab_BUILD_CLI )
+add_subdirectory( external )
+
+include_directories( BEFORE
+    ${CMAKE_CURRENT_SOURCE_DIR}/utility
+    ${CMAKE_CURRENT_SOURCE_DIR}/logger
+    ${CMAKE_CURRENT_SOURCE_DIR}/version
+)
+
+include_directories( BEFORE
+    ${CMAKE_CURRENT_BINARY_DIR}/utility 
+    ${CMAKE_CURRENT_BINARY_DIR}/version 
+)
+add_subdirectory( utility )
+add_subdirectory( version )
+add_subdirectory( logger )
+
+if( Scarab_BUILD_PARAM )
+    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/param )
+    add_subdirectory( param )
+endif( Scarab_BUILD_PARAM )
+
+if( Scarab_BUILD_CODEC_JSON )
+    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/param/codec/json )
+    add_subdirectory( param/codec/json )
+endif( Scarab_BUILD_CODEC_JSON )
+
+if( Scarab_BUILD_CODEC_YAML )
+    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/param/codec/yaml )
+    add_subdirectory( param/codec/yaml )
+endif( Scarab_BUILD_CODEC_YAML )
+
+if( Scarab_BUILD_AUTHENTICATION )
+    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/authentication )
+    add_subdirectory( authentication )
+endif( Scarab_BUILD_AUTHENTICATION )
+
+if( Scarab_BUILD_CLI )
+    include_directories( BEFORE 
+        ${CMAKE_CURRENT_SOURCE_DIR}/cli
+    )
+    add_subdirectory( cli )
+endif( Scarab_BUILD_CLI )
+
+##########
+
+pbuilder_library( 
+    TARGET Scarab 
+    SOURCES ${Scarab_SOURCES}
+    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS Scarab
+)
+
+pbuilder_install_headers( ${Scarab_HEADERS} )
diff --git a/Src/Scarab/library/README.md b/Src/Scarab/library/README.md
new file mode 100644
index 0000000..d7095d1
--- /dev/null
+++ b/Src/Scarab/library/README.md
@@ -0,0 +1,45 @@
+# Description
+
+Common C++ utilities.
+
+# Requirements
+
+* C++03 (C++11 optional)
+* Boost 1.46, including filesystem, system, thread, and date_time libraries (if using Authentication)
+
+# OS Compatibility
+
+* Linux
+* Mac
+* Windows
+
+# Components
+
+* Authentication
+* Command line interface
+* Logger
+* Param (hierarchical data structure)
+* Utility
+  * Concurrent queue
+  * Digitization functions
+  * Error (exception class)
+  * Member variable macros
+  * Mutex (wraps either pthread or C++11 std::mutex)
+  * API macros for Windows
+  * Singleton base class
+  * Version (base class scarab::version_semver and implementation scarab::version)
+  * Time functions
+  
+  
+# Installation Instructions
+
+Basic installation procedure for linux and mac:
+```
+> mkdir build
+> cd build
+> ccmake ..
+```
+Now make any build option choices you desire.  Configure, then generate the Makefiles.
+```
+> make install
+```
\ No newline at end of file
diff --git a/Src/Scarab/library/authentication/CMakeLists.txt b/Src/Scarab/library/authentication/CMakeLists.txt
new file mode 100644
index 0000000..74f4598
--- /dev/null
+++ b/Src/Scarab/library/authentication/CMakeLists.txt
@@ -0,0 +1,13 @@
+# CMakeLists.txt for Scarab/library/authentication
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/authentication.hh
+    PARENT_SCOPE )
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/authentication.cc
+    PARENT_SCOPE )
diff --git a/Src/Scarab/library/authentication/authentication.cc b/Src/Scarab/library/authentication/authentication.cc
new file mode 100644
index 0000000..8721d74
--- /dev/null
+++ b/Src/Scarab/library/authentication/authentication.cc
@@ -0,0 +1,94 @@
+/*
+ * mt_authentication.cc
+ *
+ *  Created on: Jun 15, 2015
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "authentication.hh"
+
+#include "logger.hh"
+#include "param_codec.hh"
+#include "path.hh"
+
+using std::string;
+
+namespace scarab
+{
+    LOGGER( mtlog, "authentication" );
+
+    authentication::authentication( const string& a_auth_filename ) :
+                    param_node(),
+                    f_auth_filename( a_auth_filename ),
+                    f_is_loaded( false )
+    {
+        load( a_auth_filename );
+    }
+
+    authentication::~authentication()
+    {
+    }
+
+    bool authentication::load( const string& a_auth_file )
+    {
+        this->clear();
+
+        f_auth_filename = a_auth_file;
+
+        // expand path with standard assumptions
+        path t_auth_file_path = expand_path( a_auth_file );
+
+        // is the file there?
+        bool t_auth_file_present = false;
+        if( ! t_auth_file_path.empty() )
+        {
+            LDEBUG( mtlog, "Looking for authentication file: <" << t_auth_file_path << ">" );
+            try
+            {
+                t_auth_file_present = exists( t_auth_file_path ) && is_regular_file( t_auth_file_path );
+                if( ! t_auth_file_present )
+                {
+                    LERROR( mtlog, "File either doesn't exist (" << exists( t_auth_file_path ) << ") or isn't a regular file (" << is_regular_file( t_auth_file_path ) << ")" );
+                    return false;
+                }
+            }
+            catch( boost::filesystem::filesystem_error& e )
+            {
+                LERROR( mtlog, "Unable to determine if the authentication file is a regular file: " << e.what() );
+                return false;
+            }
+        }
+
+        // if so, load it
+        if( t_auth_file_present )
+        {
+            param_translator t_translator;
+            std::unique_ptr< param > t_read_file( t_translator.read_file( t_auth_file_path.string() ) );
+            if( t_read_file == NULL )
+            {
+                LERROR( mtlog, "Unable to parse authentication file" );
+                return false;
+            }
+            else if( ! t_read_file->is_node() )
+            {
+                LERROR( mtlog, "Authentication file must translate to a node" );
+                return false;
+            }
+            else
+            {
+                this->param_node::operator=( std::move(t_read_file->as_node()) );
+                LDEBUG( mtlog, "Authentications:\n" << *this );
+                f_is_loaded = true;
+                return true;
+            }
+        }
+        else
+        {
+            LWARN( mtlog, "Authentications not loaded" );
+            return false;
+        }
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/authentication/authentication.hh b/Src/Scarab/library/authentication/authentication.hh
new file mode 100644
index 0000000..de5802e
--- /dev/null
+++ b/Src/Scarab/library/authentication/authentication.hh
@@ -0,0 +1,35 @@
+/*
+ * mt_authentication.hh
+ *
+ *  Created on: Jun 15, 2015
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_AUTHENTICATION_HH_
+#define SCARAB_AUTHENTICATION_HH_
+
+#include "member_variables.hh"
+#include "param.hh"
+#include "scarab_api.hh"
+
+namespace scarab
+{
+
+    class SCARAB_API authentication : public param_node
+    {
+        public:
+            authentication( const std::string& a_auth_file );
+            ~authentication();
+
+        public:
+            bool load( const std::string& a_auth_file );
+
+        public:
+            mv_referrable( std::string, auth_filename );
+            mv_accessible_noset( bool, is_loaded );
+
+    };
+
+} /* namespace scarab */
+
+#endif /* SCARAB_AUTHENTICATION_HH_ */
diff --git a/Src/Scarab/library/cli/CMakeLists.txt b/Src/Scarab/library/cli/CMakeLists.txt
new file mode 100644
index 0000000..e8b756e
--- /dev/null
+++ b/Src/Scarab/library/cli/CMakeLists.txt
@@ -0,0 +1,15 @@
+# CMakeLists.txt for Scarab/library/param
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/application.hh
+    ${dir}/nonoption_parser.hh
+    PARENT_SCOPE )
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/application.cc
+    ${dir}/nonoption_parser.cc
+    PARENT_SCOPE )
diff --git a/Src/Scarab/library/cli/application.cc b/Src/Scarab/library/cli/application.cc
new file mode 100644
index 0000000..722d195
--- /dev/null
+++ b/Src/Scarab/library/cli/application.cc
@@ -0,0 +1,261 @@
+/*
+ * application.cc
+ *
+ *  Created on: Jul 20, 2018
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "application.hh"
+
+#include "nonoption_parser.hh"
+#include "param_codec.hh"
+#include "version_wrapper.hh"
+
+using std::string;
+
+LOGGER(applog, "application");
+
+namespace scarab
+{
+
+    config_decorator::config_decorator( main_app* a_main, app* a_this_app ) :
+            f_main( a_main ),
+            f_this( a_this_app ),
+            f_subcommand_decorators()
+    {
+    }
+
+    config_decorator::~config_decorator()
+    {
+    }
+
+    config_decorator* config_decorator::add_config_subcommand( std::string a_subcommand_name, std::string a_description )
+    {
+        app* t_subcommand = f_this->add_subcommand( a_subcommand_name, a_description );
+        //config_decorator* t_decorator = new config_decorator( f_main, t_subcommand );
+        f_subcommand_decorators.emplace_back( new config_decorator( f_main, t_subcommand ) );
+        return f_subcommand_decorators.back().get();
+    }
+
+
+    // utility function to fill the verbosity map
+    main_app::verbosity_map_t fill_verbosities()
+    {
+        main_app::verbosity_map_t t_map;
+        // have to hard-code the filling of the verbosity map because you can't iterate over an enum
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eTrace) ] = logger::ELevel::eTrace;
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eDebug) ] = logger::ELevel::eDebug;
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eInfo) ] = logger::ELevel::eInfo;
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eProg) ] = logger::ELevel::eProg;
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eWarn) ] = logger::ELevel::eWarn;
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eError) ] = logger::ELevel::eError;
+        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eFatal) ] = logger::ELevel::eFatal;
+        return t_map;
+    }
+
+    main_app::verbosity_map_t main_app::s_verbosities( fill_verbosities() );
+
+    main_app::main_app( bool a_use_config ) :
+            config_decorator( this, this ),
+            app(),
+            f_primary_config(),
+            f_default_config(),
+            f_config_filename(),
+            f_nonoption_kw_args(),
+            f_nonoption_ord_args(),
+            f_app_options(),
+            f_app_option_holders(),
+            f_use_config( a_use_config )
+    {
+        set_global_verbosity( logger::ELevel::eProg );
+
+        allow_extras(); // allow unrecognized options, which are parsed into the nonoption args
+
+        if( f_use_config )
+        {
+            add_option( "-c,--config", f_config_filename, "Config file filename" )->check(CLI::ExistingFile);
+        }
+
+        auto t_verbose_callback = [this]( unsigned a_count )
+            {
+                this->increase_global_verbosity( a_count );
+            };
+        add_flag_function( "-v,--verbose", t_verbose_callback, "Increase verbosity" );
+
+        auto t_quiet_callback = [this]( unsigned a_count )
+            {
+                this->decrease_global_verbosity( a_count );
+            };
+        add_flag_function( "-q,--quiet", t_quiet_callback, "Decrease verbosity" );
+
+        auto t_version_callback = [](int)
+            {
+                LPROG( applog, '\n' << version_wrapper::get_instance()->version_info_string() );
+                throw CLI::Success();
+            };
+        add_flag_function( "-V,--version", t_version_callback, "Print the version message and exit" );
+    }
+
+    main_app::~main_app()
+    {
+    }
+
+    void main_app::set_version( scarab::version_semantic_ptr_t a_ver )
+    {
+        version_wrapper::get_instance()->set_imp( a_ver );
+    }
+
+    void main_app::pre_callback()
+    {
+        if( f_use_config )
+        {
+            do_config_stage_1();
+
+            do_config_stage_2();
+
+            try
+            {
+                nonoption_parser t_no_parser( remaining() );
+                f_nonoption_kw_args = t_no_parser.kw_args();
+                f_nonoption_ord_args = t_no_parser.ord_args();
+            }
+            catch( error& e )
+            {
+                LERROR( applog, "Unable to parse remaining arguments: " << e.what() );
+                throw CLI::ParseError( std::string("Unable to parse remaining arguments due to parse error or unknown option: ") + e.what(), CLI::ExitCodes::ArgumentMismatch );
+            }
+
+            do_config_stage_3();
+
+            do_config_stage_4();
+
+            LPROG( applog, "Final configuration:\n" << f_primary_config );
+            LPROG( applog, "Ordered args:\n" << f_nonoption_ord_args );
+        }
+        return;
+    }
+
+    void main_app::do_config_stage_1()
+    {
+        // first configuration stage: defaults
+
+        if( ! f_use_config ) return;
+
+        LDEBUG( applog, "first configuration stage" );
+        f_primary_config.merge( f_default_config );
+        return;
+    }
+
+    void main_app::do_config_stage_2()
+    {
+        // second configuration stage: config file
+
+        if( ! f_use_config ) return;
+
+        LDEBUG( applog, "second configuration stage" );
+        if( ! f_config_filename.empty() )
+        {
+            path t_config_filepath = scarab::expand_path( f_config_filename );
+            LDEBUG( applog, "Loading config file <" << t_config_filepath << "> from filename <" << f_config_filename << ">" );
+            param_translator t_translator;
+            std::unique_ptr< param > t_config_from_file( t_translator.read_file( t_config_filepath.string() ));
+            if( t_config_from_file == NULL )
+            {
+                throw error() << "[application] error parsing config file";
+            }
+            if( ! t_config_from_file->is_node() )
+            {
+                throw error() << "[application] configuration file must consist of an object/node";
+            }
+            f_primary_config.merge( t_config_from_file->as_node() );
+        }
+        return;
+    }
+
+    void main_app::do_config_stage_3()
+    {
+        // third configuration stage: keyword args
+
+        if( ! f_use_config ) return;
+
+        LDEBUG( applog, "third configuration stage" );
+        f_primary_config.merge( f_nonoption_kw_args );
+        return;
+    }
+
+    void main_app::do_config_stage_4()
+    {
+        // fourth configuration stage: application options
+
+        if( ! f_use_config ) return;
+
+        std::for_each( f_app_option_holders.begin(), f_app_option_holders.end(),
+                       [this]( std::shared_ptr< app_option_holder > a_ptr ){ a_ptr->add_to_app_options(f_app_options); } );
+        f_primary_config.merge( f_app_options );
+        return;
+    }
+
+    main_app::verbosity_t main_app::get_global_verbosity() const
+    {
+        return f_global_verbosity->first;
+    }
+ 
+    void main_app::set_global_verbosity( main_app::verbosity_t a_verbosity )
+    {
+        auto t_it = s_verbosities.find( a_verbosity );
+
+        // if we don't match a value, then find the next higher value
+        if( t_it == s_verbosities.end() )
+        {
+            t_it = s_verbosities.upper_bound( a_verbosity );
+            // make sure we don't go off the end
+            if( t_it == s_verbosities.end() ) t_it = std::prev(s_verbosities.end());
+        }
+
+        f_global_verbosity = t_it;
+
+        // set the global verbosity in the logger
+        logger::SetGlobalLevel( f_global_verbosity->second );
+        return;
+    }
+
+    void main_app::set_global_verbosity( logger::ELevel a_verbosity )
+    {
+        set_global_verbosity( static_cast< verbosity_t >(a_verbosity) );
+        return;
+    }
+
+    void main_app::increase_global_verbosity( unsigned an_offset )
+    {
+        // increased verbosity is lower in verbosity number
+        if( an_offset == 0 ) return;
+        // Move down, but don't go past the beginning
+        for( unsigned i_count = 0; i_count < an_offset; ++i_count )
+        {
+            if( f_global_verbosity == s_verbosities.begin() ) break;
+            --f_global_verbosity;
+        }
+        // set the global verbosity in the logger
+        applog.SetGlobalLevel( f_global_verbosity->second );
+        return;
+    }
+
+    void main_app::decrease_global_verbosity( unsigned an_offset )
+    {
+        // decreased verbosity is higher in verbosity number
+        if( an_offset == 0 ) return;
+        // Move up, but not past the end
+        for( unsigned i_count = 0; i_count < an_offset; ++i_count )
+        {
+            if( std::next(f_global_verbosity) == s_verbosities.end() ) break;
+            ++f_global_verbosity;
+        }
+        // set the global verbosity in the logger
+        applog.SetGlobalLevel( f_global_verbosity->second );
+        return;
+    }
+
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/cli/application.hh b/Src/Scarab/library/cli/application.hh
new file mode 100644
index 0000000..e60fc5c
--- /dev/null
+++ b/Src/Scarab/library/cli/application.hh
@@ -0,0 +1,396 @@
+/*
+ * application.hh
+ *
+ *  Created on: Jul 20, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_APPLICATION_HH_
+#define SCARAB_APPLICATION_HH_
+
+#include "CLI11.hpp"
+
+#include "logger.hh"
+#include "member_variables.hh"
+#include "param_helpers.hh"
+#include "version_semantic.hh"
+
+#include <type_traits>
+
+namespace scarab
+{
+    typedef CLI::App app;
+
+    class version_semantic;
+
+    class main_app;
+
+    /*!
+     @class config_decorator
+     @author N. S. Oblath
+
+     @brief Adds the ability to create options and subcommands that are tied to a main_app's primary config
+
+     @details
+     Note that while this class is called a decorator, it does not follow the actual decorator pattern.
+     It does, however, follow the spirit of that pattern in that it adds a capability to the CLI::App class.
+
+     Subcommands and options are tied to the main_app in slightly different ways because of the different ways
+     in which those two CLI11 classes are used.
+
+     Subcommands are CLI::App objects, and any App can have subcommands.  Therefore the collection of Apps in
+     use in a given application can form a multi-level parent-child structure.  Each parent App can have multiple
+     children, and owns those child App objects.  The children can also be parents, of course.
+     The scarab::config_decorator for each subcommand App object is created by the parent config_decorator's
+     add_config_subcommand() function.  That decorator has a link to its App and is owned by its parent decorator.
+
+     At the top of the App hierarchy is the primary App.  In Scarab, that's the main_app, which also inherits from
+     config_decorator.  So main_app is also the top of the config_decorator hierarchy.
+
+     Options, on the other hand, do not form their own hierarchy.  Each App owns its options.  On the Scarab side,
+     though, even options that belong to subcommands contribute to the main_app's primary config.  Therefore when
+     config_decorator::add_config_option() is used, the app_option_holder that corresponds to the new option is
+     given directly to the main_app.
+    */
+    class SCARAB_API config_decorator
+    {
+        public:
+            config_decorator( main_app* a_main, app* a_this_app );
+            config_decorator( const config_decorator& ) = delete;
+            config_decorator( config_decorator&& ) = delete;
+            virtual ~config_decorator();
+
+            config_decorator& operator=( const config_decorator& ) = delete;
+            config_decorator& operator=( config_decorator&& ) = delete;
+
+            main_app* main() const;
+            app* this_app() const;
+
+            /// Add a subcommand that is linked to a particular main_app and can create options that modify that main_app's primary config
+            config_decorator* add_config_subcommand( std::string a_subcommand_name, std::string a_description="" );
+
+            /// Add an option that gets automatically added to the primary config of a main_app
+            template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
+            CLI::Option* add_config_option( std::string a_name,
+                                            std::string a_primary_config_addr,
+                                            std::string a_description = "" );
+
+            /// Add an option that gets automatically added to the primary config of a main_app
+            template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
+            CLI::Option* add_config_multi_option( std::string a_name,
+                                                  std::string a_primary_config_addr,
+                                                  std::string a_description = "" );
+
+            /// Add a flag that gets automatically added to the primary config of a main_app
+            /// The flag can be passed multiple times, and the number of instances will be recorded in the config
+            template< typename T, CLI::enable_if_t< std::is_integral<T>::value && ! CLI::is_bool<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
+            CLI::Option* add_config_flag( std::string a_name,
+                                          std::string a_primary_config_addr,
+                                          std::string a_description = "" );
+
+            /// Add a flag that gets automatically added to the primary config of a main_app
+            /// This flag is recorded in the config as a boolean: false if it doesn't appear in the command line, and true if it does
+            template< typename T, CLI::enable_if_t< CLI::is_bool<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
+            CLI::Option* add_config_flag( std::string a_name,
+                                          std::string a_primary_config_addr,
+                                          std::string a_description = "" );
+
+        public:
+            // these structs provide a type erasure mechanism that:
+            //  - holds the actual value provided on the CL, and
+            //  - adds the value to the f_app_options, and then to the global config, from the pre_callback function
+            struct app_option_holder
+            {
+                virtual void add_to_app_options( param_node& a_app_options ) = 0;
+                CLI::Option* f_option;
+                std::string f_primary_config_addr;
+                virtual ~app_option_holder() {}
+            };
+
+            template< typename T >
+            struct app_option_holder_typed : app_option_holder
+            {
+                void add_to_app_options( param_node& a_app_options )
+                {
+                    if( ! (*f_option) ) return;
+                    param_ptr_t t_new_config_ptr = simple_parser::parse_address(
+                            f_primary_config_addr,
+                            param_ptr_t( new param_value(f_value) ) ); // throws scarab::error if top-level param object is not a node
+                    a_app_options.merge( t_new_config_ptr->as_node() );
+                    return;
+                }
+                T f_value;
+                virtual ~app_option_holder_typed() {}
+            };
+
+            template< typename T >
+            struct app_option_holder_vector_typed : app_option_holder
+            {
+                void add_to_app_options( param_node& a_app_options )
+                {
+                    if( ! (*f_option) ) return;
+                    param_array t_array;
+                    std::for_each( f_values.begin(), f_values.end(), [&t_array]( T a_value ){ t_array.push_back( a_value ); } );
+                    param_ptr_t t_new_config_ptr = simple_parser::parse_address(
+                            f_primary_config_addr,
+                            param_ptr_t( new param_array(std::move(t_array)) ) ); // throws scarab::error if top-level param object is not a node
+                    a_app_options.merge( t_new_config_ptr->as_node() );
+                    return;
+                }
+                std::vector< T > f_values;
+                virtual ~app_option_holder_vector_typed() {}
+            };
+
+            struct app_option_holder_bool_flag : app_option_holder
+            {
+                void add_to_app_options( param_node& a_app_options )
+                {
+                    if( ! (*f_option) ) return;
+                    param_ptr_t t_new_config_ptr = simple_parser::parse_address(
+                            f_primary_config_addr,
+                            param_ptr_t( new param_value(*f_option) ) ); // throws scarab::error if top-level param object is not a node
+                    a_app_options.merge( t_new_config_ptr->as_node() );
+                    return;
+                }
+                virtual ~app_option_holder_bool_flag() {}
+            };
+
+        protected:
+            main_app* f_main;
+            app* f_this;
+
+            // config_decorator owns the decorators of subcommands just like app owns the apps of subcommands
+            using conf_dec_ptr_t = std::unique_ptr< config_decorator >;
+            std::vector< conf_dec_ptr_t > f_subcommand_decorators;
+    };
+
+
+    /*!
+     @class main_app
+     @author N. S. Oblath
+
+     @brief Primary application class
+
+     @details
+     This class is designed to provide an entry point for an application, and to setup the application's configuration
+     based on information provided by the user at the command line.
+
+     Note that there is a constructor option, `use_config`, which allows `main_app` to be used without using the configuration file 
+     if it's set to false (the default is `true`). 
+     There will not be a `-c` CLI option, and the configuration steps will not be run.  Functionality is much closer 
+     to that of `CLI::App` in this case.
+
+     The application's primary "configuration" is in the form of a scarab::param_node object that takes input from
+     default values, a configuration file, directly-addressed arguments, and application-specific options.
+
+     The `main_app` class uses and makes available all of the functionality of the CLI11 library, and
+     in particular it directly extends the CLI::App class.  Links to documentation on how to use CLI11
+     are provided below.
+
+     Basic usage (customized from CLI11's basic usage):
+
+     int main( int argc, char **argv )
+     {
+         main_app the_main;
+
+         // Add new options/flags here
+
+         // Set the default config file
+         the_main.default_config() = t_default_config;
+
+         // This includes calling application::pre_callback() to finalize the global config
+         CLI11_PARSE( the_main, argc, argv );
+
+         return 0;
+     }
+
+     Notes on specifying and using command-line arguments:
+
+       There are two main types of command-line arguments:
+       1. "Options" are named arguments.  On the command line they look like `-b [value]`, `--broker [value]`, or `-r` (flag with no value)
+       2. "Non-option" arguments have no name, and typically rely on the order they fall on the command line to interpret their meaning.
+
+       Options need to be specified in an application (i.e. CLI11 needs to know about them at compile time).
+       All of the functionality of CLI11 is available when using `main_app`,
+       so you can create options and flags (options with no values) that do not affect the configuration.
+       Alternatively, `main_app` provides the ability to define options that are automatically added to the configuration (see below).
+
+     Notes for setting the configuration in an application:
+
+       Stages for setting the configuration
+       1. Default options
+       2. Config file
+       3. Non-option arguments
+       4. Application-specified options
+
+       In stage 3, arguments can have two forms:
+         - Keyword arguments, in the form [name]=[value], are merged with the primary config.
+           They're also separately accessible as `nonoption_kw_args`
+         - Ordered arguments, in the form [value], are not merged with the primary config.
+           They're accessible as `nonoption_ord_args`
+
+       Application specified options (stage 4) are merged with the config and
+       are separately accessible as `app_options`.  They have to be specified
+       in the application using `add_config_option()`, which will map
+       the option name to an address in the primary config.
+
+       The functionality for each stage is implemented in its own virtual function,
+       so a subclass can customize the procedure as needed.
+
+       Example:
+         > my_app -c config.yaml --an_opt 20 nested.value="hello"
+
+         What happens:
+         1. my_app will have default values hard-coded
+         2. File `config.yaml` will be parsed and merged with the defaults
+         3. Configuration `nested { value: "hello" }` will be merged with the primary config
+         4. Option `an_opt` will set something specified in the config to 20
+
+     See CLI11 documentation for the CLI::App class:
+     - GitHub Readme: https://github.com/CLIUtils/CLI11
+     - Tutorial: https://cliutils.gitlab.io/CLI11Tutorial
+     - API: https://cliutils.github.io/CLI11/index.html
+
+     There are several test examples that can be used as useful references on different ways that
+     applications can be setup.  You'll find them in the scarab/testing/applications directory.
+     - test_app_with_callback.cc -- an example that runs a program using a callback function
+     - test_app_with_options.cc -- an example using basic CLI11 options (i.e. options that don't modify the configuration)
+     - test_app_with_subcommands.cc -- an example with two subcommands.  e.g. my_app do_action_A --an_option=6
+     - test_basic_application.cc -- the example above
+     */
+    class SCARAB_API main_app : public config_decorator, public app
+    {
+        public:
+            main_app( bool a_use_config = true );
+            virtual ~main_app();
+
+        public:
+            /// parses positional arguments into the global config
+            /// called after parsing, before running callbacks
+            virtual void pre_callback();
+
+            // Functions to perform each configuration stage
+            /// Load default values
+            virtual void do_config_stage_1();
+            /// Load the config file
+            virtual void do_config_stage_2();
+            /// Load the directly-addressed non-option arguments
+            virtual void do_config_stage_3();
+            /// Load the application-specific options
+            virtual void do_config_stage_4();
+
+            void set_version( scarab::version_semantic_ptr_t a_ver );
+
+            /// Master configuration tree for the application
+            mv_referrable( param_node, primary_config );
+
+            // configuration stage 1
+            /// Default configuration values
+            mv_referrable( param_node, default_config );
+
+            // configuration stage 2
+            /// Configuration file name
+            mv_referrable_const( std::string, config_filename );
+
+            // configuration stage 3
+            /// Keyword configuration values coming from the command line, in the form: config.address=value
+            mv_referrable( param_node, nonoption_kw_args );
+            /// Ordered configuration values coming in an application-specific order from the command line, in the form: value
+            mv_referrable( param_array, nonoption_ord_args );
+
+            // configuration stage 4
+            /// Application-specific options that are specified using add_config_option() functions
+            mv_referrable( param_node, app_options );
+
+            /// Store the app option holder structs from this app and any subcommands
+            mv_referrable( std::vector< std::shared_ptr< app_option_holder > >, app_option_holders );
+
+            mv_accessible_noset( bool, use_config );
+
+            //*************************
+            // Verbosity
+            //*************************
+        public:
+            using verbosity_t = std::underlying_type< logger::ELevel >::type; // typically is unsigned
+
+            /// Get the global verbosity
+            verbosity_t get_global_verbosity() const;
+            /// Set the global verbosity with the verbosity value
+            void set_global_verbosity( verbosity_t a_verbosity );
+            /// Set the global verbosity with the verbosity enum
+            void set_global_verbosity( logger::ELevel a_verbosity );
+
+            void increase_global_verbosity( unsigned an_offset );
+            void decrease_global_verbosity( unsigned an_offset );
+
+            using verbosity_map_t = std::map< verbosity_t, logger::ELevel >;
+            using verbosity_iterator_t = verbosity_map_t::iterator;
+            static verbosity_map_t s_verbosities;
+
+        protected:
+            verbosity_iterator_t f_global_verbosity;
+
+    };
+
+
+    template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > >
+    CLI::Option* config_decorator::add_config_option( std::string a_name,
+                                                      std::string a_primary_config_addr,
+                                                      std::string a_description )
+    {
+        auto t_opt_holder_ptr = std::make_shared< app_option_holder_typed<T> >();
+        t_opt_holder_ptr->f_option = f_this->add_option( a_name, t_opt_holder_ptr->f_value, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
+        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
+        f_main->app_option_holders().push_back( t_opt_holder_ptr );
+        return t_opt_holder_ptr->f_option;
+    }
+
+    template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > >
+    CLI::Option* config_decorator::add_config_multi_option( std::string a_name,
+                                                            std::string a_primary_config_addr,
+                                                            std::string a_description )
+    {
+        auto t_opt_holder_ptr = std::make_shared< app_option_holder_vector_typed<T> >();
+        t_opt_holder_ptr->f_option = f_this->add_option( a_name, t_opt_holder_ptr->f_values, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
+        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
+        f_main->app_option_holders().push_back( t_opt_holder_ptr );
+        return t_opt_holder_ptr->f_option;
+    }
+
+    template< typename T, CLI::enable_if_t< std::is_integral<T>::value && ! CLI::is_bool<T>::value, CLI::detail::enabler > >
+    CLI::Option* config_decorator::add_config_flag( std::string a_name,
+                                                    std::string a_primary_config_addr,
+                                                    std::string a_description )
+    {
+        auto t_opt_holder_ptr = std::make_shared< app_option_holder_typed<T> >();
+        t_opt_holder_ptr->f_option = f_this->add_flag( a_name, t_opt_holder_ptr->f_value, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
+        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
+        f_main->app_option_holders().push_back( t_opt_holder_ptr );
+        return t_opt_holder_ptr->f_option;
+    }
+
+    template< typename T, CLI::enable_if_t< CLI::is_bool<T>::value, CLI::detail::enabler > >
+    CLI::Option* config_decorator::add_config_flag( std::string a_name,
+                                                    std::string a_primary_config_addr,
+                                                    std::string a_description )
+    {
+        auto t_opt_holder_ptr = std::make_shared< app_option_holder_bool_flag >();
+        t_opt_holder_ptr->f_option = f_this->add_flag( a_name, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
+        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
+        f_main->app_option_holders().push_back( t_opt_holder_ptr );
+        return t_opt_holder_ptr->f_option;
+    }
+
+    inline app* config_decorator::this_app() const
+    {
+        return f_this;
+    }
+
+    inline main_app* config_decorator::main() const
+    {
+        return f_main;
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_APPLICATION_HH_ */
diff --git a/Src/Scarab/library/cli/nonoption_parser.cc b/Src/Scarab/library/cli/nonoption_parser.cc
new file mode 100644
index 0000000..9bae5e4
--- /dev/null
+++ b/Src/Scarab/library/cli/nonoption_parser.cc
@@ -0,0 +1,67 @@
+
+#define SCARAB_API_EXPORTS
+
+#include "nonoption_parser.hh"
+
+#include "logger.hh"
+#include "param_helpers.hh"
+
+#include <cctype>
+#include <sstream>
+
+LOGGER( parselog, "nonoption_parser" );
+
+namespace scarab
+{
+    nonoption_parser::nonoption_parser( std::vector< std::string > an_args ) :
+            f_ord_args(),
+            f_kw_args()
+    {
+        for( const std::string& arg : an_args )
+        {
+            parse( arg ); // can throw scarab::error
+        }
+    }
+
+    nonoption_parser::~nonoption_parser()
+    {
+    }
+
+    void nonoption_parser::parse( const std::string& an_arg )
+    {
+        // this method can throw scarab::error
+
+        // if an_arg starts with '-', then it's either an option or it's a negative number.
+        if( an_arg[0] == f_option_starter ) 
+        {
+            param_ptr_t t_parsed( simple_parser::parse_value( an_arg ) );
+            param_value& t_value = (*t_parsed)();
+            if( t_value.is_int() || t_value.is_double() )
+            {
+                // if it parses as a number, then it's a negative number (no need to check uint, because presumably it's negative)
+                f_ord_args.push_back( std::move(t_parsed) );
+                return;
+            }
+            // if it's not a negtive number, then it's an option and shouldn't be considered here
+            throw error() << "Cannot parse an option with the nonoption_parser: " << an_arg;
+        }
+
+        size_t t_val_pos = an_arg.find_first_of( f_value_separator );
+        if( t_val_pos != std::string::npos )
+        {
+            // this argument has an '=' (or whatever f_value_separator is), so parse as a keyword argument
+            param_ptr_t t_new_param = simple_parser::parse_address(
+                    an_arg.substr(0, t_val_pos),
+                    simple_parser::parse_value( an_arg.substr(t_val_pos+1) ) ); // can throw scarab::error
+            f_kw_args.merge( t_new_param->as_node() );
+        }
+        else
+        {
+            // this argument has no '=', so parse it as an ordered argument
+            f_ord_args.push_back( simple_parser::parse_value( an_arg ) );
+        }
+
+        return;
+    }
+
+}
diff --git a/Src/Scarab/library/cli/nonoption_parser.hh b/Src/Scarab/library/cli/nonoption_parser.hh
new file mode 100644
index 0000000..147c817
--- /dev/null
+++ b/Src/Scarab/library/cli/nonoption_parser.hh
@@ -0,0 +1,33 @@
+#ifndef SCARAB_NONOPTION_PARSER_HH_
+#define SCARAB_NONOPTION_PARSER_HH_
+
+#include "param.hh"
+
+#include "member_variables.hh"
+
+#include <string>
+
+namespace scarab
+{
+
+    class SCARAB_API nonoption_parser
+    {
+        public:
+            nonoption_parser( std::vector< std::string > an_args );
+            virtual ~nonoption_parser();
+
+            mv_referrable_const( param_array, ord_args );
+            mv_referrable_const( param_node, kw_args );
+
+        private:
+            void parse( const std::string& an_arg );
+
+        public:
+            static const char f_value_separator = '=';
+            static const char f_option_starter = '-';
+
+    };
+
+} /* namespace scarab */
+
+#endif /* SCARAB_NONOPTION_PARSER_HH_ */
diff --git a/Src/Scarab/library/external/CMakeLists.txt b/Src/Scarab/library/external/CMakeLists.txt
new file mode 100644
index 0000000..9d3ef96
--- /dev/null
+++ b/Src/Scarab/library/external/CMakeLists.txt
@@ -0,0 +1,15 @@
+# CMakeLists.txt for Scarab/library/external
+# Author: N. Oblath
+# Created: May 29, 2020
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/date/date.h
+    PARENT_SCOPE )
+
+if( Scarab_BUILD_CLI )
+    set( Scarab_HEADERS ${Scarab_HEADERS}
+        ${dir}/cli11/CLI11.hpp
+        PARENT_SCOPE )
+endif( Scarab_BUILD_CLI )
diff --git a/Src/Scarab/library/external/cli11/CLI11.hpp b/Src/Scarab/library/external/cli11/CLI11.hpp
new file mode 100644
index 0000000..5c88087
--- /dev/null
+++ b/Src/Scarab/library/external/cli11/CLI11.hpp
@@ -0,0 +1,6778 @@
+#pragma once
+
+// CLI11: Version 1.8.0
+// Originally designed by Henry Schreiner
+// https://github.com/CLIUtils/CLI11
+//
+// This is a standalone header file generated by MakeSingleHeader.py in CLI11/scripts
+// from: v1.8.0
+//
+// From LICENSE:
+//
+// CLI11 1.8 Copyright (c) 2017-2019 University of Cincinnati, developed by Henry
+// Schreiner under NSF AWARD 1414736. All rights reserved.
+// 
+// Redistribution and use in source and binary forms of CLI11, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this
+//    list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation
+//    and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors
+//    may be used to endorse or promote products derived from this software without
+//    specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+// Standard combined includes:
+
+#include <algorithm>
+#include <cmath>
+#include <deque>
+#include <exception>
+#include <fstream>
+#include <functional>
+#include <iomanip>
+#include <iostream>
+#include <istream>
+#include <iterator>
+#include <locale>
+#include <map>
+#include <memory>
+#include <numeric>
+#include <set>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+
+// Verbatim copy from CLI/Version.hpp:
+
+
+#define CLI11_VERSION_MAJOR 1
+#define CLI11_VERSION_MINOR 8
+#define CLI11_VERSION_PATCH 0
+#define CLI11_VERSION "1.8.0"
+
+
+
+
+// Verbatim copy from CLI/Macros.hpp:
+
+
+// The following version macro is very similar to the one in PyBind11
+#if !(defined(_MSC_VER) && __cplusplus == 199711L) && !defined(__INTEL_COMPILER)
+#if __cplusplus >= 201402L
+#define CLI11_CPP14
+#if __cplusplus >= 201703L
+#define CLI11_CPP17
+#if __cplusplus > 201703L
+#define CLI11_CPP20
+#endif
+#endif
+#endif
+#elif defined(_MSC_VER) && __cplusplus == 199711L
+// MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented)
+// Unless you use the /Zc:__cplusplus flag on Visual Studio 2017 15.7 Preview 3 or newer
+#if _MSVC_LANG >= 201402L
+#define CLI11_CPP14
+#if _MSVC_LANG > 201402L && _MSC_VER >= 1910
+#define CLI11_CPP17
+#if __MSVC_LANG > 201703L && _MSC_VER >= 1910
+#define CLI11_CPP20
+#endif
+#endif
+#endif
+#endif
+
+#if defined(CLI11_CPP14)
+#define CLI11_DEPRECATED(reason) [[deprecated(reason)]]
+#elif defined(_MSC_VER)
+#define CLI11_DEPRECATED(reason) __declspec(deprecated(reason))
+#else
+#define CLI11_DEPRECATED(reason) __attribute__((deprecated(reason)))
+#endif
+
+
+
+
+// Verbatim copy from CLI/Optional.hpp:
+
+
+// You can explicitly enable or disable support
+// by defining to 1 or 0. Extra check here to ensure it's in the stdlib too.
+// We nest the check for __has_include and it's usage
+#ifndef CLI11_STD_OPTIONAL
+#ifdef __has_include
+#if defined(CLI11_CPP17) && __has_include(<optional>)
+#define CLI11_STD_OPTIONAL 1
+#else
+#define CLI11_STD_OPTIONAL 0
+#endif
+#else
+#define CLI11_STD_OPTIONAL 0
+#endif
+#endif
+
+#ifndef CLI11_EXPERIMENTAL_OPTIONAL
+#define CLI11_EXPERIMENTAL_OPTIONAL 0
+#endif
+
+#ifndef CLI11_BOOST_OPTIONAL
+#define CLI11_BOOST_OPTIONAL 0
+#endif
+
+#if CLI11_BOOST_OPTIONAL
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106100
+#error "This boost::optional version is not supported, use 1.61 or better"
+#endif
+#endif
+
+#if CLI11_STD_OPTIONAL
+#include <optional>
+#endif
+#if CLI11_EXPERIMENTAL_OPTIONAL
+#include <experimental/optional>
+#endif
+#if CLI11_BOOST_OPTIONAL
+#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
+#endif
+
+
+// From CLI/Version.hpp:
+
+
+
+// From CLI/Macros.hpp:
+
+
+
+// From CLI/Optional.hpp:
+
+namespace CLI {
+
+#if CLI11_STD_OPTIONAL
+template <typename T> std::istream &operator>>(std::istream &in, std::optional<T> &val) {
+    T v;
+    in >> v;
+    val = v;
+    return in;
+}
+#endif
+
+#if CLI11_EXPERIMENTAL_OPTIONAL
+template <typename T> std::istream &operator>>(std::istream &in, std::experimental::optional<T> &val) {
+    T v;
+    in >> v;
+    val = v;
+    return in;
+}
+#endif
+
+#if CLI11_BOOST_OPTIONAL
+template <typename T> std::istream &operator>>(std::istream &in, boost::optional<T> &val) {
+    T v;
+    in >> v;
+    val = v;
+    return in;
+}
+#endif
+
+// Export the best optional to the CLI namespace
+#if CLI11_STD_OPTIONAL
+using std::optional;
+#elif CLI11_EXPERIMENTAL_OPTIONAL
+using std::experimental::optional;
+#elif CLI11_BOOST_OPTIONAL
+using boost::optional;
+#endif
+
+// This is true if any optional is found
+#if CLI11_STD_OPTIONAL || CLI11_EXPERIMENTAL_OPTIONAL || CLI11_BOOST_OPTIONAL
+#define CLI11_OPTIONAL 1
+#endif
+
+} // namespace CLI
+
+// From CLI/StringTools.hpp:
+
+namespace CLI {
+
+/// Include the items in this namespace to get free conversion of enums to/from streams.
+/// (This is available inside CLI as well, so CLI11 will use this without a using statement).
+namespace enums {
+
+/// output streaming for enumerations
+template <typename T, typename = typename std::enable_if<std::is_enum<T>::value>::type>
+std::ostream &operator<<(std::ostream &in, const T &item) {
+    // make sure this is out of the detail namespace otherwise it won't be found when needed
+    return in << static_cast<typename std::underlying_type<T>::type>(item);
+}
+
+/// input streaming for enumerations
+template <typename T, typename = typename std::enable_if<std::is_enum<T>::value>::type>
+std::istream &operator>>(std::istream &in, T &item) {
+    typename std::underlying_type<T>::type i;
+    in >> i;
+    item = static_cast<T>(i);
+    return in;
+}
+} // namespace enums
+
+/// Export to CLI namespace
+using namespace enums;
+
+namespace detail {
+
+// Based on http://stackoverflow.com/questions/236129/split-a-string-in-c
+/// Split a string by a delim
+inline std::vector<std::string> split(const std::string &s, char delim) {
+    std::vector<std::string> elems;
+    // Check to see if empty string, give consistent result
+    if(s.empty())
+        elems.emplace_back();
+    else {
+        std::stringstream ss;
+        ss.str(s);
+        std::string item;
+        while(std::getline(ss, item, delim)) {
+            elems.push_back(item);
+        }
+    }
+    return elems;
+}
+/// simple utility to convert various types to a string
+template <typename T> inline std::string as_string(const T &v) {
+    std::ostringstream s;
+    s << v;
+    return s.str();
+}
+// if the data type is already a string just forward it
+template <typename T, typename = typename std::enable_if<std::is_constructible<std::string, T>::value>::type>
+inline auto as_string(T &&v) -> decltype(std::forward<T>(v)) {
+    return std::forward<T>(v);
+}
+
+/// Simple function to join a string
+template <typename T> std::string join(const T &v, std::string delim = ",") {
+    std::ostringstream s;
+    auto beg = std::begin(v);
+    auto end = std::end(v);
+    if(beg != end)
+        s << *beg++;
+    while(beg != end) {
+        s << delim << *beg++;
+    }
+    return s.str();
+}
+
+/// Simple function to join a string from processed elements
+template <typename T,
+          typename Callable,
+          typename = typename std::enable_if<!std::is_constructible<std::string, Callable>::value>::type>
+std::string join(const T &v, Callable func, std::string delim = ",") {
+    std::ostringstream s;
+    auto beg = std::begin(v);
+    auto end = std::end(v);
+    if(beg != end)
+        s << func(*beg++);
+    while(beg != end) {
+        s << delim << func(*beg++);
+    }
+    return s.str();
+}
+
+/// Join a string in reverse order
+template <typename T> std::string rjoin(const T &v, std::string delim = ",") {
+    std::ostringstream s;
+    for(size_t start = 0; start < v.size(); start++) {
+        if(start > 0)
+            s << delim;
+        s << v[v.size() - start - 1];
+    }
+    return s.str();
+}
+
+// Based roughly on http://stackoverflow.com/questions/25829143/c-trim-whitespace-from-a-string
+
+/// Trim whitespace from left of string
+inline std::string &ltrim(std::string &str) {
+    auto it = std::find_if(str.begin(), str.end(), [](char ch) { return !std::isspace<char>(ch, std::locale()); });
+    str.erase(str.begin(), it);
+    return str;
+}
+
+/// Trim anything from left of string
+inline std::string &ltrim(std::string &str, const std::string &filter) {
+    auto it = std::find_if(str.begin(), str.end(), [&filter](char ch) { return filter.find(ch) == std::string::npos; });
+    str.erase(str.begin(), it);
+    return str;
+}
+
+/// Trim whitespace from right of string
+inline std::string &rtrim(std::string &str) {
+    auto it = std::find_if(str.rbegin(), str.rend(), [](char ch) { return !std::isspace<char>(ch, std::locale()); });
+    str.erase(it.base(), str.end());
+    return str;
+}
+
+/// Trim anything from right of string
+inline std::string &rtrim(std::string &str, const std::string &filter) {
+    auto it =
+        std::find_if(str.rbegin(), str.rend(), [&filter](char ch) { return filter.find(ch) == std::string::npos; });
+    str.erase(it.base(), str.end());
+    return str;
+}
+
+/// Trim whitespace from string
+inline std::string &trim(std::string &str) { return ltrim(rtrim(str)); }
+
+/// Trim anything from string
+inline std::string &trim(std::string &str, const std::string filter) { return ltrim(rtrim(str, filter), filter); }
+
+/// Make a copy of the string and then trim it
+inline std::string trim_copy(const std::string &str) {
+    std::string s = str;
+    return trim(s);
+}
+
+/// Make a copy of the string and then trim it, any filter string can be used (any char in string is filtered)
+inline std::string trim_copy(const std::string &str, const std::string &filter) {
+    std::string s = str;
+    return trim(s, filter);
+}
+/// Print a two part "help" string
+inline std::ostream &format_help(std::ostream &out, std::string name, std::string description, size_t wid) {
+    name = "  " + name;
+    out << std::setw(static_cast<int>(wid)) << std::left << name;
+    if(!description.empty()) {
+        if(name.length() >= wid)
+            out << "\n" << std::setw(static_cast<int>(wid)) << "";
+        for(const char c : description) {
+            out.put(c);
+            if(c == '\n') {
+                out << std::setw(static_cast<int>(wid)) << "";
+            }
+        }
+    }
+    out << "\n";
+    return out;
+}
+
+/// Verify the first character of an option
+template <typename T> bool valid_first_char(T c) {
+    return std::isalnum(c, std::locale()) || c == '_' || c == '?' || c == '@';
+}
+
+/// Verify following characters of an option
+template <typename T> bool valid_later_char(T c) { return valid_first_char(c) || c == '.' || c == '-'; }
+
+/// Verify an option name
+inline bool valid_name_string(const std::string &str) {
+    if(str.empty() || !valid_first_char(str[0]))
+        return false;
+    for(auto c : str.substr(1))
+        if(!valid_later_char(c))
+            return false;
+    return true;
+}
+
+/// Verify that str consists of letters only
+inline bool isalpha(const std::string &str) {
+    return std::all_of(str.begin(), str.end(), [](char c) { return std::isalpha(c, std::locale()); });
+}
+
+/// Return a lower case version of a string
+inline std::string to_lower(std::string str) {
+    std::transform(std::begin(str), std::end(str), std::begin(str), [](const std::string::value_type &x) {
+        return std::tolower(x, std::locale());
+    });
+    return str;
+}
+
+/// remove underscores from a string
+inline std::string remove_underscore(std::string str) {
+    str.erase(std::remove(std::begin(str), std::end(str), '_'), std::end(str));
+    return str;
+}
+
+/// Find and replace a substring with another substring
+inline std::string find_and_replace(std::string str, std::string from, std::string to) {
+
+    size_t start_pos = 0;
+
+    while((start_pos = str.find(from, start_pos)) != std::string::npos) {
+        str.replace(start_pos, from.length(), to);
+        start_pos += to.length();
+    }
+
+    return str;
+}
+
+/// check if the flag definitions has possible false flags
+inline bool has_default_flag_values(const std::string &flags) {
+    return (flags.find_first_of("{!") != std::string::npos);
+}
+
+inline void remove_default_flag_values(std::string &flags) {
+    auto loc = flags.find_first_of('{');
+    while(loc != std::string::npos) {
+        auto finish = flags.find_first_of("},", loc + 1);
+        if((finish != std::string::npos) && (flags[finish] == '}')) {
+            flags.erase(flags.begin() + static_cast<std::ptrdiff_t>(loc),
+                        flags.begin() + static_cast<std::ptrdiff_t>(finish) + 1);
+        }
+        loc = flags.find_first_of('{', loc + 1);
+    }
+    flags.erase(std::remove(flags.begin(), flags.end(), '!'), flags.end());
+}
+
+/// Check if a string is a member of a list of strings and optionally ignore case or ignore underscores
+inline std::ptrdiff_t find_member(std::string name,
+                                  const std::vector<std::string> names,
+                                  bool ignore_case = false,
+                                  bool ignore_underscore = false) {
+    auto it = std::end(names);
+    if(ignore_case) {
+        if(ignore_underscore) {
+            name = detail::to_lower(detail::remove_underscore(name));
+            it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
+                return detail::to_lower(detail::remove_underscore(local_name)) == name;
+            });
+        } else {
+            name = detail::to_lower(name);
+            it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
+                return detail::to_lower(local_name) == name;
+            });
+        }
+
+    } else if(ignore_underscore) {
+        name = detail::remove_underscore(name);
+        it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
+            return detail::remove_underscore(local_name) == name;
+        });
+    } else
+        it = std::find(std::begin(names), std::end(names), name);
+
+    return (it != std::end(names)) ? (it - std::begin(names)) : (-1);
+}
+
+/// Find a trigger string and call a modify callable function that takes the current string and starting position of the
+/// trigger and returns the position in the string to search for the next trigger string
+template <typename Callable> inline std::string find_and_modify(std::string str, std::string trigger, Callable modify) {
+    size_t start_pos = 0;
+    while((start_pos = str.find(trigger, start_pos)) != std::string::npos) {
+        start_pos = modify(str, start_pos);
+    }
+    return str;
+}
+
+/// Split a string '"one two" "three"' into 'one two', 'three'
+/// Quote characters can be ` ' or "
+inline std::vector<std::string> split_up(std::string str) {
+
+    const std::string delims("\'\"`");
+    auto find_ws = [](char ch) { return std::isspace<char>(ch, std::locale()); };
+    trim(str);
+
+    std::vector<std::string> output;
+    bool embeddedQuote = false;
+    char keyChar = ' ';
+    while(!str.empty()) {
+        if(delims.find_first_of(str[0]) != std::string::npos) {
+            keyChar = str[0];
+            auto end = str.find_first_of(keyChar, 1);
+            while((end != std::string::npos) && (str[end - 1] == '\\')) { // deal with escaped quotes
+                end = str.find_first_of(keyChar, end + 1);
+                embeddedQuote = true;
+            }
+            if(end != std::string::npos) {
+                output.push_back(str.substr(1, end - 1));
+                str = str.substr(end + 1);
+            } else {
+                output.push_back(str.substr(1));
+                str = "";
+            }
+        } else {
+            auto it = std::find_if(std::begin(str), std::end(str), find_ws);
+            if(it != std::end(str)) {
+                std::string value = std::string(str.begin(), it);
+                output.push_back(value);
+                str = std::string(it, str.end());
+            } else {
+                output.push_back(str);
+                str = "";
+            }
+        }
+        // transform any embedded quotes into the regular character
+        if(embeddedQuote) {
+            output.back() = find_and_replace(output.back(), std::string("\\") + keyChar, std::string(1, keyChar));
+            embeddedQuote = false;
+        }
+        trim(str);
+    }
+    return output;
+}
+
+/// Add a leader to the beginning of all new lines (nothing is added
+/// at the start of the first line). `"; "` would be for ini files
+///
+/// Can't use Regex, or this would be a subs.
+inline std::string fix_newlines(std::string leader, std::string input) {
+    std::string::size_type n = 0;
+    while(n != std::string::npos && n < input.size()) {
+        n = input.find('\n', n);
+        if(n != std::string::npos) {
+            input = input.substr(0, n + 1) + leader + input.substr(n + 1);
+            n += leader.size();
+        }
+    }
+    return input;
+}
+
+/// This function detects an equal or colon followed by an escaped quote after an argument
+/// then modifies the string to replace the equality with a space.  This is needed
+/// to allow the split up function to work properly and is intended to be used with the find_and_modify function
+/// the return value is the offset+1 which is required by the find_and_modify function.
+inline size_t escape_detect(std::string &str, size_t offset) {
+    auto next = str[offset + 1];
+    if((next == '\"') || (next == '\'') || (next == '`')) {
+        auto astart = str.find_last_of("-/ \"\'`", offset - 1);
+        if(astart != std::string::npos) {
+            if(str[astart] == ((str[offset] == '=') ? '-' : '/'))
+                str[offset] = ' '; // interpret this as a space so the split_up works properly
+        }
+    }
+    return offset + 1;
+}
+
+/// Add quotes if the string contains spaces
+inline std::string &add_quotes_if_needed(std::string &str) {
+    if((str.front() != '"' && str.front() != '\'') || str.front() != str.back()) {
+        char quote = str.find('"') < str.find('\'') ? '\'' : '"';
+        if(str.find(' ') != std::string::npos) {
+            str.insert(0, 1, quote);
+            str.append(1, quote);
+        }
+    }
+    return str;
+}
+
+} // namespace detail
+
+} // namespace CLI
+
+// From CLI/Error.hpp:
+
+namespace CLI {
+
+// Use one of these on all error classes.
+// These are temporary and are undef'd at the end of this file.
+#define CLI11_ERROR_DEF(parent, name)                                                                                  \
+  protected:                                                                                                           \
+    name(std::string ename, std::string msg, int exit_code) : parent(std::move(ename), std::move(msg), exit_code) {}   \
+    name(std::string ename, std::string msg, ExitCodes exit_code)                                                      \
+        : parent(std::move(ename), std::move(msg), exit_code) {}                                                       \
+                                                                                                                       \
+  public:                                                                                                              \
+    name(std::string msg, ExitCodes exit_code) : parent(#name, std::move(msg), exit_code) {}                           \
+    name(std::string msg, int exit_code) : parent(#name, std::move(msg), exit_code) {}
+
+// This is added after the one above if a class is used directly and builds its own message
+#define CLI11_ERROR_SIMPLE(name)                                                                                       \
+    explicit name(std::string msg) : name(#name, msg, ExitCodes::name) {}
+
+/// These codes are part of every error in CLI. They can be obtained from e using e.exit_code or as a quick shortcut,
+/// int values from e.get_error_code().
+enum class ExitCodes {
+    Success = 0,
+    IncorrectConstruction = 100,
+    BadNameString,
+    OptionAlreadyAdded,
+    FileError,
+    ConversionError,
+    ValidationError,
+    RequiredError,
+    RequiresError,
+    ExcludesError,
+    ExtrasError,
+    ConfigError,
+    InvalidError,
+    HorribleError,
+    OptionNotFound,
+    ArgumentMismatch,
+    BaseClass = 127
+};
+
+// Error definitions
+
+/// @defgroup error_group Errors
+/// @brief Errors thrown by CLI11
+///
+/// These are the errors that can be thrown. Some of them, like CLI::Success, are not really errors.
+/// @{
+
+/// All errors derive from this one
+class Error : public std::runtime_error {
+    int actual_exit_code;
+    std::string error_name{"Error"};
+
+  public:
+    int get_exit_code() const { return actual_exit_code; }
+
+    std::string get_name() const { return error_name; }
+
+    Error(std::string name, std::string msg, int exit_code = static_cast<int>(ExitCodes::BaseClass))
+        : runtime_error(msg), actual_exit_code(exit_code), error_name(std::move(name)) {}
+
+    Error(std::string name, std::string msg, ExitCodes exit_code) : Error(name, msg, static_cast<int>(exit_code)) {}
+};
+
+// Note: Using Error::Error constructors does not work on GCC 4.7
+
+/// Construction errors (not in parsing)
+class ConstructionError : public Error {
+    CLI11_ERROR_DEF(Error, ConstructionError)
+};
+
+/// Thrown when an option is set to conflicting values (non-vector and multi args, for example)
+class IncorrectConstruction : public ConstructionError {
+    CLI11_ERROR_DEF(ConstructionError, IncorrectConstruction)
+    CLI11_ERROR_SIMPLE(IncorrectConstruction)
+    static IncorrectConstruction PositionalFlag(std::string name) {
+        return IncorrectConstruction(name + ": Flags cannot be positional");
+    }
+    static IncorrectConstruction Set0Opt(std::string name) {
+        return IncorrectConstruction(name + ": Cannot set 0 expected, use a flag instead");
+    }
+    static IncorrectConstruction SetFlag(std::string name) {
+        return IncorrectConstruction(name + ": Cannot set an expected number for flags");
+    }
+    static IncorrectConstruction ChangeNotVector(std::string name) {
+        return IncorrectConstruction(name + ": You can only change the expected arguments for vectors");
+    }
+    static IncorrectConstruction AfterMultiOpt(std::string name) {
+        return IncorrectConstruction(
+            name + ": You can't change expected arguments after you've changed the multi option policy!");
+    }
+    static IncorrectConstruction MissingOption(std::string name) {
+        return IncorrectConstruction("Option " + name + " is not defined");
+    }
+    static IncorrectConstruction MultiOptionPolicy(std::string name) {
+        return IncorrectConstruction(name + ": multi_option_policy only works for flags and exact value options");
+    }
+};
+
+/// Thrown on construction of a bad name
+class BadNameString : public ConstructionError {
+    CLI11_ERROR_DEF(ConstructionError, BadNameString)
+    CLI11_ERROR_SIMPLE(BadNameString)
+    static BadNameString OneCharName(std::string name) { return BadNameString("Invalid one char name: " + name); }
+    static BadNameString BadLongName(std::string name) { return BadNameString("Bad long name: " + name); }
+    static BadNameString DashesOnly(std::string name) {
+        return BadNameString("Must have a name, not just dashes: " + name);
+    }
+    static BadNameString MultiPositionalNames(std::string name) {
+        return BadNameString("Only one positional name allowed, remove: " + name);
+    }
+};
+
+/// Thrown when an option already exists
+class OptionAlreadyAdded : public ConstructionError {
+    CLI11_ERROR_DEF(ConstructionError, OptionAlreadyAdded)
+    explicit OptionAlreadyAdded(std::string name)
+        : OptionAlreadyAdded(name + " is already added", ExitCodes::OptionAlreadyAdded) {}
+    static OptionAlreadyAdded Requires(std::string name, std::string other) {
+        return OptionAlreadyAdded(name + " requires " + other, ExitCodes::OptionAlreadyAdded);
+    }
+    static OptionAlreadyAdded Excludes(std::string name, std::string other) {
+        return OptionAlreadyAdded(name + " excludes " + other, ExitCodes::OptionAlreadyAdded);
+    }
+};
+
+// Parsing errors
+
+/// Anything that can error in Parse
+class ParseError : public Error {
+    CLI11_ERROR_DEF(Error, ParseError)
+};
+
+// Not really "errors"
+
+/// This is a successful completion on parsing, supposed to exit
+class Success : public ParseError {
+    CLI11_ERROR_DEF(ParseError, Success)
+    Success() : Success("Successfully completed, should be caught and quit", ExitCodes::Success) {}
+};
+
+/// -h or --help on command line
+class CallForHelp : public ParseError {
+    CLI11_ERROR_DEF(ParseError, CallForHelp)
+    CallForHelp() : CallForHelp("This should be caught in your main function, see examples", ExitCodes::Success) {}
+};
+
+/// Usually something like --help-all on command line
+class CallForAllHelp : public ParseError {
+    CLI11_ERROR_DEF(ParseError, CallForAllHelp)
+    CallForAllHelp()
+        : CallForAllHelp("This should be caught in your main function, see examples", ExitCodes::Success) {}
+};
+
+/// Does not output a diagnostic in CLI11_PARSE, but allows to return from main() with a specific error code.
+class RuntimeError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, RuntimeError)
+    explicit RuntimeError(int exit_code = 1) : RuntimeError("Runtime error", exit_code) {}
+};
+
+/// Thrown when parsing an INI file and it is missing
+class FileError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, FileError)
+    CLI11_ERROR_SIMPLE(FileError)
+    static FileError Missing(std::string name) { return FileError(name + " was not readable (missing?)"); }
+};
+
+/// Thrown when conversion call back fails, such as when an int fails to coerce to a string
+class ConversionError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ConversionError)
+    CLI11_ERROR_SIMPLE(ConversionError)
+    ConversionError(std::string member, std::string name)
+        : ConversionError("The value " + member + " is not an allowed value for " + name) {}
+    ConversionError(std::string name, std::vector<std::string> results)
+        : ConversionError("Could not convert: " + name + " = " + detail::join(results)) {}
+    static ConversionError TooManyInputsFlag(std::string name) {
+        return ConversionError(name + ": too many inputs for a flag");
+    }
+    static ConversionError TrueFalse(std::string name) {
+        return ConversionError(name + ": Should be true/false or a number");
+    }
+};
+
+/// Thrown when validation of results fails
+class ValidationError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ValidationError)
+    CLI11_ERROR_SIMPLE(ValidationError)
+    explicit ValidationError(std::string name, std::string msg) : ValidationError(name + ": " + msg) {}
+};
+
+/// Thrown when a required option is missing
+class RequiredError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, RequiredError)
+    explicit RequiredError(std::string name) : RequiredError(name + " is required", ExitCodes::RequiredError) {}
+    static RequiredError Subcommand(size_t min_subcom) {
+        if(min_subcom == 1)
+            return RequiredError("A subcommand");
+        else
+            return RequiredError("Requires at least " + std::to_string(min_subcom) + " subcommands",
+                                 ExitCodes::RequiredError);
+    }
+    static RequiredError Option(size_t min_option, size_t max_option, size_t used, const std::string &option_list) {
+        if((min_option == 1) && (max_option == 1) && (used == 0))
+            return RequiredError("Exactly 1 option from [" + option_list + "]");
+        else if((min_option == 1) && (max_option == 1) && (used > 1))
+            return RequiredError("Exactly 1 option from [" + option_list + "] is required and " + std::to_string(used) +
+                                     " were given",
+                                 ExitCodes::RequiredError);
+        else if((min_option == 1) && (used == 0))
+            return RequiredError("At least 1 option from [" + option_list + "]");
+        else if(used < min_option)
+            return RequiredError("Requires at least " + std::to_string(min_option) + " options used and only " +
+                                     std::to_string(used) + "were given from [" + option_list + "]",
+                                 ExitCodes::RequiredError);
+        else if(max_option == 1)
+            return RequiredError("Requires at most 1 options be given from [" + option_list + "]",
+                                 ExitCodes::RequiredError);
+        else
+            return RequiredError("Requires at most " + std::to_string(max_option) + " options be used and " +
+                                     std::to_string(used) + "were given from [" + option_list + "]",
+                                 ExitCodes::RequiredError);
+    }
+};
+
+/// Thrown when the wrong number of arguments has been received
+class ArgumentMismatch : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ArgumentMismatch)
+    CLI11_ERROR_SIMPLE(ArgumentMismatch)
+    ArgumentMismatch(std::string name, int expected, size_t recieved)
+        : ArgumentMismatch(expected > 0 ? ("Expected exactly " + std::to_string(expected) + " arguments to " + name +
+                                           ", got " + std::to_string(recieved))
+                                        : ("Expected at least " + std::to_string(-expected) + " arguments to " + name +
+                                           ", got " + std::to_string(recieved)),
+                           ExitCodes::ArgumentMismatch) {}
+
+    static ArgumentMismatch AtLeast(std::string name, int num) {
+        return ArgumentMismatch(name + ": At least " + std::to_string(num) + " required");
+    }
+    static ArgumentMismatch TypedAtLeast(std::string name, int num, std::string type) {
+        return ArgumentMismatch(name + ": " + std::to_string(num) + " required " + type + " missing");
+    }
+    static ArgumentMismatch FlagOverride(std::string name) {
+        return ArgumentMismatch(name + " was given a disallowed flag override");
+    }
+};
+
+/// Thrown when a requires option is missing
+class RequiresError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, RequiresError)
+    RequiresError(std::string curname, std::string subname)
+        : RequiresError(curname + " requires " + subname, ExitCodes::RequiresError) {}
+};
+
+/// Thrown when an excludes option is present
+class ExcludesError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ExcludesError)
+    ExcludesError(std::string curname, std::string subname)
+        : ExcludesError(curname + " excludes " + subname, ExitCodes::ExcludesError) {}
+};
+
+/// Thrown when too many positionals or options are found
+class ExtrasError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ExtrasError)
+    explicit ExtrasError(std::vector<std::string> args)
+        : ExtrasError((args.size() > 1 ? "The following arguments were not expected: "
+                                       : "The following argument was not expected: ") +
+                          detail::rjoin(args, " "),
+                      ExitCodes::ExtrasError) {}
+};
+
+/// Thrown when extra values are found in an INI file
+class ConfigError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, ConfigError)
+    CLI11_ERROR_SIMPLE(ConfigError)
+    static ConfigError Extras(std::string item) { return ConfigError("INI was not able to parse " + item); }
+    static ConfigError NotConfigurable(std::string item) {
+        return ConfigError(item + ": This option is not allowed in a configuration file");
+    }
+};
+
+/// Thrown when validation fails before parsing
+class InvalidError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, InvalidError)
+    explicit InvalidError(std::string name)
+        : InvalidError(name + ": Too many positional arguments with unlimited expected args", ExitCodes::InvalidError) {
+    }
+};
+
+/// This is just a safety check to verify selection and parsing match - you should not ever see it
+/// Strings are directly added to this error, but again, it should never be seen.
+class HorribleError : public ParseError {
+    CLI11_ERROR_DEF(ParseError, HorribleError)
+    CLI11_ERROR_SIMPLE(HorribleError)
+};
+
+// After parsing
+
+/// Thrown when counting a non-existent option
+class OptionNotFound : public Error {
+    CLI11_ERROR_DEF(Error, OptionNotFound)
+    explicit OptionNotFound(std::string name) : OptionNotFound(name + " not found", ExitCodes::OptionNotFound) {}
+};
+
+#undef CLI11_ERROR_DEF
+#undef CLI11_ERROR_SIMPLE
+
+/// @}
+
+} // namespace CLI
+
+// From CLI/TypeTools.hpp:
+
+namespace CLI {
+
+// Type tools
+
+// Utilities for type enabling
+namespace detail {
+// Based generally on https://rmf.io/cxx11/almost-static-if
+/// Simple empty scoped class
+enum class enabler {};
+
+/// An instance to use in EnableIf
+constexpr enabler dummy = {};
+} // namespace detail
+
+/// A copy of enable_if_t from C++14, compatible with C++11.
+///
+/// We could check to see if C++14 is being used, but it does not hurt to redefine this
+/// (even Google does this: https://github.com/google/skia/blob/master/include/private/SkTLogic.h)
+/// It is not in the std namespace anyway, so no harm done.
+template <bool B, class T = void> using enable_if_t = typename std::enable_if<B, T>::type;
+
+/// A copy of std::void_t from C++17 (helper for C++11 and C++14)
+template <typename... Ts> struct make_void { using type = void; };
+
+/// A copy of std::void_t from C++17 - same reasoning as enable_if_t, it does not hurt to redefine
+template <typename... Ts> using void_t = typename make_void<Ts...>::type;
+
+/// A copy of std::conditional_t from C++14 - same reasoning as enable_if_t, it does not hurt to redefine
+template <bool B, class T, class F> using conditional_t = typename std::conditional<B, T, F>::type;
+
+/// Check to see if something is a vector (fail check by default)
+template <typename T> struct is_vector : std::false_type {};
+
+/// Check to see if something is a vector (true if actually a vector)
+template <class T, class A> struct is_vector<std::vector<T, A>> : std::true_type {};
+
+/// Check to see if something is bool (fail check by default)
+template <typename T> struct is_bool : std::false_type {};
+
+/// Check to see if something is bool (true if actually a bool)
+template <> struct is_bool<bool> : std::true_type {};
+
+/// Check to see if something is a shared pointer
+template <typename T> struct is_shared_ptr : std::false_type {};
+
+/// Check to see if something is a shared pointer (True if really a shared pointer)
+template <typename T> struct is_shared_ptr<std::shared_ptr<T>> : std::true_type {};
+
+/// Check to see if something is a shared pointer (True if really a shared pointer)
+template <typename T> struct is_shared_ptr<const std::shared_ptr<T>> : std::true_type {};
+
+/// Check to see if something is copyable pointer
+template <typename T> struct is_copyable_ptr {
+    static bool const value = is_shared_ptr<T>::value || std::is_pointer<T>::value;
+};
+
+/// This can be specialized to override the type deduction for IsMember.
+template <typename T> struct IsMemberType { using type = T; };
+
+/// The main custom type needed here is const char * should be a string.
+template <> struct IsMemberType<const char *> { using type = std::string; };
+
+namespace detail {
+
+// These are utilities for IsMember
+
+/// Handy helper to access the element_type generically. This is not part of is_copyable_ptr because it requires that
+/// pointer_traits<T> be valid.
+template <typename T> struct element_type {
+    using type =
+        typename std::conditional<is_copyable_ptr<T>::value, typename std::pointer_traits<T>::element_type, T>::type;
+};
+
+/// Combination of the element type and value type - remove pointer (including smart pointers) and get the value_type of
+/// the container
+template <typename T> struct element_value_type { using type = typename element_type<T>::type::value_type; };
+
+/// Adaptor for set-like structure: This just wraps a normal container in a few utilities that do almost nothing.
+template <typename T, typename _ = void> struct pair_adaptor : std::false_type {
+    using value_type = typename T::value_type;
+    using first_type = typename std::remove_const<value_type>::type;
+    using second_type = typename std::remove_const<value_type>::type;
+
+    /// Get the first value (really just the underlying value)
+    template <typename Q> static auto first(Q &&pair_value) -> decltype(std::forward<Q>(pair_value)) {
+        return std::forward<Q>(pair_value);
+    }
+    /// Get the second value (really just the underlying value)
+    template <typename Q> static auto second(Q &&pair_value) -> decltype(std::forward<Q>(pair_value)) {
+        return std::forward<Q>(pair_value);
+    }
+};
+
+/// Adaptor for map-like structure (true version, must have key_type and mapped_type).
+/// This wraps a mapped container in a few utilities access it in a general way.
+template <typename T>
+struct pair_adaptor<
+    T,
+    conditional_t<false, void_t<typename T::value_type::first_type, typename T::value_type::second_type>, void>>
+    : std::true_type {
+    using value_type = typename T::value_type;
+    using first_type = typename std::remove_const<typename value_type::first_type>::type;
+    using second_type = typename std::remove_const<typename value_type::second_type>::type;
+
+    /// Get the first value (really just the underlying value)
+    template <typename Q> static auto first(Q &&pair_value) -> decltype(std::get<0>(std::forward<Q>(pair_value))) {
+        return std::get<0>(std::forward<Q>(pair_value));
+    }
+    /// Get the second value (really just the underlying value)
+    template <typename Q> static auto second(Q &&pair_value) -> decltype(std::get<1>(std::forward<Q>(pair_value))) {
+        return std::get<1>(std::forward<Q>(pair_value));
+    }
+};
+
+// Check for streamability
+// Based on https://stackoverflow.com/questions/22758291/how-can-i-detect-if-a-type-can-be-streamed-to-an-stdostream
+
+template <typename S, typename T> class is_streamable {
+    template <typename SS, typename TT>
+    static auto test(int) -> decltype(std::declval<SS &>() << std::declval<TT>(), std::true_type());
+
+    template <typename, typename> static auto test(...) -> std::false_type;
+
+  public:
+    static const bool value = decltype(test<S, T>(0))::value;
+};
+
+/// Convert an object to a string (directly forward if this can become a string)
+template <typename T, enable_if_t<std::is_constructible<std::string, T>::value, detail::enabler> = detail::dummy>
+auto to_string(T &&value) -> decltype(std::forward<T>(value)) {
+    return std::forward<T>(value);
+}
+
+/// Convert an object to a string (streaming must be supported for that type)
+template <typename T,
+          enable_if_t<!std::is_constructible<std::string, T>::value && is_streamable<std::stringstream, T>::value,
+                      detail::enabler> = detail::dummy>
+std::string to_string(T &&value) {
+    std::stringstream stream;
+    stream << value;
+    return stream.str();
+}
+
+/// If conversion is not supported, return an empty string (streaming is not supported for that type)
+template <typename T,
+          enable_if_t<!std::is_constructible<std::string, T>::value && !is_streamable<std::stringstream, T>::value,
+                      detail::enabler> = detail::dummy>
+std::string to_string(T &&) {
+    return std::string{};
+}
+
+// Type name print
+
+/// Was going to be based on
+///  http://stackoverflow.com/questions/1055452/c-get-name-of-type-in-template
+/// But this is cleaner and works better in this case
+
+template <typename T,
+          enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "INT";
+}
+
+template <typename T,
+          enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "UINT";
+}
+
+template <typename T, enable_if_t<std::is_floating_point<T>::value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "FLOAT";
+}
+
+/// This one should not be used, since vector types print the internal type
+template <typename T, enable_if_t<is_vector<T>::value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "VECTOR";
+}
+/// Print name for enumeration types
+template <typename T, enable_if_t<std::is_enum<T>::value, detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "ENUM";
+}
+
+/// Print for all other types
+template <typename T,
+          enable_if_t<!std::is_floating_point<T>::value && !std::is_integral<T>::value && !is_vector<T>::value &&
+                          !std::is_enum<T>::value,
+                      detail::enabler> = detail::dummy>
+constexpr const char *type_name() {
+    return "TEXT";
+}
+
+// Lexical cast
+
+/// Convert a flag into an integer value  typically binary flags
+inline int64_t to_flag_value(std::string val) {
+    static const std::string trueString("true");
+    static const std::string falseString("false");
+    if(val == trueString) {
+        return 1;
+    }
+    if(val == falseString) {
+        return -1;
+    }
+    val = detail::to_lower(val);
+    int64_t ret;
+    if(val.size() == 1) {
+        switch(val[0]) {
+        case '0':
+        case 'f':
+        case 'n':
+        case '-':
+            ret = -1;
+            break;
+        case '1':
+        case 't':
+        case 'y':
+        case '+':
+            ret = 1;
+            break;
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+            ret = val[0] - '0';
+            break;
+        default:
+            throw std::invalid_argument("unrecognized character");
+        }
+        return ret;
+    }
+    if(val == trueString || val == "on" || val == "yes" || val == "enable") {
+        ret = 1;
+    } else if(val == falseString || val == "off" || val == "no" || val == "disable") {
+        ret = -1;
+    } else {
+        ret = std::stoll(val);
+    }
+    return ret;
+}
+
+/// Signed integers
+template <
+    typename T,
+    enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value && !is_bool<T>::value && !std::is_enum<T>::value,
+                detail::enabler> = detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    try {
+        size_t n = 0;
+        long long output_ll = std::stoll(input, &n, 0);
+        output = static_cast<T>(output_ll);
+        return n == input.size() && static_cast<long long>(output) == output_ll;
+    } catch(const std::invalid_argument &) {
+        return false;
+    } catch(const std::out_of_range &) {
+        return false;
+    }
+}
+
+/// Unsigned integers
+template <typename T,
+          enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value && !is_bool<T>::value, detail::enabler> =
+              detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    if(!input.empty() && input.front() == '-')
+        return false; // std::stoull happily converts negative values to junk without any errors.
+
+    try {
+        size_t n = 0;
+        unsigned long long output_ll = std::stoull(input, &n, 0);
+        output = static_cast<T>(output_ll);
+        return n == input.size() && static_cast<unsigned long long>(output) == output_ll;
+    } catch(const std::invalid_argument &) {
+        return false;
+    } catch(const std::out_of_range &) {
+        return false;
+    }
+}
+
+/// Boolean values
+template <typename T, enable_if_t<is_bool<T>::value, detail::enabler> = detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    try {
+        auto out = to_flag_value(input);
+        output = (out > 0);
+        return true;
+    } catch(const std::invalid_argument &) {
+        return false;
+    }
+}
+
+/// Floats
+template <typename T, enable_if_t<std::is_floating_point<T>::value, detail::enabler> = detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    try {
+        size_t n = 0;
+        output = static_cast<T>(std::stold(input, &n));
+        return n == input.size();
+    } catch(const std::invalid_argument &) {
+        return false;
+    } catch(const std::out_of_range &) {
+        return false;
+    }
+}
+
+/// String and similar
+template <typename T,
+          enable_if_t<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                          std::is_assignable<T &, std::string>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    output = input;
+    return true;
+}
+
+/// Enumerations
+template <typename T, enable_if_t<std::is_enum<T>::value, detail::enabler> = detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    typename std::underlying_type<T>::type val;
+    bool retval = detail::lexical_cast(input, val);
+    if(!retval) {
+        return false;
+    }
+    output = static_cast<T>(val);
+    return true;
+}
+
+/// Non-string parsable
+template <typename T,
+          enable_if_t<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
+                          !std::is_assignable<T &, std::string>::value && !std::is_enum<T>::value,
+                      detail::enabler> = detail::dummy>
+bool lexical_cast(std::string input, T &output) {
+    std::istringstream is;
+
+    is.str(input);
+    is >> output;
+    return !is.fail() && !is.rdbuf()->in_avail();
+}
+
+/// Sum a vector of flag representations
+/// The flag vector produces a series of strings in a vector,  simple true is represented by a "1",  simple false is by
+/// "-1" an if numbers are passed by some fashion they are captured as well so the function just checks for the most
+/// common true and false strings then uses stoll to convert the rest for summing
+template <typename T,
+          enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value, detail::enabler> = detail::dummy>
+void sum_flag_vector(const std::vector<std::string> &flags, T &output) {
+    int64_t count{0};
+    for(auto &flag : flags) {
+        count += detail::to_flag_value(flag);
+    }
+    output = (count > 0) ? static_cast<T>(count) : T{0};
+}
+
+/// Sum a vector of flag representations
+/// The flag vector produces a series of strings in a vector,  simple true is represented by a "1",  simple false is by
+/// "-1" an if numbers are passed by some fashion they are captured as well so the function just checks for the most
+/// common true and false strings then uses stoll to convert the rest for summing
+template <typename T,
+          enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value, detail::enabler> = detail::dummy>
+void sum_flag_vector(const std::vector<std::string> &flags, T &output) {
+    int64_t count{0};
+    for(auto &flag : flags) {
+        count += detail::to_flag_value(flag);
+    }
+    output = static_cast<T>(count);
+}
+
+} // namespace detail
+} // namespace CLI
+
+// From CLI/Split.hpp:
+
+namespace CLI {
+namespace detail {
+
+// Returns false if not a short option. Otherwise, sets opt name and rest and returns true
+inline bool split_short(const std::string &current, std::string &name, std::string &rest) {
+    if(current.size() > 1 && current[0] == '-' && valid_first_char(current[1])) {
+        name = current.substr(1, 1);
+        rest = current.substr(2);
+        return true;
+    } else
+        return false;
+}
+
+// Returns false if not a long option. Otherwise, sets opt name and other side of = and returns true
+inline bool split_long(const std::string &current, std::string &name, std::string &value) {
+    if(current.size() > 2 && current.substr(0, 2) == "--" && valid_first_char(current[2])) {
+        auto loc = current.find_first_of('=');
+        if(loc != std::string::npos) {
+            name = current.substr(2, loc - 2);
+            value = current.substr(loc + 1);
+        } else {
+            name = current.substr(2);
+            value = "";
+        }
+        return true;
+    } else
+        return false;
+}
+
+// Returns false if not a windows style option. Otherwise, sets opt name and value and returns true
+inline bool split_windows_style(const std::string &current, std::string &name, std::string &value) {
+    if(current.size() > 1 && current[0] == '/' && valid_first_char(current[1])) {
+        auto loc = current.find_first_of(':');
+        if(loc != std::string::npos) {
+            name = current.substr(1, loc - 1);
+            value = current.substr(loc + 1);
+        } else {
+            name = current.substr(1);
+            value = "";
+        }
+        return true;
+    } else
+        return false;
+}
+
+// Splits a string into multiple long and short names
+inline std::vector<std::string> split_names(std::string current) {
+    std::vector<std::string> output;
+    size_t val;
+    while((val = current.find(",")) != std::string::npos) {
+        output.push_back(trim_copy(current.substr(0, val)));
+        current = current.substr(val + 1);
+    }
+    output.push_back(trim_copy(current));
+    return output;
+}
+
+/// extract default flag values either {def} or starting with a !
+inline std::vector<std::pair<std::string, std::string>> get_default_flag_values(const std::string &str) {
+    std::vector<std::string> flags = split_names(str);
+    flags.erase(std::remove_if(flags.begin(),
+                               flags.end(),
+                               [](const std::string &name) {
+                                   return ((name.empty()) || (!(((name.find_first_of('{') != std::string::npos) &&
+                                                                 (name.back() == '}')) ||
+                                                                (name[0] == '!'))));
+                               }),
+                flags.end());
+    std::vector<std::pair<std::string, std::string>> output;
+    output.reserve(flags.size());
+    for(auto &flag : flags) {
+        auto def_start = flag.find_first_of('{');
+        std::string defval = "false";
+        if((def_start != std::string::npos) && (flag.back() == '}')) {
+            defval = flag.substr(def_start + 1);
+            defval.pop_back();
+            flag.erase(def_start, std::string::npos);
+        }
+        flag.erase(0, flag.find_first_not_of("-!"));
+        output.emplace_back(flag, defval);
+    }
+    return output;
+}
+
+/// Get a vector of short names, one of long names, and a single name
+inline std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
+get_names(const std::vector<std::string> &input) {
+
+    std::vector<std::string> short_names;
+    std::vector<std::string> long_names;
+    std::string pos_name;
+
+    for(std::string name : input) {
+        if(name.length() == 0)
+            continue;
+        else if(name.length() > 1 && name[0] == '-' && name[1] != '-') {
+            if(name.length() == 2 && valid_first_char(name[1]))
+                short_names.emplace_back(1, name[1]);
+            else
+                throw BadNameString::OneCharName(name);
+        } else if(name.length() > 2 && name.substr(0, 2) == "--") {
+            name = name.substr(2);
+            if(valid_name_string(name))
+                long_names.push_back(name);
+            else
+                throw BadNameString::BadLongName(name);
+        } else if(name == "-" || name == "--") {
+            throw BadNameString::DashesOnly(name);
+        } else {
+            if(pos_name.length() > 0)
+                throw BadNameString::MultiPositionalNames(name);
+            pos_name = name;
+        }
+    }
+
+    return std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>(
+        short_names, long_names, pos_name);
+}
+
+} // namespace detail
+} // namespace CLI
+
+// From CLI/ConfigFwd.hpp:
+
+namespace CLI {
+
+class App;
+
+namespace detail {
+
+/// Comma separated join, adds quotes if needed
+inline std::string ini_join(std::vector<std::string> args) {
+    std::ostringstream s;
+    size_t start = 0;
+    for(const auto &arg : args) {
+        if(start++ > 0)
+            s << " ";
+
+        auto it = std::find_if(arg.begin(), arg.end(), [](char ch) { return std::isspace<char>(ch, std::locale()); });
+        if(it == arg.end())
+            s << arg;
+        else if(arg.find_first_of('\"') == std::string::npos)
+            s << '\"' << arg << '\"';
+        else
+            s << '\'' << arg << '\'';
+    }
+
+    return s.str();
+}
+
+} // namespace detail
+
+/// Holds values to load into Options
+struct ConfigItem {
+    /// This is the list of parents
+    std::vector<std::string> parents;
+
+    /// This is the name
+    std::string name;
+
+    /// Listing of inputs
+    std::vector<std::string> inputs;
+
+    /// The list of parents and name joined by "."
+    std::string fullname() const {
+        std::vector<std::string> tmp = parents;
+        tmp.emplace_back(name);
+        return detail::join(tmp, ".");
+    }
+};
+
+/// This class provides a converter for configuration files.
+class Config {
+  protected:
+    std::vector<ConfigItem> items;
+
+  public:
+    /// Convert an app into a configuration
+    virtual std::string to_config(const App *, bool, bool, std::string) const = 0;
+
+    /// Convert a configuration into an app
+    virtual std::vector<ConfigItem> from_config(std::istream &) const = 0;
+
+    /// Get a flag value
+    virtual std::string to_flag(const ConfigItem &item) const {
+        if(item.inputs.size() == 1) {
+            return item.inputs.at(0);
+        }
+        throw ConversionError::TooManyInputsFlag(item.fullname());
+    }
+
+    /// Parse a config file, throw an error (ParseError:ConfigParseError or FileError) on failure
+    std::vector<ConfigItem> from_file(const std::string &name) {
+        std::ifstream input{name};
+        if(!input.good())
+            throw FileError::Missing(name);
+
+        return from_config(input);
+    }
+
+    /// Virtual destructor
+    virtual ~Config() = default;
+};
+
+/// This converter works with INI files
+class ConfigINI : public Config {
+  public:
+    std::string to_config(const App *, bool default_also, bool write_description, std::string prefix) const override;
+
+    std::vector<ConfigItem> from_config(std::istream &input) const override {
+        std::string line;
+        std::string section = "default";
+
+        std::vector<ConfigItem> output;
+
+        while(getline(input, line)) {
+            std::vector<std::string> items_buffer;
+
+            detail::trim(line);
+            size_t len = line.length();
+            if(len > 1 && line[0] == '[' && line[len - 1] == ']') {
+                section = line.substr(1, len - 2);
+            } else if(len > 0 && line[0] != ';') {
+                output.emplace_back();
+                ConfigItem &out = output.back();
+
+                // Find = in string, split and recombine
+                auto pos = line.find('=');
+                if(pos != std::string::npos) {
+                    out.name = detail::trim_copy(line.substr(0, pos));
+                    std::string item = detail::trim_copy(line.substr(pos + 1));
+                    items_buffer = detail::split_up(item);
+                } else {
+                    out.name = detail::trim_copy(line);
+                    items_buffer = {"ON"};
+                }
+
+                if(detail::to_lower(section) != "default") {
+                    out.parents = {section};
+                }
+
+                if(out.name.find('.') != std::string::npos) {
+                    std::vector<std::string> plist = detail::split(out.name, '.');
+                    out.name = plist.back();
+                    plist.pop_back();
+                    out.parents.insert(out.parents.end(), plist.begin(), plist.end());
+                }
+
+                out.inputs.insert(std::end(out.inputs), std::begin(items_buffer), std::end(items_buffer));
+            }
+        }
+        return output;
+    }
+};
+
+} // namespace CLI
+
+// From CLI/Validators.hpp:
+
+namespace CLI {
+
+class Option;
+
+/// @defgroup validator_group Validators
+
+/// @brief Some validators that are provided
+///
+/// These are simple `std::string(const std::string&)` validators that are useful. They return
+/// a string if the validation fails. A custom struct is provided, as well, with the same user
+/// semantics, but with the ability to provide a new type name.
+/// @{
+
+///
+class Validator {
+  protected:
+    /// This is the description function, if empty the description_ will be used
+    std::function<std::string()> desc_function_{[]() { return std::string{}; }};
+
+    /// This it the base function that is to be called.
+    /// Returns a string error message if validation fails.
+    std::function<std::string(std::string &)> func_{[](std::string &) { return std::string{}; }};
+    /// The name for search purposes of the Validator
+    std::string name_;
+    /// Enable for Validator to allow it to be disabled if need be
+    bool active_{true};
+    /// specify that a validator should not modify the input
+    bool non_modifying_{false};
+
+  public:
+    Validator() = default;
+    /// Construct a Validator with just the description string
+    explicit Validator(std::string validator_desc) : desc_function_([validator_desc]() { return validator_desc; }) {}
+    // Construct Validator from basic information
+    Validator(std::function<std::string(std::string &)> op, std::string validator_desc, std::string validator_name = "")
+        : desc_function_([validator_desc]() { return validator_desc; }), func_(std::move(op)),
+          name_(std::move(validator_name)) {}
+    /// Set the Validator operation function
+    Validator &operation(std::function<std::string(std::string &)> op) {
+        func_ = std::move(op);
+        return *this;
+    }
+    /// This is the required operator for a Validator - provided to help
+    /// users (CLI11 uses the member `func` directly)
+    std::string operator()(std::string &str) const {
+        std::string retstring;
+        if(active_) {
+            if(non_modifying_) {
+                std::string value = str;
+                retstring = func_(value);
+            } else {
+                retstring = func_(str);
+            }
+        }
+        return retstring;
+    };
+
+    /// This is the required operator for a Validator - provided to help
+    /// users (CLI11 uses the member `func` directly)
+    std::string operator()(const std::string &str) const {
+        std::string value = str;
+        return (active_) ? func_(value) : std::string{};
+    };
+
+    /// Specify the type string
+    Validator &description(std::string validator_desc) {
+        desc_function_ = [validator_desc]() { return validator_desc; };
+        return *this;
+    }
+    /// Generate type description information for the Validator
+    std::string get_description() const {
+        if(active_) {
+            return desc_function_();
+        }
+        return std::string{};
+    }
+    /// Specify the type string
+    Validator &name(std::string validator_name) {
+        name_ = std::move(validator_name);
+        return *this;
+    }
+    /// Get the name of the Validator
+    const std::string &get_name() const { return name_; }
+    /// Specify whether the Validator is active or not
+    Validator &active(bool active_val = true) {
+        active_ = active_val;
+        return *this;
+    }
+
+    /// Specify whether the Validator can be modifying or not
+    Validator &non_modifying(bool no_modify = true) {
+        non_modifying_ = no_modify;
+        return *this;
+    }
+
+    /// Get a boolean if the validator is active
+    bool get_active() const { return active_; }
+
+    /// Get a boolean if the validator is allowed to modify the input returns true if it can modify the input
+    bool get_modifying() const { return !non_modifying_; }
+
+    /// Combining validators is a new validator. Type comes from left validator if function, otherwise only set if the
+    /// same.
+    Validator operator&(const Validator &other) const {
+        Validator newval;
+
+        newval._merge_description(*this, other, " AND ");
+
+        // Give references (will make a copy in lambda function)
+        const std::function<std::string(std::string & filename)> &f1 = func_;
+        const std::function<std::string(std::string & filename)> &f2 = other.func_;
+
+        newval.func_ = [f1, f2](std::string &input) {
+            std::string s1 = f1(input);
+            std::string s2 = f2(input);
+            if(!s1.empty() && !s2.empty())
+                return std::string("(") + s1 + ") AND (" + s2 + ")";
+            else
+                return s1 + s2;
+        };
+
+        newval.active_ = (active_ & other.active_);
+        return newval;
+    }
+
+    /// Combining validators is a new validator. Type comes from left validator if function, otherwise only set if the
+    /// same.
+    Validator operator|(const Validator &other) const {
+        Validator newval;
+
+        newval._merge_description(*this, other, " OR ");
+
+        // Give references (will make a copy in lambda function)
+        const std::function<std::string(std::string &)> &f1 = func_;
+        const std::function<std::string(std::string &)> &f2 = other.func_;
+
+        newval.func_ = [f1, f2](std::string &input) {
+            std::string s1 = f1(input);
+            std::string s2 = f2(input);
+            if(s1.empty() || s2.empty())
+                return std::string();
+            else
+                return std::string("(") + s1 + ") OR (" + s2 + ")";
+        };
+        newval.active_ = (active_ & other.active_);
+        return newval;
+    }
+
+    /// Create a validator that fails when a given validator succeeds
+    Validator operator!() const {
+        Validator newval;
+        const std::function<std::string()> &dfunc1 = desc_function_;
+        newval.desc_function_ = [dfunc1]() {
+            auto str = dfunc1();
+            return (!str.empty()) ? std::string("NOT ") + str : std::string{};
+        };
+        // Give references (will make a copy in lambda function)
+        const std::function<std::string(std::string & res)> &f1 = func_;
+
+        newval.func_ = [f1, dfunc1](std::string &test) -> std::string {
+            std::string s1 = f1(test);
+            if(s1.empty()) {
+                return std::string("check ") + dfunc1() + " succeeded improperly";
+            } else
+                return std::string{};
+        };
+        newval.active_ = active_;
+        return newval;
+    }
+
+  private:
+    void _merge_description(const Validator &val1, const Validator &val2, const std::string &merger) {
+
+        const std::function<std::string()> &dfunc1 = val1.desc_function_;
+        const std::function<std::string()> &dfunc2 = val2.desc_function_;
+
+        desc_function_ = [=]() {
+            std::string f1 = dfunc1();
+            std::string f2 = dfunc2();
+            if((f1.empty()) || (f2.empty())) {
+                return f1 + f2;
+            }
+            return std::string("(") + f1 + ")" + merger + "(" + f2 + ")";
+        };
+    }
+};
+
+/// Class wrapping some of the accessors of Validator
+class CustomValidator : public Validator {
+  public:
+};
+// The implementation of the built in validators is using the Validator class;
+// the user is only expected to use the const (static) versions (since there's no setup).
+// Therefore, this is in detail.
+namespace detail {
+
+/// Check for an existing file (returns error message if check fails)
+class ExistingFileValidator : public Validator {
+  public:
+    ExistingFileValidator() : Validator("FILE") {
+        func_ = [](std::string &filename) {
+            struct stat buffer;
+            bool exist = stat(filename.c_str(), &buffer) == 0;
+            bool is_dir = (buffer.st_mode & S_IFDIR) != 0;
+            if(!exist) {
+                return "File does not exist: " + filename;
+            } else if(is_dir) {
+                return "File is actually a directory: " + filename;
+            }
+            return std::string();
+        };
+    }
+};
+
+/// Check for an existing directory (returns error message if check fails)
+class ExistingDirectoryValidator : public Validator {
+  public:
+    ExistingDirectoryValidator() : Validator("DIR") {
+        func_ = [](std::string &filename) {
+            struct stat buffer;
+            bool exist = stat(filename.c_str(), &buffer) == 0;
+            bool is_dir = (buffer.st_mode & S_IFDIR) != 0;
+            if(!exist) {
+                return "Directory does not exist: " + filename;
+            } else if(!is_dir) {
+                return "Directory is actually a file: " + filename;
+            }
+            return std::string();
+        };
+    }
+};
+
+/// Check for an existing path
+class ExistingPathValidator : public Validator {
+  public:
+    ExistingPathValidator() : Validator("PATH(existing)") {
+        func_ = [](std::string &filename) {
+            struct stat buffer;
+            bool const exist = stat(filename.c_str(), &buffer) == 0;
+            if(!exist) {
+                return "Path does not exist: " + filename;
+            }
+            return std::string();
+        };
+    }
+};
+
+/// Check for an non-existing path
+class NonexistentPathValidator : public Validator {
+  public:
+    NonexistentPathValidator() : Validator("PATH(non-existing)") {
+        func_ = [](std::string &filename) {
+            struct stat buffer;
+            bool exist = stat(filename.c_str(), &buffer) == 0;
+            if(exist) {
+                return "Path already exists: " + filename;
+            }
+            return std::string();
+        };
+    }
+};
+
+/// Validate the given string is a legal ipv4 address
+class IPV4Validator : public Validator {
+  public:
+    IPV4Validator() : Validator("IPV4") {
+        func_ = [](std::string &ip_addr) {
+            auto result = CLI::detail::split(ip_addr, '.');
+            if(result.size() != 4) {
+                return "Invalid IPV4 address must have four parts " + ip_addr;
+            }
+            int num;
+            bool retval = true;
+            for(const auto &var : result) {
+                retval &= detail::lexical_cast(var, num);
+                if(!retval) {
+                    return "Failed parsing number " + var;
+                }
+                if(num < 0 || num > 255) {
+                    return "Each IP number must be between 0 and 255 " + var;
+                }
+            }
+            return std::string();
+        };
+    }
+};
+
+/// Validate the argument is a number and greater than or equal to 0
+class PositiveNumber : public Validator {
+  public:
+    PositiveNumber() : Validator("POSITIVE") {
+        func_ = [](std::string &number_str) {
+            int number;
+            if(!detail::lexical_cast(number_str, number)) {
+                return "Failed parsing number " + number_str;
+            }
+            if(number < 0) {
+                return "Number less then 0 " + number_str;
+            }
+            return std::string();
+        };
+    }
+};
+
+/// Validate the argument is a number and greater than or equal to 0
+class Number : public Validator {
+  public:
+    Number() : Validator("NUMBER") {
+        func_ = [](std::string &number_str) {
+            double number;
+            if(!detail::lexical_cast(number_str, number)) {
+                return "Failed parsing as a number " + number_str;
+            }
+            return std::string();
+        };
+    }
+};
+
+} // namespace detail
+
+// Static is not needed here, because global const implies static.
+
+/// Check for existing file (returns error message if check fails)
+const detail::ExistingFileValidator ExistingFile;
+
+/// Check for an existing directory (returns error message if check fails)
+const detail::ExistingDirectoryValidator ExistingDirectory;
+
+/// Check for an existing path
+const detail::ExistingPathValidator ExistingPath;
+
+/// Check for an non-existing path
+const detail::NonexistentPathValidator NonexistentPath;
+
+/// Check for an IP4 address
+const detail::IPV4Validator ValidIPV4;
+
+/// Check for a positive number
+const detail::PositiveNumber PositiveNumber;
+
+/// Check for a number
+const detail::Number Number;
+
+/// Produce a range (factory). Min and max are inclusive.
+class Range : public Validator {
+  public:
+    /// This produces a range with min and max inclusive.
+    ///
+    /// Note that the constructor is templated, but the struct is not, so C++17 is not
+    /// needed to provide nice syntax for Range(a,b).
+    template <typename T> Range(T min, T max) {
+        std::stringstream out;
+        out << detail::type_name<T>() << " in [" << min << " - " << max << "]";
+        description(out.str());
+
+        func_ = [min, max](std::string &input) {
+            T val;
+            bool converted = detail::lexical_cast(input, val);
+            if((!converted) || (val < min || val > max))
+                return "Value " + input + " not in range " + std::to_string(min) + " to " + std::to_string(max);
+
+            return std::string();
+        };
+    }
+
+    /// Range of one value is 0 to value
+    template <typename T> explicit Range(T max) : Range(static_cast<T>(0), max) {}
+};
+
+/// Produce a bounded range (factory). Min and max are inclusive.
+class Bound : public Validator {
+  public:
+    /// This bounds a value with min and max inclusive.
+    ///
+    /// Note that the constructor is templated, but the struct is not, so C++17 is not
+    /// needed to provide nice syntax for Range(a,b).
+    template <typename T> Bound(T min, T max) {
+        std::stringstream out;
+        out << detail::type_name<T>() << " bounded to [" << min << " - " << max << "]";
+        description(out.str());
+
+        func_ = [min, max](std::string &input) {
+            T val;
+            bool converted = detail::lexical_cast(input, val);
+            if(!converted) {
+                return "Value " + input + " could not be converted";
+            }
+            if(val < min)
+                input = detail::as_string(min);
+            else if(val > max)
+                input = detail::as_string(max);
+
+            return std::string();
+        };
+    }
+
+    /// Range of one value is 0 to value
+    template <typename T> explicit Bound(T max) : Bound(static_cast<T>(0), max) {}
+};
+
+namespace detail {
+template <typename T,
+          enable_if_t<is_copyable_ptr<typename std::remove_reference<T>::type>::value, detail::enabler> = detail::dummy>
+auto smart_deref(T value) -> decltype(*value) {
+    return *value;
+}
+
+template <
+    typename T,
+    enable_if_t<!is_copyable_ptr<typename std::remove_reference<T>::type>::value, detail::enabler> = detail::dummy>
+typename std::remove_reference<T>::type &smart_deref(T &value) {
+    return value;
+}
+/// Generate a string representation of a set
+template <typename T> std::string generate_set(const T &set) {
+    using element_t = typename detail::element_type<T>::type;
+    using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair
+    std::string out(1, '{');
+    out.append(detail::join(detail::smart_deref(set),
+                            [](const iteration_type_t &v) { return detail::pair_adaptor<element_t>::first(v); },
+                            ","));
+    out.push_back('}');
+    return out;
+}
+
+/// Generate a string representation of a map
+template <typename T> std::string generate_map(const T &map, bool key_only = false) {
+    using element_t = typename detail::element_type<T>::type;
+    using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair
+    std::string out(1, '{');
+    out.append(detail::join(detail::smart_deref(map),
+                            [key_only](const iteration_type_t &v) {
+                                auto res = detail::as_string(detail::pair_adaptor<element_t>::first(v));
+                                if(!key_only) {
+                                    res += "->" + detail::as_string(detail::pair_adaptor<element_t>::second(v));
+                                }
+                                return res;
+                            },
+                            ","));
+    out.push_back('}');
+    return out;
+}
+
+template <typename> struct sfinae_true : std::true_type {};
+/// Function to check for the existence of a member find function which presumably is more efficient than looping over
+/// everything
+template <typename T, typename V>
+static auto test_find(int) -> sfinae_true<decltype(std::declval<T>().find(std::declval<V>()))>;
+template <typename, typename V> static auto test_find(long) -> std::false_type;
+
+template <typename T, typename V> struct has_find : decltype(test_find<T, V>(0)) {};
+
+/// A search function
+template <typename T, typename V, enable_if_t<!has_find<T, V>::value, detail::enabler> = detail::dummy>
+auto search(const T &set, const V &val) -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
+    using element_t = typename detail::element_type<T>::type;
+    auto &setref = detail::smart_deref(set);
+    auto it = std::find_if(std::begin(setref), std::end(setref), [&val](decltype(*std::begin(setref)) v) {
+        return (detail::pair_adaptor<element_t>::first(v) == val);
+    });
+    return {(it != std::end(setref)), it};
+}
+
+/// A search function that uses the built in find function
+template <typename T, typename V, enable_if_t<has_find<T, V>::value, detail::enabler> = detail::dummy>
+auto search(const T &set, const V &val) -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
+    auto &setref = detail::smart_deref(set);
+    auto it = setref.find(val);
+    return {(it != std::end(setref)), it};
+}
+
+/// A search function with a filter function
+template <typename T, typename V>
+auto search(const T &set, const V &val, const std::function<V(V)> &filter_function)
+    -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
+    using element_t = typename detail::element_type<T>::type;
+    // do the potentially faster first search
+    auto res = search(set, val);
+    if((res.first) || (!(filter_function))) {
+        return res;
+    }
+    // if we haven't found it do the longer linear search with all the element translations
+    auto &setref = detail::smart_deref(set);
+    auto it = std::find_if(std::begin(setref), std::end(setref), [&](decltype(*std::begin(setref)) v) {
+        V a = detail::pair_adaptor<element_t>::first(v);
+        a = filter_function(a);
+        return (a == val);
+    });
+    return {(it != std::end(setref)), it};
+}
+
+/// Performs a *= b; if it doesn't cause integer overflow. Returns false otherwise.
+template <typename T> typename std::enable_if<std::is_integral<T>::value, bool>::type checked_multiply(T &a, T b) {
+    if(a == 0 || b == 0) {
+        a *= b;
+        return true;
+    }
+    T c = a * b;
+    if(c / a != b) {
+        return false;
+    }
+    a = c;
+    return true;
+}
+
+/// Performs a *= b; if it doesn't equal infinity. Returns false otherwise.
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value, bool>::type checked_multiply(T &a, T b) {
+    T c = a * b;
+    if(std::isinf(c) && !std::isinf(a) && !std::isinf(b)) {
+        return false;
+    }
+    a = c;
+    return true;
+}
+
+} // namespace detail
+/// Verify items are in a set
+class IsMember : public Validator {
+  public:
+    using filter_fn_t = std::function<std::string(std::string)>;
+
+    /// This allows in-place construction using an initializer list
+    template <typename T, typename... Args>
+    explicit IsMember(std::initializer_list<T> values, Args &&... args)
+        : IsMember(std::vector<T>(values), std::forward<Args>(args)...) {}
+
+    /// This checks to see if an item is in a set (empty function)
+    template <typename T> explicit IsMember(T &&set) : IsMember(std::forward<T>(set), nullptr) {}
+
+    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
+    /// both sides of the comparison before computing the comparison.
+    template <typename T, typename F> explicit IsMember(T set, F filter_function) {
+
+        // Get the type of the contained item - requires a container have ::value_type
+        // if the type does not have first_type and second_type, these are both value_type
+        using element_t = typename detail::element_type<T>::type;            // Removes (smart) pointers if needed
+        using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
+
+        using local_item_t = typename IsMemberType<item_t>::type; // This will convert bad types to good ones
+                                                                  // (const char * to std::string)
+
+        // Make a local copy of the filter function, using a std::function if not one already
+        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
+
+        // This is the type name for help, it will take the current version of the set contents
+        desc_function_ = [set]() { return detail::generate_set(detail::smart_deref(set)); };
+
+        // This is the function that validates
+        // It stores a copy of the set pointer-like, so shared_ptr will stay alive
+        func_ = [set, filter_fn](std::string &input) {
+            local_item_t b;
+            if(!detail::lexical_cast(input, b)) {
+                throw ValidationError(input); // name is added later
+            }
+            if(filter_fn) {
+                b = filter_fn(b);
+            }
+            auto res = detail::search(set, b, filter_fn);
+            if(res.first) {
+                // Make sure the version in the input string is identical to the one in the set
+                if(filter_fn) {
+                    input = detail::as_string(detail::pair_adaptor<element_t>::first(*(res.second)));
+                }
+
+                // Return empty error string (success)
+                return std::string{};
+            }
+
+            // If you reach this point, the result was not found
+            std::string out(" not in ");
+            out += detail::generate_set(detail::smart_deref(set));
+            return out;
+        };
+    }
+
+    /// You can pass in as many filter functions as you like, they nest (string only currently)
+    template <typename T, typename... Args>
+    IsMember(T &&set, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&... other)
+        : IsMember(std::forward<T>(set),
+                   [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
+                   other...) {}
+};
+
+/// definition of the default transformation object
+template <typename T> using TransformPairs = std::vector<std::pair<std::string, T>>;
+
+/// Translate named items to other or a value set
+class Transformer : public Validator {
+  public:
+    using filter_fn_t = std::function<std::string(std::string)>;
+
+    /// This allows in-place construction
+    template <typename... Args>
+    explicit Transformer(std::initializer_list<std::pair<std::string, std::string>> values, Args &&... args)
+        : Transformer(TransformPairs<std::string>(values), std::forward<Args>(args)...) {}
+
+    /// direct map of std::string to std::string
+    template <typename T> explicit Transformer(T &&mapping) : Transformer(std::forward<T>(mapping), nullptr) {}
+
+    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
+    /// both sides of the comparison before computing the comparison.
+    template <typename T, typename F> explicit Transformer(T mapping, F filter_function) {
+
+        static_assert(detail::pair_adaptor<typename detail::element_type<T>::type>::value,
+                      "mapping must produce value pairs");
+        // Get the type of the contained item - requires a container have ::value_type
+        // if the type does not have first_type and second_type, these are both value_type
+        using element_t = typename detail::element_type<T>::type;            // Removes (smart) pointers if needed
+        using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
+        using local_item_t = typename IsMemberType<item_t>::type;            // This will convert bad types to good ones
+                                                                             // (const char * to std::string)
+
+        // Make a local copy of the filter function, using a std::function if not one already
+        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
+
+        // This is the type name for help, it will take the current version of the set contents
+        desc_function_ = [mapping]() { return detail::generate_map(detail::smart_deref(mapping)); };
+
+        func_ = [mapping, filter_fn](std::string &input) {
+            local_item_t b;
+            if(!detail::lexical_cast(input, b)) {
+                return std::string();
+                // there is no possible way we can match anything in the mapping if we can't convert so just return
+            }
+            if(filter_fn) {
+                b = filter_fn(b);
+            }
+            auto res = detail::search(mapping, b, filter_fn);
+            if(res.first) {
+                input = detail::as_string(detail::pair_adaptor<element_t>::second(*res.second));
+            }
+            return std::string{};
+        };
+    }
+
+    /// You can pass in as many filter functions as you like, they nest
+    template <typename T, typename... Args>
+    Transformer(T &&mapping, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&... other)
+        : Transformer(std::forward<T>(mapping),
+                      [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
+                      other...) {}
+};
+
+/// translate named items to other or a value set
+class CheckedTransformer : public Validator {
+  public:
+    using filter_fn_t = std::function<std::string(std::string)>;
+
+    /// This allows in-place construction
+    template <typename... Args>
+    explicit CheckedTransformer(std::initializer_list<std::pair<std::string, std::string>> values, Args &&... args)
+        : CheckedTransformer(TransformPairs<std::string>(values), std::forward<Args>(args)...) {}
+
+    /// direct map of std::string to std::string
+    template <typename T> explicit CheckedTransformer(T mapping) : CheckedTransformer(std::move(mapping), nullptr) {}
+
+    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
+    /// both sides of the comparison before computing the comparison.
+    template <typename T, typename F> explicit CheckedTransformer(T mapping, F filter_function) {
+
+        static_assert(detail::pair_adaptor<typename detail::element_type<T>::type>::value,
+                      "mapping must produce value pairs");
+        // Get the type of the contained item - requires a container have ::value_type
+        // if the type does not have first_type and second_type, these are both value_type
+        using element_t = typename detail::element_type<T>::type;            // Removes (smart) pointers if needed
+        using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
+        using local_item_t = typename IsMemberType<item_t>::type;            // This will convert bad types to good ones
+                                                                             // (const char * to std::string)
+        using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair //
+                                                                                       // the type of the object pair
+
+        // Make a local copy of the filter function, using a std::function if not one already
+        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
+
+        auto tfunc = [mapping]() {
+            std::string out("value in ");
+            out += detail::generate_map(detail::smart_deref(mapping)) + " OR {";
+            out += detail::join(
+                detail::smart_deref(mapping),
+                [](const iteration_type_t &v) { return detail::as_string(detail::pair_adaptor<element_t>::second(v)); },
+                ",");
+            out.push_back('}');
+            return out;
+        };
+
+        desc_function_ = tfunc;
+
+        func_ = [mapping, tfunc, filter_fn](std::string &input) {
+            local_item_t b;
+            bool converted = detail::lexical_cast(input, b);
+            if(converted) {
+                if(filter_fn) {
+                    b = filter_fn(b);
+                }
+                auto res = detail::search(mapping, b, filter_fn);
+                if(res.first) {
+                    input = detail::as_string(detail::pair_adaptor<element_t>::second(*res.second));
+                    return std::string{};
+                }
+            }
+            for(const auto &v : detail::smart_deref(mapping)) {
+                auto output_string = detail::as_string(detail::pair_adaptor<element_t>::second(v));
+                if(output_string == input) {
+                    return std::string();
+                }
+            }
+
+            return "Check " + input + " " + tfunc() + " FAILED";
+        };
+    }
+
+    /// You can pass in as many filter functions as you like, they nest
+    template <typename T, typename... Args>
+    CheckedTransformer(T &&mapping, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&... other)
+        : CheckedTransformer(std::forward<T>(mapping),
+                             [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
+                             other...) {}
+};
+
+/// Helper function to allow ignore_case to be passed to IsMember or Transform
+inline std::string ignore_case(std::string item) { return detail::to_lower(item); }
+
+/// Helper function to allow ignore_underscore to be passed to IsMember or Transform
+inline std::string ignore_underscore(std::string item) { return detail::remove_underscore(item); }
+
+/// Helper function to allow checks to ignore spaces to be passed to IsMember or Transform
+inline std::string ignore_space(std::string item) {
+    item.erase(std::remove(std::begin(item), std::end(item), ' '), std::end(item));
+    item.erase(std::remove(std::begin(item), std::end(item), '\t'), std::end(item));
+    return item;
+}
+
+/// Multiply a number by a factor using given mapping.
+/// Can be used to write transforms for SIZE or DURATION inputs.
+///
+/// Example:
+///   With mapping = `{"b"->1, "kb"->1024, "mb"->1024*1024}`
+///   one can recognize inputs like "100", "12kb", "100 MB",
+///   that will be automatically transformed to 100, 14448, 104857600.
+///
+/// Output number type matches the type in the provided mapping.
+/// Therefore, if it is required to interpret real inputs like "0.42 s",
+/// the mapping should be of a type <string, float> or <string, double>.
+class AsNumberWithUnit : public Validator {
+  public:
+    /// Adjust AsNumberWithUnit behavior.
+    /// CASE_SENSITIVE/CASE_INSENSITIVE controls how units are matched.
+    /// UNIT_OPTIONAL/UNIT_REQUIRED throws ValidationError
+    ///   if UNIT_REQUIRED is set and unit literal is not found.
+    enum Options {
+        CASE_SENSITIVE = 0,
+        CASE_INSENSITIVE = 1,
+        UNIT_OPTIONAL = 0,
+        UNIT_REQUIRED = 2,
+        DEFAULT = CASE_INSENSITIVE | UNIT_OPTIONAL
+    };
+
+    template <typename Number>
+    explicit AsNumberWithUnit(std::map<std::string, Number> mapping,
+                              Options opts = DEFAULT,
+                              const std::string &unit_name = "UNIT") {
+        description(generate_description<Number>(unit_name, opts));
+        validate_mapping(mapping, opts);
+
+        // transform function
+        func_ = [mapping, opts](std::string &input) -> std::string {
+            Number num;
+
+            detail::rtrim(input);
+            if(input.empty()) {
+                throw ValidationError("Input is empty");
+            }
+
+            // Find split position between number and prefix
+            auto unit_begin = input.end();
+            while(unit_begin > input.begin() && std::isalpha(*(unit_begin - 1), std::locale())) {
+                --unit_begin;
+            }
+
+            std::string unit{unit_begin, input.end()};
+            input.resize(static_cast<size_t>(std::distance(input.begin(), unit_begin)));
+            detail::trim(input);
+
+            if(opts & UNIT_REQUIRED && unit.empty()) {
+                throw ValidationError("Missing mandatory unit");
+            }
+            if(opts & CASE_INSENSITIVE) {
+                unit = detail::to_lower(unit);
+            }
+
+            bool converted = detail::lexical_cast(input, num);
+            if(!converted) {
+                throw ValidationError("Value " + input + " could not be converted to " + detail::type_name<Number>());
+            }
+
+            if(unit.empty()) {
+                // No need to modify input if no unit passed
+                return {};
+            }
+
+            // find corresponding factor
+            auto it = mapping.find(unit);
+            if(it == mapping.end()) {
+                throw ValidationError(unit +
+                                      " unit not recognized. "
+                                      "Allowed values: " +
+                                      detail::generate_map(mapping, true));
+            }
+
+            // perform safe multiplication
+            bool ok = detail::checked_multiply(num, it->second);
+            if(!ok) {
+                throw ValidationError(detail::as_string(num) + " multiplied by " + unit +
+                                      " factor would cause number overflow. Use smaller value.");
+            }
+            input = detail::as_string(num);
+
+            return {};
+        };
+    }
+
+  private:
+    /// Check that mapping contains valid units.
+    /// Update mapping for CASE_INSENSITIVE mode.
+    template <typename Number> static void validate_mapping(std::map<std::string, Number> &mapping, Options opts) {
+        for(auto &kv : mapping) {
+            if(kv.first.empty()) {
+                throw ValidationError("Unit must not be empty.");
+            }
+            if(!detail::isalpha(kv.first)) {
+                throw ValidationError("Unit must contain only letters.");
+            }
+        }
+
+        // make all units lowercase if CASE_INSENSITIVE
+        if(opts & CASE_INSENSITIVE) {
+            std::map<std::string, Number> lower_mapping;
+            for(auto &kv : mapping) {
+                auto s = detail::to_lower(kv.first);
+                if(lower_mapping.count(s)) {
+                    throw ValidationError("Several matching lowercase unit representations are found: " + s);
+                }
+                lower_mapping[detail::to_lower(kv.first)] = kv.second;
+            }
+            mapping = std::move(lower_mapping);
+        }
+    }
+
+    /// Generate description like this: NUMBER [UNIT]
+    template <typename Number> static std::string generate_description(const std::string &name, Options opts) {
+        std::stringstream out;
+        out << detail::type_name<Number>() << ' ';
+        if(opts & UNIT_REQUIRED) {
+            out << name;
+        } else {
+            out << '[' << name << ']';
+        }
+        return out.str();
+    }
+};
+
+/// Converts a human-readable size string (with unit literal) to uin64_t size.
+/// Example:
+///   "100" => 100
+///   "1 b" => 100
+///   "10Kb" => 10240 // you can configure this to be interpreted as kilobyte (*1000) or kibibyte (*1024)
+///   "10 KB" => 10240
+///   "10 kb" => 10240
+///   "10 kib" => 10240 // *i, *ib are always interpreted as *bibyte (*1024)
+///   "10kb" => 10240
+///   "2 MB" => 2097152
+///   "2 EiB" => 2^61 // Units up to exibyte are supported
+class AsSizeValue : public AsNumberWithUnit {
+  public:
+    using result_t = uint64_t;
+
+    /// If kb_is_1000 is true,
+    /// interpret 'kb', 'k' as 1000 and 'kib', 'ki' as 1024
+    /// (same applies to higher order units as well).
+    /// Otherwise, interpret all literals as factors of 1024.
+    /// The first option is formally correct, but
+    /// the second interpretation is more wide-spread
+    /// (see https://en.wikipedia.org/wiki/Binary_prefix).
+    explicit AsSizeValue(bool kb_is_1000) : AsNumberWithUnit(get_mapping(kb_is_1000)) {
+        if(kb_is_1000) {
+            description("SIZE [b, kb(=1000b), kib(=1024b), ...]");
+        } else {
+            description("SIZE [b, kb(=1024b), ...]");
+        }
+    }
+
+  private:
+    /// Get <size unit, factor> mapping
+    static std::map<std::string, result_t> init_mapping(bool kb_is_1000) {
+        std::map<std::string, result_t> m;
+        result_t k_factor = kb_is_1000 ? 1000 : 1024;
+        result_t ki_factor = 1024;
+        result_t k = 1;
+        result_t ki = 1;
+        m["b"] = 1;
+        for(std::string p : {"k", "m", "g", "t", "p", "e"}) {
+            k *= k_factor;
+            ki *= ki_factor;
+            m[p] = k;
+            m[p + "b"] = k;
+            m[p + "i"] = ki;
+            m[p + "ib"] = ki;
+        }
+        return m;
+    }
+
+    /// Cache calculated mapping
+    static std::map<std::string, result_t> get_mapping(bool kb_is_1000) {
+        if(kb_is_1000) {
+            static auto m = init_mapping(true);
+            return m;
+        } else {
+            static auto m = init_mapping(false);
+            return m;
+        }
+    }
+};
+
+namespace detail {
+/// Split a string into a program name and command line arguments
+/// the string is assumed to contain a file name followed by other arguments
+/// the return value contains is a pair with the first argument containing the program name and the second
+/// everything else.
+inline std::pair<std::string, std::string> split_program_name(std::string commandline) {
+    // try to determine the programName
+    std::pair<std::string, std::string> vals;
+    trim(commandline);
+    auto esp = commandline.find_first_of(' ', 1);
+    while(!ExistingFile(commandline.substr(0, esp)).empty()) {
+        esp = commandline.find_first_of(' ', esp + 1);
+        if(esp == std::string::npos) {
+            // if we have reached the end and haven't found a valid file just assume the first argument is the
+            // program name
+            esp = commandline.find_first_of(' ', 1);
+            break;
+        }
+    }
+    vals.first = commandline.substr(0, esp);
+    rtrim(vals.first);
+    // strip the program name
+    vals.second = (esp != std::string::npos) ? commandline.substr(esp + 1) : std::string{};
+    ltrim(vals.second);
+    return vals;
+}
+
+} // namespace detail
+/// @}
+
+} // namespace CLI
+
+// From CLI/FormatterFwd.hpp:
+
+namespace CLI {
+
+class Option;
+class App;
+
+/// This enum signifies the type of help requested
+///
+/// This is passed in by App; all user classes must accept this as
+/// the second argument.
+
+enum class AppFormatMode {
+    Normal, //< The normal, detailed help
+    All,    //< A fully expanded help
+    Sub,    //< Used when printed as part of expanded subcommand
+};
+
+/// This is the minimum requirements to run a formatter.
+///
+/// A user can subclass this is if they do not care at all
+/// about the structure in CLI::Formatter.
+class FormatterBase {
+  protected:
+    /// @name Options
+    ///@{
+
+    /// The width of the first column
+    size_t column_width_{30};
+
+    /// @brief The required help printout labels (user changeable)
+    /// Values are Needs, Excludes, etc.
+    std::map<std::string, std::string> labels_;
+
+    ///@}
+    /// @name Basic
+    ///@{
+
+  public:
+    FormatterBase() = default;
+    FormatterBase(const FormatterBase &) = default;
+    FormatterBase(FormatterBase &&) = default;
+
+    /// Adding a destructor in this form to work around bug in GCC 4.7
+    virtual ~FormatterBase() noexcept {} // NOLINT(modernize-use-equals-default)
+
+    /// This is the key method that puts together help
+    virtual std::string make_help(const App *, std::string, AppFormatMode) const = 0;
+
+    ///@}
+    /// @name Setters
+    ///@{
+
+    /// Set the "REQUIRED" label
+    void label(std::string key, std::string val) { labels_[key] = val; }
+
+    /// Set the column width
+    void column_width(size_t val) { column_width_ = val; }
+
+    ///@}
+    /// @name Getters
+    ///@{
+
+    /// Get the current value of a name (REQUIRED, etc.)
+    std::string get_label(std::string key) const {
+        if(labels_.find(key) == labels_.end())
+            return key;
+        else
+            return labels_.at(key);
+    }
+
+    /// Get the current column width
+    size_t get_column_width() const { return column_width_; }
+
+    ///@}
+};
+
+/// This is a specialty override for lambda functions
+class FormatterLambda final : public FormatterBase {
+    using funct_t = std::function<std::string(const App *, std::string, AppFormatMode)>;
+
+    /// The lambda to hold and run
+    funct_t lambda_;
+
+  public:
+    /// Create a FormatterLambda with a lambda function
+    explicit FormatterLambda(funct_t funct) : lambda_(std::move(funct)) {}
+
+    /// Adding a destructor (mostly to make GCC 4.7 happy)
+    ~FormatterLambda() noexcept override {} // NOLINT(modernize-use-equals-default)
+
+    /// This will simply call the lambda function
+    std::string make_help(const App *app, std::string name, AppFormatMode mode) const override {
+        return lambda_(app, name, mode);
+    }
+};
+
+/// This is the default Formatter for CLI11. It pretty prints help output, and is broken into quite a few
+/// overridable methods, to be highly customizable with minimal effort.
+class Formatter : public FormatterBase {
+  public:
+    Formatter() = default;
+    Formatter(const Formatter &) = default;
+    Formatter(Formatter &&) = default;
+
+    /// @name Overridables
+    ///@{
+
+    /// This prints out a group of options with title
+    ///
+    virtual std::string make_group(std::string group, bool is_positional, std::vector<const Option *> opts) const;
+
+    /// This prints out just the positionals "group"
+    virtual std::string make_positionals(const App *app) const;
+
+    /// This prints out all the groups of options
+    std::string make_groups(const App *app, AppFormatMode mode) const;
+
+    /// This prints out all the subcommands
+    virtual std::string make_subcommands(const App *app, AppFormatMode mode) const;
+
+    /// This prints out a subcommand
+    virtual std::string make_subcommand(const App *sub) const;
+
+    /// This prints out a subcommand in help-all
+    virtual std::string make_expanded(const App *sub) const;
+
+    /// This prints out all the groups of options
+    virtual std::string make_footer(const App *app) const;
+
+    /// This displays the description line
+    virtual std::string make_description(const App *app) const;
+
+    /// This displays the usage line
+    virtual std::string make_usage(const App *app, std::string name) const;
+
+    /// This puts everything together
+    std::string make_help(const App *, std::string, AppFormatMode) const override;
+
+    ///@}
+    /// @name Options
+    ///@{
+
+    /// This prints out an option help line, either positional or optional form
+    virtual std::string make_option(const Option *opt, bool is_positional) const {
+        std::stringstream out;
+        detail::format_help(
+            out, make_option_name(opt, is_positional) + make_option_opts(opt), make_option_desc(opt), column_width_);
+        return out.str();
+    }
+
+    /// @brief This is the name part of an option, Default: left column
+    virtual std::string make_option_name(const Option *, bool) const;
+
+    /// @brief This is the options part of the name, Default: combined into left column
+    virtual std::string make_option_opts(const Option *) const;
+
+    /// @brief This is the description. Default: Right column, on new line if left column too large
+    virtual std::string make_option_desc(const Option *) const;
+
+    /// @brief This is used to print the name on the USAGE line
+    virtual std::string make_option_usage(const Option *opt) const;
+
+    ///@}
+};
+
+} // namespace CLI
+
+// From CLI/Option.hpp:
+
+namespace CLI {
+
+using results_t = std::vector<std::string>;
+using callback_t = std::function<bool(results_t)>;
+
+class Option;
+class App;
+
+using Option_p = std::unique_ptr<Option>;
+
+enum class MultiOptionPolicy : char { Throw, TakeLast, TakeFirst, Join };
+
+/// This is the CRTP base class for Option and OptionDefaults. It was designed this way
+/// to share parts of the class; an OptionDefaults can copy to an Option.
+template <typename CRTP> class OptionBase {
+    friend App;
+
+  protected:
+    /// The group membership
+    std::string group_ = std::string("Options");
+
+    /// True if this is a required option
+    bool required_{false};
+
+    /// Ignore the case when matching (option, not value)
+    bool ignore_case_{false};
+
+    /// Ignore underscores when matching (option, not value)
+    bool ignore_underscore_{false};
+
+    /// Allow this option to be given in a configuration file
+    bool configurable_{true};
+
+    /// Disable overriding flag values with '=value'
+    bool disable_flag_override_{false};
+
+    /// Specify a delimiter character for vector arguments
+    char delimiter_{'\0'};
+
+    /// Automatically capture default value
+    bool always_capture_default_{false};
+
+    /// Policy for multiple arguments when `expected_ == 1`  (can be set on bool flags, too)
+    MultiOptionPolicy multi_option_policy_{MultiOptionPolicy::Throw};
+
+    /// Copy the contents to another similar class (one based on OptionBase)
+    template <typename T> void copy_to(T *other) const {
+        other->group(group_);
+        other->required(required_);
+        other->ignore_case(ignore_case_);
+        other->ignore_underscore(ignore_underscore_);
+        other->configurable(configurable_);
+        other->disable_flag_override(disable_flag_override_);
+        other->delimiter(delimiter_);
+        other->always_capture_default(always_capture_default_);
+        other->multi_option_policy(multi_option_policy_);
+    }
+
+  public:
+    // setters
+
+    /// Changes the group membership
+    CRTP *group(std::string name) {
+        group_ = name;
+        return static_cast<CRTP *>(this);
+    }
+
+    /// Set the option as required
+    CRTP *required(bool value = true) {
+        required_ = value;
+        return static_cast<CRTP *>(this);
+    }
+
+    /// Support Plumbum term
+    CRTP *mandatory(bool value = true) { return required(value); }
+
+    CRTP *always_capture_default(bool value = true) {
+        always_capture_default_ = value;
+        return static_cast<CRTP *>(this);
+    }
+
+    // Getters
+
+    /// Get the group of this option
+    const std::string &get_group() const { return group_; }
+
+    /// True if this is a required option
+    bool get_required() const { return required_; }
+
+    /// The status of ignore case
+    bool get_ignore_case() const { return ignore_case_; }
+
+    /// The status of ignore_underscore
+    bool get_ignore_underscore() const { return ignore_underscore_; }
+
+    /// The status of configurable
+    bool get_configurable() const { return configurable_; }
+
+    /// The status of configurable
+    bool get_disable_flag_override() const { return disable_flag_override_; }
+
+    /// Get the current delimeter char
+    char get_delimiter() const { return delimiter_; }
+
+    /// Return true if this will automatically capture the default value for help printing
+    bool get_always_capture_default() const { return always_capture_default_; }
+
+    /// The status of the multi option policy
+    MultiOptionPolicy get_multi_option_policy() const { return multi_option_policy_; }
+
+    // Shortcuts for multi option policy
+
+    /// Set the multi option policy to take last
+    CRTP *take_last() {
+        auto self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::TakeLast);
+        return self;
+    }
+
+    /// Set the multi option policy to take last
+    CRTP *take_first() {
+        auto self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::TakeFirst);
+        return self;
+    }
+
+    /// Set the multi option policy to take last
+    CRTP *join() {
+        auto self = static_cast<CRTP *>(this);
+        self->multi_option_policy(MultiOptionPolicy::Join);
+        return self;
+    }
+
+    /// Allow in a configuration file
+    CRTP *configurable(bool value = true) {
+        configurable_ = value;
+        return static_cast<CRTP *>(this);
+    }
+
+    /// Allow in a configuration file
+    CRTP *delimiter(char value = '\0') {
+        delimiter_ = value;
+        return static_cast<CRTP *>(this);
+    }
+};
+
+/// This is a version of OptionBase that only supports setting values,
+/// for defaults. It is stored as the default option in an App.
+class OptionDefaults : public OptionBase<OptionDefaults> {
+  public:
+    OptionDefaults() = default;
+
+    // Methods here need a different implementation if they are Option vs. OptionDefault
+
+    /// Take the last argument if given multiple times
+    OptionDefaults *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
+        multi_option_policy_ = value;
+        return this;
+    }
+
+    /// Ignore the case of the option name
+    OptionDefaults *ignore_case(bool value = true) {
+        ignore_case_ = value;
+        return this;
+    }
+
+    /// Ignore underscores in the option name
+    OptionDefaults *ignore_underscore(bool value = true) {
+        ignore_underscore_ = value;
+        return this;
+    }
+
+    /// Disable overriding flag values with an '=<value>' segment
+    OptionDefaults *disable_flag_override(bool value = true) {
+        disable_flag_override_ = value;
+        return this;
+    }
+
+    /// set a delimiter character to split up single arguments to treat as multiple inputs
+    OptionDefaults *delimiter(char value = '\0') {
+        delimiter_ = value;
+        return this;
+    }
+};
+
+class Option : public OptionBase<Option> {
+    friend App;
+
+  protected:
+    /// @name Names
+    ///@{
+
+    /// A list of the short names (`-a`) without the leading dashes
+    std::vector<std::string> snames_;
+
+    /// A list of the long names (`--a`) without the leading dashes
+    std::vector<std::string> lnames_;
+
+    /// A list of the flag names with the appropriate default value, the first part of the pair should be duplicates of
+    /// what is in snames or lnames but will trigger a particular response on a flag
+    std::vector<std::pair<std::string, std::string>> default_flag_values_;
+
+    /// a list of flag names with specified default values;
+    std::vector<std::string> fnames_;
+
+    /// A positional name
+    std::string pname_;
+
+    /// If given, check the environment for this option
+    std::string envname_;
+
+    ///@}
+    /// @name Help
+    ///@{
+
+    /// The description for help strings
+    std::string description_;
+
+    /// A human readable default value, either manually set, captured, or captured by default
+    std::string default_str_;
+
+    /// A human readable type value, set when App creates this
+    ///
+    /// This is a lambda function so "types" can be dynamic, such as when a set prints its contents.
+    std::function<std::string()> type_name_{[]() { return std::string(); }};
+
+    /// Run this function to capture a default (ignore if empty)
+    std::function<std::string()> default_function_;
+
+    ///@}
+    /// @name Configuration
+    ///@{
+
+    /// The number of arguments that make up one option. -1=unlimited (vector-like), 0=flag, 1=normal option,
+    /// 2=complex/pair, etc. Set only when the option is created; this is intrinsic to the type. Eventually, -2 may mean
+    /// vector of pairs.
+    int type_size_{1};
+
+    /// The number of expected values, type_size_ must be < 0. Ignored for flag. N < 0 means at least -N values.
+    int expected_{1};
+
+    /// A list of validators to run on each value parsed
+    std::vector<Validator> validators_;
+
+    /// A list of options that are required with this option
+    std::set<Option *> needs_;
+
+    /// A list of options that are excluded with this option
+    std::set<Option *> excludes_;
+
+    ///@}
+    /// @name Other
+    ///@{
+
+    /// Remember the parent app
+    App *parent_;
+
+    /// Options store a callback to do all the work
+    callback_t callback_;
+
+    ///@}
+    /// @name Parsing results
+    ///@{
+
+    /// Results of parsing
+    results_t results_;
+
+    /// Whether the callback has run (needed for INI parsing)
+    bool callback_run_{false};
+
+    ///@}
+
+    /// Making an option by hand is not defined, it must be made by the App class
+    Option(std::string option_name,
+           std::string option_description,
+           std::function<bool(results_t)> callback,
+           App *parent)
+        : description_(std::move(option_description)), parent_(parent), callback_(std::move(callback)) {
+        std::tie(snames_, lnames_, pname_) = detail::get_names(detail::split_names(option_name));
+    }
+
+  public:
+    /// @name Basic
+    ///@{
+
+    /// Count the total number of times an option was passed
+    size_t count() const { return results_.size(); }
+
+    /// True if the option was not passed
+    size_t empty() const { return results_.empty(); }
+
+    /// This class is true if option is passed.
+    operator bool() const { return !empty(); }
+
+    /// Clear the parsed results (mostly for testing)
+    void clear() { results_.clear(); }
+
+    ///@}
+    /// @name Setting options
+    ///@{
+
+    /// Set the number of expected arguments (Flags don't use this)
+    Option *expected(int value) {
+
+        // Break if this is a flag
+        if(type_size_ == 0)
+            throw IncorrectConstruction::SetFlag(get_name(true, true));
+
+        // Setting 0 is not allowed
+        else if(value == 0)
+            throw IncorrectConstruction::Set0Opt(get_name());
+
+        // No change is okay, quit now
+        else if(expected_ == value)
+            return this;
+
+        // Type must be a vector
+        else if(type_size_ >= 0)
+            throw IncorrectConstruction::ChangeNotVector(get_name());
+
+        // TODO: Can support multioption for non-1 values (except for join)
+        else if(value != 1 && multi_option_policy_ != MultiOptionPolicy::Throw)
+            throw IncorrectConstruction::AfterMultiOpt(get_name());
+
+        expected_ = value;
+        return this;
+    }
+
+    /// Adds a Validator with a built in type name
+    Option *check(Validator validator, std::string validator_name = "") {
+        validator.non_modifying();
+        validators_.push_back(std::move(validator));
+        if(!validator_name.empty())
+            validators_.front().name(validator_name);
+        return this;
+    }
+
+    /// Adds a Validator. Takes a const string& and returns an error message (empty if conversion/check is okay).
+    Option *check(std::function<std::string(const std::string &)> validator,
+                  std::string validator_description = "",
+                  std::string validator_name = "") {
+        validators_.emplace_back(validator, std::move(validator_description), std::move(validator_name));
+        validators_.back().non_modifying();
+        return this;
+    }
+
+    /// Adds a transforming validator with a built in type name
+    Option *transform(Validator validator, std::string validator_name = "") {
+        validators_.insert(validators_.begin(), std::move(validator));
+        if(!validator_name.empty())
+            validators_.front().name(validator_name);
+        return this;
+    }
+
+    /// Adds a validator-like function that can change result
+    Option *transform(std::function<std::string(std::string)> func,
+                      std::string transform_description = "",
+                      std::string transform_name = "") {
+        validators_.insert(validators_.begin(),
+                           Validator(
+                               [func](std::string &val) {
+                                   val = func(val);
+                                   return std::string{};
+                               },
+                               std::move(transform_description),
+                               std::move(transform_name)));
+
+        return this;
+    }
+
+    /// Adds a user supplied function to run on each item passed in (communicate though lambda capture)
+    Option *each(std::function<void(std::string)> func) {
+        validators_.emplace_back(
+            [func](std::string &inout) {
+                func(inout);
+                return std::string{};
+            },
+            std::string{});
+        return this;
+    }
+    /// Get a named Validator
+    Validator *get_validator(const std::string &validator_name = "") {
+        for(auto &validator : validators_) {
+            if(validator_name == validator.get_name()) {
+                return &validator;
+            }
+        }
+        if((validator_name.empty()) && (!validators_.empty())) {
+            return &(validators_.front());
+        }
+        throw OptionNotFound(std::string("Validator ") + validator_name + " Not Found");
+    }
+    /// Sets required options
+    Option *needs(Option *opt) {
+        auto tup = needs_.insert(opt);
+        if(!tup.second)
+            throw OptionAlreadyAdded::Requires(get_name(), opt->get_name());
+        return this;
+    }
+
+    /// Can find a string if needed
+    template <typename T = App> Option *needs(std::string opt_name) {
+        for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
+            if(opt.get() != this && opt->check_name(opt_name))
+                return needs(opt.get());
+        throw IncorrectConstruction::MissingOption(opt_name);
+    }
+
+    /// Any number supported, any mix of string and Opt
+    template <typename A, typename B, typename... ARG> Option *needs(A opt, B opt1, ARG... args) {
+        needs(opt);
+        return needs(opt1, args...);
+    }
+
+    /// Remove needs link from an option. Returns true if the option really was in the needs list.
+    bool remove_needs(Option *opt) {
+        auto iterator = std::find(std::begin(needs_), std::end(needs_), opt);
+
+        if(iterator != std::end(needs_)) {
+            needs_.erase(iterator);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /// Sets excluded options
+    Option *excludes(Option *opt) {
+        excludes_.insert(opt);
+
+        // Help text should be symmetric - excluding a should exclude b
+        opt->excludes_.insert(this);
+
+        // Ignoring the insert return value, excluding twice is now allowed.
+        // (Mostly to allow both directions to be excluded by user, even though the library does it for you.)
+
+        return this;
+    }
+
+    /// Can find a string if needed
+    template <typename T = App> Option *excludes(std::string opt_name) {
+        for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
+            if(opt.get() != this && opt->check_name(opt_name))
+                return excludes(opt.get());
+        throw IncorrectConstruction::MissingOption(opt_name);
+    }
+
+    /// Any number supported, any mix of string and Opt
+    template <typename A, typename B, typename... ARG> Option *excludes(A opt, B opt1, ARG... args) {
+        excludes(opt);
+        return excludes(opt1, args...);
+    }
+
+    /// Remove needs link from an option. Returns true if the option really was in the needs list.
+    bool remove_excludes(Option *opt) {
+        auto iterator = std::find(std::begin(excludes_), std::end(excludes_), opt);
+
+        if(iterator != std::end(excludes_)) {
+            excludes_.erase(iterator);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /// Sets environment variable to read if no option given
+    Option *envname(std::string name) {
+        envname_ = name;
+        return this;
+    }
+
+    /// Ignore case
+    ///
+    /// The template hides the fact that we don't have the definition of App yet.
+    /// You are never expected to add an argument to the template here.
+    template <typename T = App> Option *ignore_case(bool value = true) {
+        ignore_case_ = value;
+        auto *parent = dynamic_cast<T *>(parent_);
+
+        for(const Option_p &opt : parent->options_)
+            if(opt.get() != this && *opt == *this)
+                throw OptionAlreadyAdded(opt->get_name(true, true));
+
+        return this;
+    }
+
+    /// Ignore underscores in the option names
+    ///
+    /// The template hides the fact that we don't have the definition of App yet.
+    /// You are never expected to add an argument to the template here.
+    template <typename T = App> Option *ignore_underscore(bool value = true) {
+        ignore_underscore_ = value;
+        auto *parent = dynamic_cast<T *>(parent_);
+        for(const Option_p &opt : parent->options_)
+            if(opt.get() != this && *opt == *this)
+                throw OptionAlreadyAdded(opt->get_name(true, true));
+
+        return this;
+    }
+
+    /// Take the last argument if given multiple times (or another policy)
+    Option *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
+
+        if(get_items_expected() < 0)
+            throw IncorrectConstruction::MultiOptionPolicy(get_name());
+        multi_option_policy_ = value;
+        return this;
+    }
+
+    /// disable flag overrides
+    Option *disable_flag_override(bool value = true) {
+        disable_flag_override_ = value;
+        return this;
+    }
+    ///@}
+    /// @name Accessors
+    ///@{
+
+    /// The number of arguments the option expects
+    int get_type_size() const { return type_size_; }
+
+    /// The environment variable associated to this value
+    std::string get_envname() const { return envname_; }
+
+    /// The set of options needed
+    std::set<Option *> get_needs() const { return needs_; }
+
+    /// The set of options excluded
+    std::set<Option *> get_excludes() const { return excludes_; }
+
+    /// The default value (for help printing) DEPRECATED Use get_default_str() instead
+    CLI11_DEPRECATED("Use get_default_str() instead")
+    std::string get_defaultval() const { return default_str_; }
+
+    /// The default value (for help printing)
+    std::string get_default_str() const { return default_str_; }
+
+    /// Get the callback function
+    callback_t get_callback() const { return callback_; }
+
+    /// Get the long names
+    const std::vector<std::string> get_lnames() const { return lnames_; }
+
+    /// Get the short names
+    const std::vector<std::string> get_snames() const { return snames_; }
+
+    /// get the flag names with specified default values
+    const std::vector<std::string> get_fnames() const { return fnames_; }
+
+    /// The number of times the option expects to be included
+    int get_expected() const { return expected_; }
+
+    /// \brief The total number of expected values (including the type)
+    /// This is positive if exactly this number is expected, and negative for at least N values
+    ///
+    /// v = fabs(size_type*expected)
+    /// !MultiOptionPolicy::Throw
+    ///           | Expected < 0  | Expected == 0 | Expected > 0
+    /// Size < 0  |      -v       |       0       |     -v
+    /// Size == 0 |       0       |       0       |      0
+    /// Size > 0  |      -v       |       0       |     -v       // Expected must be 1
+    ///
+    /// MultiOptionPolicy::Throw
+    ///           | Expected < 0  | Expected == 0 | Expected > 0
+    /// Size < 0  |      -v       |       0       |      v
+    /// Size == 0 |       0       |       0       |      0
+    /// Size > 0  |       v       |       0       |      v      // Expected must be 1
+    ///
+    int get_items_expected() const {
+        return std::abs(type_size_ * expected_) *
+               ((multi_option_policy_ != MultiOptionPolicy::Throw || (expected_ < 0 && type_size_ < 0) ? -1 : 1));
+    }
+
+    /// True if the argument can be given directly
+    bool get_positional() const { return pname_.length() > 0; }
+
+    /// True if option has at least one non-positional name
+    bool nonpositional() const { return (snames_.size() + lnames_.size()) > 0; }
+
+    /// True if option has description
+    bool has_description() const { return description_.length() > 0; }
+
+    /// Get the description
+    const std::string &get_description() const { return description_; }
+
+    /// Set the description
+    Option *description(std::string option_description) {
+        description_ = std::move(option_description);
+        return this;
+    }
+
+    ///@}
+    /// @name Help tools
+    ///@{
+
+    /// \brief Gets a comma separated list of names.
+    /// Will include / prefer the positional name if positional is true.
+    /// If all_options is false, pick just the most descriptive name to show.
+    /// Use `get_name(true)` to get the positional name (replaces `get_pname`)
+    std::string get_name(bool positional = false, //<[input] Show the positional name
+                         bool all_options = false //<[input] Show every option
+                         ) const {
+
+        if(all_options) {
+
+            std::vector<std::string> name_list;
+
+            /// The all list will never include a positional unless asked or that's the only name.
+            if((positional && pname_.length()) || (snames_.empty() && lnames_.empty()))
+                name_list.push_back(pname_);
+            if((get_items_expected() == 0) && (!fnames_.empty())) {
+                for(const std::string &sname : snames_) {
+                    name_list.push_back("-" + sname);
+                    if(check_fname(sname)) {
+                        name_list.back() += "{" + get_flag_value(sname, "") + "}";
+                    }
+                }
+
+                for(const std::string &lname : lnames_) {
+                    name_list.push_back("--" + lname);
+                    if(check_fname(lname)) {
+                        name_list.back() += "{" + get_flag_value(lname, "") + "}";
+                    }
+                }
+            } else {
+                for(const std::string &sname : snames_)
+                    name_list.push_back("-" + sname);
+
+                for(const std::string &lname : lnames_)
+                    name_list.push_back("--" + lname);
+            }
+
+            return detail::join(name_list);
+
+        } else {
+
+            // This returns the positional name no matter what
+            if(positional)
+                return pname_;
+
+            // Prefer long name
+            else if(!lnames_.empty())
+                return std::string("--") + lnames_[0];
+
+            // Or short name if no long name
+            else if(!snames_.empty())
+                return std::string("-") + snames_[0];
+
+            // If positional is the only name, it's okay to use that
+            else
+                return pname_;
+        }
+    }
+
+    ///@}
+    /// @name Parser tools
+    ///@{
+
+    /// Process the callback
+    void run_callback() {
+
+        callback_run_ = true;
+
+        // Run the validators (can change the string)
+        if(!validators_.empty()) {
+            for(std::string &result : results_) {
+                auto err_msg = _validate(result);
+                if(!err_msg.empty())
+                    throw ValidationError(get_name(), err_msg);
+            }
+        }
+        if(!(callback_)) {
+            return;
+        }
+        bool local_result;
+
+        // Num items expected or length of vector, always at least 1
+        // Only valid for a trimming policy
+        int trim_size =
+            std::min<int>(std::max<int>(std::abs(get_items_expected()), 1), static_cast<int>(results_.size()));
+
+        // Operation depends on the policy setting
+        if(multi_option_policy_ == MultiOptionPolicy::TakeLast) {
+            // Allow multi-option sizes (including 0)
+            results_t partial_result{results_.end() - trim_size, results_.end()};
+            local_result = !callback_(partial_result);
+
+        } else if(multi_option_policy_ == MultiOptionPolicy::TakeFirst) {
+            results_t partial_result{results_.begin(), results_.begin() + trim_size};
+            local_result = !callback_(partial_result);
+
+        } else if(multi_option_policy_ == MultiOptionPolicy::Join) {
+            results_t partial_result = {detail::join(results_, "\n")};
+            local_result = !callback_(partial_result);
+
+        } else {
+            // Exact number required
+            if(get_items_expected() > 0) {
+                if(results_.size() != static_cast<size_t>(get_items_expected()))
+                    throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
+                // Variable length list
+            } else if(get_items_expected() < 0) {
+                // Require that this be a multiple of expected size and at least as many as expected
+                if(results_.size() < static_cast<size_t>(-get_items_expected()) ||
+                   results_.size() % static_cast<size_t>(std::abs(get_type_size())) != 0u)
+                    throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
+            }
+            local_result = !callback_(results_);
+        }
+
+        if(local_result)
+            throw ConversionError(get_name(), results_);
+    }
+
+    /// If options share any of the same names, they are equal (not counting positional)
+    bool operator==(const Option &other) const {
+        for(const std::string &sname : snames_)
+            if(other.check_sname(sname))
+                return true;
+        for(const std::string &lname : lnames_)
+            if(other.check_lname(lname))
+                return true;
+
+        if(ignore_case_ ||
+           ignore_underscore_) { // We need to do the inverse, in case we are ignore_case or ignore underscore
+            for(const std::string &sname : other.snames_)
+                if(check_sname(sname))
+                    return true;
+            for(const std::string &lname : other.lnames_)
+                if(check_lname(lname))
+                    return true;
+        }
+        return false;
+    }
+
+    /// Check a name. Requires "-" or "--" for short / long, supports positional name
+    bool check_name(std::string name) const {
+
+        if(name.length() > 2 && name[0] == '-' && name[1] == '-')
+            return check_lname(name.substr(2));
+        else if(name.length() > 1 && name.front() == '-')
+            return check_sname(name.substr(1));
+        else {
+            std::string local_pname = pname_;
+            if(ignore_underscore_) {
+                local_pname = detail::remove_underscore(local_pname);
+                name = detail::remove_underscore(name);
+            }
+            if(ignore_case_) {
+                local_pname = detail::to_lower(local_pname);
+                name = detail::to_lower(name);
+            }
+            return name == local_pname;
+        }
+    }
+
+    /// Requires "-" to be removed from string
+    bool check_sname(std::string name) const { return (detail::find_member(name, snames_, ignore_case_) >= 0); }
+
+    /// Requires "--" to be removed from string
+    bool check_lname(std::string name) const {
+        return (detail::find_member(name, lnames_, ignore_case_, ignore_underscore_) >= 0);
+    }
+
+    /// Requires "--" to be removed from string
+    bool check_fname(std::string name) const {
+        if(fnames_.empty()) {
+            return false;
+        }
+        return (detail::find_member(name, fnames_, ignore_case_, ignore_underscore_) >= 0);
+    }
+
+    std::string get_flag_value(std::string name, std::string input_value) const {
+        static const std::string trueString{"true"};
+        static const std::string falseString{"false"};
+        static const std::string emptyString{"{}"};
+        // check for disable flag override_
+        if(disable_flag_override_) {
+            if(!((input_value.empty()) || (input_value == emptyString))) {
+                auto default_ind = detail::find_member(name, fnames_, ignore_case_, ignore_underscore_);
+                if(default_ind >= 0) {
+                    // We can static cast this to size_t because it is more than 0 in this block
+                    if(default_flag_values_[static_cast<size_t>(default_ind)].second != input_value) {
+                        throw(ArgumentMismatch::FlagOverride(name));
+                    }
+                } else {
+                    if(input_value != trueString) {
+                        throw(ArgumentMismatch::FlagOverride(name));
+                    }
+                }
+            }
+        }
+        auto ind = detail::find_member(name, fnames_, ignore_case_, ignore_underscore_);
+        if((input_value.empty()) || (input_value == emptyString)) {
+            return (ind < 0) ? trueString : default_flag_values_[static_cast<size_t>(ind)].second;
+        }
+        if(ind < 0) {
+            return input_value;
+        }
+        if(default_flag_values_[static_cast<size_t>(ind)].second == falseString) {
+            try {
+                auto val = detail::to_flag_value(input_value);
+                return (val == 1) ? falseString : (val == (-1) ? trueString : std::to_string(-val));
+            } catch(const std::invalid_argument &) {
+                return input_value;
+            }
+        } else {
+            return input_value;
+        }
+    }
+
+    /// Puts a result at the end
+    Option *add_result(std::string s) {
+        _add_result(std::move(s));
+        callback_run_ = false;
+        return this;
+    }
+
+    /// Puts a result at the end and get a count of the number of arguments actually added
+    Option *add_result(std::string s, int &results_added) {
+        results_added = _add_result(std::move(s));
+        callback_run_ = false;
+        return this;
+    }
+
+    /// Puts a result at the end
+    Option *add_result(std::vector<std::string> s) {
+        for(auto &str : s) {
+            _add_result(std::move(str));
+        }
+        callback_run_ = false;
+        return this;
+    }
+
+    /// Get a copy of the results
+    std::vector<std::string> results() const { return results_; }
+
+    /// get the results as a particular type
+    template <typename T,
+              enable_if_t<!is_vector<T>::value && !std::is_const<T>::value, detail::enabler> = detail::dummy>
+    void results(T &output) const {
+        bool retval;
+        if(results_.empty()) {
+            retval = detail::lexical_cast(default_str_, output);
+        } else if(results_.size() == 1) {
+            retval = detail::lexical_cast(results_[0], output);
+        } else {
+            switch(multi_option_policy_) {
+            case MultiOptionPolicy::TakeFirst:
+                retval = detail::lexical_cast(results_.front(), output);
+                break;
+            case MultiOptionPolicy::TakeLast:
+            default:
+                retval = detail::lexical_cast(results_.back(), output);
+                break;
+            case MultiOptionPolicy::Throw:
+                throw ConversionError(get_name(), results_);
+            case MultiOptionPolicy::Join:
+                retval = detail::lexical_cast(detail::join(results_), output);
+                break;
+            }
+        }
+        if(!retval) {
+            throw ConversionError(get_name(), results_);
+        }
+    }
+    /// get the results as a vector of a particular type
+    template <typename T> void results(std::vector<T> &output) const {
+        output.clear();
+        bool retval = true;
+
+        for(const auto &elem : results_) {
+            output.emplace_back();
+            retval &= detail::lexical_cast(elem, output.back());
+        }
+
+        if(!retval) {
+            throw ConversionError(get_name(), results_);
+        }
+    }
+
+    /// return the results as a particular type
+    template <typename T> T as() const {
+        T output;
+        results(output);
+        return output;
+    }
+
+    /// See if the callback has been run already
+    bool get_callback_run() const { return callback_run_; }
+
+    ///@}
+    /// @name Custom options
+    ///@{
+
+    /// Set the type function to run when displayed on this option
+    Option *type_name_fn(std::function<std::string()> typefun) {
+        type_name_ = typefun;
+        return this;
+    }
+
+    /// Set a custom option typestring
+    Option *type_name(std::string typeval) {
+        type_name_fn([typeval]() { return typeval; });
+        return this;
+    }
+
+    /// Set a custom option size
+    Option *type_size(int option_type_size) {
+        type_size_ = option_type_size;
+        if(type_size_ == 0)
+            required_ = false;
+        if(option_type_size < 0)
+            expected_ = -1;
+        return this;
+    }
+
+    /// Set a capture function for the default. Mostly used by App.
+    Option *default_function(const std::function<std::string()> &func) {
+        default_function_ = func;
+        return this;
+    }
+
+    /// Capture the default value from the original value (if it can be captured)
+    Option *capture_default_str() {
+        if(default_function_) {
+            default_str_ = default_function_();
+        }
+        return this;
+    }
+
+    /// Set the default value string representation (does not change the contained value)
+    Option *default_str(std::string val) {
+        default_str_ = val;
+        return this;
+    }
+
+    /// Set the default value string representation and evaluate into the bound value
+    Option *default_val(std::string val) {
+        default_str(val);
+        auto old_results = results_;
+        results_ = {val};
+        run_callback();
+        results_ = std::move(old_results);
+        return this;
+    }
+
+    /// Get the full typename for this option
+    std::string get_type_name() const {
+        std::string full_type_name = type_name_();
+        if(!validators_.empty()) {
+            for(auto &validator : validators_) {
+                std::string vtype = validator.get_description();
+                if(!vtype.empty()) {
+                    full_type_name += ":" + vtype;
+                }
+            }
+        }
+        return full_type_name;
+    }
+
+  private:
+    // run through the validators
+    std::string _validate(std::string &result) {
+        std::string err_msg;
+        for(const auto &vali : validators_) {
+            try {
+                err_msg = vali(result);
+            } catch(const ValidationError &err) {
+                err_msg = err.what();
+            }
+            if(!err_msg.empty())
+                break;
+        }
+        return err_msg;
+    }
+
+    int _add_result(std::string &&result) {
+        int result_count = 0;
+        if(delimiter_ == '\0') {
+            results_.push_back(std::move(result));
+            ++result_count;
+        } else {
+            if((result.find_first_of(delimiter_) != std::string::npos)) {
+                for(const auto &var : CLI::detail::split(result, delimiter_)) {
+                    if(!var.empty()) {
+                        results_.push_back(var);
+                        ++result_count;
+                    }
+                }
+            } else {
+                results_.push_back(std::move(result));
+                ++result_count;
+            }
+        }
+        return result_count;
+    }
+};
+
+} // namespace CLI
+
+// From CLI/App.hpp:
+
+namespace CLI {
+
+#ifndef CLI11_PARSE
+#define CLI11_PARSE(app, argc, argv)                                                                                   \
+    try {                                                                                                              \
+        (app).parse((argc), (argv));                                                                                   \
+    } catch(const CLI::ParseError &e) {                                                                                \
+        return (app).exit(e);                                                                                          \
+    }
+#endif
+
+namespace detail {
+enum class Classifier { NONE, POSITIONAL_MARK, SHORT, LONG, WINDOWS, SUBCOMMAND, SUBCOMMAND_TERMINATOR };
+struct AppFriend;
+} // namespace detail
+
+namespace FailureMessage {
+std::string simple(const App *app, const Error &e);
+std::string help(const App *app, const Error &e);
+} // namespace FailureMessage
+
+class App;
+
+using App_p = std::shared_ptr<App>;
+
+class Option_group;
+/// Creates a command line program, with very few defaults.
+/** To use, create a new `Program()` instance with `argc`, `argv`, and a help description. The templated
+ *  add_option methods make it easy to prepare options. Remember to call `.start` before starting your
+ * program, so that the options can be evaluated and the help option doesn't accidentally run your program. */
+class App {
+    friend Option;
+    friend detail::AppFriend;
+
+  protected:
+    // This library follows the Google style guide for member names ending in underscores
+
+    /// @name Basics
+    ///@{
+
+    /// Subcommand name or program name (from parser if name is empty)
+    std::string name_;
+
+    /// Description of the current program/subcommand
+    std::string description_;
+
+    /// If true, allow extra arguments (ie, don't throw an error). INHERITABLE
+    bool allow_extras_{false};
+
+    /// If true, allow extra arguments in the ini file (ie, don't throw an error). INHERITABLE
+    bool allow_config_extras_{false};
+
+    ///  If true, return immediately on an unrecognized option (implies allow_extras) INHERITABLE
+    bool prefix_command_{false};
+
+    /// If set to true the name was automatically generated from the command line vs a user set name
+    bool has_automatic_name_{false};
+
+    /// If set to true the subcommand is required to be processed and used, ignored for main app
+    bool required_{false};
+
+    /// If set to true the subcommand is disabled and cannot be used, ignored for main app
+    bool disabled_{false};
+
+    /// Flag indicating that the pre_parse_callback has been triggered
+    bool pre_parse_called_{false};
+
+    /// Flag indicating that the callback for the subcommand should be executed immediately on parse completion which is
+    /// before help or ini files are processed. INHERITABLE
+    bool immediate_callback_{false};
+
+    /// This is a function that runs prior to the start of parsing
+    std::function<void(size_t)> pre_parse_callback_;
+
+    /// This is a function that runs when complete. Great for subcommands. Can throw.
+    std::function<void()> callback_;
+
+    ///@}
+    /// @name Options
+    ///@{
+
+    /// The default values for options, customizable and changeable INHERITABLE
+    OptionDefaults option_defaults_;
+
+    /// The list of options, stored locally
+    std::vector<Option_p> options_;
+
+    ///@}
+    /// @name Help
+    ///@{
+
+    /// Footer to put after all options in the help output INHERITABLE
+    std::string footer_;
+
+    /// A pointer to the help flag if there is one INHERITABLE
+    Option *help_ptr_{nullptr};
+
+    /// A pointer to the help all flag if there is one INHERITABLE
+    Option *help_all_ptr_{nullptr};
+
+    /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer)
+    std::shared_ptr<FormatterBase> formatter_{new Formatter()};
+
+    /// The error message printing function INHERITABLE
+    std::function<std::string(const App *, const Error &e)> failure_message_ = FailureMessage::simple;
+
+    ///@}
+    /// @name Parsing
+    ///@{
+
+    using missing_t = std::vector<std::pair<detail::Classifier, std::string>>;
+
+    /// Pair of classifier, string for missing options. (extra detail is removed on returning from parse)
+    ///
+    /// This is faster and cleaner than storing just a list of strings and reparsing. This may contain the -- separator.
+    missing_t missing_;
+
+    /// This is a list of pointers to options with the original parse order
+    std::vector<Option *> parse_order_;
+
+    /// This is a list of the subcommands collected, in order
+    std::vector<App *> parsed_subcommands_;
+
+    /// this is a list of subcommands that are exclusionary to this one
+    std::set<App *> exclude_subcommands_;
+
+    /// This is a list of options which are exclusionary to this App, if the options were used this subcommand should
+    /// not be
+    std::set<Option *> exclude_options_;
+
+    ///@}
+    /// @name Subcommands
+    ///@{
+
+    /// Storage for subcommand list
+    std::vector<App_p> subcommands_;
+
+    /// If true, the program name is not case sensitive INHERITABLE
+    bool ignore_case_{false};
+
+    /// If true, the program should ignore underscores INHERITABLE
+    bool ignore_underscore_{false};
+
+    /// Allow subcommand fallthrough, so that parent commands can collect commands after subcommand.  INHERITABLE
+    bool fallthrough_{false};
+
+    /// Allow '/' for options for Windows like options. Defaults to true on Windows, false otherwise. INHERITABLE
+    bool allow_windows_style_options_{
+#ifdef _WIN32
+        true
+#else
+        false
+#endif
+    };
+    /// specify that positional arguments come at the end of the argument sequence not inheritable
+    bool positionals_at_end_{false};
+
+    /// If set to true the subcommand will start each parse disabled
+    bool disabled_by_default_{false};
+    /// If set to true the subcommand will be reenabled at the start of each parse
+    bool enabled_by_default_{false};
+    /// If set to true positional options are validated before assigning INHERITABLE
+    bool validate_positionals_{false};
+    /// A pointer to the parent if this is a subcommand
+    App *parent_{nullptr};
+
+    /// Counts the number of times this command/subcommand was parsed
+    size_t parsed_ = 0;
+
+    /// Minimum required subcommands (not inheritable!)
+    size_t require_subcommand_min_ = 0;
+
+    /// Max number of subcommands allowed (parsing stops after this number). 0 is unlimited INHERITABLE
+    size_t require_subcommand_max_ = 0;
+
+    /// Minimum required options (not inheritable!)
+    size_t require_option_min_ = 0;
+
+    /// Max number of options allowed. 0 is unlimited (not inheritable)
+    size_t require_option_max_ = 0;
+
+    /// The group membership INHERITABLE
+    std::string group_{"Subcommands"};
+
+    ///@}
+    /// @name Config
+    ///@{
+
+    /// The name of the connected config file
+    std::string config_name_;
+
+    /// True if ini is required (throws if not present), if false simply keep going.
+    bool config_required_{false};
+
+    /// Pointer to the config option
+    Option *config_ptr_{nullptr};
+
+    /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer)
+    std::shared_ptr<Config> config_formatter_{new ConfigINI()};
+
+    ///@}
+
+    /// Special private constructor for subcommand
+    App(std::string app_description, std::string app_name, App *parent)
+        : name_(std::move(app_name)), description_(std::move(app_description)), parent_(parent) {
+        // Inherit if not from a nullptr
+        if(parent_ != nullptr) {
+            if(parent_->help_ptr_ != nullptr)
+                set_help_flag(parent_->help_ptr_->get_name(false, true), parent_->help_ptr_->get_description());
+            if(parent_->help_all_ptr_ != nullptr)
+                set_help_all_flag(parent_->help_all_ptr_->get_name(false, true),
+                                  parent_->help_all_ptr_->get_description());
+
+            /// OptionDefaults
+            option_defaults_ = parent_->option_defaults_;
+
+            // INHERITABLE
+            failure_message_ = parent_->failure_message_;
+            allow_extras_ = parent_->allow_extras_;
+            allow_config_extras_ = parent_->allow_config_extras_;
+            prefix_command_ = parent_->prefix_command_;
+            immediate_callback_ = parent_->immediate_callback_;
+            ignore_case_ = parent_->ignore_case_;
+            ignore_underscore_ = parent_->ignore_underscore_;
+            fallthrough_ = parent_->fallthrough_;
+            validate_positionals_ = parent_->validate_positionals_;
+            allow_windows_style_options_ = parent_->allow_windows_style_options_;
+            group_ = parent_->group_;
+            footer_ = parent_->footer_;
+            formatter_ = parent_->formatter_;
+            config_formatter_ = parent_->config_formatter_;
+            require_subcommand_max_ = parent_->require_subcommand_max_;
+        }
+    }
+
+  public:
+    /// @name Basic
+    ///@{
+
+    /// Create a new program. Pass in the same arguments as main(), along with a help string.
+    explicit App(std::string app_description = "", std::string app_name = "")
+        : App(app_description, app_name, nullptr) {
+        set_help_flag("-h,--help", "Print this help message and exit");
+    }
+
+    /// virtual destructor
+    virtual ~App() = default;
+
+    /// Set a callback for the end of parsing.
+    ///
+    /// Due to a bug in c++11,
+    /// it is not possible to overload on std::function (fixed in c++14
+    /// and backported to c++11 on newer compilers). Use capture by reference
+    /// to get a pointer to App if needed.
+    App *callback(std::function<void()> app_callback) {
+        callback_ = std::move(app_callback);
+        return this;
+    }
+
+    /// Set a callback to execute prior to parsing.
+    ///
+    App *preparse_callback(std::function<void(size_t)> pp_callback) {
+        pre_parse_callback_ = std::move(pp_callback);
+        return this;
+    }
+
+    /// Set a name for the app (empty will use parser to set the name)
+    App *name(std::string app_name = "") {
+        name_ = app_name;
+        has_automatic_name_ = false;
+        return this;
+    }
+
+    /// Remove the error when extras are left over on the command line.
+    App *allow_extras(bool allow = true) {
+        allow_extras_ = allow;
+        return this;
+    }
+
+    /// Remove the error when extras are left over on the command line.
+    App *required(bool require = true) {
+        required_ = require;
+        return this;
+    }
+
+    /// Disable the subcommand or option group
+    App *disabled(bool disable = true) {
+        disabled_ = disable;
+        return this;
+    }
+
+    /// Set the subcommand to be disabled by default, so on clear(), at the start of each parse it is disabled
+    App *disabled_by_default(bool disable = true) {
+        disabled_by_default_ = disable;
+        return this;
+    }
+
+    /// Set the subcommand to be enabled by default, so on clear(), at the start of each parse it is enabled (not
+    /// disabled)
+    App *enabled_by_default(bool enable = true) {
+        enabled_by_default_ = enable;
+        return this;
+    }
+
+    /// Set the subcommand callback to be executed immediately on subcommand completion
+    App *immediate_callback(bool immediate = true) {
+        immediate_callback_ = immediate;
+        return this;
+    }
+
+    /// Set the subcommand to validate positional arguments before assigning
+    App *validate_positionals(bool validate = true) {
+        validate_positionals_ = validate;
+        return this;
+    }
+
+    /// Remove the error when extras are left over on the command line.
+    /// Will also call App::allow_extras().
+    App *allow_config_extras(bool allow = true) {
+        allow_extras(allow);
+        allow_config_extras_ = allow;
+        return this;
+    }
+
+    /// Do not parse anything after the first unrecognized option and return
+    App *prefix_command(bool allow = true) {
+        prefix_command_ = allow;
+        return this;
+    }
+
+    /// Ignore case. Subcommands inherit value.
+    App *ignore_case(bool value = true) {
+        ignore_case_ = value;
+        if(parent_ != nullptr && !name_.empty()) {
+            for(const auto &subc : parent_->subcommands_) {
+                if(subc.get() != this && (this->check_name(subc->name_) || subc->check_name(this->name_)))
+                    throw OptionAlreadyAdded(subc->name_);
+            }
+        }
+        return this;
+    }
+
+    /// Allow windows style options, such as `/opt`. First matching short or long name used. Subcommands inherit value.
+    App *allow_windows_style_options(bool value = true) {
+        allow_windows_style_options_ = value;
+        return this;
+    }
+
+    /// Specify that the positional arguments are only at the end of the sequence
+    App *positionals_at_end(bool value = true) {
+        positionals_at_end_ = value;
+        return this;
+    }
+
+    /// Ignore underscore. Subcommands inherit value.
+    App *ignore_underscore(bool value = true) {
+        ignore_underscore_ = value;
+        if(parent_ != nullptr && !name_.empty()) {
+            for(const auto &subc : parent_->subcommands_) {
+                if(subc.get() != this && (this->check_name(subc->name_) || subc->check_name(this->name_)))
+                    throw OptionAlreadyAdded(subc->name_);
+            }
+        }
+        return this;
+    }
+
+    /// Set the help formatter
+    App *formatter(std::shared_ptr<FormatterBase> fmt) {
+        formatter_ = fmt;
+        return this;
+    }
+
+    /// Set the help formatter
+    App *formatter_fn(std::function<std::string(const App *, std::string, AppFormatMode)> fmt) {
+        formatter_ = std::make_shared<FormatterLambda>(fmt);
+        return this;
+    }
+
+    /// Set the config formatter
+    App *config_formatter(std::shared_ptr<Config> fmt) {
+        config_formatter_ = fmt;
+        return this;
+    }
+
+    /// Check to see if this subcommand was parsed, true only if received on command line.
+    bool parsed() const { return parsed_ > 0; }
+
+    /// Get the OptionDefault object, to set option defaults
+    OptionDefaults *option_defaults() { return &option_defaults_; }
+
+    ///@}
+    /// @name Adding options
+    ///@{
+
+    /// Add an option, will automatically understand the type for common types.
+    ///
+    /// To use, create a variable with the expected type, and pass it in after the name.
+    /// After start is called, you can use count to see if the value was passed, and
+    /// the value will be initialized properly. Numbers, vectors, and strings are supported.
+    ///
+    /// ->required(), ->default, and the validators are options,
+    /// The positional options take an optional number of arguments.
+    ///
+    /// For example,
+    ///
+    ///     std::string filename;
+    ///     program.add_option("filename", filename, "description of filename");
+    ///
+    Option *add_option(std::string option_name,
+                       callback_t option_callback,
+                       std::string option_description = "",
+                       bool defaulted = false,
+                       std::function<std::string()> func = {}) {
+        Option myopt{option_name, option_description, option_callback, this};
+
+        if(std::find_if(std::begin(options_), std::end(options_), [&myopt](const Option_p &v) {
+               return *v == myopt;
+           }) == std::end(options_)) {
+            options_.emplace_back();
+            Option_p &option = options_.back();
+            option.reset(new Option(option_name, option_description, option_callback, this));
+
+            // Set the default string capture function
+            option->default_function(func);
+
+            // For compatibility with CLI11 1.7 and before, capture the default string here
+            if(defaulted)
+                option->capture_default_str();
+
+            // Transfer defaults to the new option
+            option_defaults_.copy_to(option.get());
+
+            // Don't bother to capture if we already did
+            if(!defaulted && option->get_always_capture_default())
+                option->capture_default_str();
+
+            return option.get();
+
+        } else
+            throw OptionAlreadyAdded(myopt.get_name());
+    }
+
+    /// Add option for non-vectors (duplicate copy needed without defaulted to avoid `iostream << value`)
+    template <typename T, enable_if_t<!is_vector<T>::value & !std::is_const<T>::value, detail::enabler> = detail::dummy>
+    Option *add_option(std::string option_name,
+                       T &variable, ///< The variable to set
+                       std::string option_description = "",
+                       bool defaulted = false) {
+
+        auto fun = [&variable](CLI::results_t res) { return detail::lexical_cast(res[0], variable); };
+
+        Option *opt = add_option(option_name, fun, option_description, defaulted, [&variable]() {
+            return std::string(CLI::detail::to_string(variable));
+        });
+        opt->type_name(detail::type_name<T>());
+
+        return opt;
+    }
+
+    /// Add option for a callback of a specific type
+    template <typename T, enable_if_t<!is_vector<T>::value, detail::enabler> = detail::dummy>
+    Option *add_option_function(std::string option_name,
+                                const std::function<void(const T &)> &func, ///< the callback to execute
+                                std::string option_description = "") {
+
+        auto fun = [func](CLI::results_t res) {
+            T variable;
+            bool result = detail::lexical_cast(res[0], variable);
+            if(result) {
+                func(variable);
+            }
+            return result;
+        };
+
+        Option *opt = add_option(option_name, std::move(fun), option_description, false);
+        opt->type_name(detail::type_name<T>());
+        return opt;
+    }
+
+    /// Add option with no description or variable assignment
+    Option *add_option(std::string option_name) {
+        return add_option(option_name, CLI::callback_t(), std::string{}, false);
+    }
+
+    /// Add option with description but with no variable assignment or callback
+    template <typename T,
+              enable_if_t<std::is_const<T>::value && std::is_constructible<std::string, T>::value, detail::enabler> =
+                  detail::dummy>
+    Option *add_option(std::string option_name, T &option_description) {
+        return add_option(option_name, CLI::callback_t(), option_description, false);
+    }
+
+    /// Add option for vectors
+    template <typename T>
+    Option *add_option(std::string option_name,
+                       std::vector<T> &variable, ///< The variable vector to set
+                       std::string option_description = "",
+                       bool defaulted = false) {
+
+        auto fun = [&variable](CLI::results_t res) {
+            bool retval = true;
+            variable.clear();
+            variable.reserve(res.size());
+            for(const auto &elem : res) {
+
+                variable.emplace_back();
+                retval &= detail::lexical_cast(elem, variable.back());
+            }
+            return (!variable.empty()) && retval;
+        };
+
+        auto default_function = [&variable]() {
+            std::vector<std::string> defaults;
+            defaults.resize(variable.size());
+            std::transform(variable.begin(), variable.end(), defaults.begin(), [](T &val) {
+                return std::string(CLI::detail::to_string(val));
+            });
+            return std::string("[" + detail::join(defaults) + "]");
+        };
+
+        Option *opt = add_option(option_name, fun, option_description, defaulted, default_function);
+        opt->type_name(detail::type_name<T>())->type_size(-1);
+
+        return opt;
+    }
+
+    /// Add option for a vector callback of a specific type
+    template <typename T, enable_if_t<is_vector<T>::value, detail::enabler> = detail::dummy>
+    Option *add_option_function(std::string option_name,
+                                const std::function<void(const T &)> &func, ///< the callback to execute
+                                std::string option_description = "") {
+
+        CLI::callback_t fun = [func](CLI::results_t res) {
+            T values;
+            bool retval = true;
+            values.reserve(res.size());
+            for(const auto &elem : res) {
+                values.emplace_back();
+                retval &= detail::lexical_cast(elem, values.back());
+            }
+            if(retval) {
+                func(values);
+            }
+            return retval;
+        };
+
+        Option *opt = add_option(option_name, std::move(fun), std::move(option_description), false);
+        opt->type_name(detail::type_name<T>())->type_size(-1);
+        return opt;
+    }
+
+    /// Set a help flag, replace the existing one if present
+    Option *set_help_flag(std::string flag_name = "", const std::string &help_description = "") {
+        // take flag_description by const reference otherwise add_flag tries to assign to help_description
+        if(help_ptr_ != nullptr) {
+            remove_option(help_ptr_);
+            help_ptr_ = nullptr;
+        }
+
+        // Empty name will simply remove the help flag
+        if(!flag_name.empty()) {
+            help_ptr_ = add_flag(flag_name, help_description);
+            help_ptr_->configurable(false);
+        }
+
+        return help_ptr_;
+    }
+
+    /// Set a help all flag, replaced the existing one if present
+    Option *set_help_all_flag(std::string help_name = "", const std::string &help_description = "") {
+        // take flag_description by const reference otherwise add_flag tries to assign to flag_description
+        if(help_all_ptr_ != nullptr) {
+            remove_option(help_all_ptr_);
+            help_all_ptr_ = nullptr;
+        }
+
+        // Empty name will simply remove the help all flag
+        if(!help_name.empty()) {
+            help_all_ptr_ = add_flag(help_name, help_description);
+            help_all_ptr_->configurable(false);
+        }
+
+        return help_all_ptr_;
+    }
+
+  private:
+    /// Internal function for adding a flag
+    Option *_add_flag_internal(std::string flag_name, CLI::callback_t fun, std::string flag_description) {
+        Option *opt;
+        if(detail::has_default_flag_values(flag_name)) {
+            // check for default values and if it has them
+            auto flag_defaults = detail::get_default_flag_values(flag_name);
+            detail::remove_default_flag_values(flag_name);
+            opt = add_option(std::move(flag_name), std::move(fun), std::move(flag_description), false);
+            for(const auto &fname : flag_defaults)
+                opt->fnames_.push_back(fname.first);
+            opt->default_flag_values_ = std::move(flag_defaults);
+        } else {
+            opt = add_option(std::move(flag_name), std::move(fun), std::move(flag_description), false);
+        }
+        // flags cannot have positional values
+        if(opt->get_positional()) {
+            auto pos_name = opt->get_name(true);
+            remove_option(opt);
+            throw IncorrectConstruction::PositionalFlag(pos_name);
+        }
+
+        opt->type_size(0);
+        return opt;
+    }
+
+  public:
+    /// Add a flag with no description or variable assignment
+    Option *add_flag(std::string flag_name) { return _add_flag_internal(flag_name, CLI::callback_t(), std::string{}); }
+
+    /// Add flag with description but with no variable assignment or callback
+    /// takes a constant string,  if a variable string is passed that variable will be assigned the results from the
+    /// flag
+    template <typename T,
+              enable_if_t<std::is_const<T>::value && std::is_constructible<std::string, T>::value, detail::enabler> =
+                  detail::dummy>
+    Option *add_flag(std::string flag_name, T &flag_description) {
+        return _add_flag_internal(flag_name, CLI::callback_t(), flag_description);
+    }
+
+    /// Add option for flag with integer result - defaults to allowing multiple passings, but can be forced to one if
+    /// `multi_option_policy(CLI::MultiOptionPolicy::Throw)` is used.
+    template <typename T,
+              enable_if_t<std::is_integral<T>::value && !is_bool<T>::value, detail::enabler> = detail::dummy>
+    Option *add_flag(std::string flag_name,
+                     T &flag_count, ///< A variable holding the count
+                     std::string flag_description = "") {
+        flag_count = 0;
+        CLI::callback_t fun = [&flag_count](CLI::results_t res) {
+            try {
+                detail::sum_flag_vector(res, flag_count);
+            } catch(const std::invalid_argument &) {
+                return false;
+            }
+            return true;
+        };
+        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+    }
+
+    /// Other type version accepts all other types that are not vectors such as bool, enum, string or other classes that
+    /// can be converted from a string
+    template <typename T,
+              enable_if_t<!is_vector<T>::value && !std::is_const<T>::value &&
+                              (!std::is_integral<T>::value || is_bool<T>::value) &&
+                              !std::is_constructible<std::function<void(int)>, T>::value,
+                          detail::enabler> = detail::dummy>
+    Option *add_flag(std::string flag_name,
+                     T &flag_result, ///< A variable holding true if passed
+                     std::string flag_description = "") {
+
+        CLI::callback_t fun = [&flag_result](CLI::results_t res) {
+            if(res.size() != 1) {
+                return false;
+            }
+            return CLI::detail::lexical_cast(res[0], flag_result);
+        };
+        Option *opt = _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+        opt->multi_option_policy(CLI::MultiOptionPolicy::TakeLast);
+        return opt;
+    }
+
+    /// Vector version to capture multiple flags.
+    template <typename T,
+              enable_if_t<!std::is_assignable<std::function<void(int64_t)>, T>::value, detail::enabler> = detail::dummy>
+    Option *add_flag(std::string flag_name,
+                     std::vector<T> &flag_results, ///< A vector of values with the flag results
+                     std::string flag_description = "") {
+        CLI::callback_t fun = [&flag_results](CLI::results_t res) {
+            bool retval = true;
+            for(const auto &elem : res) {
+                flag_results.emplace_back();
+                retval &= detail::lexical_cast(elem, flag_results.back());
+            }
+            return retval;
+        };
+        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+    }
+
+    /// Add option for callback that is triggered with a true flag and takes no arguments
+    Option *add_flag_callback(std::string flag_name,
+                              std::function<void(void)> function, ///< A function to call, void(void)
+                              std::string flag_description = "") {
+
+        CLI::callback_t fun = [function](CLI::results_t res) {
+            if(res.size() != 1) {
+                return false;
+            }
+            bool trigger;
+            auto result = CLI::detail::lexical_cast(res[0], trigger);
+            if(trigger)
+                function();
+            return result;
+        };
+        Option *opt = _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+        opt->multi_option_policy(CLI::MultiOptionPolicy::TakeLast);
+        return opt;
+    }
+
+    /// Add option for callback with an integer value
+    Option *add_flag_function(std::string flag_name,
+                              std::function<void(int64_t)> function, ///< A function to call, void(int)
+                              std::string flag_description = "") {
+
+        CLI::callback_t fun = [function](CLI::results_t res) {
+            int64_t flag_count = 0;
+            detail::sum_flag_vector(res, flag_count);
+            function(flag_count);
+            return true;
+        };
+        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
+    }
+
+#ifdef CLI11_CPP14
+    /// Add option for callback (C++14 or better only)
+    Option *add_flag(std::string flag_name,
+                     std::function<void(int64_t)> function, ///< A function to call, void(int64_t)
+                     std::string flag_description = "") {
+        return add_flag_function(std::move(flag_name), std::move(function), std::move(flag_description));
+    }
+#endif
+
+    /// Add set of options (No default, temp reference, such as an inline set) DEPRECATED
+    template <typename T>
+    Option *add_set(std::string option_name,
+                    T &member,           ///< The selected member of the set
+                    std::set<T> options, ///< The set of possibilities
+                    std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->check(IsMember{options});
+        return opt;
+    }
+
+    /// Add set of options (No default, set can be changed afterwards - do not destroy the set) DEPRECATED
+    template <typename T>
+    Option *add_mutable_set(std::string option_name,
+                            T &member,                  ///< The selected member of the set
+                            const std::set<T> &options, ///< The set of possibilities
+                            std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->check(IsMember{&options});
+        return opt;
+    }
+
+    /// Add set of options (with default, static set, such as an inline set) DEPRECATED
+    template <typename T>
+    Option *add_set(std::string option_name,
+                    T &member,           ///< The selected member of the set
+                    std::set<T> options, ///< The set of possibilities
+                    std::string option_description,
+                    bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->check(IsMember{options});
+        return opt;
+    }
+
+    /// Add set of options (with default, set can be changed afterwards - do not destroy the set) DEPRECATED
+    template <typename T>
+    Option *add_mutable_set(std::string option_name,
+                            T &member,                  ///< The selected member of the set
+                            const std::set<T> &options, ///< The set of possibilities
+                            std::string option_description,
+                            bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->check(IsMember{&options});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore case (no default, static set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case)) instead")
+    Option *add_set_ignore_case(std::string option_name,
+                                std::string &member,           ///< The selected member of the set
+                                std::set<std::string> options, ///< The set of possibilities
+                                std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->transform(IsMember{options, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore case (no default, set can be changed afterwards - do not destroy the
+    /// set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case)) with a (shared) pointer instead")
+    Option *add_mutable_set_ignore_case(std::string option_name,
+                                        std::string &member,                  ///< The selected member of the set
+                                        const std::set<std::string> &options, ///< The set of possibilities
+                                        std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->transform(IsMember{&options, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore case (default, static set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case)) instead")
+    Option *add_set_ignore_case(std::string option_name,
+                                std::string &member,           ///< The selected member of the set
+                                std::set<std::string> options, ///< The set of possibilities
+                                std::string option_description,
+                                bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->transform(IsMember{options, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore case (default, set can be changed afterwards - do not destroy the set)
+    /// DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(...)) with a (shared) pointer instead")
+    Option *add_mutable_set_ignore_case(std::string option_name,
+                                        std::string &member,                  ///< The selected member of the set
+                                        const std::set<std::string> &options, ///< The set of possibilities
+                                        std::string option_description,
+                                        bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->transform(IsMember{&options, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore (no default, static set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) instead")
+    Option *add_set_ignore_underscore(std::string option_name,
+                                      std::string &member,           ///< The selected member of the set
+                                      std::set<std::string> options, ///< The set of possibilities
+                                      std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->transform(IsMember{options, CLI::ignore_underscore});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore (no default, set can be changed afterwards - do not destroy
+    /// the set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) with a (shared) pointer instead")
+    Option *add_mutable_set_ignore_underscore(std::string option_name,
+                                              std::string &member,                  ///< The selected member of the set
+                                              const std::set<std::string> &options, ///< The set of possibilities
+                                              std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->transform(IsMember{options, CLI::ignore_underscore});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore (default, static set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) instead")
+    Option *add_set_ignore_underscore(std::string option_name,
+                                      std::string &member,           ///< The selected member of the set
+                                      std::set<std::string> options, ///< The set of possibilities
+                                      std::string option_description,
+                                      bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->transform(IsMember{options, CLI::ignore_underscore});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore (default, set can be changed afterwards - do not destroy the
+    /// set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) with a (shared) pointer instead")
+    Option *add_mutable_set_ignore_underscore(std::string option_name,
+                                              std::string &member,                  ///< The selected member of the set
+                                              const std::set<std::string> &options, ///< The set of possibilities
+                                              std::string option_description,
+                                              bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->transform(IsMember{&options, CLI::ignore_underscore});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore and case (no default, static set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) instead")
+    Option *add_set_ignore_case_underscore(std::string option_name,
+                                           std::string &member,           ///< The selected member of the set
+                                           std::set<std::string> options, ///< The set of possibilities
+                                           std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->transform(IsMember{options, CLI::ignore_underscore, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore and case (no default, set can be changed afterwards - do not
+    /// destroy the set) DEPRECATED
+    CLI11_DEPRECATED(
+        "Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) with a (shared) pointer instead")
+    Option *add_mutable_set_ignore_case_underscore(std::string option_name,
+                                                   std::string &member, ///< The selected member of the set
+                                                   const std::set<std::string> &options, ///< The set of possibilities
+                                                   std::string option_description = "") {
+
+        Option *opt = add_option(option_name, member, std::move(option_description));
+        opt->transform(IsMember{&options, CLI::ignore_underscore, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore and case (default, static set) DEPRECATED
+    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) instead")
+    Option *add_set_ignore_case_underscore(std::string option_name,
+                                           std::string &member,           ///< The selected member of the set
+                                           std::set<std::string> options, ///< The set of possibilities
+                                           std::string option_description,
+                                           bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->transform(IsMember{options, CLI::ignore_underscore, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add set of options, string only, ignore underscore and case (default, set can be changed afterwards - do not
+    /// destroy the set) DEPRECATED
+    CLI11_DEPRECATED(
+        "Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) with a (shared) pointer instead")
+    Option *add_mutable_set_ignore_case_underscore(std::string option_name,
+                                                   std::string &member, ///< The selected member of the set
+                                                   const std::set<std::string> &options, ///< The set of possibilities
+                                                   std::string option_description,
+                                                   bool defaulted) {
+
+        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
+        opt->transform(IsMember{&options, CLI::ignore_underscore, CLI::ignore_case});
+        return opt;
+    }
+
+    /// Add a complex number
+    template <typename T>
+    Option *add_complex(std::string option_name,
+                        T &variable,
+                        std::string option_description = "",
+                        bool defaulted = false,
+                        std::string label = "COMPLEX") {
+
+        std::string simple_name = CLI::detail::split(option_name, ',').at(0);
+        CLI::callback_t fun = [&variable, simple_name, label](results_t res) {
+            if(res[1].back() == 'i')
+                res[1].pop_back();
+            double x, y;
+            bool worked = detail::lexical_cast(res[0], x) && detail::lexical_cast(res[1], y);
+            if(worked)
+                variable = T(x, y);
+            return worked;
+        };
+
+        auto default_function = [&variable]() {
+            std::stringstream out;
+            out << variable;
+            return out.str();
+        };
+
+        CLI::Option *opt =
+            add_option(option_name, std::move(fun), std::move(option_description), defaulted, default_function);
+
+        opt->type_name(label)->type_size(2);
+        return opt;
+    }
+
+    /// Set a configuration ini file option, or clear it if no name passed
+    Option *set_config(std::string option_name = "",
+                       std::string default_filename = "",
+                       std::string help_message = "Read an ini file",
+                       bool config_required = false) {
+
+        // Remove existing config if present
+        if(config_ptr_ != nullptr)
+            remove_option(config_ptr_);
+
+        // Only add config if option passed
+        if(!option_name.empty()) {
+            config_name_ = default_filename;
+            config_required_ = config_required;
+            config_ptr_ = add_option(option_name, config_name_, help_message, !default_filename.empty());
+            config_ptr_->configurable(false);
+        }
+
+        return config_ptr_;
+    }
+
+    /// Removes an option from the App. Takes an option pointer. Returns true if found and removed.
+    bool remove_option(Option *opt) {
+        // Make sure no links exist
+        for(Option_p &op : options_) {
+            op->remove_needs(opt);
+            op->remove_excludes(opt);
+        }
+
+        if(help_ptr_ == opt)
+            help_ptr_ = nullptr;
+        if(help_all_ptr_ == opt)
+            help_all_ptr_ = nullptr;
+
+        auto iterator =
+            std::find_if(std::begin(options_), std::end(options_), [opt](const Option_p &v) { return v.get() == opt; });
+        if(iterator != std::end(options_)) {
+            options_.erase(iterator);
+            return true;
+        }
+        return false;
+    }
+
+    /// creates an option group as part of the given app
+    template <typename T = Option_group>
+    T *add_option_group(std::string group_name, std::string group_description = "") {
+        auto option_group = std::make_shared<T>(std::move(group_description), group_name, nullptr);
+        auto ptr = option_group.get();
+        // move to App_p for overload resolution on older gcc versions
+        App_p app_ptr = std::dynamic_pointer_cast<App>(option_group);
+        add_subcommand(std::move(app_ptr));
+        return ptr;
+    }
+
+    ///@}
+    /// @name Subcommmands
+    ///@{
+
+    /// Add a subcommand. Inherits INHERITABLE and OptionDefaults, and help flag
+    App *add_subcommand(std::string subcommand_name = "", std::string subcommand_description = "") {
+        CLI::App_p subcom = std::shared_ptr<App>(new App(std::move(subcommand_description), subcommand_name, this));
+        return add_subcommand(std::move(subcom));
+    }
+
+    /// Add a previously created app as a subcommand
+    App *add_subcommand(CLI::App_p subcom) {
+        if(!subcom)
+            throw IncorrectConstruction("passed App is not valid");
+        if(!subcom->name_.empty()) {
+            for(const auto &subc : subcommands_)
+                if(subc->check_name(subcom->name_) || subcom->check_name(subc->name_))
+                    throw OptionAlreadyAdded(subc->name_);
+        }
+        subcom->parent_ = this;
+        subcommands_.push_back(std::move(subcom));
+        return subcommands_.back().get();
+    }
+
+    /// Removes a subcommand from the App. Takes a subcommand pointer. Returns true if found and removed.
+    bool remove_subcommand(App *subcom) {
+        // Make sure no links exist
+        for(App_p &sub : subcommands_) {
+            sub->remove_excludes(subcom);
+        }
+
+        auto iterator = std::find_if(
+            std::begin(subcommands_), std::end(subcommands_), [subcom](const App_p &v) { return v.get() == subcom; });
+        if(iterator != std::end(subcommands_)) {
+            subcommands_.erase(iterator);
+            return true;
+        }
+        return false;
+    }
+    /// Check to see if a subcommand is part of this command (doesn't have to be in command line)
+    /// returns the first subcommand if passed a nullptr
+    App *get_subcommand(App *subcom) const {
+        if(subcom == nullptr)
+            throw OptionNotFound("nullptr passed");
+        for(const App_p &subcomptr : subcommands_)
+            if(subcomptr.get() == subcom)
+                return subcom;
+        throw OptionNotFound(subcom->get_name());
+    }
+
+    /// Check to see if a subcommand is part of this command (text version)
+    App *get_subcommand(std::string subcom) const {
+        auto subc = _find_subcommand(subcom, false, false);
+        if(subc == nullptr)
+            throw OptionNotFound(subcom);
+        return subc;
+    }
+    /// Get a pointer to subcommand by index
+    App *get_subcommand(int index = 0) const {
+        if(index >= 0) {
+            auto uindex = static_cast<unsigned>(index);
+            if(uindex < subcommands_.size())
+                return subcommands_[uindex].get();
+        }
+        throw OptionNotFound(std::to_string(index));
+    }
+
+    /// Check to see if a subcommand is part of this command and get a shared_ptr to it
+    CLI::App_p get_subcommand_ptr(App *subcom) const {
+        if(subcom == nullptr)
+            throw OptionNotFound("nullptr passed");
+        for(const App_p &subcomptr : subcommands_)
+            if(subcomptr.get() == subcom)
+                return subcomptr;
+        throw OptionNotFound(subcom->get_name());
+    }
+
+    /// Check to see if a subcommand is part of this command (text version)
+    CLI::App_p get_subcommand_ptr(std::string subcom) const {
+        for(const App_p &subcomptr : subcommands_)
+            if(subcomptr->check_name(subcom))
+                return subcomptr;
+        throw OptionNotFound(subcom);
+    }
+
+    /// Get an owning pointer to subcommand by index
+    CLI::App_p get_subcommand_ptr(int index = 0) const {
+        if(index >= 0) {
+            auto uindex = static_cast<unsigned>(index);
+            if(uindex < subcommands_.size())
+                return subcommands_[uindex];
+        }
+        throw OptionNotFound(std::to_string(index));
+    }
+
+    /// Check to see if an option group is part of this App
+    App *get_option_group(std::string group_name) const {
+        for(const App_p &app : subcommands_) {
+            if(app->name_.empty() && app->group_ == group_name) {
+                return app.get();
+            }
+        }
+        throw OptionNotFound(group_name);
+    }
+
+    /// No argument version of count counts the number of times this subcommand was
+    /// passed in. The main app will return 1. Unnamed subcommands will also return 1 unless
+    /// otherwise modified in a callback
+    size_t count() const { return parsed_; }
+
+    /// Get a count of all the arguments processed in options and subcommands, this excludes arguments which were
+    /// treated as extras.
+    size_t count_all() const {
+        size_t cnt{0};
+        for(auto &opt : options_) {
+            cnt += opt->count();
+        }
+        for(auto &sub : subcommands_) {
+            cnt += sub->count_all();
+        }
+        if(!get_name().empty()) { // for named subcommands add the number of times the subcommand was called
+            cnt += parsed_;
+        }
+        return cnt;
+    }
+
+    /// Changes the group membership
+    App *group(std::string group_name) {
+        group_ = group_name;
+        return this;
+    }
+
+    /// The argumentless form of require subcommand requires 1 or more subcommands
+    App *require_subcommand() {
+        require_subcommand_min_ = 1;
+        require_subcommand_max_ = 0;
+        return this;
+    }
+
+    /// Require a subcommand to be given (does not affect help call)
+    /// The number required can be given. Negative values indicate maximum
+    /// number allowed (0 for any number). Max number inheritable.
+    App *require_subcommand(int value) {
+        if(value < 0) {
+            require_subcommand_min_ = 0;
+            require_subcommand_max_ = static_cast<size_t>(-value);
+        } else {
+            require_subcommand_min_ = static_cast<size_t>(value);
+            require_subcommand_max_ = static_cast<size_t>(value);
+        }
+        return this;
+    }
+
+    /// Explicitly control the number of subcommands required. Setting 0
+    /// for the max means unlimited number allowed. Max number inheritable.
+    App *require_subcommand(size_t min, size_t max) {
+        require_subcommand_min_ = min;
+        require_subcommand_max_ = max;
+        return this;
+    }
+
+    /// The argumentless form of require option requires 1 or more options be used
+    App *require_option() {
+        require_option_min_ = 1;
+        require_option_max_ = 0;
+        return this;
+    }
+
+    /// Require an option to be given (does not affect help call)
+    /// The number required can be given. Negative values indicate maximum
+    /// number allowed (0 for any number).
+    App *require_option(int value) {
+        if(value < 0) {
+            require_option_min_ = 0;
+            require_option_max_ = static_cast<size_t>(-value);
+        } else {
+            require_option_min_ = static_cast<size_t>(value);
+            require_option_max_ = static_cast<size_t>(value);
+        }
+        return this;
+    }
+
+    /// Explicitly control the number of options required. Setting 0
+    /// for the max means unlimited number allowed. Max number inheritable.
+    App *require_option(size_t min, size_t max) {
+        require_option_min_ = min;
+        require_option_max_ = max;
+        return this;
+    }
+
+    /// Stop subcommand fallthrough, so that parent commands cannot collect commands after subcommand.
+    /// Default from parent, usually set on parent.
+    App *fallthrough(bool value = true) {
+        fallthrough_ = value;
+        return this;
+    }
+
+    /// Check to see if this subcommand was parsed, true only if received on command line.
+    /// This allows the subcommand to be directly checked.
+    operator bool() const { return parsed_ > 0; }
+
+    ///@}
+    /// @name Extras for subclassing
+    ///@{
+
+    /// This allows subclasses to inject code before callbacks but after parse.
+    ///
+    /// This does not run if any errors or help is thrown.
+    virtual void pre_callback() {}
+
+    ///@}
+    /// @name Parsing
+    ///@{
+    //
+    /// Reset the parsed data
+    void clear() {
+
+        parsed_ = 0;
+        pre_parse_called_ = false;
+
+        missing_.clear();
+        parsed_subcommands_.clear();
+        for(const Option_p &opt : options_) {
+            opt->clear();
+        }
+        for(const App_p &subc : subcommands_) {
+            subc->clear();
+        }
+    }
+
+    /// Parses the command line - throws errors.
+    /// This must be called after the options are in but before the rest of the program.
+    void parse(int argc, const char *const *argv) {
+        // If the name is not set, read from command line
+        if(name_.empty() || has_automatic_name_) {
+            has_automatic_name_ = true;
+            name_ = argv[0];
+        }
+
+        std::vector<std::string> args;
+        args.reserve(static_cast<size_t>(argc - 1));
+        for(int i = argc - 1; i > 0; i--)
+            args.emplace_back(argv[i]);
+        parse(std::move(args));
+    }
+
+    /// Parse a single string as if it contained command line arguments.
+    /// This function splits the string into arguments then calls parse(std::vector<std::string> &)
+    /// the function takes an optional boolean argument specifying if the programName is included in the string to
+    /// process
+    void parse(std::string commandline, bool program_name_included = false) {
+
+        if(program_name_included) {
+            auto nstr = detail::split_program_name(commandline);
+            if((name_.empty()) || (has_automatic_name_)) {
+                has_automatic_name_ = true;
+                name_ = nstr.first;
+            }
+            commandline = std::move(nstr.second);
+        } else
+            detail::trim(commandline);
+        // the next section of code is to deal with quoted arguments after an '=' or ':' for windows like operations
+        if(!commandline.empty()) {
+            commandline = detail::find_and_modify(commandline, "=", detail::escape_detect);
+            if(allow_windows_style_options_)
+                commandline = detail::find_and_modify(commandline, ":", detail::escape_detect);
+        }
+
+        auto args = detail::split_up(std::move(commandline));
+        // remove all empty strings
+        args.erase(std::remove(args.begin(), args.end(), std::string{}), args.end());
+        std::reverse(args.begin(), args.end());
+
+        parse(std::move(args));
+    }
+
+    /// The real work is done here. Expects a reversed vector.
+    /// Changes the vector to the remaining options.
+    void parse(std::vector<std::string> &args) {
+        // Clear if parsed
+        if(parsed_ > 0)
+            clear();
+
+        // parsed_ is incremented in commands/subcommands,
+        // but placed here to make sure this is cleared when
+        // running parse after an error is thrown, even by _validate or _configure.
+        parsed_ = 1;
+        _validate();
+        _configure();
+        // set the parent as nullptr as this object should be the top now
+        parent_ = nullptr;
+        parsed_ = 0;
+
+        _parse(args);
+        run_callback();
+    }
+
+    /// The real work is done here. Expects a reversed vector.
+    void parse(std::vector<std::string> &&args) {
+        // Clear if parsed
+        if(parsed_ > 0)
+            clear();
+
+        // parsed_ is incremented in commands/subcommands,
+        // but placed here to make sure this is cleared when
+        // running parse after an error is thrown, even by _validate or _configure.
+        parsed_ = 1;
+        _validate();
+        _configure();
+        // set the parent as nullptr as this object should be the top now
+        parent_ = nullptr;
+        parsed_ = 0;
+
+        _parse(std::move(args));
+        run_callback();
+    }
+
+    /// Provide a function to print a help message. The function gets access to the App pointer and error.
+    void failure_message(std::function<std::string(const App *, const Error &e)> function) {
+        failure_message_ = function;
+    }
+
+    /// Print a nice error message and return the exit code
+    int exit(const Error &e, std::ostream &out = std::cout, std::ostream &err = std::cerr) const {
+
+        /// Avoid printing anything if this is a CLI::RuntimeError
+        if(dynamic_cast<const CLI::RuntimeError *>(&e) != nullptr)
+            return e.get_exit_code();
+
+        if(dynamic_cast<const CLI::CallForHelp *>(&e) != nullptr) {
+            out << help();
+            return e.get_exit_code();
+        }
+
+        if(dynamic_cast<const CLI::CallForAllHelp *>(&e) != nullptr) {
+            out << help("", AppFormatMode::All);
+            return e.get_exit_code();
+        }
+
+        if(e.get_exit_code() != static_cast<int>(ExitCodes::Success)) {
+            if(failure_message_)
+                err << failure_message_(this, e) << std::flush;
+        }
+
+        return e.get_exit_code();
+    }
+
+    ///@}
+    /// @name Post parsing
+    ///@{
+
+    /// Counts the number of times the given option was passed.
+    size_t count(std::string option_name) const { return get_option(option_name)->count(); }
+
+    /// Get a subcommand pointer list to the currently selected subcommands (after parsing by default, in command
+    /// line order; use parsed = false to get the original definition list.)
+    std::vector<App *> get_subcommands() const { return parsed_subcommands_; }
+
+    /// Get a filtered subcommand pointer list from the original definition list. An empty function will provide all
+    /// subcommands (const)
+    std::vector<const App *> get_subcommands(const std::function<bool(const App *)> &filter) const {
+        std::vector<const App *> subcomms(subcommands_.size());
+        std::transform(std::begin(subcommands_), std::end(subcommands_), std::begin(subcomms), [](const App_p &v) {
+            return v.get();
+        });
+
+        if(filter) {
+            subcomms.erase(std::remove_if(std::begin(subcomms),
+                                          std::end(subcomms),
+                                          [&filter](const App *app) { return !filter(app); }),
+                           std::end(subcomms));
+        }
+
+        return subcomms;
+    }
+
+    /// Get a filtered subcommand pointer list from the original definition list. An empty function will provide all
+    /// subcommands
+    std::vector<App *> get_subcommands(const std::function<bool(App *)> &filter) {
+        std::vector<App *> subcomms(subcommands_.size());
+        std::transform(std::begin(subcommands_), std::end(subcommands_), std::begin(subcomms), [](const App_p &v) {
+            return v.get();
+        });
+
+        if(filter) {
+            subcomms.erase(
+                std::remove_if(std::begin(subcomms), std::end(subcomms), [&filter](App *app) { return !filter(app); }),
+                std::end(subcomms));
+        }
+
+        return subcomms;
+    }
+
+    /// Check to see if given subcommand was selected
+    bool got_subcommand(App *subcom) const {
+        // get subcom needed to verify that this was a real subcommand
+        return get_subcommand(subcom)->parsed_ > 0;
+    }
+
+    /// Check with name instead of pointer to see if subcommand was selected
+    bool got_subcommand(std::string subcommand_name) const { return get_subcommand(subcommand_name)->parsed_ > 0; }
+
+    /// Sets excluded options for the subcommand
+    App *excludes(Option *opt) {
+        if(opt == nullptr) {
+            throw OptionNotFound("nullptr passed");
+        }
+        exclude_options_.insert(opt);
+        return this;
+    }
+
+    /// Sets excluded subcommands for the subcommand
+    App *excludes(App *app) {
+        if((app == this) || (app == nullptr)) {
+            throw OptionNotFound("nullptr passed");
+        }
+        auto res = exclude_subcommands_.insert(app);
+        // subcommand exclusion should be symmetric
+        if(res.second) {
+            app->exclude_subcommands_.insert(this);
+        }
+        return this;
+    }
+
+    /// Removes an option from the excludes list of this subcommand
+    bool remove_excludes(Option *opt) {
+        auto iterator = std::find(std::begin(exclude_options_), std::end(exclude_options_), opt);
+        if(iterator != std::end(exclude_options_)) {
+            exclude_options_.erase(iterator);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /// Removes a subcommand from this excludes list of this subcommand
+    bool remove_excludes(App *app) {
+        auto iterator = std::find(std::begin(exclude_subcommands_), std::end(exclude_subcommands_), app);
+        if(iterator != std::end(exclude_subcommands_)) {
+            auto other_app = *iterator;
+            exclude_subcommands_.erase(iterator);
+            other_app->remove_excludes(this);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    ///@}
+    /// @name Help
+    ///@{
+
+    /// Set footer.
+    App *footer(std::string footer_string) {
+        footer_ = std::move(footer_string);
+        return this;
+    }
+
+    /// Produce a string that could be read in as a config of the current values of the App. Set default_also to
+    /// include default arguments. Prefix will add a string to the beginning of each option.
+    std::string config_to_str(bool default_also = false, bool write_description = false) const {
+        return config_formatter_->to_config(this, default_also, write_description, "");
+    }
+
+    /// Makes a help message, using the currently configured formatter
+    /// Will only do one subcommand at a time
+    std::string help(std::string prev = "", AppFormatMode mode = AppFormatMode::Normal) const {
+        if(prev.empty())
+            prev = get_name();
+        else
+            prev += " " + get_name();
+
+        // Delegate to subcommand if needed
+        auto selected_subcommands = get_subcommands();
+        if(!selected_subcommands.empty())
+            return selected_subcommands.at(0)->help(prev, mode);
+        else
+            return formatter_->make_help(this, prev, mode);
+    }
+
+    ///@}
+    /// @name Getters
+    ///@{
+
+    /// Access the formatter
+    std::shared_ptr<FormatterBase> get_formatter() const { return formatter_; }
+
+    /// Access the config formatter
+    std::shared_ptr<Config> get_config_formatter() const { return config_formatter_; }
+
+    /// Get the app or subcommand description
+    std::string get_description() const { return description_; }
+
+    /// Set the description of the app
+    App *description(std::string app_description) {
+        description_ = std::move(app_description);
+        return this;
+    }
+
+    /// Get the list of options (user facing function, so returns raw pointers), has optional filter function
+    std::vector<const Option *> get_options(const std::function<bool(const Option *)> filter = {}) const {
+        std::vector<const Option *> options(options_.size());
+        std::transform(std::begin(options_), std::end(options_), std::begin(options), [](const Option_p &val) {
+            return val.get();
+        });
+
+        if(filter) {
+            options.erase(std::remove_if(std::begin(options),
+                                         std::end(options),
+                                         [&filter](const Option *opt) { return !filter(opt); }),
+                          std::end(options));
+        }
+
+        return options;
+    }
+
+    /// Get an option by name (noexcept non-const version)
+    Option *get_option_no_throw(std::string option_name) noexcept {
+        for(Option_p &opt : options_) {
+            if(opt->check_name(option_name)) {
+                return opt.get();
+            }
+        }
+        for(auto &subc : subcommands_) {
+            // also check down into nameless subcommands
+            if(subc->get_name().empty()) {
+                auto opt = subc->get_option_no_throw(option_name);
+                if(opt != nullptr) {
+                    return opt;
+                }
+            }
+        }
+        return nullptr;
+    }
+
+    /// Get an option by name (noexcept const version)
+    const Option *get_option_no_throw(std::string option_name) const noexcept {
+        for(const Option_p &opt : options_) {
+            if(opt->check_name(option_name)) {
+                return opt.get();
+            }
+        }
+        for(const auto &subc : subcommands_) {
+            // also check down into nameless subcommands
+            if(subc->get_name().empty()) {
+                auto opt = subc->get_option_no_throw(option_name);
+                if(opt != nullptr) {
+                    return opt;
+                }
+            }
+        }
+        return nullptr;
+    }
+
+    /// Get an option by name
+    const Option *get_option(std::string option_name) const {
+        auto opt = get_option_no_throw(option_name);
+        if(opt == nullptr) {
+            throw OptionNotFound(option_name);
+        }
+        return opt;
+    }
+
+    /// Get an option by name (non-const version)
+    Option *get_option(std::string option_name) {
+        auto opt = get_option_no_throw(option_name);
+        if(opt == nullptr) {
+            throw OptionNotFound(option_name);
+        }
+        return opt;
+    }
+
+    /// Shortcut bracket operator for getting a pointer to an option
+    const Option *operator[](const std::string &option_name) const { return get_option(option_name); }
+
+    /// Shortcut bracket operator for getting a pointer to an option
+    const Option *operator[](const char *option_name) const { return get_option(option_name); }
+
+    /// Check the status of ignore_case
+    bool get_ignore_case() const { return ignore_case_; }
+
+    /// Check the status of ignore_underscore
+    bool get_ignore_underscore() const { return ignore_underscore_; }
+
+    /// Check the status of fallthrough
+    bool get_fallthrough() const { return fallthrough_; }
+
+    /// Check the status of the allow windows style options
+    bool get_allow_windows_style_options() const { return allow_windows_style_options_; }
+
+    /// Check the status of the allow windows style options
+    bool get_positionals_at_end() const { return positionals_at_end_; }
+
+    /// Get the group of this subcommand
+    const std::string &get_group() const { return group_; }
+
+    /// Get footer.
+    const std::string &get_footer() const { return footer_; }
+
+    /// Get the required min subcommand value
+    size_t get_require_subcommand_min() const { return require_subcommand_min_; }
+
+    /// Get the required max subcommand value
+    size_t get_require_subcommand_max() const { return require_subcommand_max_; }
+
+    /// Get the required min option value
+    size_t get_require_option_min() const { return require_option_min_; }
+
+    /// Get the required max option value
+    size_t get_require_option_max() const { return require_option_max_; }
+
+    /// Get the prefix command status
+    bool get_prefix_command() const { return prefix_command_; }
+
+    /// Get the status of allow extras
+    bool get_allow_extras() const { return allow_extras_; }
+
+    /// Get the status of required
+    bool get_required() const { return required_; }
+
+    /// Get the status of disabled
+    bool get_disabled() const { return disabled_; }
+
+    /// Get the status of disabled
+    bool get_immediate_callback() const { return immediate_callback_; }
+
+    /// Get the status of disabled by default
+    bool get_disabled_by_default() const { return disabled_by_default_; }
+
+    /// Get the status of disabled by default
+    bool get_enabled_by_default() const { return enabled_by_default_; }
+    /// Get the status of validating positionals
+    bool get_validate_positionals() const { return validate_positionals_; }
+
+    /// Get the status of allow extras
+    bool get_allow_config_extras() const { return allow_config_extras_; }
+
+    /// Get a pointer to the help flag.
+    Option *get_help_ptr() { return help_ptr_; }
+
+    /// Get a pointer to the help flag. (const)
+    const Option *get_help_ptr() const { return help_ptr_; }
+
+    /// Get a pointer to the help all flag. (const)
+    const Option *get_help_all_ptr() const { return help_all_ptr_; }
+
+    /// Get a pointer to the config option.
+    Option *get_config_ptr() { return config_ptr_; }
+
+    /// Get a pointer to the config option. (const)
+    const Option *get_config_ptr() const { return config_ptr_; }
+
+    /// Get the parent of this subcommand (or nullptr if master app)
+    App *get_parent() { return parent_; }
+
+    /// Get the parent of this subcommand (or nullptr if master app) (const version)
+    const App *get_parent() const { return parent_; }
+
+    /// Get the name of the current app
+    std::string get_name() const { return name_; }
+
+    /// Get a display name for an app
+    std::string get_display_name() const { return (!name_.empty()) ? name_ : "[Option Group: " + get_group() + "]"; }
+
+    /// Check the name, case insensitive and underscore insensitive if set
+    bool check_name(std::string name_to_check) const {
+        std::string local_name = name_;
+        if(ignore_underscore_) {
+            local_name = detail::remove_underscore(name_);
+            name_to_check = detail::remove_underscore(name_to_check);
+        }
+        if(ignore_case_) {
+            local_name = detail::to_lower(name_);
+            name_to_check = detail::to_lower(name_to_check);
+        }
+
+        return local_name == name_to_check;
+    }
+
+    /// Get the groups available directly from this option (in order)
+    std::vector<std::string> get_groups() const {
+        std::vector<std::string> groups;
+
+        for(const Option_p &opt : options_) {
+            // Add group if it is not already in there
+            if(std::find(groups.begin(), groups.end(), opt->get_group()) == groups.end()) {
+                groups.push_back(opt->get_group());
+            }
+        }
+
+        return groups;
+    }
+
+    /// This gets a vector of pointers with the original parse order
+    const std::vector<Option *> &parse_order() const { return parse_order_; }
+
+    /// This returns the missing options from the current subcommand
+    std::vector<std::string> remaining(bool recurse = false) const {
+        std::vector<std::string> miss_list;
+        for(const std::pair<detail::Classifier, std::string> &miss : missing_) {
+            miss_list.push_back(std::get<1>(miss));
+        }
+        // Get from a subcommand that may allow extras
+        if(recurse) {
+            if(!allow_extras_) {
+                for(const auto &sub : subcommands_) {
+                    if(sub->name_.empty() && !sub->missing_.empty()) {
+                        for(const std::pair<detail::Classifier, std::string> &miss : sub->missing_) {
+                            miss_list.push_back(std::get<1>(miss));
+                        }
+                    }
+                }
+            }
+            // Recurse into subcommands
+
+            for(const App *sub : parsed_subcommands_) {
+                std::vector<std::string> output = sub->remaining(recurse);
+                std::copy(std::begin(output), std::end(output), std::back_inserter(miss_list));
+            }
+        }
+        return miss_list;
+    }
+
+    /// This returns the missing options in a form ready for processing by another command line program
+    std::vector<std::string> remaining_for_passthrough(bool recurse = false) const {
+        std::vector<std::string> miss_list = remaining(recurse);
+        std::reverse(std::begin(miss_list), std::end(miss_list));
+        return miss_list;
+    }
+
+    /// This returns the number of remaining options, minus the -- separator
+    size_t remaining_size(bool recurse = false) const {
+        auto remaining_options = static_cast<size_t>(std::count_if(
+            std::begin(missing_), std::end(missing_), [](const std::pair<detail::Classifier, std::string> &val) {
+                return val.first != detail::Classifier::POSITIONAL_MARK;
+            }));
+
+        if(recurse) {
+            for(const App_p &sub : subcommands_) {
+                remaining_options += sub->remaining_size(recurse);
+            }
+        }
+        return remaining_options;
+    }
+
+    ///@}
+
+  protected:
+    /// Check the options to make sure there are no conflicts.
+    ///
+    /// Currently checks to see if multiple positionals exist with -1 args and checks if the min and max options are
+    /// feasible
+    void _validate() const {
+        auto pcount = std::count_if(std::begin(options_), std::end(options_), [](const Option_p &opt) {
+            return opt->get_items_expected() < 0 && opt->get_positional();
+        });
+        if(pcount > 1)
+            throw InvalidError(name_);
+
+        size_t nameless_subs{0};
+        for(const App_p &app : subcommands_) {
+            app->_validate();
+            if(app->get_name().empty())
+                ++nameless_subs;
+        }
+
+        if(require_option_min_ > 0) {
+            if(require_option_max_ > 0) {
+                if(require_option_max_ < require_option_min_) {
+                    throw(InvalidError("Required min options greater than required max options",
+                                       ExitCodes::InvalidError));
+                }
+            }
+            if(require_option_min_ > (options_.size() + nameless_subs)) {
+                throw(InvalidError("Required min options greater than number of available options",
+                                   ExitCodes::InvalidError));
+            }
+        }
+    }
+
+    /// configure subcommands to enable parsing through the current object
+    /// set the correct fallthrough and prefix for nameless subcommands and manage the automatic enable or disable
+    /// makes sure parent is set correctly
+    void _configure() {
+        if(disabled_by_default_) {
+            disabled_ = true;
+        }
+        if(enabled_by_default_) {
+            disabled_ = false;
+        }
+        for(const App_p &app : subcommands_) {
+            if(app->has_automatic_name_) {
+                app->name_.clear();
+            }
+            if(app->name_.empty()) {
+                app->fallthrough_ = false; // make sure fallthrough_ is false to prevent infinite loop
+                app->prefix_command_ = false;
+            }
+            // make sure the parent is set to be this object in preparation for parse
+            app->parent_ = this;
+            app->_configure();
+        }
+    }
+    /// Internal function to run (App) callback, bottom up
+    void run_callback() {
+        pre_callback();
+        // run the callbacks for the received subcommands
+        for(App *subc : get_subcommands()) {
+            if(!subc->immediate_callback_)
+                subc->run_callback();
+        }
+        // now run callbacks for option_groups
+        for(auto &subc : subcommands_) {
+            if(!subc->immediate_callback_ && subc->name_.empty() && subc->count_all() > 0) {
+                subc->run_callback();
+            }
+        }
+        // finally run the main callback
+        if(callback_ && (parsed_ > 0)) {
+            if(!name_.empty() || count_all() > 0) {
+                callback_();
+            }
+        }
+    }
+
+    /// Check to see if a subcommand is valid. Give up immediately if subcommand max has been reached.
+    bool _valid_subcommand(const std::string &current, bool ignore_used = true) const {
+        // Don't match if max has been reached - but still check parents
+        if(require_subcommand_max_ != 0 && parsed_subcommands_.size() >= require_subcommand_max_) {
+            return parent_ != nullptr && parent_->_valid_subcommand(current, ignore_used);
+        }
+        auto com = _find_subcommand(current, true, ignore_used);
+        if(com != nullptr) {
+            return true;
+        }
+        // Check parent if exists, else return false
+        return parent_ != nullptr && parent_->_valid_subcommand(current, ignore_used);
+    }
+
+    /// Selects a Classifier enum based on the type of the current argument
+    detail::Classifier _recognize(const std::string &current, bool ignore_used_subcommands = true) const {
+        std::string dummy1, dummy2;
+
+        if(current == "--")
+            return detail::Classifier::POSITIONAL_MARK;
+        if(_valid_subcommand(current, ignore_used_subcommands))
+            return detail::Classifier::SUBCOMMAND;
+        if(detail::split_long(current, dummy1, dummy2))
+            return detail::Classifier::LONG;
+        if(detail::split_short(current, dummy1, dummy2))
+            return detail::Classifier::SHORT;
+        if((allow_windows_style_options_) && (detail::split_windows_style(current, dummy1, dummy2)))
+            return detail::Classifier::WINDOWS;
+        if((current == "++") && !name_.empty() && parent_ != nullptr)
+            return detail::Classifier::SUBCOMMAND_TERMINATOR;
+        return detail::Classifier::NONE;
+    }
+
+    // The parse function is now broken into several parts, and part of process
+
+    /// Read and process an ini file (main app only)
+    void _process_ini() {
+        // Process an INI file
+        if(config_ptr_ != nullptr) {
+            if(*config_ptr_) {
+                config_ptr_->run_callback();
+                config_required_ = true;
+            }
+            if(!config_name_.empty()) {
+                try {
+                    std::vector<ConfigItem> values = config_formatter_->from_file(config_name_);
+                    _parse_config(values);
+                } catch(const FileError &) {
+                    if(config_required_)
+                        throw;
+                }
+            }
+        }
+    }
+
+    /// Get envname options if not yet passed. Runs on *all* subcommands.
+    void _process_env() {
+        for(const Option_p &opt : options_) {
+            if(opt->count() == 0 && !opt->envname_.empty()) {
+                char *buffer = nullptr;
+                std::string ename_string;
+
+#ifdef _MSC_VER
+                // Windows version
+                size_t sz = 0;
+                if(_dupenv_s(&buffer, &sz, opt->envname_.c_str()) == 0 && buffer != nullptr) {
+                    ename_string = std::string(buffer);
+                    free(buffer);
+                }
+#else
+                // This also works on Windows, but gives a warning
+                buffer = std::getenv(opt->envname_.c_str());
+                if(buffer != nullptr)
+                    ename_string = std::string(buffer);
+#endif
+
+                if(!ename_string.empty()) {
+                    opt->add_result(ename_string);
+                }
+            }
+        }
+
+        for(App_p &sub : subcommands_) {
+            if(sub->get_name().empty() || !sub->immediate_callback_)
+                sub->_process_env();
+        }
+    }
+
+    /// Process callbacks. Runs on *all* subcommands.
+    void _process_callbacks() {
+
+        for(App_p &sub : subcommands_) {
+            // process the priority option_groups first
+            if(sub->get_name().empty() && sub->immediate_callback_) {
+                if(sub->count_all() > 0) {
+                    sub->_process_callbacks();
+                    sub->run_callback();
+                }
+            }
+        }
+
+        for(const Option_p &opt : options_) {
+            if(opt->count() > 0 && !opt->get_callback_run()) {
+                opt->run_callback();
+            }
+        }
+
+        for(App_p &sub : subcommands_) {
+            if(!sub->immediate_callback_) {
+                sub->_process_callbacks();
+            }
+        }
+    }
+
+    /// Run help flag processing if any are found.
+    ///
+    /// The flags allow recursive calls to remember if there was a help flag on a parent.
+    void _process_help_flags(bool trigger_help = false, bool trigger_all_help = false) const {
+        const Option *help_ptr = get_help_ptr();
+        const Option *help_all_ptr = get_help_all_ptr();
+
+        if(help_ptr != nullptr && help_ptr->count() > 0)
+            trigger_help = true;
+        if(help_all_ptr != nullptr && help_all_ptr->count() > 0)
+            trigger_all_help = true;
+
+        // If there were parsed subcommands, call those. First subcommand wins if there are multiple ones.
+        if(!parsed_subcommands_.empty()) {
+            for(const App *sub : parsed_subcommands_)
+                sub->_process_help_flags(trigger_help, trigger_all_help);
+
+            // Only the final subcommand should call for help. All help wins over help.
+        } else if(trigger_all_help) {
+            throw CallForAllHelp();
+        } else if(trigger_help) {
+            throw CallForHelp();
+        }
+    }
+
+    /// Verify required options and cross requirements. Subcommands too (only if selected).
+    void _process_requirements() {
+        // check excludes
+        bool excluded{false};
+        std::string excluder;
+        for(auto &opt : exclude_options_) {
+            if(opt->count() > 0) {
+                excluded = true;
+                excluder = opt->get_name();
+            }
+        }
+        for(auto &subc : exclude_subcommands_) {
+            if(subc->count_all() > 0) {
+                excluded = true;
+                excluder = subc->get_display_name();
+            }
+        }
+        if(excluded) {
+            if(count_all() > 0) {
+                throw ExcludesError(get_display_name(), excluder);
+            }
+            // if we are excluded but didn't receive anything, just return
+            return;
+        }
+        size_t used_options = 0;
+        for(const Option_p &opt : options_) {
+
+            if(opt->count() != 0) {
+                ++used_options;
+            }
+            // Required or partially filled
+            if(opt->get_required() || opt->count() != 0) {
+                // Make sure enough -N arguments parsed (+N is already handled in parsing function)
+                if(opt->get_items_expected() < 0 && opt->count() < static_cast<size_t>(-opt->get_items_expected()))
+                    throw ArgumentMismatch::AtLeast(opt->get_name(), -opt->get_items_expected());
+
+                // Required but empty
+                if(opt->get_required() && opt->count() == 0)
+                    throw RequiredError(opt->get_name());
+            }
+            // Requires
+            for(const Option *opt_req : opt->needs_)
+                if(opt->count() > 0 && opt_req->count() == 0)
+                    throw RequiresError(opt->get_name(), opt_req->get_name());
+            // Excludes
+            for(const Option *opt_ex : opt->excludes_)
+                if(opt->count() > 0 && opt_ex->count() != 0)
+                    throw ExcludesError(opt->get_name(), opt_ex->get_name());
+        }
+        // check for the required number of subcommands
+        if(require_subcommand_min_ > 0) {
+            auto selected_subcommands = get_subcommands();
+            if(require_subcommand_min_ > selected_subcommands.size())
+                throw RequiredError::Subcommand(require_subcommand_min_);
+        }
+
+        // Max error cannot occur, the extra subcommand will parse as an ExtrasError or a remaining item.
+
+        // run this loop to check how many unnamed subcommands were actually used since they are considered options from
+        // the perspective of an App
+        for(App_p &sub : subcommands_) {
+            if(sub->disabled_)
+                continue;
+            if(sub->name_.empty() && sub->count_all() > 0) {
+                ++used_options;
+            }
+        }
+
+        if(require_option_min_ > used_options || (require_option_max_ > 0 && require_option_max_ < used_options)) {
+            auto option_list = detail::join(options_, [](const Option_p &ptr) { return ptr->get_name(false, true); });
+            if(option_list.compare(0, 10, "-h,--help,") == 0) {
+                option_list.erase(0, 10);
+            }
+            auto subc_list = get_subcommands([](App *app) { return ((app->get_name().empty()) && (!app->disabled_)); });
+            if(!subc_list.empty()) {
+                option_list += "," + detail::join(subc_list, [](const App *app) { return app->get_display_name(); });
+            }
+            throw RequiredError::Option(require_option_min_, require_option_max_, used_options, option_list);
+        }
+
+        // now process the requirements for subcommands if needed
+        for(App_p &sub : subcommands_) {
+            if(sub->disabled_)
+                continue;
+            if(sub->name_.empty() && sub->required_ == false) {
+                if(sub->count_all() == 0) {
+                    if(require_option_min_ > 0 && require_option_min_ <= used_options) {
+                        continue;
+                        // if we have met the requirement and there is nothing in this option group skip checking
+                        // requirements
+                    }
+                    if(require_option_max_ > 0 && used_options >= require_option_min_) {
+                        continue;
+                        // if we have met the requirement and there is nothing in this option group skip checking
+                        // requirements
+                    }
+                }
+            }
+            if(sub->count() > 0 || sub->name_.empty()) {
+                sub->_process_requirements();
+            }
+
+            if(sub->required_ && sub->count_all() == 0) {
+                throw(CLI::RequiredError(sub->get_display_name()));
+            }
+        }
+    }
+
+    /// Process callbacks and such.
+    void _process() {
+        _process_ini();
+        _process_env();
+        _process_callbacks();
+        _process_help_flags();
+        _process_requirements();
+    }
+
+    /// Throw an error if anything is left over and should not be.
+    void _process_extras() {
+        if(!(allow_extras_ || prefix_command_)) {
+            size_t num_left_over = remaining_size();
+            if(num_left_over > 0) {
+                throw ExtrasError(remaining(false));
+            }
+        }
+
+        for(App_p &sub : subcommands_) {
+            if(sub->count() > 0)
+                sub->_process_extras();
+        }
+    }
+
+    /// Throw an error if anything is left over and should not be.
+    /// Modifies the args to fill in the missing items before throwing.
+    void _process_extras(std::vector<std::string> &args) {
+        if(!(allow_extras_ || prefix_command_)) {
+            size_t num_left_over = remaining_size();
+            if(num_left_over > 0) {
+                args = remaining(false);
+                throw ExtrasError(args);
+            }
+        }
+
+        for(App_p &sub : subcommands_) {
+            if(sub->count() > 0)
+                sub->_process_extras(args);
+        }
+    }
+
+    /// Internal function to recursively increment the parsed counter on the current app as well unnamed subcommands
+    void increment_parsed() {
+        ++parsed_;
+        for(App_p &sub : subcommands_) {
+            if(sub->get_name().empty())
+                sub->increment_parsed();
+        }
+    }
+    /// Internal parse function
+    void _parse(std::vector<std::string> &args) {
+        increment_parsed();
+        _trigger_pre_parse(args.size());
+        bool positional_only = false;
+
+        while(!args.empty()) {
+            if(!_parse_single(args, positional_only)) {
+                break;
+            }
+        }
+
+        if(parent_ == nullptr) {
+            _process();
+
+            // Throw error if any items are left over (depending on settings)
+            _process_extras(args);
+
+            // Convert missing (pairs) to extras (string only) ready for processing in another app
+            args = remaining_for_passthrough(false);
+        } else if(immediate_callback_) {
+            _process_env();
+            _process_callbacks();
+            _process_help_flags();
+            _process_requirements();
+            run_callback();
+        }
+    }
+
+    /// Internal parse function
+    void _parse(std::vector<std::string> &&args) {
+        // this can only be called by the top level in which case parent == nullptr by definition
+        // operation is simplified
+        increment_parsed();
+        _trigger_pre_parse(args.size());
+        bool positional_only = false;
+
+        while(!args.empty()) {
+            _parse_single(args, positional_only);
+        }
+        _process();
+
+        // Throw error if any items are left over (depending on settings)
+        _process_extras();
+    }
+
+    /// Parse one config param, return false if not found in any subcommand, remove if it is
+    ///
+    /// If this has more than one dot.separated.name, go into the subcommand matching it
+    /// Returns true if it managed to find the option, if false you'll need to remove the arg manually.
+    void _parse_config(std::vector<ConfigItem> &args) {
+        for(ConfigItem item : args) {
+            if(!_parse_single_config(item) && !allow_config_extras_)
+                throw ConfigError::Extras(item.fullname());
+        }
+    }
+
+    /// Fill in a single config option
+    bool _parse_single_config(const ConfigItem &item, size_t level = 0) {
+        if(level < item.parents.size()) {
+            try {
+                auto subcom = get_subcommand(item.parents.at(level));
+                return subcom->_parse_single_config(item, level + 1);
+            } catch(const OptionNotFound &) {
+                return false;
+            }
+        }
+
+        Option *op = get_option_no_throw("--" + item.name);
+        if(op == nullptr) {
+            // If the option was not present
+            if(get_allow_config_extras())
+                // Should we worry about classifying the extras properly?
+                missing_.emplace_back(detail::Classifier::NONE, item.fullname());
+            return false;
+        }
+
+        if(!op->get_configurable())
+            throw ConfigError::NotConfigurable(item.fullname());
+
+        if(op->empty()) {
+            // Flag parsing
+            if(op->get_type_size() == 0) {
+                auto res = config_formatter_->to_flag(item);
+                res = op->get_flag_value(item.name, res);
+
+                op->add_result(res);
+
+            } else {
+                op->add_result(item.inputs);
+                op->run_callback();
+            }
+        }
+
+        return true;
+    }
+
+    /// Parse "one" argument (some may eat more than one), delegate to parent if fails, add to missing if missing
+    /// from master return false if the parse has failed and needs to return to parent
+    bool _parse_single(std::vector<std::string> &args, bool &positional_only) {
+        bool retval = true;
+        detail::Classifier classifier = positional_only ? detail::Classifier::NONE : _recognize(args.back());
+        switch(classifier) {
+        case detail::Classifier::POSITIONAL_MARK:
+            args.pop_back();
+            positional_only = true;
+            if((!_has_remaining_positionals()) && (parent_ != nullptr)) {
+                retval = false;
+            } else {
+                _move_to_missing(classifier, "--");
+            }
+            break;
+        case detail::Classifier::SUBCOMMAND_TERMINATOR:
+            // treat this like a positional mark if in the parent app
+            args.pop_back();
+            retval = false;
+            break;
+        case detail::Classifier::SUBCOMMAND:
+            retval = _parse_subcommand(args);
+            break;
+        case detail::Classifier::LONG:
+        case detail::Classifier::SHORT:
+        case detail::Classifier::WINDOWS:
+            // If already parsed a subcommand, don't accept options_
+            _parse_arg(args, classifier);
+            break;
+        case detail::Classifier::NONE:
+            // Probably a positional or something for a parent (sub)command
+            retval = _parse_positional(args);
+            if(retval && positionals_at_end_) {
+                positional_only = true;
+            }
+            break;
+
+            // LCOV_EXCL_START
+        default:
+            HorribleError("unrecognized classifier (you should not see this!)");
+            // LCOV_EXCL_END
+        }
+        return retval;
+    }
+
+    /// Count the required remaining positional arguments
+    size_t _count_remaining_positionals(bool required_only = false) const {
+        size_t retval = 0;
+        for(const Option_p &opt : options_)
+            if(opt->get_positional() && (!required_only || opt->get_required()) && opt->get_items_expected() > 0 &&
+               static_cast<int>(opt->count()) < opt->get_items_expected())
+                retval = static_cast<size_t>(opt->get_items_expected()) - opt->count();
+
+        return retval;
+    }
+
+    /// Count the required remaining positional arguments
+    bool _has_remaining_positionals() const {
+        for(const Option_p &opt : options_)
+            if(opt->get_positional() &&
+               ((opt->get_items_expected() < 0) || ((static_cast<int>(opt->count()) < opt->get_items_expected()))))
+                return true;
+
+        return false;
+    }
+
+    /// Parse a positional, go up the tree to check
+    /// Return true if the positional was used false otherwise
+    bool _parse_positional(std::vector<std::string> &args) {
+
+        const std::string &positional = args.back();
+        for(const Option_p &opt : options_) {
+            // Eat options, one by one, until done
+            if(opt->get_positional() &&
+               (static_cast<int>(opt->count()) < opt->get_items_expected() || opt->get_items_expected() < 0)) {
+                if(validate_positionals_) {
+                    std::string pos = positional;
+                    pos = opt->_validate(pos);
+                    if(!pos.empty()) {
+                        continue;
+                    }
+                }
+                opt->add_result(positional);
+                parse_order_.push_back(opt.get());
+                args.pop_back();
+                return true;
+            }
+        }
+
+        for(auto &subc : subcommands_) {
+            if((subc->name_.empty()) && (!subc->disabled_)) {
+                if(subc->_parse_positional(args)) {
+                    if(!subc->pre_parse_called_) {
+                        subc->_trigger_pre_parse(args.size());
+                    }
+                    return true;
+                }
+            }
+        }
+        // let the parent deal with it if possible
+        if(parent_ != nullptr && fallthrough_)
+            return _get_fallthrough_parent()->_parse_positional(args);
+
+        /// Try to find a local subcommand that is repeated
+        auto com = _find_subcommand(args.back(), true, false);
+        if(com != nullptr && (require_subcommand_max_ == 0 || require_subcommand_max_ > parsed_subcommands_.size())) {
+            args.pop_back();
+            com->_parse(args);
+            return true;
+        }
+        /// now try one last gasp at subcommands that have been executed before, go to root app and try to find a
+        /// subcommand in a broader way, if one exists let the parent deal with it
+        auto parent_app = (parent_ != nullptr) ? _get_fallthrough_parent() : this;
+        com = parent_app->_find_subcommand(args.back(), true, false);
+        if(com != nullptr && (com->parent_->require_subcommand_max_ == 0 ||
+                              com->parent_->require_subcommand_max_ > com->parent_->parsed_subcommands_.size())) {
+            return false;
+        }
+
+        if(positionals_at_end_) {
+            throw CLI::ExtrasError(args);
+        }
+        /// If this is an option group don't deal with it
+        if(parent_ != nullptr && name_.empty()) {
+            return false;
+        }
+        /// We are out of other options this goes to missing
+        _move_to_missing(detail::Classifier::NONE, positional);
+        args.pop_back();
+        if(prefix_command_) {
+            while(!args.empty()) {
+                _move_to_missing(detail::Classifier::NONE, args.back());
+                args.pop_back();
+            }
+        }
+
+        return true;
+    }
+
+    /// Locate a subcommand by name with two conditions, should disabled subcommands be ignored, and should used
+    /// subcommands be ignored
+    App *_find_subcommand(const std::string &subc_name, bool ignore_disabled, bool ignore_used) const noexcept {
+        for(const App_p &com : subcommands_) {
+            if(com->disabled_ && ignore_disabled)
+                continue;
+            if(com->get_name().empty()) {
+                auto subc = com->_find_subcommand(subc_name, ignore_disabled, ignore_used);
+                if(subc != nullptr) {
+                    return subc;
+                }
+            } else if(com->check_name(subc_name)) {
+                if((!*com) || !ignore_used)
+                    return com.get();
+            }
+        }
+        return nullptr;
+    }
+
+    /// Parse a subcommand, modify args and continue
+    ///
+    /// Unlike the others, this one will always allow fallthrough
+    /// return true if the subcommand was processed false otherwise
+    bool _parse_subcommand(std::vector<std::string> &args) {
+        if(_count_remaining_positionals(/* required */ true) > 0) {
+            _parse_positional(args);
+            return true;
+        }
+        auto com = _find_subcommand(args.back(), true, true);
+        if(com != nullptr) {
+            args.pop_back();
+            parsed_subcommands_.push_back(com);
+            com->_parse(args);
+            auto parent_app = com->parent_;
+            while(parent_app != this) {
+                parent_app->_trigger_pre_parse(args.size());
+                parent_app->parsed_subcommands_.push_back(com);
+                parent_app = parent_app->parent_;
+            }
+            return true;
+        }
+
+        if(parent_ == nullptr)
+            throw HorribleError("Subcommand " + args.back() + " missing");
+        return false;
+    }
+
+    /// Parse a short (false) or long (true) argument, must be at the top of the list
+    /// return true if the argument was processed or false if nothing was done
+    bool _parse_arg(std::vector<std::string> &args, detail::Classifier current_type) {
+
+        std::string current = args.back();
+
+        std::string arg_name;
+        std::string value;
+        std::string rest;
+
+        switch(current_type) {
+        case detail::Classifier::LONG:
+            if(!detail::split_long(current, arg_name, value))
+                throw HorribleError("Long parsed but missing (you should not see this):" + args.back());
+            break;
+        case detail::Classifier::SHORT:
+            if(!detail::split_short(current, arg_name, rest))
+                throw HorribleError("Short parsed but missing! You should not see this");
+            break;
+        case detail::Classifier::WINDOWS:
+            if(!detail::split_windows_style(current, arg_name, value))
+                throw HorribleError("windows option parsed but missing! You should not see this");
+            break;
+        case detail::Classifier::SUBCOMMAND:
+        case detail::Classifier::POSITIONAL_MARK:
+        case detail::Classifier::NONE:
+        default:
+            throw HorribleError("parsing got called with invalid option! You should not see this");
+        }
+
+        auto op_ptr =
+            std::find_if(std::begin(options_), std::end(options_), [arg_name, current_type](const Option_p &opt) {
+                if(current_type == detail::Classifier::LONG)
+                    return opt->check_lname(arg_name);
+                if(current_type == detail::Classifier::SHORT)
+                    return opt->check_sname(arg_name);
+                // this will only get called for detail::Classifier::WINDOWS
+                return opt->check_lname(arg_name) || opt->check_sname(arg_name);
+            });
+
+        // Option not found
+        if(op_ptr == std::end(options_)) {
+            for(auto &subc : subcommands_) {
+                if(subc->name_.empty() && !subc->disabled_) {
+                    if(subc->_parse_arg(args, current_type)) {
+                        if(!subc->pre_parse_called_) {
+                            subc->_trigger_pre_parse(args.size());
+                        }
+                        return true;
+                    }
+                }
+            }
+            // If a subcommand, try the master command
+            if(parent_ != nullptr && fallthrough_)
+                return _get_fallthrough_parent()->_parse_arg(args, current_type);
+            // don't capture missing if this is a nameless subcommand
+            if(parent_ != nullptr && name_.empty()) {
+                return false;
+            }
+            // Otherwise, add to missing
+            args.pop_back();
+            _move_to_missing(current_type, current);
+            return true;
+        }
+
+        args.pop_back();
+
+        // Get a reference to the pointer to make syntax bearable
+        Option_p &op = *op_ptr;
+
+        int num = op->get_items_expected();
+
+        // Make sure we always eat the minimum for unlimited vectors
+        int collected = 0;
+        int result_count = 0;
+        // deal with flag like things
+        if(num == 0) {
+            auto res = op->get_flag_value(arg_name, value);
+            op->add_result(res);
+            parse_order_.push_back(op.get());
+        }
+        // --this=value
+        else if(!value.empty()) {
+            op->add_result(value, result_count);
+            parse_order_.push_back(op.get());
+            collected += result_count;
+            // If exact number expected
+            if(num > 0)
+                num = (num >= result_count) ? num - result_count : 0;
+
+            // -Trest
+        } else if(!rest.empty()) {
+            op->add_result(rest, result_count);
+            parse_order_.push_back(op.get());
+            rest = "";
+            collected += result_count;
+            // If exact number expected
+            if(num > 0)
+                num = (num >= result_count) ? num - result_count : 0;
+        }
+
+        // Unlimited vector parser
+        if(num < 0) {
+            while(!args.empty() && _recognize(args.back(), false) == detail::Classifier::NONE) {
+                if(collected >= -num) {
+                    // We could break here for allow extras, but we don't
+
+                    // If any positionals remain, don't keep eating
+                    if(_count_remaining_positionals() > 0)
+                        break;
+                }
+                op->add_result(args.back(), result_count);
+                parse_order_.push_back(op.get());
+                args.pop_back();
+                collected += result_count;
+            }
+
+            // Allow -- to end an unlimited list and "eat" it
+            if(!args.empty() && _recognize(args.back()) == detail::Classifier::POSITIONAL_MARK)
+                args.pop_back();
+
+        } else {
+            while(num > 0 && !args.empty()) {
+                std::string current_ = args.back();
+                args.pop_back();
+                op->add_result(current_, result_count);
+                parse_order_.push_back(op.get());
+                num -= result_count;
+            }
+
+            if(num > 0) {
+                throw ArgumentMismatch::TypedAtLeast(op->get_name(), num, op->get_type_name());
+            }
+        }
+
+        if(!rest.empty()) {
+            rest = "-" + rest;
+            args.push_back(rest);
+        }
+        return true;
+    }
+
+    /// Trigger the pre_parse callback if needed
+    void _trigger_pre_parse(size_t remaining_args) {
+        if(!pre_parse_called_) {
+            pre_parse_called_ = true;
+            if(pre_parse_callback_) {
+                pre_parse_callback_(remaining_args);
+            }
+        } else if(immediate_callback_) {
+            if(!name_.empty()) {
+                auto pcnt = parsed_;
+                auto extras = std::move(missing_);
+                clear();
+                parsed_ = pcnt;
+                pre_parse_called_ = true;
+                missing_ = std::move(extras);
+            }
+        }
+    }
+
+    /// Get the appropriate parent to fallthrough to which is the first one that has a name or the main app
+    App *_get_fallthrough_parent() {
+        if(parent_ == nullptr) {
+            throw(HorribleError("No Valid parent"));
+        }
+        auto fallthrough_parent = parent_;
+        while((fallthrough_parent->parent_ != nullptr) && (fallthrough_parent->get_name().empty())) {
+            fallthrough_parent = fallthrough_parent->parent_;
+        }
+        return fallthrough_parent;
+    }
+
+    /// Helper function to place extra values in the most appropriate position
+    void _move_to_missing(detail::Classifier val_type, const std::string &val) {
+        if(allow_extras_ || subcommands_.empty()) {
+            missing_.emplace_back(val_type, val);
+            return;
+        }
+        // allow extra arguments to be places in an option group if it is allowed there
+        for(auto &subc : subcommands_) {
+            if(subc->name_.empty() && subc->allow_extras_) {
+                subc->missing_.emplace_back(val_type, val);
+                return;
+            }
+        }
+        // if we haven't found any place to put them yet put them in missing
+        missing_.emplace_back(val_type, val);
+    }
+
+  public:
+    /// function that could be used by subclasses of App to shift options around into subcommands
+    void _move_option(Option *opt, App *app) {
+        if(opt == nullptr) {
+            throw OptionNotFound("the option is NULL");
+        }
+        // verify that the give app is actually a subcommand
+        bool found = false;
+        for(auto &subc : subcommands_) {
+            if(app == subc.get()) {
+                found = true;
+            }
+        }
+        if(!found) {
+            throw OptionNotFound("The Given app is not a subcommand");
+        }
+
+        if((help_ptr_ == opt) || (help_all_ptr_ == opt))
+            throw OptionAlreadyAdded("cannot move help options");
+
+        if(config_ptr_ == opt)
+            throw OptionAlreadyAdded("cannot move config file options");
+
+        auto iterator =
+            std::find_if(std::begin(options_), std::end(options_), [opt](const Option_p &v) { return v.get() == opt; });
+        if(iterator != std::end(options_)) {
+            const auto &opt_p = *iterator;
+            if(std::find_if(std::begin(app->options_), std::end(app->options_), [&opt_p](const Option_p &v) {
+                   return (*v == *opt_p);
+               }) == std::end(app->options_)) {
+                // only erase after the insertion was successful
+                app->options_.push_back(std::move(*iterator));
+                options_.erase(iterator);
+            } else {
+                throw OptionAlreadyAdded(opt->get_name());
+            }
+        } else {
+            throw OptionNotFound("could not locate the given App");
+        }
+    }
+};
+
+/// Extension of App to better manage groups of options
+class Option_group : public App {
+  public:
+    Option_group(std::string group_description, std::string group_name, App *parent)
+        : App(std::move(group_description), "", parent) {
+        group(group_name);
+        // option groups should have automatic fallthrough
+    }
+    using App::add_option;
+    /// Add an existing option to the Option_group
+    Option *add_option(Option *opt) {
+        if(get_parent() == nullptr) {
+            throw OptionNotFound("Unable to locate the specified option");
+        }
+        get_parent()->_move_option(opt, this);
+        return opt;
+    }
+    /// Add an existing option to the Option_group
+    void add_options(Option *opt) { add_option(opt); }
+    /// Add a bunch of options to the group
+    template <typename... Args> void add_options(Option *opt, Args... args) {
+        add_option(opt);
+        add_options(args...);
+    }
+    using App::add_subcommand;
+    /// Add an existing subcommand to be a member of an option_group
+    App *add_subcommand(App *subcom) {
+        App_p subc = subcom->get_parent()->get_subcommand_ptr(subcom);
+        subc->get_parent()->remove_subcommand(subcom);
+        add_subcommand(std::move(subc));
+        return subcom;
+    }
+};
+/// Helper function to enable one option group/subcommand when another is used
+inline void TriggerOn(App *trigger_app, App *app_to_enable) {
+    app_to_enable->enabled_by_default(false);
+    app_to_enable->disabled_by_default();
+    trigger_app->preparse_callback([app_to_enable](size_t) { app_to_enable->disabled(false); });
+}
+
+/// Helper function to enable one option group/subcommand when another is used
+inline void TriggerOn(App *trigger_app, std::vector<App *> apps_to_enable) {
+    for(auto &app : apps_to_enable) {
+        app->enabled_by_default(false);
+        app->disabled_by_default();
+    }
+
+    trigger_app->preparse_callback([apps_to_enable](size_t) {
+        for(auto &app : apps_to_enable) {
+            app->disabled(false);
+        }
+    });
+}
+
+/// Helper function to disable one option group/subcommand when another is used
+inline void TriggerOff(App *trigger_app, App *app_to_enable) {
+    app_to_enable->disabled_by_default(false);
+    app_to_enable->enabled_by_default();
+    trigger_app->preparse_callback([app_to_enable](size_t) { app_to_enable->disabled(); });
+}
+
+/// Helper function to disable one option group/subcommand when another is used
+inline void TriggerOff(App *trigger_app, std::vector<App *> apps_to_enable) {
+    for(auto &app : apps_to_enable) {
+        app->disabled_by_default(false);
+        app->enabled_by_default();
+    }
+
+    trigger_app->preparse_callback([apps_to_enable](size_t) {
+        for(auto &app : apps_to_enable) {
+            app->disabled();
+        }
+    });
+}
+
+namespace FailureMessage {
+
+/// Printout a clean, simple message on error (the default in CLI11 1.5+)
+inline std::string simple(const App *app, const Error &e) {
+    std::string header = std::string(e.what()) + "\n";
+    std::vector<std::string> names;
+
+    // Collect names
+    if(app->get_help_ptr() != nullptr)
+        names.push_back(app->get_help_ptr()->get_name());
+
+    if(app->get_help_all_ptr() != nullptr)
+        names.push_back(app->get_help_all_ptr()->get_name());
+
+    // If any names found, suggest those
+    if(!names.empty())
+        header += "Run with " + detail::join(names, " or ") + " for more information.\n";
+
+    return header;
+}
+
+/// Printout the full help string on error (if this fn is set, the old default for CLI11)
+inline std::string help(const App *app, const Error &e) {
+    std::string header = std::string("ERROR: ") + e.get_name() + ": " + e.what() + "\n";
+    header += app->help();
+    return header;
+}
+
+} // namespace FailureMessage
+
+namespace detail {
+/// This class is simply to allow tests access to App's protected functions
+struct AppFriend {
+
+    /// Wrap _parse_short, perfectly forward arguments and return
+    template <typename... Args>
+    static auto parse_arg(App *app, Args &&... args) ->
+        typename std::result_of<decltype (&App::_parse_arg)(App, Args...)>::type {
+        return app->_parse_arg(std::forward<Args>(args)...);
+    }
+
+    /// Wrap _parse_subcommand, perfectly forward arguments and return
+    template <typename... Args>
+    static auto parse_subcommand(App *app, Args &&... args) ->
+        typename std::result_of<decltype (&App::_parse_subcommand)(App, Args...)>::type {
+        return app->_parse_subcommand(std::forward<Args>(args)...);
+    }
+    /// Wrap the fallthrough parent function to make sure that is working correctly
+    static App *get_fallthrough_parent(App *app) { return app->_get_fallthrough_parent(); }
+};
+} // namespace detail
+
+} // namespace CLI
+
+// From CLI/Config.hpp:
+
+namespace CLI {
+
+inline std::string
+ConfigINI::to_config(const App *app, bool default_also, bool write_description, std::string prefix) const {
+    std::stringstream out;
+    for(const Option *opt : app->get_options({})) {
+
+        // Only process option with a long-name and configurable
+        if(!opt->get_lnames().empty() && opt->get_configurable()) {
+            std::string name = prefix + opt->get_lnames()[0];
+            std::string value;
+
+            // Non-flags
+            if(opt->get_type_size() != 0) {
+
+                // If the option was found on command line
+                if(opt->count() > 0)
+                    value = detail::ini_join(opt->results());
+
+                // If the option has a default and is requested by optional argument
+                else if(default_also && !opt->get_default_str().empty())
+                    value = opt->get_default_str();
+                // Flag, one passed
+            } else if(opt->count() == 1) {
+                value = "true";
+
+                // Flag, multiple passed
+            } else if(opt->count() > 1) {
+                value = std::to_string(opt->count());
+
+                // Flag, not present
+            } else if(opt->count() == 0 && default_also) {
+                value = "false";
+            }
+
+            if(!value.empty()) {
+                if(write_description && opt->has_description()) {
+                    if(static_cast<int>(out.tellp()) != 0) {
+                        out << std::endl;
+                    }
+                    out << "; " << detail::fix_newlines("; ", opt->get_description()) << std::endl;
+                }
+
+                // Don't try to quote anything that is not size 1
+                if(opt->get_items_expected() != 1)
+                    out << name << "=" << value << std::endl;
+                else
+                    out << name << "=" << detail::add_quotes_if_needed(value) << std::endl;
+            }
+        }
+    }
+
+    for(const App *subcom : app->get_subcommands({}))
+        out << to_config(subcom, default_also, write_description, prefix + subcom->get_name() + ".");
+
+    return out.str();
+}
+
+} // namespace CLI
+
+// From CLI/Formatter.hpp:
+
+namespace CLI {
+
+inline std::string
+Formatter::make_group(std::string group, bool is_positional, std::vector<const Option *> opts) const {
+    std::stringstream out;
+
+    out << "\n" << group << ":\n";
+    for(const Option *opt : opts) {
+        out << make_option(opt, is_positional);
+    }
+
+    return out.str();
+}
+
+inline std::string Formatter::make_positionals(const App *app) const {
+    std::vector<const Option *> opts =
+        app->get_options([](const Option *opt) { return !opt->get_group().empty() && opt->get_positional(); });
+
+    if(opts.empty())
+        return std::string();
+    else
+        return make_group(get_label("Positionals"), true, opts);
+}
+
+inline std::string Formatter::make_groups(const App *app, AppFormatMode mode) const {
+    std::stringstream out;
+    std::vector<std::string> groups = app->get_groups();
+
+    // Options
+    for(const std::string &group : groups) {
+        std::vector<const Option *> opts = app->get_options([app, mode, &group](const Option *opt) {
+            return opt->get_group() == group                    // Must be in the right group
+                   && opt->nonpositional()                      // Must not be a positional
+                   && (mode != AppFormatMode::Sub               // If mode is Sub, then
+                       || (app->get_help_ptr() != opt           // Ignore help pointer
+                           && app->get_help_all_ptr() != opt)); // Ignore help all pointer
+        });
+        if(!group.empty() && !opts.empty()) {
+            out << make_group(group, false, opts);
+
+            if(group != groups.back())
+                out << "\n";
+        }
+    }
+
+    return out.str();
+}
+
+inline std::string Formatter::make_description(const App *app) const {
+    std::string desc = app->get_description();
+    auto min_options = app->get_require_option_min();
+    auto max_options = app->get_require_option_max();
+    if(app->get_required()) {
+        desc += " REQUIRED ";
+    }
+    if((max_options == min_options) && (min_options > 0)) {
+        if(min_options == 1) {
+            desc += " \n[Exactly 1 of the following options is required]";
+        } else {
+            desc += " \n[Exactly " + std::to_string(min_options) + "options from the following list are required]";
+        }
+    } else if(max_options > 0) {
+        if(min_options > 0) {
+            desc += " \n[Between " + std::to_string(min_options) + " and " + std::to_string(max_options) +
+                    " of the follow options are required]";
+        } else {
+            desc += " \n[At most " + std::to_string(max_options) + " of the following options are allowed]";
+        }
+    } else if(min_options > 0) {
+        desc += " \n[At least " + std::to_string(min_options) + " of the following options are required]";
+    }
+    return (!desc.empty()) ? desc + "\n" : std::string{};
+}
+
+inline std::string Formatter::make_usage(const App *app, std::string name) const {
+    std::stringstream out;
+
+    out << get_label("Usage") << ":" << (name.empty() ? "" : " ") << name;
+
+    std::vector<std::string> groups = app->get_groups();
+
+    // Print an Options badge if any options exist
+    std::vector<const Option *> non_pos_options =
+        app->get_options([](const Option *opt) { return opt->nonpositional(); });
+    if(!non_pos_options.empty())
+        out << " [" << get_label("OPTIONS") << "]";
+
+    // Positionals need to be listed here
+    std::vector<const Option *> positionals = app->get_options([](const Option *opt) { return opt->get_positional(); });
+
+    // Print out positionals if any are left
+    if(!positionals.empty()) {
+        // Convert to help names
+        std::vector<std::string> positional_names(positionals.size());
+        std::transform(positionals.begin(), positionals.end(), positional_names.begin(), [this](const Option *opt) {
+            return make_option_usage(opt);
+        });
+
+        out << " " << detail::join(positional_names, " ");
+    }
+
+    // Add a marker if subcommands are expected or optional
+    if(!app->get_subcommands(
+               [](const CLI::App *subc) { return ((!subc->get_disabled()) && (!subc->get_name().empty())); })
+            .empty()) {
+        out << " " << (app->get_require_subcommand_min() == 0 ? "[" : "")
+            << get_label(app->get_require_subcommand_max() < 2 || app->get_require_subcommand_min() > 1 ? "SUBCOMMAND"
+                                                                                                        : "SUBCOMMANDS")
+            << (app->get_require_subcommand_min() == 0 ? "]" : "");
+    }
+
+    out << std::endl;
+
+    return out.str();
+}
+
+inline std::string Formatter::make_footer(const App *app) const {
+    std::string footer = app->get_footer();
+    if(!footer.empty())
+        return footer + "\n";
+    else
+        return "";
+}
+
+inline std::string Formatter::make_help(const App *app, std::string name, AppFormatMode mode) const {
+
+    // This immediately forwards to the make_expanded method. This is done this way so that subcommands can
+    // have overridden formatters
+    if(mode == AppFormatMode::Sub)
+        return make_expanded(app);
+
+    std::stringstream out;
+    if((app->get_name().empty()) && (app->get_parent() != nullptr)) {
+        if(app->get_group() != "Subcommands") {
+            out << app->get_group() << ':';
+        }
+    }
+
+    out << make_description(app);
+    out << make_usage(app, name);
+    out << make_positionals(app);
+    out << make_groups(app, mode);
+    out << make_subcommands(app, mode);
+    out << make_footer(app);
+
+    return out.str();
+}
+
+inline std::string Formatter::make_subcommands(const App *app, AppFormatMode mode) const {
+    std::stringstream out;
+
+    std::vector<const App *> subcommands = app->get_subcommands({});
+
+    // Make a list in definition order of the groups seen
+    std::vector<std::string> subcmd_groups_seen;
+    for(const App *com : subcommands) {
+        if(com->get_name().empty()) {
+            out << make_expanded(com);
+            continue;
+        }
+        std::string group_key = com->get_group();
+        if(!group_key.empty() &&
+           std::find_if(subcmd_groups_seen.begin(), subcmd_groups_seen.end(), [&group_key](std::string a) {
+               return detail::to_lower(a) == detail::to_lower(group_key);
+           }) == subcmd_groups_seen.end())
+            subcmd_groups_seen.push_back(group_key);
+    }
+
+    // For each group, filter out and print subcommands
+    for(const std::string &group : subcmd_groups_seen) {
+        out << "\n" << group << ":\n";
+        std::vector<const App *> subcommands_group = app->get_subcommands(
+            [&group](const App *sub_app) { return detail::to_lower(sub_app->get_group()) == detail::to_lower(group); });
+        for(const App *new_com : subcommands_group) {
+            if(new_com->get_name().empty())
+                continue;
+            if(mode != AppFormatMode::All) {
+                out << make_subcommand(new_com);
+            } else {
+                out << new_com->help(new_com->get_name(), AppFormatMode::Sub);
+                out << "\n";
+            }
+        }
+    }
+
+    return out.str();
+}
+
+inline std::string Formatter::make_subcommand(const App *sub) const {
+    std::stringstream out;
+    detail::format_help(out, sub->get_name(), sub->get_description(), column_width_);
+    return out.str();
+}
+
+inline std::string Formatter::make_expanded(const App *sub) const {
+    std::stringstream out;
+    out << sub->get_display_name() << "\n";
+
+    out << make_description(sub);
+    out << make_positionals(sub);
+    out << make_groups(sub, AppFormatMode::Sub);
+    out << make_subcommands(sub, AppFormatMode::Sub);
+
+    // Drop blank spaces
+    std::string tmp = detail::find_and_replace(out.str(), "\n\n", "\n");
+    tmp = tmp.substr(0, tmp.size() - 1); // Remove the final '\n'
+
+    // Indent all but the first line (the name)
+    return detail::find_and_replace(tmp, "\n", "\n  ") + "\n";
+}
+
+inline std::string Formatter::make_option_name(const Option *opt, bool is_positional) const {
+    if(is_positional)
+        return opt->get_name(true, false);
+    else
+        return opt->get_name(false, true);
+}
+
+inline std::string Formatter::make_option_opts(const Option *opt) const {
+    std::stringstream out;
+
+    if(opt->get_type_size() != 0) {
+        if(!opt->get_type_name().empty())
+            out << " " << get_label(opt->get_type_name());
+        if(!opt->get_default_str().empty())
+            out << "=" << opt->get_default_str();
+        if(opt->get_expected() > 1)
+            out << " x " << opt->get_expected();
+        if(opt->get_expected() == -1)
+            out << " ...";
+        if(opt->get_required())
+            out << " " << get_label("REQUIRED");
+    }
+    if(!opt->get_envname().empty())
+        out << " (" << get_label("Env") << ":" << opt->get_envname() << ")";
+    if(!opt->get_needs().empty()) {
+        out << " " << get_label("Needs") << ":";
+        for(const Option *op : opt->get_needs())
+            out << " " << op->get_name();
+    }
+    if(!opt->get_excludes().empty()) {
+        out << " " << get_label("Excludes") << ":";
+        for(const Option *op : opt->get_excludes())
+            out << " " << op->get_name();
+    }
+    return out.str();
+}
+
+inline std::string Formatter::make_option_desc(const Option *opt) const { return opt->get_description(); }
+
+inline std::string Formatter::make_option_usage(const Option *opt) const {
+    // Note that these are positionals usages
+    std::stringstream out;
+    out << make_option_name(opt, true);
+
+    if(opt->get_expected() > 1)
+        out << "(" << std::to_string(opt->get_expected()) << "x)";
+    else if(opt->get_expected() < 0)
+        out << "...";
+    return opt->get_required() ? out.str() : "[" + out.str() + "]";
+}
+
+} // namespace CLI
+
diff --git a/Src/Scarab/library/external/date/date.h b/Src/Scarab/library/external/date/date.h
new file mode 100644
index 0000000..6f1e2f4
--- /dev/null
+++ b/Src/Scarab/library/external/date/date.h
@@ -0,0 +1,8010 @@
+#ifndef DATE_H
+#define DATE_H
+
+// The MIT License (MIT)
+//
+// Copyright (c) 2015, 2016, 2017 Howard Hinnant
+// Copyright (c) 2016 Adrian Colomitchi
+// Copyright (c) 2017 Florian Dang
+// Copyright (c) 2017 Paul Thompson
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// Our apologies.  When the previous paragraph was written, lowercase had not yet
+// been invented (that would involve another several millennia of evolution).
+// We did not mean to shout.
+
+#ifndef HAS_STRING_VIEW
+#  if __cplusplus >= 201703
+#    define HAS_STRING_VIEW 1
+#  else
+#    define HAS_STRING_VIEW 0
+#  endif
+#endif  // HAS_STRING_VIEW
+
+#include <cassert>
+#include <algorithm>
+#include <cctype>
+#include <chrono>
+#include <climits>
+#if !(__cplusplus >= 201402)
+#  include <cmath>
+#endif
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <ctime>
+#include <ios>
+#include <istream>
+#include <iterator>
+#include <limits>
+#include <locale>
+#include <memory>
+#include <ostream>
+#include <ratio>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#if HAS_STRING_VIEW
+# include <string_view>
+#endif
+#include <utility>
+#include <type_traits>
+
+#ifdef __GNUC__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wpedantic"
+# if __GNUC__ < 5
+   // GCC 4.9 Bug 61489 Wrong warning with -Wmissing-field-initializers
+#  pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+# endif
+#endif
+
+namespace date
+{
+
+//---------------+
+// Configuration |
+//---------------+
+
+#ifndef ONLY_C_LOCALE
+#  define ONLY_C_LOCALE 0
+#endif
+
+#if defined(_MSC_VER) && (!defined(__clang__) || (_MSC_VER < 1910))
+// MSVC
+#  if _MSC_VER < 1910
+//   before VS2017
+#    define CONSTDATA const
+#    define CONSTCD11
+#    define CONSTCD14
+#    define NOEXCEPT _NOEXCEPT
+#  else
+//   VS2017 and later
+#    define CONSTDATA constexpr const
+#    define CONSTCD11 constexpr
+#    define CONSTCD14 constexpr
+#    define NOEXCEPT noexcept
+#  endif
+
+#elif defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x5150
+// Oracle Developer Studio 12.6 and earlier
+#  define CONSTDATA constexpr const
+#  define CONSTCD11 constexpr
+#  define CONSTCD14
+#  define NOEXCEPT noexcept
+
+#elif __cplusplus >= 201402
+// C++14
+#  define CONSTDATA constexpr const
+#  define CONSTCD11 constexpr
+#  define CONSTCD14 constexpr
+#  define NOEXCEPT noexcept
+#else
+// C++11
+#  define CONSTDATA constexpr const
+#  define CONSTCD11 constexpr
+#  define CONSTCD14
+#  define NOEXCEPT noexcept
+#endif
+
+#ifndef HAS_VOID_T
+#  if __cplusplus >= 201703
+#    define HAS_VOID_T 1
+#  else
+#    define HAS_VOID_T 0
+#  endif
+#endif  // HAS_VOID_T
+
+// Protect from Oracle sun macro
+#ifdef sun
+#  undef sun
+#endif
+
+//-----------+
+// Interface |
+//-----------+
+
+// durations
+
+using days = std::chrono::duration
+    <int, std::ratio_multiply<std::ratio<24>, std::chrono::hours::period>>;
+
+using weeks = std::chrono::duration
+    <int, std::ratio_multiply<std::ratio<7>, days::period>>;
+
+using years = std::chrono::duration
+    <int, std::ratio_multiply<std::ratio<146097, 400>, days::period>>;
+
+using months = std::chrono::duration
+    <int, std::ratio_divide<years::period, std::ratio<12>>>;
+
+// time_point
+
+template <class Duration>
+    using sys_time = std::chrono::time_point<std::chrono::system_clock, Duration>;
+
+using sys_days    = sys_time<days>;
+using sys_seconds = sys_time<std::chrono::seconds>;
+
+struct local_t {};
+
+template <class Duration>
+    using local_time = std::chrono::time_point<local_t, Duration>;
+
+using local_seconds = local_time<std::chrono::seconds>;
+using local_days    = local_time<days>;
+
+// types
+
+struct last_spec
+{
+    explicit last_spec() = default;
+};
+
+class day;
+class month;
+class year;
+
+class weekday;
+class weekday_indexed;
+class weekday_last;
+
+class month_day;
+class month_day_last;
+class month_weekday;
+class month_weekday_last;
+
+class year_month;
+
+class year_month_day;
+class year_month_day_last;
+class year_month_weekday;
+class year_month_weekday_last;
+
+// date composition operators
+
+CONSTCD11 year_month operator/(const year& y, const month& m) NOEXCEPT;
+CONSTCD11 year_month operator/(const year& y, int          m) NOEXCEPT;
+
+CONSTCD11 month_day operator/(const day& d, const month& m) NOEXCEPT;
+CONSTCD11 month_day operator/(const day& d, int          m) NOEXCEPT;
+CONSTCD11 month_day operator/(const month& m, const day& d) NOEXCEPT;
+CONSTCD11 month_day operator/(const month& m, int        d) NOEXCEPT;
+CONSTCD11 month_day operator/(int          m, const day& d) NOEXCEPT;
+
+CONSTCD11 month_day_last operator/(const month& m, last_spec) NOEXCEPT;
+CONSTCD11 month_day_last operator/(int          m, last_spec) NOEXCEPT;
+CONSTCD11 month_day_last operator/(last_spec, const month& m) NOEXCEPT;
+CONSTCD11 month_day_last operator/(last_spec, int          m) NOEXCEPT;
+
+CONSTCD11 month_weekday operator/(const month& m, const weekday_indexed& wdi) NOEXCEPT;
+CONSTCD11 month_weekday operator/(int          m, const weekday_indexed& wdi) NOEXCEPT;
+CONSTCD11 month_weekday operator/(const weekday_indexed& wdi, const month& m) NOEXCEPT;
+CONSTCD11 month_weekday operator/(const weekday_indexed& wdi, int          m) NOEXCEPT;
+
+CONSTCD11 month_weekday_last operator/(const month& m, const weekday_last& wdl) NOEXCEPT;
+CONSTCD11 month_weekday_last operator/(int          m, const weekday_last& wdl) NOEXCEPT;
+CONSTCD11 month_weekday_last operator/(const weekday_last& wdl, const month& m) NOEXCEPT;
+CONSTCD11 month_weekday_last operator/(const weekday_last& wdl, int          m) NOEXCEPT;
+
+CONSTCD11 year_month_day operator/(const year_month& ym, const day& d) NOEXCEPT;
+CONSTCD11 year_month_day operator/(const year_month& ym, int        d) NOEXCEPT;
+CONSTCD11 year_month_day operator/(const year& y, const month_day& md) NOEXCEPT;
+CONSTCD11 year_month_day operator/(int         y, const month_day& md) NOEXCEPT;
+CONSTCD11 year_month_day operator/(const month_day& md, const year& y) NOEXCEPT;
+CONSTCD11 year_month_day operator/(const month_day& md, int         y) NOEXCEPT;
+
+CONSTCD11
+    year_month_day_last operator/(const year_month& ym,   last_spec) NOEXCEPT;
+CONSTCD11
+    year_month_day_last operator/(const year& y, const month_day_last& mdl) NOEXCEPT;
+CONSTCD11
+    year_month_day_last operator/(int         y, const month_day_last& mdl) NOEXCEPT;
+CONSTCD11
+    year_month_day_last operator/(const month_day_last& mdl, const year& y) NOEXCEPT;
+CONSTCD11
+    year_month_day_last operator/(const month_day_last& mdl, int         y) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator/(const year_month& ym, const weekday_indexed& wdi) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator/(const year&        y, const month_weekday&   mwd) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator/(int                y, const month_weekday&   mwd) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator/(const month_weekday& mwd, const year&          y) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator/(const month_weekday& mwd, int                  y) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator/(const year_month& ym, const weekday_last& wdl) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator/(const year& y, const month_weekday_last& mwdl) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator/(int         y, const month_weekday_last& mwdl) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator/(const month_weekday_last& mwdl, const year& y) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator/(const month_weekday_last& mwdl, int         y) NOEXCEPT;
+
+// Detailed interface
+
+// day
+
+class day
+{
+    unsigned char d_;
+
+public:
+    day() = default;
+    explicit CONSTCD11 day(unsigned d) NOEXCEPT;
+
+    CONSTCD14 day& operator++()    NOEXCEPT;
+    CONSTCD14 day  operator++(int) NOEXCEPT;
+    CONSTCD14 day& operator--()    NOEXCEPT;
+    CONSTCD14 day  operator--(int) NOEXCEPT;
+
+    CONSTCD14 day& operator+=(const days& d) NOEXCEPT;
+    CONSTCD14 day& operator-=(const days& d) NOEXCEPT;
+
+    CONSTCD11 explicit operator unsigned() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const day& x, const day& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const day& x, const day& y) NOEXCEPT;
+CONSTCD11 bool operator< (const day& x, const day& y) NOEXCEPT;
+CONSTCD11 bool operator> (const day& x, const day& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const day& x, const day& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const day& x, const day& y) NOEXCEPT;
+
+CONSTCD11 day  operator+(const day&  x, const days& y) NOEXCEPT;
+CONSTCD11 day  operator+(const days& x, const day&  y) NOEXCEPT;
+CONSTCD11 day  operator-(const day&  x, const days& y) NOEXCEPT;
+CONSTCD11 days operator-(const day&  x, const day&  y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const day& d);
+
+// month
+
+class month
+{
+    unsigned char m_;
+
+public:
+    month() = default;
+    explicit CONSTCD11 month(unsigned m) NOEXCEPT;
+
+    CONSTCD14 month& operator++()    NOEXCEPT;
+    CONSTCD14 month  operator++(int) NOEXCEPT;
+    CONSTCD14 month& operator--()    NOEXCEPT;
+    CONSTCD14 month  operator--(int) NOEXCEPT;
+
+    CONSTCD14 month& operator+=(const months& m) NOEXCEPT;
+    CONSTCD14 month& operator-=(const months& m) NOEXCEPT;
+
+    CONSTCD11 explicit operator unsigned() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const month& x, const month& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const month& x, const month& y) NOEXCEPT;
+CONSTCD11 bool operator< (const month& x, const month& y) NOEXCEPT;
+CONSTCD11 bool operator> (const month& x, const month& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const month& x, const month& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const month& x, const month& y) NOEXCEPT;
+
+CONSTCD14 month  operator+(const month&  x, const months& y) NOEXCEPT;
+CONSTCD14 month  operator+(const months& x,  const month& y) NOEXCEPT;
+CONSTCD14 month  operator-(const month&  x, const months& y) NOEXCEPT;
+CONSTCD14 months operator-(const month&  x,  const month& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month& m);
+
+// year
+
+class year
+{
+    short y_;
+
+public:
+    year() = default;
+    explicit CONSTCD11 year(int y) NOEXCEPT;
+
+    CONSTCD14 year& operator++()    NOEXCEPT;
+    CONSTCD14 year  operator++(int) NOEXCEPT;
+    CONSTCD14 year& operator--()    NOEXCEPT;
+    CONSTCD14 year  operator--(int) NOEXCEPT;
+
+    CONSTCD14 year& operator+=(const years& y) NOEXCEPT;
+    CONSTCD14 year& operator-=(const years& y) NOEXCEPT;
+
+    CONSTCD11 year operator-() const NOEXCEPT;
+    CONSTCD11 year operator+() const NOEXCEPT;
+
+    CONSTCD11 bool is_leap() const NOEXCEPT;
+
+    CONSTCD11 explicit operator int() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+
+    static CONSTCD11 year min() NOEXCEPT;
+    static CONSTCD11 year max() NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const year& x, const year& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const year& x, const year& y) NOEXCEPT;
+CONSTCD11 bool operator< (const year& x, const year& y) NOEXCEPT;
+CONSTCD11 bool operator> (const year& x, const year& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const year& x, const year& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const year& x, const year& y) NOEXCEPT;
+
+CONSTCD11 year  operator+(const year&  x, const years& y) NOEXCEPT;
+CONSTCD11 year  operator+(const years& x, const year&  y) NOEXCEPT;
+CONSTCD11 year  operator-(const year&  x, const years& y) NOEXCEPT;
+CONSTCD11 years operator-(const year&  x, const year&  y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year& y);
+
+// weekday
+
+class weekday
+{
+    unsigned char wd_;
+public:
+    weekday() = default;
+    explicit CONSTCD11 weekday(unsigned wd) NOEXCEPT;
+    CONSTCD11 weekday(const sys_days& dp) NOEXCEPT;
+    CONSTCD11 explicit weekday(const local_days& dp) NOEXCEPT;
+
+    CONSTCD14 weekday& operator++()    NOEXCEPT;
+    CONSTCD14 weekday  operator++(int) NOEXCEPT;
+    CONSTCD14 weekday& operator--()    NOEXCEPT;
+    CONSTCD14 weekday  operator--(int) NOEXCEPT;
+
+    CONSTCD14 weekday& operator+=(const days& d) NOEXCEPT;
+    CONSTCD14 weekday& operator-=(const days& d) NOEXCEPT;
+
+    CONSTCD11 explicit operator unsigned() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+
+    CONSTCD11 weekday_indexed operator[](unsigned index) const NOEXCEPT;
+    CONSTCD11 weekday_last    operator[](last_spec)      const NOEXCEPT;
+
+private:
+    static CONSTCD11 unsigned char weekday_from_days(int z) NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const weekday& x, const weekday& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const weekday& x, const weekday& y) NOEXCEPT;
+
+CONSTCD14 weekday operator+(const weekday& x, const days&    y) NOEXCEPT;
+CONSTCD14 weekday operator+(const days&    x, const weekday& y) NOEXCEPT;
+CONSTCD14 weekday operator-(const weekday& x, const days&    y) NOEXCEPT;
+CONSTCD14 days    operator-(const weekday& x, const weekday& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const weekday& wd);
+
+// weekday_indexed
+
+class weekday_indexed
+{
+    unsigned char wd_    : 4;
+    unsigned char index_ : 4;
+
+public:
+    weekday_indexed() = default;
+    CONSTCD11 weekday_indexed(const date::weekday& wd, unsigned index) NOEXCEPT;
+
+    CONSTCD11 date::weekday weekday() const NOEXCEPT;
+    CONSTCD11 unsigned index() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_indexed& wdi);
+
+// weekday_last
+
+class weekday_last
+{
+    date::weekday wd_;
+
+public:
+    explicit CONSTCD11 weekday_last(const date::weekday& wd) NOEXCEPT;
+
+    CONSTCD11 date::weekday weekday() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const weekday_last& x, const weekday_last& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const weekday_last& x, const weekday_last& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_last& wdl);
+
+// year_month
+
+class year_month
+{
+    date::year  y_;
+    date::month m_;
+
+public:
+    year_month() = default;
+    CONSTCD11 year_month(const date::year& y, const date::month& m) NOEXCEPT;
+
+    CONSTCD11 date::year  year()  const NOEXCEPT;
+    CONSTCD11 date::month month() const NOEXCEPT;
+
+    CONSTCD14 year_month& operator+=(const months& dm) NOEXCEPT;
+    CONSTCD14 year_month& operator-=(const months& dm) NOEXCEPT;
+    CONSTCD14 year_month& operator+=(const years& dy) NOEXCEPT;
+    CONSTCD14 year_month& operator-=(const years& dy) NOEXCEPT;
+
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const year_month& x, const year_month& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const year_month& x, const year_month& y) NOEXCEPT;
+CONSTCD11 bool operator< (const year_month& x, const year_month& y) NOEXCEPT;
+CONSTCD11 bool operator> (const year_month& x, const year_month& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const year_month& x, const year_month& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const year_month& x, const year_month& y) NOEXCEPT;
+
+CONSTCD14 year_month operator+(const year_month& ym, const months& dm) NOEXCEPT;
+CONSTCD14 year_month operator+(const months& dm, const year_month& ym) NOEXCEPT;
+CONSTCD14 year_month operator-(const year_month& ym, const months& dm) NOEXCEPT;
+
+CONSTCD11 months operator-(const year_month& x, const year_month& y) NOEXCEPT;
+CONSTCD11 year_month operator+(const year_month& ym, const years& dy) NOEXCEPT;
+CONSTCD11 year_month operator+(const years& dy, const year_month& ym) NOEXCEPT;
+CONSTCD11 year_month operator-(const year_month& ym, const years& dy) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month& ym);
+
+// month_day
+
+class month_day
+{
+    date::month m_;
+    date::day   d_;
+
+public:
+    month_day() = default;
+    CONSTCD11 month_day(const date::month& m, const date::day& d) NOEXCEPT;
+
+    CONSTCD11 date::month month() const NOEXCEPT;
+    CONSTCD11 date::day   day() const NOEXCEPT;
+
+    CONSTCD14 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const month_day& x, const month_day& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const month_day& x, const month_day& y) NOEXCEPT;
+CONSTCD11 bool operator< (const month_day& x, const month_day& y) NOEXCEPT;
+CONSTCD11 bool operator> (const month_day& x, const month_day& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const month_day& x, const month_day& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const month_day& x, const month_day& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_day& md);
+
+// month_day_last
+
+class month_day_last
+{
+    date::month m_;
+
+public:
+    CONSTCD11 explicit month_day_last(const date::month& m) NOEXCEPT;
+
+    CONSTCD11 date::month month() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const month_day_last& x, const month_day_last& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const month_day_last& x, const month_day_last& y) NOEXCEPT;
+CONSTCD11 bool operator< (const month_day_last& x, const month_day_last& y) NOEXCEPT;
+CONSTCD11 bool operator> (const month_day_last& x, const month_day_last& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const month_day_last& x, const month_day_last& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const month_day_last& x, const month_day_last& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_day_last& mdl);
+
+// month_weekday
+
+class month_weekday
+{
+    date::month           m_;
+    date::weekday_indexed wdi_;
+public:
+    CONSTCD11 month_weekday(const date::month& m,
+                            const date::weekday_indexed& wdi) NOEXCEPT;
+
+    CONSTCD11 date::month           month()           const NOEXCEPT;
+    CONSTCD11 date::weekday_indexed weekday_indexed() const NOEXCEPT;
+
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const month_weekday& x, const month_weekday& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const month_weekday& x, const month_weekday& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday& mwd);
+
+// month_weekday_last
+
+class month_weekday_last
+{
+    date::month        m_;
+    date::weekday_last wdl_;
+
+public:
+    CONSTCD11 month_weekday_last(const date::month& m,
+                                 const date::weekday_last& wd) NOEXCEPT;
+
+    CONSTCD11 date::month        month()        const NOEXCEPT;
+    CONSTCD11 date::weekday_last weekday_last() const NOEXCEPT;
+
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11
+    bool operator==(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT;
+CONSTCD11
+    bool operator!=(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday_last& mwdl);
+
+// class year_month_day
+
+class year_month_day
+{
+    date::year  y_;
+    date::month m_;
+    date::day   d_;
+
+public:
+    year_month_day() = default;
+    CONSTCD11 year_month_day(const date::year& y, const date::month& m,
+                             const date::day& d) NOEXCEPT;
+    CONSTCD14 year_month_day(const year_month_day_last& ymdl) NOEXCEPT;
+
+    CONSTCD14 year_month_day(sys_days dp) NOEXCEPT;
+    CONSTCD14 explicit year_month_day(local_days dp) NOEXCEPT;
+
+    CONSTCD14 year_month_day& operator+=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_day& operator-=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_day& operator+=(const years& y)  NOEXCEPT;
+    CONSTCD14 year_month_day& operator-=(const years& y)  NOEXCEPT;
+
+    CONSTCD11 date::year  year()  const NOEXCEPT;
+    CONSTCD11 date::month month() const NOEXCEPT;
+    CONSTCD11 date::day   day()   const NOEXCEPT;
+
+    CONSTCD14 operator sys_days() const NOEXCEPT;
+    CONSTCD14 explicit operator local_days() const NOEXCEPT;
+    CONSTCD14 bool ok() const NOEXCEPT;
+
+private:
+    static CONSTCD14 year_month_day from_days(days dp) NOEXCEPT;
+    CONSTCD14 days to_days() const NOEXCEPT;
+};
+
+CONSTCD11 bool operator==(const year_month_day& x, const year_month_day& y) NOEXCEPT;
+CONSTCD11 bool operator!=(const year_month_day& x, const year_month_day& y) NOEXCEPT;
+CONSTCD11 bool operator< (const year_month_day& x, const year_month_day& y) NOEXCEPT;
+CONSTCD11 bool operator> (const year_month_day& x, const year_month_day& y) NOEXCEPT;
+CONSTCD11 bool operator<=(const year_month_day& x, const year_month_day& y) NOEXCEPT;
+CONSTCD11 bool operator>=(const year_month_day& x, const year_month_day& y) NOEXCEPT;
+
+CONSTCD14 year_month_day operator+(const year_month_day& ymd, const months& dm) NOEXCEPT;
+CONSTCD14 year_month_day operator+(const months& dm, const year_month_day& ymd) NOEXCEPT;
+CONSTCD14 year_month_day operator-(const year_month_day& ymd, const months& dm) NOEXCEPT;
+CONSTCD11 year_month_day operator+(const year_month_day& ymd, const years& dy)  NOEXCEPT;
+CONSTCD11 year_month_day operator+(const years& dy, const year_month_day& ymd)  NOEXCEPT;
+CONSTCD11 year_month_day operator-(const year_month_day& ymd, const years& dy)  NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day& ymd);
+
+// year_month_day_last
+
+class year_month_day_last
+{
+    date::year           y_;
+    date::month_day_last mdl_;
+
+public:
+    CONSTCD11 year_month_day_last(const date::year& y,
+                                  const date::month_day_last& mdl) NOEXCEPT;
+
+    CONSTCD14 year_month_day_last& operator+=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_day_last& operator-=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_day_last& operator+=(const years& y)  NOEXCEPT;
+    CONSTCD14 year_month_day_last& operator-=(const years& y)  NOEXCEPT;
+
+    CONSTCD11 date::year           year()           const NOEXCEPT;
+    CONSTCD11 date::month          month()          const NOEXCEPT;
+    CONSTCD11 date::month_day_last month_day_last() const NOEXCEPT;
+    CONSTCD14 date::day            day()            const NOEXCEPT;
+
+    CONSTCD14 operator sys_days() const NOEXCEPT;
+    CONSTCD14 explicit operator local_days() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+};
+
+CONSTCD11
+    bool operator==(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
+CONSTCD11
+    bool operator!=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
+CONSTCD11
+    bool operator< (const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
+CONSTCD11
+    bool operator> (const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
+CONSTCD11
+    bool operator<=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
+CONSTCD11
+    bool operator>=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
+
+CONSTCD14
+year_month_day_last
+operator+(const year_month_day_last& ymdl, const months& dm) NOEXCEPT;
+
+CONSTCD14
+year_month_day_last
+operator+(const months& dm, const year_month_day_last& ymdl) NOEXCEPT;
+
+CONSTCD11
+year_month_day_last
+operator+(const year_month_day_last& ymdl, const years& dy) NOEXCEPT;
+
+CONSTCD11
+year_month_day_last
+operator+(const years& dy, const year_month_day_last& ymdl) NOEXCEPT;
+
+CONSTCD14
+year_month_day_last
+operator-(const year_month_day_last& ymdl, const months& dm) NOEXCEPT;
+
+CONSTCD11
+year_month_day_last
+operator-(const year_month_day_last& ymdl, const years& dy) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day_last& ymdl);
+
+// year_month_weekday
+
+class year_month_weekday
+{
+    date::year            y_;
+    date::month           m_;
+    date::weekday_indexed wdi_;
+
+public:
+    year_month_weekday() = default;
+    CONSTCD11 year_month_weekday(const date::year& y, const date::month& m,
+                                   const date::weekday_indexed& wdi) NOEXCEPT;
+    CONSTCD14 year_month_weekday(const sys_days& dp) NOEXCEPT;
+    CONSTCD14 explicit year_month_weekday(const local_days& dp) NOEXCEPT;
+
+    CONSTCD14 year_month_weekday& operator+=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_weekday& operator-=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_weekday& operator+=(const years& y)  NOEXCEPT;
+    CONSTCD14 year_month_weekday& operator-=(const years& y)  NOEXCEPT;
+
+    CONSTCD11 date::year year() const NOEXCEPT;
+    CONSTCD11 date::month month() const NOEXCEPT;
+    CONSTCD11 date::weekday weekday() const NOEXCEPT;
+    CONSTCD11 unsigned index() const NOEXCEPT;
+    CONSTCD11 date::weekday_indexed weekday_indexed() const NOEXCEPT;
+
+    CONSTCD14 operator sys_days() const NOEXCEPT;
+    CONSTCD14 explicit operator local_days() const NOEXCEPT;
+    CONSTCD14 bool ok() const NOEXCEPT;
+
+private:
+    static CONSTCD14 year_month_weekday from_days(days dp) NOEXCEPT;
+    CONSTCD14 days to_days() const NOEXCEPT;
+};
+
+CONSTCD11
+    bool operator==(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT;
+CONSTCD11
+    bool operator!=(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT;
+
+CONSTCD14
+year_month_weekday
+operator+(const year_month_weekday& ymwd, const months& dm) NOEXCEPT;
+
+CONSTCD14
+year_month_weekday
+operator+(const months& dm, const year_month_weekday& ymwd) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator+(const year_month_weekday& ymwd, const years& dy) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator+(const years& dy, const year_month_weekday& ymwd) NOEXCEPT;
+
+CONSTCD14
+year_month_weekday
+operator-(const year_month_weekday& ymwd, const months& dm) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday
+operator-(const year_month_weekday& ymwd, const years& dy) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday& ymwdi);
+
+// year_month_weekday_last
+
+class year_month_weekday_last
+{
+    date::year y_;
+    date::month m_;
+    date::weekday_last wdl_;
+
+public:
+    CONSTCD11 year_month_weekday_last(const date::year& y, const date::month& m,
+                                      const date::weekday_last& wdl) NOEXCEPT;
+
+    CONSTCD14 year_month_weekday_last& operator+=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_weekday_last& operator-=(const months& m) NOEXCEPT;
+    CONSTCD14 year_month_weekday_last& operator+=(const years& y) NOEXCEPT;
+    CONSTCD14 year_month_weekday_last& operator-=(const years& y) NOEXCEPT;
+
+    CONSTCD11 date::year year() const NOEXCEPT;
+    CONSTCD11 date::month month() const NOEXCEPT;
+    CONSTCD11 date::weekday weekday() const NOEXCEPT;
+    CONSTCD11 date::weekday_last weekday_last() const NOEXCEPT;
+
+    CONSTCD14 operator sys_days() const NOEXCEPT;
+    CONSTCD14 explicit operator local_days() const NOEXCEPT;
+    CONSTCD11 bool ok() const NOEXCEPT;
+
+private:
+    CONSTCD14 days to_days() const NOEXCEPT;
+};
+
+CONSTCD11
+bool
+operator==(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT;
+
+CONSTCD11
+bool
+operator!=(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT;
+
+CONSTCD14
+year_month_weekday_last
+operator+(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT;
+
+CONSTCD14
+year_month_weekday_last
+operator+(const months& dm, const year_month_weekday_last& ymwdl) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator+(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator+(const years& dy, const year_month_weekday_last& ymwdl) NOEXCEPT;
+
+CONSTCD14
+year_month_weekday_last
+operator-(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT;
+
+CONSTCD11
+year_month_weekday_last
+operator-(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT;
+
+template<class CharT, class Traits>
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday_last& ymwdl);
+
+#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
+inline namespace literals
+{
+
+CONSTCD11 date::day  operator "" _d(unsigned long long d) NOEXCEPT;
+CONSTCD11 date::year operator "" _y(unsigned long long y) NOEXCEPT;
+
+// CONSTDATA date::month jan{1};
+// CONSTDATA date::month feb{2};
+// CONSTDATA date::month mar{3};
+// CONSTDATA date::month apr{4};
+// CONSTDATA date::month may{5};
+// CONSTDATA date::month jun{6};
+// CONSTDATA date::month jul{7};
+// CONSTDATA date::month aug{8};
+// CONSTDATA date::month sep{9};
+// CONSTDATA date::month oct{10};
+// CONSTDATA date::month nov{11};
+// CONSTDATA date::month dec{12};
+//
+// CONSTDATA date::weekday sun{0u};
+// CONSTDATA date::weekday mon{1u};
+// CONSTDATA date::weekday tue{2u};
+// CONSTDATA date::weekday wed{3u};
+// CONSTDATA date::weekday thu{4u};
+// CONSTDATA date::weekday fri{5u};
+// CONSTDATA date::weekday sat{6u};
+
+}  // inline namespace literals
+#endif // !defined(_MSC_VER) || (_MSC_VER >= 1900)
+
+#if HAS_VOID_T
+
+template <class T, class = std::void_t<>>
+struct is_clock
+    : std::false_type
+{};
+
+template <class T>
+struct is_clock<T, std::void_t<decltype(T::now()), typename T::rep, typename T::period,
+                               typename T::duration, typename T::time_point,
+                               decltype(T::is_steady)>>
+    : std::true_type
+{};
+
+#endif  // HAS_VOID_T
+
+//----------------+
+// Implementation |
+//----------------+
+
+// utilities
+namespace detail {
+
+template<class CharT, class Traits = std::char_traits<CharT>>
+class save_stream
+{
+    std::basic_ostream<CharT, Traits>& os_;
+    CharT fill_;
+    std::ios::fmtflags flags_;
+    std::locale loc_;
+
+public:
+    ~save_stream()
+    {
+        os_.fill(fill_);
+        os_.flags(flags_);
+        os_.imbue(loc_);
+    }
+
+    save_stream(const save_stream&) = delete;
+    save_stream& operator=(const save_stream&) = delete;
+
+    explicit save_stream(std::basic_ostream<CharT, Traits>& os)
+        : os_(os)
+        , fill_(os.fill())
+        , flags_(os.flags())
+        , loc_(os.getloc())
+        {}
+};
+
+template <class T>
+struct choose_trunc_type
+{
+    static const int digits = std::numeric_limits<T>::digits;
+    using type = typename std::conditional
+                 <
+                     digits < 32,
+                     std::int32_t,
+                     typename std::conditional
+                     <
+                         digits < 64,
+                         std::int64_t,
+#ifdef __SIZEOF_INT128__
+                         __int128
+#else
+                         std::int64_t
+#endif
+                     >::type
+                 >::type;
+};
+
+template <class T>
+CONSTCD11
+inline
+typename std::enable_if
+<
+    !std::chrono::treat_as_floating_point<T>::value,
+    T
+>::type
+trunc(T t) NOEXCEPT
+{
+    return t;
+}
+
+template <class T>
+CONSTCD14
+inline
+typename std::enable_if
+<
+    std::chrono::treat_as_floating_point<T>::value,
+    T
+>::type
+trunc(T t) NOEXCEPT
+{
+    using namespace std;
+    using I = typename choose_trunc_type<T>::type;
+    CONSTDATA auto digits = numeric_limits<T>::digits;
+    static_assert(digits < numeric_limits<I>::digits, "");
+    CONSTDATA auto max = I{1} << (digits-1);
+    CONSTDATA auto min = -max;
+    const auto negative = t < T{0};
+    if (min <= t && t <= max && t != 0 && t == t)
+    {
+        t = static_cast<T>(static_cast<I>(t));
+        if (t == 0 && negative)
+            t = -t;
+    }
+    return t;
+}
+
+template <std::intmax_t Xp, std::intmax_t Yp>
+struct static_gcd
+{
+    static const std::intmax_t value = static_gcd<Yp, Xp % Yp>::value;
+};
+
+template <std::intmax_t Xp>
+struct static_gcd<Xp, 0>
+{
+    static const std::intmax_t value = Xp;
+};
+
+template <>
+struct static_gcd<0, 0>
+{
+    static const std::intmax_t value = 1;
+};
+
+template <class R1, class R2>
+struct no_overflow
+{
+private:
+    static const std::intmax_t gcd_n1_n2 = static_gcd<R1::num, R2::num>::value;
+    static const std::intmax_t gcd_d1_d2 = static_gcd<R1::den, R2::den>::value;
+    static const std::intmax_t n1 = R1::num / gcd_n1_n2;
+    static const std::intmax_t d1 = R1::den / gcd_d1_d2;
+    static const std::intmax_t n2 = R2::num / gcd_n1_n2;
+    static const std::intmax_t d2 = R2::den / gcd_d1_d2;
+    static const std::intmax_t max = -((std::intmax_t(1) <<
+                                       (sizeof(std::intmax_t) * CHAR_BIT - 1)) + 1);
+
+    template <std::intmax_t Xp, std::intmax_t Yp, bool overflow>
+    struct mul    // overflow == false
+    {
+        static const std::intmax_t value = Xp * Yp;
+    };
+
+    template <std::intmax_t Xp, std::intmax_t Yp>
+    struct mul<Xp, Yp, true>
+    {
+        static const std::intmax_t value = 1;
+    };
+
+public:
+    static const bool value = (n1 <= max / d2) && (n2 <= max / d1);
+    typedef std::ratio<mul<n1, d2, !value>::value,
+                       mul<n2, d1, !value>::value> type;
+};
+
+}  // detail
+
+// trunc towards zero
+template <class To, class Rep, class Period>
+CONSTCD11
+inline
+typename std::enable_if
+<
+    detail::no_overflow<Period, typename To::period>::value,
+    To
+>::type
+trunc(const std::chrono::duration<Rep, Period>& d)
+{
+    return To{detail::trunc(std::chrono::duration_cast<To>(d).count())};
+}
+
+template <class To, class Rep, class Period>
+CONSTCD11
+inline
+typename std::enable_if
+<
+    !detail::no_overflow<Period, typename To::period>::value,
+    To
+>::type
+trunc(const std::chrono::duration<Rep, Period>& d)
+{
+    using namespace std::chrono;
+    using rep = typename std::common_type<Rep, typename To::rep>::type;
+    return To{detail::trunc(duration_cast<To>(duration_cast<duration<rep>>(d)).count())};
+}
+
+#ifndef HAS_CHRONO_ROUNDING
+#  if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 190023918 || (_MSC_FULL_VER >= 190000000 && defined (__clang__)))
+#    define HAS_CHRONO_ROUNDING 1
+#  elif defined(__cpp_lib_chrono) && __cplusplus > 201402 && __cpp_lib_chrono >= 201510
+#    define HAS_CHRONO_ROUNDING 1
+#  elif defined(_LIBCPP_VERSION) && __cplusplus > 201402 && _LIBCPP_VERSION >= 3800
+#    define HAS_CHRONO_ROUNDING 1
+#  else
+#    define HAS_CHRONO_ROUNDING 0
+#  endif
+#endif  // HAS_CHRONO_ROUNDING
+
+#if HAS_CHRONO_ROUNDING == 0
+
+// round down
+template <class To, class Rep, class Period>
+CONSTCD14
+inline
+typename std::enable_if
+<
+    detail::no_overflow<Period, typename To::period>::value,
+    To
+>::type
+floor(const std::chrono::duration<Rep, Period>& d)
+{
+    auto t = trunc<To>(d);
+    if (t > d)
+        return t - To{1};
+    return t;
+}
+
+template <class To, class Rep, class Period>
+CONSTCD14
+inline
+typename std::enable_if
+<
+    !detail::no_overflow<Period, typename To::period>::value,
+    To
+>::type
+floor(const std::chrono::duration<Rep, Period>& d)
+{
+    using namespace std::chrono;
+    using rep = typename std::common_type<Rep, typename To::rep>::type;
+    return floor<To>(floor<duration<rep>>(d));
+}
+
+// round to nearest, to even on tie
+template <class To, class Rep, class Period>
+CONSTCD14
+inline
+To
+round(const std::chrono::duration<Rep, Period>& d)
+{
+    auto t0 = floor<To>(d);
+    auto t1 = t0 + To{1};
+    if (t1 == To{0} && t0 < To{0})
+        t1 = -t1;
+    auto diff0 = d - t0;
+    auto diff1 = t1 - d;
+    if (diff0 == diff1)
+    {
+        if (t0 - trunc<To>(t0/2)*2 == To{0})
+            return t0;
+        return t1;
+    }
+    if (diff0 < diff1)
+        return t0;
+    return t1;
+}
+
+// round up
+template <class To, class Rep, class Period>
+CONSTCD14
+inline
+To
+ceil(const std::chrono::duration<Rep, Period>& d)
+{
+    auto t = trunc<To>(d);
+    if (t < d)
+        return t + To{1};
+    return t;
+}
+
+template <class Rep, class Period,
+          class = typename std::enable_if
+          <
+              std::numeric_limits<Rep>::is_signed
+          >::type>
+CONSTCD11
+std::chrono::duration<Rep, Period>
+abs(std::chrono::duration<Rep, Period> d)
+{
+    return d >= d.zero() ? d : -d;
+}
+
+// round down
+template <class To, class Clock, class FromDuration>
+CONSTCD11
+inline
+std::chrono::time_point<Clock, To>
+floor(const std::chrono::time_point<Clock, FromDuration>& tp)
+{
+    using std::chrono::time_point;
+    return time_point<Clock, To>{date::floor<To>(tp.time_since_epoch())};
+}
+
+// round to nearest, to even on tie
+template <class To, class Clock, class FromDuration>
+CONSTCD11
+inline
+std::chrono::time_point<Clock, To>
+round(const std::chrono::time_point<Clock, FromDuration>& tp)
+{
+    using std::chrono::time_point;
+    return time_point<Clock, To>{round<To>(tp.time_since_epoch())};
+}
+
+// round up
+template <class To, class Clock, class FromDuration>
+CONSTCD11
+inline
+std::chrono::time_point<Clock, To>
+ceil(const std::chrono::time_point<Clock, FromDuration>& tp)
+{
+    using std::chrono::time_point;
+    return time_point<Clock, To>{ceil<To>(tp.time_since_epoch())};
+}
+
+#else  // HAS_CHRONO_ROUNDING == 1
+
+using std::chrono::floor;
+using std::chrono::ceil;
+using std::chrono::round;
+using std::chrono::abs;
+
+#endif  // HAS_CHRONO_ROUNDING
+
+// trunc towards zero
+template <class To, class Clock, class FromDuration>
+CONSTCD11
+inline
+std::chrono::time_point<Clock, To>
+trunc(const std::chrono::time_point<Clock, FromDuration>& tp)
+{
+    using std::chrono::time_point;
+    return time_point<Clock, To>{trunc<To>(tp.time_since_epoch())};
+}
+
+// day
+
+CONSTCD11 inline day::day(unsigned d) NOEXCEPT : d_(static_cast<unsigned char>(d)) {}
+CONSTCD14 inline day& day::operator++() NOEXCEPT {++d_; return *this;}
+CONSTCD14 inline day day::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
+CONSTCD14 inline day& day::operator--() NOEXCEPT {--d_; return *this;}
+CONSTCD14 inline day day::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
+CONSTCD14 inline day& day::operator+=(const days& d) NOEXCEPT {*this = *this + d; return *this;}
+CONSTCD14 inline day& day::operator-=(const days& d) NOEXCEPT {*this = *this - d; return *this;}
+CONSTCD11 inline day::operator unsigned() const NOEXCEPT {return d_;}
+CONSTCD11 inline bool day::ok() const NOEXCEPT {return 1 <= d_ && d_ <= 31;}
+
+CONSTCD11
+inline
+bool
+operator==(const day& x, const day& y) NOEXCEPT
+{
+    return static_cast<unsigned>(x) == static_cast<unsigned>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const day& x, const day& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const day& x, const day& y) NOEXCEPT
+{
+    return static_cast<unsigned>(x) < static_cast<unsigned>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator>(const day& x, const day& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const day& x, const day& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const day& x, const day& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+CONSTCD11
+inline
+days
+operator-(const day& x, const day& y) NOEXCEPT
+{
+    return days{static_cast<days::rep>(static_cast<unsigned>(x)
+                                     - static_cast<unsigned>(y))};
+}
+
+CONSTCD11
+inline
+day
+operator+(const day& x, const days& y) NOEXCEPT
+{
+    return day{static_cast<unsigned>(x) + static_cast<unsigned>(y.count())};
+}
+
+CONSTCD11
+inline
+day
+operator+(const days& x, const day& y) NOEXCEPT
+{
+    return y + x;
+}
+
+CONSTCD11
+inline
+day
+operator-(const day& x, const days& y) NOEXCEPT
+{
+    return x + -y;
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const day& d)
+{
+    detail::save_stream<CharT, Traits> _(os);
+    os.fill('0');
+    os.flags(std::ios::dec | std::ios::right);
+    os.width(2);
+    os << static_cast<unsigned>(d);
+    return os;
+}
+
+// month
+
+CONSTCD11 inline month::month(unsigned m) NOEXCEPT : m_(static_cast<decltype(m_)>(m)) {}
+CONSTCD14 inline month& month::operator++() NOEXCEPT {if (++m_ == 13) m_ = 1; return *this;}
+CONSTCD14 inline month month::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
+CONSTCD14 inline month& month::operator--() NOEXCEPT {if (--m_ == 0) m_ = 12; return *this;}
+CONSTCD14 inline month month::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
+
+CONSTCD14
+inline
+month&
+month::operator+=(const months& m) NOEXCEPT
+{
+    *this = *this + m;
+    return *this;
+}
+
+CONSTCD14
+inline
+month&
+month::operator-=(const months& m) NOEXCEPT
+{
+    *this = *this - m;
+    return *this;
+}
+
+CONSTCD11 inline month::operator unsigned() const NOEXCEPT {return m_;}
+CONSTCD11 inline bool month::ok() const NOEXCEPT {return 1 <= m_ && m_ <= 12;}
+
+CONSTCD11
+inline
+bool
+operator==(const month& x, const month& y) NOEXCEPT
+{
+    return static_cast<unsigned>(x) == static_cast<unsigned>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const month& x, const month& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const month& x, const month& y) NOEXCEPT
+{
+    return static_cast<unsigned>(x) < static_cast<unsigned>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator>(const month& x, const month& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const month& x, const month& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const month& x, const month& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+CONSTCD14
+inline
+months
+operator-(const month& x, const month& y) NOEXCEPT
+{
+    auto const d = static_cast<unsigned>(x) - static_cast<unsigned>(y);
+    return months(d <= 11 ? d : d + 12);
+}
+
+CONSTCD14
+inline
+month
+operator+(const month& x, const months& y) NOEXCEPT
+{
+    auto const mu = static_cast<long long>(static_cast<unsigned>(x)) - 1 + y.count();
+    auto const yr = (mu >= 0 ? mu : mu-11) / 12;
+    return month{static_cast<unsigned>(mu - yr * 12 + 1)};
+}
+
+CONSTCD14
+inline
+month
+operator+(const months& x, const month& y) NOEXCEPT
+{
+    return y + x;
+}
+
+CONSTCD14
+inline
+month
+operator-(const month& x, const months& y) NOEXCEPT
+{
+    return x + -y;
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month& m)
+{
+    switch (static_cast<unsigned>(m))
+    {
+    case 1:
+        os << "Jan";
+        break;
+    case 2:
+        os << "Feb";
+        break;
+    case 3:
+        os << "Mar";
+        break;
+    case 4:
+        os << "Apr";
+        break;
+    case 5:
+        os << "May";
+        break;
+    case 6:
+        os << "Jun";
+        break;
+    case 7:
+        os << "Jul";
+        break;
+    case 8:
+        os << "Aug";
+        break;
+    case 9:
+        os << "Sep";
+        break;
+    case 10:
+        os << "Oct";
+        break;
+    case 11:
+        os << "Nov";
+        break;
+    case 12:
+        os << "Dec";
+        break;
+    default:
+        os << static_cast<unsigned>(m) << " is not a valid month";
+        break;
+    }
+    return os;
+}
+
+// year
+
+CONSTCD11 inline year::year(int y) NOEXCEPT : y_(static_cast<decltype(y_)>(y)) {}
+CONSTCD14 inline year& year::operator++() NOEXCEPT {++y_; return *this;}
+CONSTCD14 inline year year::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
+CONSTCD14 inline year& year::operator--() NOEXCEPT {--y_; return *this;}
+CONSTCD14 inline year year::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
+CONSTCD14 inline year& year::operator+=(const years& y) NOEXCEPT {*this = *this + y; return *this;}
+CONSTCD14 inline year& year::operator-=(const years& y) NOEXCEPT {*this = *this - y; return *this;}
+CONSTCD11 inline year year::operator-() const NOEXCEPT {return year{-y_};}
+CONSTCD11 inline year year::operator+() const NOEXCEPT {return *this;}
+
+CONSTCD11
+inline
+bool
+year::is_leap() const NOEXCEPT
+{
+    return y_ % 4 == 0 && (y_ % 100 != 0 || y_ % 400 == 0);
+}
+
+CONSTCD11 inline year::operator int() const NOEXCEPT {return y_;}
+
+CONSTCD11
+inline
+bool
+year::ok() const NOEXCEPT
+{
+    return y_ != std::numeric_limits<short>::min();
+}
+
+CONSTCD11
+inline
+year
+year::min() NOEXCEPT
+{
+    return year{-32767};
+}
+
+CONSTCD11
+inline
+year
+year::max() NOEXCEPT
+{
+    return year{32767};
+}
+
+CONSTCD11
+inline
+bool
+operator==(const year& x, const year& y) NOEXCEPT
+{
+    return static_cast<int>(x) == static_cast<int>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const year& x, const year& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const year& x, const year& y) NOEXCEPT
+{
+    return static_cast<int>(x) < static_cast<int>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator>(const year& x, const year& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const year& x, const year& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const year& x, const year& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+CONSTCD11
+inline
+years
+operator-(const year& x, const year& y) NOEXCEPT
+{
+    return years{static_cast<int>(x) - static_cast<int>(y)};
+}
+
+CONSTCD11
+inline
+year
+operator+(const year& x, const years& y) NOEXCEPT
+{
+    return year{static_cast<int>(x) + y.count()};
+}
+
+CONSTCD11
+inline
+year
+operator+(const years& x, const year& y) NOEXCEPT
+{
+    return y + x;
+}
+
+CONSTCD11
+inline
+year
+operator-(const year& x, const years& y) NOEXCEPT
+{
+    return year{static_cast<int>(x) - y.count()};
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year& y)
+{
+    detail::save_stream<CharT, Traits> _(os);
+    os.fill('0');
+    os.flags(std::ios::dec | std::ios::internal);
+    os.width(4 + (y < year{0}));
+    os << static_cast<int>(y);
+    return os;
+}
+
+// weekday
+
+CONSTCD11
+inline
+unsigned char
+weekday::weekday_from_days(int z) NOEXCEPT
+{
+    return static_cast<unsigned char>(static_cast<unsigned>(
+        z >= -4 ? (z+4) % 7 : (z+5) % 7 + 6));
+}
+
+CONSTCD11
+inline
+weekday::weekday(unsigned wd) NOEXCEPT
+    : wd_(static_cast<decltype(wd_)>(wd))
+    {}
+
+CONSTCD11
+inline
+weekday::weekday(const sys_days& dp) NOEXCEPT
+    : wd_(weekday_from_days(dp.time_since_epoch().count()))
+    {}
+
+CONSTCD11
+inline
+weekday::weekday(const local_days& dp) NOEXCEPT
+    : wd_(weekday_from_days(dp.time_since_epoch().count()))
+    {}
+
+CONSTCD14 inline weekday& weekday::operator++() NOEXCEPT {if (++wd_ == 7) wd_ = 0; return *this;}
+CONSTCD14 inline weekday weekday::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
+CONSTCD14 inline weekday& weekday::operator--() NOEXCEPT {if (wd_-- == 0) wd_ = 6; return *this;}
+CONSTCD14 inline weekday weekday::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
+
+CONSTCD14
+inline
+weekday&
+weekday::operator+=(const days& d) NOEXCEPT
+{
+    *this = *this + d;
+    return *this;
+}
+
+CONSTCD14
+inline
+weekday&
+weekday::operator-=(const days& d) NOEXCEPT
+{
+    *this = *this - d;
+    return *this;
+}
+
+CONSTCD11
+inline
+weekday::operator unsigned() const NOEXCEPT
+{
+    return static_cast<unsigned>(wd_);
+}
+
+CONSTCD11 inline bool weekday::ok() const NOEXCEPT {return wd_ <= 6;}
+
+CONSTCD11
+inline
+bool
+operator==(const weekday& x, const weekday& y) NOEXCEPT
+{
+    return static_cast<unsigned>(x) == static_cast<unsigned>(y);
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const weekday& x, const weekday& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD14
+inline
+days
+operator-(const weekday& x, const weekday& y) NOEXCEPT
+{
+    auto const diff = static_cast<unsigned>(x) - static_cast<unsigned>(y);
+    return days{diff <= 6 ? diff : diff + 7};
+}
+
+CONSTCD14
+inline
+weekday
+operator+(const weekday& x, const days& y) NOEXCEPT
+{
+    auto const wdu = static_cast<long long>(static_cast<unsigned>(x)) + y.count();
+    auto const wk = (wdu >= 0 ? wdu : wdu-6) / 7;
+    return weekday{static_cast<unsigned>(wdu - wk * 7)};
+}
+
+CONSTCD14
+inline
+weekday
+operator+(const days& x, const weekday& y) NOEXCEPT
+{
+    return y + x;
+}
+
+CONSTCD14
+inline
+weekday
+operator-(const weekday& x, const days& y) NOEXCEPT
+{
+    return x + -y;
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const weekday& wd)
+{
+    switch (static_cast<unsigned>(wd))
+    {
+    case 0:
+        os << "Sun";
+        break;
+    case 1:
+        os << "Mon";
+        break;
+    case 2:
+        os << "Tue";
+        break;
+    case 3:
+        os << "Wed";
+        break;
+    case 4:
+        os << "Thu";
+        break;
+    case 5:
+        os << "Fri";
+        break;
+    case 6:
+        os << "Sat";
+        break;
+    default:
+        os << static_cast<unsigned>(wd) << " is not a valid weekday";
+        break;
+    }
+    return os;
+}
+
+#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
+inline namespace literals
+{
+
+CONSTCD11
+inline
+date::day
+operator "" _d(unsigned long long d) NOEXCEPT
+{
+    return date::day{static_cast<unsigned>(d)};
+}
+
+CONSTCD11
+inline
+date::year
+operator "" _y(unsigned long long y) NOEXCEPT
+{
+    return date::year(static_cast<int>(y));
+}
+#endif  // !defined(_MSC_VER) || (_MSC_VER >= 1900)
+
+CONSTDATA date::last_spec last{};
+
+CONSTDATA date::month jan{1};
+CONSTDATA date::month feb{2};
+CONSTDATA date::month mar{3};
+CONSTDATA date::month apr{4};
+CONSTDATA date::month may{5};
+CONSTDATA date::month jun{6};
+CONSTDATA date::month jul{7};
+CONSTDATA date::month aug{8};
+CONSTDATA date::month sep{9};
+CONSTDATA date::month oct{10};
+CONSTDATA date::month nov{11};
+CONSTDATA date::month dec{12};
+
+CONSTDATA date::weekday sun{0u};
+CONSTDATA date::weekday mon{1u};
+CONSTDATA date::weekday tue{2u};
+CONSTDATA date::weekday wed{3u};
+CONSTDATA date::weekday thu{4u};
+CONSTDATA date::weekday fri{5u};
+CONSTDATA date::weekday sat{6u};
+
+#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
+}  // inline namespace literals
+#endif
+
+// weekday_indexed
+
+CONSTCD11
+inline
+weekday
+weekday_indexed::weekday() const NOEXCEPT
+{
+    return date::weekday{static_cast<unsigned>(wd_)};
+}
+
+CONSTCD11 inline unsigned weekday_indexed::index() const NOEXCEPT {return index_;}
+
+CONSTCD11
+inline
+bool
+weekday_indexed::ok() const NOEXCEPT
+{
+    return weekday().ok() && 1 <= index_ && index_ <= 5;
+}
+
+#ifdef __GNUC__
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Wconversion"
+#endif  // __GNUC__
+
+CONSTCD11
+inline
+weekday_indexed::weekday_indexed(const date::weekday& wd, unsigned index) NOEXCEPT
+    : wd_(static_cast<decltype(wd_)>(static_cast<unsigned>(wd)))
+    , index_(static_cast<decltype(index_)>(index))
+    {}
+
+#ifdef __GNUC__
+#  pragma GCC diagnostic pop
+#endif  // __GNUC__
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_indexed& wdi)
+{
+    return os << wdi.weekday() << '[' << wdi.index() << ']';
+}
+
+CONSTCD11
+inline
+weekday_indexed
+weekday::operator[](unsigned index) const NOEXCEPT
+{
+    return {*this, index};
+}
+
+CONSTCD11
+inline
+bool
+operator==(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT
+{
+    return x.weekday() == y.weekday() && x.index() == y.index();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+// weekday_last
+
+CONSTCD11 inline date::weekday weekday_last::weekday() const NOEXCEPT {return wd_;}
+CONSTCD11 inline bool weekday_last::ok() const NOEXCEPT {return wd_.ok();}
+CONSTCD11 inline weekday_last::weekday_last(const date::weekday& wd) NOEXCEPT : wd_(wd) {}
+
+CONSTCD11
+inline
+bool
+operator==(const weekday_last& x, const weekday_last& y) NOEXCEPT
+{
+    return x.weekday() == y.weekday();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const weekday_last& x, const weekday_last& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_last& wdl)
+{
+    return os << wdl.weekday() << "[last]";
+}
+
+CONSTCD11
+inline
+weekday_last
+weekday::operator[](last_spec) const NOEXCEPT
+{
+    return weekday_last{*this};
+}
+
+// year_month
+
+CONSTCD11
+inline
+year_month::year_month(const date::year& y, const date::month& m) NOEXCEPT
+    : y_(y)
+    , m_(m)
+    {}
+
+CONSTCD11 inline year year_month::year() const NOEXCEPT {return y_;}
+CONSTCD11 inline month year_month::month() const NOEXCEPT {return m_;}
+CONSTCD11 inline bool year_month::ok() const NOEXCEPT {return y_.ok() && m_.ok();}
+
+CONSTCD14
+inline
+year_month&
+year_month::operator+=(const months& dm) NOEXCEPT
+{
+    *this = *this + dm;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month&
+year_month::operator-=(const months& dm) NOEXCEPT
+{
+    *this = *this - dm;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month&
+year_month::operator+=(const years& dy) NOEXCEPT
+{
+    *this = *this + dy;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month&
+year_month::operator-=(const years& dy) NOEXCEPT
+{
+    *this = *this - dy;
+    return *this;
+}
+
+CONSTCD11
+inline
+bool
+operator==(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return x.year() == y.year() && x.month() == y.month();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return x.year() < y.year() ? true
+        : (x.year() > y.year() ? false
+        : (x.month() < y.month()));
+}
+
+CONSTCD11
+inline
+bool
+operator>(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+CONSTCD14
+inline
+year_month
+operator+(const year_month& ym, const months& dm) NOEXCEPT
+{
+    auto dmi = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 + dm.count();
+    auto dy = (dmi >= 0 ? dmi : dmi-11) / 12;
+    dmi = dmi - dy * 12 + 1;
+    return (ym.year() + years(dy)) / month(static_cast<unsigned>(dmi));
+}
+
+CONSTCD14
+inline
+year_month
+operator+(const months& dm, const year_month& ym) NOEXCEPT
+{
+    return ym + dm;
+}
+
+CONSTCD14
+inline
+year_month
+operator-(const year_month& ym, const months& dm) NOEXCEPT
+{
+    return ym + -dm;
+}
+
+CONSTCD11
+inline
+months
+operator-(const year_month& x, const year_month& y) NOEXCEPT
+{
+    return (x.year() - y.year()) +
+            months(static_cast<unsigned>(x.month()) - static_cast<unsigned>(y.month()));
+}
+
+CONSTCD11
+inline
+year_month
+operator+(const year_month& ym, const years& dy) NOEXCEPT
+{
+    return (ym.year() + dy) / ym.month();
+}
+
+CONSTCD11
+inline
+year_month
+operator+(const years& dy, const year_month& ym) NOEXCEPT
+{
+    return ym + dy;
+}
+
+CONSTCD11
+inline
+year_month
+operator-(const year_month& ym, const years& dy) NOEXCEPT
+{
+    return ym + -dy;
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month& ym)
+{
+    return os << ym.year() << '/' << ym.month();
+}
+
+// month_day
+
+CONSTCD11
+inline
+month_day::month_day(const date::month& m, const date::day& d) NOEXCEPT
+    : m_(m)
+    , d_(d)
+    {}
+
+CONSTCD11 inline date::month month_day::month() const NOEXCEPT {return m_;}
+CONSTCD11 inline date::day month_day::day() const NOEXCEPT {return d_;}
+
+CONSTCD14
+inline
+bool
+month_day::ok() const NOEXCEPT
+{
+    CONSTDATA date::day d[] =
+    {
+        date::day(31), date::day(29), date::day(31),
+        date::day(30), date::day(31), date::day(30),
+        date::day(31), date::day(31), date::day(30),
+        date::day(31), date::day(30), date::day(31)
+    };
+    return m_.ok() && date::day{1} <= d_ && d_ <= d[static_cast<unsigned>(m_)-1];
+}
+
+CONSTCD11
+inline
+bool
+operator==(const month_day& x, const month_day& y) NOEXCEPT
+{
+    return x.month() == y.month() && x.day() == y.day();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const month_day& x, const month_day& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const month_day& x, const month_day& y) NOEXCEPT
+{
+    return x.month() < y.month() ? true
+        : (x.month() > y.month() ? false
+        : (x.day() < y.day()));
+}
+
+CONSTCD11
+inline
+bool
+operator>(const month_day& x, const month_day& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const month_day& x, const month_day& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const month_day& x, const month_day& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_day& md)
+{
+    return os << md.month() << '/' << md.day();
+}
+
+// month_day_last
+
+CONSTCD11 inline month month_day_last::month() const NOEXCEPT {return m_;}
+CONSTCD11 inline bool month_day_last::ok() const NOEXCEPT {return m_.ok();}
+CONSTCD11 inline month_day_last::month_day_last(const date::month& m) NOEXCEPT : m_(m) {}
+
+CONSTCD11
+inline
+bool
+operator==(const month_day_last& x, const month_day_last& y) NOEXCEPT
+{
+    return x.month() == y.month();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const month_day_last& x, const month_day_last& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const month_day_last& x, const month_day_last& y) NOEXCEPT
+{
+    return x.month() < y.month();
+}
+
+CONSTCD11
+inline
+bool
+operator>(const month_day_last& x, const month_day_last& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const month_day_last& x, const month_day_last& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const month_day_last& x, const month_day_last& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_day_last& mdl)
+{
+    return os << mdl.month() << "/last";
+}
+
+// month_weekday
+
+CONSTCD11
+inline
+month_weekday::month_weekday(const date::month& m,
+                             const date::weekday_indexed& wdi) NOEXCEPT
+    : m_(m)
+    , wdi_(wdi)
+    {}
+
+CONSTCD11 inline month month_weekday::month() const NOEXCEPT {return m_;}
+
+CONSTCD11
+inline
+weekday_indexed
+month_weekday::weekday_indexed() const NOEXCEPT
+{
+    return wdi_;
+}
+
+CONSTCD11
+inline
+bool
+month_weekday::ok() const NOEXCEPT
+{
+    return m_.ok() && wdi_.ok();
+}
+
+CONSTCD11
+inline
+bool
+operator==(const month_weekday& x, const month_weekday& y) NOEXCEPT
+{
+    return x.month() == y.month() && x.weekday_indexed() == y.weekday_indexed();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const month_weekday& x, const month_weekday& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday& mwd)
+{
+    return os << mwd.month() << '/' << mwd.weekday_indexed();
+}
+
+// month_weekday_last
+
+CONSTCD11
+inline
+month_weekday_last::month_weekday_last(const date::month& m,
+                                       const date::weekday_last& wdl) NOEXCEPT
+    : m_(m)
+    , wdl_(wdl)
+    {}
+
+CONSTCD11 inline month month_weekday_last::month() const NOEXCEPT {return m_;}
+
+CONSTCD11
+inline
+weekday_last
+month_weekday_last::weekday_last() const NOEXCEPT
+{
+    return wdl_;
+}
+
+CONSTCD11
+inline
+bool
+month_weekday_last::ok() const NOEXCEPT
+{
+    return m_.ok() && wdl_.ok();
+}
+
+CONSTCD11
+inline
+bool
+operator==(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT
+{
+    return x.month() == y.month() && x.weekday_last() == y.weekday_last();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday_last& mwdl)
+{
+    return os << mwdl.month() << '/' << mwdl.weekday_last();
+}
+
+// year_month_day_last
+
+CONSTCD11
+inline
+year_month_day_last::year_month_day_last(const date::year& y,
+                                         const date::month_day_last& mdl) NOEXCEPT
+    : y_(y)
+    , mdl_(mdl)
+    {}
+
+CONSTCD14
+inline
+year_month_day_last&
+year_month_day_last::operator+=(const months& m) NOEXCEPT
+{
+    *this = *this + m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_day_last&
+year_month_day_last::operator-=(const months& m) NOEXCEPT
+{
+    *this = *this - m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_day_last&
+year_month_day_last::operator+=(const years& y) NOEXCEPT
+{
+    *this = *this + y;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_day_last&
+year_month_day_last::operator-=(const years& y) NOEXCEPT
+{
+    *this = *this - y;
+    return *this;
+}
+
+CONSTCD11 inline year year_month_day_last::year() const NOEXCEPT {return y_;}
+CONSTCD11 inline month year_month_day_last::month() const NOEXCEPT {return mdl_.month();}
+
+CONSTCD11
+inline
+month_day_last
+year_month_day_last::month_day_last() const NOEXCEPT
+{
+    return mdl_;
+}
+
+CONSTCD14
+inline
+day
+year_month_day_last::day() const NOEXCEPT
+{
+    CONSTDATA date::day d[] =
+    {
+        date::day(31), date::day(28), date::day(31),
+        date::day(30), date::day(31), date::day(30),
+        date::day(31), date::day(31), date::day(30),
+        date::day(31), date::day(30), date::day(31)
+    };
+    return month() != feb || !y_.is_leap() ?
+        d[static_cast<unsigned>(month()) - 1] : date::day{29};
+}
+
+CONSTCD14
+inline
+year_month_day_last::operator sys_days() const NOEXCEPT
+{
+    return sys_days(year()/month()/day());
+}
+
+CONSTCD14
+inline
+year_month_day_last::operator local_days() const NOEXCEPT
+{
+    return local_days(year()/month()/day());
+}
+
+CONSTCD11
+inline
+bool
+year_month_day_last::ok() const NOEXCEPT
+{
+    return y_.ok() && mdl_.ok();
+}
+
+CONSTCD11
+inline
+bool
+operator==(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
+{
+    return x.year() == y.year() && x.month_day_last() == y.month_day_last();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
+{
+    return x.year() < y.year() ? true
+        : (x.year() > y.year() ? false
+        : (x.month_day_last() < y.month_day_last()));
+}
+
+CONSTCD11
+inline
+bool
+operator>(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day_last& ymdl)
+{
+    return os << ymdl.year() << '/' << ymdl.month_day_last();
+}
+
+CONSTCD14
+inline
+year_month_day_last
+operator+(const year_month_day_last& ymdl, const months& dm) NOEXCEPT
+{
+    return (ymdl.year() / ymdl.month() + dm) / last;
+}
+
+CONSTCD14
+inline
+year_month_day_last
+operator+(const months& dm, const year_month_day_last& ymdl) NOEXCEPT
+{
+    return ymdl + dm;
+}
+
+CONSTCD14
+inline
+year_month_day_last
+operator-(const year_month_day_last& ymdl, const months& dm) NOEXCEPT
+{
+    return ymdl + (-dm);
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator+(const year_month_day_last& ymdl, const years& dy) NOEXCEPT
+{
+    return {ymdl.year()+dy, ymdl.month_day_last()};
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator+(const years& dy, const year_month_day_last& ymdl) NOEXCEPT
+{
+    return ymdl + dy;
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator-(const year_month_day_last& ymdl, const years& dy) NOEXCEPT
+{
+    return ymdl + (-dy);
+}
+
+// year_month_day
+
+CONSTCD11
+inline
+year_month_day::year_month_day(const date::year& y, const date::month& m,
+                               const date::day& d) NOEXCEPT
+    : y_(y)
+    , m_(m)
+    , d_(d)
+    {}
+
+CONSTCD14
+inline
+year_month_day::year_month_day(const year_month_day_last& ymdl) NOEXCEPT
+    : y_(ymdl.year())
+    , m_(ymdl.month())
+    , d_(ymdl.day())
+    {}
+
+CONSTCD14
+inline
+year_month_day::year_month_day(sys_days dp) NOEXCEPT
+    : year_month_day(from_days(dp.time_since_epoch()))
+    {}
+
+CONSTCD14
+inline
+year_month_day::year_month_day(local_days dp) NOEXCEPT
+    : year_month_day(from_days(dp.time_since_epoch()))
+    {}
+
+CONSTCD11 inline year year_month_day::year() const NOEXCEPT {return y_;}
+CONSTCD11 inline month year_month_day::month() const NOEXCEPT {return m_;}
+CONSTCD11 inline day year_month_day::day() const NOEXCEPT {return d_;}
+
+CONSTCD14
+inline
+year_month_day&
+year_month_day::operator+=(const months& m) NOEXCEPT
+{
+    *this = *this + m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_day&
+year_month_day::operator-=(const months& m) NOEXCEPT
+{
+    *this = *this - m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_day&
+year_month_day::operator+=(const years& y) NOEXCEPT
+{
+    *this = *this + y;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_day&
+year_month_day::operator-=(const years& y) NOEXCEPT
+{
+    *this = *this - y;
+    return *this;
+}
+
+CONSTCD14
+inline
+days
+year_month_day::to_days() const NOEXCEPT
+{
+    static_assert(std::numeric_limits<unsigned>::digits >= 18,
+             "This algorithm has not been ported to a 16 bit unsigned integer");
+    static_assert(std::numeric_limits<int>::digits >= 20,
+             "This algorithm has not been ported to a 16 bit signed integer");
+    auto const y = static_cast<int>(y_) - (m_ <= feb);
+    auto const m = static_cast<unsigned>(m_);
+    auto const d = static_cast<unsigned>(d_);
+    auto const era = (y >= 0 ? y : y-399) / 400;
+    auto const yoe = static_cast<unsigned>(y - era * 400);       // [0, 399]
+    auto const doy = (153*(m > 2 ? m-3 : m+9) + 2)/5 + d-1;      // [0, 365]
+    auto const doe = yoe * 365 + yoe/4 - yoe/100 + doy;          // [0, 146096]
+    return days{era * 146097 + static_cast<int>(doe) - 719468};
+}
+
+CONSTCD14
+inline
+year_month_day::operator sys_days() const NOEXCEPT
+{
+    return sys_days{to_days()};
+}
+
+CONSTCD14
+inline
+year_month_day::operator local_days() const NOEXCEPT
+{
+    return local_days{to_days()};
+}
+
+CONSTCD14
+inline
+bool
+year_month_day::ok() const NOEXCEPT
+{
+    if (!(y_.ok() && m_.ok()))
+        return false;
+    return date::day{1} <= d_ && d_ <= (y_ / m_ / last).day();
+}
+
+CONSTCD11
+inline
+bool
+operator==(const year_month_day& x, const year_month_day& y) NOEXCEPT
+{
+    return x.year() == y.year() && x.month() == y.month() && x.day() == y.day();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const year_month_day& x, const year_month_day& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+CONSTCD11
+inline
+bool
+operator<(const year_month_day& x, const year_month_day& y) NOEXCEPT
+{
+    return x.year() < y.year() ? true
+        : (x.year() > y.year() ? false
+        : (x.month() < y.month() ? true
+        : (x.month() > y.month() ? false
+        : (x.day() < y.day()))));
+}
+
+CONSTCD11
+inline
+bool
+operator>(const year_month_day& x, const year_month_day& y) NOEXCEPT
+{
+    return y < x;
+}
+
+CONSTCD11
+inline
+bool
+operator<=(const year_month_day& x, const year_month_day& y) NOEXCEPT
+{
+    return !(y < x);
+}
+
+CONSTCD11
+inline
+bool
+operator>=(const year_month_day& x, const year_month_day& y) NOEXCEPT
+{
+    return !(x < y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day& ymd)
+{
+    detail::save_stream<CharT, Traits> _(os);
+    os.fill('0');
+    os.flags(std::ios::dec | std::ios::right);
+    os << ymd.year() << '-';
+    os.width(2);
+    os << static_cast<unsigned>(ymd.month()) << '-';
+    os << ymd.day();
+    return os;
+}
+
+CONSTCD14
+inline
+year_month_day
+year_month_day::from_days(days dp) NOEXCEPT
+{
+    static_assert(std::numeric_limits<unsigned>::digits >= 18,
+             "This algorithm has not been ported to a 16 bit unsigned integer");
+    static_assert(std::numeric_limits<int>::digits >= 20,
+             "This algorithm has not been ported to a 16 bit signed integer");
+    auto const z = dp.count() + 719468;
+    auto const era = (z >= 0 ? z : z - 146096) / 146097;
+    auto const doe = static_cast<unsigned>(z - era * 146097);          // [0, 146096]
+    auto const yoe = (doe - doe/1460 + doe/36524 - doe/146096) / 365;  // [0, 399]
+    auto const y = static_cast<days::rep>(yoe) + era * 400;
+    auto const doy = doe - (365*yoe + yoe/4 - yoe/100);                // [0, 365]
+    auto const mp = (5*doy + 2)/153;                                   // [0, 11]
+    auto const d = doy - (153*mp+2)/5 + 1;                             // [1, 31]
+    auto const m = mp < 10 ? mp+3 : mp-9;                              // [1, 12]
+    return year_month_day{date::year{y + (m <= 2)}, date::month(m), date::day(d)};
+}
+
+CONSTCD14
+inline
+year_month_day
+operator+(const year_month_day& ymd, const months& dm) NOEXCEPT
+{
+    return (ymd.year() / ymd.month() + dm) / ymd.day();
+}
+
+CONSTCD14
+inline
+year_month_day
+operator+(const months& dm, const year_month_day& ymd) NOEXCEPT
+{
+    return ymd + dm;
+}
+
+CONSTCD14
+inline
+year_month_day
+operator-(const year_month_day& ymd, const months& dm) NOEXCEPT
+{
+    return ymd + (-dm);
+}
+
+CONSTCD11
+inline
+year_month_day
+operator+(const year_month_day& ymd, const years& dy) NOEXCEPT
+{
+    return (ymd.year() + dy) / ymd.month() / ymd.day();
+}
+
+CONSTCD11
+inline
+year_month_day
+operator+(const years& dy, const year_month_day& ymd) NOEXCEPT
+{
+    return ymd + dy;
+}
+
+CONSTCD11
+inline
+year_month_day
+operator-(const year_month_day& ymd, const years& dy) NOEXCEPT
+{
+    return ymd + (-dy);
+}
+
+// year_month_weekday
+
+CONSTCD11
+inline
+year_month_weekday::year_month_weekday(const date::year& y, const date::month& m,
+                                       const date::weekday_indexed& wdi)
+        NOEXCEPT
+    : y_(y)
+    , m_(m)
+    , wdi_(wdi)
+    {}
+
+CONSTCD14
+inline
+year_month_weekday::year_month_weekday(const sys_days& dp) NOEXCEPT
+    : year_month_weekday(from_days(dp.time_since_epoch()))
+    {}
+
+CONSTCD14
+inline
+year_month_weekday::year_month_weekday(const local_days& dp) NOEXCEPT
+    : year_month_weekday(from_days(dp.time_since_epoch()))
+    {}
+
+CONSTCD14
+inline
+year_month_weekday&
+year_month_weekday::operator+=(const months& m) NOEXCEPT
+{
+    *this = *this + m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_weekday&
+year_month_weekday::operator-=(const months& m) NOEXCEPT
+{
+    *this = *this - m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_weekday&
+year_month_weekday::operator+=(const years& y) NOEXCEPT
+{
+    *this = *this + y;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_weekday&
+year_month_weekday::operator-=(const years& y) NOEXCEPT
+{
+    *this = *this - y;
+    return *this;
+}
+
+CONSTCD11 inline year year_month_weekday::year() const NOEXCEPT {return y_;}
+CONSTCD11 inline month year_month_weekday::month() const NOEXCEPT {return m_;}
+
+CONSTCD11
+inline
+weekday
+year_month_weekday::weekday() const NOEXCEPT
+{
+    return wdi_.weekday();
+}
+
+CONSTCD11
+inline
+unsigned
+year_month_weekday::index() const NOEXCEPT
+{
+    return wdi_.index();
+}
+
+CONSTCD11
+inline
+weekday_indexed
+year_month_weekday::weekday_indexed() const NOEXCEPT
+{
+    return wdi_;
+}
+
+CONSTCD14
+inline
+year_month_weekday::operator sys_days() const NOEXCEPT
+{
+    return sys_days{to_days()};
+}
+
+CONSTCD14
+inline
+year_month_weekday::operator local_days() const NOEXCEPT
+{
+    return local_days{to_days()};
+}
+
+CONSTCD14
+inline
+bool
+year_month_weekday::ok() const NOEXCEPT
+{
+    if (!y_.ok() || !m_.ok() || !wdi_.weekday().ok() || wdi_.index() < 1)
+        return false;
+    if (wdi_.index() <= 4)
+        return true;
+    auto d2 = wdi_.weekday() - date::weekday(static_cast<sys_days>(y_/m_/1)) + days((wdi_.index()-1)*7 + 1);
+    return static_cast<unsigned>(d2.count()) <= static_cast<unsigned>((y_/m_/last).day());
+}
+
+CONSTCD14
+inline
+year_month_weekday
+year_month_weekday::from_days(days d) NOEXCEPT
+{
+    sys_days dp{d};
+    auto const wd = date::weekday(dp);
+    auto const ymd = year_month_day(dp);
+    return {ymd.year(), ymd.month(), wd[(static_cast<unsigned>(ymd.day())-1)/7+1]};
+}
+
+CONSTCD14
+inline
+days
+year_month_weekday::to_days() const NOEXCEPT
+{
+    auto d = sys_days(y_/m_/1);
+    return (d + (wdi_.weekday() - date::weekday(d) + days{(wdi_.index()-1)*7})
+           ).time_since_epoch();
+}
+
+CONSTCD11
+inline
+bool
+operator==(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT
+{
+    return x.year() == y.year() && x.month() == y.month() &&
+           x.weekday_indexed() == y.weekday_indexed();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday& ymwdi)
+{
+    return os << ymwdi.year() << '/' << ymwdi.month()
+              << '/' << ymwdi.weekday_indexed();
+}
+
+CONSTCD14
+inline
+year_month_weekday
+operator+(const year_month_weekday& ymwd, const months& dm) NOEXCEPT
+{
+    return (ymwd.year() / ymwd.month() + dm) / ymwd.weekday_indexed();
+}
+
+CONSTCD14
+inline
+year_month_weekday
+operator+(const months& dm, const year_month_weekday& ymwd) NOEXCEPT
+{
+    return ymwd + dm;
+}
+
+CONSTCD14
+inline
+year_month_weekday
+operator-(const year_month_weekday& ymwd, const months& dm) NOEXCEPT
+{
+    return ymwd + (-dm);
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator+(const year_month_weekday& ymwd, const years& dy) NOEXCEPT
+{
+    return {ymwd.year()+dy, ymwd.month(), ymwd.weekday_indexed()};
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator+(const years& dy, const year_month_weekday& ymwd) NOEXCEPT
+{
+    return ymwd + dy;
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator-(const year_month_weekday& ymwd, const years& dy) NOEXCEPT
+{
+    return ymwd + (-dy);
+}
+
+// year_month_weekday_last
+
+CONSTCD11
+inline
+year_month_weekday_last::year_month_weekday_last(const date::year& y,
+                                                 const date::month& m,
+                                                 const date::weekday_last& wdl) NOEXCEPT
+    : y_(y)
+    , m_(m)
+    , wdl_(wdl)
+    {}
+
+CONSTCD14
+inline
+year_month_weekday_last&
+year_month_weekday_last::operator+=(const months& m) NOEXCEPT
+{
+    *this = *this + m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_weekday_last&
+year_month_weekday_last::operator-=(const months& m) NOEXCEPT
+{
+    *this = *this - m;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_weekday_last&
+year_month_weekday_last::operator+=(const years& y) NOEXCEPT
+{
+    *this = *this + y;
+    return *this;
+}
+
+CONSTCD14
+inline
+year_month_weekday_last&
+year_month_weekday_last::operator-=(const years& y) NOEXCEPT
+{
+    *this = *this - y;
+    return *this;
+}
+
+CONSTCD11 inline year year_month_weekday_last::year() const NOEXCEPT {return y_;}
+CONSTCD11 inline month year_month_weekday_last::month() const NOEXCEPT {return m_;}
+
+CONSTCD11
+inline
+weekday
+year_month_weekday_last::weekday() const NOEXCEPT
+{
+    return wdl_.weekday();
+}
+
+CONSTCD11
+inline
+weekday_last
+year_month_weekday_last::weekday_last() const NOEXCEPT
+{
+    return wdl_;
+}
+
+CONSTCD14
+inline
+year_month_weekday_last::operator sys_days() const NOEXCEPT
+{
+    return sys_days{to_days()};
+}
+
+CONSTCD14
+inline
+year_month_weekday_last::operator local_days() const NOEXCEPT
+{
+    return local_days{to_days()};
+}
+
+CONSTCD11
+inline
+bool
+year_month_weekday_last::ok() const NOEXCEPT
+{
+    return y_.ok() && m_.ok() && wdl_.ok();
+}
+
+CONSTCD14
+inline
+days
+year_month_weekday_last::to_days() const NOEXCEPT
+{
+    auto const d = sys_days(y_/m_/last);
+    return (d - (date::weekday{d} - wdl_.weekday())).time_since_epoch();
+}
+
+CONSTCD11
+inline
+bool
+operator==(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT
+{
+    return x.year() == y.year() && x.month() == y.month() &&
+           x.weekday_last() == y.weekday_last();
+}
+
+CONSTCD11
+inline
+bool
+operator!=(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT
+{
+    return !(x == y);
+}
+
+template<class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday_last& ymwdl)
+{
+    return os << ymwdl.year() << '/' << ymwdl.month() << '/' << ymwdl.weekday_last();
+}
+
+CONSTCD14
+inline
+year_month_weekday_last
+operator+(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT
+{
+    return (ymwdl.year() / ymwdl.month() + dm) / ymwdl.weekday_last();
+}
+
+CONSTCD14
+inline
+year_month_weekday_last
+operator+(const months& dm, const year_month_weekday_last& ymwdl) NOEXCEPT
+{
+    return ymwdl + dm;
+}
+
+CONSTCD14
+inline
+year_month_weekday_last
+operator-(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT
+{
+    return ymwdl + (-dm);
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator+(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT
+{
+    return {ymwdl.year()+dy, ymwdl.month(), ymwdl.weekday_last()};
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator+(const years& dy, const year_month_weekday_last& ymwdl) NOEXCEPT
+{
+    return ymwdl + dy;
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator-(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT
+{
+    return ymwdl + (-dy);
+}
+
+// year_month from operator/()
+
+CONSTCD11
+inline
+year_month
+operator/(const year& y, const month& m) NOEXCEPT
+{
+    return {y, m};
+}
+
+CONSTCD11
+inline
+year_month
+operator/(const year& y, int   m) NOEXCEPT
+{
+    return y / month(static_cast<unsigned>(m));
+}
+
+// month_day from operator/()
+
+CONSTCD11
+inline
+month_day
+operator/(const month& m, const day& d) NOEXCEPT
+{
+    return {m, d};
+}
+
+CONSTCD11
+inline
+month_day
+operator/(const day& d, const month& m) NOEXCEPT
+{
+    return m / d;
+}
+
+CONSTCD11
+inline
+month_day
+operator/(const month& m, int d) NOEXCEPT
+{
+    return m / day(static_cast<unsigned>(d));
+}
+
+CONSTCD11
+inline
+month_day
+operator/(int m, const day& d) NOEXCEPT
+{
+    return month(static_cast<unsigned>(m)) / d;
+}
+
+CONSTCD11 inline month_day operator/(const day& d, int m) NOEXCEPT {return m / d;}
+
+// month_day_last from operator/()
+
+CONSTCD11
+inline
+month_day_last
+operator/(const month& m, last_spec) NOEXCEPT
+{
+    return month_day_last{m};
+}
+
+CONSTCD11
+inline
+month_day_last
+operator/(last_spec, const month& m) NOEXCEPT
+{
+    return m/last;
+}
+
+CONSTCD11
+inline
+month_day_last
+operator/(int m, last_spec) NOEXCEPT
+{
+    return month(static_cast<unsigned>(m))/last;
+}
+
+CONSTCD11
+inline
+month_day_last
+operator/(last_spec, int m) NOEXCEPT
+{
+    return m/last;
+}
+
+// month_weekday from operator/()
+
+CONSTCD11
+inline
+month_weekday
+operator/(const month& m, const weekday_indexed& wdi) NOEXCEPT
+{
+    return {m, wdi};
+}
+
+CONSTCD11
+inline
+month_weekday
+operator/(const weekday_indexed& wdi, const month& m) NOEXCEPT
+{
+    return m / wdi;
+}
+
+CONSTCD11
+inline
+month_weekday
+operator/(int m, const weekday_indexed& wdi) NOEXCEPT
+{
+    return month(static_cast<unsigned>(m)) / wdi;
+}
+
+CONSTCD11
+inline
+month_weekday
+operator/(const weekday_indexed& wdi, int m) NOEXCEPT
+{
+    return m / wdi;
+}
+
+// month_weekday_last from operator/()
+
+CONSTCD11
+inline
+month_weekday_last
+operator/(const month& m, const weekday_last& wdl) NOEXCEPT
+{
+    return {m, wdl};
+}
+
+CONSTCD11
+inline
+month_weekday_last
+operator/(const weekday_last& wdl, const month& m) NOEXCEPT
+{
+    return m / wdl;
+}
+
+CONSTCD11
+inline
+month_weekday_last
+operator/(int m, const weekday_last& wdl) NOEXCEPT
+{
+    return month(static_cast<unsigned>(m)) / wdl;
+}
+
+CONSTCD11
+inline
+month_weekday_last
+operator/(const weekday_last& wdl, int m) NOEXCEPT
+{
+    return m / wdl;
+}
+
+// year_month_day from operator/()
+
+CONSTCD11
+inline
+year_month_day
+operator/(const year_month& ym, const day& d) NOEXCEPT
+{
+    return {ym.year(), ym.month(), d};
+}
+
+CONSTCD11
+inline
+year_month_day
+operator/(const year_month& ym, int d)  NOEXCEPT
+{
+    return ym / day(static_cast<unsigned>(d));
+}
+
+CONSTCD11
+inline
+year_month_day
+operator/(const year& y, const month_day& md) NOEXCEPT
+{
+    return y / md.month() / md.day();
+}
+
+CONSTCD11
+inline
+year_month_day
+operator/(int y, const month_day& md) NOEXCEPT
+{
+    return year(y) / md;
+}
+
+CONSTCD11
+inline
+year_month_day
+operator/(const month_day& md, const year& y)  NOEXCEPT
+{
+    return y / md;
+}
+
+CONSTCD11
+inline
+year_month_day
+operator/(const month_day& md, int y) NOEXCEPT
+{
+    return year(y) / md;
+}
+
+// year_month_day_last from operator/()
+
+CONSTCD11
+inline
+year_month_day_last
+operator/(const year_month& ym, last_spec) NOEXCEPT
+{
+    return {ym.year(), month_day_last{ym.month()}};
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator/(const year& y, const month_day_last& mdl) NOEXCEPT
+{
+    return {y, mdl};
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator/(int y, const month_day_last& mdl) NOEXCEPT
+{
+    return year(y) / mdl;
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator/(const month_day_last& mdl, const year& y) NOEXCEPT
+{
+    return y / mdl;
+}
+
+CONSTCD11
+inline
+year_month_day_last
+operator/(const month_day_last& mdl, int y) NOEXCEPT
+{
+    return year(y) / mdl;
+}
+
+// year_month_weekday from operator/()
+
+CONSTCD11
+inline
+year_month_weekday
+operator/(const year_month& ym, const weekday_indexed& wdi) NOEXCEPT
+{
+    return {ym.year(), ym.month(), wdi};
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator/(const year& y, const month_weekday& mwd) NOEXCEPT
+{
+    return {y, mwd.month(), mwd.weekday_indexed()};
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator/(int y, const month_weekday& mwd) NOEXCEPT
+{
+    return year(y) / mwd;
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator/(const month_weekday& mwd, const year& y) NOEXCEPT
+{
+    return y / mwd;
+}
+
+CONSTCD11
+inline
+year_month_weekday
+operator/(const month_weekday& mwd, int y) NOEXCEPT
+{
+    return year(y) / mwd;
+}
+
+// year_month_weekday_last from operator/()
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator/(const year_month& ym, const weekday_last& wdl) NOEXCEPT
+{
+    return {ym.year(), ym.month(), wdl};
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator/(const year& y, const month_weekday_last& mwdl) NOEXCEPT
+{
+    return {y, mwdl.month(), mwdl.weekday_last()};
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator/(int y, const month_weekday_last& mwdl) NOEXCEPT
+{
+    return year(y) / mwdl;
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator/(const month_weekday_last& mwdl, const year& y) NOEXCEPT
+{
+    return y / mwdl;
+}
+
+CONSTCD11
+inline
+year_month_weekday_last
+operator/(const month_weekday_last& mwdl, int y) NOEXCEPT
+{
+    return year(y) / mwdl;
+}
+
+template <class Duration>
+struct fields;
+
+template <class CharT, class Traits, class Duration>
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const fields<Duration>& fds, const std::string* abbrev = nullptr,
+          const std::chrono::seconds* offset_sec = nullptr);
+
+template <class CharT, class Traits, class Duration, class Alloc>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+            fields<Duration>& fds, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr);
+
+// time_of_day
+
+enum {am = 1, pm};
+
+namespace detail
+{
+
+// width<n>::value is the number of fractional decimal digits in 1/n
+// width<0>::value and width<1>::value are defined to be 0
+// If 1/n takes more than 18 fractional decimal digits,
+//   the result is truncated to 19.
+// Example:  width<2>::value    ==  1
+// Example:  width<3>::value    == 19
+// Example:  width<4>::value    ==  2
+// Example:  width<10>::value   ==  1
+// Example:  width<1000>::value ==  3
+template <std::uint64_t n, std::uint64_t d = 10, unsigned w = 0,
+          bool should_continue = !(n < 2) && d != 0 && (w < 19)>
+struct width
+{
+    static CONSTDATA unsigned value = 1 + width<n, d%n*10, w+1>::value;
+};
+
+template <std::uint64_t n, std::uint64_t d, unsigned w>
+struct width<n, d, w, false>
+{
+    static CONSTDATA unsigned value = 0;
+};
+
+template <unsigned exp>
+struct static_pow10
+{
+private:
+    static CONSTDATA std::uint64_t h = static_pow10<exp/2>::value;
+public:
+    static CONSTDATA std::uint64_t value = h * h * (exp % 2 ? 10 : 1);
+};
+
+template <>
+struct static_pow10<0>
+{
+    static CONSTDATA std::uint64_t value = 1;
+};
+
+template <class Rep, unsigned w, bool in_range = (w < 19)>
+struct make_precision
+{
+    using type = std::chrono::duration<Rep,
+                                       std::ratio<1, static_pow10<w>::value>>;
+    static CONSTDATA unsigned width = w;
+};
+
+template <class Rep, unsigned w>
+struct make_precision<Rep, w, false>
+{
+    using type = std::chrono::duration<Rep, std::micro>;
+    static CONSTDATA unsigned width = 6;
+};
+
+template <class Duration,
+          unsigned w = width<std::common_type<
+                                 Duration,
+                                 std::chrono::seconds>::type::period::den>::value>
+class decimal_format_seconds
+{
+public:
+    using rep = typename std::common_type<Duration, std::chrono::seconds>::type::rep;
+    using precision = typename make_precision<rep, w>::type;
+    static auto CONSTDATA width = make_precision<rep, w>::width;
+
+private:
+    std::chrono::seconds s_;
+    precision            sub_s_;
+
+public:
+    CONSTCD11 decimal_format_seconds()
+        : s_()
+        , sub_s_()
+        {}
+
+    CONSTCD11 explicit decimal_format_seconds(const Duration& d) NOEXCEPT
+        : s_(std::chrono::duration_cast<std::chrono::seconds>(d))
+        , sub_s_(std::chrono::duration_cast<precision>(d - s_))
+        {}
+
+    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_;}
+    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_;}
+    CONSTCD11 precision subseconds() const NOEXCEPT {return sub_s_;}
+
+    CONSTCD14 precision to_duration() const NOEXCEPT
+    {
+        return s_ + sub_s_;
+    }
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        using namespace std::chrono;
+        return sub_s_ < std::chrono::seconds{1} && s_ < minutes{1};
+    }
+
+    template <class CharT, class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const decimal_format_seconds& x)
+    {
+        date::detail::save_stream<CharT, Traits> _(os);
+        os.fill('0');
+        os.flags(std::ios::dec | std::ios::right);
+        os.width(2);
+        os << x.s_.count() <<
+              std::use_facet<std::numpunct<char>>(os.getloc()).decimal_point();
+        os.width(width);
+        os << static_cast<std::int64_t>(x.sub_s_.count());
+        return os;
+    }
+};
+
+template <class Duration>
+class decimal_format_seconds<Duration, 0>
+{
+    static CONSTDATA unsigned w = 0;
+public:
+    using rep = typename std::common_type<Duration, std::chrono::seconds>::type::rep;
+    using precision = std::chrono::duration<rep>;
+    static auto CONSTDATA width = make_precision<rep, w>::width;
+private:
+
+    std::chrono::seconds s_;
+
+public:
+    CONSTCD11 decimal_format_seconds() : s_() {}
+    CONSTCD11 explicit decimal_format_seconds(const precision& s) NOEXCEPT
+        : s_(s)
+        {}
+
+    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_;}
+    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_;}
+    CONSTCD14 precision to_duration() const NOEXCEPT {return s_;}
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        using namespace std::chrono;
+        return s_ < minutes{1};
+    }
+
+    template <class CharT, class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const decimal_format_seconds& x)
+    {
+        date::detail::save_stream<CharT, Traits> _(os);
+        os.fill('0');
+        os.flags(std::ios::dec | std::ios::right);
+        os.width(2);
+        os << x.s_.count();
+        return os;
+    }
+};
+
+enum class classify
+{
+    not_valid,
+    hour,
+    minute,
+    second,
+    subsecond
+};
+
+template <class Duration>
+struct classify_duration
+{
+    static CONSTDATA classify value =
+        std::is_convertible<Duration, std::chrono::hours>::value
+                ? classify::hour :
+        std::is_convertible<Duration, std::chrono::minutes>::value
+                ? classify::minute :
+        std::is_convertible<Duration, std::chrono::seconds>::value
+                ? classify::second :
+        std::chrono::treat_as_floating_point<typename Duration::rep>::value
+                ? classify::not_valid :
+                classify::subsecond;
+};
+
+template <class Rep, class Period>
+inline
+CONSTCD11
+typename std::enable_if
+         <
+            std::numeric_limits<Rep>::is_signed,
+            std::chrono::duration<Rep, Period>
+         >::type
+abs(std::chrono::duration<Rep, Period> d)
+{
+    return d >= d.zero() ? d : -d;
+}
+
+template <class Rep, class Period>
+inline
+CONSTCD11
+typename std::enable_if
+         <
+            !std::numeric_limits<Rep>::is_signed,
+            std::chrono::duration<Rep, Period>
+         >::type
+abs(std::chrono::duration<Rep, Period> d)
+{
+    return d;
+}
+
+class time_of_day_base
+{
+protected:
+    std::chrono::hours   h_;
+    unsigned char mode_;
+    bool          neg_;
+
+    enum {is24hr};
+
+    CONSTCD11 time_of_day_base() NOEXCEPT
+        : h_(0)
+        , mode_(static_cast<decltype(mode_)>(is24hr))
+        , neg_(false)
+        {}
+
+
+    CONSTCD11 time_of_day_base(std::chrono::hours h, bool neg, unsigned m) NOEXCEPT
+        : h_(detail::abs(h))
+        , mode_(static_cast<decltype(mode_)>(m))
+        , neg_(neg)
+        {}
+
+    CONSTCD14 void make24() NOEXCEPT;
+    CONSTCD14 void make12() NOEXCEPT;
+
+    CONSTCD14 std::chrono::hours to24hr() const;
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        return !neg_ && h_ < days{1};
+    }
+};
+
+CONSTCD14
+inline
+std::chrono::hours
+time_of_day_base::to24hr() const
+{
+    auto h = h_;
+    if (mode_ == am || mode_ == pm)
+    {
+        CONSTDATA auto h12 = std::chrono::hours(12);
+        if (mode_ == pm)
+        {
+            if (h != h12)
+                h = h + h12;
+        }
+        else if (h == h12)
+            h = std::chrono::hours(0);
+    }
+    return h;
+}
+
+CONSTCD14
+inline
+void
+time_of_day_base::make24() NOEXCEPT
+{
+    h_ = to24hr();
+    mode_ = is24hr;
+}
+
+CONSTCD14
+inline
+void
+time_of_day_base::make12() NOEXCEPT
+{
+    if (mode_ == is24hr)
+    {
+        CONSTDATA auto h12 = std::chrono::hours(12);
+        if (h_ >= h12)
+        {
+            if (h_ > h12)
+                h_ = h_ - h12;
+            mode_ = pm;
+        }
+        else
+        {
+            if (h_ == std::chrono::hours(0))
+                h_ = h12;
+            mode_ = am;
+        }
+    }
+}
+
+template <class Duration, detail::classify = detail::classify_duration<Duration>::value>
+class time_of_day_storage;
+
+template <class Rep, class Period>
+class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::hour>
+    : private detail::time_of_day_base
+{
+    using base = detail::time_of_day_base;
+
+public:
+    using precision = std::chrono::hours;
+
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+    CONSTCD11 time_of_day_storage() NOEXCEPT = default;
+#else
+    CONSTCD11 time_of_day_storage() = default;
+#endif /* !defined(_MSC_VER) || _MSC_VER >= 1900 */
+
+    CONSTCD11 explicit time_of_day_storage(std::chrono::hours since_midnight) NOEXCEPT
+        : base(since_midnight, since_midnight < std::chrono::hours{0}, is24hr)
+        {}
+
+    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, unsigned md) NOEXCEPT
+        : base(h, h < std::chrono::hours{0}, md)
+        {}
+
+    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
+    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
+
+    CONSTCD14 explicit operator precision() const NOEXCEPT
+    {
+        auto p = to24hr();
+        if (neg_)
+            p = -p;
+        return p;
+    }
+
+    CONSTCD14 precision to_duration() const NOEXCEPT
+    {
+        return static_cast<precision>(*this);
+    }
+
+    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
+    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        return base::in_conventional_range();
+    }
+
+    template<class CharT, class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
+    {
+        using namespace std;
+        detail::save_stream<CharT, Traits> _(os);
+        if (t.neg_)
+            os << '-';
+        os.fill('0');
+        os.flags(std::ios::dec | std::ios::right);
+        if (t.mode_ != am && t.mode_ != pm)
+            os.width(2);
+        os << t.h_.count();
+        switch (t.mode_)
+        {
+        case time_of_day_storage::is24hr:
+            os << "00";
+            break;
+        case am:
+            os << "am";
+            break;
+        case pm:
+            os << "pm";
+            break;
+        }
+        return os;
+    }
+};
+
+template <class Rep, class Period>
+class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::minute>
+    : private detail::time_of_day_base
+{
+    using base = detail::time_of_day_base;
+
+    std::chrono::minutes m_;
+
+public:
+   using precision = std::chrono::minutes;
+
+   CONSTCD11 time_of_day_storage() NOEXCEPT
+        : base()
+        , m_(0)
+        {}
+
+   CONSTCD11 explicit time_of_day_storage(std::chrono::minutes since_midnight) NOEXCEPT
+        : base(std::chrono::duration_cast<std::chrono::hours>(since_midnight),
+               since_midnight < std::chrono::minutes{0}, is24hr)
+        , m_(detail::abs(since_midnight) - h_)
+        {}
+
+    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, std::chrono::minutes m,
+                                           unsigned md) NOEXCEPT
+        : base(h, false, md)
+        , m_(m)
+        {}
+
+    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
+    CONSTCD11 std::chrono::minutes minutes() const NOEXCEPT {return m_;}
+    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
+
+    CONSTCD14 explicit operator precision() const NOEXCEPT
+    {
+        auto p = to24hr() + m_;
+        if (neg_)
+            p = -p;
+        return p;
+    }
+
+    CONSTCD14 precision to_duration() const NOEXCEPT
+    {
+        return static_cast<precision>(*this);
+    }
+
+    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
+    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        return base::in_conventional_range() && m_ < std::chrono::hours{1};
+    }
+
+    template<class CharT, class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
+    {
+        using namespace std;
+        detail::save_stream<CharT, Traits> _(os);
+        if (t.neg_)
+            os << '-';
+        os.fill('0');
+        os.flags(std::ios::dec | std::ios::right);
+        if (t.mode_ != am && t.mode_ != pm)
+            os.width(2);
+        os << t.h_.count() << ':';
+        os.width(2);
+        os << t.m_.count();
+        switch (t.mode_)
+        {
+        case am:
+            os << "am";
+            break;
+        case pm:
+            os << "pm";
+            break;
+        }
+        return os;
+    }
+};
+
+template <class Rep, class Period>
+class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::second>
+    : private detail::time_of_day_base
+{
+    using base = detail::time_of_day_base;
+    using dfs = decimal_format_seconds<std::chrono::seconds>;
+
+    std::chrono::minutes m_;
+    dfs                  s_;
+
+public:
+    using precision = std::chrono::seconds;
+
+    CONSTCD11 time_of_day_storage() NOEXCEPT
+        : base()
+        , m_(0)
+        , s_()
+        {}
+
+    CONSTCD11 explicit time_of_day_storage(std::chrono::seconds since_midnight) NOEXCEPT
+        : base(std::chrono::duration_cast<std::chrono::hours>(since_midnight),
+               since_midnight < std::chrono::seconds{0}, is24hr)
+        , m_(std::chrono::duration_cast<std::chrono::minutes>(detail::abs(since_midnight) - h_))
+        , s_(detail::abs(since_midnight) - h_ - m_)
+        {}
+
+    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, std::chrono::minutes m,
+                                           std::chrono::seconds s, unsigned md) NOEXCEPT
+        : base(h, false, md)
+        , m_(m)
+        , s_(s)
+        {}
+
+    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
+    CONSTCD11 std::chrono::minutes minutes() const NOEXCEPT {return m_;}
+    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_.seconds();}
+    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_.seconds();}
+    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
+
+    CONSTCD14 explicit operator precision() const NOEXCEPT
+    {
+        auto p = to24hr() + s_.to_duration() + m_;
+        if (neg_)
+            p = -p;
+        return p;
+    }
+
+    CONSTCD14 precision to_duration() const NOEXCEPT
+    {
+        return static_cast<precision>(*this);
+    }
+
+    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
+    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        return base::in_conventional_range() && m_ < std::chrono::hours{1} &&
+                                                s_.in_conventional_range();
+    }
+
+    template<class CharT, class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
+    {
+        using namespace std;
+        detail::save_stream<CharT, Traits> _(os);
+        if (t.neg_)
+            os << '-';
+        os.fill('0');
+        os.flags(std::ios::dec | std::ios::right);
+        if (t.mode_ != am && t.mode_ != pm)
+            os.width(2);
+        os << t.h_.count() << ':';
+        os.width(2);
+        os << t.m_.count() << ':' << t.s_;
+        switch (t.mode_)
+        {
+        case am:
+            os << "am";
+            break;
+        case pm:
+            os << "pm";
+            break;
+        }
+        return os;
+    }
+
+    template <class CharT, class Traits, class Duration>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    date::to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const fields<Duration>& fds, const std::string* abbrev,
+          const std::chrono::seconds* offset_sec);
+
+    template <class CharT, class Traits, class Duration, class Alloc>
+    friend
+    std::basic_istream<CharT, Traits>&
+    date::from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+          fields<Duration>& fds,
+          std::basic_string<CharT, Traits, Alloc>* abbrev, std::chrono::minutes* offset);
+};
+
+template <class Rep, class Period>
+class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::subsecond>
+    : private detail::time_of_day_base
+{
+public:
+    using Duration = std::chrono::duration<Rep, Period>;
+    using dfs = decimal_format_seconds<typename std::common_type<Duration,
+                                       std::chrono::seconds>::type>;
+    using precision = typename dfs::precision;
+
+private:
+    using base = detail::time_of_day_base;
+
+    std::chrono::minutes m_;
+    dfs                  s_;
+
+public:
+    CONSTCD11 time_of_day_storage() NOEXCEPT
+        : base()
+        , m_(0)
+        , s_()
+        {}
+
+    CONSTCD11 explicit time_of_day_storage(Duration since_midnight) NOEXCEPT
+        : base(date::trunc<std::chrono::hours>(since_midnight),
+               since_midnight < Duration{0}, is24hr)
+        , m_(date::trunc<std::chrono::minutes>(detail::abs(since_midnight) - h_))
+        , s_(detail::abs(since_midnight) - h_ - m_)
+        {}
+
+    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, std::chrono::minutes m,
+                                           std::chrono::seconds s, precision sub_s,
+                                           unsigned md) NOEXCEPT
+        : base(h, false, md)
+        , m_(m)
+        , s_(s + sub_s)
+        {}
+
+    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
+    CONSTCD11 std::chrono::minutes minutes() const NOEXCEPT {return m_;}
+    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_.seconds();}
+    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_.seconds();}
+    CONSTCD11 precision subseconds() const NOEXCEPT {return s_.subseconds();}
+    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
+
+    CONSTCD14 explicit operator precision() const NOEXCEPT
+    {
+        auto p = to24hr() + s_.to_duration() + m_;
+        if (neg_)
+            p = -p;
+        return p;
+    }
+
+    CONSTCD14 precision to_duration() const NOEXCEPT
+    {
+        return static_cast<precision>(*this);
+    }
+
+    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
+    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
+
+    CONSTCD11 bool in_conventional_range() const NOEXCEPT
+    {
+        return base::in_conventional_range() && m_ < std::chrono::hours{1} &&
+                                                s_.in_conventional_range();
+    }
+
+    template<class CharT, class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
+    {
+        using namespace std;
+        detail::save_stream<CharT, Traits> _(os);
+        if (t.neg_)
+            os << '-';
+        os.fill('0');
+        os.flags(std::ios::dec | std::ios::right);
+        if (t.mode_ != am && t.mode_ != pm)
+            os.width(2);
+        os << t.h_.count() << ':';
+        os.width(2);
+        os << t.m_.count() << ':' << t.s_;
+        switch (t.mode_)
+        {
+        case am:
+            os << "am";
+            break;
+        case pm:
+            os << "pm";
+            break;
+        }
+        return os;
+    }
+
+    template <class CharT, class Traits, class Duration>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    date::to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const fields<Duration>& fds, const std::string* abbrev,
+          const std::chrono::seconds* offset_sec);
+
+    template <class CharT, class Traits, class Duration, class Alloc>
+    friend
+    std::basic_istream<CharT, Traits>&
+    date::from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+          fields<Duration>& fds,
+          std::basic_string<CharT, Traits, Alloc>* abbrev, std::chrono::minutes* offset);
+};
+
+}  // namespace detail
+
+template <class Duration>
+class time_of_day
+    : public detail::time_of_day_storage<Duration>
+{
+    using base = detail::time_of_day_storage<Duration>;
+public:
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+    CONSTCD11 time_of_day() NOEXCEPT = default;
+#else
+    CONSTCD11 time_of_day() = default;
+#endif /* !defined(_MSC_VER) || _MSC_VER >= 1900 */
+
+    CONSTCD11 explicit time_of_day(Duration since_midnight) NOEXCEPT
+        : base(since_midnight)
+        {}
+
+    template <class Arg0, class Arg1, class ...Args>
+    CONSTCD11
+    explicit time_of_day(Arg0&& arg0, Arg1&& arg1, Args&& ...args) NOEXCEPT
+        : base(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...)
+        {}
+};
+
+template <class Rep, class Period,
+          class = typename std::enable_if
+              <!std::chrono::treat_as_floating_point<Rep>::value>::type>
+CONSTCD11
+inline
+time_of_day<std::chrono::duration<Rep, Period>>
+make_time(const std::chrono::duration<Rep, Period>& d)
+{
+    return time_of_day<std::chrono::duration<Rep, Period>>(d);
+}
+
+CONSTCD11
+inline
+time_of_day<std::chrono::hours>
+make_time(const std::chrono::hours& h, unsigned md)
+{
+    return time_of_day<std::chrono::hours>(h, md);
+}
+
+CONSTCD11
+inline
+time_of_day<std::chrono::minutes>
+make_time(const std::chrono::hours& h, const std::chrono::minutes& m,
+          unsigned md)
+{
+    return time_of_day<std::chrono::minutes>(h, m, md);
+}
+
+CONSTCD11
+inline
+time_of_day<std::chrono::seconds>
+make_time(const std::chrono::hours& h, const std::chrono::minutes& m,
+          const std::chrono::seconds& s, unsigned md)
+{
+    return time_of_day<std::chrono::seconds>(h, m, s, md);
+}
+
+template <class Rep, class Period,
+          class = typename std::enable_if<std::ratio_less<Period,
+                                                          std::ratio<1>>::value>::type>
+CONSTCD11
+inline
+time_of_day<std::chrono::duration<Rep, Period>>
+make_time(const std::chrono::hours& h, const std::chrono::minutes& m,
+          const std::chrono::seconds& s, const std::chrono::duration<Rep, Period>& sub_s,
+          unsigned md)
+{
+    return time_of_day<std::chrono::duration<Rep, Period>>(h, m, s, sub_s, md);
+}
+
+template <class CharT, class Traits, class Duration>
+inline
+typename std::enable_if
+<
+    !std::chrono::treat_as_floating_point<typename Duration::rep>::value &&
+        std::ratio_less<typename Duration::period, days::period>::value
+    , std::basic_ostream<CharT, Traits>&
+>::type
+operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
+{
+    auto const dp = date::floor<days>(tp);
+    return os << year_month_day(dp) << ' ' << make_time(tp-dp);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const sys_days& dp)
+{
+    return os << year_month_day(dp);
+}
+
+template <class CharT, class Traits, class Duration>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
+{
+    return (os << sys_time<Duration>{ut.time_since_epoch()});
+}
+
+// to_stream
+
+template <class Duration>
+struct fields
+{
+    year_month_day        ymd{year{0}/0/0};
+    weekday               wd{7u};
+    time_of_day<Duration> tod{};
+
+    fields() = default;
+
+    fields(year_month_day ymd_) : ymd(ymd_) {}
+    fields(weekday wd_) : wd(wd_) {}
+    fields(time_of_day<Duration> tod_) : tod(tod_) {}
+
+    fields(year_month_day ymd_, weekday wd_) : ymd(ymd_), wd(wd_) {}
+    fields(year_month_day ymd_, time_of_day<Duration> tod_) : ymd(ymd_), tod(tod_) {}
+
+    fields(weekday wd_, time_of_day<Duration> tod_) : wd(wd_), tod(tod_) {}
+
+    fields(year_month_day ymd_, weekday wd_, time_of_day<Duration> tod_)
+        : ymd(ymd_)
+        , wd(wd_)
+        , tod(tod_)
+        {}
+};
+
+namespace detail
+{
+
+template <class CharT, class Traits, class Duration>
+unsigned
+extract_weekday(std::basic_ostream<CharT, Traits>& os, const fields<Duration>& fds)
+{
+    if (!fds.ymd.ok() && !fds.wd.ok())
+    {
+        // fds does not contain a valid weekday
+        os.setstate(std::ios::failbit);
+        return 7;
+    }
+    unsigned wd;
+    if (fds.ymd.ok())
+    {
+        wd = static_cast<unsigned>(weekday{fds.ymd});
+        if (fds.wd.ok() && wd != static_cast<unsigned>(fds.wd))
+        {
+            // fds.ymd and fds.wd are inconsistent
+            os.setstate(std::ios::failbit);
+            return 7;
+        }
+    }
+    else
+        wd = static_cast<unsigned>(fds.wd);
+    return wd;
+}
+
+template <class CharT, class Traits, class Duration>
+unsigned
+extract_month(std::basic_ostream<CharT, Traits>& os, const fields<Duration>& fds)
+{
+    if (!fds.ymd.month().ok())
+    {
+        // fds does not contain a valid month
+        os.setstate(std::ios::failbit);
+        return 0;
+    }
+    return static_cast<unsigned>(fds.ymd.month());
+}
+
+}  // namespace detail
+
+#if ONLY_C_LOCALE
+
+namespace detail
+{
+
+inline
+std::pair<const std::string*, const std::string*>
+weekday_names()
+{
+    using namespace std;
+    static const string nm[] =
+    {
+        "Sunday",
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+        "Sun",
+        "Mon",
+        "Tue",
+        "Wed",
+        "Thu",
+        "Fri",
+        "Sat"
+    };
+    return make_pair(nm, nm+sizeof(nm)/sizeof(nm[0]));
+}
+
+inline
+std::pair<const std::string*, const std::string*>
+month_names()
+{
+    using namespace std;
+    static const string nm[] =
+    {
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December",
+        "Jan",
+        "Feb",
+        "Mar",
+        "Apr",
+        "May",
+        "Jun",
+        "Jul",
+        "Aug",
+        "Sep",
+        "Oct",
+        "Nov",
+        "Dec"
+    };
+    return make_pair(nm, nm+sizeof(nm)/sizeof(nm[0]));
+}
+
+inline
+std::pair<const std::string*, const std::string*>
+ampm_names()
+{
+    using namespace std;
+    static const string nm[] =
+    {
+        "AM",
+        "PM"
+    };
+    return make_pair(nm, nm+sizeof(nm)/sizeof(nm[0]));
+}
+
+template <class CharT, class Traits, class FwdIter>
+FwdIter
+scan_keyword(std::basic_istream<CharT, Traits>& is, FwdIter kb, FwdIter ke)
+{
+    using namespace std;
+    size_t nkw = static_cast<size_t>(std::distance(kb, ke));
+    const unsigned char doesnt_match = '\0';
+    const unsigned char might_match = '\1';
+    const unsigned char does_match = '\2';
+    unsigned char statbuf[100];
+    unsigned char* status = statbuf;
+    unique_ptr<unsigned char, void(*)(void*)> stat_hold(0, free);
+    if (nkw > sizeof(statbuf))
+    {
+        status = (unsigned char*)malloc(nkw);
+        if (status == nullptr)
+            throw bad_alloc();
+        stat_hold.reset(status);
+    }
+    size_t n_might_match = nkw;  // At this point, any keyword might match
+    size_t n_does_match = 0;     // but none of them definitely do
+    // Initialize all statuses to might_match, except for "" keywords are does_match
+    unsigned char* st = status;
+    for (auto ky = kb; ky != ke; ++ky, ++st)
+    {
+        if (!ky->empty())
+            *st = might_match;
+        else
+        {
+            *st = does_match;
+            --n_might_match;
+            ++n_does_match;
+        }
+    }
+    // While there might be a match, test keywords against the next CharT
+    for (size_t indx = 0; is && n_might_match > 0; ++indx)
+    {
+        // Peek at the next CharT but don't consume it
+        auto ic = is.peek();
+        if (ic == EOF)
+        {
+            is.setstate(ios::eofbit);
+            break;
+        }
+        auto c = static_cast<char>(toupper(ic));
+        bool consume = false;
+        // For each keyword which might match, see if the indx character is c
+        // If a match if found, consume c
+        // If a match is found, and that is the last character in the keyword,
+        //    then that keyword matches.
+        // If the keyword doesn't match this character, then change the keyword
+        //    to doesn't match
+        st = status;
+        for (auto ky = kb; ky != ke; ++ky, ++st)
+        {
+            if (*st == might_match)
+            {
+                if (c == static_cast<char>(toupper((*ky)[indx])))
+                {
+                    consume = true;
+                    if (ky->size() == indx+1)
+                    {
+                        *st = does_match;
+                        --n_might_match;
+                        ++n_does_match;
+                    }
+                }
+                else
+                {
+                    *st = doesnt_match;
+                    --n_might_match;
+                }
+            }
+        }
+        // consume if we matched a character
+        if (consume)
+        {
+            (void)is.get();
+            // If we consumed a character and there might be a matched keyword that
+            //   was marked matched on a previous iteration, then such keywords
+            //   are now marked as not matching.
+            if (n_might_match + n_does_match > 1)
+            {
+                st = status;
+                for (auto ky = kb; ky != ke; ++ky, ++st)
+                {
+                    if (*st == does_match && ky->size() != indx+1)
+                    {
+                        *st = doesnt_match;
+                        --n_does_match;
+                    }
+                }
+            }
+        }
+    }
+    // We've exited the loop because we hit eof and/or we have no more "might matches".
+    // Return the first matching result
+    for (st = status; kb != ke; ++kb, ++st)
+        if (*st == does_match)
+            break;
+    if (kb == ke)
+        is.setstate(ios_base::failbit);
+    return kb;
+}
+
+}  // namespace detail
+
+#endif  // ONLY_C_LOCALE
+
+template <class CharT, class Traits, class Duration>
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const fields<Duration>& fds, const std::string* abbrev,
+          const std::chrono::seconds* offset_sec)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using namespace detail;
+    tm tm{};
+#if !ONLY_C_LOCALE
+    auto& facet = use_facet<time_put<CharT>>(os.getloc());
+#endif
+    const CharT* command = nullptr;
+    CharT modified = CharT{};
+    for (; *fmt; ++fmt)
+    {
+        switch (*fmt)
+        {
+        case 'a':
+        case 'A':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
+                    if (os.fail())
+                        return os;
+#if !ONLY_C_LOCALE
+                    const CharT f[] = {'%', *fmt};
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+#else  // ONLY_C_LOCALE
+                    os << weekday_names().first[tm.tm_wday+7*(*fmt == 'a')];
+#endif  // ONLY_C_LOCALE
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'b':
+        case 'B':
+        case 'h':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    tm.tm_mon = static_cast<int>(extract_month(os, fds)) - 1;
+#if !ONLY_C_LOCALE
+                    const CharT f[] = {'%', *fmt};
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+#else  // ONLY_C_LOCALE
+                    os << month_names().first[tm.tm_mon+12*(*fmt == 'b')];
+#endif  // ONLY_C_LOCALE
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'c':
+        case 'x':
+            if (command)
+            {
+                if (modified == CharT{'O'})
+                    os << CharT{'%'} << modified << *fmt;
+                else
+                {
+#if !ONLY_C_LOCALE
+                    tm = std::tm{};
+                    auto const& ymd = fds.ymd;
+                    auto ld = local_days(ymd);
+                    tm.tm_sec = static_cast<int>(fds.tod.seconds().count());
+                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
+                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
+                    tm.tm_mday = static_cast<int>(static_cast<unsigned>(ymd.day()));
+                    tm.tm_mon = static_cast<int>(extract_month(os, fds) - 1);
+                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
+                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
+                    if (os.fail())
+                        return os;
+                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
+                    CharT f[3] = {'%'};
+                    auto fe = begin(f) + 1;
+                    if (modified == CharT{'E'})
+                        *fe++ = modified;
+                    *fe++ = *fmt;
+                    facet.put(os, os, os.fill(), &tm, begin(f), fe);
+#else  // ONLY_C_LOCALE
+                    if (*fmt == 'c')
+                    {
+                        auto wd = static_cast<int>(extract_weekday(os, fds));
+                        os << weekday_names().first[static_cast<unsigned>(wd)+7]
+                           << ' ';
+                        os << month_names().first[extract_month(os, fds)-1+12] << ' ';
+                        auto d = static_cast<int>(static_cast<unsigned>(fds.ymd.day()));
+                        if (d < 10)
+                            os << ' ';
+                        os << d << ' '
+                           << make_time(duration_cast<seconds>(fds.tod.to_duration()))
+                           << ' ' << fds.ymd.year();
+
+                    }
+                    else  // *fmt == 'x'
+                    {
+                        auto const& ymd = fds.ymd;
+                        save_stream<CharT, Traits> _(os);
+                        os.fill('0');
+                        os.flags(std::ios::dec | std::ios::right);
+                        os.width(2);
+                        os << static_cast<unsigned>(ymd.month()) << CharT{'/'};
+                        os.width(2);
+                        os << static_cast<unsigned>(ymd.day()) << CharT{'/'};
+                        os.width(2);
+                        os << static_cast<int>(ymd.year()) % 100;
+                    }
+#endif  // ONLY_C_LOCALE
+                }
+                command = nullptr;
+                modified = CharT{};
+            }
+            else
+                os << *fmt;
+            break;
+        case 'C':
+            if (command)
+            {
+                auto y = static_cast<int>(fds.ymd.year());
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    save_stream<CharT, Traits> _(os);
+                    os.fill('0');
+                    os.flags(std::ios::dec | std::ios::right);
+                    if (y >= 0)
+                    {
+                        os.width(2);
+                        os << y/100;
+                    }
+                    else
+                    {
+                        os << CharT{'-'};
+                        os.width(2);
+                        os << -(y-99)/100;
+                    }
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'E'})
+                {
+                    tm.tm_year = y - 1900;
+                    CharT f[3] = {'%', 'E', 'C'};
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                command = nullptr;
+                modified = CharT{};
+            }
+            else
+                os << *fmt;
+            break;
+        case 'd':
+        case 'e':
+            if (command)
+            {
+                auto d = static_cast<int>(static_cast<unsigned>(fds.ymd.day()));
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    save_stream<CharT, Traits> _(os);
+                    if (*fmt == CharT{'d'})
+                        os.fill('0');
+                    os.flags(std::ios::dec | std::ios::right);
+                    os.width(2);
+                    os << d;
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    tm.tm_mday = d;
+                    CharT f[3] = {'%', 'O', *fmt};
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                command = nullptr;
+                modified = CharT{};
+            }
+            else
+                os << *fmt;
+            break;
+        case 'D':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    auto const& ymd = fds.ymd;
+                    save_stream<CharT, Traits> _(os);
+                    os.fill('0');
+                    os.flags(std::ios::dec | std::ios::right);
+                    os.width(2);
+                    os << static_cast<unsigned>(ymd.month()) << CharT{'/'};
+                    os.width(2);
+                    os << static_cast<unsigned>(ymd.day()) << CharT{'/'};
+                    os.width(2);
+                    os << static_cast<int>(ymd.year()) % 100;
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'F':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    auto const& ymd = fds.ymd;
+                    save_stream<CharT, Traits> _(os);
+                    os.fill('0');
+                    os.flags(std::ios::dec | std::ios::right);
+                    os.width(4);
+                    os << static_cast<int>(ymd.year()) << CharT{'-'};
+                    os.width(2);
+                    os << static_cast<unsigned>(ymd.month()) << CharT{'-'};
+                    os.width(2);
+                    os << static_cast<unsigned>(ymd.day());
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'g':
+        case 'G':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    auto ld = local_days(fds.ymd);
+                    auto y = year_month_day{ld + days{3}}.year();
+                    auto start = local_days((y - years{1})/date::dec/thu[last]) + (mon-thu);
+                    if (ld < start)
+                        --y;
+                    if (*fmt == CharT{'G'})
+                        os << y;
+                    else
+                    {
+                        save_stream<CharT, Traits> _(os);
+                        os.fill('0');
+                        os.flags(std::ios::dec | std::ios::right);
+                        os.width(2);
+                        os << std::abs(static_cast<int>(y)) % 100;
+                    }
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'H':
+        case 'I':
+            if (command)
+            {
+                auto hms = fds.tod;
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    if (*fmt == CharT{'I'})
+                        hms.make12();
+                    if (hms.hours() < hours{10})
+                        os << CharT{'0'};
+                    os << hms.hours().count();
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_hour = static_cast<int>(hms.hours().count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'j':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    auto ld = local_days(fds.ymd);
+                    auto y = fds.ymd.year();
+                    auto doy = ld - local_days(y/jan/1) + days{1};
+                    save_stream<CharT, Traits> _(os);
+                    os.fill('0');
+                    os.flags(std::ios::dec | std::ios::right);
+                    os.width(3);
+                    os << doy.count();
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'm':
+            if (command)
+            {
+                auto m = static_cast<unsigned>(fds.ymd.month());
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    if (m < 10)
+                        os << CharT{'0'};
+                    os << m;
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_mon = static_cast<int>(m-1);
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'M':
+            if (command)
+            {
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    if (fds.tod.minutes() < minutes{10})
+                        os << CharT{'0'};
+                    os << fds.tod.minutes().count();
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'n':
+            if (command)
+            {
+                if (modified == CharT{})
+                    os << CharT{'\n'};
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'p':
+            if (command)
+            {
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+                    const CharT f[] = {'%', *fmt};
+                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#else
+                if (fds.tod.hours() < hours{12})
+                    os << ampm_names().first[0];
+                else
+                    os << ampm_names().first[1];
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'r':
+            if (command)
+            {
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+                    const CharT f[] = {'%', *fmt};
+                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
+                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
+                    tm.tm_sec = static_cast<int>(fds.tod.seconds().count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#else
+                time_of_day<seconds> tod(duration_cast<seconds>(fds.tod.to_duration()));
+                tod.make12();
+                save_stream<CharT, Traits> _(os);
+                os.fill('0');
+                os.width(2);
+                os << tod.hours().count() << CharT{':'};
+                os.width(2);
+                os << tod.minutes().count() << CharT{':'};
+                os.width(2);
+                os << tod.seconds().count() << CharT{' '};
+                tod.make24();
+                if (tod.hours() < hours{12})
+                    os << ampm_names().first[0];
+                else
+                    os << ampm_names().first[1];
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'R':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    if (fds.tod.hours() < hours{10})
+                        os << CharT{'0'};
+                    os << fds.tod.hours().count() << CharT{':'};
+                    if (fds.tod.minutes() < minutes{10})
+                        os << CharT{'0'};
+                    os << fds.tod.minutes().count();
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'S':
+            if (command)
+            {
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    os << fds.tod.s_;
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_sec = static_cast<int>(fds.tod.s_.seconds().count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 't':
+            if (command)
+            {
+                if (modified == CharT{})
+                    os << CharT{'\t'};
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'T':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    os << fds.tod;
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'u':
+            if (command)
+            {
+                auto wd = extract_weekday(os, fds);
+                if (os.fail())
+                    return os;
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    os << (wd != 0 ? wd : 7u);
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_wday = static_cast<int>(wd);
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'U':
+            if (command)
+            {
+                auto const& ymd = fds.ymd;
+                auto ld = local_days(ymd);
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    auto st = local_days(sun[1]/jan/ymd.year());
+                    if (ld < st)
+                        os << CharT{'0'} << CharT{'0'};
+                    else
+                    {
+                        auto wn = duration_cast<weeks>(ld - st).count() + 1;
+                        if (wn < 10)
+                            os << CharT{'0'};
+                        os << wn;
+                    }
+ #if !ONLY_C_LOCALE
+               }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
+                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
+                    if (os.fail())
+                        return os;
+                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'V':
+            if (command)
+            {
+                auto ld = local_days(fds.ymd);
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    auto y = year_month_day{ld + days{3}}.year();
+                    auto st = local_days((y - years{1})/12/thu[last]) + (mon-thu);
+                    if (ld < st)
+                    {
+                        --y;
+                        st = local_days((y - years{1})/12/thu[last]) + (mon-thu);
+                    }
+                    auto wn = duration_cast<weeks>(ld - st).count() + 1;
+                    if (wn < 10)
+                        os << CharT{'0'};
+                    os << wn;
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    auto const& ymd = fds.ymd;
+                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
+                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
+                    if (os.fail())
+                        return os;
+                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'w':
+            if (command)
+            {
+                auto wd = extract_weekday(os, fds);
+                if (os.fail())
+                    return os;
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    os << wd;
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_wday = static_cast<int>(wd);
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'W':
+            if (command)
+            {
+                auto const& ymd = fds.ymd;
+                auto ld = local_days(ymd);
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    auto st = local_days(mon[1]/jan/ymd.year());
+                    if (ld < st)
+                        os << CharT{'0'} << CharT{'0'};
+                    else
+                    {
+                        auto wn = duration_cast<weeks>(ld - st).count() + 1;
+                        if (wn < 10)
+                            os << CharT{'0'};
+                        os << wn;
+                    }
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'O'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
+                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
+                    if (os.fail())
+                        return os;
+                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'X':
+            if (command)
+            {
+#if !ONLY_C_LOCALE
+                if (modified == CharT{'O'})
+                    os << CharT{'%'} << modified << *fmt;
+                else
+                {
+                    tm = std::tm{};
+                    tm.tm_sec = static_cast<int>(fds.tod.seconds().count());
+                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
+                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
+                    CharT f[3] = {'%'};
+                    auto fe = begin(f) + 1;
+                    if (modified == CharT{'E'})
+                        *fe++ = modified;
+                    *fe++ = *fmt;
+                    facet.put(os, os, os.fill(), &tm, begin(f), fe);
+                }
+#else
+                os << fds.tod;
+#endif
+                command = nullptr;
+                modified = CharT{};
+            }
+            else
+                os << *fmt;
+            break;
+        case 'y':
+            if (command)
+            {
+                auto y = static_cast<int>(fds.ymd.year());
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    y = std::abs(y) % 100;
+                    if (y < 10)
+                        os << CharT{'0'};
+                    os << y;
+#if !ONLY_C_LOCALE
+                }
+                else
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_year = y - 1900;
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'Y':
+            if (command)
+            {
+                auto y = fds.ymd.year();
+#if !ONLY_C_LOCALE
+                if (modified == CharT{})
+                {
+#endif
+                    os << y;
+#if !ONLY_C_LOCALE
+                }
+                else if (modified == CharT{'E'})
+                {
+                    const CharT f[] = {'%', modified, *fmt};
+                    tm.tm_year = static_cast<int>(y) - 1900;
+                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                }
+#endif
+                modified = CharT{};
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'z':
+            if (command)
+            {
+                if (offset_sec == nullptr)
+                {
+                    // Can not format %z with unknown offset
+                    os.setstate(ios::failbit);
+                    return os;
+                }
+                auto m = duration_cast<minutes>(*offset_sec);
+                auto neg = m < minutes{0};
+                m = date::abs(m);
+                auto h = duration_cast<hours>(m);
+                m -= h;
+                if (neg)
+                    os << CharT{'-'};
+                else
+                    os << CharT{'+'};
+                if (h < hours{10})
+                    os << CharT{'0'};
+                os << h.count();
+                if (modified != CharT{})
+                    os << CharT{':'};
+                if (m < minutes{10})
+                    os << CharT{'0'};
+                os << m.count();
+                command = nullptr;
+                modified = CharT{};
+            }
+            else
+                os << *fmt;
+            break;
+        case 'Z':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    if (abbrev == nullptr)
+                    {
+                        // Can not format %Z with unknown time_zone
+                        os.setstate(ios::failbit);
+                        return os;
+                    }
+                    for (auto c : *abbrev)
+                        os << CharT(c);
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    modified = CharT{};
+                }
+                command = nullptr;
+            }
+            else
+                os << *fmt;
+            break;
+        case 'E':
+        case 'O':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    modified = *fmt;
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << *fmt;
+                    command = nullptr;
+                    modified = CharT{};
+                }
+            }
+            else
+                os << *fmt;
+            break;
+        case '%':
+            if (command)
+            {
+                if (modified == CharT{})
+                {
+                    os << CharT{'%'};
+                    command = nullptr;
+                }
+                else
+                {
+                    os << CharT{'%'} << modified << CharT{'%'};
+                    command = nullptr;
+                    modified = CharT{};
+                }
+            }
+            else
+                command = fmt;
+            break;
+        default:
+            if (command)
+            {
+                os << CharT{'%'};
+                command = nullptr;
+            }
+            if (modified != CharT{})
+            {
+                os << modified;
+                modified = CharT{};
+            }
+            os << *fmt;
+            break;
+        }
+    }
+    if (command)
+        os << CharT{'%'};
+    if (modified != CharT{})
+        os << modified;
+    return os;
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const year& y)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{y/0/0};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const month& m)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{m/0/0};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const day& d)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{d/0/0};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const weekday& wd)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{wd};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const year_month& ym)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{ym/0};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const month_day& md)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{md/0};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const year_month_day& ymd)
+{
+    using CT = std::chrono::seconds;
+    fields<CT> fds{ymd};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits, class Rep, class Period>
+inline
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const std::chrono::duration<Rep, Period>& d)
+{
+    using Duration = std::chrono::duration<Rep, Period>;
+    using CT = typename std::common_type<Duration, std::chrono::seconds>::type;
+    fields<CT> fds{time_of_day<CT>{d}};
+    return to_stream(os, fmt, fds);
+}
+
+template <class CharT, class Traits, class Duration>
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const local_time<Duration>& tp, const std::string* abbrev = nullptr,
+          const std::chrono::seconds* offset_sec = nullptr)
+{
+    using CT = typename std::common_type<Duration, std::chrono::seconds>::type;
+    auto ld = floor<days>(tp);
+    fields<CT> fds{year_month_day{ld}, time_of_day<CT>{tp-local_seconds{ld}}};
+    return to_stream(os, fmt, fds, abbrev, offset_sec);
+}
+
+template <class CharT, class Traits, class Duration>
+std::basic_ostream<CharT, Traits>&
+to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
+          const sys_time<Duration>& tp)
+{
+    using namespace std::chrono;
+    using CT = typename std::common_type<Duration, seconds>::type;
+    const std::string abbrev("UTC");
+    CONSTDATA seconds offset{0};
+    auto sd = floor<days>(tp);
+    fields<CT> fds{year_month_day{sd}, time_of_day<CT>{tp-sys_seconds{sd}}};
+    return to_stream(os, fmt, fds, &abbrev, &offset);
+}
+
+// format
+
+template <class CharT, class Streamable>
+auto
+format(const std::locale& loc, const CharT* fmt, const Streamable& tp)
+    -> decltype(to_stream(std::declval<std::basic_ostream<CharT>&>(), fmt, tp),
+                std::basic_string<CharT>{})
+{
+    std::basic_ostringstream<CharT> os;
+    os.exceptions(std::ios::failbit | std::ios::badbit);
+    os.imbue(loc);
+    to_stream(os, fmt, tp);
+    return os.str();
+}
+
+template <class CharT, class Streamable>
+auto
+format(const CharT* fmt, const Streamable& tp)
+    -> decltype(to_stream(std::declval<std::basic_ostream<CharT>&>(), fmt, tp),
+                std::basic_string<CharT>{})
+{
+    std::basic_ostringstream<CharT> os;
+    os.exceptions(std::ios::failbit | std::ios::badbit);
+    to_stream(os, fmt, tp);
+    return os.str();
+}
+
+template <class CharT, class Traits, class Alloc, class Streamable>
+auto
+format(const std::locale& loc, const std::basic_string<CharT, Traits, Alloc>& fmt,
+       const Streamable& tp)
+    -> decltype(to_stream(std::declval<std::basic_ostream<CharT, Traits>&>(), fmt.c_str(), tp),
+                std::basic_string<CharT, Traits, Alloc>{})
+{
+    std::basic_ostringstream<CharT, Traits, Alloc> os;
+    os.exceptions(std::ios::failbit | std::ios::badbit);
+    os.imbue(loc);
+    to_stream(os, fmt.c_str(), tp);
+    return os.str();
+}
+
+template <class CharT, class Traits, class Alloc, class Streamable>
+auto
+format(const std::basic_string<CharT, Traits, Alloc>& fmt, const Streamable& tp)
+    -> decltype(to_stream(std::declval<std::basic_ostream<CharT, Traits>&>(), fmt.c_str(), tp),
+                std::basic_string<CharT, Traits, Alloc>{})
+{
+    std::basic_ostringstream<CharT, Traits, Alloc> os;
+    os.exceptions(std::ios::failbit | std::ios::badbit);
+    to_stream(os, fmt.c_str(), tp);
+    return os.str();
+}
+
+// parse
+
+namespace detail
+{
+
+template <class CharT, class Traits>
+bool
+read_char(std::basic_istream<CharT, Traits>& is, CharT fmt, std::ios::iostate& err)
+{
+    auto ic = is.get();
+    if (Traits::eq_int_type(ic, Traits::eof()) ||
+       !Traits::eq(Traits::to_char_type(ic), fmt))
+    {
+        err |= std::ios::failbit;
+        is.setstate(std::ios::failbit);
+        return false;
+    }
+    return true;
+}
+
+template <class CharT, class Traits>
+unsigned
+read_unsigned(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
+{
+    unsigned x = 0;
+    unsigned count = 0;
+    while (true)
+    {
+        auto ic = is.peek();
+        if (Traits::eq_int_type(ic, Traits::eof()))
+            break;
+        auto c = static_cast<char>(Traits::to_char_type(ic));
+        if (!('0' <= c && c <= '9'))
+            break;
+        (void)is.get();
+        ++count;
+        x = 10*x + static_cast<unsigned>(c - '0');
+        if (count == M)
+            break;
+    }
+    if (count < m)
+        is.setstate(std::ios::failbit);
+    return x;
+}
+
+template <class CharT, class Traits>
+int
+read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
+{
+    auto ic = is.peek();
+    if (!Traits::eq_int_type(ic, Traits::eof()))
+    {
+        auto c = static_cast<char>(Traits::to_char_type(ic));
+        if (('0' <= c && c <= '9') || c == '-' || c == '+')
+        {
+            if (c == '-' || c == '+')
+                (void)is.get();
+            auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
+            if (!is.fail())
+            {
+                if (c == '-')
+                    x = -x;
+                return x;
+            }
+        }
+    }
+    if (m > 0)
+        is.setstate(std::ios::failbit);
+    return 0;
+}
+
+template <class CharT, class Traits>
+long double
+read_long_double(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
+{
+    using namespace std;
+    unsigned count = 0;
+    auto decimal_point = Traits::to_int_type(
+        use_facet<numpunct<CharT>>(is.getloc()).decimal_point());
+    string buf;
+    while (true)
+    {
+        auto ic = is.peek();
+        if (Traits::eq_int_type(ic, Traits::eof()))
+            break;
+        if (Traits::eq_int_type(ic, decimal_point))
+        {
+            buf += '.';
+            decimal_point = Traits::eof();
+            is.get();
+        }
+        else
+        {
+            auto c = static_cast<char>(Traits::to_char_type(ic));
+            if (!('0' <= c && c <= '9'))
+                break;
+            buf += c;
+            (void)is.get();
+        }
+        if (++count == M)
+            break;
+    }
+    if (count < m)
+    {
+        is.setstate(std::ios::failbit);
+        return 0;
+    }
+    return std::stold(buf);
+}
+
+struct rs
+{
+    int& i;
+    unsigned m;
+    unsigned M;
+};
+
+struct ru
+{
+    int& i;
+    unsigned m;
+    unsigned M;
+};
+
+struct rld
+{
+    long double& i;
+    unsigned m;
+    unsigned M;
+};
+
+template <class CharT, class Traits>
+void
+read(std::basic_istream<CharT, Traits>&)
+{
+}
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, CharT a0, Args&& ...args);
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, rs a0, Args&& ...args);
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, ru a0, Args&& ...args);
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args);
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, rld a0, Args&& ...args);
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, CharT a0, Args&& ...args)
+{
+    // No-op if a0 == CharT{}
+    if (a0 != CharT{})
+    {
+        auto ic = is.peek();
+        if (Traits::eq_int_type(ic, Traits::eof()))
+        {
+            is.setstate(std::ios::failbit | std::ios::eofbit);
+            return;
+        }
+        if (!Traits::eq(Traits::to_char_type(ic), a0))
+        {
+            is.setstate(std::ios::failbit);
+            return;
+        }
+        (void)is.get();
+    }
+    read(is, std::forward<Args>(args)...);
+}
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, rs a0, Args&& ...args)
+{
+    auto x = read_signed(is, a0.m, a0.M);
+    if (is.fail())
+        return;
+    a0.i = x;
+    read(is, std::forward<Args>(args)...);
+}
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, ru a0, Args&& ...args)
+{
+    auto x = read_unsigned(is, a0.m, a0.M);
+    if (is.fail())
+        return;
+    a0.i = static_cast<int>(x);
+    read(is, std::forward<Args>(args)...);
+}
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
+{
+    if (a0 != -1)
+    {
+        auto u = static_cast<unsigned>(a0);
+        CharT buf[std::numeric_limits<unsigned>::digits10+2] = {};
+        auto e = buf;
+        do
+        {
+            *e++ = CharT(u % 10) + CharT{'0'};
+            u /= 10;
+        } while (u > 0);
+        std::reverse(buf, e);
+        for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
+            read(is, *p);
+    }
+    if (is.rdstate() == std::ios::goodbit)
+        read(is, std::forward<Args>(args)...);
+}
+
+template <class CharT, class Traits, class ...Args>
+void
+read(std::basic_istream<CharT, Traits>& is, rld a0, Args&& ...args)
+{
+    auto x = read_long_double(is, a0.m, a0.M);
+    if (is.fail())
+        return;
+    a0.i = x;
+    read(is, std::forward<Args>(args)...);
+}
+
+}  // namespace detail;
+
+template <class CharT, class Traits, class Duration, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+            fields<Duration>& fds, std::basic_string<CharT, Traits, Alloc>* abbrev,
+            std::chrono::minutes* offset)
+{
+    using namespace std;
+    using namespace std::chrono;
+    typename basic_istream<CharT, Traits>::sentry ok{is, true};
+    if (ok)
+    {
+#if !ONLY_C_LOCALE
+        auto& f = use_facet<time_get<CharT>>(is.getloc());
+        std::tm tm{};
+#endif
+        std::basic_string<CharT, Traits, Alloc> temp_abbrev;
+        minutes temp_offset{};
+        const CharT* command = nullptr;
+        auto modified = CharT{};
+        auto width = -1;
+        CONSTDATA int not_a_year = numeric_limits<short>::min();
+        int Y = not_a_year;
+        CONSTDATA int not_a_century = not_a_year / 100;
+        int C = not_a_century;
+        CONSTDATA int not_a_2digit_year = 100;
+        int y = not_a_2digit_year;
+        int m{};
+        int d{};
+        int j{};
+        CONSTDATA int not_a_weekday = 7;
+        int wd = not_a_weekday;
+        CONSTDATA int not_a_hour_12_value = 0;
+        int I = not_a_hour_12_value;
+        hours h{};
+        minutes min{};
+        Duration s{};
+        int g = not_a_2digit_year;
+        int G = not_a_year;
+        CONSTDATA int not_a_week_num = 100;
+        int V = not_a_week_num;
+        int U = not_a_week_num;
+        int W = not_a_week_num;
+        using detail::read;
+        using detail::rs;
+        using detail::ru;
+        using detail::rld;
+        for (; *fmt && is.rdstate() == std::ios::goodbit; ++fmt)
+        {
+            switch (*fmt)
+            {
+            case 'a':
+            case 'A':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    ios_base::iostate err = ios_base::goodbit;
+                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                    if ((err & ios::failbit) == 0)
+                        wd = tm.tm_wday;
+                    is.setstate(err);
+#else
+                    auto nm = detail::weekday_names();
+                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
+                    if (!is.fail())
+                        wd = i % 7;
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'b':
+            case 'B':
+            case 'h':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    ios_base::iostate err = ios_base::goodbit;
+                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                    if ((err & ios::failbit) == 0)
+                        m = tm.tm_mon + 1;
+                    is.setstate(err);
+#else
+                    auto nm = detail::month_names();
+                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
+                    if (!is.fail())
+                        m = i % 12 + 1;
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'c':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    ios_base::iostate err = ios_base::goodbit;
+                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                    if ((err & ios::failbit) == 0)
+                    {
+                        Y = tm.tm_year + 1900;
+                        m = tm.tm_mon + 1;
+                        d = tm.tm_mday;
+                        h = hours{tm.tm_hour};
+                        min = minutes{tm.tm_min};
+                        s = duration_cast<Duration>(seconds{tm.tm_sec});
+                    }
+                    is.setstate(err);
+#else
+                    auto nm = detail::weekday_names();
+                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
+                    if (is.fail())
+                        goto broken;
+                    wd = i % 7;
+                    ws(is);
+                    nm = detail::month_names();
+                    i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
+                    if (is.fail())
+                        goto broken;
+                    m = i % 12 + 1;
+                    ws(is);
+                    read(is, rs{d, 1, 2});
+                    if (is.fail())
+                        goto broken;
+                    ws(is);
+                    using dfs = detail::decimal_format_seconds<Duration>;
+                    CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
+                    int H;
+                    int M;
+                    long double S;
+                    read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
+                                          CharT{':'}, rld{S, 1, w});
+                    if (is.fail())
+                        goto broken;
+                    h = hours{H};
+                    min = minutes{M};
+                    s = round<Duration>(duration<long double>{S});
+                    ws(is);
+                    read(is, rs{Y, 1, 4u});
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'x':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    ios_base::iostate err = ios_base::goodbit;
+                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                    if ((err & ios::failbit) == 0)
+                    {
+                        Y = tm.tm_year + 1900;
+                        m = tm.tm_mon + 1;
+                        d = tm.tm_mday;
+                    }
+                    is.setstate(err);
+#else
+                    read(is, ru{m, 1, 2}, CharT{'/'}, ru{d, 1, 2}, CharT{'/'},
+                             rs{y, 1, 2});
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'X':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    ios_base::iostate err = ios_base::goodbit;
+                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                    if ((err & ios::failbit) == 0)
+                    {
+                        h = hours{tm.tm_hour};
+                        min = minutes{tm.tm_min};
+                        s = duration_cast<Duration>(seconds{tm.tm_sec});
+                    }
+                    is.setstate(err);
+#else
+                    using dfs = detail::decimal_format_seconds<Duration>;
+                    CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
+                    int H;
+                    int M;
+                    long double S;
+                    read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
+                                          CharT{':'}, rld{S, 1, w});
+                    if (!is.fail())
+                    {
+                        h = hours{H};
+                        min = minutes{M};
+                        s = round<Duration>(duration<long double>{S});
+                    }
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'C':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+                    {
+#endif
+                        read(is, rs{C, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+#if !ONLY_C_LOCALE
+                    }
+                    else
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                        {
+                            auto tY = tm.tm_year + 1900;
+                            C = (tY >= 0 ? tY : tY-99) / 100;
+                        }
+                        is.setstate(err);
+                    }
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'D':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, ru{m, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'},
+                                 ru{d, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'},
+                                 rs{y, 1, 2});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'F':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, rs{Y, 1, width == -1 ? 4u : static_cast<unsigned>(width)},
+                                 CharT{'-'}, ru{m, 1, 2}, CharT{'-'}, ru{d, 1, 2});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'd':
+            case 'e':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+#endif
+                        read(is, rs{d, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+#if !ONLY_C_LOCALE
+                    else if (modified == CharT{'O'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        command = nullptr;
+                        width = -1;
+                        modified = CharT{};
+                        if ((err & ios::failbit) == 0)
+                            d = tm.tm_mday;
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'H':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+                    {
+#endif
+                        int H;
+                        read(is, ru{H, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                        if (!is.fail())
+                            h = hours{H};
+#if !ONLY_C_LOCALE
+                    }
+                    else if (modified == CharT{'O'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            h = hours{tm.tm_hour};
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'I':
+                if (command)
+                {
+                    if (modified == CharT{})
+                    {
+                        // reads in an hour into I, but most be in [1, 12]
+                        read(is, rs{I, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                        if (I != not_a_hour_12_value)
+                        {
+                            if (!(1 <= I && I <= 12))
+                            {
+                                I = not_a_hour_12_value;
+                                goto broken;
+                            }
+                        }
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+               break;
+            case 'j':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, ru{j, 1, width == -1 ? 3u : static_cast<unsigned>(width)});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'M':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+                    {
+#endif
+                        int M;
+                        read(is, ru{M, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                        if (!is.fail())
+                            min = minutes{M};
+#if !ONLY_C_LOCALE
+                    }
+                    else if (modified == CharT{'O'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            min = minutes{tm.tm_min};
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'm':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+#endif
+                        read(is, rs{m, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+#if !ONLY_C_LOCALE
+                    else if (modified == CharT{'O'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            m = tm.tm_mon + 1;
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'n':
+            case 't':
+                if (command)
+                {
+                    // %n matches a single white space character
+                    // %t matches 0 or 1 white space characters
+                    auto ic = is.peek();
+                    if (Traits::eq_int_type(ic, Traits::eof()))
+                    {
+                        ios_base::iostate err = ios_base::eofbit;
+                        if (*fmt == 'n')
+                            err |= ios_base::failbit;
+                        is.setstate(err);
+                        break;
+                    }
+                    if (isspace(ic))
+                    {
+                        (void)is.get();
+                    }
+                    else if (*fmt == 'n')
+                        is.setstate(ios_base::failbit);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'p':
+                // Error if haven't yet seen %I
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+                    {
+                        if (I == not_a_hour_12_value)
+                            goto broken;
+                        tm = std::tm{};
+                        tm.tm_hour = I;
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if (err & ios::failbit)
+                            goto broken;
+                        h = hours{tm.tm_hour};
+                        I = not_a_hour_12_value;
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#else
+                    if (I == not_a_hour_12_value)
+                        goto broken;
+                    auto nm = detail::ampm_names();
+                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
+                    if (is.fail())
+                        goto broken;
+                    h = hours{I};
+                    if (i == 1)
+                    {
+                        if (h != hours{12})
+                            h += hours{12};
+                    }
+                    else if (h == hours{12})
+                        h = hours{0};
+                    I = not_a_hour_12_value;
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+
+               break;
+            case 'r':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    ios_base::iostate err = ios_base::goodbit;
+                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                    if ((err & ios::failbit) == 0)
+                    {
+                        h = hours{tm.tm_hour};
+                        min = minutes{tm.tm_min};
+                        s = duration_cast<Duration>(seconds{tm.tm_sec});
+                    }
+                    is.setstate(err);
+#else
+                    using dfs = detail::decimal_format_seconds<Duration>;
+                    CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
+                    int H;
+                    int M;
+                    long double S;
+                    read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
+                                          CharT{':'}, rld{S, 1, w});
+                    if (is.fail() || !(1 <= H && H <= 12))
+                        goto broken;
+                    ws(is);
+                    auto nm = detail::ampm_names();
+                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
+                    if (is.fail())
+                        goto broken;
+                    h = hours{H};
+                    if (i == 1)
+                    {
+                        if (h != hours{12})
+                            h += hours{12};
+                    }
+                    else if (h == hours{12})
+                        h = hours{0};
+                    min = minutes{M};
+                    s = round<Duration>(duration<long double>{S});
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'R':
+                if (command)
+                {
+                    if (modified == CharT{})
+                    {
+                        int H, M;
+                        read(is, ru{H, 1, 2}, CharT{'\0'}, CharT{':'}, CharT{'\0'},
+                                 ru{M, 1, 2}, CharT{'\0'});
+                        if (!is.fail())
+                        {
+                            h = hours{H};
+                            min = minutes{M};
+                        }
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'S':
+                if (command)
+                {
+ #if !ONLY_C_LOCALE
+                   if (modified == CharT{})
+                    {
+#endif
+                        using dfs = detail::decimal_format_seconds<Duration>;
+                        CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
+                        long double S;
+                        read(is, rld{S, 1, width == -1 ? w : static_cast<unsigned>(width)});
+                        if (!is.fail())
+                            s = round<Duration>(duration<long double>{S});
+#if !ONLY_C_LOCALE
+                    }
+                    else if (modified == CharT{'O'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            s = duration_cast<Duration>(seconds{tm.tm_sec});
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'T':
+                if (command)
+                {
+                    if (modified == CharT{})
+                    {
+                        using dfs = detail::decimal_format_seconds<Duration>;
+                        CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
+                        int H;
+                        int M;
+                        long double S;
+                        read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
+                                              CharT{':'}, rld{S, 1, w});
+                        if (!is.fail())
+                        {
+                            h = hours{H};
+                            min = minutes{M};
+                            s = round<Duration>(duration<long double>{S});
+                        }
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'Y':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+#endif
+                        read(is, rs{Y, 1, width == -1 ? 4u : static_cast<unsigned>(width)});
+#if !ONLY_C_LOCALE
+                    else if (modified == CharT{'E'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            Y = tm.tm_year + 1900;
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'y':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+#endif
+                        read(is, ru{y, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+#if !ONLY_C_LOCALE
+                    else
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            Y = tm.tm_year + 1900;
+                        is.setstate(err);
+                    }
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'g':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, ru{g, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'G':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, rs{G, 1, width == -1 ? 4u : static_cast<unsigned>(width)});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'U':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, ru{U, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'V':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, ru{V, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'W':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, ru{W, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'u':
+            case 'w':
+                if (command)
+                {
+#if !ONLY_C_LOCALE
+                    if (modified == CharT{})
+                    {
+#endif
+                        read(is, ru{wd, 1, width == -1 ? 1u : static_cast<unsigned>(width)});
+                        if (!is.fail() && *fmt == 'u')
+                        {
+                            if (wd == 7)
+                                wd = 0;
+                            else if (wd == 0)
+                                wd = 7;
+                        }
+#if !ONLY_C_LOCALE
+                    }
+                    else if (modified == CharT{'O'})
+                    {
+                        ios_base::iostate err = ios_base::goodbit;
+                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
+                        if ((err & ios::failbit) == 0)
+                            wd = tm.tm_wday;
+                        is.setstate(err);
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+#endif
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'E':
+            case 'O':
+                if (command)
+                {
+                    if (modified == CharT{})
+                    {
+                        modified = *fmt;
+                    }
+                    else
+                    {
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                        command = nullptr;
+                        width = -1;
+                        modified = CharT{};
+                    }
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case '%':
+                if (command)
+                {
+                    if (modified == CharT{})
+                        read(is, *fmt);
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    command = fmt;
+                break;
+            case 'z':
+                if (command)
+                {
+                    int H, M;
+                    if (modified == CharT{})
+                        read(is, rs{H, 2, 2}, ru{M, 2, 2});
+                    else
+                        read(is, rs{H, 1, 2}, CharT{':'}, ru{M, 2, 2});
+                    if (!is.fail())
+                        temp_offset = hours{ H } + minutes{ H < 0 ? -M : M };
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            case 'Z':
+                if (command)
+                {
+                    if (modified == CharT{})
+                    {
+                        if (!temp_abbrev.empty())
+                            is.setstate(ios::failbit);
+                        else
+                        {
+                            while (is.rdstate() == std::ios::goodbit)
+                            {
+                                auto i = is.rdbuf()->sgetc();
+                                if (Traits::eq_int_type(i, Traits::eof()))
+                                {
+                                    is.setstate(ios::eofbit);
+                                    break;
+                                }
+                                auto wc = Traits::to_char_type(i);
+                                auto c = static_cast<char>(wc);
+                                // is c a valid time zone name or abbreviation character?
+                                if (!(CharT{1} < wc && wc < CharT{127}) || !(isalnum(c) ||
+                                        c == '_' || c == '/' || c == '-' || c == '+'))
+                                    break;
+                                temp_abbrev.push_back(c);
+                                is.rdbuf()->sbumpc();
+                            }
+                            if (temp_abbrev.empty())
+                                is.setstate(ios::failbit);
+                        }
+                    }
+                    else
+                        read(is, CharT{'%'}, width, modified, *fmt);
+                    command = nullptr;
+                    width = -1;
+                    modified = CharT{};
+                }
+                else
+                    read(is, *fmt);
+                break;
+            default:
+                if (command)
+                {
+                    if (width == -1 && modified == CharT{} && '0' <= *fmt && *fmt <= '9')
+                    {
+                        width = static_cast<char>(*fmt) - '0';
+                        while ('0' <= fmt[1] && fmt[1] <= '9')
+                            width = 10*width + static_cast<char>(*++fmt) - '0';
+                    }
+                    else
+                    {
+                        if (modified == CharT{})
+                            read(is, CharT{'%'}, width, *fmt);
+                        else
+                            read(is, CharT{'%'}, width, modified, *fmt);
+                        command = nullptr;
+                        width = -1;
+                        modified = CharT{};
+                    }
+                }
+                else  // !command
+                {
+                    if (isspace(*fmt))
+                        ws(is); // space matches 0 or more white space characters
+                    else
+                        read(is, *fmt);
+                }
+                break;
+            }
+        }
+        // is.rdstate() != ios::goodbit || *fmt == CharT{}
+        if (is.rdstate() == ios::goodbit && command)
+        {
+            if (modified == CharT{})
+                read(is, CharT{'%'}, width);
+            else
+                read(is, CharT{'%'}, width, modified);
+        }
+        if (is.rdstate() != ios::goodbit && *fmt != CharT{} && !is.fail())
+            is.setstate(ios::failbit);
+        if (!is.fail())
+        {
+            if (y != not_a_2digit_year)
+            {
+                // Convert y and an optional C to Y
+                if (!(0 <= y && y <= 99))
+                    goto broken;
+                if (C == not_a_century)
+                {
+                    if (Y == not_a_year)
+                    {
+                        if (y >= 69)
+                            C = 19;
+                        else
+                            C = 20;
+                    }
+                    else
+                    {
+                        C = (Y >= 0 ? Y : Y-100) / 100;
+                    }
+                }
+                int tY;
+                if (C >= 0)
+                    tY = 100*C + y;
+                else
+                    tY = 100*(C+1) - (y == 0 ? 100 : y);
+                if (Y != not_a_year && Y != tY)
+                    goto broken;
+                Y = tY;
+            }
+            if (g != not_a_2digit_year)
+            {
+                // Convert g and an optional C to G
+                if (!(0 <= g && g <= 99))
+                    goto broken;
+                if (C == not_a_century)
+                {
+                    if (G == not_a_year)
+                    {
+                        if (g >= 69)
+                            C = 19;
+                        else
+                            C = 20;
+                    }
+                    else
+                    {
+                        C = (G >= 0 ? G : G-100) / 100;
+                    }
+                }
+                int tG;
+                if (C >= 0)
+                    tG = 100*C + g;
+                else
+                    tG = 100*(C+1) - (g == 0 ? 100 : g);
+                if (G != not_a_year && G != tG)
+                    goto broken;
+                G = tG;
+            }
+            if (G != not_a_year)
+            {
+                // Convert G, V and wd to Y, m and d
+                if (V == not_a_week_num || wd == not_a_weekday)
+                    goto broken;
+                auto ymd = year_month_day{local_days(year{G-1}/dec/thu[last]) +
+                                          (mon-thu) + weeks{V-1} +
+                                          (weekday{static_cast<unsigned>(wd)}-mon)};
+                if (Y == not_a_year)
+                    Y = static_cast<int>(ymd.year());
+                else if (year{Y} != ymd.year())
+                    goto broken;
+                if (m == 0)
+                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
+                else if (month(static_cast<unsigned>(m)) != ymd.month())
+                    goto broken;
+                if (d == 0)
+                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
+                else if (day(static_cast<unsigned>(d)) != ymd.day())
+                    goto broken;
+            }
+            if (j != 0 && Y != not_a_year)
+            {
+                auto ymd = year_month_day{local_days(year{Y}/1/1) + days{j-1}};
+                if (m == 0)
+                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
+                else if (month(static_cast<unsigned>(m)) != ymd.month())
+                    goto broken;
+                if (d == 0)
+                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
+                else if (day(static_cast<unsigned>(d)) != ymd.day())
+                    goto broken;
+            }
+            if (U != not_a_week_num && Y != not_a_year)
+            {
+                if (wd == not_a_weekday)
+                    goto broken;
+                sys_days sd;
+                if (U == 0)
+                    sd = year{Y-1}/dec/weekday{static_cast<unsigned>(wd)}[last];
+                else
+                    sd = sys_days(year{Y}/jan/sun[1]) + weeks{U-1} +
+                         (weekday{static_cast<unsigned>(wd)} - sun);
+                year_month_day ymd = sd;
+                if (year{Y} != ymd.year())
+                    goto broken;
+                if (m == 0)
+                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
+                else if (month(static_cast<unsigned>(m)) != ymd.month())
+                    goto broken;
+                if (d == 0)
+                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
+                else if (day(static_cast<unsigned>(d)) != ymd.day())
+                    goto broken;
+            }
+            if (W != not_a_week_num && Y != not_a_year)
+            {
+                if (wd == not_a_weekday)
+                    goto broken;
+                sys_days sd;
+                if (W == 0)
+                    sd = year{Y-1}/dec/weekday{static_cast<unsigned>(wd)}[last];
+                else
+                    sd = sys_days(year{Y}/jan/mon[1]) + weeks{W-1} +
+                         (weekday{static_cast<unsigned>(wd)} - mon);
+                year_month_day ymd = sd;
+                if (year{Y} != ymd.year())
+                    goto broken;
+                if (m == 0)
+                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
+                else if (month(static_cast<unsigned>(m)) != ymd.month())
+                    goto broken;
+                if (d == 0)
+                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
+                else if (day(static_cast<unsigned>(d)) != ymd.day())
+                    goto broken;
+            }
+            if (Y < static_cast<int>(year::min()) || Y > static_cast<int>(year::max()))
+                Y = not_a_year;
+            auto ymd = year{Y}/m/d;
+            if (wd != not_a_weekday && ymd.ok())
+            {
+                if (weekday{static_cast<unsigned>(wd)} != weekday(ymd))
+                    goto broken;
+            }
+            fds.ymd = ymd;
+            fds.tod = time_of_day<Duration>(hours{h} + minutes{min});
+            fds.tod.s_ = detail::decimal_format_seconds<Duration>{s};
+            if (wd != not_a_weekday)
+                fds.wd = weekday{static_cast<unsigned>(wd)};
+            if (abbrev != nullptr)
+                *abbrev = std::move(temp_abbrev);
+            if (offset != nullptr)
+                *offset = temp_offset;
+        }
+        return is;
+    }
+broken:
+    is.setstate(ios_base::failbit);
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, year& y,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.year().ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        y = fds.ymd.year();
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, month& m,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.month().ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        m = fds.ymd.month();
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, day& d,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.day().ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        d = fds.ymd.day();
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, weekday& wd,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.wd.ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        wd = fds.wd;
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, year_month& ym,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.month().ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        ym = fds.ymd.year()/fds.ymd.month();
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, month_day& md,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.month().ok() || !fds.ymd.day().ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        md = fds.ymd.month()/fds.ymd.day();
+    return is;
+}
+
+template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+            year_month_day& ymd, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = seconds;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.ok())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        ymd = fds.ymd;
+    return is;
+}
+
+template <class Duration, class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+            sys_time<Duration>& tp, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = typename common_type<Duration, seconds>::type;
+    minutes offset_local{};
+    auto offptr = offset ? offset : &offset_local;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offptr);
+    if (!fds.ymd.ok() || !fds.tod.in_conventional_range())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        tp = round<Duration>(sys_days(fds.ymd) - *offptr + fds.tod.to_duration());
+    return is;
+}
+
+template <class Duration, class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+            local_time<Duration>& tp, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using CT = typename common_type<Duration, seconds>::type;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!fds.ymd.ok() || !fds.tod.in_conventional_range())
+        is.setstate(ios::failbit);
+    if (!is.fail())
+        tp = round<Duration>(local_seconds{local_days(fds.ymd)} + fds.tod.to_duration());
+    return is;
+}
+
+template <class Rep, class Period, class CharT, class Traits, class Alloc = std::allocator<CharT>>
+std::basic_istream<CharT, Traits>&
+from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
+            std::chrono::duration<Rep, Period>& d,
+            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+            std::chrono::minutes* offset = nullptr)
+{
+    using namespace std;
+    using namespace std::chrono;
+    using Duration = std::chrono::duration<Rep, Period>;
+    using CT = typename common_type<Duration, seconds>::type;
+    fields<CT> fds{};
+    from_stream(is, fmt, fds, abbrev, offset);
+    if (!is.fail())
+        d = duration_cast<Duration>(fds.tod.to_duration());
+    return is;
+}
+
+template <class Parsable, class CharT, class Traits = std::char_traits<CharT>,
+          class Alloc = std::allocator<CharT>>
+struct parse_manip
+{
+    const std::basic_string<CharT, Traits, Alloc> format_;
+    Parsable&                                     tp_;
+    std::basic_string<CharT, Traits, Alloc>*      abbrev_;
+    std::chrono::minutes*                         offset_;
+
+public:
+    parse_manip(std::basic_string<CharT, Traits, Alloc> format, Parsable& tp,
+                std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
+                std::chrono::minutes* offset = nullptr)
+        : format_(std::move(format))
+        , tp_(tp)
+        , abbrev_(abbrev)
+        , offset_(offset)
+        {}
+
+};
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+std::basic_istream<CharT, Traits>&
+operator>>(std::basic_istream<CharT, Traits>& is,
+           const parse_manip<Parsable, CharT, Traits, Alloc>& x)
+{
+    return from_stream(is, x.format_.c_str(), x.tp_, x.abbrev_, x.offset_);
+}
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+inline
+auto
+parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
+                            format.c_str(), tp),
+                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp})
+{
+    return {format, tp};
+}
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+inline
+auto
+parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp,
+      std::basic_string<CharT, Traits, Alloc>& abbrev)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
+                            format.c_str(), tp, &abbrev),
+                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev})
+{
+    return {format, tp, &abbrev};
+}
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+inline
+auto
+parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp,
+      std::chrono::minutes& offset)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
+                            format.c_str(), tp, nullptr, &offset),
+                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, nullptr, &offset})
+{
+    return {format, tp, nullptr, &offset};
+}
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+inline
+auto
+parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp,
+      std::basic_string<CharT, Traits, Alloc>& abbrev, std::chrono::minutes& offset)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
+                            format.c_str(), tp, &abbrev, &offset),
+                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev, &offset})
+{
+    return {format, tp, &abbrev, &offset};
+}
+
+// const CharT* formats
+
+template <class Parsable, class CharT>
+inline
+auto
+parse(const CharT* format, Parsable& tp)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT>&>(), format, tp),
+                parse_manip<Parsable, CharT>{format, tp})
+{
+    return {format, tp};
+}
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+inline
+auto
+parse(const CharT* format, Parsable& tp, std::basic_string<CharT, Traits, Alloc>& abbrev)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format,
+                            tp, &abbrev),
+                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev})
+{
+    return {format, tp, &abbrev};
+}
+
+template <class Parsable, class CharT>
+inline
+auto
+parse(const CharT* format, Parsable& tp, std::chrono::minutes& offset)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT>&>(), format,
+                            tp, nullptr, &offset),
+                parse_manip<Parsable, CharT>{format, tp, nullptr, &offset})
+{
+    return {format, tp, nullptr, &offset};
+}
+
+template <class Parsable, class CharT, class Traits, class Alloc>
+inline
+auto
+parse(const CharT* format, Parsable& tp,
+      std::basic_string<CharT, Traits, Alloc>& abbrev, std::chrono::minutes& offset)
+    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format,
+                            tp, &abbrev, &offset),
+                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev, &offset})
+{
+    return {format, tp, &abbrev, &offset};
+}
+
+// duration streaming
+
+namespace detail
+{
+
+#if __cplusplus >= 201402  && (!defined(__EDG_VERSION__) || __EDG_VERSION__ > 411) \
+                           && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5150)
+
+template <class CharT, std::size_t N>
+class string_literal
+{
+    CharT p_[N];
+
+public:
+    using const_iterator = const CharT*;
+
+    string_literal(string_literal const&) = default;
+    string_literal& operator=(string_literal const&) = delete;
+
+    template <std::size_t N1 = 2,
+              class = std::enable_if_t<N1 == N>>
+    CONSTCD14 string_literal(CharT c) NOEXCEPT
+        : p_{c}
+    {
+    }
+
+    CONSTCD14 string_literal(const CharT(&a)[N]) NOEXCEPT
+        : p_{}
+    {
+        for (std::size_t i = 0; i < N; ++i)
+            p_[i] = a[i];
+    }
+
+    template <class U = CharT, class = std::enable_if_t<1 < sizeof(U)>>
+    CONSTCD14 string_literal(const char(&a)[N]) NOEXCEPT
+        : p_{}
+    {
+        for (std::size_t i = 0; i < N; ++i)
+            p_[i] = a[i];
+    }
+
+    template <class CharT2, class = std::enable_if_t<!std::is_same<CharT2, CharT>{}>>
+    CONSTCD14 string_literal(string_literal<CharT2, N> const& a) NOEXCEPT
+        : p_{}
+    {
+        for (std::size_t i = 0; i < N; ++i)
+            p_[i] = a[i];
+    }
+
+    template <std::size_t N1, std::size_t N2,
+              class = std::enable_if_t<N1 + N2 - 1 == N>>
+    CONSTCD14 string_literal(const string_literal<CharT, N1>& x,
+                             const string_literal<CharT, N2>& y) NOEXCEPT
+        : p_{}
+    {
+        std::size_t i = 0;
+        for (; i < N1-1; ++i)
+            p_[i] = x[i];
+        for (std::size_t j = 0; j < N2; ++j, ++i)
+            p_[i] = y[j];
+    }
+
+    CONSTCD14 const CharT* data() const NOEXCEPT {return p_;}
+    CONSTCD14 std::size_t size() const NOEXCEPT {return N-1;}
+
+    CONSTCD14 const_iterator begin() const NOEXCEPT {return p_;}
+    CONSTCD14 const_iterator end()   const NOEXCEPT {return p_ + N-1;}
+
+    CONSTCD14 CharT const& operator[](std::size_t n) const NOEXCEPT
+    {
+        return p_[n];
+    }
+
+    template <class Traits>
+    friend
+    std::basic_ostream<CharT, Traits>&
+    operator<<(std::basic_ostream<CharT, Traits>& os, const string_literal& s)
+    {
+        return os << s.p_;
+    }
+};
+
+template <class CharT1, class CharT2, std::size_t N1, std::size_t N2>
+CONSTCD14
+inline
+string_literal<std::conditional_t<sizeof(CharT2) <= sizeof(CharT1), CharT1, CharT2>,
+               N1 + N2 - 1>
+operator+(const string_literal<CharT1, N1>& x, const string_literal<CharT2, N2>& y) NOEXCEPT
+{
+    using CharT = std::conditional_t<sizeof(CharT2) <= sizeof(CharT1), CharT1, CharT2>;
+    return string_literal<CharT, N1 + N2 - 1>{string_literal<CharT, N1>{x},
+                                              string_literal<CharT, N2>{y}};
+}
+
+template <class CharT, class Traits, class Alloc, std::size_t N>
+inline
+std::basic_string<CharT, Traits, Alloc>
+operator+(std::basic_string<CharT, Traits, Alloc> x,
+          const string_literal<CharT, N>& y) NOEXCEPT
+{
+    x.append(y.data(), y.size());
+    return x;
+}
+
+template <class CharT, std::size_t N>
+CONSTCD14
+inline
+string_literal<CharT, N>
+msl(const CharT(&a)[N]) NOEXCEPT
+{
+    return string_literal<CharT, N>{a};
+}
+
+template <class CharT,
+          class = std::enable_if_t<std::is_same<CharT, char>{} ||
+                                   std::is_same<CharT, wchar_t>{} ||
+                                   std::is_same<CharT, char16_t>{} ||
+                                   std::is_same<CharT, char32_t>{}>>
+CONSTCD14
+inline
+string_literal<CharT, 2>
+msl(CharT c) NOEXCEPT
+{
+    return string_literal<CharT, 2>{c};
+}
+
+CONSTCD14
+inline
+std::size_t
+to_string_len(std::intmax_t i)
+{
+    std::size_t r = 0;
+    do
+    {
+        i /= 10;
+        ++r;
+    } while (i > 0);
+    return r;
+}
+
+template <std::intmax_t N>
+CONSTCD14
+inline
+std::enable_if_t
+<
+    N < 10,
+    string_literal<char, to_string_len(N)+1>
+>
+msl() NOEXCEPT
+{
+    return msl(char(N % 10 + '0'));
+}
+
+template <std::intmax_t N>
+CONSTCD14
+inline
+std::enable_if_t
+<
+    10 <= N,
+    string_literal<char, to_string_len(N)+1>
+>
+msl() NOEXCEPT
+{
+    return msl<N/10>() + msl(char(N % 10 + '0'));
+}
+
+template <class CharT, std::intmax_t N, std::intmax_t D>
+CONSTCD14
+inline
+std::enable_if_t
+<
+    std::ratio<N, D>::type::den != 1,
+    string_literal<CharT, to_string_len(std::ratio<N, D>::type::num) +
+                          to_string_len(std::ratio<N, D>::type::den) + 4>
+>
+msl(std::ratio<N, D>) NOEXCEPT
+{
+    using R = typename std::ratio<N, D>::type;
+    return msl(CharT{'['}) + msl<R::num>() + msl(CharT{'/'}) +
+                             msl<R::den>() + msl(CharT{']'});
+}
+
+template <class CharT, std::intmax_t N, std::intmax_t D>
+CONSTCD14
+inline
+std::enable_if_t
+<
+    std::ratio<N, D>::type::den == 1,
+    string_literal<CharT, to_string_len(std::ratio<N, D>::type::num) + 3>
+>
+msl(std::ratio<N, D>) NOEXCEPT
+{
+    using R = typename std::ratio<N, D>::type;
+    return msl(CharT{'['}) + msl<R::num>() + msl(CharT{']'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::atto) NOEXCEPT
+{
+    return msl(CharT{'a'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::femto) NOEXCEPT
+{
+    return msl(CharT{'f'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::pico) NOEXCEPT
+{
+    return msl(CharT{'p'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::nano) NOEXCEPT
+{
+    return msl(CharT{'n'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+std::enable_if_t
+<
+    std::is_same<CharT, char>{},
+    string_literal<char, 3>
+>
+msl(std::micro) NOEXCEPT
+{
+    return string_literal<char, 3>{"\xC2\xB5"};
+}
+
+template <class CharT>
+CONSTCD14
+inline
+std::enable_if_t
+<
+    !std::is_same<CharT, char>{},
+    string_literal<CharT, 2>
+>
+msl(std::micro) NOEXCEPT
+{
+    return string_literal<CharT, 2>{CharT{static_cast<unsigned char>('\xB5')}};
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::milli) NOEXCEPT
+{
+    return msl(CharT{'m'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::centi) NOEXCEPT
+{
+    return msl(CharT{'c'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::deci) NOEXCEPT
+{
+    return msl(CharT{'d'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::deca) NOEXCEPT
+{
+    return string_literal<CharT, 3>{"da"};
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::hecto) NOEXCEPT
+{
+    return msl(CharT{'h'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::kilo) NOEXCEPT
+{
+    return msl(CharT{'k'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::mega) NOEXCEPT
+{
+    return msl(CharT{'M'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::giga) NOEXCEPT
+{
+    return msl(CharT{'G'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::tera) NOEXCEPT
+{
+    return msl(CharT{'T'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::peta) NOEXCEPT
+{
+    return msl(CharT{'P'});
+}
+
+template <class CharT>
+CONSTCD14
+inline
+auto
+msl(std::exa) NOEXCEPT
+{
+    return msl(CharT{'E'});
+}
+
+template <class CharT, class Period>
+CONSTCD14
+auto
+get_units(Period p)
+{
+    return msl<CharT>(p) + string_literal<CharT, 2>{"s"};
+}
+
+template <class CharT>
+CONSTCD14
+auto
+get_units(std::ratio<1>)
+{
+    return string_literal<CharT, 2>{"s"};
+}
+
+template <class CharT>
+CONSTCD14
+auto
+get_units(std::ratio<60>)
+{
+    return string_literal<CharT, 4>{"min"};
+}
+
+template <class CharT>
+CONSTCD14
+auto
+get_units(std::ratio<3600>)
+{
+    return string_literal<CharT, 2>{"h"};
+}
+
+#else  // __cplusplus < 201402 || (defined(__EDG_VERSION__) && __EDG_VERSION__ <= 411)
+
+inline
+std::string
+to_string(std::uint64_t x)
+{
+    return std::to_string(x);
+}
+
+template <class CharT>
+std::basic_string<CharT>
+to_string(std::uint64_t x)
+{
+    auto y = std::to_string(x);
+    return std::basic_string<CharT>(y.begin(), y.end());
+}
+
+template <class CharT, std::intmax_t N, std::intmax_t D>
+inline
+typename std::enable_if
+<
+    std::ratio<N, D>::type::den != 1,
+    std::basic_string<CharT>
+>::type
+msl(std::ratio<N, D>)
+{
+    using R = typename std::ratio<N, D>::type;
+    return std::basic_string<CharT>(1, '[') + to_string<CharT>(R::num) + CharT{'/'} +
+                                              to_string<CharT>(R::den) + CharT{']'};
+}
+
+template <class CharT, std::intmax_t N, std::intmax_t D>
+inline
+typename std::enable_if
+<
+    std::ratio<N, D>::type::den == 1,
+    std::basic_string<CharT>
+>::type
+msl(std::ratio<N, D>)
+{
+    using R = typename std::ratio<N, D>::type;
+    return std::basic_string<CharT>(1, '[') + to_string<CharT>(R::num) + CharT{']'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::atto)
+{
+    return {'a'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::femto)
+{
+    return {'f'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::pico)
+{
+    return {'p'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::nano)
+{
+    return {'n'};
+}
+
+template <class CharT>
+inline
+typename std::enable_if
+<
+    std::is_same<CharT, char>::value,
+    std::string
+>::type
+msl(std::micro)
+{
+    return "\xC2\xB5";
+}
+
+template <class CharT>
+inline
+typename std::enable_if
+<
+    !std::is_same<CharT, char>::value,
+    std::basic_string<CharT>
+>::type
+msl(std::micro)
+{
+    return {CharT(static_cast<unsigned char>('\xB5'))};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::milli)
+{
+    return {'m'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::centi)
+{
+    return {'c'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::deci)
+{
+    return {'d'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::deca)
+{
+    return {'d', 'a'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::hecto)
+{
+    return {'h'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::kilo)
+{
+    return {'k'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::mega)
+{
+    return {'M'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::giga)
+{
+    return {'G'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::tera)
+{
+    return {'T'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::peta)
+{
+    return {'P'};
+}
+
+template <class CharT>
+inline
+std::basic_string<CharT>
+msl(std::exa)
+{
+    return {'E'};
+}
+
+template <class CharT, class Period>
+std::basic_string<CharT>
+get_units(Period p)
+{
+    return msl<CharT>(p) + CharT{'s'};
+}
+
+template <class CharT>
+std::basic_string<CharT>
+get_units(std::ratio<1>)
+{
+    return {'s'};
+}
+
+template <class CharT>
+std::basic_string<CharT>
+get_units(std::ratio<60>)
+{
+    return {'m', 'i', 'n'};
+}
+
+template <class CharT>
+std::basic_string<CharT>
+get_units(std::ratio<3600>)
+{
+    return {'h'};
+}
+
+#endif  // __cplusplus < 201402 || (defined(__EDG_VERSION__) && __EDG_VERSION__ <= 411)
+
+template <class CharT, class Traits = std::char_traits<CharT>>
+struct make_string;
+
+template <>
+struct make_string<char>
+{
+    template <class Rep>
+    static
+    std::string
+    from(Rep n)
+    {
+        return std::to_string(n);
+    }
+};
+
+template <class Traits>
+struct make_string<char, Traits>
+{
+    template <class Rep>
+    static
+    std::basic_string<char, Traits>
+    from(Rep n)
+    {
+        auto s = std::to_string(n);
+        return std::basic_string<char, Traits>(s.begin(), s.end());
+    }
+};
+
+template <>
+struct make_string<wchar_t>
+{
+    template <class Rep>
+    static
+    std::wstring
+    from(Rep n)
+    {
+        return std::to_wstring(n);
+    }
+};
+
+template <class Traits>
+struct make_string<wchar_t, Traits>
+{
+    template <class Rep>
+    static
+    std::basic_string<wchar_t, Traits>
+    from(Rep n)
+    {
+        auto s = std::to_wstring(n);
+        return std::basic_string<wchar_t, Traits>(s.begin(), s.end());
+    }
+};
+
+}  // namespace detail
+
+template <class CharT, class Traits, class Rep, class Period>
+inline
+std::basic_ostream<CharT, Traits>&
+operator<<(std::basic_ostream<CharT, Traits>& os,
+           const std::chrono::duration<Rep, Period>& d)
+{
+    using namespace detail;
+    return os << make_string<CharT, Traits>::from(d.count()) +
+                 get_units<CharT>(typename Period::type{});
+}
+
+}  // namespace date
+
+
+#ifdef __GNUC__
+# pragma GCC diagnostic pop
+#endif
+
+
+#endif  // DATE_H
diff --git a/Src/Scarab/library/logger/CMakeLists.txt b/Src/Scarab/library/logger/CMakeLists.txt
new file mode 100644
index 0000000..e9aa952
--- /dev/null
+++ b/Src/Scarab/library/logger/CMakeLists.txt
@@ -0,0 +1,13 @@
+# CMakeLists.txt for Scarab/library/logger
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/logger.hh
+    PARENT_SCOPE )
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/logger.cc
+    PARENT_SCOPE )
diff --git a/Src/Scarab/library/logger/logger.cc b/Src/Scarab/library/logger/logger.cc
new file mode 100644
index 0000000..bdbbb87
--- /dev/null
+++ b/Src/Scarab/library/logger/logger.cc
@@ -0,0 +1,349 @@
+/*
+ * logger.cxx
+ * based on KLogger.cxx from KATRIN's Kasper
+ *
+ *  Created on: 18.11.2011
+ *      Author: Marco Haag <marco.haag@kit.edu>
+ */
+
+#define SCARAB_API_EXPORTS
+
+
+#include <algorithm>
+#include <cstring> // for strrchr
+#include <iomanip>
+#include <iterator>
+#include <mutex>
+#include <set>
+#include <time.h>
+
+#ifndef NDEBUG
+#include <thread>
+#endif
+
+#include "logger.hh"
+
+using namespace std;
+
+namespace scarab
+{
+    const string& EndColor()   {static string* color = new string(COLOR_PREFIX COLOR_NORMAL COLOR_SUFFIX); return *color;}
+    const string& FatalColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_RED    COLOR_SUFFIX); return *color;}
+    const string& ErrorColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_RED    COLOR_SUFFIX); return *color;}
+    const string& WarnColor()  {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_YELLOW COLOR_SUFFIX); return *color;}
+    const string& InfoColor()  {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_GREEN  COLOR_SUFFIX); return *color;}
+    const string& ProgColor()  {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_BLUE   COLOR_SUFFIX); return *color;}
+    const string& DebugColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_CYAN   COLOR_SUFFIX); return *color;}
+    const string& TraceColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_WHITE  COLOR_SUFFIX); return *color;}
+    const string& OtherColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_WHITE  COLOR_SUFFIX); return *color;}
+
+    struct logger::Private
+    {
+        static unsigned& count()
+        {
+            static unsigned sCount = 0;
+            return sCount;
+        }
+
+        static std::mutex& mutex()
+        {
+            static std::mutex sMutex;
+            return sMutex;
+        }
+
+        typedef std::set< logger* > LoggerSet;
+        static std::shared_ptr<LoggerSet>& AllLoggers()
+        {
+            // construct-on-first-use strategy to avoid static initialization fiasco
+            static std::shared_ptr<LoggerSet> sAllLoggers = std::make_shared< LoggerSet >();
+            return sAllLoggers;
+        }
+
+        static char* dateTimeFormat()
+        {
+            static char sDateTimeFormat[16];
+
+            return sDateTimeFormat;
+        }
+
+        static char* getTimeAbsoluteStr( bool aGetNewTime = false )
+        {
+            static char sTimeBuff[512];
+            static time_t sRawTime;
+            static tm* sProcessedTime;
+
+            if( ! aGetNewTime ) return sTimeBuff;
+
+            time(&sRawTime);
+
+            sProcessedTime = localtime(&sRawTime);
+            strftime(sTimeBuff, 512, logger::Private::dateTimeFormat(), sProcessedTime);
+
+            return sTimeBuff;
+        }
+
+
+        const char* fLogger;
+
+        static bool& colored()
+        {
+#ifndef _WIN32
+            static bool sColored = true;
+#else
+            static bool sColored = false;
+#endif
+            return sColored;
+        }
+
+        static std::ostream*& out()
+        {
+            static std::ostream* sOut = &std::cout;
+            return sOut;
+        }
+
+        static std::ostream*& err()
+        {
+            static std::ostream* sErr = &std::cerr;
+            return sErr;
+        }
+
+        ELevel fThreshold;
+        bool fThresholdIsGlobal;
+
+        static ELevel& GlobalThreshold()
+        {
+            // construct-on-first-use strategy to avoid static initialization fiasco
+            static ELevel sGlobalThreshold = logger::Private::filterMinimumLevel(ELevel::eDebug);
+            return sGlobalThreshold;
+        }
+
+        static const char* level2Str(ELevel level)
+        {
+            switch(level)
+            {
+                case ELevel::eTrace : return "TRACE"; break;
+                case ELevel::eDebug : return "DEBUG"; break;
+                case ELevel::eInfo  : return "INFO"; break;
+                case ELevel::eProg  : return "PROG"; break;
+                case ELevel::eWarn  : return "WARN"; break;
+                case ELevel::eError : return "ERROR"; break;
+                case ELevel::eFatal : return "FATAL"; break;
+                default     : return "XXX";
+            }
+        }
+
+        static string level2Color(ELevel level)
+        {
+            switch(level)
+            {
+                case ELevel::eTrace : return TraceColor(); break;
+                case ELevel::eDebug : return DebugColor(); break;
+                case ELevel::eInfo  : return InfoColor(); break;
+                case ELevel::eProg  : return ProgColor(); break;
+                case ELevel::eWarn  : return WarnColor(); break;
+                case ELevel::eError : return ErrorColor(); break;
+                case ELevel::eFatal : return FatalColor(); break;
+                default     : return OtherColor();
+            }
+        }
+
+        static ELevel filterMinimumLevel(ELevel level)
+        {
+#if defined(NDEBUG) && defined(STANDARD)
+            return level >= ELevel::eInfo ? level : ELevel::eInfo;
+#elif defined(NDEBUG)
+            return level >= ELevel::eProg ? level : ELevel::eProg;
+#else
+            return level;
+#endif
+        }
+
+
+        void logCout(ELevel level, const string& message, const Location& loc)
+        {
+            logger::Private::mutex().lock();
+            logger::Private::getTimeAbsoluteStr( true );
+            if (logger::Private::colored())
+            {
+                //cout << color << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << skKTEndColor << endl;
+                *logger::Private::out() << Private::level2Color(level) << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
+#ifndef NDEBUG
+                *logger::Private::out() << "(tid " << std::this_thread::get_id() << ") ";
+#endif
+                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::out()));
+                *logger::Private::out() << "(" << loc.fLineNumber  << "): ";
+                *logger::Private::out() << message << EndColor() << endl;
+            }
+            else
+            {
+                //cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << endl;
+                *logger::Private::out() << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
+#ifndef NDEBUG
+                *logger::Private::out() << "(tid " << std::this_thread::get_id() << ") ";
+#endif
+                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::out()));
+                *logger::Private::out() << "(" << loc.fLineNumber  << "): ";
+                *logger::Private::out() << message << endl;
+            }
+            logger::Private::mutex().unlock();
+        }
+
+        void logCerr(ELevel level, const string& message, const Location& loc)
+        {
+            logger::Private::mutex().lock();
+            logger::Private::getTimeAbsoluteStr();
+            if (logger::Private::colored())
+            {
+                //cout << color << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << skKTEndColor << endl;
+                *logger::Private::err() << Private::level2Color(level) << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
+#ifndef NDEBUG
+                *logger::Private::err() << "(tid " << std::this_thread::get_id() << ") ";
+#endif
+                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::err()));
+                *logger::Private::err() << "(" << loc.fLineNumber  << "): ";
+                *logger::Private::err() << message << EndColor() << endl;
+            }
+            else
+            {
+                //cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << endl;
+                *logger::Private::err() << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
+#ifndef NDEBUG
+                *logger::Private::err() << "(tid " << std::this_thread::get_id() << ") ";
+#endif
+                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::err()));
+                *logger::Private::err() << "(" << loc.fLineNumber  << "): ";
+                *logger::Private::err() << message << endl;
+            }
+            logger::Private::mutex().unlock();
+        }
+    };
+
+
+    logger::logger(const char* name) : fPrivate(new Private())
+    {
+        if( logger::Private::count() == 0 )
+        {
+            sprintf( logger::Private::dateTimeFormat(),  "%%Y-%%m-%%d %%T" );
+        }
+
+        logger::Private::count()++;
+
+        if (name == 0)
+        {
+            fPrivate->fLogger = "root";
+        }
+        else
+        {
+            const char* logName = strrchr(name, '/') ? strrchr(name, '/') + 1 : name;
+            fPrivate->fLogger = logName;
+        }
+
+        UseGlobalLevel();
+        logger::Private::AllLoggers()->insert(this);
+
+        //std::cerr << "created logger (" << fPrivate->count() << ") " << fPrivate->fLogger << std::endl;
+    }
+
+    logger::logger(const std::string& name) : fPrivate(new Private())
+    {
+        if( logger::Private::count() == 0 )
+        {
+            sprintf( logger::Private::dateTimeFormat(),  "%%Y-%%m-%%d %%T" );
+        }
+
+        logger::Private::count()++;
+        
+        fPrivate->fLogger = name.c_str();
+
+		UseGlobalLevel();
+
+		logger::Private::AllLoggers()->insert(this);
+
+        //std::cerr << "created logger (" << fPrivate->count() << ") " << fPrivate->fLogger << std::endl;
+    }
+
+    logger::~logger()
+    {
+        fPrivate->count()--;
+        
+        //std::cerr << "destructing logger (" << fPrivate->count() << ") " << fPrivate->fLogger << std::endl;
+        logger::Private::AllLoggers()->erase(this);
+        //std::cerr << "logger removed from set: " << fPrivate->fLogger << std::endl;
+    }
+
+    bool logger::IsLevelEnabled(ELevel level) const
+    {
+        return level >= fPrivate->fThreshold;
+    }
+
+    logger::ELevel logger::GetLevel() const
+    {
+        return fPrivate->fThreshold;
+    }
+
+    void logger::SetLevel(ELevel level) const
+    {
+        fPrivate->fThreshold = logger::Private::filterMinimumLevel(level);
+        fPrivate->fThresholdIsGlobal = false;
+    }
+
+    void logger::UseGlobalLevel() const
+    {
+        fPrivate->fThreshold = logger::Private::filterMinimumLevel(logger::Private::GlobalThreshold());
+        fPrivate->fThresholdIsGlobal = true;
+    }
+
+    // static function
+    logger::ELevel logger::GetGlobalLevel()
+    {
+        return logger::Private::GlobalThreshold();
+    }
+
+    // static function
+    void logger::SetGlobalLevel(ELevel level)
+    {
+        logger::Private::GlobalThreshold() = logger::Private::filterMinimumLevel(level);
+        for( logger::Private::LoggerSet::iterator logIt = logger::Private::AllLoggers()->begin(); logIt != logger::Private::AllLoggers()->end(); ++logIt)
+        {
+            if( (*logIt)->fPrivate->fThresholdIsGlobal )
+            {
+                (*logIt)->fPrivate->fThreshold = logger::Private::GlobalThreshold();
+            }
+        }
+        return;
+    }
+
+    void logger::SetColored(bool flag)
+    {
+#ifndef _WIN32
+        logger::Private::colored() = flag;
+#else
+        std::cerr << "Colored logging is not enabled in Windows" << std::endl;
+#endif
+        return;
+    }
+
+    void logger::SetOutStream(std::ostream* stream)
+    {
+        logger::Private::out() = stream;
+        return;
+    }
+
+    void logger::SetErrStream(std::ostream* stream)
+    {
+        logger::Private::err() = stream;
+        return;
+    }
+
+    void logger::Log(ELevel level, const string& message, const Location& loc)
+    {
+        if (level >= ELevel::eWarn)
+        {
+            fPrivate->logCerr(level, message, loc);
+        }
+        else
+        {
+            fPrivate->logCout(level, message, loc);
+        }
+    }
+}
diff --git a/Src/Scarab/library/logger/logger.hh b/Src/Scarab/library/logger/logger.hh
new file mode 100644
index 0000000..69e9034
--- /dev/null
+++ b/Src/Scarab/library/logger/logger.hh
@@ -0,0 +1,445 @@
+/*
+ * logger.hh
+ * Based on KLogger.h, from KATRIN's Kasper
+ *
+ *  Created on: Jan 21, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_LOGGER_HH_
+#define SCARAB_LOGGER_HH_
+
+#include "macros.hh"
+#include "scarab_api.hh"
+
+#include <memory>
+
+/**
+ * @file
+ * @brief Contains the logger class and macros, based on Kasper's KLogger class.
+ * @date Created on: 18.11.2011
+ * @author Marco Haag <marco.haag@kit.edu>
+ *
+ */
+
+// UTILITY MACROS
+
+#ifndef LOGGER_UTILITY_MACROS_
+#define LOGGER_UTILITY_MACROS_
+
+#define msvc_bug_fix(m, args) m args
+#define expand(x) x
+
+//#define va_num_args(...) va_num_args_(__VA_ARGS__, 5,4,3,2,1)
+//#define va_num_args_(...) msvc_bug_fix(va_num_args_impl, (__VA_ARGS__))
+#define va_num_args(...) expand( va_num_args_impl(__VA_ARGS__, 5,4,3,2,1))
+#define va_num_args_impl(_1,_2,_3,_4,_5,N,...) N
+
+
+#define macro_dispatcher(func, ...) macro_dispatcher_(func, va_num_args(__VA_ARGS__))
+#define macro_dispatcher_(func, nargs) macro_dispatcher__(func, nargs)
+#define macro_dispatcher__(func, nargs) func ## nargs
+
+#endif  /* LOGGER_UTILITY_MACROS_ */
+
+// COLOR DEFINITIONS
+#define COLOR_NORMAL "0"
+#define COLOR_BRIGHT "1"
+#define COLOR_FOREGROUND_RED "31"
+#define COLOR_FOREGROUND_GREEN "32"
+#define COLOR_FOREGROUND_YELLOW "33"
+#define COLOR_FOREGROUND_BLUE "34"
+#define COLOR_FOREGROUND_CYAN "36"
+#define COLOR_FOREGROUND_WHITE "37"
+#define COLOR_PREFIX "\033["
+#define COLOR_SUFFIX "m"
+#define COLOR_SEPARATOR ";"
+
+// INCLUDES
+
+#include <cstring>
+#include <iostream>
+#include <sstream>
+
+// CLASS DEFINITIONS
+
+/**
+ * The standard scarab namespace.
+ */
+namespace scarab
+{
+
+    /**
+     * The scarab logger.
+     *
+     * The usage and syntax is inspired by log4j. logger itself uses the log4cxx library if it
+     * was available on the system during compiling, otherwise it falls back to std::stream.
+     *
+     * The logger output can be configured in a file specified with the environment variable
+     * @a LOGGER_CONFIGURATION (by default log4cxx.properties in the config directory).
+     *
+     * In most cases the following macro can be used
+     * to instantiate a Logger in your code:
+     * <pre>LOGGER(myLogger, "loggerName");</pre>
+     *
+     * This is equivalent to:
+     * <pre>static mantis::logger myLogger("loggerName");</pre>
+     *
+     * For logging the following macros can be used. The source code location will then automatically
+     * included in the output:
+     *
+     * <pre>
+     * LOG(myLogger, level, "message");
+     * LTRACE(myLogger, "message");
+     * LDEBUG(myLogger, "message");
+     * LINFO(myLogger, "message");
+     * LPROG(myLogger, "message");
+     * LWARN(myLogger, "message");
+     * LERROR(myLogger, "message");
+     * FATAL(myLogger, "message");
+     *
+     * ASSERT(myLogger, assertion, "message");
+     *
+     * LOG_ONCE(myLogger, level, "message");
+     * TRACE_ONCE(myLogger, "message");
+     * DEBUG_ONCE(myLogger, "message");
+     * INFO_ONCE(myLogger, "message");
+     * PROG_ONCE(myLogger, "message");
+     * WARN_ONCE(myLogger, "message");
+     * ERROR_ONCE(myLogger, "message");
+     * FATAL_ONCE(myLogger, "message");
+     * </pre>
+     *
+     */
+    class SCARAB_API logger
+    {
+        public:
+            /**
+             * \enum logger::ELevel
+             * Defines the verbosity levels and their integer equivalents
+             * Note that these values were selected to match with those used in the dripline_python project
+             */
+            enum class ELevel : unsigned 
+            {
+                eTrace = 0,
+                eDebug = 10,
+                eInfo = 20,
+                eProg = 25,
+                eWarn = 30,
+                eError = 40,
+                eFatal = 50
+            };
+
+        public:
+            /**
+             * A simple struct used by the Logger macros to pass information about the filename and line number.
+             * Not to be used directly by the user!
+             */
+            struct Location {
+                Location(const char* const fileName = "", const char* const functionName = "", int lineNumber = -1) :
+                    fLineNumber(lineNumber), fFileName(fileName), fFunctionName(functionName)
+                { }
+                int fLineNumber;
+                std::string fFileName;
+                std::string fFunctionName;
+            };
+
+        public:
+            static logger& GetRootLogger() {
+                static logger rootLogger;
+                return rootLogger;
+            }
+
+        public:
+            /**
+             * Standard constructor assigning a name to the logger instance.
+             * @param name The logger name.
+             */
+            logger(const char* name = 0);
+            /// @overload
+            logger(const std::string& name);
+
+            virtual ~logger();
+
+            /**
+             * Check whether a certain log-level is enabled.
+             * @param level The log level
+             * @return
+             */
+            bool IsLevelEnabled(ELevel level) const;
+
+            /**
+             * Get the logger's minimum logging level
+             * @return The log level
+             */
+            ELevel GetLevel() const;
+
+            /**
+             * Set a logger's minimum logging level
+             * @param level The log level
+             */
+            void SetLevel(ELevel level) const;
+
+            /**
+             * Set a logger's minimum logging level to the global level
+             */
+            void UseGlobalLevel() const;
+
+            /**
+             * Get the global minimum logging level
+             */
+            static logger::ELevel GetGlobalLevel();
+
+            /**
+             * Set all loggers' minimum logging level
+             * @param level The log level
+             */
+            static void SetGlobalLevel(ELevel level);
+
+            /**
+             * Set whether colored text will be used
+             * @param flag Bool determining whether colored text will be used
+             */
+            static void SetColored(bool flag);
+
+            /**
+             * Set the ostream pointer used for standard output messages
+             * @param stream Stream object for standard output
+             */
+            static void SetOutStream(std::ostream* stream);
+
+            /**
+             * Set the ostream pointer used for standard error messages
+             * @param stream Stream object for standard errors
+             */
+            static void SetErrStream(std::ostream* stream);
+
+            /**
+             * Log a message with the specified level.
+             * Use the macro LOG(logger, level, message).
+             * @param level The log level.
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void Log(ELevel level, const std::string& message, const Location& loc = Location());
+
+            /**
+             * Log a message at TRACE level.
+             * Use the macro LTRACE(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogTrace(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eTrace, message, loc);
+            }
+            /**
+             * Log a message at DEBUG level.
+             * Use the macro LDEBUG(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogDebug(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eDebug, message, loc);
+            }
+            /**
+             * Log a message at INFO level.
+             * Use the macro LINFO(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogInfo(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eInfo, message, loc);
+            }
+            /**
+             * Log a message at PROG level.
+             * Use the macro PROG(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogProg(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eProg, message, loc);
+            }
+            /**
+             * Log a message at WARN level.
+             * Use the macro LWARN(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogWarn(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eWarn, message, loc);
+            }
+            /**
+             * Log a message at ERROR level.
+             * Use the macro LERROR(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogError(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eError, message, loc);
+            }
+            /**
+             * Log a message at FATAL level.
+             * Use the macro FATAL(logger, message).
+             * @param message The message.
+             * @param loc Source code location (set automatically by the corresponding macro).
+             */
+            void LogFatal(const std::string& message, const Location& loc = Location())
+            {
+                Log(ELevel::eFatal, message, loc);
+            }
+
+        private:
+            struct Private;
+            std::shared_ptr<Private> fPrivate;
+    };
+
+}
+
+// PRIVATE MACROS
+
+#define __DEFAULT_LOGGER        scarab::logger::GetRootLogger()
+
+#define __LOG_LOCATION         scarab::logger::Location(__FILE__, __FUNC__, __LINE__)
+#define __LOG_LOG_4(I,L,M,O) \
+        { \
+    if (I.IsLevelEnabled(scarab::logger::ELevel::e##L)) { \
+        static bool _sLoggerMarker = false; \
+        if (!O || !_sLoggerMarker) { \
+            _sLoggerMarker = true; \
+            std::ostringstream stream; stream << M; \
+            I.Log(scarab::logger::ELevel::e##L, stream.str(), __LOG_LOCATION); \
+        } \
+    } \
+        }
+
+
+#define __LOG_LOG_3(I,L,M)     __LOG_LOG_4(I,L,M,false)
+#define __LOG_LOG_2(L,M)       __LOG_LOG_4(__DEFAULT_LOGGER,L,M,false)
+#define __LOG_LOG_1(M)         __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,false)
+
+#define __LOG_TRACE_2(I,M)     __LOG_LOG_4(I,Trace,M,false)
+#define __LOG_TRACE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Trace,M,false)
+
+#define __LOG_DEBUG_2(I,M)     __LOG_LOG_4(I,Debug,M,false)
+#define __LOG_DEBUG_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,false)
+
+#define __LOG_INFO_2(I,M)      __LOG_LOG_4(I,Info,M,false)
+#define __LOG_INFO_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Info,M,false)
+
+#define __LOG_PROG_2(I,M)      __LOG_LOG_4(I,Prog,M,false)
+#define __LOG_PROG_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Prog,M,false)
+
+#define __LOG_WARN_2(I,M)      __LOG_LOG_4(I,Warn,M,false)
+#define __LOG_WARN_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Warn,M,false)
+
+#define __LOG_ERROR_2(I,M)     __LOG_LOG_4(I,Error,M,false)
+#define __LOG_ERROR_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Error,M,false)
+
+#define __LOG_FATAL_2(I,M)     __LOG_LOG_4(I,Fatal,M,false)
+#define __LOG_FATAL_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Fatal,M,false)
+
+#define __LOG_ASSERT_3(I,C,M)  if (!(C)) { __LOG_ERROR_2(I,M) }
+#define __LOG_ASSERT_2(C,M)    __LOG_ASSERT_3(__DEFAULT_LOGGER,C,M)
+
+
+#define __LOG_LOG_ONCE_3(I,L,M)     __LOG_LOG_4(I,L,M,true)
+#define __LOG_LOG_ONCE_2(L,M)       __LOG_LOG_4(__DEFAULT_LOGGER,L,M,true)
+#define __LOG_LOG_ONCE_1(M)         __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,true)
+
+#define __LOG_TRACE_ONCE_2(I,M)     __LOG_LOG_4(I,Trace,M,true)
+#define __LOG_TRACE_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Trace,M,true)
+
+#define __LOG_DEBUG_ONCE_2(I,M)     __LOG_LOG_4(I,Debug,M,true)
+#define __LOG_DEBUG_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,true)
+
+#define __LOG_INFO_ONCE_2(I,M)      __LOG_LOG_4(I,Info,M,true)
+#define __LOG_INFO_ONCE_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Info,M,true)
+
+#define __LOG_PROG_ONCE_2(I,M)      __LOG_LOG_4(I,Prog,M,true)
+#define __LOG_PROG_ONCE_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Prog,M,true)
+
+#define __LOG_WARN_ONCE_2(I,M)      __LOG_LOG_4(I,Warn,M,true)
+#define __LOG_WARN_ONCE_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Warn,M,true)
+
+#define __LOG_ERROR_ONCE_2(I,M)     __LOG_LOG_4(I,Error,M,true)
+#define __LOG_ERROR_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Error,M,true)
+
+#define __LOG_FATAL_ONCE_2(I,M)     __LOG_LOG_4(I,Fatal,M,true)
+#define __LOG_FATAL_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Fatal,M,true)
+
+
+// PUBLIC MACROS
+
+#define LOGGER(I,K)      static scarab::logger I(K);
+
+#ifndef _WIN32
+
+#define LOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
+#ifdef NDEBUG
+#define LTRACE(...)
+#define LDEBUG(...)
+#else
+#define LTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
+#define LDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
+#endif
+#define LINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
+#define LPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
+#define LWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
+#define LERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
+#define LFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
+#define LASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
+
+#define LOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#ifdef NDEBUG
+#define LTRACE_ONCE(...)
+#define LDEBUG_ONCE(...)
+#else
+#define LTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#endif
+#define LINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+#define LFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
+
+#else /*_WIN32*/
+
+#define LOG(I, ...)          __LOG_LOG_2(I, __VA_ARGS__)
+#ifdef NDEBUG
+#define LTRACE(I, ...)
+#define LDEBUG(I, ...)
+#else
+#define LTRACE(I, ...)       __LOG_TRACE_2(I, __VA_ARGS__)
+#define LDEBUG(I, ...)       __LOG_DEBUG_2(I, __VA_ARGS__)
+#endif
+#define LINFO(I, ...)        __LOG_INFO_2(I, __VA_ARGS__)
+#define LPROG(I, ...)        __LOG_PROG_2(I, __VA_ARGS__)
+#define LWARN(I, ...)        __LOG_WARN_2(I, __VA_ARGS__)
+#define LERROR(I, ...)       __LOG_ERROR_2(I, __VA_ARGS__)
+#define LFATAL(I, ...)       __LOG_FATAL_2(I, __VA_ARGS__)
+#define LASSERT(I, ...)      __LOG_ASSERT_2(I, __VA_ARGS__)
+
+#define LOG_ONCE(I, ...)     __LOG_LOG_ONCE_2(I, __VA_ARGS__)
+#ifdef NDEBUG
+#define LTRACE_ONCE(I, ...)
+#define LDEBUG_ONCE(I, ...)
+#else
+#define LTRACE_ONCE(I, ...)  __LOG_TRACE_ONCE_2(I, __VA_ARGS__)
+#define LDEBUG_ONCE(I, ...)  __LOG_DEBUG_ONCE_2(I, __VA_ARGS__)
+#endif
+#define LINFO_ONCE(I, ...)   __LOG_INFO_ONCE_2(I, __VA_ARGS__)
+#define LPROG_ONCE(I, ...)   __LOG_PROG_ONCE_2(I, __VA_ARGS__)
+#define LWARN_ONCE(I, ...)   __LOG_WARN_ONCE_2(I, __VA_ARGS__)
+#define LERROR_ONCE(I, ...)  __LOG_ERROR_ONCE_2(I, __VA_ARGS__)
+#define LFATAL_ONCE(I, ...)  __LOG_FATAL_ONCE_2(I, __VA_ARGS__)
+
+#endif /*_WIN32*/
+
+#endif /* SCARAB_LOGGER_HH_ */
diff --git a/Src/Scarab/library/param/CMakeLists.txt b/Src/Scarab/library/param/CMakeLists.txt
new file mode 100644
index 0000000..301663b
--- /dev/null
+++ b/Src/Scarab/library/param/CMakeLists.txt
@@ -0,0 +1,25 @@
+# CMakeLists.txt for Scarab/library/param
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/param.hh
+    ${dir}/param_array.hh
+    ${dir}/param_base.hh
+    ${dir}/param_base_impl.hh
+    ${dir}/param_codec.hh
+    ${dir}/param_helpers.hh
+    ${dir}/param_node.hh
+    ${dir}/param_value.hh
+    PARENT_SCOPE )
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/param_array.cc
+    ${dir}/param_base.cc
+    ${dir}/param_codec.cc
+    ${dir}/param_helpers.cc
+    ${dir}/param_node.cc
+    ${dir}/param_value.cc
+    PARENT_SCOPE )
diff --git a/Src/Scarab/library/param/codec/json/CMakeLists.txt b/Src/Scarab/library/param/codec/json/CMakeLists.txt
new file mode 100644
index 0000000..df91748
--- /dev/null
+++ b/Src/Scarab/library/param/codec/json/CMakeLists.txt
@@ -0,0 +1,13 @@
+# CMakeLists.txt for Scarab/param/codec/json
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/param_json.hh
+    PARENT_SCOPE )
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/param_json.cc
+    PARENT_SCOPE )
diff --git a/Src/Scarab/library/param/codec/json/param_json.cc b/Src/Scarab/library/param/codec/json/param_json.cc
new file mode 100644
index 0000000..35d287b
--- /dev/null
+++ b/Src/Scarab/library/param/codec/json/param_json.cc
@@ -0,0 +1,276 @@
+/*
+ * param_json.cc
+ *
+ *  Created on: March 27, 2015
+ *      Author: nsoblath, bhlaroque
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include <sstream>
+using std::string;
+using std::stringstream;
+
+#include "param_json.hh"
+
+#include "logger.hh"
+
+#include "rapidjson/document.h"
+#include "rapidjson/filereadstream.h"
+#include "rapidjson/filewritestream.h"
+#include "rapidjson/stringbuffer.h"
+
+
+
+namespace scarab
+{
+    LOGGER( dlog, "param" );
+
+    REGISTER_PARAM_INPUT_CODEC( param_input_json, "json" );
+
+    param_input_json::param_input_json()
+    {
+    }
+    param_input_json::~param_input_json()
+    {
+    }
+
+    param_ptr_t param_input_json::read_file( const std::string& a_filename, const param_node& )
+    {
+        FILE* t_config_file = fopen( a_filename.c_str(), "r" );
+        if( t_config_file == NULL )
+        {
+            LERROR( dlog, "file <" << a_filename << "> did not open" );
+            return NULL;
+        }
+
+        char t_buffer[ RAPIDJSON_FILE_BUFFER_SIZE ];
+        rapidjson::FileReadStream t_file_stream( t_config_file, t_buffer, sizeof(t_buffer) );
+
+        rapidjson::Document t_config_doc;
+        if( t_config_doc.ParseStream<0>( t_file_stream ).HasParseError() )
+        {
+            unsigned errorPos = t_config_doc.GetErrorOffset();
+            rewind( t_config_file );
+            unsigned iChar, newlineCount = 1, lastNewlinePos = 0;
+            int thisChar;
+            for( iChar = 0; iChar != errorPos; ++iChar )
+            {
+                thisChar = fgetc( t_config_file );
+                if( thisChar == EOF )
+                {
+                    break;
+                }
+                if( thisChar == '\n' || thisChar == '\r' )
+                {
+                    newlineCount++;
+                    lastNewlinePos = iChar + 1;
+                }
+            }
+            if( iChar == errorPos )
+            {
+                LERROR( dlog, "error parsing config file :\n" <<
+                        '\t' << t_config_doc.GetParseError() << '\n' <<
+                        "\tThe error was reported at line " << newlineCount << ", character " << errorPos - lastNewlinePos );
+            }
+            else
+            {
+                LERROR( dlog, "error parsing config file :\n" <<
+                        '\t' << t_config_doc.GetParseError() <<
+                        "\tend of file reached before error location was found" );
+            }
+            fclose( t_config_file );
+            return NULL;
+        }
+        fclose( t_config_file );
+
+        return param_input_json::read_document( t_config_doc );
+    }
+
+    param_ptr_t param_input_json::read_string( const std::string& a_json_string, const param_node& )
+    {
+        rapidjson::Document t_config_doc;
+        if( t_config_doc.Parse<0>( a_json_string.c_str() ).HasParseError() )
+        {
+            LERROR( dlog, "error parsing string:\n" << t_config_doc.GetParseError() );
+            return NULL;
+        }
+        return param_input_json::read_document( t_config_doc );
+    }
+
+    param_ptr_t param_input_json::read_document( const rapidjson::Document& a_doc )
+    {
+        return read_value( a_doc );
+    }
+
+    param_ptr_t param_input_json::read_value( const rapidjson::Value& a_value )
+    {
+        if( a_value.IsNull() )
+        {
+            return std::unique_ptr< param >( new param() );
+        }
+        if( a_value.IsObject() )
+        {
+            std::unique_ptr< param_node > t_obj_as_param( new param_node() );
+            for( rapidjson::Value::ConstMemberIterator jsonIt = a_value.MemberBegin();
+                    jsonIt != a_value.MemberEnd();
+                    ++jsonIt)
+            {
+                t_obj_as_param->replace( jsonIt->name.GetString(), param_input_json::read_value( jsonIt->value ) );
+            }
+            return t_obj_as_param;
+        }
+        if( a_value.IsArray() )
+        {
+            std::unique_ptr< param_array > t_array_as_param( new param_array() );
+            for( rapidjson::Value::ConstValueIterator jsonIt = a_value.Begin();
+                    jsonIt != a_value.End();
+                    ++jsonIt)
+            {
+                t_array_as_param->push_back( std::move(*param_input_json::read_value( *jsonIt )) );
+            }
+            return t_array_as_param;
+        }
+        if( a_value.IsString() )
+        {
+            //LWARN( dlog, "reading string from json: " << a_value.GetString() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetString() ) );
+        }
+        if( a_value.IsBool() )
+        {
+            //LWARN( dlog, "reading bool from json: " << a_value.GetBool() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetBool() ) );
+        }
+        if( a_value.IsInt() )
+        {
+            //LWARN( dlog, "reading int from json: " << a_value.GetInt() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetInt() ) ) ;
+        }
+        if( a_value.IsUint() )
+        {
+            //LWARN( dlog, "reading uint from json: " << a_value.GetUint() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetUint() ) );
+        }
+        if( a_value.IsInt64() )
+        {
+            //LWARN( dlog, "reading int64 from json: " << a_value.GetInt64() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetInt64() ) );
+        }
+        if( a_value.IsUint64() )
+        {
+            //LWARN( dlog, "reading uint64 from json: " << a_value.GetUint64() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetUint64() ) );
+        }
+        if( a_value.IsDouble() )
+        {
+            //LWARN( dlog, "reading double from json: " << a_value.GetDouble() );
+            return std::unique_ptr< param_value >( new param_value( a_value.GetDouble() ) );
+        }
+        LWARN( dlog, "(config_reader_json) unknown type; returning null value" );
+        return std::unique_ptr< param >( new param() );
+    }
+
+
+    REGISTER_PARAM_OUTPUT_CODEC( param_output_json, "json" );
+
+    param_output_json::param_output_json()
+    {}
+
+    param_output_json::~param_output_json()
+    {}
+
+    bool param_output_json::write_file( const param& a_to_write, const std::string& a_filename, const param_node& a_options )
+    {
+        if( a_filename.empty() )
+        {
+            LERROR( dlog, "Filename cannot be an empty string" );
+            return false;
+        }
+
+        FILE* file = fopen( a_filename.c_str(), "w" );
+        if( file == NULL )
+        {
+            LERROR( dlog, "Unable to open file: " << a_filename );
+            return false;
+        }
+
+        char t_buffer[ RAPIDJSON_FILE_BUFFER_SIZE ];
+        rapidjson::FileWriteStream t_filestream( file, t_buffer, sizeof(t_buffer) );
+
+        json_writing_style t_style = k_compact;
+        if( a_options.has( "style" ) )
+        {
+            if( a_options["style"]().is_uint() )
+            {
+                t_style = (json_writing_style)a_options.get_value< unsigned >( "style", k_compact );
+            }
+            else
+            {
+                string t_style_string( a_options.get_value( "style", "compact" ) );
+                if( t_style_string == string( "pretty" ) ) t_style = k_pretty;
+            }
+        }
+
+        bool t_result = false;
+        if( t_style == k_compact )
+        {
+            rj_file_writer t_writer( t_filestream );
+            t_result = param_output_json::write_param( a_to_write, &t_writer );
+        }
+        else
+        {
+            rj_pretty_file_writer t_writer( t_filestream );
+            t_result = param_output_json::write_param( a_to_write, &t_writer );
+        }
+
+        if (! t_result )
+        {
+            LERROR( dlog, "Error while writing file" );
+            return false;
+        }
+
+        return true;
+    }
+
+    bool param_output_json::write_string( const param& a_to_write, std::string& a_string, const param_node& a_options )
+    {
+        rapidjson::StringBuffer t_str_buff;
+
+        json_writing_style t_style = k_compact;
+        if( a_options.has( "style" ) )
+        {
+            if( a_options["style"]().is_uint() )
+            {
+                t_style = (json_writing_style)a_options.get_value< unsigned >( "style", k_compact );
+            }
+            else
+            {
+                string t_style_string( a_options.get_value( "style", "compact" ) );
+                if( t_style_string == string( "pretty" ) ) t_style = k_pretty;
+            }
+        }
+
+        bool t_result = false;
+        if( t_style == k_compact )
+        {
+            rj_string_writer t_writer( t_str_buff );
+            t_result = param_output_json::write_param( a_to_write, &t_writer );
+        }
+        else
+        {
+            rj_pretty_string_writer t_writer( t_str_buff );
+            t_result = param_output_json::write_param( a_to_write, &t_writer );
+        }
+
+        if (! t_result )
+        {
+            LERROR( dlog, "Error while writing string" );
+            return false;
+        }
+
+        a_string.assign( t_str_buff.GetString() );
+
+        return true;
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/param/codec/json/param_json.hh b/Src/Scarab/library/param/codec/json/param_json.hh
new file mode 100644
index 0000000..6d01d22
--- /dev/null
+++ b/Src/Scarab/library/param/codec/json/param_json.hh
@@ -0,0 +1,202 @@
+/*
+ * param_json.hh
+ *
+ *  Created on: March 27, 2015
+ *      Author: nsoblath, bhlaroque
+ */
+
+#ifndef SCARAB_PARAM_JSON_HH_
+#define SCARAB_PARAM_JSON_HH_
+
+#include "param_codec.hh"
+
+#include "logger.hh"
+#include "param.hh"
+
+#include "rapidjson/fwd.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/writer.h"
+
+#include <deque>
+#include <map>
+#include <sstream>
+#include <string>
+
+
+namespace scarab
+{
+    LOGGER( dlog_param_json, "param_json" );
+
+    //***************************************
+    //************** INPUT ******************
+    //***************************************
+
+    /*!
+     @class param_input_json
+     @author N.S. Oblath
+
+     @brief Convert JSON to Param
+
+     @details
+     Options: None
+    */
+    class SCARAB_API param_input_json : public param_input_codec
+    {
+        public:
+            param_input_json();
+            virtual ~param_input_json();
+
+            virtual param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node() );
+            virtual param_ptr_t read_string( const std::string& a_json_str, const param_node& a_options = param_node() );
+            param_ptr_t read_document( const rapidjson::Document& a_document );
+            param_ptr_t read_value( const rapidjson::Value& a_value );
+    };
+
+    //***************************************
+    //************** OUTPUT *****************
+    //***************************************
+
+    /*!
+     @class param_output_json
+     @author N.S. Oblath
+
+     @brief Convert Param to JSON
+
+     @details
+     Options:
+       - JSON Style
+           Pretty print: { "style": param_output_json::k_pretty } or { "style": "pretty" }
+           Compact (default): { "style": param_output_json::k_compact } or { "style": "compact" } or anything else
+    */
+    class SCARAB_API param_output_json : public param_output_codec
+    {
+        public:
+            typedef rapidjson::Writer< rapidjson::FileWriteStream > rj_file_writer;
+            typedef rapidjson::PrettyWriter< rapidjson::FileWriteStream > rj_pretty_file_writer;
+            typedef rapidjson::Writer< rapidjson::StringBuffer > rj_string_writer;
+            typedef rapidjson::PrettyWriter< rapidjson::StringBuffer > rj_pretty_string_writer;
+
+            enum json_writing_style
+            {
+                k_compact = 0,
+                k_pretty = 1
+            };
+
+        public:
+            param_output_json();
+            virtual ~param_output_json();
+
+            virtual bool write_file( const param& a_to_write, const std::string& a_filename, const param_node& a_options = param_node() );
+            virtual bool write_string( const param& a_to_write, std::string& a_string, const param_node& a_options = param_node() );
+
+            template< class XWriter >
+            bool write_param( const param& a_to_write, XWriter* a_writer );
+            template< class XWriter >
+            bool write_param_null( const param& a_to_write, XWriter* a_writer );
+            template< class XWriter >
+            bool write_param_value( const param_value& a_to_write, XWriter* a_writer );
+            template< class XWriter >
+            bool write_param_array( const param_array& a_to_write, XWriter* a_writer );
+            template< class XWriter >
+            bool write_param_node( const param_node& a_to_write, XWriter* a_writer );
+
+    };
+
+    template< class XWriter >
+    bool param_output_json::write_param( const param& a_to_write, XWriter* a_writer )
+    {
+        if( a_to_write.is_null() )
+        {
+            return param_output_json::write_param_null( a_to_write, a_writer );
+        }
+        if( a_to_write.is_value() )
+        {
+            return param_output_json::write_param_value( a_to_write.as_value(), a_writer );
+        }
+        if( a_to_write.is_array() )
+        {
+            return param_output_json::write_param_array( a_to_write.as_array(), a_writer );
+        }
+        if( a_to_write.is_node() )
+        {
+            return param_output_json::write_param_node( a_to_write.as_node(), a_writer );
+        }
+        LWARN( dlog_param_json, "parameter not written: <" << a_to_write << ">" );
+        return false;
+    }
+    template< class XWriter >
+    bool param_output_json::write_param_null( const param& /*a_to_write*/, XWriter* a_writer )
+    {
+        //LWARN( dlog_param_json, "writing null" );
+        a_writer->Null();
+        return true;
+    }
+    template< class XWriter >
+    bool param_output_json::write_param_value( const param_value& a_to_write, XWriter* a_writer )
+    {
+        //LWARN( dlog_param_json, "writing value" );
+        if( a_to_write.is_string() )
+        {
+            a_writer->String( a_to_write.as_string().c_str() );
+            //LWARN( dlog_param_json, "writing string to json: " << a_to_write.as_string() );
+        }
+        else if( a_to_write.is_bool() )
+        {
+            a_writer->Bool( a_to_write.as_bool() );
+            //LWARN( dlog_param_json, "writing bool to json: " << a_to_write.as_bool() );
+        }
+        else if( a_to_write.is_int() )
+        {
+            a_writer->Int64( a_to_write.as_int() );
+            //LWARN( dlog_param_json, "writing int to json: " << a_to_write.as_int() );
+        }
+        else if( a_to_write.is_uint() )
+        {
+            a_writer->Uint64( a_to_write.as_uint() );
+            //LWARN( dlog_param_json, "writing uint to json: " << a_to_write.as_uint() );
+        }
+        else if( a_to_write.is_double() )
+        {
+            a_writer->Double( a_to_write.as_double() );
+            //LWARN( dlog_param_json, "writing double to json: " << a_to_write.as_double() );
+        }
+        return true;
+    }
+    template< class XWriter >
+    bool param_output_json::write_param_array( const param_array& a_to_write, XWriter* a_writer )
+    {
+        //LWARN( dlog_param_json, "writing array" );
+        a_writer->StartArray();
+        for( param_array::const_iterator it = a_to_write.begin(); it != a_to_write.end(); ++it )
+        {
+            if( ! param_output_json::write_param( *it, a_writer ) )
+            {
+                LERROR( dlog_param_json, "Error while writing parameter array" );
+                return false;
+            }
+        }
+        a_writer->EndArray();
+        return true;
+    }
+    template< class XWriter >
+    bool param_output_json::write_param_node( const param_node& a_to_write, XWriter* a_writer )
+    {
+        //LWARN( dlog_param_json, "writing node" );
+        a_writer->StartObject();
+        for( param_node::const_iterator it = a_to_write.begin(); it != a_to_write.end(); ++it )
+        {
+            a_writer->String( it.name().c_str() );
+            if( ! param_output_json::write_param( *it, a_writer ) )
+            {
+                LERROR( dlog_param_json, "Error while writing parameter node" );
+                return false;
+            }
+        }
+        a_writer->EndObject();
+        return true;
+    }
+
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_JSON_HH_ */
diff --git a/Src/Scarab/library/param/codec/yaml/CMakeLists.txt b/Src/Scarab/library/param/codec/yaml/CMakeLists.txt
new file mode 100644
index 0000000..453723a
--- /dev/null
+++ b/Src/Scarab/library/param/codec/yaml/CMakeLists.txt
@@ -0,0 +1,13 @@
+# CMakeLists.txt for Scarab/param/codec/yaml
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/param_yaml.hh
+    PARENT_SCOPE )
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/param_yaml.cc
+    PARENT_SCOPE )
diff --git a/Src/Scarab/library/param/codec/yaml/param_yaml.cc b/Src/Scarab/library/param/codec/yaml/param_yaml.cc
new file mode 100644
index 0000000..40e1eba
--- /dev/null
+++ b/Src/Scarab/library/param/codec/yaml/param_yaml.cc
@@ -0,0 +1,309 @@
+/*
+ * param_yaml.cc
+ *
+ *  Created on: Jan 19, 2016
+ *      Author: bidishasen97
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "param_yaml.hh"
+
+#include "logger.hh"
+#include "param.hh"
+
+#include <sstream>
+#include <fstream>
+
+using std::string;
+using std::stringstream;
+
+namespace scarab
+{
+    LOGGER( slog, "param_yaml" );
+
+    REGISTER_PARAM_INPUT_CODEC( param_input_yaml, "yaml" );
+
+    param_input_yaml::param_input_yaml()
+    {}
+
+    param_input_yaml::~param_input_yaml()
+    {}
+
+    param_ptr_t param_input_yaml::read_file( const std::string& a_filename, const param_node& )
+    {
+        try
+        {
+            YAML::Node root_node = YAML::LoadFile( a_filename );
+            return param_input_yaml::read_node_type( root_node );
+        }
+        catch( YAML::Exception& e )
+        {
+            LERROR( slog, "YAML error: " << e.what() );
+            return std::unique_ptr< param >();
+        }
+    }
+
+    std::unique_ptr< param > param_input_yaml::read_string( const std::string& a_string, const param_node& )
+    {
+        try
+        {
+            YAML::Node root_node = YAML::Load( a_string );
+            return param_input_yaml::read_node_type( root_node );
+        }
+        catch( YAML::Exception& e )
+        {
+            LERROR( slog, "YAML error: " << e.what() );
+            return std::unique_ptr< param >();
+        }
+    }
+
+    param_ptr_t param_input_yaml::read_node_type( const YAML::Node& a_node )
+    {
+        try
+        {
+            if( a_node.IsNull() )
+            {
+                return param_ptr_t( new param() );
+            }
+            if( a_node.IsScalar() )
+            {
+                return param_input_yaml::scalar_handler(a_node);
+            }
+            if( a_node.IsSequence() )
+            {
+                return param_input_yaml::sequence_handler(a_node);
+            }
+            if( a_node.IsMap() )
+            {
+                return param_input_yaml::map_handler(a_node);
+            }
+        }
+        catch( YAML::Exception& e )
+        {
+            LERROR(slog, "YAML error in read_node_type: " << e.what());
+            throw error() << "YAML error: " << e.what();
+        }
+        LDEBUG( slog, "YAML unknown" );
+        throw error() << "Unknown YAML encountered";
+        return std::unique_ptr< param >();
+    }
+
+    std::unique_ptr< param_array > param_input_yaml::sequence_handler( const YAML::Node& a_node )
+    {
+        try
+        {
+            std::unique_ptr< param_array > t_array_as_param( new param_array() );
+
+            for( YAML::const_iterator counter = a_node.begin(); counter != a_node.end(); ++counter )
+            {
+                t_array_as_param->push_back( param_input_yaml::read_node_type( *counter ) );
+            }
+
+            return t_array_as_param;
+        }
+        catch( YAML::Exception& e )
+        {
+            LERROR( slog, "YAML error in sequence_handler: " << e.what() );
+            return std::unique_ptr< param_array >();
+        }
+    }
+
+    std::unique_ptr< param_node > param_input_yaml::map_handler( const YAML::Node& a_node )
+    {
+        try
+        {
+            std::unique_ptr< param_node > t_map_as_param( new param_node() );
+
+            for( YAML::const_iterator counter = a_node.begin(); counter != a_node.end(); ++counter )
+            {
+                t_map_as_param->replace( counter->first.as< std::string >(), param_input_yaml::read_node_type( counter->second ) );
+            }
+
+            return t_map_as_param;
+        }
+        catch( YAML::Exception& e )
+        {
+            LERROR( slog, "YAML error in map_handler: " << e.what() );
+            return std::unique_ptr< param_node >();
+        }
+    }
+
+    std::unique_ptr< param_value > param_input_yaml::scalar_handler( const YAML::Node& a_node )
+    {
+        try
+        {
+            // the order of these try statements matters!
+            try
+            {
+                return std::unique_ptr< param_value >( new param_value( a_node.as< unsigned >() ) );
+            }
+            catch( YAML::TypedBadConversion<unsigned>& )
+            {
+                try
+                {
+                    return std::unique_ptr< param_value >( new param_value( a_node.as< int >() ) );
+                }
+                catch( const YAML::TypedBadConversion<int>& )
+                {
+                    try
+                    {
+                        return std::unique_ptr< param_value >( new param_value( a_node.as< double >() ) );
+                    }
+                    catch( const YAML::TypedBadConversion<double>& )
+                    {
+                        try
+                        {
+                            return std::unique_ptr< param_value >( new param_value( a_node.as< bool >() ) );
+                        }
+                        catch( const YAML::TypedBadConversion<bool>& )
+                        {
+                            try
+                            {
+                                return std::unique_ptr< param_value >( new param_value( a_node.as< std::string >() ) );
+                            }
+                            catch( const YAML::TypedBadConversion<std::string>& )
+                            {
+                                return std::unique_ptr< param_value >( new param_value( a_node.Scalar() ) );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        catch ( YAML::Exception& e )
+        {
+            LERROR( slog, "YAML error in scalar_handler: " << e.what() )
+            return std::unique_ptr< param_value >();
+        }
+        return std::unique_ptr< param_value >();
+    }
+
+
+    REGISTER_PARAM_OUTPUT_CODEC( param_output_yaml, "yaml" );
+
+    param_output_yaml::param_output_yaml()
+    {}
+
+    param_output_yaml::~param_output_yaml()
+    {}
+
+    bool param_output_yaml::write_file( const param& a_to_write, const std::string& a_filename, const param_node& )
+    {
+        if( a_filename.empty() )
+        {
+            LERROR( slog, "Filename cannot be an empty string" );
+            return false;
+        }
+
+        YAML::Node a_node = param_output_yaml::check_param_type(a_to_write);
+
+        std::ofstream fout( a_filename.c_str() );
+        if (! fout.is_open() )
+        {
+            LERROR( slog, "Unable to open file: " << a_filename );
+            return false;
+        }
+
+        fout << a_node;
+
+        fout.close();
+
+        return true;
+    }
+
+    bool param_output_yaml::write_string( const param& a_to_write, std::string& a_string, const param_node& )
+    {
+        YAML::Node a_node = param_output_yaml::check_param_type( a_to_write );
+
+        std::stringstream t_out;
+        t_out << a_node;
+        a_string = t_out.str();
+
+        return true;
+    }
+
+    YAML::Node param_output_yaml::check_param_type( const param& a_to_write )
+    {
+        if( a_to_write.is_null() )
+        {
+            return YAML::Node();
+        }
+        else if( a_to_write.is_node() )
+        {
+            return param_output_yaml::param_node_handler( a_to_write );
+        }
+        else if( a_to_write.is_array() )
+        {
+            return param_output_yaml::param_array_handler( a_to_write );
+        }
+        else if( a_to_write.is_value() )
+        {
+            return param_output_yaml::param_value_handler( a_to_write );
+        }
+        LWARN( slog, "Unknown param type encountered" );
+        return YAML::Node();
+    }
+
+    YAML::Node param_output_yaml::param_node_handler( const param& a_to_write )
+    {
+        YAML::Node t_node;
+
+        const param_node& p_node = a_to_write.as_node();
+        for( param_node::const_iterator counter = p_node.begin(); counter != p_node.end(); ++counter )
+        {
+            t_node[counter.name()] = param_output_yaml::check_param_type( *counter );
+        }
+
+        return t_node;
+    }
+
+    YAML::Node param_output_yaml::param_array_handler( const param& a_to_write )
+    {
+        YAML::Node t_node;
+
+        const param_array& array = a_to_write.as_array();
+        for ( int count = 0; count != (int) array.size(); ++count )
+        {
+            t_node.push_back(param_output_yaml::check_param_type( array[count] ) );
+        }
+
+        return t_node;
+    }
+
+    YAML::Node param_output_yaml::param_value_handler( const param& a_to_write )
+    {
+        YAML::Node t_node;
+
+        const param_value& value = static_cast< const param_value& >(a_to_write);
+        if( value.is_bool() )
+        {
+            return t_node = value.as_bool();
+        }
+
+        else if( value.is_uint() )
+        {
+            return t_node = value.as_uint();
+        }
+
+        else if( value.is_double() )
+        {
+            return t_node = value.as_double();
+        }
+
+        else if( value.is_int() )
+        {
+            return t_node = value.as_int();
+        }
+
+        else if( value.is_string() )
+        {
+            return t_node = value.as_string();
+        }
+
+        LWARN( slog, "Unkown value type encountered" );
+        return YAML::Node();
+    }
+}
+/* namespace scarab */
+
diff --git a/Src/Scarab/library/param/codec/yaml/param_yaml.hh b/Src/Scarab/library/param/codec/yaml/param_yaml.hh
new file mode 100644
index 0000000..11867e6
--- /dev/null
+++ b/Src/Scarab/library/param/codec/yaml/param_yaml.hh
@@ -0,0 +1,79 @@
+/*
+ * param_yaml.hh
+ *
+ *  Created on: Jan 19, 2016
+ *      Author: bidishasen97
+ */
+
+#ifndef PARAM_YAML_HH_
+#define PARAM_YAML_HH_
+
+#include "yaml-cpp/yaml.h"
+
+#include "param_codec.hh"
+
+
+namespace scarab
+{
+    class param_array;
+    class param_value;
+
+    //***************************************
+    //************** INPUT ******************
+    //***************************************
+
+    /*!
+     @class param_input_yaml
+     @author N.S. Oblath
+
+     @brief Convert YAML to Param
+
+     @details
+     Options: None
+    */
+    class SCARAB_API param_input_yaml : public param_input_codec
+    {
+        public:
+            param_input_yaml();
+            virtual ~param_input_yaml();
+
+            virtual param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node() );
+            virtual param_ptr_t read_string( const std::string& a_string, const param_node& a_options = param_node() );
+
+            param_ptr_t read_node_type( const YAML::Node& a_node );
+            std::unique_ptr< param_array > sequence_handler( const YAML::Node& a_node );
+            std::unique_ptr< param_node > map_handler( const YAML::Node& a_node );
+            std::unique_ptr< param_value > scalar_handler( const YAML::Node& a_node );
+    };
+
+    //***************************************
+    //************** OUTPUT *****************
+    //***************************************
+
+    /*!
+     @class param_output_yaml
+     @author N.S. Oblath
+
+     @brief Convert Param to YAML
+
+     @details
+     Options: None
+    */
+    class SCARAB_API param_output_yaml : public param_output_codec
+    {
+        public:
+            param_output_yaml();
+            virtual ~param_output_yaml();
+
+            virtual bool write_file( const param& a_to_write, const std::string& a_filename, const param_node& a_options = param_node() );
+            virtual bool write_string( const param& a_to_write, std::string& a_string, const param_node& a_options = param_node() );
+
+            YAML::Node check_param_type( const param& a_to_write );
+            YAML::Node param_node_handler( const param& a_to_write );
+            YAML::Node param_array_handler( const param& a_to_write );
+            YAML::Node param_value_handler( const param& a_to_write );
+    };
+
+} /* namespace scarab */
+
+#endif /* PARAM_YAML_HH_ */
diff --git a/Src/Scarab/library/param/param.hh b/Src/Scarab/library/param/param.hh
new file mode 100644
index 0000000..c06069e
--- /dev/null
+++ b/Src/Scarab/library/param/param.hh
@@ -0,0 +1,18 @@
+/*
+ * param.hh
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PARAM_HH_
+#define SCARAB_PARAM_HH_
+
+#include "param_array.hh"
+#include "param_base.hh"
+#include "param_node.hh"
+#include "param_value.hh"
+
+#include "param_base_impl.hh"
+
+#endif /* SCARAB_PARAM_HH_ */
diff --git a/Src/Scarab/library/param/param_array.cc b/Src/Scarab/library/param/param_array.cc
new file mode 100644
index 0000000..f352ab9
--- /dev/null
+++ b/Src/Scarab/library/param/param_array.cc
@@ -0,0 +1,172 @@
+/*
+ * param_array.cc
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include <sstream>
+using std::string;
+using std::stringstream;
+
+#include "param_array.hh"
+
+#include "param_base_impl.hh"
+#include "param_node.hh"
+
+
+namespace scarab
+{
+
+    param_array::param_array() :
+            param(),
+            f_contents()
+    {
+    }
+
+    param_array::param_array( const param_array& orig ) :
+            param( orig ),
+            f_contents( orig.f_contents.size() )
+    {
+        for( unsigned ind = 0; ind < f_contents.size(); ++ind )
+        {
+            f_contents[ind] = orig.f_contents[ ind ]->clone();
+        }
+    }
+
+    param_array::param_array( param_array&& orig ) :
+            param( std::move(orig) ),
+            f_contents( orig.f_contents.size() )
+    {
+        for( unsigned ind = 0; ind < f_contents.size(); ++ind )
+        {
+            f_contents[ind] = orig.f_contents[ ind ]->move_clone();
+        }
+        orig.clear();
+    }
+
+    param_array::~param_array()
+    {
+    }
+
+    param_array& param_array::operator=( const param_array& rhs )
+    {
+        this->param::operator=( rhs );
+        clear();
+        resize( rhs.size()) ;
+        for( unsigned ind = 0; ind < rhs.f_contents.size(); ++ind )
+        {
+            f_contents[ind] = rhs.f_contents[ ind ]->clone();
+        }
+        return *this;
+    }
+
+    param_array& param_array::operator=( param_array&& rhs )
+    {
+        this->param::operator=( std::move(rhs) );
+        clear();
+        resize( rhs.size()) ;
+        for( unsigned ind = 0; ind < rhs.f_contents.size(); ++ind )
+        {
+            f_contents[ind] = rhs.f_contents[ ind ]->move_clone();
+        }
+        rhs.clear();
+        return *this;
+    }
+
+    void param_array::resize( unsigned a_size )
+    {
+        f_contents.resize( a_size );
+        for( auto it = f_contents.begin(); it != f_contents.end(); ++it )
+        {
+            if( ! *it ) it->reset( new param() );
+        }
+        return;
+    }
+
+    bool param_array::has_subset( const param& a_subset ) const
+    {
+        if( ! a_subset.is_array() ) return false;
+        const param_array& t_subset_array = a_subset.as_array();
+        if( t_subset_array.size() > f_contents.size() ) return false;
+        contents::const_iterator t_this_it = f_contents.begin();
+        contents::const_iterator t_that_it = t_subset_array.f_contents.begin();
+        while( t_that_it != t_subset_array.f_contents.end() ) // loop condition is on a_subset because it's smaller or equal to this
+        {
+            if( ! (*t_this_it)->has_subset( **t_that_it ) ) return false;
+            ++t_this_it;
+            ++t_that_it;
+        }
+        return true;
+    }
+
+    void param_array::merge( const param_array& a_object )
+    {
+        //LDEBUG( dlog, "merging array with " << a_object.size() << " items:\n" << a_object );
+        if( size() < a_object.size() ) resize( a_object.size() );
+
+        for( unsigned index = 0; index < size() && index < a_object.size(); ++index )
+        {
+            // directly assign if destination location is empty
+            if( f_contents.at( index )->is_null() )
+            {
+                //LDEBUG( dlog, "have a null object at <" << index << ">; adding <" << a_object[index] << ">" );
+                assign( index, a_object[index] );
+                continue;
+            }
+
+            // overwrite/recurse if destination location matches incoming type
+            param& t_param = (*this)[index];
+            if( t_param.is_value() && a_object[index].is_value() )
+            {
+                //LDEBUG( dlog, "replacing the value at <" << index << "> with <" << a_object[index] << ">" );
+                t_param.as_value() = a_object[index].as_value();
+                continue;
+            }
+            if( t_param.is_node() && a_object[index].is_node() )
+            {
+                //LDEBUG( dlog, "merging nodes at <" << index << ">" )
+                t_param.as_node().merge( a_object[index].as_node() );
+                continue;
+            }
+            if( t_param.is_array() && a_object[index].is_array() )
+            {
+                //LDEBUG( dlog, "merging array at <" << index << ">" );
+                t_param.as_array().merge( a_object[index].as_array() );
+                continue;
+            }
+
+            // overwrite via direct assignment if destination location does not match incoming type
+            //LDEBUG( dlog, "generic replace" );
+            assign( index, a_object[index] );
+        }
+        return;
+     }
+
+
+    std::string param_array::to_string() const
+    {
+        stringstream out;
+        string indentation;
+        for ( unsigned i=0; i<param::s_indent_level; ++i )
+            indentation += "    ";
+        out << '\n' << indentation << "[\n";
+        param::s_indent_level++;
+        for( contents::const_iterator it = f_contents.begin(); it != f_contents.end(); ++it )
+        {
+            out << indentation << "    " << **it << '\n';
+        }
+        param::s_indent_level--;
+        out << indentation << "]\n";
+        return out.str();
+    }
+
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_array& a_value)
+    {
+        return out << a_value.to_string();
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_array.hh b/Src/Scarab/library/param/param_array.hh
new file mode 100644
index 0000000..0adff55
--- /dev/null
+++ b/Src/Scarab/library/param/param_array.hh
@@ -0,0 +1,347 @@
+/*
+ * param_array.hh
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PARAM_ARRAY_HH_
+#define SCARAB_PARAM_ARRAY_HH_
+
+#include "param_value.hh"
+
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/iterator/indirect_iterator.hpp>
+
+#include <deque>
+
+
+namespace scarab
+{
+    class param_value;
+    class param_node;
+
+    typedef std::deque< std::unique_ptr< param > > param_array_contents;
+
+    typedef boost::indirect_iterator< param_array_contents::iterator, param > param_array_iterator;
+    typedef boost::indirect_iterator< param_array_contents::const_iterator, const param > param_array_const_iterator;
+
+    class SCARAB_API param_array : public param
+    {
+        public:
+            typedef param_array_contents contents;
+            typedef param_array_iterator iterator;
+            typedef param_array_const_iterator const_iterator;
+            typedef contents::reverse_iterator reverse_iterator;
+            typedef contents::const_reverse_iterator const_reverse_iterator;
+            typedef contents::value_type contents_type;
+
+        public:
+            param_array();
+            param_array( const param_array& orig );
+            param_array( param_array&& orig );
+            virtual ~param_array();
+
+            param_array& operator=( const param_array& rhs );
+            param_array& operator=( param_array&& rhs );
+
+            virtual param_ptr_t clone() const;
+            virtual param_ptr_t move_clone();
+
+            virtual bool is_null() const;
+            virtual bool is_array() const;
+
+            virtual bool has_subset( const param& a_subset ) const;
+
+            unsigned size() const;
+            bool empty() const;
+
+            /// sets the size of the array
+            /// if smaller than the current size, extra elements are deleted
+            void resize( unsigned a_size );
+
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            std::string get_value( unsigned a_index, const std::string& a_default ) const;
+            std::string get_value( unsigned a_index, const char* a_default ) const;
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            template< typename XValType >
+            XValType get_value( unsigned a_index, XValType a_default ) const;
+
+            /// Returns a reference to the param at a_index.
+            /// Throws a std::out_of_range if a_index is out-of-range.
+            const param& operator[]( unsigned a_index ) const;
+            /// Returns a reference to the param at a_index.
+            /// Throws a std::out_of_range if a_index is out-of-range.
+            param& operator[]( unsigned a_index );
+
+            const param& front() const;
+            param& front();
+
+            const param& back() const;
+            param& back();
+
+            // assign a copy of a_value to the array at a_index
+            void assign( unsigned a_index, const param& a_value );
+            // directly assign a_value to the array at a_index
+            void assign( unsigned a_index, param&& a_value );
+            // directly assign a_value_ptr to the array at a_index
+            void assign( unsigned a_index, param_ptr_t a_value_ptr );
+            // directly assign a_value to the array at a_index for any type that param_value accepts
+            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
+            void assign( unsigned a_index, T a_value );
+
+            void push_back( const param& a_value );
+            void push_back( param&& a_value );
+            void push_back( param_ptr_t a_value_ptr );
+            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
+            void push_back( T a_value );
+
+            void push_front( const param& a_value );
+            void push_front( param&& a_value );
+            void push_front( param_ptr_t a_value_ptr );
+            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
+            void push_front( T a_value );
+
+            void append( const param_array& an_array );
+
+            void merge( const param_array& an_array );
+
+            void erase( unsigned a_index );
+            param_ptr_t remove( unsigned a_index );
+            void clear();
+
+            iterator begin();
+            const_iterator begin() const;
+
+            iterator end();
+            const_iterator end() const;
+
+            reverse_iterator rbegin();
+            const_reverse_iterator rbegin() const;
+
+            reverse_iterator rend();
+            const_reverse_iterator rend() const;
+
+            virtual std::string to_string() const;
+
+        protected:
+            contents f_contents;
+    };
+
+
+    template< typename XValType >
+    XValType param_array::get_value( unsigned a_index, XValType a_default ) const
+    {
+        return a_index < size() ? operator[]( a_index ).as_value().as< XValType >() : a_default;
+    }
+
+    inline param_ptr_t param_array::clone() const
+    {
+        return std::unique_ptr< param_array >( new param_array( *this ) );
+    }
+
+    inline param_ptr_t param_array::move_clone()
+    {
+        return std::unique_ptr< param_array >( new param_array( std::move( *this ) ) );
+    }
+
+    inline bool param_array::is_null() const
+    {
+        return false;
+    }
+
+    inline bool param_array::is_array() const
+    {
+        return true;
+    }
+
+    inline unsigned param_array::size() const
+    {
+        return f_contents.size();
+    }
+    inline bool param_array::empty() const
+    {
+        return f_contents.empty();
+    }
+
+    inline std::string param_array::get_value( unsigned a_index, const std::string& a_default ) const
+    {
+        return a_index < size() ? operator[]( a_index ).to_string() : a_default;
+    }
+
+    inline std::string param_array::get_value( unsigned a_index, const char* a_default ) const
+    {
+        return get_value( a_index, std::string( a_default ) );
+    }
+
+    inline const param& param_array::operator[]( unsigned a_index ) const
+    {
+        return *f_contents.at( a_index );
+    }
+    inline param& param_array::operator[]( unsigned a_index )
+    {
+        return *f_contents.at( a_index );
+    }
+
+    inline const param& param_array::front() const
+    {
+        return *f_contents.front();
+    }
+    inline param& param_array::front()
+    {
+        return *f_contents.front();
+    }
+
+    inline const param& param_array::back() const
+    {
+        return *f_contents.back();
+    }
+    inline param& param_array::back()
+    {
+        return *f_contents.back();
+    }
+
+    // assign a copy of a_value to the array at a_index
+    inline void param_array::assign( unsigned a_index, const param& a_value )
+    {
+        erase( a_index );
+        f_contents.at( a_index ) = a_value.clone();
+        return;
+    }
+    // directly move a_value to the array at a_index
+    inline void param_array::assign( unsigned a_index, param&& a_value )
+    {
+        erase( a_index );
+        f_contents.at( a_index ) = a_value.move_clone();
+        return;
+    }
+    // directly assign a_value_ptr to the array at a_index
+    inline void param_array::assign( unsigned a_index, param_ptr_t a_value_ptr )
+    {
+        erase( a_index );
+        f_contents.at( a_index ) = std::move(a_value_ptr);
+        return;
+    }
+    // directly move a_value to the array at a_index
+    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
+    inline void param_array::assign( unsigned a_index, T a_value )
+    {
+        erase( a_index );
+        f_contents.at( a_index ) = param_ptr_t( new param_value( a_value ) );
+        return;
+    }
+
+    inline void param_array::push_back( const param& a_value )
+    {
+        f_contents.push_back( a_value.clone() );
+        return;
+    }
+    inline void param_array::push_back( param&& a_value )
+    {
+        f_contents.push_back( a_value.move_clone() );
+        return;
+    }
+    inline void param_array::push_back( param_ptr_t a_value_ptr )
+    {
+        f_contents.push_back( std::move(a_value_ptr) );
+        return;
+    }
+    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
+    inline void param_array::push_back( T a_value )
+    {
+        f_contents.push_back( param_ptr_t( new param_value( a_value ) ) );
+        return;
+    }
+
+    inline void param_array::push_front( const param& a_value )
+    {
+        f_contents.push_front( a_value.clone() );
+        return;
+    }
+    inline void param_array::push_front( param&& a_value )
+    {
+        f_contents.push_front( a_value.move_clone() );
+        return;
+    }
+    inline void param_array::push_front( param_ptr_t a_value_ptr )
+    {
+        f_contents.push_front( std::move(a_value_ptr) );
+        return;
+    }
+    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
+    inline void param_array::push_front( T a_value )
+    {
+        f_contents.push_front( param_ptr_t( new param_value( a_value ) ) );
+        return;
+    }
+
+    inline void param_array::append( const param_array& an_array )
+    {
+        for( const_iterator it = const_iterator(an_array.begin()); it != const_iterator(an_array.end()); ++it )
+        {
+            push_back( *it );
+        }
+        return;
+    }
+
+    inline void param_array::erase( unsigned a_index )
+    {
+        f_contents.at( a_index ).reset();
+        return;
+    }
+    inline param_ptr_t param_array::remove( unsigned a_index )
+    {
+        param_ptr_t t_current( std::move( f_contents.at( a_index ) ) );
+        return t_current;
+    }
+    inline void param_array::clear()
+    {
+        f_contents.clear();
+        return;
+    }
+
+    inline param_array::iterator param_array::begin()
+    {
+        return iterator( f_contents.begin() );
+    }
+    inline param_array::const_iterator param_array::begin() const
+    {
+        return const_iterator( f_contents.cbegin() );
+    }
+
+    inline param_array::iterator param_array::end()
+    {
+        return iterator( f_contents.end() );
+    }
+    inline param_array::const_iterator param_array::end() const
+    {
+        return const_iterator( f_contents.cend() );
+    }
+
+    inline param_array::reverse_iterator param_array::rbegin()
+    {
+        return f_contents.rbegin();
+    }
+    inline param_array::const_reverse_iterator param_array::rbegin() const
+    {
+        return f_contents.rbegin();
+    }
+
+    inline param_array::reverse_iterator param_array::rend()
+    {
+        return f_contents.rend();
+    }
+    inline param_array::const_reverse_iterator param_array::rend() const
+    {
+        return f_contents.crend();
+    }
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_array& value);
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_ARRAY_HH_ */
diff --git a/Src/Scarab/library/param/param_base.cc b/Src/Scarab/library/param/param_base.cc
new file mode 100644
index 0000000..7a451a1
--- /dev/null
+++ b/Src/Scarab/library/param/param_base.cc
@@ -0,0 +1,65 @@
+/*
+ * param_base.cc
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include <sstream>
+using std::string;
+using std::stringstream;
+
+#include "param_base.hh"
+
+#include "param_base_impl.hh"
+
+namespace scarab
+{
+
+    SCARAB_API unsigned param::s_indent_level = 0;
+
+    param::param()
+    {
+    }
+
+    param::param( const param& )
+    {
+    }
+
+    param::param( param&& )
+    {
+    }
+
+    param::~param()
+    {
+    }
+
+    inline void param::merge( const param& a_param )
+    {
+        if( is_node() && a_param.is_node() )
+        {
+            as_node().merge( a_param.as_node() );
+            return;
+        }
+        if( is_array() && a_param.is_array() )
+        {
+            as_array().merge( a_param.as_array() );
+            return;
+        }
+        if( is_value() && a_param.is_value() )
+        {
+            as_value() = a_param.as_value();
+            return;
+        }
+        if( is_null() && a_param.is_null() ) return;
+        throw error() << "Invalid merge command with incompatible param types";
+    }
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param& a_value)
+    {
+        return out << a_value.to_string();
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_base.hh b/Src/Scarab/library/param/param_base.hh
new file mode 100644
index 0000000..524dccc
--- /dev/null
+++ b/Src/Scarab/library/param/param_base.hh
@@ -0,0 +1,107 @@
+/*
+ * param_base.hh
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PARAM_BASE_HH_
+#define SCARAB_PARAM_BASE_HH_
+
+#include "error.hh"
+
+#include <memory>
+#include <sstream>
+#include <string>
+
+namespace scarab
+{
+    class param_value;
+    class param_array;
+    class param_node;
+
+    class param;
+    typedef std::unique_ptr< param > param_ptr_t;
+
+    class SCARAB_API param
+    {
+        public:
+            param();
+            param( const param& orig );
+            param( param&& orig );
+            virtual ~param();
+
+            param& operator=( const param& rhs );
+            param& operator=( param&& );
+
+            virtual param_ptr_t clone() const;
+            virtual param_ptr_t move_clone();
+
+            virtual bool is_null() const;
+            virtual bool is_value() const;
+            virtual bool is_array() const;
+            virtual bool is_node() const;
+
+            virtual bool has_subset( const param& a_subset ) const;
+
+            param_value& as_value();
+            param_array& as_array();
+            param_node& as_node();
+
+            const param_value& as_value() const;
+            const param_array& as_array() const;
+            const param_node& as_node() const;
+
+            /// Assumes that the parameter is a value, and returns a reference to itself.
+            const param_value& operator()() const;
+            /// Assumes that the parameter is a value, and returns a reference to itself.
+            param_value& operator()();
+
+            /// Assumes that the parameter is an array, and returns a reference to the param at a_index.
+            /// Behavior is undefined if a_index is out-of-range.
+            const param& operator[]( unsigned a_index ) const;
+            /// Assumes that the parameter is an array, and returns a reference to the param at a_index.
+            /// Behavior is undefined if a_index is out-of-range.
+            param& operator[]( unsigned a_index );
+
+            /// Assumes that the parameter is a node, and returns a reference to the param corresponding to a_name.
+            /// Throws a scarab::error if a_name is not present.
+            const param& operator[]( const std::string& a_name ) const;
+            /// Assumes that the parameter is a node, and returns a reference to the param corresponding to a_name.
+            /// Throws a scarab::error if a_name is not present.
+            param& operator[]( const std::string& a_name );
+
+            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            std::string get_value( const std::string& a_name, const std::string& a_default ) const;
+            std::string get_value( const std::string& a_name, const char* a_default ) const;
+            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            template< typename XValType >
+            XValType get_value( const std::string& a_name, XValType a_default ) const;
+
+            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            std::string get_value( unsigned a_index, const std::string& a_default ) const;
+            std::string get_value( unsigned a_index, const char* a_default ) const;
+            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            template< typename XValType >
+            XValType get_value( unsigned a_index, XValType a_default ) const;
+
+            void merge( const param& a_param );
+
+            virtual std::string to_string() const;
+
+            static unsigned s_indent_level;
+    };
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param& value);
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_BASE_HH_ */
diff --git a/Src/Scarab/library/param/param_base_impl.hh b/Src/Scarab/library/param/param_base_impl.hh
new file mode 100644
index 0000000..5ab4e66
--- /dev/null
+++ b/Src/Scarab/library/param/param_base_impl.hh
@@ -0,0 +1,173 @@
+/*
+ * param_base_impl.hh
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PARAM_BASE_IMPL_HH_
+#define SCARAB_PARAM_BASE_IMPL_HH_
+
+#include "param_base.hh"
+
+#include "param_array.hh"
+#include "param_node.hh"
+#include "param_value.hh"
+
+namespace scarab
+{
+
+    inline param& param::operator=( const param& )
+    {
+        return *this;
+    }
+
+    inline param& param::operator=( param&& )
+    {
+        return *this;
+    }
+
+    inline param_ptr_t param::clone() const
+    {
+        //std::cout << "param::clone()" << std::endl;
+        return param_ptr_t( new param( *this ) );
+    }
+
+    inline param_ptr_t param::move_clone()
+    {
+        //std::cout << "param::clone()" << std::endl;
+        return param_ptr_t( new param( std::move(*this) ) );
+    }
+
+    inline bool param::is_null() const
+    {
+        return true;
+    }
+
+    inline bool param::is_value() const
+    {
+        return false;
+    }
+
+    inline bool param::is_array() const
+    {
+        return false;
+    }
+
+    inline bool param::is_node() const
+    {
+        return false;
+    }
+
+    inline bool param::has_subset( const param& /*a_subset*/ ) const
+    {
+        // this version of has_subset should only ever be called if a_subset is a null param (i.e. not one of the derived classes)
+        return true;
+    }
+
+    inline param_value& param::as_value()
+    {
+        if( this->is_value() ) return *static_cast< param_value* >( this );
+        throw error() << "Param object is not a value";
+    }
+
+    inline param_array& param::as_array()
+    {
+        if( this->is_array() ) return *static_cast< param_array* >( this );
+        throw error() << "Param object is not an array";
+    }
+
+    inline param_node& param::as_node()
+    {
+        if( this->is_node() ) return *static_cast< param_node* >( this );
+        throw error() << "Param object is not a node";
+    }
+
+    inline const param_value& param::as_value() const
+    {
+        if( this->is_value() ) return *static_cast< const param_value* >( this );
+        throw error() << "Param object is not a value";
+    }
+
+    inline const param_array& param::as_array() const
+    {
+        if( this->is_array() ) return *static_cast< const param_array* >( this );
+        throw error() << "Param object is not an array";
+    }
+
+    inline const param_node& param::as_node() const
+    {
+        if( this->is_node() ) return *static_cast< const param_node* >( this );
+        throw error() << "Param object is not a node";
+    }
+
+    inline const param_value& param::operator()() const
+    {
+        return as_value();
+    }
+
+    inline param_value& param::operator()()
+    {
+        return as_value();
+    }
+
+    inline const param& param::operator[]( unsigned a_index ) const
+    {
+        return as_array()[ a_index ];
+    }
+
+    inline param& param::operator[]( unsigned a_index )
+    {
+        return as_array()[ a_index ];
+    }
+
+    inline const param& param::operator[]( const std::string& a_name ) const
+    {
+        return as_node()[ a_name ];
+    }
+
+    inline param& param::operator[]( const std::string& a_name )
+    {
+        return as_node()[ a_name ];
+    }
+
+    inline std::string param::get_value( const std::string& a_name, const std::string& a_default ) const
+    {
+        return as_node().get_value( a_name, a_default );
+    }
+
+    inline std::string param::get_value( const std::string& a_name, const char* a_default ) const
+    {
+        return as_node().get_value( a_name, a_default );
+    }
+
+    template< typename XValType >
+    inline XValType param::get_value( const std::string& a_name, XValType a_default ) const
+    {
+        return as_node().get_value( a_name, a_default );
+    }
+
+    inline std::string param::get_value( unsigned a_index, const std::string& a_default ) const
+    {
+        return as_array().get_value( a_index, a_default );
+    }
+
+    inline std::string param::get_value( unsigned a_index, const char* a_default ) const
+    {
+        return as_array().get_value( a_index, a_default );
+    }
+
+    template< typename XValType >
+    inline XValType param::get_value( unsigned a_index, XValType a_default ) const
+    {
+        return as_array().get_value( a_index, a_default );
+    }
+
+    inline std::string param::to_string() const
+    {
+        return std::string();
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_BASE_IMPL_HH_ */
diff --git a/Src/Scarab/library/param/param_codec.cc b/Src/Scarab/library/param/param_codec.cc
new file mode 100644
index 0000000..2990003
--- /dev/null
+++ b/Src/Scarab/library/param/param_codec.cc
@@ -0,0 +1,133 @@
+/*
+ * param_codec.cc
+ *
+ *  Created on: Aug 10, 2016
+ *      Author: obla999
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "param_codec.hh"
+
+#include "factory.hh"
+#include "logger.hh"
+#include "path.hh"
+
+LOGGER( slog, "param_codec" );
+
+namespace scarab
+{
+
+    param_input_codec::param_input_codec()
+    {
+    }
+
+    param_input_codec::~param_input_codec()
+    {
+    }
+
+
+    param_output_codec::param_output_codec()
+    {
+    }
+
+    param_output_codec::~param_output_codec()
+    {
+    }
+
+
+    param_translator::param_translator()
+    {
+    }
+
+    param_translator::~param_translator()
+    {
+    }
+
+    param_ptr_t param_translator::read_file( const std::string& a_filename, const param_node& a_options  )
+    {
+        std::string t_encoding = a_options.get_value( "encoding", "" );
+        if( t_encoding.empty() )
+        {
+            path t_path = expand_path( a_filename );
+            t_encoding = t_path.extension().string().substr( 1 ); // remove the '.' at the beginning
+        }
+
+        param_input_codec* t_codec = factory< param_input_codec >::get_instance()->create( t_encoding );
+        if( t_codec == nullptr )
+        {
+            LERROR( slog, "Unable to find input codec for encoding <" << t_encoding << ">");
+            return nullptr;
+        }
+
+        return t_codec->read_file( a_filename, a_options );
+    }
+
+    param_ptr_t param_translator::read_string( const std::string& a_string, const param_node& a_options  )
+    {
+        std::string t_encoding = a_options.get_value( "encoding", "" );
+        if( t_encoding.empty() )
+        {
+            LERROR( slog, "Encoding-type option must be provided");
+            return nullptr;
+        }
+
+        return read_string( a_string, t_encoding, a_options );
+    }
+
+    param_ptr_t param_translator::read_string( const std::string& a_string, const std::string& a_encoding, const param_node& a_options  )
+    {
+        param_input_codec* t_codec = factory< param_input_codec >::get_instance()->create( a_encoding );
+        if( t_codec == nullptr )
+        {
+            LERROR( slog, "Unable to find input codec for encoding <" << a_encoding << ">");
+            return nullptr;
+        }
+
+        return t_codec->read_string( a_string, a_options );
+    }
+
+    bool param_translator::write_file( const param& a_param, const std::string& a_filename, const param_node& a_options  )
+    {
+        std::string t_encoding = a_options.get_value( "encoding", "" );
+        if( t_encoding.empty() )
+        {
+            path t_path = expand_path( a_filename );
+            t_encoding = t_path.extension().string().substr( 1 ); // remove the '.' at the beginning
+        }
+
+        param_output_codec* t_codec = factory< param_output_codec >::get_instance()->create( t_encoding );
+        if( t_codec == nullptr )
+        {
+            LERROR( slog, "Unable to find output codec for encoding <" << t_encoding << ">");
+            return false;
+        }
+
+        return t_codec->write_file( a_param, a_filename, a_options );
+    }
+
+    bool param_translator::write_string( const param& a_param, std::string& a_string, const param_node& a_options  )
+    {
+        std::string t_encoding = a_options.get_value( "encoding", "" );
+        if( t_encoding.empty() )
+        {
+            LERROR( slog, "Encoding-type option must be provided");
+            return false;
+        }
+
+        return write_string( a_param, a_string, t_encoding, a_options );
+    }
+
+    bool param_translator::write_string( const param& a_param, std::string& a_string, const std::string& a_encoding, const param_node& a_options  )
+    {
+        param_output_codec* t_codec = factory< param_output_codec >::get_instance()->create( a_encoding );
+        if( t_codec == nullptr )
+        {
+            LERROR( slog, "Unable to find output codec for encoding <" << a_encoding << ">");
+            return false;
+        }
+
+        return t_codec->write_string( a_param, a_string, a_options );
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_codec.hh b/Src/Scarab/library/param/param_codec.hh
new file mode 100644
index 0000000..dd6dc68
--- /dev/null
+++ b/Src/Scarab/library/param/param_codec.hh
@@ -0,0 +1,72 @@
+/*
+ * param_codec.hh
+ *
+ *  Created on: Aug 10, 2016
+ *      Author: obla999
+ */
+
+#ifndef SCARAB_PARAM_CODEC_HH_
+#define SCARAB_PARAM_CODEC_HH_
+
+#include "param.hh"
+
+#include "scarab_api.hh"
+
+#include "factory.hh"
+
+#include <memory>
+#include <string>
+
+namespace scarab
+{
+
+#define REGISTER_PARAM_INPUT_CODEC(codec_class, encoding) \
+        static registrar< param_input_codec, codec_class > s_param_input_codec##codec_class##_registrar( encoding );
+
+    class SCARAB_API param_input_codec
+    {
+        public:
+            param_input_codec();
+            virtual ~param_input_codec();
+
+            virtual param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node() ) = 0;
+            virtual param_ptr_t read_string( const std::string& a_string, const param_node& a_options = param_node() ) = 0;
+    };
+
+
+    class SCARAB_API param_output_codec
+    {
+        public:
+            param_output_codec();
+            virtual ~param_output_codec();
+
+            virtual bool write_file( const param& a_param, const std::string& a_filename, const param_node& a_options = param_node() ) = 0;
+            virtual bool write_string( const param& a_param, std::string& a_string, const param_node& a_options = param_node() ) = 0;
+    };
+
+#define REGISTER_PARAM_OUTPUT_CODEC(codec_class, encoding) \
+        static registrar< param_output_codec, codec_class > s_param_output_codec##codec_class##_registrar( encoding );
+
+
+    class SCARAB_API param_translator
+    {
+        public:
+            param_translator();
+            ~param_translator();
+
+        public:
+            param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node()  );
+            param_ptr_t read_string( const std::string& a_string, const param_node& a_options = param_node()  );
+            param_ptr_t read_string( const std::string& a_string, const std::string& a_encoding, const param_node& a_options = param_node() );
+
+        public:
+            bool write_file( const param& a_param, const std::string& a_filename, const param_node& a_options = param_node() );
+            bool write_string( const param& a_param, std::string& a_string, const param_node& a_options = param_node() );
+            bool write_string( const param& a_param, std::string& a_string, const std::string& a_encoding, const param_node& a_options = param_node() );
+    };
+
+
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_CODEC_HH_ */
diff --git a/Src/Scarab/library/param/param_helpers.cc b/Src/Scarab/library/param/param_helpers.cc
new file mode 100644
index 0000000..b089669
--- /dev/null
+++ b/Src/Scarab/library/param/param_helpers.cc
@@ -0,0 +1,171 @@
+/*
+ * param_helpers.cc
+ *
+ *  Created on: Jan 10, 2019
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "param_helpers.hh"
+
+#include "logger.hh"
+
+LOGGER( plog, "param_helpers" );
+
+namespace scarab
+{
+    param_ptr_t simple_parser::parse_address( const std::string& an_addr, param_ptr_t a_value )
+    {
+        // this method can throw scarab::error
+
+        if( an_addr.empty() )
+        {
+            throw error() << "No address for keyword argument with value <" << *a_value << ">";
+        }
+
+        std::string::size_type t_div_pos = an_addr.find( f_node_separator );
+        std::string t_top_addr = an_addr.substr( 0, t_div_pos );
+
+        param_ptr_t t_new_param = new_param_from_addr( t_top_addr );
+
+        if( t_new_param->is_node() )
+        {
+            // only nodes are allowed at the top level
+            std::string t_next_addr = t_div_pos == an_addr.npos ? "" : an_addr.substr( t_div_pos+1 );
+            add_next( *t_new_param, t_top_addr, t_next_addr, std::move(a_value) ); // this can throw scarab::error
+            return t_new_param;
+        }
+
+        throw error() << "Top param type must be a node; this address is invalid: <" << an_addr << ">";
+    }
+
+    void simple_parser::add_next( param& a_parent, const std::string& an_addr_in_parent, const std::string& a_next_addr, param_ptr_t a_value )
+    {
+        // this method can throw scarab::error
+
+        param_ptr_t t_child;
+
+        // check if the next address is empty;
+        // if so, parse the value
+        // if not, parse the child
+        if( a_next_addr.empty() )
+        {
+            // the child is a param_value or param
+            t_child = std::move(a_value);
+        }
+        else
+        {
+            // the child is a param_array or param_node
+            std::string::size_type t_div_pos = a_next_addr.find( f_node_separator );
+            std::string t_top_addr = a_next_addr.substr( 0, t_div_pos );
+            t_child = new_param_from_addr( t_top_addr );
+            std::string t_next_addr = t_div_pos == a_next_addr.npos ? "" : a_next_addr.substr( t_div_pos+1 );
+            add_next( *t_child, t_top_addr, t_next_addr, std::move(a_value) ); // this can throw scarab::error
+        }
+
+        // add the child as appropriate for the parent type
+        if( a_parent.is_array() )
+        {
+            unsigned index = std::stoul( an_addr_in_parent );
+            param_array& t_parent_array = a_parent.as_array();
+            if( index > t_parent_array.size() ) t_parent_array.resize( index+1 );
+            if( t_child )
+            {
+                a_parent.as_array().assign( std::stoul( an_addr_in_parent ), std::move(t_child) );
+            }
+        }
+        else if( a_parent.is_node() )
+        {
+            if( t_child )
+            {
+                a_parent.as_node().replace( an_addr_in_parent, std::move(t_child) );
+            }
+        }
+        else
+        {
+            throw error() << "Invalid param type: only nodes and arrays accepted";
+        }
+
+        return;
+    }
+
+    param_ptr_t simple_parser::new_param_from_addr( const std::string& an_addr )
+    {
+        if( an_addr.empty() ) return std::unique_ptr< param_value >( ( new param_value() ) );
+
+        // check whether all of the characters in the address are digits
+        // if any are not, then the address cannot be an integer array index, so return a param_node
+        for( const char& ch : an_addr )
+        {
+            if( ! std::isdigit( ch ) ) return std::unique_ptr< param_node >( new param_node() );
+        }
+        // if we're here, then the address is an integer, so return a param_array
+        return std::unique_ptr< param_array >( new param_array() );
+    }
+
+    param_ptr_t simple_parser::parse_value( const std::string& a_value )
+    {
+        // we've found the value; now check if it's a number or a string
+        if( a_value.empty() )
+        {
+            LTRACE( plog, "Parsed value as NULL" );
+            return std::unique_ptr< param >( new param() );
+        }
+        // if "true" or "false", then bool
+        else if( a_value == "true" )
+        {
+            LTRACE( plog, "Parsing value (" << a_value << ") as bool(true)" );
+            return std::unique_ptr< param_value >( new param_value( true ) );
+        }
+        else if( a_value == "false" )
+        {
+            LTRACE( plog, "Parsing value (" << a_value << ") as bool(false)" );
+            return std::unique_ptr< param_value >( new param_value( false ) );
+        }
+        else
+        {
+            // To test if the string is numeric:
+            //   1. if it has 2 decimal points, it's not numeric (IP addresses, for example, would pass the second test)
+            //   2. double is the most general form of number, so if it fails that conversion, it's not numeric.
+            double t_double;
+            std::stringstream t_conv_double( a_value );
+            if( a_value.find( '.' ) == a_value.rfind( '.' ) &&
+                    a_value.find( '-' ) == a_value.rfind( '-' ) &&
+                    ! (t_conv_double >> t_double).fail() )
+            {
+                // now we know the value is numeric
+                if( a_value.find( '.' ) != std::string::npos ||
+                    a_value.find( 'e' ) != std::string::npos ||
+                    a_value.find( 'E' ) != std::string::npos )
+                {
+                    // value is a floating-point number, since it has a decimal point
+                    LTRACE( plog, "Parsing value (" << a_value << ") as double(" << t_double << ")" );
+                    return std::unique_ptr< param_value >( new param_value( t_double ) );
+                }
+                else if( a_value[ 0 ] == '-' )
+                {
+                    // value is a signed integer if it's negative
+                    LTRACE( plog, "Parsing value (" << a_value << ") as int(" << (int64_t)t_double << ")" );
+                    return std::unique_ptr< param_value >( new param_value( (int64_t)t_double ) );
+                }
+                else
+                {
+                    // value is assumed to be unsigned if it's positive
+                    LTRACE( plog, "Parsing value (" << a_value << ") as uint(" << (uint64_t)t_double << ")" );
+                    return std::unique_ptr< param_value >( new param_value( (uint64_t)t_double ) );
+                }
+            }
+            else
+            {
+                // value is not numeric; treat as a string
+                LTRACE( plog, "Parsing value (" << a_value << ") as a string" );
+                return std::unique_ptr< param_value >( new param_value( a_value ) );
+            }
+        }
+    }
+
+}
+
+
+
diff --git a/Src/Scarab/library/param/param_helpers.hh b/Src/Scarab/library/param/param_helpers.hh
new file mode 100644
index 0000000..ebcd4ca
--- /dev/null
+++ b/Src/Scarab/library/param/param_helpers.hh
@@ -0,0 +1,34 @@
+/*
+ * param_helpers.hh
+ *
+ *  Created on: Jan 10, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_PARAM_HELPERS_HH_
+#define SCARAB_PARAM_HELPERS_HH_
+
+#include "param.hh"
+
+namespace scarab
+{
+    struct SCARAB_API simple_parser
+    {
+        public:
+            /// Converts an address into a nested param structure, and optionally attaches a value
+            static param_ptr_t parse_address( const std::string& an_addr, param_ptr_t a_value = param_ptr_t() );
+
+            /// Attempts to determine whether a value encoded as a string is an int, and unsigned int, or a floating-point number
+            static param_ptr_t parse_value( const std::string& a_value );
+
+        private:
+            static void add_next( param& a_parent, const std::string& an_addr_in_parent, const std::string& a_next_addr, param_ptr_t a_value = param_ptr_t() );
+
+            static param_ptr_t new_param_from_addr( const std::string& an_addr );
+
+        public:
+            static const char f_node_separator = '.';
+    };
+}
+
+#endif /* SCARAB_PARAM_HELPERS_HH_ */
diff --git a/Src/Scarab/library/param/param_node.cc b/Src/Scarab/library/param/param_node.cc
new file mode 100644
index 0000000..0c81f72
--- /dev/null
+++ b/Src/Scarab/library/param/param_node.cc
@@ -0,0 +1,149 @@
+/*
+ * param_node.cc
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include <sstream>
+using std::string;
+using std::stringstream;
+
+#include "param_node.hh"
+
+#include "param_array.hh"
+#include "param_base_impl.hh"
+
+
+namespace scarab
+{
+
+    param_node::param_node() :
+            param(),
+            f_contents()
+    {
+    }
+
+    param_node::param_node( const param_node& orig ) :
+            param( orig ),
+            f_contents()
+    {
+        for( contents::const_iterator it = orig.f_contents.begin(); it != orig.f_contents.end(); ++it )
+        {
+            f_contents[it->first] = it->second->clone();
+        }
+    }
+
+    param_node::param_node( param_node&& orig ) :
+            param( std::move(orig) ),
+            f_contents()
+    {
+        for( contents::const_iterator it = orig.f_contents.begin(); it != orig.f_contents.end(); ++it )
+        {
+            f_contents[it->first] = it->second->move_clone();
+        }
+        orig.clear();
+    }
+
+    param_node::~param_node()
+    {
+    }
+
+    param_node& param_node::operator=( const param_node& rhs )
+    {
+        this->param::operator=( rhs );
+        clear();
+        for( contents::const_iterator it = rhs.f_contents.begin(); it != rhs.f_contents.end(); ++it )
+        {
+            f_contents[it->first] = it->second->clone();
+        }
+        return *this;
+    }
+
+    param_node& param_node::operator=( param_node&& rhs )
+    {
+        this->param::operator=( std::move(rhs) );
+        clear();
+        for( contents::const_iterator it = rhs.f_contents.begin(); it != rhs.f_contents.end(); ++it )
+        {
+            f_contents[it->first] = it->second->move_clone();
+        }
+        rhs.clear();
+        return *this;
+    }
+
+    bool param_node::has_subset( const param& a_subset ) const
+    {
+        if( ! a_subset.is_node() ) return false;
+        const param_node& t_subset_node = a_subset.as_node();
+        if( t_subset_node.size() > f_contents.size() ) return false;
+        for( contents::const_iterator t_subset_it = t_subset_node.f_contents.begin(); t_subset_it != t_subset_node.f_contents.end(); ++t_subset_it )
+        {
+            if( ! has( t_subset_it->first ) ) return false;
+            if( ! f_contents.at( t_subset_it->first )->has_subset( *t_subset_it->second ) ) return false;
+        }
+        return true;
+    }
+
+    void param_node::merge( const param_node& a_object )
+    {
+        //LDEBUG( dlog, "merging object with " << a_object.size() << " items:\n" << a_object );
+        for( contents::const_iterator it = a_object.f_contents.begin(); it != a_object.f_contents.end(); ++it )
+        {
+            if( ! has( it->first ) )
+            {
+                //LDEBUG( dlog, "do not have object <" << it->first << "> = <" << *it->second << ">" );
+                add( it->first, *it->second );
+                continue;
+            }
+
+            param& t_param = (*this)[ it->first ];
+            if( t_param.is_value() && it->second->is_value() )
+            {
+                //LDEBUG( dlog, "replacing the value of \"" << it->first << "\" <" << get_value( it->first ) << "> with <" << *it->second << ">" );
+                t_param.as_value() = it->second->as_value();
+                continue;
+            }
+            if( t_param.is_node() && it->second->is_node() )
+            {
+                //LDEBUG( dlog, "merging nodes")
+                t_param.as_node().merge( it->second->as_node() );
+                continue;
+            }
+            if( t_param.is_array() && it->second->is_array() )
+            {
+                //LDEBUG( dlog, "merging array" );
+                t_param.as_array().merge( it->second->as_array() );
+                continue;
+            }
+
+            //LDEBUG( dlog, "generic replace" );
+            this->replace( it->first, *it->second );
+        }
+    }
+
+    std::string param_node::to_string() const
+    {
+        stringstream out;
+        string indentation;
+        for ( unsigned i=0; i<param::s_indent_level; ++i )
+            indentation += "    ";
+        out << '\n' << indentation << "{\n";
+        param::s_indent_level++;
+        for( contents::const_iterator it = f_contents.begin(); it != f_contents.end(); ++it )
+        {
+            out << indentation << "    " << it->first << " : " << *(it->second) << '\n';
+        }
+        param::s_indent_level--;
+        out << indentation << "}\n";
+        return out.str();
+    }
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_node& a_value)
+    {
+        return out << a_value.to_string();
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_node.hh b/Src/Scarab/library/param/param_node.hh
new file mode 100644
index 0000000..de51ef0
--- /dev/null
+++ b/Src/Scarab/library/param/param_node.hh
@@ -0,0 +1,352 @@
+/*
+ * param_node.hh
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PARAM_NODE_HH_
+#define SCARAB_PARAM_NODE_HH_
+
+#include "param_value.hh"
+
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/utility/enable_if.hpp>
+
+#include <map>
+
+namespace scarab
+{
+    class param_value;
+    class param_array;
+
+    // This special iterator class is used to allow the param_node iterator to point to a `param` object instead of a `std::unique_ptr<param>` object.
+    // In param_array we just used boost::indirect_iterator, but that doesn't work quite as simply for map-like objects.
+    // Note that unlike a normal map iterator, *iterator gives the `param` object, and iterator.name() gives the key.
+    template< class x_key, class x_value, class x_iiterator >
+    class map_deref_iterator : public boost::iterator_adaptor< map_deref_iterator< x_key, x_value, x_iiterator >, x_iiterator, x_value, boost::bidirectional_traversal_tag >
+    {
+        private:
+            // used for the conversion constructor below
+            struct enabler {};
+
+        public:
+            map_deref_iterator() :
+                    map_deref_iterator::iterator_adaptor_()
+            {}
+            map_deref_iterator( const x_iiterator& other ) :
+                    map_deref_iterator::iterator_adaptor_( other )
+            {}
+
+            // converts from iterator to const_iterator, but the enable_if business prevents converting from const_iterator to iterator
+            template< class x_other_value, class x_other_iiterator >
+            map_deref_iterator( const map_deref_iterator< x_key, x_other_value, x_other_iiterator > & other, typename boost::enable_if< boost::is_convertible< x_other_value, x_value >, enabler >::type = enabler() ) :
+                    map_deref_iterator::iterator_adaptor_( other.base )
+            {}
+
+            const x_key& name() const
+            {
+                return this->base()->first;
+            }
+
+        private:
+            friend class boost::iterator_core_access;
+
+            x_value& dereference() const
+            {
+                return *this->base()->second;
+            }
+
+    };
+
+    typedef std::map< std::string, std::unique_ptr< param > > param_node_contents;
+
+    typedef map_deref_iterator< std::string, param, param_node_contents::iterator > param_node_iterator;
+    typedef map_deref_iterator< std::string, const param, param_node_contents::const_iterator > param_node_const_iterator;
+
+
+    class SCARAB_API param_node : public param
+    {
+        public:
+            typedef param_node_contents contents;
+            typedef param_node_iterator iterator;
+            typedef param_node_const_iterator const_iterator;
+            typedef contents::value_type contents_type;
+
+            param_node();
+            param_node( const param_node& orig );
+            param_node( param_node&& orig );
+            virtual ~param_node();
+
+            param_node& operator=( const param_node& rhs );
+            param_node& operator=( param_node&& rhs );
+
+            virtual param_ptr_t clone() const;
+            virtual param_ptr_t move_clone();
+
+            virtual bool is_null() const;
+            virtual bool is_node() const;
+
+            virtual bool has_subset( const param& a_subset ) const;
+
+            unsigned size() const;
+            bool empty() const;
+
+            bool has( const std::string& a_name ) const;
+            unsigned count( const std::string& a_name ) const;
+
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            std::string get_value( const std::string& a_name, const std::string& a_default ) const;
+            std::string get_value( const std::string& a_name, const char* a_default ) const;
+            /// Returns the result of param_value::get if a_name is present and is of type param_value
+            /// Returns a_default if a_name is not present or is not of type param_value
+            template< typename XValType >
+            XValType get_value( const std::string& a_name, XValType a_default ) const;
+
+            /// Returns a reference to the param corresponding to a_name.
+            /// Throws an std::out_of_range if a_name is not present.
+            const param& operator[]( const std::string& a_name ) const;
+            /// Returns a reference to the param corresponding to a_name.
+            /// Throws an std::out_of_range if a_name is not present.
+            param& operator[]( const std::string& a_name );
+
+            /// Adds a copy of a_value
+            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
+            bool add( const std::string& a_name, const param& a_value );
+            /// Adds a_value with move semantics
+            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
+            bool add( const std::string& a_name, param&& a_value );
+            /// Adds a_value_ptr by directly adding the pointer
+            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
+            bool add( const std::string& a_name, param_ptr_t a_value_ptr );
+            /// Adds a_value as a param_value for any type that param_value accepts
+            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
+            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
+            bool add( const std::string& a_name, T a_value );
+
+            /// Creates a copy of a_value; overwrites if the key exits
+            void replace( const std::string& a_name, const param& a_value );
+            /// Adds a_value with move semantics; overwrites if the key exists
+            void replace( const std::string& a_name, param&& a_value );
+            /// Adds a_value_ptr by directly adding the pointer; overwrites if the key exists
+            void replace( const std::string& a_name, param_ptr_t a_value_ptr );
+            /// Adds a_value as a param_valuefor any type that param_value accepts
+            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
+            void replace( const std::string& a_name, T a_value );
+
+            /// Merges the contents of a_object into this object.
+            /// If names in the contents of a_object exist in this object,
+            /// the values in this object corresponding to the matching names will be replaced.
+            void merge( const param_node& a_object );
+
+            void erase( const std::string& a_name );
+            param_ptr_t remove( const std::string& a_name );
+            void clear();
+
+            iterator begin();
+            const_iterator begin() const;
+
+            iterator end();
+            const_iterator end() const;
+
+            virtual std::string to_string() const;
+
+        protected:
+            contents f_contents;
+
+    };
+
+
+    template< typename XValType >
+    inline XValType param_node::get_value( const std::string& a_name, XValType a_default ) const
+    {
+        return has( a_name ) ? operator[]( a_name ).as_value().as< XValType >() : a_default;
+    }
+
+    inline param_ptr_t param_node::clone() const
+    {
+        //std::cout << "param_node::clone" << std::endl;
+        return std::unique_ptr< param_node >( new param_node( *this ) );
+    }
+
+    inline param_ptr_t param_node::move_clone()
+    {
+        return std::unique_ptr< param_node >( new param_node( std::move(*this) ) );
+    }
+
+    inline bool param_node::is_null() const
+    {
+        return false;
+    }
+
+    inline bool param_node::is_node() const
+    {
+        return true;
+    }
+
+    inline unsigned param_node::size() const
+    {
+        return f_contents.size();
+    }
+    inline bool param_node::empty() const
+    {
+        return f_contents.empty();
+    }
+
+    inline bool param_node::has( const std::string& a_name ) const
+    {
+        return f_contents.count( a_name ) > 0;
+    }
+
+    inline unsigned param_node::count( const std::string& a_name ) const
+    {
+        return f_contents.count( a_name );
+    }
+
+    inline std::string param_node::get_value( const std::string& a_name, const std::string& a_default ) const
+    {
+        return has( a_name ) ? operator[]( a_name ).to_string() : a_default;
+    }
+
+    inline std::string param_node::get_value( const std::string& a_name, const char* a_default ) const
+    {
+        return get_value( a_name, std::string( a_default ) );
+    }
+
+    inline const param& param_node::operator[]( const std::string& a_name ) const
+    {
+        return *f_contents.at( a_name );
+    }
+
+    inline param& param_node::operator[]( const std::string& a_name )
+    {
+        return *f_contents.at( a_name );
+    }
+
+    inline bool param_node::add( const std::string& a_name, const param& a_value )
+    {
+        contents::iterator it = f_contents.find( a_name );
+        if( it == f_contents.end() )
+        {
+            f_contents.insert( contents_type( a_name, a_value.clone() ) );
+            return true;
+        }
+        return false;
+    }
+
+    inline bool param_node::add( const std::string& a_name, param&& a_value )
+    {
+        contents::iterator it = f_contents.find( a_name );
+        if( it == f_contents.end() )
+        {
+            f_contents.insert( contents_type( a_name, a_value.move_clone() ) );
+            return true;
+        }
+        return false;
+    }
+
+    inline bool param_node::add( const std::string& a_name, param_ptr_t a_value_ptr )
+    {
+        contents::iterator it = f_contents.find( a_name );
+        if( it == f_contents.end() )
+        {
+            f_contents.insert( contents_type( a_name, std::move(a_value_ptr) ) );
+            return true;
+        }
+        return false;
+    }
+
+    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
+    inline bool param_node::add( const std::string& a_name, T a_value )
+    {
+        //static_assert(std::is_convertible< T, param_value >::value, "Cannot convert type to param_value" );
+        contents::iterator it = f_contents.find( a_name );
+        if( it == f_contents.end() )
+        {
+            f_contents.insert( contents_type( a_name, param_ptr_t( new param_value( a_value ) ) ) );
+            return true;
+        }
+        return false;
+    }
+
+    inline void param_node::replace( const std::string& a_name, const param& a_value )
+    {
+        f_contents[ a_name ] = a_value.clone();
+        return;
+    }
+
+    inline void param_node::replace( const std::string& a_name, param&& a_value )
+    {
+        f_contents[ a_name ] = a_value.move_clone();
+        return;
+    }
+
+    inline void param_node::replace( const std::string& a_name, param_ptr_t a_value_ptr )
+    {
+        f_contents[ a_name ] = std::move(a_value_ptr);
+        return;
+    }
+
+    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
+    inline void param_node::replace( const std::string& a_name, T a_value )
+    {
+        f_contents[ a_name ] = param_ptr_t( new param_value( a_value ) );
+        return;
+    }
+
+
+    inline void param_node::erase( const std::string& a_name )
+    {
+        contents::iterator it = f_contents.find( a_name );
+        if( it != f_contents.end() )
+        {
+            f_contents.erase( it );
+        }
+        return;
+    }
+
+    inline param_ptr_t param_node::remove( const std::string& a_name )
+    {
+        contents::iterator it = f_contents.find( a_name );
+        if( it != f_contents.end() )
+        {
+            param_ptr_t removed( std::move( it->second ) );
+            f_contents.erase( it );
+            return removed;
+        }
+        return param_ptr_t();
+    }
+
+    inline void param_node::clear()
+    {
+        f_contents.clear();
+        return;
+    }
+
+    inline param_node::iterator param_node::begin()
+    {
+        return iterator( f_contents.begin() );
+    }
+
+    inline param_node::const_iterator param_node::begin() const
+    {
+        return const_iterator( f_contents.cbegin() );
+    }
+
+    inline param_node::iterator param_node::end()
+    {
+        return iterator( f_contents.end() );
+    }
+
+    inline param_node::const_iterator param_node::end() const
+    {
+        return const_iterator( f_contents.cend() );
+    }
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_node& value);
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_NODE_HH_ */
diff --git a/Src/Scarab/library/param/param_value.cc b/Src/Scarab/library/param/param_value.cc
new file mode 100644
index 0000000..4d02be1
--- /dev/null
+++ b/Src/Scarab/library/param/param_value.cc
@@ -0,0 +1,187 @@
+/*
+ * param_value.cc
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include <sstream>
+using std::string;
+using std::stringstream;
+
+#include "param_value.hh"
+
+#include "param_base_impl.hh"
+
+//#include "logger.hh"
+//LOGGER( dlog, "param_value" )
+
+namespace scarab
+{
+
+    param_value::param_value() :
+            param(),
+            f_value( false )
+    {
+        //LWARN( dlog, "param_value constructor: default (bool)" );
+    }
+
+    param_value::param_value( bool a_value ) :
+            param(),
+            f_value( a_value )
+    {
+        f_value = a_value;
+        //LWARN( dlog, "param_value constructor: bool --> bool" );
+    }
+
+    param_value::param_value( uint8_t a_value ) :
+            param(),
+            f_value( uint64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: uint8 --> uint" );
+    }
+
+    param_value::param_value( uint16_t a_value ) :
+            param(),
+            f_value( uint64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: uint16 --> uint" );
+    }
+
+    param_value::param_value( uint32_t a_value ) :
+            param(),
+            f_value( uint64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: uint32 --> uint" );
+    }
+
+    param_value::param_value( uint64_t a_value ) :
+            param(),
+            f_value( uint64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: uint64 --> uint" );
+    }
+
+    param_value::param_value( int8_t a_value ) :
+            param(),
+            f_value( int64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: int8 --> int" );
+    }
+
+    param_value::param_value( int16_t a_value ) :
+            param(),
+            f_value( int64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: int16 --> int" );
+    }
+
+
+    param_value::param_value( int32_t a_value ) :
+            param(),
+            f_value( int64_t(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: int32 --> int" );
+    }
+
+    param_value::param_value( int64_t a_value ) :
+            param(),
+            f_value( a_value )
+    {
+        //LWARN( dlog, "param_value constructor: int64 --> int" );
+    }
+
+    param_value::param_value( float a_value ) :
+            param(),
+            f_value( double(a_value) )
+    {
+        //LWARN( dlog, "param_value constructor: float --> double" );
+    }
+
+    param_value::param_value( double a_value ) :
+            param(),
+            f_value( a_value )
+    {
+        //LWARN( dlog, "param_value constructor: double --> double" );
+    }
+
+    param_value::param_value( const char* a_value ) :
+            param(),
+            f_value( string() )
+    {
+        //LWARN( dlog, "param_value constructor: char* --> k_string" );
+        string t_value( a_value );
+        if( t_value.size() > 1 && t_value.front() == '\'' && t_value.back() == '\'' )
+        {
+            f_value = t_value.substr( 1, t_value.size() - 2 );
+        }
+        else
+        {
+            f_value = t_value;
+        }
+    }
+
+    param_value::param_value( const string& a_value ) :
+            param(),
+            f_value( a_value )
+    {
+        //LWARN( dlog, "param_value constructor: string --> k_string" );
+        if( a_value.size() > 1 && a_value.front() == '\'' && a_value.back() == '\'' )
+        {
+            f_value = a_value.substr( 1, a_value.size() - 2 );
+        }
+        else
+        {
+            f_value = a_value;
+        }
+    }
+
+    param_value::param_value( const param_value& orig ) :
+            param( orig ),
+            f_value( orig.f_value )
+    {
+        //LWARN( dlog, "param_value copy constructor: " << type() );
+    }
+
+    param_value::param_value( param_value&& orig ) :
+            param( std::move( orig ) ),
+            f_value( std::move( orig.f_value ) )
+    {
+    }
+
+    param_value::~param_value()
+    {
+    }
+
+    param_value& param_value::operator=( const param_value& rhs )
+    {
+        if( &rhs == this ) return *this;
+
+        f_value = rhs.f_value;
+
+        return *this;
+    }
+
+    param_value& param_value::operator=( param_value&& rhs )
+    {
+        if( &rhs == this ) return *this;
+
+        f_value = std::move( rhs.f_value );
+
+        return *this;
+    }
+
+    bool param_value::has_subset( const param& a_subset ) const
+    {
+        if( ! a_subset.is_value() ) return false;
+        return true;
+    }
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_value& a_value)
+    {
+        return out << a_value.as_string();
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_value.hh b/Src/Scarab/library/param/param_value.hh
new file mode 100644
index 0000000..ebb60d5
--- /dev/null
+++ b/Src/Scarab/library/param/param_value.hh
@@ -0,0 +1,566 @@
+/*
+ * param_value.hh
+ *
+ *  Created on: Jan 14, 2014
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PARAM_VALUE_HH_
+#define SCARAB_PARAM_VALUE_HH_
+
+#include "param_base.hh"
+
+#include "path.hh"
+
+#include <boost/variant.hpp>
+
+#include <stdint.h>
+
+//#include "logger.hh"
+//LOGGER(pv_h, "param_value.hh")
+
+namespace scarab
+{
+    class param_array;
+    class param_node;
+
+    class SCARAB_API param_value : public param
+    {
+        public:
+            param_value();
+            param_value( bool a_value );
+            param_value( uint8_t a_value );
+            param_value( uint16_t a_value );
+            param_value( uint32_t a_value );
+            param_value( uint64_t a_value );
+            param_value( int8_t a_value );
+            param_value( int16_t a_value );
+            param_value( int32_t a_value );
+            param_value( int64_t a_value );
+            param_value( float a_value );
+            param_value( double a_value );
+            /// String constructor; if a_value is wrapped in single quotes, they will be stripped
+            param_value( const std::string& a_value );
+            /// C-string constructor; if a_value is wrapped in single quotes, they will be stripped
+            param_value( const char* a_value );
+            param_value( const param_value& orig );
+            param_value( param_value&& orig );
+            virtual ~param_value();
+
+            param_value& operator=( const param_value& rhs );
+            param_value& operator=( param_value&& rhs );
+
+            virtual param_ptr_t clone() const;
+            virtual param_ptr_t move_clone();
+
+            /// Strict equality
+            bool operator==( const param_value& rhs ) const;
+            bool strict_is_equal_to( const param_value& rhs ) const;
+            bool loose_is_equal_to( const param_value& rhs ) const;
+
+            bool empty() const;
+
+            virtual bool is_null() const;
+            virtual bool is_value() const;
+
+            virtual bool has_subset( const param& a_subset ) const;
+
+            std::string type() const;
+            bool is_bool() const;
+            bool is_uint() const;
+            bool is_int() const;
+            bool is_double() const;
+            bool is_string() const;
+
+            bool as_bool() const;
+            uint64_t as_uint() const;
+            int64_t as_int() const;
+            double as_double() const;
+            std::string as_string() const;
+            path as_path() const;
+
+            template< typename XValType >
+            XValType as() const;
+
+            template< typename XValType, typename std::enable_if< std::is_convertible< XValType, param_value >::value, XValType >::type* = nullptr >
+            void set( XValType a_value );
+
+            //template< typename XStreamableType >
+            //param_value& operator<<( const XStreamableType& a_streamable );
+
+            virtual std::string to_string() const;
+
+            void clear();
+
+        private:
+            boost::variant< bool, uint64_t, int64_t, double, std::string > f_value;
+
+            //*********************
+            // Visitor Classes
+            //*********************
+
+            class are_strict_equals : public boost::static_visitor< bool >
+            {
+                public:
+                    template < typename T, typename U >
+                    bool operator()( const T &, const U & ) const
+                    {
+                        return false; // cannot compare different types
+                    }
+
+                    template < typename T >
+                    bool operator()( const T & lhs, const T & rhs ) const
+                    {
+                        return lhs == rhs;
+                    }
+            };
+
+            class are_loose_equals : public boost::static_visitor< bool >
+            {
+                public:
+                    template < typename T, typename U >
+                    bool operator()( const T & rhs, const U & lhs ) const
+                    {
+                        as_string_visitor t_as_string;
+                        return t_as_string(lhs) == t_as_string(rhs); // cannot compare different types
+                    }
+
+                    template < typename T >
+                    bool operator()( const T & lhs, const T & rhs ) const
+                    {
+                        return lhs == rhs;
+                    }
+            };
+
+
+            class type_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef std::string result_type;
+                    std::string operator()( bool ) const
+                    {
+                        return "bool";
+                    }
+                    std::string operator()( uint64_t ) const
+                    {
+                        return "uint";
+                    }
+                    std::string operator()( int64_t ) const
+                    {
+                        return "int";
+                    }
+                    std::string operator()( double ) const
+                    {
+                        return "double";
+                    }
+                    std::string operator()( const std::string& ) const
+                    {
+                        return "string";
+                    }
+            };
+
+            template< typename XValType >
+            class get_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef XValType result_type;
+                    XValType operator()( bool a_value ) const
+                    {
+                        return static_cast< XValType >( a_value );
+                    }
+                    XValType operator()( uint64_t a_value ) const
+                    {
+                        return static_cast< XValType >( a_value );
+                    }
+                    XValType operator()( int64_t a_value ) const
+                    {
+                        return static_cast< XValType >( a_value );
+                    }
+                    XValType operator()( double a_value ) const
+                    {
+                        return static_cast< XValType >( a_value );
+                    }
+                    XValType operator()( const std::string& a_value ) const
+                    {
+                        std::stringstream t_conv;
+                        t_conv << a_value;
+                        XValType t_return;
+                        t_conv >> t_return;
+                        return t_return;
+                    }
+            };
+
+            class is_bool_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef bool result_type;
+                    bool operator()( bool ) const
+                    {
+                        return true;
+                    }
+                    template< typename T >
+                    bool operator()( T ) const
+                    {
+                        return false;
+                    }
+            };
+
+            class is_int_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef bool result_type;
+                    bool operator()( int64_t ) const
+                    {
+                        return true;
+                    }
+                    template< typename T >
+                    bool operator()( T ) const
+                    {
+                        return false;
+                    }
+            };
+
+            class is_uint_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef bool result_type;
+                    bool operator()( uint64_t ) const
+                    {
+                        return true;
+                    }
+                    template< typename T >
+                    bool operator()( T ) const
+                    {
+                        return false;
+                    }
+            };
+
+            class is_double_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef bool result_type;
+                    bool operator()( double ) const
+                    {
+                        return true;
+                    }
+                    template< typename T >
+                    bool operator()( T ) const
+                    {
+                        return false;
+                    }
+            };
+
+            class is_string_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef bool result_type;
+                    bool operator()( const std::string& ) const
+                    {
+                        return true;
+                    }
+                    template< typename T >
+                    bool operator()( T ) const
+                    {
+                        return false;
+                    }
+            };
+
+            class as_bool_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef bool result_type;
+                    bool operator()( bool a_value ) const
+                    {
+                        return a_value;
+                    }
+                    bool operator()( const std::string& a_value ) const
+                    {
+                        if( a_value.empty() ) return false;
+
+                        std::string t_str_val;
+                        bool t_is_numeric = true;
+                        for( std::string::const_iterator t_val_it = a_value.begin(); t_val_it != a_value.end(); ++t_val_it )
+                        {
+                            t_is_numeric = t_is_numeric && ::isdigit( *t_val_it );
+                            t_str_val.push_back( ::tolower( *t_val_it ) );
+                        }
+
+                        if( t_is_numeric ) return std::stoi( t_str_val );
+
+                        std::istringstream t_iss_val( t_str_val );
+                        bool t_bool_val;
+                        t_iss_val >> std::boolalpha >> t_bool_val;
+                        return t_bool_val;
+                    }
+                    template< typename T >
+                    bool operator()( T a_value ) const
+                    {
+                        return a_value != 0;
+                    }
+            };
+
+            class as_uint_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef uint64_t result_type;
+                    uint64_t operator()( const std::string& a_value ) const
+                    {
+                        return std::stoull( a_value );
+                    }
+                    template< typename T >
+                    uint64_t operator()( T a_value ) const
+                    {
+                        return (uint64_t)a_value;
+                    }
+            };
+
+            class as_int_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef int64_t result_type;
+                    int64_t operator()( const std::string& a_value ) const
+                    {
+                        return std::stoll( a_value );
+                    }
+                    template< typename T >
+                    int64_t operator()( T a_value ) const
+                    {
+                        return (int64_t)a_value;
+                    }
+            };
+
+            class as_double_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef double result_type;
+                    double operator()( const std::string& a_value ) const
+                    {
+                        return std::stod( a_value );
+                    }
+                    template< typename T >
+                    double operator()( T a_value ) const
+                    {
+                        return (double)a_value;
+                    }
+            };
+
+            class as_string_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef std::string result_type;
+                    std::string operator()( bool a_value ) const
+                    {
+                        return a_value ? "true" : "false";
+                    }
+                    std::string operator()( const std::string& a_value ) const
+                    {
+                        return a_value;
+                    }
+                    template< typename T >
+                    std::string operator()( T a_value ) const
+                    {
+                        return std::to_string( a_value );
+                    }
+            };
+
+            class as_path_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef scarab::path result_type;
+                    scarab::path operator()( const std::string& a_value ) const
+                    {
+                        return scarab::path( a_value );
+                    }
+                    template< typename T >
+                    scarab::path operator()( T ) const
+                    {
+                        return scarab::path();
+                    }
+            };
+
+            class clear_visitor : public boost::static_visitor<>
+            {
+                public:
+                    typedef void result_type;
+                    void operator()( bool& a_value ) const
+                    {
+                        a_value = false;
+                    }
+                    void operator()( std::string& a_value ) const
+                    {
+                        a_value.clear();
+                    }
+                    template< typename T >
+                    void operator()( T& a_value ) const
+                    {
+                        a_value = 0;
+                    }
+            };
+
+
+    };
+
+    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_value& value);
+
+    template<>
+    inline bool param_value::as< bool >() const
+    {
+        return as_bool();
+    }
+
+    template<>
+    inline uint64_t param_value::as< uint64_t >() const
+    {
+        return as_uint();
+    }
+
+    template<>
+    inline int64_t param_value::as< int64_t >() const
+    {
+        return as_int();
+    }
+
+    template<>
+    inline double param_value::as< double >() const
+    {
+        return as_double();
+    }
+
+    template<>
+    inline std::string param_value::as< std::string >() const
+    {
+        return as_string();
+    }
+
+    template<>
+    inline scarab::path param_value::as< scarab::path >() const
+    {
+        return as_path();
+    }
+
+    template< typename XValType >
+    XValType param_value::as() const
+    {
+        return boost::apply_visitor( get_visitor< XValType >(), f_value );
+    }
+
+
+    inline param_ptr_t param_value::clone() const
+    {
+        //std::cout << "param_value::clone" << std::endl;
+        return param_ptr_t( new param_value( *this ) );
+    }
+
+    inline param_ptr_t param_value::move_clone()
+    {
+        return param_ptr_t( new param_value( std::move(*this) ) );
+    }
+
+    inline bool param_value::operator==( const param_value& rhs ) const
+    {
+        return boost::apply_visitor( are_strict_equals(), f_value, rhs.f_value );
+    }
+
+    inline bool param_value::strict_is_equal_to( const param_value& rhs ) const
+    {
+        return boost::apply_visitor( are_strict_equals(), f_value, rhs.f_value );
+    }
+
+    inline bool param_value::loose_is_equal_to( const param_value& rhs ) const
+    {
+        return boost::apply_visitor( are_loose_equals(), f_value, rhs.f_value );
+    }
+
+    inline std::string param_value::type() const
+    {
+        return boost::apply_visitor( type_visitor(), f_value );
+    }
+
+    inline bool param_value::is_null() const
+    {
+        return false;
+    }
+
+    inline bool param_value::is_value() const
+    {
+        return true;
+    }
+
+    inline bool param_value::is_bool() const
+    {
+        return boost::apply_visitor( is_bool_visitor(), f_value );
+    }
+
+    inline bool param_value::is_uint() const
+    {
+        return boost::apply_visitor( is_uint_visitor(), f_value );
+    }
+
+    inline bool param_value::is_int() const
+    {
+        return boost::apply_visitor( is_int_visitor(), f_value );
+    }
+
+    inline bool param_value::is_double() const
+    {
+        return boost::apply_visitor( is_double_visitor(), f_value );
+    }
+
+    inline bool param_value::is_string() const
+    {
+        return boost::apply_visitor( is_string_visitor(), f_value );
+    }
+
+    inline bool param_value::as_bool() const
+    {
+        return boost::apply_visitor( as_bool_visitor(), f_value );
+    }
+
+    inline uint64_t param_value::as_uint() const
+    {
+        return boost::apply_visitor( as_uint_visitor(), f_value );
+    }
+
+    inline int64_t param_value::as_int() const
+    {
+        return boost::apply_visitor( as_int_visitor(), f_value );
+    }
+
+    inline double param_value::as_double() const
+    {
+        return boost::apply_visitor( as_double_visitor(), f_value );
+    }
+
+    inline std::string param_value::as_string() const
+    {
+        return boost::apply_visitor( as_string_visitor(), f_value );
+    }
+
+    inline path param_value::as_path() const
+    {
+        return boost::apply_visitor( as_path_visitor(), f_value );
+    }
+
+    template< typename XValType, typename std::enable_if< std::is_convertible< XValType, param_value >::value, XValType >::type* >
+    void param_value::set( XValType a_value )
+    {
+        // as of v2.11.2, this was changed from f_value = a_value to *this = param_value( a_value )
+        // this is to take advantage of the stripping of single quotes around strings that's done in the string constructors
+        *this = param_value( a_value );
+        return;
+    }
+
+    inline std::string param_value::to_string() const
+    {
+        return as_string();
+    }
+
+    inline void param_value::clear()
+    {
+        boost::apply_visitor( clear_visitor(), f_value );
+        return;
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_PARAM_VALUE_HH_ */
diff --git a/Src/Scarab/library/utility/CMakeLists.txt b/Src/Scarab/library/utility/CMakeLists.txt
new file mode 100644
index 0000000..9dd6f34
--- /dev/null
+++ b/Src/Scarab/library/utility/CMakeLists.txt
@@ -0,0 +1,58 @@
+# CMakeLists.txt for Scarab/library/utility
+# Author: N. Oblath
+# Created: Jan 1, 2016
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/base_exception.hh
+    ${dir}/cancelable.hh
+    ${dir}/concurrent_queue.hh
+    ${dir}/destroyer.hh
+    ${dir}/digital.hh
+    ${dir}/error.hh
+    ${dir}/exponential_backoff.hh
+    ${dir}/factory.hh
+    ${dir}/indexed_factory.hh
+    ${dir}/macros.hh
+    ${dir}/map_at_default.hh
+    ${dir}/member_variables.hh
+    ${dir}/path.hh
+    ${dir}/scarab_api.hh
+    ${dir}/signal_handler.hh
+    ${dir}/singleton.hh
+    ${dir}/thread_singleton.hh
+    ${dir}/time.hh
+    ${dir}/typename.hh
+    ${dir}/unique_typelist.hh
+) # not PARENT_SCOPE so that we can set it to that scope in the set command below
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/cancelable.cc
+    ${dir}/digital.cc
+    ${dir}/path.cc
+    ${dir}/signal_handler.cc
+    ${dir}/time.cc
+    ${dir}/typename.cc
+    PARENT_SCOPE 
+)
+
+set( macro_prefix camel_case_)
+set( set_prefix Set )
+set( get_prefix Get )
+set( var_prefix f )
+set( static_prefix s )
+configure_file( _member_variables.hh.in _camel_case_member_variables.hh @ONLY )    
+        
+set( macro_prefix snake_case_)
+set( set_prefix set_ )
+set( get_prefix get_ )
+set( var_prefix f_ )
+set( static_prefix s_ )
+configure_file( _member_variables.hh.in _snake_case_member_variables.hh @ONLY )
+
+set( Scarab_HEADERS
+    ${Scarab_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/_camel_case_member_variables.hh
+    ${CMAKE_CURRENT_BINARY_DIR}/_snake_case_member_variables.hh
+    PARENT_SCOPE )    
diff --git a/Src/Scarab/library/utility/_member_variables.hh.in b/Src/Scarab/library/utility/_member_variables.hh.in
new file mode 100644
index 0000000..d8f28e2
--- /dev/null
+++ b/Src/Scarab/library/utility/_member_variables.hh.in
@@ -0,0 +1,337 @@
+/*
+ * _member_variables.hh.in
+ *
+ *  Created on: Jan 6, 2016
+ *      Author: N.S. Oblath
+ */
+
+#ifndef @macro_prefix@SCARAB_UTILITY_MEMBER_VARIABLES_HH_
+#define @macro_prefix@SCARAB_UTILITY_MEMBER_VARIABLES_HH_
+
+#include "macros.hh"
+
+/**
+ * Templates for macros for class member variables
+ *
+ * Types of variables:
+ * - "normal"
+ * - referrable (i.e. accessed by reference)
+ * - pointers
+ * - std::shared_ptr
+ * - std::atomic
+ *
+ * Variations:
+ * - no set (non-const) accessor
+ * - static
+ * - mutable
+ *
+ * Accessors for normal variables, pointers, and atomics are of the form [set_prefix][variable name] and [get_prefix][variable_name].
+ * Accessors for referrable variables and shared_ptr's are of the form [variable name], both const and non-const
+ *
+ * To use this template file, the client package needs to define prefixes for 
+ * set and get functions, and for normal and non-static and static variables.
+ * This definition is done in the CMake stage of the build.  As an example, 
+ * see library/utility/CMakeLists.txt where both the camel-case and snake-case 
+ * headers are created.
+ * 
+ * If you want to use either the snake-case or camel-case header, but with different 
+ * macros, you can create a new header that includes the appropriate member-variable header 
+ * and then aliases the macros.  As an example, see library/utility/member_variables.hh.
+ * 
+ * Steps for creating a header file with different prefixes and aliased macros:
+ *
+ * 1. Create the include file that will be used (see e.g. member_variables.hh)
+ * 2. Add include guards
+ * 3. Include either _camel_case_member_variables.hh or _snake_case_member_variables.hh
+ * 4. Alias the camel_case_mv_ or snake_case_mv_ macros if desired
+ *
+ * CMake variables that must be defined to use this file:
+ * - macro_prefix: the prefix for the macro names (e.g. snake_case_)
+ * - set_prefix: the prefix for set accessor functions (e.g. set_)
+ * - get_prefix: the prefix for get accessor functions (e.g. get_)
+ * - var_prefix: the prefix for variables (e.g. f_)
+ * - static_prefix: the prefix for static variables (e.g. s_)
+ *
+ */
+
+#define @macro_prefix@get_fcn( x_variable ) PASTE( @get_prefix@, x_variable )
+#define @macro_prefix@set_fcn( x_variable ) PASTE( @set_prefix@, x_variable )
+#define @macro_prefix@var_name( x_variable ) PASTE( @var_prefix@, x_variable )
+#define @macro_prefix@static_var_name( x_variable ) PASTE( @static_prefix@, x_variable )
+
+//**********
+// normal
+//**********
+
+#define @macro_prefix@mv_accessible_noset( x_type, x_variable )\
+    protected:\
+        x_type @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type @macro_prefix@get_fcn( x_variable )() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_accessible( x_type, x_variable )\
+    @macro_prefix@mv_accessible_noset( x_type, x_variable )\
+    public:\
+        void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
+        {\
+            @macro_prefix@var_name( x_variable ) = p_variable;\
+            return;\
+        }
+
+#define @macro_prefix@mv_accessible_static_noset( x_type, x_variable )\
+    protected:\
+        static x_type @macro_prefix@static_var_name( x_variable );\
+    public:\
+        static x_type @macro_prefix@get_fcn( x_variable )()\
+        {\
+            return @macro_prefix@static_var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_accessible_static( x_type, x_variable )\
+    @macro_prefix@mv_accessible_static_noset( x_type, x_variable )\
+    public:\
+        static void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
+        {\
+            @macro_prefix@static_var_name( x_variable ) = p_variable;\
+            return;\
+        }
+
+#define @macro_prefix@mv_accessible_mutable_noset( x_type, x_variable )\
+    protected:\
+        mutable x_type @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type @macro_prefix@get_fcn( x_variable )() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_accessible_mutable( x_type, x_variable )\
+    @macro_prefix@mv_accessible_mutable_noset( x_type, x_variable )\
+    public:\
+        void @macro_prefix@set_fcn( x_variable )( x_type p_variable ) const\
+        {\
+            @macro_prefix@var_name( x_variable ) = p_variable;\
+            return;\
+        }
+
+
+//**************
+// referrable
+//**************
+
+#define @macro_prefix@mv_referrable_const( x_type, x_variable )\
+    protected:\
+        x_type @macro_prefix@var_name( x_variable );\
+    public:\
+        const x_type& x_variable() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_referrable( x_type, x_variable )\
+    @macro_prefix@mv_referrable_const( x_type, x_variable )\
+    public:\
+        x_type& x_variable()\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_referrable_static( x_type, x_variable )\
+    protected:\
+        static x_type @macro_prefix@static_var_name( x_variable );\
+    public:\
+        static x_type& x_variable()\
+        {\
+            return @macro_prefix@static_var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_referrable_mutable_const( x_type, x_variable )\
+    protected:\
+        mutable x_type @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type& x_variable() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_referrable_mutable( x_type, x_variable )\
+    @macro_prefix@mv_referrable_mutable_const( x_type, x_variable )\
+    public:\
+        x_type& x_variable()\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+
+//***********
+// pointer
+//***********
+
+#define @macro_prefix@mv_assignable_noset( x_type, x_variable )\
+    protected:\
+        x_type* @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type* @macro_prefix@get_fcn( x_variable )() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_assignable( x_type, x_variable )\
+    @macro_prefix@mv_assignable_noset( x_type, x_variable )\
+    public:\
+        void @macro_prefix@set_fcn( x_variable )( x_type* p_variable )\
+        {\
+            delete @macro_prefix@var_name( x_variable );\
+            @macro_prefix@var_name( x_variable ) = p_variable;\
+            return;\
+        }
+
+#define @macro_prefix@mv_assignable_static_noset( x_type, x_variable )\
+    protected:\
+        static x_type* @macro_prefix@static_var_name( x_variable );\
+    public:\
+        static x_type* @macro_prefix@get_fcn( x_variable )()\
+        {\
+            return @macro_prefix@static_var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_assignable_static( x_type, x_variable )\
+    @macro_prefix@mv_assignable_static_noset( x_type, x_variable )\
+    public:\
+        static void @macro_prefix@set_fcn( x_variable )( x_type* p_variable )\
+        {\
+            delete @macro_prefix@static_var_name( x_variable );\
+            @macro_prefix@static_var_name( x_variable ) = p_variable;\
+            return;\
+        }
+
+#define @macro_prefix@mv_assignable_mutable_noset( x_type, x_variable )\
+    protected:\
+        mutable x_type* @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type* @macro_prefix@get_fcn( x_variable )() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_assignable_mutable( x_type, x_variable )\
+    @macro_prefix@mv_assignable_mutable_noset( x_type, x_variable )\
+    public:\
+        void @macro_prefix@set_fcn( x_variable )( x_type* p_variable ) const\
+        {\
+            delete @macro_prefix@var_name( x_variable );\
+            @macro_prefix@var_name( x_variable ) = p_variable;\
+            return;\
+        }
+
+
+//**************
+// shared_ptr
+//**************
+
+#define @macro_prefix@mv_shared_ptr_const( x_type, x_variable )\
+    protected:\
+        std::shared_ptr< x_type > @macro_prefix@var_name( x_variable );\
+    public:\
+        const std::shared_ptr< x_type > x_variable() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_shared_ptr( x_type, x_variable )\
+    @macro_prefix@mv_shared_ptr_const( x_type, x_variable )\
+    public:\
+        std::shared_ptr< x_type > x_variable()\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_shared_ptr_static( x_type, x_variable )\
+    protected:\
+        static std::shared_ptr< x_type > @macro_prefix@static_var_name( x_variable );\
+    public:\
+        static std::shared_ptr< x_type >  x_variable()\
+        {\
+            return @macro_prefix@static_var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_shared_ptr_mutable_const( x_type, x_variable )\
+    protected:\
+        mutable std::shared_ptr< x_type > @macro_prefix@var_name( x_variable );\
+    public:\
+        std::shared_ptr< x_type > x_variable() const\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+#define @macro_prefix@mv_shared_ptr_mutable( x_type, x_variable )\
+    @macro_prefix@mv_shared_ptr_mutable_const( x_type, x_variable )\
+    public:\
+        std::shared_ptr< x_type > x_variable()\
+        {\
+            return @macro_prefix@var_name( x_variable );\
+        }
+
+
+//**********
+// atomic
+//**********
+
+#define @macro_prefix@mv_atomic_noset( x_type, x_variable )\
+    protected:\
+        std::atomic< x_type > @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type @macro_prefix@get_fcn( x_variable )() const\
+        {\
+            return @macro_prefix@var_name( x_variable ).load();\
+        }
+
+#define @macro_prefix@mv_atomic( x_type, x_variable )\
+    @macro_prefix@mv_atomic_noset( x_type, x_variable )\
+    public:\
+        void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
+        {\
+            @macro_prefix@var_name( x_variable ).store( p_variable );\
+            return;\
+        }
+
+#define @macro_prefix@mv_atomic_static_noset( x_type, x_variable )\
+    protected:\
+        static std::atomic< x_type > @macro_prefix@static_var_name( x_variable );\
+    public:\
+        static x_type @macro_prefix@get_fcn( x_variable )()\
+        {\
+            return @macro_prefix@static_var_name( x_variable ).load();\
+        }
+
+#define @macro_prefix@mv_atomic_static( x_type, x_variable )\
+    @macro_prefix@mv_atomic_static_noset( x_type, x_variable )\
+    public:\
+        static void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
+        {\
+            @macro_prefix@static_var_name( x_variable ).store( p_variable );\
+            return;\
+        }
+
+#define @macro_prefix@mv_atomic_mutable_noset( x_type, x_variable )\
+    protected:\
+        mutable std::atomic< x_type > @macro_prefix@var_name( x_variable );\
+    public:\
+        x_type @macro_prefix@get_fcn( x_variable )() const\
+        {\
+            return @macro_prefix@var_name( x_variable ).load();\
+        }
+
+#define @macro_prefix@mv_atomic_mutable( x_type, x_variable )\
+    @macro_prefix@mv_atomic_mutable_noset( x_type, x_variable )\
+    public:\
+        void @macro_prefix@set_fcn( x_variable )( x_type p_variable ) const\
+        {\
+            @macro_prefix@var_name( x_variable ).store( p_variable );\
+            return;\
+        }
+
+#endif /* @macro_prefix@SCARAB_UTILITY_MEMBER_VARIABLES_HH_ */
diff --git a/Src/Scarab/library/utility/base_exception.hh b/Src/Scarab/library/utility/base_exception.hh
new file mode 100644
index 0000000..18bb9be
--- /dev/null
+++ b/Src/Scarab/library/utility/base_exception.hh
@@ -0,0 +1,207 @@
+/*
+ * base_exception.hh
+ *
+ *  Created on: Mar 17, 2020
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_BASE_EXCEPTION_HH_
+#define SCARAB_BASE_EXCEPTION_HH_
+
+#include "path.hh"
+#include "scarab_api.hh"
+
+#include <exception>
+#include <sstream>
+
+
+namespace scarab
+{
+    /*!
+     @class base_exception
+     @author N.S. Oblath
+     @brief Base class for exceptions with what() and where() functions
+    */
+    class SCARAB_API base_exception : public ::std::exception
+    {
+        public:
+            base_exception() noexcept = default;
+            virtual ~base_exception() noexcept = default;
+
+            // what() inherited from std::exception
+
+            virtual const char* where() const noexcept = 0;
+    };
+
+    /*!
+     @class typed_exception
+     @author N.S. Oblath
+     @brief Base class for exceptions with streaming operators and filename/line number location
+
+     @details
+     This class provides streaming operators for building up the `what()` message.
+     It's meant to be the base class for any exceptions wanting to use that feature.
+
+     The `where()` message can be filled with the filename and line number using 
+     a constructor or operator().
+
+     This class uses the Curiously Recurring Template Pattern (CRTP) to get the 
+     derived class type to appear in the base class.
+     In particular, we need to return x_derived& from the various operator<<() 
+     so that those functions can be used in a throw statement and the user can 
+     still catch the derived type.
+    */
+   template< typename x_derived >
+    class SCARAB_API typed_exception : public base_exception
+    {
+        public:
+            typed_exception() noexcept;
+            typed_exception( const std::string& a_filename, int a_line ) noexcept;
+            typed_exception( const typed_exception< x_derived >& a_orig ) noexcept;
+            virtual ~typed_exception() noexcept;
+
+            typed_exception< x_derived >& operator=( const typed_exception< x_derived >& a_orig );
+
+            template< class x_streamable >
+            x_derived& operator<<( x_streamable a_fragment );
+            x_derived& operator<<( const std::string& a_fragment );
+            x_derived& operator<<( const char* a_fragment );
+
+            x_derived& operator()( const std::string& a_filename, int a_line );
+
+            virtual const char* what() const noexcept;
+            virtual const char* where() const noexcept;
+
+            const std::string& filename() const;
+            int line() const;
+
+        protected:
+            mutable std::string f_what;
+            mutable std::string f_where;
+
+            std::string f_filename;
+            int f_line;
+    };
+
+    template< typename x_derived >
+    typed_exception< x_derived >::typed_exception() noexcept :
+            base_exception(),
+            f_what(),
+            f_where(),
+            f_filename(),
+            f_line(0)
+    {}
+
+    template< typename x_derived >
+    typed_exception< x_derived >::typed_exception( const std::string& a_filename, int a_line) noexcept :
+            base_exception(),
+            f_what(),
+            f_where(),
+            f_filename(),
+            f_line( a_line )
+    {
+        try
+        {
+            f_filename = a_filename;
+        }
+        catch( ... )
+        {
+            f_filename.clear();
+        }
+    }
+
+    template< typename x_derived >
+    typed_exception< x_derived >::typed_exception( const typed_exception< x_derived >& a_orig ) noexcept :
+            base_exception( a_orig ),
+            f_what( a_orig.f_what ),
+            f_where(),
+            f_filename(),
+            f_line( a_orig.f_line )
+    {
+        try
+        {
+            f_filename = a_orig.f_filename;
+        }
+        catch( ... )
+        {
+            f_filename.clear();
+        }
+    }
+
+    template< typename x_derived >
+    typed_exception< x_derived >::~typed_exception() noexcept
+    {}
+
+    template< typename x_derived >
+    typed_exception< x_derived >& typed_exception< x_derived >::operator=( const typed_exception< x_derived >& a_orig )
+    {
+        f_what = a_orig.f_error;
+        return *this;
+    }
+
+    template< typename x_derived >
+    const char* typed_exception< x_derived >::what() const noexcept
+    {
+        return f_what.c_str();
+    }
+
+    template< typename x_derived >
+    const char* typed_exception< x_derived >::where() const noexcept
+    {
+        try
+        {
+            f_where = path(f_filename).filename().string() + "(" + std::to_string(f_line) + ")";
+        }
+        catch( ... )
+        {
+            f_where.clear();
+        }
+        return f_where.c_str();
+    }
+
+    template< typename x_derived >
+    template< class x_streamable >
+    x_derived& typed_exception< x_derived >::operator<<( x_streamable a_fragment )
+    {
+        std::stringstream stream;
+        stream << a_fragment;
+        f_what += stream.str();
+        return *static_cast< x_derived* >(this);
+    }
+
+    template< typename x_derived >
+    x_derived& typed_exception< x_derived >::operator<<( const std::string& a_fragment )
+    {
+        f_what += a_fragment;
+        return *static_cast< x_derived* >(this);
+    }
+
+    template< typename x_derived >
+    x_derived& typed_exception< x_derived >::operator<<( const char* a_fragment )
+    {
+        f_what += std::string( a_fragment );
+        return *static_cast< x_derived* >(this);
+    }
+
+    template< typename x_derived >
+    x_derived& typed_exception< x_derived >::operator()( const std::string& a_filename, int a_line )
+    {
+        f_filename = a_filename;
+        f_line = a_line;
+        return *static_cast< x_derived* >(this);
+    }
+
+    template< typename x_derived >
+    const std::string& typed_exception< x_derived >::filename() const
+    {
+        return f_filename;
+    }
+
+    template< typename x_derived >
+    int typed_exception< x_derived >::line() const
+    {
+        return f_line;
+    }
+}
+
+#endif /* SCARAB_BASE_EXCEPTION_HH_ */
diff --git a/Src/Scarab/library/utility/cancelable.cc b/Src/Scarab/library/utility/cancelable.cc
new file mode 100644
index 0000000..47c4fff
--- /dev/null
+++ b/Src/Scarab/library/utility/cancelable.cc
@@ -0,0 +1,83 @@
+/*
+ * cancelable.cc
+ *
+ *  Created on: Jan 24, 2016
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "cancelable.hh"
+
+#include "logger.hh"
+#include "signal_handler.hh"
+
+namespace scarab
+{
+    LOGGER( slog, "cancelable" );
+
+    cancelable::cancelable() :
+            f_canceled( false )
+    {}
+
+    cancelable::cancelable( const cancelable& a_orig ) :
+            f_canceled( a_orig.f_canceled.load() )
+    {}
+
+    cancelable::cancelable( cancelable&& a_orig ) :
+            f_canceled( a_orig.f_canceled.load() )
+    {
+        a_orig.f_canceled.store( false );
+    }
+
+    cancelable::~cancelable()
+    {
+        signal_handler::remove_cancelable( this );
+    }
+
+    cancelable& cancelable::operator=( const cancelable& a_orig )
+    {
+        f_canceled.store( a_orig.f_canceled.load() );
+        return *this;
+    }
+
+    cancelable& cancelable::operator=( cancelable&& a_orig )
+    {
+        f_canceled.store( a_orig.f_canceled.load() );
+        a_orig.f_canceled.store( false );
+        return *this;
+    }
+
+#ifdef NDEBUG
+    void cancelable::do_cancellation( int )
+#else
+    void cancelable::do_cancellation( int a_code )
+#endif
+    {
+        // override in derived class
+        LDEBUG( slog, "cancelable::do_cancellation with code <" << a_code << ">" );
+        return;
+    }
+
+    void cancelable::do_reset_cancellation()
+    {
+        // override in derived class
+        return;
+    }
+
+    // cancelable_wrapper
+    cancelable_wrapper::cancelable_wrapper( cancelable& a_cancelable ) :
+            f_wrapped( &a_cancelable )
+    {}
+
+    cancelable_wrapper::~cancelable_wrapper() 
+    {}
+
+    // wrap_cancelable
+    SCARAB_API std::shared_ptr< cancelable_wrapper > wrap_cancelable( cancelable& a_cancelable )
+    {
+        return std::make_shared< cancelable_wrapper >( a_cancelable );
+    }
+
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/utility/cancelable.hh b/Src/Scarab/library/utility/cancelable.hh
new file mode 100644
index 0000000..9c38402
--- /dev/null
+++ b/Src/Scarab/library/utility/cancelable.hh
@@ -0,0 +1,142 @@
+/*
+ * cancelable.hh
+ *
+ *  Created on: Jan 24, 2016
+ *      Author: nsoblath
+ *
+ *  Base class for thread-safe asynchronous cancellation
+ */
+
+#ifndef SCARAB_CANCELABLE_HH_
+#define SCARAB_CANCELABLE_HH_
+
+#include "macros.hh"
+#include "scarab_api.hh"
+
+#include <atomic>
+#include <memory>
+
+namespace scarab
+{
+    /*!
+     @class cancelable
+     @author N. S. Oblath
+
+     @brief Base class for a cancelable object (i.e. an object that can be canceled by scarab::signal_handler or other client code)
+
+     @details
+     A cancelable object is one which has some execution operation that should be asynchronously cancelable.  
+     Cancellation is performed using cancelable::cancel().
+
+     For example, if the object of a derived class is executing in thread 1, 
+     client code in thread 2 or a signal (e.g. SIGINT) from the user or a system 
+     should be able to cancel execution.
+
+     If a derived class has a function execute() that performs the main execution loop, that loop should include 
+     a periodic check of cancelable::is_canceled() to know whether to exit the loop.
+
+     Any actions that should take place when cancelable::cancel() is used should be implemented by the derived class in do_cancellation().
+
+     Cancelable objects can exist within a parent/child hierarchy to ensure that execution can be cleanly shut down.  
+     Parent classes should implement do_cancellation(int) to cancel their children.
+
+     For example, if a parent object in thread 1 starts the execution of two children, each in their own thread (i.e. threads 2 and 3),
+     then the parent object should be added to the signal_handler (using signal_handler::add_cancelable()).  The parent's implementation of 
+     do_cancellation() should take care of calling cancelable::cancel() on each of the children.  The children should not be separately added to 
+     the signal_handler.
+
+     Genreally it's assumed that a top-level-parent cancelable object will be created on the heap using std::shared_ptr
+     (hence why signal_handler adds cancelables using std::shared_ptr<cancelable>).
+    */
+    class SCARAB_API cancelable
+    {
+        public:
+            cancelable();
+            cancelable( const cancelable& a_orig );
+            cancelable( cancelable&& a_orig );
+            virtual ~cancelable();
+
+            cancelable& operator=( const cancelable& a_orig );
+            cancelable& operator=( cancelable&& a_orig );
+
+            /// asynchronous cancel function
+            void cancel( int a_code = RETURN_SUCCESS );
+
+            /// reset to non-canceled state
+            void reset_cancel();
+
+            /// check canceled state
+            bool is_canceled() const;
+
+        private:
+            virtual void do_cancellation( int a_code );
+            virtual void do_reset_cancellation();
+
+        protected:
+            std::atomic< bool > f_canceled;
+    };
+
+    /*!
+     @struct cancelable_wrapper
+     @author N. S. Oblath
+
+     @brief Lightweight wrapper for a cancelable object only temporarily added to signal_handler.
+
+     @details
+     Sometimes a cancelable object is created on the stack in a local scope, or it's temporarily added to signal_handler 
+     while a specific action is performed.  In this case you can use this lightweight wrapper to add the cancelable object to the signal handler.
+
+     NOTE: the wrapper does not track the lifetime of the wrapped object.  Only use this wrapper if you can guarantee that the lifetime of the 
+     wrapped object is not shorter than that of the wrapper.
+
+     Example:
+       {
+           my_cancelable t_obj;  // here's the local object we want to have temporarily added to signal_handler
+           auto t_obj_wrap = wrap_cancelable( t_obj );  // use wrap_cancelable() (declared below) to create the wrapper
+           scarab::signal_handler t_handler;  // creating the signal_handler sets the signal-handling functions, if it hasn't been done before
+           t_handler.add_cancelable( t_obj_wrap );  // add the wrapper
+           t_obj.execute();  // do the cancelable action
+           // end of scope: t_obj_wrap is destroyed, which removes it from signal_handler automatically
+       }
+    */
+
+    struct SCARAB_API cancelable_wrapper : cancelable
+    {
+        cancelable_wrapper( cancelable& a_cancelable );
+        virtual ~cancelable_wrapper();
+        virtual void do_cancellation( int a_code );
+        cancelable* f_wrapped;
+    };
+
+    /// Convenience function to create a cancelable_wrapper
+    SCARAB_API std::shared_ptr< cancelable_wrapper > wrap_cancelable( cancelable& a_cancelable );
+
+
+    inline void cancelable::cancel( int a_code )
+    {
+        if( f_canceled.load() ) return;
+        f_canceled.store( true );
+        this->do_cancellation( a_code );
+    }
+
+    inline void cancelable::reset_cancel()
+    {
+        if( ! f_canceled.load() ) return;
+        f_canceled.store( false );
+        this->do_reset_cancellation();
+    }
+
+    inline bool cancelable::is_canceled() const
+    {
+        return f_canceled.load();
+    }
+
+
+    inline void cancelable_wrapper::do_cancellation( int a_code )
+    {
+        f_wrapped->cancel( a_code );
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_CANCELABLE_HH_ */
diff --git a/Src/Scarab/library/utility/concurrent_queue.hh b/Src/Scarab/library/utility/concurrent_queue.hh
new file mode 100644
index 0000000..fb6e1fd
--- /dev/null
+++ b/Src/Scarab/library/utility/concurrent_queue.hh
@@ -0,0 +1,171 @@
+/*
+ * concurrent_queue.hh
+ *
+ *  Created on: July 8, 2015
+ *      Author: nsoblath
+ *
+ *      FIFO Queue
+ *
+ *      Based almost exactly on the class concurrent_queue from:
+ *      http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html
+ *      Post author: Anthony Williams
+ *      Copyright  2005-2013 Just Software Solutions Ltd. All rights reserved.
+ */
+
+#ifndef SCARAB_CONCURRENT_QUEUE_HH_
+#define SCARAB_CONCURRENT_QUEUE_HH_
+
+#include "logger.hh"
+
+#include <chrono>
+#include <condition_variable>
+#include <deque>
+#include <mutex>
+
+namespace scarab
+{
+    LOGGER( slog_cq, "concurrent_queue" );
+
+    template< class XDataType >
+    class concurrent_queue
+    {
+        public:
+            typedef std::deque< XDataType > queue;
+
+            struct queue_not_empty
+            {
+                queue& f_queue;
+                queue_not_empty( queue& a_queue ) :
+                    f_queue( a_queue )
+                {}
+                bool operator()() const
+                {
+                    return ! f_queue.empty();
+                }
+            };
+
+            typedef std::unique_lock< std::mutex > cq_lock;
+
+        public:
+            concurrent_queue() :
+                f_queue(),
+                f_interrupt( false ),
+                f_timeout( std::chrono::milliseconds( 1000 ) ),
+                f_mutex(),
+                f_condition_var()
+            {
+            }
+
+            virtual ~concurrent_queue()
+            {
+                f_queue.clear();
+            }
+
+        private:
+            queue f_queue;
+            bool f_interrupt;
+
+            std::chrono::milliseconds f_timeout; /// Timeout duration in milliseconds
+
+            mutable std::mutex f_mutex;
+            std::condition_variable f_condition_var;
+
+        public:
+            void push( XDataType const& a_data )
+            {
+                LDEBUG( slog_cq, "Attempting to push to queue" );
+                cq_lock lock( f_mutex );
+                LDEBUG( slog_cq, "Pushing to concurrent queue; size: " << f_queue.size() );
+                f_queue.push_back( a_data );
+                lock.unlock();
+                f_condition_var.notify_one();
+                return;
+            }
+
+            bool empty() const
+            {
+                cq_lock lock( f_mutex );
+                return f_queue.empty();
+            }
+
+            unsigned size() const
+            {
+                cq_lock lock( f_mutex );
+                return f_queue.size();
+            }
+
+            bool try_pop( XDataType& a_popped_value )
+            {
+                cq_lock lock( f_mutex );
+                f_interrupt = false;
+                if( f_queue.empty() )
+                {
+                    return false;
+                }
+
+                a_popped_value = f_queue.front();
+                f_queue.pop_front();
+                return true;
+            }
+
+            bool wait_and_pop( XDataType& a_popped_value )
+            {
+                cq_lock lock( f_mutex );
+                f_interrupt = false;
+                f_condition_var.wait( lock, queue_not_empty( f_queue ) );
+                if( f_interrupt )
+                {
+                    f_interrupt = false;
+                    return false;
+                }
+
+                a_popped_value = f_queue.front();
+                f_queue.pop_front();
+                LDEBUG( slog_cq, "Popping from concurrent queue; size: " << f_queue.size() );
+                return true;
+            }
+
+            bool timed_wait_and_pop( XDataType& a_popped_value )
+            {
+                cq_lock lock( f_mutex );
+                f_interrupt = false;
+                std::chrono::steady_clock::time_point const waitUntil = std::chrono::steady_clock::now() + f_timeout;
+                if( ! f_condition_var.wait_until( lock, waitUntil, queue_not_empty( f_queue ) ) )
+                {
+                    //LDEBUG( mtlog_cq, "Queue wait has timed out" );
+                    return false;
+                }
+                if( f_interrupt )
+                {
+                    f_interrupt = false;
+                    return false;
+                }
+
+                a_popped_value = f_queue.front();
+                f_queue.pop_front();
+                LDEBUG( slog_cq, "Popping from concurrent queue; size: " << f_queue.size() );
+                return true;
+            }
+
+            void interrupt()
+            {
+                f_interrupt = true;
+                f_condition_var.notify_one();
+                return;
+            }
+
+            inline unsigned get_timeout() const
+            {
+                return f_timeout.count();
+            }
+
+            inline void set_timeout( unsigned a_duration )
+            {
+                f_timeout = std::chrono::milliseconds( a_duration );
+                return;
+            }
+    };
+
+} /* namespace scarab */
+
+#endif /* SCARAB_CONCURRENT_QUEUE_HH_ */
diff --git a/Src/Scarab/library/utility/destroyer.hh b/Src/Scarab/library/utility/destroyer.hh
new file mode 100644
index 0000000..94008a2
--- /dev/null
+++ b/Src/Scarab/library/utility/destroyer.hh
@@ -0,0 +1,52 @@
+/*
+ * destroyer.hh
+ *
+ *  Created on: Nov 7, 2011
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_DESTROYER_HH_
+#define SCARAB_DESTROYER_HH_
+
+
+namespace scarab
+{
+
+    template< class XDoomed >
+    class destroyer
+    {
+        public:
+            destroyer( XDoomed* = 0 );
+            ~destroyer();
+
+            void set_doomed( XDoomed* );
+
+        private:
+            // Prevent users from making copies of a destroyer to avoid double deletion:
+            destroyer( const destroyer< XDoomed >& );
+            void operator=( const destroyer< XDoomed >& );
+
+        private:
+            XDoomed* f_doomed;
+    };
+
+    template< class XDoomed >
+    destroyer< XDoomed >::destroyer( XDoomed* d )
+    {
+        f_doomed = d;
+    }
+
+    template< class XDoomed >
+    destroyer< XDoomed >::~destroyer()
+    {
+        delete f_doomed;
+    }
+
+    template< class XDoomed >
+    void destroyer< XDoomed >::set_doomed( XDoomed* d )
+    {
+        f_doomed = d;
+    }
+
+} /* namespace scarab */
+#endif /* SCARAB_DESTROYER_HH_ */
diff --git a/Src/Scarab/library/utility/digital.cc b/Src/Scarab/library/utility/digital.cc
new file mode 100644
index 0000000..c27e9d2
--- /dev/null
+++ b/Src/Scarab/library/utility/digital.cc
@@ -0,0 +1,46 @@
+/*
+ * digital.c
+ *
+ * written by jared kofron <jared.kofron@gmail.com>
+ *
+ * documented prototypes are in digital.h
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "digital.hh"
+
+#include <cstdio>
+
+namespace scarab
+{
+
+    void get_calib_params( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, bool bits_r_aligned, dig_calib_params *params )
+    {
+        params->bit_depth = n_bits;
+        params->levels = 1 << n_bits;
+        params->data_type_size = data_type_size;
+        params->v_range = v_range;
+        params->v_offset = v_offset;
+        params->inv_levels = 1. / (double)params->levels;
+        params->inv_v_range = 1. / params->v_range;
+        params->dac_gain = params->v_range * params->inv_levels;
+        params->bits_right_aligned = bits_r_aligned;
+        return;
+    }
+
+    void get_calib_params2( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, double dac_gain, bool bits_r_aligned, dig_calib_params *params )
+    {
+        params->bit_depth = n_bits;
+        params->levels = 1 << n_bits;
+        params->data_type_size = data_type_size;
+        params->v_range = v_range;
+        params->v_offset = v_offset;
+        params->inv_levels = 1. / ( double )params->levels;
+        params->inv_v_range = 1. / params->v_range;
+        params->dac_gain = dac_gain;
+        params->bits_right_aligned = bits_r_aligned;
+        return;
+    }
+
+}
diff --git a/Src/Scarab/library/utility/digital.hh b/Src/Scarab/library/utility/digital.hh
new file mode 100644
index 0000000..f970e34
--- /dev/null
+++ b/Src/Scarab/library/utility/digital.hh
@@ -0,0 +1,106 @@
+/*
+ * digital.hh
+ *
+ * Created on: ~2016
+ *     Author: N.S. Oblath
+ *
+ *
+ */
+
+#ifndef SCARAB_DIGITAL_HH_
+#define SCARAB_DIGITAL_HH_
+
+#include "scarab_api.hh"
+
+#include <cmath>
+#include <type_traits>
+
+namespace scarab
+{
+
+    /** \struct dig_calib_params
+        \brief Collection of parameters used for converting between analog and digital data
+
+        Typically this struct is filled in with one of the get_calib_params functions.
+
+        Notes on parameters that are typically specified by the user:
+
+        \param bit_depth The number of bits used by the digitized data (<= to the size of the data type)
+
+        \param data_type_size The size of the digitized data type in bytes
+
+        \param v_range The voltage range covered by the digitization
+
+        \param v_offset The voltage offset for the measurement.  The specific meaning of this depends on whether
+        you're recording your data as variations about some middle point, or as positive variations above a pedestal.
+        In the former case, it's assumed (by how the a2d function is setup) that you'll be using a signed datatype for
+        the digitized data.  In the latter case, it's assumed that you'll be using an unsigned datatype.
+
+        \param bits_right_aligned Whether the bits within the data type are right aligned or left-aligned
+
+        \param dac_gain Some digitizers libraries provide the DAC gain that should be used for reconstructing analog values.
+     */
+    struct SCARAB_API dig_calib_params
+    {
+        unsigned bit_depth;
+        unsigned levels;
+        unsigned data_type_size;
+        double v_range;
+        double v_offset;
+        double inv_levels;
+        double inv_v_range;
+        double dac_gain;
+        bool bits_right_aligned;
+    };
+
+
+    /// Calculate the digitizer calibration parameters with basic parameters: number of bits, Voffset, and Vrange
+    SCARAB_API void get_calib_params( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, bool bits_r_aligned, dig_calib_params *params );
+    /// Calculate the digitizer calibration parameters when given the DAC gain (e.g. from a digitizer's own calibration)
+    SCARAB_API void get_calib_params2( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, double dac_gain, bool bits_r_aligned, dig_calib_params *params );
+
+
+    //namespace detail {
+    //    enum class is_signed {};
+    //    enum class is_unsigned {};
+    //}
+
+    template< typename type >
+    using enable_if_signed = typename std::enable_if< std::is_signed<type>::value >::type*;
+
+    template< typename type >
+    using enable_if_unsigned = typename std::enable_if< std::is_unsigned<type>::value >::type*;
+
+    /// Convert a signed or unsigned digital value to an analog value.
+    template< typename dig_type, typename an_type >
+    an_type d2a( dig_type dig, const struct dig_calib_params* params )
+    {
+        return params->v_offset + params->dac_gain * ( an_type )dig;
+    }
+
+    /// Convert an analog value to an unsigned digital value.
+    template< typename an_type, typename dig_type,
+                enable_if_unsigned< dig_type > = nullptr  >
+    dig_type a2d( an_type analog, const struct dig_calib_params* params )
+    {
+        analog = ( analog - params->v_offset ) * params->inv_v_range * (an_type)(params->levels);
+        if( analog > (an_type)(params->levels - 1) ) analog = params->levels - 1;
+        else if( analog < 0. ) analog = 0.;
+        return (dig_type)std::round( analog );
+    }
+
+    ///Convert an analog value to a signed digital value.
+    template< typename an_type, typename dig_type,
+              enable_if_signed< dig_type > = nullptr >
+    dig_type a2d( an_type analog, const struct dig_calib_params* params )
+    {
+        double half_levels = params->levels * 0.5;
+        analog = ( analog - params->v_offset ) * params->inv_v_range * (an_type)(params->levels);
+        if( analog > (an_type)(half_levels - 1) ) analog = half_levels - 1;
+        else if( analog < -half_levels ) analog = -half_levels;
+        return (dig_type)std::round( analog );
+    }
+
+}
+
+#endif // SCARAB_DIGITAL_HH_
diff --git a/Src/Scarab/library/utility/error.hh b/Src/Scarab/library/utility/error.hh
new file mode 100644
index 0000000..d99fbee
--- /dev/null
+++ b/Src/Scarab/library/utility/error.hh
@@ -0,0 +1,20 @@
+#ifndef SCARAB_EXCEPTION_HH_
+#define SCARAB_EXCEPTION_HH_
+
+#include "base_exception.hh"
+#include "scarab_api.hh"
+
+namespace scarab
+{
+
+    class SCARAB_API error : public typed_exception< error >
+    {
+        public:
+            error() = default;
+            error( const error& ) = default;
+            ~error() noexcept = default;
+    };
+
+}
+
+#endif /* SCARAB_EXCEPTION_HH_ */
diff --git a/Src/Scarab/library/utility/exponential_backoff.hh b/Src/Scarab/library/utility/exponential_backoff.hh
new file mode 100644
index 0000000..5ba603a
--- /dev/null
+++ b/Src/Scarab/library/utility/exponential_backoff.hh
@@ -0,0 +1,87 @@
+/*
+ * exponential_backoff.hh
+ *
+ *  Created on: Jun 17, 2021
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_EXPONENTIAL_BACKOFF_HH_
+#define SCARAB_EXPONENTIAL_BACKOFF_HH_
+
+#include "error.hh"
+#include "logger.hh"
+#include "member_variables.hh"
+#include "scarab_api.hh"
+
+#include <chrono>
+#include <functional>
+#include <thread>
+
+
+LOGGER( expbacklog_hh, "exponential_backoff.hh" )
+
+namespace scarab
+{
+    /*!
+     @class exponential_backoff
+     @author N.S. Oblath
+     @brief Class that performs an action using exponential backoff
+
+     @details
+     
+    */
+    template< typename ... x_args >
+    class SCARAB_API exponential_backoff
+    {
+        public:
+            exponential_backoff( std::function< bool (x_args...) > an_action, unsigned a_max_attempts = 10, unsigned a_base_delay_ms = 100 );
+            //exponential_backoff( const exponential_backoff< x_args... >& a_orig );
+            virtual ~exponential_backoff();
+
+            //exponential_backoff< x_args... >& operator=( const exponential_backoff< x_args... >& a_orig );
+
+            /// returns the number of attempts made at calling the function (including the last, successful or not)
+            unsigned go( x_args... args );
+
+            mv_referrable( std::function< bool (x_args...) >, action );
+
+            mv_accessible( unsigned, max_attempts );
+            mv_accessible( unsigned, base_delay_ms );
+    };
+
+
+    template< typename ... x_args >
+    exponential_backoff< x_args... >::exponential_backoff( std::function< bool (x_args...) > an_action, unsigned a_max_attempts, unsigned a_base_delay_ms ) :
+            f_action( an_action ),
+            f_max_attempts( a_max_attempts ),
+            f_base_delay_ms( a_base_delay_ms )
+    {
+        if( f_max_attempts == 0 ) throw error() << "Max attempts must be > 0";
+    }
+
+    template< typename ... x_args >
+    exponential_backoff< x_args... >::~exponential_backoff()
+    {}
+
+    template< typename ... x_args >
+    unsigned exponential_backoff< x_args... >::go( x_args... args )
+    {
+        //LDEBUG( expbacklog_hh, "doing action" );
+        unsigned t_attempts = 1;
+        bool t_success = f_action( args... );
+        LDEBUG( expbacklog_hh, "function called first time: " << t_success );
+        while( ! t_success && t_attempts < f_max_attempts )
+        {
+            LDEBUG( expbacklog_hh, "attempt: " << t_attempts + 1 << " after delay: " << (1<<t_attempts) * f_base_delay_ms );
+            std::this_thread::sleep_for( std::chrono::milliseconds( (1<<t_attempts) * f_base_delay_ms ) );
+            t_success = f_action( args... );
+            LDEBUG( expbacklog_hh, "function called: " << t_success );
+            ++t_attempts;
+        }
+
+        return t_success ? t_attempts : 0;
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_EXPONENTIAL_BACKOFF_HH_ */
diff --git a/Src/Scarab/library/utility/factory.hh b/Src/Scarab/library/utility/factory.hh
new file mode 100644
index 0000000..94a2430
--- /dev/null
+++ b/Src/Scarab/library/utility/factory.hh
@@ -0,0 +1,36 @@
+/*
+ * factory.hh
+ *
+ *  created on: Jul 31, 2012
+ *      Author: N.S. Oblath
+ * 
+ *  The factory is a special kind of indexed_factory with a string index.
+ * 
+ *  Why is factory based on indexed_factory?  Because factory existed first with the string index, 
+ *  and then factories with non-string indices were desired, 
+ *  so indexed_factory was created as a generalization of factory.
+ * 
+ *  Note on registrar lifespan: when a registrar is deleted, it un-registers itself from the factory.
+ *     This is because the registrar itself is used to create objects, and the act of registering 
+ *     stores a pointer in the factory.  The factory does _not_ assume ownership of the registrar.
+ *     Therefore the registrar needs to exist for as long as it might be needed.
+ */
+
+#ifndef SCARAB_FACTORY_HH_
+#define SCARAB_FACTORY_HH_
+
+#include "indexed_factory.hh"
+
+#include <string>
+
+namespace scarab
+{
+
+    template< class XBaseType, class... XArgs >
+    using factory = indexed_factory< std::string, XBaseType, XArgs... >;
+
+    template< class XBaseType, class... XArgs >
+    using registrar = indexed_registrar< std::string, XBaseType, XArgs... >;
+    
+} /* namespace scarab */
+#endif /* SCARAB_FACTORY_HH_ */
diff --git a/Src/Scarab/library/utility/indexed_factory.hh b/Src/Scarab/library/utility/indexed_factory.hh
new file mode 100644
index 0000000..355531e
--- /dev/null
+++ b/Src/Scarab/library/utility/indexed_factory.hh
@@ -0,0 +1,402 @@
+/*
+ * indexed_factory.hh
+ *
+ *  created on: Oct 4, 2019
+ *      Author: N.S. Oblath
+ * 
+ *  This factory has the same functionality as is found in factory.hh plus the option of choosing the index type.
+ *
+ *  Note on registrar lifespan: when a registrar is deleted, it un-registers itself from the factory.
+ *     This is because the registrar itself is used to create objects, and the act of registering 
+ *     stores a pointer in the factory.  The factory does _not_ assume ownership of the registrar.
+ *     Therefore the registrar needs to exist for as long as it might be needed.
+ */
+
+#ifndef SCARAB_INDEXED_FACTORY_HH_
+#define SCARAB_INDEXED_FACTORY_HH_
+
+#include "singleton.hh"
+
+#include "error.hh"
+#include "logger.hh"
+
+#include <map>
+#include <string>
+#include <utility>
+
+namespace scarab
+{
+    LOGGER( slog_ind_fact, "indexed_factory" );
+
+    //********************
+    // Class definitions
+    //********************
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    class indexed_factory;
+
+    // base_registrar
+
+    template< class XBaseType, typename ... XArgs >
+    class base_registrar
+    {
+        public:
+            base_registrar() {}
+            virtual ~base_registrar() {}
+
+            virtual XBaseType* create( XArgs ... args ) const = 0;
+
+    };
+
+    // registrar
+
+    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
+    class indexed_registrar : public base_registrar< XBaseType, XArgs... >
+    {
+        public:
+            indexed_registrar( const XIndexType& a_index );
+            virtual ~indexed_registrar();
+
+            void register_class() const;
+
+            XBaseType* create( XArgs ... args ) const;
+
+        protected:
+            XIndexType f_index;
+    };
+
+    // indexed_factory
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    class indexed_factory : public singleton< indexed_factory< XIndexType, XBaseType, XArgs... > >
+    {
+        public:
+            typedef std::map< XIndexType, const base_registrar< XBaseType, XArgs... >* > FactoryMap;
+            typedef typename FactoryMap::value_type FactoryEntry;
+            typedef typename FactoryMap::iterator FactoryIt;
+            typedef typename FactoryMap::const_iterator FactoryCIt;
+
+        public:
+            XBaseType* create( const XIndexType& a_index, XArgs ... args );
+            XBaseType* create( const FactoryCIt& iter, XArgs ... args );
+
+            void register_class( const XIndexType& a_index, const base_registrar< XBaseType, XArgs... >* base_registrar );
+            bool has_class( const XIndexType& a_index ) const;
+            void remove_class( const XIndexType& a_index );
+
+            FactoryCIt begin() const;
+            FactoryCIt end() const;
+
+        protected:
+            FactoryMap* fMap;
+            mutable std::mutex f_factory_mutex;
+
+        protected:
+            allow_singleton_access( indexed_factory );
+            indexed_factory();
+            ~indexed_factory();
+    };
+
+
+    //*****************************************
+    // Partial specialization for empty XArgs
+    //*****************************************
+
+    template< class XBaseType >
+    class base_registrar< XBaseType, void >
+    {
+        public:
+            base_registrar() {}
+            virtual ~base_registrar() {}
+
+            virtual XBaseType* create() const = 0;
+
+    };
+
+    template< class XIndexType, class XBaseType, class XDerivedType >
+    class indexed_registrar< XIndexType, XBaseType, XDerivedType, void > : public base_registrar< XBaseType >
+    {
+        public:
+            indexed_registrar( const XIndexType& a_index );
+            virtual ~indexed_registrar();
+
+            void register_class() const;
+
+            XBaseType* create() const;
+
+        protected:
+            XIndexType f_index;
+    };
+
+
+    template< class XIndexType, class XBaseType >
+    class indexed_factory< XIndexType, XBaseType, void > : public singleton< indexed_factory< XIndexType, XBaseType > >
+    {
+        public:
+            typedef std::map< XIndexType, const base_registrar< XBaseType >* > FactoryMap;
+            typedef typename FactoryMap::value_type FactoryEntry;
+            typedef typename FactoryMap::iterator FactoryIt;
+            typedef typename FactoryMap::const_iterator FactoryCIt;
+
+        public:
+            XBaseType* create( const XIndexType& a_index );
+            XBaseType* create( const FactoryCIt& iter );
+
+            void register_class( const XIndexType& a_index, const base_registrar< XBaseType >* base_registrar );
+            bool has_class( const XIndexType& a_index ) const;
+            void remove_class( const XIndexType& a_index );
+
+            FactoryCIt begin() const;
+            FactoryCIt end() const;
+
+        protected:
+            FactoryMap* fMap;
+            std::mutex f_factory_mutex;
+
+        protected:
+            allow_singleton_access( indexed_factory );
+            indexed_factory();
+            ~indexed_factory();
+    };
+
+
+    //******************
+    // Implementations
+    //******************
+
+    // indexed_factory
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    XBaseType* indexed_factory< XIndexType, XBaseType, XArgs... >::create( const FactoryCIt& iter, XArgs ... args )
+    {
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        return iter->second->create( args... );
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    XBaseType* indexed_factory< XIndexType, XBaseType, XArgs... >::create( const XIndexType& a_index, XArgs ... args )
+    {
+        //std::cout << "this factory (" << this << ") has " << fMap->size() << " entries" << std::endl;
+        //for( FactoryCIt iter = fMap->begin(); iter != fMap->end(); ++iter )
+        //{
+        //    std::cout << "this factory has: " << iter->first << " at " << iter->second << std::endl;
+        //}
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        FactoryCIt it = fMap->find( a_index );
+        if( it == fMap->end() )
+        {
+            LERROR( slog_ind_fact, "Did not find indexed_factory for <" << a_index << ">." );
+            return nullptr;
+        }
+
+        return it->second->create( args... );
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    void indexed_factory< XIndexType, XBaseType, XArgs... >::register_class( const XIndexType& a_index, const base_registrar< XBaseType, XArgs... >* a_registrar )
+    {
+        // A local (static) logger is created inside this function to avoid static initialization order problems
+        LOGGER( slog_ind_factory_reg, "indexed_factory-register");
+
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        FactoryCIt it = fMap->find(a_index);
+        if (it != fMap->end())
+        {
+            throw error() << "Already have indexed_factory registered for <" << a_index << ">.";
+        }
+        fMap->insert(std::pair< XIndexType, const base_registrar< XBaseType, XArgs... >* >(a_index, a_registrar));
+        LDEBUG( slog_ind_factory_reg, "Registered a indexed_factory for class " << a_index << " at " << (*fMap)[ a_index ] << ", indexed_factory #" << fMap->size()-1 << " for " << this );
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    bool indexed_factory< XIndexType, XBaseType, XArgs... >::has_class(const XIndexType& a_index ) const
+    {
+        return fMap->find( a_index ) != fMap->end();
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    void indexed_factory< XIndexType, XBaseType, XArgs... >::remove_class(const XIndexType& a_index )
+    {
+        LDEBUG( slog_ind_fact, "Removing indexed_factory for class " << a_index << " from " << this );
+        FactoryIt iter = fMap->find( a_index );
+        if( iter != fMap->end() ) fMap->erase( iter );
+        return;
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    indexed_factory< XIndexType, XBaseType, XArgs... >::indexed_factory() :
+        fMap(new FactoryMap()),
+        f_factory_mutex()
+    {}
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    indexed_factory< XIndexType, XBaseType, XArgs... >::~indexed_factory()
+    {
+        delete fMap;
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    typename indexed_factory< XIndexType, XBaseType, XArgs... >::FactoryCIt indexed_factory< XIndexType, XBaseType, XArgs... >::begin() const
+    {
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        return fMap->begin();
+    }
+
+    template< class XIndexType, class XBaseType, typename ... XArgs >
+    typename indexed_factory< XIndexType, XBaseType, XArgs... >::FactoryCIt indexed_factory< XIndexType, XBaseType, XArgs... >::end() const
+    {
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        return fMap->end();
+    }
+
+    // registrar
+
+    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
+    indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::indexed_registrar( const XIndexType& a_index ) :
+            base_registrar< XBaseType, XArgs... >(),
+            f_index( a_index )
+    {
+        register_class();
+    }
+
+    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
+    indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::~indexed_registrar()
+    {
+        indexed_factory< XIndexType, XBaseType, XArgs... >::get_instance()->remove_class( f_index );
+    }
+
+    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
+    void indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::register_class() const
+    {
+        indexed_factory< XIndexType, XBaseType, XArgs... >::get_instance()->register_class( f_index, this );
+        return;
+    }
+
+    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
+    XBaseType* indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::create( XArgs... args ) const
+    {
+        return dynamic_cast< XBaseType* >( new XDerivedType( args... ) );
+    }
+
+
+    //*******************************************
+    // Implementations (partial specialization)
+    //*******************************************
+
+    // indexed_factory
+
+    template< class XIndexType, class XBaseType >
+    XBaseType* indexed_factory< XIndexType, XBaseType, void >::create( const FactoryCIt& iter )
+    {
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        return iter->second->create();
+    }
+
+    template< class XIndexType, class XBaseType >
+    XBaseType* indexed_factory< XIndexType, XBaseType, void >::create( const XIndexType& a_index )
+    {
+        //std::cout << "this indexed_factory (" << this << ") has " << fMap->size() << " entries" << std::endl;
+        //for( FactoryCIt iter = fMap->begin(); iter != fMap->end(); ++iter )
+        //{
+        //    std::cout << "this indexed_factory has: " << iter->first << " at " << iter->second << std::endl;
+        //}
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        FactoryCIt it = fMap->find( a_index );
+        if( it == fMap->end() )
+        {
+            LERROR( slog_ind_fact, "Did not find indexed_factory for <" << a_index << ">." );
+            return nullptr;
+        }
+
+        return it->second->create();
+    }
+
+    template< class XIndexType, class XBaseType >
+    void indexed_factory< XIndexType, XBaseType, void >::register_class( const XIndexType& a_index, const base_registrar< XBaseType >* a_registrar )
+    {
+        // A local (static) logger is created inside this function to avoid static initialization order problems
+        LOGGER( slog_ind_factory_reg, "indexed_factory-register");
+
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        FactoryCIt it = fMap->find(a_index);
+        if (it != fMap->end())
+        {
+            throw error() << "Already have indexed_factory registered for <" << a_index << ">.";
+            return;
+        }
+        fMap->insert(std::pair< std::string, const base_registrar< XIndexType, XBaseType >* >(a_index, a_registrar));
+        LDEBUG( slog_ind_factory_reg, "Registered a indexed_factory for class " << a_index << ", indexed_factory #" << fMap->size()-1 << " for " << this );
+    }
+
+    template< class XIndexType, class XBaseType >
+    bool indexed_factory< XIndexType, XBaseType, void >::has_class(const XIndexType& a_index ) const
+    {
+        return fMap->find( a_index ) != fMap->end();
+    }
+
+    template< class XIndexType, class XBaseType >
+    void indexed_factory< XIndexType, XBaseType, void >::remove_class(const XIndexType& a_index )
+    {
+        LDEBUG( slog_ind_fact, "Removing indexed_factory for class " << a_index << " from " << this );
+        FactoryIt iter = fMap->find( a_index );
+        if( iter != fMap->end() ) fMap->erase( iter );
+        return;
+    }
+
+    template< class XIndexType, class XBaseType >
+    indexed_factory< XIndexType, XBaseType, void >::indexed_factory() :
+        fMap(new FactoryMap()),
+        f_factory_mutex()
+    {}
+
+    template< class XIndexType, class XBaseType >
+    indexed_factory< XIndexType, XBaseType, void >::~indexed_factory()
+    {
+        delete fMap;
+    }
+
+    template< class XIndexType, class XBaseType >
+    typename indexed_factory< XIndexType, XBaseType, void >::FactoryCIt indexed_factory< XIndexType, XBaseType, void >::begin() const
+    {
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        return fMap->begin();
+    }
+
+    template< class XIndexType, class XBaseType >
+    typename indexed_factory< XIndexType, XBaseType, void >::FactoryCIt indexed_factory< XIndexType, XBaseType, void >::end() const
+    {
+        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
+        return fMap->end();
+    }
+
+    // registrar
+
+    template< class XIndexType, class XBaseType, class XDerivedType >
+    indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::indexed_registrar( const XIndexType& a_index ) :
+            base_registrar< XBaseType >(),
+            f_index( a_index )
+    {
+        register_class();
+    }
+
+    template< class XIndexType, class XBaseType, class XDerivedType >
+    indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::~indexed_registrar()
+    {
+        indexed_factory< XIndexType, XBaseType >::get_instance()->remove_class( f_index );
+    }
+
+    template< class XIndexType, class XBaseType, class XDerivedType >
+    void indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::register_class() const
+    {
+        indexed_factory< XIndexType, XBaseType >::get_instance()->register_class( f_index, this );
+        return;
+    }
+
+    template< class XIndexType, class XBaseType, class XDerivedType >
+    XBaseType* indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::create() const
+    {
+        return dynamic_cast< XBaseType* >( new XDerivedType() );
+    }
+
+} /* namespace scarab */
+#endif /* SCARAB_INDEXED_FACTORY_HH_ */
diff --git a/Src/Scarab/library/utility/macros.hh b/Src/Scarab/library/utility/macros.hh
new file mode 100644
index 0000000..f9cee49
--- /dev/null
+++ b/Src/Scarab/library/utility/macros.hh
@@ -0,0 +1,35 @@
+/*
+ * macros.hh
+ *
+ *  Created on: May 25, 2017
+ *      Author: obla999
+ */
+
+#ifndef SCARAB_UTILITY_MACROS_HH_
+#define SCARAB_UTILITY_MACROS_HH_
+
+// Return value constants
+#define RETURN_SUCCESS 0
+#define RETURN_ERROR 1
+#define RETURN_CANCELED 2
+#define RETURN_REVOKED 3
+
+#define PASTE2( x, y ) x##y
+#define PASTE( x, y ) PASTE2( x, y )
+
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY(x)
+#define __FILE_LINE__      __FILE__ "(" TOSTRING(__LINE__) ")"
+#define __FILENAME_LINE__  (strrchr(__FILE__, '/') ? strrchr(__FILE_LINE__, '/') + 1 : __FILE_LINE__)
+
+#if !defined(__FUNC__)
+#if defined(_MSC_VER)
+#define __FUNC__ __FUNCSIG__
+#elif defined(__GNUC__)
+#define __FUNC__ __PRETTY_FUNCTION__
+#else
+#define __FUNC__ ""
+#endif
+#endif
+
+#endif /* SCARAB_UTILITY_MACROS_HH_ */
diff --git a/Src/Scarab/library/utility/map_at_default.hh b/Src/Scarab/library/utility/map_at_default.hh
new file mode 100644
index 0000000..9006594
--- /dev/null
+++ b/Src/Scarab/library/utility/map_at_default.hh
@@ -0,0 +1,30 @@
+/*
+ * map_at_default.hh
+ *
+ *  Created on: Jan 8, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_UTILITY_MAPATDEFAULT
+#define SCARAB_UTILITY_MAPATDEFAULT
+
+#include <map>
+
+namespace scarab
+{
+    template< typename x_key, typename x_value >
+    const x_value& at( const std::map< x_key, x_value >& a_map, const x_key& a_key, const x_value& a_default )
+    {
+        try
+        {
+            return a_map.at( a_key );
+        }
+        catch(...)
+        {
+            return a_default;
+        }
+    }
+
+} /* end namespace scarab */
+
+#endif /* SCARAB_UTILITY_MAPATDEFAULT */
diff --git a/Src/Scarab/library/utility/member_variables.hh b/Src/Scarab/library/utility/member_variables.hh
new file mode 100644
index 0000000..24d3418
--- /dev/null
+++ b/Src/Scarab/library/utility/member_variables.hh
@@ -0,0 +1,94 @@
+/*
+ * member_variables.hh
+ *
+ *  Created on: Jan 6, 2016
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_MEMBER_VARIABLES_HH_
+#define SCARAB_MEMBER_VARIABLES_HH_
+
+/**
+ * Macros for class member variables
+ *
+ * In all cases remember to initialize the variables!
+ *
+ * For "normal" variables
+ * Defines accessors [type get_my_var() const], [void set_my_var( type )], and member variable [type f_my_var]
+ * The set_ function is not available if the _noset macros are used
+ *  - mv_accessible
+ *  - mv_accessible_noset
+ *  - mv_accessible_static
+ *  - mv_accessible_static_noset
+ *
+ * For variables accessed by reference
+ * Defines accessors [const type& my_var() const], [type& my_var()], and member variable [type f_my_var]
+ * The non-const function is not available if the _const macros are used
+ *  - mv_referrable
+ *  - mv_referrable_const
+ *  - mv_referrable_static
+ *  - mv_referrable_static_const
+ *
+ * For pointer variables
+ * Defines accessors [type* get_my_var() const], [void set_my_var( type* )], and member variable [type* f_my_var]
+ * The set_ function is not available if the _noset macros are used
+ *  - mv_assignable
+ *  - mv_assignable_noset
+ *  - mv_assignable_static
+ *  - mv_assignable_static_noset
+ *
+ * For std::shared_ptr's
+ * Defines accessors [const std::shared_ptr< type > my_var() const], [std::shared_ptr< type > my_var()], and member variable [std::shared_ptr< type > f_my_var]
+ * The non-const function is not available if the _const macros are used
+ *  - mv_shared_ptr
+ *  - mv_shared_ptr_const
+ *  - mv_shared_ptr_static
+ *  - mv_shared_ptr_static_const
+ *
+ * For atomic variables
+ * Defines accessors [type get_my_var() const], [void set_my_var( type )], and member variable [std::atomic< type > f_my_var]
+ * The set_ function is not available if the _noset macros are used
+ *  - mv_atomic
+ *  - mv_atomic_noset
+ *  - mv_atomic_static
+ *  - mv_atomic_static_noset
+ *
+ */
+
+#include "_snake_case_member_variables.hh"
+
+#define mv_accessible                         snake_case_mv_accessible
+#define mv_accessible_noset                   snake_case_mv_accessible_noset
+#define mv_accessible_static                  snake_case_mv_accessible_static
+#define mv_accessible_static_noset            snake_case_mv_accessible_static_noset
+#define mv_accessible_mutable                 snake_case_mv_accessible_mutable
+#define mv_accessible_mutable_noset           snake_case_mv_accessible_mutable_noset
+
+#define mv_referrable                         snake_case_mv_referrable
+#define mv_referrable_const                   snake_case_mv_referrable_const
+#define mv_referrable_static                  snake_case_mv_referrable_static
+#define mv_referrable_mutable                 snake_case_mv_referrable_mutable
+#define mv_referrable_mutable_const           snake_case_mv_referrable_mutable_const
+
+#define mv_assignable                         snake_case_mv_assignable
+#define mv_assignable_noset                   snake_case_mv_assignable_noset
+#define mv_assignable_static                  snake_case_mv_assignable_static
+#define mv_assignable_static_noset            snake_case_mv_assignable_static_noset
+#define mv_assignable_mutable                 snake_case_mv_assignable_mutable
+#define mv_assignable_mutable_noset           snake_case_mv_assignable_mutable_noset
+
+#define mv_shared_ptr                         snake_case_mv_shared_ptr
+#define mv_shared_ptr_const                   snake_case_mv_shared_ptr_const
+#define mv_shared_ptr_static                  snake_case_mv_shared_ptr_static
+#define mv_shared_ptr_mutable                 snake_case_mv_shared_ptr_mutable
+#define mv_shared_ptr_mutable_const           snake_case_mv_shared_ptr_mutable_const
+
+#define mv_atomic                             snake_case_mv_atomic
+#define mv_atomic_noset                       snake_case_mv_atomic_noset
+#define mv_atomic_static                      snake_case_mv_atomic_static
+#define mv_atomic_static_noset                snake_case_mv_atomic_static_noset
+#define mv_atomic_mutable                     snake_case_mv_atomic_mutable
+#define mv_atomic_mutable_noset               snake_case_mv_atomic_mutable_noset
+
+
+#endif /* SCARAB_MEMBER_VARIABLES_HH_ */
diff --git a/Src/Scarab/library/utility/path.cc b/Src/Scarab/library/utility/path.cc
new file mode 100644
index 0000000..750e534
--- /dev/null
+++ b/Src/Scarab/library/utility/path.cc
@@ -0,0 +1,50 @@
+/*
+ * path.cc
+ *
+ *  Created on: Jan 22, 2016
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "path.hh"
+
+//#include <iostream>
+#include <regex>
+
+using std::string;
+using boost::filesystem::absolute;
+
+namespace scarab
+{
+    path SCARAB_API expand_path( const string& a_path )
+    {
+        string t_exp_path( a_path );
+#ifndef _WIN32
+        // POSIX-shell-like expansion
+        wordexp_t t_expansion_result;
+        wordexp( a_path.c_str(), &t_expansion_result, 0 );
+        if( t_expansion_result.we_wordc > 0 )
+        {
+            t_exp_path = string( t_expansion_result.we_wordv[0] );
+            //std::cout << "#### expanded path: " << t_exp_path << std::endl;
+        }
+        wordfree( &t_expansion_result );
+#endif
+        // do canonical expansion; return the absolute path
+        return absolute( t_exp_path );
+    }
+
+    std::vector< path > SCARAB_API glob( const string& a_path, const string& a_pattern )
+    {
+        std::vector< path > t_file_paths;
+        path t_abs_path = expand_path( a_path );
+        for( fs::directory_entry& dir_entry: fs::recursive_directory_iterator(t_abs_path) )
+        {
+            path t_file_path=dir_entry.path();
+            if ( ! std::regex_search( t_file_path.string(), std::regex(a_pattern) ) ) continue;
+            t_file_paths.push_back( t_file_path );
+        }
+        return t_file_paths;
+    }
+}
diff --git a/Src/Scarab/library/utility/path.hh b/Src/Scarab/library/utility/path.hh
new file mode 100644
index 0000000..4a69910
--- /dev/null
+++ b/Src/Scarab/library/utility/path.hh
@@ -0,0 +1,35 @@
+/*
+ * path.hh
+ *
+ *  Created on: Jan 22, 2016
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_PATH_HH_
+#define SCARAB_PATH_HH_
+
+#include "scarab_api.hh"
+
+#include <boost/filesystem.hpp>
+
+#include <string>
+#include <vector>
+
+#ifndef _WIN32
+#include <wordexp.h>
+#endif
+
+namespace scarab
+{
+    namespace fs = ::boost::filesystem;
+
+    typedef fs::path path;
+
+    path SCARAB_API expand_path( const std::string& a_path );
+
+    std::vector< path> SCARAB_API glob( const std::string& a_path, const std::string& a_pattern );
+}
+
+
+
+#endif /* SCARAB_PATH_HH_ */
diff --git a/Src/Scarab/library/utility/scarab_api.hh b/Src/Scarab/library/utility/scarab_api.hh
new file mode 100644
index 0000000..a81c581
--- /dev/null
+++ b/Src/Scarab/library/utility/scarab_api.hh
@@ -0,0 +1,29 @@
+/*
+ * scarab_api.hh
+ *
+ *  Created on: Jan 1, 2016
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_API_HH_
+#define SCARAB_API_HH_
+
+
+namespace scarab
+{
+    // API export macros for windows
+#ifdef _WIN32
+#  ifdef SCARAB_API_EXPORTS
+#    define SCARAB_API __declspec(dllexport)
+#    define SCARAB_EXPIMP_TEMPLATE
+#  else
+#    define SCARAB_API __declspec(dllimport)
+#    define SCARAB_EXPIMP_TEMPLATE extern
+#  endif
+#else
+#  define SCARAB_API
+#endif
+
+}
+
+#endif /* SCARAB_API_HH_ */
diff --git a/Src/Scarab/library/utility/signal_handler.cc b/Src/Scarab/library/utility/signal_handler.cc
new file mode 100644
index 0000000..5524101
--- /dev/null
+++ b/Src/Scarab/library/utility/signal_handler.cc
@@ -0,0 +1,464 @@
+/*
+ * signal_handler.cc
+ *
+ *  Created on: Dec 3, 2013
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "signal_handler.hh"
+
+#include "cancelable.hh"
+#include "error.hh"
+#include "logger.hh"
+
+#include <execinfo.h>
+#include <stdexcept>
+#include <thread>
+
+#ifdef _WIN32
+#include <csignal>
+#include <Windows.h>
+//#include "processthreadsapi.h"
+#endif
+
+namespace {
+    // function to catch unhandled exceptions
+    // invoke set_terminate as part of global constant initialization
+    static const bool SET_TERMINATE = std::set_terminate( scarab::signal_handler::handle_terminate );
+}
+
+
+namespace scarab
+{
+    LOGGER( slog, "signal_handler" );
+
+    int signal_handler::s_ref_count = 0;
+
+    bool signal_handler::s_exited = false;
+    int signal_handler::s_return_code = RETURN_SUCCESS;
+
+    bool signal_handler::s_handling_sig_abrt = false;
+    bool signal_handler::s_handling_sig_term = false;
+    bool signal_handler::s_handling_sig_int = false;
+    bool signal_handler::s_handling_sig_quit = false;
+
+#ifndef _WIN32
+    struct sigaction signal_handler::s_old_sig_abrt_action;
+    struct sigaction signal_handler::s_old_sig_term_action;
+    struct sigaction signal_handler::s_old_sig_int_action;
+    struct sigaction signal_handler::s_old_sig_quit_action;
+#else // _WIN32
+    signal_handler::handler_t signal_handler::s_old_sig_abrt_handler = SIG_DFL;
+    signal_handler::handler_t signal_handler::s_old_sig_term_handler = SIG_DFL;
+    signal_handler::handler_t signal_handler::s_old_sig_int_handler = SIG_DFL;
+    signal_handler::handler_t signal_handler::s_old_sig_quit_handler = SIG_DFL;
+#endif
+
+    std::recursive_mutex signal_handler::s_mutex;
+    signal_handler::cancelers signal_handler::s_cancelers;
+
+    signal_handler::signal_handler()
+    {
+        //std::cerr << "signal_handler constructor" << std::endl;
+        ++signal_handler::s_ref_count;
+
+        signal_handler::handle_signals();
+    }
+
+    signal_handler::~signal_handler()
+    {
+        //std::cerr << "signal_handler destructor" << std::endl;
+        --signal_handler::s_ref_count;
+        if( signal_handler::s_ref_count == 0 )
+        {
+            signal_handler::unhandle_signals();
+        }
+    }
+
+    void signal_handler::add_cancelable( std::shared_ptr< scarab::cancelable > a_cancelable )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        s_cancelers.insert( std::make_pair(a_cancelable.get(), cancelable_wptr_t(a_cancelable) ) );
+        return;
+    }
+
+    void signal_handler::remove_cancelable( std::shared_ptr< scarab::cancelable > a_cancelable )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        s_cancelers.erase( a_cancelable.get() );
+        return;
+    }
+
+    void signal_handler::remove_cancelable( scarab::cancelable* a_cancelable )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        s_cancelers.erase( a_cancelable );
+        return;
+    }
+
+    void signal_handler::handle_signals()
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+
+        // we create a new logger here so that handle_signals() can be called from the signal_handler constructor during static initalization
+        LOGGER( slog_constr, "signal_handler handle_signals" );
+
+        LDEBUG( slog_constr, "Taking over signal handling for SIGABRT, SIGTERM, SIGINT, and SIGQUIT" );
+
+#ifndef _WIN32  // on a POSIX system we use sigaction
+
+        struct sigaction t_exit_error_action, t_exit_success_action;
+
+        t_exit_error_action.sa_handler = signal_handler::handle_exit_error;
+        sigemptyset(&t_exit_error_action.sa_mask);
+        t_exit_error_action.sa_flags = 0;
+
+        t_exit_success_action.sa_handler = signal_handler::handle_exit_success;
+        sigemptyset(&t_exit_success_action.sa_mask);
+        t_exit_success_action.sa_flags = 0;
+
+        // setup to handle SIGABRT
+        if( ! s_handling_sig_abrt && sigaction( SIGABRT, &t_exit_error_action, &s_old_sig_abrt_action ) != 0 )
+        {
+            LWARN( slog_constr, "Unable to setup handling of SIGABRT: abort() and unhandled exceptions will result in an unclean exit" );
+        }
+        else
+        {
+            LTRACE( slog_constr, "Handling SIGABRT (abort() and unhandled exceptions)" );
+            s_handling_sig_abrt = true;
+        }
+
+        // setup to handle SIGTERM
+        if( ! s_handling_sig_term && sigaction( SIGTERM, &t_exit_error_action, &s_old_sig_term_action ) != 0 )
+        {
+            LWARN( slog_constr, "Unable to setup handling of SIGTERM: SIGTERM will result in an unclean exit" );
+        }
+        else
+        {
+            LTRACE( slog_constr, "Handling SIGTERM" );
+            s_handling_sig_term = true;
+        }
+
+        // setup to handle SIGINT
+        if( ! s_handling_sig_int && sigaction( SIGINT, &t_exit_success_action, &s_old_sig_int_action ) != 0 )
+        {
+            LWARN( slog_constr, "Unable to setup handling of SIGINT: ctrl-c cancellation will result in an unclean exit" );
+        }
+        else
+        {
+            LTRACE( slog_constr, "Handling SIGINT (ctrl-c)" );
+            s_handling_sig_int = true;
+        }
+
+        // setup to handle SIGQUIT
+        if( ! s_handling_sig_quit && sigaction( SIGQUIT, &t_exit_success_action, &s_old_sig_quit_action ) != 0 )
+        {
+            LWARN( slog_constr, "Unable to setup handling of SIGQUIT: ctrl-\\ cancellation will result in an unclean exit" );
+        }
+        else
+        {
+            LTRACE( slog_constr, "Handling SIGQUIT (ctrl-\\)" );
+            s_handling_sig_quit = true;
+        }
+
+        if( signal(SIGPIPE, SIG_IGN) == SIG_ERR )
+        {
+            throw error() << "Unable to ignore SIGPIPE\n";
+        }
+
+#else // _WIN32; on a Windows system we use std::signal
+
+        // setup to handle SIGABRT
+        if( ! s_handling_sig_abrt )
+        {
+            auto t_sig_ret = signal( SIGABRT, signal_handler::handle_exit_error );
+            if( t_sig_ret == SIG_ERR )
+            {
+                LWARN( slog_constr, "Unable to setup handling of SIGABRT: abort() and unhandled exceptions will result in an unclean exit" );
+            }
+            else
+            {
+                s_handling_sig_abrt = true;
+                s_old_sig_abrt_handler = t_sig_ret;
+            }
+        }
+        if( s_handling_sig_abrt ) LTRACE( slog_constr, "Handling SIGABRT (abort() and unhandled exceptions)" );
+
+
+        // setup to handle SIGTERM
+        if( ! s_handling_sig_term )
+        {
+            auto t_sig_ret = signal( SIGTERM, signal_handler::handle_exit_error );
+            if( t_sig_ret == SIG_ERR )
+            {
+                LWARN( slog_constr, "Unable to setup handling of SIGTERM: SIGTERM will result in an unclean exit" );
+            }
+            else
+            {
+                s_handling_sig_term = true;
+                s_old_sig_abrt_handler = t_sig_ret;
+            }
+        }
+        if( s_handling_sig_term ) LTRACE( slog_constr, "Handling SIGTERM" );
+
+        // setup to handle SIGINT
+        if( ! s_handling_sig_int )
+        {
+            auto t_sig_ret = signal( SIGINT, signal_handler::handle_exit_error );
+            if( t_sig_ret == SIG_ERR )
+            {
+                LWARN( slog_constr, "Unable to setup handling of SIGINT: ctrl-c cancellation will result in an unclean exit" );
+            }
+            else
+            {
+                s_handling_sig_int = true;
+                s_old_sig_abrt_handler = t_sig_ret;
+            }
+        }
+        if( s_handling_sig_int ) LTRACE( slog_constr, "Handling SIGINT (ctrl-c))" );
+
+#endif
+        return;
+    }
+
+    void signal_handler::unhandle_signals()
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+
+        LDEBUG( slog, "Returning signal handling for SIGABRT, SIGTERM, SIGINT, and SIGQUIT" );
+
+#ifndef _WIN32
+
+        if( s_handling_sig_abrt && sigaction( SIGABRT, &s_old_sig_abrt_action, nullptr ) != 0 )
+        {
+            LWARN( slog, "Unable to switch SIGABRT to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_abrt = false;
+        }
+        
+        if( s_handling_sig_term && sigaction( SIGTERM, &s_old_sig_term_action, nullptr ) != 0 )
+        {
+            LWARN( slog, "Unable to switch SIGTERM to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_term = false;
+        }
+        
+        if( s_handling_sig_int && sigaction( SIGINT, &s_old_sig_int_action, nullptr ) != 0 )
+        {
+            LWARN( slog, "Unable to switch SIGINT to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_int = false;
+        }
+        
+        if( s_handling_sig_quit && sigaction( SIGQUIT, &s_old_sig_quit_action, nullptr ) != 0 )
+        {
+            LWARN( slog, "Unable to switch SIGQUIT to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_quit = false;
+        }
+
+#else // _WIN32
+
+        if( s_handling_sig_abrt && signal( SIGABRT, s_old_sig_abrt_handler ) == SIG_ERR )
+        {
+            LWARN( slog, "Unable to switch SIGABRT to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_abrt = false;
+        }
+        
+        if( s_handling_sig_term && signal( SIGTERM, s_old_sig_term_handler ) == SIG_ERR )
+        {
+            LWARN( slog, "Unable to switch SIGTERM to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_term = false;
+        }
+        
+        if( s_handling_sig_int && signal( SIGINT, s_old_sig_int_handler ) == SIG_ERR )
+        {
+            LWARN( slog, "Unable to switch SIGINT to previous handler" );
+        }
+        else
+        {
+            s_handling_sig_int = false;
+        }
+       
+#endif
+        return;
+    }
+
+    bool signal_handler::is_handling( int a_signal )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+
+        bool t_is_handled = false;
+        switch( a_signal )
+        {
+            case SIGABRT:
+                if( s_handling_sig_abrt) t_is_handled = true;
+                break;
+            case SIGTERM:
+                if( s_handling_sig_term) t_is_handled = true;
+                break;
+            case SIGINT:
+                if( s_handling_sig_int) t_is_handled = true;
+                break;
+#ifndef _WIN32
+            case SIGQUIT:
+                if( s_handling_sig_quit) t_is_handled = true;
+                break;
+#endif
+            default:
+                break;
+        }
+        return t_is_handled;
+    }
+
+    void signal_handler::reset()
+    {
+        LDEBUG( slog, "Resetting signal_handler" );
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+
+        s_exited = false;
+        s_return_code = RETURN_SUCCESS;
+        s_cancelers.clear();
+
+        signal_handler::unhandle_signals();
+        return;
+    }
+
+    [[noreturn]] void signal_handler::handle_terminate() noexcept
+    {
+        terminate( RETURN_ERROR );
+    }
+
+    void signal_handler::handle_exit_error( int a_sig )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        LERROR( slog, "Handling signal <" << a_sig << "> as an error condition; return code: " << RETURN_ERROR );
+        exit( RETURN_ERROR );
+        return;
+    }
+
+    void signal_handler::handle_exit_success( int a_sig )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        LPROG( slog, "Handling signal <" << a_sig << ">; return code: " << RETURN_SUCCESS );
+        exit( RETURN_SUCCESS );
+        return;
+    }
+
+    [[noreturn]] void signal_handler::terminate( int a_code ) noexcept
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        print_current_exception( false );
+        if( a_code > 0 )
+        {
+            print_stack_trace( false );
+        }
+        std::cerr << "Exiting abruptly" << std::endl;
+        std::_Exit( a_code );
+    }
+
+    void signal_handler::exit( int a_code )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        s_exited = true;
+        s_return_code = a_code;
+        print_current_exception( true );
+        if( a_code > 0 )
+        {
+            print_stack_trace( true );
+        }
+        cancel_all( a_code );
+        return;
+    }
+
+    void signal_handler::print_current_exception( bool a_use_logging )
+    {
+        // no mutex locking needed here
+
+        // if there's a current exception, rethrow to print out what()
+        if( auto t_exc_ptr = std::current_exception() ) 
+        { 
+            // we have an exception
+            try
+            {
+                if( a_use_logging ) { LDEBUG( slog, "Rethrowing current exception" ); }
+                else { std::cerr << "Rethrowing current exception" << std::endl; }
+                std::rethrow_exception( t_exc_ptr ); // throw to recognize the type
+            }
+            catch( const std::exception& e ) {
+                if( a_use_logging ) { LERROR( slog, "Caught unhandled exception. what(): " << e.what() ); }
+                else { std::cerr << "Caught unhandled exception. what(): " << e.what() << std::endl; }
+            }
+            catch( ... ) {
+                if( a_use_logging ) LERROR( slog, "Caught unknown (non-std::exception) & unhandled exception." )
+                else { std::cerr << "Caught unknown (non-std::exception) & unhandled exception." << std::endl; }
+            }
+        }
+        return;
+    }
+
+    void signal_handler::print_stack_trace( bool a_use_logging )
+    {
+        // no mutex locking needed here
+#ifndef _WIN32 // stack trace printing not implemented for windows
+        void* t_bt_array[50];
+        int t_size = backtrace( t_bt_array, 50 );
+
+        if( a_use_logging ) { LERROR( slog, "Backtrace returned " << t_size << " frames\n" ); }
+        else { std::cerr << "Backtrace returned " << t_size << " frames\n" << std::endl; }
+
+        char** t_messages = backtrace_symbols( t_bt_array, t_size );
+
+        std::stringstream t_bt_str;
+        for( int i = 0; i < t_size && t_messages != nullptr; ++i )
+        {
+            t_bt_str << "[bt]: (" << i << ") " << t_messages[i] << '\n';
+        }
+        if( a_use_logging ) { LERROR( slog, "Backtrace:\n" << t_bt_str.str() ); }
+        else { std::cerr << "Backtrace:\n" << t_bt_str.str() << std::endl; }
+
+        free( t_messages );
+#endif
+        return;
+    }
+
+    void signal_handler::cancel_all( int a_code )
+    {
+        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
+        LDEBUG( slog, "Canceling all cancelables" );
+
+        while( ! s_cancelers.empty() )
+        {
+            auto t_canceler_it = s_cancelers.begin();
+            if( ! t_canceler_it->second.expired() )
+            {
+                t_canceler_it->second.lock()->cancel( a_code );
+            }
+            s_cancelers.erase( t_canceler_it );
+            std::this_thread::sleep_for( std::chrono::seconds(1) );
+        }
+
+#ifdef _WIN32
+        ExitProcess( a_code );
+#endif
+
+        return;
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/utility/signal_handler.hh b/Src/Scarab/library/utility/signal_handler.hh
new file mode 100644
index 0000000..ef25382
--- /dev/null
+++ b/Src/Scarab/library/utility/signal_handler.hh
@@ -0,0 +1,200 @@
+/*
+ * signal_handler.hh
+ *
+ *  Created on: Dec 3, 2013
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_SIGNAL_HANDLER_HH_
+#define SCARAB_SIGNAL_HANDLER_HH_
+
+#include "scarab_api.hh"
+#include "member_variables.hh"
+
+#include <memory>
+#include <mutex>
+#include <map>
+
+#ifndef _WIN32
+#include <signal.h>  // for struct sigaction, which is in signal.h but not csignal
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#ifndef __USE_GNU
+#define __USE_GNU
+#endif
+
+
+namespace scarab
+{
+    class cancelable;
+
+
+    /*!
+     @class signal_handler
+     @author N. S. Oblath
+
+     @brief Deals with cleanly exiting an application, and includes signal and std::terminate handler functions
+
+     @details
+     # Exiting and Terminating
+
+     This class differentiates between two different ways of finishing a program:
+     - Cleanly "exiting" a program, allowing threads to be canceled and memory to be cleaned up, and
+     - Unclealy "terminating" a program, which exits more-or-less immediately.
+
+     Termination occurs in situations where the program must finish immediately.  These are the situations in which
+     std::terminate is used, for example, or there are unhandled exceptions.  This can occur during execution, or even
+     during static initialization and cleanup.  Therefore only minimal global resources are assumed to be available
+     (e.g. std::cerr).  See https://akrzemi1.wordpress.com/2011/10/05/using-stdterminate/ for more information about
+     the way in which termination can be handled.  Termination can be commenced by:
+
+     - Unhandled exceptions
+     - Any other way in which std::terminate() is used (see, e.g. https://en.cppreference.com/w/cpp/error/terminate)
+     - Client code calling std::terminate() directly
+     - Client code calling signal_handler::terminate( code )
+
+     Exiting occurs in situations where cleanly shutting down is possible.  This includes both successful exiting and
+     exiting with an error condition.  signal_handler will be responsible for cancelling all threads that it knows about
+     (via add_cancelable()).  After the exit process is complete, it's the responsiblity of the program to stop execution.
+     The program can use get_exited() to check whether the exit process has been used.  Exiting can be commenced by:
+
+     - Catching SIGABRT or SIGTERM (exits with an error code)
+     - Catching SIGINT (usually ctrl-c) or SIGQUIT (usually ctrl-\) (exits with a success code)
+     - Client code calling signal_handler::exit( code )
+
+     To cleanly exit, signal_handler takes responsibility for canceling the cancelable objects that it knows about.
+     Responsibility for canceling a cancelable is given to the signal_handler using add_cancelable(), and it's taken away
+     using remove_cancelable().
+
+     # Signal Handling
+
+     To perform the tasks of exiting and terminating applications, `signal_handler` allows the user to control when signals
+     are handled, and when they aren't.  In most cases, a user will control signal handling through the existence of
+     a `signal_handler` instance.  The user should create the instance of `signal_handler` when they want `signal_handler`
+     to start handling those signals, and it should be destructed when handling the signals should cease.
+     Here are several examples of how this could be done:
+
+     1. The instance is created as a global static object at static initialization time.  Signals will be handled for the entire
+     time the application is running.
+     2. The instance is created in the `main()` function of the application and exists until the application exits.
+     3. The instance is created in some function for a specific limited time to cover a particular action.
+     This could be for the entire scope of the function, or it could be destructed when signal handling is no longer wanted.
+
+     Note that signals are handled as long as one or more instances of `signal_handler` exist.  If two instance exist, and one
+     goes out of scope, signals are still handled until the second instance is destructed.
+
+     In addition to this typical behavior, `signal_handler` includes an interface for more fine-grained control over when
+     signals are handled while the `signal_handler` exists (i.e. handle_signals(), unhandle_signals(), and is_handling()),
+     but the recommended use case is as described above, where signal handling is controled by the existence of a `signal_handler` instance.
+
+     Note that the interface for `signal_handler` uses all static functions, so there is no need to create an extra instance of
+     the class to use any part of that interface.  So the creation and destruction of instances can be used to control
+     whether or not signals are handled, and the rest of the interface can be used without an instance.
+
+     # Cancelables
+
+     This class communicates the need to exit to other objects via the \ref cancelable interface.  Simply put, a \ref cancelable object
+     can be canceled, or told to exit, asynchronously by the `signal_handler`.  Only the cancelable objects that the user wants
+     to be directly canceled by `signal_handler` should be added with add_cancelable().  In some cases that might be all of the
+     cancelable objects.  In other cases, where there's some hierarchy of cancelables, it would only be the top-level cancelables.
+
+     While add_cancelable() takes a std::shared_ptr<cancelable> as an argument, it stores only std::weak_ptr<cancelable>, and
+     claims no ownership or responsibility for the lifetime of the cancelable object.
+
+     # Manual Cancelation/Exiting/Terminating
+
+     In addition to acting automatically via handled signals, a user can manually terminate, exit, or cancel using
+     terminate(), exit(), or cancel_all(), respectively.  cancel_all() will only affect the canceled objects.
+     exit() perform a clean exit using cancel_all(), in addition to setting a return code, though it assumes the
+     application will take care of actually exiting.  And terminate() will immediately exit the application using std::_Exit().
+    */
+    class SCARAB_API signal_handler
+    {
+        public:
+            signal_handler();
+            virtual ~signal_handler();
+
+            /// Static version: add a cancelable object
+            static void add_cancelable( std::shared_ptr< cancelable > a_cancelable );
+            /// Static version: remove a cancelable object
+            static void remove_cancelable( std::shared_ptr< cancelable > a_cancelable );
+            /// Static version: remove a cancelable object with a plain pointer
+            static void remove_cancelable( cancelable* a_cancelable );
+
+            /// Remove all cancelables and signal handling
+            static void reset();
+
+            /// Start handling signals
+            static void handle_signals();
+            /// Stop handling signals
+            static void unhandle_signals();
+            /// Check if a signal is handled
+            static bool is_handling( int a_signal );
+
+            /// Handler for std::terminate -- does not cleanup memory or threads
+            [[noreturn]] static void handle_terminate() noexcept;
+
+            /// Handler for error signals -- cleanly exits
+            static void handle_exit_error( int a_sig );
+
+            /// Handler for success signals -- cleanly exits
+            static void handle_exit_success( int a_sig );
+
+            /// Main terminate function -- does not cleanup memory or threads
+            [[noreturn]] static void terminate( int a_code ) noexcept;
+
+            /// Main exit function -- cleanly exits
+            static void exit( int a_code );
+
+            /// Prints the current exception, if there is one
+            static void print_current_exception( bool a_use_logging );
+
+            /// Prints the stack trace
+            static void print_stack_trace( bool a_use_logging );
+
+            /// Asynchronous call to cancel all cancelables with the given exit code
+            static void cancel_all( int a_code );
+
+        private:
+
+            typedef std::weak_ptr< cancelable > cancelable_wptr_t;
+            // technical note: std::map<cancelable*, cancelable_wptr_t> is used instead of std::set<cancelable_wptr_t> because
+            // weak_ptr cannot be used as a key because weak_ptrs are not immutable (see, e.g. https://stackoverflow.com/a/32668849 and one of the comments therein).
+            // the raw pointer is only used as a key here.  the weak_ptr is used for accessing the cancelable.
+            typedef std::map< cancelable*, cancelable_wptr_t > cancelers;
+            typedef cancelers::const_iterator cancelers_cit_t;
+            typedef cancelers::iterator cancelers_it_t;
+
+            static cancelers s_cancelers;
+            static std::recursive_mutex s_mutex;
+
+        public:
+            mv_accessible_static_noset( int, ref_count );
+
+            mv_accessible_static_noset( bool, exited );
+            mv_accessible_static( int, return_code );
+
+            mv_accessible_static_noset( bool, handling_sig_abrt );
+            mv_accessible_static_noset( bool, handling_sig_term );
+            mv_accessible_static_noset( bool, handling_sig_int );
+            mv_accessible_static_noset( bool, handling_sig_quit );
+
+#ifndef _WIN32
+            mv_referrable_static( struct sigaction, old_sig_abrt_action );
+            mv_referrable_static( struct sigaction, old_sig_term_action );
+            mv_referrable_static( struct sigaction, old_sig_int_action );
+            mv_referrable_static( struct sigaction, old_sig_quit_action );
+#else // _WIN32
+            typedef void (*handler_t)(int);
+            mv_referrable_static( handler_t, old_sig_abrt_handler );
+            mv_referrable_static( handler_t, old_sig_term_handler );
+            mv_referrable_static( handler_t, old_sig_int_handler );
+            mv_referrable_static( handler_t, old_sig_quit_handler );
+#endif
+    };
+
+} /* namespace scarab */
+#endif /* SCARAB_SIGNAL_HANDLER_HH_ */
diff --git a/Src/Scarab/library/utility/singleton.hh b/Src/Scarab/library/utility/singleton.hh
new file mode 100644
index 0000000..6da50fb
--- /dev/null
+++ b/Src/Scarab/library/utility/singleton.hh
@@ -0,0 +1,147 @@
+/*
+ * singleton.hh
+ *
+ *  Created on: Nov 7, 2011
+ *      Author: nsoblath
+ */
+
+#ifndef SCARAB_SINGLETON_HH_
+#define SCARAB_SINGLETON_HH_
+
+#include "destroyer.hh"
+#include "error.hh"
+
+#include <cstddef>
+#include <mutex>
+
+namespace scarab
+{
+    /*!
+     \def allow_singleton_access( class_name )
+     Gives friend access to your class from scarab::singleton< class_name > and scarab::destroyer< class_name > 
+     so that those classes can control the life of your singleton class.
+    */
+#define allow_singleton_access( class_name ) \
+    friend class scarab::singleton< class_name >; \
+    friend class scarab::destroyer< class_name >;
+
+    /*!
+      @class singleton
+      @author N.S. Oblath
+      @brief Base class that turns a class into a singleton
+
+      @details
+      To use:
+        1. Inherit your class from singleton< your_class >
+        2. Make your constructor and destructor protected (or private)
+        3. Add the `allow_singleton_access( your_class )` macro to your class definition to allow the base classes to access your class
+
+      The mutex f_mutex provides thread safety for creation and destruction of an instance of the singleton.  It's available to the 
+      derived class for thread-safe access to the object in general.
+    */
+    template< class x_type >
+    class singleton
+    {
+        public:
+            static x_type* get_instance();
+            static void kill_instance();
+
+            template< class... x_args >
+            static x_type* create_instance( x_args... args );
+
+        private:
+            static void construct_instance();
+            static void delete_instance();
+
+        private:
+            static x_type* f_instance;
+            static destroyer< x_type > f_destroyer;
+
+        protected:
+            static std::mutex f_mutex;
+
+        protected:
+            singleton();
+
+            friend class destroyer< x_type >;
+            ~singleton();
+    };
+
+    template< class x_type >
+    x_type* singleton< x_type >::f_instance = nullptr;
+
+    template< class x_type >
+    destroyer< x_type > singleton< x_type >::f_destroyer;
+
+    template< class x_type >
+    std::mutex singleton< x_type >::f_mutex;
+
+    template< class x_type >
+    x_type* singleton< x_type >::get_instance()
+    {
+        if( f_instance == nullptr )
+        {
+            std::unique_lock< std::mutex > t_lock( f_mutex );
+            construct_instance();
+        }
+        return f_instance;
+    }
+
+    template< class x_type >
+    void singleton< x_type >::kill_instance()
+    {
+        if( f_instance != nullptr )
+        {
+            std::unique_lock< std::mutex > t_lock( f_mutex );
+            delete_instance();
+        }
+        return;
+    }
+
+    template< class x_type >
+    template< class... x_args >
+    x_type* singleton< x_type >::create_instance( x_args... args )
+    {
+        if( f_instance != nullptr )
+        {
+            throw error() << "Instance already exists; create_instance can only be called before the instance exists";
+        }
+        std::unique_lock< std::mutex > t_lock( f_mutex );
+        f_instance = new x_type( args... );
+        f_destroyer.set_doomed( f_instance );
+        return f_instance;
+    }
+
+    template< class x_type >
+    void singleton< x_type >::construct_instance()
+    {
+        if( f_instance == nullptr )
+        {
+            f_instance = new x_type();
+            f_destroyer.set_doomed( f_instance );
+        }
+    }
+
+    template< class x_type >
+    void singleton< x_type >::delete_instance()
+    {
+        if( f_instance != nullptr )
+        {
+            delete f_instance;
+            f_instance = nullptr;
+            f_destroyer.set_doomed( nullptr );
+        }
+    }
+
+    template< class x_type >
+    singleton< x_type >::singleton()
+    {
+    }
+    template< class x_type >
+    singleton< x_type >::~singleton()
+    {
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_SINGLETON_HH_ */
diff --git a/Src/Scarab/library/utility/thread_singleton.hh b/Src/Scarab/library/utility/thread_singleton.hh
new file mode 100644
index 0000000..5c85643
--- /dev/null
+++ b/Src/Scarab/library/utility/thread_singleton.hh
@@ -0,0 +1,149 @@
+/*
+ * thread_local_singleton.hh
+ *
+ *  Created on: Dec 31, 2019
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_THREAD_SINGLETON_HH_
+#define SCARAB_THREAD_SINGLETON_HH_
+
+#include "destroyer.hh"
+#include "error.hh"
+
+#include <cstddef>
+#include <mutex>
+
+namespace scarab
+{
+    /*!
+     \def allow_thread_singleton_access( class_name )
+     Gives friend access to your class from scarab::singleton< class_name > and scarab::destroyer< class_name > 
+     so that those classes can control the life of your singleton class.
+    */
+#define allow_thread_singleton_access( class_name ) \
+    friend class scarab::thread_singleton< class_name >; \
+    friend class scarab::destroyer< class_name >;
+
+    /*!
+      @class thread_singleton
+      @author N.S. Oblath
+      @brief Base class that turns a class into a thread-local singleton
+
+      @details
+      A thread-local singleton is similar to a singleton except that a different instance exists in each thread.
+
+      To use:
+        1. Inherit your class from thread_singleton< your_class >
+        2. Make your constructor and destructor protected (or private)
+        3. Add the `allow_thread_singleton_access( your_class )` macro to your class definition to allow the base classes to access your class
+
+      The mutex f_mutex provides thread safety for creation and destruction of an instance of the thread_singleton.  It's available to the 
+      derived class for thread-safe access to the object in general.
+    */
+    template< class x_type >
+    class thread_singleton
+    {
+        public:
+            static x_type* get_instance();
+            static void kill_instance();
+
+            template< class... x_args >
+            static x_type* create_instance( x_args... args );
+
+        private:
+            static void construct_instance();
+            static void delete_instance();
+
+        private:
+            thread_local static x_type* f_instance;
+            thread_local static destroyer< x_type > f_destroyer;
+
+        protected:
+            thread_local static std::mutex f_mutex;
+
+        protected:
+            thread_singleton();
+
+            friend class destroyer< x_type >;
+            ~thread_singleton();
+    };
+
+    template< class x_type >
+    thread_local x_type* thread_singleton< x_type >::f_instance = nullptr;
+
+    template< class x_type >
+    thread_local destroyer< x_type > thread_singleton< x_type >::f_destroyer;
+
+    template< class x_type >
+    thread_local std::mutex thread_singleton< x_type >::f_mutex;
+
+    template< class x_type >
+    x_type* thread_singleton< x_type >::get_instance()
+    {
+        if( f_instance == nullptr )
+        {
+            std::unique_lock< std::mutex > t_lock( f_mutex );
+            construct_instance();
+        }
+        return f_instance;
+    }
+
+    template< class x_type >
+    void thread_singleton< x_type >::kill_instance()
+    {
+        if( f_instance != nullptr )
+        {
+            std::unique_lock< std::mutex > t_lock( f_mutex );
+            delete_instance();
+        }
+        return;
+    }
+
+    template< class x_type >
+    template< class... x_args >
+    x_type* thread_singleton< x_type >::create_instance( x_args... args )
+    {
+        if( f_instance != nullptr )
+        {
+            throw error() << "Instance already exists; create_instance can only be called before the instance exists";
+        }
+        std::unique_lock< std::mutex > t_lock( f_mutex );
+        f_instance = new x_type( args... );
+        f_destroyer.set_doomed( f_instance );
+        return f_instance;
+    }
+
+    template< class x_type >
+    void thread_singleton< x_type >::construct_instance()
+    {
+        if( f_instance == nullptr )
+        {
+            f_instance = new x_type();
+            f_destroyer.set_doomed( f_instance );
+        }
+    }
+
+    template< class x_type >
+    void thread_singleton< x_type >::delete_instance()
+    {
+        if( f_instance != nullptr )
+        {
+            delete f_instance;
+            f_instance = nullptr;
+            f_destroyer.set_doomed( nullptr );
+        }
+    }
+
+    template< class x_type >
+    thread_singleton< x_type >::thread_singleton()
+    {
+    }
+    template< class x_type >
+    thread_singleton< x_type >::~thread_singleton()
+    {
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_THREAD_SINGLETON_HH_ */
diff --git a/Src/Scarab/library/utility/time.cc b/Src/Scarab/library/utility/time.cc
new file mode 100644
index 0000000..1e82c36
--- /dev/null
+++ b/Src/Scarab/library/utility/time.cc
@@ -0,0 +1,27 @@
+/*
+ * time.cc
+ *
+ *  Created on: Oct 29, 2013
+ *      Author: nsoblath
+ */
+
+
+#define SCARAB_API_EXPORTS
+
+#include "time.hh"
+
+#include "date.h"
+
+namespace scarab
+{
+
+    // Combined date & time, according to the ISO 8601 standard: e.g. 2015-01-31T22:35:58Z
+    SCARAB_API char date_time_format[] = "%Y-%m-%dT%H:%M:%SZ";
+
+    SCARAB_API std::string get_formatted_now()
+    {
+        using namespace std::chrono;
+        return date::format(scarab::date_time_format, time_point_cast<microseconds>(system_clock::now()));
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/utility/time.hh b/Src/Scarab/library/utility/time.hh
new file mode 100644
index 0000000..9f0de17
--- /dev/null
+++ b/Src/Scarab/library/utility/time.hh
@@ -0,0 +1,17 @@
+#ifndef SCARAB_TIME_HH_
+#define SCARAB_TIME_HH_
+
+#include "scarab_api.hh"
+
+#include <string>
+
+namespace scarab
+{
+
+    extern SCARAB_API char date_time_format[];
+
+    SCARAB_API std::string get_formatted_now();
+
+} /* namespace scarab */
+
+#endif // SCARAB_TIME_HH_
diff --git a/Src/Scarab/library/utility/typename.cc b/Src/Scarab/library/utility/typename.cc
new file mode 100644
index 0000000..03e5b50
--- /dev/null
+++ b/Src/Scarab/library/utility/typename.cc
@@ -0,0 +1,66 @@
+/*
+ * typename.cc
+ *
+ *  Created on: Feb 10, 2016
+ *      Author: nsoblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "typename.hh"
+
+#ifdef __GNUG__
+#include <cstdlib>
+#include <memory>
+#include <cxxabi.h>
+#endif
+
+
+namespace scarab
+{
+
+#ifdef __GNUG__
+#ifdef USE_CPP11
+
+    std::string demangle( const char* a_name )
+    {
+
+        int t_status = -4; // some arbitrary value to eliminate the compiler warning
+
+        std::unique_ptr< char, void(*)( void* ) > res( abi::__cxa_demangle( a_name, NULL, NULL, &t_status ), std::free );
+
+        return ( t_status==0 ) ? res.get() : a_name ;
+    }
+
+#else // USE_CPP11
+
+    struct handle
+    {
+        char* f_ptr;
+        handle( char* a_ptr ) : f_ptr( a_ptr ) {}
+        ~handle() { std::free( f_ptr ); }
+    };
+
+
+    std::string demangle( const char* a_name )
+    {
+
+        int t_status = -4; // some arbitrary value to eliminate the compiler warning
+
+        handle result( abi::__cxa_demangle( a_name, NULL, NULL, &t_status ) );
+
+        return ( t_status==0 ) ? result.f_ptr : a_name ;
+    }
+
+#endif // USE_CPP11
+
+#else // __GNUG__
+
+    // does nothing if not g++
+    std::string demangle( const char* a_name ) {
+        return a_name;
+    }
+
+#endif // __GNUG__
+
+}
diff --git a/Src/Scarab/library/utility/typename.hh b/Src/Scarab/library/utility/typename.hh
new file mode 100644
index 0000000..136871b
--- /dev/null
+++ b/Src/Scarab/library/utility/typename.hh
@@ -0,0 +1,32 @@
+/*
+ * typename.hh
+ *
+ *  Created on: Feb 10, 2016
+ *      Author: nsoblath
+ *
+ *  Based on: http://stackoverflow.com/a/4541470
+ */
+
+#ifndef SCARAB_UTILITY_TYPENAME_HH_
+#define SCARAB_UTILITY_TYPENAME_HH_
+
+#include "scarab_api.hh"
+
+#include <string>
+#include <typeinfo>
+
+namespace scarab
+{
+
+    SCARAB_API std::string demangle( const char* a_name );
+
+    template <class x_type>
+    SCARAB_API std::string type( const x_type& a_param )
+    {
+        return demangle( typeid(a_param).name() );
+    }
+
+} /* namespace scarab */
+
+
+#endif /* SCARAB_UTILITY_TYPENAME_HH_ */
diff --git a/Src/Scarab/library/utility/unique_typelist.hh b/Src/Scarab/library/utility/unique_typelist.hh
new file mode 100644
index 0000000..7f86ffc
--- /dev/null
+++ b/Src/Scarab/library/utility/unique_typelist.hh
@@ -0,0 +1,175 @@
+/*
+ * unique_typelist.hh
+ *
+ *  Created on: Oct 3, 2018
+ *      Author: N.S. Oblath
+ *
+ *  This file allows you to create type lists with unique elements.
+ *
+ *  The typelist itself is a standard type list, and the uniqueness of the elements is
+ *  enforced as elements are appended using `unique_append`.
+ *
+ *  Test code is commented out below as an example of how to use the append functionality.
+ *
+ *  The current version works for types; a version that made integer lists was explored but a problem was found
+ *  that didn't have an obvious work-around.  That path was abandoned because the type version can work for
+ *  integers using std::integer_constant.  The integer code is commented out below in case a work-around can be found.
+ */
+
+#ifndef SCARAB_UNIQUE_TYPELIST_HH_
+#define SCARAB_UNIQUE_TYPELIST_HH_
+
+#include <type_traits>
+
+namespace scarab
+{
+    // unique type check
+    template< typename T, typename FirstType, typename... OtherTypes  >
+    struct is_unique_impl;
+
+    template< typename T, typename FirstType >
+    struct is_unique_impl< T, FirstType >
+    {
+        static const bool value = ! std::is_same< T, FirstType >::value;
+    };
+
+    template< typename T, typename FirstType, typename... OtherTypes  >
+    struct is_unique_impl
+    {
+        static const bool value = std::is_same< T, FirstType >::value ? false : is_unique_impl< T, OtherTypes... >::value;
+    };
+
+    template< typename T, typename FirstType, typename... OtherTypes >
+    struct is_unique : std::integral_constant< bool, is_unique_impl< T, FirstType, OtherTypes... >::value >
+    {};
+
+    // type list
+    template< typename... Types >
+    struct type_list {};
+
+    // appending
+    template< typename T, typename... ListItems >
+    struct unique_append_impl;
+
+    template< typename T >
+    struct unique_append_impl< T, type_list<> >
+    {
+        using type = type_list< T >;
+    };
+
+    template< typename T, typename... ListItems >
+    struct unique_append_impl< T, type_list< ListItems... > >
+    {
+        static_assert(is_unique< T, ListItems... >::value, "Non-unique type found");
+        using type = type_list< T, ListItems... >;
+    };
+
+    template< typename T, typename List >
+    using unique_append = typename unique_append_impl< T, List >::type;
+
+    // for debug printing
+    //template< typename T > struct debug_t;
+
+    // test implementation
+/*    // this should work
+    using test_list_void = type_list<>;
+#define TEST_LIST test_list_void
+
+    typedef std::integral_constant< unsigned, 0 > zero_t;
+    using test_list_zero_t = unique_append< zero_t, TEST_LIST >;
+#undef TEST_LIST
+#define TEST_LIST test_list_zero_t
+
+    typedef std::integral_constant< unsigned, 1 > one_t;
+    using test_list_one_t = unique_append< one_t, TEST_LIST >;
+#undef TEST_LIST
+#define TEST_LIST test_list_one_t
+*/
+/*    // this should fail
+    typedef std::integral_constant< unsigned, 1 > duplicate_t;
+    using test_list_duplicate_t = unique_append< duplicate_t, TEST_LIST >;
+#undef TEST_LIST
+#define TEST_LIST test_list_duplicate_t
+    //debug_t< TEST_LIST > d;
+*/
+
+
+
+    // Integer lists
+    // Unfortunately this section doesn't quite work
+    // The problem comes in the partial specialization:  struct append_impl_int< T, int_list< ListItems... > >
+    // This works when the unspecialized template uses a type parameter pack, but not when it uses an int parameter pack.
+    // The error I get is:
+    //   error: template argument for non-type template parameter must be an expression
+/*
+    // unique int check
+    template< int T, int FirstType, int... OtherTypes  >
+    struct is_unique_impl_int;
+
+    template< int T, int FirstType >
+    struct is_unique_impl_int< T, FirstType >
+    {
+        static const bool value =  T != FirstType;
+    };
+
+    template< int T, int FirstType, int... OtherTypes  >
+    struct is_unique_impl_int
+    {
+        static const bool value = T == FirstType ? false : is_unique_impl_int< T, OtherTypes... >::value;
+    };
+
+    template< int T, int FirstType, int... OtherTypes >
+    struct is_unique_int : std::integral_constant< bool, is_unique_impl_int< T, FirstType, OtherTypes... >::value >
+    {};
+
+    // int list
+    template< int... Types >
+    struct int_list {};
+
+    // appending
+    template< int T, int... ListItems >
+    struct unique_append_impl_int;
+
+    template< int T >
+    struct unique_append_impl_int< T >
+    {
+        using type = int_list< T >;
+    };
+
+    template< int T, int... ListItems >
+    struct unique_append_impl_int< T, int_list< ListItems... > >
+    {
+        static_assert(is_unique_int< T, ListItems... >::value, "Non-unique return code found");
+        using type = int_list< T, ListItems... >;
+    };
+
+    template< int T, typename List >
+    using unique_append_int = typename unique_append_impl_int< T, List >::type;
+
+
+    // test implementation
+
+    using test_list_void_int = list_int<>;
+#define TEST_LIST_INT test_list_void_int
+
+    const static int zero_int = 0;
+    using test_list_zero_int = append_int< zero_int, TEST_LIST_INT >;
+#undef TEST_LIST_INT
+#define TEST_LIST_INT test_list_zero_int
+
+    const static int one_int = 1;
+    using test_list_one_int = unique_append_int< one_int, TEST_LIST_INT >;
+#undef TEST_LIST_INT
+#define TEST_LIST_INT test_list_one_int
+*/
+/*    // this should fail
+    const static int duplicate_int = 1;
+    using test_list_duplicate_t = unique_append< duplicate_int, TEST_LIST >;
+#undef TEST_LIST
+#define TEST_LIST test_list_duplicate_int
+    //debug_t< TEST_LIST > d;
+*/
+
+}
+
+#endif /* SCARAB_UNIQUE_TYPELIST_HH_ */
diff --git a/Src/Scarab/library/version/CMakeLists.txt b/Src/Scarab/library/version/CMakeLists.txt
new file mode 100644
index 0000000..02f921e
--- /dev/null
+++ b/Src/Scarab/library/version/CMakeLists.txt
@@ -0,0 +1,25 @@
+# CMakeLists.txt for Scarab/library/version
+# Author: N.S. Oblath
+# Created: Sep 26, 2019
+
+set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+set( Scarab_HEADERS ${Scarab_HEADERS}
+    ${dir}/scarab_version.hh
+    ${dir}/version_ifc.hh
+    ${dir}/version_semantic.hh
+    ${dir}/version_wrapper.hh
+    PARENT_SCOPE 
+)
+
+set( Scarab_SOURCES ${Scarab_SOURCES}
+    ${dir}/version_ifc.cc
+    ${dir}/version_semantic.cc
+) # not PARENT_SCOPE so that we can set it to that scope in the next set command
+
+configure_file( ${dir}/scarab_version.cc.in ${CMAKE_CURRENT_BINARY_DIR}/scarab_version.cc )
+set( Scarab_SOURCES
+    ${Scarab_SOURCES}
+    ${CMAKE_CURRENT_BINARY_DIR}/scarab_version.cc
+    PARENT_SCOPE )
+    
\ No newline at end of file
diff --git a/Src/Scarab/library/version/scarab_version.cc.in b/Src/Scarab/library/version/scarab_version.cc.in
new file mode 100644
index 0000000..859382d
--- /dev/null
+++ b/Src/Scarab/library/version/scarab_version.cc.in
@@ -0,0 +1,34 @@
+/*
+ * scarab_version.cc
+ *
+ *  Created on: Mar 21, 2014
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "scarab_version.hh"
+
+#include "macros.hh"
+
+namespace scarab
+{
+
+    version::version() :
+            version_semantic()
+    {
+        f_major_ver = @Scarab_VERSION_MAJOR@;
+        f_minor_ver = @Scarab_VERSION_MINOR@;
+        f_patch_ver = @Scarab_VERSION_PATCH@;
+        f_version = TOSTRING(@Scarab_VERSION@);
+        f_package = TOSTRING(@Scarab_PACKAGE_NAME@);
+        f_commit = TOSTRING(@Scarab_GIT_COMMIT@);
+    }
+
+    version::~version()
+    {
+    }
+
+} /* namespace scarab */
+
+
diff --git a/Src/Scarab/library/version/scarab_version.hh b/Src/Scarab/library/version/scarab_version.hh
new file mode 100644
index 0000000..06ac420
--- /dev/null
+++ b/Src/Scarab/library/version/scarab_version.hh
@@ -0,0 +1,25 @@
+/*
+ * scarab_version.hh
+ *
+ *  Created on: Mar 20, 2013
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_VERSION_HH_
+#define SCARAB_VERSION_HH_
+
+#include "version_semantic.hh"
+    
+namespace scarab
+{
+    
+    class SCARAB_API version : public version_semantic
+    {
+        public:
+            version();
+            ~version();
+    };
+
+} // namespace scarab
+
+#endif /* SCARAB_VERSION_HH_ */
diff --git a/Src/Scarab/library/version/version_ifc.cc b/Src/Scarab/library/version/version_ifc.cc
new file mode 100644
index 0000000..6a3e9c7
--- /dev/null
+++ b/Src/Scarab/library/version/version_ifc.cc
@@ -0,0 +1,28 @@
+/*
+ * version_ifc.cc
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "version_ifc.hh"
+
+namespace scarab
+{
+    version_ifc::version_ifc()
+    {}
+
+    version_ifc::version_ifc( const version_ifc& )
+    {}
+
+    version_ifc::~version_ifc()
+    {}
+
+    version_ifc& version_ifc::operator=( const version_ifc& )
+    {
+        return *this;
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/version/version_ifc.hh b/Src/Scarab/library/version/version_ifc.hh
new file mode 100644
index 0000000..bde3d95
--- /dev/null
+++ b/Src/Scarab/library/version/version_ifc.hh
@@ -0,0 +1,45 @@
+/*
+ * version_ifc.hh
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_VERSION_IFC_HH_
+#define SCARAB_VERSION_IFC_HH_
+
+#include "scarab_api.hh"
+
+#include <string>
+
+namespace scarab
+{
+
+    class SCARAB_API version_ifc
+    {
+        public:
+            version_ifc();
+            version_ifc( const version_ifc& );
+            virtual ~version_ifc();
+
+            version_ifc& operator=( const version_ifc& );
+
+            virtual unsigned major_version() const = 0;
+            virtual unsigned minor_version() const = 0;
+            virtual unsigned patch_version() const = 0;
+
+            virtual const std::string& version_str() const = 0;
+
+            virtual const std::string& package() const = 0;
+            virtual const std::string& commit() const = 0;
+
+            virtual const std::string& exe_name() const = 0;
+            virtual const std::string& hostname() const = 0;
+            virtual const std::string& username() const = 0;
+
+            virtual std::string version_info_string() const = 0;
+    };
+
+} /* namespace scarab */
+
+#endif /* SCARAB_VERSION_IFC_HH_ */
diff --git a/Src/Scarab/library/version/version_semantic.cc b/Src/Scarab/library/version/version_semantic.cc
new file mode 100644
index 0000000..d446127
--- /dev/null
+++ b/Src/Scarab/library/version/version_semantic.cc
@@ -0,0 +1,286 @@
+/*
+ * version_semantic.cc
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ */
+
+#define SCARAB_API_EXPORTS
+
+#include "version_semantic.hh"
+
+#include "logger.hh"
+#include "path.hh"
+
+#include <sstream>
+
+#ifdef _WIN32
+#include <Windows.h> // for extracting the exe name, gethostname and GetUserName
+#elif __APPLE__
+#include <mach-o/dyld.h> // for extracting the exe name
+#include <unistd.h> // for gethostname and getlogin_r
+#include <pwd.h> // for struct passwd
+#elif __linux
+#include <unistd.h> // for readlink, gethostname and getlogin_r
+#include <pwd.h> // for struct passwd
+#endif
+
+using std::string;
+
+namespace scarab
+{
+    LOGGER( slog, "version_semantic" );
+
+    char version_semantic::s_delimeter = '.';
+
+    version_semantic::version_semantic() :
+            version_ifc(),
+            f_major_ver(),
+            f_minor_ver(),
+            f_patch_ver(),
+            f_version(),
+            f_package(),
+            f_commit(),
+            f_exe_name(),
+            f_hostname(),
+            f_username()
+    {
+        update_exe_host_user();
+    }
+
+    version_semantic::version_semantic( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver ) :
+            version_ifc(),
+            f_major_ver( a_maj_ver ),
+            f_minor_ver( a_min_ver ),
+            f_patch_ver( a_patch_ver ),
+            f_version(),
+            f_package(),
+            f_commit(),
+            f_exe_name(),
+            f_hostname(),
+            f_username()
+    {
+        combine( a_maj_ver, a_min_ver, a_patch_ver );
+        update_exe_host_user();
+    }
+
+    version_semantic::version_semantic( const std::string& a_ver ) :
+            version_ifc(),
+            f_major_ver( 0 ),
+            f_minor_ver( 0 ),
+            f_patch_ver( 0 ),
+            f_version( a_ver ),
+            f_package(),
+            f_commit(),
+            f_exe_name(),
+            f_hostname(),
+            f_username()
+    {
+        parse( a_ver );
+        update_exe_host_user();
+    }
+
+    version_semantic::version_semantic( const version_semantic& a_orig ) :
+            version_ifc(),
+            f_major_ver( a_orig.f_major_ver ),
+            f_minor_ver( a_orig.f_minor_ver ),
+            f_patch_ver( a_orig.f_patch_ver ),
+            f_version( a_orig.f_version ),
+            f_package( a_orig.f_package ),
+            f_commit( a_orig.f_commit ),
+            f_exe_name( a_orig.f_exe_name ),
+            f_hostname( a_orig.f_hostname ),
+            f_username( a_orig.f_username )
+    {
+    }
+
+    version_semantic::~version_semantic()
+    {
+    }
+
+    version_semantic& version_semantic::operator=( const version_semantic& a_orig )
+    {
+        this->version_ifc::operator=( a_orig );
+        f_major_ver = a_orig.f_major_ver;
+        f_minor_ver = a_orig.f_minor_ver;
+        f_patch_ver = a_orig.f_patch_ver;
+        f_version = a_orig.f_version;
+        f_package = a_orig.f_package;
+        f_commit = a_orig.f_commit;
+        f_exe_name = a_orig.f_exe_name;
+        f_hostname = a_orig.f_hostname;
+        f_username = a_orig.f_username;
+        return *this;
+    }
+
+    bool version_semantic::operator<( const version_semantic& a_other )
+    {
+        if( f_major_ver < a_other.f_major_ver ) return true;
+        if( f_major_ver > a_other.f_major_ver ) return false;
+        if( f_minor_ver < a_other.f_minor_ver ) return true;
+        if( f_minor_ver > a_other.f_minor_ver ) return false;
+        if( f_patch_ver < a_other.f_patch_ver ) return true;
+        return false;
+    }
+
+    bool version_semantic::operator==( const version_semantic& a_other )
+    {
+        return f_major_ver == a_other.f_major_ver &&
+               f_minor_ver == a_other.f_minor_ver &&
+               f_patch_ver == a_other.f_patch_ver;
+    }
+
+    bool version_semantic::operator>( const version_semantic& a_other )
+    {
+        if( f_major_ver > a_other.f_major_ver ) return true;
+        if( f_major_ver < a_other.f_major_ver ) return false;
+        if( f_minor_ver > a_other.f_minor_ver ) return true;
+        if( f_minor_ver < a_other.f_minor_ver ) return false;
+        if( f_patch_ver > a_other.f_patch_ver ) return true;
+        return false;
+    }
+
+    bool version_semantic::parse( const std::string& a_ver )
+    {
+        if( a_ver.empty() || a_ver == "unknown" )
+        {
+            f_major_ver = 0;
+            f_minor_ver = 0;
+            f_patch_ver = 0;
+            f_version = a_ver;
+            return true;
+        }
+
+        size_t t_start = 0;
+        if( a_ver[0] == 'v' )
+        {
+            t_start = 1;
+        }
+        size_t t_delim_pos_1 = a_ver.find( s_delimeter, 0 );
+        if( t_delim_pos_1 == std::string::npos )
+        {
+            LERROR( slog, "version string <" << a_ver << "> is not in the right format (did not find first delimeter)" );
+            return false;
+        }
+        std::stringstream t_maj_ver_str;
+        t_maj_ver_str << a_ver.substr( t_start, t_delim_pos_1 );
+
+        size_t t_delim_pos_2 = a_ver.find( s_delimeter, t_delim_pos_1 + 1 );
+        if( t_delim_pos_2 == std::string::npos )
+        {
+            LERROR( slog, "version string <" << a_ver << "> is not in the right format (did not find second delimeter)" );
+            return false;
+        }
+        std::stringstream t_min_ver_str;
+        t_min_ver_str << a_ver.substr(t_delim_pos_1 + 1, t_delim_pos_2 );
+
+        std::stringstream t_patch_ver;
+        t_patch_ver << a_ver.substr( t_delim_pos_2 + 1 );
+
+        t_maj_ver_str >> f_major_ver;
+        t_min_ver_str >> f_minor_ver;
+        t_patch_ver >> f_patch_ver;
+        f_version = a_ver;
+
+        return true;
+    }
+
+    bool version_semantic::combine( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver )
+    {
+        std::stringstream t_ver_str;
+        t_ver_str << a_maj_ver << s_delimeter << a_min_ver << s_delimeter << a_patch_ver;
+        f_version = t_ver_str.str();
+        return true;
+    }
+
+    bool version_semantic::update_exe_host_user()
+    {
+        const size_t t_bufsize = 1024;
+
+        // Username
+#ifdef _WIN32
+        char t_username_buf[ t_bufsize ];
+        DWORD t_bufsize_win = t_bufsize;
+        if( GetUserName( t_username_buf, &t_bufsize_win ) )
+        {
+            f_username = string( t_username_buf );
+        }
+        else
+        {
+#else
+        //if( getlogin_r( t_username_buf, t_bufsize ) == 0 )
+        passwd* t_passwd = getpwuid( getuid() );
+        if( t_passwd != nullptr )
+        {
+            f_username = string( t_passwd->pw_name );
+        }
+        else
+        {
+            LWARN( slog, "Error reported while getting passwd info: " << strerror( errno ) );
+#endif
+            LWARN( slog, "Unable to get the username" );
+        }
+
+        // Hostname
+        char t_hostname_buf[ t_bufsize ];
+#ifdef _WIN32
+        WSADATA wsaData;
+        WSAStartup( MAKEWORD( 2, 2 ), &wsaData );
+#endif
+        // gethostname is the same on posix and windows
+        if( gethostname( t_hostname_buf, t_bufsize ) == 0 )
+        {
+            f_hostname = string( t_hostname_buf );
+        }
+        else
+        {
+            LWARN( slog, "Unable to get the hostname" );
+        }
+#ifdef _WIN32
+        WSACleanup();
+#endif
+
+        // name of executable
+        //f_exe_name = t_parser.get_value( t_name_exe, f_exe_name );
+#ifdef _WIN32
+        TCHAR t_exe_buf[ MAX_PATH ];
+        if( ! GetModuleFileName( NULL, t_exe_buf, MAX_PATH ) )
+#elif __APPLE__
+        char t_exe_buf[ 2048 ];
+        uint32_t t_exe_bufsize = sizeof( t_exe_buf );
+        if( _NSGetExecutablePath( t_exe_buf, &t_exe_bufsize ) != 0 )
+#elif __linux
+        const size_t t_exe_bufsize = 2048;
+        char t_exe_buf[ t_exe_bufsize ];
+        ssize_t t_exe_name_len = readlink( "/proc/self/exe", t_exe_buf, t_exe_bufsize );
+        if( t_exe_name_len >= 0 )
+        {
+            t_exe_buf[t_exe_name_len] = '\0';
+        }
+        else
+        //if( readlink( "/proc/self/exe", t_exe_buf, t_exe_bufsize ) < 0 )
+#endif
+        {
+            LWARN( slog, "Could not retrieve executable file name" );
+#ifdef __APPLE__
+            LWARN( slog, "Executable name buffer is too small; needs size %u\n" << t_bufsize );
+#endif
+        }
+        f_exe_name = string( t_exe_buf );
+
+        return true;
+    }
+
+    std::string version_semantic::version_info_string() const
+    {
+        std::stringstream t_info_stream;
+        path t_exe_path( f_exe_name );
+        t_info_stream << "Executable: " << t_exe_path.filename() << '\n';
+        t_info_stream << "Location: " << t_exe_path.parent_path() << '\n';
+        t_info_stream << "Built with " << f_package << " version " << f_version << '\n';
+        t_info_stream << "Git commit: " << f_commit;
+        std::string t_version_info( t_info_stream.str() );
+        return t_version_info;
+    }
+
+} /* namespace scarab */
diff --git a/Src/Scarab/library/version/version_semantic.hh b/Src/Scarab/library/version/version_semantic.hh
new file mode 100644
index 0000000..b67415a
--- /dev/null
+++ b/Src/Scarab/library/version/version_semantic.hh
@@ -0,0 +1,92 @@
+/*
+ * version_semantic.hh
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_VERSION_SEMANTIC_HH_
+#define SCARAB_VERSION_SEMANTIC_HH_
+
+#include "version_ifc.hh"
+
+#include "member_variables.hh"
+
+#include <memory>
+
+namespace scarab
+{
+
+    class SCARAB_API version_semantic : public version_ifc
+    {
+        public:
+            version_semantic();
+            version_semantic( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver );
+            version_semantic( const std::string& a_ver );
+            version_semantic( const version_semantic& a_orig );
+            ~version_semantic();
+
+            version_semantic& operator=( const version_semantic& a_orig );
+
+            /// Less-than operator to compare version information only
+            bool operator<( const version_semantic& a_other );
+            /// Equality operator to compare version information only
+            bool operator==( const version_semantic& a_other );
+            /// Greater-than operator to compare version information only
+            bool operator>( const version_semantic& a_other );
+
+            virtual unsigned major_version() const;
+            virtual unsigned minor_version() const;
+            virtual unsigned patch_version() const;
+
+            virtual const std::string& version_str() const;
+
+            virtual std::string version_info_string() const;
+
+        public:
+            bool parse( const std::string& a_ver );
+
+            bool combine( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver );
+
+            bool update_exe_host_user();
+
+        protected:
+            static char s_delimeter;
+
+            unsigned f_major_ver;
+            unsigned f_minor_ver;
+            unsigned f_patch_ver;
+            std::string f_version;
+
+            mv_referrable( std::string, package );
+            mv_referrable( std::string, commit );
+
+            mv_referrable( std::string, exe_name );
+            mv_referrable( std::string, hostname );
+            mv_referrable( std::string, username );
+    };
+
+    typedef std::shared_ptr< version_semantic > version_semantic_ptr_t;
+
+
+    inline unsigned version_semantic::major_version() const
+    {
+        return f_major_ver;
+    }
+    inline unsigned version_semantic::minor_version() const
+    {
+        return f_minor_ver;
+    }
+    inline unsigned version_semantic::patch_version() const
+    {
+        return f_patch_ver;
+    }
+
+    inline const std::string& version_semantic::version_str() const
+    {
+        return f_version;
+    }
+
+} /* namespace scarab */
+
+#endif /* SCARAB_VERSION_SEMANTIC_HH_ */
diff --git a/Src/Scarab/library/version/version_wrapper.hh b/Src/Scarab/library/version/version_wrapper.hh
new file mode 100644
index 0000000..2c9f286
--- /dev/null
+++ b/Src/Scarab/library/version/version_wrapper.hh
@@ -0,0 +1,84 @@
+/*
+ * version_wrapper.hh
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_VERSION_WRAPPER_HH_
+#define SCARAB_VERSION_WRAPPER_HH_
+
+#include "scarab_version.hh"
+
+#include "singleton.hh"
+
+namespace scarab
+{
+    class SCARAB_API version_wrapper : public singleton< version_wrapper >, public version_ifc
+    {
+        protected:
+            friend class singleton< version_wrapper >;
+            friend class destroyer< version_wrapper >;
+            version_wrapper() : f_imp( new version() ) {}
+            ~version_wrapper() {}
+
+        public:
+            void set_imp( version_semantic_ptr_t a_imp )
+            {
+                f_imp = a_imp;
+                return;
+            }
+
+        public:
+            virtual unsigned major_version() const
+            {
+                return f_imp->major_version();
+            }
+            virtual unsigned minor_version() const
+            {
+                return f_imp->minor_version();
+            }
+            virtual unsigned patch_version() const
+            {
+                return f_imp->patch_version();
+            }
+
+            virtual const std::string& version_str() const
+            {
+                return f_imp->version_str();
+            }
+
+            virtual const std::string& package() const
+            {
+                return f_imp->package();
+            }
+            virtual const std::string& commit() const
+            {
+                return f_imp->commit();
+            }
+
+            virtual const std::string& exe_name() const
+            {
+                return f_imp->exe_name();
+            }
+            virtual const std::string& hostname() const
+            {
+                return f_imp->hostname();
+            }
+            virtual const std::string& username() const
+            {
+                return f_imp->username();
+            }
+
+            virtual std::string version_info_string() const
+            {
+                return f_imp->version_info_string();
+            }
+
+        private:
+            version_semantic_ptr_t f_imp;
+    };
+
+}
+
+#endif /* SCARAB_VERSION_WRAPPER_HH_ */
diff --git a/Src/Scarab/python/CMakeLists.txt b/Src/Scarab/python/CMakeLists.txt
new file mode 100644
index 0000000..11f2da7
--- /dev/null
+++ b/Src/Scarab/python/CMakeLists.txt
@@ -0,0 +1,56 @@
+# CMakeLists.txt file for Scarab/library/python
+# Author: N.S. Oblath
+# Created on: Sept 2, 2019
+
+if( Scarab_BUILD_PYTHON )
+    message( "Building Python bindings" )
+
+    set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+
+    # Python binding headers
+    set( PYBINDING_HEADERFILES
+        ${dir}/scarab_binding_helpers.hh
+        ${dir}/cancelable_pybind.hh
+        ${dir}/signal_handler_pybind.hh
+        ${dir}/version_pybind.hh
+    )
+
+    # Python bindings
+    set( PYBINDING_SOURCEFILES
+        ${dir}/scarab_namespace_pybind.cc
+    )
+
+    if( Scarab_BUILD_CLI )
+        add_definitions( -DBUILD_CLI_PYBINDING )
+        set( PYBINDING_HEADERFILES
+            ${PYBINDING_HEADERFILES}
+            ${dir}/application_pybind.hh
+        )
+    endif( Scarab_BUILD_CLI )
+
+    if( Scarab_BUILD_PARAM )
+        add_definitions( -DBUILD_PARAM_PYBINDING )
+        set( PYBINDING_HEADERFILES
+            ${PYBINDING_HEADERFILES}
+            ${dir}/param_pybind.hh
+            ${dir}/param_binding_helpers.hh
+            ${dir}/param_value_pybind.hh
+            ${dir}/param_array_pybind.hh
+            ${dir}/param_node_pybind.hh
+        )
+    endif( Scarab_BUILD_PARAM )
+
+    set( PROJECT_LIBRARIES Scarab )
+
+    pbuilder_add_pybind11_module( scarab ${PROJECT_LIBRARIES} )
+
+    pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
+
+    if( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
+        message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )
+        configure_file( add_lib_python_path.sh.in add_lib_python_path.sh @ONLY)
+        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/add_lib_python_path.sh DESTINATION ${BIN_INSTALL_DIR} )
+    endif( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
+
+    message( "Done with Python bindings" )
+endif( Scarab_BUILD_PYTHON )
diff --git a/Src/Scarab/python/add_lib_python_path.sh.in b/Src/Scarab/python/add_lib_python_path.sh.in
new file mode 100644
index 0000000..68aff4b
--- /dev/null
+++ b/Src/Scarab/python/add_lib_python_path.sh.in
@@ -0,0 +1,3 @@
+# Adds the lib install directory to the python path
+
+export PYTHONPATH=@LIB_INSTALL_DIR@:$PYTHONPATH
diff --git a/Src/Scarab/python/application_pybind.hh b/Src/Scarab/python/application_pybind.hh
new file mode 100644
index 0000000..2456d82
--- /dev/null
+++ b/Src/Scarab/python/application_pybind.hh
@@ -0,0 +1,136 @@
+#ifndef APPLICATION_PYBIND_HH_
+#define APPLICATION_PYBIND_HH_
+
+#include "pybind11/pybind11.h"
+#include "pybind11/functional.h"
+#include "pybind11/stl.h"
+
+#include "application.hh"
+#include "scarab_binding_helpers.hh"
+
+namespace scarab_pybind
+{
+    std::list< std::string > export_application( pybind11::module& mod )
+    {
+        std::list< std::string > all_members;
+
+        all_members.push_back( "MainApp" );
+        pybind11::class_< scarab::main_app >( mod, "MainApp", "Base class for creating CLI utilities" )
+            .def( pybind11::init< bool >(),
+                  pybind11::arg( "use_config" ) = true,
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+
+            .def( "set_callback", [](scarab::main_app* an_app, std::function< void() > a_fun){ an_app->callback( a_fun );} )
+
+            // member variables
+            .def_property_readonly( "primary_config", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::primary_config )
+            .def_property( "default_config", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::default_config,
+                           [](scarab::main_app& an_obj, scarab::param_node& a_config){ an_obj.default_config() = a_config; } )
+            .def_property_readonly( "config_filename", (const std::string& (scarab::main_app::*)()) &scarab::main_app::config_filename )
+            .def_property_readonly( "global_verbosity", &scarab::main_app::get_global_verbosity )
+            .def_property_readonly( "nonoption_kw_args", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::nonoption_kw_args )
+            .def_property_readonly( "nonoption_ord_args", (scarab::param_array& (scarab::main_app::*)()) &scarab::main_app::nonoption_ord_args )
+            .def_property_readonly( "app_options", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::app_options )
+            .def_property_readonly( "use_config", &scarab::main_app::get_use_config )
+
+            .def( "do_config_stage_1", &scarab::main_app::do_config_stage_1, SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "do_config_stage_2", &scarab::main_app::do_config_stage_2, SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "do_config_stage_3", &scarab::main_app::do_config_stage_3, SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "do_config_stage_4", &scarab::main_app::do_config_stage_4, SCARAB_BIND_CALL_GUARD_STREAMS )
+
+            //TODO: add_config_subcommand?
+
+            //add_config_options... what template versions do we need?
+            .def( "add_config_flag",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_flag< bool >(a_name, a_addr, a_description);},
+                  pybind11::arg( "flag" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a CLI flag, which is toggled as a bool",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_counted_flag",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_flag< unsigned >(a_name, a_addr, a_description);},
+                  pybind11::arg( "flag" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a CLI flag, the config will contain a count of occurrances",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_string_option",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_option< std::string >(a_name, a_addr, a_description);},
+                  pybind11::arg( "option" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a single-string argument",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_int_option",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_option< int >(a_name, a_addr, a_description);},
+                  pybind11::arg( "option" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a single-integer argument",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_float_option",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_option< double >(a_name, a_addr, a_description);},
+                  pybind11::arg( "option" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a single-float argument",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_multi_string_option",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_multi_option< std::string >(a_name, a_addr, a_description);},
+                  pybind11::arg( "option" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a sequence of string arguments",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_multi_int_option",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_multi_option< int >(a_name, a_addr, a_description);},
+                  pybind11::arg( "option" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a sequence of ints arguments",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def( "add_config_multi_float_option",
+                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
+                        {an_app->add_config_multi_option< double >(a_name, a_addr, a_description);},
+                  pybind11::arg( "option" ),
+                  pybind11::arg( "config_address" ),
+                  pybind11::arg( "description" ) = "",
+                  "add a sequence of string arguments",
+                  SCARAB_BIND_CALL_GUARD_STREAMS )
+
+            .def( "set_version", &scarab::main_app::set_version, SCARAB_BIND_CALL_GUARD_STREAMS )
+
+            // implement execute as a lambda, it is a macro in CLI11
+            .def( "execute",
+                  [](scarab::main_app& an_app, std::list< std::string > args )
+                  {
+                    //TODO: this feels... super ugly, also how do I deal with errors/return codes?
+                    const char* argv[args.size()];
+                    std::list< std::string >::iterator an_arg = args.begin();
+                    for (unsigned i_arg=0; i_arg<args.size(); ++i_arg)
+                    {
+                        argv[i_arg] = an_arg->c_str();
+                        ++an_arg;
+                    }
+                    // CLI11_PARSE returns an integer in the event of an error, the are meant to be
+                    // valid shell return codes, so 0 is success
+                    CLI11_PARSE( an_app, args.size(), argv );
+                    return 0;
+                  },
+                  "parse arguments and execute the application",
+                  SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
+
+            ;
+
+        return all_members;
+    }
+} /* namespace scarab_pybind */
+#endif /* APPLICATION_PYBIND_HH_ */
diff --git a/Src/Scarab/python/cancelable_pybind.hh b/Src/Scarab/python/cancelable_pybind.hh
new file mode 100644
index 0000000..970a7f5
--- /dev/null
+++ b/Src/Scarab/python/cancelable_pybind.hh
@@ -0,0 +1,29 @@
+#ifndef CANCELABLE_PYBIND_HH_
+#define CANCELABLE_PYBIND_HH_
+
+#include "cancelable.hh"
+#include "scarab_binding_helpers.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace scarab_pybind
+{
+    std::list< std::string > export_cancelable( pybind11::module& mod )
+    {
+        std::list< std::string> all_members;
+
+        all_members.push_back( "Cancelable" );
+        pybind11::class_< scarab::cancelable, std::shared_ptr<scarab::cancelable> >( mod, "Cancelable" )
+            .def( pybind11::init< >() )
+
+            .def( "cancel", &scarab::cancelable::cancel, SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
+            .def( "reset_cancel", &scarab::cancelable::reset_cancel, SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
+            .def( "is_canceled", &scarab::cancelable::is_canceled )
+
+            ;
+
+        return all_members;
+    }
+}
+
+#endif /* CANCELABLE_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_array_pybind.hh b/Src/Scarab/python/param_array_pybind.hh
new file mode 100644
index 0000000..3c3b766
--- /dev/null
+++ b/Src/Scarab/python/param_array_pybind.hh
@@ -0,0 +1,108 @@
+/*
+ * KTPyNymph.cc
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
+ */
+
+#ifndef PARAM_ARRAY_PYBIND_HH_
+#define PARAM_ARRAY_PYBIND_HH_
+
+#include "param.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace scarab_pybind
+{
+
+    std::list< std::string > export_param_array( pybind11::module& mod )
+    {
+        std::list< std::string > all_members;
+
+        // param_array
+        all_members.push_back( "ParamArray" );
+        pybind11::class_< scarab::param_array, scarab::param >( mod, "ParamArray", "param data structure object for holding an ordered sequence of objects" )
+            .def( pybind11::init< >() )
+            .def( "__str__", &scarab::param_array::to_string )
+            .def( "__len__", &scarab::param_array::size,
+                    "Returns the size of the array" )
+            .def( "__getitem__", (scarab::param& (scarab::param_array::*)(unsigned)) &scarab::param_array::operator[],
+                    pybind11::return_value_policy::reference_internal)
+            .def( "__setitem__", [](scarab::param_array& an_obj, unsigned a_index, scarab::param& a_value){ an_obj.assign( a_index, a_value ); } )
+            .def( "__iter__", [](const scarab::param_array& an_obj){ return pybind11::make_iterator(an_obj.begin(), an_obj.end()); },
+                    pybind11::keep_alive<0, 1>() /* keep object alive while the iterator exists */)
+
+            //TODO: has_subset()
+
+            .def( "empty", &scarab::param_array::empty,
+                    "True if the length is zero" )
+
+            .def( "resize", &scarab::param_array::resize, pybind11::arg( "size" ),
+                    "Sets the size of the array; if smaller than the current size, the extra elements are deleted" )
+
+            .def( "assign",
+                    (void (scarab::param_array::*)(unsigned, const scarab::param&)) &scarab::param_array::assign,
+                    pybind11::arg( "index" ),
+                    pybind11::arg( "value" ),
+                    "Add a param object [value] to the specified [index] in a array" )
+
+            // Get value of the parameter, bringing along the default value
+            .def( "get_value",
+                    (bool (scarab::param_array::*)(unsigned, bool) const) &scarab::param_array::get_value<bool>,
+                    pybind11::arg( "index" ),
+                    pybind11::arg( "default" ),
+                    "Get boolean parameter array value at index, or return provided value if out of index range" )
+            .def( "get_value",
+                    (unsigned (scarab::param_array::*)(unsigned, unsigned) const) &scarab::param_array::get_value<uint>,
+                    pybind11::arg( "index" ),
+                    pybind11::arg( "default" ),
+                    "Get integer parameter array value at index, or return provided value if out of index range" )
+            .def( "get_value",
+                    (int (scarab::param_array::*)(unsigned, int) const) &scarab::param_array::get_value<int>,
+                    pybind11::arg( "index" ),
+                    pybind11::arg( "default" ),
+                    "Get signed integer parameter array value at index, or return provided value if out of index range" )
+            .def( "get_value",
+                    (double (scarab::param_array::*)(unsigned, double) const) &scarab::param_array::get_value<double>,
+                    pybind11::arg( "index" ),
+                    pybind11::arg( "default" ),
+                    "Get float parameter array value at index, or return provided value if out of index range" )
+            .def( "get_value",
+                    (std::string (scarab::param_array::*)(unsigned, const std::string& ) const) &scarab::param_array::get_value,
+                    pybind11::arg( "index" ),
+                    pybind11::arg( "default" ),
+                    "Get string parameter array value at index, or return provided value if out of index range" )
+
+            .def( "push_back",
+                    (void (scarab::param_array::*)(const scarab::param&)) &scarab::param_array::push_back,
+                    pybind11::arg( "value" ),
+                    "add a param object to the end of the array")
+            .def( "push_front",
+                    (void (scarab::param_array::*)(const scarab::param&)) &scarab::param_array::push_front,
+                    pybind11::arg( "value" ),
+                    "add a param object to the end of the array")
+
+            .def( "append",
+                    &scarab::param_array::append,
+                    pybind11::arg( "array" ),
+                    "adds all elements of a param_array to the end of this" )
+            .def( "merge",
+                    &scarab::param_array::merge,
+                    pybind11::arg( "array" ),
+                    "merges provided param_array, effectively replacing the current array")
+            .def( "erase",
+                    &scarab::param_array::erase,
+                    pybind11::arg( "index" ),
+                    "eliminates the value at a position in the array" )
+            .def( "remove",
+                    &scarab::param_array::remove,
+                    pybind11::arg( "index" ),
+                    "returns the param_value at the provided index and removes it from the array" )
+            .def( "clear", &scarab::param_array::clear, "erase all contents and resize to 0" )
+
+            ;
+        return all_members;
+    }
+
+} /* namespace scarab_pybind */
+#endif /* PARAM_ARRAY_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_binding_helpers.hh b/Src/Scarab/python/param_binding_helpers.hh
new file mode 100644
index 0000000..3fc5bc9
--- /dev/null
+++ b/Src/Scarab/python/param_binding_helpers.hh
@@ -0,0 +1,125 @@
+/*
+ * param_binding_helpers.hh
+ *
+ *  Created on: Jan 23, 2020
+ *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
+ */
+
+#ifndef PARAM_BINDING_HELPERS_HH_
+#define PARAM_BINDING_HELPERS_HH_
+
+#include <algorithm> //for std::replace on string
+
+#include "param.hh"
+#include "error.hh"
+
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+
+
+namespace scarab_pybind
+{
+
+    scarab::param_ptr_t to_param( const pybind11::object& an_object, bool hyphenate_keys=false )
+    {
+        using namespace pybind11;
+        if( isinstance< none >( an_object ) )
+        {
+            return scarab::param_ptr_t( new scarab::param() );
+        }
+        else if( isinstance< bool_ >( an_object ) )
+        {
+            return scarab::param_ptr_t( new scarab::param_value( static_cast< const bool_& >(an_object) ) );
+        }
+        else if( isinstance< int_ >( an_object ) )
+        {
+            return scarab::param_ptr_t( new scarab::param_value( (int64_t)static_cast< const int_& >(an_object) ) );
+        }
+        else if( isinstance< float_ >( an_object ) )
+        {
+            return scarab::param_ptr_t( new scarab::param_value( (double)static_cast< const float_& >(an_object) ) );
+        }
+        else if( isinstance< str >( an_object ) )
+        {
+            return scarab::param_ptr_t( new scarab::param_value( static_cast< const str& >(an_object) ) );
+        }
+        else if( isinstance< list >( an_object ) )
+        {
+            scarab::param_ptr_t the_return( new scarab::param_array() );
+            scarab::param_array& the_return_arr = the_return->as_array();
+            for( auto an_item = an_object.begin(); an_item != an_object.end(); ++an_item )
+            {
+                the_return_arr.push_back( to_param( reinterpret_borrow< object >( *an_item ) ) );
+            }
+            return the_return;
+        }
+        else if( isinstance< dict >( an_object ) )
+        {
+            scarab::param_ptr_t the_return( new scarab::param_node() );
+            scarab::param_node& the_return_arr = the_return->as_node();
+            const dict& a_dict = static_cast< const dict& >( an_object );
+            for( auto an_item = a_dict.begin(); an_item != a_dict.end(); ++an_item )
+            {
+                if( ! isinstance< str >(an_item->first) || ! isinstance< object >(an_item->second) )
+                {
+                    throw scarab::error() << "Cannot convert dict to param";
+                }
+                std::string new_key = pybind11::str(an_item->first);
+                if ( hyphenate_keys )
+                {
+                    std::replace( new_key.begin(), new_key.end(), '_', '-' );
+                }
+                the_return_arr.add( new_key, to_param( static_cast< const object& >(an_item->second) ) );
+            }
+            return the_return;
+        }
+        throw scarab::error() << "Unknown python type cannot be converted to param";
+    };
+
+    pybind11::object to_python( const scarab::param& a_param, bool underscore_keys = false )
+    {
+        if (a_param.is_null())
+        {
+            return pybind11::none();
+        }
+        else if (a_param.is_value())
+        {
+            const scarab::param_value& this_value = a_param.as_value();
+            pybind11::object to_return;
+            if (this_value.is_bool()) to_return =  pybind11::cast(this_value.as_bool());
+            else if (this_value.is_uint()) to_return = pybind11::cast(this_value.as_uint());
+            else if (this_value.is_int()) to_return = pybind11::cast(this_value.as_int());
+            else if (this_value.is_double()) to_return = pybind11::cast(this_value.as_double());
+            else if (this_value.is_string()) to_return = pybind11::cast(this_value.as_string());
+            return to_return;
+        }
+        else if (a_param.is_array())
+        {
+            const scarab::param_array& this_array = a_param.as_array();
+            pybind11::list to_return;
+            for (scarab::param_array_const_iterator an_item=this_array.begin(); an_item != this_array.end(); ++an_item)
+            {
+                to_return.append( to_python( *an_item ) );
+            }
+            return std::move(to_return);
+        }
+        else if (a_param.is_node())
+        {
+            const scarab::param_node& this_node = a_param.as_node();
+            pybind11::dict to_return;
+            for (scarab::param_node_const_iterator an_item=this_node.begin(); an_item != this_node.end(); ++an_item)
+            {
+                std::string new_key = an_item.name();
+                if ( underscore_keys )
+                {
+                    std::replace( new_key.begin(), new_key.end(), '-', '_' );
+                }
+                to_return[ new_key.c_str() ] = to_python( *an_item );
+            }
+            return std::move(to_return);
+        }
+        throw scarab::error() << "Unknown param type cannot be converted to Python";
+    };
+
+} /* namespace scarab_pybind */
+#endif /* PARAM_BINDING_HLEPERS_HH_ */
diff --git a/Src/Scarab/python/param_node_pybind.hh b/Src/Scarab/python/param_node_pybind.hh
new file mode 100644
index 0000000..70edc0f
--- /dev/null
+++ b/Src/Scarab/python/param_node_pybind.hh
@@ -0,0 +1,83 @@
+/*
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
+ */
+
+#ifndef PARAM_NODE_PYBIND_HH_
+#define PARAM_NODE_PYBIND_HH_
+
+#include "param.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace scarab_pybind
+{
+
+    std::list< std::string > export_param_node( pybind11::module& mod )
+    {
+        std::list< std::string > all_members;
+
+        // param_node
+        all_members.push_back( "ParamNode" );
+        pybind11::class_< scarab::param_node, scarab::param >( mod, "ParamNode", "param data structure object for holding a collection of object indexable by string keys" )
+            .def( pybind11::init< >() )
+
+            .def( "__str__", &scarab::param_node::to_string )
+            .def( "__len__", &scarab::param_node::size )
+            .def( "__getitem__", (scarab::param& (scarab::param_node::*)(const std::string&)) &scarab::param_node::operator[],
+                    pybind11::return_value_policy::reference_internal)
+            .def( "__setitem__", [](scarab::param_node& an_obj, std::string& a_name, scarab::param& a_value){ an_obj.replace( a_name, a_value ); } )
+            .def( "__contains__", &scarab::param_node::has )
+            .def( "__iter__", [](const scarab::param_node& an_obj){ return pybind11::make_iterator(an_obj.begin(), an_obj.end()); },
+                    pybind11::keep_alive<0, 1>() /* keep object alive while the iterator exists */ )
+
+            .def( "count",
+                    &scarab::param_node::count,
+                    pybind11::arg( "key" ),
+                    "returns the number of occurances of provided key" )
+
+            //TODO: has_subset()
+
+            .def( "empty", &scarab::param_node::empty, "returns whether the map container is empty")
+
+            .def( "add",
+                    (bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,
+                    pybind11::arg( "key" ),
+                    pybind11::arg( "value" ),
+                    "Add a param object to a node at a particular key")
+
+            // Get value of the parameter, bringing along the default value
+            .def( "get_value",
+                    (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
+                    pybind11::arg( "key" ),
+                    pybind11::arg( "default" ),
+                    "Get parameter node value at [key] or return [default] (as a bool)" )
+            .def( "get_value",
+                    (unsigned (scarab::param_node::*)(const std::string&, unsigned) const) &scarab::param_node::get_value<uint>,
+                    pybind11::arg( "key" ),
+                    pybind11::arg( "default" ),
+                    "Get parameter node value at [key] or return [default] (as an unsigned integer)" )
+            .def( "get_value",
+                    (int (scarab::param_node::*)(const std::string&, int) const) &scarab::param_node::get_value<int>,
+                    pybind11::arg( "key" ),
+                    pybind11::arg( "default" ),
+                    "Get parameter node value at [key] or return [default] (as a signed integer)" )
+            .def( "get_value",
+                    (double (scarab::param_node::*)(const std::string&, double) const) &scarab::param_node::get_value<double>,
+                    pybind11::arg( "key" ),
+                    pybind11::arg( "default" ),
+                    "Get parameter node value at [key] or return [default] (as a float)" )
+            .def( "get_value",
+                    (std::string (scarab::param_node::*)(const std::string&, const std::string& ) const) &scarab::param_node::get_value,
+                    pybind11::arg( "key" ),
+                    pybind11::arg( "default" ),
+                    "Get parameter node value at [key] or return [default] (as a string)" )
+
+            //TODO: merge(), erase(), remove(), clear()
+
+
+            ;
+        return all_members;
+    }
+} /* namespace scarab_pybind */
+#endif /* PARAM_NODE_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_pybind.hh b/Src/Scarab/python/param_pybind.hh
new file mode 100644
index 0000000..3b76a52
--- /dev/null
+++ b/Src/Scarab/python/param_pybind.hh
@@ -0,0 +1,76 @@
+/*
+ * param_pybind.hh
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
+ */
+
+#ifndef PARAM_PYBIND_HH_
+#define PARAM_PYBIND_HH_
+
+#include "param.hh"
+#include "param_binding_helpers.hh"
+#include "error.hh"
+
+#include "pybind11/pybind11.h"
+#include "pybind11/pytypes.h"
+
+
+namespace scarab_pybind
+{
+    std::list< std::string > export_param( pybind11::module& mod )
+    {
+        std::list< std::string > all_members;
+
+        all_members.push_back( "to_param" );
+        mod.def( "to_param",
+                &to_param,
+                pybind11::arg( "object"),
+                pybind11::arg( "hyphenate_keys" ) = false,
+                "Convert native python types to a param structure." );
+
+        // param
+        all_members.push_back( "Param" );
+        pybind11::class_< scarab::param >( mod, "Param", "param data structure base class and null object" )
+            .def( pybind11::init< >() )
+            .def( pybind11::init< scarab::param_value >() )
+
+            .def( "__str__", &scarab::param::to_string )
+            .def( "__call__", (scarab::param_value& (scarab::param::*)()) &scarab::param::operator(),
+                    pybind11::return_value_policy::reference_internal )
+
+            .def( "is_null", &scarab::param::is_null, "return whether the param object is an empty param type" )
+            .def( "is_node", &scarab::param::is_node, "return whether the param object is a ParamNode" )
+            .def( "is_array", &scarab::param::is_array, "return whether the param object is a ParamArray" )
+            .def( "is_value", &scarab::param::is_value, "return whether the param object is a ParamValue" )
+
+            .def( "as_array",
+                    (scarab::param_array& (scarab::param::*)()) &scarab::param::as_array,
+                    pybind11::return_value_policy::reference_internal,
+                    "returns Param object as a ParamArray" )
+            .def( "as_node",
+                    (scarab::param_node& (scarab::param::*)()) &scarab::param::as_node,
+                    pybind11::return_value_policy::reference_internal,
+                    "returns Param object as ParamNode" )
+            .def( "as_value",
+                    (scarab::param_value& (scarab::param::*)()) &scarab::param::as_value,
+                    pybind11::return_value_policy::reference_internal,
+                    "returns Param object as ParamValue" )
+
+            .def( "to_python",
+                    &to_python,
+                    pybind11::arg( "underscore_keys" ) = false,
+                    "recursively converts param object to native python data structure" )
+
+            //TODO: has_subset()
+
+            //TODO: get_value() in its various types
+
+            //TODO: merge()
+
+            ;
+        return all_members;
+    }
+
+} /* namespace scarab_pybind */
+#endif /* PARAM_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_value_pybind.hh b/Src/Scarab/python/param_value_pybind.hh
new file mode 100644
index 0000000..9c6e051
--- /dev/null
+++ b/Src/Scarab/python/param_value_pybind.hh
@@ -0,0 +1,77 @@
+/*
+ *
+ *  Created on: Feb 1, 2018
+ *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
+ */
+
+#ifndef PARAM_VALUE_PYBIND_HH_
+#define PARAM_VALUE_PYBIND_HH_
+
+#include "param.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace scarab_pybind
+{
+
+    std::list< std::string > export_param_value( pybind11::module& mod )
+    {
+        std::list< std::string > all_members;
+
+        // param_value
+        all_members.push_back( "ParamValue" );
+        pybind11::class_< scarab::param_value, scarab::param >( mod, "ParamValue", "param data structure object for holding a single value" )
+            // initialization overloads by type
+            .def( pybind11::init< bool >() )
+            .def( pybind11::init< unsigned >() )
+            .def( pybind11::init< int >() )
+            .def( pybind11::init< double >() )
+            .def( pybind11::init< const std::string& >() )
+            .def( pybind11::init< const char* >() )
+
+            // python __ special functions
+            .def( "__str__", &scarab::param_value::to_string )
+            .def( "__eq__", &scarab::param_value::operator== )
+
+            .def( "type", &scarab::param_value::type, "returns a string representation of the stored data type" )
+            // type checking methods
+            .def( "is_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::is_bool,
+                    "Return whether the param_value stores a boolean value" )
+            .def( "is_uint", (bool (scarab::param_value::*)() const) &scarab::param_value::is_uint,
+                    "Return whether the param_value stores an unsigned integer value" )
+            .def( "is_int", (bool (scarab::param_value::*)() const) &scarab::param_value::is_int,
+                    "Return whether the param_value stores a signed integer value" )
+            .def( "is_double", (bool (scarab::param_value::*)() const) &scarab::param_value::is_double,
+                    "Return whether the param_value stores a double value" )
+            .def( "is_string", (bool (scarab::param_value::*)() const) &scarab::param_value::is_string,
+                    "Return whether the param_value stores a string value" )
+
+            // output cast to native types
+            .def( "as_bool", &scarab::param_value::as_bool, "Get parameter value as a bool" )
+            .def( "as_uint", &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
+            .def( "as_int", &scarab::param_value::as_int, "Get parameter value as a signed integer" )
+            .def( "as_double", &scarab::param_value::as_double, "Get parameter value as a float" )
+            .def( "as_string", &scarab::param_value::as_string, "Get parameter value as a string" )
+
+            // set method overloads
+            .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set,
+                    "Set a bool value" )
+            //.def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set<uint64_t>, "Set an unsigned integer value" )
+            .def("set",&scarab::param_value::set<uint64_t>,
+                    "Set an unsigned integer value")
+            //.def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set<int64_t>, "Set a signed integer value" )
+            .def("set", &scarab::param_value::set<int64_t>,
+                    "Set a signed integer value")
+            .def( "set", (void (scarab::param_value::*)(double)) &scarab::param_value::set,
+                    "Set an float value" )
+            .def( "set", (void (scarab::param_value::*)(std::string)) &scarab::param_value::set,
+                    "Set an string value" )
+
+            //TODO: empty(), clear(), has_subset()
+
+            ;
+        return all_members;
+    }
+
+} /* namespace scarab_pybind */
+#endif /* PARAM_VALUE_PYBIND_HH_ */
diff --git a/Src/Scarab/python/scarab_binding_helpers.hh b/Src/Scarab/python/scarab_binding_helpers.hh
new file mode 100644
index 0000000..720f924
--- /dev/null
+++ b/Src/Scarab/python/scarab_binding_helpers.hh
@@ -0,0 +1,15 @@
+#ifndef SCARAB_PYBIND_BINDING_HELPERS
+#define SCARAB_PYBIND_BINDING_HELPERS
+
+#include "pybind11/iostream.h"
+
+#define SCARAB_BIND_CALL_GUARD_STREAMS \
+    pybind11::call_guard< pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect >()
+
+#define SCARAB_BIND_CALL_GUARD_GIL \
+    pybind11::call_guard< pybind11::gil_scoped_release >()
+
+#define SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL \
+    pybind11::call_guard< pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect, pybind11::gil_scoped_release >()
+
+#endif /* SCARAB_PYBIND_BINDING_HELPERS */
diff --git a/Src/Scarab/python/scarab_namespace_pybind.cc b/Src/Scarab/python/scarab_namespace_pybind.cc
new file mode 100644
index 0000000..8b4ca56
--- /dev/null
+++ b/Src/Scarab/python/scarab_namespace_pybind.cc
@@ -0,0 +1,46 @@
+/*
+ * scarab_namespace_pybind.cc
+ *
+ * Created on: April 18, 2019
+ *     Author: B.H. LaRoque
+ */
+
+#include "pybind11/stl.h"
+
+#ifdef BUILD_CLI_PYBINDING
+#include "application_pybind.hh"
+#endif
+
+#include "cancelable_pybind.hh"
+#include "signal_handler_pybind.hh"
+#include "version_pybind.hh"
+
+#ifdef BUILD_PARAM_PYBINDING
+#include "param_pybind.hh"
+#include "param_value_pybind.hh"
+#include "param_array_pybind.hh"
+#include "param_node_pybind.hh"
+#endif
+
+PYBIND11_MODULE( scarab, scarab_mod )
+{
+    std::list< std::string > all_members;
+    // cancelable
+    all_members.splice( all_members.end(), scarab_pybind::export_cancelable( scarab_mod ) );
+    // signal handler
+    all_members.splice( all_members.end(), scarab_pybind::export_signal_handler( scarab_mod ) );
+#ifdef BUILD_CLI_PYBINDING
+    // application
+    all_members.splice( all_members.end(), scarab_pybind::export_application( scarab_mod ) );
+#endif
+    // utility
+    all_members.splice( all_members.end(), scarab_pybind::export_version( scarab_mod ) );
+#ifdef BUILD_PARAM_PYBINDING
+    // Param-related data objects
+    all_members.splice( all_members.end(), scarab_pybind::export_param( scarab_mod ) );
+    all_members.splice( all_members.end(), scarab_pybind::export_param_value( scarab_mod ) );
+    all_members.splice( all_members.end(), scarab_pybind::export_param_array( scarab_mod ) );
+    all_members.splice( all_members.end(), scarab_pybind::export_param_node( scarab_mod ) );
+#endif
+    scarab_mod.attr( "__all__" ) = all_members;
+}
diff --git a/Src/Scarab/python/signal_handler_pybind.hh b/Src/Scarab/python/signal_handler_pybind.hh
new file mode 100644
index 0000000..bdcd6e3
--- /dev/null
+++ b/Src/Scarab/python/signal_handler_pybind.hh
@@ -0,0 +1,28 @@
+#ifndef SIGNAL_HANDLER_PYBIND_HH_
+#define SIGNAL_HANDLER_PYBIND_HH_
+
+#include "signal_handler.hh"
+#include "scarab_binding_helpers.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace scarab_pybind
+{
+    std::list< std::string > export_signal_handler( pybind11::module& mod )
+    {
+        std::list< std::string > all_members;
+
+        all_members.push_back( "SignalHandler" );
+        pybind11::class_< scarab::signal_handler >( mod, "SignalHandler", "handle system signals and pass cancel status to associated objects" )
+            .def( pybind11::init< >(), SCARAB_BIND_CALL_GUARD_STREAMS )
+
+            .def_static( "add_cancelable", &scarab::signal_handler::add_cancelable, "add a cancelable object to the list to be canceled in the event of a SIGINT" )
+            .def_static( "remove_cancelable", static_cast<void (*)(std::shared_ptr<scarab::cancelable>)>( &scarab::signal_handler::remove_cancelable ), "remove a cancelable object from the list to be canceled in the event of a SIGINT" )
+            .def_static( "reset", &scarab::signal_handler::reset, "remove all cancelable objects", SCARAB_BIND_CALL_GUARD_STREAMS )
+            .def_static( "cancel_all", &scarab::signal_handler::cancel_all, "cancel all cancelable objects known to the signal_handler", SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
+            ;
+
+        return all_members;
+    }
+} /* namespace scarab_pybind */
+#endif /* SIGNAL_HANDLER_PYBIND_HH_ */
diff --git a/Src/Scarab/python/version_pybind.hh b/Src/Scarab/python/version_pybind.hh
new file mode 100644
index 0000000..05486dd
--- /dev/null
+++ b/Src/Scarab/python/version_pybind.hh
@@ -0,0 +1,57 @@
+#ifndef VERSION_PYBIND_HH_
+#define VERSION_PYBIND_HH_
+
+#include "version_semantic.hh"
+
+#include "pybind11/pybind11.h"
+
+namespace scarab_pybind
+{
+
+    std::list< std::string > export_version( pybind11::module& mod )
+    {
+        std::list< std::string > all_items;
+
+        all_items.push_back( "VersionSemantic" );
+        pybind11::class_< scarab::version_semantic, std::shared_ptr< scarab::version_semantic > >( mod, "VersionSemantic", "data structure for representing semantic version information" )
+            .def( pybind11::init<>() )
+            .def( pybind11::init< unsigned, unsigned, unsigned >(),
+                    pybind11::arg( "major"),
+                    pybind11::arg( "minor"),
+                    pybind11::arg( "patch"))
+            .def( pybind11::init< const scarab::version_semantic& >() )
+
+            .def( "__eq__", &scarab::version_semantic::operator== )
+            .def( "__lt__", &scarab::version_semantic::operator< )
+            .def( "__gt__", &scarab::version_semantic::operator> )
+
+            .def_property_readonly( "major_version", &scarab::version_semantic::major_version )
+            .def_property_readonly( "minor_version", &scarab::version_semantic::minor_version )
+            .def_property_readonly( "patch_version", &scarab::version_semantic::patch_version )
+            .def_property_readonly( "version", &scarab::version_semantic::version_str )
+
+            .def_property( "package", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::package,
+                           [](scarab::version_semantic& an_obj, const std::string& a_package ) {an_obj.package() = a_package; } )
+            .def_property( "commit", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::commit,
+                           [](scarab::version_semantic& an_obj, const std::string& a_commit ) {an_obj.commit() = a_commit; } )
+
+            .def_property( "exe_name", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::exe_name,
+                           [](scarab::version_semantic& an_obj, const std::string& an_exe ) {an_obj.exe_name() = an_exe; } )
+            .def_property( "hostname", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::hostname,
+                           [](scarab::version_semantic& an_obj, const std::string& a_hostname ) {an_obj.hostname() = a_hostname; } )
+            .def_property( "username", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::username,
+                           [](scarab::version_semantic& an_obj, const std::string& a_username ) {an_obj.username() = a_username; } )
+
+            .def_property_readonly( "version_info", &scarab::version_semantic::version_info_string )
+
+            .def( "parse", &scarab::version_semantic::parse, "parse a version string into this object" )
+            .def( "combine", &scarab::version_semantic::combine, pybind11::arg( "major" ), pybind11::arg( "minor" ), pybind11::arg( "patch" ), "combine integer represetnations of major, minor, and patch into object")
+            .def( "update_exe_host_user", &scarab::version_semantic::update_exe_host_user, "attempt to determine execution properties: executable name, username, hostname" )
+        ;
+
+        return all_items;
+    }
+
+} /* namespace scarab_pybind */
+
+#endif /* VERSION_PYBIND_HH_ */
diff --git a/Src/Scarab/testing/CMakeLists.txt b/Src/Scarab/testing/CMakeLists.txt
new file mode 100644
index 0000000..232da5a
--- /dev/null
+++ b/Src/Scarab/testing/CMakeLists.txt
@@ -0,0 +1,93 @@
+# CMakeLists.txt for scarab/testing
+# Author: N.S. Oblath
+# Created: Jul 7, 2020
+
+##########
+
+set( testing_HEADERS
+    stream_check.hh
+    test_member_variables.hh
+)
+
+pbuilder_install_headers( ${testing_HEADERS} )
+
+    configure_file( 
+        ${CMAKE_CURRENT_SOURCE_DIR}/test_path.cc.in 
+        ${CMAKE_CURRENT_BINARY_DIR}/test_path.cc 
+        @ONLY
+    )
+
+    set( testing_SOURCES
+        use_catch.cc
+        stream_check.cc
+        test_digital.cc
+        test_exponential_backoff.cc
+        test_logger.cc
+        test_member_variables.cc
+        test_signal_handler.cc
+        test_time.cc
+        test_verbosity.cc
+        ${CMAKE_CURRENT_BINARY_DIR}/test_path.cc 
+    )
+
+    if( Scarab_BUILD_PARAM )
+        set( testing_SOURCES
+            ${testing_SOURCES}
+            test_param_array.cc
+            test_param_by_pointer.cc
+            test_param_node.cc
+            test_param_translator.cc
+            test_param_value.cc
+        )
+    endif( Scarab_BUILD_PARAM )
+
+    if( Scarab_BUILD_CODEC_JSON )
+        set( testing_SOURCES
+            ${testing_SOURCES}
+            test_json.cc
+        )
+    endif( Scarab_BUILD_CODEC_JSON )
+    
+    if( Scarab_BUILD_CODEC_YAML )
+        set( testing_SOURCES
+            ${testing_SOURCES}
+            test_yaml.cc
+        )
+    endif( Scarab_BUILD_CODEC_YAML )
+
+    if( Scarab_BUILD_CLI )
+        set( testing_SOURCES
+            ${testing_SOURCES}
+            test_nonoption_parser.cc
+        )
+    endif( Scarab_BUILD_CLI )
+
+
+set( testing_LIB_DEPENDENCIES 
+    Scarab
+    Catch
+)
+
+# Interface library was recommended for Catch:
+# https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
+add_library( Catch INTERFACE )
+target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/catch )
+
+add_executable( run_tests ${testing_SOURCES} )
+target_link_libraries( run_tests PUBLIC ${testing_LIB_DEPENDENCIES} )
+
+if( Scarab_BUILD_CLI )
+    add_subdirectory( applications )
+endif( Scarab_BUILD_CLI )
+
+# So far it seems sufficient to use Catch2's ability to run tests, and not CTest.
+# Here are two ways it could potentially be integrated with CTest, if we change our minds.
+
+# Normal CMake Integration
+#enable_testing()
+add_test(NAME unit_tests COMMAND run_tests )
+
+# Automated CMake Integration
+#include(CTest)
+#include(Catch)
+#catch_discover_tests(foo) 
\ No newline at end of file
diff --git a/Src/Scarab/testing/Doxyfile b/Src/Scarab/testing/Doxyfile
new file mode 100644
index 0000000..af49bc3
--- /dev/null
+++ b/Src/Scarab/testing/Doxyfile
@@ -0,0 +1,1534 @@
+# Doxyfile 1.5.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME = Scarab_Test
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER = 0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Scarab Test"
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+PROJECT_LOGO           =  
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY = ./user_doxygen_out
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING = 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS = YES
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST = YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+#
+INPUT = . 
+
+
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py *.f90 *.f *.vhd *.vhdl
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE = $(DOXYGEN_EXCLUDE)
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX = KT
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET = 
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION = 
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
+
+GENERATE_TREEVIEW = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = YES
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the
+# mathjax.org site, so you can quickly see the result without installing
+# MathJax, but it is strongly recommended to install a local copy of MathJax
+# before deployment.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+# names that should be enabled during MathJax rendering.
+
+MATHJAX_EXTENSIONS     =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX = YES
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH =  ../cli ../logger ../param ../utility
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT = YES
+
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME = 
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH = 
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH = NO
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH = NO
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif 
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH = 2
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP = YES
+
+#---------------------------------------------------------------------------
+# Options related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE = YES
diff --git a/Src/Scarab/testing/README.md b/Src/Scarab/testing/README.md
new file mode 100644
index 0000000..b2c6b94
--- /dev/null
+++ b/Src/Scarab/testing/README.md
@@ -0,0 +1,67 @@
+# README for scarab/testing
+
+## C++
+
+### Catch2
+
+Scarab uses the Catch2 testing framework for unit tests.  See these links for more information:
+
+* [Main GitHub page](https://github.com/catchorg/Catch2)
+* [Tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md)
+
+### Building tests
+
+In CMake, enable the option `Scarab_ENABLE_TESTING`, and build.
+
+The testing executable, `run_tests`, will be installed in `testing/`.
+
+### Running tests
+
+To see the available options for running tests, you can do:
+
+```
+> testing/run_tests -h
+```
+
+To simply run all of the tests, you can do:
+
+```
+> testing/run_tests
+```
+
+Or if you want to run a specific test, you can do:
+
+```
+> testing/run_tests [name]
+```
+
+For further documentation on using Catch2, see the [tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md)
+
+## Applications
+
+Four example applications are included in the `applications` directory, demonstrating different ways in which the CLI portion of the library can be used:
+
+* test_app_with_callback
+* test_app_with_options
+* test_app_with_subcommands
+* test_basic_application
+
+To build these examples, ensure that the CMake flags `Scarab_ENABLE_TESTING` AND `Scarab_BUILD_CLI` are set to `TRUE`.
+
+## Package Builder
+
+Tests of the package builder framework are included in the `package_builder` directory, in these subdirectories:
+
+* NestedPBTest
+* PBTest
+
+## Doxygen Documentation
+
+A Doxygen configuration file has been included in the `testing` directory to allow testing of Doxygen documentation generation.
+
+To use:
+
+1. Enter into the `testing` source directory
+1. Run `doxygen Doxyfile`
+1. Open `testing/user_doxygen_out/html/index.html` in a web browser
+1. When finished, remember to delete `testing/user_doxygen_out` so that it doesn't get committed to the repo
diff --git a/Src/Scarab/testing/applications/CMakeLists.txt b/Src/Scarab/testing/applications/CMakeLists.txt
new file mode 100644
index 0000000..1319a60
--- /dev/null
+++ b/Src/Scarab/testing/applications/CMakeLists.txt
@@ -0,0 +1,36 @@
+# CMakeLists.txt for Scarab/testing/applications
+# Author: N. Oblath
+# Created: Jan 4, 2016
+
+set( testing_applications_SOURCES
+    test_app_with_callback.cc
+    test_app_with_options.cc
+    test_app_with_subcommands.cc
+    test_basic_application.cc
+    test_raise_sigabrt.cc
+    test_raise_sigint.cc
+    test_raise_sigquit.cc
+    test_raise_sigterm.cc
+    test_unhandled_exception.cc
+)
+
+pbuilder_executables( SOURCES ${testing_applications_SOURCES}
+        TARGETS_VAR programs
+        PROJECT_LIBRARIES ${testing_LIB_DEPENDENCIES}
+        )
+
+if( Scarab_ENABLE_TESTING )
+    add_test( NAME app_with_callback COMMAND test_app_with_callback WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME app_with_options COMMAND test_app_with_options -f 5 -s "hello" -t "world" WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME app_with_subcommands_get COMMAND test_app_with_subcommands get WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME app_with_subcommands_set COMMAND test_app_with_subcommands set value=10 WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME basic_application COMMAND test_basic_application WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME raise_sigabrt COMMAND test_raise_sigabrt WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME raise_sigint COMMAND test_raise_sigint WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME raise_sigquit COMMAND test_raise_sigquit WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME raise_sigterm COMMAND test_raise_sigterm WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+    add_test( NAME unhandled_exception COMMAND test_unhandled_exception WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
+
+    set_tests_properties( unhandled_exception PROPERTIES WILL_FAIL TRUE )
+endif()
+
diff --git a/Src/Scarab/testing/applications/test_app_with_callback.cc b/Src/Scarab/testing/applications/test_app_with_callback.cc
new file mode 100644
index 0000000..697285a
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_app_with_callback.cc
@@ -0,0 +1,85 @@
+/*
+ * test_app_with_callback.cc
+ *
+ *  Created on: Jul 24, 2018
+ *      Author: N.S. Oblath
+ *  Output examples:
+ *
+> bin/test_app_with_callback
+2018-07-24 11:40:07 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
+
+{
+}
+
+2018-07-24 11:40:07 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
+
+[
+]
+
+2018-07-24 11:40:07 [ PROG] (tid 0x7fff9c9dc380) with_callback.cc(27): My value is: 5
+
+
+> bin/test_app_with_callback value=10
+
+2018-07-24 11:40:49 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
+
+{
+    value : 10
+}
+
+2018-07-24 11:40:49 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
+
+[
+]
+
+2018-07-24 11:40:49 [ PROG] (tid 0x7fff9c9dc380) with_callback.cc(27): My value is: 10
+ *
+ */
+
+#include "application.hh"
+
+#include "logger.hh"
+
+LOGGER( testlog, "test_app_with_callback" );
+
+namespace scarab
+{
+    struct do_a_thing
+    {
+        do_a_thing() : f_value( 5 ) {}
+
+        void execute( const main_app& an_app )
+        {
+            // configure to run
+            f_value = an_app.primary_config().get_value( "value", f_value );
+
+            // do a thing!
+            LPROG( testlog, "My value is: " << f_value );
+
+            return;
+        }
+
+        int f_value;
+    };
+}
+
+
+using namespace scarab;
+
+int main( int argc, char **argv )
+{
+    main_app the_main;
+
+    auto t_dat_callback = [&](){
+        do_a_thing t_dat;
+        t_dat.execute( the_main );
+    };
+
+    the_main.callback( t_dat_callback );
+
+    CLI11_PARSE( the_main, argc, argv );
+
+    return 0;
+}
+
+
diff --git a/Src/Scarab/testing/applications/test_app_with_options.cc b/Src/Scarab/testing/applications/test_app_with_options.cc
new file mode 100644
index 0000000..267b20e
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_app_with_options.cc
@@ -0,0 +1,76 @@
+/*
+ * test_app_with_options.cc
+ *
+ *  Created on: Oct 28, 2018
+ *      Author: N.S. Oblath
+ *
+ *  Output examples:
+ *
+    > bin/test_app_with_options -f 5 -s "hello" -t "world"
+    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) i/application.cc(97): Final configuration:
+
+    {
+        third-value : world
+    }
+
+    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) i/application.cc(98): Ordered args:
+
+    [
+    ]
+
+    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) _with_options.cc(69): First value: 5
+    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) _with_options.cc(70): Second value: hello
+    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) _with_options.cc(71): Third value: world
+ *
+ */
+
+#include "application.hh"
+
+#include "logger.hh"
+
+using namespace scarab;
+
+LOGGER( testlog, "test_app_with_options" );
+
+class test_app : public main_app
+{
+    public:
+        test_app(bool a_use_config = true) :
+            main_app(a_use_config),
+            f_first_value(),
+            f_second_value()
+        {
+            // Add an option that sets the value directly
+            add_option("-f,--first-value", f_first_value, "Set the first value" );
+
+            // Add an option that sets the value via callback
+            add_option( "-s,--second-value", [this](std::vector< std::string > args) { f_second_value = args[0]; return true; }, "Set the second value" );
+
+            // Add an option that sets the value into the configuration via callback
+            add_option( "-t,--third-value", [this](std::vector< std::string > args) { f_primary_config.add( "third-value", args[0] ); return true; }, "Set the third value" );
+        }
+        virtual ~test_app() {}
+
+        void set_first_value( int a_value ) { f_first_value = a_value; }
+        int get_first_value() { return f_first_value; }
+
+        const std::string& second_value() const { return f_second_value; }
+        std::string& second_value() { return f_second_value; }
+
+    private:
+        int f_first_value;
+        std::string f_second_value;
+};
+
+int main( int argc, char **argv )
+{
+    test_app the_main( false ); // boolean option is for skipping use of a config file
+
+    CLI11_PARSE( the_main, argc, argv );
+
+    LPROG( testlog, "First value: " << the_main.get_first_value() );
+    LPROG( testlog, "Second value: " << the_main.second_value() );
+    LPROG( testlog, "Third value: " << the_main.primary_config()["third-value"]() );
+
+    return 0;
+}
diff --git a/Src/Scarab/testing/applications/test_app_with_subcommands.cc b/Src/Scarab/testing/applications/test_app_with_subcommands.cc
new file mode 100644
index 0000000..cc7ebe9
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_app_with_subcommands.cc
@@ -0,0 +1,102 @@
+/*
+ * test_app_with_subcommands.cc
+ *
+ *  Created on: Jul 24, 2018
+ *      Author: N.S. Oblath
+ *  Output examples:
+ *
+> bin/test_app_with_subcommands
+
+A subcommand is required
+Run with --help for more information.
+
+
+> bin/test_app_with_subcommands get
+
+2018-07-24 14:06:45 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
+
+{
+}
+
+2018-07-24 14:06:45 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
+
+[
+]
+
+2018-07-24 14:06:45 [ PROG] (tid 0x7fff9c9dc380) h_subcommands.cc(65): Value is: 5
+
+
+> bin/test_app_with_subcommands set value=10
+
+2018-07-24 14:06:59 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
+
+{
+    value : 10
+}
+
+2018-07-24 14:06:59 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
+
+[
+]
+
+2018-07-24 14:06:59 [ PROG] (tid 0x7fff9c9dc380) h_subcommands.cc(72): Just to check: 10
+
+ *
+ */
+
+#include "application.hh"
+
+#include "logger.hh"
+
+LOGGER( testlog, "test_app_with_subcommands" );
+
+namespace scarab
+{
+    struct get_or_set
+    {
+        get_or_set() : f_value( 5 ) {}
+
+        void setup_subcommands( main_app& an_app )
+        {
+            app* t_sc_get = an_app.add_subcommand( "get", "Get the value" );
+            t_sc_get->callback([this]() { this->get(); } );
+
+            app* t_sc_set = an_app.add_subcommand( "set", "Set the value" );
+            t_sc_set->callback([&an_app, this]() { this->set( an_app ); } );
+
+            return;
+        }
+
+        void get()
+        {
+            LPROG( testlog, "Value is: " << f_value );
+            return;
+        }
+
+        void set( const main_app& an_app )
+        {
+            f_value = an_app.primary_config().get_value( "value", f_value );
+            LPROG( testlog, "Just to check: " << f_value );
+            return;
+        }
+
+        int f_value;
+    };
+}
+
+
+using namespace scarab;
+
+int main( int argc, char **argv )
+{
+    main_app the_main;
+    the_main.require_subcommand();
+    the_main.fallthrough();
+
+    get_or_set t_gos;
+    t_gos.setup_subcommands( the_main );
+
+    CLI11_PARSE( the_main, argc, argv );
+
+    return 0;
+}
diff --git a/Src/Scarab/testing/applications/test_basic_application.cc b/Src/Scarab/testing/applications/test_basic_application.cc
new file mode 100644
index 0000000..1e5b853
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_basic_application.cc
@@ -0,0 +1,56 @@
+/*
+ * test_basic_application.cc
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ *
+ *  Output examples:
+ *
+> bin/test_basic_application -v
+
+2018-07-23 23:25:17 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(36):
+Executable: "test_basic_application"
+Location: "/Users/obla999/Work/Project8/Software/scarab/library/build-cli-debug/bin"
+Built with Scarab version 2.2.0
+Git commit: 44d2aecaa570180d24cb3b5a2a2a64c792c10059
+
+> bin/test_basic_application -h
+
+Usage: bin/test_basic_application [OPTIONS]
+
+Options:
+  -h,--help                   Print this help message and exit
+  -c,--config FILE            Config file filename
+  --verbosity UINT            Global logger verosity
+  -v,--version                Print the version message and exit
+
+> bin/test_basic_application test=teststr test-ordered
+
+2018-07-24 08:54:26 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(122): Final configuration:
+
+{
+    test : teststr
+}
+
+2018-07-24 08:54:26 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(123): Ordered args:
+
+[
+    test-ordered
+]
+
+ *
+ */
+
+#include "application.hh"
+
+using namespace scarab;
+
+int main( int argc, char **argv )
+{
+    main_app the_main( false );
+
+    CLI11_PARSE( the_main, argc, argv );
+
+    return 0;
+}
+
diff --git a/Src/Scarab/testing/applications/test_raise_sigabrt.cc b/Src/Scarab/testing/applications/test_raise_sigabrt.cc
new file mode 100644
index 0000000..ab261e9
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_raise_sigabrt.cc
@@ -0,0 +1,49 @@
+/*
+ * test_raise_sigabrt.cc
+ *
+ *  Created on: Jul 20, 2020
+ *      Author: N.S. Oblath
+ * 
+ *  Use: 
+ *    > bin/test_raise_sigabrt
+ * 
+ *  The signal should be caught and the application exit cleanly.
+ *  Since this is an error signal, a stack trace should be displayed.
+ * 
+ *  Example output (irrelevant lines removed):
+ * 
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(78): Handling SIGTERM
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
+ * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(187): Handling termination due to an error condition; signal <6>
+ * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(254): Backtrace from terminate() returned 9 frames
+ * 
+ * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(263): Backtrace:
+ * [bt]: (0) 0   libScarab.dylib                     0x000000010233afca _ZN6scarab14signal_handler17print_stack_traceEv + 42
+ * [bt]: (1) 1   libScarab.dylib                     0x000000010233aa34 _ZN6scarab14signal_handler9terminateEi + 68
+ * [bt]: (2) 2   libScarab.dylib                     0x0000000102339bc2 _ZN6scarab14signal_handler22handle_terminate_errorEi + 434
+ * [bt]: (3) 3   libsystem_platform.dylib            0x00007fff7300ab5d _sigtramp + 29
+ * [bt]: (4) 4   ???                                 0x000000010dbbcf50 0x0 + 4525379408
+ * [bt]: (5) 5   libsystem_c.dylib                   0x00007fff72e77d8a raise + 26
+ * [bt]: (6) 6   test_raise_sigterm                  0x0000000102326f80 main + 32
+ * [bt]: (7) 7   libdyld.dylib                       0x00007fff72e1f3d5 start + 1
+ * [bt]: (8) 8   ???                                 0x0000000000000001 0x0 + 1
+ * 
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(273): Canceling all cancelables
+ * 
+ */
+
+#include "signal_handler.hh"
+
+
+#include <signal.h>
+
+
+int main(int , char ** )
+{
+    scarab::signal_handler t_handler;
+    
+    raise( SIGABRT );
+
+    return( EXIT_SUCCESS );
+}
diff --git a/Src/Scarab/testing/applications/test_raise_sigint.cc b/Src/Scarab/testing/applications/test_raise_sigint.cc
new file mode 100644
index 0000000..e5c1795
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_raise_sigint.cc
@@ -0,0 +1,36 @@
+/*
+ * test_raise_sigint.cc
+ *
+ *  Created on: Jul 20, 2020
+ *      Author: N.S. Oblath
+ * 
+ *  Use: 
+ *    > bin/test_raise_sigint
+ * 
+ *  The signal should be caught and the application exit cleanly.
+ * 
+ *  Example output (irrelevant lines removed):
+ * 
+ * ➜  build-sighandler-debug git:(scarab3/feature/termination) ✗ bin/test_raise_sigint       
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(78): Handling SIGTERM
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
+ * 2020-07-20 14:35:30 [ PROG] (tid 0x1098eb5c0) ignal_handler.cc(195): Handling termination; signal <2>
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(273): Canceling all cancelables
+ * 
+ */
+
+#include "signal_handler.hh"
+
+
+#include <signal.h>
+
+
+int main(int , char ** )
+{
+    scarab::signal_handler t_handler;
+
+    raise( SIGINT );
+
+    return( EXIT_SUCCESS );
+}
diff --git a/Src/Scarab/testing/applications/test_raise_sigquit.cc b/Src/Scarab/testing/applications/test_raise_sigquit.cc
new file mode 100644
index 0000000..27aeb97
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_raise_sigquit.cc
@@ -0,0 +1,36 @@
+/*
+ * test_raise_sigquit.cc
+ *
+ *  Created on: Jul 20, 2020
+ *      Author: N.S. Oblath
+ * 
+ *  Use: 
+ *    > bin/test_raise_sigquit
+ * 
+ *  The signal should be caught and the application exit cleanly.
+ * 
+ *  Example output (irrelevant lines removed):
+ * 
+ * ➜  build-sighandler-debug git:(scarab3/feature/termination) ✗ bin/test_raise_sigquit       
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(78): Handling SIGTERM
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
+ * 2020-07-20 14:35:30 [ PROG] (tid 0x1098eb5c0) ignal_handler.cc(195): Handling termination; signal <3>
+ * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(273): Canceling all cancelables
+ * 
+ */
+
+#include "signal_handler.hh"
+
+
+#include <signal.h>
+
+
+int main(int , char ** )
+{
+    scarab::signal_handler t_handler;
+
+    raise( SIGQUIT );
+
+    return( EXIT_SUCCESS );
+}
diff --git a/Src/Scarab/testing/applications/test_raise_sigterm.cc b/Src/Scarab/testing/applications/test_raise_sigterm.cc
new file mode 100644
index 0000000..8a1feaa
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_raise_sigterm.cc
@@ -0,0 +1,49 @@
+/*
+ * test_raise_sigterm.cc
+ *
+ *  Created on: Jul 20, 2020
+ *      Author: N.S. Oblath
+ * 
+ *  Use: 
+ *    > bin/test_raise_sigterm
+ * 
+ *  The signal should be caught and the application exit cleanly.
+ *  Since this is an error signal, a stack trace should be displayed.
+ * 
+ *  Example output (irrelevant lines removed):
+ * 
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(78): Handling SIGTERM
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
+ * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(187): Handling termination due to an error condition; signal <15>
+ * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(254): Backtrace from terminate() returned 9 frames
+ * 
+ * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(263): Backtrace:
+ * [bt]: (0) 0   libScarab.dylib                     0x000000010233afca _ZN6scarab14signal_handler17print_stack_traceEv + 42
+ * [bt]: (1) 1   libScarab.dylib                     0x000000010233aa34 _ZN6scarab14signal_handler9terminateEi + 68
+ * [bt]: (2) 2   libScarab.dylib                     0x0000000102339bc2 _ZN6scarab14signal_handler22handle_terminate_errorEi + 434
+ * [bt]: (3) 3   libsystem_platform.dylib            0x00007fff7300ab5d _sigtramp + 29
+ * [bt]: (4) 4   ???                                 0x000000010dbbcf50 0x0 + 4525379408
+ * [bt]: (5) 5   libsystem_c.dylib                   0x00007fff72e77d8a raise + 26
+ * [bt]: (6) 6   test_raise_sigterm                  0x0000000102326f80 main + 32
+ * [bt]: (7) 7   libdyld.dylib                       0x00007fff72e1f3d5 start + 1
+ * [bt]: (8) 8   ???                                 0x0000000000000001 0x0 + 1
+ * 
+ * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(273): Canceling all cancelables
+ * 
+ */
+
+#include "signal_handler.hh"
+
+
+#include <signal.h>
+
+
+int main(int , char ** )
+{
+    scarab::signal_handler t_handler;
+
+    raise( SIGTERM );
+
+    return( EXIT_SUCCESS );
+}
diff --git a/Src/Scarab/testing/applications/test_unhandled_exception.cc b/Src/Scarab/testing/applications/test_unhandled_exception.cc
new file mode 100644
index 0000000..0dd6f45
--- /dev/null
+++ b/Src/Scarab/testing/applications/test_unhandled_exception.cc
@@ -0,0 +1,52 @@
+/*
+ * test_unhandled_exception.cc
+ *
+ *  Created on: May 23, 2017
+ *      Author: N.S. Oblath
+ * 
+ *  Use: 
+ *    > bin/terminate
+ * 
+ *  The unhandled exception should result in terminate() being called.
+ *  The exception should be printed, and a stack trace displayed.
+ */
+
+#include "signal_handler.hh"
+
+#include "logger.hh"
+
+LOGGER( slog, "test_unhandled_exception" );
+
+namespace scarab
+{
+    int throw_exception()
+    {
+        // throw an unhandled runtime error
+        throw std::runtime_error("RUNTIME ERROR!");
+        return 0;
+    }
+
+    int foo2()
+    {
+        throw_exception();
+        return 0;
+    }
+
+    int foo1()
+    {
+        foo2();
+        return 0;
+    }
+}
+
+int main(int , char ** )
+{
+    scarab::signal_handler t_handler;
+
+    // cause the unhandled exception to be thrown, which should exit immediately
+    scarab::foo1();
+
+    LERROR( slog, "This should never print" );
+
+    return( EXIT_SUCCESS );
+}
diff --git a/Src/Scarab/testing/catch/catch.hpp b/Src/Scarab/testing/catch/catch.hpp
new file mode 100644
index 0000000..b066b71
--- /dev/null
+++ b/Src/Scarab/testing/catch/catch.hpp
@@ -0,0 +1,17758 @@
+/*
+ *  Catch v2.12.4
+ *  Generated: 2020-07-05 11:47:18.451282
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+// start catch.hpp
+
+
+#define CATCH_VERSION_MAJOR 2
+#define CATCH_VERSION_MINOR 12
+#define CATCH_VERSION_PATCH 4
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// start catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+     // Because REQUIREs trigger GCC's -Wparentheses, and because still
+     // supported version of g++ have only buggy support for _Pragmas,
+     // Wparentheses have to be suppressed globally.
+#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
+
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+// end catch_suppress_warnings.h
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#  define CATCH_CONFIG_ALL_PARTS
+#endif
+
+// In the impl file, we want to have access to all parts of the headers
+// Can also be used to sanely support PCHs
+#if defined(CATCH_CONFIG_ALL_PARTS)
+#  define CATCH_CONFIG_EXTERNAL_INTERFACES
+#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#    undef CATCH_CONFIG_DISABLE_MATCHERS
+#  endif
+#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  endif
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+// start catch_platform.h
+
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_OSX == 1
+#  define CATCH_PLATFORM_MAC
+# elif TARGET_OS_IPHONE == 1
+#  define CATCH_PLATFORM_IPHONE
+# endif
+
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
+#  define CATCH_PLATFORM_WINDOWS
+#endif
+
+// end catch_platform.h
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// start catch_user_interfaces.h
+
+namespace Catch {
+    unsigned int rngSeed();
+}
+
+// end catch_user_interfaces.h
+// start catch_tag_alias_autoregistrar.h
+
+// start catch_common.h
+
+// start catch_compiler_capabilities.h
+
+// Detect a number of compiler features - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+#ifdef __cplusplus
+
+#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
+#    define CATCH_CPP17_OR_GREATER
+#  endif
+
+#endif
+
+#if defined(__cpp_lib_uncaught_exceptions)
+#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+// We have to avoid both ICC and Clang, because they try to mask themselves
+// as gcc, and we want only GCC in this block
+#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC)
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
+
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
+
+#endif
+
+#if defined(__clang__)
+
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
+
+// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
+// which results in calls to destructors being emitted for each temporary,
+// without a matching initialization. In practice, this can result in something
+// like `std::string::~string` being called on an uninitialized value.
+//
+// For example, this code will likely segfault under IBM XL:
+// ```
+// REQUIRE(std::string("12") + "34" == "1234")
+// ```
+//
+// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
+#  if !defined(__ibmxl__)
+#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
+#  endif
+
+#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
+         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
+
+#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
+
+#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// Assume that non-Windows platforms support posix signals by default
+#if !defined(CATCH_PLATFORM_WINDOWS)
+    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
+    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Android somehow still does not support std::to_string
+#if defined(__ANDROID__)
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Not all Windows environments support SEH properly
+#if defined(__MINGW32__)
+#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// PS4
+#if defined(__ORBIS__)
+#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
+// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
+# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
+           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
+
+#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
+
+# endif
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#if defined(_MSC_VER)
+
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
+
+#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
+#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#  endif
+
+// Universal Windows platform does not support SEH
+// Or console colours (or console at all...)
+#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
+#    define CATCH_CONFIG_COLOUR_NONE
+#  else
+#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+#  endif
+
+// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
+// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
+// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
+#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#    endif // MSVC_TRADITIONAL
+#  endif // __clang__
+
+#endif // _MSC_VER
+
+#if defined(_REENTRANT) || defined(_MSC_VER)
+// Enable async processing, as -pthread is specified or no additional linking is required
+# define CATCH_INTERNAL_CONFIG_USE_ASYNC
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// Check if we are compiled with -fno-exceptions or equivalent
+#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
+#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// DJGPP
+#ifdef __DJGPP__
+#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
+#endif // __DJGPP__
+
+////////////////////////////////////////////////////////////////////////////////
+// Embarcadero C++Build
+#if defined(__BORLANDC__)
+    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use of __COUNTER__ is suppressed during code analysis in
+// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
+// handled by it.
+// Otherwise all supported compilers support COUNTER macro,
+// but user still might want to turn it off
+#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
+#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Various stdlib support checks that require __has_include
+#if defined(__has_include)
+  // Check if string_view is available and usable
+  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
+  #endif
+
+  // Check if optional is available and usable
+  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
+  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if byte is available and usable
+  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+  #    define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+
+  // Check if variant is available and usable
+  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+  #    if defined(__clang__) && (__clang_major__ < 8)
+         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
+         // fix should be in clang 8, workaround in libstdc++ 8.2
+  #      include <ciso646>
+  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #        define CATCH_CONFIG_NO_CPP17_VARIANT
+  #      else
+  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
+  #    else
+  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
+  #    endif // defined(__clang__) && (__clang_major__ < 8)
+  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // defined(__has_include)
+
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
+#   define CATCH_CONFIG_WCHAR
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
+#    define CATCH_CONFIG_CPP11_TO_STRING
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#  define CATCH_CONFIG_CPP17_OPTIONAL
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
+#  define CATCH_CONFIG_CPP17_STRING_VIEW
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
+#  define CATCH_CONFIG_CPP17_VARIANT
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
+#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
+#  define CATCH_CONFIG_NEW_CAPTURE
+#endif
+
+#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+#  define CATCH_CONFIG_POLYFILL_ISNAN
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#  define CATCH_CONFIG_USE_ASYNC
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#  define CATCH_CONFIG_ANDROID_LOGWRITE
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
+#endif
+
+// Even if we do not think the compiler has that warning, we still have
+// to provide a macro that can be used by the code.
+#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
+#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
+#endif
+
+// The goal of this macro is to avoid evaluation of the arguments, but
+// still have the compiler warn on problems inside...
+#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
+#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
+#endif
+
+#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#elif defined(__clang__) && (__clang_major__ < 5)
+#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
+#endif
+
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+#define CATCH_TRY if ((true))
+#define CATCH_CATCH_ALL if ((false))
+#define CATCH_CATCH_ANON(type) if ((false))
+#else
+#define CATCH_TRY try
+#define CATCH_CATCH_ALL catch (...)
+#define CATCH_CATCH_ANON(type) catch (type)
+#endif
+
+#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
+#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#endif
+
+// end catch_compiler_capabilities.h
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#include <iosfwd>
+#include <string>
+#include <cstdint>
+
+// We need a dummy global operator<< so we can bring it into Catch namespace later
+struct Catch_global_namespace_dummy {};
+std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
+
+namespace Catch {
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+
+    protected:
+        NonCopyable();
+        virtual ~NonCopyable();
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo() = delete;
+        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
+        :   file( _file ),
+            line( _line )
+        {}
+
+        SourceLineInfo( SourceLineInfo const& other )            = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
+        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
+        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
+
+        bool empty() const noexcept { return file[0] == '\0'; }
+        bool operator == ( SourceLineInfo const& other ) const noexcept;
+        bool operator < ( SourceLineInfo const& other ) const noexcept;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // Bring in operator<< from global namespace into Catch namespace
+    // This is necessary because the overload of operator<< above makes
+    // lookup stop at namespace Catch
+    using ::operator<<;
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() const;
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO \
+    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+
+// end catch_common.h
+namespace Catch {
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_tag_alias_autoregistrar.h
+// start catch_test_registry.h
+
+// start catch_interfaces_testcase.h
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestInvoker {
+        virtual void invoke () const = 0;
+        virtual ~ITestInvoker();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+// end catch_interfaces_testcase.h
+// start catch_stringref.h
+
+#include <cstddef>
+#include <string>
+#include <iosfwd>
+#include <cassert>
+
+namespace Catch {
+
+    /// A non-owning string class (similar to the forthcoming std::string_view)
+    /// Note that, because a StringRef may be a substring of another string,
+    /// it may not be null terminated.
+    class StringRef {
+    public:
+        using size_type = std::size_t;
+        using const_iterator = const char*;
+
+    private:
+        static constexpr char const* const s_empty = "";
+
+        char const* m_start = s_empty;
+        size_type m_size = 0;
+
+    public: // construction
+        constexpr StringRef() noexcept = default;
+
+        StringRef( char const* rawChars ) noexcept;
+
+        constexpr StringRef( char const* rawChars, size_type size ) noexcept
+        :   m_start( rawChars ),
+            m_size( size )
+        {}
+
+        StringRef( std::string const& stdString ) noexcept
+        :   m_start( stdString.c_str() ),
+            m_size( stdString.size() )
+        {}
+
+        explicit operator std::string() const {
+            return std::string(m_start, m_size);
+        }
+
+    public: // operators
+        auto operator == ( StringRef const& other ) const noexcept -> bool;
+        auto operator != (StringRef const& other) const noexcept -> bool {
+            return !(*this == other);
+        }
+
+        auto operator[] ( size_type index ) const noexcept -> char {
+            assert(index < m_size);
+            return m_start[index];
+        }
+
+    public: // named queries
+        constexpr auto empty() const noexcept -> bool {
+            return m_size == 0;
+        }
+        constexpr auto size() const noexcept -> size_type {
+            return m_size;
+        }
+
+        // Returns the current start pointer. If the StringRef is not
+        // null-terminated, throws std::domain_exception
+        auto c_str() const -> char const*;
+
+    public: // substrings and searches
+        // Returns a substring of [start, start + length).
+        // If start + length > size(), then the substring is [start, size()).
+        // If start > size(), then the substring is empty.
+        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
+
+        // Returns the current start pointer. May not be null-terminated.
+        auto data() const noexcept -> char const*;
+
+        constexpr auto isNullTerminated() const noexcept -> bool {
+            return m_start[m_size] == '\0';
+        }
+
+    public: // iterators
+        constexpr const_iterator begin() const { return m_start; }
+        constexpr const_iterator end() const { return m_start + m_size; }
+    };
+
+    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
+    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+
+    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+        return StringRef( rawChars, size );
+    }
+} // namespace Catch
+
+constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+    return Catch::StringRef( rawChars, size );
+}
+
+// end catch_stringref.h
+// start catch_preprocessor.hpp
+
+
+#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
+#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
+#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
+
+#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
+// MSVC needs more evaluations
+#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
+#else
+#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
+#endif
+
+#define CATCH_REC_END(...)
+#define CATCH_REC_OUT
+
+#define CATCH_EMPTY()
+#define CATCH_DEFER(id) id CATCH_EMPTY()
+
+#define CATCH_REC_GET_END2() 0, CATCH_REC_END
+#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
+#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
+#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
+#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
+#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
+
+#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
+
+#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
+
+// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
+// and passes userdata as the first parameter to each invocation,
+// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
+#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
+
+#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
+#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
+#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
+#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
+#else
+// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
+#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
+#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
+#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
+#endif
+
+#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
+#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
+
+#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
+#else
+#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
+#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
+#endif
+
+#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
+    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
+
+#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
+#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
+#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
+#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
+#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
+#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
+#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
+#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
+#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
+#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
+#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
+
+#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
+
+#define INTERNAL_CATCH_TYPE_GEN\
+    template<typename...> struct TypeList {};\
+    template<typename...Ts>\
+    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
+    template<template<typename...> class...> struct TemplateTypeList{};\
+    template<template<typename...> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
+    template<typename...>\
+    struct append;\
+    template<typename...>\
+    struct rewrap;\
+    template<template<typename...> class, typename...>\
+    struct create;\
+    template<template<typename...> class, typename>\
+    struct convert;\
+    \
+    template<typename T> \
+    struct append<T> { using type = T; };\
+    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
+    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
+    template< template<typename...> class L1, typename...E1, typename...Rest>\
+    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
+    \
+    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
+    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
+    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
+    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
+    \
+    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
+    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
+    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
+    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
+
+#define INTERNAL_CATCH_NTTP_1(signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
+    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
+    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
+    \
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
+    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
+    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
+    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
+    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    static void TestName()
+
+#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
+    template<typename Type>\
+    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
+    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
+    {\
+        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
+    template<typename TestType> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
+        void test();\
+    }
+
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
+    template<typename TestType> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
+    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
+    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define INTERNAL_CATCH_NTTP_0
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
+#else
+#define INTERNAL_CATCH_NTTP_0(signature)
+#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
+#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
+#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
+#endif
+
+// end catch_preprocessor.hpp
+// start catch_meta.hpp
+
+
+#include <type_traits>
+
+namespace Catch {
+    template<typename T>
+    struct always_false : std::false_type {};
+
+    template <typename> struct true_given : std::true_type {};
+    struct is_callable_tester {
+        template <typename Fun, typename... Args>
+        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
+        template <typename...>
+        std::false_type static test(...);
+    };
+
+    template <typename T>
+    struct is_callable;
+
+    template <typename Fun, typename... Args>
+    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
+
+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
+    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
+    // replaced with std::invoke_result here.
+    template <typename Func, typename... U>
+    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
+#else
+    // Keep ::type here because we still support C++11
+    template <typename Func, typename... U>
+    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
+#endif
+
+} // namespace Catch
+
+namespace mpl_{
+    struct na;
+}
+
+// end catch_meta.hpp
+namespace Catch {
+
+template<typename C>
+class TestInvokerAsMethod : public ITestInvoker {
+    void (C::*m_testAsMethod)();
+public:
+    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
+
+    void invoke() const override {
+        C obj;
+        (obj.*m_testAsMethod)();
+    }
+};
+
+auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
+
+template<typename C>
+auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
+    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
+}
+
+struct NameAndTags {
+    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
+    StringRef name;
+    StringRef tags;
+};
+
+struct AutoReg : NonCopyable {
+    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
+    ~AutoReg();
+};
+
+} // end namespace Catch
+
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
+        namespace{                        \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test();              \
+            };                            \
+        }                                 \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
+        namespace{                                                                                  \
+            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        }                                                                                           \
+        }                                                                                           \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+    #endif
+
+    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+    #else
+        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+    #endif
+#endif
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        namespace{ \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestName{\
+                TestName(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+            return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
+        template<typename TestType> static void TestFuncName();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
+            INTERNAL_CATCH_TYPE_GEN                                                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
+            template<typename... Types>                               \
+            struct TestName {                                         \
+                void reg_tests() {                                          \
+                    int index = 0;                                    \
+                    using expander = int[];                           \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */\
+                }                                                     \
+            };                                                        \
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }                                                             \
+        }                                                             \
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFuncName()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> static void TestFunc();       \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
+        INTERNAL_CATCH_TYPE_GEN\
+        template<typename... Types>                               \
+        struct TestName {                                         \
+            void reg_tests() {                                          \
+                int index = 0;                                    \
+                using expander = int[];                           \
+                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */\
+            }                                                     \
+        };\
+        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
+                using TestInit = typename convert<TestName, TmplList>::type; \
+                TestInit t;                                           \
+                t.reg_tests();                                        \
+                return 0;                                             \
+            }();                                                      \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
+        template<typename TestType>                                   \
+        static void TestFunc()
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
+
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
+            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types> \
+            struct TestNameClass{\
+                TestNameClass(){\
+                    int index = 0;                                    \
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
+                    using expander = int[];\
+                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
+                return 0;\
+        }();\
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+                void test();\
+            };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
+            INTERNAL_CATCH_TYPE_GEN                  \
+            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
+                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
+                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }\
+        }\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+#endif
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+#else
+    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+#endif
+
+    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
+        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
+        template<typename TestType> \
+        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
+            void test();\
+        };\
+        namespace {\
+        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
+            INTERNAL_CATCH_TYPE_GEN\
+            template<typename...Types>\
+            struct TestNameClass{\
+                void reg_tests(){\
+                    int index = 0;\
+                    using expander = int[];\
+                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */ \
+                }\
+            };\
+            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
+                using TestInit = typename convert<TestNameClass, TmplList>::type;\
+                TestInit t;\
+                t.reg_tests();\
+                return 0;\
+            }(); \
+        }}\
+        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        template<typename TestType> \
+        void TestName<TestType>::test()
+
+#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
+
+// end catch_test_registry.h
+// start catch_capture.hpp
+
+// start catch_assertionhandler.h
+
+// start catch_assertioninfo.h
+
+// start catch_result_type.h
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    bool isOk( ResultWas::OfType resultType );
+    bool isJustInfo( int flags );
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
+
+    bool shouldContinueOnFailure( int flags );
+    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    bool shouldSuppressFailure( int flags );
+
+} // end namespace Catch
+
+// end catch_result_type.h
+namespace Catch {
+
+    struct AssertionInfo
+    {
+        StringRef macroName;
+        SourceLineInfo lineInfo;
+        StringRef capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+
+        // We want to delete this constructor but a compiler bug in 4.8 means
+        // the struct is then treated as non-aggregate
+        //AssertionInfo() = delete;
+    };
+
+} // end namespace Catch
+
+// end catch_assertioninfo.h
+// start catch_decomposer.h
+
+// start catch_tostring.h
+
+#include <vector>
+#include <cstddef>
+#include <type_traits>
+#include <string>
+// start catch_stream.h
+
+#include <iosfwd>
+#include <cstddef>
+#include <ostream>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    class StringRef;
+
+    struct IStream {
+        virtual ~IStream();
+        virtual std::ostream& stream() const = 0;
+    };
+
+    auto makeStream( StringRef const &filename ) -> IStream const*;
+
+    class ReusableStringStream : NonCopyable {
+        std::size_t m_index;
+        std::ostream* m_oss;
+    public:
+        ReusableStringStream();
+        ~ReusableStringStream();
+
+        auto str() const -> std::string;
+
+        template<typename T>
+        auto operator << ( T const& value ) -> ReusableStringStream& {
+            *m_oss << value;
+            return *this;
+        }
+        auto get() -> std::ostream& { return *m_oss; }
+    };
+}
+
+// end catch_stream.h
+// start catch_interfaces_enum_values_registry.h
+
+#include <vector>
+
+namespace Catch {
+
+    namespace Detail {
+        struct EnumInfo {
+            StringRef m_name;
+            std::vector<std::pair<int, StringRef>> m_values;
+
+            ~EnumInfo();
+
+            StringRef lookup( int value ) const;
+        };
+    } // namespace Detail
+
+    struct IMutableEnumValuesRegistry {
+        virtual ~IMutableEnumValuesRegistry();
+
+        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
+
+        template<typename E>
+        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
+            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
+            std::vector<int> intValues;
+            intValues.reserve( values.size() );
+            for( auto enumValue : values )
+                intValues.push_back( static_cast<int>( enumValue ) );
+            return registerEnum( enumName, allEnums, intValues );
+        }
+    };
+
+} // Catch
+
+// end catch_interfaces_enum_values_registry.h
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+#include <string_view>
+#endif
+
+#ifdef __OBJC__
+// start catch_objc_arc.hpp
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+// end catch_objc_arc.hpp
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
+#endif
+
+namespace Catch {
+    namespace Detail {
+
+        extern const std::string unprintableString;
+
+        std::string rawMemoryToString( const void *object, std::size_t size );
+
+        template<typename T>
+        std::string rawMemoryToString( const T& object ) {
+          return rawMemoryToString( &object, sizeof(object) );
+        }
+
+        template<typename T>
+        class IsStreamInsertable {
+            template<typename Stream, typename U>
+            static auto test(int)
+                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
+
+            template<typename, typename>
+            static auto test(...)->std::false_type;
+
+        public:
+            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
+        };
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e );
+
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
+        std::string>::type convertUnstreamable( T const& ) {
+            return Detail::unprintableString;
+        }
+        template<typename T>
+        typename std::enable_if<
+            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
+         std::string>::type convertUnstreamable(T const& ex) {
+            return ex.what();
+        }
+
+        template<typename T>
+        typename std::enable_if<
+            std::is_enum<T>::value
+        , std::string>::type convertUnstreamable( T const& value ) {
+            return convertUnknownEnumToString( value );
+        }
+
+#if defined(_MANAGED)
+        //! Convert a CLR string to a utf8 std::string
+        template<typename T>
+        std::string clrReferenceToString( T^ ref ) {
+            if (ref == nullptr)
+                return std::string("null");
+            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
+            cli::pin_ptr<System::Byte> p = &bytes[0];
+            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
+        }
+#endif
+
+    } // namespace Detail
+
+    // If we decide for C++14, change these to enable_if_ts
+    template <typename T, typename = void>
+    struct StringMaker {
+        template <typename Fake = T>
+        static
+        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert(const Fake& value) {
+                ReusableStringStream rss;
+                // NB: call using the function-like syntax to avoid ambiguity with
+                // user-defined templated operator<< under clang.
+                rss.operator<<(value);
+                return rss.str();
+        }
+
+        template <typename Fake = T>
+        static
+        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
+            convert( const Fake& value ) {
+#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
+            return Detail::convertUnstreamable(value);
+#else
+            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
+#endif
+        }
+    };
+
+    namespace Detail {
+
+        // This function dispatches all stringification requests inside of Catch.
+        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
+        template <typename T>
+        std::string stringify(const T& e) {
+            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
+        }
+
+        template<typename E>
+        std::string convertUnknownEnumToString( E e ) {
+            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
+        }
+
+#if defined(_MANAGED)
+        template <typename T>
+        std::string stringify( T^ e ) {
+            return ::Catch::StringMaker<T^>::convert(e);
+        }
+#endif
+
+    } // namespace Detail
+
+    // Some predefined specializations
+
+    template<>
+    struct StringMaker<std::string> {
+        static std::string convert(const std::string& str);
+    };
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::string_view> {
+        static std::string convert(std::string_view str);
+    };
+#endif
+
+    template<>
+    struct StringMaker<char const *> {
+        static std::string convert(char const * str);
+    };
+    template<>
+    struct StringMaker<char *> {
+        static std::string convert(char * str);
+    };
+
+#ifdef CATCH_CONFIG_WCHAR
+    template<>
+    struct StringMaker<std::wstring> {
+        static std::string convert(const std::wstring& wstr);
+    };
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+    template<>
+    struct StringMaker<std::wstring_view> {
+        static std::string convert(std::wstring_view str);
+    };
+# endif
+
+    template<>
+    struct StringMaker<wchar_t const *> {
+        static std::string convert(wchar_t const * str);
+    };
+    template<>
+    struct StringMaker<wchar_t *> {
+        static std::string convert(wchar_t * str);
+    };
+#endif
+
+    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
+    //      while keeping string semantics?
+    template<int SZ>
+    struct StringMaker<char[SZ]> {
+        static std::string convert(char const* str) {
+            return ::Catch::Detail::stringify(std::string{ str });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<signed char[SZ]> {
+        static std::string convert(signed char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+    template<int SZ>
+    struct StringMaker<unsigned char[SZ]> {
+        static std::string convert(unsigned char const* str) {
+            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
+        }
+    };
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<int> {
+        static std::string convert(int value);
+    };
+    template<>
+    struct StringMaker<long> {
+        static std::string convert(long value);
+    };
+    template<>
+    struct StringMaker<long long> {
+        static std::string convert(long long value);
+    };
+    template<>
+    struct StringMaker<unsigned int> {
+        static std::string convert(unsigned int value);
+    };
+    template<>
+    struct StringMaker<unsigned long> {
+        static std::string convert(unsigned long value);
+    };
+    template<>
+    struct StringMaker<unsigned long long> {
+        static std::string convert(unsigned long long value);
+    };
+
+    template<>
+    struct StringMaker<bool> {
+        static std::string convert(bool b);
+    };
+
+    template<>
+    struct StringMaker<char> {
+        static std::string convert(char c);
+    };
+    template<>
+    struct StringMaker<signed char> {
+        static std::string convert(signed char c);
+    };
+    template<>
+    struct StringMaker<unsigned char> {
+        static std::string convert(unsigned char c);
+    };
+
+    template<>
+    struct StringMaker<std::nullptr_t> {
+        static std::string convert(std::nullptr_t);
+    };
+
+    template<>
+    struct StringMaker<float> {
+        static std::string convert(float value);
+        static int precision;
+    };
+
+    template<>
+    struct StringMaker<double> {
+        static std::string convert(double value);
+        static int precision;
+    };
+
+    template <typename T>
+    struct StringMaker<T*> {
+        template <typename U>
+        static std::string convert(U* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+    template <typename R, typename C>
+    struct StringMaker<R C::*> {
+        static std::string convert(R C::* p) {
+            if (p) {
+                return ::Catch::Detail::rawMemoryToString(p);
+            } else {
+                return "nullptr";
+            }
+        }
+    };
+
+#if defined(_MANAGED)
+    template <typename T>
+    struct StringMaker<T^> {
+        static std::string convert( T^ ref ) {
+            return ::Catch::Detail::clrReferenceToString(ref);
+        }
+    };
+#endif
+
+    namespace Detail {
+        template<typename InputIterator>
+        std::string rangeToString(InputIterator first, InputIterator last) {
+            ReusableStringStream rss;
+            rss << "{ ";
+            if (first != last) {
+                rss << ::Catch::Detail::stringify(*first);
+                for (++first; first != last; ++first)
+                    rss << ", " << ::Catch::Detail::stringify(*first);
+            }
+            rss << " }";
+            return rss.str();
+        }
+    }
+
+#ifdef __OBJC__
+    template<>
+    struct StringMaker<NSString*> {
+        static std::string convert(NSString * nsstring) {
+            if (!nsstring)
+                return "nil";
+            return std::string("@") + [nsstring UTF8String];
+        }
+    };
+    template<>
+    struct StringMaker<NSObject*> {
+        static std::string convert(NSObject* nsObject) {
+            return ::Catch::Detail::stringify([nsObject description]);
+        }
+
+    };
+    namespace Detail {
+        inline std::string stringify( NSString* nsstring ) {
+            return StringMaker<NSString*>::convert( nsstring );
+        }
+
+    } // namespace Detail
+#endif // __OBJC__
+
+} // namespace Catch
+
+//////////////////////////////////////////////////////
+// Separate std-lib types stringification, so it can be selectively enabled
+// This means that we do not bring in
+
+#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
+#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+#endif
+
+// Separate std::pair specialization
+#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
+#include <utility>
+namespace Catch {
+    template<typename T1, typename T2>
+    struct StringMaker<std::pair<T1, T2> > {
+        static std::string convert(const std::pair<T1, T2>& pair) {
+            ReusableStringStream rss;
+            rss << "{ "
+                << ::Catch::Detail::stringify(pair.first)
+                << ", "
+                << ::Catch::Detail::stringify(pair.second)
+                << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
+#include <optional>
+namespace Catch {
+    template<typename T>
+    struct StringMaker<std::optional<T> > {
+        static std::string convert(const std::optional<T>& optional) {
+            ReusableStringStream rss;
+            if (optional.has_value()) {
+                rss << ::Catch::Detail::stringify(*optional);
+            } else {
+                rss << "{ }";
+            }
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
+
+// Separate std::tuple specialization
+#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
+#include <tuple>
+namespace Catch {
+    namespace Detail {
+        template<
+            typename Tuple,
+            std::size_t N = 0,
+            bool = (N < std::tuple_size<Tuple>::value)
+            >
+            struct TupleElementPrinter {
+            static void print(const Tuple& tuple, std::ostream& os) {
+                os << (N ? ", " : " ")
+                    << ::Catch::Detail::stringify(std::get<N>(tuple));
+                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
+            }
+        };
+
+        template<
+            typename Tuple,
+            std::size_t N
+        >
+            struct TupleElementPrinter<Tuple, N, false> {
+            static void print(const Tuple&, std::ostream&) {}
+        };
+
+    }
+
+    template<typename ...Types>
+    struct StringMaker<std::tuple<Types...>> {
+        static std::string convert(const std::tuple<Types...>& tuple) {
+            ReusableStringStream rss;
+            rss << '{';
+            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
+            rss << " }";
+            return rss.str();
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
+
+#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
+#include <variant>
+namespace Catch {
+    template<>
+    struct StringMaker<std::monostate> {
+        static std::string convert(const std::monostate&) {
+            return "{ }";
+        }
+    };
+
+    template<typename... Elements>
+    struct StringMaker<std::variant<Elements...>> {
+        static std::string convert(const std::variant<Elements...>& variant) {
+            if (variant.valueless_by_exception()) {
+                return "{valueless variant}";
+            } else {
+                return std::visit(
+                    [](const auto& value) {
+                        return ::Catch::Detail::stringify(value);
+                    },
+                    variant
+                );
+            }
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
+
+namespace Catch {
+    // Import begin/ end from std here
+    using std::begin;
+    using std::end;
+
+    namespace detail {
+        template <typename...>
+        struct void_type {
+            using type = void;
+        };
+
+        template <typename T, typename = void>
+        struct is_range_impl : std::false_type {
+        };
+
+        template <typename T>
+        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
+        };
+    } // namespace detail
+
+    template <typename T>
+    struct is_range : detail::is_range_impl<T> {
+    };
+
+#if defined(_MANAGED) // Managed types are never ranges
+    template <typename T>
+    struct is_range<T^> {
+        static const bool value = false;
+    };
+#endif
+
+    template<typename Range>
+    std::string rangeToString( Range const& range ) {
+        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
+    }
+
+    // Handle vector<bool> specially
+    template<typename Allocator>
+    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
+        ReusableStringStream rss;
+        rss << "{ ";
+        bool first = true;
+        for( bool b : v ) {
+            if( first )
+                first = false;
+            else
+                rss << ", ";
+            rss << ::Catch::Detail::stringify( b );
+        }
+        rss << " }";
+        return rss.str();
+    }
+
+    template<typename R>
+    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
+        static std::string convert( R const& range ) {
+            return rangeToString( range );
+        }
+    };
+
+    template <typename T, int SZ>
+    struct StringMaker<T[SZ]> {
+        static std::string convert(T const(&arr)[SZ]) {
+            return rangeToString(arr);
+        }
+    };
+
+} // namespace Catch
+
+// Separate std::chrono::duration specialization
+#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#include <ctime>
+#include <ratio>
+#include <chrono>
+
+namespace Catch {
+
+template <class Ratio>
+struct ratio_string {
+    static std::string symbol();
+};
+
+template <class Ratio>
+std::string ratio_string<Ratio>::symbol() {
+    Catch::ReusableStringStream rss;
+    rss << '[' << Ratio::num << '/'
+        << Ratio::den << ']';
+    return rss.str();
+}
+template <>
+struct ratio_string<std::atto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::femto> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::pico> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::nano> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::micro> {
+    static std::string symbol();
+};
+template <>
+struct ratio_string<std::milli> {
+    static std::string symbol();
+};
+
+    ////////////
+    // std::chrono::duration specializations
+    template<typename Value, typename Ratio>
+    struct StringMaker<std::chrono::duration<Value, Ratio>> {
+        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " s";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " m";
+            return rss.str();
+        }
+    };
+    template<typename Value>
+    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
+        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
+            ReusableStringStream rss;
+            rss << duration.count() << " h";
+            return rss.str();
+        }
+    };
+
+    ////////////
+    // std::chrono::time_point specialization
+    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
+    template<typename Clock, typename Duration>
+    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
+        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
+            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
+        }
+    };
+    // std::chrono::time_point<system_clock> specialization
+    template<typename Duration>
+    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
+        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
+            auto converted = std::chrono::system_clock::to_time_t(time_point);
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &converted);
+#else
+            std::tm* timeInfo = std::gmtime(&converted);
+#endif
+
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+    };
+}
+#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+
+#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
+namespace Catch { \
+    template<> struct StringMaker<enumName> { \
+        static std::string convert( enumName value ) { \
+            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
+            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
+        } \
+    }; \
+}
+
+#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_tostring.h
+#include <iosfwd>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#pragma warning(disable:4180) // qualifier applied to function type has no meaning
+#pragma warning(disable:4800) // Forcing result to true or false
+#endif
+
+namespace Catch {
+
+    struct ITransientExpression {
+        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
+        auto getResult() const -> bool { return m_result; }
+        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
+
+        ITransientExpression( bool isBinaryExpression, bool result )
+        :   m_isBinaryExpression( isBinaryExpression ),
+            m_result( result )
+        {}
+
+        // We don't actually need a virtual destructor, but many static analysers
+        // complain if it's not here :-(
+        virtual ~ITransientExpression();
+
+        bool m_isBinaryExpression;
+        bool m_result;
+
+    };
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
+
+    template<typename LhsT, typename RhsT>
+    class BinaryExpr  : public ITransientExpression {
+        LhsT m_lhs;
+        StringRef m_op;
+        RhsT m_rhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            formatReconstructedExpression
+                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
+        }
+
+    public:
+        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
+        :   ITransientExpression{ true, comparisonResult },
+            m_lhs( lhs ),
+            m_op( op ),
+            m_rhs( rhs )
+        {}
+
+        template<typename T>
+        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename T>
+        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<T>::value,
+            "chained comparisons are not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+    };
+
+    template<typename LhsT>
+    class UnaryExpr : public ITransientExpression {
+        LhsT m_lhs;
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            os << Catch::Detail::stringify( m_lhs );
+        }
+
+    public:
+        explicit UnaryExpr( LhsT lhs )
+        :   ITransientExpression{ false, static_cast<bool>(lhs) },
+            m_lhs( lhs )
+        {}
+    };
+
+    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
+    template<typename LhsT, typename RhsT>
+    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+    template<typename T>
+    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
+
+    template<typename LhsT, typename RhsT>
+    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
+    template<typename T>
+    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+    template<typename T>
+    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
+
+    template<typename LhsT>
+    class ExprLhs {
+        LhsT m_lhs;
+    public:
+        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
+
+        template<typename RhsT>
+        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
+        }
+        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs == rhs, m_lhs, "==", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
+        }
+        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
+            return { m_lhs != rhs, m_lhs, "!=", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
+        }
+        template<typename RhsT>
+        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
+        }
+        template<typename RhsT>
+        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
+        }
+        template<typename RhsT>
+        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
+        }
+        template <typename RhsT>
+        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
+        }
+        template <typename RhsT>
+        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
+        }
+        template <typename RhsT>
+        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
+            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
+        }
+
+        template<typename RhsT>
+        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator&& is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        template<typename RhsT>
+        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
+            static_assert(always_false<RhsT>::value,
+            "operator|| is not supported inside assertions, "
+            "wrap the expression inside parentheses, or decompose it");
+        }
+
+        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
+            return UnaryExpr<LhsT>{ m_lhs };
+        }
+    };
+
+    void handleExpression( ITransientExpression const& expr );
+
+    template<typename T>
+    void handleExpression( ExprLhs<T> const& expr ) {
+        handleExpression( expr.makeUnaryExpr() );
+    }
+
+    struct Decomposer {
+        template<typename T>
+        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
+            return ExprLhs<T const&>{ lhs };
+        }
+
+        auto operator <=( bool value ) -> ExprLhs<bool> {
+            return ExprLhs<bool>{ value };
+        }
+    };
+
+} // end namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// end catch_decomposer.h
+// start catch_interfaces_capture.h
+
+#include <string>
+#include <chrono>
+
+namespace Catch {
+
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    struct MessageBuilder;
+    struct Counts;
+    struct AssertionReaction;
+    struct SourceLineInfo;
+
+    struct ITransientExpression;
+    struct IGeneratorTracker;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo;
+    template <typename Duration = std::chrono::duration<double, std::nano>>
+    struct BenchmarkStats;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+
+        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& name ) = 0;
+        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
+        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
+        virtual void benchmarkFailed( std::string const& error ) = 0;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
+
+        virtual void handleFatalErrorCondition( StringRef message ) = 0;
+
+        virtual void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) = 0;
+        virtual void handleIncomplete
+                (   AssertionInfo const& info ) = 0;
+        virtual void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+
+        // Deprecated, do not use:
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+        virtual void exceptionEarlyReported() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// end catch_interfaces_capture.h
+namespace Catch {
+
+    struct TestFailureException{};
+    struct AssertionResultData;
+    struct IResultCapture;
+    class RunContext;
+
+    class LazyExpression {
+        friend class AssertionHandler;
+        friend struct AssertionStats;
+        friend class RunContext;
+
+        ITransientExpression const* m_transientExpression = nullptr;
+        bool m_isNegated;
+    public:
+        LazyExpression( bool isNegated );
+        LazyExpression( LazyExpression const& other );
+        LazyExpression& operator = ( LazyExpression const& ) = delete;
+
+        explicit operator bool() const;
+
+        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
+    };
+
+    struct AssertionReaction {
+        bool shouldDebugBreak = false;
+        bool shouldThrow = false;
+    };
+
+    class AssertionHandler {
+        AssertionInfo m_assertionInfo;
+        AssertionReaction m_reaction;
+        bool m_completed = false;
+        IResultCapture& m_resultCapture;
+
+    public:
+        AssertionHandler
+            (   StringRef const& macroName,
+                SourceLineInfo const& lineInfo,
+                StringRef capturedExpression,
+                ResultDisposition::Flags resultDisposition );
+        ~AssertionHandler() {
+            if ( !m_completed ) {
+                m_resultCapture.handleIncomplete( m_assertionInfo );
+            }
+        }
+
+        template<typename T>
+        void handleExpr( ExprLhs<T> const& expr ) {
+            handleExpr( expr.makeUnaryExpr() );
+        }
+        void handleExpr( ITransientExpression const& expr );
+
+        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
+
+        void handleExceptionThrownAsExpected();
+        void handleUnexpectedExceptionNotThrown();
+        void handleExceptionNotThrownAsExpected();
+        void handleThrowingCallSkipped();
+        void handleUnexpectedInflightException();
+
+        void complete();
+        void setCompleted();
+
+        // query
+        auto allowThrows() const -> bool;
+    };
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
+
+} // namespace Catch
+
+// end catch_assertionhandler.h
+// start catch_message.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    StringRef const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        StringRef macroName;
+        std::string message;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const;
+        bool operator < ( MessageInfo const& other ) const;
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageStream {
+
+        template<typename T>
+        MessageStream& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        ReusableStringStream m_stream;
+    };
+
+    struct MessageBuilder : MessageStream {
+        MessageBuilder( StringRef const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type );
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+    };
+
+    class ScopedMessage {
+    public:
+        explicit ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage& duplicate ) = delete;
+        ScopedMessage( ScopedMessage&& old );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+        bool m_moved;
+    };
+
+    class Capturer {
+        std::vector<MessageInfo> m_messages;
+        IResultCapture& m_resultCapture = getResultCapture();
+        size_t m_captured = 0;
+    public:
+        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
+        ~Capturer();
+
+        void captureValue( size_t index, std::string const& value );
+
+        template<typename T>
+        void captureValues( size_t index, T const& value ) {
+            captureValue( index, Catch::Detail::stringify( value ) );
+        }
+
+        template<typename T, typename... Ts>
+        void captureValues( size_t index, T const& value, Ts const&... values ) {
+            captureValue( index, Catch::Detail::stringify(value) );
+            captureValues( index+1, values... );
+        }
+    };
+
+} // end namespace Catch
+
+// end catch_message.h
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
+#else
+  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+#define INTERNAL_CATCH_TRY
+#define INTERNAL_CATCH_CATCH( capturer )
+
+#else // CATCH_CONFIG_FAST_COMPILE
+
+#define INTERNAL_CATCH_TRY try
+#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
+
+#endif
+
+#define INTERNAL_CATCH_REACT( handler ) handler.complete();
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
+    do { \
+        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
+            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
+        try { \
+            static_cast<void>(__VA_ARGS__); \
+            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
+        } \
+        catch( ... ) { \
+            catchAssertionHandler.handleUnexpectedInflightException(); \
+        } \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ) { \
+                catchAssertionHandler.handleExceptionThrownAsExpected(); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
+        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
+    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
+    varName.captureValues( 0, __VA_ARGS__ )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
+    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
+
+///////////////////////////////////////////////////////////////////////////////
+// Although this is matcher-based, it can be used with just a string
+#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( ... ) { \
+                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_capture.hpp
+// start catch_section.h
+
+// start catch_section_info.h
+
+// start catch_totals.h
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts operator - ( Counts const& other ) const;
+        Counts& operator += ( Counts const& other );
+
+        std::size_t total() const;
+        bool allPassed() const;
+        bool allOk() const;
+
+        std::size_t passed = 0;
+        std::size_t failed = 0;
+        std::size_t failedButOk = 0;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const;
+        Totals& operator += ( Totals const& other );
+
+        Totals delta( Totals const& prevTotals ) const;
+
+        int error = 0;
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+// end catch_totals.h
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name );
+
+        // Deprecated
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
+
+        std::string name;
+        std::string description; // !Deprecated: this will always be empty
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// end catch_section_info.h
+// start catch_timer.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
+    auto getEstimatedClockResolution() -> uint64_t;
+
+    class Timer {
+        uint64_t m_nanoseconds = 0;
+    public:
+        void start();
+        auto getElapsedNanoseconds() const -> uint64_t;
+        auto getElapsedMicroseconds() const -> uint64_t;
+        auto getElapsedMilliseconds() const -> unsigned int;
+        auto getElapsedSeconds() const -> double;
+    };
+
+} // namespace Catch
+
+// end catch_timer.h
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        explicit operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
+    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+// end catch_section.h
+// start catch_interfaces_exception.h
+
+// start catch_interfaces_registry_hub.h
+
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+    struct IMutableEnumValuesRegistry;
+
+    class StartupExceptionRegistry;
+
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
+
+        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+        virtual void registerStartupException() noexcept = 0;
+        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
+    };
+
+    IRegistryHub const& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+// end catch_interfaces_registry_hub.h
+#if defined(CATCH_CONFIG_DISABLE)
+    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
+        static std::string translatorName( signature )
+#endif
+
+#include <exception>
+#include <string>
+#include <vector>
+
+namespace Catch {
+    using exceptionTranslateFunction = std::string(*)();
+
+    struct IExceptionTranslator;
+    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                return "";
+#else
+                try {
+                    if( it == itEnd )
+                        std::rethrow_exception(std::current_exception());
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+#endif
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// end catch_interfaces_exception.h
+// start catch_approx.h
+
+#include <type_traits>
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    private:
+        bool equalityComparisonImpl(double other) const;
+        // Validates the new margin (margin >= 0)
+        // out-of-line to avoid including stdexcept in the header
+        void setMargin(double margin);
+        // Validates the new epsilon (0 < epsilon < 1)
+        // out-of-line to avoid including stdexcept in the header
+        void setEpsilon(double epsilon);
+
+    public:
+        explicit Approx ( double value );
+
+        static Approx custom();
+
+        Approx operator-() const;
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T const& value ) {
+            Approx approx( static_cast<double>(value) );
+            approx.m_epsilon = m_epsilon;
+            approx.m_margin = m_margin;
+            approx.m_scale = m_scale;
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T const& value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            auto lhs_v = static_cast<double>(lhs);
+            return rhs.equalityComparisonImpl(lhs_v);
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T const& lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T const& rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
+            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
+            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T const& newEpsilon ) {
+            double epsilonAsDouble = static_cast<double>(newEpsilon);
+            setEpsilon(epsilonAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T const& newMargin ) {
+            double marginAsDouble = static_cast<double>(newMargin);
+            setMargin(marginAsDouble);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T const& newScale ) {
+            m_scale = static_cast<double>(newScale);
+            return *this;
+        }
+
+        std::string toString() const;
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val);
+    Detail::Approx operator "" _a(unsigned long long val);
+} // end namespace literals
+
+template<>
+struct StringMaker<Catch::Detail::Approx> {
+    static std::string convert(Catch::Detail::Approx const& value);
+};
+
+} // end namespace Catch
+
+// end catch_approx.h
+// start catch_string_manip.h
+
+#include <string>
+#include <iosfwd>
+#include <vector>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    //! Returns a new string without whitespace at the start/end
+    std::string trim( std::string const& str );
+    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
+    StringRef trim(StringRef ref);
+
+    // !!! Be aware, returns refs into original string - make sure original string outlives them
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+}
+
+// end catch_string_manip.h
+#ifndef CATCH_CONFIG_DISABLE_MATCHERS
+// start catch_capture_matchers.h
+
+// start catch_matchers.h
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            MatcherUntypedBase() = default;
+            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
+            std::string toString() const;
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        };
+
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
+        };
+#endif
+
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
+
+        template<typename T>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
+
+            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<T> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (!matcher->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " and ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            bool match( ArgT const& arg ) const override {
+                for( auto matcher : m_matchers ) {
+                    if (matcher->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            std::string describe() const override {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                bool first = true;
+                for( auto matcher : m_matchers ) {
+                    if( first )
+                        first = false;
+                    else
+                        description += " or ";
+                    description += matcher->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
+                auto copy(*this);
+                copy.m_matchers.push_back( &other );
+                return copy;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            bool match( ArgT const& arg ) const override {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            std::string describe() const override {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename T>
+        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<T>() && *this && other;
+        }
+        template<typename T>
+        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<T>() || *this || other;
+        }
+        template<typename T>
+        MatchNotOf<T> MatcherBase<T>::operator ! () const {
+            return MatchNotOf<T>( *this );
+        }
+
+    } // namespace Impl
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+// end catch_matchers.h
+// start catch_matchers_exception.hpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+class ExceptionMessageMatcher : public MatcherBase<std::exception> {
+    std::string m_message;
+public:
+
+    ExceptionMessageMatcher(std::string const& message):
+        m_message(message)
+    {}
+
+    bool match(std::exception const& ex) const override;
+
+    std::string describe() const override;
+};
+
+} // namespace Exception
+
+Exception::ExceptionMessageMatcher Message(std::string const& message);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_exception.hpp
+// start catch_matchers_floating.h
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Floating {
+
+        enum class FloatingPointKind : uint8_t;
+
+        struct WithinAbsMatcher : MatcherBase<double> {
+            WithinAbsMatcher(double target, double margin);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_margin;
+        };
+
+        struct WithinUlpsMatcher : MatcherBase<double> {
+            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            uint64_t m_ulps;
+            FloatingPointKind m_type;
+        };
+
+        // Given IEEE-754 format for floats and doubles, we can assume
+        // that float -> double promotion is lossless. Given this, we can
+        // assume that if we do the standard relative comparison of
+        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
+        // the same result if we do this for floats, as if we do this for
+        // doubles that were promoted from floats.
+        struct WithinRelMatcher : MatcherBase<double> {
+            WithinRelMatcher(double target, double epsilon);
+            bool match(double const& matchee) const override;
+            std::string describe() const override;
+        private:
+            double m_target;
+            double m_epsilon;
+        };
+
+    } // namespace Floating
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
+    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
+    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
+    Floating::WithinRelMatcher WithinRel(double target, double eps);
+    // defaults epsilon to 100*numeric_limits<double>::epsilon()
+    Floating::WithinRelMatcher WithinRel(double target);
+    Floating::WithinRelMatcher WithinRel(float target, float eps);
+    // defaults epsilon to 100*numeric_limits<float>::epsilon()
+    Floating::WithinRelMatcher WithinRel(float target);
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.h
+// start catch_matchers_generic.hpp
+
+#include <functional>
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+namespace Generic {
+
+namespace Detail {
+    std::string finalizeDescription(const std::string& desc);
+}
+
+template <typename T>
+class PredicateMatcher : public MatcherBase<T> {
+    std::function<bool(T const&)> m_predicate;
+    std::string m_description;
+public:
+
+    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
+        :m_predicate(std::move(elem)),
+        m_description(Detail::finalizeDescription(descr))
+    {}
+
+    bool match( T const& item ) const override {
+        return m_predicate(item);
+    }
+
+    std::string describe() const override {
+        return m_description;
+    }
+};
+
+} // namespace Generic
+
+    // The following functions create the actual matcher objects.
+    // The user has to explicitly specify type to the function, because
+    // inferring std::function<bool(T const&)> is hard (but possible) and
+    // requires a lot of TMP.
+    template<typename T>
+    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
+        return Generic::PredicateMatcher<T>(predicate, description);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_generic.hpp
+// start catch_matchers_string.h
+
+#include <string>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            std::string describe() const override;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            bool match( std::string const& source ) const override;
+        };
+
+        struct RegexMatcher : MatcherBase<std::string> {
+            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
+            bool match( std::string const& matchee ) const override;
+            std::string describe() const override;
+
+        private:
+            std::string m_regex;
+            CaseSensitive::Choice m_caseSensitivity;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_string.h
+// start catch_matchers_vector.h
+
+#include <algorithm>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+        template<typename T, typename Alloc>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T, Alloc> const &v) const override {
+                for (auto const& el : v) {
+                    if (el == m_comparator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (auto const& comparator : m_comparator) {
+                    auto present = false;
+                    for (const auto& el : v) {
+                        if (el == comparator) {
+                            present = true;
+                            break;
+                        }
+                    }
+                    if (!present) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            std::string describe() const override {
+                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            std::vector<T, AllocComp> const& m_comparator;
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+
+            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T, AllocMatch> const &v) const override {
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (std::size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != approx(v[i]))
+                        return false;
+                return true;
+            }
+            std::string describe() const override {
+                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& epsilon( T const& newEpsilon ) {
+                approx.epsilon(newEpsilon);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& margin( T const& newMargin ) {
+                approx.margin(newMargin);
+                return *this;
+            }
+            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+            ApproxMatcher& scale( T const& newScale ) {
+                approx.scale(newScale);
+                return *this;
+            }
+
+            std::vector<T, AllocComp> const& m_comparator;
+            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+        };
+
+        template<typename T, typename AllocComp, typename AllocMatch>
+        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
+            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
+            bool match(std::vector<T, AllocMatch> const& vec) const override {
+                if (m_target.size() != vec.size()) {
+                    return false;
+                }
+                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
+            }
+
+            std::string describe() const override {
+                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
+            }
+        private:
+            std::vector<T, AllocComp> const& m_target;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename Alloc = std::allocator<T>>
+    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
+        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
+    }
+
+    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
+    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
+        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_vector.h
+namespace Catch {
+
+    template<typename ArgT, typename MatcherT>
+    class MatchExpr : public ITransientExpression {
+        ArgT const& m_arg;
+        MatcherT m_matcher;
+        StringRef m_matcherString;
+    public:
+        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
+        :   ITransientExpression{ true, matcher.match( arg ) },
+            m_arg( arg ),
+            m_matcher( matcher ),
+            m_matcherString( matcherString )
+        {}
+
+        void streamReconstructedExpression( std::ostream &os ) const override {
+            auto matcherAsString = m_matcher.toString();
+            os << Catch::Detail::stringify( m_arg ) << ' ';
+            if( matcherAsString == Detail::unprintableString )
+                os << m_matcherString;
+            else
+                os << matcherAsString;
+        }
+    };
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
+
+    template<typename ArgT, typename MatcherT>
+    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
+        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
+    }
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        INTERNAL_CATCH_TRY { \
+            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
+        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
+    do { \
+        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        if( catchAssertionHandler.allowThrows() ) \
+            try { \
+                static_cast<void>(__VA_ARGS__ ); \
+                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
+            } \
+            catch( exceptionType const& ex ) { \
+                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
+            } \
+            catch( ... ) { \
+                catchAssertionHandler.handleUnexpectedInflightException(); \
+            } \
+        else \
+            catchAssertionHandler.handleThrowingCallSkipped(); \
+        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
+    } while( false )
+
+// end catch_capture_matchers.h
+#endif
+// start catch_generators.hpp
+
+// start catch_interfaces_generatortracker.h
+
+
+#include <memory>
+
+namespace Catch {
+
+    namespace Generators {
+        class GeneratorUntypedBase {
+        public:
+            GeneratorUntypedBase() = default;
+            virtual ~GeneratorUntypedBase();
+            // Attempts to move the generator to the next element
+             //
+             // Returns true iff the move succeeded (and a valid element
+             // can be retrieved).
+            virtual bool next() = 0;
+        };
+        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
+
+    } // namespace Generators
+
+    struct IGeneratorTracker {
+        virtual ~IGeneratorTracker();
+        virtual auto hasGenerator() const -> bool = 0;
+        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
+        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
+    };
+
+} // namespace Catch
+
+// end catch_interfaces_generatortracker.h
+// start catch_enforce.h
+
+#include <exception>
+
+namespace Catch {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    template <typename Ex>
+    [[noreturn]]
+    void throw_exception(Ex const& e) {
+        throw e;
+    }
+#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
+    [[noreturn]]
+    void throw_exception(std::exception const& e);
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg);
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg);
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg);
+
+} // namespace Catch;
+
+#define CATCH_MAKE_MSG(...) \
+    (Catch::ReusableStringStream() << __VA_ARGS__).str()
+
+#define CATCH_INTERNAL_ERROR(...) \
+    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
+
+#define CATCH_ERROR(...) \
+    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_RUNTIME_ERROR(...) \
+    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
+
+#define CATCH_ENFORCE( condition, ... ) \
+    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
+
+// end catch_enforce.h
+#include <memory>
+#include <vector>
+#include <cassert>
+
+#include <utility>
+#include <exception>
+
+namespace Catch {
+
+class GeneratorException : public std::exception {
+    const char* const m_msg = "";
+
+public:
+    GeneratorException(const char* msg):
+        m_msg(msg)
+    {}
+
+    const char* what() const noexcept override final;
+};
+
+namespace Generators {
+
+    // !TBD move this into its own location?
+    namespace pf{
+        template<typename T, typename... Args>
+        std::unique_ptr<T> make_unique( Args&&... args ) {
+            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+        }
+    }
+
+    template<typename T>
+    struct IGenerator : GeneratorUntypedBase {
+        virtual ~IGenerator() = default;
+
+        // Returns the current element of the generator
+        //
+        // \Precondition The generator is either freshly constructed,
+        // or the last call to `next()` returned true
+        virtual T const& get() const = 0;
+        using type = T;
+    };
+
+    template<typename T>
+    class SingleValueGenerator final : public IGenerator<T> {
+        T m_value;
+    public:
+        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
+
+        T const& get() const override {
+            return m_value;
+        }
+        bool next() override {
+            return false;
+        }
+    };
+
+    template<typename T>
+    class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "FixedValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
+        std::vector<T> m_values;
+        size_t m_idx = 0;
+    public:
+        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
+
+        T const& get() const override {
+            return m_values[m_idx];
+        }
+        bool next() override {
+            ++m_idx;
+            return m_idx < m_values.size();
+        }
+    };
+
+    template <typename T>
+    class GeneratorWrapper final {
+        std::unique_ptr<IGenerator<T>> m_generator;
+    public:
+        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
+            m_generator(std::move(generator))
+        {}
+        T const& get() const {
+            return m_generator->get();
+        }
+        bool next() {
+            return m_generator->next();
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> value(T&& value) {
+        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
+    }
+    template <typename T>
+    GeneratorWrapper<T> values(std::initializer_list<T> values) {
+        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
+    }
+
+    template<typename T>
+    class Generators : public IGenerator<T> {
+        std::vector<GeneratorWrapper<T>> m_generators;
+        size_t m_current = 0;
+
+        void populate(GeneratorWrapper<T>&& generator) {
+            m_generators.emplace_back(std::move(generator));
+        }
+        void populate(T&& val) {
+            m_generators.emplace_back(value(std::forward<T>(val)));
+        }
+        template<typename U>
+        void populate(U&& val) {
+            populate(T(std::forward<U>(val)));
+        }
+        template<typename U, typename... Gs>
+        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
+            populate(std::forward<U>(valueOrGenerator));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+    public:
+        template <typename... Gs>
+        Generators(Gs &&... moreGenerators) {
+            m_generators.reserve(sizeof...(Gs));
+            populate(std::forward<Gs>(moreGenerators)...);
+        }
+
+        T const& get() const override {
+            return m_generators[m_current].get();
+        }
+
+        bool next() override {
+            if (m_current >= m_generators.size()) {
+                return false;
+            }
+            const bool current_status = m_generators[m_current].next();
+            if (!current_status) {
+                ++m_current;
+            }
+            return m_current < m_generators.size();
+        }
+    };
+
+    template<typename... Ts>
+    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
+        return values<std::tuple<Ts...>>( tuples );
+    }
+
+    // Tag type to signal that a generator sequence should convert arguments to a specific type
+    template <typename T>
+    struct as {};
+
+    template<typename T, typename... Gs>
+    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
+        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
+    }
+    template<typename T>
+    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
+        return Generators<T>(std::move(generator));
+    }
+    template<typename T, typename... Gs>
+    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
+    }
+    template<typename T, typename U, typename... Gs>
+    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
+        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
+    }
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
+
+    template<typename L>
+    // Note: The type after -> is weird, because VS2015 cannot parse
+    //       the expression used in the typedef inside, when it is in
+    //       return type. Yeah.
+    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
+        using UnderlyingType = typename decltype(generatorExpression())::type;
+
+        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
+        if (!tracker.hasGenerator()) {
+            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
+        }
+
+        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
+        return generator.get();
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+#define GENERATE( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_COPY( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+#define GENERATE_REF( ... ) \
+    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
+                                 CATCH_INTERNAL_LINEINFO, \
+                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
+
+// end catch_generators.hpp
+// start catch_generators_generic.hpp
+
+namespace Catch {
+namespace Generators {
+
+    template <typename T>
+    class TakeGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        size_t m_returned = 0;
+        size_t m_target;
+    public:
+        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target(target)
+        {
+            assert(target != 0 && "Empty generators are not allowed");
+        }
+        T const& get() const override {
+            return m_generator.get();
+        }
+        bool next() override {
+            ++m_returned;
+            if (m_returned >= m_target) {
+                return false;
+            }
+
+            const auto success = m_generator.next();
+            // If the underlying generator does not contain enough values
+            // then we cut short as well
+            if (!success) {
+                m_returned = m_target;
+            }
+            return success;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
+    }
+
+    template <typename T, typename Predicate>
+    class FilterGenerator : public IGenerator<T> {
+        GeneratorWrapper<T> m_generator;
+        Predicate m_predicate;
+    public:
+        template <typename P = Predicate>
+        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_predicate(std::forward<P>(pred))
+        {
+            if (!m_predicate(m_generator.get())) {
+                // It might happen that there are no values that pass the
+                // filter. In that case we throw an exception.
+                auto has_initial_value = next();
+                if (!has_initial_value) {
+                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
+                }
+            }
+        }
+
+        T const& get() const override {
+            return m_generator.get();
+        }
+
+        bool next() override {
+            bool success = m_generator.next();
+            if (!success) {
+                return false;
+            }
+            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
+            return success;
+        }
+    };
+
+    template <typename T, typename Predicate>
+    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
+    }
+
+    template <typename T>
+    class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
+        GeneratorWrapper<T> m_generator;
+        mutable std::vector<T> m_returned;
+        size_t m_target_repeats;
+        size_t m_current_repeat = 0;
+        size_t m_repeat_index = 0;
+    public:
+        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
+            m_generator(std::move(generator)),
+            m_target_repeats(repeats)
+        {
+            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
+        }
+
+        T const& get() const override {
+            if (m_current_repeat == 0) {
+                m_returned.push_back(m_generator.get());
+                return m_returned.back();
+            }
+            return m_returned[m_repeat_index];
+        }
+
+        bool next() override {
+            // There are 2 basic cases:
+            // 1) We are still reading the generator
+            // 2) We are reading our own cache
+
+            // In the first case, we need to poke the underlying generator.
+            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
+            if (m_current_repeat == 0) {
+                const auto success = m_generator.next();
+                if (!success) {
+                    ++m_current_repeat;
+                }
+                return m_current_repeat < m_target_repeats;
+            }
+
+            // In the second case, we need to move indices forward and check that we haven't run up against the end
+            ++m_repeat_index;
+            if (m_repeat_index == m_returned.size()) {
+                m_repeat_index = 0;
+                ++m_current_repeat;
+            }
+            return m_current_repeat < m_target_repeats;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
+    }
+
+    template <typename T, typename U, typename Func>
+    class MapGenerator : public IGenerator<T> {
+        // TBD: provide static assert for mapping function, for friendly error message
+        GeneratorWrapper<U> m_generator;
+        Func m_function;
+        // To avoid returning dangling reference, we have to save the values
+        T m_cache;
+    public:
+        template <typename F2 = Func>
+        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
+            m_generator(std::move(generator)),
+            m_function(std::forward<F2>(function)),
+            m_cache(m_function(m_generator.get()))
+        {}
+
+        T const& get() const override {
+            return m_cache;
+        }
+        bool next() override {
+            const auto success = m_generator.next();
+            if (success) {
+                m_cache = m_function(m_generator.get());
+            }
+            return success;
+        }
+    };
+
+    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T, typename U, typename Func>
+    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
+        return GeneratorWrapper<T>(
+            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
+        );
+    }
+
+    template <typename T>
+    class ChunkGenerator final : public IGenerator<std::vector<T>> {
+        std::vector<T> m_chunk;
+        size_t m_chunk_size;
+        GeneratorWrapper<T> m_generator;
+        bool m_used_up = false;
+    public:
+        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
+            m_chunk_size(size), m_generator(std::move(generator))
+        {
+            m_chunk.reserve(m_chunk_size);
+            if (m_chunk_size != 0) {
+                m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
+            }
+        }
+        std::vector<T> const& get() const override {
+            return m_chunk;
+        }
+        bool next() override {
+            m_chunk.clear();
+            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
+                if (!m_generator.next()) {
+                    return false;
+                }
+                m_chunk.push_back(m_generator.get());
+            }
+            return true;
+        }
+    };
+
+    template <typename T>
+    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
+        return GeneratorWrapper<std::vector<T>>(
+            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
+        );
+    }
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_generic.hpp
+// start catch_generators_specific.hpp
+
+// start catch_context.h
+
+#include <memory>
+
+namespace Catch {
+
+    struct IResultCapture;
+    struct IRunner;
+    struct IConfig;
+    struct IMutableContext;
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual IConfigPtr const& getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( IConfigPtr const& config ) = 0;
+
+    private:
+        static IMutableContext *currentContext;
+        friend IMutableContext& getCurrentMutableContext();
+        friend void cleanUpContext();
+        static void createContext();
+    };
+
+    inline IMutableContext& getCurrentMutableContext()
+    {
+        if( !IMutableContext::currentContext )
+            IMutableContext::createContext();
+        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
+        return *IMutableContext::currentContext;
+    }
+
+    inline IContext& getCurrentContext()
+    {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext();
+
+    class SimplePcg32;
+    SimplePcg32& rng();
+}
+
+// end catch_context.h
+// start catch_interfaces_config.h
+
+// start catch_option.hpp
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( nullptr ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = nullptr;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != nullptr; }
+        bool none() const { return nullableValue == nullptr; }
+
+        bool operator !() const { return nullableValue == nullptr; }
+        explicit operator bool() const {
+            return some();
+        }
+
+    private:
+        T *nullableValue;
+        alignas(alignof(T)) char storage[sizeof(T)];
+    };
+
+} // end namespace Catch
+
+// end catch_option.hpp
+#include <chrono>
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    enum class Verbosity {
+        Quiet = 0,
+        Normal,
+        High
+    };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01,
+        NoTests = 0x02
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : NonCopyable {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual bool warnAboutNoTests() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual bool hasTestFilters() const = 0;
+        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+        virtual Verbosity verbosity() const = 0;
+
+        virtual bool benchmarkNoAnalysis() const = 0;
+        virtual int benchmarkSamples() const = 0;
+        virtual double benchmarkConfidenceInterval() const = 0;
+        virtual unsigned int benchmarkResamples() const = 0;
+        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
+    };
+
+    using IConfigPtr = std::shared_ptr<IConfig const>;
+}
+
+// end catch_interfaces_config.h
+// start catch_random_number_generator.h
+
+#include <cstdint>
+
+namespace Catch {
+
+    // This is a simple implementation of C++11 Uniform Random Number
+    // Generator. It does not provide all operators, because Catch2
+    // does not use it, but it should behave as expected inside stdlib's
+    // distributions.
+    // The implementation is based on the PCG family (http://pcg-random.org)
+    class SimplePcg32 {
+        using state_type = std::uint64_t;
+    public:
+        using result_type = std::uint32_t;
+        static constexpr result_type (min)() {
+            return 0;
+        }
+        static constexpr result_type (max)() {
+            return static_cast<result_type>(-1);
+        }
+
+        // Provide some default initial state for the default constructor
+        SimplePcg32():SimplePcg32(0xed743cc4U) {}
+
+        explicit SimplePcg32(result_type seed_);
+
+        void seed(result_type seed_);
+        void discard(uint64_t skip);
+
+        result_type operator()();
+
+    private:
+        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
+
+        // In theory we also need operator<< and operator>>
+        // In practice we do not use them, so we will skip them for now
+
+        std::uint64_t m_state;
+        // This part of the state determines which "stream" of the numbers
+        // is chosen -- we take it as a constant for Catch2, so we only
+        // need to deal with seeding the main state.
+        // Picked by reading 8 bytes from `/dev/random` :-)
+        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
+    };
+
+} // end namespace Catch
+
+// end catch_random_number_generator.h
+#include <random>
+
+namespace Catch {
+namespace Generators {
+
+template <typename Float>
+class RandomFloatingGenerator final : public IGenerator<Float> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_real_distribution<Float> m_dist;
+    Float m_current_number;
+public:
+
+    RandomFloatingGenerator(Float a, Float b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Float const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+template <typename Integer>
+class RandomIntegerGenerator final : public IGenerator<Integer> {
+    Catch::SimplePcg32& m_rng;
+    std::uniform_int_distribution<Integer> m_dist;
+    Integer m_current_number;
+public:
+
+    RandomIntegerGenerator(Integer a, Integer b):
+        m_rng(rng()),
+        m_dist(a, b) {
+        static_cast<void>(next());
+    }
+
+    Integer const& get() const override {
+        return m_current_number;
+    }
+    bool next() override {
+        m_current_number = m_dist(m_rng);
+        return true;
+    }
+};
+
+// TODO: Ideally this would be also constrained against the various char types,
+//       but I don't expect users to run into that in practice.
+template <typename T>
+typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+typename std::enable_if<std::is_floating_point<T>::value,
+GeneratorWrapper<T>>::type
+random(T a, T b) {
+    return GeneratorWrapper<T>(
+        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
+    );
+}
+
+template <typename T>
+class RangeGenerator final : public IGenerator<T> {
+    T m_current;
+    T m_end;
+    T m_step;
+    bool m_positive;
+
+public:
+    RangeGenerator(T const& start, T const& end, T const& step):
+        m_current(start),
+        m_end(end),
+        m_step(step),
+        m_positive(m_step > T(0))
+    {
+        assert(m_current != m_end && "Range start and end cannot be equal");
+        assert(m_step != T(0) && "Step size cannot be zero");
+        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
+    }
+
+    RangeGenerator(T const& start, T const& end):
+        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
+    {}
+
+    T const& get() const override {
+        return m_current;
+    }
+
+    bool next() override {
+        m_current += m_step;
+        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
+    }
+};
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
+    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
+}
+
+template <typename T>
+GeneratorWrapper<T> range(T const& start, T const& end) {
+    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
+    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
+}
+
+template <typename T>
+class IteratorGenerator final : public IGenerator<T> {
+    static_assert(!std::is_same<T, bool>::value,
+        "IteratorGenerator currently does not support bools"
+        "because of std::vector<bool> specialization");
+
+    std::vector<T> m_elems;
+    size_t m_current = 0;
+public:
+    template <typename InputIterator, typename InputSentinel>
+    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
+        if (m_elems.empty()) {
+            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
+        }
+    }
+
+    T const& get() const override {
+        return m_elems[m_current];
+    }
+
+    bool next() override {
+        ++m_current;
+        return m_current != m_elems.size();
+    }
+};
+
+template <typename InputIterator,
+          typename InputSentinel,
+          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
+GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
+}
+
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
+}
+
+} // namespace Generators
+} // namespace Catch
+
+// end catch_generators_specific.hpp
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// start catch_test_case_info.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestInvoker;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5,
+            Benchmark = 1 << 6
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::vector<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string tagsAsString() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::vector<std::string> tags;
+        std::vector<std::string> lcaseTags;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+
+    private:
+        std::shared_ptr<ITestInvoker> test;
+    };
+
+    TestCase makeTestCase(  ITestInvoker* testCase,
+                            std::string const& className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_case_info.h
+// start catch_interfaces_runner.h
+
+namespace Catch {
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+// end catch_interfaces_runner.h
+
+#ifdef __OBJC__
+// start catch_objc.hpp
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public ITestInvoker {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline std::size_t registerTestMethods() {
+        std::size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( nullptr, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                bool match( NSString* str ) const override {
+                    return false;
+                }
+
+                NSString* CATCH_ARC_STRONG m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                std::string describe() const override {
+                    return "equals string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                std::string describe() const override {
+                    return "contains string: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                std::string describe() const override {
+                    return "starts with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                bool match( NSString* str ) const override {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                std::string describe() const override {
+                    return "ends with: " + Catch::Detail::stringify( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
+#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
+{ \
+return @ name; \
+} \
++(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
+{ \
+return @ desc; \
+} \
+-(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
+
+#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
+
+// end catch_objc.hpp
+#endif
+
+// Benchmarking needs the externally-facing parts of reporters to work
+#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_external_interfaces.h
+
+// start catch_reporter_bases.hpp
+
+// start catch_interfaces_reporter.h
+
+// start catch_config.hpp
+
+// start catch_test_spec_parser.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_test_spec.h
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// start catch_wildcard_pattern.h
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
+        virtual ~WildcardPattern() = default;
+        virtual bool matches( std::string const& str ) const;
+
+    private:
+        std::string normaliseString( std::string const& str ) const;
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard = NoWildcard;
+        std::string m_pattern;
+    };
+}
+
+// end catch_wildcard_pattern.h
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    struct IConfig;
+
+    class TestSpec {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
+        };
+        using PatternPtr = std::shared_ptr<Pattern>;
+
+        class NamePattern : public Pattern {
+        public:
+            explicit NamePattern( std::string const& name, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
+            bool matches( TestCaseInfo const& testCase ) const override;
+        private:
+            PatternPtr m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<PatternPtr> m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
+        };
+
+    public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+        using vectorStrings = std::vector<std::string>;
+
+        bool hasFilters() const;
+        bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
+        const vectorStrings & getInvalidArgs() const;
+
+    private:
+        std::vector<Filter> m_filters;
+        std::vector<std::string> m_invalidArgs;
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec.h
+// start catch_interfaces_tag_alias_registry.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias;
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        // Nullptr if not present
+        virtual TagAlias const* find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_tag_alias_registry.h
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode = None;
+        Mode lastMode = None;
+        bool m_exclusion = false;
+        std::size_t m_pos = 0;
+        std::size_t m_realPatternPos = 0;
+        std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases = nullptr;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases );
+
+        TestSpecParser& parse( std::string const& arg );
+        TestSpec testSpec();
+
+    private:
+        bool visitChar( char c );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
+        void escape();
+        bool isControlChar( char c ) const;
+        void saveLastMode();
+        void revertBackToLastMode();
+        void addFilter();
+        bool separate();
+
+        // Handles common preprocessing of the pattern for name/tag patterns
+        std::string preprocessPattern();
+        // Adds the current pattern as a test name
+        void addNamePattern();
+        // Adds the current pattern as a tag
+        void addTagPattern();
+
+        inline void addCharToPattern(char c) {
+            m_substring += c;
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+
+    };
+    TestSpec parseTestSpec( std::string const& arg );
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_test_spec_parser.h
+// Libstdc++ doesn't like incomplete classes for unique_ptr
+
+#include <memory>
+#include <vector>
+#include <string>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct IStream;
+
+    struct ConfigData {
+        bool listTests = false;
+        bool listTags = false;
+        bool listReporters = false;
+        bool listTestNamesOnly = false;
+
+        bool showSuccessfulTests = false;
+        bool shouldDebugBreak = false;
+        bool noThrow = false;
+        bool showHelp = false;
+        bool showInvisibles = false;
+        bool filenamesAsTags = false;
+        bool libIdentify = false;
+
+        int abortAfter = -1;
+        unsigned int rngSeed = 0;
+
+        bool benchmarkNoAnalysis = false;
+        unsigned int benchmarkSamples = 100;
+        double benchmarkConfidenceInterval = 0.95;
+        unsigned int benchmarkResamples = 100000;
+        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
+
+        Verbosity verbosity = Verbosity::Normal;
+        WarnAbout::What warnings = WarnAbout::Nothing;
+        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
+        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
+        UseColour::YesOrNo useColour = UseColour::Auto;
+        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+#ifndef CATCH_CONFIG_DEFAULT_REPORTER
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
+#undef CATCH_CONFIG_DEFAULT_REPORTER
+
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public IConfig {
+    public:
+
+        Config() = default;
+        Config( ConfigData const& data );
+        virtual ~Config() = default;
+
+        std::string const& getFilename() const;
+
+        bool listTests() const;
+        bool listTestNamesOnly() const;
+        bool listTags() const;
+        bool listReporters() const;
+
+        std::string getProcessName() const;
+        std::string const& getReporterName() const;
+
+        std::vector<std::string> const& getTestsOrTags() const override;
+        std::vector<std::string> const& getSectionsToRun() const override;
+
+        TestSpec const& testSpec() const override;
+        bool hasTestFilters() const override;
+
+        bool showHelp() const;
+
+        // IConfig interface
+        bool allowThrows() const override;
+        std::ostream& stream() const override;
+        std::string name() const override;
+        bool includeSuccessfulResults() const override;
+        bool warnAboutMissingAssertions() const override;
+        bool warnAboutNoTests() const override;
+        ShowDurations::OrNot showDurations() const override;
+        RunTests::InWhatOrder runOrder() const override;
+        unsigned int rngSeed() const override;
+        UseColour::YesOrNo useColour() const override;
+        bool shouldDebugBreak() const override;
+        int abortAfter() const override;
+        bool showInvisibles() const override;
+        Verbosity verbosity() const override;
+        bool benchmarkNoAnalysis() const override;
+        int benchmarkSamples() const override;
+        double benchmarkConfidenceInterval() const override;
+        unsigned int benchmarkResamples() const override;
+        std::chrono::milliseconds benchmarkWarmupTime() const override;
+
+    private:
+
+        IStream const* openStream();
+        ConfigData m_data;
+
+        std::unique_ptr<IStream const> m_stream;
+        TestSpec m_testSpec;
+        bool m_hasTestFilters = false;
+    };
+
+} // end namespace Catch
+
+// end catch_config.hpp
+// start catch_assertionresult.h
+
+#include <string>
+
+namespace Catch {
+
+    struct AssertionResultData
+    {
+        AssertionResultData() = delete;
+
+        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
+
+        std::string message;
+        mutable std::string reconstructedExpression;
+        LazyExpression lazyExpression;
+        ResultWas::OfType resultType;
+
+        std::string reconstructExpression() const;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult() = delete;
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        StringRef getTestMacroName() const;
+
+    //protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// end catch_assertionresult.h
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_estimate.hpp
+
+ // Statistics estimates
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct Estimate {
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
+            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate.hpp
+// start catch_outlier_classification.hpp
+
+// Outlier information
+
+namespace Catch {
+    namespace Benchmark {
+        struct OutlierClassification {
+            int samples_seen = 0;
+            int low_severe = 0;     // more than 3 times IQR below Q1
+            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
+            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
+            int high_severe = 0;    // more than 3 times IQR above Q3
+
+            int total() const {
+                return low_severe + low_mild + high_mild + high_severe;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_outlier_classification.hpp
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+#include <string>
+#include <iosfwd>
+#include <map>
+#include <set>
+#include <memory>
+#include <algorithm>
+
+namespace Catch {
+
+    struct ReporterConfig {
+        explicit ReporterConfig( IConfigPtr const& _fullConfig );
+
+        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
+
+        std::ostream& stream() const;
+        IConfigPtr fullConfig() const;
+
+    private:
+        std::ostream* m_stream;
+        IConfigPtr m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        bool shouldRedirectStdOut = false;
+        bool shouldReportAllAssertions = false;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used = false;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name );
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount );
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals );
+
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = delete;
+        AssertionStats& operator = ( AssertionStats && )     = delete;
+        virtual ~AssertionStats();
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions );
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+        virtual ~SectionStats();
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting );
+
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+        virtual ~TestCaseStats();
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+        TestGroupStats( GroupInfo const& _groupInfo );
+
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+        virtual ~TestGroupStats();
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting );
+
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+        virtual ~TestRunStats();
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    struct BenchmarkInfo {
+        std::string name;
+        double estimatedDuration;
+        int iterations;
+        int samples;
+        unsigned int resamples;
+        double clockResolution;
+        double clockCost;
+    };
+
+    template <class Duration>
+    struct BenchmarkStats {
+        BenchmarkInfo info;
+
+        std::vector<Duration> samples;
+        Benchmark::Estimate<Duration> mean;
+        Benchmark::Estimate<Duration> standardDeviation;
+        Benchmark::OutlierClassification outliers;
+        double outlierVariance;
+
+        template <typename Duration2>
+        operator BenchmarkStats<Duration2>() const {
+            std::vector<Duration2> samples2;
+            samples2.reserve(samples.size());
+            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+            return {
+                info,
+                std::move(samples2),
+                mean,
+                standardDeviation,
+                outliers,
+                outlierVariance,
+            };
+        }
+    };
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    struct IStreamingReporter {
+        virtual ~IStreamingReporter() = default;
+
+        // Implementing class must also provide the following static methods:
+        // static std::string getDescription();
+        // static std::set<Verbosity> getSupportedVerbosities()
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void reportInvalidArguments(std::string const&) {}
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        virtual void benchmarkPreparing( std::string const& ) {}
+        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
+        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
+        virtual void benchmarkFailed( std::string const& ) {}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        // Default empty implementation provided
+        virtual void fatalErrorEncountered( StringRef name );
+
+        virtual bool isMulti() const;
+    };
+    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
+
+    struct IReporterFactory {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
+
+    struct IReporterRegistry {
+        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
+        using Listeners = std::vector<IReporterFactoryPtr>;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_interfaces_reporter.h
+#include <algorithm>
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+#include <ostream>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result);
+
+    // Returns double formatted as %.3f (format expected on output)
+    std::string getFormattedDuration( double duration );
+
+    std::string serializeFilters( std::vector<std::string> const& container );
+
+    template<typename DerivedT>
+    struct StreamingReporterBase : IStreamingReporter {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        ~StreamingReporterBase() override = default;
+
+        void noMatchingTestCases(std::string const&) override {}
+
+        void reportInvalidArguments(std::string const&) override {}
+
+        void testRunStarting(TestRunInfo const& _testRunInfo) override {
+            currentTestRunInfo = _testRunInfo;
+        }
+
+        void testGroupStarting(GroupInfo const& _groupInfo) override {
+            currentGroupInfo = _groupInfo;
+        }
+
+        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
+            currentTestCaseInfo = _testInfo;
+        }
+        void sectionStarting(SectionInfo const& _sectionInfo) override {
+            m_sectionStack.push_back(_sectionInfo);
+        }
+
+        void sectionEnded(SectionStats const& /* _sectionStats */) override {
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
+            currentTestCaseInfo.reset();
+        }
+        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
+            currentGroupInfo.reset();
+        }
+        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        void skipTest(TestCaseInfo const&) override {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<typename DerivedT>
+    struct CumulativeReporterBase : IStreamingReporter {
+        template<typename T, typename ChildNodeT>
+        struct Node {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode {
+            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
+            virtual ~SectionNode() = default;
+
+            bool operator == (SectionNode const& other) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == (std::shared_ptr<SectionNode> const& other) const {
+                return operator==(*other);
+            }
+
+            SectionStats stats;
+            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
+            using Assertions = std::vector<AssertionStats>;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() (std::shared_ptr<SectionNode> const& node) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+            void operator=(BySectionInfo const&) = delete;
+
+        private:
+            SectionInfo const& m_other;
+        };
+
+        using TestCaseNode = Node<TestCaseStats, SectionNode>;
+        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
+        using TestRunNode = Node<TestRunStats, TestGroupNode>;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
+                CATCH_ERROR( "Verbosity level not supported by this reporter" );
+        }
+        ~CumulativeReporterBase() override = default;
+
+        ReporterPreferences getPreferences() const override {
+            return m_reporterPrefs;
+        }
+
+        static std::set<Verbosity> getSupportedVerbosities() {
+            return { Verbosity::Normal };
+        }
+
+        void testRunStarting( TestRunInfo const& ) override {}
+        void testGroupStarting( GroupInfo const& ) override {}
+
+        void testCaseStarting( TestCaseInfo const& ) override {}
+
+        void sectionStarting( SectionInfo const& sectionInfo ) override {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            std::shared_ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                auto it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = std::make_shared<SectionNode>( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = std::move(node);
+        }
+
+        void assertionStarting(AssertionInfo const&) override {}
+
+        bool assertionEnded(AssertionStats const& assertionStats) override {
+            assert(!m_sectionStack.empty());
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back(assertionStats);
+            return true;
+        }
+        void sectionEnded(SectionStats const& sectionStats) override {
+            assert(!m_sectionStack.empty());
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        void testCaseEnded(TestCaseStats const& testCaseStats) override {
+            auto node = std::make_shared<TestCaseNode>(testCaseStats);
+            assert(m_sectionStack.size() == 0);
+            node->children.push_back(m_rootSection);
+            m_testCases.push_back(node);
+            m_rootSection.reset();
+
+            assert(m_deepestSection);
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        void testGroupEnded(TestGroupStats const& testGroupStats) override {
+            auto node = std::make_shared<TestGroupNode>(testGroupStats);
+            node->children.swap(m_testCases);
+            m_testGroups.push_back(node);
+        }
+        void testRunEnded(TestRunStats const& testRunStats) override {
+            auto node = std::make_shared<TestRunNode>(testRunStats);
+            node->children.swap(m_testGroups);
+            m_testRuns.push_back(node);
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        void skipTest(TestCaseInfo const&) override {}
+
+        IConfigPtr m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
+        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
+        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
+
+        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
+
+        std::shared_ptr<SectionNode> m_rootSection;
+        std::shared_ptr<SectionNode> m_deepestSection;
+        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
+        TestEventListenerBase( ReporterConfig const& _config );
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+        void assertionStarting(AssertionInfo const&) override;
+        bool assertionEnded(AssertionStats const&) override;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_bases.hpp
+// start catch_console_colour.h
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+            BrightYellow = Bright | Yellow,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = BrightYellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = BrightYellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour&& other ) noexcept;
+        Colour& operator=( Colour&& other ) noexcept;
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved = false;
+    };
+
+    std::ostream& operator << ( std::ostream& os, Colour const& );
+
+} // end namespace Catch
+
+// end catch_console_colour.h
+// start catch_reporter_registrars.hpp
+
+
+namespace Catch {
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+
+            std::string getDescription() const override {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        explicit ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public IReporterFactory {
+
+            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
+                return std::unique_ptr<T>( new T( config ) );
+            }
+            std::string getDescription() const override {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
+        }
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE)
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
+    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
+    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#else // CATCH_CONFIG_DISABLE
+
+#define CATCH_REGISTER_REPORTER(name, reporterType)
+#define CATCH_REGISTER_LISTENER(listenerType)
+
+#endif // CATCH_CONFIG_DISABLE
+
+// end catch_reporter_registrars.hpp
+// Allow users to base their work off existing reporters
+// start catch_reporter_compact.h
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase<CompactReporter> {
+
+        using StreamingReporterBase::StreamingReporterBase;
+
+        ~CompactReporter() override;
+
+        static std::string getDescription();
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_compact.h
+// start catch_reporter_console.h
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    // Fwd decls
+    struct SummaryColumn;
+    class TablePrinter;
+
+    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
+        std::unique_ptr<TablePrinter> m_tablePrinter;
+
+        ConsoleReporter(ReporterConfig const& config);
+        ~ConsoleReporter() override;
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& spec) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& _assertionStats) override;
+
+        void sectionStarting(SectionInfo const& _sectionInfo) override;
+        void sectionEnded(SectionStats const& _sectionStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const& info) override;
+        void benchmarkEnded(BenchmarkStats<> const& stats) override;
+        void benchmarkFailed(std::string const& error) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
+        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
+        void testRunEnded(TestRunStats const& _testRunStats) override;
+        void testRunStarting(TestRunInfo const& _testRunInfo) override;
+    private:
+
+        void lazyPrint();
+
+        void lazyPrintWithoutClosingBenchmarkTable();
+        void lazyPrintRunInfo();
+        void lazyPrintGroupInfo();
+        void printTestCaseAndSectionHeader();
+
+        void printClosedHeader(std::string const& _name);
+        void printOpenHeader(std::string const& _name);
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString(std::string const& _string, std::size_t indent = 0);
+
+        void printTotals(Totals const& totals);
+        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
+
+        void printTotalsDivider(Totals const& totals);
+        void printSummaryDivider();
+        void printTestFilters();
+
+    private:
+        bool m_headerPrinted = false;
+    };
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+// end catch_reporter_console.h
+// start catch_reporter_junit.h
+
+// start catch_xmlwriter.h
+
+#include <vector>
+
+namespace Catch {
+    enum class XmlFormatting {
+        None = 0x00,
+        Indent = 0x01,
+        Newline = 0x02,
+    };
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
+
+        void encodeTo( std::ostream& os ) const;
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
+
+            ScopedElement( ScopedElement&& other ) noexcept;
+            ScopedElement& operator=( ScopedElement&& other ) noexcept;
+
+            ~ScopedElement();
+
+            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer = nullptr;
+            XmlFormatting m_fmt;
+        };
+
+        XmlWriter( std::ostream& os = Catch::cout() );
+        ~XmlWriter();
+
+        XmlWriter( XmlWriter const& ) = delete;
+        XmlWriter& operator=( XmlWriter const& ) = delete;
+
+        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute );
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            ReusableStringStream rss;
+            rss << attribute;
+            return writeAttribute( name, rss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
+
+        void writeStylesheetRef( std::string const& url );
+
+        XmlWriter& writeBlankLine();
+
+        void ensureTagClosed();
+
+    private:
+
+        void applyFormatting(XmlFormatting fmt);
+
+        void writeDeclaration();
+
+        void newlineIfNecessary();
+
+        bool m_tagIsOpen = false;
+        bool m_needsNewline = false;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+// end catch_xmlwriter.h
+namespace Catch {
+
+    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
+    public:
+        JunitReporter(ReporterConfig const& _config);
+
+        ~JunitReporter() override;
+
+        static std::string getDescription();
+
+        void noMatchingTestCases(std::string const& /*spec*/) override;
+
+        void testRunStarting(TestRunInfo const& runInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEndedCumulative() override;
+
+        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
+
+        void writeTestCase(TestCaseNode const& testCaseNode);
+
+        void writeSection(std::string const& className,
+                          std::string const& rootName,
+                          SectionNode const& sectionNode);
+
+        void writeAssertions(SectionNode const& sectionNode);
+        void writeAssertion(AssertionStats const& stats);
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::string stdOutForSuite;
+        std::string stdErrForSuite;
+        unsigned int unexpectedExceptions = 0;
+        bool m_okToFail = false;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_junit.h
+// start catch_reporter_xml.h
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase<XmlReporter> {
+    public:
+        XmlReporter(ReporterConfig const& _config);
+
+        ~XmlReporter() override;
+
+        static std::string getDescription();
+
+        virtual std::string getStylesheetRef() const;
+
+        void writeSourceInfo(SourceLineInfo const& sourceInfo);
+
+    public: // StreamingReporterBase
+
+        void noMatchingTestCases(std::string const& s) override;
+
+        void testRunStarting(TestRunInfo const& testInfo) override;
+
+        void testGroupStarting(GroupInfo const& groupInfo) override;
+
+        void testCaseStarting(TestCaseInfo const& testInfo) override;
+
+        void sectionStarting(SectionInfo const& sectionInfo) override;
+
+        void assertionStarting(AssertionInfo const&) override;
+
+        bool assertionEnded(AssertionStats const& assertionStats) override;
+
+        void sectionEnded(SectionStats const& sectionStats) override;
+
+        void testCaseEnded(TestCaseStats const& testCaseStats) override;
+
+        void testGroupEnded(TestGroupStats const& testGroupStats) override;
+
+        void testRunEnded(TestRunStats const& testRunStats) override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting(BenchmarkInfo const&) override;
+        void benchmarkEnded(BenchmarkStats<> const&) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth = 0;
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_xml.h
+
+// end catch_external_interfaces.h
+#endif
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+// start catch_benchmarking_all.hpp
+
+// A proxy header that includes all of the benchmarking headers to allow
+// concise include of the benchmarking features. You should prefer the
+// individual includes in standard use.
+
+// start catch_benchmark.hpp
+
+ // Benchmark
+
+// start catch_chronometer.hpp
+
+// User-facing chronometer
+
+
+// start catch_clock.hpp
+
+// Clocks
+
+
+#include <chrono>
+#include <ratio>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
+
+        template <typename Clock>
+        using TimePoint = typename Clock::time_point;
+
+        using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_clock.hpp
+// start catch_optimizer.hpp
+
+ // Hinting the optimizer
+
+
+#if defined(_MSC_VER)
+#   include <atomic> // atomic_thread_fence
+#endif
+
+namespace Catch {
+    namespace Benchmark {
+#if defined(__GNUC__) || defined(__clang__)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            asm volatile("" : : "g"(p) : "memory");
+        }
+        inline void keep_memory() {
+            asm volatile("" : : : "memory");
+        }
+
+        namespace Detail {
+            inline void optimizer_barrier() { keep_memory(); }
+        } // namespace Detail
+#elif defined(_MSC_VER)
+
+#pragma optimize("", off)
+        template <typename T>
+        inline void keep_memory(T* p) {
+            // thanks @milleniumbug
+            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
+        }
+        // TODO equivalent keep_memory()
+#pragma optimize("", on)
+
+        namespace Detail {
+            inline void optimizer_barrier() {
+                std::atomic_thread_fence(std::memory_order_seq_cst);
+            }
+        } // namespace Detail
+
+#endif
+
+        template <typename T>
+        inline void deoptimize_value(T&& x) {
+            keep_memory(&x);
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
+            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
+        }
+
+        template <typename Fn, typename... Args>
+        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
+            std::forward<Fn>(fn) (std::forward<Args...>(args...));
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_optimizer.hpp
+// start catch_complete_invoke.hpp
+
+// Invoke with a special case for void
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            struct CompleteType { using type = T; };
+            template <>
+            struct CompleteType<void> { struct type {}; };
+
+            template <typename T>
+            using CompleteType_t = typename CompleteType<T>::type;
+
+            template <typename Result>
+            struct CompleteInvoker {
+                template <typename Fun, typename... Args>
+                static Result invoke(Fun&& fun, Args&&... args) {
+                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                }
+            };
+            template <>
+            struct CompleteInvoker<void> {
+                template <typename Fun, typename... Args>
+                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
+                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
+                    return {};
+                }
+            };
+
+            // invoke and not return void :(
+            template <typename Fun, typename... Args>
+            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
+                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
+            }
+
+            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
+        } // namespace Detail
+
+        template <typename Fun>
+        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
+            CATCH_TRY{
+                return Detail::complete_invoke(std::forward<Fun>(fun));
+            } CATCH_CATCH_ALL{
+                getResultCapture().benchmarkFailed(translateActiveException());
+                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
+            }
+        }
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_complete_invoke.hpp
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            struct ChronometerConcept {
+                virtual void start() = 0;
+                virtual void finish() = 0;
+                virtual ~ChronometerConcept() = default;
+            };
+            template <typename Clock>
+            struct ChronometerModel final : public ChronometerConcept {
+                void start() override { started = Clock::now(); }
+                void finish() override { finished = Clock::now(); }
+
+                ClockDuration<Clock> elapsed() const { return finished - started; }
+
+                TimePoint<Clock> started;
+                TimePoint<Clock> finished;
+            };
+        } // namespace Detail
+
+        struct Chronometer {
+        public:
+            template <typename Fun>
+            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
+
+            int runs() const { return k; }
+
+            Chronometer(Detail::ChronometerConcept& meter, int k)
+                : impl(&meter)
+                , k(k) {}
+
+        private:
+            template <typename Fun>
+            void measure(Fun&& fun, std::false_type) {
+                measure([&fun](int) { return fun(); }, std::true_type());
+            }
+
+            template <typename Fun>
+            void measure(Fun&& fun, std::true_type) {
+                Detail::optimizer_barrier();
+                impl->start();
+                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
+                impl->finish();
+                Detail::optimizer_barrier();
+            }
+
+            Detail::ChronometerConcept* impl;
+            int k;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_chronometer.hpp
+// start catch_environment.hpp
+
+// Environment information
+
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct EnvironmentEstimate {
+            Duration mean;
+            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
+        };
+        template <typename Clock>
+        struct Environment {
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_environment.hpp
+// start catch_execution_plan.hpp
+
+ // Execution plan
+
+
+// start catch_benchmark_function.hpp
+
+ // Dumb std::function implementation for consistent call overhead
+
+
+#include <cassert>
+#include <type_traits>
+#include <utility>
+#include <memory>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T>
+            using Decay = typename std::decay<T>::type;
+            template <typename T, typename U>
+            struct is_related
+                : std::is_same<Decay<T>, Decay<U>> {};
+
+            /// We need to reinvent std::function because every piece of code that might add overhead
+            /// in a measurement context needs to have consistent performance characteristics so that we
+            /// can account for it in the measurement.
+            /// Implementations of std::function with optimizations that aren't always applicable, like
+            /// small buffer optimizations, are not uncommon.
+            /// This is effectively an implementation of std::function without any such optimizations;
+            /// it may be slow, but it is consistently slow.
+            struct BenchmarkFunction {
+            private:
+                struct callable {
+                    virtual void call(Chronometer meter) const = 0;
+                    virtual callable* clone() const = 0;
+                    virtual ~callable() = default;
+                };
+                template <typename Fun>
+                struct model : public callable {
+                    model(Fun&& fun) : fun(std::move(fun)) {}
+                    model(Fun const& fun) : fun(fun) {}
+
+                    model<Fun>* clone() const override { return new model<Fun>(*this); }
+
+                    void call(Chronometer meter) const override {
+                        call(meter, is_callable<Fun(Chronometer)>());
+                    }
+                    void call(Chronometer meter, std::true_type) const {
+                        fun(meter);
+                    }
+                    void call(Chronometer meter, std::false_type) const {
+                        meter.measure(fun);
+                    }
+
+                    Fun fun;
+                };
+
+                struct do_nothing { void operator()() const {} };
+
+                template <typename T>
+                BenchmarkFunction(model<T>* c) : f(c) {}
+
+            public:
+                BenchmarkFunction()
+                    : f(new model<do_nothing>{ {} }) {}
+
+                template <typename Fun,
+                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
+                    BenchmarkFunction(Fun&& fun)
+                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
+
+                BenchmarkFunction(BenchmarkFunction&& that)
+                    : f(std::move(that.f)) {}
+
+                BenchmarkFunction(BenchmarkFunction const& that)
+                    : f(that.f->clone()) {}
+
+                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
+                    f = std::move(that.f);
+                    return *this;
+                }
+
+                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
+                    f.reset(that.f->clone());
+                    return *this;
+                }
+
+                void operator()(Chronometer meter) const { f->call(meter); }
+
+            private:
+                std::unique_ptr<callable> f;
+            };
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_benchmark_function.hpp
+// start catch_repeat.hpp
+
+// repeat algorithm
+
+
+#include <type_traits>
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Fun>
+            struct repeater {
+                void operator()(int k) const {
+                    for (int i = 0; i < k; ++i) {
+                        fun();
+                    }
+                }
+                Fun fun;
+            };
+            template <typename Fun>
+            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
+                return { std::forward<Fun>(fun) };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_repeat.hpp
+// start catch_run_for_at_least.hpp
+
+// Run a function for a minimum amount of time
+
+
+// start catch_measure.hpp
+
+// Measure
+
+
+// start catch_timing.hpp
+
+// Timing
+
+
+#include <tuple>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration, typename Result>
+        struct Timing {
+            Duration elapsed;
+            Result result;
+            int iterations;
+        };
+        template <typename Clock, typename Func, typename... Args>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_timing.hpp
+#include <utility>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun, typename... Args>
+            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
+                auto start = Clock::now();
+                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
+                auto end = Clock::now();
+                auto delta = end - start;
+                return { delta, std::forward<decltype(r)>(r), 1 };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_measure.hpp
+#include <utility>
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+                return Detail::measure<Clock>(fun, iters);
+            }
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+                Detail::ChronometerModel<Clock> meter;
+                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
+
+                return { meter.elapsed(), std::move(result), iters };
+            }
+
+            template <typename Clock, typename Fun>
+            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
+
+            struct optimized_away_error : std::exception {
+                const char* what() const noexcept override {
+                    return "could not measure benchmark, maybe it was optimized away";
+                }
+            };
+
+            template <typename Clock, typename Fun>
+            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
+                auto iters = seed;
+                while (iters < (1 << 30)) {
+                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
+
+                    if (Timing.elapsed >= how_long) {
+                        return { Timing.elapsed, std::move(Timing.result), iters };
+                    }
+                    iters *= 2;
+                }
+                throw optimized_away_error{};
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_run_for_at_least.hpp
+#include <algorithm>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct ExecutionPlan {
+            int iterations_per_sample;
+            Duration estimated_duration;
+            Detail::BenchmarkFunction benchmark;
+            Duration warmup_time;
+            int warmup_iterations;
+
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }
+
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
+                    Detail::ChronometerModel<Clock> model;
+                    this->benchmark(Chronometer(model, iterations_per_sample));
+                    auto sample_time = model.elapsed() - env.clock_cost.mean;
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
+                return times;
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_execution_plan.hpp
+// start catch_estimate_clock.hpp
+
+ // Environment measurement
+
+
+// start catch_stats.hpp
+
+// Statistical analysis tools
+
+
+#include <algorithm>
+#include <functional>
+#include <vector>
+#include <iterator>
+#include <numeric>
+#include <tuple>
+#include <cmath>
+#include <utility>
+#include <cstddef>
+#include <random>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            using sample = std::vector<double>;
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
+
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);
+
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / count;
+            }
+
+            template <typename URng, typename Iterator, typename Estimator>
+            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
+                auto n = last - first;
+                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
+
+                sample out;
+                out.reserve(resamples);
+                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+                    std::vector<double> resampled;
+                    resampled.reserve(n);
+                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
+                    return estimator(resampled.begin(), resampled.end());
+                });
+                std::sort(out.begin(), out.end());
+                return out;
+            }
+
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = last - first;
+                auto second = std::next(first);
+                sample results;
+                results.reserve(n);
+
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
+
+                return results;
+            }
+
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }
+
+            double erfc_inv(double x);
+
+            double normal_quantile(double p);
+
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                int n = static_cast<int>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
+                // degenerate case with uniform samples
+                if (prob_n == 0) return { point, point, point, confidence_level };
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n](double x) -> int {
+                    return std::lround(normal_cdf(x) * n); };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = std::max(cumn(a1), 0);
+                auto hi = std::min(cumn(a2), n - 1);
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
+
+            struct bootstrap_analysis {
+                Estimate<double> mean;
+                Estimate<double> standard_deviation;
+                double outlier_variance;
+            };
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_stats.hpp
+#include <algorithm>
+#include <iterator>
+#include <tuple>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Clock>
+            std::vector<double> resolution(int k) {
+                std::vector<TimePoint<Clock>> times;
+                times.reserve(k + 1);
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
+
+                std::vector<double> deltas;
+                deltas.reserve(k);
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
+
+                return deltas;
+            }
+
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;
+
+            template <typename Clock>
+            int warmup() {
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
+                    .iterations;
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+                    .result;
+                return {
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
+                };
+            }
+            template <typename Clock>
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
+                auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration<Clock>(clock_cost_estimation_time_limit));
+                auto time_clock = [](int k) {
+                    return Detail::measure<Clock>([k] {
+                        for (int i = 0; i < k; ++i) {
+                            volatile auto ignored = Clock::now();
+                            (void)ignored;
+                        }
+                    }).elapsed;
+                };
+                time_clock(1);
+                int iters = clock_cost_estimation_iterations;
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
+                std::vector<double> times;
+                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
+                times.reserve(nsamples);
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
+                return {
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
+                };
+            }
+
+            template <typename Clock>
+            Environment<FloatDuration<Clock>> measure_environment() {
+                static Environment<FloatDuration<Clock>>* env = nullptr;
+                if (env) {
+                    return *env;
+                }
+
+                auto iters = Detail::warmup<Clock>();
+                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
+                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
+
+                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
+                return *env;
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_estimate_clock.hpp
+// start catch_analyse.hpp
+
+ // Run and analyse one benchmark
+
+
+// start catch_sample_analysis.hpp
+
+// Benchmark results
+
+
+#include <algorithm>
+#include <vector>
+#include <string>
+#include <iterator>
+
+namespace Catch {
+    namespace Benchmark {
+        template <typename Duration>
+        struct SampleAnalysis {
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
+            OutlierClassification outliers;
+            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    std::move(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
+        };
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_sample_analysis.hpp
+#include <algorithm>
+#include <iterator>
+#include <vector>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(last - first);
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        std::move(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(last - first);
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        std::move(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+// end catch_analyse.hpp
+#include <algorithm>
+#include <functional>
+#include <string>
+#include <vector>
+#include <cmath>
+
+namespace Catch {
+    namespace Benchmark {
+        struct Benchmark {
+            Benchmark(std::string &&name)
+                : name(std::move(name)) {}
+
+            template <class FUN>
+            Benchmark(std::string &&name, FUN &&func)
+                : fun(std::move(func)), name(std::move(name)) {}
+
+            template <typename Clock>
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
+                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
+                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+            }
+
+            template <typename Clock = default_clock>
+            void run() {
+                IConfigPtr cfg = getCurrentContext().getConfig();
+
+                auto env = Detail::measure_environment<Clock>();
+
+                getResultCapture().benchmarkPreparing(name);
+                CATCH_TRY{
+                    auto plan = user_code([&] {
+                        return prepare<Clock>(*cfg, env);
+                    });
+
+                    BenchmarkInfo info {
+                        name,
+                        plan.estimated_duration.count(),
+                        plan.iterations_per_sample,
+                        cfg->benchmarkSamples(),
+                        cfg->benchmarkResamples(),
+                        env.clock_resolution.mean.count(),
+                        env.clock_cost.mean.count()
+                    };
+
+                    getResultCapture().benchmarkStarting(info);
+
+                    auto samples = user_code([&] {
+                        return plan.template run<Clock>(*cfg, env);
+                    });
+
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    getResultCapture().benchmarkEnded(stats);
+
+                } CATCH_CATCH_ALL{
+                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
+                        std::rethrow_exception(std::current_exception());
+                }
+            }
+
+            // sets lambda to be used in fun *and* executes benchmark!
+            template <typename Fun,
+                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
+                Benchmark & operator=(Fun func) {
+                fun = Detail::BenchmarkFunction(func);
+                run();
+                return *this;
+            }
+
+            explicit operator bool() {
+                return true;
+            }
+
+        private:
+            Detail::BenchmarkFunction fun;
+            std::string name;
+        };
+    }
+} // namespace Catch
+
+#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
+#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
+
+#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&](int benchmarkIndex)
+
+#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
+    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
+        BenchmarkName = [&]
+
+// end catch_benchmark.hpp
+// start catch_constructor.hpp
+
+// Constructor and destructor helpers
+
+
+#include <type_traits>
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+            template <typename T, bool Destruct>
+            struct ObjectStorage
+            {
+                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
+
+                ObjectStorage() : data() {}
+
+                ObjectStorage(const ObjectStorage& other)
+                {
+                    new(&data) T(other.stored_object());
+                }
+
+                ObjectStorage(ObjectStorage&& other)
+                {
+                    new(&data) T(std::move(other.stored_object()));
+                }
+
+                ~ObjectStorage() { destruct_on_exit<T>(); }
+
+                template <typename... Args>
+                void construct(Args&&... args)
+                {
+                    new (&data) T(std::forward<Args>(args)...);
+                }
+
+                template <bool AllowManualDestruction = !Destruct>
+                typename std::enable_if<AllowManualDestruction>::type destruct()
+                {
+                    stored_object().~T();
+                }
+
+            private:
+                // If this is a constructor benchmark, destruct the underlying object
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
+                // Otherwise, don't
+                template <typename U>
+                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
+
+                T& stored_object() {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                T const& stored_object() const {
+                    return *static_cast<T*>(static_cast<void*>(&data));
+                }
+
+                TStorage data;
+            };
+        }
+
+        template <typename T>
+        using storage_for = Detail::ObjectStorage<T, true>;
+
+        template <typename T>
+        using destructable_object = Detail::ObjectStorage<T, false>;
+    }
+}
+
+// end catch_constructor.hpp
+// end catch_benchmarking_all.hpp
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+#ifdef CATCH_IMPL
+// start catch_impl.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// Keep these here for external reporters
+// start catch_test_case_tracker.h
+
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
+        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
+            return lhs.name == rhs.name
+                && lhs.location == rhs.location;
+        }
+    };
+
+    class ITracker;
+
+    using ITrackerPtr = std::shared_ptr<ITracker>;
+
+    class  ITracker {
+        NameAndLocation m_nameAndLocation;
+
+    public:
+        ITracker(NameAndLocation const& nameAndLoc) :
+            m_nameAndLocation(nameAndLoc)
+        {}
+
+        // static queries
+        NameAndLocation const& nameAndLocation() const {
+            return m_nameAndLocation;
+        }
+
+        virtual ~ITracker();
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( ITrackerPtr const& child ) = 0;
+        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isGeneratorTracker() const = 0;
+    };
+
+    class TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        ITrackerPtr m_rootTracker;
+        ITracker* m_currentTracker = nullptr;
+        RunState m_runState = NotStarted;
+
+    public:
+
+        ITracker& startRun();
+        void endRun();
+
+        void startCycle();
+        void completeCycle();
+
+        bool completedCycle() const;
+        ITracker& currentTracker();
+        void setCurrentTracker( ITracker* tracker );
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+
+        using Children = std::vector<ITrackerPtr>;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState = NotStarted;
+
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isComplete() const override;
+        bool isSuccessfullyCompleted() const override;
+        bool isOpen() const override;
+        bool hasChildren() const override;
+
+        void addChild( ITrackerPtr const& child ) override;
+
+        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
+        ITracker& parent() override;
+
+        void openChild() override;
+
+        bool isSectionTracker() const override;
+        bool isGeneratorTracker() const override;
+
+        void open();
+
+        void close() override;
+        void fail() override;
+        void markAsNeedingAnotherRun() override;
+
+    private:
+        void moveToParent();
+        void moveToThis();
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+        std::string m_trimmed_name;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
+
+        bool isSectionTracker() const override;
+
+        bool isComplete() const override;
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
+
+        void tryOpen();
+
+        void addInitialFilters( std::vector<std::string> const& filters );
+        void addNextFilters( std::vector<std::string> const& filters );
+    };
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+// end catch_test_case_tracker.h
+
+// start catch_leak_detector.h
+
+namespace Catch {
+
+    struct LeakDetector {
+        LeakDetector();
+        ~LeakDetector();
+    };
+
+}
+// end catch_leak_detector.h
+// Cpp files will be included in the single-header file here
+// start catch_stats.cpp
+
+// Statistical analysis tools
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+
+#include <cassert>
+#include <random>
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+#include <future>
+#endif
+
+namespace {
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
+            double diff = b - m;
+            return a + diff * diff;
+            }) / (last - first);
+            return std::sqrt(variance);
+    }
+
+}
+
+namespace Catch {
+    namespace Benchmark {
+        namespace Detail {
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                auto count = last - first;
+                double idx = (count - 1) * k / static_cast<double>(q);
+                int j = static_cast<int>(idx);
+                double g = idx - j;
+                std::nth_element(first, first + j, last);
+                auto xj = first[j];
+                if (g == 0) return xj;
+
+                auto xj1 = *std::min_element(first + (j + 1), last);
+                return xj + g * (xj1 - xj);
+            }
+
+            double erfc_inv(double x) {
+                return erf_inv(1.0 - x);
+            }
+
+            double normal_quantile(double p) {
+                static const double ROOT_TWO = std::sqrt(2.0);
+
+                double result = 0.0;
+                assert(p >= 0 && p <= 1);
+                if (p < 0 || p > 1) {
+                    return result;
+                }
+
+                result = -erfc_inv(2.0 * p);
+                // result *= normal distribution standard deviation (1.0) * sqrt(2)
+                result *= /*sd * */ ROOT_TWO;
+                // result += normal disttribution mean (0)
+                return result;
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = std::min(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;
+
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
+                };
+
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2;
+            }
+
+            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
+                auto stddev = &standard_deviation;
+
+#if defined(CATCH_CONFIG_USE_ASYNC)
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    return std::async(std::launch::async, [=] {
+                        std::mt19937 rng(seed);
+                        auto resampled = resample(rng, n_resamples, first, last, f);
+                        return bootstrap(confidence_level, first, last, resampled, f);
+                    });
+                };
+
+                auto mean_future = Estimate(mean);
+                auto stddev_future = Estimate(stddev);
+
+                auto mean_estimate = mean_future.get();
+                auto stddev_estimate = stddev_future.get();
+#else
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
+                    auto resampled = resample(rng, n_resamples, first, last, f);
+                    return bootstrap(confidence_level, first, last, resampled, f);
+                };
+
+                auto mean_estimate = Estimate(mean);
+                auto stddev_estimate = Estimate(stddev);
+#endif // CATCH_USE_ASYNC
+
+                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
+
+                return { mean_estimate, stddev_estimate, outlier_variance };
+            }
+        } // namespace Detail
+    } // namespace Benchmark
+} // namespace Catch
+
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+// end catch_stats.cpp
+// start catch_approx.cpp
+
+#include <cmath>
+#include <limits>
+
+namespace {
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+}
+
+namespace Catch {
+namespace Detail {
+
+    Approx::Approx ( double value )
+    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+        m_margin( 0.0 ),
+        m_scale( 0.0 ),
+        m_value( value )
+    {}
+
+    Approx Approx::custom() {
+        return Approx( 0 );
+    }
+
+    Approx Approx::operator-() const {
+        auto temp(*this);
+        temp.m_value = -temp.m_value;
+        return temp;
+    }
+
+    std::string Approx::toString() const {
+        ReusableStringStream rss;
+        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
+        return rss.str();
+    }
+
+    bool Approx::equalityComparisonImpl(const double other) const {
+        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
+        // Thanks to Richard Harris for his help refining the scaled margin value
+        return marginComparison(m_value, other, m_margin)
+            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
+    }
+
+    void Approx::setMargin(double newMargin) {
+        CATCH_ENFORCE(newMargin >= 0,
+            "Invalid Approx::margin: " << newMargin << '.'
+            << " Approx::Margin has to be non-negative.");
+        m_margin = newMargin;
+    }
+
+    void Approx::setEpsilon(double newEpsilon) {
+        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
+            "Invalid Approx::epsilon: " << newEpsilon << '.'
+            << " Approx::epsilon has to be in [0, 1]");
+        m_epsilon = newEpsilon;
+    }
+
+} // end namespace Detail
+
+namespace literals {
+    Detail::Approx operator "" _a(long double val) {
+        return Detail::Approx(val);
+    }
+    Detail::Approx operator "" _a(unsigned long long val) {
+        return Detail::Approx(val);
+    }
+} // end namespace literals
+
+std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+    return value.toString();
+}
+
+} // end namespace Catch
+// end catch_approx.cpp
+// start catch_assertionhandler.cpp
+
+// start catch_debugger.h
+
+namespace Catch {
+    bool isDebuggerActive();
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
+
+#elif defined(CATCH_PLATFORM_IPHONE)
+
+    // use inline assembler
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP()  __asm__("int $3")
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #elif defined(__arm__) && !defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
+    #elif defined(__arm__) &&  defined(__thumb__)
+        #define CATCH_TRAP()  __asm__(".inst 0xde01")
+    #endif
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifndef CATCH_BREAK_INTO_DEBUGGER
+    #ifdef CATCH_TRAP
+        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
+    #else
+        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
+    #endif
+#endif
+
+// end catch_debugger.h
+// start catch_run_context.h
+
+// start catch_fatal_condition.h
+
+// start catch_windows_h_proxy.h
+
+
+#if defined(CATCH_PLATFORM_WINDOWS)
+
+#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#  define CATCH_DEFINED_NOMINMAX
+#  define NOMINMAX
+#endif
+#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINED_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+#endif // defined(CATCH_PLATFORM_WINDOWS)
+
+// end catch_windows_h_proxy.h
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
+        FatalConditionHandler();
+        static void reset();
+        ~FatalConditionHandler();
+
+    private:
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static PVOID exceptionHandlerHandle;
+    };
+
+} // namespace Catch
+
+#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct FatalConditionHandler {
+
+        static bool isSet;
+        static struct sigaction oldSigActions[];
+        static stack_t oldSigStack;
+        static char altStackMem[];
+
+        static void handleSignal( int sig );
+
+        FatalConditionHandler();
+        ~FatalConditionHandler();
+        static void reset();
+    };
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset();
+    };
+}
+
+#endif
+
+// end catch_fatal_condition.h
+#include <string>
+
+namespace Catch {
+
+    struct IMutableContext;
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+    public:
+        RunContext( RunContext const& ) = delete;
+        RunContext& operator =( RunContext const& ) = delete;
+
+        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
+
+        ~RunContext() override;
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
+
+        Totals runTest(TestCase const& testCase);
+
+        IConfigPtr config() const;
+        IStreamingReporter& reporter() const;
+
+    public: // IResultCapture
+
+        // Assertion handlers
+        void handleExpr
+                (   AssertionInfo const& info,
+                    ITransientExpression const& expr,
+                    AssertionReaction& reaction ) override;
+        void handleMessage
+                (   AssertionInfo const& info,
+                    ResultWas::OfType resultType,
+                    StringRef const& message,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedExceptionNotThrown
+                (   AssertionInfo const& info,
+                    AssertionReaction& reaction ) override;
+        void handleUnexpectedInflightException
+                (   AssertionInfo const& info,
+                    std::string const& message,
+                    AssertionReaction& reaction ) override;
+        void handleIncomplete
+                (   AssertionInfo const& info ) override;
+        void handleNonExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    AssertionReaction &reaction ) override;
+
+        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
+
+        void sectionEnded( SectionEndInfo const& endInfo ) override;
+        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
+
+        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing( std::string const& name ) override;
+        void benchmarkStarting( BenchmarkInfo const& info ) override;
+        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
+        void benchmarkFailed( std::string const& error ) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void pushScopedMessage( MessageInfo const& message ) override;
+        void popScopedMessage( MessageInfo const& message ) override;
+
+        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
+
+        std::string getCurrentTestName() const override;
+
+        const AssertionResult* getLastResult() const override;
+
+        void exceptionEarlyReported() override;
+
+        void handleFatalErrorCondition( StringRef message ) override;
+
+        bool lastAssertionPassed() override;
+
+        void assertionPassed() override;
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const final;
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
+        void invokeActiveTestCase();
+
+        void resetAssertionInfo();
+        bool testForMissingAssertions( Counts& assertions );
+
+        void assertionEnded( AssertionResult const& result );
+        void reportExpr
+                (   AssertionInfo const &info,
+                    ResultWas::OfType resultType,
+                    ITransientExpression const *expr,
+                    bool negated );
+
+        void populateReaction( AssertionReaction& reaction );
+
+    private:
+
+        void handleUnfinishedSections();
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase = nullptr;
+        ITracker* m_testCaseTracker = nullptr;
+        Option<AssertionResult> m_lastResult;
+
+        IConfigPtr m_config;
+        Totals m_totals;
+        IStreamingReporterPtr m_reporter;
+        std::vector<MessageInfo> m_messages;
+        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        bool m_lastAssertionPassed = false;
+        bool m_shouldReportUnexpected = true;
+        bool m_includeSuccessfulResults;
+    };
+
+    void seedRng(IConfig const& config);
+    unsigned int rngSeed();
+} // end namespace Catch
+
+// end catch_run_context.h
+namespace Catch {
+
+    namespace {
+        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
+            expr.streamReconstructedExpression( os );
+            return os;
+        }
+    }
+
+    LazyExpression::LazyExpression( bool isNegated )
+    :   m_isNegated( isNegated )
+    {}
+
+    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
+
+    LazyExpression::operator bool() const {
+        return m_transientExpression != nullptr;
+    }
+
+    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
+        if( lazyExpr.m_isNegated )
+            os << "!";
+
+        if( lazyExpr ) {
+            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
+                os << "(" << *lazyExpr.m_transientExpression << ")";
+            else
+                os << *lazyExpr.m_transientExpression;
+        }
+        else {
+            os << "{** error - unchecked empty expression requested **}";
+        }
+        return os;
+    }
+
+    AssertionHandler::AssertionHandler
+        (   StringRef const& macroName,
+            SourceLineInfo const& lineInfo,
+            StringRef capturedExpression,
+            ResultDisposition::Flags resultDisposition )
+    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
+        m_resultCapture( getResultCapture() )
+    {}
+
+    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
+        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
+    }
+    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
+        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
+    }
+
+    auto AssertionHandler::allowThrows() const -> bool {
+        return getCurrentContext().getConfig()->allowThrows();
+    }
+
+    void AssertionHandler::complete() {
+        setCompleted();
+        if( m_reaction.shouldDebugBreak ) {
+
+            // If you find your debugger stopping you here then go one level up on the
+            // call-stack for the code that caused it (typically a failed assertion)
+
+            // (To go back to the test and change execution, jump over the throw, next)
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+        if (m_reaction.shouldThrow) {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+            throw Catch::TestFailureException();
+#else
+            CATCH_ERROR( "Test failure requires aborting test!" );
+#endif
+        }
+    }
+    void AssertionHandler::setCompleted() {
+        m_completed = true;
+    }
+
+    void AssertionHandler::handleUnexpectedInflightException() {
+        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
+    }
+
+    void AssertionHandler::handleExceptionThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+    void AssertionHandler::handleExceptionNotThrownAsExpected() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
+        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
+    }
+
+    void AssertionHandler::handleThrowingCallSkipped() {
+        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
+    }
+
+    // This is the overload that takes a string and infers the Equals matcher from it
+    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
+    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
+        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
+    }
+
+} // namespace Catch
+// end catch_assertionhandler.cpp
+// start catch_assertionresult.cpp
+
+namespace Catch {
+    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
+        lazyExpression(_lazyExpression),
+        resultType(_resultType) {}
+
+    std::string AssertionResultData::reconstructExpression() const {
+
+        if( reconstructedExpression.empty() ) {
+            if( lazyExpression ) {
+                ReusableStringStream rss;
+                rss << lazyExpression;
+                reconstructedExpression = rss.str();
+            }
+        }
+        return reconstructedExpression;
+    }
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return !m_info.capturedExpression.empty();
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string AssertionResult::getExpression() const {
+        // Possibly overallocating by 3 characters should be basically free
+        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += "!(";
+        }
+        expr += m_info.capturedExpression;
+        if (isFalseTest(m_info.resultDisposition)) {
+            expr += ')';
+        }
+        return expr;
+    }
+
+    std::string AssertionResult::getExpressionInMacro() const {
+        std::string expr;
+        if( m_info.macroName.empty() )
+            expr = static_cast<std::string>(m_info.capturedExpression);
+        else {
+            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
+            expr += m_info.macroName;
+            expr += "( ";
+            expr += m_info.capturedExpression;
+            expr += " )";
+        }
+        return expr;
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        std::string expr = m_resultData.reconstructExpression();
+        return expr.empty()
+                ? getExpression()
+                : expr;
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    StringRef AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+} // end namespace Catch
+// end catch_assertionresult.cpp
+// start catch_capture_matchers.cpp
+
+namespace Catch {
+
+    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
+
+    // This is the general overload that takes a any string matcher
+    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
+    // the Equals matcher (so the header does not mention matchers)
+    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
+        std::string exceptionMessage = Catch::translateActiveException();
+        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
+        handler.handleExpr( expr );
+    }
+
+} // namespace Catch
+// end catch_capture_matchers.cpp
+// start catch_commandline.cpp
+
+// start catch_commandline.h
+
+// start catch_clara.h
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#endif
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#pragma clang diagnostic ignored "-Wexit-time-destructors"
+#pragma clang diagnostic ignored "-Wshadow"
+#endif
+
+// start clara.hpp
+// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// See https://github.com/philsquared/Clara for more details
+
+// Clara v1.1.5
+
+
+#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#ifndef CLARA_CONFIG_OPTIONAL_TYPE
+#ifdef __has_include
+#if __has_include(<optional>) && __cplusplus >= 201703L
+#include <optional>
+#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
+#endif
+#endif
+#endif
+
+// ----------- #included from clara_textflow.hpp -----------
+
+// TextFlowCpp
+//
+// A single-header library for wrapping and laying out basic text, by Phil Nash
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// This project is hosted at https://github.com/philsquared/textflowcpp
+
+
+#include <cassert>
+#include <ostream>
+#include <sstream>
+#include <vector>
+
+#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+namespace clara {
+namespace TextFlow {
+
+inline auto isWhitespace(char c) -> bool {
+	static std::string chars = " \t\n\r";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableBefore(char c) -> bool {
+	static std::string chars = "[({<|";
+	return chars.find(c) != std::string::npos;
+}
+inline auto isBreakableAfter(char c) -> bool {
+	static std::string chars = "])}>.,:;*+-=&/\\";
+	return chars.find(c) != std::string::npos;
+}
+
+class Columns;
+
+class Column {
+	std::vector<std::string> m_strings;
+	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
+	size_t m_indent = 0;
+	size_t m_initialIndent = std::string::npos;
+
+public:
+	class iterator {
+		friend Column;
+
+		Column const& m_column;
+		size_t m_stringIndex = 0;
+		size_t m_pos = 0;
+
+		size_t m_len = 0;
+		size_t m_end = 0;
+		bool m_suffix = false;
+
+		iterator(Column const& column, size_t stringIndex)
+			: m_column(column),
+			m_stringIndex(stringIndex) {}
+
+		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
+
+		auto isBoundary(size_t at) const -> bool {
+			assert(at > 0);
+			assert(at <= line().size());
+
+			return at == line().size() ||
+				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
+				isBreakableBefore(line()[at]) ||
+				isBreakableAfter(line()[at - 1]);
+		}
+
+		void calcLength() {
+			assert(m_stringIndex < m_column.m_strings.size());
+
+			m_suffix = false;
+			auto width = m_column.m_width - indent();
+			m_end = m_pos;
+			if (line()[m_pos] == '\n') {
+				++m_end;
+			}
+			while (m_end < line().size() && line()[m_end] != '\n')
+				++m_end;
+
+			if (m_end < m_pos + width) {
+				m_len = m_end - m_pos;
+			} else {
+				size_t len = width;
+				while (len > 0 && !isBoundary(m_pos + len))
+					--len;
+				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
+					--len;
+
+				if (len > 0) {
+					m_len = len;
+				} else {
+					m_suffix = true;
+					m_len = width - 1;
+				}
+			}
+		}
+
+		auto indent() const -> size_t {
+			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
+			return initial == std::string::npos ? m_column.m_indent : initial;
+		}
+
+		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
+			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Column const& column) : m_column(column) {
+			assert(m_column.m_width > m_column.m_indent);
+			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
+			calcLength();
+			if (m_len == 0)
+				m_stringIndex++; // Empty string
+		}
+
+		auto operator *() const -> std::string {
+			assert(m_stringIndex < m_column.m_strings.size());
+			assert(m_pos <= m_end);
+			return addIndentAndSuffix(line().substr(m_pos, m_len));
+		}
+
+		auto operator ++() -> iterator& {
+			m_pos += m_len;
+			if (m_pos < line().size() && line()[m_pos] == '\n')
+				m_pos += 1;
+			else
+				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
+					++m_pos;
+
+			if (m_pos == line().size()) {
+				m_pos = 0;
+				++m_stringIndex;
+			}
+			if (m_stringIndex < m_column.m_strings.size())
+				calcLength();
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return
+				m_pos == other.m_pos &&
+				m_stringIndex == other.m_stringIndex &&
+				&m_column == &other.m_column;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return !operator==(other);
+		}
+	};
+	using const_iterator = iterator;
+
+	explicit Column(std::string const& text) { m_strings.push_back(text); }
+
+	auto width(size_t newWidth) -> Column& {
+		assert(newWidth > 0);
+		m_width = newWidth;
+		return *this;
+	}
+	auto indent(size_t newIndent) -> Column& {
+		m_indent = newIndent;
+		return *this;
+	}
+	auto initialIndent(size_t newIndent) -> Column& {
+		m_initialIndent = newIndent;
+		return *this;
+	}
+
+	auto width() const -> size_t { return m_width; }
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, m_strings.size() }; }
+
+	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
+		bool first = true;
+		for (auto line : col) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto operator + (Column const& other)->Columns;
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+class Spacer : public Column {
+
+public:
+	explicit Spacer(size_t spaceWidth) : Column("") {
+		width(spaceWidth);
+	}
+};
+
+class Columns {
+	std::vector<Column> m_columns;
+
+public:
+
+	class iterator {
+		friend Columns;
+		struct EndTag {};
+
+		std::vector<Column> const& m_columns;
+		std::vector<Column::iterator> m_iterators;
+		size_t m_activeIterators;
+
+		iterator(Columns const& columns, EndTag)
+			: m_columns(columns.m_columns),
+			m_activeIterators(0) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.end());
+		}
+
+	public:
+		using difference_type = std::ptrdiff_t;
+		using value_type = std::string;
+		using pointer = value_type * ;
+		using reference = value_type & ;
+		using iterator_category = std::forward_iterator_tag;
+
+		explicit iterator(Columns const& columns)
+			: m_columns(columns.m_columns),
+			m_activeIterators(m_columns.size()) {
+			m_iterators.reserve(m_columns.size());
+
+			for (auto const& col : m_columns)
+				m_iterators.push_back(col.begin());
+		}
+
+		auto operator ==(iterator const& other) const -> bool {
+			return m_iterators == other.m_iterators;
+		}
+		auto operator !=(iterator const& other) const -> bool {
+			return m_iterators != other.m_iterators;
+		}
+		auto operator *() const -> std::string {
+			std::string row, padding;
+
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				auto width = m_columns[i].width();
+				if (m_iterators[i] != m_columns[i].end()) {
+					std::string col = *m_iterators[i];
+					row += padding + col;
+					if (col.size() < width)
+						padding = std::string(width - col.size(), ' ');
+					else
+						padding = "";
+				} else {
+					padding += std::string(width, ' ');
+				}
+			}
+			return row;
+		}
+		auto operator ++() -> iterator& {
+			for (size_t i = 0; i < m_columns.size(); ++i) {
+				if (m_iterators[i] != m_columns[i].end())
+					++m_iterators[i];
+			}
+			return *this;
+		}
+		auto operator ++(int) -> iterator {
+			iterator prev(*this);
+			operator++();
+			return prev;
+		}
+	};
+	using const_iterator = iterator;
+
+	auto begin() const -> iterator { return iterator(*this); }
+	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
+
+	auto operator += (Column const& col) -> Columns& {
+		m_columns.push_back(col);
+		return *this;
+	}
+	auto operator + (Column const& col) -> Columns {
+		Columns combined = *this;
+		combined += col;
+		return combined;
+	}
+
+	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
+
+		bool first = true;
+		for (auto line : cols) {
+			if (first)
+				first = false;
+			else
+				os << "\n";
+			os << line;
+		}
+		return os;
+	}
+
+	auto toString() const -> std::string {
+		std::ostringstream oss;
+		oss << *this;
+		return oss.str();
+	}
+};
+
+inline auto Column::operator + (Column const& other) -> Columns {
+	Columns cols;
+	cols += *this;
+	cols += other;
+	return cols;
+}
+}
+
+}
+}
+
+// ----------- end of #include from clara_textflow.hpp -----------
+// ........... back in clara.hpp
+
+#include <cctype>
+#include <string>
+#include <memory>
+#include <set>
+#include <algorithm>
+
+#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
+#define CATCH_PLATFORM_WINDOWS
+#endif
+
+namespace Catch { namespace clara {
+namespace detail {
+
+    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
+    template<typename L>
+    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
+
+    template<typename ClassT, typename ReturnT, typename... Args>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
+        static const bool isValid = false;
+    };
+
+    template<typename ClassT, typename ReturnT, typename ArgT>
+    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
+        static const bool isValid = true;
+        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
+        using ReturnType = ReturnT;
+    };
+
+    class TokenStream;
+
+    // Transport for raw args (copied from main args, or supplied via init list for testing)
+    class Args {
+        friend TokenStream;
+        std::string m_exeName;
+        std::vector<std::string> m_args;
+
+    public:
+        Args( int argc, char const* const* argv )
+            : m_exeName(argv[0]),
+              m_args(argv + 1, argv + argc) {}
+
+        Args( std::initializer_list<std::string> args )
+        :   m_exeName( *args.begin() ),
+            m_args( args.begin()+1, args.end() )
+        {}
+
+        auto exeName() const -> std::string {
+            return m_exeName;
+        }
+    };
+
+    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
+    // may encode an option + its argument if the : or = form is used
+    enum class TokenType {
+        Option, Argument
+    };
+    struct Token {
+        TokenType type;
+        std::string token;
+    };
+
+    inline auto isOptPrefix( char c ) -> bool {
+        return c == '-'
+#ifdef CATCH_PLATFORM_WINDOWS
+            || c == '/'
+#endif
+        ;
+    }
+
+    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
+    class TokenStream {
+        using Iterator = std::vector<std::string>::const_iterator;
+        Iterator it;
+        Iterator itEnd;
+        std::vector<Token> m_tokenBuffer;
+
+        void loadBuffer() {
+            m_tokenBuffer.resize( 0 );
+
+            // Skip any empty strings
+            while( it != itEnd && it->empty() )
+                ++it;
+
+            if( it != itEnd ) {
+                auto const &next = *it;
+                if( isOptPrefix( next[0] ) ) {
+                    auto delimiterPos = next.find_first_of( " :=" );
+                    if( delimiterPos != std::string::npos ) {
+                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
+                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
+                    } else {
+                        if( next[1] != '-' && next.size() > 2 ) {
+                            std::string opt = "- ";
+                            for( size_t i = 1; i < next.size(); ++i ) {
+                                opt[1] = next[i];
+                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
+                            }
+                        } else {
+                            m_tokenBuffer.push_back( { TokenType::Option, next } );
+                        }
+                    }
+                } else {
+                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
+                }
+            }
+        }
+
+    public:
+        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
+
+        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
+            loadBuffer();
+        }
+
+        explicit operator bool() const {
+            return !m_tokenBuffer.empty() || it != itEnd;
+        }
+
+        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
+
+        auto operator*() const -> Token {
+            assert( !m_tokenBuffer.empty() );
+            return m_tokenBuffer.front();
+        }
+
+        auto operator->() const -> Token const * {
+            assert( !m_tokenBuffer.empty() );
+            return &m_tokenBuffer.front();
+        }
+
+        auto operator++() -> TokenStream & {
+            if( m_tokenBuffer.size() >= 2 ) {
+                m_tokenBuffer.erase( m_tokenBuffer.begin() );
+            } else {
+                if( it != itEnd )
+                    ++it;
+                loadBuffer();
+            }
+            return *this;
+        }
+    };
+
+    class ResultBase {
+    public:
+        enum Type {
+            Ok, LogicError, RuntimeError
+        };
+
+    protected:
+        ResultBase( Type type ) : m_type( type ) {}
+        virtual ~ResultBase() = default;
+
+        virtual void enforceOk() const = 0;
+
+        Type m_type;
+    };
+
+    template<typename T>
+    class ResultValueBase : public ResultBase {
+    public:
+        auto value() const -> T const & {
+            enforceOk();
+            return m_value;
+        }
+
+    protected:
+        ResultValueBase( Type type ) : ResultBase( type ) {}
+
+        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+        }
+
+        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
+            new( &m_value ) T( value );
+        }
+
+        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
+            if( m_type == ResultBase::Ok )
+                m_value.~T();
+            ResultBase::operator=(other);
+            if( m_type == ResultBase::Ok )
+                new( &m_value ) T( other.m_value );
+            return *this;
+        }
+
+        ~ResultValueBase() override {
+            if( m_type == Ok )
+                m_value.~T();
+        }
+
+        union {
+            T m_value;
+        };
+    };
+
+    template<>
+    class ResultValueBase<void> : public ResultBase {
+    protected:
+        using ResultBase::ResultBase;
+    };
+
+    template<typename T = void>
+    class BasicResult : public ResultValueBase<T> {
+    public:
+        template<typename U>
+        explicit BasicResult( BasicResult<U> const &other )
+        :   ResultValueBase<T>( other.type() ),
+            m_errorMessage( other.errorMessage() )
+        {
+            assert( type() != ResultBase::Ok );
+        }
+
+        template<typename U>
+        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
+        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
+        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
+        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
+
+        explicit operator bool() const { return m_type == ResultBase::Ok; }
+        auto type() const -> ResultBase::Type { return m_type; }
+        auto errorMessage() const -> std::string { return m_errorMessage; }
+
+    protected:
+        void enforceOk() const override {
+
+            // Errors shouldn't reach this point, but if they do
+            // the actual error message will be in m_errorMessage
+            assert( m_type != ResultBase::LogicError );
+            assert( m_type != ResultBase::RuntimeError );
+            if( m_type != ResultBase::Ok )
+                std::abort();
+        }
+
+        std::string m_errorMessage; // Only populated if resultType is an error
+
+        BasicResult( ResultBase::Type type, std::string const &message )
+        :   ResultValueBase<T>(type),
+            m_errorMessage(message)
+        {
+            assert( m_type != ResultBase::Ok );
+        }
+
+        using ResultValueBase<T>::ResultValueBase;
+        using ResultBase::m_type;
+    };
+
+    enum class ParseResultType {
+        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
+    };
+
+    class ParseState {
+    public:
+
+        ParseState( ParseResultType type, TokenStream const &remainingTokens )
+        : m_type(type),
+          m_remainingTokens( remainingTokens )
+        {}
+
+        auto type() const -> ParseResultType { return m_type; }
+        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
+
+    private:
+        ParseResultType m_type;
+        TokenStream m_remainingTokens;
+    };
+
+    using Result = BasicResult<void>;
+    using ParserResult = BasicResult<ParseResultType>;
+    using InternalParseResult = BasicResult<ParseState>;
+
+    struct HelpColumns {
+        std::string left;
+        std::string right;
+    };
+
+    template<typename T>
+    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
+        std::stringstream ss;
+        ss << source;
+        ss >> target;
+        if( ss.fail() )
+            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
+        else
+            return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
+        target = source;
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
+        std::string srcLC = source;
+        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
+        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
+            target = true;
+        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
+            target = false;
+        else
+            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
+        return ParserResult::ok( ParseResultType::Matched );
+    }
+#ifdef CLARA_CONFIG_OPTIONAL_TYPE
+    template<typename T>
+    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
+        T temp;
+        auto result = convertInto( source, temp );
+        if( result )
+            target = std::move(temp);
+        return result;
+    }
+#endif // CLARA_CONFIG_OPTIONAL_TYPE
+
+    struct NonCopyable {
+        NonCopyable() = default;
+        NonCopyable( NonCopyable const & ) = delete;
+        NonCopyable( NonCopyable && ) = delete;
+        NonCopyable &operator=( NonCopyable const & ) = delete;
+        NonCopyable &operator=( NonCopyable && ) = delete;
+    };
+
+    struct BoundRef : NonCopyable {
+        virtual ~BoundRef() = default;
+        virtual auto isContainer() const -> bool { return false; }
+        virtual auto isFlag() const -> bool { return false; }
+    };
+    struct BoundValueRefBase : BoundRef {
+        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
+    };
+    struct BoundFlagRefBase : BoundRef {
+        virtual auto setFlag( bool flag ) -> ParserResult = 0;
+        virtual auto isFlag() const -> bool { return true; }
+    };
+
+    template<typename T>
+    struct BoundValueRef : BoundValueRefBase {
+        T &m_ref;
+
+        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return convertInto( arg, m_ref );
+        }
+    };
+
+    template<typename T>
+    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
+        std::vector<T> &m_ref;
+
+        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
+
+        auto isContainer() const -> bool override { return true; }
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            T temp;
+            auto result = convertInto( arg, temp );
+            if( result )
+                m_ref.push_back( temp );
+            return result;
+        }
+    };
+
+    struct BoundFlagRef : BoundFlagRefBase {
+        bool &m_ref;
+
+        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            m_ref = flag;
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ReturnType>
+    struct LambdaInvoker {
+        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
+
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            return lambda( arg );
+        }
+    };
+
+    template<>
+    struct LambdaInvoker<void> {
+        template<typename L, typename ArgType>
+        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
+            lambda( arg );
+            return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    template<typename ArgType, typename L>
+    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
+        ArgType temp{};
+        auto result = convertInto( arg, temp );
+        return !result
+           ? result
+           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
+    }
+
+    template<typename L>
+    struct BoundLambda : BoundValueRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setValue( std::string const &arg ) -> ParserResult override {
+            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
+        }
+    };
+
+    template<typename L>
+    struct BoundFlagLambda : BoundFlagRefBase {
+        L m_lambda;
+
+        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
+        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
+
+        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
+
+        auto setFlag( bool flag ) -> ParserResult override {
+            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
+        }
+    };
+
+    enum class Optionality { Optional, Required };
+
+    struct Parser;
+
+    class ParserBase {
+    public:
+        virtual ~ParserBase() = default;
+        virtual auto validate() const -> Result { return Result::ok(); }
+        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
+        virtual auto cardinality() const -> size_t { return 1; }
+
+        auto parse( Args const &args ) const -> InternalParseResult {
+            return parse( args.exeName(), TokenStream( args ) );
+        }
+    };
+
+    template<typename DerivedT>
+    class ComposableParserImpl : public ParserBase {
+    public:
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser;
+
+		template<typename T>
+        auto operator+( T const &other ) const -> Parser;
+    };
+
+    // Common code and state for Args and Opts
+    template<typename DerivedT>
+    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
+    protected:
+        Optionality m_optionality = Optionality::Optional;
+        std::shared_ptr<BoundRef> m_ref;
+        std::string m_hint;
+        std::string m_description;
+
+        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
+
+    public:
+        template<typename T>
+        ParserRefImpl( T &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
+            m_hint( hint )
+        {}
+
+        template<typename LambdaT>
+        ParserRefImpl( LambdaT const &ref, std::string const &hint )
+        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
+            m_hint(hint)
+        {}
+
+        auto operator()( std::string const &description ) -> DerivedT & {
+            m_description = description;
+            return static_cast<DerivedT &>( *this );
+        }
+
+        auto optional() -> DerivedT & {
+            m_optionality = Optionality::Optional;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto required() -> DerivedT & {
+            m_optionality = Optionality::Required;
+            return static_cast<DerivedT &>( *this );
+        };
+
+        auto isOptional() const -> bool {
+            return m_optionality == Optionality::Optional;
+        }
+
+        auto cardinality() const -> size_t override {
+            if( m_ref->isContainer() )
+                return 0;
+            else
+                return 1;
+        }
+
+        auto hint() const -> std::string { return m_hint; }
+    };
+
+    class ExeName : public ComposableParserImpl<ExeName> {
+        std::shared_ptr<std::string> m_name;
+        std::shared_ptr<BoundValueRefBase> m_ref;
+
+        template<typename LambdaT>
+        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
+            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
+        }
+
+    public:
+        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
+
+        explicit ExeName( std::string &ref ) : ExeName() {
+            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
+        }
+
+        template<typename LambdaT>
+        explicit ExeName( LambdaT const& lambda ) : ExeName() {
+            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
+        }
+
+        // The exe name is not parsed out of the normal tokens, but is handled specially
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+        }
+
+        auto name() const -> std::string { return *m_name; }
+        auto set( std::string const& newName ) -> ParserResult {
+
+            auto lastSlash = newName.find_last_of( "\\/" );
+            auto filename = ( lastSlash == std::string::npos )
+                    ? newName
+                    : newName.substr( lastSlash+1 );
+
+            *m_name = filename;
+            if( m_ref )
+                return m_ref->setValue( filename );
+            else
+                return ParserResult::ok( ParseResultType::Matched );
+        }
+    };
+
+    class Arg : public ParserRefImpl<Arg> {
+    public:
+        using ParserRefImpl::ParserRefImpl;
+
+        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            auto const &token = *remainingTokens;
+            if( token.type != TokenType::Argument )
+                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+
+            assert( !m_ref->isFlag() );
+            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+
+            auto result = valueRef->setValue( remainingTokens->token );
+            if( !result )
+                return InternalParseResult( result );
+            else
+                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+        }
+    };
+
+    inline auto normaliseOpt( std::string const &optName ) -> std::string {
+#ifdef CATCH_PLATFORM_WINDOWS
+        if( optName[0] == '/' )
+            return "-" + optName.substr( 1 );
+        else
+#endif
+            return optName;
+    }
+
+    class Opt : public ParserRefImpl<Opt> {
+    protected:
+        std::vector<std::string> m_optNames;
+
+    public:
+        template<typename LambdaT>
+        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
+
+        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
+
+        template<typename LambdaT>
+        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        template<typename T>
+        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
+
+        auto operator[]( std::string const &optName ) -> Opt & {
+            m_optNames.push_back( optName );
+            return *this;
+        }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::ostringstream oss;
+            bool first = true;
+            for( auto const &opt : m_optNames ) {
+                if (first)
+                    first = false;
+                else
+                    oss << ", ";
+                oss << opt;
+            }
+            if( !m_hint.empty() )
+                oss << " <" << m_hint << ">";
+            return { { oss.str(), m_description } };
+        }
+
+        auto isMatch( std::string const &optToken ) const -> bool {
+            auto normalisedToken = normaliseOpt( optToken );
+            for( auto const &name : m_optNames ) {
+                if( normaliseOpt( name ) == normalisedToken )
+                    return true;
+            }
+            return false;
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
+            auto validationResult = validate();
+            if( !validationResult )
+                return InternalParseResult( validationResult );
+
+            auto remainingTokens = tokens;
+            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
+                auto const &token = *remainingTokens;
+                if( isMatch(token.token ) ) {
+                    if( m_ref->isFlag() ) {
+                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
+                        auto result = flagRef->setFlag( true );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    } else {
+                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
+                        ++remainingTokens;
+                        if( !remainingTokens )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto const &argToken = *remainingTokens;
+                        if( argToken.type != TokenType::Argument )
+                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
+                        auto result = valueRef->setValue( argToken.token );
+                        if( !result )
+                            return InternalParseResult( result );
+                        if( result.value() == ParseResultType::ShortCircuitAll )
+                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
+                    }
+                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
+                }
+            }
+            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
+        }
+
+        auto validate() const -> Result override {
+            if( m_optNames.empty() )
+                return Result::logicError( "No options supplied to Opt" );
+            for( auto const &name : m_optNames ) {
+                if( name.empty() )
+                    return Result::logicError( "Option name cannot be empty" );
+#ifdef CATCH_PLATFORM_WINDOWS
+                if( name[0] != '-' && name[0] != '/' )
+                    return Result::logicError( "Option name must begin with '-' or '/'" );
+#else
+                if( name[0] != '-' )
+                    return Result::logicError( "Option name must begin with '-'" );
+#endif
+            }
+            return ParserRefImpl::validate();
+        }
+    };
+
+    struct Help : Opt {
+        Help( bool &showHelpFlag )
+        :   Opt([&]( bool flag ) {
+                showHelpFlag = flag;
+                return ParserResult::ok( ParseResultType::ShortCircuitAll );
+            })
+        {
+            static_cast<Opt &>( *this )
+                    ("display usage information")
+                    ["-?"]["-h"]["--help"]
+                    .optional();
+        }
+    };
+
+    struct Parser : ParserBase {
+
+        mutable ExeName m_exeName;
+        std::vector<Opt> m_options;
+        std::vector<Arg> m_args;
+
+        auto operator|=( ExeName const &exeName ) -> Parser & {
+            m_exeName = exeName;
+            return *this;
+        }
+
+        auto operator|=( Arg const &arg ) -> Parser & {
+            m_args.push_back(arg);
+            return *this;
+        }
+
+        auto operator|=( Opt const &opt ) -> Parser & {
+            m_options.push_back(opt);
+            return *this;
+        }
+
+        auto operator|=( Parser const &other ) -> Parser & {
+            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
+            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
+            return *this;
+        }
+
+        template<typename T>
+        auto operator|( T const &other ) const -> Parser {
+            return Parser( *this ) |= other;
+        }
+
+        // Forward deprecated interface with '+' instead of '|'
+        template<typename T>
+        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
+        template<typename T>
+        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
+
+        auto getHelpColumns() const -> std::vector<HelpColumns> {
+            std::vector<HelpColumns> cols;
+            for (auto const &o : m_options) {
+                auto childCols = o.getHelpColumns();
+                cols.insert( cols.end(), childCols.begin(), childCols.end() );
+            }
+            return cols;
+        }
+
+        void writeToStream( std::ostream &os ) const {
+            if (!m_exeName.name().empty()) {
+                os << "usage:\n" << "  " << m_exeName.name() << " ";
+                bool required = true, first = true;
+                for( auto const &arg : m_args ) {
+                    if (first)
+                        first = false;
+                    else
+                        os << " ";
+                    if( arg.isOptional() && required ) {
+                        os << "[";
+                        required = false;
+                    }
+                    os << "<" << arg.hint() << ">";
+                    if( arg.cardinality() == 0 )
+                        os << " ... ";
+                }
+                if( !required )
+                    os << "]";
+                if( !m_options.empty() )
+                    os << " options";
+                os << "\n\nwhere options are:" << std::endl;
+            }
+
+            auto rows = getHelpColumns();
+            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
+            size_t optWidth = 0;
+            for( auto const &cols : rows )
+                optWidth = (std::max)(optWidth, cols.left.size() + 2);
+
+            optWidth = (std::min)(optWidth, consoleWidth/2);
+
+            for( auto const &cols : rows ) {
+                auto row =
+                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
+                        TextFlow::Spacer(4) +
+                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
+                os << row << std::endl;
+            }
+        }
+
+        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
+            parser.writeToStream( os );
+            return os;
+        }
+
+        auto validate() const -> Result override {
+            for( auto const &opt : m_options ) {
+                auto result = opt.validate();
+                if( !result )
+                    return result;
+            }
+            for( auto const &arg : m_args ) {
+                auto result = arg.validate();
+                if( !result )
+                    return result;
+            }
+            return Result::ok();
+        }
+
+        using ParserBase::parse;
+
+        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
+
+            struct ParserInfo {
+                ParserBase const* parser = nullptr;
+                size_t count = 0;
+            };
+            const size_t totalParsers = m_options.size() + m_args.size();
+            assert( totalParsers < 512 );
+            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
+            ParserInfo parseInfos[512];
+
+            {
+                size_t i = 0;
+                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
+                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
+            }
+
+            m_exeName.set( exeName );
+
+            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
+            while( result.value().remainingTokens() ) {
+                bool tokenParsed = false;
+
+                for( size_t i = 0; i < totalParsers; ++i ) {
+                    auto&  parseInfo = parseInfos[i];
+                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
+                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
+                        if (!result)
+                            return result;
+                        if (result.value().type() != ParseResultType::NoMatch) {
+                            tokenParsed = true;
+                            ++parseInfo.count;
+                            break;
+                        }
+                    }
+                }
+
+                if( result.value().type() == ParseResultType::ShortCircuitAll )
+                    return result;
+                if( !tokenParsed )
+                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
+            }
+            // !TBD Check missing required options
+            return result;
+        }
+    };
+
+    template<typename DerivedT>
+    template<typename T>
+    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
+        return Parser() | static_cast<DerivedT const &>( *this ) | other;
+    }
+} // namespace detail
+
+// A Combined parser
+using detail::Parser;
+
+// A parser for options
+using detail::Opt;
+
+// A parser for arguments
+using detail::Arg;
+
+// Wrapper for argc, argv from main()
+using detail::Args;
+
+// Specifies the name of the executable
+using detail::ExeName;
+
+// Convenience wrapper for option parser that specifies the help option
+using detail::Help;
+
+// enum of result types from a parse
+using detail::ParseResultType;
+
+// Result type for parser operation
+using detail::ParserResult;
+
+}} // namespace Catch::clara
+
+// end clara.hpp
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+// end catch_clara.h
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config );
+
+} // end namespace Catch
+
+// end catch_commandline.h
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    clara::Parser makeCommandLineParser( ConfigData& config ) {
+
+        using namespace clara;
+
+        auto const setWarning = [&]( std::string const& warning ) {
+                auto warningSet = [&]() {
+                    if( warning == "NoAssertions" )
+                        return WarnAbout::NoAssertions;
+
+                    if ( warning == "NoTests" )
+                        return WarnAbout::NoTests;
+
+                    return WarnAbout::Nothing;
+                }();
+
+                if (warningSet == WarnAbout::Nothing)
+                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
+                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
+                std::ifstream f( filename.c_str() );
+                if( !f.is_open() )
+                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
+
+                std::string line;
+                while( std::getline( f, line ) ) {
+                    line = trim(line);
+                    if( !line.empty() && !startsWith( line, '#' ) ) {
+                        if( !startsWith( line, '"' ) )
+                            line = '"' + line + '"';
+                        config.testsOrTags.push_back( line );
+                        config.testsOrTags.emplace_back( "," );
+                    }
+                }
+                //Remove comma in the end
+                if(!config.testsOrTags.empty())
+                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
+
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setTestOrder = [&]( std::string const& order ) {
+                if( startsWith( "declared", order ) )
+                    config.runOrder = RunTests::InDeclarationOrder;
+                else if( startsWith( "lexical", order ) )
+                    config.runOrder = RunTests::InLexicographicalOrder;
+                else if( startsWith( "random", order ) )
+                    config.runOrder = RunTests::InRandomOrder;
+                else
+                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setRngSeed = [&]( std::string const& seed ) {
+                if( seed != "time" )
+                    return clara::detail::convertInto( seed, config.rngSeed );
+                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setColourUsage = [&]( std::string const& useColour ) {
+                    auto mode = toLower( useColour );
+
+                    if( mode == "yes" )
+                        config.useColour = UseColour::Yes;
+                    else if( mode == "no" )
+                        config.useColour = UseColour::No;
+                    else if( mode == "auto" )
+                        config.useColour = UseColour::Auto;
+                    else
+                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
+                return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
+                auto keypressLc = toLower( keypress );
+                if (keypressLc == "never")
+                    config.waitForKeypress = WaitForKeypress::Never;
+                else if( keypressLc == "start" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStart;
+                else if( keypressLc == "exit" )
+                    config.waitForKeypress = WaitForKeypress::BeforeExit;
+                else if( keypressLc == "both" )
+                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+                else
+                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
+            return ParserResult::ok( ParseResultType::Matched );
+            };
+        auto const setVerbosity = [&]( std::string const& verbosity ) {
+            auto lcVerbosity = toLower( verbosity );
+            if( lcVerbosity == "quiet" )
+                config.verbosity = Verbosity::Quiet;
+            else if( lcVerbosity == "normal" )
+                config.verbosity = Verbosity::Normal;
+            else if( lcVerbosity == "high" )
+                config.verbosity = Verbosity::High;
+            else
+                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+        auto const setReporter = [&]( std::string const& reporter ) {
+            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+
+            auto lcReporter = toLower( reporter );
+            auto result = factories.find( lcReporter );
+
+            if( factories.end() != result )
+                config.reporterName = lcReporter;
+            else
+                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
+            return ParserResult::ok( ParseResultType::Matched );
+        };
+
+        auto cli
+            = ExeName( config.processName )
+            | Help( config.showHelp )
+            | Opt( config.listTests )
+                ["-l"]["--list-tests"]
+                ( "list all/matching test cases" )
+            | Opt( config.listTags )
+                ["-t"]["--list-tags"]
+                ( "list all/matching tags" )
+            | Opt( config.showSuccessfulTests )
+                ["-s"]["--success"]
+                ( "include successful tests in output" )
+            | Opt( config.shouldDebugBreak )
+                ["-b"]["--break"]
+                ( "break into debugger on failure" )
+            | Opt( config.noThrow )
+                ["-e"]["--nothrow"]
+                ( "skip exception tests" )
+            | Opt( config.showInvisibles )
+                ["-i"]["--invisibles"]
+                ( "show invisibles (tabs, newlines)" )
+            | Opt( config.outputFilename, "filename" )
+                ["-o"]["--out"]
+                ( "output filename" )
+            | Opt( setReporter, "name" )
+                ["-r"]["--reporter"]
+                ( "reporter to use (defaults to console)" )
+            | Opt( config.name, "name" )
+                ["-n"]["--name"]
+                ( "suite name" )
+            | Opt( [&]( bool ){ config.abortAfter = 1; } )
+                ["-a"]["--abort"]
+                ( "abort at first failure" )
+            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
+                ["-x"]["--abortx"]
+                ( "abort after x failures" )
+            | Opt( setWarning, "warning name" )
+                ["-w"]["--warn"]
+                ( "enable warnings" )
+            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
+                ["-d"]["--durations"]
+                ( "show test durations" )
+            | Opt( loadTestNamesFromFile, "filename" )
+                ["-f"]["--input-file"]
+                ( "load test names to run from a file" )
+            | Opt( config.filenamesAsTags )
+                ["-#"]["--filenames-as-tags"]
+                ( "adds a tag for the filename" )
+            | Opt( config.sectionsToRun, "section name" )
+                ["-c"]["--section"]
+                ( "specify section to run" )
+            | Opt( setVerbosity, "quiet|normal|high" )
+                ["-v"]["--verbosity"]
+                ( "set output verbosity" )
+            | Opt( config.listTestNamesOnly )
+                ["--list-test-names-only"]
+                ( "list all/matching test cases names only" )
+            | Opt( config.listReporters )
+                ["--list-reporters"]
+                ( "list all reporters" )
+            | Opt( setTestOrder, "decl|lex|rand" )
+                ["--order"]
+                ( "test case order (defaults to decl)" )
+            | Opt( setRngSeed, "'time'|number" )
+                ["--rng-seed"]
+                ( "set a specific seed for random numbers" )
+            | Opt( setColourUsage, "yes|no" )
+                ["--use-colour"]
+                ( "should output be colourised" )
+            | Opt( config.libIdentify )
+                ["--libidentify"]
+                ( "report name and version according to libidentify standard" )
+            | Opt( setWaitForKeypress, "never|start|exit|both" )
+                ["--wait-for-keypress"]
+                ( "waits for a keypress before exiting" )
+            | Opt( config.benchmarkSamples, "samples" )
+                ["--benchmark-samples"]
+                ( "number of samples to collect (default: 100)" )
+            | Opt( config.benchmarkResamples, "resamples" )
+                ["--benchmark-resamples"]
+                ( "number of resamples for the bootstrap (default: 100000)" )
+            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
+                ["--benchmark-confidence-interval"]
+                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
+            | Opt( config.benchmarkNoAnalysis )
+                ["--benchmark-no-analysis"]
+                ( "perform only measurements; do not perform any analysis" )
+            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
+                ["--benchmark-warmup-time"]
+                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
+            | Arg( config.testsOrTags, "test name|pattern|tags" )
+                ( "which test or tests to use" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+// end catch_commandline.cpp
+// start catch_common.cpp
+
+#include <cstring>
+#include <ostream>
+
+namespace Catch {
+
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
+        // We can assume that the same file will usually have the same pointer.
+        // Thus, if the pointers are the same, there is no point in calling the strcmp
+        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    std::string StreamEndStop::operator+() const {
+        return std::string();
+    }
+
+    NonCopyable::NonCopyable() = default;
+    NonCopyable::~NonCopyable() = default;
+
+}
+// end catch_common.cpp
+// start catch_config.cpp
+
+namespace Catch {
+
+    Config::Config( ConfigData const& data )
+    :   m_data( data ),
+        m_stream( openStream() )
+    {
+        // We need to trim filter specs to avoid trouble with superfluous
+        // whitespace (esp. important for bdd macros, as those are manually
+        // aligned with whitespace).
+
+        for (auto& elem : m_data.testsOrTags) {
+            elem = trim(elem);
+        }
+        for (auto& elem : m_data.sectionsToRun) {
+            elem = trim(elem);
+        }
+
+        TestSpecParser parser(ITagAliasRegistry::get());
+        if (!m_data.testsOrTags.empty()) {
+            m_hasTestFilters = true;
+            for (auto const& testOrTags : m_data.testsOrTags) {
+                parser.parse(testOrTags);
+            }
+        }
+        m_testSpec = parser.testSpec();
+    }
+
+    std::string const& Config::getFilename() const {
+        return m_data.outputFilename ;
+    }
+
+    bool Config::listTests() const          { return m_data.listTests; }
+    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
+    bool Config::listTags() const           { return m_data.listTags; }
+    bool Config::listReporters() const      { return m_data.listReporters; }
+
+    std::string Config::getProcessName() const { return m_data.processName; }
+    std::string const& Config::getReporterName() const { return m_data.reporterName; }
+
+    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
+    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
+
+    TestSpec const& Config::testSpec() const { return m_testSpec; }
+    bool Config::hasTestFilters() const { return m_hasTestFilters; }
+
+    bool Config::showHelp() const { return m_data.showHelp; }
+
+    // IConfig interface
+    bool Config::allowThrows() const                   { return !m_data.noThrow; }
+    std::ostream& Config::stream() const               { return m_stream->stream(); }
+    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
+    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
+    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
+    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
+    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
+    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
+    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
+    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
+    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
+    int Config::abortAfter() const                     { return m_data.abortAfter; }
+    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
+    Verbosity Config::verbosity() const                { return m_data.verbosity; }
+
+    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
+    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
+    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
+    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
+    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
+
+    IStream const* Config::openStream() {
+        return Catch::makeStream(m_data.outputFilename);
+    }
+
+} // end namespace Catch
+// end catch_config.cpp
+// start catch_console_colour.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+// start catch_errno_guard.h
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard();
+        ~ErrnoGuard();
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+// end catch_errno_guard.h
+#include <sstream>
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() = default;
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) override {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+
+                default:
+                    CATCH_ERROR( "Unknown colour requested" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = UseColour::Yes;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        void use( Colour::Code _colourCode ) override {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+                case Colour::BrightYellow:  return setColour( "[1;33m" );
+
+                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
+                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            getCurrentContext().getConfig()->stream()
+                << '\033' << _escapeCode;
+        }
+    };
+
+    bool useColourOnPlatform() {
+        return
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+            !isDebuggerActive() &&
+#endif
+#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
+            isatty(STDOUT_FILENO)
+#else
+            false
+#endif
+            ;
+    }
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        IConfigPtr config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = useColourOnPlatform()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
+    Colour::Colour( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved = true;
+    }
+    Colour& Colour::operator=( Colour&& other ) noexcept {
+        m_moved = other.m_moved;
+        other.m_moved  = true;
+        return *this;
+    }
+
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        // Strictly speaking, this cannot possibly happen.
+        // However, under some conditions it does happen (see #1626),
+        // and this change is small enough that we can let practicality
+        // triumph over purity in this case.
+        if (impl != nullptr) {
+            impl->use( _colourCode );
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, Colour const& ) {
+        return os;
+    }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_console_colour.cpp
+// start catch_context.cpp
+
+namespace Catch {
+
+    class Context : public IMutableContext, NonCopyable {
+
+    public: // IContext
+        IResultCapture* getResultCapture() override {
+            return m_resultCapture;
+        }
+        IRunner* getRunner() override {
+            return m_runner;
+        }
+
+        IConfigPtr const& getConfig() const override {
+            return m_config;
+        }
+
+        ~Context() override;
+
+    public: // IMutableContext
+        void setResultCapture( IResultCapture* resultCapture ) override {
+            m_resultCapture = resultCapture;
+        }
+        void setRunner( IRunner* runner ) override {
+            m_runner = runner;
+        }
+        void setConfig( IConfigPtr const& config ) override {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IConfigPtr m_config;
+        IRunner* m_runner = nullptr;
+        IResultCapture* m_resultCapture = nullptr;
+    };
+
+    IMutableContext *IMutableContext::currentContext = nullptr;
+
+    void IMutableContext::createContext()
+    {
+        currentContext = new Context();
+    }
+
+    void cleanUpContext() {
+        delete IMutableContext::currentContext;
+        IMutableContext::currentContext = nullptr;
+    }
+    IContext::~IContext() = default;
+    IMutableContext::~IMutableContext() = default;
+    Context::~Context() = default;
+
+    SimplePcg32& rng() {
+        static SimplePcg32 s_rng;
+        return s_rng;
+    }
+
+}
+// end catch_context.cpp
+// start catch_debug_console.cpp
+
+// start catch_debug_console.h
+
+#include <string>
+
+namespace Catch {
+    void writeToDebugConsole( std::string const& text );
+}
+
+// end catch_debug_console.h
+#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+
+#else
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+
+#endif // Platform
+// end catch_debug_console.cpp
+// start catch_debugger.cpp
+
+#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
+
+#  include <cassert>
+#  include <sys/types.h>
+#  include <unistd.h>
+#  include <cstddef>
+#  include <ostream>
+
+#ifdef __apple_build_version__
+    // These headers will only compile with AppleClang (XCode)
+    // For other compilers (Clang, GCC, ... ) we need to exclude them
+#  include <sys/sysctl.h>
+#endif
+
+    namespace Catch {
+        #ifdef __apple_build_version__
+        // The following function is taken directly from the following technical note:
+        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+            int                 mib[4];
+            struct kinfo_proc   info;
+            std::size_t         size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+        #else
+        bool isDebuggerActive() {
+            // We need to find another way to determine this for non-appleclang compilers on macOS
+            return false;
+        }
+        #endif
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+// end catch_debugger.cpp
+// start catch_decomposer.cpp
+
+namespace Catch {
+
+    ITransientExpression::~ITransientExpression() = default;
+
+    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
+        if( lhs.size() + rhs.size() < 40 &&
+                lhs.find('\n') == std::string::npos &&
+                rhs.find('\n') == std::string::npos )
+            os << lhs << " " << op << " " << rhs;
+        else
+            os << lhs << "\n" << op << "\n" << rhs;
+    }
+}
+// end catch_decomposer.cpp
+// start catch_enforce.cpp
+
+#include <stdexcept>
+
+namespace Catch {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
+    [[noreturn]]
+    void throw_exception(std::exception const& e) {
+        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
+                      << "The message was: " << e.what() << '\n';
+        std::terminate();
+    }
+#endif
+
+    [[noreturn]]
+    void throw_logic_error(std::string const& msg) {
+        throw_exception(std::logic_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_domain_error(std::string const& msg) {
+        throw_exception(std::domain_error(msg));
+    }
+
+    [[noreturn]]
+    void throw_runtime_error(std::string const& msg) {
+        throw_exception(std::runtime_error(msg));
+    }
+
+} // namespace Catch;
+// end catch_enforce.cpp
+// start catch_enum_values_registry.cpp
+// start catch_enum_values_registry.h
+
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    namespace Detail {
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
+
+        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
+
+            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
+
+            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
+        };
+
+        std::vector<StringRef> parseEnums( StringRef enums );
+
+    } // Detail
+
+} // Catch
+
+// end catch_enum_values_registry.h
+
+#include <map>
+#include <cassert>
+
+namespace Catch {
+
+    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
+
+    namespace Detail {
+
+        namespace {
+            // Extracts the actual name part of an enum instance
+            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
+            StringRef extractInstanceName(StringRef enumInstance) {
+                // Find last occurence of ":"
+                size_t name_start = enumInstance.size();
+                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
+                    --name_start;
+                }
+                return enumInstance.substr(name_start, enumInstance.size() - name_start);
+            }
+        }
+
+        std::vector<StringRef> parseEnums( StringRef enums ) {
+            auto enumValues = splitStringRef( enums, ',' );
+            std::vector<StringRef> parsed;
+            parsed.reserve( enumValues.size() );
+            for( auto const& enumValue : enumValues ) {
+                parsed.push_back(trim(extractInstanceName(enumValue)));
+            }
+            return parsed;
+        }
+
+        EnumInfo::~EnumInfo() {}
+
+        StringRef EnumInfo::lookup( int value ) const {
+            for( auto const& valueToName : m_values ) {
+                if( valueToName.first == value )
+                    return valueToName.second;
+            }
+            return "{** unexpected enum value **}"_sr;
+        }
+
+        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
+            enumInfo->m_name = enumName;
+            enumInfo->m_values.reserve( values.size() );
+
+            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
+            assert( valueNames.size() == values.size() );
+            std::size_t i = 0;
+            for( auto value : values )
+                enumInfo->m_values.emplace_back(value, valueNames[i++]);
+
+            return enumInfo;
+        }
+
+        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
+            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
+            return *m_enumInfos.back();
+        }
+
+    } // Detail
+} // Catch
+
+// end catch_enum_values_registry.cpp
+// start catch_errno_guard.cpp
+
+#include <cerrno>
+
+namespace Catch {
+        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
+        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
+}
+// end catch_errno_guard.cpp
+// start catch_exception_translator_registry.cpp
+
+// start catch_exception_translator_registry.h
+
+#include <vector>
+#include <string>
+#include <memory>
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry();
+        virtual void registerTranslator( const IExceptionTranslator* translator );
+        std::string translateActiveException() const override;
+        std::string tryTranslators() const;
+
+    private:
+        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
+    };
+}
+
+// end catch_exception_translator_registry.h
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
+    }
+
+    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
+        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
+    }
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        try {
+#ifdef __OBJC__
+            // In Objective-C try objective-c exceptions first
+            @try {
+                return tryTranslators();
+            }
+            @catch (NSException *exception) {
+                return Catch::Detail::stringify( [exception description] );
+            }
+#else
+            // Compiling a mixed mode project with MSVC means that CLR
+            // exceptions will be caught in (...) as well. However, these
+            // do not fill-in std::current_exception and thus lead to crash
+            // when attempting rethrow.
+            // /EHa switch also causes structured exceptions to be caught
+            // here, but they fill-in current_exception properly, so
+            // at worst the output should be a little weird, instead of
+            // causing a crash.
+            if (std::current_exception() == nullptr) {
+                return "Non C++ exception. Possibly a CLR exception.";
+            }
+            return tryTranslators();
+#endif
+        }
+        catch( TestFailureException& ) {
+            std::rethrow_exception(std::current_exception());
+        }
+        catch( std::exception& ex ) {
+            return ex.what();
+        }
+        catch( std::string& msg ) {
+            return msg;
+        }
+        catch( const char* msg ) {
+            return msg;
+        }
+        catch(...) {
+            return "Unknown exception";
+        }
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        if (m_translators.empty()) {
+            std::rethrow_exception(std::current_exception());
+        } else {
+            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
+        }
+    }
+
+#else // ^^ Exceptions are enabled // Exceptions are disabled vv
+    std::string ExceptionTranslatorRegistry::translateActiveException() const {
+        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+
+    std::string ExceptionTranslatorRegistry::tryTranslators() const {
+        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+    }
+#endif
+
+}
+// end catch_exception_translator_registry.cpp
+// start catch_fatal_condition.cpp
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace {
+    // Report the error condition
+    void reportFatal( char const * const message ) {
+        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
+    }
+}
+
+#endif // signals/SEH handling
+
+#if defined( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+    struct SignalDefs { DWORD id; const char* name; };
+
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    static SignalDefs signalDefs[] = {
+        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
+        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
+        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
+        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
+    };
+
+    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+        for (auto const& def : signalDefs) {
+            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
+                reportFatal(def.name);
+            }
+        }
+        // If its not an exception we care about, pass it along.
+        // This stops us from eating debugger breaks etc.
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        // 32k seems enough for Catch to handle stack overflow,
+        // but the value was found experimentally, so there is no strong guarantee
+        guaranteeSize = 32 * 1024;
+        exceptionHandlerHandle = nullptr;
+        // Register as first handler in current chain
+        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+        // Pass in guarantee size to be filled
+        SetThreadStackGuarantee(&guaranteeSize);
+    }
+
+    void FatalConditionHandler::reset() {
+        if (isSet) {
+            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+            SetThreadStackGuarantee(&guaranteeSize);
+            exceptionHandlerHandle = nullptr;
+            isSet = false;
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+bool FatalConditionHandler::isSet = false;
+ULONG FatalConditionHandler::guaranteeSize = 0;
+PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
+
+} // namespace Catch
+
+#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+
+    // 32kb for the alternate stack seems to be sufficient. However, this value
+    // is experimentally determined, so that's not guaranteed.
+    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+
+    static SignalDefs signalDefs[] = {
+        { SIGINT,  "SIGINT - Terminal interrupt signal" },
+        { SIGILL,  "SIGILL - Illegal instruction signal" },
+        { SIGFPE,  "SIGFPE - Floating point error signal" },
+        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+        { SIGTERM, "SIGTERM - Termination request signal" },
+        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+    void FatalConditionHandler::handleSignal( int sig ) {
+        char const * name = "<unknown signal>";
+        for (auto const& def : signalDefs) {
+            if (sig == def.id) {
+                name = def.name;
+                break;
+            }
+        }
+        reset();
+        reportFatal(name);
+        raise( sig );
+    }
+
+    FatalConditionHandler::FatalConditionHandler() {
+        isSet = true;
+        stack_t sigStack;
+        sigStack.ss_sp = altStackMem;
+        sigStack.ss_size = sigStackSize;
+        sigStack.ss_flags = 0;
+        sigaltstack(&sigStack, &oldSigStack);
+        struct sigaction sa = { };
+
+        sa.sa_handler = handleSignal;
+        sa.sa_flags = SA_ONSTACK;
+        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+        }
+    }
+
+    FatalConditionHandler::~FatalConditionHandler() {
+        reset();
+    }
+
+    void FatalConditionHandler::reset() {
+        if( isSet ) {
+            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
+            }
+            // Return the old stack
+            sigaltstack(&oldSigStack, nullptr);
+            isSet = false;
+        }
+    }
+
+    bool FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+    stack_t FatalConditionHandler::oldSigStack = {};
+    char FatalConditionHandler::altStackMem[sigStackSize] = {};
+
+} // namespace Catch
+
+#else
+
+namespace Catch {
+    void FatalConditionHandler::reset() {}
+}
+
+#endif // signals/SEH handling
+
+#if defined(__GNUC__)
+#    pragma GCC diagnostic pop
+#endif
+// end catch_fatal_condition.cpp
+// start catch_generators.cpp
+
+#include <limits>
+#include <set>
+
+namespace Catch {
+
+IGeneratorTracker::~IGeneratorTracker() {}
+
+const char* GeneratorException::what() const noexcept {
+    return m_msg;
+}
+
+namespace Generators {
+
+    GeneratorUntypedBase::~GeneratorUntypedBase() {}
+
+    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
+    }
+
+} // namespace Generators
+} // namespace Catch
+// end catch_generators.cpp
+// start catch_interfaces_capture.cpp
+
+namespace Catch {
+    IResultCapture::~IResultCapture() = default;
+}
+// end catch_interfaces_capture.cpp
+// start catch_interfaces_config.cpp
+
+namespace Catch {
+    IConfig::~IConfig() = default;
+}
+// end catch_interfaces_config.cpp
+// start catch_interfaces_exception.cpp
+
+namespace Catch {
+    IExceptionTranslator::~IExceptionTranslator() = default;
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
+}
+// end catch_interfaces_exception.cpp
+// start catch_interfaces_registry_hub.cpp
+
+namespace Catch {
+    IRegistryHub::~IRegistryHub() = default;
+    IMutableRegistryHub::~IMutableRegistryHub() = default;
+}
+// end catch_interfaces_registry_hub.cpp
+// start catch_interfaces_reporter.cpp
+
+// start catch_reporter_listening.h
+
+namespace Catch {
+
+    class ListeningReporter : public IStreamingReporter {
+        using Reporters = std::vector<IStreamingReporterPtr>;
+        Reporters m_listeners;
+        IStreamingReporterPtr m_reporter = nullptr;
+        ReporterPreferences m_preferences;
+
+    public:
+        ListeningReporter();
+
+        void addListener( IStreamingReporterPtr&& listener );
+        void addReporter( IStreamingReporterPtr&& reporter );
+
+    public: // IStreamingReporter
+
+        ReporterPreferences getPreferences() const override;
+
+        void noMatchingTestCases( std::string const& spec ) override;
+
+        void reportInvalidArguments(std::string const&arg) override;
+
+        static std::set<Verbosity> getSupportedVerbosities();
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
+        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
+        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
+        void benchmarkFailed(std::string const&) override;
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+        void testRunStarting( TestRunInfo const& testRunInfo ) override;
+        void testGroupStarting( GroupInfo const& groupInfo ) override;
+        void testCaseStarting( TestCaseInfo const& testInfo ) override;
+        void sectionStarting( SectionInfo const& sectionInfo ) override;
+        void assertionStarting( AssertionInfo const& assertionInfo ) override;
+
+        // The return value indicates if the messages buffer should be cleared:
+        bool assertionEnded( AssertionStats const& assertionStats ) override;
+        void sectionEnded( SectionStats const& sectionStats ) override;
+        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
+        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
+        void testRunEnded( TestRunStats const& testRunStats ) override;
+
+        void skipTest( TestCaseInfo const& testInfo ) override;
+        bool isMulti() const override;
+
+    };
+
+} // end namespace Catch
+
+// end catch_reporter_listening.h
+namespace Catch {
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
+    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
+    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+    std::ostream& ReporterConfig::stream() const { return *m_stream; }
+    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
+
+    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
+
+    GroupInfo::GroupInfo(  std::string const& _name,
+                           std::size_t _groupIndex,
+                           std::size_t _groupsCount )
+    :   name( _name ),
+        groupIndex( _groupIndex ),
+        groupsCounts( _groupsCount )
+    {}
+
+     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
+                                     std::vector<MessageInfo> const& _infoMessages,
+                                     Totals const& _totals )
+    :   assertionResult( _assertionResult ),
+        infoMessages( _infoMessages ),
+        totals( _totals )
+    {
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
+
+        if( assertionResult.hasMessage() ) {
+            // Copy message into messages list.
+            // !TBD This should have been done earlier, somewhere
+            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+            builder << assertionResult.getMessage();
+            builder.m_info.message = builder.m_stream.str();
+
+            infoMessages.push_back( builder.m_info );
+        }
+    }
+
+     AssertionStats::~AssertionStats() = default;
+
+    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
+                                 Counts const& _assertions,
+                                 double _durationInSeconds,
+                                 bool _missingAssertions )
+    :   sectionInfo( _sectionInfo ),
+        assertions( _assertions ),
+        durationInSeconds( _durationInSeconds ),
+        missingAssertions( _missingAssertions )
+    {}
+
+    SectionStats::~SectionStats() = default;
+
+    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
+                                   Totals const& _totals,
+                                   std::string const& _stdOut,
+                                   std::string const& _stdErr,
+                                   bool _aborting )
+    : testInfo( _testInfo ),
+        totals( _totals ),
+        stdOut( _stdOut ),
+        stdErr( _stdErr ),
+        aborting( _aborting )
+    {}
+
+    TestCaseStats::~TestCaseStats() = default;
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
+                                    Totals const& _totals,
+                                    bool _aborting )
+    :   groupInfo( _groupInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
+    :   groupInfo( _groupInfo ),
+        aborting( false )
+    {}
+
+    TestGroupStats::~TestGroupStats() = default;
+
+    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
+                    Totals const& _totals,
+                    bool _aborting )
+    :   runInfo( _runInfo ),
+        totals( _totals ),
+        aborting( _aborting )
+    {}
+
+    TestRunStats::~TestRunStats() = default;
+
+    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
+    bool IStreamingReporter::isMulti() const { return false; }
+
+    IReporterFactory::~IReporterFactory() = default;
+    IReporterRegistry::~IReporterRegistry() = default;
+
+} // end namespace Catch
+// end catch_interfaces_reporter.cpp
+// start catch_interfaces_runner.cpp
+
+namespace Catch {
+    IRunner::~IRunner() = default;
+}
+// end catch_interfaces_runner.cpp
+// start catch_interfaces_testcase.cpp
+
+namespace Catch {
+    ITestInvoker::~ITestInvoker() = default;
+    ITestCaseRegistry::~ITestCaseRegistry() = default;
+}
+// end catch_interfaces_testcase.cpp
+// start catch_leak_detector.cpp
+
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+
+namespace Catch {
+
+    LeakDetector::LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+}
+
+#else
+
+    Catch::LeakDetector::LeakDetector() {}
+
+#endif
+
+Catch::LeakDetector::~LeakDetector() {
+    Catch::cleanUp();
+}
+// end catch_leak_detector.cpp
+// start catch_list.cpp
+
+// start catch_list.h
+
+#include <set>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config );
+
+    std::size_t listTestsNamesOnly( Config const& config );
+
+    struct TagInfo {
+        void add( std::string const& spelling );
+        std::string all() const;
+
+        std::set<std::string> spellings;
+        std::size_t count = 0;
+    };
+
+    std::size_t listTags( Config const& config );
+
+    std::size_t listReporters();
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config );
+
+} // end namespace Catch
+
+// end catch_list.h
+// start catch_text.h
+
+namespace Catch {
+    using namespace clara::TextFlow;
+}
+
+// end catch_text.h
+#include <limits>
+#include <algorithm>
+#include <iomanip>
+
+namespace Catch {
+
+    std::size_t listTests( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+        }
+
+        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
+            if( config.verbosity() >= Verbosity::High ) {
+                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Column( description ).indent(4) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
+        }
+
+        if( !config.hasTestFilters() )
+            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
+        return matchedTestCases.size();
+    }
+
+    std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCaseInfo : matchedTestCases ) {
+            matchedTests++;
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.verbosity() >= Verbosity::High )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    void TagInfo::add( std::string const& spelling ) {
+        ++count;
+        spellings.insert( spelling );
+    }
+
+    std::string TagInfo::all() const {
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
+        return out;
+    }
+
+    std::size_t listTags( Config const& config ) {
+        TestSpec const& testSpec = config.testSpec();
+        if( config.hasTestFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( auto const& testCase : matchedTestCases ) {
+            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
+                std::string lcaseTagName = toLower( tagName );
+                auto countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( auto const& tagCount : tagCounts ) {
+            ReusableStringStream rss;
+            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
+            auto str = rss.str();
+            auto wrapper = Column( tagCount.second.all() )
+                                                    .initialIndent( 0 )
+                                                    .indent( str.size() )
+                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
+            Catch::cout() << str << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    std::size_t listReporters() {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        std::size_t maxNameLen = 0;
+        for( auto const& factoryKvp : factories )
+            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
+
+        for( auto const& factoryKvp : factories ) {
+            Catch::cout()
+                    << Column( factoryKvp.first + ":" )
+                            .indent(2)
+                            .width( 5+maxNameLen )
+                    +  Column( factoryKvp.second->getDescription() )
+                            .initialIndent(0)
+                            .indent(2)
+                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
+                    << "\n";
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
+        Option<std::size_t> listedCount;
+        getCurrentMutableContext().setConfig( config );
+        if( config->listTests() )
+            listedCount = listedCount.valueOr(0) + listTests( *config );
+        if( config->listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
+        if( config->listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( *config );
+        if( config->listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters();
+        return listedCount;
+    }
+
+} // end namespace Catch
+// end catch_list.cpp
+// start catch_matchers.cpp
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        std::string MatcherUntypedBase::toString() const {
+            if( m_cachedToString.empty() )
+                m_cachedToString = describe();
+            return m_cachedToString;
+        }
+
+        MatcherUntypedBase::~MatcherUntypedBase() = default;
+
+    } // namespace Impl
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+// end catch_matchers.cpp
+// start catch_matchers_exception.cpp
+
+namespace Catch {
+namespace Matchers {
+namespace Exception {
+
+bool ExceptionMessageMatcher::match(std::exception const& ex) const {
+    return ex.what() == m_message;
+}
+
+std::string ExceptionMessageMatcher::describe() const {
+    return "exception message matches \"" + m_message + "\"";
+}
+
+}
+Exception::ExceptionMessageMatcher Message(std::string const& message) {
+    return Exception::ExceptionMessageMatcher(message);
+}
+
+// namespace Exception
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_exception.cpp
+// start catch_matchers_floating.cpp
+
+// start catch_polyfills.hpp
+
+namespace Catch {
+    bool isnan(float f);
+    bool isnan(double d);
+}
+
+// end catch_polyfills.hpp
+// start catch_to_string.hpp
+
+#include <string>
+
+namespace Catch {
+    template <typename T>
+    std::string to_string(T const& t) {
+#if defined(CATCH_CONFIG_CPP11_TO_STRING)
+        return std::to_string(t);
+#else
+        ReusableStringStream rss;
+        rss << t;
+        return rss.str();
+#endif
+    }
+} // end namespace Catch
+
+// end catch_to_string.hpp
+#include <algorithm>
+#include <cmath>
+#include <cstdlib>
+#include <cstdint>
+#include <cstring>
+#include <sstream>
+#include <type_traits>
+#include <iomanip>
+#include <limits>
+
+namespace Catch {
+namespace {
+
+    int32_t convert(float f) {
+        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
+        int32_t i;
+        std::memcpy(&i, &f, sizeof(f));
+        return i;
+    }
+
+    int64_t convert(double d) {
+        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
+        int64_t i;
+        std::memcpy(&i, &d, sizeof(d));
+        return i;
+    }
+
+    template <typename FP>
+    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
+        // Comparison with NaN should always be false.
+        // This way we can rule it out before getting into the ugly details
+        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
+            return false;
+        }
+
+        auto lc = convert(lhs);
+        auto rc = convert(rhs);
+
+        if ((lc < 0) != (rc < 0)) {
+            // Potentially we can have +0 and -0
+            return lhs == rhs;
+        }
+
+        auto ulpDiff = std::abs(lc - rc);
+        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
+    }
+
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+
+    float nextafter(float x, float y) {
+        return ::nextafterf(x, y);
+    }
+
+    double nextafter(double x, double y) {
+        return ::nextafter(x, y);
+    }
+
+#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
+
+template <typename FP>
+FP step(FP start, FP direction, uint64_t steps) {
+    for (uint64_t i = 0; i < steps; ++i) {
+#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
+        start = Catch::nextafter(start, direction);
+#else
+        start = std::nextafter(start, direction);
+#endif
+    }
+    return start;
+}
+
+// Performs equivalent check of std::fabs(lhs - rhs) <= margin
+// But without the subtraction to allow for INFINITY in comparison
+bool marginComparison(double lhs, double rhs, double margin) {
+    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
+}
+
+template <typename FloatingPoint>
+void write(std::ostream& out, FloatingPoint num) {
+    out << std::scientific
+        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
+        << num;
+}
+
+} // end anonymous namespace
+
+namespace Matchers {
+namespace Floating {
+
+    enum class FloatingPointKind : uint8_t {
+        Float,
+        Double
+    };
+
+    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
+        :m_target{ target }, m_margin{ margin } {
+        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
+            << " Margin has to be non-negative.");
+    }
+
+    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
+    // But without the subtraction to allow for INFINITY in comparison
+    bool WithinAbsMatcher::match(double const& matchee) const {
+        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
+    }
+
+    std::string WithinAbsMatcher::describe() const {
+        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
+    }
+
+    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
+        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
+        CATCH_ENFORCE(m_type == FloatingPointKind::Double
+                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
+            "Provided ULP is impossibly large for a float comparison.");
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic push
+// Clang <3.5 reports on the default branch in the switch below
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+
+    bool WithinUlpsMatcher::match(double const& matchee) const {
+        switch (m_type) {
+        case FloatingPointKind::Float:
+            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
+        case FloatingPointKind::Double:
+            return almostEqualUlps<double>(matchee, m_target, m_ulps);
+        default:
+            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
+        }
+    }
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+    std::string WithinUlpsMatcher::describe() const {
+        std::stringstream ret;
+
+        ret << "is within " << m_ulps << " ULPs of ";
+
+        if (m_type == FloatingPointKind::Float) {
+            write(ret, static_cast<float>(m_target));
+            ret << 'f';
+        } else {
+            write(ret, m_target);
+        }
+
+        ret << " ([";
+        if (m_type == FloatingPointKind::Double) {
+            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
+        } else {
+            // We have to cast INFINITY to float because of MinGW, see #1782
+            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
+            ret << ", ";
+            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
+        }
+        ret << "])";
+
+        return ret.str();
+    }
+
+    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
+        m_target(target),
+        m_epsilon(epsilon){
+        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
+        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
+    }
+
+    bool WithinRelMatcher::match(double const& matchee) const {
+        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
+        return marginComparison(matchee, m_target,
+                                std::isinf(relMargin)? 0 : relMargin);
+    }
+
+    std::string WithinRelMatcher::describe() const {
+        Catch::ReusableStringStream sstr;
+        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
+        return sstr.str();
+    }
+
+}// namespace Floating
+
+Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
+}
+
+Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
+    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
+}
+
+Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
+    return Floating::WithinAbsMatcher(target, margin);
+}
+
+Floating::WithinRelMatcher WithinRel(double target, double eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(double target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
+}
+
+Floating::WithinRelMatcher WithinRel(float target, float eps) {
+    return Floating::WithinRelMatcher(target, eps);
+}
+
+Floating::WithinRelMatcher WithinRel(float target) {
+    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
+}
+
+} // namespace Matchers
+} // namespace Catch
+
+// end catch_matchers_floating.cpp
+// start catch_matchers_generic.cpp
+
+std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
+    if (desc.empty()) {
+        return "matches undescribed predicate";
+    } else {
+        return "matches predicate: \"" + desc + '"';
+    }
+}
+// end catch_matchers_generic.cpp
+// start catch_matchers_string.cpp
+
+#include <regex>
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
+
+        bool RegexMatcher::match(std::string const& matchee) const {
+            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
+            if (m_caseSensitivity == CaseSensitive::Choice::No) {
+                flags |= std::regex::icase;
+            }
+            auto reg = std::regex(m_regex, flags);
+            return std::regex_match(matchee, reg);
+        }
+
+        std::string RegexMatcher::describe() const {
+            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
+        return StdString::RegexMatcher(regex, caseSensitivity);
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// end catch_matchers_string.cpp
+// start catch_message.cpp
+
+// start catch_uncaught_exceptions.h
+
+namespace Catch {
+    bool uncaught_exceptions();
+} // end namespace Catch
+
+// end catch_uncaught_exceptions.h
+#include <cassert>
+#include <stack>
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   StringRef const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    bool MessageInfo::operator==( MessageInfo const& other ) const {
+        return sequence == other.sequence;
+    }
+
+    bool MessageInfo::operator<( MessageInfo const& other ) const {
+        return sequence < other.sequence;
+    }
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
+                                           SourceLineInfo const& lineInfo,
+                                           ResultWas::OfType type )
+        :m_info(macroName, lineInfo, type) {}
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info ), m_moved()
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+
+    ScopedMessage::ScopedMessage( ScopedMessage&& old )
+    : m_info( old.m_info ), m_moved()
+    {
+        old.m_moved = true;
+    }
+
+    ScopedMessage::~ScopedMessage() {
+        if ( !uncaught_exceptions() && !m_moved ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
+        auto trimmed = [&] (size_t start, size_t end) {
+            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
+                ++start;
+            }
+            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
+                --end;
+            }
+            return names.substr(start, end - start + 1);
+        };
+        auto skipq = [&] (size_t start, char quote) {
+            for (auto i = start + 1; i < names.size() ; ++i) {
+                if (names[i] == quote)
+                    return i;
+                if (names[i] == '\\')
+                    ++i;
+            }
+            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
+        };
+
+        size_t start = 0;
+        std::stack<char> openings;
+        for (size_t pos = 0; pos < names.size(); ++pos) {
+            char c = names[pos];
+            switch (c) {
+            case '[':
+            case '{':
+            case '(':
+            // It is basically impossible to disambiguate between
+            // comparison and start of template args in this context
+//            case '<':
+                openings.push(c);
+                break;
+            case ']':
+            case '}':
+            case ')':
+//           case '>':
+                openings.pop();
+                break;
+            case '"':
+            case '\'':
+                pos = skipq(pos, c);
+                break;
+            case ',':
+                if (start != pos && openings.empty()) {
+                    m_messages.emplace_back(macroName, lineInfo, resultType);
+                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
+                    m_messages.back().message += " := ";
+                    start = pos;
+                }
+            }
+        }
+        assert(openings.empty() && "Mismatched openings");
+        m_messages.emplace_back(macroName, lineInfo, resultType);
+        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
+        m_messages.back().message += " := ";
+    }
+    Capturer::~Capturer() {
+        if ( !uncaught_exceptions() ){
+            assert( m_captured == m_messages.size() );
+            for( size_t i = 0; i < m_captured; ++i  )
+                m_resultCapture.popScopedMessage( m_messages[i] );
+        }
+    }
+
+    void Capturer::captureValue( size_t index, std::string const& value ) {
+        assert( index < m_messages.size() );
+        m_messages[index].message += value;
+        m_resultCapture.pushScopedMessage( m_messages[index] );
+        m_captured++;
+    }
+
+} // end namespace Catch
+// end catch_message.cpp
+// start catch_output_redirect.cpp
+
+// start catch_output_redirect.h
+#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+
+#include <cstdio>
+#include <iosfwd>
+#include <string>
+
+namespace Catch {
+
+    class RedirectedStream {
+        std::ostream& m_originalStream;
+        std::ostream& m_redirectionStream;
+        std::streambuf* m_prevBuf;
+
+    public:
+        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
+        ~RedirectedStream();
+    };
+
+    class RedirectedStdOut {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cout;
+    public:
+        RedirectedStdOut();
+        auto str() const -> std::string;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes
+    class RedirectedStdErr {
+        ReusableStringStream m_rss;
+        RedirectedStream m_cerr;
+        RedirectedStream m_clog;
+    public:
+        RedirectedStdErr();
+        auto str() const -> std::string;
+    };
+
+    class RedirectedStreams {
+    public:
+        RedirectedStreams(RedirectedStreams const&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
+        RedirectedStreams(RedirectedStreams&&) = delete;
+        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
+
+        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
+        ~RedirectedStreams();
+    private:
+        std::string& m_redirectedCout;
+        std::string& m_redirectedCerr;
+        RedirectedStdOut m_redirectedStdOut;
+        RedirectedStdErr m_redirectedStdErr;
+    };
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+    // Windows's implementation of std::tmpfile is terrible (it tries
+    // to create a file inside system folder, thus requiring elevated
+    // privileges for the binary), so we have to use tmpnam(_s) and
+    // create the file ourselves there.
+    class TempFile {
+    public:
+        TempFile(TempFile const&) = delete;
+        TempFile& operator=(TempFile const&) = delete;
+        TempFile(TempFile&&) = delete;
+        TempFile& operator=(TempFile&&) = delete;
+
+        TempFile();
+        ~TempFile();
+
+        std::FILE* getFile();
+        std::string getContents();
+
+    private:
+        std::FILE* m_file = nullptr;
+    #if defined(_MSC_VER)
+        char m_buffer[L_tmpnam] = { 0 };
+    #endif
+    };
+
+    class OutputRedirect {
+    public:
+        OutputRedirect(OutputRedirect const&) = delete;
+        OutputRedirect& operator=(OutputRedirect const&) = delete;
+        OutputRedirect(OutputRedirect&&) = delete;
+        OutputRedirect& operator=(OutputRedirect&&) = delete;
+
+        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
+        ~OutputRedirect();
+
+    private:
+        int m_originalStdout = -1;
+        int m_originalStderr = -1;
+        TempFile m_stdoutFile;
+        TempFile m_stderrFile;
+        std::string& m_stdoutDest;
+        std::string& m_stderrDest;
+    };
+
+#endif
+
+} // end namespace Catch
+
+#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
+// end catch_output_redirect.h
+#include <cstdio>
+#include <cstring>
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #include <io.h>      //_dup and _dup2
+    #define dup _dup
+    #define dup2 _dup2
+    #define fileno _fileno
+    #else
+    #include <unistd.h>  // dup and dup2
+    #endif
+#endif
+
+namespace Catch {
+
+    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
+    :   m_originalStream( originalStream ),
+        m_redirectionStream( redirectionStream ),
+        m_prevBuf( m_originalStream.rdbuf() )
+    {
+        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
+    }
+
+    RedirectedStream::~RedirectedStream() {
+        m_originalStream.rdbuf( m_prevBuf );
+    }
+
+    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
+    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStdErr::RedirectedStdErr()
+    :   m_cerr( Catch::cerr(), m_rss.get() ),
+        m_clog( Catch::clog(), m_rss.get() )
+    {}
+    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
+
+    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
+    :   m_redirectedCout(redirectedCout),
+        m_redirectedCerr(redirectedCerr)
+    {}
+
+    RedirectedStreams::~RedirectedStreams() {
+        m_redirectedCout += m_redirectedStdOut.str();
+        m_redirectedCerr += m_redirectedStdErr.str();
+    }
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+
+#if defined(_MSC_VER)
+    TempFile::TempFile() {
+        if (tmpnam_s(m_buffer)) {
+            CATCH_RUNTIME_ERROR("Could not get a temp filename");
+        }
+        if (fopen_s(&m_file, m_buffer, "w")) {
+            char buffer[100];
+            if (strerror_s(buffer, errno)) {
+                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
+            }
+            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
+        }
+    }
+#else
+    TempFile::TempFile() {
+        m_file = std::tmpfile();
+        if (!m_file) {
+            CATCH_RUNTIME_ERROR("Could not create a temp file.");
+        }
+    }
+
+#endif
+
+    TempFile::~TempFile() {
+         // TBD: What to do about errors here?
+         std::fclose(m_file);
+         // We manually create the file on Windows only, on Linux
+         // it will be autodeleted
+#if defined(_MSC_VER)
+         std::remove(m_buffer);
+#endif
+    }
+
+    FILE* TempFile::getFile() {
+        return m_file;
+    }
+
+    std::string TempFile::getContents() {
+        std::stringstream sstr;
+        char buffer[100] = {};
+        std::rewind(m_file);
+        while (std::fgets(buffer, sizeof(buffer), m_file)) {
+            sstr << buffer;
+        }
+        return sstr.str();
+    }
+
+    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
+        m_originalStdout(dup(1)),
+        m_originalStderr(dup(2)),
+        m_stdoutDest(stdout_dest),
+        m_stderrDest(stderr_dest) {
+        dup2(fileno(m_stdoutFile.getFile()), 1);
+        dup2(fileno(m_stderrFile.getFile()), 2);
+    }
+
+    OutputRedirect::~OutputRedirect() {
+        Catch::cout() << std::flush;
+        fflush(stdout);
+        // Since we support overriding these streams, we flush cerr
+        // even though std::cerr is unbuffered
+        Catch::cerr() << std::flush;
+        Catch::clog() << std::flush;
+        fflush(stderr);
+
+        dup2(m_originalStdout, 1);
+        dup2(m_originalStderr, 2);
+
+        m_stdoutDest += m_stdoutFile.getContents();
+        m_stderrDest += m_stderrFile.getContents();
+    }
+
+#endif // CATCH_CONFIG_NEW_CAPTURE
+
+} // namespace Catch
+
+#if defined(CATCH_CONFIG_NEW_CAPTURE)
+    #if defined(_MSC_VER)
+    #undef dup
+    #undef dup2
+    #undef fileno
+    #endif
+#endif
+// end catch_output_redirect.cpp
+// start catch_polyfills.cpp
+
+#include <cmath>
+
+namespace Catch {
+
+#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
+    bool isnan(float f) {
+        return std::isnan(f);
+    }
+    bool isnan(double d) {
+        return std::isnan(d);
+    }
+#else
+    // For now we only use this for embarcadero
+    bool isnan(float f) {
+        return std::_isnan(f);
+    }
+    bool isnan(double d) {
+        return std::_isnan(d);
+    }
+#endif
+
+} // end namespace Catch
+// end catch_polyfills.cpp
+// start catch_random_number_generator.cpp
+
+namespace Catch {
+
+namespace {
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4146) // we negate uint32 during the rotate
+#endif
+        // Safe rotr implementation thanks to John Regehr
+        uint32_t rotate_right(uint32_t val, uint32_t count) {
+            const uint32_t mask = 31;
+            count &= mask;
+            return (val >> count) | (val << (-count & mask));
+        }
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+}
+
+    SimplePcg32::SimplePcg32(result_type seed_) {
+        seed(seed_);
+    }
+
+    void SimplePcg32::seed(result_type seed_) {
+        m_state = 0;
+        (*this)();
+        m_state += seed_;
+        (*this)();
+    }
+
+    void SimplePcg32::discard(uint64_t skip) {
+        // We could implement this to run in O(log n) steps, but this
+        // should suffice for our use case.
+        for (uint64_t s = 0; s < skip; ++s) {
+            static_cast<void>((*this)());
+        }
+    }
+
+    SimplePcg32::result_type SimplePcg32::operator()() {
+        // prepare the output value
+        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
+        const auto output = rotate_right(xorshifted, m_state >> 59u);
+
+        // advance state
+        m_state = m_state * 6364136223846793005ULL + s_inc;
+
+        return output;
+    }
+
+    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state == rhs.m_state;
+    }
+
+    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
+        return lhs.m_state != rhs.m_state;
+    }
+}
+// end catch_random_number_generator.cpp
+// start catch_registry_hub.cpp
+
+// start catch_test_case_registry_impl.h
+
+#include <vector>
+#include <set>
+#include <algorithm>
+#include <ios>
+
+namespace Catch {
+
+    class TestCase;
+    struct IConfig;
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        virtual ~TestRegistry() = default;
+
+        virtual void registerTest( TestCase const& testCase );
+
+        std::vector<TestCase> const& getAllTests() const override;
+        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        std::size_t m_unnamedCount = 0;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class TestInvokerAsFunction : public ITestInvoker {
+        void(*m_testAsFunction)();
+    public:
+        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
+
+        void invoke() const override;
+    };
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
+
+    ///////////////////////////////////////////////////////////////////////////
+
+} // end namespace Catch
+
+// end catch_test_case_registry_impl.h
+// start catch_reporter_registry.h
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        ~ReporterRegistry() override;
+
+        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
+
+        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
+        void registerListener( IReporterFactoryPtr const& factory );
+
+        FactoryMap const& getFactories() const override;
+        Listeners const& getListeners() const override;
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// end catch_reporter_registry.h
+// start catch_tag_alias_registry.h
+
+// start catch_tag_alias.h
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias.h
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        ~TagAliasRegistry() override;
+        TagAlias const* find( std::string const& alias ) const override;
+        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+// end catch_tag_alias_registry.h
+// start catch_startup_exception_registry.h
+
+#include <vector>
+#include <exception>
+
+namespace Catch {
+
+    class StartupExceptionRegistry {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+    public:
+        void add(std::exception_ptr const& exception) noexcept;
+        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
+    private:
+        std::vector<std::exception_ptr> m_exceptions;
+#endif
+    };
+
+} // end namespace Catch
+
+// end catch_startup_exception_registry.h
+// start catch_singletons.hpp
+
+namespace Catch {
+
+    struct ISingleton {
+        virtual ~ISingleton();
+    };
+
+    void addSingleton( ISingleton* singleton );
+    void cleanupSingletons();
+
+    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
+    class Singleton : SingletonImplT, public ISingleton {
+
+        static auto getInternal() -> Singleton* {
+            static Singleton* s_instance = nullptr;
+            if( !s_instance ) {
+                s_instance = new Singleton;
+                addSingleton( s_instance );
+            }
+            return s_instance;
+        }
+
+    public:
+        static auto get() -> InterfaceT const& {
+            return *getInternal();
+        }
+        static auto getMutable() -> MutableInterfaceT& {
+            return *getInternal();
+        }
+    };
+
+} // namespace Catch
+
+// end catch_singletons.hpp
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
+                            private NonCopyable {
+
+        public: // IRegistryHub
+            RegistryHub() = default;
+            IReporterRegistry const& getReporterRegistry() const override {
+                return m_reporterRegistry;
+            }
+            ITestCaseRegistry const& getTestCaseRegistry() const override {
+                return m_testCaseRegistry;
+            }
+            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
+                return m_exceptionTranslatorRegistry;
+            }
+            ITagAliasRegistry const& getTagAliasRegistry() const override {
+                return m_tagAliasRegistry;
+            }
+            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
+                return m_exceptionRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            void registerListener( IReporterFactoryPtr const& factory ) override {
+                m_reporterRegistry.registerListener( factory );
+            }
+            void registerTest( TestCase const& testInfo ) override {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            void registerTranslator( const IExceptionTranslator* translator ) override {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+            void registerStartupException() noexcept override {
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+                m_exceptionRegistry.add(std::current_exception());
+#else
+                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
+#endif
+            }
+            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
+                return m_enumValuesRegistry;
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+            StartupExceptionRegistry m_exceptionRegistry;
+            Detail::EnumValuesRegistry m_enumValuesRegistry;
+        };
+    }
+
+    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
+
+    IRegistryHub const& getRegistryHub() {
+        return RegistryHubSingleton::get();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return RegistryHubSingleton::getMutable();
+    }
+    void cleanUp() {
+        cleanupSingletons();
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+// end catch_registry_hub.cpp
+// start catch_reporter_registry.cpp
+
+namespace Catch {
+
+    ReporterRegistry::~ReporterRegistry() = default;
+
+    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
+        auto it =  m_factories.find( name );
+        if( it == m_factories.end() )
+            return nullptr;
+        return it->second->create( ReporterConfig( config ) );
+    }
+
+    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
+        m_factories.emplace(name, factory);
+    }
+    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
+        m_listeners.push_back( factory );
+    }
+
+    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
+        return m_factories;
+    }
+    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
+        return m_listeners;
+    }
+
+}
+// end catch_reporter_registry.cpp
+// start catch_result_type.cpp
+
+namespace Catch {
+
+    bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+// end catch_result_type.cpp
+// start catch_run_context.cpp
+
+#include <cassert>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace Generators {
+        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
+            GeneratorBasePtr m_generator;
+
+            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+            :   TrackerBase( nameAndLocation, ctx, parent )
+            {}
+            ~GeneratorTracker();
+
+            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
+                std::shared_ptr<GeneratorTracker> tracker;
+
+                ITracker& currentTracker = ctx.currentTracker();
+                // Under specific circumstances, the generator we want
+                // to acquire is also the current tracker. If this is
+                // the case, we have to avoid looking through current
+                // tracker's children, and instead return the current
+                // tracker.
+                // A case where this check is important is e.g.
+                //     for (int i = 0; i < 5; ++i) {
+                //         int n = GENERATE(1, 2);
+                //     }
+                //
+                // without it, the code above creates 5 nested generators.
+                if (currentTracker.nameAndLocation() == nameAndLocation) {
+                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
+                    assert(thisTracker);
+                    assert(thisTracker->isGeneratorTracker());
+                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
+                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                    assert( childTracker );
+                    assert( childTracker->isGeneratorTracker() );
+                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
+                } else {
+                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
+                    currentTracker.addChild( tracker );
+                }
+
+                if( !ctx.completedCycle() && !tracker->isComplete() ) {
+                    tracker->open();
+                }
+
+                return *tracker;
+            }
+
+            // TrackerBase interface
+            bool isGeneratorTracker() const override { return true; }
+            auto hasGenerator() const -> bool override {
+                return !!m_generator;
+            }
+            void close() override {
+                TrackerBase::close();
+                // Generator interface only finds out if it has another item on atual move
+                if (m_runState == CompletedSuccessfully && m_generator->next()) {
+                    m_children.clear();
+                    m_runState = Executing;
+                }
+            }
+
+            // IGeneratorTracker interface
+            auto getGenerator() const -> GeneratorBasePtr const& override {
+                return m_generator;
+            }
+            void setGenerator( GeneratorBasePtr&& generator ) override {
+                m_generator = std::move( generator );
+            }
+        };
+        GeneratorTracker::~GeneratorTracker() {}
+    }
+
+    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
+    :   m_runInfo(_config->name()),
+        m_context(getCurrentMutableContext()),
+        m_config(_config),
+        m_reporter(std::move(reporter)),
+        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
+        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
+    {
+        m_context.setRunner(this);
+        m_context.setConfig(m_config);
+        m_context.setResultCapture(this);
+        m_reporter->testRunStarting(m_runInfo);
+    }
+
+    RunContext::~RunContext() {
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
+    }
+
+    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
+    }
+
+    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
+        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
+    }
+
+    Totals RunContext::runTest(TestCase const& testCase) {
+        Totals prevTotals = m_totals;
+
+        std::string redirectedCout;
+        std::string redirectedCerr;
+
+        auto const& testInfo = testCase.getTestCaseInfo();
+
+        m_reporter->testCaseStarting(testInfo);
+
+        m_activeTestCase = &testCase;
+
+        ITracker& rootTracker = m_trackerContext.startRun();
+        assert(rootTracker.isSectionTracker());
+        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
+        do {
+            m_trackerContext.startCycle();
+            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
+            runCurrentTest(redirectedCout, redirectedCerr);
+        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
+
+        Totals deltaTotals = m_totals.delta(prevTotals);
+        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
+            deltaTotals.assertions.failed++;
+            deltaTotals.testCases.passed--;
+            deltaTotals.testCases.failed++;
+        }
+        m_totals.testCases += deltaTotals.testCases;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  redirectedCout,
+                                  redirectedCerr,
+                                  aborting()));
+
+        m_activeTestCase = nullptr;
+        m_testCaseTracker = nullptr;
+
+        return deltaTotals;
+    }
+
+    IConfigPtr RunContext::config() const {
+        return m_config;
+    }
+
+    IStreamingReporter& RunContext::reporter() const {
+        return *m_reporter;
+    }
+
+    void RunContext::assertionEnded(AssertionResult const & result) {
+        if (result.getResultType() == ResultWas::Ok) {
+            m_totals.assertions.passed++;
+            m_lastAssertionPassed = true;
+        } else if (!result.isOk()) {
+            m_lastAssertionPassed = false;
+            if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                m_totals.assertions.failedButOk++;
+            else
+                m_totals.assertions.failed++;
+        }
+        else {
+            m_lastAssertionPassed = true;
+        }
+
+        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+        // and should be let to clear themselves out.
+        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+        if (result.getResultType() != ResultWas::Warning)
+            m_messageScopes.clear();
+
+        // Reset working state
+        resetAssertionInfo();
+        m_lastResult = result;
+    }
+    void RunContext::resetAssertionInfo() {
+        m_lastAssertionInfo.macroName = StringRef();
+        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
+    }
+
+    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
+        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
+        if (!sectionTracker.isOpen())
+            return false;
+        m_activeSections.push_back(&sectionTracker);
+
+        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+        m_reporter->sectionStarting(sectionInfo);
+
+        assertions = m_totals.assertions;
+
+        return true;
+    }
+    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
+        using namespace Generators;
+        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
+                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
+        assert( tracker.isOpen() );
+        m_lastAssertionInfo.lineInfo = lineInfo;
+        return tracker;
+    }
+
+    bool RunContext::testForMissingAssertions(Counts& assertions) {
+        if (assertions.total() != 0)
+            return false;
+        if (!m_config->warnAboutMissingAssertions())
+            return false;
+        if (m_trackerContext.currentTracker().hasChildren())
+            return false;
+        m_totals.assertions.failed++;
+        assertions.failed++;
+        return true;
+    }
+
+    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
+        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        if (!m_activeSections.empty()) {
+            m_activeSections.back()->close();
+            m_activeSections.pop_back();
+        }
+
+        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
+        m_messages.clear();
+        m_messageScopes.clear();
+    }
+
+    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
+        if (m_unfinishedSections.empty())
+            m_activeSections.back()->fail();
+        else
+            m_activeSections.back()->close();
+        m_activeSections.pop_back();
+
+        m_unfinishedSections.push_back(endInfo);
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void RunContext::benchmarkPreparing(std::string const& name) {
+        m_reporter->benchmarkPreparing(name);
+    }
+    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
+        m_reporter->benchmarkStarting( info );
+    }
+    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
+        m_reporter->benchmarkEnded( stats );
+    }
+    void RunContext::benchmarkFailed(std::string const & error) {
+        m_reporter->benchmarkFailed(error);
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void RunContext::pushScopedMessage(MessageInfo const & message) {
+        m_messages.push_back(message);
+    }
+
+    void RunContext::popScopedMessage(MessageInfo const & message) {
+        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
+    }
+
+    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
+        m_messageScopes.emplace_back( builder );
+    }
+
+    std::string RunContext::getCurrentTestName() const {
+        return m_activeTestCase
+            ? m_activeTestCase->getTestCaseInfo().name
+            : std::string();
+    }
+
+    const AssertionResult * RunContext::getLastResult() const {
+        return &(*m_lastResult);
+    }
+
+    void RunContext::exceptionEarlyReported() {
+        m_shouldReportUnexpected = false;
+    }
+
+    void RunContext::handleFatalErrorCondition( StringRef message ) {
+        // First notify reporter that bad things happened
+        m_reporter->fatalErrorEncountered(message);
+
+        // Don't rebuild the result -- the stringification itself can cause more fatal errors
+        // Instead, fake a result data.
+        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
+        tempResult.message = static_cast<std::string>(message);
+        AssertionResult result(m_lastAssertionInfo, tempResult);
+
+        assertionEnded(result);
+
+        handleUnfinishedSections();
+
+        // Recreate section for test case (as we will lose the one that was in scope)
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+
+        Counts assertions;
+        assertions.failed = 1;
+        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
+        m_reporter->sectionEnded(testCaseSectionStats);
+
+        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
+
+        Totals deltaTotals;
+        deltaTotals.testCases.failed = 1;
+        deltaTotals.assertions.failed = 1;
+        m_reporter->testCaseEnded(TestCaseStats(testInfo,
+                                  deltaTotals,
+                                  std::string(),
+                                  std::string(),
+                                  false));
+        m_totals.testCases.failed++;
+        testGroupEnded(std::string(), m_totals, 1, 1);
+        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
+    }
+
+    bool RunContext::lastAssertionPassed() {
+         return m_lastAssertionPassed;
+    }
+
+    void RunContext::assertionPassed() {
+        m_lastAssertionPassed = true;
+        ++m_totals.assertions.passed;
+        resetAssertionInfo();
+        m_messageScopes.clear();
+    }
+
+    bool RunContext::aborting() const {
+        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
+    }
+
+    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
+        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
+        m_reporter->sectionStarting(testCaseSection);
+        Counts prevAssertions = m_totals.assertions;
+        double duration = 0;
+        m_shouldReportUnexpected = true;
+        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
+
+        seedRng(*m_config);
+
+        Timer timer;
+        CATCH_TRY {
+            if (m_reporter->getPreferences().shouldRedirectStdOut) {
+#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
+                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
+
+                timer.start();
+                invokeActiveTestCase();
+#else
+                OutputRedirect r(redirectedCout, redirectedCerr);
+                timer.start();
+                invokeActiveTestCase();
+#endif
+            } else {
+                timer.start();
+                invokeActiveTestCase();
+            }
+            duration = timer.getElapsedSeconds();
+        } CATCH_CATCH_ANON (TestFailureException&) {
+            // This just means the test was aborted due to failure
+        } CATCH_CATCH_ALL {
+            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+            // are reported without translation at the point of origin.
+            if( m_shouldReportUnexpected ) {
+                AssertionReaction dummyReaction;
+                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
+            }
+        }
+        Counts assertions = m_totals.assertions - prevAssertions;
+        bool missingAssertions = testForMissingAssertions(assertions);
+
+        m_testCaseTracker->close();
+        handleUnfinishedSections();
+        m_messages.clear();
+        m_messageScopes.clear();
+
+        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
+        m_reporter->sectionEnded(testCaseSectionStats);
+    }
+
+    void RunContext::invokeActiveTestCase() {
+        FatalConditionHandler fatalConditionHandler; // Handle signals
+        m_activeTestCase->invoke();
+        fatalConditionHandler.reset();
+    }
+
+    void RunContext::handleUnfinishedSections() {
+        // If sections ended prematurely due to an exception we stored their
+        // infos here so we can tear them down outside the unwind process.
+        for (auto it = m_unfinishedSections.rbegin(),
+             itEnd = m_unfinishedSections.rend();
+             it != itEnd;
+             ++it)
+            sectionEnded(*it);
+        m_unfinishedSections.clear();
+    }
+
+    void RunContext::handleExpr(
+        AssertionInfo const& info,
+        ITransientExpression const& expr,
+        AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        bool negated = isFalseTest( info.resultDisposition );
+        bool result = expr.getResult() != negated;
+
+        if( result ) {
+            if (!m_includeSuccessfulResults) {
+                assertionPassed();
+            }
+            else {
+                reportExpr(info, ResultWas::Ok, &expr, negated);
+            }
+        }
+        else {
+            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
+            populateReaction( reaction );
+        }
+    }
+    void RunContext::reportExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            ITransientExpression const *expr,
+            bool negated ) {
+
+        m_lastAssertionInfo = info;
+        AssertionResultData data( resultType, LazyExpression( negated ) );
+
+        AssertionResult assertionResult{ info, data };
+        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
+
+        assertionEnded( assertionResult );
+    }
+
+    void RunContext::handleMessage(
+            AssertionInfo const& info,
+            ResultWas::OfType resultType,
+            StringRef const& message,
+            AssertionReaction& reaction
+    ) {
+        m_reporter->assertionStarting( info );
+
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        data.message = static_cast<std::string>(message);
+        AssertionResult assertionResult{ m_lastAssertionInfo, data };
+        assertionEnded( assertionResult );
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+    void RunContext::handleUnexpectedExceptionNotThrown(
+            AssertionInfo const& info,
+            AssertionReaction& reaction
+    ) {
+        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
+    }
+
+    void RunContext::handleUnexpectedInflightException(
+            AssertionInfo const& info,
+            std::string const& message,
+            AssertionReaction& reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = message;
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+        populateReaction( reaction );
+    }
+
+    void RunContext::populateReaction( AssertionReaction& reaction ) {
+        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
+        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
+    }
+
+    void RunContext::handleIncomplete(
+            AssertionInfo const& info
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
+        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+    }
+    void RunContext::handleNonExpr(
+            AssertionInfo const &info,
+            ResultWas::OfType resultType,
+            AssertionReaction &reaction
+    ) {
+        m_lastAssertionInfo = info;
+
+        AssertionResultData data( resultType, LazyExpression( false ) );
+        AssertionResult assertionResult{ info, data };
+        assertionEnded( assertionResult );
+
+        if( !assertionResult.isOk() )
+            populateReaction( reaction );
+    }
+
+    IResultCapture& getResultCapture() {
+        if (auto* capture = getCurrentContext().getResultCapture())
+            return *capture;
+        else
+            CATCH_INTERNAL_ERROR("No result capture instance");
+    }
+
+    void seedRng(IConfig const& config) {
+        if (config.rngSeed() != 0) {
+            std::srand(config.rngSeed());
+            rng().seed(config.rngSeed());
+        }
+    }
+
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+}
+// end catch_run_context.cpp
+// start catch_section.cpp
+
+namespace Catch {
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
+            if( uncaught_exceptions() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+// end catch_section.cpp
+// start catch_section_info.cpp
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name )
+    :   name( _name ),
+        lineInfo( _lineInfo )
+    {}
+
+} // end namespace Catch
+// end catch_section_info.cpp
+// start catch_session.cpp
+
+// start catch_session.h
+
+#include <memory>
+
+namespace Catch {
+
+    class Session : NonCopyable {
+    public:
+
+        Session();
+        ~Session() override;
+
+        void showHelp() const;
+        void libIdentify();
+
+        int applyCommandLine( int argc, char const * const * argv );
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+        int applyCommandLine( int argc, wchar_t const * const * argv );
+    #endif
+
+        void useConfigData( ConfigData const& configData );
+
+        template<typename CharT>
+        int run(int argc, CharT const * const argv[]) {
+            if (m_startupExceptions)
+                return 1;
+            int returnCode = applyCommandLine(argc, argv);
+            if (returnCode == 0)
+                returnCode = run();
+            return returnCode;
+        }
+
+        int run();
+
+        clara::Parser const& cli() const;
+        void cli( clara::Parser const& newParser );
+        ConfigData& configData();
+        Config& config();
+    private:
+        int runInternal();
+
+        clara::Parser m_cli;
+        ConfigData m_configData;
+        std::shared_ptr<Config> m_config;
+        bool m_startupExceptions = false;
+    };
+
+} // end namespace Catch
+
+// end catch_session.h
+// start catch_version.h
+
+#include <iosfwd>
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version( Version const& ) = delete;
+        Version& operator=( Version const& ) = delete;
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+    };
+
+    Version const& libraryVersion();
+}
+
+// end catch_version.h
+#include <cstdlib>
+#include <iomanip>
+#include <set>
+#include <iterator>
+
+namespace Catch {
+
+    namespace {
+        const int MaxExitCode = 255;
+
+        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
+            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
+            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
+
+            return reporter;
+        }
+
+        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
+            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
+                return createReporter(config->getReporterName(), config);
+            }
+
+            // On older platforms, returning std::unique_ptr<ListeningReporter>
+            // when the return type is std::unique_ptr<IStreamingReporter>
+            // doesn't compile without a std::move call. However, this causes
+            // a warning on newer platforms. Thus, we have to work around
+            // it a bit and downcast the pointer manually.
+            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
+            auto& multi = static_cast<ListeningReporter&>(*ret);
+            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
+            for (auto const& listener : listeners) {
+                multi.addListener(listener->create(Catch::ReporterConfig(config)));
+            }
+            multi.addReporter(createReporter(config->getReporterName(), config));
+            return ret;
+        }
+
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+
+                if (m_matches.empty() && invalidArgs.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
+            }
+
+            Totals execute() {
+                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
+                }
+
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+
+                if (!invalidArgs.empty()) {
+                    for (auto const& invalidArg: invalidArgs)
+                         m_context.reporter().reportInvalidArguments(invalidArg);
+                }
+
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
+            }
+
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
+
+        void applyFilenamesAsTags(Catch::IConfig const& config) {
+            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
+            for (auto& testCase : tests) {
+                auto tags = testCase.tags;
+
+                std::string filename = testCase.lineInfo.file;
+                auto lastSlash = filename.find_last_of("\\/");
+                if (lastSlash != std::string::npos) {
+                    filename.erase(0, lastSlash);
+                    filename[0] = '#';
+                }
+
+                auto lastDot = filename.find_last_of('.');
+                if (lastDot != std::string::npos) {
+                    filename.erase(lastDot);
+                }
+
+                tags.push_back(std::move(filename));
+                setTags(testCase, tags);
+            }
+        }
+
+    } // anon namespace
+
+    Session::Session() {
+        static bool alreadyInstantiated = false;
+        if( alreadyInstantiated ) {
+            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
+            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
+        }
+
+        // There cannot be exceptions at startup in no-exception mode.
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
+        if ( !exceptions.empty() ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+
+            m_startupExceptions = true;
+            Colour colourGuard( Colour::Red );
+            Catch::cerr() << "Errors occurred during startup!" << '\n';
+            // iterate over all exceptions and notify user
+            for ( const auto& ex_ptr : exceptions ) {
+                try {
+                    std::rethrow_exception(ex_ptr);
+                } catch ( std::exception const& ex ) {
+                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
+                }
+            }
+        }
+#endif
+
+        alreadyInstantiated = true;
+        m_cli = makeCommandLineParser( m_configData );
+    }
+    Session::~Session() {
+        Catch::cleanUp();
+    }
+
+    void Session::showHelp() const {
+        Catch::cout()
+                << "\nCatch v" << libraryVersion() << "\n"
+                << m_cli << std::endl
+                << "For more detailed usage please see the project docs\n" << std::endl;
+    }
+    void Session::libIdentify() {
+        Catch::cout()
+                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
+                << std::left << std::setw(16) << "category: " << "testframework\n"
+                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+    }
+
+    int Session::applyCommandLine( int argc, char const * const * argv ) {
+        if( m_startupExceptions )
+            return 1;
+
+        auto result = m_cli.parse( clara::Args( argc, argv ) );
+        if( !result ) {
+            config();
+            getCurrentMutableContext().setConfig(m_config);
+            Catch::cerr()
+                << Colour( Colour::Red )
+                << "\nError(s) in input:\n"
+                << Column( result.errorMessage() ).indent( 2 )
+                << "\n\n";
+            Catch::cerr() << "Run with -? for usage\n" << std::endl;
+            return MaxExitCode;
+        }
+
+        if( m_configData.showHelp )
+            showHelp();
+        if( m_configData.libIdentify )
+            libIdentify();
+        m_config.reset();
+        return 0;
+    }
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
+    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
+
+        char **utf8Argv = new char *[ argc ];
+
+        for ( int i = 0; i < argc; ++i ) {
+            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
+
+            utf8Argv[ i ] = new char[ bufSize ];
+
+            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
+        }
+
+        int returnCode = applyCommandLine( argc, utf8Argv );
+
+        for ( int i = 0; i < argc; ++i )
+            delete [] utf8Argv[ i ];
+
+        delete [] utf8Argv;
+
+        return returnCode;
+    }
+#endif
+
+    void Session::useConfigData( ConfigData const& configData ) {
+        m_configData = configData;
+        m_config.reset();
+    }
+
+    int Session::run() {
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        int exitCode = runInternal();
+        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+            static_cast<void>(std::getchar());
+        }
+        return exitCode;
+    }
+
+    clara::Parser const& Session::cli() const {
+        return m_cli;
+    }
+    void Session::cli( clara::Parser const& newParser ) {
+        m_cli = newParser;
+    }
+    ConfigData& Session::configData() {
+        return m_configData;
+    }
+    Config& Session::config() {
+        if( !m_config )
+            m_config = std::make_shared<Config>( m_configData );
+        return *m_config;
+    }
+
+    int Session::runInternal() {
+        if( m_startupExceptions )
+            return 1;
+
+        if (m_configData.showHelp || m_configData.libIdentify) {
+            return 0;
+        }
+
+        CATCH_TRY {
+            config(); // Force config to be constructed
+
+            seedRng( *m_config );
+
+            if( m_configData.filenamesAsTags )
+                applyFilenamesAsTags( *m_config );
+
+            // Handle list request
+            if( Option<std::size_t> listed = list( m_config ) )
+                return static_cast<int>( *listed );
+
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
+            // Note that on unices only the lower 8 bits are usually used, clamping
+            // the return value to 255 prevents false negative when some multiple
+            // of 256 tests has failed
+            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
+        }
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        catch( std::exception& ex ) {
+            Catch::cerr() << ex.what() << std::endl;
+            return MaxExitCode;
+        }
+#endif
+    }
+
+} // end namespace Catch
+// end catch_session.cpp
+// start catch_singletons.cpp
+
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        static auto getSingletons() -> std::vector<ISingleton*>*& {
+            static std::vector<ISingleton*>* g_singletons = nullptr;
+            if( !g_singletons )
+                g_singletons = new std::vector<ISingleton*>();
+            return g_singletons;
+        }
+    }
+
+    ISingleton::~ISingleton() {}
+
+    void addSingleton(ISingleton* singleton ) {
+        getSingletons()->push_back( singleton );
+    }
+    void cleanupSingletons() {
+        auto& singletons = getSingletons();
+        for( auto singleton : *singletons )
+            delete singleton;
+        delete singletons;
+        singletons = nullptr;
+    }
+
+} // namespace Catch
+// end catch_singletons.cpp
+// start catch_startup_exception_registry.cpp
+
+#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+namespace Catch {
+void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
+        CATCH_TRY {
+            m_exceptions.push_back(exception);
+        } CATCH_CATCH_ALL {
+            // If we run out of memory during start-up there's really not a lot more we can do about it
+            std::terminate();
+        }
+    }
+
+    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
+        return m_exceptions;
+    }
+
+} // end namespace Catch
+#endif
+// end catch_startup_exception_registry.cpp
+// start catch_stream.cpp
+
+#include <cstdio>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    Catch::IStream::~IStream() = default;
+
+    namespace Detail { namespace {
+        template<typename WriterF, std::size_t bufferSize=256>
+        class StreamBufImpl : public std::streambuf {
+            char data[bufferSize];
+            WriterF m_writer;
+
+        public:
+            StreamBufImpl() {
+                setp( data, data + sizeof(data) );
+            }
+
+            ~StreamBufImpl() noexcept {
+                StreamBufImpl::sync();
+            }
+
+        private:
+            int overflow( int c ) override {
+                sync();
+
+                if( c != EOF ) {
+                    if( pbase() == epptr() )
+                        m_writer( std::string( 1, static_cast<char>( c ) ) );
+                    else
+                        sputc( static_cast<char>( c ) );
+                }
+                return 0;
+            }
+
+            int sync() override {
+                if( pbase() != pptr() ) {
+                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                    setp( pbase(), epptr() );
+                }
+                return 0;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        struct OutputDebugWriter {
+
+            void operator()( std::string const&str ) {
+                writeToDebugConsole( str );
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class FileStream : public IStream {
+            mutable std::ofstream m_ofs;
+        public:
+            FileStream( StringRef filename ) {
+                m_ofs.open( filename.c_str() );
+                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
+            }
+            ~FileStream() override = default;
+        public: // IStream
+            std::ostream& stream() const override {
+                return m_ofs;
+            }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class CoutStream : public IStream {
+            mutable std::ostream m_os;
+        public:
+            // Store the streambuf from cout up-front because
+            // cout may get redirected when running tests
+            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
+            ~CoutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+        ///////////////////////////////////////////////////////////////////////////
+
+        class DebugOutStream : public IStream {
+            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
+            mutable std::ostream m_os;
+        public:
+            DebugOutStream()
+            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+                m_os( m_streamBuf.get() )
+            {}
+
+            ~DebugOutStream() override = default;
+
+        public: // IStream
+            std::ostream& stream() const override { return m_os; }
+        };
+
+    }} // namespace anon::detail
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    auto makeStream( StringRef const &filename ) -> IStream const* {
+        if( filename.empty() )
+            return new Detail::CoutStream();
+        else if( filename[0] == '%' ) {
+            if( filename == "%debug" )
+                return new Detail::DebugOutStream();
+            else
+                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
+        }
+        else
+            return new Detail::FileStream( filename );
+    }
+
+    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
+    struct StringStreams {
+        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
+        std::vector<std::size_t> m_unused;
+        std::ostringstream m_referenceStream; // Used for copy state/ flags from
+
+        auto add() -> std::size_t {
+            if( m_unused.empty() ) {
+                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
+                return m_streams.size()-1;
+            }
+            else {
+                auto index = m_unused.back();
+                m_unused.pop_back();
+                return index;
+            }
+        }
+
+        void release( std::size_t index ) {
+            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
+            m_unused.push_back(index);
+        }
+    };
+
+    ReusableStringStream::ReusableStringStream()
+    :   m_index( Singleton<StringStreams>::getMutable().add() ),
+        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
+    {}
+
+    ReusableStringStream::~ReusableStringStream() {
+        static_cast<std::ostringstream*>( m_oss )->str("");
+        m_oss->clear();
+        Singleton<StringStreams>::getMutable().release( m_index );
+    }
+
+    auto ReusableStringStream::str() const -> std::string {
+        return static_cast<std::ostringstream*>( m_oss )->str();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() { return std::cout; }
+    std::ostream& cerr() { return std::cerr; }
+    std::ostream& clog() { return std::clog; }
+#endif
+}
+// end catch_stream.cpp
+// start catch_string_manip.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cctype>
+#include <vector>
+
+namespace Catch {
+
+    namespace {
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
+        }
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    StringRef trim(StringRef ref) {
+        const auto is_ws = [](char c) {
+            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
+        };
+        size_t real_begin = 0;
+        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
+        size_t real_end = ref.size();
+        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
+
+        return ref.substr(real_begin, real_end - real_begin);
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
+        std::vector<StringRef> subStrings;
+        std::size_t start = 0;
+        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
+            if( str[pos] == delimiter ) {
+                if( pos - start > 1 )
+                    subStrings.push_back( str.substr( start, pos-start ) );
+                start = pos+1;
+            }
+        }
+        if( start < str.size() )
+            subStrings.push_back( str.substr( start, str.size()-start ) );
+        return subStrings;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+}
+// end catch_string_manip.cpp
+// start catch_stringref.cpp
+
+#include <algorithm>
+#include <ostream>
+#include <cstring>
+#include <cstdint>
+
+namespace Catch {
+    StringRef::StringRef( char const* rawChars ) noexcept
+    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
+    {}
+
+    auto StringRef::c_str() const -> char const* {
+        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
+        return m_start;
+    }
+    auto StringRef::data() const noexcept -> char const* {
+        return m_start;
+    }
+
+    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
+        if (start < m_size) {
+            return StringRef(m_start + start, (std::min)(m_size - start, size));
+        } else {
+            return StringRef();
+        }
+    }
+    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
+        return m_size == other.m_size
+            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
+    }
+
+    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
+        return os.write(str.data(), str.size());
+    }
+
+    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
+        lhs.append(rhs.data(), rhs.size());
+        return lhs;
+    }
+
+} // namespace Catch
+// end catch_stringref.cpp
+// start catch_tag_alias.cpp
+
+namespace Catch {
+    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
+}
+// end catch_tag_alias.cpp
+// start catch_tag_alias_autoregistrar.cpp
+
+namespace Catch {
+
+    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
+        CATCH_TRY {
+            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+}
+// end catch_tag_alias_autoregistrar.cpp
+// start catch_tag_alias_registry.cpp
+
+#include <sstream>
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
+        auto it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return &(it->second);
+        else
+            return nullptr;
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( auto const& registryKvp : m_registry ) {
+            std::size_t pos = expandedTestSpec.find( registryKvp.first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    registryKvp.second.tag +
+                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
+                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
+
+        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
+                      "error: tag alias, '" << alias << "' already registered.\n"
+                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
+                      << "\tRedefined at: " << lineInfo );
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+} // end namespace Catch
+// end catch_tag_alias_registry.cpp
+// start catch_test_case_info.cpp
+
+#include <cctype>
+#include <exception>
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+            if( startsWith( tag, '.' ) ||
+                tag == "!hide" )
+                return TestCaseInfo::IsHidden;
+            else if( tag == "!throws" )
+                return TestCaseInfo::Throws;
+            else if( tag == "!shouldfail" )
+                return TestCaseInfo::ShouldFail;
+            else if( tag == "!mayfail" )
+                return TestCaseInfo::MayFail;
+            else if( tag == "!nonportable" )
+                return TestCaseInfo::NonPortable;
+            else if( tag == "!benchmark" )
+                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
+            else
+                return TestCaseInfo::None;
+        }
+        bool isReservedTag( std::string const& tag ) {
+            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
+        }
+        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+            CATCH_ENFORCE( !isReservedTag(tag),
+                          "Tag name: [" << tag << "] is not allowed.\n"
+                          << "Tag names starting with non alphanumeric characters are reserved\n"
+                          << _lineInfo );
+        }
+    }
+
+    TestCase makeTestCase(  ITestInvoker* _testCase,
+                            std::string const& _className,
+                            NameAndTags const& nameAndTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden = false;
+
+        // Parse out tags
+        std::vector<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        for (char c : nameAndTags.tags) {
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    // Merged hide tags like `[.approvals]` should be added as
+                    // `[.][approvals]`. The `[.]` is added at later point, so
+                    // we only strip the prefix
+                    if (startsWith(tag, '.') && tag.size() > 1) {
+                        tag.erase(0, 1);
+                    }
+                    tags.push_back( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            // Add all "hidden" tags to make them behave identically
+            tags.insert( tags.end(), { ".", "!hide" } );
+        }
+
+        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, std::move(info) );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
+        std::sort(begin(tags), end(tags));
+        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
+        testCaseInfo.lcaseTags.clear();
+
+        for( auto const& tag : tags ) {
+            std::string lcaseTag = toLower( tag );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.push_back( lcaseTag );
+        }
+        testCaseInfo.tags = std::move(tags);
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::vector<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    std::string TestCaseInfo::tagsAsString() const {
+        std::string ret;
+        // '[' and ']' per tag
+        std::size_t full_size = 2 * tags.size();
+        for (const auto& tag : tags) {
+            full_size += tag.size();
+        }
+        ret.reserve(full_size);
+        for (const auto& tag : tags) {
+            ret.push_back('[');
+            ret.append(tag);
+            ret.push_back(']');
+        }
+
+        return ret;
+    }
+
+    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+// end catch_test_case_info.cpp
+// start catch_test_case_registry_impl.cpp
+
+#include <algorithm>
+#include <sstream>
+
+namespace Catch {
+
+    namespace {
+        struct TestHasher {
+            explicit TestHasher(Catch::SimplePcg32& rng) {
+                basis = rng();
+                basis <<= 32;
+                basis |= rng();
+            }
+
+            uint64_t basis;
+
+            uint64_t operator()(TestCase const& t) const {
+                // Modified FNV-1a hash
+                static constexpr uint64_t prime = 1099511628211;
+                uint64_t hash = basis;
+                for (const char c : t.name) {
+                    hash ^= c;
+                    hash *= prime;
+                }
+                return hash;
+            }
+        };
+    } // end unnamed namespace
+
+    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+        switch( config.runOrder() ) {
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+
+            case RunTests::InLexicographicalOrder: {
+                std::vector<TestCase> sorted = unsortedTestCases;
+                std::sort( sorted.begin(), sorted.end() );
+                return sorted;
+            }
+
+            case RunTests::InRandomOrder: {
+                seedRng( config );
+                TestHasher h( rng() );
+
+                using hashedTest = std::pair<uint64_t, TestCase const*>;
+                std::vector<hashedTest> indexed_tests;
+                indexed_tests.reserve( unsortedTestCases.size() );
+
+                for (auto const& testCase : unsortedTestCases) {
+                    indexed_tests.emplace_back(h(testCase), &testCase);
+                }
+
+                std::sort(indexed_tests.begin(), indexed_tests.end(),
+                          [](hashedTest const& lhs, hashedTest const& rhs) {
+                          if (lhs.first == rhs.first) {
+                              return lhs.second->name < rhs.second->name;
+                          }
+                          return lhs.first < rhs.first;
+                });
+
+                std::vector<TestCase> sorted;
+                sorted.reserve( indexed_tests.size() );
+
+                for (auto const& hashed : indexed_tests) {
+                    sorted.emplace_back(*hashed.second);
+                }
+
+                return sorted;
+            }
+        }
+        return unsortedTestCases;
+    }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
+    }
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( auto const& function : functions ) {
+            auto prev = seenFunctions.insert( function );
+            CATCH_ENFORCE( prev.second,
+                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
+                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for (auto const& testCase : testCases) {
+            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
+                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
+                filtered.push_back(testCase);
+            }
+        }
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    void TestRegistry::registerTest( TestCase const& testCase ) {
+        std::string name = testCase.getTestCaseInfo().name;
+        if( name.empty() ) {
+            ReusableStringStream rss;
+            rss << "Anonymous test case " << ++m_unnamedCount;
+            return registerTest( testCase.withName( rss.str() ) );
+        }
+        m_functions.push_back( testCase );
+    }
+
+    std::vector<TestCase> const& TestRegistry::getAllTests() const {
+        return m_functions;
+    }
+    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
+        if( m_sortedFunctions.empty() )
+            enforceNoDuplicateTestCases( m_functions );
+
+        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+            m_sortedFunctions = sortTests( config, m_functions );
+            m_currentSortOrder = config.runOrder();
+        }
+        return m_sortedFunctions;
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
+
+    void TestInvokerAsFunction::invoke() const {
+        m_testAsFunction();
+    }
+
+    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
+        std::string className(classOrQualifiedMethodName);
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+} // end namespace Catch
+// end catch_test_case_registry_impl.cpp
+// start catch_test_case_tracker.cpp
+
+#include <algorithm>
+#include <cassert>
+#include <stdexcept>
+#include <memory>
+#include <sstream>
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+    :   name( _name ),
+        location( _location )
+    {}
+
+    ITracker::~ITracker() = default;
+
+    ITracker& TrackerContext::startRun() {
+        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
+        m_currentTracker = nullptr;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+    void TrackerContext::endRun() {
+        m_rootTracker.reset();
+        m_currentTracker = nullptr;
+        m_runState = NotStarted;
+    }
+
+    void TrackerContext::startCycle() {
+        m_currentTracker = m_rootTracker.get();
+        m_runState = Executing;
+    }
+    void TrackerContext::completeCycle() {
+        m_runState = CompletedCycle;
+    }
+
+    bool TrackerContext::completedCycle() const {
+        return m_runState == CompletedCycle;
+    }
+    ITracker& TrackerContext::currentTracker() {
+        return *m_currentTracker;
+    }
+    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
+        m_currentTracker = tracker;
+    }
+
+    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
+        ITracker(nameAndLocation),
+        m_ctx( ctx ),
+        m_parent( parent )
+    {}
+
+    bool TrackerBase::isComplete() const {
+        return m_runState == CompletedSuccessfully || m_runState == Failed;
+    }
+    bool TrackerBase::isSuccessfullyCompleted() const {
+        return m_runState == CompletedSuccessfully;
+    }
+    bool TrackerBase::isOpen() const {
+        return m_runState != NotStarted && !isComplete();
+    }
+    bool TrackerBase::hasChildren() const {
+        return !m_children.empty();
+    }
+
+    void TrackerBase::addChild( ITrackerPtr const& child ) {
+        m_children.push_back( child );
+    }
+
+    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
+        auto it = std::find_if( m_children.begin(), m_children.end(),
+            [&nameAndLocation]( ITrackerPtr const& tracker ){
+                return
+                    tracker->nameAndLocation().location == nameAndLocation.location &&
+                    tracker->nameAndLocation().name == nameAndLocation.name;
+            } );
+        return( it != m_children.end() )
+            ? *it
+            : nullptr;
+    }
+    ITracker& TrackerBase::parent() {
+        assert( m_parent ); // Should always be non-null except for root
+        return *m_parent;
+    }
+
+    void TrackerBase::openChild() {
+        if( m_runState != ExecutingChildren ) {
+            m_runState = ExecutingChildren;
+            if( m_parent )
+                m_parent->openChild();
+        }
+    }
+
+    bool TrackerBase::isSectionTracker() const { return false; }
+    bool TrackerBase::isGeneratorTracker() const { return false; }
+
+    void TrackerBase::open() {
+        m_runState = Executing;
+        moveToThis();
+        if( m_parent )
+            m_parent->openChild();
+    }
+
+    void TrackerBase::close() {
+
+        // Close any still open children (e.g. generators)
+        while( &m_ctx.currentTracker() != this )
+            m_ctx.currentTracker().close();
+
+        switch( m_runState ) {
+            case NeedsAnotherRun:
+                break;
+
+            case Executing:
+                m_runState = CompletedSuccessfully;
+                break;
+            case ExecutingChildren:
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
+                    m_runState = CompletedSuccessfully;
+                break;
+
+            case NotStarted:
+            case CompletedSuccessfully:
+            case Failed:
+                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
+
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
+        }
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::fail() {
+        m_runState = Failed;
+        if( m_parent )
+            m_parent->markAsNeedingAnotherRun();
+        moveToParent();
+        m_ctx.completeCycle();
+    }
+    void TrackerBase::markAsNeedingAnotherRun() {
+        m_runState = NeedsAnotherRun;
+    }
+
+    void TrackerBase::moveToParent() {
+        assert( m_parent );
+        m_ctx.setCurrentTracker( m_parent );
+    }
+    void TrackerBase::moveToThis() {
+        m_ctx.setCurrentTracker( this );
+    }
+
+    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+    :   TrackerBase( nameAndLocation, ctx, parent ),
+        m_trimmed_name(trim(nameAndLocation.name))
+    {
+        if( parent ) {
+            while( !parent->isSectionTracker() )
+                parent = &parent->parent();
+
+            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+            addNextFilters( parentSection.m_filters );
+        }
+    }
+
+    bool SectionTracker::isComplete() const {
+        bool complete = true;
+
+        if ((m_filters.empty() || m_filters[0] == "")
+            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
+            complete = TrackerBase::isComplete();
+        }
+        return complete;
+    }
+
+    bool SectionTracker::isSectionTracker() const { return true; }
+
+    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+        std::shared_ptr<SectionTracker> section;
+
+        ITracker& currentTracker = ctx.currentTracker();
+        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
+            assert( childTracker );
+            assert( childTracker->isSectionTracker() );
+            section = std::static_pointer_cast<SectionTracker>( childTracker );
+        }
+        else {
+            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
+            currentTracker.addChild( section );
+        }
+        if( !ctx.completedCycle() )
+            section->tryOpen();
+        return *section;
+    }
+
+    void SectionTracker::tryOpen() {
+        if( !isComplete() )
+            open();
+    }
+
+    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
+        if( !filters.empty() ) {
+            m_filters.reserve( m_filters.size() + filters.size() + 2 );
+            m_filters.emplace_back(""); // Root - should never be consulted
+            m_filters.emplace_back(""); // Test Case - not a section filter
+            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+        }
+    }
+    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
+        if( filters.size() > 1 )
+            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+
+} // namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+// end catch_test_case_tracker.cpp
+// start catch_test_registry.cpp
+
+namespace Catch {
+
+    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
+        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
+    }
+
+    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
+
+    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
+        CATCH_TRY {
+            getMutableRegistryHub()
+                    .registerTest(
+                        makeTestCase(
+                            invoker,
+                            extractClassName( classOrMethod ),
+                            nameAndTags,
+                            lineInfo));
+        } CATCH_CATCH_ALL {
+            // Do not throw when constructing global objects, instead register the exception to be processed later
+            getMutableRegistryHub().registerStartupException();
+        }
+    }
+
+    AutoReg::~AutoReg() = default;
+}
+// end catch_test_registry.cpp
+// start catch_test_spec.cpp
+
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <memory>
+
+namespace Catch {
+
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
+    {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
+    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
+        return m_wildcardPattern.matches( testCase.name );
+    }
+
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
+    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
+        return std::find(begin(testCase.lcaseTags),
+                         end(testCase.lcaseTags),
+                         m_tag) != end(testCase.lcaseTags);
+    }
+
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
+
+    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
+    }
+
+    bool TestSpec::hasFilters() const {
+        return !m_filters.empty();
+    }
+
+    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
+    }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
+    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
+        return  (m_invalidArgs);
+    }
+
+}
+// end catch_test_spec.cpp
+// start catch_test_spec_parser.cpp
+
+namespace Catch {
+
+    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
+
+    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
+        m_mode = None;
+        m_exclusion = false;
+        m_arg = m_tagAliases->expandAliases( arg );
+        m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
+        m_realPatternPos = 0;
+
+        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+          //if visitChar fails
+           if( !visitChar( m_arg[m_pos] ) ){
+               m_testSpec.m_invalidArgs.push_back(arg);
+               break;
+           }
+        endMode();
+        return *this;
+    }
+    TestSpec TestSpecParser::testSpec() {
+        addFilter();
+        return m_testSpec;
+    }
+    bool TestSpecParser::visitChar( char c ) {
+        if( (m_mode != EscapedName) && (c == '\\') ) {
+            escape();
+            addCharToPattern(c);
+            return true;
+        }else if((m_mode != EscapedName) && (c == ',') )  {
+            return separate();
+        }
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return true;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            addCharToPattern(c);
+            return true;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return true;
+            break;
+        }
+
+        m_substring += c;
+        if( !isControlChar( c ) ) {
+            m_patternName += c;
+            m_realPatternPos++;
+        }
+        return true;
+    }
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
+        m_mode = mode;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addNamePattern();
+        case Tag:
+            return addTagPattern();
+        case EscapedName:
+            revertBackToLastMode();
+            return;
+        case None:
+        default:
+            return startNewMode( None );
+        }
+    }
+    void TestSpecParser::escape() {
+        saveLastMode();
+        m_mode = EscapedName;
+        m_escapeChars.push_back(m_realPatternPos);
+    }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
+
+    void TestSpecParser::addFilter() {
+        if( !m_currentFilter.m_patterns.empty() ) {
+            m_testSpec.m_filters.push_back( m_currentFilter );
+            m_currentFilter = TestSpec::Filter();
+        }
+    }
+
+    void TestSpecParser::saveLastMode() {
+      lastMode = m_mode;
+    }
+
+    void TestSpecParser::revertBackToLastMode() {
+      m_mode = lastMode;
+    }
+
+    bool TestSpecParser::separate() {
+      if( (m_mode==QuotedName) || (m_mode==Tag) ){
+         //invalid argument, signal failure to previous scope.
+         m_mode = None;
+         m_pos = m_arg.size();
+         m_substring.clear();
+         m_patternName.clear();
+         m_realPatternPos = 0;
+         return false;
+      }
+      endMode();
+      addFilter();
+      return true; //success
+    }
+
+    std::string TestSpecParser::preprocessPattern() {
+        std::string token = m_patternName;
+        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
+            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
+        m_escapeChars.clear();
+        if (startsWith(token, "exclude:")) {
+            m_exclusion = true;
+            token = token.substr(8);
+        }
+
+        m_patternName.clear();
+        m_realPatternPos = 0;
+
+        return token;
+    }
+
+    void TestSpecParser::addNamePattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
+            if (m_exclusion)
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    void TestSpecParser::addTagPattern() {
+        auto token = preprocessPattern();
+
+        if (!token.empty()) {
+            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
+            // we have to create a separate hide tag and shorten the real one
+            if (token.size() > 1 && token[0] == '.') {
+                token.erase(token.begin());
+                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
+                if (m_exclusion) {
+                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+                }
+                m_currentFilter.m_patterns.push_back(pattern);
+            }
+
+            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
+
+            if (m_exclusion) {
+                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
+            }
+            m_currentFilter.m_patterns.push_back(pattern);
+        }
+        m_substring.clear();
+        m_exclusion = false;
+        m_mode = None;
+    }
+
+    TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+// end catch_test_spec_parser.cpp
+// start catch_timer.cpp
+
+#include <chrono>
+
+static const uint64_t nanosecondsInSecond = 1000000000;
+
+namespace Catch {
+
+    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
+        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+    }
+
+    namespace {
+        auto estimateClockResolution() -> uint64_t {
+            uint64_t sum = 0;
+            static const uint64_t iterations = 1000000;
+
+            auto startTime = getCurrentNanosecondsSinceEpoch();
+
+            for( std::size_t i = 0; i < iterations; ++i ) {
+
+                uint64_t ticks;
+                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
+                do {
+                    ticks = getCurrentNanosecondsSinceEpoch();
+                } while( ticks == baseTicks );
+
+                auto delta = ticks - baseTicks;
+                sum += delta;
+
+                // If we have been calibrating for over 3 seconds -- the clock
+                // is terrible and we should move on.
+                // TBD: How to signal that the measured resolution is probably wrong?
+                if (ticks > startTime + 3 * nanosecondsInSecond) {
+                    return sum / ( i + 1u );
+                }
+            }
+
+            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
+            // - and potentially do more iterations if there's a high variance.
+            return sum/iterations;
+        }
+    }
+    auto getEstimatedClockResolution() -> uint64_t {
+        static auto s_resolution = estimateClockResolution();
+        return s_resolution;
+    }
+
+    void Timer::start() {
+       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
+    }
+    auto Timer::getElapsedNanoseconds() const -> uint64_t {
+        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
+    }
+    auto Timer::getElapsedMicroseconds() const -> uint64_t {
+        return getElapsedNanoseconds()/1000;
+    }
+    auto Timer::getElapsedMilliseconds() const -> unsigned int {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    auto Timer::getElapsedSeconds() const -> double {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+// end catch_timer.cpp
+// start catch_tostring.cpp
+
+#if defined(__clang__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wexit-time-destructors"
+#    pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+// Enable specific decls locally
+#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
+#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
+#endif
+
+#include <cmath>
+#include <iomanip>
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                int one = 1;
+                // If the lowest byte we read is non-zero, we can assume
+                // that little endian format is used.
+                auto value = *reinterpret_cast<char*>(&one);
+                return value ? Little : Big;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size ) {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        ReusableStringStream rss;
+        rss << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return rss.str();
+    }
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    if (Catch::isnan(value)) {
+        return "nan";
+    }
+
+    ReusableStringStream rss;
+    rss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = rss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+//// ======================================================= ////
+//
+//   Out-of-line defs for full specialization of StringMaker
+//
+//// ======================================================= ////
+
+std::string StringMaker<std::string>::convert(const std::string& str) {
+    if (!getCurrentContext().getConfig()->showInvisibles()) {
+        return '"' + str + '"';
+    }
+
+    std::string s("\"");
+    for (char c : str) {
+        switch (c) {
+        case '\n':
+            s.append("\\n");
+            break;
+        case '\t':
+            s.append("\\t");
+            break;
+        default:
+            s.push_back(c);
+            break;
+        }
+    }
+    s.append("\"");
+    return s;
+}
+
+#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::string_view>::convert(std::string_view str) {
+    return ::Catch::Detail::stringify(std::string{ str });
+}
+#endif
+
+std::string StringMaker<char const*>::convert(char const* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<char*>::convert(char* str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::string{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+
+#ifdef CATCH_CONFIG_WCHAR
+std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
+    std::string s;
+    s.reserve(wstr.size());
+    for (auto c : wstr) {
+        s += (c <= 0xff) ? static_cast<char>(c) : '?';
+    }
+    return ::Catch::Detail::stringify(s);
+}
+
+# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
+std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
+    return StringMaker<std::wstring>::convert(std::wstring(str));
+}
+# endif
+
+std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
+    if (str) {
+        return ::Catch::Detail::stringify(std::wstring{ str });
+    } else {
+        return{ "{null string}" };
+    }
+}
+#endif
+
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
+std::string StringMaker<int>::convert(int value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long>::convert(long value) {
+    return ::Catch::Detail::stringify(static_cast<long long>(value));
+}
+std::string StringMaker<long long>::convert(long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<unsigned int>::convert(unsigned int value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long>::convert(unsigned long value) {
+    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
+}
+std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
+    ReusableStringStream rss;
+    rss << value;
+    if (value > Detail::hexThreshold) {
+        rss << " (0x" << std::hex << value << ')';
+    }
+    return rss.str();
+}
+
+std::string StringMaker<bool>::convert(bool b) {
+    return b ? "true" : "false";
+}
+
+std::string StringMaker<signed char>::convert(signed char value) {
+    if (value == '\r') {
+        return "'\\r'";
+    } else if (value == '\f') {
+        return "'\\f'";
+    } else if (value == '\n') {
+        return "'\\n'";
+    } else if (value == '\t') {
+        return "'\\t'";
+    } else if ('\0' <= value && value < ' ') {
+        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
+    } else {
+        char chstr[] = "' '";
+        chstr[1] = value;
+        return chstr;
+    }
+}
+std::string StringMaker<char>::convert(char c) {
+    return ::Catch::Detail::stringify(static_cast<signed char>(c));
+}
+std::string StringMaker<unsigned char>::convert(unsigned char c) {
+    return ::Catch::Detail::stringify(static_cast<char>(c));
+}
+
+std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
+    return "nullptr";
+}
+
+int StringMaker<float>::precision = 5;
+
+std::string StringMaker<float>::convert(float value) {
+    return fpToString(value, precision) + 'f';
+}
+
+int StringMaker<double>::precision = 10;
+
+std::string StringMaker<double>::convert(double value) {
+    return fpToString(value, precision);
+}
+
+std::string ratio_string<std::atto>::symbol() { return "a"; }
+std::string ratio_string<std::femto>::symbol() { return "f"; }
+std::string ratio_string<std::pico>::symbol() { return "p"; }
+std::string ratio_string<std::nano>::symbol() { return "n"; }
+std::string ratio_string<std::micro>::symbol() { return "u"; }
+std::string ratio_string<std::milli>::symbol() { return "m"; }
+
+} // end namespace Catch
+
+#if defined(__clang__)
+#    pragma clang diagnostic pop
+#endif
+
+// end catch_tostring.cpp
+// start catch_totals.cpp
+
+namespace Catch {
+
+    Counts Counts::operator - ( Counts const& other ) const {
+        Counts diff;
+        diff.passed = passed - other.passed;
+        diff.failed = failed - other.failed;
+        diff.failedButOk = failedButOk - other.failedButOk;
+        return diff;
+    }
+
+    Counts& Counts::operator += ( Counts const& other ) {
+        passed += other.passed;
+        failed += other.failed;
+        failedButOk += other.failedButOk;
+        return *this;
+    }
+
+    std::size_t Counts::total() const {
+        return passed + failed + failedButOk;
+    }
+    bool Counts::allPassed() const {
+        return failed == 0 && failedButOk == 0;
+    }
+    bool Counts::allOk() const {
+        return failed == 0;
+    }
+
+    Totals Totals::operator - ( Totals const& other ) const {
+        Totals diff;
+        diff.assertions = assertions - other.assertions;
+        diff.testCases = testCases - other.testCases;
+        return diff;
+    }
+
+    Totals& Totals::operator += ( Totals const& other ) {
+        assertions += other.assertions;
+        testCases += other.testCases;
+        return *this;
+    }
+
+    Totals Totals::delta( Totals const& prevTotals ) const {
+        Totals diff = *this - prevTotals;
+        if( diff.assertions.failed > 0 )
+            ++diff.testCases.failed;
+        else if( diff.assertions.failedButOk > 0 )
+            ++diff.testCases.failedButOk;
+        else
+            ++diff.testCases.passed;
+        return diff;
+    }
+
+}
+// end catch_totals.cpp
+// start catch_uncaught_exceptions.cpp
+
+#include <exception>
+
+namespace Catch {
+    bool uncaught_exceptions() {
+#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
+        return false;
+#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+  }
+} // end namespace Catch
+// end catch_uncaught_exceptions.cpp
+// start catch_version.cpp
+
+#include <ostream>
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    Version const& libraryVersion() {
+        static Version version( 2, 12, 4, "", 0 );
+        return version;
+    }
+
+}
+// end catch_version.cpp
+// start catch_wildcard_pattern.cpp
+
+namespace Catch {
+
+    WildcardPattern::WildcardPattern( std::string const& pattern,
+                                      CaseSensitive::Choice caseSensitivity )
+    :   m_caseSensitivity( caseSensitivity ),
+        m_pattern( normaliseString( pattern ) )
+    {
+        if( startsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 1 );
+            m_wildcard = WildcardAtStart;
+        }
+        if( endsWith( m_pattern, '*' ) ) {
+            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+        }
+    }
+
+    bool WildcardPattern::matches( std::string const& str ) const {
+        switch( m_wildcard ) {
+            case NoWildcard:
+                return m_pattern == normaliseString( str );
+            case WildcardAtStart:
+                return endsWith( normaliseString( str ), m_pattern );
+            case WildcardAtEnd:
+                return startsWith( normaliseString( str ), m_pattern );
+            case WildcardAtBothEnds:
+                return contains( normaliseString( str ), m_pattern );
+            default:
+                CATCH_INTERNAL_ERROR( "Unknown enum" );
+        }
+    }
+
+    std::string WildcardPattern::normaliseString( std::string const& str ) const {
+        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
+    }
+}
+// end catch_wildcard_pattern.cpp
+// start catch_xmlwriter.cpp
+
+#include <iomanip>
+#include <type_traits>
+
+namespace Catch {
+
+namespace {
+
+    size_t trailingBytes(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return 2;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return 3;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return 4;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    uint32_t headerValue(unsigned char c) {
+        if ((c & 0xE0) == 0xC0) {
+            return c & 0x1F;
+        }
+        if ((c & 0xF0) == 0xE0) {
+            return c & 0x0F;
+        }
+        if ((c & 0xF8) == 0xF0) {
+            return c & 0x07;
+        }
+        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
+    }
+
+    void hexEscapeChar(std::ostream& os, unsigned char c) {
+        std::ios_base::fmtflags f(os.flags());
+        os << "\\x"
+            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+            << static_cast<int>(c);
+        os.flags(f);
+    }
+
+    bool shouldNewline(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
+    }
+
+    bool shouldIndent(XmlFormatting fmt) {
+        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
+    }
+
+} // anonymous namespace
+
+    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
+        return static_cast<XmlFormatting>(
+            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
+            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
+        );
+    }
+
+    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
+    :   m_str( str ),
+        m_forWhat( forWhat )
+    {}
+
+    void XmlEncode::encodeTo( std::ostream& os ) const {
+        // Apostrophe escaping not necessary if we always use " to write attributes
+        // (see: http://www.w3.org/TR/xml/#syntax)
+
+        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
+            unsigned char c = m_str[idx];
+            switch (c) {
+            case '<':   os << "&lt;"; break;
+            case '&':   os << "&amp;"; break;
+
+            case '>':
+                // See: http://www.w3.org/TR/xml/#syntax
+                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
+                    os << "&gt;";
+                else
+                    os << c;
+                break;
+
+            case '\"':
+                if (m_forWhat == ForAttributes)
+                    os << "&quot;";
+                else
+                    os << c;
+                break;
+
+            default:
+                // Check for control characters and invalid utf-8
+
+                // Escape control characters in standard ascii
+                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // Plain ASCII: Write it to stream
+                if (c < 0x7F) {
+                    os << c;
+                    break;
+                }
+
+                // UTF-8 territory
+                // Check if the encoding is valid and if it is not, hex escape bytes.
+                // Important: We do not check the exact decoded values for validity, only the encoding format
+                // First check that this bytes is a valid lead byte:
+                // This means that it is not encoded as 1111 1XXX
+                // Or as 10XX XXXX
+                if (c <  0xC0 ||
+                    c >= 0xF8) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                auto encBytes = trailingBytes(c);
+                // Are there enough bytes left to avoid accessing out-of-bounds memory?
+                if (idx + encBytes - 1 >= m_str.size()) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+                // The header is valid, check data
+                // The next encBytes bytes must together be a valid utf-8
+                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
+                bool valid = true;
+                uint32_t value = headerValue(c);
+                for (std::size_t n = 1; n < encBytes; ++n) {
+                    unsigned char nc = m_str[idx + n];
+                    valid &= ((nc & 0xC0) == 0x80);
+                    value = (value << 6) | (nc & 0x3F);
+                }
+
+                if (
+                    // Wrong bit pattern of following bytes
+                    (!valid) ||
+                    // Overlong encodings
+                    (value < 0x80) ||
+                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
+                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
+                    // Encoded value out of range
+                    (value >= 0x110000)
+                    ) {
+                    hexEscapeChar(os, c);
+                    break;
+                }
+
+                // If we got here, this is in fact a valid(ish) utf-8 sequence
+                for (std::size_t n = 0; n < encBytes; ++n) {
+                    os << m_str[idx + n];
+                }
+                idx += encBytes - 1;
+                break;
+            }
+        }
+    }
+
+    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+        xmlEncode.encodeTo( os );
+        return os;
+    }
+
+    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
+    :   m_writer( writer ),
+        m_fmt(fmt)
+    {}
+
+    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
+    :   m_writer( other.m_writer ),
+        m_fmt(other.m_fmt)
+    {
+        other.m_writer = nullptr;
+        other.m_fmt = XmlFormatting::None;
+    }
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
+        if ( m_writer ) {
+            m_writer->endElement();
+        }
+        m_writer = other.m_writer;
+        other.m_writer = nullptr;
+        m_fmt = other.m_fmt;
+        other.m_fmt = XmlFormatting::None;
+        return *this;
+    }
+
+    XmlWriter::ScopedElement::~ScopedElement() {
+        if (m_writer) {
+            m_writer->endElement(m_fmt);
+        }
+    }
+
+    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
+        m_writer->writeText( text, fmt );
+        return *this;
+    }
+
+    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
+    {
+        writeDeclaration();
+    }
+
+    XmlWriter::~XmlWriter() {
+        while (!m_tags.empty()) {
+            endElement();
+        }
+        newlineIfNecessary();
+    }
+
+    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
+        ensureTagClosed();
+        newlineIfNecessary();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+            m_indent += "  ";
+        }
+        m_os << '<' << name;
+        m_tags.push_back( name );
+        m_tagIsOpen = true;
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
+        ScopedElement scoped( this, fmt );
+        startElement( name, fmt );
+        return scoped;
+    }
+
+    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
+        m_indent = m_indent.substr(0, m_indent.size() - 2);
+
+        if( m_tagIsOpen ) {
+            m_os << "/>";
+            m_tagIsOpen = false;
+        } else {
+            newlineIfNecessary();
+            if (shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << "</" << m_tags.back() << ">";
+        }
+        m_os << std::flush;
+        applyFormatting(fmt);
+        m_tags.pop_back();
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
+        if( !name.empty() && !attribute.empty() )
+            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
+        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
+        if( !text.empty() ){
+            bool tagWasOpen = m_tagIsOpen;
+            ensureTagClosed();
+            if (tagWasOpen && shouldIndent(fmt)) {
+                m_os << m_indent;
+            }
+            m_os << XmlEncode( text );
+            applyFormatting(fmt);
+        }
+        return *this;
+    }
+
+    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
+        ensureTagClosed();
+        if (shouldIndent(fmt)) {
+            m_os << m_indent;
+        }
+        m_os << "<!--" << text << "-->";
+        applyFormatting(fmt);
+        return *this;
+    }
+
+    void XmlWriter::writeStylesheetRef( std::string const& url ) {
+        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+    }
+
+    XmlWriter& XmlWriter::writeBlankLine() {
+        ensureTagClosed();
+        m_os << '\n';
+        return *this;
+    }
+
+    void XmlWriter::ensureTagClosed() {
+        if( m_tagIsOpen ) {
+            m_os << '>' << std::flush;
+            newlineIfNecessary();
+            m_tagIsOpen = false;
+        }
+    }
+
+    void XmlWriter::applyFormatting(XmlFormatting fmt) {
+        m_needsNewline = shouldNewline(fmt);
+    }
+
+    void XmlWriter::writeDeclaration() {
+        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    }
+
+    void XmlWriter::newlineIfNecessary() {
+        if( m_needsNewline ) {
+            m_os << std::endl;
+            m_needsNewline = false;
+        }
+    }
+}
+// end catch_xmlwriter.cpp
+// start catch_reporter_bases.cpp
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <cassert>
+#include <memory>
+
+namespace Catch {
+    void prepareExpandedExpression(AssertionResult& result) {
+        result.getExpandedExpression();
+    }
+
+    // Because formatting using c++ streams is stateful, drop down to C is required
+    // Alternatively we could use stringstream, but its performance is... not good.
+    std::string getFormattedDuration( double duration ) {
+        // Max exponent + 1 is required to represent the whole part
+        // + 1 for decimal point
+        // + 3 for the 3 decimal places
+        // + 1 for null terminator
+        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+        char buffer[maxDoubleSize];
+
+        // Save previous errno, to prevent sprintf from overwriting it
+        ErrnoGuard guard;
+#ifdef _MSC_VER
+        sprintf_s(buffer, "%.3f", duration);
+#else
+        std::sprintf(buffer, "%.3f", duration);
+#endif
+        return std::string(buffer);
+    }
+
+    std::string serializeFilters( std::vector<std::string> const& container ) {
+        ReusableStringStream oss;
+        bool first = true;
+        for (auto&& filter : container)
+        {
+            if (!first)
+                oss << ' ';
+            else
+                first = false;
+
+            oss << filter;
+        }
+        return oss.str();
+    }
+
+    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
+        :StreamingReporterBase(_config) {}
+
+    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
+        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
+    }
+
+    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
+
+    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
+        return false;
+    }
+
+} // end namespace Catch
+// end catch_reporter_bases.cpp
+// start catch_reporter_compact.cpp
+
+namespace {
+
+#ifdef CATCH_PLATFORM_MAC
+    const char* failedString() { return "FAILED"; }
+    const char* passedString() { return "PASSED"; }
+#else
+    const char* failedString() { return "failed"; }
+    const char* passedString() { return "passed"; }
+#endif
+
+    // Colour::LightGrey
+    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
+
+    std::string bothOrAll( std::size_t count ) {
+        return count == 1 ? std::string() :
+               count == 2 ? "both " : "all " ;
+    }
+
+} // anon namespace
+
+namespace Catch {
+namespace {
+// Colour, message variants:
+// - white: No tests ran.
+// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+// - white: Passed [both/all] N test cases (no assertions).
+// -   red: Failed N tests cases, failed M assertions.
+// - green: Passed [both/all] N tests cases with M assertions.
+void printTotals(std::ostream& out, const Totals& totals) {
+    if (totals.testCases.total() == 0) {
+        out << "No tests ran.";
+    } else if (totals.testCases.failed == totals.testCases.total()) {
+        Colour colour(Colour::ResultError);
+        const std::string qualify_assertions_failed =
+            totals.assertions.failed == totals.assertions.total() ?
+            bothOrAll(totals.assertions.failed) : std::string();
+        out <<
+            "Failed " << bothOrAll(totals.testCases.failed)
+            << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << qualify_assertions_failed <<
+            pluralise(totals.assertions.failed, "assertion") << '.';
+    } else if (totals.assertions.total() == 0) {
+        out <<
+            "Passed " << bothOrAll(totals.testCases.total())
+            << pluralise(totals.testCases.total(), "test case")
+            << " (no assertions).";
+    } else if (totals.assertions.failed) {
+        Colour colour(Colour::ResultError);
+        out <<
+            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
+            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
+    } else {
+        Colour colour(Colour::ResultSuccess);
+        out <<
+            "Passed " << bothOrAll(totals.testCases.passed)
+            << pluralise(totals.testCases.passed, "test case") <<
+            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
+    }
+}
+
+// Implementation of CompactReporter formatting
+class AssertionPrinter {
+public:
+    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
+    AssertionPrinter(AssertionPrinter const&) = delete;
+    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream)
+        , result(_stats.assertionResult)
+        , messages(_stats.infoMessages)
+        , itMessage(_stats.infoMessages.begin())
+        , printInfoMessages(_printInfoMessages) {}
+
+    void print() {
+        printSourceInfo();
+
+        itMessage = messages.begin();
+
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            printResultType(Colour::ResultSuccess, passedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            if (!result.hasExpression())
+                printRemainingMessages(Colour::None);
+            else
+                printRemainingMessages();
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk())
+                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
+            else
+                printResultType(Colour::Error, failedString());
+            printOriginalExpression();
+            printReconstructedExpression();
+            printRemainingMessages();
+            break;
+        case ResultWas::ThrewException:
+            printResultType(Colour::Error, failedString());
+            printIssue("unexpected exception with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::FatalErrorCondition:
+            printResultType(Colour::Error, failedString());
+            printIssue("fatal error condition with message:");
+            printMessage();
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::DidntThrowException:
+            printResultType(Colour::Error, failedString());
+            printIssue("expected exception, got none");
+            printExpressionWas();
+            printRemainingMessages();
+            break;
+        case ResultWas::Info:
+            printResultType(Colour::None, "info");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::Warning:
+            printResultType(Colour::None, "warning");
+            printMessage();
+            printRemainingMessages();
+            break;
+        case ResultWas::ExplicitFailure:
+            printResultType(Colour::Error, failedString());
+            printIssue("explicitly");
+            printRemainingMessages(Colour::None);
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            printResultType(Colour::Error, "** internal error **");
+            break;
+        }
+    }
+
+private:
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ':';
+    }
+
+    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
+        if (!passOrFail.empty()) {
+            {
+                Colour colourGuard(colour);
+                stream << ' ' << passOrFail;
+            }
+            stream << ':';
+        }
+    }
+
+    void printIssue(std::string const& issue) const {
+        stream << ' ' << issue;
+    }
+
+    void printExpressionWas() {
+        if (result.hasExpression()) {
+            stream << ';';
+            {
+                Colour colour(dimColour());
+                stream << " expression was:";
+            }
+            printOriginalExpression();
+        }
+    }
+
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            stream << ' ' << result.getExpression();
+        }
+    }
+
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            {
+                Colour colour(dimColour());
+                stream << " for: ";
+            }
+            stream << result.getExpandedExpression();
+        }
+    }
+
+    void printMessage() {
+        if (itMessage != messages.end()) {
+            stream << " '" << itMessage->message << '\'';
+            ++itMessage;
+        }
+    }
+
+    void printRemainingMessages(Colour::Code colour = dimColour()) {
+        if (itMessage == messages.end())
+            return;
+
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+
+        {
+            Colour colourGuard(colour);
+            stream << " with " << pluralise(N, "message") << ':';
+        }
+
+        while (itMessage != itEnd) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || itMessage->type != ResultWas::Info) {
+                printMessage();
+                if (itMessage != itEnd) {
+                    Colour colourGuard(dimColour());
+                    stream << " and";
+                }
+                continue;
+            }
+            ++itMessage;
+        }
+    }
+
+private:
+    std::ostream& stream;
+    AssertionResult const& result;
+    std::vector<MessageInfo> messages;
+    std::vector<MessageInfo>::const_iterator itMessage;
+    bool printInfoMessages;
+};
+
+} // anon namespace
+
+        std::string CompactReporter::getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        ReporterPreferences CompactReporter::getPreferences() const {
+            return m_reporterPrefs;
+        }
+
+        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
+
+        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
+            if (m_config->showDurations() == ShowDurations::Always) {
+                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( stream, _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+        CompactReporter::~CompactReporter() {}
+
+    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+// end catch_reporter_compact.cpp
+// start catch_reporter_console.cpp
+
+#include <cfloat>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+ // Note that 4062 (not all labels are handled and default is missing) is enabled
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+// For simplicity, benchmarking-only helpers are always enabled
+#  pragma clang diagnostic ignored "-Wunused-function"
+#endif
+
+namespace Catch {
+
+namespace {
+
+// Formatter impl for ConsoleReporter
+class ConsoleAssertionPrinter {
+public:
+    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
+    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
+        : stream(_stream),
+        stats(_stats),
+        result(_stats.assertionResult),
+        colour(Colour::None),
+        message(result.getMessage()),
+        messages(_stats.infoMessages),
+        printInfoMessages(_printInfoMessages) {
+        switch (result.getResultType()) {
+        case ResultWas::Ok:
+            colour = Colour::Success;
+            passOrFail = "PASSED";
+            //if( result.hasMessage() )
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ExpressionFailed:
+            if (result.isOk()) {
+                colour = Colour::Success;
+                passOrFail = "FAILED - but was ok";
+            } else {
+                colour = Colour::Error;
+                passOrFail = "FAILED";
+            }
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "with messages";
+            break;
+        case ResultWas::ThrewException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to unexpected exception with ";
+            if (_stats.infoMessages.size() == 1)
+                messageLabel += "message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel += "messages";
+            break;
+        case ResultWas::FatalErrorCondition:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "due to a fatal error condition";
+            break;
+        case ResultWas::DidntThrowException:
+            colour = Colour::Error;
+            passOrFail = "FAILED";
+            messageLabel = "because no exception was thrown where one was expected";
+            break;
+        case ResultWas::Info:
+            messageLabel = "info";
+            break;
+        case ResultWas::Warning:
+            messageLabel = "warning";
+            break;
+        case ResultWas::ExplicitFailure:
+            passOrFail = "FAILED";
+            colour = Colour::Error;
+            if (_stats.infoMessages.size() == 1)
+                messageLabel = "explicitly with message";
+            if (_stats.infoMessages.size() > 1)
+                messageLabel = "explicitly with messages";
+            break;
+            // These cases are here to prevent compiler warnings
+        case ResultWas::Unknown:
+        case ResultWas::FailureBit:
+        case ResultWas::Exception:
+            passOrFail = "** internal error **";
+            colour = Colour::Error;
+            break;
+        }
+    }
+
+    void print() const {
+        printSourceInfo();
+        if (stats.totals.assertions.total() > 0) {
+            printResultType();
+            printOriginalExpression();
+            printReconstructedExpression();
+        } else {
+            stream << '\n';
+        }
+        printMessage();
+    }
+
+private:
+    void printResultType() const {
+        if (!passOrFail.empty()) {
+            Colour colourGuard(colour);
+            stream << passOrFail << ":\n";
+        }
+    }
+    void printOriginalExpression() const {
+        if (result.hasExpression()) {
+            Colour colourGuard(Colour::OriginalExpression);
+            stream << "  ";
+            stream << result.getExpressionInMacro();
+            stream << '\n';
+        }
+    }
+    void printReconstructedExpression() const {
+        if (result.hasExpandedExpression()) {
+            stream << "with expansion:\n";
+            Colour colourGuard(Colour::ReconstructedExpression);
+            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
+        }
+    }
+    void printMessage() const {
+        if (!messageLabel.empty())
+            stream << messageLabel << ':' << '\n';
+        for (auto const& msg : messages) {
+            // If this assertion is a warning ignore any INFO messages
+            if (printInfoMessages || msg.type != ResultWas::Info)
+                stream << Column(msg.message).indent(2) << '\n';
+        }
+    }
+    void printSourceInfo() const {
+        Colour colourGuard(Colour::FileName);
+        stream << result.getSourceInfo() << ": ";
+    }
+
+    std::ostream& stream;
+    AssertionStats const& stats;
+    AssertionResult const& result;
+    Colour::Code colour;
+    std::string passOrFail;
+    std::string messageLabel;
+    std::string message;
+    std::vector<MessageInfo> messages;
+    bool printInfoMessages;
+};
+
+std::size_t makeRatio(std::size_t number, std::size_t total) {
+    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
+    return (ratio == 0 && number > 0) ? 1 : ratio;
+}
+
+std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
+    if (i > j && i > k)
+        return i;
+    else if (j > k)
+        return j;
+    else
+        return k;
+}
+
+struct ColumnInfo {
+    enum Justification { Left, Right };
+    std::string name;
+    int width;
+    Justification justification;
+};
+struct ColumnBreak {};
+struct RowBreak {};
+
+class Duration {
+    enum class Unit {
+        Auto,
+        Nanoseconds,
+        Microseconds,
+        Milliseconds,
+        Seconds,
+        Minutes
+    };
+    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
+    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
+    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
+    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
+
+    double m_inNanoseconds;
+    Unit m_units;
+
+public:
+    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
+        : m_inNanoseconds(inNanoseconds),
+        m_units(units) {
+        if (m_units == Unit::Auto) {
+            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
+                m_units = Unit::Nanoseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
+                m_units = Unit::Microseconds;
+            else if (m_inNanoseconds < s_nanosecondsInASecond)
+                m_units = Unit::Milliseconds;
+            else if (m_inNanoseconds < s_nanosecondsInAMinute)
+                m_units = Unit::Seconds;
+            else
+                m_units = Unit::Minutes;
+        }
+
+    }
+
+    auto value() const -> double {
+        switch (m_units) {
+        case Unit::Microseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
+        case Unit::Milliseconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
+        case Unit::Seconds:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
+        case Unit::Minutes:
+            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
+        default:
+            return m_inNanoseconds;
+        }
+    }
+    auto unitsAsString() const -> std::string {
+        switch (m_units) {
+        case Unit::Nanoseconds:
+            return "ns";
+        case Unit::Microseconds:
+            return "us";
+        case Unit::Milliseconds:
+            return "ms";
+        case Unit::Seconds:
+            return "s";
+        case Unit::Minutes:
+            return "m";
+        default:
+            return "** internal error **";
+        }
+
+    }
+    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
+        return os << duration.value() << ' ' << duration.unitsAsString();
+    }
+};
+} // end anon namespace
+
+class TablePrinter {
+    std::ostream& m_os;
+    std::vector<ColumnInfo> m_columnInfos;
+    std::ostringstream m_oss;
+    int m_currentColumn = -1;
+    bool m_isOpen = false;
+
+public:
+    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
+    :   m_os( os ),
+        m_columnInfos( std::move( columnInfos ) ) {}
+
+    auto columnInfos() const -> std::vector<ColumnInfo> const& {
+        return m_columnInfos;
+    }
+
+    void open() {
+        if (!m_isOpen) {
+            m_isOpen = true;
+            *this << RowBreak();
+
+			Columns headerCols;
+			Spacer spacer(2);
+			for (auto const& info : m_columnInfos) {
+				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
+				headerCols += spacer;
+			}
+			m_os << headerCols << '\n';
+
+            m_os << Catch::getLineOfChars<'-'>() << '\n';
+        }
+    }
+    void close() {
+        if (m_isOpen) {
+            *this << RowBreak();
+            m_os << std::endl;
+            m_isOpen = false;
+        }
+    }
+
+    template<typename T>
+    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
+        tp.m_oss << value;
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
+        auto colStr = tp.m_oss.str();
+        const auto strSize = colStr.size();
+        tp.m_oss.str("");
+        tp.open();
+        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
+            tp.m_currentColumn = -1;
+            tp.m_os << '\n';
+        }
+        tp.m_currentColumn++;
+
+        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
+        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
+            ? std::string(colInfo.width - (strSize + 1), ' ')
+            : std::string();
+        if (colInfo.justification == ColumnInfo::Left)
+            tp.m_os << colStr << padding << ' ';
+        else
+            tp.m_os << padding << colStr << ' ';
+        return tp;
+    }
+
+    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
+        if (tp.m_currentColumn > 0) {
+            tp.m_os << '\n';
+            tp.m_currentColumn = -1;
+        }
+        return tp;
+    }
+};
+
+ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
+    : StreamingReporterBase(config),
+    m_tablePrinter(new TablePrinter(config.stream(),
+        [&config]() -> std::vector<ColumnInfo> {
+        if (config.fullConfig()->benchmarkNoAnalysis())
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "     samples", 14, ColumnInfo::Right },
+                { "  iterations", 14, ColumnInfo::Right },
+                { "        mean", 14, ColumnInfo::Right }
+            };
+        }
+        else
+        {
+            return{
+                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
+                { "samples      mean       std dev", 14, ColumnInfo::Right },
+                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
+                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
+            };
+        }
+    }())) {}
+ConsoleReporter::~ConsoleReporter() = default;
+
+std::string ConsoleReporter::getDescription() {
+    return "Reports test results as plain lines of text";
+}
+
+void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
+    stream << "No test cases matched '" << spec << '\'' << std::endl;
+}
+
+void ConsoleReporter::reportInvalidArguments(std::string const&arg){
+    stream << "Invalid Filter: " << arg << std::endl;
+}
+
+void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
+
+bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
+    AssertionResult const& result = _assertionStats.assertionResult;
+
+    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+    // Drop out if result was successful but we're not printing them.
+    if (!includeResults && result.getResultType() != ResultWas::Warning)
+        return false;
+
+    lazyPrint();
+
+    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
+    printer.print();
+    stream << std::endl;
+    return true;
+}
+
+void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
+    m_tablePrinter->close();
+    m_headerPrinted = false;
+    StreamingReporterBase::sectionStarting(_sectionInfo);
+}
+void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
+    m_tablePrinter->close();
+    if (_sectionStats.missingAssertions) {
+        lazyPrint();
+        Colour colour(Colour::ResultError);
+        if (m_sectionStack.size() > 1)
+            stream << "\nNo assertions in section";
+        else
+            stream << "\nNo assertions in test case";
+        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+    }
+    if (m_config->showDurations() == ShowDurations::Always) {
+        stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+    }
+    if (m_headerPrinted) {
+        m_headerPrinted = false;
+    }
+    StreamingReporterBase::sectionEnded(_sectionStats);
+}
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+void ConsoleReporter::benchmarkPreparing(std::string const& name) {
+	lazyPrintWithoutClosingBenchmarkTable();
+
+	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
+
+	bool firstLine = true;
+	for (auto line : nameCol) {
+		if (!firstLine)
+			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
+		else
+			firstLine = false;
+
+		(*m_tablePrinter) << line << ColumnBreak();
+	}
+}
+
+void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
+    (*m_tablePrinter) << info.samples << ColumnBreak()
+        << info.iterations << ColumnBreak();
+    if (!m_config->benchmarkNoAnalysis())
+        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
+}
+void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
+    if (m_config->benchmarkNoAnalysis())
+    {
+        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
+    }
+    else
+    {
+        (*m_tablePrinter) << ColumnBreak()
+            << Duration(stats.mean.point.count()) << ColumnBreak()
+            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
+            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
+            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
+    }
+}
+
+void ConsoleReporter::benchmarkFailed(std::string const& error) {
+	Colour colour(Colour::Red);
+    (*m_tablePrinter)
+        << "Benchmark failed (" << error << ')'
+        << ColumnBreak() << RowBreak();
+}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
+    m_tablePrinter->close();
+    StreamingReporterBase::testCaseEnded(_testCaseStats);
+    m_headerPrinted = false;
+}
+void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
+    if (currentGroupInfo.used) {
+        printSummaryDivider();
+        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+        printTotals(_testGroupStats.totals);
+        stream << '\n' << std::endl;
+    }
+    StreamingReporterBase::testGroupEnded(_testGroupStats);
+}
+void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
+    printTotalsDivider(_testRunStats.totals);
+    printTotals(_testRunStats.totals);
+    stream << std::endl;
+    StreamingReporterBase::testRunEnded(_testRunStats);
+}
+void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
+    StreamingReporterBase::testRunStarting(_testInfo);
+    printTestFilters();
+}
+
+void ConsoleReporter::lazyPrint() {
+
+    m_tablePrinter->close();
+    lazyPrintWithoutClosingBenchmarkTable();
+}
+
+void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
+
+    if (!currentTestRunInfo.used)
+        lazyPrintRunInfo();
+    if (!currentGroupInfo.used)
+        lazyPrintGroupInfo();
+
+    if (!m_headerPrinted) {
+        printTestCaseAndSectionHeader();
+        m_headerPrinted = true;
+    }
+}
+void ConsoleReporter::lazyPrintRunInfo() {
+    stream << '\n' << getLineOfChars<'~'>() << '\n';
+    Colour colour(Colour::SecondaryText);
+    stream << currentTestRunInfo->name
+        << " is a Catch v" << libraryVersion() << " host application.\n"
+        << "Run with -? for options\n\n";
+
+    if (m_config->rngSeed() != 0)
+        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+    currentTestRunInfo.used = true;
+}
+void ConsoleReporter::lazyPrintGroupInfo() {
+    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
+        printClosedHeader("Group: " + currentGroupInfo->name);
+        currentGroupInfo.used = true;
+    }
+}
+void ConsoleReporter::printTestCaseAndSectionHeader() {
+    assert(!m_sectionStack.empty());
+    printOpenHeader(currentTestCaseInfo->name);
+
+    if (m_sectionStack.size() > 1) {
+        Colour colourGuard(Colour::Headers);
+
+        auto
+            it = m_sectionStack.begin() + 1, // Skip first section (test case)
+            itEnd = m_sectionStack.end();
+        for (; it != itEnd; ++it)
+            printHeaderString(it->name, 2);
+    }
+
+    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+    stream << getLineOfChars<'-'>() << '\n';
+    Colour colourGuard(Colour::FileName);
+    stream << lineInfo << '\n';
+    stream << getLineOfChars<'.'>() << '\n' << std::endl;
+}
+
+void ConsoleReporter::printClosedHeader(std::string const& _name) {
+    printOpenHeader(_name);
+    stream << getLineOfChars<'.'>() << '\n';
+}
+void ConsoleReporter::printOpenHeader(std::string const& _name) {
+    stream << getLineOfChars<'-'>() << '\n';
+    {
+        Colour colourGuard(Colour::Headers);
+        printHeaderString(_name);
+    }
+}
+
+// if string has a : in first line will set indent to follow it on
+// subsequent lines
+void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
+    std::size_t i = _string.find(": ");
+    if (i != std::string::npos)
+        i += 2;
+    else
+        i = 0;
+    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
+}
+
+struct SummaryColumn {
+
+    SummaryColumn( std::string _label, Colour::Code _colour )
+    :   label( std::move( _label ) ),
+        colour( _colour ) {}
+    SummaryColumn addRow( std::size_t count ) {
+        ReusableStringStream rss;
+        rss << count;
+        std::string row = rss.str();
+        for (auto& oldRow : rows) {
+            while (oldRow.size() < row.size())
+                oldRow = ' ' + oldRow;
+            while (oldRow.size() > row.size())
+                row = ' ' + row;
+        }
+        rows.push_back(row);
+        return *this;
+    }
+
+    std::string label;
+    Colour::Code colour;
+    std::vector<std::string> rows;
+
+};
+
+void ConsoleReporter::printTotals( Totals const& totals ) {
+    if (totals.testCases.total() == 0) {
+        stream << Colour(Colour::Warning) << "No tests ran\n";
+    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
+        stream << Colour(Colour::ResultSuccess) << "All tests passed";
+        stream << " ("
+            << pluralise(totals.assertions.passed, "assertion") << " in "
+            << pluralise(totals.testCases.passed, "test case") << ')'
+            << '\n';
+    } else {
+
+        std::vector<SummaryColumn> columns;
+        columns.push_back(SummaryColumn("", Colour::None)
+                          .addRow(totals.testCases.total())
+                          .addRow(totals.assertions.total()));
+        columns.push_back(SummaryColumn("passed", Colour::Success)
+                          .addRow(totals.testCases.passed)
+                          .addRow(totals.assertions.passed));
+        columns.push_back(SummaryColumn("failed", Colour::ResultError)
+                          .addRow(totals.testCases.failed)
+                          .addRow(totals.assertions.failed));
+        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
+                          .addRow(totals.testCases.failedButOk)
+                          .addRow(totals.assertions.failedButOk));
+
+        printSummaryRow("test cases", columns, 0);
+        printSummaryRow("assertions", columns, 1);
+    }
+}
+void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
+    for (auto col : cols) {
+        std::string value = col.rows[row];
+        if (col.label.empty()) {
+            stream << label << ": ";
+            if (value != "0")
+                stream << value;
+            else
+                stream << Colour(Colour::Warning) << "- none -";
+        } else if (value != "0") {
+            stream << Colour(Colour::LightGrey) << " | ";
+            stream << Colour(col.colour)
+                << value << ' ' << col.label;
+        }
+    }
+    stream << '\n';
+}
+
+void ConsoleReporter::printTotalsDivider(Totals const& totals) {
+    if (totals.testCases.total() > 0) {
+        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
+        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
+        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
+        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)++;
+        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
+            findMax(failedRatio, failedButOkRatio, passedRatio)--;
+
+        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
+        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
+        if (totals.testCases.allPassed())
+            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
+        else
+            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
+    } else {
+        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
+    }
+    stream << '\n';
+}
+void ConsoleReporter::printSummaryDivider() {
+    stream << getLineOfChars<'-'>() << '\n';
+}
+
+void ConsoleReporter::printTestFilters() {
+    if (m_config->testSpec().hasFilters()) {
+        Colour guard(Colour::BrightYellow);
+        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
+    }
+}
+
+CATCH_REGISTER_REPORTER("console", ConsoleReporter)
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#endif
+// end catch_reporter_console.cpp
+// start catch_reporter_junit.cpp
+
+#include <cassert>
+#include <sstream>
+#include <ctime>
+#include <algorithm>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+
+        std::string fileNameTag(const std::vector<std::string> &tags) {
+            auto it = std::find_if(begin(tags),
+                                   end(tags),
+                                   [] (std::string const& tag) {return tag.front() == '#'; });
+            if (it != tags.end())
+                return it->substr(1);
+            return std::string();
+        }
+    } // anonymous namespace
+
+    JunitReporter::JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+            m_reporterPrefs.shouldReportAllAssertions = true;
+        }
+
+    JunitReporter::~JunitReporter() {}
+
+    std::string JunitReporter::getDescription() {
+        return "Reports test results in an XML format that looks like Ant's junitreport target";
+    }
+
+    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
+
+    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
+        CumulativeReporterBase::testRunStarting( runInfo );
+        xml.startElement( "testsuites" );
+    }
+
+    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        suiteTimer.start();
+        stdOutForSuite.clear();
+        stdErrForSuite.clear();
+        unexpectedExceptions = 0;
+        CumulativeReporterBase::testGroupStarting( groupInfo );
+    }
+
+    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
+        m_okToFail = testCaseInfo.okToFail();
+    }
+
+    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+            unexpectedExceptions++;
+        return CumulativeReporterBase::assertionEnded( assertionStats );
+    }
+
+    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        stdOutForSuite += testCaseStats.stdOut;
+        stdErrForSuite += testCaseStats.stdErr;
+        CumulativeReporterBase::testCaseEnded( testCaseStats );
+    }
+
+    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        double suiteTime = suiteTimer.getElapsedSeconds();
+        CumulativeReporterBase::testGroupEnded( testGroupStats );
+        writeGroup( *m_testGroups.back(), suiteTime );
+    }
+
+    void JunitReporter::testRunEndedCumulative() {
+        xml.endElement();
+    }
+
+    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+
+        TestGroupStats const& stats = groupNode.value;
+        xml.writeAttribute( "name", stats.groupInfo.name );
+        xml.writeAttribute( "errors", unexpectedExceptions );
+        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+        xml.writeAttribute( "tests", stats.totals.assertions.total() );
+        xml.writeAttribute( "hostname", "tbd" ); // !TBD
+        if( m_config->showDurations() == ShowDurations::Never )
+            xml.writeAttribute( "time", "" );
+        else
+            xml.writeAttribute( "time", suiteTime );
+        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+        // Write properties if there are any
+        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
+            auto properties = xml.scopedElement("properties");
+            if (m_config->hasTestFilters()) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "filters")
+                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
+            }
+            if (m_config->rngSeed() != 0) {
+                xml.scopedElement("property")
+                    .writeAttribute("name", "random-seed")
+                    .writeAttribute("value", m_config->rngSeed());
+            }
+        }
+
+        // Write test cases
+        for( auto const& child : groupNode.children )
+            writeTestCase( *child );
+
+        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
+        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
+    }
+
+    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
+        TestCaseStats const& stats = testCaseNode.value;
+
+        // All test cases have exactly one section - which represents the
+        // test case itself. That section may have 0-n nested sections
+        assert( testCaseNode.children.size() == 1 );
+        SectionNode const& rootSection = *testCaseNode.children.front();
+
+        std::string className = stats.testInfo.className;
+
+        if( className.empty() ) {
+            className = fileNameTag(stats.testInfo.tags);
+            if ( className.empty() )
+                className = "global";
+        }
+
+        if ( !m_config->name().empty() )
+            className = m_config->name() + "." + className;
+
+        writeSection( className, "", rootSection );
+    }
+
+    void JunitReporter::writeSection(  std::string const& className,
+                        std::string const& rootName,
+                        SectionNode const& sectionNode ) {
+        std::string name = trim( sectionNode.stats.sectionInfo.name );
+        if( !rootName.empty() )
+            name = rootName + '/' + name;
+
+        if( !sectionNode.assertions.empty() ||
+            !sectionNode.stdOut.empty() ||
+            !sectionNode.stdErr.empty() ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+            if( className.empty() ) {
+                xml.writeAttribute( "classname", name );
+                xml.writeAttribute( "name", "root" );
+            }
+            else {
+                xml.writeAttribute( "classname", className );
+                xml.writeAttribute( "name", name );
+            }
+            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
+            // This is not ideal, but it should be enough to mimic gtest's
+            // junit output.
+            // Ideally the JUnit reporter would also handle `skipTest`
+            // events and write those out appropriately.
+            xml.writeAttribute( "status", "run" );
+
+            writeAssertions( sectionNode );
+
+            if( !sectionNode.stdOut.empty() )
+                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
+            if( !sectionNode.stdErr.empty() )
+                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
+        }
+        for( auto const& childNode : sectionNode.childSections )
+            if( className.empty() )
+                writeSection( name, "", *childNode );
+            else
+                writeSection( className, name, *childNode );
+    }
+
+    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
+        for( auto const& assertion : sectionNode.assertions )
+            writeAssertion( assertion );
+    }
+
+    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
+        AssertionResult const& result = stats.assertionResult;
+        if( !result.isOk() ) {
+            std::string elementName;
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                case ResultWas::FatalErrorCondition:
+                    elementName = "error";
+                    break;
+                case ResultWas::ExplicitFailure:
+                case ResultWas::ExpressionFailed:
+                case ResultWas::DidntThrowException:
+                    elementName = "failure";
+                    break;
+
+                // We should never see these here:
+                case ResultWas::Info:
+                case ResultWas::Warning:
+                case ResultWas::Ok:
+                case ResultWas::Unknown:
+                case ResultWas::FailureBit:
+                case ResultWas::Exception:
+                    elementName = "internalError";
+                    break;
+            }
+
+            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+            xml.writeAttribute( "message", result.getExpression() );
+            xml.writeAttribute( "type", result.getTestMacroName() );
+
+            ReusableStringStream rss;
+            if (stats.totals.assertions.total() > 0) {
+                rss << "FAILED" << ":\n";
+                if (result.hasExpression()) {
+                    rss << "  ";
+                    rss << result.getExpressionInMacro();
+                    rss << '\n';
+                }
+                if (result.hasExpandedExpression()) {
+                    rss << "with expansion:\n";
+                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
+                }
+            } else {
+                rss << '\n';
+            }
+
+            if( !result.getMessage().empty() )
+                rss << result.getMessage() << '\n';
+            for( auto const& msg : stats.infoMessages )
+                if( msg.type == ResultWas::Info )
+                    rss << msg.message << '\n';
+
+            rss << "at " << result.getSourceInfo();
+            xml.writeText( rss.str(), XmlFormatting::Newline );
+        }
+    }
+
+    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+// end catch_reporter_junit.cpp
+// start catch_reporter_listening.cpp
+
+#include <cassert>
+
+namespace Catch {
+
+    ListeningReporter::ListeningReporter() {
+        // We will assume that listeners will always want all assertions
+        m_preferences.shouldReportAllAssertions = true;
+    }
+
+    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
+        m_listeners.push_back( std::move( listener ) );
+    }
+
+    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
+        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
+        m_reporter = std::move( reporter );
+        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
+    }
+
+    ReporterPreferences ListeningReporter::getPreferences() const {
+        return m_preferences;
+    }
+
+    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
+        return std::set<Verbosity>{ };
+    }
+
+    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->noMatchingTestCases( spec );
+        }
+        m_reporter->noMatchingTestCases( spec );
+    }
+
+    void ListeningReporter::reportInvalidArguments(std::string const&arg){
+        for ( auto const& listener : m_listeners ) {
+            listener->reportInvalidArguments( arg );
+        }
+        m_reporter->reportInvalidArguments( arg );
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkPreparing(name);
+		}
+		m_reporter->benchmarkPreparing(name);
+	}
+    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkStarting( benchmarkInfo );
+        }
+        m_reporter->benchmarkStarting( benchmarkInfo );
+    }
+    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->benchmarkEnded( benchmarkStats );
+        }
+        m_reporter->benchmarkEnded( benchmarkStats );
+    }
+
+	void ListeningReporter::benchmarkFailed( std::string const& error ) {
+		for (auto const& listener : m_listeners) {
+			listener->benchmarkFailed(error);
+		}
+		m_reporter->benchmarkFailed(error);
+	}
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunStarting( testRunInfo );
+        }
+        m_reporter->testRunStarting( testRunInfo );
+    }
+
+    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupStarting( groupInfo );
+        }
+        m_reporter->testGroupStarting( groupInfo );
+    }
+
+    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseStarting( testInfo );
+        }
+        m_reporter->testCaseStarting( testInfo );
+    }
+
+    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionStarting( sectionInfo );
+        }
+        m_reporter->sectionStarting( sectionInfo );
+    }
+
+    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->assertionStarting( assertionInfo );
+        }
+        m_reporter->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
+        for( auto const& listener : m_listeners ) {
+            static_cast<void>( listener->assertionEnded( assertionStats ) );
+        }
+        return m_reporter->assertionEnded( assertionStats );
+    }
+
+    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->sectionEnded( sectionStats );
+        }
+        m_reporter->sectionEnded( sectionStats );
+    }
+
+    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testCaseEnded( testCaseStats );
+        }
+        m_reporter->testCaseEnded( testCaseStats );
+    }
+
+    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testGroupEnded( testGroupStats );
+        }
+        m_reporter->testGroupEnded( testGroupStats );
+    }
+
+    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->testRunEnded( testRunStats );
+        }
+        m_reporter->testRunEnded( testRunStats );
+    }
+
+    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
+        for ( auto const& listener : m_listeners ) {
+            listener->skipTest( testInfo );
+        }
+        m_reporter->skipTest( testInfo );
+    }
+
+    bool ListeningReporter::isMulti() const {
+        return true;
+    }
+
+} // end namespace Catch
+// end catch_reporter_listening.cpp
+// start catch_reporter_xml.cpp
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
+                              // Note that 4062 (not all labels are handled
+                              // and default is missing) is enabled
+#endif
+
+namespace Catch {
+    XmlReporter::XmlReporter( ReporterConfig const& _config )
+    :   StreamingReporterBase( _config ),
+        m_xml(_config.stream())
+    {
+        m_reporterPrefs.shouldRedirectStdOut = true;
+        m_reporterPrefs.shouldReportAllAssertions = true;
+    }
+
+    XmlReporter::~XmlReporter() = default;
+
+    std::string XmlReporter::getDescription() {
+        return "Reports test results as an XML document";
+    }
+
+    std::string XmlReporter::getStylesheetRef() const {
+        return std::string();
+    }
+
+    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+        m_xml
+            .writeAttribute( "filename", sourceInfo.file )
+            .writeAttribute( "line", sourceInfo.line );
+    }
+
+    void XmlReporter::noMatchingTestCases( std::string const& s ) {
+        StreamingReporterBase::noMatchingTestCases( s );
+    }
+
+    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
+        StreamingReporterBase::testRunStarting( testInfo );
+        std::string stylesheetRef = getStylesheetRef();
+        if( !stylesheetRef.empty() )
+            m_xml.writeStylesheetRef( stylesheetRef );
+        m_xml.startElement( "Catch" );
+        if( !m_config->name().empty() )
+            m_xml.writeAttribute( "name", m_config->name() );
+        if (m_config->testSpec().hasFilters())
+            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
+        if( m_config->rngSeed() != 0 )
+            m_xml.scopedElement( "Randomness" )
+                .writeAttribute( "seed", m_config->rngSeed() );
+    }
+
+    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
+        StreamingReporterBase::testGroupStarting( groupInfo );
+        m_xml.startElement( "Group" )
+            .writeAttribute( "name", groupInfo.name );
+    }
+
+    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        StreamingReporterBase::testCaseStarting(testInfo);
+        m_xml.startElement( "TestCase" )
+            .writeAttribute( "name", trim( testInfo.name ) )
+            .writeAttribute( "description", testInfo.description )
+            .writeAttribute( "tags", testInfo.tagsAsString() );
+
+        writeSourceInfo( testInfo.lineInfo );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            m_testCaseTimer.start();
+        m_xml.ensureTagClosed();
+    }
+
+    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
+        StreamingReporterBase::sectionStarting( sectionInfo );
+        if( m_sectionDepth++ > 0 ) {
+            m_xml.startElement( "Section" )
+                .writeAttribute( "name", trim( sectionInfo.name ) );
+            writeSourceInfo( sectionInfo.lineInfo );
+            m_xml.ensureTagClosed();
+        }
+    }
+
+    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
+
+    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
+
+        AssertionResult const& result = assertionStats.assertionResult;
+
+        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+        if( includeResults || result.getResultType() == ResultWas::Warning ) {
+            // Print any info messages in <Info> tags.
+            for( auto const& msg : assertionStats.infoMessages ) {
+                if( msg.type == ResultWas::Info && includeResults ) {
+                    m_xml.scopedElement( "Info" )
+                            .writeText( msg.message );
+                } else if ( msg.type == ResultWas::Warning ) {
+                    m_xml.scopedElement( "Warning" )
+                            .writeText( msg.message );
+                }
+            }
+        }
+
+        // Drop out if result was successful but we're not printing them.
+        if( !includeResults && result.getResultType() != ResultWas::Warning )
+            return true;
+
+        // Print the expression if there is one.
+        if( result.hasExpression() ) {
+            m_xml.startElement( "Expression" )
+                .writeAttribute( "success", result.succeeded() )
+                .writeAttribute( "type", result.getTestMacroName() );
+
+            writeSourceInfo( result.getSourceInfo() );
+
+            m_xml.scopedElement( "Original" )
+                .writeText( result.getExpression() );
+            m_xml.scopedElement( "Expanded" )
+                .writeText( result.getExpandedExpression() );
+        }
+
+        // And... Print a result applicable to each result type.
+        switch( result.getResultType() ) {
+            case ResultWas::ThrewException:
+                m_xml.startElement( "Exception" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::FatalErrorCondition:
+                m_xml.startElement( "FatalErrorCondition" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            case ResultWas::Info:
+                m_xml.scopedElement( "Info" )
+                    .writeText( result.getMessage() );
+                break;
+            case ResultWas::Warning:
+                // Warning will already have been written
+                break;
+            case ResultWas::ExplicitFailure:
+                m_xml.startElement( "Failure" );
+                writeSourceInfo( result.getSourceInfo() );
+                m_xml.writeText( result.getMessage() );
+                m_xml.endElement();
+                break;
+            default:
+                break;
+        }
+
+        if( result.hasExpression() )
+            m_xml.endElement();
+
+        return true;
+    }
+
+    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
+        StreamingReporterBase::sectionEnded( sectionStats );
+        if( --m_sectionDepth > 0 ) {
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+            e.writeAttribute( "successes", sectionStats.assertions.passed );
+            e.writeAttribute( "failures", sectionStats.assertions.failed );
+            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+            m_xml.endElement();
+        }
+    }
+
+    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        StreamingReporterBase::testCaseEnded( testCaseStats );
+        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+        if ( m_config->showDurations() == ShowDurations::Always )
+            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+        if( !testCaseStats.stdOut.empty() )
+            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
+        if( !testCaseStats.stdErr.empty() )
+            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
+
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        StreamingReporterBase::testGroupEnded( testGroupStats );
+        // TODO: Check testGroupStats.aborting and act accordingly.
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
+            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
+        StreamingReporterBase::testRunEnded( testRunStats );
+        m_xml.scopedElement( "OverallResults" )
+            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+        m_xml.scopedElement( "OverallResultsCases")
+            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
+            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
+            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
+        m_xml.endElement();
+    }
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
+        m_xml.startElement("BenchmarkResults")
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
+            .writeAttribute("resamples", info.resamples)
+            .writeAttribute("iterations", info.iterations)
+            .writeAttribute("clockResolution", info.clockResolution)
+            .writeAttribute("estimatedDuration", info.estimatedDuration)
+            .writeComment("All values in nano seconds");
+    }
+
+    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
+        m_xml.startElement("mean")
+            .writeAttribute("value", benchmarkStats.mean.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("standardDeviation")
+            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
+            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
+            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
+            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
+        m_xml.endElement();
+        m_xml.startElement("outliers")
+            .writeAttribute("variance", benchmarkStats.outlierVariance)
+            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
+            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
+            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
+            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
+        m_xml.endElement();
+        m_xml.endElement();
+    }
+
+    void XmlReporter::benchmarkFailed(std::string const &error) {
+        m_xml.scopedElement("failed").
+            writeAttribute("message", error);
+        m_xml.endElement();
+    }
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+// end catch_reporter_xml.cpp
+
+namespace Catch {
+    LeakDetector leakDetector;
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// end catch_impl.hpp
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// start catch_default_main.hpp
+
+#ifndef __OBJC__
+
+#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    return Catch::Session().run( argc, argv );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char**)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return result;
+}
+
+#endif // __OBJC__
+
+// end catch_default_main.hpp
+#endif
+
+#if !defined(CATCH_CONFIG_IMPL_ONLY)
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+#if !defined(CATCH_CONFIG_DISABLE)
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
+#else
+#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define CATCH_BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define CATCH_BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
+#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+
+#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
+
+#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
+#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
+
+#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
+
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
+#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
+#endif
+
+#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
+#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
+#else
+#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
+#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
+#endif
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+
+#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
+#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
+#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
+#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
+#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
+#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
+
+#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+#define BENCHMARK(...) \
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+#define BENCHMARK_ADVANCED(name) \
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
+
+using Catch::Detail::Approx;
+
+#else // CATCH_CONFIG_DISABLE
+
+//////
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#define CATCH_REQUIRE( ... )        (void)(0)
+#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
+
+#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif// CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CATCH_CHECK( ... )         (void)(0)
+#define CATCH_CHECK_FALSE( ... )   (void)(0)
+#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
+#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
+#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
+
+#define CATCH_CHECK_THROWS( ... )  (void)(0)
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
+
+#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define CATCH_INFO( msg )          (void)(0)
+#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
+#define CATCH_WARN( msg )          (void)(0)
+#define CATCH_CAPTURE( msg )       (void)(0)
+
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_METHOD_AS_TEST_CASE( method, ... )
+#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define CATCH_SECTION( ... )
+#define CATCH_DYNAMIC_SECTION( ... )
+#define CATCH_FAIL( ... ) (void)(0)
+#define CATCH_FAIL_CHECK( ... ) (void)(0)
+#define CATCH_SUCCEED( ... ) (void)(0)
+
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+// "BDD-style" convenience wrappers
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_GIVEN( desc )
+#define CATCH_AND_GIVEN( desc )
+#define CATCH_WHEN( desc )
+#define CATCH_AND_WHEN( desc )
+#define CATCH_THEN( desc )
+#define CATCH_AND_THEN( desc )
+
+#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
+#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#define REQUIRE( ... )       (void)(0)
+#define REQUIRE_FALSE( ... ) (void)(0)
+
+#define REQUIRE_THROWS( ... ) (void)(0)
+#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
+#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define REQUIRE_NOTHROW( ... ) (void)(0)
+
+#define CHECK( ... ) (void)(0)
+#define CHECK_FALSE( ... ) (void)(0)
+#define CHECKED_IF( ... ) if (__VA_ARGS__)
+#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
+#define CHECK_NOFAIL( ... ) (void)(0)
+
+#define CHECK_THROWS( ... )  (void)(0)
+#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
+#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+#define CHECK_NOTHROW( ... ) (void)(0)
+
+#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
+#define CHECK_THAT( arg, matcher ) (void)(0)
+
+#define REQUIRE_THAT( arg, matcher ) (void)(0)
+#endif // CATCH_CONFIG_DISABLE_MATCHERS
+
+#define INFO( msg ) (void)(0)
+#define UNSCOPED_INFO( msg ) (void)(0)
+#define WARN( msg ) (void)(0)
+#define CAPTURE( msg ) (void)(0)
+
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define METHOD_AS_TEST_CASE( method, ... )
+#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
+#define SECTION( ... )
+#define DYNAMIC_SECTION( ... )
+#define FAIL( ... ) (void)(0)
+#define FAIL_CHECK( ... ) (void)(0)
+#define SUCCEED( ... ) (void)(0)
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+
+#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#else
+#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
+#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
+#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#endif
+
+#define STATIC_REQUIRE( ... )       (void)(0)
+#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// "BDD-style" convenience wrappers
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+
+#define GIVEN( desc )
+#define AND_GIVEN( desc )
+#define WHEN( desc )
+#define AND_WHEN( desc )
+#define THEN( desc )
+#define AND_THEN( desc )
+
+using Catch::Detail::Approx;
+
+#endif
+
+#endif // ! CATCH_CONFIG_IMPL_ONLY
+
+// start catch_reenable_warnings.h
+
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+// end catch_reenable_warnings.h
+// end catch.hpp
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/Src/Scarab/testing/glob_path/README.md b/Src/Scarab/testing/glob_path/README.md
new file mode 100644
index 0000000..ce6f045
--- /dev/null
+++ b/Src/Scarab/testing/glob_path/README.md
@@ -0,0 +1 @@
+This directory is just for testing if glob feature in path utility works properly. Please don't add any sub directories/files other than the ones that already exists. 
diff --git a/Src/Scarab/testing/glob_path/sub1/sub1sub1/glob_sub1sub1.txt b/Src/Scarab/testing/glob_path/sub1/sub1sub1/glob_sub1sub1.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub1/sub1sub2/glob_sub1sub2.txt b/Src/Scarab/testing/glob_path/sub1/sub1sub2/glob_sub1sub2.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub1/sub1sub3/glob_sub1sub3.txt b/Src/Scarab/testing/glob_path/sub1/sub1sub3/glob_sub1sub3.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_3.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_3.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub3/glob_sub2sub1sub3.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub3/glob_sub2sub1sub3.txt
new file mode 100644
index 0000000..e69de29
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt b/Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt
new file mode 100644
index 0000000..5d0b8fd
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt
@@ -0,0 +1,112 @@
+cmake_minimum_required (VERSION 3.1)
+
+cmake_policy( SET CMP0048 NEW ) # version in project()
+project( NestedPBTest VERSION 1.0.0 )
+
+### 
+if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
+    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/create_nesting.sh.in ${CMAKE_CURRENT_BINARY_DIR}/create_nesting.sh @ONLY )
+    execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/create_nesting.sh
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+    if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
+        message( STATUS "Created submodule `scarab`" )
+    else()
+        message( FATAL "Did not create submodule" )
+    endif()
+endif()
+###
+
+list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scarab/cmake )
+
+include( PackageBuilder )
+
+
+#########
+# Options
+#########
+
+##############
+# Dependencies
+##############
+
+
+# before adding submodules and building the project
+pbuilder_prepare_project()
+
+########
+# Scarab
+########
+
+pbuilder_add_submodule( Scarab scarab ) # first use of Scarab is the direct submodule, so the scarab submodule of PBTest should be skipped
+pbuilder_add_submodule( PBTest PBTest )
+
+
+#########
+# Library
+#########
+
+include_directories( BEFORE library )
+
+pbuilder_use_sm_library( Scarab Scarab )
+pbuilder_use_sm_library( PBTest PBTest )
+
+set( NestedPBTest_HEADERS
+    library/nested_print.hh
+)
+
+set( NestedPBTest_SOURCES 
+    library/nested_print.cc
+)
+
+pbuilder_library( 
+    TARGET NestedPBTest 
+    SOURCES ${NestedPBTest_SOURCES}
+#    PROJECT_LIBRARIES ${PACKAGE_LIBS} 
+#    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+#    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS NestedPBTest
+)
+
+pbuilder_install_headers( ${NestedPBTest_HEADERS} )
+
+############
+# Executable
+############
+
+if( NestedPBTest_ENABLE_EXECUTABLES )
+    set( PACKAGE_LIBS
+        NestedPBTest
+    )
+
+    set( NestedPBTest_sources
+        executable/nested_do_print.cc
+    )
+
+    pbuilder_executables( NestedPBTest_sources PACKAGE_LIBS PUBLIC_EXT_LIBS PRIVATE_EXT_LIBS )
+    set( programs )
+    pbuilder_executables( 
+        SOURCES ${NestedPBTest_sources}
+        TARGETS_VAR programs
+        PROJECT_LIBRARIES ${PACKAGE_LIBS}
+#        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+    )
+
+    pbuilder_component_install_and_export( 
+        COMPONENT Executables
+        EXETARGETS ${programs}
+    )
+endif()
+
+########
+# Config
+########
+
+configure_file( ${PROJECT_SOURCE_DIR}/NestedPBTestConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/NestedPBTestConfig.cmake @ONLY )
+
+pbuilder_do_package_config()
+
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in b/Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in
new file mode 100644
index 0000000..e2422ed
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in
@@ -0,0 +1,17 @@
+# NestedPBTestConfig.cmake
+
+get_filename_component( NestedPBTest_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
+
+# Find the dependencies
+include( CMakeFindDependencyMacro )
+find_dependency( PBTest REQUIRED PATHS ${NestedPBTest_CMAKE_DIR}/PBTest @PBTest_BINARY_LOCATION@ )
+find_dependency( Scarab REQUIRED PATHS ${NestedPBTest_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
+
+# Import targets if they're not already present
+if( NOT TARGET NestedPBTest::@NestedPBTest_FULL_PROJECT_NAME@ )
+    if( TARGET @NestedPBTest_FULL_PROJECT_NAME@ )
+        add_library( NestedPBTest::@NestedPBTest_FULL_PROJECT_NAME@ ALIAS @NestedPBTest_FULL_PROJECT_NAME@ )
+    else()
+        include("${NestedPBTest_CMAKE_DIR}/NestedPBTest_Libary_Targets.cmake")
+    endif()
+endif()
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/README.md b/Src/Scarab/testing/package_builder/NestedPBTest/README.md
new file mode 100644
index 0000000..2e9b98f
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/README.md
@@ -0,0 +1,29 @@
+# PackageBuilder Test
+
+This directory contains the infrastructure to test the nested-submodules aspects of the PackageBuilder framework.
+
+Scarab's PackageBuilder provides the framework for using multiply-nested submodules.  To test these features, we need to be able to make Scarab a submodule of the test project.  Therefore we've included the script `create_nesting.sh`, which is used by CMake to copy all of the contents of the scarab directory to a subdirectory called `scarab` (excluding anything listed in the `.gitignore` file), and the `testing/PBTest` directory to a subdirectory called `PBTest`.  `PBTest` also includes its own copy of `scarab`.  Then you can use the `CMakeLists.txt` file in this directory to test the submodule framework in PackageBuilder.
+
+## Usage
+
+```
+> cd /top/level/of/Scarab/testing/package_builder/NestedPBTest
+> mkdir build
+> cd build
+> cmake ..
+> make install
+```
+
+For development, if working on Scarab and building in a subdirectory of `testing/package_builder/NestedPBTest`, be sure to clean scarab and PBTEst before re-testing the CMake process:
+
+```
+rm -rf ../scarab ../PBTest
+cmake ..
+```
+
+## Cleanup
+
+```
+> cd /top/level/of/Scarab/testing/package_builder/NestedPBTest
+> rm -rf scarab PBTest
+```
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in b/Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in
new file mode 100755
index 0000000..0f8bb51
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+echo "Copying scarab"
+rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/../../.. @CMAKE_CURRENT_SOURCE_DIR@/scarab
+
+echo "Copying PBTest"
+rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/../PBTest @CMAKE_CURRENT_SOURCE_DIR@
+
+echo "Copying PBTest/scarab"
+rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/scarab @CMAKE_CURRENT_SOURCE_DIR@/PBTest
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc b/Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc
new file mode 100644
index 0000000..0311031
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc
@@ -0,0 +1,14 @@
+// nested_do_print.cc
+// Author: N.S. Oblath
+// Date: Jun 1, 2020
+
+#include "nested_print.hh"
+#include "print.hh"
+
+int main()
+{
+    nested_pbtest::print( scarab::param_value("Hello, Nested World") );
+    pbtest::print( scarab::param_value("Hello, World") );
+
+    return 0;
+}
\ No newline at end of file
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc b/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc
new file mode 100644
index 0000000..68320f4
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc
@@ -0,0 +1,18 @@
+// nested_print.cc
+// Author: N.S. Oblath
+// Date: Jun 4, 2020
+
+#include "nested_print.hh"
+
+#include "logger.hh"
+
+LOGGER( plog, "nested_print" );
+
+namespace nested_pbtest
+{
+    void print( const scarab::param& a_param )
+    {
+        LINFO( plog, "NESTED:\n" << a_param );
+        return;
+    }
+}
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh b/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh
new file mode 100644
index 0000000..5424894
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh
@@ -0,0 +1,17 @@
+// print.hh
+// Author: N.S. Oblath
+// Date: Jun 1, 2020
+
+#ifndef NESTEDPBTEST_PRINT_HH_
+#define NESTEDPBTEST_PRINT_HH_
+
+#include "param.hh"
+
+namespace nested_pbtest
+{
+
+    void print( const scarab::param& a_param );
+
+} /* end namespace nested_pbtest */
+
+#endif /* NESTEDPBTEST_PRINT_HH_ */
diff --git a/Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt b/Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt
new file mode 100644
index 0000000..355dc7a
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt
@@ -0,0 +1,111 @@
+cmake_minimum_required (VERSION 3.1)
+
+cmake_policy( SET CMP0048 NEW ) # version in project()
+project( PBTest VERSION 1.0.0 )
+
+### 
+if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
+    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/copy_scarab.sh.in ${CMAKE_CURRENT_BINARY_DIR}/copy_scarab.sh @ONLY )
+    execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/copy_scarab.sh
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+    if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
+        message( STATUS "Created submodule `scarab`" )
+    else()
+        message( FATAL "Did not create submodule" )
+    endif()
+endif()
+###
+
+list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scarab/cmake )
+
+include( PackageBuilder )
+
+message( STATUS "Full project name for <${PROJECT_NAME}: ${${PROJECT_NAME}_FULL_PROJECT_NAME}" )
+
+
+#########
+# Options
+#########
+
+##############
+# Dependencies
+##############
+
+
+
+# before adding submodules and building the project
+pbuilder_prepare_project()
+
+########
+# Scarab
+########
+
+pbuilder_add_submodule( Scarab scarab )
+
+
+#########
+# Library
+#########
+
+include_directories( BEFORE library )
+
+pbuilder_use_sm_library( Scarab Scarab )
+
+set( PBTest_HEADERS
+    library/print.hh
+)
+
+set( PBTest_SOURCES 
+    library/print.cc
+)
+
+pbuilder_library( 
+    TARGET PBTest 
+    SOURCES ${PBTest_SOURCES}
+#    PROJECT_LIBRARIES ${PACKAGE_LIBS} 
+#    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+#    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS PBTest
+)
+
+pbuilder_install_headers( ${PBTest_HEADERS} )
+
+############
+# Executable
+############
+
+if( PBTest_ENABLE_EXECUTABLES )
+    set( PACKAGE_LIBS
+        PBTest
+    )
+
+    set( PBTest_sources
+        executable/do_print.cc
+    )
+
+    set( programs )
+    pbuilder_executables( 
+        SOURCES ${PBTest_sources}
+        TARGETS_VAR programs
+        PROJECT_LIBRARIES ${PACKAGE_LIBS}
+#        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+    )
+
+    pbuilder_component_install_and_export( 
+        COMPONENT Executables
+        EXETARGETS ${programs}
+    )
+endif()
+
+########
+# Config
+########
+
+configure_file( ${PROJECT_SOURCE_DIR}/PBTestConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PBTestConfig.cmake @ONLY )
+
+pbuilder_do_package_config()
diff --git a/Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in b/Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in
new file mode 100644
index 0000000..498fdd5
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in
@@ -0,0 +1,16 @@
+# PBTestConfig.cmake
+
+get_filename_component( PBTest_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
+
+# Find the dependencies
+include( CMakeFindDependencyMacro )
+find_dependency( Scarab REQUIRED PATHS ${PBTest_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
+
+# Import library targets if they're not already present
+if( NOT TARGET PBTest::@PBTest_FULL_PROJECT_NAME@ )
+    if( TARGET @PBTest_FULL_PROJECT_NAME@ )
+        add_library( PBTest::@PBTest_FULL_PROJECT_NAME@ ALIAS @PBTest_FULL_PROJECT_NAME@ )
+    else()
+        include("${PBTest_CMAKE_DIR}/PBTest_Library_Targets.cmake")
+    endif()
+endif()
diff --git a/Src/Scarab/testing/package_builder/PBTest/README.md b/Src/Scarab/testing/package_builder/PBTest/README.md
new file mode 100644
index 0000000..95a9043
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/README.md
@@ -0,0 +1,29 @@
+# PackageBuilder Test
+
+This directory contains the infrastructure to test the PackageBuilder framework, including the use of submodules.
+
+Scarab's PackageBuilder provides the framework for using multiply-nested submodules.  To test these features, we need to be able to make Scarab a submodule of the test project.  Therefore we've included the script `copy_scarab.sh`, which is called by CMake to copy all of the contents of the scarab directory to a subdirectory called `scarab` (excluding anything listed in the `.gitignore` file).  Then you can use the `CMakeLists.txt` file in this directory to test the submodule framework in PackageBuilder.
+
+## Usage
+
+```
+> cd /top/level/of/Scarab/testing/package_builder/PBTest
+> mkdir build
+> cd build
+> cmake ..
+> make install
+```
+
+For development, if working on Scarab and building in a subdirectory of `testing/package_builder/PBTest`, be sure to clean scarab before re-testing the CMake process:
+
+```
+rm -rf ../scarab
+cmake ..
+```
+
+## Cleanup
+
+```
+> cd /top/level/of/Scarab/testing/package_builder/PBTest
+> rm -rf scarab
+```
diff --git a/Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in b/Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in
new file mode 100755
index 0000000..fc7e131
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in
@@ -0,0 +1,4 @@
+#! /bin/bash
+
+echo "Copying Scarab"
+rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/../../.. @CMAKE_CURRENT_SOURCE_DIR@/scarab
diff --git a/Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc b/Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc
new file mode 100644
index 0000000..a56a5b8
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc
@@ -0,0 +1,12 @@
+// print.cc
+// Author: N.S. Oblath
+// Date: May 4, 2020
+
+#include "print.hh"
+
+int main()
+{
+    pbtest::print( scarab::param_value("Hello, World") );
+
+    return 0;
+}
\ No newline at end of file
diff --git a/Src/Scarab/testing/package_builder/PBTest/library/print.cc b/Src/Scarab/testing/package_builder/PBTest/library/print.cc
new file mode 100644
index 0000000..8785550
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/library/print.cc
@@ -0,0 +1,18 @@
+// print.cc
+// Author: N.S. Oblath
+// Date: May 4, 2020
+
+#include "print.hh"
+
+#include "logger.hh"
+
+LOGGER( plog, "print" );
+
+namespace pbtest
+{
+    void print( const scarab::param& a_param )
+    {
+        LINFO( plog, a_param );
+        return;
+    }
+}
diff --git a/Src/Scarab/testing/package_builder/PBTest/library/print.hh b/Src/Scarab/testing/package_builder/PBTest/library/print.hh
new file mode 100644
index 0000000..ac4e3b3
--- /dev/null
+++ b/Src/Scarab/testing/package_builder/PBTest/library/print.hh
@@ -0,0 +1,17 @@
+// print.hh
+// Author: N.S. Oblath
+// Date: May 4, 2020
+
+#ifndef PBTEST_PRINT_HH_
+#define PBTEST_PRINT_HH_
+
+#include "param.hh"
+
+namespace pbtest
+{
+
+    void print( const scarab::param& a_param );
+
+} /* end namespace pbtest */
+
+#endif /* PBTEST_PRINT_HH_ */
diff --git a/Src/Scarab/testing/stream_check.cc b/Src/Scarab/testing/stream_check.cc
new file mode 100644
index 0000000..bb36267
--- /dev/null
+++ b/Src/Scarab/testing/stream_check.cc
@@ -0,0 +1,26 @@
+/*
+ * stream_check.cc
+ *
+ *  Created on: Jul 17, 2020
+ *      Author: N.S. Oblath
+ */
+
+#include "stream_check.hh"
+
+
+namespace scarab
+{
+    namespace testing
+    {
+
+        bool compare_and_clear( std::stringstream* a_stream, const std::string& a_test )
+        {
+            std::string t_log( a_stream->str() );
+            if( t_log.empty() && a_test.empty() ) return true;
+            bool t_result = t_log.compare( t_log.size() - a_test.size(), a_test.size(), a_test );
+            a_stream->str("");
+            return t_result;
+        }
+
+    } /* namespace testing */
+} /* namespace scarab */
diff --git a/Src/Scarab/testing/stream_check.hh b/Src/Scarab/testing/stream_check.hh
new file mode 100644
index 0000000..e91f0aa
--- /dev/null
+++ b/Src/Scarab/testing/stream_check.hh
@@ -0,0 +1,24 @@
+/*
+ * stream_check.hh
+ *
+ *  Created on: Jul 17, 2020
+ *      Author: N.S. Oblath
+ */
+
+#ifndef SCARAB_TESTING_STREAM_CHECK_HH_
+#define SCARAB_TESTING_STREAM_CHECK_HH_
+
+#include <sstream>
+
+
+namespace scarab
+{
+    namespace testing
+    {
+
+        bool compare_and_clear( std::stringstream* a_stream, const std::string& a_test );
+
+    } /* namespace testing */
+} /* namespace scarab */
+
+#endif /* SCARAB_TESTING_STREAM_CHECK_HH_ */
\ No newline at end of file
diff --git a/Src/Scarab/testing/test_digital.cc b/Src/Scarab/testing/test_digital.cc
new file mode 100644
index 0000000..b8af3a5
--- /dev/null
+++ b/Src/Scarab/testing/test_digital.cc
@@ -0,0 +1,123 @@
+/*
+ * test_digital.cc
+ *
+ *  Created on: Feb 15, 2019
+ *      Author: N.S. Oblath
+ *
+ *  Expected output (approximately for the floating-point side of the DAC tests)
+ *
+
+ *
+ *      DAC Unsigned Test
+ *      0 --> 0
+ *      0 --> 0
+ *      26 --> 0.101562
+ *      128 --> 0.5
+ *      230 --> 0.898438
+ *      255 --> 0.996094
+ *      255 --> 0.996094
+ *
+ *      DAC Signed Test
+ *      -128 --> -0.5
+ *      -128 --> -0.5
+ *      -102 --> -0.398438
+ *      0 --> 0
+ *      102 --> 0.398438
+ *      127 --> 0.496094
+ *      127 --> 0.496094
+ *
+ */
+
+#include "digital.hh"
+
+#include "catch.hpp"
+
+#include <iostream>
+
+
+TEST_CASE( "digital", "[utility]" )
+{
+    SECTION( "adc_unsigned" )
+    {
+        std::cout << "ADC Unsigned Test" << std::endl;
+        // 8 bit digitized data
+        // V offset = 0 V
+        // V range = 1 V
+        // Expected analog data: varying between 0 V and 1 V
+
+        scarab::dig_calib_params t_params;
+        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
+
+        std::vector< double > t_analog{ -0.1, 0., 0.1, 0.5, 0.9, 1.0, 1.1 };
+        std::vector< unsigned > t_digital{ 0, 0, 26, 128, 230, 255, 255 };
+
+        for( unsigned i = 0; i < t_analog.size(); ++i )
+        {
+            REQUIRE( scarab::a2d< double, unsigned >( t_analog[i], &t_params ) == t_digital[i] );
+        }
+    }
+
+    SECTION( "adc_signed" )
+    {
+        std::cout << "ADC Signed Test" << std::endl;
+        // 8 bit digitized data
+        // V offset = 0 V
+        // V range = 1 V
+        // Expected analog data: symmetric about 0 V with maximum deviation of +/- 0.5 V
+
+        scarab::dig_calib_params t_params;
+        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
+
+        std::vector< double > t_analog{ -0.6, -0.5, -0.4, 0., 0.4, 0.5, 0.6 };
+        std::vector< int > t_digital{ -128, -128, -102, 0, 102, 127, 127 };
+
+        for( unsigned i = 0; i < t_analog.size(); ++i )
+        {
+            REQUIRE( scarab::a2d< double, int >( t_analog[i], &t_params ) == t_digital[i] );
+        }
+    }
+
+    SECTION( "dac_unsigned" )
+    {
+        std::cout << "DAC Unsigned Test" << std::endl;
+        // 8 bit digitized data
+        // V offset = 0 V
+        // V range = 1 V
+        // Expected analog data: varying between 0 V and 1 V
+
+        scarab::dig_calib_params t_params;
+        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
+
+        std::vector< double > t_analog{ 0., 0.1, 0.5, 0.9, 1.0 };
+        std::vector< unsigned > t_digital{ 0, 26, 128, 230, 255 };
+
+        const double t_tolerance = t_params.v_range * t_params.inv_levels;
+
+        for( unsigned i = 0; i < t_digital.size(); ++i )
+        {
+            REQUIRE_THAT( (scarab::d2a< unsigned, double >( t_digital[i], &t_params )), Catch::WithinAbs( t_analog[i], t_tolerance ) );
+        }
+    }
+
+    SECTION( "dac_signed" )
+    {
+        std::cout << "DAC Signed Test" << std::endl;
+        // 8 bit digitized data
+        // V offset = 0 V
+        // V range = 1 V
+        // Expected analog data: varying between 0 V and 1 V
+
+        scarab::dig_calib_params t_params;
+        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
+
+        std::vector< double > t_analog{ -0.5, -0.4, 0., 0.4, 0.5 };
+        std::vector< int > t_digital{ -128, -102, 0, 102, 127 };
+
+        const double t_tolerance = t_params.v_range * t_params.inv_levels;
+
+        for( unsigned i = 0; i < t_digital.size(); ++i )
+        {
+            REQUIRE_THAT( (scarab::d2a< int, double >( t_digital[i], &t_params )), Catch::WithinAbs( t_analog[i], t_tolerance ) );
+        }
+    }
+}
diff --git a/Src/Scarab/testing/test_exponential_backoff.cc b/Src/Scarab/testing/test_exponential_backoff.cc
new file mode 100644
index 0000000..4a7f760
--- /dev/null
+++ b/Src/Scarab/testing/test_exponential_backoff.cc
@@ -0,0 +1,90 @@
+/*
+ * test_exponential_backoff.cc
+ *
+ *  Created on: Jun 17, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "exponential_backoff.hh"
+
+#include "catch.hpp"
+
+#include <chrono>
+
+using namespace std::chrono;
+
+TEST_CASE( "exponential_backoff", "[utility]" )
+{
+    unsigned t_value = 0; // value to increment, allowing verification that the function executed; check that this has changed from the before-test value
+    unsigned t_attempts = 0; // how many attempts the increment function should wait; set this to the desired number of attempts before a test
+    unsigned t_attempt = 0; // used by the function to track how many attempts have been attempted; set to 0 before executing the exponential backoff.  if test succeeded, this will equal the return value of the go() function
+    unsigned t_max_attempts = 10; // maximum attempts
+    unsigned t_return = 0; // stores the return value; should match t_attempt
+
+    // this function will wait for a specified number of attempts (t_attempts), 
+    // returning false each time until t_attempt == t_attempts; then it returns true.
+    auto t_increment = [&]()->bool
+    {
+        ++t_attempt;
+        if( t_attempt < t_attempts )
+        {
+            return false;
+        }
+
+        ++t_value;
+        return true;
+    };
+
+    REQUIRE_THROWS_AS( scarab::exponential_backoff<>( t_increment, 0 ), scarab::error );
+
+    // the exponential-backoff test object
+    scarab::exponential_backoff<> t_exp_back( t_increment, t_max_attempts );
+
+    // test: just verify that the function gets called
+    // t_value == 0
+    t_attempts = 1; t_attempt = 0;
+    t_return = t_exp_back.go();
+
+    REQUIRE( t_value == 1 );
+    REQUIRE( t_attempt == t_return );
+    REQUIRE( t_return == 1 );
+
+    // test: do multiple attempts
+    // t_value == 1
+    t_attempts = 3; t_attempt = 0;
+    auto t_start = high_resolution_clock::now();
+    t_return = t_exp_back.go();
+    auto t_end = high_resolution_clock::now();
+    auto t_duration = duration_cast< milliseconds >( t_end - t_start );
+
+    REQUIRE( t_value == 2 );
+    REQUIRE( t_attempt == t_return );
+    REQUIRE( t_return == 3 );
+    // this test was removed because it caused strange problems on the mac GitHub Actions test, even though all other indications showed that the backoff was working
+    //REQUIRE( t_duration.count() == Approx(200+400+t_attempts*15).margin(t_attempts*15) );
+
+    // test: do max attempts
+    // t_value == 2
+    t_attempts = t_max_attempts; t_attempt = 0;
+    t_start = high_resolution_clock::now();
+    t_return = t_exp_back.go();
+    t_end = high_resolution_clock::now();
+    t_duration = duration_cast< milliseconds >( t_end - t_start );
+
+    REQUIRE( t_value == 3 );
+    REQUIRE( t_attempt == t_return );
+    REQUIRE( t_return == 10 );
+    // this test was removed because it caused strange problems on the mac GitHub Actions test, even though all other indications showed that the backoff was working
+    //REQUIRE( t_duration.count() == Approx(200+400+800+1600+3200+6400+12800+25600+51200+t_attempts*15).margin(t_attempts*15) );
+
+    // test: exceed max attempts
+    // t_value == 3
+    t_attempts = t_max_attempts + 1; t_attempt = 0;
+    t_return = t_exp_back.go();
+
+    REQUIRE( t_value == 3 ); // because function was never successfully executed
+    REQUIRE( t_attempt == t_max_attempts );
+    REQUIRE( t_return == 0 );
+
+
+}
diff --git a/Src/Scarab/testing/test_json.cc b/Src/Scarab/testing/test_json.cc
new file mode 100644
index 0000000..6bdb306
--- /dev/null
+++ b/Src/Scarab/testing/test_json.cc
@@ -0,0 +1,74 @@
+/*
+ * test_json.cc
+ *
+ *  Created on: Jul 18, 2018
+ *      Author: N.S. Oblath
+ *
+ */
+
+#include "param.hh"
+#include "param_json.hh"
+
+#include "catch.hpp"
+
+#include <iostream>
+
+
+using scarab::param_node;
+using scarab::param_value;
+using scarab::param_array;
+using scarab::param_ptr_t;
+using scarab::param_output_json;
+using scarab::param_input_json;
+
+TEST_CASE( "json", "[param][param_codec]" )
+{
+    param_ptr_t t_input( new param_node() );
+    param_node& t_input_node = t_input->as_node();
+
+    t_input_node.add( "string", "hello, world" );
+    
+    param_array t_input_array;
+    t_input_array.push_back( 10 );
+    t_input_array.push_back( "I'm in an array!" );
+
+    param_node t_input_nested_node;
+    t_input_nested_node.add( "first", "abcdefg" );
+    t_input_nested_node.add( "second", "hijklmnop" );
+    t_input_nested_node.add( "third", "qrstuv" );
+    t_input_nested_node.add( "fourth", "wxyz" );
+
+    t_input_node.add( "array", std::move(t_input_array) );
+    t_input_node.add( "node", std::move(t_input_nested_node) );
+
+    param_output_json t_writer;
+    std::string t_written;
+    t_writer.write_string( *t_input, t_written );
+
+    param_input_json t_reader;
+    param_ptr_t t_output( t_reader.read_string( t_written ) );
+
+    REQUIRE( t_output->is_node() );
+    param_node& t_output_node = t_input->as_node();
+
+    REQUIRE( t_output_node.size() == 3 );
+
+    REQUIRE( t_output_node.has("string") );
+    REQUIRE( t_output_node["string"].is_value() );
+    REQUIRE( t_output_node["string"]().as_string() == "hello, world" );
+
+    REQUIRE( t_output_node.has("array") );
+    REQUIRE( t_output_node["array"].is_array() );
+    REQUIRE( t_output_node["array"].as_array().size() == 2 );
+    REQUIRE( t_output_node["array"][0].is_value() );
+    REQUIRE( t_output_node["array"][0]().as_uint() == 10 );
+    REQUIRE( t_output_node["array"][1].is_value() );
+    REQUIRE( t_output_node["array"][1]().as_string() == "I'm in an array!" );
+
+    REQUIRE( t_output_node.has("node") );
+    REQUIRE( t_output_node["node"].is_node() );
+    REQUIRE( t_output_node["node"].as_node().size() == 4 );
+    REQUIRE( t_output_node["node"]["first"]().as_string() == "abcdefg" );
+    REQUIRE( t_output_node["node"]["second"].is_value() );
+    REQUIRE( t_output_node["node"]["second"]().as_string() == "hijklmnop" );
+}
diff --git a/Src/Scarab/testing/test_logger.cc b/Src/Scarab/testing/test_logger.cc
new file mode 100644
index 0000000..7352da7
--- /dev/null
+++ b/Src/Scarab/testing/test_logger.cc
@@ -0,0 +1,84 @@
+/*
+ * test_logger.cc
+ *
+ *  Created on: Jan 4, 2016
+ *      Author: N.S. Oblath
+ */
+
+#include "logger.hh"
+
+#include "stream_check.hh"
+
+#include "catch.hpp"
+
+using scarab::testing::compare_and_clear;
+
+
+TEST_CASE( "logger", "[logger]" )
+{
+    LOGGER( tlog, "test_logger" );
+
+    std::stringstream* t_outstream = new std::stringstream();
+    scarab::logger::SetOutStream( t_outstream );
+
+    std::stringstream* t_errstream = new std::stringstream();
+    scarab::logger::SetErrStream( t_errstream );
+
+    // all levels enabled
+    scarab::logger::SetGlobalLevel( scarab::logger::ELevel::eTrace );
+
+    // log
+
+    LPROG( tlog, "test PROG" );
+    REQUIRE( compare_and_clear( t_outstream, "test PROG" ) );
+
+    LINFO( tlog, "test INFO" );
+    REQUIRE( compare_and_clear( t_outstream, "test INFO" ) );
+
+    LDEBUG( tlog, "test DEBUG" );
+    REQUIRE( compare_and_clear( t_outstream, "test DEBUG" ) );
+
+    LTRACE( tlog, "test TRACE" );
+    REQUIRE( compare_and_clear( t_outstream, "test TRACE" ) );
+
+    // err
+
+    LWARN( tlog, "test WARN" );
+    REQUIRE( compare_and_clear( t_errstream, "test WARN" ) );
+
+    LERROR( tlog, "test ERROR" );
+    REQUIRE( compare_and_clear( t_errstream, "test ERROR" ) );
+
+    LFATAL( tlog, "test FATAL" );
+    REQUIRE( compare_and_clear( t_errstream, "test FATAL" ) );
+
+
+    // Info and above
+    tlog.SetGlobalLevel( scarab::logger::ELevel::eInfo );
+
+    // log
+
+    LPROG( tlog, "test PROG" );
+    REQUIRE( compare_and_clear( t_outstream, "test PROG" ) );
+
+    LINFO( tlog, "test INFO" );
+    REQUIRE( compare_and_clear( t_outstream, "test INFO" ) );
+
+    LDEBUG( tlog, "test DEBUG" );
+    REQUIRE( compare_and_clear( t_outstream, "" ) );
+
+    LTRACE( tlog, "test TRACE" );
+    REQUIRE( compare_and_clear( t_outstream, "" ) );
+
+    // err
+
+    LWARN( tlog, "test WARN" );
+    REQUIRE( compare_and_clear( t_errstream, "test WARN" ) );
+
+    LERROR( tlog, "test ERROR" );
+    REQUIRE( compare_and_clear( t_errstream, "test ERROR" ) );
+
+    LFATAL( tlog, "test FATAL" );
+    REQUIRE( compare_and_clear( t_errstream, "test FATAL" ) );
+
+}
diff --git a/Src/Scarab/testing/test_member_variables.cc b/Src/Scarab/testing/test_member_variables.cc
new file mode 100644
index 0000000..a48beef
--- /dev/null
+++ b/Src/Scarab/testing/test_member_variables.cc
@@ -0,0 +1,94 @@
+/*
+ * test_member_variable.cc
+ *
+ *  Created on: May 30, 2017
+ *      Author: N.S. Oblath
+ */
+
+#include "test_member_variables.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "member_variables", "[utility]" )
+{
+    SECTION( "accessible" )
+    {
+        scarab_testing::test_acc t_acc;
+        t_acc.set_mv_acc_int( 5 );
+        REQUIRE( t_acc.get_mv_acc_int() == 5 );
+        REQUIRE( t_acc.get_mv_acc_ns_int() == 10 );
+
+        scarab_testing::test_acc_static::set_mv_acc_int( 5 );
+        REQUIRE( scarab_testing::test_acc_static::get_mv_acc_int() == 5 );
+        REQUIRE( scarab_testing::test_acc_static::get_mv_acc_ns_int() == 10 );
+
+        scarab_testing::test_acc_mutable t_acc_mut;
+        t_acc_mut.set_mv_acc_int( 5 );
+        REQUIRE( t_acc_mut.get_mv_acc_int() == 5 );
+        REQUIRE( t_acc_mut.get_mv_acc_ns_int() == 10 );
+    }
+
+    SECTION( "referrable" )
+    {
+        scarab_testing::test_ref t_ref;
+        t_ref.mv_ref_int() = 5;
+        REQUIRE( t_ref.mv_ref_int() == 5 );
+        REQUIRE( t_ref.mv_ref_c_int() == 10 );
+
+        scarab_testing::test_ref_static::mv_ref_int() = 5;
+        REQUIRE( scarab_testing::test_ref_static::mv_ref_int() == 5 );
+
+        scarab_testing::test_ref_mutable t_ref_mut;
+        t_ref_mut.mv_ref_int() = 5;
+        REQUIRE( t_ref_mut.mv_ref_int() == 5 );
+    }
+
+    SECTION( "pointer" )
+    {
+        scarab_testing::test_ptr t_ptr;
+        t_ptr.set_mv_ptr_int( new int(5) );
+        REQUIRE( *(t_ptr.get_mv_ptr_int()) == 5 );
+        REQUIRE( *(t_ptr.get_mv_ptr_ns_int()) == 10 );
+
+        scarab_testing::test_ptr_static::set_mv_ptr_int( new int(5) );
+        REQUIRE( *(scarab_testing::test_ptr_static::get_mv_ptr_int()) == 5 );
+
+        scarab_testing::test_ptr_mutable t_ptr_mut;
+        t_ptr_mut.set_mv_ptr_int( new int(5) );
+        REQUIRE( *(t_ptr_mut.get_mv_ptr_int()) == 5 );
+        REQUIRE( *(t_ptr_mut.get_mv_ptr_ns_int()) == 10 );
+    }
+
+    SECTION( "shared_ptr" )
+    {
+        scarab_testing::test_shptr t_shptr;
+        *t_shptr.mv_shptr_int() = 5;
+        REQUIRE( *(t_shptr.mv_shptr_int()) == 5 );
+        REQUIRE( *(t_shptr.mv_shptr_c_int()) == 10 );
+
+        *scarab_testing::test_shptr_static::mv_shptr_int() = 5;
+        REQUIRE( *(scarab_testing::test_shptr_static::mv_shptr_int()) == 5 );
+
+        scarab_testing::test_shptr_mutable t_shptr_mut;
+        *t_shptr_mut.mv_shptr_int() = 5;
+        REQUIRE( *(t_shptr_mut.mv_shptr_int()) == 5 );
+        REQUIRE( *(t_shptr_mut.mv_shptr_c_int()) == 10 );
+    }
+
+    SECTION( "atomic" )
+    {
+        scarab_testing::test_atm t_atm;
+        t_atm.set_mv_atm_int( 5 );
+        REQUIRE( t_atm.get_mv_atm_int() == 5 );
+        REQUIRE( t_atm.get_mv_atm_ns_int() == 10 );
+
+        scarab_testing::test_atm_static::set_mv_atm_int( 5 );
+        REQUIRE( scarab_testing::test_atm_static::get_mv_atm_int() == 5 );
+
+        scarab_testing::test_atm_mutable t_atm_mut;
+        t_atm_mut.set_mv_atm_int( 5 );
+        REQUIRE( t_atm_mut.get_mv_atm_int() == 5 );
+        REQUIRE( t_atm_mut.get_mv_atm_ns_int() == 10 );
+    }
+}
diff --git a/Src/Scarab/testing/test_member_variables.hh b/Src/Scarab/testing/test_member_variables.hh
new file mode 100644
index 0000000..c42c560
--- /dev/null
+++ b/Src/Scarab/testing/test_member_variables.hh
@@ -0,0 +1,164 @@
+/*
+ * test_member_variable.hh
+ *
+ *  Created on: May 30, 2017
+ *      Author: obla999
+ *
+ *  The variables in the test_acc struct include a test of doxygen-compliant documentation
+ */
+
+#ifndef SCARAB_TEST_MEMBER_VARIABLE_HH_
+#define SCARAB_TEST_MEMBER_VARIABLE_HH_
+
+#include <atomic>
+#include <memory>
+#include <string>
+
+#include "member_variables.hh"
+
+namespace scarab_testing
+{
+    
+    //**********
+    // normal
+    //**********
+
+    struct test_acc
+    {
+        test_acc() : f_mv_acc_ns_int( 10 ), f_mv_acc_int( 0 ) {}
+        /// Very special variable f_acc_ns_int
+        mv_accessible_noset( int, mv_acc_ns_int )
+        /**
+         *  Another special variable: f_acc_int
+         *  This variable is so special it requires
+         *  a multi-line comment
+         */
+        mv_accessible( int, mv_acc_int )
+    };
+
+    struct test_acc_static
+    {
+        mv_accessible_static_noset( int, mv_acc_ns_int )
+        mv_accessible_static( int, mv_acc_int )
+    };
+
+    int test_acc_static::s_mv_acc_ns_int = 10;
+    int test_acc_static::s_mv_acc_int = 0;
+
+    struct test_acc_mutable
+    {
+        test_acc_mutable() : f_mv_acc_ns_int( 10 ), f_mv_acc_int( 0 ) {}
+        mv_accessible_mutable_noset( int, mv_acc_ns_int )
+        mv_accessible_mutable( int, mv_acc_int )
+    };
+
+    //**************
+    // referrable
+    //**************
+
+    struct test_ref
+    {
+        test_ref() : f_mv_ref_c_int( 10 ), f_mv_ref_int( 0 ) {}
+        mv_referrable_const( int, mv_ref_c_int )
+        mv_referrable( int, mv_ref_int )
+    };
+
+    struct test_ref_static
+    {
+        mv_referrable_static( int, mv_ref_int )
+    };
+
+    int test_ref_static::s_mv_ref_int = 0;
+
+    struct test_ref_mutable
+    {
+        test_ref_mutable() : f_mv_ref_int( 0 ) {}
+        mv_referrable_mutable( int, mv_ref_int )
+    };
+
+
+    //***********
+    // pointer
+    //***********
+
+    struct test_ptr
+    {
+        test_ptr() : f_mv_ptr_ns_int( new int(10) ), f_mv_ptr_int( new int(0) ) {}
+        ~test_ptr() {delete f_mv_ptr_ns_int; delete f_mv_ptr_int;}
+        mv_assignable_noset( int, mv_ptr_ns_int )
+        mv_assignable( int, mv_ptr_int )
+    };
+
+    struct test_ptr_static
+    {
+        mv_assignable_static_noset( int, mv_ptr_ns_int )
+        mv_assignable_static( int, mv_ptr_int )
+    };
+
+    int* test_ptr_static::s_mv_ptr_ns_int = new int(10);
+    int* test_ptr_static::s_mv_ptr_int = new int(0);
+
+    struct test_ptr_mutable
+    {
+        test_ptr_mutable() : f_mv_ptr_ns_int( new int(10) ), f_mv_ptr_int( new int(0) ) {}
+        ~test_ptr_mutable() {delete f_mv_ptr_ns_int; delete f_mv_ptr_int;}
+        mv_assignable_mutable_noset( int, mv_ptr_ns_int )
+        mv_assignable_mutable( int, mv_ptr_int )
+    };
+
+
+    //**************
+    // shared_ptr
+    //**************
+
+    struct test_shptr
+    {
+        test_shptr() : f_mv_shptr_c_int( new int(10) ), f_mv_shptr_int( new int(0) ) {}
+        mv_shared_ptr_const( int, mv_shptr_c_int )
+        mv_shared_ptr( int, mv_shptr_int )
+    };
+
+    struct test_shptr_static
+    {
+        mv_shared_ptr_static( int, mv_shptr_int )
+    };
+
+    std::shared_ptr< int > test_shptr_static::s_mv_shptr_int = std::make_shared< int >( 0 );
+
+    struct test_shptr_mutable
+    {
+        test_shptr_mutable() : f_mv_shptr_c_int( new int(10) ), f_mv_shptr_int( new int(0) ) {}
+        mv_shared_ptr_mutable_const( int, mv_shptr_c_int )
+        mv_shared_ptr_mutable( int, mv_shptr_int )
+    };
+
+
+    //**********
+    // atomic
+    //**********
+
+    struct test_atm
+    {
+        test_atm() : f_mv_atm_ns_int( 10 ), f_mv_atm_int( 0 ) {}
+        mv_atomic_noset( int, mv_atm_ns_int )
+        mv_atomic( int, mv_atm_int )
+    };
+
+    struct test_atm_static
+    {
+        mv_atomic_static_noset( int, mv_atm_ns_int )
+        mv_atomic_static( int, mv_atm_int )
+    };
+
+    std::atomic< int > test_atm_static::s_mv_atm_ns_int( 10 );
+    std::atomic< int > test_atm_static::s_mv_atm_int( 0 );
+
+    struct test_atm_mutable
+    {
+        test_atm_mutable() : f_mv_atm_ns_int( 10 ), f_mv_atm_int( 0 ) {}
+        mv_atomic_mutable_noset( int, mv_atm_ns_int )
+        mv_atomic_mutable( int, mv_atm_int )
+    };
+}
+
+#endif /* SCARAB_TEST_MEMBER_VARIABLE_HH_ */
diff --git a/Src/Scarab/testing/test_nonoption_parser.cc b/Src/Scarab/testing/test_nonoption_parser.cc
new file mode 100644
index 0000000..3a34da2
--- /dev/null
+++ b/Src/Scarab/testing/test_nonoption_parser.cc
@@ -0,0 +1,106 @@
+/*
+ * test_nonoption_parser.cc
+ *
+ *  Created on: Jul 23, 2018
+ *      Author: N.S. Oblath
+ *
+ *  Terminal output should be something like this:
+2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(19): Creating arguments
+2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(33): Parsing
+2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(36): Checking parsed args
+2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(37):  Ordered args:
+
+[
+    We
+    are
+    5
+    ordered
+    args
+]
+
+2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(38):  Keyword args:
+
+{
+    And : 1
+    are :
+    [
+
+
+
+
+
+
+        3.000000
+    ]
+
+    args : 500000000.000000
+    key :
+    {
+        word : -4
+    }
+
+    we : 2
+}
+
+2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(79): Testing negative number vs illegal option
+2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(83): Parsing `-5`
+2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(85): Is ord_args[0] == -5? 1
+2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(89): Parsing `-five`
+2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(97): Caught exception while parsing:
+Cannot parse an option with the nonoption_parser: -five
+ *
+ */
+
+#include "nonoption_parser.hh"
+
+#include "catch.hpp"
+
+TEST_CASE( "nonoption_parser", "[param]" )
+{
+    SECTION( "args" )
+    {
+        std::vector< std::string > t_args;
+        t_args.push_back( "We" );
+        t_args.push_back( "are" );
+        t_args.push_back( "5" );
+        t_args.push_back( "ordered" );
+        t_args.push_back( "args" );
+
+        t_args.push_back( "And=1" );
+        t_args.push_back( "we=2" );
+        t_args.push_back( "are.6=3.0" );
+        t_args.push_back( "key.word=-4" );
+        t_args.push_back( "args=5e8" );
+
+        scarab::nonoption_parser t_parser( t_args );
+
+        REQUIRE( t_parser.ord_args()[0]().as_string() == "We" );
+        REQUIRE( t_parser.ord_args()[1]().as_string() == "are" );
+        REQUIRE( t_parser.ord_args()[2]().as_uint() == 5 );
+        REQUIRE( t_parser.ord_args()[3]().as_string() == "ordered" );
+        REQUIRE( t_parser.ord_args()[4]().as_string() == "args" );
+
+        REQUIRE( t_parser.kw_args()["And"]().as_uint() == 1 );
+        REQUIRE( t_parser.kw_args()["we"]().as_uint() == 2 );
+        REQUIRE_THAT( t_parser.kw_args()["are"][6]().as_double(), Catch::WithinRel( 3.0 ) );
+        REQUIRE( t_parser.kw_args()["key"]["word"]().as_int() == -4 );
+        REQUIRE_THAT( t_parser.kw_args()["args"]().as_double(), Catch::WithinRel( 5.e8 ) );
+    }
+
+    SECTION( "negative" )
+    {
+        std::vector< std::string > t_args;
+        t_args.push_back( "-5" );
+
+        scarab::nonoption_parser t_parser( t_args );
+        REQUIRE( t_parser.ord_args()[0]().as_int() == -5 );
+    }
+
+    SECTION( "option" )
+    {
+        std::vector< std::string > t_args;
+        t_args.push_back( "-five" );
+
+        REQUIRE_THROWS_AS( scarab::nonoption_parser( t_args ), scarab::error );
+    }
+}
diff --git a/Src/Scarab/testing/test_param_array.cc b/Src/Scarab/testing/test_param_array.cc
new file mode 100644
index 0000000..67e90ef
--- /dev/null
+++ b/Src/Scarab/testing/test_param_array.cc
@@ -0,0 +1,137 @@
+/*
+ * test_param_array.cc
+ *
+ *  Created on: Jul 17, 2018
+ *      Author: N.S. Oblath
+ *
+ *  Output should be something like:
+ *
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(54): Creating param array
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(57): Adding a value
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(60): Adding an array
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(69): Printing contents:
+[
+    5
+
+    {
+        five-hundred : 500
+    }
+
+
+    [
+        5000
+    ]
+
+]
+
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(71): After move, should be full:
+{
+    five-hundred : 500
+}
+
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(72): After move, should be empty:
+[
+]
+
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(74): Access:
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(75): 5
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(76): 5
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(77): 500
+2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(78): 5000
+ *
+ */
+
+#include "param.hh"
+
+#include "error.hh"
+
+#include "catch.hpp"
+
+using scarab::param_array;
+using scarab::param_node;
+using scarab::param_value;
+using scarab::param_ptr_t;
+
+TEST_CASE( "param_array", "[param]" )
+{
+    param_array array;
+    REQUIRE( array.empty() );
+    REQUIRE( array.size() == 0 );
+
+    array.push_back( 5 );
+    REQUIRE_FALSE( array.empty() );
+    REQUIRE( array.size() == 1 );
+
+    param_node subnode;
+    subnode.add( "five-hundred", 500 );
+    array.push_back( subnode );
+    REQUIRE( array.size() == 2 );
+    REQUIRE_FALSE( subnode.empty() );
+
+    param_array subarray;
+    subarray.push_back( "5000" );
+    array.push_back( std::move(subarray) );
+    REQUIRE( array.size() == 3 );
+    REQUIRE( subarray.empty() );
+
+    // access
+    REQUIRE( array[0]().as_int() == 5 );
+    REQUIRE( array.get_value(0, 99999) == 5 );
+    REQUIRE( array.get_value(100, 99999) == 99999 );
+    REQUIRE_THROWS_AS( array[1](), scarab::error );
+    REQUIRE_THROWS_AS( array[2](), scarab::error );
+    REQUIRE( array[1]["five-hundred"]().as_int() == 500 );
+    REQUIRE( array[2][0]().as_int() == 5000 );
+
+    // front and back
+    REQUIRE( array.front()().as_int() == 5 );
+    REQUIRE( array.back()[0]().as_int() == 5000 );
+
+    // assign
+    param_value to_assign( 10 );
+    array.assign( 0, to_assign );
+    REQUIRE( array[0]().as_int() == 10 );
+    REQUIRE( to_assign.as_int() == 10 );
+
+    to_assign = 15;
+    array.assign( 0, std::move(to_assign ) );
+    REQUIRE( array[0]().as_int() == 15 );
+    REQUIRE_FALSE( to_assign.as_int() == 0 );
+
+    array.assign( 0, 20 );
+    REQUIRE( array[0]().as_int() == 20 );
+
+    // append and merge
+    param_array to_append;
+    to_append.push_back( -1 );
+    array.append( to_append );
+    REQUIRE( array.size() == 4 );
+    REQUIRE( array[3]().as_int() == -1 );
+
+    param_array to_merge;
+    to_merge.push_back( -2 );
+    array.merge( to_merge );
+    REQUIRE( array.size() == 4 );
+    REQUIRE( array[0]().as_int() == -2 );
+
+    // iterator, begin, and end
+    param_array::iterator it = array.begin();
+    unsigned count = 0;
+    for( ; it != array.end(); ++it, ++count );
+    REQUIRE( count == array.size() );
+
+    // remove, erase and clear
+    param_ptr_t removed = array.remove( 0 );
+    REQUIRE( removed->is_value() );
+    REQUIRE( removed->as_value().as_int() == -2 );
+
+    array.erase( 1 );
+
+    REQUIRE( array.size() == 4 );
+
+    array.clear();
+    REQUIRE( array.size() == 0 );
+
+}
+
+
diff --git a/Src/Scarab/testing/test_param_by_pointer.cc b/Src/Scarab/testing/test_param_by_pointer.cc
new file mode 100644
index 0000000..0a9c936
--- /dev/null
+++ b/Src/Scarab/testing/test_param_by_pointer.cc
@@ -0,0 +1,45 @@
+/*
+ * test_param_by_pointer.cc
+ *
+ *  Created on: Jul 18, 2018
+ *      Author: N.S. Oblath
+ *
+ */
+
+#include "param.hh"
+
+#include "catch.hpp"
+
+using scarab::param_ptr_t;
+using scarab::param_array;
+using scarab::param_value;
+using scarab::param_node;
+
+TEST_CASE( "param_by_pointer", "[param]" )
+{
+    param_ptr_t param_0( new param_node() );
+    REQUIRE( param_0 );
+    REQUIRE( param_0->is_node() );
+
+    param_ptr_t param_1( new param_value(8.0) );
+    REQUIRE( param_1->is_value() );
+    param_0->as_node().add( "eight", std::move(param_1) );
+    REQUIRE_FALSE( param_1 );
+    REQUIRE_THAT( param_0->as_node()["eight"]().as_double(), Catch::WithinULP(8., 10) );
+
+    param_ptr_t param_2( new param_array() );
+    REQUIRE( param_2->is_array() );
+
+    param_ptr_t param_3( new param_value(80) );
+    param_2->as_array().push_back( std::move(param_3) );
+
+    param_ptr_t param_4( new param_value(800) );
+    param_2->as_array().push_back( std::move(param_4) );
+
+    param_0->as_node().add( "subarray", std::move(param_2) );
+    REQUIRE( param_0->as_node().has( "subarray" ) );
+    REQUIRE( param_0->as_node()["subarray"].is_array() );
+    REQUIRE( param_0->as_node()["subarray"].as_array().size() == 2 );
+
+    REQUIRE_FALSE( param_2 );
+}
diff --git a/Src/Scarab/testing/test_param_node.cc b/Src/Scarab/testing/test_param_node.cc
new file mode 100644
index 0000000..f4929ef
--- /dev/null
+++ b/Src/Scarab/testing/test_param_node.cc
@@ -0,0 +1,86 @@
+/*
+ * test_param_node.cc
+ *
+ *  Created on: Jul 13, 2018
+ *      Author: N.S. Oblath
+ */
+
+#include "param.hh"
+
+#include "catch.hpp"
+
+using scarab::param_array;
+using scarab::param_node;
+using scarab::param_value;
+using scarab::param_ptr_t;
+
+TEST_CASE( "param_node", "[param]" )
+{
+    param_node node;
+    REQUIRE( node.empty() );
+    REQUIRE( node.size() == 0 );
+
+    node.add( "five", 5 );
+    REQUIRE_FALSE( node.empty() );
+    REQUIRE( node.size() == 1 );
+
+    param_array subarray1;
+    subarray1.push_back( 500 );
+    node.add( "subarray1", subarray1 );
+    REQUIRE( node.size() == 2 );
+    REQUIRE_FALSE( subarray1.empty() );
+
+    param_array subarray2;
+    subarray2.push_back( "5000" );
+    node.add( "subarray2", std::move(subarray2) );
+    REQUIRE( node.size() == 3 );
+    REQUIRE( subarray2.empty() );
+
+    // has and count
+    REQUIRE( node.has("five") );
+    REQUIRE_FALSE( node.has("ten") );
+    REQUIRE( node.count("five") == 1 );
+    REQUIRE( node.count("ten") == 0 );
+
+    // access
+    REQUIRE( node["five"]().as_int() == 5 );
+    REQUIRE( node.get_value("five", 99999) == 5 );
+    REQUIRE( node.get_value("ten", 99999) == 99999 );
+    REQUIRE_THROWS_AS( node["subarray1"](), scarab::error );
+    REQUIRE_THROWS_AS( node["subarray2"](), scarab::error );
+    REQUIRE( node["subarray1"][0]().as_int() == 500 );
+    REQUIRE( node["subarray2"][0]().as_int() == 5000 );
+
+    // add and replace
+    REQUIRE( node.add("ten", 10) );
+    REQUIRE_FALSE( node.add("five", -5) );
+    REQUIRE_NOTHROW( node.replace("ten", -10) );
+    REQUIRE( node.has("ten") );
+    REQUIRE( node["ten"]().as_int() == -10 );
+
+    // merge
+    param_node to_merge;
+    to_merge.add( "minus-two", -2 );
+    node.merge( to_merge );
+    REQUIRE( node.size() == 5 );
+    REQUIRE( node["minus-two"]().as_int() == -2 );
+
+    // iterator, begin, and end
+    param_node::iterator it = node.begin();
+    unsigned count = 0;
+    for( ; it != node.end(); ++it, ++count );
+    REQUIRE( count == node.size() );
+
+    // remove, erase, and clear
+    param_ptr_t removed = node.remove( "ten" );
+    REQUIRE( removed->is_value() );
+    REQUIRE( removed->as_value().as_int() == -10 );
+
+    node.erase( "minus-two" );
+    REQUIRE( node.size() == 3 );
+
+    node.clear();
+    REQUIRE( node.size() == 0 );
+
+}
+
diff --git a/Src/Scarab/testing/test_param_translator.cc b/Src/Scarab/testing/test_param_translator.cc
new file mode 100644
index 0000000..b90bacd
--- /dev/null
+++ b/Src/Scarab/testing/test_param_translator.cc
@@ -0,0 +1,92 @@
+/*
+ * test_param_translator.cc
+ *
+ *  Created on: Dec 9, 2021
+ *      Author: N.S. Oblath
+ *
+ */
+
+#include "param_codec.hh"
+
+#include "logger.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "test_param_translator" )
+
+using namespace scarab;
+
+
+TEST_CASE( "param_translator", "[param]" )
+{
+#ifdef USE_CODEC_YAML
+    SECTION( "YAML" )
+    {
+        LINFO( testlog, "Testing YAML translator" )
+
+        std::string test_yaml(
+            "a-node:\n"
+            "  name1: 1\n"
+            "  name2: 2\n"
+            "a-array:\n"
+            "  - 3\n"
+            "  - 4"
+        );
+
+        LINFO( testlog, "YAML test string:\n" << test_yaml );
+
+        param_translator translator;
+
+        param_ptr_t translated_yaml = translator.read_string( test_yaml, "yaml" );
+        REQUIRE( translated_yaml );
+        REQUIRE( (*translated_yaml)["a-node"]["name1"]().as_int() == 1 );
+        REQUIRE( (*translated_yaml)["a-node"]["name2"]().as_int() == 2 );
+        REQUIRE( (*translated_yaml)["a-array"][0]().as_int() == 3 );
+        REQUIRE( (*translated_yaml)["a-array"][1]().as_int() == 4 );
+
+        std::string test_yaml_fromparam;
+        REQUIRE( translator.write_string( *translated_yaml, test_yaml_fromparam, "yaml" ) );
+
+        LINFO( testlog, "Back to YAML:\n" << test_yaml_fromparam );
+    }
+#endif
+
+#ifdef USE_CODEC_JSON
+    SECTION( "JSON" )
+    {
+        LINFO( testlog, "Testing JSON translator" )
+
+        std::string test_json(
+            "{\n"
+            "  \"a-node\": {\n"
+            "    \"name1\": 1,\n"
+            "    \"name2\": 2\n"
+            "  },\n"
+            "  \"a-array\": [3, 4]"
+            "}"
+
+        );
+
+        LINFO( testlog, "JSON test string:\n" << test_json );
+
+        param_translator translator;
+        param_ptr_t translated_json = translator.read_string( test_json, "json" );
+        REQUIRE( translated_json );
+        REQUIRE( (*translated_json)["a-node"]["name1"]().as_int() == 1 );
+        REQUIRE( (*translated_json)["a-node"]["name2"]().as_int() == 2 );
+        REQUIRE( (*translated_json)["a-array"][0]().as_int() == 3 );
+        REQUIRE( (*translated_json)["a-array"][1]().as_int() == 4 );
+
+        std::string test_json_fromparam;
+        REQUIRE( translator.write_string( *translated_json, test_json_fromparam, "json" ) );
+
+        LINFO( testlog, "Back to JSON:\n" << test_json_fromparam );
+
+    }
+
+#endif
+
+}
+
+
+
diff --git a/Src/Scarab/testing/test_param_value.cc b/Src/Scarab/testing/test_param_value.cc
new file mode 100644
index 0000000..de12f56
--- /dev/null
+++ b/Src/Scarab/testing/test_param_value.cc
@@ -0,0 +1,183 @@
+/*
+ * test_param_value.cc
+ *
+ *  Created on: Jul 13, 2018
+ *      Author: N.S. Oblath
+ *
+ */
+
+#include "param_value.hh"
+
+#include "catch.hpp"
+
+using scarab::param_value;
+
+TEST_CASE( "param_value", "[param]" )
+{
+    SECTION( "initialization" )
+    {
+        // boolean
+        param_value bool_val( true );
+        REQUIRE( bool_val.as_bool() );
+        REQUIRE( bool_val.as_string() == "true" );
+
+        bool_val.set( false );
+        REQUIRE_FALSE( bool_val.as_bool() );
+        REQUIRE( bool_val.as_string() == "false" );
+
+        bool_val = true;
+        REQUIRE( bool_val.as_bool() );
+
+        // integer
+        param_value int_val( 5 );
+        REQUIRE( int_val.as_int() == 5 );
+        REQUIRE( int_val.as_string() == "5" );
+        REQUIRE_THAT( int_val.as_double(), Catch::WithinULP( 5., 10 ) );
+
+        int_val = 10;
+        REQUIRE( int_val.as_int() == 10 );
+
+        // string
+        param_value string_val( "hello world" );
+        REQUIRE( string_val.as_string() == "hello world" );
+
+        string_val = "oh, hai!";
+        REQUIRE( string_val.as_string() == "oh, hai!" );
+
+        string_val.set( "abracadabra" );
+        REQUIRE( string_val.as_string() == "abracadabra" );
+
+        // single-quote stripping
+        param_value string_val_sq( "'hello world'" );
+        REQUIRE( string_val_sq.as_string() == "hello world" );
+
+        string_val.set( "'hello world'" );
+        REQUIRE( string_val.as_string() == "hello world" );
+
+        // string to int
+        string_val.set( "10" );
+        REQUIRE( string_val.as_string() == "10" );
+        REQUIRE( string_val.as_int() == 10 );
+
+        // string to bool
+        string_val.set( "true" );
+        REQUIRE( string_val.as_bool() );
+
+        string_val.set( "false" );
+        REQUIRE_FALSE( string_val.as_bool() );
+    }
+
+
+    SECTION( "quotation_options" )
+    {
+        param_value quote_opts_val( 1 );
+        REQUIRE( quote_opts_val.as_string() == "1" );
+        REQUIRE( quote_opts_val.as_int() == 1 );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE( quote_opts_val.is_int() );
+        REQUIRE_FALSE( quote_opts_val.is_string() );
+
+        quote_opts_val.set( "1" );
+        REQUIRE( quote_opts_val.as_string() == "1" );
+        REQUIRE( quote_opts_val.as_int() == 1 );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE_FALSE( quote_opts_val.is_int() );
+        REQUIRE( quote_opts_val.is_string() );
+
+        // Initializes as a char in integer form
+        quote_opts_val.set( '1' );
+        REQUIRE( quote_opts_val.as_string() == "49" );
+        REQUIRE( quote_opts_val.as_int() == 49 );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE( quote_opts_val.is_int() );
+        REQUIRE_FALSE( quote_opts_val.is_string() );
+
+        quote_opts_val.set( "'1'" );
+        REQUIRE( quote_opts_val.as_string() == "1" );
+        REQUIRE( quote_opts_val.as_int() == 1 );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE_FALSE( quote_opts_val.is_int() );
+        REQUIRE( quote_opts_val.is_string() );
+
+        quote_opts_val.set( "\"'1'\"" );
+        REQUIRE( quote_opts_val.as_string() == "\"'1'\"" );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE_FALSE( quote_opts_val.is_int() );
+        REQUIRE( quote_opts_val.is_string() );
+
+        quote_opts_val.set( "''1''" );
+        REQUIRE( quote_opts_val.as_string() == "'1'" );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE_FALSE( quote_opts_val.is_int() );
+        REQUIRE( quote_opts_val.is_string() );
+
+        quote_opts_val.set( "'\'1\''" );
+        REQUIRE( quote_opts_val.as_string() == "'1'" );
+        REQUIRE_FALSE( quote_opts_val.is_uint() );
+        REQUIRE_FALSE( quote_opts_val.is_int() );
+        REQUIRE( quote_opts_val.is_string() );
+    }
+
+    SECTION( "strict_equality" )
+    {
+        param_value bool_val( true );
+        param_value bool_val_2( false );
+        REQUIRE_FALSE( bool_val.strict_is_equal_to(bool_val_2) );
+        REQUIRE_FALSE( bool_val_2.strict_is_equal_to(bool_val) );
+        bool_val_2 = true;
+        REQUIRE( bool_val.strict_is_equal_to(bool_val_2) );
+        REQUIRE( bool_val_2.strict_is_equal_to(bool_val) );
+
+        param_value string_val( "hello" );
+        param_value string_val_2( "hello" );
+        REQUIRE( string_val.strict_is_equal_to(string_val_2) );
+        string_val_2 = "world";
+        REQUIRE_FALSE( string_val.strict_is_equal_to(string_val_2) );
+
+        bool_val = true;
+        param_value int_val( 1 );
+        REQUIRE_FALSE( bool_val.strict_is_equal_to(int_val) );
+        param_value uint_val( 1U );
+        REQUIRE_FALSE( int_val.strict_is_equal_to(uint_val) );
+        string_val = "true";
+        REQUIRE_FALSE( bool_val.strict_is_equal_to(string_val) );
+
+        param_value double_val( 1. );
+        param_value double_val_2( 1. );
+        REQUIRE( double_val.strict_is_equal_to(double_val_2) );
+        double_val_2 = 2.;
+        REQUIRE_FALSE( double_val.strict_is_equal_to(double_val_2) );
+        int_val = 1;
+        REQUIRE_FALSE( double_val.strict_is_equal_to(int_val) );
+    }
+
+    SECTION( "loose_equality" )
+    {
+        param_value bool_val( true );
+        param_value bool_val_2( false );
+        REQUIRE_FALSE( bool_val.loose_is_equal_to(bool_val_2) );
+        bool_val_2 = true;
+        REQUIRE( bool_val.loose_is_equal_to(bool_val_2) );
+
+        param_value string_val( "hello" );
+        param_value string_val_2( "hello" );
+        REQUIRE( string_val.loose_is_equal_to(string_val_2) );
+        string_val_2 = "world";
+        REQUIRE_FALSE( string_val.loose_is_equal_to(string_val_2) );
+
+        param_value int_val( 1 );
+        REQUIRE_FALSE( bool_val.loose_is_equal_to(int_val) );
+        param_value uint_val( 1U );
+        REQUIRE( uint_val.loose_is_equal_to(int_val) );
+        string_val = "true";
+        REQUIRE( bool_val.loose_is_equal_to(string_val) );
+
+        param_value double_val( 1. );
+        param_value double_val_2( 1. );
+        REQUIRE( double_val.loose_is_equal_to(double_val_2) );
+        double_val_2 = 2.;
+        REQUIRE_FALSE( double_val.loose_is_equal_to(double_val_2) );
+        REQUIRE_FALSE( double_val.loose_is_equal_to(int_val) );
+    }
+}
+
diff --git a/Src/Scarab/testing/test_path.cc.in b/Src/Scarab/testing/test_path.cc.in
new file mode 100644
index 0000000..2dc28e9
--- /dev/null
+++ b/Src/Scarab/testing/test_path.cc.in
@@ -0,0 +1,42 @@
+/*
+ * test_path.cc
+ *
+ *  Created on: Oct 13, 2021
+ *      Author: P.T. Surukuchi
+ *
+ */
+
+#include "path.hh"
+
+#include "catch.hpp"
+
+#include <iostream>
+
+
+using scarab::path;
+
+TEST_CASE( "path", "[utility]" )
+{
+    SECTION( "glob" )
+    {
+        std::cout << "Glob Test" << std::endl;
+        std::string dir_path( "@DIR_PATH@" );
+        
+        // build a test vector of txt files to test against the output of glob function
+        //this only works asssuming you are in a build directory
+        std::vector< path > test_file_paths;
+        test_file_paths.push_back( dir_path + "/glob_path/sub1/sub1sub1/glob_sub1sub1.txt" );
+        test_file_paths.push_back( dir_path + "/glob_path/sub1/sub1sub2/glob_sub1sub2.txt" );
+        test_file_paths.push_back( dir_path + "/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt" );
+        test_file_paths.push_back( dir_path + "/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt" );
+        test_file_paths.push_back( dir_path + "/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt" );
+
+        std::vector< path > file_paths = scarab::glob( dir_path, "[0-2].txt$" );
+        std::sort( file_paths.begin(),file_paths.end() );// sort to make sure they are in order
+        for( unsigned int i = 0; i < file_paths.size(); ++i )
+        {
+            REQUIRE( test_file_paths[i] == file_paths[i] );
+        }
+    }
+}
+
diff --git a/Src/Scarab/testing/test_signal_handler.cc b/Src/Scarab/testing/test_signal_handler.cc
new file mode 100644
index 0000000..ffd7943
--- /dev/null
+++ b/Src/Scarab/testing/test_signal_handler.cc
@@ -0,0 +1,147 @@
+/*
+ * test_signal_handler.cc
+ *
+ *  Created on: Jul 17, 2020
+ *      Author: N.S. Oblath
+ * 
+ *  Things we cannot test here due to the way in which catch2 is setup:
+ *  - Signal catching
+ *  - Termination
+ * 
+ */
+
+#include "signal_handler.hh"
+
+#include "cancelable.hh"
+#include "logger.hh"
+#include "stream_check.hh"
+
+#include "catch.hpp"
+
+#include <signal.h>
+
+using scarab::testing::compare_and_clear;
+
+
+TEST_CASE( "signal_handler", "[utility]" )
+{
+    LOGGER( tlog, "test_signal_handler" );
+
+    SECTION( "not_handling" )
+    {
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_abrt() );
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_term() );
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_int() );
+        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGABRT ) );
+        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGTERM ) );
+        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGINT ) );
+    #ifndef _WIN32
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_quit() );
+        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGQUIT ) );
+    #endif
+
+        REQUIRE( scarab::signal_handler::get_ref_count() == 0 );
+    }
+
+    scarab::signal_handler t_handler;
+    REQUIRE( scarab::signal_handler::get_ref_count() == 1 );
+
+    SECTION( "handling" )
+    {
+        REQUIRE( scarab::signal_handler::get_handling_sig_abrt() );
+        REQUIRE( scarab::signal_handler::get_handling_sig_term() );
+        REQUIRE( scarab::signal_handler::get_handling_sig_int() );
+        REQUIRE( scarab::signal_handler::is_handling( SIGABRT ) );
+        REQUIRE( scarab::signal_handler::is_handling( SIGTERM ) );
+        REQUIRE( scarab::signal_handler::is_handling( SIGINT ) );
+    #ifndef _WIN32
+        REQUIRE( scarab::signal_handler::get_handling_sig_quit() );
+        REQUIRE( scarab::signal_handler::is_handling( SIGQUIT ) );
+    #endif
+
+        scarab::signal_handler t_handler_2;
+        REQUIRE( scarab::signal_handler::get_ref_count() == 2 );
+
+        REQUIRE( scarab::signal_handler::get_handling_sig_abrt() );
+        REQUIRE( scarab::signal_handler::get_handling_sig_term() );
+        REQUIRE( scarab::signal_handler::get_handling_sig_int() );
+    #ifndef _WIN32
+        REQUIRE( scarab::signal_handler::get_handling_sig_quit() );
+    #endif
+
+    }
+
+    REQUIRE( scarab::signal_handler::get_ref_count() == 1 );
+
+    SECTION( "handling_switch" )
+    {
+        scarab::signal_handler::unhandle_signals();
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_abrt() );
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_term() );
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_int() );
+    #ifndef _WIN32
+        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_quit() );
+    #endif
+
+        scarab::signal_handler::handle_signals();
+        REQUIRE( scarab::signal_handler::get_handling_sig_abrt() );
+        REQUIRE( scarab::signal_handler::get_handling_sig_term() );
+        REQUIRE( scarab::signal_handler::get_handling_sig_int() );
+    #ifndef _WIN32
+        REQUIRE( scarab::signal_handler::get_handling_sig_quit() );
+    #endif
+    }
+
+    SECTION( "printing" )
+    {
+        REQUIRE_NOTHROW( scarab::signal_handler::print_current_exception( true ) );
+        REQUIRE_NOTHROW( scarab::signal_handler::print_stack_trace( true ) );
+
+        try
+        {
+            throw std::runtime_error( "test error" );
+        }
+        catch(const std::runtime_error& e)
+        {
+            REQUIRE_NOTHROW( scarab::signal_handler::print_current_exception( true ) );
+
+            std::stringstream* t_errstream = new std::stringstream();
+            scarab::logger::SetErrStream( t_errstream );
+
+            scarab::signal_handler::print_current_exception( true );
+            REQUIRE( compare_and_clear( t_errstream, "test error" ) );
+
+            scarab::logger::SetErrStream( &std::cerr );
+
+        }
+    }
+
+    scarab::cancelable t_cancel;
+    REQUIRE_FALSE( t_cancel.is_canceled() );
+
+    // we use cancelable_wrapper to wrap t_cancel in a shared_ptr
+    auto t_cwrap = scarab::wrap_cancelable( t_cancel );
+    t_handler.add_cancelable( t_cwrap );
+
+    SECTION( "canceling" )
+    {
+        t_handler.cancel_all( 0 );
+        REQUIRE( t_cancel.is_canceled() );
+    }
+
+    SECTION( "terminating" )
+    {
+        t_handler.exit( 0 );
+        REQUIRE( t_cancel.is_canceled() );
+    }
+
+    // delete the cancelable_wrapper, which removes it from the signal_handler
+    t_cwrap.reset();
+
+    SECTION( "not canceling" )
+    {
+        t_handler.cancel_all( 0 );
+        REQUIRE_FALSE( t_cancel.is_canceled() );
+    }
+
+}
diff --git a/Src/Scarab/testing/test_time.cc b/Src/Scarab/testing/test_time.cc
new file mode 100644
index 0000000..af9264e
--- /dev/null
+++ b/Src/Scarab/testing/test_time.cc
@@ -0,0 +1,18 @@
+/*
+ * test_time.cc
+ *
+ *  Created on: Jan 15, 2018
+ *      Author: obla999
+ */
+
+#include "time.hh"
+
+#include "catch.hpp"
+
+#include <regex>
+
+TEST_CASE( "time", "[utility]" )
+{
+    std::regex t_regex( "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]+Z" );
+    REQUIRE( std::regex_match( scarab::get_formatted_now(), t_regex ) );
+}
diff --git a/Src/Scarab/testing/test_verbosity.cc b/Src/Scarab/testing/test_verbosity.cc
new file mode 100644
index 0000000..992b84d
--- /dev/null
+++ b/Src/Scarab/testing/test_verbosity.cc
@@ -0,0 +1,78 @@
+/*
+ * test_verbosity.cc
+ *
+ *  Created on: Mar 31, 2020
+ *      Author: N.S. Oblath
+ */
+
+#include "application.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "verbosity", "[cli][logger]" )
+{
+    LOGGER( tlog, "test_verbosity" );
+
+    scarab::main_app t_app;
+
+    // test default verbosity
+    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eProg );
+
+    // test increasing verbosity
+    t_app.increase_global_verbosity( 1 );
+    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eInfo );
+
+    // test increasing past the end
+    t_app.increase_global_verbosity( 10 );
+    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eTrace );
+
+    // test decreasing past the beginning
+    t_app.decrease_global_verbosity( 100 );
+    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eFatal );
+
+    // test setting verbosity
+    t_app.set_global_verbosity( 30 );
+    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eWarn );
+
+    // test decreasing past the beginning
+    t_app.set_global_verbosity( 100 );
+    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eFatal );
+
+}
+/*
+using namespace scarab;
+
+LOGGER( tlog, "test_verbosity" );
+
+int main()
+{
+    main_app t_app;
+
+    // test default verbosity
+    LPROG( tlog, "Verbosity should be PROG (" << static_cast<unsigned>(logger::ELevel::eProg) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
+
+    // test increasing verbosity
+    t_app.increase_global_verbosity( 1 );
+    LINFO( tlog, "Verbosity should be INFO (" << static_cast<unsigned>(logger::ELevel::eInfo) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
+
+    // test increasing past the end
+    t_app.increase_global_verbosity( 10 );
+    LTRACE( tlog, "Verbosity should be TRACE (" << static_cast<unsigned>(logger::ELevel::eTrace) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
+
+    // test decreasing past the beginning
+    t_app.decrease_global_verbosity( 100 );
+    LFATAL( tlog, "Verbosity should be FATAL (" << static_cast<unsigned>(logger::ELevel::eFatal) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
+
+    // test setting verbosity
+    t_app.set_global_verbosity( 30 );
+    LWARN( tlog, "Verbosity should be WARN (" << static_cast<unsigned>(logger::ELevel::eWarn) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
+
+    // test decreasing past the beginning
+    t_app.set_global_verbosity( 100 );
+    LFATAL( tlog, "Verbosity should be FATAL (" << static_cast<unsigned>(logger::ELevel::eFatal) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
+
+    return 0;
+}
+*/
+
diff --git a/Src/Scarab/testing/test_yaml.cc b/Src/Scarab/testing/test_yaml.cc
new file mode 100644
index 0000000..d0b009e
--- /dev/null
+++ b/Src/Scarab/testing/test_yaml.cc
@@ -0,0 +1,74 @@
+/*
+ * test_yaml.cc
+ *
+ *  Created on: Jul 18, 2018
+ *      Author: N.S. Oblath
+ *
+ */
+
+#include "param.hh"
+#include "param_yaml.hh"
+
+#include "catch.hpp"
+
+#include <iostream>
+
+
+using scarab::param_node;
+using scarab::param_value;
+using scarab::param_array;
+using scarab::param_ptr_t;
+using scarab::param_output_yaml;
+using scarab::param_input_yaml;
+
+TEST_CASE( "yaml", "[param][param_codec]" )
+{
+    param_ptr_t t_input( new param_node() );
+    param_node& t_input_node = t_input->as_node();
+
+    t_input_node.add( "string", "hello, world" );
+    
+    param_array t_input_array;
+    t_input_array.push_back( 10 );
+    t_input_array.push_back( "I'm in an array!" );
+
+    param_node t_input_nested_node;
+    t_input_nested_node.add( "first", "abcdefg" );
+    t_input_nested_node.add( "second", "hijklmnop" );
+    t_input_nested_node.add( "third", "qrstuv" );
+    t_input_nested_node.add( "fourth", "wxyz" );
+
+    t_input_node.add( "array", std::move(t_input_array) );
+    t_input_node.add( "node", std::move(t_input_nested_node) );
+
+    param_output_yaml t_writer;
+    std::string t_written;
+    t_writer.write_string( *t_input, t_written );
+
+    param_input_yaml t_reader;
+    param_ptr_t t_output( t_reader.read_string( t_written ) );
+
+    REQUIRE( t_output->is_node() );
+    param_node& t_output_node = t_input->as_node();
+
+    REQUIRE( t_output_node.size() == 3 );
+
+    REQUIRE( t_output_node.has("string") );
+    REQUIRE( t_output_node["string"].is_value() );
+    REQUIRE( t_output_node["string"]().as_string() == "hello, world" );
+
+    REQUIRE( t_output_node.has("array") );
+    REQUIRE( t_output_node["array"].is_array() );
+    REQUIRE( t_output_node["array"].as_array().size() == 2 );
+    REQUIRE( t_output_node["array"][0].is_value() );
+    REQUIRE( t_output_node["array"][0]().as_uint() == 10 );
+    REQUIRE( t_output_node["array"][1].is_value() );
+    REQUIRE( t_output_node["array"][1]().as_string() == "I'm in an array!" );
+
+    REQUIRE( t_output_node.has("node") );
+    REQUIRE( t_output_node["node"].is_node() );
+    REQUIRE( t_output_node["node"].as_node().size() == 4 );
+    REQUIRE( t_output_node["node"]["first"]().as_string() == "abcdefg" );
+    REQUIRE( t_output_node["node"]["second"].is_value() );
+    REQUIRE( t_output_node["node"]["second"]().as_string() == "hijklmnop" );
+}
diff --git a/Src/Scarab/testing/use_catch.cc b/Src/Scarab/testing/use_catch.cc
new file mode 100644
index 0000000..e4fe336
--- /dev/null
+++ b/Src/Scarab/testing/use_catch.cc
@@ -0,0 +1,10 @@
+/*
+ * use_catch.cc
+ *
+ *  Created on: Jul 7, 2020
+ *      Author: N.S. Oblath
+ */
+
+// Tells Catch to provide a main()
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git a/cmake/Nymph.cmake b/cmake/Nymph.cmake
index 67521d5..13dec37 100644
--- a/cmake/Nymph.cmake
+++ b/cmake/Nymph.cmake
@@ -55,6 +55,6 @@ macro (nymph_process_options)
 endmacro ()
 
 macro (nymph_build_executables)
-	add_subdirectory (${NYMPH_DIR}/Cpp/Executables_v1)
+	add_subdirectory (${NYMPH_DIR}/Src/Cpp/Executables_v1)
 endmacro ()
 
diff --git a/pyproject.toml b/pyproject.toml
index 1542d03..70cfe4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,6 +4,7 @@ requires = [
     "wheel",
     "cmake>=3.12",
     "pybind11>=2.3.0",
-
+    "PyYAML",
+    "python-rapidjson",
 ]
 build-backend = "setuptools.build_meta"
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 20aaaaf..878115a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,11 +2,11 @@
 name = nymph
 version = 2.0.0
 author = Project 8
-
+author_email = project8xperiment@gmail.com
 description = A C++/python based data analysis framework.
 long_description = file: README.md 
 url = https://github.com/project8/nymph
-classsifiers = 
+classifiers = 
     License :: Other/Proprietary License
     Operating System :: MacOS
     Operating System :: Unix
@@ -14,10 +14,11 @@ classsifiers =
     Programming Language :: Python
 
 [options]
+zip_safe = False
 package_dir =
-    = Python
+    = Src/Python
 packages = find:
-python_requiires = >= 3.6
+python_requires = >=3.6
 
 [options.packages.find]
-where = Python
\ No newline at end of file
+where = Src/Python
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 1f82fe1..4f1a7a8 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ class CMakeExtension(Extension):
     def __init__(self, name, sourcedir=''):
         Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
+        print(self.sourcedir)
 
 
 class CMakeBuild(build_ext):
@@ -43,9 +44,8 @@ def build_extension(self, ext):
         #cfg = 'DEBUG'
         build_args = ['--config', cfg]
 
-        else:
-            cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
-            build_args += ['--', '-j2', 'VERBOSE=1']
+        cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
+        build_args += ['--', '-j2',]
 
         env = os.environ.copy()
         env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
@@ -64,40 +64,16 @@ def build_extension(self, ext):
         #subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
         subprocess.check_call(['make', 'install', 'VERBOSE=1'], cwd=self.build_temp)
 
-'''
-requirements = [
-    'PyYAML',
-    'asteval',
-    'setuptools_scm',
-    #these two for postgreSQL, move to plugin?
-    'sqlalchemy',
-    'psycopg2',
-    'colorlog', #we could make this optional if we wnat to minimize dependencies
-]
+#packages = ["nymph"] + ["nymph."+i_package for i_package in find_packages("dripline")]
+#print('packages are: {}'.format(packages))
 
-packages = ["dripline"] + ["dripline."+i_package for i_package in find_packages("dripline")]
-print('packages are: {}'.format(packages))
+if __name__ == "__main__":
 
-setup(
-    name='dripline',
-    use_scm_version={
-        "root": ".",
-        "write_to": "./dripline/version.py",
-        'version_scheme': lambda x: "v{}".format(x.tag),
-        'local_scheme': lambda x: '',
-    },
-    #version='4.0.0-beta',
-    author='us',
-    author_email='driplineorg@email.tld',
-    description='a description would be good',
-    long_description='',
-    setup_requires=["pytest-runner"],
-    tests_require=["pytest"],
-    ext_modules=[CMakeExtension('dripline_python')],
-    cmdclass=dict(build_ext=CMakeBuild),
-    zip_safe=False,
-    install_requires=requirements,
-    packages=packages,
-    scripts=["bin/dl-serve"]
-)
-'''
\ No newline at end of file
+    setup(
+
+        ext_modules=[CMakeExtension('nymph', sourcedir='')],
+        cmdclass=dict(build_ext=CMakeBuild),
+        #install_requires=requirements,
+        #packages=packages,
+        #scripts=["bin/dl-serve"]
+    )

From c18275819237b4007f5b2c6763d694d5dfd5dcd5 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Fri, 11 Mar 2022 09:20:23 -0500
Subject: [PATCH 301/521] python build now completes

---
 .gitignore                                    |     4 +
 .gitmodules                                   |     8 +-
 CMakeLists.txt                                |    17 +-
 .../Executables_v1/Main/CMakeLists.txt        |     0
 .../Executables_v1/Main/ConfigCheck.cc        |     0
 {Src/Cpp => Cpp}/Executables_v1/Main/Nymph.cc |     0
 .../Executables_v1/Validation/CMakeLists.txt  |     0
 .../ConfigFiles/TestConfigurator.json         |     0
 .../ConfigFiles/TestParameterStoreConfig.json |     0
 .../Executables_v1/Validation/KTJSONReader.cc |     0
 .../Executables_v1/Validation/KTJSONReader.hh |     0
 .../Validation/KTJSONTypeWriterValidation.cc  |     0
 .../Validation/KTJSONTypeWriterValidation.hh  |     0
 .../Validation/KTPyTestClass.cc               |     0
 .../Validation/KTPyTestClass.hh               |     0
 .../Validation/KTPyTestClassPybind.hh         |     0
 .../KTRegisterNymphValidationExtData.hh       |     0
 .../Validation/KTTestConfigurable.cc          |     0
 .../Validation/KTTestConfigurable.hh          |     0
 .../Executables_v1/Validation/KTTestCuts.cc   |     0
 .../Executables_v1/Validation/KTTestCuts.hh   |     0
 .../Executables_v1/Validation/KTTestData.cc   |     0
 .../Executables_v1/Validation/KTTestData.hh   |     0
 .../Validation/KTTestDataPrimaryProcessor.cc  |     0
 .../Validation/KTTestDataPrimaryProcessor.hh  |     0
 .../Validation/KTTestPrimaryProcessor.cc      |     0
 .../Validation/KTTestPrimaryProcessor.hh      |     0
 .../Validation/KTTestProcessor.cc             |     0
 .../Validation/KTTestProcessor.hh             |     0
 .../Validation/NymphValidationPybind.cc       |     0
 .../Validation/TestApplication.cc             |     0
 .../Executables_v1/Validation/TestApplyCut.cc |     0
 .../Validation/TestCacheDirectory.cc          |     0
 .../Executables_v1/Validation/TestCut.cc      |     0
 .../Validation/TestCutFilter.cc               |     0
 .../Executables_v1/Validation/TestData.cc     |     0
 .../Validation/TestExceptionInSlot.cc         |     0
 .../Executables_v1/Validation/TestExt.cc      |     0
 .../Validation/TestExtSerialization.cc        |     0
 .../Validation/TestJSONWriter.cc              |     0
 .../Validation/TestJSONWriterViaSlot.cc       |     0
 .../Executables_v1/Validation/TestLogger.cc   |     0
 .../Validation/TestParamBindings.py           |     0
 .../Validation/TestPolymorphicSlotData.cc     |     0
 .../Validation/TestPrimaryProcessor.cc        |     0
 .../TestPrimaryProcessorNoThreading.cc        |     0
 .../Validation/TestPrintData.cc               |     0
 .../Validation/TestProcessorToolbox.py        |     0
 .../TestProcessorToolbox2Threads.cc           |     0
 .../TestProcessorToolboxMultithreaded.cc      |     0
 .../TestProcessorToolboxSinglethreaded.cc     |     0
 .../Validation/TestPyTestClass.py             |     0
 .../Validation/TestPythonBasics.hh            |     0
 .../Validation/TestPythonBasics.py            |     0
 .../Validation/TestSerialization.cc           |     0
 .../Validation/TestSignalsAndSlots.cc         |     0
 .../Executables_v1/Validation/TestSlotData.cc |     0
 .../Validation/TestThroughputProfiler.cc      |     0
 .../Validation/TestUseBreakpoint.cc           |     0
 .../Validation/TestWrapProcessor.py           |     0
 {Src/Cpp => Cpp}/Library/CMakeLists.txt       |     0
 .../Library/Control/ControlAccess.cc          |     0
 .../Library/Control/ControlAccess.hh          |     0
 .../Cpp => Cpp}/Library/Control/Controller.cc |     0
 .../Cpp => Cpp}/Library/Control/Controller.hh |     0
 .../Library/Control/ControllerInterface.cc    |     0
 .../Library/Control/ControllerInterface.hh    |     0
 .../Library/Control/ReturnBuffer.cc           |     0
 .../Library/Control/ReturnBuffer.hh           |     0
 .../Library/Control/SingleRunController.cc    |     0
 .../Library/Control/SingleRunController.hh    |     0
 {Src/Cpp => Cpp}/Library/Data/Data.cc         |     0
 {Src/Cpp => Cpp}/Library/Data/Data.hh         |     0
 {Src/Cpp => Cpp}/Library/Data/DataFrame.cc    |     0
 {Src/Cpp => Cpp}/Library/Data/DataFrame.hh    |     0
 {Src/Cpp => Cpp}/Library/Data/DataManager.cc  |     0
 {Src/Cpp => Cpp}/Library/Data/DataManager.hh  |     0
 .../Library/Processor/PrimaryProcessor.cc     |     0
 .../Library/Processor/PrimaryProcessor.hh     |     0
 .../Library/Processor/Processor.cc            |     0
 .../Library/Processor/Processor.hh            |     0
 .../Library/Processor/ProcessorToolbox.cc     |     0
 .../Library/Processor/ProcessorToolbox.hh     |     0
 .../Library/Processor/QuitChain.hh            |     0
 {Src/Cpp => Cpp}/Library/Processor/Signal.hh  |     0
 .../Library/Processor/SignalSlotBase.cc       |     0
 .../Library/Processor/SignalSlotBase.hh       |     0
 {Src/Cpp => Cpp}/Library/Processor/Slot.hh    |     0
 {Src/Cpp => Cpp}/Library/Utility/Exception.cc |     0
 {Src/Cpp => Cpp}/Library/Utility/Exception.hh |     0
 .../Library/Utility/MemberVariable.hh         |     0
 .../Library_v1/AddLibPythonPath.sh.in         |     0
 .../Library_v1/Application/KTApplication.cc   |     0
 .../Library_v1/Application/KTApplication.hh   |     0
 .../Application/KTCommandLineHandler.cc       |     0
 .../Application/KTCommandLineHandler.hh       |     0
 .../Application/KTCommandLineOption.hh        |     0
 .../Library_v1/Application/KTConfigurator.cc  |     0
 .../Library_v1/Application/KTConfigurator.hh  |     0
 .../Application/KTDataQueueProcessor.cc       |     0
 .../Application/KTDataQueueProcessor.hh       |     0
 .../Application/KTFilenameParsers.cc          |     0
 .../Application/KTFilenameParsers.hh          |     0
 .../Application/KTPrintDataStructure.cc       |     0
 .../Application/KTPrintDataStructure.hh       |     0
 .../Application/KTProcessorToolbox.cc         |     0
 .../Application/KTProcessorToolbox.hh         |     0
 .../Application/KTProcessorToolboxPybind.hh   |     0
 .../Library_v1/Application/KTRunNymph.cc      |     0
 .../Library_v1/Application/KTRunNymph.hh      |     0
 .../Application/KTThroughputProfiler.cc       |     0
 .../Application/KTThroughputProfiler.hh       |     0
 {Src/Cpp => Cpp}/Library_v1/CMakeLists.txt    |     0
 .../Cpp => Cpp}/Library_v1/Data/KTApplyCut.cc |     0
 .../Cpp => Cpp}/Library_v1/Data/KTApplyCut.hh |     0
 .../Cpp => Cpp}/Library_v1/Data/KTCoreData.cc |     0
 .../Cpp => Cpp}/Library_v1/Data/KTCoreData.hh |     0
 {Src/Cpp => Cpp}/Library_v1/Data/KTCut.cc     |     0
 {Src/Cpp => Cpp}/Library_v1/Data/KTCut.hh     |     0
 .../Library_v1/Data/KTCutFilter.cc            |     0
 .../Library_v1/Data/KTCutFilter.hh            |     0
 .../Library_v1/Data/KTCutResult.hh            |     0
 .../Library_v1/Data/KTCutStatus.cc            |     0
 .../Library_v1/Data/KTCutStatus.hh            |     0
 {Src/Cpp => Cpp}/Library_v1/Data/KTData.cc    |     0
 {Src/Cpp => Cpp}/Library_v1/Data/KTData.hh    |     0
 .../Library_v1/Data/KTRegisterNymphExtData.hh |     0
 {Src/Cpp => Cpp}/Library_v1/Data/KTTester.cc  |     0
 {Src/Cpp => Cpp}/Library_v1/Data/KTTester.hh  |     0
 .../Cpp => Cpp}/Library_v1/IO/KTJSONWriter.cc |     0
 .../Cpp => Cpp}/Library_v1/IO/KTJSONWriter.hh |     0
 {Src/Cpp => Cpp}/Library_v1/IO/KTReader.cc    |     0
 {Src/Cpp => Cpp}/Library_v1/IO/KTReader.hh    |     0
 {Src/Cpp => Cpp}/Library_v1/IO/KTWriter.cc    |     0
 {Src/Cpp => Cpp}/Library_v1/IO/KTWriter.hh    |     0
 {Src/Cpp => Cpp}/Library_v1/NymphPybind.cc    |     0
 .../Library_v1/Processor/KTConnection.hh      |     0
 .../Library_v1/Processor/KTNymphSignals.hh    |     0
 .../Library_v1/Processor/KTNymphSlot.hh       |     0
 .../Processor/KTPrimaryProcessor.cc           |     0
 .../Processor/KTPrimaryProcessor.hh           |     0
 .../Library_v1/Processor/KTProcessor.cc       |     0
 .../Library_v1/Processor/KTProcessor.hh       |     0
 .../Library_v1/Processor/KTProcessorPybind.cc |     0
 .../Library_v1/Processor/KTProcessorPybind.hh |     0
 .../Library_v1/Processor/KTPyProcessor.hh     |     0
 .../Library_v1/Processor/KTSignal.hh          |     0
 .../Library_v1/Processor/KTSignalSlotBase.hh  |     0
 .../Library_v1/Processor/KTSignalWrapper.cc   |     0
 .../Library_v1/Processor/KTSignalWrapper.hh   |     0
 .../Library_v1/Processor/KTSlot.hh            |     0
 .../Library_v1/Processor/KTSlotWrapper.cc     |     0
 .../Library_v1/Processor/KTSlotWrapper.hh     |     0
 .../Library_v1/Processor/KTThreadReference.cc |     0
 .../Library_v1/Processor/KTThreadReference.hh |     0
 .../Library_v1/Utility/KTCacheDirectory.cc    |     0
 .../Library_v1/Utility/KTCacheDirectory.hh    |     0
 .../Library_v1/Utility/KTConcurrentQueue.hh   |     0
 .../Library_v1/Utility/KTConfigurable.cc      |     0
 .../Library_v1/Utility/KTConfigurable.hh      |     0
 .../Utility/KTConfigurablePybind.hh           |     0
 .../Library_v1/Utility/KTDirectory.cc         |     0
 .../Library_v1/Utility/KTDirectory.hh         |     0
 .../Library_v1/Utility/KTEventLoop.cc         |     0
 .../Library_v1/Utility/KTEventLoop.hh         |     0
 .../Library_v1/Utility/KTException.cc         |     0
 .../Library_v1/Utility/KTException.hh         |     0
 .../Library_v1/Utility/KTExtensible.hh        |     0
 .../Library_v1/Utility/KTExtensibleStruct.hh  |     0
 .../Utility/KTExtensibleStructFactory.hh      |     0
 .../Library_v1/Utility/KTLogger.hh            |     0
 .../Library_v1/Utility/KTMemberVariable.hh    |     0
 .../Library_v1/Utility/KTParamPybind.hh       |     0
 .../Library_v1/Utility/KTPythonMacros.hh      |     0
 .../Library_v1/Utility/KTTIFactory.hh         |     0
 {Src/Cpp => Cpp}/Library_v1/Utility/KTTime.cc |     0
 {Src/Cpp => Cpp}/Library_v1/Utility/KTTime.hh |     0
 .../Templates/KTProcessorTemplate.cc          |     0
 .../Templates/KTProcessorTemplate.hh          |     0
 {Src/Cpp => Cpp}/Templates/MainCMakeLists.txt |     0
 External/cereal                               |     1 +
 MANIFEST.in                                   |     7 +-
 NymphConfig.cmake.in                          |     2 +-
 {Src/Python => Python}/CMakeLists.txt         |    10 +-
 {Src/Python => Python}/README.md              |     0
 {Src/Python => Python}/nymph/__init__.py      |     0
 Scarab                                        |     1 +
 Src/External/cereal/.gitignore                |    49 -
 Src/External/cereal/.travis.yml               |    39 -
 Src/External/cereal/CMakeLists.txt            |    66 -
 Src/External/cereal/LICENSE                   |    24 -
 Src/External/cereal/README.md                 |    85 -
 Src/External/cereal/appveyor.yml              |    35 -
 Src/External/cereal/doc/CMakeLists.txt        |    18 -
 Src/External/cereal/doc/DoxygenLayout.xml     |   190 -
 Src/External/cereal/doc/doxygen.in            |  1870 --
 Src/External/cereal/doc/footer.html           |    31 -
 Src/External/cereal/doc/mainpage.dox          |    47 -
 Src/External/cereal/include/cereal/access.hpp |   448 -
 .../include/cereal/archives/adapters.hpp      |   163 -
 .../cereal/include/cereal/archives/binary.hpp |   169 -
 .../cereal/include/cereal/archives/json.hpp   |   981 -
 .../cereal/archives/portable_binary.hpp       |   334 -
 .../cereal/include/cereal/archives/xml.hpp    |   897 -
 Src/External/cereal/include/cereal/cereal.hpp |   987 -
 .../cereal/include/cereal/details/helpers.hpp |   383 -
 .../cereal/details/polymorphic_impl.hpp       |   764 -
 .../cereal/details/polymorphic_impl_fwd.hpp   |    65 -
 .../include/cereal/details/static_object.hpp  |   127 -
 .../cereal/include/cereal/details/traits.hpp  |  1389 --
 .../cereal/include/cereal/details/util.hpp    |    84 -
 .../cereal/include/cereal/external/base64.hpp |   127 -
 .../cereal/external/rapidjson/allocators.h    |   271 -
 .../cereal/external/rapidjson/document.h      |  2575 ---
 .../cereal/external/rapidjson/encodedstream.h |   299 -
 .../cereal/external/rapidjson/encodings.h     |   716 -
 .../cereal/external/rapidjson/error/en.h      |    74 -
 .../cereal/external/rapidjson/error/error.h   |   155 -
 .../external/rapidjson/filereadstream.h       |    99 -
 .../external/rapidjson/filewritestream.h      |   104 -
 .../include/cereal/external/rapidjson/fwd.h   |   151 -
 .../external/rapidjson/internal/biginteger.h  |   290 -
 .../external/rapidjson/internal/diyfp.h       |   258 -
 .../cereal/external/rapidjson/internal/dtoa.h |   245 -
 .../external/rapidjson/internal/ieee754.h     |    78 -
 .../cereal/external/rapidjson/internal/itoa.h |   304 -
 .../cereal/external/rapidjson/internal/meta.h |   181 -
 .../external/rapidjson/internal/pow10.h       |    55 -
 .../external/rapidjson/internal/regex.h       |   701 -
 .../external/rapidjson/internal/stack.h       |   230 -
 .../external/rapidjson/internal/strfunc.h     |    55 -
 .../external/rapidjson/internal/strtod.h      |   269 -
 .../cereal/external/rapidjson/internal/swap.h |    46 -
 .../external/rapidjson/istreamwrapper.h       |   116 -
 .../cereal/external/rapidjson/memorybuffer.h  |    70 -
 .../cereal/external/rapidjson/memorystream.h  |    76 -
 .../external/rapidjson/msinttypes/inttypes.h  |   316 -
 .../external/rapidjson/msinttypes/stdint.h    |   300 -
 .../external/rapidjson/ostreamwrapper.h       |    81 -
 .../cereal/external/rapidjson/pointer.h       |  1358 --
 .../cereal/external/rapidjson/prettywriter.h  |   255 -
 .../cereal/external/rapidjson/rapidjson.h     |   615 -
 .../cereal/external/rapidjson/reader.h        |  1879 --
 .../cereal/external/rapidjson/schema.h        |  2006 --
 .../cereal/external/rapidjson/stream.h        |   179 -
 .../cereal/external/rapidjson/stringbuffer.h  |   117 -
 .../cereal/external/rapidjson/writer.h        |   610 -
 .../cereal/external/rapidxml/license.txt      |    52 -
 .../cereal/external/rapidxml/manual.html      |   406 -
 .../cereal/external/rapidxml/rapidxml.hpp     |  2624 ---
 .../external/rapidxml/rapidxml_iterators.hpp  |   175 -
 .../external/rapidxml/rapidxml_print.hpp      |   426 -
 .../external/rapidxml/rapidxml_utils.hpp      |   123 -
 Src/External/cereal/include/cereal/macros.hpp |   135 -
 .../cereal/include/cereal/types/array.hpp     |    79 -
 .../include/cereal/types/base_class.hpp       |   201 -
 .../cereal/include/cereal/types/bitset.hpp    |   176 -
 .../include/cereal/types/boost_variant.hpp    |   106 -
 .../cereal/include/cereal/types/chrono.hpp    |    72 -
 .../cereal/include/cereal/types/common.hpp    |   129 -
 .../cereal/include/cereal/types/complex.hpp   |    56 -
 .../concepts/pair_associative_container.hpp   |    73 -
 .../cereal/include/cereal/types/deque.hpp     |    62 -
 .../include/cereal/types/forward_list.hpp     |    68 -
 .../include/cereal/types/functional.hpp       |    43 -
 .../cereal/include/cereal/types/list.hpp      |    62 -
 .../cereal/include/cereal/types/map.hpp       |    36 -
 .../cereal/include/cereal/types/memory.hpp    |   425 -
 .../include/cereal/types/polymorphic.hpp      |   481 -
 .../cereal/include/cereal/types/queue.hpp     |   132 -
 .../cereal/include/cereal/types/set.hpp       |   103 -
 .../cereal/include/cereal/types/stack.hpp     |    76 -
 .../cereal/include/cereal/types/string.hpp    |    61 -
 .../cereal/include/cereal/types/tuple.hpp     |   123 -
 .../include/cereal/types/unordered_map.hpp    |    36 -
 .../include/cereal/types/unordered_set.hpp    |    99 -
 .../cereal/include/cereal/types/utility.hpp   |    47 -
 .../cereal/include/cereal/types/valarray.hpp  |    89 -
 .../cereal/include/cereal/types/vector.hpp    |   112 -
 Src/External/cereal/sandbox/CMakeLists.txt    |    17 -
 Src/External/cereal/sandbox/performance.cpp   |   469 -
 Src/External/cereal/sandbox/sandbox.cpp       |   820 -
 Src/External/cereal/sandbox/sandbox_json.cpp  |   446 -
 Src/External/cereal/sandbox/sandbox_rtti.cpp  |   231 -
 .../sandbox/sandbox_shared_lib/CMakeLists.txt |     1 -
 .../sandbox/sandbox_shared_lib/base.cpp       |     9 -
 .../sandbox/sandbox_shared_lib/base.hpp       |    43 -
 .../sandbox/sandbox_shared_lib/derived.cpp    |    10 -
 .../sandbox/sandbox_shared_lib/derived.hpp    |    19 -
 Src/External/cereal/sandbox/sandbox_vs.cpp    |   278 -
 .../cereal/scripts/add_rapidjson_prefix.sh    |     4 -
 Src/External/cereal/scripts/appveyor.bat      |    75 -
 Src/External/cereal/scripts/renameincludes.sh |    12 -
 Src/External/cereal/scripts/updatecoverage.sh |    33 -
 Src/External/cereal/scripts/updatedoc.in      |    25 -
 Src/External/cereal/unittests/CMakeLists.txt  |    92 -
 Src/External/cereal/unittests/array.cpp       |    52 -
 Src/External/cereal/unittests/array.hpp       |    95 -
 .../cereal/unittests/basic_string.cpp         |   171 -
 .../cereal/unittests/basic_string.hpp         |   114 -
 Src/External/cereal/unittests/bitset.cpp      |    52 -
 Src/External/cereal/unittests/bitset.hpp      |    87 -
 .../cereal/unittests/boost_variant.cpp        |    52 -
 .../cereal/unittests/boost_variant.hpp        |    70 -
 Src/External/cereal/unittests/chrono.cpp      |    52 -
 Src/External/cereal/unittests/chrono.hpp      |   105 -
 .../unittests/cmake-config-module.cmake       |   123 -
 Src/External/cereal/unittests/common.hpp      |   223 -
 Src/External/cereal/unittests/complex.cpp     |    52 -
 Src/External/cereal/unittests/complex.hpp     |    77 -
 Src/External/cereal/unittests/deque.cpp       |    52 -
 Src/External/cereal/unittests/deque.hpp       |   101 -
 Src/External/cereal/unittests/doctest.h       |  3374 ---
 .../cereal/unittests/forward_list.cpp         |    52 -
 .../cereal/unittests/forward_list.hpp         |    95 -
 Src/External/cereal/unittests/list.cpp        |    52 -
 Src/External/cereal/unittests/list.hpp        |    95 -
 .../cereal/unittests/load_construct.cpp       |    52 -
 .../cereal/unittests/load_construct.hpp       |   260 -
 Src/External/cereal/unittests/map.cpp         |    72 -
 Src/External/cereal/unittests/map.hpp         |   169 -
 Src/External/cereal/unittests/memory.cpp      |    72 -
 Src/External/cereal/unittests/memory.hpp      |   116 -
 .../cereal/unittests/memory_cycles.cpp        |    52 -
 .../cereal/unittests/memory_cycles.hpp        |   142 -
 Src/External/cereal/unittests/multimap.cpp    |    52 -
 Src/External/cereal/unittests/multimap.hpp    |   129 -
 Src/External/cereal/unittests/multiset.cpp    |    52 -
 Src/External/cereal/unittests/multiset.hpp    |   134 -
 Src/External/cereal/unittests/pair.cpp        |    51 -
 Src/External/cereal/unittests/pair.hpp        |    92 -
 Src/External/cereal/unittests/pod.cpp         |    52 -
 Src/External/cereal/unittests/pod.hpp         |   147 -
 Src/External/cereal/unittests/polymorphic.cpp |    74 -
 Src/External/cereal/unittests/polymorphic.hpp |   359 -
 .../cereal/unittests/portability_test.cpp     |   202 -
 .../unittests/portable_binary_archive.cpp     |   134 -
 .../unittests/portable_binary_archive.hpp     |   156 -
 .../cereal/unittests/priority_queue.cpp       |    52 -
 .../cereal/unittests/priority_queue.hpp       |   107 -
 Src/External/cereal/unittests/queue.cpp       |    52 -
 Src/External/cereal/unittests/queue.hpp       |   107 -
 .../unittests/run_portability_test.cmake      |    16 -
 Src/External/cereal/unittests/run_valgrind.sh |    10 -
 Src/External/cereal/unittests/set.cpp         |    52 -
 Src/External/cereal/unittests/set.hpp         |    95 -
 Src/External/cereal/unittests/stack.cpp       |    52 -
 Src/External/cereal/unittests/stack.hpp       |   107 -
 Src/External/cereal/unittests/structs.cpp     |    52 -
 Src/External/cereal/unittests/structs.hpp     |    68 -
 .../cereal/unittests/structs_minimal.cpp      |    52 -
 .../cereal/unittests/structs_minimal.hpp      |   254 -
 .../cereal/unittests/structs_specialized.cpp  |    52 -
 .../cereal/unittests/structs_specialized.hpp  |   461 -
 Src/External/cereal/unittests/tuple.cpp       |    52 -
 Src/External/cereal/unittests/tuple.hpp       |   101 -
 .../cereal/unittests/unordered_loads.cpp      |    42 -
 .../cereal/unittests/unordered_loads.hpp      |   149 -
 .../cereal/unittests/unordered_map.cpp        |    52 -
 .../cereal/unittests/unordered_map.hpp        |   124 -
 .../cereal/unittests/unordered_multimap.cpp   |    52 -
 .../cereal/unittests/unordered_multimap.hpp   |   155 -
 .../cereal/unittests/unordered_multiset.cpp   |    52 -
 .../cereal/unittests/unordered_multiset.hpp   |   134 -
 .../cereal/unittests/unordered_set.cpp        |    52 -
 .../cereal/unittests/unordered_set.hpp        |   114 -
 .../cereal/unittests/user_data_adapters.cpp   |    52 -
 .../cereal/unittests/user_data_adapters.hpp   |   120 -
 Src/External/cereal/unittests/valarray.cpp    |    52 -
 Src/External/cereal/unittests/valarray.hpp    |   101 -
 Src/External/cereal/unittests/vector.cpp      |    52 -
 Src/External/cereal/unittests/vector.hpp      |   110 -
 Src/External/cereal/unittests/versioning.cpp  |    74 -
 Src/External/cereal/unittests/versioning.hpp  |   217 -
 Src/External/cereal/vs2013/.gitignore         |     3 -
 .../cereal/vs2013/sandbox/sandbox.vcxproj     |   256 -
 .../vs2013/sandbox/sandbox.vcxproj.filters    |    22 -
 .../vs2013/sandbox_json/sandbox_json.vcxproj  |   248 -
 .../sandbox_json/sandbox_json.vcxproj.filters |    22 -
 .../vs2013/sandbox_rtti/sandbox_rtti.vcxproj  |   252 -
 .../sandbox_rtti/sandbox_rtti.vcxproj.filters |    22 -
 .../vs2013/sandbox_vs/sandbox_vs.vcxproj      |   266 -
 .../sandbox_vs/sandbox_vs.vcxproj.filters     |    22 -
 .../sandbox_vs_dll/sandbox_vs_dll.vcxproj     |   261 -
 .../sandbox_vs_dll.vcxproj.filters            |    33 -
 Src/External/cereal/vs2013/unittests/main.cpp |    30 -
 .../cereal/vs2013/unittests/unittests.vcxproj |   327 -
 .../unittests/unittests.vcxproj.filters       |   127 -
 Src/External/cereal/vs2013/vs2013.sln         |   147 -
 Src/Scarab/.github/workflows/run_tests.yaml   |    69 -
 Src/Scarab/.gitignore                         |    13 -
 Src/Scarab/.gitmodules                        |     0
 Src/Scarab/.travis.yml                        |    74 -
 Src/Scarab/AUTHORS                            |    12 -
 Src/Scarab/CMakeLists.txt                     |   181 -
 Src/Scarab/LICENSE                            |    28 -
 Src/Scarab/README.md                          |    16 -
 Src/Scarab/ScarabConfig.cmake.in              |    29 -
 Src/Scarab/VERSION                            |     1 -
 Src/Scarab/cmake/FindEigen3.cmake             |    80 -
 Src/Scarab/cmake/FindFFTW.cmake               |   163 -
 Src/Scarab/cmake/FindSphinx.cmake             |    14 -
 Src/Scarab/cmake/GetVersion.cmake             |    33 -
 Src/Scarab/cmake/PackageBuilder.cmake         |   171 -
 Src/Scarab/cmake/PackageBuilderMacros.cmake   |   541 -
 Src/Scarab/documentation/README.md            |    24 -
 .../documentation/application_building.rst    |   223 -
 Src/Scarab/documentation/cpp/Doxyfile         |  1534 --
 Src/Scarab/documentation/cpp/README.md        |    57 -
 .../cpp/Scarab_CMakeOverview.rst              |     2 -
 .../cpp/Scarab_LibraryOverview.rst            |    34 -
 Src/Scarab/documentation/cpp/conf.py          |   317 -
 .../documentation/cpp/doxfiles/mainpage.dox   |     5 -
 Src/Scarab/documentation/cpp/favicon.ico      |   Bin 1150 -> 0 bytes
 Src/Scarab/documentation/cpp/index.rst        |    12 -
 Src/Scarab/documentation/cpp/requirements.txt |     1 -
 .../documentation/cpp/scarab_logo_small.png   |   Bin 4236 -> 0 bytes
 Src/Scarab/documentation/package_builder.rst  |   336 -
 Src/Scarab/documentation/python/README.md     |    77 -
 .../documentation/python/_templates/README.md |     3 -
 .../python/_templates/module.rst              |    79 -
 .../python/_templates/package.rst             |    89 -
 Src/Scarab/documentation/python/conf.py       |   298 -
 Src/Scarab/documentation/python/index.rst     |     9 -
 Src/Scarab/executables/CMakeLists.txt         |    27 -
 Src/Scarab/executables/scarab-parse.cc        |   106 -
 Src/Scarab/library/CMakeLists.txt             |    72 -
 Src/Scarab/library/README.md                  |    45 -
 .../library/authentication/CMakeLists.txt     |    13 -
 .../library/authentication/authentication.cc  |    94 -
 .../library/authentication/authentication.hh  |    35 -
 Src/Scarab/library/cli/CMakeLists.txt         |    15 -
 Src/Scarab/library/cli/application.cc         |   261 -
 Src/Scarab/library/cli/application.hh         |   396 -
 Src/Scarab/library/cli/nonoption_parser.cc    |    67 -
 Src/Scarab/library/cli/nonoption_parser.hh    |    33 -
 Src/Scarab/library/external/CMakeLists.txt    |    15 -
 Src/Scarab/library/external/cli11/CLI11.hpp   |  6778 ------
 Src/Scarab/library/external/date/date.h       |  8010 -------
 Src/Scarab/library/logger/CMakeLists.txt      |    13 -
 Src/Scarab/library/logger/logger.cc           |   349 -
 Src/Scarab/library/logger/logger.hh           |   445 -
 Src/Scarab/library/param/CMakeLists.txt       |    25 -
 .../library/param/codec/json/CMakeLists.txt   |    13 -
 .../library/param/codec/json/param_json.cc    |   276 -
 .../library/param/codec/json/param_json.hh    |   202 -
 .../library/param/codec/yaml/CMakeLists.txt   |    13 -
 .../library/param/codec/yaml/param_yaml.cc    |   309 -
 .../library/param/codec/yaml/param_yaml.hh    |    79 -
 Src/Scarab/library/param/param.hh             |    18 -
 Src/Scarab/library/param/param_array.cc       |   172 -
 Src/Scarab/library/param/param_array.hh       |   347 -
 Src/Scarab/library/param/param_base.cc        |    65 -
 Src/Scarab/library/param/param_base.hh        |   107 -
 Src/Scarab/library/param/param_base_impl.hh   |   173 -
 Src/Scarab/library/param/param_codec.cc       |   133 -
 Src/Scarab/library/param/param_codec.hh       |    72 -
 Src/Scarab/library/param/param_helpers.cc     |   171 -
 Src/Scarab/library/param/param_helpers.hh     |    34 -
 Src/Scarab/library/param/param_node.cc        |   149 -
 Src/Scarab/library/param/param_node.hh        |   352 -
 Src/Scarab/library/param/param_value.cc       |   187 -
 Src/Scarab/library/param/param_value.hh       |   566 -
 Src/Scarab/library/utility/CMakeLists.txt     |    58 -
 .../library/utility/_member_variables.hh.in   |   337 -
 Src/Scarab/library/utility/base_exception.hh  |   207 -
 Src/Scarab/library/utility/cancelable.cc      |    83 -
 Src/Scarab/library/utility/cancelable.hh      |   142 -
 .../library/utility/concurrent_queue.hh       |   171 -
 Src/Scarab/library/utility/destroyer.hh       |    52 -
 Src/Scarab/library/utility/digital.cc         |    46 -
 Src/Scarab/library/utility/digital.hh         |   106 -
 Src/Scarab/library/utility/error.hh           |    20 -
 .../library/utility/exponential_backoff.hh    |    87 -
 Src/Scarab/library/utility/factory.hh         |    36 -
 Src/Scarab/library/utility/indexed_factory.hh |   402 -
 Src/Scarab/library/utility/macros.hh          |    35 -
 Src/Scarab/library/utility/map_at_default.hh  |    30 -
 .../library/utility/member_variables.hh       |    94 -
 Src/Scarab/library/utility/path.cc            |    50 -
 Src/Scarab/library/utility/path.hh            |    35 -
 Src/Scarab/library/utility/scarab_api.hh      |    29 -
 Src/Scarab/library/utility/signal_handler.cc  |   464 -
 Src/Scarab/library/utility/signal_handler.hh  |   200 -
 Src/Scarab/library/utility/singleton.hh       |   147 -
 .../library/utility/thread_singleton.hh       |   149 -
 Src/Scarab/library/utility/time.cc            |    27 -
 Src/Scarab/library/utility/time.hh            |    17 -
 Src/Scarab/library/utility/typename.cc        |    66 -
 Src/Scarab/library/utility/typename.hh        |    32 -
 Src/Scarab/library/utility/unique_typelist.hh |   175 -
 Src/Scarab/library/version/CMakeLists.txt     |    25 -
 .../library/version/scarab_version.cc.in      |    34 -
 Src/Scarab/library/version/scarab_version.hh  |    25 -
 Src/Scarab/library/version/version_ifc.cc     |    28 -
 Src/Scarab/library/version/version_ifc.hh     |    45 -
 .../library/version/version_semantic.cc       |   286 -
 .../library/version/version_semantic.hh       |    92 -
 Src/Scarab/library/version/version_wrapper.hh |    84 -
 Src/Scarab/python/CMakeLists.txt              |    56 -
 Src/Scarab/python/add_lib_python_path.sh.in   |     3 -
 Src/Scarab/python/application_pybind.hh       |   136 -
 Src/Scarab/python/cancelable_pybind.hh        |    29 -
 Src/Scarab/python/param_array_pybind.hh       |   108 -
 Src/Scarab/python/param_binding_helpers.hh    |   125 -
 Src/Scarab/python/param_node_pybind.hh        |    83 -
 Src/Scarab/python/param_pybind.hh             |    76 -
 Src/Scarab/python/param_value_pybind.hh       |    77 -
 Src/Scarab/python/scarab_binding_helpers.hh   |    15 -
 Src/Scarab/python/scarab_namespace_pybind.cc  |    46 -
 Src/Scarab/python/signal_handler_pybind.hh    |    28 -
 Src/Scarab/python/version_pybind.hh           |    57 -
 Src/Scarab/testing/CMakeLists.txt             |    93 -
 Src/Scarab/testing/Doxyfile                   |  1534 --
 Src/Scarab/testing/README.md                  |    67 -
 .../testing/applications/CMakeLists.txt       |    36 -
 .../applications/test_app_with_callback.cc    |    85 -
 .../applications/test_app_with_options.cc     |    76 -
 .../applications/test_app_with_subcommands.cc |   102 -
 .../applications/test_basic_application.cc    |    56 -
 .../applications/test_raise_sigabrt.cc        |    49 -
 .../testing/applications/test_raise_sigint.cc |    36 -
 .../applications/test_raise_sigquit.cc        |    36 -
 .../applications/test_raise_sigterm.cc        |    49 -
 .../applications/test_unhandled_exception.cc  |    52 -
 Src/Scarab/testing/catch/catch.hpp            | 17758 ----------------
 Src/Scarab/testing/glob_path/README.md        |     1 -
 .../glob_path/sub1/sub1sub1/glob_sub1sub1.txt |     0
 .../glob_path/sub1/sub1sub2/glob_sub1sub2.txt |     0
 .../glob_path/sub1/sub1sub3/glob_sub1sub3.txt |     0
 .../sub2sub1sub1/glob_sub2sub1sub1_1.txt      |     0
 .../sub2sub1sub1/glob_sub2sub1sub1_2.txt      |     0
 .../sub2sub1sub1/glob_sub2sub1sub1_3.txt      |     0
 .../sub2sub1sub2/glob_sub2sub1sub2.txt        |     0
 .../sub2sub1sub3/glob_sub2sub1sub3.txt        |     0
 .../NestedPBTest/CMakeLists.txt               |   112 -
 .../NestedPBTest/NestedPBTestConfig.cmake.in  |    17 -
 .../package_builder/NestedPBTest/README.md    |    29 -
 .../NestedPBTest/create_nesting.sh.in         |    10 -
 .../executable/nested_do_print.cc             |    14 -
 .../NestedPBTest/library/nested_print.cc      |    18 -
 .../NestedPBTest/library/nested_print.hh      |    17 -
 .../package_builder/PBTest/CMakeLists.txt     |   111 -
 .../PBTest/PBTestConfig.cmake.in              |    16 -
 .../testing/package_builder/PBTest/README.md  |    29 -
 .../package_builder/PBTest/copy_scarab.sh.in  |     4 -
 .../PBTest/executable/do_print.cc             |    12 -
 .../package_builder/PBTest/library/print.cc   |    18 -
 .../package_builder/PBTest/library/print.hh   |    17 -
 Src/Scarab/testing/stream_check.cc            |    26 -
 Src/Scarab/testing/stream_check.hh            |    24 -
 Src/Scarab/testing/test_digital.cc            |   123 -
 .../testing/test_exponential_backoff.cc       |    90 -
 Src/Scarab/testing/test_json.cc               |    74 -
 Src/Scarab/testing/test_logger.cc             |    84 -
 Src/Scarab/testing/test_member_variables.cc   |    94 -
 Src/Scarab/testing/test_member_variables.hh   |   164 -
 Src/Scarab/testing/test_nonoption_parser.cc   |   106 -
 Src/Scarab/testing/test_param_array.cc        |   137 -
 Src/Scarab/testing/test_param_by_pointer.cc   |    45 -
 Src/Scarab/testing/test_param_node.cc         |    86 -
 Src/Scarab/testing/test_param_translator.cc   |    92 -
 Src/Scarab/testing/test_param_value.cc        |   183 -
 Src/Scarab/testing/test_path.cc.in            |    42 -
 Src/Scarab/testing/test_signal_handler.cc     |   147 -
 Src/Scarab/testing/test_time.cc               |    18 -
 Src/Scarab/testing/test_verbosity.cc          |    78 -
 Src/Scarab/testing/test_yaml.cc               |    74 -
 Src/Scarab/testing/use_catch.cc               |    10 -
 cmake/Nymph.cmake                             |     2 +-
 setup.cfg                                     |     4 +-
 setup.py                                      |     9 +-
 572 files changed, 33 insertions(+), 98877 deletions(-)
 rename {Src/Cpp => Cpp}/Executables_v1/Main/CMakeLists.txt (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Main/ConfigCheck.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Main/Nymph.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/CMakeLists.txt (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/ConfigFiles/TestConfigurator.json (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTJSONReader.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTJSONReader.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTJSONTypeWriterValidation.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTJSONTypeWriterValidation.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTPyTestClass.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTPyTestClass.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTPyTestClassPybind.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestConfigurable.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestConfigurable.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestCuts.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestCuts.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestData.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestData.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestPrimaryProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/KTTestProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/NymphValidationPybind.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestApplication.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestApplyCut.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestCacheDirectory.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestCut.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestCutFilter.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestData.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestExceptionInSlot.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestExt.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestExtSerialization.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestJSONWriter.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestJSONWriterViaSlot.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestLogger.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestParamBindings.py (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPolymorphicSlotData.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPrimaryProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPrintData.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestProcessorToolbox.py (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestProcessorToolbox2Threads.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPyTestClass.py (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPythonBasics.hh (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestPythonBasics.py (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestSerialization.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestSignalsAndSlots.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestSlotData.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestThroughputProfiler.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestUseBreakpoint.cc (100%)
 rename {Src/Cpp => Cpp}/Executables_v1/Validation/TestWrapProcessor.py (100%)
 rename {Src/Cpp => Cpp}/Library/CMakeLists.txt (100%)
 rename {Src/Cpp => Cpp}/Library/Control/ControlAccess.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Control/ControlAccess.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Control/Controller.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Control/Controller.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Control/ControllerInterface.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Control/ControllerInterface.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Control/ReturnBuffer.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Control/ReturnBuffer.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Control/SingleRunController.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Control/SingleRunController.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Data/Data.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Data/Data.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Data/DataFrame.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Data/DataFrame.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Data/DataManager.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Data/DataManager.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/PrimaryProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/PrimaryProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/Processor.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/Processor.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/ProcessorToolbox.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/ProcessorToolbox.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/QuitChain.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/Signal.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/SignalSlotBase.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/SignalSlotBase.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Processor/Slot.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Utility/Exception.cc (100%)
 rename {Src/Cpp => Cpp}/Library/Utility/Exception.hh (100%)
 rename {Src/Cpp => Cpp}/Library/Utility/MemberVariable.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/AddLibPythonPath.sh.in (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTApplication.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTApplication.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTCommandLineHandler.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTCommandLineHandler.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTCommandLineOption.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTConfigurator.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTConfigurator.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTDataQueueProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTDataQueueProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTFilenameParsers.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTFilenameParsers.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTPrintDataStructure.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTPrintDataStructure.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTProcessorToolbox.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTProcessorToolbox.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTProcessorToolboxPybind.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTRunNymph.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTRunNymph.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTThroughputProfiler.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Application/KTThroughputProfiler.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/CMakeLists.txt (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTApplyCut.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTApplyCut.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCoreData.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCoreData.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCut.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCut.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCutFilter.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCutFilter.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCutResult.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCutStatus.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTCutStatus.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTData.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTData.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTRegisterNymphExtData.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTTester.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Data/KTTester.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/IO/KTJSONWriter.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/IO/KTJSONWriter.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/IO/KTReader.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/IO/KTReader.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/IO/KTWriter.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/IO/KTWriter.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/NymphPybind.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTConnection.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTNymphSignals.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTNymphSlot.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTPrimaryProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTPrimaryProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTProcessor.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTProcessorPybind.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTProcessorPybind.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTPyProcessor.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSignal.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSignalSlotBase.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSignalWrapper.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSignalWrapper.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSlot.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSlotWrapper.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTSlotWrapper.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTThreadReference.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Processor/KTThreadReference.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTCacheDirectory.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTCacheDirectory.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTConcurrentQueue.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTConfigurable.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTConfigurable.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTConfigurablePybind.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTDirectory.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTDirectory.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTEventLoop.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTEventLoop.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTException.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTException.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTExtensible.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTExtensibleStruct.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTExtensibleStructFactory.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTLogger.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTMemberVariable.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTParamPybind.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTPythonMacros.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTTIFactory.hh (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTTime.cc (100%)
 rename {Src/Cpp => Cpp}/Library_v1/Utility/KTTime.hh (100%)
 rename {Src/Cpp => Cpp}/Templates/KTProcessorTemplate.cc (100%)
 rename {Src/Cpp => Cpp}/Templates/KTProcessorTemplate.hh (100%)
 rename {Src/Cpp => Cpp}/Templates/MainCMakeLists.txt (100%)
 create mode 160000 External/cereal
 rename {Src/Python => Python}/CMakeLists.txt (73%)
 rename {Src/Python => Python}/README.md (100%)
 rename {Src/Python => Python}/nymph/__init__.py (100%)
 create mode 160000 Scarab
 delete mode 100644 Src/External/cereal/.gitignore
 delete mode 100644 Src/External/cereal/.travis.yml
 delete mode 100644 Src/External/cereal/CMakeLists.txt
 delete mode 100644 Src/External/cereal/LICENSE
 delete mode 100644 Src/External/cereal/README.md
 delete mode 100644 Src/External/cereal/appveyor.yml
 delete mode 100644 Src/External/cereal/doc/CMakeLists.txt
 delete mode 100644 Src/External/cereal/doc/DoxygenLayout.xml
 delete mode 100644 Src/External/cereal/doc/doxygen.in
 delete mode 100644 Src/External/cereal/doc/footer.html
 delete mode 100644 Src/External/cereal/doc/mainpage.dox
 delete mode 100644 Src/External/cereal/include/cereal/access.hpp
 delete mode 100644 Src/External/cereal/include/cereal/archives/adapters.hpp
 delete mode 100644 Src/External/cereal/include/cereal/archives/binary.hpp
 delete mode 100644 Src/External/cereal/include/cereal/archives/json.hpp
 delete mode 100644 Src/External/cereal/include/cereal/archives/portable_binary.hpp
 delete mode 100644 Src/External/cereal/include/cereal/archives/xml.hpp
 delete mode 100644 Src/External/cereal/include/cereal/cereal.hpp
 delete mode 100644 Src/External/cereal/include/cereal/details/helpers.hpp
 delete mode 100644 Src/External/cereal/include/cereal/details/polymorphic_impl.hpp
 delete mode 100644 Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
 delete mode 100644 Src/External/cereal/include/cereal/details/static_object.hpp
 delete mode 100644 Src/External/cereal/include/cereal/details/traits.hpp
 delete mode 100644 Src/External/cereal/include/cereal/details/util.hpp
 delete mode 100644 Src/External/cereal/include/cereal/external/base64.hpp
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/allocators.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/document.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/encodings.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/error/en.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/error/error.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/fwd.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/memorystream.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/pointer.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/reader.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/schema.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/stream.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidjson/writer.h
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidxml/license.txt
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidxml/manual.html
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
 delete mode 100644 Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
 delete mode 100644 Src/External/cereal/include/cereal/macros.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/array.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/base_class.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/bitset.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/boost_variant.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/chrono.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/common.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/complex.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/deque.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/forward_list.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/functional.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/list.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/map.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/memory.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/polymorphic.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/queue.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/set.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/stack.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/string.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/tuple.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/unordered_map.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/unordered_set.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/utility.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/valarray.hpp
 delete mode 100644 Src/External/cereal/include/cereal/types/vector.hpp
 delete mode 100644 Src/External/cereal/sandbox/CMakeLists.txt
 delete mode 100644 Src/External/cereal/sandbox/performance.cpp
 delete mode 100644 Src/External/cereal/sandbox/sandbox.cpp
 delete mode 100644 Src/External/cereal/sandbox/sandbox_json.cpp
 delete mode 100644 Src/External/cereal/sandbox/sandbox_rtti.cpp
 delete mode 100644 Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt
 delete mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp
 delete mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp
 delete mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp
 delete mode 100755 Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp
 delete mode 100644 Src/External/cereal/sandbox/sandbox_vs.cpp
 delete mode 100755 Src/External/cereal/scripts/add_rapidjson_prefix.sh
 delete mode 100644 Src/External/cereal/scripts/appveyor.bat
 delete mode 100755 Src/External/cereal/scripts/renameincludes.sh
 delete mode 100755 Src/External/cereal/scripts/updatecoverage.sh
 delete mode 100755 Src/External/cereal/scripts/updatedoc.in
 delete mode 100644 Src/External/cereal/unittests/CMakeLists.txt
 delete mode 100644 Src/External/cereal/unittests/array.cpp
 delete mode 100644 Src/External/cereal/unittests/array.hpp
 delete mode 100644 Src/External/cereal/unittests/basic_string.cpp
 delete mode 100644 Src/External/cereal/unittests/basic_string.hpp
 delete mode 100644 Src/External/cereal/unittests/bitset.cpp
 delete mode 100644 Src/External/cereal/unittests/bitset.hpp
 delete mode 100644 Src/External/cereal/unittests/boost_variant.cpp
 delete mode 100644 Src/External/cereal/unittests/boost_variant.hpp
 delete mode 100644 Src/External/cereal/unittests/chrono.cpp
 delete mode 100644 Src/External/cereal/unittests/chrono.hpp
 delete mode 100644 Src/External/cereal/unittests/cmake-config-module.cmake
 delete mode 100644 Src/External/cereal/unittests/common.hpp
 delete mode 100644 Src/External/cereal/unittests/complex.cpp
 delete mode 100644 Src/External/cereal/unittests/complex.hpp
 delete mode 100644 Src/External/cereal/unittests/deque.cpp
 delete mode 100644 Src/External/cereal/unittests/deque.hpp
 delete mode 100644 Src/External/cereal/unittests/doctest.h
 delete mode 100644 Src/External/cereal/unittests/forward_list.cpp
 delete mode 100644 Src/External/cereal/unittests/forward_list.hpp
 delete mode 100644 Src/External/cereal/unittests/list.cpp
 delete mode 100644 Src/External/cereal/unittests/list.hpp
 delete mode 100644 Src/External/cereal/unittests/load_construct.cpp
 delete mode 100644 Src/External/cereal/unittests/load_construct.hpp
 delete mode 100644 Src/External/cereal/unittests/map.cpp
 delete mode 100644 Src/External/cereal/unittests/map.hpp
 delete mode 100644 Src/External/cereal/unittests/memory.cpp
 delete mode 100644 Src/External/cereal/unittests/memory.hpp
 delete mode 100644 Src/External/cereal/unittests/memory_cycles.cpp
 delete mode 100644 Src/External/cereal/unittests/memory_cycles.hpp
 delete mode 100644 Src/External/cereal/unittests/multimap.cpp
 delete mode 100644 Src/External/cereal/unittests/multimap.hpp
 delete mode 100644 Src/External/cereal/unittests/multiset.cpp
 delete mode 100644 Src/External/cereal/unittests/multiset.hpp
 delete mode 100644 Src/External/cereal/unittests/pair.cpp
 delete mode 100644 Src/External/cereal/unittests/pair.hpp
 delete mode 100644 Src/External/cereal/unittests/pod.cpp
 delete mode 100644 Src/External/cereal/unittests/pod.hpp
 delete mode 100644 Src/External/cereal/unittests/polymorphic.cpp
 delete mode 100644 Src/External/cereal/unittests/polymorphic.hpp
 delete mode 100644 Src/External/cereal/unittests/portability_test.cpp
 delete mode 100644 Src/External/cereal/unittests/portable_binary_archive.cpp
 delete mode 100644 Src/External/cereal/unittests/portable_binary_archive.hpp
 delete mode 100644 Src/External/cereal/unittests/priority_queue.cpp
 delete mode 100644 Src/External/cereal/unittests/priority_queue.hpp
 delete mode 100644 Src/External/cereal/unittests/queue.cpp
 delete mode 100644 Src/External/cereal/unittests/queue.hpp
 delete mode 100644 Src/External/cereal/unittests/run_portability_test.cmake
 delete mode 100755 Src/External/cereal/unittests/run_valgrind.sh
 delete mode 100644 Src/External/cereal/unittests/set.cpp
 delete mode 100644 Src/External/cereal/unittests/set.hpp
 delete mode 100644 Src/External/cereal/unittests/stack.cpp
 delete mode 100644 Src/External/cereal/unittests/stack.hpp
 delete mode 100644 Src/External/cereal/unittests/structs.cpp
 delete mode 100644 Src/External/cereal/unittests/structs.hpp
 delete mode 100644 Src/External/cereal/unittests/structs_minimal.cpp
 delete mode 100644 Src/External/cereal/unittests/structs_minimal.hpp
 delete mode 100644 Src/External/cereal/unittests/structs_specialized.cpp
 delete mode 100644 Src/External/cereal/unittests/structs_specialized.hpp
 delete mode 100644 Src/External/cereal/unittests/tuple.cpp
 delete mode 100644 Src/External/cereal/unittests/tuple.hpp
 delete mode 100644 Src/External/cereal/unittests/unordered_loads.cpp
 delete mode 100644 Src/External/cereal/unittests/unordered_loads.hpp
 delete mode 100644 Src/External/cereal/unittests/unordered_map.cpp
 delete mode 100644 Src/External/cereal/unittests/unordered_map.hpp
 delete mode 100644 Src/External/cereal/unittests/unordered_multimap.cpp
 delete mode 100644 Src/External/cereal/unittests/unordered_multimap.hpp
 delete mode 100644 Src/External/cereal/unittests/unordered_multiset.cpp
 delete mode 100644 Src/External/cereal/unittests/unordered_multiset.hpp
 delete mode 100644 Src/External/cereal/unittests/unordered_set.cpp
 delete mode 100644 Src/External/cereal/unittests/unordered_set.hpp
 delete mode 100644 Src/External/cereal/unittests/user_data_adapters.cpp
 delete mode 100644 Src/External/cereal/unittests/user_data_adapters.hpp
 delete mode 100644 Src/External/cereal/unittests/valarray.cpp
 delete mode 100644 Src/External/cereal/unittests/valarray.hpp
 delete mode 100644 Src/External/cereal/unittests/vector.cpp
 delete mode 100644 Src/External/cereal/unittests/vector.hpp
 delete mode 100644 Src/External/cereal/unittests/versioning.cpp
 delete mode 100644 Src/External/cereal/unittests/versioning.hpp
 delete mode 100644 Src/External/cereal/vs2013/.gitignore
 delete mode 100644 Src/External/cereal/vs2013/sandbox/sandbox.vcxproj
 delete mode 100644 Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters
 delete mode 100644 Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj
 delete mode 100644 Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters
 delete mode 100644 Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj
 delete mode 100644 Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters
 delete mode 100644 Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj
 delete mode 100644 Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters
 delete mode 100755 Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj
 delete mode 100755 Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters
 delete mode 100755 Src/External/cereal/vs2013/unittests/main.cpp
 delete mode 100644 Src/External/cereal/vs2013/unittests/unittests.vcxproj
 delete mode 100644 Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters
 delete mode 100644 Src/External/cereal/vs2013/vs2013.sln
 delete mode 100644 Src/Scarab/.github/workflows/run_tests.yaml
 delete mode 100644 Src/Scarab/.gitignore
 delete mode 100644 Src/Scarab/.gitmodules
 delete mode 100644 Src/Scarab/.travis.yml
 delete mode 100644 Src/Scarab/AUTHORS
 delete mode 100644 Src/Scarab/CMakeLists.txt
 delete mode 100644 Src/Scarab/LICENSE
 delete mode 100644 Src/Scarab/README.md
 delete mode 100644 Src/Scarab/ScarabConfig.cmake.in
 delete mode 100644 Src/Scarab/VERSION
 delete mode 100644 Src/Scarab/cmake/FindEigen3.cmake
 delete mode 100644 Src/Scarab/cmake/FindFFTW.cmake
 delete mode 100644 Src/Scarab/cmake/FindSphinx.cmake
 delete mode 100644 Src/Scarab/cmake/GetVersion.cmake
 delete mode 100644 Src/Scarab/cmake/PackageBuilder.cmake
 delete mode 100644 Src/Scarab/cmake/PackageBuilderMacros.cmake
 delete mode 100644 Src/Scarab/documentation/README.md
 delete mode 100644 Src/Scarab/documentation/application_building.rst
 delete mode 100644 Src/Scarab/documentation/cpp/Doxyfile
 delete mode 100644 Src/Scarab/documentation/cpp/README.md
 delete mode 100644 Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst
 delete mode 100644 Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst
 delete mode 100644 Src/Scarab/documentation/cpp/conf.py
 delete mode 100644 Src/Scarab/documentation/cpp/doxfiles/mainpage.dox
 delete mode 100644 Src/Scarab/documentation/cpp/favicon.ico
 delete mode 100644 Src/Scarab/documentation/cpp/index.rst
 delete mode 100644 Src/Scarab/documentation/cpp/requirements.txt
 delete mode 100644 Src/Scarab/documentation/cpp/scarab_logo_small.png
 delete mode 100644 Src/Scarab/documentation/package_builder.rst
 delete mode 100644 Src/Scarab/documentation/python/README.md
 delete mode 100644 Src/Scarab/documentation/python/_templates/README.md
 delete mode 100644 Src/Scarab/documentation/python/_templates/module.rst
 delete mode 100644 Src/Scarab/documentation/python/_templates/package.rst
 delete mode 100644 Src/Scarab/documentation/python/conf.py
 delete mode 100644 Src/Scarab/documentation/python/index.rst
 delete mode 100644 Src/Scarab/executables/CMakeLists.txt
 delete mode 100644 Src/Scarab/executables/scarab-parse.cc
 delete mode 100644 Src/Scarab/library/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/README.md
 delete mode 100644 Src/Scarab/library/authentication/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/authentication/authentication.cc
 delete mode 100644 Src/Scarab/library/authentication/authentication.hh
 delete mode 100644 Src/Scarab/library/cli/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/cli/application.cc
 delete mode 100644 Src/Scarab/library/cli/application.hh
 delete mode 100644 Src/Scarab/library/cli/nonoption_parser.cc
 delete mode 100644 Src/Scarab/library/cli/nonoption_parser.hh
 delete mode 100644 Src/Scarab/library/external/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/external/cli11/CLI11.hpp
 delete mode 100644 Src/Scarab/library/external/date/date.h
 delete mode 100644 Src/Scarab/library/logger/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/logger/logger.cc
 delete mode 100644 Src/Scarab/library/logger/logger.hh
 delete mode 100644 Src/Scarab/library/param/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/param/codec/json/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/param/codec/json/param_json.cc
 delete mode 100644 Src/Scarab/library/param/codec/json/param_json.hh
 delete mode 100644 Src/Scarab/library/param/codec/yaml/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/param/codec/yaml/param_yaml.cc
 delete mode 100644 Src/Scarab/library/param/codec/yaml/param_yaml.hh
 delete mode 100644 Src/Scarab/library/param/param.hh
 delete mode 100644 Src/Scarab/library/param/param_array.cc
 delete mode 100644 Src/Scarab/library/param/param_array.hh
 delete mode 100644 Src/Scarab/library/param/param_base.cc
 delete mode 100644 Src/Scarab/library/param/param_base.hh
 delete mode 100644 Src/Scarab/library/param/param_base_impl.hh
 delete mode 100644 Src/Scarab/library/param/param_codec.cc
 delete mode 100644 Src/Scarab/library/param/param_codec.hh
 delete mode 100644 Src/Scarab/library/param/param_helpers.cc
 delete mode 100644 Src/Scarab/library/param/param_helpers.hh
 delete mode 100644 Src/Scarab/library/param/param_node.cc
 delete mode 100644 Src/Scarab/library/param/param_node.hh
 delete mode 100644 Src/Scarab/library/param/param_value.cc
 delete mode 100644 Src/Scarab/library/param/param_value.hh
 delete mode 100644 Src/Scarab/library/utility/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/utility/_member_variables.hh.in
 delete mode 100644 Src/Scarab/library/utility/base_exception.hh
 delete mode 100644 Src/Scarab/library/utility/cancelable.cc
 delete mode 100644 Src/Scarab/library/utility/cancelable.hh
 delete mode 100644 Src/Scarab/library/utility/concurrent_queue.hh
 delete mode 100644 Src/Scarab/library/utility/destroyer.hh
 delete mode 100644 Src/Scarab/library/utility/digital.cc
 delete mode 100644 Src/Scarab/library/utility/digital.hh
 delete mode 100644 Src/Scarab/library/utility/error.hh
 delete mode 100644 Src/Scarab/library/utility/exponential_backoff.hh
 delete mode 100644 Src/Scarab/library/utility/factory.hh
 delete mode 100644 Src/Scarab/library/utility/indexed_factory.hh
 delete mode 100644 Src/Scarab/library/utility/macros.hh
 delete mode 100644 Src/Scarab/library/utility/map_at_default.hh
 delete mode 100644 Src/Scarab/library/utility/member_variables.hh
 delete mode 100644 Src/Scarab/library/utility/path.cc
 delete mode 100644 Src/Scarab/library/utility/path.hh
 delete mode 100644 Src/Scarab/library/utility/scarab_api.hh
 delete mode 100644 Src/Scarab/library/utility/signal_handler.cc
 delete mode 100644 Src/Scarab/library/utility/signal_handler.hh
 delete mode 100644 Src/Scarab/library/utility/singleton.hh
 delete mode 100644 Src/Scarab/library/utility/thread_singleton.hh
 delete mode 100644 Src/Scarab/library/utility/time.cc
 delete mode 100644 Src/Scarab/library/utility/time.hh
 delete mode 100644 Src/Scarab/library/utility/typename.cc
 delete mode 100644 Src/Scarab/library/utility/typename.hh
 delete mode 100644 Src/Scarab/library/utility/unique_typelist.hh
 delete mode 100644 Src/Scarab/library/version/CMakeLists.txt
 delete mode 100644 Src/Scarab/library/version/scarab_version.cc.in
 delete mode 100644 Src/Scarab/library/version/scarab_version.hh
 delete mode 100644 Src/Scarab/library/version/version_ifc.cc
 delete mode 100644 Src/Scarab/library/version/version_ifc.hh
 delete mode 100644 Src/Scarab/library/version/version_semantic.cc
 delete mode 100644 Src/Scarab/library/version/version_semantic.hh
 delete mode 100644 Src/Scarab/library/version/version_wrapper.hh
 delete mode 100644 Src/Scarab/python/CMakeLists.txt
 delete mode 100644 Src/Scarab/python/add_lib_python_path.sh.in
 delete mode 100644 Src/Scarab/python/application_pybind.hh
 delete mode 100644 Src/Scarab/python/cancelable_pybind.hh
 delete mode 100644 Src/Scarab/python/param_array_pybind.hh
 delete mode 100644 Src/Scarab/python/param_binding_helpers.hh
 delete mode 100644 Src/Scarab/python/param_node_pybind.hh
 delete mode 100644 Src/Scarab/python/param_pybind.hh
 delete mode 100644 Src/Scarab/python/param_value_pybind.hh
 delete mode 100644 Src/Scarab/python/scarab_binding_helpers.hh
 delete mode 100644 Src/Scarab/python/scarab_namespace_pybind.cc
 delete mode 100644 Src/Scarab/python/signal_handler_pybind.hh
 delete mode 100644 Src/Scarab/python/version_pybind.hh
 delete mode 100644 Src/Scarab/testing/CMakeLists.txt
 delete mode 100644 Src/Scarab/testing/Doxyfile
 delete mode 100644 Src/Scarab/testing/README.md
 delete mode 100644 Src/Scarab/testing/applications/CMakeLists.txt
 delete mode 100644 Src/Scarab/testing/applications/test_app_with_callback.cc
 delete mode 100644 Src/Scarab/testing/applications/test_app_with_options.cc
 delete mode 100644 Src/Scarab/testing/applications/test_app_with_subcommands.cc
 delete mode 100644 Src/Scarab/testing/applications/test_basic_application.cc
 delete mode 100644 Src/Scarab/testing/applications/test_raise_sigabrt.cc
 delete mode 100644 Src/Scarab/testing/applications/test_raise_sigint.cc
 delete mode 100644 Src/Scarab/testing/applications/test_raise_sigquit.cc
 delete mode 100644 Src/Scarab/testing/applications/test_raise_sigterm.cc
 delete mode 100644 Src/Scarab/testing/applications/test_unhandled_exception.cc
 delete mode 100644 Src/Scarab/testing/catch/catch.hpp
 delete mode 100644 Src/Scarab/testing/glob_path/README.md
 delete mode 100644 Src/Scarab/testing/glob_path/sub1/sub1sub1/glob_sub1sub1.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub1/sub1sub2/glob_sub1sub2.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub1/sub1sub3/glob_sub1sub3.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_3.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt
 delete mode 100644 Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub3/glob_sub2sub1sub3.txt
 delete mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt
 delete mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in
 delete mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/README.md
 delete mode 100755 Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in
 delete mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc
 delete mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc
 delete mode 100644 Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh
 delete mode 100644 Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt
 delete mode 100644 Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in
 delete mode 100644 Src/Scarab/testing/package_builder/PBTest/README.md
 delete mode 100755 Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in
 delete mode 100644 Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc
 delete mode 100644 Src/Scarab/testing/package_builder/PBTest/library/print.cc
 delete mode 100644 Src/Scarab/testing/package_builder/PBTest/library/print.hh
 delete mode 100644 Src/Scarab/testing/stream_check.cc
 delete mode 100644 Src/Scarab/testing/stream_check.hh
 delete mode 100644 Src/Scarab/testing/test_digital.cc
 delete mode 100644 Src/Scarab/testing/test_exponential_backoff.cc
 delete mode 100644 Src/Scarab/testing/test_json.cc
 delete mode 100644 Src/Scarab/testing/test_logger.cc
 delete mode 100644 Src/Scarab/testing/test_member_variables.cc
 delete mode 100644 Src/Scarab/testing/test_member_variables.hh
 delete mode 100644 Src/Scarab/testing/test_nonoption_parser.cc
 delete mode 100644 Src/Scarab/testing/test_param_array.cc
 delete mode 100644 Src/Scarab/testing/test_param_by_pointer.cc
 delete mode 100644 Src/Scarab/testing/test_param_node.cc
 delete mode 100644 Src/Scarab/testing/test_param_translator.cc
 delete mode 100644 Src/Scarab/testing/test_param_value.cc
 delete mode 100644 Src/Scarab/testing/test_path.cc.in
 delete mode 100644 Src/Scarab/testing/test_signal_handler.cc
 delete mode 100644 Src/Scarab/testing/test_time.cc
 delete mode 100644 Src/Scarab/testing/test_verbosity.cc
 delete mode 100644 Src/Scarab/testing/test_yaml.cc
 delete mode 100644 Src/Scarab/testing/use_catch.cc

diff --git a/.gitignore b/.gitignore
index 77bfe6e..06169dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,7 @@
 # Build directories
 build*/
 
+# Python Package
+dist*/
+Python/nymph/*.egg-info
+
diff --git a/.gitmodules b/.gitmodules
index e8c94fd..4a11728 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "Src/Scarab"]
-	path = Src/Scarab
+[submodule "Scarab"]
+	path = Scarab
 	url = https://github.com/project8/scarab
-[submodule "Src/External/cereal"]
-	path = Src/External/cereal
+[submodule "External/cereal"]
+	path = External/cereal
 	url = https://github.com/USCiLab/cereal.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bcf820..22cf061 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ cmake_minimum_required (VERSION 3.12)
 cmake_policy( SET CMP0048 NEW ) # version in project()
 project( Nymph VERSION 1.5.2 )
 
-list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Src/Scarab/cmake )
+list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )
 include( PackageBuilder )
 
 # Nymph CMake files
@@ -81,6 +81,7 @@ add_definitions( -DBOOST_ALL_DYN_LINK )
 
 if( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON TRUE )
+    add_subdirectory( Python )
 else( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON FALSE )
 endif( Nymph_ENABLE_PYTHON )
@@ -90,8 +91,8 @@ endif( Nymph_ENABLE_PYTHON )
 ########
 
 set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
-add_subdirectory( Src/External/cereal )
-include_directories( Src/External/cereal/include )
+add_subdirectory( External/cereal )
+include_directories( External/cereal/include )
 
 
 #####################
@@ -109,13 +110,13 @@ pbuilder_prepare_project()
 # Scarab
 ########
 
-pbuilder_add_submodule( Scarab Src/Scarab )
+pbuilder_add_submodule( Scarab Scarab )
 
 # all parts of midge use Scarab, so include it here
-pbuilder_use_sm_library( Scarab Src/Scarab )
+pbuilder_use_sm_library( Scarab Scarab )
 
 # this is needed for anything that wants to read or write JSON files
-get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Src/Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
+get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
 set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 
@@ -123,10 +124,10 @@ set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 # Build Nymph #
 ###############
 
-add_subdirectory( Src/Cpp/Library )
+add_subdirectory( Cpp/Library )
 
 #if (Nymph_ENABLE_EXECUTABLES)
-#    add_subdirectory( Src/Cpp/Executables_v1 )
+#    add_subdirectory( Cpp/Executables_v1 )
 #endif (Nymph_ENABLE_EXECUTABLES )
 
 
diff --git a/Src/Cpp/Executables_v1/Main/CMakeLists.txt b/Cpp/Executables_v1/Main/CMakeLists.txt
similarity index 100%
rename from Src/Cpp/Executables_v1/Main/CMakeLists.txt
rename to Cpp/Executables_v1/Main/CMakeLists.txt
diff --git a/Src/Cpp/Executables_v1/Main/ConfigCheck.cc b/Cpp/Executables_v1/Main/ConfigCheck.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Main/ConfigCheck.cc
rename to Cpp/Executables_v1/Main/ConfigCheck.cc
diff --git a/Src/Cpp/Executables_v1/Main/Nymph.cc b/Cpp/Executables_v1/Main/Nymph.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Main/Nymph.cc
rename to Cpp/Executables_v1/Main/Nymph.cc
diff --git a/Src/Cpp/Executables_v1/Validation/CMakeLists.txt b/Cpp/Executables_v1/Validation/CMakeLists.txt
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/CMakeLists.txt
rename to Cpp/Executables_v1/Validation/CMakeLists.txt
diff --git a/Src/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json b/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
rename to Cpp/Executables_v1/Validation/ConfigFiles/TestConfigurator.json
diff --git a/Src/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json b/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
rename to Cpp/Executables_v1/Validation/ConfigFiles/TestParameterStoreConfig.json
diff --git a/Src/Cpp/Executables_v1/Validation/KTJSONReader.cc b/Cpp/Executables_v1/Validation/KTJSONReader.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTJSONReader.cc
rename to Cpp/Executables_v1/Validation/KTJSONReader.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTJSONReader.hh b/Cpp/Executables_v1/Validation/KTJSONReader.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTJSONReader.hh
rename to Cpp/Executables_v1/Validation/KTJSONReader.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc b/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
rename to Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh b/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
rename to Cpp/Executables_v1/Validation/KTJSONTypeWriterValidation.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTPyTestClass.cc b/Cpp/Executables_v1/Validation/KTPyTestClass.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTPyTestClass.cc
rename to Cpp/Executables_v1/Validation/KTPyTestClass.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTPyTestClass.hh b/Cpp/Executables_v1/Validation/KTPyTestClass.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTPyTestClass.hh
rename to Cpp/Executables_v1/Validation/KTPyTestClass.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh b/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
rename to Cpp/Executables_v1/Validation/KTPyTestClassPybind.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh b/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
rename to Cpp/Executables_v1/Validation/KTRegisterNymphValidationExtData.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestConfigurable.cc b/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestConfigurable.cc
rename to Cpp/Executables_v1/Validation/KTTestConfigurable.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestConfigurable.hh b/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestConfigurable.hh
rename to Cpp/Executables_v1/Validation/KTTestConfigurable.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestCuts.cc b/Cpp/Executables_v1/Validation/KTTestCuts.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestCuts.cc
rename to Cpp/Executables_v1/Validation/KTTestCuts.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestCuts.hh b/Cpp/Executables_v1/Validation/KTTestCuts.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestCuts.hh
rename to Cpp/Executables_v1/Validation/KTTestCuts.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestData.cc b/Cpp/Executables_v1/Validation/KTTestData.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestData.cc
rename to Cpp/Executables_v1/Validation/KTTestData.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestData.hh b/Cpp/Executables_v1/Validation/KTTestData.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestData.hh
rename to Cpp/Executables_v1/Validation/KTTestData.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc b/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
rename to Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh b/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
rename to Cpp/Executables_v1/Validation/KTTestDataPrimaryProcessor.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc b/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
rename to Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh b/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
rename to Cpp/Executables_v1/Validation/KTTestPrimaryProcessor.hh
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestProcessor.cc b/Cpp/Executables_v1/Validation/KTTestProcessor.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestProcessor.cc
rename to Cpp/Executables_v1/Validation/KTTestProcessor.cc
diff --git a/Src/Cpp/Executables_v1/Validation/KTTestProcessor.hh b/Cpp/Executables_v1/Validation/KTTestProcessor.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/KTTestProcessor.hh
rename to Cpp/Executables_v1/Validation/KTTestProcessor.hh
diff --git a/Src/Cpp/Executables_v1/Validation/NymphValidationPybind.cc b/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/NymphValidationPybind.cc
rename to Cpp/Executables_v1/Validation/NymphValidationPybind.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestApplication.cc b/Cpp/Executables_v1/Validation/TestApplication.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestApplication.cc
rename to Cpp/Executables_v1/Validation/TestApplication.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestApplyCut.cc b/Cpp/Executables_v1/Validation/TestApplyCut.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestApplyCut.cc
rename to Cpp/Executables_v1/Validation/TestApplyCut.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestCacheDirectory.cc b/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestCacheDirectory.cc
rename to Cpp/Executables_v1/Validation/TestCacheDirectory.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestCut.cc b/Cpp/Executables_v1/Validation/TestCut.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestCut.cc
rename to Cpp/Executables_v1/Validation/TestCut.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestCutFilter.cc b/Cpp/Executables_v1/Validation/TestCutFilter.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestCutFilter.cc
rename to Cpp/Executables_v1/Validation/TestCutFilter.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestData.cc b/Cpp/Executables_v1/Validation/TestData.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestData.cc
rename to Cpp/Executables_v1/Validation/TestData.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc b/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
rename to Cpp/Executables_v1/Validation/TestExceptionInSlot.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestExt.cc b/Cpp/Executables_v1/Validation/TestExt.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestExt.cc
rename to Cpp/Executables_v1/Validation/TestExt.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestExtSerialization.cc b/Cpp/Executables_v1/Validation/TestExtSerialization.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestExtSerialization.cc
rename to Cpp/Executables_v1/Validation/TestExtSerialization.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestJSONWriter.cc b/Cpp/Executables_v1/Validation/TestJSONWriter.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestJSONWriter.cc
rename to Cpp/Executables_v1/Validation/TestJSONWriter.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc b/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
rename to Cpp/Executables_v1/Validation/TestJSONWriterViaSlot.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestLogger.cc b/Cpp/Executables_v1/Validation/TestLogger.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestLogger.cc
rename to Cpp/Executables_v1/Validation/TestLogger.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestParamBindings.py b/Cpp/Executables_v1/Validation/TestParamBindings.py
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestParamBindings.py
rename to Cpp/Executables_v1/Validation/TestParamBindings.py
diff --git a/Src/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc b/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
rename to Cpp/Executables_v1/Validation/TestPolymorphicSlotData.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc b/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
rename to Cpp/Executables_v1/Validation/TestPrimaryProcessor.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc b/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
rename to Cpp/Executables_v1/Validation/TestPrimaryProcessorNoThreading.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestPrintData.cc b/Cpp/Executables_v1/Validation/TestPrintData.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPrintData.cc
rename to Cpp/Executables_v1/Validation/TestPrintData.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestProcessorToolbox.py b/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestProcessorToolbox.py
rename to Cpp/Executables_v1/Validation/TestProcessorToolbox.py
diff --git a/Src/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc b/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
rename to Cpp/Executables_v1/Validation/TestProcessorToolbox2Threads.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc b/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
rename to Cpp/Executables_v1/Validation/TestProcessorToolboxMultithreaded.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc b/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
rename to Cpp/Executables_v1/Validation/TestProcessorToolboxSinglethreaded.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestPyTestClass.py b/Cpp/Executables_v1/Validation/TestPyTestClass.py
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPyTestClass.py
rename to Cpp/Executables_v1/Validation/TestPyTestClass.py
diff --git a/Src/Cpp/Executables_v1/Validation/TestPythonBasics.hh b/Cpp/Executables_v1/Validation/TestPythonBasics.hh
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPythonBasics.hh
rename to Cpp/Executables_v1/Validation/TestPythonBasics.hh
diff --git a/Src/Cpp/Executables_v1/Validation/TestPythonBasics.py b/Cpp/Executables_v1/Validation/TestPythonBasics.py
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestPythonBasics.py
rename to Cpp/Executables_v1/Validation/TestPythonBasics.py
diff --git a/Src/Cpp/Executables_v1/Validation/TestSerialization.cc b/Cpp/Executables_v1/Validation/TestSerialization.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestSerialization.cc
rename to Cpp/Executables_v1/Validation/TestSerialization.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc b/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
rename to Cpp/Executables_v1/Validation/TestSignalsAndSlots.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestSlotData.cc b/Cpp/Executables_v1/Validation/TestSlotData.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestSlotData.cc
rename to Cpp/Executables_v1/Validation/TestSlotData.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc b/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
rename to Cpp/Executables_v1/Validation/TestThroughputProfiler.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc b/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
rename to Cpp/Executables_v1/Validation/TestUseBreakpoint.cc
diff --git a/Src/Cpp/Executables_v1/Validation/TestWrapProcessor.py b/Cpp/Executables_v1/Validation/TestWrapProcessor.py
similarity index 100%
rename from Src/Cpp/Executables_v1/Validation/TestWrapProcessor.py
rename to Cpp/Executables_v1/Validation/TestWrapProcessor.py
diff --git a/Src/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
similarity index 100%
rename from Src/Cpp/Library/CMakeLists.txt
rename to Cpp/Library/CMakeLists.txt
diff --git a/Src/Cpp/Library/Control/ControlAccess.cc b/Cpp/Library/Control/ControlAccess.cc
similarity index 100%
rename from Src/Cpp/Library/Control/ControlAccess.cc
rename to Cpp/Library/Control/ControlAccess.cc
diff --git a/Src/Cpp/Library/Control/ControlAccess.hh b/Cpp/Library/Control/ControlAccess.hh
similarity index 100%
rename from Src/Cpp/Library/Control/ControlAccess.hh
rename to Cpp/Library/Control/ControlAccess.hh
diff --git a/Src/Cpp/Library/Control/Controller.cc b/Cpp/Library/Control/Controller.cc
similarity index 100%
rename from Src/Cpp/Library/Control/Controller.cc
rename to Cpp/Library/Control/Controller.cc
diff --git a/Src/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
similarity index 100%
rename from Src/Cpp/Library/Control/Controller.hh
rename to Cpp/Library/Control/Controller.hh
diff --git a/Src/Cpp/Library/Control/ControllerInterface.cc b/Cpp/Library/Control/ControllerInterface.cc
similarity index 100%
rename from Src/Cpp/Library/Control/ControllerInterface.cc
rename to Cpp/Library/Control/ControllerInterface.cc
diff --git a/Src/Cpp/Library/Control/ControllerInterface.hh b/Cpp/Library/Control/ControllerInterface.hh
similarity index 100%
rename from Src/Cpp/Library/Control/ControllerInterface.hh
rename to Cpp/Library/Control/ControllerInterface.hh
diff --git a/Src/Cpp/Library/Control/ReturnBuffer.cc b/Cpp/Library/Control/ReturnBuffer.cc
similarity index 100%
rename from Src/Cpp/Library/Control/ReturnBuffer.cc
rename to Cpp/Library/Control/ReturnBuffer.cc
diff --git a/Src/Cpp/Library/Control/ReturnBuffer.hh b/Cpp/Library/Control/ReturnBuffer.hh
similarity index 100%
rename from Src/Cpp/Library/Control/ReturnBuffer.hh
rename to Cpp/Library/Control/ReturnBuffer.hh
diff --git a/Src/Cpp/Library/Control/SingleRunController.cc b/Cpp/Library/Control/SingleRunController.cc
similarity index 100%
rename from Src/Cpp/Library/Control/SingleRunController.cc
rename to Cpp/Library/Control/SingleRunController.cc
diff --git a/Src/Cpp/Library/Control/SingleRunController.hh b/Cpp/Library/Control/SingleRunController.hh
similarity index 100%
rename from Src/Cpp/Library/Control/SingleRunController.hh
rename to Cpp/Library/Control/SingleRunController.hh
diff --git a/Src/Cpp/Library/Data/Data.cc b/Cpp/Library/Data/Data.cc
similarity index 100%
rename from Src/Cpp/Library/Data/Data.cc
rename to Cpp/Library/Data/Data.cc
diff --git a/Src/Cpp/Library/Data/Data.hh b/Cpp/Library/Data/Data.hh
similarity index 100%
rename from Src/Cpp/Library/Data/Data.hh
rename to Cpp/Library/Data/Data.hh
diff --git a/Src/Cpp/Library/Data/DataFrame.cc b/Cpp/Library/Data/DataFrame.cc
similarity index 100%
rename from Src/Cpp/Library/Data/DataFrame.cc
rename to Cpp/Library/Data/DataFrame.cc
diff --git a/Src/Cpp/Library/Data/DataFrame.hh b/Cpp/Library/Data/DataFrame.hh
similarity index 100%
rename from Src/Cpp/Library/Data/DataFrame.hh
rename to Cpp/Library/Data/DataFrame.hh
diff --git a/Src/Cpp/Library/Data/DataManager.cc b/Cpp/Library/Data/DataManager.cc
similarity index 100%
rename from Src/Cpp/Library/Data/DataManager.cc
rename to Cpp/Library/Data/DataManager.cc
diff --git a/Src/Cpp/Library/Data/DataManager.hh b/Cpp/Library/Data/DataManager.hh
similarity index 100%
rename from Src/Cpp/Library/Data/DataManager.hh
rename to Cpp/Library/Data/DataManager.hh
diff --git a/Src/Cpp/Library/Processor/PrimaryProcessor.cc b/Cpp/Library/Processor/PrimaryProcessor.cc
similarity index 100%
rename from Src/Cpp/Library/Processor/PrimaryProcessor.cc
rename to Cpp/Library/Processor/PrimaryProcessor.cc
diff --git a/Src/Cpp/Library/Processor/PrimaryProcessor.hh b/Cpp/Library/Processor/PrimaryProcessor.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/PrimaryProcessor.hh
rename to Cpp/Library/Processor/PrimaryProcessor.hh
diff --git a/Src/Cpp/Library/Processor/Processor.cc b/Cpp/Library/Processor/Processor.cc
similarity index 100%
rename from Src/Cpp/Library/Processor/Processor.cc
rename to Cpp/Library/Processor/Processor.cc
diff --git a/Src/Cpp/Library/Processor/Processor.hh b/Cpp/Library/Processor/Processor.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/Processor.hh
rename to Cpp/Library/Processor/Processor.hh
diff --git a/Src/Cpp/Library/Processor/ProcessorToolbox.cc b/Cpp/Library/Processor/ProcessorToolbox.cc
similarity index 100%
rename from Src/Cpp/Library/Processor/ProcessorToolbox.cc
rename to Cpp/Library/Processor/ProcessorToolbox.cc
diff --git a/Src/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/ProcessorToolbox.hh
rename to Cpp/Library/Processor/ProcessorToolbox.hh
diff --git a/Src/Cpp/Library/Processor/QuitChain.hh b/Cpp/Library/Processor/QuitChain.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/QuitChain.hh
rename to Cpp/Library/Processor/QuitChain.hh
diff --git a/Src/Cpp/Library/Processor/Signal.hh b/Cpp/Library/Processor/Signal.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/Signal.hh
rename to Cpp/Library/Processor/Signal.hh
diff --git a/Src/Cpp/Library/Processor/SignalSlotBase.cc b/Cpp/Library/Processor/SignalSlotBase.cc
similarity index 100%
rename from Src/Cpp/Library/Processor/SignalSlotBase.cc
rename to Cpp/Library/Processor/SignalSlotBase.cc
diff --git a/Src/Cpp/Library/Processor/SignalSlotBase.hh b/Cpp/Library/Processor/SignalSlotBase.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/SignalSlotBase.hh
rename to Cpp/Library/Processor/SignalSlotBase.hh
diff --git a/Src/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
similarity index 100%
rename from Src/Cpp/Library/Processor/Slot.hh
rename to Cpp/Library/Processor/Slot.hh
diff --git a/Src/Cpp/Library/Utility/Exception.cc b/Cpp/Library/Utility/Exception.cc
similarity index 100%
rename from Src/Cpp/Library/Utility/Exception.cc
rename to Cpp/Library/Utility/Exception.cc
diff --git a/Src/Cpp/Library/Utility/Exception.hh b/Cpp/Library/Utility/Exception.hh
similarity index 100%
rename from Src/Cpp/Library/Utility/Exception.hh
rename to Cpp/Library/Utility/Exception.hh
diff --git a/Src/Cpp/Library/Utility/MemberVariable.hh b/Cpp/Library/Utility/MemberVariable.hh
similarity index 100%
rename from Src/Cpp/Library/Utility/MemberVariable.hh
rename to Cpp/Library/Utility/MemberVariable.hh
diff --git a/Src/Cpp/Library_v1/AddLibPythonPath.sh.in b/Cpp/Library_v1/AddLibPythonPath.sh.in
similarity index 100%
rename from Src/Cpp/Library_v1/AddLibPythonPath.sh.in
rename to Cpp/Library_v1/AddLibPythonPath.sh.in
diff --git a/Src/Cpp/Library_v1/Application/KTApplication.cc b/Cpp/Library_v1/Application/KTApplication.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTApplication.cc
rename to Cpp/Library_v1/Application/KTApplication.cc
diff --git a/Src/Cpp/Library_v1/Application/KTApplication.hh b/Cpp/Library_v1/Application/KTApplication.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTApplication.hh
rename to Cpp/Library_v1/Application/KTApplication.hh
diff --git a/Src/Cpp/Library_v1/Application/KTCommandLineHandler.cc b/Cpp/Library_v1/Application/KTCommandLineHandler.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTCommandLineHandler.cc
rename to Cpp/Library_v1/Application/KTCommandLineHandler.cc
diff --git a/Src/Cpp/Library_v1/Application/KTCommandLineHandler.hh b/Cpp/Library_v1/Application/KTCommandLineHandler.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTCommandLineHandler.hh
rename to Cpp/Library_v1/Application/KTCommandLineHandler.hh
diff --git a/Src/Cpp/Library_v1/Application/KTCommandLineOption.hh b/Cpp/Library_v1/Application/KTCommandLineOption.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTCommandLineOption.hh
rename to Cpp/Library_v1/Application/KTCommandLineOption.hh
diff --git a/Src/Cpp/Library_v1/Application/KTConfigurator.cc b/Cpp/Library_v1/Application/KTConfigurator.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTConfigurator.cc
rename to Cpp/Library_v1/Application/KTConfigurator.cc
diff --git a/Src/Cpp/Library_v1/Application/KTConfigurator.hh b/Cpp/Library_v1/Application/KTConfigurator.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTConfigurator.hh
rename to Cpp/Library_v1/Application/KTConfigurator.hh
diff --git a/Src/Cpp/Library_v1/Application/KTDataQueueProcessor.cc b/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTDataQueueProcessor.cc
rename to Cpp/Library_v1/Application/KTDataQueueProcessor.cc
diff --git a/Src/Cpp/Library_v1/Application/KTDataQueueProcessor.hh b/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTDataQueueProcessor.hh
rename to Cpp/Library_v1/Application/KTDataQueueProcessor.hh
diff --git a/Src/Cpp/Library_v1/Application/KTFilenameParsers.cc b/Cpp/Library_v1/Application/KTFilenameParsers.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTFilenameParsers.cc
rename to Cpp/Library_v1/Application/KTFilenameParsers.cc
diff --git a/Src/Cpp/Library_v1/Application/KTFilenameParsers.hh b/Cpp/Library_v1/Application/KTFilenameParsers.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTFilenameParsers.hh
rename to Cpp/Library_v1/Application/KTFilenameParsers.hh
diff --git a/Src/Cpp/Library_v1/Application/KTPrintDataStructure.cc b/Cpp/Library_v1/Application/KTPrintDataStructure.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTPrintDataStructure.cc
rename to Cpp/Library_v1/Application/KTPrintDataStructure.cc
diff --git a/Src/Cpp/Library_v1/Application/KTPrintDataStructure.hh b/Cpp/Library_v1/Application/KTPrintDataStructure.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTPrintDataStructure.hh
rename to Cpp/Library_v1/Application/KTPrintDataStructure.hh
diff --git a/Src/Cpp/Library_v1/Application/KTProcessorToolbox.cc b/Cpp/Library_v1/Application/KTProcessorToolbox.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTProcessorToolbox.cc
rename to Cpp/Library_v1/Application/KTProcessorToolbox.cc
diff --git a/Src/Cpp/Library_v1/Application/KTProcessorToolbox.hh b/Cpp/Library_v1/Application/KTProcessorToolbox.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTProcessorToolbox.hh
rename to Cpp/Library_v1/Application/KTProcessorToolbox.hh
diff --git a/Src/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh b/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
rename to Cpp/Library_v1/Application/KTProcessorToolboxPybind.hh
diff --git a/Src/Cpp/Library_v1/Application/KTRunNymph.cc b/Cpp/Library_v1/Application/KTRunNymph.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTRunNymph.cc
rename to Cpp/Library_v1/Application/KTRunNymph.cc
diff --git a/Src/Cpp/Library_v1/Application/KTRunNymph.hh b/Cpp/Library_v1/Application/KTRunNymph.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTRunNymph.hh
rename to Cpp/Library_v1/Application/KTRunNymph.hh
diff --git a/Src/Cpp/Library_v1/Application/KTThroughputProfiler.cc b/Cpp/Library_v1/Application/KTThroughputProfiler.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTThroughputProfiler.cc
rename to Cpp/Library_v1/Application/KTThroughputProfiler.cc
diff --git a/Src/Cpp/Library_v1/Application/KTThroughputProfiler.hh b/Cpp/Library_v1/Application/KTThroughputProfiler.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Application/KTThroughputProfiler.hh
rename to Cpp/Library_v1/Application/KTThroughputProfiler.hh
diff --git a/Src/Cpp/Library_v1/CMakeLists.txt b/Cpp/Library_v1/CMakeLists.txt
similarity index 100%
rename from Src/Cpp/Library_v1/CMakeLists.txt
rename to Cpp/Library_v1/CMakeLists.txt
diff --git a/Src/Cpp/Library_v1/Data/KTApplyCut.cc b/Cpp/Library_v1/Data/KTApplyCut.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTApplyCut.cc
rename to Cpp/Library_v1/Data/KTApplyCut.cc
diff --git a/Src/Cpp/Library_v1/Data/KTApplyCut.hh b/Cpp/Library_v1/Data/KTApplyCut.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTApplyCut.hh
rename to Cpp/Library_v1/Data/KTApplyCut.hh
diff --git a/Src/Cpp/Library_v1/Data/KTCoreData.cc b/Cpp/Library_v1/Data/KTCoreData.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCoreData.cc
rename to Cpp/Library_v1/Data/KTCoreData.cc
diff --git a/Src/Cpp/Library_v1/Data/KTCoreData.hh b/Cpp/Library_v1/Data/KTCoreData.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCoreData.hh
rename to Cpp/Library_v1/Data/KTCoreData.hh
diff --git a/Src/Cpp/Library_v1/Data/KTCut.cc b/Cpp/Library_v1/Data/KTCut.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCut.cc
rename to Cpp/Library_v1/Data/KTCut.cc
diff --git a/Src/Cpp/Library_v1/Data/KTCut.hh b/Cpp/Library_v1/Data/KTCut.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCut.hh
rename to Cpp/Library_v1/Data/KTCut.hh
diff --git a/Src/Cpp/Library_v1/Data/KTCutFilter.cc b/Cpp/Library_v1/Data/KTCutFilter.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCutFilter.cc
rename to Cpp/Library_v1/Data/KTCutFilter.cc
diff --git a/Src/Cpp/Library_v1/Data/KTCutFilter.hh b/Cpp/Library_v1/Data/KTCutFilter.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCutFilter.hh
rename to Cpp/Library_v1/Data/KTCutFilter.hh
diff --git a/Src/Cpp/Library_v1/Data/KTCutResult.hh b/Cpp/Library_v1/Data/KTCutResult.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCutResult.hh
rename to Cpp/Library_v1/Data/KTCutResult.hh
diff --git a/Src/Cpp/Library_v1/Data/KTCutStatus.cc b/Cpp/Library_v1/Data/KTCutStatus.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCutStatus.cc
rename to Cpp/Library_v1/Data/KTCutStatus.cc
diff --git a/Src/Cpp/Library_v1/Data/KTCutStatus.hh b/Cpp/Library_v1/Data/KTCutStatus.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTCutStatus.hh
rename to Cpp/Library_v1/Data/KTCutStatus.hh
diff --git a/Src/Cpp/Library_v1/Data/KTData.cc b/Cpp/Library_v1/Data/KTData.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTData.cc
rename to Cpp/Library_v1/Data/KTData.cc
diff --git a/Src/Cpp/Library_v1/Data/KTData.hh b/Cpp/Library_v1/Data/KTData.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTData.hh
rename to Cpp/Library_v1/Data/KTData.hh
diff --git a/Src/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh b/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
rename to Cpp/Library_v1/Data/KTRegisterNymphExtData.hh
diff --git a/Src/Cpp/Library_v1/Data/KTTester.cc b/Cpp/Library_v1/Data/KTTester.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTTester.cc
rename to Cpp/Library_v1/Data/KTTester.cc
diff --git a/Src/Cpp/Library_v1/Data/KTTester.hh b/Cpp/Library_v1/Data/KTTester.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Data/KTTester.hh
rename to Cpp/Library_v1/Data/KTTester.hh
diff --git a/Src/Cpp/Library_v1/IO/KTJSONWriter.cc b/Cpp/Library_v1/IO/KTJSONWriter.cc
similarity index 100%
rename from Src/Cpp/Library_v1/IO/KTJSONWriter.cc
rename to Cpp/Library_v1/IO/KTJSONWriter.cc
diff --git a/Src/Cpp/Library_v1/IO/KTJSONWriter.hh b/Cpp/Library_v1/IO/KTJSONWriter.hh
similarity index 100%
rename from Src/Cpp/Library_v1/IO/KTJSONWriter.hh
rename to Cpp/Library_v1/IO/KTJSONWriter.hh
diff --git a/Src/Cpp/Library_v1/IO/KTReader.cc b/Cpp/Library_v1/IO/KTReader.cc
similarity index 100%
rename from Src/Cpp/Library_v1/IO/KTReader.cc
rename to Cpp/Library_v1/IO/KTReader.cc
diff --git a/Src/Cpp/Library_v1/IO/KTReader.hh b/Cpp/Library_v1/IO/KTReader.hh
similarity index 100%
rename from Src/Cpp/Library_v1/IO/KTReader.hh
rename to Cpp/Library_v1/IO/KTReader.hh
diff --git a/Src/Cpp/Library_v1/IO/KTWriter.cc b/Cpp/Library_v1/IO/KTWriter.cc
similarity index 100%
rename from Src/Cpp/Library_v1/IO/KTWriter.cc
rename to Cpp/Library_v1/IO/KTWriter.cc
diff --git a/Src/Cpp/Library_v1/IO/KTWriter.hh b/Cpp/Library_v1/IO/KTWriter.hh
similarity index 100%
rename from Src/Cpp/Library_v1/IO/KTWriter.hh
rename to Cpp/Library_v1/IO/KTWriter.hh
diff --git a/Src/Cpp/Library_v1/NymphPybind.cc b/Cpp/Library_v1/NymphPybind.cc
similarity index 100%
rename from Src/Cpp/Library_v1/NymphPybind.cc
rename to Cpp/Library_v1/NymphPybind.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTConnection.hh b/Cpp/Library_v1/Processor/KTConnection.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTConnection.hh
rename to Cpp/Library_v1/Processor/KTConnection.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTNymphSignals.hh b/Cpp/Library_v1/Processor/KTNymphSignals.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTNymphSignals.hh
rename to Cpp/Library_v1/Processor/KTNymphSignals.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTNymphSlot.hh b/Cpp/Library_v1/Processor/KTNymphSlot.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTNymphSlot.hh
rename to Cpp/Library_v1/Processor/KTNymphSlot.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc b/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
rename to Cpp/Library_v1/Processor/KTPrimaryProcessor.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh b/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
rename to Cpp/Library_v1/Processor/KTPrimaryProcessor.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTProcessor.cc b/Cpp/Library_v1/Processor/KTProcessor.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTProcessor.cc
rename to Cpp/Library_v1/Processor/KTProcessor.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTProcessor.hh b/Cpp/Library_v1/Processor/KTProcessor.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTProcessor.hh
rename to Cpp/Library_v1/Processor/KTProcessor.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTProcessorPybind.cc b/Cpp/Library_v1/Processor/KTProcessorPybind.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTProcessorPybind.cc
rename to Cpp/Library_v1/Processor/KTProcessorPybind.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTProcessorPybind.hh b/Cpp/Library_v1/Processor/KTProcessorPybind.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTProcessorPybind.hh
rename to Cpp/Library_v1/Processor/KTProcessorPybind.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTPyProcessor.hh b/Cpp/Library_v1/Processor/KTPyProcessor.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTPyProcessor.hh
rename to Cpp/Library_v1/Processor/KTPyProcessor.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTSignal.hh b/Cpp/Library_v1/Processor/KTSignal.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSignal.hh
rename to Cpp/Library_v1/Processor/KTSignal.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTSignalSlotBase.hh b/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSignalSlotBase.hh
rename to Cpp/Library_v1/Processor/KTSignalSlotBase.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTSignalWrapper.cc b/Cpp/Library_v1/Processor/KTSignalWrapper.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSignalWrapper.cc
rename to Cpp/Library_v1/Processor/KTSignalWrapper.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTSignalWrapper.hh b/Cpp/Library_v1/Processor/KTSignalWrapper.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSignalWrapper.hh
rename to Cpp/Library_v1/Processor/KTSignalWrapper.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTSlot.hh b/Cpp/Library_v1/Processor/KTSlot.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSlot.hh
rename to Cpp/Library_v1/Processor/KTSlot.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTSlotWrapper.cc b/Cpp/Library_v1/Processor/KTSlotWrapper.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSlotWrapper.cc
rename to Cpp/Library_v1/Processor/KTSlotWrapper.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTSlotWrapper.hh b/Cpp/Library_v1/Processor/KTSlotWrapper.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTSlotWrapper.hh
rename to Cpp/Library_v1/Processor/KTSlotWrapper.hh
diff --git a/Src/Cpp/Library_v1/Processor/KTThreadReference.cc b/Cpp/Library_v1/Processor/KTThreadReference.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTThreadReference.cc
rename to Cpp/Library_v1/Processor/KTThreadReference.cc
diff --git a/Src/Cpp/Library_v1/Processor/KTThreadReference.hh b/Cpp/Library_v1/Processor/KTThreadReference.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Processor/KTThreadReference.hh
rename to Cpp/Library_v1/Processor/KTThreadReference.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTCacheDirectory.cc b/Cpp/Library_v1/Utility/KTCacheDirectory.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTCacheDirectory.cc
rename to Cpp/Library_v1/Utility/KTCacheDirectory.cc
diff --git a/Src/Cpp/Library_v1/Utility/KTCacheDirectory.hh b/Cpp/Library_v1/Utility/KTCacheDirectory.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTCacheDirectory.hh
rename to Cpp/Library_v1/Utility/KTCacheDirectory.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTConcurrentQueue.hh b/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTConcurrentQueue.hh
rename to Cpp/Library_v1/Utility/KTConcurrentQueue.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTConfigurable.cc b/Cpp/Library_v1/Utility/KTConfigurable.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTConfigurable.cc
rename to Cpp/Library_v1/Utility/KTConfigurable.cc
diff --git a/Src/Cpp/Library_v1/Utility/KTConfigurable.hh b/Cpp/Library_v1/Utility/KTConfigurable.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTConfigurable.hh
rename to Cpp/Library_v1/Utility/KTConfigurable.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTConfigurablePybind.hh b/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTConfigurablePybind.hh
rename to Cpp/Library_v1/Utility/KTConfigurablePybind.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTDirectory.cc b/Cpp/Library_v1/Utility/KTDirectory.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTDirectory.cc
rename to Cpp/Library_v1/Utility/KTDirectory.cc
diff --git a/Src/Cpp/Library_v1/Utility/KTDirectory.hh b/Cpp/Library_v1/Utility/KTDirectory.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTDirectory.hh
rename to Cpp/Library_v1/Utility/KTDirectory.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTEventLoop.cc b/Cpp/Library_v1/Utility/KTEventLoop.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTEventLoop.cc
rename to Cpp/Library_v1/Utility/KTEventLoop.cc
diff --git a/Src/Cpp/Library_v1/Utility/KTEventLoop.hh b/Cpp/Library_v1/Utility/KTEventLoop.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTEventLoop.hh
rename to Cpp/Library_v1/Utility/KTEventLoop.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTException.cc b/Cpp/Library_v1/Utility/KTException.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTException.cc
rename to Cpp/Library_v1/Utility/KTException.cc
diff --git a/Src/Cpp/Library_v1/Utility/KTException.hh b/Cpp/Library_v1/Utility/KTException.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTException.hh
rename to Cpp/Library_v1/Utility/KTException.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTExtensible.hh b/Cpp/Library_v1/Utility/KTExtensible.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTExtensible.hh
rename to Cpp/Library_v1/Utility/KTExtensible.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTExtensibleStruct.hh b/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTExtensibleStruct.hh
rename to Cpp/Library_v1/Utility/KTExtensibleStruct.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh b/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
rename to Cpp/Library_v1/Utility/KTExtensibleStructFactory.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTLogger.hh b/Cpp/Library_v1/Utility/KTLogger.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTLogger.hh
rename to Cpp/Library_v1/Utility/KTLogger.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTMemberVariable.hh b/Cpp/Library_v1/Utility/KTMemberVariable.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTMemberVariable.hh
rename to Cpp/Library_v1/Utility/KTMemberVariable.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTParamPybind.hh b/Cpp/Library_v1/Utility/KTParamPybind.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTParamPybind.hh
rename to Cpp/Library_v1/Utility/KTParamPybind.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTPythonMacros.hh b/Cpp/Library_v1/Utility/KTPythonMacros.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTPythonMacros.hh
rename to Cpp/Library_v1/Utility/KTPythonMacros.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTTIFactory.hh b/Cpp/Library_v1/Utility/KTTIFactory.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTTIFactory.hh
rename to Cpp/Library_v1/Utility/KTTIFactory.hh
diff --git a/Src/Cpp/Library_v1/Utility/KTTime.cc b/Cpp/Library_v1/Utility/KTTime.cc
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTTime.cc
rename to Cpp/Library_v1/Utility/KTTime.cc
diff --git a/Src/Cpp/Library_v1/Utility/KTTime.hh b/Cpp/Library_v1/Utility/KTTime.hh
similarity index 100%
rename from Src/Cpp/Library_v1/Utility/KTTime.hh
rename to Cpp/Library_v1/Utility/KTTime.hh
diff --git a/Src/Cpp/Templates/KTProcessorTemplate.cc b/Cpp/Templates/KTProcessorTemplate.cc
similarity index 100%
rename from Src/Cpp/Templates/KTProcessorTemplate.cc
rename to Cpp/Templates/KTProcessorTemplate.cc
diff --git a/Src/Cpp/Templates/KTProcessorTemplate.hh b/Cpp/Templates/KTProcessorTemplate.hh
similarity index 100%
rename from Src/Cpp/Templates/KTProcessorTemplate.hh
rename to Cpp/Templates/KTProcessorTemplate.hh
diff --git a/Src/Cpp/Templates/MainCMakeLists.txt b/Cpp/Templates/MainCMakeLists.txt
similarity index 100%
rename from Src/Cpp/Templates/MainCMakeLists.txt
rename to Cpp/Templates/MainCMakeLists.txt
diff --git a/External/cereal b/External/cereal
new file mode 160000
index 0000000..51cbda5
--- /dev/null
+++ b/External/cereal
@@ -0,0 +1 @@
+Subproject commit 51cbda5f30e56c801c07fe3d3aba5d7fb9e6cca4
diff --git a/MANIFEST.in b/MANIFEST.in
index 0d287ce..1cfdf45 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
-graft Src/Scarab
-graft Src/External
-graft Src/Cpp
+graft Scarab
+graft External
+graft Cpp
+graft Python
 graft Testing
 graft cmake
 include CMakeLists.txt
diff --git a/NymphConfig.cmake.in b/NymphConfig.cmake.in
index 52fc373..9ec817e 100644
--- a/NymphConfig.cmake.in
+++ b/NymphConfig.cmake.in
@@ -4,7 +4,7 @@ get_filename_component( Nymph_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
 
 # Find the dependencies
 include( CMakeFindDependencyMacro )
-find_dependency( Scarab REQUIRED PATHS ${Nymph_CMAKE_DIR}/Src/Scarab @Scarab_BINARY_LOCATION@ )
+find_dependency( Scarab REQUIRED PATHS ${Nymph_CMAKE_DIR} /Scarab @Scarab_BINARY_LOCATION@ )
 
 # Import library targets if they're not already present
 if( NOT TARGET Nymph::@Nymph_FULL_TARGET_NAME@ )
diff --git a/Src/Python/CMakeLists.txt b/Python/CMakeLists.txt
similarity index 73%
rename from Src/Python/CMakeLists.txt
rename to Python/CMakeLists.txt
index 74046ef..83accc7 100644
--- a/Src/Python/CMakeLists.txt
+++ b/Python/CMakeLists.txt
@@ -9,13 +9,13 @@ cmake_minimum_required (VERSION 3.12)
 # Setup #
 #########
 cmake_policy( SET CMP0048 NEW ) # version in project()
-project( NymphPy VERSION 2.0.0 )
+project( Nymph VERSION 2.0.0 )
 
-list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../Src/Scarab/cmake )
+#list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../Scarab/cmake )
 include( PackageBuilder )
 
 ###############
-# Build NymphPy #
+# Build Nymph #
 ###############
 
 message( "Building Python bindings")
@@ -32,9 +32,9 @@ set( PYBINDING_SOURCEFILES
 
 )
 
-set( PROJECT_LIBRARIES Scarab )
+#set( PROJECT_LIBRARIES Nymph )
 
-pbuilder_add_pybind11_module( scarab ${PROJECT_LIBRARIES} )
+#pbuilder_add_pybind11_module( Nymph ${PROJECT_LIBRARIES} )
 
 pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 
diff --git a/Src/Python/README.md b/Python/README.md
similarity index 100%
rename from Src/Python/README.md
rename to Python/README.md
diff --git a/Src/Python/nymph/__init__.py b/Python/nymph/__init__.py
similarity index 100%
rename from Src/Python/nymph/__init__.py
rename to Python/nymph/__init__.py
diff --git a/Scarab b/Scarab
new file mode 160000
index 0000000..a20a6db
--- /dev/null
+++ b/Scarab
@@ -0,0 +1 @@
+Subproject commit a20a6dbe4cdd1ef489515a21f7987cc6867a753c
diff --git a/Src/External/cereal/.gitignore b/Src/External/cereal/.gitignore
deleted file mode 100644
index 44c7498..0000000
--- a/Src/External/cereal/.gitignore
+++ /dev/null
@@ -1,49 +0,0 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-
-# Visual studio cruft
-*.opensdf
-*.sdf
-*.suo
-*.user
-*/x64
-*/Debug*
-*/Release*
-*.log
-*.tlog*
-*.obj
-*.VC.db
-*.VC.VC.opendb
-*.pdb
-
-# misc files mostly used for testing
-out.txt
-ptr.txt
-test.txt
-boost_serialize
-arr.txt
-performance
-include_renamed
-.ycm_extra_conf.py*
-doc/html
-rtti.txt
-doc/latex
-portability64
-portability32
-file.json
-out.xml
-cereal_version.out
-xml_ordering.out
-build
-/out/
\ No newline at end of file
diff --git a/Src/External/cereal/.travis.yml b/Src/External/cereal/.travis.yml
deleted file mode 100644
index ae12dbc..0000000
--- a/Src/External/cereal/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: cpp
-dist: trusty
-sudo: false
-group: beta
-
-addons:
-  apt:
-    sources:
-      - 'ubuntu-toolchain-r-test'
-      - 'boost-latest'
-    packages:
-      - 'g++-multilib'
-      - 'libboost-serialization-dev'
-#      - 'libboost-test-dev'
-
-compiler:
-  - gcc
-
-matrix:
-  include:
-    - os: linux
-      compiler: clang
-      env: CMAKE_OPTIONS="-DSKIP_PORTABILITY_TEST=ON"
-
-    # TODO: Add an entry for valgrind
-    #  after_script: make valgrind
-
-    - os: osx
-      osx_image: xcode8
-      compiler: clang
-
-script:
-  - mkdir build && cd build
-  - cmake ${CMAKE_OPTIONS} .. && make -j4
-  - ctest . --output-on-failure
-
-branches:
-  only:
-    - develop
diff --git a/Src/External/cereal/CMakeLists.txt b/Src/External/cereal/CMakeLists.txt
deleted file mode 100644
index dcb9cd6..0000000
--- a/Src/External/cereal/CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-cmake_minimum_required (VERSION 2.6.2)
-project (cereal)
-
-option(SKIP_PORTABILITY_TEST "Skip portability (32 bit) tests" OFF)
-if(NOT CMAKE_VERSION VERSION_LESS 3.0) # installing cereal requires INTERFACE lib
-    option(JUST_INSTALL_CEREAL "Don't do anything besides installing the library" OFF)
-endif()
-
-option(THREAD_SAFE "Use mutexes to ensure thread safety" OFF)
-if(THREAD_SAFE)
-    add_definitions(-DCEREAL_THREAD_SAFE=1)
-    set(CEREAL_THREAD_LIBS "pthread")
-else()
-    set(CEREAL_THREAD_LIBS "")
-endif()
-
-if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /W3 /WX")
-else()
-    set(CMAKE_CXX_FLAGS "-Wall -g -Wextra -Wshadow -pedantic -Wold-style-cast ${CMAKE_CXX_FLAGS}")
-    option(WITH_WERROR "Compile with '-Werror' C++ compiler flag" ON)
-    if(WITH_WERROR)
-        set(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
-    endif(WITH_WERROR)
-    if(CMAKE_VERSION VERSION_LESS 3.1)
-        set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
-    else()
-        if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD STREQUAL "98")
-            set(CMAKE_CXX_STANDARD 11)
-        endif()
-        set(CMAKE_CXX_STANDARD_REQUIRED ON)
-    endif()
-endif()
-
-if(NOT CMAKE_VERSION VERSION_LESS 3.0)
-    add_library(cereal INTERFACE)
-    target_include_directories(cereal INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:include>
-    )
-    install(TARGETS cereal EXPORT cereal
-        DESTINATION lib) # ignored
-    install(EXPORT cereal FILE cereal-config.cmake
-        DESTINATION share/cmake/cereal)
-    install(DIRECTORY include/cereal DESTINATION include)
-endif()
-
-if(JUST_INSTALL_CEREAL)
-    return()
-endif()
-
-include_directories(./include)
-
-# Boost serialization for performance sandbox
-find_package(Boost COMPONENTS serialization)
-
-if(Boost_FOUND)
-  include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
-endif(Boost_FOUND)
-  
-enable_testing()
-add_subdirectory(unittests)
-
-add_subdirectory(sandbox)
-
-add_subdirectory(doc)
diff --git a/Src/External/cereal/LICENSE b/Src/External/cereal/LICENSE
deleted file mode 100644
index acc4fd8..0000000
--- a/Src/External/cereal/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2014, Randolph Voorhies, Shane Grant
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of cereal nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Src/External/cereal/README.md b/Src/External/cereal/README.md
deleted file mode 100644
index 1001f50..0000000
--- a/Src/External/cereal/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-cereal - A C++11 library for serialization
-==========================================
-
-<img src="http://uscilab.github.io/cereal/assets/img/cerealboxside.png" align="right"/><p>cereal is a header-only C++11 serialization library.  cereal takes arbitrary data types and reversibly turns them into different representations, such as compact binary encodings, XML, or JSON.  cereal was designed to be fast, light-weight, and easy to extend - it has no external dependencies and can be easily bundled with other code or used standalone.</p>
-
-### cereal has great documentation
-
-Looking for more information on how cereal works and its documentation?  Visit [cereal's web page](http://USCiLab.github.com/cereal) to get the latest information.
-
-### cereal is easy to use
-
-Installation and use of of cereal is fully documented on the [main web page](http://USCiLab.github.com/cereal), but this is a quick and dirty version:
-
-* Download cereal and place the headers somewhere your code can see them
-* Write serialization functions for your custom types or use the built in support for the standard library cereal provides
-* Use the serialization archives to load and save data
-
-```cpp
-#include <cereal/types/unordered_map.hpp>
-#include <cereal/types/memory.hpp>
-#include <cereal/archives/binary.hpp>
-#include <fstream>
-    
-struct MyRecord
-{
-  uint8_t x, y;
-  float z;
-  
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x, y, z );
-  }
-};
-    
-struct SomeData
-{
-  int32_t id;
-  std::shared_ptr<std::unordered_map<uint32_t, MyRecord>> data;
-  
-  template <class Archive>
-  void save( Archive & ar ) const
-  {
-    ar( data );
-  }
-      
-  template <class Archive>
-  void load( Archive & ar )
-  {
-    static int32_t idGen = 0;
-    id = idGen++;
-    ar( data );
-  }
-};
-
-int main()
-{
-  std::ofstream os("out.cereal", std::ios::binary);
-  cereal::BinaryOutputArchive archive( os );
-
-  SomeData myData;
-  archive( myData );
-
-  return 0;
-}
-```    
-
-### cereal has a mailing list
-
-Either get in touch over <a href="mailto:cerealcpp@googlegroups.com">email</a> or [on the web](https://groups.google.com/forum/#!forum/cerealcpp).
-
-
-
-## cereal has a permissive license
-
-cereal is licensed under the [BSD license](http://opensource.org/licenses/BSD-3-Clause).
-
-## cereal build status
-
-* develop : [![Build Status](https://travis-ci.org/USCiLab/cereal.png?branch=develop)](https://travis-ci.org/USCiLab/cereal)
-[![Build status](https://ci.appveyor.com/api/projects/status/91aou6smj36or0vb/branch/develop?svg=true)](https://ci.appveyor.com/project/AzothAmmo/cereal/branch/develop)
-
----
-
-Were you looking for the Haskell cereal?  Go <a href="https://github.com/GaloisInc/cereal">here</a>.
diff --git a/Src/External/cereal/appveyor.yml b/Src/External/cereal/appveyor.yml
deleted file mode 100644
index 121eba1..0000000
--- a/Src/External/cereal/appveyor.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# can use variables like {build} and {branch}
-version: 1.2.{build}
-pull_requests:
-  do_not_increment_build_number: true
-
-branches:
-  only:
-    - develop
-
-configuration:
-  - Debug
-  - Release
-
-environment:
-  matrix:
-    - VS_VERSION_MAJOR: 12
-    - VS_VERSION_MAJOR: 14
-      BOOST_ROOT: C:\Libraries\boost_1_59_0
-
-platform:
-  - Win32
-  - x64
-
-before_build: "scripts\\appveyor.bat"
-
-build:
-  parallel: true
-  project: build/cereal.sln
-  verbosity: minimal
-
-test_script: "scripts\\appveyor.bat test"
-
-artifacts:
-  - path: build\Testing
-  - path: out
diff --git a/Src/External/cereal/doc/CMakeLists.txt b/Src/External/cereal/doc/CMakeLists.txt
deleted file mode 100644
index ec0316e..0000000
--- a/Src/External/cereal/doc/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doxygen.in" "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg" @ONLY)
-  add_custom_target(doc
-    COMMAND ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/.."
-    COMMENT "Generating API documentation with Doxygen" VERBATIM
-    )
-
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../scripts/updatedoc.in" "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh" @ONLY)
-  add_custom_target(update-doc
-    COMMAND "${CMAKE_CURRENT_BINARY_DIR}/updatedoc.sh"
-    DEPENDS doc
-    COMMENT "Copying documentation to gh-pages branch" VERBATIM
-    )
-
-endif(DOXYGEN_FOUND)
\ No newline at end of file
diff --git a/Src/External/cereal/doc/DoxygenLayout.xml b/Src/External/cereal/doc/DoxygenLayout.xml
deleted file mode 100644
index 819c4f4..0000000
--- a/Src/External/cereal/doc/DoxygenLayout.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.3.1-20130402 -->
-  <!-- Navigation index tabs for HTML output -->
-  <navindex>
-    <tab type="user" visible="true" title="cereal" url="../../index.html"/>
-    <tab type="mainpage" visible="yes" title="Doxygen Documentation"/>
-    <tab type="pages" visible="no" title="" intro=""/>
-    <tab type="modules" visible="yes" title="Code Modules" intro=""/>
-    <tab type="namespaces" visible="no" title="">
-      <tab type="namespacelist" visible="yes" title="" intro=""/>
-      <tab type="namespacemembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="classes" visible="no" title="">
-      <tab type="classlist" visible="yes" title="" intro=""/>
-      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
-      <tab type="hierarchy" visible="yes" title="" intro=""/>
-      <tab type="classmembers" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="files" visible="yes" title="Source File Documentation">
-      <tab type="filelist" visible="yes" title="" intro=""/>
-      <tab type="globals" visible="yes" title="" intro=""/>
-    </tab>
-    <tab type="examples" visible="no" title="" intro=""/>
-    <tab type="user" visible="true" title="Github" url="https://github.com/USCiLab/cereal"/>
-  </navindex>
-
-  <!-- Layout definition for a class page -->
-  <class>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <inheritancegraph visible="$CLASS_GRAPH"/>
-    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
-      <publicslots title=""/>
-      <signals title=""/>
-      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
-      <protectedslots title=""/>
-      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
-      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
-      <properties title=""/>
-      <events title=""/>
-      <privatetypes title=""/>
-      <privateslots title=""/>
-      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
-      <friends title=""/>
-      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <constructors title=""/>
-      <functions title=""/>
-      <related title=""/>
-      <variables title=""/>
-      <properties title=""/>
-      <events title=""/>
-    </memberdef>
-    <allmemberslink visible="yes"/>
-    <usedfiles visible="$SHOW_USED_FILES"/>
-    <authorsection visible="yes"/>
-  </class>
-
-  <!-- Layout definition for a namespace page -->
-  <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </namespace>
-
-  <!-- Layout definition for a file page -->
-  <file>
-    <briefdescription visible="yes"/>
-    <includes visible="$SHOW_INCLUDE_FILES"/>
-    <includegraph visible="$INCLUDE_GRAPH"/>
-    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
-    <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-    </memberdef>
-    <authorsection/>
-  </file>
-
-  <!-- Layout definition for a group page -->
-  <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-    <memberdef>
-      <pagedocs/>
-      <inlineclasses title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-    </memberdef>
-    <authorsection visible="yes"/>
-  </group>
-
-  <!-- Layout definition for a directory page -->
-  <directory>
-    <briefdescription visible="yes"/>
-    <directorygraph visible="yes"/>
-    <memberdecl>
-      <dirs visible="yes"/>
-      <files visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
-  </directory>
-</doxygenlayout>
diff --git a/Src/External/cereal/doc/doxygen.in b/Src/External/cereal/doc/doxygen.in
deleted file mode 100644
index ddf1398..0000000
--- a/Src/External/cereal/doc/doxygen.in
+++ /dev/null
@@ -1,1870 +0,0 @@
-# Doxyfile 1.8.3.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a hash (#) is considered a comment and will be ignored.
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
-
-PROJECT_NAME           = "cereal"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "A C++11 library for serialization"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
-
-PROJECT_LOGO           =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip. Note that you specify absolute paths here, but also
-# relative paths, which will be relative from the directory where doxygen is
-# started.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = include
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 2
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented classes,
-# or namespaces to their corresponding documentation. Such a link can be
-# prevented in individual cases by by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES (the
-# default) will make doxygen replace the get and set methods by a property in
-# the documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-#SYMBOL_CACHE_SIZE      = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC         = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if section-label ... \endif
-# and \cond section-label ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-LAYOUT_FILE            = "@CMAKE_CURRENT_SOURCE_DIR@/DoxygenLayout.xml"
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path. Do not use
-# file names with spaces, bibtex cannot handle them.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = YES
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../include @CMAKE_CURRENT_SOURCE_DIR@/
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
-
-FILE_PATTERNS          = *.hpp
-FILE_PATTERNS          += *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/../external
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = .* *.cpp */external/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page (index.html).
-# This can be useful if you have a project on for instance GitHub and want reuse
-# the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-#  for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER            ="@CMAKE_CURRENT_SOURCE_DIR@/footer.html"
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If left blank doxygen will
-# generate a default style sheet. Note that it is recommended to use
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-# tag will in the future become obsolete.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-# user-defined cascading style sheet that is included after the standard
-# style sheets created by doxygen. Using this option one can overrule
-# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
-# robust against future updates. Doxygen will copy the style sheet file to
-# the output directory.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-# identify the documentation publisher. This should be a reverse domain-name
-# style string, e.g. com.mycompany.MyDocSet.documentation.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE               =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING     =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
-
-GENERATE_TREEVIEW      = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-# SVG. The default value is HTML-CSS, which is slower, but has the best
-# compatibility.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax.
-# However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS     =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript.
-# There are two flavours of web server based search depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools.
-# See the manual for details.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-# the search results. Doxygen ships with an example indexer (doxyindexer) and
-# search engine (doxysearch.cgi) which are based on the open source search engine
-# library Xapian. See the manual for configuration details.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will returned the search results when EXTERNAL_SEARCH is enabled.
-# Doxygen ships with an example search engine (doxysearch) which is based on
-# the open source search engine library Xapian. See the manual for configuration
-# details.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-# of to a relative location where the documentation can be found.
-# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
-
-LATEX_FOOTER           =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-# XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-# XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = cereal.doxytags
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
-DOT_NUM_THREADS        = 0
-
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
-
-INTERACTIVE_SVG        = NO
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
-
-MSCFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP            = YES
diff --git a/Src/External/cereal/doc/footer.html b/Src/External/cereal/doc/footer.html
deleted file mode 100644
index e76312e..0000000
--- a/Src/External/cereal/doc/footer.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- HTML footer for doxygen 1.8.3.1-->
-<!-- start footer part -->
-<!--BEGIN GENERATE_TREEVIEW-->
-<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-  <ul>
-    $navpath
-    <li class="footer">$generatedby
-    <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
-  </ul>
-</div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-<hr class="footer"/><address class="footer"><small>
-$generatedby &#160;<a href="http://www.doxygen.org/index.html">
-<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/>
-</a> $doxygenversion
-</small></address>
-<!--END !GENERATE_TREEVIEW-->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-42360142-1', 'uscilab.github.io');
-  ga('send', 'pageview');
-
-</script>
-</body>
-</html>
diff --git a/Src/External/cereal/doc/mainpage.dox b/Src/External/cereal/doc/mainpage.dox
deleted file mode 100644
index 066c83c..0000000
--- a/Src/External/cereal/doc/mainpage.dox
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
-\mainpage cereal code documentation
-
-\tableofcontents
-
-Aside from the <a href="../../index.html">documentation</a> presented on the main cereal site, this doxygen
-page offers code level documentation.
-
-\section modules Browse modules
-
-cereal's code is organized into modules of similar functionality.  Take a look at the <a href="modules.html">modules</a>
-section to learn more.  Average users will not need to understand the workings of any code that falls under the
-<i>internal</i> module.
-
-\section files Browse files
-
-If you need reference on a specific file, the <a href="files.html">files</a> page lists all files in cereal.
-*/
-
-  //! \defgroup Archives Input and Output Archive Types
-
-  /*! \defgroup Access Access Control and Disambiguation
-      Provides ways to give cereal access to protected member functions, disambiguate
-      which serialization function cereal should use, and provide ways of using smart
-      pointers with types that have no default constructor. */
-
-  /*! \defgroup Utility Utility Functionality
-      Name-value pairs, binary data wrappers, exceptions, and other utility functions */
-
-  /*! \defgroup TypeSupport Support for Serializing Various Types
-      Serialization of many types is shipped with cereal, including most of the standard library as well as a few others.  */
-
-  /*! \defgroup STLSupport Standard Library Support
-      Serialization methods for nearly all types found in the C++ standard library.
-      \ingroup TypeSupport */
-  
-  /*! \defgroup TypeConcepts Abstract Type Concept Support
-      Serialization methods for more abstract type concepts that can generalize over many types.
-      \ingroup TypeSupport */
-
-  /*! \defgroup OtherTypes Miscellaneous Types Support
-      Support for various other types such as smart pointers to polymorphic base classes, boost::variant, etc.
-      \ingroup TypeSupport */
-
-  /*! \defgroup Internal Internal Functionality
-      Various classes and functions that are critical for the operation of cereal but of no
-      interest to users */
diff --git a/Src/External/cereal/include/cereal/access.hpp b/Src/External/cereal/include/cereal/access.hpp
deleted file mode 100644
index 63c1f74..0000000
--- a/Src/External/cereal/include/cereal/access.hpp
+++ /dev/null
@@ -1,448 +0,0 @@
-/*! \file access.hpp
-    \brief Access control, default construction, and serialization disambiguation */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_ACCESS_HPP_
-#define CEREAL_ACCESS_HPP_
-
-#include <type_traits>
-#include <iostream>
-#include <cstdint>
-#include <functional>
-
-#include "cereal/macros.hpp"
-#include "cereal/details/helpers.hpp"
-
-namespace cereal
-{
-  // ######################################################################
-  //! A class that allows cereal to load smart pointers to types that have no default constructor
-  /*! If your class does not have a default constructor, cereal will not be able
-      to load any smart pointers to it unless you overload LoadAndConstruct
-      for your class, and provide an appropriate load_and_construct method.  You can also
-      choose to define a member static function instead of specializing this class.
-
-      The specialization of LoadAndConstruct must be placed within the cereal namespace:
-
-      @code{.cpp}
-      struct MyType
-      {
-        MyType( int x ); // note: no default ctor
-        int myX;
-
-        // Define a serialize or load/save pair as you normally would
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( myX );
-        }
-      };
-
-      // Provide a specialization for LoadAndConstruct for your type
-      namespace cereal
-      {
-        template <> struct LoadAndConstruct<MyType>
-        {
-          // load_and_construct will be passed the archive that you will be loading
-          // from as well as a construct object which you can use as if it were the
-          // constructor for your type.  cereal will handle all memory management for you.
-          template <class Archive>
-          static void load_and_construct( Archive & ar, cereal::construct<MyType> & construct )
-          {
-            int x;
-            ar( x );
-            construct( x );
-          }
-
-          // if you require versioning, simply add a const std::uint32_t as the final parameter, e.g.:
-          // load_and_construct( Archive & ar, cereal::construct<MyType> & construct, std::uint32_t const version )
-        };
-      } // end namespace cereal
-      @endcode
-
-      Please note that just as in using external serialization functions, you cannot get
-      access to non-public members of your class by befriending cereal::access.  If you
-      have the ability to modify the class you wish to serialize, it is recommended that you
-      use member serialize functions and a static member load_and_construct function.
-
-      load_and_construct functions, regardless of whether they are static members of your class or
-      whether you create one in the LoadAndConstruct specialization, have the following signature:
-
-      @code{.cpp}
-      // generally Archive will be templated, but it can be specific if desired
-      template <class Archive>
-      static void load_and_construct( Archive & ar, cereal::construct<MyType> & construct );
-      // with an optional last parameter specifying the version: const std::uint32_t version
-      @endcode
-
-      Versioning behaves the same way as it does for standard serialization functions.
-
-      @tparam T The type to specialize for
-      @ingroup Access */
-  template <class T>
-  struct LoadAndConstruct
-  { };
-
-  // forward decl for construct
-  //! @cond PRIVATE_NEVERDEFINED
-  namespace memory_detail{ template <class Ar, class T> struct LoadAndConstructLoadWrapper; }
-  //! @endcond
-
-  //! Used to construct types with no default constructor
-  /*! When serializing a type that has no default constructor, cereal
-      will attempt to call either the class static function load_and_construct
-      or the appropriate template specialization of LoadAndConstruct.  cereal
-      will pass that function a reference to the archive as well as a reference
-      to a construct object which should be used to perform the allocation once
-      data has been appropriately loaded.
-
-      @code{.cpp}
-      struct MyType
-      {
-        // note the lack of default constructor
-        MyType( int xx, int yy );
-
-        int x, y;
-        double notInConstructor;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( x, y );
-          ar( notInConstructor );
-        }
-
-        template <class Archive>
-        static void load_and_construct( Archive & ar, cereal::construct<MyType> & construct )
-        {
-          int x, y;
-          ar( x, y );
-
-          // use construct object to initialize with loaded data
-          construct( x, y );
-
-          // access to member variables and functions via -> operator
-          ar( construct->notInConstructor );
-
-          // could also do the above section by:
-          double z;
-          ar( z );
-          construct->notInConstructor = z;
-        }
-      };
-      @endcode
-
-      @tparam T The class type being serialized
-      */
-  template <class T>
-  class construct
-  {
-    public:
-      //! Construct and initialize the type T with the given arguments
-      /*! This will forward all arguments to the underlying type T,
-          calling an appropriate constructor.
-
-          Calling this function more than once will result in an exception
-          being thrown.
-
-          @param args The arguments to the constructor for T
-          @throw Exception If called more than once */
-      template <class ... Args>
-      void operator()( Args && ... args );
-      // implementation deferred due to reliance on cereal::access
-
-      //! Get a reference to the initialized underlying object
-      /*! This must be called after the object has been initialized.
-
-          @return A reference to the initialized object
-          @throw Exception If called before initialization */
-      T * operator->()
-      {
-        if( !itsValid )
-          throw Exception("Object must be initialized prior to accessing members");
-
-        return itsPtr;
-      }
-
-      //! Returns a raw pointer to the initialized underlying object
-      /*! This is mainly intended for use with passing an instance of
-          a constructed object to cereal::base_class.
-
-          It is strongly recommended to avoid using this function in
-          any other circumstance.
-
-          @return A raw pointer to the initialized type */
-      T * ptr()
-      {
-        return operator->();
-      }
-
-    private:
-      template <class A, class B> friend struct ::cereal::memory_detail::LoadAndConstructLoadWrapper;
-
-      construct( T * p ) : itsPtr( p ), itsEnableSharedRestoreFunction( [](){} ), itsValid( false ) {}
-      construct( T * p, std::function<void()> enableSharedFunc ) : // g++4.7 ice with default lambda to std func
-        itsPtr( p ), itsEnableSharedRestoreFunction( enableSharedFunc ), itsValid( false ) {}
-      construct( construct const & ) = delete;
-      construct & operator=( construct const & ) = delete;
-
-      T * itsPtr;
-      std::function<void()> itsEnableSharedRestoreFunction;
-      bool itsValid;
-  };
-
-  // ######################################################################
-  //! A class that can be made a friend to give cereal access to non public functions
-  /*! If you desire non-public serialization functions within a class, cereal can only
-      access these if you declare cereal::access a friend.
-
-      @code{.cpp}
-      class MyClass
-      {
-        private:
-          friend class cereal::access; // gives access to the private serialize
-
-          template <class Archive>
-          void serialize( Archive & ar )
-          {
-            // some code
-          }
-      };
-      @endcode
-      @ingroup Access */
-  class access
-  {
-    public:
-      // ####### Standard Serialization ########################################
-      template<class Archive, class T> inline
-      static auto member_serialize(Archive & ar, T & t) -> decltype(t.CEREAL_SERIALIZE_FUNCTION_NAME(ar))
-      { return t.CEREAL_SERIALIZE_FUNCTION_NAME(ar); }
-
-      template<class Archive, class T> inline
-      static auto member_save(Archive & ar, T const & t) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar))
-      { return t.CEREAL_SAVE_FUNCTION_NAME(ar); }
-
-      template<class Archive, class T> inline
-      static auto member_save_non_const(Archive & ar, T & t) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar))
-      { return t.CEREAL_SAVE_FUNCTION_NAME(ar); }
-
-      template<class Archive, class T> inline
-      static auto member_load(Archive & ar, T & t) -> decltype(t.CEREAL_LOAD_FUNCTION_NAME(ar))
-      { return t.CEREAL_LOAD_FUNCTION_NAME(ar); }
-
-      template<class Archive, class T> inline
-      static auto member_save_minimal(Archive const & ar, T const & t) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar))
-      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar); }
-
-      template<class Archive, class T> inline
-      static auto member_save_minimal_non_const(Archive const & ar, T & t) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar))
-      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar); }
-
-      template<class Archive, class T, class U> inline
-      static auto member_load_minimal(Archive const & ar, T & t, U && u) -> decltype(t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u)))
-      { return t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u)); }
-
-      // ####### Versioned Serialization #######################################
-      template<class Archive, class T> inline
-      static auto member_serialize(Archive & ar, T & t, const std::uint32_t version ) -> decltype(t.CEREAL_SERIALIZE_FUNCTION_NAME(ar, version))
-      { return t.CEREAL_SERIALIZE_FUNCTION_NAME(ar, version); }
-
-      template<class Archive, class T> inline
-      static auto member_save(Archive & ar, T const & t, const std::uint32_t version ) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar, version))
-      { return t.CEREAL_SAVE_FUNCTION_NAME(ar, version); }
-
-      template<class Archive, class T> inline
-      static auto member_save_non_const(Archive & ar, T & t, const std::uint32_t version ) -> decltype(t.CEREAL_SAVE_FUNCTION_NAME(ar, version))
-      { return t.CEREAL_SAVE_FUNCTION_NAME(ar, version); }
-
-      template<class Archive, class T> inline
-      static auto member_load(Archive & ar, T & t, const std::uint32_t version ) -> decltype(t.CEREAL_LOAD_FUNCTION_NAME(ar, version))
-      { return t.CEREAL_LOAD_FUNCTION_NAME(ar, version); }
-
-      template<class Archive, class T> inline
-      static auto member_save_minimal(Archive const & ar, T const & t, const std::uint32_t version) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version))
-      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version); }
-
-      template<class Archive, class T> inline
-      static auto member_save_minimal_non_const(Archive const & ar, T & t, const std::uint32_t version) -> decltype(t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version))
-      { return t.CEREAL_SAVE_MINIMAL_FUNCTION_NAME(ar, version); }
-
-      template<class Archive, class T, class U> inline
-      static auto member_load_minimal(Archive const & ar, T & t, U && u, const std::uint32_t version) -> decltype(t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u), version))
-      { return t.CEREAL_LOAD_MINIMAL_FUNCTION_NAME(ar, std::forward<U>(u), version); }
-
-      // ####### Other Functionality ##########################################
-      // for detecting inheritance from enable_shared_from_this
-      template <class T> inline
-      static auto shared_from_this(T & t) -> decltype(t.shared_from_this());
-
-      // for placement new
-      template <class T, class ... Args> inline
-      static void construct( T *& ptr, Args && ... args )
-      {
-        new (ptr) T( std::forward<Args>( args )... );
-      }
-
-      // for non-placement new with a default constructor
-      template <class T> inline
-      static T * construct()
-      {
-        return new T();
-      }
-
-      template <class T> inline
-      static std::false_type load_and_construct(...)
-      { return std::false_type(); }
-
-      template<class T, class Archive> inline
-      static auto load_and_construct(Archive & ar, ::cereal::construct<T> & construct) -> decltype(T::load_and_construct(ar, construct))
-      {
-        T::load_and_construct( ar, construct );
-      }
-
-      template<class T, class Archive> inline
-      static auto load_and_construct(Archive & ar, ::cereal::construct<T> & construct, const std::uint32_t version) -> decltype(T::load_and_construct(ar, construct, version))
-      {
-        T::load_and_construct( ar, construct, version );
-      }
-  }; // end class access
-
-  // ######################################################################
-  //! A specifier used in conjunction with cereal::specialize to disambiguate
-  //! serialization in special cases
-  /*! @relates specialize
-      @ingroup Access */
-  enum class specialization
-  {
-    member_serialize,            //!< Force the use of a member serialize function
-    member_load_save,            //!< Force the use of a member load/save pair
-    member_load_save_minimal,    //!< Force the use of a member minimal load/save pair
-    non_member_serialize,        //!< Force the use of a non-member serialize function
-    non_member_load_save,        //!< Force the use of a non-member load/save pair
-    non_member_load_save_minimal //!< Force the use of a non-member minimal load/save pair
-  };
-
-  //! A class used to disambiguate cases where cereal cannot detect a unique way of serializing a class
-  /*! cereal attempts to figure out which method of serialization (member vs. non-member serialize
-      or load/save pair) at compile time.  If for some reason cereal cannot find a non-ambiguous way
-      of serializing a type, it will produce a static assertion complaining about this.
-
-      This can happen because you have both a serialize and load/save pair, or even because a base
-      class has a serialize (public or private with friend access) and a derived class does not
-      overwrite this due to choosing some other serialization type.
-
-      Specializing this class will tell cereal to explicitly use the serialization type you specify
-      and it will not complain about ambiguity in its compile time selection.  However, if cereal detects
-      an ambiguity in specializations, it will continue to issue a static assertion.
-
-      @code{.cpp}
-      class MyParent
-      {
-        friend class cereal::access;
-        template <class Archive>
-        void serialize( Archive & ar ) {}
-      };
-
-      // Although serialize is private in MyParent, to cereal::access it will look public,
-      // even through MyDerived
-      class MyDerived : public MyParent
-      {
-        public:
-          template <class Archive>
-          void load( Archive & ar ) {}
-
-          template <class Archive>
-          void save( Archive & ar ) {}
-      };
-
-      // The load/save pair in MyDerived is ambiguous because serialize in MyParent can
-      // be accessed from cereal::access.  This looks the same as making serialize public
-      // in MyParent, making it seem as though MyDerived has both a serialize and a load/save pair.
-      // cereal will complain about this at compile time unless we disambiguate:
-
-      namespace cereal
-      {
-        // This struct specialization will tell cereal which is the right way to serialize the ambiguity
-        template <class Archive> struct specialize<Archive, MyDerived, cereal::specialization::member_load_save> {};
-
-        // If we only had a disambiguation for a specific archive type, it would look something like this
-        template <> struct specialize<cereal::BinaryOutputArchive, MyDerived, cereal::specialization::member_load_save> {};
-      }
-      @endcode
-
-      You can also choose to use the macros CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES or
-      CEREAL_SPECIALIZE_FOR_ARCHIVE if you want to type a little bit less.
-
-      @tparam T The type to specialize the serialization for
-      @tparam S The specialization type to use for T
-      @ingroup Access */
-  template <class Archive, class T, specialization S>
-  struct specialize : public std::false_type {};
-
-  //! Convenient macro for performing specialization for all archive types
-  /*! This performs specialization for the specific type for all types of archives.
-      This macro should be placed at the global namespace.
-
-      @code{cpp}
-      struct MyType {};
-      CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES( MyType, cereal::specialization::member_load_save );
-      @endcode
-
-      @relates specialize
-      @ingroup Access */
-  #define CEREAL_SPECIALIZE_FOR_ALL_ARCHIVES( Type, Specialization )                                \
-  namespace cereal { template <class Archive> struct specialize<Archive, Type, Specialization> {}; }
-
-  //! Convenient macro for performing specialization for a single archive type
-  /*! This performs specialization for the specific type for a single type of archive.
-      This macro should be placed at the global namespace.
-
-      @code{cpp}
-      struct MyType {};
-      CEREAL_SPECIALIZE_FOR_ARCHIVE( cereal::XMLInputArchive, MyType, cereal::specialization::member_load_save );
-      @endcode
-
-      @relates specialize
-      @ingroup Access */
-  #define CEREAL_SPECIALIZE_FOR_ARCHIVE( Archive, Type, Specialization )               \
-  namespace cereal { template <> struct specialize<Archive, Type, Specialization> {}; }
-
-  // ######################################################################
-  // Deferred Implementation, see construct for more information
-  template <class T> template <class ... Args> inline
-  void construct<T>::operator()( Args && ... args )
-  {
-    if( itsValid )
-      throw Exception("Attempting to construct an already initialized object");
-
-    ::cereal::access::construct( itsPtr, std::forward<Args>( args )... );
-    itsEnableSharedRestoreFunction();
-    itsValid = true;
-  }
-} // namespace cereal
-
-#endif // CEREAL_ACCESS_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/adapters.hpp b/Src/External/cereal/include/cereal/archives/adapters.hpp
deleted file mode 100644
index 0191e32..0000000
--- a/Src/External/cereal/include/cereal/archives/adapters.hpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*! \file adapters.hpp
-    \brief Archive adapters that provide additional functionality
-           on top of an existing archive */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_ARCHIVES_ADAPTERS_HPP_
-#define CEREAL_ARCHIVES_ADAPTERS_HPP_
-
-#include "cereal/details/helpers.hpp"
-#include <utility>
-
-namespace cereal
-{
-  #ifdef CEREAL_FUTURE_EXPERIMENTAL
-
-  // Forward declaration for friend access
-  template <class U, class A> U & get_user_data( A & );
-
-  //! Wraps an archive and gives access to user data
-  /*! This adapter is useful if you require access to
-      either raw pointers or references within your
-      serialization functions.
-
-      While cereal does not directly support serialization
-      raw pointers or references, it is sometimes the case
-      that you may want to supply something such as a raw
-      pointer or global reference to some constructor.
-      In this situation this adapter would likely be used
-      with the construct class to allow for non-default
-      constructors.
-
-      @note This feature is experimental and may be altered or removed in a future release. See issue #46.
-
-      @code{.cpp}
-      struct MyUserData
-      {
-        int * myRawPointer;
-        std::reference_wrapper<MyOtherType> myReference;
-      };
-
-      struct MyClass
-      {
-        // Note the raw pointer parameter
-        MyClass( int xx, int * rawP );
-
-        int x;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        { ar( x ); }
-
-        template <class Archive>
-        static void load_and_construct( Archive & ar, cereal::construct<MyClass> & construct )
-        {
-          int xx;
-          ar( xx );
-          // note the need to use get_user_data to retrieve user data from the archive
-          construct( xx, cereal::get_user_data<MyUserData>( ar ).myRawPointer );
-        }
-      };
-
-      int main()
-      {
-        {
-          MyUserData md;
-          md.myRawPointer = &something;
-          md.myReference = someInstanceOfType;
-
-          std::ifstream is( "data.xml" );
-          cereal::UserDataAdapter<MyUserData, cereal::XMLInputArchive> ar( md, is );
-
-          std::unique_ptr<MyClass> sc;
-          ar( sc ); // use as normal
-        }
-
-        return 0;
-      }
-      @endcode
-
-      @relates get_user_data
-
-      @tparam UserData The type to give the archive access to
-      @tparam Archive The archive to wrap */
-  template <class UserData, class Archive>
-  class UserDataAdapter : public Archive
-  {
-    public:
-      //! Construct the archive with some user data struct
-      /*! This will forward all arguments (other than the user
-          data) to the wrapped archive type.  The UserDataAdapter
-          can then be used identically to the wrapped archive type
-
-          @tparam Args The arguments to pass to the constructor of
-                       the archive. */
-      template <class ... Args>
-      UserDataAdapter( UserData & ud, Args && ... args ) :
-        Archive( std::forward<Args>( args )... ),
-        userdata( ud )
-      { }
-
-    private:
-      //! Overload the rtti function to enable dynamic_cast
-      void rtti() {}
-      friend UserData & get_user_data<UserData>( Archive & ar );
-      UserData & userdata; //!< The actual user data
-  };
-
-  //! Retrieves user data from an archive wrapped by UserDataAdapter
-  /*! This will attempt to retrieve the user data associated with
-      some archive wrapped by UserDataAdapter.  If this is used on
-      an archive that is not wrapped, a run-time exception will occur.
-
-      @note This feature is experimental and may be altered or removed in a future release. See issue #46.
-
-      @note The correct use of this function cannot be enforced at compile
-            time.
-
-      @relates UserDataAdapter
-      @tparam UserData The data struct contained in the archive
-      @tparam Archive The archive, which should be wrapped by UserDataAdapter
-      @param ar The archive
-      @throws Exception if the archive this is used upon is not wrapped with
-                        UserDataAdapter. */
-  template <class UserData, class Archive>
-  UserData & get_user_data( Archive & ar )
-  {
-    try
-    {
-      return dynamic_cast<UserDataAdapter<UserData, Archive> &>( ar ).userdata;
-    }
-    catch( std::bad_cast const & )
-    {
-      throw ::cereal::Exception("Attempting to get user data from archive not wrapped in UserDataAdapter");
-    }
-  }
-  #endif // CEREAL_FUTURE_EXPERIMENTAL
-} // namespace cereal
-
-#endif // CEREAL_ARCHIVES_ADAPTERS_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/binary.hpp b/Src/External/cereal/include/cereal/archives/binary.hpp
deleted file mode 100644
index 7e00322..0000000
--- a/Src/External/cereal/include/cereal/archives/binary.hpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*! \file binary.hpp
-    \brief Binary input and output archives */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_ARCHIVES_BINARY_HPP_
-#define CEREAL_ARCHIVES_BINARY_HPP_
-
-#include "cereal/cereal.hpp"
-#include <sstream>
-
-namespace cereal
-{
-  // ######################################################################
-  //! An output archive designed to save data in a compact binary representation
-  /*! This archive outputs data to a stream in an extremely compact binary
-      representation with as little extra metadata as possible.
-
-      This archive does nothing to ensure that the endianness of the saved
-      and loaded data is the same.  If you need to have portability over
-      architectures with different endianness, use PortableBinaryOutputArchive.
-
-      When using a binary archive and a file stream, you must use the
-      std::ios::binary format flag to avoid having your data altered
-      inadvertently.
-
-      \ingroup Archives */
-  class BinaryOutputArchive : public OutputArchive<BinaryOutputArchive, AllowEmptyClassElision>
-  {
-    public:
-      //! Construct, outputting to the provided stream
-      /*! @param stream The stream to output to.  Can be a stringstream, a file stream, or
-                        even cout! */
-      BinaryOutputArchive(std::ostream & stream) :
-        OutputArchive<BinaryOutputArchive, AllowEmptyClassElision>(this),
-        itsStream(stream)
-      { }
-
-      ~BinaryOutputArchive() CEREAL_NOEXCEPT = default;
-
-      //! Writes size bytes of data to the output stream
-      void saveBinary( const void * data, std::size_t size )
-      {
-        auto const writtenSize = static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ), size ) );
-
-        if(writtenSize != size)
-          throw Exception("Failed to write " + std::to_string(size) + " bytes to output stream! Wrote " + std::to_string(writtenSize));
-      }
-
-    private:
-      std::ostream & itsStream;
-  };
-
-  // ######################################################################
-  //! An input archive designed to load data saved using BinaryOutputArchive
-  /*  This archive does nothing to ensure that the endianness of the saved
-      and loaded data is the same.  If you need to have portability over
-      architectures with different endianness, use PortableBinaryOutputArchive.
-
-      When using a binary archive and a file stream, you must use the
-      std::ios::binary format flag to avoid having your data altered
-      inadvertently.
-
-      \ingroup Archives */
-  class BinaryInputArchive : public InputArchive<BinaryInputArchive, AllowEmptyClassElision>
-  {
-    public:
-      //! Construct, loading from the provided stream
-      BinaryInputArchive(std::istream & stream) :
-        InputArchive<BinaryInputArchive, AllowEmptyClassElision>(this),
-        itsStream(stream)
-      { }
-
-      ~BinaryInputArchive() CEREAL_NOEXCEPT = default;
-
-      //! Reads size bytes of data from the input stream
-      void loadBinary( void * const data, std::size_t size )
-      {
-        auto const readSize = static_cast<std::size_t>( itsStream.rdbuf()->sgetn( reinterpret_cast<char*>( data ), size ) );
-
-        if(readSize != size)
-          throw Exception("Failed to read " + std::to_string(size) + " bytes from input stream! Read " + std::to_string(readSize));
-      }
-
-    private:
-      std::istream & itsStream;
-  };
-
-  // ######################################################################
-  // Common BinaryArchive serialization functions
-
-  //! Saving for POD types to binary
-  template<class T> inline
-  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME(BinaryOutputArchive & ar, T const & t)
-  {
-    ar.saveBinary(std::addressof(t), sizeof(t));
-  }
-
-  //! Loading for POD types from binary
-  template<class T> inline
-  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME(BinaryInputArchive & ar, T & t)
-  {
-    ar.loadBinary(std::addressof(t), sizeof(t));
-  }
-
-  //! Serializing NVP types to binary
-  template <class Archive, class T> inline
-  CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
-  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, NameValuePair<T> & t )
-  {
-    ar( t.value );
-  }
-
-  //! Serializing SizeTags to binary
-  template <class Archive, class T> inline
-  CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
-  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, SizeTag<T> & t )
-  {
-    ar( t.size );
-  }
-
-  //! Saving binary data
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME(BinaryOutputArchive & ar, BinaryData<T> const & bd)
-  {
-    ar.saveBinary( bd.data, static_cast<std::size_t>( bd.size ) );
-  }
-
-  //! Loading binary data
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME(BinaryInputArchive & ar, BinaryData<T> & bd)
-  {
-    ar.loadBinary(bd.data, static_cast<std::size_t>(bd.size));
-  }
-} // namespace cereal
-
-// register archives for polymorphic support
-CEREAL_REGISTER_ARCHIVE(cereal::BinaryOutputArchive)
-CEREAL_REGISTER_ARCHIVE(cereal::BinaryInputArchive)
-
-// tie input and output archives together
-CEREAL_SETUP_ARCHIVE_TRAITS(cereal::BinaryInputArchive, cereal::BinaryOutputArchive)
-
-#endif // CEREAL_ARCHIVES_BINARY_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/json.hpp b/Src/External/cereal/include/cereal/archives/json.hpp
deleted file mode 100644
index 9d57434..0000000
--- a/Src/External/cereal/include/cereal/archives/json.hpp
+++ /dev/null
@@ -1,981 +0,0 @@
-/*! \file json.hpp
-    \brief JSON input and output archives */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_ARCHIVES_JSON_HPP_
-#define CEREAL_ARCHIVES_JSON_HPP_
-
-#include "cereal/cereal.hpp"
-#include "cereal/details/util.hpp"
-
-namespace cereal
-{
-  //! An exception thrown when rapidjson fails an internal assertion
-  /*! @ingroup Utility */
-  struct RapidJSONException : Exception
-  { RapidJSONException( const char * what_ ) : Exception( what_ ) {} };
-}
-
-// Override rapidjson assertions to throw exceptions by default
-#ifndef CEREAL_RAPIDJSON_ASSERT
-#define CEREAL_RAPIDJSON_ASSERT(x) if(!(x)){ \
-  throw ::cereal::RapidJSONException("rapidjson internal assertion failure: " #x); }
-#endif // RAPIDJSON_ASSERT
-
-// Enable support for parsing of nan, inf, -inf
-#define CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNanAndInfFlag
-#define CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS kParseFullPrecisionFlag | kParseNanAndInfFlag
-
-#include "cereal/external/rapidjson/prettywriter.h"
-#include "cereal/external/rapidjson/ostreamwrapper.h"
-#include "cereal/external/rapidjson/istreamwrapper.h"
-#include "cereal/external/rapidjson/document.h"
-#include "cereal/external/base64.hpp"
-
-#include <limits>
-#include <sstream>
-#include <stack>
-#include <vector>
-#include <string>
-
-namespace cereal
-{
-  // ######################################################################
-  //! An output archive designed to save data to JSON
-  /*! This archive uses RapidJSON to build serialize data to JSON.
-
-      JSON archives provides a human readable output but at decreased
-      performance (both in time and space) compared to binary archives.
-
-      JSON archives are only guaranteed to finish flushing their contents
-      upon destruction and should thus be used in an RAII fashion.
-
-      JSON benefits greatly from name-value pairs, which if present, will
-      name the nodes in the output.  If these are not present, each level
-      of the output will be given an automatically generated delimited name.
-
-      The precision of the output archive controls the number of decimals output
-      for floating point numbers and should be sufficiently large (i.e. at least 20)
-      if there is a desire to have binary equality between the numbers output and
-      those read in.  In general you should expect a loss of precision when going
-      from floating point to text and back.
-
-      JSON archives do not output the size information for any dynamically sized structure
-      and instead infer it from the number of children for a node.  This means that data
-      can be hand edited for dynamic sized structures and will still be readable.  This
-      is accomplished through the cereal::SizeTag object, which will cause the archive
-      to output the data as a JSON array (e.g. marked by [] instead of {}), which indicates
-      that the container is variable sized and may be edited.
-
-      \ingroup Archives */
-  class JSONOutputArchive : public OutputArchive<JSONOutputArchive>, public traits::TextArchive
-  {
-    enum class NodeType { StartObject, InObject, StartArray, InArray };
-
-    using WriteStream = CEREAL_RAPIDJSON_NAMESPACE::OStreamWrapper;
-    using JSONWriter = CEREAL_RAPIDJSON_NAMESPACE::PrettyWriter<WriteStream>;
-
-    public:
-      /*! @name Common Functionality
-          Common use cases for directly interacting with an JSONOutputArchive */
-      //! @{
-
-      //! A class containing various advanced options for the JSON archive
-      class Options
-      {
-        public:
-          //! Default options
-          static Options Default(){ return Options(); }
-
-          //! Default options with no indentation
-          static Options NoIndent(){ return Options( JSONWriter::kDefaultMaxDecimalPlaces, IndentChar::space, 0 ); }
-
-          //! The character to use for indenting
-          enum class IndentChar : char
-          {
-            space = ' ',
-            tab = '\t',
-            newline = '\n',
-            carriage_return = '\r'
-          };
-
-          //! Specify specific options for the JSONOutputArchive
-          /*! @param precision The precision used for floating point numbers
-              @param indentChar The type of character to indent with
-              @param indentLength The number of indentChar to use for indentation
-                             (0 corresponds to no indentation) */
-          explicit Options( int precision = JSONWriter::kDefaultMaxDecimalPlaces,
-                            IndentChar indentChar = IndentChar::space,
-                            unsigned int indentLength = 4 ) :
-            itsPrecision( precision ),
-            itsIndentChar( static_cast<char>(indentChar) ),
-            itsIndentLength( indentLength ) { }
-
-        private:
-          friend class JSONOutputArchive;
-          int itsPrecision;
-          char itsIndentChar;
-          unsigned int itsIndentLength;
-      };
-
-      //! Construct, outputting to the provided stream
-      /*! @param stream The stream to output to.
-          @param options The JSON specific options to use.  See the Options struct
-                         for the values of default parameters */
-      JSONOutputArchive(std::ostream & stream, Options const & options = Options::Default() ) :
-        OutputArchive<JSONOutputArchive>(this),
-        itsWriteStream(stream),
-        itsWriter(itsWriteStream),
-        itsNextName(nullptr)
-      {
-        itsWriter.SetMaxDecimalPlaces( options.itsPrecision );
-        itsWriter.SetIndent( options.itsIndentChar, options.itsIndentLength );
-        itsNameCounter.push(0);
-        itsNodeStack.push(NodeType::StartObject);
-      }
-
-      //! Destructor, flushes the JSON
-      ~JSONOutputArchive() CEREAL_NOEXCEPT
-      {
-        if (itsNodeStack.top() == NodeType::InObject)
-          itsWriter.EndObject();
-        else if (itsNodeStack.top() == NodeType::InArray)
-          itsWriter.EndArray();
-      }
-
-      //! Saves some binary data, encoded as a base64 string, with an optional name
-      /*! This will create a new node, optionally named, and insert a value that consists of
-          the data encoded as a base64 string */
-      void saveBinaryValue( const void * data, size_t size, const char * name = nullptr )
-      {
-        setNextName( name );
-        writeName();
-
-        auto base64string = base64::encode( reinterpret_cast<const unsigned char *>( data ), size );
-        saveValue( base64string );
-      };
-
-      //! @}
-      /*! @name Internal Functionality
-          Functionality designed for use by those requiring control over the inner mechanisms of
-          the JSONOutputArchive */
-      //! @{
-
-      //! Starts a new node in the JSON output
-      /*! The node can optionally be given a name by calling setNextName prior
-          to creating the node
-
-          Nodes only need to be started for types that are themselves objects or arrays */
-      void startNode()
-      {
-        writeName();
-        itsNodeStack.push(NodeType::StartObject);
-        itsNameCounter.push(0);
-      }
-
-      //! Designates the most recently added node as finished
-      void finishNode()
-      {
-        // if we ended up serializing an empty object or array, writeName
-        // will never have been called - so start and then immediately end
-        // the object/array.
-        //
-        // We'll also end any object/arrays we happen to be in
-        switch(itsNodeStack.top())
-        {
-          case NodeType::StartArray:
-            itsWriter.StartArray();
-          case NodeType::InArray:
-            itsWriter.EndArray();
-            break;
-          case NodeType::StartObject:
-            itsWriter.StartObject();
-          case NodeType::InObject:
-            itsWriter.EndObject();
-            break;
-        }
-
-        itsNodeStack.pop();
-        itsNameCounter.pop();
-      }
-
-      //! Sets the name for the next node created with startNode
-      void setNextName( const char * name )
-      {
-        itsNextName = name;
-      }
-
-      //! Saves a bool to the current node
-      void saveValue(bool b)                { itsWriter.Bool(b);                                                         }
-      //! Saves an int to the current node
-      void saveValue(int i)                 { itsWriter.Int(i);                                                          }
-      //! Saves a uint to the current node
-      void saveValue(unsigned u)            { itsWriter.Uint(u);                                                         }
-      //! Saves an int64 to the current node
-      void saveValue(int64_t i64)           { itsWriter.Int64(i64);                                                      }
-      //! Saves a uint64 to the current node
-      void saveValue(uint64_t u64)          { itsWriter.Uint64(u64);                                                     }
-      //! Saves a double to the current node
-      void saveValue(double d)              { itsWriter.Double(d);                                                       }
-      //! Saves a string to the current node
-      void saveValue(std::string const & s) { itsWriter.String(s.c_str(), static_cast<CEREAL_RAPIDJSON_NAMESPACE::SizeType>( s.size() )); }
-      //! Saves a const char * to the current node
-      void saveValue(char const * s)        { itsWriter.String(s);                                                       }
-      //! Saves a nullptr to the current node
-      void saveValue(std::nullptr_t)        { itsWriter.Null();                                                          }
-
-    private:
-      // Some compilers/OS have difficulty disambiguating the above for various flavors of longs, so we provide
-      // special overloads to handle these cases.
-
-      //! 32 bit signed long saving to current node
-      template <class T, traits::EnableIf<sizeof(T) == sizeof(std::int32_t),
-                                          std::is_signed<T>::value> = traits::sfinae> inline
-      void saveLong(T l){ saveValue( static_cast<std::int32_t>( l ) ); }
-
-      //! non 32 bit signed long saving to current node
-      template <class T, traits::EnableIf<sizeof(T) != sizeof(std::int32_t),
-                                          std::is_signed<T>::value> = traits::sfinae> inline
-      void saveLong(T l){ saveValue( static_cast<std::int64_t>( l ) ); }
-
-      //! 32 bit unsigned long saving to current node
-      template <class T, traits::EnableIf<sizeof(T) == sizeof(std::int32_t),
-                                          std::is_unsigned<T>::value> = traits::sfinae> inline
-      void saveLong(T lu){ saveValue( static_cast<std::uint32_t>( lu ) ); }
-
-      //! non 32 bit unsigned long saving to current node
-      template <class T, traits::EnableIf<sizeof(T) != sizeof(std::int32_t),
-                                          std::is_unsigned<T>::value> = traits::sfinae> inline
-      void saveLong(T lu){ saveValue( static_cast<std::uint64_t>( lu ) ); }
-
-    public:
-#ifdef _MSC_VER
-      //! MSVC only long overload to current node
-      void saveValue( unsigned long lu ){ saveLong( lu ); };
-#else // _MSC_VER
-      //! Serialize a long if it would not be caught otherwise
-      template <class T, traits::EnableIf<std::is_same<T, long>::value,
-                                          !std::is_same<T, std::int32_t>::value,
-                                          !std::is_same<T, std::int64_t>::value> = traits::sfinae> inline
-      void saveValue( T t ){ saveLong( t ); }
-
-      //! Serialize an unsigned long if it would not be caught otherwise
-      template <class T, traits::EnableIf<std::is_same<T, unsigned long>::value,
-                                          !std::is_same<T, std::uint32_t>::value,
-                                          !std::is_same<T, std::uint64_t>::value> = traits::sfinae> inline
-      void saveValue( T t ){ saveLong( t ); }
-#endif // _MSC_VER
-
-      //! Save exotic arithmetic as strings to current node
-      /*! Handles long long (if distinct from other types), unsigned long (if distinct), and long double */
-      template <class T, traits::EnableIf<std::is_arithmetic<T>::value,
-                                          !std::is_same<T, long>::value,
-                                          !std::is_same<T, unsigned long>::value,
-                                          !std::is_same<T, std::int64_t>::value,
-                                          !std::is_same<T, std::uint64_t>::value,
-                                          (sizeof(T) >= sizeof(long double) || sizeof(T) >= sizeof(long long))> = traits::sfinae> inline
-      void saveValue(T const & t)
-      {
-        std::stringstream ss; ss.precision( std::numeric_limits<long double>::max_digits10 );
-        ss << t;
-        saveValue( ss.str() );
-      }
-
-      //! Write the name of the upcoming node and prepare object/array state
-      /*! Since writeName is called for every value that is output, regardless of
-          whether it has a name or not, it is the place where we will do a deferred
-          check of our node state and decide whether we are in an array or an object.
-
-          The general workflow of saving to the JSON archive is:
-
-            1. (optional) Set the name for the next node to be created, usually done by an NVP
-            2. Start the node
-            3. (if there is data to save) Write the name of the node (this function)
-            4. (if there is data to save) Save the data (with saveValue)
-            5. Finish the node
-          */
-      void writeName()
-      {
-        NodeType const & nodeType = itsNodeStack.top();
-
-        // Start up either an object or an array, depending on state
-        if(nodeType == NodeType::StartArray)
-        {
-          itsWriter.StartArray();
-          itsNodeStack.top() = NodeType::InArray;
-        }
-        else if(nodeType == NodeType::StartObject)
-        {
-          itsNodeStack.top() = NodeType::InObject;
-          itsWriter.StartObject();
-        }
-
-        // Array types do not output names
-        if(nodeType == NodeType::InArray) return;
-
-        if(itsNextName == nullptr)
-        {
-          std::string name = "value" + std::to_string( itsNameCounter.top()++ ) + "\0";
-          saveValue(name);
-        }
-        else
-        {
-          saveValue(itsNextName);
-          itsNextName = nullptr;
-        }
-      }
-
-      //! Designates that the current node should be output as an array, not an object
-      void makeArray()
-      {
-        itsNodeStack.top() = NodeType::StartArray;
-      }
-
-      //! @}
-
-    private:
-      WriteStream itsWriteStream;          //!< Rapidjson write stream
-      JSONWriter itsWriter;                //!< Rapidjson writer
-      char const * itsNextName;            //!< The next name
-      std::stack<uint32_t> itsNameCounter; //!< Counter for creating unique names for unnamed nodes
-      std::stack<NodeType> itsNodeStack;
-  }; // JSONOutputArchive
-
-  // ######################################################################
-  //! An input archive designed to load data from JSON
-  /*! This archive uses RapidJSON to read in a JSON archive.
-
-      As with the output JSON archive, the preferred way to use this archive is in
-      an RAII fashion, ensuring its destruction after all data has been read.
-
-      Input JSON should have been produced by the JSONOutputArchive.  Data can
-      only be added to dynamically sized containers (marked by JSON arrays) -
-      the input archive will determine their size by looking at the number of child nodes.
-      Only JSON originating from a JSONOutputArchive is officially supported, but data
-      from other sources may work if properly formatted.
-
-      The JSONInputArchive does not require that nodes are loaded in the same
-      order they were saved by JSONOutputArchive.  Using name value pairs (NVPs),
-      it is possible to load in an out of order fashion or otherwise skip/select
-      specific nodes to load.
-
-      The default behavior of the input archive is to read sequentially starting
-      with the first node and exploring its children.  When a given NVP does
-      not match the read in name for a node, the archive will search for that
-      node at the current level and load it if it exists.  After loading an out of
-      order node, the archive will then proceed back to loading sequentially from
-      its new position.
-
-      Consider this simple example where loading of some data is skipped:
-
-      @code{cpp}
-      // imagine the input file has someData(1-9) saved in order at the top level node
-      ar( someData1, someData2, someData3 );        // XML loads in the order it sees in the file
-      ar( cereal::make_nvp( "hello", someData6 ) ); // NVP given does not
-                                                    // match expected NVP name, so we search
-                                                    // for the given NVP and load that value
-      ar( someData7, someData8, someData9 );        // with no NVP given, loading resumes at its
-                                                    // current location, proceeding sequentially
-      @endcode
-
-      \ingroup Archives */
-  class JSONInputArchive : public InputArchive<JSONInputArchive>, public traits::TextArchive
-  {
-    private:
-      using ReadStream = CEREAL_RAPIDJSON_NAMESPACE::IStreamWrapper;
-      typedef CEREAL_RAPIDJSON_NAMESPACE::GenericValue<CEREAL_RAPIDJSON_NAMESPACE::UTF8<>> JSONValue;
-      typedef JSONValue::ConstMemberIterator MemberIterator;
-      typedef JSONValue::ConstValueIterator ValueIterator;
-      typedef CEREAL_RAPIDJSON_NAMESPACE::Document::GenericValue GenericValue;
-
-    public:
-      /*! @name Common Functionality
-          Common use cases for directly interacting with an JSONInputArchive */
-      //! @{
-
-      //! Construct, reading from the provided stream
-      /*! @param stream The stream to read from */
-      JSONInputArchive(std::istream & stream) :
-        InputArchive<JSONInputArchive>(this),
-        itsNextName( nullptr ),
-        itsReadStream(stream)
-      {
-        itsDocument.ParseStream<>(itsReadStream);
-        if (itsDocument.IsArray())
-          itsIteratorStack.emplace_back(itsDocument.Begin(), itsDocument.End());
-        else
-          itsIteratorStack.emplace_back(itsDocument.MemberBegin(), itsDocument.MemberEnd());
-      }
-
-      ~JSONInputArchive() CEREAL_NOEXCEPT = default;
-
-      //! Loads some binary data, encoded as a base64 string
-      /*! This will automatically start and finish a node to load the data, and can be called directly by
-          users.
-
-          Note that this follows the same ordering rules specified in the class description in regards
-          to loading in/out of order */
-      void loadBinaryValue( void * data, size_t size, const char * name = nullptr )
-      {
-        itsNextName = name;
-
-        std::string encoded;
-        loadValue( encoded );
-        auto decoded = base64::decode( encoded );
-
-        if( size != decoded.size() )
-          throw Exception("Decoded binary data size does not match specified size");
-
-        std::memcpy( data, decoded.data(), decoded.size() );
-        itsNextName = nullptr;
-      };
-
-    private:
-      //! @}
-      /*! @name Internal Functionality
-          Functionality designed for use by those requiring control over the inner mechanisms of
-          the JSONInputArchive */
-      //! @{
-
-      //! An internal iterator that handles both array and object types
-      /*! This class is a variant and holds both types of iterators that
-          rapidJSON supports - one for arrays and one for objects. */
-      class Iterator
-      {
-        public:
-          Iterator() : itsIndex( 0 ), itsType(Null_) {}
-
-          Iterator(MemberIterator begin, MemberIterator end) :
-            itsMemberItBegin(begin), itsMemberItEnd(end), itsIndex(0), itsType(Member)
-          {
-            if( std::distance( begin, end ) == 0 )
-              itsType = Null_;
-          }
-
-          Iterator(ValueIterator begin, ValueIterator end) :
-            itsValueItBegin(begin), itsValueItEnd(end), itsIndex(0), itsType(Value)
-          {
-            if( std::distance( begin, end ) == 0 )
-              itsType = Null_;
-          }
-
-          //! Advance to the next node
-          Iterator & operator++()
-          {
-            ++itsIndex;
-            return *this;
-          }
-
-          //! Get the value of the current node
-          GenericValue const & value()
-          {
-            switch(itsType)
-            {
-              case Value : return itsValueItBegin[itsIndex];
-              case Member: return itsMemberItBegin[itsIndex].value;
-              default: throw cereal::Exception("JSONInputArchive internal error: null or empty iterator to object or array!");
-            }
-          }
-
-          //! Get the name of the current node, or nullptr if it has no name
-          const char * name() const
-          {
-            if( itsType == Member && (itsMemberItBegin + itsIndex) != itsMemberItEnd )
-              return itsMemberItBegin[itsIndex].name.GetString();
-            else
-              return nullptr;
-          }
-
-          //! Adjust our position such that we are at the node with the given name
-          /*! @throws Exception if no such named node exists */
-          inline void search( const char * searchName )
-          {
-            const auto len = std::strlen( searchName );
-            size_t index = 0;
-            for( auto it = itsMemberItBegin; it != itsMemberItEnd; ++it, ++index )
-            {
-              const auto currentName = it->name.GetString();
-              if( ( std::strncmp( searchName, currentName, len ) == 0 ) &&
-                  ( std::strlen( currentName ) == len ) )
-              {
-                itsIndex = index;
-                return;
-              }
-            }
-
-            throw Exception("JSON Parsing failed - provided NVP (" + std::string(searchName) + ") not found");
-          }
-
-        private:
-          MemberIterator itsMemberItBegin, itsMemberItEnd; //!< The member iterator (object)
-          ValueIterator itsValueItBegin, itsValueItEnd;    //!< The value iterator (array)
-          size_t itsIndex;                                 //!< The current index of this iterator
-          enum Type {Value, Member, Null_} itsType;        //!< Whether this holds values (array) or members (objects) or nothing
-      };
-
-      //! Searches for the expectedName node if it doesn't match the actualName
-      /*! This needs to be called before every load or node start occurs.  This function will
-          check to see if an NVP has been provided (with setNextName) and if so, see if that name matches the actual
-          next name given.  If the names do not match, it will search in the current level of the JSON for that name.
-          If the name is not found, an exception will be thrown.
-
-          Resets the NVP name after called.
-
-          @throws Exception if an expectedName is given and not found */
-      inline void search()
-      {
-        // The name an NVP provided with setNextName()
-        if( itsNextName )
-        {
-          // The actual name of the current node
-          auto const actualName = itsIteratorStack.back().name();
-
-          // Do a search if we don't see a name coming up, or if the names don't match
-          if( !actualName || std::strcmp( itsNextName, actualName ) != 0 )
-            itsIteratorStack.back().search( itsNextName );
-        }
-
-        itsNextName = nullptr;
-      }
-
-    public:
-      //! Starts a new node, going into its proper iterator
-      /*! This places an iterator for the next node to be parsed onto the iterator stack.  If the next
-          node is an array, this will be a value iterator, otherwise it will be a member iterator.
-
-          By default our strategy is to start with the document root node and then recursively iterate through
-          all children in the order they show up in the document.
-          We don't need to know NVPs to do this; we'll just blindly load in the order things appear in.
-
-          If we were given an NVP, we will search for it if it does not match our the name of the next node
-          that would normally be loaded.  This functionality is provided by search(). */
-      void startNode()
-      {
-        search();
-
-        if(itsIteratorStack.back().value().IsArray())
-          itsIteratorStack.emplace_back(itsIteratorStack.back().value().Begin(), itsIteratorStack.back().value().End());
-        else
-          itsIteratorStack.emplace_back(itsIteratorStack.back().value().MemberBegin(), itsIteratorStack.back().value().MemberEnd());
-      }
-
-      //! Finishes the most recently started node
-      void finishNode()
-      {
-        itsIteratorStack.pop_back();
-        ++itsIteratorStack.back();
-      }
-
-      //! Retrieves the current node name
-      /*! @return nullptr if no name exists */
-      const char * getNodeName() const
-      {
-        return itsIteratorStack.back().name();
-      }
-
-      //! Sets the name for the next node created with startNode
-      void setNextName( const char * name )
-      {
-        itsNextName = name;
-      }
-
-      //! Loads a value from the current node - small signed overload
-      template <class T, traits::EnableIf<std::is_signed<T>::value,
-                                          sizeof(T) < sizeof(int64_t)> = traits::sfinae> inline
-      void loadValue(T & val)
-      {
-        search();
-
-        val = static_cast<T>( itsIteratorStack.back().value().GetInt() );
-        ++itsIteratorStack.back();
-      }
-
-      //! Loads a value from the current node - small unsigned overload
-      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
-                                          sizeof(T) < sizeof(uint64_t),
-                                          !std::is_same<bool, T>::value> = traits::sfinae> inline
-      void loadValue(T & val)
-      {
-        search();
-
-        val = static_cast<T>( itsIteratorStack.back().value().GetUint() );
-        ++itsIteratorStack.back();
-      }
-
-      //! Loads a value from the current node - bool overload
-      void loadValue(bool & val)        { search(); val = itsIteratorStack.back().value().GetBool(); ++itsIteratorStack.back(); }
-      //! Loads a value from the current node - int64 overload
-      void loadValue(int64_t & val)     { search(); val = itsIteratorStack.back().value().GetInt64(); ++itsIteratorStack.back(); }
-      //! Loads a value from the current node - uint64 overload
-      void loadValue(uint64_t & val)    { search(); val = itsIteratorStack.back().value().GetUint64(); ++itsIteratorStack.back(); }
-      //! Loads a value from the current node - float overload
-      void loadValue(float & val)       { search(); val = static_cast<float>(itsIteratorStack.back().value().GetDouble()); ++itsIteratorStack.back(); }
-      //! Loads a value from the current node - double overload
-      void loadValue(double & val)      { search(); val = itsIteratorStack.back().value().GetDouble(); ++itsIteratorStack.back(); }
-      //! Loads a value from the current node - string overload
-      void loadValue(std::string & val) { search(); val = itsIteratorStack.back().value().GetString(); ++itsIteratorStack.back(); }
-      //! Loads a nullptr from the current node
-      void loadValue(std::nullptr_t&)   { search(); CEREAL_RAPIDJSON_ASSERT(itsIteratorStack.back().value().IsNull()); ++itsIteratorStack.back(); }
-
-      // Special cases to handle various flavors of long, which tend to conflict with
-      // the int32_t or int64_t on various compiler/OS combinations.  MSVC doesn't need any of this.
-      #ifndef _MSC_VER
-    private:
-      //! 32 bit signed long loading from current node
-      template <class T> inline
-      typename std::enable_if<sizeof(T) == sizeof(std::int32_t) && std::is_signed<T>::value, void>::type
-      loadLong(T & l){ loadValue( reinterpret_cast<std::int32_t&>( l ) ); }
-
-      //! non 32 bit signed long loading from current node
-      template <class T> inline
-      typename std::enable_if<sizeof(T) == sizeof(std::int64_t) && std::is_signed<T>::value, void>::type
-      loadLong(T & l){ loadValue( reinterpret_cast<std::int64_t&>( l ) ); }
-
-      //! 32 bit unsigned long loading from current node
-      template <class T> inline
-      typename std::enable_if<sizeof(T) == sizeof(std::uint32_t) && !std::is_signed<T>::value, void>::type
-      loadLong(T & lu){ loadValue( reinterpret_cast<std::uint32_t&>( lu ) ); }
-
-      //! non 32 bit unsigned long loading from current node
-      template <class T> inline
-      typename std::enable_if<sizeof(T) == sizeof(std::uint64_t) && !std::is_signed<T>::value, void>::type
-      loadLong(T & lu){ loadValue( reinterpret_cast<std::uint64_t&>( lu ) ); }
-
-    public:
-      //! Serialize a long if it would not be caught otherwise
-      template <class T> inline
-      typename std::enable_if<std::is_same<T, long>::value &&
-                              sizeof(T) >= sizeof(std::int64_t) &&
-                              !std::is_same<T, std::int64_t>::value, void>::type
-      loadValue( T & t ){ loadLong(t); }
-
-      //! Serialize an unsigned long if it would not be caught otherwise
-      template <class T> inline
-      typename std::enable_if<std::is_same<T, unsigned long>::value &&
-                              sizeof(T) >= sizeof(std::uint64_t) &&
-                              !std::is_same<T, std::uint64_t>::value, void>::type
-      loadValue( T & t ){ loadLong(t); }
-      #endif // _MSC_VER
-
-    private:
-      //! Convert a string to a long long
-      void stringToNumber( std::string const & str, long long & val ) { val = std::stoll( str ); }
-      //! Convert a string to an unsigned long long
-      void stringToNumber( std::string const & str, unsigned long long & val ) { val = std::stoull( str ); }
-      //! Convert a string to a long double
-      void stringToNumber( std::string const & str, long double & val ) { val = std::stold( str ); }
-
-    public:
-      //! Loads a value from the current node - long double and long long overloads
-      template <class T, traits::EnableIf<std::is_arithmetic<T>::value,
-                                          !std::is_same<T, long>::value,
-                                          !std::is_same<T, unsigned long>::value,
-                                          !std::is_same<T, std::int64_t>::value,
-                                          !std::is_same<T, std::uint64_t>::value,
-                                          (sizeof(T) >= sizeof(long double) || sizeof(T) >= sizeof(long long))> = traits::sfinae>
-      inline void loadValue(T & val)
-      {
-        std::string encoded;
-        loadValue( encoded );
-        stringToNumber( encoded, val );
-      }
-
-      //! Loads the size for a SizeTag
-      void loadSize(size_type & size)
-      {
-        if (itsIteratorStack.size() == 1)
-          size = itsDocument.Size();
-        else
-          size = (itsIteratorStack.rbegin() + 1)->value().Size();
-      }
-
-      //! @}
-
-    private:
-      const char * itsNextName;               //!< Next name set by NVP
-      ReadStream itsReadStream;               //!< Rapidjson write stream
-      std::vector<Iterator> itsIteratorStack; //!< 'Stack' of rapidJSON iterators
-      CEREAL_RAPIDJSON_NAMESPACE::Document itsDocument; //!< Rapidjson document
-  };
-
-  // ######################################################################
-  // JSONArchive prologue and epilogue functions
-  // ######################################################################
-
-  // ######################################################################
-  //! Prologue for NVPs for JSON archives
-  /*! NVPs do not start or finish nodes - they just set up the names */
-  template <class T> inline
-  void prologue( JSONOutputArchive &, NameValuePair<T> const & )
-  { }
-
-  //! Prologue for NVPs for JSON archives
-  template <class T> inline
-  void prologue( JSONInputArchive &, NameValuePair<T> const & )
-  { }
-
-  // ######################################################################
-  //! Epilogue for NVPs for JSON archives
-  /*! NVPs do not start or finish nodes - they just set up the names */
-  template <class T> inline
-  void epilogue( JSONOutputArchive &, NameValuePair<T> const & )
-  { }
-
-  //! Epilogue for NVPs for JSON archives
-  /*! NVPs do not start or finish nodes - they just set up the names */
-  template <class T> inline
-  void epilogue( JSONInputArchive &, NameValuePair<T> const & )
-  { }
-
-  // ######################################################################
-  //! Prologue for SizeTags for JSON archives
-  /*! SizeTags are strictly ignored for JSON, they just indicate
-      that the current node should be made into an array */
-  template <class T> inline
-  void prologue( JSONOutputArchive & ar, SizeTag<T> const & )
-  {
-    ar.makeArray();
-  }
-
-  //! Prologue for SizeTags for JSON archives
-  template <class T> inline
-  void prologue( JSONInputArchive &, SizeTag<T> const & )
-  { }
-
-  // ######################################################################
-  //! Epilogue for SizeTags for JSON archives
-  /*! SizeTags are strictly ignored for JSON */
-  template <class T> inline
-  void epilogue( JSONOutputArchive &, SizeTag<T> const & )
-  { }
-
-  //! Epilogue for SizeTags for JSON archives
-  template <class T> inline
-  void epilogue( JSONInputArchive &, SizeTag<T> const & )
-  { }
-
-  // ######################################################################
-  //! Prologue for all other types for JSON archives (except minimal types)
-  /*! Starts a new node, named either automatically or by some NVP,
-      that may be given data by the type about to be archived
-
-      Minimal types do not start or finish nodes */
-  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
-                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, JSONOutputArchive>::value,
-                                      !traits::has_minimal_output_serialization<T, JSONOutputArchive>::value> = traits::sfinae>
-  inline void prologue( JSONOutputArchive & ar, T const & )
-  {
-    ar.startNode();
-  }
-
-  //! Prologue for all other types for JSON archives
-  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
-                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, JSONInputArchive>::value,
-                                      !traits::has_minimal_input_serialization<T, JSONInputArchive>::value> = traits::sfinae>
-  inline void prologue( JSONInputArchive & ar, T const & )
-  {
-    ar.startNode();
-  }
-
-  // ######################################################################
-  //! Epilogue for all other types other for JSON archives (except minimal types)
-  /*! Finishes the node created in the prologue
-
-      Minimal types do not start or finish nodes */
-  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
-                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, JSONOutputArchive>::value,
-                                      !traits::has_minimal_output_serialization<T, JSONOutputArchive>::value> = traits::sfinae>
-  inline void epilogue( JSONOutputArchive & ar, T const & )
-  {
-    ar.finishNode();
-  }
-
-  //! Epilogue for all other types other for JSON archives
-  template <class T, traits::EnableIf<!std::is_arithmetic<T>::value,
-                                      !traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, JSONInputArchive>::value,
-                                      !traits::has_minimal_input_serialization<T, JSONInputArchive>::value> = traits::sfinae>
-  inline void epilogue( JSONInputArchive & ar, T const & )
-  {
-    ar.finishNode();
-  }
-
-  // ######################################################################
-  //! Prologue for arithmetic types for JSON archives
-  inline
-  void prologue( JSONOutputArchive & ar, std::nullptr_t const & )
-  {
-    ar.writeName();
-  }
-
-  //! Prologue for arithmetic types for JSON archives
-  inline
-  void prologue( JSONInputArchive &, std::nullptr_t const & )
-  { }
-
-  // ######################################################################
-  //! Epilogue for arithmetic types for JSON archives
-  inline
-  void epilogue( JSONOutputArchive &, std::nullptr_t const & )
-  { }
-
-  //! Epilogue for arithmetic types for JSON archives
-  inline
-  void epilogue( JSONInputArchive &, std::nullptr_t const & )
-  { }
-
-  // ######################################################################
-  //! Prologue for arithmetic types for JSON archives
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void prologue( JSONOutputArchive & ar, T const & )
-  {
-    ar.writeName();
-  }
-
-  //! Prologue for arithmetic types for JSON archives
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void prologue( JSONInputArchive &, T const & )
-  { }
-
-  // ######################################################################
-  //! Epilogue for arithmetic types for JSON archives
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void epilogue( JSONOutputArchive &, T const & )
-  { }
-
-  //! Epilogue for arithmetic types for JSON archives
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void epilogue( JSONInputArchive &, T const & )
-  { }
-
-  // ######################################################################
-  //! Prologue for strings for JSON archives
-  template<class CharT, class Traits, class Alloc> inline
-  void prologue(JSONOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const &)
-  {
-    ar.writeName();
-  }
-
-  //! Prologue for strings for JSON archives
-  template<class CharT, class Traits, class Alloc> inline
-  void prologue(JSONInputArchive &, std::basic_string<CharT, Traits, Alloc> const &)
-  { }
-
-  // ######################################################################
-  //! Epilogue for strings for JSON archives
-  template<class CharT, class Traits, class Alloc> inline
-  void epilogue(JSONOutputArchive &, std::basic_string<CharT, Traits, Alloc> const &)
-  { }
-
-  //! Epilogue for strings for JSON archives
-  template<class CharT, class Traits, class Alloc> inline
-  void epilogue(JSONInputArchive &, std::basic_string<CharT, Traits, Alloc> const &)
-  { }
-
-  // ######################################################################
-  // Common JSONArchive serialization functions
-  // ######################################################################
-  //! Serializing NVP types to JSON
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME( JSONOutputArchive & ar, NameValuePair<T> const & t )
-  {
-    ar.setNextName( t.name );
-    ar( t.value );
-  }
-
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME( JSONInputArchive & ar, NameValuePair<T> & t )
-  {
-    ar.setNextName( t.name );
-    ar( t.value );
-  }
-
-  //! Saving for nullptr to JSON
-  inline
-  void CEREAL_SAVE_FUNCTION_NAME(JSONOutputArchive & ar, std::nullptr_t const & t)
-  {
-    ar.saveValue( t );
-  }
-
-  //! Loading arithmetic from JSON
-  inline
-  void CEREAL_LOAD_FUNCTION_NAME(JSONInputArchive & ar, std::nullptr_t & t)
-  {
-    ar.loadValue( t );
-  }
-
-  //! Saving for arithmetic to JSON
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void CEREAL_SAVE_FUNCTION_NAME(JSONOutputArchive & ar, T const & t)
-  {
-    ar.saveValue( t );
-  }
-
-  //! Loading arithmetic from JSON
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void CEREAL_LOAD_FUNCTION_NAME(JSONInputArchive & ar, T & t)
-  {
-    ar.loadValue( t );
-  }
-
-  //! saving string to JSON
-  template<class CharT, class Traits, class Alloc> inline
-  void CEREAL_SAVE_FUNCTION_NAME(JSONOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
-  {
-    ar.saveValue( str );
-  }
-
-  //! loading string from JSON
-  template<class CharT, class Traits, class Alloc> inline
-  void CEREAL_LOAD_FUNCTION_NAME(JSONInputArchive & ar, std::basic_string<CharT, Traits, Alloc> & str)
-  {
-    ar.loadValue( str );
-  }
-
-  // ######################################################################
-  //! Saving SizeTags to JSON
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME( JSONOutputArchive &, SizeTag<T> const & )
-  {
-    // nothing to do here, we don't explicitly save the size
-  }
-
-  //! Loading SizeTags from JSON
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME( JSONInputArchive & ar, SizeTag<T> & st )
-  {
-    ar.loadSize( st.size );
-  }
-} // namespace cereal
-
-// register archives for polymorphic support
-CEREAL_REGISTER_ARCHIVE(cereal::JSONInputArchive)
-CEREAL_REGISTER_ARCHIVE(cereal::JSONOutputArchive)
-
-// tie input and output archives together
-CEREAL_SETUP_ARCHIVE_TRAITS(cereal::JSONInputArchive, cereal::JSONOutputArchive)
-
-#endif // CEREAL_ARCHIVES_JSON_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/portable_binary.hpp b/Src/External/cereal/include/cereal/archives/portable_binary.hpp
deleted file mode 100644
index 76e634b..0000000
--- a/Src/External/cereal/include/cereal/archives/portable_binary.hpp
+++ /dev/null
@@ -1,334 +0,0 @@
-/*! \file binary.hpp
-    \brief Binary input and output archives */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_ARCHIVES_PORTABLE_BINARY_HPP_
-#define CEREAL_ARCHIVES_PORTABLE_BINARY_HPP_
-
-#include "cereal/cereal.hpp"
-#include <sstream>
-#include <limits>
-
-namespace cereal
-{
-  namespace portable_binary_detail
-  {
-    //! Returns true if the current machine is little endian
-    /*! @ingroup Internal */
-    inline std::uint8_t is_little_endian()
-    {
-      static std::int32_t test = 1;
-      return *reinterpret_cast<std::int8_t*>( &test ) == 1;
-    }
-
-    //! Swaps the order of bytes for some chunk of memory
-    /*! @param data The data as a uint8_t pointer
-        @tparam DataSize The true size of the data
-        @ingroup Internal */
-    template <std::size_t DataSize>
-    inline void swap_bytes( std::uint8_t * data )
-    {
-      for( std::size_t i = 0, end = DataSize / 2; i < end; ++i )
-        std::swap( data[i], data[DataSize - i - 1] );
-    }
-  } // end namespace portable_binary_detail
-
-  // ######################################################################
-  //! An output archive designed to save data in a compact binary representation portable over different architectures
-  /*! This archive outputs data to a stream in an extremely compact binary
-      representation with as little extra metadata as possible.
-
-      This archive will record the endianness of the data as well as the desired in/out endianness
-      and assuming that the user takes care of ensuring serialized types are the same size
-      across machines, is portable over different architectures.
-
-      When using a binary archive and a file stream, you must use the
-      std::ios::binary format flag to avoid having your data altered
-      inadvertently.
-
-      \warning This archive has not been thoroughly tested across different architectures.
-               Please report any issues, optimizations, or feature requests at
-               <a href="www.github.com/USCiLab/cereal">the project github</a>.
-
-    \ingroup Archives */
-  class PortableBinaryOutputArchive : public OutputArchive<PortableBinaryOutputArchive, AllowEmptyClassElision>
-  {
-    public:
-      //! A class containing various advanced options for the PortableBinaryOutput archive
-      class Options
-      {
-        public:
-          //! Represents desired endianness
-          enum class Endianness : std::uint8_t
-          { big, little };
-
-          //! Default options, preserve system endianness
-          static Options Default(){ return Options(); }
-
-          //! Save as little endian
-          static Options LittleEndian(){ return Options( Endianness::little ); }
-
-          //! Save as big endian
-          static Options BigEndian(){ return Options( Endianness::big ); }
-
-          //! Specify specific options for the PortableBinaryOutputArchive
-          /*! @param outputEndian The desired endianness of saved (output) data */
-          explicit Options( Endianness outputEndian = getEndianness() ) :
-            itsOutputEndianness( outputEndian ) { }
-
-        private:
-          //! Gets the endianness of the system
-          inline static Endianness getEndianness()
-          { return portable_binary_detail::is_little_endian() ? Endianness::little : Endianness::big; }
-
-          //! Checks if Options is set for little endian
-          inline std::uint8_t is_little_endian() const
-          { return itsOutputEndianness == Endianness::little; }
-
-          friend class PortableBinaryOutputArchive;
-          Endianness itsOutputEndianness;
-      };
-
-      //! Construct, outputting to the provided stream
-      /*! @param stream The stream to output to. Should be opened with std::ios::binary flag.
-          @param options The PortableBinary specific options to use.  See the Options struct
-                         for the values of default parameters */
-      PortableBinaryOutputArchive(std::ostream & stream, Options const & options = Options::Default()) :
-        OutputArchive<PortableBinaryOutputArchive, AllowEmptyClassElision>(this),
-        itsStream(stream),
-        itsConvertEndianness( portable_binary_detail::is_little_endian() ^ options.is_little_endian() )
-      {
-        this->operator()( options.is_little_endian() );
-      }
-
-      ~PortableBinaryOutputArchive() CEREAL_NOEXCEPT = default;
-
-      //! Writes size bytes of data to the output stream
-      template <std::size_t DataSize> inline
-      void saveBinary( const void * data, std::size_t size )
-      {
-        std::size_t writtenSize = 0;
-
-        if( itsConvertEndianness )
-        {
-          for( std::size_t i = 0; i < size; i += DataSize )
-            for( std::size_t j = 0; j < DataSize; ++j )
-              writtenSize += static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ) + DataSize - j - 1 + i, 1 ) );
-        }
-        else
-          writtenSize = static_cast<std::size_t>( itsStream.rdbuf()->sputn( reinterpret_cast<const char*>( data ), size ) );
-
-        if(writtenSize != size)
-          throw Exception("Failed to write " + std::to_string(size) + " bytes to output stream! Wrote " + std::to_string(writtenSize));
-      }
-
-    private:
-      std::ostream & itsStream;
-      const uint8_t itsConvertEndianness; //!< If set to true, we will need to swap bytes upon saving
-  };
-
-  // ######################################################################
-  //! An input archive designed to load data saved using PortableBinaryOutputArchive
-  /*! This archive outputs data to a stream in an extremely compact binary
-      representation with as little extra metadata as possible.
-
-      This archive will load the endianness of the serialized data and
-      if necessary transform it to match that of the local machine.  This comes
-      at a significant performance cost compared to non portable archives if
-      the transformation is necessary, and also causes a small performance hit
-      even if it is not necessary.
-
-      It is recommended to use portable archives only if you know that you will
-      be sending binary data to machines with different endianness.
-
-      The archive will do nothing to ensure types are the same size - that is
-      the responsibility of the user.
-
-      When using a binary archive and a file stream, you must use the
-      std::ios::binary format flag to avoid having your data altered
-      inadvertently.
-
-      \warning This archive has not been thoroughly tested across different architectures.
-               Please report any issues, optimizations, or feature requests at
-               <a href="www.github.com/USCiLab/cereal">the project github</a>.
-
-    \ingroup Archives */
-  class PortableBinaryInputArchive : public InputArchive<PortableBinaryInputArchive, AllowEmptyClassElision>
-  {
-    public:
-      //! A class containing various advanced options for the PortableBinaryInput archive
-      class Options
-      {
-        public:
-          //! Represents desired endianness
-          enum class Endianness : std::uint8_t
-          { big, little };
-
-          //! Default options, preserve system endianness
-          static Options Default(){ return Options(); }
-
-          //! Load into little endian
-          static Options LittleEndian(){ return Options( Endianness::little ); }
-
-          //! Load into big endian
-          static Options BigEndian(){ return Options( Endianness::big ); }
-
-          //! Specify specific options for the PortableBinaryInputArchive
-          /*! @param inputEndian The desired endianness of loaded (input) data */
-          explicit Options( Endianness inputEndian = getEndianness() ) :
-            itsInputEndianness( inputEndian ) { }
-
-        private:
-          //! Gets the endianness of the system
-          inline static Endianness getEndianness()
-          { return portable_binary_detail::is_little_endian() ? Endianness::little : Endianness::big; }
-
-          //! Checks if Options is set for little endian
-          inline std::uint8_t is_little_endian() const
-          { return itsInputEndianness == Endianness::little; }
-
-          friend class PortableBinaryInputArchive;
-          Endianness itsInputEndianness;
-      };
-
-      //! Construct, loading from the provided stream
-      /*! @param stream The stream to read from. Should be opened with std::ios::binary flag.
-          @param options The PortableBinary specific options to use.  See the Options struct
-                         for the values of default parameters */
-      PortableBinaryInputArchive(std::istream & stream, Options const & options = Options::Default()) :
-        InputArchive<PortableBinaryInputArchive, AllowEmptyClassElision>(this),
-        itsStream(stream),
-        itsConvertEndianness( false )
-      {
-        uint8_t streamLittleEndian;
-        this->operator()( streamLittleEndian );
-        itsConvertEndianness = options.is_little_endian() ^ streamLittleEndian;
-      }
-
-      ~PortableBinaryInputArchive() CEREAL_NOEXCEPT = default;
-
-      //! Reads size bytes of data from the input stream
-      /*! @param data The data to save
-          @param size The number of bytes in the data
-          @tparam DataSize T The size of the actual type of the data elements being loaded */
-      template <std::size_t DataSize> inline
-      void loadBinary( void * const data, std::size_t size )
-      {
-        // load data
-        auto const readSize = static_cast<std::size_t>( itsStream.rdbuf()->sgetn( reinterpret_cast<char*>( data ), size ) );
-
-        if(readSize != size)
-          throw Exception("Failed to read " + std::to_string(size) + " bytes from input stream! Read " + std::to_string(readSize));
-
-        // flip bits if needed
-        if( itsConvertEndianness )
-        {
-          std::uint8_t * ptr = reinterpret_cast<std::uint8_t*>( data );
-          for( std::size_t i = 0; i < size; i += DataSize )
-            portable_binary_detail::swap_bytes<DataSize>( ptr + i );
-        }
-      }
-
-    private:
-      std::istream & itsStream;
-      uint8_t itsConvertEndianness; //!< If set to true, we will need to swap bytes upon loading
-  };
-
-  // ######################################################################
-  // Common BinaryArchive serialization functions
-
-  //! Saving for POD types to portable binary
-  template<class T> inline
-  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME(PortableBinaryOutputArchive & ar, T const & t)
-  {
-    static_assert( !std::is_floating_point<T>::value ||
-                   (std::is_floating_point<T>::value && std::numeric_limits<T>::is_iec559),
-                   "Portable binary only supports IEEE 754 standardized floating point" );
-    ar.template saveBinary<sizeof(T)>(std::addressof(t), sizeof(t));
-  }
-
-  //! Loading for POD types from portable binary
-  template<class T> inline
-  typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME(PortableBinaryInputArchive & ar, T & t)
-  {
-    static_assert( !std::is_floating_point<T>::value ||
-                   (std::is_floating_point<T>::value && std::numeric_limits<T>::is_iec559),
-                   "Portable binary only supports IEEE 754 standardized floating point" );
-    ar.template loadBinary<sizeof(T)>(std::addressof(t), sizeof(t));
-  }
-
-  //! Serializing NVP types to portable binary
-  template <class Archive, class T> inline
-  CEREAL_ARCHIVE_RESTRICT(PortableBinaryInputArchive, PortableBinaryOutputArchive)
-  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, NameValuePair<T> & t )
-  {
-    ar( t.value );
-  }
-
-  //! Serializing SizeTags to portable binary
-  template <class Archive, class T> inline
-  CEREAL_ARCHIVE_RESTRICT(PortableBinaryInputArchive, PortableBinaryOutputArchive)
-  CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, SizeTag<T> & t )
-  {
-    ar( t.size );
-  }
-
-  //! Saving binary data to portable binary
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME(PortableBinaryOutputArchive & ar, BinaryData<T> const & bd)
-  {
-    typedef typename std::remove_pointer<T>::type TT;
-    static_assert( !std::is_floating_point<TT>::value ||
-                   (std::is_floating_point<TT>::value && std::numeric_limits<TT>::is_iec559),
-                   "Portable binary only supports IEEE 754 standardized floating point" );
-
-    ar.template saveBinary<sizeof(TT)>( bd.data, static_cast<std::size_t>( bd.size ) );
-  }
-
-  //! Loading binary data from portable binary
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME(PortableBinaryInputArchive & ar, BinaryData<T> & bd)
-  {
-    typedef typename std::remove_pointer<T>::type TT;
-    static_assert( !std::is_floating_point<TT>::value ||
-                   (std::is_floating_point<TT>::value && std::numeric_limits<TT>::is_iec559),
-                   "Portable binary only supports IEEE 754 standardized floating point" );
-
-    ar.template loadBinary<sizeof(TT)>( bd.data, static_cast<std::size_t>( bd.size ) );
-  }
-} // namespace cereal
-
-// register archives for polymorphic support
-CEREAL_REGISTER_ARCHIVE(cereal::PortableBinaryOutputArchive)
-CEREAL_REGISTER_ARCHIVE(cereal::PortableBinaryInputArchive)
-
-// tie input and output archives together
-CEREAL_SETUP_ARCHIVE_TRAITS(cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive)
-
-#endif // CEREAL_ARCHIVES_PORTABLE_BINARY_HPP_
diff --git a/Src/External/cereal/include/cereal/archives/xml.hpp b/Src/External/cereal/include/cereal/archives/xml.hpp
deleted file mode 100644
index c520f02..0000000
--- a/Src/External/cereal/include/cereal/archives/xml.hpp
+++ /dev/null
@@ -1,897 +0,0 @@
-/*! \file xml.hpp
-    \brief XML input and output archives */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_ARCHIVES_XML_HPP_
-#define CEREAL_ARCHIVES_XML_HPP_
-#include "cereal/cereal.hpp"
-#include "cereal/details/util.hpp"
-
-#include "cereal/external/rapidxml/rapidxml.hpp"
-#include "cereal/external/rapidxml/rapidxml_print.hpp"
-#include "cereal/external/base64.hpp"
-
-#include <sstream>
-#include <stack>
-#include <vector>
-#include <limits>
-#include <string>
-#include <cstring>
-#include <cmath>
-
-namespace cereal
-{
-  namespace xml_detail
-  {
-    #ifndef CEREAL_XML_STRING_VALUE
-    //! The default name for the root node in a cereal xml archive.
-    /*! You can define CEREAL_XML_STRING_VALUE to be different assuming you do so
-        before this file is included. */
-    #define CEREAL_XML_STRING_VALUE "cereal"
-    #endif // CEREAL_XML_STRING_VALUE
-
-    //! The name given to the root node in a cereal xml archive
-    static const char * CEREAL_XML_STRING = CEREAL_XML_STRING_VALUE;
-
-    //! Returns true if the character is whitespace
-    inline bool isWhitespace( char c )
-    {
-      return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-    }
-  }
-
-  // ######################################################################
-  //! An output archive designed to save data to XML
-  /*! This archive uses RapidXML to build an in memory XML tree of the
-      data it serializes before outputting it to its stream upon destruction.
-      This archive should be used in an RAII fashion, letting
-      the automatic destruction of the object cause the flush to its stream.
-
-      XML archives provides a human readable output but at decreased
-      performance (both in time and space) compared to binary archives.
-
-      XML benefits greatly from name-value pairs, which if present, will
-      name the nodes in the output.  If these are not present, each level
-      of the output tree will be given an automatically generated delimited name.
-
-      The precision of the output archive controls the number of decimals output
-      for floating point numbers and should be sufficiently large (i.e. at least 20)
-      if there is a desire to have binary equality between the numbers output and
-      those read in.  In general you should expect a loss of precision when going
-      from floating point to text and back.
-
-      XML archives can optionally print the type of everything they serialize, which
-      adds an attribute to each node.
-
-      XML archives do not output the size information for any dynamically sized structure
-      and instead infer it from the number of children for a node.  This means that data
-      can be hand edited for dynamic sized structures and will still be readable.  This
-      is accomplished through the cereal::SizeTag object, which will also add an attribute
-      to its parent field.
-      \ingroup Archives */
-  class XMLOutputArchive : public OutputArchive<XMLOutputArchive>, public traits::TextArchive
-  {
-    public:
-      /*! @name Common Functionality
-          Common use cases for directly interacting with an XMLOutputArchive */
-      //! @{
-
-      //! A class containing various advanced options for the XML archive
-      class Options
-      {
-        public:
-          //! Default options
-          static Options Default(){ return Options(); }
-
-          //! Default options with no indentation
-          static Options NoIndent(){ return Options( std::numeric_limits<double>::max_digits10, false ); }
-
-          //! Specify specific options for the XMLOutputArchive
-          /*! @param precision The precision used for floating point numbers
-              @param indent Whether to indent each line of XML
-              @param outputType Whether to output the type of each serialized object as an attribute */
-          explicit Options( int precision = std::numeric_limits<double>::max_digits10,
-                            bool indent = true,
-                            bool outputType = false ) :
-            itsPrecision( precision ),
-            itsIndent( indent ),
-            itsOutputType( outputType ) { }
-
-        private:
-          friend class XMLOutputArchive;
-          int itsPrecision;
-          bool itsIndent;
-          bool itsOutputType;
-      };
-
-      //! Construct, outputting to the provided stream upon destruction
-      /*! @param stream  The stream to output to.  Note that XML is only guaranteed to flush
-                         its output to the stream upon destruction.
-          @param options The XML specific options to use.  See the Options struct
-                         for the values of default parameters */
-      XMLOutputArchive( std::ostream & stream, Options const & options = Options::Default() ) :
-        OutputArchive<XMLOutputArchive>(this),
-        itsStream(stream),
-        itsOutputType( options.itsOutputType ),
-        itsIndent( options.itsIndent )
-      {
-        // rapidxml will delete all allocations when xml_document is cleared
-        auto node = itsXML.allocate_node( rapidxml::node_declaration );
-        node->append_attribute( itsXML.allocate_attribute( "version", "1.0" ) );
-        node->append_attribute( itsXML.allocate_attribute( "encoding", "utf-8" ) );
-        itsXML.append_node( node );
-
-        // allocate root node
-        auto root = itsXML.allocate_node( rapidxml::node_element, xml_detail::CEREAL_XML_STRING );
-        itsXML.append_node( root );
-        itsNodes.emplace( root );
-
-        // set attributes on the streams
-        itsStream << std::boolalpha;
-        itsStream.precision( options.itsPrecision );
-        itsOS << std::boolalpha;
-        itsOS.precision( options.itsPrecision );
-      }
-
-      //! Destructor, flushes the XML
-      ~XMLOutputArchive() CEREAL_NOEXCEPT
-      {
-        const int flags = itsIndent ? 0x0 : rapidxml::print_no_indenting;
-        rapidxml::print( itsStream, itsXML, flags );
-        itsXML.clear();
-      }
-
-      //! Saves some binary data, encoded as a base64 string, with an optional name
-      /*! This can be called directly by users and it will automatically create a child node for
-          the current XML node, populate it with a base64 encoded string, and optionally name
-          it.  The node will be finished after it has been populated.  */
-      void saveBinaryValue( const void * data, size_t size, const char * name = nullptr )
-      {
-        itsNodes.top().name = name;
-
-        startNode();
-
-        auto base64string = base64::encode( reinterpret_cast<const unsigned char *>( data ), size );
-        saveValue( base64string );
-
-        if( itsOutputType )
-          itsNodes.top().node->append_attribute( itsXML.allocate_attribute( "type", "cereal binary data" ) );
-
-        finishNode();
-      };
-
-      //! @}
-      /*! @name Internal Functionality
-          Functionality designed for use by those requiring control over the inner mechanisms of
-          the XMLOutputArchive */
-      //! @{
-
-      //! Creates a new node that is a child of the node at the top of the stack
-      /*! Nodes will be given a name that has either been pre-set by a name value pair,
-          or generated based upon a counter unique to the parent node.  If you want to
-          give a node a specific name, use setNextName prior to calling startNode.
-
-          The node will then be pushed onto the node stack. */
-      void startNode()
-      {
-        // generate a name for this new node
-        const auto nameString = itsNodes.top().getValueName();
-
-        // allocate strings for all of the data in the XML object
-        auto namePtr = itsXML.allocate_string( nameString.data(), nameString.length() + 1 );
-
-        // insert into the XML
-        auto node = itsXML.allocate_node( rapidxml::node_element, namePtr, nullptr, nameString.size() );
-        itsNodes.top().node->append_node( node );
-        itsNodes.emplace( node );
-      }
-
-      //! Designates the most recently added node as finished
-      void finishNode()
-      {
-        itsNodes.pop();
-      }
-
-      //! Sets the name for the next node created with startNode
-      void setNextName( const char * name )
-      {
-        itsNodes.top().name = name;
-      }
-
-      //! Saves some data, encoded as a string, into the current top level node
-      /*! The data will be be named with the most recent name if one exists,
-          otherwise it will be given some default delimited value that depends upon
-          the parent node */
-      template <class T> inline
-      void saveValue( T const & value )
-      {
-        itsOS.clear(); itsOS.seekp( 0, std::ios::beg );
-        itsOS << value << std::ends;
-
-        auto strValue = itsOS.str();
-
-        // itsOS.str() may contain data from previous calls after the first '\0' that was just inserted
-        // and this data is counted in the length call. We make sure to remove that section so that the
-        // whitespace validation is done properly
-        strValue.resize(std::strlen(strValue.c_str()));
-
-        // If the first or last character is a whitespace, add xml:space attribute
-        const auto len = strValue.length();
-        if ( len > 0 && ( xml_detail::isWhitespace( strValue[0] ) || xml_detail::isWhitespace( strValue[len - 1] ) ) )
-        {
-          itsNodes.top().node->append_attribute( itsXML.allocate_attribute( "xml:space", "preserve" ) );
-        }
-
-        // allocate strings for all of the data in the XML object
-        auto dataPtr = itsXML.allocate_string(strValue.c_str(), strValue.length() + 1 );
-
-        // insert into the XML
-        itsNodes.top().node->append_node( itsXML.allocate_node( rapidxml::node_data, nullptr, dataPtr ) );
-      }
-
-      //! Overload for uint8_t prevents them from being serialized as characters
-      void saveValue( uint8_t const & value )
-      {
-        saveValue( static_cast<uint32_t>( value ) );
-      }
-
-      //! Overload for int8_t prevents them from being serialized as characters
-      void saveValue( int8_t const & value )
-      {
-        saveValue( static_cast<int32_t>( value ) );
-      }
-
-      //! Causes the type to be appended as an attribute to the most recently made node if output type is set to true
-      template <class T> inline
-      void insertType()
-      {
-        if( !itsOutputType )
-          return;
-
-        // generate a name for this new node
-        const auto nameString = util::demangledName<T>();
-
-        // allocate strings for all of the data in the XML object
-        auto namePtr = itsXML.allocate_string( nameString.data(), nameString.length() + 1 );
-
-        itsNodes.top().node->append_attribute( itsXML.allocate_attribute( "type", namePtr ) );
-      }
-
-      //! Appends an attribute to the current top level node
-      void appendAttribute( const char * name, const char * value )
-      {
-        auto namePtr =  itsXML.allocate_string( name );
-        auto valuePtr = itsXML.allocate_string( value );
-        itsNodes.top().node->append_attribute( itsXML.allocate_attribute( namePtr, valuePtr ) );
-      }
-
-    protected:
-      //! A struct that contains metadata about a node
-      struct NodeInfo
-      {
-        NodeInfo( rapidxml::xml_node<> * n = nullptr,
-                  const char * nm = nullptr ) :
-          node( n ),
-          counter( 0 ),
-          name( nm )
-        { }
-
-        rapidxml::xml_node<> * node; //!< A pointer to this node
-        size_t counter;              //!< The counter for naming child nodes
-        const char * name;           //!< The name for the next child node
-
-        //! Gets the name for the next child node created from this node
-        /*! The name will be automatically generated using the counter if
-            a name has not been previously set.  If a name has been previously
-            set, that name will be returned only once */
-        std::string getValueName()
-        {
-          if( name )
-          {
-            auto n = name;
-            name = nullptr;
-            return {n};
-          }
-          else
-            return "value" + std::to_string( counter++ ) + "\0";
-        }
-      }; // NodeInfo
-
-      //! @}
-
-    private:
-      std::ostream & itsStream;        //!< The output stream
-      rapidxml::xml_document<> itsXML; //!< The XML document
-      std::stack<NodeInfo> itsNodes;   //!< A stack of nodes added to the document
-      std::ostringstream itsOS;        //!< Used to format strings internally
-      bool itsOutputType;              //!< Controls whether type information is printed
-      bool itsIndent;                  //!< Controls whether indenting is used
-  }; // XMLOutputArchive
-
-  // ######################################################################
-  //! An output archive designed to load data from XML
-  /*! This archive uses RapidXML to build an in memory XML tree of the
-      data in the stream it is given before loading any types serialized.
-
-      As with the output XML archive, the preferred way to use this archive is in
-      an RAII fashion, ensuring its destruction after all data has been read.
-
-      Input XML should have been produced by the XMLOutputArchive.  Data can
-      only be added to dynamically sized containers - the input archive will
-      determine their size by looking at the number of child nodes.  Data that
-      did not originate from an XMLOutputArchive is not officially supported,
-      but may be possible to use if properly formatted.
-
-      The XMLInputArchive does not require that nodes are loaded in the same
-      order they were saved by XMLOutputArchive.  Using name value pairs (NVPs),
-      it is possible to load in an out of order fashion or otherwise skip/select
-      specific nodes to load.
-
-      The default behavior of the input archive is to read sequentially starting
-      with the first node and exploring its children.  When a given NVP does
-      not match the read in name for a node, the archive will search for that
-      node at the current level and load it if it exists.  After loading an out of
-      order node, the archive will then proceed back to loading sequentially from
-      its new position.
-
-      Consider this simple example where loading of some data is skipped:
-
-      @code{cpp}
-      // imagine the input file has someData(1-9) saved in order at the top level node
-      ar( someData1, someData2, someData3 );        // XML loads in the order it sees in the file
-      ar( cereal::make_nvp( "hello", someData6 ) ); // NVP given does not
-                                                    // match expected NVP name, so we search
-                                                    // for the given NVP and load that value
-      ar( someData7, someData8, someData9 );        // with no NVP given, loading resumes at its
-                                                    // current location, proceeding sequentially
-      @endcode
-
-      \ingroup Archives */
-  class XMLInputArchive : public InputArchive<XMLInputArchive>, public traits::TextArchive
-  {
-    public:
-      /*! @name Common Functionality
-          Common use cases for directly interacting with an XMLInputArchive */
-      //! @{
-
-      //! Construct, reading in from the provided stream
-      /*! Reads in an entire XML document from some stream and parses it as soon
-          as serialization starts
-
-          @param stream The stream to read from.  Can be a stringstream or a file. */
-      XMLInputArchive( std::istream & stream ) :
-        InputArchive<XMLInputArchive>( this ),
-        itsData( std::istreambuf_iterator<char>( stream ), std::istreambuf_iterator<char>() )
-      {
-        try
-        {
-          itsData.push_back('\0'); // rapidxml will do terrible things without the data being null terminated
-          itsXML.parse<rapidxml::parse_trim_whitespace | rapidxml::parse_no_data_nodes | rapidxml::parse_declaration_node>( reinterpret_cast<char *>( itsData.data() ) );
-        }
-        catch( rapidxml::parse_error const & )
-        {
-          //std::cerr << "-----Original-----" << std::endl;
-          //stream.seekg(0);
-          //std::cout << std::string( std::istreambuf_iterator<char>( stream ), std::istreambuf_iterator<char>() ) << std::endl;
-
-          //std::cerr << "-----Error-----" << std::endl;
-          //std::cerr << e.what() << std::endl;
-          //std::cerr << e.where<char>() << std::endl;
-          throw Exception("XML Parsing failed - likely due to invalid characters or invalid naming");
-        }
-
-        // Parse the root
-        auto root = itsXML.first_node( xml_detail::CEREAL_XML_STRING );
-        if( root == nullptr )
-          throw Exception("Could not detect cereal root node - likely due to empty or invalid input");
-        else
-          itsNodes.emplace( root );
-      }
-
-      ~XMLInputArchive() CEREAL_NOEXCEPT = default;
-
-      //! Loads some binary data, encoded as a base64 string, optionally specified by some name
-      /*! This will automatically start and finish a node to load the data, and can be called directly by
-          users.
-
-          Note that this follows the same ordering rules specified in the class description in regards
-          to loading in/out of order */
-      void loadBinaryValue( void * data, size_t size, const char * name = nullptr )
-      {
-        setNextName( name );
-        startNode();
-
-        std::string encoded;
-        loadValue( encoded );
-
-        auto decoded = base64::decode( encoded );
-
-        if( size != decoded.size() )
-          throw Exception("Decoded binary data size does not match specified size");
-
-        std::memcpy( data, decoded.data(), decoded.size() );
-
-        finishNode();
-      };
-
-      //! @}
-      /*! @name Internal Functionality
-          Functionality designed for use by those requiring control over the inner mechanisms of
-          the XMLInputArchive */
-      //! @{
-
-      //! Prepares to start reading the next node
-      /*! This places the next node to be parsed onto the nodes stack.
-
-          By default our strategy is to start with the document root node and then
-          recursively iterate through all children in the order they show up in the document.
-          We don't need to know NVPs do to this; we'll just blindly load in the order things appear in.
-
-          We check to see if the specified NVP matches what the next automatically loaded node is.  If they
-          match, we just continue as normal, going in order.  If they don't match, we attempt to find a node
-          named after the NVP that is being loaded.  If that NVP does not exist, we throw an exception. */
-      void startNode()
-      {
-        auto next = itsNodes.top().child; // By default we would move to the next child node
-        auto const expectedName = itsNodes.top().name; // this is the expected name from the NVP, if provided
-
-        // If we were given an NVP name, look for it in the current level of the document.
-        //    We only need to do this if either we have exhausted the siblings of the current level or
-        //    the NVP name does not match the name of the node we would normally read next
-        if( expectedName && ( next == nullptr || std::strcmp( next->name(), expectedName ) != 0 ) )
-        {
-          next = itsNodes.top().search( expectedName );
-
-          if( next == nullptr )
-            throw Exception("XML Parsing failed - provided NVP (" + std::string(expectedName) + ") not found");
-        }
-
-        itsNodes.emplace( next );
-      }
-
-      //! Finishes reading the current node
-      void finishNode()
-      {
-        // remove current
-        itsNodes.pop();
-
-        // advance parent
-        itsNodes.top().advance();
-
-        // Reset name
-        itsNodes.top().name = nullptr;
-      }
-
-      //! Retrieves the current node name
-      //! will return @c nullptr if the node does not have a name
-      const char * getNodeName() const
-      {
-        return itsNodes.top().getChildName();
-      }
-
-      //! Sets the name for the next node created with startNode
-      void setNextName( const char * name )
-      {
-        itsNodes.top().name = name;
-      }
-
-      //! Loads a bool from the current top node
-      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
-                                          std::is_same<T, bool>::value> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        std::istringstream is( itsNodes.top().node->value() );
-        is.setf( std::ios::boolalpha );
-        is >> value;
-      }
-
-      //! Loads a char (signed or unsigned) from the current top node
-      template <class T, traits::EnableIf<std::is_integral<T>::value,
-                                          !std::is_same<T, bool>::value,
-                                          sizeof(T) == sizeof(char)> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        value = *reinterpret_cast<T*>( itsNodes.top().node->value() );
-      }
-
-      //! Load an int8_t from the current top node (ensures we parse entire number)
-      void loadValue( int8_t & value )
-      {
-        int32_t val; loadValue( val ); value = static_cast<int8_t>( val );
-      }
-
-      //! Load a uint8_t from the current top node (ensures we parse entire number)
-      void loadValue( uint8_t & value )
-      {
-        uint32_t val; loadValue( val ); value = static_cast<uint8_t>( val );
-      }
-
-      //! Loads a type best represented as an unsigned long from the current top node
-      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
-                                          !std::is_same<T, bool>::value,
-                                          !std::is_same<T, char>::value,
-                                          !std::is_same<T, unsigned char>::value,
-                                          sizeof(T) < sizeof(long long)> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        value = static_cast<T>( std::stoul( itsNodes.top().node->value() ) );
-      }
-
-      //! Loads a type best represented as an unsigned long long from the current top node
-      template <class T, traits::EnableIf<std::is_unsigned<T>::value,
-                                          !std::is_same<T, bool>::value,
-                                          sizeof(T) >= sizeof(long long)> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        value = static_cast<T>( std::stoull( itsNodes.top().node->value() ) );
-      }
-
-      //! Loads a type best represented as an int from the current top node
-      template <class T, traits::EnableIf<std::is_signed<T>::value,
-                                          !std::is_same<T, char>::value,
-                                          sizeof(T) <= sizeof(int)> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        value = static_cast<T>( std::stoi( itsNodes.top().node->value() ) );
-      }
-
-      //! Loads a type best represented as a long from the current top node
-      template <class T, traits::EnableIf<std::is_signed<T>::value,
-                                          (sizeof(T) > sizeof(int)),
-                                          sizeof(T) <= sizeof(long)> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        value = static_cast<T>( std::stol( itsNodes.top().node->value() ) );
-      }
-
-      //! Loads a type best represented as a long long from the current top node
-      template <class T, traits::EnableIf<std::is_signed<T>::value,
-                                          (sizeof(T) > sizeof(long)),
-                                          sizeof(T) <= sizeof(long long)> = traits::sfinae> inline
-      void loadValue( T & value )
-      {
-        value = static_cast<T>( std::stoll( itsNodes.top().node->value() ) );
-      }
-
-      //! Loads a type best represented as a float from the current top node
-      void loadValue( float & value )
-      {
-        try
-        {
-          value = std::stof( itsNodes.top().node->value() );
-        }
-        catch( std::out_of_range const & )
-        {
-          // special case for denormalized values
-          std::istringstream is( itsNodes.top().node->value() );
-          is >> value;
-          if( std::fpclassify( value ) != FP_SUBNORMAL )
-            throw;
-        }
-      }
-
-      //! Loads a type best represented as a double from the current top node
-      void loadValue( double & value )
-      {
-        try
-        {
-          value = std::stod( itsNodes.top().node->value() );
-        }
-        catch( std::out_of_range const & )
-        {
-          // special case for denormalized values
-          std::istringstream is( itsNodes.top().node->value() );
-          is >> value;
-          if( std::fpclassify( value ) != FP_SUBNORMAL )
-            throw;
-        }
-      }
-
-      //! Loads a type best represented as a long double from the current top node
-      void loadValue( long double & value )
-      {
-        try
-        {
-          value = std::stold( itsNodes.top().node->value() );
-        }
-        catch( std::out_of_range const & )
-        {
-          // special case for denormalized values
-          std::istringstream is( itsNodes.top().node->value() );
-          is >> value;
-          if( std::fpclassify( value ) != FP_SUBNORMAL )
-            throw;
-        }
-      }
-
-      //! Loads a string from the current node from the current top node
-      template<class CharT, class Traits, class Alloc> inline
-      void loadValue( std::basic_string<CharT, Traits, Alloc> & str )
-      {
-        std::basic_istringstream<CharT, Traits> is( itsNodes.top().node->value() );
-
-        str.assign( std::istreambuf_iterator<CharT, Traits>( is ),
-                    std::istreambuf_iterator<CharT, Traits>() );
-      }
-
-      //! Loads the size of the current top node
-      template <class T> inline
-      void loadSize( T & value )
-      {
-        value = getNumChildren( itsNodes.top().node );
-      }
-
-    protected:
-      //! Gets the number of children (usually interpreted as size) for the specified node
-      static size_t getNumChildren( rapidxml::xml_node<> * node )
-      {
-        size_t size = 0;
-        node = node->first_node(); // get first child
-
-        while( node != nullptr )
-        {
-          ++size;
-          node = node->next_sibling();
-        }
-
-        return size;
-      }
-
-      //! A struct that contains metadata about a node
-      /*! Keeps track of some top level node, its number of
-          remaining children, and the current active child node */
-      struct NodeInfo
-      {
-        NodeInfo( rapidxml::xml_node<> * n = nullptr ) :
-          node( n ),
-          child( n->first_node() ),
-          size( XMLInputArchive::getNumChildren( n ) ),
-          name( nullptr )
-        { }
-
-        //! Advances to the next sibling node of the child
-        /*! If this is the last sibling child will be null after calling */
-        void advance()
-        {
-          if( size > 0 )
-          {
-            --size;
-            child = child->next_sibling();
-          }
-        }
-
-        //! Searches for a child with the given name in this node
-        /*! @param searchName The name to search for (must be null terminated)
-            @return The node if found, nullptr otherwise */
-        rapidxml::xml_node<> * search( const char * searchName )
-        {
-          if( searchName )
-          {
-            size_t new_size = XMLInputArchive::getNumChildren( node );
-            const size_t name_size = rapidxml::internal::measure( searchName );
-
-            for( auto new_child = node->first_node(); new_child != nullptr; new_child = new_child->next_sibling() )
-            {
-              if( rapidxml::internal::compare( new_child->name(), new_child->name_size(), searchName, name_size, true ) )
-              {
-                size = new_size;
-                child = new_child;
-
-                return new_child;
-              }
-              --new_size;
-            }
-          }
-
-          return nullptr;
-        }
-
-        //! Returns the actual name of the next child node, if it exists
-        const char * getChildName() const
-        {
-          return child ? child->name() : nullptr;
-        }
-
-        rapidxml::xml_node<> * node;  //!< A pointer to this node
-        rapidxml::xml_node<> * child; //!< A pointer to its current child
-        size_t size;                  //!< The remaining number of children for this node
-        const char * name;            //!< The NVP name for next child node
-      }; // NodeInfo
-
-      //! @}
-
-    private:
-      std::vector<char> itsData;       //!< The raw data loaded
-      rapidxml::xml_document<> itsXML; //!< The XML document
-      std::stack<NodeInfo> itsNodes;   //!< A stack of nodes read from the document
-  };
-
-  // ######################################################################
-  // XMLArchive prologue and epilogue functions
-  // ######################################################################
-
-  // ######################################################################
-  //! Prologue for NVPs for XML output archives
-  /*! NVPs do not start or finish nodes - they just set up the names */
-  template <class T> inline
-  void prologue( XMLOutputArchive &, NameValuePair<T> const & )
-  { }
-
-  //! Prologue for NVPs for XML input archives
-  template <class T> inline
-  void prologue( XMLInputArchive &, NameValuePair<T> const & )
-  { }
-
-  // ######################################################################
-  //! Epilogue for NVPs for XML output archives
-  /*! NVPs do not start or finish nodes - they just set up the names */
-  template <class T> inline
-  void epilogue( XMLOutputArchive &, NameValuePair<T> const & )
-  { }
-
-  //! Epilogue for NVPs for XML input archives
-  template <class T> inline
-  void epilogue( XMLInputArchive &, NameValuePair<T> const & )
-  { }
-
-  // ######################################################################
-  //! Prologue for SizeTags for XML output archives
-  /*! SizeTags do not start or finish nodes */
-  template <class T> inline
-  void prologue( XMLOutputArchive & ar, SizeTag<T> const & )
-  {
-    ar.appendAttribute( "size", "dynamic" );
-  }
-
-  template <class T> inline
-  void prologue( XMLInputArchive &, SizeTag<T> const & )
-  { }
-
-  //! Epilogue for SizeTags for XML output archives
-  /*! SizeTags do not start or finish nodes */
-  template <class T> inline
-  void epilogue( XMLOutputArchive &, SizeTag<T> const & )
-  { }
-
-  template <class T> inline
-  void epilogue( XMLInputArchive &, SizeTag<T> const & )
-  { }
-
-  // ######################################################################
-  //! Prologue for all other types for XML output archives (except minimal types)
-  /*! Starts a new node, named either automatically or by some NVP,
-      that may be given data by the type about to be archived
-
-      Minimal types do not start or end nodes */
-  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, XMLOutputArchive>::value ||
-                                       traits::has_minimal_output_serialization<T, XMLOutputArchive>::value> = traits::sfinae> inline
-  void prologue( XMLOutputArchive & ar, T const & )
-  {
-    ar.startNode();
-    ar.insertType<T>();
-  }
-
-  //! Prologue for all other types for XML input archives (except minimal types)
-  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, XMLInputArchive>::value ||
-                                       traits::has_minimal_input_serialization<T, XMLInputArchive>::value> = traits::sfinae> inline
-  void prologue( XMLInputArchive & ar, T const & )
-  {
-    ar.startNode();
-  }
-
-  // ######################################################################
-  //! Epilogue for all other types other for XML output archives (except minimal types)
-  /*! Finishes the node created in the prologue
-
-      Minimal types do not start or end nodes */
-  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_output_serialization, XMLOutputArchive>::value ||
-                                       traits::has_minimal_output_serialization<T, XMLOutputArchive>::value> = traits::sfinae> inline
-  void epilogue( XMLOutputArchive & ar, T const & )
-  {
-    ar.finishNode();
-  }
-
-  //! Epilogue for all other types other for XML output archives (except minimal types)
-  template <class T, traits::DisableIf<traits::has_minimal_base_class_serialization<T, traits::has_minimal_input_serialization, XMLInputArchive>::value ||
-                                       traits::has_minimal_input_serialization<T, XMLInputArchive>::value> = traits::sfinae> inline
-  void epilogue( XMLInputArchive & ar, T const & )
-  {
-    ar.finishNode();
-  }
-
-  // ######################################################################
-  // Common XMLArchive serialization functions
-  // ######################################################################
-
-  //! Saving NVP types to XML
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME( XMLOutputArchive & ar, NameValuePair<T> const & t )
-  {
-    ar.setNextName( t.name );
-    ar( t.value );
-  }
-
-  //! Loading NVP types from XML
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME( XMLInputArchive & ar, NameValuePair<T> & t )
-  {
-    ar.setNextName( t.name );
-    ar( t.value );
-  }
-
-  // ######################################################################
-  //! Saving SizeTags to XML
-  template <class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME( XMLOutputArchive &, SizeTag<T> const & )
-  { }
-
-  //! Loading SizeTags from XML
-  template <class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME( XMLInputArchive & ar, SizeTag<T> & st )
-  {
-    ar.loadSize( st.size );
-  }
-
-  // ######################################################################
-  //! Saving for POD types to xml
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void CEREAL_SAVE_FUNCTION_NAME(XMLOutputArchive & ar, T const & t)
-  {
-    ar.saveValue( t );
-  }
-
-  //! Loading for POD types from xml
-  template <class T, traits::EnableIf<std::is_arithmetic<T>::value> = traits::sfinae> inline
-  void CEREAL_LOAD_FUNCTION_NAME(XMLInputArchive & ar, T & t)
-  {
-    ar.loadValue( t );
-  }
-
-  // ######################################################################
-  //! saving string to xml
-  template<class CharT, class Traits, class Alloc> inline
-  void CEREAL_SAVE_FUNCTION_NAME(XMLOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
-  {
-    ar.saveValue( str );
-  }
-
-  //! loading string from xml
-  template<class CharT, class Traits, class Alloc> inline
-  void CEREAL_LOAD_FUNCTION_NAME(XMLInputArchive & ar, std::basic_string<CharT, Traits, Alloc> & str)
-  {
-    ar.loadValue( str );
-  }
-} // namespace cereal
-
-// register archives for polymorphic support
-CEREAL_REGISTER_ARCHIVE(cereal::XMLOutputArchive)
-CEREAL_REGISTER_ARCHIVE(cereal::XMLInputArchive)
-
-// tie input and output archives together
-CEREAL_SETUP_ARCHIVE_TRAITS(cereal::XMLInputArchive, cereal::XMLOutputArchive)
-
-#endif // CEREAL_ARCHIVES_XML_HPP_
diff --git a/Src/External/cereal/include/cereal/cereal.hpp b/Src/External/cereal/include/cereal/cereal.hpp
deleted file mode 100644
index a777010..0000000
--- a/Src/External/cereal/include/cereal/cereal.hpp
+++ /dev/null
@@ -1,987 +0,0 @@
-/*! \file cereal.hpp
-    \brief Main cereal functionality */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_CEREAL_HPP_
-#define CEREAL_CEREAL_HPP_
-
-#include <type_traits>
-#include <string>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-
-#include "cereal/macros.hpp"
-#include "cereal/details/traits.hpp"
-#include "cereal/details/helpers.hpp"
-#include "cereal/types/base_class.hpp"
-
-namespace cereal
-{
-  // ######################################################################
-  //! Creates a name value pair
-  /*! @relates NameValuePair
-      @ingroup Utility */
-  template <class T> inline
-  NameValuePair<T> make_nvp( std::string const & name, T && value )
-  {
-    return {name.c_str(), std::forward<T>(value)};
-  }
-
-  //! Creates a name value pair
-  /*! @relates NameValuePair
-      @ingroup Utility */
-  template <class T> inline
-  NameValuePair<T> make_nvp( const char * name, T && value )
-  {
-    return {name, std::forward<T>(value)};
-  }
-
-  //! Creates a name value pair for the variable T with the same name as the variable
-  /*! @relates NameValuePair
-      @ingroup Utility */
-  #define CEREAL_NVP(T) ::cereal::make_nvp(#T, T)
-
-  // ######################################################################
-  //! Convenience function to create binary data for both const and non const pointers
-  /*! @param data Pointer to beginning of the data
-      @param size The size in bytes of the data
-      @relates BinaryData
-      @ingroup Utility */
-  template <class T> inline
-  BinaryData<T> binary_data( T && data, size_t size )
-  {
-    return {std::forward<T>(data), size};
-  }
-
-  // ######################################################################
-  //! Creates a size tag from some variable.
-  /*! Will normally be used to serialize size (e.g. size()) information for
-      variable size containers.  If you have a variable sized container,
-      the very first thing it serializes should be its size, wrapped in
-      a SizeTag.
-
-      @relates SizeTag
-      @ingroup Utility */
-  template <class T> inline
-  SizeTag<T> make_size_tag( T && sz )
-  {
-    return {std::forward<T>(sz)};
-  }
-
-  // ######################################################################
-  //! Called before a type is serialized to set up any special archive state
-  //! for processing some type
-  /*! If designing a serializer that needs to set up any kind of special
-      state or output extra information for a type, specialize this function
-      for the archive type and the types that require the extra information.
-      @ingroup Internal */
-  template <class Archive, class T> inline
-  void prologue( Archive & /* archive */, T const & /* data */)
-  { }
-
-  //! Called after a type is serialized to tear down any special archive state
-  //! for processing some type
-  /*! @ingroup Internal */
-  template <class Archive, class T> inline
-  void epilogue( Archive & /* archive */, T const & /* data */)
-  { }
-
-  // ######################################################################
-  //! Special flags for archives
-  /*! AllowEmptyClassElision
-        This allows for empty classes to be serialized even if they do not provide
-        a serialization function.  Classes with no data members are considered to be
-        empty.  Be warned that if this is enabled and you attempt to serialize an
-        empty class with improperly formed serialize or load/save functions, no
-        static error will occur - the error will propogate silently and your
-        intended serialization functions may not be called.  You can manually
-        ensure that your classes that have custom serialization are correct
-        by using the traits is_output_serializable and is_input_serializable
-        in cereal/details/traits.hpp.
-      @ingroup Internal */
-  enum Flags { AllowEmptyClassElision = 1 };
-
-  // ######################################################################
-  //! Registers a specific Archive type with cereal
-  /*! This registration should be done once per archive.  A good place to
-      put this is immediately following the definition of your archive.
-      Archive registration is only strictly necessary if you wish to
-      support pointers to polymorphic data types.  All archives that
-      come with cereal are already registered.
-      @ingroup Internal */
-  #define CEREAL_REGISTER_ARCHIVE(Archive)                              \
-  namespace cereal { namespace detail {                                 \
-  template <class T, class BindingTag>                                  \
-  typename polymorphic_serialization_support<Archive, T>::type          \
-  instantiate_polymorphic_binding( T*, Archive*, BindingTag, adl_tag ); \
-  } } /* end namespaces */
-
-  // ######################################################################
-  //! Defines a class version for some type
-  /*! Versioning information is optional and adds some small amount of
-      overhead to serialization.  This overhead will occur both in terms of
-      space in the archive (the version information for each class will be
-      stored exactly once) as well as runtime (versioned serialization functions
-      must check to see if they need to load or store version information).
-
-      Versioning is useful if you plan on fundamentally changing the way some
-      type is serialized in the future.  Versioned serialization functions
-      cannot be used to load non-versioned data.
-
-      By default, all types have an assumed version value of zero.  By
-      using this macro, you may change the version number associated with
-      some type.  cereal will then use this value as a second parameter
-      to your serialization functions.
-
-      The interface for the serialization functions is nearly identical
-      to non-versioned serialization with the addition of a second parameter,
-      const std::uint32_t version, which will be supplied with the correct
-      version number.  Serializing the version number on a save happens
-      automatically.
-
-      Versioning cannot be mixed with non-versioned serialization functions.
-      Having both types will result result in a compile time error.  Data
-      serialized without versioning cannot be loaded by a serialization
-      function with added versioning support.
-
-      Example interface for versioning on a non-member serialize function:
-
-      @code{cpp}
-      CEREAL_CLASS_VERSION( Mytype, 77 ); // register class version
-
-      template <class Archive>
-      void serialize( Archive & ar, Mytype & t, const std::uint32_t version )
-      {
-        // When performing a load, the version associated with the class
-        // is whatever it was when that data was originally serialized
-        //
-        // When we save, we'll use the version that is defined in the macro
-
-        if( version >= some_number )
-          // do this
-        else
-          // do that
-      }
-      @endcode
-
-      Interfaces for other forms of serialization functions is similar.  This
-      macro should be placed at global scope.
-      @ingroup Utility */
-  #define CEREAL_CLASS_VERSION(TYPE, VERSION_NUMBER)                             \
-  namespace cereal { namespace detail {                                          \
-    template <> struct Version<TYPE>                                             \
-    {                                                                            \
-      static const std::uint32_t version;                                        \
-      static std::uint32_t registerVersion()                                     \
-      {                                                                          \
-        ::cereal::detail::StaticObject<Versions>::getInstance().mapping.emplace( \
-             std::type_index(typeid(TYPE)).hash_code(), VERSION_NUMBER );        \
-        return VERSION_NUMBER;                                                   \
-      }                                                                          \
-      static void unused() { (void)version; }                                    \
-    }; /* end Version */                                                         \
-    const std::uint32_t Version<TYPE>::version =                                 \
-      Version<TYPE>::registerVersion();                                          \
-  } } // end namespaces
-
-  // ######################################################################
-  //! The base output archive class
-  /*! This is the base output archive for all output archives.  If you create
-      a custom archive class, it should derive from this, passing itself as
-      a template parameter for the ArchiveType.
-
-      The base class provides all of the functionality necessary to
-      properly forward data to the correct serialization functions.
-
-      Individual archives should use a combination of prologue and
-      epilogue functions together with specializations of serialize, save,
-      and load to alter the functionality of their serialization.
-
-      @tparam ArchiveType The archive type that derives from OutputArchive
-      @tparam Flags Flags to control advanced functionality.  See the Flags
-                    enum for more information.
-      @ingroup Internal */
-  template<class ArchiveType, std::uint32_t Flags = 0>
-  class OutputArchive : public detail::OutputArchiveBase
-  {
-    public:
-      //! Construct the output archive
-      /*! @param derived A pointer to the derived ArchiveType (pass this from the derived archive) */
-      OutputArchive(ArchiveType * const derived) : self(derived), itsCurrentPointerId(1), itsCurrentPolymorphicTypeId(1)
-      { }
-
-      OutputArchive & operator=( OutputArchive const & ) = delete;
-
-      //! Serializes all passed in data
-      /*! This is the primary interface for serializing data with an archive */
-      template <class ... Types> inline
-      ArchiveType & operator()( Types && ... args )
-      {
-        self->process( std::forward<Types>( args )... );
-        return *self;
-      }
-
-      /*! @name Boost Transition Layer
-          Functionality that mirrors the syntax for Boost.  This is useful if you are transitioning
-          a large project from Boost to cereal.  The preferred interface for cereal is using operator(). */
-      //! @{
-
-      //! Indicates this archive is not intended for loading
-      /*! This ensures compatibility with boost archive types.  If you are transitioning
-          from boost, you can check this value within a member or external serialize function
-          (i.e., Archive::is_loading::value) to disable behavior specific to loading, until 
-          you can transition to split save/load or save_minimal/load_minimal functions */
-      using is_loading = std::false_type;
-
-      //! Indicates this archive is intended for saving
-      /*! This ensures compatibility with boost archive types.  If you are transitioning
-          from boost, you can check this value within a member or external serialize function
-          (i.e., Archive::is_saving::value) to enable behavior specific to loading, until 
-          you can transition to split save/load or save_minimal/load_minimal functions */
-      using is_saving = std::true_type;
-
-      //! Serializes passed in data
-      /*! This is a boost compatability layer and is not the preferred way of using
-          cereal.  If you are transitioning from boost, use this until you can
-          transition to the operator() overload */
-      template <class T> inline
-      ArchiveType & operator&( T && arg )
-      {
-        self->process( std::forward<T>( arg ) );
-        return *self;
-      }
-
-      //! Serializes passed in data
-      /*! This is a boost compatability layer and is not the preferred way of using
-          cereal.  If you are transitioning from boost, use this until you can
-          transition to the operator() overload */
-      template <class T> inline
-      ArchiveType & operator<<( T && arg )
-      {
-        self->process( std::forward<T>( arg ) );
-        return *self;
-      }
-
-      //! @}
-
-      //! Registers a shared pointer with the archive
-      /*! This function is used to track shared pointer targets to prevent
-          unnecessary saves from taking place if multiple shared pointers
-          point to the same data.
-
-          @internal
-          @param addr The address (see shared_ptr get()) pointed to by the shared pointer
-          @return A key that uniquely identifies the pointer */
-      inline std::uint32_t registerSharedPointer( void const * addr )
-      {
-        // Handle null pointers by just returning 0
-        if(addr == 0) return 0;
-
-        auto id = itsSharedPointerMap.find( addr );
-        if( id == itsSharedPointerMap.end() )
-        {
-          auto ptrId = itsCurrentPointerId++;
-          itsSharedPointerMap.insert( {addr, ptrId} );
-          return ptrId | detail::msb_32bit; // mask MSB to be 1
-        }
-        else
-          return id->second;
-      }
-
-      //! Registers a polymorphic type name with the archive
-      /*! This function is used to track polymorphic types to prevent
-          unnecessary saves of identifying strings used by the polymorphic
-          support functionality.
-
-          @internal
-          @param name The name to associate with a polymorphic type
-          @return A key that uniquely identifies the polymorphic type name */
-      inline std::uint32_t registerPolymorphicType( char const * name )
-      {
-        auto id = itsPolymorphicTypeMap.find( name );
-        if( id == itsPolymorphicTypeMap.end() )
-        {
-          auto polyId = itsCurrentPolymorphicTypeId++;
-          itsPolymorphicTypeMap.insert( {name, polyId} );
-          return polyId | detail::msb_32bit; // mask MSB to be 1
-        }
-        else
-          return id->second;
-      }
-
-    private:
-      //! Serializes data after calling prologue, then calls epilogue
-      template <class T> inline
-      void process( T && head )
-      {
-        prologue( *self, head );
-        self->processImpl( head );
-        epilogue( *self, head );
-      }
-
-      //! Unwinds to process all data
-      template <class T, class ... Other> inline
-      void process( T && head, Other && ... tail )
-      {
-        self->process( std::forward<T>( head ) );
-        self->process( std::forward<Other>( tail )... );
-      }
-
-      //! Serialization of a virtual_base_class wrapper
-      /*! \sa virtual_base_class */
-      template <class T> inline
-      ArchiveType & processImpl(virtual_base_class<T> const & b)
-      {
-        traits::detail::base_class_id id(b.base_ptr);
-        if(itsBaseClassSet.count(id) == 0)
-        {
-          itsBaseClassSet.insert(id);
-          self->processImpl( *b.base_ptr );
-        }
-        return *self;
-      }
-
-      //! Serialization of a base_class wrapper
-      /*! \sa base_class */
-      template <class T> inline
-      ArchiveType & processImpl(base_class<T> const & b)
-      {
-        self->processImpl( *b.base_ptr );
-        return *self;
-      }
-
-      //! Helper macro that expands the requirements for activating an overload
-      /*! Requirements:
-            Has the requested serialization function
-            Does not have version and unversioned at the same time
-            Is output serializable AND
-              is specialized for this type of function OR
-              has no specialization at all */
-      #define PROCESS_IF(name)                                                             \
-      traits::EnableIf<traits::has_##name<T, ArchiveType>::value,                          \
-                       !traits::has_invalid_output_versioning<T, ArchiveType>::value,      \
-                       (traits::is_output_serializable<T, ArchiveType>::value &&           \
-                        (traits::is_specialized_##name<T, ArchiveType>::value ||           \
-                         !traits::is_specialized<T, ArchiveType>::value))> = traits::sfinae
-
-      //! Member serialization
-      template <class T, PROCESS_IF(member_serialize)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        access::member_serialize(*self, const_cast<T &>(t));
-        return *self;
-      }
-
-      //! Non member serialization
-      template <class T, PROCESS_IF(non_member_serialize)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        CEREAL_SERIALIZE_FUNCTION_NAME(*self, const_cast<T &>(t));
-        return *self;
-      }
-
-      //! Member split (save)
-      template <class T, PROCESS_IF(member_save)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        access::member_save(*self, t);
-        return *self;
-      }
-
-      //! Non member split (save)
-      template <class T, PROCESS_IF(non_member_save)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        CEREAL_SAVE_FUNCTION_NAME(*self, t);
-        return *self;
-      }
-
-      //! Member split (save_minimal)
-      template <class T, PROCESS_IF(member_save_minimal)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        self->process( access::member_save_minimal(*self, t) );
-        return *self;
-      }
-
-      //! Non member split (save_minimal)
-      template <class T, PROCESS_IF(non_member_save_minimal)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        self->process( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(*self, t) );
-        return *self;
-      }
-
-      //! Empty class specialization
-      template <class T, traits::EnableIf<(Flags & AllowEmptyClassElision),
-                                          !traits::is_output_serializable<T, ArchiveType>::value,
-                                          std::is_empty<T>::value> = traits::sfinae> inline
-      ArchiveType & processImpl(T const &)
-      {
-        return *self;
-      }
-
-      //! No matching serialization
-      /*! Invalid if we have invalid output versioning or
-          we are not output serializable, and either
-          don't allow empty class ellision or allow it but are not serializing an empty class */
-      template <class T, traits::EnableIf<traits::has_invalid_output_versioning<T, ArchiveType>::value ||
-                                          (!traits::is_output_serializable<T, ArchiveType>::value &&
-                                           (!(Flags & AllowEmptyClassElision) || ((Flags & AllowEmptyClassElision) && !std::is_empty<T>::value)))> = traits::sfinae> inline
-      ArchiveType & processImpl(T const &)
-      {
-        static_assert(traits::detail::count_output_serializers<T, ArchiveType>::value != 0,
-            "cereal could not find any output serialization functions for the provided type and archive combination. \n\n "
-            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
-            "Serialize functions generally have the following signature: \n\n "
-            "template<class Archive> \n "
-            "  void serialize(Archive & ar) \n "
-            "  { \n "
-            "    ar( member1, member2, member3 ); \n "
-            "  } \n\n " );
-
-        static_assert(traits::detail::count_output_serializers<T, ArchiveType>::value < 2,
-            "cereal found more than one compatible output serialization function for the provided type and archive combination. \n\n "
-            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
-            "Use specialization (see access.hpp) if you need to disambiguate between serialize vs load/save functions.  \n "
-            "Note that serialization functions can be inherited which may lead to the aforementioned ambiguities. \n "
-            "In addition, you may not mix versioned with non-versioned serialization functions. \n\n ");
-
-        return *self;
-      }
-
-      //! Registers a class version with the archive and serializes it if necessary
-      /*! If this is the first time this class has been serialized, we will record its
-          version number and serialize that.
-
-          @tparam T The type of the class being serialized
-          @param version The version number associated with it */
-      template <class T> inline
-      std::uint32_t registerClassVersion()
-      {
-        static const auto hash = std::type_index(typeid(T)).hash_code();
-        const auto insertResult = itsVersionedTypes.insert( hash );
-        const auto lock = detail::StaticObject<detail::Versions>::lock();
-        const auto version =
-          detail::StaticObject<detail::Versions>::getInstance().find( hash, detail::Version<T>::version );
-
-        if( insertResult.second ) // insertion took place, serialize the version number
-          process( make_nvp<ArchiveType>("cereal_class_version", version) );
-
-        return version;
-      }
-
-      //! Member serialization
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(member_versioned_serialize)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        access::member_serialize(*self, const_cast<T &>(t), registerClassVersion<T>());
-        return *self;
-      }
-
-      //! Non member serialization
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(non_member_versioned_serialize)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        CEREAL_SERIALIZE_FUNCTION_NAME(*self, const_cast<T &>(t), registerClassVersion<T>());
-        return *self;
-      }
-
-      //! Member split (save)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(member_versioned_save)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        access::member_save(*self, t, registerClassVersion<T>());
-        return *self;
-      }
-
-      //! Non member split (save)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(non_member_versioned_save)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        CEREAL_SAVE_FUNCTION_NAME(*self, t, registerClassVersion<T>());
-        return *self;
-      }
-
-      //! Member split (save_minimal)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(member_versioned_save_minimal)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        self->process( access::member_save_minimal(*self, t, registerClassVersion<T>()) );
-        return *self;
-      }
-
-      //! Non member split (save_minimal)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(non_member_versioned_save_minimal)> inline
-      ArchiveType & processImpl(T const & t)
-      {
-        self->process( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(*self, t, registerClassVersion<T>()) );
-        return *self;
-      }
-
-    #undef PROCESS_IF
-
-    private:
-      ArchiveType * const self;
-
-      //! A set of all base classes that have been serialized
-      std::unordered_set<traits::detail::base_class_id, traits::detail::base_class_id_hash> itsBaseClassSet;
-
-      //! Maps from addresses to pointer ids
-      std::unordered_map<void const *, std::uint32_t> itsSharedPointerMap;
-
-      //! The id to be given to the next pointer
-      std::uint32_t itsCurrentPointerId;
-
-      //! Maps from polymorphic type name strings to ids
-      std::unordered_map<char const *, std::uint32_t> itsPolymorphicTypeMap;
-
-      //! The id to be given to the next polymorphic type name
-      std::uint32_t itsCurrentPolymorphicTypeId;
-
-      //! Keeps track of classes that have versioning information associated with them
-      std::unordered_set<size_type> itsVersionedTypes;
-  }; // class OutputArchive
-
-  // ######################################################################
-  //! The base input archive class
-  /*! This is the base input archive for all input archives.  If you create
-      a custom archive class, it should derive from this, passing itself as
-      a template parameter for the ArchiveType.
-
-      The base class provides all of the functionality necessary to
-      properly forward data to the correct serialization functions.
-
-      Individual archives should use a combination of prologue and
-      epilogue functions together with specializations of serialize, save,
-      and load to alter the functionality of their serialization.
-
-      @tparam ArchiveType The archive type that derives from InputArchive
-      @tparam Flags Flags to control advanced functionality.  See the Flags
-                    enum for more information.
-      @ingroup Internal */
-  template<class ArchiveType, std::uint32_t Flags = 0>
-  class InputArchive : public detail::InputArchiveBase
-  {
-    public:
-      //! Construct the output archive
-      /*! @param derived A pointer to the derived ArchiveType (pass this from the derived archive) */
-      InputArchive(ArchiveType * const derived) :
-        self(derived),
-        itsBaseClassSet(),
-        itsSharedPointerMap(),
-        itsPolymorphicTypeMap(),
-        itsVersionedTypes()
-      { }
-
-      InputArchive & operator=( InputArchive const & ) = delete;
-
-      //! Serializes all passed in data
-      /*! This is the primary interface for serializing data with an archive */
-      template <class ... Types> inline
-      ArchiveType & operator()( Types && ... args )
-      {
-        process( std::forward<Types>( args )... );
-        return *self;
-      }
-
-      /*! @name Boost Transition Layer
-          Functionality that mirrors the syntax for Boost.  This is useful if you are transitioning
-          a large project from Boost to cereal.  The preferred interface for cereal is using operator(). */
-      //! @{
-
-      //! Indicates this archive is intended for loading
-      /*! This ensures compatibility with boost archive types.  If you are transitioning
-          from boost, you can check this value within a member or external serialize function
-          (i.e., Archive::is_loading::value) to enable behavior specific to loading, until 
-          you can transition to split save/load or save_minimal/load_minimal functions */
-      using is_loading = std::true_type;
-
-      //! Indicates this archive is not intended for saving
-      /*! This ensures compatibility with boost archive types.  If you are transitioning
-          from boost, you can check this value within a member or external serialize function
-          (i.e., Archive::is_saving::value) to disable behavior specific to loading, until 
-          you can transition to split save/load or save_minimal/load_minimal functions */
-      using is_saving = std::false_type;
-
-      //! Serializes passed in data
-      /*! This is a boost compatability layer and is not the preferred way of using
-          cereal.  If you are transitioning from boost, use this until you can
-          transition to the operator() overload */
-      template <class T> inline
-      ArchiveType & operator&( T && arg )
-      {
-        self->process( std::forward<T>( arg ) );
-        return *self;
-      }
-
-      //! Serializes passed in data
-      /*! This is a boost compatability layer and is not the preferred way of using
-          cereal.  If you are transitioning from boost, use this until you can
-          transition to the operator() overload */
-      template <class T> inline
-      ArchiveType & operator>>( T && arg )
-      {
-        self->process( std::forward<T>( arg ) );
-        return *self;
-      }
-
-      //! @}
-
-      //! Retrieves a shared pointer given a unique key for it
-      /*! This is used to retrieve a previously registered shared_ptr
-          which has already been loaded.
-
-          @param id The unique id that was serialized for the pointer
-          @return A shared pointer to the data
-          @throw Exception if the id does not exist */
-      inline std::shared_ptr<void> getSharedPointer(std::uint32_t const id)
-      {
-        if(id == 0) return std::shared_ptr<void>(nullptr);
-
-        auto iter = itsSharedPointerMap.find( id );
-        if(iter == itsSharedPointerMap.end())
-          throw Exception("Error while trying to deserialize a smart pointer. Could not find id " + std::to_string(id));
-
-        return iter->second;
-      }
-
-      //! Registers a shared pointer to its unique identifier
-      /*! After a shared pointer has been allocated for the first time, it should
-          be registered with its loaded id for future references to it.
-
-          @param id The unique identifier for the shared pointer
-          @param ptr The actual shared pointer */
-      inline void registerSharedPointer(std::uint32_t const id, std::shared_ptr<void> ptr)
-      {
-        std::uint32_t const stripped_id = id & ~detail::msb_32bit;
-        itsSharedPointerMap[stripped_id] = ptr;
-      }
-
-      //! Retrieves the string for a polymorphic type given a unique key for it
-      /*! This is used to retrieve a string previously registered during
-          a polymorphic load.
-
-          @param id The unique id that was serialized for the polymorphic type
-          @return The string identifier for the tyep */
-      inline std::string getPolymorphicName(std::uint32_t const id)
-      {
-        auto name = itsPolymorphicTypeMap.find( id );
-        if(name == itsPolymorphicTypeMap.end())
-        {
-          throw Exception("Error while trying to deserialize a polymorphic pointer. Could not find type id " + std::to_string(id));
-        }
-        return name->second;
-      }
-
-      //! Registers a polymorphic name string to its unique identifier
-      /*! After a polymorphic type has been loaded for the first time, it should
-          be registered with its loaded id for future references to it.
-
-          @param id The unique identifier for the polymorphic type
-          @param name The name associated with the tyep */
-      inline void registerPolymorphicName(std::uint32_t const id, std::string const & name)
-      {
-        std::uint32_t const stripped_id = id & ~detail::msb_32bit;
-        itsPolymorphicTypeMap.insert( {stripped_id, name} );
-      }
-
-    private:
-      //! Serializes data after calling prologue, then calls epilogue
-      template <class T> inline
-      void process( T && head )
-      {
-        prologue( *self, head );
-        self->processImpl( head );
-        epilogue( *self, head );
-      }
-
-      //! Unwinds to process all data
-      template <class T, class ... Other> inline
-      void process( T && head, Other && ... tail )
-      {
-        process( std::forward<T>( head ) );
-        process( std::forward<Other>( tail )... );
-      }
-
-      //! Serialization of a virtual_base_class wrapper
-      /*! \sa virtual_base_class */
-      template <class T> inline
-      ArchiveType & processImpl(virtual_base_class<T> & b)
-      {
-        traits::detail::base_class_id id(b.base_ptr);
-        if(itsBaseClassSet.count(id) == 0)
-        {
-          itsBaseClassSet.insert(id);
-          self->processImpl( *b.base_ptr );
-        }
-        return *self;
-      }
-
-      //! Serialization of a base_class wrapper
-      /*! \sa base_class */
-      template <class T> inline
-      ArchiveType & processImpl(base_class<T> & b)
-      {
-        self->processImpl( *b.base_ptr );
-        return *self;
-      }
-
-      //! Helper macro that expands the requirements for activating an overload
-      /*! Requirements:
-            Has the requested serialization function
-            Does not have version and unversioned at the same time
-            Is input serializable AND
-              is specialized for this type of function OR
-              has no specialization at all */
-      #define PROCESS_IF(name)                                                              \
-      traits::EnableIf<traits::has_##name<T, ArchiveType>::value,                           \
-                       !traits::has_invalid_input_versioning<T, ArchiveType>::value,        \
-                       (traits::is_input_serializable<T, ArchiveType>::value &&             \
-                        (traits::is_specialized_##name<T, ArchiveType>::value ||            \
-                         !traits::is_specialized<T, ArchiveType>::value))> = traits::sfinae
-
-      //! Member serialization
-      template <class T, PROCESS_IF(member_serialize)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        access::member_serialize(*self, t);
-        return *self;
-      }
-
-      //! Non member serialization
-      template <class T, PROCESS_IF(non_member_serialize)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        CEREAL_SERIALIZE_FUNCTION_NAME(*self, t);
-        return *self;
-      }
-
-      //! Member split (load)
-      template <class T, PROCESS_IF(member_load)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        access::member_load(*self, t);
-        return *self;
-      }
-
-      //! Non member split (load)
-      template <class T, PROCESS_IF(non_member_load)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        CEREAL_LOAD_FUNCTION_NAME(*self, t);
-        return *self;
-      }
-
-      //! Member split (load_minimal)
-      template <class T, PROCESS_IF(member_load_minimal)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
-        typename traits::has_member_save_minimal<T, OutArchiveType>::type value;
-        self->process( value );
-        access::member_load_minimal(*self, t, value);
-        return *self;
-      }
-
-      //! Non member split (load_minimal)
-      template <class T, PROCESS_IF(non_member_load_minimal)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
-        typename traits::has_non_member_save_minimal<T, OutArchiveType>::type value;
-        self->process( value );
-        CEREAL_LOAD_MINIMAL_FUNCTION_NAME(*self, t, value);
-        return *self;
-      }
-
-      //! Empty class specialization
-      template <class T, traits::EnableIf<(Flags & AllowEmptyClassElision),
-                                          !traits::is_input_serializable<T, ArchiveType>::value,
-                                          std::is_empty<T>::value> = traits::sfinae> inline
-      ArchiveType & processImpl(T const &)
-      {
-        return *self;
-      }
-
-      //! No matching serialization
-      /*! Invalid if we have invalid input versioning or
-          we are not input serializable, and either
-          don't allow empty class ellision or allow it but are not serializing an empty class */
-      template <class T, traits::EnableIf<traits::has_invalid_input_versioning<T, ArchiveType>::value ||
-                                          (!traits::is_input_serializable<T, ArchiveType>::value &&
-                                           (!(Flags & AllowEmptyClassElision) || ((Flags & AllowEmptyClassElision) && !std::is_empty<T>::value)))> = traits::sfinae> inline
-      ArchiveType & processImpl(T const &)
-      {
-        static_assert(traits::detail::count_input_serializers<T, ArchiveType>::value != 0,
-            "cereal could not find any input serialization functions for the provided type and archive combination. \n\n "
-            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
-            "Serialize functions generally have the following signature: \n\n "
-            "template<class Archive> \n "
-            "  void serialize(Archive & ar) \n "
-            "  { \n "
-            "    ar( member1, member2, member3 ); \n "
-            "  } \n\n " );
-
-        static_assert(traits::detail::count_input_serializers<T, ArchiveType>::value < 2,
-            "cereal found more than one compatible input serialization function for the provided type and archive combination. \n\n "
-            "Types must either have a serialize function, load/save pair, or load_minimal/save_minimal pair (you may not mix these). \n "
-            "Use specialization (see access.hpp) if you need to disambiguate between serialize vs load/save functions.  \n "
-            "Note that serialization functions can be inherited which may lead to the aforementioned ambiguities. \n "
-            "In addition, you may not mix versioned with non-versioned serialization functions. \n\n ");
-
-        return *self;
-      }
-
-      //! Befriend for versioning in load_and_construct
-      template <class A, class B, bool C, bool D, bool E, bool F> friend struct detail::Construct;
-
-      //! Registers a class version with the archive and serializes it if necessary
-      /*! If this is the first time this class has been serialized, we will record its
-          version number and serialize that.
-
-          @tparam T The type of the class being serialized
-          @param version The version number associated with it */
-      template <class T> inline
-      std::uint32_t loadClassVersion()
-      {
-        static const auto hash = std::type_index(typeid(T)).hash_code();
-        auto lookupResult = itsVersionedTypes.find( hash );
-
-        if( lookupResult != itsVersionedTypes.end() ) // already exists
-          return lookupResult->second;
-        else // need to load
-        {
-          std::uint32_t version;
-
-          process( make_nvp<ArchiveType>("cereal_class_version", version) );
-          itsVersionedTypes.emplace_hint( lookupResult, hash, version );
-
-          return version;
-        }
-      }
-
-      //! Member serialization
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(member_versioned_serialize)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        const auto version = loadClassVersion<T>();
-        access::member_serialize(*self, t, version);
-        return *self;
-      }
-
-      //! Non member serialization
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(non_member_versioned_serialize)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        const auto version = loadClassVersion<T>();
-        CEREAL_SERIALIZE_FUNCTION_NAME(*self, t, version);
-        return *self;
-      }
-
-      //! Member split (load)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(member_versioned_load)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        const auto version = loadClassVersion<T>();
-        access::member_load(*self, t, version);
-        return *self;
-      }
-
-      //! Non member split (load)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(non_member_versioned_load)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        const auto version = loadClassVersion<T>();
-        CEREAL_LOAD_FUNCTION_NAME(*self, t, version);
-        return *self;
-      }
-
-      //! Member split (load_minimal)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(member_versioned_load_minimal)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
-        const auto version = loadClassVersion<T>();
-        typename traits::has_member_versioned_save_minimal<T, OutArchiveType>::type value;
-        self->process(value);
-        access::member_load_minimal(*self, t, value, version);
-        return *self;
-      }
-
-      //! Non member split (load_minimal)
-      /*! Versioning implementation */
-      template <class T, PROCESS_IF(non_member_versioned_load_minimal)> inline
-      ArchiveType & processImpl(T & t)
-      {
-        using OutArchiveType = typename traits::detail::get_output_from_input<ArchiveType>::type;
-        const auto version = loadClassVersion<T>();
-        typename traits::has_non_member_versioned_save_minimal<T, OutArchiveType>::type value;
-        self->process(value);
-        CEREAL_LOAD_MINIMAL_FUNCTION_NAME(*self, t, value, version);
-        return *self;
-      }
-
-      #undef PROCESS_IF
-
-    private:
-      ArchiveType * const self;
-
-      //! A set of all base classes that have been serialized
-      std::unordered_set<traits::detail::base_class_id, traits::detail::base_class_id_hash> itsBaseClassSet;
-
-      //! Maps from pointer ids to metadata
-      std::unordered_map<std::uint32_t, std::shared_ptr<void>> itsSharedPointerMap;
-
-      //! Maps from name ids to names
-      std::unordered_map<std::uint32_t, std::string> itsPolymorphicTypeMap;
-
-      //! Maps from type hash codes to version numbers
-      std::unordered_map<std::size_t, std::uint32_t> itsVersionedTypes;
-  }; // class InputArchive
-} // namespace cereal
-
-// This include needs to come after things such as binary_data, make_nvp, etc
-#include "cereal/types/common.hpp"
-
-#endif // CEREAL_CEREAL_HPP_
diff --git a/Src/External/cereal/include/cereal/details/helpers.hpp b/Src/External/cereal/include/cereal/details/helpers.hpp
deleted file mode 100644
index 9092688..0000000
--- a/Src/External/cereal/include/cereal/details/helpers.hpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/*! \file helpers.hpp
-    \brief Internal helper functionality
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_DETAILS_HELPERS_HPP_
-#define CEREAL_DETAILS_HELPERS_HPP_
-
-#include <type_traits>
-#include <cstdint>
-#include <utility>
-#include <memory>
-#include <unordered_map>
-#include <stdexcept>
-
-#include "cereal/macros.hpp"
-#include "cereal/details/static_object.hpp"
-
-namespace cereal
-{
-  // ######################################################################
-  //! An exception class thrown when things go wrong at runtime
-  /*! @ingroup Utility */
-  struct Exception : public std::runtime_error
-  {
-    explicit Exception( const std::string & what_ ) : std::runtime_error(what_) {}
-    explicit Exception( const char * what_ ) : std::runtime_error(what_) {}
-  };
-
-  // ######################################################################
-  //! The size type used by cereal
-  /*! To ensure compatability between 32, 64, etc bit machines, we need to use
-      a fixed size type instead of size_t, which may vary from machine to
-      machine.
-
-      The default value for CEREAL_SIZE_TYPE is specified in cereal/macros.hpp */
-  using size_type = CEREAL_SIZE_TYPE;
-
-  // forward decls
-  class BinaryOutputArchive;
-  class BinaryInputArchive;
-
-  // ######################################################################
-  namespace detail
-  {
-    struct NameValuePairCore {}; //!< Traits struct for NVPs
-  }
-
-  //! For holding name value pairs
-  /*! This pairs a name (some string) with some value such that an archive
-      can potentially take advantage of the pairing.
-
-      In serialization functions, NameValuePairs are usually created like so:
-      @code{.cpp}
-      struct MyStruct
-      {
-        int a, b, c, d, e;
-
-        template<class Archive>
-        void serialize(Archive & archive)
-        {
-          archive( CEREAL_NVP(a),
-                   CEREAL_NVP(b),
-                   CEREAL_NVP(c),
-                   CEREAL_NVP(d),
-                   CEREAL_NVP(e) );
-        }
-      };
-      @endcode
-
-      Alternatively, you can give you data members custom names like so:
-      @code{.cpp}
-      struct MyStruct
-      {
-        int a, b, my_embarrassing_variable_name, d, e;
-
-        template<class Archive>
-        void serialize(Archive & archive)
-        {
-          archive( CEREAL_NVP(a),
-                   CEREAL_NVP(b),
-                   cereal::make_nvp("var", my_embarrassing_variable_name) );
-                   CEREAL_NVP(d),
-                   CEREAL_NVP(e) );
-        }
-      };
-      @endcode
-
-      There is a slight amount of overhead to creating NameValuePairs, so there
-      is a third method which will elide the names when they are not used by
-      the Archive:
-
-      @code{.cpp}
-      struct MyStruct
-      {
-        int a, b;
-
-        template<class Archive>
-        void serialize(Archive & archive)
-        {
-          archive( cereal::make_nvp<Archive>(a),
-                   cereal::make_nvp<Archive>(b) );
-        }
-      };
-      @endcode
-
-      This third method is generally only used when providing generic type
-      support.  Users writing their own serialize functions will normally
-      explicitly control whether they want to use NVPs or not.
-
-      @internal */
-  template <class T>
-  class NameValuePair : detail::NameValuePairCore
-  {
-    private:
-      // If we get passed an array, keep the type as is, otherwise store
-      // a reference if we were passed an l value reference, else copy the value
-      using Type = typename std::conditional<std::is_array<typename std::remove_reference<T>::type>::value,
-                                             typename std::remove_cv<T>::type,
-                                             typename std::conditional<std::is_lvalue_reference<T>::value,
-                                                                       T,
-                                                                       typename std::decay<T>::type>::type>::type;
-
-      // prevent nested nvps
-      static_assert( !std::is_base_of<detail::NameValuePairCore, T>::value,
-                     "Cannot pair a name to a NameValuePair" );
-
-      NameValuePair & operator=( NameValuePair const & ) = delete;
-
-    public:
-      //! Constructs a new NameValuePair
-      /*! @param n The name of the pair
-          @param v The value to pair.  Ideally this should be an l-value reference so that
-                   the value can be both loaded and saved to.  If you pass an r-value reference,
-                   the NameValuePair will store a copy of it instead of a reference.  Thus you should
-                   only pass r-values in cases where this makes sense, such as the result of some
-                   size() call.
-          @internal */
-      NameValuePair( char const * n, T && v ) : name(n), value(std::forward<T>(v)) {}
-
-      char const * name;
-      Type value;
-  };
-
-  //! A specialization of make_nvp<> that simply forwards the value for binary archives
-  /*! @relates NameValuePair
-      @internal */
-  template<class Archive, class T> inline
-  typename
-  std::enable_if<std::is_same<Archive, ::cereal::BinaryInputArchive>::value ||
-                 std::is_same<Archive, ::cereal::BinaryOutputArchive>::value,
-  T && >::type
-  make_nvp( const char *, T && value )
-  {
-    return std::forward<T>(value);
-  }
-
-  //! A specialization of make_nvp<> that actually creates an nvp for non-binary archives
-  /*! @relates NameValuePair
-      @internal */
-  template<class Archive, class T> inline
-  typename
-  std::enable_if<!std::is_same<Archive, ::cereal::BinaryInputArchive>::value &&
-                 !std::is_same<Archive, ::cereal::BinaryOutputArchive>::value,
-  NameValuePair<T> >::type
-  make_nvp( const char * name, T && value)
-  {
-    return {name, std::forward<T>(value)};
-  }
-
-  //! Convenience for creating a templated NVP
-  /*! For use in internal generic typing functions which have an
-      Archive type declared
-      @internal */
-  #define CEREAL_NVP_(name, value) ::cereal::make_nvp<Archive>(name, value)
-
-  // ######################################################################
-  //! A wrapper around data that can be serialized in a binary fashion
-  /*! This class is used to demarcate data that can safely be serialized
-      as a binary chunk of data.  Individual archives can then choose how
-      best represent this during serialization.
-
-      @internal */
-  template <class T>
-  struct BinaryData
-  {
-    //! Internally store the pointer as a void *, keeping const if created with
-    //! a const pointer
-    using PT = typename std::conditional<std::is_const<typename std::remove_pointer<T>::type>::value,
-                                         const void *,
-                                         void *>::type;
-
-    BinaryData( T && d, uint64_t s ) : data(std::forward<T>(d)), size(s) {}
-
-    PT data;       //!< pointer to beginning of data
-    uint64_t size; //!< size in bytes
-  };
-
-  // ######################################################################
-  namespace detail
-  {
-    // base classes for type checking
-    /* The rtti virtual function only exists to enable an archive to
-       be used in a polymorphic fashion, if necessary.  See the
-       archive adapters for an example of this */
-    class OutputArchiveBase
-    {
-      public:
-        OutputArchiveBase() = default;
-        OutputArchiveBase( OutputArchiveBase && ) CEREAL_NOEXCEPT {}
-        OutputArchiveBase & operator=( OutputArchiveBase && ) CEREAL_NOEXCEPT { return *this; }
-        virtual ~OutputArchiveBase() CEREAL_NOEXCEPT = default;
-
-      private:
-        virtual void rtti() {}
-    };
-
-    class InputArchiveBase
-    {
-      public:
-        InputArchiveBase() = default;
-        InputArchiveBase( InputArchiveBase && ) CEREAL_NOEXCEPT {}
-        InputArchiveBase & operator=( InputArchiveBase && ) CEREAL_NOEXCEPT { return *this; }
-        virtual ~InputArchiveBase() CEREAL_NOEXCEPT = default;
-
-      private:
-        virtual void rtti() {}
-    };
-
-    // forward decls for polymorphic support
-    template <class Archive, class T> struct polymorphic_serialization_support;
-    struct adl_tag;
-
-    // used during saving pointers
-    static const int32_t msb_32bit  = 0x80000000;
-    static const int32_t msb2_32bit = 0x40000000;
-  }
-
-  // ######################################################################
-  //! A wrapper around size metadata
-  /*! This class provides a way for archives to have more flexibility over how
-      they choose to serialize size metadata for containers.  For some archive
-      types, the size may be implicitly encoded in the output (e.g. JSON) and
-      not need an explicit entry.  Specializing serialize or load/save for
-      your archive and SizeTags allows you to choose what happens.
-
-      @internal */
-  template <class T>
-  class SizeTag
-  {
-    private:
-      // Store a reference if passed an lvalue reference, otherwise
-      // make a copy of the data
-      using Type = typename std::conditional<std::is_lvalue_reference<T>::value,
-                                             T,
-                                             typename std::decay<T>::type>::type;
-
-      SizeTag & operator=( SizeTag const & ) = delete;
-
-    public:
-      SizeTag( T && sz ) : size(std::forward<T>(sz)) {}
-
-      Type size;
-  };
-
-  // ######################################################################
-  //! A wrapper around a key and value for serializing data into maps.
-  /*! This class just provides a grouping of keys and values into a struct for
-      human readable archives. For example, XML archives will use this wrapper
-      to write maps like so:
-
-      @code{.xml}
-      <mymap>
-        <item0>
-          <key>MyFirstKey</key>
-          <value>MyFirstValue</value>
-        </item0>
-        <item1>
-          <key>MySecondKey</key>
-          <value>MySecondValue</value>
-        </item1>
-      </mymap>
-      @endcode
-
-      \sa make_map_item
-      @internal */
-  template <class Key, class Value>
-  struct MapItem
-  {
-    using KeyType = typename std::conditional<
-      std::is_lvalue_reference<Key>::value,
-      Key,
-      typename std::decay<Key>::type>::type;
-
-    using ValueType = typename std::conditional<
-      std::is_lvalue_reference<Value>::value,
-      Value,
-      typename std::decay<Value>::type>::type;
-
-    //! Construct a MapItem from a key and a value
-    /*! @internal */
-    MapItem( Key && key_, Value && value_ ) : key(std::forward<Key>(key_)), value(std::forward<Value>(value_)) {}
-
-    MapItem & operator=( MapItem const & ) = delete;
-
-    KeyType key;
-    ValueType value;
-
-    //! Serialize the MapItem with the NVPs "key" and "value"
-    template <class Archive> inline
-    void CEREAL_SERIALIZE_FUNCTION_NAME(Archive & archive)
-    {
-      archive( make_nvp<Archive>("key",   key),
-               make_nvp<Archive>("value", value) );
-    }
-  };
-
-  //! Create a MapItem so that human readable archives will group keys and values together
-  /*! @internal
-      @relates MapItem */
-  template <class KeyType, class ValueType> inline
-  MapItem<KeyType, ValueType> make_map_item(KeyType && key, ValueType && value)
-  {
-    return {std::forward<KeyType>(key), std::forward<ValueType>(value)};
-  }
-
-  namespace detail
-  {
-    //! Tag for Version, which due to its anonymous namespace, becomes a different
-    //! type in each translation unit
-    /*! This allows CEREAL_CLASS_VERSION to be safely called in a header file */
-    namespace{ struct version_binding_tag {}; }
-
-    // ######################################################################
-    //! Version information class
-    /*! This is the base case for classes that have not been explicitly
-        registered */
-    template <class T, class BindingTag = version_binding_tag> struct Version
-    {
-      static const std::uint32_t version = 0;
-      // we don't need to explicitly register these types since they
-      // always get a version number of 0
-    };
-
-    //! Holds all registered version information
-    struct Versions
-    {
-      std::unordered_map<std::size_t, std::uint32_t> mapping;
-
-      std::uint32_t find( std::size_t hash, std::uint32_t version )
-      {
-        const auto result = mapping.emplace( hash, version );
-        return result.first->second;
-      }
-    }; // struct Versions
-  } // namespace detail
-} // namespace cereal
-
-#endif // CEREAL_DETAILS_HELPERS_HPP_
diff --git a/Src/External/cereal/include/cereal/details/polymorphic_impl.hpp b/Src/External/cereal/include/cereal/details/polymorphic_impl.hpp
deleted file mode 100644
index 81128c8..0000000
--- a/Src/External/cereal/include/cereal/details/polymorphic_impl.hpp
+++ /dev/null
@@ -1,764 +0,0 @@
-/*! \file polymorphic_impl.hpp
-    \brief Internal polymorphism support
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* This code is heavily inspired by the boost serialization implementation by the following authors
-
-   (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-   Use, modification and distribution is subject to the Boost Software
-   License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)
-
-    See http://www.boost.org for updates, documentation, and revision history.
-
-   (C) Copyright 2006 David Abrahams - http://www.boost.org.
-
-   See /boost/serialization/export.hpp, /boost/archive/detail/register_archive.hpp,
-   and /boost/serialization/void_cast.hpp for their implementation. Additional details
-   found in other files split across serialization and archive.
-*/
-#ifndef CEREAL_DETAILS_POLYMORPHIC_IMPL_HPP_
-#define CEREAL_DETAILS_POLYMORPHIC_IMPL_HPP_
-
-#include "cereal/details/polymorphic_impl_fwd.hpp"
-#include "cereal/details/static_object.hpp"
-#include "cereal/types/memory.hpp"
-#include "cereal/types/string.hpp"
-#include <functional>
-#include <typeindex>
-#include <map>
-#include <limits>
-#include <set>
-#include <stack>
-
-//! Binds a polymorhic type to all registered archives
-/*! This binds a polymorphic type to all compatible registered archives that
-    have been registered with CEREAL_REGISTER_ARCHIVE.  This must be called
-    after all archives are registered (usually after the archives themselves
-    have been included). */
-#define CEREAL_BIND_TO_ARCHIVES(...)                                     \
-    namespace cereal {                                                   \
-    namespace detail {                                                   \
-    template<>                                                           \
-    struct init_binding<__VA_ARGS__> {                                   \
-        static bind_to_archives<__VA_ARGS__> const & b;                  \
-        static void unused() { (void)b; }                                \
-    };                                                                   \
-    bind_to_archives<__VA_ARGS__> const & init_binding<__VA_ARGS__>::b = \
-        ::cereal::detail::StaticObject<                                  \
-            bind_to_archives<__VA_ARGS__>                                \
-        >::getInstance().bind();                                         \
-    }} /* end namespaces */
-
-namespace cereal
-{
-  /* Polymorphic casting support */
-  namespace detail
-  {
-    //! Base type for polymorphic void casting
-    /*! Contains functions for casting between registered base and derived types.
-
-        This is necessary so that cereal can properly cast between polymorphic types
-        even though void pointers are used, which normally have no type information.
-        Runtime type information is used instead to index a compile-time made mapping
-        that can perform the proper cast. In the case of multiple levels of inheritance,
-        cereal will attempt to find the shortest path by using registered relationships to
-        perform the cast.
-
-        This class will be allocated as a StaticObject and only referenced by pointer,
-        allowing a templated derived version of it to define strongly typed functions
-        that cast between registered base and derived types. */
-    struct PolymorphicCaster
-    {
-      PolymorphicCaster() = default;
-      PolymorphicCaster( const PolymorphicCaster & ) = default;
-      PolymorphicCaster & operator=( const PolymorphicCaster & ) = default;
-      PolymorphicCaster( PolymorphicCaster && ) CEREAL_NOEXCEPT {}
-      PolymorphicCaster & operator=( PolymorphicCaster && ) CEREAL_NOEXCEPT { return *this; }
-      virtual ~PolymorphicCaster() CEREAL_NOEXCEPT = default;
-
-      //! Downcasts to the proper derived type
-      virtual void const * downcast( void const * const ptr ) const = 0;
-      //! Upcast to proper base type
-      virtual void * upcast( void * const ptr ) const = 0;
-      //! Upcast to proper base type, shared_ptr version
-      virtual std::shared_ptr<void> upcast( std::shared_ptr<void> const & ptr ) const = 0;
-    };
-
-    //! Holds registered mappings between base and derived types for casting
-    /*! This will be allocated as a StaticObject and holds a map containing
-        all registered mappings between base and derived types. */
-    struct PolymorphicCasters
-    {
-      //! Maps from base type index to a map from derived type index to caster
-      std::map<std::type_index, std::map<std::type_index, std::vector<PolymorphicCaster const*>>> map;
-
-      std::multimap<std::type_index, std::type_index> reverseMap;
-
-      //! Error message used for unregistered polymorphic casts
-      #define UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(LoadSave)                                                                                                                \
-        throw cereal::Exception("Trying to " #LoadSave " a registered polymorphic type with an unregistered polymorphic cast.\n"                                               \
-                                "Could not find a path to a base class (" + util::demangle(baseInfo.name()) + ") for type: " + ::cereal::util::demangledName<Derived>() + "\n" \
-                                "Make sure you either serialize the base class at some point via cereal::base_class or cereal::virtual_base_class.\n"                          \
-                                "Alternatively, manually register the association with CEREAL_REGISTER_POLYMORPHIC_RELATION.");
-
-      //! Checks if the mapping object that can perform the upcast or downcast
-      /*! Uses the type index from the base and derived class to find the matching
-          registered caster. If no matching caster exists, returns false. */
-      static bool exists( std::type_index const & baseIndex, std::type_index const & derivedIndex )
-      {
-        // First phase of lookup - match base type index
-        auto const & baseMap = StaticObject<PolymorphicCasters>::getInstance().map;
-        auto baseIter = baseMap.find( baseIndex );
-        if (baseIter == baseMap.end())
-          return false;
-
-        // Second phase - find a match from base to derived
-        auto & derivedMap = baseIter->second;
-        auto derivedIter = derivedMap.find( derivedIndex );
-        if (derivedIter == derivedMap.end())
-          return false;
-
-        return true;
-      }
-
-      //! Gets the mapping object that can perform the upcast or downcast
-      /*! Uses the type index from the base and derived class to find the matching
-          registered caster. If no matching caster exists, calls the exception function.
-
-          The returned PolymorphicCaster is capable of upcasting or downcasting between the two types. */
-      template <class F> inline
-      static std::vector<PolymorphicCaster const *> const & lookup( std::type_index const & baseIndex, std::type_index const & derivedIndex, F && exceptionFunc )
-      {
-        // First phase of lookup - match base type index
-        auto const & baseMap = StaticObject<PolymorphicCasters>::getInstance().map;
-        auto baseIter = baseMap.find( baseIndex );
-        if( baseIter == baseMap.end() )
-          exceptionFunc();
-
-        // Second phase - find a match from base to derived
-        auto & derivedMap = baseIter->second;
-        auto derivedIter = derivedMap.find( derivedIndex );
-        if( derivedIter == derivedMap.end() )
-          exceptionFunc();
-
-        return derivedIter->second;
-      }
-
-      //! Performs a downcast to the derived type using a registered mapping
-      template <class Derived> inline
-      static const Derived * downcast( const void * dptr, std::type_info const & baseInfo )
-      {
-        auto const & mapping = lookup( baseInfo, typeid(Derived), [&](){ UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(save) } );
-
-        for( auto const * map : mapping )
-          dptr = map->downcast( dptr );
-
-        return static_cast<Derived const *>( dptr );
-      }
-
-      //! Performs an upcast to the registered base type using the given a derived type
-      /*! The return is untyped because the final casting to the base type must happen in the polymorphic
-          serialization function, where the type is known at compile time */
-      template <class Derived> inline
-      static void * upcast( Derived * const dptr, std::type_info const & baseInfo )
-      {
-        auto const & mapping = lookup( baseInfo, typeid(Derived), [&](){ UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(load) } );
-
-        void * uptr = dptr;
-        for( auto mIter = mapping.rbegin(), mEnd = mapping.rend(); mIter != mEnd; ++mIter )
-          uptr = (*mIter)->upcast( uptr );
-
-        return uptr;
-      }
-
-      //! Upcasts for shared pointers
-      template <class Derived> inline
-      static std::shared_ptr<void> upcast( std::shared_ptr<Derived> const & dptr, std::type_info const & baseInfo )
-      {
-        auto const & mapping = lookup( baseInfo, typeid(Derived), [&](){ UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION(load) } );
-
-        std::shared_ptr<void> uptr = dptr;
-        for( auto mIter = mapping.rbegin(), mEnd = mapping.rend(); mIter != mEnd; ++mIter )
-          uptr = (*mIter)->upcast( uptr );
-
-        return uptr;
-      }
-
-      #undef UNREGISTERED_POLYMORPHIC_CAST_EXCEPTION
-    };
-
-    //! Strongly typed derivation of PolymorphicCaster
-    template <class Base, class Derived>
-    struct PolymorphicVirtualCaster : PolymorphicCaster
-    {
-      //! Inserts an entry in the polymorphic casting map for this pairing
-      /*! Creates an explicit mapping between Base and Derived in both upwards and
-          downwards directions, allowing void pointers to either to be properly cast
-          assuming dynamic type information is available */
-      PolymorphicVirtualCaster()
-      {
-        const auto baseKey = std::type_index(typeid(Base));
-        const auto derivedKey = std::type_index(typeid(Derived));
-
-        // First insert the relation Base->Derived
-        const auto lock = StaticObject<PolymorphicCasters>::lock();
-        auto & baseMap = StaticObject<PolymorphicCasters>::getInstance().map;
-        auto lb = baseMap.lower_bound(baseKey);
-
-        {
-          auto & derivedMap = baseMap.insert( lb, {baseKey, {}} )->second;
-          auto lbd = derivedMap.lower_bound(derivedKey);
-          auto & derivedVec = derivedMap.insert( lbd, { std::move(derivedKey), {}} )->second;
-          derivedVec.push_back( this );
-        }
-
-        // Insert reverse relation Derived->Base
-        auto & reverseMap = StaticObject<PolymorphicCasters>::getInstance().reverseMap;
-        reverseMap.insert( {derivedKey, baseKey} );
-
-        // Find all chainable unregistered relations
-        /* The strategy here is to process only the nodes in the class hierarchy graph that have been
-           affected by the new insertion. The aglorithm iteratively processes a node an ensures that it
-           is updated with all new shortest length paths. It then rocesses the parents of the active node,
-           with the knowledge that all children have already been processed.
-
-           Note that for the following, we'll use the nomenclature of parent and child to not confuse with
-           the inserted base derived relationship */
-        {
-          // Checks whether there is a path from parent->child and returns a <dist, path> pair
-          // dist is set to MAX if the path does not exist
-          auto checkRelation = [](std::type_index const & parentInfo, std::type_index const & childInfo) ->
-            std::pair<size_t, std::vector<PolymorphicCaster const *>>
-          {
-            if( PolymorphicCasters::exists( parentInfo, childInfo ) )
-            {
-              auto const & path = PolymorphicCasters::lookup( parentInfo, childInfo, [](){} );
-              return {path.size(), path};
-            }
-            else
-              return {std::numeric_limits<size_t>::max(), {}};
-          };
-
-          std::stack<std::type_index> parentStack;      // Holds the parent nodes to be processed
-          std::set<std::type_index>   dirtySet;         // Marks child nodes that have been changed
-          std::set<std::type_index>   processedParents; // Marks parent nodes that have been processed
-
-          // Begin processing the base key and mark derived as dirty
-          parentStack.push( baseKey );
-          dirtySet.insert( derivedKey );
-
-          while( !parentStack.empty() )
-          {
-            using Relations = std::multimap<std::type_index, std::pair<std::type_index, std::vector<PolymorphicCaster const *>>>;
-            Relations unregisteredRelations; // Defer insertions until after main loop to prevent iterator invalidation
-
-            const auto parent = parentStack.top();
-            parentStack.pop();
-
-            // Update paths to all children marked dirty
-            for( auto const & childPair : baseMap[parent] )
-            {
-              const auto child = childPair.first;
-              if( dirtySet.count( child ) && baseMap.count( child ) )
-              {
-                auto parentChildPath = checkRelation( parent, child );
-
-                // Search all paths from the child to its own children (finalChild),
-                // looking for a shorter parth from parent to finalChild
-                for( auto const & finalChildPair : baseMap[child] )
-                {
-                  const auto finalChild = finalChildPair.first;
-
-                  auto parentFinalChildPath = checkRelation( parent, finalChild );
-                  auto childFinalChildPath  = checkRelation( child, finalChild );
-
-                  const size_t newLength = 1u + parentChildPath.first;
-
-                  if( newLength < parentFinalChildPath.first )
-                  {
-                    std::vector<PolymorphicCaster const *> path = parentChildPath.second;
-                    path.insert( path.end(), childFinalChildPath.second.begin(), childFinalChildPath.second.end() );
-
-                    // Check to see if we have a previous uncommitted path in unregisteredRelations
-                    // that is shorter. If so, ignore this path
-                    auto hintRange = unregisteredRelations.equal_range( parent );
-                    auto hint = hintRange.first;
-                    for( ; hint != hintRange.second; ++hint )
-                      if( hint->second.first == finalChild )
-                        break;
-
-                    const bool uncommittedExists = hint != unregisteredRelations.end();
-                    if( uncommittedExists && (hint->second.second.size() <= newLength) )
-                      continue;
-
-                    auto newPath = std::pair<std::type_index, std::vector<PolymorphicCaster const *>>{finalChild, std::move(path)};
-
-                    // Insert the new path if it doesn't exist, otherwise this will just lookup where to do the
-                    // replacement
-                    #ifdef CEREAL_OLDER_GCC
-                    auto old = unregisteredRelations.insert( hint, std::make_pair(parent, newPath) );
-                    #else // NOT CEREAL_OLDER_GCC
-                    auto old = unregisteredRelations.emplace_hint( hint, parent, newPath );
-                    #endif // NOT CEREAL_OLDER_GCC
-
-                    // If there was an uncommitted path, we need to perform a replacement
-                    if( uncommittedExists )
-                      old->second = newPath;
-                  }
-                } // end loop over child's children
-              } // end if dirty and child has children
-            } // end loop over children
-
-            // Insert chained relations
-            for( auto const & it : unregisteredRelations )
-            {
-              auto & derivedMap = baseMap.find( it.first )->second;
-              derivedMap[it.second.first] = it.second.second;
-              reverseMap.insert( {it.second.first, it.first} );
-            }
-
-            // Mark current parent as modified
-            dirtySet.insert( parent );
-
-            // Insert all parents of the current parent node that haven't yet been processed
-            auto parentRange = reverseMap.equal_range( parent );
-            for( auto pIter = parentRange.first; pIter != parentRange.second; ++pIter )
-            {
-              const auto pParent = pIter->second;
-              if( !processedParents.count( pParent ) )
-              {
-                parentStack.push( pParent );
-                processedParents.insert( pParent );
-              }
-            }
-          } // end loop over parent stack
-        } // end chainable relations
-      } // end PolymorphicVirtualCaster()
-
-      //! Performs the proper downcast with the templated types
-      void const * downcast( void const * const ptr ) const override
-      {
-        return dynamic_cast<Derived const*>( static_cast<Base const*>( ptr ) );
-      }
-
-      //! Performs the proper upcast with the templated types
-      void * upcast( void * const ptr ) const override
-      {
-        return dynamic_cast<Base*>( static_cast<Derived*>( ptr ) );
-      }
-
-      //! Performs the proper upcast with the templated types (shared_ptr version)
-      std::shared_ptr<void> upcast( std::shared_ptr<void> const & ptr ) const override
-      {
-        return std::dynamic_pointer_cast<Base>( std::static_pointer_cast<Derived>( ptr ) );
-      }
-    };
-
-    //! Registers a polymorphic casting relation between a Base and Derived type
-    /*! Registering a relation allows cereal to properly cast between the two types
-        given runtime type information and void pointers.
-
-        Registration happens automatically via cereal::base_class and cereal::virtual_base_class
-        instantiations. For cases where neither is called, see the CEREAL_REGISTER_POLYMORPHIC_RELATION
-        macro */
-    template <class Base, class Derived>
-    struct RegisterPolymorphicCaster
-    {
-      static PolymorphicCaster const * bind( std::true_type /* is_polymorphic<Base> */)
-      {
-        return &StaticObject<PolymorphicVirtualCaster<Base, Derived>>::getInstance();
-      }
-
-      static PolymorphicCaster const * bind( std::false_type /* is_polymorphic<Base> */ )
-      { return nullptr; }
-
-      //! Performs registration (binding) between Base and Derived
-      /*! If the type is not polymorphic, nothing will happen */
-      static PolymorphicCaster const * bind()
-      { return bind( typename std::is_polymorphic<Base>::type() ); }
-    };
-  }
-
-  /* General polymorphism support */
-  namespace detail
-  {
-    //! Binds a compile time type with a user defined string
-    template <class T>
-    struct binding_name {};
-
-    //! A structure holding a map from type_indices to output serializer functions
-    /*! A static object of this map should be created for each registered archive
-        type, containing entries for every registered type that describe how to
-        properly cast the type to its real type in polymorphic scenarios for
-        shared_ptr, weak_ptr, and unique_ptr. */
-    template <class Archive>
-    struct OutputBindingMap
-    {
-      //! A serializer function
-      /*! Serializer functions return nothing and take an archive as
-          their first parameter (will be cast properly inside the function,
-          a pointer to actual data (contents of smart_ptr's get() function)
-          as their second parameter, and the type info of the owning smart_ptr
-          as their final parameter */
-      typedef std::function<void(void*, void const *, std::type_info const &)> Serializer;
-
-      //! Struct containing the serializer functions for all pointer types
-      struct Serializers
-      {
-        Serializer shared_ptr, //!< Serializer function for shared/weak pointers
-                   unique_ptr; //!< Serializer function for unique pointers
-      };
-
-      //! A map of serializers for pointers of all registered types
-      std::map<std::type_index, Serializers> map;
-    };
-
-    //! An empty noop deleter
-    template<class T> struct EmptyDeleter { void operator()(T *) const {} };
-
-    //! A structure holding a map from type name strings to input serializer functions
-    /*! A static object of this map should be created for each registered archive
-        type, containing entries for every registered type that describe how to
-        properly cast the type to its real type in polymorphic scenarios for
-        shared_ptr, weak_ptr, and unique_ptr. */
-    template <class Archive>
-    struct InputBindingMap
-    {
-      //! Shared ptr serializer function
-      /*! Serializer functions return nothing and take an archive as
-          their first parameter (will be cast properly inside the function,
-          a shared_ptr (or unique_ptr for the unique case) of any base
-          type, and the type id of said base type as the third parameter.
-          Internally it will properly be loaded and cast to the correct type. */
-      typedef std::function<void(void*, std::shared_ptr<void> &, std::type_info const &)> SharedSerializer;
-      //! Unique ptr serializer function
-      typedef std::function<void(void*, std::unique_ptr<void, EmptyDeleter<void>> &, std::type_info const &)> UniqueSerializer;
-
-      //! Struct containing the serializer functions for all pointer types
-      struct Serializers
-      {
-        SharedSerializer shared_ptr; //!< Serializer function for shared/weak pointers
-        UniqueSerializer unique_ptr; //!< Serializer function for unique pointers
-      };
-
-      //! A map of serializers for pointers of all registered types
-      std::map<std::string, Serializers> map;
-    };
-
-    // forward decls for archives from cereal.hpp
-    class InputArchiveBase;
-    class OutputArchiveBase;
-
-    //! Creates a binding (map entry) between an input archive type and a polymorphic type
-    /*! Bindings are made when types are registered, assuming that at least one
-        archive has already been registered.  When this struct is created,
-        it will insert (at run time) an entry into a map that properly handles
-        casting for serializing polymorphic objects */
-    template <class Archive, class T> struct InputBindingCreator
-    {
-      //! Initialize the binding
-      InputBindingCreator()
-      {
-        auto & map = StaticObject<InputBindingMap<Archive>>::getInstance().map;
-        auto lock = StaticObject<InputBindingMap<Archive>>::lock();
-        auto key = std::string(binding_name<T>::name());
-        auto lb = map.lower_bound(key);
-
-        if (lb != map.end() && lb->first == key)
-          return;
-
-        typename InputBindingMap<Archive>::Serializers serializers;
-
-        serializers.shared_ptr =
-          [](void * arptr, std::shared_ptr<void> & dptr, std::type_info const & baseInfo)
-          {
-            Archive & ar = *static_cast<Archive*>(arptr);
-            std::shared_ptr<T> ptr;
-
-            ar( CEREAL_NVP_("ptr_wrapper", ::cereal::memory_detail::make_ptr_wrapper(ptr)) );
-
-            dptr = PolymorphicCasters::template upcast<T>( ptr, baseInfo );
-          };
-
-        serializers.unique_ptr =
-          [](void * arptr, std::unique_ptr<void, EmptyDeleter<void>> & dptr, std::type_info const & baseInfo)
-          {
-            Archive & ar = *static_cast<Archive*>(arptr);
-            std::unique_ptr<T> ptr;
-
-            ar( CEREAL_NVP_("ptr_wrapper", ::cereal::memory_detail::make_ptr_wrapper(ptr)) );
-
-            dptr.reset( PolymorphicCasters::template upcast<T>( ptr.release(), baseInfo ));
-          };
-
-        map.insert( lb, { std::move(key), std::move(serializers) } );
-      }
-    };
-
-    //! Creates a binding (map entry) between an output archive type and a polymorphic type
-    /*! Bindings are made when types are registered, assuming that at least one
-        archive has already been registered.  When this struct is created,
-        it will insert (at run time) an entry into a map that properly handles
-        casting for serializing polymorphic objects */
-    template <class Archive, class T> struct OutputBindingCreator
-    {
-      //! Writes appropriate metadata to the archive for this polymorphic type
-      static void writeMetadata(Archive & ar)
-      {
-        // Register the polymorphic type name with the archive, and get the id
-        char const * name = binding_name<T>::name();
-        std::uint32_t id = ar.registerPolymorphicType(name);
-
-        // Serialize the id
-        ar( CEREAL_NVP_("polymorphic_id", id) );
-
-        // If the msb of the id is 1, then the type name is new, and we should serialize it
-        if( id & detail::msb_32bit )
-        {
-          std::string namestring(name);
-          ar( CEREAL_NVP_("polymorphic_name", namestring) );
-        }
-      }
-
-      //! Holds a properly typed shared_ptr to the polymorphic type
-      class PolymorphicSharedPointerWrapper
-      {
-        public:
-          /*! Wrap a raw polymorphic pointer in a shared_ptr to its true type
-
-              The wrapped pointer will not be responsible for ownership of the held pointer
-              so it will not attempt to destroy it; instead the refcount of the wrapped
-              pointer will be tied to a fake 'ownership pointer' that will do nothing
-              when it ultimately goes out of scope.
-
-              The main reason for doing this, other than not to destroy the true object
-              with our wrapper pointer, is to avoid meddling with the internal reference
-              count in a polymorphic type that inherits from std::enable_shared_from_this.
-
-              @param dptr A void pointer to the contents of the shared_ptr to serialize */
-          PolymorphicSharedPointerWrapper( T const * dptr ) : refCount(), wrappedPtr( refCount, dptr )
-          { }
-
-          //! Get the wrapped shared_ptr */
-          inline std::shared_ptr<T const> const & operator()() const { return wrappedPtr; }
-
-        private:
-          std::shared_ptr<void> refCount;      //!< The ownership pointer
-          std::shared_ptr<T const> wrappedPtr; //!< The wrapped pointer
-      };
-
-      //! Does the actual work of saving a polymorphic shared_ptr
-      /*! This function will properly create a shared_ptr from the void * that is passed in
-          before passing it to the archive for serialization.
-
-          In addition, this will also preserve the state of any internal enable_shared_from_this mechanisms
-
-          @param ar The archive to serialize to
-          @param dptr Pointer to the actual data held by the shared_ptr */
-      static inline void savePolymorphicSharedPtr( Archive & ar, T const * dptr, std::true_type /* has_shared_from_this */ )
-      {
-        ::cereal::memory_detail::EnableSharedStateHelper<T> state( const_cast<T *>(dptr) );
-        PolymorphicSharedPointerWrapper psptr( dptr );
-        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( psptr() ) ) );
-      }
-
-      //! Does the actual work of saving a polymorphic shared_ptr
-      /*! This function will properly create a shared_ptr from the void * that is passed in
-          before passing it to the archive for serialization.
-
-          This version is for types that do not inherit from std::enable_shared_from_this.
-
-          @param ar The archive to serialize to
-          @param dptr Pointer to the actual data held by the shared_ptr */
-      static inline void savePolymorphicSharedPtr( Archive & ar, T const * dptr, std::false_type /* has_shared_from_this */ )
-      {
-        PolymorphicSharedPointerWrapper psptr( dptr );
-        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( psptr() ) ) );
-      }
-
-      //! Initialize the binding
-      OutputBindingCreator()
-      {
-        auto & map = StaticObject<OutputBindingMap<Archive>>::getInstance().map;
-        auto key = std::type_index(typeid(T));
-        auto lb = map.lower_bound(key);
-
-        if (lb != map.end() && lb->first == key)
-          return;
-
-        typename OutputBindingMap<Archive>::Serializers serializers;
-
-        serializers.shared_ptr =
-          [&](void * arptr, void const * dptr, std::type_info const & baseInfo)
-          {
-            Archive & ar = *static_cast<Archive*>(arptr);
-            writeMetadata(ar);
-
-            auto ptr = PolymorphicCasters::template downcast<T>( dptr, baseInfo );
-
-            #ifdef _MSC_VER
-            savePolymorphicSharedPtr( ar, ptr, ::cereal::traits::has_shared_from_this<T>::type() ); // MSVC doesn't like typename here
-            #else // not _MSC_VER
-            savePolymorphicSharedPtr( ar, ptr, typename ::cereal::traits::has_shared_from_this<T>::type() );
-            #endif // _MSC_VER
-          };
-
-        serializers.unique_ptr =
-          [&](void * arptr, void const * dptr, std::type_info const & baseInfo)
-          {
-            Archive & ar = *static_cast<Archive*>(arptr);
-            writeMetadata(ar);
-
-            std::unique_ptr<T const, EmptyDeleter<T const>> const ptr( PolymorphicCasters::template downcast<T>( dptr, baseInfo ) );
-
-            ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
-          };
-
-        map.insert( { std::move(key), std::move(serializers) } );
-      }
-    };
-
-    //! Used to help out argument dependent lookup for finding potential overloads
-    //! of instantiate_polymorphic_binding
-    struct adl_tag {};
-
-    //! Tag for init_binding, bind_to_archives and instantiate_polymorphic_binding. Due to the use of anonymous
-    //! namespace it becomes a different type in each translation unit.
-    namespace { struct polymorphic_binding_tag {}; }
-
-    //! Causes the static object bindings between an archive type and a serializable type T
-    template <class Archive, class T>
-    struct create_bindings
-    {
-      static const InputBindingCreator<Archive, T> &
-      load(std::true_type)
-      {
-        return cereal::detail::StaticObject<InputBindingCreator<Archive, T>>::getInstance();
-      }
-
-      static const OutputBindingCreator<Archive, T> &
-      save(std::true_type)
-      {
-        return cereal::detail::StaticObject<OutputBindingCreator<Archive, T>>::getInstance();
-      }
-
-      inline static void load(std::false_type) {}
-      inline static void save(std::false_type) {}
-    };
-
-    //! When specialized, causes the compiler to instantiate its parameter
-    template <void(*)()>
-    struct instantiate_function {};
-
-    /*! This struct is used as the return type of instantiate_polymorphic_binding
-        for specific Archive types.  When the compiler looks for overloads of
-        instantiate_polymorphic_binding, it will be forced to instantiate this
-        struct during overload resolution, even though it will not be part of a valid
-        overload */
-    template <class Archive, class T>
-    struct polymorphic_serialization_support
-    {
-      #if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
-      //! Creates the appropriate bindings depending on whether the archive supports
-      //! saving or loading
-      virtual CEREAL_DLL_EXPORT void instantiate() CEREAL_USED;
-      #else // NOT _MSC_VER
-      //! Creates the appropriate bindings depending on whether the archive supports
-      //! saving or loading
-      static CEREAL_DLL_EXPORT void instantiate() CEREAL_USED;
-      //! This typedef causes the compiler to instantiate this static function
-      typedef instantiate_function<instantiate> unused;
-      #endif // _MSC_VER
-    };
-
-    // instantiate implementation
-    template <class Archive, class T>
-    CEREAL_DLL_EXPORT void polymorphic_serialization_support<Archive,T>::instantiate()
-    {
-      create_bindings<Archive,T>::save( std::integral_constant<bool,
-                                          std::is_base_of<detail::OutputArchiveBase, Archive>::value &&
-                                          traits::is_output_serializable<T, Archive>::value>{} );
-
-      create_bindings<Archive,T>::load( std::integral_constant<bool,
-                                          std::is_base_of<detail::InputArchiveBase, Archive>::value &&
-                                          traits::is_input_serializable<T, Archive>::value>{} );
-    }
-
-    //! Begins the binding process of a type to all registered archives
-    /*! Archives need to be registered prior to this struct being instantiated via
-        the CEREAL_REGISTER_ARCHIVE macro.  Overload resolution will then force
-        several static objects to be made that allow us to bind together all
-        registered archive types with the parameter type T. */
-    template <class T, class Tag = polymorphic_binding_tag>
-    struct bind_to_archives
-    {
-      //! Binding for non abstract types
-      void bind(std::false_type) const
-      {
-        instantiate_polymorphic_binding(static_cast<T*>(nullptr), 0, Tag{}, adl_tag{});
-      }
-
-      //! Binding for abstract types
-      void bind(std::true_type) const
-      { }
-
-      //! Binds the type T to all registered archives
-      /*! If T is abstract, we will not serialize it and thus
-          do not need to make a binding */
-      bind_to_archives const & bind() const
-      {
-        static_assert( std::is_polymorphic<T>::value,
-                       "Attempting to register non polymorphic type" );
-        bind( std::is_abstract<T>() );
-        return *this;
-      }
-    };
-
-    //! Used to hide the static object used to bind T to registered archives
-    template <class T, class Tag = polymorphic_binding_tag>
-    struct init_binding;
-
-    //! Base case overload for instantiation
-    /*! This will end up always being the best overload due to the second
-        parameter always being passed as an int.  All other overloads will
-        accept pointers to archive types and have lower precedence than int.
-
-        Since the compiler needs to check all possible overloads, the
-        other overloads created via CEREAL_REGISTER_ARCHIVE, which will have
-        lower precedence due to requring a conversion from int to (Archive*),
-        will cause their return types to be instantiated through the static object
-        mechanisms even though they are never called.
-
-        See the documentation for the other functions to try and understand this */
-    template <class T, typename BindingTag>
-    void instantiate_polymorphic_binding( T*, int, BindingTag, adl_tag ) {}
-  } // namespace detail
-} // namespace cereal
-
-#endif // CEREAL_DETAILS_POLYMORPHIC_IMPL_HPP_
diff --git a/Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp b/Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
deleted file mode 100644
index c13ce23..0000000
--- a/Src/External/cereal/include/cereal/details/polymorphic_impl_fwd.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*! \file polymorphic_impl_fwd.hpp
-    \brief Internal polymorphism support forward declarations
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* This code is heavily inspired by the boost serialization implementation by the following authors
-
-   (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-   Use, modification and distribution is subject to the Boost Software
-   License, Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt)
-
-    See http://www.boost.org for updates, documentation, and revision history.
-
-   (C) Copyright 2006 David Abrahams - http://www.boost.org.
-
-   See /boost/serialization/export.hpp and /boost/archive/detail/register_archive.hpp for their
-   implementation.
-*/
-
-#ifndef CEREAL_DETAILS_POLYMORPHIC_IMPL_FWD_HPP_
-#define CEREAL_DETAILS_POLYMORPHIC_IMPL_FWD_HPP_
-
-namespace cereal
-{
-  namespace detail
-  {
-    //! Forward declaration, see polymorphic_impl.hpp for more information
-    template <class Base, class Derived>
-    struct RegisterPolymorphicCaster;
-
-    //! Forward declaration, see polymorphic_impl.hpp for more information
-    struct PolymorphicCasters;
-
-    //! Forward declaration, see polymorphic_impl.hpp for more information
-    template <class Base, class Derived>
-    struct PolymorphicRelation;
-  } // namespace detail
-} // namespace cereal
-
-#endif // CEREAL_DETAILS_POLYMORPHIC_IMPL_FWD_HPP_
diff --git a/Src/External/cereal/include/cereal/details/static_object.hpp b/Src/External/cereal/include/cereal/details/static_object.hpp
deleted file mode 100644
index c9c888d..0000000
--- a/Src/External/cereal/include/cereal/details/static_object.hpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*! \file static_object.hpp
-    \brief Internal polymorphism static object support
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_DETAILS_STATIC_OBJECT_HPP_
-#define CEREAL_DETAILS_STATIC_OBJECT_HPP_
-
-#include "cereal/macros.hpp"
-
-#if CEREAL_THREAD_SAFE
-#include <mutex>
-#endif
-
-//! Prevent link optimization from removing non-referenced static objects
-/*! Especially for polymorphic support, we create static objects which
-    may not ever be explicitly referenced.  Most linkers will detect this
-    and remove the code causing various unpleasant runtime errors.  These
-    macros, adopted from Boost (see force_include.hpp) prevent this
-    (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
-    Use, modification and distribution is subject to the Boost Software
-    License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-    http://www.boost.org/LICENSE_1_0.txt) */
-
-#ifdef _MSC_VER
-#   define CEREAL_DLL_EXPORT __declspec(dllexport)
-#   define CEREAL_USED
-#else // clang or gcc
-#   define CEREAL_DLL_EXPORT
-#   define CEREAL_USED __attribute__ ((__used__))
-#endif
-
-namespace cereal
-{
-  namespace detail
-  {
-    //! A static, pre-execution object
-    /*! This class will create a single copy (singleton) of some
-        type and ensures that merely referencing this type will
-        cause it to be instantiated and initialized pre-execution.
-        For example, this is used heavily in the polymorphic pointer
-        serialization mechanisms to bind various archive types with
-        different polymorphic classes */
-    template <class T>
-    class CEREAL_DLL_EXPORT StaticObject
-    {
-      private:
-        //! Forces instantiation at pre-execution time
-        static void instantiate( T const & ) {}
-
-        static T & create()
-        {
-          static T t;
-          instantiate(instance);
-          return t;
-        }
-
-        StaticObject( StaticObject const & /*other*/ ) {}
-
-      public:
-        static T & getInstance()
-        {
-          return create();
-        }
-
-        //! A class that acts like std::lock_guard
-        class LockGuard
-        {
-          #if CEREAL_THREAD_SAFE
-          public:
-            LockGuard(std::mutex & m) : lock(m) {}
-          private:
-            std::unique_lock<std::mutex> lock;
-          #else
-          public:
-            ~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used
-          #endif
-        };
-
-        //! Attempts to lock this static object for the current scope
-        /*! @note This function is a no-op if cereal is not compiled with
-                  thread safety enabled (CEREAL_THREAD_SAFE = 1).
-
-            This function returns an object that holds a lock for
-            this StaticObject that will release its lock upon destruction. This
-            call will block until the lock is available. */
-        static LockGuard lock()
-        {
-          #if CEREAL_THREAD_SAFE
-          static std::mutex instanceMutex;
-          return LockGuard{instanceMutex};
-          #else
-          return LockGuard{};
-          #endif
-        }
-
-      private:
-        static T & instance;
-    };
-
-    template <class T> T & StaticObject<T>::instance = StaticObject<T>::create();
-  } // namespace detail
-} // namespace cereal
-
-#endif // CEREAL_DETAILS_STATIC_OBJECT_HPP_
diff --git a/Src/External/cereal/include/cereal/details/traits.hpp b/Src/External/cereal/include/cereal/details/traits.hpp
deleted file mode 100644
index 3390bbd..0000000
--- a/Src/External/cereal/include/cereal/details/traits.hpp
+++ /dev/null
@@ -1,1389 +0,0 @@
-/*! \file traits.hpp
-    \brief Internal type trait support
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_DETAILS_TRAITS_HPP_
-#define CEREAL_DETAILS_TRAITS_HPP_
-
-#ifndef __clang__
-#if (__GNUC__ == 4 && __GNUC_MINOR__ <= 7)
-#define CEREAL_OLDER_GCC
-#endif // gcc 4.7 or earlier
-#endif // __clang__
-
-#include <type_traits>
-#include <typeindex>
-
-#include "cereal/macros.hpp"
-#include "cereal/access.hpp"
-
-namespace cereal
-{
-  namespace traits
-  {
-    using yes = std::true_type;
-    using no  = std::false_type;
-
-    namespace detail
-    {
-      // ######################################################################
-      //! Used to delay a static_assert until template instantiation
-      template <class T>
-      struct delay_static_assert : std::false_type {};
-
-      // ######################################################################
-      // SFINAE Helpers
-      #ifdef CEREAL_OLDER_GCC // when VS supports better SFINAE, we can use this as the default
-      template<typename> struct Void { typedef void type; };
-      #endif // CEREAL_OLDER_GCC
-
-      //! Return type for SFINAE Enablers
-      enum class sfinae {};
-
-      // ######################################################################
-      // Helper functionality for boolean integral constants and Enable/DisableIf
-      template <bool H, bool ... T> struct meta_bool_and : std::integral_constant<bool, H && meta_bool_and<T...>::value> {};
-      template <bool B> struct meta_bool_and<B> : std::integral_constant<bool, B> {};
-
-      template <bool H, bool ... T> struct meta_bool_or : std::integral_constant<bool, H || meta_bool_or<T...>::value> {};
-      template <bool B> struct meta_bool_or<B> : std::integral_constant<bool, B> {};
-
-      // workaround needed due to bug in MSVC 2013, see
-      // http://connect.microsoft.com/VisualStudio/feedback/details/800231/c-11-alias-template-issue
-      template <bool ... Conditions>
-      struct EnableIfHelper : std::enable_if<meta_bool_and<Conditions...>::value, sfinae> {};
-
-      template <bool ... Conditions>
-      struct DisableIfHelper : std::enable_if<!meta_bool_or<Conditions...>::value, sfinae> {};
-    } // namespace detail
-
-    //! Used as the default value for EnableIf and DisableIf template parameters
-    /*! @relates EnableIf
-        @relates DisableIf */
-    static const detail::sfinae sfinae = {};
-
-    // ######################################################################
-    //! Provides a way to enable a function if conditions are met
-    /*! This is intended to be used in a near identical fashion to std::enable_if
-        while being significantly easier to read at the cost of not allowing for as
-        complicated of a condition.
-
-        This will compile (allow the function) if every condition evaluates to true.
-        at compile time.  This should be used with SFINAE to ensure that at least
-        one other candidate function works when one fails due to an EnableIf.
-
-        This should be used as the las template parameter to a function as
-        an unnamed parameter with a default value of cereal::traits::sfinae:
-
-        @code{cpp}
-        // using by making the last template argument variadic
-        template <class T, EnableIf<std::is_same<T, bool>::value> = sfinae>
-        void func(T t );
-        @endcode
-
-        Note that this performs a logical AND of all conditions, so you will need
-        to construct more complicated requirements with this fact in mind.
-
-        @relates DisableIf
-        @relates sfinae
-        @tparam Conditions The conditions which will be logically ANDed to enable the function. */
-    template <bool ... Conditions>
-    using EnableIf = typename detail::EnableIfHelper<Conditions...>::type;
-
-    // ######################################################################
-    //! Provides a way to disable a function if conditions are met
-    /*! This is intended to be used in a near identical fashion to std::enable_if
-        while being significantly easier to read at the cost of not allowing for as
-        complicated of a condition.
-
-        This will compile (allow the function) if every condition evaluates to false.
-        This should be used with SFINAE to ensure that at least one other candidate
-        function works when one fails due to a DisableIf.
-
-        This should be used as the las template parameter to a function as
-        an unnamed parameter with a default value of cereal::traits::sfinae:
-
-        @code{cpp}
-        // using by making the last template argument variadic
-        template <class T, DisableIf<std::is_same<T, bool>::value> = sfinae>
-        void func(T t );
-        @endcode
-
-        This is often used in conjunction with EnableIf to form an enable/disable pair of
-        overloads.
-
-        Note that this performs a logical AND of all conditions, so you will need
-        to construct more complicated requirements with this fact in mind.  If all conditions
-        hold, the function will be disabled.
-
-        @relates EnableIf
-        @relates sfinae
-        @tparam Conditions The conditions which will be logically ANDed to disable the function. */
-    template <bool ... Conditions>
-    using DisableIf = typename detail::DisableIfHelper<Conditions...>::type;
-
-    // ######################################################################
-    namespace detail
-    {
-      template <class InputArchive>
-      struct get_output_from_input : no
-      {
-        static_assert( detail::delay_static_assert<InputArchive>::value,
-            "Could not find an associated output archive for input archive." );
-      };
-
-      template <class OutputArchive>
-      struct get_input_from_output : no
-      {
-        static_assert( detail::delay_static_assert<OutputArchive>::value,
-            "Could not find an associated input archive for output archive." );
-      };
-    }
-
-    //! Sets up traits that relate an input archive to an output archive
-    #define CEREAL_SETUP_ARCHIVE_TRAITS(InputArchive, OutputArchive)  \
-    namespace cereal { namespace traits { namespace detail {          \
-      template <> struct get_output_from_input<InputArchive>          \
-      { using type = OutputArchive; };                                \
-      template <> struct get_input_from_output<OutputArchive>         \
-      { using type = InputArchive; }; } } } /* end namespaces */
-
-    // ######################################################################
-    //! Used to convert a MAKE_HAS_XXX macro into a versioned variant
-    #define CEREAL_MAKE_VERSIONED_TEST ,0
-
-    // ######################################################################
-    //! Creates a test for whether a non const member function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        @param name The name of the function to test for (e.g. serialize, load, save)
-        @param test_name The name to give the test for the function being tested for (e.g. serialize, versioned_serialize)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #ifdef CEREAL_OLDER_GCC
-    #define CEREAL_MAKE_HAS_MEMBER_TEST(name, test_name, versioned)                                                                         \
-    template <class T, class A, class SFINAE = void>                                                                                        \
-    struct has_member_##test_name : no {};                                                                                                  \
-    template <class T, class A>                                                                                                             \
-    struct has_member_##test_name<T, A,                                                                                                     \
-      typename detail::Void< decltype( cereal::access::member_##name( std::declval<A&>(), std::declval<T&>() versioned ) ) >::type> : yes {}
-    #else // NOT CEREAL_OLDER_GCC
-    #define CEREAL_MAKE_HAS_MEMBER_TEST(name, test_name, versioned)                                                                     \
-    namespace detail                                                                                                                    \
-    {                                                                                                                                   \
-      template <class T, class A>                                                                                                       \
-      struct has_member_##name##_##versioned##_impl                                                                                     \
-      {                                                                                                                                 \
-        template <class TT, class AA>                                                                                                   \
-        static auto test(int) -> decltype( cereal::access::member_##name( std::declval<AA&>(), std::declval<TT&>() versioned ), yes()); \
-        template <class, class>                                                                                                         \
-        static no test(...);                                                                                                            \
-        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                                    \
-      };                                                                                                                                \
-    } /* end namespace detail */                                                                                                        \
-    template <class T, class A>                                                                                                         \
-    struct has_member_##test_name : std::integral_constant<bool, detail::has_member_##name##_##versioned##_impl<T, A>::value> {}
-    #endif // NOT CEREAL_OLDER_GCC
-
-    // ######################################################################
-    //! Creates a test for whether a non const non-member function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper non-member function for the given archive. */
-    #define CEREAL_MAKE_HAS_NON_MEMBER_TEST(test_name, func, versioned)                                                         \
-    namespace detail                                                                                                            \
-    {                                                                                                                           \
-      template <class T, class A>                                                                                               \
-      struct has_non_member_##test_name##_impl                                                                                  \
-      {                                                                                                                         \
-        template <class TT, class AA>                                                                                           \
-        static auto test(int) -> decltype( func( std::declval<AA&>(), std::declval<TT&>() versioned ), yes());                  \
-        template <class, class>                                                                                                 \
-        static no test( ... );                                                                                                  \
-        static const bool value = std::is_same<decltype( test<T, A>( 0 ) ), yes>::value;                                        \
-      };                                                                                                                        \
-    } /* end namespace detail */                                                                                                \
-    template <class T, class A>                                                                                                 \
-    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> {}
-
-    // ######################################################################
-    // Member Serialize
-    CEREAL_MAKE_HAS_MEMBER_TEST(serialize, serialize,);
-
-    // ######################################################################
-    // Member Serialize (versioned)
-    CEREAL_MAKE_HAS_MEMBER_TEST(serialize, versioned_serialize, CEREAL_MAKE_VERSIONED_TEST);
-
-    // ######################################################################
-    // Non Member Serialize
-    CEREAL_MAKE_HAS_NON_MEMBER_TEST(serialize, CEREAL_SERIALIZE_FUNCTION_NAME,);
-
-    // ######################################################################
-    // Non Member Serialize (versioned)
-    CEREAL_MAKE_HAS_NON_MEMBER_TEST(versioned_serialize, CEREAL_SERIALIZE_FUNCTION_NAME, CEREAL_MAKE_VERSIONED_TEST);
-
-    // ######################################################################
-    // Member Load
-    CEREAL_MAKE_HAS_MEMBER_TEST(load, load,);
-
-    // ######################################################################
-    // Member Load (versioned)
-    CEREAL_MAKE_HAS_MEMBER_TEST(load, versioned_load, CEREAL_MAKE_VERSIONED_TEST);
-
-    // ######################################################################
-    // Non Member Load
-    CEREAL_MAKE_HAS_NON_MEMBER_TEST(load, CEREAL_LOAD_FUNCTION_NAME,);
-
-    // ######################################################################
-    // Non Member Load (versioned)
-    CEREAL_MAKE_HAS_NON_MEMBER_TEST(versioned_load, CEREAL_LOAD_FUNCTION_NAME, CEREAL_MAKE_VERSIONED_TEST);
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_NON_MEMBER_TEST
-    #undef CEREAL_MAKE_HAS_MEMBER_TEST
-
-    // ######################################################################
-    //! Creates a test for whether a member save function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        @param test_name The name to give the test (e.g. save or versioned_save)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #ifdef CEREAL_OLDER_GCC
-    #define CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(test_name, versioned)                                                                  \
-    namespace detail                                                                                                                \
-    {                                                                                                                               \
-    template <class T, class A>                                                                                                     \
-    struct has_member_##test_name##_impl                                                                                            \
-      {                                                                                                                             \
-        template <class TT, class AA, class SFINAE = void> struct test : no {};                                                     \
-        template <class TT, class AA>                                                                                               \
-        struct test<TT, AA,                                                                                                         \
-          typename detail::Void< decltype( cereal::access::member_save( std::declval<AA&>(),                                        \
-                                                                        std::declval<TT const &>() versioned ) ) >::type> : yes {}; \
-        static const bool value = test<T, A>();                                                                                     \
-                                                                                                                                    \
-        template <class TT, class AA, class SFINAE = void> struct test2 : no {};                                                    \
-        template <class TT, class AA>                                                                                               \
-        struct test2<TT, AA,                                                                                                        \
-          typename detail::Void< decltype( cereal::access::member_save_non_const(                                                   \
-                                            std::declval<AA&>(),                                                                    \
-                                            std::declval<typename std::remove_const<TT>::type&>() versioned ) ) >::type> : yes {};  \
-        static const bool not_const_type = test2<T, A>();                                                                           \
-      };                                                                                                                            \
-    } /* end namespace detail */
-    #else /* NOT CEREAL_OLDER_GCC =================================== */
-    #define CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(test_name, versioned)                                                                  \
-    namespace detail                                                                                                                \
-    {                                                                                                                               \
-    template <class T, class A>                                                                                                     \
-    struct has_member_##test_name##_impl                                                                                            \
-      {                                                                                                                             \
-        template <class TT, class AA>                                                                                               \
-        static auto test(int) -> decltype( cereal::access::member_save( std::declval<AA&>(),                                        \
-                                                                        std::declval<TT const &>() versioned ), yes());             \
-        template <class, class> static no test(...);                                                                                \
-        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                                \
-                                                                                                                                    \
-        template <class TT, class AA>                                                                                               \
-        static auto test2(int) -> decltype( cereal::access::member_save_non_const(                                                  \
-                                              std::declval<AA &>(),                                                                 \
-                                              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());            \
-        template <class, class> static no test2(...);                                                                               \
-        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value;                                      \
-      };                                                                                                                            \
-    } /* end namespace detail */
-    #endif /* NOT CEREAL_OLDER_GCC */
-
-    // ######################################################################
-    // Member Save
-    CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(save, )
-
-    template <class T, class A>
-    struct has_member_save : std::integral_constant<bool, detail::has_member_save_impl<T, A>::value>
-    {
-      typedef typename detail::has_member_save_impl<T, A> check;
-      static_assert( check::value || !check::not_const_type,
-        "cereal detected a non-const save. \n "
-        "save member functions must always be const" );
-    };
-
-    // ######################################################################
-    // Member Save (versioned)
-    CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL(versioned_save, CEREAL_MAKE_VERSIONED_TEST)
-
-    template <class T, class A>
-    struct has_member_versioned_save : std::integral_constant<bool, detail::has_member_versioned_save_impl<T, A>::value>
-    {
-      typedef typename detail::has_member_versioned_save_impl<T, A> check;
-      static_assert( check::value || !check::not_const_type,
-        "cereal detected a versioned non-const save. \n "
-        "save member functions must always be const" );
-    };
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_IMPL
-
-    // ######################################################################
-    //! Creates a test for whether a non-member save function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper non-member function for the given archive.
-
-        @param test_name The name to give the test (e.g. save or versioned_save)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #define CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST(test_name, versioned)                                                       \
-    namespace detail                                                                                                         \
-    {                                                                                                                        \
-      template <class T, class A>                                                                                            \
-      struct has_non_member_##test_name##_impl                                                                               \
-      {                                                                                                                      \
-        template <class TT, class AA>                                                                                        \
-        static auto test(int) -> decltype( CEREAL_SAVE_FUNCTION_NAME(                                                        \
-                                              std::declval<AA&>(),                                                           \
-                                              std::declval<TT const &>() versioned ), yes());                                \
-        template <class, class> static no test(...);                                                                         \
-        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                         \
-                                                                                                                             \
-        template <class TT, class AA>                                                                                        \
-        static auto test2(int) -> decltype( CEREAL_SAVE_FUNCTION_NAME(                                                       \
-                                              std::declval<AA &>(),                                                          \
-                                              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());     \
-        template <class, class> static no test2(...);                                                                        \
-        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value;                               \
-      };                                                                                                                     \
-    } /* end namespace detail */                                                                                             \
-                                                                                                                             \
-    template <class T, class A>                                                                                              \
-    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> \
-    {                                                                                                                        \
-      using check = typename detail::has_non_member_##test_name##_impl<T, A>;                                                \
-      static_assert( check::value || !check::not_const_type,                                                                 \
-        "cereal detected a non-const type parameter in non-member " #test_name ". \n "                                       \
-        #test_name " non-member functions must always pass their types as const" );                                          \
-    };
-
-    // ######################################################################
-    // Non Member Save
-    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST(save, )
-
-    // ######################################################################
-    // Non Member Save (versioned)
-    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST(versioned_save, CEREAL_MAKE_VERSIONED_TEST)
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_NON_MEMBER_SAVE_TEST
-
-    // ######################################################################
-    // Minimal Utilities
-    namespace detail
-    {
-      // Determines if the provided type is an std::string
-      template <class> struct is_string : std::false_type {};
-
-      template <class CharT, class Traits, class Alloc>
-      struct is_string<std::basic_string<CharT, Traits, Alloc>> : std::true_type {};
-    }
-
-    // Determines if the type is valid for use with a minimal serialize function
-    template <class T>
-    struct is_minimal_type : std::integral_constant<bool,
-      detail::is_string<T>::value || std::is_arithmetic<T>::value> {};
-
-    // ######################################################################
-    //! Creates implementation details for whether a member save_minimal function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #ifdef CEREAL_OLDER_GCC
-    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(test_name, versioned)                                                                        \
-    namespace detail                                                                                                                              \
-    {                                                                                                                                             \
-      template <class T, class A>                                                                                                                 \
-      struct has_member_##test_name##_impl                                                                                                        \
-      {                                                                                                                                           \
-        template <class TT, class AA, class SFINAE = void> struct test : no {};                                                                   \
-        template <class TT, class AA>                                                                                                             \
-        struct test<TT, AA, typename detail::Void< decltype(                                                                                      \
-            cereal::access::member_save_minimal( std::declval<AA const &>(),                                                                      \
-                                                 std::declval<TT const &>() versioned ) ) >::type> : yes {};                                      \
-                                                                                                                                                  \
-        static const bool value = test<T, A>();                                                                                                   \
-                                                                                                                                                  \
-        template <class TT, class AA, class SFINAE = void> struct test2 : no {};                                                                  \
-        template <class TT, class AA>                                                                                                             \
-        struct test2<TT, AA, typename detail::Void< decltype(                                                                                     \
-            cereal::access::member_save_minimal_non_const( std::declval<AA const &>(),                                                            \
-                                                           std::declval<typename std::remove_const<TT>::type&>() versioned ) ) >::type> : yes {}; \
-        static const bool not_const_type = test2<T, A>();                                                                                         \
-                                                                                                                                                  \
-        static const bool valid = value || !not_const_type;                                                                                       \
-      };                                                                                                                                          \
-    } /* end namespace detail */
-    #else /* NOT CEREAL_OLDER_GCC =================================== */
-    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(test_name, versioned)                     \
-    namespace detail                                                                           \
-    {                                                                                          \
-      template <class T, class A>                                                              \
-      struct has_member_##test_name##_impl                                                     \
-      {                                                                                        \
-        template <class TT, class AA>                                                          \
-        static auto test(int) -> decltype( cereal::access::member_save_minimal(                \
-              std::declval<AA const &>(),                                                      \
-              std::declval<TT const &>() versioned ), yes());                                  \
-        template <class, class> static no test(...);                                           \
-        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;           \
-                                                                                               \
-        template <class TT, class AA>                                                          \
-        static auto test2(int) -> decltype( cereal::access::member_save_minimal_non_const(     \
-              std::declval<AA const &>(),                                                      \
-              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());       \
-        template <class, class> static no test2(...);                                          \
-        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value; \
-                                                                                               \
-        static const bool valid = value || !not_const_type;                                    \
-      };                                                                                       \
-    } /* end namespace detail */
-    #endif // NOT CEREAL_OLDER_GCC
-
-    // ######################################################################
-    //! Creates helpers for minimal save functions
-    /*! The get_member_*_type structs allow access to the return type of a save_minimal,
-        assuming that the function actually exists.  If the function does not
-        exist, the type will be void.
-
-        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL(test_name, versioned)                           \
-    namespace detail                                                                                         \
-    {                                                                                                        \
-      template <class T, class A, bool Valid>                                                                \
-      struct get_member_##test_name##_type { using type = void; };                                           \
-                                                                                                             \
-      template <class T, class A>                                                                            \
-      struct get_member_##test_name##_type<T, A, true>                                                       \
-      {                                                                                                      \
-        using type = decltype( cereal::access::member_save_minimal( std::declval<A const &>(),               \
-                                                                    std::declval<T const &>() versioned ) ); \
-      };                                                                                                     \
-    } /* end namespace detail */
-
-    // ######################################################################
-    //! Creates a test for whether a member save_minimal function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal) */
-    #define CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST(test_name)                                                      \
-    template <class T, class A>                                                                                      \
-    struct has_member_##test_name : std::integral_constant<bool, detail::has_member_##test_name##_impl<T, A>::value> \
-    {                                                                                                                \
-      using check = typename detail::has_member_##test_name##_impl<T, A>;                                            \
-      static_assert( check::valid,                                                                                   \
-        "cereal detected a non-const member " #test_name ". \n "                                                     \
-        #test_name " member functions must always be const" );                                                       \
-                                                                                                                     \
-      using type = typename detail::get_member_##test_name##_type<T, A, check::value>::type;                         \
-      static_assert( (check::value && is_minimal_type<type>::value) || !check::value,                                \
-        "cereal detected a member " #test_name " with an invalid return type. \n "                                   \
-        "return type must be arithmetic or string" );                                                                \
-    };
-
-    // ######################################################################
-    // Member Save Minimal
-    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(save_minimal, )
-    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL(save_minimal, )
-    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST(save_minimal)
-
-    // ######################################################################
-    // Member Save Minimal (versioned)
-    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL(versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
-    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL(versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
-    CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST(versioned_save_minimal)
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_IMPL
-    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_HELPERS_IMPL
-    #undef CEREAL_MAKE_HAS_MEMBER_SAVE_MINIMAL_TEST
-
-    // ######################################################################
-    //! Creates a test for whether a non-member save_minimal function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        @param test_name The name to give the test (e.g. save_minimal or versioned_save_minimal)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #define CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST(test_name, versioned)                                               \
-    namespace detail                                                                                                         \
-    {                                                                                                                        \
-      template <class T, class A>                                                                                            \
-      struct has_non_member_##test_name##_impl                                                                               \
-      {                                                                                                                      \
-        template <class TT, class AA>                                                                                        \
-        static auto test(int) -> decltype( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(                                                \
-              std::declval<AA const &>(),                                                                                    \
-              std::declval<TT const &>() versioned ), yes());                                                                \
-        template <class, class> static no test(...);                                                                         \
-        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;                                         \
-                                                                                                                             \
-        template <class TT, class AA>                                                                                        \
-        static auto test2(int) -> decltype( CEREAL_SAVE_MINIMAL_FUNCTION_NAME(                                               \
-              std::declval<AA const &>(),                                                                                    \
-              std::declval<typename std::remove_const<TT>::type&>() versioned ), yes());                                     \
-        template <class, class> static no test2(...);                                                                        \
-        static const bool not_const_type = std::is_same<decltype(test2<T, A>(0)), yes>::value;                               \
-                                                                                                                             \
-        static const bool valid = value || !not_const_type;                                                                  \
-      };                                                                                                                     \
-                                                                                                                             \
-      template <class T, class A, bool Valid>                                                                                \
-      struct get_non_member_##test_name##_type { using type = void; };                                                       \
-                                                                                                                             \
-      template <class T, class A>                                                                                            \
-      struct get_non_member_##test_name##_type <T, A, true>                                                                  \
-      {                                                                                                                      \
-        using type = decltype( CEREAL_SAVE_MINIMAL_FUNCTION_NAME( std::declval<A const &>(),                                 \
-                                                                  std::declval<T const &>() versioned ) );                   \
-      };                                                                                                                     \
-    } /* end namespace detail */                                                                                             \
-                                                                                                                             \
-    template <class T, class A>                                                                                              \
-    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> \
-    {                                                                                                                        \
-      using check = typename detail::has_non_member_##test_name##_impl<T, A>;                                                \
-      static_assert( check::valid,                                                                                           \
-        "cereal detected a non-const type parameter in non-member " #test_name ". \n "                                       \
-        #test_name " non-member functions must always pass their types as const" );                                          \
-                                                                                                                             \
-      using type = typename detail::get_non_member_##test_name##_type<T, A, check::value>::type;                             \
-      static_assert( (check::value && is_minimal_type<type>::value) || !check::value,                                        \
-        "cereal detected a non-member " #test_name " with an invalid return type. \n "                                       \
-        "return type must be arithmetic or string" );                                                                        \
-    };
-
-    // ######################################################################
-    // Non-Member Save Minimal
-    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST(save_minimal, )
-
-    // ######################################################################
-    // Non-Member Save Minimal (versioned)
-    CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST(versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_NON_MEMBER_SAVE_MINIMAL_TEST
-
-    // ######################################################################
-    // Load Minimal Utilities
-    namespace detail
-    {
-      //! Used to help strip away conversion wrappers
-      /*! If someone writes a non-member load/save minimal function that accepts its
-          parameter as some generic template type and needs to perform trait checks
-          on that type, our NoConvert wrappers will interfere with this.  Using
-          the struct strip_minmal, users can strip away our wrappers to get to
-          the underlying type, allowing traits to work properly */
-      struct NoConvertBase {};
-
-      //! A struct that prevents implicit conversion
-      /*! Any type instantiated with this struct will be unable to implicitly convert
-          to another type.  Is designed to only allow conversion to Source const &.
-
-          @tparam Source the type of the original source */
-      template <class Source>
-      struct NoConvertConstRef : NoConvertBase
-      {
-        using type = Source; //!< Used to get underlying type easily
-
-        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
-        operator Dest () = delete;
-
-        //! only allow conversion if the types are the same and we are converting into a const reference
-        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
-        operator Dest const & ();
-      };
-
-      //! A struct that prevents implicit conversion
-      /*! Any type instantiated with this struct will be unable to implicitly convert
-          to another type.  Is designed to only allow conversion to Source &.
-
-          @tparam Source the type of the original source */
-      template <class Source>
-      struct NoConvertRef : NoConvertBase
-      {
-        using type = Source; //!< Used to get underlying type easily
-
-        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
-        operator Dest () = delete;
-
-        #ifdef __clang__
-        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
-        operator Dest const & () = delete;
-        #endif // __clang__
-
-        //! only allow conversion if the types are the same and we are converting into a const reference
-        template <class Dest, class = typename std::enable_if<std::is_same<Source, Dest>::value>::type>
-        operator Dest & ();
-      };
-
-      //! A type that can implicitly convert to anything else
-      struct AnyConvert
-      {
-        template <class Dest>
-        operator Dest & ();
-
-        template <class Dest>
-        operator Dest const & () const;
-      };
-    } // namespace detail
-
-    // ######################################################################
-    //! Creates a test for whether a member load_minimal function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        Our strategy here is to first check if a function matching the signature more or less exists
-        (allow anything like load_minimal(xxx) using AnyConvert, and then secondly enforce
-        that it has the correct signature using NoConvertConstRef
-
-        @param test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #ifdef CEREAL_OLDER_GCC
-    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(test_name, versioned)                                                    \
-    namespace detail                                                                                                          \
-    {                                                                                                                         \
-      template <class T, class A, class SFINAE = void> struct has_member_##test_name##_impl : no {};                          \
-      template <class T, class A>                                                                                             \
-      struct has_member_##test_name##_impl<T, A, typename detail::Void< decltype(                                             \
-          cereal::access::member_load_minimal( std::declval<A const &>(),                                                     \
-                                               std::declval<T &>(), AnyConvert() versioned ) ) >::type> : yes {};             \
-                                                                                                                              \
-        template <class T, class A, class U, class SFINAE = void> struct has_member_##test_name##_type_impl : no {};          \
-        template <class T, class A, class U>                                                                                  \
-        struct has_member_##test_name##_type_impl<T, A, U, typename detail::Void< decltype(                                   \
-            cereal::access::member_load_minimal( std::declval<A const &>(),                                                   \
-                                                 std::declval<T &>(), NoConvertConstRef<U>() versioned ) ) >::type> : yes {}; \
-    } /* end namespace detail */
-    #else /* NOT CEREAL_OLDER_GCC =================================== */
-    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(test_name, versioned)              \
-    namespace detail                                                                    \
-    {                                                                                   \
-      template <class T, class A>                                                       \
-      struct has_member_##test_name##_impl                                              \
-      {                                                                                 \
-        template <class TT, class AA>                                                   \
-        static auto test(int) -> decltype( cereal::access::member_load_minimal(         \
-              std::declval<AA const &>(),                                               \
-              std::declval<TT &>(), AnyConvert() versioned ), yes());                   \
-        template <class, class> static no test(...);                                    \
-        static const bool value = std::is_same<decltype(test<T, A>(0)), yes>::value;    \
-      };                                                                                \
-      template <class T, class A, class U>                                              \
-      struct has_member_##test_name##_type_impl                                         \
-      {                                                                                 \
-        template <class TT, class AA, class UU>                                         \
-        static auto test(int) -> decltype( cereal::access::member_load_minimal(         \
-              std::declval<AA const &>(),                                               \
-              std::declval<TT &>(), NoConvertConstRef<UU>() versioned ), yes());        \
-        template <class, class, class> static no test(...);                             \
-        static const bool value = std::is_same<decltype(test<T, A, U>(0)), yes>::value; \
-                                                                                        \
-      };                                                                                \
-    } /* end namespace detail */
-    #endif // NOT CEREAL_OLDER_GCC
-
-    // ######################################################################
-    //! Creates helpers for minimal load functions
-    /*! The has_member_*_wrapper structs ensure that the load and save types for the
-        requested function type match appropriately.
-
-        @param load_test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
-        @param save_test_name The name to give the test (e.g. save_minimal or versioned_save_minimal,
-                              should match the load name.
-        @param save_test_prefix The name to give the test (e.g. save_minimal or versioned_save_minimal,
-                              should match the load name, without the trailing "_minimal" (e.g.
-                              save or versioned_save).  Needed because the preprocessor is an abomination.
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL(load_test_name, save_test_name, save_test_prefix, versioned) \
-    namespace detail                                                                                                      \
-    {                                                                                                                     \
-      template <class T, class A, bool Valid>                                                                             \
-      struct has_member_##load_test_name##_wrapper : std::false_type {};                                                  \
-                                                                                                                          \
-      template <class T, class A>                                                                                         \
-      struct has_member_##load_test_name##_wrapper<T, A, true>                                                            \
-      {                                                                                                                   \
-        using AOut = typename detail::get_output_from_input<A>::type;                                                     \
-                                                                                                                          \
-        static_assert( has_member_##save_test_prefix##_minimal<T, AOut>::value,                                           \
-          "cereal detected member " #load_test_name " but no valid member " #save_test_name ". \n "                       \
-          "cannot evaluate correctness of " #load_test_name " without valid " #save_test_name "." );                      \
-                                                                                                                          \
-        using SaveType = typename detail::get_member_##save_test_prefix##_minimal_type<T, AOut, true>::type;              \
-        const static bool value = has_member_##load_test_name##_impl<T, A>::value;                                        \
-        const static bool valid = has_member_##load_test_name##_type_impl<T, A, SaveType>::value;                         \
-                                                                                                                          \
-        static_assert( valid || !value, "cereal detected different or invalid types in corresponding member "             \
-            #load_test_name " and " #save_test_name " functions. \n "                                                     \
-            "the paramater to " #load_test_name " must be a constant reference to the type that "                         \
-            #save_test_name " returns." );                                                                                \
-      };                                                                                                                  \
-    } /* end namespace detail */
-
-    // ######################################################################
-    //! Creates a test for whether a member load_minimal function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        @param load_test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
-        @param load_test_prefix The above parameter minus the trailing "_minimal" */
-    #define CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST(load_test_name, load_test_prefix)                                         \
-    template <class T, class A>                                                                                                \
-    struct has_member_##load_test_prefix##_minimal : std::integral_constant<bool,                                              \
-      detail::has_member_##load_test_name##_wrapper<T, A, detail::has_member_##load_test_name##_impl<T, A>::value>::value> {};
-
-    // ######################################################################
-    // Member Load Minimal
-    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(load_minimal, )
-    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL(load_minimal, save_minimal, save, )
-    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST(load_minimal, load)
-
-    // ######################################################################
-    // Member Load Minimal (versioned)
-    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL(versioned_load_minimal, CEREAL_MAKE_VERSIONED_TEST)
-    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL(versioned_load_minimal, versioned_save_minimal, versioned_save, CEREAL_MAKE_VERSIONED_TEST)
-    CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST(versioned_load_minimal, versioned_load)
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_IMPL
-    #undef CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_HELPERS_IMPL
-    #undef CEREAL_MAKE_HAS_MEMBER_LOAD_MINIMAL_TEST
-
-    // ######################################################################
-    // Non-Member Load Minimal
-    namespace detail
-    {
-      #ifdef CEREAL_OLDER_GCC
-      void CEREAL_LOAD_MINIMAL_FUNCTION_NAME(); // prevents nonsense complaining about not finding this
-      void CEREAL_SAVE_MINIMAL_FUNCTION_NAME();
-      #endif // CEREAL_OLDER_GCC
-    } // namespace detail
-
-    // ######################################################################
-    //! Creates a test for whether a non-member load_minimal function exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper member function for the given archive.
-
-        See notes from member load_minimal implementation.
-
-        @param test_name The name to give the test (e.g. load_minimal or versioned_load_minimal)
-        @param save_name The corresponding name the save test would have (e.g. save_minimal or versioned_save_minimal)
-        @param versioned Either blank or the macro CEREAL_MAKE_VERSIONED_TEST */
-    #define CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST(test_name, save_name, versioned)                                    \
-    namespace detail                                                                                                         \
-    {                                                                                                                        \
-      template <class T, class A, class U = void>                                                                            \
-      struct has_non_member_##test_name##_impl                                                                               \
-      {                                                                                                                      \
-        template <class TT, class AA>                                                                                        \
-        static auto test(int) -> decltype( CEREAL_LOAD_MINIMAL_FUNCTION_NAME(                                                \
-              std::declval<AA const &>(), std::declval<TT&>(), AnyConvert() versioned ), yes() );                            \
-        template <class, class> static no test( ... );                                                                       \
-        static const bool exists = std::is_same<decltype( test<T, A>( 0 ) ), yes>::value;                                    \
-                                                                                                                             \
-        template <class TT, class AA, class UU>                                                                              \
-        static auto test2(int) -> decltype( CEREAL_LOAD_MINIMAL_FUNCTION_NAME(                                               \
-              std::declval<AA const &>(), std::declval<TT&>(), NoConvertConstRef<UU>() versioned ), yes() );                 \
-        template <class, class, class> static no test2( ... );                                                               \
-        static const bool valid = std::is_same<decltype( test2<T, A, U>( 0 ) ), yes>::value;                                 \
-                                                                                                                             \
-        template <class TT, class AA>                                                                                        \
-        static auto test3(int) -> decltype( CEREAL_LOAD_MINIMAL_FUNCTION_NAME(                                               \
-              std::declval<AA const &>(), NoConvertRef<TT>(), AnyConvert() versioned ), yes() );                             \
-        template <class, class> static no test3( ... );                                                                      \
-        static const bool const_valid = std::is_same<decltype( test3<T, A>( 0 ) ), yes>::value;                              \
-      };                                                                                                                     \
-                                                                                                                             \
-      template <class T, class A, bool Valid>                                                                                \
-      struct has_non_member_##test_name##_wrapper : std::false_type {};                                                      \
-                                                                                                                             \
-      template <class T, class A>                                                                                            \
-      struct has_non_member_##test_name##_wrapper<T, A, true>                                                                \
-      {                                                                                                                      \
-        using AOut = typename detail::get_output_from_input<A>::type;                                                        \
-                                                                                                                             \
-        static_assert( detail::has_non_member_##save_name##_impl<T, AOut>::valid,                                            \
-          "cereal detected non-member " #test_name " but no valid non-member " #save_name ". \n "                            \
-          "cannot evaluate correctness of " #test_name " without valid " #save_name "." );                                   \
-                                                                                                                             \
-        using SaveType = typename detail::get_non_member_##save_name##_type<T, AOut, true>::type;                            \
-        using check = has_non_member_##test_name##_impl<T, A, SaveType>;                                                     \
-        static const bool value = check::exists;                                                                             \
-                                                                                                                             \
-        static_assert( check::valid || !check::exists, "cereal detected different types in corresponding non-member "        \
-            #test_name " and " #save_name " functions. \n "                                                                  \
-            "the paramater to " #test_name " must be a constant reference to the type that " #save_name " returns." );       \
-        static_assert( check::const_valid || !check::exists,                                                                 \
-            "cereal detected an invalid serialization type parameter in non-member " #test_name ".  "                        \
-            #test_name " non-member functions must accept their serialization type by non-const reference" );                \
-      };                                                                                                                     \
-    } /* namespace detail */                                                                                                 \
-                                                                                                                             \
-    template <class T, class A>                                                                                              \
-    struct has_non_member_##test_name : std::integral_constant<bool,                                                         \
-      detail::has_non_member_##test_name##_wrapper<T, A, detail::has_non_member_##test_name##_impl<T, A>::exists>::value> {};
-
-    // ######################################################################
-    // Non-Member Load Minimal
-    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST(load_minimal, save_minimal, )
-
-    // ######################################################################
-    // Non-Member Load Minimal (versioned)
-    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST(versioned_load_minimal, versioned_save_minimal, CEREAL_MAKE_VERSIONED_TEST)
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_NON_MEMBER_LOAD_MINIMAL_TEST
-
-    // ######################################################################
-    //! Member load and construct check
-    template<typename T, typename A>
-    struct has_member_load_and_construct : std::integral_constant<bool,
-      std::is_same<decltype( access::load_and_construct<T>( std::declval<A&>(), std::declval< ::cereal::construct<T>&>() ) ), void>::value>
-    { };
-
-    // ######################################################################
-    //! Member load and construct check (versioned)
-    template<typename T, typename A>
-    struct has_member_versioned_load_and_construct : std::integral_constant<bool,
-      std::is_same<decltype( access::load_and_construct<T>( std::declval<A&>(), std::declval< ::cereal::construct<T>&>(), 0 ) ), void>::value>
-    { };
-
-    // ######################################################################
-    //! Creates a test for whether a non-member load_and_construct specialization exists
-    /*! This creates a class derived from std::integral_constant that will be true if
-        the type has the proper non-member function for the given archive. */
-    #define CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST(test_name, versioned)                                            \
-    namespace detail                                                                                                            \
-    {                                                                                                                           \
-      template <class T, class A>                                                                                               \
-      struct has_non_member_##test_name##_impl                                                                                  \
-      {                                                                                                                         \
-        template <class TT, class AA>                                                                                           \
-        static auto test(int) -> decltype( LoadAndConstruct<TT>::load_and_construct(                                            \
-                                           std::declval<AA&>(), std::declval< ::cereal::construct<TT>&>() versioned ), yes());  \
-        template <class, class>                                                                                                 \
-        static no test( ... );                                                                                                  \
-        static const bool value = std::is_same<decltype( test<T, A>( 0 ) ), yes>::value;                                        \
-      };                                                                                                                        \
-    } /* end namespace detail */                                                                                                \
-    template <class T, class A>                                                                                                 \
-    struct has_non_member_##test_name : std::integral_constant<bool, detail::has_non_member_##test_name##_impl<T, A>::value> {};
-
-    // ######################################################################
-    //! Non member load and construct check
-    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST(load_and_construct, )
-
-    // ######################################################################
-    //! Non member load and construct check (versioned)
-    CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST(versioned_load_and_construct, CEREAL_MAKE_VERSIONED_TEST)
-
-    // ######################################################################
-    //! Has either a member or non member load and construct
-    template<typename T, typename A>
-    struct has_load_and_construct : std::integral_constant<bool,
-      has_member_load_and_construct<T, A>::value || has_non_member_load_and_construct<T, A>::value ||
-      has_member_versioned_load_and_construct<T, A>::value || has_non_member_versioned_load_and_construct<T, A>::value>
-    { };
-
-    // ######################################################################
-    #undef CEREAL_MAKE_HAS_NON_MEMBER_LOAD_AND_CONSTRUCT_TEST
-
-    // ######################################################################
-    // End of serialization existence tests
-    #undef CEREAL_MAKE_VERSIONED_TEST
-
-    // ######################################################################
-    template <class T, class InputArchive, class OutputArchive>
-    struct has_member_split : std::integral_constant<bool,
-      (has_member_load<T, InputArchive>::value && has_member_save<T, OutputArchive>::value) ||
-      (has_member_versioned_load<T, InputArchive>::value && has_member_versioned_save<T, OutputArchive>::value)> {};
-
-    // ######################################################################
-    template <class T, class InputArchive, class OutputArchive>
-    struct has_non_member_split : std::integral_constant<bool,
-      (has_non_member_load<T, InputArchive>::value && has_non_member_save<T, OutputArchive>::value) ||
-      (has_non_member_versioned_load<T, InputArchive>::value && has_non_member_versioned_save<T, OutputArchive>::value)> {};
-
-    // ######################################################################
-    template <class T, class OutputArchive>
-    struct has_invalid_output_versioning : std::integral_constant<bool,
-      (has_member_versioned_save<T, OutputArchive>::value && has_member_save<T, OutputArchive>::value) ||
-      (has_non_member_versioned_save<T, OutputArchive>::value && has_non_member_save<T, OutputArchive>::value) ||
-      (has_member_versioned_serialize<T, OutputArchive>::value && has_member_serialize<T, OutputArchive>::value) ||
-      (has_non_member_versioned_serialize<T, OutputArchive>::value && has_non_member_serialize<T, OutputArchive>::value) ||
-      (has_member_versioned_save_minimal<T, OutputArchive>::value && has_member_save_minimal<T, OutputArchive>::value) ||
-      (has_non_member_versioned_save_minimal<T, OutputArchive>::value &&  has_non_member_save_minimal<T, OutputArchive>::value)> {};
-
-    // ######################################################################
-    template <class T, class InputArchive>
-    struct has_invalid_input_versioning : std::integral_constant<bool,
-      (has_member_versioned_load<T, InputArchive>::value && has_member_load<T, InputArchive>::value) ||
-      (has_non_member_versioned_load<T, InputArchive>::value && has_non_member_load<T, InputArchive>::value) ||
-      (has_member_versioned_serialize<T, InputArchive>::value && has_member_serialize<T, InputArchive>::value) ||
-      (has_non_member_versioned_serialize<T, InputArchive>::value && has_non_member_serialize<T, InputArchive>::value) ||
-      (has_member_versioned_load_minimal<T, InputArchive>::value && has_member_load_minimal<T, InputArchive>::value) ||
-      (has_non_member_versioned_load_minimal<T, InputArchive>::value &&  has_non_member_load_minimal<T, InputArchive>::value)> {};
-
-    // ######################################################################
-    namespace detail
-    {
-      //! Create a test for a cereal::specialization entry
-      #define CEREAL_MAKE_IS_SPECIALIZED_IMPL(name)                                          \
-      template <class T, class A>                                                            \
-      struct is_specialized_##name : std::integral_constant<bool,                            \
-        !std::is_base_of<std::false_type, specialize<A, T, specialization::name>>::value> {}
-
-      CEREAL_MAKE_IS_SPECIALIZED_IMPL(member_serialize);
-      CEREAL_MAKE_IS_SPECIALIZED_IMPL(member_load_save);
-      CEREAL_MAKE_IS_SPECIALIZED_IMPL(member_load_save_minimal);
-      CEREAL_MAKE_IS_SPECIALIZED_IMPL(non_member_serialize);
-      CEREAL_MAKE_IS_SPECIALIZED_IMPL(non_member_load_save);
-      CEREAL_MAKE_IS_SPECIALIZED_IMPL(non_member_load_save_minimal);
-
-      #undef CEREAL_MAKE_IS_SPECIALIZED_IMPL
-
-      //! Number of specializations detected
-      template <class T, class A>
-      struct count_specializations : std::integral_constant<int,
-        is_specialized_member_serialize<T, A>::value +
-        is_specialized_member_load_save<T, A>::value +
-        is_specialized_member_load_save_minimal<T, A>::value +
-        is_specialized_non_member_serialize<T, A>::value +
-        is_specialized_non_member_load_save<T, A>::value +
-        is_specialized_non_member_load_save_minimal<T, A>::value> {};
-    } // namespace detail
-
-    //! Check if any specialization exists for a type
-    template <class T, class A>
-    struct is_specialized : std::integral_constant<bool,
-      detail::is_specialized_member_serialize<T, A>::value ||
-      detail::is_specialized_member_load_save<T, A>::value ||
-      detail::is_specialized_member_load_save_minimal<T, A>::value ||
-      detail::is_specialized_non_member_serialize<T, A>::value ||
-      detail::is_specialized_non_member_load_save<T, A>::value ||
-      detail::is_specialized_non_member_load_save_minimal<T, A>::value>
-    {
-      static_assert(detail::count_specializations<T, A>::value <= 1, "More than one explicit specialization detected for type.");
-    };
-
-    //! Create the static assertion for some specialization
-    /*! This assertion will fail if the type is indeed specialized and does not have the appropriate
-        type of serialization functions */
-    #define CEREAL_MAKE_IS_SPECIALIZED_ASSERT(name, versioned_name, print_name, spec_name)                      \
-    static_assert( (is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value &&           \
-                   (has_##name<T, A>::value || has_##versioned_name<T, A>::value))                              \
-                   || !(is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value),        \
-                   "cereal detected " #print_name " specialization but no " #print_name " serialize function" )
-
-    //! Generates a test for specialization for versioned and unversioned functions
-    /*! This creates checks that can be queried to see if a given type of serialization function
-        has been specialized for this type */
-    #define CEREAL_MAKE_IS_SPECIALIZED(name, versioned_name, spec_name)                     \
-    template <class T, class A>                                                             \
-    struct is_specialized_##name : std::integral_constant<bool,                             \
-      is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value>       \
-    { CEREAL_MAKE_IS_SPECIALIZED_ASSERT(name, versioned_name, name, spec_name); };          \
-    template <class T, class A>                                                             \
-    struct is_specialized_##versioned_name : std::integral_constant<bool,                   \
-      is_specialized<T, A>::value && detail::is_specialized_##spec_name<T, A>::value>       \
-    { CEREAL_MAKE_IS_SPECIALIZED_ASSERT(name, versioned_name, versioned_name, spec_name); }
-
-    CEREAL_MAKE_IS_SPECIALIZED(member_serialize, member_versioned_serialize, member_serialize);
-    CEREAL_MAKE_IS_SPECIALIZED(non_member_serialize, non_member_versioned_serialize, non_member_serialize);
-
-    CEREAL_MAKE_IS_SPECIALIZED(member_save, member_versioned_save, member_load_save);
-    CEREAL_MAKE_IS_SPECIALIZED(non_member_save, non_member_versioned_save, non_member_load_save);
-    CEREAL_MAKE_IS_SPECIALIZED(member_load, member_versioned_load, member_load_save);
-    CEREAL_MAKE_IS_SPECIALIZED(non_member_load, non_member_versioned_load, non_member_load_save);
-
-    CEREAL_MAKE_IS_SPECIALIZED(member_save_minimal, member_versioned_save_minimal, member_load_save_minimal);
-    CEREAL_MAKE_IS_SPECIALIZED(non_member_save_minimal, non_member_versioned_save_minimal, non_member_load_save_minimal);
-    CEREAL_MAKE_IS_SPECIALIZED(member_load_minimal, member_versioned_load_minimal, member_load_save_minimal);
-    CEREAL_MAKE_IS_SPECIALIZED(non_member_load_minimal, non_member_versioned_load_minimal, non_member_load_save_minimal);
-
-    #undef CEREAL_MAKE_IS_SPECIALIZED_ASSERT
-    #undef CEREAL_MAKE_IS_SPECIALIZED
-
-    // ######################################################################
-    // detects if a type has any active minimal output serialization
-    template <class T, class OutputArchive>
-    struct has_minimal_output_serialization : std::integral_constant<bool,
-      is_specialized_member_save_minimal<T, OutputArchive>::value ||
-      ((has_member_save_minimal<T, OutputArchive>::value ||
-        has_non_member_save_minimal<T, OutputArchive>::value ||
-        has_member_versioned_save_minimal<T, OutputArchive>::value ||
-        has_non_member_versioned_save_minimal<T, OutputArchive>::value) &&
-       !(is_specialized_member_serialize<T, OutputArchive>::value ||
-         is_specialized_member_save<T, OutputArchive>::value))> {};
-
-    // ######################################################################
-    // detects if a type has any active minimal input serialization
-    template <class T, class InputArchive>
-    struct has_minimal_input_serialization : std::integral_constant<bool,
-      is_specialized_member_load_minimal<T, InputArchive>::value ||
-      ((has_member_load_minimal<T, InputArchive>::value ||
-        has_non_member_load_minimal<T, InputArchive>::value ||
-        has_member_versioned_load_minimal<T, InputArchive>::value ||
-        has_non_member_versioned_load_minimal<T, InputArchive>::value) &&
-       !(is_specialized_member_serialize<T, InputArchive>::value ||
-         is_specialized_member_load<T, InputArchive>::value))> {};
-
-    // ######################################################################
-    namespace detail
-    {
-      //! The number of output serialization functions available
-      /*! If specialization is being used, we'll count only those; otherwise we'll count everything */
-      template <class T, class OutputArchive>
-      struct count_output_serializers : std::integral_constant<int,
-        count_specializations<T, OutputArchive>::value ? count_specializations<T, OutputArchive>::value :
-        has_member_save<T, OutputArchive>::value +
-        has_non_member_save<T, OutputArchive>::value +
-        has_member_serialize<T, OutputArchive>::value +
-        has_non_member_serialize<T, OutputArchive>::value +
-        has_member_save_minimal<T, OutputArchive>::value +
-        has_non_member_save_minimal<T, OutputArchive>::value +
-        /*-versioned---------------------------------------------------------*/
-        has_member_versioned_save<T, OutputArchive>::value +
-        has_non_member_versioned_save<T, OutputArchive>::value +
-        has_member_versioned_serialize<T, OutputArchive>::value +
-        has_non_member_versioned_serialize<T, OutputArchive>::value +
-        has_member_versioned_save_minimal<T, OutputArchive>::value +
-        has_non_member_versioned_save_minimal<T, OutputArchive>::value> {};
-    }
-
-    template <class T, class OutputArchive>
-    struct is_output_serializable : std::integral_constant<bool,
-      detail::count_output_serializers<T, OutputArchive>::value == 1> {};
-
-    // ######################################################################
-    namespace detail
-    {
-      //! The number of input serialization functions available
-      /*! If specialization is being used, we'll count only those; otherwise we'll count everything */
-      template <class T, class InputArchive>
-      struct count_input_serializers : std::integral_constant<int,
-        count_specializations<T, InputArchive>::value ? count_specializations<T, InputArchive>::value :
-        has_member_load<T, InputArchive>::value +
-        has_non_member_load<T, InputArchive>::value +
-        has_member_serialize<T, InputArchive>::value +
-        has_non_member_serialize<T, InputArchive>::value +
-        has_member_load_minimal<T, InputArchive>::value +
-        has_non_member_load_minimal<T, InputArchive>::value +
-        /*-versioned---------------------------------------------------------*/
-        has_member_versioned_load<T, InputArchive>::value +
-        has_non_member_versioned_load<T, InputArchive>::value +
-        has_member_versioned_serialize<T, InputArchive>::value +
-        has_non_member_versioned_serialize<T, InputArchive>::value +
-        has_member_versioned_load_minimal<T, InputArchive>::value +
-        has_non_member_versioned_load_minimal<T, InputArchive>::value> {};
-    }
-
-    template <class T, class InputArchive>
-    struct is_input_serializable : std::integral_constant<bool,
-      detail::count_input_serializers<T, InputArchive>::value == 1> {};
-
-    // ######################################################################
-    // Base Class Support
-    namespace detail
-    {
-      struct base_class_id
-      {
-        template<class T>
-          base_class_id(T const * const t) :
-          type(typeid(T)),
-          ptr(t),
-          hash(std::hash<std::type_index>()(typeid(T)) ^ (std::hash<void const *>()(t) << 1))
-          { }
-
-          bool operator==(base_class_id const & other) const
-          { return (type == other.type) && (ptr == other.ptr); }
-
-          std::type_index type;
-          void const * ptr;
-          size_t hash;
-      };
-      struct base_class_id_hash { size_t operator()(base_class_id const & id) const { return id.hash; }  };
-    } // namespace detail
-
-    namespace detail
-    {
-      //! Common base type for base class casting
-      struct BaseCastBase {};
-
-      template <class>
-      struct get_base_class;
-
-      template <template<typename> class Cast, class Base>
-      struct get_base_class<Cast<Base>>
-      {
-        using type = Base;
-      };
-
-      //! Base class cast, behave as the test
-      template <class Cast, template<class, class> class Test, class Archive,
-                bool IsBaseCast = std::is_base_of<BaseCastBase, Cast>::value>
-      struct has_minimal_base_class_serialization_impl : Test<typename get_base_class<Cast>::type, Archive>
-      { };
-
-      //! Not a base class cast
-      template <class Cast, template<class, class> class Test, class Archive>
-      struct has_minimal_base_class_serialization_impl<Cast,Test, Archive, false> : std::false_type
-      { };
-    }
-
-    //! Checks to see if the base class used in a cast has a minimal serialization
-    /*! @tparam Cast Either base_class or virtual_base_class wrapped type
-        @tparam Test A has_minimal test (for either input or output)
-        @tparam Archive The archive to use with the test */
-    template <class Cast, template<class, class> class Test, class Archive>
-    struct has_minimal_base_class_serialization : detail::has_minimal_base_class_serialization_impl<Cast, Test, Archive>
-    { };
-
-
-    // ######################################################################
-    namespace detail
-    {
-      struct shared_from_this_wrapper
-      {
-        template <class U>
-        static auto (check)( U const & t ) -> decltype( ::cereal::access::shared_from_this(t), std::true_type() );
-
-        static auto (check)( ... ) -> decltype( std::false_type() );
-
-        template <class U>
-        static auto get( U const & t ) -> decltype( t.shared_from_this() );
-      };
-    }
-
-    //! Determine if T or any base class of T has inherited from std::enable_shared_from_this
-    template<class T>
-    struct has_shared_from_this : decltype((detail::shared_from_this_wrapper::check)(std::declval<T>()))
-    { };
-
-    //! Get the type of the base class of T which inherited from std::enable_shared_from_this
-    template <class T>
-    struct get_shared_from_this_base
-    {
-      private:
-        using PtrType = decltype(detail::shared_from_this_wrapper::get(std::declval<T>()));
-      public:
-        //! The type of the base of T that inherited from std::enable_shared_from_this
-        using type = typename std::decay<typename PtrType::element_type>::type;
-    };
-
-    // ######################################################################
-    //! Extracts the true type from something possibly wrapped in a cereal NoConvert
-    /*! Internally cereal uses some wrapper classes to test the validity of non-member
-        minimal load and save functions.  This can interfere with user type traits on
-        templated load and save minimal functions.  To get to the correct underlying type,
-        users should use strip_minimal when performing any enable_if type type trait checks.
-
-        See the enum serialization in types/common.hpp for an example of using this */
-    template <class T, bool IsCerealMinimalTrait = std::is_base_of<detail::NoConvertBase, T>::value>
-    struct strip_minimal
-    {
-      using type = T;
-    };
-
-    //! Specialization for types wrapped in a NoConvert
-    template <class T>
-    struct strip_minimal<T, true>
-    {
-      using type = typename T::type;
-    };
-
-    // ######################################################################
-    //! Determines whether the class T can be default constructed by cereal::access
-    template <class T>
-    struct is_default_constructible
-    {
-      #ifdef CEREAL_OLDER_GCC
-      template <class TT, class SFINAE = void>
-      struct test : no {};
-      template <class TT>
-      struct test<TT, typename detail::Void< decltype( cereal::access::construct<TT>() ) >::type> : yes {};
-      static const bool value = test<T>();
-      #else // NOT CEREAL_OLDER_GCC =========================================
-      template <class TT>
-      static auto test(int) -> decltype( cereal::access::construct<TT>(), yes());
-      template <class>
-      static no test(...);
-      static const bool value = std::is_same<decltype(test<T>(0)), yes>::value;
-      #endif // NOT CEREAL_OLDER_GCC
-    };
-
-    // ######################################################################
-    namespace detail
-    {
-      //! Removes all qualifiers and minimal wrappers from an archive
-      template <class A>
-      using decay_archive = typename std::decay<typename strip_minimal<A>::type>::type;
-    }
-
-    //! Checks if the provided archive type is equal to some cereal archive type
-    /*! This automatically does things such as std::decay and removing any other wrappers that may be
-        on the Archive template parameter.
-
-        Example use:
-        @code{cpp}
-        // example use to disable a serialization function
-        template <class Archive, EnableIf<cereal::traits::is_same_archive<Archive, cereal::BinaryOutputArchive>::value> = sfinae>
-        void save( Archive & ar, MyType const & mt );
-        @endcode */
-    template <class ArchiveT, class CerealArchiveT>
-    struct is_same_archive : std::integral_constant<bool,
-      std::is_same<detail::decay_archive<ArchiveT>, CerealArchiveT>::value>
-    { };
-
-    // ######################################################################
-    //! A macro to use to restrict which types of archives your function will work for.
-    /*! This requires you to have a template class parameter named Archive and replaces the void return
-        type for your function.
-
-        INTYPE refers to the input archive type you wish to restrict on.
-        OUTTYPE refers to the output archive type you wish to restrict on.
-
-        For example, if we want to limit a serialize to only work with binary serialization:
-
-        @code{.cpp}
-        template <class Archive>
-        CEREAL_ARCHIVE_RESTRICT(BinaryInputArchive, BinaryOutputArchive)
-        serialize( Archive & ar, MyCoolType & m )
-        {
-          ar & m;
-        }
-        @endcode
-
-        If you need to do more restrictions in your enable_if, you will need to do this by hand.
-     */
-    #define CEREAL_ARCHIVE_RESTRICT(INTYPE, OUTTYPE) \
-    typename std::enable_if<cereal::traits::is_same_archive<Archive, INTYPE>::value || cereal::traits::is_same_archive<Archive, OUTTYPE>::value, void>::type
-
-    //! Type traits only struct used to mark an archive as human readable (text based)
-    /*! Archives that wish to identify as text based/human readable should inherit from
-        this struct */
-    struct TextArchive {};
-
-    //! Checks if an archive is a text archive (human readable)
-    template <class A>
-    struct is_text_archive : std::integral_constant<bool,
-      std::is_base_of<TextArchive, detail::decay_archive<A>>::value>
-    { };
-  } // namespace traits
-
-  // ######################################################################
-  namespace detail
-  {
-    template <class T, class A,
-              bool Member = traits::has_member_load_and_construct<T, A>::value,
-              bool MemberVersioned = traits::has_member_versioned_load_and_construct<T, A>::value,
-              bool NonMember = traits::has_non_member_load_and_construct<T, A>::value,
-              bool NonMemberVersioned = traits::has_non_member_versioned_load_and_construct<T, A>::value>
-    struct Construct
-    {
-      static_assert( cereal::traits::detail::delay_static_assert<T>::value,
-        "cereal found more than one compatible load_and_construct function for the provided type and archive combination. \n\n "
-        "Types must either have a member load_and_construct function or a non-member specialization of LoadAndConstruct (you may not mix these). \n "
-        "In addition, you may not mix versioned with non-versioned load_and_construct functions. \n\n " );
-      static T * load_andor_construct( A & /*ar*/, construct<T> & /*construct*/ )
-      { return nullptr; }
-    };
-
-    // no load and construct case
-    template <class T, class A>
-    struct Construct<T, A, false, false, false, false>
-    {
-      static_assert( ::cereal::traits::is_default_constructible<T>::value,
-                     "Trying to serialize a an object with no default constructor. \n\n "
-                     "Types must either be default constructible or define either a member or non member Construct function. \n "
-                     "Construct functions generally have the signature: \n\n "
-                     "template <class Archive> \n "
-                     "static void load_and_construct(Archive & ar, cereal::construct<T> & construct) \n "
-                     "{ \n "
-                     "  var a; \n "
-                     "  ar( a ) \n "
-                     "  construct( a ); \n "
-                     "} \n\n" );
-      static T * load_andor_construct()
-      { return ::cereal::access::construct<T>(); }
-    };
-
-    // member non-versioned
-    template <class T, class A>
-    struct Construct<T, A, true, false, false, false>
-    {
-      static void load_andor_construct( A & ar, construct<T> & construct )
-      {
-        access::load_and_construct<T>( ar, construct );
-      }
-    };
-
-    // member versioned
-    template <class T, class A>
-    struct Construct<T, A, false, true, false, false>
-    {
-      static void load_andor_construct( A & ar, construct<T> & construct )
-      {
-        const auto version = ar.template loadClassVersion<T>();
-        access::load_and_construct<T>( ar, construct, version );
-      }
-    };
-
-    // non-member non-versioned
-    template <class T, class A>
-    struct Construct<T, A, false, false, true, false>
-    {
-      static void load_andor_construct( A & ar, construct<T> & construct )
-      {
-        LoadAndConstruct<T>::load_and_construct( ar, construct );
-      }
-    };
-
-    // non-member versioned
-    template <class T, class A>
-    struct Construct<T, A, false, false, false, true>
-    {
-      static void load_andor_construct( A & ar, construct<T> & construct )
-      {
-        const auto version = ar.template loadClassVersion<T>();
-        LoadAndConstruct<T>::load_and_construct( ar, construct, version );
-      }
-    };
-  } // namespace detail
-} // namespace cereal
-
-#endif // CEREAL_DETAILS_TRAITS_HPP_
diff --git a/Src/External/cereal/include/cereal/details/util.hpp b/Src/External/cereal/include/cereal/details/util.hpp
deleted file mode 100644
index ba24813..0000000
--- a/Src/External/cereal/include/cereal/details/util.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*! \file util.hpp
-    \brief Internal misc utilities
-    \ingroup Internal */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_DETAILS_UTIL_HPP_
-#define CEREAL_DETAILS_UTIL_HPP_
-
-#include <typeinfo>
-#include <string>
-
-#ifdef _MSC_VER
-namespace cereal
-{
-  namespace util
-  {
-    //! Demangles the type encoded in a string
-    /*! @internal */
-    inline std::string demangle( std::string const & name )
-    { return name; }
-
-    //! Gets the demangled name of a type
-    /*! @internal */
-    template <class T> inline
-    std::string demangledName()
-    { return typeid( T ).name(); }
-  } // namespace util
-} // namespace cereal
-#else // clang or gcc
-#include <cxxabi.h>
-#include <cstdlib>
-namespace cereal
-{
-  namespace util
-  {
-    //! Demangles the type encoded in a string
-    /*! @internal */
-    inline std::string demangle(std::string mangledName)
-    {
-      int status = 0;
-      char *demangledName = nullptr;
-      std::size_t len;
-
-      demangledName = abi::__cxa_demangle(mangledName.c_str(), 0, &len, &status);
-
-      std::string retName(demangledName);
-      free(demangledName);
-
-      return retName;
-    }
-
-    //! Gets the demangled name of a type
-    /*! @internal */
-    template<class T> inline
-    std::string demangledName()
-    { return demangle(typeid(T).name()); }
-  }
-} // namespace cereal
-#endif // clang or gcc branch of _MSC_VER
-#endif // CEREAL_DETAILS_UTIL_HPP_
diff --git a/Src/External/cereal/include/cereal/external/base64.hpp b/Src/External/cereal/include/cereal/external/base64.hpp
deleted file mode 100644
index 7eee003..0000000
--- a/Src/External/cereal/include/cereal/external/base64.hpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-   Copyright (C) 2004-2008 René Nyffenegger
-
-   This source code is provided 'as-is', without any express or implied
-   warranty. In no event will the author be held liable for any damages
-   arising from the use of this software.
-
-   Permission is granted to anyone to use this software for any purpose,
-   including commercial applications, and to alter it and redistribute it
-   freely, subject to the following restrictions:
-
-   1. The origin of this source code must not be misrepresented; you must not
-      claim that you wrote the original source code. If you use this source code
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original source code.
-
-   3. This notice may not be removed or altered from any source distribution.
-
-   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
-*/
-
-#ifndef CEREAL_EXTERNAL_BASE64_HPP_
-#define CEREAL_EXTERNAL_BASE64_HPP_
-
-#include <string>
-
-namespace cereal
-{
-  namespace base64
-  {
-    static const std::string chars =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-      "abcdefghijklmnopqrstuvwxyz"
-      "0123456789+/";
-
-    static inline bool is_base64(unsigned char c) {
-      return (isalnum(c) || (c == '+') || (c == '/'));
-    }
-
-    inline std::string encode(unsigned char const* bytes_to_encode, size_t in_len) {
-      std::string ret;
-      int i = 0;
-      int j = 0;
-      unsigned char char_array_3[3];
-      unsigned char char_array_4[4];
-
-      while (in_len--) {
-        char_array_3[i++] = *(bytes_to_encode++);
-        if (i == 3) {
-          char_array_4[0] = static_cast<unsigned char>((char_array_3[0] & 0xfc) >> 2);
-          char_array_4[1] = static_cast<unsigned char>( ( ( char_array_3[0] & 0x03 ) << 4 ) + ( ( char_array_3[1] & 0xf0 ) >> 4 ) );
-          char_array_4[2] = static_cast<unsigned char>( ( ( char_array_3[1] & 0x0f ) << 2 ) + ( ( char_array_3[2] & 0xc0 ) >> 6 ) );
-          char_array_4[3] = static_cast<unsigned char>( char_array_3[2] & 0x3f );
-
-          for(i = 0; (i <4) ; i++)
-            ret += chars[char_array_4[i]];
-          i = 0;
-        }
-      }
-
-      if (i)
-      {
-        for(j = i; j < 3; j++)
-          char_array_3[j] = '\0';
-
-        char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
-        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
-        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
-        char_array_4[3] = char_array_3[2] & 0x3f;
-
-        for (j = 0; (j < i + 1); j++)
-          ret += chars[char_array_4[j]];
-
-        while((i++ < 3))
-          ret += '=';
-      }
-
-      return ret;
-    }
-
-    inline std::string decode(std::string const& encoded_string) {
-      size_t in_len = encoded_string.size();
-      size_t i = 0;
-      size_t j = 0;
-      int in_ = 0;
-      unsigned char char_array_4[4], char_array_3[3];
-      std::string ret;
-
-      while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
-        char_array_4[i++] = encoded_string[in_]; in_++;
-        if (i ==4) {
-          for (i = 0; i <4; i++)
-            char_array_4[i] = static_cast<unsigned char>(chars.find( char_array_4[i] ));
-
-          char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-          char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-          char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-          for (i = 0; (i < 3); i++)
-            ret += char_array_3[i];
-          i = 0;
-        }
-      }
-
-      if (i) {
-        for (j = i; j <4; j++)
-          char_array_4[j] = 0;
-
-        for (j = 0; j <4; j++)
-          char_array_4[j] = static_cast<unsigned char>(chars.find( char_array_4[j] ));
-
-        char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
-        char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
-        char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
-
-        for (j = 0; (j < i - 1); j++) ret += char_array_3[j];
-      }
-
-      return ret;
-    }
-  } // namespace base64
-} // namespace cereal
-
-#endif // CEREAL_EXTERNAL_BASE64_HPP_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/allocators.h b/Src/External/cereal/include/cereal/external/rapidjson/allocators.h
deleted file mode 100644
index 554dc4a..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/allocators.h
+++ /dev/null
@@ -1,271 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ALLOCATORS_H_
-#define CEREAL_RAPIDJSON_ALLOCATORS_H_
-
-#include "rapidjson.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Allocator
-
-/*! \class rapidjson::Allocator
-    \brief Concept for allocating, resizing and freeing memory block.
-    
-    Note that Malloc() and Realloc() are non-static but Free() is static.
-    
-    So if an allocator need to support Free(), it needs to put its pointer in 
-    the header of memory block.
-
-\code
-concept Allocator {
-    static const bool kNeedFree;    //!< Whether this allocator needs to call Free().
-
-    // Allocate a memory block.
-    // \param size of the memory block in bytes.
-    // \returns pointer to the memory block.
-    void* Malloc(size_t size);
-
-    // Resize a memory block.
-    // \param originalPtr The pointer to current memory block. Null pointer is permitted.
-    // \param originalSize The current size in bytes. (Design issue: since some allocator may not book-keep this, explicitly pass to it can save memory.)
-    // \param newSize the new size in bytes.
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize);
-
-    // Free a memory block.
-    // \param pointer to the memory block. Null pointer is permitted.
-    static void Free(void *ptr);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// CrtAllocator
-
-//! C-runtime library allocator.
-/*! This class is just wrapper for standard C library memory routines.
-    \note implements Allocator concept
-*/
-class CrtAllocator {
-public:
-    static const bool kNeedFree = true;
-    void* Malloc(size_t size) { 
-        if (size) //  behavior of malloc(0) is implementation defined.
-            return std::malloc(size);
-        else
-            return NULL; // standardize to returning NULL.
-    }
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-        (void)originalSize;
-        if (newSize == 0) {
-            std::free(originalPtr);
-            return NULL;
-        }
-        return std::realloc(originalPtr, newSize);
-    }
-    static void Free(void *ptr) { std::free(ptr); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// MemoryPoolAllocator
-
-//! Default memory allocator used by the parser and DOM.
-/*! This allocator allocate memory blocks from pre-allocated memory chunks. 
-
-    It does not free memory blocks. And Realloc() only allocate new memory.
-
-    The memory chunks are allocated by BaseAllocator, which is CrtAllocator by default.
-
-    User may also supply a buffer as the first chunk.
-
-    If the user-buffer is full then additional chunks are allocated by BaseAllocator.
-
-    The user-buffer is not deallocated by this allocator.
-
-    \tparam BaseAllocator the allocator type for allocating memory chunks. Default is CrtAllocator.
-    \note implements Allocator concept
-*/
-template <typename BaseAllocator = CrtAllocator>
-class MemoryPoolAllocator {
-public:
-    static const bool kNeedFree = false;    //!< Tell users that no need to call Free() with this allocator. (concept Allocator)
-
-    //! Constructor with chunkSize.
-    /*! \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-        \param baseAllocator The allocator for allocating memory chunks.
-    */
-    MemoryPoolAllocator(size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) : 
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(0), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-    {
-    }
-
-    //! Constructor with user-supplied buffer.
-    /*! The user buffer will be used firstly. When it is full, memory pool allocates new chunk with chunk size.
-
-        The user buffer will not be deallocated when this allocator is destructed.
-
-        \param buffer User supplied buffer.
-        \param size Size of the buffer in bytes. It must at least larger than sizeof(ChunkHeader).
-        \param chunkSize The size of memory chunk. The default is kDefaultChunkSize.
-        \param baseAllocator The allocator for allocating memory chunks.
-    */
-    MemoryPoolAllocator(void *buffer, size_t size, size_t chunkSize = kDefaultChunkCapacity, BaseAllocator* baseAllocator = 0) :
-        chunkHead_(0), chunk_capacity_(chunkSize), userBuffer_(buffer), baseAllocator_(baseAllocator), ownBaseAllocator_(0)
-    {
-        CEREAL_RAPIDJSON_ASSERT(buffer != 0);
-        CEREAL_RAPIDJSON_ASSERT(size > sizeof(ChunkHeader));
-        chunkHead_ = reinterpret_cast<ChunkHeader*>(buffer);
-        chunkHead_->capacity = size - sizeof(ChunkHeader);
-        chunkHead_->size = 0;
-        chunkHead_->next = 0;
-    }
-
-    //! Destructor.
-    /*! This deallocates all memory chunks, excluding the user-supplied buffer.
-    */
-    ~MemoryPoolAllocator() {
-        Clear();
-        CEREAL_RAPIDJSON_DELETE(ownBaseAllocator_);
-    }
-
-    //! Deallocates all memory chunks, excluding the user-supplied buffer.
-    void Clear() {
-        while (chunkHead_ && chunkHead_ != userBuffer_) {
-            ChunkHeader* next = chunkHead_->next;
-            baseAllocator_->Free(chunkHead_);
-            chunkHead_ = next;
-        }
-        if (chunkHead_ && chunkHead_ == userBuffer_)
-            chunkHead_->size = 0; // Clear user buffer
-    }
-
-    //! Computes the total capacity of allocated memory chunks.
-    /*! \return total capacity in bytes.
-    */
-    size_t Capacity() const {
-        size_t capacity = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-            capacity += c->capacity;
-        return capacity;
-    }
-
-    //! Computes the memory blocks allocated.
-    /*! \return total used bytes.
-    */
-    size_t Size() const {
-        size_t size = 0;
-        for (ChunkHeader* c = chunkHead_; c != 0; c = c->next)
-            size += c->size;
-        return size;
-    }
-
-    //! Allocates a memory block. (concept Allocator)
-    void* Malloc(size_t size) {
-        if (!size)
-            return NULL;
-
-        size = CEREAL_RAPIDJSON_ALIGN(size);
-        if (chunkHead_ == 0 || chunkHead_->size + size > chunkHead_->capacity)
-            if (!AddChunk(chunk_capacity_ > size ? chunk_capacity_ : size))
-                return NULL;
-
-        void *buffer = reinterpret_cast<char *>(chunkHead_) + CEREAL_RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size;
-        chunkHead_->size += size;
-        return buffer;
-    }
-
-    //! Resizes a memory block (concept Allocator)
-    void* Realloc(void* originalPtr, size_t originalSize, size_t newSize) {
-        if (originalPtr == 0)
-            return Malloc(newSize);
-
-        if (newSize == 0)
-            return NULL;
-
-        originalSize = CEREAL_RAPIDJSON_ALIGN(originalSize);
-        newSize = CEREAL_RAPIDJSON_ALIGN(newSize);
-
-        // Do not shrink if new size is smaller than original
-        if (originalSize >= newSize)
-            return originalPtr;
-
-        // Simply expand it if it is the last allocation and there is sufficient space
-        if (originalPtr == reinterpret_cast<char *>(chunkHead_) + CEREAL_RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
-            size_t increment = static_cast<size_t>(newSize - originalSize);
-            if (chunkHead_->size + increment <= chunkHead_->capacity) {
-                chunkHead_->size += increment;
-                return originalPtr;
-            }
-        }
-
-        // Realloc process: allocate and copy memory, do not free original buffer.
-        if (void* newBuffer = Malloc(newSize)) {
-            if (originalSize)
-                std::memcpy(newBuffer, originalPtr, originalSize);
-            return newBuffer;
-        }
-        else
-            return NULL;
-    }
-
-    //! Frees a memory block (concept Allocator)
-    static void Free(void *ptr) { (void)ptr; } // Do nothing
-
-private:
-    //! Copy constructor is not permitted.
-    MemoryPoolAllocator(const MemoryPoolAllocator& rhs) /* = delete */;
-    //! Copy assignment operator is not permitted.
-    MemoryPoolAllocator& operator=(const MemoryPoolAllocator& rhs) /* = delete */;
-
-    //! Creates a new chunk.
-    /*! \param capacity Capacity of the chunk in bytes.
-        \return true if success.
-    */
-    bool AddChunk(size_t capacity) {
-        if (!baseAllocator_)
-            ownBaseAllocator_ = baseAllocator_ = CEREAL_RAPIDJSON_NEW(BaseAllocator());
-        if (ChunkHeader* chunk = reinterpret_cast<ChunkHeader*>(baseAllocator_->Malloc(CEREAL_RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + capacity))) {
-            chunk->capacity = capacity;
-            chunk->size = 0;
-            chunk->next = chunkHead_;
-            chunkHead_ =  chunk;
-            return true;
-        }
-        else
-            return false;
-    }
-
-    static const int kDefaultChunkCapacity = 64 * 1024; //!< Default chunk capacity.
-
-    //! Chunk header for perpending to each chunk.
-    /*! Chunks are stored as a singly linked list.
-    */
-    struct ChunkHeader {
-        size_t capacity;    //!< Capacity of the chunk in bytes (excluding the header itself).
-        size_t size;        //!< Current size of allocated memory in bytes.
-        ChunkHeader *next;  //!< Next chunk in the linked list.
-    };
-
-    ChunkHeader *chunkHead_;    //!< Head of the chunk linked-list. Only the head chunk serves allocation.
-    size_t chunk_capacity_;     //!< The minimum capacity of chunk when they are allocated.
-    void *userBuffer_;          //!< User supplied buffer.
-    BaseAllocator* baseAllocator_;  //!< base allocator for allocating memory chunks.
-    BaseAllocator* ownBaseAllocator_;   //!< base allocator created by this object.
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_ENCODINGS_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/document.h b/Src/External/cereal/include/cereal/external/rapidjson/document.h
deleted file mode 100644
index 46faeb1..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/document.h
+++ /dev/null
@@ -1,2575 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_DOCUMENT_H_
-#define CEREAL_RAPIDJSON_DOCUMENT_H_
-
-/*! \file document.h */
-
-#include "reader.h"
-#include "internal/meta.h"
-#include "internal/strfunc.h"
-#include "memorystream.h"
-#include "encodedstream.h"
-#include <new>      // placement new
-#include <limits>
-
-CEREAL_RAPIDJSON_DIAG_PUSH
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-CEREAL_RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
-CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#if __GNUC__ >= 6
-CEREAL_RAPIDJSON_DIAG_OFF(terminate) // ignore throwing CEREAL_RAPIDJSON_ASSERT in CEREAL_RAPIDJSON_NOEXCEPT functions
-#endif
-#endif // __GNUC__
-
-#ifndef CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
-#include <iterator> // std::iterator, std::random_access_iterator_tag
-#endif
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-// Forward declaration.
-template <typename Encoding, typename Allocator>
-class GenericValue;
-
-template <typename Encoding, typename Allocator, typename StackAllocator>
-class GenericDocument;
-
-//! Name-value pair in a JSON object value.
-/*!
-    This class was internal to GenericValue. It used to be a inner struct.
-    But a compiler (IBM XL C/C++ for AIX) have reported to have problem with that so it moved as a namespace scope struct.
-    https://code.google.com/p/rapidjson/issues/detail?id=64
-*/
-template <typename Encoding, typename Allocator> 
-struct GenericMember { 
-    GenericValue<Encoding, Allocator> name;     //!< name of member (must be a string)
-    GenericValue<Encoding, Allocator> value;    //!< value of member.
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericMemberIterator
-
-#ifndef CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
-
-//! (Constant) member iterator for a JSON object value
-/*!
-    \tparam Const Is this a constant iterator?
-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
-
-    This class implements a Random Access Iterator for GenericMember elements
-    of a GenericValue, see ISO/IEC 14882:2003(E) C++ standard, 24.1 [lib.iterator.requirements].
-
-    \note This iterator implementation is mainly intended to avoid implicit
-        conversions from iterator values to \c NULL,
-        e.g. from GenericValue::FindMember.
-
-    \note Define \c CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS to fall back to a
-        pointer-based implementation, if your platform doesn't provide
-        the C++ <iterator> header.
-
-    \see GenericMember, GenericValue::MemberIterator, GenericValue::ConstMemberIterator
- */
-template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator
-    : public std::iterator<std::random_access_iterator_tag
-        , typename internal::MaybeAddConst<Const,GenericMember<Encoding,Allocator> >::Type> {
-
-    friend class GenericValue<Encoding,Allocator>;
-    template <bool, typename, typename> friend class GenericMemberIterator;
-
-    typedef GenericMember<Encoding,Allocator> PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef std::iterator<std::random_access_iterator_tag,ValueType> BaseType;
-
-public:
-    //! Iterator type itself
-    typedef GenericMemberIterator Iterator;
-    //! Constant iterator type
-    typedef GenericMemberIterator<true,Encoding,Allocator>  ConstIterator;
-    //! Non-constant iterator type
-    typedef GenericMemberIterator<false,Encoding,Allocator> NonConstIterator;
-
-    //! Pointer to (const) GenericMember
-    typedef typename BaseType::pointer         Pointer;
-    //! Reference to (const) GenericMember
-    typedef typename BaseType::reference       Reference;
-    //! Signed integer type (e.g. \c ptrdiff_t)
-    typedef typename BaseType::difference_type DifferenceType;
-
-    //! Default constructor (singular value)
-    /*! Creates an iterator pointing to no element.
-        \note All operations, except for comparisons, are undefined on such values.
-     */
-    GenericMemberIterator() : ptr_() {}
-
-    //! Iterator conversions to more const
-    /*!
-        \param it (Non-const) iterator to copy from
-
-        Allows the creation of an iterator from another GenericMemberIterator
-        that is "less const".  Especially, creating a non-constant iterator
-        from a constant iterator are disabled:
-        \li const -> non-const (not ok)
-        \li const -> const (ok)
-        \li non-const -> const (ok)
-        \li non-const -> non-const (ok)
-
-        \note If the \c Const template parameter is already \c false, this
-            constructor effectively defines a regular copy-constructor.
-            Otherwise, the copy constructor is implicitly defined.
-    */
-    GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
-    Iterator& operator=(const NonConstIterator & it) { ptr_ = it.ptr_; return *this; }
-
-    //! @name stepping
-    //@{
-    Iterator& operator++(){ ++ptr_; return *this; }
-    Iterator& operator--(){ --ptr_; return *this; }
-    Iterator  operator++(int){ Iterator old(*this); ++ptr_; return old; }
-    Iterator  operator--(int){ Iterator old(*this); --ptr_; return old; }
-    //@}
-
-    //! @name increment/decrement
-    //@{
-    Iterator operator+(DifferenceType n) const { return Iterator(ptr_+n); }
-    Iterator operator-(DifferenceType n) const { return Iterator(ptr_-n); }
-
-    Iterator& operator+=(DifferenceType n) { ptr_+=n; return *this; }
-    Iterator& operator-=(DifferenceType n) { ptr_-=n; return *this; }
-    //@}
-
-    //! @name relations
-    //@{
-    bool operator==(ConstIterator that) const { return ptr_ == that.ptr_; }
-    bool operator!=(ConstIterator that) const { return ptr_ != that.ptr_; }
-    bool operator<=(ConstIterator that) const { return ptr_ <= that.ptr_; }
-    bool operator>=(ConstIterator that) const { return ptr_ >= that.ptr_; }
-    bool operator< (ConstIterator that) const { return ptr_ < that.ptr_; }
-    bool operator> (ConstIterator that) const { return ptr_ > that.ptr_; }
-    //@}
-
-    //! @name dereference
-    //@{
-    Reference operator*() const { return *ptr_; }
-    Pointer   operator->() const { return ptr_; }
-    Reference operator[](DifferenceType n) const { return ptr_[n]; }
-    //@}
-
-    //! Distance
-    DifferenceType operator-(ConstIterator that) const { return ptr_-that.ptr_; }
-
-private:
-    //! Internal constructor from plain pointer
-    explicit GenericMemberIterator(Pointer p) : ptr_(p) {}
-
-    Pointer ptr_; //!< raw pointer
-};
-
-#else // CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
-
-// class-based member iterator implementation disabled, use plain pointers
-
-template <bool Const, typename Encoding, typename Allocator>
-struct GenericMemberIterator;
-
-//! non-const GenericMemberIterator
-template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<false,Encoding,Allocator> {
-    //! use plain pointer as iterator type
-    typedef GenericMember<Encoding,Allocator>* Iterator;
-};
-//! const GenericMemberIterator
-template <typename Encoding, typename Allocator>
-struct GenericMemberIterator<true,Encoding,Allocator> {
-    //! use plain const pointer as iterator type
-    typedef const GenericMember<Encoding,Allocator>* Iterator;
-};
-
-#endif // CEREAL_RAPIDJSON_NOMEMBERITERATORCLASS
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericStringRef
-
-//! Reference to a constant string (not taking a copy)
-/*!
-    \tparam CharType character type of the string
-
-    This helper class is used to automatically infer constant string
-    references for string literals, especially from \c const \b (!)
-    character arrays.
-
-    The main use is for creating JSON string values without copying the
-    source string via an \ref Allocator.  This requires that the referenced
-    string pointers have a sufficient lifetime, which exceeds the lifetime
-    of the associated GenericValue.
-
-    \b Example
-    \code
-    Value v("foo");   // ok, no need to copy & calculate length
-    const char foo[] = "foo";
-    v.SetString(foo); // ok
-
-    const char* bar = foo;
-    // Value x(bar); // not ok, can't rely on bar's lifetime
-    Value x(StringRef(bar)); // lifetime explicitly guaranteed by user
-    Value y(StringRef(bar, 3));  // ok, explicitly pass length
-    \endcode
-
-    \see StringRef, GenericValue::SetString
-*/
-template<typename CharType>
-struct GenericStringRef {
-    typedef CharType Ch; //!< character type of the string
-
-    //! Create string reference from \c const character array
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        This constructor implicitly creates a constant string reference from
-        a \c const character array.  It has better performance than
-        \ref StringRef(const CharType*) by inferring the string \ref length
-        from the array length, and also supports strings containing null
-        characters.
-
-        \tparam N length of the string, automatically inferred
-
-        \param str Constant character array, lifetime assumed to be longer
-            than the use of the string in e.g. a GenericValue
-
-        \post \ref s == str
-
-        \note Constant complexity.
-        \note There is a hidden, private overload to disallow references to
-            non-const character arrays to be created via this constructor.
-            By this, e.g. function-scope arrays used to be filled via
-            \c snprintf are excluded from consideration.
-            In such cases, the referenced string should be \b copied to the
-            GenericValue instead.
-     */
-#endif
-    template<SizeType N>
-    GenericStringRef(const CharType (&str)[N]) CEREAL_RAPIDJSON_NOEXCEPT
-        : s(str), length(N-1) {}
-
-    //! Explicitly create string reference from \c const character pointer
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        This constructor can be used to \b explicitly  create a reference to
-        a constant string pointer.
-
-        \see StringRef(const CharType*)
-
-        \param str Constant character pointer, lifetime assumed to be longer
-            than the use of the string in e.g. a GenericValue
-
-        \post \ref s == str
-
-        \note There is a hidden, private overload to disallow references to
-            non-const character arrays to be created via this constructor.
-            By this, e.g. function-scope arrays used to be filled via
-            \c snprintf are excluded from consideration.
-            In such cases, the referenced string should be \b copied to the
-            GenericValue instead.
-     */
-#endif
-    explicit GenericStringRef(const CharType* str)
-        : s(str), length(internal::StrLen(str)){ CEREAL_RAPIDJSON_ASSERT(s != 0); }
-
-    //! Create constant string reference from pointer and length
-#ifndef __clang__ // -Wdocumentation
-    /*! \param str constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-        \param len length of the string, excluding the trailing NULL terminator
-
-        \post \ref s == str && \ref length == len
-        \note Constant complexity.
-     */
-#endif
-    GenericStringRef(const CharType* str, SizeType len)
-        : s(str), length(len) { CEREAL_RAPIDJSON_ASSERT(s != 0); }
-
-    GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
-
-    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
-
-    //! implicit conversion to plain CharType pointer
-    operator const Ch *() const { return s; }
-
-    const Ch* const s; //!< plain CharType pointer
-    const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
-
-private:
-    //! Disallow construction from non-const array
-    template<SizeType N>
-    GenericStringRef(CharType (&str)[N]) /* = delete */;
-};
-
-//! Mark a character pointer as constant string
-/*! Mark a plain character pointer as a "string literal".  This function
-    can be used to avoid copying a character string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-    \tparam CharType Character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-
-    \see GenericValue::GenericValue(StringRefType), GenericValue::operator=(StringRefType), GenericValue::SetString(StringRefType), GenericValue::PushBack(StringRefType, Allocator&), GenericValue::AddMember
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const CharType* str) {
-    return GenericStringRef<CharType>(str, internal::StrLen(str));
-}
-
-//! Mark a character pointer as constant string
-/*! Mark a plain character pointer as a "string literal".  This function
-    can be used to avoid copying a character string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-
-    This version has better performance with supplied length, and also
-    supports string containing null characters.
-
-    \tparam CharType character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \param length The length of source string.
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const CharType* str, size_t length) {
-    return GenericStringRef<CharType>(str, SizeType(length));
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-//! Mark a string object as constant string
-/*! Mark a string object (e.g. \c std::string) as a "string literal".
-    This function can be used to avoid copying a string to be referenced as a
-    value in a JSON GenericValue object, if the string's lifetime is known
-    to be valid long enough.
-
-    \tparam CharType character type of the string
-    \param str Constant string, lifetime assumed to be longer than the use of the string in e.g. a GenericValue
-    \return GenericStringRef string reference object
-    \relatesalso GenericStringRef
-    \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
-*/
-template<typename CharType>
-inline GenericStringRef<CharType> StringRef(const std::basic_string<CharType>& str) {
-    return GenericStringRef<CharType>(str.data(), SizeType(str.size()));
-}
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericValue type traits
-namespace internal {
-
-template <typename T, typename Encoding = void, typename Allocator = void>
-struct IsGenericValueImpl : FalseType {};
-
-// select candidates according to nested encoding and allocator types
-template <typename T> struct IsGenericValueImpl<T, typename Void<typename T::EncodingType>::Type, typename Void<typename T::AllocatorType>::Type>
-    : IsBaseOf<GenericValue<typename T::EncodingType, typename T::AllocatorType>, T>::Type {};
-
-// helper to match arbitrary GenericValue instantiations, including derived classes
-template <typename T> struct IsGenericValue : IsGenericValueImpl<T>::Type {};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// TypeHelper
-
-namespace internal {
-
-template <typename ValueType, typename T>
-struct TypeHelper {};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, bool> {
-    static bool Is(const ValueType& v) { return v.IsBool(); }
-    static bool Get(const ValueType& v) { return v.GetBool(); }
-    static ValueType& Set(ValueType& v, bool data) { return v.SetBool(data); }
-    static ValueType& Set(ValueType& v, bool data, typename ValueType::AllocatorType&) { return v.SetBool(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, int> {
-    static bool Is(const ValueType& v) { return v.IsInt(); }
-    static int Get(const ValueType& v) { return v.GetInt(); }
-    static ValueType& Set(ValueType& v, int data) { return v.SetInt(data); }
-    static ValueType& Set(ValueType& v, int data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, unsigned> {
-    static bool Is(const ValueType& v) { return v.IsUint(); }
-    static unsigned Get(const ValueType& v) { return v.GetUint(); }
-    static ValueType& Set(ValueType& v, unsigned data) { return v.SetUint(data); }
-    static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, int64_t> {
-    static bool Is(const ValueType& v) { return v.IsInt64(); }
-    static int64_t Get(const ValueType& v) { return v.GetInt64(); }
-    static ValueType& Set(ValueType& v, int64_t data) { return v.SetInt64(data); }
-    static ValueType& Set(ValueType& v, int64_t data, typename ValueType::AllocatorType&) { return v.SetInt64(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, uint64_t> {
-    static bool Is(const ValueType& v) { return v.IsUint64(); }
-    static uint64_t Get(const ValueType& v) { return v.GetUint64(); }
-    static ValueType& Set(ValueType& v, uint64_t data) { return v.SetUint64(data); }
-    static ValueType& Set(ValueType& v, uint64_t data, typename ValueType::AllocatorType&) { return v.SetUint64(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, double> {
-    static bool Is(const ValueType& v) { return v.IsDouble(); }
-    static double Get(const ValueType& v) { return v.GetDouble(); }
-    static ValueType& Set(ValueType& v, double data) { return v.SetDouble(data); }
-    static ValueType& Set(ValueType& v, double data, typename ValueType::AllocatorType&) { return v.SetDouble(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, float> {
-    static bool Is(const ValueType& v) { return v.IsFloat(); }
-    static float Get(const ValueType& v) { return v.GetFloat(); }
-    static ValueType& Set(ValueType& v, float data) { return v.SetFloat(data); }
-    static ValueType& Set(ValueType& v, float data, typename ValueType::AllocatorType&) { return v.SetFloat(data); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, const typename ValueType::Ch*> {
-    typedef const typename ValueType::Ch* StringType;
-    static bool Is(const ValueType& v) { return v.IsString(); }
-    static StringType Get(const ValueType& v) { return v.GetString(); }
-    static ValueType& Set(ValueType& v, const StringType data) { return v.SetString(typename ValueType::StringRefType(data)); }
-    static ValueType& Set(ValueType& v, const StringType data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
-};
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template<typename ValueType> 
-struct TypeHelper<ValueType, std::basic_string<typename ValueType::Ch> > {
-    typedef std::basic_string<typename ValueType::Ch> StringType;
-    static bool Is(const ValueType& v) { return v.IsString(); }
-    static StringType Get(const ValueType& v) { return StringType(v.GetString(), v.GetStringLength()); }
-    static ValueType& Set(ValueType& v, const StringType& data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
-};
-#endif
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::Array> {
-    typedef typename ValueType::Array ArrayType;
-    static bool Is(const ValueType& v) { return v.IsArray(); }
-    static ArrayType Get(ValueType& v) { return v.GetArray(); }
-    static ValueType& Set(ValueType& v, ArrayType data) { return v = data; }
-    static ValueType& Set(ValueType& v, ArrayType data, typename ValueType::AllocatorType&) { return v = data; }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::ConstArray> {
-    typedef typename ValueType::ConstArray ArrayType;
-    static bool Is(const ValueType& v) { return v.IsArray(); }
-    static ArrayType Get(const ValueType& v) { return v.GetArray(); }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::Object> {
-    typedef typename ValueType::Object ObjectType;
-    static bool Is(const ValueType& v) { return v.IsObject(); }
-    static ObjectType Get(ValueType& v) { return v.GetObject(); }
-    static ValueType& Set(ValueType& v, ObjectType data) { return v = data; }
-    static ValueType& Set(ValueType& v, ObjectType data, typename ValueType::AllocatorType&) { v = data; }
-};
-
-template<typename ValueType> 
-struct TypeHelper<ValueType, typename ValueType::ConstObject> {
-    typedef typename ValueType::ConstObject ObjectType;
-    static bool Is(const ValueType& v) { return v.IsObject(); }
-    static ObjectType Get(const ValueType& v) { return v.GetObject(); }
-};
-
-} // namespace internal
-
-// Forward declarations
-template <bool, typename> class GenericArray;
-template <bool, typename> class GenericObject;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericValue
-
-//! Represents a JSON value. Use Value for UTF8 encoding and default allocator.
-/*!
-    A JSON value can be one of 7 types. This class is a variant type supporting
-    these types.
-
-    Use the Value if UTF8 and default allocator
-
-    \tparam Encoding    Encoding of the value. (Even non-string values need to have the same encoding in a document)
-    \tparam Allocator   Allocator type for allocating memory of object, array and string.
-*/
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<> > 
-class GenericValue {
-public:
-    //! Name-value pair in an object.
-    typedef GenericMember<Encoding, Allocator> Member;
-    typedef Encoding EncodingType;                  //!< Encoding type from template parameter.
-    typedef Allocator AllocatorType;                //!< Allocator type from template parameter.
-    typedef typename Encoding::Ch Ch;               //!< Character type derived from Encoding.
-    typedef GenericStringRef<Ch> StringRefType;     //!< Reference to a constant string
-    typedef typename GenericMemberIterator<false,Encoding,Allocator>::Iterator MemberIterator;  //!< Member iterator for iterating in object.
-    typedef typename GenericMemberIterator<true,Encoding,Allocator>::Iterator ConstMemberIterator;  //!< Constant member iterator for iterating in object.
-    typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
-    typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of itself.
-    typedef GenericArray<false, ValueType> Array;
-    typedef GenericArray<true, ValueType> ConstArray;
-    typedef GenericObject<false, ValueType> Object;
-    typedef GenericObject<true, ValueType> ConstObject;
-
-    //!@name Constructors and destructor.
-    //@{
-
-    //! Default constructor creates a null value.
-    GenericValue() CEREAL_RAPIDJSON_NOEXCEPT : data_() { data_.f.flags = kNullFlag; }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericValue(GenericValue&& rhs) CEREAL_RAPIDJSON_NOEXCEPT : data_(rhs.data_) {
-        rhs.data_.f.flags = kNullFlag; // give up contents
-    }
-#endif
-
-private:
-    //! Copy constructor is not permitted.
-    GenericValue(const GenericValue& rhs);
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Moving from a GenericDocument is not permitted.
-    template <typename StackAllocator>
-    GenericValue(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
-
-    //! Move assignment from a GenericDocument is not permitted.
-    template <typename StackAllocator>
-    GenericValue& operator=(GenericDocument<Encoding,Allocator,StackAllocator>&& rhs);
-#endif
-
-public:
-
-    //! Constructor with JSON value type.
-    /*! This creates a Value of specified type with default content.
-        \param type Type of the value.
-        \note Default content for number is zero.
-    */
-    explicit GenericValue(Type type) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
-        static const uint16_t defaultFlags[7] = {
-            kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
-            kNumberAnyFlag
-        };
-        CEREAL_RAPIDJSON_ASSERT(type <= kNumberType);
-        data_.f.flags = defaultFlags[type];
-
-        // Use ShortString to store empty string.
-        if (type == kStringType)
-            data_.ss.SetLength(0);
-    }
-
-    //! Explicit copy constructor (with allocator)
-    /*! Creates a copy of a Value by using the given Allocator
-        \tparam SourceAllocator allocator of \c rhs
-        \param rhs Value to copy from (read-only)
-        \param allocator Allocator for allocating copied elements and buffers. Commonly use GenericDocument::GetAllocator().
-        \see CopyFrom()
-    */
-    template< typename SourceAllocator >
-    GenericValue(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator & allocator);
-
-    //! Constructor for boolean value.
-    /*! \param b Boolean value
-        \note This constructor is limited to \em real boolean values and rejects
-            implicitly converted types like arbitrary pointers.  Use an explicit cast
-            to \c bool, if you want to construct a boolean JSON value in such cases.
-     */
-#ifndef CEREAL_RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
-    template <typename T>
-    explicit GenericValue(T b, CEREAL_RAPIDJSON_ENABLEIF((internal::IsSame<bool, T>))) CEREAL_RAPIDJSON_NOEXCEPT  // See #472
-#else
-    explicit GenericValue(bool b) CEREAL_RAPIDJSON_NOEXCEPT
-#endif
-        : data_() {
-            // safe-guard against failing SFINAE
-            CEREAL_RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
-            data_.f.flags = b ? kTrueFlag : kFalseFlag;
-    }
-
-    //! Constructor for int value.
-    explicit GenericValue(int i) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.i64 = i;
-        data_.f.flags = (i >= 0) ? (kNumberIntFlag | kUintFlag | kUint64Flag) : kNumberIntFlag;
-    }
-
-    //! Constructor for unsigned value.
-    explicit GenericValue(unsigned u) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.u64 = u; 
-        data_.f.flags = (u & 0x80000000) ? kNumberUintFlag : (kNumberUintFlag | kIntFlag | kInt64Flag);
-    }
-
-    //! Constructor for int64_t value.
-    explicit GenericValue(int64_t i64) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.i64 = i64;
-        data_.f.flags = kNumberInt64Flag;
-        if (i64 >= 0) {
-            data_.f.flags |= kNumberUint64Flag;
-            if (!(static_cast<uint64_t>(i64) & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-                data_.f.flags |= kUintFlag;
-            if (!(static_cast<uint64_t>(i64) & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-                data_.f.flags |= kIntFlag;
-        }
-        else if (i64 >= static_cast<int64_t>(CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            data_.f.flags |= kIntFlag;
-    }
-
-    //! Constructor for uint64_t value.
-    explicit GenericValue(uint64_t u64) CEREAL_RAPIDJSON_NOEXCEPT : data_() {
-        data_.n.u64 = u64;
-        data_.f.flags = kNumberUint64Flag;
-        if (!(u64 & CEREAL_RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
-            data_.f.flags |= kInt64Flag;
-        if (!(u64 & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-            data_.f.flags |= kUintFlag;
-        if (!(u64 & CEREAL_RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            data_.f.flags |= kIntFlag;
-    }
-
-    //! Constructor for double value.
-    explicit GenericValue(double d) CEREAL_RAPIDJSON_NOEXCEPT : data_() { data_.n.d = d; data_.f.flags = kNumberDoubleFlag; }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    GenericValue(const Ch* s, SizeType length) CEREAL_RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(StringRef(s, length)); }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    explicit GenericValue(StringRefType s) CEREAL_RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(s); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_() { SetStringRaw(StringRef(s, length), allocator); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch*s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Constructor for copy-string from a string object (i.e. do make a copy of string)
-    /*! \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
-     */
-    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
-#endif
-
-    //! Constructor for Array.
-    /*!
-        \param a An array obtained by \c GetArray().
-        \note \c Array is always pass-by-value.
-        \note the source array is moved into this value and the sourec array becomes empty.
-    */
-    GenericValue(Array a) CEREAL_RAPIDJSON_NOEXCEPT : data_(a.value_.data_) {
-        a.value_.data_ = Data();
-        a.value_.data_.f.flags = kArrayFlag;
-    }
-
-    //! Constructor for Object.
-    /*!
-        \param o An object obtained by \c GetObject().
-        \note \c Object is always pass-by-value.
-        \note the source object is moved into this value and the sourec object becomes empty.
-    */
-    GenericValue(Object o) CEREAL_RAPIDJSON_NOEXCEPT : data_(o.value_.data_) {
-        o.value_.data_ = Data();
-        o.value_.data_.f.flags = kObjectFlag;
-    }
-
-    //! Destructor.
-    /*! Need to destruct elements of array, members of object, or copy-string.
-    */
-    ~GenericValue() {
-        if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
-            switch(data_.f.flags) {
-            case kArrayFlag:
-                {
-                    GenericValue* e = GetElementsPointer();
-                    for (GenericValue* v = e; v != e + data_.a.size; ++v)
-                        v->~GenericValue();
-                    Allocator::Free(e);
-                }
-                break;
-
-            case kObjectFlag:
-                for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-                    m->~Member();
-                Allocator::Free(GetMembersPointer());
-                break;
-
-            case kCopyStringFlag:
-                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
-                break;
-
-            default:
-                break;  // Do nothing for other types.
-            }
-        }
-    }
-
-    //@}
-
-    //!@name Assignment operators
-    //@{
-
-    //! Assignment with move semantics.
-    /*! \param rhs Source of the assignment. It will become a null value after assignment.
-    */
-    GenericValue& operator=(GenericValue& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
-        CEREAL_RAPIDJSON_ASSERT(this != &rhs);
-        this->~GenericValue();
-        RawAssign(rhs);
-        return *this;
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move assignment in C++11
-    GenericValue& operator=(GenericValue&& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
-        return *this = rhs.Move();
-    }
-#endif
-
-    //! Assignment of constant string reference (no copy)
-    /*! \param str Constant string reference to be assigned
-        \note This overload is needed to avoid clashes with the generic primitive type assignment overload below.
-        \see GenericStringRef, operator=(T)
-    */
-    GenericValue& operator=(StringRefType str) CEREAL_RAPIDJSON_NOEXCEPT {
-        GenericValue s(str);
-        return *this = s;
-    }
-
-    //! Assignment with primitive types.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param value The value to be assigned.
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref SetString(const Ch*, Allocator&) (for copying) or
-            \ref StringRef() (to explicitly mark the pointer as constant) instead.
-            All other pointer types would implicitly convert to \c bool,
-            use \ref SetBool() instead.
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsPointer<T>), (GenericValue&))
-    operator=(T value) {
-        GenericValue v(value);
-        return *this = v;
-    }
-
-    //! Deep-copy assignment from Value
-    /*! Assigns a \b copy of the Value to the current Value object
-        \tparam SourceAllocator Allocator type of \c rhs
-        \param rhs Value to copy from (read-only)
-        \param allocator Allocator to use for copying
-     */
-    template <typename SourceAllocator>
-    GenericValue& CopyFrom(const GenericValue<Encoding, SourceAllocator>& rhs, Allocator& allocator) {
-        CEREAL_RAPIDJSON_ASSERT(static_cast<void*>(this) != static_cast<void const*>(&rhs));
-        this->~GenericValue();
-        new (this) GenericValue(rhs, allocator);
-        return *this;
-    }
-
-    //! Exchange the contents of this value with those of other.
-    /*!
-        \param other Another value.
-        \note Constant complexity.
-    */
-    GenericValue& Swap(GenericValue& other) CEREAL_RAPIDJSON_NOEXCEPT {
-        GenericValue temp;
-        temp.RawAssign(*this);
-        RawAssign(other);
-        other.RawAssign(temp);
-        return *this;
-    }
-
-    //! free-standing swap function helper
-    /*!
-        Helper function to enable support for common swap implementation pattern based on \c std::swap:
-        \code
-        void swap(MyClass& a, MyClass& b) {
-            using std::swap;
-            swap(a.value, b.value);
-            // ...
-        }
-        \endcode
-        \see Swap()
-     */
-    friend inline void swap(GenericValue& a, GenericValue& b) CEREAL_RAPIDJSON_NOEXCEPT { a.Swap(b); }
-
-    //! Prepare Value for move semantics
-    /*! \return *this */
-    GenericValue& Move() CEREAL_RAPIDJSON_NOEXCEPT { return *this; }
-    //@}
-
-    //!@name Equal-to and not-equal-to operators
-    //@{
-    //! Equal-to operator
-    /*!
-        \note If an object contains duplicated named member, comparing equality with any object is always \c false.
-        \note Linear time complexity (number of all values in the subtree and total lengths of all strings).
-    */
-    template <typename SourceAllocator>
-    bool operator==(const GenericValue<Encoding, SourceAllocator>& rhs) const {
-        typedef GenericValue<Encoding, SourceAllocator> RhsType;
-        if (GetType() != rhs.GetType())
-            return false;
-
-        switch (GetType()) {
-        case kObjectType: // Warning: O(n^2) inner-loop
-            if (data_.o.size != rhs.data_.o.size)
-                return false;           
-            for (ConstMemberIterator lhsMemberItr = MemberBegin(); lhsMemberItr != MemberEnd(); ++lhsMemberItr) {
-                typename RhsType::ConstMemberIterator rhsMemberItr = rhs.FindMember(lhsMemberItr->name);
-                if (rhsMemberItr == rhs.MemberEnd() || lhsMemberItr->value != rhsMemberItr->value)
-                    return false;
-            }
-            return true;
-            
-        case kArrayType:
-            if (data_.a.size != rhs.data_.a.size)
-                return false;
-            for (SizeType i = 0; i < data_.a.size; i++)
-                if ((*this)[i] != rhs[i])
-                    return false;
-            return true;
-
-        case kStringType:
-            return StringEqual(rhs);
-
-        case kNumberType:
-            if (IsDouble() || rhs.IsDouble()) {
-                double a = GetDouble();     // May convert from integer to double.
-                double b = rhs.GetDouble(); // Ditto
-                return a >= b && a <= b;    // Prevent -Wfloat-equal
-            }
-            else
-                return data_.n.u64 == rhs.data_.n.u64;
-
-        default:
-            return true;
-        }
-    }
-
-    //! Equal-to operator with const C-string pointer
-    bool operator==(const Ch* rhs) const { return *this == GenericValue(StringRef(rhs)); }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Equal-to operator with string object
-    /*! \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
-     */
-    bool operator==(const std::basic_string<Ch>& rhs) const { return *this == GenericValue(StringRef(rhs)); }
-#endif
-
-    //! Equal-to operator with primitive types
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c true, \c false
-    */
-    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
-
-    //! Not-equal-to operator
-    /*! \return !(*this == rhs)
-     */
-    template <typename SourceAllocator>
-    bool operator!=(const GenericValue<Encoding, SourceAllocator>& rhs) const { return !(*this == rhs); }
-
-    //! Not-equal-to operator with const C-string pointer
-    bool operator!=(const Ch* rhs) const { return !(*this == rhs); }
-
-    //! Not-equal-to operator with arbitrary types
-    /*! \return !(*this == rhs)
-     */
-    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
-
-    //! Equal-to operator with arbitrary types (symmetric version)
-    /*! \return (rhs == lhs)
-     */
-    template <typename T> friend CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator==(const T& lhs, const GenericValue& rhs) { return rhs == lhs; }
-
-    //! Not-Equal-to operator with arbitrary types (symmetric version)
-    /*! \return !(rhs == lhs)
-     */
-    template <typename T> friend CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& lhs, const GenericValue& rhs) { return !(rhs == lhs); }
-    //@}
-
-    //!@name Type
-    //@{
-
-    Type GetType()  const { return static_cast<Type>(data_.f.flags & kTypeMask); }
-    bool IsNull()   const { return data_.f.flags == kNullFlag; }
-    bool IsFalse()  const { return data_.f.flags == kFalseFlag; }
-    bool IsTrue()   const { return data_.f.flags == kTrueFlag; }
-    bool IsBool()   const { return (data_.f.flags & kBoolFlag) != 0; }
-    bool IsObject() const { return data_.f.flags == kObjectFlag; }
-    bool IsArray()  const { return data_.f.flags == kArrayFlag; }
-    bool IsNumber() const { return (data_.f.flags & kNumberFlag) != 0; }
-    bool IsInt()    const { return (data_.f.flags & kIntFlag) != 0; }
-    bool IsUint()   const { return (data_.f.flags & kUintFlag) != 0; }
-    bool IsInt64()  const { return (data_.f.flags & kInt64Flag) != 0; }
-    bool IsUint64() const { return (data_.f.flags & kUint64Flag) != 0; }
-    bool IsDouble() const { return (data_.f.flags & kDoubleFlag) != 0; }
-    bool IsString() const { return (data_.f.flags & kStringFlag) != 0; }
-
-    // Checks whether a number can be losslessly converted to a double.
-    bool IsLosslessDouble() const {
-        if (!IsNumber()) return false;
-        if (IsUint64()) {
-            uint64_t u = GetUint64();
-            volatile double d = static_cast<double>(u);
-            return (d >= 0.0)
-                && (d < static_cast<double>(std::numeric_limits<uint64_t>::max()))
-                && (u == static_cast<uint64_t>(d));
-        }
-        if (IsInt64()) {
-            int64_t i = GetInt64();
-            volatile double d = static_cast<double>(i);
-            return (d >= static_cast<double>(std::numeric_limits<int64_t>::min()))
-                && (d < static_cast<double>(std::numeric_limits<int64_t>::max()))
-                && (i == static_cast<int64_t>(d));
-        }
-        return true; // double, int, uint are always lossless
-    }
-
-    // Checks whether a number is a float (possible lossy).
-    bool IsFloat() const  {
-        if ((data_.f.flags & kDoubleFlag) == 0)
-            return false;
-        double d = GetDouble();
-        return d >= -3.4028234e38 && d <= 3.4028234e38;
-    }
-    // Checks whether a number can be losslessly converted to a float.
-    bool IsLosslessFloat() const {
-        if (!IsNumber()) return false;
-        double a = GetDouble();
-        if (a < static_cast<double>(-std::numeric_limits<float>::max())
-                || a > static_cast<double>(std::numeric_limits<float>::max()))
-            return false;
-        double b = static_cast<double>(static_cast<float>(a));
-        return a >= b && a <= b;    // Prevent -Wfloat-equal
-    }
-
-    //@}
-
-    //!@name Null
-    //@{
-
-    GenericValue& SetNull() { this->~GenericValue(); new (this) GenericValue(); return *this; }
-
-    //@}
-
-    //!@name Bool
-    //@{
-
-    bool GetBool() const { CEREAL_RAPIDJSON_ASSERT(IsBool()); return data_.f.flags == kTrueFlag; }
-    //!< Set boolean value
-    /*! \post IsBool() == true */
-    GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
-
-    //@}
-
-    //!@name Object
-    //@{
-
-    //! Set this value as an empty object.
-    /*! \post IsObject() == true */
-    GenericValue& SetObject() { this->~GenericValue(); new (this) GenericValue(kObjectType); return *this; }
-
-    //! Get the number of members in the object.
-    SizeType MemberCount() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return data_.o.size; }
-
-    //! Check whether the object is empty.
-    bool ObjectEmpty() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; }
-
-    //! Get a value from an object associated with the name.
-    /*! \pre IsObject() == true
-        \tparam T Either \c Ch or \c const \c Ch (template used for disambiguation with \ref operator[](SizeType))
-        \note In version 0.1x, if the member is not found, this function returns a null value. This makes issue 7.
-        Since 0.2, if the name is not correct, it will assert.
-        If user is unsure whether a member exists, user should use HasMember() first.
-        A better approach is to use FindMember().
-        \note Linear time complexity.
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(GenericValue&)) operator[](T* name) {
-        GenericValue n(StringRef(name));
-        return (*this)[n];
-    }
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >),(const GenericValue&)) operator[](T* name) const { return const_cast<GenericValue&>(*this)[name]; }
-
-    //! Get a value from an object associated with the name.
-    /*! \pre IsObject() == true
-        \tparam SourceAllocator Allocator of the \c name value
-
-        \note Compared to \ref operator[](T*), this version is faster because it does not need a StrLen().
-        And it can also handle strings with embedded null characters.
-
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator member = FindMember(name);
-        if (member != MemberEnd())
-            return member->value;
-        else {
-            CEREAL_RAPIDJSON_ASSERT(false);    // see above note
-
-            // This will generate -Wexit-time-destructors in clang
-            // static GenericValue NullValue;
-            // return NullValue;
-
-            // Use static buffer and placement-new to prevent destruction
-            static char buffer[sizeof(GenericValue)];
-            return *new (buffer) GenericValue();
-        }
-    }
-    template <typename SourceAllocator>
-    const GenericValue& operator[](const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this)[name]; }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Get a value from an object associated with name (string object).
-    GenericValue& operator[](const std::basic_string<Ch>& name) { return (*this)[GenericValue(StringRef(name))]; }
-    const GenericValue& operator[](const std::basic_string<Ch>& name) const { return (*this)[GenericValue(StringRef(name))]; }
-#endif
-
-    //! Const member iterator
-    /*! \pre IsObject() == true */
-    ConstMemberIterator MemberBegin() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer()); }
-    //! Const \em past-the-end member iterator
-    /*! \pre IsObject() == true */
-    ConstMemberIterator MemberEnd() const   { CEREAL_RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer() + data_.o.size); }
-    //! Member iterator
-    /*! \pre IsObject() == true */
-    MemberIterator MemberBegin()            { CEREAL_RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer()); }
-    //! \em Past-the-end member iterator
-    /*! \pre IsObject() == true */
-    MemberIterator MemberEnd()              { CEREAL_RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer() + data_.o.size); }
-
-    //! Check whether a member exists in the object.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    bool HasMember(const Ch* name) const { return FindMember(name) != MemberEnd(); }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Check whether a member exists in the object with string object.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    bool HasMember(const std::basic_string<Ch>& name) const { return FindMember(name) != MemberEnd(); }
-#endif
-
-    //! Check whether a member exists in the object with GenericValue name.
-    /*!
-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Whether a member with that name exists.
-        \note It is better to use FindMember() directly if you need the obtain the value as well.
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    bool HasMember(const GenericValue<Encoding, SourceAllocator>& name) const { return FindMember(name) != MemberEnd(); }
-
-    //! Find member by name.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-
-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
-            the requested member doesn't exist. For consistency with e.g.
-            \c std::map, this has been changed to MemberEnd() now.
-        \note Linear time complexity.
-    */
-    MemberIterator FindMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return FindMember(n);
-    }
-
-    ConstMemberIterator FindMember(const Ch* name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
-
-    //! Find member by name.
-    /*!
-        This version is faster because it does not need a StrLen(). It can also handle string with null character.
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-
-        \note Earlier versions of Rapidjson returned a \c NULL pointer, in case
-            the requested member doesn't exist. For consistency with e.g.
-            \c std::map, this has been changed to MemberEnd() now.
-        \note Linear time complexity.
-    */
-    template <typename SourceAllocator>
-    MemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        CEREAL_RAPIDJSON_ASSERT(IsObject());
-        CEREAL_RAPIDJSON_ASSERT(name.IsString());
-        MemberIterator member = MemberBegin();
-        for ( ; member != MemberEnd(); ++member)
-            if (name.StringEqual(member->name))
-                break;
-        return member;
-    }
-    template <typename SourceAllocator> ConstMemberIterator FindMember(const GenericValue<Encoding, SourceAllocator>& name) const { return const_cast<GenericValue&>(*this).FindMember(name); }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Find member by string object name.
-    /*!
-        \param name Member name to be searched.
-        \pre IsObject() == true
-        \return Iterator to member, if it exists.
-            Otherwise returns \ref MemberEnd().
-    */
-    MemberIterator FindMember(const std::basic_string<Ch>& name) { return FindMember(GenericValue(StringRef(name))); }
-    ConstMemberIterator FindMember(const std::basic_string<Ch>& name) const { return FindMember(GenericValue(StringRef(name))); }
-#endif
-
-    //! Add a member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value Value of any type.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note The ownership of \c name and \c value will be transferred to this object on success.
-        \pre  IsObject() && name.IsString()
-        \post name.IsNull() && value.IsNull()
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, GenericValue& value, Allocator& allocator) {
-        CEREAL_RAPIDJSON_ASSERT(IsObject());
-        CEREAL_RAPIDJSON_ASSERT(name.IsString());
-
-        ObjectData& o = data_.o;
-        if (o.size >= o.capacity) {
-            if (o.capacity == 0) {
-                o.capacity = kDefaultObjectCapacity;
-                SetMembersPointer(reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member))));
-            }
-            else {
-                SizeType oldCapacity = o.capacity;
-                o.capacity += (oldCapacity + 1) / 2; // grow by factor 1.5
-                SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), oldCapacity * sizeof(Member), o.capacity * sizeof(Member))));
-            }
-        }
-        Member* members = GetMembersPointer();
-        members[o.size].name.RawAssign(name);
-        members[o.size].value.RawAssign(value);
-        o.size++;
-        return *this;
-    }
-
-    //! Add a constant string value as member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, StringRefType value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Add a string object as member (name-value pair) to the object.
-    /*! \param name A string value as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(GenericValue&,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(GenericValue& name, std::basic_string<Ch>& value, Allocator& allocator) {
-        GenericValue v(value, allocator);
-        return AddMember(name, v, allocator);
-    }
-#endif
-
-    //! Add any primitive value as member (name-value pair) to the object.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param name A string value as name of member.
-        \param value Value of primitive type \c T as value of member
-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
-            AddMember(StringRefType, StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized Constant time complexity.
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    AddMember(GenericValue& name, T value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericValue& AddMember(GenericValue&& name, GenericValue&& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(GenericValue&& name, GenericValue& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(GenericValue& name, GenericValue&& value, Allocator& allocator) {
-        return AddMember(name, value, allocator);
-    }
-    GenericValue& AddMember(StringRefType name, GenericValue&& value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-
-    //! Add a member (name-value pair) to the object.
-    /*! \param name A constant string reference as name of member.
-        \param value Value of any type.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note The ownership of \c value will be transferred to this object on success.
-        \pre  IsObject()
-        \post value.IsNull()
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(StringRefType name, GenericValue& value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-
-    //! Add a constant string value as member (name-value pair) to the object.
-    /*! \param name A constant string reference as name of member.
-        \param value constant string reference as value of member.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-        \note This overload is needed to avoid clashes with the generic primitive type AddMember(StringRefType,T,Allocator&) overload below.
-        \note Amortized Constant time complexity.
-    */
-    GenericValue& AddMember(StringRefType name, StringRefType value, Allocator& allocator) {
-        GenericValue v(value);
-        return AddMember(name, v, allocator);
-    }
-
-    //! Add any primitive value as member (name-value pair) to the object.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param name A constant string reference as name of member.
-        \param value Value of primitive type \c T as value of member
-        \param allocator Allocator for reallocating memory. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \pre  IsObject()
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref AddMember(StringRefType, GenericValue&, Allocator&) or \ref
-            AddMember(StringRefType, StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized Constant time complexity.
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    AddMember(StringRefType name, T value, Allocator& allocator) {
-        GenericValue n(name);
-        return AddMember(n, value, allocator);
-    }
-
-    //! Remove all members in the object.
-    /*! This function do not deallocate memory in the object, i.e. the capacity is unchanged.
-        \note Linear time complexity.
-    */
-    void RemoveAllMembers() {
-        CEREAL_RAPIDJSON_ASSERT(IsObject()); 
-        for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
-            m->~Member();
-        data_.o.size = 0;
-    }
-
-    //! Remove a member in object by its name.
-    /*! \param name Name of member to be removed.
-        \return Whether the member existed.
-        \note This function may reorder the object members. Use \ref
-            EraseMember(ConstMemberIterator) if you need to preserve the
-            relative order of the remaining members.
-        \note Linear time complexity.
-    */
-    bool RemoveMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return RemoveMember(n);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool RemoveMember(const std::basic_string<Ch>& name) { return RemoveMember(GenericValue(StringRef(name))); }
-#endif
-
-    template <typename SourceAllocator>
-    bool RemoveMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator m = FindMember(name);
-        if (m != MemberEnd()) {
-            RemoveMember(m);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    //! Remove a member in object by iterator.
-    /*! \param m member iterator (obtained by FindMember() or MemberBegin()).
-        \return the new iterator after removal.
-        \note This function may reorder the object members. Use \ref
-            EraseMember(ConstMemberIterator) if you need to preserve the
-            relative order of the remaining members.
-        \note Constant time complexity.
-    */
-    MemberIterator RemoveMember(MemberIterator m) {
-        CEREAL_RAPIDJSON_ASSERT(IsObject());
-        CEREAL_RAPIDJSON_ASSERT(data_.o.size > 0);
-        CEREAL_RAPIDJSON_ASSERT(GetMembersPointer() != 0);
-        CEREAL_RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
-
-        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
-        if (data_.o.size > 1 && m != last)
-            *m = *last; // Move the last one to this place
-        else
-            m->~Member(); // Only one left, just destroy
-        --data_.o.size;
-        return m;
-    }
-
-    //! Remove a member from an object by iterator.
-    /*! \param pos iterator to the member to remove
-        \pre IsObject() == true && \ref MemberBegin() <= \c pos < \ref MemberEnd()
-        \return Iterator following the removed element.
-            If the iterator \c pos refers to the last element, the \ref MemberEnd() iterator is returned.
-        \note This function preserves the relative order of the remaining object
-            members. If you do not need this, use the more efficient \ref RemoveMember(MemberIterator).
-        \note Linear time complexity.
-    */
-    MemberIterator EraseMember(ConstMemberIterator pos) {
-        return EraseMember(pos, pos +1);
-    }
-
-    //! Remove members in the range [first, last) from an object.
-    /*! \param first iterator to the first member to remove
-        \param last  iterator following the last member to remove
-        \pre IsObject() == true && \ref MemberBegin() <= \c first <= \c last <= \ref MemberEnd()
-        \return Iterator following the last removed element.
-        \note This function preserves the relative order of the remaining object
-            members.
-        \note Linear time complexity.
-    */
-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
-        CEREAL_RAPIDJSON_ASSERT(IsObject());
-        CEREAL_RAPIDJSON_ASSERT(data_.o.size > 0);
-        CEREAL_RAPIDJSON_ASSERT(GetMembersPointer() != 0);
-        CEREAL_RAPIDJSON_ASSERT(first >= MemberBegin());
-        CEREAL_RAPIDJSON_ASSERT(first <= last);
-        CEREAL_RAPIDJSON_ASSERT(last <= MemberEnd());
-
-        MemberIterator pos = MemberBegin() + (first - MemberBegin());
-        for (MemberIterator itr = pos; itr != last; ++itr)
-            itr->~Member();
-        std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
-        data_.o.size -= static_cast<SizeType>(last - first);
-        return pos;
-    }
-
-    //! Erase a member in object by its name.
-    /*! \param name Name of member to be removed.
-        \return Whether the member existed.
-        \note Linear time complexity.
-    */
-    bool EraseMember(const Ch* name) {
-        GenericValue n(StringRef(name));
-        return EraseMember(n);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool EraseMember(const std::basic_string<Ch>& name) { return EraseMember(GenericValue(StringRef(name))); }
-#endif
-
-    template <typename SourceAllocator>
-    bool EraseMember(const GenericValue<Encoding, SourceAllocator>& name) {
-        MemberIterator m = FindMember(name);
-        if (m != MemberEnd()) {
-            EraseMember(m);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    Object GetObject() { CEREAL_RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
-    ConstObject GetObject() const { CEREAL_RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
-
-    //@}
-
-    //!@name Array
-    //@{
-
-    //! Set this value as an empty array.
-    /*! \post IsArray == true */
-    GenericValue& SetArray() { this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
-
-    //! Get the number of elements in array.
-    SizeType Size() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
-
-    //! Get the capacity of array.
-    SizeType Capacity() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return data_.a.capacity; }
-
-    //! Check whether the array is empty.
-    bool Empty() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return data_.a.size == 0; }
-
-    //! Remove all elements in the array.
-    /*! This function do not deallocate memory in the array, i.e. the capacity is unchanged.
-        \note Linear time complexity.
-    */
-    void Clear() {
-        CEREAL_RAPIDJSON_ASSERT(IsArray()); 
-        GenericValue* e = GetElementsPointer();
-        for (GenericValue* v = e; v != e + data_.a.size; ++v)
-            v->~GenericValue();
-        data_.a.size = 0;
-    }
-
-    //! Get an element from array by index.
-    /*! \pre IsArray() == true
-        \param index Zero-based index of element.
-        \see operator[](T*)
-    */
-    GenericValue& operator[](SizeType index) {
-        CEREAL_RAPIDJSON_ASSERT(IsArray());
-        CEREAL_RAPIDJSON_ASSERT(index < data_.a.size);
-        return GetElementsPointer()[index];
-    }
-    const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
-
-    //! Element iterator
-    /*! \pre IsArray() == true */
-    ValueIterator Begin() { CEREAL_RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer(); }
-    //! \em Past-the-end element iterator
-    /*! \pre IsArray() == true */
-    ValueIterator End() { CEREAL_RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer() + data_.a.size; }
-    //! Constant element iterator
-    /*! \pre IsArray() == true */
-    ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
-    //! Constant \em past-the-end element iterator
-    /*! \pre IsArray() == true */
-    ConstValueIterator End() const { return const_cast<GenericValue&>(*this).End(); }
-
-    //! Request the array to have enough capacity to store elements.
-    /*! \param newCapacity  The capacity that the array at least need to have.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \note Linear time complexity.
-    */
-    GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
-        CEREAL_RAPIDJSON_ASSERT(IsArray());
-        if (newCapacity > data_.a.capacity) {
-            SetElementsPointer(reinterpret_cast<GenericValue*>(allocator.Realloc(GetElementsPointer(), data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue))));
-            data_.a.capacity = newCapacity;
-        }
-        return *this;
-    }
-
-    //! Append a GenericValue at the end of the array.
-    /*! \param value        Value to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \post value.IsNull() == true
-        \return The value itself for fluent API.
-        \note The ownership of \c value will be transferred to this array on success.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-        \note Amortized constant time complexity.
-    */
-    GenericValue& PushBack(GenericValue& value, Allocator& allocator) {
-        CEREAL_RAPIDJSON_ASSERT(IsArray());
-        if (data_.a.size >= data_.a.capacity)
-            Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
-        GetElementsPointer()[data_.a.size++].RawAssign(value);
-        return *this;
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericValue& PushBack(GenericValue&& value, Allocator& allocator) {
-        return PushBack(value, allocator);
-    }
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-    //! Append a constant string reference at the end of the array.
-    /*! \param value        Constant string reference to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one used previously. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \return The value itself for fluent API.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-        \note Amortized constant time complexity.
-        \see GenericStringRef
-    */
-    GenericValue& PushBack(StringRefType value, Allocator& allocator) {
-        return (*this).template PushBack<StringRefType>(value, allocator);
-    }
-
-    //! Append a primitive value at the end of the array.
-    /*! \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t
-        \param value Value of primitive type T to be appended.
-        \param allocator    Allocator for reallocating memory. It must be the same one as used before. Commonly use GenericDocument::GetAllocator().
-        \pre IsArray() == true
-        \return The value itself for fluent API.
-        \note If the number of elements to be appended is known, calls Reserve() once first may be more efficient.
-
-        \note The source type \c T explicitly disallows all pointer types,
-            especially (\c const) \ref Ch*.  This helps avoiding implicitly
-            referencing character strings with insufficient lifetime, use
-            \ref PushBack(GenericValue&, Allocator&) or \ref
-            PushBack(StringRefType, Allocator&).
-            All other pointer types would implicitly convert to \c bool,
-            use an explicit cast instead, if needed.
-        \note Amortized constant time complexity.
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericValue&))
-    PushBack(T value, Allocator& allocator) {
-        GenericValue v(value);
-        return PushBack(v, allocator);
-    }
-
-    //! Remove the last element in the array.
-    /*!
-        \note Constant time complexity.
-    */
-    GenericValue& PopBack() {
-        CEREAL_RAPIDJSON_ASSERT(IsArray());
-        CEREAL_RAPIDJSON_ASSERT(!Empty());
-        GetElementsPointer()[--data_.a.size].~GenericValue();
-        return *this;
-    }
-
-    //! Remove an element of array by iterator.
-    /*!
-        \param pos iterator to the element to remove
-        \pre IsArray() == true && \ref Begin() <= \c pos < \ref End()
-        \return Iterator following the removed element. If the iterator pos refers to the last element, the End() iterator is returned.
-        \note Linear time complexity.
-    */
-    ValueIterator Erase(ConstValueIterator pos) {
-        return Erase(pos, pos + 1);
-    }
-
-    //! Remove elements in the range [first, last) of the array.
-    /*!
-        \param first iterator to the first element to remove
-        \param last  iterator following the last element to remove
-        \pre IsArray() == true && \ref Begin() <= \c first <= \c last <= \ref End()
-        \return Iterator following the last removed element.
-        \note Linear time complexity.
-    */
-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
-        CEREAL_RAPIDJSON_ASSERT(IsArray());
-        CEREAL_RAPIDJSON_ASSERT(data_.a.size > 0);
-        CEREAL_RAPIDJSON_ASSERT(GetElementsPointer() != 0);
-        CEREAL_RAPIDJSON_ASSERT(first >= Begin());
-        CEREAL_RAPIDJSON_ASSERT(first <= last);
-        CEREAL_RAPIDJSON_ASSERT(last <= End());
-        ValueIterator pos = Begin() + (first - Begin());
-        for (ValueIterator itr = pos; itr != last; ++itr)
-            itr->~GenericValue();       
-        std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
-        data_.a.size -= static_cast<SizeType>(last - first);
-        return pos;
-    }
-
-    Array GetArray() { CEREAL_RAPIDJSON_ASSERT(IsArray()); return Array(*this); }
-    ConstArray GetArray() const { CEREAL_RAPIDJSON_ASSERT(IsArray()); return ConstArray(*this); }
-
-    //@}
-
-    //!@name Number
-    //@{
-
-    int GetInt() const          { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kIntFlag);   return data_.n.i.i;   }
-    unsigned GetUint() const    { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kUintFlag);  return data_.n.u.u;   }
-    int64_t GetInt64() const    { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kInt64Flag); return data_.n.i64; }
-    uint64_t GetUint64() const  { CEREAL_RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; }
-
-    //! Get the value as double type.
-    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless.
-    */
-    double GetDouble() const {
-        CEREAL_RAPIDJSON_ASSERT(IsNumber());
-        if ((data_.f.flags & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
-        if ((data_.f.flags & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
-        if ((data_.f.flags & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
-        if ((data_.f.flags & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
-        CEREAL_RAPIDJSON_ASSERT((data_.f.flags & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
-    }
-
-    //! Get the value as float type.
-    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless.
-    */
-    float GetFloat() const {
-        return static_cast<float>(GetDouble());
-    }
-
-    GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
-    GenericValue& SetUint(unsigned u)       { this->~GenericValue(); new (this) GenericValue(u);    return *this; }
-    GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
-    GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
-    GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
-    GenericValue& SetFloat(float f)         { this->~GenericValue(); new (this) GenericValue(f);    return *this; }
-
-    //@}
-
-    //!@name String
-    //@{
-
-    const Ch* GetString() const { CEREAL_RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
-
-    //! Get the length of string.
-    /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
-    */
-    SizeType GetStringLength() const { CEREAL_RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
-
-    //! Set this value as a string without copying source string.
-    /*! This version has better performance with supplied length, and also support string containing null character.
-        \param s source string pointer. 
-        \param length The length of source string, excluding the trailing null terminator.
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() == s && GetStringLength() == length
-        \see SetString(StringRefType)
-    */
-    GenericValue& SetString(const Ch* s, SizeType length) { return SetString(StringRef(s, length)); }
-
-    //! Set this value as a string without copying source string.
-    /*! \param s source string reference
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() == s && GetStringLength() == s.length
-    */
-    GenericValue& SetString(StringRefType s) { this->~GenericValue(); SetStringRaw(s); return *this; }
-
-    //! Set this value as a string by copying from source string.
-    /*! This version has better performance with supplied length, and also support string containing null character.
-        \param s source string. 
-        \param length The length of source string, excluding the trailing null terminator.
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { this->~GenericValue(); SetStringRaw(StringRef(s, length), allocator); return *this; }
-
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string. 
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s && strcmp(GetString(),s) == 0 && GetStringLength() == length
-    */
-    GenericValue& SetString(const Ch* s, Allocator& allocator) { return SetString(s, internal::StrLen(s), allocator); }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Set this value as a string by copying from source string.
-    /*! \param s source string.
-        \param allocator Allocator for allocating copied buffer. Commonly use GenericDocument::GetAllocator().
-        \return The value itself for fluent API.
-        \post IsString() == true && GetString() != s.data() && strcmp(GetString(),s.data() == 0 && GetStringLength() == s.size()
-        \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
-    */
-    GenericValue& SetString(const std::basic_string<Ch>& s, Allocator& allocator) { return SetString(s.data(), SizeType(s.size()), allocator); }
-#endif
-
-    //@}
-
-    //!@name Array
-    //@{
-
-    //! Templated version for checking whether this value is type T.
-    /*!
-        \tparam T Either \c bool, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c float, \c const \c char*, \c std::basic_string<Ch>
-    */
-    template <typename T>
-    bool Is() const { return internal::TypeHelper<ValueType, T>::Is(*this); }
-
-    template <typename T>
-    T Get() const { return internal::TypeHelper<ValueType, T>::Get(*this); }
-
-    template <typename T>
-    T Get() { return internal::TypeHelper<ValueType, T>::Get(*this); }
-
-    template<typename T>
-    ValueType& Set(const T& data) { return internal::TypeHelper<ValueType, T>::Set(*this, data); }
-
-    template<typename T>
-    ValueType& Set(const T& data, AllocatorType& allocator) { return internal::TypeHelper<ValueType, T>::Set(*this, data, allocator); }
-
-    //@}
-
-    //! Generate events of this value to a Handler.
-    /*! This function adopts the GoF visitor pattern.
-        Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
-        It can also be used to deep clone this value via GenericDocument, which is also a Handler.
-        \tparam Handler type of handler.
-        \param handler An object implementing concept Handler.
-    */
-    template <typename Handler>
-    bool Accept(Handler& handler) const {
-        switch(GetType()) {
-        case kNullType:     return handler.Null();
-        case kFalseType:    return handler.Bool(false);
-        case kTrueType:     return handler.Bool(true);
-
-        case kObjectType:
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartObject()))
-                return false;
-            for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
-                CEREAL_RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
-                if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.data_.f.flags & kCopyFlag) != 0)))
-                    return false;
-                if (CEREAL_RAPIDJSON_UNLIKELY(!m->value.Accept(handler)))
-                    return false;
-            }
-            return handler.EndObject(data_.o.size);
-
-        case kArrayType:
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartArray()))
-                return false;
-            for (const GenericValue* v = Begin(); v != End(); ++v)
-                if (CEREAL_RAPIDJSON_UNLIKELY(!v->Accept(handler)))
-                    return false;
-            return handler.EndArray(data_.a.size);
-    
-        case kStringType:
-            return handler.String(GetString(), GetStringLength(), (data_.f.flags & kCopyFlag) != 0);
-    
-        default:
-            CEREAL_RAPIDJSON_ASSERT(GetType() == kNumberType);
-            if (IsDouble())         return handler.Double(data_.n.d);
-            else if (IsInt())       return handler.Int(data_.n.i.i);
-            else if (IsUint())      return handler.Uint(data_.n.u.u);
-            else if (IsInt64())     return handler.Int64(data_.n.i64);
-            else                    return handler.Uint64(data_.n.u64);
-        }
-    }
-
-private:
-    template <typename, typename> friend class GenericValue;
-    template <typename, typename, typename> friend class GenericDocument;
-
-    enum {
-        kBoolFlag       = 0x0008,
-        kNumberFlag     = 0x0010,
-        kIntFlag        = 0x0020,
-        kUintFlag       = 0x0040,
-        kInt64Flag      = 0x0080,
-        kUint64Flag     = 0x0100,
-        kDoubleFlag     = 0x0200,
-        kStringFlag     = 0x0400,
-        kCopyFlag       = 0x0800,
-        kInlineStrFlag  = 0x1000,
-
-        // Initial flags of different types.
-        kNullFlag = kNullType,
-        kTrueFlag = kTrueType | kBoolFlag,
-        kFalseFlag = kFalseType | kBoolFlag,
-        kNumberIntFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag,
-        kNumberUintFlag = kNumberType | kNumberFlag | kUintFlag | kUint64Flag | kInt64Flag,
-        kNumberInt64Flag = kNumberType | kNumberFlag | kInt64Flag,
-        kNumberUint64Flag = kNumberType | kNumberFlag | kUint64Flag,
-        kNumberDoubleFlag = kNumberType | kNumberFlag | kDoubleFlag,
-        kNumberAnyFlag = kNumberType | kNumberFlag | kIntFlag | kInt64Flag | kUintFlag | kUint64Flag | kDoubleFlag,
-        kConstStringFlag = kStringType | kStringFlag,
-        kCopyStringFlag = kStringType | kStringFlag | kCopyFlag,
-        kShortStringFlag = kStringType | kStringFlag | kCopyFlag | kInlineStrFlag,
-        kObjectFlag = kObjectType,
-        kArrayFlag = kArrayType,
-
-        kTypeMask = 0x07
-    };
-
-    static const SizeType kDefaultArrayCapacity = 16;
-    static const SizeType kDefaultObjectCapacity = 16;
-
-    struct Flag {
-#if CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
-        char payload[sizeof(SizeType) * 2 + 6];     // 2 x SizeType + lower 48-bit pointer
-#elif CEREAL_RAPIDJSON_64BIT
-        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 6]; // 6 padding bytes
-#else
-        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 2]; // 2 padding bytes
-#endif
-        uint16_t flags;
-    };
-
-    struct String {
-        SizeType length;
-        SizeType hashcode;  //!< reserved
-        const Ch* str;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
-    // (excluding the terminating zero) and store a value to determine the length of the contained
-    // string in the last character str[LenPos] by storing "MaxSize - length" there. If the string
-    // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
-    // the string terminator as well. For getting the string length back from that value just use
-    // "MaxSize - str[LenPos]".
-    // This allows to store 13-chars strings in 32-bit mode, 21-chars strings in 64-bit mode,
-    // 13-chars strings for CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION=1 inline (for `UTF8`-encoded strings).
-    struct ShortString {
-        enum { MaxChars = sizeof(static_cast<Flag*>(0)->payload) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
-        Ch str[MaxChars];
-
-        inline static bool Usable(SizeType len) { return                       (MaxSize >= len); }
-        inline void     SetLength(SizeType len) { str[LenPos] = static_cast<Ch>(MaxSize -  len); }
-        inline SizeType GetLength() const       { return  static_cast<SizeType>(MaxSize -  str[LenPos]); }
-    };  // at most as many bytes as "String" above => 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    // By using proper binary layout, retrieval of different integer types do not need conversions.
-    union Number {
-#if CEREAL_RAPIDJSON_ENDIAN == CEREAL_RAPIDJSON_LITTLEENDIAN
-        struct I {
-            int i;
-            char padding[4];
-        }i;
-        struct U {
-            unsigned u;
-            char padding2[4];
-        }u;
-#else
-        struct I {
-            char padding[4];
-            int i;
-        }i;
-        struct U {
-            char padding2[4];
-            unsigned u;
-        }u;
-#endif
-        int64_t i64;
-        uint64_t u64;
-        double d;
-    };  // 8 bytes
-
-    struct ObjectData {
-        SizeType size;
-        SizeType capacity;
-        Member* members;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    struct ArrayData {
-        SizeType size;
-        SizeType capacity;
-        GenericValue* elements;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    union Data {
-        String s;
-        ShortString ss;
-        Number n;
-        ObjectData o;
-        ArrayData a;
-        Flag f;
-    };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-    CEREAL_RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return CEREAL_RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
-    CEREAL_RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return CEREAL_RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
-    CEREAL_RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return CEREAL_RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
-    CEREAL_RAPIDJSON_FORCEINLINE GenericValue* SetElementsPointer(GenericValue* elements) { return CEREAL_RAPIDJSON_SETPOINTER(GenericValue, data_.a.elements, elements); }
-    CEREAL_RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return CEREAL_RAPIDJSON_GETPOINTER(Member, data_.o.members); }
-    CEREAL_RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return CEREAL_RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
-
-    // Initialize this value as array with initial data, without calling destructor.
-    void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
-        data_.f.flags = kArrayFlag;
-        if (count) {
-            GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
-            SetElementsPointer(e);
-            std::memcpy(e, values, count * sizeof(GenericValue));
-        }
-        else
-            SetElementsPointer(0);
-        data_.a.size = data_.a.capacity = count;
-    }
-
-    //! Initialize this value as object with initial data, without calling destructor.
-    void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
-        data_.f.flags = kObjectFlag;
-        if (count) {
-            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-            SetMembersPointer(m);
-            std::memcpy(m, members, count * sizeof(Member));
-        }
-        else
-            SetMembersPointer(0);
-        data_.o.size = data_.o.capacity = count;
-    }
-
-    //! Initialize this value as constant string, without calling destructor.
-    void SetStringRaw(StringRefType s) CEREAL_RAPIDJSON_NOEXCEPT {
-        data_.f.flags = kConstStringFlag;
-        SetStringPointer(s);
-        data_.s.length = s.length;
-    }
-
-    //! Initialize this value as copy string with initial data, without calling destructor.
-    void SetStringRaw(StringRefType s, Allocator& allocator) {
-        Ch* str = 0;
-        if (ShortString::Usable(s.length)) {
-            data_.f.flags = kShortStringFlag;
-            data_.ss.SetLength(s.length);
-            str = data_.ss.str;
-        } else {
-            data_.f.flags = kCopyStringFlag;
-            data_.s.length = s.length;
-            str = static_cast<Ch *>(allocator.Malloc((s.length + 1) * sizeof(Ch)));
-            SetStringPointer(str);
-        }
-        std::memcpy(str, s, s.length * sizeof(Ch));
-        str[s.length] = '\0';
-    }
-
-    //! Assignment without calling destructor
-    void RawAssign(GenericValue& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
-        data_ = rhs.data_;
-        // data_.f.flags = rhs.data_.f.flags;
-        rhs.data_.f.flags = kNullFlag;
-    }
-
-    template <typename SourceAllocator>
-    bool StringEqual(const GenericValue<Encoding, SourceAllocator>& rhs) const {
-        CEREAL_RAPIDJSON_ASSERT(IsString());
-        CEREAL_RAPIDJSON_ASSERT(rhs.IsString());
-
-        const SizeType len1 = GetStringLength();
-        const SizeType len2 = rhs.GetStringLength();
-        if(len1 != len2) { return false; }
-
-        const Ch* const str1 = GetString();
-        const Ch* const str2 = rhs.GetString();
-        if(str1 == str2) { return true; } // fast path for constant string
-
-        return (std::memcmp(str1, str2, sizeof(Ch) * len1) == 0);
-    }
-
-    Data data_;
-};
-
-//! GenericValue with UTF8 encoding
-typedef GenericValue<UTF8<> > Value;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericDocument 
-
-//! A document for parsing JSON text as DOM.
-/*!
-    \note implements Handler concept
-    \tparam Encoding Encoding for both parsing and string storage.
-    \tparam Allocator Allocator for allocating memory for the DOM
-    \tparam StackAllocator Allocator for allocating memory for stack during parsing.
-    \warning Although GenericDocument inherits from GenericValue, the API does \b not provide any virtual functions, especially no virtual destructor.  To avoid memory leaks, do not \c delete a GenericDocument object via a pointer to a GenericValue.
-*/
-template <typename Encoding, typename Allocator = MemoryPoolAllocator<>, typename StackAllocator = CrtAllocator>
-class GenericDocument : public GenericValue<Encoding, Allocator> {
-public:
-    typedef typename Encoding::Ch Ch;                       //!< Character type derived from Encoding.
-    typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of the document.
-    typedef Allocator AllocatorType;                        //!< Allocator type from template parameter.
-
-    //! Constructor
-    /*! Creates an empty document of specified type.
-        \param type             Mandatory type of object to create.
-        \param allocator        Optional allocator for allocating memory.
-        \param stackCapacity    Optional initial capacity of stack in bytes.
-        \param stackAllocator   Optional allocator for allocating memory for stack.
-    */
-    explicit GenericDocument(Type type, Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) :
-        GenericValue<Encoding, Allocator>(type),  allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
-    }
-
-    //! Constructor
-    /*! Creates an empty document which type is Null. 
-        \param allocator        Optional allocator for allocating memory.
-        \param stackCapacity    Optional initial capacity of stack in bytes.
-        \param stackAllocator   Optional allocator for allocating memory for stack.
-    */
-    GenericDocument(Allocator* allocator = 0, size_t stackCapacity = kDefaultStackCapacity, StackAllocator* stackAllocator = 0) : 
-        allocator_(allocator), ownAllocator_(0), stack_(stackAllocator, stackCapacity), parseResult_()
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericDocument(GenericDocument&& rhs) CEREAL_RAPIDJSON_NOEXCEPT
-        : ValueType(std::forward<ValueType>(rhs)), // explicit cast to avoid prohibited move from Document
-          allocator_(rhs.allocator_),
-          ownAllocator_(rhs.ownAllocator_),
-          stack_(std::move(rhs.stack_)),
-          parseResult_(rhs.parseResult_)
-    {
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.parseResult_ = ParseResult();
-    }
-#endif
-
-    ~GenericDocument() {
-        Destroy();
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move assignment in C++11
-    GenericDocument& operator=(GenericDocument&& rhs) CEREAL_RAPIDJSON_NOEXCEPT
-    {
-        // The cast to ValueType is necessary here, because otherwise it would
-        // attempt to call GenericValue's templated assignment operator.
-        ValueType::operator=(std::forward<ValueType>(rhs));
-
-        // Calling the destructor here would prematurely call stack_'s destructor
-        Destroy();
-
-        allocator_ = rhs.allocator_;
-        ownAllocator_ = rhs.ownAllocator_;
-        stack_ = std::move(rhs.stack_);
-        parseResult_ = rhs.parseResult_;
-
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.parseResult_ = ParseResult();
-
-        return *this;
-    }
-#endif
-
-    //! Exchange the contents of this document with those of another.
-    /*!
-        \param rhs Another document.
-        \note Constant complexity.
-        \see GenericValue::Swap
-    */
-    GenericDocument& Swap(GenericDocument& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
-        ValueType::Swap(rhs);
-        stack_.Swap(rhs.stack_);
-        internal::Swap(allocator_, rhs.allocator_);
-        internal::Swap(ownAllocator_, rhs.ownAllocator_);
-        internal::Swap(parseResult_, rhs.parseResult_);
-        return *this;
-    }
-
-    //! free-standing swap function helper
-    /*!
-        Helper function to enable support for common swap implementation pattern based on \c std::swap:
-        \code
-        void swap(MyClass& a, MyClass& b) {
-            using std::swap;
-            swap(a.doc, b.doc);
-            // ...
-        }
-        \endcode
-        \see Swap()
-     */
-    friend inline void swap(GenericDocument& a, GenericDocument& b) CEREAL_RAPIDJSON_NOEXCEPT { a.Swap(b); }
-
-    //! Populate this document by a generator which produces SAX events.
-    /*! \tparam Generator A functor with <tt>bool f(Handler)</tt> prototype.
-        \param g Generator functor which sends SAX events to the parameter.
-        \return The document itself for fluent API.
-    */
-    template <typename Generator>
-    GenericDocument& Populate(Generator& g) {
-        ClearStackOnExit scope(*this);
-        if (g(*this)) {
-            CEREAL_RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
-        }
-        return *this;
-    }
-
-    //!@name Parse from stream
-    //!@{
-
-    //! Parse JSON text from an input stream (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam SourceEncoding Encoding of input stream
-        \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename SourceEncoding, typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        GenericReader<SourceEncoding, Encoding, StackAllocator> reader(
-            stack_.HasAllocator() ? &stack_.GetAllocator() : 0);
-        ClearStackOnExit scope(*this);
-        parseResult_ = reader.template Parse<parseFlags>(is, *this);
-        if (parseResult_) {
-            CEREAL_RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
-            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
-        }
-        return *this;
-    }
-
-    //! Parse JSON text from an input stream
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags, typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<parseFlags, Encoding, InputStream>(is);
-    }
-
-    //! Parse JSON text from an input stream (with \ref kParseDefaultFlags)
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \param is Input stream to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <typename InputStream>
-    GenericDocument& ParseStream(InputStream& is) {
-        return ParseStream<kParseDefaultFlags, Encoding, InputStream>(is);
-    }
-    //!@}
-
-    //!@name Parse in-place from mutable string
-    //!@{
-
-    //! Parse JSON text from a mutable string
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    template <unsigned parseFlags>
-    GenericDocument& ParseInsitu(Ch* str) {
-        GenericInsituStringStream<Encoding> s(str);
-        return ParseStream<parseFlags | kParseInsituFlag>(s);
-    }
-
-    //! Parse JSON text from a mutable string (with \ref kParseDefaultFlags)
-    /*! \param str Mutable zero-terminated string to be parsed.
-        \return The document itself for fluent API.
-    */
-    GenericDocument& ParseInsitu(Ch* str) {
-        return ParseInsitu<kParseDefaultFlags>(str);
-    }
-    //!@}
-
-    //!@name Parse from read-only string
-    //!@{
-
-    //! Parse JSON text from a read-only string (with Encoding conversion)
-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
-        \tparam SourceEncoding Transcoding from input Encoding
-        \param str Read-only zero-terminated string to be parsed.
-    */
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const typename SourceEncoding::Ch* str) {
-        CEREAL_RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
-        GenericStringStream<SourceEncoding> s(str);
-        return ParseStream<parseFlags, SourceEncoding>(s);
-    }
-
-    //! Parse JSON text from a read-only string
-    /*! \tparam parseFlags Combination of \ref ParseFlag (must not contain \ref kParseInsituFlag).
-        \param str Read-only zero-terminated string to be parsed.
-    */
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const Ch* str) {
-        return Parse<parseFlags, Encoding>(str);
-    }
-
-    //! Parse JSON text from a read-only string (with \ref kParseDefaultFlags)
-    /*! \param str Read-only zero-terminated string to be parsed.
-    */
-    GenericDocument& Parse(const Ch* str) {
-        return Parse<kParseDefaultFlags>(str);
-    }
-
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const typename SourceEncoding::Ch* str, size_t length) {
-        CEREAL_RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
-        MemoryStream ms(static_cast<const char*>(str), length * sizeof(typename SourceEncoding::Ch));
-        EncodedInputStream<SourceEncoding, MemoryStream> is(ms);
-        ParseStream<parseFlags, SourceEncoding>(is);
-        return *this;
-    }
-
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const Ch* str, size_t length) {
-        return Parse<parseFlags, Encoding>(str, length);
-    }
-    
-    GenericDocument& Parse(const Ch* str, size_t length) {
-        return Parse<kParseDefaultFlags>(str, length);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    template <unsigned parseFlags, typename SourceEncoding>
-    GenericDocument& Parse(const std::basic_string<typename SourceEncoding::Ch>& str) {
-        // c_str() is constant complexity according to standard. Should be faster than Parse(const char*, size_t)
-        return Parse<parseFlags, SourceEncoding>(str.c_str());
-    }
-
-    template <unsigned parseFlags>
-    GenericDocument& Parse(const std::basic_string<Ch>& str) {
-        return Parse<parseFlags, Encoding>(str.c_str());
-    }
-
-    GenericDocument& Parse(const std::basic_string<Ch>& str) {
-        return Parse<kParseDefaultFlags>(str);
-    }
-#endif // CEREAL_RAPIDJSON_HAS_STDSTRING    
-
-    //!@}
-
-    //!@name Handling parse errors
-    //!@{
-
-    //! Whether a parse error has occured in the last parsing.
-    bool HasParseError() const { return parseResult_.IsError(); }
-
-    //! Get the \ref ParseErrorCode of last parsing.
-    ParseErrorCode GetParseError() const { return parseResult_.Code(); }
-
-    //! Get the position of last parsing error in input, 0 otherwise.
-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
-
-    //! Implicit conversion to get the last parse result
-#ifndef __clang // -Wdocumentation
-    /*! \return \ref ParseResult of the last parse operation
-
-        \code
-          Document doc;
-          ParseResult ok = doc.Parse(json);
-          if (!ok)
-            printf( "JSON parse error: %s (%u)\n", GetParseError_En(ok.Code()), ok.Offset());
-        \endcode
-     */
-#endif
-    operator ParseResult() const { return parseResult_; }
-    //!@}
-
-    //! Get the allocator of this document.
-    Allocator& GetAllocator() {
-        CEREAL_RAPIDJSON_ASSERT(allocator_);
-        return *allocator_;
-    }
-
-    //! Get the capacity of stack in bytes.
-    size_t GetStackCapacity() const { return stack_.GetCapacity(); }
-
-private:
-    // clear stack on any exit from ParseStream, e.g. due to exception
-    struct ClearStackOnExit {
-        explicit ClearStackOnExit(GenericDocument& d) : d_(d) {}
-        ~ClearStackOnExit() { d_.ClearStack(); }
-    private:
-        ClearStackOnExit(const ClearStackOnExit&);
-        ClearStackOnExit& operator=(const ClearStackOnExit&);
-        GenericDocument& d_;
-    };
-
-    // callers of the following private Handler functions
-    // template <typename,typename,typename> friend class GenericReader; // for parsing
-    template <typename, typename> friend class GenericValue; // for deep copying
-
-public:
-    // Implementation of Handler
-    bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
-    bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
-    bool Int(int i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Uint(unsigned i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Int64(int64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy) { 
-        if (copy) 
-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
-        else
-            new (stack_.template Push<ValueType>()) ValueType(str, length);
-        return true;
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy) { 
-        if (copy) 
-            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
-        else
-            new (stack_.template Push<ValueType>()) ValueType(str, length);
-        return true;
-    }
-
-    bool StartObject() { new (stack_.template Push<ValueType>()) ValueType(kObjectType); return true; }
-    
-    bool Key(const Ch* str, SizeType length, bool copy) { return String(str, length, copy); }
-
-    bool EndObject(SizeType memberCount) {
-        typename ValueType::Member* members = stack_.template Pop<typename ValueType::Member>(memberCount);
-        stack_.template Top<ValueType>()->SetObjectRaw(members, memberCount, GetAllocator());
-        return true;
-    }
-
-    bool StartArray() { new (stack_.template Push<ValueType>()) ValueType(kArrayType); return true; }
-    
-    bool EndArray(SizeType elementCount) {
-        ValueType* elements = stack_.template Pop<ValueType>(elementCount);
-        stack_.template Top<ValueType>()->SetArrayRaw(elements, elementCount, GetAllocator());
-        return true;
-    }
-
-private:
-    //! Prohibit copying
-    GenericDocument(const GenericDocument&);
-    //! Prohibit assignment
-    GenericDocument& operator=(const GenericDocument&);
-
-    void ClearStack() {
-        if (Allocator::kNeedFree)
-            while (stack_.GetSize() > 0)    // Here assumes all elements in stack array are GenericValue (Member is actually 2 GenericValue objects)
-                (stack_.template Pop<ValueType>(1))->~ValueType();
-        else
-            stack_.Clear();
-        stack_.ShrinkToFit();
-    }
-
-    void Destroy() {
-        CEREAL_RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    static const size_t kDefaultStackCapacity = 1024;
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    internal::Stack<StackAllocator> stack_;
-    ParseResult parseResult_;
-};
-
-//! GenericDocument with UTF8 encoding
-typedef GenericDocument<UTF8<> > Document;
-
-// defined here due to the dependency on GenericDocument
-template <typename Encoding, typename Allocator>
-template <typename SourceAllocator>
-inline
-GenericValue<Encoding,Allocator>::GenericValue(const GenericValue<Encoding,SourceAllocator>& rhs, Allocator& allocator)
-{
-    switch (rhs.GetType()) {
-    case kObjectType:
-    case kArrayType: { // perform deep copy via SAX Handler
-            GenericDocument<Encoding,Allocator> d(&allocator);
-            rhs.Accept(d);
-            RawAssign(*d.stack_.template Pop<GenericValue>(1));
-        }
-        break;
-    case kStringType:
-        if (rhs.data_.f.flags == kConstStringFlag) {
-            data_.f.flags = rhs.data_.f.flags;
-            data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-        } else {
-            SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
-        }
-        break;
-    default:
-        data_.f.flags = rhs.data_.f.flags;
-        data_  = *reinterpret_cast<const Data*>(&rhs.data_);
-        break;
-    }
-}
-
-//! Helper class for accessing Value of array type.
-/*!
-    Instance of this helper class is obtained by \c GenericValue::GetArray().
-    In addition to all APIs for array type, it provides range-based for loop if \c CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
-*/
-template <bool Const, typename ValueT>
-class GenericArray {
-public:
-    typedef GenericArray<true, ValueT> ConstArray;
-    typedef GenericArray<false, ValueT> Array;
-    typedef ValueT PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef ValueType* ValueIterator;  // This may be const or non-const iterator
-    typedef const ValueT* ConstValueIterator;
-    typedef typename ValueType::AllocatorType AllocatorType;
-    typedef typename ValueType::StringRefType StringRefType;
-
-    template <typename, typename>
-    friend class GenericValue;
-
-    GenericArray(const GenericArray& rhs) : value_(rhs.value_) {}
-    GenericArray& operator=(const GenericArray& rhs) { value_ = rhs.value_; return *this; }
-    ~GenericArray() {}
-
-    SizeType Size() const { return value_.Size(); }
-    SizeType Capacity() const { return value_.Capacity(); }
-    bool Empty() const { return value_.Empty(); }
-    void Clear() const { value_.Clear(); }
-    ValueType& operator[](SizeType index) const {  return value_[index]; }
-    ValueIterator Begin() const { return value_.Begin(); }
-    ValueIterator End() const { return value_.End(); }
-    GenericArray Reserve(SizeType newCapacity, AllocatorType &allocator) const { value_.Reserve(newCapacity, allocator); return *this; }
-    GenericArray PushBack(ValueType& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericArray PushBack(ValueType&& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericArray PushBack(StringRefType value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (const GenericArray&)) PushBack(T value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
-    GenericArray PopBack() const { value_.PopBack(); return *this; }
-    ValueIterator Erase(ConstValueIterator pos) const { return value_.Erase(pos); }
-    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) const { return value_.Erase(first, last); }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
-    ValueIterator begin() const { return value_.Begin(); }
-    ValueIterator end() const { return value_.End(); }
-#endif
-
-private:
-    GenericArray();
-    GenericArray(ValueType& value) : value_(value) {}
-    ValueType& value_;
-};
-
-//! Helper class for accessing Value of object type.
-/*!
-    Instance of this helper class is obtained by \c GenericValue::GetObject().
-    In addition to all APIs for array type, it provides range-based for loop if \c CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
-*/
-template <bool Const, typename ValueT>
-class GenericObject {
-public:
-    typedef GenericObject<true, ValueT> ConstObject;
-    typedef GenericObject<false, ValueT> Object;
-    typedef ValueT PlainType;
-    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
-    typedef GenericMemberIterator<Const, typename ValueT::EncodingType, typename ValueT::AllocatorType> MemberIterator;  // This may be const or non-const iterator
-    typedef GenericMemberIterator<true, typename ValueT::EncodingType, typename ValueT::AllocatorType> ConstMemberIterator;
-    typedef typename ValueType::AllocatorType AllocatorType;
-    typedef typename ValueType::StringRefType StringRefType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename ValueType::Ch Ch;
-
-    template <typename, typename>
-    friend class GenericValue;
-
-    GenericObject(const GenericObject& rhs) : value_(rhs.value_) {}
-    GenericObject& operator=(const GenericObject& rhs) { value_ = rhs.value_; return *this; }
-    ~GenericObject() {}
-
-    SizeType MemberCount() const { return value_.MemberCount(); }
-    bool ObjectEmpty() const { return value_.ObjectEmpty(); }
-    template <typename T> ValueType& operator[](T* name) const { return value_[name]; }
-    template <typename SourceAllocator> ValueType& operator[](const GenericValue<EncodingType, SourceAllocator>& name) const { return value_[name]; }
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    ValueType& operator[](const std::basic_string<Ch>& name) const { return value_[name]; }
-#endif
-    MemberIterator MemberBegin() const { return value_.MemberBegin(); }
-    MemberIterator MemberEnd() const { return value_.MemberEnd(); }
-    bool HasMember(const Ch* name) const { return value_.HasMember(name); }
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool HasMember(const std::basic_string<Ch>& name) const { return value_.HasMember(name); }
-#endif
-    template <typename SourceAllocator> bool HasMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.HasMember(name); }
-    MemberIterator FindMember(const Ch* name) const { return value_.FindMember(name); }
-    template <typename SourceAllocator> MemberIterator FindMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.FindMember(name); }
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    MemberIterator FindMember(const std::basic_string<Ch>& name) const { return value_.FindMember(name); }
-#endif
-    GenericObject AddMember(ValueType& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType& name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    GenericObject AddMember(ValueType& name, std::basic_string<Ch>& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#endif
-    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&)) AddMember(ValueType& name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericObject AddMember(ValueType&& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType&& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(ValueType& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(StringRefType name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericObject AddMember(StringRefType name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    GenericObject AddMember(StringRefType name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    template <typename T> CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericObject)) AddMember(StringRefType name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
-    void RemoveAllMembers() { return value_.RemoveAllMembers(); }
-    bool RemoveMember(const Ch* name) const { return value_.RemoveMember(name); }
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool RemoveMember(const std::basic_string<Ch>& name) const { return value_.RemoveMember(name); }
-#endif
-    template <typename SourceAllocator> bool RemoveMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.RemoveMember(name); }
-    MemberIterator RemoveMember(MemberIterator m) const { return value_.RemoveMember(m); }
-    MemberIterator EraseMember(ConstMemberIterator pos) const { return value_.EraseMember(pos); }
-    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) const { return value_.EraseMember(first, last); }
-    bool EraseMember(const Ch* name) const { return value_.EraseMember(name); }
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool EraseMember(const std::basic_string<Ch>& name) const { return EraseMember(ValueType(StringRef(name))); }
-#endif
-    template <typename SourceAllocator> bool EraseMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.EraseMember(name); }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
-    MemberIterator begin() const { return value_.MemberBegin(); }
-    MemberIterator end() const { return value_.MemberEnd(); }
-#endif
-
-private:
-    GenericObject();
-    GenericObject(ValueType& value) : value_(value) {}
-    ValueType& value_;
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-CEREAL_RAPIDJSON_DIAG_POP
-
-#endif // CEREAL_RAPIDJSON_DOCUMENT_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h b/Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h
deleted file mode 100644
index 9671394..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/encodedstream.h
+++ /dev/null
@@ -1,299 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ENCODEDSTREAM_H_
-#define CEREAL_RAPIDJSON_ENCODEDSTREAM_H_
-
-#include "stream.h"
-#include "memorystream.h"
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Input byte stream wrapper with a statically bound encoding.
-/*!
-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam InputByteStream Type of input byte stream. For example, FileReadStream.
-*/
-template <typename Encoding, typename InputByteStream>
-class EncodedInputStream {
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-    typedef typename Encoding::Ch Ch;
-
-    EncodedInputStream(InputByteStream& is) : is_(is) { 
-        current_ = Encoding::TakeBOM(is_);
-    }
-
-    Ch Peek() const { return current_; }
-    Ch Take() { Ch c = current_; current_ = Encoding::Take(is_); return c; }
-    size_t Tell() const { return is_.Tell(); }
-
-    // Not implemented
-    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
-    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    EncodedInputStream(const EncodedInputStream&);
-    EncodedInputStream& operator=(const EncodedInputStream&);
-
-    InputByteStream& is_;
-    Ch current_;
-};
-
-//! Specialized for UTF8 MemoryStream.
-template <>
-class EncodedInputStream<UTF8<>, MemoryStream> {
-public:
-    typedef UTF8<>::Ch Ch;
-
-    EncodedInputStream(MemoryStream& is) : is_(is) {
-        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
-        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
-        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
-    }
-    Ch Peek() const { return is_.Peek(); }
-    Ch Take() { return is_.Take(); }
-    size_t Tell() const { return is_.Tell(); }
-
-    // Not implemented
-    void Put(Ch) {}
-    void Flush() {} 
-    Ch* PutBegin() { return 0; }
-    size_t PutEnd(Ch*) { return 0; }
-
-    MemoryStream& is_;
-
-private:
-    EncodedInputStream(const EncodedInputStream&);
-    EncodedInputStream& operator=(const EncodedInputStream&);
-};
-
-//! Output byte stream wrapper with statically bound encoding.
-/*!
-    \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.
-    \tparam OutputByteStream Type of input byte stream. For example, FileWriteStream.
-*/
-template <typename Encoding, typename OutputByteStream>
-class EncodedOutputStream {
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-    typedef typename Encoding::Ch Ch;
-
-    EncodedOutputStream(OutputByteStream& os, bool putBOM = true) : os_(os) { 
-        if (putBOM)
-            Encoding::PutBOM(os_);
-    }
-
-    void Put(Ch c) { Encoding::Put(os_, c);  }
-    void Flush() { os_.Flush(); }
-
-    // Not implemented
-    Ch Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
-    Ch Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
-    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false);  return 0; }
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    EncodedOutputStream(const EncodedOutputStream&);
-    EncodedOutputStream& operator=(const EncodedOutputStream&);
-
-    OutputByteStream& os_;
-};
-
-#define CEREAL_RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-//! Input stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-    \tparam CharType Type of character for reading.
-    \tparam InputByteStream type of input byte stream to be wrapped.
-*/
-template <typename CharType, typename InputByteStream>
-class AutoUTFInputStream {
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-public:
-    typedef CharType Ch;
-
-    //! Constructor.
-    /*!
-        \param is input stream to be wrapped.
-        \param type UTF encoding type if it is not detected from the stream.
-    */
-    AutoUTFInputStream(InputByteStream& is, UTFType type = kUTF8) : is_(&is), type_(type), hasBOM_(false) {
-        CEREAL_RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);        
-        DetectType();
-        static const TakeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Take) };
-        takeFunc_ = f[type_];
-        current_ = takeFunc_(*is_);
-    }
-
-    UTFType GetType() const { return type_; }
-    bool HasBOM() const { return hasBOM_; }
-
-    Ch Peek() const { return current_; }
-    Ch Take() { Ch c = current_; current_ = takeFunc_(*is_); return c; }
-    size_t Tell() const { return is_->Tell(); }
-
-    // Not implemented
-    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
-    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    AutoUTFInputStream(const AutoUTFInputStream&);
-    AutoUTFInputStream& operator=(const AutoUTFInputStream&);
-
-    // Detect encoding type with BOM or RFC 4627
-    void DetectType() {
-        // BOM (Byte Order Mark):
-        // 00 00 FE FF  UTF-32BE
-        // FF FE 00 00  UTF-32LE
-        // FE FF        UTF-16BE
-        // FF FE        UTF-16LE
-        // EF BB BF     UTF-8
-
-        const unsigned char* c = reinterpret_cast<const unsigned char *>(is_->Peek4());
-        if (!c)
-            return;
-
-        unsigned bom = static_cast<unsigned>(c[0] | (c[1] << 8) | (c[2] << 16) | (c[3] << 24));
-        hasBOM_ = false;
-        if (bom == 0xFFFE0000)                  { type_ = kUTF32BE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-        else if (bom == 0x0000FEFF)             { type_ = kUTF32LE; hasBOM_ = true; is_->Take(); is_->Take(); is_->Take(); is_->Take(); }
-        else if ((bom & 0xFFFF) == 0xFFFE)      { type_ = kUTF16BE; hasBOM_ = true; is_->Take(); is_->Take();                           }
-        else if ((bom & 0xFFFF) == 0xFEFF)      { type_ = kUTF16LE; hasBOM_ = true; is_->Take(); is_->Take();                           }
-        else if ((bom & 0xFFFFFF) == 0xBFBBEF)  { type_ = kUTF8;    hasBOM_ = true; is_->Take(); is_->Take(); is_->Take();              }
-
-        // RFC 4627: Section 3
-        // "Since the first two characters of a JSON text will always be ASCII
-        // characters [RFC0020], it is possible to determine whether an octet
-        // stream is UTF-8, UTF-16 (BE or LE), or UTF-32 (BE or LE) by looking
-        // at the pattern of nulls in the first four octets."
-        // 00 00 00 xx  UTF-32BE
-        // 00 xx 00 xx  UTF-16BE
-        // xx 00 00 00  UTF-32LE
-        // xx 00 xx 00  UTF-16LE
-        // xx xx xx xx  UTF-8
-
-        if (!hasBOM_) {
-            unsigned pattern = (c[0] ? 1 : 0) | (c[1] ? 2 : 0) | (c[2] ? 4 : 0) | (c[3] ? 8 : 0);
-            switch (pattern) {
-            case 0x08: type_ = kUTF32BE; break;
-            case 0x0A: type_ = kUTF16BE; break;
-            case 0x01: type_ = kUTF32LE; break;
-            case 0x05: type_ = kUTF16LE; break;
-            case 0x0F: type_ = kUTF8;    break;
-            default: break; // Use type defined by user.
-            }
-        }
-
-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        if (type_ == kUTF16LE || type_ == kUTF16BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-        if (type_ == kUTF32LE || type_ == kUTF32BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-    }
-
-    typedef Ch (*TakeFunc)(InputByteStream& is);
-    InputByteStream* is_;
-    UTFType type_;
-    Ch current_;
-    TakeFunc takeFunc_;
-    bool hasBOM_;
-};
-
-//! Output stream wrapper with dynamically bound encoding and automatic encoding detection.
-/*!
-    \tparam CharType Type of character for writing.
-    \tparam OutputByteStream type of output byte stream to be wrapped.
-*/
-template <typename CharType, typename OutputByteStream>
-class AutoUTFOutputStream {
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-public:
-    typedef CharType Ch;
-
-    //! Constructor.
-    /*!
-        \param os output stream to be wrapped.
-        \param type UTF encoding type.
-        \param putBOM Whether to write BOM at the beginning of the stream.
-    */
-    AutoUTFOutputStream(OutputByteStream& os, UTFType type, bool putBOM) : os_(&os), type_(type) {
-        CEREAL_RAPIDJSON_ASSERT(type >= kUTF8 && type <= kUTF32BE);
-
-        // Runtime check whether the size of character type is sufficient. It only perform checks with assertion.
-        if (type_ == kUTF16LE || type_ == kUTF16BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 2);
-        if (type_ == kUTF32LE || type_ == kUTF32BE) CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) >= 4);
-
-        static const PutFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Put) };
-        putFunc_ = f[type_];
-
-        if (putBOM)
-            PutBOM();
-    }
-
-    UTFType GetType() const { return type_; }
-
-    void Put(Ch c) { putFunc_(*os_, c); }
-    void Flush() { os_->Flush(); } 
-
-    // Not implemented
-    Ch Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
-    Ch Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0;}
-    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    AutoUTFOutputStream(const AutoUTFOutputStream&);
-    AutoUTFOutputStream& operator=(const AutoUTFOutputStream&);
-
-    void PutBOM() { 
-        typedef void (*PutBOMFunc)(OutputByteStream&);
-        static const PutBOMFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(PutBOM) };
-        f[type_](*os_);
-    }
-
-    typedef void (*PutFunc)(OutputByteStream&, Ch);
-
-    OutputByteStream* os_;
-    UTFType type_;
-    PutFunc putFunc_;
-};
-
-#undef CEREAL_RAPIDJSON_ENCODINGS_FUNC
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_FILESTREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/encodings.h b/Src/External/cereal/include/cereal/external/rapidjson/encodings.h
deleted file mode 100644
index ed00b97..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/encodings.h
+++ /dev/null
@@ -1,716 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ENCODINGS_H_
-#define CEREAL_RAPIDJSON_ENCODINGS_H_
-
-#include "rapidjson.h"
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(4244) // conversion from 'type1' to 'type2', possible loss of data
-CEREAL_RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#elif defined(__GNUC__)
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-CEREAL_RAPIDJSON_DIAG_OFF(overflow)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Encoding
-
-/*! \class rapidjson::Encoding
-    \brief Concept for encoding of Unicode characters.
-
-\code
-concept Encoding {
-    typename Ch;    //! Type of character. A "character" is actually a code unit in unicode's definition.
-
-    enum { supportUnicode = 1 }; // or 0 if not supporting unicode
-
-    //! \brief Encode a Unicode codepoint to an output stream.
-    //! \param os Output stream.
-    //! \param codepoint An unicode codepoint, ranging from 0x0 to 0x10FFFF inclusively.
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint);
-
-    //! \brief Decode a Unicode codepoint from an input stream.
-    //! \param is Input stream.
-    //! \param codepoint Output of the unicode codepoint.
-    //! \return true if a valid codepoint can be decoded from the stream.
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint);
-
-    //! \brief Validate one Unicode codepoint from an encoded stream.
-    //! \param is Input stream to obtain codepoint.
-    //! \param os Output for copying one codepoint.
-    //! \return true if it is valid.
-    //! \note This function just validating and copying the codepoint without actually decode it.
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os);
-
-    // The following functions are deal with byte streams.
-
-    //! Take a character from input byte stream, skip BOM if exist.
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is);
-
-    //! Take a character from input byte stream.
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is);
-
-    //! Put BOM to output byte stream.
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os);
-
-    //! Put a character to output byte stream.
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c);
-};
-\endcode
-*/
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF8
-
-//! UTF-8 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-8
-    http://tools.ietf.org/html/rfc3629
-    \tparam CharType Code unit for storing 8-bit UTF-8 data. Default is char.
-    \note implements Encoding concept
-*/
-template<typename CharType = char>
-struct UTF8 {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        if (codepoint <= 0x7F) 
-            os.Put(static_cast<Ch>(codepoint & 0xFF));
-        else if (codepoint <= 0x7FF) {
-            os.Put(static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-        }
-        else if (codepoint <= 0xFFFF) {
-            os.Put(static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-        else {
-            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            os.Put(static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            os.Put(static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        if (codepoint <= 0x7F) 
-            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
-        else if (codepoint <= 0x7FF) {
-            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
-        }
-        else if (codepoint <= 0xFFFF) {
-            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-        else {
-            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
-            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
-        }
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-#define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
-#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        typename InputStream::Ch c = is.Take();
-        if (!(c & 0x80)) {
-            *codepoint = static_cast<unsigned char>(c);
-            return true;
-        }
-
-        unsigned char type = GetRange(static_cast<unsigned char>(c));
-        if (type >= 32) {
-            *codepoint = 0;
-        } else {
-            *codepoint = (0xFF >> type) & static_cast<unsigned char>(c);
-        }
-        bool result = true;
-        switch (type) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-        default: return false;
-        }
-#undef COPY
-#undef TRANS
-#undef TAIL
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-#define COPY() os.Put(c = is.Take())
-#define TRANS(mask) result &= ((GetRange(static_cast<unsigned char>(c)) & mask) != 0)
-#define TAIL() COPY(); TRANS(0x70)
-        Ch c;
-        COPY();
-        if (!(c & 0x80))
-            return true;
-
-        bool result = true;
-        switch (GetRange(static_cast<unsigned char>(c))) {
-        case 2: TAIL(); return result;
-        case 3: TAIL(); TAIL(); return result;
-        case 4: COPY(); TRANS(0x50); TAIL(); return result;
-        case 5: COPY(); TRANS(0x10); TAIL(); TAIL(); return result;
-        case 6: TAIL(); TAIL(); TAIL(); return result;
-        case 10: COPY(); TRANS(0x20); TAIL(); return result;
-        case 11: COPY(); TRANS(0x60); TAIL(); TAIL(); return result;
-        default: return false;
-        }
-#undef COPY
-#undef TRANS
-#undef TAIL
-    }
-
-    static unsigned char GetRange(unsigned char c) {
-        // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-        // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types.
-        static const unsigned char type[] = {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10,
-            0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-            0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-            8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-            10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
-        };
-        return type[c];
-    }
-
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        typename InputByteStream::Ch c = Take(is);
-        if (static_cast<unsigned char>(c) != 0xEFu) return c;
-        c = is.Take();
-        if (static_cast<unsigned char>(c) != 0xBBu) return c;
-        c = is.Take();
-        if (static_cast<unsigned char>(c) != 0xBFu) return c;
-        c = is.Take();
-        return c;
-    }
-
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return static_cast<Ch>(is.Take());
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xEFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xBBu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xBFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF16
-
-//! UTF-16 encoding.
-/*! http://en.wikipedia.org/wiki/UTF-16
-    http://tools.ietf.org/html/rfc2781
-    \tparam CharType Type for storing 16-bit UTF-16 data. Default is wchar_t. C++11 may use char16_t instead.
-    \note implements Encoding concept
-
-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-    For streaming, use UTF16LE and UTF16BE, which handle endianness.
-*/
-template<typename CharType = wchar_t>
-struct UTF16 {
-    typedef CharType Ch;
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 2);
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        if (codepoint <= 0xFFFF) {
-            CEREAL_RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-            os.Put(static_cast<typename OutputStream::Ch>(codepoint));
-        }
-        else {
-            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            unsigned v = codepoint - 0x10000;
-            os.Put(static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            os.Put((v & 0x3FF) | 0xDC00);
-        }
-    }
-
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        if (codepoint <= 0xFFFF) {
-            CEREAL_RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
-        }
-        else {
-            CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-            unsigned v = codepoint - 0x10000;
-            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
-            PutUnsafe(os, (v & 0x3FF) | 0xDC00);
-        }
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        typename InputStream::Ch c = is.Take();
-        if (c < 0xD800 || c > 0xDFFF) {
-            *codepoint = static_cast<unsigned>(c);
-            return true;
-        }
-        else if (c <= 0xDBFF) {
-            *codepoint = (static_cast<unsigned>(c) & 0x3FF) << 10;
-            c = is.Take();
-            *codepoint |= (static_cast<unsigned>(c) & 0x3FF);
-            *codepoint += 0x10000;
-            return c >= 0xDC00 && c <= 0xDFFF;
-        }
-        return false;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
-        typename InputStream::Ch c;
-        os.Put(static_cast<typename OutputStream::Ch>(c = is.Take()));
-        if (c < 0xD800 || c > 0xDFFF)
-            return true;
-        else if (c <= 0xDBFF) {
-            os.Put(c = is.Take());
-            return c >= 0xDC00 && c <= 0xDFFF;
-        }
-        return false;
-    }
-};
-
-//! UTF-16 little endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16LE : UTF16<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<uint8_t>(is.Take());
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
-    }
-};
-
-//! UTF-16 big endian encoding.
-template<typename CharType = wchar_t>
-struct UTF16BE : UTF16<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint16_t>(c) == 0xFEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<uint8_t>(is.Take());
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>((static_cast<unsigned>(c) >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(static_cast<unsigned>(c) & 0xFFu));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// UTF32
-
-//! UTF-32 encoding. 
-/*! http://en.wikipedia.org/wiki/UTF-32
-    \tparam CharType Type for storing 32-bit UTF-32 data. Default is unsigned. C++11 may use char32_t instead.
-    \note implements Encoding concept
-
-    \note For in-memory access, no need to concern endianness. The code units and code points are represented by CPU's endianness.
-    For streaming, use UTF32LE and UTF32BE, which handle endianness.
-*/
-template<typename CharType = unsigned>
-struct UTF32 {
-    typedef CharType Ch;
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(Ch) >= 4);
-
-    enum { supportUnicode = 1 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-        os.Put(codepoint);
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
-        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
-        PutUnsafe(os, codepoint);
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-        Ch c = is.Take();
-        *codepoint = c;
-        return c <= 0x10FFFF;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
-        Ch c;
-        os.Put(c = is.Take());
-        return c <= 0x10FFFF;
-    }
-};
-
-//! UTF-32 little endian enocoding.
-template<typename CharType = unsigned>
-struct UTF32LE : UTF32<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c;
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<uint8_t>(is.Take());
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
-    }
-};
-
-//! UTF-32 big endian encoding.
-template<typename CharType = unsigned>
-struct UTF32BE : UTF32<CharType> {
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        CharType c = Take(is);
-        return static_cast<uint32_t>(c) == 0x0000FEFFu ? Take(is) : c; 
-    }
-
-    template <typename InputByteStream>
-    static CharType Take(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        unsigned c = static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 24;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 16;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take())) << 8;
-        c |= static_cast<unsigned>(static_cast<uint8_t>(is.Take()));
-        return static_cast<CharType>(c);
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0x00u));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFEu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(0xFFu));
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, CharType c) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 24) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 16) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>((c >> 8) & 0xFFu));
-        os.Put(static_cast<typename OutputByteStream::Ch>(c & 0xFFu));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ASCII
-
-//! ASCII encoding.
-/*! http://en.wikipedia.org/wiki/ASCII
-    \tparam CharType Code unit for storing 7-bit ASCII data. Default is char.
-    \note implements Encoding concept
-*/
-template<typename CharType = char>
-struct ASCII {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 0 };
-
-    template<typename OutputStream>
-    static void Encode(OutputStream& os, unsigned codepoint) {
-        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x7F);
-        os.Put(static_cast<Ch>(codepoint & 0xFF));
-    }
-
-    template<typename OutputStream>
-    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        CEREAL_RAPIDJSON_ASSERT(codepoint <= 0x7F);
-        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
-    }
-
-    template <typename InputStream>
-    static bool Decode(InputStream& is, unsigned* codepoint) {
-        uint8_t c = static_cast<uint8_t>(is.Take());
-        *codepoint = c;
-        return c <= 0X7F;
-    }
-
-    template <typename InputStream, typename OutputStream>
-    static bool Validate(InputStream& is, OutputStream& os) {
-        uint8_t c = static_cast<uint8_t>(is.Take());
-        os.Put(static_cast<typename OutputStream::Ch>(c));
-        return c <= 0x7F;
-    }
-
-    template <typename InputByteStream>
-    static CharType TakeBOM(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        uint8_t c = static_cast<uint8_t>(Take(is));
-        return static_cast<Ch>(c);
-    }
-
-    template <typename InputByteStream>
-    static Ch Take(InputByteStream& is) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename InputByteStream::Ch) == 1);
-        return static_cast<Ch>(is.Take());
-    }
-
-    template <typename OutputByteStream>
-    static void PutBOM(OutputByteStream& os) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        (void)os;
-    }
-
-    template <typename OutputByteStream>
-    static void Put(OutputByteStream& os, Ch c) {
-        CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputByteStream::Ch) == 1);
-        os.Put(static_cast<typename OutputByteStream::Ch>(c));
-    }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// AutoUTF
-
-//! Runtime-specified UTF encoding type of a stream.
-enum UTFType {
-    kUTF8 = 0,      //!< UTF-8.
-    kUTF16LE = 1,   //!< UTF-16 little endian.
-    kUTF16BE = 2,   //!< UTF-16 big endian.
-    kUTF32LE = 3,   //!< UTF-32 little endian.
-    kUTF32BE = 4    //!< UTF-32 big endian.
-};
-
-//! Dynamically select encoding according to stream's runtime-specified UTF encoding type.
-/*! \note This class can be used with AutoUTFInputtStream and AutoUTFOutputStream, which provides GetType().
-*/
-template<typename CharType>
-struct AutoUTF {
-    typedef CharType Ch;
-
-    enum { supportUnicode = 1 };
-
-#define CEREAL_RAPIDJSON_ENCODINGS_FUNC(x) UTF8<Ch>::x, UTF16LE<Ch>::x, UTF16BE<Ch>::x, UTF32LE<Ch>::x, UTF32BE<Ch>::x
-
-    template<typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static void Encode(OutputStream& os, unsigned codepoint) {
-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
-        static const EncodeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Encode) };
-        (*f[os.GetType()])(os, codepoint);
-    }
-
-    template<typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
-        typedef void (*EncodeFunc)(OutputStream&, unsigned);
-        static const EncodeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
-        (*f[os.GetType()])(os, codepoint);
-    }
-
-    template <typename InputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
-        typedef bool (*DecodeFunc)(InputStream&, unsigned*);
-        static const DecodeFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Decode) };
-        return (*f[is.GetType()])(is, codepoint);
-    }
-
-    template <typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-        typedef bool (*ValidateFunc)(InputStream&, OutputStream&);
-        static const ValidateFunc f[] = { CEREAL_RAPIDJSON_ENCODINGS_FUNC(Validate) };
-        return (*f[is.GetType()])(is, os);
-    }
-
-#undef CEREAL_RAPIDJSON_ENCODINGS_FUNC
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Transcoder
-
-//! Encoding conversion.
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder {
-    //! Take one Unicode codepoint from source encoding, convert it to target encoding and put it to the output stream.
-    template<typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
-        unsigned codepoint;
-        if (!SourceEncoding::Decode(is, &codepoint))
-            return false;
-        TargetEncoding::Encode(os, codepoint);
-        return true;
-    }
-
-    template<typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
-        unsigned codepoint;
-        if (!SourceEncoding::Decode(is, &codepoint))
-            return false;
-        TargetEncoding::EncodeUnsafe(os, codepoint);
-        return true;
-    }
-
-    //! Validate one Unicode codepoint from an encoded stream.
-    template<typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-        return Transcode(is, os);   // Since source/target encoding is different, must transcode.
-    }
-};
-
-// Forward declaration.
-template<typename Stream>
-inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
-
-//! Specialization of Transcoder with same source and target encoding.
-template<typename Encoding>
-struct Transcoder<Encoding, Encoding> {
-    template<typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Transcode(InputStream& is, OutputStream& os) {
-        os.Put(is.Take());  // Just copy one code unit. This semantic is different from primary template class.
-        return true;
-    }
-    
-    template<typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
-        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
-        return true;
-    }
-    
-    template<typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
-        return Encoding::Validate(is, os);  // source/target encoding are the same
-    }
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#if defined(__GNUC__) || defined(_MSC_VER)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_ENCODINGS_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/error/en.h b/Src/External/cereal/include/cereal/external/rapidjson/error/en.h
deleted file mode 100644
index ea93bf8..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/error/en.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ERROR_EN_H_
-#define CEREAL_RAPIDJSON_ERROR_EN_H_
-
-#include "error.h"
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
-CEREAL_RAPIDJSON_DIAG_OFF(covered-switch-default)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Maps error code of parsing into error message.
-/*!
-    \ingroup CEREAL_RAPIDJSON_ERRORS
-    \param parseErrorCode Error code obtained in parsing.
-    \return the error message.
-    \note User can make a copy of this function for localization.
-        Using switch-case is safer for future modification of error codes.
-*/
-inline const CEREAL_RAPIDJSON_ERROR_CHARTYPE* GetParseError_En(ParseErrorCode parseErrorCode) {
-    switch (parseErrorCode) {
-        case kParseErrorNone:                           return CEREAL_RAPIDJSON_ERROR_STRING("No error.");
-
-        case kParseErrorDocumentEmpty:                  return CEREAL_RAPIDJSON_ERROR_STRING("The document is empty.");
-        case kParseErrorDocumentRootNotSingular:        return CEREAL_RAPIDJSON_ERROR_STRING("The document root must not be followed by other values.");
-    
-        case kParseErrorValueInvalid:                   return CEREAL_RAPIDJSON_ERROR_STRING("Invalid value.");
-    
-        case kParseErrorObjectMissName:                 return CEREAL_RAPIDJSON_ERROR_STRING("Missing a name for object member.");
-        case kParseErrorObjectMissColon:                return CEREAL_RAPIDJSON_ERROR_STRING("Missing a colon after a name of object member.");
-        case kParseErrorObjectMissCommaOrCurlyBracket:  return CEREAL_RAPIDJSON_ERROR_STRING("Missing a comma or '}' after an object member.");
-    
-        case kParseErrorArrayMissCommaOrSquareBracket:  return CEREAL_RAPIDJSON_ERROR_STRING("Missing a comma or ']' after an array element.");
-
-        case kParseErrorStringUnicodeEscapeInvalidHex:  return CEREAL_RAPIDJSON_ERROR_STRING("Incorrect hex digit after \\u escape in string.");
-        case kParseErrorStringUnicodeSurrogateInvalid:  return CEREAL_RAPIDJSON_ERROR_STRING("The surrogate pair in string is invalid.");
-        case kParseErrorStringEscapeInvalid:            return CEREAL_RAPIDJSON_ERROR_STRING("Invalid escape character in string.");
-        case kParseErrorStringMissQuotationMark:        return CEREAL_RAPIDJSON_ERROR_STRING("Missing a closing quotation mark in string.");
-        case kParseErrorStringInvalidEncoding:          return CEREAL_RAPIDJSON_ERROR_STRING("Invalid encoding in string.");
-
-        case kParseErrorNumberTooBig:                   return CEREAL_RAPIDJSON_ERROR_STRING("Number too big to be stored in double.");
-        case kParseErrorNumberMissFraction:             return CEREAL_RAPIDJSON_ERROR_STRING("Miss fraction part in number.");
-        case kParseErrorNumberMissExponent:             return CEREAL_RAPIDJSON_ERROR_STRING("Miss exponent in number.");
-
-        case kParseErrorTermination:                    return CEREAL_RAPIDJSON_ERROR_STRING("Terminate parsing due to Handler error.");
-        case kParseErrorUnspecificSyntaxError:          return CEREAL_RAPIDJSON_ERROR_STRING("Unspecific syntax error.");
-
-        default:                                        return CEREAL_RAPIDJSON_ERROR_STRING("Unknown error.");
-    }
-}
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_ERROR_EN_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/error/error.h b/Src/External/cereal/include/cereal/external/rapidjson/error/error.h
deleted file mode 100644
index c2638f1..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/error/error.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ERROR_ERROR_H_
-#define CEREAL_RAPIDJSON_ERROR_ERROR_H_
-
-#include "../rapidjson.h"
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-/*! \file error.h */
-
-/*! \defgroup CEREAL_RAPIDJSON_ERRORS RapidJSON error handling */
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_ERROR_CHARTYPE
-
-//! Character type of error messages.
-/*! \ingroup CEREAL_RAPIDJSON_ERRORS
-    The default character type is \c char.
-    On Windows, user can define this macro as \c TCHAR for supporting both
-    unicode/non-unicode settings.
-*/
-#ifndef CEREAL_RAPIDJSON_ERROR_CHARTYPE
-#define CEREAL_RAPIDJSON_ERROR_CHARTYPE char
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_ERROR_STRING
-
-//! Macro for converting string literial to \ref CEREAL_RAPIDJSON_ERROR_CHARTYPE[].
-/*! \ingroup CEREAL_RAPIDJSON_ERRORS
-    By default this conversion macro does nothing.
-    On Windows, user can define this macro as \c _T(x) for supporting both
-    unicode/non-unicode settings.
-*/
-#ifndef CEREAL_RAPIDJSON_ERROR_STRING
-#define CEREAL_RAPIDJSON_ERROR_STRING(x) x
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseErrorCode
-
-//! Error code of parsing.
-/*! \ingroup CEREAL_RAPIDJSON_ERRORS
-    \see GenericReader::Parse, GenericReader::GetParseErrorCode
-*/
-enum ParseErrorCode {
-    kParseErrorNone = 0,                        //!< No error.
-
-    kParseErrorDocumentEmpty,                   //!< The document is empty.
-    kParseErrorDocumentRootNotSingular,         //!< The document root must not follow by other values.
-
-    kParseErrorValueInvalid,                    //!< Invalid value.
-
-    kParseErrorObjectMissName,                  //!< Missing a name for object member.
-    kParseErrorObjectMissColon,                 //!< Missing a colon after a name of object member.
-    kParseErrorObjectMissCommaOrCurlyBracket,   //!< Missing a comma or '}' after an object member.
-
-    kParseErrorArrayMissCommaOrSquareBracket,   //!< Missing a comma or ']' after an array element.
-
-    kParseErrorStringUnicodeEscapeInvalidHex,   //!< Incorrect hex digit after \\u escape in string.
-    kParseErrorStringUnicodeSurrogateInvalid,   //!< The surrogate pair in string is invalid.
-    kParseErrorStringEscapeInvalid,             //!< Invalid escape character in string.
-    kParseErrorStringMissQuotationMark,         //!< Missing a closing quotation mark in string.
-    kParseErrorStringInvalidEncoding,           //!< Invalid encoding in string.
-
-    kParseErrorNumberTooBig,                    //!< Number too big to be stored in double.
-    kParseErrorNumberMissFraction,              //!< Miss fraction part in number.
-    kParseErrorNumberMissExponent,              //!< Miss exponent in number.
-
-    kParseErrorTermination,                     //!< Parsing was terminated.
-    kParseErrorUnspecificSyntaxError            //!< Unspecific syntax error.
-};
-
-//! Result of parsing (wraps ParseErrorCode)
-/*!
-    \ingroup CEREAL_RAPIDJSON_ERRORS
-    \code
-        Document doc;
-        ParseResult ok = doc.Parse("[42]");
-        if (!ok) {
-            fprintf(stderr, "JSON parse error: %s (%u)",
-                    GetParseError_En(ok.Code()), ok.Offset());
-            exit(EXIT_FAILURE);
-        }
-    \endcode
-    \see GenericReader::Parse, GenericDocument::Parse
-*/
-struct ParseResult {
-public:
-    //! Default constructor, no error.
-    ParseResult() : code_(kParseErrorNone), offset_(0) {}
-    //! Constructor to set an error.
-    ParseResult(ParseErrorCode code, size_t offset) : code_(code), offset_(offset) {}
-
-    //! Get the error code.
-    ParseErrorCode Code() const { return code_; }
-    //! Get the error offset, if \ref IsError(), 0 otherwise.
-    size_t Offset() const { return offset_; }
-
-    //! Conversion to \c bool, returns \c true, iff !\ref IsError().
-    operator bool() const { return !IsError(); }
-    //! Whether the result is an error.
-    bool IsError() const { return code_ != kParseErrorNone; }
-
-    bool operator==(const ParseResult& that) const { return code_ == that.code_; }
-    bool operator==(ParseErrorCode code) const { return code_ == code; }
-    friend bool operator==(ParseErrorCode code, const ParseResult & err) { return code == err.code_; }
-
-    //! Reset error code.
-    void Clear() { Set(kParseErrorNone); }
-    //! Update error code and offset.
-    void Set(ParseErrorCode code, size_t offset = 0) { code_ = code; offset_ = offset; }
-
-private:
-    ParseErrorCode code_;
-    size_t offset_;
-};
-
-//! Function pointer type of GetParseError().
-/*! \ingroup CEREAL_RAPIDJSON_ERRORS
-
-    This is the prototype for \c GetParseError_X(), where \c X is a locale.
-    User can dynamically change locale in runtime, e.g.:
-\code
-    GetParseErrorFunc GetParseError = GetParseError_En; // or whatever
-    const CEREAL_RAPIDJSON_ERROR_CHARTYPE* s = GetParseError(document.GetParseErrorCode());
-\endcode
-*/
-typedef const CEREAL_RAPIDJSON_ERROR_CHARTYPE* (*GetParseErrorFunc)(ParseErrorCode);
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_ERROR_ERROR_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h b/Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h
deleted file mode 100644
index abafb54..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/filereadstream.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_FILEREADSTREAM_H_
-#define CEREAL_RAPIDJSON_FILEREADSTREAM_H_
-
-#include "stream.h"
-#include <cstdio>
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
-CEREAL_RAPIDJSON_DIAG_OFF(missing-noreturn)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! File byte stream for input using fread().
-/*!
-    \note implements Stream concept
-*/
-class FileReadStream {
-public:
-    typedef char Ch;    //!< Character type (byte).
-
-    //! Constructor.
-    /*!
-        \param fp File pointer opened for read.
-        \param buffer user-supplied buffer.
-        \param bufferSize size of buffer in bytes. Must >=4 bytes.
-    */
-    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 
-        CEREAL_RAPIDJSON_ASSERT(fp_ != 0);
-        CEREAL_RAPIDJSON_ASSERT(bufferSize >= 4);
-        Read();
-    }
-
-    Ch Peek() const { return *current_; }
-    Ch Take() { Ch c = *current_; Read(); return c; }
-    size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
-
-    // Not implemented
-    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
-    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); } 
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        return (current_ + 4 <= bufferLast_) ? current_ : 0;
-    }
-
-private:
-    void Read() {
-        if (current_ < bufferLast_)
-            ++current_;
-        else if (!eof_) {
-            count_ += readCount_;
-            readCount_ = fread(buffer_, 1, bufferSize_, fp_);
-            bufferLast_ = buffer_ + readCount_ - 1;
-            current_ = buffer_;
-
-            if (readCount_ < bufferSize_) {
-                buffer_[readCount_] = '\0';
-                ++bufferLast_;
-                eof_ = true;
-            }
-        }
-    }
-
-    std::FILE* fp_;
-    Ch *buffer_;
-    size_t bufferSize_;
-    Ch *bufferLast_;
-    Ch *current_;
-    size_t readCount_;
-    size_t count_;  //!< Number of characters read
-    bool eof_;
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_FILESTREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h b/Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h
deleted file mode 100644
index 9a60099..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/filewritestream.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_FILEWRITESTREAM_H_
-#define CEREAL_RAPIDJSON_FILEWRITESTREAM_H_
-
-#include "stream.h"
-#include <cstdio>
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of C file stream for input using fread().
-/*!
-    \note implements Stream concept
-*/
-class FileWriteStream {
-public:
-    typedef char Ch;    //!< Character type. Only support char.
-
-    FileWriteStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferEnd_(buffer + bufferSize), current_(buffer_) { 
-        CEREAL_RAPIDJSON_ASSERT(fp_ != 0);
-    }
-
-    void Put(char c) { 
-        if (current_ >= bufferEnd_)
-            Flush();
-
-        *current_++ = c;
-    }
-
-    void PutN(char c, size_t n) {
-        size_t avail = static_cast<size_t>(bufferEnd_ - current_);
-        while (n > avail) {
-            std::memset(current_, c, avail);
-            current_ += avail;
-            Flush();
-            n -= avail;
-            avail = static_cast<size_t>(bufferEnd_ - current_);
-        }
-
-        if (n > 0) {
-            std::memset(current_, c, n);
-            current_ += n;
-        }
-    }
-
-    void Flush() {
-        if (current_ != buffer_) {
-            size_t result = fwrite(buffer_, 1, static_cast<size_t>(current_ - buffer_), fp_);
-            if (result < static_cast<size_t>(current_ - buffer_)) {
-                // failure deliberately ignored at this time
-                // added to avoid warn_unused_result build errors
-            }
-            current_ = buffer_;
-        }
-    }
-
-    // Not implemented
-    char Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    char Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    char* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(char*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    FileWriteStream(const FileWriteStream&);
-    FileWriteStream& operator=(const FileWriteStream&);
-
-    std::FILE* fp_;
-    char *buffer_;
-    char *bufferEnd_;
-    char *current_;
-};
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(FileWriteStream& stream, char c, size_t n) {
-    stream.PutN(c, n);
-}
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_FILESTREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/fwd.h b/Src/External/cereal/include/cereal/external/rapidjson/fwd.h
deleted file mode 100644
index 1b15c66..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/fwd.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_FWD_H_
-#define CEREAL_RAPIDJSON_FWD_H_
-
-#include "rapidjson.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-// encodings.h
-
-template<typename CharType> struct UTF8;
-template<typename CharType> struct UTF16;
-template<typename CharType> struct UTF16BE;
-template<typename CharType> struct UTF16LE;
-template<typename CharType> struct UTF32;
-template<typename CharType> struct UTF32BE;
-template<typename CharType> struct UTF32LE;
-template<typename CharType> struct ASCII;
-template<typename CharType> struct AutoUTF;
-
-template<typename SourceEncoding, typename TargetEncoding>
-struct Transcoder;
-
-// allocators.h
-
-class CrtAllocator;
-
-template <typename BaseAllocator>
-class MemoryPoolAllocator;
-
-// stream.h
-
-template <typename Encoding>
-struct GenericStringStream;
-
-typedef GenericStringStream<UTF8<char> > StringStream;
-
-template <typename Encoding>
-struct GenericInsituStringStream;
-
-typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
-
-// stringbuffer.h
-
-template <typename Encoding, typename Allocator>
-class GenericStringBuffer;
-
-typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
-
-// filereadstream.h
-
-class FileReadStream;
-
-// filewritestream.h
-
-class FileWriteStream;
-
-// memorybuffer.h
-
-template <typename Allocator>
-struct GenericMemoryBuffer;
-
-typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
-
-// memorystream.h
-
-struct MemoryStream;
-
-// reader.h
-
-template<typename Encoding, typename Derived>
-struct BaseReaderHandler;
-
-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
-class GenericReader;
-
-typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
-
-// writer.h
-
-template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
-class Writer;
-
-// prettywriter.h
-
-template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
-class PrettyWriter;
-
-// document.h
-
-template <typename Encoding, typename Allocator> 
-struct GenericMember;
-
-template <bool Const, typename Encoding, typename Allocator>
-class GenericMemberIterator;
-
-template<typename CharType>
-struct GenericStringRef;
-
-template <typename Encoding, typename Allocator> 
-class GenericValue;
-
-typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
-
-template <typename Encoding, typename Allocator, typename StackAllocator>
-class GenericDocument;
-
-typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
-
-// pointer.h
-
-template <typename ValueType, typename Allocator>
-class GenericPointer;
-
-typedef GenericPointer<Value, CrtAllocator> Pointer;
-
-// schema.h
-
-template <typename SchemaDocumentType>
-class IGenericRemoteSchemaDocumentProvider;
-
-template <typename ValueT, typename Allocator>
-class GenericSchemaDocument;
-
-typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
-typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
-
-template <
-    typename SchemaDocumentType,
-    typename OutputHandler,
-    typename StateAllocator>
-class GenericSchemaValidator;
-
-typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_RAPIDJSONFWD_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h
deleted file mode 100644
index f8a5a50..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/biginteger.h
+++ /dev/null
@@ -1,290 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_BIGINTEGER_H_
-#define CEREAL_RAPIDJSON_BIGINTEGER_H_
-
-#include "../rapidjson.h"
-
-#if defined(_MSC_VER) && defined(_M_AMD64)
-#include <intrin.h> // for _umul128
-#pragma intrinsic(_umul128)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-class BigInteger {
-public:
-    typedef uint64_t Type;
-
-    BigInteger(const BigInteger& rhs) : count_(rhs.count_) {
-        std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
-    }
-
-    explicit BigInteger(uint64_t u) : count_(1) {
-        digits_[0] = u;
-    }
-
-    BigInteger(const char* decimals, size_t length) : count_(1) {
-        CEREAL_RAPIDJSON_ASSERT(length > 0);
-        digits_[0] = 0;
-        size_t i = 0;
-        const size_t kMaxDigitPerIteration = 19;  // 2^64 = 18446744073709551616 > 10^19
-        while (length >= kMaxDigitPerIteration) {
-            AppendDecimal64(decimals + i, decimals + i + kMaxDigitPerIteration);
-            length -= kMaxDigitPerIteration;
-            i += kMaxDigitPerIteration;
-        }
-
-        if (length > 0)
-            AppendDecimal64(decimals + i, decimals + i + length);
-    }
-    
-    BigInteger& operator=(const BigInteger &rhs)
-    {
-        if (this != &rhs) {
-            count_ = rhs.count_;
-            std::memcpy(digits_, rhs.digits_, count_ * sizeof(Type));
-        }
-        return *this;
-    }
-    
-    BigInteger& operator=(uint64_t u) {
-        digits_[0] = u;            
-        count_ = 1;
-        return *this;
-    }
-
-    BigInteger& operator+=(uint64_t u) {
-        Type backup = digits_[0];
-        digits_[0] += u;
-        for (size_t i = 0; i < count_ - 1; i++) {
-            if (digits_[i] >= backup)
-                return *this; // no carry
-            backup = digits_[i + 1];
-            digits_[i + 1] += 1;
-        }
-
-        // Last carry
-        if (digits_[count_ - 1] < backup)
-            PushBack(1);
-
-        return *this;
-    }
-
-    BigInteger& operator*=(uint64_t u) {
-        if (u == 0) return *this = 0;
-        if (u == 1) return *this;
-        if (*this == 1) return *this = u;
-
-        uint64_t k = 0;
-        for (size_t i = 0; i < count_; i++) {
-            uint64_t hi;
-            digits_[i] = MulAdd64(digits_[i], u, k, &hi);
-            k = hi;
-        }
-        
-        if (k > 0)
-            PushBack(k);
-
-        return *this;
-    }
-
-    BigInteger& operator*=(uint32_t u) {
-        if (u == 0) return *this = 0;
-        if (u == 1) return *this;
-        if (*this == 1) return *this = u;
-
-        uint64_t k = 0;
-        for (size_t i = 0; i < count_; i++) {
-            const uint64_t c = digits_[i] >> 32;
-            const uint64_t d = digits_[i] & 0xFFFFFFFF;
-            const uint64_t uc = u * c;
-            const uint64_t ud = u * d;
-            const uint64_t p0 = ud + k;
-            const uint64_t p1 = uc + (p0 >> 32);
-            digits_[i] = (p0 & 0xFFFFFFFF) | (p1 << 32);
-            k = p1 >> 32;
-        }
-        
-        if (k > 0)
-            PushBack(k);
-
-        return *this;
-    }
-
-    BigInteger& operator<<=(size_t shift) {
-        if (IsZero() || shift == 0) return *this;
-
-        size_t offset = shift / kTypeBit;
-        size_t interShift = shift % kTypeBit;
-        CEREAL_RAPIDJSON_ASSERT(count_ + offset <= kCapacity);
-
-        if (interShift == 0) {
-            std::memmove(&digits_[count_ - 1 + offset], &digits_[count_ - 1], count_ * sizeof(Type));
-            count_ += offset;
-        }
-        else {
-            digits_[count_] = 0;
-            for (size_t i = count_; i > 0; i--)
-                digits_[i + offset] = (digits_[i] << interShift) | (digits_[i - 1] >> (kTypeBit - interShift));
-            digits_[offset] = digits_[0] << interShift;
-            count_ += offset;
-            if (digits_[count_])
-                count_++;
-        }
-
-        std::memset(digits_, 0, offset * sizeof(Type));
-
-        return *this;
-    }
-
-    bool operator==(const BigInteger& rhs) const {
-        return count_ == rhs.count_ && std::memcmp(digits_, rhs.digits_, count_ * sizeof(Type)) == 0;
-    }
-
-    bool operator==(const Type rhs) const {
-        return count_ == 1 && digits_[0] == rhs;
-    }
-
-    BigInteger& MultiplyPow5(unsigned exp) {
-        static const uint32_t kPow5[12] = {
-            5,
-            5 * 5,
-            5 * 5 * 5,
-            5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5,
-            5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5 * 5
-        };
-        if (exp == 0) return *this;
-        for (; exp >= 27; exp -= 27) *this *= CEREAL_RAPIDJSON_UINT64_C2(0X6765C793, 0XFA10079D); // 5^27
-        for (; exp >= 13; exp -= 13) *this *= static_cast<uint32_t>(1220703125u); // 5^13
-        if (exp > 0)                 *this *= kPow5[exp - 1];
-        return *this;
-    }
-
-    // Compute absolute difference of this and rhs.
-    // Assume this != rhs
-    bool Difference(const BigInteger& rhs, BigInteger* out) const {
-        int cmp = Compare(rhs);
-        CEREAL_RAPIDJSON_ASSERT(cmp != 0);
-        const BigInteger *a, *b;  // Makes a > b
-        bool ret;
-        if (cmp < 0) { a = &rhs; b = this; ret = true; }
-        else         { a = this; b = &rhs; ret = false; }
-
-        Type borrow = 0;
-        for (size_t i = 0; i < a->count_; i++) {
-            Type d = a->digits_[i] - borrow;
-            if (i < b->count_)
-                d -= b->digits_[i];
-            borrow = (d > a->digits_[i]) ? 1 : 0;
-            out->digits_[i] = d;
-            if (d != 0)
-                out->count_ = i + 1;
-        }
-
-        return ret;
-    }
-
-    int Compare(const BigInteger& rhs) const {
-        if (count_ != rhs.count_)
-            return count_ < rhs.count_ ? -1 : 1;
-
-        for (size_t i = count_; i-- > 0;)
-            if (digits_[i] != rhs.digits_[i])
-                return digits_[i] < rhs.digits_[i] ? -1 : 1;
-
-        return 0;
-    }
-
-    size_t GetCount() const { return count_; }
-    Type GetDigit(size_t index) const { CEREAL_RAPIDJSON_ASSERT(index < count_); return digits_[index]; }
-    bool IsZero() const { return count_ == 1 && digits_[0] == 0; }
-
-private:
-    void AppendDecimal64(const char* begin, const char* end) {
-        uint64_t u = ParseUint64(begin, end);
-        if (IsZero())
-            *this = u;
-        else {
-            unsigned exp = static_cast<unsigned>(end - begin);
-            (MultiplyPow5(exp) <<= exp) += u;   // *this = *this * 10^exp + u
-        }
-    }
-
-    void PushBack(Type digit) {
-        CEREAL_RAPIDJSON_ASSERT(count_ < kCapacity);
-        digits_[count_++] = digit;
-    }
-
-    static uint64_t ParseUint64(const char* begin, const char* end) {
-        uint64_t r = 0;
-        for (const char* p = begin; p != end; ++p) {
-            CEREAL_RAPIDJSON_ASSERT(*p >= '0' && *p <= '9');
-            r = r * 10u + static_cast<unsigned>(*p - '0');
-        }
-        return r;
-    }
-
-    // Assume a * b + k < 2^128
-    static uint64_t MulAdd64(uint64_t a, uint64_t b, uint64_t k, uint64_t* outHigh) {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        uint64_t low = _umul128(a, b, outHigh) + k;
-        if (low < k)
-            (*outHigh)++;
-        return low;
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        __extension__ typedef unsigned __int128 uint128;
-        uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
-        p += k;
-        *outHigh = static_cast<uint64_t>(p >> 64);
-        return static_cast<uint64_t>(p);
-#else
-        const uint64_t a0 = a & 0xFFFFFFFF, a1 = a >> 32, b0 = b & 0xFFFFFFFF, b1 = b >> 32;
-        uint64_t x0 = a0 * b0, x1 = a0 * b1, x2 = a1 * b0, x3 = a1 * b1;
-        x1 += (x0 >> 32); // can't give carry
-        x1 += x2;
-        if (x1 < x2)
-            x3 += (static_cast<uint64_t>(1) << 32);
-        uint64_t lo = (x1 << 32) + (x0 & 0xFFFFFFFF);
-        uint64_t hi = x3 + (x1 >> 32);
-
-        lo += k;
-        if (lo < k)
-            hi++;
-        *outHigh = hi;
-        return lo;
-#endif
-    }
-
-    static const size_t kBitCount = 3328;  // 64bit * 54 > 10^1000
-    static const size_t kCapacity = kBitCount / sizeof(Type);
-    static const size_t kTypeBit = sizeof(Type) * 8;
-
-    Type digits_[kCapacity];
-    size_t count_;
-};
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_BIGINTEGER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h
deleted file mode 100644
index ab7d66b..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/diyfp.h
+++ /dev/null
@@ -1,258 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
-
-#ifndef CEREAL_RAPIDJSON_DIYFP_H_
-#define CEREAL_RAPIDJSON_DIYFP_H_
-
-#include "../rapidjson.h"
-
-#if defined(_MSC_VER) && defined(_M_AMD64)
-#include <intrin.h>
-#pragma intrinsic(_BitScanReverse64)
-#pragma intrinsic(_umul128)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-struct DiyFp {
-    DiyFp() : f(), e() {}
-
-    DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
-
-    explicit DiyFp(double d) {
-        union {
-            double d;
-            uint64_t u64;
-        } u = { d };
-
-        int biased_e = static_cast<int>((u.u64 & kDpExponentMask) >> kDpSignificandSize);
-        uint64_t significand = (u.u64 & kDpSignificandMask);
-        if (biased_e != 0) {
-            f = significand + kDpHiddenBit;
-            e = biased_e - kDpExponentBias;
-        } 
-        else {
-            f = significand;
-            e = kDpMinExponent + 1;
-        }
-    }
-
-    DiyFp operator-(const DiyFp& rhs) const {
-        return DiyFp(f - rhs.f, e);
-    }
-
-    DiyFp operator*(const DiyFp& rhs) const {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        uint64_t h;
-        uint64_t l = _umul128(f, rhs.f, &h);
-        if (l & (uint64_t(1) << 63)) // rounding
-            h++;
-        return DiyFp(h, e + rhs.e + 64);
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
-        __extension__ typedef unsigned __int128 uint128;
-        uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
-        uint64_t h = static_cast<uint64_t>(p >> 64);
-        uint64_t l = static_cast<uint64_t>(p);
-        if (l & (uint64_t(1) << 63)) // rounding
-            h++;
-        return DiyFp(h, e + rhs.e + 64);
-#else
-        const uint64_t M32 = 0xFFFFFFFF;
-        const uint64_t a = f >> 32;
-        const uint64_t b = f & M32;
-        const uint64_t c = rhs.f >> 32;
-        const uint64_t d = rhs.f & M32;
-        const uint64_t ac = a * c;
-        const uint64_t bc = b * c;
-        const uint64_t ad = a * d;
-        const uint64_t bd = b * d;
-        uint64_t tmp = (bd >> 32) + (ad & M32) + (bc & M32);
-        tmp += 1U << 31;  /// mult_round
-        return DiyFp(ac + (ad >> 32) + (bc >> 32) + (tmp >> 32), e + rhs.e + 64);
-#endif
-    }
-
-    DiyFp Normalize() const {
-#if defined(_MSC_VER) && defined(_M_AMD64)
-        unsigned long index;
-        _BitScanReverse64(&index, f);
-        return DiyFp(f << (63 - index), e - (63 - index));
-#elif defined(__GNUC__) && __GNUC__ >= 4
-        int s = __builtin_clzll(f);
-        return DiyFp(f << s, e - s);
-#else
-        DiyFp res = *this;
-        while (!(res.f & (static_cast<uint64_t>(1) << 63))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        return res;
-#endif
-    }
-
-    DiyFp NormalizeBoundary() const {
-        DiyFp res = *this;
-        while (!(res.f & (kDpHiddenBit << 1))) {
-            res.f <<= 1;
-            res.e--;
-        }
-        res.f <<= (kDiySignificandSize - kDpSignificandSize - 2);
-        res.e = res.e - (kDiySignificandSize - kDpSignificandSize - 2);
-        return res;
-    }
-
-    void NormalizedBoundaries(DiyFp* minus, DiyFp* plus) const {
-        DiyFp pl = DiyFp((f << 1) + 1, e - 1).NormalizeBoundary();
-        DiyFp mi = (f == kDpHiddenBit) ? DiyFp((f << 2) - 1, e - 2) : DiyFp((f << 1) - 1, e - 1);
-        mi.f <<= mi.e - pl.e;
-        mi.e = pl.e;
-        *plus = pl;
-        *minus = mi;
-    }
-
-    double ToDouble() const {
-        union {
-            double d;
-            uint64_t u64;
-        }u;
-        const uint64_t be = (e == kDpDenormalExponent && (f & kDpHiddenBit) == 0) ? 0 : 
-            static_cast<uint64_t>(e + kDpExponentBias);
-        u.u64 = (f & kDpSignificandMask) | (be << kDpSignificandSize);
-        return u.d;
-    }
-
-    static const int kDiySignificandSize = 64;
-    static const int kDpSignificandSize = 52;
-    static const int kDpExponentBias = 0x3FF + kDpSignificandSize;
-    static const int kDpMaxExponent = 0x7FF - kDpExponentBias;
-    static const int kDpMinExponent = -kDpExponentBias;
-    static const int kDpDenormalExponent = -kDpExponentBias + 1;
-    static const uint64_t kDpExponentMask = CEREAL_RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kDpSignificandMask = CEREAL_RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kDpHiddenBit = CEREAL_RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    uint64_t f;
-    int e;
-};
-
-inline DiyFp GetCachedPowerByIndex(size_t index) {
-    // 10^-348, 10^-340, ..., 10^340
-    static const uint64_t kCachedPowers_F[] = {
-        CEREAL_RAPIDJSON_UINT64_C2(0xfa8fd5a0, 0x081c0288), CEREAL_RAPIDJSON_UINT64_C2(0xbaaee17f, 0xa23ebf76),
-        CEREAL_RAPIDJSON_UINT64_C2(0x8b16fb20, 0x3055ac76), CEREAL_RAPIDJSON_UINT64_C2(0xcf42894a, 0x5dce35ea),
-        CEREAL_RAPIDJSON_UINT64_C2(0x9a6bb0aa, 0x55653b2d), CEREAL_RAPIDJSON_UINT64_C2(0xe61acf03, 0x3d1a45df),
-        CEREAL_RAPIDJSON_UINT64_C2(0xab70fe17, 0xc79ac6ca), CEREAL_RAPIDJSON_UINT64_C2(0xff77b1fc, 0xbebcdc4f),
-        CEREAL_RAPIDJSON_UINT64_C2(0xbe5691ef, 0x416bd60c), CEREAL_RAPIDJSON_UINT64_C2(0x8dd01fad, 0x907ffc3c),
-        CEREAL_RAPIDJSON_UINT64_C2(0xd3515c28, 0x31559a83), CEREAL_RAPIDJSON_UINT64_C2(0x9d71ac8f, 0xada6c9b5),
-        CEREAL_RAPIDJSON_UINT64_C2(0xea9c2277, 0x23ee8bcb), CEREAL_RAPIDJSON_UINT64_C2(0xaecc4991, 0x4078536d),
-        CEREAL_RAPIDJSON_UINT64_C2(0x823c1279, 0x5db6ce57), CEREAL_RAPIDJSON_UINT64_C2(0xc2109436, 0x4dfb5637),
-        CEREAL_RAPIDJSON_UINT64_C2(0x9096ea6f, 0x3848984f), CEREAL_RAPIDJSON_UINT64_C2(0xd77485cb, 0x25823ac7),
-        CEREAL_RAPIDJSON_UINT64_C2(0xa086cfcd, 0x97bf97f4), CEREAL_RAPIDJSON_UINT64_C2(0xef340a98, 0x172aace5),
-        CEREAL_RAPIDJSON_UINT64_C2(0xb23867fb, 0x2a35b28e), CEREAL_RAPIDJSON_UINT64_C2(0x84c8d4df, 0xd2c63f3b),
-        CEREAL_RAPIDJSON_UINT64_C2(0xc5dd4427, 0x1ad3cdba), CEREAL_RAPIDJSON_UINT64_C2(0x936b9fce, 0xbb25c996),
-        CEREAL_RAPIDJSON_UINT64_C2(0xdbac6c24, 0x7d62a584), CEREAL_RAPIDJSON_UINT64_C2(0xa3ab6658, 0x0d5fdaf6),
-        CEREAL_RAPIDJSON_UINT64_C2(0xf3e2f893, 0xdec3f126), CEREAL_RAPIDJSON_UINT64_C2(0xb5b5ada8, 0xaaff80b8),
-        CEREAL_RAPIDJSON_UINT64_C2(0x87625f05, 0x6c7c4a8b), CEREAL_RAPIDJSON_UINT64_C2(0xc9bcff60, 0x34c13053),
-        CEREAL_RAPIDJSON_UINT64_C2(0x964e858c, 0x91ba2655), CEREAL_RAPIDJSON_UINT64_C2(0xdff97724, 0x70297ebd),
-        CEREAL_RAPIDJSON_UINT64_C2(0xa6dfbd9f, 0xb8e5b88f), CEREAL_RAPIDJSON_UINT64_C2(0xf8a95fcf, 0x88747d94),
-        CEREAL_RAPIDJSON_UINT64_C2(0xb9447093, 0x8fa89bcf), CEREAL_RAPIDJSON_UINT64_C2(0x8a08f0f8, 0xbf0f156b),
-        CEREAL_RAPIDJSON_UINT64_C2(0xcdb02555, 0x653131b6), CEREAL_RAPIDJSON_UINT64_C2(0x993fe2c6, 0xd07b7fac),
-        CEREAL_RAPIDJSON_UINT64_C2(0xe45c10c4, 0x2a2b3b06), CEREAL_RAPIDJSON_UINT64_C2(0xaa242499, 0x697392d3),
-        CEREAL_RAPIDJSON_UINT64_C2(0xfd87b5f2, 0x8300ca0e), CEREAL_RAPIDJSON_UINT64_C2(0xbce50864, 0x92111aeb),
-        CEREAL_RAPIDJSON_UINT64_C2(0x8cbccc09, 0x6f5088cc), CEREAL_RAPIDJSON_UINT64_C2(0xd1b71758, 0xe219652c),
-        CEREAL_RAPIDJSON_UINT64_C2(0x9c400000, 0x00000000), CEREAL_RAPIDJSON_UINT64_C2(0xe8d4a510, 0x00000000),
-        CEREAL_RAPIDJSON_UINT64_C2(0xad78ebc5, 0xac620000), CEREAL_RAPIDJSON_UINT64_C2(0x813f3978, 0xf8940984),
-        CEREAL_RAPIDJSON_UINT64_C2(0xc097ce7b, 0xc90715b3), CEREAL_RAPIDJSON_UINT64_C2(0x8f7e32ce, 0x7bea5c70),
-        CEREAL_RAPIDJSON_UINT64_C2(0xd5d238a4, 0xabe98068), CEREAL_RAPIDJSON_UINT64_C2(0x9f4f2726, 0x179a2245),
-        CEREAL_RAPIDJSON_UINT64_C2(0xed63a231, 0xd4c4fb27), CEREAL_RAPIDJSON_UINT64_C2(0xb0de6538, 0x8cc8ada8),
-        CEREAL_RAPIDJSON_UINT64_C2(0x83c7088e, 0x1aab65db), CEREAL_RAPIDJSON_UINT64_C2(0xc45d1df9, 0x42711d9a),
-        CEREAL_RAPIDJSON_UINT64_C2(0x924d692c, 0xa61be758), CEREAL_RAPIDJSON_UINT64_C2(0xda01ee64, 0x1a708dea),
-        CEREAL_RAPIDJSON_UINT64_C2(0xa26da399, 0x9aef774a), CEREAL_RAPIDJSON_UINT64_C2(0xf209787b, 0xb47d6b85),
-        CEREAL_RAPIDJSON_UINT64_C2(0xb454e4a1, 0x79dd1877), CEREAL_RAPIDJSON_UINT64_C2(0x865b8692, 0x5b9bc5c2),
-        CEREAL_RAPIDJSON_UINT64_C2(0xc83553c5, 0xc8965d3d), CEREAL_RAPIDJSON_UINT64_C2(0x952ab45c, 0xfa97a0b3),
-        CEREAL_RAPIDJSON_UINT64_C2(0xde469fbd, 0x99a05fe3), CEREAL_RAPIDJSON_UINT64_C2(0xa59bc234, 0xdb398c25),
-        CEREAL_RAPIDJSON_UINT64_C2(0xf6c69a72, 0xa3989f5c), CEREAL_RAPIDJSON_UINT64_C2(0xb7dcbf53, 0x54e9bece),
-        CEREAL_RAPIDJSON_UINT64_C2(0x88fcf317, 0xf22241e2), CEREAL_RAPIDJSON_UINT64_C2(0xcc20ce9b, 0xd35c78a5),
-        CEREAL_RAPIDJSON_UINT64_C2(0x98165af3, 0x7b2153df), CEREAL_RAPIDJSON_UINT64_C2(0xe2a0b5dc, 0x971f303a),
-        CEREAL_RAPIDJSON_UINT64_C2(0xa8d9d153, 0x5ce3b396), CEREAL_RAPIDJSON_UINT64_C2(0xfb9b7cd9, 0xa4a7443c),
-        CEREAL_RAPIDJSON_UINT64_C2(0xbb764c4c, 0xa7a44410), CEREAL_RAPIDJSON_UINT64_C2(0x8bab8eef, 0xb6409c1a),
-        CEREAL_RAPIDJSON_UINT64_C2(0xd01fef10, 0xa657842c), CEREAL_RAPIDJSON_UINT64_C2(0x9b10a4e5, 0xe9913129),
-        CEREAL_RAPIDJSON_UINT64_C2(0xe7109bfb, 0xa19c0c9d), CEREAL_RAPIDJSON_UINT64_C2(0xac2820d9, 0x623bf429),
-        CEREAL_RAPIDJSON_UINT64_C2(0x80444b5e, 0x7aa7cf85), CEREAL_RAPIDJSON_UINT64_C2(0xbf21e440, 0x03acdd2d),
-        CEREAL_RAPIDJSON_UINT64_C2(0x8e679c2f, 0x5e44ff8f), CEREAL_RAPIDJSON_UINT64_C2(0xd433179d, 0x9c8cb841),
-        CEREAL_RAPIDJSON_UINT64_C2(0x9e19db92, 0xb4e31ba9), CEREAL_RAPIDJSON_UINT64_C2(0xeb96bf6e, 0xbadf77d9),
-        CEREAL_RAPIDJSON_UINT64_C2(0xaf87023b, 0x9bf0ee6b)
-    };
-    static const int16_t kCachedPowers_E[] = {
-        -1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007,  -980,
-        -954,  -927,  -901,  -874,  -847,  -821,  -794,  -768,  -741,  -715,
-        -688,  -661,  -635,  -608,  -582,  -555,  -529,  -502,  -475,  -449,
-        -422,  -396,  -369,  -343,  -316,  -289,  -263,  -236,  -210,  -183,
-        -157,  -130,  -103,   -77,   -50,   -24,     3,    30,    56,    83,
-        109,   136,   162,   189,   216,   242,   269,   295,   322,   348,
-        375,   402,   428,   455,   481,   508,   534,   561,   588,   614,
-        641,   667,   694,   720,   747,   774,   800,   827,   853,   880,
-        907,   933,   960,   986,  1013,  1039,  1066
-    };
-    return DiyFp(kCachedPowers_F[index], kCachedPowers_E[index]);
-}
-    
-inline DiyFp GetCachedPower(int e, int* K) {
-
-    //int k = static_cast<int>(ceil((-61 - e) * 0.30102999566398114)) + 374;
-    double dk = (-61 - e) * 0.30102999566398114 + 347;  // dk must be positive, so can do ceiling in positive
-    int k = static_cast<int>(dk);
-    if (dk - k > 0.0)
-        k++;
-
-    unsigned index = static_cast<unsigned>((k >> 3) + 1);
-    *K = -(-348 + static_cast<int>(index << 3));    // decimal exponent no need lookup table
-
-    return GetCachedPowerByIndex(index);
-}
-
-inline DiyFp GetCachedPower10(int exp, int *outExp) {
-     unsigned index = (static_cast<unsigned>(exp) + 348u) / 8u;
-     *outExp = -348 + static_cast<int>(index) * 8;
-     return GetCachedPowerByIndex(index);
- }
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_DIYFP_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h
deleted file mode 100644
index c59c92e..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/dtoa.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-// This is a C++ header-only implementation of Grisu2 algorithm from the publication:
-// Loitsch, Florian. "Printing floating-point numbers quickly and accurately with
-// integers." ACM Sigplan Notices 45.6 (2010): 233-243.
-
-#ifndef CEREAL_RAPIDJSON_DTOA_
-#define CEREAL_RAPIDJSON_DTOA_
-
-#include "itoa.h" // GetDigitsLut()
-#include "diyfp.h"
-#include "ieee754.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-CEREAL_RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
-#endif
-
-inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
-    while (rest < wp_w && delta - rest >= ten_kappa &&
-           (rest + ten_kappa < wp_w ||  /// closer
-            wp_w - rest > rest + ten_kappa - wp_w)) {
-        buffer[len - 1]--;
-        rest += ten_kappa;
-    }
-}
-
-inline unsigned CountDecimalDigit32(uint32_t n) {
-    // Simple pure C++ implementation was faster than __builtin_clz version in this situation.
-    if (n < 10) return 1;
-    if (n < 100) return 2;
-    if (n < 1000) return 3;
-    if (n < 10000) return 4;
-    if (n < 100000) return 5;
-    if (n < 1000000) return 6;
-    if (n < 10000000) return 7;
-    if (n < 100000000) return 8;
-    // Will not reach 10 digits in DigitGen()
-    //if (n < 1000000000) return 9;
-    //return 10;
-    return 9;
-}
-
-inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
-    static const uint32_t kPow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
-    const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
-    const DiyFp wp_w = Mp - W;
-    uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
-    uint64_t p2 = Mp.f & (one.f - 1);
-    unsigned kappa = CountDecimalDigit32(p1); // kappa in [0, 9]
-    *len = 0;
-
-    while (kappa > 0) {
-        uint32_t d = 0;
-        switch (kappa) {
-            case  9: d = p1 /  100000000; p1 %=  100000000; break;
-            case  8: d = p1 /   10000000; p1 %=   10000000; break;
-            case  7: d = p1 /    1000000; p1 %=    1000000; break;
-            case  6: d = p1 /     100000; p1 %=     100000; break;
-            case  5: d = p1 /      10000; p1 %=      10000; break;
-            case  4: d = p1 /       1000; p1 %=       1000; break;
-            case  3: d = p1 /        100; p1 %=        100; break;
-            case  2: d = p1 /         10; p1 %=         10; break;
-            case  1: d = p1;              p1 =           0; break;
-            default:;
-        }
-        if (d || *len)
-            buffer[(*len)++] = static_cast<char>('0' + static_cast<char>(d));
-        kappa--;
-        uint64_t tmp = (static_cast<uint64_t>(p1) << -one.e) + p2;
-        if (tmp <= delta) {
-            *K += kappa;
-            GrisuRound(buffer, *len, delta, tmp, static_cast<uint64_t>(kPow10[kappa]) << -one.e, wp_w.f);
-            return;
-        }
-    }
-
-    // kappa = 0
-    for (;;) {
-        p2 *= 10;
-        delta *= 10;
-        char d = static_cast<char>(p2 >> -one.e);
-        if (d || *len)
-            buffer[(*len)++] = static_cast<char>('0' + d);
-        p2 &= one.f - 1;
-        kappa--;
-        if (p2 < delta) {
-            *K += kappa;
-            int index = -static_cast<int>(kappa);
-            GrisuRound(buffer, *len, delta, p2, one.f, wp_w.f * (index < 9 ? kPow10[-static_cast<int>(kappa)] : 0));
-            return;
-        }
-    }
-}
-
-inline void Grisu2(double value, char* buffer, int* length, int* K) {
-    const DiyFp v(value);
-    DiyFp w_m, w_p;
-    v.NormalizedBoundaries(&w_m, &w_p);
-
-    const DiyFp c_mk = GetCachedPower(w_p.e, K);
-    const DiyFp W = v.Normalize() * c_mk;
-    DiyFp Wp = w_p * c_mk;
-    DiyFp Wm = w_m * c_mk;
-    Wm.f++;
-    Wp.f--;
-    DigitGen(W, Wp, Wp.f - Wm.f, buffer, length, K);
-}
-
-inline char* WriteExponent(int K, char* buffer) {
-    if (K < 0) {
-        *buffer++ = '-';
-        K = -K;
-    }
-
-    if (K >= 100) {
-        *buffer++ = static_cast<char>('0' + static_cast<char>(K / 100));
-        K %= 100;
-        const char* d = GetDigitsLut() + K * 2;
-        *buffer++ = d[0];
-        *buffer++ = d[1];
-    }
-    else if (K >= 10) {
-        const char* d = GetDigitsLut() + K * 2;
-        *buffer++ = d[0];
-        *buffer++ = d[1];
-    }
-    else
-        *buffer++ = static_cast<char>('0' + static_cast<char>(K));
-
-    return buffer;
-}
-
-inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
-    const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
-
-    if (0 <= k && kk <= 21) {
-        // 1234e7 -> 12340000000
-        for (int i = length; i < kk; i++)
-            buffer[i] = '0';
-        buffer[kk] = '.';
-        buffer[kk + 1] = '0';
-        return &buffer[kk + 2];
-    }
-    else if (0 < kk && kk <= 21) {
-        // 1234e-2 -> 12.34
-        std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
-        buffer[kk] = '.';
-        if (0 > k + maxDecimalPlaces) {
-            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
-            // Remove extra trailing zeros (at least one) after truncation.
-            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
-                if (buffer[i] != '0')
-                    return &buffer[i + 1];
-            return &buffer[kk + 2]; // Reserve one zero
-        }
-        else
-            return &buffer[length + 1];
-    }
-    else if (-6 < kk && kk <= 0) {
-        // 1234e-6 -> 0.001234
-        const int offset = 2 - kk;
-        std::memmove(&buffer[offset], &buffer[0], static_cast<size_t>(length));
-        buffer[0] = '0';
-        buffer[1] = '.';
-        for (int i = 2; i < offset; i++)
-            buffer[i] = '0';
-        if (length - kk > maxDecimalPlaces) {
-            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
-            // Remove extra trailing zeros (at least one) after truncation.
-            for (int i = maxDecimalPlaces + 1; i > 2; i--)
-                if (buffer[i] != '0')
-                    return &buffer[i + 1];
-            return &buffer[3]; // Reserve one zero
-        }
-        else
-            return &buffer[length + offset];
-    }
-    else if (kk < -maxDecimalPlaces) {
-        // Truncate to zero
-        buffer[0] = '0';
-        buffer[1] = '.';
-        buffer[2] = '0';
-        return &buffer[3];
-    }
-    else if (length == 1) {
-        // 1e30
-        buffer[1] = 'e';
-        return WriteExponent(kk - 1, &buffer[2]);
-    }
-    else {
-        // 1234e30 -> 1.234e33
-        std::memmove(&buffer[2], &buffer[1], static_cast<size_t>(length - 1));
-        buffer[1] = '.';
-        buffer[length + 1] = 'e';
-        return WriteExponent(kk - 1, &buffer[0 + length + 2]);
-    }
-}
-
-inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
-    CEREAL_RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
-    Double d(value);
-    if (d.IsZero()) {
-        if (d.Sign())
-            *buffer++ = '-';     // -0.0, Issue #289
-        buffer[0] = '0';
-        buffer[1] = '.';
-        buffer[2] = '0';
-        return &buffer[3];
-    }
-    else {
-        if (value < 0) {
-            *buffer++ = '-';
-            value = -value;
-        }
-        int length, K;
-        Grisu2(value, buffer, &length, &K);
-        return Prettify(buffer, length, K, maxDecimalPlaces);
-    }
-}
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_DTOA_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h
deleted file mode 100644
index 35845a1..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/ieee754.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_IEEE754_
-#define CEREAL_RAPIDJSON_IEEE754_
-
-#include "../rapidjson.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-class Double {
-public:
-    Double() {}
-    Double(double d) : d_(d) {}
-    Double(uint64_t u) : u_(u) {}
-
-    double Value() const { return d_; }
-    uint64_t Uint64Value() const { return u_; }
-
-    double NextPositiveDouble() const {
-        CEREAL_RAPIDJSON_ASSERT(!Sign());
-        return Double(u_ + 1).Value();
-    }
-
-    bool Sign() const { return (u_ & kSignMask) != 0; }
-    uint64_t Significand() const { return u_ & kSignificandMask; }
-    int Exponent() const { return static_cast<int>(((u_ & kExponentMask) >> kSignificandSize) - kExponentBias); }
-
-    bool IsNan() const { return (u_ & kExponentMask) == kExponentMask && Significand() != 0; }
-    bool IsInf() const { return (u_ & kExponentMask) == kExponentMask && Significand() == 0; }
-    bool IsNanOrInf() const { return (u_ & kExponentMask) == kExponentMask; }
-    bool IsNormal() const { return (u_ & kExponentMask) != 0 || Significand() == 0; }
-    bool IsZero() const { return (u_ & (kExponentMask | kSignificandMask)) == 0; }
-
-    uint64_t IntegerSignificand() const { return IsNormal() ? Significand() | kHiddenBit : Significand(); }
-    int IntegerExponent() const { return (IsNormal() ? Exponent() : kDenormalExponent) - kSignificandSize; }
-    uint64_t ToBias() const { return (u_ & kSignMask) ? ~u_ + 1 : u_ | kSignMask; }
-
-    static unsigned EffectiveSignificandSize(int order) {
-        if (order >= -1021)
-            return 53;
-        else if (order <= -1074)
-            return 0;
-        else
-            return static_cast<unsigned>(order) + 1074;
-    }
-
-private:
-    static const int kSignificandSize = 52;
-    static const int kExponentBias = 0x3FF;
-    static const int kDenormalExponent = 1 - kExponentBias;
-    static const uint64_t kSignMask = CEREAL_RAPIDJSON_UINT64_C2(0x80000000, 0x00000000);
-    static const uint64_t kExponentMask = CEREAL_RAPIDJSON_UINT64_C2(0x7FF00000, 0x00000000);
-    static const uint64_t kSignificandMask = CEREAL_RAPIDJSON_UINT64_C2(0x000FFFFF, 0xFFFFFFFF);
-    static const uint64_t kHiddenBit = CEREAL_RAPIDJSON_UINT64_C2(0x00100000, 0x00000000);
-
-    union {
-        double d_;
-        uint64_t u_;
-    };
-};
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_IEEE754_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h
deleted file mode 100644
index 3e83658..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/itoa.h
+++ /dev/null
@@ -1,304 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ITOA_
-#define CEREAL_RAPIDJSON_ITOA_
-
-#include "../rapidjson.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-inline const char* GetDigitsLut() {
-    static const char cDigitsLut[200] = {
-        '0','0','0','1','0','2','0','3','0','4','0','5','0','6','0','7','0','8','0','9',
-        '1','0','1','1','1','2','1','3','1','4','1','5','1','6','1','7','1','8','1','9',
-        '2','0','2','1','2','2','2','3','2','4','2','5','2','6','2','7','2','8','2','9',
-        '3','0','3','1','3','2','3','3','3','4','3','5','3','6','3','7','3','8','3','9',
-        '4','0','4','1','4','2','4','3','4','4','4','5','4','6','4','7','4','8','4','9',
-        '5','0','5','1','5','2','5','3','5','4','5','5','5','6','5','7','5','8','5','9',
-        '6','0','6','1','6','2','6','3','6','4','6','5','6','6','6','7','6','8','6','9',
-        '7','0','7','1','7','2','7','3','7','4','7','5','7','6','7','7','7','8','7','9',
-        '8','0','8','1','8','2','8','3','8','4','8','5','8','6','8','7','8','8','8','9',
-        '9','0','9','1','9','2','9','3','9','4','9','5','9','6','9','7','9','8','9','9'
-    };
-    return cDigitsLut;
-}
-
-inline char* u32toa(uint32_t value, char* buffer) {
-    const char* cDigitsLut = GetDigitsLut();
-
-    if (value < 10000) {
-        const uint32_t d1 = (value / 100) << 1;
-        const uint32_t d2 = (value % 100) << 1;
-        
-        if (value >= 1000)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= 100)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= 10)
-            *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-    }
-    else if (value < 100000000) {
-        // value = bbbbcccc
-        const uint32_t b = value / 10000;
-        const uint32_t c = value % 10000;
-        
-        const uint32_t d1 = (b / 100) << 1;
-        const uint32_t d2 = (b % 100) << 1;
-        
-        const uint32_t d3 = (c / 100) << 1;
-        const uint32_t d4 = (c % 100) << 1;
-        
-        if (value >= 10000000)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= 1000000)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= 100000)
-            *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-    }
-    else {
-        // value = aabbbbcccc in decimal
-        
-        const uint32_t a = value / 100000000; // 1 to 42
-        value %= 100000000;
-        
-        if (a >= 10) {
-            const unsigned i = a << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
-
-        const uint32_t b = value / 10000; // 0 to 9999
-        const uint32_t c = value % 10000; // 0 to 9999
-        
-        const uint32_t d1 = (b / 100) << 1;
-        const uint32_t d2 = (b % 100) << 1;
-        
-        const uint32_t d3 = (c / 100) << 1;
-        const uint32_t d4 = (c % 100) << 1;
-        
-        *buffer++ = cDigitsLut[d1];
-        *buffer++ = cDigitsLut[d1 + 1];
-        *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-    }
-    return buffer;
-}
-
-inline char* i32toa(int32_t value, char* buffer) {
-    uint32_t u = static_cast<uint32_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-
-    return u32toa(u, buffer);
-}
-
-inline char* u64toa(uint64_t value, char* buffer) {
-    const char* cDigitsLut = GetDigitsLut();
-    const uint64_t  kTen8 = 100000000;
-    const uint64_t  kTen9 = kTen8 * 10;
-    const uint64_t kTen10 = kTen8 * 100;
-    const uint64_t kTen11 = kTen8 * 1000;
-    const uint64_t kTen12 = kTen8 * 10000;
-    const uint64_t kTen13 = kTen8 * 100000;
-    const uint64_t kTen14 = kTen8 * 1000000;
-    const uint64_t kTen15 = kTen8 * 10000000;
-    const uint64_t kTen16 = kTen8 * kTen8;
-    
-    if (value < kTen8) {
-        uint32_t v = static_cast<uint32_t>(value);
-        if (v < 10000) {
-            const uint32_t d1 = (v / 100) << 1;
-            const uint32_t d2 = (v % 100) << 1;
-            
-            if (v >= 1000)
-                *buffer++ = cDigitsLut[d1];
-            if (v >= 100)
-                *buffer++ = cDigitsLut[d1 + 1];
-            if (v >= 10)
-                *buffer++ = cDigitsLut[d2];
-            *buffer++ = cDigitsLut[d2 + 1];
-        }
-        else {
-            // value = bbbbcccc
-            const uint32_t b = v / 10000;
-            const uint32_t c = v % 10000;
-            
-            const uint32_t d1 = (b / 100) << 1;
-            const uint32_t d2 = (b % 100) << 1;
-            
-            const uint32_t d3 = (c / 100) << 1;
-            const uint32_t d4 = (c % 100) << 1;
-            
-            if (value >= 10000000)
-                *buffer++ = cDigitsLut[d1];
-            if (value >= 1000000)
-                *buffer++ = cDigitsLut[d1 + 1];
-            if (value >= 100000)
-                *buffer++ = cDigitsLut[d2];
-            *buffer++ = cDigitsLut[d2 + 1];
-            
-            *buffer++ = cDigitsLut[d3];
-            *buffer++ = cDigitsLut[d3 + 1];
-            *buffer++ = cDigitsLut[d4];
-            *buffer++ = cDigitsLut[d4 + 1];
-        }
-    }
-    else if (value < kTen16) {
-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-        
-        const uint32_t b0 = v0 / 10000;
-        const uint32_t c0 = v0 % 10000;
-        
-        const uint32_t d1 = (b0 / 100) << 1;
-        const uint32_t d2 = (b0 % 100) << 1;
-        
-        const uint32_t d3 = (c0 / 100) << 1;
-        const uint32_t d4 = (c0 % 100) << 1;
-
-        const uint32_t b1 = v1 / 10000;
-        const uint32_t c1 = v1 % 10000;
-        
-        const uint32_t d5 = (b1 / 100) << 1;
-        const uint32_t d6 = (b1 % 100) << 1;
-        
-        const uint32_t d7 = (c1 / 100) << 1;
-        const uint32_t d8 = (c1 % 100) << 1;
-
-        if (value >= kTen15)
-            *buffer++ = cDigitsLut[d1];
-        if (value >= kTen14)
-            *buffer++ = cDigitsLut[d1 + 1];
-        if (value >= kTen13)
-            *buffer++ = cDigitsLut[d2];
-        if (value >= kTen12)
-            *buffer++ = cDigitsLut[d2 + 1];
-        if (value >= kTen11)
-            *buffer++ = cDigitsLut[d3];
-        if (value >= kTen10)
-            *buffer++ = cDigitsLut[d3 + 1];
-        if (value >= kTen9)
-            *buffer++ = cDigitsLut[d4];
-        if (value >= kTen8)
-            *buffer++ = cDigitsLut[d4 + 1];
-        
-        *buffer++ = cDigitsLut[d5];
-        *buffer++ = cDigitsLut[d5 + 1];
-        *buffer++ = cDigitsLut[d6];
-        *buffer++ = cDigitsLut[d6 + 1];
-        *buffer++ = cDigitsLut[d7];
-        *buffer++ = cDigitsLut[d7 + 1];
-        *buffer++ = cDigitsLut[d8];
-        *buffer++ = cDigitsLut[d8 + 1];
-    }
-    else {
-        const uint32_t a = static_cast<uint32_t>(value / kTen16); // 1 to 1844
-        value %= kTen16;
-        
-        if (a < 10)
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a));
-        else if (a < 100) {
-            const uint32_t i = a << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else if (a < 1000) {
-            *buffer++ = static_cast<char>('0' + static_cast<char>(a / 100));
-            
-            const uint32_t i = (a % 100) << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-        }
-        else {
-            const uint32_t i = (a / 100) << 1;
-            const uint32_t j = (a % 100) << 1;
-            *buffer++ = cDigitsLut[i];
-            *buffer++ = cDigitsLut[i + 1];
-            *buffer++ = cDigitsLut[j];
-            *buffer++ = cDigitsLut[j + 1];
-        }
-        
-        const uint32_t v0 = static_cast<uint32_t>(value / kTen8);
-        const uint32_t v1 = static_cast<uint32_t>(value % kTen8);
-        
-        const uint32_t b0 = v0 / 10000;
-        const uint32_t c0 = v0 % 10000;
-        
-        const uint32_t d1 = (b0 / 100) << 1;
-        const uint32_t d2 = (b0 % 100) << 1;
-        
-        const uint32_t d3 = (c0 / 100) << 1;
-        const uint32_t d4 = (c0 % 100) << 1;
-        
-        const uint32_t b1 = v1 / 10000;
-        const uint32_t c1 = v1 % 10000;
-        
-        const uint32_t d5 = (b1 / 100) << 1;
-        const uint32_t d6 = (b1 % 100) << 1;
-        
-        const uint32_t d7 = (c1 / 100) << 1;
-        const uint32_t d8 = (c1 % 100) << 1;
-        
-        *buffer++ = cDigitsLut[d1];
-        *buffer++ = cDigitsLut[d1 + 1];
-        *buffer++ = cDigitsLut[d2];
-        *buffer++ = cDigitsLut[d2 + 1];
-        *buffer++ = cDigitsLut[d3];
-        *buffer++ = cDigitsLut[d3 + 1];
-        *buffer++ = cDigitsLut[d4];
-        *buffer++ = cDigitsLut[d4 + 1];
-        *buffer++ = cDigitsLut[d5];
-        *buffer++ = cDigitsLut[d5 + 1];
-        *buffer++ = cDigitsLut[d6];
-        *buffer++ = cDigitsLut[d6 + 1];
-        *buffer++ = cDigitsLut[d7];
-        *buffer++ = cDigitsLut[d7 + 1];
-        *buffer++ = cDigitsLut[d8];
-        *buffer++ = cDigitsLut[d8 + 1];
-    }
-    
-    return buffer;
-}
-
-inline char* i64toa(int64_t value, char* buffer) {
-    uint64_t u = static_cast<uint64_t>(value);
-    if (value < 0) {
-        *buffer++ = '-';
-        u = ~u + 1;
-    }
-
-    return u64toa(u, buffer);
-}
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_ITOA_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h
deleted file mode 100644
index c98db90..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/meta.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_INTERNAL_META_H_
-#define CEREAL_RAPIDJSON_INTERNAL_META_H_
-
-#include "../rapidjson.h"
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-#if defined(_MSC_VER)
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(6334)
-#endif
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
-#include <type_traits>
-#endif
-
-//@cond CEREAL_RAPIDJSON_INTERNAL
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-// Helper to wrap/convert arbitrary types to void, useful for arbitrary type matching
-template <typename T> struct Void { typedef void Type; };
-
-///////////////////////////////////////////////////////////////////////////////
-// BoolType, TrueType, FalseType
-//
-template <bool Cond> struct BoolType {
-    static const bool Value = Cond;
-    typedef BoolType Type;
-};
-typedef BoolType<true> TrueType;
-typedef BoolType<false> FalseType;
-
-
-///////////////////////////////////////////////////////////////////////////////
-// SelectIf, BoolExpr, NotExpr, AndExpr, OrExpr
-//
-
-template <bool C> struct SelectIfImpl { template <typename T1, typename T2> struct Apply { typedef T1 Type; }; };
-template <> struct SelectIfImpl<false> { template <typename T1, typename T2> struct Apply { typedef T2 Type; }; };
-template <bool C, typename T1, typename T2> struct SelectIfCond : SelectIfImpl<C>::template Apply<T1,T2> {};
-template <typename C, typename T1, typename T2> struct SelectIf : SelectIfCond<C::Value, T1, T2> {};
-
-template <bool Cond1, bool Cond2> struct AndExprCond : FalseType {};
-template <> struct AndExprCond<true, true> : TrueType {};
-template <bool Cond1, bool Cond2> struct OrExprCond : TrueType {};
-template <> struct OrExprCond<false, false> : FalseType {};
-
-template <typename C> struct BoolExpr : SelectIf<C,TrueType,FalseType>::Type {};
-template <typename C> struct NotExpr  : SelectIf<C,FalseType,TrueType>::Type {};
-template <typename C1, typename C2> struct AndExpr : AndExprCond<C1::Value, C2::Value>::Type {};
-template <typename C1, typename C2> struct OrExpr  : OrExprCond<C1::Value, C2::Value>::Type {};
-
-
-///////////////////////////////////////////////////////////////////////////////
-// AddConst, MaybeAddConst, RemoveConst
-template <typename T> struct AddConst { typedef const T Type; };
-template <bool Constify, typename T> struct MaybeAddConst : SelectIfCond<Constify, const T, T> {};
-template <typename T> struct RemoveConst { typedef T Type; };
-template <typename T> struct RemoveConst<const T> { typedef T Type; };
-
-
-///////////////////////////////////////////////////////////////////////////////
-// IsSame, IsConst, IsMoreConst, IsPointer
-//
-template <typename T, typename U> struct IsSame : FalseType {};
-template <typename T> struct IsSame<T, T> : TrueType {};
-
-template <typename T> struct IsConst : FalseType {};
-template <typename T> struct IsConst<const T> : TrueType {};
-
-template <typename CT, typename T>
-struct IsMoreConst
-    : AndExpr<IsSame<typename RemoveConst<CT>::Type, typename RemoveConst<T>::Type>,
-              BoolType<IsConst<CT>::Value >= IsConst<T>::Value> >::Type {};
-
-template <typename T> struct IsPointer : FalseType {};
-template <typename T> struct IsPointer<T*> : TrueType {};
-
-///////////////////////////////////////////////////////////////////////////////
-// IsBaseOf
-//
-#if CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
-
-template <typename B, typename D> struct IsBaseOf
-    : BoolType< ::std::is_base_of<B,D>::value> {};
-
-#else // simplified version adopted from Boost
-
-template<typename B, typename D> struct IsBaseOfImpl {
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(B) != 0);
-    CEREAL_RAPIDJSON_STATIC_ASSERT(sizeof(D) != 0);
-
-    typedef char (&Yes)[1];
-    typedef char (&No) [2];
-
-    template <typename T>
-    static Yes Check(const D*, T);
-    static No  Check(const B*, int);
-
-    struct Host {
-        operator const B*() const;
-        operator const D*();
-    };
-
-    enum { Value = (sizeof(Check(Host(), 0)) == sizeof(Yes)) };
-};
-
-template <typename B, typename D> struct IsBaseOf
-    : OrExpr<IsSame<B, D>, BoolExpr<IsBaseOfImpl<B, D> > >::Type {};
-
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
-
-
-//////////////////////////////////////////////////////////////////////////
-// EnableIf / DisableIf
-//
-template <bool Condition, typename T = void> struct EnableIfCond  { typedef T Type; };
-template <typename T> struct EnableIfCond<false, T> { /* empty */ };
-
-template <bool Condition, typename T = void> struct DisableIfCond { typedef T Type; };
-template <typename T> struct DisableIfCond<true, T> { /* empty */ };
-
-template <typename Condition, typename T = void>
-struct EnableIf : EnableIfCond<Condition::Value, T> {};
-
-template <typename Condition, typename T = void>
-struct DisableIf : DisableIfCond<Condition::Value, T> {};
-
-// SFINAE helpers
-struct SfinaeTag {};
-template <typename T> struct RemoveSfinaeTag;
-template <typename T> struct RemoveSfinaeTag<SfinaeTag&(*)(T)> { typedef T Type; };
-
-#define CEREAL_RAPIDJSON_REMOVEFPTR_(type) \
-    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::RemoveSfinaeTag \
-        < ::CEREAL_RAPIDJSON_NAMESPACE::internal::SfinaeTag&(*) type>::Type
-
-#define CEREAL_RAPIDJSON_ENABLEIF(cond) \
-    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::EnableIf \
-        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define CEREAL_RAPIDJSON_DISABLEIF(cond) \
-    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::DisableIf \
-        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond)>::Type * = NULL
-
-#define CEREAL_RAPIDJSON_ENABLEIF_RETURN(cond,returntype) \
-    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::EnableIf \
-        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond), \
-         CEREAL_RAPIDJSON_REMOVEFPTR_(returntype)>::Type
-
-#define CEREAL_RAPIDJSON_DISABLEIF_RETURN(cond,returntype) \
-    typename ::CEREAL_RAPIDJSON_NAMESPACE::internal::DisableIf \
-        <CEREAL_RAPIDJSON_REMOVEFPTR_(cond), \
-         CEREAL_RAPIDJSON_REMOVEFPTR_(returntype)>::Type
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-//@endcond
-
-#if defined(__GNUC__) || defined(_MSC_VER)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_INTERNAL_META_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h
deleted file mode 100644
index 7f796a1..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/pow10.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_POW10_
-#define CEREAL_RAPIDJSON_POW10_
-
-#include "../rapidjson.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Computes integer powers of 10 in double (10.0^n).
-/*! This function uses lookup table for fast and accurate results.
-    \param n non-negative exponent. Must <= 308.
-    \return 10.0^n
-*/
-inline double Pow10(int n) {
-    static const double e[] = { // 1e-0...1e308: 309 * 8 bytes = 2472 bytes
-        1e+0,  
-        1e+1,  1e+2,  1e+3,  1e+4,  1e+5,  1e+6,  1e+7,  1e+8,  1e+9,  1e+10, 1e+11, 1e+12, 1e+13, 1e+14, 1e+15, 1e+16, 1e+17, 1e+18, 1e+19, 1e+20, 
-        1e+21, 1e+22, 1e+23, 1e+24, 1e+25, 1e+26, 1e+27, 1e+28, 1e+29, 1e+30, 1e+31, 1e+32, 1e+33, 1e+34, 1e+35, 1e+36, 1e+37, 1e+38, 1e+39, 1e+40,
-        1e+41, 1e+42, 1e+43, 1e+44, 1e+45, 1e+46, 1e+47, 1e+48, 1e+49, 1e+50, 1e+51, 1e+52, 1e+53, 1e+54, 1e+55, 1e+56, 1e+57, 1e+58, 1e+59, 1e+60,
-        1e+61, 1e+62, 1e+63, 1e+64, 1e+65, 1e+66, 1e+67, 1e+68, 1e+69, 1e+70, 1e+71, 1e+72, 1e+73, 1e+74, 1e+75, 1e+76, 1e+77, 1e+78, 1e+79, 1e+80,
-        1e+81, 1e+82, 1e+83, 1e+84, 1e+85, 1e+86, 1e+87, 1e+88, 1e+89, 1e+90, 1e+91, 1e+92, 1e+93, 1e+94, 1e+95, 1e+96, 1e+97, 1e+98, 1e+99, 1e+100,
-        1e+101,1e+102,1e+103,1e+104,1e+105,1e+106,1e+107,1e+108,1e+109,1e+110,1e+111,1e+112,1e+113,1e+114,1e+115,1e+116,1e+117,1e+118,1e+119,1e+120,
-        1e+121,1e+122,1e+123,1e+124,1e+125,1e+126,1e+127,1e+128,1e+129,1e+130,1e+131,1e+132,1e+133,1e+134,1e+135,1e+136,1e+137,1e+138,1e+139,1e+140,
-        1e+141,1e+142,1e+143,1e+144,1e+145,1e+146,1e+147,1e+148,1e+149,1e+150,1e+151,1e+152,1e+153,1e+154,1e+155,1e+156,1e+157,1e+158,1e+159,1e+160,
-        1e+161,1e+162,1e+163,1e+164,1e+165,1e+166,1e+167,1e+168,1e+169,1e+170,1e+171,1e+172,1e+173,1e+174,1e+175,1e+176,1e+177,1e+178,1e+179,1e+180,
-        1e+181,1e+182,1e+183,1e+184,1e+185,1e+186,1e+187,1e+188,1e+189,1e+190,1e+191,1e+192,1e+193,1e+194,1e+195,1e+196,1e+197,1e+198,1e+199,1e+200,
-        1e+201,1e+202,1e+203,1e+204,1e+205,1e+206,1e+207,1e+208,1e+209,1e+210,1e+211,1e+212,1e+213,1e+214,1e+215,1e+216,1e+217,1e+218,1e+219,1e+220,
-        1e+221,1e+222,1e+223,1e+224,1e+225,1e+226,1e+227,1e+228,1e+229,1e+230,1e+231,1e+232,1e+233,1e+234,1e+235,1e+236,1e+237,1e+238,1e+239,1e+240,
-        1e+241,1e+242,1e+243,1e+244,1e+245,1e+246,1e+247,1e+248,1e+249,1e+250,1e+251,1e+252,1e+253,1e+254,1e+255,1e+256,1e+257,1e+258,1e+259,1e+260,
-        1e+261,1e+262,1e+263,1e+264,1e+265,1e+266,1e+267,1e+268,1e+269,1e+270,1e+271,1e+272,1e+273,1e+274,1e+275,1e+276,1e+277,1e+278,1e+279,1e+280,
-        1e+281,1e+282,1e+283,1e+284,1e+285,1e+286,1e+287,1e+288,1e+289,1e+290,1e+291,1e+292,1e+293,1e+294,1e+295,1e+296,1e+297,1e+298,1e+299,1e+300,
-        1e+301,1e+302,1e+303,1e+304,1e+305,1e+306,1e+307,1e+308
-    };
-    CEREAL_RAPIDJSON_ASSERT(n >= 0 && n <= 308);
-    return e[n];
-}
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_POW10_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h
deleted file mode 100644
index 3bfa3ec..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/regex.h
+++ /dev/null
@@ -1,701 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_INTERNAL_REGEX_H_
-#define CEREAL_RAPIDJSON_INTERNAL_REGEX_H_
-
-#include "../allocators.h"
-#include "../stream.h"
-#include "stack.h"
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
-CEREAL_RAPIDJSON_DIAG_OFF(implicit-fallthrough)
-#endif
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-#ifndef CEREAL_RAPIDJSON_REGEX_VERBOSE
-#define CEREAL_RAPIDJSON_REGEX_VERBOSE 0
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericRegex
-
-static const SizeType kRegexInvalidState = ~SizeType(0);  //!< Represents an invalid index in GenericRegex::State::out, out1
-static const SizeType kRegexInvalidRange = ~SizeType(0);
-
-//! Regular expression engine with subset of ECMAscript grammar.
-/*!
-    Supported regular expression syntax:
-    - \c ab     Concatenation
-    - \c a|b    Alternation
-    - \c a?     Zero or one
-    - \c a*     Zero or more
-    - \c a+     One or more
-    - \c a{3}   Exactly 3 times
-    - \c a{3,}  At least 3 times
-    - \c a{3,5} 3 to 5 times
-    - \c (ab)   Grouping
-    - \c ^a     At the beginning
-    - \c a$     At the end
-    - \c .      Any character
-    - \c [abc]  Character classes
-    - \c [a-c]  Character class range
-    - \c [a-z0-9_] Character class combination
-    - \c [^abc] Negated character classes
-    - \c [^a-c] Negated character class range
-    - \c [\b]   Backspace (U+0008)
-    - \c \\| \\\\ ...  Escape characters
-    - \c \\f Form feed (U+000C)
-    - \c \\n Line feed (U+000A)
-    - \c \\r Carriage return (U+000D)
-    - \c \\t Tab (U+0009)
-    - \c \\v Vertical tab (U+000B)
-
-    \note This is a Thompson NFA engine, implemented with reference to 
-        Cox, Russ. "Regular Expression Matching Can Be Simple And Fast (but is slow in Java, Perl, PHP, Python, Ruby,...).", 
-        https://swtch.com/~rsc/regexp/regexp1.html 
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-class GenericRegex {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    GenericRegex(const Ch* source, Allocator* allocator = 0) : 
-        states_(allocator, 256), ranges_(allocator, 256), root_(kRegexInvalidState), stateCount_(), rangeCount_(), 
-        stateSet_(), state0_(allocator, 0), state1_(allocator, 0), anchorBegin_(), anchorEnd_()
-    {
-        GenericStringStream<Encoding> ss(source);
-        DecodedStream<GenericStringStream<Encoding> > ds(ss);
-        Parse(ds);
-    }
-
-    ~GenericRegex() {
-        Allocator::Free(stateSet_);
-    }
-
-    bool IsValid() const {
-        return root_ != kRegexInvalidState;
-    }
-
-    template <typename InputStream>
-    bool Match(InputStream& is) const {
-        return SearchWithAnchoring(is, true, true);
-    }
-
-    bool Match(const Ch* s) const {
-        GenericStringStream<Encoding> is(s);
-        return Match(is);
-    }
-
-    template <typename InputStream>
-    bool Search(InputStream& is) const {
-        return SearchWithAnchoring(is, anchorBegin_, anchorEnd_);
-    }
-
-    bool Search(const Ch* s) const {
-        GenericStringStream<Encoding> is(s);
-        return Search(is);
-    }
-
-private:
-    enum Operator {
-        kZeroOrOne,
-        kZeroOrMore,
-        kOneOrMore,
-        kConcatenation,
-        kAlternation,
-        kLeftParenthesis
-    };
-
-    static const unsigned kAnyCharacterClass = 0xFFFFFFFF;   //!< For '.'
-    static const unsigned kRangeCharacterClass = 0xFFFFFFFE;
-    static const unsigned kRangeNegationFlag = 0x80000000;
-
-    struct Range {
-        unsigned start; // 
-        unsigned end;
-        SizeType next;
-    };
-
-    struct State {
-        SizeType out;     //!< Equals to kInvalid for matching state
-        SizeType out1;    //!< Equals to non-kInvalid for split
-        SizeType rangeStart;
-        unsigned codepoint;
-    };
-
-    struct Frag {
-        Frag(SizeType s, SizeType o, SizeType m) : start(s), out(o), minIndex(m) {}
-        SizeType start;
-        SizeType out; //!< link-list of all output states
-        SizeType minIndex;
-    };
-
-    template <typename SourceStream>
-    class DecodedStream {
-    public:
-        DecodedStream(SourceStream& ss) : ss_(ss), codepoint_() { Decode(); }
-        unsigned Peek() { return codepoint_; }
-        unsigned Take() {
-            unsigned c = codepoint_;
-            if (c) // No further decoding when '\0'
-                Decode();
-            return c;
-        }
-
-    private:
-        void Decode() {
-            if (!Encoding::Decode(ss_, &codepoint_))
-                codepoint_ = 0;
-        }
-
-        SourceStream& ss_;
-        unsigned codepoint_;
-    };
-
-    State& GetState(SizeType index) {
-        CEREAL_RAPIDJSON_ASSERT(index < stateCount_);
-        return states_.template Bottom<State>()[index];
-    }
-
-    const State& GetState(SizeType index) const {
-        CEREAL_RAPIDJSON_ASSERT(index < stateCount_);
-        return states_.template Bottom<State>()[index];
-    }
-
-    Range& GetRange(SizeType index) {
-        CEREAL_RAPIDJSON_ASSERT(index < rangeCount_);
-        return ranges_.template Bottom<Range>()[index];
-    }
-
-    const Range& GetRange(SizeType index) const {
-        CEREAL_RAPIDJSON_ASSERT(index < rangeCount_);
-        return ranges_.template Bottom<Range>()[index];
-    }
-
-    template <typename InputStream>
-    void Parse(DecodedStream<InputStream>& ds) {
-        Allocator allocator;
-        Stack<Allocator> operandStack(&allocator, 256);     // Frag
-        Stack<Allocator> operatorStack(&allocator, 256);    // Operator
-        Stack<Allocator> atomCountStack(&allocator, 256);   // unsigned (Atom per parenthesis)
-
-        *atomCountStack.template Push<unsigned>() = 0;
-
-        unsigned codepoint;
-        while (ds.Peek() != 0) {
-            switch (codepoint = ds.Take()) {
-                case '^':
-                    anchorBegin_ = true;
-                    break;
-
-                case '$':
-                    anchorEnd_ = true;
-                    break;
-
-                case '|':
-                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() < kAlternation)
-                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                            return;
-                    *operatorStack.template Push<Operator>() = kAlternation;
-                    *atomCountStack.template Top<unsigned>() = 0;
-                    break;
-
-                case '(':
-                    *operatorStack.template Push<Operator>() = kLeftParenthesis;
-                    *atomCountStack.template Push<unsigned>() = 0;
-                    break;
-
-                case ')':
-                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() != kLeftParenthesis)
-                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                            return;
-                    if (operatorStack.Empty())
-                        return;
-                    operatorStack.template Pop<Operator>(1);
-                    atomCountStack.template Pop<unsigned>(1);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '?':
-                    if (!Eval(operandStack, kZeroOrOne))
-                        return;
-                    break;
-
-                case '*':
-                    if (!Eval(operandStack, kZeroOrMore))
-                        return;
-                    break;
-
-                case '+':
-                    if (!Eval(operandStack, kOneOrMore))
-                        return;
-                    break;
-
-                case '{':
-                    {
-                        unsigned n, m;
-                        if (!ParseUnsigned(ds, &n))
-                            return;
-
-                        if (ds.Peek() == ',') {
-                            ds.Take();
-                            if (ds.Peek() == '}')
-                                m = kInfinityQuantifier;
-                            else if (!ParseUnsigned(ds, &m) || m < n)
-                                return;
-                        }
-                        else
-                            m = n;
-
-                        if (!EvalQuantifier(operandStack, n, m) || ds.Peek() != '}')
-                            return;
-                        ds.Take();
-                    }
-                    break;
-
-                case '.':
-                    PushOperand(operandStack, kAnyCharacterClass);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '[':
-                    {
-                        SizeType range;
-                        if (!ParseRange(ds, &range))
-                            return;
-                        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, kRangeCharacterClass);
-                        GetState(s).rangeStart = range;
-                        *operandStack.template Push<Frag>() = Frag(s, s, s);
-                    }
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-                    break;
-
-                case '\\': // Escape character
-                    if (!CharacterEscape(ds, &codepoint))
-                        return; // Unsupported escape character
-                    // fall through to default
-
-                default: // Pattern character
-                    PushOperand(operandStack, codepoint);
-                    ImplicitConcatenation(atomCountStack, operatorStack);
-            }
-        }
-
-        while (!operatorStack.Empty())
-            if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
-                return;
-
-        // Link the operand to matching state.
-        if (operandStack.GetSize() == sizeof(Frag)) {
-            Frag* e = operandStack.template Pop<Frag>(1);
-            Patch(e->out, NewState(kRegexInvalidState, kRegexInvalidState, 0));
-            root_ = e->start;
-
-#if CEREAL_RAPIDJSON_REGEX_VERBOSE
-            printf("root: %d\n", root_);
-            for (SizeType i = 0; i < stateCount_ ; i++) {
-                State& s = GetState(i);
-                printf("[%2d] out: %2d out1: %2d c: '%c'\n", i, s.out, s.out1, (char)s.codepoint);
-            }
-            printf("\n");
-#endif
-        }
-
-        // Preallocate buffer for SearchWithAnchoring()
-        CEREAL_RAPIDJSON_ASSERT(stateSet_ == 0);
-        if (stateCount_ > 0) {
-            stateSet_ = static_cast<unsigned*>(states_.GetAllocator().Malloc(GetStateSetSize()));
-            state0_.template Reserve<SizeType>(stateCount_);
-            state1_.template Reserve<SizeType>(stateCount_);
-        }
-    }
-
-    SizeType NewState(SizeType out, SizeType out1, unsigned codepoint) {
-        State* s = states_.template Push<State>();
-        s->out = out;
-        s->out1 = out1;
-        s->codepoint = codepoint;
-        s->rangeStart = kRegexInvalidRange;
-        return stateCount_++;
-    }
-
-    void PushOperand(Stack<Allocator>& operandStack, unsigned codepoint) {
-        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, codepoint);
-        *operandStack.template Push<Frag>() = Frag(s, s, s);
-    }
-
-    void ImplicitConcatenation(Stack<Allocator>& atomCountStack, Stack<Allocator>& operatorStack) {
-        if (*atomCountStack.template Top<unsigned>())
-            *operatorStack.template Push<Operator>() = kConcatenation;
-        (*atomCountStack.template Top<unsigned>())++;
-    }
-
-    SizeType Append(SizeType l1, SizeType l2) {
-        SizeType old = l1;
-        while (GetState(l1).out != kRegexInvalidState)
-            l1 = GetState(l1).out;
-        GetState(l1).out = l2;
-        return old;
-    }
-
-    void Patch(SizeType l, SizeType s) {
-        for (SizeType next; l != kRegexInvalidState; l = next) {
-            next = GetState(l).out;
-            GetState(l).out = s;
-        }
-    }
-
-    bool Eval(Stack<Allocator>& operandStack, Operator op) {
-        switch (op) {
-            case kConcatenation:
-                CEREAL_RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag) * 2);
-                {
-                    Frag e2 = *operandStack.template Pop<Frag>(1);
-                    Frag e1 = *operandStack.template Pop<Frag>(1);
-                    Patch(e1.out, e2.start);
-                    *operandStack.template Push<Frag>() = Frag(e1.start, e2.out, Min(e1.minIndex, e2.minIndex));
-                }
-                return true;
-
-            case kAlternation:
-                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
-                    Frag e2 = *operandStack.template Pop<Frag>(1);
-                    Frag e1 = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(e1.start, e2.start, 0);
-                    *operandStack.template Push<Frag>() = Frag(s, Append(e1.out, e2.out), Min(e1.minIndex, e2.minIndex));
-                    return true;
-                }
-                return false;
-
-            case kZeroOrOne:
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    *operandStack.template Push<Frag>() = Frag(s, Append(e.out, s), e.minIndex);
-                    return true;
-                }
-                return false;
-
-            case kZeroOrMore:
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    Patch(e.out, s);
-                    *operandStack.template Push<Frag>() = Frag(s, s, e.minIndex);
-                    return true;
-                }
-                return false;
-
-            default: 
-                CEREAL_RAPIDJSON_ASSERT(op == kOneOrMore);
-                if (operandStack.GetSize() >= sizeof(Frag)) {
-                    Frag e = *operandStack.template Pop<Frag>(1);
-                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
-                    Patch(e.out, s);
-                    *operandStack.template Push<Frag>() = Frag(e.start, s, e.minIndex);
-                    return true;
-                }
-                return false;
-        }
-    }
-
-    bool EvalQuantifier(Stack<Allocator>& operandStack, unsigned n, unsigned m) {
-        CEREAL_RAPIDJSON_ASSERT(n <= m);
-        CEREAL_RAPIDJSON_ASSERT(operandStack.GetSize() >= sizeof(Frag));
-
-        if (n == 0) {
-            if (m == 0)                             // a{0} not support
-                return false;
-            else if (m == kInfinityQuantifier)
-                Eval(operandStack, kZeroOrMore);    // a{0,} -> a*
-            else {
-                Eval(operandStack, kZeroOrOne);         // a{0,5} -> a?
-                for (unsigned i = 0; i < m - 1; i++)
-                    CloneTopOperand(operandStack);      // a{0,5} -> a? a? a? a? a?
-                for (unsigned i = 0; i < m - 1; i++)
-                    Eval(operandStack, kConcatenation); // a{0,5} -> a?a?a?a?a?
-            }
-            return true;
-        }
-
-        for (unsigned i = 0; i < n - 1; i++)        // a{3} -> a a a
-            CloneTopOperand(operandStack);
-
-        if (m == kInfinityQuantifier)
-            Eval(operandStack, kOneOrMore);         // a{3,} -> a a a+
-        else if (m > n) {
-            CloneTopOperand(operandStack);          // a{3,5} -> a a a a
-            Eval(operandStack, kZeroOrOne);         // a{3,5} -> a a a a?
-            for (unsigned i = n; i < m - 1; i++)
-                CloneTopOperand(operandStack);      // a{3,5} -> a a a a? a?
-            for (unsigned i = n; i < m; i++)
-                Eval(operandStack, kConcatenation); // a{3,5} -> a a aa?a?
-        }
-
-        for (unsigned i = 0; i < n - 1; i++)
-            Eval(operandStack, kConcatenation);     // a{3} -> aaa, a{3,} -> aaa+, a{3.5} -> aaaa?a?
-
-        return true;
-    }
-
-    static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
-
-    void CloneTopOperand(Stack<Allocator>& operandStack) {
-        const Frag src = *operandStack.template Top<Frag>(); // Copy constructor to prevent invalidation
-        SizeType count = stateCount_ - src.minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
-        State* s = states_.template Push<State>(count);
-        memcpy(s, &GetState(src.minIndex), count * sizeof(State));
-        for (SizeType j = 0; j < count; j++) {
-            if (s[j].out != kRegexInvalidState)
-                s[j].out += count;
-            if (s[j].out1 != kRegexInvalidState)
-                s[j].out1 += count;
-        }
-        *operandStack.template Push<Frag>() = Frag(src.start + count, src.out + count, src.minIndex + count);
-        stateCount_ += count;
-    }
-
-    template <typename InputStream>
-    bool ParseUnsigned(DecodedStream<InputStream>& ds, unsigned* u) {
-        unsigned r = 0;
-        if (ds.Peek() < '0' || ds.Peek() > '9')
-            return false;
-        while (ds.Peek() >= '0' && ds.Peek() <= '9') {
-            if (r >= 429496729 && ds.Peek() > '5') // 2^32 - 1 = 4294967295
-                return false; // overflow
-            r = r * 10 + (ds.Take() - '0');
-        }
-        *u = r;
-        return true;
-    }
-
-    template <typename InputStream>
-    bool ParseRange(DecodedStream<InputStream>& ds, SizeType* range) {
-        bool isBegin = true;
-        bool negate = false;
-        int step = 0;
-        SizeType start = kRegexInvalidRange;
-        SizeType current = kRegexInvalidRange;
-        unsigned codepoint;
-        while ((codepoint = ds.Take()) != 0) {
-            if (isBegin) {
-                isBegin = false;
-                if (codepoint == '^') {
-                    negate = true;
-                    continue;
-                }
-            }
-
-            switch (codepoint) {
-            case ']':
-                if (start == kRegexInvalidRange)
-                    return false;   // Error: nothing inside []
-                if (step == 2) { // Add trailing '-'
-                    SizeType r = NewRange('-');
-                    CEREAL_RAPIDJSON_ASSERT(current != kRegexInvalidRange);
-                    GetRange(current).next = r;
-                }
-                if (negate)
-                    GetRange(start).start |= kRangeNegationFlag;
-                *range = start;
-                return true;
-
-            case '\\':
-                if (ds.Peek() == 'b') {
-                    ds.Take();
-                    codepoint = 0x0008; // Escape backspace character
-                }
-                else if (!CharacterEscape(ds, &codepoint))
-                    return false;
-                // fall through to default
-
-            default:
-                switch (step) {
-                case 1:
-                    if (codepoint == '-') {
-                        step++;
-                        break;
-                    }
-                    // fall through to step 0 for other characters
-
-                case 0:
-                    {
-                        SizeType r = NewRange(codepoint);
-                        if (current != kRegexInvalidRange)
-                            GetRange(current).next = r;
-                        if (start == kRegexInvalidRange)
-                            start = r;
-                        current = r;
-                    }
-                    step = 1;
-                    break;
-
-                default:
-                    CEREAL_RAPIDJSON_ASSERT(step == 2);
-                    GetRange(current).end = codepoint;
-                    step = 0;
-                }
-            }
-        }
-        return false;
-    }
-    
-    SizeType NewRange(unsigned codepoint) {
-        Range* r = ranges_.template Push<Range>();
-        r->start = r->end = codepoint;
-        r->next = kRegexInvalidRange;
-        return rangeCount_++;
-    }
-
-    template <typename InputStream>
-    bool CharacterEscape(DecodedStream<InputStream>& ds, unsigned* escapedCodepoint) {
-        unsigned codepoint;
-        switch (codepoint = ds.Take()) {
-            case '^':
-            case '$':
-            case '|':
-            case '(':
-            case ')':
-            case '?':
-            case '*':
-            case '+':
-            case '.':
-            case '[':
-            case ']':
-            case '{':
-            case '}':
-            case '\\':
-                *escapedCodepoint = codepoint; return true;
-            case 'f': *escapedCodepoint = 0x000C; return true;
-            case 'n': *escapedCodepoint = 0x000A; return true;
-            case 'r': *escapedCodepoint = 0x000D; return true;
-            case 't': *escapedCodepoint = 0x0009; return true;
-            case 'v': *escapedCodepoint = 0x000B; return true;
-            default:
-                return false; // Unsupported escape character
-        }
-    }
-
-    template <typename InputStream>
-    bool SearchWithAnchoring(InputStream& is, bool anchorBegin, bool anchorEnd) const {
-        CEREAL_RAPIDJSON_ASSERT(IsValid());
-        DecodedStream<InputStream> ds(is);
-
-        state0_.Clear();
-        Stack<Allocator> *current = &state0_, *next = &state1_;
-        const size_t stateSetSize = GetStateSetSize();
-        std::memset(stateSet_, 0, stateSetSize);
-
-        bool matched = AddState(*current, root_);
-        unsigned codepoint;
-        while (!current->Empty() && (codepoint = ds.Take()) != 0) {
-            std::memset(stateSet_, 0, stateSetSize);
-            next->Clear();
-            matched = false;
-            for (const SizeType* s = current->template Bottom<SizeType>(); s != current->template End<SizeType>(); ++s) {
-                const State& sr = GetState(*s);
-                if (sr.codepoint == codepoint ||
-                    sr.codepoint == kAnyCharacterClass || 
-                    (sr.codepoint == kRangeCharacterClass && MatchRange(sr.rangeStart, codepoint)))
-                {
-                    matched = AddState(*next, sr.out) || matched;
-                    if (!anchorEnd && matched)
-                        return true;
-                }
-                if (!anchorBegin)
-                    AddState(*next, root_);
-            }
-            internal::Swap(current, next);
-        }
-
-        return matched;
-    }
-
-    size_t GetStateSetSize() const {
-        return (stateCount_ + 31) / 32 * 4;
-    }
-
-    // Return whether the added states is a match state
-    bool AddState(Stack<Allocator>& l, SizeType index) const {
-        CEREAL_RAPIDJSON_ASSERT(index != kRegexInvalidState);
-
-        const State& s = GetState(index);
-        if (s.out1 != kRegexInvalidState) { // Split
-            bool matched = AddState(l, s.out);
-            return AddState(l, s.out1) || matched;
-        }
-        else if (!(stateSet_[index >> 5] & (1 << (index & 31)))) {
-            stateSet_[index >> 5] |= (1 << (index & 31));
-            *l.template PushUnsafe<SizeType>() = index;
-        }
-        return s.out == kRegexInvalidState; // by using PushUnsafe() above, we can ensure s is not validated due to reallocation.
-    }
-
-    bool MatchRange(SizeType rangeIndex, unsigned codepoint) const {
-        bool yes = (GetRange(rangeIndex).start & kRangeNegationFlag) == 0;
-        while (rangeIndex != kRegexInvalidRange) {
-            const Range& r = GetRange(rangeIndex);
-            if (codepoint >= (r.start & ~kRangeNegationFlag) && codepoint <= r.end)
-                return yes;
-            rangeIndex = r.next;
-        }
-        return !yes;
-    }
-
-    Stack<Allocator> states_;
-    Stack<Allocator> ranges_;
-    SizeType root_;
-    SizeType stateCount_;
-    SizeType rangeCount_;
-
-    static const unsigned kInfinityQuantifier = ~0u;
-
-    // For SearchWithAnchoring()
-    uint32_t* stateSet_;        // allocated by states_.GetAllocator()
-    mutable Stack<Allocator> state0_;
-    mutable Stack<Allocator> state1_;
-    bool anchorBegin_;
-    bool anchorEnd_;
-};
-
-typedef GenericRegex<UTF8<> > Regex;
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_INTERNAL_REGEX_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h
deleted file mode 100644
index 768551e..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/stack.h
+++ /dev/null
@@ -1,230 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_INTERNAL_STACK_H_
-#define CEREAL_RAPIDJSON_INTERNAL_STACK_H_
-
-#include "../allocators.h"
-#include "swap.h"
-
-#if defined(__clang__)
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-///////////////////////////////////////////////////////////////////////////////
-// Stack
-
-//! A type-unsafe stack for storing different types of data.
-/*! \tparam Allocator Allocator for allocating stack memory.
-*/
-template <typename Allocator>
-class Stack {
-public:
-    // Optimization note: Do not allocate memory for stack_ in constructor.
-    // Do it lazily when first Push() -> Expand() -> Resize().
-    Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Stack(Stack&& rhs)
-        : allocator_(rhs.allocator_),
-          ownAllocator_(rhs.ownAllocator_),
-          stack_(rhs.stack_),
-          stackTop_(rhs.stackTop_),
-          stackEnd_(rhs.stackEnd_),
-          initialCapacity_(rhs.initialCapacity_)
-    {
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-        rhs.stack_ = 0;
-        rhs.stackTop_ = 0;
-        rhs.stackEnd_ = 0;
-        rhs.initialCapacity_ = 0;
-    }
-#endif
-
-    ~Stack() {
-        Destroy();
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    Stack& operator=(Stack&& rhs) {
-        if (&rhs != this)
-        {
-            Destroy();
-
-            allocator_ = rhs.allocator_;
-            ownAllocator_ = rhs.ownAllocator_;
-            stack_ = rhs.stack_;
-            stackTop_ = rhs.stackTop_;
-            stackEnd_ = rhs.stackEnd_;
-            initialCapacity_ = rhs.initialCapacity_;
-
-            rhs.allocator_ = 0;
-            rhs.ownAllocator_ = 0;
-            rhs.stack_ = 0;
-            rhs.stackTop_ = 0;
-            rhs.stackEnd_ = 0;
-            rhs.initialCapacity_ = 0;
-        }
-        return *this;
-    }
-#endif
-
-    void Swap(Stack& rhs) CEREAL_RAPIDJSON_NOEXCEPT {
-        internal::Swap(allocator_, rhs.allocator_);
-        internal::Swap(ownAllocator_, rhs.ownAllocator_);
-        internal::Swap(stack_, rhs.stack_);
-        internal::Swap(stackTop_, rhs.stackTop_);
-        internal::Swap(stackEnd_, rhs.stackEnd_);
-        internal::Swap(initialCapacity_, rhs.initialCapacity_);
-    }
-
-    void Clear() { stackTop_ = stack_; }
-
-    void ShrinkToFit() { 
-        if (Empty()) {
-            // If the stack is empty, completely deallocate the memory.
-            Allocator::Free(stack_);
-            stack_ = 0;
-            stackTop_ = 0;
-            stackEnd_ = 0;
-        }
-        else
-            Resize(GetSize());
-    }
-
-    // Optimization note: try to minimize the size of this function for force inline.
-    // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
-    template<typename T>
-    CEREAL_RAPIDJSON_FORCEINLINE void Reserve(size_t count = 1) {
-         // Expand the stack if needed
-        if (CEREAL_RAPIDJSON_UNLIKELY(stackTop_ + sizeof(T) * count > stackEnd_))
-            Expand<T>(count);
-    }
-
-    template<typename T>
-    CEREAL_RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
-        Reserve<T>(count);
-        return PushUnsafe<T>(count);
-    }
-
-    template<typename T>
-    CEREAL_RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
-        CEREAL_RAPIDJSON_ASSERT(stackTop_ + sizeof(T) * count <= stackEnd_);
-        T* ret = reinterpret_cast<T*>(stackTop_);
-        stackTop_ += sizeof(T) * count;
-        return ret;
-    }
-
-    template<typename T>
-    T* Pop(size_t count) {
-        CEREAL_RAPIDJSON_ASSERT(GetSize() >= count * sizeof(T));
-        stackTop_ -= count * sizeof(T);
-        return reinterpret_cast<T*>(stackTop_);
-    }
-
-    template<typename T>
-    T* Top() { 
-        CEREAL_RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
-    }
-
-    template<typename T>
-    const T* Top() const {
-        CEREAL_RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
-        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
-    }
-
-    template<typename T>
-    T* End() { return reinterpret_cast<T*>(stackTop_); }
-
-    template<typename T>
-    const T* End() const { return reinterpret_cast<T*>(stackTop_); }
-
-    template<typename T>
-    T* Bottom() { return reinterpret_cast<T*>(stack_); }
-
-    template<typename T>
-    const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
-
-    bool HasAllocator() const {
-        return allocator_ != 0;
-    }
-
-    Allocator& GetAllocator() {
-        CEREAL_RAPIDJSON_ASSERT(allocator_);
-        return *allocator_;
-    }
-
-    bool Empty() const { return stackTop_ == stack_; }
-    size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
-    size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
-
-private:
-    template<typename T>
-    void Expand(size_t count) {
-        // Only expand the capacity if the current stack exists. Otherwise just create a stack with initial capacity.
-        size_t newCapacity;
-        if (stack_ == 0) {
-            if (!allocator_)
-                ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
-            newCapacity = initialCapacity_;
-        } else {
-            newCapacity = GetCapacity();
-            newCapacity += (newCapacity + 1) / 2;
-        }
-        size_t newSize = GetSize() + sizeof(T) * count;
-        if (newCapacity < newSize)
-            newCapacity = newSize;
-
-        Resize(newCapacity);
-    }
-
-    void Resize(size_t newCapacity) {
-        const size_t size = GetSize();  // Backup the current size
-        stack_ = static_cast<char*>(allocator_->Realloc(stack_, GetCapacity(), newCapacity));
-        stackTop_ = stack_ + size;
-        stackEnd_ = stack_ + newCapacity;
-    }
-
-    void Destroy() {
-        Allocator::Free(stack_);
-        CEREAL_RAPIDJSON_DELETE(ownAllocator_); // Only delete if it is owned by the stack
-    }
-
-    // Prohibit copy constructor & assignment operator.
-    Stack(const Stack&);
-    Stack& operator=(const Stack&);
-
-    Allocator* allocator_;
-    Allocator* ownAllocator_;
-    char *stack_;
-    char *stackTop_;
-    char *stackEnd_;
-    size_t initialCapacity_;
-};
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_STACK_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h
deleted file mode 100644
index 0c6973c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/strfunc.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_INTERNAL_STRFUNC_H_
-#define CEREAL_RAPIDJSON_INTERNAL_STRFUNC_H_
-
-#include "../stream.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Custom strlen() which works on different character types.
-/*! \tparam Ch Character type (e.g. char, wchar_t, short)
-    \param s Null-terminated input string.
-    \return Number of characters in the string. 
-    \note This has the same semantics as strlen(), the return value is not number of Unicode codepoints.
-*/
-template <typename Ch>
-inline SizeType StrLen(const Ch* s) {
-    const Ch* p = s;
-    while (*p) ++p;
-    return SizeType(p - s);
-}
-
-//! Returns number of code points in a encoded string.
-template<typename Encoding>
-bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
-    GenericStringStream<Encoding> is(s);
-    const typename Encoding::Ch* end = s + length;
-    SizeType count = 0;
-    while (is.src_ < end) {
-        unsigned codepoint;
-        if (!Encoding::Decode(is, &codepoint))
-            return false;
-        count++;
-    }
-    *outCount = count;
-    return true;
-}
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_INTERNAL_STRFUNC_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h
deleted file mode 100644
index 076434c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/strtod.h
+++ /dev/null
@@ -1,269 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_STRTOD_
-#define CEREAL_RAPIDJSON_STRTOD_
-
-#include "ieee754.h"
-#include "biginteger.h"
-#include "diyfp.h"
-#include "pow10.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-inline double FastPath(double significand, int exp) {
-    if (exp < -308)
-        return 0.0;
-    else if (exp >= 0)
-        return significand * internal::Pow10(exp);
-    else
-        return significand / internal::Pow10(-exp);
-}
-
-inline double StrtodNormalPrecision(double d, int p) {
-    if (p < -308) {
-        // Prevent expSum < -308, making Pow10(p) = 0
-        d = FastPath(d, -308);
-        d = FastPath(d, p + 308);
-    }
-    else
-        d = FastPath(d, p);
-    return d;
-}
-
-template <typename T>
-inline T Min3(T a, T b, T c) {
-    T m = a;
-    if (m > b) m = b;
-    if (m > c) m = c;
-    return m;
-}
-
-inline int CheckWithinHalfULP(double b, const BigInteger& d, int dExp) {
-    const Double db(b);
-    const uint64_t bInt = db.IntegerSignificand();
-    const int bExp = db.IntegerExponent();
-    const int hExp = bExp - 1;
-
-    int dS_Exp2 = 0, dS_Exp5 = 0, bS_Exp2 = 0, bS_Exp5 = 0, hS_Exp2 = 0, hS_Exp5 = 0;
-
-    // Adjust for decimal exponent
-    if (dExp >= 0) {
-        dS_Exp2 += dExp;
-        dS_Exp5 += dExp;
-    }
-    else {
-        bS_Exp2 -= dExp;
-        bS_Exp5 -= dExp;
-        hS_Exp2 -= dExp;
-        hS_Exp5 -= dExp;
-    }
-
-    // Adjust for binary exponent
-    if (bExp >= 0)
-        bS_Exp2 += bExp;
-    else {
-        dS_Exp2 -= bExp;
-        hS_Exp2 -= bExp;
-    }
-
-    // Adjust for half ulp exponent
-    if (hExp >= 0)
-        hS_Exp2 += hExp;
-    else {
-        dS_Exp2 -= hExp;
-        bS_Exp2 -= hExp;
-    }
-
-    // Remove common power of two factor from all three scaled values
-    int common_Exp2 = Min3(dS_Exp2, bS_Exp2, hS_Exp2);
-    dS_Exp2 -= common_Exp2;
-    bS_Exp2 -= common_Exp2;
-    hS_Exp2 -= common_Exp2;
-
-    BigInteger dS = d;
-    dS.MultiplyPow5(static_cast<unsigned>(dS_Exp5)) <<= static_cast<unsigned>(dS_Exp2);
-
-    BigInteger bS(bInt);
-    bS.MultiplyPow5(static_cast<unsigned>(bS_Exp5)) <<= static_cast<unsigned>(bS_Exp2);
-
-    BigInteger hS(1);
-    hS.MultiplyPow5(static_cast<unsigned>(hS_Exp5)) <<= static_cast<unsigned>(hS_Exp2);
-
-    BigInteger delta(0);
-    dS.Difference(bS, &delta);
-
-    return delta.Compare(hS);
-}
-
-inline bool StrtodFast(double d, int p, double* result) {
-    // Use fast path for string-to-double conversion if possible
-    // see http://www.exploringbinary.com/fast-path-decimal-to-floating-point-conversion/
-    if (p > 22  && p < 22 + 16) {
-        // Fast Path Cases In Disguise
-        d *= internal::Pow10(p - 22);
-        p = 22;
-    }
-
-    if (p >= -22 && p <= 22 && d <= 9007199254740991.0) { // 2^53 - 1
-        *result = FastPath(d, p);
-        return true;
-    }
-    else
-        return false;
-}
-
-// Compute an approximation and see if it is within 1/2 ULP
-inline bool StrtodDiyFp(const char* decimals, size_t length, size_t decimalPosition, int exp, double* result) {
-    uint64_t significand = 0;
-    size_t i = 0;   // 2^64 - 1 = 18446744073709551615, 1844674407370955161 = 0x1999999999999999    
-    for (; i < length; i++) {
-        if (significand  >  CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) ||
-            (significand == CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) && decimals[i] > '5'))
-            break;
-        significand = significand * 10u + static_cast<unsigned>(decimals[i] - '0');
-    }
-    
-    if (i < length && decimals[i] >= '5') // Rounding
-        significand++;
-
-    size_t remaining = length - i;
-    const unsigned kUlpShift = 3;
-    const unsigned kUlp = 1 << kUlpShift;
-    int64_t error = (remaining == 0) ? 0 : kUlp / 2;
-
-    DiyFp v(significand, 0);
-    v = v.Normalize();
-    error <<= -v.e;
-
-    const int dExp = static_cast<int>(decimalPosition) - static_cast<int>(i) + exp;
-
-    int actualExp;
-    DiyFp cachedPower = GetCachedPower10(dExp, &actualExp);
-    if (actualExp != dExp) {
-        static const DiyFp kPow10[] = {
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xa0000000, 00000000), -60),  // 10^1
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xc8000000, 00000000), -57),  // 10^2
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xfa000000, 00000000), -54),  // 10^3
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0x9c400000, 00000000), -50),  // 10^4
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xc3500000, 00000000), -47),  // 10^5
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44),  // 10^6
-            DiyFp(CEREAL_RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40)   // 10^7
-        };
-        int  adjustment = dExp - actualExp - 1;
-        CEREAL_RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
-        v = v * kPow10[adjustment];
-        if (length + static_cast<unsigned>(adjustment)> 19u) // has more digits than decimal digits in 64-bit
-            error += kUlp / 2;
-    }
-
-    v = v * cachedPower;
-
-    error += kUlp + (error == 0 ? 0 : 1);
-
-    const int oldExp = v.e;
-    v = v.Normalize();
-    error <<= oldExp - v.e;
-
-    const unsigned effectiveSignificandSize = Double::EffectiveSignificandSize(64 + v.e);
-    unsigned precisionSize = 64 - effectiveSignificandSize;
-    if (precisionSize + kUlpShift >= 64) {
-        unsigned scaleExp = (precisionSize + kUlpShift) - 63;
-        v.f >>= scaleExp;
-        v.e += scaleExp; 
-        error = (error >> scaleExp) + 1 + static_cast<int>(kUlp);
-        precisionSize -= scaleExp;
-    }
-
-    DiyFp rounded(v.f >> precisionSize, v.e + static_cast<int>(precisionSize));
-    const uint64_t precisionBits = (v.f & ((uint64_t(1) << precisionSize) - 1)) * kUlp;
-    const uint64_t halfWay = (uint64_t(1) << (precisionSize - 1)) * kUlp;
-    if (precisionBits >= halfWay + static_cast<unsigned>(error)) {
-        rounded.f++;
-        if (rounded.f & (DiyFp::kDpHiddenBit << 1)) { // rounding overflows mantissa (issue #340)
-            rounded.f >>= 1;
-            rounded.e++;
-        }
-    }
-
-    *result = rounded.ToDouble();
-
-    return halfWay - static_cast<unsigned>(error) >= precisionBits || precisionBits >= halfWay + static_cast<unsigned>(error);
-}
-
-inline double StrtodBigInteger(double approx, const char* decimals, size_t length, size_t decimalPosition, int exp) {
-    const BigInteger dInt(decimals, length);
-    const int dExp = static_cast<int>(decimalPosition) - static_cast<int>(length) + exp;
-    Double a(approx);
-    int cmp = CheckWithinHalfULP(a.Value(), dInt, dExp);
-    if (cmp < 0)
-        return a.Value();  // within half ULP
-    else if (cmp == 0) {
-        // Round towards even
-        if (a.Significand() & 1)
-            return a.NextPositiveDouble();
-        else
-            return a.Value();
-    }
-    else // adjustment
-        return a.NextPositiveDouble();
-}
-
-inline double StrtodFullPrecision(double d, int p, const char* decimals, size_t length, size_t decimalPosition, int exp) {
-    CEREAL_RAPIDJSON_ASSERT(d >= 0.0);
-    CEREAL_RAPIDJSON_ASSERT(length >= 1);
-
-    double result;
-    if (StrtodFast(d, p, &result))
-        return result;
-
-    // Trim leading zeros
-    while (*decimals == '0' && length > 1) {
-        length--;
-        decimals++;
-        decimalPosition--;
-    }
-
-    // Trim trailing zeros
-    while (decimals[length - 1] == '0' && length > 1) {
-        length--;
-        decimalPosition--;
-        exp++;
-    }
-
-    // Trim right-most digits
-    const int kMaxDecimalDigit = 780;
-    if (static_cast<int>(length) > kMaxDecimalDigit) {
-        int delta = (static_cast<int>(length) - kMaxDecimalDigit);
-        exp += delta;
-        decimalPosition -= static_cast<unsigned>(delta);
-        length = kMaxDecimalDigit;
-    }
-
-    // If too small, underflow to zero
-    if (int(length) + exp < -324)
-        return 0.0;
-
-    if (StrtodDiyFp(decimals, length, decimalPosition, exp, &result))
-        return result;
-
-    // Use approximation from StrtodDiyFp and make adjustment with BigInteger comparison
-    return StrtodBigInteger(result, decimals, length, decimalPosition, exp);
-}
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_STRTOD_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h b/Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h
deleted file mode 100644
index 5d8910c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/internal/swap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_INTERNAL_SWAP_H_
-#define CEREAL_RAPIDJSON_INTERNAL_SWAP_H_
-
-#include "../rapidjson.h"
-
-#if defined(__clang__)
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-namespace internal {
-
-//! Custom swap() to avoid dependency on C++ <algorithm> header
-/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.
-    \note This has the same semantics as std::swap().
-*/
-template <typename T>
-inline void Swap(T& a, T& b) CEREAL_RAPIDJSON_NOEXCEPT {
-    T tmp = a;
-        a = b;
-        b = tmp;
-}
-
-} // namespace internal
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_INTERNAL_SWAP_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h b/Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h
deleted file mode 100644
index e1c7ea8..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/istreamwrapper.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_ISTREAMWRAPPER_H_
-#define CEREAL_RAPIDJSON_ISTREAMWRAPPER_H_
-
-#include "stream.h"
-#include <iosfwd>
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
-CEREAL_RAPIDJSON_DIAG_OFF(4127) // ignore assert(false) for triggering exception
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of \c std::basic_istream into RapidJSON's Stream concept.
-/*!
-    The classes can be wrapped including but not limited to:
-
-    - \c std::istringstream
-    - \c std::stringstream
-    - \c std::wistringstream
-    - \c std::wstringstream
-    - \c std::ifstream
-    - \c std::fstream
-    - \c std::wifstream
-    - \c std::wfstream
-
-    \tparam StreamType Class derived from \c std::basic_istream.
-*/
-
-template <typename StreamType>
-class BasicIStreamWrapper {
-public:
-    typedef typename StreamType::char_type Ch;
-    BasicIStreamWrapper(StreamType& stream) : stream_(stream), count_(), peekBuffer_() {}
-
-    Ch Peek() const {
-        typename StreamType::int_type c = stream_.peek();
-        return CEREAL_RAPIDJSON_LIKELY(c != StreamType::traits_type::eof()) ? static_cast<Ch>(c) : '\0';
-    }
-
-    Ch Take() {
-        typename StreamType::int_type c = stream_.get();
-        if (CEREAL_RAPIDJSON_LIKELY(c != StreamType::traits_type::eof())) {
-            count_++;
-            return static_cast<Ch>(c);
-        }
-        else
-            return '\0';
-    }
-
-    // tellg() may return -1 when failed. So we count by ourself.
-    size_t Tell() const { return count_; }
-
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
-    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        CEREAL_RAPIDJSON_ASSERT(sizeof(Ch) == 1); // Only usable for byte stream.
-        int i;
-        bool hasError = false;
-        for (i = 0; i < 4; ++i) {
-            typename StreamType::int_type c = stream_.get();
-            if (c == StreamType::traits_type::eof()) {
-                hasError = true;
-                stream_.clear();
-                break;
-            }
-            peekBuffer_[i] = static_cast<Ch>(c);
-        }
-        for (--i; i >= 0; --i)
-            stream_.putback(peekBuffer_[i]);
-        return !hasError ? peekBuffer_ : 0;
-    }
-
-private:
-    BasicIStreamWrapper(const BasicIStreamWrapper&);
-    BasicIStreamWrapper& operator=(const BasicIStreamWrapper&);
-
-    StreamType& stream_;
-    size_t count_;  //!< Number of characters read. Note:
-    mutable Ch peekBuffer_[4];
-};
-
-typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
-typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
-
-#if defined(__clang__) || defined(_MSC_VER)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_ISTREAMWRAPPER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h b/Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h
deleted file mode 100644
index 0cd75cf..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/memorybuffer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_MEMORYBUFFER_H_
-#define CEREAL_RAPIDJSON_MEMORYBUFFER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory output byte stream.
-/*!
-    This class is mainly for being wrapped by EncodedOutputStream or AutoUTFOutputStream.
-
-    It is similar to FileWriteBuffer but the destination is an in-memory buffer instead of a file.
-
-    Differences between MemoryBuffer and StringBuffer:
-    1. StringBuffer has Encoding but MemoryBuffer is only a byte buffer. 
-    2. StringBuffer::GetString() returns a null-terminated string. MemoryBuffer::GetBuffer() returns a buffer without terminator.
-
-    \tparam Allocator type for allocating memory buffer.
-    \note implements Stream concept
-*/
-template <typename Allocator = CrtAllocator>
-struct GenericMemoryBuffer {
-    typedef char Ch; // byte
-
-    GenericMemoryBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-    void Flush() {}
-
-    void Clear() { stack_.Clear(); }
-    void ShrinkToFit() { stack_.ShrinkToFit(); }
-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
-
-    const Ch* GetBuffer() const {
-        return stack_.template Bottom<Ch>();
-    }
-
-    size_t GetSize() const { return stack_.GetSize(); }
-
-    static const size_t kDefaultCapacity = 256;
-    mutable internal::Stack<Allocator> stack_;
-};
-
-typedef GenericMemoryBuffer<> MemoryBuffer;
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(MemoryBuffer& memoryBuffer, char c, size_t n) {
-    std::memset(memoryBuffer.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_MEMORYBUFFER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/memorystream.h b/Src/External/cereal/include/cereal/external/rapidjson/memorystream.h
deleted file mode 100644
index e48988c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/memorystream.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_MEMORYSTREAM_H_
-#define CEREAL_RAPIDJSON_MEMORYSTREAM_H_
-
-#include "stream.h"
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
-CEREAL_RAPIDJSON_DIAG_OFF(missing-noreturn)
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF( 4127 ) // ignore assert(false) for triggering exception
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory input byte stream.
-/*!
-    This class is mainly for being wrapped by EncodedInputStream or AutoUTFInputStream.
-
-    It is similar to FileReadBuffer but the source is an in-memory buffer instead of a file.
-
-    Differences between MemoryStream and StringStream:
-    1. StringStream has encoding but MemoryStream is a byte stream.
-    2. MemoryStream needs size of the source buffer and the buffer don't need to be null terminated. StringStream assume null-terminated string as source.
-    3. MemoryStream supports Peek4() for encoding detection. StringStream is specified with an encoding so it should not have Peek4().
-    \note implements Stream concept
-*/
-struct MemoryStream {
-    typedef char Ch; // byte
-
-    MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
-
-    Ch Peek() const { return CEREAL_RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_; }
-    Ch Take() { return CEREAL_RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
-
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
-    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-    // For encoding detection only.
-    const Ch* Peek4() const {
-        return Tell() + 4 <= size_ ? src_ : 0;
-    }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* begin_;   //!< Original head of the string.
-    const Ch* end_;     //!< End of stream.
-    size_t size_;       //!< Size of the stream.
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__) || defined(_MSC_VER)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_MEMORYBUFFER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h b/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
deleted file mode 100644
index 1811128..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/inttypes.h
+++ /dev/null
@@ -1,316 +0,0 @@
-// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-// The above software in this distribution may have been modified by 
-// THL A29 Limited ("Tencent Modifications"). 
-// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_INTTYPES_H_ // [
-#define _MSC_INTTYPES_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include "stdint.h"
-
-// miloyip: VC supports inttypes.h since VC2013
-#if _MSC_VER >= 1800
-#include <inttypes.h>
-#else
-
-// 7.8 Format conversion of integer types
-
-typedef struct {
-   intmax_t quot;
-   intmax_t rem;
-} imaxdiv_t;
-
-// 7.8.1 Macros for format specifiers
-
-#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
-
-// The fprintf macros for signed integers are:
-#define PRId8       "d"
-#define PRIi8       "i"
-#define PRIdLEAST8  "d"
-#define PRIiLEAST8  "i"
-#define PRIdFAST8   "d"
-#define PRIiFAST8   "i"
-
-#define PRId16       "hd"
-#define PRIi16       "hi"
-#define PRIdLEAST16  "hd"
-#define PRIiLEAST16  "hi"
-#define PRIdFAST16   "hd"
-#define PRIiFAST16   "hi"
-
-#define PRId32       "I32d"
-#define PRIi32       "I32i"
-#define PRIdLEAST32  "I32d"
-#define PRIiLEAST32  "I32i"
-#define PRIdFAST32   "I32d"
-#define PRIiFAST32   "I32i"
-
-#define PRId64       "I64d"
-#define PRIi64       "I64i"
-#define PRIdLEAST64  "I64d"
-#define PRIiLEAST64  "I64i"
-#define PRIdFAST64   "I64d"
-#define PRIiFAST64   "I64i"
-
-#define PRIdMAX     "I64d"
-#define PRIiMAX     "I64i"
-
-#define PRIdPTR     "Id"
-#define PRIiPTR     "Ii"
-
-// The fprintf macros for unsigned integers are:
-#define PRIo8       "o"
-#define PRIu8       "u"
-#define PRIx8       "x"
-#define PRIX8       "X"
-#define PRIoLEAST8  "o"
-#define PRIuLEAST8  "u"
-#define PRIxLEAST8  "x"
-#define PRIXLEAST8  "X"
-#define PRIoFAST8   "o"
-#define PRIuFAST8   "u"
-#define PRIxFAST8   "x"
-#define PRIXFAST8   "X"
-
-#define PRIo16       "ho"
-#define PRIu16       "hu"
-#define PRIx16       "hx"
-#define PRIX16       "hX"
-#define PRIoLEAST16  "ho"
-#define PRIuLEAST16  "hu"
-#define PRIxLEAST16  "hx"
-#define PRIXLEAST16  "hX"
-#define PRIoFAST16   "ho"
-#define PRIuFAST16   "hu"
-#define PRIxFAST16   "hx"
-#define PRIXFAST16   "hX"
-
-#define PRIo32       "I32o"
-#define PRIu32       "I32u"
-#define PRIx32       "I32x"
-#define PRIX32       "I32X"
-#define PRIoLEAST32  "I32o"
-#define PRIuLEAST32  "I32u"
-#define PRIxLEAST32  "I32x"
-#define PRIXLEAST32  "I32X"
-#define PRIoFAST32   "I32o"
-#define PRIuFAST32   "I32u"
-#define PRIxFAST32   "I32x"
-#define PRIXFAST32   "I32X"
-
-#define PRIo64       "I64o"
-#define PRIu64       "I64u"
-#define PRIx64       "I64x"
-#define PRIX64       "I64X"
-#define PRIoLEAST64  "I64o"
-#define PRIuLEAST64  "I64u"
-#define PRIxLEAST64  "I64x"
-#define PRIXLEAST64  "I64X"
-#define PRIoFAST64   "I64o"
-#define PRIuFAST64   "I64u"
-#define PRIxFAST64   "I64x"
-#define PRIXFAST64   "I64X"
-
-#define PRIoMAX     "I64o"
-#define PRIuMAX     "I64u"
-#define PRIxMAX     "I64x"
-#define PRIXMAX     "I64X"
-
-#define PRIoPTR     "Io"
-#define PRIuPTR     "Iu"
-#define PRIxPTR     "Ix"
-#define PRIXPTR     "IX"
-
-// The fscanf macros for signed integers are:
-#define SCNd8       "d"
-#define SCNi8       "i"
-#define SCNdLEAST8  "d"
-#define SCNiLEAST8  "i"
-#define SCNdFAST8   "d"
-#define SCNiFAST8   "i"
-
-#define SCNd16       "hd"
-#define SCNi16       "hi"
-#define SCNdLEAST16  "hd"
-#define SCNiLEAST16  "hi"
-#define SCNdFAST16   "hd"
-#define SCNiFAST16   "hi"
-
-#define SCNd32       "ld"
-#define SCNi32       "li"
-#define SCNdLEAST32  "ld"
-#define SCNiLEAST32  "li"
-#define SCNdFAST32   "ld"
-#define SCNiFAST32   "li"
-
-#define SCNd64       "I64d"
-#define SCNi64       "I64i"
-#define SCNdLEAST64  "I64d"
-#define SCNiLEAST64  "I64i"
-#define SCNdFAST64   "I64d"
-#define SCNiFAST64   "I64i"
-
-#define SCNdMAX     "I64d"
-#define SCNiMAX     "I64i"
-
-#ifdef _WIN64 // [
-#  define SCNdPTR     "I64d"
-#  define SCNiPTR     "I64i"
-#else  // _WIN64 ][
-#  define SCNdPTR     "ld"
-#  define SCNiPTR     "li"
-#endif  // _WIN64 ]
-
-// The fscanf macros for unsigned integers are:
-#define SCNo8       "o"
-#define SCNu8       "u"
-#define SCNx8       "x"
-#define SCNX8       "X"
-#define SCNoLEAST8  "o"
-#define SCNuLEAST8  "u"
-#define SCNxLEAST8  "x"
-#define SCNXLEAST8  "X"
-#define SCNoFAST8   "o"
-#define SCNuFAST8   "u"
-#define SCNxFAST8   "x"
-#define SCNXFAST8   "X"
-
-#define SCNo16       "ho"
-#define SCNu16       "hu"
-#define SCNx16       "hx"
-#define SCNX16       "hX"
-#define SCNoLEAST16  "ho"
-#define SCNuLEAST16  "hu"
-#define SCNxLEAST16  "hx"
-#define SCNXLEAST16  "hX"
-#define SCNoFAST16   "ho"
-#define SCNuFAST16   "hu"
-#define SCNxFAST16   "hx"
-#define SCNXFAST16   "hX"
-
-#define SCNo32       "lo"
-#define SCNu32       "lu"
-#define SCNx32       "lx"
-#define SCNX32       "lX"
-#define SCNoLEAST32  "lo"
-#define SCNuLEAST32  "lu"
-#define SCNxLEAST32  "lx"
-#define SCNXLEAST32  "lX"
-#define SCNoFAST32   "lo"
-#define SCNuFAST32   "lu"
-#define SCNxFAST32   "lx"
-#define SCNXFAST32   "lX"
-
-#define SCNo64       "I64o"
-#define SCNu64       "I64u"
-#define SCNx64       "I64x"
-#define SCNX64       "I64X"
-#define SCNoLEAST64  "I64o"
-#define SCNuLEAST64  "I64u"
-#define SCNxLEAST64  "I64x"
-#define SCNXLEAST64  "I64X"
-#define SCNoFAST64   "I64o"
-#define SCNuFAST64   "I64u"
-#define SCNxFAST64   "I64x"
-#define SCNXFAST64   "I64X"
-
-#define SCNoMAX     "I64o"
-#define SCNuMAX     "I64u"
-#define SCNxMAX     "I64x"
-#define SCNXMAX     "I64X"
-
-#ifdef _WIN64 // [
-#  define SCNoPTR     "I64o"
-#  define SCNuPTR     "I64u"
-#  define SCNxPTR     "I64x"
-#  define SCNXPTR     "I64X"
-#else  // _WIN64 ][
-#  define SCNoPTR     "lo"
-#  define SCNuPTR     "lu"
-#  define SCNxPTR     "lx"
-#  define SCNXPTR     "lX"
-#endif  // _WIN64 ]
-
-#endif // __STDC_FORMAT_MACROS ]
-
-// 7.8.2 Functions for greatest-width integer types
-
-// 7.8.2.1 The imaxabs function
-#define imaxabs _abs64
-
-// 7.8.2.2 The imaxdiv function
-
-// This is modified version of div() function from Microsoft's div.c found
-// in %MSVC.NET%\crt\src\div.c
-#ifdef STATIC_IMAXDIV // [
-static
-#else // STATIC_IMAXDIV ][
-_inline
-#endif // STATIC_IMAXDIV ]
-imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
-{
-   imaxdiv_t result;
-
-   result.quot = numer / denom;
-   result.rem = numer % denom;
-
-   if (numer < 0 && result.rem > 0) {
-      // did division wrong; must fix up
-      ++result.quot;
-      result.rem -= denom;
-   }
-
-   return result;
-}
-
-// 7.8.2.3 The strtoimax and strtoumax functions
-#define strtoimax _strtoi64
-#define strtoumax _strtoui64
-
-// 7.8.2.4 The wcstoimax and wcstoumax functions
-#define wcstoimax _wcstoi64
-#define wcstoumax _wcstoui64
-
-#endif // _MSC_VER >= 1800
-
-#endif // _MSC_INTTYPES_H_ ]
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h b/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
deleted file mode 100644
index 3d4477b..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/msinttypes/stdint.h
+++ /dev/null
@@ -1,300 +0,0 @@
-// ISO C9x  compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
-// 
-//  Copyright (c) 2006-2013 Alexander Chemeris
-// 
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-//   1. Redistributions of source code must retain the above copyright notice,
-//      this list of conditions and the following disclaimer.
-// 
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in the
-//      documentation and/or other materials provided with the distribution.
-// 
-//   3. Neither the name of the product nor the names of its contributors may
-//      be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// 
-///////////////////////////////////////////////////////////////////////////////
-
-// The above software in this distribution may have been modified by 
-// THL A29 Limited ("Tencent Modifications"). 
-// All Tencent Modifications are Copyright (C) 2015 THL A29 Limited.
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-// miloyip: Originally Visual Studio 2010 uses its own stdint.h. However it generates warning with INT64_C(), so change to use this file for vs2010.
-#if _MSC_VER >= 1600 // [
-#include <stdint.h>
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-#undef INT8_C
-#undef INT16_C
-#undef INT32_C
-#undef INT64_C
-#undef UINT8_C
-#undef UINT16_C
-#undef UINT32_C
-#undef UINT64_C
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#else // ] _MSC_VER >= 1700 [
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
-// compiling for ARM we have to wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler would give many errors like this:
-//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if defined(__cplusplus) && !defined(_M_ARM)
-extern "C" {
-#endif
-#  include <wchar.h>
-#if defined(__cplusplus) && !defined(_M_ARM)
-}
-#endif
-
-// Define _W64 macros to mark types changing their size, like intptr_t.
-#ifndef _W64
-#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
-#     define _W64 __w64
-#  else
-#     define _W64
-#  endif
-#endif
-
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-
-// Visual Studio 6 and Embedded Visual C++ 4 doesn't
-// realize that, e.g. char has the same size as __int8
-// so we give up on __intX for them.
-#if (_MSC_VER < 1300)
-   typedef signed char       int8_t;
-   typedef signed short      int16_t;
-   typedef signed int        int32_t;
-   typedef unsigned char     uint8_t;
-   typedef unsigned short    uint16_t;
-   typedef unsigned int      uint32_t;
-#else
-   typedef signed __int8     int8_t;
-   typedef signed __int16    int16_t;
-   typedef signed __int32    int32_t;
-   typedef unsigned __int8   uint8_t;
-   typedef unsigned __int16  uint16_t;
-   typedef unsigned __int32  uint32_t;
-#endif
-typedef signed __int64       int64_t;
-typedef unsigned __int64     uint64_t;
-
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t    int_least8_t;
-typedef int16_t   int_least16_t;
-typedef int32_t   int_least32_t;
-typedef int64_t   int_least64_t;
-typedef uint8_t   uint_least8_t;
-typedef uint16_t  uint_least16_t;
-typedef uint32_t  uint_least32_t;
-typedef uint64_t  uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t    int_fast8_t;
-typedef int16_t   int_fast16_t;
-typedef int32_t   int_fast32_t;
-typedef int64_t   int_fast64_t;
-typedef uint8_t   uint_fast8_t;
-typedef uint16_t  uint_fast16_t;
-typedef uint32_t  uint_fast32_t;
-typedef uint64_t  uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
-   typedef signed __int64    intptr_t;
-   typedef unsigned __int64  uintptr_t;
-#else // _WIN64 ][
-   typedef _W64 signed int   intptr_t;
-   typedef _W64 unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t   intmax_t;
-typedef uint64_t  uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN     ((int8_t)_I8_MIN)
-#define INT8_MAX     _I8_MAX
-#define INT16_MIN    ((int16_t)_I16_MIN)
-#define INT16_MAX    _I16_MAX
-#define INT32_MIN    ((int32_t)_I32_MIN)
-#define INT32_MAX    _I32_MAX
-#define INT64_MIN    ((int64_t)_I64_MIN)
-#define INT64_MAX    _I64_MAX
-#define UINT8_MAX    _UI8_MAX
-#define UINT16_MAX   _UI16_MAX
-#define UINT32_MAX   _UI32_MAX
-#define UINT64_MAX   _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN    INT8_MIN
-#define INT_LEAST8_MAX    INT8_MAX
-#define INT_LEAST16_MIN   INT16_MIN
-#define INT_LEAST16_MAX   INT16_MAX
-#define INT_LEAST32_MIN   INT32_MIN
-#define INT_LEAST32_MAX   INT32_MAX
-#define INT_LEAST64_MIN   INT64_MIN
-#define INT_LEAST64_MAX   INT64_MAX
-#define UINT_LEAST8_MAX   UINT8_MAX
-#define UINT_LEAST16_MAX  UINT16_MAX
-#define UINT_LEAST32_MAX  UINT32_MAX
-#define UINT_LEAST64_MAX  UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN    INT8_MIN
-#define INT_FAST8_MAX    INT8_MAX
-#define INT_FAST16_MIN   INT16_MIN
-#define INT_FAST16_MAX   INT16_MAX
-#define INT_FAST32_MIN   INT32_MIN
-#define INT_FAST32_MAX   INT32_MAX
-#define INT_FAST64_MIN   INT64_MIN
-#define INT_FAST64_MAX   INT64_MAX
-#define UINT_FAST8_MAX   UINT8_MAX
-#define UINT_FAST16_MAX  UINT16_MAX
-#define UINT_FAST32_MAX  UINT32_MAX
-#define UINT_FAST64_MAX  UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-#  define INTPTR_MIN   INT64_MIN
-#  define INTPTR_MAX   INT64_MAX
-#  define UINTPTR_MAX  UINT64_MAX
-#else // _WIN64 ][
-#  define INTPTR_MIN   INT32_MIN
-#  define INTPTR_MAX   INT32_MAX
-#  define UINTPTR_MAX  UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN   INT64_MIN
-#define INTMAX_MAX   INT64_MAX
-#define UINTMAX_MAX  UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-#  define PTRDIFF_MIN  _I64_MIN
-#  define PTRDIFF_MAX  _I64_MAX
-#else  // _WIN64 ][
-#  define PTRDIFF_MIN  _I32_MIN
-#  define PTRDIFF_MAX  _I32_MAX
-#endif  // _WIN64 ]
-
-#define SIG_ATOMIC_MIN  INT_MIN
-#define SIG_ATOMIC_MAX  INT_MAX
-
-#ifndef SIZE_MAX // [
-#  ifdef _WIN64 // [
-#     define SIZE_MAX  _UI64_MAX
-#  else // _WIN64 ][
-#     define SIZE_MAX  _UI32_MAX
-#  endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-#  define WCHAR_MIN  0
-#endif  // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-#  define WCHAR_MAX  _UI16_MAX
-#endif  // WCHAR_MAX ]
-
-#define WINT_MIN  0
-#define WINT_MAX  _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val)  val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-#define INT64_C(val) val##i64
-
-#define UINT8_C(val)  val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-// These #ifndef's are needed to prevent collisions with <boost/cstdint.hpp>.
-// Check out Issue 9 for the details.
-#ifndef INTMAX_C //   [
-#  define INTMAX_C   INT64_C
-#endif // INTMAX_C    ]
-#ifndef UINTMAX_C //  [
-#  define UINTMAX_C  UINT64_C
-#endif // UINTMAX_C   ]
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-#endif // _MSC_VER >= 1600 ]
-
-#endif // _MSC_STDINT_H_ ]
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h b/Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
deleted file mode 100644
index 58c034a..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/ostreamwrapper.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_OSTREAMWRAPPER_H_
-#define CEREAL_RAPIDJSON_OSTREAMWRAPPER_H_
-
-#include "stream.h"
-#include <iosfwd>
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Wrapper of \c std::basic_ostream into RapidJSON's Stream concept.
-/*!
-    The classes can be wrapped including but not limited to:
-
-    - \c std::ostringstream
-    - \c std::stringstream
-    - \c std::wpstringstream
-    - \c std::wstringstream
-    - \c std::ifstream
-    - \c std::fstream
-    - \c std::wofstream
-    - \c std::wfstream
-
-    \tparam StreamType Class derived from \c std::basic_ostream.
-*/
-   
-template <typename StreamType>
-class BasicOStreamWrapper {
-public:
-    typedef typename StreamType::char_type Ch;
-    BasicOStreamWrapper(StreamType& stream) : stream_(stream) {}
-
-    void Put(Ch c) {
-        stream_.put(c);
-    }
-
-    void Flush() {
-        stream_.flush();
-    }
-
-    // Not implemented
-    char Peek() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    char Take() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t Tell() const { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    char* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    size_t PutEnd(char*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-private:
-    BasicOStreamWrapper(const BasicOStreamWrapper&);
-    BasicOStreamWrapper& operator=(const BasicOStreamWrapper&);
-
-    StreamType& stream_;
-};
-
-typedef BasicOStreamWrapper<std::ostream> OStreamWrapper;
-typedef BasicOStreamWrapper<std::wostream> WOStreamWrapper;
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_OSTREAMWRAPPER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/pointer.h b/Src/External/cereal/include/cereal/external/rapidjson/pointer.h
deleted file mode 100644
index 1e4836c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/pointer.h
+++ /dev/null
@@ -1,1358 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_POINTER_H_
-#define CEREAL_RAPIDJSON_POINTER_H_
-
-#include "document.h"
-#include "internal/itoa.h"
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
-
-//! Error code of parsing.
-/*! \ingroup CEREAL_RAPIDJSON_ERRORS
-    \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
-*/
-enum PointerParseErrorCode {
-    kPointerParseErrorNone = 0,                     //!< The parse is successful
-
-    kPointerParseErrorTokenMustBeginWithSolidus,    //!< A token must begin with a '/'
-    kPointerParseErrorInvalidEscape,                //!< Invalid escape
-    kPointerParseErrorInvalidPercentEncoding,       //!< Invalid percent encoding in URI fragment
-    kPointerParseErrorCharacterMustPercentEncode    //!< A character must percent encoded in URI fragment
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericPointer
-
-//! Represents a JSON Pointer. Use Pointer for UTF8 encoding and default allocator.
-/*!
-    This class implements RFC 6901 "JavaScript Object Notation (JSON) Pointer" 
-    (https://tools.ietf.org/html/rfc6901).
-
-    A JSON pointer is for identifying a specific value in a JSON document
-    (GenericDocument). It can simplify coding of DOM tree manipulation, because it
-    can access multiple-level depth of DOM tree with single API call.
-
-    After it parses a string representation (e.g. "/foo/0" or URI fragment 
-    representation (e.g. "#/foo/0") into its internal representation (tokens),
-    it can be used to resolve a specific value in multiple documents, or sub-tree 
-    of documents.
-
-    Contrary to GenericValue, Pointer can be copy constructed and copy assigned.
-    Apart from assignment, a Pointer cannot be modified after construction.
-
-    Although Pointer is very convenient, please aware that constructing Pointer
-    involves parsing and dynamic memory allocation. A special constructor with user-
-    supplied tokens eliminates these.
-
-    GenericPointer depends on GenericDocument and GenericValue.
-    
-    \tparam ValueType The value type of the DOM tree. E.g. GenericValue<UTF8<> >
-    \tparam Allocator The allocator type for allocating memory for internal representation.
-    
-    \note GenericPointer uses same encoding of ValueType.
-    However, Allocator of GenericPointer is independent of Allocator of Value.
-*/
-template <typename ValueType, typename Allocator = CrtAllocator>
-class GenericPointer {
-public:
-    typedef typename ValueType::EncodingType EncodingType;  //!< Encoding type from Value
-    typedef typename ValueType::Ch Ch;                      //!< Character type from Value
-
-    //! A token is the basic units of internal representation.
-    /*!
-        A JSON pointer string representation "/foo/123" is parsed to two tokens: 
-        "foo" and 123. 123 will be represented in both numeric form and string form.
-        They are resolved according to the actual value type (object or array).
-
-        For token that are not numbers, or the numeric value is out of bound
-        (greater than limits of SizeType), they are only treated as string form
-        (i.e. the token's index will be equal to kPointerInvalidIndex).
-
-        This struct is public so that user can create a Pointer without parsing and 
-        allocation, using a special constructor.
-    */
-    struct Token {
-        const Ch* name;             //!< Name of the token. It has null character at the end but it can contain null character.
-        SizeType length;            //!< Length of the name.
-        SizeType index;             //!< A valid array index, if it is not equal to kPointerInvalidIndex.
-    };
-
-    //!@name Constructors and destructor.
-    //@{
-
-    //! Default constructor.
-    GenericPointer(Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
-
-    //! Constructor that parses a string or URI fragment representation.
-    /*!
-        \param source A null-terminated, string or URI fragment representation of JSON pointer.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-    */
-    explicit GenericPointer(const Ch* source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source, internal::StrLen(source));
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Constructor that parses a string or URI fragment representation.
-    /*!
-        \param source A string or URI fragment representation of JSON pointer.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-        \note Requires the definition of the preprocessor symbol \ref CEREAL_RAPIDJSON_HAS_STDSTRING.
-    */
-    explicit GenericPointer(const std::basic_string<Ch>& source, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source.c_str(), source.size());
-    }
-#endif
-
-    //! Constructor that parses a string or URI fragment representation, with length of the source string.
-    /*!
-        \param source A string or URI fragment representation of JSON pointer.
-        \param length Length of source.
-        \param allocator User supplied allocator for this pointer. If no allocator is provided, it creates a self-owned one.
-        \note Slightly faster than the overload without length.
-    */
-    GenericPointer(const Ch* source, size_t length, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        Parse(source, length);
-    }
-
-    //! Constructor with user-supplied tokens.
-    /*!
-        This constructor let user supplies const array of tokens.
-        This prevents the parsing process and eliminates allocation.
-        This is preferred for memory constrained environments.
-
-        \param tokens An constant array of tokens representing the JSON pointer.
-        \param tokenCount Number of tokens.
-
-        \b Example
-        \code
-        #define NAME(s) { s, sizeof(s) / sizeof(s[0]) - 1, kPointerInvalidIndex }
-        #define INDEX(i) { #i, sizeof(#i) - 1, i }
-
-        static const Pointer::Token kTokens[] = { NAME("foo"), INDEX(123) };
-        static const Pointer p(kTokens, sizeof(kTokens) / sizeof(kTokens[0]));
-        // Equivalent to static const Pointer p("/foo/123");
-
-        #undef NAME
-        #undef INDEX
-        \endcode
-    */
-    GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
-
-    //! Copy constructor.
-    GenericPointer(const GenericPointer& rhs, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
-        *this = rhs;
-    }
-
-    //! Destructor.
-    ~GenericPointer() {
-        if (nameBuffer_)    // If user-supplied tokens constructor is used, nameBuffer_ is nullptr and tokens_ are not deallocated.
-            Allocator::Free(tokens_);
-        CEREAL_RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    //! Assignment operator.
-    GenericPointer& operator=(const GenericPointer& rhs) {
-        if (this != &rhs) {
-            // Do not delete ownAllcator
-            if (nameBuffer_)
-                Allocator::Free(tokens_);
-
-            tokenCount_ = rhs.tokenCount_;
-            parseErrorOffset_ = rhs.parseErrorOffset_;
-            parseErrorCode_ = rhs.parseErrorCode_;
-
-            if (rhs.nameBuffer_)
-                CopyFromRaw(rhs); // Normally parsed tokens.
-            else {
-                tokens_ = rhs.tokens_; // User supplied const tokens.
-                nameBuffer_ = 0;
-            }
-        }
-        return *this;
-    }
-
-    //@}
-
-    //!@name Append token
-    //@{
-
-    //! Append a token and return a new Pointer
-    /*!
-        \param token Token to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const Token& token, Allocator* allocator = 0) const {
-        GenericPointer r;
-        r.allocator_ = allocator;
-        Ch *p = r.CopyFromRaw(*this, 1, token.length + 1);
-        std::memcpy(p, token.name, (token.length + 1) * sizeof(Ch));
-        r.tokens_[tokenCount_].name = p;
-        r.tokens_[tokenCount_].length = token.length;
-        r.tokens_[tokenCount_].index = token.index;
-        return r;
-    }
-
-    //! Append a name token with length, and return a new Pointer
-    /*!
-        \param name Name to be appended.
-        \param length Length of name.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const Ch* name, SizeType length, Allocator* allocator = 0) const {
-        Token token = { name, length, kPointerInvalidIndex };
-        return Append(token, allocator);
-    }
-
-    //! Append a name token without length, and return a new Pointer
-    /*!
-        \param name Name (const Ch*) to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::NotExpr<internal::IsSame<typename internal::RemoveConst<T>::Type, Ch> >), (GenericPointer))
-    Append(T* name, Allocator* allocator = 0) const {
-        return Append(name, StrLen(name), allocator);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Append a name token, and return a new Pointer
-    /*!
-        \param name Name to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const std::basic_string<Ch>& name, Allocator* allocator = 0) const {
-        return Append(name.c_str(), static_cast<SizeType>(name.size()), allocator);
-    }
-#endif
-
-    //! Append a index token, and return a new Pointer
-    /*!
-        \param index Index to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(SizeType index, Allocator* allocator = 0) const {
-        char buffer[21];
-        char* end = sizeof(SizeType) == 4 ? internal::u32toa(index, buffer) : internal::u64toa(index, buffer);
-        SizeType length = static_cast<SizeType>(end - buffer);
-        buffer[length] = '\0';
-
-        if (sizeof(Ch) == 1) {
-            Token token = { reinterpret_cast<Ch*>(buffer), length, index };
-            return Append(token, allocator);
-        }
-        else {
-            Ch name[21];
-            for (size_t i = 0; i <= length; i++)
-                name[i] = buffer[i];
-            Token token = { name, length, index };
-            return Append(token, allocator);
-        }
-    }
-
-    //! Append a token by value, and return a new Pointer
-    /*!
-        \param token token to be appended.
-        \param allocator Allocator for the newly return Pointer.
-        \return A new Pointer with appended token.
-    */
-    GenericPointer Append(const ValueType& token, Allocator* allocator = 0) const {
-        if (token.IsString())
-            return Append(token.GetString(), token.GetStringLength(), allocator);
-        else {
-            CEREAL_RAPIDJSON_ASSERT(token.IsUint64());
-            CEREAL_RAPIDJSON_ASSERT(token.GetUint64() <= SizeType(~0));
-            return Append(static_cast<SizeType>(token.GetUint64()), allocator);
-        }
-    }
-
-    //!@name Handling Parse Error
-    //@{
-
-    //! Check whether this is a valid pointer.
-    bool IsValid() const { return parseErrorCode_ == kPointerParseErrorNone; }
-
-    //! Get the parsing error offset in code unit.
-    size_t GetParseErrorOffset() const { return parseErrorOffset_; }
-
-    //! Get the parsing error code.
-    PointerParseErrorCode GetParseErrorCode() const { return parseErrorCode_; }
-
-    //@}
-
-    //! Get the allocator of this pointer.
-    Allocator& GetAllocator() { return *allocator_; }
-
-    //!@name Tokens
-    //@{
-
-    //! Get the token array (const version only).
-    const Token* GetTokens() const { return tokens_; }
-
-    //! Get the number of tokens.
-    size_t GetTokenCount() const { return tokenCount_; }
-
-    //@}
-
-    //!@name Equality/inequality operators
-    //@{
-
-    //! Equality operator.
-    /*!
-        \note When any pointers are invalid, always returns false.
-    */
-    bool operator==(const GenericPointer& rhs) const {
-        if (!IsValid() || !rhs.IsValid() || tokenCount_ != rhs.tokenCount_)
-            return false;
-
-        for (size_t i = 0; i < tokenCount_; i++) {
-            if (tokens_[i].index != rhs.tokens_[i].index ||
-                tokens_[i].length != rhs.tokens_[i].length || 
-                (tokens_[i].length != 0 && std::memcmp(tokens_[i].name, rhs.tokens_[i].name, sizeof(Ch)* tokens_[i].length) != 0))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    //! Inequality operator.
-    /*!
-        \note When any pointers are invalid, always returns true.
-    */
-    bool operator!=(const GenericPointer& rhs) const { return !(*this == rhs); }
-
-    //@}
-
-    //!@name Stringify
-    //@{
-
-    //! Stringify the pointer into string representation.
-    /*!
-        \tparam OutputStream Type of output stream.
-        \param os The output stream.
-    */
-    template<typename OutputStream>
-    bool Stringify(OutputStream& os) const {
-        return Stringify<false, OutputStream>(os);
-    }
-
-    //! Stringify the pointer into URI fragment representation.
-    /*!
-        \tparam OutputStream Type of output stream.
-        \param os The output stream.
-    */
-    template<typename OutputStream>
-    bool StringifyUriFragment(OutputStream& os) const {
-        return Stringify<true, OutputStream>(os);
-    }
-
-    //@}
-
-    //!@name Create value
-    //@{
-
-    //! Create a value in a subtree.
-    /*!
-        If the value is not exist, it creates all parent values and a JSON Null value.
-        So it always succeed and return the newly created or existing value.
-
-        Remind that it may change types of parents according to tokens, so it 
-        potentially removes previously stored values. For example, if a document 
-        was an array, and "/foo" is used to create a value, then the document 
-        will be changed to an object, and all existing array elements are lost.
-
-        \param root Root value of a DOM subtree to be resolved. It can be any value other than document root.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
-        \return The resolved newly created (a JSON Null value), or already exists value.
-    */
-    ValueType& Create(ValueType& root, typename ValueType::AllocatorType& allocator, bool* alreadyExist = 0) const {
-        CEREAL_RAPIDJSON_ASSERT(IsValid());
-        ValueType* v = &root;
-        bool exist = true;
-        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            if (v->IsArray() && t->name[0] == '-' && t->length == 1) {
-                v->PushBack(ValueType().Move(), allocator);
-                v = &((*v)[v->Size() - 1]);
-                exist = false;
-            }
-            else {
-                if (t->index == kPointerInvalidIndex) { // must be object name
-                    if (!v->IsObject())
-                        v->SetObject(); // Change to Object
-                }
-                else { // object name or array index
-                    if (!v->IsArray() && !v->IsObject())
-                        v->SetArray(); // Change to Array
-                }
-
-                if (v->IsArray()) {
-                    if (t->index >= v->Size()) {
-                        v->Reserve(t->index + 1, allocator);
-                        while (t->index >= v->Size())
-                            v->PushBack(ValueType().Move(), allocator);
-                        exist = false;
-                    }
-                    v = &((*v)[t->index]);
-                }
-                else {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd()) {
-                        v->AddMember(ValueType(t->name, t->length, allocator).Move(), ValueType().Move(), allocator);
-                        v = &(--v->MemberEnd())->value; // Assumes AddMember() appends at the end
-                        exist = false;
-                    }
-                    else
-                        v = &m->value;
-                }
-            }
-        }
-
-        if (alreadyExist)
-            *alreadyExist = exist;
-
-        return *v;
-    }
-
-    //! Creates a value in a document.
-    /*!
-        \param document A document to be resolved.
-        \param alreadyExist If non-null, it stores whether the resolved value is already exist.
-        \return The resolved newly created, or already exists value.
-    */
-    template <typename stackAllocator>
-    ValueType& Create(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, bool* alreadyExist = 0) const {
-        return Create(document, document.GetAllocator(), alreadyExist);
-    }
-
-    //@}
-
-    //!@name Query value
-    //@{
-
-    //! Query a value in a subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
-        \return Pointer to the value if it can be resolved. Otherwise null.
-
-        \note
-        There are only 3 situations when a value cannot be resolved:
-        1. A value in the path is not an array nor object.
-        2. An object value does not contain the token.
-        3. A token is out of range of an array value.
-
-        Use unresolvedTokenIndex to retrieve the token index.
-    */
-    ValueType* Get(ValueType& root, size_t* unresolvedTokenIndex = 0) const {
-        CEREAL_RAPIDJSON_ASSERT(IsValid());
-        ValueType* v = &root;
-        for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            switch (v->GetType()) {
-            case kObjectType:
-                {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd())
-                        break;
-                    v = &m->value;
-                }
-                continue;
-            case kArrayType:
-                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    break;
-                v = &((*v)[t->index]);
-                continue;
-            default:
-                break;
-            }
-
-            // Error: unresolved token
-            if (unresolvedTokenIndex)
-                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
-            return 0;
-        }
-        return v;
-    }
-
-    //! Query a const value in a const subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \return Pointer to the value if it can be resolved. Otherwise null.
-    */
-    const ValueType* Get(const ValueType& root, size_t* unresolvedTokenIndex = 0) const { 
-        return Get(const_cast<ValueType&>(root), unresolvedTokenIndex);
-    }
-
-    //@}
-
-    //!@name Query a value with default
-    //@{
-
-    //! Query a value in a subtree with default value.
-    /*!
-        Similar to Get(), but if the specified value do not exists, it creates all parents and clone the default value.
-        So that this function always succeed.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param defaultValue Default value to be cloned if the value was not exists.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& GetWithDefault(ValueType& root, const ValueType& defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        Value& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.CopyFrom(defaultValue, allocator);
-    }
-
-    //! Query a value in a subtree with default null-terminated string.
-    ValueType& GetWithDefault(ValueType& root, const Ch* defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        Value& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.SetString(defaultValue, allocator);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Query a value in a subtree with default std::basic_string.
-    ValueType& GetWithDefault(ValueType& root, const std::basic_string<Ch>& defaultValue, typename ValueType::AllocatorType& allocator) const {
-        bool alreadyExist;
-        Value& v = Create(root, allocator, &alreadyExist);
-        return alreadyExist ? v : v.SetString(defaultValue, allocator);
-    }
-#endif
-
-    //! Query a value in a subtree with default primitive value.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    GetWithDefault(ValueType& root, T defaultValue, typename ValueType::AllocatorType& allocator) const {
-        return GetWithDefault(root, ValueType(defaultValue).Move(), allocator);
-    }
-
-    //! Query a value in a document with default value.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-
-    //! Query a value in a document with default null-terminated string.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-    
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Query a value in a document with default std::basic_string.
-    template <typename stackAllocator>
-    ValueType& GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-#endif
-
-    //! Query a value in a document with default primitive value.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T, typename stackAllocator>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    GetWithDefault(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T defaultValue) const {
-        return GetWithDefault(document, defaultValue, document.GetAllocator());
-    }
-
-    //@}
-
-    //!@name Set a value
-    //@{
-
-    //! Set a value in a subtree, with move semantics.
-    /*!
-        It creates all parents if they are not exist or types are different to the tokens.
-        So this function always succeeds but potentially remove existing values.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param value Value to be set.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& Set(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = value;
-    }
-
-    //! Set a value in a subtree, with copy semantics.
-    ValueType& Set(ValueType& root, const ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator).CopyFrom(value, allocator);
-    }
-
-    //! Set a null-terminated string in a subtree.
-    ValueType& Set(ValueType& root, const Ch* value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value, allocator).Move();
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Set a std::basic_string in a subtree.
-    ValueType& Set(ValueType& root, const std::basic_string<Ch>& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value, allocator).Move();
-    }
-#endif
-
-    //! Set a primitive value in a subtree.
-    /*!
-        \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-    Set(ValueType& root, T value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator) = ValueType(value).Move();
-    }
-
-    //! Set a value in a document, with move semantics.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
-        return Create(document) = value;
-    }
-
-    //! Set a value in a document, with copy semantics.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const ValueType& value) const {
-        return Create(document).CopyFrom(value, document.GetAllocator());
-    }
-
-    //! Set a null-terminated string in a document.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const Ch* value) const {
-        return Create(document) = ValueType(value, document.GetAllocator()).Move();
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    //! Sets a std::basic_string in a document.
-    template <typename stackAllocator>
-    ValueType& Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, const std::basic_string<Ch>& value) const {
-        return Create(document) = ValueType(value, document.GetAllocator()).Move();
-    }
-#endif
-
-    //! Set a primitive value in a document.
-    /*!
-    \tparam T Either \ref Type, \c int, \c unsigned, \c int64_t, \c uint64_t, \c bool
-    */
-    template <typename T, typename stackAllocator>
-    CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&))
-        Set(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, T value) const {
-            return Create(document) = value;
-    }
-
-    //@}
-
-    //!@name Swap a value
-    //@{
-
-    //! Swap a value with a value in a subtree.
-    /*!
-        It creates all parents if they are not exist or types are different to the tokens.
-        So this function always succeeds but potentially remove existing values.
-
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \param value Value to be swapped.
-        \param allocator Allocator for creating the values if the specified value or its parents are not exist.
-        \see Create()
-    */
-    ValueType& Swap(ValueType& root, ValueType& value, typename ValueType::AllocatorType& allocator) const {
-        return Create(root, allocator).Swap(value);
-    }
-
-    //! Swap a value with a value in a document.
-    template <typename stackAllocator>
-    ValueType& Swap(GenericDocument<EncodingType, typename ValueType::AllocatorType, stackAllocator>& document, ValueType& value) const {
-        return Create(document).Swap(value);
-    }
-
-    //@}
-
-    //! Erase a value in a subtree.
-    /*!
-        \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
-        \return Whether the resolved value is found and erased.
-
-        \note Erasing with an empty pointer \c Pointer(""), i.e. the root, always fail and return false.
-    */
-    bool Erase(ValueType& root) const {
-        CEREAL_RAPIDJSON_ASSERT(IsValid());
-        if (tokenCount_ == 0) // Cannot erase the root
-            return false;
-
-        ValueType* v = &root;
-        const Token* last = tokens_ + (tokenCount_ - 1);
-        for (const Token *t = tokens_; t != last; ++t) {
-            switch (v->GetType()) {
-            case kObjectType:
-                {
-                    typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
-                    if (m == v->MemberEnd())
-                        return false;
-                    v = &m->value;
-                }
-                break;
-            case kArrayType:
-                if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    return false;
-                v = &((*v)[t->index]);
-                break;
-            default:
-                return false;
-            }
-        }
-
-        switch (v->GetType()) {
-        case kObjectType:
-            return v->EraseMember(GenericStringRef<Ch>(last->name, last->length));
-        case kArrayType:
-            if (last->index == kPointerInvalidIndex || last->index >= v->Size())
-                return false;
-            v->Erase(v->Begin() + last->index);
-            return true;
-        default:
-            return false;
-        }
-    }
-
-private:
-    //! Clone the content from rhs to this.
-    /*!
-        \param rhs Source pointer.
-        \param extraToken Extra tokens to be allocated.
-        \param extraNameBufferSize Extra name buffer size (in number of Ch) to be allocated.
-        \return Start of non-occupied name buffer, for storing extra names.
-    */
-    Ch* CopyFromRaw(const GenericPointer& rhs, size_t extraToken = 0, size_t extraNameBufferSize = 0) {
-        if (!allocator_) // allocator is independently owned.
-            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
-
-        size_t nameBufferSize = rhs.tokenCount_; // null terminators for tokens
-        for (Token *t = rhs.tokens_; t != rhs.tokens_ + rhs.tokenCount_; ++t)
-            nameBufferSize += t->length;
-
-        tokenCount_ = rhs.tokenCount_ + extraToken;
-        tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + (nameBufferSize + extraNameBufferSize) * sizeof(Ch)));
-        nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
-        if (rhs.tokenCount_ > 0) {
-            std::memcpy(tokens_, rhs.tokens_, rhs.tokenCount_ * sizeof(Token));
-        }
-        if (nameBufferSize > 0) {
-            std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
-        }
-
-        // Adjust pointers to name buffer
-        std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
-        for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
-            t->name += diff;
-
-        return nameBuffer_ + nameBufferSize;
-    }
-
-    //! Check whether a character should be percent-encoded.
-    /*!
-        According to RFC 3986 2.3 Unreserved Characters.
-        \param c The character (code unit) to be tested.
-    */
-    bool NeedPercentEncode(Ch c) const {
-        return !((c >= '0' && c <= '9') || (c >= 'A' && c <='Z') || (c >= 'a' && c <= 'z') || c == '-' || c == '.' || c == '_' || c =='~');
-    }
-
-    //! Parse a JSON String or its URI fragment representation into tokens.
-#ifndef __clang__ // -Wdocumentation
-    /*!
-        \param source Either a JSON Pointer string, or its URI fragment representation. Not need to be null terminated.
-        \param length Length of the source string.
-        \note Source cannot be JSON String Representation of JSON Pointer, e.g. In "/\u0000", \u0000 will not be unescaped.
-    */
-#endif
-    void Parse(const Ch* source, size_t length) {
-        CEREAL_RAPIDJSON_ASSERT(source != NULL);
-        CEREAL_RAPIDJSON_ASSERT(nameBuffer_ == 0);
-        CEREAL_RAPIDJSON_ASSERT(tokens_ == 0);
-
-        // Create own allocator if user did not supply.
-        if (!allocator_)
-            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
-
-        // Count number of '/' as tokenCount
-        tokenCount_ = 0;
-        for (const Ch* s = source; s != source + length; s++) 
-            if (*s == '/')
-                tokenCount_++;
-
-        Token* token = tokens_ = static_cast<Token *>(allocator_->Malloc(tokenCount_ * sizeof(Token) + length * sizeof(Ch)));
-        Ch* name = nameBuffer_ = reinterpret_cast<Ch *>(tokens_ + tokenCount_);
-        size_t i = 0;
-
-        // Detect if it is a URI fragment
-        bool uriFragment = false;
-        if (source[i] == '#') {
-            uriFragment = true;
-            i++;
-        }
-
-        if (i != length && source[i] != '/') {
-            parseErrorCode_ = kPointerParseErrorTokenMustBeginWithSolidus;
-            goto error;
-        }
-
-        while (i < length) {
-            CEREAL_RAPIDJSON_ASSERT(source[i] == '/');
-            i++; // consumes '/'
-
-            token->name = name;
-            bool isNumber = true;
-
-            while (i < length && source[i] != '/') {
-                Ch c = source[i];
-                if (uriFragment) {
-                    // Decoding percent-encoding for URI fragment
-                    if (c == '%') {
-                        PercentDecodeStream is(&source[i], source + length);
-                        GenericInsituStringStream<EncodingType> os(name);
-                        Ch* begin = os.PutBegin();
-                        if (!Transcoder<UTF8<>, EncodingType>().Validate(is, os) || !is.IsValid()) {
-                            parseErrorCode_ = kPointerParseErrorInvalidPercentEncoding;
-                            goto error;
-                        }
-                        size_t len = os.PutEnd(begin);
-                        i += is.Tell() - 1;
-                        if (len == 1)
-                            c = *name;
-                        else {
-                            name += len;
-                            isNumber = false;
-                            i++;
-                            continue;
-                        }
-                    }
-                    else if (NeedPercentEncode(c)) {
-                        parseErrorCode_ = kPointerParseErrorCharacterMustPercentEncode;
-                        goto error;
-                    }
-                }
-
-                i++;
-                
-                // Escaping "~0" -> '~', "~1" -> '/'
-                if (c == '~') {
-                    if (i < length) {
-                        c = source[i];
-                        if (c == '0')       c = '~';
-                        else if (c == '1')  c = '/';
-                        else {
-                            parseErrorCode_ = kPointerParseErrorInvalidEscape;
-                            goto error;
-                        }
-                        i++;
-                    }
-                    else {
-                        parseErrorCode_ = kPointerParseErrorInvalidEscape;
-                        goto error;
-                    }
-                }
-
-                // First check for index: all of characters are digit
-                if (c < '0' || c > '9')
-                    isNumber = false;
-
-                *name++ = c;
-            }
-            token->length = static_cast<SizeType>(name - token->name);
-            if (token->length == 0)
-                isNumber = false;
-            *name++ = '\0'; // Null terminator
-
-            // Second check for index: more than one digit cannot have leading zero
-            if (isNumber && token->length > 1 && token->name[0] == '0')
-                isNumber = false;
-
-            // String to SizeType conversion
-            SizeType n = 0;
-            if (isNumber) {
-                for (size_t j = 0; j < token->length; j++) {
-                    SizeType m = n * 10 + static_cast<SizeType>(token->name[j] - '0');
-                    if (m < n) {   // overflow detection
-                        isNumber = false;
-                        break;
-                    }
-                    n = m;
-                }
-            }
-
-            token->index = isNumber ? n : kPointerInvalidIndex;
-            token++;
-        }
-
-        CEREAL_RAPIDJSON_ASSERT(name <= nameBuffer_ + length); // Should not overflow buffer
-        parseErrorCode_ = kPointerParseErrorNone;
-        return;
-
-    error:
-        Allocator::Free(tokens_);
-        nameBuffer_ = 0;
-        tokens_ = 0;
-        tokenCount_ = 0;
-        parseErrorOffset_ = i;
-        return;
-    }
-
-    //! Stringify to string or URI fragment representation.
-    /*!
-        \tparam uriFragment True for stringifying to URI fragment representation. False for string representation.
-        \tparam OutputStream type of output stream.
-        \param os The output stream.
-    */
-    template<bool uriFragment, typename OutputStream>
-    bool Stringify(OutputStream& os) const {
-        CEREAL_RAPIDJSON_ASSERT(IsValid());
-
-        if (uriFragment)
-            os.Put('#');
-
-        for (Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
-            os.Put('/');
-            for (size_t j = 0; j < t->length; j++) {
-                Ch c = t->name[j];
-                if (c == '~') {
-                    os.Put('~');
-                    os.Put('0');
-                }
-                else if (c == '/') {
-                    os.Put('~');
-                    os.Put('1');
-                }
-                else if (uriFragment && NeedPercentEncode(c)) { 
-                    // Transcode to UTF8 sequence
-                    GenericStringStream<typename ValueType::EncodingType> source(&t->name[j]);
-                    PercentEncodeStream<OutputStream> target(os);
-                    if (!Transcoder<EncodingType, UTF8<> >().Validate(source, target))
-                        return false;
-                    j += source.Tell() - 1;
-                }
-                else
-                    os.Put(c);
-            }
-        }
-        return true;
-    }
-
-    //! A helper stream for decoding a percent-encoded sequence into code unit.
-    /*!
-        This stream decodes %XY triplet into code unit (0-255).
-        If it encounters invalid characters, it sets output code unit as 0 and 
-        mark invalid, and to be checked by IsValid().
-    */
-    class PercentDecodeStream {
-    public:
-        typedef typename ValueType::Ch Ch;
-
-        //! Constructor
-        /*!
-            \param source Start of the stream
-            \param end Past-the-end of the stream.
-        */
-        PercentDecodeStream(const Ch* source, const Ch* end) : src_(source), head_(source), end_(end), valid_(true) {}
-
-        Ch Take() {
-            if (*src_ != '%' || src_ + 3 > end_) { // %XY triplet
-                valid_ = false;
-                return 0;
-            }
-            src_++;
-            Ch c = 0;
-            for (int j = 0; j < 2; j++) {
-                c = static_cast<Ch>(c << 4);
-                Ch h = *src_;
-                if      (h >= '0' && h <= '9') c = static_cast<Ch>(c + h - '0');
-                else if (h >= 'A' && h <= 'F') c = static_cast<Ch>(c + h - 'A' + 10);
-                else if (h >= 'a' && h <= 'f') c = static_cast<Ch>(c + h - 'a' + 10);
-                else {
-                    valid_ = false;
-                    return 0;
-                }
-                src_++;
-            }
-            return c;
-        }
-
-        size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-        bool IsValid() const { return valid_; }
-
-    private:
-        const Ch* src_;     //!< Current read position.
-        const Ch* head_;    //!< Original head of the string.
-        const Ch* end_;     //!< Past-the-end position.
-        bool valid_;        //!< Whether the parsing is valid.
-    };
-
-    //! A helper stream to encode character (UTF-8 code unit) into percent-encoded sequence.
-    template <typename OutputStream>
-    class PercentEncodeStream {
-    public:
-        PercentEncodeStream(OutputStream& os) : os_(os) {}
-        void Put(char c) { // UTF-8 must be byte
-            unsigned char u = static_cast<unsigned char>(c);
-            static const char hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-            os_.Put('%');
-            os_.Put(hexDigits[u >> 4]);
-            os_.Put(hexDigits[u & 15]);
-        }
-    private:
-        OutputStream& os_;
-    };
-
-    Allocator* allocator_;                  //!< The current allocator. It is either user-supplied or equal to ownAllocator_.
-    Allocator* ownAllocator_;               //!< Allocator owned by this Pointer.
-    Ch* nameBuffer_;                        //!< A buffer containing all names in tokens.
-    Token* tokens_;                         //!< A list of tokens.
-    size_t tokenCount_;                     //!< Number of tokens in tokens_.
-    size_t parseErrorOffset_;               //!< Offset in code unit when parsing fail.
-    PointerParseErrorCode parseErrorCode_;  //!< Parsing error code.
-};
-
-//! GenericPointer for Value (UTF-8, default allocator).
-typedef GenericPointer<Value> Pointer;
-
-//!@name Helper functions for GenericPointer
-//@{
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& CreateValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::AllocatorType& a) {
-    return pointer.Create(root, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& CreateValueByPointer(T& root, const CharType(&source)[N], typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Create(root, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer) {
-    return pointer.Create(document);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& CreateValueByPointer(DocumentType& document, const CharType(&source)[N]) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Create(document);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
-    return pointer.Get(root, unresolvedTokenIndex);
-}
-
-template <typename T>
-const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
-    return pointer.Get(root, unresolvedTokenIndex);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N], size_t* unresolvedTokenIndex = 0) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
-}
-
-template <typename T, typename CharType, size_t N>
-const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N], size_t* unresolvedTokenIndex = 0) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename T>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-#endif
-
-template <typename T, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-GetValueByPointerWithDefault(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 defaultValue, typename T::AllocatorType& a) {
-    return pointer.GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::ValueType& defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const typename T::Ch* defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& GetValueByPointerWithDefault(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-#endif
-
-template <typename T, typename CharType, size_t N, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-GetValueByPointerWithDefault(T& root, const CharType(&source)[N], T2 defaultValue, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).GetWithDefault(root, defaultValue, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-#endif
-
-template <typename DocumentType, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-GetValueByPointerWithDefault(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 defaultValue) {
-    return pointer.GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-#endif
-
-template <typename DocumentType, typename CharType, size_t N, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-GetValueByPointerWithDefault(DocumentType& document, const CharType(&source)[N], T2 defaultValue) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).GetWithDefault(document, defaultValue);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const typename T::Ch* value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename T>
-typename T::ValueType& SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-#endif
-
-template <typename T, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-SetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, T2 value, typename T::AllocatorType& a) {
-    return pointer.Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const typename T::Ch* value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SetValueByPointer(T& root, const CharType(&source)[N], const std::basic_string<typename T::Ch>& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-#endif
-
-template <typename T, typename CharType, size_t N, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename T::ValueType&))
-SetValueByPointer(T& root, const CharType(&source)[N], T2 value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Set(root, value, a);
-}
-
-// No allocator parameter
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::ValueType& value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const typename DocumentType::Ch* value) {
-    return pointer.Set(document, value);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, const std::basic_string<typename DocumentType::Ch>& value) {
-    return pointer.Set(document, value);
-}
-#endif
-
-template <typename DocumentType, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-SetValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, T2 value) {
-    return pointer.Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const typename DocumentType::Ch* value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SetValueByPointer(DocumentType& document, const CharType(&source)[N], const std::basic_string<typename DocumentType::Ch>& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-#endif
-
-template <typename DocumentType, typename CharType, size_t N, typename T2>
-CEREAL_RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T2>, internal::IsGenericValue<T2> >), (typename DocumentType::ValueType&))
-SetValueByPointer(DocumentType& document, const CharType(&source)[N], T2 value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Set(document, value);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-typename T::ValueType& SwapValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, typename T::ValueType& value, typename T::AllocatorType& a) {
-    return pointer.Swap(root, value, a);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType& SwapValueByPointer(T& root, const CharType(&source)[N], typename T::ValueType& value, typename T::AllocatorType& a) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Swap(root, value, a);
-}
-
-template <typename DocumentType>
-typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const GenericPointer<typename DocumentType::ValueType>& pointer, typename DocumentType::ValueType& value) {
-    return pointer.Swap(document, value);
-}
-
-template <typename DocumentType, typename CharType, size_t N>
-typename DocumentType::ValueType& SwapValueByPointer(DocumentType& document, const CharType(&source)[N], typename DocumentType::ValueType& value) {
-    return GenericPointer<typename DocumentType::ValueType>(source, N - 1).Swap(document, value);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename T>
-bool EraseValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer) {
-    return pointer.Erase(root);
-}
-
-template <typename T, typename CharType, size_t N>
-bool EraseValueByPointer(T& root, const CharType(&source)[N]) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Erase(root);
-}
-
-//@}
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_POINTER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h b/Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h
deleted file mode 100644
index 50a24fc..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/prettywriter.h
+++ /dev/null
@@ -1,255 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_PRETTYWRITER_H_
-#define CEREAL_RAPIDJSON_PRETTYWRITER_H_
-
-#include "writer.h"
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Combination of PrettyWriter format flags.
-/*! \see PrettyWriter::SetFormatOptions
- */
-enum PrettyFormatOptions {
-    kFormatDefault = 0,         //!< Default pretty formatting.
-    kFormatSingleLineArray = 1  //!< Format arrays on a single line.
-};
-
-//! Writer with indentation and spacing.
-/*!
-    \tparam OutputStream Type of ouptut os.
-    \tparam SourceEncoding Encoding of source string.
-    \tparam TargetEncoding Encoding of output stream.
-    \tparam StackAllocator Type of allocator for allocating memory of stack.
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
-public:
-    typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
-    typedef typename Base::Ch Ch;
-
-    //! Constructor
-    /*! \param os Output stream.
-        \param allocator User supplied allocator. If it is null, it will create a private one.
-        \param levelDepth Initial capacity of stack.
-    */
-    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
-
-
-    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
-
-    //! Set custom indentation.
-    /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
-        \param indentCharCount  Number of indent characters for each indentation level.
-        \note The default indentation is 4 spaces.
-    */
-    PrettyWriter& SetIndent(Ch indentChar, unsigned indentCharCount) {
-        CEREAL_RAPIDJSON_ASSERT(indentChar == ' ' || indentChar == '\t' || indentChar == '\n' || indentChar == '\r');
-        indentChar_ = indentChar;
-        indentCharCount_ = indentCharCount;
-        return *this;
-    }
-
-    //! Set pretty writer formatting options.
-    /*! \param options Formatting options.
-    */
-    PrettyWriter& SetFormatOptions(PrettyFormatOptions options) {
-        formatOptions_ = options;
-        return *this;
-    }
-
-    /*! @name Implementation of Handler
-        \see Handler
-    */
-    //@{
-
-    bool Null()                 { PrettyPrefix(kNullType);   return Base::WriteNull(); }
-    bool Bool(bool b)           { PrettyPrefix(b ? kTrueType : kFalseType); return Base::WriteBool(b); }
-    bool Int(int i)             { PrettyPrefix(kNumberType); return Base::WriteInt(i); }
-    bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::WriteUint(u); }
-    bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::WriteInt64(i64); }
-    bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
-    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        PrettyPrefix(kNumberType);
-        return Base::WriteString(str, length);
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        PrettyPrefix(kStringType);
-        return Base::WriteString(str, length);
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool String(const std::basic_string<Ch>& str) {
-        return String(str.data(), SizeType(str.size()));
-    }
-#endif
-
-    bool StartObject() {
-        PrettyPrefix(kObjectType);
-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);
-        return Base::WriteStartObject();
-    }
-
-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool Key(const std::basic_string<Ch>& str) {
-        return Key(str.data(), SizeType(str.size()));
-    }
-#endif
-	
-    bool EndObject(SizeType memberCount = 0) {
-        (void)memberCount;
-        CEREAL_RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-        CEREAL_RAPIDJSON_ASSERT(!Base::level_stack_.template Top<typename Base::Level>()->inArray);
-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-        if (!empty) {
-            Base::os_->Put('\n');
-            WriteIndent();
-        }
-        bool ret = Base::WriteEndObject();
-        (void)ret;
-        CEREAL_RAPIDJSON_ASSERT(ret == true);
-        if (Base::level_stack_.Empty()) // end of json text
-            Base::os_->Flush();
-        return true;
-    }
-
-    bool StartArray() {
-        PrettyPrefix(kArrayType);
-        new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(true);
-        return Base::WriteStartArray();
-    }
-
-    bool EndArray(SizeType memberCount = 0) {
-        (void)memberCount;
-        CEREAL_RAPIDJSON_ASSERT(Base::level_stack_.GetSize() >= sizeof(typename Base::Level));
-        CEREAL_RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
-        bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
-
-        if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
-            Base::os_->Put('\n');
-            WriteIndent();
-        }
-        bool ret = Base::WriteEndArray();
-        (void)ret;
-        CEREAL_RAPIDJSON_ASSERT(ret == true);
-        if (Base::level_stack_.Empty()) // end of json text
-            Base::os_->Flush();
-        return true;
-    }
-
-    //@}
-
-    /*! @name Convenience extensions */
-    //@{
-
-    //! Simpler but slower overload.
-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
-
-    //@}
-
-    //! Write a raw JSON value.
-    /*!
-        For user to write a stringified JSON as a value.
-
-        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
-        \param length Length of the json.
-        \param type Type of the root of json.
-        \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
-    */
-    bool RawValue(const Ch* json, size_t length, Type type) { PrettyPrefix(type); return Base::WriteRawValue(json, length); }
-
-protected:
-    void PrettyPrefix(Type type) {
-        (void)type;
-        if (Base::level_stack_.GetSize() != 0) { // this value is not at root
-            typename Base::Level* level = Base::level_stack_.template Top<typename Base::Level>();
-
-            if (level->inArray) {
-                if (level->valueCount > 0) {
-                    Base::os_->Put(','); // add comma if it is not the first element in array
-                    if (formatOptions_ & kFormatSingleLineArray)
-                        Base::os_->Put(' ');
-                }
-
-                if (!(formatOptions_ & kFormatSingleLineArray)) {
-                    Base::os_->Put('\n');
-                    WriteIndent();
-                }
-            }
-            else {  // in object
-                if (level->valueCount > 0) {
-                    if (level->valueCount % 2 == 0) {
-                        Base::os_->Put(',');
-                        Base::os_->Put('\n');
-                    }
-                    else {
-                        Base::os_->Put(':');
-                        Base::os_->Put(' ');
-                    }
-                }
-                else
-                    Base::os_->Put('\n');
-
-                if (level->valueCount % 2 == 0)
-                    WriteIndent();
-            }
-            if (!level->inArray && level->valueCount % 2 == 0)
-                CEREAL_RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-            level->valueCount++;
-        }
-        else {
-            CEREAL_RAPIDJSON_ASSERT(!Base::hasRoot_);  // Should only has one and only one root.
-            Base::hasRoot_ = true;
-        }
-    }
-
-    void WriteIndent()  {
-        size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;
-        PutN(*Base::os_, static_cast<typename TargetEncoding::Ch>(indentChar_), count);
-    }
-
-    Ch indentChar_;
-    unsigned indentCharCount_;
-    PrettyFormatOptions formatOptions_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    PrettyWriter(const PrettyWriter&);
-    PrettyWriter& operator=(const PrettyWriter&);
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h b/Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h
deleted file mode 100644
index b79023c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/rapidjson.h
+++ /dev/null
@@ -1,615 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
-#define CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
-
-/*!\file rapidjson.h
-    \brief common definitions and configuration
-    
-    \see CEREAL_RAPIDJSON_CONFIG
- */
-
-/*! \defgroup CEREAL_RAPIDJSON_CONFIG RapidJSON configuration
-    \brief Configuration macros for library features
-
-    Some RapidJSON features are configurable to adapt the library to a wide
-    variety of platforms, environments and usage scenarios.  Most of the
-    features can be configured in terms of overriden or predefined
-    preprocessor macros at compile-time.
-
-    Some additional customization is available in the \ref CEREAL_RAPIDJSON_ERRORS APIs.
-
-    \note These macros should be given on the compiler command-line
-          (where applicable)  to avoid inconsistent values when compiling
-          different translation units of a single application.
- */
-
-#include <cstdlib>  // malloc(), realloc(), free(), size_t
-#include <cstring>  // memset(), memcpy(), memmove(), memcmp()
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_VERSION_STRING
-//
-// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.
-//
-
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-// token stringification
-#define CEREAL_RAPIDJSON_STRINGIFY(x) CEREAL_RAPIDJSON_DO_STRINGIFY(x)
-#define CEREAL_RAPIDJSON_DO_STRINGIFY(x) #x
-//!@endcond
-
-/*! \def CEREAL_RAPIDJSON_MAJOR_VERSION
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Major version of RapidJSON in integer.
-*/
-/*! \def CEREAL_RAPIDJSON_MINOR_VERSION
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Minor version of RapidJSON in integer.
-*/
-/*! \def CEREAL_RAPIDJSON_PATCH_VERSION
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Patch version of RapidJSON in integer.
-*/
-/*! \def CEREAL_RAPIDJSON_VERSION_STRING
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.
-*/
-#define CEREAL_RAPIDJSON_MAJOR_VERSION 1
-#define CEREAL_RAPIDJSON_MINOR_VERSION 0
-#define CEREAL_RAPIDJSON_PATCH_VERSION 2
-#define CEREAL_RAPIDJSON_VERSION_STRING \
-    CEREAL_RAPIDJSON_STRINGIFY(CEREAL_RAPIDJSON_MAJOR_VERSION.CEREAL_RAPIDJSON_MINOR_VERSION.CEREAL_RAPIDJSON_PATCH_VERSION)
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_NAMESPACE_(BEGIN|END)
-/*! \def CEREAL_RAPIDJSON_NAMESPACE
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace
-
-    In order to avoid symbol clashes and/or "One Definition Rule" errors
-    between multiple inclusions of (different versions of) RapidJSON in
-    a single binary, users can customize the name of the main RapidJSON
-    namespace.
-
-    In case of a single nesting level, defining \c CEREAL_RAPIDJSON_NAMESPACE
-    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple
-    levels are needed, both \ref CEREAL_RAPIDJSON_NAMESPACE_BEGIN and \ref
-    CEREAL_RAPIDJSON_NAMESPACE_END need to be defined as well:
-
-    \code
-    // in some .cpp file
-    #define CEREAL_RAPIDJSON_NAMESPACE my::rapidjson
-    #define CEREAL_RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {
-    #define CEREAL_RAPIDJSON_NAMESPACE_END   } }
-    #include "rapidjson/..."
-    \endcode
-
-    \see rapidjson
- */
-/*! \def CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace (opening expression)
-    \see CEREAL_RAPIDJSON_NAMESPACE
-*/
-/*! \def CEREAL_RAPIDJSON_NAMESPACE_END
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief   provide custom rapidjson namespace (closing expression)
-    \see CEREAL_RAPIDJSON_NAMESPACE
-*/
-#ifndef CEREAL_RAPIDJSON_NAMESPACE
-#define CEREAL_RAPIDJSON_NAMESPACE rapidjson
-#endif
-#ifndef CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-#define CEREAL_RAPIDJSON_NAMESPACE_BEGIN namespace CEREAL_RAPIDJSON_NAMESPACE {
-#endif
-#ifndef CEREAL_RAPIDJSON_NAMESPACE_END
-#define CEREAL_RAPIDJSON_NAMESPACE_END }
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_HAS_STDSTRING
-
-#ifndef CEREAL_RAPIDJSON_HAS_STDSTRING
-#ifdef CEREAL_RAPIDJSON_DOXYGEN_RUNNING
-#define CEREAL_RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation
-#else
-#define CEREAL_RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default
-#endif
-/*! \def CEREAL_RAPIDJSON_HAS_STDSTRING
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Enable RapidJSON support for \c std::string
-
-    By defining this preprocessor symbol to \c 1, several convenience functions for using
-    \ref rapidjson::GenericValue with \c std::string are enabled, especially
-    for construction and comparison.
-
-    \hideinitializer
-*/
-#endif // !defined(CEREAL_RAPIDJSON_HAS_STDSTRING)
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-#include <string>
-#endif // CEREAL_RAPIDJSON_HAS_STDSTRING
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_NO_INT64DEFINE
-
-/*! \def CEREAL_RAPIDJSON_NO_INT64DEFINE
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Use external 64-bit integer types.
-
-    RapidJSON requires the 64-bit integer types \c int64_t and  \c uint64_t types
-    to be available at global scope.
-
-    If users have their own definition, define CEREAL_RAPIDJSON_NO_INT64DEFINE to
-    prevent RapidJSON from defining its own types.
-*/
-#ifndef CEREAL_RAPIDJSON_NO_INT64DEFINE
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
-#include "msinttypes/stdint.h"
-#include "msinttypes/inttypes.h"
-#else
-// Other compilers should have this.
-#include <stdint.h>
-#include <inttypes.h>
-#endif
-//!@endcond
-#ifdef CEREAL_RAPIDJSON_DOXYGEN_RUNNING
-#define CEREAL_RAPIDJSON_NO_INT64DEFINE
-#endif
-#endif // CEREAL_RAPIDJSON_NO_INT64TYPEDEF
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_FORCEINLINE
-
-#ifndef CEREAL_RAPIDJSON_FORCEINLINE
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && defined(NDEBUG)
-#define CEREAL_RAPIDJSON_FORCEINLINE __forceinline
-#elif defined(__GNUC__) && __GNUC__ >= 4 && defined(NDEBUG)
-#define CEREAL_RAPIDJSON_FORCEINLINE __attribute__((always_inline))
-#else
-#define CEREAL_RAPIDJSON_FORCEINLINE
-#endif
-//!@endcond
-#endif // CEREAL_RAPIDJSON_FORCEINLINE
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_ENDIAN
-#define CEREAL_RAPIDJSON_LITTLEENDIAN  0   //!< Little endian machine
-#define CEREAL_RAPIDJSON_BIGENDIAN     1   //!< Big endian machine
-
-//! Endianness of the machine.
-/*!
-    \def CEREAL_RAPIDJSON_ENDIAN
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-
-    GCC 4.6 provided macro for detecting endianness of the target machine. But other
-    compilers may not have this. User can define CEREAL_RAPIDJSON_ENDIAN to either
-    \ref CEREAL_RAPIDJSON_LITTLEENDIAN or \ref CEREAL_RAPIDJSON_BIGENDIAN.
-
-    Default detection implemented with reference to
-    \li https://gcc.gnu.org/onlinedocs/gcc-4.6.0/cpp/Common-Predefined-Macros.html
-    \li http://www.boost.org/doc/libs/1_42_0/boost/detail/endian.hpp
-*/
-#ifndef CEREAL_RAPIDJSON_ENDIAN
-// Detect with GCC 4.6's macro
-#  ifdef __BYTE_ORDER__
-#    if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
-#    elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianess detected. User needs to define CEREAL_RAPIDJSON_ENDIAN.
-#    endif // __BYTE_ORDER__
-// Detect with GLIBC's endian.h
-#  elif defined(__GLIBC__)
-#    include <endian.h>
-#    if (__BYTE_ORDER == __LITTLE_ENDIAN)
-#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
-#    elif (__BYTE_ORDER == __BIG_ENDIAN)
-#      define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
-#    else
-#      error Unknown machine endianess detected. User needs to define CEREAL_RAPIDJSON_ENDIAN.
-#   endif // __GLIBC__
-// Detect with _LITTLE_ENDIAN and _BIG_ENDIAN macro
-#  elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
-#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
-#  elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
-#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
-// Detect with architecture macros
-#  elif defined(__sparc) || defined(__sparc__) || defined(_POWER) || defined(__powerpc__) || defined(__ppc__) || defined(__hpux) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__s390__)
-#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_BIGENDIAN
-#  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)
-#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
-#  elif defined(_MSC_VER) && defined(_M_ARM)
-#    define CEREAL_RAPIDJSON_ENDIAN CEREAL_RAPIDJSON_LITTLEENDIAN
-#  elif defined(CEREAL_RAPIDJSON_DOXYGEN_RUNNING)
-#    define CEREAL_RAPIDJSON_ENDIAN
-#  else
-#    error Unknown machine endianess detected. User needs to define CEREAL_RAPIDJSON_ENDIAN.   
-#  endif
-#endif // CEREAL_RAPIDJSON_ENDIAN
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_64BIT
-
-//! Whether using 64-bit architecture
-#ifndef CEREAL_RAPIDJSON_64BIT
-#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
-#define CEREAL_RAPIDJSON_64BIT 1
-#else
-#define CEREAL_RAPIDJSON_64BIT 0
-#endif
-#endif // CEREAL_RAPIDJSON_64BIT
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_ALIGN
-
-//! Data alignment of the machine.
-/*! \ingroup CEREAL_RAPIDJSON_CONFIG
-    \param x pointer to align
-
-    Some machines require strict data alignment. Currently the default uses 4 bytes
-    alignment on 32-bit platforms and 8 bytes alignment for 64-bit platforms.
-    User can customize by defining the CEREAL_RAPIDJSON_ALIGN function macro.
-*/
-#ifndef CEREAL_RAPIDJSON_ALIGN
-#if CEREAL_RAPIDJSON_64BIT == 1
-#define CEREAL_RAPIDJSON_ALIGN(x) (((x) + static_cast<uint64_t>(7u)) & ~static_cast<uint64_t>(7u))
-#else
-#define CEREAL_RAPIDJSON_ALIGN(x) (((x) + 3u) & ~3u)
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_UINT64_C2
-
-//! Construct a 64-bit literal by a pair of 32-bit integer.
-/*!
-    64-bit literal with or without ULL suffix is prone to compiler warnings.
-    UINT64_C() is C macro which cause compilation problems.
-    Use this macro to define 64-bit constants by a pair of 32-bit integer.
-*/
-#ifndef CEREAL_RAPIDJSON_UINT64_C2
-#define CEREAL_RAPIDJSON_UINT64_C2(high32, low32) ((static_cast<uint64_t>(high32) << 32) | static_cast<uint64_t>(low32))
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-//! Use only lower 48-bit address for some pointers.
-/*!
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-
-    This optimization uses the fact that current X86-64 architecture only implement lower 48-bit virtual address.
-    The higher 16-bit can be used for storing other data.
-    \c GenericValue uses this optimization to reduce its size form 24 bytes to 16 bytes in 64-bit architecture.
-*/
-#ifndef CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
-#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
-#define CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION 1
-#else
-#define CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
-#endif
-#endif // CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION
-
-#if CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION == 1
-#if CEREAL_RAPIDJSON_64BIT != 1
-#error CEREAL_RAPIDJSON_48BITPOINTER_OPTIMIZATION can only be set to 1 when CEREAL_RAPIDJSON_64BIT=1
-#endif
-#define CEREAL_RAPIDJSON_SETPOINTER(type, p, x) (p = reinterpret_cast<type *>((reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(CEREAL_RAPIDJSON_UINT64_C2(0xFFFF0000, 0x00000000))) | reinterpret_cast<uintptr_t>(reinterpret_cast<const void*>(x))))
-#define CEREAL_RAPIDJSON_GETPOINTER(type, p) (reinterpret_cast<type *>(reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(CEREAL_RAPIDJSON_UINT64_C2(0x0000FFFF, 0xFFFFFFFF))))
-#else
-#define CEREAL_RAPIDJSON_SETPOINTER(type, p, x) (p = (x))
-#define CEREAL_RAPIDJSON_GETPOINTER(type, p) (p)
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_SSE2/CEREAL_RAPIDJSON_SSE42/CEREAL_RAPIDJSON_SIMD
-
-/*! \def CEREAL_RAPIDJSON_SIMD
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief Enable SSE2/SSE4.2 optimization.
-
-    RapidJSON supports optimized implementations for some parsing operations
-    based on the SSE2 or SSE4.2 SIMD extensions on modern Intel-compatible
-    processors.
-
-    To enable these optimizations, two different symbols can be defined;
-    \code
-    // Enable SSE2 optimization.
-    #define CEREAL_RAPIDJSON_SSE2
-
-    // Enable SSE4.2 optimization.
-    #define CEREAL_RAPIDJSON_SSE42
-    \endcode
-
-    \c CEREAL_RAPIDJSON_SSE42 takes precedence, if both are defined.
-
-    If any of these symbols is defined, RapidJSON defines the macro
-    \c CEREAL_RAPIDJSON_SIMD to indicate the availability of the optimized code.
-*/
-#if defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42) \
-    || defined(CEREAL_RAPIDJSON_DOXYGEN_RUNNING)
-#define CEREAL_RAPIDJSON_SIMD
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
-
-#ifndef CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
-/*! \def CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief User-provided \c SizeType definition.
-
-    In order to avoid using 32-bit size types for indexing strings and arrays,
-    define this preprocessor symbol and provide the type rapidjson::SizeType
-    before including RapidJSON:
-    \code
-    #define CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
-    namespace rapidjson { typedef ::std::size_t SizeType; }
-    #include "rapidjson/..."
-    \endcode
-
-    \see rapidjson::SizeType
-*/
-#ifdef CEREAL_RAPIDJSON_DOXYGEN_RUNNING
-#define CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE
-#endif
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-//! Size type (for string lengths, array sizes, etc.)
-/*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,
-    instead of using \c size_t. Users may override the SizeType by defining
-    \ref CEREAL_RAPIDJSON_NO_SIZETYPEDEFINE.
-*/
-typedef unsigned SizeType;
-CEREAL_RAPIDJSON_NAMESPACE_END
-#endif
-
-// always import std::size_t to rapidjson namespace
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-using std::size_t;
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_ASSERT
-
-//! Assertion.
-/*! \ingroup CEREAL_RAPIDJSON_CONFIG
-    By default, rapidjson uses C \c assert() for internal assertions.
-    User can override it by defining CEREAL_RAPIDJSON_ASSERT(x) macro.
-
-    \note Parsing errors are handled and can be customized by the
-          \ref CEREAL_RAPIDJSON_ERRORS APIs.
-*/
-#ifndef CEREAL_RAPIDJSON_ASSERT
-#include <cassert>
-#define CEREAL_RAPIDJSON_ASSERT(x) assert(x)
-#endif // CEREAL_RAPIDJSON_ASSERT
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_STATIC_ASSERT
-
-// Adopt from boost
-#ifndef CEREAL_RAPIDJSON_STATIC_ASSERT
-#ifndef __clang__
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#endif
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-template <bool x> struct STATIC_ASSERTION_FAILURE;
-template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };
-template<int x> struct StaticAssertTest {};
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#define CEREAL_RAPIDJSON_JOIN(X, Y) CEREAL_RAPIDJSON_DO_JOIN(X, Y)
-#define CEREAL_RAPIDJSON_DO_JOIN(X, Y) CEREAL_RAPIDJSON_DO_JOIN2(X, Y)
-#define CEREAL_RAPIDJSON_DO_JOIN2(X, Y) X##Y
-
-#if defined(__GNUC__)
-#define CEREAL_RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#define CEREAL_RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 
-#endif
-#ifndef __clang__
-//!@endcond
-#endif
-
-/*! \def CEREAL_RAPIDJSON_STATIC_ASSERT
-    \brief (Internal) macro to check for conditions at compile-time
-    \param x compile-time condition
-    \hideinitializer
- */
-#define CEREAL_RAPIDJSON_STATIC_ASSERT(x) \
-    typedef ::CEREAL_RAPIDJSON_NAMESPACE::StaticAssertTest< \
-      sizeof(::CEREAL_RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \
-    CEREAL_RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) CEREAL_RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_LIKELY, CEREAL_RAPIDJSON_UNLIKELY
-
-//! Compiler branching hint for expression with high probability to be true.
-/*!
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \param x Boolean expression likely to be true.
-*/
-#ifndef CEREAL_RAPIDJSON_LIKELY
-#if defined(__GNUC__) || defined(__clang__)
-#define CEREAL_RAPIDJSON_LIKELY(x) __builtin_expect(!!(x), 1)
-#else
-#define CEREAL_RAPIDJSON_LIKELY(x) (x)
-#endif
-#endif
-
-//! Compiler branching hint for expression with low probability to be true.
-/*!
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \param x Boolean expression unlikely to be true.
-*/
-#ifndef CEREAL_RAPIDJSON_UNLIKELY
-#if defined(__GNUC__) || defined(__clang__)
-#define CEREAL_RAPIDJSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-#define CEREAL_RAPIDJSON_UNLIKELY(x) (x)
-#endif
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Helpers
-
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-
-#define CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN do {  
-#define CEREAL_RAPIDJSON_MULTILINEMACRO_END \
-} while((void)0, 0)
-
-// adopted from Boost
-#define CEREAL_RAPIDJSON_VERSION_CODE(x,y,z) \
-  (((x)*100000) + ((y)*100) + (z))
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_DIAG_PUSH/POP, CEREAL_RAPIDJSON_DIAG_OFF
-
-#if defined(__GNUC__)
-#define CEREAL_RAPIDJSON_GNUC \
-    CEREAL_RAPIDJSON_VERSION_CODE(__GNUC__,__GNUC_MINOR__,__GNUC_PATCHLEVEL__)
-#endif
-
-#if defined(__clang__) || (defined(CEREAL_RAPIDJSON_GNUC) && CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,2,0))
-
-#define CEREAL_RAPIDJSON_PRAGMA(x) _Pragma(CEREAL_RAPIDJSON_STRINGIFY(x))
-#define CEREAL_RAPIDJSON_DIAG_PRAGMA(x) CEREAL_RAPIDJSON_PRAGMA(GCC diagnostic x)
-#define CEREAL_RAPIDJSON_DIAG_OFF(x) \
-    CEREAL_RAPIDJSON_DIAG_PRAGMA(ignored CEREAL_RAPIDJSON_STRINGIFY(CEREAL_RAPIDJSON_JOIN(-W,x)))
-
-// push/pop support in Clang and GCC>=4.6
-#if defined(__clang__) || (defined(CEREAL_RAPIDJSON_GNUC) && CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,6,0))
-#define CEREAL_RAPIDJSON_DIAG_PUSH CEREAL_RAPIDJSON_DIAG_PRAGMA(push)
-#define CEREAL_RAPIDJSON_DIAG_POP  CEREAL_RAPIDJSON_DIAG_PRAGMA(pop)
-#else // GCC >= 4.2, < 4.6
-#define CEREAL_RAPIDJSON_DIAG_PUSH /* ignored */
-#define CEREAL_RAPIDJSON_DIAG_POP /* ignored */
-#endif
-
-#elif defined(_MSC_VER)
-
-// pragma (MSVC specific)
-#define CEREAL_RAPIDJSON_PRAGMA(x) __pragma(x)
-#define CEREAL_RAPIDJSON_DIAG_PRAGMA(x) CEREAL_RAPIDJSON_PRAGMA(warning(x))
-
-#define CEREAL_RAPIDJSON_DIAG_OFF(x) CEREAL_RAPIDJSON_DIAG_PRAGMA(disable: x)
-#define CEREAL_RAPIDJSON_DIAG_PUSH CEREAL_RAPIDJSON_DIAG_PRAGMA(push)
-#define CEREAL_RAPIDJSON_DIAG_POP  CEREAL_RAPIDJSON_DIAG_PRAGMA(pop)
-
-#else
-
-#define CEREAL_RAPIDJSON_DIAG_OFF(x) /* ignored */
-#define CEREAL_RAPIDJSON_DIAG_PUSH   /* ignored */
-#define CEREAL_RAPIDJSON_DIAG_POP    /* ignored */
-
-#endif // CEREAL_RAPIDJSON_DIAG_*
-
-///////////////////////////////////////////////////////////////////////////////
-// C++11 features
-
-#ifndef CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#if defined(__clang__)
-#if __has_feature(cxx_rvalue_references) && \
-    (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)
-#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
-#else
-#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
-#endif
-#elif (defined(CEREAL_RAPIDJSON_GNUC) && (CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1600)
-
-#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 1
-#else
-#define CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS 0
-#endif
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-
-#ifndef CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT
-#if defined(__clang__)
-#define CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT __has_feature(cxx_noexcept)
-#elif (defined(CEREAL_RAPIDJSON_GNUC) && (CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,6,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__))
-//    (defined(_MSC_VER) && _MSC_VER >= ????) // not yet supported
-#define CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT 1
-#else
-#define CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT 0
-#endif
-#endif
-#if CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT
-#define CEREAL_RAPIDJSON_NOEXCEPT noexcept
-#else
-#define CEREAL_RAPIDJSON_NOEXCEPT /* noexcept */
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_NOEXCEPT
-
-// no automatic detection, yet
-#ifndef CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS
-#define CEREAL_RAPIDJSON_HAS_CXX11_TYPETRAITS 0
-#endif
-
-#ifndef CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
-#if defined(__clang__)
-#define CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR __has_feature(cxx_range_for)
-#elif (defined(CEREAL_RAPIDJSON_GNUC) && (CEREAL_RAPIDJSON_GNUC >= CEREAL_RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
-      (defined(_MSC_VER) && _MSC_VER >= 1700)
-#define CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR 1
-#else
-#define CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR 0
-#endif
-#endif // CEREAL_RAPIDJSON_HAS_CXX11_RANGE_FOR
-
-//!@endcond
-
-///////////////////////////////////////////////////////////////////////////////
-// new/delete
-
-#ifndef CEREAL_RAPIDJSON_NEW
-///! customization point for global \c new
-#define CEREAL_RAPIDJSON_NEW(x) new x
-#endif
-#ifndef CEREAL_RAPIDJSON_DELETE
-///! customization point for global \c delete
-#define CEREAL_RAPIDJSON_DELETE(x) delete x
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-// Type
-
-/*! \namespace rapidjson
-    \brief main RapidJSON namespace
-    \see CEREAL_RAPIDJSON_NAMESPACE
-*/
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Type of JSON value
-enum Type {
-    kNullType = 0,      //!< null
-    kFalseType = 1,     //!< false
-    kTrueType = 2,      //!< true
-    kObjectType = 3,    //!< object
-    kArrayType = 4,     //!< array 
-    kStringType = 5,    //!< string
-    kNumberType = 6     //!< number
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/reader.h b/Src/External/cereal/include/cereal/external/rapidjson/reader.h
deleted file mode 100644
index ad8ff33..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/reader.h
+++ /dev/null
@@ -1,1879 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-//
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_READER_H_
-#define CEREAL_RAPIDJSON_READER_H_
-
-/*! \file reader.h */
-
-#include "allocators.h"
-#include "stream.h"
-#include "encodedstream.h"
-#include "internal/meta.h"
-#include "internal/stack.h"
-#include "internal/strtod.h"
-#include <limits>
-
-#if defined(CEREAL_RAPIDJSON_SIMD) && defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-#ifdef CEREAL_RAPIDJSON_SSE42
-#include <nmmintrin.h>
-#elif defined(CEREAL_RAPIDJSON_SSE2)
-#include <emmintrin.h>
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(4127)  // conditional expression is constant
-CEREAL_RAPIDJSON_DIAG_OFF(4702)  // unreachable code
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(old-style-cast)
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-CEREAL_RAPIDJSON_DIAG_OFF(switch-enum)
-#endif
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define CEREAL_RAPIDJSON_NOTHING /* deliberately empty */
-#ifndef CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN
-#define CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(value) \
-    CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN \
-    if (CEREAL_RAPIDJSON_UNLIKELY(HasParseError())) { return value; } \
-    CEREAL_RAPIDJSON_MULTILINEMACRO_END
-#endif
-#define CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID \
-    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(CEREAL_RAPIDJSON_NOTHING)
-//!@endcond
-
-/*! \def CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN
-    \ingroup CEREAL_RAPIDJSON_ERRORS
-    \brief Macro to indicate a parse error.
-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
-    \param offset  position of the error in JSON input (\c size_t)
-
-    This macros can be used as a customization point for the internal
-    error handling mechanism of RapidJSON.
-
-    A common usage model is to throw an exception instead of requiring the
-    caller to explicitly check the \ref rapidjson::GenericReader::Parse's
-    return value:
-
-    \code
-    #define CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode,offset) \
-       throw ParseException(parseErrorCode, #parseErrorCode, offset)
-
-    #include <stdexcept>               // std::runtime_error
-    #include "rapidjson/error/error.h" // rapidjson::ParseResult
-
-    struct ParseException : std::runtime_error, rapidjson::ParseResult {
-      ParseException(rapidjson::ParseErrorCode code, const char* msg, size_t offset)
-        : std::runtime_error(msg), ParseResult(code, offset) {}
-    };
-
-    #include "rapidjson/reader.h"
-    \endcode
-
-    \see CEREAL_RAPIDJSON_PARSE_ERROR, rapidjson::GenericReader::Parse
- */
-#ifndef CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN
-#define CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset) \
-    CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN \
-    CEREAL_RAPIDJSON_ASSERT(!HasParseError()); /* Error can only be assigned once */ \
-    SetParseError(parseErrorCode, offset); \
-    CEREAL_RAPIDJSON_MULTILINEMACRO_END
-#endif
-
-/*! \def CEREAL_RAPIDJSON_PARSE_ERROR
-    \ingroup CEREAL_RAPIDJSON_ERRORS
-    \brief (Internal) macro to indicate and handle a parse error.
-    \param parseErrorCode \ref rapidjson::ParseErrorCode of the error
-    \param offset  position of the error in JSON input (\c size_t)
-
-    Invokes CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN and stops the parsing.
-
-    \see CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN
-    \hideinitializer
- */
-#ifndef CEREAL_RAPIDJSON_PARSE_ERROR
-#define CEREAL_RAPIDJSON_PARSE_ERROR(parseErrorCode, offset) \
-    CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN \
-    CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(parseErrorCode, offset); \
-    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID; \
-    CEREAL_RAPIDJSON_MULTILINEMACRO_END
-#endif
-
-#include "error/error.h" // ParseErrorCode, ParseResult
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// ParseFlag
-
-/*! \def CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief User-defined kParseDefaultFlags definition.
-
-    User can define this as any \c ParseFlag combinations.
-*/
-#ifndef CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS
-#define CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS kParseNoFlags
-#endif
-
-//! Combination of parseFlags
-/*! \see Reader::Parse, Document::Parse, Document::ParseInsitu, Document::ParseStream
- */
-enum ParseFlag {
-    kParseNoFlags = 0,              //!< No flags are set.
-    kParseInsituFlag = 1,           //!< In-situ(destructive) parsing.
-    kParseValidateEncodingFlag = 2, //!< Validate encoding of JSON strings.
-    kParseIterativeFlag = 4,        //!< Iterative(constant complexity in terms of function call stack size) parsing.
-    kParseStopWhenDoneFlag = 8,     //!< After parsing a complete JSON root from stream, stop further processing the rest of stream. When this flag is used, parser will not generate kParseErrorDocumentRootNotSingular error.
-    kParseFullPrecisionFlag = 16,   //!< Parse number in full precision (but slower).
-    kParseCommentsFlag = 32,        //!< Allow one-line (//) and multi-line (/**/) comments.
-    kParseNumbersAsStringsFlag = 64,    //!< Parse all numbers (ints/doubles) as strings.
-    kParseTrailingCommasFlag = 128, //!< Allow trailing commas at the end of objects and arrays.
-    kParseNanAndInfFlag = 256,      //!< Allow parsing NaN, Inf, Infinity, -Inf and -Infinity as doubles.
-    kParseDefaultFlags = CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS  //!< Default parse flags. Can be customized by defining CEREAL_RAPIDJSON_PARSE_DEFAULT_FLAGS
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Handler
-
-/*! \class rapidjson::Handler
-    \brief Concept for receiving events from GenericReader upon parsing.
-    The functions return true if no error occurs. If they return false,
-    the event publisher should terminate the process.
-\code
-concept Handler {
-    typename Ch;
-
-    bool Null();
-    bool Bool(bool b);
-    bool Int(int i);
-    bool Uint(unsigned i);
-    bool Int64(int64_t i);
-    bool Uint64(uint64_t i);
-    bool Double(double d);
-    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
-    bool RawNumber(const Ch* str, SizeType length, bool copy);
-    bool String(const Ch* str, SizeType length, bool copy);
-    bool StartObject();
-    bool Key(const Ch* str, SizeType length, bool copy);
-    bool EndObject(SizeType memberCount);
-    bool StartArray();
-    bool EndArray(SizeType elementCount);
-};
-\endcode
-*/
-///////////////////////////////////////////////////////////////////////////////
-// BaseReaderHandler
-
-//! Default implementation of Handler.
-/*! This can be used as base class of any reader handler.
-    \note implements Handler concept
-*/
-template<typename Encoding = UTF8<>, typename Derived = void>
-struct BaseReaderHandler {
-    typedef typename Encoding::Ch Ch;
-
-    typedef typename internal::SelectIf<internal::IsSame<Derived, void>, BaseReaderHandler, Derived>::Type Override;
-
-    bool Default() { return true; }
-    bool Null() { return static_cast<Override&>(*this).Default(); }
-    bool Bool(bool) { return static_cast<Override&>(*this).Default(); }
-    bool Int(int) { return static_cast<Override&>(*this).Default(); }
-    bool Uint(unsigned) { return static_cast<Override&>(*this).Default(); }
-    bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Double(double) { return static_cast<Override&>(*this).Default(); }
-    /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
-    bool RawNumber(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
-    bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
-    bool StartObject() { return static_cast<Override&>(*this).Default(); }
-    bool Key(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
-    bool EndObject(SizeType) { return static_cast<Override&>(*this).Default(); }
-    bool StartArray() { return static_cast<Override&>(*this).Default(); }
-    bool EndArray(SizeType) { return static_cast<Override&>(*this).Default(); }
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// StreamLocalCopy
-
-namespace internal {
-
-template<typename Stream, int = StreamTraits<Stream>::copyOptimization>
-class StreamLocalCopy;
-
-//! Do copy optimization.
-template<typename Stream>
-class StreamLocalCopy<Stream, 1> {
-public:
-    StreamLocalCopy(Stream& original) : s(original), original_(original) {}
-    ~StreamLocalCopy() { original_ = s; }
-
-    Stream s;
-
-private:
-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
-
-    Stream& original_;
-};
-
-//! Keep reference.
-template<typename Stream>
-class StreamLocalCopy<Stream, 0> {
-public:
-    StreamLocalCopy(Stream& original) : s(original) {}
-
-    Stream& s;
-
-private:
-    StreamLocalCopy& operator=(const StreamLocalCopy&) /* = delete */;
-};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// SkipWhitespace
-
-//! Skip the JSON white spaces in a stream.
-/*! \param is A input stream for skipping white spaces.
-    \note This function has SSE2/SSE4.2 specialization.
-*/
-template<typename InputStream>
-void SkipWhitespace(InputStream& is) {
-    internal::StreamLocalCopy<InputStream> copy(is);
-    InputStream& s(copy.s);
-
-    typename InputStream::Ch c;
-    while ((c = s.Peek()) == ' ' || c == '\n' || c == '\r' || c == '\t')
-        s.Take();
-}
-
-inline const char* SkipWhitespace(const char* p, const char* end) {
-    while (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    return p;
-}
-
-#ifdef CEREAL_RAPIDJSON_SSE42
-//! Skip whitespace with SSE 4.2 pcmpistrm instruction, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    // The rest of string using SIMD
-    static const char whitespace[16] = " \n\r\t";
-    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
-
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        const int r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
-        if (r != 0) {   // some of characters is non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    // The middle of string using SIMD
-    static const char whitespace[16] = " \n\r\t";
-    const __m128i w = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespace[0]));
-
-    for (; p <= end - 16; p += 16) {
-        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
-        const int r = _mm_cvtsi128_si32(_mm_cmpistrm(w, s, _SIDD_UBYTE_OPS | _SIDD_CMP_EQUAL_ANY | _SIDD_BIT_MASK | _SIDD_NEGATIVE_POLARITY));
-        if (r != 0) {   // some of characters is non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#elif defined(CEREAL_RAPIDJSON_SSE2)
-
-//! Skip whitespace with SSE2 instructions, testing 16 8-byte characters at once.
-inline const char *SkipWhitespace_SIMD(const char* p) {
-    // Fast return for single non-whitespace
-    if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-        ++p;
-    else
-        return p;
-
-    // 16-byte align to the next boundary
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    while (p != nextAligned)
-        if (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t')
-            ++p;
-        else
-            return p;
-
-    // The rest of string
-    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
-    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
-    #undef C16
-
-    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
-    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
-    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
-    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
-
-    for (;; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        __m128i x = _mm_cmpeq_epi8(s, w0);
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
-        if (r != 0) {   // some of characters may be non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-}
-
-inline const char *SkipWhitespace_SIMD(const char* p, const char* end) {
-    // Fast return for single non-whitespace
-    if (p != end && (*p == ' ' || *p == '\n' || *p == '\r' || *p == '\t'))
-        ++p;
-    else
-        return p;
-
-    // The rest of string
-    #define C16(c) { c, c, c, c, c, c, c, c, c, c, c, c, c, c, c, c }
-    static const char whitespaces[4][16] = { C16(' '), C16('\n'), C16('\r'), C16('\t') };
-    #undef C16
-
-    const __m128i w0 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[0][0]));
-    const __m128i w1 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[1][0]));
-    const __m128i w2 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[2][0]));
-    const __m128i w3 = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&whitespaces[3][0]));
-
-    for (; p <= end - 16; p += 16) {
-        const __m128i s = _mm_loadu_si128(reinterpret_cast<const __m128i *>(p));
-        __m128i x = _mm_cmpeq_epi8(s, w0);
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w1));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w2));
-        x = _mm_or_si128(x, _mm_cmpeq_epi8(s, w3));
-        unsigned short r = static_cast<unsigned short>(~_mm_movemask_epi8(x));
-        if (r != 0) {   // some of characters may be non-whitespace
-#ifdef _MSC_VER         // Find the index of first non-whitespace
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            return p + offset;
-#else
-            return p + __builtin_ffs(r) - 1;
-#endif
-        }
-    }
-
-    return SkipWhitespace(p, end);
-}
-
-#endif // CEREAL_RAPIDJSON_SSE2
-
-#ifdef CEREAL_RAPIDJSON_SIMD
-//! Template function specialization for InsituStringStream
-template<> inline void SkipWhitespace(InsituStringStream& is) {
-    is.src_ = const_cast<char*>(SkipWhitespace_SIMD(is.src_));
-}
-
-//! Template function specialization for StringStream
-template<> inline void SkipWhitespace(StringStream& is) {
-    is.src_ = SkipWhitespace_SIMD(is.src_);
-}
-
-template<> inline void SkipWhitespace(EncodedInputStream<UTF8<>, MemoryStream>& is) {
-    is.is_.src_ = SkipWhitespace_SIMD(is.is_.src_, is.is_.end_);
-}
-#endif // CEREAL_RAPIDJSON_SIMD
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericReader
-
-//! SAX-style JSON parser. Use \ref Reader for UTF8 encoding and default allocator.
-/*! GenericReader parses JSON text from a stream, and send events synchronously to an
-    object implementing Handler concept.
-
-    It needs to allocate a stack for storing a single decoded string during
-    non-destructive parsing.
-
-    For in-situ parsing, the decoded string is directly written to the source
-    text string, no temporary buffer is required.
-
-    A GenericReader object can be reused for parsing multiple JSON text.
-
-    \tparam SourceEncoding Encoding of the input stream.
-    \tparam TargetEncoding Encoding of the parse output.
-    \tparam StackAllocator Allocator type for stack.
-*/
-template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator = CrtAllocator>
-class GenericReader {
-public:
-    typedef typename SourceEncoding::Ch Ch; //!< SourceEncoding character type
-
-    //! Constructor.
-    /*! \param stackAllocator Optional allocator for allocating stack memory. (Only use for non-destructive parsing)
-        \param stackCapacity stack capacity in bytes for storing a single decoded string.  (Only use for non-destructive parsing)
-    */
-    GenericReader(StackAllocator* stackAllocator = 0, size_t stackCapacity = kDefaultStackCapacity) : stack_(stackAllocator, stackCapacity), parseResult_() {}
-
-    //! Parse JSON text.
-    /*! \tparam parseFlags Combination of \ref ParseFlag.
-        \tparam InputStream Type of input stream, implementing Stream concept.
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-    */
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    ParseResult Parse(InputStream& is, Handler& handler) {
-        if (parseFlags & kParseIterativeFlag)
-            return IterativeParse<parseFlags>(is, handler);
-
-        parseResult_.Clear();
-
-        ClearStackOnExit scope(*this);
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-        if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() == '\0')) {
-            CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentEmpty, is.Tell());
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        }
-        else {
-            ParseValue<parseFlags>(is, handler);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-            if (!(parseFlags & kParseStopWhenDoneFlag)) {
-                SkipWhitespaceAndComments<parseFlags>(is);
-                CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-
-                if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() != '\0')) {
-                    CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorDocumentRootNotSingular, is.Tell());
-                    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-                }
-            }
-        }
-
-        return parseResult_;
-    }
-
-    //! Parse JSON text (with \ref kParseDefaultFlags)
-    /*! \tparam InputStream Type of input stream, implementing Stream concept
-        \tparam Handler Type of handler, implementing Handler concept.
-        \param is Input stream to be parsed.
-        \param handler The handler to receive events.
-        \return Whether the parsing is successful.
-    */
-    template <typename InputStream, typename Handler>
-    ParseResult Parse(InputStream& is, Handler& handler) {
-        return Parse<kParseDefaultFlags>(is, handler);
-    }
-
-    //! Whether a parse error has occured in the last parsing.
-    bool HasParseError() const { return parseResult_.IsError(); }
-
-    //! Get the \ref ParseErrorCode of last parsing.
-    ParseErrorCode GetParseErrorCode() const { return parseResult_.Code(); }
-
-    //! Get the position of last parsing error in input, 0 otherwise.
-    size_t GetErrorOffset() const { return parseResult_.Offset(); }
-
-protected:
-    void SetParseError(ParseErrorCode code, size_t offset) { parseResult_.Set(code, offset); }
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    GenericReader(const GenericReader&);
-    GenericReader& operator=(const GenericReader&);
-
-    void ClearStack() { stack_.Clear(); }
-
-    // clear stack on any exit from ParseStream, e.g. due to exception
-    struct ClearStackOnExit {
-        explicit ClearStackOnExit(GenericReader& r) : r_(r) {}
-        ~ClearStackOnExit() { r_.ClearStack(); }
-    private:
-        GenericReader& r_;
-        ClearStackOnExit(const ClearStackOnExit&);
-        ClearStackOnExit& operator=(const ClearStackOnExit&);
-    };
-
-    template<unsigned parseFlags, typename InputStream>
-    void SkipWhitespaceAndComments(InputStream& is) {
-        SkipWhitespace(is);
-
-        if (parseFlags & kParseCommentsFlag) {
-            while (CEREAL_RAPIDJSON_UNLIKELY(Consume(is, '/'))) {
-                if (Consume(is, '*')) {
-                    while (true) {
-                        if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() == '\0'))
-                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-                        else if (Consume(is, '*')) {
-                            if (Consume(is, '/'))
-                                break;
-                        }
-                        else
-                            is.Take();
-                    }
-                }
-                else if (CEREAL_RAPIDJSON_LIKELY(Consume(is, '/')))
-                    while (is.Peek() != '\0' && is.Take() != '\n');
-                else
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorUnspecificSyntaxError, is.Tell());
-
-                SkipWhitespace(is);
-            }
-        }
-    }
-
-    // Parse object: { string : value, ... }
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseObject(InputStream& is, Handler& handler) {
-        CEREAL_RAPIDJSON_ASSERT(is.Peek() == '{');
-        is.Take();  // Skip '{'
-
-        if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartObject()))
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-        if (Consume(is, '}')) {
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndObject(0)))  // empty object
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-            return;
-        }
-
-        for (SizeType memberCount = 0;;) {
-            if (CEREAL_RAPIDJSON_UNLIKELY(is.Peek() != '"'))
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell());
-
-            ParseString<parseFlags>(is, handler, true);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            if (CEREAL_RAPIDJSON_UNLIKELY(!Consume(is, ':')))
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell());
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ParseValue<parseFlags>(is, handler);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ++memberCount;
-
-            switch (is.Peek()) {
-                case ',':
-                    is.Take();
-                    SkipWhitespaceAndComments<parseFlags>(is);
-                    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    break;
-                case '}':
-                    is.Take();
-                    if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
-                        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    return;
-                default:
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); break; // This useless break is only for making warning and coverage happy
-            }
-
-            if (parseFlags & kParseTrailingCommasFlag) {
-                if (is.Peek() == '}') {
-                    if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndObject(memberCount)))
-                        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    is.Take();
-                    return;
-                }
-            }
-        }
-    }
-
-    // Parse array: [ value, ... ]
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseArray(InputStream& is, Handler& handler) {
-        CEREAL_RAPIDJSON_ASSERT(is.Peek() == '[');
-        is.Take();  // Skip '['
-
-        if (CEREAL_RAPIDJSON_UNLIKELY(!handler.StartArray()))
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-        if (Consume(is, ']')) {
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndArray(0))) // empty array
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-            return;
-        }
-
-        for (SizeType elementCount = 0;;) {
-            ParseValue<parseFlags>(is, handler);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            ++elementCount;
-            SkipWhitespaceAndComments<parseFlags>(is);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-
-            if (Consume(is, ',')) {
-                SkipWhitespaceAndComments<parseFlags>(is);
-                CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            }
-            else if (Consume(is, ']')) {
-                if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                return;
-            }
-            else
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell());
-
-            if (parseFlags & kParseTrailingCommasFlag) {
-                if (is.Peek() == ']') {
-                    if (CEREAL_RAPIDJSON_UNLIKELY(!handler.EndArray(elementCount)))
-                        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-                    is.Take();
-                    return;
-                }
-            }
-        }
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseNull(InputStream& is, Handler& handler) {
-        CEREAL_RAPIDJSON_ASSERT(is.Peek() == 'n');
-        is.Take();
-
-        if (CEREAL_RAPIDJSON_LIKELY(Consume(is, 'u') && Consume(is, 'l') && Consume(is, 'l'))) {
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Null()))
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseTrue(InputStream& is, Handler& handler) {
-        CEREAL_RAPIDJSON_ASSERT(is.Peek() == 't');
-        is.Take();
-
-        if (CEREAL_RAPIDJSON_LIKELY(Consume(is, 'r') && Consume(is, 'u') && Consume(is, 'e'))) {
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Bool(true)))
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseFalse(InputStream& is, Handler& handler) {
-        CEREAL_RAPIDJSON_ASSERT(is.Peek() == 'f');
-        is.Take();
-
-        if (CEREAL_RAPIDJSON_LIKELY(Consume(is, 'a') && Consume(is, 'l') && Consume(is, 's') && Consume(is, 'e'))) {
-            if (CEREAL_RAPIDJSON_UNLIKELY(!handler.Bool(false)))
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, is.Tell());
-        }
-        else
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell());
-    }
-
-    template<typename InputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE static bool Consume(InputStream& is, typename InputStream::Ch expect) {
-        if (CEREAL_RAPIDJSON_LIKELY(is.Peek() == expect)) {
-            is.Take();
-            return true;
-        }
-        else
-            return false;
-    }
-
-    // Helper function to parse four hexidecimal digits in \uXXXX in ParseString().
-    template<typename InputStream>
-    unsigned ParseHex4(InputStream& is, size_t escapeOffset) {
-        unsigned codepoint = 0;
-        for (int i = 0; i < 4; i++) {
-            Ch c = is.Peek();
-            codepoint <<= 4;
-            codepoint += static_cast<unsigned>(c);
-            if (c >= '0' && c <= '9')
-                codepoint -= '0';
-            else if (c >= 'A' && c <= 'F')
-                codepoint -= 'A' - 10;
-            else if (c >= 'a' && c <= 'f')
-                codepoint -= 'a' - 10;
-            else {
-                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorStringUnicodeEscapeInvalidHex, escapeOffset);
-                CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(0);
-            }
-            is.Take();
-        }
-        return codepoint;
-    }
-
-    template <typename CharType>
-    class StackStream {
-    public:
-        typedef CharType Ch;
-
-        StackStream(internal::Stack<StackAllocator>& stack) : stack_(stack), length_(0) {}
-        CEREAL_RAPIDJSON_FORCEINLINE void Put(Ch c) {
-            *stack_.template Push<Ch>() = c;
-            ++length_;
-        }
-
-        CEREAL_RAPIDJSON_FORCEINLINE void* Push(SizeType count) {
-            length_ += count;
-            return stack_.template Push<Ch>(count);
-        }
-
-        size_t Length() const { return length_; }
-
-        Ch* Pop() {
-            return stack_.template Pop<Ch>(length_);
-        }
-
-    private:
-        StackStream(const StackStream&);
-        StackStream& operator=(const StackStream&);
-
-        internal::Stack<StackAllocator>& stack_;
-        SizeType length_;
-    };
-
-    // Parse string and generate String event. Different code paths for kParseInsituFlag.
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseString(InputStream& is, Handler& handler, bool isKey = false) {
-        internal::StreamLocalCopy<InputStream> copy(is);
-        InputStream& s(copy.s);
-
-        CEREAL_RAPIDJSON_ASSERT(s.Peek() == '\"');
-        s.Take();  // Skip '\"'
-
-        bool success = false;
-        if (parseFlags & kParseInsituFlag) {
-            typename InputStream::Ch *head = s.PutBegin();
-            ParseStringToStream<parseFlags, SourceEncoding, SourceEncoding>(s, s);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            size_t length = s.PutEnd(head) - 1;
-            CEREAL_RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-            const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
-            success = (isKey ? handler.Key(str, SizeType(length), false) : handler.String(str, SizeType(length), false));
-        }
-        else {
-            StackStream<typename TargetEncoding::Ch> stackStream(stack_);
-            ParseStringToStream<parseFlags, SourceEncoding, TargetEncoding>(s, stackStream);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-            SizeType length = static_cast<SizeType>(stackStream.Length()) - 1;
-            const typename TargetEncoding::Ch* const str = stackStream.Pop();
-            success = (isKey ? handler.Key(str, length, true) : handler.String(str, length, true));
-        }
-        if (CEREAL_RAPIDJSON_UNLIKELY(!success))
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, s.Tell());
-    }
-
-    // Parse string to an output is
-    // This function handles the prefix/suffix double quotes, escaping, and optional encoding validation.
-    template<unsigned parseFlags, typename SEncoding, typename TEncoding, typename InputStream, typename OutputStream>
-    CEREAL_RAPIDJSON_FORCEINLINE void ParseStringToStream(InputStream& is, OutputStream& os) {
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        static const char escape[256] = {
-            Z16, Z16, 0, 0,'\"', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'/',
-            Z16, Z16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,'\\', 0, 0, 0,
-            0, 0,'\b', 0, 0, 0,'\f', 0, 0, 0, 0, 0, 0, 0,'\n', 0,
-            0, 0,'\r', 0,'\t', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16
-        };
-#undef Z16
-//!@endcond
-
-        for (;;) {
-            // Scan and copy string before "\\\"" or < 0x20. This is an optional optimzation.
-            if (!(parseFlags & kParseValidateEncodingFlag))
-                ScanCopyUnescapedString(is, os);
-
-            Ch c = is.Peek();
-            if (CEREAL_RAPIDJSON_UNLIKELY(c == '\\')) {    // Escape
-                size_t escapeOffset = is.Tell();    // For invalid escaping, report the inital '\\' as error offset
-                is.Take();
-                Ch e = is.Peek();
-                if ((sizeof(Ch) == 1 || unsigned(e) < 256) && CEREAL_RAPIDJSON_LIKELY(escape[static_cast<unsigned char>(e)])) {
-                    is.Take();
-                    os.Put(static_cast<typename TEncoding::Ch>(escape[static_cast<unsigned char>(e)]));
-                }
-                else if (CEREAL_RAPIDJSON_LIKELY(e == 'u')) {    // Unicode
-                    is.Take();
-                    unsigned codepoint = ParseHex4(is, escapeOffset);
-                    CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                    if (CEREAL_RAPIDJSON_UNLIKELY(codepoint >= 0xD800 && codepoint <= 0xDBFF)) {
-                        // Handle UTF-16 surrogate pair
-                        if (CEREAL_RAPIDJSON_UNLIKELY(!Consume(is, '\\') || !Consume(is, 'u')))
-                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
-                        unsigned codepoint2 = ParseHex4(is, escapeOffset);
-                        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN_VOID;
-                        if (CEREAL_RAPIDJSON_UNLIKELY(codepoint2 < 0xDC00 || codepoint2 > 0xDFFF))
-                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringUnicodeSurrogateInvalid, escapeOffset);
-                        codepoint = (((codepoint - 0xD800) << 10) | (codepoint2 - 0xDC00)) + 0x10000;
-                    }
-                    TEncoding::Encode(os, codepoint);
-                }
-                else
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, escapeOffset);
-            }
-            else if (CEREAL_RAPIDJSON_UNLIKELY(c == '"')) {    // Closing double quote
-                is.Take();
-                os.Put('\0');   // null-terminate the string
-                return;
-            }
-            else if (CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(c) < 0x20)) { // RFC 4627: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF
-                if (c == '\0')
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringMissQuotationMark, is.Tell());
-                else
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringEscapeInvalid, is.Tell());
-            }
-            else {
-                size_t offset = is.Tell();
-                if (CEREAL_RAPIDJSON_UNLIKELY((parseFlags & kParseValidateEncodingFlag ?
-                    !Transcoder<SEncoding, TEncoding>::Validate(is, os) :
-                    !Transcoder<SEncoding, TEncoding>::Transcode(is, os))))
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorStringInvalidEncoding, offset);
-            }
-        }
-    }
-
-    template<typename InputStream, typename OutputStream>
-    static CEREAL_RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InputStream&, OutputStream&) {
-            // Do nothing for generic version
-    }
-
-#if defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42)
-    // StringStream -> StackStream<char>
-    static CEREAL_RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(StringStream& is, StackStream<char>& os) {
-        const char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (CEREAL_RAPIDJSON_UNLIKELY(*p == '\"') || CEREAL_RAPIDJSON_UNLIKELY(*p == '\\') || CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                return;
-            }
-            else
-                os.Put(*p++);
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16]  = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                SizeType length;
-    #ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-    #else
-                length = static_cast<SizeType>(__builtin_ffs(r) - 1);
-    #endif
-                char* q = reinterpret_cast<char*>(os.Push(length));
-                for (size_t i = 0; i < length; i++)
-                    q[i] = p[i];
-
-                p += length;
-                break;
-            }
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(os.Push(16)), s);
-        }
-
-        is.src_ = p;
-    }
-
-    // InsituStringStream -> InsituStringStream
-    static CEREAL_RAPIDJSON_FORCEINLINE void ScanCopyUnescapedString(InsituStringStream& is, InsituStringStream& os) {
-        CEREAL_RAPIDJSON_ASSERT(&is == &os);
-        (void)os;
-
-        if (is.src_ == is.dst_) {
-            SkipUnescapedString(is);
-            return;
-        }
-
-        char* p = is.src_;
-        char *q = is.dst_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        while (p != nextAligned)
-            if (CEREAL_RAPIDJSON_UNLIKELY(*p == '\"') || CEREAL_RAPIDJSON_UNLIKELY(*p == '\\') || CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = p;
-                is.dst_ = q;
-                return;
-            }
-            else
-                *q++ = *p++;
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16] = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16, q += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                size_t length;
-#ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-#else
-                length = static_cast<size_t>(__builtin_ffs(r) - 1);
-#endif
-                for (const char* pend = p + length; p != pend; )
-                    *q++ = *p++;
-                break;
-            }
-            _mm_storeu_si128(reinterpret_cast<__m128i *>(q), s);
-        }
-
-        is.src_ = p;
-        is.dst_ = q;
-    }
-
-    // When read/write pointers are the same for insitu stream, just skip unescaped characters
-    static CEREAL_RAPIDJSON_FORCEINLINE void SkipUnescapedString(InsituStringStream& is) {
-        CEREAL_RAPIDJSON_ASSERT(is.src_ == is.dst_);
-        char* p = is.src_;
-
-        // Scan one by one until alignment (unaligned load may cross page boundary and cause crash)
-        const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-        for (; p != nextAligned; p++)
-            if (CEREAL_RAPIDJSON_UNLIKELY(*p == '\"') || CEREAL_RAPIDJSON_UNLIKELY(*p == '\\') || CEREAL_RAPIDJSON_UNLIKELY(static_cast<unsigned>(*p) < 0x20)) {
-                is.src_ = is.dst_ = p;
-                return;
-            }
-
-        // The rest of string using SIMD
-        static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-        static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-        static const char space[16] = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-        const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-        const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-        const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-        for (;; p += 16) {
-            const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-            const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-            const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-            const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-            const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-            unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-            if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-                size_t length;
-#ifdef _MSC_VER         // Find the index of first escaped
-                unsigned long offset;
-                _BitScanForward(&offset, r);
-                length = offset;
-#else
-                length = static_cast<size_t>(__builtin_ffs(r) - 1);
-#endif
-                p += length;
-                break;
-            }
-        }
-
-        is.src_ = is.dst_ = p;
-    }
-#endif
-
-    template<typename InputStream, bool backup, bool pushOnTake>
-    class NumberStream;
-
-    template<typename InputStream>
-    class NumberStream<InputStream, false, false> {
-    public:
-        typedef typename InputStream::Ch Ch;
-
-        NumberStream(GenericReader& reader, InputStream& s) : is(s) { (void)reader;  }
-        ~NumberStream() {}
-
-        CEREAL_RAPIDJSON_FORCEINLINE Ch Peek() const { return is.Peek(); }
-        CEREAL_RAPIDJSON_FORCEINLINE Ch TakePush() { return is.Take(); }
-        CEREAL_RAPIDJSON_FORCEINLINE Ch Take() { return is.Take(); }
-		  CEREAL_RAPIDJSON_FORCEINLINE void Push(char) {}
-
-        size_t Tell() { return is.Tell(); }
-        size_t Length() { return 0; }
-        const char* Pop() { return 0; }
-
-    protected:
-        NumberStream& operator=(const NumberStream&);
-
-        InputStream& is;
-    };
-
-    template<typename InputStream>
-    class NumberStream<InputStream, true, false> : public NumberStream<InputStream, false, false> {
-        typedef NumberStream<InputStream, false, false> Base;
-    public:
-        NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s), stackStream(reader.stack_) {}
-        ~NumberStream() {}
-
-        CEREAL_RAPIDJSON_FORCEINLINE Ch TakePush() {
-            stackStream.Put(static_cast<char>(Base::is.Peek()));
-            return Base::is.Take();
-        }
-
-        CEREAL_RAPIDJSON_FORCEINLINE void Push(char c) {
-            stackStream.Put(c);
-        }
-
-        size_t Length() { return stackStream.Length(); }
-
-        const char* Pop() {
-            stackStream.Put('\0');
-            return stackStream.Pop();
-        }
-
-    private:
-        StackStream<char> stackStream;
-    };
-
-    template<typename InputStream>
-    class NumberStream<InputStream, true, true> : public NumberStream<InputStream, true, false> {
-        typedef NumberStream<InputStream, true, false> Base;
-    public:
-        NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
-        ~NumberStream() {}
-
-        CEREAL_RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
-    };
-
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseNumber(InputStream& is, Handler& handler) {
-        internal::StreamLocalCopy<InputStream> copy(is);
-        NumberStream<InputStream,
-            ((parseFlags & kParseNumbersAsStringsFlag) != 0) ?
-                ((parseFlags & kParseInsituFlag) == 0) :
-                ((parseFlags & kParseFullPrecisionFlag) != 0),
-            (parseFlags & kParseNumbersAsStringsFlag) != 0 &&
-                (parseFlags & kParseInsituFlag) == 0> s(*this, copy.s);
-
-        size_t startOffset = s.Tell();
-        double d = 0.0;
-        bool useNanOrInf = false;
-
-        // Parse minus
-        bool minus = Consume(s, '-');
-
-        // Parse int: zero / ( digit1-9 *DIGIT )
-        unsigned i = 0;
-        uint64_t i64 = 0;
-        bool use64bit = false;
-        int significandDigit = 0;
-        if (CEREAL_RAPIDJSON_UNLIKELY(s.Peek() == '0')) {
-            i = 0;
-            s.TakePush();
-        }
-        else if (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '1' && s.Peek() <= '9')) {
-            i = static_cast<unsigned>(s.TakePush() - '0');
-
-            if (minus)
-                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (CEREAL_RAPIDJSON_UNLIKELY(i >= 214748364)) { // 2^31 = 2147483648
-                        if (CEREAL_RAPIDJSON_LIKELY(i != 214748364 || s.Peek() > '8')) {
-                            i64 = i;
-                            use64bit = true;
-                            break;
-                        }
-                    }
-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-            else
-                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (CEREAL_RAPIDJSON_UNLIKELY(i >= 429496729)) { // 2^32 - 1 = 4294967295
-                        if (CEREAL_RAPIDJSON_LIKELY(i != 429496729 || s.Peek() > '5')) {
-                            i64 = i;
-                            use64bit = true;
-                            break;
-                        }
-                    }
-                    i = i * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-        }
-        // Parse NaN or Infinity here
-        else if ((parseFlags & kParseNanAndInfFlag) && CEREAL_RAPIDJSON_LIKELY((s.Peek() == 'I' || s.Peek() == 'N'))) {
-            useNanOrInf = true;
-            if (CEREAL_RAPIDJSON_LIKELY(Consume(s, 'N') && Consume(s, 'a') && Consume(s, 'N'))) {
-                d = std::numeric_limits<double>::quiet_NaN();
-            }
-            else if (CEREAL_RAPIDJSON_LIKELY(Consume(s, 'I') && Consume(s, 'n') && Consume(s, 'f'))) {
-                d = (minus ? -std::numeric_limits<double>::infinity() : std::numeric_limits<double>::infinity());
-                if (CEREAL_RAPIDJSON_UNLIKELY(s.Peek() == 'i' && !(Consume(s, 'i') && Consume(s, 'n')
-                                                            && Consume(s, 'i') && Consume(s, 't') && Consume(s, 'y'))))
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-            }
-            else
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-        }
-        else
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, s.Tell());
-
-        // Parse 64bit int
-        bool useDouble = false;
-        if (use64bit) {
-            if (minus)
-                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                     if (CEREAL_RAPIDJSON_UNLIKELY(i64 >= CEREAL_RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC))) // 2^63 = 9223372036854775808
-                        if (CEREAL_RAPIDJSON_LIKELY(i64 != CEREAL_RAPIDJSON_UINT64_C2(0x0CCCCCCC, 0xCCCCCCCC) || s.Peek() > '8')) {
-                            d = static_cast<double>(i64);
-                            useDouble = true;
-                            break;
-                        }
-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-            else
-                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (CEREAL_RAPIDJSON_UNLIKELY(i64 >= CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999))) // 2^64 - 1 = 18446744073709551615
-                        if (CEREAL_RAPIDJSON_LIKELY(i64 != CEREAL_RAPIDJSON_UINT64_C2(0x19999999, 0x99999999) || s.Peek() > '5')) {
-                            d = static_cast<double>(i64);
-                            useDouble = true;
-                            break;
-                        }
-                    i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                    significandDigit++;
-                }
-        }
-
-        // Force double for big integer
-        if (useDouble) {
-            while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                if (CEREAL_RAPIDJSON_UNLIKELY(d >= 1.7976931348623157e307)) // DBL_MAX / 10.0
-                    CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
-                d = d * 10 + (s.TakePush() - '0');
-            }
-        }
-
-        // Parse frac = decimal-point 1*DIGIT
-        int expFrac = 0;
-        size_t decimalPosition;
-        if (Consume(s, '.')) {
-            decimalPosition = s.Length();
-
-            if (CEREAL_RAPIDJSON_UNLIKELY(!(s.Peek() >= '0' && s.Peek() <= '9')))
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissFraction, s.Tell());
-
-            if (!useDouble) {
-#if CEREAL_RAPIDJSON_64BIT
-                // Use i64 to store significand in 64-bit architecture
-                if (!use64bit)
-                    i64 = i;
-
-                while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                    if (i64 > CEREAL_RAPIDJSON_UINT64_C2(0x1FFFFF, 0xFFFFFFFF)) // 2^53 - 1 for fast path
-                        break;
-                    else {
-                        i64 = i64 * 10 + static_cast<unsigned>(s.TakePush() - '0');
-                        --expFrac;
-                        if (i64 != 0)
-                            significandDigit++;
-                    }
-                }
-
-                d = static_cast<double>(i64);
-#else
-                // Use double to store significand in 32-bit architecture
-                d = static_cast<double>(use64bit ? i64 : i);
-#endif
-                useDouble = true;
-            }
-
-            while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                if (significandDigit < 17) {
-                    d = d * 10.0 + (s.TakePush() - '0');
-                    --expFrac;
-                    if (CEREAL_RAPIDJSON_LIKELY(d > 0.0))
-                        significandDigit++;
-                }
-                else
-                    s.TakePush();
-            }
-        }
-        else
-            decimalPosition = s.Length(); // decimal position at the end of integer.
-
-        // Parse exp = e [ minus / plus ] 1*DIGIT
-        int exp = 0;
-        if (Consume(s, 'e') || Consume(s, 'E')) {
-            if (!useDouble) {
-                d = static_cast<double>(use64bit ? i64 : i);
-                useDouble = true;
-            }
-
-            bool expMinus = false;
-            if (Consume(s, '+'))
-                ;
-            else if (Consume(s, '-'))
-                expMinus = true;
-
-            if (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                exp = static_cast<int>(s.Take() - '0');
-                if (expMinus) {
-                    while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
-                        if (exp >= 214748364) {                         // Issue #313: prevent overflow exponent
-                            while (CEREAL_RAPIDJSON_UNLIKELY(s.Peek() >= '0' && s.Peek() <= '9'))  // Consume the rest of exponent
-                                s.Take();
-                        }
-                    }
-                }
-                else {  // positive exp
-                    int maxExp = 308 - expFrac;
-                    while (CEREAL_RAPIDJSON_LIKELY(s.Peek() >= '0' && s.Peek() <= '9')) {
-                        exp = exp * 10 + static_cast<int>(s.Take() - '0');
-                        if (CEREAL_RAPIDJSON_UNLIKELY(exp > maxExp))
-                            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberTooBig, startOffset);
-                    }
-                }
-            }
-            else
-                CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorNumberMissExponent, s.Tell());
-
-            if (expMinus)
-                exp = -exp;
-        }
-
-        // Finish parsing, call event according to the type of number.
-        bool cont = true;
-
-        if (parseFlags & kParseNumbersAsStringsFlag) {
-            if (parseFlags & kParseInsituFlag) {
-                s.Pop();  // Pop stack no matter if it will be used or not.
-                typename InputStream::Ch* head = is.PutBegin();
-                const size_t length = s.Tell() - startOffset;
-                CEREAL_RAPIDJSON_ASSERT(length <= 0xFFFFFFFF);
-                // unable to insert the \0 character here, it will erase the comma after this number
-                const typename TargetEncoding::Ch* const str = reinterpret_cast<typename TargetEncoding::Ch*>(head);
-                cont = handler.RawNumber(str, SizeType(length), false);
-            }
-            else {
-                SizeType numCharsToCopy = static_cast<SizeType>(s.Length());
-                StringStream srcStream(s.Pop());
-                StackStream<typename TargetEncoding::Ch> dstStream(stack_);
-                while (numCharsToCopy--) {
-                    Transcoder<UTF8<>, TargetEncoding>::Transcode(srcStream, dstStream);
-                }
-                dstStream.Put('\0');
-                const typename TargetEncoding::Ch* str = dstStream.Pop();
-                const SizeType length = static_cast<SizeType>(dstStream.Length()) - 1;
-                cont = handler.RawNumber(str, SizeType(length), true);
-            }
-        }
-        else {
-           size_t length = s.Length();
-           const char* decimal = s.Pop();  // Pop stack no matter if it will be used or not.
-
-           if (useDouble) {
-               int p = exp + expFrac;
-               if (parseFlags & kParseFullPrecisionFlag)
-                   d = internal::StrtodFullPrecision(d, p, decimal, length, decimalPosition, exp);
-               else
-                   d = internal::StrtodNormalPrecision(d, p);
-
-               cont = handler.Double(minus ? -d : d);
-           }
-           else if (useNanOrInf) {
-               cont = handler.Double(d);
-           }
-           else {
-               if (use64bit) {
-                   if (minus)
-                       cont = handler.Int64(static_cast<int64_t>(~i64 + 1));
-                   else
-                       cont = handler.Uint64(i64);
-               }
-               else {
-                   if (minus)
-                       cont = handler.Int(static_cast<int32_t>(~i + 1));
-                   else
-                       cont = handler.Uint(i);
-               }
-           }
-        }
-        if (CEREAL_RAPIDJSON_UNLIKELY(!cont))
-            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorTermination, startOffset);
-    }
-
-    // Parse any JSON value
-    template<unsigned parseFlags, typename InputStream, typename Handler>
-    void ParseValue(InputStream& is, Handler& handler) {
-        switch (is.Peek()) {
-            case 'n': ParseNull  <parseFlags>(is, handler); break;
-            case 't': ParseTrue  <parseFlags>(is, handler); break;
-            case 'f': ParseFalse <parseFlags>(is, handler); break;
-            case '"': ParseString<parseFlags>(is, handler); break;
-            case '{': ParseObject<parseFlags>(is, handler); break;
-            case '[': ParseArray <parseFlags>(is, handler); break;
-            default :
-                      ParseNumber<parseFlags>(is, handler);
-                      break;
-
-        }
-    }
-
-    // Iterative Parsing
-
-    // States
-    enum IterativeParsingState {
-        IterativeParsingStartState = 0,
-        IterativeParsingFinishState,
-        IterativeParsingErrorState,
-
-        // Object states
-        IterativeParsingObjectInitialState,
-        IterativeParsingMemberKeyState,
-        IterativeParsingKeyValueDelimiterState,
-        IterativeParsingMemberValueState,
-        IterativeParsingMemberDelimiterState,
-        IterativeParsingObjectFinishState,
-
-        // Array states
-        IterativeParsingArrayInitialState,
-        IterativeParsingElementState,
-        IterativeParsingElementDelimiterState,
-        IterativeParsingArrayFinishState,
-
-        // Single value state
-        IterativeParsingValueState
-    };
-
-    enum { cIterativeParsingStateCount = IterativeParsingValueState + 1 };
-
-    // Tokens
-    enum Token {
-        LeftBracketToken = 0,
-        RightBracketToken,
-
-        LeftCurlyBracketToken,
-        RightCurlyBracketToken,
-
-        CommaToken,
-        ColonToken,
-
-        StringToken,
-        FalseToken,
-        TrueToken,
-        NullToken,
-        NumberToken,
-
-        kTokenCount
-    };
-
-    CEREAL_RAPIDJSON_FORCEINLINE Token Tokenize(Ch c) {
-
-//!@cond CEREAL_RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#define N NumberToken
-#define N16 N,N,N,N,N,N,N,N,N,N,N,N,N,N,N,N
-        // Maps from ASCII to Token
-        static const unsigned char tokenMap[256] = {
-            N16, // 00~0F
-            N16, // 10~1F
-            N, N, StringToken, N, N, N, N, N, N, N, N, N, CommaToken, N, N, N, // 20~2F
-            N, N, N, N, N, N, N, N, N, N, ColonToken, N, N, N, N, N, // 30~3F
-            N16, // 40~4F
-            N, N, N, N, N, N, N, N, N, N, N, LeftBracketToken, N, RightBracketToken, N, N, // 50~5F
-            N, N, N, N, N, N, FalseToken, N, N, N, N, N, N, N, NullToken, N, // 60~6F
-            N, N, N, N, TrueToken, N, N, N, N, N, N, LeftCurlyBracketToken, N, RightCurlyBracketToken, N, N, // 70~7F
-            N16, N16, N16, N16, N16, N16, N16, N16 // 80~FF
-        };
-#undef N
-#undef N16
-//!@endcond
-
-        if (sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256)
-            return static_cast<Token>(tokenMap[static_cast<unsigned char>(c)]);
-        else
-            return NumberToken;
-    }
-
-    CEREAL_RAPIDJSON_FORCEINLINE IterativeParsingState Predict(IterativeParsingState state, Token token) {
-        // current state x one lookahead token -> new state
-        static const char G[cIterativeParsingStateCount][kTokenCount] = {
-            // Start
-            {
-                IterativeParsingArrayInitialState,  // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingObjectInitialState, // Left curly bracket
-                IterativeParsingErrorState,         // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingValueState,         // String
-                IterativeParsingValueState,         // False
-                IterativeParsingValueState,         // True
-                IterativeParsingValueState,         // Null
-                IterativeParsingValueState          // Number
-            },
-            // Finish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Error(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // ObjectInitial
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingObjectFinishState,  // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
-            // MemberKey
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingKeyValueDelimiterState, // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // KeyValueDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push MemberValue state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingMemberValueState,       // String
-                IterativeParsingMemberValueState,       // False
-                IterativeParsingMemberValueState,       // True
-                IterativeParsingMemberValueState,       // Null
-                IterativeParsingMemberValueState        // Number
-            },
-            // MemberValue
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingErrorState,             // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingObjectFinishState,      // Right curly bracket
-                IterativeParsingMemberDelimiterState,   // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // MemberDelimiter
-            {
-                IterativeParsingErrorState,         // Left bracket
-                IterativeParsingErrorState,         // Right bracket
-                IterativeParsingErrorState,         // Left curly bracket
-                IterativeParsingObjectFinishState,  // Right curly bracket
-                IterativeParsingErrorState,         // Comma
-                IterativeParsingErrorState,         // Colon
-                IterativeParsingMemberKeyState,     // String
-                IterativeParsingErrorState,         // False
-                IterativeParsingErrorState,         // True
-                IterativeParsingErrorState,         // Null
-                IterativeParsingErrorState          // Number
-            },
-            // ObjectFinish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // ArrayInitial
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingElementState,           // String
-                IterativeParsingElementState,           // False
-                IterativeParsingElementState,           // True
-                IterativeParsingElementState,           // Null
-                IterativeParsingElementState            // Number
-            },
-            // Element
-            {
-                IterativeParsingErrorState,             // Left bracket
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingErrorState,             // Left curly bracket
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingElementDelimiterState,  // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingErrorState,             // String
-                IterativeParsingErrorState,             // False
-                IterativeParsingErrorState,             // True
-                IterativeParsingErrorState,             // Null
-                IterativeParsingErrorState              // Number
-            },
-            // ElementDelimiter
-            {
-                IterativeParsingArrayInitialState,      // Left bracket(push Element state)
-                IterativeParsingArrayFinishState,       // Right bracket
-                IterativeParsingObjectInitialState,     // Left curly bracket(push Element state)
-                IterativeParsingErrorState,             // Right curly bracket
-                IterativeParsingErrorState,             // Comma
-                IterativeParsingErrorState,             // Colon
-                IterativeParsingElementState,           // String
-                IterativeParsingElementState,           // False
-                IterativeParsingElementState,           // True
-                IterativeParsingElementState,           // Null
-                IterativeParsingElementState            // Number
-            },
-            // ArrayFinish(sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            },
-            // Single Value (sink state)
-            {
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState, IterativeParsingErrorState,
-                IterativeParsingErrorState
-            }
-        }; // End of G
-
-        return static_cast<IterativeParsingState>(G[state][token]);
-    }
-
-    // Make an advance in the token stream and state based on the candidate destination state which was returned by Transit().
-    // May return a new state on state pop.
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    CEREAL_RAPIDJSON_FORCEINLINE IterativeParsingState Transit(IterativeParsingState src, Token token, IterativeParsingState dst, InputStream& is, Handler& handler) {
-        (void)token;
-
-        switch (dst) {
-        case IterativeParsingErrorState:
-            return dst;
-
-        case IterativeParsingObjectInitialState:
-        case IterativeParsingArrayInitialState:
-        {
-            // Push the state(Element or MemeberValue) if we are nested in another array or value of member.
-            // In this way we can get the correct state on ObjectFinish or ArrayFinish by frame pop.
-            IterativeParsingState n = src;
-            if (src == IterativeParsingArrayInitialState || src == IterativeParsingElementDelimiterState)
-                n = IterativeParsingElementState;
-            else if (src == IterativeParsingKeyValueDelimiterState)
-                n = IterativeParsingMemberValueState;
-            // Push current state.
-            *stack_.template Push<SizeType>(1) = n;
-            // Initialize and push the member/element count.
-            *stack_.template Push<SizeType>(1) = 0;
-            // Call handler
-            bool hr = (dst == IterativeParsingObjectInitialState) ? handler.StartObject() : handler.StartArray();
-            // On handler short circuits the parsing.
-            if (!hr) {
-                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return dst;
-            }
-        }
-
-        case IterativeParsingMemberKeyState:
-            ParseString<parseFlags>(is, handler, true);
-            if (HasParseError())
-                return IterativeParsingErrorState;
-            else
-                return dst;
-
-        case IterativeParsingKeyValueDelimiterState:
-            CEREAL_RAPIDJSON_ASSERT(token == ColonToken);
-            is.Take();
-            return dst;
-
-        case IterativeParsingMemberValueState:
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return dst;
-
-        case IterativeParsingElementState:
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return dst;
-
-        case IterativeParsingMemberDelimiterState:
-        case IterativeParsingElementDelimiterState:
-            is.Take();
-            // Update member/element count.
-            *stack_.template Top<SizeType>() = *stack_.template Top<SizeType>() + 1;
-            return dst;
-
-        case IterativeParsingObjectFinishState:
-        {
-            // Transit from delimiter is only allowed when trailing commas are enabled
-            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingMemberDelimiterState) {
-                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorObjectMissName, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            // Get member count.
-            SizeType c = *stack_.template Pop<SizeType>(1);
-            // If the object is not empty, count the last member.
-            if (src == IterativeParsingMemberValueState)
-                ++c;
-            // Restore the state.
-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
-            // Transit to Finish state if this is the topmost scope.
-            if (n == IterativeParsingStartState)
-                n = IterativeParsingFinishState;
-            // Call handler
-            bool hr = handler.EndObject(c);
-            // On handler short circuits the parsing.
-            if (!hr) {
-                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return n;
-            }
-        }
-
-        case IterativeParsingArrayFinishState:
-        {
-            // Transit from delimiter is only allowed when trailing commas are enabled
-            if (!(parseFlags & kParseTrailingCommasFlag) && src == IterativeParsingElementDelimiterState) {
-                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorValueInvalid, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            // Get element count.
-            SizeType c = *stack_.template Pop<SizeType>(1);
-            // If the array is not empty, count the last element.
-            if (src == IterativeParsingElementState)
-                ++c;
-            // Restore the state.
-            IterativeParsingState n = static_cast<IterativeParsingState>(*stack_.template Pop<SizeType>(1));
-            // Transit to Finish state if this is the topmost scope.
-            if (n == IterativeParsingStartState)
-                n = IterativeParsingFinishState;
-            // Call handler
-            bool hr = handler.EndArray(c);
-            // On handler short circuits the parsing.
-            if (!hr) {
-                CEREAL_RAPIDJSON_PARSE_ERROR_NORETURN(kParseErrorTermination, is.Tell());
-                return IterativeParsingErrorState;
-            }
-            else {
-                is.Take();
-                return n;
-            }
-        }
-
-        default:
-            // This branch is for IterativeParsingValueState actually.
-            // Use `default:` rather than
-            // `case IterativeParsingValueState:` is for code coverage.
-
-            // The IterativeParsingStartState is not enumerated in this switch-case.
-            // It is impossible for that case. And it can be caught by following assertion.
-
-            // The IterativeParsingFinishState is not enumerated in this switch-case either.
-            // It is a "derivative" state which cannot triggered from Predict() directly.
-            // Therefore it cannot happen here. And it can be caught by following assertion.
-            CEREAL_RAPIDJSON_ASSERT(dst == IterativeParsingValueState);
-
-            // Must be non-compound value. Or it would be ObjectInitial or ArrayInitial state.
-            ParseValue<parseFlags>(is, handler);
-            if (HasParseError()) {
-                return IterativeParsingErrorState;
-            }
-            return IterativeParsingFinishState;
-        }
-    }
-
-    template <typename InputStream>
-    void HandleError(IterativeParsingState src, InputStream& is) {
-        if (HasParseError()) {
-            // Error flag has been set.
-            return;
-        }
-
-        switch (src) {
-        case IterativeParsingStartState:            CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorDocumentEmpty, is.Tell()); return;
-        case IterativeParsingFinishState:           CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorDocumentRootNotSingular, is.Tell()); return;
-        case IterativeParsingObjectInitialState:
-        case IterativeParsingMemberDelimiterState:  CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissName, is.Tell()); return;
-        case IterativeParsingMemberKeyState:        CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissColon, is.Tell()); return;
-        case IterativeParsingMemberValueState:      CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorObjectMissCommaOrCurlyBracket, is.Tell()); return;
-        case IterativeParsingKeyValueDelimiterState:
-        case IterativeParsingArrayInitialState:
-        case IterativeParsingElementDelimiterState: CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorValueInvalid, is.Tell()); return;
-        default: CEREAL_RAPIDJSON_ASSERT(src == IterativeParsingElementState); CEREAL_RAPIDJSON_PARSE_ERROR(kParseErrorArrayMissCommaOrSquareBracket, is.Tell()); return;
-        }
-    }
-
-    template <unsigned parseFlags, typename InputStream, typename Handler>
-    ParseResult IterativeParse(InputStream& is, Handler& handler) {
-        parseResult_.Clear();
-        ClearStackOnExit scope(*this);
-        IterativeParsingState state = IterativeParsingStartState;
-
-        SkipWhitespaceAndComments<parseFlags>(is);
-        CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        while (is.Peek() != '\0') {
-            Token t = Tokenize(is.Peek());
-            IterativeParsingState n = Predict(state, t);
-            IterativeParsingState d = Transit<parseFlags>(state, t, n, is, handler);
-
-            if (d == IterativeParsingErrorState) {
-                HandleError(state, is);
-                break;
-            }
-
-            state = d;
-
-            // Do not further consume streams if a root JSON has been parsed.
-            if ((parseFlags & kParseStopWhenDoneFlag) && state == IterativeParsingFinishState)
-                break;
-
-            SkipWhitespaceAndComments<parseFlags>(is);
-            CEREAL_RAPIDJSON_PARSE_ERROR_EARLY_RETURN(parseResult_);
-        }
-
-        // Handle the end of file.
-        if (state != IterativeParsingFinishState)
-            HandleError(state, is);
-
-        return parseResult_;
-    }
-
-    static const size_t kDefaultStackCapacity = 256;    //!< Default stack capacity in bytes for storing a single decoded string.
-    internal::Stack<StackAllocator> stack_;  //!< A stack for storing decoded string temporarily during non-destructive parsing.
-    ParseResult parseResult_;
-}; // class GenericReader
-
-//! Reader with UTF8 encoding and default allocator.
-typedef GenericReader<UTF8<>, UTF8<> > Reader;
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-
-#ifdef __GNUC__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_READER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/schema.h b/Src/External/cereal/include/cereal/external/rapidjson/schema.h
deleted file mode 100644
index 1298755..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/schema.h
+++ /dev/null
@@ -1,2006 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available->
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip-> All rights reserved->
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License-> You may obtain a copy of the License at
-//
-// http://opensource->org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied-> See the License for the 
-// specific language governing permissions and limitations under the License->
-
-#ifndef CEREAL_RAPIDJSON_SCHEMA_H_
-#define CEREAL_RAPIDJSON_SCHEMA_H_
-
-#include "document.h"
-#include "pointer.h"
-#include <cmath> // abs, floor
-
-#if !defined(CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX)
-#define CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX 1
-#else
-#define CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX 0
-#endif
-
-#if !CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX && !defined(CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX) && (__cplusplus >=201103L || (defined(_MSC_VER) && _MSC_VER >= 1800))
-#define CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX 1
-#else
-#define CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX 0
-#endif
-
-#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-#include "internal/regex.h"
-#elif CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
-#include <regex>
-#endif
-
-#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX || CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
-#define CEREAL_RAPIDJSON_SCHEMA_HAS_REGEX 1
-#else
-#define CEREAL_RAPIDJSON_SCHEMA_HAS_REGEX 0
-#endif
-
-#ifndef CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-#define CEREAL_RAPIDJSON_SCHEMA_VERBOSE 0
-#endif
-
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-#include "stringbuffer.h"
-#endif
-
-CEREAL_RAPIDJSON_DIAG_PUSH
-
-#if defined(__GNUC__)
-CEREAL_RAPIDJSON_DIAG_OFF(effc++)
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_OFF(weak-vtables)
-CEREAL_RAPIDJSON_DIAG_OFF(exit-time-destructors)
-CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat-pedantic)
-CEREAL_RAPIDJSON_DIAG_OFF(variadic-macros)
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// Verbose Utilities
-
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-
-namespace internal {
-
-inline void PrintInvalidKeyword(const char* keyword) {
-    printf("Fail keyword: %s\n", keyword);
-}
-
-inline void PrintInvalidKeyword(const wchar_t* keyword) {
-    wprintf(L"Fail keyword: %ls\n", keyword);
-}
-
-inline void PrintInvalidDocument(const char* document) {
-    printf("Fail document: %s\n\n", document);
-}
-
-inline void PrintInvalidDocument(const wchar_t* document) {
-    wprintf(L"Fail document: %ls\n\n", document);
-}
-
-inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
-    printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
-}
-
-inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
-    wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
-}
-
-} // namespace internal
-
-#endif // CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-
-///////////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN
-
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-#define CEREAL_RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
-#else
-#define CEREAL_RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
-#endif
-
-#define CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(keyword)\
-CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN\
-    context.invalidKeyword = keyword.GetString();\
-    CEREAL_RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword.GetString());\
-    return false;\
-CEREAL_RAPIDJSON_MULTILINEMACRO_END
-
-///////////////////////////////////////////////////////////////////////////////
-// Forward declarations
-
-template <typename ValueType, typename Allocator>
-class GenericSchemaDocument;
-
-namespace internal {
-
-template <typename SchemaDocumentType>
-class Schema;
-
-///////////////////////////////////////////////////////////////////////////////
-// ISchemaValidator
-
-class ISchemaValidator {
-public:
-    virtual ~ISchemaValidator() {}
-    virtual bool IsValid() const = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// ISchemaStateFactory
-
-template <typename SchemaType>
-class ISchemaStateFactory {
-public:
-    virtual ~ISchemaStateFactory() {}
-    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType&) = 0;
-    virtual void DestroySchemaValidator(ISchemaValidator* validator) = 0;
-    virtual void* CreateHasher() = 0;
-    virtual uint64_t GetHashCode(void* hasher) = 0;
-    virtual void DestroryHasher(void* hasher) = 0;
-    virtual void* MallocState(size_t size) = 0;
-    virtual void FreeState(void* p) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Hasher
-
-// For comparison of compound value
-template<typename Encoding, typename Allocator>
-class Hasher {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    Hasher(Allocator* allocator = 0, size_t stackCapacity = kDefaultSize) : stack_(allocator, stackCapacity) {}
-
-    bool Null() { return WriteType(kNullType); }
-    bool Bool(bool b) { return WriteType(b ? kTrueType : kFalseType); }
-    bool Int(int i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
-    bool Uint(unsigned u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Int64(int64_t i) { Number n; n.u.i = i; n.d = static_cast<double>(i); return WriteNumber(n); }
-    bool Uint64(uint64_t u) { Number n; n.u.u = u; n.d = static_cast<double>(u); return WriteNumber(n); }
-    bool Double(double d) { 
-        Number n; 
-        if (d < 0) n.u.i = static_cast<int64_t>(d);
-        else       n.u.u = static_cast<uint64_t>(d); 
-        n.d = d;
-        return WriteNumber(n);
-    }
-
-    bool RawNumber(const Ch* str, SizeType len, bool) {
-        WriteBuffer(kNumberType, str, len * sizeof(Ch));
-        return true;
-    }
-
-    bool String(const Ch* str, SizeType len, bool) {
-        WriteBuffer(kStringType, str, len * sizeof(Ch));
-        return true;
-    }
-
-    bool StartObject() { return true; }
-    bool Key(const Ch* str, SizeType len, bool copy) { return String(str, len, copy); }
-    bool EndObject(SizeType memberCount) { 
-        uint64_t h = Hash(0, kObjectType);
-        uint64_t* kv = stack_.template Pop<uint64_t>(memberCount * 2);
-        for (SizeType i = 0; i < memberCount; i++)
-            h ^= Hash(kv[i * 2], kv[i * 2 + 1]);  // Use xor to achieve member order insensitive
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-    
-    bool StartArray() { return true; }
-    bool EndArray(SizeType elementCount) { 
-        uint64_t h = Hash(0, kArrayType);
-        uint64_t* e = stack_.template Pop<uint64_t>(elementCount);
-        for (SizeType i = 0; i < elementCount; i++)
-            h = Hash(h, e[i]); // Use hash to achieve element order sensitive
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-
-    bool IsValid() const { return stack_.GetSize() == sizeof(uint64_t); }
-
-    uint64_t GetHashCode() const {
-        CEREAL_RAPIDJSON_ASSERT(IsValid());
-        return *stack_.template Top<uint64_t>();
-    }
-
-private:
-    static const size_t kDefaultSize = 256;
-    struct Number {
-        union U {
-            uint64_t u;
-            int64_t i;
-        }u;
-        double d;
-    };
-
-    bool WriteType(Type type) { return WriteBuffer(type, 0, 0); }
-    
-    bool WriteNumber(const Number& n) { return WriteBuffer(kNumberType, &n, sizeof(n)); }
-    
-    bool WriteBuffer(Type type, const void* data, size_t len) {
-        // FNV-1a from http://isthe.com/chongo/tech/comp/fnv/
-        uint64_t h = Hash(CEREAL_RAPIDJSON_UINT64_C2(0x84222325, 0xcbf29ce4), type);
-        const unsigned char* d = static_cast<const unsigned char*>(data);
-        for (size_t i = 0; i < len; i++)
-            h = Hash(h, d[i]);
-        *stack_.template Push<uint64_t>() = h;
-        return true;
-    }
-
-    static uint64_t Hash(uint64_t h, uint64_t d) {
-        static const uint64_t kPrime = CEREAL_RAPIDJSON_UINT64_C2(0x00000100, 0x000001b3);
-        h ^= d;
-        h *= kPrime;
-        return h;
-    }
-
-    Stack<Allocator> stack_;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// SchemaValidationContext
-
-template <typename SchemaDocumentType>
-struct SchemaValidationContext {
-    typedef Schema<SchemaDocumentType> SchemaType;
-    typedef ISchemaStateFactory<SchemaType> SchemaValidatorFactoryType;
-    typedef typename SchemaType::ValueType ValueType;
-    typedef typename ValueType::Ch Ch;
-
-    enum PatternValidatorType {
-        kPatternValidatorOnly,
-        kPatternValidatorWithProperty,
-        kPatternValidatorWithAdditionalProperty
-    };
-
-    SchemaValidationContext(SchemaValidatorFactoryType& f, const SchemaType* s) :
-        factory(f),
-        schema(s),
-        valueSchema(),
-        invalidKeyword(),
-        hasher(),
-        arrayElementHashCodes(),
-        validators(),
-        validatorCount(),
-        patternPropertiesValidators(),
-        patternPropertiesValidatorCount(),
-        patternPropertiesSchemas(),
-        patternPropertiesSchemaCount(),
-        valuePatternValidatorType(kPatternValidatorOnly),
-        propertyExist(),
-        inArray(false),
-        valueUniqueness(false),
-        arrayUniqueness(false)
-    {
-    }
-
-    ~SchemaValidationContext() {
-        if (hasher)
-            factory.DestroryHasher(hasher);
-        if (validators) {
-            for (SizeType i = 0; i < validatorCount; i++)
-                factory.DestroySchemaValidator(validators[i]);
-            factory.FreeState(validators);
-        }
-        if (patternPropertiesValidators) {
-            for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
-                factory.DestroySchemaValidator(patternPropertiesValidators[i]);
-            factory.FreeState(patternPropertiesValidators);
-        }
-        if (patternPropertiesSchemas)
-            factory.FreeState(patternPropertiesSchemas);
-        if (propertyExist)
-            factory.FreeState(propertyExist);
-    }
-
-    SchemaValidatorFactoryType& factory;
-    const SchemaType* schema;
-    const SchemaType* valueSchema;
-    const Ch* invalidKeyword;
-    void* hasher; // Only validator access
-    void* arrayElementHashCodes; // Only validator access this
-    ISchemaValidator** validators;
-    SizeType validatorCount;
-    ISchemaValidator** patternPropertiesValidators;
-    SizeType patternPropertiesValidatorCount;
-    const SchemaType** patternPropertiesSchemas;
-    SizeType patternPropertiesSchemaCount;
-    PatternValidatorType valuePatternValidatorType;
-    PatternValidatorType objectPatternValidatorType;
-    SizeType arrayElementIndex;
-    bool* propertyExist;
-    bool inArray;
-    bool valueUniqueness;
-    bool arrayUniqueness;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Schema
-
-template <typename SchemaDocumentType>
-class Schema {
-public:
-    typedef typename SchemaDocumentType::ValueType ValueType;
-    typedef typename SchemaDocumentType::AllocatorType AllocatorType;
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-    typedef SchemaValidationContext<SchemaDocumentType> Context;
-    typedef Schema<SchemaDocumentType> SchemaType;
-    typedef GenericValue<EncodingType, AllocatorType> SValue;
-    friend class GenericSchemaDocument<ValueType, AllocatorType>;
-
-    Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator) :
-        allocator_(allocator),
-        enum_(),
-        enumCount_(),
-        not_(),
-        type_((1 << kTotalSchemaType) - 1), // typeless
-        validatorCount_(),
-        properties_(),
-        additionalPropertiesSchema_(),
-        patternProperties_(),
-        patternPropertyCount_(),
-        propertyCount_(),
-        minProperties_(),
-        maxProperties_(SizeType(~0)),
-        additionalProperties_(true),
-        hasDependencies_(),
-        hasRequired_(),
-        hasSchemaDependencies_(),
-        additionalItemsSchema_(),
-        itemsList_(),
-        itemsTuple_(),
-        itemsTupleCount_(),
-        minItems_(),
-        maxItems_(SizeType(~0)),
-        additionalItems_(true),
-        uniqueItems_(false),
-        pattern_(),
-        minLength_(0),
-        maxLength_(~SizeType(0)),
-        exclusiveMinimum_(false),
-        exclusiveMaximum_(false)
-    {
-        typedef typename SchemaDocumentType::ValueType ValueType;
-        typedef typename ValueType::ConstValueIterator ConstValueIterator;
-        typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
-
-        if (!value.IsObject())
-            return;
-
-        if (const ValueType* v = GetMember(value, GetTypeString())) {
-            type_ = 0;
-            if (v->IsString())
-                AddType(*v);
-            else if (v->IsArray())
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr)
-                    AddType(*itr);
-        }
-
-        if (const ValueType* v = GetMember(value, GetEnumString()))
-            if (v->IsArray() && v->Size() > 0) {
-                enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
-                    typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
-                    char buffer[256 + 24];
-                    MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
-                    EnumHasherType h(&hasherAllocator, 256);
-                    itr->Accept(h);
-                    enum_[enumCount_++] = h.GetHashCode();
-                }
-            }
-
-        if (schemaDocument) {
-            AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
-            AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
-            AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
-        }
-
-        if (const ValueType* v = GetMember(value, GetNotString())) {
-            schemaDocument->CreateSchema(&not_, p.Append(GetNotString(), allocator_), *v, document);
-            notValidatorIndex_ = validatorCount_;
-            validatorCount_++;
-        }
-
-        // Object
-
-        const ValueType* properties = GetMember(value, GetPropertiesString());
-        const ValueType* required = GetMember(value, GetRequiredString());
-        const ValueType* dependencies = GetMember(value, GetDependenciesString());
-        {
-            // Gather properties from properties/required/dependencies
-            SValue allProperties(kArrayType);
-
-            if (properties && properties->IsObject())
-                for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr)
-                    AddUniqueElement(allProperties, itr->name);
-            
-            if (required && required->IsArray())
-                for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
-                    if (itr->IsString())
-                        AddUniqueElement(allProperties, *itr);
-
-            if (dependencies && dependencies->IsObject())
-                for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
-                    AddUniqueElement(allProperties, itr->name);
-                    if (itr->value.IsArray())
-                        for (ConstValueIterator i = itr->value.Begin(); i != itr->value.End(); ++i)
-                            if (i->IsString())
-                                AddUniqueElement(allProperties, *i);
-                }
-
-            if (allProperties.Size() > 0) {
-                propertyCount_ = allProperties.Size();
-                properties_ = static_cast<Property*>(allocator_->Malloc(sizeof(Property) * propertyCount_));
-                for (SizeType i = 0; i < propertyCount_; i++) {
-                    new (&properties_[i]) Property();
-                    properties_[i].name = allProperties[i];
-                    properties_[i].schema = GetTypeless();
-                }
-            }
-        }
-
-        if (properties && properties->IsObject()) {
-            PointerType q = p.Append(GetPropertiesString(), allocator_);
-            for (ConstMemberIterator itr = properties->MemberBegin(); itr != properties->MemberEnd(); ++itr) {
-                SizeType index;
-                if (FindPropertyIndex(itr->name, &index))
-                    schemaDocument->CreateSchema(&properties_[index].schema, q.Append(itr->name, allocator_), itr->value, document);
-            }
-        }
-
-        if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
-            PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
-            patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
-            patternPropertyCount_ = 0;
-
-            for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
-                new (&patternProperties_[patternPropertyCount_]) PatternProperty();
-                patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
-                schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document);
-                patternPropertyCount_++;
-            }
-        }
-
-        if (required && required->IsArray())
-            for (ConstValueIterator itr = required->Begin(); itr != required->End(); ++itr)
-                if (itr->IsString()) {
-                    SizeType index;
-                    if (FindPropertyIndex(*itr, &index)) {
-                        properties_[index].required = true;
-                        hasRequired_ = true;
-                    }
-                }
-
-        if (dependencies && dependencies->IsObject()) {
-            PointerType q = p.Append(GetDependenciesString(), allocator_);
-            hasDependencies_ = true;
-            for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
-                SizeType sourceIndex;
-                if (FindPropertyIndex(itr->name, &sourceIndex)) {
-                    if (itr->value.IsArray()) {
-                        properties_[sourceIndex].dependencies = static_cast<bool*>(allocator_->Malloc(sizeof(bool) * propertyCount_));
-                        std::memset(properties_[sourceIndex].dependencies, 0, sizeof(bool)* propertyCount_);
-                        for (ConstValueIterator targetItr = itr->value.Begin(); targetItr != itr->value.End(); ++targetItr) {
-                            SizeType targetIndex;
-                            if (FindPropertyIndex(*targetItr, &targetIndex))
-                                properties_[sourceIndex].dependencies[targetIndex] = true;
-                        }
-                    }
-                    else if (itr->value.IsObject()) {
-                        hasSchemaDependencies_ = true;
-                        schemaDocument->CreateSchema(&properties_[sourceIndex].dependenciesSchema, q.Append(itr->name, allocator_), itr->value, document);
-                        properties_[sourceIndex].dependenciesValidatorIndex = validatorCount_;
-                        validatorCount_++;
-                    }
-                }
-            }
-        }
-
-        if (const ValueType* v = GetMember(value, GetAdditionalPropertiesString())) {
-            if (v->IsBool())
-                additionalProperties_ = v->GetBool();
-            else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalPropertiesSchema_, p.Append(GetAdditionalPropertiesString(), allocator_), *v, document);
-        }
-
-        AssignIfExist(minProperties_, value, GetMinPropertiesString());
-        AssignIfExist(maxProperties_, value, GetMaxPropertiesString());
-
-        // Array
-        if (const ValueType* v = GetMember(value, GetItemsString())) {
-            PointerType q = p.Append(GetItemsString(), allocator_);
-            if (v->IsObject()) // List validation
-                schemaDocument->CreateSchema(&itemsList_, q, *v, document);
-            else if (v->IsArray()) { // Tuple validation
-                itemsTuple_ = static_cast<const Schema**>(allocator_->Malloc(sizeof(const Schema*) * v->Size()));
-                SizeType index = 0;
-                for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr, index++)
-                    schemaDocument->CreateSchema(&itemsTuple_[itemsTupleCount_++], q.Append(index, allocator_), *itr, document);
-            }
-        }
-
-        AssignIfExist(minItems_, value, GetMinItemsString());
-        AssignIfExist(maxItems_, value, GetMaxItemsString());
-
-        if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
-            if (v->IsBool())
-                additionalItems_ = v->GetBool();
-            else if (v->IsObject())
-                schemaDocument->CreateSchema(&additionalItemsSchema_, p.Append(GetAdditionalItemsString(), allocator_), *v, document);
-        }
-
-        AssignIfExist(uniqueItems_, value, GetUniqueItemsString());
-
-        // String
-        AssignIfExist(minLength_, value, GetMinLengthString());
-        AssignIfExist(maxLength_, value, GetMaxLengthString());
-
-        if (const ValueType* v = GetMember(value, GetPatternString()))
-            pattern_ = CreatePattern(*v);
-
-        // Number
-        if (const ValueType* v = GetMember(value, GetMinimumString()))
-            if (v->IsNumber())
-                minimum_.CopyFrom(*v, *allocator_);
-
-        if (const ValueType* v = GetMember(value, GetMaximumString()))
-            if (v->IsNumber())
-                maximum_.CopyFrom(*v, *allocator_);
-
-        AssignIfExist(exclusiveMinimum_, value, GetExclusiveMinimumString());
-        AssignIfExist(exclusiveMaximum_, value, GetExclusiveMaximumString());
-
-        if (const ValueType* v = GetMember(value, GetMultipleOfString()))
-            if (v->IsNumber() && v->GetDouble() > 0.0)
-                multipleOf_.CopyFrom(*v, *allocator_);
-    }
-
-    ~Schema() {
-        if (allocator_) {
-            allocator_->Free(enum_);
-        }
-        if (properties_) {
-            for (SizeType i = 0; i < propertyCount_; i++)
-                properties_[i].~Property();
-            AllocatorType::Free(properties_);
-        }
-        if (patternProperties_) {
-            for (SizeType i = 0; i < patternPropertyCount_; i++)
-                patternProperties_[i].~PatternProperty();
-            AllocatorType::Free(patternProperties_);
-        }
-        AllocatorType::Free(itemsTuple_);
-#if CEREAL_RAPIDJSON_SCHEMA_HAS_REGEX
-        if (pattern_) {
-            pattern_->~RegexType();
-            allocator_->Free(pattern_);
-        }
-#endif
-    }
-
-    bool BeginValue(Context& context) const {
-        if (context.inArray) {
-            if (uniqueItems_)
-                context.valueUniqueness = true;
-
-            if (itemsList_)
-                context.valueSchema = itemsList_;
-            else if (itemsTuple_) {
-                if (context.arrayElementIndex < itemsTupleCount_)
-                    context.valueSchema = itemsTuple_[context.arrayElementIndex];
-                else if (additionalItemsSchema_)
-                    context.valueSchema = additionalItemsSchema_;
-                else if (additionalItems_)
-                    context.valueSchema = GetTypeless();
-                else
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetItemsString());
-            }
-            else
-                context.valueSchema = GetTypeless();
-
-            context.arrayElementIndex++;
-        }
-        return true;
-    }
-
-    CEREAL_RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
-        if (context.patternPropertiesValidatorCount > 0) {
-            bool otherValid = false;
-            SizeType count = context.patternPropertiesValidatorCount;
-            if (context.objectPatternValidatorType != Context::kPatternValidatorOnly)
-                otherValid = context.patternPropertiesValidators[--count]->IsValid();
-
-            bool patternValid = true;
-            for (SizeType i = 0; i < count; i++)
-                if (!context.patternPropertiesValidators[i]->IsValid()) {
-                    patternValid = false;
-                    break;
-                }
-
-            if (context.objectPatternValidatorType == Context::kPatternValidatorOnly) {
-                if (!patternValid)
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-            }
-            else if (context.objectPatternValidatorType == Context::kPatternValidatorWithProperty) {
-                if (!patternValid || !otherValid)
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-            }
-            else if (!patternValid && !otherValid) // kPatternValidatorWithAdditionalProperty)
-                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternPropertiesString());
-        }
-
-        if (enum_) {
-            const uint64_t h = context.factory.GetHashCode(context.hasher);
-            for (SizeType i = 0; i < enumCount_; i++)
-                if (enum_[i] == h)
-                    goto foundEnum;
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetEnumString());
-            foundEnum:;
-        }
-
-        if (allOf_.schemas)
-            for (SizeType i = allOf_.begin; i < allOf_.begin + allOf_.count; i++)
-                if (!context.validators[i]->IsValid())
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetAllOfString());
-        
-        if (anyOf_.schemas) {
-            for (SizeType i = anyOf_.begin; i < anyOf_.begin + anyOf_.count; i++)
-                if (context.validators[i]->IsValid())
-                    goto foundAny;
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetAnyOfString());
-            foundAny:;
-        }
-
-        if (oneOf_.schemas) {
-            bool oneValid = false;
-            for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
-                if (context.validators[i]->IsValid()) {
-                    if (oneValid)
-                        CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
-                    else
-                        oneValid = true;
-                }
-            if (!oneValid)
-                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetOneOfString());
-        }
-
-        if (not_ && context.validators[notValidatorIndex_]->IsValid())
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetNotString());
-
-        return true;
-    }
-
-    bool Null(Context& context) const { 
-        if (!(type_ & (1 << kNullSchemaType)))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        return CreateParallelValidator(context);
-    }
-    
-    bool Bool(Context& context, bool) const { 
-        if (!(type_ & (1 << kBooleanSchemaType)))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-        return CreateParallelValidator(context);
-    }
-
-    bool Int(Context& context, int i) const {
-        if (!CheckInt(context, i))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Uint(Context& context, unsigned u) const {
-        if (!CheckUint(context, u))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Int64(Context& context, int64_t i) const {
-        if (!CheckInt(context, i))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Uint64(Context& context, uint64_t u) const {
-        if (!CheckUint(context, u))
-            return false;
-        return CreateParallelValidator(context);
-    }
-
-    bool Double(Context& context, double d) const {
-        if (!(type_ & (1 << kNumberSchemaType)))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (!minimum_.IsNull() && !CheckDoubleMinimum(context, d))
-            return false;
-
-        if (!maximum_.IsNull() && !CheckDoubleMaximum(context, d))
-            return false;
-        
-        if (!multipleOf_.IsNull() && !CheckDoubleMultipleOf(context, d))
-            return false;
-        
-        return CreateParallelValidator(context);
-    }
-    
-    bool String(Context& context, const Ch* str, SizeType length, bool) const {
-        if (!(type_ & (1 << kStringSchemaType)))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (minLength_ != 0 || maxLength_ != SizeType(~0)) {
-            SizeType count;
-            if (internal::CountStringCodePoint<EncodingType>(str, length, &count)) {
-                if (count < minLength_)
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinLengthString());
-                if (count > maxLength_)
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxLengthString());
-            }
-        }
-
-        if (pattern_ && !IsPatternMatch(pattern_, str, length))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetPatternString());
-
-        return CreateParallelValidator(context);
-    }
-
-    bool StartObject(Context& context) const { 
-        if (!(type_ & (1 << kObjectSchemaType)))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (hasDependencies_ || hasRequired_) {
-            context.propertyExist = static_cast<bool*>(context.factory.MallocState(sizeof(bool) * propertyCount_));
-            std::memset(context.propertyExist, 0, sizeof(bool) * propertyCount_);
-        }
-
-        if (patternProperties_) { // pre-allocate schema array
-            SizeType count = patternPropertyCount_ + 1; // extra for valuePatternValidatorType
-            context.patternPropertiesSchemas = static_cast<const SchemaType**>(context.factory.MallocState(sizeof(const SchemaType*) * count));
-            context.patternPropertiesSchemaCount = 0;
-            std::memset(context.patternPropertiesSchemas, 0, sizeof(SchemaType*) * count);
-        }
-
-        return CreateParallelValidator(context);
-    }
-    
-    bool Key(Context& context, const Ch* str, SizeType len, bool) const {
-        if (patternProperties_) {
-            context.patternPropertiesSchemaCount = 0;
-            for (SizeType i = 0; i < patternPropertyCount_; i++)
-                if (patternProperties_[i].pattern && IsPatternMatch(patternProperties_[i].pattern, str, len))
-                    context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = patternProperties_[i].schema;
-        }
-
-        SizeType index;
-        if (FindPropertyIndex(ValueType(str, len).Move(), &index)) {
-            if (context.patternPropertiesSchemaCount > 0) {
-                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = properties_[index].schema;
-                context.valueSchema = GetTypeless();
-                context.valuePatternValidatorType = Context::kPatternValidatorWithProperty;
-            }
-            else
-                context.valueSchema = properties_[index].schema;
-
-            if (context.propertyExist)
-                context.propertyExist[index] = true;
-
-            return true;
-        }
-
-        if (additionalPropertiesSchema_) {
-            if (additionalPropertiesSchema_ && context.patternPropertiesSchemaCount > 0) {
-                context.patternPropertiesSchemas[context.patternPropertiesSchemaCount++] = additionalPropertiesSchema_;
-                context.valueSchema = GetTypeless();
-                context.valuePatternValidatorType = Context::kPatternValidatorWithAdditionalProperty;
-            }
-            else
-                context.valueSchema = additionalPropertiesSchema_;
-            return true;
-        }
-        else if (additionalProperties_) {
-            context.valueSchema = GetTypeless();
-            return true;
-        }
-
-        if (context.patternPropertiesSchemaCount == 0) // patternProperties are not additional properties
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetAdditionalPropertiesString());
-
-        return true;
-    }
-
-    bool EndObject(Context& context, SizeType memberCount) const {
-        if (hasRequired_)
-            for (SizeType index = 0; index < propertyCount_; index++)
-                if (properties_[index].required)
-                    if (!context.propertyExist[index])
-                        CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetRequiredString());
-
-        if (memberCount < minProperties_)
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinPropertiesString());
-
-        if (memberCount > maxProperties_)
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxPropertiesString());
-
-        if (hasDependencies_) {
-            for (SizeType sourceIndex = 0; sourceIndex < propertyCount_; sourceIndex++)
-                if (context.propertyExist[sourceIndex]) {
-                    if (properties_[sourceIndex].dependencies) {
-                        for (SizeType targetIndex = 0; targetIndex < propertyCount_; targetIndex++)
-                            if (properties_[sourceIndex].dependencies[targetIndex] && !context.propertyExist[targetIndex])
-                                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
-                    }
-                    else if (properties_[sourceIndex].dependenciesSchema)
-                        if (!context.validators[properties_[sourceIndex].dependenciesValidatorIndex]->IsValid())
-                            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetDependenciesString());
-                }
-        }
-
-        return true;
-    }
-
-    bool StartArray(Context& context) const { 
-        if (!(type_ & (1 << kArraySchemaType)))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        context.arrayElementIndex = 0;
-        context.inArray = true;
-
-        return CreateParallelValidator(context);
-    }
-
-    bool EndArray(Context& context, SizeType elementCount) const { 
-        context.inArray = false;
-        
-        if (elementCount < minItems_)
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinItemsString());
-        
-        if (elementCount > maxItems_)
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaxItemsString());
-
-        return true;
-    }
-
-    // Generate functions for string literal according to Ch
-#define CEREAL_RAPIDJSON_STRING_(name, ...) \
-    static const ValueType& Get##name##String() {\
-        static const Ch s[] = { __VA_ARGS__, '\0' };\
-        static const ValueType v(s, sizeof(s) / sizeof(Ch) - 1);\
-        return v;\
-    }
-
-    CEREAL_RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
-    CEREAL_RAPIDJSON_STRING_(Boolean, 'b', 'o', 'o', 'l', 'e', 'a', 'n')
-    CEREAL_RAPIDJSON_STRING_(Object, 'o', 'b', 'j', 'e', 'c', 't')
-    CEREAL_RAPIDJSON_STRING_(Array, 'a', 'r', 'r', 'a', 'y')
-    CEREAL_RAPIDJSON_STRING_(String, 's', 't', 'r', 'i', 'n', 'g')
-    CEREAL_RAPIDJSON_STRING_(Number, 'n', 'u', 'm', 'b', 'e', 'r')
-    CEREAL_RAPIDJSON_STRING_(Integer, 'i', 'n', 't', 'e', 'g', 'e', 'r')
-    CEREAL_RAPIDJSON_STRING_(Type, 't', 'y', 'p', 'e')
-    CEREAL_RAPIDJSON_STRING_(Enum, 'e', 'n', 'u', 'm')
-    CEREAL_RAPIDJSON_STRING_(AllOf, 'a', 'l', 'l', 'O', 'f')
-    CEREAL_RAPIDJSON_STRING_(AnyOf, 'a', 'n', 'y', 'O', 'f')
-    CEREAL_RAPIDJSON_STRING_(OneOf, 'o', 'n', 'e', 'O', 'f')
-    CEREAL_RAPIDJSON_STRING_(Not, 'n', 'o', 't')
-    CEREAL_RAPIDJSON_STRING_(Properties, 'p', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    CEREAL_RAPIDJSON_STRING_(Required, 'r', 'e', 'q', 'u', 'i', 'r', 'e', 'd')
-    CEREAL_RAPIDJSON_STRING_(Dependencies, 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'i', 'e', 's')
-    CEREAL_RAPIDJSON_STRING_(PatternProperties, 'p', 'a', 't', 't', 'e', 'r', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    CEREAL_RAPIDJSON_STRING_(AdditionalProperties, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    CEREAL_RAPIDJSON_STRING_(MinProperties, 'm', 'i', 'n', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    CEREAL_RAPIDJSON_STRING_(MaxProperties, 'm', 'a', 'x', 'P', 'r', 'o', 'p', 'e', 'r', 't', 'i', 'e', 's')
-    CEREAL_RAPIDJSON_STRING_(Items, 'i', 't', 'e', 'm', 's')
-    CEREAL_RAPIDJSON_STRING_(MinItems, 'm', 'i', 'n', 'I', 't', 'e', 'm', 's')
-    CEREAL_RAPIDJSON_STRING_(MaxItems, 'm', 'a', 'x', 'I', 't', 'e', 'm', 's')
-    CEREAL_RAPIDJSON_STRING_(AdditionalItems, 'a', 'd', 'd', 'i', 't', 'i', 'o', 'n', 'a', 'l', 'I', 't', 'e', 'm', 's')
-    CEREAL_RAPIDJSON_STRING_(UniqueItems, 'u', 'n', 'i', 'q', 'u', 'e', 'I', 't', 'e', 'm', 's')
-    CEREAL_RAPIDJSON_STRING_(MinLength, 'm', 'i', 'n', 'L', 'e', 'n', 'g', 't', 'h')
-    CEREAL_RAPIDJSON_STRING_(MaxLength, 'm', 'a', 'x', 'L', 'e', 'n', 'g', 't', 'h')
-    CEREAL_RAPIDJSON_STRING_(Pattern, 'p', 'a', 't', 't', 'e', 'r', 'n')
-    CEREAL_RAPIDJSON_STRING_(Minimum, 'm', 'i', 'n', 'i', 'm', 'u', 'm')
-    CEREAL_RAPIDJSON_STRING_(Maximum, 'm', 'a', 'x', 'i', 'm', 'u', 'm')
-    CEREAL_RAPIDJSON_STRING_(ExclusiveMinimum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'i', 'n', 'i', 'm', 'u', 'm')
-    CEREAL_RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
-    CEREAL_RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
-
-#undef CEREAL_RAPIDJSON_STRING_
-
-private:
-    enum SchemaValueType {
-        kNullSchemaType,
-        kBooleanSchemaType,
-        kObjectSchemaType,
-        kArraySchemaType,
-        kStringSchemaType,
-        kNumberSchemaType,
-        kIntegerSchemaType,
-        kTotalSchemaType
-    };
-
-#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-        typedef internal::GenericRegex<EncodingType> RegexType;
-#elif CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
-        typedef std::basic_regex<Ch> RegexType;
-#else
-        typedef char RegexType;
-#endif
-
-    struct SchemaArray {
-        SchemaArray() : schemas(), count() {}
-        ~SchemaArray() { AllocatorType::Free(schemas); }
-        const SchemaType** schemas;
-        SizeType begin; // begin index of context.validators
-        SizeType count;
-    };
-
-    static const SchemaType* GetTypeless() {
-        static SchemaType typeless(0, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), 0);
-        return &typeless;
-    }
-
-    template <typename V1, typename V2>
-    void AddUniqueElement(V1& a, const V2& v) {
-        for (typename V1::ConstValueIterator itr = a.Begin(); itr != a.End(); ++itr)
-            if (*itr == v)
-                return;
-        V1 c(v, *allocator_);
-        a.PushBack(c, *allocator_);
-    }
-
-    static const ValueType* GetMember(const ValueType& value, const ValueType& name) {
-        typename ValueType::ConstMemberIterator itr = value.FindMember(name);
-        return itr != value.MemberEnd() ? &(itr->value) : 0;
-    }
-
-    static void AssignIfExist(bool& out, const ValueType& value, const ValueType& name) {
-        if (const ValueType* v = GetMember(value, name))
-            if (v->IsBool())
-                out = v->GetBool();
-    }
-
-    static void AssignIfExist(SizeType& out, const ValueType& value, const ValueType& name) {
-        if (const ValueType* v = GetMember(value, name))
-            if (v->IsUint64() && v->GetUint64() <= SizeType(~0))
-                out = static_cast<SizeType>(v->GetUint64());
-    }
-
-    void AssignIfExist(SchemaArray& out, SchemaDocumentType& schemaDocument, const PointerType& p, const ValueType& value, const ValueType& name, const ValueType& document) {
-        if (const ValueType* v = GetMember(value, name)) {
-            if (v->IsArray() && v->Size() > 0) {
-                PointerType q = p.Append(name, allocator_);
-                out.count = v->Size();
-                out.schemas = static_cast<const Schema**>(allocator_->Malloc(out.count * sizeof(const Schema*)));
-                memset(out.schemas, 0, sizeof(Schema*)* out.count);
-                for (SizeType i = 0; i < out.count; i++)
-                    schemaDocument.CreateSchema(&out.schemas[i], q.Append(i, allocator_), (*v)[i], document);
-                out.begin = validatorCount_;
-                validatorCount_ += out.count;
-            }
-        }
-    }
-
-#if CEREAL_RAPIDJSON_SCHEMA_USE_INTERNALREGEX
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
-        if (value.IsString()) {
-            RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString());
-            if (!r->IsValid()) {
-                r->~RegexType();
-                AllocatorType::Free(r);
-                r = 0;
-            }
-            return r;
-        }
-        return 0;
-    }
-
-    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType) {
-        return pattern->Search(str);
-    }
-#elif CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType& value) {
-        if (value.IsString())
-            try {
-                return new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
-            }
-            catch (const std::regex_error&) {
-            }
-        return 0;
-    }
-
-    static bool IsPatternMatch(const RegexType* pattern, const Ch *str, SizeType length) {
-        std::match_results<const Ch*> r;
-        return std::regex_search(str, str + length, r, *pattern);
-    }
-#else
-    template <typename ValueType>
-    RegexType* CreatePattern(const ValueType&) { return 0; }
-
-    static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
-#endif // CEREAL_RAPIDJSON_SCHEMA_USE_STDREGEX
-
-    void AddType(const ValueType& type) {
-        if      (type == GetNullString()   ) type_ |= 1 << kNullSchemaType;
-        else if (type == GetBooleanString()) type_ |= 1 << kBooleanSchemaType;
-        else if (type == GetObjectString() ) type_ |= 1 << kObjectSchemaType;
-        else if (type == GetArrayString()  ) type_ |= 1 << kArraySchemaType;
-        else if (type == GetStringString() ) type_ |= 1 << kStringSchemaType;
-        else if (type == GetIntegerString()) type_ |= 1 << kIntegerSchemaType;
-        else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
-    }
-
-    bool CreateParallelValidator(Context& context) const {
-        if (enum_ || context.arrayUniqueness)
-            context.hasher = context.factory.CreateHasher();
-
-        if (validatorCount_) {
-            CEREAL_RAPIDJSON_ASSERT(context.validators == 0);
-            context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
-            context.validatorCount = validatorCount_;
-
-            if (allOf_.schemas)
-                CreateSchemaValidators(context, allOf_);
-
-            if (anyOf_.schemas)
-                CreateSchemaValidators(context, anyOf_);
-            
-            if (oneOf_.schemas)
-                CreateSchemaValidators(context, oneOf_);
-            
-            if (not_)
-                context.validators[notValidatorIndex_] = context.factory.CreateSchemaValidator(*not_);
-            
-            if (hasSchemaDependencies_) {
-                for (SizeType i = 0; i < propertyCount_; i++)
-                    if (properties_[i].dependenciesSchema)
-                        context.validators[properties_[i].dependenciesValidatorIndex] = context.factory.CreateSchemaValidator(*properties_[i].dependenciesSchema);
-            }
-        }
-
-        return true;
-    }
-
-    void CreateSchemaValidators(Context& context, const SchemaArray& schemas) const {
-        for (SizeType i = 0; i < schemas.count; i++)
-            context.validators[schemas.begin + i] = context.factory.CreateSchemaValidator(*schemas.schemas[i]);
-    }
-
-    // O(n)
-    bool FindPropertyIndex(const ValueType& name, SizeType* outIndex) const {
-        SizeType len = name.GetStringLength();
-        const Ch* str = name.GetString();
-        for (SizeType index = 0; index < propertyCount_; index++)
-            if (properties_[index].name.GetStringLength() == len && 
-                (std::memcmp(properties_[index].name.GetString(), str, sizeof(Ch) * len) == 0))
-            {
-                *outIndex = index;
-                return true;
-            }
-        return false;
-    }
-
-    bool CheckInt(Context& context, int64_t i) const {
-        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType))))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (!minimum_.IsNull()) {
-            if (minimum_.IsInt64()) {
-                if (exclusiveMinimum_ ? i <= minimum_.GetInt64() : i < minimum_.GetInt64())
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-            }
-            else if (minimum_.IsUint64()) {
-                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString()); // i <= max(int64_t) < minimum.GetUint64()
-            }
-            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!maximum_.IsNull()) {
-            if (maximum_.IsInt64()) {
-                if (exclusiveMaximum_ ? i >= maximum_.GetInt64() : i > maximum_.GetInt64())
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-            }
-            else if (maximum_.IsUint64())
-                /* do nothing */; // i <= max(int64_t) < maximum_.GetUint64()
-            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!multipleOf_.IsNull()) {
-            if (multipleOf_.IsUint64()) {
-                if (static_cast<uint64_t>(i >= 0 ? i : -i) % multipleOf_.GetUint64() != 0)
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-            }
-            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
-                return false;
-        }
-
-        return true;
-    }
-
-    bool CheckUint(Context& context, uint64_t i) const {
-        if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType))))
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetTypeString());
-
-        if (!minimum_.IsNull()) {
-            if (minimum_.IsUint64()) {
-                if (exclusiveMinimum_ ? i <= minimum_.GetUint64() : i < minimum_.GetUint64())
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-            }
-            else if (minimum_.IsInt64())
-                /* do nothing */; // i >= 0 > minimum.Getint64()
-            else if (!CheckDoubleMinimum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!maximum_.IsNull()) {
-            if (maximum_.IsUint64()) {
-                if (exclusiveMaximum_ ? i >= maximum_.GetUint64() : i > maximum_.GetUint64())
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-            }
-            else if (maximum_.IsInt64())
-                CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString()); // i >= 0 > maximum_
-            else if (!CheckDoubleMaximum(context, static_cast<double>(i)))
-                return false;
-        }
-
-        if (!multipleOf_.IsNull()) {
-            if (multipleOf_.IsUint64()) {
-                if (i % multipleOf_.GetUint64() != 0)
-                    CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-            }
-            else if (!CheckDoubleMultipleOf(context, static_cast<double>(i)))
-                return false;
-        }
-
-        return true;
-    }
-
-    bool CheckDoubleMinimum(Context& context, double d) const {
-        if (exclusiveMinimum_ ? d <= minimum_.GetDouble() : d < minimum_.GetDouble())
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMinimumString());
-        return true;
-    }
-
-    bool CheckDoubleMaximum(Context& context, double d) const {
-        if (exclusiveMaximum_ ? d >= maximum_.GetDouble() : d > maximum_.GetDouble())
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMaximumString());
-        return true;
-    }
-
-    bool CheckDoubleMultipleOf(Context& context, double d) const {
-        double a = std::abs(d), b = std::abs(multipleOf_.GetDouble());
-        double q = std::floor(a / b);
-        double r = a - q * b;
-        if (r > 0.0)
-            CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(GetMultipleOfString());
-        return true;
-    }
-
-    struct Property {
-        Property() : schema(), dependenciesSchema(), dependenciesValidatorIndex(), dependencies(), required(false) {}
-        ~Property() { AllocatorType::Free(dependencies); }
-        SValue name;
-        const SchemaType* schema;
-        const SchemaType* dependenciesSchema;
-        SizeType dependenciesValidatorIndex;
-        bool* dependencies;
-        bool required;
-    };
-
-    struct PatternProperty {
-        PatternProperty() : schema(), pattern() {}
-        ~PatternProperty() { 
-            if (pattern) {
-                pattern->~RegexType();
-                AllocatorType::Free(pattern);
-            }
-        }
-        const SchemaType* schema;
-        RegexType* pattern;
-    };
-
-    AllocatorType* allocator_;
-    uint64_t* enum_;
-    SizeType enumCount_;
-    SchemaArray allOf_;
-    SchemaArray anyOf_;
-    SchemaArray oneOf_;
-    const SchemaType* not_;
-    unsigned type_; // bitmask of kSchemaType
-    SizeType validatorCount_;
-    SizeType notValidatorIndex_;
-
-    Property* properties_;
-    const SchemaType* additionalPropertiesSchema_;
-    PatternProperty* patternProperties_;
-    SizeType patternPropertyCount_;
-    SizeType propertyCount_;
-    SizeType minProperties_;
-    SizeType maxProperties_;
-    bool additionalProperties_;
-    bool hasDependencies_;
-    bool hasRequired_;
-    bool hasSchemaDependencies_;
-
-    const SchemaType* additionalItemsSchema_;
-    const SchemaType* itemsList_;
-    const SchemaType** itemsTuple_;
-    SizeType itemsTupleCount_;
-    SizeType minItems_;
-    SizeType maxItems_;
-    bool additionalItems_;
-    bool uniqueItems_;
-
-    RegexType* pattern_;
-    SizeType minLength_;
-    SizeType maxLength_;
-
-    SValue minimum_;
-    SValue maximum_;
-    SValue multipleOf_;
-    bool exclusiveMinimum_;
-    bool exclusiveMaximum_;
-};
-
-template<typename Stack, typename Ch>
-struct TokenHelper {
-    CEREAL_RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        *documentStack.template Push<Ch>() = '/';
-        char buffer[21];
-        size_t length = static_cast<size_t>((sizeof(SizeType) == 4 ? u32toa(index, buffer) : u64toa(index, buffer)) - buffer);
-        for (size_t i = 0; i < length; i++)
-            *documentStack.template Push<Ch>() = buffer[i];
-    }
-};
-
-// Partial specialized version for char to prevent buffer copying.
-template <typename Stack>
-struct TokenHelper<Stack, char> {
-    CEREAL_RAPIDJSON_FORCEINLINE static void AppendIndexToken(Stack& documentStack, SizeType index) {
-        if (sizeof(SizeType) == 4) {
-            char *buffer = documentStack.template Push<char>(1 + 10); // '/' + uint
-            *buffer++ = '/';
-            const char* end = internal::u32toa(index, buffer);
-             documentStack.template Pop<char>(static_cast<size_t>(10 - (end - buffer)));
-        }
-        else {
-            char *buffer = documentStack.template Push<char>(1 + 20); // '/' + uint64
-            *buffer++ = '/';
-            const char* end = internal::u64toa(index, buffer);
-            documentStack.template Pop<char>(static_cast<size_t>(20 - (end - buffer)));
-        }
-    }
-};
-
-} // namespace internal
-
-///////////////////////////////////////////////////////////////////////////////
-// IGenericRemoteSchemaDocumentProvider
-
-template <typename SchemaDocumentType>
-class IGenericRemoteSchemaDocumentProvider {
-public:
-    typedef typename SchemaDocumentType::Ch Ch;
-
-    virtual ~IGenericRemoteSchemaDocumentProvider() {}
-    virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericSchemaDocument
-
-//! JSON schema document.
-/*!
-    A JSON schema document is a compiled version of a JSON schema.
-    It is basically a tree of internal::Schema.
-
-    \note This is an immutable class (i.e. its instance cannot be modified after construction).
-    \tparam ValueT Type of JSON value (e.g. \c Value ), which also determine the encoding.
-    \tparam Allocator Allocator type for allocating memory of this document.
-*/
-template <typename ValueT, typename Allocator = CrtAllocator>
-class GenericSchemaDocument {
-public:
-    typedef ValueT ValueType;
-    typedef IGenericRemoteSchemaDocumentProvider<GenericSchemaDocument> IRemoteSchemaDocumentProviderType;
-    typedef Allocator AllocatorType;
-    typedef typename ValueType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-    typedef internal::Schema<GenericSchemaDocument> SchemaType;
-    typedef GenericPointer<ValueType, Allocator> PointerType;
-    friend class internal::Schema<GenericSchemaDocument>;
-    template <typename, typename, typename>
-    friend class GenericSchemaValidator;
-
-    //! Constructor.
-    /*!
-        Compile a JSON document into schema document.
-
-        \param document A JSON document as source.
-        \param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
-        \param allocator An optional allocator instance for allocating memory. Can be null.
-    */
-    explicit GenericSchemaDocument(const ValueType& document, IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0) :
-        remoteProvider_(remoteProvider),
-        allocator_(allocator),
-        ownAllocator_(),
-        root_(),
-        schemaMap_(allocator, kInitialSchemaMapSize),
-        schemaRef_(allocator, kInitialSchemaRefSize)
-    {
-        if (!allocator_)
-            ownAllocator_ = allocator_ = CEREAL_RAPIDJSON_NEW(Allocator());
-
-        // Generate root schema, it will call CreateSchema() to create sub-schemas,
-        // And call AddRefSchema() if there are $ref.
-        CreateSchemaRecursive(&root_, PointerType(), document, document);
-
-        // Resolve $ref
-        while (!schemaRef_.Empty()) {
-            SchemaRefEntry* refEntry = schemaRef_.template Pop<SchemaRefEntry>(1);
-            if (const SchemaType* s = GetSchema(refEntry->target)) {
-                if (refEntry->schema)
-                    *refEntry->schema = s;
-
-                // Create entry in map if not exist
-                if (!GetSchema(refEntry->source)) {
-                    new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(refEntry->source, const_cast<SchemaType*>(s), false, allocator_);
-                }
-            }
-            refEntry->~SchemaRefEntry();
-        }
-
-        CEREAL_RAPIDJSON_ASSERT(root_ != 0);
-
-        schemaRef_.ShrinkToFit(); // Deallocate all memory for ref
-    }
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    //! Move constructor in C++11
-    GenericSchemaDocument(GenericSchemaDocument&& rhs) CEREAL_RAPIDJSON_NOEXCEPT :
-        remoteProvider_(rhs.remoteProvider_),
-        allocator_(rhs.allocator_),
-        ownAllocator_(rhs.ownAllocator_),
-        root_(rhs.root_),
-        schemaMap_(std::move(rhs.schemaMap_)),
-        schemaRef_(std::move(rhs.schemaRef_))
-    {
-        rhs.remoteProvider_ = 0;
-        rhs.allocator_ = 0;
-        rhs.ownAllocator_ = 0;
-    }
-#endif
-
-    //! Destructor
-    ~GenericSchemaDocument() {
-        while (!schemaMap_.Empty())
-            schemaMap_.template Pop<SchemaEntry>(1)->~SchemaEntry();
-
-        CEREAL_RAPIDJSON_DELETE(ownAllocator_);
-    }
-
-    //! Get the root schema.
-    const SchemaType& GetRoot() const { return *root_; }
-
-private:
-    //! Prohibit copying
-    GenericSchemaDocument(const GenericSchemaDocument&);
-    //! Prohibit assignment
-    GenericSchemaDocument& operator=(const GenericSchemaDocument&);
-
-    struct SchemaRefEntry {
-        SchemaRefEntry(const PointerType& s, const PointerType& t, const SchemaType** outSchema, Allocator *allocator) : source(s, allocator), target(t, allocator), schema(outSchema) {}
-        PointerType source;
-        PointerType target;
-        const SchemaType** schema;
-    };
-
-    struct SchemaEntry {
-        SchemaEntry(const PointerType& p, SchemaType* s, bool o, Allocator* allocator) : pointer(p, allocator), schema(s), owned(o) {}
-        ~SchemaEntry() {
-            if (owned) {
-                schema->~SchemaType();
-                Allocator::Free(schema);
-            }
-        }
-        PointerType pointer;
-        SchemaType* schema;
-        bool owned;
-    };
-
-    void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        if (schema)
-            *schema = SchemaType::GetTypeless();
-
-        if (v.GetType() == kObjectType) {
-            const SchemaType* s = GetSchema(pointer);
-            if (!s)
-                CreateSchema(schema, pointer, v, document);
-
-            for (typename ValueType::ConstMemberIterator itr = v.MemberBegin(); itr != v.MemberEnd(); ++itr)
-                CreateSchemaRecursive(0, pointer.Append(itr->name, allocator_), itr->value, document);
-        }
-        else if (v.GetType() == kArrayType)
-            for (SizeType i = 0; i < v.Size(); i++)
-                CreateSchemaRecursive(0, pointer.Append(i, allocator_), v[i], document);
-    }
-
-    void CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document) {
-        CEREAL_RAPIDJSON_ASSERT(pointer.IsValid());
-        if (v.IsObject()) {
-            if (!HandleRefSchema(pointer, schema, v, document)) {
-                SchemaType* s = new (allocator_->Malloc(sizeof(SchemaType))) SchemaType(this, pointer, v, document, allocator_);
-                new (schemaMap_.template Push<SchemaEntry>()) SchemaEntry(pointer, s, true, allocator_);
-                if (schema)
-                    *schema = s;
-            }
-        }
-    }
-
-    bool HandleRefSchema(const PointerType& source, const SchemaType** schema, const ValueType& v, const ValueType& document) {
-        static const Ch kRefString[] = { '$', 'r', 'e', 'f', '\0' };
-        static const ValueType kRefValue(kRefString, 4);
-
-        typename ValueType::ConstMemberIterator itr = v.FindMember(kRefValue);
-        if (itr == v.MemberEnd())
-            return false;
-
-        if (itr->value.IsString()) {
-            SizeType len = itr->value.GetStringLength();
-            if (len > 0) {
-                const Ch* s = itr->value.GetString();
-                SizeType i = 0;
-                while (i < len && s[i] != '#') // Find the first #
-                    i++;
-
-                if (i > 0) { // Remote reference, resolve immediately
-                    if (remoteProvider_) {
-                        if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(s, i - 1)) {
-                            PointerType pointer(&s[i], len - i, allocator_);
-                            if (pointer.IsValid()) {
-                                if (const SchemaType* sc = remoteDocument->GetSchema(pointer)) {
-                                    if (schema)
-                                        *schema = sc;
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                }
-                else if (s[i] == '#') { // Local reference, defer resolution
-                    PointerType pointer(&s[i], len - i, allocator_);
-                    if (pointer.IsValid()) {
-                        if (const ValueType* nv = pointer.Get(document))
-                            if (HandleRefSchema(source, schema, *nv, document))
-                                return true;
-
-                        new (schemaRef_.template Push<SchemaRefEntry>()) SchemaRefEntry(source, pointer, schema, allocator_);
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    const SchemaType* GetSchema(const PointerType& pointer) const {
-        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
-            if (pointer == target->pointer)
-                return target->schema;
-        return 0;
-    }
-
-    PointerType GetPointer(const SchemaType* schema) const {
-        for (const SchemaEntry* target = schemaMap_.template Bottom<SchemaEntry>(); target != schemaMap_.template End<SchemaEntry>(); ++target)
-            if (schema == target->schema)
-                return target->pointer;
-        return PointerType();
-    }
-
-    static const size_t kInitialSchemaMapSize = 64;
-    static const size_t kInitialSchemaRefSize = 64;
-
-    IRemoteSchemaDocumentProviderType* remoteProvider_;
-    Allocator *allocator_;
-    Allocator *ownAllocator_;
-    const SchemaType* root_;                //!< Root schema.
-    internal::Stack<Allocator> schemaMap_;  // Stores created Pointer -> Schemas
-    internal::Stack<Allocator> schemaRef_;  // Stores Pointer from $ref and schema which holds the $ref
-};
-
-//! GenericSchemaDocument using Value type.
-typedef GenericSchemaDocument<Value> SchemaDocument;
-//! IGenericRemoteSchemaDocumentProvider using SchemaDocument.
-typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
-
-///////////////////////////////////////////////////////////////////////////////
-// GenericSchemaValidator
-
-//! JSON Schema Validator.
-/*!
-    A SAX style JSON schema validator.
-    It uses a \c GenericSchemaDocument to validate SAX events.
-    It delegates the incoming SAX events to an output handler.
-    The default output handler does nothing.
-    It can be reused multiple times by calling \c Reset().
-
-    \tparam SchemaDocumentType Type of schema document.
-    \tparam OutputHandler Type of output handler. Default handler does nothing.
-    \tparam StateAllocator Allocator for storing the internal validation states.
-*/
-template <
-    typename SchemaDocumentType,
-    typename OutputHandler = BaseReaderHandler<typename SchemaDocumentType::SchemaType::EncodingType>,
-    typename StateAllocator = CrtAllocator>
-class GenericSchemaValidator :
-    public internal::ISchemaStateFactory<typename SchemaDocumentType::SchemaType>, 
-    public internal::ISchemaValidator
-{
-public:
-    typedef typename SchemaDocumentType::SchemaType SchemaType;
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename SchemaType::EncodingType EncodingType;
-    typedef typename EncodingType::Ch Ch;
-
-    //! Constructor without output handler.
-    /*!
-        \param schemaDocument The schema document to conform to.
-        \param allocator Optional allocator for storing internal validation states.
-        \param schemaStackCapacity Optional initial capacity of schema path stack.
-        \param documentStackCapacity Optional initial capacity of document path stack.
-    */
-    GenericSchemaValidator(
-        const SchemaDocumentType& schemaDocument,
-        StateAllocator* allocator = 0, 
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(schemaDocument.GetRoot()),
-        outputHandler_(GetNullHandler()),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        valid_(true)
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
-    {
-    }
-
-    //! Constructor with output handler.
-    /*!
-        \param schemaDocument The schema document to conform to.
-        \param allocator Optional allocator for storing internal validation states.
-        \param schemaStackCapacity Optional initial capacity of schema path stack.
-        \param documentStackCapacity Optional initial capacity of document path stack.
-    */
-    GenericSchemaValidator(
-        const SchemaDocumentType& schemaDocument,
-        OutputHandler& outputHandler,
-        StateAllocator* allocator = 0, 
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(schemaDocument.GetRoot()),
-        outputHandler_(outputHandler),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        valid_(true)
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(0)
-#endif
-    {
-    }
-
-    //! Destructor.
-    ~GenericSchemaValidator() {
-        Reset();
-        CEREAL_RAPIDJSON_DELETE(ownStateAllocator_);
-    }
-
-    //! Reset the internal states.
-    void Reset() {
-        while (!schemaStack_.Empty())
-            PopSchema();
-        documentStack_.Clear();
-        valid_ = true;
-    }
-
-    //! Checks whether the current state is valid.
-    // Implementation of ISchemaValidator
-    virtual bool IsValid() const { return valid_; }
-
-    //! Gets the JSON pointer pointed to the invalid schema.
-    PointerType GetInvalidSchemaPointer() const {
-        return schemaStack_.Empty() ? PointerType() : schemaDocument_->GetPointer(&CurrentSchema());
-    }
-
-    //! Gets the keyword of invalid schema.
-    const Ch* GetInvalidSchemaKeyword() const {
-        return schemaStack_.Empty() ? 0 : CurrentContext().invalidKeyword;
-    }
-
-    //! Gets the JSON pointer pointed to the invalid value.
-    PointerType GetInvalidDocumentPointer() const {
-        return documentStack_.Empty() ? PointerType() : PointerType(documentStack_.template Bottom<Ch>(), documentStack_.GetSize() / sizeof(Ch));
-    }
-
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
-CEREAL_RAPIDJSON_MULTILINEMACRO_BEGIN\
-    *documentStack_.template Push<Ch>() = '\0';\
-    documentStack_.template Pop<Ch>(1);\
-    internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
-CEREAL_RAPIDJSON_MULTILINEMACRO_END
-#else
-#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
-#endif
-
-#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
-    if (!valid_) return false; \
-    if (!BeginValue() || !CurrentSchema().method arg1) {\
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
-        return valid_ = false;\
-    }
-
-#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
-    for (Context* context = schemaStack_.template Bottom<Context>(); context != schemaStack_.template End<Context>(); context++) {\
-        if (context->hasher)\
-            static_cast<HasherType*>(context->hasher)->method arg2;\
-        if (context->validators)\
-            for (SizeType i_ = 0; i_ < context->validatorCount; i_++)\
-                static_cast<GenericSchemaValidator*>(context->validators[i_])->method arg2;\
-        if (context->patternPropertiesValidators)\
-            for (SizeType i_ = 0; i_ < context->patternPropertiesValidatorCount; i_++)\
-                static_cast<GenericSchemaValidator*>(context->patternPropertiesValidators[i_])->method arg2;\
-    }
-
-#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_(method, arg2)\
-    return valid_ = EndValue() && outputHandler_.method arg2
-
-#define CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(method, arg1, arg2) \
-    CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_   (method, arg1);\
-    CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2);\
-    CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_     (method, arg2)
-
-    bool Null()             { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Null,   (CurrentContext()   ), ( )); }
-    bool Bool(bool b)       { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Bool,   (CurrentContext(), b), (b)); }
-    bool Int(int i)         { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int,    (CurrentContext(), i), (i)); }
-    bool Uint(unsigned u)   { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint,   (CurrentContext(), u), (u)); }
-    bool Int64(int64_t i)   { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Int64,  (CurrentContext(), i), (i)); }
-    bool Uint64(uint64_t u) { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Uint64, (CurrentContext(), u), (u)); }
-    bool Double(double d)   { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(Double, (CurrentContext(), d), (d)); }
-    bool RawNumber(const Ch* str, SizeType length, bool copy)
-                                    { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
-    bool String(const Ch* str, SizeType length, bool copy)
-                                    { CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
-
-    bool StartObject() {
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
-        return valid_ = outputHandler_.StartObject();
-    }
-    
-    bool Key(const Ch* str, SizeType len, bool copy) {
-        if (!valid_) return false;
-        AppendToken(str, len);
-        if (!CurrentSchema().Key(CurrentContext(), str, len, copy)) return valid_ = false;
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
-        return valid_ = outputHandler_.Key(str, len, copy);
-    }
-    
-    bool EndObject(SizeType memberCount) { 
-        if (!valid_) return false;
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
-        if (!CurrentSchema().EndObject(CurrentContext(), memberCount)) return valid_ = false;
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
-    }
-
-    bool StartArray() {
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
-        return valid_ = outputHandler_.StartArray();
-    }
-    
-    bool EndArray(SizeType elementCount) {
-        if (!valid_) return false;
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
-        if (!CurrentSchema().EndArray(CurrentContext(), elementCount)) return valid_ = false;
-        CEREAL_RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
-    }
-
-#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
-#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_BEGIN_
-#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
-#undef CEREAL_RAPIDJSON_SCHEMA_HANDLE_VALUE_
-
-    // Implementation of ISchemaStateFactory<SchemaType>
-    virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root) {
-        return new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root,
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-        depth_ + 1,
-#endif
-        &GetStateAllocator());
-    }
-
-    virtual void DestroySchemaValidator(ISchemaValidator* validator) {
-        GenericSchemaValidator* v = static_cast<GenericSchemaValidator*>(validator);
-        v->~GenericSchemaValidator();
-        StateAllocator::Free(v);
-    }
-
-    virtual void* CreateHasher() {
-        return new (GetStateAllocator().Malloc(sizeof(HasherType))) HasherType(&GetStateAllocator());
-    }
-
-    virtual uint64_t GetHashCode(void* hasher) {
-        return static_cast<HasherType*>(hasher)->GetHashCode();
-    }
-
-    virtual void DestroryHasher(void* hasher) {
-        HasherType* h = static_cast<HasherType*>(hasher);
-        h->~HasherType();
-        StateAllocator::Free(h);
-    }
-
-    virtual void* MallocState(size_t size) {
-        return GetStateAllocator().Malloc(size);
-    }
-
-    virtual void FreeState(void* p) {
-        return StateAllocator::Free(p);
-    }
-
-private:
-    typedef typename SchemaType::Context Context;
-    typedef GenericValue<UTF8<>, StateAllocator> HashCodeArray;
-    typedef internal::Hasher<EncodingType, StateAllocator> HasherType;
-
-    GenericSchemaValidator( 
-        const SchemaDocumentType& schemaDocument,
-        const SchemaType& root,
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-        unsigned depth,
-#endif
-        StateAllocator* allocator = 0,
-        size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
-        size_t documentStackCapacity = kDefaultDocumentStackCapacity)
-        :
-        schemaDocument_(&schemaDocument),
-        root_(root),
-        outputHandler_(GetNullHandler()),
-        stateAllocator_(allocator),
-        ownStateAllocator_(0),
-        schemaStack_(allocator, schemaStackCapacity),
-        documentStack_(allocator, documentStackCapacity),
-        valid_(true)
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-        , depth_(depth)
-#endif
-    {
-    }
-
-    StateAllocator& GetStateAllocator() {
-        if (!stateAllocator_)
-            stateAllocator_ = ownStateAllocator_ = CEREAL_RAPIDJSON_NEW(StateAllocator());
-        return *stateAllocator_;
-    }
-
-    bool BeginValue() {
-        if (schemaStack_.Empty())
-            PushSchema(root_);
-        else {
-            if (CurrentContext().inArray)
-                internal::TokenHelper<internal::Stack<StateAllocator>, Ch>::AppendIndexToken(documentStack_, CurrentContext().arrayElementIndex);
-
-            if (!CurrentSchema().BeginValue(CurrentContext()))
-                return false;
-
-            SizeType count = CurrentContext().patternPropertiesSchemaCount;
-            const SchemaType** sa = CurrentContext().patternPropertiesSchemas;
-            typename Context::PatternValidatorType patternValidatorType = CurrentContext().valuePatternValidatorType;
-            bool valueUniqueness = CurrentContext().valueUniqueness;
-            if (CurrentContext().valueSchema)
-                PushSchema(*CurrentContext().valueSchema);
-
-            if (count > 0) {
-                CurrentContext().objectPatternValidatorType = patternValidatorType;
-                ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
-                SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
-                va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
-                for (SizeType i = 0; i < count; i++)
-                    va[validatorCount++] = CreateSchemaValidator(*sa[i]);
-            }
-
-            CurrentContext().arrayUniqueness = valueUniqueness;
-        }
-        return true;
-    }
-
-    bool EndValue() {
-        if (!CurrentSchema().EndValue(CurrentContext()))
-            return false;
-
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-        GenericStringBuffer<EncodingType> sb;
-        schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
-
-        *documentStack_.template Push<Ch>() = '\0';
-        documentStack_.template Pop<Ch>(1);
-        internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
-#endif
-
-        uint64_t h = CurrentContext().arrayUniqueness ? static_cast<HasherType*>(CurrentContext().hasher)->GetHashCode() : 0;
-        
-        PopSchema();
-
-        if (!schemaStack_.Empty()) {
-            Context& context = CurrentContext();
-            if (context.valueUniqueness) {
-                HashCodeArray* a = static_cast<HashCodeArray*>(context.arrayElementHashCodes);
-                if (!a)
-                    CurrentContext().arrayElementHashCodes = a = new (GetStateAllocator().Malloc(sizeof(HashCodeArray))) HashCodeArray(kArrayType);
-                for (typename HashCodeArray::ConstValueIterator itr = a->Begin(); itr != a->End(); ++itr)
-                    if (itr->GetUint64() == h)
-                        CEREAL_RAPIDJSON_INVALID_KEYWORD_RETURN(SchemaType::GetUniqueItemsString());
-                a->PushBack(h, GetStateAllocator());
-            }
-        }
-
-        // Remove the last token of document pointer
-        while (!documentStack_.Empty() && *documentStack_.template Pop<Ch>(1) != '/')
-            ;
-
-        return true;
-    }
-
-    void AppendToken(const Ch* str, SizeType len) {
-        documentStack_.template Reserve<Ch>(1 + len * 2); // worst case all characters are escaped as two characters
-        *documentStack_.template PushUnsafe<Ch>() = '/';
-        for (SizeType i = 0; i < len; i++) {
-            if (str[i] == '~') {
-                *documentStack_.template PushUnsafe<Ch>() = '~';
-                *documentStack_.template PushUnsafe<Ch>() = '0';
-            }
-            else if (str[i] == '/') {
-                *documentStack_.template PushUnsafe<Ch>() = '~';
-                *documentStack_.template PushUnsafe<Ch>() = '1';
-            }
-            else
-                *documentStack_.template PushUnsafe<Ch>() = str[i];
-        }
-    }
-
-    CEREAL_RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, &schema); }
-    
-    CEREAL_RAPIDJSON_FORCEINLINE void PopSchema() {
-        Context* c = schemaStack_.template Pop<Context>(1);
-        if (HashCodeArray* a = static_cast<HashCodeArray*>(c->arrayElementHashCodes)) {
-            a->~HashCodeArray();
-            StateAllocator::Free(a);
-        }
-        c->~Context();
-    }
-
-    const SchemaType& CurrentSchema() const { return *schemaStack_.template Top<Context>()->schema; }
-    Context& CurrentContext() { return *schemaStack_.template Top<Context>(); }
-    const Context& CurrentContext() const { return *schemaStack_.template Top<Context>(); }
-
-    static OutputHandler& GetNullHandler() {
-        static OutputHandler nullHandler;
-        return nullHandler;
-    }
-
-    static const size_t kDefaultSchemaStackCapacity = 1024;
-    static const size_t kDefaultDocumentStackCapacity = 256;
-    const SchemaDocumentType* schemaDocument_;
-    const SchemaType& root_;
-    OutputHandler& outputHandler_;
-    StateAllocator* stateAllocator_;
-    StateAllocator* ownStateAllocator_;
-    internal::Stack<StateAllocator> schemaStack_;    //!< stack to store the current path of schema (BaseSchemaType *)
-    internal::Stack<StateAllocator> documentStack_;  //!< stack to store the current path of validating document (Ch)
-    bool valid_;
-#if CEREAL_RAPIDJSON_SCHEMA_VERBOSE
-    unsigned depth_;
-#endif
-};
-
-typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
-
-///////////////////////////////////////////////////////////////////////////////
-// SchemaValidatingReader
-
-//! A helper class for parsing with validation.
-/*!
-    This helper class is a functor, designed as a parameter of \ref GenericDocument::Populate().
-
-    \tparam parseFlags Combination of \ref ParseFlag.
-    \tparam InputStream Type of input stream, implementing Stream concept.
-    \tparam SourceEncoding Encoding of the input stream.
-    \tparam SchemaDocumentType Type of schema document.
-    \tparam StackAllocator Allocator type for stack.
-*/
-template <
-    unsigned parseFlags,
-    typename InputStream,
-    typename SourceEncoding,
-    typename SchemaDocumentType = SchemaDocument,
-    typename StackAllocator = CrtAllocator>
-class SchemaValidatingReader {
-public:
-    typedef typename SchemaDocumentType::PointerType PointerType;
-    typedef typename InputStream::Ch Ch;
-
-    //! Constructor
-    /*!
-        \param is Input stream.
-        \param sd Schema document.
-    */
-    SchemaValidatingReader(InputStream& is, const SchemaDocumentType& sd) : is_(is), sd_(sd), invalidSchemaKeyword_(), isValid_(true) {}
-
-    template <typename Handler>
-    bool operator()(Handler& handler) {
-        GenericReader<SourceEncoding, typename SchemaDocumentType::EncodingType, StackAllocator> reader;
-        GenericSchemaValidator<SchemaDocumentType, Handler> validator(sd_, handler);
-        parseResult_ = reader.template Parse<parseFlags>(is_, validator);
-
-        isValid_ = validator.IsValid();
-        if (isValid_) {
-            invalidSchemaPointer_ = PointerType();
-            invalidSchemaKeyword_ = 0;
-            invalidDocumentPointer_ = PointerType();
-        }
-        else {
-            invalidSchemaPointer_ = validator.GetInvalidSchemaPointer();
-            invalidSchemaKeyword_ = validator.GetInvalidSchemaKeyword();
-            invalidDocumentPointer_ = validator.GetInvalidDocumentPointer();
-        }
-
-        return parseResult_;
-    }
-
-    const ParseResult& GetParseResult() const { return parseResult_; }
-    bool IsValid() const { return isValid_; }
-    const PointerType& GetInvalidSchemaPointer() const { return invalidSchemaPointer_; }
-    const Ch* GetInvalidSchemaKeyword() const { return invalidSchemaKeyword_; }
-    const PointerType& GetInvalidDocumentPointer() const { return invalidDocumentPointer_; }
-
-private:
-    InputStream& is_;
-    const SchemaDocumentType& sd_;
-
-    ParseResult parseResult_;
-    PointerType invalidSchemaPointer_;
-    const Ch* invalidSchemaKeyword_;
-    PointerType invalidDocumentPointer_;
-    bool isValid_;
-};
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-CEREAL_RAPIDJSON_DIAG_POP
-
-#endif // CEREAL_RAPIDJSON_SCHEMA_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/stream.h b/Src/External/cereal/include/cereal/external/rapidjson/stream.h
deleted file mode 100644
index c05c2d4..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/stream.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#include "rapidjson.h"
-
-#ifndef CEREAL_RAPIDJSON_STREAM_H_
-#define CEREAL_RAPIDJSON_STREAM_H_
-
-#include "encodings.h"
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-//  Stream
-
-/*! \class rapidjson::Stream
-    \brief Concept for reading and writing characters.
-
-    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
-
-    For write-only stream, only need to implement Put() and Flush().
-
-\code
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.
-    //! \return Number of characters read from start.
-    size_t Tell();
-
-    //! Begin writing operation at the current read pointer.
-    //! \return The begin writer pointer.
-    Ch* PutBegin();
-
-    //! Write a character.
-    void Put(Ch c);
-
-    //! Flush the buffer.
-    void Flush();
-
-    //! End the writing operation.
-    //! \param begin The begin write pointer returned by PutBegin().
-    //! \return Number of characters written.
-    size_t PutEnd(Ch* begin);
-}
-\endcode
-*/
-
-//! Provides additional information for stream.
-/*!
-    By using traits pattern, this type provides a default configuration for stream.
-    For custom stream, this type can be specialized for other configuration.
-    See TEST(Reader, CustomStringStream) in readertest.cpp for example.
-*/
-template<typename Stream>
-struct StreamTraits {
-    //! Whether to make local copy of stream for optimization during parsing.
-    /*!
-        By default, for safety, streams do not use local copy optimization.
-        Stream that can be copied fast should specialize this, like StreamTraits<StringStream>.
-    */
-    enum { copyOptimization = 0 };
-};
-
-//! Reserve n characters for writing to a stream.
-template<typename Stream>
-inline void PutReserve(Stream& stream, size_t count) {
-    (void)stream;
-    (void)count;
-}
-
-//! Write character to a stream, presuming buffer is reserved.
-template<typename Stream>
-inline void PutUnsafe(Stream& stream, typename Stream::Ch c) {
-    stream.Put(c);
-}
-
-//! Put N copies of a character to a stream.
-template<typename Stream, typename Ch>
-inline void PutN(Stream& stream, Ch c, size_t n) {
-    PutReserve(stream, n);
-    for (size_t i = 0; i < n; i++)
-        PutUnsafe(stream, c);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// StringStream
-
-//! Read-only string stream.
-/*! \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringStream(const Ch *src) : src_(src), head_(src) {}
-
-    Ch Peek() const { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() const { return static_cast<size_t>(src_ - head_); }
-
-    Ch* PutBegin() { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-    void Put(Ch) { CEREAL_RAPIDJSON_ASSERT(false); }
-    void Flush() { CEREAL_RAPIDJSON_ASSERT(false); }
-    size_t PutEnd(Ch*) { CEREAL_RAPIDJSON_ASSERT(false); return 0; }
-
-    const Ch* src_;     //!< Current read position.
-    const Ch* head_;    //!< Original head of the string.
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! String stream with UTF8 encoding.
-typedef GenericStringStream<UTF8<> > StringStream;
-
-///////////////////////////////////////////////////////////////////////////////
-// InsituStringStream
-
-//! A read-write string stream.
-/*! This string stream is particularly designed for in-situ parsing.
-    \note implements Stream concept
-*/
-template <typename Encoding>
-struct GenericInsituStringStream {
-    typedef typename Encoding::Ch Ch;
-
-    GenericInsituStringStream(Ch *src) : src_(src), dst_(0), head_(src) {}
-
-    // Read
-    Ch Peek() { return *src_; }
-    Ch Take() { return *src_++; }
-    size_t Tell() { return static_cast<size_t>(src_ - head_); }
-
-    // Write
-    void Put(Ch c) { CEREAL_RAPIDJSON_ASSERT(dst_ != 0); *dst_++ = c; }
-
-    Ch* PutBegin() { return dst_ = src_; }
-    size_t PutEnd(Ch* begin) { return static_cast<size_t>(dst_ - begin); }
-    void Flush() {}
-
-    Ch* Push(size_t count) { Ch* begin = dst_; dst_ += count; return begin; }
-    void Pop(size_t count) { dst_ -= count; }
-
-    Ch* src_;
-    Ch* dst_;
-    Ch* head_;
-};
-
-template <typename Encoding>
-struct StreamTraits<GenericInsituStringStream<Encoding> > {
-    enum { copyOptimization = 1 };
-};
-
-//! Insitu string stream with UTF8 encoding.
-typedef GenericInsituStringStream<UTF8<> > InsituStringStream;
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#endif // CEREAL_RAPIDJSON_STREAM_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h b/Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h
deleted file mode 100644
index 76eb730..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/stringbuffer.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_STRINGBUFFER_H_
-#define CEREAL_RAPIDJSON_STRINGBUFFER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-#include <utility> // std::move
-#endif
-
-#include "internal/stack.h"
-
-#if defined(__clang__)
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(c++98-compat)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-//! Represents an in-memory output stream.
-/*!
-    \tparam Encoding Encoding of the stream.
-    \tparam Allocator type for allocating memory buffer.
-    \note implements Stream concept
-*/
-template <typename Encoding, typename Allocator = CrtAllocator>
-class GenericStringBuffer {
-public:
-    typedef typename Encoding::Ch Ch;
-
-    GenericStringBuffer(Allocator* allocator = 0, size_t capacity = kDefaultCapacity) : stack_(allocator, capacity) {}
-
-#if CEREAL_RAPIDJSON_HAS_CXX11_RVALUE_REFS
-    GenericStringBuffer(GenericStringBuffer&& rhs) : stack_(std::move(rhs.stack_)) {}
-    GenericStringBuffer& operator=(GenericStringBuffer&& rhs) {
-        if (&rhs != this)
-            stack_ = std::move(rhs.stack_);
-        return *this;
-    }
-#endif
-
-    void Put(Ch c) { *stack_.template Push<Ch>() = c; }
-    void PutUnsafe(Ch c) { *stack_.template PushUnsafe<Ch>() = c; }
-    void Flush() {}
-
-    void Clear() { stack_.Clear(); }
-    void ShrinkToFit() {
-        // Push and pop a null terminator. This is safe.
-        *stack_.template Push<Ch>() = '\0';
-        stack_.ShrinkToFit();
-        stack_.template Pop<Ch>(1);
-    }
-
-    void Reserve(size_t count) { stack_.template Reserve<Ch>(count); }
-    Ch* Push(size_t count) { return stack_.template Push<Ch>(count); }
-    Ch* PushUnsafe(size_t count) { return stack_.template PushUnsafe<Ch>(count); }
-    void Pop(size_t count) { stack_.template Pop<Ch>(count); }
-
-    const Ch* GetString() const {
-        // Push and pop a null terminator. This is safe.
-        *stack_.template Push<Ch>() = '\0';
-        stack_.template Pop<Ch>(1);
-
-        return stack_.template Bottom<Ch>();
-    }
-
-    size_t GetSize() const { return stack_.GetSize(); }
-
-    static const size_t kDefaultCapacity = 256;
-    mutable internal::Stack<Allocator> stack_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    GenericStringBuffer(const GenericStringBuffer&);
-    GenericStringBuffer& operator=(const GenericStringBuffer&);
-};
-
-//! String buffer with UTF8 encoding
-typedef GenericStringBuffer<UTF8<> > StringBuffer;
-
-template<typename Encoding, typename Allocator>
-inline void PutReserve(GenericStringBuffer<Encoding, Allocator>& stream, size_t count) {
-    stream.Reserve(count);
-}
-
-template<typename Encoding, typename Allocator>
-inline void PutUnsafe(GenericStringBuffer<Encoding, Allocator>& stream, typename Encoding::Ch c) {
-    stream.PutUnsafe(c);
-}
-
-//! Implement specialized version of PutN() with memset() for better performance.
-template<>
-inline void PutN(GenericStringBuffer<UTF8<> >& stream, char c, size_t n) {
-    std::memset(stream.stack_.Push<char>(n), c, n * sizeof(c));
-}
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#if defined(__clang__)
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_STRINGBUFFER_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidjson/writer.h b/Src/External/cereal/include/cereal/external/rapidjson/writer.h
deleted file mode 100644
index ae86cb5..0000000
--- a/Src/External/cereal/include/cereal/external/rapidjson/writer.h
+++ /dev/null
@@ -1,610 +0,0 @@
-// Tencent is pleased to support the open source community by making RapidJSON available.
-// 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
-//
-// Licensed under the MIT License (the "License"); you may not use this file except
-// in compliance with the License. You may obtain a copy of the License at
-//
-// http://opensource.org/licenses/MIT
-//
-// Unless required by applicable law or agreed to in writing, software distributed 
-// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
-// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
-// specific language governing permissions and limitations under the License.
-
-#ifndef CEREAL_RAPIDJSON_WRITER_H_
-#define CEREAL_RAPIDJSON_WRITER_H_
-
-#include "stream.h"
-#include "internal/stack.h"
-#include "internal/strfunc.h"
-#include "internal/dtoa.h"
-#include "internal/itoa.h"
-#include "stringbuffer.h"
-#include <new>      // placement new
-
-#if defined(CEREAL_RAPIDJSON_SIMD) && defined(_MSC_VER)
-#include <intrin.h>
-#pragma intrinsic(_BitScanForward)
-#endif
-#ifdef CEREAL_RAPIDJSON_SSE42
-#include <nmmintrin.h>
-#elif defined(CEREAL_RAPIDJSON_SSE2)
-#include <emmintrin.h>
-#endif
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_PUSH
-CEREAL_RAPIDJSON_DIAG_OFF(padded)
-CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
-#endif
-
-CEREAL_RAPIDJSON_NAMESPACE_BEGIN
-
-///////////////////////////////////////////////////////////////////////////////
-// WriteFlag
-
-/*! \def CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS 
-    \ingroup CEREAL_RAPIDJSON_CONFIG
-    \brief User-defined kWriteDefaultFlags definition.
-
-    User can define this as any \c WriteFlag combinations.
-*/
-#ifndef CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS
-#define CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS kWriteNoFlags
-#endif
-
-//! Combination of writeFlags
-enum WriteFlag {
-    kWriteNoFlags = 0,              //!< No flags are set.
-    kWriteValidateEncodingFlag = 1, //!< Validate encoding of JSON strings.
-    kWriteNanAndInfFlag = 2,        //!< Allow writing of Inf, -Inf and NaN.
-    kWriteDefaultFlags = CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS  //!< Default write flags. Can be customized by defining CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS
-};
-
-//! JSON writer
-/*! Writer implements the concept Handler.
-    It generates JSON text by events to an output os.
-
-    User may programmatically calls the functions of a writer to generate JSON text.
-
-    On the other side, a writer can also be passed to objects that generates events, 
-
-    for example Reader::Parse() and Document::Accept().
-
-    \tparam OutputStream Type of output stream.
-    \tparam SourceEncoding Encoding of source string.
-    \tparam TargetEncoding Encoding of output stream.
-    \tparam StackAllocator Type of allocator for allocating memory of stack.
-    \note implements Handler concept
-*/
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
-class Writer {
-public:
-    typedef typename SourceEncoding::Ch Ch;
-
-    static const int kDefaultMaxDecimalPlaces = 324;
-
-    //! Constructor
-    /*! \param os Output stream.
-        \param stackAllocator User supplied allocator. If it is null, it will create a private one.
-        \param levelDepth Initial capacity of stack.
-    */
-    explicit
-    Writer(OutputStream& os, StackAllocator* stackAllocator = 0, size_t levelDepth = kDefaultLevelDepth) : 
-        os_(&os), level_stack_(stackAllocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
-
-    explicit
-    Writer(StackAllocator* allocator = 0, size_t levelDepth = kDefaultLevelDepth) :
-        os_(0), level_stack_(allocator, levelDepth * sizeof(Level)), maxDecimalPlaces_(kDefaultMaxDecimalPlaces), hasRoot_(false) {}
-
-    //! Reset the writer with a new stream.
-    /*!
-        This function reset the writer with a new stream and default settings,
-        in order to make a Writer object reusable for output multiple JSONs.
-
-        \param os New output stream.
-        \code
-        Writer<OutputStream> writer(os1);
-        writer.StartObject();
-        // ...
-        writer.EndObject();
-
-        writer.Reset(os2);
-        writer.StartObject();
-        // ...
-        writer.EndObject();
-        \endcode
-    */
-    void Reset(OutputStream& os) {
-        os_ = &os;
-        hasRoot_ = false;
-        level_stack_.Clear();
-    }
-
-    //! Checks whether the output is a complete JSON.
-    /*!
-        A complete JSON has a complete root object or array.
-    */
-    bool IsComplete() const {
-        return hasRoot_ && level_stack_.Empty();
-    }
-
-    int GetMaxDecimalPlaces() const {
-        return maxDecimalPlaces_;
-    }
-
-    //! Sets the maximum number of decimal places for double output.
-    /*!
-        This setting truncates the output with specified number of decimal places.
-
-        For example, 
-
-        \code
-        writer.SetMaxDecimalPlaces(3);
-        writer.StartArray();
-        writer.Double(0.12345);                 // "0.123"
-        writer.Double(0.0001);                  // "0.0"
-        writer.Double(1.234567890123456e30);    // "1.234567890123456e30" (do not truncate significand for positive exponent)
-        writer.Double(1.23e-4);                 // "0.0"                  (do truncate significand for negative exponent)
-        writer.EndArray();
-        \endcode
-
-        The default setting does not truncate any decimal places. You can restore to this setting by calling
-        \code
-        writer.SetMaxDecimalPlaces(Writer::kDefaultMaxDecimalPlaces);
-        \endcode
-    */
-    void SetMaxDecimalPlaces(int maxDecimalPlaces) {
-        maxDecimalPlaces_ = maxDecimalPlaces;
-    }
-
-    /*!@name Implementation of Handler
-        \see Handler
-    */
-    //@{
-
-    bool Null()                 { Prefix(kNullType);   return EndValue(WriteNull()); }
-    bool Bool(bool b)           { Prefix(b ? kTrueType : kFalseType); return EndValue(WriteBool(b)); }
-    bool Int(int i)             { Prefix(kNumberType); return EndValue(WriteInt(i)); }
-    bool Uint(unsigned u)       { Prefix(kNumberType); return EndValue(WriteUint(u)); }
-    bool Int64(int64_t i64)     { Prefix(kNumberType); return EndValue(WriteInt64(i64)); }
-    bool Uint64(uint64_t u64)   { Prefix(kNumberType); return EndValue(WriteUint64(u64)); }
-
-    //! Writes the given \c double value to the stream
-    /*!
-        \param d The value to be written.
-        \return Whether it is succeed.
-    */
-    bool Double(double d)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
-
-    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        Prefix(kNumberType);
-        return EndValue(WriteString(str, length));
-    }
-
-    bool String(const Ch* str, SizeType length, bool copy = false) {
-        (void)copy;
-        Prefix(kStringType);
-        return EndValue(WriteString(str, length));
-    }
-
-#if CEREAL_RAPIDJSON_HAS_STDSTRING
-    bool String(const std::basic_string<Ch>& str) {
-        return String(str.data(), SizeType(str.size()));
-    }
-#endif
-
-    bool StartObject() {
-        Prefix(kObjectType);
-        new (level_stack_.template Push<Level>()) Level(false);
-        return WriteStartObject();
-    }
-
-    bool Key(const Ch* str, SizeType length, bool copy = false) { return String(str, length, copy); }
-
-    bool EndObject(SizeType memberCount = 0) {
-        (void)memberCount;
-        CEREAL_RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-        CEREAL_RAPIDJSON_ASSERT(!level_stack_.template Top<Level>()->inArray);
-        level_stack_.template Pop<Level>(1);
-        return EndValue(WriteEndObject());
-    }
-
-    bool StartArray() {
-        Prefix(kArrayType);
-        new (level_stack_.template Push<Level>()) Level(true);
-        return WriteStartArray();
-    }
-
-    bool EndArray(SizeType elementCount = 0) {
-        (void)elementCount;
-        CEREAL_RAPIDJSON_ASSERT(level_stack_.GetSize() >= sizeof(Level));
-        CEREAL_RAPIDJSON_ASSERT(level_stack_.template Top<Level>()->inArray);
-        level_stack_.template Pop<Level>(1);
-        return EndValue(WriteEndArray());
-    }
-    //@}
-
-    /*! @name Convenience extensions */
-    //@{
-
-    //! Simpler but slower overload.
-    bool String(const Ch* str) { return String(str, internal::StrLen(str)); }
-    bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
-
-    //@}
-
-    //! Write a raw JSON value.
-    /*!
-        For user to write a stringified JSON as a value.
-
-        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
-        \param length Length of the json.
-        \param type Type of the root of json.
-    */
-    bool RawValue(const Ch* json, size_t length, Type type) { Prefix(type); return EndValue(WriteRawValue(json, length)); }
-
-protected:
-    //! Information for each nested level
-    struct Level {
-        Level(bool inArray_) : valueCount(0), inArray(inArray_) {}
-        size_t valueCount;  //!< number of values in this level
-        bool inArray;       //!< true if in array, otherwise in object
-    };
-
-    static const size_t kDefaultLevelDepth = 32;
-
-    bool WriteNull()  {
-        PutReserve(*os_, 4);
-        PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 'l'); return true;
-    }
-
-    bool WriteBool(bool b)  {
-        if (b) {
-            PutReserve(*os_, 4);
-            PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'r'); PutUnsafe(*os_, 'u'); PutUnsafe(*os_, 'e');
-        }
-        else {
-            PutReserve(*os_, 5);
-            PutUnsafe(*os_, 'f'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'l'); PutUnsafe(*os_, 's'); PutUnsafe(*os_, 'e');
-        }
-        return true;
-    }
-
-    bool WriteInt(int i) {
-        char buffer[11];
-        const char* end = internal::i32toa(i, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteUint(unsigned u) {
-        char buffer[10];
-        const char* end = internal::u32toa(u, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteInt64(int64_t i64) {
-        char buffer[21];
-        const char* end = internal::i64toa(i64, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (const char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteUint64(uint64_t u64) {
-        char buffer[20];
-        char* end = internal::u64toa(u64, buffer);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteDouble(double d) {
-        if (internal::Double(d).IsNanOrInf()) {
-            if (!(writeFlags & kWriteNanAndInfFlag))
-                return false;
-            if (internal::Double(d).IsNan()) {
-                PutReserve(*os_, 3);
-                PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
-                return true;
-            }
-            if (internal::Double(d).Sign()) {
-                PutReserve(*os_, 9);
-                PutUnsafe(*os_, '-');
-            }
-            else
-                PutReserve(*os_, 8);
-            PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
-            PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
-            return true;
-        }
-
-        char buffer[25];
-        char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
-        PutReserve(*os_, static_cast<size_t>(end - buffer));
-        for (char* p = buffer; p != end; ++p)
-            PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(*p));
-        return true;
-    }
-
-    bool WriteString(const Ch* str, SizeType length)  {
-        static const typename TargetEncoding::Ch hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        static const char escape[256] = {
-#define Z16 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-            //0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't', 'n', 'u', 'f', 'r', 'u', 'u', // 00
-            'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', // 10
-              0,   0, '"',   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, // 20
-            Z16, Z16,                                                                       // 30~4F
-              0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,'\\',   0,   0,   0, // 50
-            Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16, Z16                                // 60~FF
-#undef Z16
-        };
-
-        if (TargetEncoding::supportUnicode)
-            PutReserve(*os_, 2 + length * 6); // "\uxxxx..."
-        else
-            PutReserve(*os_, 2 + length * 12);  // "\uxxxx\uyyyy..."
-
-        PutUnsafe(*os_, '\"');
-        GenericStringStream<SourceEncoding> is(str);
-        while (ScanWriteUnescapedString(is, length)) {
-            const Ch c = is.Peek();
-            if (!TargetEncoding::supportUnicode && static_cast<unsigned>(c) >= 0x80) {
-                // Unicode escaping
-                unsigned codepoint;
-                if (CEREAL_RAPIDJSON_UNLIKELY(!SourceEncoding::Decode(is, &codepoint)))
-                    return false;
-                PutUnsafe(*os_, '\\');
-                PutUnsafe(*os_, 'u');
-                if (codepoint <= 0xD7FF || (codepoint >= 0xE000 && codepoint <= 0xFFFF)) {
-                    PutUnsafe(*os_, hexDigits[(codepoint >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(codepoint      ) & 15]);
-                }
-                else {
-                    CEREAL_RAPIDJSON_ASSERT(codepoint >= 0x010000 && codepoint <= 0x10FFFF);
-                    // Surrogate pair
-                    unsigned s = codepoint - 0x010000;
-                    unsigned lead = (s >> 10) + 0xD800;
-                    unsigned trail = (s & 0x3FF) + 0xDC00;
-                    PutUnsafe(*os_, hexDigits[(lead >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(lead      ) & 15]);
-                    PutUnsafe(*os_, '\\');
-                    PutUnsafe(*os_, 'u');
-                    PutUnsafe(*os_, hexDigits[(trail >> 12) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail >>  8) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail >>  4) & 15]);
-                    PutUnsafe(*os_, hexDigits[(trail      ) & 15]);                    
-                }
-            }
-            else if ((sizeof(Ch) == 1 || static_cast<unsigned>(c) < 256) && CEREAL_RAPIDJSON_UNLIKELY(escape[static_cast<unsigned char>(c)]))  {
-                is.Take();
-                PutUnsafe(*os_, '\\');
-                PutUnsafe(*os_, static_cast<typename TargetEncoding::Ch>(escape[static_cast<unsigned char>(c)]));
-                if (escape[static_cast<unsigned char>(c)] == 'u') {
-                    PutUnsafe(*os_, '0');
-                    PutUnsafe(*os_, '0');
-                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) >> 4]);
-                    PutUnsafe(*os_, hexDigits[static_cast<unsigned char>(c) & 0xF]);
-                }
-            }
-            else if (CEREAL_RAPIDJSON_UNLIKELY(!(writeFlags & kWriteValidateEncodingFlag ? 
-                Transcoder<SourceEncoding, TargetEncoding>::Validate(is, *os_) :
-                Transcoder<SourceEncoding, TargetEncoding>::TranscodeUnsafe(is, *os_))))
-                return false;
-        }
-        PutUnsafe(*os_, '\"');
-        return true;
-    }
-
-    bool ScanWriteUnescapedString(GenericStringStream<SourceEncoding>& is, size_t length) {
-        return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
-    }
-
-    bool WriteStartObject() { os_->Put('{'); return true; }
-    bool WriteEndObject()   { os_->Put('}'); return true; }
-    bool WriteStartArray()  { os_->Put('['); return true; }
-    bool WriteEndArray()    { os_->Put(']'); return true; }
-
-    bool WriteRawValue(const Ch* json, size_t length) {
-        PutReserve(*os_, length);
-        for (size_t i = 0; i < length; i++) {
-            CEREAL_RAPIDJSON_ASSERT(json[i] != '\0');
-            PutUnsafe(*os_, json[i]);
-        }
-        return true;
-    }
-
-    void Prefix(Type type) {
-        (void)type;
-        if (CEREAL_RAPIDJSON_LIKELY(level_stack_.GetSize() != 0)) { // this value is not at root
-            Level* level = level_stack_.template Top<Level>();
-            if (level->valueCount > 0) {
-                if (level->inArray) 
-                    os_->Put(','); // add comma if it is not the first element in array
-                else  // in object
-                    os_->Put((level->valueCount % 2 == 0) ? ',' : ':');
-            }
-            if (!level->inArray && level->valueCount % 2 == 0)
-                CEREAL_RAPIDJSON_ASSERT(type == kStringType);  // if it's in object, then even number should be a name
-            level->valueCount++;
-        }
-        else {
-            CEREAL_RAPIDJSON_ASSERT(!hasRoot_);    // Should only has one and only one root.
-            hasRoot_ = true;
-        }
-    }
-
-    // Flush the value if it is the top level one.
-    bool EndValue(bool ret) {
-        if (CEREAL_RAPIDJSON_UNLIKELY(level_stack_.Empty()))   // end of json text
-            os_->Flush();
-        return ret;
-    }
-
-    OutputStream* os_;
-    internal::Stack<StackAllocator> level_stack_;
-    int maxDecimalPlaces_;
-    bool hasRoot_;
-
-private:
-    // Prohibit copy constructor & assignment operator.
-    Writer(const Writer&);
-    Writer& operator=(const Writer&);
-};
-
-// Full specialization for StringStream to prevent memory copying
-
-template<>
-inline bool Writer<StringBuffer>::WriteInt(int i) {
-    char *buffer = os_->Push(11);
-    const char* end = internal::i32toa(i, buffer);
-    os_->Pop(static_cast<size_t>(11 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteUint(unsigned u) {
-    char *buffer = os_->Push(10);
-    const char* end = internal::u32toa(u, buffer);
-    os_->Pop(static_cast<size_t>(10 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteInt64(int64_t i64) {
-    char *buffer = os_->Push(21);
-    const char* end = internal::i64toa(i64, buffer);
-    os_->Pop(static_cast<size_t>(21 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteUint64(uint64_t u) {
-    char *buffer = os_->Push(20);
-    const char* end = internal::u64toa(u, buffer);
-    os_->Pop(static_cast<size_t>(20 - (end - buffer)));
-    return true;
-}
-
-template<>
-inline bool Writer<StringBuffer>::WriteDouble(double d) {
-    if (internal::Double(d).IsNanOrInf()) {
-        // Note: This code path can only be reached if (CEREAL_RAPIDJSON_WRITE_DEFAULT_FLAGS & kWriteNanAndInfFlag).
-        if (!(kWriteDefaultFlags & kWriteNanAndInfFlag))
-            return false;
-        if (internal::Double(d).IsNan()) {
-            PutReserve(*os_, 3);
-            PutUnsafe(*os_, 'N'); PutUnsafe(*os_, 'a'); PutUnsafe(*os_, 'N');
-            return true;
-        }
-        if (internal::Double(d).Sign()) {
-            PutReserve(*os_, 9);
-            PutUnsafe(*os_, '-');
-        }
-        else
-            PutReserve(*os_, 8);
-        PutUnsafe(*os_, 'I'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'f');
-        PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 'n'); PutUnsafe(*os_, 'i'); PutUnsafe(*os_, 't'); PutUnsafe(*os_, 'y');
-        return true;
-    }
-    
-    char *buffer = os_->Push(25);
-    char* end = internal::dtoa(d, buffer, maxDecimalPlaces_);
-    os_->Pop(static_cast<size_t>(25 - (end - buffer)));
-    return true;
-}
-
-#if defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42)
-template<>
-inline bool Writer<StringBuffer>::ScanWriteUnescapedString(StringStream& is, size_t length) {
-    if (length < 16)
-        return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
-
-    if (!CEREAL_RAPIDJSON_LIKELY(is.Tell() < length))
-        return false;
-
-    const char* p = is.src_;
-    const char* end = is.head_ + length;
-    const char* nextAligned = reinterpret_cast<const char*>((reinterpret_cast<size_t>(p) + 15) & static_cast<size_t>(~15));
-    const char* endAligned = reinterpret_cast<const char*>(reinterpret_cast<size_t>(end) & static_cast<size_t>(~15));
-    if (nextAligned > end)
-        return true;
-
-    while (p != nextAligned)
-        if (*p < 0x20 || *p == '\"' || *p == '\\') {
-            is.src_ = p;
-            return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
-        }
-        else
-            os_->PutUnsafe(*p++);
-
-    // The rest of string using SIMD
-    static const char dquote[16] = { '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"', '\"' };
-    static const char bslash[16] = { '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\', '\\' };
-    static const char space[16]  = { 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19 };
-    const __m128i dq = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&dquote[0]));
-    const __m128i bs = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&bslash[0]));
-    const __m128i sp = _mm_loadu_si128(reinterpret_cast<const __m128i *>(&space[0]));
-
-    for (; p != endAligned; p += 16) {
-        const __m128i s = _mm_load_si128(reinterpret_cast<const __m128i *>(p));
-        const __m128i t1 = _mm_cmpeq_epi8(s, dq);
-        const __m128i t2 = _mm_cmpeq_epi8(s, bs);
-        const __m128i t3 = _mm_cmpeq_epi8(_mm_max_epu8(s, sp), sp); // s < 0x20 <=> max(s, 0x19) == 0x19
-        const __m128i x = _mm_or_si128(_mm_or_si128(t1, t2), t3);
-        unsigned short r = static_cast<unsigned short>(_mm_movemask_epi8(x));
-        if (CEREAL_RAPIDJSON_UNLIKELY(r != 0)) {   // some of characters is escaped
-            SizeType len;
-#ifdef _MSC_VER         // Find the index of first escaped
-            unsigned long offset;
-            _BitScanForward(&offset, r);
-            len = offset;
-#else
-            len = static_cast<SizeType>(__builtin_ffs(r) - 1);
-#endif
-            char* q = reinterpret_cast<char*>(os_->PushUnsafe(len));
-            for (size_t i = 0; i < len; i++)
-                q[i] = p[i];
-
-            p += len;
-            break;
-        }
-        _mm_storeu_si128(reinterpret_cast<__m128i *>(os_->PushUnsafe(16)), s);
-    }
-
-    is.src_ = p;
-    return CEREAL_RAPIDJSON_LIKELY(is.Tell() < length);
-}
-#endif // defined(CEREAL_RAPIDJSON_SSE2) || defined(CEREAL_RAPIDJSON_SSE42)
-
-CEREAL_RAPIDJSON_NAMESPACE_END
-
-#ifdef _MSC_VER
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#ifdef __clang__
-CEREAL_RAPIDJSON_DIAG_POP
-#endif
-
-#endif // CEREAL_RAPIDJSON_CEREAL_RAPIDJSON_H_
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/license.txt b/Src/External/cereal/include/cereal/external/rapidxml/license.txt
deleted file mode 100644
index 0095bc7..0000000
--- a/Src/External/cereal/include/cereal/external/rapidxml/license.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Use of this software is granted under one of the following two licenses,
-to be chosen freely by the user.
-
-1. Boost Software License - Version 1.0 - August 17th, 2003
-===============================================================================
-
-Copyright (c) 2006, 2007 Marcin Kalicinski
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-2. The MIT License
-===============================================================================
-
-Copyright (c) 2006, 2007 Marcin Kalicinski
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
-IN THE SOFTWARE.
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/manual.html b/Src/External/cereal/include/cereal/external/rapidxml/manual.html
deleted file mode 100644
index 4e6a5f1..0000000
--- a/Src/External/cereal/include/cereal/external/rapidxml/manual.html
+++ /dev/null
@@ -1,406 +0,0 @@
-<html><head><style type="text/css">
-
-          body
-          {
-          font-family: sans-serif;
-          font-size: 90%;
-          margin: 8pt 8pt 8pt 8pt;
-          text-align: justify;
-          background-color: White;
-          }
-
-          h1 { font-weight: bold; text-align: left;  }
-          h2 { font: 140% sans-serif; font-weight: bold; text-align: left;  }
-          h3 { font: 120% sans-serif; font-weight: bold; text-align: left;  }
-          h4 { font: bold 100% sans-serif; font-weight: bold; text-align: left;  }
-          h5 { font: italic 100% sans-serif; font-weight: bold; text-align: left;  }
-          h6 { font: small-caps 100% sans-serif; font-weight: bold; text-align: left;  }
-
-          code
-          {
-          font-family: &quot;Courier New&quot;, Courier, mono;
-          }
-
-          pre
-          {
-          border-top: gray 0.5pt solid;
-          border-right: gray 0.5pt solid;
-          border-left: gray 0.5pt solid;
-          border-bottom: gray 0.5pt solid;
-          padding-top: 2pt;
-          padding-right: 2pt;
-          padding-left: 2pt;
-          padding-bottom: 2pt;
-          display: block;
-          font-family: &quot;courier new&quot;, courier, mono;
-          background-color: #eeeeee;
-          }
-
-          a
-          {
-          color: #000080;
-          text-decoration: none;
-          }
-
-          a:hover
-          {
-          text-decoration: underline;
-          }
-
-          .reference-header
-          {
-          border-top: gray 0.5pt solid;
-          border-right: gray 0.5pt solid;
-          border-left: gray 0.5pt solid;
-          border-bottom: gray 0.5pt solid;
-          padding-top: 2pt;
-          padding-right: 2pt;
-          padding-left: 2pt;
-          padding-bottom: 2pt;
-          background-color: #dedede;
-          }
-
-          .parameter-name
-          {
-          font-style: italic;
-          }
-
-          .indented
-          {
-          margin-left: 0.5cm;
-          }
-
-          a.toc1
-          {
-          margin-left: 0.0cm;
-          }
-
-          a.toc2
-          {
-          margin-left: 0.75cm;
-          }
-
-          a.toc3
-          {
-          margin-left: 1.5cm;
-          }
-
-        </style></head><body><h1>RAPIDXML Manual</h1><h3>Version 1.13</h3><detaileddescription xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><para><i>Copyright (C) 2006, 2009 Marcin Kalicinski</i><br/><i>See accompanying file <a href="license.txt">license.txt</a> for license information.</i><hr/><h2 level="2">Table of Contents</h2></para><para><toc><toc-contents><a href="#namespacerapidxml_1what_is_rapidxml" class="toc1">1. What is RapidXml?</a><br/><a href="#namespacerapidxml_1dependencies_and_compatibility" class="toc2">1.1 Dependencies And Compatibility</a><br/><a href="#namespacerapidxml_1character_types_and_encodings" class="toc2">1.2 Character Types And Encodings</a><br/><a href="#namespacerapidxml_1error_handling" class="toc2">1.3 Error Handling</a><br/><a href="#namespacerapidxml_1memory_allocation" class="toc2">1.4 Memory Allocation</a><br/><a href="#namespacerapidxml_1w3c_compliance" class="toc2">1.5 W3C Compliance</a><br/><a href="#namespacerapidxml_1api_design" class="toc2">1.6 API Design</a><br/><a href="#namespacerapidxml_1reliability" class="toc2">1.7 Reliability</a><br/><a href="#namespacerapidxml_1acknowledgements" class="toc2">1.8 Acknowledgements</a><br/><a href="#namespacerapidxml_1two_minute_tutorial" class="toc1">2. Two Minute Tutorial</a><br/><a href="#namespacerapidxml_1parsing" class="toc2">2.1 Parsing</a><br/><a href="#namespacerapidxml_1accessing_dom_tree" class="toc2">2.2 Accessing The DOM Tree</a><br/><a href="#namespacerapidxml_1modifying_dom_tree" class="toc2">2.3 Modifying The DOM Tree</a><br/><a href="#namespacerapidxml_1printing" class="toc2">2.4 Printing XML</a><br/><a href="#namespacerapidxml_1differences" class="toc1">3. Differences From Regular XML Parsers</a><br/><a href="#namespacerapidxml_1lifetime_of_source_text" class="toc2">3.1 Lifetime Of Source Text</a><br/><a href="#namespacerapidxml_1ownership_of_strings" class="toc2">3.2 Ownership Of Strings</a><br/><a href="#namespacerapidxml_1destructive_non_destructive" class="toc2">3.3 Destructive Vs Non-Destructive Mode</a><br/><a href="#namespacerapidxml_1performance" class="toc1">4. Performance</a><br/><a href="#namespacerapidxml_1performance_charts" class="toc2">4.1 Comparison With Other Parsers</a><br/><a href="#namespacerapidxml_1reference" class="toc1">5. Reference</a><br/></toc-contents></toc><br/></para><sect1><h2 id="namespacerapidxml_1what_is_rapidxml">1. What is RapidXml?</h2><para><a href="http://rapidxml.sourceforge.net">RapidXml</a> is an attempt to create the fastest XML DOM parser possible, while retaining useability, portability and reasonable W3C compatibility. It is an in-situ parser written in C++, with parsing speed approaching that of <code>strlen()</code> function executed on the same data. <br/><br/>
- Entire parser is contained in a single header file, so no building or linking is neccesary. To use it you just need to copy <code>rapidxml.hpp</code> file to a convenient place (such as your project directory), and include it where needed. You may also want to use printing functions contained in header <code>rapidxml_print.hpp</code>.</para><sect2><h3 id="namespacerapidxml_1dependencies_and_compatibility">1.1 Dependencies And Compatibility</h3><para>RapidXml has <i>no dependencies</i> other than a very small subset of standard C++ library (<code>&lt;cassert&gt;</code>, <code>&lt;cstdlib&gt;</code>, <code>&lt;new&gt;</code> and <code>&lt;exception&gt;</code>, unless exceptions are disabled). It should compile on any reasonably conformant compiler, and was tested on Visual C++ 2003, Visual C++ 2005, Visual C++ 2008, gcc 3, gcc 4, and Comeau 4.3.3. Care was taken that no warnings are produced on these compilers, even with highest warning levels enabled.</para></sect2><sect2><h3 id="namespacerapidxml_1character_types_and_encodings">1.2 Character Types And Encodings</h3><para>RapidXml is character type agnostic, and can work both with narrow and wide characters. Current version does not fully support UTF-16 or UTF-32, so use of wide characters is somewhat incapacitated. However, it should succesfully parse <code>wchar_t</code> strings containing UTF-16 or UTF-32 if endianness of the data matches that of the machine. UTF-8 is fully supported, including all numeric character references, which are expanded into appropriate UTF-8 byte sequences (unless you enable parse_no_utf8 flag). <br/><br/>
- Note that RapidXml performs no decoding - strings returned by name() and value() functions will contain text encoded using the same encoding as source file. Rapidxml understands and expands the following character references: <code>&amp;apos; &amp;amp; &amp;quot; &amp;lt; &amp;gt; &amp;#...;</code> Other character references are not expanded.</para></sect2><sect2><h3 id="namespacerapidxml_1error_handling">1.3 Error Handling</h3><para>By default, RapidXml uses C++ exceptions to report errors. If this behaviour is undesirable, RAPIDXML_NO_EXCEPTIONS can be defined to suppress exception code. See <a href="#classrapidxml_1_1parse__error" kindref="compound">parse_error</a> class and <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">parse_error_handler()</a> function for more information.</para></sect2><sect2><h3 id="namespacerapidxml_1memory_allocation">1.4 Memory Allocation</h3><para>RapidXml uses a special memory pool object to allocate nodes and attributes, because direct allocation using <code>new</code> operator would be far too slow. Underlying memory allocations performed by the pool can be customized by use of <a href="#classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a" kindref="member">memory_pool::set_allocator()</a> function. See class <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> for more information.</para></sect2><sect2><h3 id="namespacerapidxml_1w3c_compliance">1.5 W3C Compliance</h3><para>RapidXml is not a W3C compliant parser, primarily because it ignores DOCTYPE declarations. There is a number of other, minor incompatibilities as well. Still, it can successfully parse and produce complete trees of all valid XML files in W3C conformance suite (over 1000 files specially designed to find flaws in XML processors). In destructive mode it performs whitespace normalization and character entity substitution for a small set of built-in entities.</para></sect2><sect2><h3 id="namespacerapidxml_1api_design">1.6 API Design</h3><para>RapidXml API is minimalistic, to reduce code size as much as possible, and facilitate use in embedded environments. Additional convenience functions are provided in separate headers: <code>rapidxml_utils.hpp</code> and <code><a href="#rapidxml__print_8hpp" kindref="compound">rapidxml_print.hpp</a></code>. Contents of these headers is not an essential part of the library, and is currently not documented (otherwise than with comments in code).</para></sect2><sect2><h3 id="namespacerapidxml_1reliability">1.7 Reliability</h3><para>RapidXml is very robust and comes with a large harness of unit tests. Special care has been taken to ensure stability of the parser no matter what source text is thrown at it. One of the unit tests produces 100,000 randomly corrupted variants of XML document, which (when uncorrupted) contains all constructs recognized by RapidXml. RapidXml passes this test when it correctly recognizes that errors have been introduced, and does not crash or loop indefinitely. <br/><br/>
- Another unit test puts RapidXml head-to-head with another, well estabilished XML parser, and verifies that their outputs match across a wide variety of small and large documents. <br/><br/>
- Yet another test feeds RapidXml with over 1000 test files from W3C compliance suite, and verifies that correct results are obtained. There are also additional tests that verify each API function separately, and test that various parsing modes work as expected.</para></sect2><sect2><h3 id="namespacerapidxml_1acknowledgements">1.8 Acknowledgements</h3><para>I would like to thank Arseny Kapoulkine for his work on <a href="http://code.google.com/p/pugixml">pugixml</a>, which was an inspiration for this project. Additional thanks go to Kristen Wegner for creating <a href="http://www.codeproject.com/soap/pugxml.asp">pugxml</a>, from which pugixml was derived. Janusz Wohlfeil kindly ran RapidXml speed tests on hardware that I did not have access to, allowing me to expand performance comparison table.</para></sect2></sect1><sect1><h2 id="namespacerapidxml_1two_minute_tutorial">2. Two Minute Tutorial</h2><sect2><h3 id="namespacerapidxml_1parsing">2.1 Parsing</h3><para>The following code causes RapidXml to parse a zero-terminated string named <code>text</code>: <pre>using namespace rapidxml;
-xml_document&lt;&gt; doc;    // character type defaults to char
-doc.parse&lt;0&gt;(text);    // 0 means default parse flags
-</pre><code>doc</code> object is now a root of DOM tree containing representation of the parsed XML. Because all RapidXml interface is contained inside namespace <code>rapidxml</code>, users must either bring contents of this namespace into scope, or fully qualify all the names. Class <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> represents a root of the DOM hierarchy. By means of public inheritance, it is also an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and a <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a>. Template parameter of <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function is used to specify parsing flags, with which you can fine-tune behaviour of the parser. Note that flags must be a compile-time constant.</para></sect2><sect2><h3 id="namespacerapidxml_1accessing_dom_tree">2.2 Accessing The DOM Tree</h3><para>To access the DOM tree, use methods of <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and <a href="#classrapidxml_1_1xml__attribute" kindref="compound">xml_attribute</a> classes: <pre>cout &lt;&lt; &quot;Name of my first node is: &quot; &lt;&lt; doc.first_node()-&gt;name() &lt;&lt; &quot;\n&quot;;
-xml_node&lt;&gt; *node = doc.first_node(&quot;foobar&quot;);
-cout &lt;&lt; &quot;Node foobar has value &quot; &lt;&lt; node-&gt;value() &lt;&lt; &quot;\n&quot;;
-for (xml_attribute&lt;&gt; *attr = node-&gt;first_attribute();
-     attr; attr = attr-&gt;next_attribute())
-{
-    cout &lt;&lt; &quot;Node foobar has attribute &quot; &lt;&lt; attr-&gt;name() &lt;&lt; &quot; &quot;;
-    cout &lt;&lt; &quot;with value &quot; &lt;&lt; attr-&gt;value() &lt;&lt; &quot;\n&quot;;
-}
-</pre></para></sect2><sect2><h3 id="namespacerapidxml_1modifying_dom_tree">2.3 Modifying The DOM Tree</h3><para>DOM tree produced by the parser is fully modifiable. Nodes and attributes can be added/removed, and their contents changed. The below example creates a HTML document, whose sole contents is a link to google.com website: <pre>xml_document&lt;&gt; doc;
-xml_node&lt;&gt; *node = doc.allocate_node(node_element, &quot;a&quot;, &quot;Google&quot;);
-doc.append_node(node);
-xml_attribute&lt;&gt; *attr = doc.allocate_attribute(&quot;href&quot;, &quot;google.com&quot;);
-node-&gt;append_attribute(attr);
-</pre> One quirk is that nodes and attributes <i>do not own</i> the text of their names and values. This is because normally they only store pointers to the source text. So, when assigning a new name or value to the node, care must be taken to ensure proper lifetime of the string. The easiest way to achieve it is to allocate the string from the <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> memory pool. In the above example this is not necessary, because we are only assigning character constants. But the code below uses <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859" kindref="member">memory_pool::allocate_string()</a> function to allocate node name (which will have the same lifetime as the document), and assigns it to a new node: <pre>xml_document&lt;&gt; doc;
-char *node_name = doc.allocate_string(name);        // Allocate string and copy name into it
-xml_node&lt;&gt; *node = doc.allocate_node(node_element, node_name);  // Set node name to node_name
-</pre> Check <a href="#namespacerapidxml_1reference" kindref="member">Reference</a>  section for description of the entire interface.</para></sect2><sect2><h3 id="namespacerapidxml_1printing">2.4 Printing XML</h3><para>You can print <code><a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a></code> and <code><a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a></code> objects into an XML string. Use <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1" kindref="member">print()</a> function or operator &lt;&lt;, which are defined in <code><a href="#rapidxml__print_8hpp" kindref="compound">rapidxml_print.hpp</a></code> header. <pre>using namespace rapidxml;
-xml_document&lt;&gt; doc;    // character type defaults to char
-// ... some code to fill the document
-
-// Print to stream using operator &lt;&lt;
-std::cout &lt;&lt; doc;   
-
-// Print to stream using print function, specifying printing flags
-print(std::cout, doc, 0);   // 0 means default printing flags
-
-// Print to string using output iterator
-std::string s;
-print(std::back_inserter(s), doc, 0);
-
-// Print to memory buffer using output iterator
-char buffer[4096];                      // You are responsible for making the buffer large enough!
-char *end = print(buffer, doc, 0);      // end contains pointer to character after last printed character
-*end = 0;                               // Add string terminator after XML
-</pre></para></sect2></sect1><sect1><h2 id="namespacerapidxml_1differences">3. Differences From Regular XML Parsers</h2><para>RapidXml is an <i>in-situ parser</i>, which allows it to achieve very high parsing speed. In-situ means that parser does not make copies of strings. Instead, it places pointers to the <i>source text</i> in the DOM hierarchy.</para><sect2><h3 id="namespacerapidxml_1lifetime_of_source_text">3.1 Lifetime Of Source Text</h3><para>In-situ parsing requires that source text lives at least as long as the document object. If source text is destroyed, names and values of nodes in DOM tree will become destroyed as well. Additionally, whitespace processing, character entity translation, and zero-termination of strings require that source text be modified during parsing (but see non-destructive mode). This makes the text useless for further processing once it was parsed by RapidXml. <br/><br/>
- In many cases however, these are not serious issues.</para></sect2><sect2><h3 id="namespacerapidxml_1ownership_of_strings">3.2 Ownership Of Strings</h3><para>Nodes and attributes produced by RapidXml do not own their name and value strings. They merely hold the pointers to them. This means you have to be careful when setting these values manually, by using <a href="#classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e" kindref="member">xml_base::name(const Ch *)</a> or <a href="#classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c" kindref="member">xml_base::value(const Ch *)</a> functions. Care must be taken to ensure that lifetime of the string passed is at least as long as lifetime of the node/attribute. The easiest way to achieve it is to allocate the string from <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> owned by the document. Use <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859" kindref="member">memory_pool::allocate_string()</a> function for this purpose.</para></sect2><sect2><h3 id="namespacerapidxml_1destructive_non_destructive">3.3 Destructive Vs Non-Destructive Mode</h3><para>By default, the parser modifies source text during the parsing process. This is required to achieve character entity translation, whitespace normalization, and zero-termination of strings. <br/><br/>
- In some cases this behaviour may be undesirable, for example if source text resides in read only memory, or is mapped to memory directly from file. By using appropriate parser flags (parse_non_destructive), source text modifications can be disabled. However, because RapidXml does in-situ parsing, it obviously has the following side-effects:<ul><li><para>no whitespace normalization is done</para></li><li><para>no entity reference translation is done</para></li><li><para>names and values are not zero-terminated, you must use <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">xml_base::name_size()</a> and <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">xml_base::value_size()</a> functions to tell where they end</para></li></ul></para></sect2></sect1><sect1><h2 id="namespacerapidxml_1performance">4. Performance</h2><para>RapidXml achieves its speed through use of several techniques:<ul><li><para>In-situ parsing. When building DOM tree, RapidXml does not make copies of string data, such as node names and values. Instead, it stores pointers to interior of the source text.</para></li><li><para>Use of template metaprogramming techniques. This allows it to move much of the work to compile time. Through magic of the templates, C++ compiler generates a separate copy of parsing code for any combination of parser flags you use. In each copy, all possible decisions are made at compile time and all unused code is omitted.</para></li><li><para>Extensive use of lookup tables for parsing.</para></li><li><para>Hand-tuned C++ with profiling done on several most popular CPUs.</para></li></ul></para><para>This results in a very small and fast code: a parser which is custom tailored to exact needs with each invocation.</para><sect2><h3 id="namespacerapidxml_1performance_charts">4.1 Comparison With Other Parsers</h3><para>The table below compares speed of RapidXml to some other parsers, and to <code>strlen()</code> function executed on the same data. On a modern CPU (as of 2007), you can expect parsing throughput to be close to 1 GB/s. As a rule of thumb, parsing speed is about 50-100x faster than Xerces DOM, 30-60x faster than TinyXml, 3-12x faster than pugxml, and about 5% - 30% faster than pugixml, the fastest XML parser I know of.</para><para><ul><li><para>The test file is a real-world, 50kB large, moderately dense XML file. </para></li><li><para>All timing is done by using RDTSC instruction present in Pentium-compatible CPUs. </para></li><li><para>No profile-guided optimizations are used. </para></li><li><para>All parsers are running in their fastest modes. </para></li><li><para>The results are given in CPU cycles per character, so frequency of CPUs is irrelevant. </para></li><li><para>The results are minimum values from a large number of runs, to minimize effects of operating system activity, task switching, interrupt handling etc. </para></li><li><para>A single parse of the test file takes about 1/10th of a millisecond, so with large number of runs there is a good chance of hitting at least one no-interrupt streak, and obtaining undisturbed results. </para></li></ul><table rows="9" cols="7" border="1" cellpadding="3pt"><tr><th thead="yes"><para><center>Platform</center></para></th><th thead="yes"><para><center>Compiler</center></para></th><th thead="yes"><para>strlen() </para></th><th thead="yes"><para>RapidXml </para></th><th thead="yes"><para>pugixml 0.3 </para></th><th thead="yes"><para>pugxml </para></th><th thead="yes"><para>TinyXml  </para></th></tr><tr><td thead="no"><para><center>Pentium 4</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>2.5</center></para></td><td thead="no"><para><center>5.4</center></para></td><td thead="no"><para><center>7.0</center></para></td><td thead="no"><para><center>61.7</center></para></td><td thead="no"><para><center>298.8</center></para></td></tr><tr><td thead="no"><para><center>Pentium 4</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>0.8</center></para></td><td thead="no"><para><center>6.1</center></para></td><td thead="no"><para><center>9.5</center></para></td><td thead="no"><para><center>67.0</center></para></td><td thead="no"><para><center>413.2</center></para></td></tr><tr><td thead="no"><para><center>Core 2</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>1.0</center></para></td><td thead="no"><para><center>4.5</center></para></td><td thead="no"><para><center>5.0</center></para></td><td thead="no"><para><center>24.6</center></para></td><td thead="no"><para><center>154.8</center></para></td></tr><tr><td thead="no"><para><center>Core 2</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>0.6</center></para></td><td thead="no"><para><center>4.6</center></para></td><td thead="no"><para><center>5.4</center></para></td><td thead="no"><para><center>28.3</center></para></td><td thead="no"><para><center>229.3</center></para></td></tr><tr><td thead="no"><para><center>Athlon XP</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>3.1</center></para></td><td thead="no"><para><center>7.7</center></para></td><td thead="no"><para><center>8.0</center></para></td><td thead="no"><para><center>25.5</center></para></td><td thead="no"><para><center>182.6</center></para></td></tr><tr><td thead="no"><para><center>Athlon XP</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>0.9</center></para></td><td thead="no"><para><center>8.2</center></para></td><td thead="no"><para><center>9.2</center></para></td><td thead="no"><para><center>33.7</center></para></td><td thead="no"><para><center>265.2</center></para></td></tr><tr><td thead="no"><para><center>Pentium 3</center></para></td><td thead="no"><para><center>MSVC 8.0</center></para></td><td thead="no"><para><center>2.0</center></para></td><td thead="no"><para><center>6.3</center></para></td><td thead="no"><para><center>7.0</center></para></td><td thead="no"><para><center>30.9</center></para></td><td thead="no"><para><center>211.9</center></para></td></tr><tr><td thead="no"><para><center>Pentium 3</center></para></td><td thead="no"><para><center>gcc 4.1.1</center></para></td><td thead="no"><para><center>1.0</center></para></td><td thead="no"><para><center>6.7</center></para></td><td thead="no"><para><center>8.9</center></para></td><td thead="no"><para><center>35.3</center></para></td><td thead="no"><para><center>316.0</center></para></td></tr></table><i>(*) All results are in CPU cycles per character of source text</i></para></sect2></sect1><sect1><h2 id="namespacerapidxml_1reference">5. Reference</h2><para>This section lists all classes, functions, constants etc. and describes them in detail. </para></sect1></detaileddescription><dl><dt>class
-								  template
-							   <a href="#classrapidxml_1_1memory__pool">rapidxml::memory_pool</a></dt><dt class="indented">
-				constructor
-			 <a href="#classrapidxml_1_1memory__pool_f8fb3c8f1a564f8045c40bcd07a89866_1f8fb3c8f1a564f8045c40bcd07a89866">memory_pool()</a></dt><dt class="indented">
-				destructor
-			 <a href="#classrapidxml_1_1memory__pool_6f8c7990d9ec1ed2acf6558b238570eb_16f8c7990d9ec1ed2acf6558b238570eb">~memory_pool()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_750ba3c610b129ac057d817509d08f41_1750ba3c610b129ac057d817509d08f41">allocate_node(node_type type, const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_462de142669e0ff649e8e615b82bf457_1462de142669e0ff649e8e615b82bf457">allocate_attribute(const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859">allocate_string(const Ch *source=0, std::size_t size=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_95c49fcb056e9103ec906a59e3e01d76_195c49fcb056e9103ec906a59e3e01d76">clone_node(const xml_node&lt; Ch &gt; *source, xml_node&lt; Ch &gt; *result=0)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">clear()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a">set_allocator(alloc_func *af, free_func *ff)</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><p/><dt>class <a href="#classrapidxml_1_1parse__error">rapidxml::parse_error</a></dt><dt class="indented">
-				constructor
-			 <a href="#classrapidxml_1_1parse__error_4dd8d1bdbd9221df4dcb90cafaee3332_14dd8d1bdbd9221df4dcb90cafaee3332">parse_error(const char *what, void *where)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1parse__error_ff06f49065b54a8a86e02e9a2441a8ba_1ff06f49065b54a8a86e02e9a2441a8ba">what() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1parse__error_377be7d201d95221c318682c35377aca_1377be7d201d95221c318682c35377aca">where() const </a></dt><dt class="indented"/><dt class="indented"/><p/><dt>class
-								  template
-							   <a href="#classrapidxml_1_1xml__attribute">rapidxml::xml_attribute</a></dt><dt class="indented">
-				constructor
-			 <a href="#classrapidxml_1_1xml__attribute_d5464aadf08269a886b730993525db34_1d5464aadf08269a886b730993525db34">xml_attribute()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__attribute_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">document() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__attribute_5c4a98d2b75f9b41b12c110108fd55ab_15c4a98d2b75f9b41b12c110108fd55ab">previous_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__attribute_1b8a814d0d3a7165396b08433eee8a91_11b8a814d0d3a7165396b08433eee8a91">next_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><dt>class
-								  template
-							   <a href="#classrapidxml_1_1xml__base">rapidxml::xml_base</a></dt><dt class="indented">
-				constructor
-			 <a href="#classrapidxml_1_1xml__base_23630d2c130a9e0e3f3afa7584a9b218_123630d2c130a9e0e3f3afa7584a9b218">xml_base()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707">name() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c">name_size() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f">value() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db">value_size() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_4e7e23d06d48126c65b1f6266acfba5c_14e7e23d06d48126c65b1f6266acfba5c">name(const Ch *name, std::size_t size)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e">name(const Ch *name)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_d9640aa3f5374673cb72a5289b6c91eb_1d9640aa3f5374673cb72a5289b6c91eb">value(const Ch *value, std::size_t size)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c">value(const Ch *value)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e">parent() const </a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><dt>class
-								  template
-							   <a href="#classrapidxml_1_1xml__document">rapidxml::xml_document</a></dt><dt class="indented">
-				constructor
-			 <a href="#classrapidxml_1_1xml__document_6ce266cc52d549c42abe3a3d5e8af9ba_16ce266cc52d549c42abe3a3d5e8af9ba">xml_document()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c">parse(Ch *text)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__document_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">clear()</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><p/><p/><p/><p/><p/><p/><p/><p/><dt>class
-								  template
-							   <a href="#classrapidxml_1_1xml__node">rapidxml::xml_node</a></dt><dt class="indented">
-				constructor
-			 <a href="#classrapidxml_1_1xml__node_34c55af3504549a475e5b9dfcaa6adf5_134c55af3504549a475e5b9dfcaa6adf5">xml_node(node_type type)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0">type() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">document() const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a">first_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_fcb6e2209b591a36d2dadba20d2bc7cc_1fcb6e2209b591a36d2dadba20d2bc7cc">last_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_ac2f6886c0107e9d5f156e9542546df6_1ac2f6886c0107e9d5f156e9542546df6">previous_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_b3ead2cefecc03a813836203e3f6f38f_1b3ead2cefecc03a813836203e3f6f38f">next_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83">first_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_16953d66751b5b949ee4ee2d9c0bc63a_116953d66751b5b949ee4ee2d9c0bc63a">last_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const </a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_a78759bfa429fa2ab6bc5fe617cfa3cf_1a78759bfa429fa2ab6bc5fe617cfa3cf">type(node_type type)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_0c39df6617e709eb2fba11300dea63f2_10c39df6617e709eb2fba11300dea63f2">prepend_node(xml_node&lt; Ch &gt; *child)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_86de2e22276826089b7baed2599f8dee_186de2e22276826089b7baed2599f8dee">append_node(xml_node&lt; Ch &gt; *child)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_780972a57fc447250ab47cc8f421b65e_1780972a57fc447250ab47cc8f421b65e">insert_node(xml_node&lt; Ch &gt; *where, xml_node&lt; Ch &gt; *child)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_9a31d861e1bddc710839c551a5d2b3a4_19a31d861e1bddc710839c551a5d2b3a4">remove_first_node()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_87addf2bc127ee31aa4b5295d3c9b530_187addf2bc127ee31aa4b5295d3c9b530">remove_last_node()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_9316463a2201631e7e2062b17729f9cd_19316463a2201631e7e2062b17729f9cd">remove_node(xml_node&lt; Ch &gt; *where)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_0218147d13e41d5fa60ced4e7a7e9726_10218147d13e41d5fa60ced4e7a7e9726">remove_all_nodes()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_f6dffa513da74cc0be71a7ba84f8265e_1f6dffa513da74cc0be71a7ba84f8265e">prepend_attribute(xml_attribute&lt; Ch &gt; *attribute)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_8fbd4f5ef7169d493da9f8d87ac04b77_18fbd4f5ef7169d493da9f8d87ac04b77">append_attribute(xml_attribute&lt; Ch &gt; *attribute)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_070d5888b0557fe06a5b24961de1b988_1070d5888b0557fe06a5b24961de1b988">insert_attribute(xml_attribute&lt; Ch &gt; *where, xml_attribute&lt; Ch &gt; *attribute)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_4eea4a7f6cb484ca9944f7eafe6e1843_14eea4a7f6cb484ca9944f7eafe6e1843">remove_first_attribute()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_37d87c4d5d89fa0cf05b72ee8d4cba3b_137d87c4d5d89fa0cf05b72ee8d4cba3b">remove_last_attribute()</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_c75154db2e768c0e5b541fc8cd0775ab_1c75154db2e768c0e5b541fc8cd0775ab">remove_attribute(xml_attribute&lt; Ch &gt; *where)</a></dt><dt class="indented">function <a href="#classrapidxml_1_1xml__node_59e6ad4cfd5e8096c052e71d79561eda_159e6ad4cfd5e8096c052e71d79561eda">remove_all_attributes()</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><p/><dt>namespace <a href="#namespacerapidxml">rapidxml</a></dt><dt class="indented">enum <a href="#namespacerapidxml_6a276b85e2da28c5f9c3dbce61c55682_16a276b85e2da28c5f9c3dbce61c55682">node_type</a></dt><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented"/><dt class="indented">function <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1">parse_error_handler(const char *what, void *where)</a></dt><dt class="indented">function <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1">print(OutIt out, const xml_node&lt; Ch &gt; &amp;node, int flags=0)</a></dt><dt class="indented">function <a href="#namespacerapidxml_13bc37d6d1047acb0efdbc1689221a5e_113bc37d6d1047acb0efdbc1689221a5e">print(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node, int flags=0)</a></dt><dt class="indented">function <a href="#namespacerapidxml_5619b38000d967fb223b2b0a8c17463a_15619b38000d967fb223b2b0a8c17463a">operator&lt;&lt;(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node)</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9">parse_no_data_nodes</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_97e2c4fdc04fae17126f9971a4fc993e_197e2c4fdc04fae17126f9971a4fc993e">parse_no_element_values</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c">parse_no_string_terminators</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_7223b7815c4fb8b42e6e4e77e1ea6b97_17223b7815c4fb8b42e6e4e77e1ea6b97">parse_no_entity_translation</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_ccde57f6054857ee4042a1b4d98c83b9_1ccde57f6054857ee4042a1b4d98c83b9">parse_no_utf8</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_52e2c934ad9c845a5f4cc49570470556_152e2c934ad9c845a5f4cc49570470556">parse_declaration_node</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_0f7479dacbc868456d07897a8c072784_10f7479dacbc868456d07897a8c072784">parse_comment_nodes</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_8e187746ba1ca04f107951ad32df962e_18e187746ba1ca04f107951ad32df962e">parse_doctype_node</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_1c20b2b2b75711cd76423e119c49f830_11c20b2b2b75711cd76423e119c49f830">parse_pi_nodes</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_a5daff9d61c7d4eaf98e4d42efe628ee_1a5daff9d61c7d4eaf98e4d42efe628ee">parse_validate_closing_tags</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_ac1f06b1afd47b812732fb521b146fd9_1ac1f06b1afd47b812732fb521b146fd9">parse_trim_whitespace</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_88f95d4e275ba01408fefde83078651b_188f95d4e275ba01408fefde83078651b">parse_normalize_whitespace</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_45751cf2f38fd6915f35b3122b46d5b6_145751cf2f38fd6915f35b3122b46d5b6">parse_default</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_a97ba1a0a79a6d66f4eef3612508d943_1a97ba1a0a79a6d66f4eef3612508d943">parse_non_destructive</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_398c5476e76102f8bd76c10bb0abbe10_1398c5476e76102f8bd76c10bb0abbe10">parse_fastest</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_b4f2515265facb42291570307924bd57_1b4f2515265facb42291570307924bd57">parse_full</a></dt><dt class="indented">
-				constant
-			 <a href="#namespacerapidxml_b08b8d4293c203b69ed6c5ae77ac1907_1b08b8d4293c203b69ed6c5ae77ac1907">print_no_indenting</a></dt><p/><p/><p/><p/></dl><hr/><h3 class="reference-header" id="classrapidxml_1_1memory__pool">class
-									  template
-								   rapidxml::memory_pool</h3>
-
-							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
-								  Base class for
-								  <a href="#classrapidxml_1_1xml__document">xml_document</a> <h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">This class is used by the parser to create new nodes and attributes, without overheads of dynamic memory allocation. In most cases, you will not need to use this class directly. However, if you need to create nodes manually or modify names/values of nodes, you are encouraged to use <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of relevant <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> to allocate the memory. Not only is this faster than allocating them by using <code>new</code> operator, but also their lifetime will be tied to the lifetime of document, possibly simplyfing memory management. <br/><br/>
- Call <a href="#classrapidxml_1_1memory__pool_750ba3c610b129ac057d817509d08f41_1750ba3c610b129ac057d817509d08f41" kindref="member">allocate_node()</a> or <a href="#classrapidxml_1_1memory__pool_462de142669e0ff649e8e615b82bf457_1462de142669e0ff649e8e615b82bf457" kindref="member">allocate_attribute()</a> functions to obtain new nodes or attributes from the pool. You can also call <a href="#classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859" kindref="member">allocate_string()</a> function to allocate strings. Such strings can then be used as names or values of nodes without worrying about their lifetime. Note that there is no <code>free()</code> function -- all allocations are freed at once when <a href="#classrapidxml_1_1memory__pool_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204" kindref="member">clear()</a> function is called, or when the pool is destroyed. <br/><br/>
- It is also possible to create a standalone <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a>, and use it to allocate nodes, whose lifetime will not be tied to any document. <br/><br/>
- Pool maintains <code>RAPIDXML_STATIC_POOL_SIZE</code> bytes of statically allocated memory. Until static memory is exhausted, no dynamic memory allocations are done. When static memory is exhausted, pool allocates additional blocks of memory of size <code>RAPIDXML_DYNAMIC_POOL_SIZE</code> each, by using global <code>new[]</code> and <code>delete[]</code> operators. This behaviour can be changed by setting custom allocation routines. Use <a href="#classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a" kindref="member">set_allocator()</a> function to set them. <br/><br/>
- Allocations for nodes, attributes and strings are aligned at <code>RAPIDXML_ALIGNMENT</code> bytes. This value defaults to the size of pointer on target architecture. <br/><br/>
- To obtain absolutely top performance from the parser, it is important that all nodes are allocated from a single, contiguous block of memory. Otherwise, cache misses when jumping between two (or more) disjoint blocks of memory can slow down parsing quite considerably. If required, you can tweak <code>RAPIDXML_STATIC_POOL_SIZE</code>, <code>RAPIDXML_DYNAMIC_POOL_SIZE</code> and <code>RAPIDXML_ALIGNMENT</code> to obtain best wasted memory to performance compromise. To do it, define their values before <a href="#rapidxml_8hpp" kindref="compound">rapidxml.hpp</a> file is included. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type of created nodes. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_f8fb3c8f1a564f8045c40bcd07a89866_1f8fb3c8f1a564f8045c40bcd07a89866">
-				constructor
-			 memory_pool::memory_pool</h3><h4>Synopsis</h4><code class="synopsis">memory_pool();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs empty pool with default allocator functions. </para><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_6f8c7990d9ec1ed2acf6558b238570eb_16f8c7990d9ec1ed2acf6558b238570eb">
-				destructor
-			 memory_pool::~memory_pool</h3><h4>Synopsis</h4><code class="synopsis">~memory_pool();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Destroys pool and frees all the memory. This causes memory occupied by nodes allocated by the pool to be freed. Nodes allocated from the pool are no longer valid. </para><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_750ba3c610b129ac057d817509d08f41_1750ba3c610b129ac057d817509d08f41">function memory_pool::allocate_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* allocate_node(node_type type, const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Allocates a new node from the pool, and optionally assigns name and value to it. If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>. If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function will call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function. </para><h4>Parameters</h4><dl><dt class="parameter-name">type</dt><dd class="parameter-def">Type of node to create. </dd></dl><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name to assign to the node, or 0 to assign no name. </dd></dl><dl><dt class="parameter-name">value</dt><dd class="parameter-def">Value to assign to the node, or 0 to assign no value. </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name to assign, or 0 to automatically calculate size from name string. </dd></dl><dl><dt class="parameter-name">value_size</dt><dd class="parameter-def">Size of value to assign, or 0 to automatically calculate size from value string. </dd></dl><h4>Returns</h4>Pointer to allocated node. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_462de142669e0ff649e8e615b82bf457_1462de142669e0ff649e8e615b82bf457">function memory_pool::allocate_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* allocate_attribute(const Ch *name=0, const Ch *value=0, std::size_t name_size=0, std::size_t value_size=0);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Allocates a new attribute from the pool, and optionally assigns name and value to it. If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>. If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function will call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name to assign to the attribute, or 0 to assign no name. </dd></dl><dl><dt class="parameter-name">value</dt><dd class="parameter-def">Value to assign to the attribute, or 0 to assign no value. </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name to assign, or 0 to automatically calculate size from name string. </dd></dl><dl><dt class="parameter-name">value_size</dt><dd class="parameter-def">Size of value to assign, or 0 to automatically calculate size from value string. </dd></dl><h4>Returns</h4>Pointer to allocated attribute. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_69729185bc59b0875192d667c47b8859_169729185bc59b0875192d667c47b8859">function memory_pool::allocate_string</h3><h4>Synopsis</h4><code class="synopsis">Ch* allocate_string(const Ch *source=0, std::size_t size=0);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Allocates a char array of given size from the pool, and optionally copies a given string to it. If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>. If exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function will call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function. </para><h4>Parameters</h4><dl><dt class="parameter-name">source</dt><dd class="parameter-def">String to initialize the allocated memory with, or 0 to not initialize it. </dd></dl><dl><dt class="parameter-name">size</dt><dd class="parameter-def">Number of characters to allocate, or zero to calculate it automatically from source string length; if size is 0, source string must be specified and null terminated. </dd></dl><h4>Returns</h4>Pointer to allocated char array. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_95c49fcb056e9103ec906a59e3e01d76_195c49fcb056e9103ec906a59e3e01d76">function memory_pool::clone_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* clone_node(const xml_node&lt; Ch &gt; *source, xml_node&lt; Ch &gt; *result=0);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Clones an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and its hierarchy of child nodes and attributes. Nodes and attributes are allocated from this memory pool. Names and values are not cloned, they are shared between the clone and the source. Result node can be optionally specified as a second parameter, in which case its contents will be replaced with cloned source node. This is useful when you want to clone entire document. </para><h4>Parameters</h4><dl><dt class="parameter-name">source</dt><dd class="parameter-def">Node to clone. </dd></dl><dl><dt class="parameter-name">result</dt><dd class="parameter-def">Node to put results in, or 0 to automatically allocate result node </dd></dl><h4>Returns</h4>Pointer to cloned node. This pointer will never be NULL. <p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">function memory_pool::clear</h3><h4>Synopsis</h4><code class="synopsis">void clear();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Clears the pool. This causes memory occupied by nodes allocated by the pool to be freed. Any nodes or strings allocated from the pool will no longer be valid. </para><p/><h3 class="reference-header" id="classrapidxml_1_1memory__pool_c0a55a6ef0837dca67572e357100d78a_1c0a55a6ef0837dca67572e357100d78a">function memory_pool::set_allocator</h3><h4>Synopsis</h4><code class="synopsis">void set_allocator(alloc_func *af, free_func *ff);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets or resets the user-defined memory allocation functions for the pool. This can only be called when no memory is allocated from the pool yet, otherwise results are undefined. Allocation function must not return invalid pointer on failure. It should either throw, stop the program, or use <code>longjmp()</code> function to pass control to other place of program. If it returns invalid pointer, results are undefined. <br/><br/>
- User defined allocation functions must have the following forms: <br/><code><br/>
-void *allocate(std::size_t size); <br/>
-void free(void *pointer); </code><br/></para><h4>Parameters</h4><dl><dt class="parameter-name">af</dt><dd class="parameter-def">Allocation function, or 0 to restore default function </dd></dl><dl><dt class="parameter-name">ff</dt><dd class="parameter-def">Free function, or 0 to restore default function </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1parse__error">class rapidxml::parse_error</h3>
-
-							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse error exception. This exception is thrown by the parser when an error occurs. Use <a href="#classrapidxml_1_1parse__error_ff06f49065b54a8a86e02e9a2441a8ba_1ff06f49065b54a8a86e02e9a2441a8ba" kindref="member">what()</a> function to get human-readable error message. Use <a href="#classrapidxml_1_1parse__error_377be7d201d95221c318682c35377aca_1377be7d201d95221c318682c35377aca" kindref="member">where()</a> function to get a pointer to position within source text where error was detected. <br/><br/>
- If throwing exceptions by the parser is undesirable, it can be disabled by defining RAPIDXML_NO_EXCEPTIONS macro before <a href="#rapidxml_8hpp" kindref="compound">rapidxml.hpp</a> is included. This will cause the parser to call <a href="#namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1" kindref="member">rapidxml::parse_error_handler()</a> function instead of throwing an exception. This function must be defined by the user. <br/><br/>
- This class derives from <code>std::exception</code> class. </para><p/><h3 class="reference-header" id="classrapidxml_1_1parse__error_4dd8d1bdbd9221df4dcb90cafaee3332_14dd8d1bdbd9221df4dcb90cafaee3332">
-				constructor
-			 parse_error::parse_error</h3><h4>Synopsis</h4><code class="synopsis">parse_error(const char *what, void *where);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs parse error. </para><p/><h3 class="reference-header" id="classrapidxml_1_1parse__error_ff06f49065b54a8a86e02e9a2441a8ba_1ff06f49065b54a8a86e02e9a2441a8ba">function parse_error::what</h3><h4>Synopsis</h4><code class="synopsis">virtual const char* what() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets human readable description of error. </para><h4>Returns</h4>Pointer to null terminated description of the error. <p/><h3 class="reference-header" id="classrapidxml_1_1parse__error_377be7d201d95221c318682c35377aca_1377be7d201d95221c318682c35377aca">function parse_error::where</h3><h4>Synopsis</h4><code class="synopsis">Ch* where() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets pointer to character data where error happened. Ch should be the same as char type of <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> that produced the error. </para><h4>Returns</h4>Pointer to location within the parsed string where error occured. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute">class
-									  template
-								   rapidxml::xml_attribute</h3>
-
-							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
-								  Inherits from
-								  <a href="#classrapidxml_1_1xml__base">xml_base</a> <br/><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Class representing attribute node of XML document. Each attribute has name and value strings, which are available through <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707" kindref="member">name()</a> and <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f" kindref="member">value()</a> functions (inherited from <a href="#classrapidxml_1_1xml__base" kindref="compound">xml_base</a>). Note that after parse, both name and value of attribute will point to interior of source text used for parsing. Thus, this text must persist in memory for the lifetime of attribute. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_d5464aadf08269a886b730993525db34_1d5464aadf08269a886b730993525db34">
-				constructor
-			 xml_attribute::xml_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs an empty attribute with the specified type. Consider using <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of appropriate <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a> if allocating attributes manually. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">function xml_attribute::document</h3><h4>Synopsis</h4><code class="synopsis">xml_document&lt;Ch&gt;* document() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets document of which attribute is a child. </para><h4>Returns</h4>Pointer to document that contains this attribute, or 0 if there is no parent document. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_5c4a98d2b75f9b41b12c110108fd55ab_15c4a98d2b75f9b41b12c110108fd55ab">function xml_attribute::previous_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* previous_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets previous attribute, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return previous attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__attribute_1b8a814d0d3a7165396b08433eee8a91_11b8a814d0d3a7165396b08433eee8a91">function xml_attribute::next_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* next_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets next attribute, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return next attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base">class
-									  template
-								   rapidxml::xml_base</h3>
-
-							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
-								  Base class for
-								  <a href="#classrapidxml_1_1xml__attribute">xml_attribute</a> <a href="#classrapidxml_1_1xml__node">xml_node</a> <h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Base class for <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and <a href="#classrapidxml_1_1xml__attribute" kindref="compound">xml_attribute</a> implementing common functions: <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707" kindref="member">name()</a>, <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">name_size()</a>, <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f" kindref="member">value()</a>, <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">value_size()</a> and <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e" kindref="member">parent()</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_23630d2c130a9e0e3f3afa7584a9b218_123630d2c130a9e0e3f3afa7584a9b218">
-				constructor
-			 xml_base::xml_base</h3><h4>Synopsis</h4><code class="synopsis">xml_base();
-									  </code><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707">function xml_base::name</h3><h4>Synopsis</h4><code class="synopsis">Ch* name() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets name of the node. Interpretation of name depends on type of node. Note that name will not be zero-terminated if <a href="#namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c" kindref="member">rapidxml::parse_no_string_terminators</a> option was selected during parse. <br/><br/>
- Use <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">name_size()</a> function to determine length of the name. </para><h4>Returns</h4>Name of node, or empty string if node has no name. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c">function xml_base::name_size</h3><h4>Synopsis</h4><code class="synopsis">std::size_t name_size() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets size of node name, not including terminator character. This function works correctly irrespective of whether name is or is not zero terminated. </para><h4>Returns</h4>Size of node name, in characters. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f">function xml_base::value</h3><h4>Synopsis</h4><code class="synopsis">Ch* value() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets value of node. Interpretation of value depends on type of node. Note that value will not be zero-terminated if <a href="#namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c" kindref="member">rapidxml::parse_no_string_terminators</a> option was selected during parse. <br/><br/>
- Use <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">value_size()</a> function to determine length of the value. </para><h4>Returns</h4>Value of node, or empty string if node has no value. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db">function xml_base::value_size</h3><h4>Synopsis</h4><code class="synopsis">std::size_t value_size() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets size of node value, not including terminator character. This function works correctly irrespective of whether value is or is not zero terminated. </para><h4>Returns</h4>Size of node value, in characters. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_4e7e23d06d48126c65b1f6266acfba5c_14e7e23d06d48126c65b1f6266acfba5c">function xml_base::name</h3><h4>Synopsis</h4><code class="synopsis">void name(const Ch *name, std::size_t size);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets name of node to a non zero-terminated string. See <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a> . <br/><br/>
- Note that node does not own its name or value, it only stores a pointer to it. It will not delete or otherwise free the pointer on destruction. It is reponsibility of the user to properly manage lifetime of the string. The easiest way to achieve it is to use <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of the document to allocate the string - on destruction of the document the string will be automatically freed. <br/><br/>
- Size of name must be specified separately, because name does not have to be zero terminated. Use <a href="#classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e" kindref="member">name(const Ch *)</a> function to have the length automatically calculated (string must be zero terminated). </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of node to set. Does not have to be zero terminated. </dd></dl><dl><dt class="parameter-name">size</dt><dd class="parameter-def">Size of name, in characters. This does not include zero terminator, if one is present. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_e099c291e104a0d277307fe71f5e0f9e_1e099c291e104a0d277307fe71f5e0f9e">function xml_base::name</h3><h4>Synopsis</h4><code class="synopsis">void name(const Ch *name);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets name of node to a zero-terminated string. See also <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a>  and <a href="#classrapidxml_1_1xml__base_4e7e23d06d48126c65b1f6266acfba5c_14e7e23d06d48126c65b1f6266acfba5c" kindref="member">xml_node::name(const Ch *, std::size_t)</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of node to set. Must be zero terminated. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_d9640aa3f5374673cb72a5289b6c91eb_1d9640aa3f5374673cb72a5289b6c91eb">function xml_base::value</h3><h4>Synopsis</h4><code class="synopsis">void value(const Ch *value, std::size_t size);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets value of node to a non zero-terminated string. See <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a> . <br/><br/>
- Note that node does not own its name or value, it only stores a pointer to it. It will not delete or otherwise free the pointer on destruction. It is reponsibility of the user to properly manage lifetime of the string. The easiest way to achieve it is to use <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of the document to allocate the string - on destruction of the document the string will be automatically freed. <br/><br/>
- Size of value must be specified separately, because it does not have to be zero terminated. Use <a href="#classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c" kindref="member">value(const Ch *)</a> function to have the length automatically calculated (string must be zero terminated). <br/><br/>
- If an element has a child node of type node_data, it will take precedence over element value when printing. If you want to manipulate data of elements using values, use parser flag <a href="#namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9" kindref="member">rapidxml::parse_no_data_nodes</a> to prevent creation of data nodes by the parser. </para><h4>Parameters</h4><dl><dt class="parameter-name">value</dt><dd class="parameter-def">value of node to set. Does not have to be zero terminated. </dd></dl><dl><dt class="parameter-name">size</dt><dd class="parameter-def">Size of value, in characters. This does not include zero terminator, if one is present. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_18c7469acdca771de9b4f3054053029c_118c7469acdca771de9b4f3054053029c">function xml_base::value</h3><h4>Synopsis</h4><code class="synopsis">void value(const Ch *value);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets value of node to a zero-terminated string. See also <a href="#namespacerapidxml_1ownership_of_strings" kindref="member">Ownership Of Strings</a>  and <a href="#classrapidxml_1_1xml__base_d9640aa3f5374673cb72a5289b6c91eb_1d9640aa3f5374673cb72a5289b6c91eb" kindref="member">xml_node::value(const Ch *, std::size_t)</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">value</dt><dd class="parameter-def">Vame of node to set. Must be zero terminated. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e">function xml_base::parent</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* parent() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets node parent. </para><h4>Returns</h4>Pointer to parent node, or 0 if there is no parent. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__document">class
-									  template
-								   rapidxml::xml_document</h3>
-
-							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
-								  Inherits from
-								  <a href="#classrapidxml_1_1xml__node">xml_node</a> <a href="#classrapidxml_1_1memory__pool">memory_pool</a> <br/><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">This class represents root of the DOM hierarchy. It is also an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a> and a <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> through public inheritance. Use <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">parse()</a> function to build a DOM tree from a zero-terminated XML text string. <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">parse()</a> function allocates memory for nodes and attributes by using functions of <a href="#classrapidxml_1_1xml__document" kindref="compound">xml_document</a>, which are inherited from <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a>. To access root node of the document, use the document itself, as if it was an <a href="#classrapidxml_1_1xml__node" kindref="compound">xml_node</a>. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__document_6ce266cc52d549c42abe3a3d5e8af9ba_16ce266cc52d549c42abe3a3d5e8af9ba">
-				constructor
-			 xml_document::xml_document</h3><h4>Synopsis</h4><code class="synopsis">xml_document();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs empty XML document. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c">function xml_document::parse</h3><h4>Synopsis</h4><code class="synopsis">void parse(Ch *text);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parses zero-terminated XML string according to given flags. Passed string will be modified by the parser, unless <a href="#namespacerapidxml_a97ba1a0a79a6d66f4eef3612508d943_1a97ba1a0a79a6d66f4eef3612508d943" kindref="member">rapidxml::parse_non_destructive</a> flag is used. The string must persist for the lifetime of the document. In case of error, <a href="#classrapidxml_1_1parse__error" kindref="compound">rapidxml::parse_error</a> exception will be thrown. <br/><br/>
- If you want to parse contents of a file, you must first load the file into the memory, and pass pointer to its beginning. Make sure that data is zero-terminated. <br/><br/>
- Document can be parsed into multiple times. Each new call to parse removes previous nodes and attributes (if any), but does not clear memory pool. </para><h4>Parameters</h4><dl><dt class="parameter-name">text</dt><dd class="parameter-def">XML data to parse; pointer is non-const to denote fact that this data may be modified by the parser. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__document_c8bb3912a3ce86b15842e79d0b421204_1c8bb3912a3ce86b15842e79d0b421204">function xml_document::clear</h3><h4>Synopsis</h4><code class="synopsis">void clear();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Clears the document by deleting all nodes and clearing the memory pool. All nodes owned by document pool are destroyed. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node">class
-									  template
-								   rapidxml::xml_node</h3>
-
-							  Defined in <a href="rapidxml.hpp">rapidxml.hpp</a><br/>
-								  Inherits from
-								  <a href="#classrapidxml_1_1xml__base">xml_base</a> <br/>
-								  Base class for
-								  <a href="#classrapidxml_1_1xml__document">xml_document</a> <h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Class representing a node of XML document. Each node may have associated name and value strings, which are available through <a href="#classrapidxml_1_1xml__base_622eade29fdf7806d3ef93ac4d90e707_1622eade29fdf7806d3ef93ac4d90e707" kindref="member">name()</a> and <a href="#classrapidxml_1_1xml__base_c54fa4987fb503916a7b541eb15c9c7f_1c54fa4987fb503916a7b541eb15c9c7f" kindref="member">value()</a> functions. Interpretation of name and value depends on type of the node. Type of node can be determined by using <a href="#classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0" kindref="member">type()</a> function. <br/><br/>
- Note that after parse, both name and value of node, if any, will point interior of source text used for parsing. Thus, this text must persist in the memory for the lifetime of node. </para><h4>Parameters</h4><dl><dt class="parameter-name">Ch</dt><dd>Character type to use. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_34c55af3504549a475e5b9dfcaa6adf5_134c55af3504549a475e5b9dfcaa6adf5">
-				constructor
-			 xml_node::xml_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node(node_type type);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Constructs an empty node with the specified type. Consider using <a href="#classrapidxml_1_1memory__pool" kindref="compound">memory_pool</a> of appropriate document to allocate nodes manually. </para><h4>Parameters</h4><dl><dt class="parameter-name">type</dt><dd class="parameter-def">Type of node to construct. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0">function xml_node::type</h3><h4>Synopsis</h4><code class="synopsis">node_type type() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets type of node. </para><h4>Returns</h4>Type of node. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_77aea7d8d996ba4f6bd61cc478a4e72d_177aea7d8d996ba4f6bd61cc478a4e72d">function xml_node::document</h3><h4>Synopsis</h4><code class="synopsis">xml_document&lt;Ch&gt;* document() const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets document of which node is a child. </para><h4>Returns</h4>Pointer to document that contains this node, or 0 if there is no parent document. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a">function xml_node::first_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* first_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets first child node, optionally matching node name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of child to find, or 0 to return first child regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found child, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_fcb6e2209b591a36d2dadba20d2bc7cc_1fcb6e2209b591a36d2dadba20d2bc7cc">function xml_node::last_node</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* last_node(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets last child node, optionally matching node name. Behaviour is undefined if node has no children. Use <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a" kindref="member">first_node()</a> to test if node has children. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of child to find, or 0 to return last child regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found child, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_ac2f6886c0107e9d5f156e9542546df6_1ac2f6886c0107e9d5f156e9542546df6">function xml_node::previous_sibling</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* previous_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets previous sibling node, optionally matching node name. Behaviour is undefined if node has no parent. Use <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e" kindref="member">parent()</a> to test if node has a parent. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of sibling to find, or 0 to return previous sibling regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found sibling, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_b3ead2cefecc03a813836203e3f6f38f_1b3ead2cefecc03a813836203e3f6f38f">function xml_node::next_sibling</h3><h4>Synopsis</h4><code class="synopsis">xml_node&lt;Ch&gt;* next_sibling(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets next sibling node, optionally matching node name. Behaviour is undefined if node has no parent. Use <a href="#classrapidxml_1_1xml__base_798e8df7ea53ade4d9f0701017dce80e_1798e8df7ea53ade4d9f0701017dce80e" kindref="member">parent()</a> to test if node has a parent. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of sibling to find, or 0 to return next sibling regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found sibling, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83">function xml_node::first_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* first_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets first attribute of node, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return first attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_16953d66751b5b949ee4ee2d9c0bc63a_116953d66751b5b949ee4ee2d9c0bc63a">function xml_node::last_attribute</h3><h4>Synopsis</h4><code class="synopsis">xml_attribute&lt;Ch&gt;* last_attribute(const Ch *name=0, std::size_t name_size=0, bool case_sensitive=true) const;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Gets last attribute of node, optionally matching attribute name. </para><h4>Parameters</h4><dl><dt class="parameter-name">name</dt><dd class="parameter-def">Name of attribute to find, or 0 to return last attribute regardless of its name; this string doesn&apos;t have to be zero-terminated if name_size is non-zero </dd></dl><dl><dt class="parameter-name">name_size</dt><dd class="parameter-def">Size of name, in characters, or 0 to have size calculated automatically from string </dd></dl><dl><dt class="parameter-name">case_sensitive</dt><dd class="parameter-def">Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters </dd></dl><h4>Returns</h4>Pointer to found attribute, or 0 if not found. <p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_a78759bfa429fa2ab6bc5fe617cfa3cf_1a78759bfa429fa2ab6bc5fe617cfa3cf">function xml_node::type</h3><h4>Synopsis</h4><code class="synopsis">void type(node_type type);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Sets type of node. </para><h4>Parameters</h4><dl><dt class="parameter-name">type</dt><dd class="parameter-def">Type of node to set. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_0c39df6617e709eb2fba11300dea63f2_10c39df6617e709eb2fba11300dea63f2">function xml_node::prepend_node</h3><h4>Synopsis</h4><code class="synopsis">void prepend_node(xml_node&lt; Ch &gt; *child);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prepends a new child node. The prepended child becomes the first child, and all existing children are moved one position back. </para><h4>Parameters</h4><dl><dt class="parameter-name">child</dt><dd class="parameter-def">Node to prepend. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_86de2e22276826089b7baed2599f8dee_186de2e22276826089b7baed2599f8dee">function xml_node::append_node</h3><h4>Synopsis</h4><code class="synopsis">void append_node(xml_node&lt; Ch &gt; *child);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Appends a new child node. The appended child becomes the last child. </para><h4>Parameters</h4><dl><dt class="parameter-name">child</dt><dd class="parameter-def">Node to append. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_780972a57fc447250ab47cc8f421b65e_1780972a57fc447250ab47cc8f421b65e">function xml_node::insert_node</h3><h4>Synopsis</h4><code class="synopsis">void insert_node(xml_node&lt; Ch &gt; *where, xml_node&lt; Ch &gt; *child);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Inserts a new child node at specified place inside the node. All children after and including the specified node are moved one position back. </para><h4>Parameters</h4><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Place where to insert the child, or 0 to insert at the back. </dd></dl><dl><dt class="parameter-name">child</dt><dd class="parameter-def">Node to insert. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_9a31d861e1bddc710839c551a5d2b3a4_19a31d861e1bddc710839c551a5d2b3a4">function xml_node::remove_first_node</h3><h4>Synopsis</h4><code class="synopsis">void remove_first_node();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes first child node. If node has no children, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a" kindref="member">first_node()</a> to test if node has children. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_87addf2bc127ee31aa4b5295d3c9b530_187addf2bc127ee31aa4b5295d3c9b530">function xml_node::remove_last_node</h3><h4>Synopsis</h4><code class="synopsis">void remove_last_node();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes last child of the node. If node has no children, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_7823e36687669e59c2afdf66334ef35a_17823e36687669e59c2afdf66334ef35a" kindref="member">first_node()</a> to test if node has children. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_9316463a2201631e7e2062b17729f9cd_19316463a2201631e7e2062b17729f9cd">function xml_node::remove_node</h3><h4>Synopsis</h4><code class="synopsis">void remove_node(xml_node&lt; Ch &gt; *where);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes specified child from the node. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_0218147d13e41d5fa60ced4e7a7e9726_10218147d13e41d5fa60ced4e7a7e9726">function xml_node::remove_all_nodes</h3><h4>Synopsis</h4><code class="synopsis">void remove_all_nodes();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes all child nodes (but not attributes). </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_f6dffa513da74cc0be71a7ba84f8265e_1f6dffa513da74cc0be71a7ba84f8265e">function xml_node::prepend_attribute</h3><h4>Synopsis</h4><code class="synopsis">void prepend_attribute(xml_attribute&lt; Ch &gt; *attribute);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prepends a new attribute to the node. </para><h4>Parameters</h4><dl><dt class="parameter-name">attribute</dt><dd class="parameter-def">Attribute to prepend. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_8fbd4f5ef7169d493da9f8d87ac04b77_18fbd4f5ef7169d493da9f8d87ac04b77">function xml_node::append_attribute</h3><h4>Synopsis</h4><code class="synopsis">void append_attribute(xml_attribute&lt; Ch &gt; *attribute);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Appends a new attribute to the node. </para><h4>Parameters</h4><dl><dt class="parameter-name">attribute</dt><dd class="parameter-def">Attribute to append. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_070d5888b0557fe06a5b24961de1b988_1070d5888b0557fe06a5b24961de1b988">function xml_node::insert_attribute</h3><h4>Synopsis</h4><code class="synopsis">void insert_attribute(xml_attribute&lt; Ch &gt; *where, xml_attribute&lt; Ch &gt; *attribute);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Inserts a new attribute at specified place inside the node. All attributes after and including the specified attribute are moved one position back. </para><h4>Parameters</h4><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Place where to insert the attribute, or 0 to insert at the back. </dd></dl><dl><dt class="parameter-name">attribute</dt><dd class="parameter-def">Attribute to insert. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_4eea4a7f6cb484ca9944f7eafe6e1843_14eea4a7f6cb484ca9944f7eafe6e1843">function xml_node::remove_first_attribute</h3><h4>Synopsis</h4><code class="synopsis">void remove_first_attribute();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes first attribute of the node. If node has no attributes, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83" kindref="member">first_attribute()</a> to test if node has attributes. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_37d87c4d5d89fa0cf05b72ee8d4cba3b_137d87c4d5d89fa0cf05b72ee8d4cba3b">function xml_node::remove_last_attribute</h3><h4>Synopsis</h4><code class="synopsis">void remove_last_attribute();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes last attribute of the node. If node has no attributes, behaviour is undefined. Use <a href="#classrapidxml_1_1xml__node_5810a09f82f8d53efbe9456286dcec83_15810a09f82f8d53efbe9456286dcec83" kindref="member">first_attribute()</a> to test if node has attributes. </para><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_c75154db2e768c0e5b541fc8cd0775ab_1c75154db2e768c0e5b541fc8cd0775ab">function xml_node::remove_attribute</h3><h4>Synopsis</h4><code class="synopsis">void remove_attribute(xml_attribute&lt; Ch &gt; *where);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes specified attribute from node. </para><h4>Parameters</h4><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Pointer to attribute to be removed. </dd></dl><p/><h3 class="reference-header" id="classrapidxml_1_1xml__node_59e6ad4cfd5e8096c052e71d79561eda_159e6ad4cfd5e8096c052e71d79561eda">function xml_node::remove_all_attributes</h3><h4>Synopsis</h4><code class="synopsis">void remove_all_attributes();
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Removes all attributes of node. </para><p/><h3 class="reference-header" id="namespacerapidxml_6a276b85e2da28c5f9c3dbce61c55682_16a276b85e2da28c5f9c3dbce61c55682">enum node_type</h3><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Enumeration listing all node types produced by the parser. Use <a href="#classrapidxml_1_1xml__node_975e86937621ae4afe6a423219de30d0_1975e86937621ae4afe6a423219de30d0" kindref="member">xml_node::type()</a> function to query node type. </para><h4>Values</h4><dl><dt class="parameter-name">node_document</dt><dd class="parameter-def">A document node. Name and value are empty. </dd></dl><dl><dt class="parameter-name">node_element</dt><dd class="parameter-def">An element node. Name contains element name. Value contains text of first data node. </dd></dl><dl><dt class="parameter-name">node_data</dt><dd class="parameter-def">A data node. Name is empty. Value contains data text. </dd></dl><dl><dt class="parameter-name">node_cdata</dt><dd class="parameter-def">A CDATA node. Name is empty. Value contains data text. </dd></dl><dl><dt class="parameter-name">node_comment</dt><dd class="parameter-def">A comment node. Name is empty. Value contains comment text. </dd></dl><dl><dt class="parameter-name">node_declaration</dt><dd class="parameter-def">A declaration node. Name and value are empty. Declaration parameters (version, encoding and standalone) are in node attributes. </dd></dl><dl><dt class="parameter-name">node_doctype</dt><dd class="parameter-def">A DOCTYPE node. Name is empty. Value contains DOCTYPE text. </dd></dl><dl><dt class="parameter-name">node_pi</dt><dd class="parameter-def">A PI node. Name contains target. Value contains instructions. </dd></dl><p/><h3 class="reference-header" id="namespacerapidxml_ff5d67f74437199d316d2b2660653ae1_1ff5d67f74437199d316d2b2660653ae1">function parse_error_handler</h3><h4>Synopsis</h4><code class="synopsis">void rapidxml::parse_error_handler(const char *what, void *where);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">When exceptions are disabled by defining RAPIDXML_NO_EXCEPTIONS, this function is called to notify user about the error. It must be defined by the user. <br/><br/>
- This function cannot return. If it does, the results are undefined. <br/><br/>
- A very simple definition might look like that: <preformatted>
-        void rapidxml::parse_error_handler(const char *what, void *where)
-        {
-            std::cout &lt;&lt; &quot;Parse error: &quot; &lt;&lt; what &lt;&lt; &quot;\n&quot;;
-            std::abort();
-        }
-        </preformatted></para><h4>Parameters</h4><dl><dt class="parameter-name">what</dt><dd class="parameter-def">Human readable description of the error. </dd></dl><dl><dt class="parameter-name">where</dt><dd class="parameter-def">Pointer to character data where error was detected. </dd></dl><p/><h3 class="reference-header" id="namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1">function print</h3><h4>Synopsis</h4><code class="synopsis">OutIt rapidxml::print(OutIt out, const xml_node&lt; Ch &gt; &amp;node, int flags=0);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prints XML to given output iterator. </para><h4>Parameters</h4><dl><dt class="parameter-name">out</dt><dd class="parameter-def">Output iterator to print to. </dd></dl><dl><dt class="parameter-name">node</dt><dd class="parameter-def">Node to be printed. Pass xml_document to print entire document. </dd></dl><dl><dt class="parameter-name">flags</dt><dd class="parameter-def">Flags controlling how XML is printed. </dd></dl><h4>Returns</h4>Output iterator pointing to position immediately after last character of printed text. <p/><h3 class="reference-header" id="namespacerapidxml_13bc37d6d1047acb0efdbc1689221a5e_113bc37d6d1047acb0efdbc1689221a5e">function print</h3><h4>Synopsis</h4><code class="synopsis">std::basic_ostream&lt;Ch&gt;&amp; rapidxml::print(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node, int flags=0);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prints XML to given output stream. </para><h4>Parameters</h4><dl><dt class="parameter-name">out</dt><dd class="parameter-def">Output stream to print to. </dd></dl><dl><dt class="parameter-name">node</dt><dd class="parameter-def">Node to be printed. Pass xml_document to print entire document. </dd></dl><dl><dt class="parameter-name">flags</dt><dd class="parameter-def">Flags controlling how XML is printed. </dd></dl><h4>Returns</h4>Output stream. <p/><h3 class="reference-header" id="namespacerapidxml_5619b38000d967fb223b2b0a8c17463a_15619b38000d967fb223b2b0a8c17463a">function operator&lt;&lt;</h3><h4>Synopsis</h4><code class="synopsis">std::basic_ostream&lt;Ch&gt;&amp; rapidxml::operator&lt;&lt;(std::basic_ostream&lt; Ch &gt; &amp;out, const xml_node&lt; Ch &gt; &amp;node);
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Prints formatted XML to given output stream. Uses default printing flags. Use <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1" kindref="member">print()</a> function to customize printing process. </para><h4>Parameters</h4><dl><dt class="parameter-name">out</dt><dd class="parameter-def">Output stream to print to. </dd></dl><dl><dt class="parameter-name">node</dt><dd class="parameter-def">Node to be printed. </dd></dl><h4>Returns</h4>Output stream. <p/><h3 class="reference-header" id="namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9">
-				constant
-			 parse_no_data_nodes</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_data_nodes
-											  = 0x1;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not create data nodes. Text of first data node will still be placed in value of parent element, unless <a href="#namespacerapidxml_97e2c4fdc04fae17126f9971a4fc993e_197e2c4fdc04fae17126f9971a4fc993e" kindref="member">rapidxml::parse_no_element_values</a> flag is also specified. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_97e2c4fdc04fae17126f9971a4fc993e_197e2c4fdc04fae17126f9971a4fc993e">
-				constant
-			 parse_no_element_values</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_element_values
-											  = 0x2;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not use text of first data node as a value of parent element. Can be combined with other flags by use of | operator. Note that child data nodes of element node take precendence over its value when printing. That is, if element has one or more child data nodes <i>and</i> a value, the value will be ignored. Use <a href="#namespacerapidxml_87e8bbab53702cf3b438bd553c10b6b9_187e8bbab53702cf3b438bd553c10b6b9" kindref="member">rapidxml::parse_no_data_nodes</a> flag to prevent creation of data nodes if you want to manipulate data using values of elements. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_9cae3801e70437cbc410c24bf6be691c_19cae3801e70437cbc410c24bf6be691c">
-				constant
-			 parse_no_string_terminators</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_string_terminators
-											  = 0x4;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not place zero terminators after strings in the source text. By default zero terminators are placed, modifying source text. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_7223b7815c4fb8b42e6e4e77e1ea6b97_17223b7815c4fb8b42e6e4e77e1ea6b97">
-				constant
-			 parse_no_entity_translation</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_entity_translation
-											  = 0x8;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to not translate entities in the source text. By default entities are translated, modifying source text. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_ccde57f6054857ee4042a1b4d98c83b9_1ccde57f6054857ee4042a1b4d98c83b9">
-				constant
-			 parse_no_utf8</h3><h4>Synopsis</h4><code class="synopsis">const int parse_no_utf8
-											  = 0x10;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to disable UTF-8 handling and assume plain 8 bit characters. By default, UTF-8 handling is enabled. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_52e2c934ad9c845a5f4cc49570470556_152e2c934ad9c845a5f4cc49570470556">
-				constant
-			 parse_declaration_node</h3><h4>Synopsis</h4><code class="synopsis">const int parse_declaration_node
-											  = 0x20;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create XML declaration node. By default, declaration node is not created. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_0f7479dacbc868456d07897a8c072784_10f7479dacbc868456d07897a8c072784">
-				constant
-			 parse_comment_nodes</h3><h4>Synopsis</h4><code class="synopsis">const int parse_comment_nodes
-											  = 0x40;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create comments nodes. By default, comment nodes are not created. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_8e187746ba1ca04f107951ad32df962e_18e187746ba1ca04f107951ad32df962e">
-				constant
-			 parse_doctype_node</h3><h4>Synopsis</h4><code class="synopsis">const int parse_doctype_node
-											  = 0x80;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create DOCTYPE node. By default, doctype node is not created. Although W3C specification allows at most one DOCTYPE node, RapidXml will silently accept documents with more than one. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_1c20b2b2b75711cd76423e119c49f830_11c20b2b2b75711cd76423e119c49f830">
-				constant
-			 parse_pi_nodes</h3><h4>Synopsis</h4><code class="synopsis">const int parse_pi_nodes
-											  = 0x100;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to create PI nodes. By default, PI nodes are not created. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_a5daff9d61c7d4eaf98e4d42efe628ee_1a5daff9d61c7d4eaf98e4d42efe628ee">
-				constant
-			 parse_validate_closing_tags</h3><h4>Synopsis</h4><code class="synopsis">const int parse_validate_closing_tags
-											  = 0x200;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to validate closing tag names. If not set, name inside closing tag is irrelevant to the parser. By default, closing tags are not validated. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_ac1f06b1afd47b812732fb521b146fd9_1ac1f06b1afd47b812732fb521b146fd9">
-				constant
-			 parse_trim_whitespace</h3><h4>Synopsis</h4><code class="synopsis">const int parse_trim_whitespace
-											  = 0x400;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to trim all leading and trailing whitespace of data nodes. By default, whitespace is not trimmed. This flag does not cause the parser to modify source text. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_88f95d4e275ba01408fefde83078651b_188f95d4e275ba01408fefde83078651b">
-				constant
-			 parse_normalize_whitespace</h3><h4>Synopsis</h4><code class="synopsis">const int parse_normalize_whitespace
-											  = 0x800;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flag instructing the parser to condense all whitespace runs of data nodes to a single space character. Trimming of leading and trailing whitespace of data is controlled by <a href="#namespacerapidxml_ac1f06b1afd47b812732fb521b146fd9_1ac1f06b1afd47b812732fb521b146fd9" kindref="member">rapidxml::parse_trim_whitespace</a> flag. By default, whitespace is not normalized. If this flag is specified, source text will be modified. Can be combined with other flags by use of | operator. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_45751cf2f38fd6915f35b3122b46d5b6_145751cf2f38fd6915f35b3122b46d5b6">
-				constant
-			 parse_default</h3><h4>Synopsis</h4><code class="synopsis">const int parse_default
-											  = 0;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Parse flags which represent default behaviour of the parser. This is always equal to 0, so that all other flags can be simply ored together. Normally there is no need to inconveniently disable flags by anding with their negated (~) values. This also means that meaning of each flag is a <i>negation</i> of the default setting. For example, if flag name is <a href="#namespacerapidxml_ccde57f6054857ee4042a1b4d98c83b9_1ccde57f6054857ee4042a1b4d98c83b9" kindref="member">rapidxml::parse_no_utf8</a>, it means that utf-8 is <i>enabled</i> by default, and using the flag will disable it. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_a97ba1a0a79a6d66f4eef3612508d943_1a97ba1a0a79a6d66f4eef3612508d943">
-				constant
-			 parse_non_destructive</h3><h4>Synopsis</h4><code class="synopsis">const int parse_non_destructive
-											  = parse_no_string_terminators | parse_no_entity_translation;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">A combination of parse flags that forbids any modifications of the source text. This also results in faster parsing. However, note that the following will occur: <ul><li><para>names and values of nodes will not be zero terminated, you have to use <a href="#classrapidxml_1_1xml__base_0dae694c8f7e4d89f1003e2f3a15a43c_10dae694c8f7e4d89f1003e2f3a15a43c" kindref="member">xml_base::name_size()</a> and <a href="#classrapidxml_1_1xml__base_aed5ae791b7164c1ee5e649198cbb3db_1aed5ae791b7164c1ee5e649198cbb3db" kindref="member">xml_base::value_size()</a> functions to determine where name and value ends </para></li><li><para>entities will not be translated </para></li><li><para>whitespace will not be normalized </para></li></ul>
-See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_398c5476e76102f8bd76c10bb0abbe10_1398c5476e76102f8bd76c10bb0abbe10">
-				constant
-			 parse_fastest</h3><h4>Synopsis</h4><code class="synopsis">const int parse_fastest
-											  = parse_non_destructive | parse_no_data_nodes;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">A combination of parse flags resulting in fastest possible parsing, without sacrificing important data. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_b4f2515265facb42291570307924bd57_1b4f2515265facb42291570307924bd57">
-				constant
-			 parse_full</h3><h4>Synopsis</h4><code class="synopsis">const int parse_full
-											  = parse_declaration_node | parse_comment_nodes | parse_doctype_node | parse_pi_nodes | parse_validate_closing_tags;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">A combination of parse flags resulting in largest amount of data being extracted. This usually results in slowest parsing. <br/><br/>
- See <a href="#classrapidxml_1_1xml__document_8338ce6042e7b04d5a42144fb446b69c_18338ce6042e7b04d5a42144fb446b69c" kindref="member">xml_document::parse()</a> function. </para><p/><h3 class="reference-header" id="namespacerapidxml_b08b8d4293c203b69ed6c5ae77ac1907_1b08b8d4293c203b69ed6c5ae77ac1907">
-				constant
-			 print_no_indenting</h3><h4>Synopsis</h4><code class="synopsis">const int print_no_indenting
-											  = 0x1;
-									  </code><h4>Description</h4><para xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">Printer flag instructing the printer to suppress indenting of XML. See <a href="#namespacerapidxml_b94d570fc4c4ab2423813cd0243326b1_1b94d570fc4c4ab2423813cd0243326b1" kindref="member">print()</a> function. </para><p/></body></html>
\ No newline at end of file
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp
deleted file mode 100644
index 61013a9..0000000
--- a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml.hpp
+++ /dev/null
@@ -1,2624 +0,0 @@
-#ifndef CEREAL_RAPIDXML_HPP_INCLUDED
-#define CEREAL_RAPIDXML_HPP_INCLUDED
-
-// Copyright (C) 2006, 2009 Marcin Kalicinski
-// Version 1.13
-// Revision $DateTime: 2009/05/13 01:46:17 $
-
-// If standard library is disabled, user must provide implementations of required functions and typedefs
-#if !defined(CEREAL_RAPIDXML_NO_STDLIB)
-    #include <cstdlib>      // For std::size_t
-    #include <cassert>      // For assert
-    #include <new>          // For placement new
-#endif
-
-// On MSVC, disable "conditional expression is constant" warning (level 4).
-// This warning is almost impossible to avoid with certain types of templated code
-#ifdef _MSC_VER
-    #pragma warning(push)
-    #pragma warning(disable:4127)   // Conditional expression is constant
-    #pragma warning(disable:4100)   // unreferenced formal parameter
-#endif
-
-///////////////////////////////////////////////////////////////////////////
-// CEREAL_RAPIDXML_PARSE_ERROR
-
-#if defined(CEREAL_RAPIDXML_NO_EXCEPTIONS)
-
-#define CEREAL_RAPIDXML_PARSE_ERROR(what, where) { parse_error_handler(what, where); assert(0); }
-
-namespace cereal {
-namespace rapidxml
-{
-    //! When exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS,
-    //! this function is called to notify user about the error.
-    //! It must be defined by the user.
-    //! <br><br>
-    //! This function cannot return. If it does, the results are undefined.
-    //! <br><br>
-    //! A very simple definition might look like that:
-    //! <pre>
-    //! void %rapidxml::%parse_error_handler(const char *what, void *where)
-    //! {
-    //!     std::cout << "Parse error: " << what << "\n";
-    //!     std::abort();
-    //! }
-    //! </pre>
-    //! \param what Human readable description of the error.
-    //! \param where Pointer to character data where error was detected.
-    void parse_error_handler(const char *what, void *where);
-}
-} // end namespace cereal
-
-#else
-
-#include <exception>    // For std::exception
-
-#define CEREAL_RAPIDXML_PARSE_ERROR(what, where) throw parse_error(what, where)
-
-namespace cereal {
-namespace rapidxml
-{
-
-    //! Parse error exception.
-    //! This exception is thrown by the parser when an error occurs.
-    //! Use what() function to get human-readable error message.
-    //! Use where() function to get a pointer to position within source text where error was detected.
-    //! <br><br>
-    //! If throwing exceptions by the parser is undesirable,
-    //! it can be disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS macro before rapidxml.hpp is included.
-    //! This will cause the parser to call rapidxml::parse_error_handler() function instead of throwing an exception.
-    //! This function must be defined by the user.
-    //! <br><br>
-    //! This class derives from <code>std::exception</code> class.
-    class parse_error: public std::exception
-    {
-
-    public:
-
-        //! Constructs parse error
-        parse_error(const char *what_, void *where_)
-            : m_what(what_)
-            , m_where(where_)
-        {
-        }
-
-        //! Gets human readable description of error.
-        //! \return Pointer to null terminated description of the error.
-        virtual const char *what() const throw()
-        {
-            return m_what;
-        }
-
-        //! Gets pointer to character data where error happened.
-        //! Ch should be the same as char type of xml_document that produced the error.
-        //! \return Pointer to location within the parsed string where error occured.
-        template<class Ch>
-        Ch *where() const
-        {
-            return reinterpret_cast<Ch *>(m_where);
-        }
-
-    private:
-
-        const char *m_what;
-        void *m_where;
-
-    };
-}
-} // end namespace cereal
-
-#endif
-
-///////////////////////////////////////////////////////////////////////////
-// Pool sizes
-
-#ifndef CEREAL_RAPIDXML_STATIC_POOL_SIZE
-    // Size of static memory block of memory_pool.
-    // Define CEREAL_RAPIDXML_STATIC_POOL_SIZE before including rapidxml.hpp if you want to override the default value.
-    // No dynamic memory allocations are performed by memory_pool until static memory is exhausted.
-    #define CEREAL_RAPIDXML_STATIC_POOL_SIZE (64 * 1024)
-#endif
-
-#ifndef CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE
-    // Size of dynamic memory block of memory_pool.
-    // Define CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE before including rapidxml.hpp if you want to override the default value.
-    // After the static block is exhausted, dynamic blocks with approximately this size are allocated by memory_pool.
-    #define CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE (64 * 1024)
-#endif
-
-#ifndef CEREAL_RAPIDXML_ALIGNMENT
-    // Memory allocation alignment.
-    // Define CEREAL_RAPIDXML_ALIGNMENT before including rapidxml.hpp if you want to override the default value, which is the size of pointer.
-    // All memory allocations for nodes, attributes and strings will be aligned to this value.
-    // This must be a power of 2 and at least 1, otherwise memory_pool will not work.
-    #define CEREAL_RAPIDXML_ALIGNMENT sizeof(void *)
-#endif
-
-namespace cereal {
-namespace rapidxml
-{
-    // Forward declarations
-    template<class Ch> class xml_node;
-    template<class Ch> class xml_attribute;
-    template<class Ch> class xml_document;
-
-    //! Enumeration listing all node types produced by the parser.
-    //! Use xml_node::type() function to query node type.
-    enum node_type
-    {
-        node_document,      //!< A document node. Name and value are empty.
-        node_element,       //!< An element node. Name contains element name. Value contains text of first data node.
-        node_data,          //!< A data node. Name is empty. Value contains data text.
-        node_cdata,         //!< A CDATA node. Name is empty. Value contains data text.
-        node_comment,       //!< A comment node. Name is empty. Value contains comment text.
-        node_declaration,   //!< A declaration node. Name and value are empty. Declaration parameters (version, encoding and standalone) are in node attributes.
-        node_doctype,       //!< A DOCTYPE node. Name is empty. Value contains DOCTYPE text.
-        node_pi             //!< A PI node. Name contains target. Value contains instructions.
-    };
-
-    ///////////////////////////////////////////////////////////////////////
-    // Parsing flags
-
-    //! Parse flag instructing the parser to not create data nodes.
-    //! Text of first data node will still be placed in value of parent element, unless rapidxml::parse_no_element_values flag is also specified.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_no_data_nodes = 0x1;
-
-    //! Parse flag instructing the parser to not use text of first data node as a value of parent element.
-    //! Can be combined with other flags by use of | operator.
-    //! Note that child data nodes of element node take precendence over its value when printing.
-    //! That is, if element has one or more child data nodes <em>and</em> a value, the value will be ignored.
-    //! Use rapidxml::parse_no_data_nodes flag to prevent creation of data nodes if you want to manipulate data using values of elements.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_no_element_values = 0x2;
-
-    //! Parse flag instructing the parser to not place zero terminators after strings in the source text.
-    //! By default zero terminators are placed, modifying source text.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_no_string_terminators = 0x4;
-
-    //! Parse flag instructing the parser to not translate entities in the source text.
-    //! By default entities are translated, modifying source text.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_no_entity_translation = 0x8;
-
-    //! Parse flag instructing the parser to disable UTF-8 handling and assume plain 8 bit characters.
-    //! By default, UTF-8 handling is enabled.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_no_utf8 = 0x10;
-
-    //! Parse flag instructing the parser to create XML declaration node.
-    //! By default, declaration node is not created.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_declaration_node = 0x20;
-
-    //! Parse flag instructing the parser to create comments nodes.
-    //! By default, comment nodes are not created.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_comment_nodes = 0x40;
-
-    //! Parse flag instructing the parser to create DOCTYPE node.
-    //! By default, doctype node is not created.
-    //! Although W3C specification allows at most one DOCTYPE node, RapidXml will silently accept documents with more than one.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_doctype_node = 0x80;
-
-    //! Parse flag instructing the parser to create PI nodes.
-    //! By default, PI nodes are not created.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_pi_nodes = 0x100;
-
-    //! Parse flag instructing the parser to validate closing tag names.
-    //! If not set, name inside closing tag is irrelevant to the parser.
-    //! By default, closing tags are not validated.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_validate_closing_tags = 0x200;
-
-    //! Parse flag instructing the parser to trim all leading and trailing whitespace of data nodes.
-    //! By default, whitespace is not trimmed.
-    //! This flag does not cause the parser to modify source text.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_trim_whitespace = 0x400;
-
-    //! Parse flag instructing the parser to condense all whitespace runs of data nodes to a single space character.
-    //! Trimming of leading and trailing whitespace of data is controlled by rapidxml::parse_trim_whitespace flag.
-    //! By default, whitespace is not normalized.
-    //! If this flag is specified, source text will be modified.
-    //! Can be combined with other flags by use of | operator.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_normalize_whitespace = 0x800;
-
-    // Compound flags
-
-    //! Parse flags which represent default behaviour of the parser.
-    //! This is always equal to 0, so that all other flags can be simply ored together.
-    //! Normally there is no need to inconveniently disable flags by anding with their negated (~) values.
-    //! This also means that meaning of each flag is a <i>negation</i> of the default setting.
-    //! For example, if flag name is rapidxml::parse_no_utf8, it means that utf-8 is <i>enabled</i> by default,
-    //! and using the flag will disable it.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_default = 0;
-
-    //! A combination of parse flags that forbids any modifications of the source text.
-    //! This also results in faster parsing. However, note that the following will occur:
-    //! <ul>
-    //! <li>names and values of nodes will not be zero terminated, you have to use xml_base::name_size() and xml_base::value_size() functions to determine where name and value ends</li>
-    //! <li>entities will not be translated</li>
-    //! <li>whitespace will not be normalized</li>
-    //! </ul>
-    //! See xml_document::parse() function.
-    const int parse_non_destructive = parse_no_string_terminators | parse_no_entity_translation;
-
-    //! A combination of parse flags resulting in fastest possible parsing, without sacrificing important data.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_fastest = parse_non_destructive | parse_no_data_nodes;
-
-    //! A combination of parse flags resulting in largest amount of data being extracted.
-    //! This usually results in slowest parsing.
-    //! <br><br>
-    //! See xml_document::parse() function.
-    const int parse_full = parse_declaration_node | parse_comment_nodes | parse_doctype_node | parse_pi_nodes | parse_validate_closing_tags;
-
-    ///////////////////////////////////////////////////////////////////////
-    // Internals
-
-    //! \cond internal
-    namespace internal
-    {
-
-        // Struct that contains lookup tables for the parser
-        // It must be a template to allow correct linking (because it has static data members, which are defined in a header file).
-        template<int Dummy>
-        struct lookup_tables
-        {
-            static const unsigned char lookup_whitespace[256];              // Whitespace table
-            static const unsigned char lookup_node_name[256];               // Node name table
-            static const unsigned char lookup_text[256];                    // Text table
-            static const unsigned char lookup_text_pure_no_ws[256];         // Text table
-            static const unsigned char lookup_text_pure_with_ws[256];       // Text table
-            static const unsigned char lookup_attribute_name[256];          // Attribute name table
-            static const unsigned char lookup_attribute_data_1[256];        // Attribute data table with single quote
-            static const unsigned char lookup_attribute_data_1_pure[256];   // Attribute data table with single quote
-            static const unsigned char lookup_attribute_data_2[256];        // Attribute data table with double quotes
-            static const unsigned char lookup_attribute_data_2_pure[256];   // Attribute data table with double quotes
-            static const unsigned char lookup_digits[256];                  // Digits
-            static const unsigned char lookup_upcase[256];                  // To uppercase conversion table for ASCII characters
-        };
-
-        // Find length of the string
-        template<class Ch>
-        inline std::size_t measure(const Ch *p)
-        {
-            const Ch *tmp = p;
-            while (*tmp)
-                ++tmp;
-            return tmp - p;
-        }
-
-        // Compare strings for equality
-        template<class Ch>
-        inline bool compare(const Ch *p1, std::size_t size1, const Ch *p2, std::size_t size2, bool case_sensitive)
-        {
-            if (size1 != size2)
-                return false;
-            if (case_sensitive)
-            {
-                for (const Ch *end = p1 + size1; p1 < end; ++p1, ++p2)
-                    if (*p1 != *p2)
-                        return false;
-            }
-            else
-            {
-                for (const Ch *end = p1 + size1; p1 < end; ++p1, ++p2)
-                    if (lookup_tables<0>::lookup_upcase[static_cast<unsigned char>(*p1)] != lookup_tables<0>::lookup_upcase[static_cast<unsigned char>(*p2)])
-                        return false;
-            }
-            return true;
-        }
-
-        template<class Ch>
-        inline bool preserve_space(xml_node<Ch>* node)
-        {
-            const Ch preserve_value[] = { Ch('p'), Ch('r'), Ch('e'), Ch('s'), Ch('e'), Ch('r'), Ch('v'), Ch('e') };
-            const xml_attribute<Ch>* space = node->first_attribute("xml:space");
-            return space && internal::compare(space->value(), space->value_size(), preserve_value, sizeof(preserve_value) / sizeof(Ch), true);
-        }
-    }
-    //! \endcond
-
-    ///////////////////////////////////////////////////////////////////////
-    // Memory pool
-
-    //! This class is used by the parser to create new nodes and attributes, without overheads of dynamic memory allocation.
-    //! In most cases, you will not need to use this class directly.
-    //! However, if you need to create nodes manually or modify names/values of nodes,
-    //! you are encouraged to use memory_pool of relevant xml_document to allocate the memory.
-    //! Not only is this faster than allocating them by using <code>new</code> operator,
-    //! but also their lifetime will be tied to the lifetime of document,
-    //! possibly simplyfing memory management.
-    //! <br><br>
-    //! Call allocate_node() or allocate_attribute() functions to obtain new nodes or attributes from the pool.
-    //! You can also call allocate_string() function to allocate strings.
-    //! Such strings can then be used as names or values of nodes without worrying about their lifetime.
-    //! Note that there is no <code>free()</code> function -- all allocations are freed at once when clear() function is called,
-    //! or when the pool is destroyed.
-    //! <br><br>
-    //! It is also possible to create a standalone memory_pool, and use it
-    //! to allocate nodes, whose lifetime will not be tied to any document.
-    //! <br><br>
-    //! Pool maintains <code>CEREAL_RAPIDXML_STATIC_POOL_SIZE</code> bytes of statically allocated memory.
-    //! Until static memory is exhausted, no dynamic memory allocations are done.
-    //! When static memory is exhausted, pool allocates additional blocks of memory of size <code>CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE</code> each,
-    //! by using global <code>new[]</code> and <code>delete[]</code> operators.
-    //! This behaviour can be changed by setting custom allocation routines.
-    //! Use set_allocator() function to set them.
-    //! <br><br>
-    //! Allocations for nodes, attributes and strings are aligned at <code>CEREAL_RAPIDXML_ALIGNMENT</code> bytes.
-    //! This value defaults to the size of pointer on target architecture.
-    //! <br><br>
-    //! To obtain absolutely top performance from the parser,
-    //! it is important that all nodes are allocated from a single, contiguous block of memory.
-    //! Otherwise, cache misses when jumping between two (or more) disjoint blocks of memory can slow down parsing quite considerably.
-    //! If required, you can tweak <code>CEREAL_RAPIDXML_STATIC_POOL_SIZE</code>, <code>CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE</code> and <code>CEREAL_RAPIDXML_ALIGNMENT</code>
-    //! to obtain best wasted memory to performance compromise.
-    //! To do it, define their values before rapidxml.hpp file is included.
-    //! \param Ch Character type of created nodes.
-    template<class Ch = char>
-    class memory_pool
-    {
-
-    public:
-
-        //! \cond internal
-        typedef void *(alloc_func)(std::size_t);       // Type of user-defined function used to allocate memory
-        typedef void (free_func)(void *);              // Type of user-defined function used to free memory
-        //! \endcond
-
-        //! Constructs empty pool with default allocator functions.
-        memory_pool()
-            : m_alloc_func(0)
-            , m_free_func(0)
-        {
-            init();
-        }
-
-        //! Destroys pool and frees all the memory.
-        //! This causes memory occupied by nodes allocated by the pool to be freed.
-        //! Nodes allocated from the pool are no longer valid.
-        ~memory_pool()
-        {
-            clear();
-        }
-
-        //! Allocates a new node from the pool, and optionally assigns name and value to it.
-        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
-        //! If exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS, this function
-        //! will call rapidxml::parse_error_handler() function.
-        //! \param type Type of node to create.
-        //! \param name Name to assign to the node, or 0 to assign no name.
-        //! \param value Value to assign to the node, or 0 to assign no value.
-        //! \param name_size Size of name to assign, or 0 to automatically calculate size from name string.
-        //! \param value_size Size of value to assign, or 0 to automatically calculate size from value string.
-        //! \return Pointer to allocated node. This pointer will never be NULL.
-        xml_node<Ch> *allocate_node(node_type type,
-                                    const Ch *name = 0, const Ch *value = 0,
-                                    std::size_t name_size = 0, std::size_t value_size = 0)
-        {
-            void *memory = allocate_aligned(sizeof(xml_node<Ch>));
-            xml_node<Ch> *node = new(memory) xml_node<Ch>(type);
-            if (name)
-            {
-                if (name_size > 0)
-                    node->name(name, name_size);
-                else
-                    node->name(name);
-            }
-            if (value)
-            {
-                if (value_size > 0)
-                    node->value(value, value_size);
-                else
-                    node->value(value);
-            }
-            return node;
-        }
-
-        //! Allocates a new attribute from the pool, and optionally assigns name and value to it.
-        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
-        //! If exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS, this function
-        //! will call rapidxml::parse_error_handler() function.
-        //! \param name Name to assign to the attribute, or 0 to assign no name.
-        //! \param value Value to assign to the attribute, or 0 to assign no value.
-        //! \param name_size Size of name to assign, or 0 to automatically calculate size from name string.
-        //! \param value_size Size of value to assign, or 0 to automatically calculate size from value string.
-        //! \return Pointer to allocated attribute. This pointer will never be NULL.
-        xml_attribute<Ch> *allocate_attribute(const Ch *name = 0, const Ch *value = 0,
-                                              std::size_t name_size = 0, std::size_t value_size = 0)
-        {
-            void *memory = allocate_aligned(sizeof(xml_attribute<Ch>));
-            xml_attribute<Ch> *attribute = new(memory) xml_attribute<Ch>;
-            if (name)
-            {
-                if (name_size > 0)
-                    attribute->name(name, name_size);
-                else
-                    attribute->name(name);
-            }
-            if (value)
-            {
-                if (value_size > 0)
-                    attribute->value(value, value_size);
-                else
-                    attribute->value(value);
-            }
-            return attribute;
-        }
-
-        //! Allocates a char array of given size from the pool, and optionally copies a given string to it.
-        //! If the allocation request cannot be accomodated, this function will throw <code>std::bad_alloc</code>.
-        //! If exceptions are disabled by defining CEREAL_RAPIDXML_NO_EXCEPTIONS, this function
-        //! will call rapidxml::parse_error_handler() function.
-        //! \param source String to initialize the allocated memory with, or 0 to not initialize it.
-        //! \param size Number of characters to allocate, or zero to calculate it automatically from source string length; if size is 0, source string must be specified and null terminated.
-        //! \return Pointer to allocated char array. This pointer will never be NULL.
-        Ch *allocate_string(const Ch *source = 0, std::size_t size = 0)
-        {
-            assert(source || size);     // Either source or size (or both) must be specified
-            if (size == 0)
-                size = internal::measure(source) + 1;
-            Ch *result = static_cast<Ch *>(allocate_aligned(size * sizeof(Ch)));
-            if (source)
-                for (std::size_t i = 0; i < size; ++i)
-                    result[i] = source[i];
-            return result;
-        }
-
-        //! Clones an xml_node and its hierarchy of child nodes and attributes.
-        //! Nodes and attributes are allocated from this memory pool.
-        //! Names and values are not cloned, they are shared between the clone and the source.
-        //! Result node can be optionally specified as a second parameter,
-        //! in which case its contents will be replaced with cloned source node.
-        //! This is useful when you want to clone entire document.
-        //! \param source Node to clone.
-        //! \param result Node to put results in, or 0 to automatically allocate result node
-        //! \return Pointer to cloned node. This pointer will never be NULL.
-        xml_node<Ch> *clone_node(const xml_node<Ch> *source, xml_node<Ch> *result = 0)
-        {
-            // Prepare result node
-            if (result)
-            {
-                result->remove_all_attributes();
-                result->remove_all_nodes();
-                result->type(source->type());
-            }
-            else
-                result = allocate_node(source->type());
-
-            // Clone name and value
-            result->name(source->name(), source->name_size());
-            result->value(source->value(), source->value_size());
-
-            // Clone child nodes and attributes
-            for (xml_node<Ch> *child = source->first_node(); child; child = child->next_sibling())
-                result->append_node(clone_node(child));
-            for (xml_attribute<Ch> *attr = source->first_attribute(); attr; attr = attr->next_attribute())
-                result->append_attribute(allocate_attribute(attr->name(), attr->value(), attr->name_size(), attr->value_size()));
-
-            return result;
-        }
-
-        //! Clears the pool.
-        //! This causes memory occupied by nodes allocated by the pool to be freed.
-        //! Any nodes or strings allocated from the pool will no longer be valid.
-        void clear()
-        {
-            while (m_begin != m_static_memory)
-            {
-                char *previous_begin = reinterpret_cast<header *>(align(m_begin))->previous_begin;
-                if (m_free_func)
-                    m_free_func(m_begin);
-                else
-                    delete[] m_begin;
-                m_begin = previous_begin;
-            }
-            init();
-        }
-
-        //! Sets or resets the user-defined memory allocation functions for the pool.
-        //! This can only be called when no memory is allocated from the pool yet, otherwise results are undefined.
-        //! Allocation function must not return invalid pointer on failure. It should either throw,
-        //! stop the program, or use <code>longjmp()</code> function to pass control to other place of program.
-        //! If it returns invalid pointer, results are undefined.
-        //! <br><br>
-        //! User defined allocation functions must have the following forms:
-        //! <br><code>
-        //! <br>void *allocate(std::size_t size);
-        //! <br>void free(void *pointer);
-        //! </code><br>
-        //! \param af Allocation function, or 0 to restore default function
-        //! \param ff Free function, or 0 to restore default function
-        void set_allocator(alloc_func *af, free_func *ff)
-        {
-            assert(m_begin == m_static_memory && m_ptr == align(m_begin));    // Verify that no memory is allocated yet
-            m_alloc_func = af;
-            m_free_func = ff;
-        }
-
-    private:
-
-        struct header
-        {
-            char *previous_begin;
-        };
-
-        void init()
-        {
-            m_begin = m_static_memory;
-            m_ptr = align(m_begin);
-            m_end = m_static_memory + sizeof(m_static_memory);
-        }
-
-        char *align(char *ptr)
-        {
-            std::size_t alignment = ((CEREAL_RAPIDXML_ALIGNMENT - (std::size_t(ptr) & (CEREAL_RAPIDXML_ALIGNMENT - 1))) & (CEREAL_RAPIDXML_ALIGNMENT - 1));
-            return ptr + alignment;
-        }
-
-        char *allocate_raw(std::size_t size)
-        {
-            // Allocate
-            void *memory;
-            if (m_alloc_func)   // Allocate memory using either user-specified allocation function or global operator new[]
-            {
-                memory = m_alloc_func(size);
-                assert(memory); // Allocator is not allowed to return 0, on failure it must either throw, stop the program or use longjmp
-            }
-            else
-            {
-                memory = new char[size];
-#ifdef CEREAL_RAPIDXML_NO_EXCEPTIONS
-                if (!memory)            // If exceptions are disabled, verify memory allocation, because new will not be able to throw bad_alloc
-                    CEREAL_RAPIDXML_PARSE_ERROR("out of memory", 0);
-#endif
-            }
-            return static_cast<char *>(memory);
-        }
-
-        void *allocate_aligned(std::size_t size)
-        {
-            // Calculate aligned pointer
-            char *result = align(m_ptr);
-
-            // If not enough memory left in current pool, allocate a new pool
-            if (result + size > m_end)
-            {
-                // Calculate required pool size (may be bigger than CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE)
-                std::size_t pool_size = CEREAL_RAPIDXML_DYNAMIC_POOL_SIZE;
-                if (pool_size < size)
-                    pool_size = size;
-
-                // Allocate
-                std::size_t alloc_size = sizeof(header) + (2 * CEREAL_RAPIDXML_ALIGNMENT - 2) + pool_size;     // 2 alignments required in worst case: one for header, one for actual allocation
-                char *raw_memory = allocate_raw(alloc_size);
-
-                // Setup new pool in allocated memory
-                char *pool = align(raw_memory);
-                header *new_header = reinterpret_cast<header *>(pool);
-                new_header->previous_begin = m_begin;
-                m_begin = raw_memory;
-                m_ptr = pool + sizeof(header);
-                m_end = raw_memory + alloc_size;
-
-                // Calculate aligned pointer again using new pool
-                result = align(m_ptr);
-            }
-
-            // Update pool and return aligned pointer
-            m_ptr = result + size;
-            return result;
-        }
-
-        char *m_begin;                                      // Start of raw memory making up current pool
-        char *m_ptr;                                        // First free byte in current pool
-        char *m_end;                                        // One past last available byte in current pool
-        char m_static_memory[CEREAL_RAPIDXML_STATIC_POOL_SIZE];    // Static raw memory
-        alloc_func *m_alloc_func;                           // Allocator function, or 0 if default is to be used
-        free_func *m_free_func;                             // Free function, or 0 if default is to be used
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    // XML base
-
-    //! Base class for xml_node and xml_attribute implementing common functions:
-    //! name(), name_size(), value(), value_size() and parent().
-    //! \param Ch Character type to use
-    template<class Ch = char>
-    class xml_base
-    {
-
-    public:
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Construction & destruction
-
-        // Construct a base with empty name, value and parent
-        xml_base()
-            : m_name(0)
-            , m_value(0)
-            , m_parent(0)
-        {
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Node data access
-
-        //! Gets name of the node.
-        //! Interpretation of name depends on type of node.
-        //! Note that name will not be zero-terminated if rapidxml::parse_no_string_terminators option was selected during parse.
-        //! <br><br>
-        //! Use name_size() function to determine length of the name.
-        //! \return Name of node, or empty string if node has no name.
-        Ch *name() const
-        {
-            return m_name ? m_name : nullstr();
-        }
-
-        //! Gets size of node name, not including terminator character.
-        //! This function works correctly irrespective of whether name is or is not zero terminated.
-        //! \return Size of node name, in characters.
-        std::size_t name_size() const
-        {
-            return m_name ? m_name_size : 0;
-        }
-
-        //! Gets value of node.
-        //! Interpretation of value depends on type of node.
-        //! Note that value will not be zero-terminated if rapidxml::parse_no_string_terminators option was selected during parse.
-        //! <br><br>
-        //! Use value_size() function to determine length of the value.
-        //! \return Value of node, or empty string if node has no value.
-        Ch *value() const
-        {
-            return m_value ? m_value : nullstr();
-        }
-
-        //! Gets size of node value, not including terminator character.
-        //! This function works correctly irrespective of whether value is or is not zero terminated.
-        //! \return Size of node value, in characters.
-        std::size_t value_size() const
-        {
-            return m_value ? m_value_size : 0;
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Node modification
-
-        //! Sets name of node to a non zero-terminated string.
-        //! See \ref ownership_of_strings.
-        //! <br><br>
-        //! Note that node does not own its name or value, it only stores a pointer to it.
-        //! It will not delete or otherwise free the pointer on destruction.
-        //! It is reponsibility of the user to properly manage lifetime of the string.
-        //! The easiest way to achieve it is to use memory_pool of the document to allocate the string -
-        //! on destruction of the document the string will be automatically freed.
-        //! <br><br>
-        //! Size of name must be specified separately, because name does not have to be zero terminated.
-        //! Use name(const Ch *) function to have the length automatically calculated (string must be zero terminated).
-        //! \param name Name of node to set. Does not have to be zero terminated.
-        //! \param size Size of name, in characters. This does not include zero terminator, if one is present.
-        void name(const Ch *name_, std::size_t size)
-        {
-            m_name = const_cast<Ch *>(name_);
-            m_name_size = size;
-        }
-
-        //! Sets name of node to a zero-terminated string.
-        //! See also \ref ownership_of_strings and xml_node::name(const Ch *, std::size_t).
-        //! \param name Name of node to set. Must be zero terminated.
-        void name(const Ch *name_)
-        {
-            this->name(name_, internal::measure(name_));
-        }
-
-        //! Sets value of node to a non zero-terminated string.
-        //! See \ref ownership_of_strings.
-        //! <br><br>
-        //! Note that node does not own its name or value, it only stores a pointer to it.
-        //! It will not delete or otherwise free the pointer on destruction.
-        //! It is reponsibility of the user to properly manage lifetime of the string.
-        //! The easiest way to achieve it is to use memory_pool of the document to allocate the string -
-        //! on destruction of the document the string will be automatically freed.
-        //! <br><br>
-        //! Size of value must be specified separately, because it does not have to be zero terminated.
-        //! Use value(const Ch *) function to have the length automatically calculated (string must be zero terminated).
-        //! <br><br>
-        //! If an element has a child node of type node_data, it will take precedence over element value when printing.
-        //! If you want to manipulate data of elements using values, use parser flag rapidxml::parse_no_data_nodes to prevent creation of data nodes by the parser.
-        //! \param value value of node to set. Does not have to be zero terminated.
-        //! \param size Size of value, in characters. This does not include zero terminator, if one is present.
-        void value(const Ch *value_, std::size_t size)
-        {
-            m_value = const_cast<Ch *>(value_);
-            m_value_size = size;
-        }
-
-        //! Sets value of node to a zero-terminated string.
-        //! See also \ref ownership_of_strings and xml_node::value(const Ch *, std::size_t).
-        //! \param value Vame of node to set. Must be zero terminated.
-        void value(const Ch *value_)
-        {
-            this->value(value_, internal::measure(value_));
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Related nodes access
-
-        //! Gets node parent.
-        //! \return Pointer to parent node, or 0 if there is no parent.
-        xml_node<Ch> *parent() const
-        {
-            return m_parent;
-        }
-
-    protected:
-
-        // Return empty string
-        static Ch *nullstr()
-        {
-            static Ch zero = Ch('\0');
-            return &zero;
-        }
-
-        Ch *m_name;                         // Name of node, or 0 if no name
-        Ch *m_value;                        // Value of node, or 0 if no value
-        std::size_t m_name_size;            // Length of node name, or undefined of no name
-        std::size_t m_value_size;           // Length of node value, or undefined if no value
-        xml_node<Ch> *m_parent;             // Pointer to parent node, or 0 if none
-
-    };
-
-    //! Class representing attribute node of XML document.
-    //! Each attribute has name and value strings, which are available through name() and value() functions (inherited from xml_base).
-    //! Note that after parse, both name and value of attribute will point to interior of source text used for parsing.
-    //! Thus, this text must persist in memory for the lifetime of attribute.
-    //! \param Ch Character type to use.
-    template<class Ch = char>
-    class xml_attribute: public xml_base<Ch>
-    {
-
-        friend class xml_node<Ch>;
-
-    public:
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Construction & destruction
-
-        //! Constructs an empty attribute with the specified type.
-        //! Consider using memory_pool of appropriate xml_document if allocating attributes manually.
-        xml_attribute()
-        {
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Related nodes access
-
-        //! Gets document of which attribute is a child.
-        //! \return Pointer to document that contains this attribute, or 0 if there is no parent document.
-        xml_document<Ch> *document() const
-        {
-            if (xml_node<Ch> *node = this->parent())
-            {
-                while (node->parent())
-                    node = node->parent();
-                return node->type() == node_document ? static_cast<xml_document<Ch> *>(node) : 0;
-            }
-            else
-                return 0;
-        }
-
-        //! Gets previous attribute, optionally matching attribute name.
-        //! \param name Name of attribute to find, or 0 to return previous attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found attribute, or 0 if not found.
-        xml_attribute<Ch> *previous_attribute(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
-        {
-            if (name)
-            {
-                if (name_size == 0)
-                    name_size = internal::measure(name);
-                for (xml_attribute<Ch> *attribute = m_prev_attribute; attribute; attribute = attribute->m_prev_attribute)
-                    if (internal::compare(attribute->name(), attribute->name_size(), name, name_size, case_sensitive))
-                        return attribute;
-                return 0;
-            }
-            else
-                return this->m_parent ? m_prev_attribute : 0;
-        }
-
-        //! Gets next attribute, optionally matching attribute name.
-        //! \param name Name of attribute to find, or 0 to return next attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found attribute, or 0 if not found.
-        xml_attribute<Ch> *next_attribute(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
-        {
-            if (name_)
-            {
-                if (name_size_ == 0)
-                    name_size_ = internal::measure(name_);
-                for (xml_attribute<Ch> *attribute = m_next_attribute; attribute; attribute = attribute->m_next_attribute)
-                    if (internal::compare(attribute->name(), attribute->name_size(), name_, name_size_, case_sensitive))
-                        return attribute;
-                return 0;
-            }
-            else
-                return this->m_parent ? m_next_attribute : 0;
-        }
-
-    private:
-
-        xml_attribute<Ch> *m_prev_attribute;        // Pointer to previous sibling of attribute, or 0 if none; only valid if parent is non-zero
-        xml_attribute<Ch> *m_next_attribute;        // Pointer to next sibling of attribute, or 0 if none; only valid if parent is non-zero
-
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    // XML node
-
-    //! Class representing a node of XML document.
-    //! Each node may have associated name and value strings, which are available through name() and value() functions.
-    //! Interpretation of name and value depends on type of the node.
-    //! Type of node can be determined by using type() function.
-    //! <br><br>
-    //! Note that after parse, both name and value of node, if any, will point interior of source text used for parsing.
-    //! Thus, this text must persist in the memory for the lifetime of node.
-    //! \param Ch Character type to use.
-    template<class Ch = char>
-    class xml_node: public xml_base<Ch>
-    {
-
-    public:
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Construction & destruction
-
-        //! Constructs an empty node with the specified type.
-        //! Consider using memory_pool of appropriate document to allocate nodes manually.
-        //! \param type Type of node to construct.
-        xml_node(node_type type_)
-            : m_type(type_)
-            , m_first_node(0)
-            , m_first_attribute(0)
-        {
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Node data access
-
-        //! Gets type of node.
-        //! \return Type of node.
-        node_type type() const
-        {
-            return m_type;
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Related nodes access
-
-        //! Gets document of which node is a child.
-        //! \return Pointer to document that contains this node, or 0 if there is no parent document.
-        xml_document<Ch> *document() const
-        {
-            xml_node<Ch> *node = const_cast<xml_node<Ch> *>(this);
-            while (node->parent())
-                node = node->parent();
-            return node->type() == node_document ? static_cast<xml_document<Ch> *>(node) : 0;
-        }
-
-        //! Gets first child node, optionally matching node name.
-        //! \param name Name of child to find, or 0 to return first child regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found child, or 0 if not found.
-        xml_node<Ch> *first_node(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
-        {
-            if (name_)
-            {
-                if (name_size_ == 0)
-                    name_size_ = internal::measure(name_);
-                for (xml_node<Ch> *child = m_first_node; child; child = child->next_sibling())
-                    if (internal::compare(child->name(), child->name_size(), name_, name_size_, case_sensitive))
-                        return child;
-                return 0;
-            }
-            else
-                return m_first_node;
-        }
-
-        //! Gets last child node, optionally matching node name.
-        //! Behaviour is undefined if node has no children.
-        //! Use first_node() to test if node has children.
-        //! \param name Name of child to find, or 0 to return last child regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found child, or 0 if not found.
-        xml_node<Ch> *last_node(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
-        {
-            assert(m_first_node);  // Cannot query for last child if node has no children
-            if (name)
-            {
-                if (name_size == 0)
-                    name_size = internal::measure(name);
-                for (xml_node<Ch> *child = m_last_node; child; child = child->previous_sibling())
-                    if (internal::compare(child->name(), child->name_size(), name, name_size, case_sensitive))
-                        return child;
-                return 0;
-            }
-            else
-                return m_last_node;
-        }
-
-        //! Gets previous sibling node, optionally matching node name.
-        //! Behaviour is undefined if node has no parent.
-        //! Use parent() to test if node has a parent.
-        //! \param name Name of sibling to find, or 0 to return previous sibling regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found sibling, or 0 if not found.
-        xml_node<Ch> *previous_sibling(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
-        {
-            assert(this->m_parent);     // Cannot query for siblings if node has no parent
-            if (name)
-            {
-                if (name_size == 0)
-                    name_size = internal::measure(name);
-                for (xml_node<Ch> *sibling = m_prev_sibling; sibling; sibling = sibling->m_prev_sibling)
-                    if (internal::compare(sibling->name(), sibling->name_size(), name, name_size, case_sensitive))
-                        return sibling;
-                return 0;
-            }
-            else
-                return m_prev_sibling;
-        }
-
-        //! Gets next sibling node, optionally matching node name.
-        //! Behaviour is undefined if node has no parent.
-        //! Use parent() to test if node has a parent.
-        //! \param name Name of sibling to find, or 0 to return next sibling regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found sibling, or 0 if not found.
-        xml_node<Ch> *next_sibling(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
-        {
-            assert(this->m_parent);     // Cannot query for siblings if node has no parent
-            if (name_)
-            {
-                if (name_size_ == 0)
-                    name_size_ = internal::measure(name_);
-                for (xml_node<Ch> *sibling = m_next_sibling; sibling; sibling = sibling->m_next_sibling)
-                    if (internal::compare(sibling->name(), sibling->name_size(), name_, name_size_, case_sensitive))
-                        return sibling;
-                return 0;
-            }
-            else
-                return m_next_sibling;
-        }
-
-        //! Gets first attribute of node, optionally matching attribute name.
-        //! \param name Name of attribute to find, or 0 to return first attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found attribute, or 0 if not found.
-        xml_attribute<Ch> *first_attribute(const Ch *name_ = 0, std::size_t name_size_ = 0, bool case_sensitive = true) const
-        {
-            if (name_)
-            {
-                if (name_size_ == 0)
-                    name_size_ = internal::measure(name_);
-                for (xml_attribute<Ch> *attribute = m_first_attribute; attribute; attribute = attribute->m_next_attribute)
-                    if (internal::compare(attribute->name(), attribute->name_size(), name_, name_size_, case_sensitive))
-                        return attribute;
-                return 0;
-            }
-            else
-                return m_first_attribute;
-        }
-
-        //! Gets last attribute of node, optionally matching attribute name.
-        //! \param name Name of attribute to find, or 0 to return last attribute regardless of its name; this string doesn't have to be zero-terminated if name_size is non-zero
-        //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string
-        //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters
-        //! \return Pointer to found attribute, or 0 if not found.
-        xml_attribute<Ch> *last_attribute(const Ch *name = 0, std::size_t name_size = 0, bool case_sensitive = true) const
-        {
-            if (name)
-            {
-                if (name_size == 0)
-                    name_size = internal::measure(name);
-                for (xml_attribute<Ch> *attribute = m_last_attribute; attribute; attribute = attribute->m_prev_attribute)
-                    if (internal::compare(attribute->name(), attribute->name_size(), name, name_size, case_sensitive))
-                        return attribute;
-                return 0;
-            }
-            else
-                return m_first_attribute ? m_last_attribute : 0;
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Node modification
-
-        //! Sets type of node.
-        //! \param type Type of node to set.
-        void type(node_type type_)
-        {
-            m_type = type_;
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Node manipulation
-
-        //! Prepends a new child node.
-        //! The prepended child becomes the first child, and all existing children are moved one position back.
-        //! \param child Node to prepend.
-        void prepend_node(xml_node<Ch> *child)
-        {
-            assert(child && !child->parent() && child->type() != node_document);
-            if (first_node())
-            {
-                child->m_next_sibling = m_first_node;
-                m_first_node->m_prev_sibling = child;
-            }
-            else
-            {
-                child->m_next_sibling = 0;
-                m_last_node = child;
-            }
-            m_first_node = child;
-            child->m_parent = this;
-            child->m_prev_sibling = 0;
-        }
-
-        //! Appends a new child node.
-        //! The appended child becomes the last child.
-        //! \param child Node to append.
-        void append_node(xml_node<Ch> *child)
-        {
-            assert(child && !child->parent() && child->type() != node_document);
-            if (first_node())
-            {
-                child->m_prev_sibling = m_last_node;
-                m_last_node->m_next_sibling = child;
-            }
-            else
-            {
-                child->m_prev_sibling = 0;
-                m_first_node = child;
-            }
-            m_last_node = child;
-            child->m_parent = this;
-            child->m_next_sibling = 0;
-        }
-
-        //! Inserts a new child node at specified place inside the node.
-        //! All children after and including the specified node are moved one position back.
-        //! \param where Place where to insert the child, or 0 to insert at the back.
-        //! \param child Node to insert.
-        void insert_node(xml_node<Ch> *where, xml_node<Ch> *child)
-        {
-            assert(!where || where->parent() == this);
-            assert(child && !child->parent() && child->type() != node_document);
-            if (where == m_first_node)
-                prepend_node(child);
-            else if (where == 0)
-                append_node(child);
-            else
-            {
-                child->m_prev_sibling = where->m_prev_sibling;
-                child->m_next_sibling = where;
-                where->m_prev_sibling->m_next_sibling = child;
-                where->m_prev_sibling = child;
-                child->m_parent = this;
-            }
-        }
-
-        //! Removes first child node.
-        //! If node has no children, behaviour is undefined.
-        //! Use first_node() to test if node has children.
-        void remove_first_node()
-        {
-            assert(first_node());
-            xml_node<Ch> *child = m_first_node;
-            m_first_node = child->m_next_sibling;
-            if (child->m_next_sibling)
-                child->m_next_sibling->m_prev_sibling = 0;
-            else
-                m_last_node = 0;
-            child->m_parent = 0;
-        }
-
-        //! Removes last child of the node.
-        //! If node has no children, behaviour is undefined.
-        //! Use first_node() to test if node has children.
-        void remove_last_node()
-        {
-            assert(first_node());
-            xml_node<Ch> *child = m_last_node;
-            if (child->m_prev_sibling)
-            {
-                m_last_node = child->m_prev_sibling;
-                child->m_prev_sibling->m_next_sibling = 0;
-            }
-            else
-                m_first_node = 0;
-            child->m_parent = 0;
-        }
-
-        //! Removes specified child from the node
-        // \param where Pointer to child to be removed.
-        void remove_node(xml_node<Ch> *where)
-        {
-            assert(where && where->parent() == this);
-            assert(first_node());
-            if (where == m_first_node)
-                remove_first_node();
-            else if (where == m_last_node)
-                remove_last_node();
-            else
-            {
-                where->m_prev_sibling->m_next_sibling = where->m_next_sibling;
-                where->m_next_sibling->m_prev_sibling = where->m_prev_sibling;
-                where->m_parent = 0;
-            }
-        }
-
-        //! Removes all child nodes (but not attributes).
-        void remove_all_nodes()
-        {
-            for (xml_node<Ch> *node = first_node(); node; node = node->m_next_sibling)
-                node->m_parent = 0;
-            m_first_node = 0;
-        }
-
-        //! Prepends a new attribute to the node.
-        //! \param attribute Attribute to prepend.
-        void prepend_attribute(xml_attribute<Ch> *attribute)
-        {
-            assert(attribute && !attribute->parent());
-            if (first_attribute())
-            {
-                attribute->m_next_attribute = m_first_attribute;
-                m_first_attribute->m_prev_attribute = attribute;
-            }
-            else
-            {
-                attribute->m_next_attribute = 0;
-                m_last_attribute = attribute;
-            }
-            m_first_attribute = attribute;
-            attribute->m_parent = this;
-            attribute->m_prev_attribute = 0;
-        }
-
-        //! Appends a new attribute to the node.
-        //! \param attribute Attribute to append.
-        void append_attribute(xml_attribute<Ch> *attribute)
-        {
-            assert(attribute && !attribute->parent());
-            if (first_attribute())
-            {
-                attribute->m_prev_attribute = m_last_attribute;
-                m_last_attribute->m_next_attribute = attribute;
-            }
-            else
-            {
-                attribute->m_prev_attribute = 0;
-                m_first_attribute = attribute;
-            }
-            m_last_attribute = attribute;
-            attribute->m_parent = this;
-            attribute->m_next_attribute = 0;
-        }
-
-        //! Inserts a new attribute at specified place inside the node.
-        //! All attributes after and including the specified attribute are moved one position back.
-        //! \param where Place where to insert the attribute, or 0 to insert at the back.
-        //! \param attribute Attribute to insert.
-        void insert_attribute(xml_attribute<Ch> *where, xml_attribute<Ch> *attribute)
-        {
-            assert(!where || where->parent() == this);
-            assert(attribute && !attribute->parent());
-            if (where == m_first_attribute)
-                prepend_attribute(attribute);
-            else if (where == 0)
-                append_attribute(attribute);
-            else
-            {
-                attribute->m_prev_attribute = where->m_prev_attribute;
-                attribute->m_next_attribute = where;
-                where->m_prev_attribute->m_next_attribute = attribute;
-                where->m_prev_attribute = attribute;
-                attribute->m_parent = this;
-            }
-        }
-
-        //! Removes first attribute of the node.
-        //! If node has no attributes, behaviour is undefined.
-        //! Use first_attribute() to test if node has attributes.
-        void remove_first_attribute()
-        {
-            assert(first_attribute());
-            xml_attribute<Ch> *attribute = m_first_attribute;
-            if (attribute->m_next_attribute)
-            {
-                attribute->m_next_attribute->m_prev_attribute = 0;
-            }
-            else
-                m_last_attribute = 0;
-            attribute->m_parent = 0;
-            m_first_attribute = attribute->m_next_attribute;
-        }
-
-        //! Removes last attribute of the node.
-        //! If node has no attributes, behaviour is undefined.
-        //! Use first_attribute() to test if node has attributes.
-        void remove_last_attribute()
-        {
-            assert(first_attribute());
-            xml_attribute<Ch> *attribute = m_last_attribute;
-            if (attribute->m_prev_attribute)
-            {
-                attribute->m_prev_attribute->m_next_attribute = 0;
-                m_last_attribute = attribute->m_prev_attribute;
-            }
-            else
-                m_first_attribute = 0;
-            attribute->m_parent = 0;
-        }
-
-        //! Removes specified attribute from node.
-        //! \param where Pointer to attribute to be removed.
-        void remove_attribute(xml_attribute<Ch> *where)
-        {
-            assert(first_attribute() && where->parent() == this);
-            if (where == m_first_attribute)
-                remove_first_attribute();
-            else if (where == m_last_attribute)
-                remove_last_attribute();
-            else
-            {
-                where->m_prev_attribute->m_next_attribute = where->m_next_attribute;
-                where->m_next_attribute->m_prev_attribute = where->m_prev_attribute;
-                where->m_parent = 0;
-            }
-        }
-
-        //! Removes all attributes of node.
-        void remove_all_attributes()
-        {
-            for (xml_attribute<Ch> *attribute = first_attribute(); attribute; attribute = attribute->m_next_attribute)
-                attribute->m_parent = 0;
-            m_first_attribute = 0;
-        }
-
-    private:
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Restrictions
-
-        // No copying
-        xml_node(const xml_node &);
-        void operator =(const xml_node &);
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Data members
-
-        // Note that some of the pointers below have UNDEFINED values if certain other pointers are 0.
-        // This is required for maximum performance, as it allows the parser to omit initialization of
-        // unneded/redundant values.
-        //
-        // The rules are as follows:
-        // 1. first_node and first_attribute contain valid pointers, or 0 if node has no children/attributes respectively
-        // 2. last_node and last_attribute are valid only if node has at least one child/attribute respectively, otherwise they contain garbage
-        // 3. prev_sibling and next_sibling are valid only if node has a parent, otherwise they contain garbage
-
-        node_type m_type;                       // Type of node; always valid
-        xml_node<Ch> *m_first_node;             // Pointer to first child node, or 0 if none; always valid
-        xml_node<Ch> *m_last_node;              // Pointer to last child node, or 0 if none; this value is only valid if m_first_node is non-zero
-        xml_attribute<Ch> *m_first_attribute;   // Pointer to first attribute of node, or 0 if none; always valid
-        xml_attribute<Ch> *m_last_attribute;    // Pointer to last attribute of node, or 0 if none; this value is only valid if m_first_attribute is non-zero
-        xml_node<Ch> *m_prev_sibling;           // Pointer to previous sibling of node, or 0 if none; this value is only valid if m_parent is non-zero
-        xml_node<Ch> *m_next_sibling;           // Pointer to next sibling of node, or 0 if none; this value is only valid if m_parent is non-zero
-
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    // XML document
-
-    //! This class represents root of the DOM hierarchy.
-    //! It is also an xml_node and a memory_pool through public inheritance.
-    //! Use parse() function to build a DOM tree from a zero-terminated XML text string.
-    //! parse() function allocates memory for nodes and attributes by using functions of xml_document,
-    //! which are inherited from memory_pool.
-    //! To access root node of the document, use the document itself, as if it was an xml_node.
-    //! \param Ch Character type to use.
-    template<class Ch = char>
-    class xml_document: public xml_node<Ch>, public memory_pool<Ch>
-    {
-
-    public:
-
-        //! Constructs empty XML document
-        xml_document()
-            : xml_node<Ch>(node_document)
-        {
-        }
-
-        //! Parses zero-terminated XML string according to given flags.
-        //! Passed string will be modified by the parser, unless rapidxml::parse_non_destructive flag is used.
-        //! The string must persist for the lifetime of the document.
-        //! In case of error, rapidxml::parse_error exception will be thrown.
-        //! <br><br>
-        //! If you want to parse contents of a file, you must first load the file into the memory, and pass pointer to its beginning.
-        //! Make sure that data is zero-terminated.
-        //! <br><br>
-        //! Document can be parsed into multiple times.
-        //! Each new call to parse removes previous nodes and attributes (if any), but does not clear memory pool.
-        //! \param text XML data to parse; pointer is non-const to denote fact that this data may be modified by the parser.
-        template<int Flags>
-        void parse(Ch *text)
-        {
-            assert(text);
-
-            // Remove current contents
-            this->remove_all_nodes();
-            this->remove_all_attributes();
-
-            // Parse BOM, if any
-            parse_bom<Flags>(text);
-
-            // Parse children
-            while (1)
-            {
-                // Skip whitespace before node
-                skip<whitespace_pred, Flags>(text);
-                if (*text == 0)
-                    break;
-
-                // Parse and append new child
-                if (*text == Ch('<'))
-                {
-                    ++text;     // Skip '<'
-                    if (xml_node<Ch> *node = parse_node<Flags>(text))
-                        this->append_node(node);
-                }
-                else
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected <", text);
-            }
-
-        }
-
-        //! Clears the document by deleting all nodes and clearing the memory pool.
-        //! All nodes owned by document pool are destroyed.
-        void clear()
-        {
-            this->remove_all_nodes();
-            this->remove_all_attributes();
-            memory_pool<Ch>::clear();
-        }
-
-    private:
-
-        ///////////////////////////////////////////////////////////////////////
-        // Internal character utility functions
-
-        // Detect whitespace character
-        struct whitespace_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                return internal::lookup_tables<0>::lookup_whitespace[static_cast<unsigned char>(ch)];
-            }
-        };
-
-        // Detect node name character
-        struct node_name_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                return internal::lookup_tables<0>::lookup_node_name[static_cast<unsigned char>(ch)];
-            }
-        };
-
-        // Detect attribute name character
-        struct attribute_name_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                return internal::lookup_tables<0>::lookup_attribute_name[static_cast<unsigned char>(ch)];
-            }
-        };
-
-        // Detect text character (PCDATA)
-        struct text_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                return internal::lookup_tables<0>::lookup_text[static_cast<unsigned char>(ch)];
-            }
-        };
-
-        // Detect text character (PCDATA) that does not require processing
-        struct text_pure_no_ws_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                return internal::lookup_tables<0>::lookup_text_pure_no_ws[static_cast<unsigned char>(ch)];
-            }
-        };
-
-        // Detect text character (PCDATA) that does not require processing
-        struct text_pure_with_ws_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                return internal::lookup_tables<0>::lookup_text_pure_with_ws[static_cast<unsigned char>(ch)];
-            }
-        };
-
-        // Detect attribute value character
-        template<Ch Quote>
-        struct attribute_value_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                if (Quote == Ch('\''))
-                    return internal::lookup_tables<0>::lookup_attribute_data_1[static_cast<unsigned char>(ch)];
-                if (Quote == Ch('\"'))
-                    return internal::lookup_tables<0>::lookup_attribute_data_2[static_cast<unsigned char>(ch)];
-                return 0;       // Should never be executed, to avoid warnings on Comeau
-            }
-        };
-
-        // Detect attribute value character
-        template<Ch Quote>
-        struct attribute_value_pure_pred
-        {
-            static unsigned char test(Ch ch)
-            {
-                if (Quote == Ch('\''))
-                    return internal::lookup_tables<0>::lookup_attribute_data_1_pure[static_cast<unsigned char>(ch)];
-                if (Quote == Ch('\"'))
-                    return internal::lookup_tables<0>::lookup_attribute_data_2_pure[static_cast<unsigned char>(ch)];
-                return 0;       // Should never be executed, to avoid warnings on Comeau
-            }
-        };
-
-        // Insert coded character, using UTF8 or 8-bit ASCII
-        template<int Flags>
-        static void insert_coded_character(Ch *&text, unsigned long code)
-        {
-            if (Flags & parse_no_utf8)
-            {
-                // Insert 8-bit ASCII character
-                // Todo: possibly verify that code is less than 256 and use replacement char otherwise?
-                text[0] = static_cast<unsigned char>(code);
-                text += 1;
-            }
-            else
-            {
-                // Insert UTF8 sequence
-                if (code < 0x80)    // 1 byte sequence
-                {
-	                text[0] = static_cast<unsigned char>(code);
-                    text += 1;
-                }
-                else if (code < 0x800)  // 2 byte sequence
-                {
-	                text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
-	                text[0] = static_cast<unsigned char>(code | 0xC0);
-                    text += 2;
-                }
-	            else if (code < 0x10000)    // 3 byte sequence
-                {
-	                text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
-	                text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
-	                text[0] = static_cast<unsigned char>(code | 0xE0);
-                    text += 3;
-                }
-	            else if (code < 0x110000)   // 4 byte sequence
-                {
-	                text[3] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
-	                text[2] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
-	                text[1] = static_cast<unsigned char>((code | 0x80) & 0xBF); code >>= 6;
-	                text[0] = static_cast<unsigned char>(code | 0xF0);
-                    text += 4;
-                }
-                else    // Invalid, only codes up to 0x10FFFF are allowed in Unicode
-                {
-                    CEREAL_RAPIDXML_PARSE_ERROR("invalid numeric character entity", text);
-                }
-            }
-        }
-
-        // Skip characters until predicate evaluates to true
-        template<class StopPred, int Flags>
-        static void skip(Ch *&text)
-        {
-            Ch *tmp = text;
-            while (StopPred::test(*tmp))
-                ++tmp;
-            text = tmp;
-        }
-
-        // Skip characters until predicate evaluates to true while doing the following:
-        // - replacing XML character entity references with proper characters (&apos; &amp; &quot; &lt; &gt; &#...;)
-        // - condensing whitespace sequences to single space character
-        template<class StopPred, class StopPredPure, int Flags>
-        static Ch *skip_and_expand_character_refs(Ch *&text, bool preserve_space)
-        {
-            // If entity translation, whitespace condense and whitespace trimming is disabled, use plain skip
-            if (Flags & parse_no_entity_translation &&
-                !(Flags & parse_normalize_whitespace) &&
-                !(Flags & parse_trim_whitespace))
-            {
-                skip<StopPred, Flags>(text);
-                return text;
-            }
-
-            // Use simple skip until first modification is detected
-            skip<StopPredPure, Flags>(text);
-
-            // Use translation skip
-            Ch *src = text;
-            Ch *dest = src;
-            while (StopPred::test(*src))
-            {
-                // If entity translation is enabled
-                if (!(Flags & parse_no_entity_translation))
-                {
-                    // Test if replacement is needed
-                    if (src[0] == Ch('&'))
-                    {
-                        switch (src[1])
-                        {
-
-                        // &amp; &apos;
-                        case Ch('a'):
-                            if (src[2] == Ch('m') && src[3] == Ch('p') && src[4] == Ch(';'))
-                            {
-                                *dest = Ch('&');
-                                ++dest;
-                                src += 5;
-                                continue;
-                            }
-                            if (src[2] == Ch('p') && src[3] == Ch('o') && src[4] == Ch('s') && src[5] == Ch(';'))
-                            {
-                                *dest = Ch('\'');
-                                ++dest;
-                                src += 6;
-                                continue;
-                            }
-                            break;
-
-                        // &quot;
-                        case Ch('q'):
-                            if (src[2] == Ch('u') && src[3] == Ch('o') && src[4] == Ch('t') && src[5] == Ch(';'))
-                            {
-                                *dest = Ch('"');
-                                ++dest;
-                                src += 6;
-                                continue;
-                            }
-                            break;
-
-                        // &gt;
-                        case Ch('g'):
-                            if (src[2] == Ch('t') && src[3] == Ch(';'))
-                            {
-                                *dest = Ch('>');
-                                ++dest;
-                                src += 4;
-                                continue;
-                            }
-                            break;
-
-                        // &lt;
-                        case Ch('l'):
-                            if (src[2] == Ch('t') && src[3] == Ch(';'))
-                            {
-                                *dest = Ch('<');
-                                ++dest;
-                                src += 4;
-                                continue;
-                            }
-                            break;
-
-                        // &#...; - assumes ASCII
-                        case Ch('#'):
-                            if (src[2] == Ch('x'))
-                            {
-                                unsigned long code = 0;
-                                src += 3;   // Skip &#x
-                                while (1)
-                                {
-                                    unsigned char digit = internal::lookup_tables<0>::lookup_digits[static_cast<unsigned char>(*src)];
-                                    if (digit == 0xFF)
-                                        break;
-                                    code = code * 16 + digit;
-                                    ++src;
-                                }
-                                insert_coded_character<Flags>(dest, code);    // Put character in output
-                            }
-                            else
-                            {
-                                unsigned long code = 0;
-                                src += 2;   // Skip &#
-                                while (1)
-                                {
-                                    unsigned char digit = internal::lookup_tables<0>::lookup_digits[static_cast<unsigned char>(*src)];
-                                    if (digit == 0xFF)
-                                        break;
-                                    code = code * 10 + digit;
-                                    ++src;
-                                }
-                                insert_coded_character<Flags>(dest, code);    // Put character in output
-                            }
-                            if (*src == Ch(';'))
-                                ++src;
-                            else
-                                CEREAL_RAPIDXML_PARSE_ERROR("expected ;", src);
-                            continue;
-
-                        // Something else
-                        default:
-                            // Ignore, just copy '&' verbatim
-                            break;
-
-                        }
-                    }
-                }
-
-                // If whitespace condensing is enabled
-                if ((Flags & parse_normalize_whitespace) && !preserve_space)
-                {
-                    // Test if condensing is needed
-                    if (whitespace_pred::test(*src))
-                    {
-                        *dest = Ch(' '); ++dest;    // Put single space in dest
-                        ++src;                      // Skip first whitespace char
-                        // Skip remaining whitespace chars
-                        while (whitespace_pred::test(*src))
-                            ++src;
-                        continue;
-                    }
-                }
-
-                // No replacement, only copy character
-                *dest++ = *src++;
-
-            }
-
-            // Return new end
-            text = src;
-            return dest;
-
-        }
-
-        ///////////////////////////////////////////////////////////////////////
-        // Internal parsing functions
-
-        // Parse BOM, if any
-        template<int Flags>
-        void parse_bom(Ch *&text)
-        {
-            // UTF-8?
-            if (static_cast<unsigned char>(text[0]) == 0xEF &&
-                static_cast<unsigned char>(text[1]) == 0xBB &&
-                static_cast<unsigned char>(text[2]) == 0xBF)
-            {
-                text += 3;      // Skup utf-8 bom
-            }
-        }
-
-        // Parse XML declaration (<?xml...)
-        template<int Flags>
-        xml_node<Ch> *parse_xml_declaration(Ch *&text)
-        {
-            // If parsing of declaration is disabled
-            if (!(Flags & parse_declaration_node))
-            {
-                // Skip until end of declaration
-                while (text[0] != Ch('?') || text[1] != Ch('>'))
-                {
-                    if (!text[0])
-                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                    ++text;
-                }
-                text += 2;    // Skip '?>'
-                return 0;
-            }
-
-            // Create declaration
-            xml_node<Ch> *declaration = this->allocate_node(node_declaration);
-
-            // Skip whitespace before attributes or ?>
-            skip<whitespace_pred, Flags>(text);
-
-            // Parse declaration attributes
-            parse_node_attributes<Flags>(text, declaration);
-
-            // Skip ?>
-            if (text[0] != Ch('?') || text[1] != Ch('>'))
-                CEREAL_RAPIDXML_PARSE_ERROR("expected ?>", text);
-            text += 2;
-
-            return declaration;
-        }
-
-        // Parse XML comment (<!--...)
-        template<int Flags>
-        xml_node<Ch> *parse_comment(Ch *&text)
-        {
-            // If parsing of comments is disabled
-            if (!(Flags & parse_comment_nodes))
-            {
-                // Skip until end of comment
-                while (text[0] != Ch('-') || text[1] != Ch('-') || text[2] != Ch('>'))
-                {
-                    if (!text[0])
-                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                    ++text;
-                }
-                text += 3;     // Skip '-->'
-                return 0;      // Do not produce comment node
-            }
-
-            // Remember value start
-            Ch *value_ = text;
-
-            // Skip until end of comment
-            while (text[0] != Ch('-') || text[1] != Ch('-') || text[2] != Ch('>'))
-            {
-                if (!text[0])
-                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                ++text;
-            }
-
-            // Create comment node
-            xml_node<Ch> *comment = this->allocate_node(node_comment);
-            comment->value(value_, text - value_);
-
-            // Place zero terminator after comment value
-            if (!(Flags & parse_no_string_terminators))
-                *text = Ch('\0');
-
-            text += 3;     // Skip '-->'
-            return comment;
-        }
-
-        // Parse DOCTYPE
-        template<int Flags>
-        xml_node<Ch> *parse_doctype(Ch *&text)
-        {
-            // Remember value start
-            Ch *value_ = text;
-
-            // Skip to >
-            while (*text != Ch('>'))
-            {
-                // Determine character type
-                switch (*text)
-                {
-
-                // If '[' encountered, scan for matching ending ']' using naive algorithm with depth
-                // This works for all W3C test files except for 2 most wicked
-                case Ch('['):
-                {
-                    ++text;     // Skip '['
-                    int depth = 1;
-                    while (depth > 0)
-                    {
-                        switch (*text)
-                        {
-                            case Ch('['): ++depth; break;
-                            case Ch(']'): --depth; break;
-                            case 0: CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                        }
-                        ++text;
-                    }
-                    break;
-                }
-
-                // Error on end of text
-                case Ch('\0'):
-                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-
-                // Other character, skip it
-                default:
-                    ++text;
-
-                }
-            }
-
-            // If DOCTYPE nodes enabled
-            if (Flags & parse_doctype_node)
-            {
-                // Create a new doctype node
-                xml_node<Ch> *doctype = this->allocate_node(node_doctype);
-                doctype->value(value_, text - value_);
-
-                // Place zero terminator after value
-                if (!(Flags & parse_no_string_terminators))
-                    *text = Ch('\0');
-
-                text += 1;      // skip '>'
-                return doctype;
-            }
-            else
-            {
-                text += 1;      // skip '>'
-                return 0;
-            }
-
-        }
-
-        // Parse PI
-        template<int Flags>
-        xml_node<Ch> *parse_pi(Ch *&text)
-        {
-            // If creation of PI nodes is enabled
-            if (Flags & parse_pi_nodes)
-            {
-                // Create pi node
-                xml_node<Ch> *pi = this->allocate_node(node_pi);
-
-                // Extract PI target name
-                Ch *name_ = text;
-                skip<node_name_pred, Flags>(text);
-                if (text == name_)
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected PI target", text);
-                pi->name(name_, text - name_);
-
-                // Skip whitespace between pi target and pi
-                skip<whitespace_pred, Flags>(text);
-
-                // Remember start of pi
-                Ch *value_ = text;
-
-                // Skip to '?>'
-                while (text[0] != Ch('?') || text[1] != Ch('>'))
-                {
-                    if (*text == Ch('\0'))
-                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                    ++text;
-                }
-
-                // Set pi value (verbatim, no entity expansion or whitespace normalization)
-                pi->value(value_, text - value_);
-
-                // Place zero terminator after name and value
-                if (!(Flags & parse_no_string_terminators))
-                {
-                    pi->name()[pi->name_size()] = Ch('\0');
-                    pi->value()[pi->value_size()] = Ch('\0');
-                }
-
-                text += 2;                          // Skip '?>'
-                return pi;
-            }
-            else
-            {
-                // Skip to '?>'
-                while (text[0] != Ch('?') || text[1] != Ch('>'))
-                {
-                    if (*text == Ch('\0'))
-                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                    ++text;
-                }
-                text += 2;    // Skip '?>'
-                return 0;
-            }
-        }
-
-        // Parse and append data
-        // Return character that ends data.
-        // This is necessary because this character might have been overwritten by a terminating 0
-        template<int Flags>
-        Ch parse_and_append_data(xml_node<Ch> *node, Ch *&text, Ch *contents_start)
-        {
-            // Backup to contents start if whitespace trimming is disabled
-            if (!(Flags & parse_trim_whitespace))
-                text = contents_start;
-
-            const bool preserve_space =  internal::preserve_space(node);
-
-            // Skip until end of data
-            Ch *value_ = text, *end;
-            if ((Flags & parse_normalize_whitespace) && !preserve_space)
-                end = skip_and_expand_character_refs<text_pred, text_pure_with_ws_pred, Flags>(text, false);
-            else
-                end = skip_and_expand_character_refs<text_pred, text_pure_no_ws_pred, Flags>(text, preserve_space);
-
-            // Trim trailing whitespace if flag is set; leading was already trimmed by whitespace skip after >
-            if ((Flags & parse_trim_whitespace) && !preserve_space)
-            {
-                if (Flags & parse_normalize_whitespace)
-                {
-                    // Whitespace is already condensed to single space characters by skipping function, so just trim 1 char off the end
-                    if (*(end - 1) == Ch(' '))
-                        --end;
-                }
-                else
-                {
-                    // Backup until non-whitespace character is found
-                    while (whitespace_pred::test(*(end - 1)))
-                        --end;
-                }
-            }
-
-            // If characters are still left between end and value (this test is only necessary if normalization is enabled)
-            // Create new data node
-            if (!(Flags & parse_no_data_nodes))
-            {
-                xml_node<Ch> *data = this->allocate_node(node_data);
-                data->value(value_, end - value_);
-                node->append_node(data);
-            }
-
-            // Add data to parent node if no data exists yet
-            if (!(Flags & parse_no_element_values))
-                if (*node->value() == Ch('\0'))
-                    node->value(value_, end - value_);
-
-            // Place zero terminator after value
-            if (!(Flags & parse_no_string_terminators))
-            {
-                Ch ch = *text;
-                *end = Ch('\0');
-                return ch;      // Return character that ends data; this is required because zero terminator overwritten it
-            }
-
-            // Return character that ends data
-            return *text;
-        }
-
-        // Parse CDATA
-        template<int Flags>
-        xml_node<Ch> *parse_cdata(Ch *&text)
-        {
-            // If CDATA is disabled
-            if (Flags & parse_no_data_nodes)
-            {
-                // Skip until end of cdata
-                while (text[0] != Ch(']') || text[1] != Ch(']') || text[2] != Ch('>'))
-                {
-                    if (!text[0])
-                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                    ++text;
-                }
-                text += 3;      // Skip ]]>
-                return 0;       // Do not produce CDATA node
-            }
-
-            // Skip until end of cdata
-            Ch *value_ = text;
-            while (text[0] != Ch(']') || text[1] != Ch(']') || text[2] != Ch('>'))
-            {
-                if (!text[0])
-                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                ++text;
-            }
-
-            // Create new cdata node
-            xml_node<Ch> *cdata = this->allocate_node(node_cdata);
-            cdata->value(value_, text - value_);
-
-            // Place zero terminator after value
-            if (!(Flags & parse_no_string_terminators))
-                *text = Ch('\0');
-
-            text += 3;      // Skip ]]>
-            return cdata;
-        }
-
-        // Parse element node
-        template<int Flags>
-        xml_node<Ch> *parse_element(Ch *&text)
-        {
-            // Create element node
-            xml_node<Ch> *element = this->allocate_node(node_element);
-
-            // Extract element name
-            Ch *name_ = text;
-            skip<node_name_pred, Flags>(text);
-            if (text == name_)
-                CEREAL_RAPIDXML_PARSE_ERROR("expected element name", text);
-            element->name(name_, text - name_);
-
-            // Skip whitespace between element name and attributes or >
-            skip<whitespace_pred, Flags>(text);
-
-            // Parse attributes, if any
-            parse_node_attributes<Flags>(text, element);
-
-            // Determine ending type
-            if (*text == Ch('>'))
-            {
-                ++text;
-                parse_node_contents<Flags>(text, element);
-            }
-            else if (*text == Ch('/'))
-            {
-                ++text;
-                if (*text != Ch('>'))
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected >", text);
-                ++text;
-            }
-            else
-                CEREAL_RAPIDXML_PARSE_ERROR("expected >", text);
-
-            // Place zero terminator after name
-            if (!(Flags & parse_no_string_terminators))
-                element->name()[element->name_size()] = Ch('\0');
-
-            // Return parsed element
-            return element;
-        }
-
-        // Determine node type, and parse it
-        template<int Flags>
-        xml_node<Ch> *parse_node(Ch *&text)
-        {
-            // Parse proper node type
-            switch (text[0])
-            {
-
-            // <...
-            default:
-                // Parse and append element node
-                return parse_element<Flags>(text);
-
-            // <?...
-            case Ch('?'):
-                ++text;     // Skip ?
-                if ((text[0] == Ch('x') || text[0] == Ch('X')) &&
-                    (text[1] == Ch('m') || text[1] == Ch('M')) &&
-                    (text[2] == Ch('l') || text[2] == Ch('L')) &&
-                    whitespace_pred::test(text[3]))
-                {
-                    // '<?xml ' - xml declaration
-                    text += 4;      // Skip 'xml '
-                    return parse_xml_declaration<Flags>(text);
-                }
-                else
-                {
-                    // Parse PI
-                    return parse_pi<Flags>(text);
-                }
-
-            // <!...
-            case Ch('!'):
-
-                // Parse proper subset of <! node
-                switch (text[1])
-                {
-
-                // <!-
-                case Ch('-'):
-                    if (text[2] == Ch('-'))
-                    {
-                        // '<!--' - xml comment
-                        text += 3;     // Skip '!--'
-                        return parse_comment<Flags>(text);
-                    }
-                    break;
-
-                // <![
-                case Ch('['):
-                    if (text[2] == Ch('C') && text[3] == Ch('D') && text[4] == Ch('A') &&
-                        text[5] == Ch('T') && text[6] == Ch('A') && text[7] == Ch('['))
-                    {
-                        // '<![CDATA[' - cdata
-                        text += 8;     // Skip '![CDATA['
-                        return parse_cdata<Flags>(text);
-                    }
-                    break;
-
-                // <!D
-                case Ch('D'):
-                    if (text[2] == Ch('O') && text[3] == Ch('C') && text[4] == Ch('T') &&
-                        text[5] == Ch('Y') && text[6] == Ch('P') && text[7] == Ch('E') &&
-                        whitespace_pred::test(text[8]))
-                    {
-                        // '<!DOCTYPE ' - doctype
-                        text += 9;      // skip '!DOCTYPE '
-                        return parse_doctype<Flags>(text);
-                    }
-
-                }   // switch
-
-                // Attempt to skip other, unrecognized node types starting with <!
-                ++text;     // Skip !
-                while (*text != Ch('>'))
-                {
-                    if (*text == 0)
-                        CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-                    ++text;
-                }
-                ++text;     // Skip '>'
-                return 0;   // No node recognized
-
-            }
-        }
-
-        // Parse contents of the node - children, data etc.
-        template<int Flags>
-        void parse_node_contents(Ch *&text, xml_node<Ch> *node)
-        {
-            // For all children and text
-            while (1)
-            {
-                // Skip whitespace between > and node contents
-                Ch *contents_start = text;      // Store start of node contents before whitespace is skipped
-                skip<whitespace_pred, Flags>(text);
-                Ch next_char = *text;
-
-            // After data nodes, instead of continuing the loop, control jumps here.
-            // This is because zero termination inside parse_and_append_data() function
-            // would wreak havoc with the above code.
-            // Also, skipping whitespace after data nodes is unnecessary.
-            after_data_node:
-
-                // Determine what comes next: node closing, child node, data node, or 0?
-                switch (next_char)
-                {
-
-                // Node closing or child node
-                case Ch('<'):
-                    if (text[1] == Ch('/'))
-                    {
-                        Ch *contents_end = 0;
-                        if (internal::preserve_space(node))
-                        {
-                            contents_end = text;
-                        }
-
-                        // Node closing
-                        text += 2;      // Skip '</'
-                        if (Flags & parse_validate_closing_tags)
-                        {
-                            // Skip and validate closing tag name
-                            Ch *closing_name = text;
-                            skip<node_name_pred, Flags>(text);
-                            if (!internal::compare(node->name(), node->name_size(), closing_name, text - closing_name, true))
-                                CEREAL_RAPIDXML_PARSE_ERROR("invalid closing tag name", text);
-                        }
-                        else
-                        {
-                            // No validation, just skip name
-                            skip<node_name_pred, Flags>(text);
-                        }
-                        // Skip remaining whitespace after node name
-                        skip<whitespace_pred, Flags>(text);
-                        if (*text != Ch('>'))
-                            CEREAL_RAPIDXML_PARSE_ERROR("expected >", text);
-                        ++text;     // Skip '>'
-
-                        if (contents_end && contents_end != contents_start)
-                        {
-                            node->value(contents_start, contents_end - contents_start);
-                            node->value()[node->value_size()] = Ch('\0');
-                        }
-                        return;     // Node closed, finished parsing contents
-                    }
-                    else
-                    {
-                        // Child node
-                        ++text;     // Skip '<'
-                        if (xml_node<Ch> *child = parse_node<Flags>(text))
-                            node->append_node(child);
-                    }
-                    break;
-
-                // End of data - error
-                case Ch('\0'):
-                    CEREAL_RAPIDXML_PARSE_ERROR("unexpected end of data", text);
-
-                // Data node
-                default:
-                    next_char = parse_and_append_data<Flags>(node, text, contents_start);
-                    goto after_data_node;   // Bypass regular processing after data nodes
-
-                }
-            }
-        }
-
-        // Parse XML attributes of the node
-        template<int Flags>
-        void parse_node_attributes(Ch *&text, xml_node<Ch> *node)
-        {
-            // For all attributes
-            while (attribute_name_pred::test(*text))
-            {
-                // Extract attribute name
-                Ch *name_ = text;
-                ++text;     // Skip first character of attribute name
-                skip<attribute_name_pred, Flags>(text);
-                if (text == name_)
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected attribute name", name_);
-
-                // Create new attribute
-                xml_attribute<Ch> *attribute = this->allocate_attribute();
-                attribute->name(name_, text - name_);
-                node->append_attribute(attribute);
-
-                // Skip whitespace after attribute name
-                skip<whitespace_pred, Flags>(text);
-
-                // Skip =
-                if (*text != Ch('='))
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected =", text);
-                ++text;
-
-                // Add terminating zero after name
-                if (!(Flags & parse_no_string_terminators))
-                    attribute->name()[attribute->name_size()] = 0;
-
-                // Skip whitespace after =
-                skip<whitespace_pred, Flags>(text);
-
-                // Skip quote and remember if it was ' or "
-                Ch quote = *text;
-                if (quote != Ch('\'') && quote != Ch('"'))
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected ' or \"", text);
-                ++text;
-
-                // Extract attribute value and expand char refs in it
-                Ch *value_ = text, *end;
-                const int AttFlags = Flags & ~parse_normalize_whitespace;   // No whitespace normalization in attributes
-                if (quote == Ch('\''))
-                    end = skip_and_expand_character_refs<attribute_value_pred<Ch('\'')>, attribute_value_pure_pred<Ch('\'')>, AttFlags>(text, false);
-                else
-                    end = skip_and_expand_character_refs<attribute_value_pred<Ch('"')>, attribute_value_pure_pred<Ch('"')>, AttFlags>(text, false);
-
-                // Set attribute value
-                attribute->value(value_, end - value_);
-
-                // Make sure that end quote is present
-                if (*text != quote)
-                    CEREAL_RAPIDXML_PARSE_ERROR("expected ' or \"", text);
-                ++text;     // Skip quote
-
-                // Add terminating zero after value
-                if (!(Flags & parse_no_string_terminators))
-                    attribute->value()[attribute->value_size()] = 0;
-
-                // Skip whitespace after attribute value
-                skip<whitespace_pred, Flags>(text);
-            }
-        }
-
-    };
-
-    //! \cond internal
-    namespace internal
-    {
-
-        // Whitespace (space \n \r \t)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_whitespace[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  0,  0,  1,  0,  0,  // 0
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 1
-             1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 2
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 3
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 4
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 5
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 6
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 7
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 8
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 9
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // A
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // B
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // C
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // D
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // E
-             0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0   // F
-        };
-
-        // Node name (anything but space \n \r \t / > ? \0)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_node_name[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  0,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Text (i.e. PCDATA) (anything but < \0)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_text[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Text (i.e. PCDATA) that does not require processing when ws normalization is disabled
-        // (anything but < \0 &)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_text_pure_no_ws[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Text (i.e. PCDATA) that does not require processing when ws normalizationis is enabled
-        // (anything but < \0 & space \n \r \t)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_text_pure_with_ws[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  0,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             0,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Attribute name (anything but space \n \r \t / < > = ? ! \0)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_attribute_name[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  0,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  0,  0,  0,  0,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Attribute data with single quote (anything but ' \0)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_1[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             1,  1,  1,  1,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Attribute data with single quote that does not require processing (anything but ' \0 &)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_1_pure[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             1,  1,  1,  1,  1,  1,  0,  0,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Attribute data with double quote (anything but " \0)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_2[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Attribute data with double quote that does not require processing (anything but " \0 &)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_attribute_data_2_pure[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-             0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 0
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 1
-             1,  1,  0,  1,  1,  1,  0,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 2
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 3
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 4
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 5
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 6
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 7
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 8
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // 9
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // A
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // B
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // C
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // D
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  // E
-             1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1   // F
-        };
-
-        // Digits (dec and hex, 255 denotes end of numeric character reference)
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_digits[256] =
-        {
-          // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 0
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 1
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 2
-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9,255,255,255,255,255,255,  // 3
-           255, 10, 11, 12, 13, 14, 15,255,255,255,255,255,255,255,255,255,  // 4
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 5
-           255, 10, 11, 12, 13, 14, 15,255,255,255,255,255,255,255,255,255,  // 6
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 7
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 8
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // 9
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // A
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // B
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // C
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // D
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  // E
-           255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255   // F
-        };
-
-        // Upper case conversion
-        template<int Dummy>
-        const unsigned char lookup_tables<Dummy>::lookup_upcase[256] =
-        {
-          // 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  A   B   C   D   E   F
-           0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,   // 0
-           16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,   // 1
-           32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,   // 2
-           48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,   // 3
-           64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,   // 4
-           80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,   // 5
-           96, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,   // 6
-           80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 123,124,125,126,127,  // 7
-           128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,  // 8
-           144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,  // 9
-           160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,  // A
-           176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,  // B
-           192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,  // C
-           208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,  // D
-           224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,  // E
-           240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255   // F
-        };
-    }
-    //! \endcond
-
-}
-} // end namespace cereal
-
-// Undefine internal macros
-#undef CEREAL_RAPIDXML_PARSE_ERROR
-
-// On MSVC, restore warnings state
-#ifdef _MSC_VER
-    #pragma warning(pop)
-#endif
-
-#endif
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
deleted file mode 100644
index 736d46c..0000000
--- a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_iterators.hpp
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef CEREAL_RAPIDXML_ITERATORS_HPP_INCLUDED
-#define CEREAL_RAPIDXML_ITERATORS_HPP_INCLUDED
-
-// Copyright (C) 2006, 2009 Marcin Kalicinski
-// Version 1.13
-// Revision $DateTime: 2009/05/13 01:46:17 $
-
-#include "rapidxml.hpp"
-
-namespace cereal {
-namespace rapidxml
-{
-
-    //! Iterator of child nodes of xml_node
-    template<class Ch>
-    class node_iterator
-    {
-
-    public:
-
-        typedef typename xml_node<Ch> value_type;
-        typedef typename xml_node<Ch> &reference;
-        typedef typename xml_node<Ch> *pointer;
-        typedef std::ptrdiff_t difference_type;
-        typedef std::bidirectional_iterator_tag iterator_category;
-
-        node_iterator()
-            : m_node(0)
-        {
-        }
-
-        node_iterator(xml_node<Ch> *node)
-            : m_node(node->first_node())
-        {
-        }
-
-        reference operator *() const
-        {
-            assert(m_node);
-            return *m_node;
-        }
-
-        pointer operator->() const
-        {
-            assert(m_node);
-            return m_node;
-        }
-
-        node_iterator& operator++()
-        {
-            assert(m_node);
-            m_node = m_node->next_sibling();
-            return *this;
-        }
-
-        node_iterator operator++(int)
-        {
-            node_iterator tmp = *this;
-            ++this;
-            return tmp;
-        }
-
-        node_iterator& operator--()
-        {
-            assert(m_node && m_node->previous_sibling());
-            m_node = m_node->previous_sibling();
-            return *this;
-        }
-
-        node_iterator operator--(int)
-        {
-            node_iterator tmp = *this;
-            ++this;
-            return tmp;
-        }
-
-        bool operator ==(const node_iterator<Ch> &rhs)
-        {
-            return m_node == rhs.m_node;
-        }
-
-        bool operator !=(const node_iterator<Ch> &rhs)
-        {
-            return m_node != rhs.m_node;
-        }
-
-    private:
-
-        xml_node<Ch> *m_node;
-
-    };
-
-    //! Iterator of child attributes of xml_node
-    template<class Ch>
-    class attribute_iterator
-    {
-
-    public:
-
-        typedef typename xml_attribute<Ch> value_type;
-        typedef typename xml_attribute<Ch> &reference;
-        typedef typename xml_attribute<Ch> *pointer;
-        typedef std::ptrdiff_t difference_type;
-        typedef std::bidirectional_iterator_tag iterator_category;
-
-        attribute_iterator()
-            : m_attribute(0)
-        {
-        }
-
-        attribute_iterator(xml_node<Ch> *node)
-            : m_attribute(node->first_attribute())
-        {
-        }
-
-        reference operator *() const
-        {
-            assert(m_attribute);
-            return *m_attribute;
-        }
-
-        pointer operator->() const
-        {
-            assert(m_attribute);
-            return m_attribute;
-        }
-
-        attribute_iterator& operator++()
-        {
-            assert(m_attribute);
-            m_attribute = m_attribute->next_attribute();
-            return *this;
-        }
-
-        attribute_iterator operator++(int)
-        {
-            attribute_iterator tmp = *this;
-            ++this;
-            return tmp;
-        }
-
-        attribute_iterator& operator--()
-        {
-            assert(m_attribute && m_attribute->previous_attribute());
-            m_attribute = m_attribute->previous_attribute();
-            return *this;
-        }
-
-        attribute_iterator operator--(int)
-        {
-            attribute_iterator tmp = *this;
-            ++this;
-            return tmp;
-        }
-
-        bool operator ==(const attribute_iterator<Ch> &rhs)
-        {
-            return m_attribute == rhs.m_attribute;
-        }
-
-        bool operator !=(const attribute_iterator<Ch> &rhs)
-        {
-            return m_attribute != rhs.m_attribute;
-        }
-
-    private:
-
-        xml_attribute<Ch> *m_attribute;
-
-    };
-
-}
-} // namespace cereal
-
-#endif
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
deleted file mode 100644
index ce10dbb..0000000
--- a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_print.hpp
+++ /dev/null
@@ -1,426 +0,0 @@
-#ifndef CEREAL_RAPIDXML_PRINT_HPP_INCLUDED
-#define CEREAL_RAPIDXML_PRINT_HPP_INCLUDED
-
-// Copyright (C) 2006, 2009 Marcin Kalicinski
-// Version 1.13
-// Revision $DateTime: 2009/05/13 01:46:17 $
-
-#include "rapidxml.hpp"
-
-// Only include streams if not disabled
-#ifndef CEREAL_RAPIDXML_NO_STREAMS
-    #include <ostream>
-    #include <iterator>
-#endif
-
-namespace cereal {
-namespace rapidxml
-{
-
-    ///////////////////////////////////////////////////////////////////////
-    // Printing flags
-
-    const int print_no_indenting = 0x1;   //!< Printer flag instructing the printer to suppress indenting of XML. See print() function.
-
-    ///////////////////////////////////////////////////////////////////////
-    // Internal
-
-    //! \cond internal
-    namespace internal
-    {
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Internal character operations
-
-        // Copy characters from given range to given output iterator
-        template<class OutIt, class Ch>
-        inline OutIt copy_chars(const Ch *begin, const Ch *end, OutIt out)
-        {
-            while (begin != end)
-                *out++ = *begin++;
-            return out;
-        }
-
-        // Copy characters from given range to given output iterator and expand
-        // characters into references (&lt; &gt; &apos; &quot; &amp;)
-        template<class OutIt, class Ch>
-        inline OutIt copy_and_expand_chars(const Ch *begin, const Ch *end, Ch noexpand, OutIt out)
-        {
-            while (begin != end)
-            {
-                if (*begin == noexpand)
-                {
-                    *out++ = *begin;    // No expansion, copy character
-                }
-                else
-                {
-                    switch (*begin)
-                    {
-                    case Ch('<'):
-                        *out++ = Ch('&'); *out++ = Ch('l'); *out++ = Ch('t'); *out++ = Ch(';');
-                        break;
-                    case Ch('>'):
-                        *out++ = Ch('&'); *out++ = Ch('g'); *out++ = Ch('t'); *out++ = Ch(';');
-                        break;
-                    case Ch('\''):
-                        *out++ = Ch('&'); *out++ = Ch('a'); *out++ = Ch('p'); *out++ = Ch('o'); *out++ = Ch('s'); *out++ = Ch(';');
-                        break;
-                    case Ch('"'):
-                        *out++ = Ch('&'); *out++ = Ch('q'); *out++ = Ch('u'); *out++ = Ch('o'); *out++ = Ch('t'); *out++ = Ch(';');
-                        break;
-                    case Ch('&'):
-                        *out++ = Ch('&'); *out++ = Ch('a'); *out++ = Ch('m'); *out++ = Ch('p'); *out++ = Ch(';');
-                        break;
-                    default:
-                        *out++ = *begin;    // No expansion, copy character
-                    }
-                }
-                ++begin;    // Step to next character
-            }
-            return out;
-        }
-
-        // Fill given output iterator with repetitions of the same character
-        template<class OutIt, class Ch>
-        inline OutIt fill_chars(OutIt out, int n, Ch ch)
-        {
-            for (int i = 0; i < n; ++i)
-                *out++ = ch;
-            return out;
-        }
-
-        // Find character
-        template<class Ch, Ch ch>
-        inline bool find_char(const Ch *begin, const Ch *end)
-        {
-            while (begin != end)
-                if (*begin++ == ch)
-                    return true;
-            return false;
-        }
-
-        ///////////////////////////////////////////////////////////////////////////
-        // Internal printing operations
-
-        // Print node
-        template<class OutIt, class Ch>
-        inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent);
-
-        // Print children of the node
-        template<class OutIt, class Ch>
-        inline OutIt print_children(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            for (xml_node<Ch> *child = node->first_node(); child; child = child->next_sibling())
-                out = print_node(out, child, flags, indent);
-            return out;
-        }
-
-        // Print attributes of the node
-        template<class OutIt, class Ch>
-        inline OutIt print_attributes(OutIt out, const xml_node<Ch> *node, int /*flags*/)
-        {
-            for (xml_attribute<Ch> *attribute = node->first_attribute(); attribute; attribute = attribute->next_attribute())
-            {
-                if (attribute->name() && attribute->value())
-                {
-                    // Print attribute name
-                    *out = Ch(' '), ++out;
-                    out = copy_chars(attribute->name(), attribute->name() + attribute->name_size(), out);
-                    *out = Ch('='), ++out;
-                    // Print attribute value using appropriate quote type
-                    if (find_char<Ch, Ch('"')>(attribute->value(), attribute->value() + attribute->value_size()))
-                    {
-                        *out = Ch('\''), ++out;
-                        out = copy_and_expand_chars(attribute->value(), attribute->value() + attribute->value_size(), Ch('"'), out);
-                        *out = Ch('\''), ++out;
-                    }
-                    else
-                    {
-                        *out = Ch('"'), ++out;
-                        out = copy_and_expand_chars(attribute->value(), attribute->value() + attribute->value_size(), Ch('\''), out);
-                        *out = Ch('"'), ++out;
-                    }
-                }
-            }
-            return out;
-        }
-
-        // Print data node
-        template<class OutIt, class Ch>
-        inline OutIt print_data_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            assert(node->type() == node_data);
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            out = copy_and_expand_chars(node->value(), node->value() + node->value_size(), Ch(0), out);
-            return out;
-        }
-
-        // Print data node
-        template<class OutIt, class Ch>
-        inline OutIt print_cdata_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            assert(node->type() == node_cdata);
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            *out = Ch('<'); ++out;
-            *out = Ch('!'); ++out;
-            *out = Ch('['); ++out;
-            *out = Ch('C'); ++out;
-            *out = Ch('D'); ++out;
-            *out = Ch('A'); ++out;
-            *out = Ch('T'); ++out;
-            *out = Ch('A'); ++out;
-            *out = Ch('['); ++out;
-            out = copy_chars(node->value(), node->value() + node->value_size(), out);
-            *out = Ch(']'); ++out;
-            *out = Ch(']'); ++out;
-            *out = Ch('>'); ++out;
-            return out;
-        }
-
-        // Print element node
-        template<class OutIt, class Ch>
-        inline OutIt print_element_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            assert(node->type() == node_element);
-
-            // Print element name and attributes, if any
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            *out = Ch('<'), ++out;
-            out = copy_chars(node->name(), node->name() + node->name_size(), out);
-            out = print_attributes(out, node, flags);
-
-            // If node is childless
-            if (node->value_size() == 0 && !node->first_node())
-            {
-                // Print childless node tag ending
-                *out = Ch('/'), ++out;
-                *out = Ch('>'), ++out;
-            }
-            else
-            {
-                // Print normal node tag ending
-                *out = Ch('>'), ++out;
-
-                // Test if node contains a single data node only (and no other nodes)
-                xml_node<Ch> *child = node->first_node();
-                if (!child)
-                {
-                    // If node has no children, only print its value without indenting
-                    out = copy_and_expand_chars(node->value(), node->value() + node->value_size(), Ch(0), out);
-                }
-                else if (child->next_sibling() == 0 && child->type() == node_data)
-                {
-                    // If node has a sole data child, only print its value without indenting
-                    out = copy_and_expand_chars(child->value(), child->value() + child->value_size(), Ch(0), out);
-                }
-                else
-                {
-                    // Print all children with full indenting
-                    if (!(flags & print_no_indenting))
-                        *out = Ch('\n'), ++out;
-                    out = print_children(out, node, flags, indent + 1);
-                    if (!(flags & print_no_indenting))
-                        out = fill_chars(out, indent, Ch('\t'));
-                }
-
-                // Print node end
-                *out = Ch('<'), ++out;
-                *out = Ch('/'), ++out;
-                out = copy_chars(node->name(), node->name() + node->name_size(), out);
-                *out = Ch('>'), ++out;
-            }
-            return out;
-        }
-
-        // Print declaration node
-        template<class OutIt, class Ch>
-        inline OutIt print_declaration_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            // Print declaration start
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            *out = Ch('<'), ++out;
-            *out = Ch('?'), ++out;
-            *out = Ch('x'), ++out;
-            *out = Ch('m'), ++out;
-            *out = Ch('l'), ++out;
-
-            // Print attributes
-            out = print_attributes(out, node, flags);
-
-            // Print declaration end
-            *out = Ch('?'), ++out;
-            *out = Ch('>'), ++out;
-
-            return out;
-        }
-
-        // Print comment node
-        template<class OutIt, class Ch>
-        inline OutIt print_comment_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            assert(node->type() == node_comment);
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            *out = Ch('<'), ++out;
-            *out = Ch('!'), ++out;
-            *out = Ch('-'), ++out;
-            *out = Ch('-'), ++out;
-            out = copy_chars(node->value(), node->value() + node->value_size(), out);
-            *out = Ch('-'), ++out;
-            *out = Ch('-'), ++out;
-            *out = Ch('>'), ++out;
-            return out;
-        }
-
-        // Print doctype node
-        template<class OutIt, class Ch>
-        inline OutIt print_doctype_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            assert(node->type() == node_doctype);
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            *out = Ch('<'), ++out;
-            *out = Ch('!'), ++out;
-            *out = Ch('D'), ++out;
-            *out = Ch('O'), ++out;
-            *out = Ch('C'), ++out;
-            *out = Ch('T'), ++out;
-            *out = Ch('Y'), ++out;
-            *out = Ch('P'), ++out;
-            *out = Ch('E'), ++out;
-            *out = Ch(' '), ++out;
-            out = copy_chars(node->value(), node->value() + node->value_size(), out);
-            *out = Ch('>'), ++out;
-            return out;
-        }
-
-        // Print pi node
-        template<class OutIt, class Ch>
-        inline OutIt print_pi_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            assert(node->type() == node_pi);
-            if (!(flags & print_no_indenting))
-                out = fill_chars(out, indent, Ch('\t'));
-            *out = Ch('<'), ++out;
-            *out = Ch('?'), ++out;
-            out = copy_chars(node->name(), node->name() + node->name_size(), out);
-            *out = Ch(' '), ++out;
-            out = copy_chars(node->value(), node->value() + node->value_size(), out);
-            *out = Ch('?'), ++out;
-            *out = Ch('>'), ++out;
-            return out;
-        }
-
-        // Print node
-        template<class OutIt, class Ch>
-        inline OutIt print_node(OutIt out, const xml_node<Ch> *node, int flags, int indent)
-        {
-            // Print proper node type
-            switch (node->type())
-            {
-
-            // Document
-            case node_document:
-                out = print_children(out, node, flags, indent);
-                break;
-
-            // Element
-            case node_element:
-                out = print_element_node(out, node, flags, indent);
-                break;
-
-            // Data
-            case node_data:
-                out = print_data_node(out, node, flags, indent);
-                break;
-
-            // CDATA
-            case node_cdata:
-                out = print_cdata_node(out, node, flags, indent);
-                break;
-
-            // Declaration
-            case node_declaration:
-                out = print_declaration_node(out, node, flags, indent);
-                break;
-
-            // Comment
-            case node_comment:
-                out = print_comment_node(out, node, flags, indent);
-                break;
-
-            // Doctype
-            case node_doctype:
-                out = print_doctype_node(out, node, flags, indent);
-                break;
-
-            // Pi
-            case node_pi:
-                out = print_pi_node(out, node, flags, indent);
-                break;
-
-                // Unknown
-            default:
-                assert(0);
-                break;
-            }
-
-            // If indenting not disabled, add line break after node
-            if (!(flags & print_no_indenting))
-                *out = Ch('\n'), ++out;
-
-            // Return modified iterator
-            return out;
-        }
-
-    }
-    //! \endcond
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Printing
-
-    //! Prints XML to given output iterator.
-    //! \param out Output iterator to print to.
-    //! \param node Node to be printed. Pass xml_document to print entire document.
-    //! \param flags Flags controlling how XML is printed.
-    //! \return Output iterator pointing to position immediately after last character of printed text.
-    template<class OutIt, class Ch>
-    inline OutIt print(OutIt out, const xml_node<Ch> &node, int flags = 0)
-    {
-        return internal::print_node(out, &node, flags, 0);
-    }
-
-#ifndef CEREAL_RAPIDXML_NO_STREAMS
-
-    //! Prints XML to given output stream.
-    //! \param out Output stream to print to.
-    //! \param node Node to be printed. Pass xml_document to print entire document.
-    //! \param flags Flags controlling how XML is printed.
-    //! \return Output stream.
-    template<class Ch>
-    inline std::basic_ostream<Ch> &print(std::basic_ostream<Ch> &out, const xml_node<Ch> &node, int flags = 0)
-    {
-        print(std::ostream_iterator<Ch>(out), node, flags);
-        return out;
-    }
-
-    //! Prints formatted XML to given output stream. Uses default printing flags. Use print() function to customize printing process.
-    //! \param out Output stream to print to.
-    //! \param node Node to be printed.
-    //! \return Output stream.
-    template<class Ch>
-    inline std::basic_ostream<Ch> &operator <<(std::basic_ostream<Ch> &out, const xml_node<Ch> &node)
-    {
-        return print(out, node);
-    }
-
-#endif
-
-}
-} // namespace cereal
-
-#endif
diff --git a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp b/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
deleted file mode 100644
index e11ecf3..0000000
--- a/Src/External/cereal/include/cereal/external/rapidxml/rapidxml_utils.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#ifndef CEREAL_RAPIDXML_UTILS_HPP_INCLUDED
-#define CEREAL_RAPIDXML_UTILS_HPP_INCLUDED
-
-// Copyright (C) 2006, 2009 Marcin Kalicinski
-// Version 1.13
-// Revision $DateTime: 2009/05/13 01:46:17 $
-//! in certain simple scenarios. They should probably not be used if maximizing performance is the main objective.
-
-#include "rapidxml.hpp"
-#include <vector>
-#include <string>
-#include <fstream>
-#include <stdexcept>
-
-namespace cereal {
-namespace rapidxml
-{
-
-    //! Represents data loaded from a file
-    template<class Ch = char>
-    class file
-    {
-
-    public:
-
-        //! Loads file into the memory. Data will be automatically destroyed by the destructor.
-        //! \param filename Filename to load.
-        file(const char *filename)
-        {
-            using namespace std;
-
-            // Open stream
-            basic_ifstream<Ch> stream(filename, ios::binary);
-            if (!stream)
-                throw runtime_error(string("cannot open file ") + filename);
-            stream.unsetf(ios::skipws);
-
-            // Determine stream size
-            stream.seekg(0, ios::end);
-            size_t size = stream.tellg();
-            stream.seekg(0);
-
-            // Load data and add terminating 0
-            m_data.resize(size + 1);
-            stream.read(&m_data.front(), static_cast<streamsize>(size));
-            m_data[size] = 0;
-        }
-
-        //! Loads file into the memory. Data will be automatically destroyed by the destructor
-        //! \param stream Stream to load from
-        file(std::basic_istream<Ch> &stream)
-        {
-            using namespace std;
-
-            // Load data and add terminating 0
-            stream.unsetf(ios::skipws);
-            m_data.assign(istreambuf_iterator<Ch>(stream), istreambuf_iterator<Ch>());
-            if (stream.fail() || stream.bad())
-                throw runtime_error("error reading stream");
-            m_data.push_back(0);
-        }
-
-        //! Gets file data.
-        //! \return Pointer to data of file.
-        Ch *data()
-        {
-            return &m_data.front();
-        }
-
-        //! Gets file data.
-        //! \return Pointer to data of file.
-        const Ch *data() const
-        {
-            return &m_data.front();
-        }
-
-        //! Gets file data size.
-        //! \return Size of file data, in characters.
-        std::size_t size() const
-        {
-            return m_data.size();
-        }
-
-    private:
-
-        std::vector<Ch> m_data;   // File data
-
-    };
-
-    //! Counts children of node. Time complexity is O(n).
-    //! \return Number of children of node
-    template<class Ch>
-    inline std::size_t count_children(xml_node<Ch> *node)
-    {
-        xml_node<Ch> *child = node->first_node();
-        std::size_t count = 0;
-        while (child)
-        {
-            ++count;
-            child = child->next_sibling();
-        }
-        return count;
-    }
-
-    //! Counts attributes of node. Time complexity is O(n).
-    //! \return Number of attributes of node
-    template<class Ch>
-    inline std::size_t count_attributes(xml_node<Ch> *node)
-    {
-        xml_attribute<Ch> *attr = node->first_attribute();
-        std::size_t count = 0;
-        while (attr)
-        {
-            ++count;
-            attr = attr->next_attribute();
-        }
-        return count;
-    }
-
-}
-} // namespace cereal
-
-#endif
diff --git a/Src/External/cereal/include/cereal/macros.hpp b/Src/External/cereal/include/cereal/macros.hpp
deleted file mode 100644
index cfdc14c..0000000
--- a/Src/External/cereal/include/cereal/macros.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*! \file macros.hpp
-    \brief Preprocessor macros that can customise the cereal library
-
-    By default, cereal looks for serialization functions with very
-    specific names, that is: serialize, load, save, load_minimal,
-    or save_minimal.
-
-    This file allows an advanced user to change these names to conform
-    to some other style or preference.  This is implemented using
-    preprocessor macros.
-
-    As a result of this, in internal cereal code you will see macros
-    used for these function names.  In user code, you should name
-    the functions like you normally would and not use the macros
-    to improve readability.
-    \ingroup utility */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef CEREAL_MACROS_HPP_
-#define CEREAL_MACROS_HPP_
-
-#ifndef CEREAL_THREAD_SAFE
-//! Whether cereal should be compiled for a threaded environment
-/*! This macro causes cereal to use mutexes to control access to
-    global internal state in a thread safe manner.
-
-    Note that even with this enabled you must still ensure that
-    archives are accessed by only one thread at a time; it is safe
-    to use multiple archives in paralel, but not to access one archive
-    from many places simultaneously. */
-#define CEREAL_THREAD_SAFE 0
-#endif // CEREAL_THREAD_SAFE
-
-#ifndef CEREAL_SIZE_TYPE
-//! Determines the data type used for size_type
-/*! cereal uses size_type to ensure that the serialized size of
-    dynamic containers is compatible across different architectures
-    (e.g. 32 vs 64 bit), which may use different underlying types for
-    std::size_t.
-
-    More information can be found in cereal/details/helpers.hpp.
-
-    If you choose to modify this type, ensure that you use a fixed
-    size type (e.g. uint32_t). */
-#define CEREAL_SIZE_TYPE uint64_t
-#endif // CEREAL_SIZE_TYPE
-
-// ######################################################################
-#ifndef CEREAL_SERIALIZE_FUNCTION_NAME
-//! The serialization/deserialization function name to search for.
-/*! You can define @c CEREAL_SERIALIZE_FUNCTION_NAME to be different assuming
-    you do so before this file is included. */
-#define CEREAL_SERIALIZE_FUNCTION_NAME serialize
-#endif // CEREAL_SERIALIZE_FUNCTION_NAME
-
-#ifndef CEREAL_LOAD_FUNCTION_NAME
-//! The deserialization (load) function name to search for.
-/*! You can define @c CEREAL_LOAD_FUNCTION_NAME to be different assuming you do so
-    before this file is included. */
-#define CEREAL_LOAD_FUNCTION_NAME load
-#endif // CEREAL_LOAD_FUNCTION_NAME
-
-#ifndef CEREAL_SAVE_FUNCTION_NAME
-//! The serialization (save) function name to search for.
-/*! You can define @c CEREAL_SAVE_FUNCTION_NAME to be different assuming you do so
-    before this file is included. */
-#define CEREAL_SAVE_FUNCTION_NAME save
-#endif // CEREAL_SAVE_FUNCTION_NAME
-
-#ifndef CEREAL_LOAD_MINIMAL_FUNCTION_NAME
-//! The deserialization (load_minimal) function name to search for.
-/*! You can define @c CEREAL_LOAD_MINIMAL_FUNCTION_NAME to be different assuming you do so
-    before this file is included. */
-#define CEREAL_LOAD_MINIMAL_FUNCTION_NAME load_minimal
-#endif // CEREAL_LOAD_MINIMAL_FUNCTION_NAME
-
-#ifndef CEREAL_SAVE_MINIMAL_FUNCTION_NAME
-//! The serialization (save_minimal) function name to search for.
-/*! You can define @c CEREAL_SAVE_MINIMAL_FUNCTION_NAME to be different assuming you do so
-    before this file is included. */
-#define CEREAL_SAVE_MINIMAL_FUNCTION_NAME save_minimal
-#endif // CEREAL_SAVE_MINIMAL_FUNCTION_NAME
-
-// ######################################################################
-//! Defines the CEREAL_NOEXCEPT macro to use instead of noexcept
-/*! If a compiler we support does not support noexcept, this macro
-    will detect this and define CEREAL_NOEXCEPT as a no-op
-    @internal */
-#if !defined(CEREAL_HAS_NOEXCEPT)
-  #if defined(__clang__)
-    #if __has_feature(cxx_noexcept)
-      #define CEREAL_HAS_NOEXCEPT
-    #endif
-  #else // NOT clang
-    #if defined(__GXX_EXPERIMENTAL_CXX0X__) && __GNUC__ * 10 + __GNUC_MINOR__ >= 46 || \
-        defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026
-      #define CEREAL_HAS_NOEXCEPT
-    #endif // end GCC/MSVC check
-  #endif // end NOT clang block
-
-  #ifndef CEREAL_NOEXCEPT
-    #ifdef CEREAL_HAS_NOEXCEPT
-      #define CEREAL_NOEXCEPT noexcept
-    #else
-      #define CEREAL_NOEXCEPT
-    #endif // end CEREAL_HAS_NOEXCEPT
-  #endif // end !defined(CEREAL_HAS_NOEXCEPT)
-#endif // ifndef CEREAL_NOEXCEPT
-
-#endif // CEREAL_MACROS_HPP_
diff --git a/Src/External/cereal/include/cereal/types/array.hpp b/Src/External/cereal/include/cereal/types/array.hpp
deleted file mode 100644
index f5d510a..0000000
--- a/Src/External/cereal/include/cereal/types/array.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*! \file array.hpp
-    \brief Support for types found in \<array\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_ARRAY_HPP_
-#define CEREAL_TYPES_ARRAY_HPP_
-
-#include "cereal/cereal.hpp"
-#include <array>
-
-namespace cereal
-{
-  //! Saving for std::array primitive types
-  //! using binary serialization, if supported
-  template <class Archive, class T, size_t N> inline
-  typename std::enable_if<traits::is_output_serializable<BinaryData<T>, Archive>::value
-                          && std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::array<T, N> const & array )
-  {
-    ar( binary_data( array.data(), sizeof(array) ) );
-  }
-
-  //! Loading for std::array primitive types
-  //! using binary serialization, if supported
-  template <class Archive, class T, size_t N> inline
-  typename std::enable_if<traits::is_input_serializable<BinaryData<T>, Archive>::value
-                          && std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::array<T, N> & array )
-  {
-    ar( binary_data( array.data(), sizeof(array) ) );
-  }
-
-  //! Saving for std::array all other types
-  template <class Archive, class T, size_t N> inline
-  typename std::enable_if<!traits::is_output_serializable<BinaryData<T>, Archive>::value
-                          || !std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::array<T, N> const & array )
-  {
-    for( auto const & i : array )
-      ar( i );
-  }
-
-  //! Loading for std::array all other types
-  template <class Archive, class T, size_t N> inline
-  typename std::enable_if<!traits::is_input_serializable<BinaryData<T>, Archive>::value
-                          || !std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::array<T, N> & array )
-  {
-    for( auto & i : array )
-      ar( i );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_ARRAY_HPP_
diff --git a/Src/External/cereal/include/cereal/types/base_class.hpp b/Src/External/cereal/include/cereal/types/base_class.hpp
deleted file mode 100644
index 37b551e..0000000
--- a/Src/External/cereal/include/cereal/types/base_class.hpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*! \file base_class.hpp
-    \brief Support for base classes (virtual and non-virtual)
-    \ingroup OtherTypes */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_BASE_CLASS_HPP_
-#define CEREAL_TYPES_BASE_CLASS_HPP_
-
-#include "cereal/details/traits.hpp"
-#include "cereal/details/polymorphic_impl_fwd.hpp"
-
-namespace cereal
-{
-  namespace base_class_detail
-  {
-    //! Used to register polymorphic relations and avoid the need to include
-    //! polymorphic.hpp when no polymorphism is used
-    /*! @internal */
-    template <class Base, class Derived, bool IsPolymorphic = std::is_polymorphic<Base>::value>
-    struct RegisterPolymorphicBaseClass
-    {
-      static void bind()
-      { }
-    };
-
-    //! Polymorphic version
-    /*! @internal */
-    template <class Base, class Derived>
-    struct RegisterPolymorphicBaseClass<Base, Derived, true>
-    {
-      static void bind()
-      { detail::RegisterPolymorphicCaster<Base, Derived>::bind(); }
-    };
-  }
-
-  //! Casts a derived class to its non-virtual base class in a way that safely supports abstract classes
-  /*! This should be used in cases when a derived type needs to serialize its base type. This is better than directly
-      using static_cast, as it allows for serialization of pure virtual (abstract) base classes.
-
-      This also automatically registers polymorphic relation between the base and derived class, assuming they
-      are indeed polymorphic. Note this is not the same as polymorphic type registration. For more information
-      see the documentation on polymorphism.
-
-      \sa virtual_base_class
-
-      @code{.cpp}
-      struct MyBase
-      {
-        int x;
-
-        virtual void foo() = 0;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( x );
-        }
-      };
-
-      struct MyDerived : public MyBase //<-- Note non-virtual inheritance
-      {
-        int y;
-
-        virtual void foo() {};
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( cereal::base_class<MyBase>(this) );
-          ar( y );
-        }
-      };
-      @endcode */
-  template<class Base>
-    struct base_class : private traits::detail::BaseCastBase
-    {
-      template<class Derived>
-        base_class(Derived const * derived) :
-          base_ptr(const_cast<Base*>(static_cast<Base const *>(derived)))
-      {
-        static_assert( std::is_base_of<Base, Derived>::value, "Can only use base_class on a valid base class" );
-        base_class_detail::RegisterPolymorphicBaseClass<Base, Derived>::bind();
-      }
-
-        Base * base_ptr;
-    };
-
-  //! Casts a derived class to its virtual base class in a way that allows cereal to track inheritance
-  /*! This should be used in cases when a derived type features virtual inheritance from some
-      base type.  This allows cereal to track the inheritance and to avoid making duplicate copies
-      during serialization.
-
-      It is safe to use virtual_base_class in all circumstances for serializing base classes, even in cases
-      where virtual inheritance does not take place, though it may be slightly faster to utilize
-      cereal::base_class<> if you do not need to worry about virtual inheritance.
-
-      This also automatically registers polymorphic relation between the base and derived class, assuming they
-      are indeed polymorphic. Note this is not the same as polymorphic type registration. For more information
-      see the documentation on polymorphism.
-
-      \sa base_class
-
-      @code{.cpp}
-      struct MyBase
-      {
-        int x;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( x );
-        }
-      };
-
-      struct MyLeft : virtual MyBase //<-- Note the virtual inheritance
-      {
-        int y;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( cereal::virtual_base_class<MyBase>( this ) );
-          ar( y );
-        }
-      };
-
-      struct MyRight : virtual MyBase
-      {
-        int z;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( cereal::virtual_base_clas<MyBase>( this ) );
-          ar( z );
-        }
-      };
-
-      // diamond virtual inheritance; contains one copy of each base class
-      struct MyDerived : virtual MyLeft, virtual MyRight
-      {
-        int a;
-
-        template <class Archive>
-        void serialize( Archive & ar )
-        {
-          ar( cereal::virtual_base_class<MyLeft>( this ) );  // safely serialize data members in MyLeft
-          ar( cereal::virtual_base_class<MyRight>( this ) ); // safely serialize data members in MyRight
-          ar( a );
-
-          // Because we used virtual_base_class, cereal will ensure that only one instance of MyBase is
-          // serialized as we traverse the inheritance heirarchy. This means that there will be one copy
-          // each of the variables x, y, z, and a
-
-          // If we had chosen to use static_cast<> instead, cereal would perform no tracking and
-          // assume that every base class should be serialized (in this case leading to a duplicate
-          // serialization of MyBase due to diamond inheritance
-      };
-     }
-     @endcode */
-  template<class Base>
-    struct virtual_base_class : private traits::detail::BaseCastBase
-    {
-      template<class Derived>
-        virtual_base_class(Derived const * derived) :
-          base_ptr(const_cast<Base*>(static_cast<Base const *>(derived)))
-      {
-        static_assert( std::is_base_of<Base, Derived>::value, "Can only use virtual_base_class on a valid base class" );
-        base_class_detail::RegisterPolymorphicBaseClass<Base, Derived>::bind();
-      }
-
-        Base * base_ptr;
-    };
-
-} // namespace cereal
-
-#endif // CEREAL_TYPES_BASE_CLASS_HPP_
diff --git a/Src/External/cereal/include/cereal/types/bitset.hpp b/Src/External/cereal/include/cereal/types/bitset.hpp
deleted file mode 100644
index 12d3a82..0000000
--- a/Src/External/cereal/include/cereal/types/bitset.hpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*! \file bitset.hpp
-    \brief Support for types found in \<bitset\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_BITSET_HPP_
-#define CEREAL_TYPES_BITSET_HPP_
-
-#include "cereal/cereal.hpp"
-#include "cereal/types/string.hpp"
-#include <bitset>
-
-namespace cereal
-{
-  namespace bitset_detail
-  {
-    //! The type the bitset is encoded with
-    /*! @internal */
-    enum class type : uint8_t
-    {
-      ulong,
-      ullong,
-      string,
-      bits
-    };
-  }
-
-  //! Serializing (save) for std::bitset when BinaryData optimization supported
-  template <class Archive, size_t N,
-            traits::EnableIf<traits::is_output_serializable<BinaryData<std::uint32_t>, Archive>::value>
-            = traits::sfinae> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::bitset<N> const & bits )
-  {
-    ar( CEREAL_NVP_("type", bitset_detail::type::bits) );
-
-    // Serialize 8 bit chunks
-    std::uint8_t chunk = 0;
-    std::uint8_t mask = 0x80;
-
-    // Set each chunk using a rotating mask for the current bit
-    for( std::size_t i = 0; i < N; ++i )
-    {
-      if( bits[i] )
-        chunk |= mask;
-
-      mask >>= 1;
-
-      // output current chunk when mask is empty (8 bits)
-      if( mask == 0 )
-      {
-        ar( chunk );
-        chunk = 0;
-        mask = 0x80;
-      }
-    }
-
-    // serialize remainder, if it exists
-    if( mask != 0x80 )
-      ar( chunk );
-  }
-
-  //! Serializing (save) for std::bitset when BinaryData is not supported
-  template <class Archive, size_t N,
-            traits::DisableIf<traits::is_output_serializable<BinaryData<std::uint32_t>, Archive>::value>
-            = traits::sfinae> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::bitset<N> const & bits )
-  {
-    try
-    {
-      auto const b = bits.to_ulong();
-      ar( CEREAL_NVP_("type", bitset_detail::type::ulong) );
-      ar( CEREAL_NVP_("data", b) );
-    }
-    catch( std::overflow_error const & )
-    {
-      try
-      {
-        auto const b = bits.to_ullong();
-        ar( CEREAL_NVP_("type", bitset_detail::type::ullong) );
-        ar( CEREAL_NVP_("data", b) );
-      }
-      catch( std::overflow_error const & )
-      {
-        ar( CEREAL_NVP_("type", bitset_detail::type::string) );
-        ar( CEREAL_NVP_("data", bits.to_string()) );
-      }
-    }
-  }
-
-  //! Serializing (load) for std::bitset
-  template <class Archive, size_t N> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::bitset<N> & bits )
-  {
-    bitset_detail::type t;
-    ar( CEREAL_NVP_("type", t) );
-
-    switch( t )
-    {
-      case bitset_detail::type::ulong:
-      {
-        unsigned long b;
-        ar( CEREAL_NVP_("data", b) );
-        bits = std::bitset<N>( b );
-        break;
-      }
-      case bitset_detail::type::ullong:
-      {
-        unsigned long long b;
-        ar( CEREAL_NVP_("data", b) );
-        bits = std::bitset<N>( b );
-        break;
-      }
-      case bitset_detail::type::string:
-      {
-        std::string b;
-        ar( CEREAL_NVP_("data", b) );
-        bits = std::bitset<N>( b );
-        break;
-      }
-      case bitset_detail::type::bits:
-      {
-        // Normally we would use BinaryData to route this at compile time,
-        // but doing this at runtime doesn't break any old serialization
-        std::uint8_t chunk = 0;
-        std::uint8_t mask  = 0;
-
-        bits.reset();
-
-        // Load one chunk at a time, rotating through the chunk
-        // to set bits in the bitset
-        for( std::size_t i = 0; i < N; ++i )
-        {
-          if( mask == 0 )
-          {
-            ar( chunk );
-            mask = 0x80;
-          }
-
-          if( chunk & mask )
-            bits[i] = 1;
-
-          mask >>= 1;
-        }
-        break;
-      }
-      default:
-        throw Exception("Invalid bitset data representation");
-    }
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_BITSET_HPP_
diff --git a/Src/External/cereal/include/cereal/types/boost_variant.hpp b/Src/External/cereal/include/cereal/types/boost_variant.hpp
deleted file mode 100644
index e1863c1..0000000
--- a/Src/External/cereal/include/cereal/types/boost_variant.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*! \file boost_variant.hpp
-    \brief Support for boost::variant
-    \ingroup OtherTypes */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_BOOST_VARIANT_HPP_
-#define CEREAL_TYPES_BOOST_VARIANT_HPP_
-
-#include "cereal/cereal.hpp"
-#include <boost/variant.hpp>
-#include <boost/mpl/size.hpp>
-
-namespace cereal
-{
-  namespace variant_detail
-  {
-    //! @internal
-    template <class Archive>
-    struct variant_save_visitor : boost::static_visitor<>
-    {
-      variant_save_visitor(Archive & ar_) : ar(ar_) {}
-
-      template<class T>
-        void operator()(T const & value) const
-        {
-          ar( CEREAL_NVP_("data", value) );
-        }
-
-      Archive & ar;
-    };
-
-    //! @internal
-    template<int N, class Variant, class ... Args, class Archive>
-    typename std::enable_if<N == boost::mpl::size<typename Variant::types>::value, void>::type
-    load_variant(Archive & /*ar*/, int /*target*/, Variant & /*variant*/)
-    {
-      throw ::cereal::Exception("Error traversing variant during load");
-    }
-
-    //! @internal
-    template<int N, class Variant, class H, class ... T, class Archive>
-    typename std::enable_if<N < boost::mpl::size<typename Variant::types>::value, void>::type
-    load_variant(Archive & ar, int target, Variant & variant)
-    {
-      if(N == target)
-      {
-        H value;
-        ar( CEREAL_NVP_("data", value) );
-        variant = value;
-      }
-      else
-        load_variant<N+1, Variant, T...>(ar, target, variant);
-    }
-
-  } // namespace variant_detail
-
-  //! Saving for boost::variant
-  template <class Archive, typename VariantType1, typename... VariantTypes> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, boost::variant<VariantType1, VariantTypes...> const & variant )
-  {
-    int32_t which = variant.which();
-    ar( CEREAL_NVP_("which", which) );
-    variant_detail::variant_save_visitor<Archive> visitor(ar);
-    variant.apply_visitor(visitor);
-  }
-
-  //! Loading for boost::variant
-  template <class Archive, typename VariantType1, typename... VariantTypes> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, boost::variant<VariantType1, VariantTypes...> & variant )
-  {
-    typedef typename boost::variant<VariantType1, VariantTypes...>::types types;
-
-    int32_t which;
-    ar( CEREAL_NVP_("which", which) );
-    if(which >= boost::mpl::size<types>::value)
-      throw Exception("Invalid 'which' selector when deserializing boost::variant");
-
-    variant_detail::load_variant<0, boost::variant<VariantType1, VariantTypes...>, VariantType1, VariantTypes...>(ar, which, variant);
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_BOOST_VARIANT_HPP_
diff --git a/Src/External/cereal/include/cereal/types/chrono.hpp b/Src/External/cereal/include/cereal/types/chrono.hpp
deleted file mode 100644
index 12ee4cb..0000000
--- a/Src/External/cereal/include/cereal/types/chrono.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*! \file chrono.hpp
-    \brief Support for types found in \<chrono\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_CHRONO_HPP_
-#define CEREAL_TYPES_CHRONO_HPP_
-
-#include <chrono>
-
-namespace cereal
-{
-  //! Saving std::chrono::duration
-  template <class Archive, class R, class P> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::chrono::duration<R, P> const & dur )
-  {
-    ar( CEREAL_NVP_("count", dur.count()) );
-  }
-
-  //! Loading std::chrono::duration
-  template <class Archive, class R, class P> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::chrono::duration<R, P> & dur )
-  {
-    R count;
-    ar( CEREAL_NVP_("count", count) );
-
-    dur = std::chrono::duration<R, P>{count};
-  }
-
-  //! Saving std::chrono::time_point
-  template <class Archive, class C, class D> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::chrono::time_point<C, D> const & dur )
-  {
-    ar( CEREAL_NVP_("time_since_epoch", dur.time_since_epoch()) );
-  }
-
-  //! Loading std::chrono::time_point
-  template <class Archive, class C, class D> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::chrono::time_point<C, D> & dur )
-  {
-    D elapsed;
-    ar( CEREAL_NVP_("time_since_epoch", elapsed) );
-
-    dur = std::chrono::time_point<C, D>{elapsed};
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_CHRONO_HPP_
diff --git a/Src/External/cereal/include/cereal/types/common.hpp b/Src/External/cereal/include/cereal/types/common.hpp
deleted file mode 100644
index b239daa..0000000
--- a/Src/External/cereal/include/cereal/types/common.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*! \file common.hpp
-    \brief Support common types - always included automatically
-    \ingroup OtherTypes */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_COMMON_HPP_
-#define CEREAL_TYPES_COMMON_HPP_
-
-#include "cereal/cereal.hpp"
-
-namespace cereal
-{
-  namespace common_detail
-  {
-    //! Serialization for arrays if BinaryData is supported and we are arithmetic
-    /*! @internal */
-    template <class Archive, class T> inline
-    void serializeArray( Archive & ar, T & array, std::true_type /* binary_supported */ )
-    {
-      ar( binary_data( array, sizeof(array) ) );
-    }
-
-    //! Serialization for arrays if BinaryData is not supported or we are not arithmetic
-    /*! @internal */
-    template <class Archive, class T> inline
-    void serializeArray( Archive & ar, T & array, std::false_type /* binary_supported */ )
-    {
-      for( auto & i : array )
-        ar( i );
-    }
-
-    namespace
-    {
-      //! Gets the underlying type of an enum
-      /*! @internal */
-      template <class T, bool IsEnum>
-      struct enum_underlying_type : std::false_type {};
-
-      //! Gets the underlying type of an enum
-      /*! Specialization for when we actually have an enum
-          @internal */
-      template <class T>
-      struct enum_underlying_type<T, true> { using type = typename std::underlying_type<T>::type; };
-    } // anon namespace
-
-    //! Checks if a type is an enum
-    /*! This is needed over simply calling std::is_enum because the type
-        traits checking at compile time will attempt to call something like
-        load_minimal with a special NoConvertRef struct that wraps up the true type.
-
-        This will strip away any of that and also expose the true underlying type.
-        @internal */
-    template <class T>
-    class is_enum
-    {
-      private:
-        using DecayedT  = typename std::decay<T>::type;
-        using StrippedT = typename ::cereal::traits::strip_minimal<DecayedT>::type;
-
-      public:
-        static const bool value = std::is_enum<StrippedT>::value;
-        using type = StrippedT;
-        using base_type = typename enum_underlying_type<StrippedT, value>::type;
-    };
-  }
-
-  //! Saving for enum types
-  template <class Archive, class T> inline
-  typename std::enable_if<common_detail::is_enum<T>::value,
-                          typename common_detail::is_enum<T>::base_type>::type
-  CEREAL_SAVE_MINIMAL_FUNCTION_NAME( Archive const &, T const & t )
-  {
-    return static_cast<typename common_detail::is_enum<T>::base_type>(t);
-  }
-
-  //! Loading for enum types
-  template <class Archive, class T> inline
-  typename std::enable_if<common_detail::is_enum<T>::value, void>::type
-  CEREAL_LOAD_MINIMAL_FUNCTION_NAME( Archive const &, T && t,
-                                     typename common_detail::is_enum<T>::base_type const & value )
-  {
-    t = reinterpret_cast<typename common_detail::is_enum<T>::type const &>( value );
-  }
-
-  //! Serialization for raw pointers
-  /*! This exists only to throw a static_assert to let users know we don't support raw pointers. */
-  template <class Archive, class T> inline
-  void CEREAL_SERIALIZE_FUNCTION_NAME( Archive &, T * & )
-  {
-    static_assert(cereal::traits::detail::delay_static_assert<T>::value,
-      "Cereal does not support serializing raw pointers - please use a smart pointer");
-  }
-
-  //! Serialization for C style arrays
-  template <class Archive, class T> inline
-  typename std::enable_if<std::is_array<T>::value, void>::type
-  CEREAL_SERIALIZE_FUNCTION_NAME(Archive & ar, T & array)
-  {
-    common_detail::serializeArray( ar, array,
-        std::integral_constant<bool, traits::is_output_serializable<BinaryData<T>, Archive>::value &&
-                                     std::is_arithmetic<typename std::remove_all_extents<T>::type>::value>() );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_COMMON_HPP_
diff --git a/Src/External/cereal/include/cereal/types/complex.hpp b/Src/External/cereal/include/cereal/types/complex.hpp
deleted file mode 100644
index 7e6ff54..0000000
--- a/Src/External/cereal/include/cereal/types/complex.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*! \file complex.hpp
-    \brief Support for types found in \<complex\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_COMPLEX_HPP_
-#define CEREAL_TYPES_COMPLEX_HPP_
-
-#include <complex>
-
-namespace cereal
-{
-  //! Serializing (save) for std::complex
-  template <class Archive, class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::complex<T> const & comp )
-  {
-    ar( CEREAL_NVP_("real", comp.real()),
-        CEREAL_NVP_("imag", comp.imag()) );
-  }
-
-  //! Serializing (load) for std::complex
-  template <class Archive, class T> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::complex<T> & bits )
-  {
-    T real, imag;
-    ar( CEREAL_NVP_("real", real),
-        CEREAL_NVP_("imag", imag) );
-    bits = {real, imag};
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_COMPLEX_HPP_
diff --git a/Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp b/Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp
deleted file mode 100644
index 5f0fd74..0000000
--- a/Src/External/cereal/include/cereal/types/concepts/pair_associative_container.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*! \file pair_associative_container.hpp
-    \brief Support for the PairAssociativeContainer refinement of the
-    AssociativeContainer concept.
-    \ingroup TypeConcepts */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_CONCEPTS_PAIR_ASSOCIATIVE_CONTAINER_HPP_
-#define CEREAL_CONCEPTS_PAIR_ASSOCIATIVE_CONTAINER_HPP_
-
-#include "cereal/cereal.hpp"
-
-namespace cereal
-{
-  //! Saving for std-like pair associative containers
-  template <class Archive, template <typename...> class Map, typename... Args, typename = typename Map<Args...>::mapped_type> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, Map<Args...> const & map )
-  {
-    ar( make_size_tag( static_cast<size_type>(map.size()) ) );
-
-    for( const auto & i : map )
-      ar( make_map_item(i.first, i.second) );
-  }
-
-  //! Loading for std-like pair associative containers
-  template <class Archive, template <typename...> class Map, typename... Args, typename = typename Map<Args...>::mapped_type> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, Map<Args...> & map )
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-
-    map.clear();
-
-    auto hint = map.begin();
-    for( size_t i = 0; i < size; ++i )
-    {
-      typename Map<Args...>::key_type key;
-      typename Map<Args...>::mapped_type value;
-
-      ar( make_map_item(key, value) );
-      #ifdef CEREAL_OLDER_GCC
-      hint = map.insert( hint, std::make_pair(std::move(key), std::move(value)) );
-      #else // NOT CEREAL_OLDER_GCC
-      hint = map.emplace_hint( hint, std::move( key ), std::move( value ) );
-      #endif // NOT CEREAL_OLDER_GCC
-    }
-  }
-} // namespace cereal
-
-#endif // CEREAL_CONCEPTS_PAIR_ASSOCIATIVE_CONTAINER_HPP_
diff --git a/Src/External/cereal/include/cereal/types/deque.hpp b/Src/External/cereal/include/cereal/types/deque.hpp
deleted file mode 100644
index 0491d28..0000000
--- a/Src/External/cereal/include/cereal/types/deque.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*! \file deque.hpp
-    \brief Support for types found in \<deque\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_DEQUE_HPP_
-#define CEREAL_TYPES_DEQUE_HPP_
-
-#include "cereal/cereal.hpp"
-#include <deque>
-
-namespace cereal
-{
-  //! Saving for std::deque
-  template <class Archive, class T, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::deque<T, A> const & deque )
-  {
-    ar( make_size_tag( static_cast<size_type>(deque.size()) ) );
-
-    for( auto const & i : deque )
-      ar( i );
-  }
-
-  //! Loading for std::deque
-  template <class Archive, class T, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::deque<T, A> & deque )
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-
-    deque.resize( static_cast<size_t>( size ) );
-
-    for( auto & i : deque )
-      ar( i );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_DEQUE_HPP_
diff --git a/Src/External/cereal/include/cereal/types/forward_list.hpp b/Src/External/cereal/include/cereal/types/forward_list.hpp
deleted file mode 100644
index db87e1f..0000000
--- a/Src/External/cereal/include/cereal/types/forward_list.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*! \file forward_list.hpp
-    \brief Support for types found in \<forward_list\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_FORWARD_LIST_HPP_
-#define CEREAL_TYPES_FORWARD_LIST_HPP_
-
-#include "cereal/cereal.hpp"
-#include <forward_list>
-
-namespace cereal
-{
-  //! Saving for std::forward_list all other types
-  template <class Archive, class T, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::forward_list<T, A> const & forward_list )
-  {
-    // write the size - note that this is slow because we need to traverse
-    // the entire list. there are ways we could avoid this but this was chosen
-    // since it works in the most general fashion with any archive type
-    size_type const size = std::distance( forward_list.begin(), forward_list.end() );
-
-    ar( make_size_tag( size ) );
-
-    // write the list
-    for( const auto & i : forward_list )
-      ar( i );
-  }
-
-  //! Loading for std::forward_list all other types from
-  template <class Archive, class T, class A>
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::forward_list<T, A> & forward_list )
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-
-    forward_list.resize( static_cast<size_t>( size ) );
-
-    for( auto & i : forward_list )
-      ar( i );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_FORWARD_LIST_HPP_
diff --git a/Src/External/cereal/include/cereal/types/functional.hpp b/Src/External/cereal/include/cereal/types/functional.hpp
deleted file mode 100644
index 0023ec4..0000000
--- a/Src/External/cereal/include/cereal/types/functional.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*! \file functional.hpp
-    \brief Support for types found in \<functional\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2016, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_FUNCTIONAL_HPP_
-#define CEREAL_TYPES_FUNCTIONAL_HPP_
-
-#include <functional>
-
-namespace cereal
-{
-  //! Saving for std::less
-  template <class Archive, class T> inline
-  void serialize( Archive &, std::less<T> & )
-  { }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_FUNCTIONAL_HPP_
diff --git a/Src/External/cereal/include/cereal/types/list.hpp b/Src/External/cereal/include/cereal/types/list.hpp
deleted file mode 100644
index 6008204..0000000
--- a/Src/External/cereal/include/cereal/types/list.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*! \file list.hpp
-    \brief Support for types found in \<list\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_LIST_HPP_
-#define CEREAL_TYPES_LIST_HPP_
-
-#include "cereal/cereal.hpp"
-#include <list>
-
-namespace cereal
-{
-  //! Saving for std::list
-  template <class Archive, class T, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::list<T, A> const & list )
-  {
-    ar( make_size_tag( static_cast<size_type>(list.size()) ) );
-
-    for( auto const & i : list )
-      ar( i );
-  }
-
-  //! Loading for std::list
-  template <class Archive, class T, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::list<T, A> & list )
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-
-    list.resize( static_cast<size_t>( size ) );
-
-    for( auto & i : list )
-      ar( i );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_LIST_HPP_
diff --git a/Src/External/cereal/include/cereal/types/map.hpp b/Src/External/cereal/include/cereal/types/map.hpp
deleted file mode 100644
index 41845e9..0000000
--- a/Src/External/cereal/include/cereal/types/map.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*! \file map.hpp
-    \brief Support for types found in \<map\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_MAP_HPP_
-#define CEREAL_TYPES_MAP_HPP_
-
-#include "cereal/types/concepts/pair_associative_container.hpp"
-#include <map>
-
-#endif // CEREAL_TYPES_MAP_HPP_
diff --git a/Src/External/cereal/include/cereal/types/memory.hpp b/Src/External/cereal/include/cereal/types/memory.hpp
deleted file mode 100644
index 40c965a..0000000
--- a/Src/External/cereal/include/cereal/types/memory.hpp
+++ /dev/null
@@ -1,425 +0,0 @@
-/*! \file memory.hpp
-    \brief Support for types found in \<memory\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_SHARED_PTR_HPP_
-#define CEREAL_TYPES_SHARED_PTR_HPP_
-
-#include "cereal/cereal.hpp"
-#include <memory>
-#include <cstring>
-
-// Work around MSVC not having alignof
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define CEREAL_ALIGNOF __alignof
-#else // not MSVC 2013 or older
-#define CEREAL_ALIGNOF alignof
-#endif // end MSVC check
-
-namespace cereal
-{
-  namespace memory_detail
-  {
-    //! A wrapper class to notify cereal that it is ok to serialize the contained pointer
-    /*! This mechanism allows us to intercept and properly handle polymorphic pointers
-        @internal */
-    template<class T>
-    struct PtrWrapper
-    {
-      PtrWrapper(T && p) : ptr(std::forward<T>(p)) {}
-      T & ptr;
-
-      PtrWrapper & operator=( PtrWrapper const & ) = delete;
-    };
-
-    //! Make a PtrWrapper
-    /*! @internal */
-    template<class T> inline
-    PtrWrapper<T> make_ptr_wrapper(T && t)
-    {
-      return {std::forward<T>(t)};
-    }
-
-    //! A struct that acts as a wrapper around calling load_andor_construct
-    /*! The purpose of this is to allow a load_and_construct call to properly enter into the
-        'data' NVP of the ptr_wrapper
-        @internal */
-    template <class Archive, class T>
-    struct LoadAndConstructLoadWrapper
-    {
-      LoadAndConstructLoadWrapper( T * ptr ) :
-        construct( ptr )
-      { }
-
-      //! Constructor for embedding an early call for restoring shared_from_this
-      template <class F>
-      LoadAndConstructLoadWrapper( T * ptr, F && sharedFromThisFunc ) :
-        construct( ptr, sharedFromThisFunc )
-      { }
-
-      inline void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar )
-      {
-        ::cereal::detail::Construct<T, Archive>::load_andor_construct( ar, construct );
-      }
-
-      ::cereal::construct<T> construct;
-    };
-
-    //! A helper struct for saving and restoring the state of types that derive from
-    //! std::enable_shared_from_this
-    /*! This special struct is necessary because when a user uses load_and_construct,
-        the weak_ptr (or whatever implementation defined variant) that allows
-        enable_shared_from_this to function correctly will not be initialized properly.
-
-        This internal weak_ptr can also be modified by the shared_ptr that is created
-        during the serialization of a polymorphic pointer, where cereal creates a
-        wrapper shared_ptr out of a void pointer to the real data.
-
-        In the case of load_and_construct, this happens because it is the allocation
-        of shared_ptr that perform this initialization, which we let happen on a buffer
-        of memory (aligned_storage).  This buffer is then used for placement new
-        later on, effectively overwriting any initialized weak_ptr with a default
-        initialized one, eventually leading to issues when the user calls shared_from_this.
-
-        To get around these issues, we will store the memory for the enable_shared_from_this
-        portion of the class and replace it after whatever happens to modify it (e.g. the
-        user performing construction or the wrapper shared_ptr in saving).
-
-        Example usage:
-
-        @code{.cpp}
-        T * myActualPointer;
-        {
-          EnableSharedStateHelper<T> helper( myActualPointer ); // save the state
-          std::shared_ptr<T> myPtr( myActualPointer ); // modifies the internal weak_ptr
-          // helper restores state when it goes out of scope
-        }
-        @endcode
-
-        When possible, this is designed to be used in an RAII fashion - it will save state on
-        construction and restore it on destruction. The restore can be done at an earlier time
-        (e.g. after construct() is called in load_and_construct) in which case the destructor will
-        do nothing. Performing the restore immediately following construct() allows a user to call
-        shared_from_this within their load_and_construct function.
-
-        @tparam T Type pointed to by shared_ptr
-        @internal */
-    template <class T>
-    class EnableSharedStateHelper
-    {
-      // typedefs for parent type and storage type
-      using BaseType = typename ::cereal::traits::get_shared_from_this_base<T>::type;
-      using ParentType = std::enable_shared_from_this<BaseType>;
-      using StorageType = typename std::aligned_storage<sizeof(ParentType), CEREAL_ALIGNOF(ParentType)>::type;
-      
-      public:
-        //! Saves the state of some type inheriting from enable_shared_from_this
-        /*! @param ptr The raw pointer held by the shared_ptr */
-        inline EnableSharedStateHelper( T * ptr ) :
-          itsPtr( static_cast<ParentType *>( ptr ) ),
-          itsState(),
-          itsRestored( false )
-        {
-          std::memcpy( &itsState, itsPtr, sizeof(ParentType) );
-        }
-
-        //! Restores the state of the held pointer (can only be done once)
-        inline void restore()
-        {
-          if( !itsRestored )
-          {
-            std::memcpy( itsPtr, &itsState, sizeof(ParentType) );
-            itsRestored = true;
-          }
-        }
-
-        //! Restores the state of the held pointer if not done previously
-        inline ~EnableSharedStateHelper()
-        {
-          restore();
-        }
-
-      private:
-        ParentType * itsPtr;
-        StorageType itsState;
-        bool itsRestored;
-    }; // end EnableSharedStateHelper
-
-    //! Performs loading and construction for a shared pointer that is derived from
-    //! std::enable_shared_from_this
-    /*! @param ar The archive
-        @param ptr Raw pointer held by the shared_ptr
-        @internal */
-    template <class Archive, class T> inline
-    void loadAndConstructSharedPtr( Archive & ar, T * ptr, std::true_type /* has_shared_from_this */ )
-    {
-      memory_detail::EnableSharedStateHelper<T> state( ptr );
-      memory_detail::LoadAndConstructLoadWrapper<Archive, T> loadWrapper( ptr, [&](){ state.restore(); } );
-
-      // let the user perform their initialization, shared state will be restored as soon as construct()
-      // is called
-      ar( CEREAL_NVP_("data", loadWrapper) );
-    }
-
-    //! Performs loading and construction for a shared pointer that is NOT derived from
-    //! std::enable_shared_from_this
-    /*! This is the typical case, where we simply pass the load wrapper to the
-        archive.
-
-        @param ar The archive
-        @param ptr Raw pointer held by the shared_ptr
-        @internal */
-    template <class Archive, class T> inline
-    void loadAndConstructSharedPtr( Archive & ar, T * ptr, std::false_type /* has_shared_from_this */ )
-    {
-      memory_detail::LoadAndConstructLoadWrapper<Archive, T> loadWrapper( ptr );
-      ar( CEREAL_NVP_("data", loadWrapper) );
-    }
-  } // end namespace memory_detail
-
-  //! Saving std::shared_ptr for non polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> const & ptr )
-  {
-    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
-  }
-
-  //! Loading std::shared_ptr, case when no user load and construct for non polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> & ptr )
-  {
-    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
-  }
-
-  //! Saving std::weak_ptr for non polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> const & ptr )
-  {
-    auto const sptr = ptr.lock();
-    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( sptr )) );
-  }
-
-  //! Loading std::weak_ptr for non polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> & ptr )
-  {
-    std::shared_ptr<T> sptr;
-    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( sptr )) );
-    ptr = sptr;
-  }
-
-  //! Saving std::unique_ptr for non polymorphic types
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> const & ptr )
-  {
-    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
-  }
-
-  //! Loading std::unique_ptr, case when user provides load_and_construct for non polymorphic types
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<!std::is_polymorphic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> & ptr )
-  {
-    ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper( ptr )) );
-  }
-
-  // ######################################################################
-  // Pointer wrapper implementations follow below
-
-  //! Saving std::shared_ptr (wrapper implementation)
-  /*! @internal */
-  template <class Archive, class T> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::shared_ptr<T> const &> const & wrapper )
-  {
-    auto & ptr = wrapper.ptr;
-
-    uint32_t id = ar.registerSharedPointer( ptr.get() );
-    ar( CEREAL_NVP_("id", id) );
-
-    if( id & detail::msb_32bit )
-    {
-      ar( CEREAL_NVP_("data", *ptr) );
-    }
-  }
-
-  //! Loading std::shared_ptr, case when user load and construct (wrapper implementation)
-  /*! @internal */
-  template <class Archive, class T> inline
-  typename std::enable_if<traits::has_load_and_construct<T, Archive>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::shared_ptr<T> &> & wrapper )
-  {
-    auto & ptr = wrapper.ptr;
-
-    uint32_t id;
-
-    ar( CEREAL_NVP_("id", id) );
-
-    if( id & detail::msb_32bit )
-    {
-      // Storage type for the pointer - since we can't default construct this type,
-      // we'll allocate it using std::aligned_storage and use a custom deleter
-      using ST = typename std::aligned_storage<sizeof(T), CEREAL_ALIGNOF(T)>::type;
-
-      // Valid flag - set to true once construction finishes
-      //  This prevents us from calling the destructor on
-      //  uninitialized data.
-      auto valid = std::make_shared<bool>( false );
-
-      // Allocate our storage, which we will treat as
-      //  uninitialized until initialized with placement new
-      ptr.reset( reinterpret_cast<T *>( new ST() ),
-          [=]( T * t )
-          {
-            if( *valid )
-              t->~T();
-
-            delete reinterpret_cast<ST *>( t );
-          } );
-
-      // Register the pointer
-      ar.registerSharedPointer( id, ptr );
-
-      // Perform the actual loading and allocation
-      memory_detail::loadAndConstructSharedPtr( ar, ptr.get(), typename ::cereal::traits::has_shared_from_this<T>::type() );
-
-      // Mark pointer as valid (initialized)
-      *valid = true;
-    }
-    else
-      ptr = std::static_pointer_cast<T>(ar.getSharedPointer(id));
-  }
-
-  //! Loading std::shared_ptr, case when no user load and construct (wrapper implementation)
-  /*! @internal */
-  template <class Archive, class T> inline
-  typename std::enable_if<!traits::has_load_and_construct<T, Archive>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::shared_ptr<T> &> & wrapper )
-  {
-    auto & ptr = wrapper.ptr;
-
-    uint32_t id;
-
-    ar( CEREAL_NVP_("id", id) );
-
-    if( id & detail::msb_32bit )
-    {
-      ptr.reset( detail::Construct<T, Archive>::load_andor_construct() );
-      ar.registerSharedPointer( id, ptr );
-      ar( CEREAL_NVP_("data", *ptr) );
-    }
-    else
-      ptr = std::static_pointer_cast<T>(ar.getSharedPointer(id));
-  }
-
-  //! Saving std::unique_ptr (wrapper implementation)
-  /*! @internal */
-  template <class Archive, class T, class D> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::unique_ptr<T, D> const &> const & wrapper )
-  {
-    auto & ptr = wrapper.ptr;
-
-    // unique_ptr get one byte of metadata which signifies whether they were a nullptr
-    // 0 == nullptr
-    // 1 == not null
-
-    if( !ptr )
-      ar( CEREAL_NVP_("valid", uint8_t(0)) );
-    else
-    {
-      ar( CEREAL_NVP_("valid", uint8_t(1)) );
-      ar( CEREAL_NVP_("data", *ptr) );
-    }
-  }
-
-  //! Loading std::unique_ptr, case when user provides load_and_construct (wrapper implementation)
-  /*! @internal */
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<traits::has_load_and_construct<T, Archive>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::unique_ptr<T, D> &> & wrapper )
-  {
-    uint8_t isValid;
-    ar( CEREAL_NVP_("valid", isValid) );
-
-    auto & ptr = wrapper.ptr;
-
-    if( isValid )
-    {
-      // Storage type for the pointer - since we can't default construct this type,
-      // we'll allocate it using std::aligned_storage
-      using ST = typename std::aligned_storage<sizeof(T), CEREAL_ALIGNOF(T)>::type;
-
-      // Allocate storage - note the ST type so that deleter is correct if
-      //                    an exception is thrown before we are initialized
-      std::unique_ptr<ST> stPtr( new ST() );
-
-      // Use wrapper to enter into "data" nvp of ptr_wrapper
-      memory_detail::LoadAndConstructLoadWrapper<Archive, T> loadWrapper( reinterpret_cast<T *>( stPtr.get() ) );
-
-      // Initialize storage
-      ar( CEREAL_NVP_("data", loadWrapper) );
-
-      // Transfer ownership to correct unique_ptr type
-      ptr.reset( reinterpret_cast<T *>( stPtr.release() ) );
-    }
-    else
-      ptr.reset( nullptr );
-  }
-
-  //! Loading std::unique_ptr, case when no load_and_construct (wrapper implementation)
-  /*! @internal */
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<!traits::has_load_and_construct<T, Archive>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, memory_detail::PtrWrapper<std::unique_ptr<T, D> &> & wrapper )
-  {
-    uint8_t isValid;
-    ar( CEREAL_NVP_("valid", isValid) );
-
-    auto & ptr = wrapper.ptr;
-
-    if( isValid )
-    {
-      ptr.reset( detail::Construct<T, Archive>::load_andor_construct() );
-      ar( CEREAL_NVP_( "data", *ptr ) );
-    }
-    else
-    {
-      ptr.reset( nullptr );
-    }
-  }
-} // namespace cereal
-
-// automatically include polymorphic support
-#include "cereal/types/polymorphic.hpp"
-
-#undef CEREAL_ALIGNOF
-#endif // CEREAL_TYPES_SHARED_PTR_HPP_
\ No newline at end of file
diff --git a/Src/External/cereal/include/cereal/types/polymorphic.hpp b/Src/External/cereal/include/cereal/types/polymorphic.hpp
deleted file mode 100644
index 5acc11f..0000000
--- a/Src/External/cereal/include/cereal/types/polymorphic.hpp
+++ /dev/null
@@ -1,481 +0,0 @@
-/*! \file polymorphic.hpp
-    \brief Support for pointers to polymorphic base classes
-    \ingroup OtherTypes */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_POLYMORPHIC_HPP_
-#define CEREAL_TYPES_POLYMORPHIC_HPP_
-
-#include "cereal/cereal.hpp"
-#include "cereal/types/memory.hpp"
-
-#include "cereal/details/util.hpp"
-#include "cereal/details/helpers.hpp"
-#include "cereal/details/traits.hpp"
-#include "cereal/details/polymorphic_impl.hpp"
-
-#ifdef _MSC_VER
-#define CEREAL_STATIC_CONSTEXPR static
-#else
-#define CEREAL_STATIC_CONSTEXPR static constexpr
-#endif
-
-//! Registers a derived polymorphic type with cereal
-/*! Polymorphic types must be registered before smart
-    pointers to them can be serialized.  Note that base
-    classes do not need to be registered.
-
-    Registering a type lets cereal know how to properly
-    serialize it when a smart pointer to a base object is
-    used in conjunction with a derived class.
-
-    This assumes that all relevant archives have also
-    previously been registered.  Registration for archives
-    is usually done in the header file in which they are
-    defined.  This means that type registration needs to
-    happen after specific archives to be used are included.
-
-    It is recommended that type registration be done in
-    the header file in which the type is declared.
-
-    Registration can also be placed in a source file,
-    but this may require the use of the
-    CEREAL_REGISTER_DYNAMIC_INIT macro (see below).
-
-    Registration may be called repeatedly for the same
-    type in different translation units to add support
-    for additional archives if they are not initially
-    available (included and registered).
-
-    When building serialization support as a DLL on
-    Windows, registration must happen in the header file.
-    On Linux and Mac things should still work properly
-    if placed in a source file, but see the above comments
-    on registering in source files.
-
-    Polymorphic support in cereal requires RTTI to be
-    enabled */
-#define CEREAL_REGISTER_TYPE(...)                                        \
-  namespace cereal {                                                     \
-  namespace detail {                                                     \
-  template <>                                                            \
-  struct binding_name<__VA_ARGS__>                                       \
-  {                                                                      \
-    CEREAL_STATIC_CONSTEXPR char const * name() { return #__VA_ARGS__; } \
-  };                                                                     \
-  } } /* end namespaces */                                               \
-  CEREAL_BIND_TO_ARCHIVES(__VA_ARGS__)
-
-//! Registers a polymorphic type with cereal, giving it a
-//! user defined name
-/*! In some cases the default name used with
-    CEREAL_REGISTER_TYPE (the name of the type) may not be
-    suitable.  This macro allows any name to be associated
-    with the type.  The name should be unique */
-#define CEREAL_REGISTER_TYPE_WITH_NAME(T, Name)                     \
-  namespace cereal {                                                \
-  namespace detail {                                                \
-  template <>                                                       \
-  struct binding_name<T>                                            \
-  { CEREAL_STATIC_CONSTEXPR char const * name() { return Name; } }; \
-  } } /* end namespaces */                                          \
-  CEREAL_BIND_TO_ARCHIVES(T)
-
-//! Registers the base-derived relationship for a polymorphic type
-/*! When polymorphic serialization occurs, cereal needs to know how to
-    properly cast between derived and base types for the polymorphic
-    type. Normally this happens automatically whenever cereal::base_class
-    or cereal::virtual_base_class are used to serialize a base class. In
-    cases where neither of these is ever called but a base class still
-    exists, this explicit registration is required.
-
-    The Derived class should be the most derived type that will be serialized,
-    and the Base type any possible base that has not been covered under a base
-    class serialization that will be used to store a Derived pointer.
-
-    Placement of this is the same as for CEREAL_REGISTER_TYPE. */
-#define CEREAL_REGISTER_POLYMORPHIC_RELATION(Base, Derived)                     \
-  namespace cereal {                                                            \
-  namespace detail {                                                            \
-  template <>                                                                   \
-  struct PolymorphicRelation<Base, Derived>                                     \
-  { static void bind() { RegisterPolymorphicCaster<Base, Derived>::bind(); } }; \
-  } } /* end namespaces */
-
-//! Adds a way to force initialization of a translation unit containing
-//! calls to CEREAL_REGISTER_TYPE
-/*! In C++, dynamic initialization of non-local variables of a translation
-    unit may be deferred until "the first odr-use of any function or variable
-    defined in the same translation unit as the variable to be initialized."
-
-    Informally, odr-use means that your program takes the address of or binds
-    a reference directly to an object, which must have a definition.
-
-    Since polymorphic type support in cereal relies on the dynamic
-    initialization of certain global objects happening before
-    serialization is performed, it is important to ensure that something
-    from files that call CEREAL_REGISTER_TYPE is odr-used before serialization
-    occurs, otherwise the registration will never take place.  This may often
-    be the case when serialization is built as a shared library external from
-    your main program.
-
-    This macro, with any name of your choosing, should be placed into the
-    source file that contains calls to CEREAL_REGISTER_TYPE.
-
-    Its counterpart, CEREAL_FORCE_DYNAMIC_INIT, should be placed in its
-    associated header file such that it is included in the translation units
-    (source files) in which you want the registration to appear.
-
-    @relates CEREAL_FORCE_DYNAMIC_INIT
-    */
-#define CEREAL_REGISTER_DYNAMIC_INIT(LibName)                \
-  namespace cereal {                                         \
-  namespace detail {                                         \
-    void CEREAL_DLL_EXPORT dynamic_init_dummy_##LibName() {} \
-  } } /* end namespaces */
-
-//! Forces dynamic initialization of polymorphic support in a
-//! previously registered source file
-/*! @sa CEREAL_REGISTER_DYNAMIC_INIT
-
-    See CEREAL_REGISTER_DYNAMIC_INIT for detailed explanation
-    of how this macro should be used.  The name used should
-    match that for CEREAL_REGISTER_DYNAMIC_INIT. */
-#define CEREAL_FORCE_DYNAMIC_INIT(LibName)              \
-  namespace cereal {                                    \
-  namespace detail {                                    \
-    void dynamic_init_dummy_##LibName();                \
-  } /* end detail */                                    \
-  namespace {                                           \
-    void dynamic_init_##LibName()                       \
-    {                                                   \
-      ::cereal::detail::dynamic_init_dummy_##LibName(); \
-    }                                                   \
-  } } /* end namespaces */
-
-namespace cereal
-{
-  namespace polymorphic_detail
-  {
-    //! Error message used for unregistered polymorphic types
-    /*! @internal */
-    #define UNREGISTERED_POLYMORPHIC_EXCEPTION(LoadSave, Name)                                                                                      \
-      throw cereal::Exception("Trying to " #LoadSave " an unregistered polymorphic type (" + Name + ").\n"                                          \
-                              "Make sure your type is registered with CEREAL_REGISTER_TYPE and that the archive "                                   \
-                              "you are using was included (and registered with CEREAL_REGISTER_ARCHIVE) prior to calling CEREAL_REGISTER_TYPE.\n"   \
-                              "If your type is already registered and you still see this error, you may need to use CEREAL_REGISTER_DYNAMIC_INIT.");
-
-    //! Get an input binding from the given archive by deserializing the type meta data
-    /*! @internal */
-    template<class Archive> inline
-    typename ::cereal::detail::InputBindingMap<Archive>::Serializers getInputBinding(Archive & ar, std::uint32_t const nameid)
-    {
-      // If the nameid is zero, we serialized a null pointer
-      if(nameid == 0)
-      {
-        typename ::cereal::detail::InputBindingMap<Archive>::Serializers emptySerializers;
-        emptySerializers.shared_ptr = [](void*, std::shared_ptr<void> & ptr, std::type_info const &) { ptr.reset(); };
-        emptySerializers.unique_ptr = [](void*, std::unique_ptr<void, ::cereal::detail::EmptyDeleter<void>> & ptr, std::type_info const &) { ptr.reset( nullptr ); };
-        return emptySerializers;
-      }
-
-      std::string name;
-      if(nameid & detail::msb_32bit)
-      {
-        ar( CEREAL_NVP_("polymorphic_name", name) );
-        ar.registerPolymorphicName(nameid, name);
-      }
-      else
-        name = ar.getPolymorphicName(nameid);
-
-      auto const & bindingMap = detail::StaticObject<detail::InputBindingMap<Archive>>::getInstance().map;
-
-      auto binding = bindingMap.find(name);
-      if(binding == bindingMap.end())
-        UNREGISTERED_POLYMORPHIC_EXCEPTION(load, name)
-      return binding->second;
-    }
-
-    //! Serialize a shared_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
-    /*! This check lets us try and skip doing polymorphic machinery if we can get away with
-        using the derived class serialize function
-
-        Note that on MSVC 2013 preview, is_default_constructible<T> returns true for abstract classes with
-        default constructors, but on clang/gcc this will return false.  So we also need to check for that here.
-        @internal */
-    template<class Archive, class T> inline
-    typename std::enable_if<(traits::is_default_constructible<T>::value
-                             || traits::has_load_and_construct<T, Archive>::value)
-                             && !std::is_abstract<T>::value, bool>::type
-    serialize_wrapper(Archive & ar, std::shared_ptr<T> & ptr, std::uint32_t const nameid)
-    {
-      if(nameid & detail::msb2_32bit)
-      {
-        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
-        return true;
-      }
-      return false;
-    }
-
-    //! Serialize a unique_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
-    /*! This check lets us try and skip doing polymorphic machinery if we can get away with
-        using the derived class serialize function
-        @internal */
-    template<class Archive, class T, class D> inline
-    typename std::enable_if<(traits::is_default_constructible<T>::value
-                             || traits::has_load_and_construct<T, Archive>::value)
-                             && !std::is_abstract<T>::value, bool>::type
-    serialize_wrapper(Archive & ar, std::unique_ptr<T, D> & ptr, std::uint32_t const nameid)
-    {
-      if(nameid & detail::msb2_32bit)
-      {
-        ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
-        return true;
-      }
-      return false;
-    }
-
-    //! Serialize a shared_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
-    /*! This case is for when we can't actually construct the shared pointer.  Normally this would be caught
-        as the pointer itself is serialized, but since this is a polymorphic pointer, if we tried to serialize
-        the pointer we'd end up back here recursively.  So we have to catch the error here as well, if
-        this was a polymorphic type serialized by its proper pointer type
-        @internal */
-    template<class Archive, class T> inline
-    typename std::enable_if<(!traits::is_default_constructible<T>::value
-                             && !traits::has_load_and_construct<T, Archive>::value)
-                             || std::is_abstract<T>::value, bool>::type
-    serialize_wrapper(Archive &, std::shared_ptr<T> &, std::uint32_t const nameid)
-    {
-      if(nameid & detail::msb2_32bit)
-        throw cereal::Exception("Cannot load a polymorphic type that is not default constructable and does not have a load_and_construct function");
-      return false;
-    }
-
-    //! Serialize a unique_ptr if the 2nd msb in the nameid is set, and if we can actually construct the pointee
-    /*! This case is for when we can't actually construct the unique pointer.  Normally this would be caught
-        as the pointer itself is serialized, but since this is a polymorphic pointer, if we tried to serialize
-        the pointer we'd end up back here recursively.  So we have to catch the error here as well, if
-        this was a polymorphic type serialized by its proper pointer type
-        @internal */
-    template<class Archive, class T, class D> inline
-     typename std::enable_if<(!traits::is_default_constructible<T>::value
-                               && !traits::has_load_and_construct<T, Archive>::value)
-                               || std::is_abstract<T>::value, bool>::type
-    serialize_wrapper(Archive &, std::unique_ptr<T, D> &, std::uint32_t const nameid)
-    {
-      if(nameid & detail::msb2_32bit)
-        throw cereal::Exception("Cannot load a polymorphic type that is not default constructable and does not have a load_and_construct function");
-      return false;
-    }
-  } // polymorphic_detail
-
-  // ######################################################################
-  // Pointer serialization for polymorphic types
-
-  //! Saving std::shared_ptr for polymorphic types, abstract
-  template <class Archive, class T> inline
-  typename std::enable_if<std::is_polymorphic<T>::value && std::is_abstract<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> const & ptr )
-  {
-    if(!ptr)
-    {
-      // same behavior as nullptr in memory implementation
-      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
-      return;
-    }
-
-    std::type_info const & ptrinfo = typeid(*ptr.get());
-    static std::type_info const & tinfo = typeid(T);
-    // ptrinfo can never be equal to T info since we can't have an instance
-    // of an abstract object
-    //  this implies we need to do the lookup
-
-    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
-
-    auto binding = bindingMap.find(std::type_index(ptrinfo));
-    if(binding == bindingMap.end())
-      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
-
-    binding->second.shared_ptr(&ar, ptr.get(), tinfo);
-  }
-
-  //! Saving std::shared_ptr for polymorphic types, not abstract
-  template <class Archive, class T> inline
-  typename std::enable_if<std::is_polymorphic<T>::value && !std::is_abstract<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> const & ptr )
-  {
-    if(!ptr)
-    {
-      // same behavior as nullptr in memory implementation
-      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
-      return;
-    }
-
-    std::type_info const & ptrinfo = typeid(*ptr.get());
-    static std::type_info const & tinfo = typeid(T);
-
-    if(ptrinfo == tinfo)
-    {
-      // The 2nd msb signals that the following pointer does not need to be
-      // cast with our polymorphic machinery
-      ar( CEREAL_NVP_("polymorphic_id", detail::msb2_32bit) );
-
-      ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
-
-      return;
-    }
-
-    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
-
-    auto binding = bindingMap.find(std::type_index(ptrinfo));
-    if(binding == bindingMap.end())
-      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
-
-    binding->second.shared_ptr(&ar, ptr.get(), tinfo);
-  }
-
-  //! Loading std::shared_ptr for polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::shared_ptr<T> & ptr )
-  {
-    std::uint32_t nameid;
-    ar( CEREAL_NVP_("polymorphic_id", nameid) );
-
-    // Check to see if we can skip all of this polymorphism business
-    if(polymorphic_detail::serialize_wrapper(ar, ptr, nameid))
-      return;
-
-    auto binding = polymorphic_detail::getInputBinding(ar, nameid);
-    std::shared_ptr<void> result;
-    binding.shared_ptr(&ar, result, typeid(T));
-    ptr = std::static_pointer_cast<T>(result);
-  }
-
-  //! Saving std::weak_ptr for polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> const & ptr )
-  {
-    auto const sptr = ptr.lock();
-    ar( CEREAL_NVP_("locked_ptr", sptr) );
-  }
-
-  //! Loading std::weak_ptr for polymorphic types
-  template <class Archive, class T> inline
-  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::weak_ptr<T> & ptr )
-  {
-    std::shared_ptr<T> sptr;
-    ar( CEREAL_NVP_("locked_ptr", sptr) );
-    ptr = sptr;
-  }
-
-  //! Saving std::unique_ptr for polymorphic types that are abstract
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<std::is_polymorphic<T>::value && std::is_abstract<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> const & ptr )
-  {
-    if(!ptr)
-    {
-      // same behavior as nullptr in memory implementation
-      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
-      return;
-    }
-
-    std::type_info const & ptrinfo = typeid(*ptr.get());
-    static std::type_info const & tinfo = typeid(T);
-    // ptrinfo can never be equal to T info since we can't have an instance
-    // of an abstract object
-    //  this implies we need to do the lookup
-
-    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
-
-    auto binding = bindingMap.find(std::type_index(ptrinfo));
-    if(binding == bindingMap.end())
-      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
-
-    binding->second.unique_ptr(&ar, ptr.get(), tinfo);
-  }
-
-  //! Saving std::unique_ptr for polymorphic types, not abstract
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<std::is_polymorphic<T>::value && !std::is_abstract<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> const & ptr )
-  {
-    if(!ptr)
-    {
-      // same behavior as nullptr in memory implementation
-      ar( CEREAL_NVP_("polymorphic_id", std::uint32_t(0)) );
-      return;
-    }
-
-    std::type_info const & ptrinfo = typeid(*ptr.get());
-    static std::type_info const & tinfo = typeid(T);
-
-    if(ptrinfo == tinfo)
-    {
-      // The 2nd msb signals that the following pointer does not need to be
-      // cast with our polymorphic machinery
-      ar( CEREAL_NVP_("polymorphic_id", detail::msb2_32bit) );
-
-      ar( CEREAL_NVP_("ptr_wrapper", memory_detail::make_ptr_wrapper(ptr)) );
-
-      return;
-    }
-
-    auto const & bindingMap = detail::StaticObject<detail::OutputBindingMap<Archive>>::getInstance().map;
-
-    auto binding = bindingMap.find(std::type_index(ptrinfo));
-    if(binding == bindingMap.end())
-      UNREGISTERED_POLYMORPHIC_EXCEPTION(save, cereal::util::demangle(ptrinfo.name()))
-
-    binding->second.unique_ptr(&ar, ptr.get(), tinfo);
-  }
-
-  //! Loading std::unique_ptr, case when user provides load_and_construct for polymorphic types
-  template <class Archive, class T, class D> inline
-  typename std::enable_if<std::is_polymorphic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unique_ptr<T, D> & ptr )
-  {
-    std::uint32_t nameid;
-    ar( CEREAL_NVP_("polymorphic_id", nameid) );
-
-    // Check to see if we can skip all of this polymorphism business
-    if(polymorphic_detail::serialize_wrapper(ar, ptr, nameid))
-      return;
-
-    auto binding = polymorphic_detail::getInputBinding(ar, nameid);
-    std::unique_ptr<void, ::cereal::detail::EmptyDeleter<void>> result;
-    binding.unique_ptr(&ar, result, typeid(T));
-    ptr.reset(static_cast<T*>(result.release()));
-  }
-
-  #undef UNREGISTERED_POLYMORPHIC_EXCEPTION
-} // namespace cereal
-#endif // CEREAL_TYPES_POLYMORPHIC_HPP_
diff --git a/Src/External/cereal/include/cereal/types/queue.hpp b/Src/External/cereal/include/cereal/types/queue.hpp
deleted file mode 100644
index 52d26a2..0000000
--- a/Src/External/cereal/include/cereal/types/queue.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*! \file queue.hpp
-    \brief Support for types found in \<queue\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_QUEUE_HPP_
-#define CEREAL_TYPES_QUEUE_HPP_
-
-#include "cereal/details/helpers.hpp"
-#include <queue>
-
-// The default container for queue is deque, so let's include that too
-#include "cereal/types/deque.hpp"
-// The default comparator for queue is less
-#include "cereal/types/functional.hpp"
-
-namespace cereal
-{
-  namespace queue_detail
-  {
-    //! Allows access to the protected container in queue
-    /*! @internal */
-    template <class T, class C> inline
-    C const & container( std::queue<T, C> const & queue )
-    {
-      struct H : public std::queue<T, C>
-      {
-        static C const & get( std::queue<T, C> const & q )
-        {
-          return q.*(&H::c);
-        }
-      };
-
-      return H::get( queue );
-    }
-
-    //! Allows access to the protected container in priority queue
-    /*! @internal */
-    template <class T, class C, class Comp> inline
-    C const & container( std::priority_queue<T, C, Comp> const & priority_queue )
-    {
-      struct H : public std::priority_queue<T, C, Comp>
-      {
-        static C const & get( std::priority_queue<T, C, Comp> const & pq )
-        {
-          return pq.*(&H::c);
-        }
-      };
-
-      return H::get( priority_queue );
-    }
-
-    //! Allows access to the protected comparator in priority queue
-    /*! @internal */
-    template <class T, class C, class Comp> inline
-    Comp const & comparator( std::priority_queue<T, C, Comp> const & priority_queue )
-    {
-      struct H : public std::priority_queue<T, C, Comp>
-      {
-        static Comp const & get( std::priority_queue<T, C, Comp> const & pq )
-        {
-          return pq.*(&H::comp);
-        }
-      };
-
-      return H::get( priority_queue );
-    }
-  }
-
-  //! Saving for std::queue
-  template <class Archive, class T, class C> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::queue<T, C> const & queue )
-  {
-    ar( CEREAL_NVP_("container", queue_detail::container( queue )) );
-  }
-
-  //! Loading for std::queue
-  template <class Archive, class T, class C> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::queue<T, C> & queue )
-  {
-    C container;
-    ar( CEREAL_NVP_("container", container) );
-    queue = std::queue<T, C>( std::move( container ) );
-  }
-
-  //! Saving for std::priority_queue
-  template <class Archive, class T, class C, class Comp> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::priority_queue<T, C, Comp> const & priority_queue )
-  {
-    ar( CEREAL_NVP_("comparator", queue_detail::comparator( priority_queue )) );
-    ar( CEREAL_NVP_("container", queue_detail::container( priority_queue )) );
-  }
-
-  //! Loading for std::priority_queue
-  template <class Archive, class T, class C, class Comp> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::priority_queue<T, C, Comp> & priority_queue )
-  {
-    Comp comparator;
-    ar( CEREAL_NVP_("comparator", comparator) );
-
-    C container;
-    ar( CEREAL_NVP_("container", container) );
-
-    priority_queue = std::priority_queue<T, C, Comp>( comparator, std::move( container ) );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_QUEUE_HPP_
diff --git a/Src/External/cereal/include/cereal/types/set.hpp b/Src/External/cereal/include/cereal/types/set.hpp
deleted file mode 100644
index 149a5b4..0000000
--- a/Src/External/cereal/include/cereal/types/set.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*! \file set.hpp
-    \brief Support for types found in \<set\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_SET_HPP_
-#define CEREAL_TYPES_SET_HPP_
-
-#include "cereal/cereal.hpp"
-#include <set>
-
-namespace cereal
-{
-  namespace set_detail
-  {
-    //! @internal
-    template <class Archive, class SetT> inline
-    void save( Archive & ar, SetT const & set )
-    {
-      ar( make_size_tag( static_cast<size_type>(set.size()) ) );
-
-      for( const auto & i : set )
-        ar( i );
-    }
-
-    //! @internal
-    template <class Archive, class SetT> inline
-    void load( Archive & ar, SetT & set )
-    {
-      size_type size;
-      ar( make_size_tag( size ) );
-
-      set.clear();
-
-      auto hint = set.begin();
-      for( size_type i = 0; i < size; ++i )
-      {
-        typename SetT::key_type key;
-
-        ar( key );
-        #ifdef CEREAL_OLDER_GCC
-        hint = set.insert( hint, std::move( key ) );
-        #else // NOT CEREAL_OLDER_GCC
-        hint = set.emplace_hint( hint, std::move( key ) );
-        #endif // NOT CEREAL_OLDER_GCC
-      }
-    }
-  }
-
-  //! Saving for std::set
-  template <class Archive, class K, class C, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::set<K, C, A> const & set )
-  {
-    set_detail::save( ar, set );
-  }
-
-  //! Loading for std::set
-  template <class Archive, class K, class C, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::set<K, C, A> & set )
-  {
-    set_detail::load( ar, set );
-  }
-
-  //! Saving for std::multiset
-  template <class Archive, class K, class C, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::multiset<K, C, A> const & multiset )
-  {
-    set_detail::save( ar, multiset );
-  }
-
-  //! Loading for std::multiset
-  template <class Archive, class K, class C, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::multiset<K, C, A> & multiset )
-  {
-    set_detail::load( ar, multiset );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_SET_HPP_
diff --git a/Src/External/cereal/include/cereal/types/stack.hpp b/Src/External/cereal/include/cereal/types/stack.hpp
deleted file mode 100644
index b69b660..0000000
--- a/Src/External/cereal/include/cereal/types/stack.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*! \file stack.hpp
-    \brief Support for types found in \<stack\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_STACK_HPP_
-#define CEREAL_TYPES_STACK_HPP_
-
-#include "cereal/cereal.hpp"
-#include <stack>
-
-// The default container for stack is deque, so let's include that too
-#include "cereal/types/deque.hpp"
-
-namespace cereal
-{
-  namespace stack_detail
-  {
-    //! Allows access to the protected container in stack
-    template <class T, class C> inline
-    C const & container( std::stack<T, C> const & stack )
-    {
-      struct H : public std::stack<T, C>
-      {
-        static C const & get( std::stack<T, C> const & s )
-        {
-          return s.*(&H::c);
-        }
-      };
-
-      return H::get( stack );
-    }
-  }
-
-  //! Saving for std::stack
-  template <class Archive, class T, class C> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::stack<T, C> const & stack )
-  {
-    ar( CEREAL_NVP_("container", stack_detail::container( stack )) );
-  }
-
-  //! Loading for std::stack
-  template <class Archive, class T, class C> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::stack<T, C> & stack )
-  {
-    C container;
-    ar( CEREAL_NVP_("container", container) );
-    stack = std::stack<T, C>( std::move( container ) );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_STACK_HPP_
diff --git a/Src/External/cereal/include/cereal/types/string.hpp b/Src/External/cereal/include/cereal/types/string.hpp
deleted file mode 100644
index e7488a9..0000000
--- a/Src/External/cereal/include/cereal/types/string.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*! \file string.hpp
-    \brief Support for types found in \<string\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_STRING_HPP_
-#define CEREAL_TYPES_STRING_HPP_
-
-#include "cereal/cereal.hpp"
-#include <string>
-
-namespace cereal
-{
-  //! Serialization for basic_string types, if binary data is supported
-  template<class Archive, class CharT, class Traits, class Alloc> inline
-  typename std::enable_if<traits::is_output_serializable<BinaryData<CharT>, Archive>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME(Archive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
-  {
-    // Save number of chars + the data
-    ar( make_size_tag( static_cast<size_type>(str.size()) ) );
-    ar( binary_data( str.data(), str.size() * sizeof(CharT) ) );
-  }
-
-  //! Serialization for basic_string types, if binary data is supported
-  template<class Archive, class CharT, class Traits, class Alloc> inline
-  typename std::enable_if<traits::is_input_serializable<BinaryData<CharT>, Archive>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME(Archive & ar, std::basic_string<CharT, Traits, Alloc> & str)
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-    str.resize(static_cast<std::size_t>(size));
-    ar( binary_data( const_cast<CharT *>( str.data() ), static_cast<std::size_t>(size) * sizeof(CharT) ) );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_STRING_HPP_
-
diff --git a/Src/External/cereal/include/cereal/types/tuple.hpp b/Src/External/cereal/include/cereal/types/tuple.hpp
deleted file mode 100644
index 7e56f0d..0000000
--- a/Src/External/cereal/include/cereal/types/tuple.hpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*! \file tuple.hpp
-    \brief Support for types found in \<tuple\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_TUPLE_HPP_
-#define CEREAL_TYPES_TUPLE_HPP_
-
-#include "cereal/cereal.hpp"
-#include <tuple>
-
-namespace cereal
-{
-  namespace tuple_detail
-  {
-    //! Creates a c string from a sequence of characters
-    /*! The c string created will alwas be prefixed by "tuple_element"
-        Based on code from: http://stackoverflow/a/20973438/710791
-        @internal */
-    template<char...Cs>
-    struct char_seq_to_c_str
-    {
-      static const int size = 14;// Size of array for the word: tuple_element
-      typedef const char (&arr_type)[sizeof...(Cs) + size];
-      static const char str[sizeof...(Cs) + size];
-    };
-
-    // the word tuple_element plus a number
-    //! @internal
-    template<char...Cs>
-    const char char_seq_to_c_str<Cs...>::str[sizeof...(Cs) + size] =
-      {'t','u','p','l','e','_','e','l','e','m','e','n','t', Cs..., '\0'};
-
-    //! Converts a number into a sequence of characters
-    /*! @tparam Q The quotient of dividing the original number by 10
-        @tparam R The remainder of dividing the original number by 10
-        @tparam C The sequence built so far
-        @internal */
-    template <size_t Q, size_t R, char ... C>
-    struct to_string_impl
-    {
-      using type = typename to_string_impl<Q/10, Q%10, R+'0', C...>::type;
-    };
-
-    //! Base case with no quotient
-    /*! @internal */
-    template <size_t R, char ... C>
-    struct to_string_impl<0, R, C...>
-    {
-      using type = char_seq_to_c_str<R+'0', C...>;
-    };
-
-    //! Generates a c string for a given index of a tuple
-    /*! Example use:
-        @code{cpp}
-        tuple_element_name<3>::c_str();// returns "tuple_element3"
-        @endcode
-        @internal */
-    template<size_t T>
-    struct tuple_element_name
-    {
-      using type = typename to_string_impl<T/10, T%10>::type;
-      static const typename type::arr_type c_str(){ return type::str; };
-    };
-
-    // unwinds a tuple to save it
-    //! @internal
-    template <size_t Height>
-    struct serialize
-    {
-      template <class Archive, class ... Types> inline
-      static void apply( Archive & ar, std::tuple<Types...> & tuple )
-      {
-        serialize<Height - 1>::template apply( ar, tuple );
-        ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(),
-            std::get<Height - 1>( tuple )) );
-      }
-    };
-
-    // Zero height specialization - nothing to do here
-    //! @internal
-    template <>
-    struct serialize<0>
-    {
-      template <class Archive, class ... Types> inline
-      static void apply( Archive &, std::tuple<Types...> & )
-      { }
-    };
-  }
-
-  //! Serializing for std::tuple
-  template <class Archive, class ... Types> inline
-  void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple )
-  {
-    tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_TUPLE_HPP_
diff --git a/Src/External/cereal/include/cereal/types/unordered_map.hpp b/Src/External/cereal/include/cereal/types/unordered_map.hpp
deleted file mode 100644
index 3b0f80b..0000000
--- a/Src/External/cereal/include/cereal/types/unordered_map.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*! \file unordered_map.hpp
-    \brief Support for types found in \<unordered_map\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_UNORDERED_MAP_HPP_
-#define CEREAL_TYPES_UNORDERED_MAP_HPP_
-
-#include "cereal/types/concepts/pair_associative_container.hpp"
-#include <unordered_map>
-
-#endif // CEREAL_TYPES_UNORDERED_MAP_HPP_
diff --git a/Src/External/cereal/include/cereal/types/unordered_set.hpp b/Src/External/cereal/include/cereal/types/unordered_set.hpp
deleted file mode 100644
index b86d8e5..0000000
--- a/Src/External/cereal/include/cereal/types/unordered_set.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*! \file unordered_set.hpp
-    \brief Support for types found in \<unordered_set\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_UNORDERED_SET_HPP_
-#define CEREAL_TYPES_UNORDERED_SET_HPP_
-
-#include "cereal/cereal.hpp"
-#include <unordered_set>
-
-namespace cereal
-{
-  namespace unordered_set_detail
-  {
-    //! @internal
-    template <class Archive, class SetT> inline
-    void save( Archive & ar, SetT const & set )
-    {
-      ar( make_size_tag( static_cast<size_type>(set.size()) ) );
-
-      for( const auto & i : set )
-        ar( i );
-    }
-
-    //! @internal
-    template <class Archive, class SetT> inline
-    void load( Archive & ar, SetT & set )
-    {
-      size_type size;
-      ar( make_size_tag( size ) );
-
-      set.clear();
-      set.reserve( static_cast<std::size_t>( size ) );
-
-      for( size_type i = 0; i < size; ++i )
-      {
-        typename SetT::key_type key;
-
-        ar( key );
-        set.emplace( std::move( key ) );
-      }
-    }
-  }
-
-  //! Saving for std::unordered_set
-  template <class Archive, class K, class H, class KE, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unordered_set<K, H, KE, A> const & unordered_set )
-  {
-    unordered_set_detail::save( ar, unordered_set );
-  }
-
-  //! Loading for std::unordered_set
-  template <class Archive, class K, class H, class KE, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unordered_set<K, H, KE, A> & unordered_set )
-  {
-    unordered_set_detail::load( ar, unordered_set );
-  }
-
-  //! Saving for std::unordered_multiset
-  template <class Archive, class K, class H, class KE, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::unordered_multiset<K, H, KE, A> const & unordered_multiset )
-  {
-    unordered_set_detail::save( ar, unordered_multiset );
-  }
-
-  //! Loading for std::unordered_multiset
-  template <class Archive, class K, class H, class KE, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::unordered_multiset<K, H, KE, A> & unordered_multiset )
-  {
-    unordered_set_detail::load( ar, unordered_multiset );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_UNORDERED_SET_HPP_
diff --git a/Src/External/cereal/include/cereal/types/utility.hpp b/Src/External/cereal/include/cereal/types/utility.hpp
deleted file mode 100644
index 076bea8..0000000
--- a/Src/External/cereal/include/cereal/types/utility.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*! \file utility.hpp
-    \brief Support for types found in \<utility\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_UTILITY_HPP_
-#define CEREAL_TYPES_UTILITY_HPP_
-
-#include "cereal/cereal.hpp"
-#include <utility>
-
-namespace cereal
-{
-  //! Serializing for std::pair
-  template <class Archive, class T1, class T2> inline
-  void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::pair<T1, T2> & pair )
-  {
-    ar( CEREAL_NVP_("first",  pair.first),
-        CEREAL_NVP_("second", pair.second) );
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_UTILITY_HPP_
diff --git a/Src/External/cereal/include/cereal/types/valarray.hpp b/Src/External/cereal/include/cereal/types/valarray.hpp
deleted file mode 100644
index dcc471d..0000000
--- a/Src/External/cereal/include/cereal/types/valarray.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*! \file valarray.hpp
-\brief Support for types found in \<valarray\>
-\ingroup STLSupport */
-
-/*
-Copyright (c) 2014, Randolph Voorhies, Shane Grant
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-* Neither the name of cereal nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef CEREAL_TYPES_VALARRAY_HPP_
-#define CEREAL_TYPES_VALARRAY_HPP_
-
-#include "cereal/cereal.hpp"
-#include <valarray>
-
-namespace cereal
-{
-  //! Saving for std::valarray arithmetic types, using binary serialization, if supported
-  template <class Archive, class T> inline
-  typename std::enable_if<traits::is_output_serializable<BinaryData<T>, Archive>::value
-                          && std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::valarray<T> const & valarray )
-  {
-    ar( make_size_tag( static_cast<size_type>(valarray.size()) ) ); // number of elements
-    ar( binary_data( &valarray[0], valarray.size() * sizeof(T) ) ); // &valarray[0] ok since guaranteed contiguous
-  }
-
-  //! Loading for std::valarray arithmetic types, using binary serialization, if supported
-  template <class Archive, class T> inline
-  typename std::enable_if<traits::is_input_serializable<BinaryData<T>, Archive>::value
-                          && std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::valarray<T> & valarray )
-  {
-    size_type valarraySize;
-    ar( make_size_tag( valarraySize ) );
-
-    valarray.resize( static_cast<std::size_t>( valarraySize ) );
-    ar( binary_data( &valarray[0], static_cast<std::size_t>( valarraySize ) * sizeof(T) ) );
-  }
-
-  //! Saving for std::valarray all other types
-  template <class Archive, class T> inline
-  typename std::enable_if<!traits::is_output_serializable<BinaryData<T>, Archive>::value
-                          || !std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::valarray<T> const & valarray )
-  {
-    ar( make_size_tag( static_cast<size_type>(valarray.size()) ) ); // number of elements
-    for(auto && v : valarray)
-      ar(v);
-  }
-
-  //! Loading for std::valarray all other types
-  template <class Archive, class T> inline
-  typename std::enable_if<!traits::is_input_serializable<BinaryData<T>, Archive>::value
-                          || !std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::valarray<T> & valarray )
-  {
-    size_type valarraySize;
-    ar( make_size_tag( valarraySize ) );
-
-    valarray.resize( static_cast<size_t>( valarraySize ) );
-    for(auto && v : valarray)
-      ar(v);
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_VALARRAY_HPP_
diff --git a/Src/External/cereal/include/cereal/types/vector.hpp b/Src/External/cereal/include/cereal/types/vector.hpp
deleted file mode 100644
index 8302cb9..0000000
--- a/Src/External/cereal/include/cereal/types/vector.hpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*! \file vector.hpp
-    \brief Support for types found in \<vector\>
-    \ingroup STLSupport */
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES OR SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TYPES_VECTOR_HPP_
-#define CEREAL_TYPES_VECTOR_HPP_
-
-#include "cereal/cereal.hpp"
-#include <vector>
-
-namespace cereal
-{
-  //! Serialization for std::vectors of arithmetic (but not bool) using binary serialization, if supported
-  template <class Archive, class T, class A> inline
-  typename std::enable_if<traits::is_output_serializable<BinaryData<T>, Archive>::value
-                          && std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::vector<T, A> const & vector )
-  {
-    ar( make_size_tag( static_cast<size_type>(vector.size()) ) ); // number of elements
-    ar( binary_data( vector.data(), vector.size() * sizeof(T) ) );
-  }
-
-  //! Serialization for std::vectors of arithmetic (but not bool) using binary serialization, if supported
-  template <class Archive, class T, class A> inline
-  typename std::enable_if<traits::is_input_serializable<BinaryData<T>, Archive>::value
-                          && std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::vector<T, A> & vector )
-  {
-    size_type vectorSize;
-    ar( make_size_tag( vectorSize ) );
-
-    vector.resize( static_cast<std::size_t>( vectorSize ) );
-    ar( binary_data( vector.data(), static_cast<std::size_t>( vectorSize ) * sizeof(T) ) );
-  }
-
-  //! Serialization for non-arithmetic vector types
-  template <class Archive, class T, class A> inline
-  typename std::enable_if<!traits::is_output_serializable<BinaryData<T>, Archive>::value
-                          || !std::is_arithmetic<T>::value, void>::type
-  CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::vector<T, A> const & vector )
-  {
-    ar( make_size_tag( static_cast<size_type>(vector.size()) ) ); // number of elements
-    for(auto && v : vector)
-      ar( v );
-  }
-
-  //! Serialization for non-arithmetic vector types
-  template <class Archive, class T, class A> inline
-  typename std::enable_if<!traits::is_input_serializable<BinaryData<T>, Archive>::value
-                          || !std::is_arithmetic<T>::value, void>::type
-  CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::vector<T, A> & vector )
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-
-    vector.resize( static_cast<std::size_t>( size ) );
-    for(auto && v : vector)
-      ar( v );
-  }
-
-  //! Serialization for bool vector types
-  template <class Archive, class A> inline
-  void CEREAL_SAVE_FUNCTION_NAME( Archive & ar, std::vector<bool, A> const & vector )
-  {
-    ar( make_size_tag( static_cast<size_type>(vector.size()) ) ); // number of elements
-    for(auto && v : vector)
-      ar( static_cast<bool>(v) );
-  }
-
-  //! Serialization for bool vector types
-  template <class Archive, class A> inline
-  void CEREAL_LOAD_FUNCTION_NAME( Archive & ar, std::vector<bool, A> & vector )
-  {
-    size_type size;
-    ar( make_size_tag( size ) );
-
-    vector.resize( static_cast<std::size_t>( size ) );
-    for(auto && v : vector)
-    {
-      bool b;
-      ar( b );
-      v = b;
-    }
-  }
-} // namespace cereal
-
-#endif // CEREAL_TYPES_VECTOR_HPP_
diff --git a/Src/External/cereal/sandbox/CMakeLists.txt b/Src/External/cereal/sandbox/CMakeLists.txt
deleted file mode 100644
index 52c8df8..0000000
--- a/Src/External/cereal/sandbox/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-add_subdirectory(sandbox_shared_lib)
-
-add_executable(sandbox sandbox.cpp)
-add_executable(sandbox_json sandbox_json.cpp)
-add_executable(sandbox_rtti sandbox_rtti.cpp)
-
-add_executable(sandbox_vs sandbox_vs.cpp)
-target_link_libraries(sandbox_vs sandbox_vs_dll)
-include_directories(sandbox_shared_lib)
-
-if(Boost_FOUND)
-  add_executable(performance performance.cpp)
-  if(MSVC)
-    set_target_properties(performance PROPERTIES COMPILE_DEFINITIONS "BOOST_SERIALIZATION_DYN_LINK")
-  endif()
-  target_link_libraries(performance ${Boost_LIBRARIES})
-endif(Boost_FOUND)
diff --git a/Src/External/cereal/sandbox/performance.cpp b/Src/External/cereal/sandbox/performance.cpp
deleted file mode 100644
index e5d61f0..0000000
--- a/Src/External/cereal/sandbox/performance.cpp
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifdef _MSC_VER
-#  pragma warning(push)
-#  pragma warning(disable : 4244 4267)
-#endif
-
-#include <sstream>
-#include <iostream>
-#include <chrono>
-#include <random>
-
-#include <boost/format.hpp>
-
-#include <boost/serialization/serialization.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/serialization/map.hpp>
-#include <boost/serialization/string.hpp>
-#include <boost/serialization/base_object.hpp>
-
-#include <cereal/archives/binary.hpp>
-#include <cereal/types/vector.hpp>
-#include <cereal/types/string.hpp>
-#include <cereal/types/map.hpp>
-
-//! Runs serialization to save data to an ostringstream
-/*! Used to time how long it takes to save data to an ostringstream.
-    Everything that happens within the save function will be timed, including
-    any set-up necessary to perform the serialization.
-
-    @param data The data to save
-    @param saveFunction A function taking in an ostringstream and the data and returning void
-    @return The ostringstream and the time it took to save the data */
-template <class T>
-std::chrono::nanoseconds
-saveData( T const & data, std::function<void(std::ostringstream &, T const&)> saveFunction, std::ostringstream & os )
-{
-  auto start = std::chrono::high_resolution_clock::now();
-  saveFunction( os, data );
-  return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - start );
-}
-
-//! Runs serialization to load data to from an istringstream
-/*! Used to time how long it takes to load data from an istringstream.
-    Everything that happens within the load function will be timed, including
-    any set-up necessary to perform the serialization.
-
-    @param dataStream The saved data stream
-    @param loadFunction A function taking in an istringstream and a data reference and returning void
-    @return The loaded data and the time it took to save the data */
-template <class T>
-std::pair<T, std::chrono::nanoseconds>
-loadData( std::ostringstream const & dataStream, std::function<void(std::istringstream &, T &)> loadFunction )
-{
-  T data;
-  std::istringstream os( dataStream.str() );
-
-  auto start = std::chrono::high_resolution_clock::now();
-  loadFunction( os, data );
-
-  return {data, std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now() - start )};
-}
-
-struct cerealBinary
-{
-  //! Saves data to a cereal binary archive
-  template <class T>
-  static void save( std::ostringstream & os, T const & data )
-  {
-    cereal::BinaryOutputArchive oar(os);
-    oar(data);
-  }
-
-  //! Loads data to a cereal binary archive
-  template <class T>
-  static void load( std::istringstream & is, T & data )
-  {
-    cereal::BinaryInputArchive iar(is);
-    iar(data);
-  }
-};
-
-struct boostBinary
-{
-  //! Saves data to a boost binary archive
-  template <class T>
-  static void save( std::ostringstream & os, T const & data )
-  {
-    boost::archive::binary_oarchive oar(os);
-    oar & data;
-  }
-
-  //! Loads data to a boost binary archive
-  template <class T>
-  static void load( std::istringstream & is, T & data )
-  {
-    boost::archive::binary_iarchive iar(is);
-    iar & data;
-  }
-};
-
-struct binary
-{
-  typedef boostBinary  boost;
-  typedef cerealBinary cereal;
-};
-
-//! Times how long it takes to serialize (load and store) some data
-/*! Times how long and the size of the serialization object used to serialize
-    some data.  Result is output to standard out.
-
-    @tparam SerializationT The serialization struct that has all save and load functions
-    @tparam DataTCereal The type of data to test for cereal
-    @tparam DataTBoost The type of data to test for boost
-    @param name The name for this test
-    @param data The data to serialize for cereal
-    @param data The data to serialize for boost
-    @param numAverages The number of times to average
-    @param validateData Whether data should be validated (input == output) */
-template <class SerializationT, class DataTCereal, class DataTBoost>
-void test( std::string const & name,
-            DataTCereal const & dataC,
-            DataTBoost const & dataB,
-            size_t numAverages = 100,
-            bool validateData = false );
-
-template <class SerializationT, class DataTCereal, class DataTBoost>
-void test( std::string const & name,
-            DataTCereal const & dataC,
-            DataTBoost const & dataB,
-            size_t numAverages,
-            bool /*validateData*/ )
-{
-  std::cout << "-----------------------------------" << std::endl;
-  std::cout << "Running test: " << name << std::endl;
-
-  std::chrono::nanoseconds totalBoostSave{0};
-  std::chrono::nanoseconds totalBoostLoad{0};
-
-  std::chrono::nanoseconds totalCerealSave{0};
-  std::chrono::nanoseconds totalCerealLoad{0};
-
-  size_t boostSize = 0;
-  size_t cerealSize = 0;
-
-  for(size_t i = 0; i < numAverages; ++i)
-  {
-    // Boost
-    {
-      std::ostringstream os;
-      auto saveResult = saveData<DataTBoost>( dataB, {SerializationT::boost::template save<DataTBoost>}, os );
-      totalBoostSave += saveResult;
-      if(!boostSize)
-        boostSize = os.tellp();
-
-      auto loadResult = loadData<DataTBoost>( os, {SerializationT::boost::template load<DataTBoost>} );
-      totalBoostLoad += loadResult.second;
-    }
-
-    // Cereal
-    {
-      std::ostringstream os;
-      auto saveResult = saveData<DataTCereal>( dataC, {SerializationT::cereal::template save<DataTCereal>}, os );
-      totalCerealSave += saveResult;
-      if(!cerealSize)
-        cerealSize = os.tellp();
-
-      auto loadResult = loadData<DataTCereal>( os, {SerializationT::cereal::template load<DataTCereal>} );
-      totalCerealLoad += loadResult.second;
-    }
-  }
-
-  // Averages
-  double averageBoostSave = std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostSave).count() / static_cast<double>( numAverages );
-  double averageBoostLoad = std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostLoad).count() / static_cast<double>( numAverages );
-
-  double averageCerealSave = std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealSave).count() / static_cast<double>( numAverages );
-  double averageCerealLoad = std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealLoad).count() / static_cast<double>( numAverages );
-
-  // Percentages relative to boost
-  double cerealSaveP = averageCerealSave / averageBoostSave;
-  double cerealLoadP = averageCerealLoad / averageBoostLoad;
-  double cerealSizeP = cerealSize / static_cast<double>( boostSize );
-
-  std::cout << "  Boost results:" << std::endl;
-  std::cout << boost::format("\tsave | time: %06.4fms (%1.2f) size: %20.8fkb (%1.8f) total: %6.1fms")
-    % averageBoostSave % 1.0 % (boostSize / 1024.0) % 1.0 % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostSave).count() );
-  std::cout << std::endl;
-  std::cout << boost::format("\tload | time: %06.4fms (%1.2f) total: %6.1fms")
-    % averageBoostLoad % 1.0 % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalBoostLoad).count() );
-  std::cout << std::endl;
-
-  std::cout << "  Cereal results:" << std::endl;
-  std::cout << boost::format("\tsave | time: %06.4fms (%1.2f) size: %20.8fkb (%1.8f) total: %6.1fms")
-    % averageCerealSave % cerealSaveP % (cerealSize / 1024.0) % cerealSizeP % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealSave).count() );
-  std::cout << std::endl;
-  std::cout << boost::format("\tload | time: %06.4fms (%1.2f) total: %6.1fms")
-    % averageCerealLoad % cerealLoadP % static_cast<double>( std::chrono::duration_cast<std::chrono::milliseconds>(totalCerealLoad).count() );
-  std::cout << std::endl;
-}
-
-template <class SerializationT, class DataT>
-void test( std::string const & name,
-            DataT const & data,
-            size_t numAverages = 100,
-            bool validateData = false )
-{
-  return test<SerializationT, DataT, DataT>( name, data, data, numAverages, validateData );
-}
-
-template<class T>
-typename std::enable_if<std::is_floating_point<T>::value, T>::type
-random_value(std::mt19937 & gen)
-{ return std::uniform_real_distribution<T>(-10000.0, 10000.0)(gen); }
-
-template<class T>
-typename std::enable_if<std::is_integral<T>::value && sizeof(T) != sizeof(char), T>::type
-random_value(std::mt19937 & gen)
-{ return std::uniform_int_distribution<T>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen); }
-
-template<class T>
-typename std::enable_if<std::is_integral<T>::value && sizeof(T) == sizeof(char), T>::type
-random_value(std::mt19937 & gen)
-{ return static_cast<T>( std::uniform_int_distribution<int64_t>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen) ); }
-
-template<class T>
-typename std::enable_if<std::is_same<T, std::string>::value, std::string>::type
-random_value(std::mt19937 & gen)
-{
-  std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
-  for(char & c : s)
-    c = std::uniform_int_distribution<char>(' ', '~')(gen);
-  return s;
-}
-
-template<class C>
-std::basic_string<C> random_basic_string(std::mt19937 & gen, size_t maxSize = 30)
-{
-  std::basic_string<C> s(std::uniform_int_distribution<int>(3, maxSize)(gen), ' ');
-  for(C & c : s)
-    c = static_cast<C>( std::uniform_int_distribution<int>( '~', '~' )(gen) );
-  return s;
-  return s;
-}
-
-template <size_t N>
-std::string random_binary_string(std::mt19937 & gen)
-{
-  std::string s(N, ' ');
-  for(auto & c : s )
-    c = std::uniform_int_distribution<char>('0', '1')(gen);
-  return s;
-}
-
-struct PoDStructCereal
-{
-  int32_t a;
-  int64_t b;
-  float c;
-  double d;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar(a, b, c, d);
-  }
-};
-
-struct PoDStructBoost
-{
-  int32_t a;
-  int64_t b;
-  float c;
-  double d;
-
-  template <class Archive>
-  void serialize( Archive & ar, const unsigned int /*version*/ )
-  {
-    ar & a & b & c & d;
-  }
-};
-
-struct PoDChildCereal : virtual PoDStructCereal
-{
-  PoDChildCereal() : v(1024)
-  { }
-
-  std::vector<float> v;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( cereal::virtual_base_class<PoDStructCereal>(this), v );
-  }
-};
-
-struct PoDChildBoost : virtual PoDStructBoost
-{
-  PoDChildBoost() : v(1024)
-  { }
-
-  std::vector<float> v;
-
-  template <class Archive>
-  void serialize( Archive & ar, const unsigned int /*version*/ )
-  {
-    ar & boost::serialization::base_object<PoDStructBoost>(*this);
-    ar & v;
-  }
-};
-
-int main()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-  auto rngC = [&](){ return random_value<uint8_t>(gen); };
-  auto rngD = [&](){ return random_value<double>(gen); };
-  const bool randomize = false;
-
-  //########################################
-  auto vectorDoubleTest = [&](size_t s, bool randomize_)
-  {
-    std::ostringstream name;
-    name << "Vector(double) size " << s;
-
-    std::vector<double> data(s);
-    if(randomize_)
-      for( auto & d : data )
-        d = rngD();
-
-    test<binary>( name.str(), data );
-  };
-
-  vectorDoubleTest(1, randomize); // 8B
-  vectorDoubleTest(16, randomize); // 128B
-  vectorDoubleTest(1024, randomize); // 8KB
-  vectorDoubleTest(1024*1024, randomize); // 8MB
-
-  //########################################
-  auto vectorCharTest = [&](size_t s, bool randomize_)
-  {
-    std::ostringstream name;
-    name << "Vector(uint8_t) size " << s;
-
-    std::vector<uint8_t> data(s);
-    if(randomize_)
-      for( auto & d : data )
-        d = rngC();
-
-    test<binary>( name.str(), data );
-  };
-
-  vectorCharTest(1024*1024*64, randomize);
-
-  //########################################
-  auto vectorPoDStructTest = [&](size_t s)
-  {
-    std::ostringstream name;
-    name << "Vector(PoDStruct) size " << s;
-
-    std::vector<PoDStructCereal> dataC(s);
-    std::vector<PoDStructBoost> dataB(s);
-    test<binary>( name.str(), dataC, dataB );
-  };
-
-  vectorPoDStructTest(1);
-  vectorPoDStructTest(64);
-  vectorPoDStructTest(1024);
-  vectorPoDStructTest(1024*1024);
-  vectorPoDStructTest(1024*1024*2);
-
-  //########################################
-  auto vectorPoDChildTest = [&](size_t s)
-  {
-    std::ostringstream name;
-    name << "Vector(PoDChild) size " << s;
-
-    std::vector<PoDChildCereal> dataC(s);
-    std::vector<PoDChildBoost> dataB(s);
-    test<binary>( name.str(), dataC, dataB );
-  };
-
-  vectorPoDChildTest(1024);
-  vectorPoDChildTest(1024*32);
-
-  //########################################
-  auto stringTest = [&](size_t s)
-  {
-    std::ostringstream name;
-    name << "String size " << s;
-
-    std::string data = random_basic_string<char>(gen, s);
-    std::cout << "data.size " << data.size() << std::endl;
-    test<binary>( name.str(), data );
-  };
-
-  stringTest(200000);
-  stringTest(2000000);
-  stringTest(20000000);
-
-  //########################################
-  auto vectorStringTest = [&](size_t s)
-  {
-    std::ostringstream name;
-    name << "Vector(String) size " << s;
-
-    std::vector<std::string> data(s);
-    for(size_t i=0; i<data.size(); ++i)
-      data[i] = random_basic_string<char>(gen);
-
-    test<binary>( name.str(), data );
-  };
-
-  vectorStringTest(512);
-  vectorStringTest(1024);
-  vectorStringTest(1024*64);
-  vectorStringTest(1024*128);
-
-  //########################################
-  auto mapPoDStructTest = [&](size_t s)
-  {
-    std::ostringstream name;
-    name << "Map(PoDStruct) size " <<s;
-
-    std::map<std::string, PoDStructCereal> mC;
-    std::map<std::string, PoDStructBoost> mB;
-    for(size_t i=0; i<s; ++i)
-    {
-      mC[std::to_string( i )] = PoDStructCereal();
-      mB[std::to_string( i )] = PoDStructBoost();
-    }
-    test<binary>(name.str(), mC, mB);
-  };
-
-  mapPoDStructTest(1024);
-  mapPoDStructTest(1024*64);
-
-  return 0;
-}
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/Src/External/cereal/sandbox/sandbox.cpp b/Src/External/cereal/sandbox/sandbox.cpp
deleted file mode 100644
index af28b22..0000000
--- a/Src/External/cereal/sandbox/sandbox.cpp
+++ /dev/null
@@ -1,820 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <cereal/cereal.hpp>
-#include <cereal/archives/binary.hpp>
-#include <cereal/archives/portable_binary.hpp>
-#include <cereal/archives/xml.hpp>
-
-#include <cereal/types/string.hpp>
-#include <cereal/types/utility.hpp>
-#include <cereal/types/memory.hpp>
-#include <cereal/types/complex.hpp>
-#include <cereal/types/base_class.hpp>
-#include <cereal/types/array.hpp>
-#include <cereal/types/vector.hpp>
-#include <cereal/types/map.hpp>
-#include <cereal/types/utility.hpp>
-#include <cereal/types/bitset.hpp>
-#include <cereal/types/polymorphic.hpp>
-
-//#include <cxxabi.h>
-#include <sstream>
-#include <fstream>
-#include <cassert>
-#include <complex>
-#include <iostream>
-#include <random>
-
-class Base
-{
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void serialize( Archive & ar )
-    {
-      std::cout << "Base serialize" << std::endl;
-      ar( x );
-    }
-
-    virtual void foo() = 0;
-
-  public:
-    int x;
-};
-
-class Derived : public Base
-{
-  public:
-    using Base::x;
-    Derived() : Base(), y() {}
-    Derived( int d, int b )
-    {
-      y = d;
-      x = b;
-    }
-
-    template <class Archive>
-    void save( Archive & ar ) const
-    {
-      ar( cereal::virtual_base_class<Base>(this) );
-      std::cout << "Derived save" << std::endl;
-      ar( y );
-    }
-
-    template <class Archive>
-    void load( Archive & ar )
-    {
-      ar( cereal::virtual_base_class<Base>(this) );
-      std::cout << "Derived load" << std::endl;
-      ar( y );
-    }
-
-    void foo() {}
-
-    int y;
-};
-
-namespace cereal
-{
-  template <class Archive> struct specialize<Archive, Derived, cereal::specialization::member_load_save> {};
-}
-
-CEREAL_REGISTER_TYPE(Derived)
-
-// ###################################
-struct Test1
-{
-  int a;
-
-  private:
-    friend class cereal::access;
-    template<class Archive>
-    void serialize(Archive & ar)
-    {
-      ar(CEREAL_NVP(a));
-    }
-};
-
-// ###################################
-class Test2
-{
-  public:
-    Test2() {}
-    Test2( int x ) : a( x ) {}
-    int a;
-
-  private:
-    friend class cereal::access;
-
-    template<class Archive>
-      void save(Archive & ar) const
-      {
-        ar(a);
-      }
-
-    template<class Archive>
-      void load(Archive & ar)
-      {
-        ar(a);
-      }
-};
-
-// ###################################
-struct Test3
-{
-  int a;
-};
-
-template<class Archive>
-void serialize(Archive & ar, Test3 & t)
-{
-  ar(CEREAL_NVP(t.a));
-}
-
-namespace test4
-{
-  // ###################################
-  struct Test4
-  {
-    int a;
-  };
-
-  template<class Archive>
-  void save(Archive & ar, Test4 const & t)
-  {
-    ar(CEREAL_NVP(t.a));
-  }
-
-  template<class Archive>
-  void load(Archive & ar, Test4 & t)
-  {
-    ar(CEREAL_NVP(t.a));
-  }
-}
-
-class Private
-{
-  public:
-    Private() : a('z') {}
-
-  private:
-    char a;
-
-    friend class cereal::access;
-
-    template<class Archive>
-      void serialize(Archive & ar)
-      {
-        ar(a);
-      }
-};
-
-struct Everything
-{
-  int x;
-  int y;
-  Test1 t1;
-  Test2 t2;
-  Test3 t3;
-  test4::Test4 t4;
-  std::string s;
-
-  template<class Archive>
-  void serialize(Archive & ar)
-  {
-    ar(CEREAL_NVP(x));
-    ar(CEREAL_NVP(y));
-    ar(CEREAL_NVP(t1));
-    ar(CEREAL_NVP(t2));
-    ar(CEREAL_NVP(t3));
-    ar(CEREAL_NVP(t4));
-    ar(CEREAL_NVP(s));
-  }
-
-  bool operator==(Everything const & o)
-  {
-    return
-      x == o.x &&
-      y == o.y &&
-      t1.a == o.t1.a &&
-      t2.a == o.t2.a &&
-      t3.a == o.t3.a &&
-      t4.a == o.t4.a &&
-      s == o.s;
-  }
-};
-
-struct EmptyStruct
-{
-  template<class Archive>
-  void serialize(Archive &)
-  {
-    std::cout << "Side effects!" << std::endl;
-  }
-};
-
-struct NonEmptyStruct
-{
-  int x, y, z;
-};
-
-struct NoDefaultCtor
-{
-private:
-  NoDefaultCtor() {};
-  int z;
-  NoDefaultCtor( int x, bool ) :y(x) {}
-public:
-  NoDefaultCtor(int x) : y(x)
-  { }
-
-  friend class cereal::access;
-
-  int y;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( y );
-  }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<NoDefaultCtor> & construct )
-  {
-    int yy;
-    ar( yy );
-    construct( yy, true );
-    construct->z = 33;
-    construct.ptr()->z = 33;
-  }
-};
-
-//namespace cereal
-//{
-//  template <>
-//  struct LoadAndConstruct<NoDefaultCtor>
-//  {
-//    template <class Archive>
-//    static void load_and_construct( Archive & ar, cereal::construct<NoDefaultCtor> & construct )
-//    {
-//      int y;
-//      ar( y );
-//      construct( y );
-//    }
-//  };
-//}
-
-struct unordered_naming
-{
-  int x;
-  int y;
-  int z;
-
-  template <class Archive>
-  void save( Archive & ar ) const
-  {
-    ar( CEREAL_NVP(x),
-        CEREAL_NVP(z),
-        CEREAL_NVP(y) );
-  }
-
-  template <class Archive>
-  void load( Archive & ar )
-  {
-    ar( x,
-        CEREAL_NVP(y),
-        CEREAL_NVP(z) );
-  }
-
-  bool operator==( unordered_naming const & other ) const
-  {
-    return x == other.x && y == other.y && z == other.z;
-  }
-};
-
-std::ostream& operator<<(std::ostream& os, unordered_naming const & s)
-{
-  os << "[x: " << s.x << " y: " << s.y << " z: " << s.z << "]";
-  return os;
-}
-
-template <class IArchive, class OArchive>
-void test_unordered_loads()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rngI = [](){ return 1; };
-  auto rngF = [](){ return 2.0f; };
-  auto rngD = [](){ return 3.2; };
-
-  for(int i=0; i<100; ++i)
-  {
-    auto const name1 = "1";
-    auto const name2 = "2";
-    auto const name3 = "3";
-    auto const name4 = "4";
-    auto const name5 = "5";
-    auto const name6 = "6";
-    auto const name7 = "7";
-
-    int o_int1 = rngI();
-    double o_double2 = rngD();
-    std::vector<bool> o_vecbool3 = { true, false, true, false, true };
-    int o_int4 = rngI();
-    int o_int5 = rngI();
-    int o_int6 = rngI();
-    std::pair<float, unordered_naming> o_un7;
-    o_un7.first = rngF();
-    o_un7.second.x = rngI();
-    o_un7.second.y = rngI();
-    o_un7.second.z = rngI();
-
-    {
-      std::ofstream os("test.xml");
-      OArchive oar(os);
-
-      oar( cereal::make_nvp( name1, o_int1 ),
-           cereal::make_nvp( name2, o_double2 ),
-           cereal::make_nvp( name3, o_vecbool3 ),
-           cereal::make_nvp( name4, o_int4 ),
-           cereal::make_nvp( name5, o_int5 ),
-           cereal::make_nvp( name6, o_int6 ),
-           cereal::make_nvp( name7, o_un7 ) );
-    }
-
-    decltype(o_int1) i_int1;
-    decltype(o_double2) i_double2;
-    decltype(o_vecbool3) i_vecbool3;
-    decltype(o_int4) i_int4;
-    decltype(o_int5) i_int5;
-    decltype(o_int6) i_int6;
-    decltype(o_un7) i_un7;
-
-    std::ifstream is("test.xml");
-    {
-      IArchive iar(is);
-
-      iar( cereal::make_nvp( name7, o_un7 ),
-           cereal::make_nvp( name2, i_double2 ),
-           cereal::make_nvp( name4, i_int4 ),
-           cereal::make_nvp( name3, i_vecbool3 ),
-           cereal::make_nvp( name1, i_int1 ),
-           cereal::make_nvp( name5, i_int5 ),
-           i_int6 );
-    }
-  }
-}
-
-class BoostTransitionMS
-{
-  public:
-    BoostTransitionMS() {}
-    BoostTransitionMS( int xx ) : x(xx) {}
-
-    int getX(){ return x; }
-    void setX( int xx ){ x = xx; }
-
-  private:
-    friend class cereal::access;
-    int x;
-
-    template <class Archive>
-    void serialize( Archive & ar, const std::uint32_t /*version*/ )
-    { ar( x ); }
-};
-
-class BoostTransitionSplit
-{
-  public:
-    BoostTransitionSplit() {}
-    BoostTransitionSplit( int xx ) : x(xx) {}
-
-    int getX(){ return x; }
-    void setX( int xx ){ x = xx; }
-
-  private:
-    friend class cereal::access;
-    int x;
-
-    template <class Archive>
-    void save( Archive & ar, const std::uint32_t /*version*/ ) const
-    { ar( x ); }
-
-    template <class Archive>
-    void load( Archive & ar, const std::uint32_t /*version*/ )
-    { ar( x ); }
-};
-
-class BoostTransitionNMS
-{
-  public:
-    BoostTransitionNMS() {}
-    BoostTransitionNMS( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void serialize( Archive & ar, BoostTransitionNMS & bnms, const std::uint32_t version )
-{ ar( bnms.x ); std::cout << "NMS version: " << version << std::endl; }
-
-struct BoostTransitionNMSplit
-{
-  public:
-    BoostTransitionNMSplit() {}
-    BoostTransitionNMSplit( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void save( Archive & ar, BoostTransitionNMSplit const & bnsplit, const std::uint32_t version )
-{ ar( bnsplit.x ); std::cout << "NMsave version: " << version << std::endl; }
-
-template <class Archive>
-void load( Archive & ar, BoostTransitionNMSplit & bnsplit, const std::uint32_t version )
-{ ar( bnsplit.x ); std::cout << "NMload version: " << version << std::endl; }
-
-// ######################################################################
-int main()
-{
-  std::cout << std::boolalpha << std::endl;
-
-  Everything e_out;
-  e_out.x = 99;
-  e_out.y = 100;
-  e_out.t1 = {1};
-  e_out.t2 = {2};
-  e_out.t3 = {3};
-  e_out.t4 = {4};
-  e_out.s = "Hello, World!";
-  std::unique_ptr<NoDefaultCtor> nodefault( new NoDefaultCtor( 3 ) );
-
-  Test2 t2 = {22};
-
-  {
-    std::ofstream os("out.txt", std::ios::binary);
-    cereal::BinaryOutputArchive archive(os);
-    archive(CEREAL_NVP(e_out));
-    archive(t2);
-    archive(nodefault);
-  }
-
-  Everything e_in;
-
-  std::unique_ptr<NoDefaultCtor> nodefaultin( new NoDefaultCtor( 1 ) );
-
-  {
-    std::ifstream is("out.txt", std::ios::binary);
-    cereal::BinaryInputArchive archive(is);
-    archive(CEREAL_NVP(e_in));
-    archive(t2);
-    archive(nodefaultin);
-    std::remove("out.txt");
-  }
-
-  assert(e_in == e_out);
-  assert(nodefault->y == nodefaultin->y);
-
-  {
-    cereal::BinaryOutputArchive archive(std::cout);
-    int xxx[] = {-1, 95, 3};
-    archive( xxx );
-
-    cereal::XMLOutputArchive archive2(std::cout, cereal::XMLOutputArchive::Options(std::numeric_limits<double>::max_digits10, true, true));
-    archive2( xxx );
-
-    std::vector<int> yyy = {1, 2, 3};
-    archive2( yyy );
-
-    archive2.saveBinaryValue( xxx, sizeof(int)*3 );
-  }
-
-  {
-    std::ofstream os("out.xml");
-    cereal::XMLOutputArchive oar( os );
-    //cereal::XMLOutputArchive oar( std::cout );
-
-    oar( cereal::make_nvp("hello", 5 ) );
-
-    std::string bla("bla");
-    oar( bla );
-
-    auto intptr = std::make_shared<int>(99);
-    oar( CEREAL_NVP(intptr) );
-
-    std::map<std::string, int> map1 =
-    {
-      {"one",   1},
-      {"two",   2},
-      {"three", 3}
-    };
-
-    oar( CEREAL_NVP(map1) );
-
-    int x = 3;
-    oar( CEREAL_NVP(x) );
-    oar( 5 );
-    oar( 3.3 );
-    oar( 3.2f );
-    oar( true );
-
-    std::array<int,5> arr = {{1, 2, 3, 4, 5}};
-    oar( arr );
-
-    std::vector<std::string> vec = {"hey",
-                                    "there",
-                                    "buddy"};
-
-    std::vector<std::vector<std::string>> vec2 = {vec, vec, vec};
-
-    oar( cereal::make_nvp("EVERYTHING", e_out) );
-    oar( vec );
-    oar( vec2 );
-
-    int xxx[] = {-1, 95, 3};
-    oar.saveBinaryValue( xxx, sizeof(int)*3, "xxxbinary" );
-    //oar.saveBinaryValue( xxx, sizeof(int)*3 );
-
-    std::unique_ptr<Derived> d1( new Derived(3, 4) );
-    std::unique_ptr<Base> d2( new Derived(4, 5) );
-    std::shared_ptr<Base> d3( new Derived(5, 6) );
-    oar( d1 );
-    oar( d2 );
-    oar( d3 );
-  }
-
-  {
-    std::ifstream is("out.xml");
-    cereal::XMLInputArchive iar( is );
-
-    int hello;
-    iar( cereal::make_nvp("hello", hello) );
-    assert( hello == 5 );
-
-    std::string bla;
-    iar( bla );
-    assert( bla == "bla" );
-
-    std::shared_ptr<int> intptr;
-    iar( CEREAL_NVP(intptr) );
-    assert( *intptr == 99 );
-
-    std::map<std::string, int> map1;
-
-    iar( CEREAL_NVP(map1) );
-    assert( map1["one"]   == 1 );
-    assert( map1["two"]   == 2 );
-    assert( map1["three"] == 3 );
-
-
-    int x;
-    iar( CEREAL_NVP(x) );
-    assert( x == 3 );
-
-    int x5;
-    iar( x5 );
-    assert( x5 == 5 );
-
-    double x33;
-    iar( x33 );
-    assert( x33 == 3.3 );
-
-    float x32;
-    iar( x32 );
-    assert( x32 == 3.2f );
-
-    bool xtrue;
-    iar( xtrue );
-    assert( xtrue == true );
-
-    std::array<int,5> arr;
-    iar( arr );
-    for( int i = 0; i < 5; ++i )
-      assert( arr[i] == (i+1) );
-
-    Everything e;
-    iar( cereal::make_nvp("EVERYTHING", e) );
-    assert( e == e_out );
-
-    std::vector<std::string> vec;
-    iar( vec );
-    assert( vec[0] == "hey" );
-    assert( vec[1] == "there" );
-    assert( vec[2] == "buddy" );
-
-    std::vector<std::vector<std::string>> vec2;
-    iar( vec2 );
-    for( auto & v : vec2 )
-    {
-      assert( v[0] == "hey" );
-      assert( v[1] == "there" );
-      assert( v[2] == "buddy" );
-    }
-
-    int xxx[3];
-    iar.loadBinaryValue( xxx, sizeof(int)*3 );
-    assert( xxx[0] == -1 );
-    assert( xxx[1] == 95 );
-    assert( xxx[2] == 3 );
-
-    std::unique_ptr<Derived> d1;
-    std::unique_ptr<Base> d2;
-    std::shared_ptr<Base> d3;
-
-    iar( d1 );
-    assert( d1->x == 4 && d1->y == 3 );
-    iar( d2 );
-    assert( dynamic_cast<Derived*>(d2.get())->x == 5 && dynamic_cast<Derived*>(d2.get())->y == 4 );
-    iar( d3 );
-    assert( dynamic_cast<Derived*>(d3.get())->x == 6 && dynamic_cast<Derived*>(d3.get())->y == 5 );
-  }
-
-  {
-    std::ofstream b("endian.out", std::ios::binary);
-    cereal::PortableBinaryOutputArchive oar(b);
-
-    bool bb = true;
-    char a = 'a';
-    int x = 1234;
-    float y = 1.324f;
-    double z = 3.1452;
-    long double d = 1.123451234512345;
-    long long j = 2394873298472343;
-
-    oar( bb, a, x, y, z, d, j );
-    std::cout << bb << " " << a << " " << x << " " << y << " " << z << " " << d << " " << j << std::endl;
-    // valgrind will complain about uninitialized bytes here - seems to be the padding caused by the long double and
-    // long long allocations (this padding just exists on the stack and is never used anywhere)
-    // see https://bugs.kde.org/show_bug.cgi?id=197915
-  }
-  {
-    std::ifstream b("endian.out", std::ios::binary);
-    cereal::PortableBinaryInputArchive iar(b);
-
-    bool bb;
-    char a;
-    int x;
-    float y;
-    double z;
-    long double d;
-    long long j;
-
-    iar( bb, a, x, y, z, d, j );
-
-    std::cout << bb << " " << a << " " << x << " " << y << " " << z << " " << d << " " << j << std::endl;
-
-    std::remove("endian.out");
-  }
-
-  {
-    std::ofstream ss("xml_ordering.out");
-    cereal::XMLOutputArchive ar(ss);
-
-    double one = 1;
-    double two = 2;
-    double three = 3;
-    std::vector<int> four = {1, 2, 3, 4};
-
-    // Output is ordered 3 2 1 4
-    ar( three, CEREAL_NVP(two), one, cereal::make_nvp("five", four) );
-  }
-
-  {
-    std::ifstream ss("xml_ordering.out");
-    cereal::XMLInputArchive ar(ss);
-
-    // Output prodered out of order, try to load in order 1 2 3 4
-    double one;
-    double two;
-    double three;
-    std::vector<int> four;
-
-    ar( one ); // cereal can only give warnings if you used an NVP!
-    ar( CEREAL_NVP( two ) );
-    ar( three );
-
-    try
-    {
-      ar( CEREAL_NVP( three ) );
-    }
-    catch( cereal::Exception const & e )
-    {
-      std::cout << e.what() << std::endl;
-      std::cout << "Looked for three but we didn't use an NVP when saving" << std::endl;
-    }
-    ar( cereal::make_nvp("five", four) );
-    ar( cereal::make_nvp("five", four) ); // do it a second time since it shouldn't matter as we provide the name
-
-    std::cout << one << std::endl;
-    std::cout << two << std::endl;
-    std::cout << three << std::endl;
-    for( auto i : four ) std::cout << i << " ";
-    std::cout << std::endl;
-  }
-
-  {
-    // Boost transition layer stuff
-    std::ofstream ss("cereal_version.out");
-    cereal::XMLOutputArchive ar(ss);
-
-    BoostTransitionMS b(3);
-    ar( b, b );
-
-    BoostTransitionSplit c(4);
-    ar( c, c );
-
-    BoostTransitionNMS d(5);
-    ar( d, d );
-
-    BoostTransitionNMSplit e(32);
-    ar( e, e );
-  }
-
-  {
-    // Boost transition layer stuff
-    std::ifstream ss("cereal_version.out");
-    cereal::XMLInputArchive ar(ss);
-
-    BoostTransitionMS b;
-    ar( b );
-    assert( b.getX() == 3 );
-    b.setX( 0 );
-    ar( b );
-    assert( b.getX() == 3 );
-
-    BoostTransitionSplit c;
-    ar( c );
-    assert( c.getX() == 4 );
-    c.setX( 0 );
-    ar( c );
-    assert( c.getX() == 4 );
-
-    BoostTransitionNMS d;
-    ar( d );
-    assert( d.x == 5 );
-    d.x = 0;
-    ar( d );
-    assert( d.x == 5 );
-
-    BoostTransitionNMSplit e;
-    ar( e );
-    assert( e.x == 32 );
-    e.x = 0;
-    ar( e );
-    assert( e.x == 32 );
-  }
-
-#ifdef CEREAL_FUTURE_EXPERIMENTAL
-  {
-    // Any testing
-    int x = 32;
-    int * xx = &x;
-    std::string y("hello");
-    cereal::detail::Any a(xx);
-    auto b = a;
-
-    std::cout << *((int *)a) << std::endl;
-    *((int*)a) = 44;
-    std::cout << *((int *)b) << std::endl;
-    std::cout << *((int *)a) << std::endl;
-
-    a = cereal::detail::Any(y);
-    std::string a_out = a;
-    std::cout << a_out << std::endl;
-  }
-#endif // CEREAL_FUTURE_EXPERIMENTAL
-
-  return 0;
-}
-
-CEREAL_CLASS_VERSION(BoostTransitionMS, 1)
-CEREAL_CLASS_VERSION(BoostTransitionSplit, 2)
-CEREAL_CLASS_VERSION(BoostTransitionNMS, 3)
-// keep the other at default version (0)
diff --git a/Src/External/cereal/sandbox/sandbox_json.cpp b/Src/External/cereal/sandbox/sandbox_json.cpp
deleted file mode 100644
index e767ca5..0000000
--- a/Src/External/cereal/sandbox/sandbox_json.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <cereal/cereal.hpp>
-#include <cereal/archives/binary.hpp>
-#include <cereal/archives/json.hpp>
-
-#include <cereal/types/string.hpp>
-#include <cereal/types/utility.hpp>
-#include <cereal/types/memory.hpp>
-#include <cereal/types/complex.hpp>
-#include <cereal/types/base_class.hpp>
-#include <cereal/types/array.hpp>
-#include <cereal/types/vector.hpp>
-#include <cereal/types/map.hpp>
-
-#include <sstream>
-#include <fstream>
-#include <cassert>
-#include <complex>
-#include <iostream>
-#include <iomanip>
-#include <string>
-
-// ###################################
-struct Test1
-{
-  int a;
-
-  private:
-    friend class cereal::access;
-    template<class Archive>
-    void serialize(Archive & ar)
-    {
-      ar(CEREAL_NVP(a));
-    }
-};
-
-// ###################################
-class Test2
-{
-  public:
-    Test2() {}
-    Test2( int x ) : a( x ) {}
-    int a;
-
-  private:
-    friend class cereal::access;
-
-    template<class Archive>
-      void save(Archive & ar) const
-      {
-        ar(a);
-      }
-
-    template<class Archive>
-      void load(Archive & ar)
-      {
-        ar(a);
-      }
-};
-
-// ###################################
-struct Test3
-{
-  int a;
-};
-
-template<class Archive>
-void serialize(Archive & ar, Test3 & t)
-{
-  ar(CEREAL_NVP(t.a));
-}
-
-namespace test4
-{
-  // ###################################
-  struct Test4
-  {
-    int a;
-  };
-
-  template<class Archive>
-  void save(Archive & ar, Test4 const & t)
-  {
-    ar(CEREAL_NVP(t.a));
-  }
-
-  template<class Archive>
-  void load(Archive & ar, Test4 & t)
-  {
-    ar(CEREAL_NVP(t.a));
-  }
-}
-
-class Private
-{
-  public:
-    Private() : a('z') {}
-
-  private:
-    char a;
-
-    friend class cereal::access;
-
-    template<class Archive>
-      void serialize(Archive & ar)
-      {
-        ar(a);
-      }
-};
-
-struct Everything
-{
-  int x;
-  int y;
-  Test1 t1;
-  Test2 t2;
-  Test3 t3;
-  test4::Test4 t4;
-  std::string s;
-
-  template<class Archive>
-  void serialize(Archive & ar)
-  {
-    ar(CEREAL_NVP(x));
-    ar(CEREAL_NVP(y));
-    ar(CEREAL_NVP(t1));
-    ar(CEREAL_NVP(t2));
-    ar(CEREAL_NVP(t3));
-    ar(CEREAL_NVP(t4));
-    ar(CEREAL_NVP(s));
-  }
-
-  bool operator==(Everything const & o)
-  {
-    return
-      x == o.x &&
-      y == o.y &&
-      t1.a == o.t1.a &&
-      t2.a == o.t2.a &&
-      t3.a == o.t3.a &&
-      t4.a == o.t4.a &&
-      s == o.s;
-  }
-};
-
-
-struct SubFixture
-{
-  SubFixture() : a( 3 ),
-    b( 9999 ),
-    c( 100.1f ),
-    d( 2000.9 ),
-    s( "hello, world!" )
-  {}
-
-  int a;
-  uint64_t b;
-  float c;
-  double d;
-  std::string s;
-
-    template<class Archive>
-      void serialize(Archive & ar)
-      {
-        ar( CEREAL_NVP(a),
-            b,
-            c,
-            CEREAL_NVP(d),
-            CEREAL_NVP(s) );
-      }
-    void change()
-    {
-      a = 4;
-      b = 4;
-      c = 4;
-      d = 4;
-      s = "4";
-    }
-};
-
-struct Fixture
-{
-  SubFixture f1, f2, f3;
-  int array[4];
-
-  Fixture()
-  {
-    array[0] = 1;
-    array[1] = 2;
-    array[2] = 3;
-    array[3] = 4;
-  }
-
-  template<class Archive>
-  void save(Archive & ar) const
-  {
-    ar( f1,
-        CEREAL_NVP(f2),
-        f3 );
-    ar.saveBinaryValue( array, sizeof(int)*4, "cool array man" );
-  }
-
-  template<class Archive>
-  void load(Archive & ar)
-  {
-    ar( f1,
-        CEREAL_NVP(f2),
-        f3 );
-    ar.loadBinaryValue( array, sizeof(int)*4 );
-  }
-
-    void change()
-    {
-      f1.change();
-      f2.change();
-      f3.change();
-    }
-};
-
-struct AAA
-{
-  AAA() : one( 1 ), two( 2 ), three( { {1, 2, 3}, { 4, 5, 6 }, {} } ) {}
-  int one, two;
-
-  std::vector<std::vector<int>> three;
-
-  template<class Archive>
-    void serialize(Archive & ar)
-    {
-      ar( CEREAL_NVP(one), CEREAL_NVP(two) );
-      //ar( CEREAL_NVP(three) );
-    }
-};
-
-class Stuff
-{
-  public:
-    Stuff() {}
-
-    void fillData()
-    {
-      std::vector<std::complex<float>> t1{ {0, -1.0f},
-                          { 0, -2.9932f },
-                          { 0, -3.5f } };
-      std::vector<std::complex<float>> t2{ {1.0f, 0},
-                     { 2.2f, 0 },
-                     { 3.3f, 0 } };
-      data["imaginary"] = t1;
-      data["real"] = t2;
-    }
-
-  private:
-    std::map<std::string, std::vector<std::complex<float>>> data;
-
-    friend class cereal::access;
-
-    template <class Archive>
-    void serialize( Archive & ar )
-    {
-      ar( CEREAL_NVP(data) );
-    }
-};
-
-struct OOJson
-{
-  OOJson() = default;
-  OOJson( int aa, int bb, bool cc, double dd ) :
-    a( aa ), b( bb ), c{ cc, dd }
-  {
-    d[0] = 0; d[1] = 1; d[2] = 2;
-  }
-
-  int a;
-  int b;
-  std::pair<bool, double> c;
-  float d[3];
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( CEREAL_NVP(c) );
-    ar( CEREAL_NVP(a) );
-    ar( b );
-    ar( CEREAL_NVP(d) );
-  }
-};
-
-// ######################################################################
-int main()
-{
-  std::cout << std::boolalpha << std::endl;
-
-  {
-    std::ofstream os("file.json");
-    cereal::JSONOutputArchive oar( os );
-
-    //auto f = std::make_shared<Fixture>();
-    //auto f2 = f;
-    //oar( f );
-    //oar( f2 );
-    Stuff s; s.fillData();
-    oar( cereal::make_nvp("best data ever", s) );
-  }
-
-  {
-    std::ifstream is("file.json");
-    std::string str((std::istreambuf_iterator<char>(is)), std::istreambuf_iterator<char>());
-    std::cout << "---------------------" << std::endl << str << std::endl << "---------------------" << std::endl;
-  }
-
-  // playground
-  {
-    cereal::JSONOutputArchive archive( std::cout );
-    bool arr[] = {true, false};
-    std::vector<int> vec = {1, 2, 3, 4, 5};
-    archive( CEREAL_NVP(vec),
-        arr );
-    auto f = std::make_shared<Fixture>();
-    auto f2 = f;
-    archive( f );
-    archive( f2 );
-  }
-
-  // test out of order
-  std::stringstream oos;
-  {
-    cereal::JSONOutputArchive ar(oos);
-    cereal::JSONOutputArchive ar2(std::cout,
-        cereal::JSONOutputArchive::Options(2, cereal::JSONOutputArchive::Options::IndentChar::space, 2) );
-
-    ar( cereal::make_nvp( "1", 1 ),
-        cereal::make_nvp( "2", 2 ),
-        3,
-        0, // unused
-        cereal::make_nvp( "4", 4 ),
-        cereal::make_nvp( "5", 5 ) );
-
-    int x = 33;
-    ar.saveBinaryValue( &x, sizeof(int), "bla" );
-
-    ar2( cereal::make_nvp( "1", 1 ),
-         cereal::make_nvp( "2", 2 ),
-         3,
-         0, // unused
-         cereal::make_nvp( "4", 4 ),
-         cereal::make_nvp( "5", 5 ) );
-    ar2.saveBinaryValue( &x, sizeof(int), "bla" );
-
-    OOJson oo( 1, 2, true, 4.2 );
-    ar( CEREAL_NVP(oo) );
-    ar2( CEREAL_NVP(oo) );
-
-    // boost stuff
-    ar & cereal::make_nvp("usingop&", oo ) & 6;
-    ar << 5 << 4 << 3;
-
-    ar2 & cereal::make_nvp("usingop&", oo ) & 6;
-    ar2 << 5 << 4 << 3;
-
-    long double ld = std::numeric_limits<long double>::max();
-    long long ll = std::numeric_limits<long long>::max();
-    unsigned long long ull = std::numeric_limits<unsigned long long>::max();
-
-    ar( CEREAL_NVP(ld),
-        CEREAL_NVP(ll),
-        CEREAL_NVP(ull) );
-
-    ar2( CEREAL_NVP(ld),
-         CEREAL_NVP(ll),
-         CEREAL_NVP(ull) );
-  }
-
-  {
-    cereal::JSONInputArchive ar(oos);
-    int i1, i2, i3, i4, i5, x;
-
-    ar( i1 );
-    ar( cereal::make_nvp( "2", i2 ), i3 );
-
-    ar( cereal::make_nvp( "4", i4 ),
-        i5 );
-
-    ar.loadBinaryValue( &x, sizeof(int) );
-
-    OOJson ii;
-    ar( cereal::make_nvp("oo", ii) );
-    ar( cereal::make_nvp( "2", i2 ) );
-
-    std::cout << i1 << " " << i2 << " " << i3 << " " << i4 << " " << i5 << std::endl;
-    std::cout << x << std::endl;
-    std::cout << ii.a << " " << ii.b << " " << ii.c.first << " " << ii.c.second << " ";
-    for( auto z : ii.d )
-      std::cout << z << " ";
-    std::cout << std::endl;
-
-    OOJson oo;
-    ar >> cereal::make_nvp("usingop&", oo );
-    std::cout << oo.a << " " << oo.b << " " << oo.c.first << " " << oo.c.second << " ";
-    for( auto z : oo.d )
-      std::cout << z << " ";
-
-    int aa, a, b, c;
-    ar & aa & a & b & c;
-    std::cout << aa << " " << a << " " << b << " " << c << std::endl;
-
-    long double ld;
-    long long ll;
-    unsigned long long ull;
-
-    ar( CEREAL_NVP(ld),
-        CEREAL_NVP(ll),
-        CEREAL_NVP(ull) );
-
-    std::cout << (ld  == std::numeric_limits<long double>::max()) << std::endl;
-    std::cout << (ll  == std::numeric_limits<long long>::max()) << std::endl;
-    std::cout << (ull == std::numeric_limits<unsigned long long>::max()) << std::endl;
-  }
-
-  return 0;
-}
diff --git a/Src/External/cereal/sandbox/sandbox_rtti.cpp b/Src/External/cereal/sandbox/sandbox_rtti.cpp
deleted file mode 100644
index 896d033..0000000
--- a/Src/External/cereal/sandbox/sandbox_rtti.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <type_traits>
-#include <cereal/archives/binary.hpp>
-#include <cereal/archives/xml.hpp>
-#include <cereal/types/polymorphic.hpp>
-#include <sstream>
-#include <fstream>
-#include <iostream>
-
-struct Base
-{
-  int y;
-  virtual void foo() = 0;
-
-  template<class Archive>
-    void save(Archive & ar) const
-    {
-      std::cout << "Saving Base" << std::endl;
-      ar( y );
-    }
-
-  template<class Archive>
-    void load(Archive & ar)
-    {
-      std::cout << "Loading Base" << std::endl;
-      ar( y );
-    }
-};
-
-struct MyType : public Base
-{
-  int x;
-
-  void foo() {}
-
-  template<class Archive>
-    void save(Archive & ar) const
-    {
-      std::cout << "Saving MyType" << std::endl;
-      ar( cereal::virtual_base_class<Base>( this ) );
-    }
-
-  template<class Archive>
-    void load(Archive & ar)
-    {
-      std::cout << "Loading MyType" << std::endl;
-      ar( cereal::base_class<Base>( this ) );
-    }
-};
-CEREAL_REGISTER_TYPE(MyType)
-
-struct YourType : public Base
-{
-  YourType(int xx) : x(xx) {}
-  YourType() : x(-1) {}
-  int x;
-
-  void foo() {}
-
-  template<class Archive>
-    void save(Archive & ar) const
-    {
-      std::cout << "Saving YourType" << std::endl;
-      ar( x );
-    }
-
-  template<class Archive>
-    void load(Archive & ar)
-    {
-      std::cout << "Loading YourType" << std::endl;
-      ar( x );
-    }
-};
-
-CEREAL_REGISTER_TYPE(YourType)
-CEREAL_REGISTER_POLYMORPHIC_RELATION(Base, YourType)
-
-struct OurBase
-{
-  virtual void foo() {}
-
-  template<class Archive>
-    void serialize(Archive &)
-    { }
-};
-
-struct OurType : public OurBase
-{
-  OurType() : OurBase(), x() {}
-  OurType(int x_) : x(x_) {}
-  void foo() {}
-
-  int x;
-
-  template<class Archive>
-    void serialize(Archive & ar)
-    {
-      ar( x );
-    }
-};
-
-struct BaseVirtual
-{
-  int x;
-  template <class Archive>
-  void serialize( Archive & ar )
-  { ar( x ); }
-  virtual void foo() = 0;
-};
-
-struct DerivedVirtual : public virtual BaseVirtual
-{
-  int y;
-  virtual void foo() {}
-
-  template <class Archive>
-  void save( Archive & ar ) const
-  {
-    ar( cereal::virtual_base_class<BaseVirtual>( this ) );
-    ar( y );
-  }
-
-  template <class Archive>
-  void load( Archive & ar )
-  {
-    ar( cereal::virtual_base_class<BaseVirtual>( this ) );
-    ar( y );
-  }
-};
-
-struct TestType
-{
-  int x;
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x );
-  }
-};
-
-namespace cereal
-{
-  template <class Archive> struct specialize<Archive, DerivedVirtual, cereal::specialization::member_load_save> {};
-  template <class Archive> struct specialize<Archive, TestType, cereal::specialization::member_serialize> {};
-}
-
-struct AAA
-{
-  virtual void foo() = 0;
-};
-
-struct BBB : AAA
-{
-  void foo() {}
-  template <class Archive>
-  void serialize( Archive & ) {}
-};
-
-CEREAL_REGISTER_TYPE(BBB)
-
-template <class T> void nop(T&&) {}
-
-int main()
-{
-  {
-    std::ofstream ostream("rtti.txt");
-    //cereal::BinaryOutputArchive oarchive(ostream);
-    cereal::XMLOutputArchive oarchive(ostream);
-
-    std::shared_ptr<Base> ptr1 = std::make_shared<MyType>();
-    std::shared_ptr<Base> ptr2 = std::make_shared<YourType>(33);
-    std::unique_ptr<Base> ptr3(new MyType());
-    std::weak_ptr<Base>   ptr4 = ptr2;
-
-    std::shared_ptr<OurType> ptr5 = std::make_shared<OurType>(99);
-
-    oarchive(ptr1);
-    oarchive(ptr2);
-    oarchive(ptr3);
-    oarchive(ptr4);
-    oarchive(ptr5);
-
-    //std::shared_ptr<AAA> a = std::make_shared<BBB>();
-    //oarchive(a);
-  }
-
-  {
-    std::ifstream istream("rtti.txt");
-    //cereal::BinaryInputArchive iarchive(istream);
-    cereal::XMLInputArchive iarchive(istream);
-
-    std::shared_ptr<Base> ptr1;
-    std::shared_ptr<Base> ptr2;
-    std::unique_ptr<Base> ptr3;
-    std::weak_ptr<Base>   ptr4;
-
-    std::shared_ptr<OurType> ptr5;
-
-    iarchive(ptr1);
-    iarchive(ptr2);
-    iarchive(ptr3);
-    iarchive(ptr4);
-    iarchive(ptr5);
-  }
-}
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt b/Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt
deleted file mode 100644
index 5d8ea08..0000000
--- a/Src/External/cereal/sandbox/sandbox_shared_lib/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library(sandbox_vs_dll SHARED base.cpp derived.cpp)
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp b/Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp
deleted file mode 100755
index 9d8e360..0000000
--- a/Src/External/cereal/sandbox/sandbox_shared_lib/base.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef CEREAL_DLL_USE
-#define CEREAL_DLL_MAKE
-#endif
-#include "base.hpp"
-
-template void Base::serialize<cereal::XMLOutputArchive>
-    ( cereal::XMLOutputArchive & ar, std::uint32_t const version );
-template void Base::serialize<cereal::XMLInputArchive>
-    ( cereal::XMLInputArchive & ar, std::uint32_t const version );
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp b/Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp
deleted file mode 100755
index 388a015..0000000
--- a/Src/External/cereal/sandbox/sandbox_shared_lib/base.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <cereal/cereal.hpp>
-#include <cereal/archives/xml.hpp>
-#include <cereal/types/polymorphic.hpp>
-
-#if defined (_WINDLL)
-#define DECLSPECIFIER __declspec(dllexport)
-#elif defined(MSC_VER)
-#define DECLSPECIFIER __declspec(dllimport)
-#else
-#define DECLSPECIFIER
-#endif
-
-int doit();
-
-class VersionTest
-{
-  public:
-    int x;
-    template <class Archive>
-    void serialize( Archive & ar, const std::uint32_t /* version */ )
-    { ar( x ); }
-};
-
-class Base
-{
-  public:
-    friend class cereal::access;
-
-    template < class Archive >
-    void serialize(Archive &, std::uint32_t const) {}
-    virtual ~Base() {}
-};
-
-extern template DECLSPECIFIER void Base::serialize<cereal::XMLInputArchive>
-( cereal::XMLInputArchive & ar, std::uint32_t const version );
-
-extern template DECLSPECIFIER void Base::serialize<cereal::XMLOutputArchive>
-( cereal::XMLOutputArchive & ar, std::uint32_t const version );
-
-CEREAL_CLASS_VERSION(VersionTest, 1)
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp b/Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp
deleted file mode 100755
index 52043e2..0000000
--- a/Src/External/cereal/sandbox/sandbox_shared_lib/derived.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef CEREAL_DLL_USE
-#define CEREAL_DLL_MAKE
-#endif
-#include "derived.hpp"
-
-template void Derived::serialize<cereal::XMLOutputArchive>
-    ( cereal::XMLOutputArchive & ar, std::uint32_t const version );
-
-template void Derived::serialize<cereal::XMLInputArchive>
-    ( cereal::XMLInputArchive & ar, std::uint32_t const version );
diff --git a/Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp b/Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp
deleted file mode 100755
index 6f6cfb6..0000000
--- a/Src/External/cereal/sandbox/sandbox_shared_lib/derived.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-#include "base.hpp"
-class Derived : public Base
-{
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void serialize(Archive & ar, std::uint32_t const)
-    {
-      ar(cereal::base_class<Base>(this));
-    }
-};
-
-extern template DECLSPECIFIER void Derived::serialize<cereal::XMLOutputArchive>
-    ( cereal::XMLOutputArchive & ar, std::uint32_t const version );
-extern template DECLSPECIFIER void Derived::serialize<cereal::XMLInputArchive>
-    ( cereal::XMLInputArchive & ar, std::uint32_t const version );
-
-CEREAL_REGISTER_TYPE(Derived)
diff --git a/Src/External/cereal/sandbox/sandbox_vs.cpp b/Src/External/cereal/sandbox/sandbox_vs.cpp
deleted file mode 100644
index fb7fceb..0000000
--- a/Src/External/cereal/sandbox/sandbox_vs.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-#include <base.hpp>
-#include <derived.hpp>
-
-#include <cereal/access.hpp>
-#include <cereal/details/traits.hpp>
-#include <cereal/details/helpers.hpp>
-#include <cereal/types/base_class.hpp>
-#include <cereal/cereal.hpp>
-
-#include <cereal/types/array.hpp>
-#include <cereal/types/bitset.hpp>
-#include <cereal/types/chrono.hpp>
-#include <cereal/types/common.hpp>
-#include <cereal/types/complex.hpp>
-#include <cereal/types/deque.hpp>
-#include <cereal/types/forward_list.hpp>
-#include <cereal/types/list.hpp>
-#include <cereal/types/map.hpp>
-#include <cereal/types/memory.hpp>
-
-#include <cereal/details/util.hpp>
-
-#include <cereal/details/polymorphic_impl.hpp>
-#include <cereal/types/polymorphic.hpp>
-
-#include <cereal/types/queue.hpp>
-#include <cereal/types/set.hpp>
-#include <cereal/types/stack.hpp>
-#include <cereal/types/string.hpp>
-#include <cereal/types/tuple.hpp>
-#include <cereal/types/unordered_map.hpp>
-#include <cereal/types/unordered_set.hpp>
-#include <cereal/types/utility.hpp>
-#include <cereal/types/vector.hpp>
-
-#include <cereal/archives/binary.hpp>
-#include <cereal/archives/portable_binary.hpp>
-#include <cereal/archives/xml.hpp>
-#include <cereal/archives/json.hpp>
-
-#include <iostream>
-#include <type_traits>
-#include <functional>
-
-//CEREAL_FORCE_LINK_SHARED_LIBRARY(Sandbox)
-
-struct Archive {};
-CEREAL_SETUP_ARCHIVE_TRAITS(Archive, Archive)
-
-struct Test
-{
-  template <class Archive>
-  void serialzize( Archive & )
-  {
-    std::cout << "hey there" << std::endl;
-  }
-
-  template <class Archive>
-  void save( Archive & ) const
-  {
-    std::cout << "saved by the bell" << std::endl;
-  }
-
-  template <class Archive>
-  void load( Archive & )
-  {
-    std::cout << "locked and loaded" << std::endl;
-  }
-
-  template <class Archive>
-  static void load_and_construct( Archive &, cereal::construct<Test> & )
-  {
-  }
-
-  template <class Archive>
-  int save_minimal() const
-  {
-    return 0;
-  }
-
-  template <class Archive>
-  int save_minimal(const std::uint32_t) const
-  {
-    return 1;
-  }
-
-  template <class Archive>
-  void load_minimal( int & )
-  { }
-};
-
-template <class Archive>
-void serialize( Archive &, Test & )
-{ }
-
-template <class Archive>
-void load( Archive &, Test & )
-{ }
-
-template <class Archive>
-void save( Archive &, Test const & )
-{ }
-
-template <class Archive>
-int save_minimal( Test const & )
-{ return 0; }
-
-template <class Archive>
-int save_minimal( Test const &, const std::uint32_t )
-{ return 0; }
-
-namespace cereal
-{
-  template <>
-  struct LoadAndConstruct<Test>
-  {
-    template <class Archive>
-    static void load_and_construct( Archive &, cereal::construct<Test> & construct )
-    {
-      construct();
-    }
-  };
-}
-
-struct A
-{
-  virtual void foo() = 0;
-};
-
-struct B : A
-{
-  void foo() {}
-
-  template <class Archive>
-  void serialize( Archive & )
-  {
-    std::cout << "i'm in your b" << std::endl;
-  }
-};
-
-struct C
-{
-  char a;
-};
-
-CEREAL_REGISTER_TYPE(B)
-CEREAL_REGISTER_POLYMORPHIC_RELATION(A, B)
-
-class MemberMinimal
-{
-  public:
-    MemberMinimal() = default;
-    template <class Archive>
-    int save_minimal( Archive const & ) const
-    {
-      return x;
-    }
-
-    template <class Archive>
-    void load_minimal( Archive const &, int const & str )
-    {
-      x = str;
-    }
-
-  public:
-    int x;
-};
-
-int main()
-{
-  typedef Test T;
-  std::cout << std::boolalpha;
-
-  // Test Load and Construct internal/external
-  std::cout << "\tload_and_construct" << std::endl;
-  std::cout << cereal::traits::has_member_load_and_construct<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_load_and_construct<T, Archive>::value << std::endl;
-
-  // serialize
-  std::cout << "\tserialize" << std::endl;
-  std::cout << cereal::traits::has_member_serialize<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_serialize<T, Archive>::value << std::endl;
-
-  // load
-  std::cout << "\tload" << std::endl;
-  std::cout << cereal::traits::has_member_load<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_load<T, Archive>::value << std::endl;
-
-  // load minimal
-  std::cout << "\tload minimal" << std::endl;
-  std::cout << cereal::traits::has_member_load<T, Archive>::value << std::endl;
-
-  // save
-  std::cout << "\tsave" << std::endl;
-  std::cout << cereal::traits::has_member_save<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_save<T, Archive>::value << std::endl;
-
-  // save_minimal
-  std::cout << "\tsave_minimal" << std::endl;
-  std::cout << cereal::traits::has_member_save_minimal<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_save_minimal<T, Archive>::value << std::endl;
-
-  // save_minimal_versioned
-  std::cout << "\tsave_minimal versioned" << std::endl;
-  std::cout << cereal::traits::has_member_versioned_save_minimal<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_versioned_save_minimal<T, Archive>::value << std::endl;
-
-  // splittable
-  std::cout << "\t splittable" << std::endl;
-  std::cout << cereal::traits::has_member_split<T, Archive, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_non_member_split<T, Archive, Archive>::value << std::endl;
-
-  // serialiable
-  std::cout << "\toutput serializable" << std::endl;
-  std::cout << cereal::traits::is_output_serializable<T, Archive>::value << std::endl;
-
-#if !defined(__INTEL_COMPILER)
-  //! TODO: This causes icc to crash
-  std::cout << cereal::traits::is_input_serializable<T, Archive>::value << std::endl;
-#endif
-
-  // specialized
-  std::cout << "\tspecialized" << std::endl;
-  std::cout << cereal::traits::detail::is_specialized_member_serialize<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::detail::is_specialized_member_load_save<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::detail::is_specialized_non_member_serialize<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::detail::is_specialized_non_member_load_save<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::detail::count_specializations<T, Archive>::value << std::endl;
-  std::cout << cereal::traits::is_specialized<T, Archive>::value << std::endl;
-
-  // array size
-  std::cout << typeid(A).name() << std::endl;
-  std::cout << typeid(cereal::traits::has_load_and_construct<int, bool>).name() << std::endl;
-
-  // extra testing
-  std::cout << "\textra" << std::endl;
-  std::cout << cereal::traits::has_member_save_minimal<MemberMinimal, Archive>::value << std::endl;
-  std::cout << cereal::traits::has_member_load_minimal<MemberMinimal, Archive>::value << std::endl;
-
-  // DLL testing
-  std::cout << "------DLL TESTING------" << std::endl;
-  std::stringstream dllSS1;
-  std::stringstream dllSS2;
-  {
-    cereal::XMLOutputArchive out(dllSS1);
-    VersionTest x{1};
-    std::shared_ptr<Base> p = std::make_shared<Derived>();
-    out(x);
-    out( p );
-
-    std::shared_ptr<A> ay = std::make_shared<B>();
-    out(ay);
-  }
-
-  std::cout << dllSS1.str() << std::endl;
-
-  {
-    VersionTest x;
-    std::shared_ptr<Base> p;
-    std::shared_ptr<A> ay;
-    {
-      cereal::XMLInputArchive in(dllSS1);
-      in(x);
-      in( p );
-      in( ay );
-    }
-    {
-      cereal::XMLOutputArchive out(dllSS2);
-      out( x );
-      out( p );
-      out( ay );
-    }
-  }
-
-  std::cout << dllSS2.str() << std::endl;
-
-  return 0;
-}
diff --git a/Src/External/cereal/scripts/add_rapidjson_prefix.sh b/Src/External/cereal/scripts/add_rapidjson_prefix.sh
deleted file mode 100755
index c5b3980..0000000
--- a/Src/External/cereal/scripts/add_rapidjson_prefix.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Applies renaming within all of the rapidjson source files to add a cereal prefix
-find ./../include/cereal/external/rapidjson/ -type f -name \*.h -exec sed -i "s/RAPIDJSON_/CEREAL_RAPIDJSON_/g" {} \;
-echo "Remember to backport any cereal specific changes not in this version of RapidJSON!"
-echo "See https://github.com/USCiLab/cereal/commits/develop/include/cereal/external/rapidjson"
diff --git a/Src/External/cereal/scripts/appveyor.bat b/Src/External/cereal/scripts/appveyor.bat
deleted file mode 100644
index 5e478de..0000000
--- a/Src/External/cereal/scripts/appveyor.bat
+++ /dev/null
@@ -1,75 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-if not defined APPVEYOR (
-    @echo This script is meant to be used with AppVeyor CI. This can be used as reference.
-    @echo I sincerely recommend not using it for building/testing cereal locally.
-    exit /b 0
-)
-
-if not defined BOOST_ROOT (
-    set BOOST_ROOT=C:\Libraries\boost
-)
-if not defined VS_VERSION_MAJOR (
-    set VS_VERSION_MAJOR=14
-)
-if not defined VS_VERSION_YEAR (
-    if "%VS_VERSION_MAJOR%" == "12" (
-        set VS_VERSION_YEAR=2013
-    ) else if "%VS_VERSION_MAJOR%" == "14" (
-        set VS_VERSION_YEAR=2015
-    ) else (
-        @echo Cannot use Visual Studio version %VS_VERSION_MAJOR%
-        exit /b 1
-    )
-)
-if not defined CMAKE_GENERATOR_PREFIX (
-    set CMAKE_GENERATOR_PREFIX=Visual Studio %VS_VERSION_MAJOR% %VS_VERSION_YEAR%
-)
-
-@rem CONFIGURATION is (one of the entries) defined in appveyor.yml
-if not defined CONFIGURATION (
-    set CONFIGURATION=Release
-)
-@rem PLATFORM is (one of the entries) defined in appveyor.yml
-if "%PLATFORM%"=="x64" (
-    set BIT_COUNT=64
-    set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_PREFIX% Win64
-) else (
-    set BIT_COUNT=32
-    set CMAKE_GENERATOR_NAME=%CMAKE_GENERATOR_PREFIX%
-)
-
-set BOOST_LIBRARYDIR=%BOOST_ROOT%\lib%BIT_COUNT%-msvc-%VS_VERSION_MAJOR%.0
-
-set START_DIR=%CD%
-
-if not exist build\NUL mkdir build
-cd build
-
-if "%~1" == "test" (
-    @rem overloading the batch script; Run tests if the first argument is `test` (without quotes).
-    @rem   Cereal uses Boost Unit test framework. Rather than modifying the code to load boost test
-    @rem dll from its location OR copying the boost dlls to the directory of every test being run,
-    @rem we use another option Windows leaves us - modify the PATH.
-    for %%i in (ctest.exe) do set CTEST_EXE=%%~$PATH:i
-    PATH %BOOST_LIBRARYDIR%
-    "!CTEST_EXE!" -C %CONFIGURATION%
-    if %errorlevel% neq 0 exit /b %errorlevel%
-    goto done
-)
-
-if "%PLATFORM%" == "x64" (
-    @rem please excuse the hack - CMake is unable to produce multiarch MSVC projects
-    cmake -G "%CMAKE_GENERATOR_PREFIX%" -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ..
-    cmake --build . --config %CONFIGURATION% --target portability_test32
-    del CMakeCache.txt
-    rmdir /s /q CMakeFiles
-)
-
-cmake -G "%CMAKE_GENERATOR_NAME%" -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ..
-@rem left the actual build for later - AppVeyor enables parallel jobs in a much cleaner way than msbuild
-
-:done
-@REM go back home
-cd %START_DIR%
diff --git a/Src/External/cereal/scripts/renameincludes.sh b/Src/External/cereal/scripts/renameincludes.sh
deleted file mode 100755
index acc2fa2..0000000
--- a/Src/External/cereal/scripts/renameincludes.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-destdir="include_renamed"
-
-echo -n "New prefix: "
-read newprefix
-
-cp -r include ${destdir}
-
-newprefix=$(echo ${newprefix} | sed -e 's/\//\\\//')
-
-find ${destdir} -name '*.hpp' -exec sed -i "s/#include <cereal/#include <${newprefix}\/cereal/" {} \;
diff --git a/Src/External/cereal/scripts/updatecoverage.sh b/Src/External/cereal/scripts/updatecoverage.sh
deleted file mode 100755
index a3ec4ad..0000000
--- a/Src/External/cereal/scripts/updatecoverage.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# Updates the coverage documentation, and copies it into the appropriate place
-# in the gh-pages-develop branch.
-#   $1 from CMAKE will contain the root directory of cereal
-
-# this requires lcov 1.10 or newer
-
-set -e
-
-COVERAGE_TESTS=./coverage_*
-
-# run tests
-for f in $COVERAGE_TESTS
-  do
-    echo $f
-    $f
-  done
-
-# build coverage output
-tempdir=`mktemp -d`
-
-lcov --capture --directory $1 --output-file coverage.info --no-external
-lcov --remove coverage.info '*/external/*' 'cereal/details/util.hpp' 'sandbox/*' 'unittests/*' -o coverage.info
-genhtml --demangle-cpp coverage.info --output-directory ${tempdir}
-
-# copy over to gh pages
-git checkout gh-pages-develop
-
-rm -rf $1/assets/coverage
-mkdir $1/assets/coverage
-cp -r ${tempdir}/* $1/assets/coverage/
-rm -rf ${tempdir}
diff --git a/Src/External/cereal/scripts/updatedoc.in b/Src/External/cereal/scripts/updatedoc.in
deleted file mode 100755
index 7f6a4a6..0000000
--- a/Src/External/cereal/scripts/updatedoc.in
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Updates the doxygen documentation, and copies it into the appropriate place
-# in the gh-pages branch.
-
-set -e
-
-tempdir=`mktemp -d`
-branch=`git rev-parse --abbrev-ref HEAD`
-
-cp -r @PROJECT_BINARY_DIR@/doc/html/ ${tempdir}
-
-git stash
-git checkout gh-pages-develop
-
-rm -rf @PROJECT_SOURCE_DIR@/assets/doxygen
-mkdir @PROJECT_SOURCE_DIR@/assets/doxygen
-cp -r ${tempdir}/html/* @PROJECT_SOURCE_DIR@/assets/doxygen/
-
-rm -rf ${tempdir}
-
-git commit @PROJECT_SOURCE_DIR@/assets/doxygen
-
-git checkout ${branch}
-git stash apply
diff --git a/Src/External/cereal/unittests/CMakeLists.txt b/Src/External/cereal/unittests/CMakeLists.txt
deleted file mode 100644
index b7a769b..0000000
--- a/Src/External/cereal/unittests/CMakeLists.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-file(GLOB TESTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
-
-# A semi-colon separated list of test sources that should not be automatically built with doctest 
-set(SPECIAL_TESTS "portability_test.cpp")
-
-if(CMAKE_VERSION VERSION_LESS 2.8)
-  # Portability test uses the `TARGET_FILE_DIR` generator expression which is available from CMake 2.8.
-  set(SKIP_PORTABILITY_TEST ON)
-endif()
-
-if(NOT SKIP_PORTABILITY_TEST)
-  # Build the portability test only if we are on a 64-bit machine (void* is 8 bytes)
-  if((${CMAKE_SIZEOF_VOID_P} EQUAL 8))
-    if(NOT MSVC)
-      add_executable(portability_test32 portability_test.cpp)
-      set_target_properties(portability_test32 PROPERTIES COMPILE_FLAGS "-m32")
-      set_target_properties(portability_test32 PROPERTIES LINK_FLAGS "-m32")
-    endif()
-
-    add_executable(portability_test64 portability_test.cpp)
-
-    add_test(NAME portability_test
-            COMMAND ${CMAKE_COMMAND}
-              -DPORTABILITY_TEST_DIR=$<TARGET_FILE_DIR:portability_test64>
-            -P "${CMAKE_CURRENT_SOURCE_DIR}/run_portability_test.cmake")
-
-  elseif(MSVC)
-    add_executable(portability_test32 portability_test.cpp)
-  endif()
-endif()
-
-# Build all of the non-special tests
-foreach(TEST_SOURCE ${TESTS})
-
-  string(REPLACE ".cpp" "" TEST_TARGET "${TEST_SOURCE}")
-  set(TEST_TARGET "test_${TEST_TARGET}")
-
-  # Check to see if our target is listed in "SPECIAL_TESTS"
-  list(FIND SPECIAL_TESTS "${TEST_SOURCE}" IS_SPECIAL_TEST)
-
-  if(IS_SPECIAL_TEST EQUAL -1)
-
-    add_executable(${TEST_TARGET} ${TEST_SOURCE})
-    target_link_libraries(${TEST_TARGET} ${CEREAL_THREAD_LIBS})
-    add_test("${TEST_TARGET}" "${TEST_TARGET}")
-
-    # If we are on a 64-bit machine, create an extra 32-bit version of the test if portability testing is enabled
-    if((NOT MSVC) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST))
-      add_executable(${TEST_TARGET}_32 ${TEST_SOURCE})
-      set_target_properties(${TEST_TARGET}_32 PROPERTIES
-        COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
-      add_test("${TEST_TARGET}_32" "${TEST_TARGET}_32")
-    endif()
-
-  endif()
-
-endforeach()
-
-# Add the valgrind target
-if(NOT MSVC)
-  add_custom_target(valgrind
-    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_valgrind.sh")
-
-  # Add the coverage target
-  add_custom_target(coverage)
-  add_custom_command(TARGET coverage
-    COMMAND "${CMAKE_SOURCE_DIR}/scripts/updatecoverage.sh" ${CMAKE_SOURCE_DIR}
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/coverage")
-
-  # add tests to coverage
-  foreach(TEST_SOURCE ${TESTS})
-    string(REPLACE ".cpp" "" COVERAGE_TARGET "${TEST_SOURCE}")
-    set(COVERAGE_TARGET "coverage_${COVERAGE_TARGET}")
-
-    # Check to see if our target is listed in "SPECIAL_TESTS"
-    list(FIND SPECIAL_TESTS "${TEST_SOURCE}" IS_SPECIAL_TEST)
-
-    if(IS_SPECIAL_TEST EQUAL -1)
-      add_dependencies(coverage ${COVERAGE_TARGET})
-
-      add_executable(${COVERAGE_TARGET} EXCLUDE_FROM_ALL ${TEST_SOURCE})
-      set_target_properties(${COVERAGE_TARGET} PROPERTIES COMPILE_FLAGS "-coverage")
-      set_target_properties(${COVERAGE_TARGET} PROPERTIES LINK_FLAGS "-coverage")
-      set_target_properties(${COVERAGE_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/coverage")
-      target_link_libraries(${COVERAGE_TARGET} ${CEREAL_THREAD_LIBS})
-    endif()
-  endforeach()
-endif(NOT MSVC)
-
-if(NOT CMAKE_VERSION VERSION_LESS 3.0)
-  add_test(test_cmake_config_module ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake-config-module.cmake)
-endif()
diff --git a/Src/External/cereal/unittests/array.cpp b/Src/External/cereal/unittests/array.cpp
deleted file mode 100644
index 5cd1c39..0000000
--- a/Src/External/cereal/unittests/array.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "array.hpp"
-
-TEST_SUITE("array");
-
-TEST_CASE("binary_array")
-{
-  test_array<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_array")
-{
-  test_array<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_array")
-{
-  test_array<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_array")
-{
-  test_array<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/array.hpp b/Src/External/cereal/unittests/array.hpp
deleted file mode 100644
index 766225b..0000000
--- a/Src/External/cereal/unittests/array.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_ARRAY_H_
-#define CEREAL_TEST_ARRAY_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_array()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::array<int, 100> o_podarray;
-    for(auto & elem : o_podarray)
-      elem = random_value<int>(gen);
-
-    std::array<StructInternalSerialize, 100> o_iserarray;
-    for(auto & elem : o_iserarray)
-      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::array<StructInternalSplit, 100> o_isplarray;
-    for(auto & elem : o_isplarray)
-      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::array<StructExternalSerialize, 100> o_eserarray;
-    for(auto & elem : o_eserarray)
-      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::array<StructExternalSplit, 100> o_esplarray;
-    for(auto & elem : o_esplarray)
-      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podarray);
-      oar(o_iserarray);
-      oar(o_isplarray);
-      oar(o_eserarray);
-      oar(o_esplarray);
-    }
-
-    std::array<int, 100> i_podarray;
-    std::array<StructInternalSerialize, 100> i_iserarray;
-    std::array<StructInternalSplit, 100>     i_isplarray;
-    std::array<StructExternalSerialize, 100> i_eserarray;
-    std::array<StructExternalSplit, 100>     i_esplarray;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podarray);
-      iar(i_iserarray);
-      iar(i_isplarray);
-      iar(i_eserarray);
-      iar(i_esplarray);
-    }
-
-    check_collection( i_podarray, o_podarray );
-    check_collection( i_iserarray, o_iserarray );
-    check_collection( i_isplarray, o_isplarray );
-    check_collection( i_eserarray, o_eserarray );
-    check_collection( i_esplarray, o_esplarray );
-  }
-}
-
-#endif // CEREAL_TEST_ARRAY_H_
diff --git a/Src/External/cereal/unittests/basic_string.cpp b/Src/External/cereal/unittests/basic_string.cpp
deleted file mode 100644
index 245530e..0000000
--- a/Src/External/cereal/unittests/basic_string.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "basic_string.hpp"
-
-TEST_SUITE("basic_string");
-
-TEST_CASE("binary_string")
-{
-  test_string_all<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_string")
-{
-  test_string_all<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_string_basic")
-{
-  test_string_basic<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_string_basic")
-{
-  test_string_basic<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-template <class IArchive, class OArchive, class Out, class In = Out>
-void test_ws_in_out(Out const & o_value_with_ws)
-{
-  std::ostringstream os;
-  {
-    OArchive oar(os);
-    oar(o_value_with_ws);
-  }
-
-  In i_value_with_ws;
-
-  std::istringstream is(os.str());
-  {
-    IArchive iar(is);
-    iar(i_value_with_ws);
-  }
-
-  CHECK(i_value_with_ws == o_value_with_ws);
-}
-
-TEST_CASE("xml_string_issue109")
-{
-  char strings[][20] = {
-    "some text",
-    "some text ",
-    " some text",
-    " some text ",
-    "  ",
-    "    text    ",
-    " ]]> ",
-    " &gt; > ]]> ",
-    " < <]>] &lt; ",
-    " &amp; &   "
-  };
-
-  for( size_t i=0; i<( sizeof( strings ) / sizeof( strings[0] ) ); ++i )
-  {
-    std::basic_string<char> o_string = strings[i];
-
-    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( o_string );
-  }
-}
-
-TEST_CASE("xml_char_issue109")
-{
-  uint8_t chars[] = {
-    ' ',
-    '\t',
-    '\n',
-    '\r',
-    '&',
-    '>',
-    '<',
-    '\'',
-    '"',
-    '!',
-    '|'
-  };
-
-  for( size_t i=0; i<( sizeof( chars ) / sizeof( chars[0] ) ); ++i )
-  {
-    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( chars[i] );
-  }
-
-  for( size_t i=0; i<( sizeof( chars ) / sizeof( chars[0] ) ); ++i )
-  {
-    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( int8_t( chars[i] ) );
-  }
-
-  for( size_t i=0; i<( sizeof( chars ) / sizeof( chars[0] ) ); ++i )
-  {
-    test_ws_in_out<cereal::XMLInputArchive, cereal::XMLOutputArchive>( char( chars[i] ) );
-  }
-}
-
-template <class IArchive, class OArchive, class Out, size_t Nb, class In = Out>
-void test_ws_in_out_array(Out const (&o_a_value_with_ws)[Nb])
-{
-    std::ostringstream os;
-    {
-        OArchive oar(os);
-        for (const auto& o_value_with_ws : o_a_value_with_ws)
-        {
-            oar(o_value_with_ws);
-        }
-    }
-
-    In i_a_value_with_ws[Nb];
-
-    std::istringstream is(os.str());
-    {
-        IArchive iar(is);
-        for (In& i_value_with_ws : i_a_value_with_ws)
-        {
-            iar(i_value_with_ws);
-        }
-    }
-
-    for (size_t uiIndex = 0; uiIndex < Nb; ++uiIndex)
-    {
-        CHECK(i_a_value_with_ws[uiIndex] == o_a_value_with_ws[uiIndex]);
-    }
-}
-
-TEST_CASE("xml_string_issue_consecutive_calls")
-{
-    std::string strings[] = {
-        "some text",
-        " some text",
-        " some text ",
-        "Long text without ws at the end",
-        "some text ",
-        " some text",
-        " some text ",
-    };
-
-    test_ws_in_out_array<cereal::XMLInputArchive, cereal::XMLOutputArchive>(strings);
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/basic_string.hpp b/Src/External/cereal/unittests/basic_string.hpp
deleted file mode 100644
index 5ee37aa..0000000
--- a/Src/External/cereal/unittests/basic_string.hpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_BASIC_STRING_H_
-#define CEREAL_TEST_BASIC_STRING_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_string_basic()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(size_t i=0; i<100; ++i)
-  {
-    std::basic_string<char> o_string  = random_basic_string<char>(gen);
-    std::basic_string<char> o_string2 = "";
-    std::basic_string<char> o_string3;
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-      oar(o_string);
-      oar(o_string2);
-      oar(o_string3);
-    }
-
-    std::basic_string<char> i_string;
-    std::basic_string<char> i_string2;
-    std::basic_string<char> i_string3;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_string);
-      iar(i_string2);
-      iar(i_string3);
-    }
-
-    CHECK_EQ(i_string, o_string);
-    CHECK_EQ(i_string2, o_string2);
-    CHECK_EQ(i_string3, o_string3);
-  }
-}
-
-template <class IArchive, class OArchive> inline
-void test_string_all()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(size_t i=0; i<100; ++i)
-  {
-    std::basic_string<char> o_string        = random_basic_string<char>(gen);
-    std::basic_string<wchar_t> o_wstring    = random_basic_string<wchar_t>(gen);
-    std::basic_string<char16_t> o_u16string = random_basic_string<char16_t>(gen);
-    std::basic_string<char32_t> o_u32string = random_basic_string<char32_t>(gen);
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-      oar(o_string);
-      oar(o_wstring);
-      oar(o_u16string);
-      oar(o_u32string);
-    }
-
-    std::basic_string<char> i_string;
-    std::basic_string<wchar_t> i_wstring;
-    std::basic_string<char16_t> i_u16string;
-    std::basic_string<char32_t> i_u32string;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_string);
-      iar(i_wstring);
-      iar(i_u16string);
-      iar(i_u32string);
-    }
-
-    CHECK_EQ(i_string, o_string);
-    check_collection( i_wstring, o_wstring );
-    check_collection( i_u16string, o_u16string );
-    check_collection( i_u32string, o_u32string );
-  }
-}
-
-#endif // CEREAL_TEST_BASIC_STRING_H_
diff --git a/Src/External/cereal/unittests/bitset.cpp b/Src/External/cereal/unittests/bitset.cpp
deleted file mode 100644
index 912c22c..0000000
--- a/Src/External/cereal/unittests/bitset.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "bitset.hpp"
-
-TEST_SUITE("bitset");
-
-TEST_CASE("binary_bitset")
-{
-  test_bitset<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_bitset")
-{
-  test_bitset<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_bitset")
-{
-  test_bitset<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_bitset")
-{
-  test_bitset<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/bitset.hpp b/Src/External/cereal/unittests/bitset.hpp
deleted file mode 100644
index 09f597c..0000000
--- a/Src/External/cereal/unittests/bitset.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_BITSET_H_
-#define CEREAL_TEST_BITSET_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_bitset()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rng32  = [&](){ return random_binary_string<32>( gen ); };
-  auto rng65  = [&](){ return random_binary_string<65>( gen ); };
-  auto rng256 = [&](){ return random_binary_string<256>( gen ); };
-  auto rng512 = [&](){ return random_binary_string<512>( gen ); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::bitset<32> o_bit32( rng32() );
-    std::bitset<65> o_bit65( rng65() );
-    std::bitset<256> o_bit256( rng256() );
-    std::bitset<512> o_bit512( rng512() );
-    std::bitset<32>  o_bit32_low( 0 );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_bit32);
-      oar(o_bit65);
-      oar(o_bit256);
-      oar(o_bit512);
-      oar(o_bit32_low);
-    }
-
-    std::bitset<32>  i_bit32;
-    std::bitset<65>  i_bit65;
-    std::bitset<256> i_bit256;
-    std::bitset<512> i_bit512;
-    std::bitset<32>  i_bit32_low( 0xffffffff );
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_bit32);
-      iar(i_bit65);
-      iar(i_bit256);
-      iar(i_bit512);
-      iar(i_bit32_low);
-    }
-
-    CHECK_EQ( o_bit32, i_bit32 );
-    CHECK_EQ( o_bit65, i_bit65 );
-    CHECK_EQ( o_bit256, i_bit256 );
-    CHECK_EQ( o_bit512, i_bit512 );
-
-    CHECK_EQ( o_bit32_low, i_bit32_low );
-  }
-}
-
-#endif // CEREAL_TEST_BITSET_H_
diff --git a/Src/External/cereal/unittests/boost_variant.cpp b/Src/External/cereal/unittests/boost_variant.cpp
deleted file mode 100644
index 7e073b8..0000000
--- a/Src/External/cereal/unittests/boost_variant.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2015, Kyle Fleming
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "boost_variant.hpp"
-
-TEST_SUITE("boost_variant");
-
-TEST_CASE("binary_boost_variant")
-{
-  test_boost_variant<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_boost_variant")
-{
-  test_boost_variant<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_boost_variant")
-{
-  test_boost_variant<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_boost_variant")
-{
-  test_boost_variant<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/boost_variant.hpp b/Src/External/cereal/unittests/boost_variant.hpp
deleted file mode 100644
index bedb6a8..0000000
--- a/Src/External/cereal/unittests/boost_variant.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-  Copyright (c) 2015, Kyle Fleming
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_BOOST_VARIANT_H_
-#define CEREAL_TEST_BOOST_VARIANT_H_
-
-#include "common.hpp"
-#include <cereal/types/boost_variant.hpp>
-
-template <class IArchive, class OArchive> inline
-void test_boost_variant()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  boost::variant<int, double, std::string> o_bv1 = random_value<int>(gen);
-  boost::variant<int, double, std::string> o_bv2 = random_value<double>(gen);
-  boost::variant<int, double, std::string> o_bv3 = random_basic_string<char>(gen);
-
-  std::ostringstream os;
-  {
-    OArchive oar(os);
-
-    oar(o_bv1);
-    oar(o_bv2);
-    oar(o_bv3);
-  }
-
-  decltype(o_bv1) i_bv1;
-  decltype(o_bv2) i_bv2;
-  decltype(o_bv3) i_bv3;
-
-  std::istringstream is(os.str());
-  {
-    IArchive iar(is);
-
-    iar(i_bv1);
-    iar(i_bv2);
-    iar(i_bv3);
-  }
-
-  CHECK_EQ( boost::get<int>(i_bv1), boost::get<int>(o_bv1) );
-  CHECK_EQ( boost::get<double>(i_bv2), doctest::Approx(boost::get<double>(o_bv2)).epsilon(1e-5) );
-  CHECK_EQ( boost::get<std::string>(i_bv3), boost::get<std::string>(o_bv3) );
-}
-
-#endif // CEREAL_TEST_BOOST_VARIANT_H_
diff --git a/Src/External/cereal/unittests/chrono.cpp b/Src/External/cereal/unittests/chrono.cpp
deleted file mode 100644
index b175dec..0000000
--- a/Src/External/cereal/unittests/chrono.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "chrono.hpp"
-
-TEST_SUITE("chrono");
-
-TEST_CASE("binary_chrono")
-{
-  test_chrono<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_chrono")
-{
-  test_chrono<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_chrono")
-{
-  test_chrono<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_chrono")
-{
-  test_chrono<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/chrono.hpp b/Src/External/cereal/unittests/chrono.hpp
deleted file mode 100644
index 3e66623..0000000
--- a/Src/External/cereal/unittests/chrono.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_CHRONO_H_
-#define CEREAL_TEST_CHRONO_H_
-
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_chrono()
-{
-  for(int ii=0; ii<100; ++ii)
-  {
-    auto o_timePoint1 = std::chrono::system_clock::now();
-    #ifndef CEREAL_OLDER_GCC
-    auto o_timePoint2 = std::chrono::steady_clock::now();
-    #endif // CEREAL_OLDER_GCC
-    auto o_timePoint3 = std::chrono::high_resolution_clock::now();
-
-    auto o_duration1 = std::chrono::system_clock::now() - o_timePoint1;
-    #ifndef CEREAL_OLDER_GCC
-    auto o_duration2 = std::chrono::steady_clock::now() - o_timePoint2;
-    #endif // CEREAL_OLDER_GCC
-    auto o_duration3 = std::chrono::high_resolution_clock::now() - o_timePoint3;
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_timePoint1);
-      #ifndef CEREAL_OLDER_GCC
-      oar(o_timePoint2);
-      #endif // CEREAL_OLDER_GCC
-      oar(o_timePoint3);
-      oar(o_duration1);
-      #ifndef CEREAL_OLDER_GCC
-      oar(o_duration2);
-      #endif // CEREAL_OLDER_GCC
-      oar(o_duration3);
-    }
-
-    decltype(o_timePoint1) i_timePoint1;
-    #ifndef CEREAL_OLDER_GCC
-    decltype(o_timePoint2) i_timePoint2;
-    #endif // CEREAL_OLDER_GCC
-    decltype(o_timePoint3) i_timePoint3;
-    decltype(o_duration1) i_duration1;
-    #ifndef CEREAL_OLDER_GCC
-    decltype(o_duration2) i_duration2;
-    #endif // CEREAL_OLDER_GCC
-    decltype(o_duration3) i_duration3;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_timePoint1);
-      #ifndef CEREAL_OLDER_GCC
-      iar(i_timePoint2);
-      #endif // CEREAL_OLDER_GCC
-      iar(i_timePoint3);
-      iar(i_duration1);
-      #ifndef CEREAL_OLDER_GCC
-      iar(i_duration2);
-      #endif // CEREAL_OLDER_GCC
-      iar(i_duration3);
-    }
-
-    CHECK_EQ( o_timePoint1, i_timePoint1 );
-    #ifndef CEREAL_OLDER_GCC
-    CHECK_EQ( o_timePoint2, i_timePoint2 );
-    #endif // CEREAL_OLDER_GCC
-    CHECK_EQ( o_timePoint3, i_timePoint3 );
-    CHECK_EQ( o_duration1, i_duration1 );
-    #ifndef CEREAL_OLDER_GCC
-    CHECK_EQ( o_duration2, i_duration2 );
-    #endif // CEREAL_OLDER_GCC
-    CHECK_EQ( o_duration3, i_duration3 );
-  }
-}
-
-#endif // CEREAL_TEST_CHRONO_H_
diff --git a/Src/External/cereal/unittests/cmake-config-module.cmake b/Src/External/cereal/unittests/cmake-config-module.cmake
deleted file mode 100644
index 1b2f464..0000000
--- a/Src/External/cereal/unittests/cmake-config-module.cmake
+++ /dev/null
@@ -1,123 +0,0 @@
-if(CMAKE_VERSION LESS 3.0)
-  message(FATAL_ERROR "Cereal can't be installed with CMake < 3.0")
-endif()
-
-get_filename_component(BINARY_DIR ${CMAKE_CURRENT_LIST_DIR}/../build ABSOLUTE)
-get_filename_component(INSTALL_DIR ${CMAKE_CURRENT_LIST_DIR}/../out ABSOLUTE)
-
-# cmake configure step for cereal
-file(MAKE_DIRECTORY ${BINARY_DIR}/cereal)
-execute_process(
-  COMMAND ${CMAKE_COMMAND}
-    -DJUST_INSTALL_CEREAL=1
-    -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
-    ${CMAKE_CURRENT_LIST_DIR}/..
-  WORKING_DIRECTORY ${BINARY_DIR}/cereal
-  RESULT_VARIABLE result
-)
-if(result)
-  message(FATAL_ERROR "Cereal cmake configure-step failed")
-endif()
-
-# cmake install cereal
-execute_process(
-  COMMAND ${CMAKE_COMMAND}
-    --build ${BINARY_DIR}/cereal
-    --target install
-  RESULT_VARIABLE result
-)
-if(result)
-  message(FATAL_ERROR "Cereal cmake install-step failed")
-endif()
-
-# create test project sources
-file(WRITE ${BINARY_DIR}/test_source/CMakeLists.txt "
-  cmake_minimum_required(VERSION ${CMAKE_VERSION})
-  project(cereal-test-config-module)
-  if(NOT MSVC)
-      if(CMAKE_VERSION VERSION_LESS 3.1)
-          set(CMAKE_CXX_FLAGS \"-std=c++11 \${CMAKE_CXX_FLAGS}\")
-      else()
-          set(CMAKE_CXX_STANDARD 11)
-          set(CMAKE_CXX_STANDARD_REQUIRED ON)
-      endif()
-  endif()
-  find_package(cereal REQUIRED)
-  add_executable(cereal-test-config-module main.cpp)
-  target_link_libraries(cereal-test-config-module cereal)
-  enable_testing()
-  add_test(test-cereal-test-config-module cereal-test-config-module)
-")
-file(WRITE ${BINARY_DIR}/test_source/main.cpp "
-  #include <cereal/archives/binary.hpp>
-  #include <sstream>
-  #include <cstdlib>
-  struct MyData
-  {
-    int x = 0, y = 0, z = 0;
-    void set() { x = 1; y = 2; z = 3; }
-    bool is_set() const { return x == 1 && y == 2 && z == 3; }
-
-    // This method lets cereal know which data members to serialize
-    template<class Archive>
-    void serialize(Archive & archive)
-    {
-      archive( x, y, z ); // serialize things by passing them to the archive
-    }
-  };
-  int main()
-  {
-    std::stringstream ss; // any stream can be used
-
-    {
-      cereal::BinaryOutputArchive oarchive(ss); // Create an output archive
-
-      MyData m1, m2, m3;
-      m1.set();
-      m2.set();
-      m3.set();
-      oarchive(m1, m2, m3); // Write the data to the archive
-    }
-
-    {
-      cereal::BinaryInputArchive iarchive(ss); // Create an input archive
-
-      MyData m1, m2, m3;
-      iarchive(m1, m2, m3); // Read the data from the archive
-
-      return (m1.is_set() && m2.is_set() && m3.is_set())
-      ? EXIT_SUCCESS : EXIT_FAILURE;
-    }
-  }"
-)
-file(MAKE_DIRECTORY ${BINARY_DIR}/test)
-execute_process(
-  COMMAND ${CMAKE_COMMAND}
-    -DCMAKE_PREFIX_PATH=${INSTALL_DIR}
-    ${BINARY_DIR}/test_source
-  WORKING_DIRECTORY ${BINARY_DIR}/test
-  RESULT_VARIABLE result
-)
-if(result)
-  message(FATAL_ERROR "Test cmake configure-step failed")
-endif()
-
-# cmake install cereal
-execute_process(
-  COMMAND ${CMAKE_COMMAND}
-    --build ${BINARY_DIR}/test
-  RESULT_VARIABLE result
-)
-if(result)
-  message(FATAL_ERROR "Test cmake build-step failed")
-endif()
-
-execute_process(
-  COMMAND ${CMAKE_CTEST_COMMAND}
-  WORKING_DIRECTORY ${BINARY_DIR}/test
-  RESULT_VARIABLE result
-)
-
-if(result)
-  message(FATAL_ERROR "Test run failed")
-endif()
diff --git a/Src/External/cereal/unittests/common.hpp b/Src/External/cereal/unittests/common.hpp
deleted file mode 100644
index 5376d0a..0000000
--- a/Src/External/cereal/unittests/common.hpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_COMMON_H_
-#define CEREAL_TEST_COMMON_H_
-
-#include <cereal/types/memory.hpp>
-#include <cereal/types/array.hpp>
-#include <cereal/types/valarray.hpp>
-#include <cereal/types/vector.hpp>
-#include <cereal/types/deque.hpp>
-#include <cereal/types/forward_list.hpp>
-#include <cereal/types/list.hpp>
-#include <cereal/types/string.hpp>
-#include <cereal/types/map.hpp>
-#include <cereal/types/queue.hpp>
-#include <cereal/types/set.hpp>
-#include <cereal/types/stack.hpp>
-#include <cereal/types/unordered_map.hpp>
-#include <cereal/types/unordered_set.hpp>
-#include <cereal/types/utility.hpp>
-#include <cereal/types/tuple.hpp>
-#include <cereal/types/bitset.hpp>
-#include <cereal/types/complex.hpp>
-#include <cereal/types/chrono.hpp>
-#include <cereal/types/polymorphic.hpp>
-
-#include <cereal/archives/binary.hpp>
-#include <cereal/archives/portable_binary.hpp>
-#include <cereal/archives/xml.hpp>
-#include <cereal/archives/json.hpp>
-#include <limits>
-#include <random>
-
-#include "doctest.h"
-
-namespace std
-{
-  // Ostream overload for std::pair
-  template<class F, class S> inline
-  ::std::ostream & operator<<(::std::ostream & os, ::std::pair<F, S> const & p)
-  {
-    os << "([" << p.first << "], [" << p.second << "])";
-    return os;
-  }
-}
-
-// Checks that collections have equal size and all elements are the same
-template <class T> inline
-void check_collection( T const & a, T const & b )
-{
-  auto aIter = std::begin(a);
-  auto aEnd  = std::end(a);
-  auto bIter = std::begin(b);
-  auto bEnd  = std::end(b);
-
-  CHECK_EQ( std::distance(aIter, aEnd), std::distance(bIter, bEnd) );
-
-  for( ; aIter != aEnd; ++aIter, ++bIter )
-    CHECK_EQ( *aIter, *bIter );
-}
-
-// Random Number Generation ===============================================
-template<class T> inline
-typename std::enable_if<std::is_floating_point<T>::value, T>::type
-random_value(std::mt19937 & gen)
-{ return std::uniform_real_distribution<T>(-10000.0, 10000.0)(gen); }
-
-template<class T> inline
-typename std::enable_if<std::is_integral<T>::value && sizeof(T) != sizeof(char), T>::type
-random_value(std::mt19937 & gen)
-{ return std::uniform_int_distribution<T>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen); }
-
-template<class T> inline
-typename std::enable_if<std::is_integral<T>::value && sizeof(T) == sizeof(char), T>::type
-random_value(std::mt19937 & gen)
-{ return static_cast<T>( std::uniform_int_distribution<int64_t>(std::numeric_limits<T>::lowest(), std::numeric_limits<T>::max())(gen) ); }
-
-template<class T> inline
-typename std::enable_if<std::is_same<T, std::string>::value, std::string>::type
-random_value(std::mt19937 & gen)
-{
-  std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
-  for(char & c : s)
-    c = static_cast<char>( std::uniform_int_distribution<int>( 'A', 'Z' )(gen) );
-  return s;
-}
-
-template<class C> inline
-std::basic_string<C> random_basic_string(std::mt19937 & gen)
-{
-  std::basic_string<C> s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
-  for(C & c : s)
-    c = static_cast<C>( std::uniform_int_distribution<int>( 'A', 'Z' )(gen) );
-  return s;
-}
-
-template <size_t N> inline
-std::string random_binary_string(std::mt19937 & gen)
-{
-  std::string s(N, ' ');
-  for(auto & c : s )
-     c = static_cast<char>( std::uniform_int_distribution<int>( '0', '1' )(gen) );
-  return s;
-}
-
-// Generic struct useful for testing many serialization functions
-struct StructBase
-{
-  StructBase() {}
-  StructBase( int xx, int yy ) : x( xx ), y( yy ) {}
-  int x, y;
-  bool operator==(StructBase const & other) const
-  { return x == other.x && y == other.y; }
-  bool operator!=(StructBase const & other) const
-  { return x != other.x || y != other.y; }
-  bool operator<(StructBase const & other) const
-  {
-    if (x < other.x) return true;
-    else if(other.x < x) return false;
-    else return (y < other.y);
-  }
-};
-
-inline std::ostream& operator<<(std::ostream& os, StructBase const & s)
-{
-    os << "[x: " << s.x << " y: " << s.y << "]";
-    return os;
-}
-
-struct StructInternalSerialize : StructBase
-{
-  StructInternalSerialize() : StructBase{0,0} {}
-  StructInternalSerialize(int x_, int y_) : StructBase{x_,y_} {}
-  template<class Archive>
-    void serialize(Archive & ar)
-    {
-      ar(x, y);
-    }
-};
-
-struct StructInternalSplit : StructBase
-{
-  StructInternalSplit() : StructBase{0,0} {}
-  StructInternalSplit(int x_, int y_) : StructBase{x_,y_} {}
-  template<class Archive>
-    void save(Archive & ar) const
-    {
-      ar(x, y);
-    }
-
-  template<class Archive>
-    void load(Archive & ar)
-    {
-      ar(x, y);
-    }
-};
-
-struct StructExternalSerialize : StructBase
-{
-  StructExternalSerialize() : StructBase{0,0} {}
-  StructExternalSerialize(int x_, int y_) : StructBase{x_,y_} {}
-};
-
-template<class Archive>
-void serialize(Archive & ar, StructExternalSerialize & s)
-{
-  ar(s.x, s.y);
-}
-
-struct StructExternalSplit : StructBase
-{
-  StructExternalSplit() : StructBase{0,0} {}
-  StructExternalSplit(int x_, int y_) : StructBase{x_,y_} {}
-};
-
-template<class Archive> inline
-void save(Archive & ar, StructExternalSplit const & s)
-{
-  ar(s.x, s.y);
-}
-
-template<class Archive> inline
-void load(Archive & ar, StructExternalSplit & s)
-{
-  ar(s.x, s.y);
-}
-
-template<class T>
-struct StructHash {
-  public:
-    size_t operator()(const T & s) const
-    {
-      size_t h1 = std::hash<int>()(s.x);
-      size_t h2 = std::hash<int>()(s.y);
-      return h1 ^ ( h2 << 1 );
-    }
-};
-
-#endif // CEREAL_TEST_COMMON_H_
diff --git a/Src/External/cereal/unittests/complex.cpp b/Src/External/cereal/unittests/complex.cpp
deleted file mode 100644
index 168d103..0000000
--- a/Src/External/cereal/unittests/complex.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "complex.hpp"
-
-TEST_SUITE("complex");
-
-TEST_CASE("binary_complex")
-{
-  test_complex<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_complex")
-{
-  test_complex<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_complex")
-{
-  test_complex<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_complex")
-{
-  test_complex<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/complex.hpp b/Src/External/cereal/unittests/complex.hpp
deleted file mode 100644
index ebd7e35..0000000
--- a/Src/External/cereal/unittests/complex.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_COMPLEX_H_
-#define CEREAL_TEST_COMPLEX_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_complex()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rngF = [&](){ return random_value<float>(gen); };
-  auto rngD = [&](){ return random_value<double>(gen); };
-  auto rngLD = [&](){ return random_value<long double>(gen); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::complex<float> o_float( rngF(), rngF() );
-    std::complex<double> o_double( rngD(), rngD() );
-    std::complex<long double> o_ldouble( rngLD(), rngLD() );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_float);
-      oar(o_double);
-      oar(o_ldouble);
-    }
-
-    std::complex<float> i_float;
-    std::complex<double> i_double;
-    std::complex<long double> i_ldouble;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_float);
-      iar(i_double);
-      iar(i_ldouble);
-    }
-
-    CHECK_EQ( o_float, i_float );
-    CHECK_EQ( o_double.real(), doctest::Approx(i_double.real()).epsilon(1e-5) );
-    CHECK_EQ( o_double.imag(), doctest::Approx(i_double.imag()).epsilon(1e-5) );
-    CHECK_EQ( o_ldouble.real(), doctest::Approx(i_ldouble.real()).epsilon(1e-5L) );
-    CHECK_EQ( o_ldouble.imag(), doctest::Approx(i_ldouble.imag()).epsilon(1e-5L) );
-  }
-}
-
-#endif // CEREAL_TEST_COMPLEX_H_
diff --git a/Src/External/cereal/unittests/deque.cpp b/Src/External/cereal/unittests/deque.cpp
deleted file mode 100644
index cbfaea1..0000000
--- a/Src/External/cereal/unittests/deque.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "deque.hpp"
-
-TEST_SUITE("deque");
-
-TEST_CASE("binary_dequeue")
-{
-  test_deque<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_dequeue")
-{
-  test_deque<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_dequeue")
-{
-  test_deque<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_dequeue")
-{
-  test_deque<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/deque.hpp b/Src/External/cereal/unittests/deque.hpp
deleted file mode 100644
index b129a1e..0000000
--- a/Src/External/cereal/unittests/deque.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_DEQUE_H_
-#define CEREAL_TEST_DEQUE_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive>
-void test_deque()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::deque<int> o_poddeque(100);
-    for(auto & elem : o_poddeque)
-      elem = random_value<int>(gen);
-
-    std::deque<StructInternalSerialize> o_iserdeque(100);
-    for(auto & elem : o_iserdeque)
-      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::deque<StructInternalSplit> o_ispldeque(100);
-    for(auto & elem : o_ispldeque)
-      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::deque<StructExternalSerialize> o_eserdeque(100);
-    for(auto & elem : o_eserdeque)
-      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::deque<StructExternalSplit> o_espldeque(100);
-    for(auto & elem : o_espldeque)
-      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_poddeque);
-      oar(o_iserdeque);
-      oar(o_ispldeque);
-      oar(o_eserdeque);
-      oar(o_espldeque);
-    }
-
-    std::deque<int> i_poddeque;
-    std::deque<StructInternalSerialize> i_iserdeque;
-    std::deque<StructInternalSplit>     i_ispldeque;
-    std::deque<StructExternalSerialize> i_eserdeque;
-    std::deque<StructExternalSplit>     i_espldeque;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_poddeque);
-      iar(i_iserdeque);
-      iar(i_ispldeque);
-      iar(i_eserdeque);
-      iar(i_espldeque);
-    }
-
-    CHECK_EQ(i_poddeque.size(),  o_poddeque.size());
-    CHECK_EQ(i_iserdeque.size(), o_iserdeque.size());
-    CHECK_EQ(i_ispldeque.size(), o_ispldeque.size());
-    CHECK_EQ(i_eserdeque.size(), o_eserdeque.size());
-    CHECK_EQ(i_espldeque.size(), o_espldeque.size());
-
-    check_collection(i_poddeque,  o_poddeque );
-    check_collection(i_iserdeque, o_iserdeque);
-    check_collection(i_ispldeque, o_ispldeque);
-    check_collection(i_eserdeque, o_eserdeque);
-    check_collection(i_espldeque, o_espldeque);
-  }
-}
-
-#endif // CEREAL_TEST_DEQUE_H_
diff --git a/Src/External/cereal/unittests/doctest.h b/Src/External/cereal/unittests/doctest.h
deleted file mode 100644
index 2edf604..0000000
--- a/Src/External/cereal/unittests/doctest.h
+++ /dev/null
@@ -1,3374 +0,0 @@
-// ======================================================================
-// == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! ==
-// ======================================================================
-//
-// doctest.h - the lightest feature-rich C++ single-header testing framework for unit tests and TDD
-//
-// Copyright (c) 2016 Viktor Kirilov
-//
-// Distributed under the MIT Software License
-// See accompanying file LICENSE.txt or copy at
-// https://opensource.org/licenses/MIT
-//
-// The documentation can be found at the library's page:
-// https://github.com/onqtam/doctest/blob/master/doc/markdown/readme.md
-//
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-//
-// The library is heavily influenced by Catch - https://github.com/philsquared/Catch
-// which uses the Boost Software License - Version 1.0
-// see here - https://github.com/philsquared/Catch/blob/master/LICENSE_1_0.txt
-//
-// The concept of subcases (sections in Catch) and expression decomposition are from there.
-// Some parts of the code are taken directly:
-// - stringification - the detection of "ostream& operator<<(ostream&, const T&)" and StringMaker<>
-// - the Approx() helper class for floating point comparison
-// - colors in the console
-// - breaking into a debugger
-//
-// The expression decomposing templates are taken from lest - https://github.com/martinmoene/lest
-// which uses the Boost Software License - Version 1.0
-// see here - https://github.com/martinmoene/lest/blob/master/LICENSE_1_0.txt
-//
-// =================================================================================================
-// =================================================================================================
-// =================================================================================================
-
-// Suppress this globally (without push/pop) - there is no way to silence it in the
-// expression decomposition macros _Pragma() in macros doesn't work for the c++ front-end of g++
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55578
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69543
-// Also the warning is completely worthless nowadays - http://stackoverflow.com/questions/14016993
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic ignored "-Waggregate-return"
-#endif
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic push
-#endif // > gcc 4.6
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Weffc++"
-#pragma GCC diagnostic ignored "-Wstrict-overflow"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Winline"
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif // > gcc 4.6
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif // > gcc 4.7
-#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3)
-#pragma GCC diagnostic ignored "-Wuseless-cast"
-#endif // > gcc 5.3
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration
-#pragma warning(disable : 4706) // assignment within conditional expression
-#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif                          // _MSC_VER
-
-#ifndef DOCTEST_LIBRARY_INCLUDED
-#define DOCTEST_LIBRARY_INCLUDED
-
-#define DOCTEST_VERSION_MAJOR 1
-#define DOCTEST_VERSION_MINOR 1
-#define DOCTEST_VERSION_PATCH 2
-#define DOCTEST_VERSION_STR "1.1.2"
-
-#define DOCTEST_VERSION                                                                            \
-    (DOCTEST_VERSION_MAJOR * 10000 + DOCTEST_VERSION_MINOR * 100 + DOCTEST_VERSION_PATCH)
-
-// =================================================================================================
-// == MODERN C++ FEATURE DETECTION =================================================================
-// =================================================================================================
-
-#if __cplusplus >= 201103L
-#ifndef DOCTEST_CONFIG_WITH_NULLPTR
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-#ifndef DOCTEST_CONFIG_WITH_LONG_LONG
-#define DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // __cplusplus >= 201103L
-
-// nullptr
-
-#ifndef DOCTEST_CONFIG_WITH_NULLPTR
-#ifdef __clang__
-#if __has_feature(cxx_nullptr)
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // __has_feature(cxx_nullptr)
-#endif // __clang__
-
-#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // __GNUC__
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010
-#define DOCTEST_CONFIG_WITH_NULLPTR
-#endif // _MSC_VER
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-#if defined(DOCTEST_CONFIG_NO_NULLPTR) && defined(DOCTEST_CONFIG_WITH_NULLPTR)
-#undef DOCTEST_CONFIG_WITH_NULLPTR
-#endif // DOCTEST_CONFIG_NO_NULLPTR
-
-// long long
-
-#ifndef DOCTEST_CONFIG_WITH_LONG_LONG
-#if !defined(DOCTEST_CONFIG_WITH_LONG_LONG) && defined(_MSC_VER) && (_MSC_VER >= 1400)
-#define DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // _MSC_VER
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-#if defined(DOCTEST_CONFIG_NO_LONG_LONG) && defined(DOCTEST_CONFIG_WITH_LONG_LONG)
-#undef DOCTEST_CONFIG_WITH_LONG_LONG
-#endif // DOCTEST_CONFIG_NO_LONG_LONG
-
-// static_assert
-
-#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#ifdef __clang__
-#if __has_feature(cxx_static_assert)
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // __has_feature(cxx_static_assert)
-#endif // __clang__
-
-#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 3 && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // __GNUC__
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) // MSVC 2010
-#define DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // _MSC_VER
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-
-#if defined(DOCTEST_CONFIG_NO_STATIC_ASSERT) && defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT)
-#undef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#endif // DOCTEST_CONFIG_NO_STATIC_ASSERT
-
-#if defined(DOCTEST_CONFIG_WITH_NULLPTR) || defined(DOCTEST_CONFIG_WITH_LONG_LONG) ||              \
-        defined(DOCTEST_CONFIG_WITH_STATIC_ASSERT)
-#define DOCTEST_NO_CPP11_COMPAT
-#endif // c++11 stuff
-
-#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT)
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT
-
-// =================================================================================================
-// == MODERN C++ FEATURE DETECTION END =============================================================
-// =================================================================================================
-
-// internal macros for string concatenation and anonymous variable name generation
-#define DOCTEST_CAT_IMPL(s1, s2) s1##s2
-#define DOCTEST_CAT(s1, s2) DOCTEST_CAT_IMPL(s1, s2)
-#ifdef __COUNTER__ // not standard and may be missing for some compilers
-#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __COUNTER__)
-#else // __COUNTER__
-#define DOCTEST_ANONYMOUS(x) DOCTEST_CAT(x, __LINE__)
-#endif // __COUNTER__
-
-// macro for making a string out of an identifier
-#define DOCTEST_TOSTR_IMPL(x) #x
-#define DOCTEST_TOSTR(x) DOCTEST_TOSTR_IMPL(x)
-
-// for concatenating literals and making the result a string
-#define DOCTEST_STR_CONCAT_TOSTR(s1, s2) DOCTEST_TOSTR(s1) DOCTEST_TOSTR(s2)
-
-// counts the number of elements in a C string
-#define DOCTEST_COUNTOF(x) (sizeof(x) / sizeof(x[0]))
-
-#ifndef DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-#define DOCTEST_REF_WRAP(x) x&
-#else // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-#define DOCTEST_REF_WRAP(x) x
-#endif // DOCTEST_CONFIG_ASSERTION_PARAMETERS_BY_VALUE
-
-// not using __APPLE__ because... this is how Catch does it
-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
-#define DOCTEST_PLATFORM_MAC
-#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
-#define DOCTEST_PLATFORM_IPHONE
-#elif defined(_WIN32) || defined(_MSC_VER)
-#define DOCTEST_PLATFORM_WINDOWS
-#else
-#define DOCTEST_PLATFORM_LINUX
-#endif
-
-#define DOCTEST_GCS() (*doctest::detail::getTestsContextState())
-
-// should probably take a look at https://github.com/scottt/debugbreak
-#ifdef DOCTEST_PLATFORM_MAC
-// The following code snippet based on:
-// http://cocoawithlove.com/2008/03/break-into-debugger.html
-#if defined(__ppc64__) || defined(__ppc__)
-#define DOCTEST_BREAK_INTO_DEBUGGER()                                                              \
-    __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" : : : "memory", "r0", "r3", "r4")
-#else // __ppc64__ || __ppc__
-#define DOCTEST_BREAK_INTO_DEBUGGER() __asm__("int $3\n" : :)
-#endif // __ppc64__ || __ppc__
-#elif defined(_MSC_VER)
-#define DOCTEST_BREAK_INTO_DEBUGGER() __debugbreak()
-#elif defined(__MINGW32__)
-extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-#define DOCTEST_BREAK_INTO_DEBUGGER() ::DebugBreak()
-#else // linux
-#define DOCTEST_BREAK_INTO_DEBUGGER() ((void)0)
-#endif // linux
-
-#define DOCTEST_BREAK_INTO_DEBUGGER_CHECKED()                                                      \
-    if(doctest::detail::isDebuggerActive() && !DOCTEST_GCS().no_breaks)                            \
-        DOCTEST_BREAK_INTO_DEBUGGER();
-
-#ifdef __clang__
-// to detect if libc++ is being used with clang (the _LIBCPP_VERSION identifier)
-#include <ciso646>
-#endif // __clang__
-
-#ifdef _LIBCPP_VERSION
-// not forward declaring ostream for libc++ because I had some problems (inline namespaces vs c++98)
-// so the <iosfwd> header is used - also it is very light and doesn't drag a ton of stuff
-#include <iosfwd>
-#else // _LIBCPP_VERSION
-#ifndef DOCTEST_CONFIG_USE_IOSFWD
-namespace std
-{
-template <class charT>
-struct char_traits;
-template <>
-struct char_traits<char>;
-template <class charT, class traits>
-class basic_ostream;
-typedef basic_ostream<char, char_traits<char> > ostream;
-}
-#else // DOCTEST_CONFIG_USE_IOSFWD
-#include <iosfwd>
-#endif // DOCTEST_CONFIG_USE_IOSFWD
-#endif // _LIBCPP_VERSION
-
-// static assert macro - because of the c++98 support requires that the message is an
-// identifier (no spaces and not a C string) - example without quotes: I_am_a_message
-// taken from here: http://stackoverflow.com/a/1980156/3162383
-#ifdef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#define DOCTEST_STATIC_ASSERT(expression, message) static_assert(expression, #message)
-#else // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-#define DOCTEST_STATIC_ASSERT(expression, message)                                                 \
-    struct DOCTEST_CAT(__static_assertion_at_line_, __LINE__)                                      \
-    {                                                                                              \
-        doctest::detail::static_assert_impl::StaticAssertion<static_cast<bool>((expression))>      \
-                DOCTEST_CAT(DOCTEST_CAT(DOCTEST_CAT(STATIC_ASSERTION_FAILED_AT_LINE_, __LINE__),   \
-                                        _),                                                        \
-                            message);                                                              \
-    };                                                                                             \
-    typedef doctest::detail::static_assert_impl::StaticAssertionTest<sizeof(                       \
-            DOCTEST_CAT(__static_assertion_at_line_, __LINE__))>                                   \
-            DOCTEST_CAT(__static_assertion_test_at_line_, __LINE__)
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-
-#ifdef DOCTEST_CONFIG_WITH_NULLPTR
-#ifdef _LIBCPP_VERSION
-#include <cstddef>
-#else  // _LIBCPP_VERSION
-namespace std
-{ typedef decltype(nullptr) nullptr_t; }
-#endif // _LIBCPP_VERSION
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-namespace doctest
-{
-class String
-{
-    char* m_str;
-
-    void copy(const String& other);
-
-public:
-    String(const char* in = "");
-    String(const String& other);
-    ~String();
-
-    String& operator=(const String& other);
-
-    String operator+(const String& other) const;
-    String& operator+=(const String& other);
-
-    char& operator[](unsigned pos) { return m_str[pos]; }
-    const char& operator[](unsigned pos) const { return m_str[pos]; }
-
-    char*       c_str() { return m_str; }
-    const char* c_str() const { return m_str; }
-
-    unsigned size() const;
-    unsigned length() const;
-
-    int compare(const char* other, bool no_case = false) const;
-    int compare(const String& other, bool no_case = false) const;
-};
-
-// clang-format off
-inline bool operator==(const String& lhs, const String& rhs) { return lhs.compare(rhs) == 0; }
-inline bool operator!=(const String& lhs, const String& rhs) { return lhs.compare(rhs) != 0; }
-inline bool operator< (const String& lhs, const String& rhs) { return lhs.compare(rhs) < 0; }
-inline bool operator> (const String& lhs, const String& rhs) { return lhs.compare(rhs) > 0; }
-inline bool operator<=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) < 0 : true; }
-inline bool operator>=(const String& lhs, const String& rhs) { return (lhs != rhs) ? lhs.compare(rhs) > 0 : true; }
-// clang-format on
-
-std::ostream& operator<<(std::ostream& stream, const String& in);
-
-namespace detail
-{
-#ifndef DOCTEST_CONFIG_WITH_STATIC_ASSERT
-    namespace static_assert_impl
-    {
-        template <bool>
-        struct StaticAssertion;
-
-        template <>
-        struct StaticAssertion<true>
-        {};
-
-        template <int i>
-        struct StaticAssertionTest
-        {};
-    }  // namespace static_assert_impl
-#endif // DOCTEST_CONFIG_WITH_STATIC_ASSERT
-
-    template <typename T>
-    struct deferred_false
-    { static const bool value = false; };
-
-    namespace has_insertion_operator_impl
-    {
-        typedef char no;
-        typedef char yes[2];
-
-        struct any_t
-        {
-            template <typename T>
-            any_t(const DOCTEST_REF_WRAP(T));
-        };
-
-        yes& testStreamable(std::ostream&);
-        no   testStreamable(no);
-
-        no operator<<(const std::ostream&, const any_t&);
-
-        template <typename T>
-        struct has_insertion_operator
-        {
-            static std::ostream& s;
-            static const DOCTEST_REF_WRAP(T) t;
-            static const bool value = sizeof(testStreamable(s << t)) == sizeof(yes);
-        };
-    } // namespace has_insertion_operator_impl
-
-    template <typename T>
-    struct has_insertion_operator : has_insertion_operator_impl::has_insertion_operator<T>
-    {};
-
-    std::ostream* createStream();
-    String        getStreamResult(std::ostream*);
-    void          freeStream(std::ostream*);
-
-    template <bool C>
-    struct StringMakerBase
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T)) {
-            return "{?}";
-        }
-    };
-
-    template <>
-    struct StringMakerBase<true>
-    {
-        template <typename T>
-        static String convert(const DOCTEST_REF_WRAP(T) in) {
-            std::ostream* stream = createStream();
-            *stream << in;
-            String result = getStreamResult(stream);
-            freeStream(stream);
-            return result;
-        }
-    };
-
-    String rawMemoryToString(const void* object, unsigned size);
-
-    template <typename T>
-    String rawMemoryToString(const DOCTEST_REF_WRAP(T) object) {
-        return rawMemoryToString(&object, sizeof(object));
-    }
-} // namespace detail
-
-template <typename T>
-struct StringMaker : detail::StringMakerBase<detail::has_insertion_operator<T>::value>
-{};
-
-template <typename T>
-struct StringMaker<T*>
-{
-    template <typename U>
-    static String convert(U* p) {
-        if(!p)
-            return "NULL";
-        else
-            return detail::rawMemoryToString(p);
-    }
-};
-
-template <typename R, typename C>
-struct StringMaker<R C::*>
-{
-    static String convert(R C::*p) {
-        if(!p)
-            return "NULL";
-        else
-            return detail::rawMemoryToString(p);
-    }
-};
-
-template <typename T>
-String toString(const DOCTEST_REF_WRAP(T) value) {
-    return StringMaker<T>::convert(value);
-}
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(char* in);
-String toString(const char* in);
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(bool in);
-String toString(float in);
-String toString(double in);
-String toString(double long in);
-
-String toString(char in);
-String toString(char unsigned in);
-String toString(int short in);
-String toString(int short unsigned in);
-String toString(int in);
-String toString(int unsigned in);
-String toString(int long in);
-String toString(int long unsigned in);
-
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-String toString(int long long in);
-String toString(int long long unsigned in);
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-#ifdef DOCTEST_CONFIG_WITH_NULLPTR
-String toString(std::nullptr_t in);
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-class Approx
-{
-public:
-    explicit Approx(double value);
-
-    Approx(Approx const& other)
-            : m_epsilon(other.m_epsilon)
-            , m_scale(other.m_scale)
-            , m_value(other.m_value) {}
-
-    Approx operator()(double value) {
-        Approx approx(value);
-        approx.epsilon(m_epsilon);
-        approx.scale(m_scale);
-        return approx;
-    }
-
-    friend bool operator==(double lhs, Approx const& rhs);
-    friend bool operator==(Approx const& lhs, double rhs) { return operator==(rhs, lhs); }
-    friend bool operator!=(double lhs, Approx const& rhs) { return !operator==(lhs, rhs); }
-    friend bool operator!=(Approx const& lhs, double rhs) { return !operator==(rhs, lhs); }
-
-    Approx& epsilon(double newEpsilon) {
-        m_epsilon = newEpsilon;
-        return *this;
-    }
-
-    Approx& scale(double newScale) {
-        m_scale = newScale;
-        return *this;
-    }
-
-    String toString() const;
-
-private:
-    double m_epsilon;
-    double m_scale;
-    double m_value;
-};
-
-template <>
-inline String toString<Approx>(const DOCTEST_REF_WRAP(Approx) value) {
-    return value.toString();
-}
-
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-namespace detail
-{
-    // the function type this library works with
-    typedef void (*funcType)(void);
-
-    namespace assertType
-    {
-        enum Enum
-        {
-            // macro traits
-
-            is_warn    = 1,
-            is_check   = 2,
-            is_require = 4,
-
-            is_throws    = 8,
-            is_throws_as = 16,
-            is_nothrow   = 32,
-
-            is_fast  = 64, // not checked anywhere - used just to distinguish the types
-            is_false = 128,
-            is_unary = 256,
-
-            is_eq = 512,
-            is_ne = 1024,
-
-            is_lt = 2048,
-            is_gt = 4096,
-
-            is_ge = 8192,
-            is_le = 16384,
-
-            // macro types
-
-            DT_WARN    = is_warn,
-            DT_CHECK   = is_check,
-            DT_REQUIRE = is_require,
-
-            DT_WARN_FALSE    = is_false | is_warn,
-            DT_CHECK_FALSE   = is_false | is_check,
-            DT_REQUIRE_FALSE = is_false | is_require,
-
-            DT_WARN_THROWS    = is_throws | is_warn,
-            DT_CHECK_THROWS   = is_throws | is_check,
-            DT_REQUIRE_THROWS = is_throws | is_require,
-
-            DT_WARN_THROWS_AS    = is_throws_as | is_warn,
-            DT_CHECK_THROWS_AS   = is_throws_as | is_check,
-            DT_REQUIRE_THROWS_AS = is_throws_as | is_require,
-
-            DT_WARN_NOTHROW    = is_nothrow | is_warn,
-            DT_CHECK_NOTHROW   = is_nothrow | is_check,
-            DT_REQUIRE_NOTHROW = is_nothrow | is_require,
-
-            DT_WARN_EQ    = is_eq | is_warn,
-            DT_CHECK_EQ   = is_eq | is_check,
-            DT_REQUIRE_EQ = is_eq | is_require,
-
-            DT_WARN_NE    = is_ne | is_warn,
-            DT_CHECK_NE   = is_ne | is_check,
-            DT_REQUIRE_NE = is_ne | is_require,
-
-            DT_WARN_GT    = is_gt | is_warn,
-            DT_CHECK_GT   = is_gt | is_check,
-            DT_REQUIRE_GT = is_gt | is_require,
-
-            DT_WARN_LT    = is_lt | is_warn,
-            DT_CHECK_LT   = is_lt | is_check,
-            DT_REQUIRE_LT = is_lt | is_require,
-
-            DT_WARN_GE    = is_ge | is_warn,
-            DT_CHECK_GE   = is_ge | is_check,
-            DT_REQUIRE_GE = is_ge | is_require,
-
-            DT_WARN_LE    = is_le | is_warn,
-            DT_CHECK_LE   = is_le | is_check,
-            DT_REQUIRE_LE = is_le | is_require,
-
-            DT_WARN_UNARY    = is_unary | is_warn,
-            DT_CHECK_UNARY   = is_unary | is_check,
-            DT_REQUIRE_UNARY = is_unary | is_require,
-
-            DT_WARN_UNARY_FALSE    = is_false | is_unary | is_warn,
-            DT_CHECK_UNARY_FALSE   = is_false | is_unary | is_check,
-            DT_REQUIRE_UNARY_FALSE = is_false | is_unary | is_require,
-
-            DT_FAST_WARN_EQ    = is_fast | is_eq | is_warn,
-            DT_FAST_CHECK_EQ   = is_fast | is_eq | is_check,
-            DT_FAST_REQUIRE_EQ = is_fast | is_eq | is_require,
-
-            DT_FAST_WARN_NE    = is_fast | is_ne | is_warn,
-            DT_FAST_CHECK_NE   = is_fast | is_ne | is_check,
-            DT_FAST_REQUIRE_NE = is_fast | is_ne | is_require,
-
-            DT_FAST_WARN_GT    = is_fast | is_gt | is_warn,
-            DT_FAST_CHECK_GT   = is_fast | is_gt | is_check,
-            DT_FAST_REQUIRE_GT = is_fast | is_gt | is_require,
-
-            DT_FAST_WARN_LT    = is_fast | is_lt | is_warn,
-            DT_FAST_CHECK_LT   = is_fast | is_lt | is_check,
-            DT_FAST_REQUIRE_LT = is_fast | is_lt | is_require,
-
-            DT_FAST_WARN_GE    = is_fast | is_ge | is_warn,
-            DT_FAST_CHECK_GE   = is_fast | is_ge | is_check,
-            DT_FAST_REQUIRE_GE = is_fast | is_ge | is_require,
-
-            DT_FAST_WARN_LE    = is_fast | is_le | is_warn,
-            DT_FAST_CHECK_LE   = is_fast | is_le | is_check,
-            DT_FAST_REQUIRE_LE = is_fast | is_le | is_require,
-
-            DT_FAST_WARN_UNARY    = is_fast | is_unary | is_warn,
-            DT_FAST_CHECK_UNARY   = is_fast | is_unary | is_check,
-            DT_FAST_REQUIRE_UNARY = is_fast | is_unary | is_require,
-
-            DT_FAST_WARN_UNARY_FALSE    = is_fast | is_false | is_unary | is_warn,
-            DT_FAST_CHECK_UNARY_FALSE   = is_fast | is_false | is_unary | is_check,
-            DT_FAST_REQUIRE_UNARY_FALSE = is_fast | is_false | is_unary | is_require
-        };
-    } // namespace assertType
-
-    const char* getAssertString(assertType::Enum val);
-
-    // clang-format off
-    template<class T>               struct decay_array       { typedef T type; };
-    template<class T, unsigned N>   struct decay_array<T[N]> { typedef T* type; };
-    template<class T>               struct decay_array<T[]>  { typedef T* type; };
-
-    template<class T>   struct not_char_pointer              { enum { value = true }; };
-    template<>          struct not_char_pointer<char*>       { enum { value = false }; };
-    template<>          struct not_char_pointer<const char*> { enum { value = false }; };
-
-    template<class T> struct can_use_op : not_char_pointer<typename decay_array<T>::type> {};
-
-    template<bool, class = void> struct enable_if {};
-    template<class T> struct enable_if<true, T> { typedef T type; };
-    // clang-format on
-
-    struct TestFailureException
-    {};
-
-    bool checkIfShouldThrow(assertType::Enum assert_type);
-    void fastAssertThrowIfFlagSet(int flags);
-    void throwException();
-    bool always_false();
-
-    // a struct defining a registered test callback
-    struct TestData
-    {
-        // not used for determining uniqueness
-        const char* m_suite; // the test suite in which the test was added
-        const char* m_name;  // name of the test function
-        funcType    m_f;     // a function pointer to the test function
-
-        // fields by which uniqueness of test cases shall be determined
-        const char* m_file; // the file in which the test was registered
-        unsigned    m_line; // the line where the test was registered
-
-        TestData(const char* suite, const char* name, funcType f, const char* file, unsigned line)
-                : m_suite(suite)
-                , m_name(name)
-                , m_f(f)
-                , m_file(file)
-                , m_line(line) {}
-
-        bool operator<(const TestData& other) const;
-    };
-
-    struct SubcaseSignature
-    {
-        const char* m_name;
-        const char* m_file;
-        int         m_line;
-
-        SubcaseSignature(const char* name, const char* file, int line)
-                : m_name(name)
-                , m_file(file)
-                , m_line(line) {}
-
-        bool operator<(const SubcaseSignature& other) const;
-    };
-
-    struct Subcase
-    {
-        SubcaseSignature m_signature;
-        bool             m_entered;
-
-        Subcase(const char* name, const char* file, int line);
-        Subcase(const Subcase& other);
-        ~Subcase();
-
-        operator bool() const { return m_entered; }
-    };
-
-    template <typename L, typename R>
-    String stringifyBinaryExpr(const DOCTEST_REF_WRAP(L) lhs, const char* op,
-                               const DOCTEST_REF_WRAP(R) rhs) {
-        return toString(lhs) + op + toString(rhs);
-    }
-
-    struct Result
-    {
-        bool   m_passed;
-        String m_decomposition;
-
-// to fix gcc 4.7 "-Winline" warnings
-#if defined(__GNUC__) && !defined(__clang__)
-        __attribute__((noinline))
-#endif
-        ~Result() {
-        }
-
-        Result(bool passed = false, const String& decomposition = String())
-                : m_passed(passed)
-                , m_decomposition(decomposition) {}
-
-        Result(const Result& other)
-                : m_passed(other.m_passed)
-                , m_decomposition(other.m_decomposition) {}
-
-// to fix gcc 4.7 "-Winline" warnings
-#if defined(__GNUC__) && !defined(__clang__)
-        __attribute__((noinline))
-#endif
-        Result&
-        operator=(const Result& other) {
-            m_passed        = other.m_passed;
-            m_decomposition = other.m_decomposition;
-
-            return *this;
-        }
-
-        operator bool() { return !m_passed; }
-
-        void invert() { m_passed = !m_passed; }
-
-        // clang-format off
-        // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence
-        template <typename R> Result operator&  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator^  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator|  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator&& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator|| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator== (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator!= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator<  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator>  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator<= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator>= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator=  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator+= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator-= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator*= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator/= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator%= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator<<=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator>>=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator&= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator^= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        template <typename R> Result operator|= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return Result(); }
-        // clang-format on
-    };
-
-#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#pragma clang diagnostic ignored "-Wsign-compare"
-#pragma clang diagnostic ignored "-Wdouble-promotion"
-//#pragma clang diagnostic ignored "-Wconversion"
-//#pragma clang diagnostic ignored "-Wfloat-equal"
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic push
-#endif // > gcc 4.6
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 5)
-#pragma GCC diagnostic ignored "-Wdouble-promotion"
-#endif // > gcc 4.5
-//#pragma GCC diagnostic ignored "-Wconversion"
-//#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(push)
-// http://stackoverflow.com/questions/39479163 what's the difference between C4018 and C4389
-#pragma warning(disable : 4389) // 'operator' : signed/unsigned mismatch
-#pragma warning(disable : 4018) // 'expression' : signed/unsigned mismatch
-//#pragma warning(disable : 4805) // 'operation' : unsafe mix of type 'type' and type 'type' in operation
-#endif // _MSC_VER
-
-#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-// clang-format off
-#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE bool
-#else // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-#define DOCTEST_COMPARISON_RETURN_TYPE typename enable_if<can_use_op<L>::value || can_use_op<R>::value, bool>::type
-    inline bool eq(const char* lhs, const char* rhs) { return String(lhs) == String(rhs); }
-    inline bool ne(const char* lhs, const char* rhs) { return String(lhs) != String(rhs); }
-    inline bool lt(const char* lhs, const char* rhs) { return String(lhs) <  String(rhs); }
-    inline bool gt(const char* lhs, const char* rhs) { return String(lhs) >  String(rhs); }
-    inline bool le(const char* lhs, const char* rhs) { return String(lhs) <= String(rhs); }
-    inline bool ge(const char* lhs, const char* rhs) { return String(lhs) >= String(rhs); }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE eq(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs == rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE ne(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs != rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE lt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <  rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE gt(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >  rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE le(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs <= rhs; }
-    template <typename L, typename R> DOCTEST_COMPARISON_RETURN_TYPE ge(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) { return lhs >= rhs; }
-    // clang-format on
-
-    template <typename L>
-    struct Expression_lhs
-    {
-        L lhs;
-
-        Expression_lhs(L in)
-                : lhs(in) {}
-
-        Expression_lhs(const Expression_lhs& other)
-                : lhs(other.lhs) {}
-
-        operator Result() { return Result(!!lhs, toString(lhs)); }
-
-// clang-format off
-#ifndef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-        template <typename R> Result operator==(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs == rhs, stringifyBinaryExpr(lhs, " == ", rhs)); }
-        template <typename R> Result operator!=(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs != rhs, stringifyBinaryExpr(lhs, " != ", rhs)); }
-        template <typename R> Result operator< (const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs <  rhs, stringifyBinaryExpr(lhs, " < " , rhs)); }
-        template <typename R> Result operator<=(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs <= rhs, stringifyBinaryExpr(lhs, " <= ", rhs)); }
-        template <typename R> Result operator> (const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs >  rhs, stringifyBinaryExpr(lhs, " > " , rhs)); }
-        template <typename R> Result operator>=(const DOCTEST_REF_WRAP(R) rhs) { return Result(lhs >= rhs, stringifyBinaryExpr(lhs, " >= ", rhs)); }
-#else  // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-        template <typename R> Result operator==(const DOCTEST_REF_WRAP(R) rhs) { return Result(eq(lhs, rhs), stringifyBinaryExpr(lhs, " == ", rhs)); }
-        template <typename R> Result operator!=(const DOCTEST_REF_WRAP(R) rhs) { return Result(ne(lhs, rhs), stringifyBinaryExpr(lhs, " != ", rhs)); }
-        template <typename R> Result operator< (const DOCTEST_REF_WRAP(R) rhs) { return Result(lt(lhs, rhs), stringifyBinaryExpr(lhs, " < " , rhs)); }
-        template <typename R> Result operator<=(const DOCTEST_REF_WRAP(R) rhs) { return Result(le(lhs, rhs), stringifyBinaryExpr(lhs, " <= ", rhs)); }
-        template <typename R> Result operator> (const DOCTEST_REF_WRAP(R) rhs) { return Result(gt(lhs, rhs), stringifyBinaryExpr(lhs, " > " , rhs)); }
-        template <typename R> Result operator>=(const DOCTEST_REF_WRAP(R) rhs) { return Result(ge(lhs, rhs), stringifyBinaryExpr(lhs, " >= ", rhs)); }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-        // clang-format on
-
-        // clang-format off
-        // forbidding some expressions based on this table: http://en.cppreference.com/w/cpp/language/operator_precedence
-        template <typename R> int operator&  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator^  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator|  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator&& (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator|| (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator=  (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator+= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator-= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator*= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator/= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator%= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator<<=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator>>=(const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator&= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator^= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        template <typename R> int operator|= (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison); return int(); }
-        // these 2 are unfortunate because they should be allowed - they have higher precedence over the comparisons, but the
-        // ExpressionDecomposer class uses the left shift operator to capture the left operand of the binary expression...
-        template <typename R> int operator<< (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Please_Surround_The_Left_Shift_Operation_With_Parenthesis); return int(); }
-        template <typename R> int operator>> (const R&) { DOCTEST_STATIC_ASSERT(deferred_false<R>::value, Please_Surround_The_Right_Shift_Operation_With_Parenthesis); return int(); }
-        // clang-format on
-    };
-
-#ifndef DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic pop
-#endif // > gcc 4.6
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // _MSC_VER
-
-#endif // DOCTEST_CONFIG_NO_COMPARISON_WARNING_SUPPRESSION
-
-    struct ExpressionDecomposer
-    {
-        template <typename L>
-        Expression_lhs<const DOCTEST_REF_WRAP(L)> operator<<(const DOCTEST_REF_WRAP(L) operand) {
-            return Expression_lhs<const DOCTEST_REF_WRAP(L)>(operand);
-        }
-    };
-
-    // forward declarations of functions used by the macros
-    int regTest(void (*f)(void), unsigned line, const char* file, const char* name);
-    int setTestSuiteName(const char* name);
-
-    void addFailedAssert(assertType::Enum assert_type);
-
-    void logTestStart(const char* name, const char* file, unsigned line);
-    void logTestEnd();
-
-    void logTestCrashed();
-
-    void logAssert(bool passed, const char* decomposition, bool threw, const char* expr,
-                   assertType::Enum assert_type, const char* file, int line);
-
-    void logAssertThrows(bool threw, const char* expr, assertType::Enum assert_type,
-                         const char* file, int line);
-
-    void logAssertThrowsAs(bool threw, bool threw_as, const char* as, const char* expr,
-                           assertType::Enum assert_type, const char* file, int line);
-
-    void logAssertNothrow(bool threw, const char* expr, assertType::Enum assert_type,
-                          const char* file, int line);
-
-    bool isDebuggerActive();
-    void writeToDebugConsole(const String&);
-
-    struct TestAccessibleContextState
-    {
-        bool            success;   // include successful assertions in output
-        bool            no_throw;  // to skip exceptions-related assertion macros
-        bool            no_breaks; // to not break into the debugger
-        const TestData* currentTest;
-        bool            hasLoggedCurrentTestStart;
-        int             numAssertionsForCurrentTestcase;
-    };
-
-    struct ContextState;
-
-    TestAccessibleContextState* getTestsContextState();
-
-    namespace binaryAssertComparison
-    {
-        enum Enum
-        {
-            eq = 0,
-            ne,
-            gt,
-            lt,
-            ge,
-            le
-        };
-    } // namespace binaryAssertComparison
-
-    // clang-format off
-    template <int, class L, class R> struct RelationalComparator     { bool operator()(const DOCTEST_REF_WRAP(L),     const DOCTEST_REF_WRAP(R)    ) const { return false;        } };
-    template <class L, class R> struct RelationalComparator<0, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return eq(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<1, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ne(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<2, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return gt(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<3, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return lt(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<4, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return ge(lhs, rhs); } };
-    template <class L, class R> struct RelationalComparator<5, L, R> { bool operator()(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) const { return le(lhs, rhs); } };
-    // clang-format on
-
-    struct ResultBuilder
-    {
-        assertType::Enum m_assert_type;
-        const char*      m_file;
-        int              m_line;
-        const char*      m_expr;
-        const char*      m_exception_type;
-
-        Result m_result;
-        bool   m_threw;
-        bool   m_threw_as;
-        bool   m_failed;
-
-        ResultBuilder(assertType::Enum assert_type, const char* file, int line, const char* expr,
-                      const char* exception_type = "");
-
-// to fix gcc 4.7 "-Winline" warnings
-#if defined(__GNUC__) && !defined(__clang__)
-        __attribute__((noinline))
-#endif
-        ~ResultBuilder() {
-        }
-
-        void setResult(const Result& res) { m_result = res; }
-
-        template <int comparison, typename L, typename R>
-        void          binary_assert(const DOCTEST_REF_WRAP(L) lhs, const DOCTEST_REF_WRAP(R) rhs) {
-            m_result.m_passed        = RelationalComparator<comparison, L, R>()(lhs, rhs);
-            m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs);
-        }
-
-        template <typename L>
-        void unary_assert(const DOCTEST_REF_WRAP(L) val) {
-            m_result.m_passed        = !!val;
-            m_result.m_decomposition = toString(val);
-        }
-
-        bool log();
-        void react() const;
-    };
-
-    namespace assertAction
-    {
-        enum Enum
-        {
-            nothing     = 0,
-            dbgbreak    = 1,
-            shouldthrow = 2
-        };
-    } // namespace assertAction
-
-    template <int comparison, typename L, typename R>
-    int fast_binary_assert(assertType::Enum assert_type, const char* file, int line,
-                           const char* lhs_str, const char* rhs_str, const DOCTEST_REF_WRAP(L) lhs,
-                           const DOCTEST_REF_WRAP(R) rhs) {
-        String        expr     = String(lhs_str) + ", " + rhs_str;
-        const char*   expr_str = expr.c_str();
-        ResultBuilder rb(assert_type, file, line, expr_str);
-
-        rb.m_result.m_passed        = RelationalComparator<comparison, L, R>()(lhs, rhs);
-        rb.m_result.m_decomposition = stringifyBinaryExpr(lhs, ", ", rhs);
-
-        int res = 0;
-
-        if(rb.log())
-            res |= assertAction::dbgbreak;
-
-        if(rb.m_failed && checkIfShouldThrow(assert_type))
-            res |= assertAction::shouldthrow;
-
-#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-        // #########################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // #########################################################################################
-        if(res & assertAction::dbgbreak)
-            DOCTEST_BREAK_INTO_DEBUGGER();
-        fastAssertThrowIfFlagSet(res);
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-        return res;
-    }
-
-    template <typename L>
-    int fast_unary_assert(assertType::Enum assert_type, const char* file, int line,
-                          const char* val_str, const DOCTEST_REF_WRAP(L) val) {
-        ResultBuilder rb(assert_type, file, line, val_str);
-
-        rb.m_result.m_passed        = !!val;
-        rb.m_result.m_decomposition = toString(val);
-
-        int res = 0;
-
-        if(rb.log())
-            res |= assertAction::dbgbreak;
-
-        if(rb.m_failed && checkIfShouldThrow(assert_type))
-            res |= assertAction::shouldthrow;
-
-#ifdef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-        // #########################################################################################
-        // IF THE DEBUGGER BREAKS HERE - GO 1 LEVEL UP IN THE CALLSTACK TO SEE THE FAILING ASSERTION
-        // THIS IS THE EFFECT OF HAVING 'DOCTEST_CONFIG_SUPER_FAST_ASSERTS' DEFINED
-        // #########################################################################################
-        if(res & assertAction::dbgbreak)
-            DOCTEST_BREAK_INTO_DEBUGGER();
-        fastAssertThrowIfFlagSet(res);
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-        return res;
-    }
-} // namespace detail
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-class Context
-{
-#if !defined(DOCTEST_CONFIG_DISABLE)
-    detail::ContextState* p;
-
-    void parseArgs(int argc, const char* const* argv, bool withDefaults = false);
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-public:
-    Context(int argc = 0, const char* const* argv = 0);
-
-// to fix gcc 4.7 "-Winline" warnings
-#if defined(__GNUC__) && !defined(__clang__)
-    __attribute__((noinline))
-#endif
-    ~Context();
-
-    void applyCommandLine(int argc, const char* const* argv);
-
-    void addFilter(const char* filter, const char* value);
-    void clearFilters();
-    void setOption(const char* option, int value);
-    void setOption(const char* option, const char* value);
-
-    bool shouldExit();
-
-    int run();
-};
-
-} // namespace doctest
-
-// if registering is not disabled
-#if !defined(DOCTEST_CONFIG_DISABLE)
-
-// registers the test by initializing a dummy var with a function
-#if defined(__GNUC__) && !defined(__clang__)
-#define DOCTEST_REGISTER_FUNCTION(f, name)                                                         \
-    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) __attribute__((unused)) =                     \
-            doctest::detail::regTest(f, __LINE__, __FILE__, name);
-#elif defined(__clang__)
-#define DOCTEST_REGISTER_FUNCTION(f, name)                                                         \
-    _Pragma("clang diagnostic push")                                                               \
-            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int               \
-                    DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) =                                        \
-                            doctest::detail::regTest(f, __LINE__, __FILE__, name);                 \
-    _Pragma("clang diagnostic pop")
-#else // MSVC
-#define DOCTEST_REGISTER_FUNCTION(f, name)                                                         \
-    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) =                                             \
-            doctest::detail::regTest(f, __LINE__, __FILE__, name);
-#endif // MSVC
-
-#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
-    namespace                                                                                      \
-    {                                                                                              \
-        struct der : base                                                                          \
-        { void f(); };                                                                             \
-        static void func() {                                                                       \
-            der v;                                                                                 \
-            v.f();                                                                                 \
-        }                                                                                          \
-        DOCTEST_REGISTER_FUNCTION(func, name)                                                      \
-    }                                                                                              \
-    inline void der::f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
-    static void f();                                                                               \
-    DOCTEST_REGISTER_FUNCTION(f, name)                                                             \
-    inline void f()
-
-// for registering tests
-#define DOCTEST_TEST_CASE(name)                                                                    \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for registering tests with a fixture
-#define DOCTEST_TEST_CASE_FIXTURE(c, name)                                                         \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), c,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for subcases
-#if defined(__GNUC__)
-#define DOCTEST_SUBCASE(name)                                                                      \
-    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_)                  \
-                                                __attribute__((unused)) =                          \
-               doctest::detail::Subcase(name, __FILE__, __LINE__))
-#else // __GNUC__
-#define DOCTEST_SUBCASE(name)                                                                      \
-    if(const doctest::detail::Subcase & DOCTEST_ANONYMOUS(_DOCTEST_ANON_SUBCASE_) =                \
-               doctest::detail::Subcase(name, __FILE__, __LINE__))
-#endif // __GNUC__
-
-// for starting a testsuite block
-#if defined(__GNUC__) && !defined(__clang__)
-#define DOCTEST_TEST_SUITE(name)                                                                   \
-    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) __attribute__((unused)) =                     \
-            doctest::detail::setTestSuiteName(name);                                               \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#elif defined(__clang__)
-#define DOCTEST_TEST_SUITE(name)                                                                   \
-    _Pragma("clang diagnostic push")                                                               \
-            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int               \
-                    DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) =                                        \
-                            doctest::detail::setTestSuiteName(name);                               \
-    _Pragma("clang diagnostic pop") typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#else // MSVC
-#define DOCTEST_TEST_SUITE(name)                                                                   \
-    static int  DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) = doctest::detail::setTestSuiteName(name);   \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#endif // MSVC
-
-// for ending a testsuite block
-#if defined(__GNUC__) && !defined(__clang__)
-#define DOCTEST_TEST_SUITE_END                                                                     \
-    static int DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) __attribute__((unused)) =                     \
-            doctest::detail::setTestSuiteName("");                                                 \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#elif defined(__clang__)
-#define DOCTEST_TEST_SUITE_END                                                                                                 \
-    _Pragma("clang diagnostic push")                                                                                           \
-            _Pragma("clang diagnostic ignored \"-Wglobal-constructors\"") static int                                           \
-                                                DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) = doctest::detail::setTestSuiteName(""); \
-    _Pragma("clang diagnostic pop") typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#else // MSVC
-#define DOCTEST_TEST_SUITE_END                                                                     \
-    static int  DOCTEST_ANONYMOUS(_DOCTEST_ANON_VAR_) = doctest::detail::setTestSuiteName("");     \
-    typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-#endif // MSVC
-
-#define DOCTEST_ASSERT_LOG_AND_REACT(rb)                                                           \
-    if(rb.log())                                                                                   \
-        DOCTEST_BREAK_INTO_DEBUGGER();                                                             \
-    rb.react()
-
-#define DOCTEST_ASSERT_IMPLEMENT(expr, assert_type)                                                \
-    doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type, __FILE__, \
-                                               __LINE__, #expr);                                   \
-    try {                                                                                          \
-        _DOCTEST_RB.setResult(doctest::detail::ExpressionDecomposer() << expr);                    \
-    } catch(...) { _DOCTEST_RB.m_threw = true; }                                                   \
-    DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);
-
-#if defined(__clang__)
-#define DOCTEST_ASSERT_PROXY(expr, assert_type)                                                    \
-    do {                                                                                           \
-        _Pragma("clang diagnostic push")                                                           \
-                _Pragma("clang diagnostic ignored \"-Woverloaded-shift-op-parentheses\"")          \
-                        DOCTEST_ASSERT_IMPLEMENT(expr, assert_type)                                \
-                                _Pragma("clang diagnostic pop")                                    \
-    } while(doctest::detail::always_false())
-#else // __clang__
-#define DOCTEST_ASSERT_PROXY(expr, assert_type)                                                    \
-    do {                                                                                           \
-        DOCTEST_ASSERT_IMPLEMENT(expr, assert_type)                                                \
-    } while(doctest::detail::always_false())
-#endif // __clang__
-
-#define DOCTEST_WARN(expr) DOCTEST_ASSERT_PROXY(expr, DT_WARN)
-#define DOCTEST_CHECK(expr) DOCTEST_ASSERT_PROXY(expr, DT_CHECK)
-#define DOCTEST_REQUIRE(expr) DOCTEST_ASSERT_PROXY(expr, DT_REQUIRE)
-
-#define DOCTEST_WARN_FALSE(expr) DOCTEST_ASSERT_PROXY(expr, DT_WARN_FALSE)
-#define DOCTEST_CHECK_FALSE(expr) DOCTEST_ASSERT_PROXY(expr, DT_CHECK_FALSE)
-#define DOCTEST_REQUIRE_FALSE(expr) DOCTEST_ASSERT_PROXY(expr, DT_REQUIRE_FALSE)
-
-#define DOCTEST_ASSERT_THROWS(expr, assert_type)                                                   \
-    do {                                                                                           \
-        if(!DOCTEST_GCS().no_throw) {                                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
-                                                       __FILE__, __LINE__, #expr);                 \
-            try {                                                                                  \
-                expr;                                                                              \
-            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while(doctest::detail::always_false())
-
-#define DOCTEST_ASSERT_THROWS_AS(expr, as, assert_type)                                            \
-    do {                                                                                           \
-        if(!DOCTEST_GCS().no_throw) {                                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
-                                                       __FILE__, __LINE__, #expr, #as);            \
-            try {                                                                                  \
-                expr;                                                                              \
-            } catch(as) {                                                                          \
-                _DOCTEST_RB.m_threw    = true;                                                     \
-                _DOCTEST_RB.m_threw_as = true;                                                     \
-            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while(doctest::detail::always_false())
-
-#define DOCTEST_ASSERT_NOTHROW(expr, assert_type)                                                  \
-    do {                                                                                           \
-        if(!DOCTEST_GCS().no_throw) {                                                              \
-            doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,   \
-                                                       __FILE__, __LINE__, #expr);                 \
-            try {                                                                                  \
-                expr;                                                                              \
-            } catch(...) { _DOCTEST_RB.m_threw = true; }                                           \
-            DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                             \
-        }                                                                                          \
-    } while(doctest::detail::always_false())
-
-#define DOCTEST_WARN_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_WARN_THROWS)
-#define DOCTEST_CHECK_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_CHECK_THROWS)
-#define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS)
-
-#define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS)
-#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS)
-
-#define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW)
-#define DOCTEST_CHECK_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_CHECK_NOTHROW)
-#define DOCTEST_REQUIRE_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_REQUIRE_NOTHROW)
-
-#define DOCTEST_BINARY_ASSERT(assert_type, lhs, rhs, comp)                                         \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,       \
-                                                   __FILE__, __LINE__, #lhs ", " #rhs);            \
-        try {                                                                                      \
-            _DOCTEST_RB.binary_assert<doctest::detail::binaryAssertComparison::comp>(lhs, rhs);    \
-        } catch(...) { _DOCTEST_RB.m_threw = true; }                                               \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(doctest::detail::always_false())
-
-#define DOCTEST_UNARY_ASSERT(assert_type, val)                                                     \
-    do {                                                                                           \
-        doctest::detail::ResultBuilder _DOCTEST_RB(doctest::detail::assertType::assert_type,       \
-                                                   __FILE__, __LINE__, #val);                      \
-        try {                                                                                      \
-            _DOCTEST_RB.unary_assert(val);                                                         \
-        } catch(...) { _DOCTEST_RB.m_threw = true; }                                               \
-        DOCTEST_ASSERT_LOG_AND_REACT(_DOCTEST_RB);                                                 \
-    } while(doctest::detail::always_false())
-
-#define DOCTEST_WARN_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_EQ, lhs, rhs, eq)
-#define DOCTEST_CHECK_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_EQ, lhs, rhs, eq)
-#define DOCTEST_REQUIRE_EQ(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_EQ, lhs, rhs, eq)
-#define DOCTEST_WARN_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_NE, lhs, rhs, ne)
-#define DOCTEST_CHECK_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_NE, lhs, rhs, ne)
-#define DOCTEST_REQUIRE_NE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_NE, lhs, rhs, ne)
-#define DOCTEST_WARN_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GT, lhs, rhs, gt)
-#define DOCTEST_CHECK_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GT, lhs, rhs, gt)
-#define DOCTEST_REQUIRE_GT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GT, lhs, rhs, gt)
-#define DOCTEST_WARN_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LT, lhs, rhs, lt)
-#define DOCTEST_CHECK_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LT, lhs, rhs, lt)
-#define DOCTEST_REQUIRE_LT(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LT, lhs, rhs, lt)
-#define DOCTEST_WARN_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_GE, lhs, rhs, ge)
-#define DOCTEST_CHECK_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_GE, lhs, rhs, ge)
-#define DOCTEST_REQUIRE_GE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_GE, lhs, rhs, ge)
-#define DOCTEST_WARN_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_WARN_LE, lhs, rhs, le)
-#define DOCTEST_CHECK_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_CHECK_LE, lhs, rhs, le)
-#define DOCTEST_REQUIRE_LE(lhs, rhs) DOCTEST_BINARY_ASSERT(DT_REQUIRE_LE, lhs, rhs, le)
-
-#define DOCTEST_WARN_UNARY(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY, v)
-#define DOCTEST_CHECK_UNARY(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY, v)
-#define DOCTEST_REQUIRE_UNARY(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY, v)
-#define DOCTEST_WARN_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_WARN_UNARY_FALSE, v)
-#define DOCTEST_CHECK_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_CHECK_UNARY_FALSE, v)
-#define DOCTEST_REQUIRE_UNARY_FALSE(v) DOCTEST_UNARY_ASSERT(DT_REQUIRE_UNARY_FALSE, v)
-
-#ifndef DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison)                              \
-    do {                                                                                           \
-        int _DOCTEST_FAST_RES = doctest::detail::fast_binary_assert<                               \
-                doctest::detail::binaryAssertComparison::comparison>(                              \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs, #rhs, lhs,     \
-                rhs);                                                                              \
-        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
-            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
-        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
-    } while(doctest::detail::always_false())
-
-#define DOCTEST_FAST_UNARY_ASSERT(assert_type, val)                                                \
-    do {                                                                                           \
-        int _DOCTEST_FAST_RES = doctest::detail::fast_unary_assert(                                \
-                doctest::detail::assertType::assert_type, __FILE__, __LINE__, #val, val);          \
-        if(_DOCTEST_FAST_RES & doctest::detail::assertAction::dbgbreak)                            \
-            DOCTEST_BREAK_INTO_DEBUGGER();                                                         \
-        doctest::detail::fastAssertThrowIfFlagSet(_DOCTEST_FAST_RES);                              \
-    } while(doctest::detail::always_false())
-
-#else // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_FAST_BINARY_ASSERT(assert_type, lhs, rhs, comparison)                              \
-    doctest::detail::fast_binary_assert<doctest::detail::binaryAssertComparison::comparison>(      \
-            doctest::detail::assertType::assert_type, __FILE__, __LINE__, #lhs, #rhs, lhs, rhs)
-
-#define DOCTEST_FAST_UNARY_ASSERT(assert_type, val)                                                \
-    doctest::detail::fast_unary_assert(doctest::detail::assertType::assert_type, __FILE__,         \
-                                       __LINE__, #val, val)
-
-#endif // DOCTEST_CONFIG_SUPER_FAST_ASSERTS
-
-#define DOCTEST_FAST_WARN_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_EQ, l, r, eq)
-#define DOCTEST_FAST_CHECK_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_EQ, l, r, eq)
-#define DOCTEST_FAST_REQUIRE_EQ(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_EQ, l, r, eq)
-#define DOCTEST_FAST_WARN_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_NE, l, r, ne)
-#define DOCTEST_FAST_CHECK_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_NE, l, r, ne)
-#define DOCTEST_FAST_REQUIRE_NE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_NE, l, r, ne)
-#define DOCTEST_FAST_WARN_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GT, l, r, gt)
-#define DOCTEST_FAST_CHECK_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GT, l, r, gt)
-#define DOCTEST_FAST_REQUIRE_GT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GT, l, r, gt)
-#define DOCTEST_FAST_WARN_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LT, l, r, lt)
-#define DOCTEST_FAST_CHECK_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LT, l, r, lt)
-#define DOCTEST_FAST_REQUIRE_LT(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LT, l, r, lt)
-#define DOCTEST_FAST_WARN_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_GE, l, r, ge)
-#define DOCTEST_FAST_CHECK_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_GE, l, r, ge)
-#define DOCTEST_FAST_REQUIRE_GE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_GE, l, r, ge)
-#define DOCTEST_FAST_WARN_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_WARN_LE, l, r, le)
-#define DOCTEST_FAST_CHECK_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_CHECK_LE, l, r, le)
-#define DOCTEST_FAST_REQUIRE_LE(l, r) DOCTEST_FAST_BINARY_ASSERT(DT_FAST_REQUIRE_LE, l, r, le)
-
-#define DOCTEST_FAST_WARN_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY, v)
-#define DOCTEST_FAST_CHECK_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY, v)
-#define DOCTEST_FAST_REQUIRE_UNARY(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY, v)
-#define DOCTEST_FAST_WARN_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_WARN_UNARY_FALSE, v)
-#define DOCTEST_FAST_CHECK_UNARY_FALSE(v) DOCTEST_FAST_UNARY_ASSERT(DT_FAST_CHECK_UNARY_FALSE, v)
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(v)                                                        \
-    DOCTEST_FAST_UNARY_ASSERT(DT_FAST_REQUIRE_UNARY_FALSE, v)
-
-// =================================================================================================
-// == WHAT FOLLOWS IS VERSIONS OF THE MACROS THAT DO NOT DO ANY REGISTERING!                      ==
-// == THIS CAN BE ENABLED BY DEFINING DOCTEST_CONFIG_DISABLE GLOBALLY!                            ==
-// =================================================================================================
-#else // DOCTEST_CONFIG_DISABLE
-
-#define DOCTEST_IMPLEMENT_FIXTURE(der, base, func, name)                                           \
-    namespace                                                                                      \
-    {                                                                                              \
-        template <typename T>                                                                      \
-        struct der : base                                                                          \
-        { void f(); };                                                                             \
-    }                                                                                              \
-    template <typename T>                                                                          \
-    inline void der<T>::f()
-
-#define DOCTEST_CREATE_AND_REGISTER_FUNCTION(f, name)                                              \
-    template <typename T>                                                                          \
-    static inline void f()
-
-// for registering tests
-#define DOCTEST_TEST_CASE(name)                                                                    \
-    DOCTEST_CREATE_AND_REGISTER_FUNCTION(DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for registering tests with a fixture
-#define DOCTEST_TEST_CASE_FIXTURE(x, name)                                                         \
-    DOCTEST_IMPLEMENT_FIXTURE(DOCTEST_ANONYMOUS(_DOCTEST_ANON_CLASS_), x,                          \
-                              DOCTEST_ANONYMOUS(_DOCTEST_ANON_FUNC_), name)
-
-// for subcases
-#define DOCTEST_SUBCASE(name)
-
-// for starting a testsuite block
-#define DOCTEST_TEST_SUITE(name) typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-// for ending a testsuite block
-#define DOCTEST_TEST_SUITE_END typedef int DOCTEST_ANONYMOUS(_DOCTEST_ANON_FOR_SEMICOLON_)
-
-#define DOCTEST_WARN(expr) ((void)0)
-#define DOCTEST_WARN_FALSE(expr) ((void)0)
-#define DOCTEST_WARN_THROWS(expr) ((void)0)
-#define DOCTEST_WARN_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_WARN_NOTHROW(expr) ((void)0)
-#define DOCTEST_CHECK(expr) ((void)0)
-#define DOCTEST_CHECK_FALSE(expr) ((void)0)
-#define DOCTEST_CHECK_THROWS(expr) ((void)0)
-#define DOCTEST_CHECK_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_CHECK_NOTHROW(expr) ((void)0)
-#define DOCTEST_REQUIRE(expr) ((void)0)
-#define DOCTEST_REQUIRE_FALSE(expr) ((void)0)
-#define DOCTEST_REQUIRE_THROWS(expr) ((void)0)
-#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) ((void)0)
-#define DOCTEST_REQUIRE_NOTHROW(expr) ((void)0)
-
-#define DOCTEST_WARN_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_NE(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_NE(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_NE(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_GT(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_GT(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_GT(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_LT(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_LT(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_LT(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_GE(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_GE(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_GE(lhs, rhs) ((void)0)
-#define DOCTEST_WARN_LE(lhs, rhs) ((void)0)
-#define DOCTEST_CHECK_LE(lhs, rhs) ((void)0)
-#define DOCTEST_REQUIRE_LE(lhs, rhs) ((void)0)
-
-#define DOCTEST_WARN_UNARY(val) ((void)0)
-#define DOCTEST_CHECK_UNARY(val) ((void)0)
-#define DOCTEST_REQUIRE_UNARY(val) ((void)0)
-#define DOCTEST_WARN_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_CHECK_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_REQUIRE_UNARY_FALSE(val) ((void)0)
-
-#define DOCTEST_FAST_WARN_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_EQ(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_NE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_NE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_NE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_GT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_GT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_GT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_LT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_LT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_LT(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_GE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_GE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_GE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_WARN_LE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_CHECK_LE(lhs, rhs) ((void)0)
-#define DOCTEST_FAST_REQUIRE_LE(lhs, rhs) ((void)0)
-
-#define DOCTEST_FAST_WARN_UNARY(val) ((void)0)
-#define DOCTEST_FAST_CHECK_UNARY(val) ((void)0)
-#define DOCTEST_FAST_REQUIRE_UNARY(val) ((void)0)
-#define DOCTEST_FAST_WARN_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_FAST_CHECK_UNARY_FALSE(val) ((void)0)
-#define DOCTEST_FAST_REQUIRE_UNARY_FALSE(val) ((void)0)
-
-#endif // DOCTEST_CONFIG_DISABLE
-
-// BDD style macros
-// clang-format off
-#define DOCTEST_SCENARIO(name)  TEST_CASE("  Scenario: " name)
-#define DOCTEST_GIVEN(name)     SUBCASE("   Given: " name)
-#define DOCTEST_WHEN(name)      SUBCASE("    When: " name)
-#define DOCTEST_AND_WHEN(name)  SUBCASE("And when: " name)
-#define DOCTEST_THEN(name)      SUBCASE("    Then: " name)
-#define DOCTEST_AND_THEN(name)  SUBCASE("     And: " name)
-// clang-format on
-
-// == SHORT VERSIONS OF THE MACROS
-#if !defined(DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES)
-
-#define TEST_CASE DOCTEST_TEST_CASE
-#define TEST_CASE_FIXTURE DOCTEST_TEST_CASE_FIXTURE
-#define SUBCASE DOCTEST_SUBCASE
-#define TEST_SUITE DOCTEST_TEST_SUITE
-#define TEST_SUITE_END DOCTEST_TEST_SUITE_END
-#define WARN DOCTEST_WARN
-#define WARN_FALSE DOCTEST_WARN_FALSE
-#define WARN_THROWS DOCTEST_WARN_THROWS
-#define WARN_THROWS_AS DOCTEST_WARN_THROWS_AS
-#define WARN_NOTHROW DOCTEST_WARN_NOTHROW
-#define CHECK DOCTEST_CHECK
-#define CHECK_FALSE DOCTEST_CHECK_FALSE
-#define CHECK_THROWS DOCTEST_CHECK_THROWS
-#define CHECK_THROWS_AS DOCTEST_CHECK_THROWS_AS
-#define CHECK_NOTHROW DOCTEST_CHECK_NOTHROW
-#define REQUIRE DOCTEST_REQUIRE
-#define REQUIRE_FALSE DOCTEST_REQUIRE_FALSE
-#define REQUIRE_THROWS DOCTEST_REQUIRE_THROWS
-#define REQUIRE_THROWS_AS DOCTEST_REQUIRE_THROWS_AS
-#define REQUIRE_NOTHROW DOCTEST_REQUIRE_NOTHROW
-
-#define SCENARIO DOCTEST_SCENARIO
-#define GIVEN DOCTEST_GIVEN
-#define WHEN DOCTEST_WHEN
-#define AND_WHEN DOCTEST_AND_WHEN
-#define THEN DOCTEST_THEN
-#define AND_THEN DOCTEST_AND_THEN
-
-#define WARN_EQ DOCTEST_WARN_EQ
-#define CHECK_EQ DOCTEST_CHECK_EQ
-#define REQUIRE_EQ DOCTEST_REQUIRE_EQ
-#define WARN_NE DOCTEST_WARN_NE
-#define CHECK_NE DOCTEST_CHECK_NE
-#define REQUIRE_NE DOCTEST_REQUIRE_NE
-#define WARN_GT DOCTEST_WARN_GT
-#define CHECK_GT DOCTEST_CHECK_GT
-#define REQUIRE_GT DOCTEST_REQUIRE_GT
-#define WARN_LT DOCTEST_WARN_LT
-#define CHECK_LT DOCTEST_CHECK_LT
-#define REQUIRE_LT DOCTEST_REQUIRE_LT
-#define WARN_GE DOCTEST_WARN_GE
-#define CHECK_GE DOCTEST_CHECK_GE
-#define REQUIRE_GE DOCTEST_REQUIRE_GE
-#define WARN_LE DOCTEST_WARN_LE
-#define CHECK_LE DOCTEST_CHECK_LE
-#define REQUIRE_LE DOCTEST_REQUIRE_LE
-#define WARN_UNARY DOCTEST_WARN_UNARY
-#define CHECK_UNARY DOCTEST_CHECK_UNARY
-#define REQUIRE_UNARY DOCTEST_REQUIRE_UNARY
-#define WARN_UNARY_FALSE DOCTEST_WARN_UNARY_FALSE
-#define CHECK_UNARY_FALSE DOCTEST_CHECK_UNARY_FALSE
-#define REQUIRE_UNARY_FALSE DOCTEST_REQUIRE_UNARY_FALSE
-
-#define FAST_WARN_EQ DOCTEST_FAST_WARN_EQ
-#define FAST_CHECK_EQ DOCTEST_FAST_CHECK_EQ
-#define FAST_REQUIRE_EQ DOCTEST_FAST_REQUIRE_EQ
-#define FAST_WARN_NE DOCTEST_FAST_WARN_NE
-#define FAST_CHECK_NE DOCTEST_FAST_CHECK_NE
-#define FAST_REQUIRE_NE DOCTEST_FAST_REQUIRE_NE
-#define FAST_WARN_GT DOCTEST_FAST_WARN_GT
-#define FAST_CHECK_GT DOCTEST_FAST_CHECK_GT
-#define FAST_REQUIRE_GT DOCTEST_FAST_REQUIRE_GT
-#define FAST_WARN_LT DOCTEST_FAST_WARN_LT
-#define FAST_CHECK_LT DOCTEST_FAST_CHECK_LT
-#define FAST_REQUIRE_LT DOCTEST_FAST_REQUIRE_LT
-#define FAST_WARN_GE DOCTEST_FAST_WARN_GE
-#define FAST_CHECK_GE DOCTEST_FAST_CHECK_GE
-#define FAST_REQUIRE_GE DOCTEST_FAST_REQUIRE_GE
-#define FAST_WARN_LE DOCTEST_FAST_WARN_LE
-#define FAST_CHECK_LE DOCTEST_FAST_CHECK_LE
-#define FAST_REQUIRE_LE DOCTEST_FAST_REQUIRE_LE
-#define FAST_WARN_UNARY DOCTEST_FAST_WARN_UNARY
-#define FAST_CHECK_UNARY DOCTEST_FAST_CHECK_UNARY
-#define FAST_REQUIRE_UNARY DOCTEST_FAST_REQUIRE_UNARY
-#define FAST_WARN_UNARY_FALSE DOCTEST_FAST_WARN_UNARY_FALSE
-#define FAST_CHECK_UNARY_FALSE DOCTEST_FAST_CHECK_UNARY_FALSE
-#define FAST_REQUIRE_UNARY_FALSE DOCTEST_FAST_REQUIRE_UNARY_FALSE
-
-#endif // DOCTEST_CONFIG_NO_SHORT_MACRO_NAMES
-
-// this is here to clear the 'current test suite' for the current translation unit - at the top
-DOCTEST_TEST_SUITE_END();
-
-#endif // DOCTEST_LIBRARY_INCLUDED
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic pop
-#endif // > gcc 4.6
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // _MSC_VER
-
-#ifndef DOCTEST_SINGLE_HEADER
-#define DOCTEST_SINGLE_HEADER
-#endif // DOCTEST_SINGLE_HEADER
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunknown-pragmas"
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wglobal-constructors"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wmissing-prototypes"
-#pragma clang diagnostic ignored "-Wsign-conversion"
-#pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#pragma clang diagnostic ignored "-Wmissing-variable-declarations"
-#pragma clang diagnostic ignored "-Wswitch"
-#pragma clang diagnostic ignored "-Wswitch-enum"
-#pragma clang diagnostic ignored "-Wcovered-switch-default"
-#pragma clang diagnostic ignored "-Wmissing-noreturn"
-#pragma clang diagnostic ignored "-Wunused-local-typedef"
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic push
-#endif // > gcc 4.6
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Weffc++"
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#pragma GCC diagnostic ignored "-Wstrict-overflow"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-#pragma GCC diagnostic ignored "-Winline"
-#pragma GCC diagnostic ignored "-Wswitch"
-#pragma GCC diagnostic ignored "-Wswitch-enum"
-#pragma GCC diagnostic ignored "-Wswitch-default"
-#pragma GCC diagnostic ignored "-Wunsafe-loop-optimizations"
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif // > gcc 4.6
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
-#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
-#endif // > gcc 4.7
-#if __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3)
-#pragma GCC diagnostic ignored "-Wuseless-cast"
-#endif // > gcc 5.3
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996) // The compiler encountered a deprecated declaration
-#pragma warning(disable : 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
-#pragma warning(disable : 4706) // assignment within conditional expression
-#pragma warning(disable : 4512) // 'class' : assignment operator could not be generated
-#pragma warning(disable : 4127) // conditional expression is constant
-#endif                          // _MSC_VER
-
-#if defined(DOCTEST_CONFIG_IMPLEMENT) || defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) ||            \
-        !defined(DOCTEST_SINGLE_HEADER)
-#ifndef DOCTEST_LIBRARY_IMPLEMENTATION
-#define DOCTEST_LIBRARY_IMPLEMENTATION
-
-#ifndef DOCTEST_SINGLE_HEADER
-#include "doctest_fwd.h"
-#endif // DOCTEST_SINGLE_HEADER
-
-#if defined(__clang__) && defined(DOCTEST_NO_CPP11_COMPAT)
-#pragma clang diagnostic ignored "-Wc++98-compat"
-#pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif // __clang__ && DOCTEST_NO_CPP11_COMPAT
-
-// snprintf() not in the C++98 standard
-#ifdef _MSC_VER
-#define DOCTEST_SNPRINTF _snprintf
-#else
-#define DOCTEST_SNPRINTF snprintf
-#endif
-
-#define DOCTEST_LOG_START()                                                                        \
-    do {                                                                                           \
-        if(!DOCTEST_GCS().hasLoggedCurrentTestStart) {                                             \
-            doctest::detail::logTestStart(DOCTEST_GCS().currentTest->m_name,                       \
-                                          DOCTEST_GCS().currentTest->m_file,                       \
-                                          DOCTEST_GCS().currentTest->m_line);                      \
-            DOCTEST_GCS().hasLoggedCurrentTestStart = true;                                        \
-        }                                                                                          \
-    } while(doctest::detail::always_false())
-
-// required includes - will go only in one translation unit!
-#include <ctime>
-#include <cmath>
-// borland (Embarcadero) compiler requires math.h and not cmath - https://github.com/onqtam/doctest/pull/37
-#ifdef __BORLANDC__
-#include <math.h>
-#endif // __BORLANDC__
-#include <new>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <limits>
-#include <utility>
-#include <sstream>
-#include <iomanip>
-#include <vector>
-#include <set>
-
-namespace doctest
-{
-namespace detail
-{
-    // not using std::strlen() because of valgrind errors when optimizations are turned on
-    // 'Invalid read of size 4' when the test suite len (with '\0') is not a multiple of 4
-    // for details see http://stackoverflow.com/questions/35671155
-    size_t my_strlen(const char* in) {
-        const char* temp = in;
-        while(temp && *temp)
-            ++temp;
-        return temp - in;
-    }
-
-    template <typename T>
-    T my_max(const T& lhs, const T& rhs) {
-        return lhs > rhs ? lhs : rhs;
-    }
-
-    // case insensitive strcmp
-    int stricmp(char const* a, char const* b) {
-        for(;; a++, b++) {
-            int d = tolower(*a) - tolower(*b);
-            if(d != 0 || !*a)
-                return d;
-        }
-    }
-
-    template <typename T>
-    String fpToString(T value, int precision) {
-        std::ostringstream oss;
-        oss << std::setprecision(precision) << std::fixed << value;
-        std::string d = oss.str();
-        size_t      i = d.find_last_not_of('0');
-        if(i != std::string::npos && i != d.size() - 1) {
-            if(d[i] == '.')
-                i++;
-            d = d.substr(0, i + 1);
-        }
-        return d.c_str();
-    }
-
-    struct Endianness
-    {
-        enum Arch
-        {
-            Big,
-            Little
-        };
-
-        static Arch which() {
-            union _
-            {
-                int  asInt;
-                char asChar[sizeof(int)];
-            } u;
-
-            u.asInt = 1;
-            return (u.asChar[sizeof(int) - 1] == 1) ? Big : Little;
-        }
-    };
-
-    String rawMemoryToString(const void* object, unsigned size) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>(size), inc = 1;
-        if(Endianness::which() == Endianness::Little) {
-            i   = end - 1;
-            end = inc = -1;
-        }
-
-        unsigned char const* bytes = static_cast<unsigned char const*>(object);
-        std::ostringstream   os;
-        os << "0x" << std::setfill('0') << std::hex;
-        for(; i != end; i += inc)
-            os << std::setw(2) << static_cast<unsigned>(bytes[i]);
-        return os.str().c_str();
-    }
-
-    std::ostream* createStream() { return new std::ostringstream(); }
-    String getStreamResult(std::ostream* in) {
-        return static_cast<std::ostringstream*>(in)->str().c_str();
-    }
-    void freeStream(std::ostream* in) { delete in; }
-
-#ifndef DOCTEST_CONFIG_DISABLE
-
-    // this holds both parameters for the command line and runtime data for tests
-    struct ContextState : TestAccessibleContextState
-    {
-        // == parameters from the command line
-
-        std::vector<std::vector<String> > filters;
-
-        String   order_by;  // how tests should be ordered
-        unsigned rand_seed; // the seed for rand ordering
-
-        unsigned first; // the first (matching) test to be executed
-        unsigned last;  // the last (matching) test to be executed
-
-        int  abort_after;    // stop tests after this many failed assertions
-        bool case_sensitive; // if filtering should be case sensitive
-        bool exit;           // if the program should be exited after the tests are ran/whatever
-        bool no_exitcode;    // if the framework should return 0 as the exitcode
-        bool no_run;         // to not run the tests at all (can be done with an "*" exclude)
-        bool no_colors;      // if output to the console should be colorized
-        bool no_path_in_filenames; // if the path to files should be removed from the output
-
-        bool help;             // to print the help
-        bool version;          // to print the version
-        bool count;            // if only the count of matching tests is to be retreived
-        bool list_test_cases;  // to list all tests matching the filters
-        bool list_test_suites; // to list all suites matching the filters
-
-        // == data for the tests being ran
-
-        int numAssertions;
-        int numFailedAssertions;
-        int numFailedAssertionsForCurrentTestcase;
-
-        // stuff for subcases
-        std::set<SubcaseSignature> subcasesPassed;
-        std::set<int>              subcasesEnteredLevels;
-        std::vector<Subcase>       subcasesStack;
-        int                        subcasesCurrentLevel;
-        bool                       subcasesHasSkipped;
-
-        void resetRunData() {
-            numAssertions       = 0;
-            numFailedAssertions = 0;
-        }
-
-        ContextState()
-                : filters(6) // 6 different filters total
-        {
-            resetRunData();
-        }
-    };
-
-    ContextState*& getContextState();
-#endif // DOCTEST_CONFIG_DISABLE
-} // namespace detail
-
-String::String(const char* in)
-        : m_str(static_cast<char*>(malloc(detail::my_strlen(in) + 1))) {
-    if(in)
-        strcpy(m_str, in);
-    else
-        m_str[0] = '\0';
-}
-
-String::String(const String& other)
-        : m_str(0) {
-    copy(other);
-}
-
-void String::copy(const String& other) {
-    if(m_str)
-        free(m_str);
-    m_str = static_cast<char*>(malloc(detail::my_strlen(other.m_str) + 1));
-    strcpy(m_str, other.m_str);
-}
-
-String::~String() { free(m_str); }
-
-String& String::operator=(const String& other) {
-    if(this != &other)
-        copy(other);
-    return *this;
-}
-
-String String::operator+(const String& other) const { return String(m_str) += other; }
-
-String& String::operator+=(const String& other) {
-    using namespace detail;
-    if(other.m_str != 0) {
-        char* newStr = static_cast<char*>(malloc(my_strlen(m_str) + my_strlen(other.m_str) + 1));
-        strcpy(newStr, m_str);
-        strcpy(newStr + my_strlen(m_str), other.m_str);
-        free(m_str);
-        m_str = newStr;
-    }
-    return *this;
-}
-
-unsigned String::size() const { return m_str ? detail::my_strlen(m_str) : 0; }
-unsigned String::length() const { return size(); }
-
-int String::compare(const char* other, bool no_case) const {
-    if(no_case)
-        return detail::stricmp(m_str, other);
-    return strcmp(m_str, other);
-}
-
-int String::compare(const String& other, bool no_case) const {
-    if(no_case)
-        return detail::stricmp(m_str, other.m_str);
-    return strcmp(m_str, other.m_str);
-}
-
-std::ostream& operator<<(std::ostream& stream, const String& in) {
-    stream << in.c_str();
-    return stream;
-}
-
-Approx::Approx(double value)
-        : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100)
-        , m_scale(1.0)
-        , m_value(value) {}
-
-bool operator==(double lhs, Approx const& rhs) {
-    // Thanks to Richard Harris for his help refining this formula
-    return fabs(lhs - rhs.m_value) <
-           rhs.m_epsilon * (rhs.m_scale + detail::my_max(fabs(lhs), fabs(rhs.m_value)));
-}
-
-String Approx::toString() const { return String("Approx( ") + doctest::toString(m_value) + " )"; }
-
-#ifdef DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(char* in) { return toString(static_cast<const char*>(in)); }
-String toString(const char* in) { return String("\"") + (in ? in : "{null string}") + "\""; }
-#endif // DOCTEST_CONFIG_TREAT_CHAR_STAR_AS_STRING
-String toString(bool in) { return in ? "true" : "false"; }
-String toString(float in) { return detail::fpToString(in, 5) + "f"; }
-String toString(double in) { return detail::fpToString(in, 10); }
-String toString(double long in) { return detail::fpToString(in, 15); }
-
-String toString(char in) {
-    char buf[64];
-    sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(char unsigned in) {
-    char buf[64];
-    sprintf(buf, "%ud", in);
-    return buf;
-}
-
-String toString(int short in) {
-    char buf[64];
-    sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(int short unsigned in) {
-    char buf[64];
-    sprintf(buf, "%u", in);
-    return buf;
-}
-
-String toString(int in) {
-    char buf[64];
-    sprintf(buf, "%d", in);
-    return buf;
-}
-
-String toString(int unsigned in) {
-    char buf[64];
-    sprintf(buf, "%u", in);
-    return buf;
-}
-
-String toString(int long in) {
-    char buf[64];
-    sprintf(buf, "%ld", in);
-    return buf;
-}
-
-String toString(int long unsigned in) {
-    char buf[64];
-    sprintf(buf, "%lu", in);
-    return buf;
-}
-
-#ifdef DOCTEST_CONFIG_WITH_LONG_LONG
-String toString(int long long in) {
-    char buf[64];
-    sprintf(buf, "%lld", in);
-    return buf;
-}
-String toString(int long long unsigned in) {
-    char buf[64];
-    sprintf(buf, "%llu", in);
-    return buf;
-}
-#endif // DOCTEST_CONFIG_WITH_LONG_LONG
-
-#ifdef DOCTEST_CONFIG_WITH_NULLPTR
-String toString(std::nullptr_t) { return "nullptr"; }
-#endif // DOCTEST_CONFIG_WITH_NULLPTR
-
-} // namespace doctest
-
-#if defined(DOCTEST_CONFIG_DISABLE)
-namespace doctest
-{
-Context::Context(int, const char* const*) {}
-Context::~Context() {}
-void Context::applyCommandLine(int, const char* const*) {}
-void Context::addFilter(const char*, const char*) {}
-void Context::clearFilters() {}
-void Context::setOption(const char*, int) {}
-void Context::setOption(const char*, const char*) {}
-bool Context::shouldExit() { return false; }
-int  Context::run() { return 0; }
-} // namespace doctest
-#else // DOCTEST_CONFIG_DISABLE
-
-#if !defined(DOCTEST_CONFIG_COLORS_NONE)
-#if !defined(DOCTEST_CONFIG_COLORS_WINDOWS) && !defined(DOCTEST_CONFIG_COLORS_ANSI)
-#ifdef DOCTEST_PLATFORM_WINDOWS
-#define DOCTEST_CONFIG_COLORS_WINDOWS
-#else // linux
-#define DOCTEST_CONFIG_COLORS_ANSI
-#endif // platform
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS && DOCTEST_CONFIG_COLORS_ANSI
-#endif // DOCTEST_CONFIG_COLORS_NONE
-
-#define DOCTEST_PRINTF_COLORED(buffer, color)                                                      \
-    do {                                                                                           \
-        if(buffer[0] != 0) {                                                                       \
-            doctest::detail::Color col(color);                                                     \
-            printf("%s", buffer);                                                                  \
-        }                                                                                          \
-    } while(doctest::detail::always_false())
-
-// the buffer size used for snprintf() calls
-#if !defined(DOCTEST_SNPRINTF_BUFFER_LENGTH)
-#define DOCTEST_SNPRINTF_BUFFER_LENGTH 1024
-#endif // DOCTEST_SNPRINTF_BUFFER_LENGTH
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#if defined(_MSC_VER) && _MSC_VER >= 1700
-#define DOCTEST_WINDOWS_SAL_IN_OPT _In_opt_
-#else // _MSC_VER
-#define DOCTEST_WINDOWS_SAL_IN_OPT
-#endif // _MSC_VER
-extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(
-        DOCTEST_WINDOWS_SAL_IN_OPT const char*);
-extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-#endif // _MSC_VER || __MINGW32__
-
-#ifdef DOCTEST_CONFIG_COLORS_ANSI
-#include <unistd.h>
-#endif // DOCTEST_CONFIG_COLORS_ANSI
-
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-
-// defines for a leaner windows.h
-#ifndef WIN32_MEAN_AND_LEAN
-#define WIN32_MEAN_AND_LEAN
-#endif // WIN32_MEAN_AND_LEAN
-#ifndef VC_EXTRA_LEAN
-#define VC_EXTRA_LEAN
-#endif // VC_EXTRA_LEAN
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif // NOMINMAX
-
-// not sure what AfxWin.h is for - here I do what Catch does
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-
-namespace doctest
-{
-namespace detail
-{
-    bool TestData::operator<(const TestData& other) const {
-        if(m_line != other.m_line)
-            return m_line < other.m_line;
-        return strcmp(m_file, other.m_file) < 0;
-    }
-
-    const char* getAssertString(assertType::Enum val) {
-        switch(val) {
-            // clang-format off
-            case assertType::DT_WARN                    : return "WARN";
-            case assertType::DT_CHECK                   : return "CHECK";
-            case assertType::DT_REQUIRE                 : return "REQUIRE";
-
-            case assertType::DT_WARN_FALSE              : return "WARN_FALSE";
-            case assertType::DT_CHECK_FALSE             : return "CHECK_FALSE";
-            case assertType::DT_REQUIRE_FALSE           : return "REQUIRE_FALSE";
-
-            case assertType::DT_WARN_THROWS             : return "WARN_THROWS";
-            case assertType::DT_CHECK_THROWS            : return "CHECK_THROWS";
-            case assertType::DT_REQUIRE_THROWS          : return "REQUIRE_THROWS";
-
-            case assertType::DT_WARN_THROWS_AS          : return "WARN_THROWS_AS";
-            case assertType::DT_CHECK_THROWS_AS         : return "CHECK_THROWS_AS";
-            case assertType::DT_REQUIRE_THROWS_AS       : return "REQUIRE_THROWS_AS";
-
-            case assertType::DT_WARN_NOTHROW            : return "WARN_NOTHROW";
-            case assertType::DT_CHECK_NOTHROW           : return "CHECK_NOTHROW";
-            case assertType::DT_REQUIRE_NOTHROW         : return "REQUIRE_NOTHROW";
-
-            case assertType::DT_WARN_EQ                 : return "WARN_EQ";
-            case assertType::DT_CHECK_EQ                : return "CHECK_EQ";
-            case assertType::DT_REQUIRE_EQ              : return "REQUIRE_EQ";
-            case assertType::DT_WARN_NE                 : return "WARN_NE";
-            case assertType::DT_CHECK_NE                : return "CHECK_NE";
-            case assertType::DT_REQUIRE_NE              : return "REQUIRE_NE";
-            case assertType::DT_WARN_GT                 : return "WARN_GT";
-            case assertType::DT_CHECK_GT                : return "CHECK_GT";
-            case assertType::DT_REQUIRE_GT              : return "REQUIRE_GT";
-            case assertType::DT_WARN_LT                 : return "WARN_LT";
-            case assertType::DT_CHECK_LT                : return "CHECK_LT";
-            case assertType::DT_REQUIRE_LT              : return "REQUIRE_LT";
-            case assertType::DT_WARN_GE                 : return "WARN_GE";
-            case assertType::DT_CHECK_GE                : return "CHECK_GE";
-            case assertType::DT_REQUIRE_GE              : return "REQUIRE_GE";
-            case assertType::DT_WARN_LE                 : return "WARN_LE";
-            case assertType::DT_CHECK_LE                : return "CHECK_LE";
-            case assertType::DT_REQUIRE_LE              : return "REQUIRE_LE";
-
-            case assertType::DT_WARN_UNARY              : return "WARN_UNARY";
-            case assertType::DT_CHECK_UNARY             : return "CHECK_UNARY";
-            case assertType::DT_REQUIRE_UNARY           : return "REQUIRE_UNARY";
-            case assertType::DT_WARN_UNARY_FALSE        : return "WARN_UNARY_FALSE";
-            case assertType::DT_CHECK_UNARY_FALSE       : return "CHECK_UNARY_FALSE";
-            case assertType::DT_REQUIRE_UNARY_FALSE     : return "REQUIRE_UNARY_FALSE";
-
-            case assertType::DT_FAST_WARN_EQ            : return "FAST_WARN_EQ";
-            case assertType::DT_FAST_CHECK_EQ           : return "FAST_CHECK_EQ";
-            case assertType::DT_FAST_REQUIRE_EQ         : return "FAST_REQUIRE_EQ";
-            case assertType::DT_FAST_WARN_NE            : return "FAST_WARN_NE";
-            case assertType::DT_FAST_CHECK_NE           : return "FAST_CHECK_NE";
-            case assertType::DT_FAST_REQUIRE_NE         : return "FAST_REQUIRE_NE";
-            case assertType::DT_FAST_WARN_GT            : return "FAST_WARN_GT";
-            case assertType::DT_FAST_CHECK_GT           : return "FAST_CHECK_GT";
-            case assertType::DT_FAST_REQUIRE_GT         : return "FAST_REQUIRE_GT";
-            case assertType::DT_FAST_WARN_LT            : return "FAST_WARN_LT";
-            case assertType::DT_FAST_CHECK_LT           : return "FAST_CHECK_LT";
-            case assertType::DT_FAST_REQUIRE_LT         : return "FAST_REQUIRE_LT";
-            case assertType::DT_FAST_WARN_GE            : return "FAST_WARN_GE";
-            case assertType::DT_FAST_CHECK_GE           : return "FAST_CHECK_GE";
-            case assertType::DT_FAST_REQUIRE_GE         : return "FAST_REQUIRE_GE";
-            case assertType::DT_FAST_WARN_LE            : return "FAST_WARN_LE";
-            case assertType::DT_FAST_CHECK_LE           : return "FAST_CHECK_LE";
-            case assertType::DT_FAST_REQUIRE_LE         : return "FAST_REQUIRE_LE";
-
-            case assertType::DT_FAST_WARN_UNARY         : return "FAST_WARN_UNARY";
-            case assertType::DT_FAST_CHECK_UNARY        : return "FAST_CHECK_UNARY";
-            case assertType::DT_FAST_REQUIRE_UNARY      : return "FAST_REQUIRE_UNARY";
-            case assertType::DT_FAST_WARN_UNARY_FALSE   : return "FAST_WARN_UNARY_FALSE";
-            case assertType::DT_FAST_CHECK_UNARY_FALSE  : return "FAST_CHECK_UNARY_FALSE";
-            case assertType::DT_FAST_REQUIRE_UNARY_FALSE: return "FAST_REQUIRE_UNARY_FALSE";
-                // clang-format on
-        }
-        return "";
-    }
-
-    bool checkIfShouldThrow(assertType::Enum assert_type) {
-        if(assert_type & assertType::is_require)
-            return true;
-
-        if((assert_type & assertType::is_check) && getContextState()->abort_after > 0) {
-            if(getContextState()->numFailedAssertions >= getContextState()->abort_after)
-                return true;
-        }
-
-        return false;
-    }
-    void fastAssertThrowIfFlagSet(int flags) {
-        if(flags & assertAction::shouldthrow)
-            throwException();
-    }
-    void throwException() { throw TestFailureException(); }
-    bool always_false() { return false; }
-
-    // lowers ascii letters
-    char tolower(const char c) { return ((c >= 'A' && c <= 'Z') ? static_cast<char>(c + 32) : c); }
-
-    // matching of a string against a wildcard mask (case sensitivity configurable) taken from
-    // http://www.emoticode.net/c/simple-wildcard-string-compare-globbing-function.html
-    int wildcmp(const char* str, const char* wild, bool caseSensitive) {
-        const char* cp = 0;
-        const char* mp = 0;
-
-        // rolled my own tolower() to not include more headers
-        while((*str) && (*wild != '*')) {
-            if((caseSensitive ? (*wild != *str) : (tolower(*wild) != tolower(*str))) &&
-               (*wild != '?')) {
-                return 0;
-            }
-            wild++;
-            str++;
-        }
-
-        while(*str) {
-            if(*wild == '*') {
-                if(!*++wild) {
-                    return 1;
-                }
-                mp = wild;
-                cp = str + 1;
-            } else if((caseSensitive ? (*wild == *str) : (tolower(*wild) == tolower(*str))) ||
-                      (*wild == '?')) {
-                wild++;
-                str++;
-            } else {
-                wild = mp;
-                str  = cp++;
-            }
-        }
-
-        while(*wild == '*') {
-            wild++;
-        }
-        return !*wild;
-    }
-
-    //// C string hash function (djb2) - taken from http://www.cse.yorku.ca/~oz/hash.html
-    //unsigned hashStr(unsigned const char* str) {
-    //    unsigned long hash = 5381;
-    //    char          c;
-    //    while((c = *str++))
-    //        hash = ((hash << 5) + hash) + c; // hash * 33 + c
-    //    return hash;
-    //}
-
-    // checks if the name matches any of the filters (and can be configured what to do when empty)
-    int matchesAny(const char* name, std::vector<String> filters, int matchEmpty,
-                   bool caseSensitive) {
-        if(filters.size() == 0 && matchEmpty)
-            return 1;
-        for(unsigned i = 0; i < filters.size(); ++i)
-            if(wildcmp(name, filters[i].c_str(), caseSensitive))
-                return 1;
-        return 0;
-    }
-
-    // the current ContextState with which tests are being executed
-    ContextState*& getContextState() {
-        static ContextState* data = 0;
-        return data;
-    }
-
-    TestAccessibleContextState* getTestsContextState() { return getContextState(); }
-
-    bool SubcaseSignature::operator<(const SubcaseSignature& other) const {
-        if(m_line != other.m_line)
-            return m_line < other.m_line;
-        if(strcmp(m_file, other.m_file) != 0)
-            return strcmp(m_file, other.m_file) < 0;
-        return strcmp(m_name, other.m_name) < 0;
-    }
-
-    Subcase::Subcase(const char* name, const char* file, int line)
-            : m_signature(name, file, line)
-            , m_entered(false) {
-        ContextState* s = getContextState();
-
-        // if we have already completed it
-        if(s->subcasesPassed.count(m_signature) != 0)
-            return;
-
-        // if a Subcase on the same level has already been entered
-        if(s->subcasesEnteredLevels.count(s->subcasesCurrentLevel) != 0) {
-            s->subcasesHasSkipped = true;
-            return;
-        }
-
-        s->subcasesStack.push_back(*this);
-        if(s->hasLoggedCurrentTestStart)
-            logTestEnd();
-        s->hasLoggedCurrentTestStart = false;
-
-        s->subcasesEnteredLevels.insert(s->subcasesCurrentLevel++);
-        m_entered = true;
-    }
-
-    Subcase::Subcase(const Subcase& other)
-            : m_signature(other.m_signature.m_name, other.m_signature.m_file,
-                          other.m_signature.m_line)
-            , m_entered(other.m_entered) {}
-
-    Subcase::~Subcase() {
-        if(m_entered) {
-            ContextState* s = getContextState();
-
-            s->subcasesCurrentLevel--;
-            // only mark the subcase as passed if no subcases have been skipped
-            if(s->subcasesHasSkipped == false)
-                s->subcasesPassed.insert(m_signature);
-
-            if(s->subcasesStack.size() > 0)
-                s->subcasesStack.pop_back();
-            if(s->hasLoggedCurrentTestStart)
-                logTestEnd();
-            s->hasLoggedCurrentTestStart = false;
-        }
-    }
-
-    // for sorting tests by file/line
-    int fileOrderComparator(const void* a, const void* b) {
-        const TestData* lhs = *static_cast<TestData* const*>(a);
-        const TestData* rhs = *static_cast<TestData* const*>(b);
-#ifdef _MSC_VER
-        // this is needed because MSVC gives different case for drive letters
-        // for __FILE__ when evaluated in a header and a source file
-        int res = stricmp(lhs->m_file, rhs->m_file);
-#else  // _MSC_VER
-        int res = strcmp(lhs->m_file, rhs->m_file);
-#endif // _MSC_VER
-        if(res != 0)
-            return res;
-        return static_cast<int>(lhs->m_line - rhs->m_line);
-    }
-
-    // for sorting tests by suite/file/line
-    int suiteOrderComparator(const void* a, const void* b) {
-        const TestData* lhs = *static_cast<TestData* const*>(a);
-        const TestData* rhs = *static_cast<TestData* const*>(b);
-
-        int res = strcmp(lhs->m_suite, rhs->m_suite);
-        if(res != 0)
-            return res;
-        return fileOrderComparator(a, b);
-    }
-
-    // for sorting tests by name/suite/file/line
-    int nameOrderComparator(const void* a, const void* b) {
-        const TestData* lhs = *static_cast<TestData* const*>(a);
-        const TestData* rhs = *static_cast<TestData* const*>(b);
-
-        int res = strcmp(lhs->m_name, rhs->m_name);
-        if(res != 0)
-            return res;
-        return suiteOrderComparator(a, b);
-    }
-
-    // holds the current test suite
-    const char*& getCurrentTestSuite() {
-        static const char* data = 0;
-        return data;
-    }
-
-    // sets the current test suite
-    int setTestSuiteName(const char* name) {
-        getCurrentTestSuite() = name;
-        return 0;
-    }
-
-    // all the registered tests
-    std::set<TestData>& getRegisteredTests() {
-        static std::set<TestData> data;
-        return data;
-    }
-
-    // used by the macros for registering tests
-    int regTest(funcType f, unsigned line, const char* file, const char* name) {
-        getRegisteredTests().insert(TestData(getCurrentTestSuite(), name, f, file, line));
-        return 0;
-    }
-
-    struct Color
-    {
-        enum Code
-        {
-            None = 0,
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed   = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey   = Bright | Grey,
-            BrightWhite = Bright | White
-        };
-        Color(Code code) { use(code); }
-        ~Color() { use(None); }
-
-        void use(Code code);
-
-    private:
-        Color(Color const& other);
-    };
-
-    void Color::use(Code
-#ifndef DOCTEST_CONFIG_COLORS_NONE
-                            code
-#endif // DOCTEST_CONFIG_COLORS_NONE
-                    ) {
-        ContextState* p = getContextState();
-        if(p->no_colors)
-            return;
-#ifdef DOCTEST_CONFIG_COLORS_ANSI
-        if(isatty(STDOUT_FILENO)) {
-            const char* col = "";
-            // clang-format off
-            switch(code) {
-                case Color::Red:         col = "[0;31m"; break;
-                case Color::Green:       col = "[0;32m"; break;
-                case Color::Blue:        col = "[0;34m"; break;
-                case Color::Cyan:        col = "[0;36m"; break;
-                case Color::Yellow:      col = "[0;33m"; break;
-                case Color::Grey:        col = "[1;30m"; break;
-                case Color::LightGrey:   col = "[0;37m"; break;
-                case Color::BrightRed:   col = "[1;31m"; break;
-                case Color::BrightGreen: col = "[1;32m"; break;
-                case Color::BrightWhite: col = "[1;37m"; break;
-                case Color::Bright: // invalid
-                case Color::None:
-                case Color::White:
-                default:                 col = "[0m";
-            }
-            // clang-format on
-            printf("\033%s", col);
-        }
-#endif // DOCTEST_CONFIG_COLORS_ANSI
-
-#ifdef DOCTEST_CONFIG_COLORS_WINDOWS
-        static HANDLE stdoutHandle(GetStdHandle(STD_OUTPUT_HANDLE));
-        static WORD   originalForegroundAttributes;
-        static WORD   originalBackgroundAttributes;
-        static bool   attrsInitted = false;
-        if(!attrsInitted) {
-            attrsInitted = true;
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo(stdoutHandle, &csbiInfo);
-            originalForegroundAttributes =
-                    csbiInfo.wAttributes &
-                    ~(BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY);
-            originalBackgroundAttributes =
-                    csbiInfo.wAttributes &
-                    ~(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY);
-        }
-
-#define DOCTEST_SET_ATTR(x) SetConsoleTextAttribute(stdoutHandle, x | originalBackgroundAttributes)
-
-        // clang-format off
-        switch (code) {
-            case Color::White:       DOCTEST_SET_ATTR(FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
-            case Color::Red:         DOCTEST_SET_ATTR(FOREGROUND_RED);                                      break;
-            case Color::Green:       DOCTEST_SET_ATTR(FOREGROUND_GREEN);                                    break;
-            case Color::Blue:        DOCTEST_SET_ATTR(FOREGROUND_BLUE);                                     break;
-            case Color::Cyan:        DOCTEST_SET_ATTR(FOREGROUND_BLUE | FOREGROUND_GREEN);                  break;
-            case Color::Yellow:      DOCTEST_SET_ATTR(FOREGROUND_RED | FOREGROUND_GREEN);                   break;
-            case Color::Grey:        DOCTEST_SET_ATTR(0);                                                   break;
-            case Color::LightGrey:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY);                                break;
-            case Color::BrightRed:   DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_RED);               break;
-            case Color::BrightGreen: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN);             break;
-            case Color::BrightWhite: DOCTEST_SET_ATTR(FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE); break;
-            case Color::None:
-            case Color::Bright: // invalid
-            default:                 DOCTEST_SET_ATTR(originalForegroundAttributes);
-        }
-// clang-format on
-#undef DOCTEST_SET_ATTR
-#endif // DOCTEST_CONFIG_COLORS_WINDOWS
-    }
-
-    // this is needed because MSVC does not permit mixing 2 exception handling schemes in a function
-    int callTestFunc(funcType f) {
-        int res = EXIT_SUCCESS;
-        try {
-            f();
-            if(getContextState()->numFailedAssertionsForCurrentTestcase)
-                res = EXIT_FAILURE;
-        } catch(const TestFailureException&) { res = EXIT_FAILURE; } catch(...) {
-            DOCTEST_LOG_START();
-            logTestCrashed();
-            res = EXIT_FAILURE;
-        }
-        return res;
-    }
-
-    // depending on the current options this will remove the path of filenames
-    const char* fileForOutput(const char* file) {
-        if(getContextState()->no_path_in_filenames) {
-            const char* back    = strrchr(file, '\\');
-            const char* forward = strrchr(file, '/');
-            if(back || forward) {
-                if(back > forward)
-                    forward = back;
-                return forward + 1;
-            }
-        }
-        return file;
-    }
-
-#ifdef DOCTEST_PLATFORM_MAC
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/sysctl.h>
-    // The following function is taken directly from the following technical note:
-    // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
-    // Returns true if the current process is being debugged (either
-    // running under the debugger or has a debugger attached post facto).
-    bool isDebuggerActive() {
-        int               mib[4];
-        struct kinfo_proc info;
-        size_t            size;
-        // Initialize the flags so that, if sysctl fails for some bizarre
-        // reason, we get a predictable result.
-        info.kp_proc.p_flag = 0;
-        // Initialize mib, which tells sysctl the info we want, in this case
-        // we're looking for information about a specific process ID.
-        mib[0] = CTL_KERN;
-        mib[1] = KERN_PROC;
-        mib[2] = KERN_PROC_PID;
-        mib[3] = getpid();
-        // Call sysctl.
-        size = sizeof(info);
-        if(sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, 0, 0) != 0) {
-            fprintf(stderr, "\n** Call to sysctl failed - unable to determine if debugger is "
-                            "active **\n\n");
-            return false;
-        }
-        // We're being debugged if the P_TRACED flag is set.
-        return ((info.kp_proc.p_flag & P_TRACED) != 0);
-    }
-#elif defined(_MSC_VER) || defined(__MINGW32__)
-    bool    isDebuggerActive() { return ::IsDebuggerPresent() != 0; }
-#else
-    bool isDebuggerActive() { return false; }
-#endif // Platform
-
-#ifdef DOCTEST_PLATFORM_WINDOWS
-    void myOutputDebugString(const String& text) { ::OutputDebugStringA(text.c_str()); }
-#else
-    // TODO: integration with XCode and other IDEs
-    void myOutputDebugString(const String&) {}
-#endif // Platform
-
-    const char* getSeparator() {
-        return "===============================================================================\n";
-    }
-
-    void printToDebugConsole(const String& text) {
-        if(isDebuggerActive())
-            myOutputDebugString(text.c_str());
-    }
-
-    void addFailedAssert(assertType::Enum assert_type) {
-        if((assert_type & assertType::is_warn) == 0) {
-            getContextState()->numFailedAssertionsForCurrentTestcase++;
-            getContextState()->numFailedAssertions++;
-        }
-    }
-
-    void logTestStart(const char* name, const char* file, unsigned line) {
-        const char* newLine = "\n";
-
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)\n", fileForOutput(file), line);
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "%s\n", name);
-
-        DOCTEST_PRINTF_COLORED(getSeparator(), Color::Yellow);
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg, Color::None);
-
-        String                subcaseStuff  = "";
-        std::vector<Subcase>& subcasesStack = getContextState()->subcasesStack;
-        for(unsigned i = 0; i < subcasesStack.size(); ++i) {
-            char subcase[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-            DOCTEST_SNPRINTF(subcase, DOCTEST_COUNTOF(loc), "  %s\n",
-                             subcasesStack[i].m_signature.m_name);
-            DOCTEST_PRINTF_COLORED(subcase, Color::None);
-            subcaseStuff += subcase;
-        }
-
-        DOCTEST_PRINTF_COLORED(newLine, Color::None);
-
-        printToDebugConsole(String(getSeparator()) + loc + msg + subcaseStuff.c_str() + newLine);
-    }
-
-    void logTestEnd() {}
-
-    void logTestCrashed() {
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-
-        DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), "TEST CASE FAILED! (threw exception)\n\n");
-
-        DOCTEST_PRINTF_COLORED(msg, Color::Red);
-
-        printToDebugConsole(String(msg));
-    }
-
-    void logAssert(bool passed, const char* decomposition, bool threw, const char* expr,
-                   assertType::Enum assert_type, const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        if(passed)
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
-        else
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED! %s\n",
-                             (threw ? "(threw exception)" : ""));
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n",
-                         getAssertString(assert_type), expr);
-
-        char info2[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        char info3[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        info2[0] = 0;
-        info3[0] = 0;
-        if(!threw) {
-            DOCTEST_SNPRINTF(info2, DOCTEST_COUNTOF(info2), "with expansion:\n");
-            DOCTEST_SNPRINTF(info3, DOCTEST_COUNTOF(info3), "  %s( %s )\n",
-                             getAssertString(assert_type), decomposition);
-        }
-
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg, passed ? Color::BrightGreen : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-        DOCTEST_PRINTF_COLORED(info2, Color::None);
-        DOCTEST_PRINTF_COLORED(info3, Color::Cyan);
-        DOCTEST_PRINTF_COLORED("\n", Color::None);
-
-        printToDebugConsole(String(loc) + msg + info1 + info2 + info3 + "\n");
-    }
-
-    void logAssertThrows(bool threw, const char* expr, assertType::Enum assert_type,
-                         const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        if(threw)
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
-        else
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED!\n");
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n\n",
-                         getAssertString(assert_type), expr);
-
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg, threw ? Color::BrightGreen : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-
-        printToDebugConsole(String(loc) + msg + info1);
-    }
-
-    void logAssertThrowsAs(bool threw, bool threw_as, const char* as, const char* expr,
-                           assertType::Enum assert_type, const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        if(threw_as)
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
-        else
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED! %s\n",
-                             (threw ? "(threw something else)" : "(didn't throw at all)"));
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s, %s )\n\n",
-                         getAssertString(assert_type), expr, as);
-
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg, threw_as ? Color::BrightGreen : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-
-        printToDebugConsole(String(loc) + msg + info1);
-    }
-
-    void logAssertNothrow(bool threw, const char* expr, assertType::Enum assert_type,
-                          const char* file, int line) {
-        char loc[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(loc, DOCTEST_COUNTOF(loc), "%s(%d)", fileForOutput(file), line);
-
-        char msg[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        if(!threw)
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " PASSED!\n");
-        else
-            DOCTEST_SNPRINTF(msg, DOCTEST_COUNTOF(msg), " FAILED!\n");
-
-        char info1[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-        DOCTEST_SNPRINTF(info1, DOCTEST_COUNTOF(info1), "  %s( %s )\n\n",
-                         getAssertString(assert_type), expr);
-
-        DOCTEST_PRINTF_COLORED(loc, Color::LightGrey);
-        DOCTEST_PRINTF_COLORED(msg, !threw ? Color::BrightGreen : Color::Red);
-        DOCTEST_PRINTF_COLORED(info1, Color::Cyan);
-
-        printToDebugConsole(String(loc) + msg + info1);
-    }
-
-    ResultBuilder::ResultBuilder(assertType::Enum assert_type, const char* file, int line,
-                                 const char* expr, const char* exception_type)
-            : m_assert_type(assert_type)
-            , m_file(file)
-            , m_line(line)
-            , m_expr(expr)
-            , m_exception_type(exception_type)
-            , m_threw(false)
-            , m_threw_as(false)
-            , m_failed(false) {}
-
-    bool ResultBuilder::log() {
-        if((m_assert_type & assertType::is_warn) == 0)
-            DOCTEST_GCS().numAssertionsForCurrentTestcase++;
-
-        if(m_assert_type & assertType::is_false) {
-            m_result.invert();
-            m_failed = m_result;
-        } else if(m_assert_type & assertType::is_throws) {
-            m_failed = !m_threw;
-        } else if(m_assert_type & assertType::is_throws_as) {
-            m_failed = !m_threw_as;
-        } else if(m_assert_type & assertType::is_nothrow) {
-            m_failed = m_threw;
-        } else {
-            m_failed = m_result;
-        }
-
-        if(m_failed || DOCTEST_GCS().success) {
-            DOCTEST_LOG_START();
-
-            if(m_assert_type & assertType::is_throws) {
-                logAssertThrows(m_threw, m_expr, m_assert_type, m_file, m_line);
-            } else if(m_assert_type & assertType::is_throws_as) {
-                logAssertThrowsAs(m_threw, m_threw_as, m_exception_type, m_expr, m_assert_type,
-                                  m_file, m_line);
-            } else if(m_assert_type & assertType::is_nothrow) {
-                logAssertNothrow(m_threw, m_expr, m_assert_type, m_file, m_line);
-            } else {
-                logAssert(m_result.m_passed, m_result.m_decomposition.c_str(), m_threw, m_expr,
-                          m_assert_type, m_file, m_line);
-            }
-        }
-
-        if(m_failed) {
-            addFailedAssert(m_assert_type);
-            if(isDebuggerActive() && !DOCTEST_GCS().no_breaks)
-                return true; // should break into the debugger
-        }
-        return false;
-    }
-
-    void ResultBuilder::react() const {
-        if(m_failed && checkIfShouldThrow(m_assert_type))
-            throwException();
-    }
-
-    // the implementation of parseFlag()
-    bool parseFlagImpl(int argc, const char* const* argv, const char* pattern) {
-        for(int i = argc - 1; i >= 0; --i) {
-            const char* temp = strstr(argv[i], pattern);
-            if(temp && my_strlen(temp) == my_strlen(pattern)) {
-                // eliminate strings in which the chars before the option are not '-'
-                bool noBadCharsFound = true;
-                while(temp != argv[i]) {
-                    if(*--temp != '-') {
-                        noBadCharsFound = false;
-                        break;
-                    }
-                }
-                if(noBadCharsFound && argv[i][0] == '-')
-                    return true;
-            }
-        }
-        return false;
-    }
-
-    // locates a flag on the command line
-    bool parseFlag(int argc, const char* const* argv, const char* pattern) {
-#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        if(!parseFlagImpl(argc, argv, pattern))
-            return parseFlagImpl(argc, argv, pattern + 3); // 3 for "dt-"
-        return true;
-#else  // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        return parseFlagImpl(argc, argv, pattern);
-#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-    }
-
-    // the implementation of parseOption()
-    bool parseOptionImpl(int argc, const char* const* argv, const char* pattern, String& res) {
-        for(int i = argc - 1; i >= 0; --i) {
-            const char* temp = strstr(argv[i], pattern);
-            if(temp) {
-                // eliminate matches in which the chars before the option are not '-'
-                bool        noBadCharsFound = true;
-                const char* curr            = argv[i];
-                while(curr != temp) {
-                    if(*curr++ != '-') {
-                        noBadCharsFound = false;
-                        break;
-                    }
-                }
-                if(noBadCharsFound && argv[i][0] == '-') {
-                    temp += my_strlen(pattern);
-                    unsigned len = my_strlen(temp);
-                    if(len) {
-                        res = temp;
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    // parses an option and returns the string after the '=' character
-    bool parseOption(int argc, const char* const* argv, const char* pattern, String& res,
-                     const String& defaultVal = String()) {
-        res = defaultVal;
-#ifndef DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        if(!parseOptionImpl(argc, argv, pattern, res))
-            return parseOptionImpl(argc, argv, pattern + 3, res); // 3 for "dt-"
-        return true;
-#else // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-        return parseOptionImpl(argc, argv, pattern, res);
-#endif // DOCTEST_CONFIG_NO_UNPREFIXED_OPTIONS
-    }
-
-    // parses a comma separated list of words after a pattern in one of the arguments in argv
-    bool parseCommaSepArgs(int argc, const char* const* argv, const char* pattern,
-                           std::vector<String>& res) {
-        String filtersString;
-        if(parseOption(argc, argv, pattern, filtersString)) {
-            // tokenize with "," as a separator
-            char* pch = strtok(filtersString.c_str(), ","); // modifies the string
-            while(pch != 0) {
-                if(my_strlen(pch))
-                    res.push_back(pch);
-                pch = strtok(0, ","); // uses the strtok() internal state to go to the next token
-            }
-            return true;
-        }
-        return false;
-    }
-
-    enum optionType
-    {
-        option_bool,
-        option_int
-    };
-
-    // parses an int/bool option from the command line
-    bool parseIntOption(int argc, const char* const* argv, const char* pattern, optionType type,
-                        int& res) {
-        String parsedValue;
-        if(parseOption(argc, argv, pattern, parsedValue)) {
-            if(type == 0) {
-                // boolean
-                const char positive[][5] = {"1", "true", "on", "yes"};  // 5 - strlen("true") + 1
-                const char negative[][6] = {"0", "false", "off", "no"}; // 6 - strlen("false") + 1
-
-                // if the value matches any of the positive/negative possibilities
-                for(unsigned i = 0; i < 4; i++) {
-                    if(parsedValue.compare(positive[i], true) == 0) {
-                        res = 1;
-                        return true;
-                    }
-                    if(parsedValue.compare(negative[i], true) == 0) {
-                        res = 0;
-                        return true;
-                    }
-                }
-            } else {
-                // integer
-                int theInt = atoi(parsedValue.c_str());
-                if(theInt != 0) {
-                    res = theInt;
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    void printVersion() {
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("doctest version is \"%s\"\n", DOCTEST_VERSION_STR);
-    }
-
-    void printHelp() {
-        printVersion();
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("boolean values: \"1/on/yes/true\" or \"0/off/no/false\"\n");
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("filter  values: \"str1,str2,str3\" (comma separated strings)\n");
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("filters use wildcards for matching strings\n");
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("something passes a filter if any of the strings in a filter matches\n");
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("ALL FLAGS, OPTIONS AND FILTERS ALSO AVAILABLE WITH A \"dt-\" PREFIX!!!\n");
-        DOCTEST_PRINTF_COLORED("[doctest]\n", Color::Cyan);
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("Query flags - the program quits after them. Available:\n\n");
-        printf(" -?,   --help, -h                      prints this message\n");
-        printf(" -v,   --version                       prints the version\n");
-        printf(" -c,   --count                         prints the number of matching tests\n");
-        printf(" -ltc, --list-test-cases               lists all matching tests by name\n");
-        printf(" -lts, --list-test-suites              lists all matching test suites\n\n");
-        // ==================================================================================== << 79
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("The available <int>/<string> options/filters are:\n\n");
-        printf(" -tc,  --test-case=<filters>           filters     tests by their name\n");
-        printf(" -tce, --test-case-exclude=<filters>   filters OUT tests by their name\n");
-        printf(" -sf,  --source-file=<filters>         filters     tests by their file\n");
-        printf(" -sfe, --source-file-exclude=<filters> filters OUT tests by their file\n");
-        printf(" -ts,  --test-suite=<filters>          filters     tests by their test suite\n");
-        printf(" -tse, --test-suite-exclude=<filters>  filters OUT tests by their test suite\n");
-        printf(" -ob,  --order-by=<string>             how the tests should be ordered\n");
-        printf("                                       <string> - by [file/suite/name/rand]\n");
-        printf(" -rs,  --rand-seed=<int>               seed for random ordering\n");
-        printf(" -f,   --first=<int>                   the first test passing the filters to\n");
-        printf("                                       execute - for range-based execution\n");
-        printf(" -l,   --last=<int>                    the last test passing the filters to\n");
-        printf("                                       execute - for range-based execution\n");
-        printf(" -aa,  --abort-after=<int>             stop after <int> failed assertions\n\n");
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("Bool options - can be used like flags and true is assumed. Available:\n\n");
-        printf(" -s,   --success=<bool>                include successful assertions in output\n");
-        printf(" -cs,  --case-sensitive=<bool>         filters being treated as case sensitive\n");
-        printf(" -e,   --exit=<bool>                   exits after the tests finish\n");
-        printf(" -nt,  --no-throw=<bool>               skips exceptions-related assert checks\n");
-        printf(" -ne,  --no-exitcode=<bool>            returns (or exits) always with success\n");
-        printf(" -nr,  --no-run=<bool>                 skips all runtime doctest operations\n");
-        printf(" -nc,  --no-colors=<bool>              disables colors in output\n");
-        printf(" -nb,  --no-breaks=<bool>              disables breakpoints in debuggers\n");
-        printf(" -npf, --no-path-filenames=<bool>      only filenames and no paths in output\n\n");
-        // ==================================================================================== << 79
-
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("for more information visit the project documentation\n\n");
-    }
-} // namespace detail
-
-Context::Context(int argc, const char* const* argv)
-        : p(new detail::ContextState) {
-    parseArgs(argc, argv, true);
-}
-
-Context::~Context() { delete p; }
-
-void Context::applyCommandLine(int argc, const char* const* argv) { parseArgs(argc, argv); }
-
-// parses args
-void Context::parseArgs(int argc, const char* const* argv, bool withDefaults) {
-    using namespace detail;
-
-    // clang-format off
-    parseCommaSepArgs(argc, argv, "dt-source-file=",        p->filters[0]);
-    parseCommaSepArgs(argc, argv, "dt-sf=",                 p->filters[0]);
-    parseCommaSepArgs(argc, argv, "dt-source-file-exclude=",p->filters[1]);
-    parseCommaSepArgs(argc, argv, "dt-sfe=",                p->filters[1]);
-    parseCommaSepArgs(argc, argv, "dt-test-suite=",         p->filters[2]);
-    parseCommaSepArgs(argc, argv, "dt-ts=",                 p->filters[2]);
-    parseCommaSepArgs(argc, argv, "dt-test-suite-exclude=", p->filters[3]);
-    parseCommaSepArgs(argc, argv, "dt-tse=",                p->filters[3]);
-    parseCommaSepArgs(argc, argv, "dt-test-case=",          p->filters[4]);
-    parseCommaSepArgs(argc, argv, "dt-tc=",                 p->filters[4]);
-    parseCommaSepArgs(argc, argv, "dt-test-case-exclude=",  p->filters[5]);
-    parseCommaSepArgs(argc, argv, "dt-tce=",                p->filters[5]);
-    // clang-format on
-
-    int    intRes = 0;
-    String strRes;
-
-#define DOCTEST_PARSE_AS_BOOL_OR_FLAG(name, sname, var, default)                                   \
-    if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_bool, intRes) ||       \
-       parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_bool, intRes))        \
-        p->var = !!intRes;                                                                         \
-    else if(parseFlag(argc, argv, #name) || parseFlag(argc, argv, #sname))                         \
-        p->var = 1;                                                                                \
-    else if(withDefaults)                                                                          \
-    p->var = default
-
-#define DOCTEST_PARSE_INT_OPTION(name, sname, var, default)                                        \
-    if(parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), option_int, intRes) ||        \
-       parseIntOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), option_int, intRes))         \
-        p->var = intRes;                                                                           \
-    else if(withDefaults)                                                                          \
-    p->var = default
-
-#define DOCTEST_PARSE_STR_OPTION(name, sname, var, default)                                        \
-    if(parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(name, =), strRes, default) ||              \
-       parseOption(argc, argv, DOCTEST_STR_CONCAT_TOSTR(sname, =), strRes, default) ||             \
-       withDefaults)                                                                               \
-    p->var = strRes
-
-    // clang-format off
-    DOCTEST_PARSE_STR_OPTION(dt-order-by, dt-ob, order_by, "file");
-    DOCTEST_PARSE_INT_OPTION(dt-rand-seed, dt-rs, rand_seed, 0);
-
-    DOCTEST_PARSE_INT_OPTION(dt-first, dt-f, first, 1);
-    DOCTEST_PARSE_INT_OPTION(dt-last, dt-l, last, 0);
-
-    DOCTEST_PARSE_INT_OPTION(dt-abort-after, dt-aa, abort_after, 0);
-
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-success, dt-s, success, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-case-sensitive, dt-cs, case_sensitive, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-exit, dt-e, exit, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-throw, dt-nt, no_throw, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-exitcode, dt-ne, no_exitcode, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-run, dt-nr, no_run, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-colors, dt-nc, no_colors, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-breaks, dt-nb, no_breaks, 0);
-    DOCTEST_PARSE_AS_BOOL_OR_FLAG(dt-no-path-filenames, dt-npf, no_path_in_filenames, 0);
-// clang-format on
-
-#undef DOCTEST_PARSE_STR_OPTION
-#undef DOCTEST_PARSE_INT_OPTION
-#undef DOCTEST_PARSE_AS_BOOL_OR_FLAG
-
-    if(withDefaults) {
-        p->help             = false;
-        p->version          = false;
-        p->count            = false;
-        p->list_test_cases  = false;
-        p->list_test_suites = false;
-    }
-    if(parseFlag(argc, argv, "dt-help") || parseFlag(argc, argv, "dt-h") ||
-       parseFlag(argc, argv, "dt-?")) {
-        p->help = true;
-        p->exit = true;
-    }
-    if(parseFlag(argc, argv, "dt-version") || parseFlag(argc, argv, "dt-v")) {
-        p->version = true;
-        p->exit    = true;
-    }
-    if(parseFlag(argc, argv, "dt-count") || parseFlag(argc, argv, "dt-c")) {
-        p->count = true;
-        p->exit  = true;
-    }
-    if(parseFlag(argc, argv, "dt-list-test-cases") || parseFlag(argc, argv, "dt-ltc")) {
-        p->list_test_cases = true;
-        p->exit            = true;
-    }
-    if(parseFlag(argc, argv, "dt-list-test-suites") || parseFlag(argc, argv, "dt-lts")) {
-        p->list_test_suites = true;
-        p->exit             = true;
-    }
-}
-
-// allows the user to add procedurally to the filters from the command line
-void Context::addFilter(const char* filter, const char* value) { setOption(filter, value); }
-
-// allows the user to clear all filters from the command line
-void Context::clearFilters() {
-    for(unsigned i = 0; i < p->filters.size(); ++i)
-        p->filters[i].clear();
-}
-
-// allows the user to override procedurally the int/bool options from the command line
-void Context::setOption(const char* option, int value) {
-    setOption(option, toString(value).c_str());
-}
-
-// allows the user to override procedurally the string options from the command line
-void Context::setOption(const char* option, const char* value) {
-    String      argv   = String("-") + option + "=" + value;
-    const char* lvalue = argv.c_str();
-    parseArgs(1, &lvalue);
-}
-
-// users should query this in their main() and exit the program if true
-bool Context::shouldExit() { return p->exit; }
-
-// the main function that does all the filtering and test running
-int Context::run() {
-    using namespace detail;
-
-    getContextState() = p;
-    p->resetRunData();
-
-    // handle version, help and no_run
-    if(p->no_run || p->version || p->help) {
-        if(p->version)
-            printVersion();
-        if(p->help)
-            printHelp();
-
-        getContextState() = 0;
-
-        return EXIT_SUCCESS;
-    }
-
-    printVersion();
-    DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-    printf("run with \"--help\" for options\n");
-
-    unsigned i = 0; // counter used for loops - here for VC6
-
-    std::set<TestData>& registeredTests = getRegisteredTests();
-
-    std::vector<const TestData*> testArray;
-    for(std::set<TestData>::iterator it = registeredTests.begin(); it != registeredTests.end();
-        ++it)
-        testArray.push_back(&(*it));
-
-    // sort the collected records
-    if(testArray.size() > 0) {
-        if(p->order_by.compare("file", true) == 0) {
-            qsort(&testArray[0], testArray.size(), sizeof(TestData*), fileOrderComparator);
-        } else if(p->order_by.compare("suite", true) == 0) {
-            qsort(&testArray[0], testArray.size(), sizeof(TestData*), suiteOrderComparator);
-        } else if(p->order_by.compare("name", true) == 0) {
-            qsort(&testArray[0], testArray.size(), sizeof(TestData*), nameOrderComparator);
-        } else if(p->order_by.compare("rand", true) == 0) {
-            srand(p->rand_seed);
-
-            // random_shuffle implementation
-            const TestData** first = &testArray[0];
-            for(i = testArray.size() - 1; i > 0; --i) {
-                int idxToSwap = rand() % (i + 1);
-
-                const TestData* temp = first[i];
-
-                first[i]         = first[idxToSwap];
-                first[idxToSwap] = temp;
-            }
-        }
-    }
-
-    if(p->list_test_cases) {
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("listing all test case names\n");
-    }
-
-    std::set<String> testSuitesPassingFilters;
-    if(p->list_test_suites) {
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("listing all test suites\n");
-    }
-
-    unsigned numTestsPassingFilters = 0;
-    unsigned numFailed              = 0;
-    // invoke the registered functions if they match the filter criteria (or just count them)
-    for(i = 0; i < testArray.size(); i++) {
-        const TestData& data = *testArray[i];
-        if(!matchesAny(data.m_file, p->filters[0], 1, p->case_sensitive))
-            continue;
-        if(matchesAny(data.m_file, p->filters[1], 0, p->case_sensitive))
-            continue;
-        if(!matchesAny(data.m_suite, p->filters[2], 1, p->case_sensitive))
-            continue;
-        if(matchesAny(data.m_suite, p->filters[3], 0, p->case_sensitive))
-            continue;
-        if(!matchesAny(data.m_name, p->filters[4], 1, p->case_sensitive))
-            continue;
-        if(matchesAny(data.m_name, p->filters[5], 0, p->case_sensitive))
-            continue;
-
-        numTestsPassingFilters++;
-
-        // do not execute the test if we are to only count the number of filter passing tests
-        if(p->count)
-            continue;
-
-        // print the name of the test and don't execute it
-        if(p->list_test_cases) {
-            printf("%s\n", data.m_name);
-            continue;
-        }
-
-        // print the name of the test suite if not done already and don't execute it
-        if(p->list_test_suites) {
-            if(testSuitesPassingFilters.count(data.m_suite) == 0) {
-                printf("%s\n", data.m_suite);
-                testSuitesPassingFilters.insert(data.m_suite);
-            }
-            continue;
-        }
-
-        // skip the test if it is not in the execution range
-        if((p->last < numTestsPassingFilters && p->first <= p->last) ||
-           (p->first > numTestsPassingFilters))
-            continue;
-
-        // execute the test if it passes all the filtering
-        {
-#ifdef _MSC_VER
-//__try {
-#endif // _MSC_VER
-
-            p->currentTest = &data;
-
-            // if logging successful tests - force the start log
-            p->hasLoggedCurrentTestStart = false;
-            if(p->success)
-                DOCTEST_LOG_START();
-
-            unsigned didFail = 0;
-            p->subcasesPassed.clear();
-            do {
-                // reset the assertion state
-                p->numAssertionsForCurrentTestcase       = 0;
-                p->numFailedAssertionsForCurrentTestcase = 0;
-
-                // reset some of the fields for subcases (except for the set of fully passed ones)
-                p->subcasesHasSkipped   = false;
-                p->subcasesCurrentLevel = 0;
-                p->subcasesEnteredLevels.clear();
-
-                // execute the test
-                didFail += callTestFunc(data.m_f);
-                p->numAssertions += p->numAssertionsForCurrentTestcase;
-
-                // exit this loop if enough assertions have failed
-                if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after)
-                    p->subcasesHasSkipped = false;
-
-                // if the start has been logged
-                if(p->hasLoggedCurrentTestStart)
-                    logTestEnd();
-                p->hasLoggedCurrentTestStart = false;
-
-            } while(p->subcasesHasSkipped == true);
-
-            if(didFail > 0)
-                numFailed++;
-
-            // stop executing tests if enough assertions have failed
-            if(p->abort_after > 0 && p->numFailedAssertions >= p->abort_after)
-                break;
-
-#ifdef _MSC_VER
-//} __except(1) {
-//    printf("Unknown SEH exception caught!\n");
-//    numFailed++;
-//}
-#endif // _MSC_VER
-        }
-    }
-
-    DOCTEST_PRINTF_COLORED(getSeparator(), numFailed > 0 ? Color::Red : Color::Green);
-    if(p->count || p->list_test_cases || p->list_test_suites) {
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-        printf("number of tests passing the current filters: %d\n", numTestsPassingFilters);
-    } else {
-        char buff[DOCTEST_SNPRINTF_BUFFER_LENGTH];
-
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "test cases: %4d", numTestsPassingFilters);
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d passed",
-                         numTestsPassingFilters - numFailed);
-        DOCTEST_PRINTF_COLORED(buff, numFailed > 0 ? Color::None : Color::Green);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d failed", numFailed);
-        DOCTEST_PRINTF_COLORED(buff, numFailed > 0 ? Color::Red : Color::None);
-
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d skipped\n",
-                         static_cast<unsigned>(testArray.size()) - numTestsPassingFilters);
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-
-        DOCTEST_PRINTF_COLORED("[doctest] ", Color::Cyan);
-
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "assertions: %4d", p->numAssertions);
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d passed",
-                         p->numAssertions - p->numFailedAssertions);
-        DOCTEST_PRINTF_COLORED(buff, numFailed > 0 ? Color::None : Color::Green);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " | ");
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), "%4d failed", p->numFailedAssertions);
-        DOCTEST_PRINTF_COLORED(buff, p->numFailedAssertions > 0 ? Color::Red : Color::None);
-
-        DOCTEST_SNPRINTF(buff, DOCTEST_COUNTOF(buff), " |\n");
-        DOCTEST_PRINTF_COLORED(buff, Color::None);
-    }
-
-    // remove any coloring
-    DOCTEST_PRINTF_COLORED("", Color::None);
-
-    getContextState() = 0;
-
-    if(numFailed && !p->no_exitcode)
-        return EXIT_FAILURE;
-    return EXIT_SUCCESS;
-}
-} // namespace doctest
-
-#endif // DOCTEST_CONFIG_DISABLE
-#endif // DOCTEST_LIBRARY_IMPLEMENTATION
-#endif // DOCTEST_CONFIG_IMPLEMENT
-
-// == THIS SUPPLIES A MAIN FUNCTION AND SHOULD BE DONE ONLY IN ONE TRANSLATION UNIT
-#if defined(DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN) && !defined(DOCTEST_MAIN_CONFIGURED)
-#define DOCTEST_MAIN_CONFIGURED
-int main(int argc, char** argv) { return doctest::Context(argc, argv).run(); }
-#endif // DOCTEST_MAIN_CONFIGURED
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif // __clang__
-
-#if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
-#pragma GCC diagnostic pop
-#endif // > gcc 4.6
-#endif // __GNUC__
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // _MSC_VER
diff --git a/Src/External/cereal/unittests/forward_list.cpp b/Src/External/cereal/unittests/forward_list.cpp
deleted file mode 100644
index aefef2e..0000000
--- a/Src/External/cereal/unittests/forward_list.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "forward_list.hpp"
-
-TEST_SUITE("forward_list");
-
-TEST_CASE("binary_forward_list")
-{
-  test_forward_list<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_forward_list")
-{
-  test_forward_list<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_forward_list")
-{
-  test_forward_list<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_forward_list")
-{
-  test_forward_list<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/forward_list.hpp b/Src/External/cereal/unittests/forward_list.hpp
deleted file mode 100644
index c0f568b..0000000
--- a/Src/External/cereal/unittests/forward_list.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_FORWARD_LIST_H_
-#define CEREAL_TEST_FORWARD_LIST_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_forward_list()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::forward_list<int> o_podforward_list(100);
-    for(auto & elem : o_podforward_list)
-      elem = random_value<int>(gen);
-
-    std::forward_list<StructInternalSerialize> o_iserforward_list(100);
-    for(auto & elem : o_iserforward_list)
-      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::forward_list<StructInternalSplit> o_isplforward_list(100);
-    for(auto & elem : o_isplforward_list)
-      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::forward_list<StructExternalSerialize> o_eserforward_list(100);
-    for(auto & elem : o_eserforward_list)
-      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::forward_list<StructExternalSplit> o_esplforward_list(100);
-    for(auto & elem : o_esplforward_list)
-      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podforward_list);
-      oar(o_iserforward_list);
-      oar(o_isplforward_list);
-      oar(o_eserforward_list);
-      oar(o_esplforward_list);
-    }
-
-    std::forward_list<int> i_podforward_list;
-    std::forward_list<StructInternalSerialize> i_iserforward_list;
-    std::forward_list<StructInternalSplit>     i_isplforward_list;
-    std::forward_list<StructExternalSerialize> i_eserforward_list;
-    std::forward_list<StructExternalSplit>     i_esplforward_list;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podforward_list);
-      iar(i_iserforward_list);
-      iar(i_isplforward_list);
-      iar(i_eserforward_list);
-      iar(i_esplforward_list);
-    }
-
-    check_collection(i_podforward_list,  o_podforward_list );
-    check_collection(i_iserforward_list, o_iserforward_list);
-    check_collection(i_isplforward_list, o_isplforward_list);
-    check_collection(i_eserforward_list, o_eserforward_list);
-    check_collection(i_esplforward_list, o_esplforward_list);
-  }
-}
-
-#endif // CEREAL_TEST_FORWARD_LIST_H_
diff --git a/Src/External/cereal/unittests/list.cpp b/Src/External/cereal/unittests/list.cpp
deleted file mode 100644
index 099f530..0000000
--- a/Src/External/cereal/unittests/list.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "list.hpp"
-
-TEST_SUITE("list");
-
-TEST_CASE("binary_list")
-{
-  test_list<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_list")
-{
-  test_list<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_list")
-{
-  test_list<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_list")
-{
-  test_list<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/list.hpp b/Src/External/cereal/unittests/list.hpp
deleted file mode 100644
index 9e8a7dd..0000000
--- a/Src/External/cereal/unittests/list.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_LIST_H_
-#define CEREAL_TEST_LIST_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_list()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::list<int> o_podlist(100);
-    for(auto & elem : o_podlist)
-      elem = random_value<int>(gen);
-
-    std::list<StructInternalSerialize> o_iserlist(100);
-    for(auto & elem : o_iserlist)
-      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::list<StructInternalSplit> o_ispllist(100);
-    for(auto & elem : o_ispllist)
-      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::list<StructExternalSerialize> o_eserlist(100);
-    for(auto & elem : o_eserlist)
-      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::list<StructExternalSplit> o_espllist(100);
-    for(auto & elem : o_espllist)
-      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podlist);
-      oar(o_iserlist);
-      oar(o_ispllist);
-      oar(o_eserlist);
-      oar(o_espllist);
-    }
-
-    std::list<int> i_podlist;
-    std::list<StructInternalSerialize> i_iserlist;
-    std::list<StructInternalSplit>     i_ispllist;
-    std::list<StructExternalSerialize> i_eserlist;
-    std::list<StructExternalSplit>     i_espllist;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podlist);
-      iar(i_iserlist);
-      iar(i_ispllist);
-      iar(i_eserlist);
-      iar(i_espllist);
-    }
-
-    check_collection(i_podlist,  o_podlist);
-    check_collection(i_iserlist, o_iserlist);
-    check_collection(i_ispllist, o_ispllist);
-    check_collection(i_eserlist, o_eserlist);
-    check_collection(i_espllist, o_espllist);
-  }
-}
-
-#endif // CEREAL_TEST_LIST_H_
diff --git a/Src/External/cereal/unittests/load_construct.cpp b/Src/External/cereal/unittests/load_construct.cpp
deleted file mode 100644
index 923e19a..0000000
--- a/Src/External/cereal/unittests/load_construct.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "load_construct.hpp"
-
-TEST_SUITE("load_construct");
-
-TEST_CASE("binary_memory_load_construct")
-{
-  test_memory_load_construct<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_memory_load_construct")
-{
-  test_memory_load_construct<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_memory_load_construct")
-{
-  test_memory_load_construct<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_memory_load_construct")
-{
-  test_memory_load_construct<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/load_construct.hpp b/Src/External/cereal/unittests/load_construct.hpp
deleted file mode 100644
index 97b37c1..0000000
--- a/Src/External/cereal/unittests/load_construct.hpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_LOAD_CONSTRUCT_H_
-#define CEREAL_TEST_LOAD_CONSTRUCT_H_
-#include "common.hpp"
-
-struct OneLA
-{
-  OneLA( int xx ) : x( xx ) {}
-
-  int x;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  { ar( x ); }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<OneLA> & construct )
-  {
-    int xx;
-    ar( xx );
-    construct( xx );
-  }
-
-  bool operator==( OneLA const & other ) const
-  { return x == other.x; }
-};
-
-std::ostream& operator<<(std::ostream& os, OneLA const & s)
-{
-  os << "[" << s.x << "]";
-  return os;
-}
-
-struct OneLAVersioned
-{
-  OneLAVersioned( int xx ) : x( xx ), v() {}
-  OneLAVersioned( int xx, int vv ) : x( xx ), v( vv ) {}
-
-  int x;
-  std::uint32_t v;
-
-  template <class Archive>
-  void serialize( Archive & ar, const std::uint32_t version )
-  { ar( x ); v = version; }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<OneLAVersioned> & construct, const std::uint32_t version )
-  {
-    int xx;
-    ar( xx );
-    construct( xx, version );
-  }
-
-  bool operator==( OneLAVersioned const & other ) const
-  { return x == other.x; }
-};
-
-std::ostream& operator<<(std::ostream& os, OneLAVersioned const & s)
-{
-  os << "[" << s.x << "]";
-  return os;
-}
-
-CEREAL_CLASS_VERSION( OneLAVersioned, 13 )
-
-struct TwoLA
-{
-  TwoLA( int xx ) : x( xx ) {}
-
-  int x;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  { ar( x ); }
-
-  bool operator==( TwoLA const & other ) const
-  { return x == other.x; }
-};
-
-std::ostream& operator<<(std::ostream& os, TwoLA const & s)
-{
-  os << "[" << s.x << "]";
-  return os;
-}
-
-namespace cereal
-{
-  template <>
-  struct LoadAndConstruct<TwoLA>
-  {
-    template <class Archive>
-    static void load_and_construct( Archive & ar, cereal::construct<TwoLA> & construct )
-    {
-      int xx;
-      ar( xx );
-      construct( xx );
-    }
-  };
-}
-
-struct TwoLAVersioned
-{
-  TwoLAVersioned( int xx ) : x( xx ), v() {}
-  TwoLAVersioned( int xx, int vv ) : x( xx ), v( vv ) {}
-
-  int x;
-  std::uint32_t v;
-
-  template <class Archive>
-  void serialize( Archive & ar, const std::uint32_t version )
-  { ar( x ); v = version; }
-
-  bool operator==( TwoLAVersioned const & other ) const
-  { return x == other.x; }
-};
-
-std::ostream& operator<<(std::ostream& os, TwoLAVersioned const & s)
-{
-  os << "[" << s.x << "]";
-  return os;
-}
-
-namespace cereal
-{
-  template <>
-  struct LoadAndConstruct<TwoLAVersioned>
-  {
-    template <class Archive>
-    static void load_and_construct( Archive & ar, cereal::construct<TwoLAVersioned> & construct, const std::uint32_t version )
-    {
-      int xx;
-      ar( xx );
-      construct( xx, version );
-    }
-  };
-}
-
-CEREAL_CLASS_VERSION( TwoLAVersioned, 1 )
-
-struct ThreeLA : std::enable_shared_from_this<ThreeLA>
-{
-  ThreeLA( int xx ) : x( xx ) {}
-
-  int x;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  { ar( x ); }
-
-  bool operator==( ThreeLA const & other ) const
-  { return x == other.x; }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<ThreeLA> & construct )
-  {
-    int xx;
-    ar( xx );
-    construct( xx );
-  }
-};
-
-std::ostream& operator<<(std::ostream& os, ThreeLA const & s)
-{
-  os << "[" << s.x << "]";
-  return os;
-}
-
-template <class IArchive, class OArchive>
-void test_memory_load_construct()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    auto o_shared1 = std::make_shared<OneLA>( random_value<int>(gen) );
-    auto o_shared2 = std::make_shared<TwoLA>( random_value<int>(gen) );
-    std::unique_ptr<OneLA> o_unique1( new OneLA( random_value<int>(gen) ) );
-    std::unique_ptr<TwoLA> o_unique2( new TwoLA( random_value<int>(gen) ) );
-    auto o_shared3 = std::make_shared<ThreeLA>( random_value<int>(gen) );
-    auto o_shared1v = std::make_shared<OneLAVersioned>( random_value<int>(gen) );
-    auto o_shared2v = std::make_shared<TwoLAVersioned>( random_value<int>(gen) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( o_shared1 );
-      oar( o_shared2 );
-      oar( o_unique1 );
-      oar( o_unique2 );
-      oar( o_shared3 );
-      oar( o_shared1v );
-      oar( o_shared2v );
-    }
-
-    o_shared3->shared_from_this(); // tests github issue #68
-
-    decltype(o_shared1) i_shared1;
-    decltype(o_shared2) i_shared2;
-    decltype(o_unique1) i_unique1;
-    decltype(o_unique2) i_unique2;
-    decltype(o_shared3) i_shared3;
-    decltype(o_shared1v) i_shared1v;
-    decltype(o_shared2v) i_shared2v;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( i_shared1 );
-      iar( i_shared2 );
-      iar( i_unique1 );
-      iar( i_unique2 );
-      iar( i_shared3 );
-      iar( i_shared1v );
-      iar( i_shared2v );
-    }
-
-    CHECK_EQ( *o_shared1, *i_shared1 );
-    CHECK_EQ( *o_shared2, *i_shared2 );
-    CHECK_EQ( *o_unique1, *i_unique1 );
-    CHECK_EQ( *o_unique2, *i_unique2 );
-    CHECK_EQ( *o_shared3, *i_shared3 );
-    CHECK_EQ( *o_shared1v, *i_shared1v );
-    CHECK_EQ(i_shared1v->v, 13u);
-    CHECK_EQ( *o_shared2v, *i_shared2v );
-    CHECK_EQ(i_shared2v->v, 1u);
-
-    auto i_shared3_2 = i_shared3->shared_from_this();
-    CHECK_EQ( *o_shared3, *i_shared3_2 );
-  }
-}
-
-#endif // CEREAL_TEST_LOAD_CONSTRUCT_H_
diff --git a/Src/External/cereal/unittests/map.cpp b/Src/External/cereal/unittests/map.cpp
deleted file mode 100644
index 40e1b84..0000000
--- a/Src/External/cereal/unittests/map.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "map.hpp"
-
-TEST_SUITE("map");
-
-TEST_CASE("binary_map")
-{
-  test_map<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_map")
-{
-  test_map<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_map")
-{
-  test_map<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_map")
-{
-  test_map<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_CASE("binary_map_memory")
-{
-  test_map_memory<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_map_memory")
-{
-  test_map_memory<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_map_memory")
-{
-  test_map_memory<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_map_memory")
-{
-  test_map_memory<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/map.hpp b/Src/External/cereal/unittests/map.hpp
deleted file mode 100644
index 20b7c62..0000000
--- a/Src/External/cereal/unittests/map.hpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_MAP_H_
-#define CEREAL_TEST_MAP_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_map()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::map<size_t, std::vector<StructInternalSerialize>> o_vectormap;
-    for(int j=0; j<10; ++j)
-    {
-      size_t id = random_value<size_t>(gen);
-      for(int k=0; k<100; ++k)
-        o_vectormap[id].emplace_back(random_value<int>(gen), random_value<int>(gen));
-    }
-
-    std::map<std::string, int> o_podmap;
-    for(int j=0; j<100; ++j)
-      o_podmap.insert({random_value<std::string>(gen), random_value<int>(gen)});
-
-    std::map<int, StructInternalSerialize> o_isermap;
-    for(int j=0; j<100; ++j)
-      o_isermap.insert({random_value<int>(gen), { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::map<int, StructInternalSplit> o_isplmap;
-    for(int j=0; j<100; ++j)
-      o_isplmap.insert({random_value<int>(gen), { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::map<uint32_t, StructExternalSerialize> o_esermap;
-    for(int j=0; j<100; ++j)
-      o_esermap.insert({random_value<uint32_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::map<int8_t, StructExternalSplit> o_esplmap;
-    for(int j=0; j<100; ++j)
-      o_esplmap.insert({random_value<char>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_vectormap);
-      oar(o_podmap);
-      oar(o_isermap);
-      oar(o_isplmap);
-      oar(o_esermap);
-      oar(o_esplmap);
-    }
-
-    std::map<size_t, std::vector<StructInternalSerialize>> i_vectormap;
-    std::map<std::string, int> i_podmap;
-    std::map<int, StructInternalSerialize>   i_isermap;
-    std::map<int, StructInternalSplit>        i_isplmap;
-    std::map<uint32_t, StructExternalSerialize> i_esermap;
-    std::map<int8_t, StructExternalSplit>       i_esplmap;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_vectormap);
-      iar(i_podmap);
-      iar(i_isermap);
-      iar(i_isplmap);
-      iar(i_esermap);
-      iar(i_esplmap);
-    }
-
-    CHECK_EQ(i_vectormap.size(), o_vectormap.size());
-    auto o_v_it = o_vectormap.begin();
-    auto i_v_it = i_vectormap.begin();
-    for(;o_v_it != o_vectormap.end(); ++o_v_it, ++i_v_it)
-    {
-      CHECK_EQ(i_v_it->second.size(), o_v_it->second.size());
-      check_collection(i_v_it->second, o_v_it->second);
-    }
-
-    check_collection(i_podmap,  o_podmap);
-    check_collection(i_isermap, o_isermap);
-    check_collection(i_isplmap, o_isplmap);
-    check_collection(i_esermap, o_esermap);
-    check_collection(i_esplmap, o_esplmap);
-  }
-}
-
-template <class IArchive, class OArchive> inline
-void test_map_memory()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::map<int, std::unique_ptr<int>> o_uniqueptrMap;
-    std::map<int, std::shared_ptr<int>> o_sharedptrMap;
-
-    for(int j=0; j<100; ++j)
-    {
-      #ifdef CEREAL_OLDER_GCC
-      o_uniqueptrMap.insert( std::make_pair(random_value<int>(gen), std::unique_ptr<int>( new int( random_value<int>(gen) ) )) );
-      o_sharedptrMap.insert( std::make_pair(random_value<int>(gen), std::make_shared<int>( random_value<int>(gen) )) );
-      #else // NOT CEREAL_OLDER_GCC
-      o_uniqueptrMap.emplace( random_value<int>(gen), std::unique_ptr<int>( new int( random_value<int>(gen) ) ) );
-      o_sharedptrMap.emplace( random_value<int>(gen), std::make_shared<int>( random_value<int>(gen) ) );
-      #endif // NOT CEREAL_OLDER_GCC
-    }
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( o_uniqueptrMap );
-      oar( o_sharedptrMap );
-    }
-
-    decltype( o_uniqueptrMap ) i_uniqueptrMap;
-    decltype( o_sharedptrMap ) i_sharedptrMap;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( i_uniqueptrMap );
-      iar( i_sharedptrMap );
-    }
-
-    CHECK_EQ(o_sharedptrMap.size(), i_sharedptrMap.size());
-    CHECK_EQ(o_uniqueptrMap.size(), i_uniqueptrMap.size());
-
-    auto o_v_it = o_uniqueptrMap.begin();
-    auto i_v_it = i_uniqueptrMap.begin();
-    for(;o_v_it != o_uniqueptrMap.end(); ++o_v_it, ++i_v_it)
-    {
-      CHECK_EQ(i_v_it->first, o_v_it->first);
-      CHECK_EQ(*i_v_it->second, *o_v_it->second);
-    }
-  }
-}
-
-#endif // CEREAL_TEST_MAP_H_
diff --git a/Src/External/cereal/unittests/memory.cpp b/Src/External/cereal/unittests/memory.cpp
deleted file mode 100644
index 8c62592..0000000
--- a/Src/External/cereal/unittests/memory.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "memory.hpp"
-
-TEST_SUITE("memory");
-
-TEST_CASE("binary_memory")
-{
-  test_memory<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_memory")
-{
-  test_memory<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_memory")
-{
-  test_memory<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_memory")
-{
-  test_memory<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_CASE("binary_default_construction")
-{
-  test_default_construction<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_default_construction")
-{
-  test_default_construction<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_default_construction")
-{
-  test_default_construction<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_default_construction")
-{
-  test_default_construction<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/memory.hpp b/Src/External/cereal/unittests/memory.hpp
deleted file mode 100644
index 19ec2bb..0000000
--- a/Src/External/cereal/unittests/memory.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_MEMORY_H_
-#define CEREAL_TEST_MEMORY_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_memory()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::shared_ptr<int> o_xptr1 = std::make_shared<int>(random_value<int>(gen));
-    std::shared_ptr<int> o_xptr2 = o_xptr1;
-    std::shared_ptr<int> o_yptr1 = std::make_shared<int>(random_value<int>(gen));
-    std::shared_ptr<int> o_yptr2 = o_yptr1;
-    std::shared_ptr<int> o_nullptr1;
-    std::shared_ptr<int> o_nullptr2;
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( o_xptr1, o_xptr2 );
-      oar( o_yptr1, o_yptr2 );
-      oar( o_nullptr1, o_nullptr2 );
-    }
-
-    std::shared_ptr<int> i_xptr1;
-    std::shared_ptr<int> i_xptr2;
-    std::shared_ptr<int> i_yptr1;
-    std::shared_ptr<int> i_yptr2;
-    std::shared_ptr<int> i_nullptr1;
-    std::shared_ptr<int> i_nullptr2;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( i_xptr1, i_xptr2);
-      iar( i_yptr1, i_yptr2);
-      iar( i_nullptr1, i_nullptr2 );
-    }
-
-    CHECK_EQ(o_xptr1.get(), o_xptr2.get());
-    CHECK_EQ(i_xptr1.get(), i_xptr2.get());
-    CHECK_EQ(*i_xptr1,      *i_xptr2);
-
-    CHECK_EQ(o_yptr1.get(), o_yptr2.get());
-    CHECK_EQ(i_yptr1.get(), i_yptr2.get());
-    CHECK_EQ(*i_yptr1,      *i_yptr2);
-    CHECK_UNARY_FALSE(i_nullptr1);
-    CHECK_UNARY_FALSE(i_nullptr2);
-  }
-}
-
-class TestClass
-{
-  public:
-    TestClass(int v) : x(v) { }
-    int x;
-
-  private:
-    friend class cereal::access;
-    TestClass() { };
-
-    template<class Archive>
-      void serialize(Archive & ar) { ar(x); }
-};
-
-template <class IArchive, class OArchive> inline
-void test_default_construction()
-{
-  auto o_ptr = std::make_shared<TestClass>(1);
-  std::shared_ptr<TestClass> i_ptr;
-
-  std::ostringstream os;
-  {
-    OArchive oar(os);
-    oar(o_ptr);
-  }
-  {
-    std::istringstream is(os.str());
-    IArchive iar(is);
-    iar(i_ptr);
-  }
-  CHECK_EQ(o_ptr->x, i_ptr->x);
-}
-
-#endif // CEREAL_TEST_LOAD_CONSTRUCT_H_
diff --git a/Src/External/cereal/unittests/memory_cycles.cpp b/Src/External/cereal/unittests/memory_cycles.cpp
deleted file mode 100644
index 461decc..0000000
--- a/Src/External/cereal/unittests/memory_cycles.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "memory_cycles.hpp"
-
-TEST_SUITE("memory_cycles");
-
-TEST_CASE("binary_memory_cycles")
-{
-  test_memory_cycles<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_memory_cycles")
-{
-  test_memory_cycles<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_memory_cycles")
-{
-  test_memory_cycles<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_memory_cycles")
-{
-  test_memory_cycles<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/memory_cycles.hpp b/Src/External/cereal/unittests/memory_cycles.hpp
deleted file mode 100644
index 9009723..0000000
--- a/Src/External/cereal/unittests/memory_cycles.hpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_MEMORY_CYCLES_H_
-#define CEREAL_TEST_MEMORY_CYCLES_H_
-#include "common.hpp"
-
-struct MemoryCycle
-{
-  MemoryCycle() = default;
-
-  MemoryCycle( int v ) :
-    value( v )
-  { }
-
-  int value;
-  std::weak_ptr<MemoryCycle> ptr;
-
-  bool operator==( MemoryCycle const & other ) const
-  {
-    return value == other.value && ptr.lock() == other.ptr.lock();
-  }
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( value, ptr );
-  }
-};
-
-std::ostream& operator<<(std::ostream& os, MemoryCycle const & s)
-{
-  os << "[value: " << s.value << " ptr: " << s.ptr.lock() << "]";
-  return os;
-}
-
-class MemoryCycleLoadAndConstruct
-{
-  public:
-    MemoryCycleLoadAndConstruct( int v ) :
-      value( v )
-    { }
-
-    MemoryCycleLoadAndConstruct( int v,
-        std::weak_ptr<MemoryCycleLoadAndConstruct> p ) :
-      value( v ),
-      ptr( p )
-    { }
-
-    bool operator==( MemoryCycleLoadAndConstruct const & other ) const
-    {
-      return value == other.value && ptr.lock() == other.ptr.lock();
-    }
-
-    template <class Archive>
-    void serialize( Archive & ar )
-    {
-      ar( value, ptr );
-    }
-
-    template <class Archive>
-    static void load_and_construct( Archive & ar, cereal::construct<MemoryCycleLoadAndConstruct> & construct )
-    {
-      int val;
-      std::weak_ptr<MemoryCycleLoadAndConstruct> p;
-
-      ar( val, p );
-      construct( val, p );
-    }
-
-    int value;
-    std::weak_ptr<MemoryCycleLoadAndConstruct> ptr;
-};
-
-std::ostream& operator<<(std::ostream& os, MemoryCycleLoadAndConstruct const & s)
-{
-  os << "[value: " << s.value << " ptr: " << s.ptr.lock() << "]";
-  return os;
-}
-
-template <class IArchive, class OArchive> inline
-void test_memory_cycles()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    auto o_ptr1 = std::make_shared<MemoryCycle>( random_value<int>(gen) );
-    o_ptr1->ptr = o_ptr1;
-    auto o_ptr2 = std::make_shared<MemoryCycleLoadAndConstruct>( random_value<int>(gen) );
-    o_ptr2->ptr = o_ptr2;
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( o_ptr1 );
-      oar( o_ptr2 );
-    }
-
-    decltype(o_ptr1) i_ptr1;
-    decltype(o_ptr2) i_ptr2;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( i_ptr1 );
-      iar( i_ptr2 );
-    }
-
-    CHECK_EQ( o_ptr1->value, i_ptr1->value );
-    CHECK_EQ( i_ptr1.get(), i_ptr1->ptr.lock().get() );
-    CHECK_EQ( o_ptr2->value, i_ptr2->value );
-    CHECK_EQ( i_ptr2.get(), i_ptr2->ptr.lock().get() );
-  }
-}
-#endif // CEREAL_TEST_MEMORY_CYCLES_H_
diff --git a/Src/External/cereal/unittests/multimap.cpp b/Src/External/cereal/unittests/multimap.cpp
deleted file mode 100644
index 8df857e..0000000
--- a/Src/External/cereal/unittests/multimap.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "multimap.hpp"
-
-TEST_SUITE("multimap");
-
-TEST_CASE("binary_multimap")
-{
-  test_multimap<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_multimap")
-{
-  test_multimap<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_multimap")
-{
-  test_multimap<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_multimap")
-{
-  test_multimap<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/multimap.hpp b/Src/External/cereal/unittests/multimap.hpp
deleted file mode 100644
index 1426769..0000000
--- a/Src/External/cereal/unittests/multimap.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_MULTIMAP_H_
-#define CEREAL_TEST_MULTIMAP_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_multimap()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::multimap<std::string, int> o_podmultimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<std::string>(gen);
-      o_podmultimap.insert({key, random_value<int>(gen)});
-      o_podmultimap.insert({key, random_value<int>(gen)});
-    }
-
-    std::multimap<uint8_t, StructInternalSerialize> o_isermultimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<uint8_t>(gen);
-      o_isermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-      o_isermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::multimap<int16_t, StructInternalSplit> o_isplmultimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<int16_t>(gen);
-      o_isplmultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-      o_isplmultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::multimap<uint32_t, StructExternalSerialize> o_esermultimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<uint32_t>(gen);
-      o_esermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-      o_esermultimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::multimap<int8_t, StructExternalSplit> o_esplmultimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<char>(gen);
-      o_esplmultimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
-      o_esplmultimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podmultimap);
-      oar(o_isermultimap);
-      oar(o_isplmultimap);
-      oar(o_esermultimap);
-      oar(o_esplmultimap);
-    }
-
-    std::multimap<std::string, int> i_podmultimap;
-    std::multimap<uint8_t, StructInternalSerialize>   i_isermultimap;
-    std::multimap<int16_t, StructInternalSplit>        i_isplmultimap;
-    std::multimap<uint32_t, StructExternalSerialize> i_esermultimap;
-    std::multimap<int8_t, StructExternalSplit>       i_esplmultimap;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podmultimap);
-      iar(i_isermultimap);
-      iar(i_isplmultimap);
-      iar(i_esermultimap);
-      iar(i_esplmultimap);
-    }
-
-#define MULTIMAP_CHECK(InMap, OutMap) \
-    for( auto & pair : OutMap ) \
-    { \
-      auto const count = InMap.count( pair.first ); \
-      CHECK_EQ( count, OutMap.count( pair.first ) ); \
-      auto find = InMap.find( pair.first ); \
-      bool found = false; \
-      for( size_t i = 0; i < count; ++i, ++find ) \
-        found |= find->second == pair.second; \
-      CHECK_UNARY( found ); \
-    }
-
-    MULTIMAP_CHECK( i_podmultimap, o_podmultimap );
-    MULTIMAP_CHECK( i_isermultimap, o_isermultimap );
-    MULTIMAP_CHECK( i_isplmultimap, o_isplmultimap );
-    MULTIMAP_CHECK( i_esermultimap, o_esermultimap );
-    MULTIMAP_CHECK( i_esplmultimap, o_esplmultimap );
-
-#undef MULTIMAP_CHECK
-  }
-}
-
-#endif // CEREAL_TEST_MULTIMAP_H_
diff --git a/Src/External/cereal/unittests/multiset.cpp b/Src/External/cereal/unittests/multiset.cpp
deleted file mode 100644
index de53d2a..0000000
--- a/Src/External/cereal/unittests/multiset.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "multiset.hpp"
-
-TEST_SUITE("multiset");
-
-TEST_CASE("binary_multiset")
-{
-  test_multiset<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_multiset")
-{
-  test_multiset<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_multiset")
-{
-  test_multiset<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_multiset")
-{
-  test_multiset<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/multiset.hpp b/Src/External/cereal/unittests/multiset.hpp
deleted file mode 100644
index 89ad7a1..0000000
--- a/Src/External/cereal/unittests/multiset.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_MULTISET_H_
-#define CEREAL_TEST_MULTISET_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_multiset()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::multiset<int> o_podmultiset;
-    for(int j=0; j<100; ++j)
-    {
-      int value = random_value<int>(gen);
-      o_podmultiset.insert(value);
-      o_podmultiset.insert(value);
-    }
-
-    std::multiset<StructInternalSerialize> o_isermultiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructInternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
-      o_isermultiset.insert(value);
-      o_isermultiset.insert(value);
-    }
-
-    std::multiset<StructInternalSplit> o_isplmultiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructInternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
-      o_isplmultiset.insert(value);
-      o_isplmultiset.insert(value);
-    }
-
-    std::multiset<StructExternalSerialize> o_esermultiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructExternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
-      o_esermultiset.insert(value);
-      o_esermultiset.insert(value);
-    }
-
-    std::multiset<StructExternalSplit> o_esplmultiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructExternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
-      o_esplmultiset.insert(value);
-      o_esplmultiset.insert(value);
-    }
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podmultiset);
-      oar(o_isermultiset);
-      oar(o_isplmultiset);
-      oar(o_esermultiset);
-      oar(o_esplmultiset);
-    }
-
-    std::multiset<int> i_podmultiset;
-    std::multiset<StructInternalSerialize> i_isermultiset;
-    std::multiset<StructInternalSplit>     i_isplmultiset;
-    std::multiset<StructExternalSerialize> i_esermultiset;
-    std::multiset<StructExternalSplit>     i_esplmultiset;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podmultiset);
-      iar(i_isermultiset);
-      iar(i_isplmultiset);
-      iar(i_esermultiset);
-      iar(i_esplmultiset);
-    }
-
-    for(auto const & p : i_podmultiset)
-    {
-      CHECK_EQ(o_podmultiset.count(p), i_podmultiset.count(p));
-    }
-
-    for(auto const & p : i_isermultiset)
-    {
-      CHECK_EQ(o_isermultiset.count(p), i_isermultiset.count(p));
-    }
-
-    for(auto const & p : i_isplmultiset)
-    {
-      CHECK_EQ(o_isplmultiset.count(p), i_isplmultiset.count(p));
-    }
-
-    for(auto const & p : i_esermultiset)
-    {
-      CHECK_EQ(o_esermultiset.count(p), i_esermultiset.count(p));
-    }
-
-    for(auto const & p : i_esplmultiset)
-    {
-      CHECK_EQ(o_esplmultiset.count(p), i_esplmultiset.count(p));
-    }
-  }
-}
-
-#endif // CEREAL_TEST_MULTISET_H_
diff --git a/Src/External/cereal/unittests/pair.cpp b/Src/External/cereal/unittests/pair.cpp
deleted file mode 100644
index 063237b..0000000
--- a/Src/External/cereal/unittests/pair.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "pair.hpp"
-
-TEST_SUITE("pair");
-
-TEST_CASE("binary_pair")
-{
-  test_pair<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_pair")
-{
-  test_pair<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_pair")
-{
-  test_pair<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-TEST_CASE("json_pair")
-{
-  test_pair<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/pair.hpp b/Src/External/cereal/unittests/pair.hpp
deleted file mode 100644
index fe60931..0000000
--- a/Src/External/cereal/unittests/pair.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_PAIR_H_
-#define CEREAL_TEST_PAIR_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_pair()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rng = [&](){ return random_value<int>(gen); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::pair<int, int> o_podpair = {rng(), rng()};
-    std::pair<StructInternalSerialize, StructInternalSerialize> o_iserpair = {{rng(), rng()}, {rng(), rng()}};
-    std::pair<StructInternalSplit, StructInternalSplit> o_isplpair = {{rng(), rng()}, {rng(), rng()}};
-    std::pair<StructExternalSerialize, StructExternalSerialize> o_eserpair = {{rng(), rng()}, {rng(), rng()}};
-    std::pair<StructExternalSplit, StructExternalSplit> o_esplpair = {{rng(), rng()}, {rng(), rng()}};
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podpair);
-      oar(o_iserpair);
-      oar(o_isplpair);
-      oar(o_eserpair);
-      oar(o_esplpair);
-    }
-
-    std::pair<int, int> i_podpair;
-    std::pair<StructInternalSerialize, StructInternalSerialize> i_iserpair;
-    std::pair<StructInternalSplit, StructInternalSplit> i_isplpair;
-    std::pair<StructExternalSerialize, StructExternalSerialize> i_eserpair;
-    std::pair<StructExternalSplit, StructExternalSplit> i_esplpair;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podpair);
-      iar(i_iserpair);
-      iar(i_isplpair);
-      iar(i_eserpair);
-      iar(i_esplpair);
-    }
-
-    CHECK_EQ( i_podpair.first, o_podpair.first );
-    CHECK_EQ( i_podpair.second, o_podpair.second );
-
-    CHECK_EQ( i_iserpair.first, o_iserpair.first );
-    CHECK_EQ( i_iserpair.second, o_iserpair.second );
-
-    CHECK_EQ( i_isplpair.first, o_isplpair.first );
-    CHECK_EQ( i_isplpair.second, o_isplpair.second );
-
-    CHECK_EQ( i_eserpair.first, o_eserpair.first );
-    CHECK_EQ( i_eserpair.second, o_eserpair.second );
-
-    CHECK_EQ( i_esplpair.first, o_esplpair.first );
-    CHECK_EQ( i_esplpair.second, o_esplpair.second );
-  }
-}
-
-#endif // CEREAL_TEST_PAIR_H_
diff --git a/Src/External/cereal/unittests/pod.cpp b/Src/External/cereal/unittests/pod.cpp
deleted file mode 100644
index b2450e7..0000000
--- a/Src/External/cereal/unittests/pod.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "pod.hpp"
-
-TEST_SUITE("pod");
-
-TEST_CASE("binary_pod")
-{
-  test_pod<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_pod")
-{
-  test_pod<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_pod")
-{
-  test_pod<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_pod")
-{
-  test_pod<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/pod.hpp b/Src/External/cereal/unittests/pod.hpp
deleted file mode 100644
index 876d819..0000000
--- a/Src/External/cereal/unittests/pod.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_POD_H_
-#define CEREAL_TEST_POD_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_pod()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(size_t i=0; i<100; ++i)
-  {
-    bool          const o_bool   = random_value<uint8_t>(gen) % 2 ? true : false;
-    char          const o_char   = random_value<char>(gen);
-    unsigned char const o_uchar  = random_value<unsigned char>(gen);
-    uint8_t       const o_uint8  = random_value<uint8_t>(gen);
-    int8_t        const o_int8   = random_value<int8_t>(gen);
-    uint16_t      const o_uint16 = random_value<uint16_t>(gen);
-    int16_t       const o_int16  = random_value<int16_t>(gen);
-    uint32_t      const o_uint32 = random_value<uint32_t>(gen);
-    int32_t       const o_int32  = random_value<int32_t>(gen);
-    uint64_t      const o_uint64 = random_value<uint64_t>(gen);
-    int64_t       const o_int64  = random_value<int64_t>(gen);
-    float         const o_float  = random_value<float>(gen);
-    double        const o_double = random_value<double>(gen);
-
-    long double const o_long_double = random_value<long double>(gen);
-    long const o_long = random_value<long>(gen);
-    unsigned long const o_ulong = random_value<unsigned long>(gen);
-    long long const o_long_long = random_value<long long>(gen);
-    unsigned long long const o_ulong_long = random_value<unsigned long long>(gen);
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-      oar(o_bool);
-      oar(o_char);
-      oar(o_uchar);
-      oar(o_uint8);
-      oar(o_int8);
-      oar(o_uint16);
-      oar(o_int16);
-      oar(o_uint32);
-      oar(o_int32);
-      oar(o_uint64);
-      oar(o_int64);
-      oar(o_float);
-      oar(o_double);
-      oar(o_long_double);
-      oar(o_long);
-      oar(o_ulong);
-      oar(o_long_long);
-      oar(o_ulong_long);
-    }
-
-    bool          i_bool                       = false;
-    char          i_char                       = 0;
-    unsigned char i_uchar                      = 0;
-    uint8_t       i_uint8                      = 0;
-    int8_t        i_int8                       = 0;
-    uint16_t      i_uint16                     = 0;
-    int16_t       i_int16                      = 0;
-    uint32_t      i_uint32                     = 0;
-    int32_t       i_int32                      = 0;
-    uint64_t      i_uint64                     = 0;
-    int64_t       i_int64                      = 0;
-    float         i_float                      = 0;
-    double        i_double                     = 0;
-
-    long double i_long_double       = 0;
-    long i_long                     = 0;
-    unsigned long i_ulong           = 0;
-    long long i_long_long           = 0;
-    unsigned long long i_ulong_long = 0;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-      iar(i_bool);
-      iar(i_char);
-      iar(i_uchar);
-      iar(i_uint8);
-      iar(i_int8);
-      iar(i_uint16);
-      iar(i_int16);
-      iar(i_uint32);
-      iar(i_int32);
-      iar(i_uint64);
-      iar(i_int64);
-      iar(i_float);
-      iar(i_double);
-      iar(i_long_double);
-      iar(i_long);
-      iar(i_ulong);
-      iar(i_long_long);
-      iar(i_ulong_long);
-    }
-
-    CHECK_EQ(i_bool   , o_bool);
-    CHECK_EQ(i_char   , o_char);
-    CHECK_EQ(i_uchar  , o_uchar);
-    CHECK_EQ(i_uint8  , o_uint8);
-    CHECK_EQ(i_int8   , o_int8);
-    CHECK_EQ(i_uint16 , o_uint16);
-    CHECK_EQ(i_int16  , o_int16);
-    CHECK_EQ(i_uint32 , o_uint32);
-    CHECK_EQ(i_int32  , o_int32);
-    CHECK_EQ(i_uint64 , o_uint64);
-    CHECK_EQ(i_int64  , o_int64);
-    CHECK_EQ(i_float  , doctest::Approx(o_float).epsilon(1e-5F));
-    CHECK_EQ(i_double , doctest::Approx(o_double).epsilon(1e-5));
-
-    CHECK_EQ(i_long_double, doctest::Approx(o_long_double).epsilon(1e-5L));
-    CHECK_EQ(i_long,        o_long);
-    CHECK_EQ(i_ulong,       o_ulong);
-    CHECK_EQ(i_long_long,   o_long_long);
-    CHECK_EQ(i_ulong_long,  o_ulong_long);
-  }
-}
-
-#endif // CEREAL_TEST_POD_H_
diff --git a/Src/External/cereal/unittests/polymorphic.cpp b/Src/External/cereal/unittests/polymorphic.cpp
deleted file mode 100644
index 87e6de4..0000000
--- a/Src/External/cereal/unittests/polymorphic.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "polymorphic.hpp"
-
-TEST_SUITE("polymorphic");
-
-TEST_CASE("binary_polymorphic")
-{
-  test_polymorphic<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_polymorphic")
-{
-  test_polymorphic<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_polymorphic")
-{
-  test_polymorphic<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_polymorphic")
-{
-  test_polymorphic<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-#if CEREAL_THREAD_SAFE
-TEST_CASE("binary_polymorphic_threading")
-{
-  test_polymorphic_threading<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_polymorphic_threading")
-{
-  test_polymorphic_threading<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_polymorphic_threading")
-{
-  test_polymorphic_threading<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_polymorphic_threading")
-{
-  test_polymorphic_threading<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-#endif // CEREAL_THREAD_SAFE
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/polymorphic.hpp b/Src/External/cereal/unittests/polymorphic.hpp
deleted file mode 100644
index 9309ac4..0000000
--- a/Src/External/cereal/unittests/polymorphic.hpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_POLYMORPHIC_H_
-#define CEREAL_TEST_POLYMORPHIC_H_
-#include "common.hpp"
-
-#if CEREAL_THREAD_SAFE
-#include <future>
-#endif
-
-struct PolyBaseA
-{
-  virtual void foo() = 0;
-  virtual ~PolyBaseA() {}
-};
-
-struct PolyBaseAA : PolyBaseA
-{
-  PolyBaseAA() {}
-  PolyBaseAA( long ww ) : w(ww) {}
-  virtual ~PolyBaseAA() {}
-  long w;
-
-  void foo() {}
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( w );
-  }
-
-  bool operator==( PolyBaseAA const & other ) const
-  {
-    return w == other.w;
-  }
-};
-
-CEREAL_REGISTER_POLYMORPHIC_RELATION(PolyBaseA, PolyBaseAA)
-
-struct PolyBaseB : virtual PolyBaseAA
-{
-  PolyBaseB() {}
-  PolyBaseB( int xx, long ww ) : PolyBaseAA(ww), x(xx) {}
-  virtual ~PolyBaseB() {}
-  int x;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( cereal::virtual_base_class<PolyBaseAA>( this ) );
-    ar( x );
-  }
-
-  bool operator==( PolyBaseB const & other ) const
-  {
-    return PolyBaseAA::operator==( other ) &&
-           x == other.x;
-  }
-};
-
-struct PolyBaseC : virtual PolyBaseAA
-{
-  PolyBaseC() {}
-  PolyBaseC( double yy, long ww ) : PolyBaseAA(ww), y(yy) {}
-  virtual ~PolyBaseC() {}
-  double y;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( cereal::virtual_base_class<PolyBaseAA>( this ) );
-    ar( y );
-  }
-
-  bool operator==( PolyBaseC const & other ) const
-  {
-    return PolyBaseAA::operator==( other ) &&
-           std::abs(y - other.y) < 1e-5;
-  }
-};
-
-struct PolyDerivedD : PolyBaseB, PolyBaseC
-{
-  PolyDerivedD() {}
-  PolyDerivedD( std::string const & zz, double yy, int xx, long ww ) :
-    PolyBaseAA( ww ), PolyBaseB( xx, ww ), PolyBaseC( yy, ww ), z(zz) {}
-  virtual ~PolyDerivedD() {}
-  std::string z;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( cereal::base_class<PolyBaseB>( this ) );
-    ar( cereal::base_class<PolyBaseC>( this ) );
-    ar( z );
-  }
-
-  bool operator==( PolyDerivedD const & other ) const
-  {
-    return PolyBaseB::operator==( other ) &&
-           PolyBaseC::operator==( other ) &&
-           z == other.z;
-  }
-};
-
-CEREAL_REGISTER_TYPE(PolyDerivedD)
-
-struct PolyBase
-{
-  PolyBase() {}
-  PolyBase( int xx, float yy ) : x(xx), y(yy) {}
-  virtual ~PolyBase() {}
-  int x;
-  float y;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x, y );
-  }
-
-  virtual void foo() = 0;
-
-  bool operator==( PolyBase const & other ) const
-  {
-    return x == other.x && std::abs(y - other.y) < 1e-5;
-  }
-};
-
-struct PolyDerived : PolyBase
-{
-  PolyDerived() {}
-  PolyDerived( int xx, float yy, bool aa, double bb ) :
-    PolyBase( xx, yy ), a(aa), b(bb) {}
-  virtual ~PolyDerived() {}
-
-  bool a;
-  double b;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( cereal::base_class<PolyBase>( this ),
-        a, b );
-  }
-
-  bool operator==( PolyDerived const & other ) const
-  {
-    return PolyBase::operator==( other ) && a == other.a && std::abs(b - other.b) < 1e-5;
-  }
-
-  void foo() {}
-};
-
-CEREAL_REGISTER_TYPE(PolyDerived)
-
-struct PolyLA : std::enable_shared_from_this<PolyLA>
-{
-  PolyLA() {}
-  virtual ~PolyLA() {}
-  virtual void foo() = 0;
-};
-
-struct PolyDerivedLA : public PolyLA
-{
-  PolyDerivedLA( int xx ) : x( xx ) { }
-  virtual ~PolyDerivedLA() {}
-
-  int x;
-  std::vector<std::shared_ptr<PolyLA>> vec;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x );
-    ar( vec );
-  }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<PolyDerivedLA> & construct )
-  {
-    int xx;
-    ar( xx );
-    construct( xx );
-    ar( construct->vec );
-  }
-
-  void foo() {}
-
-  bool operator==( PolyDerivedLA const & other ) const
-  {
-    if( x != other.x )
-      return false;
-    if( vec.size() != other.vec.size() )
-      return false;
-    for( size_t i = 0; i < vec.size(); ++i )
-      if( !(*std::dynamic_pointer_cast<PolyDerivedLA>(vec[i]) == *std::dynamic_pointer_cast<PolyDerivedLA>(other.vec[i])) )
-        return false;
-
-    return true;
-  }
-};
-
-CEREAL_REGISTER_TYPE(PolyDerivedLA)
-CEREAL_REGISTER_POLYMORPHIC_RELATION(PolyLA, PolyDerivedLA)
-
-std::ostream& operator<<(std::ostream& os, PolyDerivedLA const & s)
-{
-    os << "[x: " << s.x << "] ";
-    for( auto const & v : s.vec )
-      os << " child: " << (*std::dynamic_pointer_cast<PolyDerivedLA>(v));
-    return os;
-}
-
-std::ostream& operator<<(std::ostream& os, PolyDerived const & s)
-{
-    os << "[x: " << s.x << " y: " << s.y << " a: " << s.a << " b: " << s.b << "]";
-    return os;
-}
-
-std::ostream& operator<<(std::ostream& os, PolyDerivedD const & s)
-{
-    os << "[w: " << s.w << " x: " << s.x << " y: " << s.y << " z: " << s.z << "]";
-    return os;
-}
-
-template <class IArchive, class OArchive> inline
-void test_polymorphic()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  #if CEREAL_THREAD_SAFE
-  static std::mutex testMutex;
-  #endif
-
-  auto rngB = [&](){ return random_value<int>( gen ) % 2 == 0; };
-  auto rngI = [&](){ return random_value<int>( gen ); };
-  auto rngL = [&](){ return random_value<long>( gen ); };
-  auto rngF = [&](){ return random_value<float>( gen ); };
-  auto rngD = [&](){ return random_value<double>( gen ); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::shared_ptr<PolyBase> o_shared = std::make_shared<PolyDerived>( rngI(), rngF(), rngB(), rngD() );
-    std::weak_ptr<PolyBase>   o_weak = o_shared;
-    std::unique_ptr<PolyBase> o_unique( new PolyDerived( rngI(), rngF(), rngB(), rngD() ) );
-
-    std::shared_ptr<PolyBaseA> o_sharedA = std::make_shared<PolyDerivedD>( random_basic_string<char>(gen),
-                                                                           rngD(), rngI(), rngL() );
-
-    std::weak_ptr<PolyBaseA>   o_weakA = o_sharedA;
-    std::unique_ptr<PolyBaseA> o_uniqueA( new PolyDerivedD( random_basic_string<char>(gen),
-                                                            rngD(), rngI(), rngL() ) );
-
-    auto pda = std::make_shared<PolyDerivedLA>( rngI() );
-    pda->vec.emplace_back( std::make_shared<PolyDerivedLA>( rngI() ) );
-    std::shared_ptr<PolyLA>   o_sharedLA = pda;
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( o_shared, o_weak, o_unique );
-      oar( o_sharedLA );
-
-      oar( o_sharedA, o_weakA, o_uniqueA );
-    }
-
-    decltype(o_shared) i_shared;
-    decltype(o_weak) i_weak;
-    decltype(o_unique) i_unique;
-
-    decltype(o_sharedLA) i_sharedLA;
-
-    decltype(o_sharedA) i_sharedA;
-    decltype(o_weakA) i_weakA;
-    decltype(o_uniqueA) i_uniqueA;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( i_shared, i_weak, i_unique );
-      iar( i_sharedLA );
-      iar( i_sharedA, i_weakA, i_uniqueA );
-    }
-
-    auto i_locked = i_weak.lock();
-    auto o_locked = o_weak.lock();
-
-    auto i_sharedLA2 = i_sharedLA->shared_from_this();
-
-    auto i_lockedA = i_weakA.lock();
-    auto o_lockedA = o_weakA.lock();
-
-    #if CEREAL_THREAD_SAFE
-    std::lock_guard<std::mutex> lock( testMutex );
-    #endif
-
-    CHECK_EQ(i_shared.get(), i_locked.get());
-    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_shared.get()), *dynamic_cast<PolyDerived*>(o_shared.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_shared.get()), *dynamic_cast<PolyDerived*>(i_locked.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_locked.get()), *dynamic_cast<PolyDerived*>(o_locked.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerived*>(i_unique.get()), *dynamic_cast<PolyDerived*>(o_unique.get()));
-
-    CHECK_EQ(*dynamic_cast<PolyDerivedLA*>(i_sharedLA.get()), *dynamic_cast<PolyDerivedLA*>(o_sharedLA.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerivedLA*>(i_sharedLA2.get()), *dynamic_cast<PolyDerivedLA*>(o_sharedLA.get()));
-
-    CHECK_EQ(i_sharedA.get(), i_lockedA.get());
-    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_sharedA.get()), *dynamic_cast<PolyDerivedD*>(o_sharedA.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_sharedA.get()), *dynamic_cast<PolyDerivedD*>(i_lockedA.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_lockedA.get()), *dynamic_cast<PolyDerivedD*>(o_lockedA.get()));
-    CHECK_EQ(*dynamic_cast<PolyDerivedD*>(i_uniqueA.get()), *dynamic_cast<PolyDerivedD*>(o_uniqueA.get()));
-  }
-}
-
-#if CEREAL_THREAD_SAFE
-template <class IArchive, class OArchive> inline
-void test_polymorphic_threading()
-{
-  std::vector<std::future<bool>> pool;
-  for( size_t i = 0; i < 100; ++i )
-    pool.emplace_back( std::async( std::launch::async,
-                                   [](){ test_polymorphic<IArchive, OArchive>(); return true; } ) );
-
-  for( auto & future : pool )
-    future.wait();
-
-  for( auto & future : pool )
-    CHECK_UNARY( future.get() );
-}
-#endif // CEREAL_THREAD_SAFE
-
-#endif // CEREAL_TEST_POLYMORPHIC_H_
diff --git a/Src/External/cereal/unittests/portability_test.cpp b/Src/External/cereal/unittests/portability_test.cpp
deleted file mode 100644
index f3a7edb..0000000
--- a/Src/External/cereal/unittests/portability_test.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <cereal/archives/portable_binary.hpp>
-
-#include <cereal/types/memory.hpp>
-#include <cereal/types/map.hpp>
-#include <cereal/types/vector.hpp>
-
-#include <fstream>
-#include <iostream>
-
-struct Data : std::enable_shared_from_this<Data>
-{
-  int32_t x;
-  int64_t y;
-
-  Data( int32_t xx, int64_t yy ) : x(xx), y(yy) {}
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x, y );
-  }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<Data> & construct )
-  {
-    int32_t xx;
-    int64_t yy;
-    ar( xx, yy );
-    construct( xx, yy );
-  }
-
-  bool operator==( Data const & other ) const
-  {
-    if( x != other.x )
-    {
-      std::cerr << "x=" << x << ", other.x=" << other.x << std::endl;
-      return false;
-    }
-    if( y != other.y )
-    {
-      std::cerr << "y=" << y << ", other.y=" << other.y << std::endl;
-      return false;
-    }
-
-    return true;
-  }
-};
-
-struct Data2
-{
-  int32_t x;
-  int64_t y;
-
-  Data2() = default;
-  Data2( int32_t xx, int64_t yy ) : x(xx), y(yy) {}
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( x, y );
-  }
-
-  bool operator==( Data2 const & other ) const
-  {
-    if( x != other.x )
-    {
-      std::cerr << "x=" << x << ", other.x=" << other.x << std::endl;
-      return false;
-    }
-    if( y != other.y )
-    {
-      std::cerr << "y=" << y << ", other.y=" << other.y << std::endl;
-      return false;
-    }
-
-    return true;
-  }
-};
-
-const uint32_t AnotherCount = 32;
-
-struct Another
-{
-  Another() = default;
-
-  Another( bool )
-  {
-    for( uint32_t i = 0; i < AnotherCount; ++i )
-      data[i] = Data2( i, i+1 );
-  }
-
-  std::map<std::uint32_t, Data2> data;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( data );
-  }
-
-  bool operator==( Another const & other ) const
-  {
-    auto iter  = data.begin();
-    auto oiter = other.data.begin();
-    for( ; iter != data.end(); ++iter, ++oiter )
-    {
-      if( !(iter->second == oiter->second) )
-      {
-        std::cerr << "Data mismatch at i=" << iter->first << std::endl;
-        return false;
-      }
-    }
-
-    return true;
-  }
-};
-
-int main( int, char ** argv )
-{
-  std::vector<Another> vec_o;
-  for( int i = 0; i < 5; ++i )
-    vec_o.emplace_back( true );
-
-  auto data_o = std::make_shared<Data>( 33, 64 );
-  int32_t int_o = 7;
-
-  std::cerr << "Portability test: " << argv[2] << "bit" << std::endl;
-
-  if( std::string(argv[1]) == "load" )
-  {
-    std::ifstream is("portable.cereal", std::ios::binary);
-    cereal::PortableBinaryInputArchive ar( is );
-
-    std::vector<Another> vec_i;
-    std::shared_ptr<Data> data_i;
-    int32_t int_i;
-
-    ar( int_i );
-
-    if( int_i != int_o )
-    {
-      std::cerr << "in " << int_i << ", out: " << int_o << std::endl;
-      return -1;
-    }
-
-    ar( vec_i );
-    ar( data_i );
-
-    if( vec_i != vec_o )
-    {
-      std::cerr << "Input vector did not equal output vector" << std::endl;
-      return -1;
-    }
-
-    if( !(*data_i == *data_o) )
-    {
-      std::cerr << "Data did not match" << std::endl;
-      return -1;
-    }
-  }
-  else if( std::string(argv[1]) == "save" )
-  {
-    std::ofstream os("portable.cereal", std::ios::binary);
-    cereal::PortableBinaryOutputArchive ar( os );
-
-    ar( int_o );
-    ar( vec_o );
-    ar( data_o );
-  }
-  else // clean
-  {
-    std::remove( "portable.cereal" );
-  }
-
-  return 0;
-}
diff --git a/Src/External/cereal/unittests/portable_binary_archive.cpp b/Src/External/cereal/unittests/portable_binary_archive.cpp
deleted file mode 100644
index 3b64b0b..0000000
--- a/Src/External/cereal/unittests/portable_binary_archive.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "portable_binary_archive.hpp"
-
-TEST_SUITE("portable_binary_archive");
-
-#ifdef _MSC_VER
-TEST_CASE("util")
-{
-  CHECK_EQ( cereal::util::demangledName<mynamespace::MyCustomClass>(), "struct mynamespace::MyCustomClass" );
-}
-#else
-TEST_CASE("util")
-{
-  CHECK_EQ( cereal::util::demangledName<mynamespace::MyCustomClass>(), "mynamespace::MyCustomClass" );
-}
-#endif
-
-TEST_CASE("portable_binary_archive_endian_conversions")
-{
-  // (last parameter is whether we load as little endian)
-  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
-      cereal::PortableBinaryInputArchive::Options::BigEndian(), cereal::PortableBinaryOutputArchive::Options::BigEndian(), false );
-  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
-      cereal::PortableBinaryInputArchive::Options::LittleEndian(), cereal::PortableBinaryOutputArchive::Options::BigEndian(), true );
-  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
-      cereal::PortableBinaryInputArchive::Options::BigEndian(), cereal::PortableBinaryOutputArchive::Options::LittleEndian(), false );
-  test_endian_serialization<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>(
-      cereal::PortableBinaryInputArchive::Options::LittleEndian(), cereal::PortableBinaryOutputArchive::Options::LittleEndian(), true );
-}
-
-// Tests the default behavior to swap bytes to current machine's endianness
-TEST_CASE("portable_binary_archive_default_behavior")
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(size_t i=0; i<100; ++i)
-  {
-    bool     o_bool   = random_value<uint8_t>(gen) % 2 ? true : false;
-    uint8_t  o_uint8  = random_value<uint8_t>(gen);
-    int8_t   o_int8   = random_value<int8_t>(gen);
-    uint16_t o_uint16 = random_value<uint16_t>(gen);
-    int16_t  o_int16  = random_value<int16_t>(gen);
-    uint32_t o_uint32 = random_value<uint32_t>(gen);
-    int32_t  o_int32  = random_value<int32_t>(gen);
-    uint64_t o_uint64 = random_value<uint64_t>(gen);
-    int64_t  o_int64  = random_value<int64_t>(gen);
-    float    o_float  = random_value<float>(gen);
-    double   o_double = random_value<double>(gen);
-
-    // swap the bytes on all of the data
-    CEREAL_TEST_SWAP_OUTPUT
-
-    std::ostringstream os;
-    {
-      cereal::BinaryOutputArchive oar(os);
-      // manually insert incorrect endian encoding
-      oar(!cereal::portable_binary_detail::is_little_endian());
-
-      oar(o_bool);
-      oar(o_uint8);
-      oar(o_int8);
-      oar(o_uint16);
-      oar(o_int16);
-      oar(o_uint32);
-      oar(o_int32);
-      oar(o_uint64);
-      oar(o_int64);
-      oar(o_float);
-      oar(o_double);
-    }
-
-    // swap back to original values
-    CEREAL_TEST_SWAP_OUTPUT
-
-    bool     i_bool   = false;
-    uint8_t  i_uint8  = 0;
-    int8_t   i_int8   = 0;
-    uint16_t i_uint16 = 0;
-    int16_t  i_int16  = 0;
-    uint32_t i_uint32 = 0;
-    int32_t  i_int32  = 0;
-    uint64_t i_uint64 = 0;
-    int64_t  i_int64  = 0;
-    float    i_float  = 0;
-    double   i_double = 0;
-
-    std::istringstream is(os.str());
-    {
-      cereal::PortableBinaryInputArchive iar(is);
-      iar(i_bool);
-      iar(i_uint8);
-      iar(i_int8);
-      iar(i_uint16);
-      iar(i_int16);
-      iar(i_uint32);
-      iar(i_int32);
-      iar(i_uint64);
-      iar(i_int64);
-      iar(i_float);
-      iar(i_double);
-    }
-
-    CEREAL_TEST_CHECK_EQUAL
-  }
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/portable_binary_archive.hpp b/Src/External/cereal/unittests/portable_binary_archive.hpp
deleted file mode 100644
index b74c4f9..0000000
--- a/Src/External/cereal/unittests/portable_binary_archive.hpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_PORTABLE_BINARY_ARCHIVE_H_
-#define CEREAL_TEST_PORTABLE_BINARY_ARCHIVE_H_
-#include "common.hpp"
-
-#include <cmath>
-
-namespace mynamespace { struct MyCustomClass {}; }
-
-template <class T>
-inline void swapBytes( T & t )
-{
-  cereal::portable_binary_detail::swap_bytes<sizeof(T)>( reinterpret_cast<std::uint8_t*>(&t) );
-}
-
-// swaps all output data
-#define CEREAL_TEST_SWAP_OUTPUT \
-    swapBytes(o_bool);          \
-    swapBytes(o_uint8);         \
-    swapBytes(o_int8);          \
-    swapBytes(o_uint16);        \
-    swapBytes(o_int16);         \
-    swapBytes(o_uint32);        \
-    swapBytes(o_int32);         \
-    swapBytes(o_uint64);        \
-    swapBytes(o_int64);         \
-    swapBytes(o_float);         \
-    swapBytes(o_double);
-
-#define CEREAL_TEST_CHECK_EQUAL                 \
-    CHECK_EQ(i_bool   , o_bool);                \
-    CHECK_EQ(i_uint8  , o_uint8);               \
-    CHECK_EQ(i_int8   , o_int8);                \
-    CHECK_EQ(i_uint16 , o_uint16);              \
-    CHECK_EQ(i_int16  , o_int16);               \
-    CHECK_EQ(i_uint32 , o_uint32);              \
-    CHECK_EQ(i_int32  , o_int32);               \
-    CHECK_EQ(i_uint64 , o_uint64);              \
-    CHECK_EQ(i_int64  , o_int64);               \
-    if( !std::isnan(i_float) && !std::isnan(o_float) ) CHECK_EQ(i_float , doctest::Approx(o_float).epsilon(1e-5F)); \
-    if( !std::isnan(i_float) && !std::isnan(o_float) ) CHECK_EQ(i_double, doctest::Approx(o_double).epsilon(1e-5));
-
-// Last parameter exists to keep everything hidden in options
-template <class IArchive, class OArchive> inline
-void test_endian_serialization( typename IArchive::Options const & iOptions, typename OArchive::Options const & oOptions, const std::uint8_t inputLittleEndian )
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(size_t i=0; i<100; ++i)
-  {
-    bool     o_bool   = random_value<uint8_t>(gen) % 2 ? true : false;
-    uint8_t  o_uint8  = random_value<uint8_t>(gen);
-    int8_t   o_int8   = random_value<int8_t>(gen);
-    uint16_t o_uint16 = random_value<uint16_t>(gen);
-    int16_t  o_int16  = random_value<int16_t>(gen);
-    uint32_t o_uint32 = random_value<uint32_t>(gen);
-    int32_t  o_int32  = random_value<int32_t>(gen);
-    uint64_t o_uint64 = random_value<uint64_t>(gen);
-    int64_t  o_int64  = random_value<int64_t>(gen);
-    float    o_float  = random_value<float>(gen);
-    double   o_double = random_value<double>(gen);
-
-    std::vector<int32_t> o_vector(100);
-    for(auto & elem : o_vector)
-      elem = random_value<uint32_t>(gen);
-
-    std::ostringstream os;
-    {
-      OArchive oar(os, oOptions);
-      oar(o_bool);
-      oar(o_uint8);
-      oar(o_int8);
-      oar(o_uint16);
-      oar(o_int16);
-      oar(o_uint32);
-      oar(o_int32);
-      oar(o_uint64);
-      oar(o_int64);
-      oar(o_float);
-      oar(o_double);
-      // We can't test vector directly here since we are artificially interfering with the endianness,
-      // which can result in the size being incorrect
-      oar(cereal::binary_data( o_vector.data(), static_cast<std::size_t>( o_vector.size() * sizeof(int32_t) ) ));
-    }
-
-    bool     i_bool   = false;
-    uint8_t  i_uint8  = 0;
-    int8_t   i_int8   = 0;
-    uint16_t i_uint16 = 0;
-    int16_t  i_int16  = 0;
-    uint32_t i_uint32 = 0;
-    int32_t  i_int32  = 0;
-    uint64_t i_uint64 = 0;
-    int64_t  i_int64  = 0;
-    float    i_float  = 0;
-    double   i_double = 0;
-    std::vector<int32_t> i_vector(100);
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is, iOptions);
-      iar(i_bool);
-      iar(i_uint8);
-      iar(i_int8);
-      iar(i_uint16);
-      iar(i_int16);
-      iar(i_uint32);
-      iar(i_int32);
-      iar(i_uint64);
-      iar(i_int64);
-      iar(i_float);
-      iar(i_double);
-      iar(cereal::binary_data( i_vector.data(), static_cast<std::size_t>( i_vector.size() * sizeof(int32_t) ) ));
-    }
-
-    // Convert to big endian if we expect to read big and didn't start big
-    if( cereal::portable_binary_detail::is_little_endian() ^ inputLittleEndian ) // Convert to little endian if
-    {
-      CEREAL_TEST_SWAP_OUTPUT
-      for( auto & val : o_vector )
-        swapBytes(val);
-    }
-
-    CEREAL_TEST_CHECK_EQUAL
-
-    check_collection(i_vector, o_vector);
-  }
-}
-
-#endif // CEREAL_TEST_PORTABLE_BINARY_ARCHIVE_H_
diff --git a/Src/External/cereal/unittests/priority_queue.cpp b/Src/External/cereal/unittests/priority_queue.cpp
deleted file mode 100644
index e8b997f..0000000
--- a/Src/External/cereal/unittests/priority_queue.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "priority_queue.hpp"
-
-TEST_SUITE("priority_queue");
-
-TEST_CASE("binary_priority_queue")
-{
-  test_priority_queue<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_priority_queue")
-{
-  test_priority_queue<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_priority_queue")
-{
-  test_priority_queue<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_priority_queue")
-{
-  test_priority_queue<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/priority_queue.hpp b/Src/External/cereal/unittests/priority_queue.hpp
deleted file mode 100644
index 27d31a5..0000000
--- a/Src/External/cereal/unittests/priority_queue.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_PRIORITY_QUEUE_H_
-#define CEREAL_TEST_PRIORITY_QUEUE_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_priority_queue()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::priority_queue<int> o_podpriority_queue;
-    for(int j=0; j<100; ++j)
-      o_podpriority_queue.push(random_value<int>(gen));
-
-    std::priority_queue<StructInternalSerialize> o_iserpriority_queue;
-    for(int j=0; j<100; ++j)
-      o_iserpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::priority_queue<StructInternalSplit> o_isplpriority_queue;
-    for(int j=0; j<100; ++j)
-      o_isplpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::priority_queue<StructExternalSerialize> o_eserpriority_queue;
-    for(int j=0; j<100; ++j)
-      o_eserpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::priority_queue<StructExternalSplit> o_esplpriority_queue;
-    for(int j=0; j<100; ++j)
-      o_esplpriority_queue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podpriority_queue);
-      oar(o_iserpriority_queue);
-      oar(o_isplpriority_queue);
-      oar(o_eserpriority_queue);
-      oar(o_esplpriority_queue);
-    }
-
-    std::priority_queue<int> i_podpriority_queue;
-    std::priority_queue<StructInternalSerialize> i_iserpriority_queue;
-    std::priority_queue<StructInternalSplit>     i_isplpriority_queue;
-    std::priority_queue<StructExternalSerialize> i_eserpriority_queue;
-    std::priority_queue<StructExternalSplit>     i_esplpriority_queue;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podpriority_queue);
-      iar(i_iserpriority_queue);
-      iar(i_isplpriority_queue);
-      iar(i_eserpriority_queue);
-      iar(i_esplpriority_queue);
-    }
-
-    auto & i_podpriority_queue_c  = cereal::queue_detail::container(i_podpriority_queue);
-    auto & i_iserpriority_queue_c = cereal::queue_detail::container(i_iserpriority_queue);
-    auto & i_isplpriority_queue_c = cereal::queue_detail::container(i_isplpriority_queue);
-    auto & i_eserpriority_queue_c = cereal::queue_detail::container(i_eserpriority_queue);
-    auto & i_esplpriority_queue_c = cereal::queue_detail::container(i_esplpriority_queue);
-
-    auto & o_podpriority_queue_c  = cereal::queue_detail::container(o_podpriority_queue);
-    auto & o_iserpriority_queue_c = cereal::queue_detail::container(o_iserpriority_queue);
-    auto & o_isplpriority_queue_c = cereal::queue_detail::container(o_isplpriority_queue);
-    auto & o_eserpriority_queue_c = cereal::queue_detail::container(o_eserpriority_queue);
-    auto & o_esplpriority_queue_c = cereal::queue_detail::container(o_esplpriority_queue);
-
-    check_collection(i_podpriority_queue_c,  o_podpriority_queue_c);
-    check_collection(i_iserpriority_queue_c, o_iserpriority_queue_c);
-    check_collection(i_isplpriority_queue_c, o_isplpriority_queue_c);
-    check_collection(i_eserpriority_queue_c, o_eserpriority_queue_c);
-    check_collection(i_esplpriority_queue_c, o_esplpriority_queue_c);
-  }
-}
-
-#endif // CEREAL_TEST_PRIORITY_QUEUE_H_
diff --git a/Src/External/cereal/unittests/queue.cpp b/Src/External/cereal/unittests/queue.cpp
deleted file mode 100644
index 5f87705..0000000
--- a/Src/External/cereal/unittests/queue.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "queue.hpp"
-
-TEST_SUITE("queue");
-
-TEST_CASE("binary_queue")
-{
-  test_queue<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_queue")
-{
-  test_queue<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_queue")
-{
-  test_queue<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_queue")
-{
-  test_queue<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/queue.hpp b/Src/External/cereal/unittests/queue.hpp
deleted file mode 100644
index 3b0484d..0000000
--- a/Src/External/cereal/unittests/queue.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_QUEUE_H_
-#define CEREAL_TEST_QUEUE_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_queue()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::queue<int> o_podqueue;
-    for(int j=0; j<100; ++j)
-      o_podqueue.push(random_value<int>(gen));
-
-    std::queue<StructInternalSerialize> o_iserqueue;
-    for(int j=0; j<100; ++j)
-      o_iserqueue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::queue<StructInternalSplit> o_isplqueue;
-    for(int j=0; j<100; ++j)
-      o_isplqueue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::queue<StructExternalSerialize> o_eserqueue;
-    for(int j=0; j<100; ++j)
-      o_eserqueue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::queue<StructExternalSplit> o_esplqueue;
-    for(int j=0; j<100; ++j)
-      o_esplqueue.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podqueue);
-      oar(o_iserqueue);
-      oar(o_isplqueue);
-      oar(o_eserqueue);
-      oar(o_esplqueue);
-    }
-
-    std::queue<int> i_podqueue;
-    std::queue<StructInternalSerialize> i_iserqueue;
-    std::queue<StructInternalSplit>     i_isplqueue;
-    std::queue<StructExternalSerialize> i_eserqueue;
-    std::queue<StructExternalSplit>     i_esplqueue;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podqueue);
-      iar(i_iserqueue);
-      iar(i_isplqueue);
-      iar(i_eserqueue);
-      iar(i_esplqueue);
-    }
-
-    auto & i_podqueue_c  = cereal::queue_detail::container(i_podqueue);
-    auto & i_iserqueue_c = cereal::queue_detail::container(i_iserqueue);
-    auto & i_isplqueue_c = cereal::queue_detail::container(i_isplqueue);
-    auto & i_eserqueue_c = cereal::queue_detail::container(i_eserqueue);
-    auto & i_esplqueue_c = cereal::queue_detail::container(i_esplqueue);
-
-    auto & o_podqueue_c  = cereal::queue_detail::container(o_podqueue);
-    auto & o_iserqueue_c = cereal::queue_detail::container(o_iserqueue);
-    auto & o_isplqueue_c = cereal::queue_detail::container(o_isplqueue);
-    auto & o_eserqueue_c = cereal::queue_detail::container(o_eserqueue);
-    auto & o_esplqueue_c = cereal::queue_detail::container(o_esplqueue);
-
-    check_collection(i_podqueue_c,  o_podqueue_c);
-    check_collection(i_iserqueue_c, o_iserqueue_c);
-    check_collection(i_isplqueue_c, o_isplqueue_c);
-    check_collection(i_eserqueue_c, o_eserqueue_c);
-    check_collection(i_esplqueue_c, o_esplqueue_c);
-  }
-}
-
-#endif // CEREAL_TEST_QUEUE_H_
diff --git a/Src/External/cereal/unittests/run_portability_test.cmake b/Src/External/cereal/unittests/run_portability_test.cmake
deleted file mode 100644
index 2841e6c..0000000
--- a/Src/External/cereal/unittests/run_portability_test.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-macro(EXEC_CMD_CHECK)
-  message("running ${ARGN}")
-  execute_process(COMMAND ${ARGN} RESULT_VARIABLE CMD_RESULT)
-  if(CMD_RESULT)
-    message(FATAL_ERROR "Error running ${ARGN}")
-  endif()
-endmacro()
-
-set(PORTABILITY_TEST_32 "${PORTABILITY_TEST_DIR}/portability_test32")
-set(PORTABILITY_TEST_64 "${PORTABILITY_TEST_DIR}/portability_test64")
-
-exec_cmd_check(${PORTABILITY_TEST_64} save 64)
-exec_cmd_check(${PORTABILITY_TEST_32} load 32)
-exec_cmd_check(${PORTABILITY_TEST_32} save 32)
-exec_cmd_check(${PORTABILITY_TEST_64} load 64)
-exec_cmd_check(${PORTABILITY_TEST_64} remove 64)
diff --git a/Src/External/cereal/unittests/run_valgrind.sh b/Src/External/cereal/unittests/run_valgrind.sh
deleted file mode 100755
index 022b1b0..0000000
--- a/Src/External/cereal/unittests/run_valgrind.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-TESTS=./test_*
-
-for f in $TESTS
-  do
-    valgrind --tool=memcheck --leak-check=full $f
-  done
diff --git a/Src/External/cereal/unittests/set.cpp b/Src/External/cereal/unittests/set.cpp
deleted file mode 100644
index cc2e00c..0000000
--- a/Src/External/cereal/unittests/set.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "set.hpp"
-
-TEST_SUITE("set");
-
-TEST_CASE("binary_set")
-{
-  test_set<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_set")
-{
-  test_set<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_set")
-{
-  test_set<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_set")
-{
-  test_set<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/set.hpp b/Src/External/cereal/unittests/set.hpp
deleted file mode 100644
index 6e39942..0000000
--- a/Src/External/cereal/unittests/set.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_SET_H_
-#define CEREAL_TEST_SET_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_set()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::set<int> o_podset;
-    for(int j=0; j<100; ++j)
-      o_podset.insert(random_value<int>(gen));
-
-    std::set<StructInternalSerialize> o_iserset;
-    for(int j=0; j<100; ++j)
-      o_iserset.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::set<StructInternalSplit> o_isplset;
-    for(int j=0; j<100; ++j)
-      o_isplset.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::set<StructExternalSerialize> o_eserset;
-    for(int j=0; j<100; ++j)
-      o_eserset.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::set<StructExternalSplit> o_esplset;
-    for(int j=0; j<100; ++j)
-      o_esplset.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podset);
-      oar(o_iserset);
-      oar(o_isplset);
-      oar(o_eserset);
-      oar(o_esplset);
-    }
-
-    std::set<int> i_podset;
-    std::set<StructInternalSerialize>   i_iserset;
-    std::set<StructInternalSplit>        i_isplset;
-    std::set<StructExternalSerialize> i_eserset;
-    std::set<StructExternalSplit>       i_esplset;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podset);
-      iar(i_iserset);
-      iar(i_isplset);
-      iar(i_eserset);
-      iar(i_esplset);
-    }
-
-    check_collection(i_podset,  o_podset);
-    check_collection(i_iserset, o_iserset);
-    check_collection(i_isplset, o_isplset);
-    check_collection(i_eserset, o_eserset);
-    check_collection(i_esplset, o_esplset);
-  }
-}
-
-#endif // CEREAL_TEST_SET_H_
diff --git a/Src/External/cereal/unittests/stack.cpp b/Src/External/cereal/unittests/stack.cpp
deleted file mode 100644
index 3e4212c..0000000
--- a/Src/External/cereal/unittests/stack.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "stack.hpp"
-
-TEST_SUITE("stack");
-
-TEST_CASE("binary_stack")
-{
-  test_stack<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_stack")
-{
-  test_stack<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_stack")
-{
-  test_stack<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_stack")
-{
-  test_stack<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/stack.hpp b/Src/External/cereal/unittests/stack.hpp
deleted file mode 100644
index 4ea1ae3..0000000
--- a/Src/External/cereal/unittests/stack.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_STACK_H_
-#define CEREAL_TEST_STACK_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_stack()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::stack<int> o_podstack;
-    for(int j=0; j<100; ++j)
-      o_podstack.push(random_value<int>(gen));
-
-    std::stack<StructInternalSerialize> o_iserstack;
-    for(int j=0; j<100; ++j)
-      o_iserstack.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::stack<StructInternalSplit> o_isplstack;
-    for(int j=0; j<100; ++j)
-      o_isplstack.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::stack<StructExternalSerialize> o_eserstack;
-    for(int j=0; j<100; ++j)
-      o_eserstack.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::stack<StructExternalSplit> o_esplstack;
-    for(int j=0; j<100; ++j)
-      o_esplstack.push({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podstack);
-      oar(o_iserstack);
-      oar(o_isplstack);
-      oar(o_eserstack);
-      oar(o_esplstack);
-    }
-
-    std::stack<int> i_podstack;
-    std::stack<StructInternalSerialize> i_iserstack;
-    std::stack<StructInternalSplit>     i_isplstack;
-    std::stack<StructExternalSerialize> i_eserstack;
-    std::stack<StructExternalSplit>     i_esplstack;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podstack);
-      iar(i_iserstack);
-      iar(i_isplstack);
-      iar(i_eserstack);
-      iar(i_esplstack);
-    }
-
-    auto & i_podstack_c  = cereal::stack_detail::container(i_podstack);
-    auto & i_iserstack_c = cereal::stack_detail::container(i_iserstack);
-    auto & i_isplstack_c = cereal::stack_detail::container(i_isplstack);
-    auto & i_eserstack_c = cereal::stack_detail::container(i_eserstack);
-    auto & i_esplstack_c = cereal::stack_detail::container(i_esplstack);
-
-    auto & o_podstack_c  = cereal::stack_detail::container(o_podstack);
-    auto & o_iserstack_c = cereal::stack_detail::container(o_iserstack);
-    auto & o_isplstack_c = cereal::stack_detail::container(o_isplstack);
-    auto & o_eserstack_c = cereal::stack_detail::container(o_eserstack);
-    auto & o_esplstack_c = cereal::stack_detail::container(o_esplstack);
-
-    check_collection(i_podstack_c,  o_podstack_c );
-    check_collection(i_iserstack_c, o_iserstack_c);
-    check_collection(i_isplstack_c, o_isplstack_c);
-    check_collection(i_eserstack_c, o_eserstack_c);
-    check_collection(i_esplstack_c, o_esplstack_c);
-  }
-}
-
-#endif // CEREAL_TEST_STACK_H_
diff --git a/Src/External/cereal/unittests/structs.cpp b/Src/External/cereal/unittests/structs.cpp
deleted file mode 100644
index 117e7cc..0000000
--- a/Src/External/cereal/unittests/structs.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "structs.hpp"
-
-TEST_SUITE("structs");
-
-TEST_CASE("binary_structs")
-{
-  test_structs<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_structs")
-{
-  test_structs<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_structs")
-{
-  test_structs<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_structs")
-{
-  test_structs<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/structs.hpp b/Src/External/cereal/unittests/structs.hpp
deleted file mode 100644
index db7ce13..0000000
--- a/Src/External/cereal/unittests/structs.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_STRUCTS_H_
-#define CEREAL_TEST_STRUCTS_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_structs()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    StructInternalSerialize o_iser = { random_value<int>(gen), random_value<int>(gen) };
-    StructInternalSplit     o_ispl = { random_value<int>(gen), random_value<int>(gen) };
-    StructExternalSerialize o_eser = { random_value<int>(gen), random_value<int>(gen) };
-    StructExternalSplit     o_espl = { random_value<int>(gen), random_value<int>(gen) };
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-      oar( o_iser, o_ispl, o_eser, o_espl);
-    }
-
-    StructInternalSerialize i_iser;
-    StructInternalSplit     i_ispl;
-    StructExternalSerialize i_eser;
-    StructExternalSplit     i_espl;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-      iar( i_iser, i_ispl, i_eser, i_espl);
-    }
-
-    CHECK_EQ(i_iser, o_iser);
-    CHECK_EQ(i_ispl, o_ispl);
-    CHECK_EQ(i_eser, o_eser);
-    CHECK_EQ(i_espl, o_espl);
-  }
-}
-
-#endif // CEREAL_TEST_STRUCTS_H_
diff --git a/Src/External/cereal/unittests/structs_minimal.cpp b/Src/External/cereal/unittests/structs_minimal.cpp
deleted file mode 100644
index d78f819..0000000
--- a/Src/External/cereal/unittests/structs_minimal.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "structs_minimal.hpp"
-
-TEST_SUITE("structs_minimal");
-
-TEST_CASE("binary_structs_minimal")
-{
-  test_structs_minimal<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_structs_minimal")
-{
-  test_structs_minimal<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_structs_minimal")
-{
-  test_structs_minimal<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_structs_minimal")
-{
-  test_structs_minimal<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/structs_minimal.hpp b/Src/External/cereal/unittests/structs_minimal.hpp
deleted file mode 100644
index 57ccd49..0000000
--- a/Src/External/cereal/unittests/structs_minimal.hpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_STRUCTS_MINIMAL_H_
-#define CEREAL_TEST_STRUCTS_MINIMAL_H_
-#include "common.hpp"
-
-class MemberMinimal
-{
-  public:
-    MemberMinimal() = default;
-    MemberMinimal( std::string const & str ) : x( str ) {}
-
-  protected:
-    friend class cereal::access;
-
-    template <class Archive>
-    std::string save_minimal( Archive const & ) const
-    {
-      return x;
-    }
-
-    template <class Archive>
-    void load_minimal( Archive const &, std::string const & str )
-    {
-      x = str;
-    }
-
-  public:
-    std::string x;
-};
-
-class MemberMinimalVersioned
-{
-  public:
-    MemberMinimalVersioned() = default;
-    MemberMinimalVersioned( double d ) : x( d ) {}
-
-  protected:
-    friend class cereal::access;
-
-    template <class Archive>
-    double save_minimal( Archive const &, const std::uint32_t ) const
-    {
-      return x;
-    }
-
-    template <class Archive>
-    void load_minimal( Archive const &, double const & d, const std::uint32_t )
-    {
-      x = d;
-    }
-
-  public:
-    double x;
-};
-
-struct NonMemberMinimal
-{
-  NonMemberMinimal() = default;
-  NonMemberMinimal( std::uint32_t xx ) : x(xx) {}
-  std::uint32_t x;
-};
-
-template <class Archive> inline
-std::uint32_t save_minimal( Archive const &, NonMemberMinimal const & nmm )
-{
-  return nmm.x;
-}
-
-template <class Archive> inline
-void load_minimal( Archive const &, NonMemberMinimal & nmm, std::uint32_t const & data )
-{
-  nmm.x = data;
-}
-
-struct NonMemberMinimalVersioned
-{
-  NonMemberMinimalVersioned() = default;
-  NonMemberMinimalVersioned( bool xx ) : x(xx) {}
-  bool x;
-};
-
-template <class Archive> inline
-bool save_minimal( Archive const &, NonMemberMinimalVersioned const & nmm, std::uint32_t const )
-{
-  return nmm.x;
-}
-
-template <class Archive> inline
-void load_minimal( Archive const &, NonMemberMinimalVersioned & nmm, bool const & data, std::uint32_t const )
-{
-  nmm.x = data;
-}
-
-struct TestStruct
-{
-  TestStruct() = default;
-  TestStruct( std::string const & s, double d, std::uint32_t u, bool b ) :
-    mm(s), mmv(d), nmm(u), nmmv(b) {}
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( mm, mmv );
-    ar( nmm, nmmv );
-  }
-
-  MemberMinimal mm;
-  MemberMinimalVersioned mmv;
-  NonMemberMinimal nmm;
-  NonMemberMinimalVersioned nmmv;
-};
-
-struct Issue79Struct
-{
-  Issue79Struct() = default;
-  Issue79Struct( std::int32_t xx ) : x(xx) {}
-  std::int32_t x;
-};
-
-template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
-                                                   std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
-inline std::string save_minimal( Archive const &, Issue79Struct const & val )
-{
-  return std::to_string( val.x );
-}
-
-template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
-                                                   std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
-inline void load_minimal( Archive const &, Issue79Struct & val, std::string const & str )
-{
-  val.x = std::stoi( str );
-}
-
-template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
-                                                  std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
-inline std::int32_t save_minimal( Archive const &, Issue79Struct const & val )
-{
-  return val.x;
-}
-
-template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
-                                                  std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
-inline void load_minimal( Archive const &, Issue79Struct & val, std::int32_t const & xx )
-{
-  val.x = xx;
-}
-
-struct Issue79StructInternal
-{
-  Issue79StructInternal() = default;
-  Issue79StructInternal( std::int32_t xx ) : x(xx) {}
-  std::int32_t x;
-
-  template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
-                                                     std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
-  inline std::string save_minimal( Archive const & ) const
-  {
-    return std::to_string( x );
-  }
-
-  template <class Archive, cereal::traits::DisableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
-                                                     std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
-  inline void load_minimal( Archive const &, std::string const & str )
-  {
-    x = std::stoi( str );
-  }
-
-  template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryOutputArchive>::value ||
-                                                    std::is_same<Archive, cereal::PortableBinaryOutputArchive>::value> = cereal::traits::sfinae>
-  inline std::int32_t save_minimal( Archive const & ) const
-  {
-    return x;
-  }
-
-  template <class Archive, cereal::traits::EnableIf<std::is_same<Archive, cereal::BinaryInputArchive>::value ||
-                                                    std::is_same<Archive, cereal::PortableBinaryInputArchive>::value> = cereal::traits::sfinae>
-  inline void load_minimal( Archive const &, std::int32_t const & xx )
-  {
-    x = xx;
-  }
-};
-
-template <class IArchive, class OArchive> inline
-void test_structs_minimal()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    TestStruct o_struct = { random_basic_string<char>(gen), random_value<double>(gen),
-                            random_value<std::uint32_t>(gen), random_value<uint8_t>(gen) % 2 ? true : false };
-
-    Issue79Struct o_struct2 = { random_value<std::int32_t>(gen) };
-    Issue79StructInternal o_struct3 = { random_value<std::int32_t>(gen) };
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-      oar( o_struct );
-      oar( o_struct2 );
-      oar( o_struct3 );
-    }
-
-    decltype(o_struct) i_struct;
-    decltype(o_struct2) i_struct2;
-    decltype(o_struct3) i_struct3;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-      iar( i_struct );
-      iar( i_struct2 );
-      iar( i_struct3 );
-    }
-
-    CHECK_EQ(o_struct.mm.x, i_struct.mm.x);
-    CHECK_EQ(o_struct.mmv.x, doctest::Approx(i_struct.mmv.x).epsilon(1e-5));
-
-    CHECK_EQ(o_struct.nmm.x, i_struct.nmm.x);
-    CHECK_EQ(o_struct.nmmv.x, i_struct.nmmv.x);
-
-    CHECK_EQ(o_struct2.x, i_struct2.x);
-
-    CHECK_EQ(o_struct3.x, i_struct3.x);
-  }
-}
-
-#endif // CEREAL_TEST_STRUCTS_MINIMAL_H_
diff --git a/Src/External/cereal/unittests/structs_specialized.cpp b/Src/External/cereal/unittests/structs_specialized.cpp
deleted file mode 100644
index 1aa3e67..0000000
--- a/Src/External/cereal/unittests/structs_specialized.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "structs_specialized.hpp"
-
-TEST_SUITE("structs_specialized");
-
-TEST_CASE("binary_structs_specialized")
-{
-  test_structs_specialized<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_structs_specialized")
-{
-  test_structs_specialized<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_structs_specialized")
-{
-  test_structs_specialized<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_structs_specialized")
-{
-  test_structs_specialized<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/structs_specialized.hpp b/Src/External/cereal/unittests/structs_specialized.hpp
deleted file mode 100644
index 8daec99..0000000
--- a/Src/External/cereal/unittests/structs_specialized.hpp
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_STRUCTS_MINIMAL_H_
-#define CEREAL_TEST_STRUCTS_MINIMAL_H_
-#include "common.hpp"
-
-struct BogusBase
-{
-  template <class Archive>
-  void serialize( Archive & ) {}
-
-  template <class Archive>
-  void save( Archive & ) const {}
-
-  template <class Archive>
-  void load( Archive & ) {}
-
-  template <class Archive>
-  int save_minimal( Archive const & ) const { return 0; }
-
-  template <class Archive>
-  void load_minimal( Archive const &, int const & ) {}
-};
-
-struct BogusBaseVersioned
-{
-  template <class Archive>
-  void serialize( Archive &, const std::uint32_t ) {}
-
-  template <class Archive>
-  void save( Archive &, const std::uint32_t ) const {}
-
-  template <class Archive>
-  void load( Archive &, const std::uint32_t ) {}
-
-  template <class Archive>
-  int save_minimal( Archive const &, const std::uint32_t ) const { return 0; }
-
-  template <class Archive>
-  void load_minimal( Archive const &, int const &, const std::uint32_t ) {}
-};
-
-struct BogusBasePolymorphic
-{
-  template <class Archive>
-  void serialize( Archive & ) {}
-
-  virtual void doesNothing() {}
-};
-
-class SpecializedMSerialize : public BogusBase
-{
-  public:
-    SpecializedMSerialize() = default;
-    SpecializedMSerialize( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void serialize( Archive & ar )
-    {
-      ar( x );
-    }
-};
-
-class SpecializedMSerializeVersioned : public BogusBaseVersioned
-{
-  public:
-    SpecializedMSerializeVersioned() = default;
-    SpecializedMSerializeVersioned( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void serialize( Archive & ar, const std::uint32_t )
-    {
-      ar( x );
-    }
-};
-
-class SpecializedMSplit : public BogusBase
-{
-  public:
-    SpecializedMSplit() = default;
-    SpecializedMSplit( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void save( Archive & ar ) const
-    {
-      ar( x );
-    }
-
-    template <class Archive>
-    void load( Archive & ar )
-    {
-      ar( x );
-    }
-};
-
-class SpecializedMSplitVersioned : public BogusBaseVersioned
-{
-  public:
-    SpecializedMSplitVersioned() = default;
-    SpecializedMSplitVersioned( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void save( Archive & ar, const std::uint32_t ) const
-    {
-      ar( x );
-    }
-
-    template <class Archive>
-    void load( Archive & ar, const std::uint32_t )
-    {
-      ar( x );
-    }
-};
-
-class SpecializedMSplitPolymorphic : public BogusBasePolymorphic
-{
-  public:
-    SpecializedMSplitPolymorphic() = default;
-    SpecializedMSplitPolymorphic( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void save( Archive & ar ) const
-    {
-      ar( x );
-    }
-
-    template <class Archive>
-    void load( Archive & ar )
-    {
-      ar( x );
-    }
-};
-
-class SpecializedMSplitMinimal : public BogusBase
-{
-  public:
-    SpecializedMSplitMinimal() = default;
-    SpecializedMSplitMinimal( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    int save_minimal( Archive const & ) const
-    {
-      return x;
-    }
-
-    template <class Archive>
-    void load_minimal( Archive const &, int const & value )
-    {
-      x = value;
-    }
-};
-
-class SpecializedMSplitVersionedMinimal : public BogusBaseVersioned
-{
-  public:
-    SpecializedMSplitVersionedMinimal() = default;
-    SpecializedMSplitVersionedMinimal( int xx ) : x(xx) {}
-
-    int x;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    int save_minimal( Archive const &, const std::uint32_t ) const
-    {
-      return x;
-    }
-
-    template <class Archive>
-    void load_minimal( Archive const &, int const & value, const std::uint32_t )
-    {
-      x = value;
-    }
-};
-
-class SpecializedNMSerialize : public BogusBase
-{
-  public:
-    SpecializedNMSerialize() = default;
-    SpecializedNMSerialize( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void serialize( Archive & ar, SpecializedNMSerialize & s )
-{
-  ar( s.x );
-}
-
-class SpecializedNMSerializeVersioned : public BogusBaseVersioned
-{
-  public:
-    SpecializedNMSerializeVersioned() = default;
-    SpecializedNMSerializeVersioned( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void serialize( Archive & ar, SpecializedNMSerializeVersioned & s )
-{
-  ar( s.x );
-}
-
-class SpecializedNMSplit : public BogusBase
-{
-  public:
-    SpecializedNMSplit() = default;
-    SpecializedNMSplit( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void load( Archive & ar, SpecializedNMSplit & s )
-{
-  ar( s.x );
-}
-
-template <class Archive>
-void save( Archive & ar, SpecializedNMSplit const & s )
-{
-  ar( s.x );
-}
-
-class SpecializedNMSplitVersioned : public BogusBaseVersioned
-{
-  public:
-    SpecializedNMSplitVersioned() = default;
-    SpecializedNMSplitVersioned( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void load( Archive & ar, SpecializedNMSplitVersioned & s, const std::uint32_t )
-{
-  ar( s.x );
-}
-
-template <class Archive>
-void save( Archive & ar, SpecializedNMSplitVersioned const & s, const std::uint32_t )
-{
-  ar( s.x );
-}
-
-class SpecializedNMSplitMinimal : public BogusBase
-{
-  public:
-    SpecializedNMSplitMinimal() = default;
-    SpecializedNMSplitMinimal( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void load_minimal( Archive const &, SpecializedNMSplitMinimal & s, int const & value )
-{
-  s.x = value;
-}
-
-template <class Archive>
-int save_minimal( Archive const &, SpecializedNMSplitMinimal const & s )
-{
-  return s.x;
-}
-
-class SpecializedNMSplitVersionedMinimal : public BogusBaseVersioned
-{
-  public:
-    SpecializedNMSplitVersionedMinimal() = default;
-    SpecializedNMSplitVersionedMinimal( int xx ) : x(xx) {}
-
-    int x;
-};
-
-template <class Archive>
-void load_minimal( Archive const &, SpecializedNMSplitVersionedMinimal & s, int const & value, const std::uint32_t )
-{
-  s.x = value;
-}
-
-template <class Archive>
-int save_minimal( Archive const &, SpecializedNMSplitVersionedMinimal const & s, const std::uint32_t )
-{
-  return s.x;
-}
-
-namespace cereal
-{
-  template <class Archive> struct specialize<Archive, SpecializedMSerialize, cereal::specialization::member_serialize> {};
-  template <class Archive> struct specialize<Archive, SpecializedMSerializeVersioned, cereal::specialization::member_serialize> {};
-
-  template <class Archive> struct specialize<Archive, SpecializedMSplit, cereal::specialization::member_load_save> {};
-  template <class Archive> struct specialize<Archive, SpecializedMSplitVersioned, cereal::specialization::member_load_save> {};
-  template <class Archive> struct specialize<Archive, SpecializedMSplitPolymorphic, cereal::specialization::member_load_save> {};
-
-  template <class Archive> struct specialize<Archive, SpecializedMSplitMinimal, cereal::specialization::member_load_save_minimal> {};
-  template <class Archive> struct specialize<Archive, SpecializedMSplitVersionedMinimal, cereal::specialization::member_load_save_minimal> {};
-
-  template <class Archive> struct specialize<Archive, SpecializedNMSerialize, cereal::specialization::non_member_serialize> {};
-  template <class Archive> struct specialize<Archive, SpecializedNMSerializeVersioned, cereal::specialization::non_member_serialize> {};
-
-  template <class Archive> struct specialize<Archive, SpecializedNMSplit, cereal::specialization::non_member_load_save> {};
-  template <class Archive> struct specialize<Archive, SpecializedNMSplitVersioned, cereal::specialization::non_member_load_save> {};
-
-  template <class Archive> struct specialize<Archive, SpecializedNMSplitMinimal,
-           cereal::specialization::non_member_load_save_minimal> {};
-  template <class Archive> struct specialize<Archive, SpecializedNMSplitVersionedMinimal,
-           cereal::specialization::non_member_load_save_minimal> {};
-}
-
-CEREAL_REGISTER_TYPE(SpecializedMSplitPolymorphic)
-CEREAL_REGISTER_POLYMORPHIC_RELATION(BogusBasePolymorphic, SpecializedMSplitPolymorphic)
-
-template <class IArchive, class OArchive> inline
-void test_structs_specialized()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    SpecializedMSerialize               o_iser          = { random_value<int>(gen) };
-    SpecializedMSerializeVersioned      o_iserv         = { random_value<int>(gen) };
-
-    SpecializedMSplit                   o_ispl          = { random_value<int>(gen) };
-    SpecializedMSplitVersioned          o_isplv         = { random_value<int>(gen) };
-
-    // added re: issue #180
-    std::shared_ptr<BogusBasePolymorphic> o_shared_ispl = std::make_shared<SpecializedMSplitPolymorphic>( random_value<int>(gen) );
-
-    SpecializedMSplitMinimal            o_isplm         = { random_value<int>(gen) };
-    SpecializedMSplitVersionedMinimal   o_isplvm        = { random_value<int>(gen) };
-
-    SpecializedNMSerialize              o_eser          = { random_value<int>(gen) };
-    SpecializedNMSerializeVersioned     o_eserv         = { random_value<int>(gen) };
-
-    SpecializedNMSplit                  o_espl          = { random_value<int>(gen) };
-    SpecializedNMSplitVersioned         o_esplv         = { random_value<int>(gen) };
-
-    SpecializedNMSplitMinimal           o_esplm         = { random_value<int>(gen) };
-    SpecializedNMSplitVersionedMinimal  o_esplvm        = { random_value<int>(gen) };
-
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( o_iser, o_iserv,
-           o_ispl, o_isplv, o_shared_ispl,
-           o_isplm, o_isplvm,
-           o_eser, o_eserv,
-           o_espl, o_esplv,
-           o_esplm, o_esplvm );
-    }
-
-    decltype(o_iser) i_iser;
-    decltype(o_iserv) i_iserv;
-
-    decltype(o_ispl) i_ispl;
-    decltype(o_isplv) i_isplv;
-
-    decltype(o_shared_ispl) i_shared_ispl;
-
-    decltype(o_isplm) i_isplm;
-    decltype(o_isplvm) i_isplvm;
-
-    decltype(o_eser) i_eser;
-    decltype(o_eserv) i_eserv;
-
-    decltype(o_espl) i_espl;
-    decltype(o_esplv) i_esplv;
-
-    decltype(o_esplm) i_esplm;
-    decltype(o_esplvm) i_esplvm;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( i_iser, i_iserv,
-           i_ispl, i_isplv, i_shared_ispl,
-           i_isplm, i_isplvm,
-           i_eser, i_eserv,
-           i_espl, i_esplv,
-           i_esplm, i_esplvm );
-    }
-
-    CHECK_EQ(i_iser.x, o_iser.x);
-    CHECK_EQ(i_iserv.x, o_iserv.x);
-
-    CHECK_EQ(i_ispl.x, o_ispl.x);
-    CHECK_EQ(i_isplv.x, o_isplv.x);
-
-    CHECK_EQ(dynamic_cast<SpecializedMSplitPolymorphic*>(i_shared_ispl.get())->x, dynamic_cast<SpecializedMSplitPolymorphic*>(o_shared_ispl.get())->x);
-
-    CHECK_EQ(i_isplm.x, o_isplm.x);
-    CHECK_EQ(i_isplvm.x, o_isplvm.x);
-
-    CHECK_EQ(i_eser.x, o_eser.x);
-    CHECK_EQ(i_eserv.x, o_eserv.x);
-
-    CHECK_EQ(i_espl.x, o_espl.x);
-    CHECK_EQ(i_esplv.x, o_esplv.x);
-
-    CHECK_EQ(i_esplm.x, o_esplm.x);
-    CHECK_EQ(i_esplvm.x, o_esplvm.x);
-  }
-}
-
-#endif // CEREAL_TEST_STRUCTS_SPECIALIZED_H_
diff --git a/Src/External/cereal/unittests/tuple.cpp b/Src/External/cereal/unittests/tuple.cpp
deleted file mode 100644
index d3ea635..0000000
--- a/Src/External/cereal/unittests/tuple.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "tuple.hpp"
-
-TEST_SUITE("tuple");
-
-TEST_CASE("binary_tuple")
-{
-  test_tuple<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_tuple")
-{
-  test_tuple<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_tuple")
-{
-  test_tuple<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_tuple")
-{
-  test_tuple<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/tuple.hpp b/Src/External/cereal/unittests/tuple.hpp
deleted file mode 100644
index edb25b2..0000000
--- a/Src/External/cereal/unittests/tuple.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_TUPLE_H_
-#define CEREAL_TEST_TUPLE_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_tuple()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rng = [&](){ return random_value<int>(gen); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    auto o_podtuple = std::make_tuple( rng(), rng(), rng(), rng() );
-    auto o_podtuple11 = std::make_tuple( rng(), rng(), rng(), rng(), rng(), rng(),
-                                         rng(), rng(), rng(), rng(), rng() );
-    auto o_isertuple = std::make_tuple( StructInternalSerialize( rng(), rng() ),
-        StructInternalSerialize( rng(), rng() ),
-        StructInternalSerialize( rng(), rng() ),
-        StructInternalSerialize( rng(), rng() ) );
-    auto o_ispltuple = std::make_tuple( StructInternalSplit( rng(), rng() ),
-        StructInternalSplit( rng(), rng() ),
-        StructInternalSplit( rng(), rng() ),
-        StructInternalSplit( rng(), rng() ) );
-    auto o_esertuple = std::make_tuple( StructExternalSerialize( rng(), rng() ),
-        StructExternalSerialize( rng(), rng() ),
-        StructExternalSerialize( rng(), rng() ),
-        StructExternalSerialize( rng(), rng() ) );
-    auto o_espltuple = std::make_tuple( StructExternalSerialize( rng(), rng() ),
-        StructExternalSerialize( rng(), rng() ),
-        StructExternalSerialize( rng(), rng() ),
-        StructExternalSerialize( rng(), rng() ) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podtuple);
-      oar(o_podtuple11);
-      oar(o_isertuple);
-      oar(o_ispltuple);
-      oar(o_esertuple);
-      oar(o_espltuple);
-    }
-
-    decltype( o_podtuple   ) i_podtuple;
-    decltype( o_podtuple11 ) i_podtuple11;
-    decltype( o_isertuple  ) i_isertuple;
-    decltype( o_ispltuple  ) i_ispltuple;
-    decltype( o_esertuple  ) i_esertuple;
-    decltype( o_espltuple  ) i_espltuple;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podtuple);
-      iar(i_podtuple11);
-      iar(i_isertuple);
-      iar(i_ispltuple);
-      iar(i_esertuple);
-      iar(i_espltuple);
-    }
-
-    CHECK_EQ( i_podtuple,   o_podtuple);
-    CHECK_EQ( i_podtuple11, o_podtuple11);
-    CHECK_EQ( i_isertuple,  o_isertuple);
-    CHECK_EQ( i_ispltuple,  o_ispltuple);
-    CHECK_EQ( i_esertuple,  o_esertuple);
-    CHECK_EQ( i_espltuple,  o_espltuple);
-  }
-}
-
-#endif // CEREAL_TEST_TUPLE_H_
diff --git a/Src/External/cereal/unittests/unordered_loads.cpp b/Src/External/cereal/unittests/unordered_loads.cpp
deleted file mode 100644
index 9377276..0000000
--- a/Src/External/cereal/unittests/unordered_loads.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "unordered_loads.hpp"
-
-TEST_SUITE("unordered_loads");
-
-TEST_CASE("xml_unordered_loads")
-{
-  test_unordered_loads<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_unordered_loads")
-{
-  test_unordered_loads<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_loads.hpp b/Src/External/cereal/unittests/unordered_loads.hpp
deleted file mode 100644
index 278fb65..0000000
--- a/Src/External/cereal/unittests/unordered_loads.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_UNORDERED_LOADS_H_
-#define CEREAL_TEST_UNORDERED_LOADS_H_
-#include "common.hpp"
-
-struct unordered_naming
-{
-  int x;
-  int xx;
-  int y;
-  int z;
-
-  template <class Archive>
-  void save( Archive & ar ) const
-  {
-    ar( CEREAL_NVP(x),
-        CEREAL_NVP(z),
-        CEREAL_NVP(y),
-        CEREAL_NVP(xx) );
-  }
-
-  template <class Archive>
-  void load( Archive & ar )
-  {
-    ar( x,
-        CEREAL_NVP(y),
-        CEREAL_NVP(z),
-        CEREAL_NVP(xx) );
-  }
-
-  bool operator==( unordered_naming const & other ) const
-  {
-    return x == other.x && xx == other.xx && y == other.y && z == other.z;
-  }
-};
-
-std::ostream& operator<<(std::ostream& os, unordered_naming const & s)
-{
-  os << "[x: " << s.x << " xx: " << s.xx << " y: " << s.y << " z: " << s.z << "]";
-  return os;
-}
-
-template <class IArchive, class OArchive> inline
-void test_unordered_loads()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rngB = [&](){ return random_value<int>( gen ) % 2 == 0; };
-  auto rngI = [&](){ return random_value<int>( gen ); };
-  auto rngF = [&](){ return random_value<float>( gen ); };
-  auto rngD = [&](){ return random_value<double>( gen ); };
-  auto rngS = [&](){ return random_basic_string<char>( gen ); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    auto const name1 = rngS();
-    auto const name2 = rngS();
-    auto const name3 = rngS();
-    auto const name4 = rngS();
-    auto const name5 = rngS();
-    auto const name6 = rngS();
-    auto const name7 = rngS();
-
-    int o_int1 = rngI();
-    double o_double2 = rngD();
-    std::vector<bool> o_vecbool3 = { rngB(), rngB(), rngB(), rngB(), rngB() };
-    int o_int4 = rngI();
-    int o_int5 = rngI();
-    int o_int6 = rngI();
-    std::pair<float, unordered_naming> o_un7;
-    o_un7.first = rngF();
-    o_un7.second.x = rngI();
-    o_un7.second.xx = rngI();
-    o_un7.second.y = rngI();
-    o_un7.second.z = rngI();
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar( cereal::make_nvp( name1, o_int1 ),
-           cereal::make_nvp( name2, o_double2 ),
-           cereal::make_nvp( name3, o_vecbool3 ),
-           cereal::make_nvp( name4, o_int4 ),
-           cereal::make_nvp( name5, o_int5 ),
-           cereal::make_nvp( name6, o_int6 ),
-           cereal::make_nvp( name7, o_un7 ) );
-    }
-
-    decltype(o_int1) i_int1;
-    decltype(o_double2) i_double2;
-    decltype(o_vecbool3) i_vecbool3;
-    decltype(o_int4) i_int4;
-    decltype(o_int5) i_int5;
-    decltype(o_int6) i_int6;
-    decltype(o_un7) i_un7;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar( cereal::make_nvp( name7, i_un7 ),
-           cereal::make_nvp( name2, i_double2 ),
-           cereal::make_nvp( name4, i_int4 ),
-           cereal::make_nvp( name3, i_vecbool3 ),
-           cereal::make_nvp( name1, i_int1 ),
-           cereal::make_nvp( name5, i_int5 ),
-           i_int6 );
-    }
-
-    CHECK_EQ(o_int1, i_int1);
-    CHECK_EQ(o_double2, doctest::Approx(o_double2).epsilon(1e-5));
-    CHECK_EQ(o_vecbool3.size(), i_vecbool3.size());
-    check_collection(i_vecbool3, o_vecbool3);
-    CHECK_EQ(o_int4, i_int4);
-    CHECK_EQ(o_int5, i_int5);
-    CHECK_EQ(o_int6, i_int6);
-    CHECK_EQ(o_un7.first, i_un7.first);
-    CHECK_EQ(o_un7.second, i_un7.second);
-  }
-}
-
-#endif // CEREAL_TEST_UNORDERED_LOADS_H_
diff --git a/Src/External/cereal/unittests/unordered_map.cpp b/Src/External/cereal/unittests/unordered_map.cpp
deleted file mode 100644
index a0c0cbb..0000000
--- a/Src/External/cereal/unittests/unordered_map.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "unordered_map.hpp"
-
-TEST_SUITE("unordered_map");
-
-TEST_CASE("binary_unordered_map")
-{
-  test_unordered_map<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_unordered_map")
-{
-  test_unordered_map<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_unordered_map")
-{
-  test_unordered_map<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_unordered_map")
-{
-  test_unordered_map<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_map.hpp b/Src/External/cereal/unittests/unordered_map.hpp
deleted file mode 100644
index 7896197..0000000
--- a/Src/External/cereal/unittests/unordered_map.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_UNORDERED_MAP_H_
-#define CEREAL_TEST_UNORDERED_MAP_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_unordered_map()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::unordered_map<std::string, int> o_podunordered_map;
-    for(int j=0; j<100; ++j)
-      o_podunordered_map.insert({random_value<std::string>(gen), random_value<int>(gen)});
-
-    std::unordered_map<uint16_t, StructInternalSerialize> o_iserunordered_map;
-    for(int j=0; j<100; ++j)
-      o_iserunordered_map.insert({random_value<uint16_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::unordered_map<uint16_t, StructInternalSplit> o_isplunordered_map;
-    for(int j=0; j<100; ++j)
-      o_isplunordered_map.insert({random_value<uint16_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::unordered_map<uint32_t, StructExternalSerialize> o_eserunordered_map;
-    for(int j=0; j<100; ++j)
-      o_eserunordered_map.insert({random_value<uint32_t>(gen), { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::unordered_map<int8_t, StructExternalSplit> o_esplunordered_map;
-    for(int j=0; j<100; ++j)
-      o_esplunordered_map.insert({random_value<char>(gen),  { random_value<int>(gen), random_value<int>(gen) }});
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podunordered_map);
-      oar(o_iserunordered_map);
-      oar(o_isplunordered_map);
-      oar(o_eserunordered_map);
-      oar(o_esplunordered_map);
-    }
-
-    std::unordered_map<std::string, int> i_podunordered_map;
-    std::unordered_map<uint16_t, StructInternalSerialize>   i_iserunordered_map;
-    std::unordered_map<uint16_t, StructInternalSplit>        i_isplunordered_map;
-    std::unordered_map<uint32_t, StructExternalSerialize> i_eserunordered_map;
-    std::unordered_map<int8_t, StructExternalSplit>       i_esplunordered_map;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podunordered_map);
-      iar(i_iserunordered_map);
-      iar(i_isplunordered_map);
-      iar(i_eserunordered_map);
-      iar(i_esplunordered_map);
-    }
-
-    for(auto const & p : i_podunordered_map)
-    {
-      auto v = o_podunordered_map.find(p.first);
-      CHECK_NE(v, o_podunordered_map.end());
-      CHECK_EQ(p.second, v->second);
-    }
-
-    for(auto const & p : i_iserunordered_map)
-    {
-      auto v = o_iserunordered_map.find(p.first);
-      CHECK_NE(v, o_iserunordered_map.end());
-      CHECK_EQ(p.second, v->second);
-    }
-
-    for(auto const & p : i_isplunordered_map)
-    {
-      auto v = o_isplunordered_map.find(p.first);
-      CHECK_NE(v, o_isplunordered_map.end());
-      CHECK_EQ(p.second, v->second);
-    }
-
-    for(auto const & p : i_eserunordered_map)
-    {
-      auto v = o_eserunordered_map.find(p.first);
-      CHECK_NE(v, o_eserunordered_map.end());
-      CHECK_EQ(p.second, v->second);
-    }
-
-    for(auto const & p : i_esplunordered_map)
-    {
-      auto v = o_esplunordered_map.find(p.first);
-      CHECK_NE(v, o_esplunordered_map.end());
-      CHECK_EQ(p.second, v->second);
-    }
-  }
-}
-
-#endif // CEREAL_TEST_UNORDERED_MAP_H_
diff --git a/Src/External/cereal/unittests/unordered_multimap.cpp b/Src/External/cereal/unittests/unordered_multimap.cpp
deleted file mode 100644
index 4d9a7c3..0000000
--- a/Src/External/cereal/unittests/unordered_multimap.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "unordered_multimap.hpp"
-
-TEST_SUITE("unordered_multimap");
-
-TEST_CASE("binary_unordered_multimap")
-{
-  test_unordered_multimap<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_unordered_multimap")
-{
-  test_unordered_multimap<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_unordered_multimap")
-{
-  test_unordered_multimap<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_unordered_multimap")
-{
-  test_unordered_multimap<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_multimap.hpp b/Src/External/cereal/unittests/unordered_multimap.hpp
deleted file mode 100644
index 6f000e6..0000000
--- a/Src/External/cereal/unittests/unordered_multimap.hpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_UNORDERED_MULTIMAP_H_
-#define CEREAL_TEST_UNORDERED_MULTIMAP_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_unordered_multimap()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::unordered_multimap<std::string, int> o_podunordered_multimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<std::string>(gen);
-      o_podunordered_multimap.insert({key, random_value<int>(gen)});
-      o_podunordered_multimap.insert({key, random_value<int>(gen)});
-    }
-
-    std::unordered_multimap<int, StructInternalSerialize> o_iserunordered_multimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<int>(gen);
-      o_iserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-      o_iserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::unordered_multimap<int, StructInternalSplit> o_isplunordered_multimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<int>(gen);
-      o_isplunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-      o_isplunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::unordered_multimap<uint32_t, StructExternalSerialize> o_eserunordered_multimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<uint32_t>(gen);
-      o_eserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-      o_eserunordered_multimap.insert({key, { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::unordered_multimap<int8_t, StructExternalSplit> o_esplunordered_multimap;
-    for(int j=0; j<100; ++j)
-    {
-      auto key = random_value<char>(gen);
-      o_esplunordered_multimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
-      o_esplunordered_multimap.insert({key,  { random_value<int>(gen), random_value<int>(gen) }});
-    }
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podunordered_multimap);
-      oar(o_iserunordered_multimap);
-      oar(o_isplunordered_multimap);
-      oar(o_eserunordered_multimap);
-      oar(o_esplunordered_multimap);
-    }
-
-    std::unordered_multimap<std::string, int> i_podunordered_multimap;
-    std::unordered_multimap<int, StructInternalSerialize>   i_iserunordered_multimap;
-    std::unordered_multimap<int, StructInternalSplit>        i_isplunordered_multimap;
-    std::unordered_multimap<uint32_t, StructExternalSerialize> i_eserunordered_multimap;
-    std::unordered_multimap<int8_t, StructExternalSplit>       i_esplunordered_multimap;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podunordered_multimap);
-      iar(i_iserunordered_multimap);
-      iar(i_isplunordered_multimap);
-      iar(i_eserunordered_multimap);
-      iar(i_esplunordered_multimap);
-    }
-
-    CHECK_EQ(i_podunordered_multimap.size(),  o_podunordered_multimap.size());
-    CHECK_EQ(i_iserunordered_multimap.size(), o_iserunordered_multimap.size());
-    CHECK_EQ(i_isplunordered_multimap.size(), o_isplunordered_multimap.size());
-    CHECK_EQ(i_eserunordered_multimap.size(), o_eserunordered_multimap.size());
-    CHECK_EQ(i_esplunordered_multimap.size(), o_esplunordered_multimap.size());
-
-    for(auto const & p : i_podunordered_multimap)
-    {
-      size_t const bucket = o_podunordered_multimap.bucket(p.first);
-      auto bucket_begin   = o_podunordered_multimap.begin(bucket);
-      auto bucket_end     = o_podunordered_multimap.end(bucket);
-      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
-    }
-
-    for(auto const & p : i_iserunordered_multimap)
-    {
-      size_t const bucket = o_iserunordered_multimap.bucket(p.first);
-      auto bucket_begin   = o_iserunordered_multimap.begin(bucket);
-      auto bucket_end     = o_iserunordered_multimap.end(bucket);
-      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
-    }
-
-    for(auto const & p : i_isplunordered_multimap)
-    {
-      size_t const bucket = o_isplunordered_multimap.bucket(p.first);
-      auto bucket_begin   = o_isplunordered_multimap.begin(bucket);
-      auto bucket_end     = o_isplunordered_multimap.end(bucket);
-      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
-    }
-
-    for(auto const & p : i_eserunordered_multimap)
-    {
-      size_t const bucket = o_eserunordered_multimap.bucket(p.first);
-      auto bucket_begin   = o_eserunordered_multimap.begin(bucket);
-      auto bucket_end     = o_eserunordered_multimap.end(bucket);
-      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
-    }
-
-    for(auto const & p : i_esplunordered_multimap)
-    {
-      size_t const bucket = o_esplunordered_multimap.bucket(p.first);
-      auto bucket_begin   = o_esplunordered_multimap.begin(bucket);
-      auto bucket_end     = o_esplunordered_multimap.end(bucket);
-      CHECK_NE(std::find(bucket_begin, bucket_end, p), bucket_end);
-    }
-  }
-}
-
-#endif // CEREAL_TEST_UNORDERED_MULTIMAP_H_
diff --git a/Src/External/cereal/unittests/unordered_multiset.cpp b/Src/External/cereal/unittests/unordered_multiset.cpp
deleted file mode 100644
index a98ffa1..0000000
--- a/Src/External/cereal/unittests/unordered_multiset.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "unordered_multiset.hpp"
-
-TEST_SUITE("unordered_multiset");
-
-TEST_CASE("binary_unordered_multiset")
-{
-  test_unordered_multiset<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_unordered_multiset")
-{
-  test_unordered_multiset<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_unordered_multiset")
-{
-  test_unordered_multiset<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_unordered_multiset")
-{
-  test_unordered_multiset<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_multiset.hpp b/Src/External/cereal/unittests/unordered_multiset.hpp
deleted file mode 100644
index ae9d072..0000000
--- a/Src/External/cereal/unittests/unordered_multiset.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_UNORDERED_MULTISET_H_
-#define CEREAL_TEST_UNORDERED_MULTISET_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_unordered_multiset()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::unordered_multiset<int> o_podunordered_multiset;
-    for(int j=0; j<100; ++j)
-    {
-      int value = random_value<int>(gen);
-      o_podunordered_multiset.insert(value);
-      o_podunordered_multiset.insert(value);
-    }
-
-    std::unordered_multiset<StructInternalSerialize, StructHash<StructInternalSerialize>> o_iserunordered_multiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructInternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
-      o_iserunordered_multiset.insert(value);
-      o_iserunordered_multiset.insert(value);
-    }
-
-    std::unordered_multiset<StructInternalSplit, StructHash<StructInternalSplit>> o_isplunordered_multiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructInternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
-      o_isplunordered_multiset.insert(value);
-      o_isplunordered_multiset.insert(value);
-    }
-
-    std::unordered_multiset<StructExternalSerialize, StructHash<StructExternalSerialize>> o_eserunordered_multiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructExternalSerialize value = { random_value<int>(gen), random_value<int>(gen) };
-      o_eserunordered_multiset.insert(value);
-      o_eserunordered_multiset.insert(value);
-    }
-
-    std::unordered_multiset<StructExternalSplit, StructHash<StructExternalSplit>> o_esplunordered_multiset;
-    for(int j=0; j<100; ++j)
-    {
-      StructExternalSplit value = { random_value<int>(gen), random_value<int>(gen) };
-      o_esplunordered_multiset.insert(value);
-      o_esplunordered_multiset.insert(value);
-    }
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podunordered_multiset);
-      oar(o_iserunordered_multiset);
-      oar(o_isplunordered_multiset);
-      oar(o_eserunordered_multiset);
-      oar(o_esplunordered_multiset);
-    }
-
-    std::unordered_multiset<int> i_podunordered_multiset;
-    std::unordered_multiset<StructInternalSerialize, StructHash<StructInternalSerialize>> i_iserunordered_multiset;
-    std::unordered_multiset<StructInternalSplit, StructHash<StructInternalSplit>>         i_isplunordered_multiset;
-    std::unordered_multiset<StructExternalSerialize, StructHash<StructExternalSerialize>> i_eserunordered_multiset;
-    std::unordered_multiset<StructExternalSplit, StructHash<StructExternalSplit>>         i_esplunordered_multiset;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podunordered_multiset);
-      iar(i_iserunordered_multiset);
-      iar(i_isplunordered_multiset);
-      iar(i_eserunordered_multiset);
-      iar(i_esplunordered_multiset);
-    }
-
-    for(auto const & p : i_podunordered_multiset)
-    {
-      CHECK_EQ(o_podunordered_multiset.count(p), i_podunordered_multiset.count(p));
-    }
-
-    for(auto const & p : i_iserunordered_multiset)
-    {
-      CHECK_EQ(o_iserunordered_multiset.count(p), i_iserunordered_multiset.count(p));
-    }
-
-    for(auto const & p : i_isplunordered_multiset)
-    {
-      CHECK_EQ(o_isplunordered_multiset.count(p), i_isplunordered_multiset.count(p));
-    }
-
-    for(auto const & p : i_eserunordered_multiset)
-    {
-      CHECK_EQ(o_eserunordered_multiset.count(p), i_eserunordered_multiset.count(p));
-    }
-
-    for(auto const & p : i_esplunordered_multiset)
-    {
-      CHECK_EQ(o_esplunordered_multiset.count(p), i_esplunordered_multiset.count(p));
-    }
-  }
-}
-
-#endif // CEREAL_TEST_UNORDERED_MULTISET_H_
diff --git a/Src/External/cereal/unittests/unordered_set.cpp b/Src/External/cereal/unittests/unordered_set.cpp
deleted file mode 100644
index 0c8be14..0000000
--- a/Src/External/cereal/unittests/unordered_set.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "unordered_set.hpp"
-
-TEST_SUITE("unordered_set");
-
-TEST_CASE("binary_unordered_set")
-{
-  test_unordered_set<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_unordered_set")
-{
-  test_unordered_set<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_unordered_set")
-{
-  test_unordered_set<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_unordered_set")
-{
-  test_unordered_set<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/unordered_set.hpp b/Src/External/cereal/unittests/unordered_set.hpp
deleted file mode 100644
index 3347313..0000000
--- a/Src/External/cereal/unittests/unordered_set.hpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_UNORDERED_SET_H_
-#define CEREAL_TEST_UNORDERED_SET_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_unordered_set()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::unordered_set<int> o_podunordered_set;
-    for(int j=0; j<100; ++j)
-      o_podunordered_set.insert(random_value<int>(gen));
-
-    std::unordered_set<StructInternalSerialize, StructHash<StructInternalSerialize>> o_iserunordered_set;
-    for(int j=0; j<100; ++j)
-      o_iserunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::unordered_set<StructInternalSplit, StructHash<StructInternalSplit>> o_isplunordered_set;
-    for(int j=0; j<100; ++j)
-      o_isplunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::unordered_set<StructExternalSerialize, StructHash<StructExternalSerialize>> o_eserunordered_set;
-    for(int j=0; j<100; ++j)
-      o_eserunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::unordered_set<StructExternalSplit, StructHash<StructExternalSplit>> o_esplunordered_set;
-    for(int j=0; j<100; ++j)
-      o_esplunordered_set.insert({ random_value<int>(gen), random_value<int>(gen) });
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podunordered_set);
-      oar(o_iserunordered_set);
-      oar(o_isplunordered_set);
-      oar(o_eserunordered_set);
-      oar(o_esplunordered_set);
-    }
-
-    std::unordered_set<int> i_podunordered_set;
-    std::unordered_set<StructInternalSerialize, StructHash<StructInternalSerialize>>   i_iserunordered_set;
-    std::unordered_set<StructInternalSplit, StructHash<StructInternalSplit>>           i_isplunordered_set;
-    std::unordered_set<StructExternalSerialize, StructHash<StructExternalSerialize>>   i_eserunordered_set;
-    std::unordered_set<StructExternalSplit, StructHash<StructExternalSplit>>           i_esplunordered_set;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podunordered_set);
-      iar(i_iserunordered_set);
-      iar(i_isplunordered_set);
-      iar(i_eserunordered_set);
-      iar(i_esplunordered_set);
-    }
-
-    for(auto const & p : i_podunordered_set)
-    {
-      CHECK_EQ(o_podunordered_set.count(p), 1lu);
-    }
-
-    for(auto const & p : i_iserunordered_set)
-    {
-      CHECK_EQ(o_iserunordered_set.count(p), 1lu);
-    }
-
-    for(auto const & p : i_isplunordered_set)
-    {
-      CHECK_EQ(o_isplunordered_set.count(p), 1lu);
-    }
-
-    for(auto const & p : i_eserunordered_set)
-    {
-      CHECK_EQ(o_eserunordered_set.count(p), 1lu);
-    }
-
-    for(auto const & p : i_esplunordered_set)
-    {
-      CHECK_EQ(o_esplunordered_set.count(p), 1lu);
-    }
-  }
-}
-
-#endif // CEREAL_TEST_UNORDERED_SET_H_
diff --git a/Src/External/cereal/unittests/user_data_adapters.cpp b/Src/External/cereal/unittests/user_data_adapters.cpp
deleted file mode 100644
index 9a88848..0000000
--- a/Src/External/cereal/unittests/user_data_adapters.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "user_data_adapters.hpp"
-
-TEST_SUITE("user_data_adapters");
-
-TEST_CASE("binary_user_data_adapters")
-{
-  test_user_data_adapters<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_user_data_adapters")
-{
-  test_user_data_adapters<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_user_data_adapters")
-{
-  test_user_data_adapters<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_user_data_adapters")
-{
-  test_user_data_adapters<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/user_data_adapters.hpp b/Src/External/cereal/unittests/user_data_adapters.hpp
deleted file mode 100644
index 23a2510..0000000
--- a/Src/External/cereal/unittests/user_data_adapters.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_USER_DATA_ADAPTERS_H_
-#define CEREAL_TEST_USER_DATA_ADAPTERS_H_
-
-#include "common.hpp"
-#define CEREAL_FUTURE_EXPERIMENTAL
-#include <cereal/archives/adapters.hpp>
-
-struct SomeStruct {};
-
-struct UserData
-{
-  UserData( SomeStruct * pp, SomeStruct & r ) :
-    p(pp), ref(r) {}
-
-  SomeStruct * p;
-  std::reference_wrapper<SomeStruct> ref;
-};
-
-struct UserStruct
-{
-  UserStruct( std::int32_t i,
-              SomeStruct * pointer,
-              SomeStruct & reference ) :
-    i32( i ),
-    p( pointer ),
-    ref( reference )
-  { }
-
-  UserStruct & operator=( UserStruct const & ) = delete;
-
-  std::int32_t i32;
-  SomeStruct const * p;
-  SomeStruct & ref;
-
-  template <class Archive>
-  void serialize( Archive & ar )
-  {
-    ar( i32 );
-  }
-
-  template <class Archive>
-  static void load_and_construct( Archive & ar, cereal::construct<UserStruct> & construct )
-  {
-    std::int32_t ii;
-    ar( ii );
-    auto & data = cereal::get_user_data<UserData>( ar );
-    construct( ii, data.p, data.ref.get() );
-  }
-};
-
-template <class IArchive, class OArchive> inline
-void test_user_data_adapters()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  auto rng = [&](){ return random_value<int>(gen); };
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    SomeStruct ss;
-    std::unique_ptr<UserStruct> o_ptr( new UserStruct( rng(), &ss, ss ) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_ptr);
-    }
-
-    decltype( o_ptr  ) i_ptr;
-
-    std::istringstream is(os.str());
-    {
-      UserData ud(&ss, ss);
-      cereal::UserDataAdapter<UserData, IArchive> iar(ud, is);
-
-      iar(i_ptr);
-    }
-
-    CHECK_EQ( i_ptr->p, o_ptr->p );
-    CHECK_EQ( std::addressof(i_ptr->ref), std::addressof(o_ptr->ref) );
-    CHECK_EQ( i_ptr->i32, o_ptr->i32 );
-
-    std::istringstream bad_is(os.str());
-    {
-      IArchive iar(bad_is);
-
-      CHECK_THROWS_AS( iar(i_ptr), ::cereal::Exception );
-    }
-  }
-}
-
-#endif // CEREAL_TEST_USER_DATA_ADAPTERS_H_
diff --git a/Src/External/cereal/unittests/valarray.cpp b/Src/External/cereal/unittests/valarray.cpp
deleted file mode 100644
index 4866c02..0000000
--- a/Src/External/cereal/unittests/valarray.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright (c) 2014, Randolph Voorhies, Shane Grant
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-* Neither the name of cereal nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "valarray.hpp"
-
-TEST_SUITE("valarray");
-
-TEST_CASE("binary_valarray")
-{
-  test_valarray<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_valarray")
-{
-  test_valarray<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_valarray")
-{
-  test_valarray<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_valarray")
-{
-  test_valarray<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/valarray.hpp b/Src/External/cereal/unittests/valarray.hpp
deleted file mode 100644
index 19df153..0000000
--- a/Src/External/cereal/unittests/valarray.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-Copyright (c) 2014, Randolph Voorhies, Shane Grant
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-* Neither the name of cereal nor the
-names of its contributors may be used to endorse or promote products
-derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_VALARRAY_H_
-#define CEREAL_TEST_VALARRAY_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_valarray()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for (int ii = 0; ii<100; ++ii)
-  {
-    std::valarray<int> o_podvalarray(100);
-    for (auto & elem : o_podvalarray)
-      elem = random_value<int>(gen);
-
-    std::valarray<StructInternalSerialize> o_iservalarray(100);
-    for (auto & elem : o_iservalarray)
-      elem = StructInternalSerialize(random_value<int>(gen), random_value<int>(gen));
-
-    std::valarray<StructInternalSplit> o_isplvalarray(100);
-    for (auto & elem : o_isplvalarray)
-      elem = StructInternalSplit(random_value<int>(gen), random_value<int>(gen));
-
-    std::valarray<StructExternalSerialize> o_eservalarray(100);
-    for (auto & elem : o_eservalarray)
-      elem = StructExternalSerialize(random_value<int>(gen), random_value<int>(gen));
-
-    std::valarray<StructExternalSplit> o_esplvalarray(100);
-    for (auto & elem : o_esplvalarray)
-      elem = StructExternalSplit(random_value<int>(gen), random_value<int>(gen));
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podvalarray);
-      oar(o_iservalarray);
-      oar(o_isplvalarray);
-      oar(o_eservalarray);
-      oar(o_esplvalarray);
-    }
-
-    std::valarray<int> i_podvalarray;
-    std::valarray<StructInternalSerialize> i_iservalarray;
-    std::valarray<StructInternalSplit>     i_isplvalarray;
-    std::valarray<StructExternalSerialize> i_eservalarray;
-    std::valarray<StructExternalSplit>     i_esplvalarray;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podvalarray);
-      iar(i_iservalarray);
-      iar(i_isplvalarray);
-      iar(i_eservalarray);
-      iar(i_esplvalarray);
-    }
-
-    CHECK_EQ(i_podvalarray.size(), o_podvalarray.size());
-    CHECK_EQ(i_iservalarray.size(), o_iservalarray.size());
-    CHECK_EQ(i_isplvalarray.size(), o_isplvalarray.size());
-    CHECK_EQ(i_eservalarray.size(), o_eservalarray.size());
-    CHECK_EQ(i_esplvalarray.size(), o_esplvalarray.size());
-
-    check_collection(i_podvalarray , o_podvalarray );
-    check_collection(i_iservalarray, o_iservalarray);
-    check_collection(i_isplvalarray, o_isplvalarray);
-    check_collection(i_eservalarray, o_eservalarray);
-    check_collection(i_esplvalarray, o_esplvalarray);
-  }
-}
-
-#endif // CEREAL_TEST_VALARRAY_H_
diff --git a/Src/External/cereal/unittests/vector.cpp b/Src/External/cereal/unittests/vector.cpp
deleted file mode 100644
index be172ba..0000000
--- a/Src/External/cereal/unittests/vector.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "vector.hpp"
-
-TEST_SUITE("vector");
-
-TEST_CASE("binary_vector")
-{
-  test_vector<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_vector")
-{
-  test_vector<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_vector")
-{
-  test_vector<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_vector")
-{
-  test_vector<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/vector.hpp b/Src/External/cereal/unittests/vector.hpp
deleted file mode 100644
index a029790..0000000
--- a/Src/External/cereal/unittests/vector.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_VECTOR_H_
-#define CEREAL_TEST_VECTOR_H_
-#include "common.hpp"
-
-template <class IArchive, class OArchive> inline
-void test_vector()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  for(int ii=0; ii<100; ++ii)
-  {
-    std::vector<int> o_podvector(100);
-    for(auto & elem : o_podvector)
-      elem = random_value<int>(gen);
-
-    std::vector<bool> o_boolvector; o_boolvector.resize(100);
-    for( size_t i = 0; i < 100; ++i )
-      o_boolvector[i] = (random_value<int>(gen) % 2) == 0;
-
-    std::vector<StructInternalSerialize> o_iservector(100);
-    for(auto & elem : o_iservector)
-      elem = StructInternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::vector<StructInternalSplit> o_isplvector(100);
-    for(auto & elem : o_isplvector)
-      elem = StructInternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::vector<StructExternalSerialize> o_eservector(100);
-    for(auto & elem : o_eservector)
-      elem = StructExternalSerialize( random_value<int>(gen), random_value<int>(gen) );
-
-    std::vector<StructExternalSplit> o_esplvector(100);
-    for(auto & elem : o_esplvector)
-      elem = StructExternalSplit( random_value<int>(gen), random_value<int>(gen) );
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-
-      oar(o_podvector);
-      oar(o_boolvector);
-      oar(o_iservector);
-      oar(o_isplvector);
-      oar(o_eservector);
-      oar(o_esplvector);
-    }
-
-    std::vector<int> i_podvector;
-    std::vector<bool> i_boolvector;
-    std::vector<StructInternalSerialize> i_iservector;
-    std::vector<StructInternalSplit>     i_isplvector;
-    std::vector<StructExternalSerialize> i_eservector;
-    std::vector<StructExternalSplit>     i_esplvector;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-
-      iar(i_podvector);
-      iar(i_boolvector);
-      iar(i_iservector);
-      iar(i_isplvector);
-      iar(i_eservector);
-      iar(i_esplvector);
-    }
-
-    CHECK_EQ(i_podvector.size(),  o_podvector.size());
-    CHECK_EQ(i_boolvector.size(),  o_boolvector.size());
-    CHECK_EQ(i_iservector.size(), o_iservector.size());
-    CHECK_EQ(i_isplvector.size(), o_isplvector.size());
-    CHECK_EQ(i_eservector.size(), o_eservector.size());
-    CHECK_EQ(i_esplvector.size(), o_esplvector.size());
-
-    check_collection(i_podvector,  o_podvector );
-    check_collection(i_boolvector, o_boolvector);
-    check_collection(i_iservector, o_iservector);
-    check_collection(i_isplvector, o_isplvector);
-    check_collection(i_eservector, o_eservector);
-    check_collection(i_esplvector, o_esplvector);
-  }
-}
-
-#endif // CEREAL_TEST_VECTOR_H_
diff --git a/Src/External/cereal/unittests/versioning.cpp b/Src/External/cereal/unittests/versioning.cpp
deleted file mode 100644
index 8727426..0000000
--- a/Src/External/cereal/unittests/versioning.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "versioning.hpp"
-
-TEST_SUITE("versioning");
-
-TEST_CASE("binary_versioning")
-{
-  test_versioning<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_versioning")
-{
-  test_versioning<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_versioning")
-{
-  test_versioning<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_versioning")
-{
-  test_versioning<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-
-#if CEREAL_THREAD_SAFE
-TEST_CASE("binary_versioning_threading")
-{
-  test_versioning_threading<cereal::BinaryInputArchive, cereal::BinaryOutputArchive>();
-}
-
-TEST_CASE("portable_binary_versioning_threading")
-{
-  test_versioning_threading<cereal::PortableBinaryInputArchive, cereal::PortableBinaryOutputArchive>();
-}
-
-TEST_CASE("xml_versioning_threading")
-{
-  test_versioning_threading<cereal::XMLInputArchive, cereal::XMLOutputArchive>();
-}
-
-TEST_CASE("json_versioning_threading")
-{
-  test_versioning_threading<cereal::JSONInputArchive, cereal::JSONOutputArchive>();
-}
-#endif // CEREAL_THREAD_SAFE
-
-TEST_SUITE_END();
diff --git a/Src/External/cereal/unittests/versioning.hpp b/Src/External/cereal/unittests/versioning.hpp
deleted file mode 100644
index 33e21d2..0000000
--- a/Src/External/cereal/unittests/versioning.hpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_TEST_VERSIONING_H_
-#define CEREAL_TEST_VERSIONING_H_
-#include "common.hpp"
-
-#if CEREAL_THREAD_SAFE
-#include <future>
-#endif
-
-namespace Nested
-{
-  struct NestedClass
-  {
-    int x;
-
-    template <class Archive>
-    void serialize( Archive & ar )
-    { ar( x ); }
-  };
-}
-
-CEREAL_CLASS_VERSION( Nested::NestedClass, 1 )
-
-class VersionStructMS
-{
-  public:
-    bool x;
-    std::uint32_t v;
-
-  private:
-    friend class cereal::access;
-    template <class Archive>
-    void serialize( Archive & ar, std::uint32_t const version )
-    {
-      ar( x );
-      v = version;
-    }
-};
-
-struct VersionStructMSP
-{
-  uint8_t x;
-  std::uint32_t v;
-  template <class Archive>
-  void save( Archive & ar, std::uint32_t const /*version*/ ) const
-  {
-    ar( x );
-  }
-
-  template <class Archive>
-  void load( Archive & ar, std::uint32_t const version )
-  {
-    ar( x );
-    v = version;
-  }
-};
-
-struct VersionStructNMS
-{
-  std::int32_t x;
-  std::uint32_t v;
-};
-
-template <class Archive>
-void serialize( Archive & ar, VersionStructNMS & vnms, const std::uint32_t version )
-{
-  ar( vnms.x );
-  vnms.v = version;
-}
-
-struct VersionStructNMSP
-{
-  double x;
-  std::uint32_t v;
-};
-
-template <class Archive>
-void save( Archive & ar, VersionStructNMSP const & vnms, const std::uint32_t /*version*/ )
-{
-  ar( vnms.x );
-}
-
-template <class Archive>
-void load( Archive & ar, VersionStructNMSP & vnms, const std::uint32_t version )
-{
-  ar( vnms.x );
-  vnms.v = version;
-}
-
-CEREAL_CLASS_VERSION( VersionStructMSP, 33 )
-CEREAL_CLASS_VERSION( VersionStructNMS, 66 )
-CEREAL_CLASS_VERSION( VersionStructNMSP, 99 )
-
-template <class IArchive, class OArchive> inline
-void test_versioning()
-{
-  std::random_device rd;
-  std::mt19937 gen(rd());
-
-  #if CEREAL_THREAD_SAFE
-  #include <future>
-  static std::mutex testMutex;
-  #endif
-
-  for(size_t i=0; i<100; ++i)
-  {
-    VersionStructMS o_MS      = {random_value<uint8_t>(gen) % 2 ? true : false, 1};
-    VersionStructMSP o_MSP    = {random_value<uint8_t>(gen), 1};
-    VersionStructNMS o_NMS    = {random_value<int32_t>(gen), 1};
-    VersionStructNMSP o_NMSP  = {random_value<double>(gen), 1};
-    VersionStructMS o_MS2     = {random_value<uint8_t>(gen) % 2 ? true : false, 1};
-    VersionStructMSP o_MSP2   = {random_value<uint8_t>(gen), 1};
-    VersionStructNMS o_NMS2   = {random_value<int32_t>(gen), 1};
-    VersionStructNMSP o_NMSP2 = {random_value<double>(gen), 1};
-
-    std::ostringstream os;
-    {
-      OArchive oar(os);
-      oar( o_MS );
-      oar( o_MSP );
-      oar( o_NMS );
-      oar( o_NMSP );
-      oar( o_MS2 );
-      oar( o_MSP2 );
-      oar( o_NMS2 );
-      oar( o_NMSP2 );
-    }
-
-    decltype(o_MS) i_MS;
-    decltype(o_MSP) i_MSP;
-    decltype(o_NMS) i_NMS;
-    decltype(o_NMSP) i_NMSP;
-    decltype(o_MS2) i_MS2;
-    decltype(o_MSP2) i_MSP2;
-    decltype(o_NMS2) i_NMS2;
-    decltype(o_NMSP2) i_NMSP2;
-
-    std::istringstream is(os.str());
-    {
-      IArchive iar(is);
-      iar( i_MS );
-      iar( i_MSP );
-      iar( i_NMS );
-      iar( i_NMSP );
-      iar( i_MS2 );
-      iar( i_MSP2 );
-      iar( i_NMS2 );
-      iar( i_NMSP2 );
-    }
-
-    #if CEREAL_THREAD_SAFE
-    std::lock_guard<std::mutex> lock( testMutex );
-    #endif
-
-    CHECK_EQ(o_MS.x, i_MS.x);
-    CHECK_EQ(i_MS.v, 0u);
-    CHECK_EQ(o_MSP.x, i_MSP.x);
-    CHECK_EQ(i_MSP.v, 33u);
-    CHECK_EQ(o_NMS.x, i_NMS.x);
-    CHECK_EQ(i_NMS.v, 66u);
-    CHECK_EQ(o_NMSP.x, doctest::Approx(i_NMSP.x).epsilon(1e-5));
-    CHECK_EQ(i_NMSP.v, 99u);
-
-    CHECK_EQ(o_MS2.x, i_MS2.x);
-    CHECK_EQ(i_MS2.v, 0u);
-    CHECK_EQ(o_MSP2.x, i_MSP2.x);
-    CHECK_EQ(i_MSP2.v, 33u);
-    CHECK_EQ(o_NMS2.x, i_NMS2.x);
-    CHECK_EQ(i_NMS2.v, 66u);
-    CHECK_EQ(o_NMSP2.x, doctest::Approx(i_NMSP2.x).epsilon(1e-5));
-    CHECK_EQ(i_NMSP2.v, 99u);
-    }
-}
-
-#if CEREAL_THREAD_SAFE
-template <class IArchive, class OArchive> inline
-void test_versioning_threading()
-{
-  std::vector<std::future<bool>> pool;
-  for( size_t i = 0; i < 100; ++i )
-    pool.emplace_back( std::async( std::launch::async,
-                                   [](){ test_versioning<IArchive, OArchive>(); return true; } ) );
-
-  for( auto & future : pool )
-    future.wait();
-
-  for( auto & future : pool )
-    CHECK_UNARY( future.get() );
-}
-#endif // CEREAL_THREAD_SAFE
-
-#endif // CEREAL_TEST_VERSIONING_H_
diff --git a/Src/External/cereal/vs2013/.gitignore b/Src/External/cereal/vs2013/.gitignore
deleted file mode 100644
index c6eec7a..0000000
--- a/Src/External/cereal/vs2013/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*/Debug
-*/Release
-*/x64
diff --git a/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj b/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj
deleted file mode 100644
index 89da192..0000000
--- a/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DEBUG_VS2015|x64">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|Win32">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|x64">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DAC23DBB-630B-46B9-B115-F1449697898A}</ProjectGuid>
-    <RootNamespace>sandbox</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters b/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters
deleted file mode 100644
index 90e0f7d..0000000
--- a/Src/External/cereal/vs2013/sandbox/sandbox.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj b/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj
deleted file mode 100644
index fc18258..0000000
--- a/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DEBUG_VS2015|x64">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|Win32">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|x64">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_json.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{52E96EC3-125A-4525-BC72-F3C524F24640}</ProjectGuid>
-    <RootNamespace>sandbox_json</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters
deleted file mode 100644
index 3edef0a..0000000
--- a/Src/External/cereal/vs2013/sandbox_json/sandbox_json.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_json.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj b/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj
deleted file mode 100644
index 035a8ca..0000000
--- a/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DEBUG_VS2015|x64">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|Win32">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|x64">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_rtti.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C81EF3F9-7849-4506-898C-85D0D564CD6A}</ProjectGuid>
-    <RootNamespace>sandbox_rtti</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_54;$(IncludePath)</IncludePath>
-    <LibraryPath>C:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;C:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters
deleted file mode 100644
index 813de5f..0000000
--- a/Src/External/cereal/vs2013/sandbox_rtti/sandbox_rtti.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_rtti.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj b/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj
deleted file mode 100644
index 4615581..0000000
--- a/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DEBUG_VS2015|x64">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|Win32">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|x64">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}</ProjectGuid>
-    <RootNamespace>sandbox_vs</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Debug;E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Debug;E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\x64\Debug;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\x64\Debug;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Release;E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\Release;E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\x64\Release;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\sandbox_vs_dll;$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(SolutionDir)\..\sandbox\sandbox_shared_lib;$(IncludePath)</IncludePath>
-    <LibraryPath>$(SolutionDir)\x64\Release;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <TreatWarningAsError>false</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <TreatWarningAsError>false</TreatWarningAsError>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>sandbox_vs_dll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_vs.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters
deleted file mode 100644
index 70ecf39..0000000
--- a/Src/External/cereal/vs2013/sandbox_vs/sandbox_vs.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_vs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj b/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj
deleted file mode 100755
index a335650..0000000
--- a/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DEBUG_VS2015|x64">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|Win32">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|x64">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\base.cpp" />
-    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\derived.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\base.hpp" />
-    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\derived.hpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95D6662F-4166-40D2-87D7-CABFB60C199A}</ProjectGuid>
-    <RootNamespace>sandbox_vs_dll</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters b/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters
deleted file mode 100755
index d61909d..0000000
--- a/Src/External/cereal/vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\base.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\sandbox\sandbox_shared_lib\derived.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\base.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\sandbox\sandbox_shared_lib\derived.hpp">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/unittests/main.cpp b/Src/External/cereal/vs2013/unittests/main.cpp
deleted file mode 100755
index fa91267..0000000
--- a/Src/External/cereal/vs2013/unittests/main.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-  Copyright (c) 2014, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL RANDOLPH VOORHIES AND SHANE GRANT BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#define BOOST_TEST_MODULE Cereal
-#include <common.hpp>
-#include <boost/test/unit_test.hpp>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/unittests/unittests.vcxproj b/Src/External/cereal/vs2013/unittests/unittests.vcxproj
deleted file mode 100644
index d3c82ca..0000000
--- a/Src/External/cereal/vs2013/unittests/unittests.vcxproj
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DEBUG_VS2015|Win32">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DEBUG_VS2015|x64">
-      <Configuration>DEBUG_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|Win32">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_VS2015|x64">
-      <Configuration>Release_VS2015</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\unittests\array.cpp" />
-    <ClCompile Include="..\..\unittests\basic_string.cpp" />
-    <ClCompile Include="..\..\unittests\bitset.cpp" />
-    <ClCompile Include="..\..\unittests\chrono.cpp" />
-    <ClCompile Include="..\..\unittests\complex.cpp" />
-    <ClCompile Include="..\..\unittests\deque.cpp" />
-    <ClCompile Include="..\..\unittests\forward_list.cpp" />
-    <ClCompile Include="..\..\unittests\list.cpp" />
-    <ClCompile Include="..\..\unittests\load_construct.cpp" />
-    <ClCompile Include="..\..\unittests\map.cpp" />
-    <ClCompile Include="..\..\unittests\memory.cpp" />
-    <ClCompile Include="..\..\unittests\memory_cycles.cpp" />
-    <ClCompile Include="..\..\unittests\multimap.cpp" />
-    <ClCompile Include="..\..\unittests\multiset.cpp" />
-    <ClCompile Include="..\..\unittests\pair.cpp" />
-    <ClCompile Include="..\..\unittests\pod.cpp" />
-    <ClCompile Include="..\..\unittests\polymorphic.cpp" />
-    <ClCompile Include="..\..\unittests\portable_binary_archive.cpp" />
-    <ClCompile Include="..\..\unittests\priority_queue.cpp" />
-    <ClCompile Include="..\..\unittests\queue.cpp" />
-    <ClCompile Include="..\..\unittests\set.cpp" />
-    <ClCompile Include="..\..\unittests\stack.cpp" />
-    <ClCompile Include="..\..\unittests\structs.cpp" />
-    <ClCompile Include="..\..\unittests\structs_minimal.cpp" />
-    <ClCompile Include="..\..\unittests\structs_specialized.cpp" />
-    <ClCompile Include="..\..\unittests\tuple.cpp" />
-    <ClCompile Include="..\..\unittests\unordered_loads.cpp" />
-    <ClCompile Include="..\..\unittests\unordered_map.cpp" />
-    <ClCompile Include="..\..\unittests\unordered_multimap.cpp" />
-    <ClCompile Include="..\..\unittests\unordered_multiset.cpp" />
-    <ClCompile Include="..\..\unittests\unordered_set.cpp" />
-    <ClCompile Include="..\..\unittests\user_data_adapters.cpp" />
-    <ClCompile Include="..\..\unittests\vector.cpp" />
-    <ClCompile Include="..\..\unittests\valarray.cpp" />
-    <ClCompile Include="..\..\unittests\versioning.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}</ProjectGuid>
-    <RootNamespace>unittests</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <IncludePath>$(SolutionDir)\..\include;$(SolutionDir)\..\unittests;E:\Boost\include\boost-1_55;$(IncludePath)</IncludePath>
-    <LibraryPath>E:\Boost\lib\x64;$(LibraryPath)</LibraryPath>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <ShowProgress>NotSet</ShowProgress>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <EnablePREfast>false</EnablePREfast>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <EnablePREfast>false</EnablePREfast>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters b/Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters
deleted file mode 100644
index 902b535..0000000
--- a/Src/External/cereal/vs2013/unittests/unittests.vcxproj.filters
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\unittests\array.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\basic_string.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\bitset.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\chrono.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\complex.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\deque.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\forward_list.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\list.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\load_construct.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\memory.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\memory_cycles.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\multimap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\multiset.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\pair.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\pod.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\polymorphic.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\portable_binary_archive.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\priority_queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\queue.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\stack.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\structs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\structs_specialized.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\tuple.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\unordered_loads.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\unordered_map.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\unordered_multimap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\unordered_multiset.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\unordered_set.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\vector.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-     <ClCompile Include="..\..\unittests\valarray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\versioning.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\structs_minimal.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\unittests\user_data_adapters.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/Src/External/cereal/vs2013/vs2013.sln b/Src/External/cereal/vs2013/vs2013.sln
deleted file mode 100644
index d0ed26a..0000000
--- a/Src/External/cereal/vs2013/vs2013.sln
+++ /dev/null
@@ -1,147 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_vs", "sandbox_vs\sandbox_vs.vcxproj", "{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}"
-	ProjectSection(ProjectDependencies) = postProject
-		{95D6662F-4166-40D2-87D7-CABFB60C199A} = {95D6662F-4166-40D2-87D7-CABFB60C199A}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_json", "sandbox_json\sandbox_json.vcxproj", "{52E96EC3-125A-4525-BC72-F3C524F24640}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox", "sandbox\sandbox.vcxproj", "{DAC23DBB-630B-46B9-B115-F1449697898A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_rtti", "sandbox_rtti\sandbox_rtti.vcxproj", "{C81EF3F9-7849-4506-898C-85D0D564CD6A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittests", "unittests\unittests.vcxproj", "{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance", "performance\performance.vcxproj", "{2F374733-FCA8-4CBB-91A0-2B0B34393D86}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sandbox_vs_dll", "sandbox_vs_dll\sandbox_vs_dll.vcxproj", "{95D6662F-4166-40D2-87D7-CABFB60C199A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_VS2013|Win32 = Debug_VS2013|Win32
-		Debug_VS2013|x64 = Debug_VS2013|x64
-		Debug_VS2015|Win32 = Debug_VS2015|Win32
-		Debug_VS2015|x64 = Debug_VS2015|x64
-		Release_VS2013|Win32 = Release_VS2013|Win32
-		Release_VS2013|x64 = Release_VS2013|x64
-		Release_VS2015|Win32 = Release_VS2015|Win32
-		Release_VS2015|x64 = Release_VS2015|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2013|x64.Build.0 = Debug|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2013|x64.Build.0 = Release|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{A67E36D2-32BE-4D4D-BA2E-8FD59378E734}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2013|x64.Build.0 = Debug|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2013|x64.Build.0 = Release|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{52E96EC3-125A-4525-BC72-F3C524F24640}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2013|x64.Build.0 = Debug|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2013|x64.Build.0 = Release|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{DAC23DBB-630B-46B9-B115-F1449697898A}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2013|x64.Build.0 = Debug|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2013|x64.Build.0 = Release|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{C81EF3F9-7849-4506-898C-85D0D564CD6A}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2013|x64.Build.0 = Debug|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2013|x64.Build.0 = Release|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{D447E13A-97A4-4907-9F61-A9BCCDB91EF7}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{2F374733-FCA8-4CBB-91A0-2B0B34393D86}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2013|Win32.ActiveCfg = Debug|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2013|Win32.Build.0 = Debug|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2013|x64.ActiveCfg = Debug|x64
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|Win32.ActiveCfg = DEBUG_VS2015|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|Win32.Build.0 = DEBUG_VS2015|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|x64.ActiveCfg = DEBUG_VS2015|x64
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Debug_VS2015|x64.Build.0 = DEBUG_VS2015|x64
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2013|Win32.ActiveCfg = Release|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2013|Win32.Build.0 = Release|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2013|x64.ActiveCfg = Release|x64
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|Win32.ActiveCfg = Release_VS2015|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|Win32.Build.0 = Release_VS2015|Win32
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|x64.ActiveCfg = Release_VS2015|x64
-		{95D6662F-4166-40D2-87D7-CABFB60C199A}.Release_VS2015|x64.Build.0 = Release_VS2015|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Src/Scarab/.github/workflows/run_tests.yaml b/Src/Scarab/.github/workflows/run_tests.yaml
deleted file mode 100644
index 166527c..0000000
--- a/Src/Scarab/.github/workflows/run_tests.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-name: Run Tests
-
-on:
-  push:
-    branches: [ 'main', 'develop' ]
-  pull_request:
-
-  workflow_dispatch:
-
-jobs:
-
-  RunTests:
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        fail-fast: [false]
-        os: [ubuntu-20.04, macos-10.15]
-
-    steps:
-
-      - name: Checkout the repo 
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-
-      - name: Install dependencies -- Mac
-        if: startsWith(matrix.os, 'macos')
-        run: |
-          brew install \
-            boost \
-            pybind11 \
-            rabbitmq-c \
-            rapidjson \
-            yaml-cpp
-
-      - name: Install dependencies -- Linux
-        # pybind11 is manually installed because the minimum version is 2.6.2, and Ubuntu 20.04 only has v2.4.3
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          sudo apt-get update
-          DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
-            libboost-all-dev \
-            rapidjson-dev \
-            libyaml-cpp-dev
-          git clone https://github.com/pybind/pybind11.git
-          cd pybind11
-          git checkout v2.7.0
-          mkdir build
-          cd build
-          sudo cmake -DPYBIND11_TEST=FALSE ..
-          sudo make -j2 install
-
-      - name: Configure
-        run: |
-          mkdir build
-          cd build
-          cmake .. -DScarab_ENABLE_TESTING=TRUE -DScarab_BUILD_PYTHON=TRUE
-
-      - name: Build
-        run: |
-          cd build
-          make -j2 install
-
-      - name: Run tests
-        run: |
-          cd build
-          ctest --output-on-failure
diff --git a/Src/Scarab/.gitignore b/Src/Scarab/.gitignore
deleted file mode 100644
index 20eae96..0000000
--- a/Src/Scarab/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.swp
-
-# Eclipse
-.project
-.cproject
-
-# Build directories
-build*/
-
-# PackageBuilder test submodule
-testing/package_builder/PBTest/scarab
-testing/package_builder/NestedPBTest/PBTest
-testing/package_builder/NestedPBTest/scarab
diff --git a/Src/Scarab/.gitmodules b/Src/Scarab/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/.travis.yml b/Src/Scarab/.travis.yml
deleted file mode 100644
index 443bace..0000000
--- a/Src/Scarab/.travis.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-language: cpp
-
-stages:
-- name: Testing
-  if: branch = main OR 
-    branch = develop OR 
-    branch =~ /.*\.(?i:build)$/ OR 
-    type = pull_request 
-
-jobs:
-  include:
-  - stage: Testing
-    os: osx
-    compiler: clang
-    osx_image: xcode11.3
-    addons:
-      homebrew:
-        packages:
-        - rapidjson
-        - yaml-cpp
-        - pybind11
-#        update: true
-    before_install:
-    - mkdir build
-    install:
-    - cd build
-    - cmake .. -DScarab_ENABLE_TESTING=TRUE
-    - make -j2 install
-    script: testing/run_tests
-  - stage: Testing
-    os: linux
-    dist: focal
-    compiler: gcc
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        packages:
-        - python3-all
-        - libboost-all-dev
-        - rapidjson-dev
-        - libyaml-cpp-dev
-        - pybind11-dev
-    before_install:
-    - cmake --version
-    - export CC=gcc && export CXX=g++
-    - mkdir build
-    install:
-    - cd build
-    - cmake .. -DScarab_ENABLE_TESTING=TRUE -DPYTHON_EXECUTABLE=$(which python)
-    - make -j2 install
-    script: testing/run_tests
-  - stage: Testing
-    os: linux
-    dist: focal
-    compiler: clang
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        packages:
-        - python3-all
-        - libboost-all-dev
-        - rapidjson-dev
-        - libyaml-cpp-dev
-        - pybind11-dev
-    before_install:
-    - export CC=clang && export CXX=clang++
-    - mkdir build
-    install:
-    - cd build
-    - cmake .. -DScarab_ENABLE_TESTING=TRUE -DPYTHON_EXECUTABLE=$(which python)
-    - make -j2 install
-    script: testing/run_tests
diff --git a/Src/Scarab/AUTHORS b/Src/Scarab/AUTHORS
deleted file mode 100644
index f2e1dd6..0000000
--- a/Src/Scarab/AUTHORS
+++ /dev/null
@@ -1,12 +0,0 @@
-Authors and Copyright Holders for Scarab
-----------------------------------------
-
-Individuals
------------
-Benjamin H. LaRoque [1]
-Noah S. Oblath [1]
-
-
-Institutions
-------------
-1. Pacific Northwest National Laboratory, Richland, WA
diff --git a/Src/Scarab/CMakeLists.txt b/Src/Scarab/CMakeLists.txt
deleted file mode 100644
index 66cd219..0000000
--- a/Src/Scarab/CMakeLists.txt
+++ /dev/null
@@ -1,181 +0,0 @@
-# CMakeLists.txt for Scarab
-# Author: N. Oblath
-# Created: Jan 4, 2016
-
-# Minimum cmake verison 3.12 required for FindPython3
-cmake_minimum_required (VERSION 3.12)
-
-#########
-# setup #
-#########
-
-# load the version number from the Scarab/VERSION file
-file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION scarab_version_from_file )
-string( REPLACE " " "." scarab_version ${scarab_version_from_file} )
-
-cmake_policy( SET CMP0048 NEW ) # version in project()
-project( Scarab VERSION ${scarab_version} )
-
-list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
-include( PackageBuilder )
-
-
-##################
-# Scarab options #
-##################
-
-option( Scarab_BUILD_CODEC_JSON "Flag to enable building the JSON codec (requires Scarab_BUILD_PARAM)" TRUE )
-
-option( Scarab_BUILD_CODEC_YAML "Flag to enable building the YAML codec (requires Scarab_BUILD_PARAM)" TRUE )
-
-option( Scarab_BUILD_AUTHENTICATION "Flag to enable building of the authentication class (requires Scarab_BUILD_CODEC_JSON)" TRUE )
-
-option( Scarab_BUILD_PARAM "Flag to enable building of the param class" TRUE )
-
-option( Scarab_BUILD_CLI "Flag to enable the building of the command-line interface class" TRUE )
-
-option( Scarab_BUILD_PYTHON "Build python bindings" TRUE )
-
-if( (Scarab_BUILD_CODEC_JSON OR Scarab_BUILD_CODEC_MSGPACK OR Scarab_BUILD_CODEC_YAML OR Scarab_BUILD_AUTHENTICATION OR Scarab_BUILD_CLI) AND NOT Scarab_BUILD_PARAM )
-    message( FATAL_ERROR "Invalid combination of build options.  Building the Codecs, Authentication, and CLI requires Param.  If you want these elements, turn on Param.  If you want Param off, turn these elements off." )
-endif()
-
-if( Scarab_BUILD_AUTHENTICATION AND NOT Scarab_BUILD_CODEC_JSON )
-    message( FATAL_ERROR "Invalid combination of build options.  Building Authentication requires the JSON Codec.  If you want Authentication, turn on the JSON Codec.  If you want the JSON Codec off, turn Authentication off.")
-endif()
-
-if( Scarab_ENABLE_TESTING )
-    enable_testing()
-endif()
-
-# Scarab needs C++11
-set( CMAKE_CXX_STANDARD 11 )
-
-
-#######################
-# Scarab dependencies #
-#######################
-
-set( PUBLIC_EXT_LIBS )
-set( PRIVATE_EXT_LIBS )
-
-if( Scarab_BUILD_CODEC_JSON )
-    set( RAPIDJSON_FILE_BUFFER_SIZE 65536 CACHE STRING "Buffer size for reading and writing files using RapidJSON (in Bytes)" )
-    
-    add_definitions( -DRAPIDJSON_FILE_BUFFER_SIZE=${RAPIDJSON_FILE_BUFFER_SIZE} )
-    add_definitions( -DUSE_CODEC_JSON )
-    
-    find_package( RapidJSON 1.0 REQUIRED )
-
-    # The config file that comes with RapidJSON does not define an interface target, so we'll do so here.
-    # We use the name `rapidjson` to match the post-v1.1.0 version.
-    # The v1-1.1 include-dir variable is RAPIDJSON_INCLUDE_DIRS.
-    if( NOT TARGET rapidjson )
-        add_library(rapidjson INTERFACE IMPORTED)
-        set_target_properties(rapidjson PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${RAPIDJSON_INCLUDE_DIRS}"
-        )
-    endif()
-
-    list( APPEND PUBLIC_EXT_LIBS rapidjson )
-else( Scarab_BUILD_CODEC_JSON )
-    remove_definitions( -DUSE_CODEC_JSON )
-endif( Scarab_BUILD_CODEC_JSON )
-
-if( Scarab_BUILD_CODEC_YAML )
-    find_package( yaml-cpp CONFIG REQUIRED )
-
-    list( APPEND PUBLIC_EXT_LIBS yaml-cpp )
-
-    add_definitions( -DUSE_CODEC_YAML )
-else( Scarab_BUILD_CODEC_YAML )
-    removed_definitions( -DUSE_CODEC_YAML )
-endif( Scarab_BUILD_CODEC_YAML )
-
-# Create a cache variable for boost components that can be set from dependent projects
-set( Scarab_BOOST_COMPONENTS "${Scarab_BOOST_COMPONENTS};filesystem;system" CACHE INTERNAL "Boost components to be found by Scarab" )
-
-#list( APPEND Scarab_BOOST_COMPONENTS filesystem system )
-list( APPEND PUBLIC_EXT_LIBS Boost::filesystem )
-
-# making sure Scarab_BOOST_COMPONENTS is not empty and remove duplicate
-if( Scarab_BOOST_COMPONENTS )
-    list( REMOVE_DUPLICATES Scarab_BOOST_COMPONENTS )
-endif( Scarab_BOOST_COMPONENTS )
-
-# Boost (1.46 required for filesystem version 3)
-find_package( Boost 1.46.0 REQUIRED COMPONENTS ${Scarab_BOOST_COMPONENTS} )
-# make sure dynamic linking is assumed for all boost libraries
-set( Boost_USE_STATIC_LIBS OFF )
-set( Boost_USE_STATIC_RUNTIME OFF )
-set( Boost_ALL_DYN_LINK ON )
-    
-# For gethostname in version_semantic
-if( WIN32 )
-    pbuilder_add_ext_libraries( "Ws2_32.lib" )
-endif( WIN32 )
-
-# Pybind11
-if( Scarab_BUILD_PYTHON )
-    find_package( Python3 REQUIRED COMPONENTS Interpreter Development )
-    set(PYBIND11_PYTHON_VERSION ${Python3_VERSION} CACHE STRING "")
-    find_package( pybind11 REQUIRED )
-    #if( TARGET Python3::Python )
-    #    message( STATUS "%%%%% Found Python::Python" )
-    #else()
-    #    message( STATUS "%%%%% Did NOT find Python::Python" )
-    #endif()
-    include_directories( ${Python3_INCLUDE_DIRS} )
-endif( Scarab_BUILD_PYTHON )
-
-
-###################
-# Process options #
-###################
-
-pbuilder_prepare_project()
-
-
-########################
-# Build Scarab library #
-########################
-
-add_subdirectory( library )
-
-
-##########
-# Python #
-##########
-
-if( Scarab_BUILD_PYTHON )
-    list( APPEND Scarab_SOURCE_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/python )
-    add_subdirectory( python )
-endif( Scarab_BUILD_PYTHON )
-
-
-###############
-# Executables #
-###############
-
-if( Scarab_ENABLE_EXECUTABLES )
-    add_subdirectory( executables )
-endif( Scarab_ENABLE_EXECUTABLES )
-
-
-###########
-# Testing #
-###########
-
-if( Scarab_ENABLE_TESTING )
-    add_subdirectory( testing )
-endif()
-
-
-##################
-# Package Config #
-##################
-
-configure_file( ${PROJECT_SOURCE_DIR}/ScarabConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/ScarabConfig.cmake @ONLY )
-
-pbuilder_do_package_config()
-
diff --git a/Src/Scarab/LICENSE b/Src/Scarab/LICENSE
deleted file mode 100644
index 2edbae6..0000000
--- a/Src/Scarab/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) the Copyright Holders of Scarab and the Project 8 Collaboration, 2016.
-See the file AUTHORS for details on the copyright holders.
-All rights not expressly granted under this license are reserved.
-
-Installation, use, reproduction, display, modification and redistribution of this software, with or without modification, in source and binary forms, are permitted on a non-exclusive basis. Any exercise of rights by you under this license is subject to the following conditions:
-
-1. Redistributions of this software, in whole or in part, with or without modification, must reproduce the above copyright notice and these license conditions in this software, the user documentation and any other materials provided with the redistributed software.  By using, copying,  modifying or distributing the software (or any work based on the software) you agree to acknowledge its use in resulting scientific publications.
-
-2. The user documentation, if any, included with a redistribution, must include the following notice:
-"This product includes software developed by the Copyright Holders of Scarab and the Project 8 Collaboration"
-
-If that is where third-party acknowledgments normally appear, this acknowledgment must be reproduced in the modified version of this software itself.
- 
-3. The names "Scarab" and "Project 8" may not be used to endorse or promote software, or products derived therefrom, except with prior written permission by the Project 8 Collaboration. If this software is redistributed in modified form, the name and reference of the modified version must be clearly distinguishable from that of this software.
-
-4. You are under no obligation to provide anyone with any modifications of this software that you may develop, including but not limited to bug fixes, patches, upgrades or other enhancements or derivatives of the features, functionality or performance of this software. However, if you publish or distribute your modifications without contemporaneously requiring users to enter into a separate written license agreement, then you are deemed to have granted all Copyright Holders and members of the Project 8 Collaboration a license to your modifications, including modifications protected by any patent owned by you, under the conditions of this license.
-
-5. You may not include this software in whole or in part in any patent or patent application in respect of any modification of this software developed by you.
-
-6. DISCLAIMER
- 
-THIS SOFTWARE IS PROVIDED BY THE MEMBERS OF THE PROJECT 8 COLLABORATION AND THE COPYRIGHT HOLDERS OF THE NYMPH AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT HOLDERS AND THE PROJECT 8 COLLABORATION MAKE NO REPRESENTATION THAT THE SOFTWARE AND MODIFICATIONS THEREOF, WILL NOT INFRINGE ANY PATENT, COPYRIGHT, TRADE SECRET OR OTHER PROPRIETARY RIGHT.
-
-7. LIMITATION OF LIABILITY
-
-THE COPYRIGHT HOLDERS AND THE MEMBERS OF THE PROJECT 8 COLLABORATION SHALL HAVE NO LIABILITY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA OR PROFITS, OR BUSINESS INTERRUPTION, HOWEVER CAUSED AND ON ANY THEORY OF CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), PRODUCT LIABILITY OR OTHERWISE, ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-8. This license shall terminate with immediate effect and without notice if you fail to comply with any of the terms of this license, or if you institute litigation against any Copyright Holder or member of the Project 8 Collaboration with regard to this software.
diff --git a/Src/Scarab/README.md b/Src/Scarab/README.md
deleted file mode 100644
index 4ad1c26..0000000
--- a/Src/Scarab/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-Scarab includes a variety of utilities primarily aimed at the C++ packages developed by the Project 8 collaboration.
-
-It contains three main components:
-* cmake: common CMake modules and scripts
-  * PackageBuilder framework
-  * Find-module scripts for Eigen3, FFTW, ROOT, and Sphinx
-* Documentation
-  * C++ system
-  * Python system
-* library: C++ library of common utilities
-  * Param system
-  * Logger
-  * Authentication class
-  * A variety of utilities
-* python: Python bindings for a subset of the C++ library
-  * Requires pybind11 v2.3.0 or greater
diff --git a/Src/Scarab/ScarabConfig.cmake.in b/Src/Scarab/ScarabConfig.cmake.in
deleted file mode 100644
index e980ac1..0000000
--- a/Src/Scarab/ScarabConfig.cmake.in
+++ /dev/null
@@ -1,29 +0,0 @@
-# ScarabConfig.cmake
-
-get_filename_component( Scarab_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
-
-# Find the dependencies
-include( CMakeFindDependencyMacro )
-find_dependency( Boost 1.46 REQUIRED COMPONENTS @Scarab_BOOST_COMPONENTS@ )
-if( @Scarab_BUILD_CODEC_JSON@ ) #Scarab_BUILD_CODEC_JSON
-    find_dependency( RapidJSON REQUIRED )
-    if(NOT TARGET rapidjson)
-        add_library(rapidjson INTERFACE IMPORTED)
-        set_property(TARGET rapidjson PROPERTY  INTERFACE_INCLUDE_DIRECTORIES ${RapidJSON_INCLUDE_DIRS})
-    endif()
-endif()
-if( @Scarab_BUILD_CODEC_YAML@ ) # Scarab_BUILD_CODEC_YAML
-    find_dependency( yaml-cpp REQUIRED )
-endif()
-if( @Scarab_BUILD_PYTHON@ ) # Scarab_BUILD_PYTHON
-    find_dependency( Python REQUIRED COMPONENTS Development )
-endif()
-
-# Import library targets if it's not already present (usable at build time or as installed)
-if( NOT TARGET Scarab::@Scarab_FULL_TARGET_NAME@ )
-    if( TARGET @Scarab_FULL_TARGET_NAME@ )
-        add_library( Scarab::@Scarab_FULL_TARGET_NAME@ ALIAS @Scarab_FULL_TARGET_NAME@ )
-    else()
-        include( "${Scarab_CMAKE_DIR}/Scarab_Library_Targets.cmake" )
-    endif()
-endif()
diff --git a/Src/Scarab/VERSION b/Src/Scarab/VERSION
deleted file mode 100644
index 346c262..0000000
--- a/Src/Scarab/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3 9 1
diff --git a/Src/Scarab/cmake/FindEigen3.cmake b/Src/Scarab/cmake/FindEigen3.cmake
deleted file mode 100644
index 9bd3474..0000000
--- a/Src/Scarab/cmake/FindEigen3.cmake
+++ /dev/null
@@ -1,80 +0,0 @@
-# - Try to find Eigen3 lib
-#
-# This module supports requiring a minimum version, e.g. you can do
-#   find_package(Eigen3 3.1.2)
-# to require version 3.1.2 or newer of Eigen3.
-#
-# Once done this will define
-#
-#  EIGEN3_FOUND - system has eigen lib with correct version
-#  EIGEN3_INCLUDE_DIR - the eigen include directory
-#  EIGEN3_VERSION - eigen version
-
-# Copyright (c) 2006, 2007 Montel Laurent, <montel@kde.org>
-# Copyright (c) 2008, 2009 Gael Guennebaud, <g.gael@free.fr>
-# Copyright (c) 2009 Benoit Jacob <jacob.benoit.1@gmail.com>
-# Redistribution and use is allowed according to the terms of the 2-clause BSD license.
-
-if(NOT Eigen3_FIND_VERSION)
-  if(NOT Eigen3_FIND_VERSION_MAJOR)
-    set(Eigen3_FIND_VERSION_MAJOR 2)
-  endif(NOT Eigen3_FIND_VERSION_MAJOR)
-  if(NOT Eigen3_FIND_VERSION_MINOR)
-    set(Eigen3_FIND_VERSION_MINOR 91)
-  endif(NOT Eigen3_FIND_VERSION_MINOR)
-  if(NOT Eigen3_FIND_VERSION_PATCH)
-    set(Eigen3_FIND_VERSION_PATCH 0)
-  endif(NOT Eigen3_FIND_VERSION_PATCH)
-
-  set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}")
-endif(NOT Eigen3_FIND_VERSION)
-
-macro(_eigen3_check_version)
-  file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header)
-
-  string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}")
-  set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}")
-  string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}")
-  set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}")
-  string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}")
-  set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}")
-
-  set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION})
-  if(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-    set(EIGEN3_VERSION_OK FALSE)
-  else(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-    set(EIGEN3_VERSION_OK TRUE)
-  endif(${EIGEN3_VERSION} VERSION_LESS ${Eigen3_FIND_VERSION})
-
-  if(NOT EIGEN3_VERSION_OK)
-
-    message(STATUS "Eigen3 version ${EIGEN3_VERSION} found in ${EIGEN3_INCLUDE_DIR}, "
-                   "but at least version ${Eigen3_FIND_VERSION} is required")
-  endif(NOT EIGEN3_VERSION_OK)
-endmacro(_eigen3_check_version)
-
-if (EIGEN3_INCLUDE_DIR)
-
-  # in cache already
-  _eigen3_check_version()
-  set(EIGEN3_FOUND ${EIGEN3_VERSION_OK})
-
-else (EIGEN3_INCLUDE_DIR)
-
-  find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library
-      PATHS
-      ${CMAKE_INSTALL_PREFIX}/include
-      ${KDE4_INCLUDE_DIR}
-      PATH_SUFFIXES eigen3 eigen
-    )
-
-  if(EIGEN3_INCLUDE_DIR)
-    _eigen3_check_version()
-  endif(EIGEN3_INCLUDE_DIR)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK)
-
-  mark_as_advanced(EIGEN3_INCLUDE_DIR)
-
-endif(EIGEN3_INCLUDE_DIR)
\ No newline at end of file
diff --git a/Src/Scarab/cmake/FindFFTW.cmake b/Src/Scarab/cmake/FindFFTW.cmake
deleted file mode 100644
index 348c992..0000000
--- a/Src/Scarab/cmake/FindFFTW.cmake
+++ /dev/null
@@ -1,163 +0,0 @@
-# Find the FFTW includes and library.
-# 
-# The default and primary FFTW installation uses double-precision floating-point values.
-# FFTW can provide single- and long-double-precision versions as well.
-# 
-# The different versions of FFTW can be found using the COMPONENTS argument of find_package().
-# The available components are:
-#   DOUBLE
-#     NOTE: This is the default.  If you don't specify any COMPONENTS, this is what you'll get.
-#     include: fftw3.h
-#     lib: fftw3
-#     threads lib: fftw3_threads
-#   SINGLE
-#     include: fftw3.h
-#     lib: fftw3f
-#     threads lib: fftw3f_threads
-#   LONGDOUBLE
-#     include: fftw3.h
-#     lib: fftw3l
-#     threads lib: fftw3l_threads
-#
-# This module defines
-# FFTW_FOUND.  If true, you can use the FFTW routines
-# FFTW_INCLUDE_DIR, where to locate fftw3.h file
-# FFTW_LIBRARIES, the libraries to link against to use fftw3
-# FFTW_LIBRARY_DIRS, the directories containing the FFTW libraries
-# FFTW_THREADS_FOUND, If true, can use multithreaded FFTW routines
-# FFTW_THREADS_LIBRARIES, where to find the FFTW threads libraries
-#
-
-# The default component is DOUBLE
-# If the components list is empty, put "DOUBLE" in
-# Otherwise just use the components specified
-if( NOT FFTW_FIND_COMPONENTS )
-    list( APPEND FFTW_FIND_COMPONENTS "DOUBLE" )
-endif( NOT FFTW_FIND_COMPONENTS )
-message( STATUS "Will look for these FFTW components ${FFTW_FIND_COMPONENTS}" )
-
-set( FFTW_FOUND TRUE )
-set( FFTW_THREADS_FOUND TRUE )
-
-# The include file is the same for all FFTW components
-find_path( FFTW_INCLUDE_DIR fftw3.h
-    $ENV{FFTW_DIR}/include
-    $ENV{FFTW3} $ENV{FFTW3}/include $ENV{FFTW3}/api
-    /usr/local/include
-    /usr/include
-    /opt/fftw3/include
-    DOC "Find the directory containing fftw3.h"
-)
-
-if( NOT FFTW_INCLUDE_DIR )
-    message( WARNING "Did not find fftw3.h" )
-    set( FFTW_FOUND FALSE )
-endif( NOT FFTW_INCLUDE_DIR )
-
-set( FFTW_LIBRARY_DIRS )
-set( FFTW_LIBRARY )
-set( FFTW_LIBRARIES )
-
-# Loop over the requested components
-foreach( COMPONENT ${FFTW_FIND_COMPONENTS} )
-    string( TOUPPER ${COMPONENT} UPPERCOMPONENT )
-
-    if( COMPONENT STREQUAL "DOUBLE" )
-        message( STATUS "Looking for the double-precision FFTW library" )
-        set( LIB_NAMES fftw3 fftw3-3 )
-        set( THREAD_LIB_NAMES fftw3_threads fftw3-3_threads )
-    elseif( COMPONENT STREQUAL "SINGLE" )
-        message( STATUS "Looking for the single-precision FFTW library" )
-        set( LIB_NAMES fftw3f fftw3-3f )
-        set( THREAD_LIB_NAMES fftw3f_threads fftw3-3f_threads )
-    elseif( COMPONENT STREQUAL "LONGDOUBLE" )
-        message( STATUS "Looking for the long-double-precision FFTW library" )
-        set( LIB_NAMES fftw3l fftw3-3l )
-        set( THREAD_LIB_NAMES fftw3l_threads fftw3-3l_threads )
-    else()
-        message( WARNING "Invalid COMPONENT <${COMPONENT}> will be ignored" )
-        unset( LIB_NAMES )
-        unset( THREAD_LIB_NAMES )
-    endif()
-
-    if( LIB_NAMES AND THREAD_LIB_NAMES )
-
-        # FFTW library
-        unset( COMP_LIBRARY CACHE )
-        find_library( COMP_LIBRARY NAMES ${LIB_NAMES} PATHS
-            ${FFTW_LIBRARY_DIRS}
-            $ENV{FFTW_DIR}/lib
-            $ENV{FFTW3} $ENV{FFTW3}/lib $ENV{FFTW3}/.libs
-            /usr/local/lib
-            /usr/lib 
-            /opt/local/lib
-            /opt/fftw3/lib
-            DOC "Find the fftw3 library"
-        )
-        
-        if( COMP_LIBRARY )
-            list( APPEND FFTW_LIBRARIES ${COMP_LIBRARY} )
-            get_filename_component( LIBRARY_DIR ${COMP_LIBRARY} DIRECTORY )
-            list( APPEND FFTW_LIBRARY_DIRS ${LIBRARY_DIR} )
-        else( COMP_LIBRARY )
-            message( WARNING "Did not find the FFTW library" )
-            set( FFTW_FOUND FALSE )
-        endif( COMP_LIBRARY )
-            
-        # Threads library
-        unset( COMP_THREADS_LIBRARY CACHE )
-        find_library( COMP_THREADS_LIBRARY NAMES ${THREAD_LIB_NAMES} PATHS
-            ${FFTW_LIBRARY_DIRS}
-            $ENV{FFTW_DIR}/lib
-            $ENV{FFTW3} $ENV{FFTW3}/lib $ENV{FFTW3}/.libs
-            /usr/local/lib
-            /usr/lib 
-            /opt/local/lib
-            /opt/fftw3/lib
-            DOC "Specify the fftw3 threads library here."
-        )
-    
-        if( COMP_THREADS_LIBRARY )
-            list( APPEND FFTW_THREADS_LIBRARIES ${COMP_THREADS_LIBRARY} )
-            get_filename_component( LIBRARY_DIR ${COMP_THREADS_LIBRARY} DIRECTORY )
-            list( APPEND FFTW_LIBRARY_DIRS ${LIBRARY_DIR} )
-        else( COMP_THREADS_LIBRARY )
-            message( WARNING "Did not find the FFTW threads library" )
-            set( FFTW_THREADS_FOUND FALSE )
-        endif( COMP_THREADS_LIBRARY )
-    
-        # get a thread library if necessary (not necessary for C++11 if using std::threads)
-        if( FFTW_THREADS_FOUND )
-            find_package( Threads )
-            # since a library is not necessary under C++11, sometimes there won't be one here
-            if( CMAKE_THREAD_LIBS_INIT )
-                list( APPEND FFTW_THREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
-                get_filename_component( LIBRARY_DIR ${CMAKE_THREAD_LIBS_INIT} DIRECTORY )
-                list( APPEND FFTW_LIBRARY_DIRS ${LIBRARY_DIR} )
-            endif( CMAKE_THREAD_LIBS_INIT )
-        endif( FFTW_THREADS_FOUND )
-         
-    endif( LIB_NAMES AND THREAD_LIB_NAMES )   
-endforeach( COMPONENT ${FFTW_FIND_COMPONENTS} )
-
-list( REMOVE_DUPLICATES FFTW_LIBRARY_DIRS )
-
-# Wrap up
-if( FFTW_FOUND )
-  if( NOT FFTW_FIND_QUIETLY )
-     message( STATUS "Found fftw3 includes at ${FFTW_INCLUDE_DIR}" )
-     message( STATUS "Found fftw3 libraries: ${FFTW_LIBRARIES}" )
-     message( STATUS "Found fftw3 libraries at ${FFTW_LIBRARY_DIRS}" )
-  endif()
-endif( FFTW_FOUND )
-  
-if( FFTW_THREADS_FOUND )
-    if( NOT FFTW_FIND_QUIETLY )
-        message( STATUS "Found fftw3 threads and threads libraries at ${FFTW_THREADS_LIBRARIES}" )
-    endif( NOT FFTW_FIND_QUIETLY )
-endif( FFTW_THREADS_FOUND )
-
-mark_as_advanced(FFTW_FOUND FFTW_LIBRARIES FFTW_INCLUDE_DIR FFTW_LIBRARY_DIRS FFTW_THREADS_FOUND)
-if( FFTW_THREADS_FOUND )
-  mark_as_advanced(FFTW_THREADS_LIBRARIES)
-endif( FFTW_THREADS_FOUND )
diff --git a/Src/Scarab/cmake/FindSphinx.cmake b/Src/Scarab/cmake/FindSphinx.cmake
deleted file mode 100644
index 267764b..0000000
--- a/Src/Scarab/cmake/FindSphinx.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-find_program(SPHINX_EXECUTABLE NAMES sphinx-build
-    HINTS
-    $ENV{SPHINX_DIR}
-    PATH_SUFFIXES bin
-    DOC "Sphinx documentation generator"
-)
-
-include(FindPackageHandleStandardArgs)
-
-find_package_handle_standard_args(Sphinx DEFAULT_MSG
-    SPHINX_EXECUTABLE
-)
-
-mark_as_advanced(SPHINX_EXECUTABLE)
diff --git a/Src/Scarab/cmake/GetVersion.cmake b/Src/Scarab/cmake/GetVersion.cmake
deleted file mode 100644
index 5865697..0000000
--- a/Src/Scarab/cmake/GetVersion.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# GetVersion.cmake
-# Author: N. Oblath
-#
-# Usage in top CMakeLists.txt: include GetVersion.cmake
-#
-# Expects the version to be in the file VERSION in the top source directory, 
-# with the major version, minor version, and revision numbers as the only 
-# contents of the file, separated by spaces.
-#
-# Sets the following variables:
-#   PROJECT_VERSION_MAJOR
-#   PROJECT_VERSION_MINOR
-#   PROJECT_REVISION
-
-
-# Make sure we have the VERSION file
-find_file( VERSION_FILE VERSION ${CMAKE_CURRENT_SOURCE_DIR} NO_DEFAULT_PATH )
-if( NOT EXISTS ${VERSION_FILE} )
-    message( FATAL_ERROR "Did not find VERSION file" )
-endif( NOT EXISTS ${VERSION_FILE} )
-
-# Read the contents of VERSION
-file( READ ${VERSION_FILE} VERSION_STRING )
-
-# Parse the version string into a list
-separate_arguments( VERSION_LIST UNIX_COMMAND ${VERSION_STRING} )
-
-# Put the version numbers into separate variables
-list( GET VERSION_LIST 0 PROJECT_VERSION_MAJOR )
-list( GET VERSION_LIST 1 PROJECT_VERSION_MINOR )
-list( GET VERSION_LIST 2 PROJECT_REVISION )
-
-message( STATUS "Project version: ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_REVISION}")
diff --git a/Src/Scarab/cmake/PackageBuilder.cmake b/Src/Scarab/cmake/PackageBuilder.cmake
deleted file mode 100644
index 2ba4806..0000000
--- a/Src/Scarab/cmake/PackageBuilder.cmake
+++ /dev/null
@@ -1,171 +0,0 @@
-# PackageBuilder.cmake
-# Author: Noah Oblath
-#
-# Default settings and macros for PackageBuilder builds
-#
-# Parts of this script are based on work done by Sebastian Voecking and Marco Haag in the Kasper package
-#
-# Requires: CMake v3.12 or better (FindPython3)
-
-# CMake policies
-cmake_policy( SET CMP0011 NEW )
-cmake_policy( SET CMP0012 NEW ) # how if-statements work
-cmake_policy( SET CMP0042 NEW ) # rpath on mac os x
-cmake_policy( SET CMP0048 NEW ) # version in project()
-
-include ( PackageBuilderMacros )
-
-include( CMakeParseArguments ) # required until cmake v3.5, when this was added as a built-in command
-
-# check if this is a stand-alone build
-set( PBUILDER_STANDALONE FALSE CACHE INTERNAL "Flag for whether or not this is a stand-alone build" )
-set( PBUILDER_CHILD_NAME_EXTENSION "${PROJECT_NAME}" CACHE INTERNAL "Submodule library name modifier" )
-if( ${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} )
-    set( PBUILDER_STANDALONE TRUE )
-    
-    if( CMAKE_GENERATOR MATCHES ".*(Make|Ninja).*" AND NOT CMAKE_BUILD_TYPE )
-  		set( CMAKE_BUILD_TYPE "DEBUG" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel" FORCE )
-  		message( STATUS "CMAKE_BUILD_TYPE not specified. Using ${CMAKE_BUILD_TYPE} build" )
-    endif()
-
-    # option to force linking when using g++
-    if( CMAKE_COMPILER_IS_GNUCXX )
-        option( GCC_FORCE_LINKING "Fix linker errors with some GCC versions by adding the --no-as-needed flag" ON )
-        if( GCC_FORCE_LINKING )
-            set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed" )
-        endif( GCC_FORCE_LINKING )
-    endif( CMAKE_COMPILER_IS_GNUCXX )
-endif( ${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR} )
-
-# define a variable pointing to the directory containing this file
-set( PBUILDER_DIR ${CMAKE_CURRENT_LIST_DIR} )
-
-# preprocessor defintion for debug build
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
-    add_definitions(-D${PROJECT_NAME}_DEBUG )
-else( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
-    remove_definitions(-D${PROJECT_NAME}_DEBUG )    
-endif( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
-
-message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
-
-# Setup the default install prefix
-# This gets set to the binary directory upon first configuring.
-# If the user changes the prefix, but leaves the flag OFF, then it will remain as the user specified.
-# If the user wants to reset the prefix to the default (i.e. the binary directory), then the flag should be set ON.
-if( NOT DEFINED SET_INSTALL_PREFIX_TO_DEFAULT )
-    set( SET_INSTALL_PREFIX_TO_DEFAULT ON )
-endif( NOT DEFINED SET_INSTALL_PREFIX_TO_DEFAULT )
-if( SET_INSTALL_PREFIX_TO_DEFAULT )
-    set( CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR} CACHE PATH "Install prefix" FORCE )
-    set( SET_INSTALL_PREFIX_TO_DEFAULT OFF CACHE BOOL "Reset default install path when when configuring" FORCE )
-endif( SET_INSTALL_PREFIX_TO_DEFAULT )
-
-# install subdirectories
-set( INCLUDE_INSTALL_SUBDIR "include/${PROJECT_NAME}" CACHE PATH "Install subdirectory for headers" )
-if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
-    set( LIB_INSTALL_SUBDIR "bin" CACHE PATH "Install subdirectory for libraries" )
-else( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
-    set( LIB_INSTALL_SUBDIR "lib" CACHE PATH "Install subdirectory for libraries" )
-endif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
-set( PACKAGE_CONFIG_SUBDIR "${LIB_INSTALL_SUBDIR}/cmake/${PROJECT_NAME}" CACHE PATH "Install subdirectory for CMake config files" )
-set( BIN_INSTALL_SUBDIR "bin" CACHE PATH "Install subdirectory for binaries" )
-set( CONFIG_INSTALL_SUBDIR "config" CACHE PATH "Install subdirectory for config files" )
-set( DATA_INSTALL_SUBDIR "data" CACHE PATH "Install subdirectory for data files" )
-
-set( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_SUBDIR}" )
-set( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_SUBDIR}" )
-set( PACKAGE_CONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}/${PACKAGE_CONFIG_SUBDIR}" )
-set( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_SUBDIR}" )
-set( CONFIG_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_SUBDIR}" )
-set( DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_SUBDIR}" )
-
-#if( NOT DEFINED TOP_PROJECT_INCLUDE_INSTALL_DIR )
-if( PBUILDER_STANDALONE )
-    # this is for standalone builds, but has to be done down here rather than in the standalone if block above
-    set( TOP_PROJECT_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}" CACHE INTERNAL "Top-project include installation path" )
-    set( TOP_PROJECT_INCLUDE_INSTALL_SUBDIR "${INCLUDE_INSTALL_SUBDIR}" CACHE INTERNAL "Top-project include installation subdirectory" )
-    message( STATUS "TOP_PROJECT_INCLUDE_INSTALL_DIR being set to ${TOP_PROJECT_INCLUDE_INSTALL_DIR}" )
-
-    set( TOP_PROJECT_CMAKE_CONFIG_DIR "${PACKAGE_CONFIG_PREFIX}" CACHE INTERNAL "Top-project CMake config installation path" )
-    message( STATUS "TOP_PROJECT_CMAKE_CONFIG_DIR being set to ${TOP_PROJECT_CMAKE_CONFIG_DIR}" )
-    set( ${PROJECT_NAME}_CMAKE_CONFIG_DIR "${PACKAGE_CONFIG_PREFIX}" CACHE INTERNAL "${PROJECT_NAME} CMake config installation path" )
-    message( STATUS "${PROJECT_NAME}_CMAKE_CONFIG_DIR being set to ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}" )
-endif()
-
-
-# flag for building test programs
-option( ${PROJECT_NAME}_ENABLE_TESTING "Turn on or off the building of test programs" OFF )
-
-# flag for building executables (other than test programs)
-# this is particularly useful if a project is used multiple times and installed in a general location, where executables would overwrite each other.
-option( ${PROJECT_NAME}_ENABLE_EXECUTABLES "Turn on or off the building of executables (other than test programs)" ON )
-
-# default version of C++
-# acceptable values are any used by the CXX_STANDARD property of your CMake
-set( CMAKE_CXX_STANDARD 11 )
-
-# build shared libraries
-set( BUILD_SHARED_LIBS ON )
-
-# turn on RPATH for Mac OSX
-set( CMAKE_MACOSX_RPATH ON )
-
-# add the library install directory to the rpath
-SET(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" )
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
-
-set( LIB_POSTFIX )
-set( INC_PREFIX )
-
-# in windows, disable the min and max macros
-if( WIN32 )
-    # disable the min and max macros
-    add_definitions( -DNOMINMAX )
-	# libraries and linking
-	set( CMAKE_SHARED_LIBRARY_PREFIX "" )
-	set( CMAKE_IMPORT_LIBRARY_PREFIX "" )
-	set( CMAKE_LINK_DEF_FILE_FLAG "" )
-	add_definitions( -DBOOST_ALL_DYN_LINK )
-endif( WIN32 )
-
-# default package name is the project name
-set( ${PROJECT_NAME}_PACKAGE_NAME "${PROJECT_NAME}" )
-
-# Full project name, expanded according to the submodule hierarchy
-pbuilder_expand_lib_name( ${PROJECT_NAME} )
-set( ${PROJECT_NAME}_FULL_PROJECT_NAME ${FULL_LIB_NAME} )
-message( STATUS "Full project name: ${PROJECT_NAME}_FULL_PROJECT_NAME = ${${PROJECT_NAME}_FULL_PROJECT_NAME}" )
-
-# if git is used, get the commit SHA1
-find_package( Git )
-if( GIT_FOUND )
-    # check whether this is a git repo
-    execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-git-dir WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE IS_GIT_REPO )
-    if( IS_GIT_REPO )
-        execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse -q HEAD  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE ${PROJECT_NAME}_GIT_COMMIT  OUTPUT_STRIP_TRAILING_WHITESPACE )
-        execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --long  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE ${PROJECT_NAME}_GIT_DESCRIBE  OUTPUT_STRIP_TRAILING_WHITESPACE )
-        execute_process( COMMAND ${GIT_EXECUTABLE} remote get-url origin WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE GIT_ORIGIN OUTPUT_STRIP_TRAILING_WHITESPACE )
-        if( GIT_ORIGIN )
-            message( STATUS "Git origin: ${GIT_ORIGIN}")
-            string( REGEX MATCH "[a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+$" GIT_PACKAGE ${GIT_ORIGIN} )
-        else( GIT_ORIGIN )
-            execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --show-toplevel WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE TOP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE )
-            execute_process( COMMAND basename ${TOP_DIR} OUTPUT_VARIABLE GIT_PACKAGE )
-        endif( GIT_ORIGIN )
-        message( STATUS "Git package: ${GIT_PACKAGE}" )
-
-        # override package name with git package
-        set( ${PROJECT_NAME}_PACKAGE_NAME "${GIT_PACKAGE}" )
-    endif( IS_GIT_REPO )
-endif( GIT_FOUND )
-# check if we set the _PACKAGE_NAME variable; if we didn't, then we'll use an alternate setting
-if( NOT ${PROJECT_NAME}_PACKAGE_NAME )
-    set( ${PROJECT_NAME}_PACKAGE_NAME "${PROJECT_NAME}" )
-endif()
-
-# define the variables to describe the package (will go in the [ProjectName]Config.hh file)
-set( ${PROJECT_NAME}_PACKAGE_STRING "${PROJECT_NAME} ${${PROJECT_NAME}_VERSION}" )
diff --git a/Src/Scarab/cmake/PackageBuilderMacros.cmake b/Src/Scarab/cmake/PackageBuilderMacros.cmake
deleted file mode 100644
index 728706f..0000000
--- a/Src/Scarab/cmake/PackageBuilderMacros.cmake
+++ /dev/null
@@ -1,541 +0,0 @@
-# PackageBuilderMacros.cmake
-# Author: Noah Oblath
-#
-# Convenient macros for PackageBuilder builds
-#
-# Requires: CMake v3.12 or better (FindPython3)
-
-# Conveniece function for overriding the value of an option (aka a cached bool variable)
-macro( set_option VARIABLE VALUE )
-    set( ${VARIABLE} ${VALUE} CACHE BOOL "" FORCE )
-endmacro()
-
-# This should be called after setting options, and before adding submodules and building the project
-macro( pbuilder_prepare_project )
-
-    # Deprecated C++ version options
-    if( DEFINED USE_CPP17 )
-        message( AUTHOR_WARNING "USE_CPP%% variables are deprecated as of Scarab v3.4; Please set CMAKE_CXX_STANDARD directly" )
-        set( CMAKE_CXX_STANDARD 17 )
-    elseif( DEFINED USE_CPP14 )
-        message( AUTHOR_WARNING "USE_CPP%% variables are deprecated as of Scarab v3.4; Please set CMAKE_CXX_STANDARD directly" )
-        set( CMAKE_CXX_STANDARD 14 )
-    elseif( DEFINED USE_CPP11 )
-        message( AUTHOR_WARNING "USE_CPP%% variables are deprecated as of Scarab v3.4; Please set CMAKE_CXX_STANDARD directly" )
-        set( CMAKE_CXX_STANDARD 11 )
-    endif()
-
-    # Add/remove C++ version macros
-    if( CMAKE_CXX_STANDARD GREATER 20 AND NOT CMAKE_CXX_STANDARD EQUAL 98 )
-        add_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
-        message( AUTHOR_WARNING "PackageBuilder does not currently include \"USE_CPP%%\" macros for higher that C++20" )
-    elseif( CMAKE_CXX_STANDARD EQUAL 20 )
-        add_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
-    elseif( CMAKE_CXX_STANDARD EQUAL 17 )
-        remove_definitions( -DUSE_CPP20 )
-        add_definitions( -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
-    elseif( CMAKE_CXX_STANDARD EQUAL 14 )
-        remove_definitions( -DUSE_CPP20 -DUSE_CPP17 )
-        add_definitions( -DUSE_CPP14 -DUSE_CPP11 )
-    elseif( CMAKE_CXX_STANDARD EQUAL 11 )
-        remove_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 )
-        add_definitions( -DUSE_CPP11 )
-    elseif( CMAKE_CXX_STANDARD EQUAL 98 )
-        remove_definitions( -DUSE_CPP20 -DUSE_CPP17 -DUSE_CPP14 -DUSE_CPP11 )
-    endif()
-
-
-endmacro()
-
-macro( pbuilder_add_submodule SM_NAME SM_LOCATION )
-    if( NOT IS_ABSOLUTE ${SM_LOCATION} )
-        set( SM_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}/${SM_LOCATION}" )
-    endif()
-
-    # Conditions that let us in this loop:
-    #  1. Submodule SM_NAME has not yet been found
-    #  2. This is the location of the submodule SM_NAME
-    message( STATUS "${SM_NAME}_LOCATION: ${${SM_NAME}_LOCATION}" )
-    message( STATUS "CMAKE_CURRENT_LIST_DIR/SM_LOCATION: ${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
-    if( NOT ${SM_NAME}_FOUND OR "${${SM_NAME}_LOCATION}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
-        message( "Adding submodule ${SM_NAME} in location ${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
-
-        set( ${SM_NAME}_FOUND TRUE CACHE INTERNAL "" )
-        set( ${SM_NAME}_LOCATION ${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION} CACHE INTERNAL "" )
-        set( ${SM_NAME}_BINARY_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION} CACHE INTERNAL "" )
-
-        # Determine the library name suffix for this submodule with respect to its parent if it's not already defined
-        if( NOT DEFINED ${SM_NAME}_PARENT_LIB_NAME_SUFFIX )
-            set( ${SM_NAME}_PARENT_LIB_NAME_SUFFIX "_${PROJECT_NAME}${${PROJECT_NAME}_PARENT_LIB_NAME_SUFFIX}" CACHE INTERNAL "Scoped library name suffix for submodule ${SM_NAME}" )
-            message( STATUS "PARENT_LIB_NAME_SUFFIX being set for SM ${SM_NAME}: ${${SM_NAME}_PARENT_LIB_NAME_SUFFIX}" )
-        endif()
-
-        # Set submodule include subdirectory
-        set( SM_INCLUDE_SUBDIR "/${SM_NAME}" )
-        message( STATUS "Include files for submodule ${SM_NAME} will be installed in ${TOP_PROJECT_INCLUDE_INSTALL_DIR}${SM_INCLUDE_SUBDIR}" )
-
-        # Set CMake config subdirectory
-        set( ${SM_NAME}_CMAKE_CONFIG_DIR "${PACKAGE_CONFIG_PREFIX}/${SM_NAME}" CACHE INTERNAL "${SM_NAME} CMake config installation path" )
-    
-        message( STATUS "SM ${SM_NAME} cached variables:" )
-        message( STATUS "${SM_NAME}_FOUND: ${${SM_NAME}_FOUND}" )
-        message( STATUS "${SM_NAME}_LOCATION: ${${SM_NAME}_LOCATION}" )
-        message( STATUS "${SM_NAME}_BINARY_LOCATION: ${${SM_NAME}_BINARY_LOCATION}" )
-        message( STATUS "${SM_NAME}_PARENT_LIB_NAME_SUFFIX: ${${SM_NAME}_PARENT_LIB_NAME_SUFFIX}")
-        message( STATUS "${SM_NAME}_CMAKE_CONFIG_DIR: ${${SM_NAME}_CMAKE_CONFIG_DIR}" )
-
-        message( STATUS "Proceeding into subdirectory: ${SM_LOCATION}" )
-        add_subdirectory( ${SM_LOCATION} )
-
-        if( EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION}/${SM_NAME}Config.cmake )
-            message( STATUS "Loading config file for submodule ${SM_NAME}" )
-            include( ${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION}/${SM_NAME}Config.cmake )
-        else()
-            message( STATUS "No config file present for submodule ${SM_NAME} (${CMAKE_CURRENT_BINARY_DIR}/${SM_LOCATION}/${SM_NAME}Config.cmake)" )
-        endif()
-
-        # Need to unset the submodule subdirectories since we're in a macro
-        unset( SM_INCLUDE_SUBDIR )
-        unset( SM_CMAKE_CONFIG_SUBDIR )
-
-    endif( NOT ${SM_NAME}_FOUND OR "${${SM_NAME}_LOCATION}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}/${SM_LOCATION}" )
-endmacro()
-
-macro( pbuilder_expand_lib_name_2 LIB_NAME SM_NAME )
-    # Output is in the form of the variable FULL_LIB_NAME
-    set( FULL_LIB_NAME "${LIB_NAME}${${SM_NAME}_PARENT_LIB_NAME_SUFFIX}" )
-endmacro()
-
-macro( pbuilder_expand_lib_name LIB_NAME )
-    # Output is in the form of the variable FULL_LIB_NAME
-    pbuilder_expand_lib_name_2( ${LIB_NAME} ${PROJECT_NAME} )
-endmacro()
-
-macro( pbuilder_expand_lib_names )
-    # Supply library targets as additional macro arguments
-    # Output is in the form of the variable FULL_LIB_NAMES
-    set( LIB_NAMES ${ARGN} )
-    #message( STATUS "expanding these project libraries: ${LIB_NAMES}" )
-    set( FULL_LIB_NAMES )
-    foreach( lib ${LIB_NAMES} )
-        pbuilder_expand_lib_name( ${lib} )
-        list( APPEND FULL_LIB_NAMES ${FULL_LIB_NAME} )
-    endforeach( lib )
-    message( STATUS "expanded to full project library names: ${FULL_LIB_NAMES}" )
-endmacro()
-
-macro( pbuilder_use_sm_library LIB_NAME SM_NAME )
-    pbuilder_expand_lib_name_2( ${LIB_NAME} ${SM_NAME} )
-    list( APPEND ${PROJECT_NAME}_SM_LIBRARIES ${FULL_LIB_NAME} )
-    #message( STATUS "Added SM library ${FULL_LIB_NAME} to ${PROJECT_NAME}_SM_LIBRARIES" )
-endmacro()
-
-function( pbuilder_library )
-    # Builds a shared-object library
-    #
-    # Combines pbuilder_add_library() and pbuilder_link_library()
-    #
-    # Parameters:
-    #     TARGET: library target name
-    #     SOURCES: source files to include
-    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
-    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
-    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
-    #     COMPILE_DEFINITIONS: compile definitions to add to this target
-
-    set( OPTIONS )
-    set( ONEVALUEARGS TARGET )
-    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES COMPILE_DEFINITIONS )
-    cmake_parse_arguments( LIB "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
-
-    message( "Building library ${LIB_TARGET}" )
-    message( STATUS "${PROJECT_NAME}_PARENT_LIB_NAME_SUFFIX is ${${PROJECT_NAME}_PARENT_LIB_NAME_SUFFIX}" )
-
-    pbuilder_add_library(
-        TARGET ${LIB_TARGET}
-        SOURCES ${LIB_SOURCES}
-    )
-
-    pbuilder_link_library(
-        TARGET ${LIB_TARGET}
-        PROJECT_LIBRARIES ${LIB_PROJECT_LIBRARIES}
-        PUBLIC_EXTERNAL_LIBRARIES ${LIB_PUBLIC_EXTERNAL_LIBRARIES}
-        PRIVATE_EXTERNAL_LIBRARIES ${LIB_PRIVATE_EXTERNAL_LIBRARIES}
-        COMPILE_DEFINITIONS ${LIB_COMPILE_DEFINITIONS}
-    )
-
-endfunction()
-
-function( pbuilder_add_library )
-    # Adding a shared-object library
-    #
-    # Parameters:
-    #     TARGET: library target name
-    #     SOURCES: source files to include
-
-    set( OPTIONS )
-    set( ONEVALUEARGS TARGET )
-    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES COMPILE_DEFINITIONS )
-    cmake_parse_arguments( LIB "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
-
-    message( "Adding library ${LIB_TARGET}" )
-
-    pbuilder_expand_lib_name( ${LIB_TARGET} )
-    set( FULL_LIB_TARGET ${FULL_LIB_NAME} )
-    set( ${LIB_TARGET}_FULL_TARGET_NAME  ${FULL_LIB_NAME} CACHE INTERNAL "Full target name for library ${LIB_TARGET}" )
-    message( STATUS "lib target: ${LIB_TARGET}" )
-    message( STATUS "full lib target: ${FULL_LIB_TARGET}" )
-    message( STATUS "internal cache ${LIB_TARGET}_FULL_TARGET_NAME: ${${LIB_TARGET}_FULL_TARGET_NAME}" )
-    message( STATUS "SM library dependencies (public): ${${PROJECT_NAME}_SM_LIBRARIES}" )
-    message( STATUS "external library dependencies (public): ${LIB_PUBLIC_EXTERNAL_LIBRARIES}" )
-    message( STATUS "external library dependencies (private): ${LIB_PRIVATE_EXTERNAL_LIBRARIES}" )
-
-    message( STATUS "pbuilder: will build library <${FULL_LIB_TARGET}>" )
-    add_library( ${FULL_LIB_TARGET} ${LIB_SOURCES} )
-
-    # Set the version of the library
-    set_target_properties( ${FULL_LIB_TARGET} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} )
-
-    # Grab the include directories, which will be used for the build-interface target includes
-    get_target_property( SOURCE_TREE_INCLUDE_DIRS ${FULL_LIB_TARGET} INCLUDE_DIRECTORIES )
-    message( STATUS "Adding install interface include dir: ${TOP_PROJECT_INCLUDE_INSTALL_SUBDIR}${SM_INCLUDE_SUBDIR}" )
-    message( STATUS "Adding build interface include dirs: ${SOURCE_TREE_INCLUDE_DIRS}" )
-    
-    # this will set the INTERFACE_INCLUDE_DIRECTORIES property using the INTERFACE option
-    # it's assumed that the include_directories() command was used to set the INCLUDE_DIRECTORIES property for the private side.
-    target_include_directories( ${FULL_LIB_TARGET} 
-        INTERFACE 
-            "$<BUILD_INTERFACE:${SOURCE_TREE_INCLUDE_DIRS}>"
-            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${TOP_PROJECT_INCLUDE_INSTALL_SUBDIR}${SM_INCLUDE_SUBDIR}>"
-    )
-
-
-endfunction()
-
-function( pbuilder_link_library )
-    # Linking a shared-object library
-    #
-    # Parameters:
-    #     TARGET: library target name
-    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
-    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
-    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
-    #     COMPILE_DEFINITIONS: compile definitions to add to this target
-
-    set( OPTIONS )
-    set( ONEVALUEARGS TARGET )
-    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES COMPILE_DEFINITIONS )
-    cmake_parse_arguments( LIB "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
-
-    message( "Linking library ${LIB_TARGET}" )
-
-    pbuilder_expand_lib_name( ${LIB_TARGET} )
-    set( FULL_LIB_TARGET ${FULL_LIB_NAME} )
-
-    pbuilder_expand_lib_names( ${LIB_PROJECT_LIBRARIES} )
-    set( FULL_PROJECT_LIBRARIES ${FULL_LIB_NAMES} )
-    message( STATUS "full project library dependencies (lib): ${FULL_PROJECT_LIBRARIES}" )
-
-    target_link_libraries( ${FULL_LIB_TARGET} 
-        PUBLIC
-            ${FULL_PROJECT_LIBRARIES} ${${PROJECT_NAME}_SM_LIBRARIES} ${LIB_PUBLIC_EXTERNAL_LIBRARIES}
-        PRIVATE
-            ${LIB_PRIVATE_EXTERNAL_LIBRARIES} 
-    )
-
-    # Add target compile definitions
-    if( LIB_COMPILE_DEFINITIONS )
-        target_compile_definitions( ${FULL_LIB_TARGET}
-            PUBLIC
-                ${LIB_COMPILE_DEFINITIONS}
-        )
-    endif()
-
-endfunction()
-
-function( pbuilder_executables )
-    # Builds multiple executables, assuming one executable per source file
-    # Strips extensino from source file and uses that as the executable name (target and file)
-    #
-    # Parameters
-    #     TARGETS_VAR (output, optional): variable in which to store the names of the executables created
-    #     SOURCES: source files to be builT
-    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
-    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
-    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
-
-
-    set( OPTIONS )
-    set( ONEVALUEARGS TARGETS_VAR )
-    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES )
-    cmake_parse_arguments( EXES "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
-
-    message( "Building multiple executables" )
-    message( STATUS "executable source files: ${EXES_SOURCES}" )
-    message( STATUS "project library dependencies: ${EXES_PROJECT_LIBRARIES}" )
-    message( STATUS "submodule library dependencies (public): ${${PROJECT_NAME}_SM_LIBRARIES}" )
-    message( STATUS "external library dependencies (public): ${EXES_PUBLIC_EXTERNAL_LIBRARIES}" )
-    message( STATUS "external library dependencies (private): ${EXES_PRIVATE_EXTERNAL_LIBRARIES}" )
-
-    set( targets )
-
-    foreach( source ${EXES_SOURCES} )
-        get_filename_component( program ${source} NAME_WE )
-        if( NOT TARGET ${program} )
-            pbuilder_executable( EXECUTABLE ${program} 
-                SOURCES ${source} 
-                PROJECT_LIBRARIES ${EXES_PROJECT_LIBRARIES} 
-                PUBLIC_EXTERNAL_LIBRARIES ${EXES_PUBLIC_EXTERNAL_LIBRARIES} 
-                PRIVATE_EXTERNAL_LIBRARIES ${EXES_PRIVATE_EXTERNAL_LIBRARIES} 
-            )
-            list( APPEND targets ${program} )
-        else()
-            message( FATAL "Duplicate target: ${program}" )
-        endif()
-    endforeach( source )
-
-    message( STATUS "Targets produced: ${targets}" )
-    if( EXES_TARGETS_VAR )
-        message( STATUS "output var for targets: ${EXES_TARGETS_VAR}" )
-        set( ${EXES_TARGETS_VAR} ${targets} PARENT_SCOPE )
-    endif()
-
-endfunction()
-
-function( pbuilder_executable )
-    # Builds a single executable from one or more source files
-    #
-    # Parameters
-    #     EXECUTABLE: executable target
-    #     SOURCES: list of sources to be built into one executable
-    #     PROJECT_LIBRARIES: libraries from the same project to be linked against
-    #     PUBLIC_EXTERNAL_LIBRARIES: public external libraries to be linked against
-    #     PRIVATE_ETERNAL_LIBRARIES: private external libraries to be linked against
-
-    set( OPTIONS )
-    set( ONEVALUEARGS EXECUTABLE )
-    set( MULTIVALUEARGS SOURCES PROJECT_LIBRARIES PUBLIC_EXTERNAL_LIBRARIES PRIVATE_EXTERNAL_LIBRARIES )
-    cmake_parse_arguments( EXE "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
-
-    message( "Building executable ${EXE_EXECUTABLE} with ${EXE_SOURCES}" )
-    message( STATUS "\tlinking with: (project) ${EXE_PROJECT_LIBRARIES} -- (submodule) ${${PROJECT_NAME}_SM_LIBRARIES} --  (public ext) ${EXE_PUBLIC_EXTERNAL_LIBRARIES} -- (private ext) ${EXE_PRIVATE_EXTERNAL_LIBRARIES}")
-
-    add_executable( ${EXE_EXECUTABLE} ${EXE_SOURCES} )
-
-    pbuilder_expand_lib_names( ${EXE_PROJECT_LIBRARIES} )
-    set( FULL_PROJECT_LIBRARIES ${FULL_LIB_NAMES} )
-    message( STATUS "full project library dependencies (exe): ${FULL_PROJECT_LIBRARIES}" )
-
-    target_link_libraries( ${EXE_EXECUTABLE} 
-        PUBLIC
-            ${FULL_PROJECT_LIBRARIES} ${${PROJECT_NAME}_SM_LIBRARIES} ${EXE_PUBLIC_EXTERNAL_LIBRARIES}
-        PRIVATE
-            ${EXE_PRIVATE_EXTERNAL_LIBRARIES} 
-    )
-
-endfunction()
-
-function( pbuilder_component_install_and_export )
-    # This function installs library and executable targets, and makes sure they're exported correctly.
-    #
-    # Parameters:
-    #     COMPONENT: build component being installed; required if this function is used multiple times in a project
-    #                if a build does not actually have multiple components, a name still needs to be given (e.g. "library")
-    #     LIBTARGETS: all library targets to be installed
-    #     EXETARGETS: all executable targets to be installed
-
-    set( OPTIONS )
-    set( ONEVALUEARGS COMPONENT )
-    set( MULTIVALUEARGS LIBTARGETS EXETARGETS )
-    cmake_parse_arguments( CIE "${OPTIONS}" "${ONEVALUEARGS}" "${MULTIVALUEARGS}" ${ARGN} )
-
-    if( CIE_COMPONENT )
-        set( INSERT_COMPONENT "_${CIE_COMPONENT}" )
-    endif()
-
-    # Libraries
-    if( CIE_LIBTARGETS )
-        message( "Installing and exporting libraries for component <${CIE_COMPONENT}>" )
-        message( STATUS "Targets are: ${CIE_LIBTARGETS}" )
-
-        # expand library names
-        pbuilder_expand_lib_names( ${CIE_LIBTARGETS} )
-        set( FULL_LIBTARGETS ${FULL_LIB_NAMES} )
-        message( STATUS "Expanded lib names: ${FULL_LIBTARGETS}" )
-
-        # make targets available at build time
-        export( TARGETS ${FULL_LIBTARGETS}
-            APPEND
-            FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake
-        )
-
-        # install libraries and add to export for installation
-        install( TARGETS ${FULL_LIBTARGETS} 
-            EXPORT ${PROJECT_NAME}${INSERT_COMPONENT}_Targets
-            COMPONENT ${CIE_COMPONENT}
-            LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-        )
-    endif()
-
-    # Executables
-    if( CIE_EXETARGETS )
-        message( "Installing and exporting executables for component <${CIE_COMPONENT}>" )
-        message( STATUS "Targets are: ${CIE_EXETARGETS}" )
-
-        # make targets available at build time
-        #message( STATUS "******* build-time exe targets file: ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake" )
-        export( TARGETS ${CIE_EXETARGETS}
-            APPEND
-            FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake
-        )
-        
-        # install executables and add to export for installation
-        #message( STATUS "******* installed exe targets export: ${PROJECT_NAME}${INSERT_COMPONENT}_Targets")
-        install( TARGETS ${CIE_EXETARGETS}
-            EXPORT ${PROJECT_NAME}${INSERT_COMPONENT}_Targets
-            COMPONENT ${CIE_COMPONENT}
-            RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-        )
-    endif()
-
-    # Export installation
-    message( "Installing export ${PROJECT_NAME}${INSERT_COMPONENT}_Targets" )
-    message( STATUS "Output file will be ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}/${PROJECT_NAME}${INSERT_COMPONENT}_Targets.cmake" )
-    install( EXPORT ${PROJECT_NAME}${INSERT_COMPONENT}_Targets
-        NAMESPACE
-            ${PROJECT_NAME}::
-        DESTINATION
-            ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}
-    )
-
-
-endfunction()
-
-macro( pbuilder_install_headers )
-    #message( STATUS "installing headers in ${INCLUDE_INSTALL_DIR}${${PROJECT_NAME}_PARENT_INC_DIR_PATH}" )
-    install( FILES ${ARGN} 
-        DESTINATION ${TOP_PROJECT_INCLUDE_INSTALL_DIR}${SM_INCLUDE_SUBDIR}
-    )
-endmacro()
-
-macro( pbuilder_install_header_dirs FILE_PATTERN )
-    install( DIRECTORY ${ARGN} 
-        DESTINATION ${INCLUDE_INSTALL_DIR}${${PROJECT_NAME}_PARENT_INC_DIR_PATH} 
-        FILES_MATCHING PATTERN "${FILE_PATTERN}" 
-    )
-endmacro()
-
-macro( pbuilder_install_config )
-    install( FILES ${ARGN} 
-        DESTINATION ${CONFIG_INSTALL_DIR} 
-    )
-endmacro()
-
-macro( pbuilder_install_data )
-    install( FILES ${ARGN} 
-        DESTINATION ${DATA_INSTALL_DIR} 
-    )
-endmacro()
-
-macro( pbuilder_install_files DEST_DIR )
-    install( FILES ${ARGN} 
-        DESTINATION ${DEST_DIR} 
-    )
-endmacro()
-
-function( pbuilder_do_package_config )
-    # This macro sets up and installs the configuration files used tospecify the install information for the project.
-    # It installs an already-created "config" file.
-    # It creates and installs the "version-config" and "targets" files.
-    # Arguments: 
-    #   
-    #   CONFIG_LOCATION -- Directory in which to find the already-created config file.
-    #                      If not specified, the default is ${PROJECT_BINARY_DIR}.
-    #   FILE_PREFIX -- Portion of the filename that preceeds `Config.cmake`, `Targets.cmake`, and `ConfigVersion.cmake` for the 
-    #                  config, targets, and config-version files, respectively.  If not specified, the default is ${PROJECT_NAME}.
-    #   CONFIG_FILENAME -- Optional specification of the full config filename.  If specified, overrules the default described above.
-    #   VERSION_FILENAME -- Optional specification of the full version-config filename.  If specified, overrules the default described above.
-
-    # Parse macro arguments
-    set( oneValueArgs CONFIG_LOCATION FILE_PREFIX CONFIG_FILENAME VERSION_FILENAME )
-    cmake_parse_arguments( PKG_CONF "" "${oneValueArgs}" "" ${ARGN} )
-
-    # Handle arguments and apply defaults
-
-    if( NOT PKG_CONF_CONFIG_LOCATION )
-        set( PKG_CONF_CONFIG_LOCATION ${PROJECT_BINARY_DIR} )
-    endif()
-
-    if( NOT PKG_CONF_FILE_PREFIX )
-        set( PKG_CONF_FILE_PREFIX ${PROJECT_NAME} )
-    endif()
-
-    if( NOT PKG_CONF_CONFIG_FILENAME )
-        set( PKG_CONF_CONFIG_FILENAME ${PKG_CONF_FILE_PREFIX}Config.cmake )
-    endif()
-    set( CONFIG_PATH ${PKG_CONF_CONFIG_LOCATION}/${PKG_CONF_CONFIG_FILENAME} )
-    message( STATUS "Config file path: ${CONFIG_PATH}" )
-
-    if( NOT PKG_CONF_VERSION_FILENAME )
-        set( PKG_CONF_VERSION_FILENAME ${PKG_CONF_FILE_PREFIX}ConfigVersion.cmake )
-    endif()
-    set( CONFIG_VERSION_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PKG_CONF_VERSION_FILENAME} )
-    message( STATUS "Config version file path: ${CONFIG_VERSION_PATH}" )
-
-    # Config file must exist already
-    if( NOT EXISTS ${CONFIG_PATH} )
-        message( FATAL_ERROR "Package config file does not exist: ${CONFIG_PATH}" )
-    endif()
-
-    include( CMakePackageConfigHelpers )
-    write_basic_package_version_file(
-        ${CONFIG_VERSION_PATH}
-        COMPATIBILITY SameMajorVersion
-    )
-
-    install( 
-        FILES 
-            ${CONFIG_VERSION_PATH}
-            ${CONFIG_PATH}
-        DESTINATION 
-            ${${PROJECT_NAME}_CMAKE_CONFIG_DIR}
-    )
-
-endfunction()
-
-function( pbuilder_add_pybind11_module PY_MODULE_NAME PROJECT_LIBRARIES )
-    # Adds a pybind11 module that is linked to the specified project libraries, PUBLIC_EXT_LIBS, and PRIVATE_EXT_LIBS
-    # Installs the library in the standard lib directory unless indicated by the definition of the variable PBUILDER_PY_INSTALL_IN_SITELIB
-
-    pbuilder_expand_lib_names( ${PROJECT_LIBRARIES} )
-    set( FULL_PROJECT_LIBRARIES ${FULL_LIB_NAMES} )
-    message( STATUS "full project libraries (pybind11): ${FULL_PROJECT_LIBRARIES}" )
-
-    message( STATUS "submodule libraries (pybind11): ${${PROJECT_NAME}_SM_LIBRARIES}" )
-
-    # Potential point of confusion: the C++ library is "Scarab" and the python library is "scarab"
-    # Other possible naming schemes seemed less desirable, and we'll hopefully avoid confusion with these comments
-    pybind11_add_module( ${PY_MODULE_NAME} ${PYBINDING_SOURCEFILES} )
-
-    get_target_property( SOURCE_TREE_INCLUDE_DIRS ${PY_MODULE_NAME} INCLUDE_DIRECTORIES )
-    message( STATUS "Adding install interface include dir: ${INCLUDE_INSTALL_SUBDIR}" )
-    message( STATUS "Adding build interface include dirs: ${SOURCE_TREE_INCLUDE_DIRS}" )
-
-    target_include_directories( ${PY_MODULE_NAME}
-        INTERFACE 
-            "$<BUILD_INTERFACE:${SOURCE_TREE_INCLUDE_DIRS}>"
-            "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${INCLUDE_INSTALL_SUBDIR}>"
-    )
-
-    target_link_libraries( ${PY_MODULE_NAME} PRIVATE ${FULL_PROJECT_LIBRARIES} ${${PROJECT_NAME}_SM_LIBRARIES} ${PUBLIC_EXT_LIBS} ${PRIVATE_EXT_LIBS} )
-
-    set( PY_MODULE_INSTALL_DIR ${LIB_INSTALL_DIR} )
-    # Override that install location if specified by the user
-    if( DEFINED PBUILDER_PY_INSTALL_IN_SITELIB AND DEFINED Python3_SITELIB )
-        set( PY_MODULE_INSTALL_DIR ${Python3_SITELIB} )
-    endif( DEFINED PBUILDER_PY_INSTALL_IN_SITELIB AND DEFINED Python3_SITELIB )
-    message( STATUS "Installing module ${PY_MODULE_NAME} in ${PY_MODULE_INSTALL_DIR}" )
-
-    install( TARGETS ${PY_MODULE_NAME} DESTINATION ${PY_MODULE_INSTALL_DIR} )
-    
-endfunction()
diff --git a/Src/Scarab/documentation/README.md b/Src/Scarab/documentation/README.md
deleted file mode 100644
index 411c1c3..0000000
--- a/Src/Scarab/documentation/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-We use sphinx (and deployment to RTD) for nearly all of our documentation within Project 8.
-Here we collect the files and instructions needing for setting up the above; these are very language specific.
-
-# General Notes
-- In many cases, you will not actually use/include these files in a project, but will instead copy and modify them as a starting template. This means that changes to the template will *not* propagate to other packages automatically.
-- The template files provided are intended as a working starting point, but modification and additions are expected. It may also be required to make changes to how builds are done on the RTD site using their advanced admin options. This action is currently restricted to the primary maintainers for each (contact Noah if you believe you need access).
-
-# Subdirectories
-Subdirectories here contain instructions (in their README.md files) and an example files needed for various languages.
-Depending on the repo, scarab may or may not be expected to be an available submodule.
-The cpp subdirectory also contains the actual documentation for scarab (it is an used as the example for other cpp packages)
-
-# Generic building notes
-For a complete understanding of how documentation is built on RTD, you should go look at their documentation.
-For our purposes, it is usually reasonable to consider the following steps:
-
-1. Github sends an HTTP POST on certain events (generally pushes and releases) and RTD may trigger a build, depending on the details of the event and its configuration.
-1. If a build is triggered, RTD spins up their standard build container and clones the desired commit
-1. RTD installs their default python environment
-1. If configured to do so, RTD installs python packages using pip and a named requirements.txt file from within the repo
-1. If configured to do so, RTD attempts to install the provided python package (based on a setup.py file)
-1. RTD cats the conf.py file which will be used for building the webpage (this is done to ease some debugging)
-1. RTD builds the sphinx documentation based on the conf.py file
-1. RTD moves the build output to their hosting location so that the webpage is served.
diff --git a/Src/Scarab/documentation/application_building.rst b/Src/Scarab/documentation/application_building.rst
deleted file mode 100644
index 295c6cb..0000000
--- a/Src/Scarab/documentation/application_building.rst
+++ /dev/null
@@ -1,223 +0,0 @@
-Applications built with Scarab
-==============================
-
-An application essentially encapsulates some behavior or capability with a user interface.  Scarab provides tools to create an interface that allows the user to easily and repeatably configure and run an application.
-
-The main set of classes that a developer will encounter are:
-
-    * ``main_app``: the top-level application class
-    * ``app``: application base class; used for subcommands
-    * The set of ``param`` classes: data structure classes that hold the configuration information
-
-Configuring an Application
---------------------------
-
-The user tells the application how to run using its configuration.  The primary configuration can be put together using several stages of input:
-
-    #. Default configuration: the developer of the application can provide a default hard-coded configuration via ``main_app::default_config()``
-    #. Configuration file: supplied via the command line (``-c`` or ``--config``)
-    #. Non-option command-line arguments (see below)
-    #. Option arguments setup to modify the configuration
-
-Starting from the top down, successive stages of configuration will add to or overwrite (for duplicated configuration keys) the primary configuration.  The configuration can be accessed with ``main_app::primary_config()``.
-
-Using the Command Line
-----------------------
-
-Components of a command::
-
-    > my_exe [subcommand] [options] [non-option arguments]
-
-Subcommands
-    An executable using subcommands typically has multiple main modes of operation, each of which is identified by a subcommand.
-
-Options
-    An option modifies the behavior of the executable in some predefined way (unknown options are not allowed).  Options are indicated by a hyphen and a single character (e.g. ``-c``) or two hyphens and a string name (e.g. ``--config``).  Options can either be flags, indicating some meaning just by their presence, or they can have some value attached to them.  Options can be given as:
-
-    *    ``-a`` (flag)
-    *    ``-abc`` (flags can be combined)
-    *    ``-f filename`` (option)
-    *    ``-ffilename`` (no space required)
-    *    ``-abcf filename`` (flags and option can be combined)
-    *    ``--long`` (long flag)
-    *    ``--file filename`` (space)
-    *    ``--file=filename`` (equals)
-
-    Several options are available with any scarab-based application:
-
-    * ``-h`` or ``--help`` will print the usage message and exit
-    * ``-V`` or ``--version`` will print the version information and exit
-    * ``-c`` or ``--config`` allows the user to provide a configuration file
-    * ``--verbosity`` allows the user to set the global maximum verbosity on a scale of 0 (trace) to 6 (fatal)
-
-Non-Option Arguments
-    Arguments that do not start with one or two hyphens are called non-option arguments.  They are parsed in two ways, and made available through the ``main-app`` class:
-
-    * Keyword arguments have a key and a value separated by a ``'='``.  They're merged into the global configuration, and they are also made available in a map-like structure, ``main-app.nonoption_kw_args()``.  The syntax options are:
- 
-        *    ``key=`` (NULL value)
-        *    ``key={true|false}`` (boolean value)
-        *    ``key=string`` (string value)
-        *    ``key=[numeric]`` (numeric value, either integer, unsigned integer, or float; scientific notation, e.g. ``1e7``, is allowed for floats)
-
-      The key can be a simple string, which indicates a key/value pair in a flat map, or it can indicate a value within a nested hierarchical structure of maps and arrays.  The only requirement on the structure is that the top level is a map with a string key.  For example, the keyword argument ``key_one.2.key_two=true`` would indicate the following structure (using YAML notation for convenience)::
-
-        ---
-        key_one:
-            - NULL
-            - NULL
-            - key_two: true
-
-    * Ordered arguments have a value (NULL, boolean, string, or numeric) but no key.  They are not merged with the global configuration, and are made available in an array-like structure: ``main_app::nonoption_ord_args()``.
-
-Creating an Application
------------------------
-
-Several examples are included below to demonstrate how one can create an application using Scarab.
-
-CLI Library
-###########
-
-Scarab uses the CLI11 library to do command-line argument parsing.  The ``CLI::App`` class has been typedef'd as ``scarab::app`` for convenience, and there is a derived class ``scarab::main_app`` that takes care of parsing the non-option arguments.
-
-Here are some useful resource for learning how to use the CLI11 library:
-
-*  `GitHub repo and README <https://github.com/CLIUtils/CLI11>`_
-*  `User manual <https://cliutils.gitlab.io/CLI11Tutorial/>`_
-*  `API reference <https://cliutils.github.io/CLI11/index.html>`_
-
-The simplest example
-####################
-
-::
-
-    #include "application.hh"
-
-    using namespace scarab;
-
-    int main( int argc, char **argv )
-    {
-        main_app the_main( false );
-
-        CLI11_PARSE( the_main, argc, argv );
-
-        return 0;
-    }
-
-In this example we create the app (``main_app``), parse the CL input, and then return.  Note that the ``main_app`` constructor 
-includes a single argument, passing ``false`` to disable the use of a config file.  
-
-Example with a callback
-#######################
-
-This example captures the behavior of the application in a class, and then runs the ``execute()`` function with a callback.
-
-::
-
-    #include "application.hh"
-    #include "logger.hh"
-
-    LOGGER( testlog, "test_app_with_callback" );
-
-    namespace scarab
-    {
-        struct do_a_thing
-        {
-            do_a_thing() : f_value( 5 ) {}
-
-            void execute( const main_app& an_app )
-            {
-                // configure to run
-                f_value = an_app.primary_config().get_value( "value", f_value );
-
-                // do a thing!
-                LPROG( testlog, "My value is: " << f_value );
-
-                return;
-            }
-
-            int f_value;
-        };
-    }
-
-    using namespace scarab;
-
-    int main( int argc, char **argv )
-    {
-        main_app the_main;
-
-        auto t_dat_callback = [&](){
-            do_a_thing t_dat;
-            t_dat.execute( the_main );
-        };
-
-        the_main.callback( t_dat_callback );
-
-        CLI11_PARSE( the_main, argc, argv );
-
-        return 0;
-    }
-
-Note that in the ``main_app`` constructor we did not pass an argument as we did in the previous example.  
-In this case we use the default value, which enables the use of a config file.
-
-
-Example with subcommands
-########################
-
-This example uses a class with two functions that are implemented as subcommands called by callback.  Note that ``app.fallthrough()`` is used in the main function to allow non-option arguments to be collected by the main app.
-
-::
-
-    #include "application.hh"
-    #include "logger.hh"
-
-    LOGGER( testlog, "test_app_with_subcommands" );
-
-    namespace scarab
-    {
-        struct get_or_set
-        {
-            get_or_set() : f_value( 5 ) {}
-
-            void setup_subcommands( main_app& an_app )
-            {
-                app* t_sc_get = an_app.add_subcommand( "get", "Get the value" );
-                t_sc_get->callback([this]() { this->get(); } );
-
-                app* t_sc_set = an_app.add_subcommand( "set", "Set the value" );
-                t_sc_set->callback([&an_app, this]() { this->set( an_app ); } );
-
-                return;
-            }
-
-            void get()
-            {
-                LPROG( testlog, "Value is: " << f_value );
-                return;
-            }
-
-            void set( const main_app& an_app )
-            {
-                f_value = an_app.primary_config().get_value( "value", f_value );
-                LPROG( testlog, "Just to check: " << f_value );
-                return;
-            }
-
-            int f_value;
-        };
-    }
-
-    using namespace scarab;
-    int main( int argc, char **argv )
-    {    
-        main_app the_main;
-        the_main.require_subcommand();
-        the_main.fallthrough();
-
-        get_or_set t_gos;
-        t_gos.setup_subcommands( the_main );
-
-        CLI11_PARSE( the_main, argc, argv );
-        return 0;
-    }
diff --git a/Src/Scarab/documentation/cpp/Doxyfile b/Src/Scarab/documentation/cpp/Doxyfile
deleted file mode 100644
index b95077a..0000000
--- a/Src/Scarab/documentation/cpp/Doxyfile
+++ /dev/null
@@ -1,1534 +0,0 @@
-# Doxyfile 1.5.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME = $(PROJECT_NAME)
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER = $(PROJECT_NUMBER)
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = $(PROJECT_BRIEF_DESC)
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-PROJECT_LOGO           =  $(PROJECT_LOGO)
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = ./user_doxygen_out
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C
-
-EXTENSION_MAPPING = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST = YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-#
-INPUT = $(DOXYGEN_INPUT) 
-
-
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py *.f90 *.f *.vhd *.vhdl
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE = $(DOXYGEN_EXCLUDE)
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code.  Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX = KT
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET = 
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
-
-CHM_INDEX_ENCODING = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = 
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME = 
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS = 
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
-
-QHG_LOCATION = 
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
-
-GENERATE_TREEVIEW = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX            = YES
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the
-# mathjax.org site, so you can quickly see the result without installing
-# MathJax, but it is strongly recommended to install a local copy of MathJax
-# before deployment.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS     =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX = YES
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH = $(PREPROC_INCLUDE_PATH)
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME = 
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH = 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = NO
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK = YES
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = NO
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 2
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = YES
diff --git a/Src/Scarab/documentation/cpp/README.md b/Src/Scarab/documentation/cpp/README.md
deleted file mode 100644
index e2c63b6..0000000
--- a/Src/Scarab/documentation/cpp/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Scarab/documentation
-
-This directory contains the files necessary to setup automated documentation for a C++ project.  
-If you are here for that purpose, rather than looking at Scarab-specific documentation, ignore files that start with `Scarab_`.
-
-The documentation system will create a documentation website hosted and automatically generated by readthedocs.org (RTD).
-You will be able to access the documentation at these URLs:
-* www.project8.org/[github repo name]
-* [RTD project name].readthedocs.io
-* [RTD project name].rtfd.io
-
-The software stack used to generate the documentation is:
-* Doxygen -- C++ source parsing and API website generation
-* Sphinx -- Python-based documentation website generation
-* readthedocs.org -- Website generation and hosting
-
-
-## Instructions for setting up documentation for a C++ project.
-
-### In your project repo
-1. Create a documentation directory.
-1. Copy into it the files `index.rst` and `conf.py`.  You do not need to copy `requirements.txt` or `Doxyfile`.
-1. Create a `doxfiles` or `DoxFiles` directory in your documentation directory, and copy `doxfiles/mainpage.dox` into it.
-1. If you have rst documentation files, put them in the documentation directory; otherwise it's recommended to create a placeholder rst file for use or descriptive documentation.
-1. Put the filename(s) for any rst documentation files (minus .rst extension) in `_index.rst` after the initial lines defining the table of contents.
-1. Customize `index.rst` and `conf.py` with the name and description of your project.
-1. Customize `conf.py` with the relevant directories in your project (`DOXYGEN_INPUT`, `DOXYGEN_EXCLUDE`, and `PREPROC_INCLUDE_PATH`).
-1. If you have a favicon file, put it in the documentation directory and specify it in `conf.py`; otherwise comment out the `html_favicon` variable in that file.
-1. Recommendation: don't merge these changes into the main branch just yet; test the creation of the documentation (described below) first.
-
-### On readthedocs
-1. Create an RTD project for your software project by importing from GitHub (this will automatically create a webhook directed to RTD).
-1. As you change each settings in each category below, be sure to press the Submit button so the changes are saved.
-1. Under Admin:Settings, change the programming language to C++.
-1. Under Admin:Advanced Settings:
-    1. Specify the location of the requirements.txt file (in Scarab) under "Requirements file".
-    1. Specify the location of conf.py under "Python configuration file".
-    1. Specify the branch where your documentation currently resides as "Default branch".
-1. Under Admin:Maintainers, add Noah as an additional maintainer so we can maintain access if you're unavailable.
-1. Under Builds you should see the `latest` build building.  Once it's done, check the documentation to make sure it worked.  If it worked great, carry on. If not, go back and fix whatever's wrong.
-1. Under Admin:Advanced Settings, switch the "Default branch" to `main`.
-
-### In your project repo
-1. Merge your changes to the main branch with a new release; this should trigger a new build of the documentation, which you should then go and check.
-1. If it doesn't already exist, create an orphan branch in your repo called `gh-pages` and clear it of all files.
-1. Populate the `gh-pages` branch with an empty file called `.nojekyll` and the following in `index.html`:
-    ```
-    <html>
-        <head>
-            <meta http-equiv="refresh" content="0; url=https://scarab.readthedocs.io/">
-        </head>
-    </html>
-    ```
-    with your RTD project name replacing `scarab`.
-1. Commit and push `gh-pages` to GitHub.
-1. In the settings for your repo, under GitHub Pages, make sure that the Source drop-down menu has `gh-pages` selected.
-1. Check that if you go to `http://www.project8.org/[github repo name]` it redirects to the RTD documentation.
diff --git a/Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst b/Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst
deleted file mode 100644
index 9525ea3..0000000
--- a/Src/Scarab/documentation/cpp/Scarab_CMakeOverview.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Scarab/CMake Overview
-=====================
diff --git a/Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst b/Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst
deleted file mode 100644
index 50d433c..0000000
--- a/Src/Scarab/documentation/cpp/Scarab_LibraryOverview.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-Scarab/Library Overview
-=======================
-
-* Utilities
-* Logger
-* Param
-
-  * Core Param classes
-  * Codecs for translation to/from various data-storage standards
-  * Application configuration
-
-* Authentication
-
-Build Options
--------------
-
-* Scarab_BUILD_PARAM 
- 
-  * Build the core param and application configuration classes
-
-* Scarab_BUILD_CODEC_JSON
-
-  * Build the JSON codec
-  * Requires Scarab_BUILD_PARAM
-
-* Scarab_BUILD_CODEC_YAML
-
-  * Build the YAML codec
-  * Requires Scarab_BUILD_PARAM
-
-* Scarab_BUILD_AUTHENTICATION
-
-  * Build the authentication class 
-  * Requires Scarab_BUILD_PARAM and Scarab_BUILD_CODEC_JSON
diff --git a/Src/Scarab/documentation/cpp/conf.py b/Src/Scarab/documentation/cpp/conf.py
deleted file mode 100644
index 1a2f852..0000000
--- a/Src/Scarab/documentation/cpp/conf.py
+++ /dev/null
@@ -1,317 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Monarch documentation build configuration file, created by
-# sphinx-quickstart on Thu Apr 23 11:11:03 2015.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# Customize the following:
-#  * the doxygen-related environment variables
-#  * the project, copyright, and author variables
-#  * the arguments used to assign variables htmlhelp_basename, latex_documents, man_pages, and texinfo_documents
-
-import sys
-import os
-from subprocess import call, check_output
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# version
-this_version = 'v?.?.?'
-try:
-    this_version = check_output(['git', 'describe', '--abbrev=0', '--tags'])
-except:
-    pass
-
-# environment variables used by Doxygen
-os.environ['PROJECT_NAME'] = 'Scarab'
-os.environ['PROJECT_NUMBER'] = this_version
-os.environ['PROJECT_BRIEF_DESC'] = 'Project 8 C++ Utility Library'
-# located in your documentation directory, or give the relative path from the documentation directory
-os.environ['PROJECT_LOGO'] = 'scarab_logo_small.png'
-
-# directories in which doxygen should look for source files; if you have a `doxfiles` directory in your documentation, that should go here; string with space-separated directories
-os.environ['DOXYGEN_INPUT'] = 'doxfiles ../../library'
-# directories within DOXYGEN_INPUT that you want to exclude from doxygen (e.g. if there's  a submodule included that you don't want to index); string with space-separated directories
-os.environ['DOXYGEN_EXCLUDE'] = '../../library/param/codec/json/rapidjson ../../library/param/codec/msgpack/msgpack-c ../../library/param/codec/yaml/yaml-cpp'
-# directories outside of DOXYGEN_INPUT that you want the C preprocessor to look in for macro definitions (e.g. if there's a submodule not included that has relevant macros); string with space-separated directories
-os.environ['PREPROC_INCLUDE_PATH'] = ''
-
-# Doxygen
-call(['doxygen', 'Doxyfile'])
-call(['mv', './user_doxygen_out/html', './_static'])
-
-
-on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-if on_rtd:
-  html_theme = 'default'
-else:
-  import sphinx_rtd_theme
-  html_theme = "sphinx_rtd_theme"
-  html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-# source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Scarab'
-copyright = u'2018, Scarab Authors'
-author = u'Project 8 Collaboration'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = this_version
-# The full version, including alpha/beta/rc tags.
-release = this_version
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-html_favicon = 'favicon.ico'
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'Scarabdoc'
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  (master_doc, 'Scarab.tex', u'Scarab Documentation',
-   u'Project 8 Collaboration', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'scarab', u'Scarab Documentation',
-     [author], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  (master_doc, 'Scarab', u'Scarab Documentation',
-   author, 'Scarab', 'Utility library for Project 8 C++ Software',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
diff --git a/Src/Scarab/documentation/cpp/doxfiles/mainpage.dox b/Src/Scarab/documentation/cpp/doxfiles/mainpage.dox
deleted file mode 100644
index ccb2455..0000000
--- a/Src/Scarab/documentation/cpp/doxfiles/mainpage.dox
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * \mainpage
- *
- * Go to the <A HREF="../index.html">main documentation page</A>.
-*/
\ No newline at end of file
diff --git a/Src/Scarab/documentation/cpp/favicon.ico b/Src/Scarab/documentation/cpp/favicon.ico
deleted file mode 100644
index 4c6c946ac7f5fc0f1dfadc3629ddcdf84ef9bad7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmb7EOG_J36ut#vbR*(xBL$cK5Er5~Mv9G(y|@rv=)#4oK9Cf5D$)|WsG=ZNCB7dq
zi3m2KT9P=#sI7&@gg$IdREVN}J!j(e5uCBk@XeX~o$ot$?md?g;t}0hS%RL0q9IL)
zd?7>;fhb~<JOv>rmwJT`fm8%z7yrej`s8?c?YHJv|DI!mz`W$7#whkJN74Ll3z?>I
zWR{Pi(G~)8Mjn~#b?o7(H2|f;0j1<a5+;Yn^(=%9Yi!0ZQ1QZp{JItLJIOni1ik0g
zuE6x%1J=m7ZbtRs9G`xiqPX3QbhAr?QaS;K9COYaJppTPdR@E6Xd4K@6G_0_;k(i+
zPiDc8eshN(tKo#Eb$&g*Rb%PP5eB`#V0v}!&#^eckpA+QJ`9m&ar^L=SANUL=Y6#H
z?;xYnMeAQe?z08t5%`_CmiIdtS>M0YD{ENo-|)D0`g-p#dr(j_1*?76(91Qre+|9V
zKiRv>Sl{E<a&jKM*iAj=9$7m5P|Bt>RK4~gNF3+%e3EbOQ!x{aVLT8=w#AK{YBxrG
zG0bho(PUHa^>@vOVRJ{Z{__;}jRQ=oF|5(KV6JQayP@9`Il&ueL|5~cav%2+y7|DL
WGu`va>*Ia#lSZzUW9t9lq2qsK=T3+K

diff --git a/Src/Scarab/documentation/cpp/index.rst b/Src/Scarab/documentation/cpp/index.rst
deleted file mode 100644
index 75062ae..0000000
--- a/Src/Scarab/documentation/cpp/index.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-Scarab Use and API Documentation
-================================
-
-.. toctree::
-   :maxdepth: 2
-
-   Scarab_LibraryOverview
-   Scarab_CMakeOverview
-
-.. end of toc
-.. (you must not remove or modify the above comment line, it is required by the API Doc generation)
-`Full Doxygen API Reference <_static/index.html>`_
diff --git a/Src/Scarab/documentation/cpp/requirements.txt b/Src/Scarab/documentation/cpp/requirements.txt
deleted file mode 100644
index d6497e6..0000000
--- a/Src/Scarab/documentation/cpp/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-sphinxcontrib-contentui
diff --git a/Src/Scarab/documentation/cpp/scarab_logo_small.png b/Src/Scarab/documentation/cpp/scarab_logo_small.png
deleted file mode 100644
index 7212aeb6a03a107a06d4eaed0c869403797a1211..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4236
zcmV;75OeQ|P)<h;3K|Lk000e1NJLTq002+`002-31^@s6juG;$00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;sFy8EDXi>FDd{45E)5C
zK~#9!?VNdZRArjRf8V{gwxlYRJ%mNUKoHqMngG&DBX%S9$l?ZP?6zB68Ew&NdR)47
z6qnKNaX?(!ahKx;$|j<sz$n-Xh)A>3LRdoxS!=mfb+`GWLP$teNJ3Ri`tY4oC+FO{
zxplwizRUAI-}_x*`F2^H9jzYHSqRPocox930Ln7k-kO72UJA0(erGGogsLmp{?0s*
z<%C=^VY7|YRPo_&e~K$BmvM8J;qaulE9}BGm3%gHBEjQF=`?5*2+@u#&@dQ0;}OO^
zvm7npW8>U=L1{;pD9P+u`Wg{m6=UZvW%Q$OfUdW*7-;BtyYv8{WWyQ|ayxQeg+0q&
z2T3BMYtMv%mrxf55VDLO(ZMo-_Czl&j7S(E6oi!6yqVxEEXW@`0?TNB`NJ|zQgS*$
z`v%aW@6<anoA8jZud*4>A;xVrW8&fJ^0?ob8VtJm0kEw03?O6-9DyW*;rGP^c=5F(
ziTJAGKLQKBe`z-1>WaE!TF}SFx%V|06m&Jf;;EysVgY0tSO(;e_<08)(rSRz{Cxb!
z4%Awc07Ue!BL!!c7kfr_JU`?8N#}FH)H`u_GwTl9QalWrem@^f>VpwhV+V7$7w<XU
z5Ozny-vok35902U2U<Ac(-p}O6OL?HjlX0+g;Q>3$<>3gd(uEasNxvo-~1Y<!`0}2
zw4k34e{&I+zw#xHRL@E9E$R}IrUqE{s}W3i`3oFrjd^B7*Z6SiP+VDgU_~wW@)tkn
z&^IfIR8>+q@i!f#l<Pe5=j>a#fQ45SVCW&#ic-|_Qc^p0iwT~gMfl*Vp%@V}3ZAS`
zy?Zm?KYAnIKRz9`^dJZcTZ$XY6fB-PoQS`=(RJ*Kjhw#2P|J^^R+OTLR2EMg#`d@8
zQFzU*9jF%8BBXaeA4yi~g0>_pT=wk8v1yts6$HpOK|~Gk_a|><(;u&;YR3kuwy)=J
zcU;QO=kEncM#vUs1neGf%xjH)bUs41)x}&%QOM}o7b4*f1R!9U2Gmwdrmit;=96H=
zNzb~*Rg1PDgka5eL#WvNC6e8F5@3gu(sdv5$rS}iz~qI0i%&DPFr)5!4y)d8Sw`}B
zRnh=74FeEZra{jM*VE-EW1F}OiQtjFq@&_UbH+W*ndT&2(om1=1u1@|liPndy|2El
z4#W-#;E9`8oGA>t>*@H#yO5~b`VAXqO+?t8r_XveJKsHgJ>}o7iq8#&px;e@#No}V
z^MH<Lfw~TsMXyQI!FMb^>nT0Jw-5X)vcuW@n^x?6|Jcp=_HB=UlCP4&t8T$EO*A#o
zq{X&B03``s4G{51D7bV=eCtc`u=S}KD5=gC|Ag#xvgNUxz?~7-3VV&8Mz}^pSAz*J
z;gSrXj1~&u&d<TowO148IjGpOGfq|A_;czA96Sbr>iF*N@siW0H@fQYXcj1Ar~z{O
z7eP1>|GYp2qyD-GPuHGk2KY3KnutYJ*rGgSQC9mY4_Q=(qu=>73(d4h$?i<i|GWcI
z6T)anC9BV1^iTlg<V;mbnhS>lxN<tjr!GzxHG8(Q{exF2J#-jdvl>~MsAF?rSkVta
z*Z_Z7CHj)r>7zJE?>h|CK+GCACA%|v5@TTU091q6-I-vTF*)Mb|2dugYd*#9b~FI1
zd7>GZ;UFdJS8-tV3OWxT&B*(nL$=vZ0nkMDWJa^FWpyAI76Mb(kWQTt5IkPO2UGe{
zvhj;L@Xln|QXQ0S-N2%22I4zh+<1a^IjP!iasafzvaANx06-+@=cAj)A`}~mot1^8
z*!c9034{U-Wi(5V68es1fhQ`oP@n;YSu%BKv_4MK5VFkD>n@Czk+q&+g+d@Kl4XWT
zb76o;O?fT<5>)Qlifng~?4dXvl&oJJy$4AmTys3Rgd<5x0+M1QSau}3&~CT$**#Ne
ztFiWx8DO)6Boiz@8a2KItpm3WfQEtH?WJtn2C%#F74JsKZP!I2I~6K+YyyXiid~zL
zohcp6h4l!o?0f>HH4v;KaCASCVrw%1g(MRyF9jh{vAdX*tUS;n9f$`S2CnQpY^hMP
zVKruwZoWw|LyJ(c>Hkn%;O^W#X#gh8uQChzA|#oz?HjN;Q`#Ir#o?lK%hyOYnbf?l
z$+PyPb*Q>?S#o7}!Zp=c7P!(pn0lnHG)pus6XIkwBiWs(Rn-W<mg-{C@`K<n?*IS_
z5iQ+LWIVeAv<Tnce>MKS+Z(i$2|%|%Ge9*g%og5-B)}yL>@vurVT!N}4Nv#J40-fD
zgwqA#&`E|bq=Y`b!~rPDeDZJO@g3Yx;ly9l|AtwJ)O6P0b`k2){VlteHxJX$F?6%`
z(h{=G231E}bQwoR9!0Ng1ht0kZ_Q!b+b@ukmC1xx*Me!Z9{|JtYCgL05{BINFpAT`
zy4iOi*(B0)^RW4kw@eAKOvvsY`@6E@mI<SliI$p4by*pPW-#oI*|>7@`Ref*jDP-9
zT$#CN%n#2PK+`Z-eC;6mUw=2fCfx{@g%+q`<=vBT_{vaPnx;$>a(cwzZ32$(Z<%aU
zD}$+yOve6Y0nW@^uq+O&S;{wm`FAG1y9t{s^+(LY?sQiF;aV~Z2hi*4TceY=ENm$r
zE}y@x<>1v<BVwc5atkpuCcL`~XL@$s{hc#*GM$Sq<@0-{fZO}y0r-!1=b@G#Wz5`<
zV=P=p(1W2?+>xm5FO1>ZwA|gyumORRQ;5FCsK?#|EVjS=_>Tl&iihw1cQ(By-vqwn
zjdj008)J5<HN$3NXGzO!RlJgHf{M*wH2%VOjKWFN**bp?oI#b;Y5>3b)2|UgYIc5u
zi3Q4|eK2at0fgMj09{qm5G)~LKBVSJToS>OVnUT=1S*a-xTZU|3qpdm58c?tNyL@P
z!tv)4sWzClc7GkuGA)xO*A2zeHPSLOv8k1`(hR|q4ffg!MhijBu~vpt3r%rR?F%5u
z3Rk|j`J~mjvv_-CHZ~Vr^~nJUscmC{-^{)RNs{UL%YT9TZ4-)ut_JaR=|Q;W48Q}7
znlg?bD(3j1Vj@+?S|6l@Ko6^=<m97kVXXSQ2h?hMPo9cocd+WNiEZG*u2j^DW0Y)I
zgP}(#yz;kDuWiDTWMrF-aW8&OzhC|Sj9MyG9fS}FAqeZOXIhqNaNhW7jDK}44o^nI
z4t+zXaME=2P?+j{JMbOe2Py6Zt1*fVgy8GPW>C86OVmmqjx;CvLoXq{_h5*G8YBQM
zsDTzCv+srcU>L0q&_+GX&ZK6r44w4C!C>k{YAT3Smf_0CImyJj6>#2VQ#kO&hpf2e
z7bq?V`4^6%=-y`#vT|A#C%y%`(>S(uJ*)1X%v%@tK*%yffA<8#@0m@+A7bc?M@|6`
z%&KxEJLvvuJm>Xmb+^6%^m<IjFk3@lP5@|;*5d+9HHe{GgeuBTVOwDa+%SuXFHGO5
zw^Q^V^H7{l-Wl7Al`|$#vgwQX?ITTD;GtEE2$bw+=<N^V?Kc`il~`Jsg%kTT@a8|@
z%E@mS|A25!1(MB<7WAX!6tp@7o>&5^zp&mq78qqe&VoUN4(>#8DA7)S(U2<Hy_pov
zdV-Df9$?D*Tj@M}EW_@9otho%IJ$Wqk&oWw+>3u1lU~IIu<Nj&oum@}Xb=xpRp9QF
z&-s&XYy{qkj3)rY(0~w1s=LwBW^+bRYY3JAd|`_;N6R5pT=u#eMhGc(m1CN8A9po-
zmc35R{@r-H_Xht_(z+Fp)~z54TpR^QYEqhNaHhnz*Zzy~FReMP9Q60so&w9jk(t*z
zaUzDc)!H~{^JD-z#h<*}G!Zv+#?4vA*7;927C)N!zvercY4VeqPsQ(bsrPITulpFZ
z2;RaWt#Z7Wg-9zCaazxTplfV<=b2LiLri6aQ4hS(BB?8(l78J5S0M-<-iN!OFP7Od
z7Z!1(gx09omSy589E4V08Z}|7_8t?ch9?w2IU@%INH#mw#k<KKbTNk7GA<alnsV)y
z3JDQ1`xa5YYcsMlx~T8zT0kNZOelcD&=IxUT({2uZ=5}faAdS><8>ese{un>WfPYa
z8P9-ADgJC>T^twgv_wuh@c>%2Qq=LCyD+Qw(&>^ZEmBd;1iDwJOD038oV}lZTpL*g
zQi8X8B^E$g!IjymHXhn3UcHpO(N|zbLW%p07E~a)qpsl4m&<W@qt%ckyATO(v`p-}
zuw^mwzIoAo8A7o4qc`#N8&k`_PCuGc@~X{Dkfx@SS#&vjSIkF95|(LDH0#eKdL(>d
z-CH;iTkU4S<2$$G+wm3se*fGV$G;OJ)J$Pvz^rEpANhg9-+UcSaCRqoBQ9(I01{To
zzF;U=7WPyJyOz8{_Jw0H)YH3hb8<v;@H5m9S%WWT$ATAdq(!r@_ncm_`>5L;fWXLy
zUyCXkz`m6WAtjqZ559cb<k6h?CYq6G&cE$pMEW`WuzY@<q%~&l(qv3ENxd;@fMIt$
ziV+DT+w82LeFK^OFKXQ)QwxU{2$6ruReby8bdaLG+Wn^81!}MZ0SI&*Gm);N#)Bkr
zXx$1(aWnF-tK(7{)o4C{sg782t+i;*a)djLgI_L3l4Lp!xrpA=?o8SPOJ3Kb7GcB#
z&y$kV4J?Z-&p(JOyEC~XufRHG>w_SwKsR?7W^4wKIbbyIZaw*7(MuSS2o7%!7d`X}
zgw+lRAV4_8xVek5yS*G*`w>VIeP%w5GpnIW)8gfF(NM7lkW<|B|I@1=1iRjU5yjzT
z+`MH8eaTMS11JQtBy-twEASmTf+Yl~0g7Jv9>sNX?LjwNzR{*WfRf$GMQ{Bhnq?I`
zfn!IwY~BiNc4yLhquU0+S`h8tEQAER7rYQX<}YK^TYFGay<nNGD&KT7>b8>I$>?|Y
z)``9cR=tm@gDbCV(!pyR0Bhq@ZvP9}^2Xeg$Na|_^~QH(4ftt`MFIf7X5sBMkkM~%
z1AkeaZEl!zFDbb>wAHJp+6F*fW9aXmKyfOV^)o=wN55ImGUn+;X#VCG`I<k>*eBm%
z(1UM6(BGi`m1TwDGymLRxiy)i&E8QbD>f`$2bZf+BT{<T0<QgdH~#XYe17{c2-O6U
z9THOQ+c!*8#|RnNQ|(;(;wn7p*|m%I4Xw;{I5ABFcbD^$wzca=1JIS8jiyF8_~`=9
z9dl*l30fBJ%sj4qe;WvaZ|`=(HPP2U+1*~!diIavRVPO^?jNk)wgEj9#-8eKt7)|z
zfWq!1{k#J9tz5vlKbu6{MdR9qY){t$JQSQfe!BO*NP^u<U&WQ3i{eg8I(=!|7zkh*
z47ueYs*86f=lumjqVk7r^uK;)>?PL@51?g{)qgmls+#0XPzZcS4s!0eYuYUSwJm^v
zWP#%HCRCxW@A?8K!qD4tN=e*k6KD8J_T$RTMTzkevNJMp)1Z9UX0rPX{pSYopKY9d
illfTy&jQ$?$NvKvUz9eZ&zjW$0000<MNUMnLSTYOA|u8C

diff --git a/Src/Scarab/documentation/package_builder.rst b/Src/Scarab/documentation/package_builder.rst
deleted file mode 100644
index 5d961e9..0000000
--- a/Src/Scarab/documentation/package_builder.rst
+++ /dev/null
@@ -1,336 +0,0 @@
-Package Builder
-===============
-
-What is the Package Builder (PB)?
----------------------------------
-
-Package Builder (PB) is a framework built on top of CMake for putting together software packages that specializes in nesting packages.
-
-PB is implemented in a series of CMake macros that standardize how things like building a library, or building an executable.  
-Part of the motivation behind PB is to simplify the process of making a software package.  
-
-While CMake is extremely powerful, it has a lot of options for how to make a software package, 
-and those choices can make the process more complicated.  PB tries to find a particular balance between how complicated or 
-simple it is to build a package, and how many choices are left available to the user or are made by PB.  
-For cases not handled by the vanilla PB interface, the user always has the option to use the raw CMake interface.
-
-Submodules
-^^^^^^^^^^
-
-The nesting infrastructure in PB assumes one is using git submodules, or something similar.  
-It assumes packages will use submodules for internal (i.e. within the same codebase) dependencies.  
-For example, the Scarab package in which PB lives is the base utility package for all of the C++ packages used by Project 8, 
-and Scarab is included as a submodule (or as a nested submodule) in all of the organization's C++ packages.
-
-
-Requirements
-------------
-
-PB requires CMake v3.12 because it uses FindPython3.
-
-
-Basic Usage
------------
-
-This section will explain the basic usage of PB by setting up an example software package called Insecta.
-
-
-Package Structure
-^^^^^^^^^^^^^^^^^
-
-Since Insecta is a PB-based package, it requires Scarab.  So Scarab should be setup as a submodule of Insecta.  
-The file structure should look like this::
-
-    Insecta
-    |
-    + Scarab
-    |  |
-    |  + cmake
-    |  |  | . . .
-    |  |
-    |  + library
-    |  |  | . . .
-    |  |
-    |  + CMakeLists.txt
-    |
-    + Source
-    |  | . . .
-    |
-    + CMakeLists.txt
-    
-Note that the Scarab directory listing is incomplete, and there are probably going to be more files and directories in Insecta as well.
-
-
-Install Structure
-^^^^^^^^^^^^^^^^^
-
-PB uses the variable ``CMAKE_INSTALL_PREFIX`` to control where headers/libraries/binaries/etc are installed.  
-The default install prefix is set to ``${PROJECT_BINARY_DIR}``.
-
-A number of different types of installed files are handled specifically by PB:
-
-- Headers are installed in ``<prefix>/${INCLUDE_INSTALL_SUBDIR}``
-- Libraries are installed in ``<prefix>/${LIB_INSTALL_SUBDIR}``
-- CMake package configuration files are installed in ``<prefix>/${PACKAGE_CONFIG_SUBDIR}``
-- Executables are installed in ``<prefix>/${BIN_INSTALL_SUBDIR}``
-- Runtime configuration files are installed in ``<prefix>/${CONFIG_INSTALL_SUBDIR}``
-- Data files are installed in ``<prefix>/${DATA_INSTALL_SUBDIR}``
-
-Default subdirectories are:
-
-- ``INCLUDE_INSTALL_SUBDIR``: ``include/${PROJECT_NAME}``
-- ``LIB_INSTALL_SUBDIR`` (non-Windows): ``lib``
-- ``LIB_INSTALL_SUBDIR`` (Windows): ``bin``
-- ``PACKAGE_CONFIG_SUBDIR``: ``${LIB_INSTALL_SUBDIR}/cmake/${PROJECT_NAME}``
-- ``BIN_INSTALL_SUBDIR``: ``bin``
-- ``CONFIG_INSTALL_SUBDIR``: ``config``
-- ``DATA_INSTALL_SUBDIR``: ``data``
-
-
-Initial Setup
-^^^^^^^^^^^^^
-
-The initial part of the CMakeList file should be setup as follows::
-
-    cmake_minimum_version( VERSION 3.12 )  # Minimum CMake version mentioned above
-    cmake_policy( SET CMP0048 NEW )  # Package version to be specified in the project() command (optional but recommended)
-    project( Insecta VERSION 1.0.0 )  # Setup the package.  Package name is `Insecta`
-
-    list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )  # This is required so that PB can be included
-    include( PackageBuilder )  # Loads the PackageBuilder.cmake file
-
-    # Create options or set options from submodules
-
-    # Find other dependencies
-
-    pbuilder_prepare_project()  # Processes PB options
-
-    pbuilder_add_submodule( Scarab Scarab )  # Insecta will use the Scarab library.  See below for more details on this macro.
-
-Building a Library
-^^^^^^^^^^^^^^^^^^
-
-Depending on the size and organization of a project, the library definition might be in the main CMakeList file, 
-or it might be in a subdirectory with its own CMakeList file.
-
-Directory inclusion should be setup in the main CMakeList file::
-
-    include_directories( BEFORE Source )
-
-The remainder should go wherever the library is being defined::
-
-    pbuilder_use_sm_library( Scarab Scarab )  # This library depends on the Scarab library;
-    # The first argument is the submodule name
-    # The second argument is the target name for the library
-
-    set( PACKAGE_LIBS )  # If there were other libraries in this package on which this library depends, then they would be put in this variable
-    set( PUBLIC_EXT_LIBS )  # If there were public external dependencies, the targets would go here
-    set( PRIVATE_EXT_LIBS )  # If there were private external dependencies, the targets would go here
-
-    # It's convenient to put the header and source files in their own respective lists
-    set( Insecta_HEADERS 
-        file1.hh
-        file2.hh
-    )
-
-    set( Insecta_SOURCES
-        file1.cc
-        file2.cc
-    )
-
-    # This function adds the library, sets the include directories as a target property and links the library.
-    pbuilder_library( 
-        TARGET Insecta 
-        SOURCES ${Insecta_SOURCES}
-        PACKAGE_LIBRARIES ${PACKAGE_LIBS}
-        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS} 
-    )
-
-    # If the build does not actually use components, but this function is being used multiple times in the project (we'll use it below), 
-    # then specifying a component is required.  Here, since we're building the library, we'll call it ``Library``.
-    pbuilder_component_install_and_export( 
-        COMPONENT Library
-        LIBTARGETS Insecta
-    )
-
-    # Headers are passed as a list, so we pass the value of the HEADERS variable
-    # This function installs the headers
-    pbuilder_install_headers( ${Insecta_HEADERS} )
-
-
-Building an Executable
-^^^^^^^^^^^^^^^^^^^^^^
-
-CMake provides a flag variable ``${PROJECT_NAME}_ENABLE_EXECUTABLES`` that should be used to control whether executables are built.
-
-For the Insecta project, the executable section of the build (again, in its own file or in the main CMakeList file) looks like this::
-
-    if( Insecta_ENABLE_EXECUTABLES )
-
-        # Package libraries required by these executables
-        set( PACKAGE_LIBS
-            Insecta
-        )
-        # Public external dependencies
-        set( PUBLIC_EXT_LIBS )  # Public external dependencies
-        set( PRIVATE_EXT_LIBS )  # Private external dependencies
-
-        # Storing the relevant source files in a variable
-        set( Insecta_SOURCES
-            executable1.cc
-            executable2.cc
-        )
-
-        # All variables are passed as variables, not their contents
-        # This will create the executables and link it
-        set( programs )
-        pbuilder_executables( 
-            TARGETS_VAR programs
-            SOURCES ${Insecta_SOURCES}
-            PACKAGE_LIBRARIES ${PACKAGE_LIBS}
-            PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-            PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS} 
-        )
-
-    # If the build does not actually use components, but this function is being used multiple times in the project (we used it above), 
-    # then specifying a component is required.  Here, since we're building the executables, we'll call it ``Library``.
-    pbuilder_component_install_and_export( 
-        COMPONENT Executables
-        LIBTARGETS ${programs}
-    )
-
-    endif( Insecta_ENABLE_EXECUTABLES )
-
-Nesting with Submodules
------------------------
-
-PB was designed with submodules in mind.  It takes care of avoiding conflicts between repeated submodules (i.e. diamond dependency pattern).  
-It also avoids conflicting library names and include installation between packages with the same submodules, as is explained in the following sections.
-
-Submodules are added with a PB macro::
-
-    pbuilder_add_submodule( [submodule package name], [submodule location] )
-
-This macro will make PB aware of the submodule, and take care of determining the names and install locations as mentioned below.
-
-
-Repeated Submodules
-^^^^^^^^^^^^^^^^^^^
-
-Imagine a situation where Package A includes packages B and C as submodules, and both B and C include package D as a submodule.  
-PB defines which version of package D is used: whichever is encountered by CMake first.  So if A's CMakeList file includes this::
-
-    pbuilder_add_submodule( B B )
-    pbuilder_add_submodule( C C )
-
-then package A's version of D will be used.  It's up to the developer to ensure that the version of D is usable by packages A, B, and C.
-
-Library Names
-^^^^^^^^^^^^^
-
-PB manages library file names to avoid conflicts between libraries installed as submodules of different packages.  
-For example, if both packages B and C have package D as a submodule, they both would generate libD.so (assuming a system that uses .so libraries).  
-So PB renames the library file according to the parent packages.  If a user builds and installs packages B and C, 
-if they install to a common location, they will find these libraries:
-
-- ``libB.so``
-- ``libD_B.so``
-- ``libC``
-- ``libD_C.so``
-
-They could also separately build and install package D, which would build ``libD.so``.
-
-PB supports arbitrary levels of nesting for library names.  In the example in the section above, package A would build these libraries:
-
-- ``libA.so``
-- ``libB_A.so``
-- ``libD_B_A.so``
-- ``libC_A.so``
-
-
-Include Install Directories
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-PB manages include install directories to avoid conflicts between headers installed as submodules of different packages.  
-Headers from all submodules of a parent project are installed in subdirectories of the parent project's header install directory.
-
-Continuing the A/B/C/D example from above, the include directories would be structured like this::
-
-    <prefix>
-    |
-    + include
-      |
-      + A
-        |
-        + <A's header files>
-        |
-        + B
-        | + <B's header files>
-        |
-        + C
-        | + <C's header files>
-        |
-        + D
-          + <D's header files>
-
-Unlike with the library naming, the submodule include-directory structure does not follow the structure of the submodule nesting: 
-all submodules are setup as subdirectories of the top parent project's include directory.  Unlike with libraries, 
-which tend to be installed in a single directory (if using a common install prefix), header files are installed in 
-project-specific subdirectories of the ``include`` directory, so submodule include subdirectories will avoid conflicts by being 
-all within the parent project's directory.
-
-
-CMake Configure Scripts
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Please refer to the next section.
-
-
-CMake Configuration Setup
--------------------------
-
-In modern CMake usage, package configurations for installed packages are discovered by loading ``.cmake`` files describing the installed package, 
-rather than by using ``FindPackage`` scripts.  PB supports the creation of CMake configuration scripts.  
-PB uses one of the standard configuration-file locations for installing the package-config files:  ``<prefix>/${LIB_INSTALL_SUBDIR}/cmake/${PROJECT_NAME}``.
-
-The package author is responsible for creating a configurable package-config file (apologies for the confusing wording).  
-The file is "configurable" in that CMake will customize the file using the ``configure_file()`` command during the CMake configure stage.  
-The user should include this in their main CMakeList file::
-
-    configure_file( ${PROJECT_SOURCE_DIR}/[project name]Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/[project name]Config.cmake @ONLY )
-
-Then the user calls a PB macro that will install the above configuration file, and create configuration files that 
-describe the version and targets of the package::
-
-    pbuilder_do_package_config()
-
-Here is an example of a simple package-config template file, taken from the PBTest package that comes with Scarab (in the ``testing`` directory)::
-
-    # PBTestConfig.cmake
-
-    get_filename_component( PBTest_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
-
-    # Find the dependencies
-    include( CMakeFindDependencyMacro )
-    find_dependency( Scarab REQUIRED PATHS ${PBTest_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
-
-    # Import targets if they're not already present
-    # This nested setup allows the import to be used both in the build tree (i.e. as a submodule) and after installation
-    if( NOT TARGET PBTest::@PBTest_FULL_PROJECT_NAME@ )
-        if( TARGET @PBTest_FULL_PROJECT_NAME@ )
-            add_library( PBTest::@PBTest_FULL_PROJECT_NAME@ ALIAS @PBTest_FULL_PROJECT_NAME@ )
-        else()
-            include("${PBTest_CMAKE_DIR}/PBTestTargets.cmake")
-        endif()
-    endif()
-
-For packages that include PB-based submodules, those are considered dependencies in this context.  
-In the above example, Scarab is a subumodule of PBTest, and it required to be found by PBTest.  
-It provides two path hints: ``${PBTest_CMAKE_DIR}/Scarab`` for occasions when PBTest has been installed, and ``@Scarab_BINARY_LOCATION@`` 
-for occasions when PBTest is itself being used as a submodule.
-
-The last section ensures that all of the expected library targets are present.  If they're not there, then usually the ``Targets`` 
-config file is included.  If, for some reason, the library target is present but not with the expected namespace, 
-then an alias target with the namespace is created.  For a project with multiple libraries, only one ``Targets`` 
-config file would be included, but multiple alias libraries would need to be created, one per real library.
diff --git a/Src/Scarab/documentation/python/README.md b/Src/Scarab/documentation/python/README.md
deleted file mode 100644
index 3bbd6cf..0000000
--- a/Src/Scarab/documentation/python/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Scarab/documentation
-
-This directory contains the files necessary to setup automated documentation for a python project.
-
-The documentation system will create a documentation website hosted and automatically generated by readthedocs.org (RTD).
-You will be able to access the documentation at these URLs:
-* www.project8.org/[github repo name]
-* [RTD project name].readthedocs.io
-* [RTD project name].rtfd.io
-
-The software stack used to generate the documentation is:
-* Sphinx -- Python-based documentation website generation
-* Breathe -- Sphinx extension for Doxygen (confirm that we actually use this?)
-* better_apidoc -- tool for automatically walking through python packages and generating rst files for the API (confirm that we need this one)
-* readthedocs.org -- Website generation and hosting
-
-
-## Instructions for setting up documentation for a python project.
-
-### In your project repo
-1. Create a documentation directory.
-1. Copy into it the file `conf.py` and `index.rst` and the entire directory `_templates`.
-1. If you have rst documentation files, put them in the documentation directory; otherwise it's recommended to create a placeholder rst file for use or descriptive documentation.
-1. Put the filename(s) for any rst documentation files (minus .rst extension) in `index.rst` after the initial lines defining the table of contents (above the line `better_apidoc_out/modules`).
-1. Customize `index.rst` and `conf.py` with the name and description of your project.
-1. Customize (if needed) the logic used to assign the `version` and `release` variables in `conf.py`. (Default is to derive values from git tags)
-1. If you have a favicon file, put it in the documentation directory and specify it in `conf.py`; otherwise comment out the `html_favicon` variable in that file.
-1. Recommendation: don't merge these changes into the master branch just yet; test the creation of the documentation (described below) first.
-1. The package `better-apidoc` is required for building the documentation, but if you add it as an optional dependency RTD won't install it. You have two options:
-    1. Create a `docs_build_requirements.txt` file (named as you please) which lists that package *and* configure RTD (under admin) to install dependencies from that file.
-    1. Add the following lines of logic to your setup.py file
-    ```
-        on_rtd  os.environ.get("READTHEDOCS", None) == 'True'
-        requirements = list()
-        if not on_rtd:
-            # requirements.append(<'the_name_of_first_required_dependency'>)
-            ...
-        else:
-            requirements.append('better-apidoc')
-
-        ...
-        setup( # this line will already exist, but it is shown to indicate where the next line goes
-            install_requires=requirements
-            ...
-        )
-    ```
-1. RTD is going to try and install your project and the automatic documentation of API docs expects to be able to import the package and inspect the contents. You need to ensure that the above works, which means either installing your dependencies or making them optional (at least for importing the package, obviously they can be required at runtime). In practice, you should see if your docs build and deploy and if not debug based on the output available on readthedocs.org site.
-
-### On readthedocs
-1. Create an RTD project for your software project by importing from GitHub (this will automatically create a webhook directed to RTD).
-1. As you change each settings in each category below, be sure to press the Submit button so the changes are saved.
-1. Under Admin:Advanced Settings:
-    1. Check the box to "Install your project inside a virtualenv using setup.py install"
-    1. If using one, specify the location of the requirements.txt file under "Requirements file".
-    1. Specify the location of conf.py under "Python configuration file".
-    1. Specify the branch where your documentation currently resides as "Default branch".
-    1. Deselct "Enable PDF build" and "Enable EPUB build" (we don't currently use these, if someone shows that are builds work we can turn them on, if there's a reason to do so).
-    1. Determine if you want to enable "use system packages" (this may depend on the install set for your package).
-1. Under Admin:Maintainers, add Noah as an additional maintainer so we can maintain access if you're unavailable.
-1. Under Builds you should see the `latest` build building.  Once it's done, check the documentation to make sure it worked.  If it worked great, carry on. If not, go back and fix whatever's wrong.
-1. Under Admin:Advanced Settings, switch the "Default branch" to `master`.
-
-### In your project repo
-1. Merge your changes to the master branch with a new release; this should trigger a new build of the documentation, which you should then go and check.
-1. If it doesn't already exist, create an orphan branch in your repo called `gh-pages` and clear it of all files.
-1. Populate the `gh-pages` branch with an empty file called `.nojekyll` and the following in `index.html`:
-    ```
-    <html>
-        <head>
-            <meta http-equiv="refresh" content="0; url=https://scarab.readthedocs.io/">
-        </head>
-    </html>
-    ```
-    with your RTD project name replacing `scarab`.
-1. Commit and push `gh-pages` to GitHub.
-1. In the settings for your repo, under GitHub Pages, make sure that the Source drop-down menu has `gh-pages` selected.
-1. Check that if you go to `http://www.project8.org/[github repo name]` it redirects to the RTD documentation.
diff --git a/Src/Scarab/documentation/python/_templates/README.md b/Src/Scarab/documentation/python/_templates/README.md
deleted file mode 100644
index b1bfd33..0000000
--- a/Src/Scarab/documentation/python/_templates/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-better-apidocs uses the two template files in this directory to generate python package documentation.
-
-It is based on jinja2 and you'll have to go check their documentation for more details.
diff --git a/Src/Scarab/documentation/python/_templates/module.rst b/Src/Scarab/documentation/python/_templates/module.rst
deleted file mode 100644
index fa154b5..0000000
--- a/Src/Scarab/documentation/python/_templates/module.rst
+++ /dev/null
@@ -1,79 +0,0 @@
-{{ fullname }} module
-{% for item in range(7 + fullname|length) -%}={%- endfor %}
-
-
-.. currentmodule:: {{ fullname }}
-
-Some template vars
-==================
-Members: {{ members|join(" ") }}
-Functions: {{ functions|join(" ") }}
-Classes: {{ classes|join(" ") }}
-
-.. automodule:: {{ fullname }}
-    {% if members -%}
-    :members: {{ members|join(", ") }}
-    :undoc-members:
-    :show-inheritance:
-    :member-order: bysource
-
-    Summary
-    -------
-
-    {%- if exceptions %}
-
-    Exceptions:
-
-    .. autosummary::
-
-{% for item in exceptions %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-
-    {%- if classes %}
-
-    Classes:
-
-    .. autosummary::
-        :nosignature:
-{% for item in classes %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-
-    {%- if functions %}
-
-    Functions:
-
-    .. autosummary::
-        :nosignature:
-{% for item in functions %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-{%- endif %}
-End of modules condition
-
-    {%- if data %}
-
-    Data:
-
-    .. autosummary::
-        :nosignature:
-{% for item in data %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-End of data condition
-
-{% if all_refs %}
-    ``__all__``: {{ all_refs|join(", ") }}
-{%- endif %}
-
-
-{% if members %}
-    Reference
-    ---------
-
-{%- endif %}
diff --git a/Src/Scarab/documentation/python/_templates/package.rst b/Src/Scarab/documentation/python/_templates/package.rst
deleted file mode 100644
index 5d0b903..0000000
--- a/Src/Scarab/documentation/python/_templates/package.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-{{ fullname }} package
-{% for item in range(8 + fullname|length) -%}={%- endfor %}
-
-.. automodule:: {{ fullname }}
-    {% if members -%}
-    :members: {{ members|join(", ") }}
-    :undoc-members:
-    :show-inheritance:
-    {%- endif %}
-
-{% if submodules %}
-    Submodules:
-
-    .. toctree::
-       :maxdepth: 1
-{% for item in submodules %}
-       {{ fullname }}.{{ item }}
-       {%- endfor %}
-    {%- endif -%}
-
-{% if subpackages %}
-    Subpackages:
-
-    .. toctree::
-       :maxdepth: 1
-{% for item in subpackages %}
-       {{ fullname }}.{{ item }}
-       {%- endfor %}
-    {%- endif %}
-
-{% if members %}
-    Summary
-    -------
-
-    {%- if exceptions %}
-
-    Exceptions:
-
-    .. autosummary::
-        :nosignatures:
-{% for item in exceptions %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-
-    {%- if classes %}
-
-    Classes:
-
-    .. autosummary::
-        :nosignatures:
-{% for item in classes %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-
-    {%- if functions %}
-
-    Functions:
-
-    .. autosummary::
-        :nosignatures:
-{% for item in functions %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-{%- endif %}
-
-    {%- if data %}
-
-    Data:
-
-    .. autosummary::
-        :nosignatures:
-{% for item in data %}
-        {{ item }}
-{%- endfor %}
-    {%- endif %}
-
-{% if all_refs %}
-    ``__all__``: {{ all_refs|join(", ") }}
-{%- endif %}
-
-
-{% if members %}
-    Reference
-    ---------
-
-{%- endif %}
diff --git a/Src/Scarab/documentation/python/conf.py b/Src/Scarab/documentation/python/conf.py
deleted file mode 100644
index bf55007..0000000
--- a/Src/Scarab/documentation/python/conf.py
+++ /dev/null
@@ -1,298 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# dripline documentation build configuration file, created by
-# sphinx-quickstart on Mon Aug 25 15:26:40 2014.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys
-import os
-
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    #'sphinx.ext.autodoc',
-    'sphinx.ext.todo',
-    'sphinx.ext.viewcode',
-    #'sphinxcontrib.programoutput',
-    #'sphinx.ext.napoleon',
-    #'sphinxarg.ext',
-]
-
-import better_apidoc
-better_apidoc.main([
-    'better_apidoc',
-    '-t', '_templates', # path to jinja templates for generated package and module rst files
-    '--force', # overwrite existing files
-    '--separate', # split the modules into their own files
-    '-o', 'better_apidoc_out', # output location, be sure to update index.rst if you change this
-    '../dripline', # path to the package containing modules to document ##TODO update this with your path
-    ])
-
-todo_include_todos = True
-
-#autoclass_content = "both"
-
-# Add any paths that contain templates here, relative to this directory.
-#templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-## TODO change this line to match the package name
-project = 'dripline'
-copyright = '2018, The Project 8 Collaboration'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-#version = #'0.0.1'
-#import pkg_resources
-# release: The full version, including alpha/beta/rc tags.
-try:
-    import subprocess
-    release = subprocess.check_output(['git', 'describe', '--long']).decode('utf-8').strip()
-    version = subprocess.check_output(['git', 'describe', '--abbrev=0']).decode('utf-8').strip()
-except Exception as e:
-    print("error message is:\n{}".format(e.message))
-    version = "unknown"
-    release = "unknown"
-print('version/release are: {}/{}'.format(version,release))
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-try:
-    import sphinx_rtd_theme
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-    html_theme = 'sphinx_rtd_theme'
-except ImportError:
-    html_theme = 'haiku'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-
-## TODO put your favicon here
-html_favicon = 'dripline_favicon.ico'
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'driplinedoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, #  author, documentclass [howto, manual, or own class]).
-#latex_documents = [
-#  ('index', 'dripline.tex', 'dripline Documentation',
-#   'The Project 8 Collaboration', 'manual'),
-#]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-#man_pages = [
-#    ('index', 'dripline', 'dripline Documentation',
-#     ['The Project 8 Collaboration'], 1)
-#]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-#texinfo_documents = [
-#  ('index', 'dripline', 'dripline Documentation',
-#   'The Project 8 Collaboration', 'dripline', 'One line description of project.',
-#   'Miscellaneous'),
-#]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
diff --git a/Src/Scarab/documentation/python/index.rst b/Src/Scarab/documentation/python/index.rst
deleted file mode 100644
index 904ea86..0000000
--- a/Src/Scarab/documentation/python/index.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-Welcome to dripline's documentation!
-====================================
-
-Contents:
-
-.. toctree::
-    :maxdepth: 2
-
-    better_apidoc_out/modules
diff --git a/Src/Scarab/executables/CMakeLists.txt b/Src/Scarab/executables/CMakeLists.txt
deleted file mode 100644
index 810c949..0000000
--- a/Src/Scarab/executables/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# CMakeLists.txt for scarab/executables
-# Author: N. Oblath
-# Created: Jul 13, 2020
-
-##########
-
-set( lib_dependencies 
-    Scarab
-)
-
-set( sources
-    scarab-parse.cc
-)
-
-set( programs )
-pbuilder_executables( 
-    SOURCES ${sources}
-    TARGETS_VAR programs
-    PROJECT_LIBRARIES ${lib_dependencies}
-    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Executables
-    EXETARGETS ${programs}
-)
diff --git a/Src/Scarab/executables/scarab-parse.cc b/Src/Scarab/executables/scarab-parse.cc
deleted file mode 100644
index 8050d01..0000000
--- a/Src/Scarab/executables/scarab-parse.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/*!
-   @file scarab-parse.cc
-   @author N.S. Oblath
-  
-   @brief Parser: Parse a file and verify its conversion to a param structure
-  
-   @details
-   Usage:
-   ~~~~
-   $> scarab-parse [format] [file]
-   ~~~~
-  
-   Use `scarab-parse -h` to get the full help information.
-*/
-
-
-#include "application.hh"
-#include "logger.hh"
-#include "param_json.hh"
-#include "param_yaml.hh"
-#include "scarab_version.hh"
-
-LOGGER( parselog, "scarab-parse" );
-
-namespace scarab
-{
-    struct do_parse
-    {
-        do_parse() :
-                f_return( 0 )
-        {}
-
-        void setup_subcommands( main_app& an_app )
-        {
-            scarab::config_decorator* t_sc_json = an_app.add_config_subcommand( "json",  "Parse a JSON file" );
-            t_sc_json->add_config_option< std::string >( "filename", "filename", "File to parse" )->required();
-            t_sc_json->this_app()->callback([&an_app,  this]() { this->json( an_app.primary_config() ); } );
-
-            scarab::config_decorator* t_sc_yaml = an_app.add_config_subcommand( "yaml", "Parse a YAML file" );
-            t_sc_yaml->add_config_option< std::string >( "filename", "filename", "File to parse" )->required();
-            t_sc_yaml->this_app()->callback([&an_app, this]() { this->yaml( an_app.primary_config() ); } );
-
-            return;
-        }
-
-        void json( const param_node& a_config )
-        {
-            parse< param_input_json >( a_config );
-            return;
-        }
-
-        void yaml( const param_node& a_config )
-        {
-            parse< param_input_yaml >( a_config );
-            return;
-        }
-
-        template< typename parser >
-        void parse( const param_node& a_config )
-        {
-            parser t_input;
-            if( ! a_config.has( "filename" ) )
-            {
-                LERROR( parselog, "Filename was not specified" );
-                f_return = -1;
-                return;
-            }
-
-            param_ptr_t t_param_location( t_input.read_file( a_config["filename"]().as_string() ) );
-
-            if( ! t_param_location )
-            {
-                LERROR( parselog, "File did not parse!" );
-                f_return = -1;
-                return;
-            }
-
-            LPROG( parselog, "Parsed file:\n" << *t_param_location );
-
-            return;
-        }
-
-        int f_return;
-    };
-}
-
-
-using namespace scarab;
-
-int main( int argc, char **argv )
-{
-    main_app the_main;
-    the_main.require_subcommand();
-    the_main.fallthrough();
-
-    do_parse t_parse;
-    t_parse.setup_subcommands( the_main );
-
-    // Package version
-    the_main.set_version( version_semantic_ptr_t( new version() ) );
-
-    // Parse CL options and run the application
-    CLI11_PARSE( the_main, argc, argv );
-
-    return t_parse.f_return;
-}
diff --git a/Src/Scarab/library/CMakeLists.txt b/Src/Scarab/library/CMakeLists.txt
deleted file mode 100644
index 3b7e6d6..0000000
--- a/Src/Scarab/library/CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-# CMakeLists.txt for Scarab/library
-# Author: N. Oblath
-# Created: Jan 4, 2016
-
-
-set( Scarab_HEADERS )
-set( Scarab_SOURCES )
-
-include_directories( BEFORE
-    ${CMAKE_CURRENT_SOURCE_DIR}/external/date
-)
-if( Scarab_BUILD_CLI )
-    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/external/cli11 )
-endif( Scarab_BUILD_CLI )
-add_subdirectory( external )
-
-include_directories( BEFORE
-    ${CMAKE_CURRENT_SOURCE_DIR}/utility
-    ${CMAKE_CURRENT_SOURCE_DIR}/logger
-    ${CMAKE_CURRENT_SOURCE_DIR}/version
-)
-
-include_directories( BEFORE
-    ${CMAKE_CURRENT_BINARY_DIR}/utility 
-    ${CMAKE_CURRENT_BINARY_DIR}/version 
-)
-add_subdirectory( utility )
-add_subdirectory( version )
-add_subdirectory( logger )
-
-if( Scarab_BUILD_PARAM )
-    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/param )
-    add_subdirectory( param )
-endif( Scarab_BUILD_PARAM )
-
-if( Scarab_BUILD_CODEC_JSON )
-    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/param/codec/json )
-    add_subdirectory( param/codec/json )
-endif( Scarab_BUILD_CODEC_JSON )
-
-if( Scarab_BUILD_CODEC_YAML )
-    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/param/codec/yaml )
-    add_subdirectory( param/codec/yaml )
-endif( Scarab_BUILD_CODEC_YAML )
-
-if( Scarab_BUILD_AUTHENTICATION )
-    include_directories( BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/authentication )
-    add_subdirectory( authentication )
-endif( Scarab_BUILD_AUTHENTICATION )
-
-if( Scarab_BUILD_CLI )
-    include_directories( BEFORE 
-        ${CMAKE_CURRENT_SOURCE_DIR}/cli
-    )
-    add_subdirectory( cli )
-endif( Scarab_BUILD_CLI )
-
-##########
-
-pbuilder_library( 
-    TARGET Scarab 
-    SOURCES ${Scarab_SOURCES}
-    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Library
-    LIBTARGETS Scarab
-)
-
-pbuilder_install_headers( ${Scarab_HEADERS} )
diff --git a/Src/Scarab/library/README.md b/Src/Scarab/library/README.md
deleted file mode 100644
index d7095d1..0000000
--- a/Src/Scarab/library/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Description
-
-Common C++ utilities.
-
-# Requirements
-
-* C++03 (C++11 optional)
-* Boost 1.46, including filesystem, system, thread, and date_time libraries (if using Authentication)
-
-# OS Compatibility
-
-* Linux
-* Mac
-* Windows
-
-# Components
-
-* Authentication
-* Command line interface
-* Logger
-* Param (hierarchical data structure)
-* Utility
-  * Concurrent queue
-  * Digitization functions
-  * Error (exception class)
-  * Member variable macros
-  * Mutex (wraps either pthread or C++11 std::mutex)
-  * API macros for Windows
-  * Singleton base class
-  * Version (base class scarab::version_semver and implementation scarab::version)
-  * Time functions
-  
-  
-# Installation Instructions
-
-Basic installation procedure for linux and mac:
-```
-> mkdir build
-> cd build
-> ccmake ..
-```
-Now make any build option choices you desire.  Configure, then generate the Makefiles.
-```
-> make install
-```
\ No newline at end of file
diff --git a/Src/Scarab/library/authentication/CMakeLists.txt b/Src/Scarab/library/authentication/CMakeLists.txt
deleted file mode 100644
index 74f4598..0000000
--- a/Src/Scarab/library/authentication/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# CMakeLists.txt for Scarab/library/authentication
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/authentication.hh
-    PARENT_SCOPE )
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/authentication.cc
-    PARENT_SCOPE )
diff --git a/Src/Scarab/library/authentication/authentication.cc b/Src/Scarab/library/authentication/authentication.cc
deleted file mode 100644
index 8721d74..0000000
--- a/Src/Scarab/library/authentication/authentication.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * mt_authentication.cc
- *
- *  Created on: Jun 15, 2015
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "authentication.hh"
-
-#include "logger.hh"
-#include "param_codec.hh"
-#include "path.hh"
-
-using std::string;
-
-namespace scarab
-{
-    LOGGER( mtlog, "authentication" );
-
-    authentication::authentication( const string& a_auth_filename ) :
-                    param_node(),
-                    f_auth_filename( a_auth_filename ),
-                    f_is_loaded( false )
-    {
-        load( a_auth_filename );
-    }
-
-    authentication::~authentication()
-    {
-    }
-
-    bool authentication::load( const string& a_auth_file )
-    {
-        this->clear();
-
-        f_auth_filename = a_auth_file;
-
-        // expand path with standard assumptions
-        path t_auth_file_path = expand_path( a_auth_file );
-
-        // is the file there?
-        bool t_auth_file_present = false;
-        if( ! t_auth_file_path.empty() )
-        {
-            LDEBUG( mtlog, "Looking for authentication file: <" << t_auth_file_path << ">" );
-            try
-            {
-                t_auth_file_present = exists( t_auth_file_path ) && is_regular_file( t_auth_file_path );
-                if( ! t_auth_file_present )
-                {
-                    LERROR( mtlog, "File either doesn't exist (" << exists( t_auth_file_path ) << ") or isn't a regular file (" << is_regular_file( t_auth_file_path ) << ")" );
-                    return false;
-                }
-            }
-            catch( boost::filesystem::filesystem_error& e )
-            {
-                LERROR( mtlog, "Unable to determine if the authentication file is a regular file: " << e.what() );
-                return false;
-            }
-        }
-
-        // if so, load it
-        if( t_auth_file_present )
-        {
-            param_translator t_translator;
-            std::unique_ptr< param > t_read_file( t_translator.read_file( t_auth_file_path.string() ) );
-            if( t_read_file == NULL )
-            {
-                LERROR( mtlog, "Unable to parse authentication file" );
-                return false;
-            }
-            else if( ! t_read_file->is_node() )
-            {
-                LERROR( mtlog, "Authentication file must translate to a node" );
-                return false;
-            }
-            else
-            {
-                this->param_node::operator=( std::move(t_read_file->as_node()) );
-                LDEBUG( mtlog, "Authentications:\n" << *this );
-                f_is_loaded = true;
-                return true;
-            }
-        }
-        else
-        {
-            LWARN( mtlog, "Authentications not loaded" );
-            return false;
-        }
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/authentication/authentication.hh b/Src/Scarab/library/authentication/authentication.hh
deleted file mode 100644
index de5802e..0000000
--- a/Src/Scarab/library/authentication/authentication.hh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * mt_authentication.hh
- *
- *  Created on: Jun 15, 2015
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_AUTHENTICATION_HH_
-#define SCARAB_AUTHENTICATION_HH_
-
-#include "member_variables.hh"
-#include "param.hh"
-#include "scarab_api.hh"
-
-namespace scarab
-{
-
-    class SCARAB_API authentication : public param_node
-    {
-        public:
-            authentication( const std::string& a_auth_file );
-            ~authentication();
-
-        public:
-            bool load( const std::string& a_auth_file );
-
-        public:
-            mv_referrable( std::string, auth_filename );
-            mv_accessible_noset( bool, is_loaded );
-
-    };
-
-} /* namespace scarab */
-
-#endif /* SCARAB_AUTHENTICATION_HH_ */
diff --git a/Src/Scarab/library/cli/CMakeLists.txt b/Src/Scarab/library/cli/CMakeLists.txt
deleted file mode 100644
index e8b756e..0000000
--- a/Src/Scarab/library/cli/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# CMakeLists.txt for Scarab/library/param
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/application.hh
-    ${dir}/nonoption_parser.hh
-    PARENT_SCOPE )
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/application.cc
-    ${dir}/nonoption_parser.cc
-    PARENT_SCOPE )
diff --git a/Src/Scarab/library/cli/application.cc b/Src/Scarab/library/cli/application.cc
deleted file mode 100644
index 722d195..0000000
--- a/Src/Scarab/library/cli/application.cc
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * application.cc
- *
- *  Created on: Jul 20, 2018
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "application.hh"
-
-#include "nonoption_parser.hh"
-#include "param_codec.hh"
-#include "version_wrapper.hh"
-
-using std::string;
-
-LOGGER(applog, "application");
-
-namespace scarab
-{
-
-    config_decorator::config_decorator( main_app* a_main, app* a_this_app ) :
-            f_main( a_main ),
-            f_this( a_this_app ),
-            f_subcommand_decorators()
-    {
-    }
-
-    config_decorator::~config_decorator()
-    {
-    }
-
-    config_decorator* config_decorator::add_config_subcommand( std::string a_subcommand_name, std::string a_description )
-    {
-        app* t_subcommand = f_this->add_subcommand( a_subcommand_name, a_description );
-        //config_decorator* t_decorator = new config_decorator( f_main, t_subcommand );
-        f_subcommand_decorators.emplace_back( new config_decorator( f_main, t_subcommand ) );
-        return f_subcommand_decorators.back().get();
-    }
-
-
-    // utility function to fill the verbosity map
-    main_app::verbosity_map_t fill_verbosities()
-    {
-        main_app::verbosity_map_t t_map;
-        // have to hard-code the filling of the verbosity map because you can't iterate over an enum
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eTrace) ] = logger::ELevel::eTrace;
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eDebug) ] = logger::ELevel::eDebug;
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eInfo) ] = logger::ELevel::eInfo;
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eProg) ] = logger::ELevel::eProg;
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eWarn) ] = logger::ELevel::eWarn;
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eError) ] = logger::ELevel::eError;
-        t_map[ static_cast< main_app::verbosity_t >(logger::ELevel::eFatal) ] = logger::ELevel::eFatal;
-        return t_map;
-    }
-
-    main_app::verbosity_map_t main_app::s_verbosities( fill_verbosities() );
-
-    main_app::main_app( bool a_use_config ) :
-            config_decorator( this, this ),
-            app(),
-            f_primary_config(),
-            f_default_config(),
-            f_config_filename(),
-            f_nonoption_kw_args(),
-            f_nonoption_ord_args(),
-            f_app_options(),
-            f_app_option_holders(),
-            f_use_config( a_use_config )
-    {
-        set_global_verbosity( logger::ELevel::eProg );
-
-        allow_extras(); // allow unrecognized options, which are parsed into the nonoption args
-
-        if( f_use_config )
-        {
-            add_option( "-c,--config", f_config_filename, "Config file filename" )->check(CLI::ExistingFile);
-        }
-
-        auto t_verbose_callback = [this]( unsigned a_count )
-            {
-                this->increase_global_verbosity( a_count );
-            };
-        add_flag_function( "-v,--verbose", t_verbose_callback, "Increase verbosity" );
-
-        auto t_quiet_callback = [this]( unsigned a_count )
-            {
-                this->decrease_global_verbosity( a_count );
-            };
-        add_flag_function( "-q,--quiet", t_quiet_callback, "Decrease verbosity" );
-
-        auto t_version_callback = [](int)
-            {
-                LPROG( applog, '\n' << version_wrapper::get_instance()->version_info_string() );
-                throw CLI::Success();
-            };
-        add_flag_function( "-V,--version", t_version_callback, "Print the version message and exit" );
-    }
-
-    main_app::~main_app()
-    {
-    }
-
-    void main_app::set_version( scarab::version_semantic_ptr_t a_ver )
-    {
-        version_wrapper::get_instance()->set_imp( a_ver );
-    }
-
-    void main_app::pre_callback()
-    {
-        if( f_use_config )
-        {
-            do_config_stage_1();
-
-            do_config_stage_2();
-
-            try
-            {
-                nonoption_parser t_no_parser( remaining() );
-                f_nonoption_kw_args = t_no_parser.kw_args();
-                f_nonoption_ord_args = t_no_parser.ord_args();
-            }
-            catch( error& e )
-            {
-                LERROR( applog, "Unable to parse remaining arguments: " << e.what() );
-                throw CLI::ParseError( std::string("Unable to parse remaining arguments due to parse error or unknown option: ") + e.what(), CLI::ExitCodes::ArgumentMismatch );
-            }
-
-            do_config_stage_3();
-
-            do_config_stage_4();
-
-            LPROG( applog, "Final configuration:\n" << f_primary_config );
-            LPROG( applog, "Ordered args:\n" << f_nonoption_ord_args );
-        }
-        return;
-    }
-
-    void main_app::do_config_stage_1()
-    {
-        // first configuration stage: defaults
-
-        if( ! f_use_config ) return;
-
-        LDEBUG( applog, "first configuration stage" );
-        f_primary_config.merge( f_default_config );
-        return;
-    }
-
-    void main_app::do_config_stage_2()
-    {
-        // second configuration stage: config file
-
-        if( ! f_use_config ) return;
-
-        LDEBUG( applog, "second configuration stage" );
-        if( ! f_config_filename.empty() )
-        {
-            path t_config_filepath = scarab::expand_path( f_config_filename );
-            LDEBUG( applog, "Loading config file <" << t_config_filepath << "> from filename <" << f_config_filename << ">" );
-            param_translator t_translator;
-            std::unique_ptr< param > t_config_from_file( t_translator.read_file( t_config_filepath.string() ));
-            if( t_config_from_file == NULL )
-            {
-                throw error() << "[application] error parsing config file";
-            }
-            if( ! t_config_from_file->is_node() )
-            {
-                throw error() << "[application] configuration file must consist of an object/node";
-            }
-            f_primary_config.merge( t_config_from_file->as_node() );
-        }
-        return;
-    }
-
-    void main_app::do_config_stage_3()
-    {
-        // third configuration stage: keyword args
-
-        if( ! f_use_config ) return;
-
-        LDEBUG( applog, "third configuration stage" );
-        f_primary_config.merge( f_nonoption_kw_args );
-        return;
-    }
-
-    void main_app::do_config_stage_4()
-    {
-        // fourth configuration stage: application options
-
-        if( ! f_use_config ) return;
-
-        std::for_each( f_app_option_holders.begin(), f_app_option_holders.end(),
-                       [this]( std::shared_ptr< app_option_holder > a_ptr ){ a_ptr->add_to_app_options(f_app_options); } );
-        f_primary_config.merge( f_app_options );
-        return;
-    }
-
-    main_app::verbosity_t main_app::get_global_verbosity() const
-    {
-        return f_global_verbosity->first;
-    }
- 
-    void main_app::set_global_verbosity( main_app::verbosity_t a_verbosity )
-    {
-        auto t_it = s_verbosities.find( a_verbosity );
-
-        // if we don't match a value, then find the next higher value
-        if( t_it == s_verbosities.end() )
-        {
-            t_it = s_verbosities.upper_bound( a_verbosity );
-            // make sure we don't go off the end
-            if( t_it == s_verbosities.end() ) t_it = std::prev(s_verbosities.end());
-        }
-
-        f_global_verbosity = t_it;
-
-        // set the global verbosity in the logger
-        logger::SetGlobalLevel( f_global_verbosity->second );
-        return;
-    }
-
-    void main_app::set_global_verbosity( logger::ELevel a_verbosity )
-    {
-        set_global_verbosity( static_cast< verbosity_t >(a_verbosity) );
-        return;
-    }
-
-    void main_app::increase_global_verbosity( unsigned an_offset )
-    {
-        // increased verbosity is lower in verbosity number
-        if( an_offset == 0 ) return;
-        // Move down, but don't go past the beginning
-        for( unsigned i_count = 0; i_count < an_offset; ++i_count )
-        {
-            if( f_global_verbosity == s_verbosities.begin() ) break;
-            --f_global_verbosity;
-        }
-        // set the global verbosity in the logger
-        applog.SetGlobalLevel( f_global_verbosity->second );
-        return;
-    }
-
-    void main_app::decrease_global_verbosity( unsigned an_offset )
-    {
-        // decreased verbosity is higher in verbosity number
-        if( an_offset == 0 ) return;
-        // Move up, but not past the end
-        for( unsigned i_count = 0; i_count < an_offset; ++i_count )
-        {
-            if( std::next(f_global_verbosity) == s_verbosities.end() ) break;
-            ++f_global_verbosity;
-        }
-        // set the global verbosity in the logger
-        applog.SetGlobalLevel( f_global_verbosity->second );
-        return;
-    }
-
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/cli/application.hh b/Src/Scarab/library/cli/application.hh
deleted file mode 100644
index e60fc5c..0000000
--- a/Src/Scarab/library/cli/application.hh
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * application.hh
- *
- *  Created on: Jul 20, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_APPLICATION_HH_
-#define SCARAB_APPLICATION_HH_
-
-#include "CLI11.hpp"
-
-#include "logger.hh"
-#include "member_variables.hh"
-#include "param_helpers.hh"
-#include "version_semantic.hh"
-
-#include <type_traits>
-
-namespace scarab
-{
-    typedef CLI::App app;
-
-    class version_semantic;
-
-    class main_app;
-
-    /*!
-     @class config_decorator
-     @author N. S. Oblath
-
-     @brief Adds the ability to create options and subcommands that are tied to a main_app's primary config
-
-     @details
-     Note that while this class is called a decorator, it does not follow the actual decorator pattern.
-     It does, however, follow the spirit of that pattern in that it adds a capability to the CLI::App class.
-
-     Subcommands and options are tied to the main_app in slightly different ways because of the different ways
-     in which those two CLI11 classes are used.
-
-     Subcommands are CLI::App objects, and any App can have subcommands.  Therefore the collection of Apps in
-     use in a given application can form a multi-level parent-child structure.  Each parent App can have multiple
-     children, and owns those child App objects.  The children can also be parents, of course.
-     The scarab::config_decorator for each subcommand App object is created by the parent config_decorator's
-     add_config_subcommand() function.  That decorator has a link to its App and is owned by its parent decorator.
-
-     At the top of the App hierarchy is the primary App.  In Scarab, that's the main_app, which also inherits from
-     config_decorator.  So main_app is also the top of the config_decorator hierarchy.
-
-     Options, on the other hand, do not form their own hierarchy.  Each App owns its options.  On the Scarab side,
-     though, even options that belong to subcommands contribute to the main_app's primary config.  Therefore when
-     config_decorator::add_config_option() is used, the app_option_holder that corresponds to the new option is
-     given directly to the main_app.
-    */
-    class SCARAB_API config_decorator
-    {
-        public:
-            config_decorator( main_app* a_main, app* a_this_app );
-            config_decorator( const config_decorator& ) = delete;
-            config_decorator( config_decorator&& ) = delete;
-            virtual ~config_decorator();
-
-            config_decorator& operator=( const config_decorator& ) = delete;
-            config_decorator& operator=( config_decorator&& ) = delete;
-
-            main_app* main() const;
-            app* this_app() const;
-
-            /// Add a subcommand that is linked to a particular main_app and can create options that modify that main_app's primary config
-            config_decorator* add_config_subcommand( std::string a_subcommand_name, std::string a_description="" );
-
-            /// Add an option that gets automatically added to the primary config of a main_app
-            template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
-            CLI::Option* add_config_option( std::string a_name,
-                                            std::string a_primary_config_addr,
-                                            std::string a_description = "" );
-
-            /// Add an option that gets automatically added to the primary config of a main_app
-            template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
-            CLI::Option* add_config_multi_option( std::string a_name,
-                                                  std::string a_primary_config_addr,
-                                                  std::string a_description = "" );
-
-            /// Add a flag that gets automatically added to the primary config of a main_app
-            /// The flag can be passed multiple times, and the number of instances will be recorded in the config
-            template< typename T, CLI::enable_if_t< std::is_integral<T>::value && ! CLI::is_bool<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
-            CLI::Option* add_config_flag( std::string a_name,
-                                          std::string a_primary_config_addr,
-                                          std::string a_description = "" );
-
-            /// Add a flag that gets automatically added to the primary config of a main_app
-            /// This flag is recorded in the config as a boolean: false if it doesn't appear in the command line, and true if it does
-            template< typename T, CLI::enable_if_t< CLI::is_bool<T>::value, CLI::detail::enabler > = CLI::detail::dummy >
-            CLI::Option* add_config_flag( std::string a_name,
-                                          std::string a_primary_config_addr,
-                                          std::string a_description = "" );
-
-        public:
-            // these structs provide a type erasure mechanism that:
-            //  - holds the actual value provided on the CL, and
-            //  - adds the value to the f_app_options, and then to the global config, from the pre_callback function
-            struct app_option_holder
-            {
-                virtual void add_to_app_options( param_node& a_app_options ) = 0;
-                CLI::Option* f_option;
-                std::string f_primary_config_addr;
-                virtual ~app_option_holder() {}
-            };
-
-            template< typename T >
-            struct app_option_holder_typed : app_option_holder
-            {
-                void add_to_app_options( param_node& a_app_options )
-                {
-                    if( ! (*f_option) ) return;
-                    param_ptr_t t_new_config_ptr = simple_parser::parse_address(
-                            f_primary_config_addr,
-                            param_ptr_t( new param_value(f_value) ) ); // throws scarab::error if top-level param object is not a node
-                    a_app_options.merge( t_new_config_ptr->as_node() );
-                    return;
-                }
-                T f_value;
-                virtual ~app_option_holder_typed() {}
-            };
-
-            template< typename T >
-            struct app_option_holder_vector_typed : app_option_holder
-            {
-                void add_to_app_options( param_node& a_app_options )
-                {
-                    if( ! (*f_option) ) return;
-                    param_array t_array;
-                    std::for_each( f_values.begin(), f_values.end(), [&t_array]( T a_value ){ t_array.push_back( a_value ); } );
-                    param_ptr_t t_new_config_ptr = simple_parser::parse_address(
-                            f_primary_config_addr,
-                            param_ptr_t( new param_array(std::move(t_array)) ) ); // throws scarab::error if top-level param object is not a node
-                    a_app_options.merge( t_new_config_ptr->as_node() );
-                    return;
-                }
-                std::vector< T > f_values;
-                virtual ~app_option_holder_vector_typed() {}
-            };
-
-            struct app_option_holder_bool_flag : app_option_holder
-            {
-                void add_to_app_options( param_node& a_app_options )
-                {
-                    if( ! (*f_option) ) return;
-                    param_ptr_t t_new_config_ptr = simple_parser::parse_address(
-                            f_primary_config_addr,
-                            param_ptr_t( new param_value(*f_option) ) ); // throws scarab::error if top-level param object is not a node
-                    a_app_options.merge( t_new_config_ptr->as_node() );
-                    return;
-                }
-                virtual ~app_option_holder_bool_flag() {}
-            };
-
-        protected:
-            main_app* f_main;
-            app* f_this;
-
-            // config_decorator owns the decorators of subcommands just like app owns the apps of subcommands
-            using conf_dec_ptr_t = std::unique_ptr< config_decorator >;
-            std::vector< conf_dec_ptr_t > f_subcommand_decorators;
-    };
-
-
-    /*!
-     @class main_app
-     @author N. S. Oblath
-
-     @brief Primary application class
-
-     @details
-     This class is designed to provide an entry point for an application, and to setup the application's configuration
-     based on information provided by the user at the command line.
-
-     Note that there is a constructor option, `use_config`, which allows `main_app` to be used without using the configuration file 
-     if it's set to false (the default is `true`). 
-     There will not be a `-c` CLI option, and the configuration steps will not be run.  Functionality is much closer 
-     to that of `CLI::App` in this case.
-
-     The application's primary "configuration" is in the form of a scarab::param_node object that takes input from
-     default values, a configuration file, directly-addressed arguments, and application-specific options.
-
-     The `main_app` class uses and makes available all of the functionality of the CLI11 library, and
-     in particular it directly extends the CLI::App class.  Links to documentation on how to use CLI11
-     are provided below.
-
-     Basic usage (customized from CLI11's basic usage):
-
-     int main( int argc, char **argv )
-     {
-         main_app the_main;
-
-         // Add new options/flags here
-
-         // Set the default config file
-         the_main.default_config() = t_default_config;
-
-         // This includes calling application::pre_callback() to finalize the global config
-         CLI11_PARSE( the_main, argc, argv );
-
-         return 0;
-     }
-
-     Notes on specifying and using command-line arguments:
-
-       There are two main types of command-line arguments:
-       1. "Options" are named arguments.  On the command line they look like `-b [value]`, `--broker [value]`, or `-r` (flag with no value)
-       2. "Non-option" arguments have no name, and typically rely on the order they fall on the command line to interpret their meaning.
-
-       Options need to be specified in an application (i.e. CLI11 needs to know about them at compile time).
-       All of the functionality of CLI11 is available when using `main_app`,
-       so you can create options and flags (options with no values) that do not affect the configuration.
-       Alternatively, `main_app` provides the ability to define options that are automatically added to the configuration (see below).
-
-     Notes for setting the configuration in an application:
-
-       Stages for setting the configuration
-       1. Default options
-       2. Config file
-       3. Non-option arguments
-       4. Application-specified options
-
-       In stage 3, arguments can have two forms:
-         - Keyword arguments, in the form [name]=[value], are merged with the primary config.
-           They're also separately accessible as `nonoption_kw_args`
-         - Ordered arguments, in the form [value], are not merged with the primary config.
-           They're accessible as `nonoption_ord_args`
-
-       Application specified options (stage 4) are merged with the config and
-       are separately accessible as `app_options`.  They have to be specified
-       in the application using `add_config_option()`, which will map
-       the option name to an address in the primary config.
-
-       The functionality for each stage is implemented in its own virtual function,
-       so a subclass can customize the procedure as needed.
-
-       Example:
-         > my_app -c config.yaml --an_opt 20 nested.value="hello"
-
-         What happens:
-         1. my_app will have default values hard-coded
-         2. File `config.yaml` will be parsed and merged with the defaults
-         3. Configuration `nested { value: "hello" }` will be merged with the primary config
-         4. Option `an_opt` will set something specified in the config to 20
-
-     See CLI11 documentation for the CLI::App class:
-     - GitHub Readme: https://github.com/CLIUtils/CLI11
-     - Tutorial: https://cliutils.gitlab.io/CLI11Tutorial
-     - API: https://cliutils.github.io/CLI11/index.html
-
-     There are several test examples that can be used as useful references on different ways that
-     applications can be setup.  You'll find them in the scarab/testing/applications directory.
-     - test_app_with_callback.cc -- an example that runs a program using a callback function
-     - test_app_with_options.cc -- an example using basic CLI11 options (i.e. options that don't modify the configuration)
-     - test_app_with_subcommands.cc -- an example with two subcommands.  e.g. my_app do_action_A --an_option=6
-     - test_basic_application.cc -- the example above
-     */
-    class SCARAB_API main_app : public config_decorator, public app
-    {
-        public:
-            main_app( bool a_use_config = true );
-            virtual ~main_app();
-
-        public:
-            /// parses positional arguments into the global config
-            /// called after parsing, before running callbacks
-            virtual void pre_callback();
-
-            // Functions to perform each configuration stage
-            /// Load default values
-            virtual void do_config_stage_1();
-            /// Load the config file
-            virtual void do_config_stage_2();
-            /// Load the directly-addressed non-option arguments
-            virtual void do_config_stage_3();
-            /// Load the application-specific options
-            virtual void do_config_stage_4();
-
-            void set_version( scarab::version_semantic_ptr_t a_ver );
-
-            /// Master configuration tree for the application
-            mv_referrable( param_node, primary_config );
-
-            // configuration stage 1
-            /// Default configuration values
-            mv_referrable( param_node, default_config );
-
-            // configuration stage 2
-            /// Configuration file name
-            mv_referrable_const( std::string, config_filename );
-
-            // configuration stage 3
-            /// Keyword configuration values coming from the command line, in the form: config.address=value
-            mv_referrable( param_node, nonoption_kw_args );
-            /// Ordered configuration values coming in an application-specific order from the command line, in the form: value
-            mv_referrable( param_array, nonoption_ord_args );
-
-            // configuration stage 4
-            /// Application-specific options that are specified using add_config_option() functions
-            mv_referrable( param_node, app_options );
-
-            /// Store the app option holder structs from this app and any subcommands
-            mv_referrable( std::vector< std::shared_ptr< app_option_holder > >, app_option_holders );
-
-            mv_accessible_noset( bool, use_config );
-
-            //*************************
-            // Verbosity
-            //*************************
-        public:
-            using verbosity_t = std::underlying_type< logger::ELevel >::type; // typically is unsigned
-
-            /// Get the global verbosity
-            verbosity_t get_global_verbosity() const;
-            /// Set the global verbosity with the verbosity value
-            void set_global_verbosity( verbosity_t a_verbosity );
-            /// Set the global verbosity with the verbosity enum
-            void set_global_verbosity( logger::ELevel a_verbosity );
-
-            void increase_global_verbosity( unsigned an_offset );
-            void decrease_global_verbosity( unsigned an_offset );
-
-            using verbosity_map_t = std::map< verbosity_t, logger::ELevel >;
-            using verbosity_iterator_t = verbosity_map_t::iterator;
-            static verbosity_map_t s_verbosities;
-
-        protected:
-            verbosity_iterator_t f_global_verbosity;
-
-    };
-
-
-    template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > >
-    CLI::Option* config_decorator::add_config_option( std::string a_name,
-                                                      std::string a_primary_config_addr,
-                                                      std::string a_description )
-    {
-        auto t_opt_holder_ptr = std::make_shared< app_option_holder_typed<T> >();
-        t_opt_holder_ptr->f_option = f_this->add_option( a_name, t_opt_holder_ptr->f_value, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
-        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
-        f_main->app_option_holders().push_back( t_opt_holder_ptr );
-        return t_opt_holder_ptr->f_option;
-    }
-
-    template< typename T, CLI::enable_if_t< ! CLI::is_vector<T>::value, CLI::detail::enabler > >
-    CLI::Option* config_decorator::add_config_multi_option( std::string a_name,
-                                                            std::string a_primary_config_addr,
-                                                            std::string a_description )
-    {
-        auto t_opt_holder_ptr = std::make_shared< app_option_holder_vector_typed<T> >();
-        t_opt_holder_ptr->f_option = f_this->add_option( a_name, t_opt_holder_ptr->f_values, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
-        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
-        f_main->app_option_holders().push_back( t_opt_holder_ptr );
-        return t_opt_holder_ptr->f_option;
-    }
-
-    template< typename T, CLI::enable_if_t< std::is_integral<T>::value && ! CLI::is_bool<T>::value, CLI::detail::enabler > >
-    CLI::Option* config_decorator::add_config_flag( std::string a_name,
-                                                    std::string a_primary_config_addr,
-                                                    std::string a_description )
-    {
-        auto t_opt_holder_ptr = std::make_shared< app_option_holder_typed<T> >();
-        t_opt_holder_ptr->f_option = f_this->add_flag( a_name, t_opt_holder_ptr->f_value, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
-        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
-        f_main->app_option_holders().push_back( t_opt_holder_ptr );
-        return t_opt_holder_ptr->f_option;
-    }
-
-    template< typename T, CLI::enable_if_t< CLI::is_bool<T>::value, CLI::detail::enabler > >
-    CLI::Option* config_decorator::add_config_flag( std::string a_name,
-                                                    std::string a_primary_config_addr,
-                                                    std::string a_description )
-    {
-        auto t_opt_holder_ptr = std::make_shared< app_option_holder_bool_flag >();
-        t_opt_holder_ptr->f_option = f_this->add_flag( a_name, a_description ); // throws CLI::OptionAlreadyAdded if the option's already there
-        t_opt_holder_ptr->f_primary_config_addr = a_primary_config_addr;
-        f_main->app_option_holders().push_back( t_opt_holder_ptr );
-        return t_opt_holder_ptr->f_option;
-    }
-
-    inline app* config_decorator::this_app() const
-    {
-        return f_this;
-    }
-
-    inline main_app* config_decorator::main() const
-    {
-        return f_main;
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_APPLICATION_HH_ */
diff --git a/Src/Scarab/library/cli/nonoption_parser.cc b/Src/Scarab/library/cli/nonoption_parser.cc
deleted file mode 100644
index 9bae5e4..0000000
--- a/Src/Scarab/library/cli/nonoption_parser.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#define SCARAB_API_EXPORTS
-
-#include "nonoption_parser.hh"
-
-#include "logger.hh"
-#include "param_helpers.hh"
-
-#include <cctype>
-#include <sstream>
-
-LOGGER( parselog, "nonoption_parser" );
-
-namespace scarab
-{
-    nonoption_parser::nonoption_parser( std::vector< std::string > an_args ) :
-            f_ord_args(),
-            f_kw_args()
-    {
-        for( const std::string& arg : an_args )
-        {
-            parse( arg ); // can throw scarab::error
-        }
-    }
-
-    nonoption_parser::~nonoption_parser()
-    {
-    }
-
-    void nonoption_parser::parse( const std::string& an_arg )
-    {
-        // this method can throw scarab::error
-
-        // if an_arg starts with '-', then it's either an option or it's a negative number.
-        if( an_arg[0] == f_option_starter ) 
-        {
-            param_ptr_t t_parsed( simple_parser::parse_value( an_arg ) );
-            param_value& t_value = (*t_parsed)();
-            if( t_value.is_int() || t_value.is_double() )
-            {
-                // if it parses as a number, then it's a negative number (no need to check uint, because presumably it's negative)
-                f_ord_args.push_back( std::move(t_parsed) );
-                return;
-            }
-            // if it's not a negtive number, then it's an option and shouldn't be considered here
-            throw error() << "Cannot parse an option with the nonoption_parser: " << an_arg;
-        }
-
-        size_t t_val_pos = an_arg.find_first_of( f_value_separator );
-        if( t_val_pos != std::string::npos )
-        {
-            // this argument has an '=' (or whatever f_value_separator is), so parse as a keyword argument
-            param_ptr_t t_new_param = simple_parser::parse_address(
-                    an_arg.substr(0, t_val_pos),
-                    simple_parser::parse_value( an_arg.substr(t_val_pos+1) ) ); // can throw scarab::error
-            f_kw_args.merge( t_new_param->as_node() );
-        }
-        else
-        {
-            // this argument has no '=', so parse it as an ordered argument
-            f_ord_args.push_back( simple_parser::parse_value( an_arg ) );
-        }
-
-        return;
-    }
-
-}
diff --git a/Src/Scarab/library/cli/nonoption_parser.hh b/Src/Scarab/library/cli/nonoption_parser.hh
deleted file mode 100644
index 147c817..0000000
--- a/Src/Scarab/library/cli/nonoption_parser.hh
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef SCARAB_NONOPTION_PARSER_HH_
-#define SCARAB_NONOPTION_PARSER_HH_
-
-#include "param.hh"
-
-#include "member_variables.hh"
-
-#include <string>
-
-namespace scarab
-{
-
-    class SCARAB_API nonoption_parser
-    {
-        public:
-            nonoption_parser( std::vector< std::string > an_args );
-            virtual ~nonoption_parser();
-
-            mv_referrable_const( param_array, ord_args );
-            mv_referrable_const( param_node, kw_args );
-
-        private:
-            void parse( const std::string& an_arg );
-
-        public:
-            static const char f_value_separator = '=';
-            static const char f_option_starter = '-';
-
-    };
-
-} /* namespace scarab */
-
-#endif /* SCARAB_NONOPTION_PARSER_HH_ */
diff --git a/Src/Scarab/library/external/CMakeLists.txt b/Src/Scarab/library/external/CMakeLists.txt
deleted file mode 100644
index 9d3ef96..0000000
--- a/Src/Scarab/library/external/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# CMakeLists.txt for Scarab/library/external
-# Author: N. Oblath
-# Created: May 29, 2020
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/date/date.h
-    PARENT_SCOPE )
-
-if( Scarab_BUILD_CLI )
-    set( Scarab_HEADERS ${Scarab_HEADERS}
-        ${dir}/cli11/CLI11.hpp
-        PARENT_SCOPE )
-endif( Scarab_BUILD_CLI )
diff --git a/Src/Scarab/library/external/cli11/CLI11.hpp b/Src/Scarab/library/external/cli11/CLI11.hpp
deleted file mode 100644
index 5c88087..0000000
--- a/Src/Scarab/library/external/cli11/CLI11.hpp
+++ /dev/null
@@ -1,6778 +0,0 @@
-#pragma once
-
-// CLI11: Version 1.8.0
-// Originally designed by Henry Schreiner
-// https://github.com/CLIUtils/CLI11
-//
-// This is a standalone header file generated by MakeSingleHeader.py in CLI11/scripts
-// from: v1.8.0
-//
-// From LICENSE:
-//
-// CLI11 1.8 Copyright (c) 2017-2019 University of Cincinnati, developed by Henry
-// Schreiner under NSF AWARD 1414736. All rights reserved.
-// 
-// Redistribution and use in source and binary forms of CLI11, with or without
-// modification, are permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its contributors
-//    may be used to endorse or promote products derived from this software without
-//    specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// Standard combined includes:
-
-#include <algorithm>
-#include <cmath>
-#include <deque>
-#include <exception>
-#include <fstream>
-#include <functional>
-#include <iomanip>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <locale>
-#include <map>
-#include <memory>
-#include <numeric>
-#include <set>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-
-// Verbatim copy from CLI/Version.hpp:
-
-
-#define CLI11_VERSION_MAJOR 1
-#define CLI11_VERSION_MINOR 8
-#define CLI11_VERSION_PATCH 0
-#define CLI11_VERSION "1.8.0"
-
-
-
-
-// Verbatim copy from CLI/Macros.hpp:
-
-
-// The following version macro is very similar to the one in PyBind11
-#if !(defined(_MSC_VER) && __cplusplus == 199711L) && !defined(__INTEL_COMPILER)
-#if __cplusplus >= 201402L
-#define CLI11_CPP14
-#if __cplusplus >= 201703L
-#define CLI11_CPP17
-#if __cplusplus > 201703L
-#define CLI11_CPP20
-#endif
-#endif
-#endif
-#elif defined(_MSC_VER) && __cplusplus == 199711L
-// MSVC sets _MSVC_LANG rather than __cplusplus (supposedly until the standard is fully implemented)
-// Unless you use the /Zc:__cplusplus flag on Visual Studio 2017 15.7 Preview 3 or newer
-#if _MSVC_LANG >= 201402L
-#define CLI11_CPP14
-#if _MSVC_LANG > 201402L && _MSC_VER >= 1910
-#define CLI11_CPP17
-#if __MSVC_LANG > 201703L && _MSC_VER >= 1910
-#define CLI11_CPP20
-#endif
-#endif
-#endif
-#endif
-
-#if defined(CLI11_CPP14)
-#define CLI11_DEPRECATED(reason) [[deprecated(reason)]]
-#elif defined(_MSC_VER)
-#define CLI11_DEPRECATED(reason) __declspec(deprecated(reason))
-#else
-#define CLI11_DEPRECATED(reason) __attribute__((deprecated(reason)))
-#endif
-
-
-
-
-// Verbatim copy from CLI/Optional.hpp:
-
-
-// You can explicitly enable or disable support
-// by defining to 1 or 0. Extra check here to ensure it's in the stdlib too.
-// We nest the check for __has_include and it's usage
-#ifndef CLI11_STD_OPTIONAL
-#ifdef __has_include
-#if defined(CLI11_CPP17) && __has_include(<optional>)
-#define CLI11_STD_OPTIONAL 1
-#else
-#define CLI11_STD_OPTIONAL 0
-#endif
-#else
-#define CLI11_STD_OPTIONAL 0
-#endif
-#endif
-
-#ifndef CLI11_EXPERIMENTAL_OPTIONAL
-#define CLI11_EXPERIMENTAL_OPTIONAL 0
-#endif
-
-#ifndef CLI11_BOOST_OPTIONAL
-#define CLI11_BOOST_OPTIONAL 0
-#endif
-
-#if CLI11_BOOST_OPTIONAL
-#include <boost/version.hpp>
-#if BOOST_VERSION < 106100
-#error "This boost::optional version is not supported, use 1.61 or better"
-#endif
-#endif
-
-#if CLI11_STD_OPTIONAL
-#include <optional>
-#endif
-#if CLI11_EXPERIMENTAL_OPTIONAL
-#include <experimental/optional>
-#endif
-#if CLI11_BOOST_OPTIONAL
-#include <boost/optional.hpp>
-#include <boost/optional/optional_io.hpp>
-#endif
-
-
-// From CLI/Version.hpp:
-
-
-
-// From CLI/Macros.hpp:
-
-
-
-// From CLI/Optional.hpp:
-
-namespace CLI {
-
-#if CLI11_STD_OPTIONAL
-template <typename T> std::istream &operator>>(std::istream &in, std::optional<T> &val) {
-    T v;
-    in >> v;
-    val = v;
-    return in;
-}
-#endif
-
-#if CLI11_EXPERIMENTAL_OPTIONAL
-template <typename T> std::istream &operator>>(std::istream &in, std::experimental::optional<T> &val) {
-    T v;
-    in >> v;
-    val = v;
-    return in;
-}
-#endif
-
-#if CLI11_BOOST_OPTIONAL
-template <typename T> std::istream &operator>>(std::istream &in, boost::optional<T> &val) {
-    T v;
-    in >> v;
-    val = v;
-    return in;
-}
-#endif
-
-// Export the best optional to the CLI namespace
-#if CLI11_STD_OPTIONAL
-using std::optional;
-#elif CLI11_EXPERIMENTAL_OPTIONAL
-using std::experimental::optional;
-#elif CLI11_BOOST_OPTIONAL
-using boost::optional;
-#endif
-
-// This is true if any optional is found
-#if CLI11_STD_OPTIONAL || CLI11_EXPERIMENTAL_OPTIONAL || CLI11_BOOST_OPTIONAL
-#define CLI11_OPTIONAL 1
-#endif
-
-} // namespace CLI
-
-// From CLI/StringTools.hpp:
-
-namespace CLI {
-
-/// Include the items in this namespace to get free conversion of enums to/from streams.
-/// (This is available inside CLI as well, so CLI11 will use this without a using statement).
-namespace enums {
-
-/// output streaming for enumerations
-template <typename T, typename = typename std::enable_if<std::is_enum<T>::value>::type>
-std::ostream &operator<<(std::ostream &in, const T &item) {
-    // make sure this is out of the detail namespace otherwise it won't be found when needed
-    return in << static_cast<typename std::underlying_type<T>::type>(item);
-}
-
-/// input streaming for enumerations
-template <typename T, typename = typename std::enable_if<std::is_enum<T>::value>::type>
-std::istream &operator>>(std::istream &in, T &item) {
-    typename std::underlying_type<T>::type i;
-    in >> i;
-    item = static_cast<T>(i);
-    return in;
-}
-} // namespace enums
-
-/// Export to CLI namespace
-using namespace enums;
-
-namespace detail {
-
-// Based on http://stackoverflow.com/questions/236129/split-a-string-in-c
-/// Split a string by a delim
-inline std::vector<std::string> split(const std::string &s, char delim) {
-    std::vector<std::string> elems;
-    // Check to see if empty string, give consistent result
-    if(s.empty())
-        elems.emplace_back();
-    else {
-        std::stringstream ss;
-        ss.str(s);
-        std::string item;
-        while(std::getline(ss, item, delim)) {
-            elems.push_back(item);
-        }
-    }
-    return elems;
-}
-/// simple utility to convert various types to a string
-template <typename T> inline std::string as_string(const T &v) {
-    std::ostringstream s;
-    s << v;
-    return s.str();
-}
-// if the data type is already a string just forward it
-template <typename T, typename = typename std::enable_if<std::is_constructible<std::string, T>::value>::type>
-inline auto as_string(T &&v) -> decltype(std::forward<T>(v)) {
-    return std::forward<T>(v);
-}
-
-/// Simple function to join a string
-template <typename T> std::string join(const T &v, std::string delim = ",") {
-    std::ostringstream s;
-    auto beg = std::begin(v);
-    auto end = std::end(v);
-    if(beg != end)
-        s << *beg++;
-    while(beg != end) {
-        s << delim << *beg++;
-    }
-    return s.str();
-}
-
-/// Simple function to join a string from processed elements
-template <typename T,
-          typename Callable,
-          typename = typename std::enable_if<!std::is_constructible<std::string, Callable>::value>::type>
-std::string join(const T &v, Callable func, std::string delim = ",") {
-    std::ostringstream s;
-    auto beg = std::begin(v);
-    auto end = std::end(v);
-    if(beg != end)
-        s << func(*beg++);
-    while(beg != end) {
-        s << delim << func(*beg++);
-    }
-    return s.str();
-}
-
-/// Join a string in reverse order
-template <typename T> std::string rjoin(const T &v, std::string delim = ",") {
-    std::ostringstream s;
-    for(size_t start = 0; start < v.size(); start++) {
-        if(start > 0)
-            s << delim;
-        s << v[v.size() - start - 1];
-    }
-    return s.str();
-}
-
-// Based roughly on http://stackoverflow.com/questions/25829143/c-trim-whitespace-from-a-string
-
-/// Trim whitespace from left of string
-inline std::string &ltrim(std::string &str) {
-    auto it = std::find_if(str.begin(), str.end(), [](char ch) { return !std::isspace<char>(ch, std::locale()); });
-    str.erase(str.begin(), it);
-    return str;
-}
-
-/// Trim anything from left of string
-inline std::string &ltrim(std::string &str, const std::string &filter) {
-    auto it = std::find_if(str.begin(), str.end(), [&filter](char ch) { return filter.find(ch) == std::string::npos; });
-    str.erase(str.begin(), it);
-    return str;
-}
-
-/// Trim whitespace from right of string
-inline std::string &rtrim(std::string &str) {
-    auto it = std::find_if(str.rbegin(), str.rend(), [](char ch) { return !std::isspace<char>(ch, std::locale()); });
-    str.erase(it.base(), str.end());
-    return str;
-}
-
-/// Trim anything from right of string
-inline std::string &rtrim(std::string &str, const std::string &filter) {
-    auto it =
-        std::find_if(str.rbegin(), str.rend(), [&filter](char ch) { return filter.find(ch) == std::string::npos; });
-    str.erase(it.base(), str.end());
-    return str;
-}
-
-/// Trim whitespace from string
-inline std::string &trim(std::string &str) { return ltrim(rtrim(str)); }
-
-/// Trim anything from string
-inline std::string &trim(std::string &str, const std::string filter) { return ltrim(rtrim(str, filter), filter); }
-
-/// Make a copy of the string and then trim it
-inline std::string trim_copy(const std::string &str) {
-    std::string s = str;
-    return trim(s);
-}
-
-/// Make a copy of the string and then trim it, any filter string can be used (any char in string is filtered)
-inline std::string trim_copy(const std::string &str, const std::string &filter) {
-    std::string s = str;
-    return trim(s, filter);
-}
-/// Print a two part "help" string
-inline std::ostream &format_help(std::ostream &out, std::string name, std::string description, size_t wid) {
-    name = "  " + name;
-    out << std::setw(static_cast<int>(wid)) << std::left << name;
-    if(!description.empty()) {
-        if(name.length() >= wid)
-            out << "\n" << std::setw(static_cast<int>(wid)) << "";
-        for(const char c : description) {
-            out.put(c);
-            if(c == '\n') {
-                out << std::setw(static_cast<int>(wid)) << "";
-            }
-        }
-    }
-    out << "\n";
-    return out;
-}
-
-/// Verify the first character of an option
-template <typename T> bool valid_first_char(T c) {
-    return std::isalnum(c, std::locale()) || c == '_' || c == '?' || c == '@';
-}
-
-/// Verify following characters of an option
-template <typename T> bool valid_later_char(T c) { return valid_first_char(c) || c == '.' || c == '-'; }
-
-/// Verify an option name
-inline bool valid_name_string(const std::string &str) {
-    if(str.empty() || !valid_first_char(str[0]))
-        return false;
-    for(auto c : str.substr(1))
-        if(!valid_later_char(c))
-            return false;
-    return true;
-}
-
-/// Verify that str consists of letters only
-inline bool isalpha(const std::string &str) {
-    return std::all_of(str.begin(), str.end(), [](char c) { return std::isalpha(c, std::locale()); });
-}
-
-/// Return a lower case version of a string
-inline std::string to_lower(std::string str) {
-    std::transform(std::begin(str), std::end(str), std::begin(str), [](const std::string::value_type &x) {
-        return std::tolower(x, std::locale());
-    });
-    return str;
-}
-
-/// remove underscores from a string
-inline std::string remove_underscore(std::string str) {
-    str.erase(std::remove(std::begin(str), std::end(str), '_'), std::end(str));
-    return str;
-}
-
-/// Find and replace a substring with another substring
-inline std::string find_and_replace(std::string str, std::string from, std::string to) {
-
-    size_t start_pos = 0;
-
-    while((start_pos = str.find(from, start_pos)) != std::string::npos) {
-        str.replace(start_pos, from.length(), to);
-        start_pos += to.length();
-    }
-
-    return str;
-}
-
-/// check if the flag definitions has possible false flags
-inline bool has_default_flag_values(const std::string &flags) {
-    return (flags.find_first_of("{!") != std::string::npos);
-}
-
-inline void remove_default_flag_values(std::string &flags) {
-    auto loc = flags.find_first_of('{');
-    while(loc != std::string::npos) {
-        auto finish = flags.find_first_of("},", loc + 1);
-        if((finish != std::string::npos) && (flags[finish] == '}')) {
-            flags.erase(flags.begin() + static_cast<std::ptrdiff_t>(loc),
-                        flags.begin() + static_cast<std::ptrdiff_t>(finish) + 1);
-        }
-        loc = flags.find_first_of('{', loc + 1);
-    }
-    flags.erase(std::remove(flags.begin(), flags.end(), '!'), flags.end());
-}
-
-/// Check if a string is a member of a list of strings and optionally ignore case or ignore underscores
-inline std::ptrdiff_t find_member(std::string name,
-                                  const std::vector<std::string> names,
-                                  bool ignore_case = false,
-                                  bool ignore_underscore = false) {
-    auto it = std::end(names);
-    if(ignore_case) {
-        if(ignore_underscore) {
-            name = detail::to_lower(detail::remove_underscore(name));
-            it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
-                return detail::to_lower(detail::remove_underscore(local_name)) == name;
-            });
-        } else {
-            name = detail::to_lower(name);
-            it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
-                return detail::to_lower(local_name) == name;
-            });
-        }
-
-    } else if(ignore_underscore) {
-        name = detail::remove_underscore(name);
-        it = std::find_if(std::begin(names), std::end(names), [&name](std::string local_name) {
-            return detail::remove_underscore(local_name) == name;
-        });
-    } else
-        it = std::find(std::begin(names), std::end(names), name);
-
-    return (it != std::end(names)) ? (it - std::begin(names)) : (-1);
-}
-
-/// Find a trigger string and call a modify callable function that takes the current string and starting position of the
-/// trigger and returns the position in the string to search for the next trigger string
-template <typename Callable> inline std::string find_and_modify(std::string str, std::string trigger, Callable modify) {
-    size_t start_pos = 0;
-    while((start_pos = str.find(trigger, start_pos)) != std::string::npos) {
-        start_pos = modify(str, start_pos);
-    }
-    return str;
-}
-
-/// Split a string '"one two" "three"' into 'one two', 'three'
-/// Quote characters can be ` ' or "
-inline std::vector<std::string> split_up(std::string str) {
-
-    const std::string delims("\'\"`");
-    auto find_ws = [](char ch) { return std::isspace<char>(ch, std::locale()); };
-    trim(str);
-
-    std::vector<std::string> output;
-    bool embeddedQuote = false;
-    char keyChar = ' ';
-    while(!str.empty()) {
-        if(delims.find_first_of(str[0]) != std::string::npos) {
-            keyChar = str[0];
-            auto end = str.find_first_of(keyChar, 1);
-            while((end != std::string::npos) && (str[end - 1] == '\\')) { // deal with escaped quotes
-                end = str.find_first_of(keyChar, end + 1);
-                embeddedQuote = true;
-            }
-            if(end != std::string::npos) {
-                output.push_back(str.substr(1, end - 1));
-                str = str.substr(end + 1);
-            } else {
-                output.push_back(str.substr(1));
-                str = "";
-            }
-        } else {
-            auto it = std::find_if(std::begin(str), std::end(str), find_ws);
-            if(it != std::end(str)) {
-                std::string value = std::string(str.begin(), it);
-                output.push_back(value);
-                str = std::string(it, str.end());
-            } else {
-                output.push_back(str);
-                str = "";
-            }
-        }
-        // transform any embedded quotes into the regular character
-        if(embeddedQuote) {
-            output.back() = find_and_replace(output.back(), std::string("\\") + keyChar, std::string(1, keyChar));
-            embeddedQuote = false;
-        }
-        trim(str);
-    }
-    return output;
-}
-
-/// Add a leader to the beginning of all new lines (nothing is added
-/// at the start of the first line). `"; "` would be for ini files
-///
-/// Can't use Regex, or this would be a subs.
-inline std::string fix_newlines(std::string leader, std::string input) {
-    std::string::size_type n = 0;
-    while(n != std::string::npos && n < input.size()) {
-        n = input.find('\n', n);
-        if(n != std::string::npos) {
-            input = input.substr(0, n + 1) + leader + input.substr(n + 1);
-            n += leader.size();
-        }
-    }
-    return input;
-}
-
-/// This function detects an equal or colon followed by an escaped quote after an argument
-/// then modifies the string to replace the equality with a space.  This is needed
-/// to allow the split up function to work properly and is intended to be used with the find_and_modify function
-/// the return value is the offset+1 which is required by the find_and_modify function.
-inline size_t escape_detect(std::string &str, size_t offset) {
-    auto next = str[offset + 1];
-    if((next == '\"') || (next == '\'') || (next == '`')) {
-        auto astart = str.find_last_of("-/ \"\'`", offset - 1);
-        if(astart != std::string::npos) {
-            if(str[astart] == ((str[offset] == '=') ? '-' : '/'))
-                str[offset] = ' '; // interpret this as a space so the split_up works properly
-        }
-    }
-    return offset + 1;
-}
-
-/// Add quotes if the string contains spaces
-inline std::string &add_quotes_if_needed(std::string &str) {
-    if((str.front() != '"' && str.front() != '\'') || str.front() != str.back()) {
-        char quote = str.find('"') < str.find('\'') ? '\'' : '"';
-        if(str.find(' ') != std::string::npos) {
-            str.insert(0, 1, quote);
-            str.append(1, quote);
-        }
-    }
-    return str;
-}
-
-} // namespace detail
-
-} // namespace CLI
-
-// From CLI/Error.hpp:
-
-namespace CLI {
-
-// Use one of these on all error classes.
-// These are temporary and are undef'd at the end of this file.
-#define CLI11_ERROR_DEF(parent, name)                                                                                  \
-  protected:                                                                                                           \
-    name(std::string ename, std::string msg, int exit_code) : parent(std::move(ename), std::move(msg), exit_code) {}   \
-    name(std::string ename, std::string msg, ExitCodes exit_code)                                                      \
-        : parent(std::move(ename), std::move(msg), exit_code) {}                                                       \
-                                                                                                                       \
-  public:                                                                                                              \
-    name(std::string msg, ExitCodes exit_code) : parent(#name, std::move(msg), exit_code) {}                           \
-    name(std::string msg, int exit_code) : parent(#name, std::move(msg), exit_code) {}
-
-// This is added after the one above if a class is used directly and builds its own message
-#define CLI11_ERROR_SIMPLE(name)                                                                                       \
-    explicit name(std::string msg) : name(#name, msg, ExitCodes::name) {}
-
-/// These codes are part of every error in CLI. They can be obtained from e using e.exit_code or as a quick shortcut,
-/// int values from e.get_error_code().
-enum class ExitCodes {
-    Success = 0,
-    IncorrectConstruction = 100,
-    BadNameString,
-    OptionAlreadyAdded,
-    FileError,
-    ConversionError,
-    ValidationError,
-    RequiredError,
-    RequiresError,
-    ExcludesError,
-    ExtrasError,
-    ConfigError,
-    InvalidError,
-    HorribleError,
-    OptionNotFound,
-    ArgumentMismatch,
-    BaseClass = 127
-};
-
-// Error definitions
-
-/// @defgroup error_group Errors
-/// @brief Errors thrown by CLI11
-///
-/// These are the errors that can be thrown. Some of them, like CLI::Success, are not really errors.
-/// @{
-
-/// All errors derive from this one
-class Error : public std::runtime_error {
-    int actual_exit_code;
-    std::string error_name{"Error"};
-
-  public:
-    int get_exit_code() const { return actual_exit_code; }
-
-    std::string get_name() const { return error_name; }
-
-    Error(std::string name, std::string msg, int exit_code = static_cast<int>(ExitCodes::BaseClass))
-        : runtime_error(msg), actual_exit_code(exit_code), error_name(std::move(name)) {}
-
-    Error(std::string name, std::string msg, ExitCodes exit_code) : Error(name, msg, static_cast<int>(exit_code)) {}
-};
-
-// Note: Using Error::Error constructors does not work on GCC 4.7
-
-/// Construction errors (not in parsing)
-class ConstructionError : public Error {
-    CLI11_ERROR_DEF(Error, ConstructionError)
-};
-
-/// Thrown when an option is set to conflicting values (non-vector and multi args, for example)
-class IncorrectConstruction : public ConstructionError {
-    CLI11_ERROR_DEF(ConstructionError, IncorrectConstruction)
-    CLI11_ERROR_SIMPLE(IncorrectConstruction)
-    static IncorrectConstruction PositionalFlag(std::string name) {
-        return IncorrectConstruction(name + ": Flags cannot be positional");
-    }
-    static IncorrectConstruction Set0Opt(std::string name) {
-        return IncorrectConstruction(name + ": Cannot set 0 expected, use a flag instead");
-    }
-    static IncorrectConstruction SetFlag(std::string name) {
-        return IncorrectConstruction(name + ": Cannot set an expected number for flags");
-    }
-    static IncorrectConstruction ChangeNotVector(std::string name) {
-        return IncorrectConstruction(name + ": You can only change the expected arguments for vectors");
-    }
-    static IncorrectConstruction AfterMultiOpt(std::string name) {
-        return IncorrectConstruction(
-            name + ": You can't change expected arguments after you've changed the multi option policy!");
-    }
-    static IncorrectConstruction MissingOption(std::string name) {
-        return IncorrectConstruction("Option " + name + " is not defined");
-    }
-    static IncorrectConstruction MultiOptionPolicy(std::string name) {
-        return IncorrectConstruction(name + ": multi_option_policy only works for flags and exact value options");
-    }
-};
-
-/// Thrown on construction of a bad name
-class BadNameString : public ConstructionError {
-    CLI11_ERROR_DEF(ConstructionError, BadNameString)
-    CLI11_ERROR_SIMPLE(BadNameString)
-    static BadNameString OneCharName(std::string name) { return BadNameString("Invalid one char name: " + name); }
-    static BadNameString BadLongName(std::string name) { return BadNameString("Bad long name: " + name); }
-    static BadNameString DashesOnly(std::string name) {
-        return BadNameString("Must have a name, not just dashes: " + name);
-    }
-    static BadNameString MultiPositionalNames(std::string name) {
-        return BadNameString("Only one positional name allowed, remove: " + name);
-    }
-};
-
-/// Thrown when an option already exists
-class OptionAlreadyAdded : public ConstructionError {
-    CLI11_ERROR_DEF(ConstructionError, OptionAlreadyAdded)
-    explicit OptionAlreadyAdded(std::string name)
-        : OptionAlreadyAdded(name + " is already added", ExitCodes::OptionAlreadyAdded) {}
-    static OptionAlreadyAdded Requires(std::string name, std::string other) {
-        return OptionAlreadyAdded(name + " requires " + other, ExitCodes::OptionAlreadyAdded);
-    }
-    static OptionAlreadyAdded Excludes(std::string name, std::string other) {
-        return OptionAlreadyAdded(name + " excludes " + other, ExitCodes::OptionAlreadyAdded);
-    }
-};
-
-// Parsing errors
-
-/// Anything that can error in Parse
-class ParseError : public Error {
-    CLI11_ERROR_DEF(Error, ParseError)
-};
-
-// Not really "errors"
-
-/// This is a successful completion on parsing, supposed to exit
-class Success : public ParseError {
-    CLI11_ERROR_DEF(ParseError, Success)
-    Success() : Success("Successfully completed, should be caught and quit", ExitCodes::Success) {}
-};
-
-/// -h or --help on command line
-class CallForHelp : public ParseError {
-    CLI11_ERROR_DEF(ParseError, CallForHelp)
-    CallForHelp() : CallForHelp("This should be caught in your main function, see examples", ExitCodes::Success) {}
-};
-
-/// Usually something like --help-all on command line
-class CallForAllHelp : public ParseError {
-    CLI11_ERROR_DEF(ParseError, CallForAllHelp)
-    CallForAllHelp()
-        : CallForAllHelp("This should be caught in your main function, see examples", ExitCodes::Success) {}
-};
-
-/// Does not output a diagnostic in CLI11_PARSE, but allows to return from main() with a specific error code.
-class RuntimeError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, RuntimeError)
-    explicit RuntimeError(int exit_code = 1) : RuntimeError("Runtime error", exit_code) {}
-};
-
-/// Thrown when parsing an INI file and it is missing
-class FileError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, FileError)
-    CLI11_ERROR_SIMPLE(FileError)
-    static FileError Missing(std::string name) { return FileError(name + " was not readable (missing?)"); }
-};
-
-/// Thrown when conversion call back fails, such as when an int fails to coerce to a string
-class ConversionError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, ConversionError)
-    CLI11_ERROR_SIMPLE(ConversionError)
-    ConversionError(std::string member, std::string name)
-        : ConversionError("The value " + member + " is not an allowed value for " + name) {}
-    ConversionError(std::string name, std::vector<std::string> results)
-        : ConversionError("Could not convert: " + name + " = " + detail::join(results)) {}
-    static ConversionError TooManyInputsFlag(std::string name) {
-        return ConversionError(name + ": too many inputs for a flag");
-    }
-    static ConversionError TrueFalse(std::string name) {
-        return ConversionError(name + ": Should be true/false or a number");
-    }
-};
-
-/// Thrown when validation of results fails
-class ValidationError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, ValidationError)
-    CLI11_ERROR_SIMPLE(ValidationError)
-    explicit ValidationError(std::string name, std::string msg) : ValidationError(name + ": " + msg) {}
-};
-
-/// Thrown when a required option is missing
-class RequiredError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, RequiredError)
-    explicit RequiredError(std::string name) : RequiredError(name + " is required", ExitCodes::RequiredError) {}
-    static RequiredError Subcommand(size_t min_subcom) {
-        if(min_subcom == 1)
-            return RequiredError("A subcommand");
-        else
-            return RequiredError("Requires at least " + std::to_string(min_subcom) + " subcommands",
-                                 ExitCodes::RequiredError);
-    }
-    static RequiredError Option(size_t min_option, size_t max_option, size_t used, const std::string &option_list) {
-        if((min_option == 1) && (max_option == 1) && (used == 0))
-            return RequiredError("Exactly 1 option from [" + option_list + "]");
-        else if((min_option == 1) && (max_option == 1) && (used > 1))
-            return RequiredError("Exactly 1 option from [" + option_list + "] is required and " + std::to_string(used) +
-                                     " were given",
-                                 ExitCodes::RequiredError);
-        else if((min_option == 1) && (used == 0))
-            return RequiredError("At least 1 option from [" + option_list + "]");
-        else if(used < min_option)
-            return RequiredError("Requires at least " + std::to_string(min_option) + " options used and only " +
-                                     std::to_string(used) + "were given from [" + option_list + "]",
-                                 ExitCodes::RequiredError);
-        else if(max_option == 1)
-            return RequiredError("Requires at most 1 options be given from [" + option_list + "]",
-                                 ExitCodes::RequiredError);
-        else
-            return RequiredError("Requires at most " + std::to_string(max_option) + " options be used and " +
-                                     std::to_string(used) + "were given from [" + option_list + "]",
-                                 ExitCodes::RequiredError);
-    }
-};
-
-/// Thrown when the wrong number of arguments has been received
-class ArgumentMismatch : public ParseError {
-    CLI11_ERROR_DEF(ParseError, ArgumentMismatch)
-    CLI11_ERROR_SIMPLE(ArgumentMismatch)
-    ArgumentMismatch(std::string name, int expected, size_t recieved)
-        : ArgumentMismatch(expected > 0 ? ("Expected exactly " + std::to_string(expected) + " arguments to " + name +
-                                           ", got " + std::to_string(recieved))
-                                        : ("Expected at least " + std::to_string(-expected) + " arguments to " + name +
-                                           ", got " + std::to_string(recieved)),
-                           ExitCodes::ArgumentMismatch) {}
-
-    static ArgumentMismatch AtLeast(std::string name, int num) {
-        return ArgumentMismatch(name + ": At least " + std::to_string(num) + " required");
-    }
-    static ArgumentMismatch TypedAtLeast(std::string name, int num, std::string type) {
-        return ArgumentMismatch(name + ": " + std::to_string(num) + " required " + type + " missing");
-    }
-    static ArgumentMismatch FlagOverride(std::string name) {
-        return ArgumentMismatch(name + " was given a disallowed flag override");
-    }
-};
-
-/// Thrown when a requires option is missing
-class RequiresError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, RequiresError)
-    RequiresError(std::string curname, std::string subname)
-        : RequiresError(curname + " requires " + subname, ExitCodes::RequiresError) {}
-};
-
-/// Thrown when an excludes option is present
-class ExcludesError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, ExcludesError)
-    ExcludesError(std::string curname, std::string subname)
-        : ExcludesError(curname + " excludes " + subname, ExitCodes::ExcludesError) {}
-};
-
-/// Thrown when too many positionals or options are found
-class ExtrasError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, ExtrasError)
-    explicit ExtrasError(std::vector<std::string> args)
-        : ExtrasError((args.size() > 1 ? "The following arguments were not expected: "
-                                       : "The following argument was not expected: ") +
-                          detail::rjoin(args, " "),
-                      ExitCodes::ExtrasError) {}
-};
-
-/// Thrown when extra values are found in an INI file
-class ConfigError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, ConfigError)
-    CLI11_ERROR_SIMPLE(ConfigError)
-    static ConfigError Extras(std::string item) { return ConfigError("INI was not able to parse " + item); }
-    static ConfigError NotConfigurable(std::string item) {
-        return ConfigError(item + ": This option is not allowed in a configuration file");
-    }
-};
-
-/// Thrown when validation fails before parsing
-class InvalidError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, InvalidError)
-    explicit InvalidError(std::string name)
-        : InvalidError(name + ": Too many positional arguments with unlimited expected args", ExitCodes::InvalidError) {
-    }
-};
-
-/// This is just a safety check to verify selection and parsing match - you should not ever see it
-/// Strings are directly added to this error, but again, it should never be seen.
-class HorribleError : public ParseError {
-    CLI11_ERROR_DEF(ParseError, HorribleError)
-    CLI11_ERROR_SIMPLE(HorribleError)
-};
-
-// After parsing
-
-/// Thrown when counting a non-existent option
-class OptionNotFound : public Error {
-    CLI11_ERROR_DEF(Error, OptionNotFound)
-    explicit OptionNotFound(std::string name) : OptionNotFound(name + " not found", ExitCodes::OptionNotFound) {}
-};
-
-#undef CLI11_ERROR_DEF
-#undef CLI11_ERROR_SIMPLE
-
-/// @}
-
-} // namespace CLI
-
-// From CLI/TypeTools.hpp:
-
-namespace CLI {
-
-// Type tools
-
-// Utilities for type enabling
-namespace detail {
-// Based generally on https://rmf.io/cxx11/almost-static-if
-/// Simple empty scoped class
-enum class enabler {};
-
-/// An instance to use in EnableIf
-constexpr enabler dummy = {};
-} // namespace detail
-
-/// A copy of enable_if_t from C++14, compatible with C++11.
-///
-/// We could check to see if C++14 is being used, but it does not hurt to redefine this
-/// (even Google does this: https://github.com/google/skia/blob/master/include/private/SkTLogic.h)
-/// It is not in the std namespace anyway, so no harm done.
-template <bool B, class T = void> using enable_if_t = typename std::enable_if<B, T>::type;
-
-/// A copy of std::void_t from C++17 (helper for C++11 and C++14)
-template <typename... Ts> struct make_void { using type = void; };
-
-/// A copy of std::void_t from C++17 - same reasoning as enable_if_t, it does not hurt to redefine
-template <typename... Ts> using void_t = typename make_void<Ts...>::type;
-
-/// A copy of std::conditional_t from C++14 - same reasoning as enable_if_t, it does not hurt to redefine
-template <bool B, class T, class F> using conditional_t = typename std::conditional<B, T, F>::type;
-
-/// Check to see if something is a vector (fail check by default)
-template <typename T> struct is_vector : std::false_type {};
-
-/// Check to see if something is a vector (true if actually a vector)
-template <class T, class A> struct is_vector<std::vector<T, A>> : std::true_type {};
-
-/// Check to see if something is bool (fail check by default)
-template <typename T> struct is_bool : std::false_type {};
-
-/// Check to see if something is bool (true if actually a bool)
-template <> struct is_bool<bool> : std::true_type {};
-
-/// Check to see if something is a shared pointer
-template <typename T> struct is_shared_ptr : std::false_type {};
-
-/// Check to see if something is a shared pointer (True if really a shared pointer)
-template <typename T> struct is_shared_ptr<std::shared_ptr<T>> : std::true_type {};
-
-/// Check to see if something is a shared pointer (True if really a shared pointer)
-template <typename T> struct is_shared_ptr<const std::shared_ptr<T>> : std::true_type {};
-
-/// Check to see if something is copyable pointer
-template <typename T> struct is_copyable_ptr {
-    static bool const value = is_shared_ptr<T>::value || std::is_pointer<T>::value;
-};
-
-/// This can be specialized to override the type deduction for IsMember.
-template <typename T> struct IsMemberType { using type = T; };
-
-/// The main custom type needed here is const char * should be a string.
-template <> struct IsMemberType<const char *> { using type = std::string; };
-
-namespace detail {
-
-// These are utilities for IsMember
-
-/// Handy helper to access the element_type generically. This is not part of is_copyable_ptr because it requires that
-/// pointer_traits<T> be valid.
-template <typename T> struct element_type {
-    using type =
-        typename std::conditional<is_copyable_ptr<T>::value, typename std::pointer_traits<T>::element_type, T>::type;
-};
-
-/// Combination of the element type and value type - remove pointer (including smart pointers) and get the value_type of
-/// the container
-template <typename T> struct element_value_type { using type = typename element_type<T>::type::value_type; };
-
-/// Adaptor for set-like structure: This just wraps a normal container in a few utilities that do almost nothing.
-template <typename T, typename _ = void> struct pair_adaptor : std::false_type {
-    using value_type = typename T::value_type;
-    using first_type = typename std::remove_const<value_type>::type;
-    using second_type = typename std::remove_const<value_type>::type;
-
-    /// Get the first value (really just the underlying value)
-    template <typename Q> static auto first(Q &&pair_value) -> decltype(std::forward<Q>(pair_value)) {
-        return std::forward<Q>(pair_value);
-    }
-    /// Get the second value (really just the underlying value)
-    template <typename Q> static auto second(Q &&pair_value) -> decltype(std::forward<Q>(pair_value)) {
-        return std::forward<Q>(pair_value);
-    }
-};
-
-/// Adaptor for map-like structure (true version, must have key_type and mapped_type).
-/// This wraps a mapped container in a few utilities access it in a general way.
-template <typename T>
-struct pair_adaptor<
-    T,
-    conditional_t<false, void_t<typename T::value_type::first_type, typename T::value_type::second_type>, void>>
-    : std::true_type {
-    using value_type = typename T::value_type;
-    using first_type = typename std::remove_const<typename value_type::first_type>::type;
-    using second_type = typename std::remove_const<typename value_type::second_type>::type;
-
-    /// Get the first value (really just the underlying value)
-    template <typename Q> static auto first(Q &&pair_value) -> decltype(std::get<0>(std::forward<Q>(pair_value))) {
-        return std::get<0>(std::forward<Q>(pair_value));
-    }
-    /// Get the second value (really just the underlying value)
-    template <typename Q> static auto second(Q &&pair_value) -> decltype(std::get<1>(std::forward<Q>(pair_value))) {
-        return std::get<1>(std::forward<Q>(pair_value));
-    }
-};
-
-// Check for streamability
-// Based on https://stackoverflow.com/questions/22758291/how-can-i-detect-if-a-type-can-be-streamed-to-an-stdostream
-
-template <typename S, typename T> class is_streamable {
-    template <typename SS, typename TT>
-    static auto test(int) -> decltype(std::declval<SS &>() << std::declval<TT>(), std::true_type());
-
-    template <typename, typename> static auto test(...) -> std::false_type;
-
-  public:
-    static const bool value = decltype(test<S, T>(0))::value;
-};
-
-/// Convert an object to a string (directly forward if this can become a string)
-template <typename T, enable_if_t<std::is_constructible<std::string, T>::value, detail::enabler> = detail::dummy>
-auto to_string(T &&value) -> decltype(std::forward<T>(value)) {
-    return std::forward<T>(value);
-}
-
-/// Convert an object to a string (streaming must be supported for that type)
-template <typename T,
-          enable_if_t<!std::is_constructible<std::string, T>::value && is_streamable<std::stringstream, T>::value,
-                      detail::enabler> = detail::dummy>
-std::string to_string(T &&value) {
-    std::stringstream stream;
-    stream << value;
-    return stream.str();
-}
-
-/// If conversion is not supported, return an empty string (streaming is not supported for that type)
-template <typename T,
-          enable_if_t<!std::is_constructible<std::string, T>::value && !is_streamable<std::stringstream, T>::value,
-                      detail::enabler> = detail::dummy>
-std::string to_string(T &&) {
-    return std::string{};
-}
-
-// Type name print
-
-/// Was going to be based on
-///  http://stackoverflow.com/questions/1055452/c-get-name-of-type-in-template
-/// But this is cleaner and works better in this case
-
-template <typename T,
-          enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value, detail::enabler> = detail::dummy>
-constexpr const char *type_name() {
-    return "INT";
-}
-
-template <typename T,
-          enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value, detail::enabler> = detail::dummy>
-constexpr const char *type_name() {
-    return "UINT";
-}
-
-template <typename T, enable_if_t<std::is_floating_point<T>::value, detail::enabler> = detail::dummy>
-constexpr const char *type_name() {
-    return "FLOAT";
-}
-
-/// This one should not be used, since vector types print the internal type
-template <typename T, enable_if_t<is_vector<T>::value, detail::enabler> = detail::dummy>
-constexpr const char *type_name() {
-    return "VECTOR";
-}
-/// Print name for enumeration types
-template <typename T, enable_if_t<std::is_enum<T>::value, detail::enabler> = detail::dummy>
-constexpr const char *type_name() {
-    return "ENUM";
-}
-
-/// Print for all other types
-template <typename T,
-          enable_if_t<!std::is_floating_point<T>::value && !std::is_integral<T>::value && !is_vector<T>::value &&
-                          !std::is_enum<T>::value,
-                      detail::enabler> = detail::dummy>
-constexpr const char *type_name() {
-    return "TEXT";
-}
-
-// Lexical cast
-
-/// Convert a flag into an integer value  typically binary flags
-inline int64_t to_flag_value(std::string val) {
-    static const std::string trueString("true");
-    static const std::string falseString("false");
-    if(val == trueString) {
-        return 1;
-    }
-    if(val == falseString) {
-        return -1;
-    }
-    val = detail::to_lower(val);
-    int64_t ret;
-    if(val.size() == 1) {
-        switch(val[0]) {
-        case '0':
-        case 'f':
-        case 'n':
-        case '-':
-            ret = -1;
-            break;
-        case '1':
-        case 't':
-        case 'y':
-        case '+':
-            ret = 1;
-            break;
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            ret = val[0] - '0';
-            break;
-        default:
-            throw std::invalid_argument("unrecognized character");
-        }
-        return ret;
-    }
-    if(val == trueString || val == "on" || val == "yes" || val == "enable") {
-        ret = 1;
-    } else if(val == falseString || val == "off" || val == "no" || val == "disable") {
-        ret = -1;
-    } else {
-        ret = std::stoll(val);
-    }
-    return ret;
-}
-
-/// Signed integers
-template <
-    typename T,
-    enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value && !is_bool<T>::value && !std::is_enum<T>::value,
-                detail::enabler> = detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    try {
-        size_t n = 0;
-        long long output_ll = std::stoll(input, &n, 0);
-        output = static_cast<T>(output_ll);
-        return n == input.size() && static_cast<long long>(output) == output_ll;
-    } catch(const std::invalid_argument &) {
-        return false;
-    } catch(const std::out_of_range &) {
-        return false;
-    }
-}
-
-/// Unsigned integers
-template <typename T,
-          enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value && !is_bool<T>::value, detail::enabler> =
-              detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    if(!input.empty() && input.front() == '-')
-        return false; // std::stoull happily converts negative values to junk without any errors.
-
-    try {
-        size_t n = 0;
-        unsigned long long output_ll = std::stoull(input, &n, 0);
-        output = static_cast<T>(output_ll);
-        return n == input.size() && static_cast<unsigned long long>(output) == output_ll;
-    } catch(const std::invalid_argument &) {
-        return false;
-    } catch(const std::out_of_range &) {
-        return false;
-    }
-}
-
-/// Boolean values
-template <typename T, enable_if_t<is_bool<T>::value, detail::enabler> = detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    try {
-        auto out = to_flag_value(input);
-        output = (out > 0);
-        return true;
-    } catch(const std::invalid_argument &) {
-        return false;
-    }
-}
-
-/// Floats
-template <typename T, enable_if_t<std::is_floating_point<T>::value, detail::enabler> = detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    try {
-        size_t n = 0;
-        output = static_cast<T>(std::stold(input, &n));
-        return n == input.size();
-    } catch(const std::invalid_argument &) {
-        return false;
-    } catch(const std::out_of_range &) {
-        return false;
-    }
-}
-
-/// String and similar
-template <typename T,
-          enable_if_t<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
-                          std::is_assignable<T &, std::string>::value,
-                      detail::enabler> = detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    output = input;
-    return true;
-}
-
-/// Enumerations
-template <typename T, enable_if_t<std::is_enum<T>::value, detail::enabler> = detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    typename std::underlying_type<T>::type val;
-    bool retval = detail::lexical_cast(input, val);
-    if(!retval) {
-        return false;
-    }
-    output = static_cast<T>(val);
-    return true;
-}
-
-/// Non-string parsable
-template <typename T,
-          enable_if_t<!std::is_floating_point<T>::value && !std::is_integral<T>::value &&
-                          !std::is_assignable<T &, std::string>::value && !std::is_enum<T>::value,
-                      detail::enabler> = detail::dummy>
-bool lexical_cast(std::string input, T &output) {
-    std::istringstream is;
-
-    is.str(input);
-    is >> output;
-    return !is.fail() && !is.rdbuf()->in_avail();
-}
-
-/// Sum a vector of flag representations
-/// The flag vector produces a series of strings in a vector,  simple true is represented by a "1",  simple false is by
-/// "-1" an if numbers are passed by some fashion they are captured as well so the function just checks for the most
-/// common true and false strings then uses stoll to convert the rest for summing
-template <typename T,
-          enable_if_t<std::is_integral<T>::value && std::is_unsigned<T>::value, detail::enabler> = detail::dummy>
-void sum_flag_vector(const std::vector<std::string> &flags, T &output) {
-    int64_t count{0};
-    for(auto &flag : flags) {
-        count += detail::to_flag_value(flag);
-    }
-    output = (count > 0) ? static_cast<T>(count) : T{0};
-}
-
-/// Sum a vector of flag representations
-/// The flag vector produces a series of strings in a vector,  simple true is represented by a "1",  simple false is by
-/// "-1" an if numbers are passed by some fashion they are captured as well so the function just checks for the most
-/// common true and false strings then uses stoll to convert the rest for summing
-template <typename T,
-          enable_if_t<std::is_integral<T>::value && std::is_signed<T>::value, detail::enabler> = detail::dummy>
-void sum_flag_vector(const std::vector<std::string> &flags, T &output) {
-    int64_t count{0};
-    for(auto &flag : flags) {
-        count += detail::to_flag_value(flag);
-    }
-    output = static_cast<T>(count);
-}
-
-} // namespace detail
-} // namespace CLI
-
-// From CLI/Split.hpp:
-
-namespace CLI {
-namespace detail {
-
-// Returns false if not a short option. Otherwise, sets opt name and rest and returns true
-inline bool split_short(const std::string &current, std::string &name, std::string &rest) {
-    if(current.size() > 1 && current[0] == '-' && valid_first_char(current[1])) {
-        name = current.substr(1, 1);
-        rest = current.substr(2);
-        return true;
-    } else
-        return false;
-}
-
-// Returns false if not a long option. Otherwise, sets opt name and other side of = and returns true
-inline bool split_long(const std::string &current, std::string &name, std::string &value) {
-    if(current.size() > 2 && current.substr(0, 2) == "--" && valid_first_char(current[2])) {
-        auto loc = current.find_first_of('=');
-        if(loc != std::string::npos) {
-            name = current.substr(2, loc - 2);
-            value = current.substr(loc + 1);
-        } else {
-            name = current.substr(2);
-            value = "";
-        }
-        return true;
-    } else
-        return false;
-}
-
-// Returns false if not a windows style option. Otherwise, sets opt name and value and returns true
-inline bool split_windows_style(const std::string &current, std::string &name, std::string &value) {
-    if(current.size() > 1 && current[0] == '/' && valid_first_char(current[1])) {
-        auto loc = current.find_first_of(':');
-        if(loc != std::string::npos) {
-            name = current.substr(1, loc - 1);
-            value = current.substr(loc + 1);
-        } else {
-            name = current.substr(1);
-            value = "";
-        }
-        return true;
-    } else
-        return false;
-}
-
-// Splits a string into multiple long and short names
-inline std::vector<std::string> split_names(std::string current) {
-    std::vector<std::string> output;
-    size_t val;
-    while((val = current.find(",")) != std::string::npos) {
-        output.push_back(trim_copy(current.substr(0, val)));
-        current = current.substr(val + 1);
-    }
-    output.push_back(trim_copy(current));
-    return output;
-}
-
-/// extract default flag values either {def} or starting with a !
-inline std::vector<std::pair<std::string, std::string>> get_default_flag_values(const std::string &str) {
-    std::vector<std::string> flags = split_names(str);
-    flags.erase(std::remove_if(flags.begin(),
-                               flags.end(),
-                               [](const std::string &name) {
-                                   return ((name.empty()) || (!(((name.find_first_of('{') != std::string::npos) &&
-                                                                 (name.back() == '}')) ||
-                                                                (name[0] == '!'))));
-                               }),
-                flags.end());
-    std::vector<std::pair<std::string, std::string>> output;
-    output.reserve(flags.size());
-    for(auto &flag : flags) {
-        auto def_start = flag.find_first_of('{');
-        std::string defval = "false";
-        if((def_start != std::string::npos) && (flag.back() == '}')) {
-            defval = flag.substr(def_start + 1);
-            defval.pop_back();
-            flag.erase(def_start, std::string::npos);
-        }
-        flag.erase(0, flag.find_first_not_of("-!"));
-        output.emplace_back(flag, defval);
-    }
-    return output;
-}
-
-/// Get a vector of short names, one of long names, and a single name
-inline std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>
-get_names(const std::vector<std::string> &input) {
-
-    std::vector<std::string> short_names;
-    std::vector<std::string> long_names;
-    std::string pos_name;
-
-    for(std::string name : input) {
-        if(name.length() == 0)
-            continue;
-        else if(name.length() > 1 && name[0] == '-' && name[1] != '-') {
-            if(name.length() == 2 && valid_first_char(name[1]))
-                short_names.emplace_back(1, name[1]);
-            else
-                throw BadNameString::OneCharName(name);
-        } else if(name.length() > 2 && name.substr(0, 2) == "--") {
-            name = name.substr(2);
-            if(valid_name_string(name))
-                long_names.push_back(name);
-            else
-                throw BadNameString::BadLongName(name);
-        } else if(name == "-" || name == "--") {
-            throw BadNameString::DashesOnly(name);
-        } else {
-            if(pos_name.length() > 0)
-                throw BadNameString::MultiPositionalNames(name);
-            pos_name = name;
-        }
-    }
-
-    return std::tuple<std::vector<std::string>, std::vector<std::string>, std::string>(
-        short_names, long_names, pos_name);
-}
-
-} // namespace detail
-} // namespace CLI
-
-// From CLI/ConfigFwd.hpp:
-
-namespace CLI {
-
-class App;
-
-namespace detail {
-
-/// Comma separated join, adds quotes if needed
-inline std::string ini_join(std::vector<std::string> args) {
-    std::ostringstream s;
-    size_t start = 0;
-    for(const auto &arg : args) {
-        if(start++ > 0)
-            s << " ";
-
-        auto it = std::find_if(arg.begin(), arg.end(), [](char ch) { return std::isspace<char>(ch, std::locale()); });
-        if(it == arg.end())
-            s << arg;
-        else if(arg.find_first_of('\"') == std::string::npos)
-            s << '\"' << arg << '\"';
-        else
-            s << '\'' << arg << '\'';
-    }
-
-    return s.str();
-}
-
-} // namespace detail
-
-/// Holds values to load into Options
-struct ConfigItem {
-    /// This is the list of parents
-    std::vector<std::string> parents;
-
-    /// This is the name
-    std::string name;
-
-    /// Listing of inputs
-    std::vector<std::string> inputs;
-
-    /// The list of parents and name joined by "."
-    std::string fullname() const {
-        std::vector<std::string> tmp = parents;
-        tmp.emplace_back(name);
-        return detail::join(tmp, ".");
-    }
-};
-
-/// This class provides a converter for configuration files.
-class Config {
-  protected:
-    std::vector<ConfigItem> items;
-
-  public:
-    /// Convert an app into a configuration
-    virtual std::string to_config(const App *, bool, bool, std::string) const = 0;
-
-    /// Convert a configuration into an app
-    virtual std::vector<ConfigItem> from_config(std::istream &) const = 0;
-
-    /// Get a flag value
-    virtual std::string to_flag(const ConfigItem &item) const {
-        if(item.inputs.size() == 1) {
-            return item.inputs.at(0);
-        }
-        throw ConversionError::TooManyInputsFlag(item.fullname());
-    }
-
-    /// Parse a config file, throw an error (ParseError:ConfigParseError or FileError) on failure
-    std::vector<ConfigItem> from_file(const std::string &name) {
-        std::ifstream input{name};
-        if(!input.good())
-            throw FileError::Missing(name);
-
-        return from_config(input);
-    }
-
-    /// Virtual destructor
-    virtual ~Config() = default;
-};
-
-/// This converter works with INI files
-class ConfigINI : public Config {
-  public:
-    std::string to_config(const App *, bool default_also, bool write_description, std::string prefix) const override;
-
-    std::vector<ConfigItem> from_config(std::istream &input) const override {
-        std::string line;
-        std::string section = "default";
-
-        std::vector<ConfigItem> output;
-
-        while(getline(input, line)) {
-            std::vector<std::string> items_buffer;
-
-            detail::trim(line);
-            size_t len = line.length();
-            if(len > 1 && line[0] == '[' && line[len - 1] == ']') {
-                section = line.substr(1, len - 2);
-            } else if(len > 0 && line[0] != ';') {
-                output.emplace_back();
-                ConfigItem &out = output.back();
-
-                // Find = in string, split and recombine
-                auto pos = line.find('=');
-                if(pos != std::string::npos) {
-                    out.name = detail::trim_copy(line.substr(0, pos));
-                    std::string item = detail::trim_copy(line.substr(pos + 1));
-                    items_buffer = detail::split_up(item);
-                } else {
-                    out.name = detail::trim_copy(line);
-                    items_buffer = {"ON"};
-                }
-
-                if(detail::to_lower(section) != "default") {
-                    out.parents = {section};
-                }
-
-                if(out.name.find('.') != std::string::npos) {
-                    std::vector<std::string> plist = detail::split(out.name, '.');
-                    out.name = plist.back();
-                    plist.pop_back();
-                    out.parents.insert(out.parents.end(), plist.begin(), plist.end());
-                }
-
-                out.inputs.insert(std::end(out.inputs), std::begin(items_buffer), std::end(items_buffer));
-            }
-        }
-        return output;
-    }
-};
-
-} // namespace CLI
-
-// From CLI/Validators.hpp:
-
-namespace CLI {
-
-class Option;
-
-/// @defgroup validator_group Validators
-
-/// @brief Some validators that are provided
-///
-/// These are simple `std::string(const std::string&)` validators that are useful. They return
-/// a string if the validation fails. A custom struct is provided, as well, with the same user
-/// semantics, but with the ability to provide a new type name.
-/// @{
-
-///
-class Validator {
-  protected:
-    /// This is the description function, if empty the description_ will be used
-    std::function<std::string()> desc_function_{[]() { return std::string{}; }};
-
-    /// This it the base function that is to be called.
-    /// Returns a string error message if validation fails.
-    std::function<std::string(std::string &)> func_{[](std::string &) { return std::string{}; }};
-    /// The name for search purposes of the Validator
-    std::string name_;
-    /// Enable for Validator to allow it to be disabled if need be
-    bool active_{true};
-    /// specify that a validator should not modify the input
-    bool non_modifying_{false};
-
-  public:
-    Validator() = default;
-    /// Construct a Validator with just the description string
-    explicit Validator(std::string validator_desc) : desc_function_([validator_desc]() { return validator_desc; }) {}
-    // Construct Validator from basic information
-    Validator(std::function<std::string(std::string &)> op, std::string validator_desc, std::string validator_name = "")
-        : desc_function_([validator_desc]() { return validator_desc; }), func_(std::move(op)),
-          name_(std::move(validator_name)) {}
-    /// Set the Validator operation function
-    Validator &operation(std::function<std::string(std::string &)> op) {
-        func_ = std::move(op);
-        return *this;
-    }
-    /// This is the required operator for a Validator - provided to help
-    /// users (CLI11 uses the member `func` directly)
-    std::string operator()(std::string &str) const {
-        std::string retstring;
-        if(active_) {
-            if(non_modifying_) {
-                std::string value = str;
-                retstring = func_(value);
-            } else {
-                retstring = func_(str);
-            }
-        }
-        return retstring;
-    };
-
-    /// This is the required operator for a Validator - provided to help
-    /// users (CLI11 uses the member `func` directly)
-    std::string operator()(const std::string &str) const {
-        std::string value = str;
-        return (active_) ? func_(value) : std::string{};
-    };
-
-    /// Specify the type string
-    Validator &description(std::string validator_desc) {
-        desc_function_ = [validator_desc]() { return validator_desc; };
-        return *this;
-    }
-    /// Generate type description information for the Validator
-    std::string get_description() const {
-        if(active_) {
-            return desc_function_();
-        }
-        return std::string{};
-    }
-    /// Specify the type string
-    Validator &name(std::string validator_name) {
-        name_ = std::move(validator_name);
-        return *this;
-    }
-    /// Get the name of the Validator
-    const std::string &get_name() const { return name_; }
-    /// Specify whether the Validator is active or not
-    Validator &active(bool active_val = true) {
-        active_ = active_val;
-        return *this;
-    }
-
-    /// Specify whether the Validator can be modifying or not
-    Validator &non_modifying(bool no_modify = true) {
-        non_modifying_ = no_modify;
-        return *this;
-    }
-
-    /// Get a boolean if the validator is active
-    bool get_active() const { return active_; }
-
-    /// Get a boolean if the validator is allowed to modify the input returns true if it can modify the input
-    bool get_modifying() const { return !non_modifying_; }
-
-    /// Combining validators is a new validator. Type comes from left validator if function, otherwise only set if the
-    /// same.
-    Validator operator&(const Validator &other) const {
-        Validator newval;
-
-        newval._merge_description(*this, other, " AND ");
-
-        // Give references (will make a copy in lambda function)
-        const std::function<std::string(std::string & filename)> &f1 = func_;
-        const std::function<std::string(std::string & filename)> &f2 = other.func_;
-
-        newval.func_ = [f1, f2](std::string &input) {
-            std::string s1 = f1(input);
-            std::string s2 = f2(input);
-            if(!s1.empty() && !s2.empty())
-                return std::string("(") + s1 + ") AND (" + s2 + ")";
-            else
-                return s1 + s2;
-        };
-
-        newval.active_ = (active_ & other.active_);
-        return newval;
-    }
-
-    /// Combining validators is a new validator. Type comes from left validator if function, otherwise only set if the
-    /// same.
-    Validator operator|(const Validator &other) const {
-        Validator newval;
-
-        newval._merge_description(*this, other, " OR ");
-
-        // Give references (will make a copy in lambda function)
-        const std::function<std::string(std::string &)> &f1 = func_;
-        const std::function<std::string(std::string &)> &f2 = other.func_;
-
-        newval.func_ = [f1, f2](std::string &input) {
-            std::string s1 = f1(input);
-            std::string s2 = f2(input);
-            if(s1.empty() || s2.empty())
-                return std::string();
-            else
-                return std::string("(") + s1 + ") OR (" + s2 + ")";
-        };
-        newval.active_ = (active_ & other.active_);
-        return newval;
-    }
-
-    /// Create a validator that fails when a given validator succeeds
-    Validator operator!() const {
-        Validator newval;
-        const std::function<std::string()> &dfunc1 = desc_function_;
-        newval.desc_function_ = [dfunc1]() {
-            auto str = dfunc1();
-            return (!str.empty()) ? std::string("NOT ") + str : std::string{};
-        };
-        // Give references (will make a copy in lambda function)
-        const std::function<std::string(std::string & res)> &f1 = func_;
-
-        newval.func_ = [f1, dfunc1](std::string &test) -> std::string {
-            std::string s1 = f1(test);
-            if(s1.empty()) {
-                return std::string("check ") + dfunc1() + " succeeded improperly";
-            } else
-                return std::string{};
-        };
-        newval.active_ = active_;
-        return newval;
-    }
-
-  private:
-    void _merge_description(const Validator &val1, const Validator &val2, const std::string &merger) {
-
-        const std::function<std::string()> &dfunc1 = val1.desc_function_;
-        const std::function<std::string()> &dfunc2 = val2.desc_function_;
-
-        desc_function_ = [=]() {
-            std::string f1 = dfunc1();
-            std::string f2 = dfunc2();
-            if((f1.empty()) || (f2.empty())) {
-                return f1 + f2;
-            }
-            return std::string("(") + f1 + ")" + merger + "(" + f2 + ")";
-        };
-    }
-};
-
-/// Class wrapping some of the accessors of Validator
-class CustomValidator : public Validator {
-  public:
-};
-// The implementation of the built in validators is using the Validator class;
-// the user is only expected to use the const (static) versions (since there's no setup).
-// Therefore, this is in detail.
-namespace detail {
-
-/// Check for an existing file (returns error message if check fails)
-class ExistingFileValidator : public Validator {
-  public:
-    ExistingFileValidator() : Validator("FILE") {
-        func_ = [](std::string &filename) {
-            struct stat buffer;
-            bool exist = stat(filename.c_str(), &buffer) == 0;
-            bool is_dir = (buffer.st_mode & S_IFDIR) != 0;
-            if(!exist) {
-                return "File does not exist: " + filename;
-            } else if(is_dir) {
-                return "File is actually a directory: " + filename;
-            }
-            return std::string();
-        };
-    }
-};
-
-/// Check for an existing directory (returns error message if check fails)
-class ExistingDirectoryValidator : public Validator {
-  public:
-    ExistingDirectoryValidator() : Validator("DIR") {
-        func_ = [](std::string &filename) {
-            struct stat buffer;
-            bool exist = stat(filename.c_str(), &buffer) == 0;
-            bool is_dir = (buffer.st_mode & S_IFDIR) != 0;
-            if(!exist) {
-                return "Directory does not exist: " + filename;
-            } else if(!is_dir) {
-                return "Directory is actually a file: " + filename;
-            }
-            return std::string();
-        };
-    }
-};
-
-/// Check for an existing path
-class ExistingPathValidator : public Validator {
-  public:
-    ExistingPathValidator() : Validator("PATH(existing)") {
-        func_ = [](std::string &filename) {
-            struct stat buffer;
-            bool const exist = stat(filename.c_str(), &buffer) == 0;
-            if(!exist) {
-                return "Path does not exist: " + filename;
-            }
-            return std::string();
-        };
-    }
-};
-
-/// Check for an non-existing path
-class NonexistentPathValidator : public Validator {
-  public:
-    NonexistentPathValidator() : Validator("PATH(non-existing)") {
-        func_ = [](std::string &filename) {
-            struct stat buffer;
-            bool exist = stat(filename.c_str(), &buffer) == 0;
-            if(exist) {
-                return "Path already exists: " + filename;
-            }
-            return std::string();
-        };
-    }
-};
-
-/// Validate the given string is a legal ipv4 address
-class IPV4Validator : public Validator {
-  public:
-    IPV4Validator() : Validator("IPV4") {
-        func_ = [](std::string &ip_addr) {
-            auto result = CLI::detail::split(ip_addr, '.');
-            if(result.size() != 4) {
-                return "Invalid IPV4 address must have four parts " + ip_addr;
-            }
-            int num;
-            bool retval = true;
-            for(const auto &var : result) {
-                retval &= detail::lexical_cast(var, num);
-                if(!retval) {
-                    return "Failed parsing number " + var;
-                }
-                if(num < 0 || num > 255) {
-                    return "Each IP number must be between 0 and 255 " + var;
-                }
-            }
-            return std::string();
-        };
-    }
-};
-
-/// Validate the argument is a number and greater than or equal to 0
-class PositiveNumber : public Validator {
-  public:
-    PositiveNumber() : Validator("POSITIVE") {
-        func_ = [](std::string &number_str) {
-            int number;
-            if(!detail::lexical_cast(number_str, number)) {
-                return "Failed parsing number " + number_str;
-            }
-            if(number < 0) {
-                return "Number less then 0 " + number_str;
-            }
-            return std::string();
-        };
-    }
-};
-
-/// Validate the argument is a number and greater than or equal to 0
-class Number : public Validator {
-  public:
-    Number() : Validator("NUMBER") {
-        func_ = [](std::string &number_str) {
-            double number;
-            if(!detail::lexical_cast(number_str, number)) {
-                return "Failed parsing as a number " + number_str;
-            }
-            return std::string();
-        };
-    }
-};
-
-} // namespace detail
-
-// Static is not needed here, because global const implies static.
-
-/// Check for existing file (returns error message if check fails)
-const detail::ExistingFileValidator ExistingFile;
-
-/// Check for an existing directory (returns error message if check fails)
-const detail::ExistingDirectoryValidator ExistingDirectory;
-
-/// Check for an existing path
-const detail::ExistingPathValidator ExistingPath;
-
-/// Check for an non-existing path
-const detail::NonexistentPathValidator NonexistentPath;
-
-/// Check for an IP4 address
-const detail::IPV4Validator ValidIPV4;
-
-/// Check for a positive number
-const detail::PositiveNumber PositiveNumber;
-
-/// Check for a number
-const detail::Number Number;
-
-/// Produce a range (factory). Min and max are inclusive.
-class Range : public Validator {
-  public:
-    /// This produces a range with min and max inclusive.
-    ///
-    /// Note that the constructor is templated, but the struct is not, so C++17 is not
-    /// needed to provide nice syntax for Range(a,b).
-    template <typename T> Range(T min, T max) {
-        std::stringstream out;
-        out << detail::type_name<T>() << " in [" << min << " - " << max << "]";
-        description(out.str());
-
-        func_ = [min, max](std::string &input) {
-            T val;
-            bool converted = detail::lexical_cast(input, val);
-            if((!converted) || (val < min || val > max))
-                return "Value " + input + " not in range " + std::to_string(min) + " to " + std::to_string(max);
-
-            return std::string();
-        };
-    }
-
-    /// Range of one value is 0 to value
-    template <typename T> explicit Range(T max) : Range(static_cast<T>(0), max) {}
-};
-
-/// Produce a bounded range (factory). Min and max are inclusive.
-class Bound : public Validator {
-  public:
-    /// This bounds a value with min and max inclusive.
-    ///
-    /// Note that the constructor is templated, but the struct is not, so C++17 is not
-    /// needed to provide nice syntax for Range(a,b).
-    template <typename T> Bound(T min, T max) {
-        std::stringstream out;
-        out << detail::type_name<T>() << " bounded to [" << min << " - " << max << "]";
-        description(out.str());
-
-        func_ = [min, max](std::string &input) {
-            T val;
-            bool converted = detail::lexical_cast(input, val);
-            if(!converted) {
-                return "Value " + input + " could not be converted";
-            }
-            if(val < min)
-                input = detail::as_string(min);
-            else if(val > max)
-                input = detail::as_string(max);
-
-            return std::string();
-        };
-    }
-
-    /// Range of one value is 0 to value
-    template <typename T> explicit Bound(T max) : Bound(static_cast<T>(0), max) {}
-};
-
-namespace detail {
-template <typename T,
-          enable_if_t<is_copyable_ptr<typename std::remove_reference<T>::type>::value, detail::enabler> = detail::dummy>
-auto smart_deref(T value) -> decltype(*value) {
-    return *value;
-}
-
-template <
-    typename T,
-    enable_if_t<!is_copyable_ptr<typename std::remove_reference<T>::type>::value, detail::enabler> = detail::dummy>
-typename std::remove_reference<T>::type &smart_deref(T &value) {
-    return value;
-}
-/// Generate a string representation of a set
-template <typename T> std::string generate_set(const T &set) {
-    using element_t = typename detail::element_type<T>::type;
-    using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair
-    std::string out(1, '{');
-    out.append(detail::join(detail::smart_deref(set),
-                            [](const iteration_type_t &v) { return detail::pair_adaptor<element_t>::first(v); },
-                            ","));
-    out.push_back('}');
-    return out;
-}
-
-/// Generate a string representation of a map
-template <typename T> std::string generate_map(const T &map, bool key_only = false) {
-    using element_t = typename detail::element_type<T>::type;
-    using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair
-    std::string out(1, '{');
-    out.append(detail::join(detail::smart_deref(map),
-                            [key_only](const iteration_type_t &v) {
-                                auto res = detail::as_string(detail::pair_adaptor<element_t>::first(v));
-                                if(!key_only) {
-                                    res += "->" + detail::as_string(detail::pair_adaptor<element_t>::second(v));
-                                }
-                                return res;
-                            },
-                            ","));
-    out.push_back('}');
-    return out;
-}
-
-template <typename> struct sfinae_true : std::true_type {};
-/// Function to check for the existence of a member find function which presumably is more efficient than looping over
-/// everything
-template <typename T, typename V>
-static auto test_find(int) -> sfinae_true<decltype(std::declval<T>().find(std::declval<V>()))>;
-template <typename, typename V> static auto test_find(long) -> std::false_type;
-
-template <typename T, typename V> struct has_find : decltype(test_find<T, V>(0)) {};
-
-/// A search function
-template <typename T, typename V, enable_if_t<!has_find<T, V>::value, detail::enabler> = detail::dummy>
-auto search(const T &set, const V &val) -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
-    using element_t = typename detail::element_type<T>::type;
-    auto &setref = detail::smart_deref(set);
-    auto it = std::find_if(std::begin(setref), std::end(setref), [&val](decltype(*std::begin(setref)) v) {
-        return (detail::pair_adaptor<element_t>::first(v) == val);
-    });
-    return {(it != std::end(setref)), it};
-}
-
-/// A search function that uses the built in find function
-template <typename T, typename V, enable_if_t<has_find<T, V>::value, detail::enabler> = detail::dummy>
-auto search(const T &set, const V &val) -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
-    auto &setref = detail::smart_deref(set);
-    auto it = setref.find(val);
-    return {(it != std::end(setref)), it};
-}
-
-/// A search function with a filter function
-template <typename T, typename V>
-auto search(const T &set, const V &val, const std::function<V(V)> &filter_function)
-    -> std::pair<bool, decltype(std::begin(detail::smart_deref(set)))> {
-    using element_t = typename detail::element_type<T>::type;
-    // do the potentially faster first search
-    auto res = search(set, val);
-    if((res.first) || (!(filter_function))) {
-        return res;
-    }
-    // if we haven't found it do the longer linear search with all the element translations
-    auto &setref = detail::smart_deref(set);
-    auto it = std::find_if(std::begin(setref), std::end(setref), [&](decltype(*std::begin(setref)) v) {
-        V a = detail::pair_adaptor<element_t>::first(v);
-        a = filter_function(a);
-        return (a == val);
-    });
-    return {(it != std::end(setref)), it};
-}
-
-/// Performs a *= b; if it doesn't cause integer overflow. Returns false otherwise.
-template <typename T> typename std::enable_if<std::is_integral<T>::value, bool>::type checked_multiply(T &a, T b) {
-    if(a == 0 || b == 0) {
-        a *= b;
-        return true;
-    }
-    T c = a * b;
-    if(c / a != b) {
-        return false;
-    }
-    a = c;
-    return true;
-}
-
-/// Performs a *= b; if it doesn't equal infinity. Returns false otherwise.
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value, bool>::type checked_multiply(T &a, T b) {
-    T c = a * b;
-    if(std::isinf(c) && !std::isinf(a) && !std::isinf(b)) {
-        return false;
-    }
-    a = c;
-    return true;
-}
-
-} // namespace detail
-/// Verify items are in a set
-class IsMember : public Validator {
-  public:
-    using filter_fn_t = std::function<std::string(std::string)>;
-
-    /// This allows in-place construction using an initializer list
-    template <typename T, typename... Args>
-    explicit IsMember(std::initializer_list<T> values, Args &&... args)
-        : IsMember(std::vector<T>(values), std::forward<Args>(args)...) {}
-
-    /// This checks to see if an item is in a set (empty function)
-    template <typename T> explicit IsMember(T &&set) : IsMember(std::forward<T>(set), nullptr) {}
-
-    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
-    /// both sides of the comparison before computing the comparison.
-    template <typename T, typename F> explicit IsMember(T set, F filter_function) {
-
-        // Get the type of the contained item - requires a container have ::value_type
-        // if the type does not have first_type and second_type, these are both value_type
-        using element_t = typename detail::element_type<T>::type;            // Removes (smart) pointers if needed
-        using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
-
-        using local_item_t = typename IsMemberType<item_t>::type; // This will convert bad types to good ones
-                                                                  // (const char * to std::string)
-
-        // Make a local copy of the filter function, using a std::function if not one already
-        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
-
-        // This is the type name for help, it will take the current version of the set contents
-        desc_function_ = [set]() { return detail::generate_set(detail::smart_deref(set)); };
-
-        // This is the function that validates
-        // It stores a copy of the set pointer-like, so shared_ptr will stay alive
-        func_ = [set, filter_fn](std::string &input) {
-            local_item_t b;
-            if(!detail::lexical_cast(input, b)) {
-                throw ValidationError(input); // name is added later
-            }
-            if(filter_fn) {
-                b = filter_fn(b);
-            }
-            auto res = detail::search(set, b, filter_fn);
-            if(res.first) {
-                // Make sure the version in the input string is identical to the one in the set
-                if(filter_fn) {
-                    input = detail::as_string(detail::pair_adaptor<element_t>::first(*(res.second)));
-                }
-
-                // Return empty error string (success)
-                return std::string{};
-            }
-
-            // If you reach this point, the result was not found
-            std::string out(" not in ");
-            out += detail::generate_set(detail::smart_deref(set));
-            return out;
-        };
-    }
-
-    /// You can pass in as many filter functions as you like, they nest (string only currently)
-    template <typename T, typename... Args>
-    IsMember(T &&set, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&... other)
-        : IsMember(std::forward<T>(set),
-                   [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
-                   other...) {}
-};
-
-/// definition of the default transformation object
-template <typename T> using TransformPairs = std::vector<std::pair<std::string, T>>;
-
-/// Translate named items to other or a value set
-class Transformer : public Validator {
-  public:
-    using filter_fn_t = std::function<std::string(std::string)>;
-
-    /// This allows in-place construction
-    template <typename... Args>
-    explicit Transformer(std::initializer_list<std::pair<std::string, std::string>> values, Args &&... args)
-        : Transformer(TransformPairs<std::string>(values), std::forward<Args>(args)...) {}
-
-    /// direct map of std::string to std::string
-    template <typename T> explicit Transformer(T &&mapping) : Transformer(std::forward<T>(mapping), nullptr) {}
-
-    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
-    /// both sides of the comparison before computing the comparison.
-    template <typename T, typename F> explicit Transformer(T mapping, F filter_function) {
-
-        static_assert(detail::pair_adaptor<typename detail::element_type<T>::type>::value,
-                      "mapping must produce value pairs");
-        // Get the type of the contained item - requires a container have ::value_type
-        // if the type does not have first_type and second_type, these are both value_type
-        using element_t = typename detail::element_type<T>::type;            // Removes (smart) pointers if needed
-        using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
-        using local_item_t = typename IsMemberType<item_t>::type;            // This will convert bad types to good ones
-                                                                             // (const char * to std::string)
-
-        // Make a local copy of the filter function, using a std::function if not one already
-        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
-
-        // This is the type name for help, it will take the current version of the set contents
-        desc_function_ = [mapping]() { return detail::generate_map(detail::smart_deref(mapping)); };
-
-        func_ = [mapping, filter_fn](std::string &input) {
-            local_item_t b;
-            if(!detail::lexical_cast(input, b)) {
-                return std::string();
-                // there is no possible way we can match anything in the mapping if we can't convert so just return
-            }
-            if(filter_fn) {
-                b = filter_fn(b);
-            }
-            auto res = detail::search(mapping, b, filter_fn);
-            if(res.first) {
-                input = detail::as_string(detail::pair_adaptor<element_t>::second(*res.second));
-            }
-            return std::string{};
-        };
-    }
-
-    /// You can pass in as many filter functions as you like, they nest
-    template <typename T, typename... Args>
-    Transformer(T &&mapping, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&... other)
-        : Transformer(std::forward<T>(mapping),
-                      [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
-                      other...) {}
-};
-
-/// translate named items to other or a value set
-class CheckedTransformer : public Validator {
-  public:
-    using filter_fn_t = std::function<std::string(std::string)>;
-
-    /// This allows in-place construction
-    template <typename... Args>
-    explicit CheckedTransformer(std::initializer_list<std::pair<std::string, std::string>> values, Args &&... args)
-        : CheckedTransformer(TransformPairs<std::string>(values), std::forward<Args>(args)...) {}
-
-    /// direct map of std::string to std::string
-    template <typename T> explicit CheckedTransformer(T mapping) : CheckedTransformer(std::move(mapping), nullptr) {}
-
-    /// This checks to see if an item is in a set: pointer or copy version. You can pass in a function that will filter
-    /// both sides of the comparison before computing the comparison.
-    template <typename T, typename F> explicit CheckedTransformer(T mapping, F filter_function) {
-
-        static_assert(detail::pair_adaptor<typename detail::element_type<T>::type>::value,
-                      "mapping must produce value pairs");
-        // Get the type of the contained item - requires a container have ::value_type
-        // if the type does not have first_type and second_type, these are both value_type
-        using element_t = typename detail::element_type<T>::type;            // Removes (smart) pointers if needed
-        using item_t = typename detail::pair_adaptor<element_t>::first_type; // Is value_type if not a map
-        using local_item_t = typename IsMemberType<item_t>::type;            // This will convert bad types to good ones
-                                                                             // (const char * to std::string)
-        using iteration_type_t = typename detail::pair_adaptor<element_t>::value_type; // the type of the object pair //
-                                                                                       // the type of the object pair
-
-        // Make a local copy of the filter function, using a std::function if not one already
-        std::function<local_item_t(local_item_t)> filter_fn = filter_function;
-
-        auto tfunc = [mapping]() {
-            std::string out("value in ");
-            out += detail::generate_map(detail::smart_deref(mapping)) + " OR {";
-            out += detail::join(
-                detail::smart_deref(mapping),
-                [](const iteration_type_t &v) { return detail::as_string(detail::pair_adaptor<element_t>::second(v)); },
-                ",");
-            out.push_back('}');
-            return out;
-        };
-
-        desc_function_ = tfunc;
-
-        func_ = [mapping, tfunc, filter_fn](std::string &input) {
-            local_item_t b;
-            bool converted = detail::lexical_cast(input, b);
-            if(converted) {
-                if(filter_fn) {
-                    b = filter_fn(b);
-                }
-                auto res = detail::search(mapping, b, filter_fn);
-                if(res.first) {
-                    input = detail::as_string(detail::pair_adaptor<element_t>::second(*res.second));
-                    return std::string{};
-                }
-            }
-            for(const auto &v : detail::smart_deref(mapping)) {
-                auto output_string = detail::as_string(detail::pair_adaptor<element_t>::second(v));
-                if(output_string == input) {
-                    return std::string();
-                }
-            }
-
-            return "Check " + input + " " + tfunc() + " FAILED";
-        };
-    }
-
-    /// You can pass in as many filter functions as you like, they nest
-    template <typename T, typename... Args>
-    CheckedTransformer(T &&mapping, filter_fn_t filter_fn_1, filter_fn_t filter_fn_2, Args &&... other)
-        : CheckedTransformer(std::forward<T>(mapping),
-                             [filter_fn_1, filter_fn_2](std::string a) { return filter_fn_2(filter_fn_1(a)); },
-                             other...) {}
-};
-
-/// Helper function to allow ignore_case to be passed to IsMember or Transform
-inline std::string ignore_case(std::string item) { return detail::to_lower(item); }
-
-/// Helper function to allow ignore_underscore to be passed to IsMember or Transform
-inline std::string ignore_underscore(std::string item) { return detail::remove_underscore(item); }
-
-/// Helper function to allow checks to ignore spaces to be passed to IsMember or Transform
-inline std::string ignore_space(std::string item) {
-    item.erase(std::remove(std::begin(item), std::end(item), ' '), std::end(item));
-    item.erase(std::remove(std::begin(item), std::end(item), '\t'), std::end(item));
-    return item;
-}
-
-/// Multiply a number by a factor using given mapping.
-/// Can be used to write transforms for SIZE or DURATION inputs.
-///
-/// Example:
-///   With mapping = `{"b"->1, "kb"->1024, "mb"->1024*1024}`
-///   one can recognize inputs like "100", "12kb", "100 MB",
-///   that will be automatically transformed to 100, 14448, 104857600.
-///
-/// Output number type matches the type in the provided mapping.
-/// Therefore, if it is required to interpret real inputs like "0.42 s",
-/// the mapping should be of a type <string, float> or <string, double>.
-class AsNumberWithUnit : public Validator {
-  public:
-    /// Adjust AsNumberWithUnit behavior.
-    /// CASE_SENSITIVE/CASE_INSENSITIVE controls how units are matched.
-    /// UNIT_OPTIONAL/UNIT_REQUIRED throws ValidationError
-    ///   if UNIT_REQUIRED is set and unit literal is not found.
-    enum Options {
-        CASE_SENSITIVE = 0,
-        CASE_INSENSITIVE = 1,
-        UNIT_OPTIONAL = 0,
-        UNIT_REQUIRED = 2,
-        DEFAULT = CASE_INSENSITIVE | UNIT_OPTIONAL
-    };
-
-    template <typename Number>
-    explicit AsNumberWithUnit(std::map<std::string, Number> mapping,
-                              Options opts = DEFAULT,
-                              const std::string &unit_name = "UNIT") {
-        description(generate_description<Number>(unit_name, opts));
-        validate_mapping(mapping, opts);
-
-        // transform function
-        func_ = [mapping, opts](std::string &input) -> std::string {
-            Number num;
-
-            detail::rtrim(input);
-            if(input.empty()) {
-                throw ValidationError("Input is empty");
-            }
-
-            // Find split position between number and prefix
-            auto unit_begin = input.end();
-            while(unit_begin > input.begin() && std::isalpha(*(unit_begin - 1), std::locale())) {
-                --unit_begin;
-            }
-
-            std::string unit{unit_begin, input.end()};
-            input.resize(static_cast<size_t>(std::distance(input.begin(), unit_begin)));
-            detail::trim(input);
-
-            if(opts & UNIT_REQUIRED && unit.empty()) {
-                throw ValidationError("Missing mandatory unit");
-            }
-            if(opts & CASE_INSENSITIVE) {
-                unit = detail::to_lower(unit);
-            }
-
-            bool converted = detail::lexical_cast(input, num);
-            if(!converted) {
-                throw ValidationError("Value " + input + " could not be converted to " + detail::type_name<Number>());
-            }
-
-            if(unit.empty()) {
-                // No need to modify input if no unit passed
-                return {};
-            }
-
-            // find corresponding factor
-            auto it = mapping.find(unit);
-            if(it == mapping.end()) {
-                throw ValidationError(unit +
-                                      " unit not recognized. "
-                                      "Allowed values: " +
-                                      detail::generate_map(mapping, true));
-            }
-
-            // perform safe multiplication
-            bool ok = detail::checked_multiply(num, it->second);
-            if(!ok) {
-                throw ValidationError(detail::as_string(num) + " multiplied by " + unit +
-                                      " factor would cause number overflow. Use smaller value.");
-            }
-            input = detail::as_string(num);
-
-            return {};
-        };
-    }
-
-  private:
-    /// Check that mapping contains valid units.
-    /// Update mapping for CASE_INSENSITIVE mode.
-    template <typename Number> static void validate_mapping(std::map<std::string, Number> &mapping, Options opts) {
-        for(auto &kv : mapping) {
-            if(kv.first.empty()) {
-                throw ValidationError("Unit must not be empty.");
-            }
-            if(!detail::isalpha(kv.first)) {
-                throw ValidationError("Unit must contain only letters.");
-            }
-        }
-
-        // make all units lowercase if CASE_INSENSITIVE
-        if(opts & CASE_INSENSITIVE) {
-            std::map<std::string, Number> lower_mapping;
-            for(auto &kv : mapping) {
-                auto s = detail::to_lower(kv.first);
-                if(lower_mapping.count(s)) {
-                    throw ValidationError("Several matching lowercase unit representations are found: " + s);
-                }
-                lower_mapping[detail::to_lower(kv.first)] = kv.second;
-            }
-            mapping = std::move(lower_mapping);
-        }
-    }
-
-    /// Generate description like this: NUMBER [UNIT]
-    template <typename Number> static std::string generate_description(const std::string &name, Options opts) {
-        std::stringstream out;
-        out << detail::type_name<Number>() << ' ';
-        if(opts & UNIT_REQUIRED) {
-            out << name;
-        } else {
-            out << '[' << name << ']';
-        }
-        return out.str();
-    }
-};
-
-/// Converts a human-readable size string (with unit literal) to uin64_t size.
-/// Example:
-///   "100" => 100
-///   "1 b" => 100
-///   "10Kb" => 10240 // you can configure this to be interpreted as kilobyte (*1000) or kibibyte (*1024)
-///   "10 KB" => 10240
-///   "10 kb" => 10240
-///   "10 kib" => 10240 // *i, *ib are always interpreted as *bibyte (*1024)
-///   "10kb" => 10240
-///   "2 MB" => 2097152
-///   "2 EiB" => 2^61 // Units up to exibyte are supported
-class AsSizeValue : public AsNumberWithUnit {
-  public:
-    using result_t = uint64_t;
-
-    /// If kb_is_1000 is true,
-    /// interpret 'kb', 'k' as 1000 and 'kib', 'ki' as 1024
-    /// (same applies to higher order units as well).
-    /// Otherwise, interpret all literals as factors of 1024.
-    /// The first option is formally correct, but
-    /// the second interpretation is more wide-spread
-    /// (see https://en.wikipedia.org/wiki/Binary_prefix).
-    explicit AsSizeValue(bool kb_is_1000) : AsNumberWithUnit(get_mapping(kb_is_1000)) {
-        if(kb_is_1000) {
-            description("SIZE [b, kb(=1000b), kib(=1024b), ...]");
-        } else {
-            description("SIZE [b, kb(=1024b), ...]");
-        }
-    }
-
-  private:
-    /// Get <size unit, factor> mapping
-    static std::map<std::string, result_t> init_mapping(bool kb_is_1000) {
-        std::map<std::string, result_t> m;
-        result_t k_factor = kb_is_1000 ? 1000 : 1024;
-        result_t ki_factor = 1024;
-        result_t k = 1;
-        result_t ki = 1;
-        m["b"] = 1;
-        for(std::string p : {"k", "m", "g", "t", "p", "e"}) {
-            k *= k_factor;
-            ki *= ki_factor;
-            m[p] = k;
-            m[p + "b"] = k;
-            m[p + "i"] = ki;
-            m[p + "ib"] = ki;
-        }
-        return m;
-    }
-
-    /// Cache calculated mapping
-    static std::map<std::string, result_t> get_mapping(bool kb_is_1000) {
-        if(kb_is_1000) {
-            static auto m = init_mapping(true);
-            return m;
-        } else {
-            static auto m = init_mapping(false);
-            return m;
-        }
-    }
-};
-
-namespace detail {
-/// Split a string into a program name and command line arguments
-/// the string is assumed to contain a file name followed by other arguments
-/// the return value contains is a pair with the first argument containing the program name and the second
-/// everything else.
-inline std::pair<std::string, std::string> split_program_name(std::string commandline) {
-    // try to determine the programName
-    std::pair<std::string, std::string> vals;
-    trim(commandline);
-    auto esp = commandline.find_first_of(' ', 1);
-    while(!ExistingFile(commandline.substr(0, esp)).empty()) {
-        esp = commandline.find_first_of(' ', esp + 1);
-        if(esp == std::string::npos) {
-            // if we have reached the end and haven't found a valid file just assume the first argument is the
-            // program name
-            esp = commandline.find_first_of(' ', 1);
-            break;
-        }
-    }
-    vals.first = commandline.substr(0, esp);
-    rtrim(vals.first);
-    // strip the program name
-    vals.second = (esp != std::string::npos) ? commandline.substr(esp + 1) : std::string{};
-    ltrim(vals.second);
-    return vals;
-}
-
-} // namespace detail
-/// @}
-
-} // namespace CLI
-
-// From CLI/FormatterFwd.hpp:
-
-namespace CLI {
-
-class Option;
-class App;
-
-/// This enum signifies the type of help requested
-///
-/// This is passed in by App; all user classes must accept this as
-/// the second argument.
-
-enum class AppFormatMode {
-    Normal, //< The normal, detailed help
-    All,    //< A fully expanded help
-    Sub,    //< Used when printed as part of expanded subcommand
-};
-
-/// This is the minimum requirements to run a formatter.
-///
-/// A user can subclass this is if they do not care at all
-/// about the structure in CLI::Formatter.
-class FormatterBase {
-  protected:
-    /// @name Options
-    ///@{
-
-    /// The width of the first column
-    size_t column_width_{30};
-
-    /// @brief The required help printout labels (user changeable)
-    /// Values are Needs, Excludes, etc.
-    std::map<std::string, std::string> labels_;
-
-    ///@}
-    /// @name Basic
-    ///@{
-
-  public:
-    FormatterBase() = default;
-    FormatterBase(const FormatterBase &) = default;
-    FormatterBase(FormatterBase &&) = default;
-
-    /// Adding a destructor in this form to work around bug in GCC 4.7
-    virtual ~FormatterBase() noexcept {} // NOLINT(modernize-use-equals-default)
-
-    /// This is the key method that puts together help
-    virtual std::string make_help(const App *, std::string, AppFormatMode) const = 0;
-
-    ///@}
-    /// @name Setters
-    ///@{
-
-    /// Set the "REQUIRED" label
-    void label(std::string key, std::string val) { labels_[key] = val; }
-
-    /// Set the column width
-    void column_width(size_t val) { column_width_ = val; }
-
-    ///@}
-    /// @name Getters
-    ///@{
-
-    /// Get the current value of a name (REQUIRED, etc.)
-    std::string get_label(std::string key) const {
-        if(labels_.find(key) == labels_.end())
-            return key;
-        else
-            return labels_.at(key);
-    }
-
-    /// Get the current column width
-    size_t get_column_width() const { return column_width_; }
-
-    ///@}
-};
-
-/// This is a specialty override for lambda functions
-class FormatterLambda final : public FormatterBase {
-    using funct_t = std::function<std::string(const App *, std::string, AppFormatMode)>;
-
-    /// The lambda to hold and run
-    funct_t lambda_;
-
-  public:
-    /// Create a FormatterLambda with a lambda function
-    explicit FormatterLambda(funct_t funct) : lambda_(std::move(funct)) {}
-
-    /// Adding a destructor (mostly to make GCC 4.7 happy)
-    ~FormatterLambda() noexcept override {} // NOLINT(modernize-use-equals-default)
-
-    /// This will simply call the lambda function
-    std::string make_help(const App *app, std::string name, AppFormatMode mode) const override {
-        return lambda_(app, name, mode);
-    }
-};
-
-/// This is the default Formatter for CLI11. It pretty prints help output, and is broken into quite a few
-/// overridable methods, to be highly customizable with minimal effort.
-class Formatter : public FormatterBase {
-  public:
-    Formatter() = default;
-    Formatter(const Formatter &) = default;
-    Formatter(Formatter &&) = default;
-
-    /// @name Overridables
-    ///@{
-
-    /// This prints out a group of options with title
-    ///
-    virtual std::string make_group(std::string group, bool is_positional, std::vector<const Option *> opts) const;
-
-    /// This prints out just the positionals "group"
-    virtual std::string make_positionals(const App *app) const;
-
-    /// This prints out all the groups of options
-    std::string make_groups(const App *app, AppFormatMode mode) const;
-
-    /// This prints out all the subcommands
-    virtual std::string make_subcommands(const App *app, AppFormatMode mode) const;
-
-    /// This prints out a subcommand
-    virtual std::string make_subcommand(const App *sub) const;
-
-    /// This prints out a subcommand in help-all
-    virtual std::string make_expanded(const App *sub) const;
-
-    /// This prints out all the groups of options
-    virtual std::string make_footer(const App *app) const;
-
-    /// This displays the description line
-    virtual std::string make_description(const App *app) const;
-
-    /// This displays the usage line
-    virtual std::string make_usage(const App *app, std::string name) const;
-
-    /// This puts everything together
-    std::string make_help(const App *, std::string, AppFormatMode) const override;
-
-    ///@}
-    /// @name Options
-    ///@{
-
-    /// This prints out an option help line, either positional or optional form
-    virtual std::string make_option(const Option *opt, bool is_positional) const {
-        std::stringstream out;
-        detail::format_help(
-            out, make_option_name(opt, is_positional) + make_option_opts(opt), make_option_desc(opt), column_width_);
-        return out.str();
-    }
-
-    /// @brief This is the name part of an option, Default: left column
-    virtual std::string make_option_name(const Option *, bool) const;
-
-    /// @brief This is the options part of the name, Default: combined into left column
-    virtual std::string make_option_opts(const Option *) const;
-
-    /// @brief This is the description. Default: Right column, on new line if left column too large
-    virtual std::string make_option_desc(const Option *) const;
-
-    /// @brief This is used to print the name on the USAGE line
-    virtual std::string make_option_usage(const Option *opt) const;
-
-    ///@}
-};
-
-} // namespace CLI
-
-// From CLI/Option.hpp:
-
-namespace CLI {
-
-using results_t = std::vector<std::string>;
-using callback_t = std::function<bool(results_t)>;
-
-class Option;
-class App;
-
-using Option_p = std::unique_ptr<Option>;
-
-enum class MultiOptionPolicy : char { Throw, TakeLast, TakeFirst, Join };
-
-/// This is the CRTP base class for Option and OptionDefaults. It was designed this way
-/// to share parts of the class; an OptionDefaults can copy to an Option.
-template <typename CRTP> class OptionBase {
-    friend App;
-
-  protected:
-    /// The group membership
-    std::string group_ = std::string("Options");
-
-    /// True if this is a required option
-    bool required_{false};
-
-    /// Ignore the case when matching (option, not value)
-    bool ignore_case_{false};
-
-    /// Ignore underscores when matching (option, not value)
-    bool ignore_underscore_{false};
-
-    /// Allow this option to be given in a configuration file
-    bool configurable_{true};
-
-    /// Disable overriding flag values with '=value'
-    bool disable_flag_override_{false};
-
-    /// Specify a delimiter character for vector arguments
-    char delimiter_{'\0'};
-
-    /// Automatically capture default value
-    bool always_capture_default_{false};
-
-    /// Policy for multiple arguments when `expected_ == 1`  (can be set on bool flags, too)
-    MultiOptionPolicy multi_option_policy_{MultiOptionPolicy::Throw};
-
-    /// Copy the contents to another similar class (one based on OptionBase)
-    template <typename T> void copy_to(T *other) const {
-        other->group(group_);
-        other->required(required_);
-        other->ignore_case(ignore_case_);
-        other->ignore_underscore(ignore_underscore_);
-        other->configurable(configurable_);
-        other->disable_flag_override(disable_flag_override_);
-        other->delimiter(delimiter_);
-        other->always_capture_default(always_capture_default_);
-        other->multi_option_policy(multi_option_policy_);
-    }
-
-  public:
-    // setters
-
-    /// Changes the group membership
-    CRTP *group(std::string name) {
-        group_ = name;
-        return static_cast<CRTP *>(this);
-    }
-
-    /// Set the option as required
-    CRTP *required(bool value = true) {
-        required_ = value;
-        return static_cast<CRTP *>(this);
-    }
-
-    /// Support Plumbum term
-    CRTP *mandatory(bool value = true) { return required(value); }
-
-    CRTP *always_capture_default(bool value = true) {
-        always_capture_default_ = value;
-        return static_cast<CRTP *>(this);
-    }
-
-    // Getters
-
-    /// Get the group of this option
-    const std::string &get_group() const { return group_; }
-
-    /// True if this is a required option
-    bool get_required() const { return required_; }
-
-    /// The status of ignore case
-    bool get_ignore_case() const { return ignore_case_; }
-
-    /// The status of ignore_underscore
-    bool get_ignore_underscore() const { return ignore_underscore_; }
-
-    /// The status of configurable
-    bool get_configurable() const { return configurable_; }
-
-    /// The status of configurable
-    bool get_disable_flag_override() const { return disable_flag_override_; }
-
-    /// Get the current delimeter char
-    char get_delimiter() const { return delimiter_; }
-
-    /// Return true if this will automatically capture the default value for help printing
-    bool get_always_capture_default() const { return always_capture_default_; }
-
-    /// The status of the multi option policy
-    MultiOptionPolicy get_multi_option_policy() const { return multi_option_policy_; }
-
-    // Shortcuts for multi option policy
-
-    /// Set the multi option policy to take last
-    CRTP *take_last() {
-        auto self = static_cast<CRTP *>(this);
-        self->multi_option_policy(MultiOptionPolicy::TakeLast);
-        return self;
-    }
-
-    /// Set the multi option policy to take last
-    CRTP *take_first() {
-        auto self = static_cast<CRTP *>(this);
-        self->multi_option_policy(MultiOptionPolicy::TakeFirst);
-        return self;
-    }
-
-    /// Set the multi option policy to take last
-    CRTP *join() {
-        auto self = static_cast<CRTP *>(this);
-        self->multi_option_policy(MultiOptionPolicy::Join);
-        return self;
-    }
-
-    /// Allow in a configuration file
-    CRTP *configurable(bool value = true) {
-        configurable_ = value;
-        return static_cast<CRTP *>(this);
-    }
-
-    /// Allow in a configuration file
-    CRTP *delimiter(char value = '\0') {
-        delimiter_ = value;
-        return static_cast<CRTP *>(this);
-    }
-};
-
-/// This is a version of OptionBase that only supports setting values,
-/// for defaults. It is stored as the default option in an App.
-class OptionDefaults : public OptionBase<OptionDefaults> {
-  public:
-    OptionDefaults() = default;
-
-    // Methods here need a different implementation if they are Option vs. OptionDefault
-
-    /// Take the last argument if given multiple times
-    OptionDefaults *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
-        multi_option_policy_ = value;
-        return this;
-    }
-
-    /// Ignore the case of the option name
-    OptionDefaults *ignore_case(bool value = true) {
-        ignore_case_ = value;
-        return this;
-    }
-
-    /// Ignore underscores in the option name
-    OptionDefaults *ignore_underscore(bool value = true) {
-        ignore_underscore_ = value;
-        return this;
-    }
-
-    /// Disable overriding flag values with an '=<value>' segment
-    OptionDefaults *disable_flag_override(bool value = true) {
-        disable_flag_override_ = value;
-        return this;
-    }
-
-    /// set a delimiter character to split up single arguments to treat as multiple inputs
-    OptionDefaults *delimiter(char value = '\0') {
-        delimiter_ = value;
-        return this;
-    }
-};
-
-class Option : public OptionBase<Option> {
-    friend App;
-
-  protected:
-    /// @name Names
-    ///@{
-
-    /// A list of the short names (`-a`) without the leading dashes
-    std::vector<std::string> snames_;
-
-    /// A list of the long names (`--a`) without the leading dashes
-    std::vector<std::string> lnames_;
-
-    /// A list of the flag names with the appropriate default value, the first part of the pair should be duplicates of
-    /// what is in snames or lnames but will trigger a particular response on a flag
-    std::vector<std::pair<std::string, std::string>> default_flag_values_;
-
-    /// a list of flag names with specified default values;
-    std::vector<std::string> fnames_;
-
-    /// A positional name
-    std::string pname_;
-
-    /// If given, check the environment for this option
-    std::string envname_;
-
-    ///@}
-    /// @name Help
-    ///@{
-
-    /// The description for help strings
-    std::string description_;
-
-    /// A human readable default value, either manually set, captured, or captured by default
-    std::string default_str_;
-
-    /// A human readable type value, set when App creates this
-    ///
-    /// This is a lambda function so "types" can be dynamic, such as when a set prints its contents.
-    std::function<std::string()> type_name_{[]() { return std::string(); }};
-
-    /// Run this function to capture a default (ignore if empty)
-    std::function<std::string()> default_function_;
-
-    ///@}
-    /// @name Configuration
-    ///@{
-
-    /// The number of arguments that make up one option. -1=unlimited (vector-like), 0=flag, 1=normal option,
-    /// 2=complex/pair, etc. Set only when the option is created; this is intrinsic to the type. Eventually, -2 may mean
-    /// vector of pairs.
-    int type_size_{1};
-
-    /// The number of expected values, type_size_ must be < 0. Ignored for flag. N < 0 means at least -N values.
-    int expected_{1};
-
-    /// A list of validators to run on each value parsed
-    std::vector<Validator> validators_;
-
-    /// A list of options that are required with this option
-    std::set<Option *> needs_;
-
-    /// A list of options that are excluded with this option
-    std::set<Option *> excludes_;
-
-    ///@}
-    /// @name Other
-    ///@{
-
-    /// Remember the parent app
-    App *parent_;
-
-    /// Options store a callback to do all the work
-    callback_t callback_;
-
-    ///@}
-    /// @name Parsing results
-    ///@{
-
-    /// Results of parsing
-    results_t results_;
-
-    /// Whether the callback has run (needed for INI parsing)
-    bool callback_run_{false};
-
-    ///@}
-
-    /// Making an option by hand is not defined, it must be made by the App class
-    Option(std::string option_name,
-           std::string option_description,
-           std::function<bool(results_t)> callback,
-           App *parent)
-        : description_(std::move(option_description)), parent_(parent), callback_(std::move(callback)) {
-        std::tie(snames_, lnames_, pname_) = detail::get_names(detail::split_names(option_name));
-    }
-
-  public:
-    /// @name Basic
-    ///@{
-
-    /// Count the total number of times an option was passed
-    size_t count() const { return results_.size(); }
-
-    /// True if the option was not passed
-    size_t empty() const { return results_.empty(); }
-
-    /// This class is true if option is passed.
-    operator bool() const { return !empty(); }
-
-    /// Clear the parsed results (mostly for testing)
-    void clear() { results_.clear(); }
-
-    ///@}
-    /// @name Setting options
-    ///@{
-
-    /// Set the number of expected arguments (Flags don't use this)
-    Option *expected(int value) {
-
-        // Break if this is a flag
-        if(type_size_ == 0)
-            throw IncorrectConstruction::SetFlag(get_name(true, true));
-
-        // Setting 0 is not allowed
-        else if(value == 0)
-            throw IncorrectConstruction::Set0Opt(get_name());
-
-        // No change is okay, quit now
-        else if(expected_ == value)
-            return this;
-
-        // Type must be a vector
-        else if(type_size_ >= 0)
-            throw IncorrectConstruction::ChangeNotVector(get_name());
-
-        // TODO: Can support multioption for non-1 values (except for join)
-        else if(value != 1 && multi_option_policy_ != MultiOptionPolicy::Throw)
-            throw IncorrectConstruction::AfterMultiOpt(get_name());
-
-        expected_ = value;
-        return this;
-    }
-
-    /// Adds a Validator with a built in type name
-    Option *check(Validator validator, std::string validator_name = "") {
-        validator.non_modifying();
-        validators_.push_back(std::move(validator));
-        if(!validator_name.empty())
-            validators_.front().name(validator_name);
-        return this;
-    }
-
-    /// Adds a Validator. Takes a const string& and returns an error message (empty if conversion/check is okay).
-    Option *check(std::function<std::string(const std::string &)> validator,
-                  std::string validator_description = "",
-                  std::string validator_name = "") {
-        validators_.emplace_back(validator, std::move(validator_description), std::move(validator_name));
-        validators_.back().non_modifying();
-        return this;
-    }
-
-    /// Adds a transforming validator with a built in type name
-    Option *transform(Validator validator, std::string validator_name = "") {
-        validators_.insert(validators_.begin(), std::move(validator));
-        if(!validator_name.empty())
-            validators_.front().name(validator_name);
-        return this;
-    }
-
-    /// Adds a validator-like function that can change result
-    Option *transform(std::function<std::string(std::string)> func,
-                      std::string transform_description = "",
-                      std::string transform_name = "") {
-        validators_.insert(validators_.begin(),
-                           Validator(
-                               [func](std::string &val) {
-                                   val = func(val);
-                                   return std::string{};
-                               },
-                               std::move(transform_description),
-                               std::move(transform_name)));
-
-        return this;
-    }
-
-    /// Adds a user supplied function to run on each item passed in (communicate though lambda capture)
-    Option *each(std::function<void(std::string)> func) {
-        validators_.emplace_back(
-            [func](std::string &inout) {
-                func(inout);
-                return std::string{};
-            },
-            std::string{});
-        return this;
-    }
-    /// Get a named Validator
-    Validator *get_validator(const std::string &validator_name = "") {
-        for(auto &validator : validators_) {
-            if(validator_name == validator.get_name()) {
-                return &validator;
-            }
-        }
-        if((validator_name.empty()) && (!validators_.empty())) {
-            return &(validators_.front());
-        }
-        throw OptionNotFound(std::string("Validator ") + validator_name + " Not Found");
-    }
-    /// Sets required options
-    Option *needs(Option *opt) {
-        auto tup = needs_.insert(opt);
-        if(!tup.second)
-            throw OptionAlreadyAdded::Requires(get_name(), opt->get_name());
-        return this;
-    }
-
-    /// Can find a string if needed
-    template <typename T = App> Option *needs(std::string opt_name) {
-        for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
-            if(opt.get() != this && opt->check_name(opt_name))
-                return needs(opt.get());
-        throw IncorrectConstruction::MissingOption(opt_name);
-    }
-
-    /// Any number supported, any mix of string and Opt
-    template <typename A, typename B, typename... ARG> Option *needs(A opt, B opt1, ARG... args) {
-        needs(opt);
-        return needs(opt1, args...);
-    }
-
-    /// Remove needs link from an option. Returns true if the option really was in the needs list.
-    bool remove_needs(Option *opt) {
-        auto iterator = std::find(std::begin(needs_), std::end(needs_), opt);
-
-        if(iterator != std::end(needs_)) {
-            needs_.erase(iterator);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /// Sets excluded options
-    Option *excludes(Option *opt) {
-        excludes_.insert(opt);
-
-        // Help text should be symmetric - excluding a should exclude b
-        opt->excludes_.insert(this);
-
-        // Ignoring the insert return value, excluding twice is now allowed.
-        // (Mostly to allow both directions to be excluded by user, even though the library does it for you.)
-
-        return this;
-    }
-
-    /// Can find a string if needed
-    template <typename T = App> Option *excludes(std::string opt_name) {
-        for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
-            if(opt.get() != this && opt->check_name(opt_name))
-                return excludes(opt.get());
-        throw IncorrectConstruction::MissingOption(opt_name);
-    }
-
-    /// Any number supported, any mix of string and Opt
-    template <typename A, typename B, typename... ARG> Option *excludes(A opt, B opt1, ARG... args) {
-        excludes(opt);
-        return excludes(opt1, args...);
-    }
-
-    /// Remove needs link from an option. Returns true if the option really was in the needs list.
-    bool remove_excludes(Option *opt) {
-        auto iterator = std::find(std::begin(excludes_), std::end(excludes_), opt);
-
-        if(iterator != std::end(excludes_)) {
-            excludes_.erase(iterator);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /// Sets environment variable to read if no option given
-    Option *envname(std::string name) {
-        envname_ = name;
-        return this;
-    }
-
-    /// Ignore case
-    ///
-    /// The template hides the fact that we don't have the definition of App yet.
-    /// You are never expected to add an argument to the template here.
-    template <typename T = App> Option *ignore_case(bool value = true) {
-        ignore_case_ = value;
-        auto *parent = dynamic_cast<T *>(parent_);
-
-        for(const Option_p &opt : parent->options_)
-            if(opt.get() != this && *opt == *this)
-                throw OptionAlreadyAdded(opt->get_name(true, true));
-
-        return this;
-    }
-
-    /// Ignore underscores in the option names
-    ///
-    /// The template hides the fact that we don't have the definition of App yet.
-    /// You are never expected to add an argument to the template here.
-    template <typename T = App> Option *ignore_underscore(bool value = true) {
-        ignore_underscore_ = value;
-        auto *parent = dynamic_cast<T *>(parent_);
-        for(const Option_p &opt : parent->options_)
-            if(opt.get() != this && *opt == *this)
-                throw OptionAlreadyAdded(opt->get_name(true, true));
-
-        return this;
-    }
-
-    /// Take the last argument if given multiple times (or another policy)
-    Option *multi_option_policy(MultiOptionPolicy value = MultiOptionPolicy::Throw) {
-
-        if(get_items_expected() < 0)
-            throw IncorrectConstruction::MultiOptionPolicy(get_name());
-        multi_option_policy_ = value;
-        return this;
-    }
-
-    /// disable flag overrides
-    Option *disable_flag_override(bool value = true) {
-        disable_flag_override_ = value;
-        return this;
-    }
-    ///@}
-    /// @name Accessors
-    ///@{
-
-    /// The number of arguments the option expects
-    int get_type_size() const { return type_size_; }
-
-    /// The environment variable associated to this value
-    std::string get_envname() const { return envname_; }
-
-    /// The set of options needed
-    std::set<Option *> get_needs() const { return needs_; }
-
-    /// The set of options excluded
-    std::set<Option *> get_excludes() const { return excludes_; }
-
-    /// The default value (for help printing) DEPRECATED Use get_default_str() instead
-    CLI11_DEPRECATED("Use get_default_str() instead")
-    std::string get_defaultval() const { return default_str_; }
-
-    /// The default value (for help printing)
-    std::string get_default_str() const { return default_str_; }
-
-    /// Get the callback function
-    callback_t get_callback() const { return callback_; }
-
-    /// Get the long names
-    const std::vector<std::string> get_lnames() const { return lnames_; }
-
-    /// Get the short names
-    const std::vector<std::string> get_snames() const { return snames_; }
-
-    /// get the flag names with specified default values
-    const std::vector<std::string> get_fnames() const { return fnames_; }
-
-    /// The number of times the option expects to be included
-    int get_expected() const { return expected_; }
-
-    /// \brief The total number of expected values (including the type)
-    /// This is positive if exactly this number is expected, and negative for at least N values
-    ///
-    /// v = fabs(size_type*expected)
-    /// !MultiOptionPolicy::Throw
-    ///           | Expected < 0  | Expected == 0 | Expected > 0
-    /// Size < 0  |      -v       |       0       |     -v
-    /// Size == 0 |       0       |       0       |      0
-    /// Size > 0  |      -v       |       0       |     -v       // Expected must be 1
-    ///
-    /// MultiOptionPolicy::Throw
-    ///           | Expected < 0  | Expected == 0 | Expected > 0
-    /// Size < 0  |      -v       |       0       |      v
-    /// Size == 0 |       0       |       0       |      0
-    /// Size > 0  |       v       |       0       |      v      // Expected must be 1
-    ///
-    int get_items_expected() const {
-        return std::abs(type_size_ * expected_) *
-               ((multi_option_policy_ != MultiOptionPolicy::Throw || (expected_ < 0 && type_size_ < 0) ? -1 : 1));
-    }
-
-    /// True if the argument can be given directly
-    bool get_positional() const { return pname_.length() > 0; }
-
-    /// True if option has at least one non-positional name
-    bool nonpositional() const { return (snames_.size() + lnames_.size()) > 0; }
-
-    /// True if option has description
-    bool has_description() const { return description_.length() > 0; }
-
-    /// Get the description
-    const std::string &get_description() const { return description_; }
-
-    /// Set the description
-    Option *description(std::string option_description) {
-        description_ = std::move(option_description);
-        return this;
-    }
-
-    ///@}
-    /// @name Help tools
-    ///@{
-
-    /// \brief Gets a comma separated list of names.
-    /// Will include / prefer the positional name if positional is true.
-    /// If all_options is false, pick just the most descriptive name to show.
-    /// Use `get_name(true)` to get the positional name (replaces `get_pname`)
-    std::string get_name(bool positional = false, //<[input] Show the positional name
-                         bool all_options = false //<[input] Show every option
-                         ) const {
-
-        if(all_options) {
-
-            std::vector<std::string> name_list;
-
-            /// The all list will never include a positional unless asked or that's the only name.
-            if((positional && pname_.length()) || (snames_.empty() && lnames_.empty()))
-                name_list.push_back(pname_);
-            if((get_items_expected() == 0) && (!fnames_.empty())) {
-                for(const std::string &sname : snames_) {
-                    name_list.push_back("-" + sname);
-                    if(check_fname(sname)) {
-                        name_list.back() += "{" + get_flag_value(sname, "") + "}";
-                    }
-                }
-
-                for(const std::string &lname : lnames_) {
-                    name_list.push_back("--" + lname);
-                    if(check_fname(lname)) {
-                        name_list.back() += "{" + get_flag_value(lname, "") + "}";
-                    }
-                }
-            } else {
-                for(const std::string &sname : snames_)
-                    name_list.push_back("-" + sname);
-
-                for(const std::string &lname : lnames_)
-                    name_list.push_back("--" + lname);
-            }
-
-            return detail::join(name_list);
-
-        } else {
-
-            // This returns the positional name no matter what
-            if(positional)
-                return pname_;
-
-            // Prefer long name
-            else if(!lnames_.empty())
-                return std::string("--") + lnames_[0];
-
-            // Or short name if no long name
-            else if(!snames_.empty())
-                return std::string("-") + snames_[0];
-
-            // If positional is the only name, it's okay to use that
-            else
-                return pname_;
-        }
-    }
-
-    ///@}
-    /// @name Parser tools
-    ///@{
-
-    /// Process the callback
-    void run_callback() {
-
-        callback_run_ = true;
-
-        // Run the validators (can change the string)
-        if(!validators_.empty()) {
-            for(std::string &result : results_) {
-                auto err_msg = _validate(result);
-                if(!err_msg.empty())
-                    throw ValidationError(get_name(), err_msg);
-            }
-        }
-        if(!(callback_)) {
-            return;
-        }
-        bool local_result;
-
-        // Num items expected or length of vector, always at least 1
-        // Only valid for a trimming policy
-        int trim_size =
-            std::min<int>(std::max<int>(std::abs(get_items_expected()), 1), static_cast<int>(results_.size()));
-
-        // Operation depends on the policy setting
-        if(multi_option_policy_ == MultiOptionPolicy::TakeLast) {
-            // Allow multi-option sizes (including 0)
-            results_t partial_result{results_.end() - trim_size, results_.end()};
-            local_result = !callback_(partial_result);
-
-        } else if(multi_option_policy_ == MultiOptionPolicy::TakeFirst) {
-            results_t partial_result{results_.begin(), results_.begin() + trim_size};
-            local_result = !callback_(partial_result);
-
-        } else if(multi_option_policy_ == MultiOptionPolicy::Join) {
-            results_t partial_result = {detail::join(results_, "\n")};
-            local_result = !callback_(partial_result);
-
-        } else {
-            // Exact number required
-            if(get_items_expected() > 0) {
-                if(results_.size() != static_cast<size_t>(get_items_expected()))
-                    throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
-                // Variable length list
-            } else if(get_items_expected() < 0) {
-                // Require that this be a multiple of expected size and at least as many as expected
-                if(results_.size() < static_cast<size_t>(-get_items_expected()) ||
-                   results_.size() % static_cast<size_t>(std::abs(get_type_size())) != 0u)
-                    throw ArgumentMismatch(get_name(), get_items_expected(), results_.size());
-            }
-            local_result = !callback_(results_);
-        }
-
-        if(local_result)
-            throw ConversionError(get_name(), results_);
-    }
-
-    /// If options share any of the same names, they are equal (not counting positional)
-    bool operator==(const Option &other) const {
-        for(const std::string &sname : snames_)
-            if(other.check_sname(sname))
-                return true;
-        for(const std::string &lname : lnames_)
-            if(other.check_lname(lname))
-                return true;
-
-        if(ignore_case_ ||
-           ignore_underscore_) { // We need to do the inverse, in case we are ignore_case or ignore underscore
-            for(const std::string &sname : other.snames_)
-                if(check_sname(sname))
-                    return true;
-            for(const std::string &lname : other.lnames_)
-                if(check_lname(lname))
-                    return true;
-        }
-        return false;
-    }
-
-    /// Check a name. Requires "-" or "--" for short / long, supports positional name
-    bool check_name(std::string name) const {
-
-        if(name.length() > 2 && name[0] == '-' && name[1] == '-')
-            return check_lname(name.substr(2));
-        else if(name.length() > 1 && name.front() == '-')
-            return check_sname(name.substr(1));
-        else {
-            std::string local_pname = pname_;
-            if(ignore_underscore_) {
-                local_pname = detail::remove_underscore(local_pname);
-                name = detail::remove_underscore(name);
-            }
-            if(ignore_case_) {
-                local_pname = detail::to_lower(local_pname);
-                name = detail::to_lower(name);
-            }
-            return name == local_pname;
-        }
-    }
-
-    /// Requires "-" to be removed from string
-    bool check_sname(std::string name) const { return (detail::find_member(name, snames_, ignore_case_) >= 0); }
-
-    /// Requires "--" to be removed from string
-    bool check_lname(std::string name) const {
-        return (detail::find_member(name, lnames_, ignore_case_, ignore_underscore_) >= 0);
-    }
-
-    /// Requires "--" to be removed from string
-    bool check_fname(std::string name) const {
-        if(fnames_.empty()) {
-            return false;
-        }
-        return (detail::find_member(name, fnames_, ignore_case_, ignore_underscore_) >= 0);
-    }
-
-    std::string get_flag_value(std::string name, std::string input_value) const {
-        static const std::string trueString{"true"};
-        static const std::string falseString{"false"};
-        static const std::string emptyString{"{}"};
-        // check for disable flag override_
-        if(disable_flag_override_) {
-            if(!((input_value.empty()) || (input_value == emptyString))) {
-                auto default_ind = detail::find_member(name, fnames_, ignore_case_, ignore_underscore_);
-                if(default_ind >= 0) {
-                    // We can static cast this to size_t because it is more than 0 in this block
-                    if(default_flag_values_[static_cast<size_t>(default_ind)].second != input_value) {
-                        throw(ArgumentMismatch::FlagOverride(name));
-                    }
-                } else {
-                    if(input_value != trueString) {
-                        throw(ArgumentMismatch::FlagOverride(name));
-                    }
-                }
-            }
-        }
-        auto ind = detail::find_member(name, fnames_, ignore_case_, ignore_underscore_);
-        if((input_value.empty()) || (input_value == emptyString)) {
-            return (ind < 0) ? trueString : default_flag_values_[static_cast<size_t>(ind)].second;
-        }
-        if(ind < 0) {
-            return input_value;
-        }
-        if(default_flag_values_[static_cast<size_t>(ind)].second == falseString) {
-            try {
-                auto val = detail::to_flag_value(input_value);
-                return (val == 1) ? falseString : (val == (-1) ? trueString : std::to_string(-val));
-            } catch(const std::invalid_argument &) {
-                return input_value;
-            }
-        } else {
-            return input_value;
-        }
-    }
-
-    /// Puts a result at the end
-    Option *add_result(std::string s) {
-        _add_result(std::move(s));
-        callback_run_ = false;
-        return this;
-    }
-
-    /// Puts a result at the end and get a count of the number of arguments actually added
-    Option *add_result(std::string s, int &results_added) {
-        results_added = _add_result(std::move(s));
-        callback_run_ = false;
-        return this;
-    }
-
-    /// Puts a result at the end
-    Option *add_result(std::vector<std::string> s) {
-        for(auto &str : s) {
-            _add_result(std::move(str));
-        }
-        callback_run_ = false;
-        return this;
-    }
-
-    /// Get a copy of the results
-    std::vector<std::string> results() const { return results_; }
-
-    /// get the results as a particular type
-    template <typename T,
-              enable_if_t<!is_vector<T>::value && !std::is_const<T>::value, detail::enabler> = detail::dummy>
-    void results(T &output) const {
-        bool retval;
-        if(results_.empty()) {
-            retval = detail::lexical_cast(default_str_, output);
-        } else if(results_.size() == 1) {
-            retval = detail::lexical_cast(results_[0], output);
-        } else {
-            switch(multi_option_policy_) {
-            case MultiOptionPolicy::TakeFirst:
-                retval = detail::lexical_cast(results_.front(), output);
-                break;
-            case MultiOptionPolicy::TakeLast:
-            default:
-                retval = detail::lexical_cast(results_.back(), output);
-                break;
-            case MultiOptionPolicy::Throw:
-                throw ConversionError(get_name(), results_);
-            case MultiOptionPolicy::Join:
-                retval = detail::lexical_cast(detail::join(results_), output);
-                break;
-            }
-        }
-        if(!retval) {
-            throw ConversionError(get_name(), results_);
-        }
-    }
-    /// get the results as a vector of a particular type
-    template <typename T> void results(std::vector<T> &output) const {
-        output.clear();
-        bool retval = true;
-
-        for(const auto &elem : results_) {
-            output.emplace_back();
-            retval &= detail::lexical_cast(elem, output.back());
-        }
-
-        if(!retval) {
-            throw ConversionError(get_name(), results_);
-        }
-    }
-
-    /// return the results as a particular type
-    template <typename T> T as() const {
-        T output;
-        results(output);
-        return output;
-    }
-
-    /// See if the callback has been run already
-    bool get_callback_run() const { return callback_run_; }
-
-    ///@}
-    /// @name Custom options
-    ///@{
-
-    /// Set the type function to run when displayed on this option
-    Option *type_name_fn(std::function<std::string()> typefun) {
-        type_name_ = typefun;
-        return this;
-    }
-
-    /// Set a custom option typestring
-    Option *type_name(std::string typeval) {
-        type_name_fn([typeval]() { return typeval; });
-        return this;
-    }
-
-    /// Set a custom option size
-    Option *type_size(int option_type_size) {
-        type_size_ = option_type_size;
-        if(type_size_ == 0)
-            required_ = false;
-        if(option_type_size < 0)
-            expected_ = -1;
-        return this;
-    }
-
-    /// Set a capture function for the default. Mostly used by App.
-    Option *default_function(const std::function<std::string()> &func) {
-        default_function_ = func;
-        return this;
-    }
-
-    /// Capture the default value from the original value (if it can be captured)
-    Option *capture_default_str() {
-        if(default_function_) {
-            default_str_ = default_function_();
-        }
-        return this;
-    }
-
-    /// Set the default value string representation (does not change the contained value)
-    Option *default_str(std::string val) {
-        default_str_ = val;
-        return this;
-    }
-
-    /// Set the default value string representation and evaluate into the bound value
-    Option *default_val(std::string val) {
-        default_str(val);
-        auto old_results = results_;
-        results_ = {val};
-        run_callback();
-        results_ = std::move(old_results);
-        return this;
-    }
-
-    /// Get the full typename for this option
-    std::string get_type_name() const {
-        std::string full_type_name = type_name_();
-        if(!validators_.empty()) {
-            for(auto &validator : validators_) {
-                std::string vtype = validator.get_description();
-                if(!vtype.empty()) {
-                    full_type_name += ":" + vtype;
-                }
-            }
-        }
-        return full_type_name;
-    }
-
-  private:
-    // run through the validators
-    std::string _validate(std::string &result) {
-        std::string err_msg;
-        for(const auto &vali : validators_) {
-            try {
-                err_msg = vali(result);
-            } catch(const ValidationError &err) {
-                err_msg = err.what();
-            }
-            if(!err_msg.empty())
-                break;
-        }
-        return err_msg;
-    }
-
-    int _add_result(std::string &&result) {
-        int result_count = 0;
-        if(delimiter_ == '\0') {
-            results_.push_back(std::move(result));
-            ++result_count;
-        } else {
-            if((result.find_first_of(delimiter_) != std::string::npos)) {
-                for(const auto &var : CLI::detail::split(result, delimiter_)) {
-                    if(!var.empty()) {
-                        results_.push_back(var);
-                        ++result_count;
-                    }
-                }
-            } else {
-                results_.push_back(std::move(result));
-                ++result_count;
-            }
-        }
-        return result_count;
-    }
-};
-
-} // namespace CLI
-
-// From CLI/App.hpp:
-
-namespace CLI {
-
-#ifndef CLI11_PARSE
-#define CLI11_PARSE(app, argc, argv)                                                                                   \
-    try {                                                                                                              \
-        (app).parse((argc), (argv));                                                                                   \
-    } catch(const CLI::ParseError &e) {                                                                                \
-        return (app).exit(e);                                                                                          \
-    }
-#endif
-
-namespace detail {
-enum class Classifier { NONE, POSITIONAL_MARK, SHORT, LONG, WINDOWS, SUBCOMMAND, SUBCOMMAND_TERMINATOR };
-struct AppFriend;
-} // namespace detail
-
-namespace FailureMessage {
-std::string simple(const App *app, const Error &e);
-std::string help(const App *app, const Error &e);
-} // namespace FailureMessage
-
-class App;
-
-using App_p = std::shared_ptr<App>;
-
-class Option_group;
-/// Creates a command line program, with very few defaults.
-/** To use, create a new `Program()` instance with `argc`, `argv`, and a help description. The templated
- *  add_option methods make it easy to prepare options. Remember to call `.start` before starting your
- * program, so that the options can be evaluated and the help option doesn't accidentally run your program. */
-class App {
-    friend Option;
-    friend detail::AppFriend;
-
-  protected:
-    // This library follows the Google style guide for member names ending in underscores
-
-    /// @name Basics
-    ///@{
-
-    /// Subcommand name or program name (from parser if name is empty)
-    std::string name_;
-
-    /// Description of the current program/subcommand
-    std::string description_;
-
-    /// If true, allow extra arguments (ie, don't throw an error). INHERITABLE
-    bool allow_extras_{false};
-
-    /// If true, allow extra arguments in the ini file (ie, don't throw an error). INHERITABLE
-    bool allow_config_extras_{false};
-
-    ///  If true, return immediately on an unrecognized option (implies allow_extras) INHERITABLE
-    bool prefix_command_{false};
-
-    /// If set to true the name was automatically generated from the command line vs a user set name
-    bool has_automatic_name_{false};
-
-    /// If set to true the subcommand is required to be processed and used, ignored for main app
-    bool required_{false};
-
-    /// If set to true the subcommand is disabled and cannot be used, ignored for main app
-    bool disabled_{false};
-
-    /// Flag indicating that the pre_parse_callback has been triggered
-    bool pre_parse_called_{false};
-
-    /// Flag indicating that the callback for the subcommand should be executed immediately on parse completion which is
-    /// before help or ini files are processed. INHERITABLE
-    bool immediate_callback_{false};
-
-    /// This is a function that runs prior to the start of parsing
-    std::function<void(size_t)> pre_parse_callback_;
-
-    /// This is a function that runs when complete. Great for subcommands. Can throw.
-    std::function<void()> callback_;
-
-    ///@}
-    /// @name Options
-    ///@{
-
-    /// The default values for options, customizable and changeable INHERITABLE
-    OptionDefaults option_defaults_;
-
-    /// The list of options, stored locally
-    std::vector<Option_p> options_;
-
-    ///@}
-    /// @name Help
-    ///@{
-
-    /// Footer to put after all options in the help output INHERITABLE
-    std::string footer_;
-
-    /// A pointer to the help flag if there is one INHERITABLE
-    Option *help_ptr_{nullptr};
-
-    /// A pointer to the help all flag if there is one INHERITABLE
-    Option *help_all_ptr_{nullptr};
-
-    /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer)
-    std::shared_ptr<FormatterBase> formatter_{new Formatter()};
-
-    /// The error message printing function INHERITABLE
-    std::function<std::string(const App *, const Error &e)> failure_message_ = FailureMessage::simple;
-
-    ///@}
-    /// @name Parsing
-    ///@{
-
-    using missing_t = std::vector<std::pair<detail::Classifier, std::string>>;
-
-    /// Pair of classifier, string for missing options. (extra detail is removed on returning from parse)
-    ///
-    /// This is faster and cleaner than storing just a list of strings and reparsing. This may contain the -- separator.
-    missing_t missing_;
-
-    /// This is a list of pointers to options with the original parse order
-    std::vector<Option *> parse_order_;
-
-    /// This is a list of the subcommands collected, in order
-    std::vector<App *> parsed_subcommands_;
-
-    /// this is a list of subcommands that are exclusionary to this one
-    std::set<App *> exclude_subcommands_;
-
-    /// This is a list of options which are exclusionary to this App, if the options were used this subcommand should
-    /// not be
-    std::set<Option *> exclude_options_;
-
-    ///@}
-    /// @name Subcommands
-    ///@{
-
-    /// Storage for subcommand list
-    std::vector<App_p> subcommands_;
-
-    /// If true, the program name is not case sensitive INHERITABLE
-    bool ignore_case_{false};
-
-    /// If true, the program should ignore underscores INHERITABLE
-    bool ignore_underscore_{false};
-
-    /// Allow subcommand fallthrough, so that parent commands can collect commands after subcommand.  INHERITABLE
-    bool fallthrough_{false};
-
-    /// Allow '/' for options for Windows like options. Defaults to true on Windows, false otherwise. INHERITABLE
-    bool allow_windows_style_options_{
-#ifdef _WIN32
-        true
-#else
-        false
-#endif
-    };
-    /// specify that positional arguments come at the end of the argument sequence not inheritable
-    bool positionals_at_end_{false};
-
-    /// If set to true the subcommand will start each parse disabled
-    bool disabled_by_default_{false};
-    /// If set to true the subcommand will be reenabled at the start of each parse
-    bool enabled_by_default_{false};
-    /// If set to true positional options are validated before assigning INHERITABLE
-    bool validate_positionals_{false};
-    /// A pointer to the parent if this is a subcommand
-    App *parent_{nullptr};
-
-    /// Counts the number of times this command/subcommand was parsed
-    size_t parsed_ = 0;
-
-    /// Minimum required subcommands (not inheritable!)
-    size_t require_subcommand_min_ = 0;
-
-    /// Max number of subcommands allowed (parsing stops after this number). 0 is unlimited INHERITABLE
-    size_t require_subcommand_max_ = 0;
-
-    /// Minimum required options (not inheritable!)
-    size_t require_option_min_ = 0;
-
-    /// Max number of options allowed. 0 is unlimited (not inheritable)
-    size_t require_option_max_ = 0;
-
-    /// The group membership INHERITABLE
-    std::string group_{"Subcommands"};
-
-    ///@}
-    /// @name Config
-    ///@{
-
-    /// The name of the connected config file
-    std::string config_name_;
-
-    /// True if ini is required (throws if not present), if false simply keep going.
-    bool config_required_{false};
-
-    /// Pointer to the config option
-    Option *config_ptr_{nullptr};
-
-    /// This is the formatter for help printing. Default provided. INHERITABLE (same pointer)
-    std::shared_ptr<Config> config_formatter_{new ConfigINI()};
-
-    ///@}
-
-    /// Special private constructor for subcommand
-    App(std::string app_description, std::string app_name, App *parent)
-        : name_(std::move(app_name)), description_(std::move(app_description)), parent_(parent) {
-        // Inherit if not from a nullptr
-        if(parent_ != nullptr) {
-            if(parent_->help_ptr_ != nullptr)
-                set_help_flag(parent_->help_ptr_->get_name(false, true), parent_->help_ptr_->get_description());
-            if(parent_->help_all_ptr_ != nullptr)
-                set_help_all_flag(parent_->help_all_ptr_->get_name(false, true),
-                                  parent_->help_all_ptr_->get_description());
-
-            /// OptionDefaults
-            option_defaults_ = parent_->option_defaults_;
-
-            // INHERITABLE
-            failure_message_ = parent_->failure_message_;
-            allow_extras_ = parent_->allow_extras_;
-            allow_config_extras_ = parent_->allow_config_extras_;
-            prefix_command_ = parent_->prefix_command_;
-            immediate_callback_ = parent_->immediate_callback_;
-            ignore_case_ = parent_->ignore_case_;
-            ignore_underscore_ = parent_->ignore_underscore_;
-            fallthrough_ = parent_->fallthrough_;
-            validate_positionals_ = parent_->validate_positionals_;
-            allow_windows_style_options_ = parent_->allow_windows_style_options_;
-            group_ = parent_->group_;
-            footer_ = parent_->footer_;
-            formatter_ = parent_->formatter_;
-            config_formatter_ = parent_->config_formatter_;
-            require_subcommand_max_ = parent_->require_subcommand_max_;
-        }
-    }
-
-  public:
-    /// @name Basic
-    ///@{
-
-    /// Create a new program. Pass in the same arguments as main(), along with a help string.
-    explicit App(std::string app_description = "", std::string app_name = "")
-        : App(app_description, app_name, nullptr) {
-        set_help_flag("-h,--help", "Print this help message and exit");
-    }
-
-    /// virtual destructor
-    virtual ~App() = default;
-
-    /// Set a callback for the end of parsing.
-    ///
-    /// Due to a bug in c++11,
-    /// it is not possible to overload on std::function (fixed in c++14
-    /// and backported to c++11 on newer compilers). Use capture by reference
-    /// to get a pointer to App if needed.
-    App *callback(std::function<void()> app_callback) {
-        callback_ = std::move(app_callback);
-        return this;
-    }
-
-    /// Set a callback to execute prior to parsing.
-    ///
-    App *preparse_callback(std::function<void(size_t)> pp_callback) {
-        pre_parse_callback_ = std::move(pp_callback);
-        return this;
-    }
-
-    /// Set a name for the app (empty will use parser to set the name)
-    App *name(std::string app_name = "") {
-        name_ = app_name;
-        has_automatic_name_ = false;
-        return this;
-    }
-
-    /// Remove the error when extras are left over on the command line.
-    App *allow_extras(bool allow = true) {
-        allow_extras_ = allow;
-        return this;
-    }
-
-    /// Remove the error when extras are left over on the command line.
-    App *required(bool require = true) {
-        required_ = require;
-        return this;
-    }
-
-    /// Disable the subcommand or option group
-    App *disabled(bool disable = true) {
-        disabled_ = disable;
-        return this;
-    }
-
-    /// Set the subcommand to be disabled by default, so on clear(), at the start of each parse it is disabled
-    App *disabled_by_default(bool disable = true) {
-        disabled_by_default_ = disable;
-        return this;
-    }
-
-    /// Set the subcommand to be enabled by default, so on clear(), at the start of each parse it is enabled (not
-    /// disabled)
-    App *enabled_by_default(bool enable = true) {
-        enabled_by_default_ = enable;
-        return this;
-    }
-
-    /// Set the subcommand callback to be executed immediately on subcommand completion
-    App *immediate_callback(bool immediate = true) {
-        immediate_callback_ = immediate;
-        return this;
-    }
-
-    /// Set the subcommand to validate positional arguments before assigning
-    App *validate_positionals(bool validate = true) {
-        validate_positionals_ = validate;
-        return this;
-    }
-
-    /// Remove the error when extras are left over on the command line.
-    /// Will also call App::allow_extras().
-    App *allow_config_extras(bool allow = true) {
-        allow_extras(allow);
-        allow_config_extras_ = allow;
-        return this;
-    }
-
-    /// Do not parse anything after the first unrecognized option and return
-    App *prefix_command(bool allow = true) {
-        prefix_command_ = allow;
-        return this;
-    }
-
-    /// Ignore case. Subcommands inherit value.
-    App *ignore_case(bool value = true) {
-        ignore_case_ = value;
-        if(parent_ != nullptr && !name_.empty()) {
-            for(const auto &subc : parent_->subcommands_) {
-                if(subc.get() != this && (this->check_name(subc->name_) || subc->check_name(this->name_)))
-                    throw OptionAlreadyAdded(subc->name_);
-            }
-        }
-        return this;
-    }
-
-    /// Allow windows style options, such as `/opt`. First matching short or long name used. Subcommands inherit value.
-    App *allow_windows_style_options(bool value = true) {
-        allow_windows_style_options_ = value;
-        return this;
-    }
-
-    /// Specify that the positional arguments are only at the end of the sequence
-    App *positionals_at_end(bool value = true) {
-        positionals_at_end_ = value;
-        return this;
-    }
-
-    /// Ignore underscore. Subcommands inherit value.
-    App *ignore_underscore(bool value = true) {
-        ignore_underscore_ = value;
-        if(parent_ != nullptr && !name_.empty()) {
-            for(const auto &subc : parent_->subcommands_) {
-                if(subc.get() != this && (this->check_name(subc->name_) || subc->check_name(this->name_)))
-                    throw OptionAlreadyAdded(subc->name_);
-            }
-        }
-        return this;
-    }
-
-    /// Set the help formatter
-    App *formatter(std::shared_ptr<FormatterBase> fmt) {
-        formatter_ = fmt;
-        return this;
-    }
-
-    /// Set the help formatter
-    App *formatter_fn(std::function<std::string(const App *, std::string, AppFormatMode)> fmt) {
-        formatter_ = std::make_shared<FormatterLambda>(fmt);
-        return this;
-    }
-
-    /// Set the config formatter
-    App *config_formatter(std::shared_ptr<Config> fmt) {
-        config_formatter_ = fmt;
-        return this;
-    }
-
-    /// Check to see if this subcommand was parsed, true only if received on command line.
-    bool parsed() const { return parsed_ > 0; }
-
-    /// Get the OptionDefault object, to set option defaults
-    OptionDefaults *option_defaults() { return &option_defaults_; }
-
-    ///@}
-    /// @name Adding options
-    ///@{
-
-    /// Add an option, will automatically understand the type for common types.
-    ///
-    /// To use, create a variable with the expected type, and pass it in after the name.
-    /// After start is called, you can use count to see if the value was passed, and
-    /// the value will be initialized properly. Numbers, vectors, and strings are supported.
-    ///
-    /// ->required(), ->default, and the validators are options,
-    /// The positional options take an optional number of arguments.
-    ///
-    /// For example,
-    ///
-    ///     std::string filename;
-    ///     program.add_option("filename", filename, "description of filename");
-    ///
-    Option *add_option(std::string option_name,
-                       callback_t option_callback,
-                       std::string option_description = "",
-                       bool defaulted = false,
-                       std::function<std::string()> func = {}) {
-        Option myopt{option_name, option_description, option_callback, this};
-
-        if(std::find_if(std::begin(options_), std::end(options_), [&myopt](const Option_p &v) {
-               return *v == myopt;
-           }) == std::end(options_)) {
-            options_.emplace_back();
-            Option_p &option = options_.back();
-            option.reset(new Option(option_name, option_description, option_callback, this));
-
-            // Set the default string capture function
-            option->default_function(func);
-
-            // For compatibility with CLI11 1.7 and before, capture the default string here
-            if(defaulted)
-                option->capture_default_str();
-
-            // Transfer defaults to the new option
-            option_defaults_.copy_to(option.get());
-
-            // Don't bother to capture if we already did
-            if(!defaulted && option->get_always_capture_default())
-                option->capture_default_str();
-
-            return option.get();
-
-        } else
-            throw OptionAlreadyAdded(myopt.get_name());
-    }
-
-    /// Add option for non-vectors (duplicate copy needed without defaulted to avoid `iostream << value`)
-    template <typename T, enable_if_t<!is_vector<T>::value & !std::is_const<T>::value, detail::enabler> = detail::dummy>
-    Option *add_option(std::string option_name,
-                       T &variable, ///< The variable to set
-                       std::string option_description = "",
-                       bool defaulted = false) {
-
-        auto fun = [&variable](CLI::results_t res) { return detail::lexical_cast(res[0], variable); };
-
-        Option *opt = add_option(option_name, fun, option_description, defaulted, [&variable]() {
-            return std::string(CLI::detail::to_string(variable));
-        });
-        opt->type_name(detail::type_name<T>());
-
-        return opt;
-    }
-
-    /// Add option for a callback of a specific type
-    template <typename T, enable_if_t<!is_vector<T>::value, detail::enabler> = detail::dummy>
-    Option *add_option_function(std::string option_name,
-                                const std::function<void(const T &)> &func, ///< the callback to execute
-                                std::string option_description = "") {
-
-        auto fun = [func](CLI::results_t res) {
-            T variable;
-            bool result = detail::lexical_cast(res[0], variable);
-            if(result) {
-                func(variable);
-            }
-            return result;
-        };
-
-        Option *opt = add_option(option_name, std::move(fun), option_description, false);
-        opt->type_name(detail::type_name<T>());
-        return opt;
-    }
-
-    /// Add option with no description or variable assignment
-    Option *add_option(std::string option_name) {
-        return add_option(option_name, CLI::callback_t(), std::string{}, false);
-    }
-
-    /// Add option with description but with no variable assignment or callback
-    template <typename T,
-              enable_if_t<std::is_const<T>::value && std::is_constructible<std::string, T>::value, detail::enabler> =
-                  detail::dummy>
-    Option *add_option(std::string option_name, T &option_description) {
-        return add_option(option_name, CLI::callback_t(), option_description, false);
-    }
-
-    /// Add option for vectors
-    template <typename T>
-    Option *add_option(std::string option_name,
-                       std::vector<T> &variable, ///< The variable vector to set
-                       std::string option_description = "",
-                       bool defaulted = false) {
-
-        auto fun = [&variable](CLI::results_t res) {
-            bool retval = true;
-            variable.clear();
-            variable.reserve(res.size());
-            for(const auto &elem : res) {
-
-                variable.emplace_back();
-                retval &= detail::lexical_cast(elem, variable.back());
-            }
-            return (!variable.empty()) && retval;
-        };
-
-        auto default_function = [&variable]() {
-            std::vector<std::string> defaults;
-            defaults.resize(variable.size());
-            std::transform(variable.begin(), variable.end(), defaults.begin(), [](T &val) {
-                return std::string(CLI::detail::to_string(val));
-            });
-            return std::string("[" + detail::join(defaults) + "]");
-        };
-
-        Option *opt = add_option(option_name, fun, option_description, defaulted, default_function);
-        opt->type_name(detail::type_name<T>())->type_size(-1);
-
-        return opt;
-    }
-
-    /// Add option for a vector callback of a specific type
-    template <typename T, enable_if_t<is_vector<T>::value, detail::enabler> = detail::dummy>
-    Option *add_option_function(std::string option_name,
-                                const std::function<void(const T &)> &func, ///< the callback to execute
-                                std::string option_description = "") {
-
-        CLI::callback_t fun = [func](CLI::results_t res) {
-            T values;
-            bool retval = true;
-            values.reserve(res.size());
-            for(const auto &elem : res) {
-                values.emplace_back();
-                retval &= detail::lexical_cast(elem, values.back());
-            }
-            if(retval) {
-                func(values);
-            }
-            return retval;
-        };
-
-        Option *opt = add_option(option_name, std::move(fun), std::move(option_description), false);
-        opt->type_name(detail::type_name<T>())->type_size(-1);
-        return opt;
-    }
-
-    /// Set a help flag, replace the existing one if present
-    Option *set_help_flag(std::string flag_name = "", const std::string &help_description = "") {
-        // take flag_description by const reference otherwise add_flag tries to assign to help_description
-        if(help_ptr_ != nullptr) {
-            remove_option(help_ptr_);
-            help_ptr_ = nullptr;
-        }
-
-        // Empty name will simply remove the help flag
-        if(!flag_name.empty()) {
-            help_ptr_ = add_flag(flag_name, help_description);
-            help_ptr_->configurable(false);
-        }
-
-        return help_ptr_;
-    }
-
-    /// Set a help all flag, replaced the existing one if present
-    Option *set_help_all_flag(std::string help_name = "", const std::string &help_description = "") {
-        // take flag_description by const reference otherwise add_flag tries to assign to flag_description
-        if(help_all_ptr_ != nullptr) {
-            remove_option(help_all_ptr_);
-            help_all_ptr_ = nullptr;
-        }
-
-        // Empty name will simply remove the help all flag
-        if(!help_name.empty()) {
-            help_all_ptr_ = add_flag(help_name, help_description);
-            help_all_ptr_->configurable(false);
-        }
-
-        return help_all_ptr_;
-    }
-
-  private:
-    /// Internal function for adding a flag
-    Option *_add_flag_internal(std::string flag_name, CLI::callback_t fun, std::string flag_description) {
-        Option *opt;
-        if(detail::has_default_flag_values(flag_name)) {
-            // check for default values and if it has them
-            auto flag_defaults = detail::get_default_flag_values(flag_name);
-            detail::remove_default_flag_values(flag_name);
-            opt = add_option(std::move(flag_name), std::move(fun), std::move(flag_description), false);
-            for(const auto &fname : flag_defaults)
-                opt->fnames_.push_back(fname.first);
-            opt->default_flag_values_ = std::move(flag_defaults);
-        } else {
-            opt = add_option(std::move(flag_name), std::move(fun), std::move(flag_description), false);
-        }
-        // flags cannot have positional values
-        if(opt->get_positional()) {
-            auto pos_name = opt->get_name(true);
-            remove_option(opt);
-            throw IncorrectConstruction::PositionalFlag(pos_name);
-        }
-
-        opt->type_size(0);
-        return opt;
-    }
-
-  public:
-    /// Add a flag with no description or variable assignment
-    Option *add_flag(std::string flag_name) { return _add_flag_internal(flag_name, CLI::callback_t(), std::string{}); }
-
-    /// Add flag with description but with no variable assignment or callback
-    /// takes a constant string,  if a variable string is passed that variable will be assigned the results from the
-    /// flag
-    template <typename T,
-              enable_if_t<std::is_const<T>::value && std::is_constructible<std::string, T>::value, detail::enabler> =
-                  detail::dummy>
-    Option *add_flag(std::string flag_name, T &flag_description) {
-        return _add_flag_internal(flag_name, CLI::callback_t(), flag_description);
-    }
-
-    /// Add option for flag with integer result - defaults to allowing multiple passings, but can be forced to one if
-    /// `multi_option_policy(CLI::MultiOptionPolicy::Throw)` is used.
-    template <typename T,
-              enable_if_t<std::is_integral<T>::value && !is_bool<T>::value, detail::enabler> = detail::dummy>
-    Option *add_flag(std::string flag_name,
-                     T &flag_count, ///< A variable holding the count
-                     std::string flag_description = "") {
-        flag_count = 0;
-        CLI::callback_t fun = [&flag_count](CLI::results_t res) {
-            try {
-                detail::sum_flag_vector(res, flag_count);
-            } catch(const std::invalid_argument &) {
-                return false;
-            }
-            return true;
-        };
-        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
-    }
-
-    /// Other type version accepts all other types that are not vectors such as bool, enum, string or other classes that
-    /// can be converted from a string
-    template <typename T,
-              enable_if_t<!is_vector<T>::value && !std::is_const<T>::value &&
-                              (!std::is_integral<T>::value || is_bool<T>::value) &&
-                              !std::is_constructible<std::function<void(int)>, T>::value,
-                          detail::enabler> = detail::dummy>
-    Option *add_flag(std::string flag_name,
-                     T &flag_result, ///< A variable holding true if passed
-                     std::string flag_description = "") {
-
-        CLI::callback_t fun = [&flag_result](CLI::results_t res) {
-            if(res.size() != 1) {
-                return false;
-            }
-            return CLI::detail::lexical_cast(res[0], flag_result);
-        };
-        Option *opt = _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
-        opt->multi_option_policy(CLI::MultiOptionPolicy::TakeLast);
-        return opt;
-    }
-
-    /// Vector version to capture multiple flags.
-    template <typename T,
-              enable_if_t<!std::is_assignable<std::function<void(int64_t)>, T>::value, detail::enabler> = detail::dummy>
-    Option *add_flag(std::string flag_name,
-                     std::vector<T> &flag_results, ///< A vector of values with the flag results
-                     std::string flag_description = "") {
-        CLI::callback_t fun = [&flag_results](CLI::results_t res) {
-            bool retval = true;
-            for(const auto &elem : res) {
-                flag_results.emplace_back();
-                retval &= detail::lexical_cast(elem, flag_results.back());
-            }
-            return retval;
-        };
-        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
-    }
-
-    /// Add option for callback that is triggered with a true flag and takes no arguments
-    Option *add_flag_callback(std::string flag_name,
-                              std::function<void(void)> function, ///< A function to call, void(void)
-                              std::string flag_description = "") {
-
-        CLI::callback_t fun = [function](CLI::results_t res) {
-            if(res.size() != 1) {
-                return false;
-            }
-            bool trigger;
-            auto result = CLI::detail::lexical_cast(res[0], trigger);
-            if(trigger)
-                function();
-            return result;
-        };
-        Option *opt = _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
-        opt->multi_option_policy(CLI::MultiOptionPolicy::TakeLast);
-        return opt;
-    }
-
-    /// Add option for callback with an integer value
-    Option *add_flag_function(std::string flag_name,
-                              std::function<void(int64_t)> function, ///< A function to call, void(int)
-                              std::string flag_description = "") {
-
-        CLI::callback_t fun = [function](CLI::results_t res) {
-            int64_t flag_count = 0;
-            detail::sum_flag_vector(res, flag_count);
-            function(flag_count);
-            return true;
-        };
-        return _add_flag_internal(flag_name, std::move(fun), std::move(flag_description));
-    }
-
-#ifdef CLI11_CPP14
-    /// Add option for callback (C++14 or better only)
-    Option *add_flag(std::string flag_name,
-                     std::function<void(int64_t)> function, ///< A function to call, void(int64_t)
-                     std::string flag_description = "") {
-        return add_flag_function(std::move(flag_name), std::move(function), std::move(flag_description));
-    }
-#endif
-
-    /// Add set of options (No default, temp reference, such as an inline set) DEPRECATED
-    template <typename T>
-    Option *add_set(std::string option_name,
-                    T &member,           ///< The selected member of the set
-                    std::set<T> options, ///< The set of possibilities
-                    std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->check(IsMember{options});
-        return opt;
-    }
-
-    /// Add set of options (No default, set can be changed afterwards - do not destroy the set) DEPRECATED
-    template <typename T>
-    Option *add_mutable_set(std::string option_name,
-                            T &member,                  ///< The selected member of the set
-                            const std::set<T> &options, ///< The set of possibilities
-                            std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->check(IsMember{&options});
-        return opt;
-    }
-
-    /// Add set of options (with default, static set, such as an inline set) DEPRECATED
-    template <typename T>
-    Option *add_set(std::string option_name,
-                    T &member,           ///< The selected member of the set
-                    std::set<T> options, ///< The set of possibilities
-                    std::string option_description,
-                    bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->check(IsMember{options});
-        return opt;
-    }
-
-    /// Add set of options (with default, set can be changed afterwards - do not destroy the set) DEPRECATED
-    template <typename T>
-    Option *add_mutable_set(std::string option_name,
-                            T &member,                  ///< The selected member of the set
-                            const std::set<T> &options, ///< The set of possibilities
-                            std::string option_description,
-                            bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->check(IsMember{&options});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore case (no default, static set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case)) instead")
-    Option *add_set_ignore_case(std::string option_name,
-                                std::string &member,           ///< The selected member of the set
-                                std::set<std::string> options, ///< The set of possibilities
-                                std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->transform(IsMember{options, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore case (no default, set can be changed afterwards - do not destroy the
-    /// set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case)) with a (shared) pointer instead")
-    Option *add_mutable_set_ignore_case(std::string option_name,
-                                        std::string &member,                  ///< The selected member of the set
-                                        const std::set<std::string> &options, ///< The set of possibilities
-                                        std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->transform(IsMember{&options, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore case (default, static set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case)) instead")
-    Option *add_set_ignore_case(std::string option_name,
-                                std::string &member,           ///< The selected member of the set
-                                std::set<std::string> options, ///< The set of possibilities
-                                std::string option_description,
-                                bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->transform(IsMember{options, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore case (default, set can be changed afterwards - do not destroy the set)
-    /// DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(...)) with a (shared) pointer instead")
-    Option *add_mutable_set_ignore_case(std::string option_name,
-                                        std::string &member,                  ///< The selected member of the set
-                                        const std::set<std::string> &options, ///< The set of possibilities
-                                        std::string option_description,
-                                        bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->transform(IsMember{&options, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore (no default, static set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) instead")
-    Option *add_set_ignore_underscore(std::string option_name,
-                                      std::string &member,           ///< The selected member of the set
-                                      std::set<std::string> options, ///< The set of possibilities
-                                      std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->transform(IsMember{options, CLI::ignore_underscore});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore (no default, set can be changed afterwards - do not destroy
-    /// the set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) with a (shared) pointer instead")
-    Option *add_mutable_set_ignore_underscore(std::string option_name,
-                                              std::string &member,                  ///< The selected member of the set
-                                              const std::set<std::string> &options, ///< The set of possibilities
-                                              std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->transform(IsMember{options, CLI::ignore_underscore});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore (default, static set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) instead")
-    Option *add_set_ignore_underscore(std::string option_name,
-                                      std::string &member,           ///< The selected member of the set
-                                      std::set<std::string> options, ///< The set of possibilities
-                                      std::string option_description,
-                                      bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->transform(IsMember{options, CLI::ignore_underscore});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore (default, set can be changed afterwards - do not destroy the
-    /// set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_underscore)) with a (shared) pointer instead")
-    Option *add_mutable_set_ignore_underscore(std::string option_name,
-                                              std::string &member,                  ///< The selected member of the set
-                                              const std::set<std::string> &options, ///< The set of possibilities
-                                              std::string option_description,
-                                              bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->transform(IsMember{&options, CLI::ignore_underscore});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore and case (no default, static set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) instead")
-    Option *add_set_ignore_case_underscore(std::string option_name,
-                                           std::string &member,           ///< The selected member of the set
-                                           std::set<std::string> options, ///< The set of possibilities
-                                           std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->transform(IsMember{options, CLI::ignore_underscore, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore and case (no default, set can be changed afterwards - do not
-    /// destroy the set) DEPRECATED
-    CLI11_DEPRECATED(
-        "Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) with a (shared) pointer instead")
-    Option *add_mutable_set_ignore_case_underscore(std::string option_name,
-                                                   std::string &member, ///< The selected member of the set
-                                                   const std::set<std::string> &options, ///< The set of possibilities
-                                                   std::string option_description = "") {
-
-        Option *opt = add_option(option_name, member, std::move(option_description));
-        opt->transform(IsMember{&options, CLI::ignore_underscore, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore and case (default, static set) DEPRECATED
-    CLI11_DEPRECATED("Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) instead")
-    Option *add_set_ignore_case_underscore(std::string option_name,
-                                           std::string &member,           ///< The selected member of the set
-                                           std::set<std::string> options, ///< The set of possibilities
-                                           std::string option_description,
-                                           bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->transform(IsMember{options, CLI::ignore_underscore, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add set of options, string only, ignore underscore and case (default, set can be changed afterwards - do not
-    /// destroy the set) DEPRECATED
-    CLI11_DEPRECATED(
-        "Use ->transform(CLI::IsMember(..., CLI::ignore_case, CLI::ignore_underscore)) with a (shared) pointer instead")
-    Option *add_mutable_set_ignore_case_underscore(std::string option_name,
-                                                   std::string &member, ///< The selected member of the set
-                                                   const std::set<std::string> &options, ///< The set of possibilities
-                                                   std::string option_description,
-                                                   bool defaulted) {
-
-        Option *opt = add_option(option_name, member, std::move(option_description), defaulted);
-        opt->transform(IsMember{&options, CLI::ignore_underscore, CLI::ignore_case});
-        return opt;
-    }
-
-    /// Add a complex number
-    template <typename T>
-    Option *add_complex(std::string option_name,
-                        T &variable,
-                        std::string option_description = "",
-                        bool defaulted = false,
-                        std::string label = "COMPLEX") {
-
-        std::string simple_name = CLI::detail::split(option_name, ',').at(0);
-        CLI::callback_t fun = [&variable, simple_name, label](results_t res) {
-            if(res[1].back() == 'i')
-                res[1].pop_back();
-            double x, y;
-            bool worked = detail::lexical_cast(res[0], x) && detail::lexical_cast(res[1], y);
-            if(worked)
-                variable = T(x, y);
-            return worked;
-        };
-
-        auto default_function = [&variable]() {
-            std::stringstream out;
-            out << variable;
-            return out.str();
-        };
-
-        CLI::Option *opt =
-            add_option(option_name, std::move(fun), std::move(option_description), defaulted, default_function);
-
-        opt->type_name(label)->type_size(2);
-        return opt;
-    }
-
-    /// Set a configuration ini file option, or clear it if no name passed
-    Option *set_config(std::string option_name = "",
-                       std::string default_filename = "",
-                       std::string help_message = "Read an ini file",
-                       bool config_required = false) {
-
-        // Remove existing config if present
-        if(config_ptr_ != nullptr)
-            remove_option(config_ptr_);
-
-        // Only add config if option passed
-        if(!option_name.empty()) {
-            config_name_ = default_filename;
-            config_required_ = config_required;
-            config_ptr_ = add_option(option_name, config_name_, help_message, !default_filename.empty());
-            config_ptr_->configurable(false);
-        }
-
-        return config_ptr_;
-    }
-
-    /// Removes an option from the App. Takes an option pointer. Returns true if found and removed.
-    bool remove_option(Option *opt) {
-        // Make sure no links exist
-        for(Option_p &op : options_) {
-            op->remove_needs(opt);
-            op->remove_excludes(opt);
-        }
-
-        if(help_ptr_ == opt)
-            help_ptr_ = nullptr;
-        if(help_all_ptr_ == opt)
-            help_all_ptr_ = nullptr;
-
-        auto iterator =
-            std::find_if(std::begin(options_), std::end(options_), [opt](const Option_p &v) { return v.get() == opt; });
-        if(iterator != std::end(options_)) {
-            options_.erase(iterator);
-            return true;
-        }
-        return false;
-    }
-
-    /// creates an option group as part of the given app
-    template <typename T = Option_group>
-    T *add_option_group(std::string group_name, std::string group_description = "") {
-        auto option_group = std::make_shared<T>(std::move(group_description), group_name, nullptr);
-        auto ptr = option_group.get();
-        // move to App_p for overload resolution on older gcc versions
-        App_p app_ptr = std::dynamic_pointer_cast<App>(option_group);
-        add_subcommand(std::move(app_ptr));
-        return ptr;
-    }
-
-    ///@}
-    /// @name Subcommmands
-    ///@{
-
-    /// Add a subcommand. Inherits INHERITABLE and OptionDefaults, and help flag
-    App *add_subcommand(std::string subcommand_name = "", std::string subcommand_description = "") {
-        CLI::App_p subcom = std::shared_ptr<App>(new App(std::move(subcommand_description), subcommand_name, this));
-        return add_subcommand(std::move(subcom));
-    }
-
-    /// Add a previously created app as a subcommand
-    App *add_subcommand(CLI::App_p subcom) {
-        if(!subcom)
-            throw IncorrectConstruction("passed App is not valid");
-        if(!subcom->name_.empty()) {
-            for(const auto &subc : subcommands_)
-                if(subc->check_name(subcom->name_) || subcom->check_name(subc->name_))
-                    throw OptionAlreadyAdded(subc->name_);
-        }
-        subcom->parent_ = this;
-        subcommands_.push_back(std::move(subcom));
-        return subcommands_.back().get();
-    }
-
-    /// Removes a subcommand from the App. Takes a subcommand pointer. Returns true if found and removed.
-    bool remove_subcommand(App *subcom) {
-        // Make sure no links exist
-        for(App_p &sub : subcommands_) {
-            sub->remove_excludes(subcom);
-        }
-
-        auto iterator = std::find_if(
-            std::begin(subcommands_), std::end(subcommands_), [subcom](const App_p &v) { return v.get() == subcom; });
-        if(iterator != std::end(subcommands_)) {
-            subcommands_.erase(iterator);
-            return true;
-        }
-        return false;
-    }
-    /// Check to see if a subcommand is part of this command (doesn't have to be in command line)
-    /// returns the first subcommand if passed a nullptr
-    App *get_subcommand(App *subcom) const {
-        if(subcom == nullptr)
-            throw OptionNotFound("nullptr passed");
-        for(const App_p &subcomptr : subcommands_)
-            if(subcomptr.get() == subcom)
-                return subcom;
-        throw OptionNotFound(subcom->get_name());
-    }
-
-    /// Check to see if a subcommand is part of this command (text version)
-    App *get_subcommand(std::string subcom) const {
-        auto subc = _find_subcommand(subcom, false, false);
-        if(subc == nullptr)
-            throw OptionNotFound(subcom);
-        return subc;
-    }
-    /// Get a pointer to subcommand by index
-    App *get_subcommand(int index = 0) const {
-        if(index >= 0) {
-            auto uindex = static_cast<unsigned>(index);
-            if(uindex < subcommands_.size())
-                return subcommands_[uindex].get();
-        }
-        throw OptionNotFound(std::to_string(index));
-    }
-
-    /// Check to see if a subcommand is part of this command and get a shared_ptr to it
-    CLI::App_p get_subcommand_ptr(App *subcom) const {
-        if(subcom == nullptr)
-            throw OptionNotFound("nullptr passed");
-        for(const App_p &subcomptr : subcommands_)
-            if(subcomptr.get() == subcom)
-                return subcomptr;
-        throw OptionNotFound(subcom->get_name());
-    }
-
-    /// Check to see if a subcommand is part of this command (text version)
-    CLI::App_p get_subcommand_ptr(std::string subcom) const {
-        for(const App_p &subcomptr : subcommands_)
-            if(subcomptr->check_name(subcom))
-                return subcomptr;
-        throw OptionNotFound(subcom);
-    }
-
-    /// Get an owning pointer to subcommand by index
-    CLI::App_p get_subcommand_ptr(int index = 0) const {
-        if(index >= 0) {
-            auto uindex = static_cast<unsigned>(index);
-            if(uindex < subcommands_.size())
-                return subcommands_[uindex];
-        }
-        throw OptionNotFound(std::to_string(index));
-    }
-
-    /// Check to see if an option group is part of this App
-    App *get_option_group(std::string group_name) const {
-        for(const App_p &app : subcommands_) {
-            if(app->name_.empty() && app->group_ == group_name) {
-                return app.get();
-            }
-        }
-        throw OptionNotFound(group_name);
-    }
-
-    /// No argument version of count counts the number of times this subcommand was
-    /// passed in. The main app will return 1. Unnamed subcommands will also return 1 unless
-    /// otherwise modified in a callback
-    size_t count() const { return parsed_; }
-
-    /// Get a count of all the arguments processed in options and subcommands, this excludes arguments which were
-    /// treated as extras.
-    size_t count_all() const {
-        size_t cnt{0};
-        for(auto &opt : options_) {
-            cnt += opt->count();
-        }
-        for(auto &sub : subcommands_) {
-            cnt += sub->count_all();
-        }
-        if(!get_name().empty()) { // for named subcommands add the number of times the subcommand was called
-            cnt += parsed_;
-        }
-        return cnt;
-    }
-
-    /// Changes the group membership
-    App *group(std::string group_name) {
-        group_ = group_name;
-        return this;
-    }
-
-    /// The argumentless form of require subcommand requires 1 or more subcommands
-    App *require_subcommand() {
-        require_subcommand_min_ = 1;
-        require_subcommand_max_ = 0;
-        return this;
-    }
-
-    /// Require a subcommand to be given (does not affect help call)
-    /// The number required can be given. Negative values indicate maximum
-    /// number allowed (0 for any number). Max number inheritable.
-    App *require_subcommand(int value) {
-        if(value < 0) {
-            require_subcommand_min_ = 0;
-            require_subcommand_max_ = static_cast<size_t>(-value);
-        } else {
-            require_subcommand_min_ = static_cast<size_t>(value);
-            require_subcommand_max_ = static_cast<size_t>(value);
-        }
-        return this;
-    }
-
-    /// Explicitly control the number of subcommands required. Setting 0
-    /// for the max means unlimited number allowed. Max number inheritable.
-    App *require_subcommand(size_t min, size_t max) {
-        require_subcommand_min_ = min;
-        require_subcommand_max_ = max;
-        return this;
-    }
-
-    /// The argumentless form of require option requires 1 or more options be used
-    App *require_option() {
-        require_option_min_ = 1;
-        require_option_max_ = 0;
-        return this;
-    }
-
-    /// Require an option to be given (does not affect help call)
-    /// The number required can be given. Negative values indicate maximum
-    /// number allowed (0 for any number).
-    App *require_option(int value) {
-        if(value < 0) {
-            require_option_min_ = 0;
-            require_option_max_ = static_cast<size_t>(-value);
-        } else {
-            require_option_min_ = static_cast<size_t>(value);
-            require_option_max_ = static_cast<size_t>(value);
-        }
-        return this;
-    }
-
-    /// Explicitly control the number of options required. Setting 0
-    /// for the max means unlimited number allowed. Max number inheritable.
-    App *require_option(size_t min, size_t max) {
-        require_option_min_ = min;
-        require_option_max_ = max;
-        return this;
-    }
-
-    /// Stop subcommand fallthrough, so that parent commands cannot collect commands after subcommand.
-    /// Default from parent, usually set on parent.
-    App *fallthrough(bool value = true) {
-        fallthrough_ = value;
-        return this;
-    }
-
-    /// Check to see if this subcommand was parsed, true only if received on command line.
-    /// This allows the subcommand to be directly checked.
-    operator bool() const { return parsed_ > 0; }
-
-    ///@}
-    /// @name Extras for subclassing
-    ///@{
-
-    /// This allows subclasses to inject code before callbacks but after parse.
-    ///
-    /// This does not run if any errors or help is thrown.
-    virtual void pre_callback() {}
-
-    ///@}
-    /// @name Parsing
-    ///@{
-    //
-    /// Reset the parsed data
-    void clear() {
-
-        parsed_ = 0;
-        pre_parse_called_ = false;
-
-        missing_.clear();
-        parsed_subcommands_.clear();
-        for(const Option_p &opt : options_) {
-            opt->clear();
-        }
-        for(const App_p &subc : subcommands_) {
-            subc->clear();
-        }
-    }
-
-    /// Parses the command line - throws errors.
-    /// This must be called after the options are in but before the rest of the program.
-    void parse(int argc, const char *const *argv) {
-        // If the name is not set, read from command line
-        if(name_.empty() || has_automatic_name_) {
-            has_automatic_name_ = true;
-            name_ = argv[0];
-        }
-
-        std::vector<std::string> args;
-        args.reserve(static_cast<size_t>(argc - 1));
-        for(int i = argc - 1; i > 0; i--)
-            args.emplace_back(argv[i]);
-        parse(std::move(args));
-    }
-
-    /// Parse a single string as if it contained command line arguments.
-    /// This function splits the string into arguments then calls parse(std::vector<std::string> &)
-    /// the function takes an optional boolean argument specifying if the programName is included in the string to
-    /// process
-    void parse(std::string commandline, bool program_name_included = false) {
-
-        if(program_name_included) {
-            auto nstr = detail::split_program_name(commandline);
-            if((name_.empty()) || (has_automatic_name_)) {
-                has_automatic_name_ = true;
-                name_ = nstr.first;
-            }
-            commandline = std::move(nstr.second);
-        } else
-            detail::trim(commandline);
-        // the next section of code is to deal with quoted arguments after an '=' or ':' for windows like operations
-        if(!commandline.empty()) {
-            commandline = detail::find_and_modify(commandline, "=", detail::escape_detect);
-            if(allow_windows_style_options_)
-                commandline = detail::find_and_modify(commandline, ":", detail::escape_detect);
-        }
-
-        auto args = detail::split_up(std::move(commandline));
-        // remove all empty strings
-        args.erase(std::remove(args.begin(), args.end(), std::string{}), args.end());
-        std::reverse(args.begin(), args.end());
-
-        parse(std::move(args));
-    }
-
-    /// The real work is done here. Expects a reversed vector.
-    /// Changes the vector to the remaining options.
-    void parse(std::vector<std::string> &args) {
-        // Clear if parsed
-        if(parsed_ > 0)
-            clear();
-
-        // parsed_ is incremented in commands/subcommands,
-        // but placed here to make sure this is cleared when
-        // running parse after an error is thrown, even by _validate or _configure.
-        parsed_ = 1;
-        _validate();
-        _configure();
-        // set the parent as nullptr as this object should be the top now
-        parent_ = nullptr;
-        parsed_ = 0;
-
-        _parse(args);
-        run_callback();
-    }
-
-    /// The real work is done here. Expects a reversed vector.
-    void parse(std::vector<std::string> &&args) {
-        // Clear if parsed
-        if(parsed_ > 0)
-            clear();
-
-        // parsed_ is incremented in commands/subcommands,
-        // but placed here to make sure this is cleared when
-        // running parse after an error is thrown, even by _validate or _configure.
-        parsed_ = 1;
-        _validate();
-        _configure();
-        // set the parent as nullptr as this object should be the top now
-        parent_ = nullptr;
-        parsed_ = 0;
-
-        _parse(std::move(args));
-        run_callback();
-    }
-
-    /// Provide a function to print a help message. The function gets access to the App pointer and error.
-    void failure_message(std::function<std::string(const App *, const Error &e)> function) {
-        failure_message_ = function;
-    }
-
-    /// Print a nice error message and return the exit code
-    int exit(const Error &e, std::ostream &out = std::cout, std::ostream &err = std::cerr) const {
-
-        /// Avoid printing anything if this is a CLI::RuntimeError
-        if(dynamic_cast<const CLI::RuntimeError *>(&e) != nullptr)
-            return e.get_exit_code();
-
-        if(dynamic_cast<const CLI::CallForHelp *>(&e) != nullptr) {
-            out << help();
-            return e.get_exit_code();
-        }
-
-        if(dynamic_cast<const CLI::CallForAllHelp *>(&e) != nullptr) {
-            out << help("", AppFormatMode::All);
-            return e.get_exit_code();
-        }
-
-        if(e.get_exit_code() != static_cast<int>(ExitCodes::Success)) {
-            if(failure_message_)
-                err << failure_message_(this, e) << std::flush;
-        }
-
-        return e.get_exit_code();
-    }
-
-    ///@}
-    /// @name Post parsing
-    ///@{
-
-    /// Counts the number of times the given option was passed.
-    size_t count(std::string option_name) const { return get_option(option_name)->count(); }
-
-    /// Get a subcommand pointer list to the currently selected subcommands (after parsing by default, in command
-    /// line order; use parsed = false to get the original definition list.)
-    std::vector<App *> get_subcommands() const { return parsed_subcommands_; }
-
-    /// Get a filtered subcommand pointer list from the original definition list. An empty function will provide all
-    /// subcommands (const)
-    std::vector<const App *> get_subcommands(const std::function<bool(const App *)> &filter) const {
-        std::vector<const App *> subcomms(subcommands_.size());
-        std::transform(std::begin(subcommands_), std::end(subcommands_), std::begin(subcomms), [](const App_p &v) {
-            return v.get();
-        });
-
-        if(filter) {
-            subcomms.erase(std::remove_if(std::begin(subcomms),
-                                          std::end(subcomms),
-                                          [&filter](const App *app) { return !filter(app); }),
-                           std::end(subcomms));
-        }
-
-        return subcomms;
-    }
-
-    /// Get a filtered subcommand pointer list from the original definition list. An empty function will provide all
-    /// subcommands
-    std::vector<App *> get_subcommands(const std::function<bool(App *)> &filter) {
-        std::vector<App *> subcomms(subcommands_.size());
-        std::transform(std::begin(subcommands_), std::end(subcommands_), std::begin(subcomms), [](const App_p &v) {
-            return v.get();
-        });
-
-        if(filter) {
-            subcomms.erase(
-                std::remove_if(std::begin(subcomms), std::end(subcomms), [&filter](App *app) { return !filter(app); }),
-                std::end(subcomms));
-        }
-
-        return subcomms;
-    }
-
-    /// Check to see if given subcommand was selected
-    bool got_subcommand(App *subcom) const {
-        // get subcom needed to verify that this was a real subcommand
-        return get_subcommand(subcom)->parsed_ > 0;
-    }
-
-    /// Check with name instead of pointer to see if subcommand was selected
-    bool got_subcommand(std::string subcommand_name) const { return get_subcommand(subcommand_name)->parsed_ > 0; }
-
-    /// Sets excluded options for the subcommand
-    App *excludes(Option *opt) {
-        if(opt == nullptr) {
-            throw OptionNotFound("nullptr passed");
-        }
-        exclude_options_.insert(opt);
-        return this;
-    }
-
-    /// Sets excluded subcommands for the subcommand
-    App *excludes(App *app) {
-        if((app == this) || (app == nullptr)) {
-            throw OptionNotFound("nullptr passed");
-        }
-        auto res = exclude_subcommands_.insert(app);
-        // subcommand exclusion should be symmetric
-        if(res.second) {
-            app->exclude_subcommands_.insert(this);
-        }
-        return this;
-    }
-
-    /// Removes an option from the excludes list of this subcommand
-    bool remove_excludes(Option *opt) {
-        auto iterator = std::find(std::begin(exclude_options_), std::end(exclude_options_), opt);
-        if(iterator != std::end(exclude_options_)) {
-            exclude_options_.erase(iterator);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /// Removes a subcommand from this excludes list of this subcommand
-    bool remove_excludes(App *app) {
-        auto iterator = std::find(std::begin(exclude_subcommands_), std::end(exclude_subcommands_), app);
-        if(iterator != std::end(exclude_subcommands_)) {
-            auto other_app = *iterator;
-            exclude_subcommands_.erase(iterator);
-            other_app->remove_excludes(this);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    ///@}
-    /// @name Help
-    ///@{
-
-    /// Set footer.
-    App *footer(std::string footer_string) {
-        footer_ = std::move(footer_string);
-        return this;
-    }
-
-    /// Produce a string that could be read in as a config of the current values of the App. Set default_also to
-    /// include default arguments. Prefix will add a string to the beginning of each option.
-    std::string config_to_str(bool default_also = false, bool write_description = false) const {
-        return config_formatter_->to_config(this, default_also, write_description, "");
-    }
-
-    /// Makes a help message, using the currently configured formatter
-    /// Will only do one subcommand at a time
-    std::string help(std::string prev = "", AppFormatMode mode = AppFormatMode::Normal) const {
-        if(prev.empty())
-            prev = get_name();
-        else
-            prev += " " + get_name();
-
-        // Delegate to subcommand if needed
-        auto selected_subcommands = get_subcommands();
-        if(!selected_subcommands.empty())
-            return selected_subcommands.at(0)->help(prev, mode);
-        else
-            return formatter_->make_help(this, prev, mode);
-    }
-
-    ///@}
-    /// @name Getters
-    ///@{
-
-    /// Access the formatter
-    std::shared_ptr<FormatterBase> get_formatter() const { return formatter_; }
-
-    /// Access the config formatter
-    std::shared_ptr<Config> get_config_formatter() const { return config_formatter_; }
-
-    /// Get the app or subcommand description
-    std::string get_description() const { return description_; }
-
-    /// Set the description of the app
-    App *description(std::string app_description) {
-        description_ = std::move(app_description);
-        return this;
-    }
-
-    /// Get the list of options (user facing function, so returns raw pointers), has optional filter function
-    std::vector<const Option *> get_options(const std::function<bool(const Option *)> filter = {}) const {
-        std::vector<const Option *> options(options_.size());
-        std::transform(std::begin(options_), std::end(options_), std::begin(options), [](const Option_p &val) {
-            return val.get();
-        });
-
-        if(filter) {
-            options.erase(std::remove_if(std::begin(options),
-                                         std::end(options),
-                                         [&filter](const Option *opt) { return !filter(opt); }),
-                          std::end(options));
-        }
-
-        return options;
-    }
-
-    /// Get an option by name (noexcept non-const version)
-    Option *get_option_no_throw(std::string option_name) noexcept {
-        for(Option_p &opt : options_) {
-            if(opt->check_name(option_name)) {
-                return opt.get();
-            }
-        }
-        for(auto &subc : subcommands_) {
-            // also check down into nameless subcommands
-            if(subc->get_name().empty()) {
-                auto opt = subc->get_option_no_throw(option_name);
-                if(opt != nullptr) {
-                    return opt;
-                }
-            }
-        }
-        return nullptr;
-    }
-
-    /// Get an option by name (noexcept const version)
-    const Option *get_option_no_throw(std::string option_name) const noexcept {
-        for(const Option_p &opt : options_) {
-            if(opt->check_name(option_name)) {
-                return opt.get();
-            }
-        }
-        for(const auto &subc : subcommands_) {
-            // also check down into nameless subcommands
-            if(subc->get_name().empty()) {
-                auto opt = subc->get_option_no_throw(option_name);
-                if(opt != nullptr) {
-                    return opt;
-                }
-            }
-        }
-        return nullptr;
-    }
-
-    /// Get an option by name
-    const Option *get_option(std::string option_name) const {
-        auto opt = get_option_no_throw(option_name);
-        if(opt == nullptr) {
-            throw OptionNotFound(option_name);
-        }
-        return opt;
-    }
-
-    /// Get an option by name (non-const version)
-    Option *get_option(std::string option_name) {
-        auto opt = get_option_no_throw(option_name);
-        if(opt == nullptr) {
-            throw OptionNotFound(option_name);
-        }
-        return opt;
-    }
-
-    /// Shortcut bracket operator for getting a pointer to an option
-    const Option *operator[](const std::string &option_name) const { return get_option(option_name); }
-
-    /// Shortcut bracket operator for getting a pointer to an option
-    const Option *operator[](const char *option_name) const { return get_option(option_name); }
-
-    /// Check the status of ignore_case
-    bool get_ignore_case() const { return ignore_case_; }
-
-    /// Check the status of ignore_underscore
-    bool get_ignore_underscore() const { return ignore_underscore_; }
-
-    /// Check the status of fallthrough
-    bool get_fallthrough() const { return fallthrough_; }
-
-    /// Check the status of the allow windows style options
-    bool get_allow_windows_style_options() const { return allow_windows_style_options_; }
-
-    /// Check the status of the allow windows style options
-    bool get_positionals_at_end() const { return positionals_at_end_; }
-
-    /// Get the group of this subcommand
-    const std::string &get_group() const { return group_; }
-
-    /// Get footer.
-    const std::string &get_footer() const { return footer_; }
-
-    /// Get the required min subcommand value
-    size_t get_require_subcommand_min() const { return require_subcommand_min_; }
-
-    /// Get the required max subcommand value
-    size_t get_require_subcommand_max() const { return require_subcommand_max_; }
-
-    /// Get the required min option value
-    size_t get_require_option_min() const { return require_option_min_; }
-
-    /// Get the required max option value
-    size_t get_require_option_max() const { return require_option_max_; }
-
-    /// Get the prefix command status
-    bool get_prefix_command() const { return prefix_command_; }
-
-    /// Get the status of allow extras
-    bool get_allow_extras() const { return allow_extras_; }
-
-    /// Get the status of required
-    bool get_required() const { return required_; }
-
-    /// Get the status of disabled
-    bool get_disabled() const { return disabled_; }
-
-    /// Get the status of disabled
-    bool get_immediate_callback() const { return immediate_callback_; }
-
-    /// Get the status of disabled by default
-    bool get_disabled_by_default() const { return disabled_by_default_; }
-
-    /// Get the status of disabled by default
-    bool get_enabled_by_default() const { return enabled_by_default_; }
-    /// Get the status of validating positionals
-    bool get_validate_positionals() const { return validate_positionals_; }
-
-    /// Get the status of allow extras
-    bool get_allow_config_extras() const { return allow_config_extras_; }
-
-    /// Get a pointer to the help flag.
-    Option *get_help_ptr() { return help_ptr_; }
-
-    /// Get a pointer to the help flag. (const)
-    const Option *get_help_ptr() const { return help_ptr_; }
-
-    /// Get a pointer to the help all flag. (const)
-    const Option *get_help_all_ptr() const { return help_all_ptr_; }
-
-    /// Get a pointer to the config option.
-    Option *get_config_ptr() { return config_ptr_; }
-
-    /// Get a pointer to the config option. (const)
-    const Option *get_config_ptr() const { return config_ptr_; }
-
-    /// Get the parent of this subcommand (or nullptr if master app)
-    App *get_parent() { return parent_; }
-
-    /// Get the parent of this subcommand (or nullptr if master app) (const version)
-    const App *get_parent() const { return parent_; }
-
-    /// Get the name of the current app
-    std::string get_name() const { return name_; }
-
-    /// Get a display name for an app
-    std::string get_display_name() const { return (!name_.empty()) ? name_ : "[Option Group: " + get_group() + "]"; }
-
-    /// Check the name, case insensitive and underscore insensitive if set
-    bool check_name(std::string name_to_check) const {
-        std::string local_name = name_;
-        if(ignore_underscore_) {
-            local_name = detail::remove_underscore(name_);
-            name_to_check = detail::remove_underscore(name_to_check);
-        }
-        if(ignore_case_) {
-            local_name = detail::to_lower(name_);
-            name_to_check = detail::to_lower(name_to_check);
-        }
-
-        return local_name == name_to_check;
-    }
-
-    /// Get the groups available directly from this option (in order)
-    std::vector<std::string> get_groups() const {
-        std::vector<std::string> groups;
-
-        for(const Option_p &opt : options_) {
-            // Add group if it is not already in there
-            if(std::find(groups.begin(), groups.end(), opt->get_group()) == groups.end()) {
-                groups.push_back(opt->get_group());
-            }
-        }
-
-        return groups;
-    }
-
-    /// This gets a vector of pointers with the original parse order
-    const std::vector<Option *> &parse_order() const { return parse_order_; }
-
-    /// This returns the missing options from the current subcommand
-    std::vector<std::string> remaining(bool recurse = false) const {
-        std::vector<std::string> miss_list;
-        for(const std::pair<detail::Classifier, std::string> &miss : missing_) {
-            miss_list.push_back(std::get<1>(miss));
-        }
-        // Get from a subcommand that may allow extras
-        if(recurse) {
-            if(!allow_extras_) {
-                for(const auto &sub : subcommands_) {
-                    if(sub->name_.empty() && !sub->missing_.empty()) {
-                        for(const std::pair<detail::Classifier, std::string> &miss : sub->missing_) {
-                            miss_list.push_back(std::get<1>(miss));
-                        }
-                    }
-                }
-            }
-            // Recurse into subcommands
-
-            for(const App *sub : parsed_subcommands_) {
-                std::vector<std::string> output = sub->remaining(recurse);
-                std::copy(std::begin(output), std::end(output), std::back_inserter(miss_list));
-            }
-        }
-        return miss_list;
-    }
-
-    /// This returns the missing options in a form ready for processing by another command line program
-    std::vector<std::string> remaining_for_passthrough(bool recurse = false) const {
-        std::vector<std::string> miss_list = remaining(recurse);
-        std::reverse(std::begin(miss_list), std::end(miss_list));
-        return miss_list;
-    }
-
-    /// This returns the number of remaining options, minus the -- separator
-    size_t remaining_size(bool recurse = false) const {
-        auto remaining_options = static_cast<size_t>(std::count_if(
-            std::begin(missing_), std::end(missing_), [](const std::pair<detail::Classifier, std::string> &val) {
-                return val.first != detail::Classifier::POSITIONAL_MARK;
-            }));
-
-        if(recurse) {
-            for(const App_p &sub : subcommands_) {
-                remaining_options += sub->remaining_size(recurse);
-            }
-        }
-        return remaining_options;
-    }
-
-    ///@}
-
-  protected:
-    /// Check the options to make sure there are no conflicts.
-    ///
-    /// Currently checks to see if multiple positionals exist with -1 args and checks if the min and max options are
-    /// feasible
-    void _validate() const {
-        auto pcount = std::count_if(std::begin(options_), std::end(options_), [](const Option_p &opt) {
-            return opt->get_items_expected() < 0 && opt->get_positional();
-        });
-        if(pcount > 1)
-            throw InvalidError(name_);
-
-        size_t nameless_subs{0};
-        for(const App_p &app : subcommands_) {
-            app->_validate();
-            if(app->get_name().empty())
-                ++nameless_subs;
-        }
-
-        if(require_option_min_ > 0) {
-            if(require_option_max_ > 0) {
-                if(require_option_max_ < require_option_min_) {
-                    throw(InvalidError("Required min options greater than required max options",
-                                       ExitCodes::InvalidError));
-                }
-            }
-            if(require_option_min_ > (options_.size() + nameless_subs)) {
-                throw(InvalidError("Required min options greater than number of available options",
-                                   ExitCodes::InvalidError));
-            }
-        }
-    }
-
-    /// configure subcommands to enable parsing through the current object
-    /// set the correct fallthrough and prefix for nameless subcommands and manage the automatic enable or disable
-    /// makes sure parent is set correctly
-    void _configure() {
-        if(disabled_by_default_) {
-            disabled_ = true;
-        }
-        if(enabled_by_default_) {
-            disabled_ = false;
-        }
-        for(const App_p &app : subcommands_) {
-            if(app->has_automatic_name_) {
-                app->name_.clear();
-            }
-            if(app->name_.empty()) {
-                app->fallthrough_ = false; // make sure fallthrough_ is false to prevent infinite loop
-                app->prefix_command_ = false;
-            }
-            // make sure the parent is set to be this object in preparation for parse
-            app->parent_ = this;
-            app->_configure();
-        }
-    }
-    /// Internal function to run (App) callback, bottom up
-    void run_callback() {
-        pre_callback();
-        // run the callbacks for the received subcommands
-        for(App *subc : get_subcommands()) {
-            if(!subc->immediate_callback_)
-                subc->run_callback();
-        }
-        // now run callbacks for option_groups
-        for(auto &subc : subcommands_) {
-            if(!subc->immediate_callback_ && subc->name_.empty() && subc->count_all() > 0) {
-                subc->run_callback();
-            }
-        }
-        // finally run the main callback
-        if(callback_ && (parsed_ > 0)) {
-            if(!name_.empty() || count_all() > 0) {
-                callback_();
-            }
-        }
-    }
-
-    /// Check to see if a subcommand is valid. Give up immediately if subcommand max has been reached.
-    bool _valid_subcommand(const std::string &current, bool ignore_used = true) const {
-        // Don't match if max has been reached - but still check parents
-        if(require_subcommand_max_ != 0 && parsed_subcommands_.size() >= require_subcommand_max_) {
-            return parent_ != nullptr && parent_->_valid_subcommand(current, ignore_used);
-        }
-        auto com = _find_subcommand(current, true, ignore_used);
-        if(com != nullptr) {
-            return true;
-        }
-        // Check parent if exists, else return false
-        return parent_ != nullptr && parent_->_valid_subcommand(current, ignore_used);
-    }
-
-    /// Selects a Classifier enum based on the type of the current argument
-    detail::Classifier _recognize(const std::string &current, bool ignore_used_subcommands = true) const {
-        std::string dummy1, dummy2;
-
-        if(current == "--")
-            return detail::Classifier::POSITIONAL_MARK;
-        if(_valid_subcommand(current, ignore_used_subcommands))
-            return detail::Classifier::SUBCOMMAND;
-        if(detail::split_long(current, dummy1, dummy2))
-            return detail::Classifier::LONG;
-        if(detail::split_short(current, dummy1, dummy2))
-            return detail::Classifier::SHORT;
-        if((allow_windows_style_options_) && (detail::split_windows_style(current, dummy1, dummy2)))
-            return detail::Classifier::WINDOWS;
-        if((current == "++") && !name_.empty() && parent_ != nullptr)
-            return detail::Classifier::SUBCOMMAND_TERMINATOR;
-        return detail::Classifier::NONE;
-    }
-
-    // The parse function is now broken into several parts, and part of process
-
-    /// Read and process an ini file (main app only)
-    void _process_ini() {
-        // Process an INI file
-        if(config_ptr_ != nullptr) {
-            if(*config_ptr_) {
-                config_ptr_->run_callback();
-                config_required_ = true;
-            }
-            if(!config_name_.empty()) {
-                try {
-                    std::vector<ConfigItem> values = config_formatter_->from_file(config_name_);
-                    _parse_config(values);
-                } catch(const FileError &) {
-                    if(config_required_)
-                        throw;
-                }
-            }
-        }
-    }
-
-    /// Get envname options if not yet passed. Runs on *all* subcommands.
-    void _process_env() {
-        for(const Option_p &opt : options_) {
-            if(opt->count() == 0 && !opt->envname_.empty()) {
-                char *buffer = nullptr;
-                std::string ename_string;
-
-#ifdef _MSC_VER
-                // Windows version
-                size_t sz = 0;
-                if(_dupenv_s(&buffer, &sz, opt->envname_.c_str()) == 0 && buffer != nullptr) {
-                    ename_string = std::string(buffer);
-                    free(buffer);
-                }
-#else
-                // This also works on Windows, but gives a warning
-                buffer = std::getenv(opt->envname_.c_str());
-                if(buffer != nullptr)
-                    ename_string = std::string(buffer);
-#endif
-
-                if(!ename_string.empty()) {
-                    opt->add_result(ename_string);
-                }
-            }
-        }
-
-        for(App_p &sub : subcommands_) {
-            if(sub->get_name().empty() || !sub->immediate_callback_)
-                sub->_process_env();
-        }
-    }
-
-    /// Process callbacks. Runs on *all* subcommands.
-    void _process_callbacks() {
-
-        for(App_p &sub : subcommands_) {
-            // process the priority option_groups first
-            if(sub->get_name().empty() && sub->immediate_callback_) {
-                if(sub->count_all() > 0) {
-                    sub->_process_callbacks();
-                    sub->run_callback();
-                }
-            }
-        }
-
-        for(const Option_p &opt : options_) {
-            if(opt->count() > 0 && !opt->get_callback_run()) {
-                opt->run_callback();
-            }
-        }
-
-        for(App_p &sub : subcommands_) {
-            if(!sub->immediate_callback_) {
-                sub->_process_callbacks();
-            }
-        }
-    }
-
-    /// Run help flag processing if any are found.
-    ///
-    /// The flags allow recursive calls to remember if there was a help flag on a parent.
-    void _process_help_flags(bool trigger_help = false, bool trigger_all_help = false) const {
-        const Option *help_ptr = get_help_ptr();
-        const Option *help_all_ptr = get_help_all_ptr();
-
-        if(help_ptr != nullptr && help_ptr->count() > 0)
-            trigger_help = true;
-        if(help_all_ptr != nullptr && help_all_ptr->count() > 0)
-            trigger_all_help = true;
-
-        // If there were parsed subcommands, call those. First subcommand wins if there are multiple ones.
-        if(!parsed_subcommands_.empty()) {
-            for(const App *sub : parsed_subcommands_)
-                sub->_process_help_flags(trigger_help, trigger_all_help);
-
-            // Only the final subcommand should call for help. All help wins over help.
-        } else if(trigger_all_help) {
-            throw CallForAllHelp();
-        } else if(trigger_help) {
-            throw CallForHelp();
-        }
-    }
-
-    /// Verify required options and cross requirements. Subcommands too (only if selected).
-    void _process_requirements() {
-        // check excludes
-        bool excluded{false};
-        std::string excluder;
-        for(auto &opt : exclude_options_) {
-            if(opt->count() > 0) {
-                excluded = true;
-                excluder = opt->get_name();
-            }
-        }
-        for(auto &subc : exclude_subcommands_) {
-            if(subc->count_all() > 0) {
-                excluded = true;
-                excluder = subc->get_display_name();
-            }
-        }
-        if(excluded) {
-            if(count_all() > 0) {
-                throw ExcludesError(get_display_name(), excluder);
-            }
-            // if we are excluded but didn't receive anything, just return
-            return;
-        }
-        size_t used_options = 0;
-        for(const Option_p &opt : options_) {
-
-            if(opt->count() != 0) {
-                ++used_options;
-            }
-            // Required or partially filled
-            if(opt->get_required() || opt->count() != 0) {
-                // Make sure enough -N arguments parsed (+N is already handled in parsing function)
-                if(opt->get_items_expected() < 0 && opt->count() < static_cast<size_t>(-opt->get_items_expected()))
-                    throw ArgumentMismatch::AtLeast(opt->get_name(), -opt->get_items_expected());
-
-                // Required but empty
-                if(opt->get_required() && opt->count() == 0)
-                    throw RequiredError(opt->get_name());
-            }
-            // Requires
-            for(const Option *opt_req : opt->needs_)
-                if(opt->count() > 0 && opt_req->count() == 0)
-                    throw RequiresError(opt->get_name(), opt_req->get_name());
-            // Excludes
-            for(const Option *opt_ex : opt->excludes_)
-                if(opt->count() > 0 && opt_ex->count() != 0)
-                    throw ExcludesError(opt->get_name(), opt_ex->get_name());
-        }
-        // check for the required number of subcommands
-        if(require_subcommand_min_ > 0) {
-            auto selected_subcommands = get_subcommands();
-            if(require_subcommand_min_ > selected_subcommands.size())
-                throw RequiredError::Subcommand(require_subcommand_min_);
-        }
-
-        // Max error cannot occur, the extra subcommand will parse as an ExtrasError or a remaining item.
-
-        // run this loop to check how many unnamed subcommands were actually used since they are considered options from
-        // the perspective of an App
-        for(App_p &sub : subcommands_) {
-            if(sub->disabled_)
-                continue;
-            if(sub->name_.empty() && sub->count_all() > 0) {
-                ++used_options;
-            }
-        }
-
-        if(require_option_min_ > used_options || (require_option_max_ > 0 && require_option_max_ < used_options)) {
-            auto option_list = detail::join(options_, [](const Option_p &ptr) { return ptr->get_name(false, true); });
-            if(option_list.compare(0, 10, "-h,--help,") == 0) {
-                option_list.erase(0, 10);
-            }
-            auto subc_list = get_subcommands([](App *app) { return ((app->get_name().empty()) && (!app->disabled_)); });
-            if(!subc_list.empty()) {
-                option_list += "," + detail::join(subc_list, [](const App *app) { return app->get_display_name(); });
-            }
-            throw RequiredError::Option(require_option_min_, require_option_max_, used_options, option_list);
-        }
-
-        // now process the requirements for subcommands if needed
-        for(App_p &sub : subcommands_) {
-            if(sub->disabled_)
-                continue;
-            if(sub->name_.empty() && sub->required_ == false) {
-                if(sub->count_all() == 0) {
-                    if(require_option_min_ > 0 && require_option_min_ <= used_options) {
-                        continue;
-                        // if we have met the requirement and there is nothing in this option group skip checking
-                        // requirements
-                    }
-                    if(require_option_max_ > 0 && used_options >= require_option_min_) {
-                        continue;
-                        // if we have met the requirement and there is nothing in this option group skip checking
-                        // requirements
-                    }
-                }
-            }
-            if(sub->count() > 0 || sub->name_.empty()) {
-                sub->_process_requirements();
-            }
-
-            if(sub->required_ && sub->count_all() == 0) {
-                throw(CLI::RequiredError(sub->get_display_name()));
-            }
-        }
-    }
-
-    /// Process callbacks and such.
-    void _process() {
-        _process_ini();
-        _process_env();
-        _process_callbacks();
-        _process_help_flags();
-        _process_requirements();
-    }
-
-    /// Throw an error if anything is left over and should not be.
-    void _process_extras() {
-        if(!(allow_extras_ || prefix_command_)) {
-            size_t num_left_over = remaining_size();
-            if(num_left_over > 0) {
-                throw ExtrasError(remaining(false));
-            }
-        }
-
-        for(App_p &sub : subcommands_) {
-            if(sub->count() > 0)
-                sub->_process_extras();
-        }
-    }
-
-    /// Throw an error if anything is left over and should not be.
-    /// Modifies the args to fill in the missing items before throwing.
-    void _process_extras(std::vector<std::string> &args) {
-        if(!(allow_extras_ || prefix_command_)) {
-            size_t num_left_over = remaining_size();
-            if(num_left_over > 0) {
-                args = remaining(false);
-                throw ExtrasError(args);
-            }
-        }
-
-        for(App_p &sub : subcommands_) {
-            if(sub->count() > 0)
-                sub->_process_extras(args);
-        }
-    }
-
-    /// Internal function to recursively increment the parsed counter on the current app as well unnamed subcommands
-    void increment_parsed() {
-        ++parsed_;
-        for(App_p &sub : subcommands_) {
-            if(sub->get_name().empty())
-                sub->increment_parsed();
-        }
-    }
-    /// Internal parse function
-    void _parse(std::vector<std::string> &args) {
-        increment_parsed();
-        _trigger_pre_parse(args.size());
-        bool positional_only = false;
-
-        while(!args.empty()) {
-            if(!_parse_single(args, positional_only)) {
-                break;
-            }
-        }
-
-        if(parent_ == nullptr) {
-            _process();
-
-            // Throw error if any items are left over (depending on settings)
-            _process_extras(args);
-
-            // Convert missing (pairs) to extras (string only) ready for processing in another app
-            args = remaining_for_passthrough(false);
-        } else if(immediate_callback_) {
-            _process_env();
-            _process_callbacks();
-            _process_help_flags();
-            _process_requirements();
-            run_callback();
-        }
-    }
-
-    /// Internal parse function
-    void _parse(std::vector<std::string> &&args) {
-        // this can only be called by the top level in which case parent == nullptr by definition
-        // operation is simplified
-        increment_parsed();
-        _trigger_pre_parse(args.size());
-        bool positional_only = false;
-
-        while(!args.empty()) {
-            _parse_single(args, positional_only);
-        }
-        _process();
-
-        // Throw error if any items are left over (depending on settings)
-        _process_extras();
-    }
-
-    /// Parse one config param, return false if not found in any subcommand, remove if it is
-    ///
-    /// If this has more than one dot.separated.name, go into the subcommand matching it
-    /// Returns true if it managed to find the option, if false you'll need to remove the arg manually.
-    void _parse_config(std::vector<ConfigItem> &args) {
-        for(ConfigItem item : args) {
-            if(!_parse_single_config(item) && !allow_config_extras_)
-                throw ConfigError::Extras(item.fullname());
-        }
-    }
-
-    /// Fill in a single config option
-    bool _parse_single_config(const ConfigItem &item, size_t level = 0) {
-        if(level < item.parents.size()) {
-            try {
-                auto subcom = get_subcommand(item.parents.at(level));
-                return subcom->_parse_single_config(item, level + 1);
-            } catch(const OptionNotFound &) {
-                return false;
-            }
-        }
-
-        Option *op = get_option_no_throw("--" + item.name);
-        if(op == nullptr) {
-            // If the option was not present
-            if(get_allow_config_extras())
-                // Should we worry about classifying the extras properly?
-                missing_.emplace_back(detail::Classifier::NONE, item.fullname());
-            return false;
-        }
-
-        if(!op->get_configurable())
-            throw ConfigError::NotConfigurable(item.fullname());
-
-        if(op->empty()) {
-            // Flag parsing
-            if(op->get_type_size() == 0) {
-                auto res = config_formatter_->to_flag(item);
-                res = op->get_flag_value(item.name, res);
-
-                op->add_result(res);
-
-            } else {
-                op->add_result(item.inputs);
-                op->run_callback();
-            }
-        }
-
-        return true;
-    }
-
-    /// Parse "one" argument (some may eat more than one), delegate to parent if fails, add to missing if missing
-    /// from master return false if the parse has failed and needs to return to parent
-    bool _parse_single(std::vector<std::string> &args, bool &positional_only) {
-        bool retval = true;
-        detail::Classifier classifier = positional_only ? detail::Classifier::NONE : _recognize(args.back());
-        switch(classifier) {
-        case detail::Classifier::POSITIONAL_MARK:
-            args.pop_back();
-            positional_only = true;
-            if((!_has_remaining_positionals()) && (parent_ != nullptr)) {
-                retval = false;
-            } else {
-                _move_to_missing(classifier, "--");
-            }
-            break;
-        case detail::Classifier::SUBCOMMAND_TERMINATOR:
-            // treat this like a positional mark if in the parent app
-            args.pop_back();
-            retval = false;
-            break;
-        case detail::Classifier::SUBCOMMAND:
-            retval = _parse_subcommand(args);
-            break;
-        case detail::Classifier::LONG:
-        case detail::Classifier::SHORT:
-        case detail::Classifier::WINDOWS:
-            // If already parsed a subcommand, don't accept options_
-            _parse_arg(args, classifier);
-            break;
-        case detail::Classifier::NONE:
-            // Probably a positional or something for a parent (sub)command
-            retval = _parse_positional(args);
-            if(retval && positionals_at_end_) {
-                positional_only = true;
-            }
-            break;
-
-            // LCOV_EXCL_START
-        default:
-            HorribleError("unrecognized classifier (you should not see this!)");
-            // LCOV_EXCL_END
-        }
-        return retval;
-    }
-
-    /// Count the required remaining positional arguments
-    size_t _count_remaining_positionals(bool required_only = false) const {
-        size_t retval = 0;
-        for(const Option_p &opt : options_)
-            if(opt->get_positional() && (!required_only || opt->get_required()) && opt->get_items_expected() > 0 &&
-               static_cast<int>(opt->count()) < opt->get_items_expected())
-                retval = static_cast<size_t>(opt->get_items_expected()) - opt->count();
-
-        return retval;
-    }
-
-    /// Count the required remaining positional arguments
-    bool _has_remaining_positionals() const {
-        for(const Option_p &opt : options_)
-            if(opt->get_positional() &&
-               ((opt->get_items_expected() < 0) || ((static_cast<int>(opt->count()) < opt->get_items_expected()))))
-                return true;
-
-        return false;
-    }
-
-    /// Parse a positional, go up the tree to check
-    /// Return true if the positional was used false otherwise
-    bool _parse_positional(std::vector<std::string> &args) {
-
-        const std::string &positional = args.back();
-        for(const Option_p &opt : options_) {
-            // Eat options, one by one, until done
-            if(opt->get_positional() &&
-               (static_cast<int>(opt->count()) < opt->get_items_expected() || opt->get_items_expected() < 0)) {
-                if(validate_positionals_) {
-                    std::string pos = positional;
-                    pos = opt->_validate(pos);
-                    if(!pos.empty()) {
-                        continue;
-                    }
-                }
-                opt->add_result(positional);
-                parse_order_.push_back(opt.get());
-                args.pop_back();
-                return true;
-            }
-        }
-
-        for(auto &subc : subcommands_) {
-            if((subc->name_.empty()) && (!subc->disabled_)) {
-                if(subc->_parse_positional(args)) {
-                    if(!subc->pre_parse_called_) {
-                        subc->_trigger_pre_parse(args.size());
-                    }
-                    return true;
-                }
-            }
-        }
-        // let the parent deal with it if possible
-        if(parent_ != nullptr && fallthrough_)
-            return _get_fallthrough_parent()->_parse_positional(args);
-
-        /// Try to find a local subcommand that is repeated
-        auto com = _find_subcommand(args.back(), true, false);
-        if(com != nullptr && (require_subcommand_max_ == 0 || require_subcommand_max_ > parsed_subcommands_.size())) {
-            args.pop_back();
-            com->_parse(args);
-            return true;
-        }
-        /// now try one last gasp at subcommands that have been executed before, go to root app and try to find a
-        /// subcommand in a broader way, if one exists let the parent deal with it
-        auto parent_app = (parent_ != nullptr) ? _get_fallthrough_parent() : this;
-        com = parent_app->_find_subcommand(args.back(), true, false);
-        if(com != nullptr && (com->parent_->require_subcommand_max_ == 0 ||
-                              com->parent_->require_subcommand_max_ > com->parent_->parsed_subcommands_.size())) {
-            return false;
-        }
-
-        if(positionals_at_end_) {
-            throw CLI::ExtrasError(args);
-        }
-        /// If this is an option group don't deal with it
-        if(parent_ != nullptr && name_.empty()) {
-            return false;
-        }
-        /// We are out of other options this goes to missing
-        _move_to_missing(detail::Classifier::NONE, positional);
-        args.pop_back();
-        if(prefix_command_) {
-            while(!args.empty()) {
-                _move_to_missing(detail::Classifier::NONE, args.back());
-                args.pop_back();
-            }
-        }
-
-        return true;
-    }
-
-    /// Locate a subcommand by name with two conditions, should disabled subcommands be ignored, and should used
-    /// subcommands be ignored
-    App *_find_subcommand(const std::string &subc_name, bool ignore_disabled, bool ignore_used) const noexcept {
-        for(const App_p &com : subcommands_) {
-            if(com->disabled_ && ignore_disabled)
-                continue;
-            if(com->get_name().empty()) {
-                auto subc = com->_find_subcommand(subc_name, ignore_disabled, ignore_used);
-                if(subc != nullptr) {
-                    return subc;
-                }
-            } else if(com->check_name(subc_name)) {
-                if((!*com) || !ignore_used)
-                    return com.get();
-            }
-        }
-        return nullptr;
-    }
-
-    /// Parse a subcommand, modify args and continue
-    ///
-    /// Unlike the others, this one will always allow fallthrough
-    /// return true if the subcommand was processed false otherwise
-    bool _parse_subcommand(std::vector<std::string> &args) {
-        if(_count_remaining_positionals(/* required */ true) > 0) {
-            _parse_positional(args);
-            return true;
-        }
-        auto com = _find_subcommand(args.back(), true, true);
-        if(com != nullptr) {
-            args.pop_back();
-            parsed_subcommands_.push_back(com);
-            com->_parse(args);
-            auto parent_app = com->parent_;
-            while(parent_app != this) {
-                parent_app->_trigger_pre_parse(args.size());
-                parent_app->parsed_subcommands_.push_back(com);
-                parent_app = parent_app->parent_;
-            }
-            return true;
-        }
-
-        if(parent_ == nullptr)
-            throw HorribleError("Subcommand " + args.back() + " missing");
-        return false;
-    }
-
-    /// Parse a short (false) or long (true) argument, must be at the top of the list
-    /// return true if the argument was processed or false if nothing was done
-    bool _parse_arg(std::vector<std::string> &args, detail::Classifier current_type) {
-
-        std::string current = args.back();
-
-        std::string arg_name;
-        std::string value;
-        std::string rest;
-
-        switch(current_type) {
-        case detail::Classifier::LONG:
-            if(!detail::split_long(current, arg_name, value))
-                throw HorribleError("Long parsed but missing (you should not see this):" + args.back());
-            break;
-        case detail::Classifier::SHORT:
-            if(!detail::split_short(current, arg_name, rest))
-                throw HorribleError("Short parsed but missing! You should not see this");
-            break;
-        case detail::Classifier::WINDOWS:
-            if(!detail::split_windows_style(current, arg_name, value))
-                throw HorribleError("windows option parsed but missing! You should not see this");
-            break;
-        case detail::Classifier::SUBCOMMAND:
-        case detail::Classifier::POSITIONAL_MARK:
-        case detail::Classifier::NONE:
-        default:
-            throw HorribleError("parsing got called with invalid option! You should not see this");
-        }
-
-        auto op_ptr =
-            std::find_if(std::begin(options_), std::end(options_), [arg_name, current_type](const Option_p &opt) {
-                if(current_type == detail::Classifier::LONG)
-                    return opt->check_lname(arg_name);
-                if(current_type == detail::Classifier::SHORT)
-                    return opt->check_sname(arg_name);
-                // this will only get called for detail::Classifier::WINDOWS
-                return opt->check_lname(arg_name) || opt->check_sname(arg_name);
-            });
-
-        // Option not found
-        if(op_ptr == std::end(options_)) {
-            for(auto &subc : subcommands_) {
-                if(subc->name_.empty() && !subc->disabled_) {
-                    if(subc->_parse_arg(args, current_type)) {
-                        if(!subc->pre_parse_called_) {
-                            subc->_trigger_pre_parse(args.size());
-                        }
-                        return true;
-                    }
-                }
-            }
-            // If a subcommand, try the master command
-            if(parent_ != nullptr && fallthrough_)
-                return _get_fallthrough_parent()->_parse_arg(args, current_type);
-            // don't capture missing if this is a nameless subcommand
-            if(parent_ != nullptr && name_.empty()) {
-                return false;
-            }
-            // Otherwise, add to missing
-            args.pop_back();
-            _move_to_missing(current_type, current);
-            return true;
-        }
-
-        args.pop_back();
-
-        // Get a reference to the pointer to make syntax bearable
-        Option_p &op = *op_ptr;
-
-        int num = op->get_items_expected();
-
-        // Make sure we always eat the minimum for unlimited vectors
-        int collected = 0;
-        int result_count = 0;
-        // deal with flag like things
-        if(num == 0) {
-            auto res = op->get_flag_value(arg_name, value);
-            op->add_result(res);
-            parse_order_.push_back(op.get());
-        }
-        // --this=value
-        else if(!value.empty()) {
-            op->add_result(value, result_count);
-            parse_order_.push_back(op.get());
-            collected += result_count;
-            // If exact number expected
-            if(num > 0)
-                num = (num >= result_count) ? num - result_count : 0;
-
-            // -Trest
-        } else if(!rest.empty()) {
-            op->add_result(rest, result_count);
-            parse_order_.push_back(op.get());
-            rest = "";
-            collected += result_count;
-            // If exact number expected
-            if(num > 0)
-                num = (num >= result_count) ? num - result_count : 0;
-        }
-
-        // Unlimited vector parser
-        if(num < 0) {
-            while(!args.empty() && _recognize(args.back(), false) == detail::Classifier::NONE) {
-                if(collected >= -num) {
-                    // We could break here for allow extras, but we don't
-
-                    // If any positionals remain, don't keep eating
-                    if(_count_remaining_positionals() > 0)
-                        break;
-                }
-                op->add_result(args.back(), result_count);
-                parse_order_.push_back(op.get());
-                args.pop_back();
-                collected += result_count;
-            }
-
-            // Allow -- to end an unlimited list and "eat" it
-            if(!args.empty() && _recognize(args.back()) == detail::Classifier::POSITIONAL_MARK)
-                args.pop_back();
-
-        } else {
-            while(num > 0 && !args.empty()) {
-                std::string current_ = args.back();
-                args.pop_back();
-                op->add_result(current_, result_count);
-                parse_order_.push_back(op.get());
-                num -= result_count;
-            }
-
-            if(num > 0) {
-                throw ArgumentMismatch::TypedAtLeast(op->get_name(), num, op->get_type_name());
-            }
-        }
-
-        if(!rest.empty()) {
-            rest = "-" + rest;
-            args.push_back(rest);
-        }
-        return true;
-    }
-
-    /// Trigger the pre_parse callback if needed
-    void _trigger_pre_parse(size_t remaining_args) {
-        if(!pre_parse_called_) {
-            pre_parse_called_ = true;
-            if(pre_parse_callback_) {
-                pre_parse_callback_(remaining_args);
-            }
-        } else if(immediate_callback_) {
-            if(!name_.empty()) {
-                auto pcnt = parsed_;
-                auto extras = std::move(missing_);
-                clear();
-                parsed_ = pcnt;
-                pre_parse_called_ = true;
-                missing_ = std::move(extras);
-            }
-        }
-    }
-
-    /// Get the appropriate parent to fallthrough to which is the first one that has a name or the main app
-    App *_get_fallthrough_parent() {
-        if(parent_ == nullptr) {
-            throw(HorribleError("No Valid parent"));
-        }
-        auto fallthrough_parent = parent_;
-        while((fallthrough_parent->parent_ != nullptr) && (fallthrough_parent->get_name().empty())) {
-            fallthrough_parent = fallthrough_parent->parent_;
-        }
-        return fallthrough_parent;
-    }
-
-    /// Helper function to place extra values in the most appropriate position
-    void _move_to_missing(detail::Classifier val_type, const std::string &val) {
-        if(allow_extras_ || subcommands_.empty()) {
-            missing_.emplace_back(val_type, val);
-            return;
-        }
-        // allow extra arguments to be places in an option group if it is allowed there
-        for(auto &subc : subcommands_) {
-            if(subc->name_.empty() && subc->allow_extras_) {
-                subc->missing_.emplace_back(val_type, val);
-                return;
-            }
-        }
-        // if we haven't found any place to put them yet put them in missing
-        missing_.emplace_back(val_type, val);
-    }
-
-  public:
-    /// function that could be used by subclasses of App to shift options around into subcommands
-    void _move_option(Option *opt, App *app) {
-        if(opt == nullptr) {
-            throw OptionNotFound("the option is NULL");
-        }
-        // verify that the give app is actually a subcommand
-        bool found = false;
-        for(auto &subc : subcommands_) {
-            if(app == subc.get()) {
-                found = true;
-            }
-        }
-        if(!found) {
-            throw OptionNotFound("The Given app is not a subcommand");
-        }
-
-        if((help_ptr_ == opt) || (help_all_ptr_ == opt))
-            throw OptionAlreadyAdded("cannot move help options");
-
-        if(config_ptr_ == opt)
-            throw OptionAlreadyAdded("cannot move config file options");
-
-        auto iterator =
-            std::find_if(std::begin(options_), std::end(options_), [opt](const Option_p &v) { return v.get() == opt; });
-        if(iterator != std::end(options_)) {
-            const auto &opt_p = *iterator;
-            if(std::find_if(std::begin(app->options_), std::end(app->options_), [&opt_p](const Option_p &v) {
-                   return (*v == *opt_p);
-               }) == std::end(app->options_)) {
-                // only erase after the insertion was successful
-                app->options_.push_back(std::move(*iterator));
-                options_.erase(iterator);
-            } else {
-                throw OptionAlreadyAdded(opt->get_name());
-            }
-        } else {
-            throw OptionNotFound("could not locate the given App");
-        }
-    }
-};
-
-/// Extension of App to better manage groups of options
-class Option_group : public App {
-  public:
-    Option_group(std::string group_description, std::string group_name, App *parent)
-        : App(std::move(group_description), "", parent) {
-        group(group_name);
-        // option groups should have automatic fallthrough
-    }
-    using App::add_option;
-    /// Add an existing option to the Option_group
-    Option *add_option(Option *opt) {
-        if(get_parent() == nullptr) {
-            throw OptionNotFound("Unable to locate the specified option");
-        }
-        get_parent()->_move_option(opt, this);
-        return opt;
-    }
-    /// Add an existing option to the Option_group
-    void add_options(Option *opt) { add_option(opt); }
-    /// Add a bunch of options to the group
-    template <typename... Args> void add_options(Option *opt, Args... args) {
-        add_option(opt);
-        add_options(args...);
-    }
-    using App::add_subcommand;
-    /// Add an existing subcommand to be a member of an option_group
-    App *add_subcommand(App *subcom) {
-        App_p subc = subcom->get_parent()->get_subcommand_ptr(subcom);
-        subc->get_parent()->remove_subcommand(subcom);
-        add_subcommand(std::move(subc));
-        return subcom;
-    }
-};
-/// Helper function to enable one option group/subcommand when another is used
-inline void TriggerOn(App *trigger_app, App *app_to_enable) {
-    app_to_enable->enabled_by_default(false);
-    app_to_enable->disabled_by_default();
-    trigger_app->preparse_callback([app_to_enable](size_t) { app_to_enable->disabled(false); });
-}
-
-/// Helper function to enable one option group/subcommand when another is used
-inline void TriggerOn(App *trigger_app, std::vector<App *> apps_to_enable) {
-    for(auto &app : apps_to_enable) {
-        app->enabled_by_default(false);
-        app->disabled_by_default();
-    }
-
-    trigger_app->preparse_callback([apps_to_enable](size_t) {
-        for(auto &app : apps_to_enable) {
-            app->disabled(false);
-        }
-    });
-}
-
-/// Helper function to disable one option group/subcommand when another is used
-inline void TriggerOff(App *trigger_app, App *app_to_enable) {
-    app_to_enable->disabled_by_default(false);
-    app_to_enable->enabled_by_default();
-    trigger_app->preparse_callback([app_to_enable](size_t) { app_to_enable->disabled(); });
-}
-
-/// Helper function to disable one option group/subcommand when another is used
-inline void TriggerOff(App *trigger_app, std::vector<App *> apps_to_enable) {
-    for(auto &app : apps_to_enable) {
-        app->disabled_by_default(false);
-        app->enabled_by_default();
-    }
-
-    trigger_app->preparse_callback([apps_to_enable](size_t) {
-        for(auto &app : apps_to_enable) {
-            app->disabled();
-        }
-    });
-}
-
-namespace FailureMessage {
-
-/// Printout a clean, simple message on error (the default in CLI11 1.5+)
-inline std::string simple(const App *app, const Error &e) {
-    std::string header = std::string(e.what()) + "\n";
-    std::vector<std::string> names;
-
-    // Collect names
-    if(app->get_help_ptr() != nullptr)
-        names.push_back(app->get_help_ptr()->get_name());
-
-    if(app->get_help_all_ptr() != nullptr)
-        names.push_back(app->get_help_all_ptr()->get_name());
-
-    // If any names found, suggest those
-    if(!names.empty())
-        header += "Run with " + detail::join(names, " or ") + " for more information.\n";
-
-    return header;
-}
-
-/// Printout the full help string on error (if this fn is set, the old default for CLI11)
-inline std::string help(const App *app, const Error &e) {
-    std::string header = std::string("ERROR: ") + e.get_name() + ": " + e.what() + "\n";
-    header += app->help();
-    return header;
-}
-
-} // namespace FailureMessage
-
-namespace detail {
-/// This class is simply to allow tests access to App's protected functions
-struct AppFriend {
-
-    /// Wrap _parse_short, perfectly forward arguments and return
-    template <typename... Args>
-    static auto parse_arg(App *app, Args &&... args) ->
-        typename std::result_of<decltype (&App::_parse_arg)(App, Args...)>::type {
-        return app->_parse_arg(std::forward<Args>(args)...);
-    }
-
-    /// Wrap _parse_subcommand, perfectly forward arguments and return
-    template <typename... Args>
-    static auto parse_subcommand(App *app, Args &&... args) ->
-        typename std::result_of<decltype (&App::_parse_subcommand)(App, Args...)>::type {
-        return app->_parse_subcommand(std::forward<Args>(args)...);
-    }
-    /// Wrap the fallthrough parent function to make sure that is working correctly
-    static App *get_fallthrough_parent(App *app) { return app->_get_fallthrough_parent(); }
-};
-} // namespace detail
-
-} // namespace CLI
-
-// From CLI/Config.hpp:
-
-namespace CLI {
-
-inline std::string
-ConfigINI::to_config(const App *app, bool default_also, bool write_description, std::string prefix) const {
-    std::stringstream out;
-    for(const Option *opt : app->get_options({})) {
-
-        // Only process option with a long-name and configurable
-        if(!opt->get_lnames().empty() && opt->get_configurable()) {
-            std::string name = prefix + opt->get_lnames()[0];
-            std::string value;
-
-            // Non-flags
-            if(opt->get_type_size() != 0) {
-
-                // If the option was found on command line
-                if(opt->count() > 0)
-                    value = detail::ini_join(opt->results());
-
-                // If the option has a default and is requested by optional argument
-                else if(default_also && !opt->get_default_str().empty())
-                    value = opt->get_default_str();
-                // Flag, one passed
-            } else if(opt->count() == 1) {
-                value = "true";
-
-                // Flag, multiple passed
-            } else if(opt->count() > 1) {
-                value = std::to_string(opt->count());
-
-                // Flag, not present
-            } else if(opt->count() == 0 && default_also) {
-                value = "false";
-            }
-
-            if(!value.empty()) {
-                if(write_description && opt->has_description()) {
-                    if(static_cast<int>(out.tellp()) != 0) {
-                        out << std::endl;
-                    }
-                    out << "; " << detail::fix_newlines("; ", opt->get_description()) << std::endl;
-                }
-
-                // Don't try to quote anything that is not size 1
-                if(opt->get_items_expected() != 1)
-                    out << name << "=" << value << std::endl;
-                else
-                    out << name << "=" << detail::add_quotes_if_needed(value) << std::endl;
-            }
-        }
-    }
-
-    for(const App *subcom : app->get_subcommands({}))
-        out << to_config(subcom, default_also, write_description, prefix + subcom->get_name() + ".");
-
-    return out.str();
-}
-
-} // namespace CLI
-
-// From CLI/Formatter.hpp:
-
-namespace CLI {
-
-inline std::string
-Formatter::make_group(std::string group, bool is_positional, std::vector<const Option *> opts) const {
-    std::stringstream out;
-
-    out << "\n" << group << ":\n";
-    for(const Option *opt : opts) {
-        out << make_option(opt, is_positional);
-    }
-
-    return out.str();
-}
-
-inline std::string Formatter::make_positionals(const App *app) const {
-    std::vector<const Option *> opts =
-        app->get_options([](const Option *opt) { return !opt->get_group().empty() && opt->get_positional(); });
-
-    if(opts.empty())
-        return std::string();
-    else
-        return make_group(get_label("Positionals"), true, opts);
-}
-
-inline std::string Formatter::make_groups(const App *app, AppFormatMode mode) const {
-    std::stringstream out;
-    std::vector<std::string> groups = app->get_groups();
-
-    // Options
-    for(const std::string &group : groups) {
-        std::vector<const Option *> opts = app->get_options([app, mode, &group](const Option *opt) {
-            return opt->get_group() == group                    // Must be in the right group
-                   && opt->nonpositional()                      // Must not be a positional
-                   && (mode != AppFormatMode::Sub               // If mode is Sub, then
-                       || (app->get_help_ptr() != opt           // Ignore help pointer
-                           && app->get_help_all_ptr() != opt)); // Ignore help all pointer
-        });
-        if(!group.empty() && !opts.empty()) {
-            out << make_group(group, false, opts);
-
-            if(group != groups.back())
-                out << "\n";
-        }
-    }
-
-    return out.str();
-}
-
-inline std::string Formatter::make_description(const App *app) const {
-    std::string desc = app->get_description();
-    auto min_options = app->get_require_option_min();
-    auto max_options = app->get_require_option_max();
-    if(app->get_required()) {
-        desc += " REQUIRED ";
-    }
-    if((max_options == min_options) && (min_options > 0)) {
-        if(min_options == 1) {
-            desc += " \n[Exactly 1 of the following options is required]";
-        } else {
-            desc += " \n[Exactly " + std::to_string(min_options) + "options from the following list are required]";
-        }
-    } else if(max_options > 0) {
-        if(min_options > 0) {
-            desc += " \n[Between " + std::to_string(min_options) + " and " + std::to_string(max_options) +
-                    " of the follow options are required]";
-        } else {
-            desc += " \n[At most " + std::to_string(max_options) + " of the following options are allowed]";
-        }
-    } else if(min_options > 0) {
-        desc += " \n[At least " + std::to_string(min_options) + " of the following options are required]";
-    }
-    return (!desc.empty()) ? desc + "\n" : std::string{};
-}
-
-inline std::string Formatter::make_usage(const App *app, std::string name) const {
-    std::stringstream out;
-
-    out << get_label("Usage") << ":" << (name.empty() ? "" : " ") << name;
-
-    std::vector<std::string> groups = app->get_groups();
-
-    // Print an Options badge if any options exist
-    std::vector<const Option *> non_pos_options =
-        app->get_options([](const Option *opt) { return opt->nonpositional(); });
-    if(!non_pos_options.empty())
-        out << " [" << get_label("OPTIONS") << "]";
-
-    // Positionals need to be listed here
-    std::vector<const Option *> positionals = app->get_options([](const Option *opt) { return opt->get_positional(); });
-
-    // Print out positionals if any are left
-    if(!positionals.empty()) {
-        // Convert to help names
-        std::vector<std::string> positional_names(positionals.size());
-        std::transform(positionals.begin(), positionals.end(), positional_names.begin(), [this](const Option *opt) {
-            return make_option_usage(opt);
-        });
-
-        out << " " << detail::join(positional_names, " ");
-    }
-
-    // Add a marker if subcommands are expected or optional
-    if(!app->get_subcommands(
-               [](const CLI::App *subc) { return ((!subc->get_disabled()) && (!subc->get_name().empty())); })
-            .empty()) {
-        out << " " << (app->get_require_subcommand_min() == 0 ? "[" : "")
-            << get_label(app->get_require_subcommand_max() < 2 || app->get_require_subcommand_min() > 1 ? "SUBCOMMAND"
-                                                                                                        : "SUBCOMMANDS")
-            << (app->get_require_subcommand_min() == 0 ? "]" : "");
-    }
-
-    out << std::endl;
-
-    return out.str();
-}
-
-inline std::string Formatter::make_footer(const App *app) const {
-    std::string footer = app->get_footer();
-    if(!footer.empty())
-        return footer + "\n";
-    else
-        return "";
-}
-
-inline std::string Formatter::make_help(const App *app, std::string name, AppFormatMode mode) const {
-
-    // This immediately forwards to the make_expanded method. This is done this way so that subcommands can
-    // have overridden formatters
-    if(mode == AppFormatMode::Sub)
-        return make_expanded(app);
-
-    std::stringstream out;
-    if((app->get_name().empty()) && (app->get_parent() != nullptr)) {
-        if(app->get_group() != "Subcommands") {
-            out << app->get_group() << ':';
-        }
-    }
-
-    out << make_description(app);
-    out << make_usage(app, name);
-    out << make_positionals(app);
-    out << make_groups(app, mode);
-    out << make_subcommands(app, mode);
-    out << make_footer(app);
-
-    return out.str();
-}
-
-inline std::string Formatter::make_subcommands(const App *app, AppFormatMode mode) const {
-    std::stringstream out;
-
-    std::vector<const App *> subcommands = app->get_subcommands({});
-
-    // Make a list in definition order of the groups seen
-    std::vector<std::string> subcmd_groups_seen;
-    for(const App *com : subcommands) {
-        if(com->get_name().empty()) {
-            out << make_expanded(com);
-            continue;
-        }
-        std::string group_key = com->get_group();
-        if(!group_key.empty() &&
-           std::find_if(subcmd_groups_seen.begin(), subcmd_groups_seen.end(), [&group_key](std::string a) {
-               return detail::to_lower(a) == detail::to_lower(group_key);
-           }) == subcmd_groups_seen.end())
-            subcmd_groups_seen.push_back(group_key);
-    }
-
-    // For each group, filter out and print subcommands
-    for(const std::string &group : subcmd_groups_seen) {
-        out << "\n" << group << ":\n";
-        std::vector<const App *> subcommands_group = app->get_subcommands(
-            [&group](const App *sub_app) { return detail::to_lower(sub_app->get_group()) == detail::to_lower(group); });
-        for(const App *new_com : subcommands_group) {
-            if(new_com->get_name().empty())
-                continue;
-            if(mode != AppFormatMode::All) {
-                out << make_subcommand(new_com);
-            } else {
-                out << new_com->help(new_com->get_name(), AppFormatMode::Sub);
-                out << "\n";
-            }
-        }
-    }
-
-    return out.str();
-}
-
-inline std::string Formatter::make_subcommand(const App *sub) const {
-    std::stringstream out;
-    detail::format_help(out, sub->get_name(), sub->get_description(), column_width_);
-    return out.str();
-}
-
-inline std::string Formatter::make_expanded(const App *sub) const {
-    std::stringstream out;
-    out << sub->get_display_name() << "\n";
-
-    out << make_description(sub);
-    out << make_positionals(sub);
-    out << make_groups(sub, AppFormatMode::Sub);
-    out << make_subcommands(sub, AppFormatMode::Sub);
-
-    // Drop blank spaces
-    std::string tmp = detail::find_and_replace(out.str(), "\n\n", "\n");
-    tmp = tmp.substr(0, tmp.size() - 1); // Remove the final '\n'
-
-    // Indent all but the first line (the name)
-    return detail::find_and_replace(tmp, "\n", "\n  ") + "\n";
-}
-
-inline std::string Formatter::make_option_name(const Option *opt, bool is_positional) const {
-    if(is_positional)
-        return opt->get_name(true, false);
-    else
-        return opt->get_name(false, true);
-}
-
-inline std::string Formatter::make_option_opts(const Option *opt) const {
-    std::stringstream out;
-
-    if(opt->get_type_size() != 0) {
-        if(!opt->get_type_name().empty())
-            out << " " << get_label(opt->get_type_name());
-        if(!opt->get_default_str().empty())
-            out << "=" << opt->get_default_str();
-        if(opt->get_expected() > 1)
-            out << " x " << opt->get_expected();
-        if(opt->get_expected() == -1)
-            out << " ...";
-        if(opt->get_required())
-            out << " " << get_label("REQUIRED");
-    }
-    if(!opt->get_envname().empty())
-        out << " (" << get_label("Env") << ":" << opt->get_envname() << ")";
-    if(!opt->get_needs().empty()) {
-        out << " " << get_label("Needs") << ":";
-        for(const Option *op : opt->get_needs())
-            out << " " << op->get_name();
-    }
-    if(!opt->get_excludes().empty()) {
-        out << " " << get_label("Excludes") << ":";
-        for(const Option *op : opt->get_excludes())
-            out << " " << op->get_name();
-    }
-    return out.str();
-}
-
-inline std::string Formatter::make_option_desc(const Option *opt) const { return opt->get_description(); }
-
-inline std::string Formatter::make_option_usage(const Option *opt) const {
-    // Note that these are positionals usages
-    std::stringstream out;
-    out << make_option_name(opt, true);
-
-    if(opt->get_expected() > 1)
-        out << "(" << std::to_string(opt->get_expected()) << "x)";
-    else if(opt->get_expected() < 0)
-        out << "...";
-    return opt->get_required() ? out.str() : "[" + out.str() + "]";
-}
-
-} // namespace CLI
-
diff --git a/Src/Scarab/library/external/date/date.h b/Src/Scarab/library/external/date/date.h
deleted file mode 100644
index 6f1e2f4..0000000
--- a/Src/Scarab/library/external/date/date.h
+++ /dev/null
@@ -1,8010 +0,0 @@
-#ifndef DATE_H
-#define DATE_H
-
-// The MIT License (MIT)
-//
-// Copyright (c) 2015, 2016, 2017 Howard Hinnant
-// Copyright (c) 2016 Adrian Colomitchi
-// Copyright (c) 2017 Florian Dang
-// Copyright (c) 2017 Paul Thompson
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in all
-// copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// Our apologies.  When the previous paragraph was written, lowercase had not yet
-// been invented (that would involve another several millennia of evolution).
-// We did not mean to shout.
-
-#ifndef HAS_STRING_VIEW
-#  if __cplusplus >= 201703
-#    define HAS_STRING_VIEW 1
-#  else
-#    define HAS_STRING_VIEW 0
-#  endif
-#endif  // HAS_STRING_VIEW
-
-#include <cassert>
-#include <algorithm>
-#include <cctype>
-#include <chrono>
-#include <climits>
-#if !(__cplusplus >= 201402)
-#  include <cmath>
-#endif
-#include <cstddef>
-#include <cstdint>
-#include <cstdlib>
-#include <ctime>
-#include <ios>
-#include <istream>
-#include <iterator>
-#include <limits>
-#include <locale>
-#include <memory>
-#include <ostream>
-#include <ratio>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#if HAS_STRING_VIEW
-# include <string_view>
-#endif
-#include <utility>
-#include <type_traits>
-
-#ifdef __GNUC__
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wpedantic"
-# if __GNUC__ < 5
-   // GCC 4.9 Bug 61489 Wrong warning with -Wmissing-field-initializers
-#  pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-# endif
-#endif
-
-namespace date
-{
-
-//---------------+
-// Configuration |
-//---------------+
-
-#ifndef ONLY_C_LOCALE
-#  define ONLY_C_LOCALE 0
-#endif
-
-#if defined(_MSC_VER) && (!defined(__clang__) || (_MSC_VER < 1910))
-// MSVC
-#  if _MSC_VER < 1910
-//   before VS2017
-#    define CONSTDATA const
-#    define CONSTCD11
-#    define CONSTCD14
-#    define NOEXCEPT _NOEXCEPT
-#  else
-//   VS2017 and later
-#    define CONSTDATA constexpr const
-#    define CONSTCD11 constexpr
-#    define CONSTCD14 constexpr
-#    define NOEXCEPT noexcept
-#  endif
-
-#elif defined(__SUNPRO_CC) && __SUNPRO_CC <= 0x5150
-// Oracle Developer Studio 12.6 and earlier
-#  define CONSTDATA constexpr const
-#  define CONSTCD11 constexpr
-#  define CONSTCD14
-#  define NOEXCEPT noexcept
-
-#elif __cplusplus >= 201402
-// C++14
-#  define CONSTDATA constexpr const
-#  define CONSTCD11 constexpr
-#  define CONSTCD14 constexpr
-#  define NOEXCEPT noexcept
-#else
-// C++11
-#  define CONSTDATA constexpr const
-#  define CONSTCD11 constexpr
-#  define CONSTCD14
-#  define NOEXCEPT noexcept
-#endif
-
-#ifndef HAS_VOID_T
-#  if __cplusplus >= 201703
-#    define HAS_VOID_T 1
-#  else
-#    define HAS_VOID_T 0
-#  endif
-#endif  // HAS_VOID_T
-
-// Protect from Oracle sun macro
-#ifdef sun
-#  undef sun
-#endif
-
-//-----------+
-// Interface |
-//-----------+
-
-// durations
-
-using days = std::chrono::duration
-    <int, std::ratio_multiply<std::ratio<24>, std::chrono::hours::period>>;
-
-using weeks = std::chrono::duration
-    <int, std::ratio_multiply<std::ratio<7>, days::period>>;
-
-using years = std::chrono::duration
-    <int, std::ratio_multiply<std::ratio<146097, 400>, days::period>>;
-
-using months = std::chrono::duration
-    <int, std::ratio_divide<years::period, std::ratio<12>>>;
-
-// time_point
-
-template <class Duration>
-    using sys_time = std::chrono::time_point<std::chrono::system_clock, Duration>;
-
-using sys_days    = sys_time<days>;
-using sys_seconds = sys_time<std::chrono::seconds>;
-
-struct local_t {};
-
-template <class Duration>
-    using local_time = std::chrono::time_point<local_t, Duration>;
-
-using local_seconds = local_time<std::chrono::seconds>;
-using local_days    = local_time<days>;
-
-// types
-
-struct last_spec
-{
-    explicit last_spec() = default;
-};
-
-class day;
-class month;
-class year;
-
-class weekday;
-class weekday_indexed;
-class weekday_last;
-
-class month_day;
-class month_day_last;
-class month_weekday;
-class month_weekday_last;
-
-class year_month;
-
-class year_month_day;
-class year_month_day_last;
-class year_month_weekday;
-class year_month_weekday_last;
-
-// date composition operators
-
-CONSTCD11 year_month operator/(const year& y, const month& m) NOEXCEPT;
-CONSTCD11 year_month operator/(const year& y, int          m) NOEXCEPT;
-
-CONSTCD11 month_day operator/(const day& d, const month& m) NOEXCEPT;
-CONSTCD11 month_day operator/(const day& d, int          m) NOEXCEPT;
-CONSTCD11 month_day operator/(const month& m, const day& d) NOEXCEPT;
-CONSTCD11 month_day operator/(const month& m, int        d) NOEXCEPT;
-CONSTCD11 month_day operator/(int          m, const day& d) NOEXCEPT;
-
-CONSTCD11 month_day_last operator/(const month& m, last_spec) NOEXCEPT;
-CONSTCD11 month_day_last operator/(int          m, last_spec) NOEXCEPT;
-CONSTCD11 month_day_last operator/(last_spec, const month& m) NOEXCEPT;
-CONSTCD11 month_day_last operator/(last_spec, int          m) NOEXCEPT;
-
-CONSTCD11 month_weekday operator/(const month& m, const weekday_indexed& wdi) NOEXCEPT;
-CONSTCD11 month_weekday operator/(int          m, const weekday_indexed& wdi) NOEXCEPT;
-CONSTCD11 month_weekday operator/(const weekday_indexed& wdi, const month& m) NOEXCEPT;
-CONSTCD11 month_weekday operator/(const weekday_indexed& wdi, int          m) NOEXCEPT;
-
-CONSTCD11 month_weekday_last operator/(const month& m, const weekday_last& wdl) NOEXCEPT;
-CONSTCD11 month_weekday_last operator/(int          m, const weekday_last& wdl) NOEXCEPT;
-CONSTCD11 month_weekday_last operator/(const weekday_last& wdl, const month& m) NOEXCEPT;
-CONSTCD11 month_weekday_last operator/(const weekday_last& wdl, int          m) NOEXCEPT;
-
-CONSTCD11 year_month_day operator/(const year_month& ym, const day& d) NOEXCEPT;
-CONSTCD11 year_month_day operator/(const year_month& ym, int        d) NOEXCEPT;
-CONSTCD11 year_month_day operator/(const year& y, const month_day& md) NOEXCEPT;
-CONSTCD11 year_month_day operator/(int         y, const month_day& md) NOEXCEPT;
-CONSTCD11 year_month_day operator/(const month_day& md, const year& y) NOEXCEPT;
-CONSTCD11 year_month_day operator/(const month_day& md, int         y) NOEXCEPT;
-
-CONSTCD11
-    year_month_day_last operator/(const year_month& ym,   last_spec) NOEXCEPT;
-CONSTCD11
-    year_month_day_last operator/(const year& y, const month_day_last& mdl) NOEXCEPT;
-CONSTCD11
-    year_month_day_last operator/(int         y, const month_day_last& mdl) NOEXCEPT;
-CONSTCD11
-    year_month_day_last operator/(const month_day_last& mdl, const year& y) NOEXCEPT;
-CONSTCD11
-    year_month_day_last operator/(const month_day_last& mdl, int         y) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator/(const year_month& ym, const weekday_indexed& wdi) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator/(const year&        y, const month_weekday&   mwd) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator/(int                y, const month_weekday&   mwd) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator/(const month_weekday& mwd, const year&          y) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator/(const month_weekday& mwd, int                  y) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator/(const year_month& ym, const weekday_last& wdl) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator/(const year& y, const month_weekday_last& mwdl) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator/(int         y, const month_weekday_last& mwdl) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator/(const month_weekday_last& mwdl, const year& y) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator/(const month_weekday_last& mwdl, int         y) NOEXCEPT;
-
-// Detailed interface
-
-// day
-
-class day
-{
-    unsigned char d_;
-
-public:
-    day() = default;
-    explicit CONSTCD11 day(unsigned d) NOEXCEPT;
-
-    CONSTCD14 day& operator++()    NOEXCEPT;
-    CONSTCD14 day  operator++(int) NOEXCEPT;
-    CONSTCD14 day& operator--()    NOEXCEPT;
-    CONSTCD14 day  operator--(int) NOEXCEPT;
-
-    CONSTCD14 day& operator+=(const days& d) NOEXCEPT;
-    CONSTCD14 day& operator-=(const days& d) NOEXCEPT;
-
-    CONSTCD11 explicit operator unsigned() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const day& x, const day& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const day& x, const day& y) NOEXCEPT;
-CONSTCD11 bool operator< (const day& x, const day& y) NOEXCEPT;
-CONSTCD11 bool operator> (const day& x, const day& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const day& x, const day& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const day& x, const day& y) NOEXCEPT;
-
-CONSTCD11 day  operator+(const day&  x, const days& y) NOEXCEPT;
-CONSTCD11 day  operator+(const days& x, const day&  y) NOEXCEPT;
-CONSTCD11 day  operator-(const day&  x, const days& y) NOEXCEPT;
-CONSTCD11 days operator-(const day&  x, const day&  y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const day& d);
-
-// month
-
-class month
-{
-    unsigned char m_;
-
-public:
-    month() = default;
-    explicit CONSTCD11 month(unsigned m) NOEXCEPT;
-
-    CONSTCD14 month& operator++()    NOEXCEPT;
-    CONSTCD14 month  operator++(int) NOEXCEPT;
-    CONSTCD14 month& operator--()    NOEXCEPT;
-    CONSTCD14 month  operator--(int) NOEXCEPT;
-
-    CONSTCD14 month& operator+=(const months& m) NOEXCEPT;
-    CONSTCD14 month& operator-=(const months& m) NOEXCEPT;
-
-    CONSTCD11 explicit operator unsigned() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const month& x, const month& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const month& x, const month& y) NOEXCEPT;
-CONSTCD11 bool operator< (const month& x, const month& y) NOEXCEPT;
-CONSTCD11 bool operator> (const month& x, const month& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const month& x, const month& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const month& x, const month& y) NOEXCEPT;
-
-CONSTCD14 month  operator+(const month&  x, const months& y) NOEXCEPT;
-CONSTCD14 month  operator+(const months& x,  const month& y) NOEXCEPT;
-CONSTCD14 month  operator-(const month&  x, const months& y) NOEXCEPT;
-CONSTCD14 months operator-(const month&  x,  const month& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month& m);
-
-// year
-
-class year
-{
-    short y_;
-
-public:
-    year() = default;
-    explicit CONSTCD11 year(int y) NOEXCEPT;
-
-    CONSTCD14 year& operator++()    NOEXCEPT;
-    CONSTCD14 year  operator++(int) NOEXCEPT;
-    CONSTCD14 year& operator--()    NOEXCEPT;
-    CONSTCD14 year  operator--(int) NOEXCEPT;
-
-    CONSTCD14 year& operator+=(const years& y) NOEXCEPT;
-    CONSTCD14 year& operator-=(const years& y) NOEXCEPT;
-
-    CONSTCD11 year operator-() const NOEXCEPT;
-    CONSTCD11 year operator+() const NOEXCEPT;
-
-    CONSTCD11 bool is_leap() const NOEXCEPT;
-
-    CONSTCD11 explicit operator int() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-
-    static CONSTCD11 year min() NOEXCEPT;
-    static CONSTCD11 year max() NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const year& x, const year& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const year& x, const year& y) NOEXCEPT;
-CONSTCD11 bool operator< (const year& x, const year& y) NOEXCEPT;
-CONSTCD11 bool operator> (const year& x, const year& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const year& x, const year& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const year& x, const year& y) NOEXCEPT;
-
-CONSTCD11 year  operator+(const year&  x, const years& y) NOEXCEPT;
-CONSTCD11 year  operator+(const years& x, const year&  y) NOEXCEPT;
-CONSTCD11 year  operator-(const year&  x, const years& y) NOEXCEPT;
-CONSTCD11 years operator-(const year&  x, const year&  y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year& y);
-
-// weekday
-
-class weekday
-{
-    unsigned char wd_;
-public:
-    weekday() = default;
-    explicit CONSTCD11 weekday(unsigned wd) NOEXCEPT;
-    CONSTCD11 weekday(const sys_days& dp) NOEXCEPT;
-    CONSTCD11 explicit weekday(const local_days& dp) NOEXCEPT;
-
-    CONSTCD14 weekday& operator++()    NOEXCEPT;
-    CONSTCD14 weekday  operator++(int) NOEXCEPT;
-    CONSTCD14 weekday& operator--()    NOEXCEPT;
-    CONSTCD14 weekday  operator--(int) NOEXCEPT;
-
-    CONSTCD14 weekday& operator+=(const days& d) NOEXCEPT;
-    CONSTCD14 weekday& operator-=(const days& d) NOEXCEPT;
-
-    CONSTCD11 explicit operator unsigned() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-
-    CONSTCD11 weekday_indexed operator[](unsigned index) const NOEXCEPT;
-    CONSTCD11 weekday_last    operator[](last_spec)      const NOEXCEPT;
-
-private:
-    static CONSTCD11 unsigned char weekday_from_days(int z) NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const weekday& x, const weekday& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const weekday& x, const weekday& y) NOEXCEPT;
-
-CONSTCD14 weekday operator+(const weekday& x, const days&    y) NOEXCEPT;
-CONSTCD14 weekday operator+(const days&    x, const weekday& y) NOEXCEPT;
-CONSTCD14 weekday operator-(const weekday& x, const days&    y) NOEXCEPT;
-CONSTCD14 days    operator-(const weekday& x, const weekday& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const weekday& wd);
-
-// weekday_indexed
-
-class weekday_indexed
-{
-    unsigned char wd_    : 4;
-    unsigned char index_ : 4;
-
-public:
-    weekday_indexed() = default;
-    CONSTCD11 weekday_indexed(const date::weekday& wd, unsigned index) NOEXCEPT;
-
-    CONSTCD11 date::weekday weekday() const NOEXCEPT;
-    CONSTCD11 unsigned index() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_indexed& wdi);
-
-// weekday_last
-
-class weekday_last
-{
-    date::weekday wd_;
-
-public:
-    explicit CONSTCD11 weekday_last(const date::weekday& wd) NOEXCEPT;
-
-    CONSTCD11 date::weekday weekday() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const weekday_last& x, const weekday_last& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const weekday_last& x, const weekday_last& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_last& wdl);
-
-// year_month
-
-class year_month
-{
-    date::year  y_;
-    date::month m_;
-
-public:
-    year_month() = default;
-    CONSTCD11 year_month(const date::year& y, const date::month& m) NOEXCEPT;
-
-    CONSTCD11 date::year  year()  const NOEXCEPT;
-    CONSTCD11 date::month month() const NOEXCEPT;
-
-    CONSTCD14 year_month& operator+=(const months& dm) NOEXCEPT;
-    CONSTCD14 year_month& operator-=(const months& dm) NOEXCEPT;
-    CONSTCD14 year_month& operator+=(const years& dy) NOEXCEPT;
-    CONSTCD14 year_month& operator-=(const years& dy) NOEXCEPT;
-
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const year_month& x, const year_month& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const year_month& x, const year_month& y) NOEXCEPT;
-CONSTCD11 bool operator< (const year_month& x, const year_month& y) NOEXCEPT;
-CONSTCD11 bool operator> (const year_month& x, const year_month& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const year_month& x, const year_month& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const year_month& x, const year_month& y) NOEXCEPT;
-
-CONSTCD14 year_month operator+(const year_month& ym, const months& dm) NOEXCEPT;
-CONSTCD14 year_month operator+(const months& dm, const year_month& ym) NOEXCEPT;
-CONSTCD14 year_month operator-(const year_month& ym, const months& dm) NOEXCEPT;
-
-CONSTCD11 months operator-(const year_month& x, const year_month& y) NOEXCEPT;
-CONSTCD11 year_month operator+(const year_month& ym, const years& dy) NOEXCEPT;
-CONSTCD11 year_month operator+(const years& dy, const year_month& ym) NOEXCEPT;
-CONSTCD11 year_month operator-(const year_month& ym, const years& dy) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month& ym);
-
-// month_day
-
-class month_day
-{
-    date::month m_;
-    date::day   d_;
-
-public:
-    month_day() = default;
-    CONSTCD11 month_day(const date::month& m, const date::day& d) NOEXCEPT;
-
-    CONSTCD11 date::month month() const NOEXCEPT;
-    CONSTCD11 date::day   day() const NOEXCEPT;
-
-    CONSTCD14 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const month_day& x, const month_day& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const month_day& x, const month_day& y) NOEXCEPT;
-CONSTCD11 bool operator< (const month_day& x, const month_day& y) NOEXCEPT;
-CONSTCD11 bool operator> (const month_day& x, const month_day& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const month_day& x, const month_day& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const month_day& x, const month_day& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_day& md);
-
-// month_day_last
-
-class month_day_last
-{
-    date::month m_;
-
-public:
-    CONSTCD11 explicit month_day_last(const date::month& m) NOEXCEPT;
-
-    CONSTCD11 date::month month() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const month_day_last& x, const month_day_last& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const month_day_last& x, const month_day_last& y) NOEXCEPT;
-CONSTCD11 bool operator< (const month_day_last& x, const month_day_last& y) NOEXCEPT;
-CONSTCD11 bool operator> (const month_day_last& x, const month_day_last& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const month_day_last& x, const month_day_last& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const month_day_last& x, const month_day_last& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_day_last& mdl);
-
-// month_weekday
-
-class month_weekday
-{
-    date::month           m_;
-    date::weekday_indexed wdi_;
-public:
-    CONSTCD11 month_weekday(const date::month& m,
-                            const date::weekday_indexed& wdi) NOEXCEPT;
-
-    CONSTCD11 date::month           month()           const NOEXCEPT;
-    CONSTCD11 date::weekday_indexed weekday_indexed() const NOEXCEPT;
-
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const month_weekday& x, const month_weekday& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const month_weekday& x, const month_weekday& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday& mwd);
-
-// month_weekday_last
-
-class month_weekday_last
-{
-    date::month        m_;
-    date::weekday_last wdl_;
-
-public:
-    CONSTCD11 month_weekday_last(const date::month& m,
-                                 const date::weekday_last& wd) NOEXCEPT;
-
-    CONSTCD11 date::month        month()        const NOEXCEPT;
-    CONSTCD11 date::weekday_last weekday_last() const NOEXCEPT;
-
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11
-    bool operator==(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT;
-CONSTCD11
-    bool operator!=(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday_last& mwdl);
-
-// class year_month_day
-
-class year_month_day
-{
-    date::year  y_;
-    date::month m_;
-    date::day   d_;
-
-public:
-    year_month_day() = default;
-    CONSTCD11 year_month_day(const date::year& y, const date::month& m,
-                             const date::day& d) NOEXCEPT;
-    CONSTCD14 year_month_day(const year_month_day_last& ymdl) NOEXCEPT;
-
-    CONSTCD14 year_month_day(sys_days dp) NOEXCEPT;
-    CONSTCD14 explicit year_month_day(local_days dp) NOEXCEPT;
-
-    CONSTCD14 year_month_day& operator+=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_day& operator-=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_day& operator+=(const years& y)  NOEXCEPT;
-    CONSTCD14 year_month_day& operator-=(const years& y)  NOEXCEPT;
-
-    CONSTCD11 date::year  year()  const NOEXCEPT;
-    CONSTCD11 date::month month() const NOEXCEPT;
-    CONSTCD11 date::day   day()   const NOEXCEPT;
-
-    CONSTCD14 operator sys_days() const NOEXCEPT;
-    CONSTCD14 explicit operator local_days() const NOEXCEPT;
-    CONSTCD14 bool ok() const NOEXCEPT;
-
-private:
-    static CONSTCD14 year_month_day from_days(days dp) NOEXCEPT;
-    CONSTCD14 days to_days() const NOEXCEPT;
-};
-
-CONSTCD11 bool operator==(const year_month_day& x, const year_month_day& y) NOEXCEPT;
-CONSTCD11 bool operator!=(const year_month_day& x, const year_month_day& y) NOEXCEPT;
-CONSTCD11 bool operator< (const year_month_day& x, const year_month_day& y) NOEXCEPT;
-CONSTCD11 bool operator> (const year_month_day& x, const year_month_day& y) NOEXCEPT;
-CONSTCD11 bool operator<=(const year_month_day& x, const year_month_day& y) NOEXCEPT;
-CONSTCD11 bool operator>=(const year_month_day& x, const year_month_day& y) NOEXCEPT;
-
-CONSTCD14 year_month_day operator+(const year_month_day& ymd, const months& dm) NOEXCEPT;
-CONSTCD14 year_month_day operator+(const months& dm, const year_month_day& ymd) NOEXCEPT;
-CONSTCD14 year_month_day operator-(const year_month_day& ymd, const months& dm) NOEXCEPT;
-CONSTCD11 year_month_day operator+(const year_month_day& ymd, const years& dy)  NOEXCEPT;
-CONSTCD11 year_month_day operator+(const years& dy, const year_month_day& ymd)  NOEXCEPT;
-CONSTCD11 year_month_day operator-(const year_month_day& ymd, const years& dy)  NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day& ymd);
-
-// year_month_day_last
-
-class year_month_day_last
-{
-    date::year           y_;
-    date::month_day_last mdl_;
-
-public:
-    CONSTCD11 year_month_day_last(const date::year& y,
-                                  const date::month_day_last& mdl) NOEXCEPT;
-
-    CONSTCD14 year_month_day_last& operator+=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_day_last& operator-=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_day_last& operator+=(const years& y)  NOEXCEPT;
-    CONSTCD14 year_month_day_last& operator-=(const years& y)  NOEXCEPT;
-
-    CONSTCD11 date::year           year()           const NOEXCEPT;
-    CONSTCD11 date::month          month()          const NOEXCEPT;
-    CONSTCD11 date::month_day_last month_day_last() const NOEXCEPT;
-    CONSTCD14 date::day            day()            const NOEXCEPT;
-
-    CONSTCD14 operator sys_days() const NOEXCEPT;
-    CONSTCD14 explicit operator local_days() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-};
-
-CONSTCD11
-    bool operator==(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
-CONSTCD11
-    bool operator!=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
-CONSTCD11
-    bool operator< (const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
-CONSTCD11
-    bool operator> (const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
-CONSTCD11
-    bool operator<=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
-CONSTCD11
-    bool operator>=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT;
-
-CONSTCD14
-year_month_day_last
-operator+(const year_month_day_last& ymdl, const months& dm) NOEXCEPT;
-
-CONSTCD14
-year_month_day_last
-operator+(const months& dm, const year_month_day_last& ymdl) NOEXCEPT;
-
-CONSTCD11
-year_month_day_last
-operator+(const year_month_day_last& ymdl, const years& dy) NOEXCEPT;
-
-CONSTCD11
-year_month_day_last
-operator+(const years& dy, const year_month_day_last& ymdl) NOEXCEPT;
-
-CONSTCD14
-year_month_day_last
-operator-(const year_month_day_last& ymdl, const months& dm) NOEXCEPT;
-
-CONSTCD11
-year_month_day_last
-operator-(const year_month_day_last& ymdl, const years& dy) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day_last& ymdl);
-
-// year_month_weekday
-
-class year_month_weekday
-{
-    date::year            y_;
-    date::month           m_;
-    date::weekday_indexed wdi_;
-
-public:
-    year_month_weekday() = default;
-    CONSTCD11 year_month_weekday(const date::year& y, const date::month& m,
-                                   const date::weekday_indexed& wdi) NOEXCEPT;
-    CONSTCD14 year_month_weekday(const sys_days& dp) NOEXCEPT;
-    CONSTCD14 explicit year_month_weekday(const local_days& dp) NOEXCEPT;
-
-    CONSTCD14 year_month_weekday& operator+=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_weekday& operator-=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_weekday& operator+=(const years& y)  NOEXCEPT;
-    CONSTCD14 year_month_weekday& operator-=(const years& y)  NOEXCEPT;
-
-    CONSTCD11 date::year year() const NOEXCEPT;
-    CONSTCD11 date::month month() const NOEXCEPT;
-    CONSTCD11 date::weekday weekday() const NOEXCEPT;
-    CONSTCD11 unsigned index() const NOEXCEPT;
-    CONSTCD11 date::weekday_indexed weekday_indexed() const NOEXCEPT;
-
-    CONSTCD14 operator sys_days() const NOEXCEPT;
-    CONSTCD14 explicit operator local_days() const NOEXCEPT;
-    CONSTCD14 bool ok() const NOEXCEPT;
-
-private:
-    static CONSTCD14 year_month_weekday from_days(days dp) NOEXCEPT;
-    CONSTCD14 days to_days() const NOEXCEPT;
-};
-
-CONSTCD11
-    bool operator==(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT;
-CONSTCD11
-    bool operator!=(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT;
-
-CONSTCD14
-year_month_weekday
-operator+(const year_month_weekday& ymwd, const months& dm) NOEXCEPT;
-
-CONSTCD14
-year_month_weekday
-operator+(const months& dm, const year_month_weekday& ymwd) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator+(const year_month_weekday& ymwd, const years& dy) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator+(const years& dy, const year_month_weekday& ymwd) NOEXCEPT;
-
-CONSTCD14
-year_month_weekday
-operator-(const year_month_weekday& ymwd, const months& dm) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday
-operator-(const year_month_weekday& ymwd, const years& dy) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday& ymwdi);
-
-// year_month_weekday_last
-
-class year_month_weekday_last
-{
-    date::year y_;
-    date::month m_;
-    date::weekday_last wdl_;
-
-public:
-    CONSTCD11 year_month_weekday_last(const date::year& y, const date::month& m,
-                                      const date::weekday_last& wdl) NOEXCEPT;
-
-    CONSTCD14 year_month_weekday_last& operator+=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_weekday_last& operator-=(const months& m) NOEXCEPT;
-    CONSTCD14 year_month_weekday_last& operator+=(const years& y) NOEXCEPT;
-    CONSTCD14 year_month_weekday_last& operator-=(const years& y) NOEXCEPT;
-
-    CONSTCD11 date::year year() const NOEXCEPT;
-    CONSTCD11 date::month month() const NOEXCEPT;
-    CONSTCD11 date::weekday weekday() const NOEXCEPT;
-    CONSTCD11 date::weekday_last weekday_last() const NOEXCEPT;
-
-    CONSTCD14 operator sys_days() const NOEXCEPT;
-    CONSTCD14 explicit operator local_days() const NOEXCEPT;
-    CONSTCD11 bool ok() const NOEXCEPT;
-
-private:
-    CONSTCD14 days to_days() const NOEXCEPT;
-};
-
-CONSTCD11
-bool
-operator==(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT;
-
-CONSTCD11
-bool
-operator!=(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT;
-
-CONSTCD14
-year_month_weekday_last
-operator+(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT;
-
-CONSTCD14
-year_month_weekday_last
-operator+(const months& dm, const year_month_weekday_last& ymwdl) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator+(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator+(const years& dy, const year_month_weekday_last& ymwdl) NOEXCEPT;
-
-CONSTCD14
-year_month_weekday_last
-operator-(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT;
-
-CONSTCD11
-year_month_weekday_last
-operator-(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT;
-
-template<class CharT, class Traits>
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday_last& ymwdl);
-
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
-inline namespace literals
-{
-
-CONSTCD11 date::day  operator "" _d(unsigned long long d) NOEXCEPT;
-CONSTCD11 date::year operator "" _y(unsigned long long y) NOEXCEPT;
-
-// CONSTDATA date::month jan{1};
-// CONSTDATA date::month feb{2};
-// CONSTDATA date::month mar{3};
-// CONSTDATA date::month apr{4};
-// CONSTDATA date::month may{5};
-// CONSTDATA date::month jun{6};
-// CONSTDATA date::month jul{7};
-// CONSTDATA date::month aug{8};
-// CONSTDATA date::month sep{9};
-// CONSTDATA date::month oct{10};
-// CONSTDATA date::month nov{11};
-// CONSTDATA date::month dec{12};
-//
-// CONSTDATA date::weekday sun{0u};
-// CONSTDATA date::weekday mon{1u};
-// CONSTDATA date::weekday tue{2u};
-// CONSTDATA date::weekday wed{3u};
-// CONSTDATA date::weekday thu{4u};
-// CONSTDATA date::weekday fri{5u};
-// CONSTDATA date::weekday sat{6u};
-
-}  // inline namespace literals
-#endif // !defined(_MSC_VER) || (_MSC_VER >= 1900)
-
-#if HAS_VOID_T
-
-template <class T, class = std::void_t<>>
-struct is_clock
-    : std::false_type
-{};
-
-template <class T>
-struct is_clock<T, std::void_t<decltype(T::now()), typename T::rep, typename T::period,
-                               typename T::duration, typename T::time_point,
-                               decltype(T::is_steady)>>
-    : std::true_type
-{};
-
-#endif  // HAS_VOID_T
-
-//----------------+
-// Implementation |
-//----------------+
-
-// utilities
-namespace detail {
-
-template<class CharT, class Traits = std::char_traits<CharT>>
-class save_stream
-{
-    std::basic_ostream<CharT, Traits>& os_;
-    CharT fill_;
-    std::ios::fmtflags flags_;
-    std::locale loc_;
-
-public:
-    ~save_stream()
-    {
-        os_.fill(fill_);
-        os_.flags(flags_);
-        os_.imbue(loc_);
-    }
-
-    save_stream(const save_stream&) = delete;
-    save_stream& operator=(const save_stream&) = delete;
-
-    explicit save_stream(std::basic_ostream<CharT, Traits>& os)
-        : os_(os)
-        , fill_(os.fill())
-        , flags_(os.flags())
-        , loc_(os.getloc())
-        {}
-};
-
-template <class T>
-struct choose_trunc_type
-{
-    static const int digits = std::numeric_limits<T>::digits;
-    using type = typename std::conditional
-                 <
-                     digits < 32,
-                     std::int32_t,
-                     typename std::conditional
-                     <
-                         digits < 64,
-                         std::int64_t,
-#ifdef __SIZEOF_INT128__
-                         __int128
-#else
-                         std::int64_t
-#endif
-                     >::type
-                 >::type;
-};
-
-template <class T>
-CONSTCD11
-inline
-typename std::enable_if
-<
-    !std::chrono::treat_as_floating_point<T>::value,
-    T
->::type
-trunc(T t) NOEXCEPT
-{
-    return t;
-}
-
-template <class T>
-CONSTCD14
-inline
-typename std::enable_if
-<
-    std::chrono::treat_as_floating_point<T>::value,
-    T
->::type
-trunc(T t) NOEXCEPT
-{
-    using namespace std;
-    using I = typename choose_trunc_type<T>::type;
-    CONSTDATA auto digits = numeric_limits<T>::digits;
-    static_assert(digits < numeric_limits<I>::digits, "");
-    CONSTDATA auto max = I{1} << (digits-1);
-    CONSTDATA auto min = -max;
-    const auto negative = t < T{0};
-    if (min <= t && t <= max && t != 0 && t == t)
-    {
-        t = static_cast<T>(static_cast<I>(t));
-        if (t == 0 && negative)
-            t = -t;
-    }
-    return t;
-}
-
-template <std::intmax_t Xp, std::intmax_t Yp>
-struct static_gcd
-{
-    static const std::intmax_t value = static_gcd<Yp, Xp % Yp>::value;
-};
-
-template <std::intmax_t Xp>
-struct static_gcd<Xp, 0>
-{
-    static const std::intmax_t value = Xp;
-};
-
-template <>
-struct static_gcd<0, 0>
-{
-    static const std::intmax_t value = 1;
-};
-
-template <class R1, class R2>
-struct no_overflow
-{
-private:
-    static const std::intmax_t gcd_n1_n2 = static_gcd<R1::num, R2::num>::value;
-    static const std::intmax_t gcd_d1_d2 = static_gcd<R1::den, R2::den>::value;
-    static const std::intmax_t n1 = R1::num / gcd_n1_n2;
-    static const std::intmax_t d1 = R1::den / gcd_d1_d2;
-    static const std::intmax_t n2 = R2::num / gcd_n1_n2;
-    static const std::intmax_t d2 = R2::den / gcd_d1_d2;
-    static const std::intmax_t max = -((std::intmax_t(1) <<
-                                       (sizeof(std::intmax_t) * CHAR_BIT - 1)) + 1);
-
-    template <std::intmax_t Xp, std::intmax_t Yp, bool overflow>
-    struct mul    // overflow == false
-    {
-        static const std::intmax_t value = Xp * Yp;
-    };
-
-    template <std::intmax_t Xp, std::intmax_t Yp>
-    struct mul<Xp, Yp, true>
-    {
-        static const std::intmax_t value = 1;
-    };
-
-public:
-    static const bool value = (n1 <= max / d2) && (n2 <= max / d1);
-    typedef std::ratio<mul<n1, d2, !value>::value,
-                       mul<n2, d1, !value>::value> type;
-};
-
-}  // detail
-
-// trunc towards zero
-template <class To, class Rep, class Period>
-CONSTCD11
-inline
-typename std::enable_if
-<
-    detail::no_overflow<Period, typename To::period>::value,
-    To
->::type
-trunc(const std::chrono::duration<Rep, Period>& d)
-{
-    return To{detail::trunc(std::chrono::duration_cast<To>(d).count())};
-}
-
-template <class To, class Rep, class Period>
-CONSTCD11
-inline
-typename std::enable_if
-<
-    !detail::no_overflow<Period, typename To::period>::value,
-    To
->::type
-trunc(const std::chrono::duration<Rep, Period>& d)
-{
-    using namespace std::chrono;
-    using rep = typename std::common_type<Rep, typename To::rep>::type;
-    return To{detail::trunc(duration_cast<To>(duration_cast<duration<rep>>(d)).count())};
-}
-
-#ifndef HAS_CHRONO_ROUNDING
-#  if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 190023918 || (_MSC_FULL_VER >= 190000000 && defined (__clang__)))
-#    define HAS_CHRONO_ROUNDING 1
-#  elif defined(__cpp_lib_chrono) && __cplusplus > 201402 && __cpp_lib_chrono >= 201510
-#    define HAS_CHRONO_ROUNDING 1
-#  elif defined(_LIBCPP_VERSION) && __cplusplus > 201402 && _LIBCPP_VERSION >= 3800
-#    define HAS_CHRONO_ROUNDING 1
-#  else
-#    define HAS_CHRONO_ROUNDING 0
-#  endif
-#endif  // HAS_CHRONO_ROUNDING
-
-#if HAS_CHRONO_ROUNDING == 0
-
-// round down
-template <class To, class Rep, class Period>
-CONSTCD14
-inline
-typename std::enable_if
-<
-    detail::no_overflow<Period, typename To::period>::value,
-    To
->::type
-floor(const std::chrono::duration<Rep, Period>& d)
-{
-    auto t = trunc<To>(d);
-    if (t > d)
-        return t - To{1};
-    return t;
-}
-
-template <class To, class Rep, class Period>
-CONSTCD14
-inline
-typename std::enable_if
-<
-    !detail::no_overflow<Period, typename To::period>::value,
-    To
->::type
-floor(const std::chrono::duration<Rep, Period>& d)
-{
-    using namespace std::chrono;
-    using rep = typename std::common_type<Rep, typename To::rep>::type;
-    return floor<To>(floor<duration<rep>>(d));
-}
-
-// round to nearest, to even on tie
-template <class To, class Rep, class Period>
-CONSTCD14
-inline
-To
-round(const std::chrono::duration<Rep, Period>& d)
-{
-    auto t0 = floor<To>(d);
-    auto t1 = t0 + To{1};
-    if (t1 == To{0} && t0 < To{0})
-        t1 = -t1;
-    auto diff0 = d - t0;
-    auto diff1 = t1 - d;
-    if (diff0 == diff1)
-    {
-        if (t0 - trunc<To>(t0/2)*2 == To{0})
-            return t0;
-        return t1;
-    }
-    if (diff0 < diff1)
-        return t0;
-    return t1;
-}
-
-// round up
-template <class To, class Rep, class Period>
-CONSTCD14
-inline
-To
-ceil(const std::chrono::duration<Rep, Period>& d)
-{
-    auto t = trunc<To>(d);
-    if (t < d)
-        return t + To{1};
-    return t;
-}
-
-template <class Rep, class Period,
-          class = typename std::enable_if
-          <
-              std::numeric_limits<Rep>::is_signed
-          >::type>
-CONSTCD11
-std::chrono::duration<Rep, Period>
-abs(std::chrono::duration<Rep, Period> d)
-{
-    return d >= d.zero() ? d : -d;
-}
-
-// round down
-template <class To, class Clock, class FromDuration>
-CONSTCD11
-inline
-std::chrono::time_point<Clock, To>
-floor(const std::chrono::time_point<Clock, FromDuration>& tp)
-{
-    using std::chrono::time_point;
-    return time_point<Clock, To>{date::floor<To>(tp.time_since_epoch())};
-}
-
-// round to nearest, to even on tie
-template <class To, class Clock, class FromDuration>
-CONSTCD11
-inline
-std::chrono::time_point<Clock, To>
-round(const std::chrono::time_point<Clock, FromDuration>& tp)
-{
-    using std::chrono::time_point;
-    return time_point<Clock, To>{round<To>(tp.time_since_epoch())};
-}
-
-// round up
-template <class To, class Clock, class FromDuration>
-CONSTCD11
-inline
-std::chrono::time_point<Clock, To>
-ceil(const std::chrono::time_point<Clock, FromDuration>& tp)
-{
-    using std::chrono::time_point;
-    return time_point<Clock, To>{ceil<To>(tp.time_since_epoch())};
-}
-
-#else  // HAS_CHRONO_ROUNDING == 1
-
-using std::chrono::floor;
-using std::chrono::ceil;
-using std::chrono::round;
-using std::chrono::abs;
-
-#endif  // HAS_CHRONO_ROUNDING
-
-// trunc towards zero
-template <class To, class Clock, class FromDuration>
-CONSTCD11
-inline
-std::chrono::time_point<Clock, To>
-trunc(const std::chrono::time_point<Clock, FromDuration>& tp)
-{
-    using std::chrono::time_point;
-    return time_point<Clock, To>{trunc<To>(tp.time_since_epoch())};
-}
-
-// day
-
-CONSTCD11 inline day::day(unsigned d) NOEXCEPT : d_(static_cast<unsigned char>(d)) {}
-CONSTCD14 inline day& day::operator++() NOEXCEPT {++d_; return *this;}
-CONSTCD14 inline day day::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
-CONSTCD14 inline day& day::operator--() NOEXCEPT {--d_; return *this;}
-CONSTCD14 inline day day::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
-CONSTCD14 inline day& day::operator+=(const days& d) NOEXCEPT {*this = *this + d; return *this;}
-CONSTCD14 inline day& day::operator-=(const days& d) NOEXCEPT {*this = *this - d; return *this;}
-CONSTCD11 inline day::operator unsigned() const NOEXCEPT {return d_;}
-CONSTCD11 inline bool day::ok() const NOEXCEPT {return 1 <= d_ && d_ <= 31;}
-
-CONSTCD11
-inline
-bool
-operator==(const day& x, const day& y) NOEXCEPT
-{
-    return static_cast<unsigned>(x) == static_cast<unsigned>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const day& x, const day& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const day& x, const day& y) NOEXCEPT
-{
-    return static_cast<unsigned>(x) < static_cast<unsigned>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator>(const day& x, const day& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const day& x, const day& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const day& x, const day& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-CONSTCD11
-inline
-days
-operator-(const day& x, const day& y) NOEXCEPT
-{
-    return days{static_cast<days::rep>(static_cast<unsigned>(x)
-                                     - static_cast<unsigned>(y))};
-}
-
-CONSTCD11
-inline
-day
-operator+(const day& x, const days& y) NOEXCEPT
-{
-    return day{static_cast<unsigned>(x) + static_cast<unsigned>(y.count())};
-}
-
-CONSTCD11
-inline
-day
-operator+(const days& x, const day& y) NOEXCEPT
-{
-    return y + x;
-}
-
-CONSTCD11
-inline
-day
-operator-(const day& x, const days& y) NOEXCEPT
-{
-    return x + -y;
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const day& d)
-{
-    detail::save_stream<CharT, Traits> _(os);
-    os.fill('0');
-    os.flags(std::ios::dec | std::ios::right);
-    os.width(2);
-    os << static_cast<unsigned>(d);
-    return os;
-}
-
-// month
-
-CONSTCD11 inline month::month(unsigned m) NOEXCEPT : m_(static_cast<decltype(m_)>(m)) {}
-CONSTCD14 inline month& month::operator++() NOEXCEPT {if (++m_ == 13) m_ = 1; return *this;}
-CONSTCD14 inline month month::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
-CONSTCD14 inline month& month::operator--() NOEXCEPT {if (--m_ == 0) m_ = 12; return *this;}
-CONSTCD14 inline month month::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
-
-CONSTCD14
-inline
-month&
-month::operator+=(const months& m) NOEXCEPT
-{
-    *this = *this + m;
-    return *this;
-}
-
-CONSTCD14
-inline
-month&
-month::operator-=(const months& m) NOEXCEPT
-{
-    *this = *this - m;
-    return *this;
-}
-
-CONSTCD11 inline month::operator unsigned() const NOEXCEPT {return m_;}
-CONSTCD11 inline bool month::ok() const NOEXCEPT {return 1 <= m_ && m_ <= 12;}
-
-CONSTCD11
-inline
-bool
-operator==(const month& x, const month& y) NOEXCEPT
-{
-    return static_cast<unsigned>(x) == static_cast<unsigned>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const month& x, const month& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const month& x, const month& y) NOEXCEPT
-{
-    return static_cast<unsigned>(x) < static_cast<unsigned>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator>(const month& x, const month& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const month& x, const month& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const month& x, const month& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-CONSTCD14
-inline
-months
-operator-(const month& x, const month& y) NOEXCEPT
-{
-    auto const d = static_cast<unsigned>(x) - static_cast<unsigned>(y);
-    return months(d <= 11 ? d : d + 12);
-}
-
-CONSTCD14
-inline
-month
-operator+(const month& x, const months& y) NOEXCEPT
-{
-    auto const mu = static_cast<long long>(static_cast<unsigned>(x)) - 1 + y.count();
-    auto const yr = (mu >= 0 ? mu : mu-11) / 12;
-    return month{static_cast<unsigned>(mu - yr * 12 + 1)};
-}
-
-CONSTCD14
-inline
-month
-operator+(const months& x, const month& y) NOEXCEPT
-{
-    return y + x;
-}
-
-CONSTCD14
-inline
-month
-operator-(const month& x, const months& y) NOEXCEPT
-{
-    return x + -y;
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month& m)
-{
-    switch (static_cast<unsigned>(m))
-    {
-    case 1:
-        os << "Jan";
-        break;
-    case 2:
-        os << "Feb";
-        break;
-    case 3:
-        os << "Mar";
-        break;
-    case 4:
-        os << "Apr";
-        break;
-    case 5:
-        os << "May";
-        break;
-    case 6:
-        os << "Jun";
-        break;
-    case 7:
-        os << "Jul";
-        break;
-    case 8:
-        os << "Aug";
-        break;
-    case 9:
-        os << "Sep";
-        break;
-    case 10:
-        os << "Oct";
-        break;
-    case 11:
-        os << "Nov";
-        break;
-    case 12:
-        os << "Dec";
-        break;
-    default:
-        os << static_cast<unsigned>(m) << " is not a valid month";
-        break;
-    }
-    return os;
-}
-
-// year
-
-CONSTCD11 inline year::year(int y) NOEXCEPT : y_(static_cast<decltype(y_)>(y)) {}
-CONSTCD14 inline year& year::operator++() NOEXCEPT {++y_; return *this;}
-CONSTCD14 inline year year::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
-CONSTCD14 inline year& year::operator--() NOEXCEPT {--y_; return *this;}
-CONSTCD14 inline year year::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
-CONSTCD14 inline year& year::operator+=(const years& y) NOEXCEPT {*this = *this + y; return *this;}
-CONSTCD14 inline year& year::operator-=(const years& y) NOEXCEPT {*this = *this - y; return *this;}
-CONSTCD11 inline year year::operator-() const NOEXCEPT {return year{-y_};}
-CONSTCD11 inline year year::operator+() const NOEXCEPT {return *this;}
-
-CONSTCD11
-inline
-bool
-year::is_leap() const NOEXCEPT
-{
-    return y_ % 4 == 0 && (y_ % 100 != 0 || y_ % 400 == 0);
-}
-
-CONSTCD11 inline year::operator int() const NOEXCEPT {return y_;}
-
-CONSTCD11
-inline
-bool
-year::ok() const NOEXCEPT
-{
-    return y_ != std::numeric_limits<short>::min();
-}
-
-CONSTCD11
-inline
-year
-year::min() NOEXCEPT
-{
-    return year{-32767};
-}
-
-CONSTCD11
-inline
-year
-year::max() NOEXCEPT
-{
-    return year{32767};
-}
-
-CONSTCD11
-inline
-bool
-operator==(const year& x, const year& y) NOEXCEPT
-{
-    return static_cast<int>(x) == static_cast<int>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const year& x, const year& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const year& x, const year& y) NOEXCEPT
-{
-    return static_cast<int>(x) < static_cast<int>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator>(const year& x, const year& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const year& x, const year& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const year& x, const year& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-CONSTCD11
-inline
-years
-operator-(const year& x, const year& y) NOEXCEPT
-{
-    return years{static_cast<int>(x) - static_cast<int>(y)};
-}
-
-CONSTCD11
-inline
-year
-operator+(const year& x, const years& y) NOEXCEPT
-{
-    return year{static_cast<int>(x) + y.count()};
-}
-
-CONSTCD11
-inline
-year
-operator+(const years& x, const year& y) NOEXCEPT
-{
-    return y + x;
-}
-
-CONSTCD11
-inline
-year
-operator-(const year& x, const years& y) NOEXCEPT
-{
-    return year{static_cast<int>(x) - y.count()};
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year& y)
-{
-    detail::save_stream<CharT, Traits> _(os);
-    os.fill('0');
-    os.flags(std::ios::dec | std::ios::internal);
-    os.width(4 + (y < year{0}));
-    os << static_cast<int>(y);
-    return os;
-}
-
-// weekday
-
-CONSTCD11
-inline
-unsigned char
-weekday::weekday_from_days(int z) NOEXCEPT
-{
-    return static_cast<unsigned char>(static_cast<unsigned>(
-        z >= -4 ? (z+4) % 7 : (z+5) % 7 + 6));
-}
-
-CONSTCD11
-inline
-weekday::weekday(unsigned wd) NOEXCEPT
-    : wd_(static_cast<decltype(wd_)>(wd))
-    {}
-
-CONSTCD11
-inline
-weekday::weekday(const sys_days& dp) NOEXCEPT
-    : wd_(weekday_from_days(dp.time_since_epoch().count()))
-    {}
-
-CONSTCD11
-inline
-weekday::weekday(const local_days& dp) NOEXCEPT
-    : wd_(weekday_from_days(dp.time_since_epoch().count()))
-    {}
-
-CONSTCD14 inline weekday& weekday::operator++() NOEXCEPT {if (++wd_ == 7) wd_ = 0; return *this;}
-CONSTCD14 inline weekday weekday::operator++(int) NOEXCEPT {auto tmp(*this); ++(*this); return tmp;}
-CONSTCD14 inline weekday& weekday::operator--() NOEXCEPT {if (wd_-- == 0) wd_ = 6; return *this;}
-CONSTCD14 inline weekday weekday::operator--(int) NOEXCEPT {auto tmp(*this); --(*this); return tmp;}
-
-CONSTCD14
-inline
-weekday&
-weekday::operator+=(const days& d) NOEXCEPT
-{
-    *this = *this + d;
-    return *this;
-}
-
-CONSTCD14
-inline
-weekday&
-weekday::operator-=(const days& d) NOEXCEPT
-{
-    *this = *this - d;
-    return *this;
-}
-
-CONSTCD11
-inline
-weekday::operator unsigned() const NOEXCEPT
-{
-    return static_cast<unsigned>(wd_);
-}
-
-CONSTCD11 inline bool weekday::ok() const NOEXCEPT {return wd_ <= 6;}
-
-CONSTCD11
-inline
-bool
-operator==(const weekday& x, const weekday& y) NOEXCEPT
-{
-    return static_cast<unsigned>(x) == static_cast<unsigned>(y);
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const weekday& x, const weekday& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD14
-inline
-days
-operator-(const weekday& x, const weekday& y) NOEXCEPT
-{
-    auto const diff = static_cast<unsigned>(x) - static_cast<unsigned>(y);
-    return days{diff <= 6 ? diff : diff + 7};
-}
-
-CONSTCD14
-inline
-weekday
-operator+(const weekday& x, const days& y) NOEXCEPT
-{
-    auto const wdu = static_cast<long long>(static_cast<unsigned>(x)) + y.count();
-    auto const wk = (wdu >= 0 ? wdu : wdu-6) / 7;
-    return weekday{static_cast<unsigned>(wdu - wk * 7)};
-}
-
-CONSTCD14
-inline
-weekday
-operator+(const days& x, const weekday& y) NOEXCEPT
-{
-    return y + x;
-}
-
-CONSTCD14
-inline
-weekday
-operator-(const weekday& x, const days& y) NOEXCEPT
-{
-    return x + -y;
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const weekday& wd)
-{
-    switch (static_cast<unsigned>(wd))
-    {
-    case 0:
-        os << "Sun";
-        break;
-    case 1:
-        os << "Mon";
-        break;
-    case 2:
-        os << "Tue";
-        break;
-    case 3:
-        os << "Wed";
-        break;
-    case 4:
-        os << "Thu";
-        break;
-    case 5:
-        os << "Fri";
-        break;
-    case 6:
-        os << "Sat";
-        break;
-    default:
-        os << static_cast<unsigned>(wd) << " is not a valid weekday";
-        break;
-    }
-    return os;
-}
-
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
-inline namespace literals
-{
-
-CONSTCD11
-inline
-date::day
-operator "" _d(unsigned long long d) NOEXCEPT
-{
-    return date::day{static_cast<unsigned>(d)};
-}
-
-CONSTCD11
-inline
-date::year
-operator "" _y(unsigned long long y) NOEXCEPT
-{
-    return date::year(static_cast<int>(y));
-}
-#endif  // !defined(_MSC_VER) || (_MSC_VER >= 1900)
-
-CONSTDATA date::last_spec last{};
-
-CONSTDATA date::month jan{1};
-CONSTDATA date::month feb{2};
-CONSTDATA date::month mar{3};
-CONSTDATA date::month apr{4};
-CONSTDATA date::month may{5};
-CONSTDATA date::month jun{6};
-CONSTDATA date::month jul{7};
-CONSTDATA date::month aug{8};
-CONSTDATA date::month sep{9};
-CONSTDATA date::month oct{10};
-CONSTDATA date::month nov{11};
-CONSTDATA date::month dec{12};
-
-CONSTDATA date::weekday sun{0u};
-CONSTDATA date::weekday mon{1u};
-CONSTDATA date::weekday tue{2u};
-CONSTDATA date::weekday wed{3u};
-CONSTDATA date::weekday thu{4u};
-CONSTDATA date::weekday fri{5u};
-CONSTDATA date::weekday sat{6u};
-
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
-}  // inline namespace literals
-#endif
-
-// weekday_indexed
-
-CONSTCD11
-inline
-weekday
-weekday_indexed::weekday() const NOEXCEPT
-{
-    return date::weekday{static_cast<unsigned>(wd_)};
-}
-
-CONSTCD11 inline unsigned weekday_indexed::index() const NOEXCEPT {return index_;}
-
-CONSTCD11
-inline
-bool
-weekday_indexed::ok() const NOEXCEPT
-{
-    return weekday().ok() && 1 <= index_ && index_ <= 5;
-}
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Wconversion"
-#endif  // __GNUC__
-
-CONSTCD11
-inline
-weekday_indexed::weekday_indexed(const date::weekday& wd, unsigned index) NOEXCEPT
-    : wd_(static_cast<decltype(wd_)>(static_cast<unsigned>(wd)))
-    , index_(static_cast<decltype(index_)>(index))
-    {}
-
-#ifdef __GNUC__
-#  pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_indexed& wdi)
-{
-    return os << wdi.weekday() << '[' << wdi.index() << ']';
-}
-
-CONSTCD11
-inline
-weekday_indexed
-weekday::operator[](unsigned index) const NOEXCEPT
-{
-    return {*this, index};
-}
-
-CONSTCD11
-inline
-bool
-operator==(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT
-{
-    return x.weekday() == y.weekday() && x.index() == y.index();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const weekday_indexed& x, const weekday_indexed& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-// weekday_last
-
-CONSTCD11 inline date::weekday weekday_last::weekday() const NOEXCEPT {return wd_;}
-CONSTCD11 inline bool weekday_last::ok() const NOEXCEPT {return wd_.ok();}
-CONSTCD11 inline weekday_last::weekday_last(const date::weekday& wd) NOEXCEPT : wd_(wd) {}
-
-CONSTCD11
-inline
-bool
-operator==(const weekday_last& x, const weekday_last& y) NOEXCEPT
-{
-    return x.weekday() == y.weekday();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const weekday_last& x, const weekday_last& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const weekday_last& wdl)
-{
-    return os << wdl.weekday() << "[last]";
-}
-
-CONSTCD11
-inline
-weekday_last
-weekday::operator[](last_spec) const NOEXCEPT
-{
-    return weekday_last{*this};
-}
-
-// year_month
-
-CONSTCD11
-inline
-year_month::year_month(const date::year& y, const date::month& m) NOEXCEPT
-    : y_(y)
-    , m_(m)
-    {}
-
-CONSTCD11 inline year year_month::year() const NOEXCEPT {return y_;}
-CONSTCD11 inline month year_month::month() const NOEXCEPT {return m_;}
-CONSTCD11 inline bool year_month::ok() const NOEXCEPT {return y_.ok() && m_.ok();}
-
-CONSTCD14
-inline
-year_month&
-year_month::operator+=(const months& dm) NOEXCEPT
-{
-    *this = *this + dm;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month&
-year_month::operator-=(const months& dm) NOEXCEPT
-{
-    *this = *this - dm;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month&
-year_month::operator+=(const years& dy) NOEXCEPT
-{
-    *this = *this + dy;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month&
-year_month::operator-=(const years& dy) NOEXCEPT
-{
-    *this = *this - dy;
-    return *this;
-}
-
-CONSTCD11
-inline
-bool
-operator==(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return x.year() == y.year() && x.month() == y.month();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return x.year() < y.year() ? true
-        : (x.year() > y.year() ? false
-        : (x.month() < y.month()));
-}
-
-CONSTCD11
-inline
-bool
-operator>(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-CONSTCD14
-inline
-year_month
-operator+(const year_month& ym, const months& dm) NOEXCEPT
-{
-    auto dmi = static_cast<int>(static_cast<unsigned>(ym.month())) - 1 + dm.count();
-    auto dy = (dmi >= 0 ? dmi : dmi-11) / 12;
-    dmi = dmi - dy * 12 + 1;
-    return (ym.year() + years(dy)) / month(static_cast<unsigned>(dmi));
-}
-
-CONSTCD14
-inline
-year_month
-operator+(const months& dm, const year_month& ym) NOEXCEPT
-{
-    return ym + dm;
-}
-
-CONSTCD14
-inline
-year_month
-operator-(const year_month& ym, const months& dm) NOEXCEPT
-{
-    return ym + -dm;
-}
-
-CONSTCD11
-inline
-months
-operator-(const year_month& x, const year_month& y) NOEXCEPT
-{
-    return (x.year() - y.year()) +
-            months(static_cast<unsigned>(x.month()) - static_cast<unsigned>(y.month()));
-}
-
-CONSTCD11
-inline
-year_month
-operator+(const year_month& ym, const years& dy) NOEXCEPT
-{
-    return (ym.year() + dy) / ym.month();
-}
-
-CONSTCD11
-inline
-year_month
-operator+(const years& dy, const year_month& ym) NOEXCEPT
-{
-    return ym + dy;
-}
-
-CONSTCD11
-inline
-year_month
-operator-(const year_month& ym, const years& dy) NOEXCEPT
-{
-    return ym + -dy;
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month& ym)
-{
-    return os << ym.year() << '/' << ym.month();
-}
-
-// month_day
-
-CONSTCD11
-inline
-month_day::month_day(const date::month& m, const date::day& d) NOEXCEPT
-    : m_(m)
-    , d_(d)
-    {}
-
-CONSTCD11 inline date::month month_day::month() const NOEXCEPT {return m_;}
-CONSTCD11 inline date::day month_day::day() const NOEXCEPT {return d_;}
-
-CONSTCD14
-inline
-bool
-month_day::ok() const NOEXCEPT
-{
-    CONSTDATA date::day d[] =
-    {
-        date::day(31), date::day(29), date::day(31),
-        date::day(30), date::day(31), date::day(30),
-        date::day(31), date::day(31), date::day(30),
-        date::day(31), date::day(30), date::day(31)
-    };
-    return m_.ok() && date::day{1} <= d_ && d_ <= d[static_cast<unsigned>(m_)-1];
-}
-
-CONSTCD11
-inline
-bool
-operator==(const month_day& x, const month_day& y) NOEXCEPT
-{
-    return x.month() == y.month() && x.day() == y.day();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const month_day& x, const month_day& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const month_day& x, const month_day& y) NOEXCEPT
-{
-    return x.month() < y.month() ? true
-        : (x.month() > y.month() ? false
-        : (x.day() < y.day()));
-}
-
-CONSTCD11
-inline
-bool
-operator>(const month_day& x, const month_day& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const month_day& x, const month_day& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const month_day& x, const month_day& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_day& md)
-{
-    return os << md.month() << '/' << md.day();
-}
-
-// month_day_last
-
-CONSTCD11 inline month month_day_last::month() const NOEXCEPT {return m_;}
-CONSTCD11 inline bool month_day_last::ok() const NOEXCEPT {return m_.ok();}
-CONSTCD11 inline month_day_last::month_day_last(const date::month& m) NOEXCEPT : m_(m) {}
-
-CONSTCD11
-inline
-bool
-operator==(const month_day_last& x, const month_day_last& y) NOEXCEPT
-{
-    return x.month() == y.month();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const month_day_last& x, const month_day_last& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const month_day_last& x, const month_day_last& y) NOEXCEPT
-{
-    return x.month() < y.month();
-}
-
-CONSTCD11
-inline
-bool
-operator>(const month_day_last& x, const month_day_last& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const month_day_last& x, const month_day_last& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const month_day_last& x, const month_day_last& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_day_last& mdl)
-{
-    return os << mdl.month() << "/last";
-}
-
-// month_weekday
-
-CONSTCD11
-inline
-month_weekday::month_weekday(const date::month& m,
-                             const date::weekday_indexed& wdi) NOEXCEPT
-    : m_(m)
-    , wdi_(wdi)
-    {}
-
-CONSTCD11 inline month month_weekday::month() const NOEXCEPT {return m_;}
-
-CONSTCD11
-inline
-weekday_indexed
-month_weekday::weekday_indexed() const NOEXCEPT
-{
-    return wdi_;
-}
-
-CONSTCD11
-inline
-bool
-month_weekday::ok() const NOEXCEPT
-{
-    return m_.ok() && wdi_.ok();
-}
-
-CONSTCD11
-inline
-bool
-operator==(const month_weekday& x, const month_weekday& y) NOEXCEPT
-{
-    return x.month() == y.month() && x.weekday_indexed() == y.weekday_indexed();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const month_weekday& x, const month_weekday& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday& mwd)
-{
-    return os << mwd.month() << '/' << mwd.weekday_indexed();
-}
-
-// month_weekday_last
-
-CONSTCD11
-inline
-month_weekday_last::month_weekday_last(const date::month& m,
-                                       const date::weekday_last& wdl) NOEXCEPT
-    : m_(m)
-    , wdl_(wdl)
-    {}
-
-CONSTCD11 inline month month_weekday_last::month() const NOEXCEPT {return m_;}
-
-CONSTCD11
-inline
-weekday_last
-month_weekday_last::weekday_last() const NOEXCEPT
-{
-    return wdl_;
-}
-
-CONSTCD11
-inline
-bool
-month_weekday_last::ok() const NOEXCEPT
-{
-    return m_.ok() && wdl_.ok();
-}
-
-CONSTCD11
-inline
-bool
-operator==(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT
-{
-    return x.month() == y.month() && x.weekday_last() == y.weekday_last();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const month_weekday_last& x, const month_weekday_last& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const month_weekday_last& mwdl)
-{
-    return os << mwdl.month() << '/' << mwdl.weekday_last();
-}
-
-// year_month_day_last
-
-CONSTCD11
-inline
-year_month_day_last::year_month_day_last(const date::year& y,
-                                         const date::month_day_last& mdl) NOEXCEPT
-    : y_(y)
-    , mdl_(mdl)
-    {}
-
-CONSTCD14
-inline
-year_month_day_last&
-year_month_day_last::operator+=(const months& m) NOEXCEPT
-{
-    *this = *this + m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_day_last&
-year_month_day_last::operator-=(const months& m) NOEXCEPT
-{
-    *this = *this - m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_day_last&
-year_month_day_last::operator+=(const years& y) NOEXCEPT
-{
-    *this = *this + y;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_day_last&
-year_month_day_last::operator-=(const years& y) NOEXCEPT
-{
-    *this = *this - y;
-    return *this;
-}
-
-CONSTCD11 inline year year_month_day_last::year() const NOEXCEPT {return y_;}
-CONSTCD11 inline month year_month_day_last::month() const NOEXCEPT {return mdl_.month();}
-
-CONSTCD11
-inline
-month_day_last
-year_month_day_last::month_day_last() const NOEXCEPT
-{
-    return mdl_;
-}
-
-CONSTCD14
-inline
-day
-year_month_day_last::day() const NOEXCEPT
-{
-    CONSTDATA date::day d[] =
-    {
-        date::day(31), date::day(28), date::day(31),
-        date::day(30), date::day(31), date::day(30),
-        date::day(31), date::day(31), date::day(30),
-        date::day(31), date::day(30), date::day(31)
-    };
-    return month() != feb || !y_.is_leap() ?
-        d[static_cast<unsigned>(month()) - 1] : date::day{29};
-}
-
-CONSTCD14
-inline
-year_month_day_last::operator sys_days() const NOEXCEPT
-{
-    return sys_days(year()/month()/day());
-}
-
-CONSTCD14
-inline
-year_month_day_last::operator local_days() const NOEXCEPT
-{
-    return local_days(year()/month()/day());
-}
-
-CONSTCD11
-inline
-bool
-year_month_day_last::ok() const NOEXCEPT
-{
-    return y_.ok() && mdl_.ok();
-}
-
-CONSTCD11
-inline
-bool
-operator==(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
-{
-    return x.year() == y.year() && x.month_day_last() == y.month_day_last();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
-{
-    return x.year() < y.year() ? true
-        : (x.year() > y.year() ? false
-        : (x.month_day_last() < y.month_day_last()));
-}
-
-CONSTCD11
-inline
-bool
-operator>(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const year_month_day_last& x, const year_month_day_last& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day_last& ymdl)
-{
-    return os << ymdl.year() << '/' << ymdl.month_day_last();
-}
-
-CONSTCD14
-inline
-year_month_day_last
-operator+(const year_month_day_last& ymdl, const months& dm) NOEXCEPT
-{
-    return (ymdl.year() / ymdl.month() + dm) / last;
-}
-
-CONSTCD14
-inline
-year_month_day_last
-operator+(const months& dm, const year_month_day_last& ymdl) NOEXCEPT
-{
-    return ymdl + dm;
-}
-
-CONSTCD14
-inline
-year_month_day_last
-operator-(const year_month_day_last& ymdl, const months& dm) NOEXCEPT
-{
-    return ymdl + (-dm);
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator+(const year_month_day_last& ymdl, const years& dy) NOEXCEPT
-{
-    return {ymdl.year()+dy, ymdl.month_day_last()};
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator+(const years& dy, const year_month_day_last& ymdl) NOEXCEPT
-{
-    return ymdl + dy;
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator-(const year_month_day_last& ymdl, const years& dy) NOEXCEPT
-{
-    return ymdl + (-dy);
-}
-
-// year_month_day
-
-CONSTCD11
-inline
-year_month_day::year_month_day(const date::year& y, const date::month& m,
-                               const date::day& d) NOEXCEPT
-    : y_(y)
-    , m_(m)
-    , d_(d)
-    {}
-
-CONSTCD14
-inline
-year_month_day::year_month_day(const year_month_day_last& ymdl) NOEXCEPT
-    : y_(ymdl.year())
-    , m_(ymdl.month())
-    , d_(ymdl.day())
-    {}
-
-CONSTCD14
-inline
-year_month_day::year_month_day(sys_days dp) NOEXCEPT
-    : year_month_day(from_days(dp.time_since_epoch()))
-    {}
-
-CONSTCD14
-inline
-year_month_day::year_month_day(local_days dp) NOEXCEPT
-    : year_month_day(from_days(dp.time_since_epoch()))
-    {}
-
-CONSTCD11 inline year year_month_day::year() const NOEXCEPT {return y_;}
-CONSTCD11 inline month year_month_day::month() const NOEXCEPT {return m_;}
-CONSTCD11 inline day year_month_day::day() const NOEXCEPT {return d_;}
-
-CONSTCD14
-inline
-year_month_day&
-year_month_day::operator+=(const months& m) NOEXCEPT
-{
-    *this = *this + m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_day&
-year_month_day::operator-=(const months& m) NOEXCEPT
-{
-    *this = *this - m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_day&
-year_month_day::operator+=(const years& y) NOEXCEPT
-{
-    *this = *this + y;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_day&
-year_month_day::operator-=(const years& y) NOEXCEPT
-{
-    *this = *this - y;
-    return *this;
-}
-
-CONSTCD14
-inline
-days
-year_month_day::to_days() const NOEXCEPT
-{
-    static_assert(std::numeric_limits<unsigned>::digits >= 18,
-             "This algorithm has not been ported to a 16 bit unsigned integer");
-    static_assert(std::numeric_limits<int>::digits >= 20,
-             "This algorithm has not been ported to a 16 bit signed integer");
-    auto const y = static_cast<int>(y_) - (m_ <= feb);
-    auto const m = static_cast<unsigned>(m_);
-    auto const d = static_cast<unsigned>(d_);
-    auto const era = (y >= 0 ? y : y-399) / 400;
-    auto const yoe = static_cast<unsigned>(y - era * 400);       // [0, 399]
-    auto const doy = (153*(m > 2 ? m-3 : m+9) + 2)/5 + d-1;      // [0, 365]
-    auto const doe = yoe * 365 + yoe/4 - yoe/100 + doy;          // [0, 146096]
-    return days{era * 146097 + static_cast<int>(doe) - 719468};
-}
-
-CONSTCD14
-inline
-year_month_day::operator sys_days() const NOEXCEPT
-{
-    return sys_days{to_days()};
-}
-
-CONSTCD14
-inline
-year_month_day::operator local_days() const NOEXCEPT
-{
-    return local_days{to_days()};
-}
-
-CONSTCD14
-inline
-bool
-year_month_day::ok() const NOEXCEPT
-{
-    if (!(y_.ok() && m_.ok()))
-        return false;
-    return date::day{1} <= d_ && d_ <= (y_ / m_ / last).day();
-}
-
-CONSTCD11
-inline
-bool
-operator==(const year_month_day& x, const year_month_day& y) NOEXCEPT
-{
-    return x.year() == y.year() && x.month() == y.month() && x.day() == y.day();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const year_month_day& x, const year_month_day& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-CONSTCD11
-inline
-bool
-operator<(const year_month_day& x, const year_month_day& y) NOEXCEPT
-{
-    return x.year() < y.year() ? true
-        : (x.year() > y.year() ? false
-        : (x.month() < y.month() ? true
-        : (x.month() > y.month() ? false
-        : (x.day() < y.day()))));
-}
-
-CONSTCD11
-inline
-bool
-operator>(const year_month_day& x, const year_month_day& y) NOEXCEPT
-{
-    return y < x;
-}
-
-CONSTCD11
-inline
-bool
-operator<=(const year_month_day& x, const year_month_day& y) NOEXCEPT
-{
-    return !(y < x);
-}
-
-CONSTCD11
-inline
-bool
-operator>=(const year_month_day& x, const year_month_day& y) NOEXCEPT
-{
-    return !(x < y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_day& ymd)
-{
-    detail::save_stream<CharT, Traits> _(os);
-    os.fill('0');
-    os.flags(std::ios::dec | std::ios::right);
-    os << ymd.year() << '-';
-    os.width(2);
-    os << static_cast<unsigned>(ymd.month()) << '-';
-    os << ymd.day();
-    return os;
-}
-
-CONSTCD14
-inline
-year_month_day
-year_month_day::from_days(days dp) NOEXCEPT
-{
-    static_assert(std::numeric_limits<unsigned>::digits >= 18,
-             "This algorithm has not been ported to a 16 bit unsigned integer");
-    static_assert(std::numeric_limits<int>::digits >= 20,
-             "This algorithm has not been ported to a 16 bit signed integer");
-    auto const z = dp.count() + 719468;
-    auto const era = (z >= 0 ? z : z - 146096) / 146097;
-    auto const doe = static_cast<unsigned>(z - era * 146097);          // [0, 146096]
-    auto const yoe = (doe - doe/1460 + doe/36524 - doe/146096) / 365;  // [0, 399]
-    auto const y = static_cast<days::rep>(yoe) + era * 400;
-    auto const doy = doe - (365*yoe + yoe/4 - yoe/100);                // [0, 365]
-    auto const mp = (5*doy + 2)/153;                                   // [0, 11]
-    auto const d = doy - (153*mp+2)/5 + 1;                             // [1, 31]
-    auto const m = mp < 10 ? mp+3 : mp-9;                              // [1, 12]
-    return year_month_day{date::year{y + (m <= 2)}, date::month(m), date::day(d)};
-}
-
-CONSTCD14
-inline
-year_month_day
-operator+(const year_month_day& ymd, const months& dm) NOEXCEPT
-{
-    return (ymd.year() / ymd.month() + dm) / ymd.day();
-}
-
-CONSTCD14
-inline
-year_month_day
-operator+(const months& dm, const year_month_day& ymd) NOEXCEPT
-{
-    return ymd + dm;
-}
-
-CONSTCD14
-inline
-year_month_day
-operator-(const year_month_day& ymd, const months& dm) NOEXCEPT
-{
-    return ymd + (-dm);
-}
-
-CONSTCD11
-inline
-year_month_day
-operator+(const year_month_day& ymd, const years& dy) NOEXCEPT
-{
-    return (ymd.year() + dy) / ymd.month() / ymd.day();
-}
-
-CONSTCD11
-inline
-year_month_day
-operator+(const years& dy, const year_month_day& ymd) NOEXCEPT
-{
-    return ymd + dy;
-}
-
-CONSTCD11
-inline
-year_month_day
-operator-(const year_month_day& ymd, const years& dy) NOEXCEPT
-{
-    return ymd + (-dy);
-}
-
-// year_month_weekday
-
-CONSTCD11
-inline
-year_month_weekday::year_month_weekday(const date::year& y, const date::month& m,
-                                       const date::weekday_indexed& wdi)
-        NOEXCEPT
-    : y_(y)
-    , m_(m)
-    , wdi_(wdi)
-    {}
-
-CONSTCD14
-inline
-year_month_weekday::year_month_weekday(const sys_days& dp) NOEXCEPT
-    : year_month_weekday(from_days(dp.time_since_epoch()))
-    {}
-
-CONSTCD14
-inline
-year_month_weekday::year_month_weekday(const local_days& dp) NOEXCEPT
-    : year_month_weekday(from_days(dp.time_since_epoch()))
-    {}
-
-CONSTCD14
-inline
-year_month_weekday&
-year_month_weekday::operator+=(const months& m) NOEXCEPT
-{
-    *this = *this + m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_weekday&
-year_month_weekday::operator-=(const months& m) NOEXCEPT
-{
-    *this = *this - m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_weekday&
-year_month_weekday::operator+=(const years& y) NOEXCEPT
-{
-    *this = *this + y;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_weekday&
-year_month_weekday::operator-=(const years& y) NOEXCEPT
-{
-    *this = *this - y;
-    return *this;
-}
-
-CONSTCD11 inline year year_month_weekday::year() const NOEXCEPT {return y_;}
-CONSTCD11 inline month year_month_weekday::month() const NOEXCEPT {return m_;}
-
-CONSTCD11
-inline
-weekday
-year_month_weekday::weekday() const NOEXCEPT
-{
-    return wdi_.weekday();
-}
-
-CONSTCD11
-inline
-unsigned
-year_month_weekday::index() const NOEXCEPT
-{
-    return wdi_.index();
-}
-
-CONSTCD11
-inline
-weekday_indexed
-year_month_weekday::weekday_indexed() const NOEXCEPT
-{
-    return wdi_;
-}
-
-CONSTCD14
-inline
-year_month_weekday::operator sys_days() const NOEXCEPT
-{
-    return sys_days{to_days()};
-}
-
-CONSTCD14
-inline
-year_month_weekday::operator local_days() const NOEXCEPT
-{
-    return local_days{to_days()};
-}
-
-CONSTCD14
-inline
-bool
-year_month_weekday::ok() const NOEXCEPT
-{
-    if (!y_.ok() || !m_.ok() || !wdi_.weekday().ok() || wdi_.index() < 1)
-        return false;
-    if (wdi_.index() <= 4)
-        return true;
-    auto d2 = wdi_.weekday() - date::weekday(static_cast<sys_days>(y_/m_/1)) + days((wdi_.index()-1)*7 + 1);
-    return static_cast<unsigned>(d2.count()) <= static_cast<unsigned>((y_/m_/last).day());
-}
-
-CONSTCD14
-inline
-year_month_weekday
-year_month_weekday::from_days(days d) NOEXCEPT
-{
-    sys_days dp{d};
-    auto const wd = date::weekday(dp);
-    auto const ymd = year_month_day(dp);
-    return {ymd.year(), ymd.month(), wd[(static_cast<unsigned>(ymd.day())-1)/7+1]};
-}
-
-CONSTCD14
-inline
-days
-year_month_weekday::to_days() const NOEXCEPT
-{
-    auto d = sys_days(y_/m_/1);
-    return (d + (wdi_.weekday() - date::weekday(d) + days{(wdi_.index()-1)*7})
-           ).time_since_epoch();
-}
-
-CONSTCD11
-inline
-bool
-operator==(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT
-{
-    return x.year() == y.year() && x.month() == y.month() &&
-           x.weekday_indexed() == y.weekday_indexed();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const year_month_weekday& x, const year_month_weekday& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday& ymwdi)
-{
-    return os << ymwdi.year() << '/' << ymwdi.month()
-              << '/' << ymwdi.weekday_indexed();
-}
-
-CONSTCD14
-inline
-year_month_weekday
-operator+(const year_month_weekday& ymwd, const months& dm) NOEXCEPT
-{
-    return (ymwd.year() / ymwd.month() + dm) / ymwd.weekday_indexed();
-}
-
-CONSTCD14
-inline
-year_month_weekday
-operator+(const months& dm, const year_month_weekday& ymwd) NOEXCEPT
-{
-    return ymwd + dm;
-}
-
-CONSTCD14
-inline
-year_month_weekday
-operator-(const year_month_weekday& ymwd, const months& dm) NOEXCEPT
-{
-    return ymwd + (-dm);
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator+(const year_month_weekday& ymwd, const years& dy) NOEXCEPT
-{
-    return {ymwd.year()+dy, ymwd.month(), ymwd.weekday_indexed()};
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator+(const years& dy, const year_month_weekday& ymwd) NOEXCEPT
-{
-    return ymwd + dy;
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator-(const year_month_weekday& ymwd, const years& dy) NOEXCEPT
-{
-    return ymwd + (-dy);
-}
-
-// year_month_weekday_last
-
-CONSTCD11
-inline
-year_month_weekday_last::year_month_weekday_last(const date::year& y,
-                                                 const date::month& m,
-                                                 const date::weekday_last& wdl) NOEXCEPT
-    : y_(y)
-    , m_(m)
-    , wdl_(wdl)
-    {}
-
-CONSTCD14
-inline
-year_month_weekday_last&
-year_month_weekday_last::operator+=(const months& m) NOEXCEPT
-{
-    *this = *this + m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_weekday_last&
-year_month_weekday_last::operator-=(const months& m) NOEXCEPT
-{
-    *this = *this - m;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_weekday_last&
-year_month_weekday_last::operator+=(const years& y) NOEXCEPT
-{
-    *this = *this + y;
-    return *this;
-}
-
-CONSTCD14
-inline
-year_month_weekday_last&
-year_month_weekday_last::operator-=(const years& y) NOEXCEPT
-{
-    *this = *this - y;
-    return *this;
-}
-
-CONSTCD11 inline year year_month_weekday_last::year() const NOEXCEPT {return y_;}
-CONSTCD11 inline month year_month_weekday_last::month() const NOEXCEPT {return m_;}
-
-CONSTCD11
-inline
-weekday
-year_month_weekday_last::weekday() const NOEXCEPT
-{
-    return wdl_.weekday();
-}
-
-CONSTCD11
-inline
-weekday_last
-year_month_weekday_last::weekday_last() const NOEXCEPT
-{
-    return wdl_;
-}
-
-CONSTCD14
-inline
-year_month_weekday_last::operator sys_days() const NOEXCEPT
-{
-    return sys_days{to_days()};
-}
-
-CONSTCD14
-inline
-year_month_weekday_last::operator local_days() const NOEXCEPT
-{
-    return local_days{to_days()};
-}
-
-CONSTCD11
-inline
-bool
-year_month_weekday_last::ok() const NOEXCEPT
-{
-    return y_.ok() && m_.ok() && wdl_.ok();
-}
-
-CONSTCD14
-inline
-days
-year_month_weekday_last::to_days() const NOEXCEPT
-{
-    auto const d = sys_days(y_/m_/last);
-    return (d - (date::weekday{d} - wdl_.weekday())).time_since_epoch();
-}
-
-CONSTCD11
-inline
-bool
-operator==(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT
-{
-    return x.year() == y.year() && x.month() == y.month() &&
-           x.weekday_last() == y.weekday_last();
-}
-
-CONSTCD11
-inline
-bool
-operator!=(const year_month_weekday_last& x, const year_month_weekday_last& y) NOEXCEPT
-{
-    return !(x == y);
-}
-
-template<class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const year_month_weekday_last& ymwdl)
-{
-    return os << ymwdl.year() << '/' << ymwdl.month() << '/' << ymwdl.weekday_last();
-}
-
-CONSTCD14
-inline
-year_month_weekday_last
-operator+(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT
-{
-    return (ymwdl.year() / ymwdl.month() + dm) / ymwdl.weekday_last();
-}
-
-CONSTCD14
-inline
-year_month_weekday_last
-operator+(const months& dm, const year_month_weekday_last& ymwdl) NOEXCEPT
-{
-    return ymwdl + dm;
-}
-
-CONSTCD14
-inline
-year_month_weekday_last
-operator-(const year_month_weekday_last& ymwdl, const months& dm) NOEXCEPT
-{
-    return ymwdl + (-dm);
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator+(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT
-{
-    return {ymwdl.year()+dy, ymwdl.month(), ymwdl.weekday_last()};
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator+(const years& dy, const year_month_weekday_last& ymwdl) NOEXCEPT
-{
-    return ymwdl + dy;
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator-(const year_month_weekday_last& ymwdl, const years& dy) NOEXCEPT
-{
-    return ymwdl + (-dy);
-}
-
-// year_month from operator/()
-
-CONSTCD11
-inline
-year_month
-operator/(const year& y, const month& m) NOEXCEPT
-{
-    return {y, m};
-}
-
-CONSTCD11
-inline
-year_month
-operator/(const year& y, int   m) NOEXCEPT
-{
-    return y / month(static_cast<unsigned>(m));
-}
-
-// month_day from operator/()
-
-CONSTCD11
-inline
-month_day
-operator/(const month& m, const day& d) NOEXCEPT
-{
-    return {m, d};
-}
-
-CONSTCD11
-inline
-month_day
-operator/(const day& d, const month& m) NOEXCEPT
-{
-    return m / d;
-}
-
-CONSTCD11
-inline
-month_day
-operator/(const month& m, int d) NOEXCEPT
-{
-    return m / day(static_cast<unsigned>(d));
-}
-
-CONSTCD11
-inline
-month_day
-operator/(int m, const day& d) NOEXCEPT
-{
-    return month(static_cast<unsigned>(m)) / d;
-}
-
-CONSTCD11 inline month_day operator/(const day& d, int m) NOEXCEPT {return m / d;}
-
-// month_day_last from operator/()
-
-CONSTCD11
-inline
-month_day_last
-operator/(const month& m, last_spec) NOEXCEPT
-{
-    return month_day_last{m};
-}
-
-CONSTCD11
-inline
-month_day_last
-operator/(last_spec, const month& m) NOEXCEPT
-{
-    return m/last;
-}
-
-CONSTCD11
-inline
-month_day_last
-operator/(int m, last_spec) NOEXCEPT
-{
-    return month(static_cast<unsigned>(m))/last;
-}
-
-CONSTCD11
-inline
-month_day_last
-operator/(last_spec, int m) NOEXCEPT
-{
-    return m/last;
-}
-
-// month_weekday from operator/()
-
-CONSTCD11
-inline
-month_weekday
-operator/(const month& m, const weekday_indexed& wdi) NOEXCEPT
-{
-    return {m, wdi};
-}
-
-CONSTCD11
-inline
-month_weekday
-operator/(const weekday_indexed& wdi, const month& m) NOEXCEPT
-{
-    return m / wdi;
-}
-
-CONSTCD11
-inline
-month_weekday
-operator/(int m, const weekday_indexed& wdi) NOEXCEPT
-{
-    return month(static_cast<unsigned>(m)) / wdi;
-}
-
-CONSTCD11
-inline
-month_weekday
-operator/(const weekday_indexed& wdi, int m) NOEXCEPT
-{
-    return m / wdi;
-}
-
-// month_weekday_last from operator/()
-
-CONSTCD11
-inline
-month_weekday_last
-operator/(const month& m, const weekday_last& wdl) NOEXCEPT
-{
-    return {m, wdl};
-}
-
-CONSTCD11
-inline
-month_weekday_last
-operator/(const weekday_last& wdl, const month& m) NOEXCEPT
-{
-    return m / wdl;
-}
-
-CONSTCD11
-inline
-month_weekday_last
-operator/(int m, const weekday_last& wdl) NOEXCEPT
-{
-    return month(static_cast<unsigned>(m)) / wdl;
-}
-
-CONSTCD11
-inline
-month_weekday_last
-operator/(const weekday_last& wdl, int m) NOEXCEPT
-{
-    return m / wdl;
-}
-
-// year_month_day from operator/()
-
-CONSTCD11
-inline
-year_month_day
-operator/(const year_month& ym, const day& d) NOEXCEPT
-{
-    return {ym.year(), ym.month(), d};
-}
-
-CONSTCD11
-inline
-year_month_day
-operator/(const year_month& ym, int d)  NOEXCEPT
-{
-    return ym / day(static_cast<unsigned>(d));
-}
-
-CONSTCD11
-inline
-year_month_day
-operator/(const year& y, const month_day& md) NOEXCEPT
-{
-    return y / md.month() / md.day();
-}
-
-CONSTCD11
-inline
-year_month_day
-operator/(int y, const month_day& md) NOEXCEPT
-{
-    return year(y) / md;
-}
-
-CONSTCD11
-inline
-year_month_day
-operator/(const month_day& md, const year& y)  NOEXCEPT
-{
-    return y / md;
-}
-
-CONSTCD11
-inline
-year_month_day
-operator/(const month_day& md, int y) NOEXCEPT
-{
-    return year(y) / md;
-}
-
-// year_month_day_last from operator/()
-
-CONSTCD11
-inline
-year_month_day_last
-operator/(const year_month& ym, last_spec) NOEXCEPT
-{
-    return {ym.year(), month_day_last{ym.month()}};
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator/(const year& y, const month_day_last& mdl) NOEXCEPT
-{
-    return {y, mdl};
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator/(int y, const month_day_last& mdl) NOEXCEPT
-{
-    return year(y) / mdl;
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator/(const month_day_last& mdl, const year& y) NOEXCEPT
-{
-    return y / mdl;
-}
-
-CONSTCD11
-inline
-year_month_day_last
-operator/(const month_day_last& mdl, int y) NOEXCEPT
-{
-    return year(y) / mdl;
-}
-
-// year_month_weekday from operator/()
-
-CONSTCD11
-inline
-year_month_weekday
-operator/(const year_month& ym, const weekday_indexed& wdi) NOEXCEPT
-{
-    return {ym.year(), ym.month(), wdi};
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator/(const year& y, const month_weekday& mwd) NOEXCEPT
-{
-    return {y, mwd.month(), mwd.weekday_indexed()};
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator/(int y, const month_weekday& mwd) NOEXCEPT
-{
-    return year(y) / mwd;
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator/(const month_weekday& mwd, const year& y) NOEXCEPT
-{
-    return y / mwd;
-}
-
-CONSTCD11
-inline
-year_month_weekday
-operator/(const month_weekday& mwd, int y) NOEXCEPT
-{
-    return year(y) / mwd;
-}
-
-// year_month_weekday_last from operator/()
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator/(const year_month& ym, const weekday_last& wdl) NOEXCEPT
-{
-    return {ym.year(), ym.month(), wdl};
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator/(const year& y, const month_weekday_last& mwdl) NOEXCEPT
-{
-    return {y, mwdl.month(), mwdl.weekday_last()};
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator/(int y, const month_weekday_last& mwdl) NOEXCEPT
-{
-    return year(y) / mwdl;
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator/(const month_weekday_last& mwdl, const year& y) NOEXCEPT
-{
-    return y / mwdl;
-}
-
-CONSTCD11
-inline
-year_month_weekday_last
-operator/(const month_weekday_last& mwdl, int y) NOEXCEPT
-{
-    return year(y) / mwdl;
-}
-
-template <class Duration>
-struct fields;
-
-template <class CharT, class Traits, class Duration>
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const fields<Duration>& fds, const std::string* abbrev = nullptr,
-          const std::chrono::seconds* offset_sec = nullptr);
-
-template <class CharT, class Traits, class Duration, class Alloc>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-            fields<Duration>& fds, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr);
-
-// time_of_day
-
-enum {am = 1, pm};
-
-namespace detail
-{
-
-// width<n>::value is the number of fractional decimal digits in 1/n
-// width<0>::value and width<1>::value are defined to be 0
-// If 1/n takes more than 18 fractional decimal digits,
-//   the result is truncated to 19.
-// Example:  width<2>::value    ==  1
-// Example:  width<3>::value    == 19
-// Example:  width<4>::value    ==  2
-// Example:  width<10>::value   ==  1
-// Example:  width<1000>::value ==  3
-template <std::uint64_t n, std::uint64_t d = 10, unsigned w = 0,
-          bool should_continue = !(n < 2) && d != 0 && (w < 19)>
-struct width
-{
-    static CONSTDATA unsigned value = 1 + width<n, d%n*10, w+1>::value;
-};
-
-template <std::uint64_t n, std::uint64_t d, unsigned w>
-struct width<n, d, w, false>
-{
-    static CONSTDATA unsigned value = 0;
-};
-
-template <unsigned exp>
-struct static_pow10
-{
-private:
-    static CONSTDATA std::uint64_t h = static_pow10<exp/2>::value;
-public:
-    static CONSTDATA std::uint64_t value = h * h * (exp % 2 ? 10 : 1);
-};
-
-template <>
-struct static_pow10<0>
-{
-    static CONSTDATA std::uint64_t value = 1;
-};
-
-template <class Rep, unsigned w, bool in_range = (w < 19)>
-struct make_precision
-{
-    using type = std::chrono::duration<Rep,
-                                       std::ratio<1, static_pow10<w>::value>>;
-    static CONSTDATA unsigned width = w;
-};
-
-template <class Rep, unsigned w>
-struct make_precision<Rep, w, false>
-{
-    using type = std::chrono::duration<Rep, std::micro>;
-    static CONSTDATA unsigned width = 6;
-};
-
-template <class Duration,
-          unsigned w = width<std::common_type<
-                                 Duration,
-                                 std::chrono::seconds>::type::period::den>::value>
-class decimal_format_seconds
-{
-public:
-    using rep = typename std::common_type<Duration, std::chrono::seconds>::type::rep;
-    using precision = typename make_precision<rep, w>::type;
-    static auto CONSTDATA width = make_precision<rep, w>::width;
-
-private:
-    std::chrono::seconds s_;
-    precision            sub_s_;
-
-public:
-    CONSTCD11 decimal_format_seconds()
-        : s_()
-        , sub_s_()
-        {}
-
-    CONSTCD11 explicit decimal_format_seconds(const Duration& d) NOEXCEPT
-        : s_(std::chrono::duration_cast<std::chrono::seconds>(d))
-        , sub_s_(std::chrono::duration_cast<precision>(d - s_))
-        {}
-
-    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_;}
-    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_;}
-    CONSTCD11 precision subseconds() const NOEXCEPT {return sub_s_;}
-
-    CONSTCD14 precision to_duration() const NOEXCEPT
-    {
-        return s_ + sub_s_;
-    }
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        using namespace std::chrono;
-        return sub_s_ < std::chrono::seconds{1} && s_ < minutes{1};
-    }
-
-    template <class CharT, class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const decimal_format_seconds& x)
-    {
-        date::detail::save_stream<CharT, Traits> _(os);
-        os.fill('0');
-        os.flags(std::ios::dec | std::ios::right);
-        os.width(2);
-        os << x.s_.count() <<
-              std::use_facet<std::numpunct<char>>(os.getloc()).decimal_point();
-        os.width(width);
-        os << static_cast<std::int64_t>(x.sub_s_.count());
-        return os;
-    }
-};
-
-template <class Duration>
-class decimal_format_seconds<Duration, 0>
-{
-    static CONSTDATA unsigned w = 0;
-public:
-    using rep = typename std::common_type<Duration, std::chrono::seconds>::type::rep;
-    using precision = std::chrono::duration<rep>;
-    static auto CONSTDATA width = make_precision<rep, w>::width;
-private:
-
-    std::chrono::seconds s_;
-
-public:
-    CONSTCD11 decimal_format_seconds() : s_() {}
-    CONSTCD11 explicit decimal_format_seconds(const precision& s) NOEXCEPT
-        : s_(s)
-        {}
-
-    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_;}
-    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_;}
-    CONSTCD14 precision to_duration() const NOEXCEPT {return s_;}
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        using namespace std::chrono;
-        return s_ < minutes{1};
-    }
-
-    template <class CharT, class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const decimal_format_seconds& x)
-    {
-        date::detail::save_stream<CharT, Traits> _(os);
-        os.fill('0');
-        os.flags(std::ios::dec | std::ios::right);
-        os.width(2);
-        os << x.s_.count();
-        return os;
-    }
-};
-
-enum class classify
-{
-    not_valid,
-    hour,
-    minute,
-    second,
-    subsecond
-};
-
-template <class Duration>
-struct classify_duration
-{
-    static CONSTDATA classify value =
-        std::is_convertible<Duration, std::chrono::hours>::value
-                ? classify::hour :
-        std::is_convertible<Duration, std::chrono::minutes>::value
-                ? classify::minute :
-        std::is_convertible<Duration, std::chrono::seconds>::value
-                ? classify::second :
-        std::chrono::treat_as_floating_point<typename Duration::rep>::value
-                ? classify::not_valid :
-                classify::subsecond;
-};
-
-template <class Rep, class Period>
-inline
-CONSTCD11
-typename std::enable_if
-         <
-            std::numeric_limits<Rep>::is_signed,
-            std::chrono::duration<Rep, Period>
-         >::type
-abs(std::chrono::duration<Rep, Period> d)
-{
-    return d >= d.zero() ? d : -d;
-}
-
-template <class Rep, class Period>
-inline
-CONSTCD11
-typename std::enable_if
-         <
-            !std::numeric_limits<Rep>::is_signed,
-            std::chrono::duration<Rep, Period>
-         >::type
-abs(std::chrono::duration<Rep, Period> d)
-{
-    return d;
-}
-
-class time_of_day_base
-{
-protected:
-    std::chrono::hours   h_;
-    unsigned char mode_;
-    bool          neg_;
-
-    enum {is24hr};
-
-    CONSTCD11 time_of_day_base() NOEXCEPT
-        : h_(0)
-        , mode_(static_cast<decltype(mode_)>(is24hr))
-        , neg_(false)
-        {}
-
-
-    CONSTCD11 time_of_day_base(std::chrono::hours h, bool neg, unsigned m) NOEXCEPT
-        : h_(detail::abs(h))
-        , mode_(static_cast<decltype(mode_)>(m))
-        , neg_(neg)
-        {}
-
-    CONSTCD14 void make24() NOEXCEPT;
-    CONSTCD14 void make12() NOEXCEPT;
-
-    CONSTCD14 std::chrono::hours to24hr() const;
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        return !neg_ && h_ < days{1};
-    }
-};
-
-CONSTCD14
-inline
-std::chrono::hours
-time_of_day_base::to24hr() const
-{
-    auto h = h_;
-    if (mode_ == am || mode_ == pm)
-    {
-        CONSTDATA auto h12 = std::chrono::hours(12);
-        if (mode_ == pm)
-        {
-            if (h != h12)
-                h = h + h12;
-        }
-        else if (h == h12)
-            h = std::chrono::hours(0);
-    }
-    return h;
-}
-
-CONSTCD14
-inline
-void
-time_of_day_base::make24() NOEXCEPT
-{
-    h_ = to24hr();
-    mode_ = is24hr;
-}
-
-CONSTCD14
-inline
-void
-time_of_day_base::make12() NOEXCEPT
-{
-    if (mode_ == is24hr)
-    {
-        CONSTDATA auto h12 = std::chrono::hours(12);
-        if (h_ >= h12)
-        {
-            if (h_ > h12)
-                h_ = h_ - h12;
-            mode_ = pm;
-        }
-        else
-        {
-            if (h_ == std::chrono::hours(0))
-                h_ = h12;
-            mode_ = am;
-        }
-    }
-}
-
-template <class Duration, detail::classify = detail::classify_duration<Duration>::value>
-class time_of_day_storage;
-
-template <class Rep, class Period>
-class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::hour>
-    : private detail::time_of_day_base
-{
-    using base = detail::time_of_day_base;
-
-public:
-    using precision = std::chrono::hours;
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-    CONSTCD11 time_of_day_storage() NOEXCEPT = default;
-#else
-    CONSTCD11 time_of_day_storage() = default;
-#endif /* !defined(_MSC_VER) || _MSC_VER >= 1900 */
-
-    CONSTCD11 explicit time_of_day_storage(std::chrono::hours since_midnight) NOEXCEPT
-        : base(since_midnight, since_midnight < std::chrono::hours{0}, is24hr)
-        {}
-
-    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, unsigned md) NOEXCEPT
-        : base(h, h < std::chrono::hours{0}, md)
-        {}
-
-    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
-    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
-
-    CONSTCD14 explicit operator precision() const NOEXCEPT
-    {
-        auto p = to24hr();
-        if (neg_)
-            p = -p;
-        return p;
-    }
-
-    CONSTCD14 precision to_duration() const NOEXCEPT
-    {
-        return static_cast<precision>(*this);
-    }
-
-    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
-    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        return base::in_conventional_range();
-    }
-
-    template<class CharT, class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
-    {
-        using namespace std;
-        detail::save_stream<CharT, Traits> _(os);
-        if (t.neg_)
-            os << '-';
-        os.fill('0');
-        os.flags(std::ios::dec | std::ios::right);
-        if (t.mode_ != am && t.mode_ != pm)
-            os.width(2);
-        os << t.h_.count();
-        switch (t.mode_)
-        {
-        case time_of_day_storage::is24hr:
-            os << "00";
-            break;
-        case am:
-            os << "am";
-            break;
-        case pm:
-            os << "pm";
-            break;
-        }
-        return os;
-    }
-};
-
-template <class Rep, class Period>
-class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::minute>
-    : private detail::time_of_day_base
-{
-    using base = detail::time_of_day_base;
-
-    std::chrono::minutes m_;
-
-public:
-   using precision = std::chrono::minutes;
-
-   CONSTCD11 time_of_day_storage() NOEXCEPT
-        : base()
-        , m_(0)
-        {}
-
-   CONSTCD11 explicit time_of_day_storage(std::chrono::minutes since_midnight) NOEXCEPT
-        : base(std::chrono::duration_cast<std::chrono::hours>(since_midnight),
-               since_midnight < std::chrono::minutes{0}, is24hr)
-        , m_(detail::abs(since_midnight) - h_)
-        {}
-
-    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, std::chrono::minutes m,
-                                           unsigned md) NOEXCEPT
-        : base(h, false, md)
-        , m_(m)
-        {}
-
-    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
-    CONSTCD11 std::chrono::minutes minutes() const NOEXCEPT {return m_;}
-    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
-
-    CONSTCD14 explicit operator precision() const NOEXCEPT
-    {
-        auto p = to24hr() + m_;
-        if (neg_)
-            p = -p;
-        return p;
-    }
-
-    CONSTCD14 precision to_duration() const NOEXCEPT
-    {
-        return static_cast<precision>(*this);
-    }
-
-    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
-    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        return base::in_conventional_range() && m_ < std::chrono::hours{1};
-    }
-
-    template<class CharT, class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
-    {
-        using namespace std;
-        detail::save_stream<CharT, Traits> _(os);
-        if (t.neg_)
-            os << '-';
-        os.fill('0');
-        os.flags(std::ios::dec | std::ios::right);
-        if (t.mode_ != am && t.mode_ != pm)
-            os.width(2);
-        os << t.h_.count() << ':';
-        os.width(2);
-        os << t.m_.count();
-        switch (t.mode_)
-        {
-        case am:
-            os << "am";
-            break;
-        case pm:
-            os << "pm";
-            break;
-        }
-        return os;
-    }
-};
-
-template <class Rep, class Period>
-class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::second>
-    : private detail::time_of_day_base
-{
-    using base = detail::time_of_day_base;
-    using dfs = decimal_format_seconds<std::chrono::seconds>;
-
-    std::chrono::minutes m_;
-    dfs                  s_;
-
-public:
-    using precision = std::chrono::seconds;
-
-    CONSTCD11 time_of_day_storage() NOEXCEPT
-        : base()
-        , m_(0)
-        , s_()
-        {}
-
-    CONSTCD11 explicit time_of_day_storage(std::chrono::seconds since_midnight) NOEXCEPT
-        : base(std::chrono::duration_cast<std::chrono::hours>(since_midnight),
-               since_midnight < std::chrono::seconds{0}, is24hr)
-        , m_(std::chrono::duration_cast<std::chrono::minutes>(detail::abs(since_midnight) - h_))
-        , s_(detail::abs(since_midnight) - h_ - m_)
-        {}
-
-    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, std::chrono::minutes m,
-                                           std::chrono::seconds s, unsigned md) NOEXCEPT
-        : base(h, false, md)
-        , m_(m)
-        , s_(s)
-        {}
-
-    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
-    CONSTCD11 std::chrono::minutes minutes() const NOEXCEPT {return m_;}
-    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_.seconds();}
-    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_.seconds();}
-    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
-
-    CONSTCD14 explicit operator precision() const NOEXCEPT
-    {
-        auto p = to24hr() + s_.to_duration() + m_;
-        if (neg_)
-            p = -p;
-        return p;
-    }
-
-    CONSTCD14 precision to_duration() const NOEXCEPT
-    {
-        return static_cast<precision>(*this);
-    }
-
-    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
-    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        return base::in_conventional_range() && m_ < std::chrono::hours{1} &&
-                                                s_.in_conventional_range();
-    }
-
-    template<class CharT, class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
-    {
-        using namespace std;
-        detail::save_stream<CharT, Traits> _(os);
-        if (t.neg_)
-            os << '-';
-        os.fill('0');
-        os.flags(std::ios::dec | std::ios::right);
-        if (t.mode_ != am && t.mode_ != pm)
-            os.width(2);
-        os << t.h_.count() << ':';
-        os.width(2);
-        os << t.m_.count() << ':' << t.s_;
-        switch (t.mode_)
-        {
-        case am:
-            os << "am";
-            break;
-        case pm:
-            os << "pm";
-            break;
-        }
-        return os;
-    }
-
-    template <class CharT, class Traits, class Duration>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    date::to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const fields<Duration>& fds, const std::string* abbrev,
-          const std::chrono::seconds* offset_sec);
-
-    template <class CharT, class Traits, class Duration, class Alloc>
-    friend
-    std::basic_istream<CharT, Traits>&
-    date::from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-          fields<Duration>& fds,
-          std::basic_string<CharT, Traits, Alloc>* abbrev, std::chrono::minutes* offset);
-};
-
-template <class Rep, class Period>
-class time_of_day_storage<std::chrono::duration<Rep, Period>, detail::classify::subsecond>
-    : private detail::time_of_day_base
-{
-public:
-    using Duration = std::chrono::duration<Rep, Period>;
-    using dfs = decimal_format_seconds<typename std::common_type<Duration,
-                                       std::chrono::seconds>::type>;
-    using precision = typename dfs::precision;
-
-private:
-    using base = detail::time_of_day_base;
-
-    std::chrono::minutes m_;
-    dfs                  s_;
-
-public:
-    CONSTCD11 time_of_day_storage() NOEXCEPT
-        : base()
-        , m_(0)
-        , s_()
-        {}
-
-    CONSTCD11 explicit time_of_day_storage(Duration since_midnight) NOEXCEPT
-        : base(date::trunc<std::chrono::hours>(since_midnight),
-               since_midnight < Duration{0}, is24hr)
-        , m_(date::trunc<std::chrono::minutes>(detail::abs(since_midnight) - h_))
-        , s_(detail::abs(since_midnight) - h_ - m_)
-        {}
-
-    CONSTCD11 explicit time_of_day_storage(std::chrono::hours h, std::chrono::minutes m,
-                                           std::chrono::seconds s, precision sub_s,
-                                           unsigned md) NOEXCEPT
-        : base(h, false, md)
-        , m_(m)
-        , s_(s + sub_s)
-        {}
-
-    CONSTCD11 std::chrono::hours hours() const NOEXCEPT {return h_;}
-    CONSTCD11 std::chrono::minutes minutes() const NOEXCEPT {return m_;}
-    CONSTCD14 std::chrono::seconds& seconds() NOEXCEPT {return s_.seconds();}
-    CONSTCD11 std::chrono::seconds seconds() const NOEXCEPT {return s_.seconds();}
-    CONSTCD11 precision subseconds() const NOEXCEPT {return s_.subseconds();}
-    CONSTCD11 unsigned mode() const NOEXCEPT {return mode_;}
-
-    CONSTCD14 explicit operator precision() const NOEXCEPT
-    {
-        auto p = to24hr() + s_.to_duration() + m_;
-        if (neg_)
-            p = -p;
-        return p;
-    }
-
-    CONSTCD14 precision to_duration() const NOEXCEPT
-    {
-        return static_cast<precision>(*this);
-    }
-
-    CONSTCD14 time_of_day_storage& make24() NOEXCEPT {base::make24(); return *this;}
-    CONSTCD14 time_of_day_storage& make12() NOEXCEPT {base::make12(); return *this;}
-
-    CONSTCD11 bool in_conventional_range() const NOEXCEPT
-    {
-        return base::in_conventional_range() && m_ < std::chrono::hours{1} &&
-                                                s_.in_conventional_range();
-    }
-
-    template<class CharT, class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const time_of_day_storage& t)
-    {
-        using namespace std;
-        detail::save_stream<CharT, Traits> _(os);
-        if (t.neg_)
-            os << '-';
-        os.fill('0');
-        os.flags(std::ios::dec | std::ios::right);
-        if (t.mode_ != am && t.mode_ != pm)
-            os.width(2);
-        os << t.h_.count() << ':';
-        os.width(2);
-        os << t.m_.count() << ':' << t.s_;
-        switch (t.mode_)
-        {
-        case am:
-            os << "am";
-            break;
-        case pm:
-            os << "pm";
-            break;
-        }
-        return os;
-    }
-
-    template <class CharT, class Traits, class Duration>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    date::to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const fields<Duration>& fds, const std::string* abbrev,
-          const std::chrono::seconds* offset_sec);
-
-    template <class CharT, class Traits, class Duration, class Alloc>
-    friend
-    std::basic_istream<CharT, Traits>&
-    date::from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-          fields<Duration>& fds,
-          std::basic_string<CharT, Traits, Alloc>* abbrev, std::chrono::minutes* offset);
-};
-
-}  // namespace detail
-
-template <class Duration>
-class time_of_day
-    : public detail::time_of_day_storage<Duration>
-{
-    using base = detail::time_of_day_storage<Duration>;
-public:
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-    CONSTCD11 time_of_day() NOEXCEPT = default;
-#else
-    CONSTCD11 time_of_day() = default;
-#endif /* !defined(_MSC_VER) || _MSC_VER >= 1900 */
-
-    CONSTCD11 explicit time_of_day(Duration since_midnight) NOEXCEPT
-        : base(since_midnight)
-        {}
-
-    template <class Arg0, class Arg1, class ...Args>
-    CONSTCD11
-    explicit time_of_day(Arg0&& arg0, Arg1&& arg1, Args&& ...args) NOEXCEPT
-        : base(std::forward<Arg0>(arg0), std::forward<Arg1>(arg1), std::forward<Args>(args)...)
-        {}
-};
-
-template <class Rep, class Period,
-          class = typename std::enable_if
-              <!std::chrono::treat_as_floating_point<Rep>::value>::type>
-CONSTCD11
-inline
-time_of_day<std::chrono::duration<Rep, Period>>
-make_time(const std::chrono::duration<Rep, Period>& d)
-{
-    return time_of_day<std::chrono::duration<Rep, Period>>(d);
-}
-
-CONSTCD11
-inline
-time_of_day<std::chrono::hours>
-make_time(const std::chrono::hours& h, unsigned md)
-{
-    return time_of_day<std::chrono::hours>(h, md);
-}
-
-CONSTCD11
-inline
-time_of_day<std::chrono::minutes>
-make_time(const std::chrono::hours& h, const std::chrono::minutes& m,
-          unsigned md)
-{
-    return time_of_day<std::chrono::minutes>(h, m, md);
-}
-
-CONSTCD11
-inline
-time_of_day<std::chrono::seconds>
-make_time(const std::chrono::hours& h, const std::chrono::minutes& m,
-          const std::chrono::seconds& s, unsigned md)
-{
-    return time_of_day<std::chrono::seconds>(h, m, s, md);
-}
-
-template <class Rep, class Period,
-          class = typename std::enable_if<std::ratio_less<Period,
-                                                          std::ratio<1>>::value>::type>
-CONSTCD11
-inline
-time_of_day<std::chrono::duration<Rep, Period>>
-make_time(const std::chrono::hours& h, const std::chrono::minutes& m,
-          const std::chrono::seconds& s, const std::chrono::duration<Rep, Period>& sub_s,
-          unsigned md)
-{
-    return time_of_day<std::chrono::duration<Rep, Period>>(h, m, s, sub_s, md);
-}
-
-template <class CharT, class Traits, class Duration>
-inline
-typename std::enable_if
-<
-    !std::chrono::treat_as_floating_point<typename Duration::rep>::value &&
-        std::ratio_less<typename Duration::period, days::period>::value
-    , std::basic_ostream<CharT, Traits>&
->::type
-operator<<(std::basic_ostream<CharT, Traits>& os, const sys_time<Duration>& tp)
-{
-    auto const dp = date::floor<days>(tp);
-    return os << year_month_day(dp) << ' ' << make_time(tp-dp);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const sys_days& dp)
-{
-    return os << year_month_day(dp);
-}
-
-template <class CharT, class Traits, class Duration>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os, const local_time<Duration>& ut)
-{
-    return (os << sys_time<Duration>{ut.time_since_epoch()});
-}
-
-// to_stream
-
-template <class Duration>
-struct fields
-{
-    year_month_day        ymd{year{0}/0/0};
-    weekday               wd{7u};
-    time_of_day<Duration> tod{};
-
-    fields() = default;
-
-    fields(year_month_day ymd_) : ymd(ymd_) {}
-    fields(weekday wd_) : wd(wd_) {}
-    fields(time_of_day<Duration> tod_) : tod(tod_) {}
-
-    fields(year_month_day ymd_, weekday wd_) : ymd(ymd_), wd(wd_) {}
-    fields(year_month_day ymd_, time_of_day<Duration> tod_) : ymd(ymd_), tod(tod_) {}
-
-    fields(weekday wd_, time_of_day<Duration> tod_) : wd(wd_), tod(tod_) {}
-
-    fields(year_month_day ymd_, weekday wd_, time_of_day<Duration> tod_)
-        : ymd(ymd_)
-        , wd(wd_)
-        , tod(tod_)
-        {}
-};
-
-namespace detail
-{
-
-template <class CharT, class Traits, class Duration>
-unsigned
-extract_weekday(std::basic_ostream<CharT, Traits>& os, const fields<Duration>& fds)
-{
-    if (!fds.ymd.ok() && !fds.wd.ok())
-    {
-        // fds does not contain a valid weekday
-        os.setstate(std::ios::failbit);
-        return 7;
-    }
-    unsigned wd;
-    if (fds.ymd.ok())
-    {
-        wd = static_cast<unsigned>(weekday{fds.ymd});
-        if (fds.wd.ok() && wd != static_cast<unsigned>(fds.wd))
-        {
-            // fds.ymd and fds.wd are inconsistent
-            os.setstate(std::ios::failbit);
-            return 7;
-        }
-    }
-    else
-        wd = static_cast<unsigned>(fds.wd);
-    return wd;
-}
-
-template <class CharT, class Traits, class Duration>
-unsigned
-extract_month(std::basic_ostream<CharT, Traits>& os, const fields<Duration>& fds)
-{
-    if (!fds.ymd.month().ok())
-    {
-        // fds does not contain a valid month
-        os.setstate(std::ios::failbit);
-        return 0;
-    }
-    return static_cast<unsigned>(fds.ymd.month());
-}
-
-}  // namespace detail
-
-#if ONLY_C_LOCALE
-
-namespace detail
-{
-
-inline
-std::pair<const std::string*, const std::string*>
-weekday_names()
-{
-    using namespace std;
-    static const string nm[] =
-    {
-        "Sunday",
-        "Monday",
-        "Tuesday",
-        "Wednesday",
-        "Thursday",
-        "Friday",
-        "Saturday",
-        "Sun",
-        "Mon",
-        "Tue",
-        "Wed",
-        "Thu",
-        "Fri",
-        "Sat"
-    };
-    return make_pair(nm, nm+sizeof(nm)/sizeof(nm[0]));
-}
-
-inline
-std::pair<const std::string*, const std::string*>
-month_names()
-{
-    using namespace std;
-    static const string nm[] =
-    {
-        "January",
-        "February",
-        "March",
-        "April",
-        "May",
-        "June",
-        "July",
-        "August",
-        "September",
-        "October",
-        "November",
-        "December",
-        "Jan",
-        "Feb",
-        "Mar",
-        "Apr",
-        "May",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Oct",
-        "Nov",
-        "Dec"
-    };
-    return make_pair(nm, nm+sizeof(nm)/sizeof(nm[0]));
-}
-
-inline
-std::pair<const std::string*, const std::string*>
-ampm_names()
-{
-    using namespace std;
-    static const string nm[] =
-    {
-        "AM",
-        "PM"
-    };
-    return make_pair(nm, nm+sizeof(nm)/sizeof(nm[0]));
-}
-
-template <class CharT, class Traits, class FwdIter>
-FwdIter
-scan_keyword(std::basic_istream<CharT, Traits>& is, FwdIter kb, FwdIter ke)
-{
-    using namespace std;
-    size_t nkw = static_cast<size_t>(std::distance(kb, ke));
-    const unsigned char doesnt_match = '\0';
-    const unsigned char might_match = '\1';
-    const unsigned char does_match = '\2';
-    unsigned char statbuf[100];
-    unsigned char* status = statbuf;
-    unique_ptr<unsigned char, void(*)(void*)> stat_hold(0, free);
-    if (nkw > sizeof(statbuf))
-    {
-        status = (unsigned char*)malloc(nkw);
-        if (status == nullptr)
-            throw bad_alloc();
-        stat_hold.reset(status);
-    }
-    size_t n_might_match = nkw;  // At this point, any keyword might match
-    size_t n_does_match = 0;     // but none of them definitely do
-    // Initialize all statuses to might_match, except for "" keywords are does_match
-    unsigned char* st = status;
-    for (auto ky = kb; ky != ke; ++ky, ++st)
-    {
-        if (!ky->empty())
-            *st = might_match;
-        else
-        {
-            *st = does_match;
-            --n_might_match;
-            ++n_does_match;
-        }
-    }
-    // While there might be a match, test keywords against the next CharT
-    for (size_t indx = 0; is && n_might_match > 0; ++indx)
-    {
-        // Peek at the next CharT but don't consume it
-        auto ic = is.peek();
-        if (ic == EOF)
-        {
-            is.setstate(ios::eofbit);
-            break;
-        }
-        auto c = static_cast<char>(toupper(ic));
-        bool consume = false;
-        // For each keyword which might match, see if the indx character is c
-        // If a match if found, consume c
-        // If a match is found, and that is the last character in the keyword,
-        //    then that keyword matches.
-        // If the keyword doesn't match this character, then change the keyword
-        //    to doesn't match
-        st = status;
-        for (auto ky = kb; ky != ke; ++ky, ++st)
-        {
-            if (*st == might_match)
-            {
-                if (c == static_cast<char>(toupper((*ky)[indx])))
-                {
-                    consume = true;
-                    if (ky->size() == indx+1)
-                    {
-                        *st = does_match;
-                        --n_might_match;
-                        ++n_does_match;
-                    }
-                }
-                else
-                {
-                    *st = doesnt_match;
-                    --n_might_match;
-                }
-            }
-        }
-        // consume if we matched a character
-        if (consume)
-        {
-            (void)is.get();
-            // If we consumed a character and there might be a matched keyword that
-            //   was marked matched on a previous iteration, then such keywords
-            //   are now marked as not matching.
-            if (n_might_match + n_does_match > 1)
-            {
-                st = status;
-                for (auto ky = kb; ky != ke; ++ky, ++st)
-                {
-                    if (*st == does_match && ky->size() != indx+1)
-                    {
-                        *st = doesnt_match;
-                        --n_does_match;
-                    }
-                }
-            }
-        }
-    }
-    // We've exited the loop because we hit eof and/or we have no more "might matches".
-    // Return the first matching result
-    for (st = status; kb != ke; ++kb, ++st)
-        if (*st == does_match)
-            break;
-    if (kb == ke)
-        is.setstate(ios_base::failbit);
-    return kb;
-}
-
-}  // namespace detail
-
-#endif  // ONLY_C_LOCALE
-
-template <class CharT, class Traits, class Duration>
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const fields<Duration>& fds, const std::string* abbrev,
-          const std::chrono::seconds* offset_sec)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using namespace detail;
-    tm tm{};
-#if !ONLY_C_LOCALE
-    auto& facet = use_facet<time_put<CharT>>(os.getloc());
-#endif
-    const CharT* command = nullptr;
-    CharT modified = CharT{};
-    for (; *fmt; ++fmt)
-    {
-        switch (*fmt)
-        {
-        case 'a':
-        case 'A':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
-                    if (os.fail())
-                        return os;
-#if !ONLY_C_LOCALE
-                    const CharT f[] = {'%', *fmt};
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-#else  // ONLY_C_LOCALE
-                    os << weekday_names().first[tm.tm_wday+7*(*fmt == 'a')];
-#endif  // ONLY_C_LOCALE
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'b':
-        case 'B':
-        case 'h':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    tm.tm_mon = static_cast<int>(extract_month(os, fds)) - 1;
-#if !ONLY_C_LOCALE
-                    const CharT f[] = {'%', *fmt};
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-#else  // ONLY_C_LOCALE
-                    os << month_names().first[tm.tm_mon+12*(*fmt == 'b')];
-#endif  // ONLY_C_LOCALE
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'c':
-        case 'x':
-            if (command)
-            {
-                if (modified == CharT{'O'})
-                    os << CharT{'%'} << modified << *fmt;
-                else
-                {
-#if !ONLY_C_LOCALE
-                    tm = std::tm{};
-                    auto const& ymd = fds.ymd;
-                    auto ld = local_days(ymd);
-                    tm.tm_sec = static_cast<int>(fds.tod.seconds().count());
-                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
-                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
-                    tm.tm_mday = static_cast<int>(static_cast<unsigned>(ymd.day()));
-                    tm.tm_mon = static_cast<int>(extract_month(os, fds) - 1);
-                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
-                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
-                    if (os.fail())
-                        return os;
-                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
-                    CharT f[3] = {'%'};
-                    auto fe = begin(f) + 1;
-                    if (modified == CharT{'E'})
-                        *fe++ = modified;
-                    *fe++ = *fmt;
-                    facet.put(os, os, os.fill(), &tm, begin(f), fe);
-#else  // ONLY_C_LOCALE
-                    if (*fmt == 'c')
-                    {
-                        auto wd = static_cast<int>(extract_weekday(os, fds));
-                        os << weekday_names().first[static_cast<unsigned>(wd)+7]
-                           << ' ';
-                        os << month_names().first[extract_month(os, fds)-1+12] << ' ';
-                        auto d = static_cast<int>(static_cast<unsigned>(fds.ymd.day()));
-                        if (d < 10)
-                            os << ' ';
-                        os << d << ' '
-                           << make_time(duration_cast<seconds>(fds.tod.to_duration()))
-                           << ' ' << fds.ymd.year();
-
-                    }
-                    else  // *fmt == 'x'
-                    {
-                        auto const& ymd = fds.ymd;
-                        save_stream<CharT, Traits> _(os);
-                        os.fill('0');
-                        os.flags(std::ios::dec | std::ios::right);
-                        os.width(2);
-                        os << static_cast<unsigned>(ymd.month()) << CharT{'/'};
-                        os.width(2);
-                        os << static_cast<unsigned>(ymd.day()) << CharT{'/'};
-                        os.width(2);
-                        os << static_cast<int>(ymd.year()) % 100;
-                    }
-#endif  // ONLY_C_LOCALE
-                }
-                command = nullptr;
-                modified = CharT{};
-            }
-            else
-                os << *fmt;
-            break;
-        case 'C':
-            if (command)
-            {
-                auto y = static_cast<int>(fds.ymd.year());
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    save_stream<CharT, Traits> _(os);
-                    os.fill('0');
-                    os.flags(std::ios::dec | std::ios::right);
-                    if (y >= 0)
-                    {
-                        os.width(2);
-                        os << y/100;
-                    }
-                    else
-                    {
-                        os << CharT{'-'};
-                        os.width(2);
-                        os << -(y-99)/100;
-                    }
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'E'})
-                {
-                    tm.tm_year = y - 1900;
-                    CharT f[3] = {'%', 'E', 'C'};
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                command = nullptr;
-                modified = CharT{};
-            }
-            else
-                os << *fmt;
-            break;
-        case 'd':
-        case 'e':
-            if (command)
-            {
-                auto d = static_cast<int>(static_cast<unsigned>(fds.ymd.day()));
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    save_stream<CharT, Traits> _(os);
-                    if (*fmt == CharT{'d'})
-                        os.fill('0');
-                    os.flags(std::ios::dec | std::ios::right);
-                    os.width(2);
-                    os << d;
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    tm.tm_mday = d;
-                    CharT f[3] = {'%', 'O', *fmt};
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                command = nullptr;
-                modified = CharT{};
-            }
-            else
-                os << *fmt;
-            break;
-        case 'D':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    auto const& ymd = fds.ymd;
-                    save_stream<CharT, Traits> _(os);
-                    os.fill('0');
-                    os.flags(std::ios::dec | std::ios::right);
-                    os.width(2);
-                    os << static_cast<unsigned>(ymd.month()) << CharT{'/'};
-                    os.width(2);
-                    os << static_cast<unsigned>(ymd.day()) << CharT{'/'};
-                    os.width(2);
-                    os << static_cast<int>(ymd.year()) % 100;
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'F':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    auto const& ymd = fds.ymd;
-                    save_stream<CharT, Traits> _(os);
-                    os.fill('0');
-                    os.flags(std::ios::dec | std::ios::right);
-                    os.width(4);
-                    os << static_cast<int>(ymd.year()) << CharT{'-'};
-                    os.width(2);
-                    os << static_cast<unsigned>(ymd.month()) << CharT{'-'};
-                    os.width(2);
-                    os << static_cast<unsigned>(ymd.day());
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'g':
-        case 'G':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    auto ld = local_days(fds.ymd);
-                    auto y = year_month_day{ld + days{3}}.year();
-                    auto start = local_days((y - years{1})/date::dec/thu[last]) + (mon-thu);
-                    if (ld < start)
-                        --y;
-                    if (*fmt == CharT{'G'})
-                        os << y;
-                    else
-                    {
-                        save_stream<CharT, Traits> _(os);
-                        os.fill('0');
-                        os.flags(std::ios::dec | std::ios::right);
-                        os.width(2);
-                        os << std::abs(static_cast<int>(y)) % 100;
-                    }
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'H':
-        case 'I':
-            if (command)
-            {
-                auto hms = fds.tod;
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    if (*fmt == CharT{'I'})
-                        hms.make12();
-                    if (hms.hours() < hours{10})
-                        os << CharT{'0'};
-                    os << hms.hours().count();
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_hour = static_cast<int>(hms.hours().count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'j':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    auto ld = local_days(fds.ymd);
-                    auto y = fds.ymd.year();
-                    auto doy = ld - local_days(y/jan/1) + days{1};
-                    save_stream<CharT, Traits> _(os);
-                    os.fill('0');
-                    os.flags(std::ios::dec | std::ios::right);
-                    os.width(3);
-                    os << doy.count();
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'm':
-            if (command)
-            {
-                auto m = static_cast<unsigned>(fds.ymd.month());
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    if (m < 10)
-                        os << CharT{'0'};
-                    os << m;
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_mon = static_cast<int>(m-1);
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'M':
-            if (command)
-            {
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    if (fds.tod.minutes() < minutes{10})
-                        os << CharT{'0'};
-                    os << fds.tod.minutes().count();
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'n':
-            if (command)
-            {
-                if (modified == CharT{})
-                    os << CharT{'\n'};
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'p':
-            if (command)
-            {
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-                    const CharT f[] = {'%', *fmt};
-                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#else
-                if (fds.tod.hours() < hours{12})
-                    os << ampm_names().first[0];
-                else
-                    os << ampm_names().first[1];
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'r':
-            if (command)
-            {
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-                    const CharT f[] = {'%', *fmt};
-                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
-                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
-                    tm.tm_sec = static_cast<int>(fds.tod.seconds().count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#else
-                time_of_day<seconds> tod(duration_cast<seconds>(fds.tod.to_duration()));
-                tod.make12();
-                save_stream<CharT, Traits> _(os);
-                os.fill('0');
-                os.width(2);
-                os << tod.hours().count() << CharT{':'};
-                os.width(2);
-                os << tod.minutes().count() << CharT{':'};
-                os.width(2);
-                os << tod.seconds().count() << CharT{' '};
-                tod.make24();
-                if (tod.hours() < hours{12})
-                    os << ampm_names().first[0];
-                else
-                    os << ampm_names().first[1];
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'R':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    if (fds.tod.hours() < hours{10})
-                        os << CharT{'0'};
-                    os << fds.tod.hours().count() << CharT{':'};
-                    if (fds.tod.minutes() < minutes{10})
-                        os << CharT{'0'};
-                    os << fds.tod.minutes().count();
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'S':
-            if (command)
-            {
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    os << fds.tod.s_;
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_sec = static_cast<int>(fds.tod.s_.seconds().count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 't':
-            if (command)
-            {
-                if (modified == CharT{})
-                    os << CharT{'\t'};
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'T':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    os << fds.tod;
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'u':
-            if (command)
-            {
-                auto wd = extract_weekday(os, fds);
-                if (os.fail())
-                    return os;
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    os << (wd != 0 ? wd : 7u);
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_wday = static_cast<int>(wd);
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'U':
-            if (command)
-            {
-                auto const& ymd = fds.ymd;
-                auto ld = local_days(ymd);
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    auto st = local_days(sun[1]/jan/ymd.year());
-                    if (ld < st)
-                        os << CharT{'0'} << CharT{'0'};
-                    else
-                    {
-                        auto wn = duration_cast<weeks>(ld - st).count() + 1;
-                        if (wn < 10)
-                            os << CharT{'0'};
-                        os << wn;
-                    }
- #if !ONLY_C_LOCALE
-               }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
-                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
-                    if (os.fail())
-                        return os;
-                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'V':
-            if (command)
-            {
-                auto ld = local_days(fds.ymd);
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    auto y = year_month_day{ld + days{3}}.year();
-                    auto st = local_days((y - years{1})/12/thu[last]) + (mon-thu);
-                    if (ld < st)
-                    {
-                        --y;
-                        st = local_days((y - years{1})/12/thu[last]) + (mon-thu);
-                    }
-                    auto wn = duration_cast<weeks>(ld - st).count() + 1;
-                    if (wn < 10)
-                        os << CharT{'0'};
-                    os << wn;
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    auto const& ymd = fds.ymd;
-                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
-                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
-                    if (os.fail())
-                        return os;
-                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'w':
-            if (command)
-            {
-                auto wd = extract_weekday(os, fds);
-                if (os.fail())
-                    return os;
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    os << wd;
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_wday = static_cast<int>(wd);
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'W':
-            if (command)
-            {
-                auto const& ymd = fds.ymd;
-                auto ld = local_days(ymd);
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    auto st = local_days(mon[1]/jan/ymd.year());
-                    if (ld < st)
-                        os << CharT{'0'} << CharT{'0'};
-                    else
-                    {
-                        auto wn = duration_cast<weeks>(ld - st).count() + 1;
-                        if (wn < 10)
-                            os << CharT{'0'};
-                        os << wn;
-                    }
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'O'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_year = static_cast<int>(ymd.year()) - 1900;
-                    tm.tm_wday = static_cast<int>(extract_weekday(os, fds));
-                    if (os.fail())
-                        return os;
-                    tm.tm_yday = static_cast<int>((ld - local_days(ymd.year()/1/1)).count());
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'X':
-            if (command)
-            {
-#if !ONLY_C_LOCALE
-                if (modified == CharT{'O'})
-                    os << CharT{'%'} << modified << *fmt;
-                else
-                {
-                    tm = std::tm{};
-                    tm.tm_sec = static_cast<int>(fds.tod.seconds().count());
-                    tm.tm_min = static_cast<int>(fds.tod.minutes().count());
-                    tm.tm_hour = static_cast<int>(fds.tod.hours().count());
-                    CharT f[3] = {'%'};
-                    auto fe = begin(f) + 1;
-                    if (modified == CharT{'E'})
-                        *fe++ = modified;
-                    *fe++ = *fmt;
-                    facet.put(os, os, os.fill(), &tm, begin(f), fe);
-                }
-#else
-                os << fds.tod;
-#endif
-                command = nullptr;
-                modified = CharT{};
-            }
-            else
-                os << *fmt;
-            break;
-        case 'y':
-            if (command)
-            {
-                auto y = static_cast<int>(fds.ymd.year());
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    y = std::abs(y) % 100;
-                    if (y < 10)
-                        os << CharT{'0'};
-                    os << y;
-#if !ONLY_C_LOCALE
-                }
-                else
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_year = y - 1900;
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'Y':
-            if (command)
-            {
-                auto y = fds.ymd.year();
-#if !ONLY_C_LOCALE
-                if (modified == CharT{})
-                {
-#endif
-                    os << y;
-#if !ONLY_C_LOCALE
-                }
-                else if (modified == CharT{'E'})
-                {
-                    const CharT f[] = {'%', modified, *fmt};
-                    tm.tm_year = static_cast<int>(y) - 1900;
-                    facet.put(os, os, os.fill(), &tm, begin(f), end(f));
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                }
-#endif
-                modified = CharT{};
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'z':
-            if (command)
-            {
-                if (offset_sec == nullptr)
-                {
-                    // Can not format %z with unknown offset
-                    os.setstate(ios::failbit);
-                    return os;
-                }
-                auto m = duration_cast<minutes>(*offset_sec);
-                auto neg = m < minutes{0};
-                m = date::abs(m);
-                auto h = duration_cast<hours>(m);
-                m -= h;
-                if (neg)
-                    os << CharT{'-'};
-                else
-                    os << CharT{'+'};
-                if (h < hours{10})
-                    os << CharT{'0'};
-                os << h.count();
-                if (modified != CharT{})
-                    os << CharT{':'};
-                if (m < minutes{10})
-                    os << CharT{'0'};
-                os << m.count();
-                command = nullptr;
-                modified = CharT{};
-            }
-            else
-                os << *fmt;
-            break;
-        case 'Z':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    if (abbrev == nullptr)
-                    {
-                        // Can not format %Z with unknown time_zone
-                        os.setstate(ios::failbit);
-                        return os;
-                    }
-                    for (auto c : *abbrev)
-                        os << CharT(c);
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    modified = CharT{};
-                }
-                command = nullptr;
-            }
-            else
-                os << *fmt;
-            break;
-        case 'E':
-        case 'O':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    modified = *fmt;
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << *fmt;
-                    command = nullptr;
-                    modified = CharT{};
-                }
-            }
-            else
-                os << *fmt;
-            break;
-        case '%':
-            if (command)
-            {
-                if (modified == CharT{})
-                {
-                    os << CharT{'%'};
-                    command = nullptr;
-                }
-                else
-                {
-                    os << CharT{'%'} << modified << CharT{'%'};
-                    command = nullptr;
-                    modified = CharT{};
-                }
-            }
-            else
-                command = fmt;
-            break;
-        default:
-            if (command)
-            {
-                os << CharT{'%'};
-                command = nullptr;
-            }
-            if (modified != CharT{})
-            {
-                os << modified;
-                modified = CharT{};
-            }
-            os << *fmt;
-            break;
-        }
-    }
-    if (command)
-        os << CharT{'%'};
-    if (modified != CharT{})
-        os << modified;
-    return os;
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const year& y)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{y/0/0};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const month& m)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{m/0/0};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const day& d)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{d/0/0};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const weekday& wd)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{wd};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const year_month& ym)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{ym/0};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt, const month_day& md)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{md/0};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const year_month_day& ymd)
-{
-    using CT = std::chrono::seconds;
-    fields<CT> fds{ymd};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits, class Rep, class Period>
-inline
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const std::chrono::duration<Rep, Period>& d)
-{
-    using Duration = std::chrono::duration<Rep, Period>;
-    using CT = typename std::common_type<Duration, std::chrono::seconds>::type;
-    fields<CT> fds{time_of_day<CT>{d}};
-    return to_stream(os, fmt, fds);
-}
-
-template <class CharT, class Traits, class Duration>
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const local_time<Duration>& tp, const std::string* abbrev = nullptr,
-          const std::chrono::seconds* offset_sec = nullptr)
-{
-    using CT = typename std::common_type<Duration, std::chrono::seconds>::type;
-    auto ld = floor<days>(tp);
-    fields<CT> fds{year_month_day{ld}, time_of_day<CT>{tp-local_seconds{ld}}};
-    return to_stream(os, fmt, fds, abbrev, offset_sec);
-}
-
-template <class CharT, class Traits, class Duration>
-std::basic_ostream<CharT, Traits>&
-to_stream(std::basic_ostream<CharT, Traits>& os, const CharT* fmt,
-          const sys_time<Duration>& tp)
-{
-    using namespace std::chrono;
-    using CT = typename std::common_type<Duration, seconds>::type;
-    const std::string abbrev("UTC");
-    CONSTDATA seconds offset{0};
-    auto sd = floor<days>(tp);
-    fields<CT> fds{year_month_day{sd}, time_of_day<CT>{tp-sys_seconds{sd}}};
-    return to_stream(os, fmt, fds, &abbrev, &offset);
-}
-
-// format
-
-template <class CharT, class Streamable>
-auto
-format(const std::locale& loc, const CharT* fmt, const Streamable& tp)
-    -> decltype(to_stream(std::declval<std::basic_ostream<CharT>&>(), fmt, tp),
-                std::basic_string<CharT>{})
-{
-    std::basic_ostringstream<CharT> os;
-    os.exceptions(std::ios::failbit | std::ios::badbit);
-    os.imbue(loc);
-    to_stream(os, fmt, tp);
-    return os.str();
-}
-
-template <class CharT, class Streamable>
-auto
-format(const CharT* fmt, const Streamable& tp)
-    -> decltype(to_stream(std::declval<std::basic_ostream<CharT>&>(), fmt, tp),
-                std::basic_string<CharT>{})
-{
-    std::basic_ostringstream<CharT> os;
-    os.exceptions(std::ios::failbit | std::ios::badbit);
-    to_stream(os, fmt, tp);
-    return os.str();
-}
-
-template <class CharT, class Traits, class Alloc, class Streamable>
-auto
-format(const std::locale& loc, const std::basic_string<CharT, Traits, Alloc>& fmt,
-       const Streamable& tp)
-    -> decltype(to_stream(std::declval<std::basic_ostream<CharT, Traits>&>(), fmt.c_str(), tp),
-                std::basic_string<CharT, Traits, Alloc>{})
-{
-    std::basic_ostringstream<CharT, Traits, Alloc> os;
-    os.exceptions(std::ios::failbit | std::ios::badbit);
-    os.imbue(loc);
-    to_stream(os, fmt.c_str(), tp);
-    return os.str();
-}
-
-template <class CharT, class Traits, class Alloc, class Streamable>
-auto
-format(const std::basic_string<CharT, Traits, Alloc>& fmt, const Streamable& tp)
-    -> decltype(to_stream(std::declval<std::basic_ostream<CharT, Traits>&>(), fmt.c_str(), tp),
-                std::basic_string<CharT, Traits, Alloc>{})
-{
-    std::basic_ostringstream<CharT, Traits, Alloc> os;
-    os.exceptions(std::ios::failbit | std::ios::badbit);
-    to_stream(os, fmt.c_str(), tp);
-    return os.str();
-}
-
-// parse
-
-namespace detail
-{
-
-template <class CharT, class Traits>
-bool
-read_char(std::basic_istream<CharT, Traits>& is, CharT fmt, std::ios::iostate& err)
-{
-    auto ic = is.get();
-    if (Traits::eq_int_type(ic, Traits::eof()) ||
-       !Traits::eq(Traits::to_char_type(ic), fmt))
-    {
-        err |= std::ios::failbit;
-        is.setstate(std::ios::failbit);
-        return false;
-    }
-    return true;
-}
-
-template <class CharT, class Traits>
-unsigned
-read_unsigned(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
-{
-    unsigned x = 0;
-    unsigned count = 0;
-    while (true)
-    {
-        auto ic = is.peek();
-        if (Traits::eq_int_type(ic, Traits::eof()))
-            break;
-        auto c = static_cast<char>(Traits::to_char_type(ic));
-        if (!('0' <= c && c <= '9'))
-            break;
-        (void)is.get();
-        ++count;
-        x = 10*x + static_cast<unsigned>(c - '0');
-        if (count == M)
-            break;
-    }
-    if (count < m)
-        is.setstate(std::ios::failbit);
-    return x;
-}
-
-template <class CharT, class Traits>
-int
-read_signed(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
-{
-    auto ic = is.peek();
-    if (!Traits::eq_int_type(ic, Traits::eof()))
-    {
-        auto c = static_cast<char>(Traits::to_char_type(ic));
-        if (('0' <= c && c <= '9') || c == '-' || c == '+')
-        {
-            if (c == '-' || c == '+')
-                (void)is.get();
-            auto x = static_cast<int>(read_unsigned(is, std::max(m, 1u), M));
-            if (!is.fail())
-            {
-                if (c == '-')
-                    x = -x;
-                return x;
-            }
-        }
-    }
-    if (m > 0)
-        is.setstate(std::ios::failbit);
-    return 0;
-}
-
-template <class CharT, class Traits>
-long double
-read_long_double(std::basic_istream<CharT, Traits>& is, unsigned m = 1, unsigned M = 10)
-{
-    using namespace std;
-    unsigned count = 0;
-    auto decimal_point = Traits::to_int_type(
-        use_facet<numpunct<CharT>>(is.getloc()).decimal_point());
-    string buf;
-    while (true)
-    {
-        auto ic = is.peek();
-        if (Traits::eq_int_type(ic, Traits::eof()))
-            break;
-        if (Traits::eq_int_type(ic, decimal_point))
-        {
-            buf += '.';
-            decimal_point = Traits::eof();
-            is.get();
-        }
-        else
-        {
-            auto c = static_cast<char>(Traits::to_char_type(ic));
-            if (!('0' <= c && c <= '9'))
-                break;
-            buf += c;
-            (void)is.get();
-        }
-        if (++count == M)
-            break;
-    }
-    if (count < m)
-    {
-        is.setstate(std::ios::failbit);
-        return 0;
-    }
-    return std::stold(buf);
-}
-
-struct rs
-{
-    int& i;
-    unsigned m;
-    unsigned M;
-};
-
-struct ru
-{
-    int& i;
-    unsigned m;
-    unsigned M;
-};
-
-struct rld
-{
-    long double& i;
-    unsigned m;
-    unsigned M;
-};
-
-template <class CharT, class Traits>
-void
-read(std::basic_istream<CharT, Traits>&)
-{
-}
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, CharT a0, Args&& ...args);
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, rs a0, Args&& ...args);
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, ru a0, Args&& ...args);
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args);
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, rld a0, Args&& ...args);
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, CharT a0, Args&& ...args)
-{
-    // No-op if a0 == CharT{}
-    if (a0 != CharT{})
-    {
-        auto ic = is.peek();
-        if (Traits::eq_int_type(ic, Traits::eof()))
-        {
-            is.setstate(std::ios::failbit | std::ios::eofbit);
-            return;
-        }
-        if (!Traits::eq(Traits::to_char_type(ic), a0))
-        {
-            is.setstate(std::ios::failbit);
-            return;
-        }
-        (void)is.get();
-    }
-    read(is, std::forward<Args>(args)...);
-}
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, rs a0, Args&& ...args)
-{
-    auto x = read_signed(is, a0.m, a0.M);
-    if (is.fail())
-        return;
-    a0.i = x;
-    read(is, std::forward<Args>(args)...);
-}
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, ru a0, Args&& ...args)
-{
-    auto x = read_unsigned(is, a0.m, a0.M);
-    if (is.fail())
-        return;
-    a0.i = static_cast<int>(x);
-    read(is, std::forward<Args>(args)...);
-}
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, int a0, Args&& ...args)
-{
-    if (a0 != -1)
-    {
-        auto u = static_cast<unsigned>(a0);
-        CharT buf[std::numeric_limits<unsigned>::digits10+2] = {};
-        auto e = buf;
-        do
-        {
-            *e++ = CharT(u % 10) + CharT{'0'};
-            u /= 10;
-        } while (u > 0);
-        std::reverse(buf, e);
-        for (auto p = buf; p != e && is.rdstate() == std::ios::goodbit; ++p)
-            read(is, *p);
-    }
-    if (is.rdstate() == std::ios::goodbit)
-        read(is, std::forward<Args>(args)...);
-}
-
-template <class CharT, class Traits, class ...Args>
-void
-read(std::basic_istream<CharT, Traits>& is, rld a0, Args&& ...args)
-{
-    auto x = read_long_double(is, a0.m, a0.M);
-    if (is.fail())
-        return;
-    a0.i = x;
-    read(is, std::forward<Args>(args)...);
-}
-
-}  // namespace detail;
-
-template <class CharT, class Traits, class Duration, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-            fields<Duration>& fds, std::basic_string<CharT, Traits, Alloc>* abbrev,
-            std::chrono::minutes* offset)
-{
-    using namespace std;
-    using namespace std::chrono;
-    typename basic_istream<CharT, Traits>::sentry ok{is, true};
-    if (ok)
-    {
-#if !ONLY_C_LOCALE
-        auto& f = use_facet<time_get<CharT>>(is.getloc());
-        std::tm tm{};
-#endif
-        std::basic_string<CharT, Traits, Alloc> temp_abbrev;
-        minutes temp_offset{};
-        const CharT* command = nullptr;
-        auto modified = CharT{};
-        auto width = -1;
-        CONSTDATA int not_a_year = numeric_limits<short>::min();
-        int Y = not_a_year;
-        CONSTDATA int not_a_century = not_a_year / 100;
-        int C = not_a_century;
-        CONSTDATA int not_a_2digit_year = 100;
-        int y = not_a_2digit_year;
-        int m{};
-        int d{};
-        int j{};
-        CONSTDATA int not_a_weekday = 7;
-        int wd = not_a_weekday;
-        CONSTDATA int not_a_hour_12_value = 0;
-        int I = not_a_hour_12_value;
-        hours h{};
-        minutes min{};
-        Duration s{};
-        int g = not_a_2digit_year;
-        int G = not_a_year;
-        CONSTDATA int not_a_week_num = 100;
-        int V = not_a_week_num;
-        int U = not_a_week_num;
-        int W = not_a_week_num;
-        using detail::read;
-        using detail::rs;
-        using detail::ru;
-        using detail::rld;
-        for (; *fmt && is.rdstate() == std::ios::goodbit; ++fmt)
-        {
-            switch (*fmt)
-            {
-            case 'a':
-            case 'A':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    ios_base::iostate err = ios_base::goodbit;
-                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                    if ((err & ios::failbit) == 0)
-                        wd = tm.tm_wday;
-                    is.setstate(err);
-#else
-                    auto nm = detail::weekday_names();
-                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                    if (!is.fail())
-                        wd = i % 7;
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'b':
-            case 'B':
-            case 'h':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    ios_base::iostate err = ios_base::goodbit;
-                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                    if ((err & ios::failbit) == 0)
-                        m = tm.tm_mon + 1;
-                    is.setstate(err);
-#else
-                    auto nm = detail::month_names();
-                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                    if (!is.fail())
-                        m = i % 12 + 1;
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'c':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    ios_base::iostate err = ios_base::goodbit;
-                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                    if ((err & ios::failbit) == 0)
-                    {
-                        Y = tm.tm_year + 1900;
-                        m = tm.tm_mon + 1;
-                        d = tm.tm_mday;
-                        h = hours{tm.tm_hour};
-                        min = minutes{tm.tm_min};
-                        s = duration_cast<Duration>(seconds{tm.tm_sec});
-                    }
-                    is.setstate(err);
-#else
-                    auto nm = detail::weekday_names();
-                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                    if (is.fail())
-                        goto broken;
-                    wd = i % 7;
-                    ws(is);
-                    nm = detail::month_names();
-                    i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                    if (is.fail())
-                        goto broken;
-                    m = i % 12 + 1;
-                    ws(is);
-                    read(is, rs{d, 1, 2});
-                    if (is.fail())
-                        goto broken;
-                    ws(is);
-                    using dfs = detail::decimal_format_seconds<Duration>;
-                    CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
-                    int H;
-                    int M;
-                    long double S;
-                    read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
-                                          CharT{':'}, rld{S, 1, w});
-                    if (is.fail())
-                        goto broken;
-                    h = hours{H};
-                    min = minutes{M};
-                    s = round<Duration>(duration<long double>{S});
-                    ws(is);
-                    read(is, rs{Y, 1, 4u});
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'x':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    ios_base::iostate err = ios_base::goodbit;
-                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                    if ((err & ios::failbit) == 0)
-                    {
-                        Y = tm.tm_year + 1900;
-                        m = tm.tm_mon + 1;
-                        d = tm.tm_mday;
-                    }
-                    is.setstate(err);
-#else
-                    read(is, ru{m, 1, 2}, CharT{'/'}, ru{d, 1, 2}, CharT{'/'},
-                             rs{y, 1, 2});
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'X':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    ios_base::iostate err = ios_base::goodbit;
-                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                    if ((err & ios::failbit) == 0)
-                    {
-                        h = hours{tm.tm_hour};
-                        min = minutes{tm.tm_min};
-                        s = duration_cast<Duration>(seconds{tm.tm_sec});
-                    }
-                    is.setstate(err);
-#else
-                    using dfs = detail::decimal_format_seconds<Duration>;
-                    CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
-                    int H;
-                    int M;
-                    long double S;
-                    read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
-                                          CharT{':'}, rld{S, 1, w});
-                    if (!is.fail())
-                    {
-                        h = hours{H};
-                        min = minutes{M};
-                        s = round<Duration>(duration<long double>{S});
-                    }
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'C':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-                    {
-#endif
-                        read(is, rs{C, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-#if !ONLY_C_LOCALE
-                    }
-                    else
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                        {
-                            auto tY = tm.tm_year + 1900;
-                            C = (tY >= 0 ? tY : tY-99) / 100;
-                        }
-                        is.setstate(err);
-                    }
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'D':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, ru{m, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'},
-                                 ru{d, 1, 2}, CharT{'\0'}, CharT{'/'}, CharT{'\0'},
-                                 rs{y, 1, 2});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'F':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, rs{Y, 1, width == -1 ? 4u : static_cast<unsigned>(width)},
-                                 CharT{'-'}, ru{m, 1, 2}, CharT{'-'}, ru{d, 1, 2});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'd':
-            case 'e':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-#endif
-                        read(is, rs{d, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-#if !ONLY_C_LOCALE
-                    else if (modified == CharT{'O'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        command = nullptr;
-                        width = -1;
-                        modified = CharT{};
-                        if ((err & ios::failbit) == 0)
-                            d = tm.tm_mday;
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'H':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-                    {
-#endif
-                        int H;
-                        read(is, ru{H, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                        if (!is.fail())
-                            h = hours{H};
-#if !ONLY_C_LOCALE
-                    }
-                    else if (modified == CharT{'O'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            h = hours{tm.tm_hour};
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'I':
-                if (command)
-                {
-                    if (modified == CharT{})
-                    {
-                        // reads in an hour into I, but most be in [1, 12]
-                        read(is, rs{I, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                        if (I != not_a_hour_12_value)
-                        {
-                            if (!(1 <= I && I <= 12))
-                            {
-                                I = not_a_hour_12_value;
-                                goto broken;
-                            }
-                        }
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-               break;
-            case 'j':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, ru{j, 1, width == -1 ? 3u : static_cast<unsigned>(width)});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'M':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-                    {
-#endif
-                        int M;
-                        read(is, ru{M, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                        if (!is.fail())
-                            min = minutes{M};
-#if !ONLY_C_LOCALE
-                    }
-                    else if (modified == CharT{'O'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            min = minutes{tm.tm_min};
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'm':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-#endif
-                        read(is, rs{m, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-#if !ONLY_C_LOCALE
-                    else if (modified == CharT{'O'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            m = tm.tm_mon + 1;
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'n':
-            case 't':
-                if (command)
-                {
-                    // %n matches a single white space character
-                    // %t matches 0 or 1 white space characters
-                    auto ic = is.peek();
-                    if (Traits::eq_int_type(ic, Traits::eof()))
-                    {
-                        ios_base::iostate err = ios_base::eofbit;
-                        if (*fmt == 'n')
-                            err |= ios_base::failbit;
-                        is.setstate(err);
-                        break;
-                    }
-                    if (isspace(ic))
-                    {
-                        (void)is.get();
-                    }
-                    else if (*fmt == 'n')
-                        is.setstate(ios_base::failbit);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'p':
-                // Error if haven't yet seen %I
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-                    {
-                        if (I == not_a_hour_12_value)
-                            goto broken;
-                        tm = std::tm{};
-                        tm.tm_hour = I;
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if (err & ios::failbit)
-                            goto broken;
-                        h = hours{tm.tm_hour};
-                        I = not_a_hour_12_value;
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#else
-                    if (I == not_a_hour_12_value)
-                        goto broken;
-                    auto nm = detail::ampm_names();
-                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                    if (is.fail())
-                        goto broken;
-                    h = hours{I};
-                    if (i == 1)
-                    {
-                        if (h != hours{12})
-                            h += hours{12};
-                    }
-                    else if (h == hours{12})
-                        h = hours{0};
-                    I = not_a_hour_12_value;
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-
-               break;
-            case 'r':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    ios_base::iostate err = ios_base::goodbit;
-                    f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                    if ((err & ios::failbit) == 0)
-                    {
-                        h = hours{tm.tm_hour};
-                        min = minutes{tm.tm_min};
-                        s = duration_cast<Duration>(seconds{tm.tm_sec});
-                    }
-                    is.setstate(err);
-#else
-                    using dfs = detail::decimal_format_seconds<Duration>;
-                    CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
-                    int H;
-                    int M;
-                    long double S;
-                    read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
-                                          CharT{':'}, rld{S, 1, w});
-                    if (is.fail() || !(1 <= H && H <= 12))
-                        goto broken;
-                    ws(is);
-                    auto nm = detail::ampm_names();
-                    auto i = detail::scan_keyword(is, nm.first, nm.second) - nm.first;
-                    if (is.fail())
-                        goto broken;
-                    h = hours{H};
-                    if (i == 1)
-                    {
-                        if (h != hours{12})
-                            h += hours{12};
-                    }
-                    else if (h == hours{12})
-                        h = hours{0};
-                    min = minutes{M};
-                    s = round<Duration>(duration<long double>{S});
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'R':
-                if (command)
-                {
-                    if (modified == CharT{})
-                    {
-                        int H, M;
-                        read(is, ru{H, 1, 2}, CharT{'\0'}, CharT{':'}, CharT{'\0'},
-                                 ru{M, 1, 2}, CharT{'\0'});
-                        if (!is.fail())
-                        {
-                            h = hours{H};
-                            min = minutes{M};
-                        }
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'S':
-                if (command)
-                {
- #if !ONLY_C_LOCALE
-                   if (modified == CharT{})
-                    {
-#endif
-                        using dfs = detail::decimal_format_seconds<Duration>;
-                        CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
-                        long double S;
-                        read(is, rld{S, 1, width == -1 ? w : static_cast<unsigned>(width)});
-                        if (!is.fail())
-                            s = round<Duration>(duration<long double>{S});
-#if !ONLY_C_LOCALE
-                    }
-                    else if (modified == CharT{'O'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            s = duration_cast<Duration>(seconds{tm.tm_sec});
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'T':
-                if (command)
-                {
-                    if (modified == CharT{})
-                    {
-                        using dfs = detail::decimal_format_seconds<Duration>;
-                        CONSTDATA auto w = Duration::period::den == 1 ? 2 : 3 + dfs::width;
-                        int H;
-                        int M;
-                        long double S;
-                        read(is, ru{H, 1, 2}, CharT{':'}, ru{M, 1, 2},
-                                              CharT{':'}, rld{S, 1, w});
-                        if (!is.fail())
-                        {
-                            h = hours{H};
-                            min = minutes{M};
-                            s = round<Duration>(duration<long double>{S});
-                        }
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'Y':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-#endif
-                        read(is, rs{Y, 1, width == -1 ? 4u : static_cast<unsigned>(width)});
-#if !ONLY_C_LOCALE
-                    else if (modified == CharT{'E'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            Y = tm.tm_year + 1900;
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'y':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-#endif
-                        read(is, ru{y, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-#if !ONLY_C_LOCALE
-                    else
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            Y = tm.tm_year + 1900;
-                        is.setstate(err);
-                    }
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'g':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, ru{g, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'G':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, rs{G, 1, width == -1 ? 4u : static_cast<unsigned>(width)});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'U':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, ru{U, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'V':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, ru{V, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'W':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, ru{W, 1, width == -1 ? 2u : static_cast<unsigned>(width)});
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'u':
-            case 'w':
-                if (command)
-                {
-#if !ONLY_C_LOCALE
-                    if (modified == CharT{})
-                    {
-#endif
-                        read(is, ru{wd, 1, width == -1 ? 1u : static_cast<unsigned>(width)});
-                        if (!is.fail() && *fmt == 'u')
-                        {
-                            if (wd == 7)
-                                wd = 0;
-                            else if (wd == 0)
-                                wd = 7;
-                        }
-#if !ONLY_C_LOCALE
-                    }
-                    else if (modified == CharT{'O'})
-                    {
-                        ios_base::iostate err = ios_base::goodbit;
-                        f.get(is, nullptr, is, err, &tm, command, fmt+1);
-                        if ((err & ios::failbit) == 0)
-                            wd = tm.tm_wday;
-                        is.setstate(err);
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-#endif
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'E':
-            case 'O':
-                if (command)
-                {
-                    if (modified == CharT{})
-                    {
-                        modified = *fmt;
-                    }
-                    else
-                    {
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                        command = nullptr;
-                        width = -1;
-                        modified = CharT{};
-                    }
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case '%':
-                if (command)
-                {
-                    if (modified == CharT{})
-                        read(is, *fmt);
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    command = fmt;
-                break;
-            case 'z':
-                if (command)
-                {
-                    int H, M;
-                    if (modified == CharT{})
-                        read(is, rs{H, 2, 2}, ru{M, 2, 2});
-                    else
-                        read(is, rs{H, 1, 2}, CharT{':'}, ru{M, 2, 2});
-                    if (!is.fail())
-                        temp_offset = hours{ H } + minutes{ H < 0 ? -M : M };
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            case 'Z':
-                if (command)
-                {
-                    if (modified == CharT{})
-                    {
-                        if (!temp_abbrev.empty())
-                            is.setstate(ios::failbit);
-                        else
-                        {
-                            while (is.rdstate() == std::ios::goodbit)
-                            {
-                                auto i = is.rdbuf()->sgetc();
-                                if (Traits::eq_int_type(i, Traits::eof()))
-                                {
-                                    is.setstate(ios::eofbit);
-                                    break;
-                                }
-                                auto wc = Traits::to_char_type(i);
-                                auto c = static_cast<char>(wc);
-                                // is c a valid time zone name or abbreviation character?
-                                if (!(CharT{1} < wc && wc < CharT{127}) || !(isalnum(c) ||
-                                        c == '_' || c == '/' || c == '-' || c == '+'))
-                                    break;
-                                temp_abbrev.push_back(c);
-                                is.rdbuf()->sbumpc();
-                            }
-                            if (temp_abbrev.empty())
-                                is.setstate(ios::failbit);
-                        }
-                    }
-                    else
-                        read(is, CharT{'%'}, width, modified, *fmt);
-                    command = nullptr;
-                    width = -1;
-                    modified = CharT{};
-                }
-                else
-                    read(is, *fmt);
-                break;
-            default:
-                if (command)
-                {
-                    if (width == -1 && modified == CharT{} && '0' <= *fmt && *fmt <= '9')
-                    {
-                        width = static_cast<char>(*fmt) - '0';
-                        while ('0' <= fmt[1] && fmt[1] <= '9')
-                            width = 10*width + static_cast<char>(*++fmt) - '0';
-                    }
-                    else
-                    {
-                        if (modified == CharT{})
-                            read(is, CharT{'%'}, width, *fmt);
-                        else
-                            read(is, CharT{'%'}, width, modified, *fmt);
-                        command = nullptr;
-                        width = -1;
-                        modified = CharT{};
-                    }
-                }
-                else  // !command
-                {
-                    if (isspace(*fmt))
-                        ws(is); // space matches 0 or more white space characters
-                    else
-                        read(is, *fmt);
-                }
-                break;
-            }
-        }
-        // is.rdstate() != ios::goodbit || *fmt == CharT{}
-        if (is.rdstate() == ios::goodbit && command)
-        {
-            if (modified == CharT{})
-                read(is, CharT{'%'}, width);
-            else
-                read(is, CharT{'%'}, width, modified);
-        }
-        if (is.rdstate() != ios::goodbit && *fmt != CharT{} && !is.fail())
-            is.setstate(ios::failbit);
-        if (!is.fail())
-        {
-            if (y != not_a_2digit_year)
-            {
-                // Convert y and an optional C to Y
-                if (!(0 <= y && y <= 99))
-                    goto broken;
-                if (C == not_a_century)
-                {
-                    if (Y == not_a_year)
-                    {
-                        if (y >= 69)
-                            C = 19;
-                        else
-                            C = 20;
-                    }
-                    else
-                    {
-                        C = (Y >= 0 ? Y : Y-100) / 100;
-                    }
-                }
-                int tY;
-                if (C >= 0)
-                    tY = 100*C + y;
-                else
-                    tY = 100*(C+1) - (y == 0 ? 100 : y);
-                if (Y != not_a_year && Y != tY)
-                    goto broken;
-                Y = tY;
-            }
-            if (g != not_a_2digit_year)
-            {
-                // Convert g and an optional C to G
-                if (!(0 <= g && g <= 99))
-                    goto broken;
-                if (C == not_a_century)
-                {
-                    if (G == not_a_year)
-                    {
-                        if (g >= 69)
-                            C = 19;
-                        else
-                            C = 20;
-                    }
-                    else
-                    {
-                        C = (G >= 0 ? G : G-100) / 100;
-                    }
-                }
-                int tG;
-                if (C >= 0)
-                    tG = 100*C + g;
-                else
-                    tG = 100*(C+1) - (g == 0 ? 100 : g);
-                if (G != not_a_year && G != tG)
-                    goto broken;
-                G = tG;
-            }
-            if (G != not_a_year)
-            {
-                // Convert G, V and wd to Y, m and d
-                if (V == not_a_week_num || wd == not_a_weekday)
-                    goto broken;
-                auto ymd = year_month_day{local_days(year{G-1}/dec/thu[last]) +
-                                          (mon-thu) + weeks{V-1} +
-                                          (weekday{static_cast<unsigned>(wd)}-mon)};
-                if (Y == not_a_year)
-                    Y = static_cast<int>(ymd.year());
-                else if (year{Y} != ymd.year())
-                    goto broken;
-                if (m == 0)
-                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
-                else if (month(static_cast<unsigned>(m)) != ymd.month())
-                    goto broken;
-                if (d == 0)
-                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
-                else if (day(static_cast<unsigned>(d)) != ymd.day())
-                    goto broken;
-            }
-            if (j != 0 && Y != not_a_year)
-            {
-                auto ymd = year_month_day{local_days(year{Y}/1/1) + days{j-1}};
-                if (m == 0)
-                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
-                else if (month(static_cast<unsigned>(m)) != ymd.month())
-                    goto broken;
-                if (d == 0)
-                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
-                else if (day(static_cast<unsigned>(d)) != ymd.day())
-                    goto broken;
-            }
-            if (U != not_a_week_num && Y != not_a_year)
-            {
-                if (wd == not_a_weekday)
-                    goto broken;
-                sys_days sd;
-                if (U == 0)
-                    sd = year{Y-1}/dec/weekday{static_cast<unsigned>(wd)}[last];
-                else
-                    sd = sys_days(year{Y}/jan/sun[1]) + weeks{U-1} +
-                         (weekday{static_cast<unsigned>(wd)} - sun);
-                year_month_day ymd = sd;
-                if (year{Y} != ymd.year())
-                    goto broken;
-                if (m == 0)
-                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
-                else if (month(static_cast<unsigned>(m)) != ymd.month())
-                    goto broken;
-                if (d == 0)
-                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
-                else if (day(static_cast<unsigned>(d)) != ymd.day())
-                    goto broken;
-            }
-            if (W != not_a_week_num && Y != not_a_year)
-            {
-                if (wd == not_a_weekday)
-                    goto broken;
-                sys_days sd;
-                if (W == 0)
-                    sd = year{Y-1}/dec/weekday{static_cast<unsigned>(wd)}[last];
-                else
-                    sd = sys_days(year{Y}/jan/mon[1]) + weeks{W-1} +
-                         (weekday{static_cast<unsigned>(wd)} - mon);
-                year_month_day ymd = sd;
-                if (year{Y} != ymd.year())
-                    goto broken;
-                if (m == 0)
-                    m = static_cast<int>(static_cast<unsigned>(ymd.month()));
-                else if (month(static_cast<unsigned>(m)) != ymd.month())
-                    goto broken;
-                if (d == 0)
-                    d = static_cast<int>(static_cast<unsigned>(ymd.day()));
-                else if (day(static_cast<unsigned>(d)) != ymd.day())
-                    goto broken;
-            }
-            if (Y < static_cast<int>(year::min()) || Y > static_cast<int>(year::max()))
-                Y = not_a_year;
-            auto ymd = year{Y}/m/d;
-            if (wd != not_a_weekday && ymd.ok())
-            {
-                if (weekday{static_cast<unsigned>(wd)} != weekday(ymd))
-                    goto broken;
-            }
-            fds.ymd = ymd;
-            fds.tod = time_of_day<Duration>(hours{h} + minutes{min});
-            fds.tod.s_ = detail::decimal_format_seconds<Duration>{s};
-            if (wd != not_a_weekday)
-                fds.wd = weekday{static_cast<unsigned>(wd)};
-            if (abbrev != nullptr)
-                *abbrev = std::move(temp_abbrev);
-            if (offset != nullptr)
-                *offset = temp_offset;
-        }
-        return is;
-    }
-broken:
-    is.setstate(ios_base::failbit);
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, year& y,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.year().ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        y = fds.ymd.year();
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, month& m,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.month().ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        m = fds.ymd.month();
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, day& d,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.day().ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        d = fds.ymd.day();
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, weekday& wd,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.wd.ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        wd = fds.wd;
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, year_month& ym,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.month().ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        ym = fds.ymd.year()/fds.ymd.month();
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt, month_day& md,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.month().ok() || !fds.ymd.day().ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        md = fds.ymd.month()/fds.ymd.day();
-    return is;
-}
-
-template <class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-            year_month_day& ymd, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = seconds;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.ok())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        ymd = fds.ymd;
-    return is;
-}
-
-template <class Duration, class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-            sys_time<Duration>& tp, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = typename common_type<Duration, seconds>::type;
-    minutes offset_local{};
-    auto offptr = offset ? offset : &offset_local;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offptr);
-    if (!fds.ymd.ok() || !fds.tod.in_conventional_range())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        tp = round<Duration>(sys_days(fds.ymd) - *offptr + fds.tod.to_duration());
-    return is;
-}
-
-template <class Duration, class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-            local_time<Duration>& tp, std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using CT = typename common_type<Duration, seconds>::type;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!fds.ymd.ok() || !fds.tod.in_conventional_range())
-        is.setstate(ios::failbit);
-    if (!is.fail())
-        tp = round<Duration>(local_seconds{local_days(fds.ymd)} + fds.tod.to_duration());
-    return is;
-}
-
-template <class Rep, class Period, class CharT, class Traits, class Alloc = std::allocator<CharT>>
-std::basic_istream<CharT, Traits>&
-from_stream(std::basic_istream<CharT, Traits>& is, const CharT* fmt,
-            std::chrono::duration<Rep, Period>& d,
-            std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-            std::chrono::minutes* offset = nullptr)
-{
-    using namespace std;
-    using namespace std::chrono;
-    using Duration = std::chrono::duration<Rep, Period>;
-    using CT = typename common_type<Duration, seconds>::type;
-    fields<CT> fds{};
-    from_stream(is, fmt, fds, abbrev, offset);
-    if (!is.fail())
-        d = duration_cast<Duration>(fds.tod.to_duration());
-    return is;
-}
-
-template <class Parsable, class CharT, class Traits = std::char_traits<CharT>,
-          class Alloc = std::allocator<CharT>>
-struct parse_manip
-{
-    const std::basic_string<CharT, Traits, Alloc> format_;
-    Parsable&                                     tp_;
-    std::basic_string<CharT, Traits, Alloc>*      abbrev_;
-    std::chrono::minutes*                         offset_;
-
-public:
-    parse_manip(std::basic_string<CharT, Traits, Alloc> format, Parsable& tp,
-                std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
-                std::chrono::minutes* offset = nullptr)
-        : format_(std::move(format))
-        , tp_(tp)
-        , abbrev_(abbrev)
-        , offset_(offset)
-        {}
-
-};
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-std::basic_istream<CharT, Traits>&
-operator>>(std::basic_istream<CharT, Traits>& is,
-           const parse_manip<Parsable, CharT, Traits, Alloc>& x)
-{
-    return from_stream(is, x.format_.c_str(), x.tp_, x.abbrev_, x.offset_);
-}
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-inline
-auto
-parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
-                            format.c_str(), tp),
-                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp})
-{
-    return {format, tp};
-}
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-inline
-auto
-parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp,
-      std::basic_string<CharT, Traits, Alloc>& abbrev)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
-                            format.c_str(), tp, &abbrev),
-                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev})
-{
-    return {format, tp, &abbrev};
-}
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-inline
-auto
-parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp,
-      std::chrono::minutes& offset)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
-                            format.c_str(), tp, nullptr, &offset),
-                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, nullptr, &offset})
-{
-    return {format, tp, nullptr, &offset};
-}
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-inline
-auto
-parse(const std::basic_string<CharT, Traits, Alloc>& format, Parsable& tp,
-      std::basic_string<CharT, Traits, Alloc>& abbrev, std::chrono::minutes& offset)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(),
-                            format.c_str(), tp, &abbrev, &offset),
-                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev, &offset})
-{
-    return {format, tp, &abbrev, &offset};
-}
-
-// const CharT* formats
-
-template <class Parsable, class CharT>
-inline
-auto
-parse(const CharT* format, Parsable& tp)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT>&>(), format, tp),
-                parse_manip<Parsable, CharT>{format, tp})
-{
-    return {format, tp};
-}
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-inline
-auto
-parse(const CharT* format, Parsable& tp, std::basic_string<CharT, Traits, Alloc>& abbrev)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format,
-                            tp, &abbrev),
-                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev})
-{
-    return {format, tp, &abbrev};
-}
-
-template <class Parsable, class CharT>
-inline
-auto
-parse(const CharT* format, Parsable& tp, std::chrono::minutes& offset)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT>&>(), format,
-                            tp, nullptr, &offset),
-                parse_manip<Parsable, CharT>{format, tp, nullptr, &offset})
-{
-    return {format, tp, nullptr, &offset};
-}
-
-template <class Parsable, class CharT, class Traits, class Alloc>
-inline
-auto
-parse(const CharT* format, Parsable& tp,
-      std::basic_string<CharT, Traits, Alloc>& abbrev, std::chrono::minutes& offset)
-    -> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format,
-                            tp, &abbrev, &offset),
-                parse_manip<Parsable, CharT, Traits, Alloc>{format, tp, &abbrev, &offset})
-{
-    return {format, tp, &abbrev, &offset};
-}
-
-// duration streaming
-
-namespace detail
-{
-
-#if __cplusplus >= 201402  && (!defined(__EDG_VERSION__) || __EDG_VERSION__ > 411) \
-                           && (!defined(__SUNPRO_CC) || __SUNPRO_CC > 0x5150)
-
-template <class CharT, std::size_t N>
-class string_literal
-{
-    CharT p_[N];
-
-public:
-    using const_iterator = const CharT*;
-
-    string_literal(string_literal const&) = default;
-    string_literal& operator=(string_literal const&) = delete;
-
-    template <std::size_t N1 = 2,
-              class = std::enable_if_t<N1 == N>>
-    CONSTCD14 string_literal(CharT c) NOEXCEPT
-        : p_{c}
-    {
-    }
-
-    CONSTCD14 string_literal(const CharT(&a)[N]) NOEXCEPT
-        : p_{}
-    {
-        for (std::size_t i = 0; i < N; ++i)
-            p_[i] = a[i];
-    }
-
-    template <class U = CharT, class = std::enable_if_t<1 < sizeof(U)>>
-    CONSTCD14 string_literal(const char(&a)[N]) NOEXCEPT
-        : p_{}
-    {
-        for (std::size_t i = 0; i < N; ++i)
-            p_[i] = a[i];
-    }
-
-    template <class CharT2, class = std::enable_if_t<!std::is_same<CharT2, CharT>{}>>
-    CONSTCD14 string_literal(string_literal<CharT2, N> const& a) NOEXCEPT
-        : p_{}
-    {
-        for (std::size_t i = 0; i < N; ++i)
-            p_[i] = a[i];
-    }
-
-    template <std::size_t N1, std::size_t N2,
-              class = std::enable_if_t<N1 + N2 - 1 == N>>
-    CONSTCD14 string_literal(const string_literal<CharT, N1>& x,
-                             const string_literal<CharT, N2>& y) NOEXCEPT
-        : p_{}
-    {
-        std::size_t i = 0;
-        for (; i < N1-1; ++i)
-            p_[i] = x[i];
-        for (std::size_t j = 0; j < N2; ++j, ++i)
-            p_[i] = y[j];
-    }
-
-    CONSTCD14 const CharT* data() const NOEXCEPT {return p_;}
-    CONSTCD14 std::size_t size() const NOEXCEPT {return N-1;}
-
-    CONSTCD14 const_iterator begin() const NOEXCEPT {return p_;}
-    CONSTCD14 const_iterator end()   const NOEXCEPT {return p_ + N-1;}
-
-    CONSTCD14 CharT const& operator[](std::size_t n) const NOEXCEPT
-    {
-        return p_[n];
-    }
-
-    template <class Traits>
-    friend
-    std::basic_ostream<CharT, Traits>&
-    operator<<(std::basic_ostream<CharT, Traits>& os, const string_literal& s)
-    {
-        return os << s.p_;
-    }
-};
-
-template <class CharT1, class CharT2, std::size_t N1, std::size_t N2>
-CONSTCD14
-inline
-string_literal<std::conditional_t<sizeof(CharT2) <= sizeof(CharT1), CharT1, CharT2>,
-               N1 + N2 - 1>
-operator+(const string_literal<CharT1, N1>& x, const string_literal<CharT2, N2>& y) NOEXCEPT
-{
-    using CharT = std::conditional_t<sizeof(CharT2) <= sizeof(CharT1), CharT1, CharT2>;
-    return string_literal<CharT, N1 + N2 - 1>{string_literal<CharT, N1>{x},
-                                              string_literal<CharT, N2>{y}};
-}
-
-template <class CharT, class Traits, class Alloc, std::size_t N>
-inline
-std::basic_string<CharT, Traits, Alloc>
-operator+(std::basic_string<CharT, Traits, Alloc> x,
-          const string_literal<CharT, N>& y) NOEXCEPT
-{
-    x.append(y.data(), y.size());
-    return x;
-}
-
-template <class CharT, std::size_t N>
-CONSTCD14
-inline
-string_literal<CharT, N>
-msl(const CharT(&a)[N]) NOEXCEPT
-{
-    return string_literal<CharT, N>{a};
-}
-
-template <class CharT,
-          class = std::enable_if_t<std::is_same<CharT, char>{} ||
-                                   std::is_same<CharT, wchar_t>{} ||
-                                   std::is_same<CharT, char16_t>{} ||
-                                   std::is_same<CharT, char32_t>{}>>
-CONSTCD14
-inline
-string_literal<CharT, 2>
-msl(CharT c) NOEXCEPT
-{
-    return string_literal<CharT, 2>{c};
-}
-
-CONSTCD14
-inline
-std::size_t
-to_string_len(std::intmax_t i)
-{
-    std::size_t r = 0;
-    do
-    {
-        i /= 10;
-        ++r;
-    } while (i > 0);
-    return r;
-}
-
-template <std::intmax_t N>
-CONSTCD14
-inline
-std::enable_if_t
-<
-    N < 10,
-    string_literal<char, to_string_len(N)+1>
->
-msl() NOEXCEPT
-{
-    return msl(char(N % 10 + '0'));
-}
-
-template <std::intmax_t N>
-CONSTCD14
-inline
-std::enable_if_t
-<
-    10 <= N,
-    string_literal<char, to_string_len(N)+1>
->
-msl() NOEXCEPT
-{
-    return msl<N/10>() + msl(char(N % 10 + '0'));
-}
-
-template <class CharT, std::intmax_t N, std::intmax_t D>
-CONSTCD14
-inline
-std::enable_if_t
-<
-    std::ratio<N, D>::type::den != 1,
-    string_literal<CharT, to_string_len(std::ratio<N, D>::type::num) +
-                          to_string_len(std::ratio<N, D>::type::den) + 4>
->
-msl(std::ratio<N, D>) NOEXCEPT
-{
-    using R = typename std::ratio<N, D>::type;
-    return msl(CharT{'['}) + msl<R::num>() + msl(CharT{'/'}) +
-                             msl<R::den>() + msl(CharT{']'});
-}
-
-template <class CharT, std::intmax_t N, std::intmax_t D>
-CONSTCD14
-inline
-std::enable_if_t
-<
-    std::ratio<N, D>::type::den == 1,
-    string_literal<CharT, to_string_len(std::ratio<N, D>::type::num) + 3>
->
-msl(std::ratio<N, D>) NOEXCEPT
-{
-    using R = typename std::ratio<N, D>::type;
-    return msl(CharT{'['}) + msl<R::num>() + msl(CharT{']'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::atto) NOEXCEPT
-{
-    return msl(CharT{'a'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::femto) NOEXCEPT
-{
-    return msl(CharT{'f'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::pico) NOEXCEPT
-{
-    return msl(CharT{'p'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::nano) NOEXCEPT
-{
-    return msl(CharT{'n'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-std::enable_if_t
-<
-    std::is_same<CharT, char>{},
-    string_literal<char, 3>
->
-msl(std::micro) NOEXCEPT
-{
-    return string_literal<char, 3>{"\xC2\xB5"};
-}
-
-template <class CharT>
-CONSTCD14
-inline
-std::enable_if_t
-<
-    !std::is_same<CharT, char>{},
-    string_literal<CharT, 2>
->
-msl(std::micro) NOEXCEPT
-{
-    return string_literal<CharT, 2>{CharT{static_cast<unsigned char>('\xB5')}};
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::milli) NOEXCEPT
-{
-    return msl(CharT{'m'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::centi) NOEXCEPT
-{
-    return msl(CharT{'c'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::deci) NOEXCEPT
-{
-    return msl(CharT{'d'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::deca) NOEXCEPT
-{
-    return string_literal<CharT, 3>{"da"};
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::hecto) NOEXCEPT
-{
-    return msl(CharT{'h'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::kilo) NOEXCEPT
-{
-    return msl(CharT{'k'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::mega) NOEXCEPT
-{
-    return msl(CharT{'M'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::giga) NOEXCEPT
-{
-    return msl(CharT{'G'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::tera) NOEXCEPT
-{
-    return msl(CharT{'T'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::peta) NOEXCEPT
-{
-    return msl(CharT{'P'});
-}
-
-template <class CharT>
-CONSTCD14
-inline
-auto
-msl(std::exa) NOEXCEPT
-{
-    return msl(CharT{'E'});
-}
-
-template <class CharT, class Period>
-CONSTCD14
-auto
-get_units(Period p)
-{
-    return msl<CharT>(p) + string_literal<CharT, 2>{"s"};
-}
-
-template <class CharT>
-CONSTCD14
-auto
-get_units(std::ratio<1>)
-{
-    return string_literal<CharT, 2>{"s"};
-}
-
-template <class CharT>
-CONSTCD14
-auto
-get_units(std::ratio<60>)
-{
-    return string_literal<CharT, 4>{"min"};
-}
-
-template <class CharT>
-CONSTCD14
-auto
-get_units(std::ratio<3600>)
-{
-    return string_literal<CharT, 2>{"h"};
-}
-
-#else  // __cplusplus < 201402 || (defined(__EDG_VERSION__) && __EDG_VERSION__ <= 411)
-
-inline
-std::string
-to_string(std::uint64_t x)
-{
-    return std::to_string(x);
-}
-
-template <class CharT>
-std::basic_string<CharT>
-to_string(std::uint64_t x)
-{
-    auto y = std::to_string(x);
-    return std::basic_string<CharT>(y.begin(), y.end());
-}
-
-template <class CharT, std::intmax_t N, std::intmax_t D>
-inline
-typename std::enable_if
-<
-    std::ratio<N, D>::type::den != 1,
-    std::basic_string<CharT>
->::type
-msl(std::ratio<N, D>)
-{
-    using R = typename std::ratio<N, D>::type;
-    return std::basic_string<CharT>(1, '[') + to_string<CharT>(R::num) + CharT{'/'} +
-                                              to_string<CharT>(R::den) + CharT{']'};
-}
-
-template <class CharT, std::intmax_t N, std::intmax_t D>
-inline
-typename std::enable_if
-<
-    std::ratio<N, D>::type::den == 1,
-    std::basic_string<CharT>
->::type
-msl(std::ratio<N, D>)
-{
-    using R = typename std::ratio<N, D>::type;
-    return std::basic_string<CharT>(1, '[') + to_string<CharT>(R::num) + CharT{']'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::atto)
-{
-    return {'a'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::femto)
-{
-    return {'f'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::pico)
-{
-    return {'p'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::nano)
-{
-    return {'n'};
-}
-
-template <class CharT>
-inline
-typename std::enable_if
-<
-    std::is_same<CharT, char>::value,
-    std::string
->::type
-msl(std::micro)
-{
-    return "\xC2\xB5";
-}
-
-template <class CharT>
-inline
-typename std::enable_if
-<
-    !std::is_same<CharT, char>::value,
-    std::basic_string<CharT>
->::type
-msl(std::micro)
-{
-    return {CharT(static_cast<unsigned char>('\xB5'))};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::milli)
-{
-    return {'m'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::centi)
-{
-    return {'c'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::deci)
-{
-    return {'d'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::deca)
-{
-    return {'d', 'a'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::hecto)
-{
-    return {'h'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::kilo)
-{
-    return {'k'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::mega)
-{
-    return {'M'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::giga)
-{
-    return {'G'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::tera)
-{
-    return {'T'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::peta)
-{
-    return {'P'};
-}
-
-template <class CharT>
-inline
-std::basic_string<CharT>
-msl(std::exa)
-{
-    return {'E'};
-}
-
-template <class CharT, class Period>
-std::basic_string<CharT>
-get_units(Period p)
-{
-    return msl<CharT>(p) + CharT{'s'};
-}
-
-template <class CharT>
-std::basic_string<CharT>
-get_units(std::ratio<1>)
-{
-    return {'s'};
-}
-
-template <class CharT>
-std::basic_string<CharT>
-get_units(std::ratio<60>)
-{
-    return {'m', 'i', 'n'};
-}
-
-template <class CharT>
-std::basic_string<CharT>
-get_units(std::ratio<3600>)
-{
-    return {'h'};
-}
-
-#endif  // __cplusplus < 201402 || (defined(__EDG_VERSION__) && __EDG_VERSION__ <= 411)
-
-template <class CharT, class Traits = std::char_traits<CharT>>
-struct make_string;
-
-template <>
-struct make_string<char>
-{
-    template <class Rep>
-    static
-    std::string
-    from(Rep n)
-    {
-        return std::to_string(n);
-    }
-};
-
-template <class Traits>
-struct make_string<char, Traits>
-{
-    template <class Rep>
-    static
-    std::basic_string<char, Traits>
-    from(Rep n)
-    {
-        auto s = std::to_string(n);
-        return std::basic_string<char, Traits>(s.begin(), s.end());
-    }
-};
-
-template <>
-struct make_string<wchar_t>
-{
-    template <class Rep>
-    static
-    std::wstring
-    from(Rep n)
-    {
-        return std::to_wstring(n);
-    }
-};
-
-template <class Traits>
-struct make_string<wchar_t, Traits>
-{
-    template <class Rep>
-    static
-    std::basic_string<wchar_t, Traits>
-    from(Rep n)
-    {
-        auto s = std::to_wstring(n);
-        return std::basic_string<wchar_t, Traits>(s.begin(), s.end());
-    }
-};
-
-}  // namespace detail
-
-template <class CharT, class Traits, class Rep, class Period>
-inline
-std::basic_ostream<CharT, Traits>&
-operator<<(std::basic_ostream<CharT, Traits>& os,
-           const std::chrono::duration<Rep, Period>& d)
-{
-    using namespace detail;
-    return os << make_string<CharT, Traits>::from(d.count()) +
-                 get_units<CharT>(typename Period::type{});
-}
-
-}  // namespace date
-
-
-#ifdef __GNUC__
-# pragma GCC diagnostic pop
-#endif
-
-
-#endif  // DATE_H
diff --git a/Src/Scarab/library/logger/CMakeLists.txt b/Src/Scarab/library/logger/CMakeLists.txt
deleted file mode 100644
index e9aa952..0000000
--- a/Src/Scarab/library/logger/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# CMakeLists.txt for Scarab/library/logger
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/logger.hh
-    PARENT_SCOPE )
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/logger.cc
-    PARENT_SCOPE )
diff --git a/Src/Scarab/library/logger/logger.cc b/Src/Scarab/library/logger/logger.cc
deleted file mode 100644
index bdbbb87..0000000
--- a/Src/Scarab/library/logger/logger.cc
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * logger.cxx
- * based on KLogger.cxx from KATRIN's Kasper
- *
- *  Created on: 18.11.2011
- *      Author: Marco Haag <marco.haag@kit.edu>
- */
-
-#define SCARAB_API_EXPORTS
-
-
-#include <algorithm>
-#include <cstring> // for strrchr
-#include <iomanip>
-#include <iterator>
-#include <mutex>
-#include <set>
-#include <time.h>
-
-#ifndef NDEBUG
-#include <thread>
-#endif
-
-#include "logger.hh"
-
-using namespace std;
-
-namespace scarab
-{
-    const string& EndColor()   {static string* color = new string(COLOR_PREFIX COLOR_NORMAL COLOR_SUFFIX); return *color;}
-    const string& FatalColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_RED    COLOR_SUFFIX); return *color;}
-    const string& ErrorColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_RED    COLOR_SUFFIX); return *color;}
-    const string& WarnColor()  {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_YELLOW COLOR_SUFFIX); return *color;}
-    const string& InfoColor()  {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_GREEN  COLOR_SUFFIX); return *color;}
-    const string& ProgColor()  {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_BLUE   COLOR_SUFFIX); return *color;}
-    const string& DebugColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_CYAN   COLOR_SUFFIX); return *color;}
-    const string& TraceColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_WHITE  COLOR_SUFFIX); return *color;}
-    const string& OtherColor() {static string* color = new string(COLOR_PREFIX COLOR_BRIGHT COLOR_SEPARATOR COLOR_FOREGROUND_WHITE  COLOR_SUFFIX); return *color;}
-
-    struct logger::Private
-    {
-        static unsigned& count()
-        {
-            static unsigned sCount = 0;
-            return sCount;
-        }
-
-        static std::mutex& mutex()
-        {
-            static std::mutex sMutex;
-            return sMutex;
-        }
-
-        typedef std::set< logger* > LoggerSet;
-        static std::shared_ptr<LoggerSet>& AllLoggers()
-        {
-            // construct-on-first-use strategy to avoid static initialization fiasco
-            static std::shared_ptr<LoggerSet> sAllLoggers = std::make_shared< LoggerSet >();
-            return sAllLoggers;
-        }
-
-        static char* dateTimeFormat()
-        {
-            static char sDateTimeFormat[16];
-
-            return sDateTimeFormat;
-        }
-
-        static char* getTimeAbsoluteStr( bool aGetNewTime = false )
-        {
-            static char sTimeBuff[512];
-            static time_t sRawTime;
-            static tm* sProcessedTime;
-
-            if( ! aGetNewTime ) return sTimeBuff;
-
-            time(&sRawTime);
-
-            sProcessedTime = localtime(&sRawTime);
-            strftime(sTimeBuff, 512, logger::Private::dateTimeFormat(), sProcessedTime);
-
-            return sTimeBuff;
-        }
-
-
-        const char* fLogger;
-
-        static bool& colored()
-        {
-#ifndef _WIN32
-            static bool sColored = true;
-#else
-            static bool sColored = false;
-#endif
-            return sColored;
-        }
-
-        static std::ostream*& out()
-        {
-            static std::ostream* sOut = &std::cout;
-            return sOut;
-        }
-
-        static std::ostream*& err()
-        {
-            static std::ostream* sErr = &std::cerr;
-            return sErr;
-        }
-
-        ELevel fThreshold;
-        bool fThresholdIsGlobal;
-
-        static ELevel& GlobalThreshold()
-        {
-            // construct-on-first-use strategy to avoid static initialization fiasco
-            static ELevel sGlobalThreshold = logger::Private::filterMinimumLevel(ELevel::eDebug);
-            return sGlobalThreshold;
-        }
-
-        static const char* level2Str(ELevel level)
-        {
-            switch(level)
-            {
-                case ELevel::eTrace : return "TRACE"; break;
-                case ELevel::eDebug : return "DEBUG"; break;
-                case ELevel::eInfo  : return "INFO"; break;
-                case ELevel::eProg  : return "PROG"; break;
-                case ELevel::eWarn  : return "WARN"; break;
-                case ELevel::eError : return "ERROR"; break;
-                case ELevel::eFatal : return "FATAL"; break;
-                default     : return "XXX";
-            }
-        }
-
-        static string level2Color(ELevel level)
-        {
-            switch(level)
-            {
-                case ELevel::eTrace : return TraceColor(); break;
-                case ELevel::eDebug : return DebugColor(); break;
-                case ELevel::eInfo  : return InfoColor(); break;
-                case ELevel::eProg  : return ProgColor(); break;
-                case ELevel::eWarn  : return WarnColor(); break;
-                case ELevel::eError : return ErrorColor(); break;
-                case ELevel::eFatal : return FatalColor(); break;
-                default     : return OtherColor();
-            }
-        }
-
-        static ELevel filterMinimumLevel(ELevel level)
-        {
-#if defined(NDEBUG) && defined(STANDARD)
-            return level >= ELevel::eInfo ? level : ELevel::eInfo;
-#elif defined(NDEBUG)
-            return level >= ELevel::eProg ? level : ELevel::eProg;
-#else
-            return level;
-#endif
-        }
-
-
-        void logCout(ELevel level, const string& message, const Location& loc)
-        {
-            logger::Private::mutex().lock();
-            logger::Private::getTimeAbsoluteStr( true );
-            if (logger::Private::colored())
-            {
-                //cout << color << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << skKTEndColor << endl;
-                *logger::Private::out() << Private::level2Color(level) << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
-#ifndef NDEBUG
-                *logger::Private::out() << "(tid " << std::this_thread::get_id() << ") ";
-#endif
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::out()));
-                *logger::Private::out() << "(" << loc.fLineNumber  << "): ";
-                *logger::Private::out() << message << EndColor() << endl;
-            }
-            else
-            {
-                //cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << endl;
-                *logger::Private::out() << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
-#ifndef NDEBUG
-                *logger::Private::out() << "(tid " << std::this_thread::get_id() << ") ";
-#endif
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::out()));
-                *logger::Private::out() << "(" << loc.fLineNumber  << "): ";
-                *logger::Private::out() << message << endl;
-            }
-            logger::Private::mutex().unlock();
-        }
-
-        void logCerr(ELevel level, const string& message, const Location& loc)
-        {
-            logger::Private::mutex().lock();
-            logger::Private::getTimeAbsoluteStr();
-            if (logger::Private::colored())
-            {
-                //cout << color << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << skKTEndColor << endl;
-                *logger::Private::err() << Private::level2Color(level) << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
-#ifndef NDEBUG
-                *logger::Private::err() << "(tid " << std::this_thread::get_id() << ") ";
-#endif
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::err()));
-                *logger::Private::err() << "(" << loc.fLineNumber  << "): ";
-                *logger::Private::err() << message << EndColor() << endl;
-            }
-            else
-            {
-                //cout << KTLogger::Private::sTimeBuff << " [" << setw(5) << level << "] " << setw(16) << left << loc.fFileName << "(" << loc.fLineNumber  << "): " << message << endl;
-                *logger::Private::err() << logger::Private::getTimeAbsoluteStr() << " [" << setw(5) << Private::level2Str(level) << "] ";
-#ifndef NDEBUG
-                *logger::Private::err() << "(tid " << std::this_thread::get_id() << ") ";
-#endif
-                copy(loc.fFileName.end() - std::min< int >(loc.fFileName.size(), 16), loc.fFileName.end(), ostream_iterator<char>(*logger::Private::err()));
-                *logger::Private::err() << "(" << loc.fLineNumber  << "): ";
-                *logger::Private::err() << message << endl;
-            }
-            logger::Private::mutex().unlock();
-        }
-    };
-
-
-    logger::logger(const char* name) : fPrivate(new Private())
-    {
-        if( logger::Private::count() == 0 )
-        {
-            sprintf( logger::Private::dateTimeFormat(),  "%%Y-%%m-%%d %%T" );
-        }
-
-        logger::Private::count()++;
-
-        if (name == 0)
-        {
-            fPrivate->fLogger = "root";
-        }
-        else
-        {
-            const char* logName = strrchr(name, '/') ? strrchr(name, '/') + 1 : name;
-            fPrivate->fLogger = logName;
-        }
-
-        UseGlobalLevel();
-        logger::Private::AllLoggers()->insert(this);
-
-        //std::cerr << "created logger (" << fPrivate->count() << ") " << fPrivate->fLogger << std::endl;
-    }
-
-    logger::logger(const std::string& name) : fPrivate(new Private())
-    {
-        if( logger::Private::count() == 0 )
-        {
-            sprintf( logger::Private::dateTimeFormat(),  "%%Y-%%m-%%d %%T" );
-        }
-
-        logger::Private::count()++;
-        
-        fPrivate->fLogger = name.c_str();
-
-		UseGlobalLevel();
-
-		logger::Private::AllLoggers()->insert(this);
-
-        //std::cerr << "created logger (" << fPrivate->count() << ") " << fPrivate->fLogger << std::endl;
-    }
-
-    logger::~logger()
-    {
-        fPrivate->count()--;
-        
-        //std::cerr << "destructing logger (" << fPrivate->count() << ") " << fPrivate->fLogger << std::endl;
-        logger::Private::AllLoggers()->erase(this);
-        //std::cerr << "logger removed from set: " << fPrivate->fLogger << std::endl;
-    }
-
-    bool logger::IsLevelEnabled(ELevel level) const
-    {
-        return level >= fPrivate->fThreshold;
-    }
-
-    logger::ELevel logger::GetLevel() const
-    {
-        return fPrivate->fThreshold;
-    }
-
-    void logger::SetLevel(ELevel level) const
-    {
-        fPrivate->fThreshold = logger::Private::filterMinimumLevel(level);
-        fPrivate->fThresholdIsGlobal = false;
-    }
-
-    void logger::UseGlobalLevel() const
-    {
-        fPrivate->fThreshold = logger::Private::filterMinimumLevel(logger::Private::GlobalThreshold());
-        fPrivate->fThresholdIsGlobal = true;
-    }
-
-    // static function
-    logger::ELevel logger::GetGlobalLevel()
-    {
-        return logger::Private::GlobalThreshold();
-    }
-
-    // static function
-    void logger::SetGlobalLevel(ELevel level)
-    {
-        logger::Private::GlobalThreshold() = logger::Private::filterMinimumLevel(level);
-        for( logger::Private::LoggerSet::iterator logIt = logger::Private::AllLoggers()->begin(); logIt != logger::Private::AllLoggers()->end(); ++logIt)
-        {
-            if( (*logIt)->fPrivate->fThresholdIsGlobal )
-            {
-                (*logIt)->fPrivate->fThreshold = logger::Private::GlobalThreshold();
-            }
-        }
-        return;
-    }
-
-    void logger::SetColored(bool flag)
-    {
-#ifndef _WIN32
-        logger::Private::colored() = flag;
-#else
-        std::cerr << "Colored logging is not enabled in Windows" << std::endl;
-#endif
-        return;
-    }
-
-    void logger::SetOutStream(std::ostream* stream)
-    {
-        logger::Private::out() = stream;
-        return;
-    }
-
-    void logger::SetErrStream(std::ostream* stream)
-    {
-        logger::Private::err() = stream;
-        return;
-    }
-
-    void logger::Log(ELevel level, const string& message, const Location& loc)
-    {
-        if (level >= ELevel::eWarn)
-        {
-            fPrivate->logCerr(level, message, loc);
-        }
-        else
-        {
-            fPrivate->logCout(level, message, loc);
-        }
-    }
-}
diff --git a/Src/Scarab/library/logger/logger.hh b/Src/Scarab/library/logger/logger.hh
deleted file mode 100644
index 69e9034..0000000
--- a/Src/Scarab/library/logger/logger.hh
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- * logger.hh
- * Based on KLogger.h, from KATRIN's Kasper
- *
- *  Created on: Jan 21, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_LOGGER_HH_
-#define SCARAB_LOGGER_HH_
-
-#include "macros.hh"
-#include "scarab_api.hh"
-
-#include <memory>
-
-/**
- * @file
- * @brief Contains the logger class and macros, based on Kasper's KLogger class.
- * @date Created on: 18.11.2011
- * @author Marco Haag <marco.haag@kit.edu>
- *
- */
-
-// UTILITY MACROS
-
-#ifndef LOGGER_UTILITY_MACROS_
-#define LOGGER_UTILITY_MACROS_
-
-#define msvc_bug_fix(m, args) m args
-#define expand(x) x
-
-//#define va_num_args(...) va_num_args_(__VA_ARGS__, 5,4,3,2,1)
-//#define va_num_args_(...) msvc_bug_fix(va_num_args_impl, (__VA_ARGS__))
-#define va_num_args(...) expand( va_num_args_impl(__VA_ARGS__, 5,4,3,2,1))
-#define va_num_args_impl(_1,_2,_3,_4,_5,N,...) N
-
-
-#define macro_dispatcher(func, ...) macro_dispatcher_(func, va_num_args(__VA_ARGS__))
-#define macro_dispatcher_(func, nargs) macro_dispatcher__(func, nargs)
-#define macro_dispatcher__(func, nargs) func ## nargs
-
-#endif  /* LOGGER_UTILITY_MACROS_ */
-
-// COLOR DEFINITIONS
-#define COLOR_NORMAL "0"
-#define COLOR_BRIGHT "1"
-#define COLOR_FOREGROUND_RED "31"
-#define COLOR_FOREGROUND_GREEN "32"
-#define COLOR_FOREGROUND_YELLOW "33"
-#define COLOR_FOREGROUND_BLUE "34"
-#define COLOR_FOREGROUND_CYAN "36"
-#define COLOR_FOREGROUND_WHITE "37"
-#define COLOR_PREFIX "\033["
-#define COLOR_SUFFIX "m"
-#define COLOR_SEPARATOR ";"
-
-// INCLUDES
-
-#include <cstring>
-#include <iostream>
-#include <sstream>
-
-// CLASS DEFINITIONS
-
-/**
- * The standard scarab namespace.
- */
-namespace scarab
-{
-
-    /**
-     * The scarab logger.
-     *
-     * The usage and syntax is inspired by log4j. logger itself uses the log4cxx library if it
-     * was available on the system during compiling, otherwise it falls back to std::stream.
-     *
-     * The logger output can be configured in a file specified with the environment variable
-     * @a LOGGER_CONFIGURATION (by default log4cxx.properties in the config directory).
-     *
-     * In most cases the following macro can be used
-     * to instantiate a Logger in your code:
-     * <pre>LOGGER(myLogger, "loggerName");</pre>
-     *
-     * This is equivalent to:
-     * <pre>static mantis::logger myLogger("loggerName");</pre>
-     *
-     * For logging the following macros can be used. The source code location will then automatically
-     * included in the output:
-     *
-     * <pre>
-     * LOG(myLogger, level, "message");
-     * LTRACE(myLogger, "message");
-     * LDEBUG(myLogger, "message");
-     * LINFO(myLogger, "message");
-     * LPROG(myLogger, "message");
-     * LWARN(myLogger, "message");
-     * LERROR(myLogger, "message");
-     * FATAL(myLogger, "message");
-     *
-     * ASSERT(myLogger, assertion, "message");
-     *
-     * LOG_ONCE(myLogger, level, "message");
-     * TRACE_ONCE(myLogger, "message");
-     * DEBUG_ONCE(myLogger, "message");
-     * INFO_ONCE(myLogger, "message");
-     * PROG_ONCE(myLogger, "message");
-     * WARN_ONCE(myLogger, "message");
-     * ERROR_ONCE(myLogger, "message");
-     * FATAL_ONCE(myLogger, "message");
-     * </pre>
-     *
-     */
-    class SCARAB_API logger
-    {
-        public:
-            /**
-             * \enum logger::ELevel
-             * Defines the verbosity levels and their integer equivalents
-             * Note that these values were selected to match with those used in the dripline_python project
-             */
-            enum class ELevel : unsigned 
-            {
-                eTrace = 0,
-                eDebug = 10,
-                eInfo = 20,
-                eProg = 25,
-                eWarn = 30,
-                eError = 40,
-                eFatal = 50
-            };
-
-        public:
-            /**
-             * A simple struct used by the Logger macros to pass information about the filename and line number.
-             * Not to be used directly by the user!
-             */
-            struct Location {
-                Location(const char* const fileName = "", const char* const functionName = "", int lineNumber = -1) :
-                    fLineNumber(lineNumber), fFileName(fileName), fFunctionName(functionName)
-                { }
-                int fLineNumber;
-                std::string fFileName;
-                std::string fFunctionName;
-            };
-
-        public:
-            static logger& GetRootLogger() {
-                static logger rootLogger;
-                return rootLogger;
-            }
-
-        public:
-            /**
-             * Standard constructor assigning a name to the logger instance.
-             * @param name The logger name.
-             */
-            logger(const char* name = 0);
-            /// @overload
-            logger(const std::string& name);
-
-            virtual ~logger();
-
-            /**
-             * Check whether a certain log-level is enabled.
-             * @param level The log level
-             * @return
-             */
-            bool IsLevelEnabled(ELevel level) const;
-
-            /**
-             * Get the logger's minimum logging level
-             * @return The log level
-             */
-            ELevel GetLevel() const;
-
-            /**
-             * Set a logger's minimum logging level
-             * @param level The log level
-             */
-            void SetLevel(ELevel level) const;
-
-            /**
-             * Set a logger's minimum logging level to the global level
-             */
-            void UseGlobalLevel() const;
-
-            /**
-             * Get the global minimum logging level
-             */
-            static logger::ELevel GetGlobalLevel();
-
-            /**
-             * Set all loggers' minimum logging level
-             * @param level The log level
-             */
-            static void SetGlobalLevel(ELevel level);
-
-            /**
-             * Set whether colored text will be used
-             * @param flag Bool determining whether colored text will be used
-             */
-            static void SetColored(bool flag);
-
-            /**
-             * Set the ostream pointer used for standard output messages
-             * @param stream Stream object for standard output
-             */
-            static void SetOutStream(std::ostream* stream);
-
-            /**
-             * Set the ostream pointer used for standard error messages
-             * @param stream Stream object for standard errors
-             */
-            static void SetErrStream(std::ostream* stream);
-
-            /**
-             * Log a message with the specified level.
-             * Use the macro LOG(logger, level, message).
-             * @param level The log level.
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void Log(ELevel level, const std::string& message, const Location& loc = Location());
-
-            /**
-             * Log a message at TRACE level.
-             * Use the macro LTRACE(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogTrace(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eTrace, message, loc);
-            }
-            /**
-             * Log a message at DEBUG level.
-             * Use the macro LDEBUG(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogDebug(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eDebug, message, loc);
-            }
-            /**
-             * Log a message at INFO level.
-             * Use the macro LINFO(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogInfo(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eInfo, message, loc);
-            }
-            /**
-             * Log a message at PROG level.
-             * Use the macro PROG(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogProg(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eProg, message, loc);
-            }
-            /**
-             * Log a message at WARN level.
-             * Use the macro LWARN(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogWarn(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eWarn, message, loc);
-            }
-            /**
-             * Log a message at ERROR level.
-             * Use the macro LERROR(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogError(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eError, message, loc);
-            }
-            /**
-             * Log a message at FATAL level.
-             * Use the macro FATAL(logger, message).
-             * @param message The message.
-             * @param loc Source code location (set automatically by the corresponding macro).
-             */
-            void LogFatal(const std::string& message, const Location& loc = Location())
-            {
-                Log(ELevel::eFatal, message, loc);
-            }
-
-        private:
-            struct Private;
-            std::shared_ptr<Private> fPrivate;
-    };
-
-}
-
-// PRIVATE MACROS
-
-#define __DEFAULT_LOGGER        scarab::logger::GetRootLogger()
-
-#define __LOG_LOCATION         scarab::logger::Location(__FILE__, __FUNC__, __LINE__)
-#define __LOG_LOG_4(I,L,M,O) \
-        { \
-    if (I.IsLevelEnabled(scarab::logger::ELevel::e##L)) { \
-        static bool _sLoggerMarker = false; \
-        if (!O || !_sLoggerMarker) { \
-            _sLoggerMarker = true; \
-            std::ostringstream stream; stream << M; \
-            I.Log(scarab::logger::ELevel::e##L, stream.str(), __LOG_LOCATION); \
-        } \
-    } \
-        }
-
-
-#define __LOG_LOG_3(I,L,M)     __LOG_LOG_4(I,L,M,false)
-#define __LOG_LOG_2(L,M)       __LOG_LOG_4(__DEFAULT_LOGGER,L,M,false)
-#define __LOG_LOG_1(M)         __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,false)
-
-#define __LOG_TRACE_2(I,M)     __LOG_LOG_4(I,Trace,M,false)
-#define __LOG_TRACE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Trace,M,false)
-
-#define __LOG_DEBUG_2(I,M)     __LOG_LOG_4(I,Debug,M,false)
-#define __LOG_DEBUG_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,false)
-
-#define __LOG_INFO_2(I,M)      __LOG_LOG_4(I,Info,M,false)
-#define __LOG_INFO_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Info,M,false)
-
-#define __LOG_PROG_2(I,M)      __LOG_LOG_4(I,Prog,M,false)
-#define __LOG_PROG_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Prog,M,false)
-
-#define __LOG_WARN_2(I,M)      __LOG_LOG_4(I,Warn,M,false)
-#define __LOG_WARN_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Warn,M,false)
-
-#define __LOG_ERROR_2(I,M)     __LOG_LOG_4(I,Error,M,false)
-#define __LOG_ERROR_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Error,M,false)
-
-#define __LOG_FATAL_2(I,M)     __LOG_LOG_4(I,Fatal,M,false)
-#define __LOG_FATAL_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Fatal,M,false)
-
-#define __LOG_ASSERT_3(I,C,M)  if (!(C)) { __LOG_ERROR_2(I,M) }
-#define __LOG_ASSERT_2(C,M)    __LOG_ASSERT_3(__DEFAULT_LOGGER,C,M)
-
-
-#define __LOG_LOG_ONCE_3(I,L,M)     __LOG_LOG_4(I,L,M,true)
-#define __LOG_LOG_ONCE_2(L,M)       __LOG_LOG_4(__DEFAULT_LOGGER,L,M,true)
-#define __LOG_LOG_ONCE_1(M)         __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,true)
-
-#define __LOG_TRACE_ONCE_2(I,M)     __LOG_LOG_4(I,Trace,M,true)
-#define __LOG_TRACE_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Trace,M,true)
-
-#define __LOG_DEBUG_ONCE_2(I,M)     __LOG_LOG_4(I,Debug,M,true)
-#define __LOG_DEBUG_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Debug,M,true)
-
-#define __LOG_INFO_ONCE_2(I,M)      __LOG_LOG_4(I,Info,M,true)
-#define __LOG_INFO_ONCE_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Info,M,true)
-
-#define __LOG_PROG_ONCE_2(I,M)      __LOG_LOG_4(I,Prog,M,true)
-#define __LOG_PROG_ONCE_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Prog,M,true)
-
-#define __LOG_WARN_ONCE_2(I,M)      __LOG_LOG_4(I,Warn,M,true)
-#define __LOG_WARN_ONCE_1(M)        __LOG_LOG_4(__DEFAULT_LOGGER,Warn,M,true)
-
-#define __LOG_ERROR_ONCE_2(I,M)     __LOG_LOG_4(I,Error,M,true)
-#define __LOG_ERROR_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Error,M,true)
-
-#define __LOG_FATAL_ONCE_2(I,M)     __LOG_LOG_4(I,Fatal,M,true)
-#define __LOG_FATAL_ONCE_1(M)       __LOG_LOG_4(__DEFAULT_LOGGER,Fatal,M,true)
-
-
-// PUBLIC MACROS
-
-#define LOGGER(I,K)      static scarab::logger I(K);
-
-#ifndef _WIN32
-
-#define LOG(...)          macro_dispatcher(__LOG_LOG_, __VA_ARGS__)(__VA_ARGS__)
-#ifdef NDEBUG
-#define LTRACE(...)
-#define LDEBUG(...)
-#else
-#define LTRACE(...)       macro_dispatcher(__LOG_TRACE_, __VA_ARGS__)(__VA_ARGS__)
-#define LDEBUG(...)       macro_dispatcher(__LOG_DEBUG_, __VA_ARGS__)(__VA_ARGS__)
-#endif
-#define LINFO(...)        macro_dispatcher(__LOG_INFO_, __VA_ARGS__)(__VA_ARGS__)
-#define LPROG(...)        macro_dispatcher(__LOG_PROG_, __VA_ARGS__)(__VA_ARGS__)
-#define LWARN(...)        macro_dispatcher(__LOG_WARN_, __VA_ARGS__)(__VA_ARGS__)
-#define LERROR(...)       macro_dispatcher(__LOG_ERROR_, __VA_ARGS__)(__VA_ARGS__)
-#define LFATAL(...)       macro_dispatcher(__LOG_FATAL_, __VA_ARGS__)(__VA_ARGS__)
-#define LASSERT(...)      macro_dispatcher(__LOG_ASSERT_, __VA_ARGS__)(__VA_ARGS__)
-
-#define LOG_ONCE(...)     macro_dispatcher(__LOG_LOG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#ifdef NDEBUG
-#define LTRACE_ONCE(...)
-#define LDEBUG_ONCE(...)
-#else
-#define LTRACE_ONCE(...)  macro_dispatcher(__LOG_TRACE_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LDEBUG_ONCE(...)  macro_dispatcher(__LOG_DEBUG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#endif
-#define LINFO_ONCE(...)   macro_dispatcher(__LOG_INFO_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LPROG_ONCE(...)   macro_dispatcher(__LOG_PROG_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LWARN_ONCE(...)   macro_dispatcher(__LOG_WARN_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LERROR_ONCE(...)  macro_dispatcher(__LOG_ERROR_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-#define LFATAL_ONCE(...)  macro_dispatcher(__LOG_FATAL_ONCE_, __VA_ARGS__)(__VA_ARGS__)
-
-#else /*_WIN32*/
-
-#define LOG(I, ...)          __LOG_LOG_2(I, __VA_ARGS__)
-#ifdef NDEBUG
-#define LTRACE(I, ...)
-#define LDEBUG(I, ...)
-#else
-#define LTRACE(I, ...)       __LOG_TRACE_2(I, __VA_ARGS__)
-#define LDEBUG(I, ...)       __LOG_DEBUG_2(I, __VA_ARGS__)
-#endif
-#define LINFO(I, ...)        __LOG_INFO_2(I, __VA_ARGS__)
-#define LPROG(I, ...)        __LOG_PROG_2(I, __VA_ARGS__)
-#define LWARN(I, ...)        __LOG_WARN_2(I, __VA_ARGS__)
-#define LERROR(I, ...)       __LOG_ERROR_2(I, __VA_ARGS__)
-#define LFATAL(I, ...)       __LOG_FATAL_2(I, __VA_ARGS__)
-#define LASSERT(I, ...)      __LOG_ASSERT_2(I, __VA_ARGS__)
-
-#define LOG_ONCE(I, ...)     __LOG_LOG_ONCE_2(I, __VA_ARGS__)
-#ifdef NDEBUG
-#define LTRACE_ONCE(I, ...)
-#define LDEBUG_ONCE(I, ...)
-#else
-#define LTRACE_ONCE(I, ...)  __LOG_TRACE_ONCE_2(I, __VA_ARGS__)
-#define LDEBUG_ONCE(I, ...)  __LOG_DEBUG_ONCE_2(I, __VA_ARGS__)
-#endif
-#define LINFO_ONCE(I, ...)   __LOG_INFO_ONCE_2(I, __VA_ARGS__)
-#define LPROG_ONCE(I, ...)   __LOG_PROG_ONCE_2(I, __VA_ARGS__)
-#define LWARN_ONCE(I, ...)   __LOG_WARN_ONCE_2(I, __VA_ARGS__)
-#define LERROR_ONCE(I, ...)  __LOG_ERROR_ONCE_2(I, __VA_ARGS__)
-#define LFATAL_ONCE(I, ...)  __LOG_FATAL_ONCE_2(I, __VA_ARGS__)
-
-#endif /*_WIN32*/
-
-#endif /* SCARAB_LOGGER_HH_ */
diff --git a/Src/Scarab/library/param/CMakeLists.txt b/Src/Scarab/library/param/CMakeLists.txt
deleted file mode 100644
index 301663b..0000000
--- a/Src/Scarab/library/param/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# CMakeLists.txt for Scarab/library/param
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/param.hh
-    ${dir}/param_array.hh
-    ${dir}/param_base.hh
-    ${dir}/param_base_impl.hh
-    ${dir}/param_codec.hh
-    ${dir}/param_helpers.hh
-    ${dir}/param_node.hh
-    ${dir}/param_value.hh
-    PARENT_SCOPE )
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/param_array.cc
-    ${dir}/param_base.cc
-    ${dir}/param_codec.cc
-    ${dir}/param_helpers.cc
-    ${dir}/param_node.cc
-    ${dir}/param_value.cc
-    PARENT_SCOPE )
diff --git a/Src/Scarab/library/param/codec/json/CMakeLists.txt b/Src/Scarab/library/param/codec/json/CMakeLists.txt
deleted file mode 100644
index df91748..0000000
--- a/Src/Scarab/library/param/codec/json/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# CMakeLists.txt for Scarab/param/codec/json
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/param_json.hh
-    PARENT_SCOPE )
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/param_json.cc
-    PARENT_SCOPE )
diff --git a/Src/Scarab/library/param/codec/json/param_json.cc b/Src/Scarab/library/param/codec/json/param_json.cc
deleted file mode 100644
index 35d287b..0000000
--- a/Src/Scarab/library/param/codec/json/param_json.cc
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * param_json.cc
- *
- *  Created on: March 27, 2015
- *      Author: nsoblath, bhlaroque
- */
-
-#define SCARAB_API_EXPORTS
-
-#include <sstream>
-using std::string;
-using std::stringstream;
-
-#include "param_json.hh"
-
-#include "logger.hh"
-
-#include "rapidjson/document.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/stringbuffer.h"
-
-
-
-namespace scarab
-{
-    LOGGER( dlog, "param" );
-
-    REGISTER_PARAM_INPUT_CODEC( param_input_json, "json" );
-
-    param_input_json::param_input_json()
-    {
-    }
-    param_input_json::~param_input_json()
-    {
-    }
-
-    param_ptr_t param_input_json::read_file( const std::string& a_filename, const param_node& )
-    {
-        FILE* t_config_file = fopen( a_filename.c_str(), "r" );
-        if( t_config_file == NULL )
-        {
-            LERROR( dlog, "file <" << a_filename << "> did not open" );
-            return NULL;
-        }
-
-        char t_buffer[ RAPIDJSON_FILE_BUFFER_SIZE ];
-        rapidjson::FileReadStream t_file_stream( t_config_file, t_buffer, sizeof(t_buffer) );
-
-        rapidjson::Document t_config_doc;
-        if( t_config_doc.ParseStream<0>( t_file_stream ).HasParseError() )
-        {
-            unsigned errorPos = t_config_doc.GetErrorOffset();
-            rewind( t_config_file );
-            unsigned iChar, newlineCount = 1, lastNewlinePos = 0;
-            int thisChar;
-            for( iChar = 0; iChar != errorPos; ++iChar )
-            {
-                thisChar = fgetc( t_config_file );
-                if( thisChar == EOF )
-                {
-                    break;
-                }
-                if( thisChar == '\n' || thisChar == '\r' )
-                {
-                    newlineCount++;
-                    lastNewlinePos = iChar + 1;
-                }
-            }
-            if( iChar == errorPos )
-            {
-                LERROR( dlog, "error parsing config file :\n" <<
-                        '\t' << t_config_doc.GetParseError() << '\n' <<
-                        "\tThe error was reported at line " << newlineCount << ", character " << errorPos - lastNewlinePos );
-            }
-            else
-            {
-                LERROR( dlog, "error parsing config file :\n" <<
-                        '\t' << t_config_doc.GetParseError() <<
-                        "\tend of file reached before error location was found" );
-            }
-            fclose( t_config_file );
-            return NULL;
-        }
-        fclose( t_config_file );
-
-        return param_input_json::read_document( t_config_doc );
-    }
-
-    param_ptr_t param_input_json::read_string( const std::string& a_json_string, const param_node& )
-    {
-        rapidjson::Document t_config_doc;
-        if( t_config_doc.Parse<0>( a_json_string.c_str() ).HasParseError() )
-        {
-            LERROR( dlog, "error parsing string:\n" << t_config_doc.GetParseError() );
-            return NULL;
-        }
-        return param_input_json::read_document( t_config_doc );
-    }
-
-    param_ptr_t param_input_json::read_document( const rapidjson::Document& a_doc )
-    {
-        return read_value( a_doc );
-    }
-
-    param_ptr_t param_input_json::read_value( const rapidjson::Value& a_value )
-    {
-        if( a_value.IsNull() )
-        {
-            return std::unique_ptr< param >( new param() );
-        }
-        if( a_value.IsObject() )
-        {
-            std::unique_ptr< param_node > t_obj_as_param( new param_node() );
-            for( rapidjson::Value::ConstMemberIterator jsonIt = a_value.MemberBegin();
-                    jsonIt != a_value.MemberEnd();
-                    ++jsonIt)
-            {
-                t_obj_as_param->replace( jsonIt->name.GetString(), param_input_json::read_value( jsonIt->value ) );
-            }
-            return t_obj_as_param;
-        }
-        if( a_value.IsArray() )
-        {
-            std::unique_ptr< param_array > t_array_as_param( new param_array() );
-            for( rapidjson::Value::ConstValueIterator jsonIt = a_value.Begin();
-                    jsonIt != a_value.End();
-                    ++jsonIt)
-            {
-                t_array_as_param->push_back( std::move(*param_input_json::read_value( *jsonIt )) );
-            }
-            return t_array_as_param;
-        }
-        if( a_value.IsString() )
-        {
-            //LWARN( dlog, "reading string from json: " << a_value.GetString() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetString() ) );
-        }
-        if( a_value.IsBool() )
-        {
-            //LWARN( dlog, "reading bool from json: " << a_value.GetBool() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetBool() ) );
-        }
-        if( a_value.IsInt() )
-        {
-            //LWARN( dlog, "reading int from json: " << a_value.GetInt() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetInt() ) ) ;
-        }
-        if( a_value.IsUint() )
-        {
-            //LWARN( dlog, "reading uint from json: " << a_value.GetUint() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetUint() ) );
-        }
-        if( a_value.IsInt64() )
-        {
-            //LWARN( dlog, "reading int64 from json: " << a_value.GetInt64() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetInt64() ) );
-        }
-        if( a_value.IsUint64() )
-        {
-            //LWARN( dlog, "reading uint64 from json: " << a_value.GetUint64() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetUint64() ) );
-        }
-        if( a_value.IsDouble() )
-        {
-            //LWARN( dlog, "reading double from json: " << a_value.GetDouble() );
-            return std::unique_ptr< param_value >( new param_value( a_value.GetDouble() ) );
-        }
-        LWARN( dlog, "(config_reader_json) unknown type; returning null value" );
-        return std::unique_ptr< param >( new param() );
-    }
-
-
-    REGISTER_PARAM_OUTPUT_CODEC( param_output_json, "json" );
-
-    param_output_json::param_output_json()
-    {}
-
-    param_output_json::~param_output_json()
-    {}
-
-    bool param_output_json::write_file( const param& a_to_write, const std::string& a_filename, const param_node& a_options )
-    {
-        if( a_filename.empty() )
-        {
-            LERROR( dlog, "Filename cannot be an empty string" );
-            return false;
-        }
-
-        FILE* file = fopen( a_filename.c_str(), "w" );
-        if( file == NULL )
-        {
-            LERROR( dlog, "Unable to open file: " << a_filename );
-            return false;
-        }
-
-        char t_buffer[ RAPIDJSON_FILE_BUFFER_SIZE ];
-        rapidjson::FileWriteStream t_filestream( file, t_buffer, sizeof(t_buffer) );
-
-        json_writing_style t_style = k_compact;
-        if( a_options.has( "style" ) )
-        {
-            if( a_options["style"]().is_uint() )
-            {
-                t_style = (json_writing_style)a_options.get_value< unsigned >( "style", k_compact );
-            }
-            else
-            {
-                string t_style_string( a_options.get_value( "style", "compact" ) );
-                if( t_style_string == string( "pretty" ) ) t_style = k_pretty;
-            }
-        }
-
-        bool t_result = false;
-        if( t_style == k_compact )
-        {
-            rj_file_writer t_writer( t_filestream );
-            t_result = param_output_json::write_param( a_to_write, &t_writer );
-        }
-        else
-        {
-            rj_pretty_file_writer t_writer( t_filestream );
-            t_result = param_output_json::write_param( a_to_write, &t_writer );
-        }
-
-        if (! t_result )
-        {
-            LERROR( dlog, "Error while writing file" );
-            return false;
-        }
-
-        return true;
-    }
-
-    bool param_output_json::write_string( const param& a_to_write, std::string& a_string, const param_node& a_options )
-    {
-        rapidjson::StringBuffer t_str_buff;
-
-        json_writing_style t_style = k_compact;
-        if( a_options.has( "style" ) )
-        {
-            if( a_options["style"]().is_uint() )
-            {
-                t_style = (json_writing_style)a_options.get_value< unsigned >( "style", k_compact );
-            }
-            else
-            {
-                string t_style_string( a_options.get_value( "style", "compact" ) );
-                if( t_style_string == string( "pretty" ) ) t_style = k_pretty;
-            }
-        }
-
-        bool t_result = false;
-        if( t_style == k_compact )
-        {
-            rj_string_writer t_writer( t_str_buff );
-            t_result = param_output_json::write_param( a_to_write, &t_writer );
-        }
-        else
-        {
-            rj_pretty_string_writer t_writer( t_str_buff );
-            t_result = param_output_json::write_param( a_to_write, &t_writer );
-        }
-
-        if (! t_result )
-        {
-            LERROR( dlog, "Error while writing string" );
-            return false;
-        }
-
-        a_string.assign( t_str_buff.GetString() );
-
-        return true;
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/param/codec/json/param_json.hh b/Src/Scarab/library/param/codec/json/param_json.hh
deleted file mode 100644
index 6d01d22..0000000
--- a/Src/Scarab/library/param/codec/json/param_json.hh
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * param_json.hh
- *
- *  Created on: March 27, 2015
- *      Author: nsoblath, bhlaroque
- */
-
-#ifndef SCARAB_PARAM_JSON_HH_
-#define SCARAB_PARAM_JSON_HH_
-
-#include "param_codec.hh"
-
-#include "logger.hh"
-#include "param.hh"
-
-#include "rapidjson/fwd.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/writer.h"
-
-#include <deque>
-#include <map>
-#include <sstream>
-#include <string>
-
-
-namespace scarab
-{
-    LOGGER( dlog_param_json, "param_json" );
-
-    //***************************************
-    //************** INPUT ******************
-    //***************************************
-
-    /*!
-     @class param_input_json
-     @author N.S. Oblath
-
-     @brief Convert JSON to Param
-
-     @details
-     Options: None
-    */
-    class SCARAB_API param_input_json : public param_input_codec
-    {
-        public:
-            param_input_json();
-            virtual ~param_input_json();
-
-            virtual param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node() );
-            virtual param_ptr_t read_string( const std::string& a_json_str, const param_node& a_options = param_node() );
-            param_ptr_t read_document( const rapidjson::Document& a_document );
-            param_ptr_t read_value( const rapidjson::Value& a_value );
-    };
-
-    //***************************************
-    //************** OUTPUT *****************
-    //***************************************
-
-    /*!
-     @class param_output_json
-     @author N.S. Oblath
-
-     @brief Convert Param to JSON
-
-     @details
-     Options:
-       - JSON Style
-           Pretty print: { "style": param_output_json::k_pretty } or { "style": "pretty" }
-           Compact (default): { "style": param_output_json::k_compact } or { "style": "compact" } or anything else
-    */
-    class SCARAB_API param_output_json : public param_output_codec
-    {
-        public:
-            typedef rapidjson::Writer< rapidjson::FileWriteStream > rj_file_writer;
-            typedef rapidjson::PrettyWriter< rapidjson::FileWriteStream > rj_pretty_file_writer;
-            typedef rapidjson::Writer< rapidjson::StringBuffer > rj_string_writer;
-            typedef rapidjson::PrettyWriter< rapidjson::StringBuffer > rj_pretty_string_writer;
-
-            enum json_writing_style
-            {
-                k_compact = 0,
-                k_pretty = 1
-            };
-
-        public:
-            param_output_json();
-            virtual ~param_output_json();
-
-            virtual bool write_file( const param& a_to_write, const std::string& a_filename, const param_node& a_options = param_node() );
-            virtual bool write_string( const param& a_to_write, std::string& a_string, const param_node& a_options = param_node() );
-
-            template< class XWriter >
-            bool write_param( const param& a_to_write, XWriter* a_writer );
-            template< class XWriter >
-            bool write_param_null( const param& a_to_write, XWriter* a_writer );
-            template< class XWriter >
-            bool write_param_value( const param_value& a_to_write, XWriter* a_writer );
-            template< class XWriter >
-            bool write_param_array( const param_array& a_to_write, XWriter* a_writer );
-            template< class XWriter >
-            bool write_param_node( const param_node& a_to_write, XWriter* a_writer );
-
-    };
-
-    template< class XWriter >
-    bool param_output_json::write_param( const param& a_to_write, XWriter* a_writer )
-    {
-        if( a_to_write.is_null() )
-        {
-            return param_output_json::write_param_null( a_to_write, a_writer );
-        }
-        if( a_to_write.is_value() )
-        {
-            return param_output_json::write_param_value( a_to_write.as_value(), a_writer );
-        }
-        if( a_to_write.is_array() )
-        {
-            return param_output_json::write_param_array( a_to_write.as_array(), a_writer );
-        }
-        if( a_to_write.is_node() )
-        {
-            return param_output_json::write_param_node( a_to_write.as_node(), a_writer );
-        }
-        LWARN( dlog_param_json, "parameter not written: <" << a_to_write << ">" );
-        return false;
-    }
-    template< class XWriter >
-    bool param_output_json::write_param_null( const param& /*a_to_write*/, XWriter* a_writer )
-    {
-        //LWARN( dlog_param_json, "writing null" );
-        a_writer->Null();
-        return true;
-    }
-    template< class XWriter >
-    bool param_output_json::write_param_value( const param_value& a_to_write, XWriter* a_writer )
-    {
-        //LWARN( dlog_param_json, "writing value" );
-        if( a_to_write.is_string() )
-        {
-            a_writer->String( a_to_write.as_string().c_str() );
-            //LWARN( dlog_param_json, "writing string to json: " << a_to_write.as_string() );
-        }
-        else if( a_to_write.is_bool() )
-        {
-            a_writer->Bool( a_to_write.as_bool() );
-            //LWARN( dlog_param_json, "writing bool to json: " << a_to_write.as_bool() );
-        }
-        else if( a_to_write.is_int() )
-        {
-            a_writer->Int64( a_to_write.as_int() );
-            //LWARN( dlog_param_json, "writing int to json: " << a_to_write.as_int() );
-        }
-        else if( a_to_write.is_uint() )
-        {
-            a_writer->Uint64( a_to_write.as_uint() );
-            //LWARN( dlog_param_json, "writing uint to json: " << a_to_write.as_uint() );
-        }
-        else if( a_to_write.is_double() )
-        {
-            a_writer->Double( a_to_write.as_double() );
-            //LWARN( dlog_param_json, "writing double to json: " << a_to_write.as_double() );
-        }
-        return true;
-    }
-    template< class XWriter >
-    bool param_output_json::write_param_array( const param_array& a_to_write, XWriter* a_writer )
-    {
-        //LWARN( dlog_param_json, "writing array" );
-        a_writer->StartArray();
-        for( param_array::const_iterator it = a_to_write.begin(); it != a_to_write.end(); ++it )
-        {
-            if( ! param_output_json::write_param( *it, a_writer ) )
-            {
-                LERROR( dlog_param_json, "Error while writing parameter array" );
-                return false;
-            }
-        }
-        a_writer->EndArray();
-        return true;
-    }
-    template< class XWriter >
-    bool param_output_json::write_param_node( const param_node& a_to_write, XWriter* a_writer )
-    {
-        //LWARN( dlog_param_json, "writing node" );
-        a_writer->StartObject();
-        for( param_node::const_iterator it = a_to_write.begin(); it != a_to_write.end(); ++it )
-        {
-            a_writer->String( it.name().c_str() );
-            if( ! param_output_json::write_param( *it, a_writer ) )
-            {
-                LERROR( dlog_param_json, "Error while writing parameter node" );
-                return false;
-            }
-        }
-        a_writer->EndObject();
-        return true;
-    }
-
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_JSON_HH_ */
diff --git a/Src/Scarab/library/param/codec/yaml/CMakeLists.txt b/Src/Scarab/library/param/codec/yaml/CMakeLists.txt
deleted file mode 100644
index 453723a..0000000
--- a/Src/Scarab/library/param/codec/yaml/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# CMakeLists.txt for Scarab/param/codec/yaml
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/param_yaml.hh
-    PARENT_SCOPE )
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/param_yaml.cc
-    PARENT_SCOPE )
diff --git a/Src/Scarab/library/param/codec/yaml/param_yaml.cc b/Src/Scarab/library/param/codec/yaml/param_yaml.cc
deleted file mode 100644
index 40e1eba..0000000
--- a/Src/Scarab/library/param/codec/yaml/param_yaml.cc
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * param_yaml.cc
- *
- *  Created on: Jan 19, 2016
- *      Author: bidishasen97
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "param_yaml.hh"
-
-#include "logger.hh"
-#include "param.hh"
-
-#include <sstream>
-#include <fstream>
-
-using std::string;
-using std::stringstream;
-
-namespace scarab
-{
-    LOGGER( slog, "param_yaml" );
-
-    REGISTER_PARAM_INPUT_CODEC( param_input_yaml, "yaml" );
-
-    param_input_yaml::param_input_yaml()
-    {}
-
-    param_input_yaml::~param_input_yaml()
-    {}
-
-    param_ptr_t param_input_yaml::read_file( const std::string& a_filename, const param_node& )
-    {
-        try
-        {
-            YAML::Node root_node = YAML::LoadFile( a_filename );
-            return param_input_yaml::read_node_type( root_node );
-        }
-        catch( YAML::Exception& e )
-        {
-            LERROR( slog, "YAML error: " << e.what() );
-            return std::unique_ptr< param >();
-        }
-    }
-
-    std::unique_ptr< param > param_input_yaml::read_string( const std::string& a_string, const param_node& )
-    {
-        try
-        {
-            YAML::Node root_node = YAML::Load( a_string );
-            return param_input_yaml::read_node_type( root_node );
-        }
-        catch( YAML::Exception& e )
-        {
-            LERROR( slog, "YAML error: " << e.what() );
-            return std::unique_ptr< param >();
-        }
-    }
-
-    param_ptr_t param_input_yaml::read_node_type( const YAML::Node& a_node )
-    {
-        try
-        {
-            if( a_node.IsNull() )
-            {
-                return param_ptr_t( new param() );
-            }
-            if( a_node.IsScalar() )
-            {
-                return param_input_yaml::scalar_handler(a_node);
-            }
-            if( a_node.IsSequence() )
-            {
-                return param_input_yaml::sequence_handler(a_node);
-            }
-            if( a_node.IsMap() )
-            {
-                return param_input_yaml::map_handler(a_node);
-            }
-        }
-        catch( YAML::Exception& e )
-        {
-            LERROR(slog, "YAML error in read_node_type: " << e.what());
-            throw error() << "YAML error: " << e.what();
-        }
-        LDEBUG( slog, "YAML unknown" );
-        throw error() << "Unknown YAML encountered";
-        return std::unique_ptr< param >();
-    }
-
-    std::unique_ptr< param_array > param_input_yaml::sequence_handler( const YAML::Node& a_node )
-    {
-        try
-        {
-            std::unique_ptr< param_array > t_array_as_param( new param_array() );
-
-            for( YAML::const_iterator counter = a_node.begin(); counter != a_node.end(); ++counter )
-            {
-                t_array_as_param->push_back( param_input_yaml::read_node_type( *counter ) );
-            }
-
-            return t_array_as_param;
-        }
-        catch( YAML::Exception& e )
-        {
-            LERROR( slog, "YAML error in sequence_handler: " << e.what() );
-            return std::unique_ptr< param_array >();
-        }
-    }
-
-    std::unique_ptr< param_node > param_input_yaml::map_handler( const YAML::Node& a_node )
-    {
-        try
-        {
-            std::unique_ptr< param_node > t_map_as_param( new param_node() );
-
-            for( YAML::const_iterator counter = a_node.begin(); counter != a_node.end(); ++counter )
-            {
-                t_map_as_param->replace( counter->first.as< std::string >(), param_input_yaml::read_node_type( counter->second ) );
-            }
-
-            return t_map_as_param;
-        }
-        catch( YAML::Exception& e )
-        {
-            LERROR( slog, "YAML error in map_handler: " << e.what() );
-            return std::unique_ptr< param_node >();
-        }
-    }
-
-    std::unique_ptr< param_value > param_input_yaml::scalar_handler( const YAML::Node& a_node )
-    {
-        try
-        {
-            // the order of these try statements matters!
-            try
-            {
-                return std::unique_ptr< param_value >( new param_value( a_node.as< unsigned >() ) );
-            }
-            catch( YAML::TypedBadConversion<unsigned>& )
-            {
-                try
-                {
-                    return std::unique_ptr< param_value >( new param_value( a_node.as< int >() ) );
-                }
-                catch( const YAML::TypedBadConversion<int>& )
-                {
-                    try
-                    {
-                        return std::unique_ptr< param_value >( new param_value( a_node.as< double >() ) );
-                    }
-                    catch( const YAML::TypedBadConversion<double>& )
-                    {
-                        try
-                        {
-                            return std::unique_ptr< param_value >( new param_value( a_node.as< bool >() ) );
-                        }
-                        catch( const YAML::TypedBadConversion<bool>& )
-                        {
-                            try
-                            {
-                                return std::unique_ptr< param_value >( new param_value( a_node.as< std::string >() ) );
-                            }
-                            catch( const YAML::TypedBadConversion<std::string>& )
-                            {
-                                return std::unique_ptr< param_value >( new param_value( a_node.Scalar() ) );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        catch ( YAML::Exception& e )
-        {
-            LERROR( slog, "YAML error in scalar_handler: " << e.what() )
-            return std::unique_ptr< param_value >();
-        }
-        return std::unique_ptr< param_value >();
-    }
-
-
-    REGISTER_PARAM_OUTPUT_CODEC( param_output_yaml, "yaml" );
-
-    param_output_yaml::param_output_yaml()
-    {}
-
-    param_output_yaml::~param_output_yaml()
-    {}
-
-    bool param_output_yaml::write_file( const param& a_to_write, const std::string& a_filename, const param_node& )
-    {
-        if( a_filename.empty() )
-        {
-            LERROR( slog, "Filename cannot be an empty string" );
-            return false;
-        }
-
-        YAML::Node a_node = param_output_yaml::check_param_type(a_to_write);
-
-        std::ofstream fout( a_filename.c_str() );
-        if (! fout.is_open() )
-        {
-            LERROR( slog, "Unable to open file: " << a_filename );
-            return false;
-        }
-
-        fout << a_node;
-
-        fout.close();
-
-        return true;
-    }
-
-    bool param_output_yaml::write_string( const param& a_to_write, std::string& a_string, const param_node& )
-    {
-        YAML::Node a_node = param_output_yaml::check_param_type( a_to_write );
-
-        std::stringstream t_out;
-        t_out << a_node;
-        a_string = t_out.str();
-
-        return true;
-    }
-
-    YAML::Node param_output_yaml::check_param_type( const param& a_to_write )
-    {
-        if( a_to_write.is_null() )
-        {
-            return YAML::Node();
-        }
-        else if( a_to_write.is_node() )
-        {
-            return param_output_yaml::param_node_handler( a_to_write );
-        }
-        else if( a_to_write.is_array() )
-        {
-            return param_output_yaml::param_array_handler( a_to_write );
-        }
-        else if( a_to_write.is_value() )
-        {
-            return param_output_yaml::param_value_handler( a_to_write );
-        }
-        LWARN( slog, "Unknown param type encountered" );
-        return YAML::Node();
-    }
-
-    YAML::Node param_output_yaml::param_node_handler( const param& a_to_write )
-    {
-        YAML::Node t_node;
-
-        const param_node& p_node = a_to_write.as_node();
-        for( param_node::const_iterator counter = p_node.begin(); counter != p_node.end(); ++counter )
-        {
-            t_node[counter.name()] = param_output_yaml::check_param_type( *counter );
-        }
-
-        return t_node;
-    }
-
-    YAML::Node param_output_yaml::param_array_handler( const param& a_to_write )
-    {
-        YAML::Node t_node;
-
-        const param_array& array = a_to_write.as_array();
-        for ( int count = 0; count != (int) array.size(); ++count )
-        {
-            t_node.push_back(param_output_yaml::check_param_type( array[count] ) );
-        }
-
-        return t_node;
-    }
-
-    YAML::Node param_output_yaml::param_value_handler( const param& a_to_write )
-    {
-        YAML::Node t_node;
-
-        const param_value& value = static_cast< const param_value& >(a_to_write);
-        if( value.is_bool() )
-        {
-            return t_node = value.as_bool();
-        }
-
-        else if( value.is_uint() )
-        {
-            return t_node = value.as_uint();
-        }
-
-        else if( value.is_double() )
-        {
-            return t_node = value.as_double();
-        }
-
-        else if( value.is_int() )
-        {
-            return t_node = value.as_int();
-        }
-
-        else if( value.is_string() )
-        {
-            return t_node = value.as_string();
-        }
-
-        LWARN( slog, "Unkown value type encountered" );
-        return YAML::Node();
-    }
-}
-/* namespace scarab */
-
diff --git a/Src/Scarab/library/param/codec/yaml/param_yaml.hh b/Src/Scarab/library/param/codec/yaml/param_yaml.hh
deleted file mode 100644
index 11867e6..0000000
--- a/Src/Scarab/library/param/codec/yaml/param_yaml.hh
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * param_yaml.hh
- *
- *  Created on: Jan 19, 2016
- *      Author: bidishasen97
- */
-
-#ifndef PARAM_YAML_HH_
-#define PARAM_YAML_HH_
-
-#include "yaml-cpp/yaml.h"
-
-#include "param_codec.hh"
-
-
-namespace scarab
-{
-    class param_array;
-    class param_value;
-
-    //***************************************
-    //************** INPUT ******************
-    //***************************************
-
-    /*!
-     @class param_input_yaml
-     @author N.S. Oblath
-
-     @brief Convert YAML to Param
-
-     @details
-     Options: None
-    */
-    class SCARAB_API param_input_yaml : public param_input_codec
-    {
-        public:
-            param_input_yaml();
-            virtual ~param_input_yaml();
-
-            virtual param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node() );
-            virtual param_ptr_t read_string( const std::string& a_string, const param_node& a_options = param_node() );
-
-            param_ptr_t read_node_type( const YAML::Node& a_node );
-            std::unique_ptr< param_array > sequence_handler( const YAML::Node& a_node );
-            std::unique_ptr< param_node > map_handler( const YAML::Node& a_node );
-            std::unique_ptr< param_value > scalar_handler( const YAML::Node& a_node );
-    };
-
-    //***************************************
-    //************** OUTPUT *****************
-    //***************************************
-
-    /*!
-     @class param_output_yaml
-     @author N.S. Oblath
-
-     @brief Convert Param to YAML
-
-     @details
-     Options: None
-    */
-    class SCARAB_API param_output_yaml : public param_output_codec
-    {
-        public:
-            param_output_yaml();
-            virtual ~param_output_yaml();
-
-            virtual bool write_file( const param& a_to_write, const std::string& a_filename, const param_node& a_options = param_node() );
-            virtual bool write_string( const param& a_to_write, std::string& a_string, const param_node& a_options = param_node() );
-
-            YAML::Node check_param_type( const param& a_to_write );
-            YAML::Node param_node_handler( const param& a_to_write );
-            YAML::Node param_array_handler( const param& a_to_write );
-            YAML::Node param_value_handler( const param& a_to_write );
-    };
-
-} /* namespace scarab */
-
-#endif /* PARAM_YAML_HH_ */
diff --git a/Src/Scarab/library/param/param.hh b/Src/Scarab/library/param/param.hh
deleted file mode 100644
index c06069e..0000000
--- a/Src/Scarab/library/param/param.hh
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * param.hh
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PARAM_HH_
-#define SCARAB_PARAM_HH_
-
-#include "param_array.hh"
-#include "param_base.hh"
-#include "param_node.hh"
-#include "param_value.hh"
-
-#include "param_base_impl.hh"
-
-#endif /* SCARAB_PARAM_HH_ */
diff --git a/Src/Scarab/library/param/param_array.cc b/Src/Scarab/library/param/param_array.cc
deleted file mode 100644
index f352ab9..0000000
--- a/Src/Scarab/library/param/param_array.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * param_array.cc
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include <sstream>
-using std::string;
-using std::stringstream;
-
-#include "param_array.hh"
-
-#include "param_base_impl.hh"
-#include "param_node.hh"
-
-
-namespace scarab
-{
-
-    param_array::param_array() :
-            param(),
-            f_contents()
-    {
-    }
-
-    param_array::param_array( const param_array& orig ) :
-            param( orig ),
-            f_contents( orig.f_contents.size() )
-    {
-        for( unsigned ind = 0; ind < f_contents.size(); ++ind )
-        {
-            f_contents[ind] = orig.f_contents[ ind ]->clone();
-        }
-    }
-
-    param_array::param_array( param_array&& orig ) :
-            param( std::move(orig) ),
-            f_contents( orig.f_contents.size() )
-    {
-        for( unsigned ind = 0; ind < f_contents.size(); ++ind )
-        {
-            f_contents[ind] = orig.f_contents[ ind ]->move_clone();
-        }
-        orig.clear();
-    }
-
-    param_array::~param_array()
-    {
-    }
-
-    param_array& param_array::operator=( const param_array& rhs )
-    {
-        this->param::operator=( rhs );
-        clear();
-        resize( rhs.size()) ;
-        for( unsigned ind = 0; ind < rhs.f_contents.size(); ++ind )
-        {
-            f_contents[ind] = rhs.f_contents[ ind ]->clone();
-        }
-        return *this;
-    }
-
-    param_array& param_array::operator=( param_array&& rhs )
-    {
-        this->param::operator=( std::move(rhs) );
-        clear();
-        resize( rhs.size()) ;
-        for( unsigned ind = 0; ind < rhs.f_contents.size(); ++ind )
-        {
-            f_contents[ind] = rhs.f_contents[ ind ]->move_clone();
-        }
-        rhs.clear();
-        return *this;
-    }
-
-    void param_array::resize( unsigned a_size )
-    {
-        f_contents.resize( a_size );
-        for( auto it = f_contents.begin(); it != f_contents.end(); ++it )
-        {
-            if( ! *it ) it->reset( new param() );
-        }
-        return;
-    }
-
-    bool param_array::has_subset( const param& a_subset ) const
-    {
-        if( ! a_subset.is_array() ) return false;
-        const param_array& t_subset_array = a_subset.as_array();
-        if( t_subset_array.size() > f_contents.size() ) return false;
-        contents::const_iterator t_this_it = f_contents.begin();
-        contents::const_iterator t_that_it = t_subset_array.f_contents.begin();
-        while( t_that_it != t_subset_array.f_contents.end() ) // loop condition is on a_subset because it's smaller or equal to this
-        {
-            if( ! (*t_this_it)->has_subset( **t_that_it ) ) return false;
-            ++t_this_it;
-            ++t_that_it;
-        }
-        return true;
-    }
-
-    void param_array::merge( const param_array& a_object )
-    {
-        //LDEBUG( dlog, "merging array with " << a_object.size() << " items:\n" << a_object );
-        if( size() < a_object.size() ) resize( a_object.size() );
-
-        for( unsigned index = 0; index < size() && index < a_object.size(); ++index )
-        {
-            // directly assign if destination location is empty
-            if( f_contents.at( index )->is_null() )
-            {
-                //LDEBUG( dlog, "have a null object at <" << index << ">; adding <" << a_object[index] << ">" );
-                assign( index, a_object[index] );
-                continue;
-            }
-
-            // overwrite/recurse if destination location matches incoming type
-            param& t_param = (*this)[index];
-            if( t_param.is_value() && a_object[index].is_value() )
-            {
-                //LDEBUG( dlog, "replacing the value at <" << index << "> with <" << a_object[index] << ">" );
-                t_param.as_value() = a_object[index].as_value();
-                continue;
-            }
-            if( t_param.is_node() && a_object[index].is_node() )
-            {
-                //LDEBUG( dlog, "merging nodes at <" << index << ">" )
-                t_param.as_node().merge( a_object[index].as_node() );
-                continue;
-            }
-            if( t_param.is_array() && a_object[index].is_array() )
-            {
-                //LDEBUG( dlog, "merging array at <" << index << ">" );
-                t_param.as_array().merge( a_object[index].as_array() );
-                continue;
-            }
-
-            // overwrite via direct assignment if destination location does not match incoming type
-            //LDEBUG( dlog, "generic replace" );
-            assign( index, a_object[index] );
-        }
-        return;
-     }
-
-
-    std::string param_array::to_string() const
-    {
-        stringstream out;
-        string indentation;
-        for ( unsigned i=0; i<param::s_indent_level; ++i )
-            indentation += "    ";
-        out << '\n' << indentation << "[\n";
-        param::s_indent_level++;
-        for( contents::const_iterator it = f_contents.begin(); it != f_contents.end(); ++it )
-        {
-            out << indentation << "    " << **it << '\n';
-        }
-        param::s_indent_level--;
-        out << indentation << "]\n";
-        return out.str();
-    }
-
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_array& a_value)
-    {
-        return out << a_value.to_string();
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_array.hh b/Src/Scarab/library/param/param_array.hh
deleted file mode 100644
index 0adff55..0000000
--- a/Src/Scarab/library/param/param_array.hh
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * param_array.hh
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PARAM_ARRAY_HH_
-#define SCARAB_PARAM_ARRAY_HH_
-
-#include "param_value.hh"
-
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/iterator/indirect_iterator.hpp>
-
-#include <deque>
-
-
-namespace scarab
-{
-    class param_value;
-    class param_node;
-
-    typedef std::deque< std::unique_ptr< param > > param_array_contents;
-
-    typedef boost::indirect_iterator< param_array_contents::iterator, param > param_array_iterator;
-    typedef boost::indirect_iterator< param_array_contents::const_iterator, const param > param_array_const_iterator;
-
-    class SCARAB_API param_array : public param
-    {
-        public:
-            typedef param_array_contents contents;
-            typedef param_array_iterator iterator;
-            typedef param_array_const_iterator const_iterator;
-            typedef contents::reverse_iterator reverse_iterator;
-            typedef contents::const_reverse_iterator const_reverse_iterator;
-            typedef contents::value_type contents_type;
-
-        public:
-            param_array();
-            param_array( const param_array& orig );
-            param_array( param_array&& orig );
-            virtual ~param_array();
-
-            param_array& operator=( const param_array& rhs );
-            param_array& operator=( param_array&& rhs );
-
-            virtual param_ptr_t clone() const;
-            virtual param_ptr_t move_clone();
-
-            virtual bool is_null() const;
-            virtual bool is_array() const;
-
-            virtual bool has_subset( const param& a_subset ) const;
-
-            unsigned size() const;
-            bool empty() const;
-
-            /// sets the size of the array
-            /// if smaller than the current size, extra elements are deleted
-            void resize( unsigned a_size );
-
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            std::string get_value( unsigned a_index, const std::string& a_default ) const;
-            std::string get_value( unsigned a_index, const char* a_default ) const;
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            template< typename XValType >
-            XValType get_value( unsigned a_index, XValType a_default ) const;
-
-            /// Returns a reference to the param at a_index.
-            /// Throws a std::out_of_range if a_index is out-of-range.
-            const param& operator[]( unsigned a_index ) const;
-            /// Returns a reference to the param at a_index.
-            /// Throws a std::out_of_range if a_index is out-of-range.
-            param& operator[]( unsigned a_index );
-
-            const param& front() const;
-            param& front();
-
-            const param& back() const;
-            param& back();
-
-            // assign a copy of a_value to the array at a_index
-            void assign( unsigned a_index, const param& a_value );
-            // directly assign a_value to the array at a_index
-            void assign( unsigned a_index, param&& a_value );
-            // directly assign a_value_ptr to the array at a_index
-            void assign( unsigned a_index, param_ptr_t a_value_ptr );
-            // directly assign a_value to the array at a_index for any type that param_value accepts
-            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
-            void assign( unsigned a_index, T a_value );
-
-            void push_back( const param& a_value );
-            void push_back( param&& a_value );
-            void push_back( param_ptr_t a_value_ptr );
-            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
-            void push_back( T a_value );
-
-            void push_front( const param& a_value );
-            void push_front( param&& a_value );
-            void push_front( param_ptr_t a_value_ptr );
-            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
-            void push_front( T a_value );
-
-            void append( const param_array& an_array );
-
-            void merge( const param_array& an_array );
-
-            void erase( unsigned a_index );
-            param_ptr_t remove( unsigned a_index );
-            void clear();
-
-            iterator begin();
-            const_iterator begin() const;
-
-            iterator end();
-            const_iterator end() const;
-
-            reverse_iterator rbegin();
-            const_reverse_iterator rbegin() const;
-
-            reverse_iterator rend();
-            const_reverse_iterator rend() const;
-
-            virtual std::string to_string() const;
-
-        protected:
-            contents f_contents;
-    };
-
-
-    template< typename XValType >
-    XValType param_array::get_value( unsigned a_index, XValType a_default ) const
-    {
-        return a_index < size() ? operator[]( a_index ).as_value().as< XValType >() : a_default;
-    }
-
-    inline param_ptr_t param_array::clone() const
-    {
-        return std::unique_ptr< param_array >( new param_array( *this ) );
-    }
-
-    inline param_ptr_t param_array::move_clone()
-    {
-        return std::unique_ptr< param_array >( new param_array( std::move( *this ) ) );
-    }
-
-    inline bool param_array::is_null() const
-    {
-        return false;
-    }
-
-    inline bool param_array::is_array() const
-    {
-        return true;
-    }
-
-    inline unsigned param_array::size() const
-    {
-        return f_contents.size();
-    }
-    inline bool param_array::empty() const
-    {
-        return f_contents.empty();
-    }
-
-    inline std::string param_array::get_value( unsigned a_index, const std::string& a_default ) const
-    {
-        return a_index < size() ? operator[]( a_index ).to_string() : a_default;
-    }
-
-    inline std::string param_array::get_value( unsigned a_index, const char* a_default ) const
-    {
-        return get_value( a_index, std::string( a_default ) );
-    }
-
-    inline const param& param_array::operator[]( unsigned a_index ) const
-    {
-        return *f_contents.at( a_index );
-    }
-    inline param& param_array::operator[]( unsigned a_index )
-    {
-        return *f_contents.at( a_index );
-    }
-
-    inline const param& param_array::front() const
-    {
-        return *f_contents.front();
-    }
-    inline param& param_array::front()
-    {
-        return *f_contents.front();
-    }
-
-    inline const param& param_array::back() const
-    {
-        return *f_contents.back();
-    }
-    inline param& param_array::back()
-    {
-        return *f_contents.back();
-    }
-
-    // assign a copy of a_value to the array at a_index
-    inline void param_array::assign( unsigned a_index, const param& a_value )
-    {
-        erase( a_index );
-        f_contents.at( a_index ) = a_value.clone();
-        return;
-    }
-    // directly move a_value to the array at a_index
-    inline void param_array::assign( unsigned a_index, param&& a_value )
-    {
-        erase( a_index );
-        f_contents.at( a_index ) = a_value.move_clone();
-        return;
-    }
-    // directly assign a_value_ptr to the array at a_index
-    inline void param_array::assign( unsigned a_index, param_ptr_t a_value_ptr )
-    {
-        erase( a_index );
-        f_contents.at( a_index ) = std::move(a_value_ptr);
-        return;
-    }
-    // directly move a_value to the array at a_index
-    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
-    inline void param_array::assign( unsigned a_index, T a_value )
-    {
-        erase( a_index );
-        f_contents.at( a_index ) = param_ptr_t( new param_value( a_value ) );
-        return;
-    }
-
-    inline void param_array::push_back( const param& a_value )
-    {
-        f_contents.push_back( a_value.clone() );
-        return;
-    }
-    inline void param_array::push_back( param&& a_value )
-    {
-        f_contents.push_back( a_value.move_clone() );
-        return;
-    }
-    inline void param_array::push_back( param_ptr_t a_value_ptr )
-    {
-        f_contents.push_back( std::move(a_value_ptr) );
-        return;
-    }
-    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
-    inline void param_array::push_back( T a_value )
-    {
-        f_contents.push_back( param_ptr_t( new param_value( a_value ) ) );
-        return;
-    }
-
-    inline void param_array::push_front( const param& a_value )
-    {
-        f_contents.push_front( a_value.clone() );
-        return;
-    }
-    inline void param_array::push_front( param&& a_value )
-    {
-        f_contents.push_front( a_value.move_clone() );
-        return;
-    }
-    inline void param_array::push_front( param_ptr_t a_value_ptr )
-    {
-        f_contents.push_front( std::move(a_value_ptr) );
-        return;
-    }
-    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
-    inline void param_array::push_front( T a_value )
-    {
-        f_contents.push_front( param_ptr_t( new param_value( a_value ) ) );
-        return;
-    }
-
-    inline void param_array::append( const param_array& an_array )
-    {
-        for( const_iterator it = const_iterator(an_array.begin()); it != const_iterator(an_array.end()); ++it )
-        {
-            push_back( *it );
-        }
-        return;
-    }
-
-    inline void param_array::erase( unsigned a_index )
-    {
-        f_contents.at( a_index ).reset();
-        return;
-    }
-    inline param_ptr_t param_array::remove( unsigned a_index )
-    {
-        param_ptr_t t_current( std::move( f_contents.at( a_index ) ) );
-        return t_current;
-    }
-    inline void param_array::clear()
-    {
-        f_contents.clear();
-        return;
-    }
-
-    inline param_array::iterator param_array::begin()
-    {
-        return iterator( f_contents.begin() );
-    }
-    inline param_array::const_iterator param_array::begin() const
-    {
-        return const_iterator( f_contents.cbegin() );
-    }
-
-    inline param_array::iterator param_array::end()
-    {
-        return iterator( f_contents.end() );
-    }
-    inline param_array::const_iterator param_array::end() const
-    {
-        return const_iterator( f_contents.cend() );
-    }
-
-    inline param_array::reverse_iterator param_array::rbegin()
-    {
-        return f_contents.rbegin();
-    }
-    inline param_array::const_reverse_iterator param_array::rbegin() const
-    {
-        return f_contents.rbegin();
-    }
-
-    inline param_array::reverse_iterator param_array::rend()
-    {
-        return f_contents.rend();
-    }
-    inline param_array::const_reverse_iterator param_array::rend() const
-    {
-        return f_contents.crend();
-    }
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_array& value);
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_ARRAY_HH_ */
diff --git a/Src/Scarab/library/param/param_base.cc b/Src/Scarab/library/param/param_base.cc
deleted file mode 100644
index 7a451a1..0000000
--- a/Src/Scarab/library/param/param_base.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * param_base.cc
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include <sstream>
-using std::string;
-using std::stringstream;
-
-#include "param_base.hh"
-
-#include "param_base_impl.hh"
-
-namespace scarab
-{
-
-    SCARAB_API unsigned param::s_indent_level = 0;
-
-    param::param()
-    {
-    }
-
-    param::param( const param& )
-    {
-    }
-
-    param::param( param&& )
-    {
-    }
-
-    param::~param()
-    {
-    }
-
-    inline void param::merge( const param& a_param )
-    {
-        if( is_node() && a_param.is_node() )
-        {
-            as_node().merge( a_param.as_node() );
-            return;
-        }
-        if( is_array() && a_param.is_array() )
-        {
-            as_array().merge( a_param.as_array() );
-            return;
-        }
-        if( is_value() && a_param.is_value() )
-        {
-            as_value() = a_param.as_value();
-            return;
-        }
-        if( is_null() && a_param.is_null() ) return;
-        throw error() << "Invalid merge command with incompatible param types";
-    }
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param& a_value)
-    {
-        return out << a_value.to_string();
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_base.hh b/Src/Scarab/library/param/param_base.hh
deleted file mode 100644
index 524dccc..0000000
--- a/Src/Scarab/library/param/param_base.hh
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * param_base.hh
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PARAM_BASE_HH_
-#define SCARAB_PARAM_BASE_HH_
-
-#include "error.hh"
-
-#include <memory>
-#include <sstream>
-#include <string>
-
-namespace scarab
-{
-    class param_value;
-    class param_array;
-    class param_node;
-
-    class param;
-    typedef std::unique_ptr< param > param_ptr_t;
-
-    class SCARAB_API param
-    {
-        public:
-            param();
-            param( const param& orig );
-            param( param&& orig );
-            virtual ~param();
-
-            param& operator=( const param& rhs );
-            param& operator=( param&& );
-
-            virtual param_ptr_t clone() const;
-            virtual param_ptr_t move_clone();
-
-            virtual bool is_null() const;
-            virtual bool is_value() const;
-            virtual bool is_array() const;
-            virtual bool is_node() const;
-
-            virtual bool has_subset( const param& a_subset ) const;
-
-            param_value& as_value();
-            param_array& as_array();
-            param_node& as_node();
-
-            const param_value& as_value() const;
-            const param_array& as_array() const;
-            const param_node& as_node() const;
-
-            /// Assumes that the parameter is a value, and returns a reference to itself.
-            const param_value& operator()() const;
-            /// Assumes that the parameter is a value, and returns a reference to itself.
-            param_value& operator()();
-
-            /// Assumes that the parameter is an array, and returns a reference to the param at a_index.
-            /// Behavior is undefined if a_index is out-of-range.
-            const param& operator[]( unsigned a_index ) const;
-            /// Assumes that the parameter is an array, and returns a reference to the param at a_index.
-            /// Behavior is undefined if a_index is out-of-range.
-            param& operator[]( unsigned a_index );
-
-            /// Assumes that the parameter is a node, and returns a reference to the param corresponding to a_name.
-            /// Throws a scarab::error if a_name is not present.
-            const param& operator[]( const std::string& a_name ) const;
-            /// Assumes that the parameter is a node, and returns a reference to the param corresponding to a_name.
-            /// Throws a scarab::error if a_name is not present.
-            param& operator[]( const std::string& a_name );
-
-            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            std::string get_value( const std::string& a_name, const std::string& a_default ) const;
-            std::string get_value( const std::string& a_name, const char* a_default ) const;
-            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            template< typename XValType >
-            XValType get_value( const std::string& a_name, XValType a_default ) const;
-
-            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            std::string get_value( unsigned a_index, const std::string& a_default ) const;
-            std::string get_value( unsigned a_index, const char* a_default ) const;
-            /// If the derived param type is param_node, forwards the reqeust to param_node; otherwise throws an error.
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            template< typename XValType >
-            XValType get_value( unsigned a_index, XValType a_default ) const;
-
-            void merge( const param& a_param );
-
-            virtual std::string to_string() const;
-
-            static unsigned s_indent_level;
-    };
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param& value);
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_BASE_HH_ */
diff --git a/Src/Scarab/library/param/param_base_impl.hh b/Src/Scarab/library/param/param_base_impl.hh
deleted file mode 100644
index 5ab4e66..0000000
--- a/Src/Scarab/library/param/param_base_impl.hh
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * param_base_impl.hh
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PARAM_BASE_IMPL_HH_
-#define SCARAB_PARAM_BASE_IMPL_HH_
-
-#include "param_base.hh"
-
-#include "param_array.hh"
-#include "param_node.hh"
-#include "param_value.hh"
-
-namespace scarab
-{
-
-    inline param& param::operator=( const param& )
-    {
-        return *this;
-    }
-
-    inline param& param::operator=( param&& )
-    {
-        return *this;
-    }
-
-    inline param_ptr_t param::clone() const
-    {
-        //std::cout << "param::clone()" << std::endl;
-        return param_ptr_t( new param( *this ) );
-    }
-
-    inline param_ptr_t param::move_clone()
-    {
-        //std::cout << "param::clone()" << std::endl;
-        return param_ptr_t( new param( std::move(*this) ) );
-    }
-
-    inline bool param::is_null() const
-    {
-        return true;
-    }
-
-    inline bool param::is_value() const
-    {
-        return false;
-    }
-
-    inline bool param::is_array() const
-    {
-        return false;
-    }
-
-    inline bool param::is_node() const
-    {
-        return false;
-    }
-
-    inline bool param::has_subset( const param& /*a_subset*/ ) const
-    {
-        // this version of has_subset should only ever be called if a_subset is a null param (i.e. not one of the derived classes)
-        return true;
-    }
-
-    inline param_value& param::as_value()
-    {
-        if( this->is_value() ) return *static_cast< param_value* >( this );
-        throw error() << "Param object is not a value";
-    }
-
-    inline param_array& param::as_array()
-    {
-        if( this->is_array() ) return *static_cast< param_array* >( this );
-        throw error() << "Param object is not an array";
-    }
-
-    inline param_node& param::as_node()
-    {
-        if( this->is_node() ) return *static_cast< param_node* >( this );
-        throw error() << "Param object is not a node";
-    }
-
-    inline const param_value& param::as_value() const
-    {
-        if( this->is_value() ) return *static_cast< const param_value* >( this );
-        throw error() << "Param object is not a value";
-    }
-
-    inline const param_array& param::as_array() const
-    {
-        if( this->is_array() ) return *static_cast< const param_array* >( this );
-        throw error() << "Param object is not an array";
-    }
-
-    inline const param_node& param::as_node() const
-    {
-        if( this->is_node() ) return *static_cast< const param_node* >( this );
-        throw error() << "Param object is not a node";
-    }
-
-    inline const param_value& param::operator()() const
-    {
-        return as_value();
-    }
-
-    inline param_value& param::operator()()
-    {
-        return as_value();
-    }
-
-    inline const param& param::operator[]( unsigned a_index ) const
-    {
-        return as_array()[ a_index ];
-    }
-
-    inline param& param::operator[]( unsigned a_index )
-    {
-        return as_array()[ a_index ];
-    }
-
-    inline const param& param::operator[]( const std::string& a_name ) const
-    {
-        return as_node()[ a_name ];
-    }
-
-    inline param& param::operator[]( const std::string& a_name )
-    {
-        return as_node()[ a_name ];
-    }
-
-    inline std::string param::get_value( const std::string& a_name, const std::string& a_default ) const
-    {
-        return as_node().get_value( a_name, a_default );
-    }
-
-    inline std::string param::get_value( const std::string& a_name, const char* a_default ) const
-    {
-        return as_node().get_value( a_name, a_default );
-    }
-
-    template< typename XValType >
-    inline XValType param::get_value( const std::string& a_name, XValType a_default ) const
-    {
-        return as_node().get_value( a_name, a_default );
-    }
-
-    inline std::string param::get_value( unsigned a_index, const std::string& a_default ) const
-    {
-        return as_array().get_value( a_index, a_default );
-    }
-
-    inline std::string param::get_value( unsigned a_index, const char* a_default ) const
-    {
-        return as_array().get_value( a_index, a_default );
-    }
-
-    template< typename XValType >
-    inline XValType param::get_value( unsigned a_index, XValType a_default ) const
-    {
-        return as_array().get_value( a_index, a_default );
-    }
-
-    inline std::string param::to_string() const
-    {
-        return std::string();
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_BASE_IMPL_HH_ */
diff --git a/Src/Scarab/library/param/param_codec.cc b/Src/Scarab/library/param/param_codec.cc
deleted file mode 100644
index 2990003..0000000
--- a/Src/Scarab/library/param/param_codec.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * param_codec.cc
- *
- *  Created on: Aug 10, 2016
- *      Author: obla999
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "param_codec.hh"
-
-#include "factory.hh"
-#include "logger.hh"
-#include "path.hh"
-
-LOGGER( slog, "param_codec" );
-
-namespace scarab
-{
-
-    param_input_codec::param_input_codec()
-    {
-    }
-
-    param_input_codec::~param_input_codec()
-    {
-    }
-
-
-    param_output_codec::param_output_codec()
-    {
-    }
-
-    param_output_codec::~param_output_codec()
-    {
-    }
-
-
-    param_translator::param_translator()
-    {
-    }
-
-    param_translator::~param_translator()
-    {
-    }
-
-    param_ptr_t param_translator::read_file( const std::string& a_filename, const param_node& a_options  )
-    {
-        std::string t_encoding = a_options.get_value( "encoding", "" );
-        if( t_encoding.empty() )
-        {
-            path t_path = expand_path( a_filename );
-            t_encoding = t_path.extension().string().substr( 1 ); // remove the '.' at the beginning
-        }
-
-        param_input_codec* t_codec = factory< param_input_codec >::get_instance()->create( t_encoding );
-        if( t_codec == nullptr )
-        {
-            LERROR( slog, "Unable to find input codec for encoding <" << t_encoding << ">");
-            return nullptr;
-        }
-
-        return t_codec->read_file( a_filename, a_options );
-    }
-
-    param_ptr_t param_translator::read_string( const std::string& a_string, const param_node& a_options  )
-    {
-        std::string t_encoding = a_options.get_value( "encoding", "" );
-        if( t_encoding.empty() )
-        {
-            LERROR( slog, "Encoding-type option must be provided");
-            return nullptr;
-        }
-
-        return read_string( a_string, t_encoding, a_options );
-    }
-
-    param_ptr_t param_translator::read_string( const std::string& a_string, const std::string& a_encoding, const param_node& a_options  )
-    {
-        param_input_codec* t_codec = factory< param_input_codec >::get_instance()->create( a_encoding );
-        if( t_codec == nullptr )
-        {
-            LERROR( slog, "Unable to find input codec for encoding <" << a_encoding << ">");
-            return nullptr;
-        }
-
-        return t_codec->read_string( a_string, a_options );
-    }
-
-    bool param_translator::write_file( const param& a_param, const std::string& a_filename, const param_node& a_options  )
-    {
-        std::string t_encoding = a_options.get_value( "encoding", "" );
-        if( t_encoding.empty() )
-        {
-            path t_path = expand_path( a_filename );
-            t_encoding = t_path.extension().string().substr( 1 ); // remove the '.' at the beginning
-        }
-
-        param_output_codec* t_codec = factory< param_output_codec >::get_instance()->create( t_encoding );
-        if( t_codec == nullptr )
-        {
-            LERROR( slog, "Unable to find output codec for encoding <" << t_encoding << ">");
-            return false;
-        }
-
-        return t_codec->write_file( a_param, a_filename, a_options );
-    }
-
-    bool param_translator::write_string( const param& a_param, std::string& a_string, const param_node& a_options  )
-    {
-        std::string t_encoding = a_options.get_value( "encoding", "" );
-        if( t_encoding.empty() )
-        {
-            LERROR( slog, "Encoding-type option must be provided");
-            return false;
-        }
-
-        return write_string( a_param, a_string, t_encoding, a_options );
-    }
-
-    bool param_translator::write_string( const param& a_param, std::string& a_string, const std::string& a_encoding, const param_node& a_options  )
-    {
-        param_output_codec* t_codec = factory< param_output_codec >::get_instance()->create( a_encoding );
-        if( t_codec == nullptr )
-        {
-            LERROR( slog, "Unable to find output codec for encoding <" << a_encoding << ">");
-            return false;
-        }
-
-        return t_codec->write_string( a_param, a_string, a_options );
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_codec.hh b/Src/Scarab/library/param/param_codec.hh
deleted file mode 100644
index dd6dc68..0000000
--- a/Src/Scarab/library/param/param_codec.hh
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * param_codec.hh
- *
- *  Created on: Aug 10, 2016
- *      Author: obla999
- */
-
-#ifndef SCARAB_PARAM_CODEC_HH_
-#define SCARAB_PARAM_CODEC_HH_
-
-#include "param.hh"
-
-#include "scarab_api.hh"
-
-#include "factory.hh"
-
-#include <memory>
-#include <string>
-
-namespace scarab
-{
-
-#define REGISTER_PARAM_INPUT_CODEC(codec_class, encoding) \
-        static registrar< param_input_codec, codec_class > s_param_input_codec##codec_class##_registrar( encoding );
-
-    class SCARAB_API param_input_codec
-    {
-        public:
-            param_input_codec();
-            virtual ~param_input_codec();
-
-            virtual param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node() ) = 0;
-            virtual param_ptr_t read_string( const std::string& a_string, const param_node& a_options = param_node() ) = 0;
-    };
-
-
-    class SCARAB_API param_output_codec
-    {
-        public:
-            param_output_codec();
-            virtual ~param_output_codec();
-
-            virtual bool write_file( const param& a_param, const std::string& a_filename, const param_node& a_options = param_node() ) = 0;
-            virtual bool write_string( const param& a_param, std::string& a_string, const param_node& a_options = param_node() ) = 0;
-    };
-
-#define REGISTER_PARAM_OUTPUT_CODEC(codec_class, encoding) \
-        static registrar< param_output_codec, codec_class > s_param_output_codec##codec_class##_registrar( encoding );
-
-
-    class SCARAB_API param_translator
-    {
-        public:
-            param_translator();
-            ~param_translator();
-
-        public:
-            param_ptr_t read_file( const std::string& a_filename, const param_node& a_options = param_node()  );
-            param_ptr_t read_string( const std::string& a_string, const param_node& a_options = param_node()  );
-            param_ptr_t read_string( const std::string& a_string, const std::string& a_encoding, const param_node& a_options = param_node() );
-
-        public:
-            bool write_file( const param& a_param, const std::string& a_filename, const param_node& a_options = param_node() );
-            bool write_string( const param& a_param, std::string& a_string, const param_node& a_options = param_node() );
-            bool write_string( const param& a_param, std::string& a_string, const std::string& a_encoding, const param_node& a_options = param_node() );
-    };
-
-
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_CODEC_HH_ */
diff --git a/Src/Scarab/library/param/param_helpers.cc b/Src/Scarab/library/param/param_helpers.cc
deleted file mode 100644
index b089669..0000000
--- a/Src/Scarab/library/param/param_helpers.cc
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * param_helpers.cc
- *
- *  Created on: Jan 10, 2019
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "param_helpers.hh"
-
-#include "logger.hh"
-
-LOGGER( plog, "param_helpers" );
-
-namespace scarab
-{
-    param_ptr_t simple_parser::parse_address( const std::string& an_addr, param_ptr_t a_value )
-    {
-        // this method can throw scarab::error
-
-        if( an_addr.empty() )
-        {
-            throw error() << "No address for keyword argument with value <" << *a_value << ">";
-        }
-
-        std::string::size_type t_div_pos = an_addr.find( f_node_separator );
-        std::string t_top_addr = an_addr.substr( 0, t_div_pos );
-
-        param_ptr_t t_new_param = new_param_from_addr( t_top_addr );
-
-        if( t_new_param->is_node() )
-        {
-            // only nodes are allowed at the top level
-            std::string t_next_addr = t_div_pos == an_addr.npos ? "" : an_addr.substr( t_div_pos+1 );
-            add_next( *t_new_param, t_top_addr, t_next_addr, std::move(a_value) ); // this can throw scarab::error
-            return t_new_param;
-        }
-
-        throw error() << "Top param type must be a node; this address is invalid: <" << an_addr << ">";
-    }
-
-    void simple_parser::add_next( param& a_parent, const std::string& an_addr_in_parent, const std::string& a_next_addr, param_ptr_t a_value )
-    {
-        // this method can throw scarab::error
-
-        param_ptr_t t_child;
-
-        // check if the next address is empty;
-        // if so, parse the value
-        // if not, parse the child
-        if( a_next_addr.empty() )
-        {
-            // the child is a param_value or param
-            t_child = std::move(a_value);
-        }
-        else
-        {
-            // the child is a param_array or param_node
-            std::string::size_type t_div_pos = a_next_addr.find( f_node_separator );
-            std::string t_top_addr = a_next_addr.substr( 0, t_div_pos );
-            t_child = new_param_from_addr( t_top_addr );
-            std::string t_next_addr = t_div_pos == a_next_addr.npos ? "" : a_next_addr.substr( t_div_pos+1 );
-            add_next( *t_child, t_top_addr, t_next_addr, std::move(a_value) ); // this can throw scarab::error
-        }
-
-        // add the child as appropriate for the parent type
-        if( a_parent.is_array() )
-        {
-            unsigned index = std::stoul( an_addr_in_parent );
-            param_array& t_parent_array = a_parent.as_array();
-            if( index > t_parent_array.size() ) t_parent_array.resize( index+1 );
-            if( t_child )
-            {
-                a_parent.as_array().assign( std::stoul( an_addr_in_parent ), std::move(t_child) );
-            }
-        }
-        else if( a_parent.is_node() )
-        {
-            if( t_child )
-            {
-                a_parent.as_node().replace( an_addr_in_parent, std::move(t_child) );
-            }
-        }
-        else
-        {
-            throw error() << "Invalid param type: only nodes and arrays accepted";
-        }
-
-        return;
-    }
-
-    param_ptr_t simple_parser::new_param_from_addr( const std::string& an_addr )
-    {
-        if( an_addr.empty() ) return std::unique_ptr< param_value >( ( new param_value() ) );
-
-        // check whether all of the characters in the address are digits
-        // if any are not, then the address cannot be an integer array index, so return a param_node
-        for( const char& ch : an_addr )
-        {
-            if( ! std::isdigit( ch ) ) return std::unique_ptr< param_node >( new param_node() );
-        }
-        // if we're here, then the address is an integer, so return a param_array
-        return std::unique_ptr< param_array >( new param_array() );
-    }
-
-    param_ptr_t simple_parser::parse_value( const std::string& a_value )
-    {
-        // we've found the value; now check if it's a number or a string
-        if( a_value.empty() )
-        {
-            LTRACE( plog, "Parsed value as NULL" );
-            return std::unique_ptr< param >( new param() );
-        }
-        // if "true" or "false", then bool
-        else if( a_value == "true" )
-        {
-            LTRACE( plog, "Parsing value (" << a_value << ") as bool(true)" );
-            return std::unique_ptr< param_value >( new param_value( true ) );
-        }
-        else if( a_value == "false" )
-        {
-            LTRACE( plog, "Parsing value (" << a_value << ") as bool(false)" );
-            return std::unique_ptr< param_value >( new param_value( false ) );
-        }
-        else
-        {
-            // To test if the string is numeric:
-            //   1. if it has 2 decimal points, it's not numeric (IP addresses, for example, would pass the second test)
-            //   2. double is the most general form of number, so if it fails that conversion, it's not numeric.
-            double t_double;
-            std::stringstream t_conv_double( a_value );
-            if( a_value.find( '.' ) == a_value.rfind( '.' ) &&
-                    a_value.find( '-' ) == a_value.rfind( '-' ) &&
-                    ! (t_conv_double >> t_double).fail() )
-            {
-                // now we know the value is numeric
-                if( a_value.find( '.' ) != std::string::npos ||
-                    a_value.find( 'e' ) != std::string::npos ||
-                    a_value.find( 'E' ) != std::string::npos )
-                {
-                    // value is a floating-point number, since it has a decimal point
-                    LTRACE( plog, "Parsing value (" << a_value << ") as double(" << t_double << ")" );
-                    return std::unique_ptr< param_value >( new param_value( t_double ) );
-                }
-                else if( a_value[ 0 ] == '-' )
-                {
-                    // value is a signed integer if it's negative
-                    LTRACE( plog, "Parsing value (" << a_value << ") as int(" << (int64_t)t_double << ")" );
-                    return std::unique_ptr< param_value >( new param_value( (int64_t)t_double ) );
-                }
-                else
-                {
-                    // value is assumed to be unsigned if it's positive
-                    LTRACE( plog, "Parsing value (" << a_value << ") as uint(" << (uint64_t)t_double << ")" );
-                    return std::unique_ptr< param_value >( new param_value( (uint64_t)t_double ) );
-                }
-            }
-            else
-            {
-                // value is not numeric; treat as a string
-                LTRACE( plog, "Parsing value (" << a_value << ") as a string" );
-                return std::unique_ptr< param_value >( new param_value( a_value ) );
-            }
-        }
-    }
-
-}
-
-
-
diff --git a/Src/Scarab/library/param/param_helpers.hh b/Src/Scarab/library/param/param_helpers.hh
deleted file mode 100644
index ebcd4ca..0000000
--- a/Src/Scarab/library/param/param_helpers.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * param_helpers.hh
- *
- *  Created on: Jan 10, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_PARAM_HELPERS_HH_
-#define SCARAB_PARAM_HELPERS_HH_
-
-#include "param.hh"
-
-namespace scarab
-{
-    struct SCARAB_API simple_parser
-    {
-        public:
-            /// Converts an address into a nested param structure, and optionally attaches a value
-            static param_ptr_t parse_address( const std::string& an_addr, param_ptr_t a_value = param_ptr_t() );
-
-            /// Attempts to determine whether a value encoded as a string is an int, and unsigned int, or a floating-point number
-            static param_ptr_t parse_value( const std::string& a_value );
-
-        private:
-            static void add_next( param& a_parent, const std::string& an_addr_in_parent, const std::string& a_next_addr, param_ptr_t a_value = param_ptr_t() );
-
-            static param_ptr_t new_param_from_addr( const std::string& an_addr );
-
-        public:
-            static const char f_node_separator = '.';
-    };
-}
-
-#endif /* SCARAB_PARAM_HELPERS_HH_ */
diff --git a/Src/Scarab/library/param/param_node.cc b/Src/Scarab/library/param/param_node.cc
deleted file mode 100644
index 0c81f72..0000000
--- a/Src/Scarab/library/param/param_node.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * param_node.cc
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include <sstream>
-using std::string;
-using std::stringstream;
-
-#include "param_node.hh"
-
-#include "param_array.hh"
-#include "param_base_impl.hh"
-
-
-namespace scarab
-{
-
-    param_node::param_node() :
-            param(),
-            f_contents()
-    {
-    }
-
-    param_node::param_node( const param_node& orig ) :
-            param( orig ),
-            f_contents()
-    {
-        for( contents::const_iterator it = orig.f_contents.begin(); it != orig.f_contents.end(); ++it )
-        {
-            f_contents[it->first] = it->second->clone();
-        }
-    }
-
-    param_node::param_node( param_node&& orig ) :
-            param( std::move(orig) ),
-            f_contents()
-    {
-        for( contents::const_iterator it = orig.f_contents.begin(); it != orig.f_contents.end(); ++it )
-        {
-            f_contents[it->first] = it->second->move_clone();
-        }
-        orig.clear();
-    }
-
-    param_node::~param_node()
-    {
-    }
-
-    param_node& param_node::operator=( const param_node& rhs )
-    {
-        this->param::operator=( rhs );
-        clear();
-        for( contents::const_iterator it = rhs.f_contents.begin(); it != rhs.f_contents.end(); ++it )
-        {
-            f_contents[it->first] = it->second->clone();
-        }
-        return *this;
-    }
-
-    param_node& param_node::operator=( param_node&& rhs )
-    {
-        this->param::operator=( std::move(rhs) );
-        clear();
-        for( contents::const_iterator it = rhs.f_contents.begin(); it != rhs.f_contents.end(); ++it )
-        {
-            f_contents[it->first] = it->second->move_clone();
-        }
-        rhs.clear();
-        return *this;
-    }
-
-    bool param_node::has_subset( const param& a_subset ) const
-    {
-        if( ! a_subset.is_node() ) return false;
-        const param_node& t_subset_node = a_subset.as_node();
-        if( t_subset_node.size() > f_contents.size() ) return false;
-        for( contents::const_iterator t_subset_it = t_subset_node.f_contents.begin(); t_subset_it != t_subset_node.f_contents.end(); ++t_subset_it )
-        {
-            if( ! has( t_subset_it->first ) ) return false;
-            if( ! f_contents.at( t_subset_it->first )->has_subset( *t_subset_it->second ) ) return false;
-        }
-        return true;
-    }
-
-    void param_node::merge( const param_node& a_object )
-    {
-        //LDEBUG( dlog, "merging object with " << a_object.size() << " items:\n" << a_object );
-        for( contents::const_iterator it = a_object.f_contents.begin(); it != a_object.f_contents.end(); ++it )
-        {
-            if( ! has( it->first ) )
-            {
-                //LDEBUG( dlog, "do not have object <" << it->first << "> = <" << *it->second << ">" );
-                add( it->first, *it->second );
-                continue;
-            }
-
-            param& t_param = (*this)[ it->first ];
-            if( t_param.is_value() && it->second->is_value() )
-            {
-                //LDEBUG( dlog, "replacing the value of \"" << it->first << "\" <" << get_value( it->first ) << "> with <" << *it->second << ">" );
-                t_param.as_value() = it->second->as_value();
-                continue;
-            }
-            if( t_param.is_node() && it->second->is_node() )
-            {
-                //LDEBUG( dlog, "merging nodes")
-                t_param.as_node().merge( it->second->as_node() );
-                continue;
-            }
-            if( t_param.is_array() && it->second->is_array() )
-            {
-                //LDEBUG( dlog, "merging array" );
-                t_param.as_array().merge( it->second->as_array() );
-                continue;
-            }
-
-            //LDEBUG( dlog, "generic replace" );
-            this->replace( it->first, *it->second );
-        }
-    }
-
-    std::string param_node::to_string() const
-    {
-        stringstream out;
-        string indentation;
-        for ( unsigned i=0; i<param::s_indent_level; ++i )
-            indentation += "    ";
-        out << '\n' << indentation << "{\n";
-        param::s_indent_level++;
-        for( contents::const_iterator it = f_contents.begin(); it != f_contents.end(); ++it )
-        {
-            out << indentation << "    " << it->first << " : " << *(it->second) << '\n';
-        }
-        param::s_indent_level--;
-        out << indentation << "}\n";
-        return out.str();
-    }
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_node& a_value)
-    {
-        return out << a_value.to_string();
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_node.hh b/Src/Scarab/library/param/param_node.hh
deleted file mode 100644
index de51ef0..0000000
--- a/Src/Scarab/library/param/param_node.hh
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
- * param_node.hh
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PARAM_NODE_HH_
-#define SCARAB_PARAM_NODE_HH_
-
-#include "param_value.hh"
-
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/type_traits/is_convertible.hpp>
-#include <boost/utility/enable_if.hpp>
-
-#include <map>
-
-namespace scarab
-{
-    class param_value;
-    class param_array;
-
-    // This special iterator class is used to allow the param_node iterator to point to a `param` object instead of a `std::unique_ptr<param>` object.
-    // In param_array we just used boost::indirect_iterator, but that doesn't work quite as simply for map-like objects.
-    // Note that unlike a normal map iterator, *iterator gives the `param` object, and iterator.name() gives the key.
-    template< class x_key, class x_value, class x_iiterator >
-    class map_deref_iterator : public boost::iterator_adaptor< map_deref_iterator< x_key, x_value, x_iiterator >, x_iiterator, x_value, boost::bidirectional_traversal_tag >
-    {
-        private:
-            // used for the conversion constructor below
-            struct enabler {};
-
-        public:
-            map_deref_iterator() :
-                    map_deref_iterator::iterator_adaptor_()
-            {}
-            map_deref_iterator( const x_iiterator& other ) :
-                    map_deref_iterator::iterator_adaptor_( other )
-            {}
-
-            // converts from iterator to const_iterator, but the enable_if business prevents converting from const_iterator to iterator
-            template< class x_other_value, class x_other_iiterator >
-            map_deref_iterator( const map_deref_iterator< x_key, x_other_value, x_other_iiterator > & other, typename boost::enable_if< boost::is_convertible< x_other_value, x_value >, enabler >::type = enabler() ) :
-                    map_deref_iterator::iterator_adaptor_( other.base )
-            {}
-
-            const x_key& name() const
-            {
-                return this->base()->first;
-            }
-
-        private:
-            friend class boost::iterator_core_access;
-
-            x_value& dereference() const
-            {
-                return *this->base()->second;
-            }
-
-    };
-
-    typedef std::map< std::string, std::unique_ptr< param > > param_node_contents;
-
-    typedef map_deref_iterator< std::string, param, param_node_contents::iterator > param_node_iterator;
-    typedef map_deref_iterator< std::string, const param, param_node_contents::const_iterator > param_node_const_iterator;
-
-
-    class SCARAB_API param_node : public param
-    {
-        public:
-            typedef param_node_contents contents;
-            typedef param_node_iterator iterator;
-            typedef param_node_const_iterator const_iterator;
-            typedef contents::value_type contents_type;
-
-            param_node();
-            param_node( const param_node& orig );
-            param_node( param_node&& orig );
-            virtual ~param_node();
-
-            param_node& operator=( const param_node& rhs );
-            param_node& operator=( param_node&& rhs );
-
-            virtual param_ptr_t clone() const;
-            virtual param_ptr_t move_clone();
-
-            virtual bool is_null() const;
-            virtual bool is_node() const;
-
-            virtual bool has_subset( const param& a_subset ) const;
-
-            unsigned size() const;
-            bool empty() const;
-
-            bool has( const std::string& a_name ) const;
-            unsigned count( const std::string& a_name ) const;
-
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            std::string get_value( const std::string& a_name, const std::string& a_default ) const;
-            std::string get_value( const std::string& a_name, const char* a_default ) const;
-            /// Returns the result of param_value::get if a_name is present and is of type param_value
-            /// Returns a_default if a_name is not present or is not of type param_value
-            template< typename XValType >
-            XValType get_value( const std::string& a_name, XValType a_default ) const;
-
-            /// Returns a reference to the param corresponding to a_name.
-            /// Throws an std::out_of_range if a_name is not present.
-            const param& operator[]( const std::string& a_name ) const;
-            /// Returns a reference to the param corresponding to a_name.
-            /// Throws an std::out_of_range if a_name is not present.
-            param& operator[]( const std::string& a_name );
-
-            /// Adds a copy of a_value
-            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
-            bool add( const std::string& a_name, const param& a_value );
-            /// Adds a_value with move semantics
-            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
-            bool add( const std::string& a_name, param&& a_value );
-            /// Adds a_value_ptr by directly adding the pointer
-            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
-            bool add( const std::string& a_name, param_ptr_t a_value_ptr );
-            /// Adds a_value as a param_value for any type that param_value accepts
-            /// Only adds and returns true if `a_name` is not already present, and returns false if it is.
-            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
-            bool add( const std::string& a_name, T a_value );
-
-            /// Creates a copy of a_value; overwrites if the key exits
-            void replace( const std::string& a_name, const param& a_value );
-            /// Adds a_value with move semantics; overwrites if the key exists
-            void replace( const std::string& a_name, param&& a_value );
-            /// Adds a_value_ptr by directly adding the pointer; overwrites if the key exists
-            void replace( const std::string& a_name, param_ptr_t a_value_ptr );
-            /// Adds a_value as a param_valuefor any type that param_value accepts
-            template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* = nullptr >
-            void replace( const std::string& a_name, T a_value );
-
-            /// Merges the contents of a_object into this object.
-            /// If names in the contents of a_object exist in this object,
-            /// the values in this object corresponding to the matching names will be replaced.
-            void merge( const param_node& a_object );
-
-            void erase( const std::string& a_name );
-            param_ptr_t remove( const std::string& a_name );
-            void clear();
-
-            iterator begin();
-            const_iterator begin() const;
-
-            iterator end();
-            const_iterator end() const;
-
-            virtual std::string to_string() const;
-
-        protected:
-            contents f_contents;
-
-    };
-
-
-    template< typename XValType >
-    inline XValType param_node::get_value( const std::string& a_name, XValType a_default ) const
-    {
-        return has( a_name ) ? operator[]( a_name ).as_value().as< XValType >() : a_default;
-    }
-
-    inline param_ptr_t param_node::clone() const
-    {
-        //std::cout << "param_node::clone" << std::endl;
-        return std::unique_ptr< param_node >( new param_node( *this ) );
-    }
-
-    inline param_ptr_t param_node::move_clone()
-    {
-        return std::unique_ptr< param_node >( new param_node( std::move(*this) ) );
-    }
-
-    inline bool param_node::is_null() const
-    {
-        return false;
-    }
-
-    inline bool param_node::is_node() const
-    {
-        return true;
-    }
-
-    inline unsigned param_node::size() const
-    {
-        return f_contents.size();
-    }
-    inline bool param_node::empty() const
-    {
-        return f_contents.empty();
-    }
-
-    inline bool param_node::has( const std::string& a_name ) const
-    {
-        return f_contents.count( a_name ) > 0;
-    }
-
-    inline unsigned param_node::count( const std::string& a_name ) const
-    {
-        return f_contents.count( a_name );
-    }
-
-    inline std::string param_node::get_value( const std::string& a_name, const std::string& a_default ) const
-    {
-        return has( a_name ) ? operator[]( a_name ).to_string() : a_default;
-    }
-
-    inline std::string param_node::get_value( const std::string& a_name, const char* a_default ) const
-    {
-        return get_value( a_name, std::string( a_default ) );
-    }
-
-    inline const param& param_node::operator[]( const std::string& a_name ) const
-    {
-        return *f_contents.at( a_name );
-    }
-
-    inline param& param_node::operator[]( const std::string& a_name )
-    {
-        return *f_contents.at( a_name );
-    }
-
-    inline bool param_node::add( const std::string& a_name, const param& a_value )
-    {
-        contents::iterator it = f_contents.find( a_name );
-        if( it == f_contents.end() )
-        {
-            f_contents.insert( contents_type( a_name, a_value.clone() ) );
-            return true;
-        }
-        return false;
-    }
-
-    inline bool param_node::add( const std::string& a_name, param&& a_value )
-    {
-        contents::iterator it = f_contents.find( a_name );
-        if( it == f_contents.end() )
-        {
-            f_contents.insert( contents_type( a_name, a_value.move_clone() ) );
-            return true;
-        }
-        return false;
-    }
-
-    inline bool param_node::add( const std::string& a_name, param_ptr_t a_value_ptr )
-    {
-        contents::iterator it = f_contents.find( a_name );
-        if( it == f_contents.end() )
-        {
-            f_contents.insert( contents_type( a_name, std::move(a_value_ptr) ) );
-            return true;
-        }
-        return false;
-    }
-
-    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
-    inline bool param_node::add( const std::string& a_name, T a_value )
-    {
-        //static_assert(std::is_convertible< T, param_value >::value, "Cannot convert type to param_value" );
-        contents::iterator it = f_contents.find( a_name );
-        if( it == f_contents.end() )
-        {
-            f_contents.insert( contents_type( a_name, param_ptr_t( new param_value( a_value ) ) ) );
-            return true;
-        }
-        return false;
-    }
-
-    inline void param_node::replace( const std::string& a_name, const param& a_value )
-    {
-        f_contents[ a_name ] = a_value.clone();
-        return;
-    }
-
-    inline void param_node::replace( const std::string& a_name, param&& a_value )
-    {
-        f_contents[ a_name ] = a_value.move_clone();
-        return;
-    }
-
-    inline void param_node::replace( const std::string& a_name, param_ptr_t a_value_ptr )
-    {
-        f_contents[ a_name ] = std::move(a_value_ptr);
-        return;
-    }
-
-    template< typename T, typename std::enable_if< std::is_convertible< T, param_value >::value, T >::type* >
-    inline void param_node::replace( const std::string& a_name, T a_value )
-    {
-        f_contents[ a_name ] = param_ptr_t( new param_value( a_value ) );
-        return;
-    }
-
-
-    inline void param_node::erase( const std::string& a_name )
-    {
-        contents::iterator it = f_contents.find( a_name );
-        if( it != f_contents.end() )
-        {
-            f_contents.erase( it );
-        }
-        return;
-    }
-
-    inline param_ptr_t param_node::remove( const std::string& a_name )
-    {
-        contents::iterator it = f_contents.find( a_name );
-        if( it != f_contents.end() )
-        {
-            param_ptr_t removed( std::move( it->second ) );
-            f_contents.erase( it );
-            return removed;
-        }
-        return param_ptr_t();
-    }
-
-    inline void param_node::clear()
-    {
-        f_contents.clear();
-        return;
-    }
-
-    inline param_node::iterator param_node::begin()
-    {
-        return iterator( f_contents.begin() );
-    }
-
-    inline param_node::const_iterator param_node::begin() const
-    {
-        return const_iterator( f_contents.cbegin() );
-    }
-
-    inline param_node::iterator param_node::end()
-    {
-        return iterator( f_contents.end() );
-    }
-
-    inline param_node::const_iterator param_node::end() const
-    {
-        return const_iterator( f_contents.cend() );
-    }
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_node& value);
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_NODE_HH_ */
diff --git a/Src/Scarab/library/param/param_value.cc b/Src/Scarab/library/param/param_value.cc
deleted file mode 100644
index 4d02be1..0000000
--- a/Src/Scarab/library/param/param_value.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * param_value.cc
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include <sstream>
-using std::string;
-using std::stringstream;
-
-#include "param_value.hh"
-
-#include "param_base_impl.hh"
-
-//#include "logger.hh"
-//LOGGER( dlog, "param_value" )
-
-namespace scarab
-{
-
-    param_value::param_value() :
-            param(),
-            f_value( false )
-    {
-        //LWARN( dlog, "param_value constructor: default (bool)" );
-    }
-
-    param_value::param_value( bool a_value ) :
-            param(),
-            f_value( a_value )
-    {
-        f_value = a_value;
-        //LWARN( dlog, "param_value constructor: bool --> bool" );
-    }
-
-    param_value::param_value( uint8_t a_value ) :
-            param(),
-            f_value( uint64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: uint8 --> uint" );
-    }
-
-    param_value::param_value( uint16_t a_value ) :
-            param(),
-            f_value( uint64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: uint16 --> uint" );
-    }
-
-    param_value::param_value( uint32_t a_value ) :
-            param(),
-            f_value( uint64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: uint32 --> uint" );
-    }
-
-    param_value::param_value( uint64_t a_value ) :
-            param(),
-            f_value( uint64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: uint64 --> uint" );
-    }
-
-    param_value::param_value( int8_t a_value ) :
-            param(),
-            f_value( int64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: int8 --> int" );
-    }
-
-    param_value::param_value( int16_t a_value ) :
-            param(),
-            f_value( int64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: int16 --> int" );
-    }
-
-
-    param_value::param_value( int32_t a_value ) :
-            param(),
-            f_value( int64_t(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: int32 --> int" );
-    }
-
-    param_value::param_value( int64_t a_value ) :
-            param(),
-            f_value( a_value )
-    {
-        //LWARN( dlog, "param_value constructor: int64 --> int" );
-    }
-
-    param_value::param_value( float a_value ) :
-            param(),
-            f_value( double(a_value) )
-    {
-        //LWARN( dlog, "param_value constructor: float --> double" );
-    }
-
-    param_value::param_value( double a_value ) :
-            param(),
-            f_value( a_value )
-    {
-        //LWARN( dlog, "param_value constructor: double --> double" );
-    }
-
-    param_value::param_value( const char* a_value ) :
-            param(),
-            f_value( string() )
-    {
-        //LWARN( dlog, "param_value constructor: char* --> k_string" );
-        string t_value( a_value );
-        if( t_value.size() > 1 && t_value.front() == '\'' && t_value.back() == '\'' )
-        {
-            f_value = t_value.substr( 1, t_value.size() - 2 );
-        }
-        else
-        {
-            f_value = t_value;
-        }
-    }
-
-    param_value::param_value( const string& a_value ) :
-            param(),
-            f_value( a_value )
-    {
-        //LWARN( dlog, "param_value constructor: string --> k_string" );
-        if( a_value.size() > 1 && a_value.front() == '\'' && a_value.back() == '\'' )
-        {
-            f_value = a_value.substr( 1, a_value.size() - 2 );
-        }
-        else
-        {
-            f_value = a_value;
-        }
-    }
-
-    param_value::param_value( const param_value& orig ) :
-            param( orig ),
-            f_value( orig.f_value )
-    {
-        //LWARN( dlog, "param_value copy constructor: " << type() );
-    }
-
-    param_value::param_value( param_value&& orig ) :
-            param( std::move( orig ) ),
-            f_value( std::move( orig.f_value ) )
-    {
-    }
-
-    param_value::~param_value()
-    {
-    }
-
-    param_value& param_value::operator=( const param_value& rhs )
-    {
-        if( &rhs == this ) return *this;
-
-        f_value = rhs.f_value;
-
-        return *this;
-    }
-
-    param_value& param_value::operator=( param_value&& rhs )
-    {
-        if( &rhs == this ) return *this;
-
-        f_value = std::move( rhs.f_value );
-
-        return *this;
-    }
-
-    bool param_value::has_subset( const param& a_subset ) const
-    {
-        if( ! a_subset.is_value() ) return false;
-        return true;
-    }
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_value& a_value)
-    {
-        return out << a_value.as_string();
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/param/param_value.hh b/Src/Scarab/library/param/param_value.hh
deleted file mode 100644
index ebb60d5..0000000
--- a/Src/Scarab/library/param/param_value.hh
+++ /dev/null
@@ -1,566 +0,0 @@
-/*
- * param_value.hh
- *
- *  Created on: Jan 14, 2014
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PARAM_VALUE_HH_
-#define SCARAB_PARAM_VALUE_HH_
-
-#include "param_base.hh"
-
-#include "path.hh"
-
-#include <boost/variant.hpp>
-
-#include <stdint.h>
-
-//#include "logger.hh"
-//LOGGER(pv_h, "param_value.hh")
-
-namespace scarab
-{
-    class param_array;
-    class param_node;
-
-    class SCARAB_API param_value : public param
-    {
-        public:
-            param_value();
-            param_value( bool a_value );
-            param_value( uint8_t a_value );
-            param_value( uint16_t a_value );
-            param_value( uint32_t a_value );
-            param_value( uint64_t a_value );
-            param_value( int8_t a_value );
-            param_value( int16_t a_value );
-            param_value( int32_t a_value );
-            param_value( int64_t a_value );
-            param_value( float a_value );
-            param_value( double a_value );
-            /// String constructor; if a_value is wrapped in single quotes, they will be stripped
-            param_value( const std::string& a_value );
-            /// C-string constructor; if a_value is wrapped in single quotes, they will be stripped
-            param_value( const char* a_value );
-            param_value( const param_value& orig );
-            param_value( param_value&& orig );
-            virtual ~param_value();
-
-            param_value& operator=( const param_value& rhs );
-            param_value& operator=( param_value&& rhs );
-
-            virtual param_ptr_t clone() const;
-            virtual param_ptr_t move_clone();
-
-            /// Strict equality
-            bool operator==( const param_value& rhs ) const;
-            bool strict_is_equal_to( const param_value& rhs ) const;
-            bool loose_is_equal_to( const param_value& rhs ) const;
-
-            bool empty() const;
-
-            virtual bool is_null() const;
-            virtual bool is_value() const;
-
-            virtual bool has_subset( const param& a_subset ) const;
-
-            std::string type() const;
-            bool is_bool() const;
-            bool is_uint() const;
-            bool is_int() const;
-            bool is_double() const;
-            bool is_string() const;
-
-            bool as_bool() const;
-            uint64_t as_uint() const;
-            int64_t as_int() const;
-            double as_double() const;
-            std::string as_string() const;
-            path as_path() const;
-
-            template< typename XValType >
-            XValType as() const;
-
-            template< typename XValType, typename std::enable_if< std::is_convertible< XValType, param_value >::value, XValType >::type* = nullptr >
-            void set( XValType a_value );
-
-            //template< typename XStreamableType >
-            //param_value& operator<<( const XStreamableType& a_streamable );
-
-            virtual std::string to_string() const;
-
-            void clear();
-
-        private:
-            boost::variant< bool, uint64_t, int64_t, double, std::string > f_value;
-
-            //*********************
-            // Visitor Classes
-            //*********************
-
-            class are_strict_equals : public boost::static_visitor< bool >
-            {
-                public:
-                    template < typename T, typename U >
-                    bool operator()( const T &, const U & ) const
-                    {
-                        return false; // cannot compare different types
-                    }
-
-                    template < typename T >
-                    bool operator()( const T & lhs, const T & rhs ) const
-                    {
-                        return lhs == rhs;
-                    }
-            };
-
-            class are_loose_equals : public boost::static_visitor< bool >
-            {
-                public:
-                    template < typename T, typename U >
-                    bool operator()( const T & rhs, const U & lhs ) const
-                    {
-                        as_string_visitor t_as_string;
-                        return t_as_string(lhs) == t_as_string(rhs); // cannot compare different types
-                    }
-
-                    template < typename T >
-                    bool operator()( const T & lhs, const T & rhs ) const
-                    {
-                        return lhs == rhs;
-                    }
-            };
-
-
-            class type_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef std::string result_type;
-                    std::string operator()( bool ) const
-                    {
-                        return "bool";
-                    }
-                    std::string operator()( uint64_t ) const
-                    {
-                        return "uint";
-                    }
-                    std::string operator()( int64_t ) const
-                    {
-                        return "int";
-                    }
-                    std::string operator()( double ) const
-                    {
-                        return "double";
-                    }
-                    std::string operator()( const std::string& ) const
-                    {
-                        return "string";
-                    }
-            };
-
-            template< typename XValType >
-            class get_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef XValType result_type;
-                    XValType operator()( bool a_value ) const
-                    {
-                        return static_cast< XValType >( a_value );
-                    }
-                    XValType operator()( uint64_t a_value ) const
-                    {
-                        return static_cast< XValType >( a_value );
-                    }
-                    XValType operator()( int64_t a_value ) const
-                    {
-                        return static_cast< XValType >( a_value );
-                    }
-                    XValType operator()( double a_value ) const
-                    {
-                        return static_cast< XValType >( a_value );
-                    }
-                    XValType operator()( const std::string& a_value ) const
-                    {
-                        std::stringstream t_conv;
-                        t_conv << a_value;
-                        XValType t_return;
-                        t_conv >> t_return;
-                        return t_return;
-                    }
-            };
-
-            class is_bool_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef bool result_type;
-                    bool operator()( bool ) const
-                    {
-                        return true;
-                    }
-                    template< typename T >
-                    bool operator()( T ) const
-                    {
-                        return false;
-                    }
-            };
-
-            class is_int_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef bool result_type;
-                    bool operator()( int64_t ) const
-                    {
-                        return true;
-                    }
-                    template< typename T >
-                    bool operator()( T ) const
-                    {
-                        return false;
-                    }
-            };
-
-            class is_uint_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef bool result_type;
-                    bool operator()( uint64_t ) const
-                    {
-                        return true;
-                    }
-                    template< typename T >
-                    bool operator()( T ) const
-                    {
-                        return false;
-                    }
-            };
-
-            class is_double_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef bool result_type;
-                    bool operator()( double ) const
-                    {
-                        return true;
-                    }
-                    template< typename T >
-                    bool operator()( T ) const
-                    {
-                        return false;
-                    }
-            };
-
-            class is_string_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef bool result_type;
-                    bool operator()( const std::string& ) const
-                    {
-                        return true;
-                    }
-                    template< typename T >
-                    bool operator()( T ) const
-                    {
-                        return false;
-                    }
-            };
-
-            class as_bool_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef bool result_type;
-                    bool operator()( bool a_value ) const
-                    {
-                        return a_value;
-                    }
-                    bool operator()( const std::string& a_value ) const
-                    {
-                        if( a_value.empty() ) return false;
-
-                        std::string t_str_val;
-                        bool t_is_numeric = true;
-                        for( std::string::const_iterator t_val_it = a_value.begin(); t_val_it != a_value.end(); ++t_val_it )
-                        {
-                            t_is_numeric = t_is_numeric && ::isdigit( *t_val_it );
-                            t_str_val.push_back( ::tolower( *t_val_it ) );
-                        }
-
-                        if( t_is_numeric ) return std::stoi( t_str_val );
-
-                        std::istringstream t_iss_val( t_str_val );
-                        bool t_bool_val;
-                        t_iss_val >> std::boolalpha >> t_bool_val;
-                        return t_bool_val;
-                    }
-                    template< typename T >
-                    bool operator()( T a_value ) const
-                    {
-                        return a_value != 0;
-                    }
-            };
-
-            class as_uint_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef uint64_t result_type;
-                    uint64_t operator()( const std::string& a_value ) const
-                    {
-                        return std::stoull( a_value );
-                    }
-                    template< typename T >
-                    uint64_t operator()( T a_value ) const
-                    {
-                        return (uint64_t)a_value;
-                    }
-            };
-
-            class as_int_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef int64_t result_type;
-                    int64_t operator()( const std::string& a_value ) const
-                    {
-                        return std::stoll( a_value );
-                    }
-                    template< typename T >
-                    int64_t operator()( T a_value ) const
-                    {
-                        return (int64_t)a_value;
-                    }
-            };
-
-            class as_double_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef double result_type;
-                    double operator()( const std::string& a_value ) const
-                    {
-                        return std::stod( a_value );
-                    }
-                    template< typename T >
-                    double operator()( T a_value ) const
-                    {
-                        return (double)a_value;
-                    }
-            };
-
-            class as_string_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef std::string result_type;
-                    std::string operator()( bool a_value ) const
-                    {
-                        return a_value ? "true" : "false";
-                    }
-                    std::string operator()( const std::string& a_value ) const
-                    {
-                        return a_value;
-                    }
-                    template< typename T >
-                    std::string operator()( T a_value ) const
-                    {
-                        return std::to_string( a_value );
-                    }
-            };
-
-            class as_path_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef scarab::path result_type;
-                    scarab::path operator()( const std::string& a_value ) const
-                    {
-                        return scarab::path( a_value );
-                    }
-                    template< typename T >
-                    scarab::path operator()( T ) const
-                    {
-                        return scarab::path();
-                    }
-            };
-
-            class clear_visitor : public boost::static_visitor<>
-            {
-                public:
-                    typedef void result_type;
-                    void operator()( bool& a_value ) const
-                    {
-                        a_value = false;
-                    }
-                    void operator()( std::string& a_value ) const
-                    {
-                        a_value.clear();
-                    }
-                    template< typename T >
-                    void operator()( T& a_value ) const
-                    {
-                        a_value = 0;
-                    }
-            };
-
-
-    };
-
-    SCARAB_API std::ostream& operator<<(std::ostream& out, const param_value& value);
-
-    template<>
-    inline bool param_value::as< bool >() const
-    {
-        return as_bool();
-    }
-
-    template<>
-    inline uint64_t param_value::as< uint64_t >() const
-    {
-        return as_uint();
-    }
-
-    template<>
-    inline int64_t param_value::as< int64_t >() const
-    {
-        return as_int();
-    }
-
-    template<>
-    inline double param_value::as< double >() const
-    {
-        return as_double();
-    }
-
-    template<>
-    inline std::string param_value::as< std::string >() const
-    {
-        return as_string();
-    }
-
-    template<>
-    inline scarab::path param_value::as< scarab::path >() const
-    {
-        return as_path();
-    }
-
-    template< typename XValType >
-    XValType param_value::as() const
-    {
-        return boost::apply_visitor( get_visitor< XValType >(), f_value );
-    }
-
-
-    inline param_ptr_t param_value::clone() const
-    {
-        //std::cout << "param_value::clone" << std::endl;
-        return param_ptr_t( new param_value( *this ) );
-    }
-
-    inline param_ptr_t param_value::move_clone()
-    {
-        return param_ptr_t( new param_value( std::move(*this) ) );
-    }
-
-    inline bool param_value::operator==( const param_value& rhs ) const
-    {
-        return boost::apply_visitor( are_strict_equals(), f_value, rhs.f_value );
-    }
-
-    inline bool param_value::strict_is_equal_to( const param_value& rhs ) const
-    {
-        return boost::apply_visitor( are_strict_equals(), f_value, rhs.f_value );
-    }
-
-    inline bool param_value::loose_is_equal_to( const param_value& rhs ) const
-    {
-        return boost::apply_visitor( are_loose_equals(), f_value, rhs.f_value );
-    }
-
-    inline std::string param_value::type() const
-    {
-        return boost::apply_visitor( type_visitor(), f_value );
-    }
-
-    inline bool param_value::is_null() const
-    {
-        return false;
-    }
-
-    inline bool param_value::is_value() const
-    {
-        return true;
-    }
-
-    inline bool param_value::is_bool() const
-    {
-        return boost::apply_visitor( is_bool_visitor(), f_value );
-    }
-
-    inline bool param_value::is_uint() const
-    {
-        return boost::apply_visitor( is_uint_visitor(), f_value );
-    }
-
-    inline bool param_value::is_int() const
-    {
-        return boost::apply_visitor( is_int_visitor(), f_value );
-    }
-
-    inline bool param_value::is_double() const
-    {
-        return boost::apply_visitor( is_double_visitor(), f_value );
-    }
-
-    inline bool param_value::is_string() const
-    {
-        return boost::apply_visitor( is_string_visitor(), f_value );
-    }
-
-    inline bool param_value::as_bool() const
-    {
-        return boost::apply_visitor( as_bool_visitor(), f_value );
-    }
-
-    inline uint64_t param_value::as_uint() const
-    {
-        return boost::apply_visitor( as_uint_visitor(), f_value );
-    }
-
-    inline int64_t param_value::as_int() const
-    {
-        return boost::apply_visitor( as_int_visitor(), f_value );
-    }
-
-    inline double param_value::as_double() const
-    {
-        return boost::apply_visitor( as_double_visitor(), f_value );
-    }
-
-    inline std::string param_value::as_string() const
-    {
-        return boost::apply_visitor( as_string_visitor(), f_value );
-    }
-
-    inline path param_value::as_path() const
-    {
-        return boost::apply_visitor( as_path_visitor(), f_value );
-    }
-
-    template< typename XValType, typename std::enable_if< std::is_convertible< XValType, param_value >::value, XValType >::type* >
-    void param_value::set( XValType a_value )
-    {
-        // as of v2.11.2, this was changed from f_value = a_value to *this = param_value( a_value )
-        // this is to take advantage of the stripping of single quotes around strings that's done in the string constructors
-        *this = param_value( a_value );
-        return;
-    }
-
-    inline std::string param_value::to_string() const
-    {
-        return as_string();
-    }
-
-    inline void param_value::clear()
-    {
-        boost::apply_visitor( clear_visitor(), f_value );
-        return;
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_PARAM_VALUE_HH_ */
diff --git a/Src/Scarab/library/utility/CMakeLists.txt b/Src/Scarab/library/utility/CMakeLists.txt
deleted file mode 100644
index 9dd6f34..0000000
--- a/Src/Scarab/library/utility/CMakeLists.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-# CMakeLists.txt for Scarab/library/utility
-# Author: N. Oblath
-# Created: Jan 1, 2016
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/base_exception.hh
-    ${dir}/cancelable.hh
-    ${dir}/concurrent_queue.hh
-    ${dir}/destroyer.hh
-    ${dir}/digital.hh
-    ${dir}/error.hh
-    ${dir}/exponential_backoff.hh
-    ${dir}/factory.hh
-    ${dir}/indexed_factory.hh
-    ${dir}/macros.hh
-    ${dir}/map_at_default.hh
-    ${dir}/member_variables.hh
-    ${dir}/path.hh
-    ${dir}/scarab_api.hh
-    ${dir}/signal_handler.hh
-    ${dir}/singleton.hh
-    ${dir}/thread_singleton.hh
-    ${dir}/time.hh
-    ${dir}/typename.hh
-    ${dir}/unique_typelist.hh
-) # not PARENT_SCOPE so that we can set it to that scope in the set command below
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/cancelable.cc
-    ${dir}/digital.cc
-    ${dir}/path.cc
-    ${dir}/signal_handler.cc
-    ${dir}/time.cc
-    ${dir}/typename.cc
-    PARENT_SCOPE 
-)
-
-set( macro_prefix camel_case_)
-set( set_prefix Set )
-set( get_prefix Get )
-set( var_prefix f )
-set( static_prefix s )
-configure_file( _member_variables.hh.in _camel_case_member_variables.hh @ONLY )    
-        
-set( macro_prefix snake_case_)
-set( set_prefix set_ )
-set( get_prefix get_ )
-set( var_prefix f_ )
-set( static_prefix s_ )
-configure_file( _member_variables.hh.in _snake_case_member_variables.hh @ONLY )
-
-set( Scarab_HEADERS
-    ${Scarab_HEADERS}
-    ${CMAKE_CURRENT_BINARY_DIR}/_camel_case_member_variables.hh
-    ${CMAKE_CURRENT_BINARY_DIR}/_snake_case_member_variables.hh
-    PARENT_SCOPE )    
diff --git a/Src/Scarab/library/utility/_member_variables.hh.in b/Src/Scarab/library/utility/_member_variables.hh.in
deleted file mode 100644
index d8f28e2..0000000
--- a/Src/Scarab/library/utility/_member_variables.hh.in
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * _member_variables.hh.in
- *
- *  Created on: Jan 6, 2016
- *      Author: N.S. Oblath
- */
-
-#ifndef @macro_prefix@SCARAB_UTILITY_MEMBER_VARIABLES_HH_
-#define @macro_prefix@SCARAB_UTILITY_MEMBER_VARIABLES_HH_
-
-#include "macros.hh"
-
-/**
- * Templates for macros for class member variables
- *
- * Types of variables:
- * - "normal"
- * - referrable (i.e. accessed by reference)
- * - pointers
- * - std::shared_ptr
- * - std::atomic
- *
- * Variations:
- * - no set (non-const) accessor
- * - static
- * - mutable
- *
- * Accessors for normal variables, pointers, and atomics are of the form [set_prefix][variable name] and [get_prefix][variable_name].
- * Accessors for referrable variables and shared_ptr's are of the form [variable name], both const and non-const
- *
- * To use this template file, the client package needs to define prefixes for 
- * set and get functions, and for normal and non-static and static variables.
- * This definition is done in the CMake stage of the build.  As an example, 
- * see library/utility/CMakeLists.txt where both the camel-case and snake-case 
- * headers are created.
- * 
- * If you want to use either the snake-case or camel-case header, but with different 
- * macros, you can create a new header that includes the appropriate member-variable header 
- * and then aliases the macros.  As an example, see library/utility/member_variables.hh.
- * 
- * Steps for creating a header file with different prefixes and aliased macros:
- *
- * 1. Create the include file that will be used (see e.g. member_variables.hh)
- * 2. Add include guards
- * 3. Include either _camel_case_member_variables.hh or _snake_case_member_variables.hh
- * 4. Alias the camel_case_mv_ or snake_case_mv_ macros if desired
- *
- * CMake variables that must be defined to use this file:
- * - macro_prefix: the prefix for the macro names (e.g. snake_case_)
- * - set_prefix: the prefix for set accessor functions (e.g. set_)
- * - get_prefix: the prefix for get accessor functions (e.g. get_)
- * - var_prefix: the prefix for variables (e.g. f_)
- * - static_prefix: the prefix for static variables (e.g. s_)
- *
- */
-
-#define @macro_prefix@get_fcn( x_variable ) PASTE( @get_prefix@, x_variable )
-#define @macro_prefix@set_fcn( x_variable ) PASTE( @set_prefix@, x_variable )
-#define @macro_prefix@var_name( x_variable ) PASTE( @var_prefix@, x_variable )
-#define @macro_prefix@static_var_name( x_variable ) PASTE( @static_prefix@, x_variable )
-
-//**********
-// normal
-//**********
-
-#define @macro_prefix@mv_accessible_noset( x_type, x_variable )\
-    protected:\
-        x_type @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type @macro_prefix@get_fcn( x_variable )() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_accessible( x_type, x_variable )\
-    @macro_prefix@mv_accessible_noset( x_type, x_variable )\
-    public:\
-        void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
-        {\
-            @macro_prefix@var_name( x_variable ) = p_variable;\
-            return;\
-        }
-
-#define @macro_prefix@mv_accessible_static_noset( x_type, x_variable )\
-    protected:\
-        static x_type @macro_prefix@static_var_name( x_variable );\
-    public:\
-        static x_type @macro_prefix@get_fcn( x_variable )()\
-        {\
-            return @macro_prefix@static_var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_accessible_static( x_type, x_variable )\
-    @macro_prefix@mv_accessible_static_noset( x_type, x_variable )\
-    public:\
-        static void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
-        {\
-            @macro_prefix@static_var_name( x_variable ) = p_variable;\
-            return;\
-        }
-
-#define @macro_prefix@mv_accessible_mutable_noset( x_type, x_variable )\
-    protected:\
-        mutable x_type @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type @macro_prefix@get_fcn( x_variable )() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_accessible_mutable( x_type, x_variable )\
-    @macro_prefix@mv_accessible_mutable_noset( x_type, x_variable )\
-    public:\
-        void @macro_prefix@set_fcn( x_variable )( x_type p_variable ) const\
-        {\
-            @macro_prefix@var_name( x_variable ) = p_variable;\
-            return;\
-        }
-
-
-//**************
-// referrable
-//**************
-
-#define @macro_prefix@mv_referrable_const( x_type, x_variable )\
-    protected:\
-        x_type @macro_prefix@var_name( x_variable );\
-    public:\
-        const x_type& x_variable() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_referrable( x_type, x_variable )\
-    @macro_prefix@mv_referrable_const( x_type, x_variable )\
-    public:\
-        x_type& x_variable()\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_referrable_static( x_type, x_variable )\
-    protected:\
-        static x_type @macro_prefix@static_var_name( x_variable );\
-    public:\
-        static x_type& x_variable()\
-        {\
-            return @macro_prefix@static_var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_referrable_mutable_const( x_type, x_variable )\
-    protected:\
-        mutable x_type @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type& x_variable() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_referrable_mutable( x_type, x_variable )\
-    @macro_prefix@mv_referrable_mutable_const( x_type, x_variable )\
-    public:\
-        x_type& x_variable()\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-
-//***********
-// pointer
-//***********
-
-#define @macro_prefix@mv_assignable_noset( x_type, x_variable )\
-    protected:\
-        x_type* @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type* @macro_prefix@get_fcn( x_variable )() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_assignable( x_type, x_variable )\
-    @macro_prefix@mv_assignable_noset( x_type, x_variable )\
-    public:\
-        void @macro_prefix@set_fcn( x_variable )( x_type* p_variable )\
-        {\
-            delete @macro_prefix@var_name( x_variable );\
-            @macro_prefix@var_name( x_variable ) = p_variable;\
-            return;\
-        }
-
-#define @macro_prefix@mv_assignable_static_noset( x_type, x_variable )\
-    protected:\
-        static x_type* @macro_prefix@static_var_name( x_variable );\
-    public:\
-        static x_type* @macro_prefix@get_fcn( x_variable )()\
-        {\
-            return @macro_prefix@static_var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_assignable_static( x_type, x_variable )\
-    @macro_prefix@mv_assignable_static_noset( x_type, x_variable )\
-    public:\
-        static void @macro_prefix@set_fcn( x_variable )( x_type* p_variable )\
-        {\
-            delete @macro_prefix@static_var_name( x_variable );\
-            @macro_prefix@static_var_name( x_variable ) = p_variable;\
-            return;\
-        }
-
-#define @macro_prefix@mv_assignable_mutable_noset( x_type, x_variable )\
-    protected:\
-        mutable x_type* @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type* @macro_prefix@get_fcn( x_variable )() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_assignable_mutable( x_type, x_variable )\
-    @macro_prefix@mv_assignable_mutable_noset( x_type, x_variable )\
-    public:\
-        void @macro_prefix@set_fcn( x_variable )( x_type* p_variable ) const\
-        {\
-            delete @macro_prefix@var_name( x_variable );\
-            @macro_prefix@var_name( x_variable ) = p_variable;\
-            return;\
-        }
-
-
-//**************
-// shared_ptr
-//**************
-
-#define @macro_prefix@mv_shared_ptr_const( x_type, x_variable )\
-    protected:\
-        std::shared_ptr< x_type > @macro_prefix@var_name( x_variable );\
-    public:\
-        const std::shared_ptr< x_type > x_variable() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_shared_ptr( x_type, x_variable )\
-    @macro_prefix@mv_shared_ptr_const( x_type, x_variable )\
-    public:\
-        std::shared_ptr< x_type > x_variable()\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_shared_ptr_static( x_type, x_variable )\
-    protected:\
-        static std::shared_ptr< x_type > @macro_prefix@static_var_name( x_variable );\
-    public:\
-        static std::shared_ptr< x_type >  x_variable()\
-        {\
-            return @macro_prefix@static_var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_shared_ptr_mutable_const( x_type, x_variable )\
-    protected:\
-        mutable std::shared_ptr< x_type > @macro_prefix@var_name( x_variable );\
-    public:\
-        std::shared_ptr< x_type > x_variable() const\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-#define @macro_prefix@mv_shared_ptr_mutable( x_type, x_variable )\
-    @macro_prefix@mv_shared_ptr_mutable_const( x_type, x_variable )\
-    public:\
-        std::shared_ptr< x_type > x_variable()\
-        {\
-            return @macro_prefix@var_name( x_variable );\
-        }
-
-
-//**********
-// atomic
-//**********
-
-#define @macro_prefix@mv_atomic_noset( x_type, x_variable )\
-    protected:\
-        std::atomic< x_type > @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type @macro_prefix@get_fcn( x_variable )() const\
-        {\
-            return @macro_prefix@var_name( x_variable ).load();\
-        }
-
-#define @macro_prefix@mv_atomic( x_type, x_variable )\
-    @macro_prefix@mv_atomic_noset( x_type, x_variable )\
-    public:\
-        void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
-        {\
-            @macro_prefix@var_name( x_variable ).store( p_variable );\
-            return;\
-        }
-
-#define @macro_prefix@mv_atomic_static_noset( x_type, x_variable )\
-    protected:\
-        static std::atomic< x_type > @macro_prefix@static_var_name( x_variable );\
-    public:\
-        static x_type @macro_prefix@get_fcn( x_variable )()\
-        {\
-            return @macro_prefix@static_var_name( x_variable ).load();\
-        }
-
-#define @macro_prefix@mv_atomic_static( x_type, x_variable )\
-    @macro_prefix@mv_atomic_static_noset( x_type, x_variable )\
-    public:\
-        static void @macro_prefix@set_fcn( x_variable )( x_type p_variable )\
-        {\
-            @macro_prefix@static_var_name( x_variable ).store( p_variable );\
-            return;\
-        }
-
-#define @macro_prefix@mv_atomic_mutable_noset( x_type, x_variable )\
-    protected:\
-        mutable std::atomic< x_type > @macro_prefix@var_name( x_variable );\
-    public:\
-        x_type @macro_prefix@get_fcn( x_variable )() const\
-        {\
-            return @macro_prefix@var_name( x_variable ).load();\
-        }
-
-#define @macro_prefix@mv_atomic_mutable( x_type, x_variable )\
-    @macro_prefix@mv_atomic_mutable_noset( x_type, x_variable )\
-    public:\
-        void @macro_prefix@set_fcn( x_variable )( x_type p_variable ) const\
-        {\
-            @macro_prefix@var_name( x_variable ).store( p_variable );\
-            return;\
-        }
-
-#endif /* @macro_prefix@SCARAB_UTILITY_MEMBER_VARIABLES_HH_ */
diff --git a/Src/Scarab/library/utility/base_exception.hh b/Src/Scarab/library/utility/base_exception.hh
deleted file mode 100644
index 18bb9be..0000000
--- a/Src/Scarab/library/utility/base_exception.hh
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * base_exception.hh
- *
- *  Created on: Mar 17, 2020
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_BASE_EXCEPTION_HH_
-#define SCARAB_BASE_EXCEPTION_HH_
-
-#include "path.hh"
-#include "scarab_api.hh"
-
-#include <exception>
-#include <sstream>
-
-
-namespace scarab
-{
-    /*!
-     @class base_exception
-     @author N.S. Oblath
-     @brief Base class for exceptions with what() and where() functions
-    */
-    class SCARAB_API base_exception : public ::std::exception
-    {
-        public:
-            base_exception() noexcept = default;
-            virtual ~base_exception() noexcept = default;
-
-            // what() inherited from std::exception
-
-            virtual const char* where() const noexcept = 0;
-    };
-
-    /*!
-     @class typed_exception
-     @author N.S. Oblath
-     @brief Base class for exceptions with streaming operators and filename/line number location
-
-     @details
-     This class provides streaming operators for building up the `what()` message.
-     It's meant to be the base class for any exceptions wanting to use that feature.
-
-     The `where()` message can be filled with the filename and line number using 
-     a constructor or operator().
-
-     This class uses the Curiously Recurring Template Pattern (CRTP) to get the 
-     derived class type to appear in the base class.
-     In particular, we need to return x_derived& from the various operator<<() 
-     so that those functions can be used in a throw statement and the user can 
-     still catch the derived type.
-    */
-   template< typename x_derived >
-    class SCARAB_API typed_exception : public base_exception
-    {
-        public:
-            typed_exception() noexcept;
-            typed_exception( const std::string& a_filename, int a_line ) noexcept;
-            typed_exception( const typed_exception< x_derived >& a_orig ) noexcept;
-            virtual ~typed_exception() noexcept;
-
-            typed_exception< x_derived >& operator=( const typed_exception< x_derived >& a_orig );
-
-            template< class x_streamable >
-            x_derived& operator<<( x_streamable a_fragment );
-            x_derived& operator<<( const std::string& a_fragment );
-            x_derived& operator<<( const char* a_fragment );
-
-            x_derived& operator()( const std::string& a_filename, int a_line );
-
-            virtual const char* what() const noexcept;
-            virtual const char* where() const noexcept;
-
-            const std::string& filename() const;
-            int line() const;
-
-        protected:
-            mutable std::string f_what;
-            mutable std::string f_where;
-
-            std::string f_filename;
-            int f_line;
-    };
-
-    template< typename x_derived >
-    typed_exception< x_derived >::typed_exception() noexcept :
-            base_exception(),
-            f_what(),
-            f_where(),
-            f_filename(),
-            f_line(0)
-    {}
-
-    template< typename x_derived >
-    typed_exception< x_derived >::typed_exception( const std::string& a_filename, int a_line) noexcept :
-            base_exception(),
-            f_what(),
-            f_where(),
-            f_filename(),
-            f_line( a_line )
-    {
-        try
-        {
-            f_filename = a_filename;
-        }
-        catch( ... )
-        {
-            f_filename.clear();
-        }
-    }
-
-    template< typename x_derived >
-    typed_exception< x_derived >::typed_exception( const typed_exception< x_derived >& a_orig ) noexcept :
-            base_exception( a_orig ),
-            f_what( a_orig.f_what ),
-            f_where(),
-            f_filename(),
-            f_line( a_orig.f_line )
-    {
-        try
-        {
-            f_filename = a_orig.f_filename;
-        }
-        catch( ... )
-        {
-            f_filename.clear();
-        }
-    }
-
-    template< typename x_derived >
-    typed_exception< x_derived >::~typed_exception() noexcept
-    {}
-
-    template< typename x_derived >
-    typed_exception< x_derived >& typed_exception< x_derived >::operator=( const typed_exception< x_derived >& a_orig )
-    {
-        f_what = a_orig.f_error;
-        return *this;
-    }
-
-    template< typename x_derived >
-    const char* typed_exception< x_derived >::what() const noexcept
-    {
-        return f_what.c_str();
-    }
-
-    template< typename x_derived >
-    const char* typed_exception< x_derived >::where() const noexcept
-    {
-        try
-        {
-            f_where = path(f_filename).filename().string() + "(" + std::to_string(f_line) + ")";
-        }
-        catch( ... )
-        {
-            f_where.clear();
-        }
-        return f_where.c_str();
-    }
-
-    template< typename x_derived >
-    template< class x_streamable >
-    x_derived& typed_exception< x_derived >::operator<<( x_streamable a_fragment )
-    {
-        std::stringstream stream;
-        stream << a_fragment;
-        f_what += stream.str();
-        return *static_cast< x_derived* >(this);
-    }
-
-    template< typename x_derived >
-    x_derived& typed_exception< x_derived >::operator<<( const std::string& a_fragment )
-    {
-        f_what += a_fragment;
-        return *static_cast< x_derived* >(this);
-    }
-
-    template< typename x_derived >
-    x_derived& typed_exception< x_derived >::operator<<( const char* a_fragment )
-    {
-        f_what += std::string( a_fragment );
-        return *static_cast< x_derived* >(this);
-    }
-
-    template< typename x_derived >
-    x_derived& typed_exception< x_derived >::operator()( const std::string& a_filename, int a_line )
-    {
-        f_filename = a_filename;
-        f_line = a_line;
-        return *static_cast< x_derived* >(this);
-    }
-
-    template< typename x_derived >
-    const std::string& typed_exception< x_derived >::filename() const
-    {
-        return f_filename;
-    }
-
-    template< typename x_derived >
-    int typed_exception< x_derived >::line() const
-    {
-        return f_line;
-    }
-}
-
-#endif /* SCARAB_BASE_EXCEPTION_HH_ */
diff --git a/Src/Scarab/library/utility/cancelable.cc b/Src/Scarab/library/utility/cancelable.cc
deleted file mode 100644
index 47c4fff..0000000
--- a/Src/Scarab/library/utility/cancelable.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * cancelable.cc
- *
- *  Created on: Jan 24, 2016
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "cancelable.hh"
-
-#include "logger.hh"
-#include "signal_handler.hh"
-
-namespace scarab
-{
-    LOGGER( slog, "cancelable" );
-
-    cancelable::cancelable() :
-            f_canceled( false )
-    {}
-
-    cancelable::cancelable( const cancelable& a_orig ) :
-            f_canceled( a_orig.f_canceled.load() )
-    {}
-
-    cancelable::cancelable( cancelable&& a_orig ) :
-            f_canceled( a_orig.f_canceled.load() )
-    {
-        a_orig.f_canceled.store( false );
-    }
-
-    cancelable::~cancelable()
-    {
-        signal_handler::remove_cancelable( this );
-    }
-
-    cancelable& cancelable::operator=( const cancelable& a_orig )
-    {
-        f_canceled.store( a_orig.f_canceled.load() );
-        return *this;
-    }
-
-    cancelable& cancelable::operator=( cancelable&& a_orig )
-    {
-        f_canceled.store( a_orig.f_canceled.load() );
-        a_orig.f_canceled.store( false );
-        return *this;
-    }
-
-#ifdef NDEBUG
-    void cancelable::do_cancellation( int )
-#else
-    void cancelable::do_cancellation( int a_code )
-#endif
-    {
-        // override in derived class
-        LDEBUG( slog, "cancelable::do_cancellation with code <" << a_code << ">" );
-        return;
-    }
-
-    void cancelable::do_reset_cancellation()
-    {
-        // override in derived class
-        return;
-    }
-
-    // cancelable_wrapper
-    cancelable_wrapper::cancelable_wrapper( cancelable& a_cancelable ) :
-            f_wrapped( &a_cancelable )
-    {}
-
-    cancelable_wrapper::~cancelable_wrapper() 
-    {}
-
-    // wrap_cancelable
-    SCARAB_API std::shared_ptr< cancelable_wrapper > wrap_cancelable( cancelable& a_cancelable )
-    {
-        return std::make_shared< cancelable_wrapper >( a_cancelable );
-    }
-
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/utility/cancelable.hh b/Src/Scarab/library/utility/cancelable.hh
deleted file mode 100644
index 9c38402..0000000
--- a/Src/Scarab/library/utility/cancelable.hh
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * cancelable.hh
- *
- *  Created on: Jan 24, 2016
- *      Author: nsoblath
- *
- *  Base class for thread-safe asynchronous cancellation
- */
-
-#ifndef SCARAB_CANCELABLE_HH_
-#define SCARAB_CANCELABLE_HH_
-
-#include "macros.hh"
-#include "scarab_api.hh"
-
-#include <atomic>
-#include <memory>
-
-namespace scarab
-{
-    /*!
-     @class cancelable
-     @author N. S. Oblath
-
-     @brief Base class for a cancelable object (i.e. an object that can be canceled by scarab::signal_handler or other client code)
-
-     @details
-     A cancelable object is one which has some execution operation that should be asynchronously cancelable.  
-     Cancellation is performed using cancelable::cancel().
-
-     For example, if the object of a derived class is executing in thread 1, 
-     client code in thread 2 or a signal (e.g. SIGINT) from the user or a system 
-     should be able to cancel execution.
-
-     If a derived class has a function execute() that performs the main execution loop, that loop should include 
-     a periodic check of cancelable::is_canceled() to know whether to exit the loop.
-
-     Any actions that should take place when cancelable::cancel() is used should be implemented by the derived class in do_cancellation().
-
-     Cancelable objects can exist within a parent/child hierarchy to ensure that execution can be cleanly shut down.  
-     Parent classes should implement do_cancellation(int) to cancel their children.
-
-     For example, if a parent object in thread 1 starts the execution of two children, each in their own thread (i.e. threads 2 and 3),
-     then the parent object should be added to the signal_handler (using signal_handler::add_cancelable()).  The parent's implementation of 
-     do_cancellation() should take care of calling cancelable::cancel() on each of the children.  The children should not be separately added to 
-     the signal_handler.
-
-     Genreally it's assumed that a top-level-parent cancelable object will be created on the heap using std::shared_ptr
-     (hence why signal_handler adds cancelables using std::shared_ptr<cancelable>).
-    */
-    class SCARAB_API cancelable
-    {
-        public:
-            cancelable();
-            cancelable( const cancelable& a_orig );
-            cancelable( cancelable&& a_orig );
-            virtual ~cancelable();
-
-            cancelable& operator=( const cancelable& a_orig );
-            cancelable& operator=( cancelable&& a_orig );
-
-            /// asynchronous cancel function
-            void cancel( int a_code = RETURN_SUCCESS );
-
-            /// reset to non-canceled state
-            void reset_cancel();
-
-            /// check canceled state
-            bool is_canceled() const;
-
-        private:
-            virtual void do_cancellation( int a_code );
-            virtual void do_reset_cancellation();
-
-        protected:
-            std::atomic< bool > f_canceled;
-    };
-
-    /*!
-     @struct cancelable_wrapper
-     @author N. S. Oblath
-
-     @brief Lightweight wrapper for a cancelable object only temporarily added to signal_handler.
-
-     @details
-     Sometimes a cancelable object is created on the stack in a local scope, or it's temporarily added to signal_handler 
-     while a specific action is performed.  In this case you can use this lightweight wrapper to add the cancelable object to the signal handler.
-
-     NOTE: the wrapper does not track the lifetime of the wrapped object.  Only use this wrapper if you can guarantee that the lifetime of the 
-     wrapped object is not shorter than that of the wrapper.
-
-     Example:
-       {
-           my_cancelable t_obj;  // here's the local object we want to have temporarily added to signal_handler
-           auto t_obj_wrap = wrap_cancelable( t_obj );  // use wrap_cancelable() (declared below) to create the wrapper
-           scarab::signal_handler t_handler;  // creating the signal_handler sets the signal-handling functions, if it hasn't been done before
-           t_handler.add_cancelable( t_obj_wrap );  // add the wrapper
-           t_obj.execute();  // do the cancelable action
-           // end of scope: t_obj_wrap is destroyed, which removes it from signal_handler automatically
-       }
-    */
-
-    struct SCARAB_API cancelable_wrapper : cancelable
-    {
-        cancelable_wrapper( cancelable& a_cancelable );
-        virtual ~cancelable_wrapper();
-        virtual void do_cancellation( int a_code );
-        cancelable* f_wrapped;
-    };
-
-    /// Convenience function to create a cancelable_wrapper
-    SCARAB_API std::shared_ptr< cancelable_wrapper > wrap_cancelable( cancelable& a_cancelable );
-
-
-    inline void cancelable::cancel( int a_code )
-    {
-        if( f_canceled.load() ) return;
-        f_canceled.store( true );
-        this->do_cancellation( a_code );
-    }
-
-    inline void cancelable::reset_cancel()
-    {
-        if( ! f_canceled.load() ) return;
-        f_canceled.store( false );
-        this->do_reset_cancellation();
-    }
-
-    inline bool cancelable::is_canceled() const
-    {
-        return f_canceled.load();
-    }
-
-
-    inline void cancelable_wrapper::do_cancellation( int a_code )
-    {
-        f_wrapped->cancel( a_code );
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_CANCELABLE_HH_ */
diff --git a/Src/Scarab/library/utility/concurrent_queue.hh b/Src/Scarab/library/utility/concurrent_queue.hh
deleted file mode 100644
index fb6e1fd..0000000
--- a/Src/Scarab/library/utility/concurrent_queue.hh
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * concurrent_queue.hh
- *
- *  Created on: July 8, 2015
- *      Author: nsoblath
- *
- *      FIFO Queue
- *
- *      Based almost exactly on the class concurrent_queue from:
- *      http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html
- *      Post author: Anthony Williams
- *      Copyright  2005-2013 Just Software Solutions Ltd. All rights reserved.
- */
-
-#ifndef SCARAB_CONCURRENT_QUEUE_HH_
-#define SCARAB_CONCURRENT_QUEUE_HH_
-
-#include "logger.hh"
-
-#include <chrono>
-#include <condition_variable>
-#include <deque>
-#include <mutex>
-
-namespace scarab
-{
-    LOGGER( slog_cq, "concurrent_queue" );
-
-    template< class XDataType >
-    class concurrent_queue
-    {
-        public:
-            typedef std::deque< XDataType > queue;
-
-            struct queue_not_empty
-            {
-                queue& f_queue;
-                queue_not_empty( queue& a_queue ) :
-                    f_queue( a_queue )
-                {}
-                bool operator()() const
-                {
-                    return ! f_queue.empty();
-                }
-            };
-
-            typedef std::unique_lock< std::mutex > cq_lock;
-
-        public:
-            concurrent_queue() :
-                f_queue(),
-                f_interrupt( false ),
-                f_timeout( std::chrono::milliseconds( 1000 ) ),
-                f_mutex(),
-                f_condition_var()
-            {
-            }
-
-            virtual ~concurrent_queue()
-            {
-                f_queue.clear();
-            }
-
-        private:
-            queue f_queue;
-            bool f_interrupt;
-
-            std::chrono::milliseconds f_timeout; /// Timeout duration in milliseconds
-
-            mutable std::mutex f_mutex;
-            std::condition_variable f_condition_var;
-
-        public:
-            void push( XDataType const& a_data )
-            {
-                LDEBUG( slog_cq, "Attempting to push to queue" );
-                cq_lock lock( f_mutex );
-                LDEBUG( slog_cq, "Pushing to concurrent queue; size: " << f_queue.size() );
-                f_queue.push_back( a_data );
-                lock.unlock();
-                f_condition_var.notify_one();
-                return;
-            }
-
-            bool empty() const
-            {
-                cq_lock lock( f_mutex );
-                return f_queue.empty();
-            }
-
-            unsigned size() const
-            {
-                cq_lock lock( f_mutex );
-                return f_queue.size();
-            }
-
-            bool try_pop( XDataType& a_popped_value )
-            {
-                cq_lock lock( f_mutex );
-                f_interrupt = false;
-                if( f_queue.empty() )
-                {
-                    return false;
-                }
-
-                a_popped_value = f_queue.front();
-                f_queue.pop_front();
-                return true;
-            }
-
-            bool wait_and_pop( XDataType& a_popped_value )
-            {
-                cq_lock lock( f_mutex );
-                f_interrupt = false;
-                f_condition_var.wait( lock, queue_not_empty( f_queue ) );
-                if( f_interrupt )
-                {
-                    f_interrupt = false;
-                    return false;
-                }
-
-                a_popped_value = f_queue.front();
-                f_queue.pop_front();
-                LDEBUG( slog_cq, "Popping from concurrent queue; size: " << f_queue.size() );
-                return true;
-            }
-
-            bool timed_wait_and_pop( XDataType& a_popped_value )
-            {
-                cq_lock lock( f_mutex );
-                f_interrupt = false;
-                std::chrono::steady_clock::time_point const waitUntil = std::chrono::steady_clock::now() + f_timeout;
-                if( ! f_condition_var.wait_until( lock, waitUntil, queue_not_empty( f_queue ) ) )
-                {
-                    //LDEBUG( mtlog_cq, "Queue wait has timed out" );
-                    return false;
-                }
-                if( f_interrupt )
-                {
-                    f_interrupt = false;
-                    return false;
-                }
-
-                a_popped_value = f_queue.front();
-                f_queue.pop_front();
-                LDEBUG( slog_cq, "Popping from concurrent queue; size: " << f_queue.size() );
-                return true;
-            }
-
-            void interrupt()
-            {
-                f_interrupt = true;
-                f_condition_var.notify_one();
-                return;
-            }
-
-            inline unsigned get_timeout() const
-            {
-                return f_timeout.count();
-            }
-
-            inline void set_timeout( unsigned a_duration )
-            {
-                f_timeout = std::chrono::milliseconds( a_duration );
-                return;
-            }
-    };
-
-} /* namespace scarab */
-
-#endif /* SCARAB_CONCURRENT_QUEUE_HH_ */
diff --git a/Src/Scarab/library/utility/destroyer.hh b/Src/Scarab/library/utility/destroyer.hh
deleted file mode 100644
index 94008a2..0000000
--- a/Src/Scarab/library/utility/destroyer.hh
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * destroyer.hh
- *
- *  Created on: Nov 7, 2011
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_DESTROYER_HH_
-#define SCARAB_DESTROYER_HH_
-
-
-namespace scarab
-{
-
-    template< class XDoomed >
-    class destroyer
-    {
-        public:
-            destroyer( XDoomed* = 0 );
-            ~destroyer();
-
-            void set_doomed( XDoomed* );
-
-        private:
-            // Prevent users from making copies of a destroyer to avoid double deletion:
-            destroyer( const destroyer< XDoomed >& );
-            void operator=( const destroyer< XDoomed >& );
-
-        private:
-            XDoomed* f_doomed;
-    };
-
-    template< class XDoomed >
-    destroyer< XDoomed >::destroyer( XDoomed* d )
-    {
-        f_doomed = d;
-    }
-
-    template< class XDoomed >
-    destroyer< XDoomed >::~destroyer()
-    {
-        delete f_doomed;
-    }
-
-    template< class XDoomed >
-    void destroyer< XDoomed >::set_doomed( XDoomed* d )
-    {
-        f_doomed = d;
-    }
-
-} /* namespace scarab */
-#endif /* SCARAB_DESTROYER_HH_ */
diff --git a/Src/Scarab/library/utility/digital.cc b/Src/Scarab/library/utility/digital.cc
deleted file mode 100644
index c27e9d2..0000000
--- a/Src/Scarab/library/utility/digital.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * digital.c
- *
- * written by jared kofron <jared.kofron@gmail.com>
- *
- * documented prototypes are in digital.h
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "digital.hh"
-
-#include <cstdio>
-
-namespace scarab
-{
-
-    void get_calib_params( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, bool bits_r_aligned, dig_calib_params *params )
-    {
-        params->bit_depth = n_bits;
-        params->levels = 1 << n_bits;
-        params->data_type_size = data_type_size;
-        params->v_range = v_range;
-        params->v_offset = v_offset;
-        params->inv_levels = 1. / (double)params->levels;
-        params->inv_v_range = 1. / params->v_range;
-        params->dac_gain = params->v_range * params->inv_levels;
-        params->bits_right_aligned = bits_r_aligned;
-        return;
-    }
-
-    void get_calib_params2( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, double dac_gain, bool bits_r_aligned, dig_calib_params *params )
-    {
-        params->bit_depth = n_bits;
-        params->levels = 1 << n_bits;
-        params->data_type_size = data_type_size;
-        params->v_range = v_range;
-        params->v_offset = v_offset;
-        params->inv_levels = 1. / ( double )params->levels;
-        params->inv_v_range = 1. / params->v_range;
-        params->dac_gain = dac_gain;
-        params->bits_right_aligned = bits_r_aligned;
-        return;
-    }
-
-}
diff --git a/Src/Scarab/library/utility/digital.hh b/Src/Scarab/library/utility/digital.hh
deleted file mode 100644
index f970e34..0000000
--- a/Src/Scarab/library/utility/digital.hh
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * digital.hh
- *
- * Created on: ~2016
- *     Author: N.S. Oblath
- *
- *
- */
-
-#ifndef SCARAB_DIGITAL_HH_
-#define SCARAB_DIGITAL_HH_
-
-#include "scarab_api.hh"
-
-#include <cmath>
-#include <type_traits>
-
-namespace scarab
-{
-
-    /** \struct dig_calib_params
-        \brief Collection of parameters used for converting between analog and digital data
-
-        Typically this struct is filled in with one of the get_calib_params functions.
-
-        Notes on parameters that are typically specified by the user:
-
-        \param bit_depth The number of bits used by the digitized data (<= to the size of the data type)
-
-        \param data_type_size The size of the digitized data type in bytes
-
-        \param v_range The voltage range covered by the digitization
-
-        \param v_offset The voltage offset for the measurement.  The specific meaning of this depends on whether
-        you're recording your data as variations about some middle point, or as positive variations above a pedestal.
-        In the former case, it's assumed (by how the a2d function is setup) that you'll be using a signed datatype for
-        the digitized data.  In the latter case, it's assumed that you'll be using an unsigned datatype.
-
-        \param bits_right_aligned Whether the bits within the data type are right aligned or left-aligned
-
-        \param dac_gain Some digitizers libraries provide the DAC gain that should be used for reconstructing analog values.
-     */
-    struct SCARAB_API dig_calib_params
-    {
-        unsigned bit_depth;
-        unsigned levels;
-        unsigned data_type_size;
-        double v_range;
-        double v_offset;
-        double inv_levels;
-        double inv_v_range;
-        double dac_gain;
-        bool bits_right_aligned;
-    };
-
-
-    /// Calculate the digitizer calibration parameters with basic parameters: number of bits, Voffset, and Vrange
-    SCARAB_API void get_calib_params( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, bool bits_r_aligned, dig_calib_params *params );
-    /// Calculate the digitizer calibration parameters when given the DAC gain (e.g. from a digitizer's own calibration)
-    SCARAB_API void get_calib_params2( unsigned n_bits, unsigned data_type_size, double v_offset, double v_range, double dac_gain, bool bits_r_aligned, dig_calib_params *params );
-
-
-    //namespace detail {
-    //    enum class is_signed {};
-    //    enum class is_unsigned {};
-    //}
-
-    template< typename type >
-    using enable_if_signed = typename std::enable_if< std::is_signed<type>::value >::type*;
-
-    template< typename type >
-    using enable_if_unsigned = typename std::enable_if< std::is_unsigned<type>::value >::type*;
-
-    /// Convert a signed or unsigned digital value to an analog value.
-    template< typename dig_type, typename an_type >
-    an_type d2a( dig_type dig, const struct dig_calib_params* params )
-    {
-        return params->v_offset + params->dac_gain * ( an_type )dig;
-    }
-
-    /// Convert an analog value to an unsigned digital value.
-    template< typename an_type, typename dig_type,
-                enable_if_unsigned< dig_type > = nullptr  >
-    dig_type a2d( an_type analog, const struct dig_calib_params* params )
-    {
-        analog = ( analog - params->v_offset ) * params->inv_v_range * (an_type)(params->levels);
-        if( analog > (an_type)(params->levels - 1) ) analog = params->levels - 1;
-        else if( analog < 0. ) analog = 0.;
-        return (dig_type)std::round( analog );
-    }
-
-    ///Convert an analog value to a signed digital value.
-    template< typename an_type, typename dig_type,
-              enable_if_signed< dig_type > = nullptr >
-    dig_type a2d( an_type analog, const struct dig_calib_params* params )
-    {
-        double half_levels = params->levels * 0.5;
-        analog = ( analog - params->v_offset ) * params->inv_v_range * (an_type)(params->levels);
-        if( analog > (an_type)(half_levels - 1) ) analog = half_levels - 1;
-        else if( analog < -half_levels ) analog = -half_levels;
-        return (dig_type)std::round( analog );
-    }
-
-}
-
-#endif // SCARAB_DIGITAL_HH_
diff --git a/Src/Scarab/library/utility/error.hh b/Src/Scarab/library/utility/error.hh
deleted file mode 100644
index d99fbee..0000000
--- a/Src/Scarab/library/utility/error.hh
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef SCARAB_EXCEPTION_HH_
-#define SCARAB_EXCEPTION_HH_
-
-#include "base_exception.hh"
-#include "scarab_api.hh"
-
-namespace scarab
-{
-
-    class SCARAB_API error : public typed_exception< error >
-    {
-        public:
-            error() = default;
-            error( const error& ) = default;
-            ~error() noexcept = default;
-    };
-
-}
-
-#endif /* SCARAB_EXCEPTION_HH_ */
diff --git a/Src/Scarab/library/utility/exponential_backoff.hh b/Src/Scarab/library/utility/exponential_backoff.hh
deleted file mode 100644
index 5ba603a..0000000
--- a/Src/Scarab/library/utility/exponential_backoff.hh
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * exponential_backoff.hh
- *
- *  Created on: Jun 17, 2021
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_EXPONENTIAL_BACKOFF_HH_
-#define SCARAB_EXPONENTIAL_BACKOFF_HH_
-
-#include "error.hh"
-#include "logger.hh"
-#include "member_variables.hh"
-#include "scarab_api.hh"
-
-#include <chrono>
-#include <functional>
-#include <thread>
-
-
-LOGGER( expbacklog_hh, "exponential_backoff.hh" )
-
-namespace scarab
-{
-    /*!
-     @class exponential_backoff
-     @author N.S. Oblath
-     @brief Class that performs an action using exponential backoff
-
-     @details
-     
-    */
-    template< typename ... x_args >
-    class SCARAB_API exponential_backoff
-    {
-        public:
-            exponential_backoff( std::function< bool (x_args...) > an_action, unsigned a_max_attempts = 10, unsigned a_base_delay_ms = 100 );
-            //exponential_backoff( const exponential_backoff< x_args... >& a_orig );
-            virtual ~exponential_backoff();
-
-            //exponential_backoff< x_args... >& operator=( const exponential_backoff< x_args... >& a_orig );
-
-            /// returns the number of attempts made at calling the function (including the last, successful or not)
-            unsigned go( x_args... args );
-
-            mv_referrable( std::function< bool (x_args...) >, action );
-
-            mv_accessible( unsigned, max_attempts );
-            mv_accessible( unsigned, base_delay_ms );
-    };
-
-
-    template< typename ... x_args >
-    exponential_backoff< x_args... >::exponential_backoff( std::function< bool (x_args...) > an_action, unsigned a_max_attempts, unsigned a_base_delay_ms ) :
-            f_action( an_action ),
-            f_max_attempts( a_max_attempts ),
-            f_base_delay_ms( a_base_delay_ms )
-    {
-        if( f_max_attempts == 0 ) throw error() << "Max attempts must be > 0";
-    }
-
-    template< typename ... x_args >
-    exponential_backoff< x_args... >::~exponential_backoff()
-    {}
-
-    template< typename ... x_args >
-    unsigned exponential_backoff< x_args... >::go( x_args... args )
-    {
-        //LDEBUG( expbacklog_hh, "doing action" );
-        unsigned t_attempts = 1;
-        bool t_success = f_action( args... );
-        LDEBUG( expbacklog_hh, "function called first time: " << t_success );
-        while( ! t_success && t_attempts < f_max_attempts )
-        {
-            LDEBUG( expbacklog_hh, "attempt: " << t_attempts + 1 << " after delay: " << (1<<t_attempts) * f_base_delay_ms );
-            std::this_thread::sleep_for( std::chrono::milliseconds( (1<<t_attempts) * f_base_delay_ms ) );
-            t_success = f_action( args... );
-            LDEBUG( expbacklog_hh, "function called: " << t_success );
-            ++t_attempts;
-        }
-
-        return t_success ? t_attempts : 0;
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_EXPONENTIAL_BACKOFF_HH_ */
diff --git a/Src/Scarab/library/utility/factory.hh b/Src/Scarab/library/utility/factory.hh
deleted file mode 100644
index 94a2430..0000000
--- a/Src/Scarab/library/utility/factory.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * factory.hh
- *
- *  created on: Jul 31, 2012
- *      Author: N.S. Oblath
- * 
- *  The factory is a special kind of indexed_factory with a string index.
- * 
- *  Why is factory based on indexed_factory?  Because factory existed first with the string index, 
- *  and then factories with non-string indices were desired, 
- *  so indexed_factory was created as a generalization of factory.
- * 
- *  Note on registrar lifespan: when a registrar is deleted, it un-registers itself from the factory.
- *     This is because the registrar itself is used to create objects, and the act of registering 
- *     stores a pointer in the factory.  The factory does _not_ assume ownership of the registrar.
- *     Therefore the registrar needs to exist for as long as it might be needed.
- */
-
-#ifndef SCARAB_FACTORY_HH_
-#define SCARAB_FACTORY_HH_
-
-#include "indexed_factory.hh"
-
-#include <string>
-
-namespace scarab
-{
-
-    template< class XBaseType, class... XArgs >
-    using factory = indexed_factory< std::string, XBaseType, XArgs... >;
-
-    template< class XBaseType, class... XArgs >
-    using registrar = indexed_registrar< std::string, XBaseType, XArgs... >;
-    
-} /* namespace scarab */
-#endif /* SCARAB_FACTORY_HH_ */
diff --git a/Src/Scarab/library/utility/indexed_factory.hh b/Src/Scarab/library/utility/indexed_factory.hh
deleted file mode 100644
index 355531e..0000000
--- a/Src/Scarab/library/utility/indexed_factory.hh
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * indexed_factory.hh
- *
- *  created on: Oct 4, 2019
- *      Author: N.S. Oblath
- * 
- *  This factory has the same functionality as is found in factory.hh plus the option of choosing the index type.
- *
- *  Note on registrar lifespan: when a registrar is deleted, it un-registers itself from the factory.
- *     This is because the registrar itself is used to create objects, and the act of registering 
- *     stores a pointer in the factory.  The factory does _not_ assume ownership of the registrar.
- *     Therefore the registrar needs to exist for as long as it might be needed.
- */
-
-#ifndef SCARAB_INDEXED_FACTORY_HH_
-#define SCARAB_INDEXED_FACTORY_HH_
-
-#include "singleton.hh"
-
-#include "error.hh"
-#include "logger.hh"
-
-#include <map>
-#include <string>
-#include <utility>
-
-namespace scarab
-{
-    LOGGER( slog_ind_fact, "indexed_factory" );
-
-    //********************
-    // Class definitions
-    //********************
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    class indexed_factory;
-
-    // base_registrar
-
-    template< class XBaseType, typename ... XArgs >
-    class base_registrar
-    {
-        public:
-            base_registrar() {}
-            virtual ~base_registrar() {}
-
-            virtual XBaseType* create( XArgs ... args ) const = 0;
-
-    };
-
-    // registrar
-
-    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
-    class indexed_registrar : public base_registrar< XBaseType, XArgs... >
-    {
-        public:
-            indexed_registrar( const XIndexType& a_index );
-            virtual ~indexed_registrar();
-
-            void register_class() const;
-
-            XBaseType* create( XArgs ... args ) const;
-
-        protected:
-            XIndexType f_index;
-    };
-
-    // indexed_factory
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    class indexed_factory : public singleton< indexed_factory< XIndexType, XBaseType, XArgs... > >
-    {
-        public:
-            typedef std::map< XIndexType, const base_registrar< XBaseType, XArgs... >* > FactoryMap;
-            typedef typename FactoryMap::value_type FactoryEntry;
-            typedef typename FactoryMap::iterator FactoryIt;
-            typedef typename FactoryMap::const_iterator FactoryCIt;
-
-        public:
-            XBaseType* create( const XIndexType& a_index, XArgs ... args );
-            XBaseType* create( const FactoryCIt& iter, XArgs ... args );
-
-            void register_class( const XIndexType& a_index, const base_registrar< XBaseType, XArgs... >* base_registrar );
-            bool has_class( const XIndexType& a_index ) const;
-            void remove_class( const XIndexType& a_index );
-
-            FactoryCIt begin() const;
-            FactoryCIt end() const;
-
-        protected:
-            FactoryMap* fMap;
-            mutable std::mutex f_factory_mutex;
-
-        protected:
-            allow_singleton_access( indexed_factory );
-            indexed_factory();
-            ~indexed_factory();
-    };
-
-
-    //*****************************************
-    // Partial specialization for empty XArgs
-    //*****************************************
-
-    template< class XBaseType >
-    class base_registrar< XBaseType, void >
-    {
-        public:
-            base_registrar() {}
-            virtual ~base_registrar() {}
-
-            virtual XBaseType* create() const = 0;
-
-    };
-
-    template< class XIndexType, class XBaseType, class XDerivedType >
-    class indexed_registrar< XIndexType, XBaseType, XDerivedType, void > : public base_registrar< XBaseType >
-    {
-        public:
-            indexed_registrar( const XIndexType& a_index );
-            virtual ~indexed_registrar();
-
-            void register_class() const;
-
-            XBaseType* create() const;
-
-        protected:
-            XIndexType f_index;
-    };
-
-
-    template< class XIndexType, class XBaseType >
-    class indexed_factory< XIndexType, XBaseType, void > : public singleton< indexed_factory< XIndexType, XBaseType > >
-    {
-        public:
-            typedef std::map< XIndexType, const base_registrar< XBaseType >* > FactoryMap;
-            typedef typename FactoryMap::value_type FactoryEntry;
-            typedef typename FactoryMap::iterator FactoryIt;
-            typedef typename FactoryMap::const_iterator FactoryCIt;
-
-        public:
-            XBaseType* create( const XIndexType& a_index );
-            XBaseType* create( const FactoryCIt& iter );
-
-            void register_class( const XIndexType& a_index, const base_registrar< XBaseType >* base_registrar );
-            bool has_class( const XIndexType& a_index ) const;
-            void remove_class( const XIndexType& a_index );
-
-            FactoryCIt begin() const;
-            FactoryCIt end() const;
-
-        protected:
-            FactoryMap* fMap;
-            std::mutex f_factory_mutex;
-
-        protected:
-            allow_singleton_access( indexed_factory );
-            indexed_factory();
-            ~indexed_factory();
-    };
-
-
-    //******************
-    // Implementations
-    //******************
-
-    // indexed_factory
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    XBaseType* indexed_factory< XIndexType, XBaseType, XArgs... >::create( const FactoryCIt& iter, XArgs ... args )
-    {
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        return iter->second->create( args... );
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    XBaseType* indexed_factory< XIndexType, XBaseType, XArgs... >::create( const XIndexType& a_index, XArgs ... args )
-    {
-        //std::cout << "this factory (" << this << ") has " << fMap->size() << " entries" << std::endl;
-        //for( FactoryCIt iter = fMap->begin(); iter != fMap->end(); ++iter )
-        //{
-        //    std::cout << "this factory has: " << iter->first << " at " << iter->second << std::endl;
-        //}
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        FactoryCIt it = fMap->find( a_index );
-        if( it == fMap->end() )
-        {
-            LERROR( slog_ind_fact, "Did not find indexed_factory for <" << a_index << ">." );
-            return nullptr;
-        }
-
-        return it->second->create( args... );
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    void indexed_factory< XIndexType, XBaseType, XArgs... >::register_class( const XIndexType& a_index, const base_registrar< XBaseType, XArgs... >* a_registrar )
-    {
-        // A local (static) logger is created inside this function to avoid static initialization order problems
-        LOGGER( slog_ind_factory_reg, "indexed_factory-register");
-
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        FactoryCIt it = fMap->find(a_index);
-        if (it != fMap->end())
-        {
-            throw error() << "Already have indexed_factory registered for <" << a_index << ">.";
-        }
-        fMap->insert(std::pair< XIndexType, const base_registrar< XBaseType, XArgs... >* >(a_index, a_registrar));
-        LDEBUG( slog_ind_factory_reg, "Registered a indexed_factory for class " << a_index << " at " << (*fMap)[ a_index ] << ", indexed_factory #" << fMap->size()-1 << " for " << this );
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    bool indexed_factory< XIndexType, XBaseType, XArgs... >::has_class(const XIndexType& a_index ) const
-    {
-        return fMap->find( a_index ) != fMap->end();
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    void indexed_factory< XIndexType, XBaseType, XArgs... >::remove_class(const XIndexType& a_index )
-    {
-        LDEBUG( slog_ind_fact, "Removing indexed_factory for class " << a_index << " from " << this );
-        FactoryIt iter = fMap->find( a_index );
-        if( iter != fMap->end() ) fMap->erase( iter );
-        return;
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    indexed_factory< XIndexType, XBaseType, XArgs... >::indexed_factory() :
-        fMap(new FactoryMap()),
-        f_factory_mutex()
-    {}
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    indexed_factory< XIndexType, XBaseType, XArgs... >::~indexed_factory()
-    {
-        delete fMap;
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    typename indexed_factory< XIndexType, XBaseType, XArgs... >::FactoryCIt indexed_factory< XIndexType, XBaseType, XArgs... >::begin() const
-    {
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        return fMap->begin();
-    }
-
-    template< class XIndexType, class XBaseType, typename ... XArgs >
-    typename indexed_factory< XIndexType, XBaseType, XArgs... >::FactoryCIt indexed_factory< XIndexType, XBaseType, XArgs... >::end() const
-    {
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        return fMap->end();
-    }
-
-    // registrar
-
-    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
-    indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::indexed_registrar( const XIndexType& a_index ) :
-            base_registrar< XBaseType, XArgs... >(),
-            f_index( a_index )
-    {
-        register_class();
-    }
-
-    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
-    indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::~indexed_registrar()
-    {
-        indexed_factory< XIndexType, XBaseType, XArgs... >::get_instance()->remove_class( f_index );
-    }
-
-    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
-    void indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::register_class() const
-    {
-        indexed_factory< XIndexType, XBaseType, XArgs... >::get_instance()->register_class( f_index, this );
-        return;
-    }
-
-    template< class XIndexType, class XBaseType, class XDerivedType, typename ... XArgs >
-    XBaseType* indexed_registrar< XIndexType, XBaseType, XDerivedType, XArgs... >::create( XArgs... args ) const
-    {
-        return dynamic_cast< XBaseType* >( new XDerivedType( args... ) );
-    }
-
-
-    //*******************************************
-    // Implementations (partial specialization)
-    //*******************************************
-
-    // indexed_factory
-
-    template< class XIndexType, class XBaseType >
-    XBaseType* indexed_factory< XIndexType, XBaseType, void >::create( const FactoryCIt& iter )
-    {
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        return iter->second->create();
-    }
-
-    template< class XIndexType, class XBaseType >
-    XBaseType* indexed_factory< XIndexType, XBaseType, void >::create( const XIndexType& a_index )
-    {
-        //std::cout << "this indexed_factory (" << this << ") has " << fMap->size() << " entries" << std::endl;
-        //for( FactoryCIt iter = fMap->begin(); iter != fMap->end(); ++iter )
-        //{
-        //    std::cout << "this indexed_factory has: " << iter->first << " at " << iter->second << std::endl;
-        //}
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        FactoryCIt it = fMap->find( a_index );
-        if( it == fMap->end() )
-        {
-            LERROR( slog_ind_fact, "Did not find indexed_factory for <" << a_index << ">." );
-            return nullptr;
-        }
-
-        return it->second->create();
-    }
-
-    template< class XIndexType, class XBaseType >
-    void indexed_factory< XIndexType, XBaseType, void >::register_class( const XIndexType& a_index, const base_registrar< XBaseType >* a_registrar )
-    {
-        // A local (static) logger is created inside this function to avoid static initialization order problems
-        LOGGER( slog_ind_factory_reg, "indexed_factory-register");
-
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        FactoryCIt it = fMap->find(a_index);
-        if (it != fMap->end())
-        {
-            throw error() << "Already have indexed_factory registered for <" << a_index << ">.";
-            return;
-        }
-        fMap->insert(std::pair< std::string, const base_registrar< XIndexType, XBaseType >* >(a_index, a_registrar));
-        LDEBUG( slog_ind_factory_reg, "Registered a indexed_factory for class " << a_index << ", indexed_factory #" << fMap->size()-1 << " for " << this );
-    }
-
-    template< class XIndexType, class XBaseType >
-    bool indexed_factory< XIndexType, XBaseType, void >::has_class(const XIndexType& a_index ) const
-    {
-        return fMap->find( a_index ) != fMap->end();
-    }
-
-    template< class XIndexType, class XBaseType >
-    void indexed_factory< XIndexType, XBaseType, void >::remove_class(const XIndexType& a_index )
-    {
-        LDEBUG( slog_ind_fact, "Removing indexed_factory for class " << a_index << " from " << this );
-        FactoryIt iter = fMap->find( a_index );
-        if( iter != fMap->end() ) fMap->erase( iter );
-        return;
-    }
-
-    template< class XIndexType, class XBaseType >
-    indexed_factory< XIndexType, XBaseType, void >::indexed_factory() :
-        fMap(new FactoryMap()),
-        f_factory_mutex()
-    {}
-
-    template< class XIndexType, class XBaseType >
-    indexed_factory< XIndexType, XBaseType, void >::~indexed_factory()
-    {
-        delete fMap;
-    }
-
-    template< class XIndexType, class XBaseType >
-    typename indexed_factory< XIndexType, XBaseType, void >::FactoryCIt indexed_factory< XIndexType, XBaseType, void >::begin() const
-    {
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        return fMap->begin();
-    }
-
-    template< class XIndexType, class XBaseType >
-    typename indexed_factory< XIndexType, XBaseType, void >::FactoryCIt indexed_factory< XIndexType, XBaseType, void >::end() const
-    {
-        std::unique_lock< std::mutex > t_lock( this->f_factory_mutex );
-        return fMap->end();
-    }
-
-    // registrar
-
-    template< class XIndexType, class XBaseType, class XDerivedType >
-    indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::indexed_registrar( const XIndexType& a_index ) :
-            base_registrar< XBaseType >(),
-            f_index( a_index )
-    {
-        register_class();
-    }
-
-    template< class XIndexType, class XBaseType, class XDerivedType >
-    indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::~indexed_registrar()
-    {
-        indexed_factory< XIndexType, XBaseType >::get_instance()->remove_class( f_index );
-    }
-
-    template< class XIndexType, class XBaseType, class XDerivedType >
-    void indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::register_class() const
-    {
-        indexed_factory< XIndexType, XBaseType >::get_instance()->register_class( f_index, this );
-        return;
-    }
-
-    template< class XIndexType, class XBaseType, class XDerivedType >
-    XBaseType* indexed_registrar< XIndexType, XBaseType, XDerivedType, void >::create() const
-    {
-        return dynamic_cast< XBaseType* >( new XDerivedType() );
-    }
-
-} /* namespace scarab */
-#endif /* SCARAB_INDEXED_FACTORY_HH_ */
diff --git a/Src/Scarab/library/utility/macros.hh b/Src/Scarab/library/utility/macros.hh
deleted file mode 100644
index f9cee49..0000000
--- a/Src/Scarab/library/utility/macros.hh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * macros.hh
- *
- *  Created on: May 25, 2017
- *      Author: obla999
- */
-
-#ifndef SCARAB_UTILITY_MACROS_HH_
-#define SCARAB_UTILITY_MACROS_HH_
-
-// Return value constants
-#define RETURN_SUCCESS 0
-#define RETURN_ERROR 1
-#define RETURN_CANCELED 2
-#define RETURN_REVOKED 3
-
-#define PASTE2( x, y ) x##y
-#define PASTE( x, y ) PASTE2( x, y )
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-#define __FILE_LINE__      __FILE__ "(" TOSTRING(__LINE__) ")"
-#define __FILENAME_LINE__  (strrchr(__FILE__, '/') ? strrchr(__FILE_LINE__, '/') + 1 : __FILE_LINE__)
-
-#if !defined(__FUNC__)
-#if defined(_MSC_VER)
-#define __FUNC__ __FUNCSIG__
-#elif defined(__GNUC__)
-#define __FUNC__ __PRETTY_FUNCTION__
-#else
-#define __FUNC__ ""
-#endif
-#endif
-
-#endif /* SCARAB_UTILITY_MACROS_HH_ */
diff --git a/Src/Scarab/library/utility/map_at_default.hh b/Src/Scarab/library/utility/map_at_default.hh
deleted file mode 100644
index 9006594..0000000
--- a/Src/Scarab/library/utility/map_at_default.hh
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * map_at_default.hh
- *
- *  Created on: Jan 8, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_UTILITY_MAPATDEFAULT
-#define SCARAB_UTILITY_MAPATDEFAULT
-
-#include <map>
-
-namespace scarab
-{
-    template< typename x_key, typename x_value >
-    const x_value& at( const std::map< x_key, x_value >& a_map, const x_key& a_key, const x_value& a_default )
-    {
-        try
-        {
-            return a_map.at( a_key );
-        }
-        catch(...)
-        {
-            return a_default;
-        }
-    }
-
-} /* end namespace scarab */
-
-#endif /* SCARAB_UTILITY_MAPATDEFAULT */
diff --git a/Src/Scarab/library/utility/member_variables.hh b/Src/Scarab/library/utility/member_variables.hh
deleted file mode 100644
index 24d3418..0000000
--- a/Src/Scarab/library/utility/member_variables.hh
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * member_variables.hh
- *
- *  Created on: Jan 6, 2016
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_MEMBER_VARIABLES_HH_
-#define SCARAB_MEMBER_VARIABLES_HH_
-
-/**
- * Macros for class member variables
- *
- * In all cases remember to initialize the variables!
- *
- * For "normal" variables
- * Defines accessors [type get_my_var() const], [void set_my_var( type )], and member variable [type f_my_var]
- * The set_ function is not available if the _noset macros are used
- *  - mv_accessible
- *  - mv_accessible_noset
- *  - mv_accessible_static
- *  - mv_accessible_static_noset
- *
- * For variables accessed by reference
- * Defines accessors [const type& my_var() const], [type& my_var()], and member variable [type f_my_var]
- * The non-const function is not available if the _const macros are used
- *  - mv_referrable
- *  - mv_referrable_const
- *  - mv_referrable_static
- *  - mv_referrable_static_const
- *
- * For pointer variables
- * Defines accessors [type* get_my_var() const], [void set_my_var( type* )], and member variable [type* f_my_var]
- * The set_ function is not available if the _noset macros are used
- *  - mv_assignable
- *  - mv_assignable_noset
- *  - mv_assignable_static
- *  - mv_assignable_static_noset
- *
- * For std::shared_ptr's
- * Defines accessors [const std::shared_ptr< type > my_var() const], [std::shared_ptr< type > my_var()], and member variable [std::shared_ptr< type > f_my_var]
- * The non-const function is not available if the _const macros are used
- *  - mv_shared_ptr
- *  - mv_shared_ptr_const
- *  - mv_shared_ptr_static
- *  - mv_shared_ptr_static_const
- *
- * For atomic variables
- * Defines accessors [type get_my_var() const], [void set_my_var( type )], and member variable [std::atomic< type > f_my_var]
- * The set_ function is not available if the _noset macros are used
- *  - mv_atomic
- *  - mv_atomic_noset
- *  - mv_atomic_static
- *  - mv_atomic_static_noset
- *
- */
-
-#include "_snake_case_member_variables.hh"
-
-#define mv_accessible                         snake_case_mv_accessible
-#define mv_accessible_noset                   snake_case_mv_accessible_noset
-#define mv_accessible_static                  snake_case_mv_accessible_static
-#define mv_accessible_static_noset            snake_case_mv_accessible_static_noset
-#define mv_accessible_mutable                 snake_case_mv_accessible_mutable
-#define mv_accessible_mutable_noset           snake_case_mv_accessible_mutable_noset
-
-#define mv_referrable                         snake_case_mv_referrable
-#define mv_referrable_const                   snake_case_mv_referrable_const
-#define mv_referrable_static                  snake_case_mv_referrable_static
-#define mv_referrable_mutable                 snake_case_mv_referrable_mutable
-#define mv_referrable_mutable_const           snake_case_mv_referrable_mutable_const
-
-#define mv_assignable                         snake_case_mv_assignable
-#define mv_assignable_noset                   snake_case_mv_assignable_noset
-#define mv_assignable_static                  snake_case_mv_assignable_static
-#define mv_assignable_static_noset            snake_case_mv_assignable_static_noset
-#define mv_assignable_mutable                 snake_case_mv_assignable_mutable
-#define mv_assignable_mutable_noset           snake_case_mv_assignable_mutable_noset
-
-#define mv_shared_ptr                         snake_case_mv_shared_ptr
-#define mv_shared_ptr_const                   snake_case_mv_shared_ptr_const
-#define mv_shared_ptr_static                  snake_case_mv_shared_ptr_static
-#define mv_shared_ptr_mutable                 snake_case_mv_shared_ptr_mutable
-#define mv_shared_ptr_mutable_const           snake_case_mv_shared_ptr_mutable_const
-
-#define mv_atomic                             snake_case_mv_atomic
-#define mv_atomic_noset                       snake_case_mv_atomic_noset
-#define mv_atomic_static                      snake_case_mv_atomic_static
-#define mv_atomic_static_noset                snake_case_mv_atomic_static_noset
-#define mv_atomic_mutable                     snake_case_mv_atomic_mutable
-#define mv_atomic_mutable_noset               snake_case_mv_atomic_mutable_noset
-
-
-#endif /* SCARAB_MEMBER_VARIABLES_HH_ */
diff --git a/Src/Scarab/library/utility/path.cc b/Src/Scarab/library/utility/path.cc
deleted file mode 100644
index 750e534..0000000
--- a/Src/Scarab/library/utility/path.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * path.cc
- *
- *  Created on: Jan 22, 2016
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "path.hh"
-
-//#include <iostream>
-#include <regex>
-
-using std::string;
-using boost::filesystem::absolute;
-
-namespace scarab
-{
-    path SCARAB_API expand_path( const string& a_path )
-    {
-        string t_exp_path( a_path );
-#ifndef _WIN32
-        // POSIX-shell-like expansion
-        wordexp_t t_expansion_result;
-        wordexp( a_path.c_str(), &t_expansion_result, 0 );
-        if( t_expansion_result.we_wordc > 0 )
-        {
-            t_exp_path = string( t_expansion_result.we_wordv[0] );
-            //std::cout << "#### expanded path: " << t_exp_path << std::endl;
-        }
-        wordfree( &t_expansion_result );
-#endif
-        // do canonical expansion; return the absolute path
-        return absolute( t_exp_path );
-    }
-
-    std::vector< path > SCARAB_API glob( const string& a_path, const string& a_pattern )
-    {
-        std::vector< path > t_file_paths;
-        path t_abs_path = expand_path( a_path );
-        for( fs::directory_entry& dir_entry: fs::recursive_directory_iterator(t_abs_path) )
-        {
-            path t_file_path=dir_entry.path();
-            if ( ! std::regex_search( t_file_path.string(), std::regex(a_pattern) ) ) continue;
-            t_file_paths.push_back( t_file_path );
-        }
-        return t_file_paths;
-    }
-}
diff --git a/Src/Scarab/library/utility/path.hh b/Src/Scarab/library/utility/path.hh
deleted file mode 100644
index 4a69910..0000000
--- a/Src/Scarab/library/utility/path.hh
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * path.hh
- *
- *  Created on: Jan 22, 2016
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_PATH_HH_
-#define SCARAB_PATH_HH_
-
-#include "scarab_api.hh"
-
-#include <boost/filesystem.hpp>
-
-#include <string>
-#include <vector>
-
-#ifndef _WIN32
-#include <wordexp.h>
-#endif
-
-namespace scarab
-{
-    namespace fs = ::boost::filesystem;
-
-    typedef fs::path path;
-
-    path SCARAB_API expand_path( const std::string& a_path );
-
-    std::vector< path> SCARAB_API glob( const std::string& a_path, const std::string& a_pattern );
-}
-
-
-
-#endif /* SCARAB_PATH_HH_ */
diff --git a/Src/Scarab/library/utility/scarab_api.hh b/Src/Scarab/library/utility/scarab_api.hh
deleted file mode 100644
index a81c581..0000000
--- a/Src/Scarab/library/utility/scarab_api.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * scarab_api.hh
- *
- *  Created on: Jan 1, 2016
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_API_HH_
-#define SCARAB_API_HH_
-
-
-namespace scarab
-{
-    // API export macros for windows
-#ifdef _WIN32
-#  ifdef SCARAB_API_EXPORTS
-#    define SCARAB_API __declspec(dllexport)
-#    define SCARAB_EXPIMP_TEMPLATE
-#  else
-#    define SCARAB_API __declspec(dllimport)
-#    define SCARAB_EXPIMP_TEMPLATE extern
-#  endif
-#else
-#  define SCARAB_API
-#endif
-
-}
-
-#endif /* SCARAB_API_HH_ */
diff --git a/Src/Scarab/library/utility/signal_handler.cc b/Src/Scarab/library/utility/signal_handler.cc
deleted file mode 100644
index 5524101..0000000
--- a/Src/Scarab/library/utility/signal_handler.cc
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * signal_handler.cc
- *
- *  Created on: Dec 3, 2013
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "signal_handler.hh"
-
-#include "cancelable.hh"
-#include "error.hh"
-#include "logger.hh"
-
-#include <execinfo.h>
-#include <stdexcept>
-#include <thread>
-
-#ifdef _WIN32
-#include <csignal>
-#include <Windows.h>
-//#include "processthreadsapi.h"
-#endif
-
-namespace {
-    // function to catch unhandled exceptions
-    // invoke set_terminate as part of global constant initialization
-    static const bool SET_TERMINATE = std::set_terminate( scarab::signal_handler::handle_terminate );
-}
-
-
-namespace scarab
-{
-    LOGGER( slog, "signal_handler" );
-
-    int signal_handler::s_ref_count = 0;
-
-    bool signal_handler::s_exited = false;
-    int signal_handler::s_return_code = RETURN_SUCCESS;
-
-    bool signal_handler::s_handling_sig_abrt = false;
-    bool signal_handler::s_handling_sig_term = false;
-    bool signal_handler::s_handling_sig_int = false;
-    bool signal_handler::s_handling_sig_quit = false;
-
-#ifndef _WIN32
-    struct sigaction signal_handler::s_old_sig_abrt_action;
-    struct sigaction signal_handler::s_old_sig_term_action;
-    struct sigaction signal_handler::s_old_sig_int_action;
-    struct sigaction signal_handler::s_old_sig_quit_action;
-#else // _WIN32
-    signal_handler::handler_t signal_handler::s_old_sig_abrt_handler = SIG_DFL;
-    signal_handler::handler_t signal_handler::s_old_sig_term_handler = SIG_DFL;
-    signal_handler::handler_t signal_handler::s_old_sig_int_handler = SIG_DFL;
-    signal_handler::handler_t signal_handler::s_old_sig_quit_handler = SIG_DFL;
-#endif
-
-    std::recursive_mutex signal_handler::s_mutex;
-    signal_handler::cancelers signal_handler::s_cancelers;
-
-    signal_handler::signal_handler()
-    {
-        //std::cerr << "signal_handler constructor" << std::endl;
-        ++signal_handler::s_ref_count;
-
-        signal_handler::handle_signals();
-    }
-
-    signal_handler::~signal_handler()
-    {
-        //std::cerr << "signal_handler destructor" << std::endl;
-        --signal_handler::s_ref_count;
-        if( signal_handler::s_ref_count == 0 )
-        {
-            signal_handler::unhandle_signals();
-        }
-    }
-
-    void signal_handler::add_cancelable( std::shared_ptr< scarab::cancelable > a_cancelable )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        s_cancelers.insert( std::make_pair(a_cancelable.get(), cancelable_wptr_t(a_cancelable) ) );
-        return;
-    }
-
-    void signal_handler::remove_cancelable( std::shared_ptr< scarab::cancelable > a_cancelable )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        s_cancelers.erase( a_cancelable.get() );
-        return;
-    }
-
-    void signal_handler::remove_cancelable( scarab::cancelable* a_cancelable )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        s_cancelers.erase( a_cancelable );
-        return;
-    }
-
-    void signal_handler::handle_signals()
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-
-        // we create a new logger here so that handle_signals() can be called from the signal_handler constructor during static initalization
-        LOGGER( slog_constr, "signal_handler handle_signals" );
-
-        LDEBUG( slog_constr, "Taking over signal handling for SIGABRT, SIGTERM, SIGINT, and SIGQUIT" );
-
-#ifndef _WIN32  // on a POSIX system we use sigaction
-
-        struct sigaction t_exit_error_action, t_exit_success_action;
-
-        t_exit_error_action.sa_handler = signal_handler::handle_exit_error;
-        sigemptyset(&t_exit_error_action.sa_mask);
-        t_exit_error_action.sa_flags = 0;
-
-        t_exit_success_action.sa_handler = signal_handler::handle_exit_success;
-        sigemptyset(&t_exit_success_action.sa_mask);
-        t_exit_success_action.sa_flags = 0;
-
-        // setup to handle SIGABRT
-        if( ! s_handling_sig_abrt && sigaction( SIGABRT, &t_exit_error_action, &s_old_sig_abrt_action ) != 0 )
-        {
-            LWARN( slog_constr, "Unable to setup handling of SIGABRT: abort() and unhandled exceptions will result in an unclean exit" );
-        }
-        else
-        {
-            LTRACE( slog_constr, "Handling SIGABRT (abort() and unhandled exceptions)" );
-            s_handling_sig_abrt = true;
-        }
-
-        // setup to handle SIGTERM
-        if( ! s_handling_sig_term && sigaction( SIGTERM, &t_exit_error_action, &s_old_sig_term_action ) != 0 )
-        {
-            LWARN( slog_constr, "Unable to setup handling of SIGTERM: SIGTERM will result in an unclean exit" );
-        }
-        else
-        {
-            LTRACE( slog_constr, "Handling SIGTERM" );
-            s_handling_sig_term = true;
-        }
-
-        // setup to handle SIGINT
-        if( ! s_handling_sig_int && sigaction( SIGINT, &t_exit_success_action, &s_old_sig_int_action ) != 0 )
-        {
-            LWARN( slog_constr, "Unable to setup handling of SIGINT: ctrl-c cancellation will result in an unclean exit" );
-        }
-        else
-        {
-            LTRACE( slog_constr, "Handling SIGINT (ctrl-c)" );
-            s_handling_sig_int = true;
-        }
-
-        // setup to handle SIGQUIT
-        if( ! s_handling_sig_quit && sigaction( SIGQUIT, &t_exit_success_action, &s_old_sig_quit_action ) != 0 )
-        {
-            LWARN( slog_constr, "Unable to setup handling of SIGQUIT: ctrl-\\ cancellation will result in an unclean exit" );
-        }
-        else
-        {
-            LTRACE( slog_constr, "Handling SIGQUIT (ctrl-\\)" );
-            s_handling_sig_quit = true;
-        }
-
-        if( signal(SIGPIPE, SIG_IGN) == SIG_ERR )
-        {
-            throw error() << "Unable to ignore SIGPIPE\n";
-        }
-
-#else // _WIN32; on a Windows system we use std::signal
-
-        // setup to handle SIGABRT
-        if( ! s_handling_sig_abrt )
-        {
-            auto t_sig_ret = signal( SIGABRT, signal_handler::handle_exit_error );
-            if( t_sig_ret == SIG_ERR )
-            {
-                LWARN( slog_constr, "Unable to setup handling of SIGABRT: abort() and unhandled exceptions will result in an unclean exit" );
-            }
-            else
-            {
-                s_handling_sig_abrt = true;
-                s_old_sig_abrt_handler = t_sig_ret;
-            }
-        }
-        if( s_handling_sig_abrt ) LTRACE( slog_constr, "Handling SIGABRT (abort() and unhandled exceptions)" );
-
-
-        // setup to handle SIGTERM
-        if( ! s_handling_sig_term )
-        {
-            auto t_sig_ret = signal( SIGTERM, signal_handler::handle_exit_error );
-            if( t_sig_ret == SIG_ERR )
-            {
-                LWARN( slog_constr, "Unable to setup handling of SIGTERM: SIGTERM will result in an unclean exit" );
-            }
-            else
-            {
-                s_handling_sig_term = true;
-                s_old_sig_abrt_handler = t_sig_ret;
-            }
-        }
-        if( s_handling_sig_term ) LTRACE( slog_constr, "Handling SIGTERM" );
-
-        // setup to handle SIGINT
-        if( ! s_handling_sig_int )
-        {
-            auto t_sig_ret = signal( SIGINT, signal_handler::handle_exit_error );
-            if( t_sig_ret == SIG_ERR )
-            {
-                LWARN( slog_constr, "Unable to setup handling of SIGINT: ctrl-c cancellation will result in an unclean exit" );
-            }
-            else
-            {
-                s_handling_sig_int = true;
-                s_old_sig_abrt_handler = t_sig_ret;
-            }
-        }
-        if( s_handling_sig_int ) LTRACE( slog_constr, "Handling SIGINT (ctrl-c))" );
-
-#endif
-        return;
-    }
-
-    void signal_handler::unhandle_signals()
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-
-        LDEBUG( slog, "Returning signal handling for SIGABRT, SIGTERM, SIGINT, and SIGQUIT" );
-
-#ifndef _WIN32
-
-        if( s_handling_sig_abrt && sigaction( SIGABRT, &s_old_sig_abrt_action, nullptr ) != 0 )
-        {
-            LWARN( slog, "Unable to switch SIGABRT to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_abrt = false;
-        }
-        
-        if( s_handling_sig_term && sigaction( SIGTERM, &s_old_sig_term_action, nullptr ) != 0 )
-        {
-            LWARN( slog, "Unable to switch SIGTERM to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_term = false;
-        }
-        
-        if( s_handling_sig_int && sigaction( SIGINT, &s_old_sig_int_action, nullptr ) != 0 )
-        {
-            LWARN( slog, "Unable to switch SIGINT to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_int = false;
-        }
-        
-        if( s_handling_sig_quit && sigaction( SIGQUIT, &s_old_sig_quit_action, nullptr ) != 0 )
-        {
-            LWARN( slog, "Unable to switch SIGQUIT to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_quit = false;
-        }
-
-#else // _WIN32
-
-        if( s_handling_sig_abrt && signal( SIGABRT, s_old_sig_abrt_handler ) == SIG_ERR )
-        {
-            LWARN( slog, "Unable to switch SIGABRT to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_abrt = false;
-        }
-        
-        if( s_handling_sig_term && signal( SIGTERM, s_old_sig_term_handler ) == SIG_ERR )
-        {
-            LWARN( slog, "Unable to switch SIGTERM to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_term = false;
-        }
-        
-        if( s_handling_sig_int && signal( SIGINT, s_old_sig_int_handler ) == SIG_ERR )
-        {
-            LWARN( slog, "Unable to switch SIGINT to previous handler" );
-        }
-        else
-        {
-            s_handling_sig_int = false;
-        }
-       
-#endif
-        return;
-    }
-
-    bool signal_handler::is_handling( int a_signal )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-
-        bool t_is_handled = false;
-        switch( a_signal )
-        {
-            case SIGABRT:
-                if( s_handling_sig_abrt) t_is_handled = true;
-                break;
-            case SIGTERM:
-                if( s_handling_sig_term) t_is_handled = true;
-                break;
-            case SIGINT:
-                if( s_handling_sig_int) t_is_handled = true;
-                break;
-#ifndef _WIN32
-            case SIGQUIT:
-                if( s_handling_sig_quit) t_is_handled = true;
-                break;
-#endif
-            default:
-                break;
-        }
-        return t_is_handled;
-    }
-
-    void signal_handler::reset()
-    {
-        LDEBUG( slog, "Resetting signal_handler" );
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-
-        s_exited = false;
-        s_return_code = RETURN_SUCCESS;
-        s_cancelers.clear();
-
-        signal_handler::unhandle_signals();
-        return;
-    }
-
-    [[noreturn]] void signal_handler::handle_terminate() noexcept
-    {
-        terminate( RETURN_ERROR );
-    }
-
-    void signal_handler::handle_exit_error( int a_sig )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        LERROR( slog, "Handling signal <" << a_sig << "> as an error condition; return code: " << RETURN_ERROR );
-        exit( RETURN_ERROR );
-        return;
-    }
-
-    void signal_handler::handle_exit_success( int a_sig )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        LPROG( slog, "Handling signal <" << a_sig << ">; return code: " << RETURN_SUCCESS );
-        exit( RETURN_SUCCESS );
-        return;
-    }
-
-    [[noreturn]] void signal_handler::terminate( int a_code ) noexcept
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        print_current_exception( false );
-        if( a_code > 0 )
-        {
-            print_stack_trace( false );
-        }
-        std::cerr << "Exiting abruptly" << std::endl;
-        std::_Exit( a_code );
-    }
-
-    void signal_handler::exit( int a_code )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        s_exited = true;
-        s_return_code = a_code;
-        print_current_exception( true );
-        if( a_code > 0 )
-        {
-            print_stack_trace( true );
-        }
-        cancel_all( a_code );
-        return;
-    }
-
-    void signal_handler::print_current_exception( bool a_use_logging )
-    {
-        // no mutex locking needed here
-
-        // if there's a current exception, rethrow to print out what()
-        if( auto t_exc_ptr = std::current_exception() ) 
-        { 
-            // we have an exception
-            try
-            {
-                if( a_use_logging ) { LDEBUG( slog, "Rethrowing current exception" ); }
-                else { std::cerr << "Rethrowing current exception" << std::endl; }
-                std::rethrow_exception( t_exc_ptr ); // throw to recognize the type
-            }
-            catch( const std::exception& e ) {
-                if( a_use_logging ) { LERROR( slog, "Caught unhandled exception. what(): " << e.what() ); }
-                else { std::cerr << "Caught unhandled exception. what(): " << e.what() << std::endl; }
-            }
-            catch( ... ) {
-                if( a_use_logging ) LERROR( slog, "Caught unknown (non-std::exception) & unhandled exception." )
-                else { std::cerr << "Caught unknown (non-std::exception) & unhandled exception." << std::endl; }
-            }
-        }
-        return;
-    }
-
-    void signal_handler::print_stack_trace( bool a_use_logging )
-    {
-        // no mutex locking needed here
-#ifndef _WIN32 // stack trace printing not implemented for windows
-        void* t_bt_array[50];
-        int t_size = backtrace( t_bt_array, 50 );
-
-        if( a_use_logging ) { LERROR( slog, "Backtrace returned " << t_size << " frames\n" ); }
-        else { std::cerr << "Backtrace returned " << t_size << " frames\n" << std::endl; }
-
-        char** t_messages = backtrace_symbols( t_bt_array, t_size );
-
-        std::stringstream t_bt_str;
-        for( int i = 0; i < t_size && t_messages != nullptr; ++i )
-        {
-            t_bt_str << "[bt]: (" << i << ") " << t_messages[i] << '\n';
-        }
-        if( a_use_logging ) { LERROR( slog, "Backtrace:\n" << t_bt_str.str() ); }
-        else { std::cerr << "Backtrace:\n" << t_bt_str.str() << std::endl; }
-
-        free( t_messages );
-#endif
-        return;
-    }
-
-    void signal_handler::cancel_all( int a_code )
-    {
-        std::unique_lock< std::recursive_mutex > t_lock( s_mutex );
-        LDEBUG( slog, "Canceling all cancelables" );
-
-        while( ! s_cancelers.empty() )
-        {
-            auto t_canceler_it = s_cancelers.begin();
-            if( ! t_canceler_it->second.expired() )
-            {
-                t_canceler_it->second.lock()->cancel( a_code );
-            }
-            s_cancelers.erase( t_canceler_it );
-            std::this_thread::sleep_for( std::chrono::seconds(1) );
-        }
-
-#ifdef _WIN32
-        ExitProcess( a_code );
-#endif
-
-        return;
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/utility/signal_handler.hh b/Src/Scarab/library/utility/signal_handler.hh
deleted file mode 100644
index ef25382..0000000
--- a/Src/Scarab/library/utility/signal_handler.hh
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * signal_handler.hh
- *
- *  Created on: Dec 3, 2013
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_SIGNAL_HANDLER_HH_
-#define SCARAB_SIGNAL_HANDLER_HH_
-
-#include "scarab_api.hh"
-#include "member_variables.hh"
-
-#include <memory>
-#include <mutex>
-#include <map>
-
-#ifndef _WIN32
-#include <signal.h>  // for struct sigaction, which is in signal.h but not csignal
-#endif
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-
-
-namespace scarab
-{
-    class cancelable;
-
-
-    /*!
-     @class signal_handler
-     @author N. S. Oblath
-
-     @brief Deals with cleanly exiting an application, and includes signal and std::terminate handler functions
-
-     @details
-     # Exiting and Terminating
-
-     This class differentiates between two different ways of finishing a program:
-     - Cleanly "exiting" a program, allowing threads to be canceled and memory to be cleaned up, and
-     - Unclealy "terminating" a program, which exits more-or-less immediately.
-
-     Termination occurs in situations where the program must finish immediately.  These are the situations in which
-     std::terminate is used, for example, or there are unhandled exceptions.  This can occur during execution, or even
-     during static initialization and cleanup.  Therefore only minimal global resources are assumed to be available
-     (e.g. std::cerr).  See https://akrzemi1.wordpress.com/2011/10/05/using-stdterminate/ for more information about
-     the way in which termination can be handled.  Termination can be commenced by:
-
-     - Unhandled exceptions
-     - Any other way in which std::terminate() is used (see, e.g. https://en.cppreference.com/w/cpp/error/terminate)
-     - Client code calling std::terminate() directly
-     - Client code calling signal_handler::terminate( code )
-
-     Exiting occurs in situations where cleanly shutting down is possible.  This includes both successful exiting and
-     exiting with an error condition.  signal_handler will be responsible for cancelling all threads that it knows about
-     (via add_cancelable()).  After the exit process is complete, it's the responsiblity of the program to stop execution.
-     The program can use get_exited() to check whether the exit process has been used.  Exiting can be commenced by:
-
-     - Catching SIGABRT or SIGTERM (exits with an error code)
-     - Catching SIGINT (usually ctrl-c) or SIGQUIT (usually ctrl-\) (exits with a success code)
-     - Client code calling signal_handler::exit( code )
-
-     To cleanly exit, signal_handler takes responsibility for canceling the cancelable objects that it knows about.
-     Responsibility for canceling a cancelable is given to the signal_handler using add_cancelable(), and it's taken away
-     using remove_cancelable().
-
-     # Signal Handling
-
-     To perform the tasks of exiting and terminating applications, `signal_handler` allows the user to control when signals
-     are handled, and when they aren't.  In most cases, a user will control signal handling through the existence of
-     a `signal_handler` instance.  The user should create the instance of `signal_handler` when they want `signal_handler`
-     to start handling those signals, and it should be destructed when handling the signals should cease.
-     Here are several examples of how this could be done:
-
-     1. The instance is created as a global static object at static initialization time.  Signals will be handled for the entire
-     time the application is running.
-     2. The instance is created in the `main()` function of the application and exists until the application exits.
-     3. The instance is created in some function for a specific limited time to cover a particular action.
-     This could be for the entire scope of the function, or it could be destructed when signal handling is no longer wanted.
-
-     Note that signals are handled as long as one or more instances of `signal_handler` exist.  If two instance exist, and one
-     goes out of scope, signals are still handled until the second instance is destructed.
-
-     In addition to this typical behavior, `signal_handler` includes an interface for more fine-grained control over when
-     signals are handled while the `signal_handler` exists (i.e. handle_signals(), unhandle_signals(), and is_handling()),
-     but the recommended use case is as described above, where signal handling is controled by the existence of a `signal_handler` instance.
-
-     Note that the interface for `signal_handler` uses all static functions, so there is no need to create an extra instance of
-     the class to use any part of that interface.  So the creation and destruction of instances can be used to control
-     whether or not signals are handled, and the rest of the interface can be used without an instance.
-
-     # Cancelables
-
-     This class communicates the need to exit to other objects via the \ref cancelable interface.  Simply put, a \ref cancelable object
-     can be canceled, or told to exit, asynchronously by the `signal_handler`.  Only the cancelable objects that the user wants
-     to be directly canceled by `signal_handler` should be added with add_cancelable().  In some cases that might be all of the
-     cancelable objects.  In other cases, where there's some hierarchy of cancelables, it would only be the top-level cancelables.
-
-     While add_cancelable() takes a std::shared_ptr<cancelable> as an argument, it stores only std::weak_ptr<cancelable>, and
-     claims no ownership or responsibility for the lifetime of the cancelable object.
-
-     # Manual Cancelation/Exiting/Terminating
-
-     In addition to acting automatically via handled signals, a user can manually terminate, exit, or cancel using
-     terminate(), exit(), or cancel_all(), respectively.  cancel_all() will only affect the canceled objects.
-     exit() perform a clean exit using cancel_all(), in addition to setting a return code, though it assumes the
-     application will take care of actually exiting.  And terminate() will immediately exit the application using std::_Exit().
-    */
-    class SCARAB_API signal_handler
-    {
-        public:
-            signal_handler();
-            virtual ~signal_handler();
-
-            /// Static version: add a cancelable object
-            static void add_cancelable( std::shared_ptr< cancelable > a_cancelable );
-            /// Static version: remove a cancelable object
-            static void remove_cancelable( std::shared_ptr< cancelable > a_cancelable );
-            /// Static version: remove a cancelable object with a plain pointer
-            static void remove_cancelable( cancelable* a_cancelable );
-
-            /// Remove all cancelables and signal handling
-            static void reset();
-
-            /// Start handling signals
-            static void handle_signals();
-            /// Stop handling signals
-            static void unhandle_signals();
-            /// Check if a signal is handled
-            static bool is_handling( int a_signal );
-
-            /// Handler for std::terminate -- does not cleanup memory or threads
-            [[noreturn]] static void handle_terminate() noexcept;
-
-            /// Handler for error signals -- cleanly exits
-            static void handle_exit_error( int a_sig );
-
-            /// Handler for success signals -- cleanly exits
-            static void handle_exit_success( int a_sig );
-
-            /// Main terminate function -- does not cleanup memory or threads
-            [[noreturn]] static void terminate( int a_code ) noexcept;
-
-            /// Main exit function -- cleanly exits
-            static void exit( int a_code );
-
-            /// Prints the current exception, if there is one
-            static void print_current_exception( bool a_use_logging );
-
-            /// Prints the stack trace
-            static void print_stack_trace( bool a_use_logging );
-
-            /// Asynchronous call to cancel all cancelables with the given exit code
-            static void cancel_all( int a_code );
-
-        private:
-
-            typedef std::weak_ptr< cancelable > cancelable_wptr_t;
-            // technical note: std::map<cancelable*, cancelable_wptr_t> is used instead of std::set<cancelable_wptr_t> because
-            // weak_ptr cannot be used as a key because weak_ptrs are not immutable (see, e.g. https://stackoverflow.com/a/32668849 and one of the comments therein).
-            // the raw pointer is only used as a key here.  the weak_ptr is used for accessing the cancelable.
-            typedef std::map< cancelable*, cancelable_wptr_t > cancelers;
-            typedef cancelers::const_iterator cancelers_cit_t;
-            typedef cancelers::iterator cancelers_it_t;
-
-            static cancelers s_cancelers;
-            static std::recursive_mutex s_mutex;
-
-        public:
-            mv_accessible_static_noset( int, ref_count );
-
-            mv_accessible_static_noset( bool, exited );
-            mv_accessible_static( int, return_code );
-
-            mv_accessible_static_noset( bool, handling_sig_abrt );
-            mv_accessible_static_noset( bool, handling_sig_term );
-            mv_accessible_static_noset( bool, handling_sig_int );
-            mv_accessible_static_noset( bool, handling_sig_quit );
-
-#ifndef _WIN32
-            mv_referrable_static( struct sigaction, old_sig_abrt_action );
-            mv_referrable_static( struct sigaction, old_sig_term_action );
-            mv_referrable_static( struct sigaction, old_sig_int_action );
-            mv_referrable_static( struct sigaction, old_sig_quit_action );
-#else // _WIN32
-            typedef void (*handler_t)(int);
-            mv_referrable_static( handler_t, old_sig_abrt_handler );
-            mv_referrable_static( handler_t, old_sig_term_handler );
-            mv_referrable_static( handler_t, old_sig_int_handler );
-            mv_referrable_static( handler_t, old_sig_quit_handler );
-#endif
-    };
-
-} /* namespace scarab */
-#endif /* SCARAB_SIGNAL_HANDLER_HH_ */
diff --git a/Src/Scarab/library/utility/singleton.hh b/Src/Scarab/library/utility/singleton.hh
deleted file mode 100644
index 6da50fb..0000000
--- a/Src/Scarab/library/utility/singleton.hh
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * singleton.hh
- *
- *  Created on: Nov 7, 2011
- *      Author: nsoblath
- */
-
-#ifndef SCARAB_SINGLETON_HH_
-#define SCARAB_SINGLETON_HH_
-
-#include "destroyer.hh"
-#include "error.hh"
-
-#include <cstddef>
-#include <mutex>
-
-namespace scarab
-{
-    /*!
-     \def allow_singleton_access( class_name )
-     Gives friend access to your class from scarab::singleton< class_name > and scarab::destroyer< class_name > 
-     so that those classes can control the life of your singleton class.
-    */
-#define allow_singleton_access( class_name ) \
-    friend class scarab::singleton< class_name >; \
-    friend class scarab::destroyer< class_name >;
-
-    /*!
-      @class singleton
-      @author N.S. Oblath
-      @brief Base class that turns a class into a singleton
-
-      @details
-      To use:
-        1. Inherit your class from singleton< your_class >
-        2. Make your constructor and destructor protected (or private)
-        3. Add the `allow_singleton_access( your_class )` macro to your class definition to allow the base classes to access your class
-
-      The mutex f_mutex provides thread safety for creation and destruction of an instance of the singleton.  It's available to the 
-      derived class for thread-safe access to the object in general.
-    */
-    template< class x_type >
-    class singleton
-    {
-        public:
-            static x_type* get_instance();
-            static void kill_instance();
-
-            template< class... x_args >
-            static x_type* create_instance( x_args... args );
-
-        private:
-            static void construct_instance();
-            static void delete_instance();
-
-        private:
-            static x_type* f_instance;
-            static destroyer< x_type > f_destroyer;
-
-        protected:
-            static std::mutex f_mutex;
-
-        protected:
-            singleton();
-
-            friend class destroyer< x_type >;
-            ~singleton();
-    };
-
-    template< class x_type >
-    x_type* singleton< x_type >::f_instance = nullptr;
-
-    template< class x_type >
-    destroyer< x_type > singleton< x_type >::f_destroyer;
-
-    template< class x_type >
-    std::mutex singleton< x_type >::f_mutex;
-
-    template< class x_type >
-    x_type* singleton< x_type >::get_instance()
-    {
-        if( f_instance == nullptr )
-        {
-            std::unique_lock< std::mutex > t_lock( f_mutex );
-            construct_instance();
-        }
-        return f_instance;
-    }
-
-    template< class x_type >
-    void singleton< x_type >::kill_instance()
-    {
-        if( f_instance != nullptr )
-        {
-            std::unique_lock< std::mutex > t_lock( f_mutex );
-            delete_instance();
-        }
-        return;
-    }
-
-    template< class x_type >
-    template< class... x_args >
-    x_type* singleton< x_type >::create_instance( x_args... args )
-    {
-        if( f_instance != nullptr )
-        {
-            throw error() << "Instance already exists; create_instance can only be called before the instance exists";
-        }
-        std::unique_lock< std::mutex > t_lock( f_mutex );
-        f_instance = new x_type( args... );
-        f_destroyer.set_doomed( f_instance );
-        return f_instance;
-    }
-
-    template< class x_type >
-    void singleton< x_type >::construct_instance()
-    {
-        if( f_instance == nullptr )
-        {
-            f_instance = new x_type();
-            f_destroyer.set_doomed( f_instance );
-        }
-    }
-
-    template< class x_type >
-    void singleton< x_type >::delete_instance()
-    {
-        if( f_instance != nullptr )
-        {
-            delete f_instance;
-            f_instance = nullptr;
-            f_destroyer.set_doomed( nullptr );
-        }
-    }
-
-    template< class x_type >
-    singleton< x_type >::singleton()
-    {
-    }
-    template< class x_type >
-    singleton< x_type >::~singleton()
-    {
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_SINGLETON_HH_ */
diff --git a/Src/Scarab/library/utility/thread_singleton.hh b/Src/Scarab/library/utility/thread_singleton.hh
deleted file mode 100644
index 5c85643..0000000
--- a/Src/Scarab/library/utility/thread_singleton.hh
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * thread_local_singleton.hh
- *
- *  Created on: Dec 31, 2019
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_THREAD_SINGLETON_HH_
-#define SCARAB_THREAD_SINGLETON_HH_
-
-#include "destroyer.hh"
-#include "error.hh"
-
-#include <cstddef>
-#include <mutex>
-
-namespace scarab
-{
-    /*!
-     \def allow_thread_singleton_access( class_name )
-     Gives friend access to your class from scarab::singleton< class_name > and scarab::destroyer< class_name > 
-     so that those classes can control the life of your singleton class.
-    */
-#define allow_thread_singleton_access( class_name ) \
-    friend class scarab::thread_singleton< class_name >; \
-    friend class scarab::destroyer< class_name >;
-
-    /*!
-      @class thread_singleton
-      @author N.S. Oblath
-      @brief Base class that turns a class into a thread-local singleton
-
-      @details
-      A thread-local singleton is similar to a singleton except that a different instance exists in each thread.
-
-      To use:
-        1. Inherit your class from thread_singleton< your_class >
-        2. Make your constructor and destructor protected (or private)
-        3. Add the `allow_thread_singleton_access( your_class )` macro to your class definition to allow the base classes to access your class
-
-      The mutex f_mutex provides thread safety for creation and destruction of an instance of the thread_singleton.  It's available to the 
-      derived class for thread-safe access to the object in general.
-    */
-    template< class x_type >
-    class thread_singleton
-    {
-        public:
-            static x_type* get_instance();
-            static void kill_instance();
-
-            template< class... x_args >
-            static x_type* create_instance( x_args... args );
-
-        private:
-            static void construct_instance();
-            static void delete_instance();
-
-        private:
-            thread_local static x_type* f_instance;
-            thread_local static destroyer< x_type > f_destroyer;
-
-        protected:
-            thread_local static std::mutex f_mutex;
-
-        protected:
-            thread_singleton();
-
-            friend class destroyer< x_type >;
-            ~thread_singleton();
-    };
-
-    template< class x_type >
-    thread_local x_type* thread_singleton< x_type >::f_instance = nullptr;
-
-    template< class x_type >
-    thread_local destroyer< x_type > thread_singleton< x_type >::f_destroyer;
-
-    template< class x_type >
-    thread_local std::mutex thread_singleton< x_type >::f_mutex;
-
-    template< class x_type >
-    x_type* thread_singleton< x_type >::get_instance()
-    {
-        if( f_instance == nullptr )
-        {
-            std::unique_lock< std::mutex > t_lock( f_mutex );
-            construct_instance();
-        }
-        return f_instance;
-    }
-
-    template< class x_type >
-    void thread_singleton< x_type >::kill_instance()
-    {
-        if( f_instance != nullptr )
-        {
-            std::unique_lock< std::mutex > t_lock( f_mutex );
-            delete_instance();
-        }
-        return;
-    }
-
-    template< class x_type >
-    template< class... x_args >
-    x_type* thread_singleton< x_type >::create_instance( x_args... args )
-    {
-        if( f_instance != nullptr )
-        {
-            throw error() << "Instance already exists; create_instance can only be called before the instance exists";
-        }
-        std::unique_lock< std::mutex > t_lock( f_mutex );
-        f_instance = new x_type( args... );
-        f_destroyer.set_doomed( f_instance );
-        return f_instance;
-    }
-
-    template< class x_type >
-    void thread_singleton< x_type >::construct_instance()
-    {
-        if( f_instance == nullptr )
-        {
-            f_instance = new x_type();
-            f_destroyer.set_doomed( f_instance );
-        }
-    }
-
-    template< class x_type >
-    void thread_singleton< x_type >::delete_instance()
-    {
-        if( f_instance != nullptr )
-        {
-            delete f_instance;
-            f_instance = nullptr;
-            f_destroyer.set_doomed( nullptr );
-        }
-    }
-
-    template< class x_type >
-    thread_singleton< x_type >::thread_singleton()
-    {
-    }
-    template< class x_type >
-    thread_singleton< x_type >::~thread_singleton()
-    {
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_THREAD_SINGLETON_HH_ */
diff --git a/Src/Scarab/library/utility/time.cc b/Src/Scarab/library/utility/time.cc
deleted file mode 100644
index 1e82c36..0000000
--- a/Src/Scarab/library/utility/time.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * time.cc
- *
- *  Created on: Oct 29, 2013
- *      Author: nsoblath
- */
-
-
-#define SCARAB_API_EXPORTS
-
-#include "time.hh"
-
-#include "date.h"
-
-namespace scarab
-{
-
-    // Combined date & time, according to the ISO 8601 standard: e.g. 2015-01-31T22:35:58Z
-    SCARAB_API char date_time_format[] = "%Y-%m-%dT%H:%M:%SZ";
-
-    SCARAB_API std::string get_formatted_now()
-    {
-        using namespace std::chrono;
-        return date::format(scarab::date_time_format, time_point_cast<microseconds>(system_clock::now()));
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/utility/time.hh b/Src/Scarab/library/utility/time.hh
deleted file mode 100644
index 9f0de17..0000000
--- a/Src/Scarab/library/utility/time.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef SCARAB_TIME_HH_
-#define SCARAB_TIME_HH_
-
-#include "scarab_api.hh"
-
-#include <string>
-
-namespace scarab
-{
-
-    extern SCARAB_API char date_time_format[];
-
-    SCARAB_API std::string get_formatted_now();
-
-} /* namespace scarab */
-
-#endif // SCARAB_TIME_HH_
diff --git a/Src/Scarab/library/utility/typename.cc b/Src/Scarab/library/utility/typename.cc
deleted file mode 100644
index 03e5b50..0000000
--- a/Src/Scarab/library/utility/typename.cc
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * typename.cc
- *
- *  Created on: Feb 10, 2016
- *      Author: nsoblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "typename.hh"
-
-#ifdef __GNUG__
-#include <cstdlib>
-#include <memory>
-#include <cxxabi.h>
-#endif
-
-
-namespace scarab
-{
-
-#ifdef __GNUG__
-#ifdef USE_CPP11
-
-    std::string demangle( const char* a_name )
-    {
-
-        int t_status = -4; // some arbitrary value to eliminate the compiler warning
-
-        std::unique_ptr< char, void(*)( void* ) > res( abi::__cxa_demangle( a_name, NULL, NULL, &t_status ), std::free );
-
-        return ( t_status==0 ) ? res.get() : a_name ;
-    }
-
-#else // USE_CPP11
-
-    struct handle
-    {
-        char* f_ptr;
-        handle( char* a_ptr ) : f_ptr( a_ptr ) {}
-        ~handle() { std::free( f_ptr ); }
-    };
-
-
-    std::string demangle( const char* a_name )
-    {
-
-        int t_status = -4; // some arbitrary value to eliminate the compiler warning
-
-        handle result( abi::__cxa_demangle( a_name, NULL, NULL, &t_status ) );
-
-        return ( t_status==0 ) ? result.f_ptr : a_name ;
-    }
-
-#endif // USE_CPP11
-
-#else // __GNUG__
-
-    // does nothing if not g++
-    std::string demangle( const char* a_name ) {
-        return a_name;
-    }
-
-#endif // __GNUG__
-
-}
diff --git a/Src/Scarab/library/utility/typename.hh b/Src/Scarab/library/utility/typename.hh
deleted file mode 100644
index 136871b..0000000
--- a/Src/Scarab/library/utility/typename.hh
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * typename.hh
- *
- *  Created on: Feb 10, 2016
- *      Author: nsoblath
- *
- *  Based on: http://stackoverflow.com/a/4541470
- */
-
-#ifndef SCARAB_UTILITY_TYPENAME_HH_
-#define SCARAB_UTILITY_TYPENAME_HH_
-
-#include "scarab_api.hh"
-
-#include <string>
-#include <typeinfo>
-
-namespace scarab
-{
-
-    SCARAB_API std::string demangle( const char* a_name );
-
-    template <class x_type>
-    SCARAB_API std::string type( const x_type& a_param )
-    {
-        return demangle( typeid(a_param).name() );
-    }
-
-} /* namespace scarab */
-
-
-#endif /* SCARAB_UTILITY_TYPENAME_HH_ */
diff --git a/Src/Scarab/library/utility/unique_typelist.hh b/Src/Scarab/library/utility/unique_typelist.hh
deleted file mode 100644
index 7f86ffc..0000000
--- a/Src/Scarab/library/utility/unique_typelist.hh
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * unique_typelist.hh
- *
- *  Created on: Oct 3, 2018
- *      Author: N.S. Oblath
- *
- *  This file allows you to create type lists with unique elements.
- *
- *  The typelist itself is a standard type list, and the uniqueness of the elements is
- *  enforced as elements are appended using `unique_append`.
- *
- *  Test code is commented out below as an example of how to use the append functionality.
- *
- *  The current version works for types; a version that made integer lists was explored but a problem was found
- *  that didn't have an obvious work-around.  That path was abandoned because the type version can work for
- *  integers using std::integer_constant.  The integer code is commented out below in case a work-around can be found.
- */
-
-#ifndef SCARAB_UNIQUE_TYPELIST_HH_
-#define SCARAB_UNIQUE_TYPELIST_HH_
-
-#include <type_traits>
-
-namespace scarab
-{
-    // unique type check
-    template< typename T, typename FirstType, typename... OtherTypes  >
-    struct is_unique_impl;
-
-    template< typename T, typename FirstType >
-    struct is_unique_impl< T, FirstType >
-    {
-        static const bool value = ! std::is_same< T, FirstType >::value;
-    };
-
-    template< typename T, typename FirstType, typename... OtherTypes  >
-    struct is_unique_impl
-    {
-        static const bool value = std::is_same< T, FirstType >::value ? false : is_unique_impl< T, OtherTypes... >::value;
-    };
-
-    template< typename T, typename FirstType, typename... OtherTypes >
-    struct is_unique : std::integral_constant< bool, is_unique_impl< T, FirstType, OtherTypes... >::value >
-    {};
-
-    // type list
-    template< typename... Types >
-    struct type_list {};
-
-    // appending
-    template< typename T, typename... ListItems >
-    struct unique_append_impl;
-
-    template< typename T >
-    struct unique_append_impl< T, type_list<> >
-    {
-        using type = type_list< T >;
-    };
-
-    template< typename T, typename... ListItems >
-    struct unique_append_impl< T, type_list< ListItems... > >
-    {
-        static_assert(is_unique< T, ListItems... >::value, "Non-unique type found");
-        using type = type_list< T, ListItems... >;
-    };
-
-    template< typename T, typename List >
-    using unique_append = typename unique_append_impl< T, List >::type;
-
-    // for debug printing
-    //template< typename T > struct debug_t;
-
-    // test implementation
-/*    // this should work
-    using test_list_void = type_list<>;
-#define TEST_LIST test_list_void
-
-    typedef std::integral_constant< unsigned, 0 > zero_t;
-    using test_list_zero_t = unique_append< zero_t, TEST_LIST >;
-#undef TEST_LIST
-#define TEST_LIST test_list_zero_t
-
-    typedef std::integral_constant< unsigned, 1 > one_t;
-    using test_list_one_t = unique_append< one_t, TEST_LIST >;
-#undef TEST_LIST
-#define TEST_LIST test_list_one_t
-*/
-/*    // this should fail
-    typedef std::integral_constant< unsigned, 1 > duplicate_t;
-    using test_list_duplicate_t = unique_append< duplicate_t, TEST_LIST >;
-#undef TEST_LIST
-#define TEST_LIST test_list_duplicate_t
-    //debug_t< TEST_LIST > d;
-*/
-
-
-
-    // Integer lists
-    // Unfortunately this section doesn't quite work
-    // The problem comes in the partial specialization:  struct append_impl_int< T, int_list< ListItems... > >
-    // This works when the unspecialized template uses a type parameter pack, but not when it uses an int parameter pack.
-    // The error I get is:
-    //   error: template argument for non-type template parameter must be an expression
-/*
-    // unique int check
-    template< int T, int FirstType, int... OtherTypes  >
-    struct is_unique_impl_int;
-
-    template< int T, int FirstType >
-    struct is_unique_impl_int< T, FirstType >
-    {
-        static const bool value =  T != FirstType;
-    };
-
-    template< int T, int FirstType, int... OtherTypes  >
-    struct is_unique_impl_int
-    {
-        static const bool value = T == FirstType ? false : is_unique_impl_int< T, OtherTypes... >::value;
-    };
-
-    template< int T, int FirstType, int... OtherTypes >
-    struct is_unique_int : std::integral_constant< bool, is_unique_impl_int< T, FirstType, OtherTypes... >::value >
-    {};
-
-    // int list
-    template< int... Types >
-    struct int_list {};
-
-    // appending
-    template< int T, int... ListItems >
-    struct unique_append_impl_int;
-
-    template< int T >
-    struct unique_append_impl_int< T >
-    {
-        using type = int_list< T >;
-    };
-
-    template< int T, int... ListItems >
-    struct unique_append_impl_int< T, int_list< ListItems... > >
-    {
-        static_assert(is_unique_int< T, ListItems... >::value, "Non-unique return code found");
-        using type = int_list< T, ListItems... >;
-    };
-
-    template< int T, typename List >
-    using unique_append_int = typename unique_append_impl_int< T, List >::type;
-
-
-    // test implementation
-
-    using test_list_void_int = list_int<>;
-#define TEST_LIST_INT test_list_void_int
-
-    const static int zero_int = 0;
-    using test_list_zero_int = append_int< zero_int, TEST_LIST_INT >;
-#undef TEST_LIST_INT
-#define TEST_LIST_INT test_list_zero_int
-
-    const static int one_int = 1;
-    using test_list_one_int = unique_append_int< one_int, TEST_LIST_INT >;
-#undef TEST_LIST_INT
-#define TEST_LIST_INT test_list_one_int
-*/
-/*    // this should fail
-    const static int duplicate_int = 1;
-    using test_list_duplicate_t = unique_append< duplicate_int, TEST_LIST >;
-#undef TEST_LIST
-#define TEST_LIST test_list_duplicate_int
-    //debug_t< TEST_LIST > d;
-*/
-
-}
-
-#endif /* SCARAB_UNIQUE_TYPELIST_HH_ */
diff --git a/Src/Scarab/library/version/CMakeLists.txt b/Src/Scarab/library/version/CMakeLists.txt
deleted file mode 100644
index 02f921e..0000000
--- a/Src/Scarab/library/version/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# CMakeLists.txt for Scarab/library/version
-# Author: N.S. Oblath
-# Created: Sep 26, 2019
-
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-set( Scarab_HEADERS ${Scarab_HEADERS}
-    ${dir}/scarab_version.hh
-    ${dir}/version_ifc.hh
-    ${dir}/version_semantic.hh
-    ${dir}/version_wrapper.hh
-    PARENT_SCOPE 
-)
-
-set( Scarab_SOURCES ${Scarab_SOURCES}
-    ${dir}/version_ifc.cc
-    ${dir}/version_semantic.cc
-) # not PARENT_SCOPE so that we can set it to that scope in the next set command
-
-configure_file( ${dir}/scarab_version.cc.in ${CMAKE_CURRENT_BINARY_DIR}/scarab_version.cc )
-set( Scarab_SOURCES
-    ${Scarab_SOURCES}
-    ${CMAKE_CURRENT_BINARY_DIR}/scarab_version.cc
-    PARENT_SCOPE )
-    
\ No newline at end of file
diff --git a/Src/Scarab/library/version/scarab_version.cc.in b/Src/Scarab/library/version/scarab_version.cc.in
deleted file mode 100644
index 859382d..0000000
--- a/Src/Scarab/library/version/scarab_version.cc.in
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * scarab_version.cc
- *
- *  Created on: Mar 21, 2014
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "scarab_version.hh"
-
-#include "macros.hh"
-
-namespace scarab
-{
-
-    version::version() :
-            version_semantic()
-    {
-        f_major_ver = @Scarab_VERSION_MAJOR@;
-        f_minor_ver = @Scarab_VERSION_MINOR@;
-        f_patch_ver = @Scarab_VERSION_PATCH@;
-        f_version = TOSTRING(@Scarab_VERSION@);
-        f_package = TOSTRING(@Scarab_PACKAGE_NAME@);
-        f_commit = TOSTRING(@Scarab_GIT_COMMIT@);
-    }
-
-    version::~version()
-    {
-    }
-
-} /* namespace scarab */
-
-
diff --git a/Src/Scarab/library/version/scarab_version.hh b/Src/Scarab/library/version/scarab_version.hh
deleted file mode 100644
index 06ac420..0000000
--- a/Src/Scarab/library/version/scarab_version.hh
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * scarab_version.hh
- *
- *  Created on: Mar 20, 2013
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_VERSION_HH_
-#define SCARAB_VERSION_HH_
-
-#include "version_semantic.hh"
-    
-namespace scarab
-{
-    
-    class SCARAB_API version : public version_semantic
-    {
-        public:
-            version();
-            ~version();
-    };
-
-} // namespace scarab
-
-#endif /* SCARAB_VERSION_HH_ */
diff --git a/Src/Scarab/library/version/version_ifc.cc b/Src/Scarab/library/version/version_ifc.cc
deleted file mode 100644
index 6a3e9c7..0000000
--- a/Src/Scarab/library/version/version_ifc.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * version_ifc.cc
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "version_ifc.hh"
-
-namespace scarab
-{
-    version_ifc::version_ifc()
-    {}
-
-    version_ifc::version_ifc( const version_ifc& )
-    {}
-
-    version_ifc::~version_ifc()
-    {}
-
-    version_ifc& version_ifc::operator=( const version_ifc& )
-    {
-        return *this;
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/version/version_ifc.hh b/Src/Scarab/library/version/version_ifc.hh
deleted file mode 100644
index bde3d95..0000000
--- a/Src/Scarab/library/version/version_ifc.hh
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * version_ifc.hh
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_VERSION_IFC_HH_
-#define SCARAB_VERSION_IFC_HH_
-
-#include "scarab_api.hh"
-
-#include <string>
-
-namespace scarab
-{
-
-    class SCARAB_API version_ifc
-    {
-        public:
-            version_ifc();
-            version_ifc( const version_ifc& );
-            virtual ~version_ifc();
-
-            version_ifc& operator=( const version_ifc& );
-
-            virtual unsigned major_version() const = 0;
-            virtual unsigned minor_version() const = 0;
-            virtual unsigned patch_version() const = 0;
-
-            virtual const std::string& version_str() const = 0;
-
-            virtual const std::string& package() const = 0;
-            virtual const std::string& commit() const = 0;
-
-            virtual const std::string& exe_name() const = 0;
-            virtual const std::string& hostname() const = 0;
-            virtual const std::string& username() const = 0;
-
-            virtual std::string version_info_string() const = 0;
-    };
-
-} /* namespace scarab */
-
-#endif /* SCARAB_VERSION_IFC_HH_ */
diff --git a/Src/Scarab/library/version/version_semantic.cc b/Src/Scarab/library/version/version_semantic.cc
deleted file mode 100644
index d446127..0000000
--- a/Src/Scarab/library/version/version_semantic.cc
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * version_semantic.cc
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- */
-
-#define SCARAB_API_EXPORTS
-
-#include "version_semantic.hh"
-
-#include "logger.hh"
-#include "path.hh"
-
-#include <sstream>
-
-#ifdef _WIN32
-#include <Windows.h> // for extracting the exe name, gethostname and GetUserName
-#elif __APPLE__
-#include <mach-o/dyld.h> // for extracting the exe name
-#include <unistd.h> // for gethostname and getlogin_r
-#include <pwd.h> // for struct passwd
-#elif __linux
-#include <unistd.h> // for readlink, gethostname and getlogin_r
-#include <pwd.h> // for struct passwd
-#endif
-
-using std::string;
-
-namespace scarab
-{
-    LOGGER( slog, "version_semantic" );
-
-    char version_semantic::s_delimeter = '.';
-
-    version_semantic::version_semantic() :
-            version_ifc(),
-            f_major_ver(),
-            f_minor_ver(),
-            f_patch_ver(),
-            f_version(),
-            f_package(),
-            f_commit(),
-            f_exe_name(),
-            f_hostname(),
-            f_username()
-    {
-        update_exe_host_user();
-    }
-
-    version_semantic::version_semantic( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver ) :
-            version_ifc(),
-            f_major_ver( a_maj_ver ),
-            f_minor_ver( a_min_ver ),
-            f_patch_ver( a_patch_ver ),
-            f_version(),
-            f_package(),
-            f_commit(),
-            f_exe_name(),
-            f_hostname(),
-            f_username()
-    {
-        combine( a_maj_ver, a_min_ver, a_patch_ver );
-        update_exe_host_user();
-    }
-
-    version_semantic::version_semantic( const std::string& a_ver ) :
-            version_ifc(),
-            f_major_ver( 0 ),
-            f_minor_ver( 0 ),
-            f_patch_ver( 0 ),
-            f_version( a_ver ),
-            f_package(),
-            f_commit(),
-            f_exe_name(),
-            f_hostname(),
-            f_username()
-    {
-        parse( a_ver );
-        update_exe_host_user();
-    }
-
-    version_semantic::version_semantic( const version_semantic& a_orig ) :
-            version_ifc(),
-            f_major_ver( a_orig.f_major_ver ),
-            f_minor_ver( a_orig.f_minor_ver ),
-            f_patch_ver( a_orig.f_patch_ver ),
-            f_version( a_orig.f_version ),
-            f_package( a_orig.f_package ),
-            f_commit( a_orig.f_commit ),
-            f_exe_name( a_orig.f_exe_name ),
-            f_hostname( a_orig.f_hostname ),
-            f_username( a_orig.f_username )
-    {
-    }
-
-    version_semantic::~version_semantic()
-    {
-    }
-
-    version_semantic& version_semantic::operator=( const version_semantic& a_orig )
-    {
-        this->version_ifc::operator=( a_orig );
-        f_major_ver = a_orig.f_major_ver;
-        f_minor_ver = a_orig.f_minor_ver;
-        f_patch_ver = a_orig.f_patch_ver;
-        f_version = a_orig.f_version;
-        f_package = a_orig.f_package;
-        f_commit = a_orig.f_commit;
-        f_exe_name = a_orig.f_exe_name;
-        f_hostname = a_orig.f_hostname;
-        f_username = a_orig.f_username;
-        return *this;
-    }
-
-    bool version_semantic::operator<( const version_semantic& a_other )
-    {
-        if( f_major_ver < a_other.f_major_ver ) return true;
-        if( f_major_ver > a_other.f_major_ver ) return false;
-        if( f_minor_ver < a_other.f_minor_ver ) return true;
-        if( f_minor_ver > a_other.f_minor_ver ) return false;
-        if( f_patch_ver < a_other.f_patch_ver ) return true;
-        return false;
-    }
-
-    bool version_semantic::operator==( const version_semantic& a_other )
-    {
-        return f_major_ver == a_other.f_major_ver &&
-               f_minor_ver == a_other.f_minor_ver &&
-               f_patch_ver == a_other.f_patch_ver;
-    }
-
-    bool version_semantic::operator>( const version_semantic& a_other )
-    {
-        if( f_major_ver > a_other.f_major_ver ) return true;
-        if( f_major_ver < a_other.f_major_ver ) return false;
-        if( f_minor_ver > a_other.f_minor_ver ) return true;
-        if( f_minor_ver < a_other.f_minor_ver ) return false;
-        if( f_patch_ver > a_other.f_patch_ver ) return true;
-        return false;
-    }
-
-    bool version_semantic::parse( const std::string& a_ver )
-    {
-        if( a_ver.empty() || a_ver == "unknown" )
-        {
-            f_major_ver = 0;
-            f_minor_ver = 0;
-            f_patch_ver = 0;
-            f_version = a_ver;
-            return true;
-        }
-
-        size_t t_start = 0;
-        if( a_ver[0] == 'v' )
-        {
-            t_start = 1;
-        }
-        size_t t_delim_pos_1 = a_ver.find( s_delimeter, 0 );
-        if( t_delim_pos_1 == std::string::npos )
-        {
-            LERROR( slog, "version string <" << a_ver << "> is not in the right format (did not find first delimeter)" );
-            return false;
-        }
-        std::stringstream t_maj_ver_str;
-        t_maj_ver_str << a_ver.substr( t_start, t_delim_pos_1 );
-
-        size_t t_delim_pos_2 = a_ver.find( s_delimeter, t_delim_pos_1 + 1 );
-        if( t_delim_pos_2 == std::string::npos )
-        {
-            LERROR( slog, "version string <" << a_ver << "> is not in the right format (did not find second delimeter)" );
-            return false;
-        }
-        std::stringstream t_min_ver_str;
-        t_min_ver_str << a_ver.substr(t_delim_pos_1 + 1, t_delim_pos_2 );
-
-        std::stringstream t_patch_ver;
-        t_patch_ver << a_ver.substr( t_delim_pos_2 + 1 );
-
-        t_maj_ver_str >> f_major_ver;
-        t_min_ver_str >> f_minor_ver;
-        t_patch_ver >> f_patch_ver;
-        f_version = a_ver;
-
-        return true;
-    }
-
-    bool version_semantic::combine( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver )
-    {
-        std::stringstream t_ver_str;
-        t_ver_str << a_maj_ver << s_delimeter << a_min_ver << s_delimeter << a_patch_ver;
-        f_version = t_ver_str.str();
-        return true;
-    }
-
-    bool version_semantic::update_exe_host_user()
-    {
-        const size_t t_bufsize = 1024;
-
-        // Username
-#ifdef _WIN32
-        char t_username_buf[ t_bufsize ];
-        DWORD t_bufsize_win = t_bufsize;
-        if( GetUserName( t_username_buf, &t_bufsize_win ) )
-        {
-            f_username = string( t_username_buf );
-        }
-        else
-        {
-#else
-        //if( getlogin_r( t_username_buf, t_bufsize ) == 0 )
-        passwd* t_passwd = getpwuid( getuid() );
-        if( t_passwd != nullptr )
-        {
-            f_username = string( t_passwd->pw_name );
-        }
-        else
-        {
-            LWARN( slog, "Error reported while getting passwd info: " << strerror( errno ) );
-#endif
-            LWARN( slog, "Unable to get the username" );
-        }
-
-        // Hostname
-        char t_hostname_buf[ t_bufsize ];
-#ifdef _WIN32
-        WSADATA wsaData;
-        WSAStartup( MAKEWORD( 2, 2 ), &wsaData );
-#endif
-        // gethostname is the same on posix and windows
-        if( gethostname( t_hostname_buf, t_bufsize ) == 0 )
-        {
-            f_hostname = string( t_hostname_buf );
-        }
-        else
-        {
-            LWARN( slog, "Unable to get the hostname" );
-        }
-#ifdef _WIN32
-        WSACleanup();
-#endif
-
-        // name of executable
-        //f_exe_name = t_parser.get_value( t_name_exe, f_exe_name );
-#ifdef _WIN32
-        TCHAR t_exe_buf[ MAX_PATH ];
-        if( ! GetModuleFileName( NULL, t_exe_buf, MAX_PATH ) )
-#elif __APPLE__
-        char t_exe_buf[ 2048 ];
-        uint32_t t_exe_bufsize = sizeof( t_exe_buf );
-        if( _NSGetExecutablePath( t_exe_buf, &t_exe_bufsize ) != 0 )
-#elif __linux
-        const size_t t_exe_bufsize = 2048;
-        char t_exe_buf[ t_exe_bufsize ];
-        ssize_t t_exe_name_len = readlink( "/proc/self/exe", t_exe_buf, t_exe_bufsize );
-        if( t_exe_name_len >= 0 )
-        {
-            t_exe_buf[t_exe_name_len] = '\0';
-        }
-        else
-        //if( readlink( "/proc/self/exe", t_exe_buf, t_exe_bufsize ) < 0 )
-#endif
-        {
-            LWARN( slog, "Could not retrieve executable file name" );
-#ifdef __APPLE__
-            LWARN( slog, "Executable name buffer is too small; needs size %u\n" << t_bufsize );
-#endif
-        }
-        f_exe_name = string( t_exe_buf );
-
-        return true;
-    }
-
-    std::string version_semantic::version_info_string() const
-    {
-        std::stringstream t_info_stream;
-        path t_exe_path( f_exe_name );
-        t_info_stream << "Executable: " << t_exe_path.filename() << '\n';
-        t_info_stream << "Location: " << t_exe_path.parent_path() << '\n';
-        t_info_stream << "Built with " << f_package << " version " << f_version << '\n';
-        t_info_stream << "Git commit: " << f_commit;
-        std::string t_version_info( t_info_stream.str() );
-        return t_version_info;
-    }
-
-} /* namespace scarab */
diff --git a/Src/Scarab/library/version/version_semantic.hh b/Src/Scarab/library/version/version_semantic.hh
deleted file mode 100644
index b67415a..0000000
--- a/Src/Scarab/library/version/version_semantic.hh
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * version_semantic.hh
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_VERSION_SEMANTIC_HH_
-#define SCARAB_VERSION_SEMANTIC_HH_
-
-#include "version_ifc.hh"
-
-#include "member_variables.hh"
-
-#include <memory>
-
-namespace scarab
-{
-
-    class SCARAB_API version_semantic : public version_ifc
-    {
-        public:
-            version_semantic();
-            version_semantic( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver );
-            version_semantic( const std::string& a_ver );
-            version_semantic( const version_semantic& a_orig );
-            ~version_semantic();
-
-            version_semantic& operator=( const version_semantic& a_orig );
-
-            /// Less-than operator to compare version information only
-            bool operator<( const version_semantic& a_other );
-            /// Equality operator to compare version information only
-            bool operator==( const version_semantic& a_other );
-            /// Greater-than operator to compare version information only
-            bool operator>( const version_semantic& a_other );
-
-            virtual unsigned major_version() const;
-            virtual unsigned minor_version() const;
-            virtual unsigned patch_version() const;
-
-            virtual const std::string& version_str() const;
-
-            virtual std::string version_info_string() const;
-
-        public:
-            bool parse( const std::string& a_ver );
-
-            bool combine( unsigned a_maj_ver, unsigned a_min_ver, unsigned a_patch_ver );
-
-            bool update_exe_host_user();
-
-        protected:
-            static char s_delimeter;
-
-            unsigned f_major_ver;
-            unsigned f_minor_ver;
-            unsigned f_patch_ver;
-            std::string f_version;
-
-            mv_referrable( std::string, package );
-            mv_referrable( std::string, commit );
-
-            mv_referrable( std::string, exe_name );
-            mv_referrable( std::string, hostname );
-            mv_referrable( std::string, username );
-    };
-
-    typedef std::shared_ptr< version_semantic > version_semantic_ptr_t;
-
-
-    inline unsigned version_semantic::major_version() const
-    {
-        return f_major_ver;
-    }
-    inline unsigned version_semantic::minor_version() const
-    {
-        return f_minor_ver;
-    }
-    inline unsigned version_semantic::patch_version() const
-    {
-        return f_patch_ver;
-    }
-
-    inline const std::string& version_semantic::version_str() const
-    {
-        return f_version;
-    }
-
-} /* namespace scarab */
-
-#endif /* SCARAB_VERSION_SEMANTIC_HH_ */
diff --git a/Src/Scarab/library/version/version_wrapper.hh b/Src/Scarab/library/version/version_wrapper.hh
deleted file mode 100644
index 2c9f286..0000000
--- a/Src/Scarab/library/version/version_wrapper.hh
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * version_wrapper.hh
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_VERSION_WRAPPER_HH_
-#define SCARAB_VERSION_WRAPPER_HH_
-
-#include "scarab_version.hh"
-
-#include "singleton.hh"
-
-namespace scarab
-{
-    class SCARAB_API version_wrapper : public singleton< version_wrapper >, public version_ifc
-    {
-        protected:
-            friend class singleton< version_wrapper >;
-            friend class destroyer< version_wrapper >;
-            version_wrapper() : f_imp( new version() ) {}
-            ~version_wrapper() {}
-
-        public:
-            void set_imp( version_semantic_ptr_t a_imp )
-            {
-                f_imp = a_imp;
-                return;
-            }
-
-        public:
-            virtual unsigned major_version() const
-            {
-                return f_imp->major_version();
-            }
-            virtual unsigned minor_version() const
-            {
-                return f_imp->minor_version();
-            }
-            virtual unsigned patch_version() const
-            {
-                return f_imp->patch_version();
-            }
-
-            virtual const std::string& version_str() const
-            {
-                return f_imp->version_str();
-            }
-
-            virtual const std::string& package() const
-            {
-                return f_imp->package();
-            }
-            virtual const std::string& commit() const
-            {
-                return f_imp->commit();
-            }
-
-            virtual const std::string& exe_name() const
-            {
-                return f_imp->exe_name();
-            }
-            virtual const std::string& hostname() const
-            {
-                return f_imp->hostname();
-            }
-            virtual const std::string& username() const
-            {
-                return f_imp->username();
-            }
-
-            virtual std::string version_info_string() const
-            {
-                return f_imp->version_info_string();
-            }
-
-        private:
-            version_semantic_ptr_t f_imp;
-    };
-
-}
-
-#endif /* SCARAB_VERSION_WRAPPER_HH_ */
diff --git a/Src/Scarab/python/CMakeLists.txt b/Src/Scarab/python/CMakeLists.txt
deleted file mode 100644
index 11f2da7..0000000
--- a/Src/Scarab/python/CMakeLists.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-# CMakeLists.txt file for Scarab/library/python
-# Author: N.S. Oblath
-# Created on: Sept 2, 2019
-
-if( Scarab_BUILD_PYTHON )
-    message( "Building Python bindings" )
-
-    set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
-
-    # Python binding headers
-    set( PYBINDING_HEADERFILES
-        ${dir}/scarab_binding_helpers.hh
-        ${dir}/cancelable_pybind.hh
-        ${dir}/signal_handler_pybind.hh
-        ${dir}/version_pybind.hh
-    )
-
-    # Python bindings
-    set( PYBINDING_SOURCEFILES
-        ${dir}/scarab_namespace_pybind.cc
-    )
-
-    if( Scarab_BUILD_CLI )
-        add_definitions( -DBUILD_CLI_PYBINDING )
-        set( PYBINDING_HEADERFILES
-            ${PYBINDING_HEADERFILES}
-            ${dir}/application_pybind.hh
-        )
-    endif( Scarab_BUILD_CLI )
-
-    if( Scarab_BUILD_PARAM )
-        add_definitions( -DBUILD_PARAM_PYBINDING )
-        set( PYBINDING_HEADERFILES
-            ${PYBINDING_HEADERFILES}
-            ${dir}/param_pybind.hh
-            ${dir}/param_binding_helpers.hh
-            ${dir}/param_value_pybind.hh
-            ${dir}/param_array_pybind.hh
-            ${dir}/param_node_pybind.hh
-        )
-    endif( Scarab_BUILD_PARAM )
-
-    set( PROJECT_LIBRARIES Scarab )
-
-    pbuilder_add_pybind11_module( scarab ${PROJECT_LIBRARIES} )
-
-    pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
-
-    if( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
-        message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )
-        configure_file( add_lib_python_path.sh.in add_lib_python_path.sh @ONLY)
-        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/add_lib_python_path.sh DESTINATION ${BIN_INSTALL_DIR} )
-    endif( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
-
-    message( "Done with Python bindings" )
-endif( Scarab_BUILD_PYTHON )
diff --git a/Src/Scarab/python/add_lib_python_path.sh.in b/Src/Scarab/python/add_lib_python_path.sh.in
deleted file mode 100644
index 68aff4b..0000000
--- a/Src/Scarab/python/add_lib_python_path.sh.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# Adds the lib install directory to the python path
-
-export PYTHONPATH=@LIB_INSTALL_DIR@:$PYTHONPATH
diff --git a/Src/Scarab/python/application_pybind.hh b/Src/Scarab/python/application_pybind.hh
deleted file mode 100644
index 2456d82..0000000
--- a/Src/Scarab/python/application_pybind.hh
+++ /dev/null
@@ -1,136 +0,0 @@
-#ifndef APPLICATION_PYBIND_HH_
-#define APPLICATION_PYBIND_HH_
-
-#include "pybind11/pybind11.h"
-#include "pybind11/functional.h"
-#include "pybind11/stl.h"
-
-#include "application.hh"
-#include "scarab_binding_helpers.hh"
-
-namespace scarab_pybind
-{
-    std::list< std::string > export_application( pybind11::module& mod )
-    {
-        std::list< std::string > all_members;
-
-        all_members.push_back( "MainApp" );
-        pybind11::class_< scarab::main_app >( mod, "MainApp", "Base class for creating CLI utilities" )
-            .def( pybind11::init< bool >(),
-                  pybind11::arg( "use_config" ) = true,
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-
-            .def( "set_callback", [](scarab::main_app* an_app, std::function< void() > a_fun){ an_app->callback( a_fun );} )
-
-            // member variables
-            .def_property_readonly( "primary_config", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::primary_config )
-            .def_property( "default_config", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::default_config,
-                           [](scarab::main_app& an_obj, scarab::param_node& a_config){ an_obj.default_config() = a_config; } )
-            .def_property_readonly( "config_filename", (const std::string& (scarab::main_app::*)()) &scarab::main_app::config_filename )
-            .def_property_readonly( "global_verbosity", &scarab::main_app::get_global_verbosity )
-            .def_property_readonly( "nonoption_kw_args", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::nonoption_kw_args )
-            .def_property_readonly( "nonoption_ord_args", (scarab::param_array& (scarab::main_app::*)()) &scarab::main_app::nonoption_ord_args )
-            .def_property_readonly( "app_options", (scarab::param_node& (scarab::main_app::*)()) &scarab::main_app::app_options )
-            .def_property_readonly( "use_config", &scarab::main_app::get_use_config )
-
-            .def( "do_config_stage_1", &scarab::main_app::do_config_stage_1, SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "do_config_stage_2", &scarab::main_app::do_config_stage_2, SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "do_config_stage_3", &scarab::main_app::do_config_stage_3, SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "do_config_stage_4", &scarab::main_app::do_config_stage_4, SCARAB_BIND_CALL_GUARD_STREAMS )
-
-            //TODO: add_config_subcommand?
-
-            //add_config_options... what template versions do we need?
-            .def( "add_config_flag",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_flag< bool >(a_name, a_addr, a_description);},
-                  pybind11::arg( "flag" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a CLI flag, which is toggled as a bool",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_counted_flag",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_flag< unsigned >(a_name, a_addr, a_description);},
-                  pybind11::arg( "flag" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a CLI flag, the config will contain a count of occurrances",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_string_option",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_option< std::string >(a_name, a_addr, a_description);},
-                  pybind11::arg( "option" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a single-string argument",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_int_option",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_option< int >(a_name, a_addr, a_description);},
-                  pybind11::arg( "option" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a single-integer argument",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_float_option",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_option< double >(a_name, a_addr, a_description);},
-                  pybind11::arg( "option" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a single-float argument",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_multi_string_option",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_multi_option< std::string >(a_name, a_addr, a_description);},
-                  pybind11::arg( "option" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a sequence of string arguments",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_multi_int_option",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_multi_option< int >(a_name, a_addr, a_description);},
-                  pybind11::arg( "option" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a sequence of ints arguments",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def( "add_config_multi_float_option",
-                  [](scarab::main_app* an_app, std::string a_name, std::string a_addr, std::string a_description)
-                        {an_app->add_config_multi_option< double >(a_name, a_addr, a_description);},
-                  pybind11::arg( "option" ),
-                  pybind11::arg( "config_address" ),
-                  pybind11::arg( "description" ) = "",
-                  "add a sequence of string arguments",
-                  SCARAB_BIND_CALL_GUARD_STREAMS )
-
-            .def( "set_version", &scarab::main_app::set_version, SCARAB_BIND_CALL_GUARD_STREAMS )
-
-            // implement execute as a lambda, it is a macro in CLI11
-            .def( "execute",
-                  [](scarab::main_app& an_app, std::list< std::string > args )
-                  {
-                    //TODO: this feels... super ugly, also how do I deal with errors/return codes?
-                    const char* argv[args.size()];
-                    std::list< std::string >::iterator an_arg = args.begin();
-                    for (unsigned i_arg=0; i_arg<args.size(); ++i_arg)
-                    {
-                        argv[i_arg] = an_arg->c_str();
-                        ++an_arg;
-                    }
-                    // CLI11_PARSE returns an integer in the event of an error, the are meant to be
-                    // valid shell return codes, so 0 is success
-                    CLI11_PARSE( an_app, args.size(), argv );
-                    return 0;
-                  },
-                  "parse arguments and execute the application",
-                  SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
-
-            ;
-
-        return all_members;
-    }
-} /* namespace scarab_pybind */
-#endif /* APPLICATION_PYBIND_HH_ */
diff --git a/Src/Scarab/python/cancelable_pybind.hh b/Src/Scarab/python/cancelable_pybind.hh
deleted file mode 100644
index 970a7f5..0000000
--- a/Src/Scarab/python/cancelable_pybind.hh
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef CANCELABLE_PYBIND_HH_
-#define CANCELABLE_PYBIND_HH_
-
-#include "cancelable.hh"
-#include "scarab_binding_helpers.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace scarab_pybind
-{
-    std::list< std::string > export_cancelable( pybind11::module& mod )
-    {
-        std::list< std::string> all_members;
-
-        all_members.push_back( "Cancelable" );
-        pybind11::class_< scarab::cancelable, std::shared_ptr<scarab::cancelable> >( mod, "Cancelable" )
-            .def( pybind11::init< >() )
-
-            .def( "cancel", &scarab::cancelable::cancel, SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
-            .def( "reset_cancel", &scarab::cancelable::reset_cancel, SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
-            .def( "is_canceled", &scarab::cancelable::is_canceled )
-
-            ;
-
-        return all_members;
-    }
-}
-
-#endif /* CANCELABLE_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_array_pybind.hh b/Src/Scarab/python/param_array_pybind.hh
deleted file mode 100644
index 3c3b766..0000000
--- a/Src/Scarab/python/param_array_pybind.hh
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * KTPyNymph.cc
- *
- *  Created on: Feb 1, 2018
- *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
- */
-
-#ifndef PARAM_ARRAY_PYBIND_HH_
-#define PARAM_ARRAY_PYBIND_HH_
-
-#include "param.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace scarab_pybind
-{
-
-    std::list< std::string > export_param_array( pybind11::module& mod )
-    {
-        std::list< std::string > all_members;
-
-        // param_array
-        all_members.push_back( "ParamArray" );
-        pybind11::class_< scarab::param_array, scarab::param >( mod, "ParamArray", "param data structure object for holding an ordered sequence of objects" )
-            .def( pybind11::init< >() )
-            .def( "__str__", &scarab::param_array::to_string )
-            .def( "__len__", &scarab::param_array::size,
-                    "Returns the size of the array" )
-            .def( "__getitem__", (scarab::param& (scarab::param_array::*)(unsigned)) &scarab::param_array::operator[],
-                    pybind11::return_value_policy::reference_internal)
-            .def( "__setitem__", [](scarab::param_array& an_obj, unsigned a_index, scarab::param& a_value){ an_obj.assign( a_index, a_value ); } )
-            .def( "__iter__", [](const scarab::param_array& an_obj){ return pybind11::make_iterator(an_obj.begin(), an_obj.end()); },
-                    pybind11::keep_alive<0, 1>() /* keep object alive while the iterator exists */)
-
-            //TODO: has_subset()
-
-            .def( "empty", &scarab::param_array::empty,
-                    "True if the length is zero" )
-
-            .def( "resize", &scarab::param_array::resize, pybind11::arg( "size" ),
-                    "Sets the size of the array; if smaller than the current size, the extra elements are deleted" )
-
-            .def( "assign",
-                    (void (scarab::param_array::*)(unsigned, const scarab::param&)) &scarab::param_array::assign,
-                    pybind11::arg( "index" ),
-                    pybind11::arg( "value" ),
-                    "Add a param object [value] to the specified [index] in a array" )
-
-            // Get value of the parameter, bringing along the default value
-            .def( "get_value",
-                    (bool (scarab::param_array::*)(unsigned, bool) const) &scarab::param_array::get_value<bool>,
-                    pybind11::arg( "index" ),
-                    pybind11::arg( "default" ),
-                    "Get boolean parameter array value at index, or return provided value if out of index range" )
-            .def( "get_value",
-                    (unsigned (scarab::param_array::*)(unsigned, unsigned) const) &scarab::param_array::get_value<uint>,
-                    pybind11::arg( "index" ),
-                    pybind11::arg( "default" ),
-                    "Get integer parameter array value at index, or return provided value if out of index range" )
-            .def( "get_value",
-                    (int (scarab::param_array::*)(unsigned, int) const) &scarab::param_array::get_value<int>,
-                    pybind11::arg( "index" ),
-                    pybind11::arg( "default" ),
-                    "Get signed integer parameter array value at index, or return provided value if out of index range" )
-            .def( "get_value",
-                    (double (scarab::param_array::*)(unsigned, double) const) &scarab::param_array::get_value<double>,
-                    pybind11::arg( "index" ),
-                    pybind11::arg( "default" ),
-                    "Get float parameter array value at index, or return provided value if out of index range" )
-            .def( "get_value",
-                    (std::string (scarab::param_array::*)(unsigned, const std::string& ) const) &scarab::param_array::get_value,
-                    pybind11::arg( "index" ),
-                    pybind11::arg( "default" ),
-                    "Get string parameter array value at index, or return provided value if out of index range" )
-
-            .def( "push_back",
-                    (void (scarab::param_array::*)(const scarab::param&)) &scarab::param_array::push_back,
-                    pybind11::arg( "value" ),
-                    "add a param object to the end of the array")
-            .def( "push_front",
-                    (void (scarab::param_array::*)(const scarab::param&)) &scarab::param_array::push_front,
-                    pybind11::arg( "value" ),
-                    "add a param object to the end of the array")
-
-            .def( "append",
-                    &scarab::param_array::append,
-                    pybind11::arg( "array" ),
-                    "adds all elements of a param_array to the end of this" )
-            .def( "merge",
-                    &scarab::param_array::merge,
-                    pybind11::arg( "array" ),
-                    "merges provided param_array, effectively replacing the current array")
-            .def( "erase",
-                    &scarab::param_array::erase,
-                    pybind11::arg( "index" ),
-                    "eliminates the value at a position in the array" )
-            .def( "remove",
-                    &scarab::param_array::remove,
-                    pybind11::arg( "index" ),
-                    "returns the param_value at the provided index and removes it from the array" )
-            .def( "clear", &scarab::param_array::clear, "erase all contents and resize to 0" )
-
-            ;
-        return all_members;
-    }
-
-} /* namespace scarab_pybind */
-#endif /* PARAM_ARRAY_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_binding_helpers.hh b/Src/Scarab/python/param_binding_helpers.hh
deleted file mode 100644
index 3fc5bc9..0000000
--- a/Src/Scarab/python/param_binding_helpers.hh
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * param_binding_helpers.hh
- *
- *  Created on: Jan 23, 2020
- *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
- */
-
-#ifndef PARAM_BINDING_HELPERS_HH_
-#define PARAM_BINDING_HELPERS_HH_
-
-#include <algorithm> //for std::replace on string
-
-#include "param.hh"
-#include "error.hh"
-
-#include "pybind11/pybind11.h"
-#include "pybind11/pytypes.h"
-
-
-namespace scarab_pybind
-{
-
-    scarab::param_ptr_t to_param( const pybind11::object& an_object, bool hyphenate_keys=false )
-    {
-        using namespace pybind11;
-        if( isinstance< none >( an_object ) )
-        {
-            return scarab::param_ptr_t( new scarab::param() );
-        }
-        else if( isinstance< bool_ >( an_object ) )
-        {
-            return scarab::param_ptr_t( new scarab::param_value( static_cast< const bool_& >(an_object) ) );
-        }
-        else if( isinstance< int_ >( an_object ) )
-        {
-            return scarab::param_ptr_t( new scarab::param_value( (int64_t)static_cast< const int_& >(an_object) ) );
-        }
-        else if( isinstance< float_ >( an_object ) )
-        {
-            return scarab::param_ptr_t( new scarab::param_value( (double)static_cast< const float_& >(an_object) ) );
-        }
-        else if( isinstance< str >( an_object ) )
-        {
-            return scarab::param_ptr_t( new scarab::param_value( static_cast< const str& >(an_object) ) );
-        }
-        else if( isinstance< list >( an_object ) )
-        {
-            scarab::param_ptr_t the_return( new scarab::param_array() );
-            scarab::param_array& the_return_arr = the_return->as_array();
-            for( auto an_item = an_object.begin(); an_item != an_object.end(); ++an_item )
-            {
-                the_return_arr.push_back( to_param( reinterpret_borrow< object >( *an_item ) ) );
-            }
-            return the_return;
-        }
-        else if( isinstance< dict >( an_object ) )
-        {
-            scarab::param_ptr_t the_return( new scarab::param_node() );
-            scarab::param_node& the_return_arr = the_return->as_node();
-            const dict& a_dict = static_cast< const dict& >( an_object );
-            for( auto an_item = a_dict.begin(); an_item != a_dict.end(); ++an_item )
-            {
-                if( ! isinstance< str >(an_item->first) || ! isinstance< object >(an_item->second) )
-                {
-                    throw scarab::error() << "Cannot convert dict to param";
-                }
-                std::string new_key = pybind11::str(an_item->first);
-                if ( hyphenate_keys )
-                {
-                    std::replace( new_key.begin(), new_key.end(), '_', '-' );
-                }
-                the_return_arr.add( new_key, to_param( static_cast< const object& >(an_item->second) ) );
-            }
-            return the_return;
-        }
-        throw scarab::error() << "Unknown python type cannot be converted to param";
-    };
-
-    pybind11::object to_python( const scarab::param& a_param, bool underscore_keys = false )
-    {
-        if (a_param.is_null())
-        {
-            return pybind11::none();
-        }
-        else if (a_param.is_value())
-        {
-            const scarab::param_value& this_value = a_param.as_value();
-            pybind11::object to_return;
-            if (this_value.is_bool()) to_return =  pybind11::cast(this_value.as_bool());
-            else if (this_value.is_uint()) to_return = pybind11::cast(this_value.as_uint());
-            else if (this_value.is_int()) to_return = pybind11::cast(this_value.as_int());
-            else if (this_value.is_double()) to_return = pybind11::cast(this_value.as_double());
-            else if (this_value.is_string()) to_return = pybind11::cast(this_value.as_string());
-            return to_return;
-        }
-        else if (a_param.is_array())
-        {
-            const scarab::param_array& this_array = a_param.as_array();
-            pybind11::list to_return;
-            for (scarab::param_array_const_iterator an_item=this_array.begin(); an_item != this_array.end(); ++an_item)
-            {
-                to_return.append( to_python( *an_item ) );
-            }
-            return std::move(to_return);
-        }
-        else if (a_param.is_node())
-        {
-            const scarab::param_node& this_node = a_param.as_node();
-            pybind11::dict to_return;
-            for (scarab::param_node_const_iterator an_item=this_node.begin(); an_item != this_node.end(); ++an_item)
-            {
-                std::string new_key = an_item.name();
-                if ( underscore_keys )
-                {
-                    std::replace( new_key.begin(), new_key.end(), '-', '_' );
-                }
-                to_return[ new_key.c_str() ] = to_python( *an_item );
-            }
-            return std::move(to_return);
-        }
-        throw scarab::error() << "Unknown param type cannot be converted to Python";
-    };
-
-} /* namespace scarab_pybind */
-#endif /* PARAM_BINDING_HLEPERS_HH_ */
diff --git a/Src/Scarab/python/param_node_pybind.hh b/Src/Scarab/python/param_node_pybind.hh
deleted file mode 100644
index 70edc0f..0000000
--- a/Src/Scarab/python/param_node_pybind.hh
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Created on: Feb 1, 2018
- *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
- */
-
-#ifndef PARAM_NODE_PYBIND_HH_
-#define PARAM_NODE_PYBIND_HH_
-
-#include "param.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace scarab_pybind
-{
-
-    std::list< std::string > export_param_node( pybind11::module& mod )
-    {
-        std::list< std::string > all_members;
-
-        // param_node
-        all_members.push_back( "ParamNode" );
-        pybind11::class_< scarab::param_node, scarab::param >( mod, "ParamNode", "param data structure object for holding a collection of object indexable by string keys" )
-            .def( pybind11::init< >() )
-
-            .def( "__str__", &scarab::param_node::to_string )
-            .def( "__len__", &scarab::param_node::size )
-            .def( "__getitem__", (scarab::param& (scarab::param_node::*)(const std::string&)) &scarab::param_node::operator[],
-                    pybind11::return_value_policy::reference_internal)
-            .def( "__setitem__", [](scarab::param_node& an_obj, std::string& a_name, scarab::param& a_value){ an_obj.replace( a_name, a_value ); } )
-            .def( "__contains__", &scarab::param_node::has )
-            .def( "__iter__", [](const scarab::param_node& an_obj){ return pybind11::make_iterator(an_obj.begin(), an_obj.end()); },
-                    pybind11::keep_alive<0, 1>() /* keep object alive while the iterator exists */ )
-
-            .def( "count",
-                    &scarab::param_node::count,
-                    pybind11::arg( "key" ),
-                    "returns the number of occurances of provided key" )
-
-            //TODO: has_subset()
-
-            .def( "empty", &scarab::param_node::empty, "returns whether the map container is empty")
-
-            .def( "add",
-                    (bool (scarab::param_node::*)(const std::string&, const scarab::param&)) &scarab::param_node::add,
-                    pybind11::arg( "key" ),
-                    pybind11::arg( "value" ),
-                    "Add a param object to a node at a particular key")
-
-            // Get value of the parameter, bringing along the default value
-            .def( "get_value",
-                    (bool (scarab::param_node::*)(const std::string&, bool) const) &scarab::param_node::get_value<bool>,
-                    pybind11::arg( "key" ),
-                    pybind11::arg( "default" ),
-                    "Get parameter node value at [key] or return [default] (as a bool)" )
-            .def( "get_value",
-                    (unsigned (scarab::param_node::*)(const std::string&, unsigned) const) &scarab::param_node::get_value<uint>,
-                    pybind11::arg( "key" ),
-                    pybind11::arg( "default" ),
-                    "Get parameter node value at [key] or return [default] (as an unsigned integer)" )
-            .def( "get_value",
-                    (int (scarab::param_node::*)(const std::string&, int) const) &scarab::param_node::get_value<int>,
-                    pybind11::arg( "key" ),
-                    pybind11::arg( "default" ),
-                    "Get parameter node value at [key] or return [default] (as a signed integer)" )
-            .def( "get_value",
-                    (double (scarab::param_node::*)(const std::string&, double) const) &scarab::param_node::get_value<double>,
-                    pybind11::arg( "key" ),
-                    pybind11::arg( "default" ),
-                    "Get parameter node value at [key] or return [default] (as a float)" )
-            .def( "get_value",
-                    (std::string (scarab::param_node::*)(const std::string&, const std::string& ) const) &scarab::param_node::get_value,
-                    pybind11::arg( "key" ),
-                    pybind11::arg( "default" ),
-                    "Get parameter node value at [key] or return [default] (as a string)" )
-
-            //TODO: merge(), erase(), remove(), clear()
-
-
-            ;
-        return all_members;
-    }
-} /* namespace scarab_pybind */
-#endif /* PARAM_NODE_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_pybind.hh b/Src/Scarab/python/param_pybind.hh
deleted file mode 100644
index 3b76a52..0000000
--- a/Src/Scarab/python/param_pybind.hh
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * param_pybind.hh
- *
- *  Created on: Feb 1, 2018
- *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
- */
-
-#ifndef PARAM_PYBIND_HH_
-#define PARAM_PYBIND_HH_
-
-#include "param.hh"
-#include "param_binding_helpers.hh"
-#include "error.hh"
-
-#include "pybind11/pybind11.h"
-#include "pybind11/pytypes.h"
-
-
-namespace scarab_pybind
-{
-    std::list< std::string > export_param( pybind11::module& mod )
-    {
-        std::list< std::string > all_members;
-
-        all_members.push_back( "to_param" );
-        mod.def( "to_param",
-                &to_param,
-                pybind11::arg( "object"),
-                pybind11::arg( "hyphenate_keys" ) = false,
-                "Convert native python types to a param structure." );
-
-        // param
-        all_members.push_back( "Param" );
-        pybind11::class_< scarab::param >( mod, "Param", "param data structure base class and null object" )
-            .def( pybind11::init< >() )
-            .def( pybind11::init< scarab::param_value >() )
-
-            .def( "__str__", &scarab::param::to_string )
-            .def( "__call__", (scarab::param_value& (scarab::param::*)()) &scarab::param::operator(),
-                    pybind11::return_value_policy::reference_internal )
-
-            .def( "is_null", &scarab::param::is_null, "return whether the param object is an empty param type" )
-            .def( "is_node", &scarab::param::is_node, "return whether the param object is a ParamNode" )
-            .def( "is_array", &scarab::param::is_array, "return whether the param object is a ParamArray" )
-            .def( "is_value", &scarab::param::is_value, "return whether the param object is a ParamValue" )
-
-            .def( "as_array",
-                    (scarab::param_array& (scarab::param::*)()) &scarab::param::as_array,
-                    pybind11::return_value_policy::reference_internal,
-                    "returns Param object as a ParamArray" )
-            .def( "as_node",
-                    (scarab::param_node& (scarab::param::*)()) &scarab::param::as_node,
-                    pybind11::return_value_policy::reference_internal,
-                    "returns Param object as ParamNode" )
-            .def( "as_value",
-                    (scarab::param_value& (scarab::param::*)()) &scarab::param::as_value,
-                    pybind11::return_value_policy::reference_internal,
-                    "returns Param object as ParamValue" )
-
-            .def( "to_python",
-                    &to_python,
-                    pybind11::arg( "underscore_keys" ) = false,
-                    "recursively converts param object to native python data structure" )
-
-            //TODO: has_subset()
-
-            //TODO: get_value() in its various types
-
-            //TODO: merge()
-
-            ;
-        return all_members;
-    }
-
-} /* namespace scarab_pybind */
-#endif /* PARAM_PYBIND_HH_ */
diff --git a/Src/Scarab/python/param_value_pybind.hh b/Src/Scarab/python/param_value_pybind.hh
deleted file mode 100644
index 9c6e051..0000000
--- a/Src/Scarab/python/param_value_pybind.hh
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- *
- *  Created on: Feb 1, 2018
- *      Author: N. Oblath, L. Gladstone, B.H. LaRoque
- */
-
-#ifndef PARAM_VALUE_PYBIND_HH_
-#define PARAM_VALUE_PYBIND_HH_
-
-#include "param.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace scarab_pybind
-{
-
-    std::list< std::string > export_param_value( pybind11::module& mod )
-    {
-        std::list< std::string > all_members;
-
-        // param_value
-        all_members.push_back( "ParamValue" );
-        pybind11::class_< scarab::param_value, scarab::param >( mod, "ParamValue", "param data structure object for holding a single value" )
-            // initialization overloads by type
-            .def( pybind11::init< bool >() )
-            .def( pybind11::init< unsigned >() )
-            .def( pybind11::init< int >() )
-            .def( pybind11::init< double >() )
-            .def( pybind11::init< const std::string& >() )
-            .def( pybind11::init< const char* >() )
-
-            // python __ special functions
-            .def( "__str__", &scarab::param_value::to_string )
-            .def( "__eq__", &scarab::param_value::operator== )
-
-            .def( "type", &scarab::param_value::type, "returns a string representation of the stored data type" )
-            // type checking methods
-            .def( "is_bool", (bool (scarab::param_value::*)() const) &scarab::param_value::is_bool,
-                    "Return whether the param_value stores a boolean value" )
-            .def( "is_uint", (bool (scarab::param_value::*)() const) &scarab::param_value::is_uint,
-                    "Return whether the param_value stores an unsigned integer value" )
-            .def( "is_int", (bool (scarab::param_value::*)() const) &scarab::param_value::is_int,
-                    "Return whether the param_value stores a signed integer value" )
-            .def( "is_double", (bool (scarab::param_value::*)() const) &scarab::param_value::is_double,
-                    "Return whether the param_value stores a double value" )
-            .def( "is_string", (bool (scarab::param_value::*)() const) &scarab::param_value::is_string,
-                    "Return whether the param_value stores a string value" )
-
-            // output cast to native types
-            .def( "as_bool", &scarab::param_value::as_bool, "Get parameter value as a bool" )
-            .def( "as_uint", &scarab::param_value::as_uint, "Get parameter value as an unsigned integer" )
-            .def( "as_int", &scarab::param_value::as_int, "Get parameter value as a signed integer" )
-            .def( "as_double", &scarab::param_value::as_double, "Get parameter value as a float" )
-            .def( "as_string", &scarab::param_value::as_string, "Get parameter value as a string" )
-
-            // set method overloads
-            .def( "set", (void (scarab::param_value::*)(bool)) &scarab::param_value::set,
-                    "Set a bool value" )
-            //.def( "set", (void (scarab::param_value::*)(unsigned)) &scarab::param_value::set<uint64_t>, "Set an unsigned integer value" )
-            .def("set",&scarab::param_value::set<uint64_t>,
-                    "Set an unsigned integer value")
-            //.def( "set", (void (scarab::param_value::*)(int)) &scarab::param_value::set<int64_t>, "Set a signed integer value" )
-            .def("set", &scarab::param_value::set<int64_t>,
-                    "Set a signed integer value")
-            .def( "set", (void (scarab::param_value::*)(double)) &scarab::param_value::set,
-                    "Set an float value" )
-            .def( "set", (void (scarab::param_value::*)(std::string)) &scarab::param_value::set,
-                    "Set an string value" )
-
-            //TODO: empty(), clear(), has_subset()
-
-            ;
-        return all_members;
-    }
-
-} /* namespace scarab_pybind */
-#endif /* PARAM_VALUE_PYBIND_HH_ */
diff --git a/Src/Scarab/python/scarab_binding_helpers.hh b/Src/Scarab/python/scarab_binding_helpers.hh
deleted file mode 100644
index 720f924..0000000
--- a/Src/Scarab/python/scarab_binding_helpers.hh
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef SCARAB_PYBIND_BINDING_HELPERS
-#define SCARAB_PYBIND_BINDING_HELPERS
-
-#include "pybind11/iostream.h"
-
-#define SCARAB_BIND_CALL_GUARD_STREAMS \
-    pybind11::call_guard< pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect >()
-
-#define SCARAB_BIND_CALL_GUARD_GIL \
-    pybind11::call_guard< pybind11::gil_scoped_release >()
-
-#define SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL \
-    pybind11::call_guard< pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect, pybind11::gil_scoped_release >()
-
-#endif /* SCARAB_PYBIND_BINDING_HELPERS */
diff --git a/Src/Scarab/python/scarab_namespace_pybind.cc b/Src/Scarab/python/scarab_namespace_pybind.cc
deleted file mode 100644
index 8b4ca56..0000000
--- a/Src/Scarab/python/scarab_namespace_pybind.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * scarab_namespace_pybind.cc
- *
- * Created on: April 18, 2019
- *     Author: B.H. LaRoque
- */
-
-#include "pybind11/stl.h"
-
-#ifdef BUILD_CLI_PYBINDING
-#include "application_pybind.hh"
-#endif
-
-#include "cancelable_pybind.hh"
-#include "signal_handler_pybind.hh"
-#include "version_pybind.hh"
-
-#ifdef BUILD_PARAM_PYBINDING
-#include "param_pybind.hh"
-#include "param_value_pybind.hh"
-#include "param_array_pybind.hh"
-#include "param_node_pybind.hh"
-#endif
-
-PYBIND11_MODULE( scarab, scarab_mod )
-{
-    std::list< std::string > all_members;
-    // cancelable
-    all_members.splice( all_members.end(), scarab_pybind::export_cancelable( scarab_mod ) );
-    // signal handler
-    all_members.splice( all_members.end(), scarab_pybind::export_signal_handler( scarab_mod ) );
-#ifdef BUILD_CLI_PYBINDING
-    // application
-    all_members.splice( all_members.end(), scarab_pybind::export_application( scarab_mod ) );
-#endif
-    // utility
-    all_members.splice( all_members.end(), scarab_pybind::export_version( scarab_mod ) );
-#ifdef BUILD_PARAM_PYBINDING
-    // Param-related data objects
-    all_members.splice( all_members.end(), scarab_pybind::export_param( scarab_mod ) );
-    all_members.splice( all_members.end(), scarab_pybind::export_param_value( scarab_mod ) );
-    all_members.splice( all_members.end(), scarab_pybind::export_param_array( scarab_mod ) );
-    all_members.splice( all_members.end(), scarab_pybind::export_param_node( scarab_mod ) );
-#endif
-    scarab_mod.attr( "__all__" ) = all_members;
-}
diff --git a/Src/Scarab/python/signal_handler_pybind.hh b/Src/Scarab/python/signal_handler_pybind.hh
deleted file mode 100644
index bdcd6e3..0000000
--- a/Src/Scarab/python/signal_handler_pybind.hh
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef SIGNAL_HANDLER_PYBIND_HH_
-#define SIGNAL_HANDLER_PYBIND_HH_
-
-#include "signal_handler.hh"
-#include "scarab_binding_helpers.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace scarab_pybind
-{
-    std::list< std::string > export_signal_handler( pybind11::module& mod )
-    {
-        std::list< std::string > all_members;
-
-        all_members.push_back( "SignalHandler" );
-        pybind11::class_< scarab::signal_handler >( mod, "SignalHandler", "handle system signals and pass cancel status to associated objects" )
-            .def( pybind11::init< >(), SCARAB_BIND_CALL_GUARD_STREAMS )
-
-            .def_static( "add_cancelable", &scarab::signal_handler::add_cancelable, "add a cancelable object to the list to be canceled in the event of a SIGINT" )
-            .def_static( "remove_cancelable", static_cast<void (*)(std::shared_ptr<scarab::cancelable>)>( &scarab::signal_handler::remove_cancelable ), "remove a cancelable object from the list to be canceled in the event of a SIGINT" )
-            .def_static( "reset", &scarab::signal_handler::reset, "remove all cancelable objects", SCARAB_BIND_CALL_GUARD_STREAMS )
-            .def_static( "cancel_all", &scarab::signal_handler::cancel_all, "cancel all cancelable objects known to the signal_handler", SCARAB_BIND_CALL_GUARD_STREAMS_AND_GIL )
-            ;
-
-        return all_members;
-    }
-} /* namespace scarab_pybind */
-#endif /* SIGNAL_HANDLER_PYBIND_HH_ */
diff --git a/Src/Scarab/python/version_pybind.hh b/Src/Scarab/python/version_pybind.hh
deleted file mode 100644
index 05486dd..0000000
--- a/Src/Scarab/python/version_pybind.hh
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef VERSION_PYBIND_HH_
-#define VERSION_PYBIND_HH_
-
-#include "version_semantic.hh"
-
-#include "pybind11/pybind11.h"
-
-namespace scarab_pybind
-{
-
-    std::list< std::string > export_version( pybind11::module& mod )
-    {
-        std::list< std::string > all_items;
-
-        all_items.push_back( "VersionSemantic" );
-        pybind11::class_< scarab::version_semantic, std::shared_ptr< scarab::version_semantic > >( mod, "VersionSemantic", "data structure for representing semantic version information" )
-            .def( pybind11::init<>() )
-            .def( pybind11::init< unsigned, unsigned, unsigned >(),
-                    pybind11::arg( "major"),
-                    pybind11::arg( "minor"),
-                    pybind11::arg( "patch"))
-            .def( pybind11::init< const scarab::version_semantic& >() )
-
-            .def( "__eq__", &scarab::version_semantic::operator== )
-            .def( "__lt__", &scarab::version_semantic::operator< )
-            .def( "__gt__", &scarab::version_semantic::operator> )
-
-            .def_property_readonly( "major_version", &scarab::version_semantic::major_version )
-            .def_property_readonly( "minor_version", &scarab::version_semantic::minor_version )
-            .def_property_readonly( "patch_version", &scarab::version_semantic::patch_version )
-            .def_property_readonly( "version", &scarab::version_semantic::version_str )
-
-            .def_property( "package", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::package,
-                           [](scarab::version_semantic& an_obj, const std::string& a_package ) {an_obj.package() = a_package; } )
-            .def_property( "commit", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::commit,
-                           [](scarab::version_semantic& an_obj, const std::string& a_commit ) {an_obj.commit() = a_commit; } )
-
-            .def_property( "exe_name", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::exe_name,
-                           [](scarab::version_semantic& an_obj, const std::string& an_exe ) {an_obj.exe_name() = an_exe; } )
-            .def_property( "hostname", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::hostname,
-                           [](scarab::version_semantic& an_obj, const std::string& a_hostname ) {an_obj.hostname() = a_hostname; } )
-            .def_property( "username", (std::string& (scarab::version_semantic::*)()) &scarab::version_semantic::username,
-                           [](scarab::version_semantic& an_obj, const std::string& a_username ) {an_obj.username() = a_username; } )
-
-            .def_property_readonly( "version_info", &scarab::version_semantic::version_info_string )
-
-            .def( "parse", &scarab::version_semantic::parse, "parse a version string into this object" )
-            .def( "combine", &scarab::version_semantic::combine, pybind11::arg( "major" ), pybind11::arg( "minor" ), pybind11::arg( "patch" ), "combine integer represetnations of major, minor, and patch into object")
-            .def( "update_exe_host_user", &scarab::version_semantic::update_exe_host_user, "attempt to determine execution properties: executable name, username, hostname" )
-        ;
-
-        return all_items;
-    }
-
-} /* namespace scarab_pybind */
-
-#endif /* VERSION_PYBIND_HH_ */
diff --git a/Src/Scarab/testing/CMakeLists.txt b/Src/Scarab/testing/CMakeLists.txt
deleted file mode 100644
index 232da5a..0000000
--- a/Src/Scarab/testing/CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-# CMakeLists.txt for scarab/testing
-# Author: N.S. Oblath
-# Created: Jul 7, 2020
-
-##########
-
-set( testing_HEADERS
-    stream_check.hh
-    test_member_variables.hh
-)
-
-pbuilder_install_headers( ${testing_HEADERS} )
-
-    configure_file( 
-        ${CMAKE_CURRENT_SOURCE_DIR}/test_path.cc.in 
-        ${CMAKE_CURRENT_BINARY_DIR}/test_path.cc 
-        @ONLY
-    )
-
-    set( testing_SOURCES
-        use_catch.cc
-        stream_check.cc
-        test_digital.cc
-        test_exponential_backoff.cc
-        test_logger.cc
-        test_member_variables.cc
-        test_signal_handler.cc
-        test_time.cc
-        test_verbosity.cc
-        ${CMAKE_CURRENT_BINARY_DIR}/test_path.cc 
-    )
-
-    if( Scarab_BUILD_PARAM )
-        set( testing_SOURCES
-            ${testing_SOURCES}
-            test_param_array.cc
-            test_param_by_pointer.cc
-            test_param_node.cc
-            test_param_translator.cc
-            test_param_value.cc
-        )
-    endif( Scarab_BUILD_PARAM )
-
-    if( Scarab_BUILD_CODEC_JSON )
-        set( testing_SOURCES
-            ${testing_SOURCES}
-            test_json.cc
-        )
-    endif( Scarab_BUILD_CODEC_JSON )
-    
-    if( Scarab_BUILD_CODEC_YAML )
-        set( testing_SOURCES
-            ${testing_SOURCES}
-            test_yaml.cc
-        )
-    endif( Scarab_BUILD_CODEC_YAML )
-
-    if( Scarab_BUILD_CLI )
-        set( testing_SOURCES
-            ${testing_SOURCES}
-            test_nonoption_parser.cc
-        )
-    endif( Scarab_BUILD_CLI )
-
-
-set( testing_LIB_DEPENDENCIES 
-    Scarab
-    Catch
-)
-
-# Interface library was recommended for Catch:
-# https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
-add_library( Catch INTERFACE )
-target_include_directories( Catch INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/catch )
-
-add_executable( run_tests ${testing_SOURCES} )
-target_link_libraries( run_tests PUBLIC ${testing_LIB_DEPENDENCIES} )
-
-if( Scarab_BUILD_CLI )
-    add_subdirectory( applications )
-endif( Scarab_BUILD_CLI )
-
-# So far it seems sufficient to use Catch2's ability to run tests, and not CTest.
-# Here are two ways it could potentially be integrated with CTest, if we change our minds.
-
-# Normal CMake Integration
-#enable_testing()
-add_test(NAME unit_tests COMMAND run_tests )
-
-# Automated CMake Integration
-#include(CTest)
-#include(Catch)
-#catch_discover_tests(foo) 
\ No newline at end of file
diff --git a/Src/Scarab/testing/Doxyfile b/Src/Scarab/testing/Doxyfile
deleted file mode 100644
index af49bc3..0000000
--- a/Src/Scarab/testing/Doxyfile
+++ /dev/null
@@ -1,1534 +0,0 @@
-# Doxyfile 1.5.8
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME = Scarab_Test
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER = 0
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer
-# a quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Scarab Test"
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-PROJECT_LOGO           =  
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = ./user_doxygen_out
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
-# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
-# Spanish, Swedish, and Ukrainian.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 4
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES = 
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C
-
-EXTENSION_MAPPING = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = YES
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST = YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-#
-INPUT = . 
-
-
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py *.f90 *.f *.vhd *.vhdl
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE = $(DOXYGEN_EXCLUDE)
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis.  Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match.  The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code.  Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX = KT
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER = 
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER = 
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET = 
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
-
-CHM_INDEX_ENCODING = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = 
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME = 
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS = 
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
-
-QHG_LOCATION = 
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
-
-GENERATE_TREEVIEW = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX            = YES
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the
-# mathjax.org site, so you can quickly see the result without installing
-# MathJax, but it is strongly recommended to install a local copy of MathJax
-# before deployment.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS     =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX = YES
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader.  This is useful 
-# if you want to understand what is going on.  On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH =  ../cli ../logger ../param ../utility
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS = 
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED = 
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#   TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#   TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME = 
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH = 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = NO
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK = YES
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = NO
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH = 
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 2
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE = YES
diff --git a/Src/Scarab/testing/README.md b/Src/Scarab/testing/README.md
deleted file mode 100644
index b2c6b94..0000000
--- a/Src/Scarab/testing/README.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# README for scarab/testing
-
-## C++
-
-### Catch2
-
-Scarab uses the Catch2 testing framework for unit tests.  See these links for more information:
-
-* [Main GitHub page](https://github.com/catchorg/Catch2)
-* [Tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md)
-
-### Building tests
-
-In CMake, enable the option `Scarab_ENABLE_TESTING`, and build.
-
-The testing executable, `run_tests`, will be installed in `testing/`.
-
-### Running tests
-
-To see the available options for running tests, you can do:
-
-```
-> testing/run_tests -h
-```
-
-To simply run all of the tests, you can do:
-
-```
-> testing/run_tests
-```
-
-Or if you want to run a specific test, you can do:
-
-```
-> testing/run_tests [name]
-```
-
-For further documentation on using Catch2, see the [tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md)
-
-## Applications
-
-Four example applications are included in the `applications` directory, demonstrating different ways in which the CLI portion of the library can be used:
-
-* test_app_with_callback
-* test_app_with_options
-* test_app_with_subcommands
-* test_basic_application
-
-To build these examples, ensure that the CMake flags `Scarab_ENABLE_TESTING` AND `Scarab_BUILD_CLI` are set to `TRUE`.
-
-## Package Builder
-
-Tests of the package builder framework are included in the `package_builder` directory, in these subdirectories:
-
-* NestedPBTest
-* PBTest
-
-## Doxygen Documentation
-
-A Doxygen configuration file has been included in the `testing` directory to allow testing of Doxygen documentation generation.
-
-To use:
-
-1. Enter into the `testing` source directory
-1. Run `doxygen Doxyfile`
-1. Open `testing/user_doxygen_out/html/index.html` in a web browser
-1. When finished, remember to delete `testing/user_doxygen_out` so that it doesn't get committed to the repo
diff --git a/Src/Scarab/testing/applications/CMakeLists.txt b/Src/Scarab/testing/applications/CMakeLists.txt
deleted file mode 100644
index 1319a60..0000000
--- a/Src/Scarab/testing/applications/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# CMakeLists.txt for Scarab/testing/applications
-# Author: N. Oblath
-# Created: Jan 4, 2016
-
-set( testing_applications_SOURCES
-    test_app_with_callback.cc
-    test_app_with_options.cc
-    test_app_with_subcommands.cc
-    test_basic_application.cc
-    test_raise_sigabrt.cc
-    test_raise_sigint.cc
-    test_raise_sigquit.cc
-    test_raise_sigterm.cc
-    test_unhandled_exception.cc
-)
-
-pbuilder_executables( SOURCES ${testing_applications_SOURCES}
-        TARGETS_VAR programs
-        PROJECT_LIBRARIES ${testing_LIB_DEPENDENCIES}
-        )
-
-if( Scarab_ENABLE_TESTING )
-    add_test( NAME app_with_callback COMMAND test_app_with_callback WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME app_with_options COMMAND test_app_with_options -f 5 -s "hello" -t "world" WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME app_with_subcommands_get COMMAND test_app_with_subcommands get WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME app_with_subcommands_set COMMAND test_app_with_subcommands set value=10 WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME basic_application COMMAND test_basic_application WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME raise_sigabrt COMMAND test_raise_sigabrt WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME raise_sigint COMMAND test_raise_sigint WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME raise_sigquit COMMAND test_raise_sigquit WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME raise_sigterm COMMAND test_raise_sigterm WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-    add_test( NAME unhandled_exception COMMAND test_unhandled_exception WORKING_DIRECTORY ${Scarab_BINARY_DIR} )
-
-    set_tests_properties( unhandled_exception PROPERTIES WILL_FAIL TRUE )
-endif()
-
diff --git a/Src/Scarab/testing/applications/test_app_with_callback.cc b/Src/Scarab/testing/applications/test_app_with_callback.cc
deleted file mode 100644
index 697285a..0000000
--- a/Src/Scarab/testing/applications/test_app_with_callback.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * test_app_with_callback.cc
- *
- *  Created on: Jul 24, 2018
- *      Author: N.S. Oblath
- *  Output examples:
- *
-> bin/test_app_with_callback
-2018-07-24 11:40:07 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
-
-{
-}
-
-2018-07-24 11:40:07 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
-
-[
-]
-
-2018-07-24 11:40:07 [ PROG] (tid 0x7fff9c9dc380) with_callback.cc(27): My value is: 5
-
-
-> bin/test_app_with_callback value=10
-
-2018-07-24 11:40:49 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
-
-{
-    value : 10
-}
-
-2018-07-24 11:40:49 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
-
-[
-]
-
-2018-07-24 11:40:49 [ PROG] (tid 0x7fff9c9dc380) with_callback.cc(27): My value is: 10
- *
- */
-
-#include "application.hh"
-
-#include "logger.hh"
-
-LOGGER( testlog, "test_app_with_callback" );
-
-namespace scarab
-{
-    struct do_a_thing
-    {
-        do_a_thing() : f_value( 5 ) {}
-
-        void execute( const main_app& an_app )
-        {
-            // configure to run
-            f_value = an_app.primary_config().get_value( "value", f_value );
-
-            // do a thing!
-            LPROG( testlog, "My value is: " << f_value );
-
-            return;
-        }
-
-        int f_value;
-    };
-}
-
-
-using namespace scarab;
-
-int main( int argc, char **argv )
-{
-    main_app the_main;
-
-    auto t_dat_callback = [&](){
-        do_a_thing t_dat;
-        t_dat.execute( the_main );
-    };
-
-    the_main.callback( t_dat_callback );
-
-    CLI11_PARSE( the_main, argc, argv );
-
-    return 0;
-}
-
-
diff --git a/Src/Scarab/testing/applications/test_app_with_options.cc b/Src/Scarab/testing/applications/test_app_with_options.cc
deleted file mode 100644
index 267b20e..0000000
--- a/Src/Scarab/testing/applications/test_app_with_options.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * test_app_with_options.cc
- *
- *  Created on: Oct 28, 2018
- *      Author: N.S. Oblath
- *
- *  Output examples:
- *
-    > bin/test_app_with_options -f 5 -s "hello" -t "world"
-    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) i/application.cc(97): Final configuration:
-
-    {
-        third-value : world
-    }
-
-    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) i/application.cc(98): Ordered args:
-
-    [
-    ]
-
-    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) _with_options.cc(69): First value: 5
-    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) _with_options.cc(70): Second value: hello
-    2018-10-29 11:15:20 [ PROG] (tid 0x7fffb0945380) _with_options.cc(71): Third value: world
- *
- */
-
-#include "application.hh"
-
-#include "logger.hh"
-
-using namespace scarab;
-
-LOGGER( testlog, "test_app_with_options" );
-
-class test_app : public main_app
-{
-    public:
-        test_app(bool a_use_config = true) :
-            main_app(a_use_config),
-            f_first_value(),
-            f_second_value()
-        {
-            // Add an option that sets the value directly
-            add_option("-f,--first-value", f_first_value, "Set the first value" );
-
-            // Add an option that sets the value via callback
-            add_option( "-s,--second-value", [this](std::vector< std::string > args) { f_second_value = args[0]; return true; }, "Set the second value" );
-
-            // Add an option that sets the value into the configuration via callback
-            add_option( "-t,--third-value", [this](std::vector< std::string > args) { f_primary_config.add( "third-value", args[0] ); return true; }, "Set the third value" );
-        }
-        virtual ~test_app() {}
-
-        void set_first_value( int a_value ) { f_first_value = a_value; }
-        int get_first_value() { return f_first_value; }
-
-        const std::string& second_value() const { return f_second_value; }
-        std::string& second_value() { return f_second_value; }
-
-    private:
-        int f_first_value;
-        std::string f_second_value;
-};
-
-int main( int argc, char **argv )
-{
-    test_app the_main( false ); // boolean option is for skipping use of a config file
-
-    CLI11_PARSE( the_main, argc, argv );
-
-    LPROG( testlog, "First value: " << the_main.get_first_value() );
-    LPROG( testlog, "Second value: " << the_main.second_value() );
-    LPROG( testlog, "Third value: " << the_main.primary_config()["third-value"]() );
-
-    return 0;
-}
diff --git a/Src/Scarab/testing/applications/test_app_with_subcommands.cc b/Src/Scarab/testing/applications/test_app_with_subcommands.cc
deleted file mode 100644
index cc7ebe9..0000000
--- a/Src/Scarab/testing/applications/test_app_with_subcommands.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * test_app_with_subcommands.cc
- *
- *  Created on: Jul 24, 2018
- *      Author: N.S. Oblath
- *  Output examples:
- *
-> bin/test_app_with_subcommands
-
-A subcommand is required
-Run with --help for more information.
-
-
-> bin/test_app_with_subcommands get
-
-2018-07-24 14:06:45 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
-
-{
-}
-
-2018-07-24 14:06:45 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
-
-[
-]
-
-2018-07-24 14:06:45 [ PROG] (tid 0x7fff9c9dc380) h_subcommands.cc(65): Value is: 5
-
-
-> bin/test_app_with_subcommands set value=10
-
-2018-07-24 14:06:59 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(92): Final configuration:
-
-{
-    value : 10
-}
-
-2018-07-24 14:06:59 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(93): Ordered args:
-
-[
-]
-
-2018-07-24 14:06:59 [ PROG] (tid 0x7fff9c9dc380) h_subcommands.cc(72): Just to check: 10
-
- *
- */
-
-#include "application.hh"
-
-#include "logger.hh"
-
-LOGGER( testlog, "test_app_with_subcommands" );
-
-namespace scarab
-{
-    struct get_or_set
-    {
-        get_or_set() : f_value( 5 ) {}
-
-        void setup_subcommands( main_app& an_app )
-        {
-            app* t_sc_get = an_app.add_subcommand( "get", "Get the value" );
-            t_sc_get->callback([this]() { this->get(); } );
-
-            app* t_sc_set = an_app.add_subcommand( "set", "Set the value" );
-            t_sc_set->callback([&an_app, this]() { this->set( an_app ); } );
-
-            return;
-        }
-
-        void get()
-        {
-            LPROG( testlog, "Value is: " << f_value );
-            return;
-        }
-
-        void set( const main_app& an_app )
-        {
-            f_value = an_app.primary_config().get_value( "value", f_value );
-            LPROG( testlog, "Just to check: " << f_value );
-            return;
-        }
-
-        int f_value;
-    };
-}
-
-
-using namespace scarab;
-
-int main( int argc, char **argv )
-{
-    main_app the_main;
-    the_main.require_subcommand();
-    the_main.fallthrough();
-
-    get_or_set t_gos;
-    t_gos.setup_subcommands( the_main );
-
-    CLI11_PARSE( the_main, argc, argv );
-
-    return 0;
-}
diff --git a/Src/Scarab/testing/applications/test_basic_application.cc b/Src/Scarab/testing/applications/test_basic_application.cc
deleted file mode 100644
index 1e5b853..0000000
--- a/Src/Scarab/testing/applications/test_basic_application.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * test_basic_application.cc
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- *
- *  Output examples:
- *
-> bin/test_basic_application -v
-
-2018-07-23 23:25:17 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(36):
-Executable: "test_basic_application"
-Location: "/Users/obla999/Work/Project8/Software/scarab/library/build-cli-debug/bin"
-Built with Scarab version 2.2.0
-Git commit: 44d2aecaa570180d24cb3b5a2a2a64c792c10059
-
-> bin/test_basic_application -h
-
-Usage: bin/test_basic_application [OPTIONS]
-
-Options:
-  -h,--help                   Print this help message and exit
-  -c,--config FILE            Config file filename
-  --verbosity UINT            Global logger verosity
-  -v,--version                Print the version message and exit
-
-> bin/test_basic_application test=teststr test-ordered
-
-2018-07-24 08:54:26 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(122): Final configuration:
-
-{
-    test : teststr
-}
-
-2018-07-24 08:54:26 [ PROG] (tid 0x7fff9c9dc380) i/application.cc(123): Ordered args:
-
-[
-    test-ordered
-]
-
- *
- */
-
-#include "application.hh"
-
-using namespace scarab;
-
-int main( int argc, char **argv )
-{
-    main_app the_main( false );
-
-    CLI11_PARSE( the_main, argc, argv );
-
-    return 0;
-}
-
diff --git a/Src/Scarab/testing/applications/test_raise_sigabrt.cc b/Src/Scarab/testing/applications/test_raise_sigabrt.cc
deleted file mode 100644
index ab261e9..0000000
--- a/Src/Scarab/testing/applications/test_raise_sigabrt.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * test_raise_sigabrt.cc
- *
- *  Created on: Jul 20, 2020
- *      Author: N.S. Oblath
- * 
- *  Use: 
- *    > bin/test_raise_sigabrt
- * 
- *  The signal should be caught and the application exit cleanly.
- *  Since this is an error signal, a stack trace should be displayed.
- * 
- *  Example output (irrelevant lines removed):
- * 
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(78): Handling SIGTERM
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
- * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(187): Handling termination due to an error condition; signal <6>
- * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(254): Backtrace from terminate() returned 9 frames
- * 
- * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(263): Backtrace:
- * [bt]: (0) 0   libScarab.dylib                     0x000000010233afca _ZN6scarab14signal_handler17print_stack_traceEv + 42
- * [bt]: (1) 1   libScarab.dylib                     0x000000010233aa34 _ZN6scarab14signal_handler9terminateEi + 68
- * [bt]: (2) 2   libScarab.dylib                     0x0000000102339bc2 _ZN6scarab14signal_handler22handle_terminate_errorEi + 434
- * [bt]: (3) 3   libsystem_platform.dylib            0x00007fff7300ab5d _sigtramp + 29
- * [bt]: (4) 4   ???                                 0x000000010dbbcf50 0x0 + 4525379408
- * [bt]: (5) 5   libsystem_c.dylib                   0x00007fff72e77d8a raise + 26
- * [bt]: (6) 6   test_raise_sigterm                  0x0000000102326f80 main + 32
- * [bt]: (7) 7   libdyld.dylib                       0x00007fff72e1f3d5 start + 1
- * [bt]: (8) 8   ???                                 0x0000000000000001 0x0 + 1
- * 
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(273): Canceling all cancelables
- * 
- */
-
-#include "signal_handler.hh"
-
-
-#include <signal.h>
-
-
-int main(int , char ** )
-{
-    scarab::signal_handler t_handler;
-    
-    raise( SIGABRT );
-
-    return( EXIT_SUCCESS );
-}
diff --git a/Src/Scarab/testing/applications/test_raise_sigint.cc b/Src/Scarab/testing/applications/test_raise_sigint.cc
deleted file mode 100644
index e5c1795..0000000
--- a/Src/Scarab/testing/applications/test_raise_sigint.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * test_raise_sigint.cc
- *
- *  Created on: Jul 20, 2020
- *      Author: N.S. Oblath
- * 
- *  Use: 
- *    > bin/test_raise_sigint
- * 
- *  The signal should be caught and the application exit cleanly.
- * 
- *  Example output (irrelevant lines removed):
- * 
- * ➜  build-sighandler-debug git:(scarab3/feature/termination) ✗ bin/test_raise_sigint       
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(78): Handling SIGTERM
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
- * 2020-07-20 14:35:30 [ PROG] (tid 0x1098eb5c0) ignal_handler.cc(195): Handling termination; signal <2>
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(273): Canceling all cancelables
- * 
- */
-
-#include "signal_handler.hh"
-
-
-#include <signal.h>
-
-
-int main(int , char ** )
-{
-    scarab::signal_handler t_handler;
-
-    raise( SIGINT );
-
-    return( EXIT_SUCCESS );
-}
diff --git a/Src/Scarab/testing/applications/test_raise_sigquit.cc b/Src/Scarab/testing/applications/test_raise_sigquit.cc
deleted file mode 100644
index 27aeb97..0000000
--- a/Src/Scarab/testing/applications/test_raise_sigquit.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * test_raise_sigquit.cc
- *
- *  Created on: Jul 20, 2020
- *      Author: N.S. Oblath
- * 
- *  Use: 
- *    > bin/test_raise_sigquit
- * 
- *  The signal should be caught and the application exit cleanly.
- * 
- *  Example output (irrelevant lines removed):
- * 
- * ➜  build-sighandler-debug git:(scarab3/feature/termination) ✗ bin/test_raise_sigquit       
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(78): Handling SIGTERM
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
- * 2020-07-20 14:35:30 [ PROG] (tid 0x1098eb5c0) ignal_handler.cc(195): Handling termination; signal <3>
- * 2020-07-20 14:35:30 [DEBUG] (tid 0x1098eb5c0) ignal_handler.cc(273): Canceling all cancelables
- * 
- */
-
-#include "signal_handler.hh"
-
-
-#include <signal.h>
-
-
-int main(int , char ** )
-{
-    scarab::signal_handler t_handler;
-
-    raise( SIGQUIT );
-
-    return( EXIT_SUCCESS );
-}
diff --git a/Src/Scarab/testing/applications/test_raise_sigterm.cc b/Src/Scarab/testing/applications/test_raise_sigterm.cc
deleted file mode 100644
index 8a1feaa..0000000
--- a/Src/Scarab/testing/applications/test_raise_sigterm.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * test_raise_sigterm.cc
- *
- *  Created on: Jul 20, 2020
- *      Author: N.S. Oblath
- * 
- *  Use: 
- *    > bin/test_raise_sigterm
- * 
- *  The signal should be caught and the application exit cleanly.
- *  Since this is an error signal, a stack trace should be displayed.
- * 
- *  Example output (irrelevant lines removed):
- * 
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(78): Handling SIGTERM
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(89): Handling SIGINT (ctrl-c)
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(101): Handling SIGQUIT (ctrl-\)
- * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(187): Handling termination due to an error condition; signal <15>
- * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(254): Backtrace from terminate() returned 9 frames
- * 
- * 2020-07-20 14:39:53 [ERROR] (tid 0x10dbef5c0) ignal_handler.cc(263): Backtrace:
- * [bt]: (0) 0   libScarab.dylib                     0x000000010233afca _ZN6scarab14signal_handler17print_stack_traceEv + 42
- * [bt]: (1) 1   libScarab.dylib                     0x000000010233aa34 _ZN6scarab14signal_handler9terminateEi + 68
- * [bt]: (2) 2   libScarab.dylib                     0x0000000102339bc2 _ZN6scarab14signal_handler22handle_terminate_errorEi + 434
- * [bt]: (3) 3   libsystem_platform.dylib            0x00007fff7300ab5d _sigtramp + 29
- * [bt]: (4) 4   ???                                 0x000000010dbbcf50 0x0 + 4525379408
- * [bt]: (5) 5   libsystem_c.dylib                   0x00007fff72e77d8a raise + 26
- * [bt]: (6) 6   test_raise_sigterm                  0x0000000102326f80 main + 32
- * [bt]: (7) 7   libdyld.dylib                       0x00007fff72e1f3d5 start + 1
- * [bt]: (8) 8   ???                                 0x0000000000000001 0x0 + 1
- * 
- * 2020-07-20 14:39:53 [DEBUG] (tid 0x10dbef5c0) ignal_handler.cc(273): Canceling all cancelables
- * 
- */
-
-#include "signal_handler.hh"
-
-
-#include <signal.h>
-
-
-int main(int , char ** )
-{
-    scarab::signal_handler t_handler;
-
-    raise( SIGTERM );
-
-    return( EXIT_SUCCESS );
-}
diff --git a/Src/Scarab/testing/applications/test_unhandled_exception.cc b/Src/Scarab/testing/applications/test_unhandled_exception.cc
deleted file mode 100644
index 0dd6f45..0000000
--- a/Src/Scarab/testing/applications/test_unhandled_exception.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * test_unhandled_exception.cc
- *
- *  Created on: May 23, 2017
- *      Author: N.S. Oblath
- * 
- *  Use: 
- *    > bin/terminate
- * 
- *  The unhandled exception should result in terminate() being called.
- *  The exception should be printed, and a stack trace displayed.
- */
-
-#include "signal_handler.hh"
-
-#include "logger.hh"
-
-LOGGER( slog, "test_unhandled_exception" );
-
-namespace scarab
-{
-    int throw_exception()
-    {
-        // throw an unhandled runtime error
-        throw std::runtime_error("RUNTIME ERROR!");
-        return 0;
-    }
-
-    int foo2()
-    {
-        throw_exception();
-        return 0;
-    }
-
-    int foo1()
-    {
-        foo2();
-        return 0;
-    }
-}
-
-int main(int , char ** )
-{
-    scarab::signal_handler t_handler;
-
-    // cause the unhandled exception to be thrown, which should exit immediately
-    scarab::foo1();
-
-    LERROR( slog, "This should never print" );
-
-    return( EXIT_SUCCESS );
-}
diff --git a/Src/Scarab/testing/catch/catch.hpp b/Src/Scarab/testing/catch/catch.hpp
deleted file mode 100644
index b066b71..0000000
--- a/Src/Scarab/testing/catch/catch.hpp
+++ /dev/null
@@ -1,17758 +0,0 @@
-/*
- *  Catch v2.12.4
- *  Generated: 2020-07-05 11:47:18.451282
- *  ----------------------------------------------------------
- *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
- *
- *  Distributed under the Boost Software License, Version 1.0. (See accompanying
- *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- */
-#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-// start catch.hpp
-
-
-#define CATCH_VERSION_MAJOR 2
-#define CATCH_VERSION_MINOR 12
-#define CATCH_VERSION_PATCH 4
-
-#ifdef __clang__
-#    pragma clang system_header
-#elif defined __GNUC__
-#    pragma GCC system_header
-#endif
-
-// start catch_suppress_warnings.h
-
-#ifdef __clang__
-#   ifdef __ICC // icpc defines the __clang__ macro
-#       pragma warning(push)
-#       pragma warning(disable: 161 1682)
-#   else // __ICC
-#       pragma clang diagnostic push
-#       pragma clang diagnostic ignored "-Wpadded"
-#       pragma clang diagnostic ignored "-Wswitch-enum"
-#       pragma clang diagnostic ignored "-Wcovered-switch-default"
-#    endif
-#elif defined __GNUC__
-     // Because REQUIREs trigger GCC's -Wparentheses, and because still
-     // supported version of g++ have only buggy support for _Pragmas,
-     // Wparentheses have to be suppressed globally.
-#    pragma GCC diagnostic ignored "-Wparentheses" // See #674 for details
-
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wunused-variable"
-#    pragma GCC diagnostic ignored "-Wpadded"
-#endif
-// end catch_suppress_warnings.h
-#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
-#  define CATCH_IMPL
-#  define CATCH_CONFIG_ALL_PARTS
-#endif
-
-// In the impl file, we want to have access to all parts of the headers
-// Can also be used to sanely support PCHs
-#if defined(CATCH_CONFIG_ALL_PARTS)
-#  define CATCH_CONFIG_EXTERNAL_INTERFACES
-#  if defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#    undef CATCH_CONFIG_DISABLE_MATCHERS
-#  endif
-#  if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#    define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  endif
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-// start catch_platform.h
-
-#ifdef __APPLE__
-# include <TargetConditionals.h>
-# if TARGET_OS_OSX == 1
-#  define CATCH_PLATFORM_MAC
-# elif TARGET_OS_IPHONE == 1
-#  define CATCH_PLATFORM_IPHONE
-# endif
-
-#elif defined(linux) || defined(__linux) || defined(__linux__)
-#  define CATCH_PLATFORM_LINUX
-
-#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || defined(__MINGW32__)
-#  define CATCH_PLATFORM_WINDOWS
-#endif
-
-// end catch_platform.h
-
-#ifdef CATCH_IMPL
-#  ifndef CLARA_CONFIG_MAIN
-#    define CLARA_CONFIG_MAIN_NOT_DEFINED
-#    define CLARA_CONFIG_MAIN
-#  endif
-#endif
-
-// start catch_user_interfaces.h
-
-namespace Catch {
-    unsigned int rngSeed();
-}
-
-// end catch_user_interfaces.h
-// start catch_tag_alias_autoregistrar.h
-
-// start catch_common.h
-
-// start catch_compiler_capabilities.h
-
-// Detect a number of compiler features - by compiler
-// The following features are defined:
-//
-// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
-// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
-// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
-// CATCH_CONFIG_DISABLE_EXCEPTIONS : Are exceptions enabled?
-// ****************
-// Note to maintainers: if new toggles are added please document them
-// in configuration.md, too
-// ****************
-
-// In general each macro has a _NO_<feature name> form
-// (e.g. CATCH_CONFIG_NO_POSIX_SIGNALS) which disables the feature.
-// Many features, at point of detection, define an _INTERNAL_ macro, so they
-// can be combined, en-mass, with the _NO_ forms later.
-
-#ifdef __cplusplus
-
-#  if (__cplusplus >= 201402L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201402L)
-#    define CATCH_CPP14_OR_GREATER
-#  endif
-
-#  if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703L)
-#    define CATCH_CPP17_OR_GREATER
-#  endif
-
-#endif
-
-#if defined(__cpp_lib_uncaught_exceptions)
-#  define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
-
-// We have to avoid both ICC and Clang, because they try to mask themselves
-// as gcc, and we want only GCC in this block
-#if defined(__GNUC__) && !defined(__clang__) && !defined(__ICC)
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "GCC diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "GCC diagnostic pop" )
-
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__)
-
-#endif
-
-#if defined(__clang__)
-
-#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma( "clang diagnostic push" )
-#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma( "clang diagnostic pop" )
-
-// As of this writing, IBM XL's implementation of __builtin_constant_p has a bug
-// which results in calls to destructors being emitted for each temporary,
-// without a matching initialization. In practice, this can result in something
-// like `std::string::~string` being called on an uninitialized value.
-//
-// For example, this code will likely segfault under IBM XL:
-// ```
-// REQUIRE(std::string("12") + "34" == "1234")
-// ```
-//
-// Therefore, `CATCH_INTERNAL_IGNORE_BUT_WARN` is not implemented.
-#  if !defined(__ibmxl__)
-#    define CATCH_INTERNAL_IGNORE_BUT_WARN(...) (void)__builtin_constant_p(__VA_ARGS__) /* NOLINT(cppcoreguidelines-pro-type-vararg, hicpp-vararg) */
-#  endif
-
-#    define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" ) \
-         _Pragma( "clang diagnostic ignored \"-Wglobal-constructors\"")
-
-#    define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-variable\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wgnu-zero-variadic-macro-arguments\"" )
-
-#    define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-         _Pragma( "clang diagnostic ignored \"-Wunused-template\"" )
-
-#endif // __clang__
-
-////////////////////////////////////////////////////////////////////////////////
-// Assume that non-Windows platforms support posix signals by default
-#if !defined(CATCH_PLATFORM_WINDOWS)
-    #define CATCH_INTERNAL_CONFIG_POSIX_SIGNALS
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// We know some environments not to support full POSIX signals
-#if defined(__CYGWIN__) || defined(__QNX__) || defined(__EMSCRIPTEN__) || defined(__DJGPP__)
-    #define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#endif
-
-#ifdef __OS400__
-#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
-#       define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Android somehow still does not support std::to_string
-#if defined(__ANDROID__)
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-#    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Not all Windows environments support SEH properly
-#if defined(__MINGW32__)
-#    define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// PS4
-#if defined(__ORBIS__)
-#    define CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// Cygwin
-#ifdef __CYGWIN__
-
-// Required for some versions of Cygwin to declare gettimeofday
-// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
-#   define _BSD_SOURCE
-// some versions of cygwin (most) do not support std::to_string. Use the libstd check.
-// https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813
-# if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-           && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
-
-#    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING
-
-# endif
-#endif // __CYGWIN__
-
-////////////////////////////////////////////////////////////////////////////////
-// Visual C++
-#if defined(_MSC_VER)
-
-#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
-#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
-
-#  if _MSC_VER >= 1900 // Visual Studio 2015 or newer
-#    define CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#  endif
-
-// Universal Windows platform does not support SEH
-// Or console colours (or console at all...)
-#  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
-#    define CATCH_CONFIG_COLOUR_NONE
-#  else
-#    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
-#  endif
-
-// MSVC traditional preprocessor needs some workaround for __VA_ARGS__
-// _MSVC_TRADITIONAL == 0 means new conformant preprocessor
-// _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
-#  if !defined(__clang__) // Handle Clang masquerading for msvc
-#    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
-#      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#    endif // MSVC_TRADITIONAL
-#  endif // __clang__
-
-#endif // _MSC_VER
-
-#if defined(_REENTRANT) || defined(_MSC_VER)
-// Enable async processing, as -pthread is specified or no additional linking is required
-# define CATCH_INTERNAL_CONFIG_USE_ASYNC
-#endif // _MSC_VER
-
-////////////////////////////////////////////////////////////////////////////////
-// Check if we are compiled with -fno-exceptions or equivalent
-#if defined(__EXCEPTIONS) || defined(__cpp_exceptions) || defined(_CPPUNWIND)
-#  define CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-// DJGPP
-#ifdef __DJGPP__
-#  define CATCH_INTERNAL_CONFIG_NO_WCHAR
-#endif // __DJGPP__
-
-////////////////////////////////////////////////////////////////////////////////
-// Embarcadero C++Build
-#if defined(__BORLANDC__)
-    #define CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Use of __COUNTER__ is suppressed during code analysis in
-// CLion/AppCode 2017.2.x and former, because __COUNTER__ is not properly
-// handled by it.
-// Otherwise all supported compilers support COUNTER macro,
-// but user still might want to turn it off
-#if ( !defined(__JETBRAINS_IDE__) || __JETBRAINS_IDE__ >= 20170300L )
-    #define CATCH_INTERNAL_CONFIG_COUNTER
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-// RTX is a special version of Windows that is real time.
-// This means that it is detected as Windows, but does not provide
-// the same set of capabilities as real Windows does.
-#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
-    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
-    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
-    #define CATCH_CONFIG_COLOUR_NONE
-#endif
-
-#if !defined(_GLIBCXX_USE_C99_MATH_TR1)
-#define CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Various stdlib support checks that require __has_include
-#if defined(__has_include)
-  // Check if string_view is available and usable
-  #if __has_include(<string_view>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW
-  #endif
-
-  // Check if optional is available and usable
-  #  if __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL
-  #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if byte is available and usable
-  #  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-  #    define CATCH_INTERNAL_CONFIG_CPP17_BYTE
-  #  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
-
-  // Check if variant is available and usable
-  #  if __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-  #    if defined(__clang__) && (__clang_major__ < 8)
-         // work around clang bug with libstdc++ https://bugs.llvm.org/show_bug.cgi?id=31852
-         // fix should be in clang 8, workaround in libstdc++ 8.2
-  #      include <ciso646>
-  #      if defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #        define CATCH_CONFIG_NO_CPP17_VARIANT
-  #      else
-  #        define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #      endif // defined(__GLIBCXX__) && defined(_GLIBCXX_RELEASE) && (_GLIBCXX_RELEASE < 9)
-  #    else
-  #      define CATCH_INTERNAL_CONFIG_CPP17_VARIANT
-  #    endif // defined(__clang__) && (__clang_major__ < 8)
-  #  endif // __has_include(<variant>) && defined(CATCH_CPP17_OR_GREATER)
-#endif // defined(__has_include)
-
-#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
-#   define CATCH_CONFIG_COUNTER
-#endif
-#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH) && !defined(CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH)
-#   define CATCH_CONFIG_WINDOWS_SEH
-#endif
-// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
-#if defined(CATCH_INTERNAL_CONFIG_POSIX_SIGNALS) && !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
-#   define CATCH_CONFIG_POSIX_SIGNALS
-#endif
-// This is set by default, because we assume that compilers with no wchar_t support are just rare exceptions.
-#if !defined(CATCH_INTERNAL_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_NO_WCHAR) && !defined(CATCH_CONFIG_WCHAR)
-#   define CATCH_CONFIG_WCHAR
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_NO_CPP11_TO_STRING) && !defined(CATCH_CONFIG_CPP11_TO_STRING)
-#    define CATCH_CONFIG_CPP11_TO_STRING
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_NO_CPP17_OPTIONAL) && !defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#  define CATCH_CONFIG_CPP17_OPTIONAL
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_NO_CPP17_UNCAUGHT_EXCEPTIONS) && !defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-#  define CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_NO_CPP17_STRING_VIEW) && !defined(CATCH_CONFIG_CPP17_STRING_VIEW)
-#  define CATCH_CONFIG_CPP17_STRING_VIEW
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_VARIANT) && !defined(CATCH_CONFIG_NO_CPP17_VARIANT) && !defined(CATCH_CONFIG_CPP17_VARIANT)
-#  define CATCH_CONFIG_CPP17_VARIANT
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
-#  define CATCH_CONFIG_CPP17_BYTE
-#endif
-
-#if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-#  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_NEW_CAPTURE) && !defined(CATCH_INTERNAL_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NO_NEW_CAPTURE) && !defined(CATCH_CONFIG_NEW_CAPTURE)
-#  define CATCH_CONFIG_NEW_CAPTURE
-#endif
-
-#if !defined(CATCH_INTERNAL_CONFIG_EXCEPTIONS_ENABLED) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#  define CATCH_CONFIG_DISABLE_EXCEPTIONS
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_NO_POLYFILL_ISNAN) && !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-#  define CATCH_CONFIG_POLYFILL_ISNAN
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
-#  define CATCH_CONFIG_USE_ASYNC
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#  define CATCH_CONFIG_ANDROID_LOGWRITE
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_NO_GLOBAL_NEXTAFTER) && !defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-#  define CATCH_CONFIG_GLOBAL_NEXTAFTER
-#endif
-
-// Even if we do not think the compiler has that warning, we still have
-// to provide a macro that can be used by the code.
-#if !defined(CATCH_INTERNAL_START_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION)
-#   define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS
-#endif
-#if !defined(CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS
-#endif
-
-// The goal of this macro is to avoid evaluation of the arguments, but
-// still have the compiler warn on problems inside...
-#if !defined(CATCH_INTERNAL_IGNORE_BUT_WARN)
-#   define CATCH_INTERNAL_IGNORE_BUT_WARN(...)
-#endif
-
-#if defined(__APPLE__) && defined(__apple_build_version__) && (__clang_major__ < 10)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#elif defined(__clang__) && (__clang_major__ < 5)
-#   undef CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if !defined(CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS)
-#   define CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS
-#endif
-
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-#define CATCH_TRY if ((true))
-#define CATCH_CATCH_ALL if ((false))
-#define CATCH_CATCH_ANON(type) if ((false))
-#else
-#define CATCH_TRY try
-#define CATCH_CATCH_ALL catch (...)
-#define CATCH_CATCH_ANON(type) catch (type)
-#endif
-
-#if defined(CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_NO_TRADITIONAL_MSVC_PREPROCESSOR) && !defined(CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR)
-#define CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#endif
-
-// end catch_compiler_capabilities.h
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
-#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
-#ifdef CATCH_CONFIG_COUNTER
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
-#else
-#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
-#endif
-
-#include <iosfwd>
-#include <string>
-#include <cstdint>
-
-// We need a dummy global operator<< so we can bring it into Catch namespace later
-struct Catch_global_namespace_dummy {};
-std::ostream& operator<<(std::ostream&, Catch_global_namespace_dummy);
-
-namespace Catch {
-
-    struct CaseSensitive { enum Choice {
-        Yes,
-        No
-    }; };
-
-    class NonCopyable {
-        NonCopyable( NonCopyable const& )              = delete;
-        NonCopyable( NonCopyable && )                  = delete;
-        NonCopyable& operator = ( NonCopyable const& ) = delete;
-        NonCopyable& operator = ( NonCopyable && )     = delete;
-
-    protected:
-        NonCopyable();
-        virtual ~NonCopyable();
-    };
-
-    struct SourceLineInfo {
-
-        SourceLineInfo() = delete;
-        SourceLineInfo( char const* _file, std::size_t _line ) noexcept
-        :   file( _file ),
-            line( _line )
-        {}
-
-        SourceLineInfo( SourceLineInfo const& other )            = default;
-        SourceLineInfo& operator = ( SourceLineInfo const& )     = default;
-        SourceLineInfo( SourceLineInfo&& )              noexcept = default;
-        SourceLineInfo& operator = ( SourceLineInfo&& ) noexcept = default;
-
-        bool empty() const noexcept { return file[0] == '\0'; }
-        bool operator == ( SourceLineInfo const& other ) const noexcept;
-        bool operator < ( SourceLineInfo const& other ) const noexcept;
-
-        char const* file;
-        std::size_t line;
-    };
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
-
-    // Bring in operator<< from global namespace into Catch namespace
-    // This is necessary because the overload of operator<< above makes
-    // lookup stop at namespace Catch
-    using ::operator<<;
-
-    // Use this in variadic streaming macros to allow
-    //    >> +StreamEndStop
-    // as well as
-    //    >> stuff +StreamEndStop
-    struct StreamEndStop {
-        std::string operator+() const;
-    };
-    template<typename T>
-    T const& operator + ( T const& value, StreamEndStop ) {
-        return value;
-    }
-}
-
-#define CATCH_INTERNAL_LINEINFO \
-    ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
-
-// end catch_common.h
-namespace Catch {
-
-    struct RegistrarForTagAliases {
-        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
-    };
-
-} // end namespace Catch
-
-#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_tag_alias_autoregistrar.h
-// start catch_test_registry.h
-
-// start catch_interfaces_testcase.h
-
-#include <vector>
-
-namespace Catch {
-
-    class TestSpec;
-
-    struct ITestInvoker {
-        virtual void invoke () const = 0;
-        virtual ~ITestInvoker();
-    };
-
-    class TestCase;
-    struct IConfig;
-
-    struct ITestCaseRegistry {
-        virtual ~ITestCaseRegistry();
-        virtual std::vector<TestCase> const& getAllTests() const = 0;
-        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
-    };
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-}
-
-// end catch_interfaces_testcase.h
-// start catch_stringref.h
-
-#include <cstddef>
-#include <string>
-#include <iosfwd>
-#include <cassert>
-
-namespace Catch {
-
-    /// A non-owning string class (similar to the forthcoming std::string_view)
-    /// Note that, because a StringRef may be a substring of another string,
-    /// it may not be null terminated.
-    class StringRef {
-    public:
-        using size_type = std::size_t;
-        using const_iterator = const char*;
-
-    private:
-        static constexpr char const* const s_empty = "";
-
-        char const* m_start = s_empty;
-        size_type m_size = 0;
-
-    public: // construction
-        constexpr StringRef() noexcept = default;
-
-        StringRef( char const* rawChars ) noexcept;
-
-        constexpr StringRef( char const* rawChars, size_type size ) noexcept
-        :   m_start( rawChars ),
-            m_size( size )
-        {}
-
-        StringRef( std::string const& stdString ) noexcept
-        :   m_start( stdString.c_str() ),
-            m_size( stdString.size() )
-        {}
-
-        explicit operator std::string() const {
-            return std::string(m_start, m_size);
-        }
-
-    public: // operators
-        auto operator == ( StringRef const& other ) const noexcept -> bool;
-        auto operator != (StringRef const& other) const noexcept -> bool {
-            return !(*this == other);
-        }
-
-        auto operator[] ( size_type index ) const noexcept -> char {
-            assert(index < m_size);
-            return m_start[index];
-        }
-
-    public: // named queries
-        constexpr auto empty() const noexcept -> bool {
-            return m_size == 0;
-        }
-        constexpr auto size() const noexcept -> size_type {
-            return m_size;
-        }
-
-        // Returns the current start pointer. If the StringRef is not
-        // null-terminated, throws std::domain_exception
-        auto c_str() const -> char const*;
-
-    public: // substrings and searches
-        // Returns a substring of [start, start + length).
-        // If start + length > size(), then the substring is [start, size()).
-        // If start > size(), then the substring is empty.
-        auto substr( size_type start, size_type length ) const noexcept -> StringRef;
-
-        // Returns the current start pointer. May not be null-terminated.
-        auto data() const noexcept -> char const*;
-
-        constexpr auto isNullTerminated() const noexcept -> bool {
-            return m_start[m_size] == '\0';
-        }
-
-    public: // iterators
-        constexpr const_iterator begin() const { return m_start; }
-        constexpr const_iterator end() const { return m_start + m_size; }
-    };
-
-    auto operator += ( std::string& lhs, StringRef const& sr ) -> std::string&;
-    auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
-
-    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
-        return StringRef( rawChars, size );
-    }
-} // namespace Catch
-
-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
-    return Catch::StringRef( rawChars, size );
-}
-
-// end catch_stringref.h
-// start catch_preprocessor.hpp
-
-
-#define CATCH_RECURSION_LEVEL0(...) __VA_ARGS__
-#define CATCH_RECURSION_LEVEL1(...) CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(CATCH_RECURSION_LEVEL0(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL2(...) CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(CATCH_RECURSION_LEVEL1(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL3(...) CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(CATCH_RECURSION_LEVEL2(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL4(...) CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(CATCH_RECURSION_LEVEL3(__VA_ARGS__)))
-#define CATCH_RECURSION_LEVEL5(...) CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(CATCH_RECURSION_LEVEL4(__VA_ARGS__)))
-
-#ifdef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_EXPAND_VARGS(...) __VA_ARGS__
-// MSVC needs more evaluations
-#define CATCH_RECURSION_LEVEL6(...) CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(CATCH_RECURSION_LEVEL5(__VA_ARGS__)))
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL6(CATCH_RECURSION_LEVEL6(__VA_ARGS__))
-#else
-#define CATCH_RECURSE(...)  CATCH_RECURSION_LEVEL5(__VA_ARGS__)
-#endif
-
-#define CATCH_REC_END(...)
-#define CATCH_REC_OUT
-
-#define CATCH_EMPTY()
-#define CATCH_DEFER(id) id CATCH_EMPTY()
-
-#define CATCH_REC_GET_END2() 0, CATCH_REC_END
-#define CATCH_REC_GET_END1(...) CATCH_REC_GET_END2
-#define CATCH_REC_GET_END(...) CATCH_REC_GET_END1
-#define CATCH_REC_NEXT0(test, next, ...) next CATCH_REC_OUT
-#define CATCH_REC_NEXT1(test, next) CATCH_DEFER ( CATCH_REC_NEXT0 ) ( test, next, 0)
-#define CATCH_REC_NEXT(test, next)  CATCH_REC_NEXT1(CATCH_REC_GET_END test, next)
-
-#define CATCH_REC_LIST0(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1(f, x, peek, ...) , f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0) ) ( f, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2(f, x, peek, ...)   f(x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1) ) ( f, peek, __VA_ARGS__ )
-
-#define CATCH_REC_LIST0_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST1_UD(f, userdata, x, peek, ...) , f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST0_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-#define CATCH_REC_LIST2_UD(f, userdata, x, peek, ...)   f(userdata, x) CATCH_DEFER ( CATCH_REC_NEXT(peek, CATCH_REC_LIST1_UD) ) ( f, userdata, peek, __VA_ARGS__ )
-
-// Applies the function macro `f` to each of the remaining parameters, inserts commas between the results,
-// and passes userdata as the first parameter to each invocation,
-// e.g. CATCH_REC_LIST_UD(f, x, a, b, c) evaluates to f(x, a), f(x, b), f(x, c)
-#define CATCH_REC_LIST_UD(f, userdata, ...) CATCH_RECURSE(CATCH_REC_LIST2_UD(f, userdata, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define CATCH_REC_LIST(f, ...) CATCH_RECURSE(CATCH_REC_LIST2(f, __VA_ARGS__, ()()(), ()()(), ()()(), 0))
-
-#define INTERNAL_CATCH_EXPAND1(param) INTERNAL_CATCH_EXPAND2(param)
-#define INTERNAL_CATCH_EXPAND2(...) INTERNAL_CATCH_NO## __VA_ARGS__
-#define INTERNAL_CATCH_DEF(...) INTERNAL_CATCH_DEF __VA_ARGS__
-#define INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE(...) INTERNAL_CATCH_STRINGIZE2(__VA_ARGS__)
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_STRINGIZE2(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param))
-#else
-// MSVC is adding extra space and needs another indirection to expand INTERNAL_CATCH_NOINTERNAL_CATCH_DEF
-#define INTERNAL_CATCH_STRINGIZE2(...) INTERNAL_CATCH_STRINGIZE3(__VA_ARGS__)
-#define INTERNAL_CATCH_STRINGIZE3(...) #__VA_ARGS__
-#define INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS(param) (INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_REMOVE_PARENS(param)) + 1)
-#endif
-
-#define INTERNAL_CATCH_MAKE_NAMESPACE2(...) ns_##__VA_ARGS__
-#define INTERNAL_CATCH_MAKE_NAMESPACE(name) INTERNAL_CATCH_MAKE_NAMESPACE2(name)
-
-#define INTERNAL_CATCH_REMOVE_PARENS(...) INTERNAL_CATCH_EXPAND1(INTERNAL_CATCH_DEF __VA_ARGS__)
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>())
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__))
-#else
-#define INTERNAL_CATCH_MAKE_TYPE_LIST2(...) INTERNAL_CATCH_EXPAND_VARGS(decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS_GEN(__VA_ARGS__)>()))
-#define INTERNAL_CATCH_MAKE_TYPE_LIST(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_MAKE_TYPE_LIST2(INTERNAL_CATCH_REMOVE_PARENS(__VA_ARGS__)))
-#endif
-
-#define INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(...)\
-    CATCH_REC_LIST(INTERNAL_CATCH_MAKE_TYPE_LIST,__VA_ARGS__)
-
-#define INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_0) INTERNAL_CATCH_REMOVE_PARENS(_0)
-#define INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_0, _1) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_1_ARG(_1)
-#define INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_0, _1, _2) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_2_ARG(_1, _2)
-#define INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_0, _1, _2, _3) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_3_ARG(_1, _2, _3)
-#define INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_0, _1, _2, _3, _4) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_4_ARG(_1, _2, _3, _4)
-#define INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_0, _1, _2, _3, _4, _5) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_5_ARG(_1, _2, _3, _4, _5)
-#define INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_0, _1, _2, _3, _4, _5, _6) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_6_ARG(_1, _2, _3, _4, _5, _6)
-#define INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_0, _1, _2, _3, _4, _5, _6, _7) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_7_ARG(_1, _2, _3, _4, _5, _6, _7)
-#define INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_8_ARG(_1, _2, _3, _4, _5, _6, _7, _8)
-#define INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_9_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9)
-#define INTERNAL_CATCH_REMOVE_PARENS_11_ARG(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10) INTERNAL_CATCH_REMOVE_PARENS(_0), INTERNAL_CATCH_REMOVE_PARENS_10_ARG(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10)
-
-#define INTERNAL_CATCH_VA_NARGS_IMPL(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, N, ...) N
-
-#define INTERNAL_CATCH_TYPE_GEN\
-    template<typename...> struct TypeList {};\
-    template<typename...Ts>\
-    constexpr auto get_wrapper() noexcept -> TypeList<Ts...> { return {}; }\
-    template<template<typename...> class...> struct TemplateTypeList{};\
-    template<template<typename...> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> TemplateTypeList<Cs...> { return {}; }\
-    template<typename...>\
-    struct append;\
-    template<typename...>\
-    struct rewrap;\
-    template<template<typename...> class, typename...>\
-    struct create;\
-    template<template<typename...> class, typename>\
-    struct convert;\
-    \
-    template<typename T> \
-    struct append<T> { using type = T; };\
-    template< template<typename...> class L1, typename...E1, template<typename...> class L2, typename...E2, typename...Rest>\
-    struct append<L1<E1...>, L2<E2...>, Rest...> { using type = typename append<L1<E1...,E2...>, Rest...>::type; };\
-    template< template<typename...> class L1, typename...E1, typename...Rest>\
-    struct append<L1<E1...>, TypeList<mpl_::na>, Rest...> { using type = L1<E1...>; };\
-    \
-    template< template<typename...> class Container, template<typename...> class List, typename...elems>\
-    struct rewrap<TemplateTypeList<Container>, List<elems...>> { using type = TypeList<Container<elems...>>; };\
-    template< template<typename...> class Container, template<typename...> class List, class...Elems, typename...Elements>\
-    struct rewrap<TemplateTypeList<Container>, List<Elems...>, Elements...> { using type = typename append<TypeList<Container<Elems...>>, typename rewrap<TemplateTypeList<Container>, Elements...>::type>::type; };\
-    \
-    template<template <typename...> class Final, template< typename...> class...Containers, typename...Types>\
-    struct create<Final, TemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<TemplateTypeList<Containers>, Types...>::type...>::type; };\
-    template<template <typename...> class Final, template <typename...> class List, typename...Ts>\
-    struct convert<Final, List<Ts...>> { using type = typename append<Final<>,TypeList<Ts>...>::type; };
-
-#define INTERNAL_CATCH_NTTP_1(signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> struct Nttp{};\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    constexpr auto get_wrapper() noexcept -> Nttp<__VA_ARGS__> { return {}; } \
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...> struct NttpTemplateTypeList{};\
-    template<template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Cs>\
-    constexpr auto get_wrapper() noexcept -> NttpTemplateTypeList<Cs...> { return {}; } \
-    \
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>> { using type = TypeList<Container<__VA_ARGS__>>; };\
-    template< template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class Container, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class List, INTERNAL_CATCH_REMOVE_PARENS(signature), typename...Elements>\
-    struct rewrap<NttpTemplateTypeList<Container>, List<__VA_ARGS__>, Elements...> { using type = typename append<TypeList<Container<__VA_ARGS__>>, typename rewrap<NttpTemplateTypeList<Container>, Elements...>::type>::type; };\
-    template<template <typename...> class Final, template<INTERNAL_CATCH_REMOVE_PARENS(signature)> class...Containers, typename...Types>\
-    struct create<Final, NttpTemplateTypeList<Containers...>, TypeList<Types...>> { using type = typename append<Final<>, typename rewrap<NttpTemplateTypeList<Containers>, Types...>::type...>::type; };
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST1(TestName, signature)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_X(TestName, signature,...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    static void TestName()
-
-#define INTERNAL_CATCH_NTTP_REGISTER0(TestFunc, signature)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<Type>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER(TestFunc, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestFunc<__VA_ARGS__>), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD0(TestName, signature, ...)\
-    template<typename Type>\
-    void reg_test(TypeList<Type>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<Type>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_NTTP_REGISTER_METHOD(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)>\
-    void reg_test(Nttp<__VA_ARGS__>, Catch::StringRef className, Catch::NameAndTags nameAndTags)\
-    {\
-        Catch::AutoReg( Catch::makeTestInvoker(&TestName<__VA_ARGS__>::test), CATCH_INTERNAL_LINEINFO, className, nameAndTags);\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0(TestName, ClassName)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1(TestName, ClassName, signature)\
-    template<typename TestType> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<TestType> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X(TestName, ClassName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName)<__VA_ARGS__> { \
-        void test();\
-    }
-
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0(TestName)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1(TestName, signature)\
-    template<typename TestType> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<TestType>::test()
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X(TestName, signature, ...)\
-    template<INTERNAL_CATCH_REMOVE_PARENS(signature)> \
-    void INTERNAL_CATCH_MAKE_NAMESPACE(TestName)::TestName<__VA_ARGS__>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define INTERNAL_CATCH_NTTP_0
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1(__VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_1( __VA_ARGS__),INTERNAL_CATCH_NTTP_1( __VA_ARGS__), INTERNAL_CATCH_NTTP_0)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__)
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__)
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__)
-#else
-#define INTERNAL_CATCH_NTTP_0(signature)
-#define INTERNAL_CATCH_NTTP_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_1,INTERNAL_CATCH_NTTP_1, INTERNAL_CATCH_NTTP_0)( __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD1, INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X,INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD_X, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD1, INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD0)(TestName, ClassName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD, INTERNAL_CATCH_NTTP_REGISTER_METHOD0, INTERNAL_CATCH_NTTP_REGISTER_METHOD0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_NTTP_REG_GEN(TestFunc, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER, INTERNAL_CATCH_NTTP_REGISTER0, INTERNAL_CATCH_NTTP_REGISTER0)(TestFunc, __VA_ARGS__))
-#define INTERNAL_CATCH_DEFINE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DEFINE_SIG_TEST1, INTERNAL_CATCH_DEFINE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_DECLARE_SIG_TEST(TestName, ...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL( "dummy", __VA_ARGS__, INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DEFINE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X,INTERNAL_CATCH_DECLARE_SIG_TEST_X, INTERNAL_CATCH_DECLARE_SIG_TEST1, INTERNAL_CATCH_DECLARE_SIG_TEST0)(TestName, __VA_ARGS__))
-#define INTERNAL_CATCH_REMOVE_PARENS_GEN(...) INTERNAL_CATCH_EXPAND_VARGS(INTERNAL_CATCH_VA_NARGS_IMPL(__VA_ARGS__, INTERNAL_CATCH_REMOVE_PARENS_11_ARG,INTERNAL_CATCH_REMOVE_PARENS_10_ARG,INTERNAL_CATCH_REMOVE_PARENS_9_ARG,INTERNAL_CATCH_REMOVE_PARENS_8_ARG,INTERNAL_CATCH_REMOVE_PARENS_7_ARG,INTERNAL_CATCH_REMOVE_PARENS_6_ARG,INTERNAL_CATCH_REMOVE_PARENS_5_ARG,INTERNAL_CATCH_REMOVE_PARENS_4_ARG,INTERNAL_CATCH_REMOVE_PARENS_3_ARG,INTERNAL_CATCH_REMOVE_PARENS_2_ARG,INTERNAL_CATCH_REMOVE_PARENS_1_ARG)(__VA_ARGS__))
-#endif
-
-// end catch_preprocessor.hpp
-// start catch_meta.hpp
-
-
-#include <type_traits>
-
-namespace Catch {
-    template<typename T>
-    struct always_false : std::false_type {};
-
-    template <typename> struct true_given : std::true_type {};
-    struct is_callable_tester {
-        template <typename Fun, typename... Args>
-        true_given<decltype(std::declval<Fun>()(std::declval<Args>()...))> static test(int);
-        template <typename...>
-        std::false_type static test(...);
-    };
-
-    template <typename T>
-    struct is_callable;
-
-    template <typename Fun, typename... Args>
-    struct is_callable<Fun(Args...)> : decltype(is_callable_tester::test<Fun, Args...>(0)) {};
-
-#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703
-    // std::result_of is deprecated in C++17 and removed in C++20. Hence, it is
-    // replaced with std::invoke_result here.
-    template <typename Func, typename... U>
-    using FunctionReturnType = std::remove_reference_t<std::remove_cv_t<std::invoke_result_t<Func, U...>>>;
-#else
-    // Keep ::type here because we still support C++11
-    template <typename Func, typename... U>
-    using FunctionReturnType = typename std::remove_reference<typename std::remove_cv<typename std::result_of<Func(U...)>::type>::type>::type;
-#endif
-
-} // namespace Catch
-
-namespace mpl_{
-    struct na;
-}
-
-// end catch_meta.hpp
-namespace Catch {
-
-template<typename C>
-class TestInvokerAsMethod : public ITestInvoker {
-    void (C::*m_testAsMethod)();
-public:
-    TestInvokerAsMethod( void (C::*testAsMethod)() ) noexcept : m_testAsMethod( testAsMethod ) {}
-
-    void invoke() const override {
-        C obj;
-        (obj.*m_testAsMethod)();
-    }
-};
-
-auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker*;
-
-template<typename C>
-auto makeTestInvoker( void (C::*testAsMethod)() ) noexcept -> ITestInvoker* {
-    return new(std::nothrow) TestInvokerAsMethod<C>( testAsMethod );
-}
-
-struct NameAndTags {
-    NameAndTags( StringRef const& name_ = StringRef(), StringRef const& tags_ = StringRef() ) noexcept;
-    StringRef name;
-    StringRef tags;
-};
-
-struct AutoReg : NonCopyable {
-    AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept;
-    ~AutoReg();
-};
-
-} // end namespace Catch
-
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TESTCASE_NO_REGISTRATION( TestName, ... ) \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION( TestName, ClassName, ... ) \
-        namespace{                        \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test();              \
-            };                            \
-        }                                 \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( TestName, TestFunc, Name, Tags, Signature, ... )  \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... )    \
-        namespace{                                                                                  \
-            namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                      \
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        }                                                                                           \
-        }                                                                                           \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-    #endif
-
-    #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-    #else
-        #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-    #endif
-#endif
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
-        static void TestName(); \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &TestName ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        static void TestName()
-    #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( &QualifiedMethod ), CATCH_INTERNAL_LINEINFO, "&" #QualifiedMethod, Catch::NameAndTags{ __VA_ARGS__ } ); } /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        namespace{ \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName) { \
-                void test(); \
-            }; \
-            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( Catch::makeTestInvoker( &TestName::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        } \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        void TestName::test()
-    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( Catch::makeTestInvoker( Function ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ __VA_ARGS__ } ); /* NOLINT */ \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-    ///////////////////////////////////////////////////////////////////////////////
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_2(TestName, TestFunc, Name, Tags, Signature, ... )\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        INTERNAL_CATCH_DECLARE_SIG_TEST(TestFunc, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_NTTP_REG_GEN(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestName{\
-                TestName(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-            TestName<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-            return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST(TestFunc,INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION                      \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS                      \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS                \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS              \
-        template<typename TestType> static void TestFuncName();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName) {                                     \
-            INTERNAL_CATCH_TYPE_GEN                                                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))         \
-            template<typename... Types>                               \
-            struct TestName {                                         \
-                void reg_tests() {                                          \
-                    int index = 0;                                    \
-                    using expander = int[];                           \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */\
-                }                                                     \
-            };                                                        \
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename create<TestName, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }                                                             \
-        }                                                             \
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFuncName()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> static void TestFunc();       \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){\
-        INTERNAL_CATCH_TYPE_GEN\
-        template<typename... Types>                               \
-        struct TestName {                                         \
-            void reg_tests() {                                          \
-                int index = 0;                                    \
-                using expander = int[];                           \
-                (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */\
-            }                                                     \
-        };\
-        static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = typename convert<TestName, TmplList>::type; \
-                TestInit t;                                           \
-                t.reg_tests();                                        \
-                return 0;                                             \
-            }();                                                      \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION                       \
-        template<typename TestType>                                   \
-        static void TestFunc()
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
-
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            INTERNAL_CATCH_DECLARE_SIG_TEST_METHOD(TestName, ClassName, INTERNAL_CATCH_REMOVE_PARENS(Signature));\
-            INTERNAL_CATCH_NTTP_REG_METHOD_GEN(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types> \
-            struct TestNameClass{\
-                TestNameClass(){\
-                    int index = 0;                                    \
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
-                    using expander = int[];\
-                    (void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                TestNameClass<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(__VA_ARGS__)>();\
-                return 0;\
-        }();\
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        INTERNAL_CATCH_DEFINE_SIG_TEST_METHOD(TestName, INTERNAL_CATCH_REMOVE_PARENS(Signature))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_ZERO_VARIADIC_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-            struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-                void test();\
-            };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestNameClass) {\
-            INTERNAL_CATCH_TYPE_GEN                  \
-            INTERNAL_CATCH_NTTP_GEN(INTERNAL_CATCH_REMOVE_PARENS(Signature))\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
-                    constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
-                    constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename create<TestNameClass, decltype(get_wrapper<INTERNAL_CATCH_REMOVE_PARENS(TmplTypes)>()), TypeList<INTERNAL_CATCH_MAKE_TYPE_LISTS_FROM_TYPES(INTERNAL_CATCH_REMOVE_PARENS(TypesList))>>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }\
-        }\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
-#endif
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
-#else
-    #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
-#endif
-
-    #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
-        CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-        CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-        CATCH_INTERNAL_SUPPRESS_UNUSED_TEMPLATE_WARNINGS \
-        template<typename TestType> \
-        struct TestName : INTERNAL_CATCH_REMOVE_PARENS(ClassName <TestType>) { \
-            void test();\
-        };\
-        namespace {\
-        namespace INTERNAL_CATCH_MAKE_NAMESPACE(TestName){ \
-            INTERNAL_CATCH_TYPE_GEN\
-            template<typename...Types>\
-            struct TestNameClass{\
-                void reg_tests(){\
-                    int index = 0;\
-                    using expander = int[];\
-                    (void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */ \
-                }\
-            };\
-            static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = typename convert<TestNameClass, TmplList>::type;\
-                TestInit t;\
-                t.reg_tests();\
-                return 0;\
-            }(); \
-        }}\
-        CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        template<typename TestType> \
-        void TestName<TestType>::test()
-
-#define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
-
-// end catch_test_registry.h
-// start catch_capture.hpp
-
-// start catch_assertionhandler.h
-
-// start catch_assertioninfo.h
-
-// start catch_result_type.h
-
-namespace Catch {
-
-    // ResultWas::OfType enum
-    struct ResultWas { enum OfType {
-        Unknown = -1,
-        Ok = 0,
-        Info = 1,
-        Warning = 2,
-
-        FailureBit = 0x10,
-
-        ExpressionFailed = FailureBit | 1,
-        ExplicitFailure = FailureBit | 2,
-
-        Exception = 0x100 | FailureBit,
-
-        ThrewException = Exception | 1,
-        DidntThrowException = Exception | 2,
-
-        FatalErrorCondition = 0x200 | FailureBit
-
-    }; };
-
-    bool isOk( ResultWas::OfType resultType );
-    bool isJustInfo( int flags );
-
-    // ResultDisposition::Flags enum
-    struct ResultDisposition { enum Flags {
-        Normal = 0x01,
-
-        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
-        FalseTest = 0x04,           // Prefix expression with !
-        SuppressFail = 0x08         // Failures are reported but do not fail the test
-    }; };
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs );
-
-    bool shouldContinueOnFailure( int flags );
-    inline bool isFalseTest( int flags ) { return ( flags & ResultDisposition::FalseTest ) != 0; }
-    bool shouldSuppressFailure( int flags );
-
-} // end namespace Catch
-
-// end catch_result_type.h
-namespace Catch {
-
-    struct AssertionInfo
-    {
-        StringRef macroName;
-        SourceLineInfo lineInfo;
-        StringRef capturedExpression;
-        ResultDisposition::Flags resultDisposition;
-
-        // We want to delete this constructor but a compiler bug in 4.8 means
-        // the struct is then treated as non-aggregate
-        //AssertionInfo() = delete;
-    };
-
-} // end namespace Catch
-
-// end catch_assertioninfo.h
-// start catch_decomposer.h
-
-// start catch_tostring.h
-
-#include <vector>
-#include <cstddef>
-#include <type_traits>
-#include <string>
-// start catch_stream.h
-
-#include <iosfwd>
-#include <cstddef>
-#include <ostream>
-
-namespace Catch {
-
-    std::ostream& cout();
-    std::ostream& cerr();
-    std::ostream& clog();
-
-    class StringRef;
-
-    struct IStream {
-        virtual ~IStream();
-        virtual std::ostream& stream() const = 0;
-    };
-
-    auto makeStream( StringRef const &filename ) -> IStream const*;
-
-    class ReusableStringStream : NonCopyable {
-        std::size_t m_index;
-        std::ostream* m_oss;
-    public:
-        ReusableStringStream();
-        ~ReusableStringStream();
-
-        auto str() const -> std::string;
-
-        template<typename T>
-        auto operator << ( T const& value ) -> ReusableStringStream& {
-            *m_oss << value;
-            return *this;
-        }
-        auto get() -> std::ostream& { return *m_oss; }
-    };
-}
-
-// end catch_stream.h
-// start catch_interfaces_enum_values_registry.h
-
-#include <vector>
-
-namespace Catch {
-
-    namespace Detail {
-        struct EnumInfo {
-            StringRef m_name;
-            std::vector<std::pair<int, StringRef>> m_values;
-
-            ~EnumInfo();
-
-            StringRef lookup( int value ) const;
-        };
-    } // namespace Detail
-
-    struct IMutableEnumValuesRegistry {
-        virtual ~IMutableEnumValuesRegistry();
-
-        virtual Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values ) = 0;
-
-        template<typename E>
-        Detail::EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::initializer_list<E> values ) {
-            static_assert(sizeof(int) >= sizeof(E), "Cannot serialize enum to int");
-            std::vector<int> intValues;
-            intValues.reserve( values.size() );
-            for( auto enumValue : values )
-                intValues.push_back( static_cast<int>( enumValue ) );
-            return registerEnum( enumName, allEnums, intValues );
-        }
-    };
-
-} // Catch
-
-// end catch_interfaces_enum_values_registry.h
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-#include <string_view>
-#endif
-
-#ifdef __OBJC__
-// start catch_objc_arc.hpp
-
-#import <Foundation/Foundation.h>
-
-#ifdef __has_feature
-#define CATCH_ARC_ENABLED __has_feature(objc_arc)
-#else
-#define CATCH_ARC_ENABLED 0
-#endif
-
-void arcSafeRelease( NSObject* obj );
-id performOptionalSelector( id obj, SEL sel );
-
-#if !CATCH_ARC_ENABLED
-inline void arcSafeRelease( NSObject* obj ) {
-    [obj release];
-}
-inline id performOptionalSelector( id obj, SEL sel ) {
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED
-#define CATCH_ARC_STRONG
-#else
-inline void arcSafeRelease( NSObject* ){}
-inline id performOptionalSelector( id obj, SEL sel ) {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-#endif
-    if( [obj respondsToSelector: sel] )
-        return [obj performSelector: sel];
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-    return nil;
-}
-#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
-#define CATCH_ARC_STRONG __strong
-#endif
-
-// end catch_objc_arc.hpp
-#endif
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4180) // We attempt to stream a function (address) by const&, which MSVC complains about but is harmless
-#endif
-
-namespace Catch {
-    namespace Detail {
-
-        extern const std::string unprintableString;
-
-        std::string rawMemoryToString( const void *object, std::size_t size );
-
-        template<typename T>
-        std::string rawMemoryToString( const T& object ) {
-          return rawMemoryToString( &object, sizeof(object) );
-        }
-
-        template<typename T>
-        class IsStreamInsertable {
-            template<typename Stream, typename U>
-            static auto test(int)
-                -> decltype(std::declval<Stream&>() << std::declval<U>(), std::true_type());
-
-            template<typename, typename>
-            static auto test(...)->std::false_type;
-
-        public:
-            static const bool value = decltype(test<std::ostream, const T&>(0))::value;
-        };
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e );
-
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && !std::is_base_of<std::exception, T>::value,
-        std::string>::type convertUnstreamable( T const& ) {
-            return Detail::unprintableString;
-        }
-        template<typename T>
-        typename std::enable_if<
-            !std::is_enum<T>::value && std::is_base_of<std::exception, T>::value,
-         std::string>::type convertUnstreamable(T const& ex) {
-            return ex.what();
-        }
-
-        template<typename T>
-        typename std::enable_if<
-            std::is_enum<T>::value
-        , std::string>::type convertUnstreamable( T const& value ) {
-            return convertUnknownEnumToString( value );
-        }
-
-#if defined(_MANAGED)
-        //! Convert a CLR string to a utf8 std::string
-        template<typename T>
-        std::string clrReferenceToString( T^ ref ) {
-            if (ref == nullptr)
-                return std::string("null");
-            auto bytes = System::Text::Encoding::UTF8->GetBytes(ref->ToString());
-            cli::pin_ptr<System::Byte> p = &bytes[0];
-            return std::string(reinterpret_cast<char const *>(p), bytes->Length);
-        }
-#endif
-
-    } // namespace Detail
-
-    // If we decide for C++14, change these to enable_if_ts
-    template <typename T, typename = void>
-    struct StringMaker {
-        template <typename Fake = T>
-        static
-        typename std::enable_if<::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert(const Fake& value) {
-                ReusableStringStream rss;
-                // NB: call using the function-like syntax to avoid ambiguity with
-                // user-defined templated operator<< under clang.
-                rss.operator<<(value);
-                return rss.str();
-        }
-
-        template <typename Fake = T>
-        static
-        typename std::enable_if<!::Catch::Detail::IsStreamInsertable<Fake>::value, std::string>::type
-            convert( const Fake& value ) {
-#if !defined(CATCH_CONFIG_FALLBACK_STRINGIFIER)
-            return Detail::convertUnstreamable(value);
-#else
-            return CATCH_CONFIG_FALLBACK_STRINGIFIER(value);
-#endif
-        }
-    };
-
-    namespace Detail {
-
-        // This function dispatches all stringification requests inside of Catch.
-        // Should be preferably called fully qualified, like ::Catch::Detail::stringify
-        template <typename T>
-        std::string stringify(const T& e) {
-            return ::Catch::StringMaker<typename std::remove_cv<typename std::remove_reference<T>::type>::type>::convert(e);
-        }
-
-        template<typename E>
-        std::string convertUnknownEnumToString( E e ) {
-            return ::Catch::Detail::stringify(static_cast<typename std::underlying_type<E>::type>(e));
-        }
-
-#if defined(_MANAGED)
-        template <typename T>
-        std::string stringify( T^ e ) {
-            return ::Catch::StringMaker<T^>::convert(e);
-        }
-#endif
-
-    } // namespace Detail
-
-    // Some predefined specializations
-
-    template<>
-    struct StringMaker<std::string> {
-        static std::string convert(const std::string& str);
-    };
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::string_view> {
-        static std::string convert(std::string_view str);
-    };
-#endif
-
-    template<>
-    struct StringMaker<char const *> {
-        static std::string convert(char const * str);
-    };
-    template<>
-    struct StringMaker<char *> {
-        static std::string convert(char * str);
-    };
-
-#ifdef CATCH_CONFIG_WCHAR
-    template<>
-    struct StringMaker<std::wstring> {
-        static std::string convert(const std::wstring& wstr);
-    };
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-    template<>
-    struct StringMaker<std::wstring_view> {
-        static std::string convert(std::wstring_view str);
-    };
-# endif
-
-    template<>
-    struct StringMaker<wchar_t const *> {
-        static std::string convert(wchar_t const * str);
-    };
-    template<>
-    struct StringMaker<wchar_t *> {
-        static std::string convert(wchar_t * str);
-    };
-#endif
-
-    // TBD: Should we use `strnlen` to ensure that we don't go out of the buffer,
-    //      while keeping string semantics?
-    template<int SZ>
-    struct StringMaker<char[SZ]> {
-        static std::string convert(char const* str) {
-            return ::Catch::Detail::stringify(std::string{ str });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<signed char[SZ]> {
-        static std::string convert(signed char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-    template<int SZ>
-    struct StringMaker<unsigned char[SZ]> {
-        static std::string convert(unsigned char const* str) {
-            return ::Catch::Detail::stringify(std::string{ reinterpret_cast<char const *>(str) });
-        }
-    };
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<std::byte> {
-        static std::string convert(std::byte value);
-    };
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-    template<>
-    struct StringMaker<int> {
-        static std::string convert(int value);
-    };
-    template<>
-    struct StringMaker<long> {
-        static std::string convert(long value);
-    };
-    template<>
-    struct StringMaker<long long> {
-        static std::string convert(long long value);
-    };
-    template<>
-    struct StringMaker<unsigned int> {
-        static std::string convert(unsigned int value);
-    };
-    template<>
-    struct StringMaker<unsigned long> {
-        static std::string convert(unsigned long value);
-    };
-    template<>
-    struct StringMaker<unsigned long long> {
-        static std::string convert(unsigned long long value);
-    };
-
-    template<>
-    struct StringMaker<bool> {
-        static std::string convert(bool b);
-    };
-
-    template<>
-    struct StringMaker<char> {
-        static std::string convert(char c);
-    };
-    template<>
-    struct StringMaker<signed char> {
-        static std::string convert(signed char c);
-    };
-    template<>
-    struct StringMaker<unsigned char> {
-        static std::string convert(unsigned char c);
-    };
-
-    template<>
-    struct StringMaker<std::nullptr_t> {
-        static std::string convert(std::nullptr_t);
-    };
-
-    template<>
-    struct StringMaker<float> {
-        static std::string convert(float value);
-        static int precision;
-    };
-
-    template<>
-    struct StringMaker<double> {
-        static std::string convert(double value);
-        static int precision;
-    };
-
-    template <typename T>
-    struct StringMaker<T*> {
-        template <typename U>
-        static std::string convert(U* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-    template <typename R, typename C>
-    struct StringMaker<R C::*> {
-        static std::string convert(R C::* p) {
-            if (p) {
-                return ::Catch::Detail::rawMemoryToString(p);
-            } else {
-                return "nullptr";
-            }
-        }
-    };
-
-#if defined(_MANAGED)
-    template <typename T>
-    struct StringMaker<T^> {
-        static std::string convert( T^ ref ) {
-            return ::Catch::Detail::clrReferenceToString(ref);
-        }
-    };
-#endif
-
-    namespace Detail {
-        template<typename InputIterator>
-        std::string rangeToString(InputIterator first, InputIterator last) {
-            ReusableStringStream rss;
-            rss << "{ ";
-            if (first != last) {
-                rss << ::Catch::Detail::stringify(*first);
-                for (++first; first != last; ++first)
-                    rss << ", " << ::Catch::Detail::stringify(*first);
-            }
-            rss << " }";
-            return rss.str();
-        }
-    }
-
-#ifdef __OBJC__
-    template<>
-    struct StringMaker<NSString*> {
-        static std::string convert(NSString * nsstring) {
-            if (!nsstring)
-                return "nil";
-            return std::string("@") + [nsstring UTF8String];
-        }
-    };
-    template<>
-    struct StringMaker<NSObject*> {
-        static std::string convert(NSObject* nsObject) {
-            return ::Catch::Detail::stringify([nsObject description]);
-        }
-
-    };
-    namespace Detail {
-        inline std::string stringify( NSString* nsstring ) {
-            return StringMaker<NSString*>::convert( nsstring );
-        }
-
-    } // namespace Detail
-#endif // __OBJC__
-
-} // namespace Catch
-
-//////////////////////////////////////////////////////
-// Separate std-lib types stringification, so it can be selectively enabled
-// This means that we do not bring in
-
-#if defined(CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS)
-#  define CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#  define CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-#endif
-
-// Separate std::pair specialization
-#if defined(CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER)
-#include <utility>
-namespace Catch {
-    template<typename T1, typename T2>
-    struct StringMaker<std::pair<T1, T2> > {
-        static std::string convert(const std::pair<T1, T2>& pair) {
-            ReusableStringStream rss;
-            rss << "{ "
-                << ::Catch::Detail::stringify(pair.first)
-                << ", "
-                << ::Catch::Detail::stringify(pair.second)
-                << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_PAIR_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_OPTIONAL)
-#include <optional>
-namespace Catch {
-    template<typename T>
-    struct StringMaker<std::optional<T> > {
-        static std::string convert(const std::optional<T>& optional) {
-            ReusableStringStream rss;
-            if (optional.has_value()) {
-                rss << ::Catch::Detail::stringify(*optional);
-            } else {
-                rss << "{ }";
-            }
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER
-
-// Separate std::tuple specialization
-#if defined(CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER)
-#include <tuple>
-namespace Catch {
-    namespace Detail {
-        template<
-            typename Tuple,
-            std::size_t N = 0,
-            bool = (N < std::tuple_size<Tuple>::value)
-            >
-            struct TupleElementPrinter {
-            static void print(const Tuple& tuple, std::ostream& os) {
-                os << (N ? ", " : " ")
-                    << ::Catch::Detail::stringify(std::get<N>(tuple));
-                TupleElementPrinter<Tuple, N + 1>::print(tuple, os);
-            }
-        };
-
-        template<
-            typename Tuple,
-            std::size_t N
-        >
-            struct TupleElementPrinter<Tuple, N, false> {
-            static void print(const Tuple&, std::ostream&) {}
-        };
-
-    }
-
-    template<typename ...Types>
-    struct StringMaker<std::tuple<Types...>> {
-        static std::string convert(const std::tuple<Types...>& tuple) {
-            ReusableStringStream rss;
-            rss << '{';
-            Detail::TupleElementPrinter<std::tuple<Types...>>::print(tuple, rss.get());
-            rss << " }";
-            return rss.str();
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_TUPLE_STRINGMAKER
-
-#if defined(CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER) && defined(CATCH_CONFIG_CPP17_VARIANT)
-#include <variant>
-namespace Catch {
-    template<>
-    struct StringMaker<std::monostate> {
-        static std::string convert(const std::monostate&) {
-            return "{ }";
-        }
-    };
-
-    template<typename... Elements>
-    struct StringMaker<std::variant<Elements...>> {
-        static std::string convert(const std::variant<Elements...>& variant) {
-            if (variant.valueless_by_exception()) {
-                return "{valueless variant}";
-            } else {
-                return std::visit(
-                    [](const auto& value) {
-                        return ::Catch::Detail::stringify(value);
-                    },
-                    variant
-                );
-            }
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_VARIANT_STRINGMAKER
-
-namespace Catch {
-    // Import begin/ end from std here
-    using std::begin;
-    using std::end;
-
-    namespace detail {
-        template <typename...>
-        struct void_type {
-            using type = void;
-        };
-
-        template <typename T, typename = void>
-        struct is_range_impl : std::false_type {
-        };
-
-        template <typename T>
-        struct is_range_impl<T, typename void_type<decltype(begin(std::declval<T>()))>::type> : std::true_type {
-        };
-    } // namespace detail
-
-    template <typename T>
-    struct is_range : detail::is_range_impl<T> {
-    };
-
-#if defined(_MANAGED) // Managed types are never ranges
-    template <typename T>
-    struct is_range<T^> {
-        static const bool value = false;
-    };
-#endif
-
-    template<typename Range>
-    std::string rangeToString( Range const& range ) {
-        return ::Catch::Detail::rangeToString( begin( range ), end( range ) );
-    }
-
-    // Handle vector<bool> specially
-    template<typename Allocator>
-    std::string rangeToString( std::vector<bool, Allocator> const& v ) {
-        ReusableStringStream rss;
-        rss << "{ ";
-        bool first = true;
-        for( bool b : v ) {
-            if( first )
-                first = false;
-            else
-                rss << ", ";
-            rss << ::Catch::Detail::stringify( b );
-        }
-        rss << " }";
-        return rss.str();
-    }
-
-    template<typename R>
-    struct StringMaker<R, typename std::enable_if<is_range<R>::value && !::Catch::Detail::IsStreamInsertable<R>::value>::type> {
-        static std::string convert( R const& range ) {
-            return rangeToString( range );
-        }
-    };
-
-    template <typename T, int SZ>
-    struct StringMaker<T[SZ]> {
-        static std::string convert(T const(&arr)[SZ]) {
-            return rangeToString(arr);
-        }
-    };
-
-} // namespace Catch
-
-// Separate std::chrono::duration specialization
-#if defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#include <ctime>
-#include <ratio>
-#include <chrono>
-
-namespace Catch {
-
-template <class Ratio>
-struct ratio_string {
-    static std::string symbol();
-};
-
-template <class Ratio>
-std::string ratio_string<Ratio>::symbol() {
-    Catch::ReusableStringStream rss;
-    rss << '[' << Ratio::num << '/'
-        << Ratio::den << ']';
-    return rss.str();
-}
-template <>
-struct ratio_string<std::atto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::femto> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::pico> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::nano> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::micro> {
-    static std::string symbol();
-};
-template <>
-struct ratio_string<std::milli> {
-    static std::string symbol();
-};
-
-    ////////////
-    // std::chrono::duration specializations
-    template<typename Value, typename Ratio>
-    struct StringMaker<std::chrono::duration<Value, Ratio>> {
-        static std::string convert(std::chrono::duration<Value, Ratio> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << ' ' << ratio_string<Ratio>::symbol() << 's';
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<1>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<1>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " s";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<60>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<60>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " m";
-            return rss.str();
-        }
-    };
-    template<typename Value>
-    struct StringMaker<std::chrono::duration<Value, std::ratio<3600>>> {
-        static std::string convert(std::chrono::duration<Value, std::ratio<3600>> const& duration) {
-            ReusableStringStream rss;
-            rss << duration.count() << " h";
-            return rss.str();
-        }
-    };
-
-    ////////////
-    // std::chrono::time_point specialization
-    // Generic time_point cannot be specialized, only std::chrono::time_point<system_clock>
-    template<typename Clock, typename Duration>
-    struct StringMaker<std::chrono::time_point<Clock, Duration>> {
-        static std::string convert(std::chrono::time_point<Clock, Duration> const& time_point) {
-            return ::Catch::Detail::stringify(time_point.time_since_epoch()) + " since epoch";
-        }
-    };
-    // std::chrono::time_point<system_clock> specialization
-    template<typename Duration>
-    struct StringMaker<std::chrono::time_point<std::chrono::system_clock, Duration>> {
-        static std::string convert(std::chrono::time_point<std::chrono::system_clock, Duration> const& time_point) {
-            auto converted = std::chrono::system_clock::to_time_t(time_point);
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &converted);
-#else
-            std::tm* timeInfo = std::gmtime(&converted);
-#endif
-
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-    };
-}
-#endif // CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-
-#define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
-namespace Catch { \
-    template<> struct StringMaker<enumName> { \
-        static std::string convert( enumName value ) { \
-            static const auto& enumInfo = ::Catch::getMutableRegistryHub().getMutableEnumValuesRegistry().registerEnum( #enumName, #__VA_ARGS__, { __VA_ARGS__ } ); \
-            return static_cast<std::string>(enumInfo.lookup( static_cast<int>( value ) )); \
-        } \
-    }; \
-}
-
-#define CATCH_REGISTER_ENUM( enumName, ... ) INTERNAL_CATCH_REGISTER_ENUM( enumName, __VA_ARGS__ )
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_tostring.h
-#include <iosfwd>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
-#pragma warning(disable:4018) // more "signed/unsigned mismatch"
-#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
-#pragma warning(disable:4180) // qualifier applied to function type has no meaning
-#pragma warning(disable:4800) // Forcing result to true or false
-#endif
-
-namespace Catch {
-
-    struct ITransientExpression {
-        auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
-        auto getResult() const -> bool { return m_result; }
-        virtual void streamReconstructedExpression( std::ostream &os ) const = 0;
-
-        ITransientExpression( bool isBinaryExpression, bool result )
-        :   m_isBinaryExpression( isBinaryExpression ),
-            m_result( result )
-        {}
-
-        // We don't actually need a virtual destructor, but many static analysers
-        // complain if it's not here :-(
-        virtual ~ITransientExpression();
-
-        bool m_isBinaryExpression;
-        bool m_result;
-
-    };
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs );
-
-    template<typename LhsT, typename RhsT>
-    class BinaryExpr  : public ITransientExpression {
-        LhsT m_lhs;
-        StringRef m_op;
-        RhsT m_rhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            formatReconstructedExpression
-                    ( os, Catch::Detail::stringify( m_lhs ), m_op, Catch::Detail::stringify( m_rhs ) );
-        }
-
-    public:
-        BinaryExpr( bool comparisonResult, LhsT lhs, StringRef op, RhsT rhs )
-        :   ITransientExpression{ true, comparisonResult },
-            m_lhs( lhs ),
-            m_op( op ),
-            m_rhs( rhs )
-        {}
-
-        template<typename T>
-        auto operator && ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator || ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator == ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator != ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator > ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator < ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator >= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename T>
-        auto operator <= ( T ) const -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<T>::value,
-            "chained comparisons are not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-    };
-
-    template<typename LhsT>
-    class UnaryExpr : public ITransientExpression {
-        LhsT m_lhs;
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            os << Catch::Detail::stringify( m_lhs );
-        }
-
-    public:
-        explicit UnaryExpr( LhsT lhs )
-        :   ITransientExpression{ false, static_cast<bool>(lhs) },
-            m_lhs( lhs )
-        {}
-    };
-
-    // Specialised comparison functions to handle equality comparisons between ints and pointers (NULL deduces as an int)
-    template<typename LhsT, typename RhsT>
-    auto compareEqual( LhsT const& lhs, RhsT const& rhs ) -> bool { return static_cast<bool>(lhs == rhs); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, int rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( T* const& lhs, long rhs ) -> bool { return lhs == reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-    template<typename T>
-    auto compareEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) == rhs; }
-
-    template<typename LhsT, typename RhsT>
-    auto compareNotEqual( LhsT const& lhs, RhsT&& rhs ) -> bool { return static_cast<bool>(lhs != rhs); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, int rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( T* const& lhs, long rhs ) -> bool { return lhs != reinterpret_cast<void const*>( rhs ); }
-    template<typename T>
-    auto compareNotEqual( int lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-    template<typename T>
-    auto compareNotEqual( long lhs, T* const& rhs ) -> bool { return reinterpret_cast<void const*>( lhs ) != rhs; }
-
-    template<typename LhsT>
-    class ExprLhs {
-        LhsT m_lhs;
-    public:
-        explicit ExprLhs( LhsT lhs ) : m_lhs( lhs ) {}
-
-        template<typename RhsT>
-        auto operator == ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareEqual( m_lhs, rhs ), m_lhs, "==", rhs };
-        }
-        auto operator == ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs == rhs, m_lhs, "==", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator != ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { compareNotEqual( m_lhs, rhs ), m_lhs, "!=", rhs };
-        }
-        auto operator != ( bool rhs ) -> BinaryExpr<LhsT, bool> const {
-            return { m_lhs != rhs, m_lhs, "!=", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator > ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs > rhs), m_lhs, ">", rhs };
-        }
-        template<typename RhsT>
-        auto operator < ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs < rhs), m_lhs, "<", rhs };
-        }
-        template<typename RhsT>
-        auto operator >= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs >= rhs), m_lhs, ">=", rhs };
-        }
-        template<typename RhsT>
-        auto operator <= ( RhsT const& rhs ) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs <= rhs), m_lhs, "<=", rhs };
-        }
-        template <typename RhsT>
-        auto operator | (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs | rhs), m_lhs, "|", rhs };
-        }
-        template <typename RhsT>
-        auto operator & (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs & rhs), m_lhs, "&", rhs };
-        }
-        template <typename RhsT>
-        auto operator ^ (RhsT const& rhs) -> BinaryExpr<LhsT, RhsT const&> const {
-            return { static_cast<bool>(m_lhs ^ rhs), m_lhs, "^", rhs };
-        }
-
-        template<typename RhsT>
-        auto operator && ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator&& is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        template<typename RhsT>
-        auto operator || ( RhsT const& ) -> BinaryExpr<LhsT, RhsT const&> const {
-            static_assert(always_false<RhsT>::value,
-            "operator|| is not supported inside assertions, "
-            "wrap the expression inside parentheses, or decompose it");
-        }
-
-        auto makeUnaryExpr() const -> UnaryExpr<LhsT> {
-            return UnaryExpr<LhsT>{ m_lhs };
-        }
-    };
-
-    void handleExpression( ITransientExpression const& expr );
-
-    template<typename T>
-    void handleExpression( ExprLhs<T> const& expr ) {
-        handleExpression( expr.makeUnaryExpr() );
-    }
-
-    struct Decomposer {
-        template<typename T>
-        auto operator <= ( T const& lhs ) -> ExprLhs<T const&> {
-            return ExprLhs<T const&>{ lhs };
-        }
-
-        auto operator <=( bool value ) -> ExprLhs<bool> {
-            return ExprLhs<bool>{ value };
-        }
-    };
-
-} // end namespace Catch
-
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-// end catch_decomposer.h
-// start catch_interfaces_capture.h
-
-#include <string>
-#include <chrono>
-
-namespace Catch {
-
-    class AssertionResult;
-    struct AssertionInfo;
-    struct SectionInfo;
-    struct SectionEndInfo;
-    struct MessageInfo;
-    struct MessageBuilder;
-    struct Counts;
-    struct AssertionReaction;
-    struct SourceLineInfo;
-
-    struct ITransientExpression;
-    struct IGeneratorTracker;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo;
-    template <typename Duration = std::chrono::duration<double, std::nano>>
-    struct BenchmarkStats;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IResultCapture {
-
-        virtual ~IResultCapture();
-
-        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
-                                        Counts& assertions ) = 0;
-        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
-        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
-
-        virtual auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& name ) = 0;
-        virtual void benchmarkStarting( BenchmarkInfo const& info ) = 0;
-        virtual void benchmarkEnded( BenchmarkStats<> const& stats ) = 0;
-        virtual void benchmarkFailed( std::string const& error ) = 0;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
-        virtual void popScopedMessage( MessageInfo const& message ) = 0;
-
-        virtual void emplaceUnscopedMessage( MessageBuilder const& builder ) = 0;
-
-        virtual void handleFatalErrorCondition( StringRef message ) = 0;
-
-        virtual void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) = 0;
-        virtual void handleIncomplete
-                (   AssertionInfo const& info ) = 0;
-        virtual void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) = 0;
-
-        virtual bool lastAssertionPassed() = 0;
-        virtual void assertionPassed() = 0;
-
-        // Deprecated, do not use:
-        virtual std::string getCurrentTestName() const = 0;
-        virtual const AssertionResult* getLastResult() const = 0;
-        virtual void exceptionEarlyReported() = 0;
-    };
-
-    IResultCapture& getResultCapture();
-}
-
-// end catch_interfaces_capture.h
-namespace Catch {
-
-    struct TestFailureException{};
-    struct AssertionResultData;
-    struct IResultCapture;
-    class RunContext;
-
-    class LazyExpression {
-        friend class AssertionHandler;
-        friend struct AssertionStats;
-        friend class RunContext;
-
-        ITransientExpression const* m_transientExpression = nullptr;
-        bool m_isNegated;
-    public:
-        LazyExpression( bool isNegated );
-        LazyExpression( LazyExpression const& other );
-        LazyExpression& operator = ( LazyExpression const& ) = delete;
-
-        explicit operator bool() const;
-
-        friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
-    };
-
-    struct AssertionReaction {
-        bool shouldDebugBreak = false;
-        bool shouldThrow = false;
-    };
-
-    class AssertionHandler {
-        AssertionInfo m_assertionInfo;
-        AssertionReaction m_reaction;
-        bool m_completed = false;
-        IResultCapture& m_resultCapture;
-
-    public:
-        AssertionHandler
-            (   StringRef const& macroName,
-                SourceLineInfo const& lineInfo,
-                StringRef capturedExpression,
-                ResultDisposition::Flags resultDisposition );
-        ~AssertionHandler() {
-            if ( !m_completed ) {
-                m_resultCapture.handleIncomplete( m_assertionInfo );
-            }
-        }
-
-        template<typename T>
-        void handleExpr( ExprLhs<T> const& expr ) {
-            handleExpr( expr.makeUnaryExpr() );
-        }
-        void handleExpr( ITransientExpression const& expr );
-
-        void handleMessage(ResultWas::OfType resultType, StringRef const& message);
-
-        void handleExceptionThrownAsExpected();
-        void handleUnexpectedExceptionNotThrown();
-        void handleExceptionNotThrownAsExpected();
-        void handleThrowingCallSkipped();
-        void handleUnexpectedInflightException();
-
-        void complete();
-        void setCompleted();
-
-        // query
-        auto allowThrows() const -> bool;
-    };
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString );
-
-} // namespace Catch
-
-// end catch_assertionhandler.h
-// start catch_message.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct MessageInfo {
-        MessageInfo(    StringRef const& _macroName,
-                        SourceLineInfo const& _lineInfo,
-                        ResultWas::OfType _type );
-
-        StringRef macroName;
-        std::string message;
-        SourceLineInfo lineInfo;
-        ResultWas::OfType type;
-        unsigned int sequence;
-
-        bool operator == ( MessageInfo const& other ) const;
-        bool operator < ( MessageInfo const& other ) const;
-    private:
-        static unsigned int globalCount;
-    };
-
-    struct MessageStream {
-
-        template<typename T>
-        MessageStream& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        ReusableStringStream m_stream;
-    };
-
-    struct MessageBuilder : MessageStream {
-        MessageBuilder( StringRef const& macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType type );
-
-        template<typename T>
-        MessageBuilder& operator << ( T const& value ) {
-            m_stream << value;
-            return *this;
-        }
-
-        MessageInfo m_info;
-    };
-
-    class ScopedMessage {
-    public:
-        explicit ScopedMessage( MessageBuilder const& builder );
-        ScopedMessage( ScopedMessage& duplicate ) = delete;
-        ScopedMessage( ScopedMessage&& old );
-        ~ScopedMessage();
-
-        MessageInfo m_info;
-        bool m_moved;
-    };
-
-    class Capturer {
-        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture = getResultCapture();
-        size_t m_captured = 0;
-    public:
-        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
-        ~Capturer();
-
-        void captureValue( size_t index, std::string const& value );
-
-        template<typename T>
-        void captureValues( size_t index, T const& value ) {
-            captureValue( index, Catch::Detail::stringify( value ) );
-        }
-
-        template<typename T, typename... Ts>
-        void captureValues( size_t index, T const& value, Ts const&... values ) {
-            captureValue( index, Catch::Detail::stringify(value) );
-            captureValues( index+1, values... );
-        }
-    };
-
-} // end namespace Catch
-
-// end catch_message.h
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
-  #define CATCH_INTERNAL_STRINGIFY(...) #__VA_ARGS__
-#else
-  #define CATCH_INTERNAL_STRINGIFY(...) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
-#endif
-
-#if defined(CATCH_CONFIG_FAST_COMPILE) || defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-
-///////////////////////////////////////////////////////////////////////////////
-// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
-// macros.
-#define INTERNAL_CATCH_TRY
-#define INTERNAL_CATCH_CATCH( capturer )
-
-#else // CATCH_CONFIG_FAST_COMPILE
-
-#define INTERNAL_CATCH_TRY try
-#define INTERNAL_CATCH_CATCH( handler ) catch(...) { handler.handleUnexpectedInflightException(); }
-
-#endif
-
-#define INTERNAL_CATCH_REACT( handler ) handler.complete();
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TEST( macroName, resultDisposition, ... ) \
-    do { \
-        CATCH_INTERNAL_IGNORE_BUT_WARN(__VA_ARGS__); \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
-            catchAssertionHandler.handleExpr( Catch::Decomposer() <= __VA_ARGS__ ); \
-            CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( (void)0, (false) && static_cast<bool>( !!(__VA_ARGS__) ) )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_IF( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, ... ) \
-    INTERNAL_CATCH_TEST( macroName, resultDisposition, __VA_ARGS__ ); \
-    if( !Catch::getResultCapture().lastAssertionPassed() )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition ); \
-        try { \
-            static_cast<void>(__VA_ARGS__); \
-            catchAssertionHandler.handleExceptionNotThrownAsExpected(); \
-        } \
-        catch( ... ) { \
-            catchAssertionHandler.handleUnexpectedInflightException(); \
-        } \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__), resultDisposition); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(expr); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ) { \
-                catchAssertionHandler.handleExceptionThrownAsExpected(); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::StringRef(), resultDisposition ); \
-        catchAssertionHandler.handleMessage( messageType, ( Catch::MessageStream() << __VA_ARGS__ + ::Catch::StreamEndStop() ).m_stream.str() ); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_CAPTURE( varName, macroName, ... ) \
-    auto varName = Catch::Capturer( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info, #__VA_ARGS__ ); \
-    varName.captureValues( 0, __VA_ARGS__ )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_INFO( macroName, log ) \
-    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage )( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log );
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_UNSCOPED_INFO( macroName, log ) \
-    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )
-
-///////////////////////////////////////////////////////////////////////////////
-// Although this is matcher-based, it can be used with just a string
-#define INTERNAL_CATCH_THROWS_STR_MATCHES( macroName, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( ... ) { \
-                Catch::handleExceptionMatchExpr( catchAssertionHandler, matcher, #matcher##_catch_sr ); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_capture.hpp
-// start catch_section.h
-
-// start catch_section_info.h
-
-// start catch_totals.h
-
-#include <cstddef>
-
-namespace Catch {
-
-    struct Counts {
-        Counts operator - ( Counts const& other ) const;
-        Counts& operator += ( Counts const& other );
-
-        std::size_t total() const;
-        bool allPassed() const;
-        bool allOk() const;
-
-        std::size_t passed = 0;
-        std::size_t failed = 0;
-        std::size_t failedButOk = 0;
-    };
-
-    struct Totals {
-
-        Totals operator - ( Totals const& other ) const;
-        Totals& operator += ( Totals const& other );
-
-        Totals delta( Totals const& prevTotals ) const;
-
-        int error = 0;
-        Counts assertions;
-        Counts testCases;
-    };
-}
-
-// end catch_totals.h
-#include <string>
-
-namespace Catch {
-
-    struct SectionInfo {
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name );
-
-        // Deprecated
-        SectionInfo
-            (   SourceLineInfo const& _lineInfo,
-                std::string const& _name,
-                std::string const& ) : SectionInfo( _lineInfo, _name ) {}
-
-        std::string name;
-        std::string description; // !Deprecated: this will always be empty
-        SourceLineInfo lineInfo;
-    };
-
-    struct SectionEndInfo {
-        SectionInfo sectionInfo;
-        Counts prevAssertions;
-        double durationInSeconds;
-    };
-
-} // end namespace Catch
-
-// end catch_section_info.h
-// start catch_timer.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t;
-    auto getEstimatedClockResolution() -> uint64_t;
-
-    class Timer {
-        uint64_t m_nanoseconds = 0;
-    public:
-        void start();
-        auto getElapsedNanoseconds() const -> uint64_t;
-        auto getElapsedMicroseconds() const -> uint64_t;
-        auto getElapsedMilliseconds() const -> unsigned int;
-        auto getElapsedSeconds() const -> double;
-    };
-
-} // namespace Catch
-
-// end catch_timer.h
-#include <string>
-
-namespace Catch {
-
-    class Section : NonCopyable {
-    public:
-        Section( SectionInfo const& info );
-        ~Section();
-
-        // This indicates whether the section should be executed or not
-        explicit operator bool() const;
-
-    private:
-        SectionInfo m_info;
-
-        std::string m_name;
-        Counts m_assertions;
-        bool m_sectionIncluded;
-        Timer m_timer;
-    };
-
-} // end namespace Catch
-
-#define INTERNAL_CATCH_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define INTERNAL_CATCH_DYNAMIC_SECTION( ... ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_UNUSED_WARNINGS \
-    if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, (Catch::ReusableStringStream() << __VA_ARGS__).str() ) ) \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-// end catch_section.h
-// start catch_interfaces_exception.h
-
-// start catch_interfaces_registry_hub.h
-
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class TestCase;
-    struct ITestCaseRegistry;
-    struct IExceptionTranslatorRegistry;
-    struct IExceptionTranslator;
-    struct IReporterRegistry;
-    struct IReporterFactory;
-    struct ITagAliasRegistry;
-    struct IMutableEnumValuesRegistry;
-
-    class StartupExceptionRegistry;
-
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IRegistryHub {
-        virtual ~IRegistryHub();
-
-        virtual IReporterRegistry const& getReporterRegistry() const = 0;
-        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
-        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
-        virtual IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const = 0;
-
-        virtual StartupExceptionRegistry const& getStartupExceptionRegistry() const = 0;
-    };
-
-    struct IMutableRegistryHub {
-        virtual ~IMutableRegistryHub();
-        virtual void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerListener( IReporterFactoryPtr const& factory ) = 0;
-        virtual void registerTest( TestCase const& testInfo ) = 0;
-        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
-        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
-        virtual void registerStartupException() noexcept = 0;
-        virtual IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() = 0;
-    };
-
-    IRegistryHub const& getRegistryHub();
-    IMutableRegistryHub& getMutableRegistryHub();
-    void cleanUp();
-    std::string translateActiveException();
-
-}
-
-// end catch_interfaces_registry_hub.h
-#if defined(CATCH_CONFIG_DISABLE)
-    #define INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( translatorName, signature) \
-        static std::string translatorName( signature )
-#endif
-
-#include <exception>
-#include <string>
-#include <vector>
-
-namespace Catch {
-    using exceptionTranslateFunction = std::string(*)();
-
-    struct IExceptionTranslator;
-    using ExceptionTranslators = std::vector<std::unique_ptr<IExceptionTranslator const>>;
-
-    struct IExceptionTranslator {
-        virtual ~IExceptionTranslator();
-        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
-    };
-
-    struct IExceptionTranslatorRegistry {
-        virtual ~IExceptionTranslatorRegistry();
-
-        virtual std::string translateActiveException() const = 0;
-    };
-
-    class ExceptionTranslatorRegistrar {
-        template<typename T>
-        class ExceptionTranslator : public IExceptionTranslator {
-        public:
-
-            ExceptionTranslator( std::string(*translateFunction)( T& ) )
-            : m_translateFunction( translateFunction )
-            {}
-
-            std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const override {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                return "";
-#else
-                try {
-                    if( it == itEnd )
-                        std::rethrow_exception(std::current_exception());
-                    else
-                        return (*it)->translate( it+1, itEnd );
-                }
-                catch( T& ex ) {
-                    return m_translateFunction( ex );
-                }
-#endif
-            }
-
-        protected:
-            std::string(*m_translateFunction)( T& );
-        };
-
-    public:
-        template<typename T>
-        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
-            getMutableRegistryHub().registerTranslator
-                ( new ExceptionTranslator<T>( translateFunction ) );
-        }
-    };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
-    static std::string translatorName( signature ); \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS \
-    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
-    static std::string translatorName( signature )
-
-#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// end catch_interfaces_exception.h
-// start catch_approx.h
-
-#include <type_traits>
-
-namespace Catch {
-namespace Detail {
-
-    class Approx {
-    private:
-        bool equalityComparisonImpl(double other) const;
-        // Validates the new margin (margin >= 0)
-        // out-of-line to avoid including stdexcept in the header
-        void setMargin(double margin);
-        // Validates the new epsilon (0 < epsilon < 1)
-        // out-of-line to avoid including stdexcept in the header
-        void setEpsilon(double epsilon);
-
-    public:
-        explicit Approx ( double value );
-
-        static Approx custom();
-
-        Approx operator-() const;
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) {
-            Approx approx( static_cast<double>(value) );
-            approx.m_epsilon = m_epsilon;
-            approx.m_margin = m_margin;
-            approx.m_scale = m_scale;
-            return approx;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        explicit Approx( T const& value ): Approx(static_cast<double>(value))
-        {}
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( const T& lhs, Approx const& rhs ) {
-            auto lhs_v = static_cast<double>(lhs);
-            return rhs.equalityComparisonImpl(lhs_v);
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator == ( Approx const& lhs, const T& rhs ) {
-            return operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( T const& lhs, Approx const& rhs ) {
-            return !operator==( lhs, rhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator != ( Approx const& lhs, T const& rhs ) {
-            return !operator==( rhs, lhs );
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) < rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator <= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value < static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( T const& lhs, Approx const& rhs ) {
-            return static_cast<double>(lhs) > rhs.m_value || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        friend bool operator >= ( Approx const& lhs, T const& rhs ) {
-            return lhs.m_value > static_cast<double>(rhs) || lhs == rhs;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& epsilon( T const& newEpsilon ) {
-            double epsilonAsDouble = static_cast<double>(newEpsilon);
-            setEpsilon(epsilonAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& margin( T const& newMargin ) {
-            double marginAsDouble = static_cast<double>(newMargin);
-            setMargin(marginAsDouble);
-            return *this;
-        }
-
-        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx& scale( T const& newScale ) {
-            m_scale = static_cast<double>(newScale);
-            return *this;
-        }
-
-        std::string toString() const;
-
-    private:
-        double m_epsilon;
-        double m_margin;
-        double m_scale;
-        double m_value;
-    };
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
-} // end namespace literals
-
-template<>
-struct StringMaker<Catch::Detail::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
-};
-
-} // end namespace Catch
-
-// end catch_approx.h
-// start catch_string_manip.h
-
-#include <string>
-#include <iosfwd>
-#include <vector>
-
-namespace Catch {
-
-    bool startsWith( std::string const& s, std::string const& prefix );
-    bool startsWith( std::string const& s, char prefix );
-    bool endsWith( std::string const& s, std::string const& suffix );
-    bool endsWith( std::string const& s, char suffix );
-    bool contains( std::string const& s, std::string const& infix );
-    void toLowerInPlace( std::string& s );
-    std::string toLower( std::string const& s );
-    //! Returns a new string without whitespace at the start/end
-    std::string trim( std::string const& str );
-    //! Returns a substring of the original ref without whitespace. Beware lifetimes!
-    StringRef trim(StringRef ref);
-
-    // !!! Be aware, returns refs into original string - make sure original string outlives them
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter );
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
-
-    struct pluralise {
-        pluralise( std::size_t count, std::string const& label );
-
-        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
-
-        std::size_t m_count;
-        std::string m_label;
-    };
-}
-
-// end catch_string_manip.h
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-// start catch_capture_matchers.h
-
-// start catch_matchers.h
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        template<typename ArgT> struct MatchAllOf;
-        template<typename ArgT> struct MatchAnyOf;
-        template<typename ArgT> struct MatchNotOf;
-
-        class MatcherUntypedBase {
-        public:
-            MatcherUntypedBase() = default;
-            MatcherUntypedBase ( MatcherUntypedBase const& ) = default;
-            MatcherUntypedBase& operator = ( MatcherUntypedBase const& ) = delete;
-            std::string toString() const;
-
-        protected:
-            virtual ~MatcherUntypedBase();
-            virtual std::string describe() const = 0;
-            mutable std::string m_cachedToString;
-        };
-
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
-
-        template<typename ObjectT>
-        struct MatcherMethod {
-            virtual bool match( ObjectT const& arg ) const = 0;
-        };
-
-#if defined(__OBJC__)
-        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
-        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
-        template<>
-        struct MatcherMethod<NSString*> {
-            virtual bool match( NSString* arg ) const = 0;
-        };
-#endif
-
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
-
-        template<typename T>
-        struct MatcherBase : MatcherUntypedBase, MatcherMethod<T> {
-
-            MatchAllOf<T> operator && ( MatcherBase const& other ) const;
-            MatchAnyOf<T> operator || ( MatcherBase const& other ) const;
-            MatchNotOf<T> operator ! () const;
-        };
-
-        template<typename ArgT>
-        struct MatchAllOf : MatcherBase<ArgT> {
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (!matcher->match(arg))
-                        return false;
-                }
-                return true;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " and ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAllOf<ArgT> operator && ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-        template<typename ArgT>
-        struct MatchAnyOf : MatcherBase<ArgT> {
-
-            bool match( ArgT const& arg ) const override {
-                for( auto matcher : m_matchers ) {
-                    if (matcher->match(arg))
-                        return true;
-                }
-                return false;
-            }
-            std::string describe() const override {
-                std::string description;
-                description.reserve( 4 + m_matchers.size()*32 );
-                description += "( ";
-                bool first = true;
-                for( auto matcher : m_matchers ) {
-                    if( first )
-                        first = false;
-                    else
-                        description += " or ";
-                    description += matcher->toString();
-                }
-                description += " )";
-                return description;
-            }
-
-            MatchAnyOf<ArgT> operator || ( MatcherBase<ArgT> const& other ) {
-                auto copy(*this);
-                copy.m_matchers.push_back( &other );
-                return copy;
-            }
-
-            std::vector<MatcherBase<ArgT> const*> m_matchers;
-        };
-
-        template<typename ArgT>
-        struct MatchNotOf : MatcherBase<ArgT> {
-
-            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
-
-            bool match( ArgT const& arg ) const override {
-                return !m_underlyingMatcher.match( arg );
-            }
-
-            std::string describe() const override {
-                return "not " + m_underlyingMatcher.toString();
-            }
-            MatcherBase<ArgT> const& m_underlyingMatcher;
-        };
-
-        template<typename T>
-        MatchAllOf<T> MatcherBase<T>::operator && ( MatcherBase const& other ) const {
-            return MatchAllOf<T>() && *this && other;
-        }
-        template<typename T>
-        MatchAnyOf<T> MatcherBase<T>::operator || ( MatcherBase const& other ) const {
-            return MatchAnyOf<T>() || *this || other;
-        }
-        template<typename T>
-        MatchNotOf<T> MatcherBase<T>::operator ! () const {
-            return MatchNotOf<T>( *this );
-        }
-
-    } // namespace Impl
-
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-
-// end catch_matchers.h
-// start catch_matchers_exception.hpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-class ExceptionMessageMatcher : public MatcherBase<std::exception> {
-    std::string m_message;
-public:
-
-    ExceptionMessageMatcher(std::string const& message):
-        m_message(message)
-    {}
-
-    bool match(std::exception const& ex) const override;
-
-    std::string describe() const override;
-};
-
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_exception.hpp
-// start catch_matchers_floating.h
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Floating {
-
-        enum class FloatingPointKind : uint8_t;
-
-        struct WithinAbsMatcher : MatcherBase<double> {
-            WithinAbsMatcher(double target, double margin);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_margin;
-        };
-
-        struct WithinUlpsMatcher : MatcherBase<double> {
-            WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            uint64_t m_ulps;
-            FloatingPointKind m_type;
-        };
-
-        // Given IEEE-754 format for floats and doubles, we can assume
-        // that float -> double promotion is lossless. Given this, we can
-        // assume that if we do the standard relative comparison of
-        // |lhs - rhs| <= epsilon * max(fabs(lhs), fabs(rhs)), then we get
-        // the same result if we do this for floats, as if we do this for
-        // doubles that were promoted from floats.
-        struct WithinRelMatcher : MatcherBase<double> {
-            WithinRelMatcher(double target, double epsilon);
-            bool match(double const& matchee) const override;
-            std::string describe() const override;
-        private:
-            double m_target;
-            double m_epsilon;
-        };
-
-    } // namespace Floating
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-    Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff);
-    Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff);
-    Floating::WithinAbsMatcher WithinAbs(double target, double margin);
-    Floating::WithinRelMatcher WithinRel(double target, double eps);
-    // defaults epsilon to 100*numeric_limits<double>::epsilon()
-    Floating::WithinRelMatcher WithinRel(double target);
-    Floating::WithinRelMatcher WithinRel(float target, float eps);
-    // defaults epsilon to 100*numeric_limits<float>::epsilon()
-    Floating::WithinRelMatcher WithinRel(float target);
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.h
-// start catch_matchers_generic.hpp
-
-#include <functional>
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-namespace Generic {
-
-namespace Detail {
-    std::string finalizeDescription(const std::string& desc);
-}
-
-template <typename T>
-class PredicateMatcher : public MatcherBase<T> {
-    std::function<bool(T const&)> m_predicate;
-    std::string m_description;
-public:
-
-    PredicateMatcher(std::function<bool(T const&)> const& elem, std::string const& descr)
-        :m_predicate(std::move(elem)),
-        m_description(Detail::finalizeDescription(descr))
-    {}
-
-    bool match( T const& item ) const override {
-        return m_predicate(item);
-    }
-
-    std::string describe() const override {
-        return m_description;
-    }
-};
-
-} // namespace Generic
-
-    // The following functions create the actual matcher objects.
-    // The user has to explicitly specify type to the function, because
-    // inferring std::function<bool(T const&)> is hard (but possible) and
-    // requires a lot of TMP.
-    template<typename T>
-    Generic::PredicateMatcher<T> Predicate(std::function<bool(T const&)> const& predicate, std::string const& description = "") {
-        return Generic::PredicateMatcher<T>(predicate, description);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_generic.hpp
-// start catch_matchers_string.h
-
-#include <string>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        struct CasedString
-        {
-            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
-            std::string adjustString( std::string const& str ) const;
-            std::string caseSensitivitySuffix() const;
-
-            CaseSensitive::Choice m_caseSensitivity;
-            std::string m_str;
-        };
-
-        struct StringMatcherBase : MatcherBase<std::string> {
-            StringMatcherBase( std::string const& operation, CasedString const& comparator );
-            std::string describe() const override;
-
-            CasedString m_comparator;
-            std::string m_operation;
-        };
-
-        struct EqualsMatcher : StringMatcherBase {
-            EqualsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct ContainsMatcher : StringMatcherBase {
-            ContainsMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct StartsWithMatcher : StringMatcherBase {
-            StartsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-        struct EndsWithMatcher : StringMatcherBase {
-            EndsWithMatcher( CasedString const& comparator );
-            bool match( std::string const& source ) const override;
-        };
-
-        struct RegexMatcher : MatcherBase<std::string> {
-            RegexMatcher( std::string regex, CaseSensitive::Choice caseSensitivity );
-            bool match( std::string const& matchee ) const override;
-            std::string describe() const override;
-
-        private:
-            std::string m_regex;
-            CaseSensitive::Choice m_caseSensitivity;
-        };
-
-    } // namespace StdString
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-    StdString::RegexMatcher Matches( std::string const& regex, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_string.h
-// start catch_matchers_vector.h
-
-#include <algorithm>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace Vector {
-        template<typename T, typename Alloc>
-        struct ContainsElementMatcher : MatcherBase<std::vector<T, Alloc>> {
-
-            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
-
-            bool match(std::vector<T, Alloc> const &v) const override {
-                for (auto const& el : v) {
-                    if (el == m_comparator) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            T const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ContainsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ContainsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: see note in EqualsMatcher
-                if (m_comparator.size() > v.size())
-                    return false;
-                for (auto const& comparator : m_comparator) {
-                    auto present = false;
-                    for (const auto& el : v) {
-                        if (el == comparator) {
-                            present = true;
-                            break;
-                        }
-                    }
-                    if (!present) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            std::string describe() const override {
-                return "Contains: " + ::Catch::Detail::stringify( m_comparator );
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct EqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            EqualsMatcher(std::vector<T, AllocComp> const &comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                // !TBD: This currently works if all elements can be compared using !=
-                // - a more general approach would be via a compare template that defaults
-                // to using !=. but could be specialised for, e.g. std::vector<T, Alloc> etc
-                // - then just call that directly
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != v[i])
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "Equals: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            std::vector<T, AllocComp> const& m_comparator;
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct ApproxMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-
-            ApproxMatcher(std::vector<T, AllocComp> const& comparator) : m_comparator( comparator ) {}
-
-            bool match(std::vector<T, AllocMatch> const &v) const override {
-                if (m_comparator.size() != v.size())
-                    return false;
-                for (std::size_t i = 0; i < v.size(); ++i)
-                    if (m_comparator[i] != approx(v[i]))
-                        return false;
-                return true;
-            }
-            std::string describe() const override {
-                return "is approx: " + ::Catch::Detail::stringify( m_comparator );
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& epsilon( T const& newEpsilon ) {
-                approx.epsilon(newEpsilon);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& margin( T const& newMargin ) {
-                approx.margin(newMargin);
-                return *this;
-            }
-            template <typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-            ApproxMatcher& scale( T const& newScale ) {
-                approx.scale(newScale);
-                return *this;
-            }
-
-            std::vector<T, AllocComp> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
-        };
-
-        template<typename T, typename AllocComp, typename AllocMatch>
-        struct UnorderedEqualsMatcher : MatcherBase<std::vector<T, AllocMatch>> {
-            UnorderedEqualsMatcher(std::vector<T, AllocComp> const& target) : m_target(target) {}
-            bool match(std::vector<T, AllocMatch> const& vec) const override {
-                if (m_target.size() != vec.size()) {
-                    return false;
-                }
-                return std::is_permutation(m_target.begin(), m_target.end(), vec.begin());
-            }
-
-            std::string describe() const override {
-                return "UnorderedEquals: " + ::Catch::Detail::stringify(m_target);
-            }
-        private:
-            std::vector<T, AllocComp> const& m_target;
-        };
-
-    } // namespace Vector
-
-    // The following functions create the actual matcher objects.
-    // This allows the types to be inferred
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ContainsMatcher<T, AllocComp, AllocMatch> Contains( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ContainsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename Alloc = std::allocator<T>>
-    Vector::ContainsElementMatcher<T, Alloc> VectorContains( T const& comparator ) {
-        return Vector::ContainsElementMatcher<T, Alloc>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::EqualsMatcher<T, AllocComp, AllocMatch> Equals( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::EqualsMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::ApproxMatcher<T, AllocComp, AllocMatch> Approx( std::vector<T, AllocComp> const& comparator ) {
-        return Vector::ApproxMatcher<T, AllocComp, AllocMatch>( comparator );
-    }
-
-    template<typename T, typename AllocComp = std::allocator<T>, typename AllocMatch = AllocComp>
-    Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch> UnorderedEquals(std::vector<T, AllocComp> const& target) {
-        return Vector::UnorderedEqualsMatcher<T, AllocComp, AllocMatch>( target );
-    }
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_vector.h
-namespace Catch {
-
-    template<typename ArgT, typename MatcherT>
-    class MatchExpr : public ITransientExpression {
-        ArgT const& m_arg;
-        MatcherT m_matcher;
-        StringRef m_matcherString;
-    public:
-        MatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString )
-        :   ITransientExpression{ true, matcher.match( arg ) },
-            m_arg( arg ),
-            m_matcher( matcher ),
-            m_matcherString( matcherString )
-        {}
-
-        void streamReconstructedExpression( std::ostream &os ) const override {
-            auto matcherAsString = m_matcher.toString();
-            os << Catch::Detail::stringify( m_arg ) << ' ';
-            if( matcherAsString == Detail::unprintableString )
-                os << m_matcherString;
-            else
-                os << matcherAsString;
-        }
-    };
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  );
-
-    template<typename ArgT, typename MatcherT>
-    auto makeMatchExpr( ArgT const& arg, MatcherT const& matcher, StringRef const& matcherString  ) -> MatchExpr<ArgT, MatcherT> {
-        return MatchExpr<ArgT, MatcherT>( arg, matcher, matcherString );
-    }
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        INTERNAL_CATCH_TRY { \
-            catchAssertionHandler.handleExpr( Catch::makeMatchExpr( arg, matcher, #matcher##_catch_sr ) ); \
-        } INTERNAL_CATCH_CATCH( catchAssertionHandler ) \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-///////////////////////////////////////////////////////////////////////////////
-#define INTERNAL_CATCH_THROWS_MATCHES( macroName, exceptionType, resultDisposition, matcher, ... ) \
-    do { \
-        Catch::AssertionHandler catchAssertionHandler( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(__VA_ARGS__) ", " CATCH_INTERNAL_STRINGIFY(exceptionType) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
-        if( catchAssertionHandler.allowThrows() ) \
-            try { \
-                static_cast<void>(__VA_ARGS__ ); \
-                catchAssertionHandler.handleUnexpectedExceptionNotThrown(); \
-            } \
-            catch( exceptionType const& ex ) { \
-                catchAssertionHandler.handleExpr( Catch::makeMatchExpr( ex, matcher, #matcher##_catch_sr ) ); \
-            } \
-            catch( ... ) { \
-                catchAssertionHandler.handleUnexpectedInflightException(); \
-            } \
-        else \
-            catchAssertionHandler.handleThrowingCallSkipped(); \
-        INTERNAL_CATCH_REACT( catchAssertionHandler ) \
-    } while( false )
-
-// end catch_capture_matchers.h
-#endif
-// start catch_generators.hpp
-
-// start catch_interfaces_generatortracker.h
-
-
-#include <memory>
-
-namespace Catch {
-
-    namespace Generators {
-        class GeneratorUntypedBase {
-        public:
-            GeneratorUntypedBase() = default;
-            virtual ~GeneratorUntypedBase();
-            // Attempts to move the generator to the next element
-             //
-             // Returns true iff the move succeeded (and a valid element
-             // can be retrieved).
-            virtual bool next() = 0;
-        };
-        using GeneratorBasePtr = std::unique_ptr<GeneratorUntypedBase>;
-
-    } // namespace Generators
-
-    struct IGeneratorTracker {
-        virtual ~IGeneratorTracker();
-        virtual auto hasGenerator() const -> bool = 0;
-        virtual auto getGenerator() const -> Generators::GeneratorBasePtr const& = 0;
-        virtual void setGenerator( Generators::GeneratorBasePtr&& generator ) = 0;
-    };
-
-} // namespace Catch
-
-// end catch_interfaces_generatortracker.h
-// start catch_enforce.h
-
-#include <exception>
-
-namespace Catch {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    template <typename Ex>
-    [[noreturn]]
-    void throw_exception(Ex const& e) {
-        throw e;
-    }
-#else // ^^ Exceptions are enabled //  Exceptions are disabled vv
-    [[noreturn]]
-    void throw_exception(std::exception const& e);
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg);
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg);
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg);
-
-} // namespace Catch;
-
-#define CATCH_MAKE_MSG(...) \
-    (Catch::ReusableStringStream() << __VA_ARGS__).str()
-
-#define CATCH_INTERNAL_ERROR(...) \
-    Catch::throw_logic_error(CATCH_MAKE_MSG( CATCH_INTERNAL_LINEINFO << ": Internal Catch2 error: " << __VA_ARGS__))
-
-#define CATCH_ERROR(...) \
-    Catch::throw_domain_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_RUNTIME_ERROR(...) \
-    Catch::throw_runtime_error(CATCH_MAKE_MSG( __VA_ARGS__ ))
-
-#define CATCH_ENFORCE( condition, ... ) \
-    do{ if( !(condition) ) CATCH_ERROR( __VA_ARGS__ ); } while(false)
-
-// end catch_enforce.h
-#include <memory>
-#include <vector>
-#include <cassert>
-
-#include <utility>
-#include <exception>
-
-namespace Catch {
-
-class GeneratorException : public std::exception {
-    const char* const m_msg = "";
-
-public:
-    GeneratorException(const char* msg):
-        m_msg(msg)
-    {}
-
-    const char* what() const noexcept override final;
-};
-
-namespace Generators {
-
-    // !TBD move this into its own location?
-    namespace pf{
-        template<typename T, typename... Args>
-        std::unique_ptr<T> make_unique( Args&&... args ) {
-            return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
-        }
-    }
-
-    template<typename T>
-    struct IGenerator : GeneratorUntypedBase {
-        virtual ~IGenerator() = default;
-
-        // Returns the current element of the generator
-        //
-        // \Precondition The generator is either freshly constructed,
-        // or the last call to `next()` returned true
-        virtual T const& get() const = 0;
-        using type = T;
-    };
-
-    template<typename T>
-    class SingleValueGenerator final : public IGenerator<T> {
-        T m_value;
-    public:
-        SingleValueGenerator(T&& value) : m_value(std::move(value)) {}
-
-        T const& get() const override {
-            return m_value;
-        }
-        bool next() override {
-            return false;
-        }
-    };
-
-    template<typename T>
-    class FixedValuesGenerator final : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "FixedValuesGenerator does not support bools because of std::vector<bool>"
-            "specialization, use SingleValue Generator instead.");
-        std::vector<T> m_values;
-        size_t m_idx = 0;
-    public:
-        FixedValuesGenerator( std::initializer_list<T> values ) : m_values( values ) {}
-
-        T const& get() const override {
-            return m_values[m_idx];
-        }
-        bool next() override {
-            ++m_idx;
-            return m_idx < m_values.size();
-        }
-    };
-
-    template <typename T>
-    class GeneratorWrapper final {
-        std::unique_ptr<IGenerator<T>> m_generator;
-    public:
-        GeneratorWrapper(std::unique_ptr<IGenerator<T>> generator):
-            m_generator(std::move(generator))
-        {}
-        T const& get() const {
-            return m_generator->get();
-        }
-        bool next() {
-            return m_generator->next();
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> value(T&& value) {
-        return GeneratorWrapper<T>(pf::make_unique<SingleValueGenerator<T>>(std::forward<T>(value)));
-    }
-    template <typename T>
-    GeneratorWrapper<T> values(std::initializer_list<T> values) {
-        return GeneratorWrapper<T>(pf::make_unique<FixedValuesGenerator<T>>(values));
-    }
-
-    template<typename T>
-    class Generators : public IGenerator<T> {
-        std::vector<GeneratorWrapper<T>> m_generators;
-        size_t m_current = 0;
-
-        void populate(GeneratorWrapper<T>&& generator) {
-            m_generators.emplace_back(std::move(generator));
-        }
-        void populate(T&& val) {
-            m_generators.emplace_back(value(std::forward<T>(val)));
-        }
-        template<typename U>
-        void populate(U&& val) {
-            populate(T(std::forward<U>(val)));
-        }
-        template<typename U, typename... Gs>
-        void populate(U&& valueOrGenerator, Gs &&... moreGenerators) {
-            populate(std::forward<U>(valueOrGenerator));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-    public:
-        template <typename... Gs>
-        Generators(Gs &&... moreGenerators) {
-            m_generators.reserve(sizeof...(Gs));
-            populate(std::forward<Gs>(moreGenerators)...);
-        }
-
-        T const& get() const override {
-            return m_generators[m_current].get();
-        }
-
-        bool next() override {
-            if (m_current >= m_generators.size()) {
-                return false;
-            }
-            const bool current_status = m_generators[m_current].next();
-            if (!current_status) {
-                ++m_current;
-            }
-            return m_current < m_generators.size();
-        }
-    };
-
-    template<typename... Ts>
-    GeneratorWrapper<std::tuple<Ts...>> table( std::initializer_list<std::tuple<typename std::decay<Ts>::type...>> tuples ) {
-        return values<std::tuple<Ts...>>( tuples );
-    }
-
-    // Tag type to signal that a generator sequence should convert arguments to a specific type
-    template <typename T>
-    struct as {};
-
-    template<typename T, typename... Gs>
-    auto makeGenerators( GeneratorWrapper<T>&& generator, Gs &&... moreGenerators ) -> Generators<T> {
-        return Generators<T>(std::move(generator), std::forward<Gs>(moreGenerators)...);
-    }
-    template<typename T>
-    auto makeGenerators( GeneratorWrapper<T>&& generator ) -> Generators<T> {
-        return Generators<T>(std::move(generator));
-    }
-    template<typename T, typename... Gs>
-    auto makeGenerators( T&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( std::forward<T>( val ) ), std::forward<Gs>( moreGenerators )... );
-    }
-    template<typename T, typename U, typename... Gs>
-    auto makeGenerators( as<T>, U&& val, Gs &&... moreGenerators ) -> Generators<T> {
-        return makeGenerators( value( T( std::forward<U>( val ) ) ), std::forward<Gs>( moreGenerators )... );
-    }
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker&;
-
-    template<typename L>
-    // Note: The type after -> is weird, because VS2015 cannot parse
-    //       the expression used in the typedef inside, when it is in
-    //       return type. Yeah.
-    auto generate( StringRef generatorName, SourceLineInfo const& lineInfo, L const& generatorExpression ) -> decltype(std::declval<decltype(generatorExpression())>().get()) {
-        using UnderlyingType = typename decltype(generatorExpression())::type;
-
-        IGeneratorTracker& tracker = acquireGeneratorTracker( generatorName, lineInfo );
-        if (!tracker.hasGenerator()) {
-            tracker.setGenerator(pf::make_unique<Generators<UnderlyingType>>(generatorExpression()));
-        }
-
-        auto const& generator = static_cast<IGenerator<UnderlyingType> const&>( *tracker.getGenerator() );
-        return generator.get();
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-#define GENERATE( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [ ]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_COPY( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [=]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-#define GENERATE_REF( ... ) \
-    Catch::Generators::generate( INTERNAL_CATCH_STRINGIZE(INTERNAL_CATCH_UNIQUE_NAME(generator)), \
-                                 CATCH_INTERNAL_LINEINFO, \
-                                 [&]{ using namespace Catch::Generators; return makeGenerators( __VA_ARGS__ ); } ) //NOLINT(google-build-using-namespace)
-
-// end catch_generators.hpp
-// start catch_generators_generic.hpp
-
-namespace Catch {
-namespace Generators {
-
-    template <typename T>
-    class TakeGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        size_t m_returned = 0;
-        size_t m_target;
-    public:
-        TakeGenerator(size_t target, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target(target)
-        {
-            assert(target != 0 && "Empty generators are not allowed");
-        }
-        T const& get() const override {
-            return m_generator.get();
-        }
-        bool next() override {
-            ++m_returned;
-            if (m_returned >= m_target) {
-                return false;
-            }
-
-            const auto success = m_generator.next();
-            // If the underlying generator does not contain enough values
-            // then we cut short as well
-            if (!success) {
-                m_returned = m_target;
-            }
-            return success;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> take(size_t target, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<TakeGenerator<T>>(target, std::move(generator)));
-    }
-
-    template <typename T, typename Predicate>
-    class FilterGenerator : public IGenerator<T> {
-        GeneratorWrapper<T> m_generator;
-        Predicate m_predicate;
-    public:
-        template <typename P = Predicate>
-        FilterGenerator(P&& pred, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_predicate(std::forward<P>(pred))
-        {
-            if (!m_predicate(m_generator.get())) {
-                // It might happen that there are no values that pass the
-                // filter. In that case we throw an exception.
-                auto has_initial_value = next();
-                if (!has_initial_value) {
-                    Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
-                }
-            }
-        }
-
-        T const& get() const override {
-            return m_generator.get();
-        }
-
-        bool next() override {
-            bool success = m_generator.next();
-            if (!success) {
-                return false;
-            }
-            while (!m_predicate(m_generator.get()) && (success = m_generator.next()) == true);
-            return success;
-        }
-    };
-
-    template <typename T, typename Predicate>
-    GeneratorWrapper<T> filter(Predicate&& pred, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(std::unique_ptr<IGenerator<T>>(pf::make_unique<FilterGenerator<T, Predicate>>(std::forward<Predicate>(pred), std::move(generator))));
-    }
-
-    template <typename T>
-    class RepeatGenerator : public IGenerator<T> {
-        static_assert(!std::is_same<T, bool>::value,
-            "RepeatGenerator currently does not support bools"
-            "because of std::vector<bool> specialization");
-        GeneratorWrapper<T> m_generator;
-        mutable std::vector<T> m_returned;
-        size_t m_target_repeats;
-        size_t m_current_repeat = 0;
-        size_t m_repeat_index = 0;
-    public:
-        RepeatGenerator(size_t repeats, GeneratorWrapper<T>&& generator):
-            m_generator(std::move(generator)),
-            m_target_repeats(repeats)
-        {
-            assert(m_target_repeats > 0 && "Repeat generator must repeat at least once");
-        }
-
-        T const& get() const override {
-            if (m_current_repeat == 0) {
-                m_returned.push_back(m_generator.get());
-                return m_returned.back();
-            }
-            return m_returned[m_repeat_index];
-        }
-
-        bool next() override {
-            // There are 2 basic cases:
-            // 1) We are still reading the generator
-            // 2) We are reading our own cache
-
-            // In the first case, we need to poke the underlying generator.
-            // If it happily moves, we are left in that state, otherwise it is time to start reading from our cache
-            if (m_current_repeat == 0) {
-                const auto success = m_generator.next();
-                if (!success) {
-                    ++m_current_repeat;
-                }
-                return m_current_repeat < m_target_repeats;
-            }
-
-            // In the second case, we need to move indices forward and check that we haven't run up against the end
-            ++m_repeat_index;
-            if (m_repeat_index == m_returned.size()) {
-                m_repeat_index = 0;
-                ++m_current_repeat;
-            }
-            return m_current_repeat < m_target_repeats;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<T> repeat(size_t repeats, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<T>(pf::make_unique<RepeatGenerator<T>>(repeats, std::move(generator)));
-    }
-
-    template <typename T, typename U, typename Func>
-    class MapGenerator : public IGenerator<T> {
-        // TBD: provide static assert for mapping function, for friendly error message
-        GeneratorWrapper<U> m_generator;
-        Func m_function;
-        // To avoid returning dangling reference, we have to save the values
-        T m_cache;
-    public:
-        template <typename F2 = Func>
-        MapGenerator(F2&& function, GeneratorWrapper<U>&& generator) :
-            m_generator(std::move(generator)),
-            m_function(std::forward<F2>(function)),
-            m_cache(m_function(m_generator.get()))
-        {}
-
-        T const& get() const override {
-            return m_cache;
-        }
-        bool next() override {
-            const auto success = m_generator.next();
-            if (success) {
-                m_cache = m_function(m_generator.get());
-            }
-            return success;
-        }
-    };
-
-    template <typename Func, typename U, typename T = FunctionReturnType<Func, U>>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T, typename U, typename Func>
-    GeneratorWrapper<T> map(Func&& function, GeneratorWrapper<U>&& generator) {
-        return GeneratorWrapper<T>(
-            pf::make_unique<MapGenerator<T, U, Func>>(std::forward<Func>(function), std::move(generator))
-        );
-    }
-
-    template <typename T>
-    class ChunkGenerator final : public IGenerator<std::vector<T>> {
-        std::vector<T> m_chunk;
-        size_t m_chunk_size;
-        GeneratorWrapper<T> m_generator;
-        bool m_used_up = false;
-    public:
-        ChunkGenerator(size_t size, GeneratorWrapper<T> generator) :
-            m_chunk_size(size), m_generator(std::move(generator))
-        {
-            m_chunk.reserve(m_chunk_size);
-            if (m_chunk_size != 0) {
-                m_chunk.push_back(m_generator.get());
-                for (size_t i = 1; i < m_chunk_size; ++i) {
-                    if (!m_generator.next()) {
-                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                    }
-                    m_chunk.push_back(m_generator.get());
-                }
-            }
-        }
-        std::vector<T> const& get() const override {
-            return m_chunk;
-        }
-        bool next() override {
-            m_chunk.clear();
-            for (size_t idx = 0; idx < m_chunk_size; ++idx) {
-                if (!m_generator.next()) {
-                    return false;
-                }
-                m_chunk.push_back(m_generator.get());
-            }
-            return true;
-        }
-    };
-
-    template <typename T>
-    GeneratorWrapper<std::vector<T>> chunk(size_t size, GeneratorWrapper<T>&& generator) {
-        return GeneratorWrapper<std::vector<T>>(
-            pf::make_unique<ChunkGenerator<T>>(size, std::move(generator))
-        );
-    }
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_generic.hpp
-// start catch_generators_specific.hpp
-
-// start catch_context.h
-
-#include <memory>
-
-namespace Catch {
-
-    struct IResultCapture;
-    struct IRunner;
-    struct IConfig;
-    struct IMutableContext;
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-
-    struct IContext
-    {
-        virtual ~IContext();
-
-        virtual IResultCapture* getResultCapture() = 0;
-        virtual IRunner* getRunner() = 0;
-        virtual IConfigPtr const& getConfig() const = 0;
-    };
-
-    struct IMutableContext : IContext
-    {
-        virtual ~IMutableContext();
-        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
-        virtual void setRunner( IRunner* runner ) = 0;
-        virtual void setConfig( IConfigPtr const& config ) = 0;
-
-    private:
-        static IMutableContext *currentContext;
-        friend IMutableContext& getCurrentMutableContext();
-        friend void cleanUpContext();
-        static void createContext();
-    };
-
-    inline IMutableContext& getCurrentMutableContext()
-    {
-        if( !IMutableContext::currentContext )
-            IMutableContext::createContext();
-        // NOLINTNEXTLINE(clang-analyzer-core.uninitialized.UndefReturn)
-        return *IMutableContext::currentContext;
-    }
-
-    inline IContext& getCurrentContext()
-    {
-        return getCurrentMutableContext();
-    }
-
-    void cleanUpContext();
-
-    class SimplePcg32;
-    SimplePcg32& rng();
-}
-
-// end catch_context.h
-// start catch_interfaces_config.h
-
-// start catch_option.hpp
-
-namespace Catch {
-
-    // An optional type
-    template<typename T>
-    class Option {
-    public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
-        : nullableValue( new( storage ) T( _value ) )
-        {}
-        Option( Option const& _other )
-        : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
-        {}
-
-        ~Option() {
-            reset();
-        }
-
-        Option& operator= ( Option const& _other ) {
-            if( &_other != this ) {
-                reset();
-                if( _other )
-                    nullableValue = new( storage ) T( *_other );
-            }
-            return *this;
-        }
-        Option& operator = ( T const& _value ) {
-            reset();
-            nullableValue = new( storage ) T( _value );
-            return *this;
-        }
-
-        void reset() {
-            if( nullableValue )
-                nullableValue->~T();
-            nullableValue = nullptr;
-        }
-
-        T& operator*() { return *nullableValue; }
-        T const& operator*() const { return *nullableValue; }
-        T* operator->() { return nullableValue; }
-        const T* operator->() const { return nullableValue; }
-
-        T valueOr( T const& defaultValue ) const {
-            return nullableValue ? *nullableValue : defaultValue;
-        }
-
-        bool some() const { return nullableValue != nullptr; }
-        bool none() const { return nullableValue == nullptr; }
-
-        bool operator !() const { return nullableValue == nullptr; }
-        explicit operator bool() const {
-            return some();
-        }
-
-    private:
-        T *nullableValue;
-        alignas(alignof(T)) char storage[sizeof(T)];
-    };
-
-} // end namespace Catch
-
-// end catch_option.hpp
-#include <chrono>
-#include <iosfwd>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    enum class Verbosity {
-        Quiet = 0,
-        Normal,
-        High
-    };
-
-    struct WarnAbout { enum What {
-        Nothing = 0x00,
-        NoAssertions = 0x01,
-        NoTests = 0x02
-    }; };
-
-    struct ShowDurations { enum OrNot {
-        DefaultForReporter,
-        Always,
-        Never
-    }; };
-    struct RunTests { enum InWhatOrder {
-        InDeclarationOrder,
-        InLexicographicalOrder,
-        InRandomOrder
-    }; };
-    struct UseColour { enum YesOrNo {
-        Auto,
-        Yes,
-        No
-    }; };
-    struct WaitForKeypress { enum When {
-        Never,
-        BeforeStart = 1,
-        BeforeExit = 2,
-        BeforeStartAndExit = BeforeStart | BeforeExit
-    }; };
-
-    class TestSpec;
-
-    struct IConfig : NonCopyable {
-
-        virtual ~IConfig();
-
-        virtual bool allowThrows() const = 0;
-        virtual std::ostream& stream() const = 0;
-        virtual std::string name() const = 0;
-        virtual bool includeSuccessfulResults() const = 0;
-        virtual bool shouldDebugBreak() const = 0;
-        virtual bool warnAboutMissingAssertions() const = 0;
-        virtual bool warnAboutNoTests() const = 0;
-        virtual int abortAfter() const = 0;
-        virtual bool showInvisibles() const = 0;
-        virtual ShowDurations::OrNot showDurations() const = 0;
-        virtual TestSpec const& testSpec() const = 0;
-        virtual bool hasTestFilters() const = 0;
-        virtual std::vector<std::string> const& getTestsOrTags() const = 0;
-        virtual RunTests::InWhatOrder runOrder() const = 0;
-        virtual unsigned int rngSeed() const = 0;
-        virtual UseColour::YesOrNo useColour() const = 0;
-        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
-        virtual Verbosity verbosity() const = 0;
-
-        virtual bool benchmarkNoAnalysis() const = 0;
-        virtual int benchmarkSamples() const = 0;
-        virtual double benchmarkConfidenceInterval() const = 0;
-        virtual unsigned int benchmarkResamples() const = 0;
-        virtual std::chrono::milliseconds benchmarkWarmupTime() const = 0;
-    };
-
-    using IConfigPtr = std::shared_ptr<IConfig const>;
-}
-
-// end catch_interfaces_config.h
-// start catch_random_number_generator.h
-
-#include <cstdint>
-
-namespace Catch {
-
-    // This is a simple implementation of C++11 Uniform Random Number
-    // Generator. It does not provide all operators, because Catch2
-    // does not use it, but it should behave as expected inside stdlib's
-    // distributions.
-    // The implementation is based on the PCG family (http://pcg-random.org)
-    class SimplePcg32 {
-        using state_type = std::uint64_t;
-    public:
-        using result_type = std::uint32_t;
-        static constexpr result_type (min)() {
-            return 0;
-        }
-        static constexpr result_type (max)() {
-            return static_cast<result_type>(-1);
-        }
-
-        // Provide some default initial state for the default constructor
-        SimplePcg32():SimplePcg32(0xed743cc4U) {}
-
-        explicit SimplePcg32(result_type seed_);
-
-        void seed(result_type seed_);
-        void discard(uint64_t skip);
-
-        result_type operator()();
-
-    private:
-        friend bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-        friend bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs);
-
-        // In theory we also need operator<< and operator>>
-        // In practice we do not use them, so we will skip them for now
-
-        std::uint64_t m_state;
-        // This part of the state determines which "stream" of the numbers
-        // is chosen -- we take it as a constant for Catch2, so we only
-        // need to deal with seeding the main state.
-        // Picked by reading 8 bytes from `/dev/random` :-)
-        static const std::uint64_t s_inc = (0x13ed0cc53f939476ULL << 1ULL) | 1ULL;
-    };
-
-} // end namespace Catch
-
-// end catch_random_number_generator.h
-#include <random>
-
-namespace Catch {
-namespace Generators {
-
-template <typename Float>
-class RandomFloatingGenerator final : public IGenerator<Float> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_real_distribution<Float> m_dist;
-    Float m_current_number;
-public:
-
-    RandomFloatingGenerator(Float a, Float b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Float const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-template <typename Integer>
-class RandomIntegerGenerator final : public IGenerator<Integer> {
-    Catch::SimplePcg32& m_rng;
-    std::uniform_int_distribution<Integer> m_dist;
-    Integer m_current_number;
-public:
-
-    RandomIntegerGenerator(Integer a, Integer b):
-        m_rng(rng()),
-        m_dist(a, b) {
-        static_cast<void>(next());
-    }
-
-    Integer const& get() const override {
-        return m_current_number;
-    }
-    bool next() override {
-        m_current_number = m_dist(m_rng);
-        return true;
-    }
-};
-
-// TODO: Ideally this would be also constrained against the various char types,
-//       but I don't expect users to run into that in practice.
-template <typename T>
-typename std::enable_if<std::is_integral<T>::value && !std::is_same<T, bool>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomIntegerGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-typename std::enable_if<std::is_floating_point<T>::value,
-GeneratorWrapper<T>>::type
-random(T a, T b) {
-    return GeneratorWrapper<T>(
-        pf::make_unique<RandomFloatingGenerator<T>>(a, b)
-    );
-}
-
-template <typename T>
-class RangeGenerator final : public IGenerator<T> {
-    T m_current;
-    T m_end;
-    T m_step;
-    bool m_positive;
-
-public:
-    RangeGenerator(T const& start, T const& end, T const& step):
-        m_current(start),
-        m_end(end),
-        m_step(step),
-        m_positive(m_step > T(0))
-    {
-        assert(m_current != m_end && "Range start and end cannot be equal");
-        assert(m_step != T(0) && "Step size cannot be zero");
-        assert(((m_positive && m_current <= m_end) || (!m_positive && m_current >= m_end)) && "Step moves away from end");
-    }
-
-    RangeGenerator(T const& start, T const& end):
-        RangeGenerator(start, end, (start < end) ? T(1) : T(-1))
-    {}
-
-    T const& get() const override {
-        return m_current;
-    }
-
-    bool next() override {
-        m_current += m_step;
-        return (m_positive) ? (m_current < m_end) : (m_current > m_end);
-    }
-};
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end, T const& step) {
-    static_assert(std::is_arithmetic<T>::value && !std::is_same<T, bool>::value, "Type must be numeric");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end, step));
-}
-
-template <typename T>
-GeneratorWrapper<T> range(T const& start, T const& end) {
-    static_assert(std::is_integral<T>::value && !std::is_same<T, bool>::value, "Type must be an integer");
-    return GeneratorWrapper<T>(pf::make_unique<RangeGenerator<T>>(start, end));
-}
-
-template <typename T>
-class IteratorGenerator final : public IGenerator<T> {
-    static_assert(!std::is_same<T, bool>::value,
-        "IteratorGenerator currently does not support bools"
-        "because of std::vector<bool> specialization");
-
-    std::vector<T> m_elems;
-    size_t m_current = 0;
-public:
-    template <typename InputIterator, typename InputSentinel>
-    IteratorGenerator(InputIterator first, InputSentinel last):m_elems(first, last) {
-        if (m_elems.empty()) {
-            Catch::throw_exception(GeneratorException("IteratorGenerator received no valid values"));
-        }
-    }
-
-    T const& get() const override {
-        return m_elems[m_current];
-    }
-
-    bool next() override {
-        ++m_current;
-        return m_current != m_elems.size();
-    }
-};
-
-template <typename InputIterator,
-          typename InputSentinel,
-          typename ResultType = typename std::iterator_traits<InputIterator>::value_type>
-GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(from, to));
-}
-
-template <typename Container,
-          typename ResultType = typename Container::value_type>
-GeneratorWrapper<ResultType> from_range(Container const& cnt) {
-    return GeneratorWrapper<ResultType>(pf::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
-}
-
-} // namespace Generators
-} // namespace Catch
-
-// end catch_generators_specific.hpp
-
-// These files are included here so the single_include script doesn't put them
-// in the conditionally compiled sections
-// start catch_test_case_info.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-namespace Catch {
-
-    struct ITestInvoker;
-
-    struct TestCaseInfo {
-        enum SpecialProperties{
-            None = 0,
-            IsHidden = 1 << 1,
-            ShouldFail = 1 << 2,
-            MayFail = 1 << 3,
-            Throws = 1 << 4,
-            NonPortable = 1 << 5,
-            Benchmark = 1 << 6
-        };
-
-        TestCaseInfo(   std::string const& _name,
-                        std::string const& _className,
-                        std::string const& _description,
-                        std::vector<std::string> const& _tags,
-                        SourceLineInfo const& _lineInfo );
-
-        friend void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags );
-
-        bool isHidden() const;
-        bool throws() const;
-        bool okToFail() const;
-        bool expectedToFail() const;
-
-        std::string tagsAsString() const;
-
-        std::string name;
-        std::string className;
-        std::string description;
-        std::vector<std::string> tags;
-        std::vector<std::string> lcaseTags;
-        SourceLineInfo lineInfo;
-        SpecialProperties properties;
-    };
-
-    class TestCase : public TestCaseInfo {
-    public:
-
-        TestCase( ITestInvoker* testCase, TestCaseInfo&& info );
-
-        TestCase withName( std::string const& _newName ) const;
-
-        void invoke() const;
-
-        TestCaseInfo const& getTestCaseInfo() const;
-
-        bool operator == ( TestCase const& other ) const;
-        bool operator < ( TestCase const& other ) const;
-
-    private:
-        std::shared_ptr<ITestInvoker> test;
-    };
-
-    TestCase makeTestCase(  ITestInvoker* testCase,
-                            std::string const& className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& lineInfo );
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_case_info.h
-// start catch_interfaces_runner.h
-
-namespace Catch {
-
-    struct IRunner {
-        virtual ~IRunner();
-        virtual bool aborting() const = 0;
-    };
-}
-
-// end catch_interfaces_runner.h
-
-#ifdef __OBJC__
-// start catch_objc.hpp
-
-#import <objc/runtime.h>
-
-#include <string>
-
-// NB. Any general catch headers included here must be included
-// in catch.hpp first to make sure they are included by the single
-// header for non obj-usage
-
-///////////////////////////////////////////////////////////////////////////////
-// This protocol is really only here for (self) documenting purposes, since
-// all its methods are optional.
-@protocol OcFixture
-
-@optional
-
--(void) setUp;
--(void) tearDown;
-
-@end
-
-namespace Catch {
-
-    class OcMethod : public ITestInvoker {
-
-    public:
-        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
-
-        virtual void invoke() const {
-            id obj = [[m_cls alloc] init];
-
-            performOptionalSelector( obj, @selector(setUp)  );
-            performOptionalSelector( obj, m_sel );
-            performOptionalSelector( obj, @selector(tearDown)  );
-
-            arcSafeRelease( obj );
-        }
-    private:
-        virtual ~OcMethod() {}
-
-        Class m_cls;
-        SEL m_sel;
-    };
-
-    namespace Detail{
-
-        inline std::string getAnnotation(   Class cls,
-                                            std::string const& annotationName,
-                                            std::string const& testCaseName ) {
-            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
-            SEL sel = NSSelectorFromString( selStr );
-            arcSafeRelease( selStr );
-            id value = performOptionalSelector( cls, sel );
-            if( value )
-                return [(NSString*)value UTF8String];
-            return "";
-        }
-    }
-
-    inline std::size_t registerTestMethods() {
-        std::size_t noTestMethods = 0;
-        int noClasses = objc_getClassList( nullptr, 0 );
-
-        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
-        objc_getClassList( classes, noClasses );
-
-        for( int c = 0; c < noClasses; c++ ) {
-            Class cls = classes[c];
-            {
-                u_int count;
-                Method* methods = class_copyMethodList( cls, &count );
-                for( u_int m = 0; m < count ; m++ ) {
-                    SEL selector = method_getName(methods[m]);
-                    std::string methodName = sel_getName(selector);
-                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
-                        std::string testCaseName = methodName.substr( 15 );
-                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
-                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
-                        const char* className = class_getName( cls );
-
-                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, NameAndTags( name.c_str(), desc.c_str() ), SourceLineInfo("",0) ) );
-                        noTestMethods++;
-                    }
-                }
-                free(methods);
-            }
-        }
-        return noTestMethods;
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-
-    namespace Matchers {
-        namespace Impl {
-        namespace NSStringMatchers {
-
-            struct StringHolder : MatcherBase<NSString*>{
-                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
-                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
-                StringHolder() {
-                    arcSafeRelease( m_substr );
-                }
-
-                bool match( NSString* str ) const override {
-                    return false;
-                }
-
-                NSString* CATCH_ARC_STRONG m_substr;
-            };
-
-            struct Equals : StringHolder {
-                Equals( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str isEqualToString:m_substr];
-                }
-
-                std::string describe() const override {
-                    return "equals string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct Contains : StringHolder {
-                Contains( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location != NSNotFound;
-                }
-
-                std::string describe() const override {
-                    return "contains string: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-            struct StartsWith : StringHolder {
-                StartsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == 0;
-                }
-
-                std::string describe() const override {
-                    return "starts with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-            struct EndsWith : StringHolder {
-                EndsWith( NSString* substr ) : StringHolder( substr ){}
-
-                bool match( NSString* str ) const override {
-                    return  (str != nil || m_substr == nil ) &&
-                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
-                }
-
-                std::string describe() const override {
-                    return "ends with: " + Catch::Detail::stringify( m_substr );
-                }
-            };
-
-        } // namespace NSStringMatchers
-        } // namespace Impl
-
-        inline Impl::NSStringMatchers::Equals
-            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
-
-        inline Impl::NSStringMatchers::Contains
-            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
-
-        inline Impl::NSStringMatchers::StartsWith
-            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
-
-        inline Impl::NSStringMatchers::EndsWith
-            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
-
-    } // namespace Matchers
-
-    using namespace Matchers;
-
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-} // namespace Catch
-
-///////////////////////////////////////////////////////////////////////////////
-#define OC_MAKE_UNIQUE_NAME( root, uniqueSuffix ) root##uniqueSuffix
-#define OC_TEST_CASE2( name, desc, uniqueSuffix ) \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Name_test_, uniqueSuffix ) \
-{ \
-return @ name; \
-} \
-+(NSString*) OC_MAKE_UNIQUE_NAME( Catch_Description_test_, uniqueSuffix ) \
-{ \
-return @ desc; \
-} \
--(void) OC_MAKE_UNIQUE_NAME( Catch_TestCase_test_, uniqueSuffix )
-
-#define OC_TEST_CASE( name, desc ) OC_TEST_CASE2( name, desc, __LINE__ )
-
-// end catch_objc.hpp
-#endif
-
-// Benchmarking needs the externally-facing parts of reporters to work
-#if defined(CATCH_CONFIG_EXTERNAL_INTERFACES) || defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_external_interfaces.h
-
-// start catch_reporter_bases.hpp
-
-// start catch_interfaces_reporter.h
-
-// start catch_config.hpp
-
-// start catch_test_spec_parser.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_test_spec.h
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wpadded"
-#endif
-
-// start catch_wildcard_pattern.h
-
-namespace Catch
-{
-    class WildcardPattern {
-        enum WildcardPosition {
-            NoWildcard = 0,
-            WildcardAtStart = 1,
-            WildcardAtEnd = 2,
-            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
-        };
-
-    public:
-
-        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity );
-        virtual ~WildcardPattern() = default;
-        virtual bool matches( std::string const& str ) const;
-
-    private:
-        std::string normaliseString( std::string const& str ) const;
-        CaseSensitive::Choice m_caseSensitivity;
-        WildcardPosition m_wildcard = NoWildcard;
-        std::string m_pattern;
-    };
-}
-
-// end catch_wildcard_pattern.h
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    struct IConfig;
-
-    class TestSpec {
-        class Pattern {
-        public:
-            explicit Pattern( std::string const& name );
-            virtual ~Pattern();
-            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
-            std::string const& name() const;
-        private:
-            std::string const m_name;
-        };
-        using PatternPtr = std::shared_ptr<Pattern>;
-
-        class NamePattern : public Pattern {
-        public:
-            explicit NamePattern( std::string const& name, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            WildcardPattern m_wildcardPattern;
-        };
-
-        class TagPattern : public Pattern {
-        public:
-            explicit TagPattern( std::string const& tag, std::string const& filterString );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            std::string m_tag;
-        };
-
-        class ExcludedPattern : public Pattern {
-        public:
-            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
-            bool matches( TestCaseInfo const& testCase ) const override;
-        private:
-            PatternPtr m_underlyingPattern;
-        };
-
-        struct Filter {
-            std::vector<PatternPtr> m_patterns;
-
-            bool matches( TestCaseInfo const& testCase ) const;
-            std::string name() const;
-        };
-
-    public:
-        struct FilterMatch {
-            std::string name;
-            std::vector<TestCase const*> tests;
-        };
-        using Matches = std::vector<FilterMatch>;
-        using vectorStrings = std::vector<std::string>;
-
-        bool hasFilters() const;
-        bool matches( TestCaseInfo const& testCase ) const;
-        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
-        const vectorStrings & getInvalidArgs() const;
-
-    private:
-        std::vector<Filter> m_filters;
-        std::vector<std::string> m_invalidArgs;
-        friend class TestSpecParser;
-    };
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec.h
-// start catch_interfaces_tag_alias_registry.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias;
-
-    struct ITagAliasRegistry {
-        virtual ~ITagAliasRegistry();
-        // Nullptr if not present
-        virtual TagAlias const* find( std::string const& alias ) const = 0;
-        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
-
-        static ITagAliasRegistry const& get();
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_tag_alias_registry.h
-namespace Catch {
-
-    class TestSpecParser {
-        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
-        Mode m_mode = None;
-        Mode lastMode = None;
-        bool m_exclusion = false;
-        std::size_t m_pos = 0;
-        std::size_t m_realPatternPos = 0;
-        std::string m_arg;
-        std::string m_substring;
-        std::string m_patternName;
-        std::vector<std::size_t> m_escapeChars;
-        TestSpec::Filter m_currentFilter;
-        TestSpec m_testSpec;
-        ITagAliasRegistry const* m_tagAliases = nullptr;
-
-    public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases );
-
-        TestSpecParser& parse( std::string const& arg );
-        TestSpec testSpec();
-
-    private:
-        bool visitChar( char c );
-        void startNewMode( Mode mode );
-        bool processNoneChar( char c );
-        void processNameChar( char c );
-        bool processOtherChar( char c );
-        void endMode();
-        void escape();
-        bool isControlChar( char c ) const;
-        void saveLastMode();
-        void revertBackToLastMode();
-        void addFilter();
-        bool separate();
-
-        // Handles common preprocessing of the pattern for name/tag patterns
-        std::string preprocessPattern();
-        // Adds the current pattern as a test name
-        void addNamePattern();
-        // Adds the current pattern as a tag
-        void addTagPattern();
-
-        inline void addCharToPattern(char c) {
-            m_substring += c;
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-
-    };
-    TestSpec parseTestSpec( std::string const& arg );
-
-} // namespace Catch
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_test_spec_parser.h
-// Libstdc++ doesn't like incomplete classes for unique_ptr
-
-#include <memory>
-#include <vector>
-#include <string>
-
-#ifndef CATCH_CONFIG_CONSOLE_WIDTH
-#define CATCH_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-
-    struct IStream;
-
-    struct ConfigData {
-        bool listTests = false;
-        bool listTags = false;
-        bool listReporters = false;
-        bool listTestNamesOnly = false;
-
-        bool showSuccessfulTests = false;
-        bool shouldDebugBreak = false;
-        bool noThrow = false;
-        bool showHelp = false;
-        bool showInvisibles = false;
-        bool filenamesAsTags = false;
-        bool libIdentify = false;
-
-        int abortAfter = -1;
-        unsigned int rngSeed = 0;
-
-        bool benchmarkNoAnalysis = false;
-        unsigned int benchmarkSamples = 100;
-        double benchmarkConfidenceInterval = 0.95;
-        unsigned int benchmarkResamples = 100000;
-        std::chrono::milliseconds::rep benchmarkWarmupTime = 100;
-
-        Verbosity verbosity = Verbosity::Normal;
-        WarnAbout::What warnings = WarnAbout::Nothing;
-        ShowDurations::OrNot showDurations = ShowDurations::DefaultForReporter;
-        RunTests::InWhatOrder runOrder = RunTests::InDeclarationOrder;
-        UseColour::YesOrNo useColour = UseColour::Auto;
-        WaitForKeypress::When waitForKeypress = WaitForKeypress::Never;
-
-        std::string outputFilename;
-        std::string name;
-        std::string processName;
-#ifndef CATCH_CONFIG_DEFAULT_REPORTER
-#define CATCH_CONFIG_DEFAULT_REPORTER "console"
-#endif
-        std::string reporterName = CATCH_CONFIG_DEFAULT_REPORTER;
-#undef CATCH_CONFIG_DEFAULT_REPORTER
-
-        std::vector<std::string> testsOrTags;
-        std::vector<std::string> sectionsToRun;
-    };
-
-    class Config : public IConfig {
-    public:
-
-        Config() = default;
-        Config( ConfigData const& data );
-        virtual ~Config() = default;
-
-        std::string const& getFilename() const;
-
-        bool listTests() const;
-        bool listTestNamesOnly() const;
-        bool listTags() const;
-        bool listReporters() const;
-
-        std::string getProcessName() const;
-        std::string const& getReporterName() const;
-
-        std::vector<std::string> const& getTestsOrTags() const override;
-        std::vector<std::string> const& getSectionsToRun() const override;
-
-        TestSpec const& testSpec() const override;
-        bool hasTestFilters() const override;
-
-        bool showHelp() const;
-
-        // IConfig interface
-        bool allowThrows() const override;
-        std::ostream& stream() const override;
-        std::string name() const override;
-        bool includeSuccessfulResults() const override;
-        bool warnAboutMissingAssertions() const override;
-        bool warnAboutNoTests() const override;
-        ShowDurations::OrNot showDurations() const override;
-        RunTests::InWhatOrder runOrder() const override;
-        unsigned int rngSeed() const override;
-        UseColour::YesOrNo useColour() const override;
-        bool shouldDebugBreak() const override;
-        int abortAfter() const override;
-        bool showInvisibles() const override;
-        Verbosity verbosity() const override;
-        bool benchmarkNoAnalysis() const override;
-        int benchmarkSamples() const override;
-        double benchmarkConfidenceInterval() const override;
-        unsigned int benchmarkResamples() const override;
-        std::chrono::milliseconds benchmarkWarmupTime() const override;
-
-    private:
-
-        IStream const* openStream();
-        ConfigData m_data;
-
-        std::unique_ptr<IStream const> m_stream;
-        TestSpec m_testSpec;
-        bool m_hasTestFilters = false;
-    };
-
-} // end namespace Catch
-
-// end catch_config.hpp
-// start catch_assertionresult.h
-
-#include <string>
-
-namespace Catch {
-
-    struct AssertionResultData
-    {
-        AssertionResultData() = delete;
-
-        AssertionResultData( ResultWas::OfType _resultType, LazyExpression const& _lazyExpression );
-
-        std::string message;
-        mutable std::string reconstructedExpression;
-        LazyExpression lazyExpression;
-        ResultWas::OfType resultType;
-
-        std::string reconstructExpression() const;
-    };
-
-    class AssertionResult {
-    public:
-        AssertionResult() = delete;
-        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
-
-        bool isOk() const;
-        bool succeeded() const;
-        ResultWas::OfType getResultType() const;
-        bool hasExpression() const;
-        bool hasMessage() const;
-        std::string getExpression() const;
-        std::string getExpressionInMacro() const;
-        bool hasExpandedExpression() const;
-        std::string getExpandedExpression() const;
-        std::string getMessage() const;
-        SourceLineInfo getSourceInfo() const;
-        StringRef getTestMacroName() const;
-
-    //protected:
-        AssertionInfo m_info;
-        AssertionResultData m_resultData;
-    };
-
-} // end namespace Catch
-
-// end catch_assertionresult.h
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_estimate.hpp
-
- // Statistics estimates
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct Estimate {
-            Duration point;
-            Duration lower_bound;
-            Duration upper_bound;
-            double confidence_interval;
-
-            template <typename Duration2>
-            operator Estimate<Duration2>() const {
-                return { point, lower_bound, upper_bound, confidence_interval };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate.hpp
-// start catch_outlier_classification.hpp
-
-// Outlier information
-
-namespace Catch {
-    namespace Benchmark {
-        struct OutlierClassification {
-            int samples_seen = 0;
-            int low_severe = 0;     // more than 3 times IQR below Q1
-            int low_mild = 0;       // 1.5 to 3 times IQR below Q1
-            int high_mild = 0;      // 1.5 to 3 times IQR above Q3
-            int high_severe = 0;    // more than 3 times IQR above Q3
-
-            int total() const {
-                return low_severe + low_mild + high_mild + high_severe;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_outlier_classification.hpp
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-#include <string>
-#include <iosfwd>
-#include <map>
-#include <set>
-#include <memory>
-#include <algorithm>
-
-namespace Catch {
-
-    struct ReporterConfig {
-        explicit ReporterConfig( IConfigPtr const& _fullConfig );
-
-        ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream );
-
-        std::ostream& stream() const;
-        IConfigPtr fullConfig() const;
-
-    private:
-        std::ostream* m_stream;
-        IConfigPtr m_fullConfig;
-    };
-
-    struct ReporterPreferences {
-        bool shouldRedirectStdOut = false;
-        bool shouldReportAllAssertions = false;
-    };
-
-    template<typename T>
-    struct LazyStat : Option<T> {
-        LazyStat& operator=( T const& _value ) {
-            Option<T>::operator=( _value );
-            used = false;
-            return *this;
-        }
-        void reset() {
-            Option<T>::reset();
-            used = false;
-        }
-        bool used = false;
-    };
-
-    struct TestRunInfo {
-        TestRunInfo( std::string const& _name );
-        std::string name;
-    };
-    struct GroupInfo {
-        GroupInfo(  std::string const& _name,
-                    std::size_t _groupIndex,
-                    std::size_t _groupsCount );
-
-        std::string name;
-        std::size_t groupIndex;
-        std::size_t groupsCounts;
-    };
-
-    struct AssertionStats {
-        AssertionStats( AssertionResult const& _assertionResult,
-                        std::vector<MessageInfo> const& _infoMessages,
-                        Totals const& _totals );
-
-        AssertionStats( AssertionStats const& )              = default;
-        AssertionStats( AssertionStats && )                  = default;
-        AssertionStats& operator = ( AssertionStats const& ) = delete;
-        AssertionStats& operator = ( AssertionStats && )     = delete;
-        virtual ~AssertionStats();
-
-        AssertionResult assertionResult;
-        std::vector<MessageInfo> infoMessages;
-        Totals totals;
-    };
-
-    struct SectionStats {
-        SectionStats(   SectionInfo const& _sectionInfo,
-                        Counts const& _assertions,
-                        double _durationInSeconds,
-                        bool _missingAssertions );
-        SectionStats( SectionStats const& )              = default;
-        SectionStats( SectionStats && )                  = default;
-        SectionStats& operator = ( SectionStats const& ) = default;
-        SectionStats& operator = ( SectionStats && )     = default;
-        virtual ~SectionStats();
-
-        SectionInfo sectionInfo;
-        Counts assertions;
-        double durationInSeconds;
-        bool missingAssertions;
-    };
-
-    struct TestCaseStats {
-        TestCaseStats(  TestCaseInfo const& _testInfo,
-                        Totals const& _totals,
-                        std::string const& _stdOut,
-                        std::string const& _stdErr,
-                        bool _aborting );
-
-        TestCaseStats( TestCaseStats const& )              = default;
-        TestCaseStats( TestCaseStats && )                  = default;
-        TestCaseStats& operator = ( TestCaseStats const& ) = default;
-        TestCaseStats& operator = ( TestCaseStats && )     = default;
-        virtual ~TestCaseStats();
-
-        TestCaseInfo testInfo;
-        Totals totals;
-        std::string stdOut;
-        std::string stdErr;
-        bool aborting;
-    };
-
-    struct TestGroupStats {
-        TestGroupStats( GroupInfo const& _groupInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-        TestGroupStats( GroupInfo const& _groupInfo );
-
-        TestGroupStats( TestGroupStats const& )              = default;
-        TestGroupStats( TestGroupStats && )                  = default;
-        TestGroupStats& operator = ( TestGroupStats const& ) = default;
-        TestGroupStats& operator = ( TestGroupStats && )     = default;
-        virtual ~TestGroupStats();
-
-        GroupInfo groupInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-    struct TestRunStats {
-        TestRunStats(   TestRunInfo const& _runInfo,
-                        Totals const& _totals,
-                        bool _aborting );
-
-        TestRunStats( TestRunStats const& )              = default;
-        TestRunStats( TestRunStats && )                  = default;
-        TestRunStats& operator = ( TestRunStats const& ) = default;
-        TestRunStats& operator = ( TestRunStats && )     = default;
-        virtual ~TestRunStats();
-
-        TestRunInfo runInfo;
-        Totals totals;
-        bool aborting;
-    };
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    template <class Duration>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Duration> samples;
-        Benchmark::Estimate<Duration> mean;
-        Benchmark::Estimate<Duration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-
-        template <typename Duration2>
-        operator BenchmarkStats<Duration2>() const {
-            std::vector<Duration2> samples2;
-            samples2.reserve(samples.size());
-            std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-            return {
-                info,
-                std::move(samples2),
-                mean,
-                standardDeviation,
-                outliers,
-                outlierVariance,
-            };
-        }
-    };
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    struct IStreamingReporter {
-        virtual ~IStreamingReporter() = default;
-
-        // Implementing class must also provide the following static methods:
-        // static std::string getDescription();
-        // static std::set<Verbosity> getSupportedVerbosities()
-
-        virtual ReporterPreferences getPreferences() const = 0;
-
-        virtual void noMatchingTestCases( std::string const& spec ) = 0;
-
-        virtual void reportInvalidArguments(std::string const&) {}
-
-        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
-        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
-
-        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
-        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        virtual void benchmarkPreparing( std::string const& ) {}
-        virtual void benchmarkStarting( BenchmarkInfo const& ) {}
-        virtual void benchmarkEnded( BenchmarkStats<> const& ) {}
-        virtual void benchmarkFailed( std::string const& ) {}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
-
-        // The return value indicates if the messages buffer should be cleared:
-        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
-
-        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
-        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
-        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
-        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
-
-        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
-
-        // Default empty implementation provided
-        virtual void fatalErrorEncountered( StringRef name );
-
-        virtual bool isMulti() const;
-    };
-    using IStreamingReporterPtr = std::unique_ptr<IStreamingReporter>;
-
-    struct IReporterFactory {
-        virtual ~IReporterFactory();
-        virtual IStreamingReporterPtr create( ReporterConfig const& config ) const = 0;
-        virtual std::string getDescription() const = 0;
-    };
-    using IReporterFactoryPtr = std::shared_ptr<IReporterFactory>;
-
-    struct IReporterRegistry {
-        using FactoryMap = std::map<std::string, IReporterFactoryPtr>;
-        using Listeners = std::vector<IReporterFactoryPtr>;
-
-        virtual ~IReporterRegistry();
-        virtual IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const = 0;
-        virtual FactoryMap const& getFactories() const = 0;
-        virtual Listeners const& getListeners() const = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_interfaces_reporter.h
-#include <algorithm>
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-#include <ostream>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result);
-
-    // Returns double formatted as %.3f (format expected on output)
-    std::string getFormattedDuration( double duration );
-
-    std::string serializeFilters( std::vector<std::string> const& container );
-
-    template<typename DerivedT>
-    struct StreamingReporterBase : IStreamingReporter {
-
-        StreamingReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        ~StreamingReporterBase() override = default;
-
-        void noMatchingTestCases(std::string const&) override {}
-
-        void reportInvalidArguments(std::string const&) override {}
-
-        void testRunStarting(TestRunInfo const& _testRunInfo) override {
-            currentTestRunInfo = _testRunInfo;
-        }
-
-        void testGroupStarting(GroupInfo const& _groupInfo) override {
-            currentGroupInfo = _groupInfo;
-        }
-
-        void testCaseStarting(TestCaseInfo const& _testInfo) override  {
-            currentTestCaseInfo = _testInfo;
-        }
-        void sectionStarting(SectionInfo const& _sectionInfo) override {
-            m_sectionStack.push_back(_sectionInfo);
-        }
-
-        void sectionEnded(SectionStats const& /* _sectionStats */) override {
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& /* _testCaseStats */) override {
-            currentTestCaseInfo.reset();
-        }
-        void testGroupEnded(TestGroupStats const& /* _testGroupStats */) override {
-            currentGroupInfo.reset();
-        }
-        void testRunEnded(TestRunStats const& /* _testRunStats */) override {
-            currentTestCaseInfo.reset();
-            currentGroupInfo.reset();
-            currentTestRunInfo.reset();
-        }
-
-        void skipTest(TestCaseInfo const&) override {
-            // Don't do anything with this by default.
-            // It can optionally be overridden in the derived class.
-        }
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-
-        LazyStat<TestRunInfo> currentTestRunInfo;
-        LazyStat<GroupInfo> currentGroupInfo;
-        LazyStat<TestCaseInfo> currentTestCaseInfo;
-
-        std::vector<SectionInfo> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<typename DerivedT>
-    struct CumulativeReporterBase : IStreamingReporter {
-        template<typename T, typename ChildNodeT>
-        struct Node {
-            explicit Node( T const& _value ) : value( _value ) {}
-            virtual ~Node() {}
-
-            using ChildNodes = std::vector<std::shared_ptr<ChildNodeT>>;
-            T value;
-            ChildNodes children;
-        };
-        struct SectionNode {
-            explicit SectionNode(SectionStats const& _stats) : stats(_stats) {}
-            virtual ~SectionNode() = default;
-
-            bool operator == (SectionNode const& other) const {
-                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
-            }
-            bool operator == (std::shared_ptr<SectionNode> const& other) const {
-                return operator==(*other);
-            }
-
-            SectionStats stats;
-            using ChildSections = std::vector<std::shared_ptr<SectionNode>>;
-            using Assertions = std::vector<AssertionStats>;
-            ChildSections childSections;
-            Assertions assertions;
-            std::string stdOut;
-            std::string stdErr;
-        };
-
-        struct BySectionInfo {
-            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
-            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
-            bool operator() (std::shared_ptr<SectionNode> const& node) const {
-                return ((node->stats.sectionInfo.name == m_other.name) &&
-                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
-            }
-            void operator=(BySectionInfo const&) = delete;
-
-        private:
-            SectionInfo const& m_other;
-        };
-
-        using TestCaseNode = Node<TestCaseStats, SectionNode>;
-        using TestGroupNode = Node<TestGroupStats, TestCaseNode>;
-        using TestRunNode = Node<TestRunStats, TestGroupNode>;
-
-        CumulativeReporterBase( ReporterConfig const& _config )
-        :   m_config( _config.fullConfig() ),
-            stream( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = false;
-            if( !DerivedT::getSupportedVerbosities().count( m_config->verbosity() ) )
-                CATCH_ERROR( "Verbosity level not supported by this reporter" );
-        }
-        ~CumulativeReporterBase() override = default;
-
-        ReporterPreferences getPreferences() const override {
-            return m_reporterPrefs;
-        }
-
-        static std::set<Verbosity> getSupportedVerbosities() {
-            return { Verbosity::Normal };
-        }
-
-        void testRunStarting( TestRunInfo const& ) override {}
-        void testGroupStarting( GroupInfo const& ) override {}
-
-        void testCaseStarting( TestCaseInfo const& ) override {}
-
-        void sectionStarting( SectionInfo const& sectionInfo ) override {
-            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
-            std::shared_ptr<SectionNode> node;
-            if( m_sectionStack.empty() ) {
-                if( !m_rootSection )
-                    m_rootSection = std::make_shared<SectionNode>( incompleteStats );
-                node = m_rootSection;
-            }
-            else {
-                SectionNode& parentNode = *m_sectionStack.back();
-                auto it =
-                    std::find_if(   parentNode.childSections.begin(),
-                                    parentNode.childSections.end(),
-                                    BySectionInfo( sectionInfo ) );
-                if( it == parentNode.childSections.end() ) {
-                    node = std::make_shared<SectionNode>( incompleteStats );
-                    parentNode.childSections.push_back( node );
-                }
-                else
-                    node = *it;
-            }
-            m_sectionStack.push_back( node );
-            m_deepestSection = std::move(node);
-        }
-
-        void assertionStarting(AssertionInfo const&) override {}
-
-        bool assertionEnded(AssertionStats const& assertionStats) override {
-            assert(!m_sectionStack.empty());
-            // AssertionResult holds a pointer to a temporary DecomposedExpression,
-            // which getExpandedExpression() calls to build the expression string.
-            // Our section stack copy of the assertionResult will likely outlive the
-            // temporary, so it must be expanded or discarded now to avoid calling
-            // a destroyed object later.
-            prepareExpandedExpression(const_cast<AssertionResult&>( assertionStats.assertionResult ) );
-            SectionNode& sectionNode = *m_sectionStack.back();
-            sectionNode.assertions.push_back(assertionStats);
-            return true;
-        }
-        void sectionEnded(SectionStats const& sectionStats) override {
-            assert(!m_sectionStack.empty());
-            SectionNode& node = *m_sectionStack.back();
-            node.stats = sectionStats;
-            m_sectionStack.pop_back();
-        }
-        void testCaseEnded(TestCaseStats const& testCaseStats) override {
-            auto node = std::make_shared<TestCaseNode>(testCaseStats);
-            assert(m_sectionStack.size() == 0);
-            node->children.push_back(m_rootSection);
-            m_testCases.push_back(node);
-            m_rootSection.reset();
-
-            assert(m_deepestSection);
-            m_deepestSection->stdOut = testCaseStats.stdOut;
-            m_deepestSection->stdErr = testCaseStats.stdErr;
-        }
-        void testGroupEnded(TestGroupStats const& testGroupStats) override {
-            auto node = std::make_shared<TestGroupNode>(testGroupStats);
-            node->children.swap(m_testCases);
-            m_testGroups.push_back(node);
-        }
-        void testRunEnded(TestRunStats const& testRunStats) override {
-            auto node = std::make_shared<TestRunNode>(testRunStats);
-            node->children.swap(m_testGroups);
-            m_testRuns.push_back(node);
-            testRunEndedCumulative();
-        }
-        virtual void testRunEndedCumulative() = 0;
-
-        void skipTest(TestCaseInfo const&) override {}
-
-        IConfigPtr m_config;
-        std::ostream& stream;
-        std::vector<AssertionStats> m_assertions;
-        std::vector<std::vector<std::shared_ptr<SectionNode>>> m_sections;
-        std::vector<std::shared_ptr<TestCaseNode>> m_testCases;
-        std::vector<std::shared_ptr<TestGroupNode>> m_testGroups;
-
-        std::vector<std::shared_ptr<TestRunNode>> m_testRuns;
-
-        std::shared_ptr<SectionNode> m_rootSection;
-        std::shared_ptr<SectionNode> m_deepestSection;
-        std::vector<std::shared_ptr<SectionNode>> m_sectionStack;
-        ReporterPreferences m_reporterPrefs;
-    };
-
-    template<char C>
-    char const* getLineOfChars() {
-        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
-        if( !*line ) {
-            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
-            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
-        }
-        return line;
-    }
-
-    struct TestEventListenerBase : StreamingReporterBase<TestEventListenerBase> {
-        TestEventListenerBase( ReporterConfig const& _config );
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-        void assertionStarting(AssertionInfo const&) override;
-        bool assertionEnded(AssertionStats const&) override;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_bases.hpp
-// start catch_console_colour.h
-
-namespace Catch {
-
-    struct Colour {
-        enum Code {
-            None = 0,
-
-            White,
-            Red,
-            Green,
-            Blue,
-            Cyan,
-            Yellow,
-            Grey,
-
-            Bright = 0x10,
-
-            BrightRed = Bright | Red,
-            BrightGreen = Bright | Green,
-            LightGrey = Bright | Grey,
-            BrightWhite = Bright | White,
-            BrightYellow = Bright | Yellow,
-
-            // By intention
-            FileName = LightGrey,
-            Warning = BrightYellow,
-            ResultError = BrightRed,
-            ResultSuccess = BrightGreen,
-            ResultExpectedFailure = Warning,
-
-            Error = BrightRed,
-            Success = Green,
-
-            OriginalExpression = Cyan,
-            ReconstructedExpression = BrightYellow,
-
-            SecondaryText = LightGrey,
-            Headers = White
-        };
-
-        // Use constructed object for RAII guard
-        Colour( Code _colourCode );
-        Colour( Colour&& other ) noexcept;
-        Colour& operator=( Colour&& other ) noexcept;
-        ~Colour();
-
-        // Use static method for one-shot changes
-        static void use( Code _colourCode );
-
-    private:
-        bool m_moved = false;
-    };
-
-    std::ostream& operator << ( std::ostream& os, Colour const& );
-
-} // end namespace Catch
-
-// end catch_console_colour.h
-// start catch_reporter_registrars.hpp
-
-
-namespace Catch {
-
-    template<typename T>
-    class ReporterRegistrar {
-
-        class ReporterFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-
-            std::string getDescription() const override {
-                return T::getDescription();
-            }
-        };
-
-    public:
-
-        explicit ReporterRegistrar( std::string const& name ) {
-            getMutableRegistryHub().registerReporter( name, std::make_shared<ReporterFactory>() );
-        }
-    };
-
-    template<typename T>
-    class ListenerRegistrar {
-
-        class ListenerFactory : public IReporterFactory {
-
-            IStreamingReporterPtr create( ReporterConfig const& config ) const override {
-                return std::unique_ptr<T>( new T( config ) );
-            }
-            std::string getDescription() const override {
-                return std::string();
-            }
-        };
-
-    public:
-
-        ListenerRegistrar() {
-            getMutableRegistryHub().registerListener( std::make_shared<ListenerFactory>() );
-        }
-    };
-}
-
-#if !defined(CATCH_CONFIG_DISABLE)
-
-#define CATCH_REGISTER_REPORTER( name, reporterType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION         \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS          \
-    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-#define CATCH_REGISTER_LISTENER( listenerType ) \
-    CATCH_INTERNAL_START_WARNINGS_SUPPRESSION   \
-    CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS    \
-    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; } \
-    CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-#else // CATCH_CONFIG_DISABLE
-
-#define CATCH_REGISTER_REPORTER(name, reporterType)
-#define CATCH_REGISTER_LISTENER(listenerType)
-
-#endif // CATCH_CONFIG_DISABLE
-
-// end catch_reporter_registrars.hpp
-// Allow users to base their work off existing reporters
-// start catch_reporter_compact.h
-
-namespace Catch {
-
-    struct CompactReporter : StreamingReporterBase<CompactReporter> {
-
-        using StreamingReporterBase::StreamingReporterBase;
-
-        ~CompactReporter() override;
-
-        static std::string getDescription();
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_compact.h
-// start catch_reporter_console.h
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    // Fwd decls
-    struct SummaryColumn;
-    class TablePrinter;
-
-    struct ConsoleReporter : StreamingReporterBase<ConsoleReporter> {
-        std::unique_ptr<TablePrinter> m_tablePrinter;
-
-        ConsoleReporter(ReporterConfig const& config);
-        ~ConsoleReporter() override;
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& spec) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& _assertionStats) override;
-
-        void sectionStarting(SectionInfo const& _sectionInfo) override;
-        void sectionEnded(SectionStats const& _sectionStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const& info) override;
-        void benchmarkEnded(BenchmarkStats<> const& stats) override;
-        void benchmarkFailed(std::string const& error) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testCaseEnded(TestCaseStats const& _testCaseStats) override;
-        void testGroupEnded(TestGroupStats const& _testGroupStats) override;
-        void testRunEnded(TestRunStats const& _testRunStats) override;
-        void testRunStarting(TestRunInfo const& _testRunInfo) override;
-    private:
-
-        void lazyPrint();
-
-        void lazyPrintWithoutClosingBenchmarkTable();
-        void lazyPrintRunInfo();
-        void lazyPrintGroupInfo();
-        void printTestCaseAndSectionHeader();
-
-        void printClosedHeader(std::string const& _name);
-        void printOpenHeader(std::string const& _name);
-
-        // if string has a : in first line will set indent to follow it on
-        // subsequent lines
-        void printHeaderString(std::string const& _string, std::size_t indent = 0);
-
-        void printTotals(Totals const& totals);
-        void printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row);
-
-        void printTotalsDivider(Totals const& totals);
-        void printSummaryDivider();
-        void printTestFilters();
-
-    private:
-        bool m_headerPrinted = false;
-    };
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-// end catch_reporter_console.h
-// start catch_reporter_junit.h
-
-// start catch_xmlwriter.h
-
-#include <vector>
-
-namespace Catch {
-    enum class XmlFormatting {
-        None = 0x00,
-        Indent = 0x01,
-        Newline = 0x02,
-    };
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs);
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs);
-
-    class XmlEncode {
-    public:
-        enum ForWhat { ForTextNodes, ForAttributes };
-
-        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes );
-
-        void encodeTo( std::ostream& os ) const;
-
-        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode );
-
-    private:
-        std::string m_str;
-        ForWhat m_forWhat;
-    };
-
-    class XmlWriter {
-    public:
-
-        class ScopedElement {
-        public:
-            ScopedElement( XmlWriter* writer, XmlFormatting fmt );
-
-            ScopedElement( ScopedElement&& other ) noexcept;
-            ScopedElement& operator=( ScopedElement&& other ) noexcept;
-
-            ~ScopedElement();
-
-            ScopedElement& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent );
-
-            template<typename T>
-            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
-                m_writer->writeAttribute( name, attribute );
-                return *this;
-            }
-
-        private:
-            mutable XmlWriter* m_writer = nullptr;
-            XmlFormatting m_fmt;
-        };
-
-        XmlWriter( std::ostream& os = Catch::cout() );
-        ~XmlWriter();
-
-        XmlWriter( XmlWriter const& ) = delete;
-        XmlWriter& operator=( XmlWriter const& ) = delete;
-
-        XmlWriter& startElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        ScopedElement scopedElement( std::string const& name, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& endElement(XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute );
-
-        XmlWriter& writeAttribute( std::string const& name, bool attribute );
-
-        template<typename T>
-        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
-            ReusableStringStream rss;
-            rss << attribute;
-            return writeAttribute( name, rss.str() );
-        }
-
-        XmlWriter& writeText( std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        XmlWriter& writeComment(std::string const& text, XmlFormatting fmt = XmlFormatting::Newline | XmlFormatting::Indent);
-
-        void writeStylesheetRef( std::string const& url );
-
-        XmlWriter& writeBlankLine();
-
-        void ensureTagClosed();
-
-    private:
-
-        void applyFormatting(XmlFormatting fmt);
-
-        void writeDeclaration();
-
-        void newlineIfNecessary();
-
-        bool m_tagIsOpen = false;
-        bool m_needsNewline = false;
-        std::vector<std::string> m_tags;
-        std::string m_indent;
-        std::ostream& m_os;
-    };
-
-}
-
-// end catch_xmlwriter.h
-namespace Catch {
-
-    class JunitReporter : public CumulativeReporterBase<JunitReporter> {
-    public:
-        JunitReporter(ReporterConfig const& _config);
-
-        ~JunitReporter() override;
-
-        static std::string getDescription();
-
-        void noMatchingTestCases(std::string const& /*spec*/) override;
-
-        void testRunStarting(TestRunInfo const& runInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testCaseInfo) override;
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEndedCumulative() override;
-
-        void writeGroup(TestGroupNode const& groupNode, double suiteTime);
-
-        void writeTestCase(TestCaseNode const& testCaseNode);
-
-        void writeSection(std::string const& className,
-                          std::string const& rootName,
-                          SectionNode const& sectionNode);
-
-        void writeAssertions(SectionNode const& sectionNode);
-        void writeAssertion(AssertionStats const& stats);
-
-        XmlWriter xml;
-        Timer suiteTimer;
-        std::string stdOutForSuite;
-        std::string stdErrForSuite;
-        unsigned int unexpectedExceptions = 0;
-        bool m_okToFail = false;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_junit.h
-// start catch_reporter_xml.h
-
-namespace Catch {
-    class XmlReporter : public StreamingReporterBase<XmlReporter> {
-    public:
-        XmlReporter(ReporterConfig const& _config);
-
-        ~XmlReporter() override;
-
-        static std::string getDescription();
-
-        virtual std::string getStylesheetRef() const;
-
-        void writeSourceInfo(SourceLineInfo const& sourceInfo);
-
-    public: // StreamingReporterBase
-
-        void noMatchingTestCases(std::string const& s) override;
-
-        void testRunStarting(TestRunInfo const& testInfo) override;
-
-        void testGroupStarting(GroupInfo const& groupInfo) override;
-
-        void testCaseStarting(TestCaseInfo const& testInfo) override;
-
-        void sectionStarting(SectionInfo const& sectionInfo) override;
-
-        void assertionStarting(AssertionInfo const&) override;
-
-        bool assertionEnded(AssertionStats const& assertionStats) override;
-
-        void sectionEnded(SectionStats const& sectionStats) override;
-
-        void testCaseEnded(TestCaseStats const& testCaseStats) override;
-
-        void testGroupEnded(TestGroupStats const& testGroupStats) override;
-
-        void testRunEnded(TestRunStats const& testRunStats) override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting(BenchmarkInfo const&) override;
-        void benchmarkEnded(BenchmarkStats<> const&) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    private:
-        Timer m_testCaseTimer;
-        XmlWriter m_xml;
-        int m_sectionDepth = 0;
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_xml.h
-
-// end catch_external_interfaces.h
-#endif
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-// start catch_benchmarking_all.hpp
-
-// A proxy header that includes all of the benchmarking headers to allow
-// concise include of the benchmarking features. You should prefer the
-// individual includes in standard use.
-
-// start catch_benchmark.hpp
-
- // Benchmark
-
-// start catch_chronometer.hpp
-
-// User-facing chronometer
-
-
-// start catch_clock.hpp
-
-// Clocks
-
-
-#include <chrono>
-#include <ratio>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Clock>
-        using ClockDuration = typename Clock::duration;
-        template <typename Clock>
-        using FloatDuration = std::chrono::duration<double, typename Clock::period>;
-
-        template <typename Clock>
-        using TimePoint = typename Clock::time_point;
-
-        using default_clock = std::chrono::steady_clock;
-
-        template <typename Clock>
-        struct now {
-            TimePoint<Clock> operator()() const {
-                return Clock::now();
-            }
-        };
-
-        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_clock.hpp
-// start catch_optimizer.hpp
-
- // Hinting the optimizer
-
-
-#if defined(_MSC_VER)
-#   include <atomic> // atomic_thread_fence
-#endif
-
-namespace Catch {
-    namespace Benchmark {
-#if defined(__GNUC__) || defined(__clang__)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            asm volatile("" : : "g"(p) : "memory");
-        }
-        inline void keep_memory() {
-            asm volatile("" : : : "memory");
-        }
-
-        namespace Detail {
-            inline void optimizer_barrier() { keep_memory(); }
-        } // namespace Detail
-#elif defined(_MSC_VER)
-
-#pragma optimize("", off)
-        template <typename T>
-        inline void keep_memory(T* p) {
-            // thanks @milleniumbug
-            *reinterpret_cast<char volatile*>(p) = *reinterpret_cast<char const volatile*>(p);
-        }
-        // TODO equivalent keep_memory()
-#pragma optimize("", on)
-
-        namespace Detail {
-            inline void optimizer_barrier() {
-                std::atomic_thread_fence(std::memory_order_seq_cst);
-            }
-        } // namespace Detail
-
-#endif
-
-        template <typename T>
-        inline void deoptimize_value(T&& x) {
-            keep_memory(&x);
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<!std::is_same<void, decltype(fn(args...))>::value>::type {
-            deoptimize_value(std::forward<Fn>(fn) (std::forward<Args...>(args...)));
-        }
-
-        template <typename Fn, typename... Args>
-        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> typename std::enable_if<std::is_same<void, decltype(fn(args...))>::value>::type {
-            std::forward<Fn>(fn) (std::forward<Args...>(args...));
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_optimizer.hpp
-// start catch_complete_invoke.hpp
-
-// Invoke with a special case for void
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            struct CompleteType { using type = T; };
-            template <>
-            struct CompleteType<void> { struct type {}; };
-
-            template <typename T>
-            using CompleteType_t = typename CompleteType<T>::type;
-
-            template <typename Result>
-            struct CompleteInvoker {
-                template <typename Fun, typename... Args>
-                static Result invoke(Fun&& fun, Args&&... args) {
-                    return std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                }
-            };
-            template <>
-            struct CompleteInvoker<void> {
-                template <typename Fun, typename... Args>
-                static CompleteType_t<void> invoke(Fun&& fun, Args&&... args) {
-                    std::forward<Fun>(fun)(std::forward<Args>(args)...);
-                    return {};
-                }
-            };
-
-            // invoke and not return void :(
-            template <typename Fun, typename... Args>
-            CompleteType_t<FunctionReturnType<Fun, Args...>> complete_invoke(Fun&& fun, Args&&... args) {
-                return CompleteInvoker<FunctionReturnType<Fun, Args...>>::invoke(std::forward<Fun>(fun), std::forward<Args>(args)...);
-            }
-
-            const std::string benchmarkErrorMsg = "a benchmark failed to run successfully";
-        } // namespace Detail
-
-        template <typename Fun>
-        Detail::CompleteType_t<FunctionReturnType<Fun>> user_code(Fun&& fun) {
-            CATCH_TRY{
-                return Detail::complete_invoke(std::forward<Fun>(fun));
-            } CATCH_CATCH_ALL{
-                getResultCapture().benchmarkFailed(translateActiveException());
-                CATCH_RUNTIME_ERROR(Detail::benchmarkErrorMsg);
-            }
-        }
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_complete_invoke.hpp
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            struct ChronometerConcept {
-                virtual void start() = 0;
-                virtual void finish() = 0;
-                virtual ~ChronometerConcept() = default;
-            };
-            template <typename Clock>
-            struct ChronometerModel final : public ChronometerConcept {
-                void start() override { started = Clock::now(); }
-                void finish() override { finished = Clock::now(); }
-
-                ClockDuration<Clock> elapsed() const { return finished - started; }
-
-                TimePoint<Clock> started;
-                TimePoint<Clock> finished;
-            };
-        } // namespace Detail
-
-        struct Chronometer {
-        public:
-            template <typename Fun>
-            void measure(Fun&& fun) { measure(std::forward<Fun>(fun), is_callable<Fun(int)>()); }
-
-            int runs() const { return k; }
-
-            Chronometer(Detail::ChronometerConcept& meter, int k)
-                : impl(&meter)
-                , k(k) {}
-
-        private:
-            template <typename Fun>
-            void measure(Fun&& fun, std::false_type) {
-                measure([&fun](int) { return fun(); }, std::true_type());
-            }
-
-            template <typename Fun>
-            void measure(Fun&& fun, std::true_type) {
-                Detail::optimizer_barrier();
-                impl->start();
-                for (int i = 0; i < k; ++i) invoke_deoptimized(fun, i);
-                impl->finish();
-                Detail::optimizer_barrier();
-            }
-
-            Detail::ChronometerConcept* impl;
-            int k;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_chronometer.hpp
-// start catch_environment.hpp
-
-// Environment information
-
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct EnvironmentEstimate {
-            Duration mean;
-            OutlierClassification outliers;
-
-            template <typename Duration2>
-            operator EnvironmentEstimate<Duration2>() const {
-                return { mean, outliers };
-            }
-        };
-        template <typename Clock>
-        struct Environment {
-            using clock_type = Clock;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
-            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_environment.hpp
-// start catch_execution_plan.hpp
-
- // Execution plan
-
-
-// start catch_benchmark_function.hpp
-
- // Dumb std::function implementation for consistent call overhead
-
-
-#include <cassert>
-#include <type_traits>
-#include <utility>
-#include <memory>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T>
-            using Decay = typename std::decay<T>::type;
-            template <typename T, typename U>
-            struct is_related
-                : std::is_same<Decay<T>, Decay<U>> {};
-
-            /// We need to reinvent std::function because every piece of code that might add overhead
-            /// in a measurement context needs to have consistent performance characteristics so that we
-            /// can account for it in the measurement.
-            /// Implementations of std::function with optimizations that aren't always applicable, like
-            /// small buffer optimizations, are not uncommon.
-            /// This is effectively an implementation of std::function without any such optimizations;
-            /// it may be slow, but it is consistently slow.
-            struct BenchmarkFunction {
-            private:
-                struct callable {
-                    virtual void call(Chronometer meter) const = 0;
-                    virtual callable* clone() const = 0;
-                    virtual ~callable() = default;
-                };
-                template <typename Fun>
-                struct model : public callable {
-                    model(Fun&& fun) : fun(std::move(fun)) {}
-                    model(Fun const& fun) : fun(fun) {}
-
-                    model<Fun>* clone() const override { return new model<Fun>(*this); }
-
-                    void call(Chronometer meter) const override {
-                        call(meter, is_callable<Fun(Chronometer)>());
-                    }
-                    void call(Chronometer meter, std::true_type) const {
-                        fun(meter);
-                    }
-                    void call(Chronometer meter, std::false_type) const {
-                        meter.measure(fun);
-                    }
-
-                    Fun fun;
-                };
-
-                struct do_nothing { void operator()() const {} };
-
-                template <typename T>
-                BenchmarkFunction(model<T>* c) : f(c) {}
-
-            public:
-                BenchmarkFunction()
-                    : f(new model<do_nothing>{ {} }) {}
-
-                template <typename Fun,
-                    typename std::enable_if<!is_related<Fun, BenchmarkFunction>::value, int>::type = 0>
-                    BenchmarkFunction(Fun&& fun)
-                    : f(new model<typename std::decay<Fun>::type>(std::forward<Fun>(fun))) {}
-
-                BenchmarkFunction(BenchmarkFunction&& that)
-                    : f(std::move(that.f)) {}
-
-                BenchmarkFunction(BenchmarkFunction const& that)
-                    : f(that.f->clone()) {}
-
-                BenchmarkFunction& operator=(BenchmarkFunction&& that) {
-                    f = std::move(that.f);
-                    return *this;
-                }
-
-                BenchmarkFunction& operator=(BenchmarkFunction const& that) {
-                    f.reset(that.f->clone());
-                    return *this;
-                }
-
-                void operator()(Chronometer meter) const { f->call(meter); }
-
-            private:
-                std::unique_ptr<callable> f;
-            };
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_benchmark_function.hpp
-// start catch_repeat.hpp
-
-// repeat algorithm
-
-
-#include <type_traits>
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Fun>
-            struct repeater {
-                void operator()(int k) const {
-                    for (int i = 0; i < k; ++i) {
-                        fun();
-                    }
-                }
-                Fun fun;
-            };
-            template <typename Fun>
-            repeater<typename std::decay<Fun>::type> repeat(Fun&& fun) {
-                return { std::forward<Fun>(fun) };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_repeat.hpp
-// start catch_run_for_at_least.hpp
-
-// Run a function for a minimum amount of time
-
-
-// start catch_measure.hpp
-
-// Measure
-
-
-// start catch_timing.hpp
-
-// Timing
-
-
-#include <tuple>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration, typename Result>
-        struct Timing {
-            Duration elapsed;
-            Result result;
-            int iterations;
-        };
-        template <typename Clock, typename Func, typename... Args>
-        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_timing.hpp
-#include <utility>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
-                auto start = Clock::now();
-                auto&& r = Detail::complete_invoke(fun, std::forward<Args>(args)...);
-                auto end = Clock::now();
-                auto delta = end - start;
-                return { delta, std::forward<decltype(r)>(r), 1 };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_measure.hpp
-#include <utility>
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
-                return Detail::measure<Clock>(fun, iters);
-            }
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
-                Detail::ChronometerModel<Clock> meter;
-                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));
-
-                return { meter.elapsed(), std::move(result), iters };
-            }
-
-            template <typename Clock, typename Fun>
-            using run_for_at_least_argument_t = typename std::conditional<is_callable<Fun(Chronometer)>::value, Chronometer, int>::type;
-
-            struct optimized_away_error : std::exception {
-                const char* what() const noexcept override {
-                    return "could not measure benchmark, maybe it was optimized away";
-                }
-            };
-
-            template <typename Clock, typename Fun>
-            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>> run_for_at_least(ClockDuration<Clock> how_long, int seed, Fun&& fun) {
-                auto iters = seed;
-                while (iters < (1 << 30)) {
-                    auto&& Timing = measure_one<Clock>(fun, iters, is_callable<Fun(Chronometer)>());
-
-                    if (Timing.elapsed >= how_long) {
-                        return { Timing.elapsed, std::move(Timing.result), iters };
-                    }
-                    iters *= 2;
-                }
-                throw optimized_away_error{};
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_run_for_at_least.hpp
-#include <algorithm>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct ExecutionPlan {
-            int iterations_per_sample;
-            Duration estimated_duration;
-            Detail::BenchmarkFunction benchmark;
-            Duration warmup_time;
-            int warmup_iterations;
-
-            template <typename Duration2>
-            operator ExecutionPlan<Duration2>() const {
-                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
-            }
-
-            template <typename Clock>
-            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
-
-                std::vector<FloatDuration<Clock>> times;
-                times.reserve(cfg.benchmarkSamples());
-                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
-                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark(Chronometer(model, iterations_per_sample));
-                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
-                    return sample_time / iterations_per_sample;
-                });
-                return times;
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_execution_plan.hpp
-// start catch_estimate_clock.hpp
-
- // Environment measurement
-
-
-// start catch_stats.hpp
-
-// Statistical analysis tools
-
-
-#include <algorithm>
-#include <functional>
-#include <vector>
-#include <iterator>
-#include <numeric>
-#include <tuple>
-#include <cmath>
-#include <utility>
-#include <cstddef>
-#include <random>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            using sample = std::vector<double>;
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);
-
-            template <typename Iterator>
-            OutlierClassification classify_outliers(Iterator first, Iterator last) {
-                std::vector<double> copy(first, last);
-
-                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
-                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
-                auto iqr = q3 - q1;
-                auto los = q1 - (iqr * 3.);
-                auto lom = q1 - (iqr * 1.5);
-                auto him = q3 + (iqr * 1.5);
-                auto his = q3 + (iqr * 3.);
-
-                OutlierClassification o;
-                for (; first != last; ++first) {
-                    auto&& t = *first;
-                    if (t < los) ++o.low_severe;
-                    else if (t < lom) ++o.low_mild;
-                    else if (t > his) ++o.high_severe;
-                    else if (t > him) ++o.high_mild;
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            template <typename Iterator>
-            double mean(Iterator first, Iterator last) {
-                auto count = last - first;
-                double sum = std::accumulate(first, last, 0.);
-                return sum / count;
-            }
-
-            template <typename URng, typename Iterator, typename Estimator>
-            sample resample(URng& rng, int resamples, Iterator first, Iterator last, Estimator& estimator) {
-                auto n = last - first;
-                std::uniform_int_distribution<decltype(n)> dist(0, n - 1);
-
-                sample out;
-                out.reserve(resamples);
-                std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
-                    std::vector<double> resampled;
-                    resampled.reserve(n);
-                    std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[dist(rng)]; });
-                    return estimator(resampled.begin(), resampled.end());
-                });
-                std::sort(out.begin(), out.end());
-                return out;
-            }
-
-            template <typename Estimator, typename Iterator>
-            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
-                auto n = last - first;
-                auto second = std::next(first);
-                sample results;
-                results.reserve(n);
-
-                for (auto it = first; it != last; ++it) {
-                    std::iter_swap(it, first);
-                    results.push_back(estimator(second, last));
-                }
-
-                return results;
-            }
-
-            inline double normal_cdf(double x) {
-                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
-            }
-
-            double erfc_inv(double x);
-
-            double normal_quantile(double p);
-
-            template <typename Iterator, typename Estimator>
-            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
-                auto n_samples = last - first;
-
-                double point = estimator(first, last);
-                // Degenerate case with a single sample
-                if (n_samples == 1) return { point, point, point, confidence_level };
-
-                sample jack = jackknife(estimator, first, last);
-                double jack_mean = mean(jack.begin(), jack.end());
-                double sum_squares, sum_cubes;
-                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
-                    auto d = jack_mean - x;
-                    auto d2 = d * d;
-                    auto d3 = d2 * d;
-                    return { sqcb.first + d2, sqcb.second + d3 };
-                });
-
-                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
-                int n = static_cast<int>(resample.size());
-                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / (double)n;
-                // degenerate case with uniform samples
-                if (prob_n == 0) return { point, point, point, confidence_level };
-
-                double bias = normal_quantile(prob_n);
-                double z1 = normal_quantile((1. - confidence_level) / 2.);
-
-                auto cumn = [n](double x) -> int {
-                    return std::lround(normal_cdf(x) * n); };
-                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a(b1);
-                double a2 = a(b2);
-                auto lo = std::max(cumn(a1), 0);
-                auto hi = std::min(cumn(a2), n - 1);
-
-                return { point, resample[lo], resample[hi], confidence_level };
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);
-
-            struct bootstrap_analysis {
-                Estimate<double> mean;
-                Estimate<double> standard_deviation;
-                double outlier_variance;
-            };
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_stats.hpp
-#include <algorithm>
-#include <iterator>
-#include <tuple>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Clock>
-            std::vector<double> resolution(int k) {
-                std::vector<TimePoint<Clock>> times;
-                times.reserve(k + 1);
-                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});
-
-                std::vector<double> deltas;
-                deltas.reserve(k);
-                std::transform(std::next(times.begin()), times.end(), times.begin(),
-                    std::back_inserter(deltas),
-                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });
-
-                return deltas;
-            }
-
-            const auto warmup_iterations = 10000;
-            const auto warmup_time = std::chrono::milliseconds(100);
-            const auto minimum_ticks = 1000;
-            const auto warmup_seed = 10000;
-            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            const auto clock_cost_estimation_tick_limit = 100000;
-            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            const auto clock_cost_estimation_iterations = 10000;
-
-            template <typename Clock>
-            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
-                    .iterations;
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
-                    .result;
-                return {
-                    FloatDuration<Clock>(mean(r.begin(), r.end())),
-                    classify_outliers(r.begin(), r.end()),
-                };
-            }
-            template <typename Clock>
-            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
-                auto time_limit = std::min(resolution * clock_cost_estimation_tick_limit, FloatDuration<Clock>(clock_cost_estimation_time_limit));
-                auto time_clock = [](int k) {
-                    return Detail::measure<Clock>([k] {
-                        for (int i = 0; i < k; ++i) {
-                            volatile auto ignored = Clock::now();
-                            (void)ignored;
-                        }
-                    }).elapsed;
-                };
-                time_clock(1);
-                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
-                std::vector<double> times;
-                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
-                times.reserve(nsamples);
-                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
-                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
-                });
-                return {
-                    FloatDuration<Clock>(mean(times.begin(), times.end())),
-                    classify_outliers(times.begin(), times.end()),
-                };
-            }
-
-            template <typename Clock>
-            Environment<FloatDuration<Clock>> measure_environment() {
-                static Environment<FloatDuration<Clock>>* env = nullptr;
-                if (env) {
-                    return *env;
-                }
-
-                auto iters = Detail::warmup<Clock>();
-                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
-                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);
-
-                env = new Environment<FloatDuration<Clock>>{ resolution, cost };
-                return *env;
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_estimate_clock.hpp
-// start catch_analyse.hpp
-
- // Run and analyse one benchmark
-
-
-// start catch_sample_analysis.hpp
-
-// Benchmark results
-
-
-#include <algorithm>
-#include <vector>
-#include <string>
-#include <iterator>
-
-namespace Catch {
-    namespace Benchmark {
-        template <typename Duration>
-        struct SampleAnalysis {
-            std::vector<Duration> samples;
-            Estimate<Duration> mean;
-            Estimate<Duration> standard_deviation;
-            OutlierClassification outliers;
-            double outlier_variance;
-
-            template <typename Duration2>
-            operator SampleAnalysis<Duration2>() const {
-                std::vector<Duration2> samples2;
-                samples2.reserve(samples.size());
-                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
-                return {
-                    std::move(samples2),
-                    mean,
-                    standard_deviation,
-                    outliers,
-                    outlier_variance,
-                };
-            }
-        };
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_sample_analysis.hpp
-#include <algorithm>
-#include <iterator>
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename Duration, typename Iterator>
-            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(last - first);
-                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<Duration> {
-                            Duration(e.point),
-                                Duration(e.lower_bound),
-                                Duration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<Duration> samples2;
-                    samples2.reserve(samples.size());
-                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
-                    return {
-                        std::move(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<Duration> samples;
-                    samples.reserve(last - first);
-
-                    Duration mean = Duration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(Duration(*it));
-                        mean += Duration(*it);
-                    }
-                    mean /= i;
-
-                    return {
-                        std::move(samples),
-                        Estimate<Duration>{mean, mean, mean, 0.0},
-                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-// end catch_analyse.hpp
-#include <algorithm>
-#include <functional>
-#include <string>
-#include <vector>
-#include <cmath>
-
-namespace Catch {
-    namespace Benchmark {
-        struct Benchmark {
-            Benchmark(std::string &&name)
-                : name(std::move(name)) {}
-
-            template <class FUN>
-            Benchmark(std::string &&name, FUN &&func)
-                : fun(std::move(func)), name(std::move(name)) {}
-
-            template <typename Clock>
-            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
-                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
-                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
-                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
-            }
-
-            template <typename Clock = default_clock>
-            void run() {
-                IConfigPtr cfg = getCurrentContext().getConfig();
-
-                auto env = Detail::measure_environment<Clock>();
-
-                getResultCapture().benchmarkPreparing(name);
-                CATCH_TRY{
-                    auto plan = user_code([&] {
-                        return prepare<Clock>(*cfg, env);
-                    });
-
-                    BenchmarkInfo info {
-                        name,
-                        plan.estimated_duration.count(),
-                        plan.iterations_per_sample,
-                        cfg->benchmarkSamples(),
-                        cfg->benchmarkResamples(),
-                        env.clock_resolution.mean.count(),
-                        env.clock_cost.mean.count()
-                    };
-
-                    getResultCapture().benchmarkStarting(info);
-
-                    auto samples = user_code([&] {
-                        return plan.template run<Clock>(*cfg, env);
-                    });
-
-                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
-                    BenchmarkStats<FloatDuration<Clock>> stats{ info, analysis.samples, analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
-                    getResultCapture().benchmarkEnded(stats);
-
-                } CATCH_CATCH_ALL{
-                    if (translateActiveException() != Detail::benchmarkErrorMsg) // benchmark errors have been reported, otherwise rethrow.
-                        std::rethrow_exception(std::current_exception());
-                }
-            }
-
-            // sets lambda to be used in fun *and* executes benchmark!
-            template <typename Fun,
-                typename std::enable_if<!Detail::is_related<Fun, Benchmark>::value, int>::type = 0>
-                Benchmark & operator=(Fun func) {
-                fun = Detail::BenchmarkFunction(func);
-                run();
-                return *this;
-            }
-
-            explicit operator bool() {
-                return true;
-            }
-
-        private:
-            Detail::BenchmarkFunction fun;
-            std::string name;
-        };
-    }
-} // namespace Catch
-
-#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
-#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
-
-#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&](int benchmarkIndex)
-
-#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
-    if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
-        BenchmarkName = [&]
-
-// end catch_benchmark.hpp
-// start catch_constructor.hpp
-
-// Constructor and destructor helpers
-
-
-#include <type_traits>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            template <typename T, bool Destruct>
-            struct ObjectStorage
-            {
-                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
-
-                ObjectStorage() : data() {}
-
-                ObjectStorage(const ObjectStorage& other)
-                {
-                    new(&data) T(other.stored_object());
-                }
-
-                ObjectStorage(ObjectStorage&& other)
-                {
-                    new(&data) T(std::move(other.stored_object()));
-                }
-
-                ~ObjectStorage() { destruct_on_exit<T>(); }
-
-                template <typename... Args>
-                void construct(Args&&... args)
-                {
-                    new (&data) T(std::forward<Args>(args)...);
-                }
-
-                template <bool AllowManualDestruction = !Destruct>
-                typename std::enable_if<AllowManualDestruction>::type destruct()
-                {
-                    stored_object().~T();
-                }
-
-            private:
-                // If this is a constructor benchmark, destruct the underlying object
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<Destruct, U>::type* = 0) { destruct<true>(); }
-                // Otherwise, don't
-                template <typename U>
-                void destruct_on_exit(typename std::enable_if<!Destruct, U>::type* = 0) { }
-
-                T& stored_object() {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                T const& stored_object() const {
-                    return *static_cast<T*>(static_cast<void*>(&data));
-                }
-
-                TStorage data;
-            };
-        }
-
-        template <typename T>
-        using storage_for = Detail::ObjectStorage<T, true>;
-
-        template <typename T>
-        using destructable_object = Detail::ObjectStorage<T, false>;
-    }
-}
-
-// end catch_constructor.hpp
-// end catch_benchmarking_all.hpp
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-#ifdef CATCH_IMPL
-// start catch_impl.hpp
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#endif
-
-// Keep these here for external reporters
-// start catch_test_case_tracker.h
-
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    struct NameAndLocation {
-        std::string name;
-        SourceLineInfo location;
-
-        NameAndLocation( std::string const& _name, SourceLineInfo const& _location );
-        friend bool operator==(NameAndLocation const& lhs, NameAndLocation const& rhs) {
-            return lhs.name == rhs.name
-                && lhs.location == rhs.location;
-        }
-    };
-
-    class ITracker;
-
-    using ITrackerPtr = std::shared_ptr<ITracker>;
-
-    class  ITracker {
-        NameAndLocation m_nameAndLocation;
-
-    public:
-        ITracker(NameAndLocation const& nameAndLoc) :
-            m_nameAndLocation(nameAndLoc)
-        {}
-
-        // static queries
-        NameAndLocation const& nameAndLocation() const {
-            return m_nameAndLocation;
-        }
-
-        virtual ~ITracker();
-
-        // dynamic queries
-        virtual bool isComplete() const = 0; // Successfully completed or failed
-        virtual bool isSuccessfullyCompleted() const = 0;
-        virtual bool isOpen() const = 0; // Started but not complete
-        virtual bool hasChildren() const = 0;
-
-        virtual ITracker& parent() = 0;
-
-        // actions
-        virtual void close() = 0; // Successfully complete
-        virtual void fail() = 0;
-        virtual void markAsNeedingAnotherRun() = 0;
-
-        virtual void addChild( ITrackerPtr const& child ) = 0;
-        virtual ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) = 0;
-        virtual void openChild() = 0;
-
-        // Debug/ checking
-        virtual bool isSectionTracker() const = 0;
-        virtual bool isGeneratorTracker() const = 0;
-    };
-
-    class TrackerContext {
-
-        enum RunState {
-            NotStarted,
-            Executing,
-            CompletedCycle
-        };
-
-        ITrackerPtr m_rootTracker;
-        ITracker* m_currentTracker = nullptr;
-        RunState m_runState = NotStarted;
-
-    public:
-
-        ITracker& startRun();
-        void endRun();
-
-        void startCycle();
-        void completeCycle();
-
-        bool completedCycle() const;
-        ITracker& currentTracker();
-        void setCurrentTracker( ITracker* tracker );
-    };
-
-    class TrackerBase : public ITracker {
-    protected:
-        enum CycleState {
-            NotStarted,
-            Executing,
-            ExecutingChildren,
-            NeedsAnotherRun,
-            CompletedSuccessfully,
-            Failed
-        };
-
-        using Children = std::vector<ITrackerPtr>;
-        TrackerContext& m_ctx;
-        ITracker* m_parent;
-        Children m_children;
-        CycleState m_runState = NotStarted;
-
-    public:
-        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isComplete() const override;
-        bool isSuccessfullyCompleted() const override;
-        bool isOpen() const override;
-        bool hasChildren() const override;
-
-        void addChild( ITrackerPtr const& child ) override;
-
-        ITrackerPtr findChild( NameAndLocation const& nameAndLocation ) override;
-        ITracker& parent() override;
-
-        void openChild() override;
-
-        bool isSectionTracker() const override;
-        bool isGeneratorTracker() const override;
-
-        void open();
-
-        void close() override;
-        void fail() override;
-        void markAsNeedingAnotherRun() override;
-
-    private:
-        void moveToParent();
-        void moveToThis();
-    };
-
-    class SectionTracker : public TrackerBase {
-        std::vector<std::string> m_filters;
-        std::string m_trimmed_name;
-    public:
-        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent );
-
-        bool isSectionTracker() const override;
-
-        bool isComplete() const override;
-
-        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation );
-
-        void tryOpen();
-
-        void addInitialFilters( std::vector<std::string> const& filters );
-        void addNextFilters( std::vector<std::string> const& filters );
-    };
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-// end catch_test_case_tracker.h
-
-// start catch_leak_detector.h
-
-namespace Catch {
-
-    struct LeakDetector {
-        LeakDetector();
-        ~LeakDetector();
-    };
-
-}
-// end catch_leak_detector.h
-// Cpp files will be included in the single-header file here
-// start catch_stats.cpp
-
-// Statistical analysis tools
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-
-#include <cassert>
-#include <random>
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-#include <future>
-#endif
-
-namespace {
-    double erf_inv(double x) {
-        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
-        double w, p;
-
-        w = -log((1.0 - x) * (1.0 + x));
-
-        if (w < 6.250000) {
-            w = w - 3.125000;
-            p = -3.6444120640178196996e-21;
-            p = -1.685059138182016589e-19 + p * w;
-            p = 1.2858480715256400167e-18 + p * w;
-            p = 1.115787767802518096e-17 + p * w;
-            p = -1.333171662854620906e-16 + p * w;
-            p = 2.0972767875968561637e-17 + p * w;
-            p = 6.6376381343583238325e-15 + p * w;
-            p = -4.0545662729752068639e-14 + p * w;
-            p = -8.1519341976054721522e-14 + p * w;
-            p = 2.6335093153082322977e-12 + p * w;
-            p = -1.2975133253453532498e-11 + p * w;
-            p = -5.4154120542946279317e-11 + p * w;
-            p = 1.051212273321532285e-09 + p * w;
-            p = -4.1126339803469836976e-09 + p * w;
-            p = -2.9070369957882005086e-08 + p * w;
-            p = 4.2347877827932403518e-07 + p * w;
-            p = -1.3654692000834678645e-06 + p * w;
-            p = -1.3882523362786468719e-05 + p * w;
-            p = 0.0001867342080340571352 + p * w;
-            p = -0.00074070253416626697512 + p * w;
-            p = -0.0060336708714301490533 + p * w;
-            p = 0.24015818242558961693 + p * w;
-            p = 1.6536545626831027356 + p * w;
-        } else if (w < 16.000000) {
-            w = sqrt(w) - 3.250000;
-            p = 2.2137376921775787049e-09;
-            p = 9.0756561938885390979e-08 + p * w;
-            p = -2.7517406297064545428e-07 + p * w;
-            p = 1.8239629214389227755e-08 + p * w;
-            p = 1.5027403968909827627e-06 + p * w;
-            p = -4.013867526981545969e-06 + p * w;
-            p = 2.9234449089955446044e-06 + p * w;
-            p = 1.2475304481671778723e-05 + p * w;
-            p = -4.7318229009055733981e-05 + p * w;
-            p = 6.8284851459573175448e-05 + p * w;
-            p = 2.4031110387097893999e-05 + p * w;
-            p = -0.0003550375203628474796 + p * w;
-            p = 0.00095328937973738049703 + p * w;
-            p = -0.0016882755560235047313 + p * w;
-            p = 0.0024914420961078508066 + p * w;
-            p = -0.0037512085075692412107 + p * w;
-            p = 0.005370914553590063617 + p * w;
-            p = 1.0052589676941592334 + p * w;
-            p = 3.0838856104922207635 + p * w;
-        } else {
-            w = sqrt(w) - 5.000000;
-            p = -2.7109920616438573243e-11;
-            p = -2.5556418169965252055e-10 + p * w;
-            p = 1.5076572693500548083e-09 + p * w;
-            p = -3.7894654401267369937e-09 + p * w;
-            p = 7.6157012080783393804e-09 + p * w;
-            p = -1.4960026627149240478e-08 + p * w;
-            p = 2.9147953450901080826e-08 + p * w;
-            p = -6.7711997758452339498e-08 + p * w;
-            p = 2.2900482228026654717e-07 + p * w;
-            p = -9.9298272942317002539e-07 + p * w;
-            p = 4.5260625972231537039e-06 + p * w;
-            p = -1.9681778105531670567e-05 + p * w;
-            p = 7.5995277030017761139e-05 + p * w;
-            p = -0.00021503011930044477347 + p * w;
-            p = -0.00013871931833623122026 + p * w;
-            p = 1.0103004648645343977 + p * w;
-            p = 4.8499064014085844221 + p * w;
-        }
-        return p * x;
-    }
-
-    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
-        auto m = Catch::Benchmark::Detail::mean(first, last);
-        double variance = std::accumulate(first, last, 0., [m](double a, double b) {
-            double diff = b - m;
-            return a + diff * diff;
-            }) / (last - first);
-            return std::sqrt(variance);
-    }
-
-}
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-
-            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                auto count = last - first;
-                double idx = (count - 1) * k / static_cast<double>(q);
-                int j = static_cast<int>(idx);
-                double g = idx - j;
-                std::nth_element(first, first + j, last);
-                auto xj = first[j];
-                if (g == 0) return xj;
-
-                auto xj1 = *std::min_element(first + (j + 1), last);
-                return xj + g * (xj1 - xj);
-            }
-
-            double erfc_inv(double x) {
-                return erf_inv(1.0 - x);
-            }
-
-            double normal_quantile(double p) {
-                static const double ROOT_TWO = std::sqrt(2.0);
-
-                double result = 0.0;
-                assert(p >= 0 && p <= 1);
-                if (p < 0 || p > 1) {
-                    return result;
-                }
-
-                result = -erfc_inv(2.0 * p);
-                // result *= normal distribution standard deviation (1.0) * sqrt(2)
-                result *= /*sd * */ ROOT_TWO;
-                // result += normal disttribution mean (0)
-                return result;
-            }
-
-            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
-                double sb = stddev.point;
-                double mn = mean.point / n;
-                double mg_min = mn / 2.;
-                double sg = std::min(mg_min / 4., sb / std::sqrt(n));
-                double sg2 = sg * sg;
-                double sb2 = sb * sb;
-
-                auto c_max = [n, mn, sb2, sg2](double x) -> double {
-                    double k = mn - x;
-                    double d = k * k;
-                    double nd = n * d;
-                    double k0 = -n * nd;
-                    double k1 = sb2 - n * sg2 + nd;
-                    double det = k1 * k1 - 4 * sg2 * k0;
-                    return (int)(-2. * k0 / (k1 + std::sqrt(det)));
-                };
-
-                auto var_out = [n, sb2, sg2](double c) {
-                    double nc = n - c;
-                    return (nc / n) * (sb2 - nc * sg2);
-                };
-
-                return std::min(var_out(1), var_out(std::min(c_max(0.), c_max(mg_min)))) / sb2;
-            }
-
-            bootstrap_analysis analyse_samples(double confidence_level, int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
-                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
-                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
-                static std::random_device entropy;
-                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
-
-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
-
-                auto mean = &Detail::mean<std::vector<double>::iterator>;
-                auto stddev = &standard_deviation;
-
-#if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    return std::async(std::launch::async, [=] {
-                        std::mt19937 rng(seed);
-                        auto resampled = resample(rng, n_resamples, first, last, f);
-                        return bootstrap(confidence_level, first, last, resampled, f);
-                    });
-                };
-
-                auto mean_future = Estimate(mean);
-                auto stddev_future = Estimate(stddev);
-
-                auto mean_estimate = mean_future.get();
-                auto stddev_estimate = stddev_future.get();
-#else
-                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
-                    auto seed = entropy();
-                    std::mt19937 rng(seed);
-                    auto resampled = resample(rng, n_resamples, first, last, f);
-                    return bootstrap(confidence_level, first, last, resampled, f);
-                };
-
-                auto mean_estimate = Estimate(mean);
-                auto stddev_estimate = Estimate(stddev);
-#endif // CATCH_USE_ASYNC
-
-                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);
-
-                return { mean_estimate, stddev_estimate, outlier_variance };
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
-
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-// end catch_stats.cpp
-// start catch_approx.cpp
-
-#include <cmath>
-#include <limits>
-
-namespace {
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-}
-
-namespace Catch {
-namespace Detail {
-
-    Approx::Approx ( double value )
-    :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
-        m_margin( 0.0 ),
-        m_scale( 0.0 ),
-        m_value( value )
-    {}
-
-    Approx Approx::custom() {
-        return Approx( 0 );
-    }
-
-    Approx Approx::operator-() const {
-        auto temp(*this);
-        temp.m_value = -temp.m_value;
-        return temp;
-    }
-
-    std::string Approx::toString() const {
-        ReusableStringStream rss;
-        rss << "Approx( " << ::Catch::Detail::stringify( m_value ) << " )";
-        return rss.str();
-    }
-
-    bool Approx::equalityComparisonImpl(const double other) const {
-        // First try with fixed margin, then compute margin based on epsilon, scale and Approx's value
-        // Thanks to Richard Harris for his help refining the scaled margin value
-        return marginComparison(m_value, other, m_margin)
-            || marginComparison(m_value, other, m_epsilon * (m_scale + std::fabs(std::isinf(m_value)? 0 : m_value)));
-    }
-
-    void Approx::setMargin(double newMargin) {
-        CATCH_ENFORCE(newMargin >= 0,
-            "Invalid Approx::margin: " << newMargin << '.'
-            << " Approx::Margin has to be non-negative.");
-        m_margin = newMargin;
-    }
-
-    void Approx::setEpsilon(double newEpsilon) {
-        CATCH_ENFORCE(newEpsilon >= 0 && newEpsilon <= 1.0,
-            "Invalid Approx::epsilon: " << newEpsilon << '.'
-            << " Approx::epsilon has to be in [0, 1]");
-        m_epsilon = newEpsilon;
-    }
-
-} // end namespace Detail
-
-namespace literals {
-    Detail::Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
-    }
-    Detail::Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
-    }
-} // end namespace literals
-
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
-    return value.toString();
-}
-
-} // end namespace Catch
-// end catch_approx.cpp
-// start catch_assertionhandler.cpp
-
-// start catch_debugger.h
-
-namespace Catch {
-    bool isDebuggerActive();
-}
-
-#ifdef CATCH_PLATFORM_MAC
-
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #endif
-
-#elif defined(CATCH_PLATFORM_IPHONE)
-
-    // use inline assembler
-    #if defined(__i386__) || defined(__x86_64__)
-        #define CATCH_TRAP()  __asm__("int $3")
-    #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
-    #elif defined(__arm__) && !defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xe7f001f0")
-    #elif defined(__arm__) &&  defined(__thumb__)
-        #define CATCH_TRAP()  __asm__(".inst 0xde01")
-    #endif
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    // If we can use inline assembler, do it because this allows us to break
-    // directly at the location of the failing check instead of breaking inside
-    // raise() called from it, i.e. one stack frame below.
-    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
-        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
-    #else // Fall back to the generic way.
-        #include <signal.h>
-
-        #define CATCH_TRAP() raise(SIGTRAP)
-    #endif
-#elif defined(_MSC_VER)
-    #define CATCH_TRAP() __debugbreak()
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
-    #define CATCH_TRAP() DebugBreak()
-#endif
-
-#ifndef CATCH_BREAK_INTO_DEBUGGER
-    #ifdef CATCH_TRAP
-        #define CATCH_BREAK_INTO_DEBUGGER() []{ if( Catch::isDebuggerActive() ) { CATCH_TRAP(); } }()
-    #else
-        #define CATCH_BREAK_INTO_DEBUGGER() []{}()
-    #endif
-#endif
-
-// end catch_debugger.h
-// start catch_run_context.h
-
-// start catch_fatal_condition.h
-
-// start catch_windows_h_proxy.h
-
-
-#if defined(CATCH_PLATFORM_WINDOWS)
-
-#if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
-#  define CATCH_DEFINED_NOMINMAX
-#  define NOMINMAX
-#endif
-#if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
-#  define CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-#endif
-
-#ifdef __AFXDLL
-#include <AfxWin.h>
-#else
-#include <windows.h>
-#endif
-
-#ifdef CATCH_DEFINED_NOMINMAX
-#  undef NOMINMAX
-#endif
-#ifdef CATCH_DEFINED_WIN32_LEAN_AND_MEAN
-#  undef WIN32_LEAN_AND_MEAN
-#endif
-
-#endif // defined(CATCH_PLATFORM_WINDOWS)
-
-// end catch_windows_h_proxy.h
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-
-    struct FatalConditionHandler {
-
-        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo);
-        FatalConditionHandler();
-        static void reset();
-        ~FatalConditionHandler();
-
-    private:
-        static bool isSet;
-        static ULONG guaranteeSize;
-        static PVOID exceptionHandlerHandle;
-    };
-
-} // namespace Catch
-
-#elif defined ( CATCH_CONFIG_POSIX_SIGNALS )
-
-#include <signal.h>
-
-namespace Catch {
-
-    struct FatalConditionHandler {
-
-        static bool isSet;
-        static struct sigaction oldSigActions[];
-        static stack_t oldSigStack;
-        static char altStackMem[];
-
-        static void handleSignal( int sig );
-
-        FatalConditionHandler();
-        ~FatalConditionHandler();
-        static void reset();
-    };
-
-} // namespace Catch
-
-#else
-
-namespace Catch {
-    struct FatalConditionHandler {
-        void reset();
-    };
-}
-
-#endif
-
-// end catch_fatal_condition.h
-#include <string>
-
-namespace Catch {
-
-    struct IMutableContext;
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class RunContext : public IResultCapture, public IRunner {
-
-    public:
-        RunContext( RunContext const& ) = delete;
-        RunContext& operator =( RunContext const& ) = delete;
-
-        explicit RunContext( IConfigPtr const& _config, IStreamingReporterPtr&& reporter );
-
-        ~RunContext() override;
-
-        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount );
-        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount );
-
-        Totals runTest(TestCase const& testCase);
-
-        IConfigPtr config() const;
-        IStreamingReporter& reporter() const;
-
-    public: // IResultCapture
-
-        // Assertion handlers
-        void handleExpr
-                (   AssertionInfo const& info,
-                    ITransientExpression const& expr,
-                    AssertionReaction& reaction ) override;
-        void handleMessage
-                (   AssertionInfo const& info,
-                    ResultWas::OfType resultType,
-                    StringRef const& message,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedExceptionNotThrown
-                (   AssertionInfo const& info,
-                    AssertionReaction& reaction ) override;
-        void handleUnexpectedInflightException
-                (   AssertionInfo const& info,
-                    std::string const& message,
-                    AssertionReaction& reaction ) override;
-        void handleIncomplete
-                (   AssertionInfo const& info ) override;
-        void handleNonExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    AssertionReaction &reaction ) override;
-
-        bool sectionStarted( SectionInfo const& sectionInfo, Counts& assertions ) override;
-
-        void sectionEnded( SectionEndInfo const& endInfo ) override;
-        void sectionEndedEarly( SectionEndInfo const& endInfo ) override;
-
-        auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& override;
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing( std::string const& name ) override;
-        void benchmarkStarting( BenchmarkInfo const& info ) override;
-        void benchmarkEnded( BenchmarkStats<> const& stats ) override;
-        void benchmarkFailed( std::string const& error ) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void pushScopedMessage( MessageInfo const& message ) override;
-        void popScopedMessage( MessageInfo const& message ) override;
-
-        void emplaceUnscopedMessage( MessageBuilder const& builder ) override;
-
-        std::string getCurrentTestName() const override;
-
-        const AssertionResult* getLastResult() const override;
-
-        void exceptionEarlyReported() override;
-
-        void handleFatalErrorCondition( StringRef message ) override;
-
-        bool lastAssertionPassed() override;
-
-        void assertionPassed() override;
-
-    public:
-        // !TBD We need to do this another way!
-        bool aborting() const final;
-
-    private:
-
-        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr );
-        void invokeActiveTestCase();
-
-        void resetAssertionInfo();
-        bool testForMissingAssertions( Counts& assertions );
-
-        void assertionEnded( AssertionResult const& result );
-        void reportExpr
-                (   AssertionInfo const &info,
-                    ResultWas::OfType resultType,
-                    ITransientExpression const *expr,
-                    bool negated );
-
-        void populateReaction( AssertionReaction& reaction );
-
-    private:
-
-        void handleUnfinishedSections();
-
-        TestRunInfo m_runInfo;
-        IMutableContext& m_context;
-        TestCase const* m_activeTestCase = nullptr;
-        ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
-
-        IConfigPtr m_config;
-        Totals m_totals;
-        IStreamingReporterPtr m_reporter;
-        std::vector<MessageInfo> m_messages;
-        std::vector<ScopedMessage> m_messageScopes; /* Keeps owners of so-called unscoped messages. */
-        AssertionInfo m_lastAssertionInfo;
-        std::vector<SectionEndInfo> m_unfinishedSections;
-        std::vector<ITracker*> m_activeSections;
-        TrackerContext m_trackerContext;
-        bool m_lastAssertionPassed = false;
-        bool m_shouldReportUnexpected = true;
-        bool m_includeSuccessfulResults;
-    };
-
-    void seedRng(IConfig const& config);
-    unsigned int rngSeed();
-} // end namespace Catch
-
-// end catch_run_context.h
-namespace Catch {
-
-    namespace {
-        auto operator <<( std::ostream& os, ITransientExpression const& expr ) -> std::ostream& {
-            expr.streamReconstructedExpression( os );
-            return os;
-        }
-    }
-
-    LazyExpression::LazyExpression( bool isNegated )
-    :   m_isNegated( isNegated )
-    {}
-
-    LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
-
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
-    auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
-        if( lazyExpr.m_isNegated )
-            os << "!";
-
-        if( lazyExpr ) {
-            if( lazyExpr.m_isNegated && lazyExpr.m_transientExpression->isBinaryExpression() )
-                os << "(" << *lazyExpr.m_transientExpression << ")";
-            else
-                os << *lazyExpr.m_transientExpression;
-        }
-        else {
-            os << "{** error - unchecked empty expression requested **}";
-        }
-        return os;
-    }
-
-    AssertionHandler::AssertionHandler
-        (   StringRef const& macroName,
-            SourceLineInfo const& lineInfo,
-            StringRef capturedExpression,
-            ResultDisposition::Flags resultDisposition )
-    :   m_assertionInfo{ macroName, lineInfo, capturedExpression, resultDisposition },
-        m_resultCapture( getResultCapture() )
-    {}
-
-    void AssertionHandler::handleExpr( ITransientExpression const& expr ) {
-        m_resultCapture.handleExpr( m_assertionInfo, expr, m_reaction );
-    }
-    void AssertionHandler::handleMessage(ResultWas::OfType resultType, StringRef const& message) {
-        m_resultCapture.handleMessage( m_assertionInfo, resultType, message, m_reaction );
-    }
-
-    auto AssertionHandler::allowThrows() const -> bool {
-        return getCurrentContext().getConfig()->allowThrows();
-    }
-
-    void AssertionHandler::complete() {
-        setCompleted();
-        if( m_reaction.shouldDebugBreak ) {
-
-            // If you find your debugger stopping you here then go one level up on the
-            // call-stack for the code that caused it (typically a failed assertion)
-
-            // (To go back to the test and change execution, jump over the throw, next)
-            CATCH_BREAK_INTO_DEBUGGER();
-        }
-        if (m_reaction.shouldThrow) {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-            throw Catch::TestFailureException();
-#else
-            CATCH_ERROR( "Test failure requires aborting test!" );
-#endif
-        }
-    }
-    void AssertionHandler::setCompleted() {
-        m_completed = true;
-    }
-
-    void AssertionHandler::handleUnexpectedInflightException() {
-        m_resultCapture.handleUnexpectedInflightException( m_assertionInfo, Catch::translateActiveException(), m_reaction );
-    }
-
-    void AssertionHandler::handleExceptionThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-    void AssertionHandler::handleExceptionNotThrownAsExpected() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    void AssertionHandler::handleUnexpectedExceptionNotThrown() {
-        m_resultCapture.handleUnexpectedExceptionNotThrown( m_assertionInfo, m_reaction );
-    }
-
-    void AssertionHandler::handleThrowingCallSkipped() {
-        m_resultCapture.handleNonExpr(m_assertionInfo, ResultWas::Ok, m_reaction);
-    }
-
-    // This is the overload that takes a string and infers the Equals matcher from it
-    // The more general overload, that takes any string matcher, is in catch_capture_matchers.cpp
-    void handleExceptionMatchExpr( AssertionHandler& handler, std::string const& str, StringRef const& matcherString  ) {
-        handleExceptionMatchExpr( handler, Matchers::Equals( str ), matcherString );
-    }
-
-} // namespace Catch
-// end catch_assertionhandler.cpp
-// start catch_assertionresult.cpp
-
-namespace Catch {
-    AssertionResultData::AssertionResultData(ResultWas::OfType _resultType, LazyExpression const & _lazyExpression):
-        lazyExpression(_lazyExpression),
-        resultType(_resultType) {}
-
-    std::string AssertionResultData::reconstructExpression() const {
-
-        if( reconstructedExpression.empty() ) {
-            if( lazyExpression ) {
-                ReusableStringStream rss;
-                rss << lazyExpression;
-                reconstructedExpression = rss.str();
-            }
-        }
-        return reconstructedExpression;
-    }
-
-    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
-    :   m_info( info ),
-        m_resultData( data )
-    {}
-
-    // Result was a success
-    bool AssertionResult::succeeded() const {
-        return Catch::isOk( m_resultData.resultType );
-    }
-
-    // Result was a success, or failure is suppressed
-    bool AssertionResult::isOk() const {
-        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
-    }
-
-    ResultWas::OfType AssertionResult::getResultType() const {
-        return m_resultData.resultType;
-    }
-
-    bool AssertionResult::hasExpression() const {
-        return !m_info.capturedExpression.empty();
-    }
-
-    bool AssertionResult::hasMessage() const {
-        return !m_resultData.message.empty();
-    }
-
-    std::string AssertionResult::getExpression() const {
-        // Possibly overallocating by 3 characters should be basically free
-        std::string expr; expr.reserve(m_info.capturedExpression.size() + 3);
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += "!(";
-        }
-        expr += m_info.capturedExpression;
-        if (isFalseTest(m_info.resultDisposition)) {
-            expr += ')';
-        }
-        return expr;
-    }
-
-    std::string AssertionResult::getExpressionInMacro() const {
-        std::string expr;
-        if( m_info.macroName.empty() )
-            expr = static_cast<std::string>(m_info.capturedExpression);
-        else {
-            expr.reserve( m_info.macroName.size() + m_info.capturedExpression.size() + 4 );
-            expr += m_info.macroName;
-            expr += "( ";
-            expr += m_info.capturedExpression;
-            expr += " )";
-        }
-        return expr;
-    }
-
-    bool AssertionResult::hasExpandedExpression() const {
-        return hasExpression() && getExpandedExpression() != getExpression();
-    }
-
-    std::string AssertionResult::getExpandedExpression() const {
-        std::string expr = m_resultData.reconstructExpression();
-        return expr.empty()
-                ? getExpression()
-                : expr;
-    }
-
-    std::string AssertionResult::getMessage() const {
-        return m_resultData.message;
-    }
-    SourceLineInfo AssertionResult::getSourceInfo() const {
-        return m_info.lineInfo;
-    }
-
-    StringRef AssertionResult::getTestMacroName() const {
-        return m_info.macroName;
-    }
-
-} // end namespace Catch
-// end catch_assertionresult.cpp
-// start catch_capture_matchers.cpp
-
-namespace Catch {
-
-    using StringMatcher = Matchers::Impl::MatcherBase<std::string>;
-
-    // This is the general overload that takes a any string matcher
-    // There is another overload, in catch_assertionhandler.h/.cpp, that only takes a string and infers
-    // the Equals matcher (so the header does not mention matchers)
-    void handleExceptionMatchExpr( AssertionHandler& handler, StringMatcher const& matcher, StringRef const& matcherString  ) {
-        std::string exceptionMessage = Catch::translateActiveException();
-        MatchExpr<std::string, StringMatcher const&> expr( exceptionMessage, matcher, matcherString );
-        handler.handleExpr( expr );
-    }
-
-} // namespace Catch
-// end catch_capture_matchers.cpp
-// start catch_commandline.cpp
-
-// start catch_commandline.h
-
-// start catch_clara.h
-
-// Use Catch's value for console width (store Clara's off to the side, if present)
-#ifdef CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#undef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#endif
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH-1
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-vtables"
-#pragma clang diagnostic ignored "-Wexit-time-destructors"
-#pragma clang diagnostic ignored "-Wshadow"
-#endif
-
-// start clara.hpp
-// Copyright 2017 Two Blue Cubes Ltd. All rights reserved.
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// See https://github.com/philsquared/Clara for more details
-
-// Clara v1.1.5
-
-
-#ifndef CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-#ifndef CLARA_CONFIG_OPTIONAL_TYPE
-#ifdef __has_include
-#if __has_include(<optional>) && __cplusplus >= 201703L
-#include <optional>
-#define CLARA_CONFIG_OPTIONAL_TYPE std::optional
-#endif
-#endif
-#endif
-
-// ----------- #included from clara_textflow.hpp -----------
-
-// TextFlowCpp
-//
-// A single-header library for wrapping and laying out basic text, by Phil Nash
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-// This project is hosted at https://github.com/philsquared/textflowcpp
-
-
-#include <cassert>
-#include <ostream>
-#include <sstream>
-#include <vector>
-
-#ifndef CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH 80
-#endif
-
-namespace Catch {
-namespace clara {
-namespace TextFlow {
-
-inline auto isWhitespace(char c) -> bool {
-	static std::string chars = " \t\n\r";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableBefore(char c) -> bool {
-	static std::string chars = "[({<|";
-	return chars.find(c) != std::string::npos;
-}
-inline auto isBreakableAfter(char c) -> bool {
-	static std::string chars = "])}>.,:;*+-=&/\\";
-	return chars.find(c) != std::string::npos;
-}
-
-class Columns;
-
-class Column {
-	std::vector<std::string> m_strings;
-	size_t m_width = CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH;
-	size_t m_indent = 0;
-	size_t m_initialIndent = std::string::npos;
-
-public:
-	class iterator {
-		friend Column;
-
-		Column const& m_column;
-		size_t m_stringIndex = 0;
-		size_t m_pos = 0;
-
-		size_t m_len = 0;
-		size_t m_end = 0;
-		bool m_suffix = false;
-
-		iterator(Column const& column, size_t stringIndex)
-			: m_column(column),
-			m_stringIndex(stringIndex) {}
-
-		auto line() const -> std::string const& { return m_column.m_strings[m_stringIndex]; }
-
-		auto isBoundary(size_t at) const -> bool {
-			assert(at > 0);
-			assert(at <= line().size());
-
-			return at == line().size() ||
-				(isWhitespace(line()[at]) && !isWhitespace(line()[at - 1])) ||
-				isBreakableBefore(line()[at]) ||
-				isBreakableAfter(line()[at - 1]);
-		}
-
-		void calcLength() {
-			assert(m_stringIndex < m_column.m_strings.size());
-
-			m_suffix = false;
-			auto width = m_column.m_width - indent();
-			m_end = m_pos;
-			if (line()[m_pos] == '\n') {
-				++m_end;
-			}
-			while (m_end < line().size() && line()[m_end] != '\n')
-				++m_end;
-
-			if (m_end < m_pos + width) {
-				m_len = m_end - m_pos;
-			} else {
-				size_t len = width;
-				while (len > 0 && !isBoundary(m_pos + len))
-					--len;
-				while (len > 0 && isWhitespace(line()[m_pos + len - 1]))
-					--len;
-
-				if (len > 0) {
-					m_len = len;
-				} else {
-					m_suffix = true;
-					m_len = width - 1;
-				}
-			}
-		}
-
-		auto indent() const -> size_t {
-			auto initial = m_pos == 0 && m_stringIndex == 0 ? m_column.m_initialIndent : std::string::npos;
-			return initial == std::string::npos ? m_column.m_indent : initial;
-		}
-
-		auto addIndentAndSuffix(std::string const &plain) const -> std::string {
-			return std::string(indent(), ' ') + (m_suffix ? plain + "-" : plain);
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Column const& column) : m_column(column) {
-			assert(m_column.m_width > m_column.m_indent);
-			assert(m_column.m_initialIndent == std::string::npos || m_column.m_width > m_column.m_initialIndent);
-			calcLength();
-			if (m_len == 0)
-				m_stringIndex++; // Empty string
-		}
-
-		auto operator *() const -> std::string {
-			assert(m_stringIndex < m_column.m_strings.size());
-			assert(m_pos <= m_end);
-			return addIndentAndSuffix(line().substr(m_pos, m_len));
-		}
-
-		auto operator ++() -> iterator& {
-			m_pos += m_len;
-			if (m_pos < line().size() && line()[m_pos] == '\n')
-				m_pos += 1;
-			else
-				while (m_pos < line().size() && isWhitespace(line()[m_pos]))
-					++m_pos;
-
-			if (m_pos == line().size()) {
-				m_pos = 0;
-				++m_stringIndex;
-			}
-			if (m_stringIndex < m_column.m_strings.size())
-				calcLength();
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return
-				m_pos == other.m_pos &&
-				m_stringIndex == other.m_stringIndex &&
-				&m_column == &other.m_column;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return !operator==(other);
-		}
-	};
-	using const_iterator = iterator;
-
-	explicit Column(std::string const& text) { m_strings.push_back(text); }
-
-	auto width(size_t newWidth) -> Column& {
-		assert(newWidth > 0);
-		m_width = newWidth;
-		return *this;
-	}
-	auto indent(size_t newIndent) -> Column& {
-		m_indent = newIndent;
-		return *this;
-	}
-	auto initialIndent(size_t newIndent) -> Column& {
-		m_initialIndent = newIndent;
-		return *this;
-	}
-
-	auto width() const -> size_t { return m_width; }
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, m_strings.size() }; }
-
-	inline friend std::ostream& operator << (std::ostream& os, Column const& col) {
-		bool first = true;
-		for (auto line : col) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto operator + (Column const& other)->Columns;
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-class Spacer : public Column {
-
-public:
-	explicit Spacer(size_t spaceWidth) : Column("") {
-		width(spaceWidth);
-	}
-};
-
-class Columns {
-	std::vector<Column> m_columns;
-
-public:
-
-	class iterator {
-		friend Columns;
-		struct EndTag {};
-
-		std::vector<Column> const& m_columns;
-		std::vector<Column::iterator> m_iterators;
-		size_t m_activeIterators;
-
-		iterator(Columns const& columns, EndTag)
-			: m_columns(columns.m_columns),
-			m_activeIterators(0) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.end());
-		}
-
-	public:
-		using difference_type = std::ptrdiff_t;
-		using value_type = std::string;
-		using pointer = value_type * ;
-		using reference = value_type & ;
-		using iterator_category = std::forward_iterator_tag;
-
-		explicit iterator(Columns const& columns)
-			: m_columns(columns.m_columns),
-			m_activeIterators(m_columns.size()) {
-			m_iterators.reserve(m_columns.size());
-
-			for (auto const& col : m_columns)
-				m_iterators.push_back(col.begin());
-		}
-
-		auto operator ==(iterator const& other) const -> bool {
-			return m_iterators == other.m_iterators;
-		}
-		auto operator !=(iterator const& other) const -> bool {
-			return m_iterators != other.m_iterators;
-		}
-		auto operator *() const -> std::string {
-			std::string row, padding;
-
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				auto width = m_columns[i].width();
-				if (m_iterators[i] != m_columns[i].end()) {
-					std::string col = *m_iterators[i];
-					row += padding + col;
-					if (col.size() < width)
-						padding = std::string(width - col.size(), ' ');
-					else
-						padding = "";
-				} else {
-					padding += std::string(width, ' ');
-				}
-			}
-			return row;
-		}
-		auto operator ++() -> iterator& {
-			for (size_t i = 0; i < m_columns.size(); ++i) {
-				if (m_iterators[i] != m_columns[i].end())
-					++m_iterators[i];
-			}
-			return *this;
-		}
-		auto operator ++(int) -> iterator {
-			iterator prev(*this);
-			operator++();
-			return prev;
-		}
-	};
-	using const_iterator = iterator;
-
-	auto begin() const -> iterator { return iterator(*this); }
-	auto end() const -> iterator { return { *this, iterator::EndTag() }; }
-
-	auto operator += (Column const& col) -> Columns& {
-		m_columns.push_back(col);
-		return *this;
-	}
-	auto operator + (Column const& col) -> Columns {
-		Columns combined = *this;
-		combined += col;
-		return combined;
-	}
-
-	inline friend std::ostream& operator << (std::ostream& os, Columns const& cols) {
-
-		bool first = true;
-		for (auto line : cols) {
-			if (first)
-				first = false;
-			else
-				os << "\n";
-			os << line;
-		}
-		return os;
-	}
-
-	auto toString() const -> std::string {
-		std::ostringstream oss;
-		oss << *this;
-		return oss.str();
-	}
-};
-
-inline auto Column::operator + (Column const& other) -> Columns {
-	Columns cols;
-	cols += *this;
-	cols += other;
-	return cols;
-}
-}
-
-}
-}
-
-// ----------- end of #include from clara_textflow.hpp -----------
-// ........... back in clara.hpp
-
-#include <cctype>
-#include <string>
-#include <memory>
-#include <set>
-#include <algorithm>
-
-#if !defined(CATCH_PLATFORM_WINDOWS) && ( defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) )
-#define CATCH_PLATFORM_WINDOWS
-#endif
-
-namespace Catch { namespace clara {
-namespace detail {
-
-    // Traits for extracting arg and return type of lambdas (for single argument lambdas)
-    template<typename L>
-    struct UnaryLambdaTraits : UnaryLambdaTraits<decltype( &L::operator() )> {};
-
-    template<typename ClassT, typename ReturnT, typename... Args>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( Args... ) const> {
-        static const bool isValid = false;
-    };
-
-    template<typename ClassT, typename ReturnT, typename ArgT>
-    struct UnaryLambdaTraits<ReturnT( ClassT::* )( ArgT ) const> {
-        static const bool isValid = true;
-        using ArgType = typename std::remove_const<typename std::remove_reference<ArgT>::type>::type;
-        using ReturnType = ReturnT;
-    };
-
-    class TokenStream;
-
-    // Transport for raw args (copied from main args, or supplied via init list for testing)
-    class Args {
-        friend TokenStream;
-        std::string m_exeName;
-        std::vector<std::string> m_args;
-
-    public:
-        Args( int argc, char const* const* argv )
-            : m_exeName(argv[0]),
-              m_args(argv + 1, argv + argc) {}
-
-        Args( std::initializer_list<std::string> args )
-        :   m_exeName( *args.begin() ),
-            m_args( args.begin()+1, args.end() )
-        {}
-
-        auto exeName() const -> std::string {
-            return m_exeName;
-        }
-    };
-
-    // Wraps a token coming from a token stream. These may not directly correspond to strings as a single string
-    // may encode an option + its argument if the : or = form is used
-    enum class TokenType {
-        Option, Argument
-    };
-    struct Token {
-        TokenType type;
-        std::string token;
-    };
-
-    inline auto isOptPrefix( char c ) -> bool {
-        return c == '-'
-#ifdef CATCH_PLATFORM_WINDOWS
-            || c == '/'
-#endif
-        ;
-    }
-
-    // Abstracts iterators into args as a stream of tokens, with option arguments uniformly handled
-    class TokenStream {
-        using Iterator = std::vector<std::string>::const_iterator;
-        Iterator it;
-        Iterator itEnd;
-        std::vector<Token> m_tokenBuffer;
-
-        void loadBuffer() {
-            m_tokenBuffer.resize( 0 );
-
-            // Skip any empty strings
-            while( it != itEnd && it->empty() )
-                ++it;
-
-            if( it != itEnd ) {
-                auto const &next = *it;
-                if( isOptPrefix( next[0] ) ) {
-                    auto delimiterPos = next.find_first_of( " :=" );
-                    if( delimiterPos != std::string::npos ) {
-                        m_tokenBuffer.push_back( { TokenType::Option, next.substr( 0, delimiterPos ) } );
-                        m_tokenBuffer.push_back( { TokenType::Argument, next.substr( delimiterPos + 1 ) } );
-                    } else {
-                        if( next[1] != '-' && next.size() > 2 ) {
-                            std::string opt = "- ";
-                            for( size_t i = 1; i < next.size(); ++i ) {
-                                opt[1] = next[i];
-                                m_tokenBuffer.push_back( { TokenType::Option, opt } );
-                            }
-                        } else {
-                            m_tokenBuffer.push_back( { TokenType::Option, next } );
-                        }
-                    }
-                } else {
-                    m_tokenBuffer.push_back( { TokenType::Argument, next } );
-                }
-            }
-        }
-
-    public:
-        explicit TokenStream( Args const &args ) : TokenStream( args.m_args.begin(), args.m_args.end() ) {}
-
-        TokenStream( Iterator it, Iterator itEnd ) : it( it ), itEnd( itEnd ) {
-            loadBuffer();
-        }
-
-        explicit operator bool() const {
-            return !m_tokenBuffer.empty() || it != itEnd;
-        }
-
-        auto count() const -> size_t { return m_tokenBuffer.size() + (itEnd - it); }
-
-        auto operator*() const -> Token {
-            assert( !m_tokenBuffer.empty() );
-            return m_tokenBuffer.front();
-        }
-
-        auto operator->() const -> Token const * {
-            assert( !m_tokenBuffer.empty() );
-            return &m_tokenBuffer.front();
-        }
-
-        auto operator++() -> TokenStream & {
-            if( m_tokenBuffer.size() >= 2 ) {
-                m_tokenBuffer.erase( m_tokenBuffer.begin() );
-            } else {
-                if( it != itEnd )
-                    ++it;
-                loadBuffer();
-            }
-            return *this;
-        }
-    };
-
-    class ResultBase {
-    public:
-        enum Type {
-            Ok, LogicError, RuntimeError
-        };
-
-    protected:
-        ResultBase( Type type ) : m_type( type ) {}
-        virtual ~ResultBase() = default;
-
-        virtual void enforceOk() const = 0;
-
-        Type m_type;
-    };
-
-    template<typename T>
-    class ResultValueBase : public ResultBase {
-    public:
-        auto value() const -> T const & {
-            enforceOk();
-            return m_value;
-        }
-
-    protected:
-        ResultValueBase( Type type ) : ResultBase( type ) {}
-
-        ResultValueBase( ResultValueBase const &other ) : ResultBase( other ) {
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-        }
-
-        ResultValueBase( Type, T const &value ) : ResultBase( Ok ) {
-            new( &m_value ) T( value );
-        }
-
-        auto operator=( ResultValueBase const &other ) -> ResultValueBase & {
-            if( m_type == ResultBase::Ok )
-                m_value.~T();
-            ResultBase::operator=(other);
-            if( m_type == ResultBase::Ok )
-                new( &m_value ) T( other.m_value );
-            return *this;
-        }
-
-        ~ResultValueBase() override {
-            if( m_type == Ok )
-                m_value.~T();
-        }
-
-        union {
-            T m_value;
-        };
-    };
-
-    template<>
-    class ResultValueBase<void> : public ResultBase {
-    protected:
-        using ResultBase::ResultBase;
-    };
-
-    template<typename T = void>
-    class BasicResult : public ResultValueBase<T> {
-    public:
-        template<typename U>
-        explicit BasicResult( BasicResult<U> const &other )
-        :   ResultValueBase<T>( other.type() ),
-            m_errorMessage( other.errorMessage() )
-        {
-            assert( type() != ResultBase::Ok );
-        }
-
-        template<typename U>
-        static auto ok( U const &value ) -> BasicResult { return { ResultBase::Ok, value }; }
-        static auto ok() -> BasicResult { return { ResultBase::Ok }; }
-        static auto logicError( std::string const &message ) -> BasicResult { return { ResultBase::LogicError, message }; }
-        static auto runtimeError( std::string const &message ) -> BasicResult { return { ResultBase::RuntimeError, message }; }
-
-        explicit operator bool() const { return m_type == ResultBase::Ok; }
-        auto type() const -> ResultBase::Type { return m_type; }
-        auto errorMessage() const -> std::string { return m_errorMessage; }
-
-    protected:
-        void enforceOk() const override {
-
-            // Errors shouldn't reach this point, but if they do
-            // the actual error message will be in m_errorMessage
-            assert( m_type != ResultBase::LogicError );
-            assert( m_type != ResultBase::RuntimeError );
-            if( m_type != ResultBase::Ok )
-                std::abort();
-        }
-
-        std::string m_errorMessage; // Only populated if resultType is an error
-
-        BasicResult( ResultBase::Type type, std::string const &message )
-        :   ResultValueBase<T>(type),
-            m_errorMessage(message)
-        {
-            assert( m_type != ResultBase::Ok );
-        }
-
-        using ResultValueBase<T>::ResultValueBase;
-        using ResultBase::m_type;
-    };
-
-    enum class ParseResultType {
-        Matched, NoMatch, ShortCircuitAll, ShortCircuitSame
-    };
-
-    class ParseState {
-    public:
-
-        ParseState( ParseResultType type, TokenStream const &remainingTokens )
-        : m_type(type),
-          m_remainingTokens( remainingTokens )
-        {}
-
-        auto type() const -> ParseResultType { return m_type; }
-        auto remainingTokens() const -> TokenStream { return m_remainingTokens; }
-
-    private:
-        ParseResultType m_type;
-        TokenStream m_remainingTokens;
-    };
-
-    using Result = BasicResult<void>;
-    using ParserResult = BasicResult<ParseResultType>;
-    using InternalParseResult = BasicResult<ParseState>;
-
-    struct HelpColumns {
-        std::string left;
-        std::string right;
-    };
-
-    template<typename T>
-    inline auto convertInto( std::string const &source, T& target ) -> ParserResult {
-        std::stringstream ss;
-        ss << source;
-        ss >> target;
-        if( ss.fail() )
-            return ParserResult::runtimeError( "Unable to convert '" + source + "' to destination type" );
-        else
-            return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, std::string& target ) -> ParserResult {
-        target = source;
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-    inline auto convertInto( std::string const &source, bool &target ) -> ParserResult {
-        std::string srcLC = source;
-        std::transform( srcLC.begin(), srcLC.end(), srcLC.begin(), []( unsigned char c ) { return static_cast<char>( std::tolower(c) ); } );
-        if (srcLC == "y" || srcLC == "1" || srcLC == "true" || srcLC == "yes" || srcLC == "on")
-            target = true;
-        else if (srcLC == "n" || srcLC == "0" || srcLC == "false" || srcLC == "no" || srcLC == "off")
-            target = false;
-        else
-            return ParserResult::runtimeError( "Expected a boolean value but did not recognise: '" + source + "'" );
-        return ParserResult::ok( ParseResultType::Matched );
-    }
-#ifdef CLARA_CONFIG_OPTIONAL_TYPE
-    template<typename T>
-    inline auto convertInto( std::string const &source, CLARA_CONFIG_OPTIONAL_TYPE<T>& target ) -> ParserResult {
-        T temp;
-        auto result = convertInto( source, temp );
-        if( result )
-            target = std::move(temp);
-        return result;
-    }
-#endif // CLARA_CONFIG_OPTIONAL_TYPE
-
-    struct NonCopyable {
-        NonCopyable() = default;
-        NonCopyable( NonCopyable const & ) = delete;
-        NonCopyable( NonCopyable && ) = delete;
-        NonCopyable &operator=( NonCopyable const & ) = delete;
-        NonCopyable &operator=( NonCopyable && ) = delete;
-    };
-
-    struct BoundRef : NonCopyable {
-        virtual ~BoundRef() = default;
-        virtual auto isContainer() const -> bool { return false; }
-        virtual auto isFlag() const -> bool { return false; }
-    };
-    struct BoundValueRefBase : BoundRef {
-        virtual auto setValue( std::string const &arg ) -> ParserResult = 0;
-    };
-    struct BoundFlagRefBase : BoundRef {
-        virtual auto setFlag( bool flag ) -> ParserResult = 0;
-        virtual auto isFlag() const -> bool { return true; }
-    };
-
-    template<typename T>
-    struct BoundValueRef : BoundValueRefBase {
-        T &m_ref;
-
-        explicit BoundValueRef( T &ref ) : m_ref( ref ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return convertInto( arg, m_ref );
-        }
-    };
-
-    template<typename T>
-    struct BoundValueRef<std::vector<T>> : BoundValueRefBase {
-        std::vector<T> &m_ref;
-
-        explicit BoundValueRef( std::vector<T> &ref ) : m_ref( ref ) {}
-
-        auto isContainer() const -> bool override { return true; }
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            T temp;
-            auto result = convertInto( arg, temp );
-            if( result )
-                m_ref.push_back( temp );
-            return result;
-        }
-    };
-
-    struct BoundFlagRef : BoundFlagRefBase {
-        bool &m_ref;
-
-        explicit BoundFlagRef( bool &ref ) : m_ref( ref ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            m_ref = flag;
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ReturnType>
-    struct LambdaInvoker {
-        static_assert( std::is_same<ReturnType, ParserResult>::value, "Lambda must return void or clara::ParserResult" );
-
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            return lambda( arg );
-        }
-    };
-
-    template<>
-    struct LambdaInvoker<void> {
-        template<typename L, typename ArgType>
-        static auto invoke( L const &lambda, ArgType const &arg ) -> ParserResult {
-            lambda( arg );
-            return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    template<typename ArgType, typename L>
-    inline auto invokeLambda( L const &lambda, std::string const &arg ) -> ParserResult {
-        ArgType temp{};
-        auto result = convertInto( arg, temp );
-        return !result
-           ? result
-           : LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( lambda, temp );
-    }
-
-    template<typename L>
-    struct BoundLambda : BoundValueRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        explicit BoundLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setValue( std::string const &arg ) -> ParserResult override {
-            return invokeLambda<typename UnaryLambdaTraits<L>::ArgType>( m_lambda, arg );
-        }
-    };
-
-    template<typename L>
-    struct BoundFlagLambda : BoundFlagRefBase {
-        L m_lambda;
-
-        static_assert( UnaryLambdaTraits<L>::isValid, "Supplied lambda must take exactly one argument" );
-        static_assert( std::is_same<typename UnaryLambdaTraits<L>::ArgType, bool>::value, "flags must be boolean" );
-
-        explicit BoundFlagLambda( L const &lambda ) : m_lambda( lambda ) {}
-
-        auto setFlag( bool flag ) -> ParserResult override {
-            return LambdaInvoker<typename UnaryLambdaTraits<L>::ReturnType>::invoke( m_lambda, flag );
-        }
-    };
-
-    enum class Optionality { Optional, Required };
-
-    struct Parser;
-
-    class ParserBase {
-    public:
-        virtual ~ParserBase() = default;
-        virtual auto validate() const -> Result { return Result::ok(); }
-        virtual auto parse( std::string const& exeName, TokenStream const &tokens) const -> InternalParseResult  = 0;
-        virtual auto cardinality() const -> size_t { return 1; }
-
-        auto parse( Args const &args ) const -> InternalParseResult {
-            return parse( args.exeName(), TokenStream( args ) );
-        }
-    };
-
-    template<typename DerivedT>
-    class ComposableParserImpl : public ParserBase {
-    public:
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser;
-
-		template<typename T>
-        auto operator+( T const &other ) const -> Parser;
-    };
-
-    // Common code and state for Args and Opts
-    template<typename DerivedT>
-    class ParserRefImpl : public ComposableParserImpl<DerivedT> {
-    protected:
-        Optionality m_optionality = Optionality::Optional;
-        std::shared_ptr<BoundRef> m_ref;
-        std::string m_hint;
-        std::string m_description;
-
-        explicit ParserRefImpl( std::shared_ptr<BoundRef> const &ref ) : m_ref( ref ) {}
-
-    public:
-        template<typename T>
-        ParserRefImpl( T &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundValueRef<T>>( ref ) ),
-            m_hint( hint )
-        {}
-
-        template<typename LambdaT>
-        ParserRefImpl( LambdaT const &ref, std::string const &hint )
-        :   m_ref( std::make_shared<BoundLambda<LambdaT>>( ref ) ),
-            m_hint(hint)
-        {}
-
-        auto operator()( std::string const &description ) -> DerivedT & {
-            m_description = description;
-            return static_cast<DerivedT &>( *this );
-        }
-
-        auto optional() -> DerivedT & {
-            m_optionality = Optionality::Optional;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto required() -> DerivedT & {
-            m_optionality = Optionality::Required;
-            return static_cast<DerivedT &>( *this );
-        };
-
-        auto isOptional() const -> bool {
-            return m_optionality == Optionality::Optional;
-        }
-
-        auto cardinality() const -> size_t override {
-            if( m_ref->isContainer() )
-                return 0;
-            else
-                return 1;
-        }
-
-        auto hint() const -> std::string { return m_hint; }
-    };
-
-    class ExeName : public ComposableParserImpl<ExeName> {
-        std::shared_ptr<std::string> m_name;
-        std::shared_ptr<BoundValueRefBase> m_ref;
-
-        template<typename LambdaT>
-        static auto makeRef(LambdaT const &lambda) -> std::shared_ptr<BoundValueRefBase> {
-            return std::make_shared<BoundLambda<LambdaT>>( lambda) ;
-        }
-
-    public:
-        ExeName() : m_name( std::make_shared<std::string>( "<executable>" ) ) {}
-
-        explicit ExeName( std::string &ref ) : ExeName() {
-            m_ref = std::make_shared<BoundValueRef<std::string>>( ref );
-        }
-
-        template<typename LambdaT>
-        explicit ExeName( LambdaT const& lambda ) : ExeName() {
-            m_ref = std::make_shared<BoundLambda<LambdaT>>( lambda );
-        }
-
-        // The exe name is not parsed out of the normal tokens, but is handled specially
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-        }
-
-        auto name() const -> std::string { return *m_name; }
-        auto set( std::string const& newName ) -> ParserResult {
-
-            auto lastSlash = newName.find_last_of( "\\/" );
-            auto filename = ( lastSlash == std::string::npos )
-                    ? newName
-                    : newName.substr( lastSlash+1 );
-
-            *m_name = filename;
-            if( m_ref )
-                return m_ref->setValue( filename );
-            else
-                return ParserResult::ok( ParseResultType::Matched );
-        }
-    };
-
-    class Arg : public ParserRefImpl<Arg> {
-    public:
-        using ParserRefImpl::ParserRefImpl;
-
-        auto parse( std::string const &, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            auto const &token = *remainingTokens;
-            if( token.type != TokenType::Argument )
-                return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-
-            assert( !m_ref->isFlag() );
-            auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-
-            auto result = valueRef->setValue( remainingTokens->token );
-            if( !result )
-                return InternalParseResult( result );
-            else
-                return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-        }
-    };
-
-    inline auto normaliseOpt( std::string const &optName ) -> std::string {
-#ifdef CATCH_PLATFORM_WINDOWS
-        if( optName[0] == '/' )
-            return "-" + optName.substr( 1 );
-        else
-#endif
-            return optName;
-    }
-
-    class Opt : public ParserRefImpl<Opt> {
-    protected:
-        std::vector<std::string> m_optNames;
-
-    public:
-        template<typename LambdaT>
-        explicit Opt( LambdaT const &ref ) : ParserRefImpl( std::make_shared<BoundFlagLambda<LambdaT>>( ref ) ) {}
-
-        explicit Opt( bool &ref ) : ParserRefImpl( std::make_shared<BoundFlagRef>( ref ) ) {}
-
-        template<typename LambdaT>
-        Opt( LambdaT const &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        template<typename T>
-        Opt( T &ref, std::string const &hint ) : ParserRefImpl( ref, hint ) {}
-
-        auto operator[]( std::string const &optName ) -> Opt & {
-            m_optNames.push_back( optName );
-            return *this;
-        }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::ostringstream oss;
-            bool first = true;
-            for( auto const &opt : m_optNames ) {
-                if (first)
-                    first = false;
-                else
-                    oss << ", ";
-                oss << opt;
-            }
-            if( !m_hint.empty() )
-                oss << " <" << m_hint << ">";
-            return { { oss.str(), m_description } };
-        }
-
-        auto isMatch( std::string const &optToken ) const -> bool {
-            auto normalisedToken = normaliseOpt( optToken );
-            for( auto const &name : m_optNames ) {
-                if( normaliseOpt( name ) == normalisedToken )
-                    return true;
-            }
-            return false;
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const&, TokenStream const &tokens ) const -> InternalParseResult override {
-            auto validationResult = validate();
-            if( !validationResult )
-                return InternalParseResult( validationResult );
-
-            auto remainingTokens = tokens;
-            if( remainingTokens && remainingTokens->type == TokenType::Option ) {
-                auto const &token = *remainingTokens;
-                if( isMatch(token.token ) ) {
-                    if( m_ref->isFlag() ) {
-                        auto flagRef = static_cast<detail::BoundFlagRefBase*>( m_ref.get() );
-                        auto result = flagRef->setFlag( true );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    } else {
-                        auto valueRef = static_cast<detail::BoundValueRefBase*>( m_ref.get() );
-                        ++remainingTokens;
-                        if( !remainingTokens )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto const &argToken = *remainingTokens;
-                        if( argToken.type != TokenType::Argument )
-                            return InternalParseResult::runtimeError( "Expected argument following " + token.token );
-                        auto result = valueRef->setValue( argToken.token );
-                        if( !result )
-                            return InternalParseResult( result );
-                        if( result.value() == ParseResultType::ShortCircuitAll )
-                            return InternalParseResult::ok( ParseState( result.value(), remainingTokens ) );
-                    }
-                    return InternalParseResult::ok( ParseState( ParseResultType::Matched, ++remainingTokens ) );
-                }
-            }
-            return InternalParseResult::ok( ParseState( ParseResultType::NoMatch, remainingTokens ) );
-        }
-
-        auto validate() const -> Result override {
-            if( m_optNames.empty() )
-                return Result::logicError( "No options supplied to Opt" );
-            for( auto const &name : m_optNames ) {
-                if( name.empty() )
-                    return Result::logicError( "Option name cannot be empty" );
-#ifdef CATCH_PLATFORM_WINDOWS
-                if( name[0] != '-' && name[0] != '/' )
-                    return Result::logicError( "Option name must begin with '-' or '/'" );
-#else
-                if( name[0] != '-' )
-                    return Result::logicError( "Option name must begin with '-'" );
-#endif
-            }
-            return ParserRefImpl::validate();
-        }
-    };
-
-    struct Help : Opt {
-        Help( bool &showHelpFlag )
-        :   Opt([&]( bool flag ) {
-                showHelpFlag = flag;
-                return ParserResult::ok( ParseResultType::ShortCircuitAll );
-            })
-        {
-            static_cast<Opt &>( *this )
-                    ("display usage information")
-                    ["-?"]["-h"]["--help"]
-                    .optional();
-        }
-    };
-
-    struct Parser : ParserBase {
-
-        mutable ExeName m_exeName;
-        std::vector<Opt> m_options;
-        std::vector<Arg> m_args;
-
-        auto operator|=( ExeName const &exeName ) -> Parser & {
-            m_exeName = exeName;
-            return *this;
-        }
-
-        auto operator|=( Arg const &arg ) -> Parser & {
-            m_args.push_back(arg);
-            return *this;
-        }
-
-        auto operator|=( Opt const &opt ) -> Parser & {
-            m_options.push_back(opt);
-            return *this;
-        }
-
-        auto operator|=( Parser const &other ) -> Parser & {
-            m_options.insert(m_options.end(), other.m_options.begin(), other.m_options.end());
-            m_args.insert(m_args.end(), other.m_args.begin(), other.m_args.end());
-            return *this;
-        }
-
-        template<typename T>
-        auto operator|( T const &other ) const -> Parser {
-            return Parser( *this ) |= other;
-        }
-
-        // Forward deprecated interface with '+' instead of '|'
-        template<typename T>
-        auto operator+=( T const &other ) -> Parser & { return operator|=( other ); }
-        template<typename T>
-        auto operator+( T const &other ) const -> Parser { return operator|( other ); }
-
-        auto getHelpColumns() const -> std::vector<HelpColumns> {
-            std::vector<HelpColumns> cols;
-            for (auto const &o : m_options) {
-                auto childCols = o.getHelpColumns();
-                cols.insert( cols.end(), childCols.begin(), childCols.end() );
-            }
-            return cols;
-        }
-
-        void writeToStream( std::ostream &os ) const {
-            if (!m_exeName.name().empty()) {
-                os << "usage:\n" << "  " << m_exeName.name() << " ";
-                bool required = true, first = true;
-                for( auto const &arg : m_args ) {
-                    if (first)
-                        first = false;
-                    else
-                        os << " ";
-                    if( arg.isOptional() && required ) {
-                        os << "[";
-                        required = false;
-                    }
-                    os << "<" << arg.hint() << ">";
-                    if( arg.cardinality() == 0 )
-                        os << " ... ";
-                }
-                if( !required )
-                    os << "]";
-                if( !m_options.empty() )
-                    os << " options";
-                os << "\n\nwhere options are:" << std::endl;
-            }
-
-            auto rows = getHelpColumns();
-            size_t consoleWidth = CATCH_CLARA_CONFIG_CONSOLE_WIDTH;
-            size_t optWidth = 0;
-            for( auto const &cols : rows )
-                optWidth = (std::max)(optWidth, cols.left.size() + 2);
-
-            optWidth = (std::min)(optWidth, consoleWidth/2);
-
-            for( auto const &cols : rows ) {
-                auto row =
-                        TextFlow::Column( cols.left ).width( optWidth ).indent( 2 ) +
-                        TextFlow::Spacer(4) +
-                        TextFlow::Column( cols.right ).width( consoleWidth - 7 - optWidth );
-                os << row << std::endl;
-            }
-        }
-
-        friend auto operator<<( std::ostream &os, Parser const &parser ) -> std::ostream& {
-            parser.writeToStream( os );
-            return os;
-        }
-
-        auto validate() const -> Result override {
-            for( auto const &opt : m_options ) {
-                auto result = opt.validate();
-                if( !result )
-                    return result;
-            }
-            for( auto const &arg : m_args ) {
-                auto result = arg.validate();
-                if( !result )
-                    return result;
-            }
-            return Result::ok();
-        }
-
-        using ParserBase::parse;
-
-        auto parse( std::string const& exeName, TokenStream const &tokens ) const -> InternalParseResult override {
-
-            struct ParserInfo {
-                ParserBase const* parser = nullptr;
-                size_t count = 0;
-            };
-            const size_t totalParsers = m_options.size() + m_args.size();
-            assert( totalParsers < 512 );
-            // ParserInfo parseInfos[totalParsers]; // <-- this is what we really want to do
-            ParserInfo parseInfos[512];
-
-            {
-                size_t i = 0;
-                for (auto const &opt : m_options) parseInfos[i++].parser = &opt;
-                for (auto const &arg : m_args) parseInfos[i++].parser = &arg;
-            }
-
-            m_exeName.set( exeName );
-
-            auto result = InternalParseResult::ok( ParseState( ParseResultType::NoMatch, tokens ) );
-            while( result.value().remainingTokens() ) {
-                bool tokenParsed = false;
-
-                for( size_t i = 0; i < totalParsers; ++i ) {
-                    auto&  parseInfo = parseInfos[i];
-                    if( parseInfo.parser->cardinality() == 0 || parseInfo.count < parseInfo.parser->cardinality() ) {
-                        result = parseInfo.parser->parse(exeName, result.value().remainingTokens());
-                        if (!result)
-                            return result;
-                        if (result.value().type() != ParseResultType::NoMatch) {
-                            tokenParsed = true;
-                            ++parseInfo.count;
-                            break;
-                        }
-                    }
-                }
-
-                if( result.value().type() == ParseResultType::ShortCircuitAll )
-                    return result;
-                if( !tokenParsed )
-                    return InternalParseResult::runtimeError( "Unrecognised token: " + result.value().remainingTokens()->token );
-            }
-            // !TBD Check missing required options
-            return result;
-        }
-    };
-
-    template<typename DerivedT>
-    template<typename T>
-    auto ComposableParserImpl<DerivedT>::operator|( T const &other ) const -> Parser {
-        return Parser() | static_cast<DerivedT const &>( *this ) | other;
-    }
-} // namespace detail
-
-// A Combined parser
-using detail::Parser;
-
-// A parser for options
-using detail::Opt;
-
-// A parser for arguments
-using detail::Arg;
-
-// Wrapper for argc, argv from main()
-using detail::Args;
-
-// Specifies the name of the executable
-using detail::ExeName;
-
-// Convenience wrapper for option parser that specifies the help option
-using detail::Help;
-
-// enum of result types from a parse
-using detail::ParseResultType;
-
-// Result type for parser operation
-using detail::ParserResult;
-
-}} // namespace Catch::clara
-
-// end clara.hpp
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// Restore Clara's value for console width, if present
-#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#define CATCH_CLARA_TEXTFLOW_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
-#endif
-
-// end catch_clara.h
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config );
-
-} // end namespace Catch
-
-// end catch_commandline.h
-#include <fstream>
-#include <ctime>
-
-namespace Catch {
-
-    clara::Parser makeCommandLineParser( ConfigData& config ) {
-
-        using namespace clara;
-
-        auto const setWarning = [&]( std::string const& warning ) {
-                auto warningSet = [&]() {
-                    if( warning == "NoAssertions" )
-                        return WarnAbout::NoAssertions;
-
-                    if ( warning == "NoTests" )
-                        return WarnAbout::NoTests;
-
-                    return WarnAbout::Nothing;
-                }();
-
-                if (warningSet == WarnAbout::Nothing)
-                    return ParserResult::runtimeError( "Unrecognised warning: '" + warning + "'" );
-                config.warnings = static_cast<WarnAbout::What>( config.warnings | warningSet );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const loadTestNamesFromFile = [&]( std::string const& filename ) {
-                std::ifstream f( filename.c_str() );
-                if( !f.is_open() )
-                    return ParserResult::runtimeError( "Unable to load input file: '" + filename + "'" );
-
-                std::string line;
-                while( std::getline( f, line ) ) {
-                    line = trim(line);
-                    if( !line.empty() && !startsWith( line, '#' ) ) {
-                        if( !startsWith( line, '"' ) )
-                            line = '"' + line + '"';
-                        config.testsOrTags.push_back( line );
-                        config.testsOrTags.emplace_back( "," );
-                    }
-                }
-                //Remove comma in the end
-                if(!config.testsOrTags.empty())
-                    config.testsOrTags.erase( config.testsOrTags.end()-1 );
-
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setTestOrder = [&]( std::string const& order ) {
-                if( startsWith( "declared", order ) )
-                    config.runOrder = RunTests::InDeclarationOrder;
-                else if( startsWith( "lexical", order ) )
-                    config.runOrder = RunTests::InLexicographicalOrder;
-                else if( startsWith( "random", order ) )
-                    config.runOrder = RunTests::InRandomOrder;
-                else
-                    return clara::ParserResult::runtimeError( "Unrecognised ordering: '" + order + "'" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setRngSeed = [&]( std::string const& seed ) {
-                if( seed != "time" )
-                    return clara::detail::convertInto( seed, config.rngSeed );
-                config.rngSeed = static_cast<unsigned int>( std::time(nullptr) );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setColourUsage = [&]( std::string const& useColour ) {
-                    auto mode = toLower( useColour );
-
-                    if( mode == "yes" )
-                        config.useColour = UseColour::Yes;
-                    else if( mode == "no" )
-                        config.useColour = UseColour::No;
-                    else if( mode == "auto" )
-                        config.useColour = UseColour::Auto;
-                    else
-                        return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" );
-                return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setWaitForKeypress = [&]( std::string const& keypress ) {
-                auto keypressLc = toLower( keypress );
-                if (keypressLc == "never")
-                    config.waitForKeypress = WaitForKeypress::Never;
-                else if( keypressLc == "start" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStart;
-                else if( keypressLc == "exit" )
-                    config.waitForKeypress = WaitForKeypress::BeforeExit;
-                else if( keypressLc == "both" )
-                    config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
-                else
-                    return ParserResult::runtimeError( "keypress argument must be one of: never, start, exit or both. '" + keypress + "' not recognised" );
-            return ParserResult::ok( ParseResultType::Matched );
-            };
-        auto const setVerbosity = [&]( std::string const& verbosity ) {
-            auto lcVerbosity = toLower( verbosity );
-            if( lcVerbosity == "quiet" )
-                config.verbosity = Verbosity::Quiet;
-            else if( lcVerbosity == "normal" )
-                config.verbosity = Verbosity::Normal;
-            else if( lcVerbosity == "high" )
-                config.verbosity = Verbosity::High;
-            else
-                return ParserResult::runtimeError( "Unrecognised verbosity, '" + verbosity + "'" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-        auto const setReporter = [&]( std::string const& reporter ) {
-            IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-
-            auto lcReporter = toLower( reporter );
-            auto result = factories.find( lcReporter );
-
-            if( factories.end() != result )
-                config.reporterName = lcReporter;
-            else
-                return ParserResult::runtimeError( "Unrecognized reporter, '" + reporter + "'. Check available with --list-reporters" );
-            return ParserResult::ok( ParseResultType::Matched );
-        };
-
-        auto cli
-            = ExeName( config.processName )
-            | Help( config.showHelp )
-            | Opt( config.listTests )
-                ["-l"]["--list-tests"]
-                ( "list all/matching test cases" )
-            | Opt( config.listTags )
-                ["-t"]["--list-tags"]
-                ( "list all/matching tags" )
-            | Opt( config.showSuccessfulTests )
-                ["-s"]["--success"]
-                ( "include successful tests in output" )
-            | Opt( config.shouldDebugBreak )
-                ["-b"]["--break"]
-                ( "break into debugger on failure" )
-            | Opt( config.noThrow )
-                ["-e"]["--nothrow"]
-                ( "skip exception tests" )
-            | Opt( config.showInvisibles )
-                ["-i"]["--invisibles"]
-                ( "show invisibles (tabs, newlines)" )
-            | Opt( config.outputFilename, "filename" )
-                ["-o"]["--out"]
-                ( "output filename" )
-            | Opt( setReporter, "name" )
-                ["-r"]["--reporter"]
-                ( "reporter to use (defaults to console)" )
-            | Opt( config.name, "name" )
-                ["-n"]["--name"]
-                ( "suite name" )
-            | Opt( [&]( bool ){ config.abortAfter = 1; } )
-                ["-a"]["--abort"]
-                ( "abort at first failure" )
-            | Opt( [&]( int x ){ config.abortAfter = x; }, "no. failures" )
-                ["-x"]["--abortx"]
-                ( "abort after x failures" )
-            | Opt( setWarning, "warning name" )
-                ["-w"]["--warn"]
-                ( "enable warnings" )
-            | Opt( [&]( bool flag ) { config.showDurations = flag ? ShowDurations::Always : ShowDurations::Never; }, "yes|no" )
-                ["-d"]["--durations"]
-                ( "show test durations" )
-            | Opt( loadTestNamesFromFile, "filename" )
-                ["-f"]["--input-file"]
-                ( "load test names to run from a file" )
-            | Opt( config.filenamesAsTags )
-                ["-#"]["--filenames-as-tags"]
-                ( "adds a tag for the filename" )
-            | Opt( config.sectionsToRun, "section name" )
-                ["-c"]["--section"]
-                ( "specify section to run" )
-            | Opt( setVerbosity, "quiet|normal|high" )
-                ["-v"]["--verbosity"]
-                ( "set output verbosity" )
-            | Opt( config.listTestNamesOnly )
-                ["--list-test-names-only"]
-                ( "list all/matching test cases names only" )
-            | Opt( config.listReporters )
-                ["--list-reporters"]
-                ( "list all reporters" )
-            | Opt( setTestOrder, "decl|lex|rand" )
-                ["--order"]
-                ( "test case order (defaults to decl)" )
-            | Opt( setRngSeed, "'time'|number" )
-                ["--rng-seed"]
-                ( "set a specific seed for random numbers" )
-            | Opt( setColourUsage, "yes|no" )
-                ["--use-colour"]
-                ( "should output be colourised" )
-            | Opt( config.libIdentify )
-                ["--libidentify"]
-                ( "report name and version according to libidentify standard" )
-            | Opt( setWaitForKeypress, "never|start|exit|both" )
-                ["--wait-for-keypress"]
-                ( "waits for a keypress before exiting" )
-            | Opt( config.benchmarkSamples, "samples" )
-                ["--benchmark-samples"]
-                ( "number of samples to collect (default: 100)" )
-            | Opt( config.benchmarkResamples, "resamples" )
-                ["--benchmark-resamples"]
-                ( "number of resamples for the bootstrap (default: 100000)" )
-            | Opt( config.benchmarkConfidenceInterval, "confidence interval" )
-                ["--benchmark-confidence-interval"]
-                ( "confidence interval for the bootstrap (between 0 and 1, default: 0.95)" )
-            | Opt( config.benchmarkNoAnalysis )
-                ["--benchmark-no-analysis"]
-                ( "perform only measurements; do not perform any analysis" )
-            | Opt( config.benchmarkWarmupTime, "benchmarkWarmupTime" )
-                ["--benchmark-warmup-time"]
-                ( "amount of time in milliseconds spent on warming up each test (default: 100)" )
-            | Arg( config.testsOrTags, "test name|pattern|tags" )
-                ( "which test or tests to use" );
-
-        return cli;
-    }
-
-} // end namespace Catch
-// end catch_commandline.cpp
-// start catch_common.cpp
-
-#include <cstring>
-#include <ostream>
-
-namespace Catch {
-
-    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const noexcept {
-        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
-    }
-    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const noexcept {
-        // We can assume that the same file will usually have the same pointer.
-        // Thus, if the pointers are the same, there is no point in calling the strcmp
-        return line < other.line || ( line == other.line && file != other.file && (std::strcmp(file, other.file) < 0));
-    }
-
-    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
-#ifndef __GNUG__
-        os << info.file << '(' << info.line << ')';
-#else
-        os << info.file << ':' << info.line;
-#endif
-        return os;
-    }
-
-    std::string StreamEndStop::operator+() const {
-        return std::string();
-    }
-
-    NonCopyable::NonCopyable() = default;
-    NonCopyable::~NonCopyable() = default;
-
-}
-// end catch_common.cpp
-// start catch_config.cpp
-
-namespace Catch {
-
-    Config::Config( ConfigData const& data )
-    :   m_data( data ),
-        m_stream( openStream() )
-    {
-        // We need to trim filter specs to avoid trouble with superfluous
-        // whitespace (esp. important for bdd macros, as those are manually
-        // aligned with whitespace).
-
-        for (auto& elem : m_data.testsOrTags) {
-            elem = trim(elem);
-        }
-        for (auto& elem : m_data.sectionsToRun) {
-            elem = trim(elem);
-        }
-
-        TestSpecParser parser(ITagAliasRegistry::get());
-        if (!m_data.testsOrTags.empty()) {
-            m_hasTestFilters = true;
-            for (auto const& testOrTags : m_data.testsOrTags) {
-                parser.parse(testOrTags);
-            }
-        }
-        m_testSpec = parser.testSpec();
-    }
-
-    std::string const& Config::getFilename() const {
-        return m_data.outputFilename ;
-    }
-
-    bool Config::listTests() const          { return m_data.listTests; }
-    bool Config::listTestNamesOnly() const  { return m_data.listTestNamesOnly; }
-    bool Config::listTags() const           { return m_data.listTags; }
-    bool Config::listReporters() const      { return m_data.listReporters; }
-
-    std::string Config::getProcessName() const { return m_data.processName; }
-    std::string const& Config::getReporterName() const { return m_data.reporterName; }
-
-    std::vector<std::string> const& Config::getTestsOrTags() const { return m_data.testsOrTags; }
-    std::vector<std::string> const& Config::getSectionsToRun() const { return m_data.sectionsToRun; }
-
-    TestSpec const& Config::testSpec() const { return m_testSpec; }
-    bool Config::hasTestFilters() const { return m_hasTestFilters; }
-
-    bool Config::showHelp() const { return m_data.showHelp; }
-
-    // IConfig interface
-    bool Config::allowThrows() const                   { return !m_data.noThrow; }
-    std::ostream& Config::stream() const               { return m_stream->stream(); }
-    std::string Config::name() const                   { return m_data.name.empty() ? m_data.processName : m_data.name; }
-    bool Config::includeSuccessfulResults() const      { return m_data.showSuccessfulTests; }
-    bool Config::warnAboutMissingAssertions() const    { return !!(m_data.warnings & WarnAbout::NoAssertions); }
-    bool Config::warnAboutNoTests() const              { return !!(m_data.warnings & WarnAbout::NoTests); }
-    ShowDurations::OrNot Config::showDurations() const { return m_data.showDurations; }
-    RunTests::InWhatOrder Config::runOrder() const     { return m_data.runOrder; }
-    unsigned int Config::rngSeed() const               { return m_data.rngSeed; }
-    UseColour::YesOrNo Config::useColour() const       { return m_data.useColour; }
-    bool Config::shouldDebugBreak() const              { return m_data.shouldDebugBreak; }
-    int Config::abortAfter() const                     { return m_data.abortAfter; }
-    bool Config::showInvisibles() const                { return m_data.showInvisibles; }
-    Verbosity Config::verbosity() const                { return m_data.verbosity; }
-
-    bool Config::benchmarkNoAnalysis() const                      { return m_data.benchmarkNoAnalysis; }
-    int Config::benchmarkSamples() const                          { return m_data.benchmarkSamples; }
-    double Config::benchmarkConfidenceInterval() const            { return m_data.benchmarkConfidenceInterval; }
-    unsigned int Config::benchmarkResamples() const               { return m_data.benchmarkResamples; }
-    std::chrono::milliseconds Config::benchmarkWarmupTime() const { return std::chrono::milliseconds(m_data.benchmarkWarmupTime); }
-
-    IStream const* Config::openStream() {
-        return Catch::makeStream(m_data.outputFilename);
-    }
-
-} // end namespace Catch
-// end catch_config.cpp
-// start catch_console_colour.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-// start catch_errno_guard.h
-
-namespace Catch {
-
-    class ErrnoGuard {
-    public:
-        ErrnoGuard();
-        ~ErrnoGuard();
-    private:
-        int m_oldErrno;
-    };
-
-}
-
-// end catch_errno_guard.h
-#include <sstream>
-
-namespace Catch {
-    namespace {
-
-        struct IColourImpl {
-            virtual ~IColourImpl() = default;
-            virtual void use( Colour::Code _colourCode ) = 0;
-        };
-
-        struct NoColourImpl : IColourImpl {
-            void use( Colour::Code ) override {}
-
-            static IColourImpl* instance() {
-                static NoColourImpl s_instance;
-                return &s_instance;
-            }
-        };
-
-    } // anon namespace
-} // namespace Catch
-
-#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
-#   ifdef CATCH_PLATFORM_WINDOWS
-#       define CATCH_CONFIG_COLOUR_WINDOWS
-#   else
-#       define CATCH_CONFIG_COLOUR_ANSI
-#   endif
-#endif
-
-#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
-
-namespace Catch {
-namespace {
-
-    class Win32ColourImpl : public IColourImpl {
-    public:
-        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
-        {
-            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
-            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
-        }
-
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
-                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
-                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
-                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
-                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
-                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
-                case Colour::Grey:      return setTextAttribute( 0 );
-
-                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
-                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
-                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
-                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
-                case Colour::BrightYellow:  return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-
-                default:
-                    CATCH_ERROR( "Unknown colour requested" );
-            }
-        }
-
-    private:
-        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
-        }
-        HANDLE stdoutHandle;
-        WORD originalForegroundAttributes;
-        WORD originalBackgroundAttributes;
-    };
-
-    IColourImpl* platformColourInstance() {
-        static Win32ColourImpl s_instance;
-
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = UseColour::Yes;
-        return colourMode == UseColour::Yes
-            ? &s_instance
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
-
-#include <unistd.h>
-
-namespace Catch {
-namespace {
-
-    // use POSIX/ ANSI console terminal codes
-    // Thanks to Adam Strzelecki for original contribution
-    // (http://github.com/nanoant)
-    // https://github.com/philsquared/Catch/pull/131
-    class PosixColourImpl : public IColourImpl {
-    public:
-        void use( Colour::Code _colourCode ) override {
-            switch( _colourCode ) {
-                case Colour::None:
-                case Colour::White:     return setColour( "[0m" );
-                case Colour::Red:       return setColour( "[0;31m" );
-                case Colour::Green:     return setColour( "[0;32m" );
-                case Colour::Blue:      return setColour( "[0;34m" );
-                case Colour::Cyan:      return setColour( "[0;36m" );
-                case Colour::Yellow:    return setColour( "[0;33m" );
-                case Colour::Grey:      return setColour( "[1;30m" );
-
-                case Colour::LightGrey:     return setColour( "[0;37m" );
-                case Colour::BrightRed:     return setColour( "[1;31m" );
-                case Colour::BrightGreen:   return setColour( "[1;32m" );
-                case Colour::BrightWhite:   return setColour( "[1;37m" );
-                case Colour::BrightYellow:  return setColour( "[1;33m" );
-
-                case Colour::Bright: CATCH_INTERNAL_ERROR( "not a colour" );
-                default: CATCH_INTERNAL_ERROR( "Unknown colour requested" );
-            }
-        }
-        static IColourImpl* instance() {
-            static PosixColourImpl s_instance;
-            return &s_instance;
-        }
-
-    private:
-        void setColour( const char* _escapeCode ) {
-            getCurrentContext().getConfig()->stream()
-                << '\033' << _escapeCode;
-        }
-    };
-
-    bool useColourOnPlatform() {
-        return
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-            !isDebuggerActive() &&
-#endif
-#if !(defined(__DJGPP__) && defined(__STRICT_ANSI__))
-            isatty(STDOUT_FILENO)
-#else
-            false
-#endif
-            ;
-    }
-    IColourImpl* platformColourInstance() {
-        ErrnoGuard guard;
-        IConfigPtr config = getCurrentContext().getConfig();
-        UseColour::YesOrNo colourMode = config
-            ? config->useColour()
-            : UseColour::Auto;
-        if( colourMode == UseColour::Auto )
-            colourMode = useColourOnPlatform()
-                ? UseColour::Yes
-                : UseColour::No;
-        return colourMode == UseColour::Yes
-            ? PosixColourImpl::instance()
-            : NoColourImpl::instance();
-    }
-
-} // end anon namespace
-} // end namespace Catch
-
-#else  // not Windows or ANSI ///////////////////////////////////////////////
-
-namespace Catch {
-
-    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
-
-} // end namespace Catch
-
-#endif // Windows/ ANSI/ None
-
-namespace Catch {
-
-    Colour::Colour( Code _colourCode ) { use( _colourCode ); }
-    Colour::Colour( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved = true;
-    }
-    Colour& Colour::operator=( Colour&& other ) noexcept {
-        m_moved = other.m_moved;
-        other.m_moved  = true;
-        return *this;
-    }
-
-    Colour::~Colour(){ if( !m_moved ) use( None ); }
-
-    void Colour::use( Code _colourCode ) {
-        static IColourImpl* impl = platformColourInstance();
-        // Strictly speaking, this cannot possibly happen.
-        // However, under some conditions it does happen (see #1626),
-        // and this change is small enough that we can let practicality
-        // triumph over purity in this case.
-        if (impl != nullptr) {
-            impl->use( _colourCode );
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, Colour const& ) {
-        return os;
-    }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_console_colour.cpp
-// start catch_context.cpp
-
-namespace Catch {
-
-    class Context : public IMutableContext, NonCopyable {
-
-    public: // IContext
-        IResultCapture* getResultCapture() override {
-            return m_resultCapture;
-        }
-        IRunner* getRunner() override {
-            return m_runner;
-        }
-
-        IConfigPtr const& getConfig() const override {
-            return m_config;
-        }
-
-        ~Context() override;
-
-    public: // IMutableContext
-        void setResultCapture( IResultCapture* resultCapture ) override {
-            m_resultCapture = resultCapture;
-        }
-        void setRunner( IRunner* runner ) override {
-            m_runner = runner;
-        }
-        void setConfig( IConfigPtr const& config ) override {
-            m_config = config;
-        }
-
-        friend IMutableContext& getCurrentMutableContext();
-
-    private:
-        IConfigPtr m_config;
-        IRunner* m_runner = nullptr;
-        IResultCapture* m_resultCapture = nullptr;
-    };
-
-    IMutableContext *IMutableContext::currentContext = nullptr;
-
-    void IMutableContext::createContext()
-    {
-        currentContext = new Context();
-    }
-
-    void cleanUpContext() {
-        delete IMutableContext::currentContext;
-        IMutableContext::currentContext = nullptr;
-    }
-    IContext::~IContext() = default;
-    IMutableContext::~IMutableContext() = default;
-    Context::~Context() = default;
-
-    SimplePcg32& rng() {
-        static SimplePcg32 s_rng;
-        return s_rng;
-    }
-
-}
-// end catch_context.cpp
-// start catch_debug_console.cpp
-
-// start catch_debug_console.h
-
-#include <string>
-
-namespace Catch {
-    void writeToDebugConsole( std::string const& text );
-}
-
-// end catch_debug_console.h
-#if defined(CATCH_CONFIG_ANDROID_LOGWRITE)
-#include <android/log.h>
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            __android_log_write( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
-        }
-    }
-
-#elif defined(CATCH_PLATFORM_WINDOWS)
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            ::OutputDebugStringA( text.c_str() );
-        }
-    }
-
-#else
-
-    namespace Catch {
-        void writeToDebugConsole( std::string const& text ) {
-            // !TBD: Need a version for Mac/ XCode and other IDEs
-            Catch::cout() << text;
-        }
-    }
-
-#endif // Platform
-// end catch_debug_console.cpp
-// start catch_debugger.cpp
-
-#if defined(CATCH_PLATFORM_MAC) || defined(CATCH_PLATFORM_IPHONE)
-
-#  include <cassert>
-#  include <sys/types.h>
-#  include <unistd.h>
-#  include <cstddef>
-#  include <ostream>
-
-#ifdef __apple_build_version__
-    // These headers will only compile with AppleClang (XCode)
-    // For other compilers (Clang, GCC, ... ) we need to exclude them
-#  include <sys/sysctl.h>
-#endif
-
-    namespace Catch {
-        #ifdef __apple_build_version__
-        // The following function is taken directly from the following technical note:
-        // https://developer.apple.com/library/archive/qa/qa1361/_index.html
-
-        // Returns true if the current process is being debugged (either
-        // running under the debugger or has a debugger attached post facto).
-        bool isDebuggerActive(){
-            int                 mib[4];
-            struct kinfo_proc   info;
-            std::size_t         size;
-
-            // Initialize the flags so that, if sysctl fails for some bizarre
-            // reason, we get a predictable result.
-
-            info.kp_proc.p_flag = 0;
-
-            // Initialize mib, which tells sysctl the info we want, in this case
-            // we're looking for information about a specific process ID.
-
-            mib[0] = CTL_KERN;
-            mib[1] = KERN_PROC;
-            mib[2] = KERN_PROC_PID;
-            mib[3] = getpid();
-
-            // Call sysctl.
-
-            size = sizeof(info);
-            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, nullptr, 0) != 0 ) {
-                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
-                return false;
-            }
-
-            // We're being debugged if the P_TRACED flag is set.
-
-            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
-        }
-        #else
-        bool isDebuggerActive() {
-            // We need to find another way to determine this for non-appleclang compilers on macOS
-            return false;
-        }
-        #endif
-    } // namespace Catch
-
-#elif defined(CATCH_PLATFORM_LINUX)
-    #include <fstream>
-    #include <string>
-
-    namespace Catch{
-        // The standard POSIX way of detecting a debugger is to attempt to
-        // ptrace() the process, but this needs to be done from a child and not
-        // this process itself to still allow attaching to this process later
-        // if wanted, so is rather heavy. Under Linux we have the PID of the
-        // "debugger" (which doesn't need to be gdb, of course, it could also
-        // be strace, for example) in /proc/$PID/status, so just get it from
-        // there instead.
-        bool isDebuggerActive(){
-            // Libstdc++ has a bug, where std::ifstream sets errno to 0
-            // This way our users can properly assert over errno values
-            ErrnoGuard guard;
-            std::ifstream in("/proc/self/status");
-            for( std::string line; std::getline(in, line); ) {
-                static const int PREFIX_LEN = 11;
-                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
-                    // We're traced if the PID is not 0 and no other PID starts
-                    // with 0 digit, so it's enough to check for just a single
-                    // character.
-                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
-                }
-            }
-
-            return false;
-        }
-    } // namespace Catch
-#elif defined(_MSC_VER)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#elif defined(__MINGW32__)
-    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
-    namespace Catch {
-        bool isDebuggerActive() {
-            return IsDebuggerPresent() != 0;
-        }
-    }
-#else
-    namespace Catch {
-       bool isDebuggerActive() { return false; }
-    }
-#endif // Platform
-// end catch_debugger.cpp
-// start catch_decomposer.cpp
-
-namespace Catch {
-
-    ITransientExpression::~ITransientExpression() = default;
-
-    void formatReconstructedExpression( std::ostream &os, std::string const& lhs, StringRef op, std::string const& rhs ) {
-        if( lhs.size() + rhs.size() < 40 &&
-                lhs.find('\n') == std::string::npos &&
-                rhs.find('\n') == std::string::npos )
-            os << lhs << " " << op << " " << rhs;
-        else
-            os << lhs << "\n" << op << "\n" << rhs;
-    }
-}
-// end catch_decomposer.cpp
-// start catch_enforce.cpp
-
-#include <stdexcept>
-
-namespace Catch {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS) && !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS_CUSTOM_HANDLER)
-    [[noreturn]]
-    void throw_exception(std::exception const& e) {
-        Catch::cerr() << "Catch will terminate because it needed to throw an exception.\n"
-                      << "The message was: " << e.what() << '\n';
-        std::terminate();
-    }
-#endif
-
-    [[noreturn]]
-    void throw_logic_error(std::string const& msg) {
-        throw_exception(std::logic_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_domain_error(std::string const& msg) {
-        throw_exception(std::domain_error(msg));
-    }
-
-    [[noreturn]]
-    void throw_runtime_error(std::string const& msg) {
-        throw_exception(std::runtime_error(msg));
-    }
-
-} // namespace Catch;
-// end catch_enforce.cpp
-// start catch_enum_values_registry.cpp
-// start catch_enum_values_registry.h
-
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    namespace Detail {
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values );
-
-        class EnumValuesRegistry : public IMutableEnumValuesRegistry {
-
-            std::vector<std::unique_ptr<EnumInfo>> m_enumInfos;
-
-            EnumInfo const& registerEnum( StringRef enumName, StringRef allEnums, std::vector<int> const& values) override;
-        };
-
-        std::vector<StringRef> parseEnums( StringRef enums );
-
-    } // Detail
-
-} // Catch
-
-// end catch_enum_values_registry.h
-
-#include <map>
-#include <cassert>
-
-namespace Catch {
-
-    IMutableEnumValuesRegistry::~IMutableEnumValuesRegistry() {}
-
-    namespace Detail {
-
-        namespace {
-            // Extracts the actual name part of an enum instance
-            // In other words, it returns the Blue part of Bikeshed::Colour::Blue
-            StringRef extractInstanceName(StringRef enumInstance) {
-                // Find last occurence of ":"
-                size_t name_start = enumInstance.size();
-                while (name_start > 0 && enumInstance[name_start - 1] != ':') {
-                    --name_start;
-                }
-                return enumInstance.substr(name_start, enumInstance.size() - name_start);
-            }
-        }
-
-        std::vector<StringRef> parseEnums( StringRef enums ) {
-            auto enumValues = splitStringRef( enums, ',' );
-            std::vector<StringRef> parsed;
-            parsed.reserve( enumValues.size() );
-            for( auto const& enumValue : enumValues ) {
-                parsed.push_back(trim(extractInstanceName(enumValue)));
-            }
-            return parsed;
-        }
-
-        EnumInfo::~EnumInfo() {}
-
-        StringRef EnumInfo::lookup( int value ) const {
-            for( auto const& valueToName : m_values ) {
-                if( valueToName.first == value )
-                    return valueToName.second;
-            }
-            return "{** unexpected enum value **}"_sr;
-        }
-
-        std::unique_ptr<EnumInfo> makeEnumInfo( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            std::unique_ptr<EnumInfo> enumInfo( new EnumInfo );
-            enumInfo->m_name = enumName;
-            enumInfo->m_values.reserve( values.size() );
-
-            const auto valueNames = Catch::Detail::parseEnums( allValueNames );
-            assert( valueNames.size() == values.size() );
-            std::size_t i = 0;
-            for( auto value : values )
-                enumInfo->m_values.emplace_back(value, valueNames[i++]);
-
-            return enumInfo;
-        }
-
-        EnumInfo const& EnumValuesRegistry::registerEnum( StringRef enumName, StringRef allValueNames, std::vector<int> const& values ) {
-            m_enumInfos.push_back(makeEnumInfo(enumName, allValueNames, values));
-            return *m_enumInfos.back();
-        }
-
-    } // Detail
-} // Catch
-
-// end catch_enum_values_registry.cpp
-// start catch_errno_guard.cpp
-
-#include <cerrno>
-
-namespace Catch {
-        ErrnoGuard::ErrnoGuard():m_oldErrno(errno){}
-        ErrnoGuard::~ErrnoGuard() { errno = m_oldErrno; }
-}
-// end catch_errno_guard.cpp
-// start catch_exception_translator_registry.cpp
-
-// start catch_exception_translator_registry.h
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace Catch {
-
-    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
-    public:
-        ~ExceptionTranslatorRegistry();
-        virtual void registerTranslator( const IExceptionTranslator* translator );
-        std::string translateActiveException() const override;
-        std::string tryTranslators() const;
-
-    private:
-        std::vector<std::unique_ptr<IExceptionTranslator const>> m_translators;
-    };
-}
-
-// end catch_exception_translator_registry.h
-#ifdef __OBJC__
-#import "Foundation/Foundation.h"
-#endif
-
-namespace Catch {
-
-    ExceptionTranslatorRegistry::~ExceptionTranslatorRegistry() {
-    }
-
-    void ExceptionTranslatorRegistry::registerTranslator( const IExceptionTranslator* translator ) {
-        m_translators.push_back( std::unique_ptr<const IExceptionTranslator>( translator ) );
-    }
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        try {
-#ifdef __OBJC__
-            // In Objective-C try objective-c exceptions first
-            @try {
-                return tryTranslators();
-            }
-            @catch (NSException *exception) {
-                return Catch::Detail::stringify( [exception description] );
-            }
-#else
-            // Compiling a mixed mode project with MSVC means that CLR
-            // exceptions will be caught in (...) as well. However, these
-            // do not fill-in std::current_exception and thus lead to crash
-            // when attempting rethrow.
-            // /EHa switch also causes structured exceptions to be caught
-            // here, but they fill-in current_exception properly, so
-            // at worst the output should be a little weird, instead of
-            // causing a crash.
-            if (std::current_exception() == nullptr) {
-                return "Non C++ exception. Possibly a CLR exception.";
-            }
-            return tryTranslators();
-#endif
-        }
-        catch( TestFailureException& ) {
-            std::rethrow_exception(std::current_exception());
-        }
-        catch( std::exception& ex ) {
-            return ex.what();
-        }
-        catch( std::string& msg ) {
-            return msg;
-        }
-        catch( const char* msg ) {
-            return msg;
-        }
-        catch(...) {
-            return "Unknown exception";
-        }
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        if (m_translators.empty()) {
-            std::rethrow_exception(std::current_exception());
-        } else {
-            return m_translators[0]->translate(m_translators.begin() + 1, m_translators.end());
-        }
-    }
-
-#else // ^^ Exceptions are enabled // Exceptions are disabled vv
-    std::string ExceptionTranslatorRegistry::translateActiveException() const {
-        CATCH_INTERNAL_ERROR("Attempted to translate active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-
-    std::string ExceptionTranslatorRegistry::tryTranslators() const {
-        CATCH_INTERNAL_ERROR("Attempted to use exception translators under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-    }
-#endif
-
-}
-// end catch_exception_translator_registry.cpp
-// start catch_fatal_condition.cpp
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH ) || defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace {
-    // Report the error condition
-    void reportFatal( char const * const message ) {
-        Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition( message );
-    }
-}
-
-#endif // signals/SEH handling
-
-#if defined( CATCH_CONFIG_WINDOWS_SEH )
-
-namespace Catch {
-    struct SignalDefs { DWORD id; const char* name; };
-
-    // There is no 1-1 mapping between signals and windows exceptions.
-    // Windows can easily distinguish between SO and SigSegV,
-    // but SigInt, SigTerm, etc are handled differently.
-    static SignalDefs signalDefs[] = {
-        { static_cast<DWORD>(EXCEPTION_ILLEGAL_INSTRUCTION),  "SIGILL - Illegal instruction signal" },
-        { static_cast<DWORD>(EXCEPTION_STACK_OVERFLOW), "SIGSEGV - Stack overflow" },
-        { static_cast<DWORD>(EXCEPTION_ACCESS_VIOLATION), "SIGSEGV - Segmentation violation signal" },
-        { static_cast<DWORD>(EXCEPTION_INT_DIVIDE_BY_ZERO), "Divide by zero error" },
-    };
-
-    LONG CALLBACK FatalConditionHandler::handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
-        for (auto const& def : signalDefs) {
-            if (ExceptionInfo->ExceptionRecord->ExceptionCode == def.id) {
-                reportFatal(def.name);
-            }
-        }
-        // If its not an exception we care about, pass it along.
-        // This stops us from eating debugger breaks etc.
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        isSet = true;
-        // 32k seems enough for Catch to handle stack overflow,
-        // but the value was found experimentally, so there is no strong guarantee
-        guaranteeSize = 32 * 1024;
-        exceptionHandlerHandle = nullptr;
-        // Register as first handler in current chain
-        exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
-        // Pass in guarantee size to be filled
-        SetThreadStackGuarantee(&guaranteeSize);
-    }
-
-    void FatalConditionHandler::reset() {
-        if (isSet) {
-            RemoveVectoredExceptionHandler(exceptionHandlerHandle);
-            SetThreadStackGuarantee(&guaranteeSize);
-            exceptionHandlerHandle = nullptr;
-            isSet = false;
-        }
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        reset();
-    }
-
-bool FatalConditionHandler::isSet = false;
-ULONG FatalConditionHandler::guaranteeSize = 0;
-PVOID FatalConditionHandler::exceptionHandlerHandle = nullptr;
-
-} // namespace Catch
-
-#elif defined( CATCH_CONFIG_POSIX_SIGNALS )
-
-namespace Catch {
-
-    struct SignalDefs {
-        int id;
-        const char* name;
-    };
-
-    // 32kb for the alternate stack seems to be sufficient. However, this value
-    // is experimentally determined, so that's not guaranteed.
-    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
-
-    static SignalDefs signalDefs[] = {
-        { SIGINT,  "SIGINT - Terminal interrupt signal" },
-        { SIGILL,  "SIGILL - Illegal instruction signal" },
-        { SIGFPE,  "SIGFPE - Floating point error signal" },
-        { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
-        { SIGTERM, "SIGTERM - Termination request signal" },
-        { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
-    };
-
-    void FatalConditionHandler::handleSignal( int sig ) {
-        char const * name = "<unknown signal>";
-        for (auto const& def : signalDefs) {
-            if (sig == def.id) {
-                name = def.name;
-                break;
-            }
-        }
-        reset();
-        reportFatal(name);
-        raise( sig );
-    }
-
-    FatalConditionHandler::FatalConditionHandler() {
-        isSet = true;
-        stack_t sigStack;
-        sigStack.ss_sp = altStackMem;
-        sigStack.ss_size = sigStackSize;
-        sigStack.ss_flags = 0;
-        sigaltstack(&sigStack, &oldSigStack);
-        struct sigaction sa = { };
-
-        sa.sa_handler = handleSignal;
-        sa.sa_flags = SA_ONSTACK;
-        for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
-            sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
-        }
-    }
-
-    FatalConditionHandler::~FatalConditionHandler() {
-        reset();
-    }
-
-    void FatalConditionHandler::reset() {
-        if( isSet ) {
-            // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
-            for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
-                sigaction(signalDefs[i].id, &oldSigActions[i], nullptr);
-            }
-            // Return the old stack
-            sigaltstack(&oldSigStack, nullptr);
-            isSet = false;
-        }
-    }
-
-    bool FatalConditionHandler::isSet = false;
-    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
-    stack_t FatalConditionHandler::oldSigStack = {};
-    char FatalConditionHandler::altStackMem[sigStackSize] = {};
-
-} // namespace Catch
-
-#else
-
-namespace Catch {
-    void FatalConditionHandler::reset() {}
-}
-
-#endif // signals/SEH handling
-
-#if defined(__GNUC__)
-#    pragma GCC diagnostic pop
-#endif
-// end catch_fatal_condition.cpp
-// start catch_generators.cpp
-
-#include <limits>
-#include <set>
-
-namespace Catch {
-
-IGeneratorTracker::~IGeneratorTracker() {}
-
-const char* GeneratorException::what() const noexcept {
-    return m_msg;
-}
-
-namespace Generators {
-
-    GeneratorUntypedBase::~GeneratorUntypedBase() {}
-
-    auto acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        return getResultCapture().acquireGeneratorTracker( generatorName, lineInfo );
-    }
-
-} // namespace Generators
-} // namespace Catch
-// end catch_generators.cpp
-// start catch_interfaces_capture.cpp
-
-namespace Catch {
-    IResultCapture::~IResultCapture() = default;
-}
-// end catch_interfaces_capture.cpp
-// start catch_interfaces_config.cpp
-
-namespace Catch {
-    IConfig::~IConfig() = default;
-}
-// end catch_interfaces_config.cpp
-// start catch_interfaces_exception.cpp
-
-namespace Catch {
-    IExceptionTranslator::~IExceptionTranslator() = default;
-    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() = default;
-}
-// end catch_interfaces_exception.cpp
-// start catch_interfaces_registry_hub.cpp
-
-namespace Catch {
-    IRegistryHub::~IRegistryHub() = default;
-    IMutableRegistryHub::~IMutableRegistryHub() = default;
-}
-// end catch_interfaces_registry_hub.cpp
-// start catch_interfaces_reporter.cpp
-
-// start catch_reporter_listening.h
-
-namespace Catch {
-
-    class ListeningReporter : public IStreamingReporter {
-        using Reporters = std::vector<IStreamingReporterPtr>;
-        Reporters m_listeners;
-        IStreamingReporterPtr m_reporter = nullptr;
-        ReporterPreferences m_preferences;
-
-    public:
-        ListeningReporter();
-
-        void addListener( IStreamingReporterPtr&& listener );
-        void addReporter( IStreamingReporterPtr&& reporter );
-
-    public: // IStreamingReporter
-
-        ReporterPreferences getPreferences() const override;
-
-        void noMatchingTestCases( std::string const& spec ) override;
-
-        void reportInvalidArguments(std::string const&arg) override;
-
-        static std::set<Verbosity> getSupportedVerbosities();
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-        void benchmarkPreparing(std::string const& name) override;
-        void benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) override;
-        void benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) override;
-        void benchmarkFailed(std::string const&) override;
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-        void testRunStarting( TestRunInfo const& testRunInfo ) override;
-        void testGroupStarting( GroupInfo const& groupInfo ) override;
-        void testCaseStarting( TestCaseInfo const& testInfo ) override;
-        void sectionStarting( SectionInfo const& sectionInfo ) override;
-        void assertionStarting( AssertionInfo const& assertionInfo ) override;
-
-        // The return value indicates if the messages buffer should be cleared:
-        bool assertionEnded( AssertionStats const& assertionStats ) override;
-        void sectionEnded( SectionStats const& sectionStats ) override;
-        void testCaseEnded( TestCaseStats const& testCaseStats ) override;
-        void testGroupEnded( TestGroupStats const& testGroupStats ) override;
-        void testRunEnded( TestRunStats const& testRunStats ) override;
-
-        void skipTest( TestCaseInfo const& testInfo ) override;
-        bool isMulti() const override;
-
-    };
-
-} // end namespace Catch
-
-// end catch_reporter_listening.h
-namespace Catch {
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig )
-    :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
-
-    ReporterConfig::ReporterConfig( IConfigPtr const& _fullConfig, std::ostream& _stream )
-    :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
-
-    std::ostream& ReporterConfig::stream() const { return *m_stream; }
-    IConfigPtr ReporterConfig::fullConfig() const { return m_fullConfig; }
-
-    TestRunInfo::TestRunInfo( std::string const& _name ) : name( _name ) {}
-
-    GroupInfo::GroupInfo(  std::string const& _name,
-                           std::size_t _groupIndex,
-                           std::size_t _groupsCount )
-    :   name( _name ),
-        groupIndex( _groupIndex ),
-        groupsCounts( _groupsCount )
-    {}
-
-     AssertionStats::AssertionStats( AssertionResult const& _assertionResult,
-                                     std::vector<MessageInfo> const& _infoMessages,
-                                     Totals const& _totals )
-    :   assertionResult( _assertionResult ),
-        infoMessages( _infoMessages ),
-        totals( _totals )
-    {
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = _assertionResult.m_resultData.lazyExpression.m_transientExpression;
-
-        if( assertionResult.hasMessage() ) {
-            // Copy message into messages list.
-            // !TBD This should have been done earlier, somewhere
-            MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
-            builder << assertionResult.getMessage();
-            builder.m_info.message = builder.m_stream.str();
-
-            infoMessages.push_back( builder.m_info );
-        }
-    }
-
-     AssertionStats::~AssertionStats() = default;
-
-    SectionStats::SectionStats(  SectionInfo const& _sectionInfo,
-                                 Counts const& _assertions,
-                                 double _durationInSeconds,
-                                 bool _missingAssertions )
-    :   sectionInfo( _sectionInfo ),
-        assertions( _assertions ),
-        durationInSeconds( _durationInSeconds ),
-        missingAssertions( _missingAssertions )
-    {}
-
-    SectionStats::~SectionStats() = default;
-
-    TestCaseStats::TestCaseStats(  TestCaseInfo const& _testInfo,
-                                   Totals const& _totals,
-                                   std::string const& _stdOut,
-                                   std::string const& _stdErr,
-                                   bool _aborting )
-    : testInfo( _testInfo ),
-        totals( _totals ),
-        stdOut( _stdOut ),
-        stdErr( _stdErr ),
-        aborting( _aborting )
-    {}
-
-    TestCaseStats::~TestCaseStats() = default;
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo,
-                                    Totals const& _totals,
-                                    bool _aborting )
-    :   groupInfo( _groupInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestGroupStats::TestGroupStats( GroupInfo const& _groupInfo )
-    :   groupInfo( _groupInfo ),
-        aborting( false )
-    {}
-
-    TestGroupStats::~TestGroupStats() = default;
-
-    TestRunStats::TestRunStats(   TestRunInfo const& _runInfo,
-                    Totals const& _totals,
-                    bool _aborting )
-    :   runInfo( _runInfo ),
-        totals( _totals ),
-        aborting( _aborting )
-    {}
-
-    TestRunStats::~TestRunStats() = default;
-
-    void IStreamingReporter::fatalErrorEncountered( StringRef ) {}
-    bool IStreamingReporter::isMulti() const { return false; }
-
-    IReporterFactory::~IReporterFactory() = default;
-    IReporterRegistry::~IReporterRegistry() = default;
-
-} // end namespace Catch
-// end catch_interfaces_reporter.cpp
-// start catch_interfaces_runner.cpp
-
-namespace Catch {
-    IRunner::~IRunner() = default;
-}
-// end catch_interfaces_runner.cpp
-// start catch_interfaces_testcase.cpp
-
-namespace Catch {
-    ITestInvoker::~ITestInvoker() = default;
-    ITestCaseRegistry::~ITestCaseRegistry() = default;
-}
-// end catch_interfaces_testcase.cpp
-// start catch_leak_detector.cpp
-
-#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
-#include <crtdbg.h>
-
-namespace Catch {
-
-    LeakDetector::LeakDetector() {
-        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
-        flag |= _CRTDBG_LEAK_CHECK_DF;
-        flag |= _CRTDBG_ALLOC_MEM_DF;
-        _CrtSetDbgFlag(flag);
-        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
-        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-        // Change this to leaking allocation's number to break there
-        _CrtSetBreakAlloc(-1);
-    }
-}
-
-#else
-
-    Catch::LeakDetector::LeakDetector() {}
-
-#endif
-
-Catch::LeakDetector::~LeakDetector() {
-    Catch::cleanUp();
-}
-// end catch_leak_detector.cpp
-// start catch_list.cpp
-
-// start catch_list.h
-
-#include <set>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config );
-
-    std::size_t listTestsNamesOnly( Config const& config );
-
-    struct TagInfo {
-        void add( std::string const& spelling );
-        std::string all() const;
-
-        std::set<std::string> spellings;
-        std::size_t count = 0;
-    };
-
-    std::size_t listTags( Config const& config );
-
-    std::size_t listReporters();
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config );
-
-} // end namespace Catch
-
-// end catch_list.h
-// start catch_text.h
-
-namespace Catch {
-    using namespace clara::TextFlow;
-}
-
-// end catch_text.h
-#include <limits>
-#include <algorithm>
-#include <iomanip>
-
-namespace Catch {
-
-    std::size_t listTests( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Matching test cases:\n";
-        else {
-            Catch::cout() << "All available test cases:\n";
-        }
-
-        auto matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            Colour::Code colour = testCaseInfo.isHidden()
-                ? Colour::SecondaryText
-                : Colour::None;
-            Colour colourGuard( colour );
-
-            Catch::cout() << Column( testCaseInfo.name ).initialIndent( 2 ).indent( 4 ) << "\n";
-            if( config.verbosity() >= Verbosity::High ) {
-                Catch::cout() << Column( Catch::Detail::stringify( testCaseInfo.lineInfo ) ).indent(4) << std::endl;
-                std::string description = testCaseInfo.description;
-                if( description.empty() )
-                    description = "(NO DESCRIPTION)";
-                Catch::cout() << Column( description ).indent(4) << std::endl;
-            }
-            if( !testCaseInfo.tags.empty() )
-                Catch::cout() << Column( testCaseInfo.tagsAsString() ).indent( 6 ) << "\n";
-        }
-
-        if( !config.hasTestFilters() )
-            Catch::cout() << pluralise( matchedTestCases.size(), "test case" ) << '\n' << std::endl;
-        else
-            Catch::cout() << pluralise( matchedTestCases.size(), "matching test case" ) << '\n' << std::endl;
-        return matchedTestCases.size();
-    }
-
-    std::size_t listTestsNamesOnly( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        std::size_t matchedTests = 0;
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCaseInfo : matchedTestCases ) {
-            matchedTests++;
-            if( startsWith( testCaseInfo.name, '#' ) )
-               Catch::cout() << '"' << testCaseInfo.name << '"';
-            else
-               Catch::cout() << testCaseInfo.name;
-            if ( config.verbosity() >= Verbosity::High )
-                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
-            Catch::cout() << std::endl;
-        }
-        return matchedTests;
-    }
-
-    void TagInfo::add( std::string const& spelling ) {
-        ++count;
-        spellings.insert( spelling );
-    }
-
-    std::string TagInfo::all() const {
-        size_t size = 0;
-        for (auto const& spelling : spellings) {
-            // Add 2 for the brackes
-            size += spelling.size() + 2;
-        }
-
-        std::string out; out.reserve(size);
-        for (auto const& spelling : spellings) {
-            out += '[';
-            out += spelling;
-            out += ']';
-        }
-        return out;
-    }
-
-    std::size_t listTags( Config const& config ) {
-        TestSpec const& testSpec = config.testSpec();
-        if( config.hasTestFilters() )
-            Catch::cout() << "Tags for matching test cases:\n";
-        else {
-            Catch::cout() << "All available tags:\n";
-        }
-
-        std::map<std::string, TagInfo> tagCounts;
-
-        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
-        for( auto const& testCase : matchedTestCases ) {
-            for( auto const& tagName : testCase.getTestCaseInfo().tags ) {
-                std::string lcaseTagName = toLower( tagName );
-                auto countIt = tagCounts.find( lcaseTagName );
-                if( countIt == tagCounts.end() )
-                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
-                countIt->second.add( tagName );
-            }
-        }
-
-        for( auto const& tagCount : tagCounts ) {
-            ReusableStringStream rss;
-            rss << "  " << std::setw(2) << tagCount.second.count << "  ";
-            auto str = rss.str();
-            auto wrapper = Column( tagCount.second.all() )
-                                                    .initialIndent( 0 )
-                                                    .indent( str.size() )
-                                                    .width( CATCH_CONFIG_CONSOLE_WIDTH-10 );
-            Catch::cout() << str << wrapper << '\n';
-        }
-        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
-        return tagCounts.size();
-    }
-
-    std::size_t listReporters() {
-        Catch::cout() << "Available reporters:\n";
-        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
-        std::size_t maxNameLen = 0;
-        for( auto const& factoryKvp : factories )
-            maxNameLen = (std::max)( maxNameLen, factoryKvp.first.size() );
-
-        for( auto const& factoryKvp : factories ) {
-            Catch::cout()
-                    << Column( factoryKvp.first + ":" )
-                            .indent(2)
-                            .width( 5+maxNameLen )
-                    +  Column( factoryKvp.second->getDescription() )
-                            .initialIndent(0)
-                            .indent(2)
-                            .width( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 )
-                    << "\n";
-        }
-        Catch::cout() << std::endl;
-        return factories.size();
-    }
-
-    Option<std::size_t> list( std::shared_ptr<Config> const& config ) {
-        Option<std::size_t> listedCount;
-        getCurrentMutableContext().setConfig( config );
-        if( config->listTests() )
-            listedCount = listedCount.valueOr(0) + listTests( *config );
-        if( config->listTestNamesOnly() )
-            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( *config );
-        if( config->listTags() )
-            listedCount = listedCount.valueOr(0) + listTags( *config );
-        if( config->listReporters() )
-            listedCount = listedCount.valueOr(0) + listReporters();
-        return listedCount;
-    }
-
-} // end namespace Catch
-// end catch_list.cpp
-// start catch_matchers.cpp
-
-namespace Catch {
-namespace Matchers {
-    namespace Impl {
-
-        std::string MatcherUntypedBase::toString() const {
-            if( m_cachedToString.empty() )
-                m_cachedToString = describe();
-            return m_cachedToString;
-        }
-
-        MatcherUntypedBase::~MatcherUntypedBase() = default;
-
-    } // namespace Impl
-} // namespace Matchers
-
-using namespace Matchers;
-using Matchers::Impl::MatcherBase;
-
-} // namespace Catch
-// end catch_matchers.cpp
-// start catch_matchers_exception.cpp
-
-namespace Catch {
-namespace Matchers {
-namespace Exception {
-
-bool ExceptionMessageMatcher::match(std::exception const& ex) const {
-    return ex.what() == m_message;
-}
-
-std::string ExceptionMessageMatcher::describe() const {
-    return "exception message matches \"" + m_message + "\"";
-}
-
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
-}
-
-// namespace Exception
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_exception.cpp
-// start catch_matchers_floating.cpp
-
-// start catch_polyfills.hpp
-
-namespace Catch {
-    bool isnan(float f);
-    bool isnan(double d);
-}
-
-// end catch_polyfills.hpp
-// start catch_to_string.hpp
-
-#include <string>
-
-namespace Catch {
-    template <typename T>
-    std::string to_string(T const& t) {
-#if defined(CATCH_CONFIG_CPP11_TO_STRING)
-        return std::to_string(t);
-#else
-        ReusableStringStream rss;
-        rss << t;
-        return rss.str();
-#endif
-    }
-} // end namespace Catch
-
-// end catch_to_string.hpp
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
-#include <sstream>
-#include <type_traits>
-#include <iomanip>
-#include <limits>
-
-namespace Catch {
-namespace {
-
-    int32_t convert(float f) {
-        static_assert(sizeof(float) == sizeof(int32_t), "Important ULP matcher assumption violated");
-        int32_t i;
-        std::memcpy(&i, &f, sizeof(f));
-        return i;
-    }
-
-    int64_t convert(double d) {
-        static_assert(sizeof(double) == sizeof(int64_t), "Important ULP matcher assumption violated");
-        int64_t i;
-        std::memcpy(&i, &d, sizeof(d));
-        return i;
-    }
-
-    template <typename FP>
-    bool almostEqualUlps(FP lhs, FP rhs, uint64_t maxUlpDiff) {
-        // Comparison with NaN should always be false.
-        // This way we can rule it out before getting into the ugly details
-        if (Catch::isnan(lhs) || Catch::isnan(rhs)) {
-            return false;
-        }
-
-        auto lc = convert(lhs);
-        auto rc = convert(rhs);
-
-        if ((lc < 0) != (rc < 0)) {
-            // Potentially we can have +0 and -0
-            return lhs == rhs;
-        }
-
-        auto ulpDiff = std::abs(lc - rc);
-        return static_cast<uint64_t>(ulpDiff) <= maxUlpDiff;
-    }
-
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-
-    float nextafter(float x, float y) {
-        return ::nextafterf(x, y);
-    }
-
-    double nextafter(double x, double y) {
-        return ::nextafter(x, y);
-    }
-
-#endif // ^^^ CATCH_CONFIG_GLOBAL_NEXTAFTER ^^^
-
-template <typename FP>
-FP step(FP start, FP direction, uint64_t steps) {
-    for (uint64_t i = 0; i < steps; ++i) {
-#if defined(CATCH_CONFIG_GLOBAL_NEXTAFTER)
-        start = Catch::nextafter(start, direction);
-#else
-        start = std::nextafter(start, direction);
-#endif
-    }
-    return start;
-}
-
-// Performs equivalent check of std::fabs(lhs - rhs) <= margin
-// But without the subtraction to allow for INFINITY in comparison
-bool marginComparison(double lhs, double rhs, double margin) {
-    return (lhs + margin >= rhs) && (rhs + margin >= lhs);
-}
-
-template <typename FloatingPoint>
-void write(std::ostream& out, FloatingPoint num) {
-    out << std::scientific
-        << std::setprecision(std::numeric_limits<FloatingPoint>::max_digits10 - 1)
-        << num;
-}
-
-} // end anonymous namespace
-
-namespace Matchers {
-namespace Floating {
-
-    enum class FloatingPointKind : uint8_t {
-        Float,
-        Double
-    };
-
-    WithinAbsMatcher::WithinAbsMatcher(double target, double margin)
-        :m_target{ target }, m_margin{ margin } {
-        CATCH_ENFORCE(margin >= 0, "Invalid margin: " << margin << '.'
-            << " Margin has to be non-negative.");
-    }
-
-    // Performs equivalent check of std::fabs(lhs - rhs) <= margin
-    // But without the subtraction to allow for INFINITY in comparison
-    bool WithinAbsMatcher::match(double const& matchee) const {
-        return (matchee + m_margin >= m_target) && (m_target + m_margin >= matchee);
-    }
-
-    std::string WithinAbsMatcher::describe() const {
-        return "is within " + ::Catch::Detail::stringify(m_margin) + " of " + ::Catch::Detail::stringify(m_target);
-    }
-
-    WithinUlpsMatcher::WithinUlpsMatcher(double target, uint64_t ulps, FloatingPointKind baseType)
-        :m_target{ target }, m_ulps{ ulps }, m_type{ baseType } {
-        CATCH_ENFORCE(m_type == FloatingPointKind::Double
-                   || m_ulps < (std::numeric_limits<uint32_t>::max)(),
-            "Provided ULP is impossibly large for a float comparison.");
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-// Clang <3.5 reports on the default branch in the switch below
-#pragma clang diagnostic ignored "-Wunreachable-code"
-#endif
-
-    bool WithinUlpsMatcher::match(double const& matchee) const {
-        switch (m_type) {
-        case FloatingPointKind::Float:
-            return almostEqualUlps<float>(static_cast<float>(matchee), static_cast<float>(m_target), m_ulps);
-        case FloatingPointKind::Double:
-            return almostEqualUlps<double>(matchee, m_target, m_ulps);
-        default:
-            CATCH_INTERNAL_ERROR( "Unknown FloatingPointKind value" );
-        }
-    }
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
-
-    std::string WithinUlpsMatcher::describe() const {
-        std::stringstream ret;
-
-        ret << "is within " << m_ulps << " ULPs of ";
-
-        if (m_type == FloatingPointKind::Float) {
-            write(ret, static_cast<float>(m_target));
-            ret << 'f';
-        } else {
-            write(ret, m_target);
-        }
-
-        ret << " ([";
-        if (m_type == FloatingPointKind::Double) {
-            write(ret, step(m_target, static_cast<double>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(m_target, static_cast<double>( INFINITY), m_ulps));
-        } else {
-            // We have to cast INFINITY to float because of MinGW, see #1782
-            write(ret, step(static_cast<float>(m_target), static_cast<float>(-INFINITY), m_ulps));
-            ret << ", ";
-            write(ret, step(static_cast<float>(m_target), static_cast<float>( INFINITY), m_ulps));
-        }
-        ret << "])";
-
-        return ret.str();
-    }
-
-    WithinRelMatcher::WithinRelMatcher(double target, double epsilon):
-        m_target(target),
-        m_epsilon(epsilon){
-        CATCH_ENFORCE(m_epsilon >= 0., "Relative comparison with epsilon <  0 does not make sense.");
-        CATCH_ENFORCE(m_epsilon  < 1., "Relative comparison with epsilon >= 1 does not make sense.");
-    }
-
-    bool WithinRelMatcher::match(double const& matchee) const {
-        const auto relMargin = m_epsilon * (std::max)(std::fabs(matchee), std::fabs(m_target));
-        return marginComparison(matchee, m_target,
-                                std::isinf(relMargin)? 0 : relMargin);
-    }
-
-    std::string WithinRelMatcher::describe() const {
-        Catch::ReusableStringStream sstr;
-        sstr << "and " << m_target << " are within " << m_epsilon * 100. << "% of each other";
-        return sstr.str();
-    }
-
-}// namespace Floating
-
-Floating::WithinUlpsMatcher WithinULP(double target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Double);
-}
-
-Floating::WithinUlpsMatcher WithinULP(float target, uint64_t maxUlpDiff) {
-    return Floating::WithinUlpsMatcher(target, maxUlpDiff, Floating::FloatingPointKind::Float);
-}
-
-Floating::WithinAbsMatcher WithinAbs(double target, double margin) {
-    return Floating::WithinAbsMatcher(target, margin);
-}
-
-Floating::WithinRelMatcher WithinRel(double target, double eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(double target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<double>::epsilon() * 100);
-}
-
-Floating::WithinRelMatcher WithinRel(float target, float eps) {
-    return Floating::WithinRelMatcher(target, eps);
-}
-
-Floating::WithinRelMatcher WithinRel(float target) {
-    return Floating::WithinRelMatcher(target, std::numeric_limits<float>::epsilon() * 100);
-}
-
-} // namespace Matchers
-} // namespace Catch
-
-// end catch_matchers_floating.cpp
-// start catch_matchers_generic.cpp
-
-std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
-    if (desc.empty()) {
-        return "matches undescribed predicate";
-    } else {
-        return "matches predicate: \"" + desc + '"';
-    }
-}
-// end catch_matchers_generic.cpp
-// start catch_matchers_string.cpp
-
-#include <regex>
-
-namespace Catch {
-namespace Matchers {
-
-    namespace StdString {
-
-        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
-        :   m_caseSensitivity( caseSensitivity ),
-            m_str( adjustString( str ) )
-        {}
-        std::string CasedString::adjustString( std::string const& str ) const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? toLower( str )
-                   : str;
-        }
-        std::string CasedString::caseSensitivitySuffix() const {
-            return m_caseSensitivity == CaseSensitive::No
-                   ? " (case insensitive)"
-                   : std::string();
-        }
-
-        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
-        : m_comparator( comparator ),
-          m_operation( operation ) {
-        }
-
-        std::string StringMatcherBase::describe() const {
-            std::string description;
-            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
-                                        m_comparator.caseSensitivitySuffix().size());
-            description += m_operation;
-            description += ": \"";
-            description += m_comparator.m_str;
-            description += "\"";
-            description += m_comparator.caseSensitivitySuffix();
-            return description;
-        }
-
-        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
-
-        bool EqualsMatcher::match( std::string const& source ) const {
-            return m_comparator.adjustString( source ) == m_comparator.m_str;
-        }
-
-        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
-
-        bool ContainsMatcher::match( std::string const& source ) const {
-            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
-
-        bool StartsWithMatcher::match( std::string const& source ) const {
-            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
-
-        bool EndsWithMatcher::match( std::string const& source ) const {
-            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
-        }
-
-        RegexMatcher::RegexMatcher(std::string regex, CaseSensitive::Choice caseSensitivity): m_regex(std::move(regex)), m_caseSensitivity(caseSensitivity) {}
-
-        bool RegexMatcher::match(std::string const& matchee) const {
-            auto flags = std::regex::ECMAScript; // ECMAScript is the default syntax option anyway
-            if (m_caseSensitivity == CaseSensitive::Choice::No) {
-                flags |= std::regex::icase;
-            }
-            auto reg = std::regex(m_regex, flags);
-            return std::regex_match(matchee, reg);
-        }
-
-        std::string RegexMatcher::describe() const {
-            return "matches " + ::Catch::Detail::stringify(m_regex) + ((m_caseSensitivity == CaseSensitive::Choice::Yes)? " case sensitively" : " case insensitively");
-        }
-
-    } // namespace StdString
-
-    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
-        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
-    }
-
-    StdString::RegexMatcher Matches(std::string const& regex, CaseSensitive::Choice caseSensitivity) {
-        return StdString::RegexMatcher(regex, caseSensitivity);
-    }
-
-} // namespace Matchers
-} // namespace Catch
-// end catch_matchers_string.cpp
-// start catch_message.cpp
-
-// start catch_uncaught_exceptions.h
-
-namespace Catch {
-    bool uncaught_exceptions();
-} // end namespace Catch
-
-// end catch_uncaught_exceptions.h
-#include <cassert>
-#include <stack>
-
-namespace Catch {
-
-    MessageInfo::MessageInfo(   StringRef const& _macroName,
-                                SourceLineInfo const& _lineInfo,
-                                ResultWas::OfType _type )
-    :   macroName( _macroName ),
-        lineInfo( _lineInfo ),
-        type( _type ),
-        sequence( ++globalCount )
-    {}
-
-    bool MessageInfo::operator==( MessageInfo const& other ) const {
-        return sequence == other.sequence;
-    }
-
-    bool MessageInfo::operator<( MessageInfo const& other ) const {
-        return sequence < other.sequence;
-    }
-
-    // This may need protecting if threading support is added
-    unsigned int MessageInfo::globalCount = 0;
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    Catch::MessageBuilder::MessageBuilder( StringRef const& macroName,
-                                           SourceLineInfo const& lineInfo,
-                                           ResultWas::OfType type )
-        :m_info(macroName, lineInfo, type) {}
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
-    : m_info( builder.m_info ), m_moved()
-    {
-        m_info.message = builder.m_stream.str();
-        getResultCapture().pushScopedMessage( m_info );
-    }
-
-    ScopedMessage::ScopedMessage( ScopedMessage&& old )
-    : m_info( old.m_info ), m_moved()
-    {
-        old.m_moved = true;
-    }
-
-    ScopedMessage::~ScopedMessage() {
-        if ( !uncaught_exceptions() && !m_moved ){
-            getResultCapture().popScopedMessage(m_info);
-        }
-    }
-
-    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
-        auto trimmed = [&] (size_t start, size_t end) {
-            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
-                ++start;
-            }
-            while (names[end] == ',' || isspace(static_cast<unsigned char>(names[end]))) {
-                --end;
-            }
-            return names.substr(start, end - start + 1);
-        };
-        auto skipq = [&] (size_t start, char quote) {
-            for (auto i = start + 1; i < names.size() ; ++i) {
-                if (names[i] == quote)
-                    return i;
-                if (names[i] == '\\')
-                    ++i;
-            }
-            CATCH_INTERNAL_ERROR("CAPTURE parsing encountered unmatched quote");
-        };
-
-        size_t start = 0;
-        std::stack<char> openings;
-        for (size_t pos = 0; pos < names.size(); ++pos) {
-            char c = names[pos];
-            switch (c) {
-            case '[':
-            case '{':
-            case '(':
-            // It is basically impossible to disambiguate between
-            // comparison and start of template args in this context
-//            case '<':
-                openings.push(c);
-                break;
-            case ']':
-            case '}':
-            case ')':
-//           case '>':
-                openings.pop();
-                break;
-            case '"':
-            case '\'':
-                pos = skipq(pos, c);
-                break;
-            case ',':
-                if (start != pos && openings.empty()) {
-                    m_messages.emplace_back(macroName, lineInfo, resultType);
-                    m_messages.back().message = static_cast<std::string>(trimmed(start, pos));
-                    m_messages.back().message += " := ";
-                    start = pos;
-                }
-            }
-        }
-        assert(openings.empty() && "Mismatched openings");
-        m_messages.emplace_back(macroName, lineInfo, resultType);
-        m_messages.back().message = static_cast<std::string>(trimmed(start, names.size() - 1));
-        m_messages.back().message += " := ";
-    }
-    Capturer::~Capturer() {
-        if ( !uncaught_exceptions() ){
-            assert( m_captured == m_messages.size() );
-            for( size_t i = 0; i < m_captured; ++i  )
-                m_resultCapture.popScopedMessage( m_messages[i] );
-        }
-    }
-
-    void Capturer::captureValue( size_t index, std::string const& value ) {
-        assert( index < m_messages.size() );
-        m_messages[index].message += value;
-        m_resultCapture.pushScopedMessage( m_messages[index] );
-        m_captured++;
-    }
-
-} // end namespace Catch
-// end catch_message.cpp
-// start catch_output_redirect.cpp
-
-// start catch_output_redirect.h
-#ifndef TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-#define TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-
-#include <cstdio>
-#include <iosfwd>
-#include <string>
-
-namespace Catch {
-
-    class RedirectedStream {
-        std::ostream& m_originalStream;
-        std::ostream& m_redirectionStream;
-        std::streambuf* m_prevBuf;
-
-    public:
-        RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream );
-        ~RedirectedStream();
-    };
-
-    class RedirectedStdOut {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cout;
-    public:
-        RedirectedStdOut();
-        auto str() const -> std::string;
-    };
-
-    // StdErr has two constituent streams in C++, std::cerr and std::clog
-    // This means that we need to redirect 2 streams into 1 to keep proper
-    // order of writes
-    class RedirectedStdErr {
-        ReusableStringStream m_rss;
-        RedirectedStream m_cerr;
-        RedirectedStream m_clog;
-    public:
-        RedirectedStdErr();
-        auto str() const -> std::string;
-    };
-
-    class RedirectedStreams {
-    public:
-        RedirectedStreams(RedirectedStreams const&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams const&) = delete;
-        RedirectedStreams(RedirectedStreams&&) = delete;
-        RedirectedStreams& operator=(RedirectedStreams&&) = delete;
-
-        RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr);
-        ~RedirectedStreams();
-    private:
-        std::string& m_redirectedCout;
-        std::string& m_redirectedCerr;
-        RedirectedStdOut m_redirectedStdOut;
-        RedirectedStdErr m_redirectedStdErr;
-    };
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-    // Windows's implementation of std::tmpfile is terrible (it tries
-    // to create a file inside system folder, thus requiring elevated
-    // privileges for the binary), so we have to use tmpnam(_s) and
-    // create the file ourselves there.
-    class TempFile {
-    public:
-        TempFile(TempFile const&) = delete;
-        TempFile& operator=(TempFile const&) = delete;
-        TempFile(TempFile&&) = delete;
-        TempFile& operator=(TempFile&&) = delete;
-
-        TempFile();
-        ~TempFile();
-
-        std::FILE* getFile();
-        std::string getContents();
-
-    private:
-        std::FILE* m_file = nullptr;
-    #if defined(_MSC_VER)
-        char m_buffer[L_tmpnam] = { 0 };
-    #endif
-    };
-
-    class OutputRedirect {
-    public:
-        OutputRedirect(OutputRedirect const&) = delete;
-        OutputRedirect& operator=(OutputRedirect const&) = delete;
-        OutputRedirect(OutputRedirect&&) = delete;
-        OutputRedirect& operator=(OutputRedirect&&) = delete;
-
-        OutputRedirect(std::string& stdout_dest, std::string& stderr_dest);
-        ~OutputRedirect();
-
-    private:
-        int m_originalStdout = -1;
-        int m_originalStderr = -1;
-        TempFile m_stdoutFile;
-        TempFile m_stderrFile;
-        std::string& m_stdoutDest;
-        std::string& m_stderrDest;
-    };
-
-#endif
-
-} // end namespace Catch
-
-#endif // TWOBLUECUBES_CATCH_OUTPUT_REDIRECT_H
-// end catch_output_redirect.h
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <stdexcept>
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #include <io.h>      //_dup and _dup2
-    #define dup _dup
-    #define dup2 _dup2
-    #define fileno _fileno
-    #else
-    #include <unistd.h>  // dup and dup2
-    #endif
-#endif
-
-namespace Catch {
-
-    RedirectedStream::RedirectedStream( std::ostream& originalStream, std::ostream& redirectionStream )
-    :   m_originalStream( originalStream ),
-        m_redirectionStream( redirectionStream ),
-        m_prevBuf( m_originalStream.rdbuf() )
-    {
-        m_originalStream.rdbuf( m_redirectionStream.rdbuf() );
-    }
-
-    RedirectedStream::~RedirectedStream() {
-        m_originalStream.rdbuf( m_prevBuf );
-    }
-
-    RedirectedStdOut::RedirectedStdOut() : m_cout( Catch::cout(), m_rss.get() ) {}
-    auto RedirectedStdOut::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStdErr::RedirectedStdErr()
-    :   m_cerr( Catch::cerr(), m_rss.get() ),
-        m_clog( Catch::clog(), m_rss.get() )
-    {}
-    auto RedirectedStdErr::str() const -> std::string { return m_rss.str(); }
-
-    RedirectedStreams::RedirectedStreams(std::string& redirectedCout, std::string& redirectedCerr)
-    :   m_redirectedCout(redirectedCout),
-        m_redirectedCerr(redirectedCerr)
-    {}
-
-    RedirectedStreams::~RedirectedStreams() {
-        m_redirectedCout += m_redirectedStdOut.str();
-        m_redirectedCerr += m_redirectedStdErr.str();
-    }
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-
-#if defined(_MSC_VER)
-    TempFile::TempFile() {
-        if (tmpnam_s(m_buffer)) {
-            CATCH_RUNTIME_ERROR("Could not get a temp filename");
-        }
-        if (fopen_s(&m_file, m_buffer, "w")) {
-            char buffer[100];
-            if (strerror_s(buffer, errno)) {
-                CATCH_RUNTIME_ERROR("Could not translate errno to a string");
-            }
-            CATCH_RUNTIME_ERROR("Could not open the temp file: '" << m_buffer << "' because: " << buffer);
-        }
-    }
-#else
-    TempFile::TempFile() {
-        m_file = std::tmpfile();
-        if (!m_file) {
-            CATCH_RUNTIME_ERROR("Could not create a temp file.");
-        }
-    }
-
-#endif
-
-    TempFile::~TempFile() {
-         // TBD: What to do about errors here?
-         std::fclose(m_file);
-         // We manually create the file on Windows only, on Linux
-         // it will be autodeleted
-#if defined(_MSC_VER)
-         std::remove(m_buffer);
-#endif
-    }
-
-    FILE* TempFile::getFile() {
-        return m_file;
-    }
-
-    std::string TempFile::getContents() {
-        std::stringstream sstr;
-        char buffer[100] = {};
-        std::rewind(m_file);
-        while (std::fgets(buffer, sizeof(buffer), m_file)) {
-            sstr << buffer;
-        }
-        return sstr.str();
-    }
-
-    OutputRedirect::OutputRedirect(std::string& stdout_dest, std::string& stderr_dest) :
-        m_originalStdout(dup(1)),
-        m_originalStderr(dup(2)),
-        m_stdoutDest(stdout_dest),
-        m_stderrDest(stderr_dest) {
-        dup2(fileno(m_stdoutFile.getFile()), 1);
-        dup2(fileno(m_stderrFile.getFile()), 2);
-    }
-
-    OutputRedirect::~OutputRedirect() {
-        Catch::cout() << std::flush;
-        fflush(stdout);
-        // Since we support overriding these streams, we flush cerr
-        // even though std::cerr is unbuffered
-        Catch::cerr() << std::flush;
-        Catch::clog() << std::flush;
-        fflush(stderr);
-
-        dup2(m_originalStdout, 1);
-        dup2(m_originalStderr, 2);
-
-        m_stdoutDest += m_stdoutFile.getContents();
-        m_stderrDest += m_stderrFile.getContents();
-    }
-
-#endif // CATCH_CONFIG_NEW_CAPTURE
-
-} // namespace Catch
-
-#if defined(CATCH_CONFIG_NEW_CAPTURE)
-    #if defined(_MSC_VER)
-    #undef dup
-    #undef dup2
-    #undef fileno
-    #endif
-#endif
-// end catch_output_redirect.cpp
-// start catch_polyfills.cpp
-
-#include <cmath>
-
-namespace Catch {
-
-#if !defined(CATCH_CONFIG_POLYFILL_ISNAN)
-    bool isnan(float f) {
-        return std::isnan(f);
-    }
-    bool isnan(double d) {
-        return std::isnan(d);
-    }
-#else
-    // For now we only use this for embarcadero
-    bool isnan(float f) {
-        return std::_isnan(f);
-    }
-    bool isnan(double d) {
-        return std::_isnan(d);
-    }
-#endif
-
-} // end namespace Catch
-// end catch_polyfills.cpp
-// start catch_random_number_generator.cpp
-
-namespace Catch {
-
-namespace {
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4146) // we negate uint32 during the rotate
-#endif
-        // Safe rotr implementation thanks to John Regehr
-        uint32_t rotate_right(uint32_t val, uint32_t count) {
-            const uint32_t mask = 31;
-            count &= mask;
-            return (val >> count) | (val << (-count & mask));
-        }
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-}
-
-    SimplePcg32::SimplePcg32(result_type seed_) {
-        seed(seed_);
-    }
-
-    void SimplePcg32::seed(result_type seed_) {
-        m_state = 0;
-        (*this)();
-        m_state += seed_;
-        (*this)();
-    }
-
-    void SimplePcg32::discard(uint64_t skip) {
-        // We could implement this to run in O(log n) steps, but this
-        // should suffice for our use case.
-        for (uint64_t s = 0; s < skip; ++s) {
-            static_cast<void>((*this)());
-        }
-    }
-
-    SimplePcg32::result_type SimplePcg32::operator()() {
-        // prepare the output value
-        const uint32_t xorshifted = static_cast<uint32_t>(((m_state >> 18u) ^ m_state) >> 27u);
-        const auto output = rotate_right(xorshifted, m_state >> 59u);
-
-        // advance state
-        m_state = m_state * 6364136223846793005ULL + s_inc;
-
-        return output;
-    }
-
-    bool operator==(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state == rhs.m_state;
-    }
-
-    bool operator!=(SimplePcg32 const& lhs, SimplePcg32 const& rhs) {
-        return lhs.m_state != rhs.m_state;
-    }
-}
-// end catch_random_number_generator.cpp
-// start catch_registry_hub.cpp
-
-// start catch_test_case_registry_impl.h
-
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <ios>
-
-namespace Catch {
-
-    class TestCase;
-    struct IConfig;
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
-
-    class TestRegistry : public ITestCaseRegistry {
-    public:
-        virtual ~TestRegistry() = default;
-
-        virtual void registerTest( TestCase const& testCase );
-
-        std::vector<TestCase> const& getAllTests() const override;
-        std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const override;
-
-    private:
-        std::vector<TestCase> m_functions;
-        mutable RunTests::InWhatOrder m_currentSortOrder = RunTests::InDeclarationOrder;
-        mutable std::vector<TestCase> m_sortedFunctions;
-        std::size_t m_unnamedCount = 0;
-        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    class TestInvokerAsFunction : public ITestInvoker {
-        void(*m_testAsFunction)();
-    public:
-        TestInvokerAsFunction( void(*testAsFunction)() ) noexcept;
-
-        void invoke() const override;
-    };
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName );
-
-    ///////////////////////////////////////////////////////////////////////////
-
-} // end namespace Catch
-
-// end catch_test_case_registry_impl.h
-// start catch_reporter_registry.h
-
-#include <map>
-
-namespace Catch {
-
-    class ReporterRegistry : public IReporterRegistry {
-
-    public:
-
-        ~ReporterRegistry() override;
-
-        IStreamingReporterPtr create( std::string const& name, IConfigPtr const& config ) const override;
-
-        void registerReporter( std::string const& name, IReporterFactoryPtr const& factory );
-        void registerListener( IReporterFactoryPtr const& factory );
-
-        FactoryMap const& getFactories() const override;
-        Listeners const& getListeners() const override;
-
-    private:
-        FactoryMap m_factories;
-        Listeners m_listeners;
-    };
-}
-
-// end catch_reporter_registry.h
-// start catch_tag_alias_registry.h
-
-// start catch_tag_alias.h
-
-#include <string>
-
-namespace Catch {
-
-    struct TagAlias {
-        TagAlias(std::string const& _tag, SourceLineInfo _lineInfo);
-
-        std::string tag;
-        SourceLineInfo lineInfo;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias.h
-#include <map>
-
-namespace Catch {
-
-    class TagAliasRegistry : public ITagAliasRegistry {
-    public:
-        ~TagAliasRegistry() override;
-        TagAlias const* find( std::string const& alias ) const override;
-        std::string expandAliases( std::string const& unexpandedTestSpec ) const override;
-        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
-
-    private:
-        std::map<std::string, TagAlias> m_registry;
-    };
-
-} // end namespace Catch
-
-// end catch_tag_alias_registry.h
-// start catch_startup_exception_registry.h
-
-#include <vector>
-#include <exception>
-
-namespace Catch {
-
-    class StartupExceptionRegistry {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-    public:
-        void add(std::exception_ptr const& exception) noexcept;
-        std::vector<std::exception_ptr> const& getExceptions() const noexcept;
-    private:
-        std::vector<std::exception_ptr> m_exceptions;
-#endif
-    };
-
-} // end namespace Catch
-
-// end catch_startup_exception_registry.h
-// start catch_singletons.hpp
-
-namespace Catch {
-
-    struct ISingleton {
-        virtual ~ISingleton();
-    };
-
-    void addSingleton( ISingleton* singleton );
-    void cleanupSingletons();
-
-    template<typename SingletonImplT, typename InterfaceT = SingletonImplT, typename MutableInterfaceT = InterfaceT>
-    class Singleton : SingletonImplT, public ISingleton {
-
-        static auto getInternal() -> Singleton* {
-            static Singleton* s_instance = nullptr;
-            if( !s_instance ) {
-                s_instance = new Singleton;
-                addSingleton( s_instance );
-            }
-            return s_instance;
-        }
-
-    public:
-        static auto get() -> InterfaceT const& {
-            return *getInternal();
-        }
-        static auto getMutable() -> MutableInterfaceT& {
-            return *getInternal();
-        }
-    };
-
-} // namespace Catch
-
-// end catch_singletons.hpp
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub, public IMutableRegistryHub,
-                            private NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            IReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerReporter( name, factory );
-            }
-            void registerListener( IReporterFactoryPtr const& factory ) override {
-                m_reporterRegistry.registerListener( factory );
-            }
-            void registerTest( TestCase const& testInfo ) override {
-                m_testCaseRegistry.registerTest( testInfo );
-            }
-            void registerTranslator( const IExceptionTranslator* translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( translator );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                m_exceptionRegistry.add(std::current_exception());
-#else
-                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-#endif
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-} // end namespace Catch
-// end catch_registry_hub.cpp
-// start catch_reporter_registry.cpp
-
-namespace Catch {
-
-    ReporterRegistry::~ReporterRegistry() = default;
-
-    IStreamingReporterPtr ReporterRegistry::create( std::string const& name, IConfigPtr const& config ) const {
-        auto it =  m_factories.find( name );
-        if( it == m_factories.end() )
-            return nullptr;
-        return it->second->create( ReporterConfig( config ) );
-    }
-
-    void ReporterRegistry::registerReporter( std::string const& name, IReporterFactoryPtr const& factory ) {
-        m_factories.emplace(name, factory);
-    }
-    void ReporterRegistry::registerListener( IReporterFactoryPtr const& factory ) {
-        m_listeners.push_back( factory );
-    }
-
-    IReporterRegistry::FactoryMap const& ReporterRegistry::getFactories() const {
-        return m_factories;
-    }
-    IReporterRegistry::Listeners const& ReporterRegistry::getListeners() const {
-        return m_listeners;
-    }
-
-}
-// end catch_reporter_registry.cpp
-// start catch_result_type.cpp
-
-namespace Catch {
-
-    bool isOk( ResultWas::OfType resultType ) {
-        return ( resultType & ResultWas::FailureBit ) == 0;
-    }
-    bool isJustInfo( int flags ) {
-        return flags == ResultWas::Info;
-    }
-
-    ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
-        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
-    }
-
-    bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
-    bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
-
-} // end namespace Catch
-// end catch_result_type.cpp
-// start catch_run_context.cpp
-
-#include <cassert>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace Generators {
-        struct GeneratorTracker : TestCaseTracking::TrackerBase, IGeneratorTracker {
-            GeneratorBasePtr m_generator;
-
-            GeneratorTracker( TestCaseTracking::NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-            :   TrackerBase( nameAndLocation, ctx, parent )
-            {}
-            ~GeneratorTracker();
-
-            static GeneratorTracker& acquire( TrackerContext& ctx, TestCaseTracking::NameAndLocation const& nameAndLocation ) {
-                std::shared_ptr<GeneratorTracker> tracker;
-
-                ITracker& currentTracker = ctx.currentTracker();
-                // Under specific circumstances, the generator we want
-                // to acquire is also the current tracker. If this is
-                // the case, we have to avoid looking through current
-                // tracker's children, and instead return the current
-                // tracker.
-                // A case where this check is important is e.g.
-                //     for (int i = 0; i < 5; ++i) {
-                //         int n = GENERATE(1, 2);
-                //     }
-                //
-                // without it, the code above creates 5 nested generators.
-                if (currentTracker.nameAndLocation() == nameAndLocation) {
-                    auto thisTracker = currentTracker.parent().findChild(nameAndLocation);
-                    assert(thisTracker);
-                    assert(thisTracker->isGeneratorTracker());
-                    tracker = std::static_pointer_cast<GeneratorTracker>(thisTracker);
-                } else if ( TestCaseTracking::ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-                    assert( childTracker );
-                    assert( childTracker->isGeneratorTracker() );
-                    tracker = std::static_pointer_cast<GeneratorTracker>( childTracker );
-                } else {
-                    tracker = std::make_shared<GeneratorTracker>( nameAndLocation, ctx, &currentTracker );
-                    currentTracker.addChild( tracker );
-                }
-
-                if( !ctx.completedCycle() && !tracker->isComplete() ) {
-                    tracker->open();
-                }
-
-                return *tracker;
-            }
-
-            // TrackerBase interface
-            bool isGeneratorTracker() const override { return true; }
-            auto hasGenerator() const -> bool override {
-                return !!m_generator;
-            }
-            void close() override {
-                TrackerBase::close();
-                // Generator interface only finds out if it has another item on atual move
-                if (m_runState == CompletedSuccessfully && m_generator->next()) {
-                    m_children.clear();
-                    m_runState = Executing;
-                }
-            }
-
-            // IGeneratorTracker interface
-            auto getGenerator() const -> GeneratorBasePtr const& override {
-                return m_generator;
-            }
-            void setGenerator( GeneratorBasePtr&& generator ) override {
-                m_generator = std::move( generator );
-            }
-        };
-        GeneratorTracker::~GeneratorTracker() {}
-    }
-
-    RunContext::RunContext(IConfigPtr const& _config, IStreamingReporterPtr&& reporter)
-    :   m_runInfo(_config->name()),
-        m_context(getCurrentMutableContext()),
-        m_config(_config),
-        m_reporter(std::move(reporter)),
-        m_lastAssertionInfo{ StringRef(), SourceLineInfo("",0), StringRef(), ResultDisposition::Normal },
-        m_includeSuccessfulResults( m_config->includeSuccessfulResults() || m_reporter->getPreferences().shouldReportAllAssertions )
-    {
-        m_context.setRunner(this);
-        m_context.setConfig(m_config);
-        m_context.setResultCapture(this);
-        m_reporter->testRunStarting(m_runInfo);
-    }
-
-    RunContext::~RunContext() {
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, aborting()));
-    }
-
-    void RunContext::testGroupStarting(std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupStarting(GroupInfo(testSpec, groupIndex, groupsCount));
-    }
-
-    void RunContext::testGroupEnded(std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount) {
-        m_reporter->testGroupEnded(TestGroupStats(GroupInfo(testSpec, groupIndex, groupsCount), totals, aborting()));
-    }
-
-    Totals RunContext::runTest(TestCase const& testCase) {
-        Totals prevTotals = m_totals;
-
-        std::string redirectedCout;
-        std::string redirectedCerr;
-
-        auto const& testInfo = testCase.getTestCaseInfo();
-
-        m_reporter->testCaseStarting(testInfo);
-
-        m_activeTestCase = &testCase;
-
-        ITracker& rootTracker = m_trackerContext.startRun();
-        assert(rootTracker.isSectionTracker());
-        static_cast<SectionTracker&>(rootTracker).addInitialFilters(m_config->getSectionsToRun());
-        do {
-            m_trackerContext.startCycle();
-            m_testCaseTracker = &SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(testInfo.name, testInfo.lineInfo));
-            runCurrentTest(redirectedCout, redirectedCerr);
-        } while (!m_testCaseTracker->isSuccessfullyCompleted() && !aborting());
-
-        Totals deltaTotals = m_totals.delta(prevTotals);
-        if (testInfo.expectedToFail() && deltaTotals.testCases.passed > 0) {
-            deltaTotals.assertions.failed++;
-            deltaTotals.testCases.passed--;
-            deltaTotals.testCases.failed++;
-        }
-        m_totals.testCases += deltaTotals.testCases;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  redirectedCout,
-                                  redirectedCerr,
-                                  aborting()));
-
-        m_activeTestCase = nullptr;
-        m_testCaseTracker = nullptr;
-
-        return deltaTotals;
-    }
-
-    IConfigPtr RunContext::config() const {
-        return m_config;
-    }
-
-    IStreamingReporter& RunContext::reporter() const {
-        return *m_reporter;
-    }
-
-    void RunContext::assertionEnded(AssertionResult const & result) {
-        if (result.getResultType() == ResultWas::Ok) {
-            m_totals.assertions.passed++;
-            m_lastAssertionPassed = true;
-        } else if (!result.isOk()) {
-            m_lastAssertionPassed = false;
-            if( m_activeTestCase->getTestCaseInfo().okToFail() )
-                m_totals.assertions.failedButOk++;
-            else
-                m_totals.assertions.failed++;
-        }
-        else {
-            m_lastAssertionPassed = true;
-        }
-
-        // We have no use for the return value (whether messages should be cleared), because messages were made scoped
-        // and should be let to clear themselves out.
-        static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
-
-        if (result.getResultType() != ResultWas::Warning)
-            m_messageScopes.clear();
-
-        // Reset working state
-        resetAssertionInfo();
-        m_lastResult = result;
-    }
-    void RunContext::resetAssertionInfo() {
-        m_lastAssertionInfo.macroName = StringRef();
-        m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}"_sr;
-    }
-
-    bool RunContext::sectionStarted(SectionInfo const & sectionInfo, Counts & assertions) {
-        ITracker& sectionTracker = SectionTracker::acquire(m_trackerContext, TestCaseTracking::NameAndLocation(sectionInfo.name, sectionInfo.lineInfo));
-        if (!sectionTracker.isOpen())
-            return false;
-        m_activeSections.push_back(&sectionTracker);
-
-        m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
-
-        m_reporter->sectionStarting(sectionInfo);
-
-        assertions = m_totals.assertions;
-
-        return true;
-    }
-    auto RunContext::acquireGeneratorTracker( StringRef generatorName, SourceLineInfo const& lineInfo ) -> IGeneratorTracker& {
-        using namespace Generators;
-        GeneratorTracker& tracker = GeneratorTracker::acquire(m_trackerContext,
-                                                              TestCaseTracking::NameAndLocation( static_cast<std::string>(generatorName), lineInfo ) );
-        assert( tracker.isOpen() );
-        m_lastAssertionInfo.lineInfo = lineInfo;
-        return tracker;
-    }
-
-    bool RunContext::testForMissingAssertions(Counts& assertions) {
-        if (assertions.total() != 0)
-            return false;
-        if (!m_config->warnAboutMissingAssertions())
-            return false;
-        if (m_trackerContext.currentTracker().hasChildren())
-            return false;
-        m_totals.assertions.failed++;
-        assertions.failed++;
-        return true;
-    }
-
-    void RunContext::sectionEnded(SectionEndInfo const & endInfo) {
-        Counts assertions = m_totals.assertions - endInfo.prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        if (!m_activeSections.empty()) {
-            m_activeSections.back()->close();
-            m_activeSections.pop_back();
-        }
-
-        m_reporter->sectionEnded(SectionStats(endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions));
-        m_messages.clear();
-        m_messageScopes.clear();
-    }
-
-    void RunContext::sectionEndedEarly(SectionEndInfo const & endInfo) {
-        if (m_unfinishedSections.empty())
-            m_activeSections.back()->fail();
-        else
-            m_activeSections.back()->close();
-        m_activeSections.pop_back();
-
-        m_unfinishedSections.push_back(endInfo);
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void RunContext::benchmarkPreparing(std::string const& name) {
-        m_reporter->benchmarkPreparing(name);
-    }
-    void RunContext::benchmarkStarting( BenchmarkInfo const& info ) {
-        m_reporter->benchmarkStarting( info );
-    }
-    void RunContext::benchmarkEnded( BenchmarkStats<> const& stats ) {
-        m_reporter->benchmarkEnded( stats );
-    }
-    void RunContext::benchmarkFailed(std::string const & error) {
-        m_reporter->benchmarkFailed(error);
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void RunContext::pushScopedMessage(MessageInfo const & message) {
-        m_messages.push_back(message);
-    }
-
-    void RunContext::popScopedMessage(MessageInfo const & message) {
-        m_messages.erase(std::remove(m_messages.begin(), m_messages.end(), message), m_messages.end());
-    }
-
-    void RunContext::emplaceUnscopedMessage( MessageBuilder const& builder ) {
-        m_messageScopes.emplace_back( builder );
-    }
-
-    std::string RunContext::getCurrentTestName() const {
-        return m_activeTestCase
-            ? m_activeTestCase->getTestCaseInfo().name
-            : std::string();
-    }
-
-    const AssertionResult * RunContext::getLastResult() const {
-        return &(*m_lastResult);
-    }
-
-    void RunContext::exceptionEarlyReported() {
-        m_shouldReportUnexpected = false;
-    }
-
-    void RunContext::handleFatalErrorCondition( StringRef message ) {
-        // First notify reporter that bad things happened
-        m_reporter->fatalErrorEncountered(message);
-
-        // Don't rebuild the result -- the stringification itself can cause more fatal errors
-        // Instead, fake a result data.
-        AssertionResultData tempResult( ResultWas::FatalErrorCondition, { false } );
-        tempResult.message = static_cast<std::string>(message);
-        AssertionResult result(m_lastAssertionInfo, tempResult);
-
-        assertionEnded(result);
-
-        handleUnfinishedSections();
-
-        // Recreate section for test case (as we will lose the one that was in scope)
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-
-        Counts assertions;
-        assertions.failed = 1;
-        SectionStats testCaseSectionStats(testCaseSection, assertions, 0, false);
-        m_reporter->sectionEnded(testCaseSectionStats);
-
-        auto const& testInfo = m_activeTestCase->getTestCaseInfo();
-
-        Totals deltaTotals;
-        deltaTotals.testCases.failed = 1;
-        deltaTotals.assertions.failed = 1;
-        m_reporter->testCaseEnded(TestCaseStats(testInfo,
-                                  deltaTotals,
-                                  std::string(),
-                                  std::string(),
-                                  false));
-        m_totals.testCases.failed++;
-        testGroupEnded(std::string(), m_totals, 1, 1);
-        m_reporter->testRunEnded(TestRunStats(m_runInfo, m_totals, false));
-    }
-
-    bool RunContext::lastAssertionPassed() {
-         return m_lastAssertionPassed;
-    }
-
-    void RunContext::assertionPassed() {
-        m_lastAssertionPassed = true;
-        ++m_totals.assertions.passed;
-        resetAssertionInfo();
-        m_messageScopes.clear();
-    }
-
-    bool RunContext::aborting() const {
-        return m_totals.assertions.failed >= static_cast<std::size_t>(m_config->abortAfter());
-    }
-
-    void RunContext::runCurrentTest(std::string & redirectedCout, std::string & redirectedCerr) {
-        auto const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
-        SectionInfo testCaseSection(testCaseInfo.lineInfo, testCaseInfo.name);
-        m_reporter->sectionStarting(testCaseSection);
-        Counts prevAssertions = m_totals.assertions;
-        double duration = 0;
-        m_shouldReportUnexpected = true;
-        m_lastAssertionInfo = { "TEST_CASE"_sr, testCaseInfo.lineInfo, StringRef(), ResultDisposition::Normal };
-
-        seedRng(*m_config);
-
-        Timer timer;
-        CATCH_TRY {
-            if (m_reporter->getPreferences().shouldRedirectStdOut) {
-#if !defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
-                RedirectedStreams redirectedStreams(redirectedCout, redirectedCerr);
-
-                timer.start();
-                invokeActiveTestCase();
-#else
-                OutputRedirect r(redirectedCout, redirectedCerr);
-                timer.start();
-                invokeActiveTestCase();
-#endif
-            } else {
-                timer.start();
-                invokeActiveTestCase();
-            }
-            duration = timer.getElapsedSeconds();
-        } CATCH_CATCH_ANON (TestFailureException&) {
-            // This just means the test was aborted due to failure
-        } CATCH_CATCH_ALL {
-            // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
-            // are reported without translation at the point of origin.
-            if( m_shouldReportUnexpected ) {
-                AssertionReaction dummyReaction;
-                handleUnexpectedInflightException( m_lastAssertionInfo, translateActiveException(), dummyReaction );
-            }
-        }
-        Counts assertions = m_totals.assertions - prevAssertions;
-        bool missingAssertions = testForMissingAssertions(assertions);
-
-        m_testCaseTracker->close();
-        handleUnfinishedSections();
-        m_messages.clear();
-        m_messageScopes.clear();
-
-        SectionStats testCaseSectionStats(testCaseSection, assertions, duration, missingAssertions);
-        m_reporter->sectionEnded(testCaseSectionStats);
-    }
-
-    void RunContext::invokeActiveTestCase() {
-        FatalConditionHandler fatalConditionHandler; // Handle signals
-        m_activeTestCase->invoke();
-        fatalConditionHandler.reset();
-    }
-
-    void RunContext::handleUnfinishedSections() {
-        // If sections ended prematurely due to an exception we stored their
-        // infos here so we can tear them down outside the unwind process.
-        for (auto it = m_unfinishedSections.rbegin(),
-             itEnd = m_unfinishedSections.rend();
-             it != itEnd;
-             ++it)
-            sectionEnded(*it);
-        m_unfinishedSections.clear();
-    }
-
-    void RunContext::handleExpr(
-        AssertionInfo const& info,
-        ITransientExpression const& expr,
-        AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        bool negated = isFalseTest( info.resultDisposition );
-        bool result = expr.getResult() != negated;
-
-        if( result ) {
-            if (!m_includeSuccessfulResults) {
-                assertionPassed();
-            }
-            else {
-                reportExpr(info, ResultWas::Ok, &expr, negated);
-            }
-        }
-        else {
-            reportExpr(info, ResultWas::ExpressionFailed, &expr, negated );
-            populateReaction( reaction );
-        }
-    }
-    void RunContext::reportExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            ITransientExpression const *expr,
-            bool negated ) {
-
-        m_lastAssertionInfo = info;
-        AssertionResultData data( resultType, LazyExpression( negated ) );
-
-        AssertionResult assertionResult{ info, data };
-        assertionResult.m_resultData.lazyExpression.m_transientExpression = expr;
-
-        assertionEnded( assertionResult );
-    }
-
-    void RunContext::handleMessage(
-            AssertionInfo const& info,
-            ResultWas::OfType resultType,
-            StringRef const& message,
-            AssertionReaction& reaction
-    ) {
-        m_reporter->assertionStarting( info );
-
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        data.message = static_cast<std::string>(message);
-        AssertionResult assertionResult{ m_lastAssertionInfo, data };
-        assertionEnded( assertionResult );
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-    void RunContext::handleUnexpectedExceptionNotThrown(
-            AssertionInfo const& info,
-            AssertionReaction& reaction
-    ) {
-        handleNonExpr(info, Catch::ResultWas::DidntThrowException, reaction);
-    }
-
-    void RunContext::handleUnexpectedInflightException(
-            AssertionInfo const& info,
-            std::string const& message,
-            AssertionReaction& reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = message;
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-        populateReaction( reaction );
-    }
-
-    void RunContext::populateReaction( AssertionReaction& reaction ) {
-        reaction.shouldDebugBreak = m_config->shouldDebugBreak();
-        reaction.shouldThrow = aborting() || (m_lastAssertionInfo.resultDisposition & ResultDisposition::Normal);
-    }
-
-    void RunContext::handleIncomplete(
-            AssertionInfo const& info
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( ResultWas::ThrewException, LazyExpression( false ) );
-        data.message = "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-    }
-    void RunContext::handleNonExpr(
-            AssertionInfo const &info,
-            ResultWas::OfType resultType,
-            AssertionReaction &reaction
-    ) {
-        m_lastAssertionInfo = info;
-
-        AssertionResultData data( resultType, LazyExpression( false ) );
-        AssertionResult assertionResult{ info, data };
-        assertionEnded( assertionResult );
-
-        if( !assertionResult.isOk() )
-            populateReaction( reaction );
-    }
-
-    IResultCapture& getResultCapture() {
-        if (auto* capture = getCurrentContext().getResultCapture())
-            return *capture;
-        else
-            CATCH_INTERNAL_ERROR("No result capture instance");
-    }
-
-    void seedRng(IConfig const& config) {
-        if (config.rngSeed() != 0) {
-            std::srand(config.rngSeed());
-            rng().seed(config.rngSeed());
-        }
-    }
-
-    unsigned int rngSeed() {
-        return getCurrentContext().getConfig()->rngSeed();
-    }
-
-}
-// end catch_run_context.cpp
-// start catch_section.cpp
-
-namespace Catch {
-
-    Section::Section( SectionInfo const& info )
-    :   m_info( info ),
-        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
-    {
-        m_timer.start();
-    }
-
-    Section::~Section() {
-        if( m_sectionIncluded ) {
-            SectionEndInfo endInfo{ m_info, m_assertions, m_timer.getElapsedSeconds() };
-            if( uncaught_exceptions() )
-                getResultCapture().sectionEndedEarly( endInfo );
-            else
-                getResultCapture().sectionEnded( endInfo );
-        }
-    }
-
-    // This indicates whether the section should be executed or not
-    Section::operator bool() const {
-        return m_sectionIncluded;
-    }
-
-} // end namespace Catch
-// end catch_section.cpp
-// start catch_section_info.cpp
-
-namespace Catch {
-
-    SectionInfo::SectionInfo
-        (   SourceLineInfo const& _lineInfo,
-            std::string const& _name )
-    :   name( _name ),
-        lineInfo( _lineInfo )
-    {}
-
-} // end namespace Catch
-// end catch_section_info.cpp
-// start catch_session.cpp
-
-// start catch_session.h
-
-#include <memory>
-
-namespace Catch {
-
-    class Session : NonCopyable {
-    public:
-
-        Session();
-        ~Session() override;
-
-        void showHelp() const;
-        void libIdentify();
-
-        int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-        int applyCommandLine( int argc, wchar_t const * const * argv );
-    #endif
-
-        void useConfigData( ConfigData const& configData );
-
-        template<typename CharT>
-        int run(int argc, CharT const * const argv[]) {
-            if (m_startupExceptions)
-                return 1;
-            int returnCode = applyCommandLine(argc, argv);
-            if (returnCode == 0)
-                returnCode = run();
-            return returnCode;
-        }
-
-        int run();
-
-        clara::Parser const& cli() const;
-        void cli( clara::Parser const& newParser );
-        ConfigData& configData();
-        Config& config();
-    private:
-        int runInternal();
-
-        clara::Parser m_cli;
-        ConfigData m_configData;
-        std::shared_ptr<Config> m_config;
-        bool m_startupExceptions = false;
-    };
-
-} // end namespace Catch
-
-// end catch_session.h
-// start catch_version.h
-
-#include <iosfwd>
-
-namespace Catch {
-
-    // Versioning information
-    struct Version {
-        Version( Version const& ) = delete;
-        Version& operator=( Version const& ) = delete;
-        Version(    unsigned int _majorVersion,
-                    unsigned int _minorVersion,
-                    unsigned int _patchNumber,
-                    char const * const _branchName,
-                    unsigned int _buildNumber );
-
-        unsigned int const majorVersion;
-        unsigned int const minorVersion;
-        unsigned int const patchNumber;
-
-        // buildNumber is only used if branchName is not null
-        char const * const branchName;
-        unsigned int const buildNumber;
-
-        friend std::ostream& operator << ( std::ostream& os, Version const& version );
-    };
-
-    Version const& libraryVersion();
-}
-
-// end catch_version.h
-#include <cstdlib>
-#include <iomanip>
-#include <set>
-#include <iterator>
-
-namespace Catch {
-
-    namespace {
-        const int MaxExitCode = 255;
-
-        IStreamingReporterPtr createReporter(std::string const& reporterName, IConfigPtr const& config) {
-            auto reporter = Catch::getRegistryHub().getReporterRegistry().create(reporterName, config);
-            CATCH_ENFORCE(reporter, "No reporter registered with name: '" << reporterName << "'");
-
-            return reporter;
-        }
-
-        IStreamingReporterPtr makeReporter(std::shared_ptr<Config> const& config) {
-            if (Catch::getRegistryHub().getReporterRegistry().getListeners().empty()) {
-                return createReporter(config->getReporterName(), config);
-            }
-
-            // On older platforms, returning std::unique_ptr<ListeningReporter>
-            // when the return type is std::unique_ptr<IStreamingReporter>
-            // doesn't compile without a std::move call. However, this causes
-            // a warning on newer platforms. Thus, we have to work around
-            // it a bit and downcast the pointer manually.
-            auto ret = std::unique_ptr<IStreamingReporter>(new ListeningReporter);
-            auto& multi = static_cast<ListeningReporter&>(*ret);
-            auto const& listeners = Catch::getRegistryHub().getReporterRegistry().getListeners();
-            for (auto const& listener : listeners) {
-                multi.addListener(listener->create(Catch::ReporterConfig(config)));
-            }
-            multi.addReporter(createReporter(config->getReporterName(), config));
-            return ret;
-        }
-
-        class TestGroup {
-        public:
-            explicit TestGroup(std::shared_ptr<Config> const& config)
-            : m_config{config}
-            , m_context{config, makeReporter(config)}
-            {
-                auto const& allTestCases = getAllTestCasesSorted(*m_config);
-                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-
-                if (m_matches.empty() && invalidArgs.empty()) {
-                    for (auto const& test : allTestCases)
-                        if (!test.isHidden())
-                            m_tests.emplace(&test);
-                } else {
-                    for (auto const& match : m_matches)
-                        m_tests.insert(match.tests.begin(), match.tests.end());
-                }
-            }
-
-            Totals execute() {
-                auto const& invalidArgs = m_config->testSpec().getInvalidArgs();
-                Totals totals;
-                m_context.testGroupStarting(m_config->name(), 1, 1);
-                for (auto const& testCase : m_tests) {
-                    if (!m_context.aborting())
-                        totals += m_context.runTest(*testCase);
-                    else
-                        m_context.reporter().skipTest(*testCase);
-                }
-
-                for (auto const& match : m_matches) {
-                    if (match.tests.empty()) {
-                        m_context.reporter().noMatchingTestCases(match.name);
-                        totals.error = -1;
-                    }
-                }
-
-                if (!invalidArgs.empty()) {
-                    for (auto const& invalidArg: invalidArgs)
-                         m_context.reporter().reportInvalidArguments(invalidArg);
-                }
-
-                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
-                return totals;
-            }
-
-        private:
-            using Tests = std::set<TestCase const*>;
-
-            std::shared_ptr<Config> m_config;
-            RunContext m_context;
-            Tests m_tests;
-            TestSpec::Matches m_matches;
-        };
-
-        void applyFilenamesAsTags(Catch::IConfig const& config) {
-            auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
-            for (auto& testCase : tests) {
-                auto tags = testCase.tags;
-
-                std::string filename = testCase.lineInfo.file;
-                auto lastSlash = filename.find_last_of("\\/");
-                if (lastSlash != std::string::npos) {
-                    filename.erase(0, lastSlash);
-                    filename[0] = '#';
-                }
-
-                auto lastDot = filename.find_last_of('.');
-                if (lastDot != std::string::npos) {
-                    filename.erase(lastDot);
-                }
-
-                tags.push_back(std::move(filename));
-                setTags(testCase, tags);
-            }
-        }
-
-    } // anon namespace
-
-    Session::Session() {
-        static bool alreadyInstantiated = false;
-        if( alreadyInstantiated ) {
-            CATCH_TRY { CATCH_INTERNAL_ERROR( "Only one instance of Catch::Session can ever be used" ); }
-            CATCH_CATCH_ALL { getMutableRegistryHub().registerStartupException(); }
-        }
-
-        // There cannot be exceptions at startup in no-exception mode.
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        const auto& exceptions = getRegistryHub().getStartupExceptionRegistry().getExceptions();
-        if ( !exceptions.empty() ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-
-            m_startupExceptions = true;
-            Colour colourGuard( Colour::Red );
-            Catch::cerr() << "Errors occurred during startup!" << '\n';
-            // iterate over all exceptions and notify user
-            for ( const auto& ex_ptr : exceptions ) {
-                try {
-                    std::rethrow_exception(ex_ptr);
-                } catch ( std::exception const& ex ) {
-                    Catch::cerr() << Column( ex.what() ).indent(2) << '\n';
-                }
-            }
-        }
-#endif
-
-        alreadyInstantiated = true;
-        m_cli = makeCommandLineParser( m_configData );
-    }
-    Session::~Session() {
-        Catch::cleanUp();
-    }
-
-    void Session::showHelp() const {
-        Catch::cout()
-                << "\nCatch v" << libraryVersion() << "\n"
-                << m_cli << std::endl
-                << "For more detailed usage please see the project docs\n" << std::endl;
-    }
-    void Session::libIdentify() {
-        Catch::cout()
-                << std::left << std::setw(16) << "description: " << "A Catch2 test executable\n"
-                << std::left << std::setw(16) << "category: " << "testframework\n"
-                << std::left << std::setw(16) << "framework: " << "Catch Test\n"
-                << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
-    }
-
-    int Session::applyCommandLine( int argc, char const * const * argv ) {
-        if( m_startupExceptions )
-            return 1;
-
-        auto result = m_cli.parse( clara::Args( argc, argv ) );
-        if( !result ) {
-            config();
-            getCurrentMutableContext().setConfig(m_config);
-            Catch::cerr()
-                << Colour( Colour::Red )
-                << "\nError(s) in input:\n"
-                << Column( result.errorMessage() ).indent( 2 )
-                << "\n\n";
-            Catch::cerr() << "Run with -? for usage\n" << std::endl;
-            return MaxExitCode;
-        }
-
-        if( m_configData.showHelp )
-            showHelp();
-        if( m_configData.libIdentify )
-            libIdentify();
-        m_config.reset();
-        return 0;
-    }
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
-    int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
-
-        char **utf8Argv = new char *[ argc ];
-
-        for ( int i = 0; i < argc; ++i ) {
-            int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, nullptr, 0, nullptr, nullptr );
-
-            utf8Argv[ i ] = new char[ bufSize ];
-
-            WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, nullptr, nullptr );
-        }
-
-        int returnCode = applyCommandLine( argc, utf8Argv );
-
-        for ( int i = 0; i < argc; ++i )
-            delete [] utf8Argv[ i ];
-
-        delete [] utf8Argv;
-
-        return returnCode;
-    }
-#endif
-
-    void Session::useConfigData( ConfigData const& configData ) {
-        m_configData = configData;
-        m_config.reset();
-    }
-
-    int Session::run() {
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        int exitCode = runInternal();
-        if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
-            Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
-            static_cast<void>(std::getchar());
-        }
-        return exitCode;
-    }
-
-    clara::Parser const& Session::cli() const {
-        return m_cli;
-    }
-    void Session::cli( clara::Parser const& newParser ) {
-        m_cli = newParser;
-    }
-    ConfigData& Session::configData() {
-        return m_configData;
-    }
-    Config& Session::config() {
-        if( !m_config )
-            m_config = std::make_shared<Config>( m_configData );
-        return *m_config;
-    }
-
-    int Session::runInternal() {
-        if( m_startupExceptions )
-            return 1;
-
-        if (m_configData.showHelp || m_configData.libIdentify) {
-            return 0;
-        }
-
-        CATCH_TRY {
-            config(); // Force config to be constructed
-
-            seedRng( *m_config );
-
-            if( m_configData.filenamesAsTags )
-                applyFilenamesAsTags( *m_config );
-
-            // Handle list request
-            if( Option<std::size_t> listed = list( m_config ) )
-                return static_cast<int>( *listed );
-
-            TestGroup tests { m_config };
-            auto const totals = tests.execute();
-
-            if( m_config->warnAboutNoTests() && totals.error == -1 )
-                return 2;
-
-            // Note that on unices only the lower 8 bits are usually used, clamping
-            // the return value to 255 prevents false negative when some multiple
-            // of 256 tests has failed
-            return (std::min) (MaxExitCode, (std::max) (totals.error, static_cast<int>(totals.assertions.failed)));
-        }
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        catch( std::exception& ex ) {
-            Catch::cerr() << ex.what() << std::endl;
-            return MaxExitCode;
-        }
-#endif
-    }
-
-} // end namespace Catch
-// end catch_session.cpp
-// start catch_singletons.cpp
-
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        static auto getSingletons() -> std::vector<ISingleton*>*& {
-            static std::vector<ISingleton*>* g_singletons = nullptr;
-            if( !g_singletons )
-                g_singletons = new std::vector<ISingleton*>();
-            return g_singletons;
-        }
-    }
-
-    ISingleton::~ISingleton() {}
-
-    void addSingleton(ISingleton* singleton ) {
-        getSingletons()->push_back( singleton );
-    }
-    void cleanupSingletons() {
-        auto& singletons = getSingletons();
-        for( auto singleton : *singletons )
-            delete singleton;
-        delete singletons;
-        singletons = nullptr;
-    }
-
-} // namespace Catch
-// end catch_singletons.cpp
-// start catch_startup_exception_registry.cpp
-
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-namespace Catch {
-void StartupExceptionRegistry::add( std::exception_ptr const& exception ) noexcept {
-        CATCH_TRY {
-            m_exceptions.push_back(exception);
-        } CATCH_CATCH_ALL {
-            // If we run out of memory during start-up there's really not a lot more we can do about it
-            std::terminate();
-        }
-    }
-
-    std::vector<std::exception_ptr> const& StartupExceptionRegistry::getExceptions() const noexcept {
-        return m_exceptions;
-    }
-
-} // end namespace Catch
-#endif
-// end catch_startup_exception_registry.cpp
-// start catch_stream.cpp
-
-#include <cstdio>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    Catch::IStream::~IStream() = default;
-
-    namespace Detail { namespace {
-        template<typename WriterF, std::size_t bufferSize=256>
-        class StreamBufImpl : public std::streambuf {
-            char data[bufferSize];
-            WriterF m_writer;
-
-        public:
-            StreamBufImpl() {
-                setp( data, data + sizeof(data) );
-            }
-
-            ~StreamBufImpl() noexcept {
-                StreamBufImpl::sync();
-            }
-
-        private:
-            int overflow( int c ) override {
-                sync();
-
-                if( c != EOF ) {
-                    if( pbase() == epptr() )
-                        m_writer( std::string( 1, static_cast<char>( c ) ) );
-                    else
-                        sputc( static_cast<char>( c ) );
-                }
-                return 0;
-            }
-
-            int sync() override {
-                if( pbase() != pptr() ) {
-                    m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
-                    setp( pbase(), epptr() );
-                }
-                return 0;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        struct OutputDebugWriter {
-
-            void operator()( std::string const&str ) {
-                writeToDebugConsole( str );
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class FileStream : public IStream {
-            mutable std::ofstream m_ofs;
-        public:
-            FileStream( StringRef filename ) {
-                m_ofs.open( filename.c_str() );
-                CATCH_ENFORCE( !m_ofs.fail(), "Unable to open file: '" << filename << "'" );
-            }
-            ~FileStream() override = default;
-        public: // IStream
-            std::ostream& stream() const override {
-                return m_ofs;
-            }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class CoutStream : public IStream {
-            mutable std::ostream m_os;
-        public:
-            // Store the streambuf from cout up-front because
-            // cout may get redirected when running tests
-            CoutStream() : m_os( Catch::cout().rdbuf() ) {}
-            ~CoutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        class DebugOutStream : public IStream {
-            std::unique_ptr<StreamBufImpl<OutputDebugWriter>> m_streamBuf;
-            mutable std::ostream m_os;
-        public:
-            DebugOutStream()
-            :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
-                m_os( m_streamBuf.get() )
-            {}
-
-            ~DebugOutStream() override = default;
-
-        public: // IStream
-            std::ostream& stream() const override { return m_os; }
-        };
-
-    }} // namespace anon::detail
-
-    ///////////////////////////////////////////////////////////////////////////
-
-    auto makeStream( StringRef const &filename ) -> IStream const* {
-        if( filename.empty() )
-            return new Detail::CoutStream();
-        else if( filename[0] == '%' ) {
-            if( filename == "%debug" )
-                return new Detail::DebugOutStream();
-            else
-                CATCH_ERROR( "Unrecognised stream: '" << filename << "'" );
-        }
-        else
-            return new Detail::FileStream( filename );
-    }
-
-    // This class encapsulates the idea of a pool of ostringstreams that can be reused.
-    struct StringStreams {
-        std::vector<std::unique_ptr<std::ostringstream>> m_streams;
-        std::vector<std::size_t> m_unused;
-        std::ostringstream m_referenceStream; // Used for copy state/ flags from
-
-        auto add() -> std::size_t {
-            if( m_unused.empty() ) {
-                m_streams.push_back( std::unique_ptr<std::ostringstream>( new std::ostringstream ) );
-                return m_streams.size()-1;
-            }
-            else {
-                auto index = m_unused.back();
-                m_unused.pop_back();
-                return index;
-            }
-        }
-
-        void release( std::size_t index ) {
-            m_streams[index]->copyfmt( m_referenceStream ); // Restore initial flags and other state
-            m_unused.push_back(index);
-        }
-    };
-
-    ReusableStringStream::ReusableStringStream()
-    :   m_index( Singleton<StringStreams>::getMutable().add() ),
-        m_oss( Singleton<StringStreams>::getMutable().m_streams[m_index].get() )
-    {}
-
-    ReusableStringStream::~ReusableStringStream() {
-        static_cast<std::ostringstream*>( m_oss )->str("");
-        m_oss->clear();
-        Singleton<StringStreams>::getMutable().release( m_index );
-    }
-
-    auto ReusableStringStream::str() const -> std::string {
-        return static_cast<std::ostringstream*>( m_oss )->str();
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-
-#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
-    std::ostream& cout() { return std::cout; }
-    std::ostream& cerr() { return std::cerr; }
-    std::ostream& clog() { return std::clog; }
-#endif
-}
-// end catch_stream.cpp
-// start catch_string_manip.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cctype>
-#include <vector>
-
-namespace Catch {
-
-    namespace {
-        char toLowerCh(char c) {
-            return static_cast<char>( std::tolower( static_cast<unsigned char>(c) ) );
-        }
-    }
-
-    bool startsWith( std::string const& s, std::string const& prefix ) {
-        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
-    }
-    bool startsWith( std::string const& s, char prefix ) {
-        return !s.empty() && s[0] == prefix;
-    }
-    bool endsWith( std::string const& s, std::string const& suffix ) {
-        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
-    }
-    bool endsWith( std::string const& s, char suffix ) {
-        return !s.empty() && s[s.size()-1] == suffix;
-    }
-    bool contains( std::string const& s, std::string const& infix ) {
-        return s.find( infix ) != std::string::npos;
-    }
-    void toLowerInPlace( std::string& s ) {
-        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
-    }
-    std::string toLower( std::string const& s ) {
-        std::string lc = s;
-        toLowerInPlace( lc );
-        return lc;
-    }
-    std::string trim( std::string const& str ) {
-        static char const* whitespaceChars = "\n\r\t ";
-        std::string::size_type start = str.find_first_not_of( whitespaceChars );
-        std::string::size_type end = str.find_last_not_of( whitespaceChars );
-
-        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
-    }
-
-    StringRef trim(StringRef ref) {
-        const auto is_ws = [](char c) {
-            return c == ' ' || c == '\t' || c == '\n' || c == '\r';
-        };
-        size_t real_begin = 0;
-        while (real_begin < ref.size() && is_ws(ref[real_begin])) { ++real_begin; }
-        size_t real_end = ref.size();
-        while (real_end > real_begin && is_ws(ref[real_end - 1])) { --real_end; }
-
-        return ref.substr(real_begin, real_end - real_begin);
-    }
-
-    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
-        bool replaced = false;
-        std::size_t i = str.find( replaceThis );
-        while( i != std::string::npos ) {
-            replaced = true;
-            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
-            if( i < str.size()-withThis.size() )
-                i = str.find( replaceThis, i+withThis.size() );
-            else
-                i = std::string::npos;
-        }
-        return replaced;
-    }
-
-    std::vector<StringRef> splitStringRef( StringRef str, char delimiter ) {
-        std::vector<StringRef> subStrings;
-        std::size_t start = 0;
-        for(std::size_t pos = 0; pos < str.size(); ++pos ) {
-            if( str[pos] == delimiter ) {
-                if( pos - start > 1 )
-                    subStrings.push_back( str.substr( start, pos-start ) );
-                start = pos+1;
-            }
-        }
-        if( start < str.size() )
-            subStrings.push_back( str.substr( start, str.size()-start ) );
-        return subStrings;
-    }
-
-    pluralise::pluralise( std::size_t count, std::string const& label )
-    :   m_count( count ),
-        m_label( label )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
-        os << pluraliser.m_count << ' ' << pluraliser.m_label;
-        if( pluraliser.m_count != 1 )
-            os << 's';
-        return os;
-    }
-
-}
-// end catch_string_manip.cpp
-// start catch_stringref.cpp
-
-#include <algorithm>
-#include <ostream>
-#include <cstring>
-#include <cstdint>
-
-namespace Catch {
-    StringRef::StringRef( char const* rawChars ) noexcept
-    : StringRef( rawChars, static_cast<StringRef::size_type>(std::strlen(rawChars) ) )
-    {}
-
-    auto StringRef::c_str() const -> char const* {
-        CATCH_ENFORCE(isNullTerminated(), "Called StringRef::c_str() on a non-null-terminated instance");
-        return m_start;
-    }
-    auto StringRef::data() const noexcept -> char const* {
-        return m_start;
-    }
-
-    auto StringRef::substr( size_type start, size_type size ) const noexcept -> StringRef {
-        if (start < m_size) {
-            return StringRef(m_start + start, (std::min)(m_size - start, size));
-        } else {
-            return StringRef();
-        }
-    }
-    auto StringRef::operator == ( StringRef const& other ) const noexcept -> bool {
-        return m_size == other.m_size
-            && (std::memcmp( m_start, other.m_start, m_size ) == 0);
-    }
-
-    auto operator << ( std::ostream& os, StringRef const& str ) -> std::ostream& {
-        return os.write(str.data(), str.size());
-    }
-
-    auto operator+=( std::string& lhs, StringRef const& rhs ) -> std::string& {
-        lhs.append(rhs.data(), rhs.size());
-        return lhs;
-    }
-
-} // namespace Catch
-// end catch_stringref.cpp
-// start catch_tag_alias.cpp
-
-namespace Catch {
-    TagAlias::TagAlias(std::string const & _tag, SourceLineInfo _lineInfo): tag(_tag), lineInfo(_lineInfo) {}
-}
-// end catch_tag_alias.cpp
-// start catch_tag_alias_autoregistrar.cpp
-
-namespace Catch {
-
-    RegistrarForTagAliases::RegistrarForTagAliases(char const* alias, char const* tag, SourceLineInfo const& lineInfo) {
-        CATCH_TRY {
-            getMutableRegistryHub().registerTagAlias(alias, tag, lineInfo);
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-}
-// end catch_tag_alias_autoregistrar.cpp
-// start catch_tag_alias_registry.cpp
-
-#include <sstream>
-
-namespace Catch {
-
-    TagAliasRegistry::~TagAliasRegistry() {}
-
-    TagAlias const* TagAliasRegistry::find( std::string const& alias ) const {
-        auto it = m_registry.find( alias );
-        if( it != m_registry.end() )
-            return &(it->second);
-        else
-            return nullptr;
-    }
-
-    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
-        std::string expandedTestSpec = unexpandedTestSpec;
-        for( auto const& registryKvp : m_registry ) {
-            std::size_t pos = expandedTestSpec.find( registryKvp.first );
-            if( pos != std::string::npos ) {
-                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
-                                    registryKvp.second.tag +
-                                    expandedTestSpec.substr( pos + registryKvp.first.size() );
-            }
-        }
-        return expandedTestSpec;
-    }
-
-    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
-        CATCH_ENFORCE( startsWith(alias, "[@") && endsWith(alias, ']'),
-                      "error: tag alias, '" << alias << "' is not of the form [@alias name].\n" << lineInfo );
-
-        CATCH_ENFORCE( m_registry.insert(std::make_pair(alias, TagAlias(tag, lineInfo))).second,
-                      "error: tag alias, '" << alias << "' already registered.\n"
-                      << "\tFirst seen at: " << find(alias)->lineInfo << "\n"
-                      << "\tRedefined at: " << lineInfo );
-    }
-
-    ITagAliasRegistry::~ITagAliasRegistry() {}
-
-    ITagAliasRegistry const& ITagAliasRegistry::get() {
-        return getRegistryHub().getTagAliasRegistry();
-    }
-
-} // end namespace Catch
-// end catch_tag_alias_registry.cpp
-// start catch_test_case_info.cpp
-
-#include <cctype>
-#include <exception>
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-            if( startsWith( tag, '.' ) ||
-                tag == "!hide" )
-                return TestCaseInfo::IsHidden;
-            else if( tag == "!throws" )
-                return TestCaseInfo::Throws;
-            else if( tag == "!shouldfail" )
-                return TestCaseInfo::ShouldFail;
-            else if( tag == "!mayfail" )
-                return TestCaseInfo::MayFail;
-            else if( tag == "!nonportable" )
-                return TestCaseInfo::NonPortable;
-            else if( tag == "!benchmark" )
-                return static_cast<TestCaseInfo::SpecialProperties>( TestCaseInfo::Benchmark | TestCaseInfo::IsHidden );
-            else
-                return TestCaseInfo::None;
-        }
-        bool isReservedTag( std::string const& tag ) {
-            return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( static_cast<unsigned char>(tag[0]) );
-        }
-        void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
-            CATCH_ENFORCE( !isReservedTag(tag),
-                          "Tag name: [" << tag << "] is not allowed.\n"
-                          << "Tag names starting with non alphanumeric characters are reserved\n"
-                          << _lineInfo );
-        }
-    }
-
-    TestCase makeTestCase(  ITestInvoker* _testCase,
-                            std::string const& _className,
-                            NameAndTags const& nameAndTags,
-                            SourceLineInfo const& _lineInfo )
-    {
-        bool isHidden = false;
-
-        // Parse out tags
-        std::vector<std::string> tags;
-        std::string desc, tag;
-        bool inTag = false;
-        for (char c : nameAndTags.tags) {
-            if( !inTag ) {
-                if( c == '[' )
-                    inTag = true;
-                else
-                    desc += c;
-            }
-            else {
-                if( c == ']' ) {
-                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
-                    if( ( prop & TestCaseInfo::IsHidden ) != 0 )
-                        isHidden = true;
-                    else if( prop == TestCaseInfo::None )
-                        enforceNotReservedTag( tag, _lineInfo );
-
-                    // Merged hide tags like `[.approvals]` should be added as
-                    // `[.][approvals]`. The `[.]` is added at later point, so
-                    // we only strip the prefix
-                    if (startsWith(tag, '.') && tag.size() > 1) {
-                        tag.erase(0, 1);
-                    }
-                    tags.push_back( tag );
-                    tag.clear();
-                    inTag = false;
-                }
-                else
-                    tag += c;
-            }
-        }
-        if( isHidden ) {
-            // Add all "hidden" tags to make them behave identically
-            tags.insert( tags.end(), { ".", "!hide" } );
-        }
-
-        TestCaseInfo info( static_cast<std::string>(nameAndTags.name), _className, desc, tags, _lineInfo );
-        return TestCase( _testCase, std::move(info) );
-    }
-
-    void setTags( TestCaseInfo& testCaseInfo, std::vector<std::string> tags ) {
-        std::sort(begin(tags), end(tags));
-        tags.erase(std::unique(begin(tags), end(tags)), end(tags));
-        testCaseInfo.lcaseTags.clear();
-
-        for( auto const& tag : tags ) {
-            std::string lcaseTag = toLower( tag );
-            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
-            testCaseInfo.lcaseTags.push_back( lcaseTag );
-        }
-        testCaseInfo.tags = std::move(tags);
-    }
-
-    TestCaseInfo::TestCaseInfo( std::string const& _name,
-                                std::string const& _className,
-                                std::string const& _description,
-                                std::vector<std::string> const& _tags,
-                                SourceLineInfo const& _lineInfo )
-    :   name( _name ),
-        className( _className ),
-        description( _description ),
-        lineInfo( _lineInfo ),
-        properties( None )
-    {
-        setTags( *this, _tags );
-    }
-
-    bool TestCaseInfo::isHidden() const {
-        return ( properties & IsHidden ) != 0;
-    }
-    bool TestCaseInfo::throws() const {
-        return ( properties & Throws ) != 0;
-    }
-    bool TestCaseInfo::okToFail() const {
-        return ( properties & (ShouldFail | MayFail ) ) != 0;
-    }
-    bool TestCaseInfo::expectedToFail() const {
-        return ( properties & (ShouldFail ) ) != 0;
-    }
-
-    std::string TestCaseInfo::tagsAsString() const {
-        std::string ret;
-        // '[' and ']' per tag
-        std::size_t full_size = 2 * tags.size();
-        for (const auto& tag : tags) {
-            full_size += tag.size();
-        }
-        ret.reserve(full_size);
-        for (const auto& tag : tags) {
-            ret.push_back('[');
-            ret.append(tag);
-            ret.push_back(']');
-        }
-
-        return ret;
-    }
-
-    TestCase::TestCase( ITestInvoker* testCase, TestCaseInfo&& info ) : TestCaseInfo( std::move(info) ), test( testCase ) {}
-
-    TestCase TestCase::withName( std::string const& _newName ) const {
-        TestCase other( *this );
-        other.name = _newName;
-        return other;
-    }
-
-    void TestCase::invoke() const {
-        test->invoke();
-    }
-
-    bool TestCase::operator == ( TestCase const& other ) const {
-        return  test.get() == other.test.get() &&
-                name == other.name &&
-                className == other.className;
-    }
-
-    bool TestCase::operator < ( TestCase const& other ) const {
-        return name < other.name;
-    }
-
-    TestCaseInfo const& TestCase::getTestCaseInfo() const
-    {
-        return *this;
-    }
-
-} // end namespace Catch
-// end catch_test_case_info.cpp
-// start catch_test_case_registry_impl.cpp
-
-#include <algorithm>
-#include <sstream>
-
-namespace Catch {
-
-    namespace {
-        struct TestHasher {
-            explicit TestHasher(Catch::SimplePcg32& rng) {
-                basis = rng();
-                basis <<= 32;
-                basis |= rng();
-            }
-
-            uint64_t basis;
-
-            uint64_t operator()(TestCase const& t) const {
-                // Modified FNV-1a hash
-                static constexpr uint64_t prime = 1099511628211;
-                uint64_t hash = basis;
-                for (const char c : t.name) {
-                    hash ^= c;
-                    hash *= prime;
-                }
-                return hash;
-            }
-        };
-    } // end unnamed namespace
-
-    std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
-        switch( config.runOrder() ) {
-            case RunTests::InDeclarationOrder:
-                // already in declaration order
-                break;
-
-            case RunTests::InLexicographicalOrder: {
-                std::vector<TestCase> sorted = unsortedTestCases;
-                std::sort( sorted.begin(), sorted.end() );
-                return sorted;
-            }
-
-            case RunTests::InRandomOrder: {
-                seedRng( config );
-                TestHasher h( rng() );
-
-                using hashedTest = std::pair<uint64_t, TestCase const*>;
-                std::vector<hashedTest> indexed_tests;
-                indexed_tests.reserve( unsortedTestCases.size() );
-
-                for (auto const& testCase : unsortedTestCases) {
-                    indexed_tests.emplace_back(h(testCase), &testCase);
-                }
-
-                std::sort(indexed_tests.begin(), indexed_tests.end(),
-                          [](hashedTest const& lhs, hashedTest const& rhs) {
-                          if (lhs.first == rhs.first) {
-                              return lhs.second->name < rhs.second->name;
-                          }
-                          return lhs.first < rhs.first;
-                });
-
-                std::vector<TestCase> sorted;
-                sorted.reserve( indexed_tests.size() );
-
-                for (auto const& hashed : indexed_tests) {
-                    sorted.emplace_back(*hashed.second);
-                }
-
-                return sorted;
-            }
-        }
-        return unsortedTestCases;
-    }
-
-    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
-        return !testCase.throws() || config.allowThrows();
-    }
-
-    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
-    }
-
-    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
-        std::set<TestCase> seenFunctions;
-        for( auto const& function : functions ) {
-            auto prev = seenFunctions.insert( function );
-            CATCH_ENFORCE( prev.second,
-                    "error: TEST_CASE( \"" << function.name << "\" ) already defined.\n"
-                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << "\n"
-                    << "\tRedefined at " << function.getTestCaseInfo().lineInfo );
-        }
-    }
-
-    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
-        std::vector<TestCase> filtered;
-        filtered.reserve( testCases.size() );
-        for (auto const& testCase : testCases) {
-            if ((!testSpec.hasFilters() && !testCase.isHidden()) ||
-                (testSpec.hasFilters() && matchTest(testCase, testSpec, config))) {
-                filtered.push_back(testCase);
-            }
-        }
-        return filtered;
-    }
-    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
-        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
-    }
-
-    void TestRegistry::registerTest( TestCase const& testCase ) {
-        std::string name = testCase.getTestCaseInfo().name;
-        if( name.empty() ) {
-            ReusableStringStream rss;
-            rss << "Anonymous test case " << ++m_unnamedCount;
-            return registerTest( testCase.withName( rss.str() ) );
-        }
-        m_functions.push_back( testCase );
-    }
-
-    std::vector<TestCase> const& TestRegistry::getAllTests() const {
-        return m_functions;
-    }
-    std::vector<TestCase> const& TestRegistry::getAllTestsSorted( IConfig const& config ) const {
-        if( m_sortedFunctions.empty() )
-            enforceNoDuplicateTestCases( m_functions );
-
-        if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
-            m_sortedFunctions = sortTests( config, m_functions );
-            m_currentSortOrder = config.runOrder();
-        }
-        return m_sortedFunctions;
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    TestInvokerAsFunction::TestInvokerAsFunction( void(*testAsFunction)() ) noexcept : m_testAsFunction( testAsFunction ) {}
-
-    void TestInvokerAsFunction::invoke() const {
-        m_testAsFunction();
-    }
-
-    std::string extractClassName( StringRef const& classOrQualifiedMethodName ) {
-        std::string className(classOrQualifiedMethodName);
-        if( startsWith( className, '&' ) )
-        {
-            std::size_t lastColons = className.rfind( "::" );
-            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
-            if( penultimateColons == std::string::npos )
-                penultimateColons = 1;
-            className = className.substr( penultimateColons, lastColons-penultimateColons );
-        }
-        return className;
-    }
-
-} // end namespace Catch
-// end catch_test_case_registry_impl.cpp
-// start catch_test_case_tracker.cpp
-
-#include <algorithm>
-#include <cassert>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#endif
-
-namespace Catch {
-namespace TestCaseTracking {
-
-    NameAndLocation::NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
-    :   name( _name ),
-        location( _location )
-    {}
-
-    ITracker::~ITracker() = default;
-
-    ITracker& TrackerContext::startRun() {
-        m_rootTracker = std::make_shared<SectionTracker>( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, nullptr );
-        m_currentTracker = nullptr;
-        m_runState = Executing;
-        return *m_rootTracker;
-    }
-
-    void TrackerContext::endRun() {
-        m_rootTracker.reset();
-        m_currentTracker = nullptr;
-        m_runState = NotStarted;
-    }
-
-    void TrackerContext::startCycle() {
-        m_currentTracker = m_rootTracker.get();
-        m_runState = Executing;
-    }
-    void TrackerContext::completeCycle() {
-        m_runState = CompletedCycle;
-    }
-
-    bool TrackerContext::completedCycle() const {
-        return m_runState == CompletedCycle;
-    }
-    ITracker& TrackerContext::currentTracker() {
-        return *m_currentTracker;
-    }
-    void TrackerContext::setCurrentTracker( ITracker* tracker ) {
-        m_currentTracker = tracker;
-    }
-
-    TrackerBase::TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent ):
-        ITracker(nameAndLocation),
-        m_ctx( ctx ),
-        m_parent( parent )
-    {}
-
-    bool TrackerBase::isComplete() const {
-        return m_runState == CompletedSuccessfully || m_runState == Failed;
-    }
-    bool TrackerBase::isSuccessfullyCompleted() const {
-        return m_runState == CompletedSuccessfully;
-    }
-    bool TrackerBase::isOpen() const {
-        return m_runState != NotStarted && !isComplete();
-    }
-    bool TrackerBase::hasChildren() const {
-        return !m_children.empty();
-    }
-
-    void TrackerBase::addChild( ITrackerPtr const& child ) {
-        m_children.push_back( child );
-    }
-
-    ITrackerPtr TrackerBase::findChild( NameAndLocation const& nameAndLocation ) {
-        auto it = std::find_if( m_children.begin(), m_children.end(),
-            [&nameAndLocation]( ITrackerPtr const& tracker ){
-                return
-                    tracker->nameAndLocation().location == nameAndLocation.location &&
-                    tracker->nameAndLocation().name == nameAndLocation.name;
-            } );
-        return( it != m_children.end() )
-            ? *it
-            : nullptr;
-    }
-    ITracker& TrackerBase::parent() {
-        assert( m_parent ); // Should always be non-null except for root
-        return *m_parent;
-    }
-
-    void TrackerBase::openChild() {
-        if( m_runState != ExecutingChildren ) {
-            m_runState = ExecutingChildren;
-            if( m_parent )
-                m_parent->openChild();
-        }
-    }
-
-    bool TrackerBase::isSectionTracker() const { return false; }
-    bool TrackerBase::isGeneratorTracker() const { return false; }
-
-    void TrackerBase::open() {
-        m_runState = Executing;
-        moveToThis();
-        if( m_parent )
-            m_parent->openChild();
-    }
-
-    void TrackerBase::close() {
-
-        // Close any still open children (e.g. generators)
-        while( &m_ctx.currentTracker() != this )
-            m_ctx.currentTracker().close();
-
-        switch( m_runState ) {
-            case NeedsAnotherRun:
-                break;
-
-            case Executing:
-                m_runState = CompletedSuccessfully;
-                break;
-            case ExecutingChildren:
-                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
-                    m_runState = CompletedSuccessfully;
-                break;
-
-            case NotStarted:
-            case CompletedSuccessfully:
-            case Failed:
-                CATCH_INTERNAL_ERROR( "Illogical state: " << m_runState );
-
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown state: " << m_runState );
-        }
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::fail() {
-        m_runState = Failed;
-        if( m_parent )
-            m_parent->markAsNeedingAnotherRun();
-        moveToParent();
-        m_ctx.completeCycle();
-    }
-    void TrackerBase::markAsNeedingAnotherRun() {
-        m_runState = NeedsAnotherRun;
-    }
-
-    void TrackerBase::moveToParent() {
-        assert( m_parent );
-        m_ctx.setCurrentTracker( m_parent );
-    }
-    void TrackerBase::moveToThis() {
-        m_ctx.setCurrentTracker( this );
-    }
-
-    SectionTracker::SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
-    :   TrackerBase( nameAndLocation, ctx, parent ),
-        m_trimmed_name(trim(nameAndLocation.name))
-    {
-        if( parent ) {
-            while( !parent->isSectionTracker() )
-                parent = &parent->parent();
-
-            SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
-            addNextFilters( parentSection.m_filters );
-        }
-    }
-
-    bool SectionTracker::isComplete() const {
-        bool complete = true;
-
-        if ((m_filters.empty() || m_filters[0] == "")
-            || std::find(m_filters.begin(), m_filters.end(), m_trimmed_name) != m_filters.end()) {
-            complete = TrackerBase::isComplete();
-        }
-        return complete;
-    }
-
-    bool SectionTracker::isSectionTracker() const { return true; }
-
-    SectionTracker& SectionTracker::acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
-        std::shared_ptr<SectionTracker> section;
-
-        ITracker& currentTracker = ctx.currentTracker();
-        if( ITrackerPtr childTracker = currentTracker.findChild( nameAndLocation ) ) {
-            assert( childTracker );
-            assert( childTracker->isSectionTracker() );
-            section = std::static_pointer_cast<SectionTracker>( childTracker );
-        }
-        else {
-            section = std::make_shared<SectionTracker>( nameAndLocation, ctx, &currentTracker );
-            currentTracker.addChild( section );
-        }
-        if( !ctx.completedCycle() )
-            section->tryOpen();
-        return *section;
-    }
-
-    void SectionTracker::tryOpen() {
-        if( !isComplete() )
-            open();
-    }
-
-    void SectionTracker::addInitialFilters( std::vector<std::string> const& filters ) {
-        if( !filters.empty() ) {
-            m_filters.reserve( m_filters.size() + filters.size() + 2 );
-            m_filters.emplace_back(""); // Root - should never be consulted
-            m_filters.emplace_back(""); // Test Case - not a section filter
-            m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
-        }
-    }
-    void SectionTracker::addNextFilters( std::vector<std::string> const& filters ) {
-        if( filters.size() > 1 )
-            m_filters.insert( m_filters.end(), filters.begin()+1, filters.end() );
-    }
-
-} // namespace TestCaseTracking
-
-using TestCaseTracking::ITracker;
-using TestCaseTracking::TrackerContext;
-using TestCaseTracking::SectionTracker;
-
-} // namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-// end catch_test_case_tracker.cpp
-// start catch_test_registry.cpp
-
-namespace Catch {
-
-    auto makeTestInvoker( void(*testAsFunction)() ) noexcept -> ITestInvoker* {
-        return new(std::nothrow) TestInvokerAsFunction( testAsFunction );
-    }
-
-    NameAndTags::NameAndTags( StringRef const& name_ , StringRef const& tags_ ) noexcept : name( name_ ), tags( tags_ ) {}
-
-    AutoReg::AutoReg( ITestInvoker* invoker, SourceLineInfo const& lineInfo, StringRef const& classOrMethod, NameAndTags const& nameAndTags ) noexcept {
-        CATCH_TRY {
-            getMutableRegistryHub()
-                    .registerTest(
-                        makeTestCase(
-                            invoker,
-                            extractClassName( classOrMethod ),
-                            nameAndTags,
-                            lineInfo));
-        } CATCH_CATCH_ALL {
-            // Do not throw when constructing global objects, instead register the exception to be processed later
-            getMutableRegistryHub().registerStartupException();
-        }
-    }
-
-    AutoReg::~AutoReg() = default;
-}
-// end catch_test_registry.cpp
-// start catch_test_spec.cpp
-
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <memory>
-
-namespace Catch {
-
-    TestSpec::Pattern::Pattern( std::string const& name )
-    : m_name( name )
-    {}
-
-    TestSpec::Pattern::~Pattern() = default;
-
-    std::string const& TestSpec::Pattern::name() const {
-        return m_name;
-    }
-
-    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
-    : Pattern( filterString )
-    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
-    {}
-
-    bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
-        return m_wildcardPattern.matches( testCase.name );
-    }
-
-    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
-    : Pattern( filterString )
-    , m_tag( toLower( tag ) )
-    {}
-
-    bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
-        return std::find(begin(testCase.lcaseTags),
-                         end(testCase.lcaseTags),
-                         m_tag) != end(testCase.lcaseTags);
-    }
-
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
-    : Pattern( underlyingPattern->name() )
-    , m_underlyingPattern( underlyingPattern )
-    {}
-
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
-        return !m_underlyingPattern->matches( testCase );
-    }
-
-    bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
-    }
-
-    std::string TestSpec::Filter::name() const {
-        std::string name;
-        for( auto const& p : m_patterns )
-            name += p->name();
-        return name;
-    }
-
-    bool TestSpec::hasFilters() const {
-        return !m_filters.empty();
-    }
-
-    bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
-    }
-
-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
-    {
-        Matches matches( m_filters.size() );
-        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
-            std::vector<TestCase const*> currentMatches;
-            for( auto const& test : testCases )
-                if( isThrowSafe( test, config ) && filter.matches( test ) )
-                    currentMatches.emplace_back( &test );
-            return FilterMatch{ filter.name(), currentMatches };
-        } );
-        return matches;
-    }
-
-    const TestSpec::vectorStrings& TestSpec::getInvalidArgs() const{
-        return  (m_invalidArgs);
-    }
-
-}
-// end catch_test_spec.cpp
-// start catch_test_spec_parser.cpp
-
-namespace Catch {
-
-    TestSpecParser::TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
-
-    TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
-        m_mode = None;
-        m_exclusion = false;
-        m_arg = m_tagAliases->expandAliases( arg );
-        m_escapeChars.clear();
-        m_substring.reserve(m_arg.size());
-        m_patternName.reserve(m_arg.size());
-        m_realPatternPos = 0;
-
-        for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
-          //if visitChar fails
-           if( !visitChar( m_arg[m_pos] ) ){
-               m_testSpec.m_invalidArgs.push_back(arg);
-               break;
-           }
-        endMode();
-        return *this;
-    }
-    TestSpec TestSpecParser::testSpec() {
-        addFilter();
-        return m_testSpec;
-    }
-    bool TestSpecParser::visitChar( char c ) {
-        if( (m_mode != EscapedName) && (c == '\\') ) {
-            escape();
-            addCharToPattern(c);
-            return true;
-        }else if((m_mode != EscapedName) && (c == ',') )  {
-            return separate();
-        }
-
-        switch( m_mode ) {
-        case None:
-            if( processNoneChar( c ) )
-                return true;
-            break;
-        case Name:
-            processNameChar( c );
-            break;
-        case EscapedName:
-            endMode();
-            addCharToPattern(c);
-            return true;
-        default:
-        case Tag:
-        case QuotedName:
-            if( processOtherChar( c ) )
-                return true;
-            break;
-        }
-
-        m_substring += c;
-        if( !isControlChar( c ) ) {
-            m_patternName += c;
-            m_realPatternPos++;
-        }
-        return true;
-    }
-    // Two of the processing methods return true to signal the caller to return
-    // without adding the given character to the current pattern strings
-    bool TestSpecParser::processNoneChar( char c ) {
-        switch( c ) {
-        case ' ':
-            return true;
-        case '~':
-            m_exclusion = true;
-            return false;
-        case '[':
-            startNewMode( Tag );
-            return false;
-        case '"':
-            startNewMode( QuotedName );
-            return false;
-        default:
-            startNewMode( Name );
-            return false;
-        }
-    }
-    void TestSpecParser::processNameChar( char c ) {
-        if( c == '[' ) {
-            if( m_substring == "exclude:" )
-                m_exclusion = true;
-            else
-                endMode();
-            startNewMode( Tag );
-        }
-    }
-    bool TestSpecParser::processOtherChar( char c ) {
-        if( !isControlChar( c ) )
-            return false;
-        m_substring += c;
-        endMode();
-        return true;
-    }
-    void TestSpecParser::startNewMode( Mode mode ) {
-        m_mode = mode;
-    }
-    void TestSpecParser::endMode() {
-        switch( m_mode ) {
-        case Name:
-        case QuotedName:
-            return addNamePattern();
-        case Tag:
-            return addTagPattern();
-        case EscapedName:
-            revertBackToLastMode();
-            return;
-        case None:
-        default:
-            return startNewMode( None );
-        }
-    }
-    void TestSpecParser::escape() {
-        saveLastMode();
-        m_mode = EscapedName;
-        m_escapeChars.push_back(m_realPatternPos);
-    }
-    bool TestSpecParser::isControlChar( char c ) const {
-        switch( m_mode ) {
-            default:
-                return false;
-            case None:
-                return c == '~';
-            case Name:
-                return c == '[';
-            case EscapedName:
-                return true;
-            case QuotedName:
-                return c == '"';
-            case Tag:
-                return c == '[' || c == ']';
-        }
-    }
-
-    void TestSpecParser::addFilter() {
-        if( !m_currentFilter.m_patterns.empty() ) {
-            m_testSpec.m_filters.push_back( m_currentFilter );
-            m_currentFilter = TestSpec::Filter();
-        }
-    }
-
-    void TestSpecParser::saveLastMode() {
-      lastMode = m_mode;
-    }
-
-    void TestSpecParser::revertBackToLastMode() {
-      m_mode = lastMode;
-    }
-
-    bool TestSpecParser::separate() {
-      if( (m_mode==QuotedName) || (m_mode==Tag) ){
-         //invalid argument, signal failure to previous scope.
-         m_mode = None;
-         m_pos = m_arg.size();
-         m_substring.clear();
-         m_patternName.clear();
-         m_realPatternPos = 0;
-         return false;
-      }
-      endMode();
-      addFilter();
-      return true; //success
-    }
-
-    std::string TestSpecParser::preprocessPattern() {
-        std::string token = m_patternName;
-        for (std::size_t i = 0; i < m_escapeChars.size(); ++i)
-            token = token.substr(0, m_escapeChars[i] - i) + token.substr(m_escapeChars[i] - i + 1);
-        m_escapeChars.clear();
-        if (startsWith(token, "exclude:")) {
-            m_exclusion = true;
-            token = token.substr(8);
-        }
-
-        m_patternName.clear();
-        m_realPatternPos = 0;
-
-        return token;
-    }
-
-    void TestSpecParser::addNamePattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::NamePattern>(token, m_substring);
-            if (m_exclusion)
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    void TestSpecParser::addTagPattern() {
-        auto token = preprocessPattern();
-
-        if (!token.empty()) {
-            // If the tag pattern is the "hide and tag" shorthand (e.g. [.foo])
-            // we have to create a separate hide tag and shorten the real one
-            if (token.size() > 1 && token[0] == '.') {
-                token.erase(token.begin());
-                TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(".", m_substring);
-                if (m_exclusion) {
-                    pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-                }
-                m_currentFilter.m_patterns.push_back(pattern);
-            }
-
-            TestSpec::PatternPtr pattern = std::make_shared<TestSpec::TagPattern>(token, m_substring);
-
-            if (m_exclusion) {
-                pattern = std::make_shared<TestSpec::ExcludedPattern>(pattern);
-            }
-            m_currentFilter.m_patterns.push_back(pattern);
-        }
-        m_substring.clear();
-        m_exclusion = false;
-        m_mode = None;
-    }
-
-    TestSpec parseTestSpec( std::string const& arg ) {
-        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
-    }
-
-} // namespace Catch
-// end catch_test_spec_parser.cpp
-// start catch_timer.cpp
-
-#include <chrono>
-
-static const uint64_t nanosecondsInSecond = 1000000000;
-
-namespace Catch {
-
-    auto getCurrentNanosecondsSinceEpoch() -> uint64_t {
-        return std::chrono::duration_cast<std::chrono::nanoseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
-    }
-
-    namespace {
-        auto estimateClockResolution() -> uint64_t {
-            uint64_t sum = 0;
-            static const uint64_t iterations = 1000000;
-
-            auto startTime = getCurrentNanosecondsSinceEpoch();
-
-            for( std::size_t i = 0; i < iterations; ++i ) {
-
-                uint64_t ticks;
-                uint64_t baseTicks = getCurrentNanosecondsSinceEpoch();
-                do {
-                    ticks = getCurrentNanosecondsSinceEpoch();
-                } while( ticks == baseTicks );
-
-                auto delta = ticks - baseTicks;
-                sum += delta;
-
-                // If we have been calibrating for over 3 seconds -- the clock
-                // is terrible and we should move on.
-                // TBD: How to signal that the measured resolution is probably wrong?
-                if (ticks > startTime + 3 * nanosecondsInSecond) {
-                    return sum / ( i + 1u );
-                }
-            }
-
-            // We're just taking the mean, here. To do better we could take the std. dev and exclude outliers
-            // - and potentially do more iterations if there's a high variance.
-            return sum/iterations;
-        }
-    }
-    auto getEstimatedClockResolution() -> uint64_t {
-        static auto s_resolution = estimateClockResolution();
-        return s_resolution;
-    }
-
-    void Timer::start() {
-       m_nanoseconds = getCurrentNanosecondsSinceEpoch();
-    }
-    auto Timer::getElapsedNanoseconds() const -> uint64_t {
-        return getCurrentNanosecondsSinceEpoch() - m_nanoseconds;
-    }
-    auto Timer::getElapsedMicroseconds() const -> uint64_t {
-        return getElapsedNanoseconds()/1000;
-    }
-    auto Timer::getElapsedMilliseconds() const -> unsigned int {
-        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
-    }
-    auto Timer::getElapsedSeconds() const -> double {
-        return getElapsedMicroseconds()/1000000.0;
-    }
-
-} // namespace Catch
-// end catch_timer.cpp
-// start catch_tostring.cpp
-
-#if defined(__clang__)
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wexit-time-destructors"
-#    pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-// Enable specific decls locally
-#if !defined(CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER)
-#define CATCH_CONFIG_ENABLE_CHRONO_STRINGMAKER
-#endif
-
-#include <cmath>
-#include <iomanip>
-
-namespace Catch {
-
-namespace Detail {
-
-    const std::string unprintableString = "{?}";
-
-    namespace {
-        const int hexThreshold = 255;
-
-        struct Endianness {
-            enum Arch { Big, Little };
-
-            static Arch which() {
-                int one = 1;
-                // If the lowest byte we read is non-zero, we can assume
-                // that little endian format is used.
-                auto value = *reinterpret_cast<char*>(&one);
-                return value ? Little : Big;
-            }
-        };
-    }
-
-    std::string rawMemoryToString( const void *object, std::size_t size ) {
-        // Reverse order for little endian architectures
-        int i = 0, end = static_cast<int>( size ), inc = 1;
-        if( Endianness::which() == Endianness::Little ) {
-            i = end-1;
-            end = inc = -1;
-        }
-
-        unsigned char const *bytes = static_cast<unsigned char const *>(object);
-        ReusableStringStream rss;
-        rss << "0x" << std::setfill('0') << std::hex;
-        for( ; i != end; i += inc )
-             rss << std::setw(2) << static_cast<unsigned>(bytes[i]);
-       return rss.str();
-    }
-}
-
-template<typename T>
-std::string fpToString( T value, int precision ) {
-    if (Catch::isnan(value)) {
-        return "nan";
-    }
-
-    ReusableStringStream rss;
-    rss << std::setprecision( precision )
-        << std::fixed
-        << value;
-    std::string d = rss.str();
-    std::size_t i = d.find_last_not_of( '0' );
-    if( i != std::string::npos && i != d.size()-1 ) {
-        if( d[i] == '.' )
-            i++;
-        d = d.substr( 0, i+1 );
-    }
-    return d;
-}
-
-//// ======================================================= ////
-//
-//   Out-of-line defs for full specialization of StringMaker
-//
-//// ======================================================= ////
-
-std::string StringMaker<std::string>::convert(const std::string& str) {
-    if (!getCurrentContext().getConfig()->showInvisibles()) {
-        return '"' + str + '"';
-    }
-
-    std::string s("\"");
-    for (char c : str) {
-        switch (c) {
-        case '\n':
-            s.append("\\n");
-            break;
-        case '\t':
-            s.append("\\t");
-            break;
-        default:
-            s.push_back(c);
-            break;
-        }
-    }
-    s.append("\"");
-    return s;
-}
-
-#ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::string_view>::convert(std::string_view str) {
-    return ::Catch::Detail::stringify(std::string{ str });
-}
-#endif
-
-std::string StringMaker<char const*>::convert(char const* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<char*>::convert(char* str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::string{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-
-#ifdef CATCH_CONFIG_WCHAR
-std::string StringMaker<std::wstring>::convert(const std::wstring& wstr) {
-    std::string s;
-    s.reserve(wstr.size());
-    for (auto c : wstr) {
-        s += (c <= 0xff) ? static_cast<char>(c) : '?';
-    }
-    return ::Catch::Detail::stringify(s);
-}
-
-# ifdef CATCH_CONFIG_CPP17_STRING_VIEW
-std::string StringMaker<std::wstring_view>::convert(std::wstring_view str) {
-    return StringMaker<std::wstring>::convert(std::wstring(str));
-}
-# endif
-
-std::string StringMaker<wchar_t const*>::convert(wchar_t const * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
-    if (str) {
-        return ::Catch::Detail::stringify(std::wstring{ str });
-    } else {
-        return{ "{null string}" };
-    }
-}
-#endif
-
-#if defined(CATCH_CONFIG_CPP17_BYTE)
-#include <cstddef>
-std::string StringMaker<std::byte>::convert(std::byte value) {
-    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
-}
-#endif // defined(CATCH_CONFIG_CPP17_BYTE)
-
-std::string StringMaker<int>::convert(int value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long>::convert(long value) {
-    return ::Catch::Detail::stringify(static_cast<long long>(value));
-}
-std::string StringMaker<long long>::convert(long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<unsigned int>::convert(unsigned int value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long>::convert(unsigned long value) {
-    return ::Catch::Detail::stringify(static_cast<unsigned long long>(value));
-}
-std::string StringMaker<unsigned long long>::convert(unsigned long long value) {
-    ReusableStringStream rss;
-    rss << value;
-    if (value > Detail::hexThreshold) {
-        rss << " (0x" << std::hex << value << ')';
-    }
-    return rss.str();
-}
-
-std::string StringMaker<bool>::convert(bool b) {
-    return b ? "true" : "false";
-}
-
-std::string StringMaker<signed char>::convert(signed char value) {
-    if (value == '\r') {
-        return "'\\r'";
-    } else if (value == '\f') {
-        return "'\\f'";
-    } else if (value == '\n') {
-        return "'\\n'";
-    } else if (value == '\t') {
-        return "'\\t'";
-    } else if ('\0' <= value && value < ' ') {
-        return ::Catch::Detail::stringify(static_cast<unsigned int>(value));
-    } else {
-        char chstr[] = "' '";
-        chstr[1] = value;
-        return chstr;
-    }
-}
-std::string StringMaker<char>::convert(char c) {
-    return ::Catch::Detail::stringify(static_cast<signed char>(c));
-}
-std::string StringMaker<unsigned char>::convert(unsigned char c) {
-    return ::Catch::Detail::stringify(static_cast<char>(c));
-}
-
-std::string StringMaker<std::nullptr_t>::convert(std::nullptr_t) {
-    return "nullptr";
-}
-
-int StringMaker<float>::precision = 5;
-
-std::string StringMaker<float>::convert(float value) {
-    return fpToString(value, precision) + 'f';
-}
-
-int StringMaker<double>::precision = 10;
-
-std::string StringMaker<double>::convert(double value) {
-    return fpToString(value, precision);
-}
-
-std::string ratio_string<std::atto>::symbol() { return "a"; }
-std::string ratio_string<std::femto>::symbol() { return "f"; }
-std::string ratio_string<std::pico>::symbol() { return "p"; }
-std::string ratio_string<std::nano>::symbol() { return "n"; }
-std::string ratio_string<std::micro>::symbol() { return "u"; }
-std::string ratio_string<std::milli>::symbol() { return "m"; }
-
-} // end namespace Catch
-
-#if defined(__clang__)
-#    pragma clang diagnostic pop
-#endif
-
-// end catch_tostring.cpp
-// start catch_totals.cpp
-
-namespace Catch {
-
-    Counts Counts::operator - ( Counts const& other ) const {
-        Counts diff;
-        diff.passed = passed - other.passed;
-        diff.failed = failed - other.failed;
-        diff.failedButOk = failedButOk - other.failedButOk;
-        return diff;
-    }
-
-    Counts& Counts::operator += ( Counts const& other ) {
-        passed += other.passed;
-        failed += other.failed;
-        failedButOk += other.failedButOk;
-        return *this;
-    }
-
-    std::size_t Counts::total() const {
-        return passed + failed + failedButOk;
-    }
-    bool Counts::allPassed() const {
-        return failed == 0 && failedButOk == 0;
-    }
-    bool Counts::allOk() const {
-        return failed == 0;
-    }
-
-    Totals Totals::operator - ( Totals const& other ) const {
-        Totals diff;
-        diff.assertions = assertions - other.assertions;
-        diff.testCases = testCases - other.testCases;
-        return diff;
-    }
-
-    Totals& Totals::operator += ( Totals const& other ) {
-        assertions += other.assertions;
-        testCases += other.testCases;
-        return *this;
-    }
-
-    Totals Totals::delta( Totals const& prevTotals ) const {
-        Totals diff = *this - prevTotals;
-        if( diff.assertions.failed > 0 )
-            ++diff.testCases.failed;
-        else if( diff.assertions.failedButOk > 0 )
-            ++diff.testCases.failedButOk;
-        else
-            ++diff.testCases.passed;
-        return diff;
-    }
-
-}
-// end catch_totals.cpp
-// start catch_uncaught_exceptions.cpp
-
-#include <exception>
-
-namespace Catch {
-    bool uncaught_exceptions() {
-#if defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-        return false;
-#elif defined(CATCH_CONFIG_CPP17_UNCAUGHT_EXCEPTIONS)
-        return std::uncaught_exceptions() > 0;
-#else
-        return std::uncaught_exception();
-#endif
-  }
-} // end namespace Catch
-// end catch_uncaught_exceptions.cpp
-// start catch_version.cpp
-
-#include <ostream>
-
-namespace Catch {
-
-    Version::Version
-        (   unsigned int _majorVersion,
-            unsigned int _minorVersion,
-            unsigned int _patchNumber,
-            char const * const _branchName,
-            unsigned int _buildNumber )
-    :   majorVersion( _majorVersion ),
-        minorVersion( _minorVersion ),
-        patchNumber( _patchNumber ),
-        branchName( _branchName ),
-        buildNumber( _buildNumber )
-    {}
-
-    std::ostream& operator << ( std::ostream& os, Version const& version ) {
-        os  << version.majorVersion << '.'
-            << version.minorVersion << '.'
-            << version.patchNumber;
-        // branchName is never null -> 0th char is \0 if it is empty
-        if (version.branchName[0]) {
-            os << '-' << version.branchName
-               << '.' << version.buildNumber;
-        }
-        return os;
-    }
-
-    Version const& libraryVersion() {
-        static Version version( 2, 12, 4, "", 0 );
-        return version;
-    }
-
-}
-// end catch_version.cpp
-// start catch_wildcard_pattern.cpp
-
-namespace Catch {
-
-    WildcardPattern::WildcardPattern( std::string const& pattern,
-                                      CaseSensitive::Choice caseSensitivity )
-    :   m_caseSensitivity( caseSensitivity ),
-        m_pattern( normaliseString( pattern ) )
-    {
-        if( startsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 1 );
-            m_wildcard = WildcardAtStart;
-        }
-        if( endsWith( m_pattern, '*' ) ) {
-            m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
-            m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
-        }
-    }
-
-    bool WildcardPattern::matches( std::string const& str ) const {
-        switch( m_wildcard ) {
-            case NoWildcard:
-                return m_pattern == normaliseString( str );
-            case WildcardAtStart:
-                return endsWith( normaliseString( str ), m_pattern );
-            case WildcardAtEnd:
-                return startsWith( normaliseString( str ), m_pattern );
-            case WildcardAtBothEnds:
-                return contains( normaliseString( str ), m_pattern );
-            default:
-                CATCH_INTERNAL_ERROR( "Unknown enum" );
-        }
-    }
-
-    std::string WildcardPattern::normaliseString( std::string const& str ) const {
-        return trim( m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str );
-    }
-}
-// end catch_wildcard_pattern.cpp
-// start catch_xmlwriter.cpp
-
-#include <iomanip>
-#include <type_traits>
-
-namespace Catch {
-
-namespace {
-
-    size_t trailingBytes(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return 2;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return 3;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return 4;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    uint32_t headerValue(unsigned char c) {
-        if ((c & 0xE0) == 0xC0) {
-            return c & 0x1F;
-        }
-        if ((c & 0xF0) == 0xE0) {
-            return c & 0x0F;
-        }
-        if ((c & 0xF8) == 0xF0) {
-            return c & 0x07;
-        }
-        CATCH_INTERNAL_ERROR("Invalid multibyte utf-8 start byte encountered");
-    }
-
-    void hexEscapeChar(std::ostream& os, unsigned char c) {
-        std::ios_base::fmtflags f(os.flags());
-        os << "\\x"
-            << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
-            << static_cast<int>(c);
-        os.flags(f);
-    }
-
-    bool shouldNewline(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Newline));
-    }
-
-    bool shouldIndent(XmlFormatting fmt) {
-        return !!(static_cast<std::underlying_type<XmlFormatting>::type>(fmt & XmlFormatting::Indent));
-    }
-
-} // anonymous namespace
-
-    XmlFormatting operator | (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) |
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlFormatting operator & (XmlFormatting lhs, XmlFormatting rhs) {
-        return static_cast<XmlFormatting>(
-            static_cast<std::underlying_type<XmlFormatting>::type>(lhs) &
-            static_cast<std::underlying_type<XmlFormatting>::type>(rhs)
-        );
-    }
-
-    XmlEncode::XmlEncode( std::string const& str, ForWhat forWhat )
-    :   m_str( str ),
-        m_forWhat( forWhat )
-    {}
-
-    void XmlEncode::encodeTo( std::ostream& os ) const {
-        // Apostrophe escaping not necessary if we always use " to write attributes
-        // (see: http://www.w3.org/TR/xml/#syntax)
-
-        for( std::size_t idx = 0; idx < m_str.size(); ++ idx ) {
-            unsigned char c = m_str[idx];
-            switch (c) {
-            case '<':   os << "&lt;"; break;
-            case '&':   os << "&amp;"; break;
-
-            case '>':
-                // See: http://www.w3.org/TR/xml/#syntax
-                if (idx > 2 && m_str[idx - 1] == ']' && m_str[idx - 2] == ']')
-                    os << "&gt;";
-                else
-                    os << c;
-                break;
-
-            case '\"':
-                if (m_forWhat == ForAttributes)
-                    os << "&quot;";
-                else
-                    os << c;
-                break;
-
-            default:
-                // Check for control characters and invalid utf-8
-
-                // Escape control characters in standard ascii
-                // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
-                if (c < 0x09 || (c > 0x0D && c < 0x20) || c == 0x7F) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // Plain ASCII: Write it to stream
-                if (c < 0x7F) {
-                    os << c;
-                    break;
-                }
-
-                // UTF-8 territory
-                // Check if the encoding is valid and if it is not, hex escape bytes.
-                // Important: We do not check the exact decoded values for validity, only the encoding format
-                // First check that this bytes is a valid lead byte:
-                // This means that it is not encoded as 1111 1XXX
-                // Or as 10XX XXXX
-                if (c <  0xC0 ||
-                    c >= 0xF8) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                auto encBytes = trailingBytes(c);
-                // Are there enough bytes left to avoid accessing out-of-bounds memory?
-                if (idx + encBytes - 1 >= m_str.size()) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-                // The header is valid, check data
-                // The next encBytes bytes must together be a valid utf-8
-                // This means: bitpattern 10XX XXXX and the extracted value is sane (ish)
-                bool valid = true;
-                uint32_t value = headerValue(c);
-                for (std::size_t n = 1; n < encBytes; ++n) {
-                    unsigned char nc = m_str[idx + n];
-                    valid &= ((nc & 0xC0) == 0x80);
-                    value = (value << 6) | (nc & 0x3F);
-                }
-
-                if (
-                    // Wrong bit pattern of following bytes
-                    (!valid) ||
-                    // Overlong encodings
-                    (value < 0x80) ||
-                    (0x80 <= value && value < 0x800   && encBytes > 2) ||
-                    (0x800 < value && value < 0x10000 && encBytes > 3) ||
-                    // Encoded value out of range
-                    (value >= 0x110000)
-                    ) {
-                    hexEscapeChar(os, c);
-                    break;
-                }
-
-                // If we got here, this is in fact a valid(ish) utf-8 sequence
-                for (std::size_t n = 0; n < encBytes; ++n) {
-                    os << m_str[idx + n];
-                }
-                idx += encBytes - 1;
-                break;
-            }
-        }
-    }
-
-    std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
-        xmlEncode.encodeTo( os );
-        return os;
-    }
-
-    XmlWriter::ScopedElement::ScopedElement( XmlWriter* writer, XmlFormatting fmt )
-    :   m_writer( writer ),
-        m_fmt(fmt)
-    {}
-
-    XmlWriter::ScopedElement::ScopedElement( ScopedElement&& other ) noexcept
-    :   m_writer( other.m_writer ),
-        m_fmt(other.m_fmt)
-    {
-        other.m_writer = nullptr;
-        other.m_fmt = XmlFormatting::None;
-    }
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::operator=( ScopedElement&& other ) noexcept {
-        if ( m_writer ) {
-            m_writer->endElement();
-        }
-        m_writer = other.m_writer;
-        other.m_writer = nullptr;
-        m_fmt = other.m_fmt;
-        other.m_fmt = XmlFormatting::None;
-        return *this;
-    }
-
-    XmlWriter::ScopedElement::~ScopedElement() {
-        if (m_writer) {
-            m_writer->endElement(m_fmt);
-        }
-    }
-
-    XmlWriter::ScopedElement& XmlWriter::ScopedElement::writeText( std::string const& text, XmlFormatting fmt ) {
-        m_writer->writeText( text, fmt );
-        return *this;
-    }
-
-    XmlWriter::XmlWriter( std::ostream& os ) : m_os( os )
-    {
-        writeDeclaration();
-    }
-
-    XmlWriter::~XmlWriter() {
-        while (!m_tags.empty()) {
-            endElement();
-        }
-        newlineIfNecessary();
-    }
-
-    XmlWriter& XmlWriter::startElement( std::string const& name, XmlFormatting fmt ) {
-        ensureTagClosed();
-        newlineIfNecessary();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-            m_indent += "  ";
-        }
-        m_os << '<' << name;
-        m_tags.push_back( name );
-        m_tagIsOpen = true;
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    XmlWriter::ScopedElement XmlWriter::scopedElement( std::string const& name, XmlFormatting fmt ) {
-        ScopedElement scoped( this, fmt );
-        startElement( name, fmt );
-        return scoped;
-    }
-
-    XmlWriter& XmlWriter::endElement(XmlFormatting fmt) {
-        m_indent = m_indent.substr(0, m_indent.size() - 2);
-
-        if( m_tagIsOpen ) {
-            m_os << "/>";
-            m_tagIsOpen = false;
-        } else {
-            newlineIfNecessary();
-            if (shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << "</" << m_tags.back() << ">";
-        }
-        m_os << std::flush;
-        applyFormatting(fmt);
-        m_tags.pop_back();
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, std::string const& attribute ) {
-        if( !name.empty() && !attribute.empty() )
-            m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeAttribute( std::string const& name, bool attribute ) {
-        m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeText( std::string const& text, XmlFormatting fmt) {
-        if( !text.empty() ){
-            bool tagWasOpen = m_tagIsOpen;
-            ensureTagClosed();
-            if (tagWasOpen && shouldIndent(fmt)) {
-                m_os << m_indent;
-            }
-            m_os << XmlEncode( text );
-            applyFormatting(fmt);
-        }
-        return *this;
-    }
-
-    XmlWriter& XmlWriter::writeComment( std::string const& text, XmlFormatting fmt) {
-        ensureTagClosed();
-        if (shouldIndent(fmt)) {
-            m_os << m_indent;
-        }
-        m_os << "<!--" << text << "-->";
-        applyFormatting(fmt);
-        return *this;
-    }
-
-    void XmlWriter::writeStylesheetRef( std::string const& url ) {
-        m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
-    }
-
-    XmlWriter& XmlWriter::writeBlankLine() {
-        ensureTagClosed();
-        m_os << '\n';
-        return *this;
-    }
-
-    void XmlWriter::ensureTagClosed() {
-        if( m_tagIsOpen ) {
-            m_os << '>' << std::flush;
-            newlineIfNecessary();
-            m_tagIsOpen = false;
-        }
-    }
-
-    void XmlWriter::applyFormatting(XmlFormatting fmt) {
-        m_needsNewline = shouldNewline(fmt);
-    }
-
-    void XmlWriter::writeDeclaration() {
-        m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-    }
-
-    void XmlWriter::newlineIfNecessary() {
-        if( m_needsNewline ) {
-            m_os << std::endl;
-            m_needsNewline = false;
-        }
-    }
-}
-// end catch_xmlwriter.cpp
-// start catch_reporter_bases.cpp
-
-#include <cstring>
-#include <cfloat>
-#include <cstdio>
-#include <cassert>
-#include <memory>
-
-namespace Catch {
-    void prepareExpandedExpression(AssertionResult& result) {
-        result.getExpandedExpression();
-    }
-
-    // Because formatting using c++ streams is stateful, drop down to C is required
-    // Alternatively we could use stringstream, but its performance is... not good.
-    std::string getFormattedDuration( double duration ) {
-        // Max exponent + 1 is required to represent the whole part
-        // + 1 for decimal point
-        // + 3 for the 3 decimal places
-        // + 1 for null terminator
-        const std::size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
-        char buffer[maxDoubleSize];
-
-        // Save previous errno, to prevent sprintf from overwriting it
-        ErrnoGuard guard;
-#ifdef _MSC_VER
-        sprintf_s(buffer, "%.3f", duration);
-#else
-        std::sprintf(buffer, "%.3f", duration);
-#endif
-        return std::string(buffer);
-    }
-
-    std::string serializeFilters( std::vector<std::string> const& container ) {
-        ReusableStringStream oss;
-        bool first = true;
-        for (auto&& filter : container)
-        {
-            if (!first)
-                oss << ' ';
-            else
-                first = false;
-
-            oss << filter;
-        }
-        return oss.str();
-    }
-
-    TestEventListenerBase::TestEventListenerBase(ReporterConfig const & _config)
-        :StreamingReporterBase(_config) {}
-
-    std::set<Verbosity> TestEventListenerBase::getSupportedVerbosities() {
-        return { Verbosity::Quiet, Verbosity::Normal, Verbosity::High };
-    }
-
-    void TestEventListenerBase::assertionStarting(AssertionInfo const &) {}
-
-    bool TestEventListenerBase::assertionEnded(AssertionStats const &) {
-        return false;
-    }
-
-} // end namespace Catch
-// end catch_reporter_bases.cpp
-// start catch_reporter_compact.cpp
-
-namespace {
-
-#ifdef CATCH_PLATFORM_MAC
-    const char* failedString() { return "FAILED"; }
-    const char* passedString() { return "PASSED"; }
-#else
-    const char* failedString() { return "failed"; }
-    const char* passedString() { return "passed"; }
-#endif
-
-    // Colour::LightGrey
-    Catch::Colour::Code dimColour() { return Catch::Colour::FileName; }
-
-    std::string bothOrAll( std::size_t count ) {
-        return count == 1 ? std::string() :
-               count == 2 ? "both " : "all " ;
-    }
-
-} // anon namespace
-
-namespace Catch {
-namespace {
-// Colour, message variants:
-// - white: No tests ran.
-// -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
-// - white: Passed [both/all] N test cases (no assertions).
-// -   red: Failed N tests cases, failed M assertions.
-// - green: Passed [both/all] N tests cases with M assertions.
-void printTotals(std::ostream& out, const Totals& totals) {
-    if (totals.testCases.total() == 0) {
-        out << "No tests ran.";
-    } else if (totals.testCases.failed == totals.testCases.total()) {
-        Colour colour(Colour::ResultError);
-        const std::string qualify_assertions_failed =
-            totals.assertions.failed == totals.assertions.total() ?
-            bothOrAll(totals.assertions.failed) : std::string();
-        out <<
-            "Failed " << bothOrAll(totals.testCases.failed)
-            << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << qualify_assertions_failed <<
-            pluralise(totals.assertions.failed, "assertion") << '.';
-    } else if (totals.assertions.total() == 0) {
-        out <<
-            "Passed " << bothOrAll(totals.testCases.total())
-            << pluralise(totals.testCases.total(), "test case")
-            << " (no assertions).";
-    } else if (totals.assertions.failed) {
-        Colour colour(Colour::ResultError);
-        out <<
-            "Failed " << pluralise(totals.testCases.failed, "test case") << ", "
-            "failed " << pluralise(totals.assertions.failed, "assertion") << '.';
-    } else {
-        Colour colour(Colour::ResultSuccess);
-        out <<
-            "Passed " << bothOrAll(totals.testCases.passed)
-            << pluralise(totals.testCases.passed, "test case") <<
-            " with " << pluralise(totals.assertions.passed, "assertion") << '.';
-    }
-}
-
-// Implementation of CompactReporter formatting
-class AssertionPrinter {
-public:
-    AssertionPrinter& operator= (AssertionPrinter const&) = delete;
-    AssertionPrinter(AssertionPrinter const&) = delete;
-    AssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream)
-        , result(_stats.assertionResult)
-        , messages(_stats.infoMessages)
-        , itMessage(_stats.infoMessages.begin())
-        , printInfoMessages(_printInfoMessages) {}
-
-    void print() {
-        printSourceInfo();
-
-        itMessage = messages.begin();
-
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            printResultType(Colour::ResultSuccess, passedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            if (!result.hasExpression())
-                printRemainingMessages(Colour::None);
-            else
-                printRemainingMessages();
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk())
-                printResultType(Colour::ResultSuccess, failedString() + std::string(" - but was ok"));
-            else
-                printResultType(Colour::Error, failedString());
-            printOriginalExpression();
-            printReconstructedExpression();
-            printRemainingMessages();
-            break;
-        case ResultWas::ThrewException:
-            printResultType(Colour::Error, failedString());
-            printIssue("unexpected exception with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::FatalErrorCondition:
-            printResultType(Colour::Error, failedString());
-            printIssue("fatal error condition with message:");
-            printMessage();
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::DidntThrowException:
-            printResultType(Colour::Error, failedString());
-            printIssue("expected exception, got none");
-            printExpressionWas();
-            printRemainingMessages();
-            break;
-        case ResultWas::Info:
-            printResultType(Colour::None, "info");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::Warning:
-            printResultType(Colour::None, "warning");
-            printMessage();
-            printRemainingMessages();
-            break;
-        case ResultWas::ExplicitFailure:
-            printResultType(Colour::Error, failedString());
-            printIssue("explicitly");
-            printRemainingMessages(Colour::None);
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            printResultType(Colour::Error, "** internal error **");
-            break;
-        }
-    }
-
-private:
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ':';
-    }
-
-    void printResultType(Colour::Code colour, std::string const& passOrFail) const {
-        if (!passOrFail.empty()) {
-            {
-                Colour colourGuard(colour);
-                stream << ' ' << passOrFail;
-            }
-            stream << ':';
-        }
-    }
-
-    void printIssue(std::string const& issue) const {
-        stream << ' ' << issue;
-    }
-
-    void printExpressionWas() {
-        if (result.hasExpression()) {
-            stream << ';';
-            {
-                Colour colour(dimColour());
-                stream << " expression was:";
-            }
-            printOriginalExpression();
-        }
-    }
-
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            stream << ' ' << result.getExpression();
-        }
-    }
-
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            {
-                Colour colour(dimColour());
-                stream << " for: ";
-            }
-            stream << result.getExpandedExpression();
-        }
-    }
-
-    void printMessage() {
-        if (itMessage != messages.end()) {
-            stream << " '" << itMessage->message << '\'';
-            ++itMessage;
-        }
-    }
-
-    void printRemainingMessages(Colour::Code colour = dimColour()) {
-        if (itMessage == messages.end())
-            return;
-
-        const auto itEnd = messages.cend();
-        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
-
-        {
-            Colour colourGuard(colour);
-            stream << " with " << pluralise(N, "message") << ':';
-        }
-
-        while (itMessage != itEnd) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                printMessage();
-                if (itMessage != itEnd) {
-                    Colour colourGuard(dimColour());
-                    stream << " and";
-                }
-                continue;
-            }
-            ++itMessage;
-        }
-    }
-
-private:
-    std::ostream& stream;
-    AssertionResult const& result;
-    std::vector<MessageInfo> messages;
-    std::vector<MessageInfo>::const_iterator itMessage;
-    bool printInfoMessages;
-};
-
-} // anon namespace
-
-        std::string CompactReporter::getDescription() {
-            return "Reports test results on a single line, suitable for IDEs";
-        }
-
-        ReporterPreferences CompactReporter::getPreferences() const {
-            return m_reporterPrefs;
-        }
-
-        void CompactReporter::noMatchingTestCases( std::string const& spec ) {
-            stream << "No test cases matched '" << spec << '\'' << std::endl;
-        }
-
-        void CompactReporter::assertionStarting( AssertionInfo const& ) {}
-
-        bool CompactReporter::assertionEnded( AssertionStats const& _assertionStats ) {
-            AssertionResult const& result = _assertionStats.assertionResult;
-
-            bool printInfoMessages = true;
-
-            // Drop out if result was successful and we're not printing those
-            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
-                if( result.getResultType() != ResultWas::Warning )
-                    return false;
-                printInfoMessages = false;
-            }
-
-            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
-            printer.print();
-
-            stream << std::endl;
-            return true;
-        }
-
-        void CompactReporter::sectionEnded(SectionStats const& _sectionStats) {
-            if (m_config->showDurations() == ShowDurations::Always) {
-                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-            }
-        }
-
-        void CompactReporter::testRunEnded( TestRunStats const& _testRunStats ) {
-            printTotals( stream, _testRunStats.totals );
-            stream << '\n' << std::endl;
-            StreamingReporterBase::testRunEnded( _testRunStats );
-        }
-
-        CompactReporter::~CompactReporter() {}
-
-    CATCH_REGISTER_REPORTER( "compact", CompactReporter )
-
-} // end namespace Catch
-// end catch_reporter_compact.cpp
-// start catch_reporter_console.cpp
-
-#include <cfloat>
-#include <cstdio>
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
- // Note that 4062 (not all labels are handled and default is missing) is enabled
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic push
-// For simplicity, benchmarking-only helpers are always enabled
-#  pragma clang diagnostic ignored "-Wunused-function"
-#endif
-
-namespace Catch {
-
-namespace {
-
-// Formatter impl for ConsoleReporter
-class ConsoleAssertionPrinter {
-public:
-    ConsoleAssertionPrinter& operator= (ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(ConsoleAssertionPrinter const&) = delete;
-    ConsoleAssertionPrinter(std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages)
-        : stream(_stream),
-        stats(_stats),
-        result(_stats.assertionResult),
-        colour(Colour::None),
-        message(result.getMessage()),
-        messages(_stats.infoMessages),
-        printInfoMessages(_printInfoMessages) {
-        switch (result.getResultType()) {
-        case ResultWas::Ok:
-            colour = Colour::Success;
-            passOrFail = "PASSED";
-            //if( result.hasMessage() )
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ExpressionFailed:
-            if (result.isOk()) {
-                colour = Colour::Success;
-                passOrFail = "FAILED - but was ok";
-            } else {
-                colour = Colour::Error;
-                passOrFail = "FAILED";
-            }
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "with messages";
-            break;
-        case ResultWas::ThrewException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to unexpected exception with ";
-            if (_stats.infoMessages.size() == 1)
-                messageLabel += "message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel += "messages";
-            break;
-        case ResultWas::FatalErrorCondition:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "due to a fatal error condition";
-            break;
-        case ResultWas::DidntThrowException:
-            colour = Colour::Error;
-            passOrFail = "FAILED";
-            messageLabel = "because no exception was thrown where one was expected";
-            break;
-        case ResultWas::Info:
-            messageLabel = "info";
-            break;
-        case ResultWas::Warning:
-            messageLabel = "warning";
-            break;
-        case ResultWas::ExplicitFailure:
-            passOrFail = "FAILED";
-            colour = Colour::Error;
-            if (_stats.infoMessages.size() == 1)
-                messageLabel = "explicitly with message";
-            if (_stats.infoMessages.size() > 1)
-                messageLabel = "explicitly with messages";
-            break;
-            // These cases are here to prevent compiler warnings
-        case ResultWas::Unknown:
-        case ResultWas::FailureBit:
-        case ResultWas::Exception:
-            passOrFail = "** internal error **";
-            colour = Colour::Error;
-            break;
-        }
-    }
-
-    void print() const {
-        printSourceInfo();
-        if (stats.totals.assertions.total() > 0) {
-            printResultType();
-            printOriginalExpression();
-            printReconstructedExpression();
-        } else {
-            stream << '\n';
-        }
-        printMessage();
-    }
-
-private:
-    void printResultType() const {
-        if (!passOrFail.empty()) {
-            Colour colourGuard(colour);
-            stream << passOrFail << ":\n";
-        }
-    }
-    void printOriginalExpression() const {
-        if (result.hasExpression()) {
-            Colour colourGuard(Colour::OriginalExpression);
-            stream << "  ";
-            stream << result.getExpressionInMacro();
-            stream << '\n';
-        }
-    }
-    void printReconstructedExpression() const {
-        if (result.hasExpandedExpression()) {
-            stream << "with expansion:\n";
-            Colour colourGuard(Colour::ReconstructedExpression);
-            stream << Column(result.getExpandedExpression()).indent(2) << '\n';
-        }
-    }
-    void printMessage() const {
-        if (!messageLabel.empty())
-            stream << messageLabel << ':' << '\n';
-        for (auto const& msg : messages) {
-            // If this assertion is a warning ignore any INFO messages
-            if (printInfoMessages || msg.type != ResultWas::Info)
-                stream << Column(msg.message).indent(2) << '\n';
-        }
-    }
-    void printSourceInfo() const {
-        Colour colourGuard(Colour::FileName);
-        stream << result.getSourceInfo() << ": ";
-    }
-
-    std::ostream& stream;
-    AssertionStats const& stats;
-    AssertionResult const& result;
-    Colour::Code colour;
-    std::string passOrFail;
-    std::string messageLabel;
-    std::string message;
-    std::vector<MessageInfo> messages;
-    bool printInfoMessages;
-};
-
-std::size_t makeRatio(std::size_t number, std::size_t total) {
-    std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number / total : 0;
-    return (ratio == 0 && number > 0) ? 1 : ratio;
-}
-
-std::size_t& findMax(std::size_t& i, std::size_t& j, std::size_t& k) {
-    if (i > j && i > k)
-        return i;
-    else if (j > k)
-        return j;
-    else
-        return k;
-}
-
-struct ColumnInfo {
-    enum Justification { Left, Right };
-    std::string name;
-    int width;
-    Justification justification;
-};
-struct ColumnBreak {};
-struct RowBreak {};
-
-class Duration {
-    enum class Unit {
-        Auto,
-        Nanoseconds,
-        Microseconds,
-        Milliseconds,
-        Seconds,
-        Minutes
-    };
-    static const uint64_t s_nanosecondsInAMicrosecond = 1000;
-    static const uint64_t s_nanosecondsInAMillisecond = 1000 * s_nanosecondsInAMicrosecond;
-    static const uint64_t s_nanosecondsInASecond = 1000 * s_nanosecondsInAMillisecond;
-    static const uint64_t s_nanosecondsInAMinute = 60 * s_nanosecondsInASecond;
-
-    double m_inNanoseconds;
-    Unit m_units;
-
-public:
-    explicit Duration(double inNanoseconds, Unit units = Unit::Auto)
-        : m_inNanoseconds(inNanoseconds),
-        m_units(units) {
-        if (m_units == Unit::Auto) {
-            if (m_inNanoseconds < s_nanosecondsInAMicrosecond)
-                m_units = Unit::Nanoseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMillisecond)
-                m_units = Unit::Microseconds;
-            else if (m_inNanoseconds < s_nanosecondsInASecond)
-                m_units = Unit::Milliseconds;
-            else if (m_inNanoseconds < s_nanosecondsInAMinute)
-                m_units = Unit::Seconds;
-            else
-                m_units = Unit::Minutes;
-        }
-
-    }
-
-    auto value() const -> double {
-        switch (m_units) {
-        case Unit::Microseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMicrosecond);
-        case Unit::Milliseconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMillisecond);
-        case Unit::Seconds:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInASecond);
-        case Unit::Minutes:
-            return m_inNanoseconds / static_cast<double>(s_nanosecondsInAMinute);
-        default:
-            return m_inNanoseconds;
-        }
-    }
-    auto unitsAsString() const -> std::string {
-        switch (m_units) {
-        case Unit::Nanoseconds:
-            return "ns";
-        case Unit::Microseconds:
-            return "us";
-        case Unit::Milliseconds:
-            return "ms";
-        case Unit::Seconds:
-            return "s";
-        case Unit::Minutes:
-            return "m";
-        default:
-            return "** internal error **";
-        }
-
-    }
-    friend auto operator << (std::ostream& os, Duration const& duration) -> std::ostream& {
-        return os << duration.value() << ' ' << duration.unitsAsString();
-    }
-};
-} // end anon namespace
-
-class TablePrinter {
-    std::ostream& m_os;
-    std::vector<ColumnInfo> m_columnInfos;
-    std::ostringstream m_oss;
-    int m_currentColumn = -1;
-    bool m_isOpen = false;
-
-public:
-    TablePrinter( std::ostream& os, std::vector<ColumnInfo> columnInfos )
-    :   m_os( os ),
-        m_columnInfos( std::move( columnInfos ) ) {}
-
-    auto columnInfos() const -> std::vector<ColumnInfo> const& {
-        return m_columnInfos;
-    }
-
-    void open() {
-        if (!m_isOpen) {
-            m_isOpen = true;
-            *this << RowBreak();
-
-			Columns headerCols;
-			Spacer spacer(2);
-			for (auto const& info : m_columnInfos) {
-				headerCols += Column(info.name).width(static_cast<std::size_t>(info.width - 2));
-				headerCols += spacer;
-			}
-			m_os << headerCols << '\n';
-
-            m_os << Catch::getLineOfChars<'-'>() << '\n';
-        }
-    }
-    void close() {
-        if (m_isOpen) {
-            *this << RowBreak();
-            m_os << std::endl;
-            m_isOpen = false;
-        }
-    }
-
-    template<typename T>
-    friend TablePrinter& operator << (TablePrinter& tp, T const& value) {
-        tp.m_oss << value;
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, ColumnBreak) {
-        auto colStr = tp.m_oss.str();
-        const auto strSize = colStr.size();
-        tp.m_oss.str("");
-        tp.open();
-        if (tp.m_currentColumn == static_cast<int>(tp.m_columnInfos.size() - 1)) {
-            tp.m_currentColumn = -1;
-            tp.m_os << '\n';
-        }
-        tp.m_currentColumn++;
-
-        auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
-        auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
-            ? std::string(colInfo.width - (strSize + 1), ' ')
-            : std::string();
-        if (colInfo.justification == ColumnInfo::Left)
-            tp.m_os << colStr << padding << ' ';
-        else
-            tp.m_os << padding << colStr << ' ';
-        return tp;
-    }
-
-    friend TablePrinter& operator << (TablePrinter& tp, RowBreak) {
-        if (tp.m_currentColumn > 0) {
-            tp.m_os << '\n';
-            tp.m_currentColumn = -1;
-        }
-        return tp;
-    }
-};
-
-ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
-    : StreamingReporterBase(config),
-    m_tablePrinter(new TablePrinter(config.stream(),
-        [&config]() -> std::vector<ColumnInfo> {
-        if (config.fullConfig()->benchmarkNoAnalysis())
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "     samples", 14, ColumnInfo::Right },
-                { "  iterations", 14, ColumnInfo::Right },
-                { "        mean", 14, ColumnInfo::Right }
-            };
-        }
-        else
-        {
-            return{
-                { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
-                { "samples      mean       std dev", 14, ColumnInfo::Right },
-                { "iterations   low mean   low std dev", 14, ColumnInfo::Right },
-                { "estimated    high mean  high std dev", 14, ColumnInfo::Right }
-            };
-        }
-    }())) {}
-ConsoleReporter::~ConsoleReporter() = default;
-
-std::string ConsoleReporter::getDescription() {
-    return "Reports test results as plain lines of text";
-}
-
-void ConsoleReporter::noMatchingTestCases(std::string const& spec) {
-    stream << "No test cases matched '" << spec << '\'' << std::endl;
-}
-
-void ConsoleReporter::reportInvalidArguments(std::string const&arg){
-    stream << "Invalid Filter: " << arg << std::endl;
-}
-
-void ConsoleReporter::assertionStarting(AssertionInfo const&) {}
-
-bool ConsoleReporter::assertionEnded(AssertionStats const& _assertionStats) {
-    AssertionResult const& result = _assertionStats.assertionResult;
-
-    bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-    // Drop out if result was successful but we're not printing them.
-    if (!includeResults && result.getResultType() != ResultWas::Warning)
-        return false;
-
-    lazyPrint();
-
-    ConsoleAssertionPrinter printer(stream, _assertionStats, includeResults);
-    printer.print();
-    stream << std::endl;
-    return true;
-}
-
-void ConsoleReporter::sectionStarting(SectionInfo const& _sectionInfo) {
-    m_tablePrinter->close();
-    m_headerPrinted = false;
-    StreamingReporterBase::sectionStarting(_sectionInfo);
-}
-void ConsoleReporter::sectionEnded(SectionStats const& _sectionStats) {
-    m_tablePrinter->close();
-    if (_sectionStats.missingAssertions) {
-        lazyPrint();
-        Colour colour(Colour::ResultError);
-        if (m_sectionStack.size() > 1)
-            stream << "\nNo assertions in section";
-        else
-            stream << "\nNo assertions in test case";
-        stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
-    }
-    if (m_config->showDurations() == ShowDurations::Always) {
-        stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
-    }
-    if (m_headerPrinted) {
-        m_headerPrinted = false;
-    }
-    StreamingReporterBase::sectionEnded(_sectionStats);
-}
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-void ConsoleReporter::benchmarkPreparing(std::string const& name) {
-	lazyPrintWithoutClosingBenchmarkTable();
-
-	auto nameCol = Column(name).width(static_cast<std::size_t>(m_tablePrinter->columnInfos()[0].width - 2));
-
-	bool firstLine = true;
-	for (auto line : nameCol) {
-		if (!firstLine)
-			(*m_tablePrinter) << ColumnBreak() << ColumnBreak() << ColumnBreak();
-		else
-			firstLine = false;
-
-		(*m_tablePrinter) << line << ColumnBreak();
-	}
-}
-
-void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
-    (*m_tablePrinter) << info.samples << ColumnBreak()
-        << info.iterations << ColumnBreak();
-    if (!m_config->benchmarkNoAnalysis())
-        (*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
-}
-void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
-    if (m_config->benchmarkNoAnalysis())
-    {
-        (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
-    }
-    else
-    {
-        (*m_tablePrinter) << ColumnBreak()
-            << Duration(stats.mean.point.count()) << ColumnBreak()
-            << Duration(stats.mean.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
-            << Duration(stats.standardDeviation.point.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
-            << Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
-    }
-}
-
-void ConsoleReporter::benchmarkFailed(std::string const& error) {
-	Colour colour(Colour::Red);
-    (*m_tablePrinter)
-        << "Benchmark failed (" << error << ')'
-        << ColumnBreak() << RowBreak();
-}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-void ConsoleReporter::testCaseEnded(TestCaseStats const& _testCaseStats) {
-    m_tablePrinter->close();
-    StreamingReporterBase::testCaseEnded(_testCaseStats);
-    m_headerPrinted = false;
-}
-void ConsoleReporter::testGroupEnded(TestGroupStats const& _testGroupStats) {
-    if (currentGroupInfo.used) {
-        printSummaryDivider();
-        stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
-        printTotals(_testGroupStats.totals);
-        stream << '\n' << std::endl;
-    }
-    StreamingReporterBase::testGroupEnded(_testGroupStats);
-}
-void ConsoleReporter::testRunEnded(TestRunStats const& _testRunStats) {
-    printTotalsDivider(_testRunStats.totals);
-    printTotals(_testRunStats.totals);
-    stream << std::endl;
-    StreamingReporterBase::testRunEnded(_testRunStats);
-}
-void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-    StreamingReporterBase::testRunStarting(_testInfo);
-    printTestFilters();
-}
-
-void ConsoleReporter::lazyPrint() {
-
-    m_tablePrinter->close();
-    lazyPrintWithoutClosingBenchmarkTable();
-}
-
-void ConsoleReporter::lazyPrintWithoutClosingBenchmarkTable() {
-
-    if (!currentTestRunInfo.used)
-        lazyPrintRunInfo();
-    if (!currentGroupInfo.used)
-        lazyPrintGroupInfo();
-
-    if (!m_headerPrinted) {
-        printTestCaseAndSectionHeader();
-        m_headerPrinted = true;
-    }
-}
-void ConsoleReporter::lazyPrintRunInfo() {
-    stream << '\n' << getLineOfChars<'~'>() << '\n';
-    Colour colour(Colour::SecondaryText);
-    stream << currentTestRunInfo->name
-        << " is a Catch v" << libraryVersion() << " host application.\n"
-        << "Run with -? for options\n\n";
-
-    if (m_config->rngSeed() != 0)
-        stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
-
-    currentTestRunInfo.used = true;
-}
-void ConsoleReporter::lazyPrintGroupInfo() {
-    if (!currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1) {
-        printClosedHeader("Group: " + currentGroupInfo->name);
-        currentGroupInfo.used = true;
-    }
-}
-void ConsoleReporter::printTestCaseAndSectionHeader() {
-    assert(!m_sectionStack.empty());
-    printOpenHeader(currentTestCaseInfo->name);
-
-    if (m_sectionStack.size() > 1) {
-        Colour colourGuard(Colour::Headers);
-
-        auto
-            it = m_sectionStack.begin() + 1, // Skip first section (test case)
-            itEnd = m_sectionStack.end();
-        for (; it != itEnd; ++it)
-            printHeaderString(it->name, 2);
-    }
-
-    SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
-
-    stream << getLineOfChars<'-'>() << '\n';
-    Colour colourGuard(Colour::FileName);
-    stream << lineInfo << '\n';
-    stream << getLineOfChars<'.'>() << '\n' << std::endl;
-}
-
-void ConsoleReporter::printClosedHeader(std::string const& _name) {
-    printOpenHeader(_name);
-    stream << getLineOfChars<'.'>() << '\n';
-}
-void ConsoleReporter::printOpenHeader(std::string const& _name) {
-    stream << getLineOfChars<'-'>() << '\n';
-    {
-        Colour colourGuard(Colour::Headers);
-        printHeaderString(_name);
-    }
-}
-
-// if string has a : in first line will set indent to follow it on
-// subsequent lines
-void ConsoleReporter::printHeaderString(std::string const& _string, std::size_t indent) {
-    std::size_t i = _string.find(": ");
-    if (i != std::string::npos)
-        i += 2;
-    else
-        i = 0;
-    stream << Column(_string).indent(indent + i).initialIndent(indent) << '\n';
-}
-
-struct SummaryColumn {
-
-    SummaryColumn( std::string _label, Colour::Code _colour )
-    :   label( std::move( _label ) ),
-        colour( _colour ) {}
-    SummaryColumn addRow( std::size_t count ) {
-        ReusableStringStream rss;
-        rss << count;
-        std::string row = rss.str();
-        for (auto& oldRow : rows) {
-            while (oldRow.size() < row.size())
-                oldRow = ' ' + oldRow;
-            while (oldRow.size() > row.size())
-                row = ' ' + row;
-        }
-        rows.push_back(row);
-        return *this;
-    }
-
-    std::string label;
-    Colour::Code colour;
-    std::vector<std::string> rows;
-
-};
-
-void ConsoleReporter::printTotals( Totals const& totals ) {
-    if (totals.testCases.total() == 0) {
-        stream << Colour(Colour::Warning) << "No tests ran\n";
-    } else if (totals.assertions.total() > 0 && totals.testCases.allPassed()) {
-        stream << Colour(Colour::ResultSuccess) << "All tests passed";
-        stream << " ("
-            << pluralise(totals.assertions.passed, "assertion") << " in "
-            << pluralise(totals.testCases.passed, "test case") << ')'
-            << '\n';
-    } else {
-
-        std::vector<SummaryColumn> columns;
-        columns.push_back(SummaryColumn("", Colour::None)
-                          .addRow(totals.testCases.total())
-                          .addRow(totals.assertions.total()));
-        columns.push_back(SummaryColumn("passed", Colour::Success)
-                          .addRow(totals.testCases.passed)
-                          .addRow(totals.assertions.passed));
-        columns.push_back(SummaryColumn("failed", Colour::ResultError)
-                          .addRow(totals.testCases.failed)
-                          .addRow(totals.assertions.failed));
-        columns.push_back(SummaryColumn("failed as expected", Colour::ResultExpectedFailure)
-                          .addRow(totals.testCases.failedButOk)
-                          .addRow(totals.assertions.failedButOk));
-
-        printSummaryRow("test cases", columns, 0);
-        printSummaryRow("assertions", columns, 1);
-    }
-}
-void ConsoleReporter::printSummaryRow(std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row) {
-    for (auto col : cols) {
-        std::string value = col.rows[row];
-        if (col.label.empty()) {
-            stream << label << ": ";
-            if (value != "0")
-                stream << value;
-            else
-                stream << Colour(Colour::Warning) << "- none -";
-        } else if (value != "0") {
-            stream << Colour(Colour::LightGrey) << " | ";
-            stream << Colour(col.colour)
-                << value << ' ' << col.label;
-        }
-    }
-    stream << '\n';
-}
-
-void ConsoleReporter::printTotalsDivider(Totals const& totals) {
-    if (totals.testCases.total() > 0) {
-        std::size_t failedRatio = makeRatio(totals.testCases.failed, totals.testCases.total());
-        std::size_t failedButOkRatio = makeRatio(totals.testCases.failedButOk, totals.testCases.total());
-        std::size_t passedRatio = makeRatio(totals.testCases.passed, totals.testCases.total());
-        while (failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)++;
-        while (failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH - 1)
-            findMax(failedRatio, failedButOkRatio, passedRatio)--;
-
-        stream << Colour(Colour::Error) << std::string(failedRatio, '=');
-        stream << Colour(Colour::ResultExpectedFailure) << std::string(failedButOkRatio, '=');
-        if (totals.testCases.allPassed())
-            stream << Colour(Colour::ResultSuccess) << std::string(passedRatio, '=');
-        else
-            stream << Colour(Colour::Success) << std::string(passedRatio, '=');
-    } else {
-        stream << Colour(Colour::Warning) << std::string(CATCH_CONFIG_CONSOLE_WIDTH - 1, '=');
-    }
-    stream << '\n';
-}
-void ConsoleReporter::printSummaryDivider() {
-    stream << getLineOfChars<'-'>() << '\n';
-}
-
-void ConsoleReporter::printTestFilters() {
-    if (m_config->testSpec().hasFilters()) {
-        Colour guard(Colour::BrightYellow);
-        stream << "Filters: " << serializeFilters(m_config->getTestsOrTags()) << '\n';
-    }
-}
-
-CATCH_REGISTER_REPORTER("console", ConsoleReporter)
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-#if defined(__clang__)
-#  pragma clang diagnostic pop
-#endif
-// end catch_reporter_console.cpp
-// start catch_reporter_junit.cpp
-
-#include <cassert>
-#include <sstream>
-#include <ctime>
-#include <algorithm>
-
-namespace Catch {
-
-    namespace {
-        std::string getCurrentTimestamp() {
-            // Beware, this is not reentrant because of backward compatibility issues
-            // Also, UTC only, again because of backward compatibility (%z is C++11)
-            time_t rawtime;
-            std::time(&rawtime);
-            auto const timeStampSize = sizeof("2017-01-16T17:06:45Z");
-
-#ifdef _MSC_VER
-            std::tm timeInfo = {};
-            gmtime_s(&timeInfo, &rawtime);
-#else
-            std::tm* timeInfo;
-            timeInfo = std::gmtime(&rawtime);
-#endif
-
-            char timeStamp[timeStampSize];
-            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
-
-#ifdef _MSC_VER
-            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
-#else
-            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
-#endif
-            return std::string(timeStamp);
-        }
-
-        std::string fileNameTag(const std::vector<std::string> &tags) {
-            auto it = std::find_if(begin(tags),
-                                   end(tags),
-                                   [] (std::string const& tag) {return tag.front() == '#'; });
-            if (it != tags.end())
-                return it->substr(1);
-            return std::string();
-        }
-    } // anonymous namespace
-
-    JunitReporter::JunitReporter( ReporterConfig const& _config )
-        :   CumulativeReporterBase( _config ),
-            xml( _config.stream() )
-        {
-            m_reporterPrefs.shouldRedirectStdOut = true;
-            m_reporterPrefs.shouldReportAllAssertions = true;
-        }
-
-    JunitReporter::~JunitReporter() {}
-
-    std::string JunitReporter::getDescription() {
-        return "Reports test results in an XML format that looks like Ant's junitreport target";
-    }
-
-    void JunitReporter::noMatchingTestCases( std::string const& /*spec*/ ) {}
-
-    void JunitReporter::testRunStarting( TestRunInfo const& runInfo )  {
-        CumulativeReporterBase::testRunStarting( runInfo );
-        xml.startElement( "testsuites" );
-    }
-
-    void JunitReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        suiteTimer.start();
-        stdOutForSuite.clear();
-        stdErrForSuite.clear();
-        unexpectedExceptions = 0;
-        CumulativeReporterBase::testGroupStarting( groupInfo );
-    }
-
-    void JunitReporter::testCaseStarting( TestCaseInfo const& testCaseInfo ) {
-        m_okToFail = testCaseInfo.okToFail();
-    }
-
-    bool JunitReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
-            unexpectedExceptions++;
-        return CumulativeReporterBase::assertionEnded( assertionStats );
-    }
-
-    void JunitReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        stdOutForSuite += testCaseStats.stdOut;
-        stdErrForSuite += testCaseStats.stdErr;
-        CumulativeReporterBase::testCaseEnded( testCaseStats );
-    }
-
-    void JunitReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        double suiteTime = suiteTimer.getElapsedSeconds();
-        CumulativeReporterBase::testGroupEnded( testGroupStats );
-        writeGroup( *m_testGroups.back(), suiteTime );
-    }
-
-    void JunitReporter::testRunEndedCumulative() {
-        xml.endElement();
-    }
-
-    void JunitReporter::writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
-        XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
-
-        TestGroupStats const& stats = groupNode.value;
-        xml.writeAttribute( "name", stats.groupInfo.name );
-        xml.writeAttribute( "errors", unexpectedExceptions );
-        xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
-        xml.writeAttribute( "tests", stats.totals.assertions.total() );
-        xml.writeAttribute( "hostname", "tbd" ); // !TBD
-        if( m_config->showDurations() == ShowDurations::Never )
-            xml.writeAttribute( "time", "" );
-        else
-            xml.writeAttribute( "time", suiteTime );
-        xml.writeAttribute( "timestamp", getCurrentTimestamp() );
-
-        // Write properties if there are any
-        if (m_config->hasTestFilters() || m_config->rngSeed() != 0) {
-            auto properties = xml.scopedElement("properties");
-            if (m_config->hasTestFilters()) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "filters")
-                    .writeAttribute("value", serializeFilters(m_config->getTestsOrTags()));
-            }
-            if (m_config->rngSeed() != 0) {
-                xml.scopedElement("property")
-                    .writeAttribute("name", "random-seed")
-                    .writeAttribute("value", m_config->rngSeed());
-            }
-        }
-
-        // Write test cases
-        for( auto const& child : groupNode.children )
-            writeTestCase( *child );
-
-        xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite ), XmlFormatting::Newline );
-        xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite ), XmlFormatting::Newline );
-    }
-
-    void JunitReporter::writeTestCase( TestCaseNode const& testCaseNode ) {
-        TestCaseStats const& stats = testCaseNode.value;
-
-        // All test cases have exactly one section - which represents the
-        // test case itself. That section may have 0-n nested sections
-        assert( testCaseNode.children.size() == 1 );
-        SectionNode const& rootSection = *testCaseNode.children.front();
-
-        std::string className = stats.testInfo.className;
-
-        if( className.empty() ) {
-            className = fileNameTag(stats.testInfo.tags);
-            if ( className.empty() )
-                className = "global";
-        }
-
-        if ( !m_config->name().empty() )
-            className = m_config->name() + "." + className;
-
-        writeSection( className, "", rootSection );
-    }
-
-    void JunitReporter::writeSection(  std::string const& className,
-                        std::string const& rootName,
-                        SectionNode const& sectionNode ) {
-        std::string name = trim( sectionNode.stats.sectionInfo.name );
-        if( !rootName.empty() )
-            name = rootName + '/' + name;
-
-        if( !sectionNode.assertions.empty() ||
-            !sectionNode.stdOut.empty() ||
-            !sectionNode.stdErr.empty() ) {
-            XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
-            if( className.empty() ) {
-                xml.writeAttribute( "classname", name );
-                xml.writeAttribute( "name", "root" );
-            }
-            else {
-                xml.writeAttribute( "classname", className );
-                xml.writeAttribute( "name", name );
-            }
-            xml.writeAttribute( "time", ::Catch::Detail::stringify( sectionNode.stats.durationInSeconds ) );
-            // This is not ideal, but it should be enough to mimic gtest's
-            // junit output.
-            // Ideally the JUnit reporter would also handle `skipTest`
-            // events and write those out appropriately.
-            xml.writeAttribute( "status", "run" );
-
-            writeAssertions( sectionNode );
-
-            if( !sectionNode.stdOut.empty() )
-                xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), XmlFormatting::Newline );
-            if( !sectionNode.stdErr.empty() )
-                xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), XmlFormatting::Newline );
-        }
-        for( auto const& childNode : sectionNode.childSections )
-            if( className.empty() )
-                writeSection( name, "", *childNode );
-            else
-                writeSection( className, name, *childNode );
-    }
-
-    void JunitReporter::writeAssertions( SectionNode const& sectionNode ) {
-        for( auto const& assertion : sectionNode.assertions )
-            writeAssertion( assertion );
-    }
-
-    void JunitReporter::writeAssertion( AssertionStats const& stats ) {
-        AssertionResult const& result = stats.assertionResult;
-        if( !result.isOk() ) {
-            std::string elementName;
-            switch( result.getResultType() ) {
-                case ResultWas::ThrewException:
-                case ResultWas::FatalErrorCondition:
-                    elementName = "error";
-                    break;
-                case ResultWas::ExplicitFailure:
-                case ResultWas::ExpressionFailed:
-                case ResultWas::DidntThrowException:
-                    elementName = "failure";
-                    break;
-
-                // We should never see these here:
-                case ResultWas::Info:
-                case ResultWas::Warning:
-                case ResultWas::Ok:
-                case ResultWas::Unknown:
-                case ResultWas::FailureBit:
-                case ResultWas::Exception:
-                    elementName = "internalError";
-                    break;
-            }
-
-            XmlWriter::ScopedElement e = xml.scopedElement( elementName );
-
-            xml.writeAttribute( "message", result.getExpression() );
-            xml.writeAttribute( "type", result.getTestMacroName() );
-
-            ReusableStringStream rss;
-            if (stats.totals.assertions.total() > 0) {
-                rss << "FAILED" << ":\n";
-                if (result.hasExpression()) {
-                    rss << "  ";
-                    rss << result.getExpressionInMacro();
-                    rss << '\n';
-                }
-                if (result.hasExpandedExpression()) {
-                    rss << "with expansion:\n";
-                    rss << Column(result.getExpandedExpression()).indent(2) << '\n';
-                }
-            } else {
-                rss << '\n';
-            }
-
-            if( !result.getMessage().empty() )
-                rss << result.getMessage() << '\n';
-            for( auto const& msg : stats.infoMessages )
-                if( msg.type == ResultWas::Info )
-                    rss << msg.message << '\n';
-
-            rss << "at " << result.getSourceInfo();
-            xml.writeText( rss.str(), XmlFormatting::Newline );
-        }
-    }
-
-    CATCH_REGISTER_REPORTER( "junit", JunitReporter )
-
-} // end namespace Catch
-// end catch_reporter_junit.cpp
-// start catch_reporter_listening.cpp
-
-#include <cassert>
-
-namespace Catch {
-
-    ListeningReporter::ListeningReporter() {
-        // We will assume that listeners will always want all assertions
-        m_preferences.shouldReportAllAssertions = true;
-    }
-
-    void ListeningReporter::addListener( IStreamingReporterPtr&& listener ) {
-        m_listeners.push_back( std::move( listener ) );
-    }
-
-    void ListeningReporter::addReporter(IStreamingReporterPtr&& reporter) {
-        assert(!m_reporter && "Listening reporter can wrap only 1 real reporter");
-        m_reporter = std::move( reporter );
-        m_preferences.shouldRedirectStdOut = m_reporter->getPreferences().shouldRedirectStdOut;
-    }
-
-    ReporterPreferences ListeningReporter::getPreferences() const {
-        return m_preferences;
-    }
-
-    std::set<Verbosity> ListeningReporter::getSupportedVerbosities() {
-        return std::set<Verbosity>{ };
-    }
-
-    void ListeningReporter::noMatchingTestCases( std::string const& spec ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->noMatchingTestCases( spec );
-        }
-        m_reporter->noMatchingTestCases( spec );
-    }
-
-    void ListeningReporter::reportInvalidArguments(std::string const&arg){
-        for ( auto const& listener : m_listeners ) {
-            listener->reportInvalidArguments( arg );
-        }
-        m_reporter->reportInvalidArguments( arg );
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void ListeningReporter::benchmarkPreparing( std::string const& name ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkPreparing(name);
-		}
-		m_reporter->benchmarkPreparing(name);
-	}
-    void ListeningReporter::benchmarkStarting( BenchmarkInfo const& benchmarkInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkStarting( benchmarkInfo );
-        }
-        m_reporter->benchmarkStarting( benchmarkInfo );
-    }
-    void ListeningReporter::benchmarkEnded( BenchmarkStats<> const& benchmarkStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->benchmarkEnded( benchmarkStats );
-        }
-        m_reporter->benchmarkEnded( benchmarkStats );
-    }
-
-	void ListeningReporter::benchmarkFailed( std::string const& error ) {
-		for (auto const& listener : m_listeners) {
-			listener->benchmarkFailed(error);
-		}
-		m_reporter->benchmarkFailed(error);
-	}
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    void ListeningReporter::testRunStarting( TestRunInfo const& testRunInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunStarting( testRunInfo );
-        }
-        m_reporter->testRunStarting( testRunInfo );
-    }
-
-    void ListeningReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupStarting( groupInfo );
-        }
-        m_reporter->testGroupStarting( groupInfo );
-    }
-
-    void ListeningReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseStarting( testInfo );
-        }
-        m_reporter->testCaseStarting( testInfo );
-    }
-
-    void ListeningReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionStarting( sectionInfo );
-        }
-        m_reporter->sectionStarting( sectionInfo );
-    }
-
-    void ListeningReporter::assertionStarting( AssertionInfo const& assertionInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->assertionStarting( assertionInfo );
-        }
-        m_reporter->assertionStarting( assertionInfo );
-    }
-
-    // The return value indicates if the messages buffer should be cleared:
-    bool ListeningReporter::assertionEnded( AssertionStats const& assertionStats ) {
-        for( auto const& listener : m_listeners ) {
-            static_cast<void>( listener->assertionEnded( assertionStats ) );
-        }
-        return m_reporter->assertionEnded( assertionStats );
-    }
-
-    void ListeningReporter::sectionEnded( SectionStats const& sectionStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->sectionEnded( sectionStats );
-        }
-        m_reporter->sectionEnded( sectionStats );
-    }
-
-    void ListeningReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testCaseEnded( testCaseStats );
-        }
-        m_reporter->testCaseEnded( testCaseStats );
-    }
-
-    void ListeningReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testGroupEnded( testGroupStats );
-        }
-        m_reporter->testGroupEnded( testGroupStats );
-    }
-
-    void ListeningReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->testRunEnded( testRunStats );
-        }
-        m_reporter->testRunEnded( testRunStats );
-    }
-
-    void ListeningReporter::skipTest( TestCaseInfo const& testInfo ) {
-        for ( auto const& listener : m_listeners ) {
-            listener->skipTest( testInfo );
-        }
-        m_reporter->skipTest( testInfo );
-    }
-
-    bool ListeningReporter::isMulti() const {
-        return true;
-    }
-
-} // end namespace Catch
-// end catch_reporter_listening.cpp
-// start catch_reporter_xml.cpp
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4061) // Not all labels are EXPLICITLY handled in switch
-                              // Note that 4062 (not all labels are handled
-                              // and default is missing) is enabled
-#endif
-
-namespace Catch {
-    XmlReporter::XmlReporter( ReporterConfig const& _config )
-    :   StreamingReporterBase( _config ),
-        m_xml(_config.stream())
-    {
-        m_reporterPrefs.shouldRedirectStdOut = true;
-        m_reporterPrefs.shouldReportAllAssertions = true;
-    }
-
-    XmlReporter::~XmlReporter() = default;
-
-    std::string XmlReporter::getDescription() {
-        return "Reports test results as an XML document";
-    }
-
-    std::string XmlReporter::getStylesheetRef() const {
-        return std::string();
-    }
-
-    void XmlReporter::writeSourceInfo( SourceLineInfo const& sourceInfo ) {
-        m_xml
-            .writeAttribute( "filename", sourceInfo.file )
-            .writeAttribute( "line", sourceInfo.line );
-    }
-
-    void XmlReporter::noMatchingTestCases( std::string const& s ) {
-        StreamingReporterBase::noMatchingTestCases( s );
-    }
-
-    void XmlReporter::testRunStarting( TestRunInfo const& testInfo ) {
-        StreamingReporterBase::testRunStarting( testInfo );
-        std::string stylesheetRef = getStylesheetRef();
-        if( !stylesheetRef.empty() )
-            m_xml.writeStylesheetRef( stylesheetRef );
-        m_xml.startElement( "Catch" );
-        if( !m_config->name().empty() )
-            m_xml.writeAttribute( "name", m_config->name() );
-        if (m_config->testSpec().hasFilters())
-            m_xml.writeAttribute( "filters", serializeFilters( m_config->getTestsOrTags() ) );
-        if( m_config->rngSeed() != 0 )
-            m_xml.scopedElement( "Randomness" )
-                .writeAttribute( "seed", m_config->rngSeed() );
-    }
-
-    void XmlReporter::testGroupStarting( GroupInfo const& groupInfo ) {
-        StreamingReporterBase::testGroupStarting( groupInfo );
-        m_xml.startElement( "Group" )
-            .writeAttribute( "name", groupInfo.name );
-    }
-
-    void XmlReporter::testCaseStarting( TestCaseInfo const& testInfo ) {
-        StreamingReporterBase::testCaseStarting(testInfo);
-        m_xml.startElement( "TestCase" )
-            .writeAttribute( "name", trim( testInfo.name ) )
-            .writeAttribute( "description", testInfo.description )
-            .writeAttribute( "tags", testInfo.tagsAsString() );
-
-        writeSourceInfo( testInfo.lineInfo );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            m_testCaseTimer.start();
-        m_xml.ensureTagClosed();
-    }
-
-    void XmlReporter::sectionStarting( SectionInfo const& sectionInfo ) {
-        StreamingReporterBase::sectionStarting( sectionInfo );
-        if( m_sectionDepth++ > 0 ) {
-            m_xml.startElement( "Section" )
-                .writeAttribute( "name", trim( sectionInfo.name ) );
-            writeSourceInfo( sectionInfo.lineInfo );
-            m_xml.ensureTagClosed();
-        }
-    }
-
-    void XmlReporter::assertionStarting( AssertionInfo const& ) { }
-
-    bool XmlReporter::assertionEnded( AssertionStats const& assertionStats ) {
-
-        AssertionResult const& result = assertionStats.assertionResult;
-
-        bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
-
-        if( includeResults || result.getResultType() == ResultWas::Warning ) {
-            // Print any info messages in <Info> tags.
-            for( auto const& msg : assertionStats.infoMessages ) {
-                if( msg.type == ResultWas::Info && includeResults ) {
-                    m_xml.scopedElement( "Info" )
-                            .writeText( msg.message );
-                } else if ( msg.type == ResultWas::Warning ) {
-                    m_xml.scopedElement( "Warning" )
-                            .writeText( msg.message );
-                }
-            }
-        }
-
-        // Drop out if result was successful but we're not printing them.
-        if( !includeResults && result.getResultType() != ResultWas::Warning )
-            return true;
-
-        // Print the expression if there is one.
-        if( result.hasExpression() ) {
-            m_xml.startElement( "Expression" )
-                .writeAttribute( "success", result.succeeded() )
-                .writeAttribute( "type", result.getTestMacroName() );
-
-            writeSourceInfo( result.getSourceInfo() );
-
-            m_xml.scopedElement( "Original" )
-                .writeText( result.getExpression() );
-            m_xml.scopedElement( "Expanded" )
-                .writeText( result.getExpandedExpression() );
-        }
-
-        // And... Print a result applicable to each result type.
-        switch( result.getResultType() ) {
-            case ResultWas::ThrewException:
-                m_xml.startElement( "Exception" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::FatalErrorCondition:
-                m_xml.startElement( "FatalErrorCondition" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            case ResultWas::Info:
-                m_xml.scopedElement( "Info" )
-                    .writeText( result.getMessage() );
-                break;
-            case ResultWas::Warning:
-                // Warning will already have been written
-                break;
-            case ResultWas::ExplicitFailure:
-                m_xml.startElement( "Failure" );
-                writeSourceInfo( result.getSourceInfo() );
-                m_xml.writeText( result.getMessage() );
-                m_xml.endElement();
-                break;
-            default:
-                break;
-        }
-
-        if( result.hasExpression() )
-            m_xml.endElement();
-
-        return true;
-    }
-
-    void XmlReporter::sectionEnded( SectionStats const& sectionStats ) {
-        StreamingReporterBase::sectionEnded( sectionStats );
-        if( --m_sectionDepth > 0 ) {
-            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
-            e.writeAttribute( "successes", sectionStats.assertions.passed );
-            e.writeAttribute( "failures", sectionStats.assertions.failed );
-            e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
-
-            if ( m_config->showDurations() == ShowDurations::Always )
-                e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
-
-            m_xml.endElement();
-        }
-    }
-
-    void XmlReporter::testCaseEnded( TestCaseStats const& testCaseStats ) {
-        StreamingReporterBase::testCaseEnded( testCaseStats );
-        XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
-        e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
-
-        if ( m_config->showDurations() == ShowDurations::Always )
-            e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
-
-        if( !testCaseStats.stdOut.empty() )
-            m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), XmlFormatting::Newline );
-        if( !testCaseStats.stdErr.empty() )
-            m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), XmlFormatting::Newline );
-
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testGroupEnded( TestGroupStats const& testGroupStats ) {
-        StreamingReporterBase::testGroupEnded( testGroupStats );
-        // TODO: Check testGroupStats.aborting and act accordingly.
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
-            .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testGroupStats.totals.testCases.passed )
-            .writeAttribute( "failures", testGroupStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testGroupStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-    void XmlReporter::testRunEnded( TestRunStats const& testRunStats ) {
-        StreamingReporterBase::testRunEnded( testRunStats );
-        m_xml.scopedElement( "OverallResults" )
-            .writeAttribute( "successes", testRunStats.totals.assertions.passed )
-            .writeAttribute( "failures", testRunStats.totals.assertions.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
-        m_xml.scopedElement( "OverallResultsCases")
-            .writeAttribute( "successes", testRunStats.totals.testCases.passed )
-            .writeAttribute( "failures", testRunStats.totals.testCases.failed )
-            .writeAttribute( "expectedFailures", testRunStats.totals.testCases.failedButOk );
-        m_xml.endElement();
-    }
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkPreparing(std::string const& name) {
-        m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", name);
-    }
-
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
-        m_xml.writeAttribute("samples", info.samples)
-            .writeAttribute("resamples", info.resamples)
-            .writeAttribute("iterations", info.iterations)
-            .writeAttribute("clockResolution", info.clockResolution)
-            .writeAttribute("estimatedDuration", info.estimatedDuration)
-            .writeComment("All values in nano seconds");
-    }
-
-    void XmlReporter::benchmarkEnded(BenchmarkStats<> const& benchmarkStats) {
-        m_xml.startElement("mean")
-            .writeAttribute("value", benchmarkStats.mean.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.mean.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.mean.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.mean.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("standardDeviation")
-            .writeAttribute("value", benchmarkStats.standardDeviation.point.count())
-            .writeAttribute("lowerBound", benchmarkStats.standardDeviation.lower_bound.count())
-            .writeAttribute("upperBound", benchmarkStats.standardDeviation.upper_bound.count())
-            .writeAttribute("ci", benchmarkStats.standardDeviation.confidence_interval);
-        m_xml.endElement();
-        m_xml.startElement("outliers")
-            .writeAttribute("variance", benchmarkStats.outlierVariance)
-            .writeAttribute("lowMild", benchmarkStats.outliers.low_mild)
-            .writeAttribute("lowSevere", benchmarkStats.outliers.low_severe)
-            .writeAttribute("highMild", benchmarkStats.outliers.high_mild)
-            .writeAttribute("highSevere", benchmarkStats.outliers.high_severe);
-        m_xml.endElement();
-        m_xml.endElement();
-    }
-
-    void XmlReporter::benchmarkFailed(std::string const &error) {
-        m_xml.scopedElement("failed").
-            writeAttribute("message", error);
-        m_xml.endElement();
-    }
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-    CATCH_REGISTER_REPORTER( "xml", XmlReporter )
-
-} // end namespace Catch
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-// end catch_reporter_xml.cpp
-
-namespace Catch {
-    LeakDetector leakDetector;
-}
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
-// end catch_impl.hpp
-#endif
-
-#ifdef CATCH_CONFIG_MAIN
-// start catch_default_main.hpp
-
-#ifndef __OBJC__
-
-#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
-// Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
-#else
-// Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
-#endif
-
-    return Catch::Session().run( argc, argv );
-}
-
-#else // __OBJC__
-
-// Objective-C entry point
-int main (int argc, char * const argv[]) {
-#if !CATCH_ARC_ENABLED
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-#endif
-
-    Catch::registerTestMethods();
-    int result = Catch::Session().run( argc, (char**)argv );
-
-#if !CATCH_ARC_ENABLED
-    [pool drain];
-#endif
-
-    return result;
-}
-
-#endif // __OBJC__
-
-// end catch_default_main.hpp
-#endif
-
-#if !defined(CATCH_CONFIG_IMPL_ONLY)
-
-#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
-#  undef CLARA_CONFIG_MAIN
-#endif
-
-#if !defined(CATCH_CONFIG_DISABLE)
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define CATCH_REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CATCH_CHECK( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CATCH_CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CATCH_CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CATCH_CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
-#define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
-#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE",__VA_ARGS__ )
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define CATCH_DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define CATCH_STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__ ,      #__VA_ARGS__ );     CATCH_SUCCEED( #__VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); CATCH_SUCCEED( #__VA_ARGS__ )
-#else
-#define CATCH_STATIC_REQUIRE( ... )       CATCH_REQUIRE( __VA_ARGS__ )
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) CATCH_REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-#define CATCH_GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define CATCH_AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define CATCH_WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define CATCH_AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define CATCH_THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define CATCH_AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, __VA_ARGS__  )
-#define REQUIRE_FALSE( ... ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-
-#define REQUIRE_THROWS( ... ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
-#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "REQUIRE_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::Normal, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, __VA_ARGS__ )
-
-#define CHECK( ... ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_FALSE( ... ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, __VA_ARGS__ )
-#define CHECKED_IF( ... ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECKED_ELSE( ... ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_NOFAIL( ... ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, __VA_ARGS__ )
-
-#define CHECK_THROWS( ... )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
-#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS_STR_MATCHES( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) INTERNAL_CATCH_THROWS_MATCHES( "CHECK_THROWS_MATCHES", exceptionType, Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
-
-#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
-#define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
-#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
-#define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE",__VA_ARGS__ )
-
-#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
-#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
-#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
-#define DYNAMIC_SECTION( ... ) INTERNAL_CATCH_DYNAMIC_SECTION( __VA_ARGS__ )
-#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
-#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE()
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(__VA_ARGS__)
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE( __VA_ARGS__ ) )
-#define TEMPLATE_LIST_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD( className, __VA_ARGS__ ) )
-#endif
-
-#if !defined(CATCH_CONFIG_RUNTIME_STATIC_REQUIRE)
-#define STATIC_REQUIRE( ... )       static_assert(   __VA_ARGS__,  #__VA_ARGS__ ); SUCCEED( #__VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) static_assert( !(__VA_ARGS__), "!(" #__VA_ARGS__ ")" ); SUCCEED( "!(" #__VA_ARGS__ ")" )
-#else
-#define STATIC_REQUIRE( ... )       REQUIRE( __VA_ARGS__ )
-#define STATIC_REQUIRE_FALSE( ... ) REQUIRE_FALSE( __VA_ARGS__ )
-#endif
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
-
-#define GIVEN( desc )     INTERNAL_CATCH_DYNAMIC_SECTION( "    Given: " << desc )
-#define AND_GIVEN( desc ) INTERNAL_CATCH_DYNAMIC_SECTION( "And given: " << desc )
-#define WHEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     When: " << desc )
-#define AND_WHEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( " And when: " << desc )
-#define THEN( desc )      INTERNAL_CATCH_DYNAMIC_SECTION( "     Then: " << desc )
-#define AND_THEN( desc )  INTERNAL_CATCH_DYNAMIC_SECTION( "      And: " << desc )
-
-#if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-#define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
-#define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
-#endif // CATCH_CONFIG_ENABLE_BENCHMARKING
-
-using Catch::Detail::Approx;
-
-#else // CATCH_CONFIG_DISABLE
-
-//////
-// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
-#ifdef CATCH_CONFIG_PREFIX_ALL
-
-#define CATCH_REQUIRE( ... )        (void)(0)
-#define CATCH_REQUIRE_FALSE( ... )  (void)(0)
-
-#define CATCH_REQUIRE_THROWS( ... ) (void)(0)
-#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_REQUIRE_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif// CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CATCH_CHECK( ... )         (void)(0)
-#define CATCH_CHECK_FALSE( ... )   (void)(0)
-#define CATCH_CHECKED_IF( ... )    if (__VA_ARGS__)
-#define CATCH_CHECKED_ELSE( ... )  if (!(__VA_ARGS__))
-#define CATCH_CHECK_NOFAIL( ... )  (void)(0)
-
-#define CATCH_CHECK_THROWS( ... )  (void)(0)
-#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CATCH_CHECK_THROWS_WITH( expr, matcher )     (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CATCH_CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CATCH_CHECK_THAT( arg, matcher )   (void)(0)
-
-#define CATCH_REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define CATCH_INFO( msg )          (void)(0)
-#define CATCH_UNSCOPED_INFO( msg ) (void)(0)
-#define CATCH_WARN( msg )          (void)(0)
-#define CATCH_CAPTURE( msg )       (void)(0)
-
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_METHOD_AS_TEST_CASE( method, ... )
-#define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define CATCH_SECTION( ... )
-#define CATCH_DYNAMIC_SECTION( ... )
-#define CATCH_FAIL( ... ) (void)(0)
-#define CATCH_FAIL_CHECK( ... ) (void)(0)
-#define CATCH_SUCCEED( ... ) (void)(0)
-
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) CATCH_TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) CATCH_TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-// "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
-#define CATCH_GIVEN( desc )
-#define CATCH_AND_GIVEN( desc )
-#define CATCH_WHEN( desc )
-#define CATCH_AND_WHEN( desc )
-#define CATCH_THEN( desc )
-#define CATCH_AND_THEN( desc )
-
-#define CATCH_STATIC_REQUIRE( ... )       (void)(0)
-#define CATCH_STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
-#else
-
-#define REQUIRE( ... )       (void)(0)
-#define REQUIRE_FALSE( ... ) (void)(0)
-
-#define REQUIRE_THROWS( ... ) (void)(0)
-#define REQUIRE_THROWS_AS( expr, exceptionType ) (void)(0)
-#define REQUIRE_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define REQUIRE_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define REQUIRE_NOTHROW( ... ) (void)(0)
-
-#define CHECK( ... ) (void)(0)
-#define CHECK_FALSE( ... ) (void)(0)
-#define CHECKED_IF( ... ) if (__VA_ARGS__)
-#define CHECKED_ELSE( ... ) if (!(__VA_ARGS__))
-#define CHECK_NOFAIL( ... ) (void)(0)
-
-#define CHECK_THROWS( ... )  (void)(0)
-#define CHECK_THROWS_AS( expr, exceptionType ) (void)(0)
-#define CHECK_THROWS_WITH( expr, matcher ) (void)(0)
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THROWS_MATCHES( expr, exceptionType, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-#define CHECK_NOTHROW( ... ) (void)(0)
-
-#if !defined(CATCH_CONFIG_DISABLE_MATCHERS)
-#define CHECK_THAT( arg, matcher ) (void)(0)
-
-#define REQUIRE_THAT( arg, matcher ) (void)(0)
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
-#define INFO( msg ) (void)(0)
-#define UNSCOPED_INFO( msg ) (void)(0)
-#define WARN( msg ) (void)(0)
-#define CAPTURE( msg ) (void)(0)
-
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define METHOD_AS_TEST_CASE( method, ... )
-#define REGISTER_TEST_CASE( Function, ... ) (void)(0)
-#define SECTION( ... )
-#define DYNAMIC_SECTION( ... )
-#define FAIL( ... ) (void)(0)
-#define FAIL_CHECK( ... ) (void)(0)
-#define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-
-#ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__)
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#else
-#define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_SIG( ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(__VA_ARGS__) )
-#define TEMPLATE_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_TEST_CASE_METHOD_SIG( className, ... ) INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION(className, __VA_ARGS__ ) )
-#define TEMPLATE_PRODUCT_TEST_CASE( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_SIG( ... ) TEMPLATE_TEST_CASE( __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#define TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( className, ... ) TEMPLATE_TEST_CASE_METHOD( className, __VA_ARGS__ )
-#endif
-
-#define STATIC_REQUIRE( ... )       (void)(0)
-#define STATIC_REQUIRE_FALSE( ... ) (void)(0)
-
-#endif
-
-#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
-
-// "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
-
-#define GIVEN( desc )
-#define AND_GIVEN( desc )
-#define WHEN( desc )
-#define AND_WHEN( desc )
-#define THEN( desc )
-#define AND_THEN( desc )
-
-using Catch::Detail::Approx;
-
-#endif
-
-#endif // ! CATCH_CONFIG_IMPL_ONLY
-
-// start catch_reenable_warnings.h
-
-
-#ifdef __clang__
-#    ifdef __ICC // icpc defines the __clang__ macro
-#        pragma warning(pop)
-#    else
-#        pragma clang diagnostic pop
-#    endif
-#elif defined __GNUC__
-#    pragma GCC diagnostic pop
-#endif
-
-// end catch_reenable_warnings.h
-// end catch.hpp
-#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
-
diff --git a/Src/Scarab/testing/glob_path/README.md b/Src/Scarab/testing/glob_path/README.md
deleted file mode 100644
index ce6f045..0000000
--- a/Src/Scarab/testing/glob_path/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory is just for testing if glob feature in path utility works properly. Please don't add any sub directories/files other than the ones that already exists. 
diff --git a/Src/Scarab/testing/glob_path/sub1/sub1sub1/glob_sub1sub1.txt b/Src/Scarab/testing/glob_path/sub1/sub1sub1/glob_sub1sub1.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub1/sub1sub2/glob_sub1sub2.txt b/Src/Scarab/testing/glob_path/sub1/sub1sub2/glob_sub1sub2.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub1/sub1sub3/glob_sub1sub3.txt b/Src/Scarab/testing/glob_path/sub1/sub1sub3/glob_sub1sub3.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_3.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_3.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub3/glob_sub2sub1sub3.txt b/Src/Scarab/testing/glob_path/sub2/sub2sub1/sub2sub1sub3/glob_sub2sub1sub3.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt b/Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt
deleted file mode 100644
index 5d0b8fd..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/CMakeLists.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-cmake_minimum_required (VERSION 3.1)
-
-cmake_policy( SET CMP0048 NEW ) # version in project()
-project( NestedPBTest VERSION 1.0.0 )
-
-### 
-if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/create_nesting.sh.in ${CMAKE_CURRENT_BINARY_DIR}/create_nesting.sh @ONLY )
-    execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/create_nesting.sh
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-    if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
-        message( STATUS "Created submodule `scarab`" )
-    else()
-        message( FATAL "Did not create submodule" )
-    endif()
-endif()
-###
-
-list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scarab/cmake )
-
-include( PackageBuilder )
-
-
-#########
-# Options
-#########
-
-##############
-# Dependencies
-##############
-
-
-# before adding submodules and building the project
-pbuilder_prepare_project()
-
-########
-# Scarab
-########
-
-pbuilder_add_submodule( Scarab scarab ) # first use of Scarab is the direct submodule, so the scarab submodule of PBTest should be skipped
-pbuilder_add_submodule( PBTest PBTest )
-
-
-#########
-# Library
-#########
-
-include_directories( BEFORE library )
-
-pbuilder_use_sm_library( Scarab Scarab )
-pbuilder_use_sm_library( PBTest PBTest )
-
-set( NestedPBTest_HEADERS
-    library/nested_print.hh
-)
-
-set( NestedPBTest_SOURCES 
-    library/nested_print.cc
-)
-
-pbuilder_library( 
-    TARGET NestedPBTest 
-    SOURCES ${NestedPBTest_SOURCES}
-#    PROJECT_LIBRARIES ${PACKAGE_LIBS} 
-#    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-#    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Library
-    LIBTARGETS NestedPBTest
-)
-
-pbuilder_install_headers( ${NestedPBTest_HEADERS} )
-
-############
-# Executable
-############
-
-if( NestedPBTest_ENABLE_EXECUTABLES )
-    set( PACKAGE_LIBS
-        NestedPBTest
-    )
-
-    set( NestedPBTest_sources
-        executable/nested_do_print.cc
-    )
-
-    pbuilder_executables( NestedPBTest_sources PACKAGE_LIBS PUBLIC_EXT_LIBS PRIVATE_EXT_LIBS )
-    set( programs )
-    pbuilder_executables( 
-        SOURCES ${NestedPBTest_sources}
-        TARGETS_VAR programs
-        PROJECT_LIBRARIES ${PACKAGE_LIBS}
-#        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-    )
-
-    pbuilder_component_install_and_export( 
-        COMPONENT Executables
-        EXETARGETS ${programs}
-    )
-endif()
-
-########
-# Config
-########
-
-configure_file( ${PROJECT_SOURCE_DIR}/NestedPBTestConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/NestedPBTestConfig.cmake @ONLY )
-
-pbuilder_do_package_config()
-
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in b/Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in
deleted file mode 100644
index e2422ed..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/NestedPBTestConfig.cmake.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# NestedPBTestConfig.cmake
-
-get_filename_component( NestedPBTest_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
-
-# Find the dependencies
-include( CMakeFindDependencyMacro )
-find_dependency( PBTest REQUIRED PATHS ${NestedPBTest_CMAKE_DIR}/PBTest @PBTest_BINARY_LOCATION@ )
-find_dependency( Scarab REQUIRED PATHS ${NestedPBTest_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
-
-# Import targets if they're not already present
-if( NOT TARGET NestedPBTest::@NestedPBTest_FULL_PROJECT_NAME@ )
-    if( TARGET @NestedPBTest_FULL_PROJECT_NAME@ )
-        add_library( NestedPBTest::@NestedPBTest_FULL_PROJECT_NAME@ ALIAS @NestedPBTest_FULL_PROJECT_NAME@ )
-    else()
-        include("${NestedPBTest_CMAKE_DIR}/NestedPBTest_Libary_Targets.cmake")
-    endif()
-endif()
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/README.md b/Src/Scarab/testing/package_builder/NestedPBTest/README.md
deleted file mode 100644
index 2e9b98f..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# PackageBuilder Test
-
-This directory contains the infrastructure to test the nested-submodules aspects of the PackageBuilder framework.
-
-Scarab's PackageBuilder provides the framework for using multiply-nested submodules.  To test these features, we need to be able to make Scarab a submodule of the test project.  Therefore we've included the script `create_nesting.sh`, which is used by CMake to copy all of the contents of the scarab directory to a subdirectory called `scarab` (excluding anything listed in the `.gitignore` file), and the `testing/PBTest` directory to a subdirectory called `PBTest`.  `PBTest` also includes its own copy of `scarab`.  Then you can use the `CMakeLists.txt` file in this directory to test the submodule framework in PackageBuilder.
-
-## Usage
-
-```
-> cd /top/level/of/Scarab/testing/package_builder/NestedPBTest
-> mkdir build
-> cd build
-> cmake ..
-> make install
-```
-
-For development, if working on Scarab and building in a subdirectory of `testing/package_builder/NestedPBTest`, be sure to clean scarab and PBTEst before re-testing the CMake process:
-
-```
-rm -rf ../scarab ../PBTest
-cmake ..
-```
-
-## Cleanup
-
-```
-> cd /top/level/of/Scarab/testing/package_builder/NestedPBTest
-> rm -rf scarab PBTest
-```
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in b/Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in
deleted file mode 100755
index 0f8bb51..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/create_nesting.sh.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/bash
-
-echo "Copying scarab"
-rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/../../.. @CMAKE_CURRENT_SOURCE_DIR@/scarab
-
-echo "Copying PBTest"
-rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/../PBTest @CMAKE_CURRENT_SOURCE_DIR@
-
-echo "Copying PBTest/scarab"
-rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/scarab @CMAKE_CURRENT_SOURCE_DIR@/PBTest
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc b/Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc
deleted file mode 100644
index 0311031..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/executable/nested_do_print.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// nested_do_print.cc
-// Author: N.S. Oblath
-// Date: Jun 1, 2020
-
-#include "nested_print.hh"
-#include "print.hh"
-
-int main()
-{
-    nested_pbtest::print( scarab::param_value("Hello, Nested World") );
-    pbtest::print( scarab::param_value("Hello, World") );
-
-    return 0;
-}
\ No newline at end of file
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc b/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc
deleted file mode 100644
index 68320f4..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// nested_print.cc
-// Author: N.S. Oblath
-// Date: Jun 4, 2020
-
-#include "nested_print.hh"
-
-#include "logger.hh"
-
-LOGGER( plog, "nested_print" );
-
-namespace nested_pbtest
-{
-    void print( const scarab::param& a_param )
-    {
-        LINFO( plog, "NESTED:\n" << a_param );
-        return;
-    }
-}
diff --git a/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh b/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh
deleted file mode 100644
index 5424894..0000000
--- a/Src/Scarab/testing/package_builder/NestedPBTest/library/nested_print.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-// print.hh
-// Author: N.S. Oblath
-// Date: Jun 1, 2020
-
-#ifndef NESTEDPBTEST_PRINT_HH_
-#define NESTEDPBTEST_PRINT_HH_
-
-#include "param.hh"
-
-namespace nested_pbtest
-{
-
-    void print( const scarab::param& a_param );
-
-} /* end namespace nested_pbtest */
-
-#endif /* NESTEDPBTEST_PRINT_HH_ */
diff --git a/Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt b/Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt
deleted file mode 100644
index 355dc7a..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/CMakeLists.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-cmake_minimum_required (VERSION 3.1)
-
-cmake_policy( SET CMP0048 NEW ) # version in project()
-project( PBTest VERSION 1.0.0 )
-
-### 
-if( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/copy_scarab.sh.in ${CMAKE_CURRENT_BINARY_DIR}/copy_scarab.sh @ONLY )
-    execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/copy_scarab.sh
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-    if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/scarab )
-        message( STATUS "Created submodule `scarab`" )
-    else()
-        message( FATAL "Did not create submodule" )
-    endif()
-endif()
-###
-
-list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scarab/cmake )
-
-include( PackageBuilder )
-
-message( STATUS "Full project name for <${PROJECT_NAME}: ${${PROJECT_NAME}_FULL_PROJECT_NAME}" )
-
-
-#########
-# Options
-#########
-
-##############
-# Dependencies
-##############
-
-
-
-# before adding submodules and building the project
-pbuilder_prepare_project()
-
-########
-# Scarab
-########
-
-pbuilder_add_submodule( Scarab scarab )
-
-
-#########
-# Library
-#########
-
-include_directories( BEFORE library )
-
-pbuilder_use_sm_library( Scarab Scarab )
-
-set( PBTest_HEADERS
-    library/print.hh
-)
-
-set( PBTest_SOURCES 
-    library/print.cc
-)
-
-pbuilder_library( 
-    TARGET PBTest 
-    SOURCES ${PBTest_SOURCES}
-#    PROJECT_LIBRARIES ${PACKAGE_LIBS} 
-#    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-#    PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
-
-pbuilder_component_install_and_export( 
-    COMPONENT Library
-    LIBTARGETS PBTest
-)
-
-pbuilder_install_headers( ${PBTest_HEADERS} )
-
-############
-# Executable
-############
-
-if( PBTest_ENABLE_EXECUTABLES )
-    set( PACKAGE_LIBS
-        PBTest
-    )
-
-    set( PBTest_sources
-        executable/do_print.cc
-    )
-
-    set( programs )
-    pbuilder_executables( 
-        SOURCES ${PBTest_sources}
-        TARGETS_VAR programs
-        PROJECT_LIBRARIES ${PACKAGE_LIBS}
-#        PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-    )
-
-    pbuilder_component_install_and_export( 
-        COMPONENT Executables
-        EXETARGETS ${programs}
-    )
-endif()
-
-########
-# Config
-########
-
-configure_file( ${PROJECT_SOURCE_DIR}/PBTestConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PBTestConfig.cmake @ONLY )
-
-pbuilder_do_package_config()
diff --git a/Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in b/Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in
deleted file mode 100644
index 498fdd5..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/PBTestConfig.cmake.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# PBTestConfig.cmake
-
-get_filename_component( PBTest_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
-
-# Find the dependencies
-include( CMakeFindDependencyMacro )
-find_dependency( Scarab REQUIRED PATHS ${PBTest_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
-
-# Import library targets if they're not already present
-if( NOT TARGET PBTest::@PBTest_FULL_PROJECT_NAME@ )
-    if( TARGET @PBTest_FULL_PROJECT_NAME@ )
-        add_library( PBTest::@PBTest_FULL_PROJECT_NAME@ ALIAS @PBTest_FULL_PROJECT_NAME@ )
-    else()
-        include("${PBTest_CMAKE_DIR}/PBTest_Library_Targets.cmake")
-    endif()
-endif()
diff --git a/Src/Scarab/testing/package_builder/PBTest/README.md b/Src/Scarab/testing/package_builder/PBTest/README.md
deleted file mode 100644
index 95a9043..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# PackageBuilder Test
-
-This directory contains the infrastructure to test the PackageBuilder framework, including the use of submodules.
-
-Scarab's PackageBuilder provides the framework for using multiply-nested submodules.  To test these features, we need to be able to make Scarab a submodule of the test project.  Therefore we've included the script `copy_scarab.sh`, which is called by CMake to copy all of the contents of the scarab directory to a subdirectory called `scarab` (excluding anything listed in the `.gitignore` file).  Then you can use the `CMakeLists.txt` file in this directory to test the submodule framework in PackageBuilder.
-
-## Usage
-
-```
-> cd /top/level/of/Scarab/testing/package_builder/PBTest
-> mkdir build
-> cd build
-> cmake ..
-> make install
-```
-
-For development, if working on Scarab and building in a subdirectory of `testing/package_builder/PBTest`, be sure to clean scarab before re-testing the CMake process:
-
-```
-rm -rf ../scarab
-cmake ..
-```
-
-## Cleanup
-
-```
-> cd /top/level/of/Scarab/testing/package_builder/PBTest
-> rm -rf scarab
-```
diff --git a/Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in b/Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in
deleted file mode 100755
index fc7e131..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/copy_scarab.sh.in
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /bin/bash
-
-echo "Copying Scarab"
-rsync -a --exclude-from='@CMAKE_CURRENT_SOURCE_DIR@/../../../.gitignore' @CMAKE_CURRENT_SOURCE_DIR@/../../.. @CMAKE_CURRENT_SOURCE_DIR@/scarab
diff --git a/Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc b/Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc
deleted file mode 100644
index a56a5b8..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/executable/do_print.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-// print.cc
-// Author: N.S. Oblath
-// Date: May 4, 2020
-
-#include "print.hh"
-
-int main()
-{
-    pbtest::print( scarab::param_value("Hello, World") );
-
-    return 0;
-}
\ No newline at end of file
diff --git a/Src/Scarab/testing/package_builder/PBTest/library/print.cc b/Src/Scarab/testing/package_builder/PBTest/library/print.cc
deleted file mode 100644
index 8785550..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/library/print.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-// print.cc
-// Author: N.S. Oblath
-// Date: May 4, 2020
-
-#include "print.hh"
-
-#include "logger.hh"
-
-LOGGER( plog, "print" );
-
-namespace pbtest
-{
-    void print( const scarab::param& a_param )
-    {
-        LINFO( plog, a_param );
-        return;
-    }
-}
diff --git a/Src/Scarab/testing/package_builder/PBTest/library/print.hh b/Src/Scarab/testing/package_builder/PBTest/library/print.hh
deleted file mode 100644
index ac4e3b3..0000000
--- a/Src/Scarab/testing/package_builder/PBTest/library/print.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-// print.hh
-// Author: N.S. Oblath
-// Date: May 4, 2020
-
-#ifndef PBTEST_PRINT_HH_
-#define PBTEST_PRINT_HH_
-
-#include "param.hh"
-
-namespace pbtest
-{
-
-    void print( const scarab::param& a_param );
-
-} /* end namespace pbtest */
-
-#endif /* PBTEST_PRINT_HH_ */
diff --git a/Src/Scarab/testing/stream_check.cc b/Src/Scarab/testing/stream_check.cc
deleted file mode 100644
index bb36267..0000000
--- a/Src/Scarab/testing/stream_check.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * stream_check.cc
- *
- *  Created on: Jul 17, 2020
- *      Author: N.S. Oblath
- */
-
-#include "stream_check.hh"
-
-
-namespace scarab
-{
-    namespace testing
-    {
-
-        bool compare_and_clear( std::stringstream* a_stream, const std::string& a_test )
-        {
-            std::string t_log( a_stream->str() );
-            if( t_log.empty() && a_test.empty() ) return true;
-            bool t_result = t_log.compare( t_log.size() - a_test.size(), a_test.size(), a_test );
-            a_stream->str("");
-            return t_result;
-        }
-
-    } /* namespace testing */
-} /* namespace scarab */
diff --git a/Src/Scarab/testing/stream_check.hh b/Src/Scarab/testing/stream_check.hh
deleted file mode 100644
index e91f0aa..0000000
--- a/Src/Scarab/testing/stream_check.hh
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * stream_check.hh
- *
- *  Created on: Jul 17, 2020
- *      Author: N.S. Oblath
- */
-
-#ifndef SCARAB_TESTING_STREAM_CHECK_HH_
-#define SCARAB_TESTING_STREAM_CHECK_HH_
-
-#include <sstream>
-
-
-namespace scarab
-{
-    namespace testing
-    {
-
-        bool compare_and_clear( std::stringstream* a_stream, const std::string& a_test );
-
-    } /* namespace testing */
-} /* namespace scarab */
-
-#endif /* SCARAB_TESTING_STREAM_CHECK_HH_ */
\ No newline at end of file
diff --git a/Src/Scarab/testing/test_digital.cc b/Src/Scarab/testing/test_digital.cc
deleted file mode 100644
index b8af3a5..0000000
--- a/Src/Scarab/testing/test_digital.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * test_digital.cc
- *
- *  Created on: Feb 15, 2019
- *      Author: N.S. Oblath
- *
- *  Expected output (approximately for the floating-point side of the DAC tests)
- *
-
- *
- *      DAC Unsigned Test
- *      0 --> 0
- *      0 --> 0
- *      26 --> 0.101562
- *      128 --> 0.5
- *      230 --> 0.898438
- *      255 --> 0.996094
- *      255 --> 0.996094
- *
- *      DAC Signed Test
- *      -128 --> -0.5
- *      -128 --> -0.5
- *      -102 --> -0.398438
- *      0 --> 0
- *      102 --> 0.398438
- *      127 --> 0.496094
- *      127 --> 0.496094
- *
- */
-
-#include "digital.hh"
-
-#include "catch.hpp"
-
-#include <iostream>
-
-
-TEST_CASE( "digital", "[utility]" )
-{
-    SECTION( "adc_unsigned" )
-    {
-        std::cout << "ADC Unsigned Test" << std::endl;
-        // 8 bit digitized data
-        // V offset = 0 V
-        // V range = 1 V
-        // Expected analog data: varying between 0 V and 1 V
-
-        scarab::dig_calib_params t_params;
-        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
-
-        std::vector< double > t_analog{ -0.1, 0., 0.1, 0.5, 0.9, 1.0, 1.1 };
-        std::vector< unsigned > t_digital{ 0, 0, 26, 128, 230, 255, 255 };
-
-        for( unsigned i = 0; i < t_analog.size(); ++i )
-        {
-            REQUIRE( scarab::a2d< double, unsigned >( t_analog[i], &t_params ) == t_digital[i] );
-        }
-    }
-
-    SECTION( "adc_signed" )
-    {
-        std::cout << "ADC Signed Test" << std::endl;
-        // 8 bit digitized data
-        // V offset = 0 V
-        // V range = 1 V
-        // Expected analog data: symmetric about 0 V with maximum deviation of +/- 0.5 V
-
-        scarab::dig_calib_params t_params;
-        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
-
-        std::vector< double > t_analog{ -0.6, -0.5, -0.4, 0., 0.4, 0.5, 0.6 };
-        std::vector< int > t_digital{ -128, -128, -102, 0, 102, 127, 127 };
-
-        for( unsigned i = 0; i < t_analog.size(); ++i )
-        {
-            REQUIRE( scarab::a2d< double, int >( t_analog[i], &t_params ) == t_digital[i] );
-        }
-    }
-
-    SECTION( "dac_unsigned" )
-    {
-        std::cout << "DAC Unsigned Test" << std::endl;
-        // 8 bit digitized data
-        // V offset = 0 V
-        // V range = 1 V
-        // Expected analog data: varying between 0 V and 1 V
-
-        scarab::dig_calib_params t_params;
-        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
-
-        std::vector< double > t_analog{ 0., 0.1, 0.5, 0.9, 1.0 };
-        std::vector< unsigned > t_digital{ 0, 26, 128, 230, 255 };
-
-        const double t_tolerance = t_params.v_range * t_params.inv_levels;
-
-        for( unsigned i = 0; i < t_digital.size(); ++i )
-        {
-            REQUIRE_THAT( (scarab::d2a< unsigned, double >( t_digital[i], &t_params )), Catch::WithinAbs( t_analog[i], t_tolerance ) );
-        }
-    }
-
-    SECTION( "dac_signed" )
-    {
-        std::cout << "DAC Signed Test" << std::endl;
-        // 8 bit digitized data
-        // V offset = 0 V
-        // V range = 1 V
-        // Expected analog data: varying between 0 V and 1 V
-
-        scarab::dig_calib_params t_params;
-        scarab::get_calib_params( 8, 1, 0., 1., true, &t_params );
-
-        std::vector< double > t_analog{ -0.5, -0.4, 0., 0.4, 0.5 };
-        std::vector< int > t_digital{ -128, -102, 0, 102, 127 };
-
-        const double t_tolerance = t_params.v_range * t_params.inv_levels;
-
-        for( unsigned i = 0; i < t_digital.size(); ++i )
-        {
-            REQUIRE_THAT( (scarab::d2a< int, double >( t_digital[i], &t_params )), Catch::WithinAbs( t_analog[i], t_tolerance ) );
-        }
-    }
-}
diff --git a/Src/Scarab/testing/test_exponential_backoff.cc b/Src/Scarab/testing/test_exponential_backoff.cc
deleted file mode 100644
index 4a7f760..0000000
--- a/Src/Scarab/testing/test_exponential_backoff.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * test_exponential_backoff.cc
- *
- *  Created on: Jun 17, 2021
- *      Author: N.S. Oblath
- */
-
-#include "exponential_backoff.hh"
-
-#include "catch.hpp"
-
-#include <chrono>
-
-using namespace std::chrono;
-
-TEST_CASE( "exponential_backoff", "[utility]" )
-{
-    unsigned t_value = 0; // value to increment, allowing verification that the function executed; check that this has changed from the before-test value
-    unsigned t_attempts = 0; // how many attempts the increment function should wait; set this to the desired number of attempts before a test
-    unsigned t_attempt = 0; // used by the function to track how many attempts have been attempted; set to 0 before executing the exponential backoff.  if test succeeded, this will equal the return value of the go() function
-    unsigned t_max_attempts = 10; // maximum attempts
-    unsigned t_return = 0; // stores the return value; should match t_attempt
-
-    // this function will wait for a specified number of attempts (t_attempts), 
-    // returning false each time until t_attempt == t_attempts; then it returns true.
-    auto t_increment = [&]()->bool
-    {
-        ++t_attempt;
-        if( t_attempt < t_attempts )
-        {
-            return false;
-        }
-
-        ++t_value;
-        return true;
-    };
-
-    REQUIRE_THROWS_AS( scarab::exponential_backoff<>( t_increment, 0 ), scarab::error );
-
-    // the exponential-backoff test object
-    scarab::exponential_backoff<> t_exp_back( t_increment, t_max_attempts );
-
-    // test: just verify that the function gets called
-    // t_value == 0
-    t_attempts = 1; t_attempt = 0;
-    t_return = t_exp_back.go();
-
-    REQUIRE( t_value == 1 );
-    REQUIRE( t_attempt == t_return );
-    REQUIRE( t_return == 1 );
-
-    // test: do multiple attempts
-    // t_value == 1
-    t_attempts = 3; t_attempt = 0;
-    auto t_start = high_resolution_clock::now();
-    t_return = t_exp_back.go();
-    auto t_end = high_resolution_clock::now();
-    auto t_duration = duration_cast< milliseconds >( t_end - t_start );
-
-    REQUIRE( t_value == 2 );
-    REQUIRE( t_attempt == t_return );
-    REQUIRE( t_return == 3 );
-    // this test was removed because it caused strange problems on the mac GitHub Actions test, even though all other indications showed that the backoff was working
-    //REQUIRE( t_duration.count() == Approx(200+400+t_attempts*15).margin(t_attempts*15) );
-
-    // test: do max attempts
-    // t_value == 2
-    t_attempts = t_max_attempts; t_attempt = 0;
-    t_start = high_resolution_clock::now();
-    t_return = t_exp_back.go();
-    t_end = high_resolution_clock::now();
-    t_duration = duration_cast< milliseconds >( t_end - t_start );
-
-    REQUIRE( t_value == 3 );
-    REQUIRE( t_attempt == t_return );
-    REQUIRE( t_return == 10 );
-    // this test was removed because it caused strange problems on the mac GitHub Actions test, even though all other indications showed that the backoff was working
-    //REQUIRE( t_duration.count() == Approx(200+400+800+1600+3200+6400+12800+25600+51200+t_attempts*15).margin(t_attempts*15) );
-
-    // test: exceed max attempts
-    // t_value == 3
-    t_attempts = t_max_attempts + 1; t_attempt = 0;
-    t_return = t_exp_back.go();
-
-    REQUIRE( t_value == 3 ); // because function was never successfully executed
-    REQUIRE( t_attempt == t_max_attempts );
-    REQUIRE( t_return == 0 );
-
-
-}
diff --git a/Src/Scarab/testing/test_json.cc b/Src/Scarab/testing/test_json.cc
deleted file mode 100644
index 6bdb306..0000000
--- a/Src/Scarab/testing/test_json.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * test_json.cc
- *
- *  Created on: Jul 18, 2018
- *      Author: N.S. Oblath
- *
- */
-
-#include "param.hh"
-#include "param_json.hh"
-
-#include "catch.hpp"
-
-#include <iostream>
-
-
-using scarab::param_node;
-using scarab::param_value;
-using scarab::param_array;
-using scarab::param_ptr_t;
-using scarab::param_output_json;
-using scarab::param_input_json;
-
-TEST_CASE( "json", "[param][param_codec]" )
-{
-    param_ptr_t t_input( new param_node() );
-    param_node& t_input_node = t_input->as_node();
-
-    t_input_node.add( "string", "hello, world" );
-    
-    param_array t_input_array;
-    t_input_array.push_back( 10 );
-    t_input_array.push_back( "I'm in an array!" );
-
-    param_node t_input_nested_node;
-    t_input_nested_node.add( "first", "abcdefg" );
-    t_input_nested_node.add( "second", "hijklmnop" );
-    t_input_nested_node.add( "third", "qrstuv" );
-    t_input_nested_node.add( "fourth", "wxyz" );
-
-    t_input_node.add( "array", std::move(t_input_array) );
-    t_input_node.add( "node", std::move(t_input_nested_node) );
-
-    param_output_json t_writer;
-    std::string t_written;
-    t_writer.write_string( *t_input, t_written );
-
-    param_input_json t_reader;
-    param_ptr_t t_output( t_reader.read_string( t_written ) );
-
-    REQUIRE( t_output->is_node() );
-    param_node& t_output_node = t_input->as_node();
-
-    REQUIRE( t_output_node.size() == 3 );
-
-    REQUIRE( t_output_node.has("string") );
-    REQUIRE( t_output_node["string"].is_value() );
-    REQUIRE( t_output_node["string"]().as_string() == "hello, world" );
-
-    REQUIRE( t_output_node.has("array") );
-    REQUIRE( t_output_node["array"].is_array() );
-    REQUIRE( t_output_node["array"].as_array().size() == 2 );
-    REQUIRE( t_output_node["array"][0].is_value() );
-    REQUIRE( t_output_node["array"][0]().as_uint() == 10 );
-    REQUIRE( t_output_node["array"][1].is_value() );
-    REQUIRE( t_output_node["array"][1]().as_string() == "I'm in an array!" );
-
-    REQUIRE( t_output_node.has("node") );
-    REQUIRE( t_output_node["node"].is_node() );
-    REQUIRE( t_output_node["node"].as_node().size() == 4 );
-    REQUIRE( t_output_node["node"]["first"]().as_string() == "abcdefg" );
-    REQUIRE( t_output_node["node"]["second"].is_value() );
-    REQUIRE( t_output_node["node"]["second"]().as_string() == "hijklmnop" );
-}
diff --git a/Src/Scarab/testing/test_logger.cc b/Src/Scarab/testing/test_logger.cc
deleted file mode 100644
index 7352da7..0000000
--- a/Src/Scarab/testing/test_logger.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * test_logger.cc
- *
- *  Created on: Jan 4, 2016
- *      Author: N.S. Oblath
- */
-
-#include "logger.hh"
-
-#include "stream_check.hh"
-
-#include "catch.hpp"
-
-using scarab::testing::compare_and_clear;
-
-
-TEST_CASE( "logger", "[logger]" )
-{
-    LOGGER( tlog, "test_logger" );
-
-    std::stringstream* t_outstream = new std::stringstream();
-    scarab::logger::SetOutStream( t_outstream );
-
-    std::stringstream* t_errstream = new std::stringstream();
-    scarab::logger::SetErrStream( t_errstream );
-
-    // all levels enabled
-    scarab::logger::SetGlobalLevel( scarab::logger::ELevel::eTrace );
-
-    // log
-
-    LPROG( tlog, "test PROG" );
-    REQUIRE( compare_and_clear( t_outstream, "test PROG" ) );
-
-    LINFO( tlog, "test INFO" );
-    REQUIRE( compare_and_clear( t_outstream, "test INFO" ) );
-
-    LDEBUG( tlog, "test DEBUG" );
-    REQUIRE( compare_and_clear( t_outstream, "test DEBUG" ) );
-
-    LTRACE( tlog, "test TRACE" );
-    REQUIRE( compare_and_clear( t_outstream, "test TRACE" ) );
-
-    // err
-
-    LWARN( tlog, "test WARN" );
-    REQUIRE( compare_and_clear( t_errstream, "test WARN" ) );
-
-    LERROR( tlog, "test ERROR" );
-    REQUIRE( compare_and_clear( t_errstream, "test ERROR" ) );
-
-    LFATAL( tlog, "test FATAL" );
-    REQUIRE( compare_and_clear( t_errstream, "test FATAL" ) );
-
-
-    // Info and above
-    tlog.SetGlobalLevel( scarab::logger::ELevel::eInfo );
-
-    // log
-
-    LPROG( tlog, "test PROG" );
-    REQUIRE( compare_and_clear( t_outstream, "test PROG" ) );
-
-    LINFO( tlog, "test INFO" );
-    REQUIRE( compare_and_clear( t_outstream, "test INFO" ) );
-
-    LDEBUG( tlog, "test DEBUG" );
-    REQUIRE( compare_and_clear( t_outstream, "" ) );
-
-    LTRACE( tlog, "test TRACE" );
-    REQUIRE( compare_and_clear( t_outstream, "" ) );
-
-    // err
-
-    LWARN( tlog, "test WARN" );
-    REQUIRE( compare_and_clear( t_errstream, "test WARN" ) );
-
-    LERROR( tlog, "test ERROR" );
-    REQUIRE( compare_and_clear( t_errstream, "test ERROR" ) );
-
-    LFATAL( tlog, "test FATAL" );
-    REQUIRE( compare_and_clear( t_errstream, "test FATAL" ) );
-
-}
diff --git a/Src/Scarab/testing/test_member_variables.cc b/Src/Scarab/testing/test_member_variables.cc
deleted file mode 100644
index a48beef..0000000
--- a/Src/Scarab/testing/test_member_variables.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * test_member_variable.cc
- *
- *  Created on: May 30, 2017
- *      Author: N.S. Oblath
- */
-
-#include "test_member_variables.hh"
-
-#include "catch.hpp"
-
-
-TEST_CASE( "member_variables", "[utility]" )
-{
-    SECTION( "accessible" )
-    {
-        scarab_testing::test_acc t_acc;
-        t_acc.set_mv_acc_int( 5 );
-        REQUIRE( t_acc.get_mv_acc_int() == 5 );
-        REQUIRE( t_acc.get_mv_acc_ns_int() == 10 );
-
-        scarab_testing::test_acc_static::set_mv_acc_int( 5 );
-        REQUIRE( scarab_testing::test_acc_static::get_mv_acc_int() == 5 );
-        REQUIRE( scarab_testing::test_acc_static::get_mv_acc_ns_int() == 10 );
-
-        scarab_testing::test_acc_mutable t_acc_mut;
-        t_acc_mut.set_mv_acc_int( 5 );
-        REQUIRE( t_acc_mut.get_mv_acc_int() == 5 );
-        REQUIRE( t_acc_mut.get_mv_acc_ns_int() == 10 );
-    }
-
-    SECTION( "referrable" )
-    {
-        scarab_testing::test_ref t_ref;
-        t_ref.mv_ref_int() = 5;
-        REQUIRE( t_ref.mv_ref_int() == 5 );
-        REQUIRE( t_ref.mv_ref_c_int() == 10 );
-
-        scarab_testing::test_ref_static::mv_ref_int() = 5;
-        REQUIRE( scarab_testing::test_ref_static::mv_ref_int() == 5 );
-
-        scarab_testing::test_ref_mutable t_ref_mut;
-        t_ref_mut.mv_ref_int() = 5;
-        REQUIRE( t_ref_mut.mv_ref_int() == 5 );
-    }
-
-    SECTION( "pointer" )
-    {
-        scarab_testing::test_ptr t_ptr;
-        t_ptr.set_mv_ptr_int( new int(5) );
-        REQUIRE( *(t_ptr.get_mv_ptr_int()) == 5 );
-        REQUIRE( *(t_ptr.get_mv_ptr_ns_int()) == 10 );
-
-        scarab_testing::test_ptr_static::set_mv_ptr_int( new int(5) );
-        REQUIRE( *(scarab_testing::test_ptr_static::get_mv_ptr_int()) == 5 );
-
-        scarab_testing::test_ptr_mutable t_ptr_mut;
-        t_ptr_mut.set_mv_ptr_int( new int(5) );
-        REQUIRE( *(t_ptr_mut.get_mv_ptr_int()) == 5 );
-        REQUIRE( *(t_ptr_mut.get_mv_ptr_ns_int()) == 10 );
-    }
-
-    SECTION( "shared_ptr" )
-    {
-        scarab_testing::test_shptr t_shptr;
-        *t_shptr.mv_shptr_int() = 5;
-        REQUIRE( *(t_shptr.mv_shptr_int()) == 5 );
-        REQUIRE( *(t_shptr.mv_shptr_c_int()) == 10 );
-
-        *scarab_testing::test_shptr_static::mv_shptr_int() = 5;
-        REQUIRE( *(scarab_testing::test_shptr_static::mv_shptr_int()) == 5 );
-
-        scarab_testing::test_shptr_mutable t_shptr_mut;
-        *t_shptr_mut.mv_shptr_int() = 5;
-        REQUIRE( *(t_shptr_mut.mv_shptr_int()) == 5 );
-        REQUIRE( *(t_shptr_mut.mv_shptr_c_int()) == 10 );
-    }
-
-    SECTION( "atomic" )
-    {
-        scarab_testing::test_atm t_atm;
-        t_atm.set_mv_atm_int( 5 );
-        REQUIRE( t_atm.get_mv_atm_int() == 5 );
-        REQUIRE( t_atm.get_mv_atm_ns_int() == 10 );
-
-        scarab_testing::test_atm_static::set_mv_atm_int( 5 );
-        REQUIRE( scarab_testing::test_atm_static::get_mv_atm_int() == 5 );
-
-        scarab_testing::test_atm_mutable t_atm_mut;
-        t_atm_mut.set_mv_atm_int( 5 );
-        REQUIRE( t_atm_mut.get_mv_atm_int() == 5 );
-        REQUIRE( t_atm_mut.get_mv_atm_ns_int() == 10 );
-    }
-}
diff --git a/Src/Scarab/testing/test_member_variables.hh b/Src/Scarab/testing/test_member_variables.hh
deleted file mode 100644
index c42c560..0000000
--- a/Src/Scarab/testing/test_member_variables.hh
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * test_member_variable.hh
- *
- *  Created on: May 30, 2017
- *      Author: obla999
- *
- *  The variables in the test_acc struct include a test of doxygen-compliant documentation
- */
-
-#ifndef SCARAB_TEST_MEMBER_VARIABLE_HH_
-#define SCARAB_TEST_MEMBER_VARIABLE_HH_
-
-#include <atomic>
-#include <memory>
-#include <string>
-
-#include "member_variables.hh"
-
-namespace scarab_testing
-{
-    
-    //**********
-    // normal
-    //**********
-
-    struct test_acc
-    {
-        test_acc() : f_mv_acc_ns_int( 10 ), f_mv_acc_int( 0 ) {}
-        /// Very special variable f_acc_ns_int
-        mv_accessible_noset( int, mv_acc_ns_int )
-        /**
-         *  Another special variable: f_acc_int
-         *  This variable is so special it requires
-         *  a multi-line comment
-         */
-        mv_accessible( int, mv_acc_int )
-    };
-
-    struct test_acc_static
-    {
-        mv_accessible_static_noset( int, mv_acc_ns_int )
-        mv_accessible_static( int, mv_acc_int )
-    };
-
-    int test_acc_static::s_mv_acc_ns_int = 10;
-    int test_acc_static::s_mv_acc_int = 0;
-
-    struct test_acc_mutable
-    {
-        test_acc_mutable() : f_mv_acc_ns_int( 10 ), f_mv_acc_int( 0 ) {}
-        mv_accessible_mutable_noset( int, mv_acc_ns_int )
-        mv_accessible_mutable( int, mv_acc_int )
-    };
-
-    //**************
-    // referrable
-    //**************
-
-    struct test_ref
-    {
-        test_ref() : f_mv_ref_c_int( 10 ), f_mv_ref_int( 0 ) {}
-        mv_referrable_const( int, mv_ref_c_int )
-        mv_referrable( int, mv_ref_int )
-    };
-
-    struct test_ref_static
-    {
-        mv_referrable_static( int, mv_ref_int )
-    };
-
-    int test_ref_static::s_mv_ref_int = 0;
-
-    struct test_ref_mutable
-    {
-        test_ref_mutable() : f_mv_ref_int( 0 ) {}
-        mv_referrable_mutable( int, mv_ref_int )
-    };
-
-
-    //***********
-    // pointer
-    //***********
-
-    struct test_ptr
-    {
-        test_ptr() : f_mv_ptr_ns_int( new int(10) ), f_mv_ptr_int( new int(0) ) {}
-        ~test_ptr() {delete f_mv_ptr_ns_int; delete f_mv_ptr_int;}
-        mv_assignable_noset( int, mv_ptr_ns_int )
-        mv_assignable( int, mv_ptr_int )
-    };
-
-    struct test_ptr_static
-    {
-        mv_assignable_static_noset( int, mv_ptr_ns_int )
-        mv_assignable_static( int, mv_ptr_int )
-    };
-
-    int* test_ptr_static::s_mv_ptr_ns_int = new int(10);
-    int* test_ptr_static::s_mv_ptr_int = new int(0);
-
-    struct test_ptr_mutable
-    {
-        test_ptr_mutable() : f_mv_ptr_ns_int( new int(10) ), f_mv_ptr_int( new int(0) ) {}
-        ~test_ptr_mutable() {delete f_mv_ptr_ns_int; delete f_mv_ptr_int;}
-        mv_assignable_mutable_noset( int, mv_ptr_ns_int )
-        mv_assignable_mutable( int, mv_ptr_int )
-    };
-
-
-    //**************
-    // shared_ptr
-    //**************
-
-    struct test_shptr
-    {
-        test_shptr() : f_mv_shptr_c_int( new int(10) ), f_mv_shptr_int( new int(0) ) {}
-        mv_shared_ptr_const( int, mv_shptr_c_int )
-        mv_shared_ptr( int, mv_shptr_int )
-    };
-
-    struct test_shptr_static
-    {
-        mv_shared_ptr_static( int, mv_shptr_int )
-    };
-
-    std::shared_ptr< int > test_shptr_static::s_mv_shptr_int = std::make_shared< int >( 0 );
-
-    struct test_shptr_mutable
-    {
-        test_shptr_mutable() : f_mv_shptr_c_int( new int(10) ), f_mv_shptr_int( new int(0) ) {}
-        mv_shared_ptr_mutable_const( int, mv_shptr_c_int )
-        mv_shared_ptr_mutable( int, mv_shptr_int )
-    };
-
-
-    //**********
-    // atomic
-    //**********
-
-    struct test_atm
-    {
-        test_atm() : f_mv_atm_ns_int( 10 ), f_mv_atm_int( 0 ) {}
-        mv_atomic_noset( int, mv_atm_ns_int )
-        mv_atomic( int, mv_atm_int )
-    };
-
-    struct test_atm_static
-    {
-        mv_atomic_static_noset( int, mv_atm_ns_int )
-        mv_atomic_static( int, mv_atm_int )
-    };
-
-    std::atomic< int > test_atm_static::s_mv_atm_ns_int( 10 );
-    std::atomic< int > test_atm_static::s_mv_atm_int( 0 );
-
-    struct test_atm_mutable
-    {
-        test_atm_mutable() : f_mv_atm_ns_int( 10 ), f_mv_atm_int( 0 ) {}
-        mv_atomic_mutable_noset( int, mv_atm_ns_int )
-        mv_atomic_mutable( int, mv_atm_int )
-    };
-}
-
-#endif /* SCARAB_TEST_MEMBER_VARIABLE_HH_ */
diff --git a/Src/Scarab/testing/test_nonoption_parser.cc b/Src/Scarab/testing/test_nonoption_parser.cc
deleted file mode 100644
index 3a34da2..0000000
--- a/Src/Scarab/testing/test_nonoption_parser.cc
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * test_nonoption_parser.cc
- *
- *  Created on: Jul 23, 2018
- *      Author: N.S. Oblath
- *
- *  Terminal output should be something like this:
-2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(19): Creating arguments
-2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(33): Parsing
-2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(36): Checking parsed args
-2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(37):  Ordered args:
-
-[
-    We
-    are
-    5
-    ordered
-    args
-]
-
-2018-07-23 17:12:03 [ INFO] (tid 0x7fff9c9dc380) option_parser.cc(38):  Keyword args:
-
-{
-    And : 1
-    are :
-    [
-
-
-
-
-
-
-        3.000000
-    ]
-
-    args : 500000000.000000
-    key :
-    {
-        word : -4
-    }
-
-    we : 2
-}
-
-2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(79): Testing negative number vs illegal option
-2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(83): Parsing `-5`
-2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(85): Is ord_args[0] == -5? 1
-2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(89): Parsing `-five`
-2020-07-06 10:37:15 [ INFO] (tid 0x1117845c0) option_parser.cc(97): Caught exception while parsing:
-Cannot parse an option with the nonoption_parser: -five
- *
- */
-
-#include "nonoption_parser.hh"
-
-#include "catch.hpp"
-
-TEST_CASE( "nonoption_parser", "[param]" )
-{
-    SECTION( "args" )
-    {
-        std::vector< std::string > t_args;
-        t_args.push_back( "We" );
-        t_args.push_back( "are" );
-        t_args.push_back( "5" );
-        t_args.push_back( "ordered" );
-        t_args.push_back( "args" );
-
-        t_args.push_back( "And=1" );
-        t_args.push_back( "we=2" );
-        t_args.push_back( "are.6=3.0" );
-        t_args.push_back( "key.word=-4" );
-        t_args.push_back( "args=5e8" );
-
-        scarab::nonoption_parser t_parser( t_args );
-
-        REQUIRE( t_parser.ord_args()[0]().as_string() == "We" );
-        REQUIRE( t_parser.ord_args()[1]().as_string() == "are" );
-        REQUIRE( t_parser.ord_args()[2]().as_uint() == 5 );
-        REQUIRE( t_parser.ord_args()[3]().as_string() == "ordered" );
-        REQUIRE( t_parser.ord_args()[4]().as_string() == "args" );
-
-        REQUIRE( t_parser.kw_args()["And"]().as_uint() == 1 );
-        REQUIRE( t_parser.kw_args()["we"]().as_uint() == 2 );
-        REQUIRE_THAT( t_parser.kw_args()["are"][6]().as_double(), Catch::WithinRel( 3.0 ) );
-        REQUIRE( t_parser.kw_args()["key"]["word"]().as_int() == -4 );
-        REQUIRE_THAT( t_parser.kw_args()["args"]().as_double(), Catch::WithinRel( 5.e8 ) );
-    }
-
-    SECTION( "negative" )
-    {
-        std::vector< std::string > t_args;
-        t_args.push_back( "-5" );
-
-        scarab::nonoption_parser t_parser( t_args );
-        REQUIRE( t_parser.ord_args()[0]().as_int() == -5 );
-    }
-
-    SECTION( "option" )
-    {
-        std::vector< std::string > t_args;
-        t_args.push_back( "-five" );
-
-        REQUIRE_THROWS_AS( scarab::nonoption_parser( t_args ), scarab::error );
-    }
-}
diff --git a/Src/Scarab/testing/test_param_array.cc b/Src/Scarab/testing/test_param_array.cc
deleted file mode 100644
index 67e90ef..0000000
--- a/Src/Scarab/testing/test_param_array.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * test_param_array.cc
- *
- *  Created on: Jul 17, 2018
- *      Author: N.S. Oblath
- *
- *  Output should be something like:
- *
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(54): Creating param array
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(57): Adding a value
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(60): Adding an array
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(69): Printing contents:
-[
-    5
-
-    {
-        five-hundred : 500
-    }
-
-
-    [
-        5000
-    ]
-
-]
-
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(71): After move, should be full:
-{
-    five-hundred : 500
-}
-
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(72): After move, should be empty:
-[
-]
-
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(74): Access:
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(75): 5
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(76): 5
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(77): 500
-2018-07-18 01:33:38 [ INFO] (tid 0x7fff9c9dc380) t_param_array.cc(78): 5000
- *
- */
-
-#include "param.hh"
-
-#include "error.hh"
-
-#include "catch.hpp"
-
-using scarab::param_array;
-using scarab::param_node;
-using scarab::param_value;
-using scarab::param_ptr_t;
-
-TEST_CASE( "param_array", "[param]" )
-{
-    param_array array;
-    REQUIRE( array.empty() );
-    REQUIRE( array.size() == 0 );
-
-    array.push_back( 5 );
-    REQUIRE_FALSE( array.empty() );
-    REQUIRE( array.size() == 1 );
-
-    param_node subnode;
-    subnode.add( "five-hundred", 500 );
-    array.push_back( subnode );
-    REQUIRE( array.size() == 2 );
-    REQUIRE_FALSE( subnode.empty() );
-
-    param_array subarray;
-    subarray.push_back( "5000" );
-    array.push_back( std::move(subarray) );
-    REQUIRE( array.size() == 3 );
-    REQUIRE( subarray.empty() );
-
-    // access
-    REQUIRE( array[0]().as_int() == 5 );
-    REQUIRE( array.get_value(0, 99999) == 5 );
-    REQUIRE( array.get_value(100, 99999) == 99999 );
-    REQUIRE_THROWS_AS( array[1](), scarab::error );
-    REQUIRE_THROWS_AS( array[2](), scarab::error );
-    REQUIRE( array[1]["five-hundred"]().as_int() == 500 );
-    REQUIRE( array[2][0]().as_int() == 5000 );
-
-    // front and back
-    REQUIRE( array.front()().as_int() == 5 );
-    REQUIRE( array.back()[0]().as_int() == 5000 );
-
-    // assign
-    param_value to_assign( 10 );
-    array.assign( 0, to_assign );
-    REQUIRE( array[0]().as_int() == 10 );
-    REQUIRE( to_assign.as_int() == 10 );
-
-    to_assign = 15;
-    array.assign( 0, std::move(to_assign ) );
-    REQUIRE( array[0]().as_int() == 15 );
-    REQUIRE_FALSE( to_assign.as_int() == 0 );
-
-    array.assign( 0, 20 );
-    REQUIRE( array[0]().as_int() == 20 );
-
-    // append and merge
-    param_array to_append;
-    to_append.push_back( -1 );
-    array.append( to_append );
-    REQUIRE( array.size() == 4 );
-    REQUIRE( array[3]().as_int() == -1 );
-
-    param_array to_merge;
-    to_merge.push_back( -2 );
-    array.merge( to_merge );
-    REQUIRE( array.size() == 4 );
-    REQUIRE( array[0]().as_int() == -2 );
-
-    // iterator, begin, and end
-    param_array::iterator it = array.begin();
-    unsigned count = 0;
-    for( ; it != array.end(); ++it, ++count );
-    REQUIRE( count == array.size() );
-
-    // remove, erase and clear
-    param_ptr_t removed = array.remove( 0 );
-    REQUIRE( removed->is_value() );
-    REQUIRE( removed->as_value().as_int() == -2 );
-
-    array.erase( 1 );
-
-    REQUIRE( array.size() == 4 );
-
-    array.clear();
-    REQUIRE( array.size() == 0 );
-
-}
-
-
diff --git a/Src/Scarab/testing/test_param_by_pointer.cc b/Src/Scarab/testing/test_param_by_pointer.cc
deleted file mode 100644
index 0a9c936..0000000
--- a/Src/Scarab/testing/test_param_by_pointer.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * test_param_by_pointer.cc
- *
- *  Created on: Jul 18, 2018
- *      Author: N.S. Oblath
- *
- */
-
-#include "param.hh"
-
-#include "catch.hpp"
-
-using scarab::param_ptr_t;
-using scarab::param_array;
-using scarab::param_value;
-using scarab::param_node;
-
-TEST_CASE( "param_by_pointer", "[param]" )
-{
-    param_ptr_t param_0( new param_node() );
-    REQUIRE( param_0 );
-    REQUIRE( param_0->is_node() );
-
-    param_ptr_t param_1( new param_value(8.0) );
-    REQUIRE( param_1->is_value() );
-    param_0->as_node().add( "eight", std::move(param_1) );
-    REQUIRE_FALSE( param_1 );
-    REQUIRE_THAT( param_0->as_node()["eight"]().as_double(), Catch::WithinULP(8., 10) );
-
-    param_ptr_t param_2( new param_array() );
-    REQUIRE( param_2->is_array() );
-
-    param_ptr_t param_3( new param_value(80) );
-    param_2->as_array().push_back( std::move(param_3) );
-
-    param_ptr_t param_4( new param_value(800) );
-    param_2->as_array().push_back( std::move(param_4) );
-
-    param_0->as_node().add( "subarray", std::move(param_2) );
-    REQUIRE( param_0->as_node().has( "subarray" ) );
-    REQUIRE( param_0->as_node()["subarray"].is_array() );
-    REQUIRE( param_0->as_node()["subarray"].as_array().size() == 2 );
-
-    REQUIRE_FALSE( param_2 );
-}
diff --git a/Src/Scarab/testing/test_param_node.cc b/Src/Scarab/testing/test_param_node.cc
deleted file mode 100644
index f4929ef..0000000
--- a/Src/Scarab/testing/test_param_node.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * test_param_node.cc
- *
- *  Created on: Jul 13, 2018
- *      Author: N.S. Oblath
- */
-
-#include "param.hh"
-
-#include "catch.hpp"
-
-using scarab::param_array;
-using scarab::param_node;
-using scarab::param_value;
-using scarab::param_ptr_t;
-
-TEST_CASE( "param_node", "[param]" )
-{
-    param_node node;
-    REQUIRE( node.empty() );
-    REQUIRE( node.size() == 0 );
-
-    node.add( "five", 5 );
-    REQUIRE_FALSE( node.empty() );
-    REQUIRE( node.size() == 1 );
-
-    param_array subarray1;
-    subarray1.push_back( 500 );
-    node.add( "subarray1", subarray1 );
-    REQUIRE( node.size() == 2 );
-    REQUIRE_FALSE( subarray1.empty() );
-
-    param_array subarray2;
-    subarray2.push_back( "5000" );
-    node.add( "subarray2", std::move(subarray2) );
-    REQUIRE( node.size() == 3 );
-    REQUIRE( subarray2.empty() );
-
-    // has and count
-    REQUIRE( node.has("five") );
-    REQUIRE_FALSE( node.has("ten") );
-    REQUIRE( node.count("five") == 1 );
-    REQUIRE( node.count("ten") == 0 );
-
-    // access
-    REQUIRE( node["five"]().as_int() == 5 );
-    REQUIRE( node.get_value("five", 99999) == 5 );
-    REQUIRE( node.get_value("ten", 99999) == 99999 );
-    REQUIRE_THROWS_AS( node["subarray1"](), scarab::error );
-    REQUIRE_THROWS_AS( node["subarray2"](), scarab::error );
-    REQUIRE( node["subarray1"][0]().as_int() == 500 );
-    REQUIRE( node["subarray2"][0]().as_int() == 5000 );
-
-    // add and replace
-    REQUIRE( node.add("ten", 10) );
-    REQUIRE_FALSE( node.add("five", -5) );
-    REQUIRE_NOTHROW( node.replace("ten", -10) );
-    REQUIRE( node.has("ten") );
-    REQUIRE( node["ten"]().as_int() == -10 );
-
-    // merge
-    param_node to_merge;
-    to_merge.add( "minus-two", -2 );
-    node.merge( to_merge );
-    REQUIRE( node.size() == 5 );
-    REQUIRE( node["minus-two"]().as_int() == -2 );
-
-    // iterator, begin, and end
-    param_node::iterator it = node.begin();
-    unsigned count = 0;
-    for( ; it != node.end(); ++it, ++count );
-    REQUIRE( count == node.size() );
-
-    // remove, erase, and clear
-    param_ptr_t removed = node.remove( "ten" );
-    REQUIRE( removed->is_value() );
-    REQUIRE( removed->as_value().as_int() == -10 );
-
-    node.erase( "minus-two" );
-    REQUIRE( node.size() == 3 );
-
-    node.clear();
-    REQUIRE( node.size() == 0 );
-
-}
-
diff --git a/Src/Scarab/testing/test_param_translator.cc b/Src/Scarab/testing/test_param_translator.cc
deleted file mode 100644
index b90bacd..0000000
--- a/Src/Scarab/testing/test_param_translator.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * test_param_translator.cc
- *
- *  Created on: Dec 9, 2021
- *      Author: N.S. Oblath
- *
- */
-
-#include "param_codec.hh"
-
-#include "logger.hh"
-
-#include "catch.hpp"
-
-LOGGER( testlog, "test_param_translator" )
-
-using namespace scarab;
-
-
-TEST_CASE( "param_translator", "[param]" )
-{
-#ifdef USE_CODEC_YAML
-    SECTION( "YAML" )
-    {
-        LINFO( testlog, "Testing YAML translator" )
-
-        std::string test_yaml(
-            "a-node:\n"
-            "  name1: 1\n"
-            "  name2: 2\n"
-            "a-array:\n"
-            "  - 3\n"
-            "  - 4"
-        );
-
-        LINFO( testlog, "YAML test string:\n" << test_yaml );
-
-        param_translator translator;
-
-        param_ptr_t translated_yaml = translator.read_string( test_yaml, "yaml" );
-        REQUIRE( translated_yaml );
-        REQUIRE( (*translated_yaml)["a-node"]["name1"]().as_int() == 1 );
-        REQUIRE( (*translated_yaml)["a-node"]["name2"]().as_int() == 2 );
-        REQUIRE( (*translated_yaml)["a-array"][0]().as_int() == 3 );
-        REQUIRE( (*translated_yaml)["a-array"][1]().as_int() == 4 );
-
-        std::string test_yaml_fromparam;
-        REQUIRE( translator.write_string( *translated_yaml, test_yaml_fromparam, "yaml" ) );
-
-        LINFO( testlog, "Back to YAML:\n" << test_yaml_fromparam );
-    }
-#endif
-
-#ifdef USE_CODEC_JSON
-    SECTION( "JSON" )
-    {
-        LINFO( testlog, "Testing JSON translator" )
-
-        std::string test_json(
-            "{\n"
-            "  \"a-node\": {\n"
-            "    \"name1\": 1,\n"
-            "    \"name2\": 2\n"
-            "  },\n"
-            "  \"a-array\": [3, 4]"
-            "}"
-
-        );
-
-        LINFO( testlog, "JSON test string:\n" << test_json );
-
-        param_translator translator;
-        param_ptr_t translated_json = translator.read_string( test_json, "json" );
-        REQUIRE( translated_json );
-        REQUIRE( (*translated_json)["a-node"]["name1"]().as_int() == 1 );
-        REQUIRE( (*translated_json)["a-node"]["name2"]().as_int() == 2 );
-        REQUIRE( (*translated_json)["a-array"][0]().as_int() == 3 );
-        REQUIRE( (*translated_json)["a-array"][1]().as_int() == 4 );
-
-        std::string test_json_fromparam;
-        REQUIRE( translator.write_string( *translated_json, test_json_fromparam, "json" ) );
-
-        LINFO( testlog, "Back to JSON:\n" << test_json_fromparam );
-
-    }
-
-#endif
-
-}
-
-
-
diff --git a/Src/Scarab/testing/test_param_value.cc b/Src/Scarab/testing/test_param_value.cc
deleted file mode 100644
index de12f56..0000000
--- a/Src/Scarab/testing/test_param_value.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * test_param_value.cc
- *
- *  Created on: Jul 13, 2018
- *      Author: N.S. Oblath
- *
- */
-
-#include "param_value.hh"
-
-#include "catch.hpp"
-
-using scarab::param_value;
-
-TEST_CASE( "param_value", "[param]" )
-{
-    SECTION( "initialization" )
-    {
-        // boolean
-        param_value bool_val( true );
-        REQUIRE( bool_val.as_bool() );
-        REQUIRE( bool_val.as_string() == "true" );
-
-        bool_val.set( false );
-        REQUIRE_FALSE( bool_val.as_bool() );
-        REQUIRE( bool_val.as_string() == "false" );
-
-        bool_val = true;
-        REQUIRE( bool_val.as_bool() );
-
-        // integer
-        param_value int_val( 5 );
-        REQUIRE( int_val.as_int() == 5 );
-        REQUIRE( int_val.as_string() == "5" );
-        REQUIRE_THAT( int_val.as_double(), Catch::WithinULP( 5., 10 ) );
-
-        int_val = 10;
-        REQUIRE( int_val.as_int() == 10 );
-
-        // string
-        param_value string_val( "hello world" );
-        REQUIRE( string_val.as_string() == "hello world" );
-
-        string_val = "oh, hai!";
-        REQUIRE( string_val.as_string() == "oh, hai!" );
-
-        string_val.set( "abracadabra" );
-        REQUIRE( string_val.as_string() == "abracadabra" );
-
-        // single-quote stripping
-        param_value string_val_sq( "'hello world'" );
-        REQUIRE( string_val_sq.as_string() == "hello world" );
-
-        string_val.set( "'hello world'" );
-        REQUIRE( string_val.as_string() == "hello world" );
-
-        // string to int
-        string_val.set( "10" );
-        REQUIRE( string_val.as_string() == "10" );
-        REQUIRE( string_val.as_int() == 10 );
-
-        // string to bool
-        string_val.set( "true" );
-        REQUIRE( string_val.as_bool() );
-
-        string_val.set( "false" );
-        REQUIRE_FALSE( string_val.as_bool() );
-    }
-
-
-    SECTION( "quotation_options" )
-    {
-        param_value quote_opts_val( 1 );
-        REQUIRE( quote_opts_val.as_string() == "1" );
-        REQUIRE( quote_opts_val.as_int() == 1 );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE( quote_opts_val.is_int() );
-        REQUIRE_FALSE( quote_opts_val.is_string() );
-
-        quote_opts_val.set( "1" );
-        REQUIRE( quote_opts_val.as_string() == "1" );
-        REQUIRE( quote_opts_val.as_int() == 1 );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE_FALSE( quote_opts_val.is_int() );
-        REQUIRE( quote_opts_val.is_string() );
-
-        // Initializes as a char in integer form
-        quote_opts_val.set( '1' );
-        REQUIRE( quote_opts_val.as_string() == "49" );
-        REQUIRE( quote_opts_val.as_int() == 49 );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE( quote_opts_val.is_int() );
-        REQUIRE_FALSE( quote_opts_val.is_string() );
-
-        quote_opts_val.set( "'1'" );
-        REQUIRE( quote_opts_val.as_string() == "1" );
-        REQUIRE( quote_opts_val.as_int() == 1 );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE_FALSE( quote_opts_val.is_int() );
-        REQUIRE( quote_opts_val.is_string() );
-
-        quote_opts_val.set( "\"'1'\"" );
-        REQUIRE( quote_opts_val.as_string() == "\"'1'\"" );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE_FALSE( quote_opts_val.is_int() );
-        REQUIRE( quote_opts_val.is_string() );
-
-        quote_opts_val.set( "''1''" );
-        REQUIRE( quote_opts_val.as_string() == "'1'" );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE_FALSE( quote_opts_val.is_int() );
-        REQUIRE( quote_opts_val.is_string() );
-
-        quote_opts_val.set( "'\'1\''" );
-        REQUIRE( quote_opts_val.as_string() == "'1'" );
-        REQUIRE_FALSE( quote_opts_val.is_uint() );
-        REQUIRE_FALSE( quote_opts_val.is_int() );
-        REQUIRE( quote_opts_val.is_string() );
-    }
-
-    SECTION( "strict_equality" )
-    {
-        param_value bool_val( true );
-        param_value bool_val_2( false );
-        REQUIRE_FALSE( bool_val.strict_is_equal_to(bool_val_2) );
-        REQUIRE_FALSE( bool_val_2.strict_is_equal_to(bool_val) );
-        bool_val_2 = true;
-        REQUIRE( bool_val.strict_is_equal_to(bool_val_2) );
-        REQUIRE( bool_val_2.strict_is_equal_to(bool_val) );
-
-        param_value string_val( "hello" );
-        param_value string_val_2( "hello" );
-        REQUIRE( string_val.strict_is_equal_to(string_val_2) );
-        string_val_2 = "world";
-        REQUIRE_FALSE( string_val.strict_is_equal_to(string_val_2) );
-
-        bool_val = true;
-        param_value int_val( 1 );
-        REQUIRE_FALSE( bool_val.strict_is_equal_to(int_val) );
-        param_value uint_val( 1U );
-        REQUIRE_FALSE( int_val.strict_is_equal_to(uint_val) );
-        string_val = "true";
-        REQUIRE_FALSE( bool_val.strict_is_equal_to(string_val) );
-
-        param_value double_val( 1. );
-        param_value double_val_2( 1. );
-        REQUIRE( double_val.strict_is_equal_to(double_val_2) );
-        double_val_2 = 2.;
-        REQUIRE_FALSE( double_val.strict_is_equal_to(double_val_2) );
-        int_val = 1;
-        REQUIRE_FALSE( double_val.strict_is_equal_to(int_val) );
-    }
-
-    SECTION( "loose_equality" )
-    {
-        param_value bool_val( true );
-        param_value bool_val_2( false );
-        REQUIRE_FALSE( bool_val.loose_is_equal_to(bool_val_2) );
-        bool_val_2 = true;
-        REQUIRE( bool_val.loose_is_equal_to(bool_val_2) );
-
-        param_value string_val( "hello" );
-        param_value string_val_2( "hello" );
-        REQUIRE( string_val.loose_is_equal_to(string_val_2) );
-        string_val_2 = "world";
-        REQUIRE_FALSE( string_val.loose_is_equal_to(string_val_2) );
-
-        param_value int_val( 1 );
-        REQUIRE_FALSE( bool_val.loose_is_equal_to(int_val) );
-        param_value uint_val( 1U );
-        REQUIRE( uint_val.loose_is_equal_to(int_val) );
-        string_val = "true";
-        REQUIRE( bool_val.loose_is_equal_to(string_val) );
-
-        param_value double_val( 1. );
-        param_value double_val_2( 1. );
-        REQUIRE( double_val.loose_is_equal_to(double_val_2) );
-        double_val_2 = 2.;
-        REQUIRE_FALSE( double_val.loose_is_equal_to(double_val_2) );
-        REQUIRE_FALSE( double_val.loose_is_equal_to(int_val) );
-    }
-}
-
diff --git a/Src/Scarab/testing/test_path.cc.in b/Src/Scarab/testing/test_path.cc.in
deleted file mode 100644
index 2dc28e9..0000000
--- a/Src/Scarab/testing/test_path.cc.in
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * test_path.cc
- *
- *  Created on: Oct 13, 2021
- *      Author: P.T. Surukuchi
- *
- */
-
-#include "path.hh"
-
-#include "catch.hpp"
-
-#include <iostream>
-
-
-using scarab::path;
-
-TEST_CASE( "path", "[utility]" )
-{
-    SECTION( "glob" )
-    {
-        std::cout << "Glob Test" << std::endl;
-        std::string dir_path( "@DIR_PATH@" );
-        
-        // build a test vector of txt files to test against the output of glob function
-        //this only works asssuming you are in a build directory
-        std::vector< path > test_file_paths;
-        test_file_paths.push_back( dir_path + "/glob_path/sub1/sub1sub1/glob_sub1sub1.txt" );
-        test_file_paths.push_back( dir_path + "/glob_path/sub1/sub1sub2/glob_sub1sub2.txt" );
-        test_file_paths.push_back( dir_path + "/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_1.txt" );
-        test_file_paths.push_back( dir_path + "/glob_path/sub2/sub2sub1/sub2sub1sub1/glob_sub2sub1sub1_2.txt" );
-        test_file_paths.push_back( dir_path + "/glob_path/sub2/sub2sub1/sub2sub1sub2/glob_sub2sub1sub2.txt" );
-
-        std::vector< path > file_paths = scarab::glob( dir_path, "[0-2].txt$" );
-        std::sort( file_paths.begin(),file_paths.end() );// sort to make sure they are in order
-        for( unsigned int i = 0; i < file_paths.size(); ++i )
-        {
-            REQUIRE( test_file_paths[i] == file_paths[i] );
-        }
-    }
-}
-
diff --git a/Src/Scarab/testing/test_signal_handler.cc b/Src/Scarab/testing/test_signal_handler.cc
deleted file mode 100644
index ffd7943..0000000
--- a/Src/Scarab/testing/test_signal_handler.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * test_signal_handler.cc
- *
- *  Created on: Jul 17, 2020
- *      Author: N.S. Oblath
- * 
- *  Things we cannot test here due to the way in which catch2 is setup:
- *  - Signal catching
- *  - Termination
- * 
- */
-
-#include "signal_handler.hh"
-
-#include "cancelable.hh"
-#include "logger.hh"
-#include "stream_check.hh"
-
-#include "catch.hpp"
-
-#include <signal.h>
-
-using scarab::testing::compare_and_clear;
-
-
-TEST_CASE( "signal_handler", "[utility]" )
-{
-    LOGGER( tlog, "test_signal_handler" );
-
-    SECTION( "not_handling" )
-    {
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_abrt() );
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_term() );
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_int() );
-        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGABRT ) );
-        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGTERM ) );
-        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGINT ) );
-    #ifndef _WIN32
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_quit() );
-        REQUIRE_FALSE( scarab::signal_handler::is_handling( SIGQUIT ) );
-    #endif
-
-        REQUIRE( scarab::signal_handler::get_ref_count() == 0 );
-    }
-
-    scarab::signal_handler t_handler;
-    REQUIRE( scarab::signal_handler::get_ref_count() == 1 );
-
-    SECTION( "handling" )
-    {
-        REQUIRE( scarab::signal_handler::get_handling_sig_abrt() );
-        REQUIRE( scarab::signal_handler::get_handling_sig_term() );
-        REQUIRE( scarab::signal_handler::get_handling_sig_int() );
-        REQUIRE( scarab::signal_handler::is_handling( SIGABRT ) );
-        REQUIRE( scarab::signal_handler::is_handling( SIGTERM ) );
-        REQUIRE( scarab::signal_handler::is_handling( SIGINT ) );
-    #ifndef _WIN32
-        REQUIRE( scarab::signal_handler::get_handling_sig_quit() );
-        REQUIRE( scarab::signal_handler::is_handling( SIGQUIT ) );
-    #endif
-
-        scarab::signal_handler t_handler_2;
-        REQUIRE( scarab::signal_handler::get_ref_count() == 2 );
-
-        REQUIRE( scarab::signal_handler::get_handling_sig_abrt() );
-        REQUIRE( scarab::signal_handler::get_handling_sig_term() );
-        REQUIRE( scarab::signal_handler::get_handling_sig_int() );
-    #ifndef _WIN32
-        REQUIRE( scarab::signal_handler::get_handling_sig_quit() );
-    #endif
-
-    }
-
-    REQUIRE( scarab::signal_handler::get_ref_count() == 1 );
-
-    SECTION( "handling_switch" )
-    {
-        scarab::signal_handler::unhandle_signals();
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_abrt() );
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_term() );
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_int() );
-    #ifndef _WIN32
-        REQUIRE_FALSE( scarab::signal_handler::get_handling_sig_quit() );
-    #endif
-
-        scarab::signal_handler::handle_signals();
-        REQUIRE( scarab::signal_handler::get_handling_sig_abrt() );
-        REQUIRE( scarab::signal_handler::get_handling_sig_term() );
-        REQUIRE( scarab::signal_handler::get_handling_sig_int() );
-    #ifndef _WIN32
-        REQUIRE( scarab::signal_handler::get_handling_sig_quit() );
-    #endif
-    }
-
-    SECTION( "printing" )
-    {
-        REQUIRE_NOTHROW( scarab::signal_handler::print_current_exception( true ) );
-        REQUIRE_NOTHROW( scarab::signal_handler::print_stack_trace( true ) );
-
-        try
-        {
-            throw std::runtime_error( "test error" );
-        }
-        catch(const std::runtime_error& e)
-        {
-            REQUIRE_NOTHROW( scarab::signal_handler::print_current_exception( true ) );
-
-            std::stringstream* t_errstream = new std::stringstream();
-            scarab::logger::SetErrStream( t_errstream );
-
-            scarab::signal_handler::print_current_exception( true );
-            REQUIRE( compare_and_clear( t_errstream, "test error" ) );
-
-            scarab::logger::SetErrStream( &std::cerr );
-
-        }
-    }
-
-    scarab::cancelable t_cancel;
-    REQUIRE_FALSE( t_cancel.is_canceled() );
-
-    // we use cancelable_wrapper to wrap t_cancel in a shared_ptr
-    auto t_cwrap = scarab::wrap_cancelable( t_cancel );
-    t_handler.add_cancelable( t_cwrap );
-
-    SECTION( "canceling" )
-    {
-        t_handler.cancel_all( 0 );
-        REQUIRE( t_cancel.is_canceled() );
-    }
-
-    SECTION( "terminating" )
-    {
-        t_handler.exit( 0 );
-        REQUIRE( t_cancel.is_canceled() );
-    }
-
-    // delete the cancelable_wrapper, which removes it from the signal_handler
-    t_cwrap.reset();
-
-    SECTION( "not canceling" )
-    {
-        t_handler.cancel_all( 0 );
-        REQUIRE_FALSE( t_cancel.is_canceled() );
-    }
-
-}
diff --git a/Src/Scarab/testing/test_time.cc b/Src/Scarab/testing/test_time.cc
deleted file mode 100644
index af9264e..0000000
--- a/Src/Scarab/testing/test_time.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * test_time.cc
- *
- *  Created on: Jan 15, 2018
- *      Author: obla999
- */
-
-#include "time.hh"
-
-#include "catch.hpp"
-
-#include <regex>
-
-TEST_CASE( "time", "[utility]" )
-{
-    std::regex t_regex( "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}.[0-9]+Z" );
-    REQUIRE( std::regex_match( scarab::get_formatted_now(), t_regex ) );
-}
diff --git a/Src/Scarab/testing/test_verbosity.cc b/Src/Scarab/testing/test_verbosity.cc
deleted file mode 100644
index 992b84d..0000000
--- a/Src/Scarab/testing/test_verbosity.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * test_verbosity.cc
- *
- *  Created on: Mar 31, 2020
- *      Author: N.S. Oblath
- */
-
-#include "application.hh"
-
-#include "catch.hpp"
-
-
-TEST_CASE( "verbosity", "[cli][logger]" )
-{
-    LOGGER( tlog, "test_verbosity" );
-
-    scarab::main_app t_app;
-
-    // test default verbosity
-    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eProg );
-
-    // test increasing verbosity
-    t_app.increase_global_verbosity( 1 );
-    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eInfo );
-
-    // test increasing past the end
-    t_app.increase_global_verbosity( 10 );
-    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eTrace );
-
-    // test decreasing past the beginning
-    t_app.decrease_global_verbosity( 100 );
-    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eFatal );
-
-    // test setting verbosity
-    t_app.set_global_verbosity( 30 );
-    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eWarn );
-
-    // test decreasing past the beginning
-    t_app.set_global_verbosity( 100 );
-    REQUIRE( tlog.GetLevel() == scarab::logger::ELevel::eFatal );
-
-}
-/*
-using namespace scarab;
-
-LOGGER( tlog, "test_verbosity" );
-
-int main()
-{
-    main_app t_app;
-
-    // test default verbosity
-    LPROG( tlog, "Verbosity should be PROG (" << static_cast<unsigned>(logger::ELevel::eProg) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
-
-    // test increasing verbosity
-    t_app.increase_global_verbosity( 1 );
-    LINFO( tlog, "Verbosity should be INFO (" << static_cast<unsigned>(logger::ELevel::eInfo) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
-
-    // test increasing past the end
-    t_app.increase_global_verbosity( 10 );
-    LTRACE( tlog, "Verbosity should be TRACE (" << static_cast<unsigned>(logger::ELevel::eTrace) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
-
-    // test decreasing past the beginning
-    t_app.decrease_global_verbosity( 100 );
-    LFATAL( tlog, "Verbosity should be FATAL (" << static_cast<unsigned>(logger::ELevel::eFatal) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
-
-    // test setting verbosity
-    t_app.set_global_verbosity( 30 );
-    LWARN( tlog, "Verbosity should be WARN (" << static_cast<unsigned>(logger::ELevel::eWarn) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
-
-    // test decreasing past the beginning
-    t_app.set_global_verbosity( 100 );
-    LFATAL( tlog, "Verbosity should be FATAL (" << static_cast<unsigned>(logger::ELevel::eFatal) << "): " << static_cast<unsigned>(tlog.GetLevel()) );
-
-    return 0;
-}
-*/
-
diff --git a/Src/Scarab/testing/test_yaml.cc b/Src/Scarab/testing/test_yaml.cc
deleted file mode 100644
index d0b009e..0000000
--- a/Src/Scarab/testing/test_yaml.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * test_yaml.cc
- *
- *  Created on: Jul 18, 2018
- *      Author: N.S. Oblath
- *
- */
-
-#include "param.hh"
-#include "param_yaml.hh"
-
-#include "catch.hpp"
-
-#include <iostream>
-
-
-using scarab::param_node;
-using scarab::param_value;
-using scarab::param_array;
-using scarab::param_ptr_t;
-using scarab::param_output_yaml;
-using scarab::param_input_yaml;
-
-TEST_CASE( "yaml", "[param][param_codec]" )
-{
-    param_ptr_t t_input( new param_node() );
-    param_node& t_input_node = t_input->as_node();
-
-    t_input_node.add( "string", "hello, world" );
-    
-    param_array t_input_array;
-    t_input_array.push_back( 10 );
-    t_input_array.push_back( "I'm in an array!" );
-
-    param_node t_input_nested_node;
-    t_input_nested_node.add( "first", "abcdefg" );
-    t_input_nested_node.add( "second", "hijklmnop" );
-    t_input_nested_node.add( "third", "qrstuv" );
-    t_input_nested_node.add( "fourth", "wxyz" );
-
-    t_input_node.add( "array", std::move(t_input_array) );
-    t_input_node.add( "node", std::move(t_input_nested_node) );
-
-    param_output_yaml t_writer;
-    std::string t_written;
-    t_writer.write_string( *t_input, t_written );
-
-    param_input_yaml t_reader;
-    param_ptr_t t_output( t_reader.read_string( t_written ) );
-
-    REQUIRE( t_output->is_node() );
-    param_node& t_output_node = t_input->as_node();
-
-    REQUIRE( t_output_node.size() == 3 );
-
-    REQUIRE( t_output_node.has("string") );
-    REQUIRE( t_output_node["string"].is_value() );
-    REQUIRE( t_output_node["string"]().as_string() == "hello, world" );
-
-    REQUIRE( t_output_node.has("array") );
-    REQUIRE( t_output_node["array"].is_array() );
-    REQUIRE( t_output_node["array"].as_array().size() == 2 );
-    REQUIRE( t_output_node["array"][0].is_value() );
-    REQUIRE( t_output_node["array"][0]().as_uint() == 10 );
-    REQUIRE( t_output_node["array"][1].is_value() );
-    REQUIRE( t_output_node["array"][1]().as_string() == "I'm in an array!" );
-
-    REQUIRE( t_output_node.has("node") );
-    REQUIRE( t_output_node["node"].is_node() );
-    REQUIRE( t_output_node["node"].as_node().size() == 4 );
-    REQUIRE( t_output_node["node"]["first"]().as_string() == "abcdefg" );
-    REQUIRE( t_output_node["node"]["second"].is_value() );
-    REQUIRE( t_output_node["node"]["second"]().as_string() == "hijklmnop" );
-}
diff --git a/Src/Scarab/testing/use_catch.cc b/Src/Scarab/testing/use_catch.cc
deleted file mode 100644
index e4fe336..0000000
--- a/Src/Scarab/testing/use_catch.cc
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * use_catch.cc
- *
- *  Created on: Jul 7, 2020
- *      Author: N.S. Oblath
- */
-
-// Tells Catch to provide a main()
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
diff --git a/cmake/Nymph.cmake b/cmake/Nymph.cmake
index 13dec37..67521d5 100644
--- a/cmake/Nymph.cmake
+++ b/cmake/Nymph.cmake
@@ -55,6 +55,6 @@ macro (nymph_process_options)
 endmacro ()
 
 macro (nymph_build_executables)
-	add_subdirectory (${NYMPH_DIR}/Src/Cpp/Executables_v1)
+	add_subdirectory (${NYMPH_DIR}/Cpp/Executables_v1)
 endmacro ()
 
diff --git a/setup.cfg b/setup.cfg
index 878115a..7a91a35 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,9 +16,9 @@ classifiers =
 [options]
 zip_safe = False
 package_dir =
-    = Src/Python
+    = Python/nymph
 packages = find:
 python_requires = >=3.6
 
 [options.packages.find]
-where = Src/Python
\ No newline at end of file
+where = .
diff --git a/setup.py b/setup.py
index 4f1a7a8..175d05f 100644
--- a/setup.py
+++ b/setup.py
@@ -62,18 +62,11 @@ def build_extension(self, ext):
         print("should make a build call:")
         print(['cmake', '--build', '.'] + build_args, 'cwd={}'.format(self.build_temp))
         #subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
-        subprocess.check_call(['make', 'install', 'VERBOSE=1'], cwd=self.build_temp)
-
-#packages = ["nymph"] + ["nymph."+i_package for i_package in find_packages("dripline")]
-#print('packages are: {}'.format(packages))
+        subprocess.check_call(['make', 'install'], cwd=self.build_temp)
 
 if __name__ == "__main__":
 
     setup(
-
         ext_modules=[CMakeExtension('nymph', sourcedir='')],
         cmdclass=dict(build_ext=CMakeBuild),
-        #install_requires=requirements,
-        #packages=packages,
-        #scripts=["bin/dl-serve"]
     )

From 98cd9c81cb8445083d131aaf3d89dc5da4e631fb Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Fri, 11 Mar 2022 10:06:01 -0500
Subject: [PATCH 302/521] added dummy pybind files for nymph

---
 CMakeLists.txt               |  7 ++++++
 Python/CMakeLists.txt        | 44 +++++++++++++-----------------------
 Python/nymph/nymph_pybind.cc |  0
 Python/nymph/nymph_pybind.hh |  0
 4 files changed, 23 insertions(+), 28 deletions(-)
 create mode 100644 Python/nymph/nymph_pybind.cc
 create mode 100644 Python/nymph/nymph_pybind.hh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22cf061..144b5f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,8 +80,15 @@ add_definitions( -DBOOST_ALL_DYN_LINK )
 ##########
 
 if( Nymph_ENABLE_PYTHON )
+
+    find_package( Python3 REQUIRED COMPONENTS Interpreter Development )
+    set(PYBIND11_PYTHON_VERSION ${Python3_VERSION} CACHE STRING "")
+    find_package( pybind11 REQUIRED )
+    include_directories( ${Python3_INCLUDE_DIRS} )
+
     set_option( Scarab_BUILD_PYTHON TRUE )
     add_subdirectory( Python )
+    
 else( Nymph_ENABLE_PYTHON )
     set_option( Scarab_BUILD_PYTHON FALSE )
 endif( Nymph_ENABLE_PYTHON )
diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt
index 83accc7..8c8d816 100644
--- a/Python/CMakeLists.txt
+++ b/Python/CMakeLists.txt
@@ -2,40 +2,28 @@
 # Author: A. Ziegler
 # Created on: Feb 4, 2022
 
-# Minimum cmake verison 3.12 required by Scarab
-cmake_minimum_required (VERSION 3.12)
+if ( Nymph_ENABLE_PYTHON )
 
-#########
-# Setup #
-#########
-cmake_policy( SET CMP0048 NEW ) # version in project()
-project( Nymph VERSION 2.0.0 )
+    message( "Building Python bindings")
 
-#list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../Scarab/cmake )
-include( PackageBuilder )
+    set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
 
-###############
-# Build Nymph #
-###############
+    # Python binding headers
+    set( PYBINDING_HEADERFILES
+        ${dir}/nymph/nymph_pybind.hh
+    )
 
-message( "Building Python bindings")
+    # Python bindings
+    set( PYBINDING_SOURCEFILES
+        ${dir}/nymph/nymph_pybind.cc
+    )
 
-set( dir ${CMAKE_CURRENT_SOURCE_DIR} )
+    set( PROJECT_LIBRARIES Nymph )
 
-# Python binding headers
-set( PYBINDING_HEADERFILES
+    pbuilder_add_pybind11_module( nymph ${PROJECT_LIBRARIES} )
 
-)
+    pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 
-# Python bindings
-set( PYBINDING_SOURCEFILES
+    message( "Done with Python bindings" )
 
-)
-
-#set( PROJECT_LIBRARIES Nymph )
-
-#pbuilder_add_pybind11_module( Nymph ${PROJECT_LIBRARIES} )
-
-pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
-
-message( "Done with Python bindings" )
\ No newline at end of file
+endif( Nymph_ENABLE_PYTHON )
\ No newline at end of file
diff --git a/Python/nymph/nymph_pybind.cc b/Python/nymph/nymph_pybind.cc
new file mode 100644
index 0000000..e69de29
diff --git a/Python/nymph/nymph_pybind.hh b/Python/nymph/nymph_pybind.hh
new file mode 100644
index 0000000..e69de29

From 6d0b71444ab1039f78bea3af129edaac3483b982 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Wed, 23 Mar 2022 10:20:15 -0400
Subject: [PATCH 303/521] working python packaging build

---
 .gitignore                             |  2 +-
 Python/CMakeLists.txt                  | 10 ++++++++--
 Python/nymph/__init__.py               |  1 +
 Python/nymph/add_lib_python_path.sh.in |  3 +++
 Python/nymph/nymph_pybind.cc           |  0
 Python/nymph/nymph_pybind.hh           |  0
 Python/nymph/nymph_pybind_template.cc  | 13 +++++++++++++
 Python/nymph/nymph_pybind_template.hh  |  6 ++++++
 setup.cfg                              |  4 ----
 setup.py                               |  6 +++++-
 10 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 Python/nymph/add_lib_python_path.sh.in
 delete mode 100644 Python/nymph/nymph_pybind.cc
 delete mode 100644 Python/nymph/nymph_pybind.hh
 create mode 100644 Python/nymph/nymph_pybind_template.cc
 create mode 100644 Python/nymph/nymph_pybind_template.hh

diff --git a/.gitignore b/.gitignore
index 06169dc..9023c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,5 +44,5 @@ build*/
 
 # Python Package
 dist*/
-Python/nymph/*.egg-info
+Python/*.egg-info
 
diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt
index 8c8d816..68ed64b 100644
--- a/Python/CMakeLists.txt
+++ b/Python/CMakeLists.txt
@@ -10,12 +10,12 @@ if ( Nymph_ENABLE_PYTHON )
 
     # Python binding headers
     set( PYBINDING_HEADERFILES
-        ${dir}/nymph/nymph_pybind.hh
+        ${dir}/nymph/nymph_pybind_template.hh
     )
 
     # Python bindings
     set( PYBINDING_SOURCEFILES
-        ${dir}/nymph/nymph_pybind.cc
+        ${dir}/nymph/nymph_pybind_template.cc
     )
 
     set( PROJECT_LIBRARIES Nymph )
@@ -24,6 +24,12 @@ if ( Nymph_ENABLE_PYTHON )
 
     pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 
+    if( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
+        message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )
+        configure_file( nymph/add_lib_python_path.sh.in nymph/add_lib_python_path.sh @ONLY)
+        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/nymph/add_lib_python_path.sh DESTINATION ${BIN_INSTALL_DIR} )
+    endif( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
+
     message( "Done with Python bindings" )
 
 endif( Nymph_ENABLE_PYTHON )
\ No newline at end of file
diff --git a/Python/nymph/__init__.py b/Python/nymph/__init__.py
index e69de29..34e3b3d 100644
--- a/Python/nymph/__init__.py
+++ b/Python/nymph/__init__.py
@@ -0,0 +1 @@
+#from . import your_module
\ No newline at end of file
diff --git a/Python/nymph/add_lib_python_path.sh.in b/Python/nymph/add_lib_python_path.sh.in
new file mode 100644
index 0000000..68aff4b
--- /dev/null
+++ b/Python/nymph/add_lib_python_path.sh.in
@@ -0,0 +1,3 @@
+# Adds the lib install directory to the python path
+
+export PYTHONPATH=@LIB_INSTALL_DIR@:$PYTHONPATH
diff --git a/Python/nymph/nymph_pybind.cc b/Python/nymph/nymph_pybind.cc
deleted file mode 100644
index e69de29..0000000
diff --git a/Python/nymph/nymph_pybind.hh b/Python/nymph/nymph_pybind.hh
deleted file mode 100644
index e69de29..0000000
diff --git a/Python/nymph/nymph_pybind_template.cc b/Python/nymph/nymph_pybind_template.cc
new file mode 100644
index 0000000..d20d315
--- /dev/null
+++ b/Python/nymph/nymph_pybind_template.cc
@@ -0,0 +1,13 @@
+/*
+ * nymph_pybind_template.cc
+ *
+ * Created on: March 16, 2022
+ *     Author: A. Ziegler
+ */
+
+#include "pybind11/stl.h"
+
+PYBIND11_MODULE( nymph, nymph_mod)
+{
+
+}
\ No newline at end of file
diff --git a/Python/nymph/nymph_pybind_template.hh b/Python/nymph/nymph_pybind_template.hh
new file mode 100644
index 0000000..6478470
--- /dev/null
+++ b/Python/nymph/nymph_pybind_template.hh
@@ -0,0 +1,6 @@
+/*
+ * nymph_pybind_template.hh
+ *
+ * Created on: March 16, 2022
+ *     Author: A. Ziegler
+ */
diff --git a/setup.cfg b/setup.cfg
index 7a91a35..0d58041 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,10 +15,6 @@ classifiers =
 
 [options]
 zip_safe = False
-package_dir =
-    = Python/nymph
-packages = find:
 python_requires = >=3.6
 
 [options.packages.find]
-where = .
diff --git a/setup.py b/setup.py
index 175d05f..378f8f0 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@ def __init__(self, name, sourcedir=''):
         self.sourcedir = os.path.abspath(sourcedir)
         print(self.sourcedir)
 
-
 class CMakeBuild(build_ext):
     def run(self):
         try:
@@ -69,4 +68,9 @@ def build_extension(self, ext):
     setup(
         ext_modules=[CMakeExtension('nymph', sourcedir='')],
         cmdclass=dict(build_ext=CMakeBuild),
+        packages = find_packages(
+            where='Python',
+            include=['nymph'],
+        ),
+        package_dir={'': 'Python'}
     )

From 0c2e652ab87730fe4238e925e8b76dcb58df7c18 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Wed, 23 Mar 2022 10:30:25 -0400
Subject: [PATCH 304/521] updated the python readme

---
 Python/README.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Python/README.md b/Python/README.md
index 7c3720e..a89ff8f 100644
--- a/Python/README.md
+++ b/Python/README.md
@@ -1,7 +1,7 @@
-NymphPy
+Nymph
 =====
 
-NymphPy is a Python extension of the C++-based Nymph data analysis framework.
+Nymph is a Python extension of the C++-based Nymph data analysis framework.
 
 
 Dependencies
@@ -23,11 +23,19 @@ Operating System Support
 Directory Structure
 -------------------
 
-*  nymph - nymph-py modules.
+*  nymph - nymph modules.
 
 Installing
 ----------
-python -m build
+To build the python package use
+
+python -m build 
+
+To install and build the python package use
+
+pip install .
+
+in the directory where the setup.py script is located.
 
 Instructions for Use
 --------------------

From cea025b044ba6a6b4065cf8bb3833e1e026d7b2b Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 5 Apr 2022 11:49:52 -0400
Subject: [PATCH 305/521] comment out distutils

---
 setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 378f8f0..603e8ef 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
-from distutils.version import LooseVersion
+#from distutils.version import LooseVersion
 
 
 class CMakeExtension(Extension):
@@ -23,10 +23,10 @@ def run(self):
             raise RuntimeError("CMake must be installed to build the following extensions: " +
                                ", ".join(e.name for e in self.extensions))
 
-        if platform.system() == "Windows":
-            cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
-            if cmake_version < '3.1.0':
-                raise RuntimeError("CMake >= 3.1.0 is required on Windows")
+        #if platform.system() == "Windows":
+        #    cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
+        #    if cmake_version < '3.1.0':
+        #        raise RuntimeError("CMake >= 3.1.0 is required on Windows")
 
         for ext in self.extensions:
             self.build_extension(ext)

From e7ddacd94740a0db4b8955f246e3e7bb3a29dc66 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 5 Apr 2022 13:28:35 -0400
Subject: [PATCH 306/521] Modify NymphPybind.cc

Rename variable to nymphPackage
---
 Python/Bindings/NymphPybind.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index fe181d5..9583627 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -12,14 +12,14 @@
 namespace py = pybind11;
 
 
-PYBIND11_MODULE(_nymph, nymphToplvl) {
+PYBIND11_MODULE(_nymph, nymphPackage) {
 
-	nymphToplvl.doc() = "Nymph package";
+	nymphPackage.doc() = "Nymph package";
 
-	auto nymphControl = nymphToplvl.def_submodule("control", "Control module");
-	auto nymphData = nymphToplvl.def_submodule("data", "Data module");
-	auto nymphImplementation = nymphToplvl.def_submodule("implementation", "Implementation module");
-	auto nymphProcessor = nymphToplvl.def_submodule("processor", "Processor module");
+	auto nymphControl = nymphPackage.def_submodule("control", "Control module");
+	auto nymphData = nymphPackage.def_submodule("data", "Data module");
+	auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
+	auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
 	NymphPybind::ExportProcessor(nymphProcessor);
-	auto nymphUtility = nymphToplvl.def_submodule("utility", "Utility module");
+	auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }

From 35bd354b8d6ab77c4e8117786c33296e46a7fd84 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 5 Apr 2022 13:30:10 -0400
Subject: [PATCH 307/521] Modify binding code for Processor class

Adds the required trampoline class. Code compiles now.
---
 Python/Bindings/Processor/ProcessorPybind.hh | 22 +++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 00a63b4..f7df36f 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -16,10 +16,26 @@ namespace py = pybind11;
 
 namespace NymphPybind
 {
+	//trampoline class
+	class PyProcessor : public Nymph::Processor {
+		public:
+			/* Inherit the constructors */
+			using Nymph::Processor::Processor;
+
+			/* Trampoline (need one for each virtual function) */
+			void Configure( const scarab::param_node& node ) override {
+				PYBIND11_OVERRIDE_PURE(
+					void, /* Return type */
+					Processor,      /* Parent class */
+					Configure,          /* Name of function in C++ (must match Python name) */
+					node/* Argument(s) */
+				);
+			}
+	};
 
 	void ExportProcessor( py::module_& nymphProcessor)
 	{
-	    py::class_< Nymph::Processor>(nymphProcessor, "_Processor")
+	    py::class_< Nymph::Processor, PyProcessor>(nymphProcessor, "_Processor")
 	    		.def(py::init<const std::string& >())
 				.def("configure", &Nymph::Processor::Configure)
 				.def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
@@ -28,8 +44,8 @@ namespace NymphPybind
 				.def("register_signal", &Nymph::Processor::RegisterSignal)
 				.def("register_slot", &Nymph::Processor::RegisterSlot)
 				.def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
-				.def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint)
-				.def_property_readonly("name", &Nymph::Processor::Name);
+				.def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
+				//.def_property_readonly("name", &Nymph::Processor::Name);
 	}
 
 }

From e618267216d7cd88e3008faeea1b727c9f12941f Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 5 Apr 2022 16:06:46 -0400
Subject: [PATCH 308/521] Modify .gitignore

Now ignores the python __pycache__ dir
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 77bfe6e..37e86d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@
 # Build directories
 build*/
 
+# python ignores
+__pycache__

From 3424aba3dbb6ab3e84d14afcfade21d8536e337a Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 5 Apr 2022 16:27:18 -0400
Subject: [PATCH 309/521] Add rudimentary test of python processor

---
 Testing/Python/testprocessor.py | 43 +++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Testing/Python/testprocessor.py

diff --git a/Testing/Python/testprocessor.py b/Testing/Python/testprocessor.py
new file mode 100644
index 0000000..a232072
--- /dev/null
+++ b/Testing/Python/testprocessor.py
@@ -0,0 +1,43 @@
+
+"""
+  testprocessor.py
+ 
+   Created on: Apr 05, 2022
+       Author: F. Thomas
+"""
+
+__all__ = []
+
+import sys
+
+build_path = sys.argv[1]
+
+sys.path.append(build_path + '/Scarab/python')
+sys.path.append(build_path + '/Python/Bindings')
+
+import _nymph
+import scarab
+
+class TestProcessor(_nymph.processor._Processor):
+    
+    def configure(self, param_node):
+        
+        param_dict = param_node.to_python()
+        self.x = param_dict['x']
+
+def main(args):
+    
+    testprocessor = TestProcessor('test')
+    
+    param = scarab.ParamValue( 1.0 )
+    param_node = scarab.ParamNode()
+    param_node.add('x', param)
+    
+    testprocessor.configure(param_node)
+    
+    print(testprocessor.x)
+    return 0
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main(sys.argv))

From 663ec996f0cae1e132547f268a07b013879940f6 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:04:35 -0400
Subject: [PATCH 310/521] runs python build in workflow now

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 805db06..54f6750 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -82,13 +82,13 @@ jobs:
             libyaml-cpp-dev \
             rapidjson-dev
 
-      - name: Configure
+      - name: Configure CMake
         run: |
           mkdir -p build
           cd build
           cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
 
-      - name: Build
+      - name: CMake Build
         run: |
           cd build
           make -j install
@@ -98,6 +98,10 @@ jobs:
           cd build
           Testing/RunTests
 
+      - name: Python Build
+        run: |
+          python -m build
+
 # For debugging
 #      - name: Setup tmate session
 #        if: ${{ ! success() }}

From 713c2f7ad9174b5d5c3d8e82f5a30fc57b11bdcf Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:13:37 -0400
Subject: [PATCH 311/521] install build in git workflow

---
 .github/workflows/build.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 54f6750..29d726f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -100,8 +100,10 @@ jobs:
 
       - name: Python Build
         run: |
+          python -m pip install build --user
           python -m build
 
+
 # For debugging
 #      - name: Setup tmate session
 #        if: ${{ ! success() }}

From 6053e5abece38b46d5044abf33f60f0c48dd2d19 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:17:47 -0400
Subject: [PATCH 312/521] try to add pybind11 install

---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 29d726f..6138f1c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,7 +71,8 @@ jobs:
           brew install \
             boost \
             rapidjson \
-            yaml-cpp
+            yaml-cpp \
+            pybind11
 
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
@@ -80,7 +81,8 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev
+            rapidjson-dev \
+            pybind11
 
       - name: Configure CMake
         run: |

From 747d1e892aa409eb671605c56235f58fef627af9 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:24:20 -0400
Subject: [PATCH 313/521] changed apt pybind package name

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6138f1c..1969295 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -72,7 +72,7 @@ jobs:
             boost \
             rapidjson \
             yaml-cpp \
-            pybind11
+            python-pybind11
 
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only

From bc805cc77903d3f16dca46e59c0dd8c2c5120458 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:27:38 -0400
Subject: [PATCH 314/521] debugging ubuntu workflow

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1969295..09f2c85 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,8 +71,7 @@ jobs:
           brew install \
             boost \
             rapidjson \
-            yaml-cpp \
-            python-pybind11
+            yaml-cpp 
 
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
@@ -103,6 +102,7 @@ jobs:
       - name: Python Build
         run: |
           python -m pip install build --user
+          python -m pip install pybind11 --user
           python -m build
 
 

From 64b63f8321b4bb64827971ca83f76a3d8dce6f39 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:29:07 -0400
Subject: [PATCH 315/521] debug

---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 09f2c85..3aa64fa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -71,7 +71,8 @@ jobs:
           brew install \
             boost \
             rapidjson \
-            yaml-cpp 
+            yaml-cpp \
+            pybind11
 
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
@@ -81,7 +82,7 @@ jobs:
             libboost-all-dev \
             libyaml-cpp-dev \
             rapidjson-dev \
-            pybind11
+            python-pybind11
 
       - name: Configure CMake
         run: |

From 707a254cb4a5e4c3a179174612d8f92d46ba25a9 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:30:27 -0400
Subject: [PATCH 316/521] debug

---
 .github/workflows/build.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3aa64fa..bb63d62 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -81,8 +81,8 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev \
-            python-pybind11
+            rapidjson-dev
+          python -m pip install pybind11 --user
 
       - name: Configure CMake
         run: |
@@ -103,7 +103,6 @@ jobs:
       - name: Python Build
         run: |
           python -m pip install build --user
-          python -m pip install pybind11 --user
           python -m build
 
 

From 5d146b77134fc23cf36f9b1289b182e738b8d94a Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:37:19 -0400
Subject: [PATCH 317/521] debug

---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bb63d62..4c9a294 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -74,6 +74,7 @@ jobs:
             yaml-cpp \
             pybind11
 
+
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
         run: |
@@ -81,8 +82,8 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev
-          python -m pip install pybind11 --user
+            rapidjson-dev \
+          
 
       - name: Configure CMake
         run: |
@@ -103,6 +104,7 @@ jobs:
       - name: Python Build
         run: |
           python -m pip install build --user
+          pip install pybind11 --user
           python -m build
 
 

From 26fe0b9f157a2ecf03a2548eba4a5b5294cf6135 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:46:08 -0400
Subject: [PATCH 318/521] debug

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4c9a294..27163e3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -82,7 +82,8 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev \
+            rapidjson-dev 
+          pip install "pybind11[global]"
           
 
       - name: Configure CMake
@@ -104,7 +105,6 @@ jobs:
       - name: Python Build
         run: |
           python -m pip install build --user
-          pip install pybind11 --user
           python -m build
 
 

From f34cebe15cc6ba4e6585329a3015fb3ac634681d Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:54:31 -0400
Subject: [PATCH 319/521] debug

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 27163e3..8667b03 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -83,7 +83,7 @@ jobs:
             libboost-all-dev \
             libyaml-cpp-dev \
             rapidjson-dev 
-          pip install "pybind11[global]"
+            pybind11-dev
           
 
       - name: Configure CMake

From f215f9b368fb7bdd8f6645a674c4969ba97e9b88 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 09:56:29 -0400
Subject: [PATCH 320/521] debug

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8667b03..07a90f5 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -82,7 +82,7 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev 
+            rapidjson-dev \
             pybind11-dev
           
 

From d0300eb962a68105babec2811a977580ea488e62 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 10:04:13 -0400
Subject: [PATCH 321/521] debug

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 07a90f5..9c9b595 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -105,7 +105,7 @@ jobs:
       - name: Python Build
         run: |
           python -m pip install build --user
-          python -m build
+          python -m build --user
 
 
 # For debugging

From 21a27fa693c8e366f3875d072eb8dab3286e2790 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 10:08:10 -0400
Subject: [PATCH 322/521] debug

---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9c9b595..bfb9ceb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -83,7 +83,8 @@ jobs:
             libboost-all-dev \
             libyaml-cpp-dev \
             rapidjson-dev \
-            pybind11-dev
+            pybind11-dev \
+          pip install "pybind11[global]"
           
 
       - name: Configure CMake
@@ -105,7 +106,7 @@ jobs:
       - name: Python Build
         run: |
           python -m pip install build --user
-          python -m build --user
+          python -m build 
 
 
 # For debugging

From 4a2aafc692ebe0e5c3769f4764a9e4a0fa4d0a73 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 18 Apr 2022 10:09:01 -0400
Subject: [PATCH 323/521] debug

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bfb9ceb..6878189 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -83,7 +83,7 @@ jobs:
             libboost-all-dev \
             libyaml-cpp-dev \
             rapidjson-dev \
-            pybind11-dev \
+            pybind11-dev 
           pip install "pybind11[global]"
           
 

From 6a1cea996b78a468c2b90e8f7ae50170e5936045 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:32:16 -0400
Subject: [PATCH 324/521] cleaned up the workflow

---
 .github/workflows/build.yaml | 66 +++++++++++++++++++++++++++++++++---
 Scarab                       |  2 +-
 pyproject.toml               |  5 ++-
 setup.py                     |  6 ++--
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6878189..fd3f238 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,8 +42,8 @@ jobs:
           docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
 
 
-  build:
-    name: Build and Test
+  build-cpp:
+    name: Build and Test Cpp
 
     runs-on: ${{ matrix.os }}
 
@@ -84,7 +84,6 @@ jobs:
             libyaml-cpp-dev \
             rapidjson-dev \
             pybind11-dev 
-          pip install "pybind11[global]"
           
 
       - name: Configure CMake
@@ -103,11 +102,68 @@ jobs:
           cd build
           Testing/RunTests
 
+  build-python:
+    name: Build and Test Python
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macOS-10.15]
+        python-version: [3.9]
+
+    steps:
+
+      - name: Checkout reposistory
+        uses: actions/checkout@master
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Mac Dependencies
+        if: startsWith(matrix.os, 'macos')  # Mac only
+        run: |
+          brew install \
+            boost \
+            rapidjson \
+            yaml-cpp \
+            pybind11
+
+          python -m pip install build
+
+
+      - name: Linux Dependencies
+        if: startsWith(matrix.os, 'ubuntu')  # Linux only
+        run: |
+          sudo apt-get update
+          sudo apt-get install -yq \
+            libboost-all-dev \
+            libyaml-cpp-dev \
+            rapidjson-dev \
+            pybind11-dev
+
+          python -m pip install build
+          
+
+      #- name: Configure CMake
+      #  run: |
+      #    mkdir -p build
+      #    cd build
+      #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+
       - name: Python Build
         run: |
-          python -m pip install build --user
-          python -m build 
+          python -m build
 
+      #- name: Run tests
+      #  run: |
+      #    cd build
+      #   Testing/RunTests
 
 # For debugging
 #      - name: Setup tmate session
diff --git a/Scarab b/Scarab
index a20a6db..2b31bd7 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit a20a6dbe4cdd1ef489515a21f7987cc6867a753c
+Subproject commit 2b31bd72d7978a388fc64ac031b924f01d07c9c7
diff --git a/pyproject.toml b/pyproject.toml
index 70cfe4a..7615e63 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,9 +2,8 @@
 requires = [
     "setuptools>=42", 
     "wheel",
-    "cmake>=3.12",
-    "pybind11>=2.3.0",
-    "PyYAML",
+    "pybind11",
     "python-rapidjson",
+    "pyyaml",
 ]
 build-backend = "setuptools.build_meta"
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 603e8ef..5c450f9 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,6 @@ class CMakeExtension(Extension):
     def __init__(self, name, sourcedir=''):
         Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
-        print(self.sourcedir)
 
 class CMakeBuild(build_ext):
     def run(self):
@@ -33,10 +32,13 @@ def run(self):
 
     def build_extension(self, ext):
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
+        build_env_dir = sys.executable.split('/bin/python')[0]
+        #print(build_env_dir)
+        
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
                       '-DPYTHON_EXECUTABLE=' + sys.executable,
                       '-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
-                      '-DNymph_ENABLE_PYTHON:bool=1',
+                      '-DNymph_ENABLE_PYTHON:bool=1'
                      ]
 
         cfg = 'Debug' if self.debug else 'Release'

From b91ec424ac75b5d31456e9ee78ad5165fc3a9770 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:40:25 -0400
Subject: [PATCH 325/521] Revert "cleaned up the workflow"

This reverts commit 6a1cea996b78a468c2b90e8f7ae50170e5936045.
---
 .github/workflows/build.yaml | 66 +++---------------------------------
 Scarab                       |  2 +-
 pyproject.toml               |  5 +--
 setup.py                     |  6 ++--
 4 files changed, 11 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd3f238..6878189 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,8 +42,8 @@ jobs:
           docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
 
 
-  build-cpp:
-    name: Build and Test Cpp
+  build:
+    name: Build and Test
 
     runs-on: ${{ matrix.os }}
 
@@ -84,6 +84,7 @@ jobs:
             libyaml-cpp-dev \
             rapidjson-dev \
             pybind11-dev 
+          pip install "pybind11[global]"
           
 
       - name: Configure CMake
@@ -102,68 +103,11 @@ jobs:
           cd build
           Testing/RunTests
 
-  build-python:
-    name: Build and Test Python
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macOS-10.15]
-        python-version: [3.9]
-
-    steps:
-
-      - name: Checkout reposistory
-        uses: actions/checkout@master
-        with:
-          submodules: recursive
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Mac Dependencies
-        if: startsWith(matrix.os, 'macos')  # Mac only
-        run: |
-          brew install \
-            boost \
-            rapidjson \
-            yaml-cpp \
-            pybind11
-
-          python -m pip install build
-
-
-      - name: Linux Dependencies
-        if: startsWith(matrix.os, 'ubuntu')  # Linux only
-        run: |
-          sudo apt-get update
-          sudo apt-get install -yq \
-            libboost-all-dev \
-            libyaml-cpp-dev \
-            rapidjson-dev \
-            pybind11-dev
-
-          python -m pip install build
-          
-
-      #- name: Configure CMake
-      #  run: |
-      #    mkdir -p build
-      #    cd build
-      #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
-
       - name: Python Build
         run: |
-          python -m build
+          python -m pip install build --user
+          python -m build 
 
-      #- name: Run tests
-      #  run: |
-      #    cd build
-      #   Testing/RunTests
 
 # For debugging
 #      - name: Setup tmate session
diff --git a/Scarab b/Scarab
index 2b31bd7..a20a6db 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 2b31bd72d7978a388fc64ac031b924f01d07c9c7
+Subproject commit a20a6dbe4cdd1ef489515a21f7987cc6867a753c
diff --git a/pyproject.toml b/pyproject.toml
index 7615e63..70cfe4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,8 +2,9 @@
 requires = [
     "setuptools>=42", 
     "wheel",
-    "pybind11",
+    "cmake>=3.12",
+    "pybind11>=2.3.0",
+    "PyYAML",
     "python-rapidjson",
-    "pyyaml",
 ]
 build-backend = "setuptools.build_meta"
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 5c450f9..603e8ef 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ class CMakeExtension(Extension):
     def __init__(self, name, sourcedir=''):
         Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
+        print(self.sourcedir)
 
 class CMakeBuild(build_ext):
     def run(self):
@@ -32,13 +33,10 @@ def run(self):
 
     def build_extension(self, ext):
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
-        build_env_dir = sys.executable.split('/bin/python')[0]
-        #print(build_env_dir)
-        
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
                       '-DPYTHON_EXECUTABLE=' + sys.executable,
                       '-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
-                      '-DNymph_ENABLE_PYTHON:bool=1'
+                      '-DNymph_ENABLE_PYTHON:bool=1',
                      ]
 
         cfg = 'Debug' if self.debug else 'Release'

From 640910a2bd27ee12a4ca91beae572d357f214fb6 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:48:59 -0400
Subject: [PATCH 326/521] modified github workflow

---
 .github/workflows/build.yaml | 75 ++++++++++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6878189..b525c2e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -43,7 +43,7 @@ jobs:
 
 
   build:
-    name: Build and Test
+    name: Build and Test Cpp
 
     runs-on: ${{ matrix.os }}
 
@@ -103,10 +103,79 @@ jobs:
           cd build
           Testing/RunTests
 
+      #- name: Python Build
+      #  run: |
+      #    python -m pip install build --user
+      #    python -m build
+
+
+    build:
+    name: Build and Test Python
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macOS-10.15]
+        python-version: [3.9]
+
+    steps:
+
+      - name: Checkout reposistory
+        uses: actions/checkout@master
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Mac Dependencies
+        if: startsWith(matrix.os, 'macos')  # Mac only
+        run: |
+          brew install \
+            boost \
+            rapidjson \
+            yaml-cpp \
+            pybind11
+
+          python -m pip install build
+
+
+      - name: Linux Dependencies
+        if: startsWith(matrix.os, 'ubuntu')  # Linux only
+        run: |
+          sudo apt-get update
+          sudo apt-get install -yq \
+            libboost-all-dev \
+            libyaml-cpp-dev \
+            rapidjson-dev \
+            pybind11-dev 
+          
+          python -m pip install build
+          
+
+      #- name: Configure CMake
+      #  run: |
+      #    mkdir -p build
+      #    cd build
+      #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+
       - name: Python Build
         run: |
-          python -m pip install build --user
-          python -m build 
+          python -m build
+
+      #- name: Run tests
+      #  run: |
+      #    cd build
+      #    Testing/RunTests
+
+      #- name: Python Build
+      #  run: |
+      #    python -m pip install build --user
+      #    python -m build
 
 
 # For debugging

From a25b609811d9499fbe46933e06c89872d8753423 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:50:32 -0400
Subject: [PATCH 327/521] fixed error in build.yaml

---
 .github/workflows/build.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b525c2e..159d8d3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -110,15 +110,15 @@ jobs:
 
 
     build:
-    name: Build and Test Python
+      name: Build and Test Python
 
-    runs-on: ${{ matrix.os }}
+      runs-on: ${{ matrix.os }}
 
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, macOS-10.15]
-        python-version: [3.9]
+      strategy:
+        fail-fast: false
+        matrix:
+          os: [ubuntu-20.04, macOS-10.15]
+          python-version: [3.9]
 
     steps:
 

From f04830ea03dcdfc6874cd5df16f8595c988ecc8a Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:51:44 -0400
Subject: [PATCH 328/521] fixed another error in the workflow

---
 .github/workflows/build.yaml | 112 +++++++++++++++++------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 159d8d3..3974670 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -120,62 +120,62 @@ jobs:
           os: [ubuntu-20.04, macOS-10.15]
           python-version: [3.9]
 
-    steps:
-
-      - name: Checkout reposistory
-        uses: actions/checkout@master
-        with:
-          submodules: recursive
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Mac Dependencies
-        if: startsWith(matrix.os, 'macos')  # Mac only
-        run: |
-          brew install \
-            boost \
-            rapidjson \
-            yaml-cpp \
-            pybind11
-
-          python -m pip install build
-
-
-      - name: Linux Dependencies
-        if: startsWith(matrix.os, 'ubuntu')  # Linux only
-        run: |
-          sudo apt-get update
-          sudo apt-get install -yq \
-            libboost-all-dev \
-            libyaml-cpp-dev \
-            rapidjson-dev \
-            pybind11-dev 
-          
-          python -m pip install build
-          
-
-      #- name: Configure CMake
-      #  run: |
-      #    mkdir -p build
-      #    cd build
-      #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
-
-      - name: Python Build
-        run: |
-          python -m build
-
-      #- name: Run tests
-      #  run: |
-      #    cd build
-      #    Testing/RunTests
-
-      #- name: Python Build
-      #  run: |
-      #    python -m pip install build --user
-      #    python -m build
+      steps:
+
+        - name: Checkout reposistory
+          uses: actions/checkout@master
+          with:
+            submodules: recursive
+
+        - name: Set up Python
+          uses: actions/setup-python@v2
+          with:
+            python-version: ${{ matrix.python-version }}
+
+        - name: Mac Dependencies
+          if: startsWith(matrix.os, 'macos')  # Mac only
+          run: |
+            brew install \
+              boost \
+              rapidjson \
+              yaml-cpp \
+              pybind11
+
+            python -m pip install build
+
+
+        - name: Linux Dependencies
+          if: startsWith(matrix.os, 'ubuntu')  # Linux only
+          run: |
+            sudo apt-get update
+            sudo apt-get install -yq \
+              libboost-all-dev \
+              libyaml-cpp-dev \
+              rapidjson-dev \
+              pybind11-dev 
+            
+            python -m pip install build
+            
+
+        #- name: Configure CMake
+        #  run: |
+        #    mkdir -p build
+        #    cd build
+        #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+
+        - name: Python Build
+          run: |
+            python -m build
+
+        #- name: Run tests
+        #  run: |
+        #    cd build
+        #    Testing/RunTests
+
+        #- name: Python Build
+        #  run: |
+        #    python -m pip install build --user
+        #    python -m build
 
 
 # For debugging

From 0f57f1dd4536d33ec1b7ef3e3c6de49678d8315b Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:53:25 -0400
Subject: [PATCH 329/521] changed job names

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3974670..216abcb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
           docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
 
 
-  build:
+  build_cpp:
     name: Build and Test Cpp
 
     runs-on: ${{ matrix.os }}
@@ -109,7 +109,7 @@ jobs:
       #    python -m build
 
 
-    build:
+    build_python:
       name: Build and Test Python
 
       runs-on: ${{ matrix.os }}

From ea3adb4272f3d89eae65ebcdd868c4235d32c2fb Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 08:54:49 -0400
Subject: [PATCH 330/521] fixed another error in the workflow

---
 .github/workflows/build.yaml | 136 +++++++++++++++++------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 216abcb..872e50b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
           docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
 
 
-  build_cpp:
+  build:
     name: Build and Test Cpp
 
     runs-on: ${{ matrix.os }}
@@ -109,73 +109,73 @@ jobs:
       #    python -m build
 
 
-    build_python:
-      name: Build and Test Python
-
-      runs-on: ${{ matrix.os }}
-
-      strategy:
-        fail-fast: false
-        matrix:
-          os: [ubuntu-20.04, macOS-10.15]
-          python-version: [3.9]
-
-      steps:
-
-        - name: Checkout reposistory
-          uses: actions/checkout@master
-          with:
-            submodules: recursive
-
-        - name: Set up Python
-          uses: actions/setup-python@v2
-          with:
-            python-version: ${{ matrix.python-version }}
-
-        - name: Mac Dependencies
-          if: startsWith(matrix.os, 'macos')  # Mac only
-          run: |
-            brew install \
-              boost \
-              rapidjson \
-              yaml-cpp \
-              pybind11
-
-            python -m pip install build
-
-
-        - name: Linux Dependencies
-          if: startsWith(matrix.os, 'ubuntu')  # Linux only
-          run: |
-            sudo apt-get update
-            sudo apt-get install -yq \
-              libboost-all-dev \
-              libyaml-cpp-dev \
-              rapidjson-dev \
-              pybind11-dev 
-            
-            python -m pip install build
-            
-
-        #- name: Configure CMake
-        #  run: |
-        #    mkdir -p build
-        #    cd build
-        #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
-
-        - name: Python Build
-          run: |
-            python -m build
-
-        #- name: Run tests
-        #  run: |
-        #    cd build
-        #    Testing/RunTests
-
-        #- name: Python Build
-        #  run: |
-        #    python -m pip install build --user
-        #    python -m build
+  build:
+    name: Build and Test Python
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, macOS-10.15]
+        python-version: [3.9]
+
+    steps:
+
+      - name: Checkout reposistory
+        uses: actions/checkout@master
+        with:
+          submodules: recursive
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Mac Dependencies
+        if: startsWith(matrix.os, 'macos')  # Mac only
+        run: |
+          brew install \
+            boost \
+            rapidjson \
+            yaml-cpp \
+            pybind11
+
+          python -m pip install build
+
+
+      - name: Linux Dependencies
+        if: startsWith(matrix.os, 'ubuntu')  # Linux only
+        run: |
+          sudo apt-get update
+          sudo apt-get install -yq \
+            libboost-all-dev \
+            libyaml-cpp-dev \
+            rapidjson-dev \
+            pybind11-dev 
+          
+          python -m pip install build
+          
+
+      #- name: Configure CMake
+      #  run: |
+      #    mkdir -p build
+      #    cd build
+      #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+
+      - name: Python Build
+        run: |
+          python -m build
+
+      #- name: Run tests
+      #  run: |
+      #    cd build
+      #    Testing/RunTests
+
+      #- name: Python Build
+      #  run: |
+      #    python -m pip install build --user
+      #    python -m build
 
 
 # For debugging

From b34694d4130050d0fd7ab01455de5f349ed228bd Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 09:00:24 -0400
Subject: [PATCH 331/521] changed job names

---
 .github/workflows/build.yaml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 872e50b..0c32f15 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
           docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
 
 
-  build:
+  build_cpp:
     name: Build and Test Cpp
 
     runs-on: ${{ matrix.os }}
@@ -103,13 +103,7 @@ jobs:
           cd build
           Testing/RunTests
 
-      #- name: Python Build
-      #  run: |
-      #    python -m pip install build --user
-      #    python -m build
-
-
-  build:
+  build_python:
     name: Build and Test Python
 
     runs-on: ${{ matrix.os }}

From 35d1a45d015113f2d43bc4d7a7ad36061149212f Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 09:14:02 -0400
Subject: [PATCH 332/521] added a sudo to the linux python build

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0c32f15..1b8f07f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -159,7 +159,7 @@ jobs:
 
       - name: Python Build
         run: |
-          python -m build
+          sudo python -m build
 
       #- name: Run tests
       #  run: |

From 57a391a27cf779880e15bfed2b7dc94a445d8c46 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Tue, 3 May 2022 09:21:55 -0400
Subject: [PATCH 333/521] Revert "added a sudo to the linux python build"

This reverts commit 35d1a45d015113f2d43bc4d7a7ad36061149212f.
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1b8f07f..0c32f15 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -159,7 +159,7 @@ jobs:
 
       - name: Python Build
         run: |
-          sudo python -m build
+          python -m build
 
       #- name: Run tests
       #  run: |

From 10890e4813ff7688481cca2587f331411ed4fa08 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Wed, 4 May 2022 08:15:43 -0400
Subject: [PATCH 334/521] modified the cmake args for he python build

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 603e8ef..dcddca6 100644
--- a/setup.py
+++ b/setup.py
@@ -35,7 +35,7 @@ def build_extension(self, ext):
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
                       '-DPYTHON_EXECUTABLE=' + sys.executable,
-                      '-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
+                      #'-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
                       '-DNymph_ENABLE_PYTHON:bool=1',
                      ]
 

From 4bbce8c07a670335ccd9fb9d402ba95b1bab7ff9 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Mon, 23 May 2022 08:06:43 -0400
Subject: [PATCH 335/521] fixed comment

---
 Cpp/Library/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index ab23244..160284b 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for Nymph/Src/Cpp/Library
+# CMakeLists for Nymph/Cpp/Library
 # Author: N.S. Oblath
 
 set( UTIL_DIR Utility )

From aa161bab0b00435813bd897a48eb2e4b4dab5d75 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 30 May 2022 18:43:48 -0400
Subject: [PATCH 336/521] Add function to python module to get existing
 processors

---
 Python/Bindings/Processor/ProcessorPybind.hh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index f7df36f..3f42f0d 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -9,8 +9,10 @@
 #define PYTHON_BINDINGS_PROCESSOR_PROCESSORPYBIND_HH_
 
 #include <pybind11/pybind11.h>
+#include <memory>
 
 #include "Processor.hh"
+#include "factory.hh"
 
 namespace py = pybind11;
 
@@ -32,10 +34,16 @@ namespace NymphPybind
 				);
 			}
 	};
+	
+	std::shared_ptr< Nymph::Processor > get_processor(const std::string& type, const std::string& name)
+	{
+		scarab::factory< Nymph::Processor, const std::string& >* factory = scarab::factory< Nymph::Processor, const std::string& >::get_instance();
+		return std::shared_ptr< Nymph::Processor >(factory->create(type, name));
+	}
 
 	void ExportProcessor( py::module_& nymphProcessor)
 	{
-	    py::class_< Nymph::Processor, PyProcessor>(nymphProcessor, "_Processor")
+	    py::class_< Nymph::Processor, PyProcessor, std::shared_ptr<Nymph::Processor> >(nymphProcessor, "_Processor")
 	    		.def(py::init<const std::string& >())
 				.def("configure", &Nymph::Processor::Configure)
 				.def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
@@ -46,6 +54,8 @@ namespace NymphPybind
 				.def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
 				.def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
 				//.def_property_readonly("name", &Nymph::Processor::Name);
+		
+		nymphProcessor.def("get_processor", &get_processor);
 	}
 
 }

From f024c13ca8717ca821a782e089b8237b3397ebab Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 31 May 2022 12:46:25 -0400
Subject: [PATCH 337/521] Fix typo in macro for registering processors

---
 Cpp/Library/Processor/Processor.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cpp/Library/Processor/Processor.hh b/Cpp/Library/Processor/Processor.hh
index 73e05d5..8ce5503 100644
--- a/Cpp/Library/Processor/Processor.hh
+++ b/Cpp/Library/Processor/Processor.hh
@@ -116,7 +116,7 @@ namespace Nymph
         return new scarab::registrar< Processor, XDerivedProc, const std::string& >( name );
     }
 
-#define REGISTER_PROCESSOR_NONAMEPSACE(proc_class, proc_name) \
+#define REGISTER_PROCESSOR_NONAMESPACE(proc_class, proc_name) \
         static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
 #define REGISTER_PROCESSOR_NAMESPACE(proc_namespace, proc_class, proc_name) \

From 4e789a3e4085d6f655ea73123584d26c8bb4b145 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 31 May 2022 16:31:55 -0400
Subject: [PATCH 338/521] Add small test that demonstrates fetching C++
 processor in python

---
 Python/Bindings/CMakeLists.txt               | 9 ++++++++-
 Python/Bindings/Processor/ProcessorPybind.hh | 6 ++++++
 Testing/Python/testprocessor.py              | 2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 8125933..56e2051 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -1,6 +1,13 @@
 # CMakeLists for Nymph/Python/Bindings
 # Author: F. Thomas
 
+set( TEST_DIR Testing/Cpp )
+
+include_directories( BEFORE 
+    ${CMAKE_SOURCE_DIR}/${TEST_DIR}
+)
+
+
 set( NYMPH_BINDING_SOURCEFILES
     NymphPybind.cc
 )
@@ -11,4 +18,4 @@ set( lib_dependencies
 
 pybind11_add_module( _nymph ${NYMPH_BINDING_SOURCEFILES} )
 
-target_link_libraries( _nymph PRIVATE Nymph )
\ No newline at end of file
+target_link_libraries( _nymph PRIVATE Nymph )
diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 3f42f0d..0be16c1 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -12,6 +12,7 @@
 #include <memory>
 
 #include "Processor.hh"
+#include "TestProcessorClasses.hh"
 #include "factory.hh"
 
 namespace py = pybind11;
@@ -56,6 +57,11 @@ namespace NymphPybind
 				//.def_property_readonly("name", &Nymph::Processor::Name);
 		
 		nymphProcessor.def("get_processor", &get_processor);
+		
+		//unfortunately this has to go into library code
+		//for some reason the factory in the wrapped get_processor function above 
+		//cannot find the test-proc when it is registered after the library was compiled
+		REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
 	}
 
 }
diff --git a/Testing/Python/testprocessor.py b/Testing/Python/testprocessor.py
index a232072..8330f8d 100644
--- a/Testing/Python/testprocessor.py
+++ b/Testing/Python/testprocessor.py
@@ -14,6 +14,7 @@
 
 sys.path.append(build_path + '/Scarab/python')
 sys.path.append(build_path + '/Python/Bindings')
+sys.path.append(build_path + '/Testing')
 
 import _nymph
 import scarab
@@ -28,6 +29,7 @@ def configure(self, param_node):
 def main(args):
     
     testprocessor = TestProcessor('test')
+    test2 = _nymph.processor.get_processor('test-proc', 'name')
     
     param = scarab.ParamValue( 1.0 )
     param_node = scarab.ParamNode()

From a6d228e3508702f3e42ac53d9101105c66211bf4 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 31 May 2022 19:18:44 -0400
Subject: [PATCH 339/521] Fix for installing pybind11 in Ubuntu build

---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0c32f15..9a3e2c1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -145,8 +145,9 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev \
-            pybind11-dev 
+            rapidjson-dev
+          
+          pip install pybind11 
           
           python -m pip install build
           

From a0ce688691dbfebfd65e31f3b696a66bc18b663e Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 31 May 2022 19:24:27 -0400
Subject: [PATCH 340/521] Fix pybind11 install again

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9a3e2c1..dcbd7fc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -147,7 +147,7 @@ jobs:
             libyaml-cpp-dev \
             rapidjson-dev
           
-          pip install pybind11 
+          pip install "pybind11[global]" 
           
           python -m pip install build
           

From 29b5093861178279e7a4d4a601bfae2f97313658 Mon Sep 17 00:00:00 2001
From: Andrew Ziegler <ziegler@HAL.local>
Date: Thu, 2 Jun 2022 10:48:27 -0400
Subject: [PATCH 341/521] responding to requested changes

---
 CMakeLists.txt       | 2 +-
 NymphConfig.cmake.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f66ef2..c7dbaa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,7 +123,7 @@ pbuilder_add_submodule( Scarab Scarab )
 pbuilder_use_sm_library( Scarab Scarab )
 
 # this is needed for anything that wants to read or write JSON files
-get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
+get_directory_property( RAPIDJSON_FILE_BUFFER_SIZE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Scarab DEFINITION RAPIDJSON_FILE_BUFFER_SIZE )
 set( RAPIDJSON_FILE_BUFFER_SIZE ${RAPIDJSON_FILE_BUFFER_SIZE} PARENT_SCOPE )
 
 
diff --git a/NymphConfig.cmake.in b/NymphConfig.cmake.in
index 9ec817e..9791851 100644
--- a/NymphConfig.cmake.in
+++ b/NymphConfig.cmake.in
@@ -4,7 +4,7 @@ get_filename_component( Nymph_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH )
 
 # Find the dependencies
 include( CMakeFindDependencyMacro )
-find_dependency( Scarab REQUIRED PATHS ${Nymph_CMAKE_DIR} /Scarab @Scarab_BINARY_LOCATION@ )
+find_dependency( Scarab REQUIRED PATHS ${Nymph_CMAKE_DIR}/Scarab @Scarab_BINARY_LOCATION@ )
 
 # Import library targets if they're not already present
 if( NOT TARGET Nymph::@Nymph_FULL_TARGET_NAME@ )

From 966ae7d0036fcbe14c2523c33d96d4b77b16247e Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 2 Jun 2022 09:57:22 -0700
Subject: [PATCH 342/521] Don't need an empty return buffer, so don't use a
 pointer to store the tuple

---
 Cpp/Library/Control/Controller.hh   |  2 +-
 Cpp/Library/Control/ReturnBuffer.hh | 16 ++++-------
 Testing/Cpp/TestReturnBuffer.cc     | 43 ++++++++++++-----------------
 3 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
index 3c3e968..9b3f87f 100644
--- a/Cpp/Library/Control/Controller.hh
+++ b/Cpp/Library/Control/Controller.hh
@@ -115,7 +115,7 @@ namespace Nymph
     void Controller::BreakAndReturn( XArgs&... args )
     {
         this->Break();
-        fReturnBuffer.reset( new ReturnBuffer( args... ) );
+        fReturnBuffer = std::make_unique< ReturnBuffer<XArgs...> >(  args... );
         return;
     }
 
diff --git a/Cpp/Library/Control/ReturnBuffer.hh b/Cpp/Library/Control/ReturnBuffer.hh
index 94ec5c7..3445d3f 100644
--- a/Cpp/Library/Control/ReturnBuffer.hh
+++ b/Cpp/Library/Control/ReturnBuffer.hh
@@ -56,7 +56,7 @@ namespace Nymph
     class ReturnBuffer : public ReturnBufferBase
     {
         public:
-            ReturnBuffer();
+            ReturnBuffer() = delete;
             ReturnBuffer( XArgs&... retval );
             virtual ~ReturnBuffer();
 
@@ -69,19 +69,15 @@ namespace Nymph
             const std::tuple< XArgs&... >& GetReturn() const;
 
         protected:
-            std::tuple< XArgs&... >* fReturn;
+            std::tuple< XArgs&... > fReturn;
     };
 
 
     // ReturnBuffer
-    template< class... XArgs >
-    ReturnBuffer< XArgs... >::ReturnBuffer() :
-            fReturn( nullptr )
-    {}
 
     template< class... XArgs >
     ReturnBuffer< XArgs... >::ReturnBuffer( XArgs&... retval ) :
-            fReturn( new std::tuple< XArgs&... >( retval... ) )
+            fReturn( retval... )
     {}
 
     template< class... XArgs >
@@ -91,15 +87,13 @@ namespace Nymph
     template< class... XArgs >
     std::tuple< XArgs&... >& ReturnBuffer< XArgs... >::GetReturn()
     {
-        if( fReturn == nullptr ) THROW_EXCEPT_HERE( Exception() << "No return is present" );
-        return *fReturn;
+        return fReturn;
     }
 
     template< class... XArgs >
     const std::tuple< XArgs&... >& ReturnBuffer< XArgs... >::GetReturn() const
     {
-        if( fReturn == nullptr ) THROW_EXCEPT_HERE( Exception() << "No return is present" );
-        return *fReturn;
+        return fReturn;
     }
 
 
diff --git a/Testing/Cpp/TestReturnBuffer.cc b/Testing/Cpp/TestReturnBuffer.cc
index 89288e9..5e30092 100644
--- a/Testing/Cpp/TestReturnBuffer.cc
+++ b/Testing/Cpp/TestReturnBuffer.cc
@@ -26,30 +26,21 @@ TEST_CASE( "return_buffer", "[processor]" )
 {
     using namespace Nymph;
 
-    SECTION( "empty" )
-    {
-        ReturnBuffer< double > buffer;
-        REQUIRE_THROWS_AS( buffer.GetReturn(), Exception );
-    }
-
-    SECTION( "full" )
-    {
-        int intData = 5;
-        double doubleData = 100.2;
-        std::string stringData( "I'm a string!" );
-        ReturnBuffer< int, double, std::string > buffer( intData, doubleData, stringData );
-
-        REQUIRE_NOTHROW( buffer.GetReturn() );
-        auto theReturn = buffer.GetReturn();
-        REQUIRE( std::get<0>( theReturn ) == 5 );
-        REQUIRE( std::get<1>( theReturn ) == Approx(100.2) );
-        REQUIRE( std::get<2>( theReturn ) == "I'm a string!" );
-
-        ReturnBufferBase& rbb = buffer;
-        auto theRBBReturn = rbb.GetReturn< int, double, std::string >();
-        REQUIRE( std::get<0>( theRBBReturn ) == 5 );
-        REQUIRE( std::get<1>( theRBBReturn ) == Approx(100.2) );
-        REQUIRE( std::get<2>( theRBBReturn ) == "I'm a string!" );
-
-    }
+    int intData = 5;
+    double doubleData = 100.2;
+    std::string stringData( "I'm a string!" );
+    ReturnBuffer< int, double, std::string > buffer( intData, doubleData, stringData );
+
+    REQUIRE_NOTHROW( buffer.GetReturn() );
+    auto theReturn = buffer.GetReturn();
+    REQUIRE( std::get<0>( theReturn ) == 5 );
+    REQUIRE( std::get<1>( theReturn ) == Approx(100.2) );
+    REQUIRE( std::get<2>( theReturn ) == "I'm a string!" );
+
+    ReturnBufferBase& rbb = buffer;
+    auto theRBBReturn = rbb.GetReturn< int, double, std::string >();
+    REQUIRE( std::get<0>( theRBBReturn ) == 5 );
+    REQUIRE( std::get<1>( theRBBReturn ) == Approx(100.2) );
+    REQUIRE( std::get<2>( theRBBReturn ) == "I'm a string!" );
+
 }

From f67bff6e497235e38593a7362f76b05857f521d5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 7 Jun 2022 16:30:23 -0700
Subject: [PATCH 343/521] Fix the break and return in Controller, and add
 testing

---
 Cpp/Library/Control/Controller.hh | 10 ++++++----
 Testing/Cpp/TestController.cc     | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
index 9b3f87f..05869d6 100644
--- a/Cpp/Library/Control/Controller.hh
+++ b/Cpp/Library/Control/Controller.hh
@@ -76,7 +76,7 @@ namespace Nymph
 
             /// Initiate a break with a return
             template< typename... XArgs >
-            void BreakAndReturn( XArgs&... args );
+            std::tuple< XArgs&... >&  BreakAndReturn( XArgs&... args );
 
             /// Reports whether control is at a breakpoint
             virtual bool IsAtBreak() const;
@@ -112,17 +112,19 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    void Controller::BreakAndReturn( XArgs&... args )
+    std::tuple< XArgs&... >&  Controller::BreakAndReturn( XArgs&... args )
     {
         this->Break();
-        fReturnBuffer = std::make_unique< ReturnBuffer<XArgs...> >(  args... );
-        return;
+        std::unique_lock< std::mutex > lock( fReturnMutex );
+        fReturnBuffer = std::make_unique< ReturnBuffer<XArgs...> >( args... );
+        return fReturnBuffer->GetReturn< XArgs... >();
     }
 
     template< class... XArgs >
     std::tuple< XArgs&... >& Controller::GetReturn()
     {
         std::unique_lock< std::mutex > lock( fReturnMutex );
+        if( ! fReturnBuffer ) THROW_EXCEPT_HERE( Exception() << "Return buffer is currently empty" );
         return fReturnBuffer->GetReturn< XArgs... >();
     }
 
diff --git a/Testing/Cpp/TestController.cc b/Testing/Cpp/TestController.cc
index 0b31ac2..3c38e4a 100644
--- a/Testing/Cpp/TestController.cc
+++ b/Testing/Cpp/TestController.cc
@@ -164,4 +164,19 @@ TEST_CASE( "controller", "[control]" )
 
     }
 
+    SECTION( "ReturnBuffer" )
+    {
+        REQUIRE_FALSE( control.HasReturn() );
+        REQUIRE_THROWS_AS( control.GetReturn<double>(), Exception ); // have to pick a return argument, so I just picked <double> in this case; it could be anything for this test
+        double retval = 5;
+        auto retBuf = control.BreakAndReturn(retval);
+        // check that we're now at a break point
+        REQUIRE( control.IsAtBreak() );
+        // we can access the return variable through the buffer
+        REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
+        // we can change the value of the return variable using the buffer
+        std::get<0>( retBuf ) = 10.;
+        REQUIRE( retval == Approx(10.) );
+    }
+
 }

From 2b99498d849e6562abd101d4a90eb80c04118e25 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 7 Jun 2022 17:05:43 -0700
Subject: [PATCH 344/521] Finishing out ControlAccess with the return-access
 capabilities

---
 Cpp/Library/Control/ControlAccess.cc |  6 ++++++
 Cpp/Library/Control/ControlAccess.hh | 23 ++++++++++++++++++-----
 Cpp/Library/Control/Controller.hh    |  2 +-
 Testing/Cpp/TestControlAccess.cc     | 16 +++++++++++++++-
 Testing/Cpp/TestController.cc        |  1 +
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/Cpp/Library/Control/ControlAccess.cc b/Cpp/Library/Control/ControlAccess.cc
index 97aaf9b..2326735 100644
--- a/Cpp/Library/Control/ControlAccess.cc
+++ b/Cpp/Library/Control/ControlAccess.cc
@@ -75,6 +75,12 @@ namespace Nymph
         THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
     }
 
+    bool ControlAccess::HasReturn() const
+    {
+        if( fControl ) return fControl->HasReturn();
+        THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
+    }
+
     void ControlAccess::ChainIsQuitting( const std::string& name, std::exception_ptr ePtr )
     {
         if( fControl ) fControl->ChainIsQuitting( name, ePtr );
diff --git a/Cpp/Library/Control/ControlAccess.hh b/Cpp/Library/Control/ControlAccess.hh
index a985464..a3c6387 100644
--- a/Cpp/Library/Control/ControlAccess.hh
+++ b/Cpp/Library/Control/ControlAccess.hh
@@ -69,11 +69,18 @@ namespace Nymph
 
             /// Initiate a break with a return
             template< typename... XArgs >
-            void BreakAndReturn( XArgs&... args );
+            std::tuple< XArgs&... >& BreakAndReturn( XArgs&... args );
 
-            /// Reports whether control is at a breakpoint
+            /// Report whether control is at a breakpoint
             bool IsAtBreak() const;
 
+            /// Check whether the return buffer has been filled
+            bool HasReturn() const;
+
+            /// Get the return buffer
+            template< typename... XArgs >
+            std::tuple< XArgs&... >& GetReturn();
+
             /// Notify the control that a chain is quitting
             void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() );
 
@@ -82,11 +89,17 @@ namespace Nymph
     };
 
     template< class... XArgs >
-    void ControlAccess::BreakAndReturn( XArgs&... args )
+    std::tuple< XArgs&... >& ControlAccess::BreakAndReturn( XArgs&... args )
     {
-        if( fControl ) fControl->BreakAndReturn( args... );
+        if( fControl ) return fControl->BreakAndReturn( args... );
+        else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
+    }
+
+    template< class... XArgs >
+    std::tuple< XArgs&... >& ControlAccess::GetReturn()
+    {
+        if( fControl ) return fControl->GetReturn< XArgs... >();
         else THROW_EXCEPT_HERE( Exception() << "Control access does not have a valid controller pointer" );
-        return;
     }
 
 /*
diff --git a/Cpp/Library/Control/Controller.hh b/Cpp/Library/Control/Controller.hh
index 05869d6..8bda216 100644
--- a/Cpp/Library/Control/Controller.hh
+++ b/Cpp/Library/Control/Controller.hh
@@ -112,7 +112,7 @@ namespace Nymph
     }
 
     template< typename... XArgs >
-    std::tuple< XArgs&... >&  Controller::BreakAndReturn( XArgs&... args )
+    std::tuple< XArgs&... >& Controller::BreakAndReturn( XArgs&... args )
     {
         this->Break();
         std::unique_lock< std::mutex > lock( fReturnMutex );
diff --git a/Testing/Cpp/TestControlAccess.cc b/Testing/Cpp/TestControlAccess.cc
index c97a79c..3839927 100644
--- a/Testing/Cpp/TestControlAccess.cc
+++ b/Testing/Cpp/TestControlAccess.cc
@@ -94,6 +94,20 @@ TEST_CASE( "control_access", "[control]" )
         REQUIRE_NOTHROW( access->ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
     }
 
-
+    SECTION( "ReturnBuffer" )
+    {
+        REQUIRE_FALSE( access->HasReturn() );
+        REQUIRE_THROWS_AS( access->GetReturn<double>(), Exception ); // have to pick a return argument, so I just picked <double> in this case; it could be anything for this test
+        double retval = 5;
+        auto retBuf = access->BreakAndReturn(retval);
+        // check that we're now at a break point
+        REQUIRE( access->IsAtBreak() );
+        REQUIRE( access->HasReturn() );
+        // we can access the return variable through the buffer
+        REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
+        // we can change the value of the return variable using the buffer
+        std::get<0>( retBuf ) = 10.;
+        REQUIRE( retval == Approx(10.) );
+    }
 
 }
\ No newline at end of file
diff --git a/Testing/Cpp/TestController.cc b/Testing/Cpp/TestController.cc
index 3c38e4a..a188056 100644
--- a/Testing/Cpp/TestController.cc
+++ b/Testing/Cpp/TestController.cc
@@ -172,6 +172,7 @@ TEST_CASE( "controller", "[control]" )
         auto retBuf = control.BreakAndReturn(retval);
         // check that we're now at a break point
         REQUIRE( control.IsAtBreak() );
+        REQUIRE( control.HasReturn() );
         // we can access the return variable through the buffer
         REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
         // we can change the value of the return variable using the buffer

From 935ab72bc13ad75cbcf406d21492cf3f2deeb172 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 10 Jun 2022 16:38:08 -0700
Subject: [PATCH 345/521] Converting hard tabs to spaces

---
 Python/Bindings/CMakeLists.txt               | 10 +--
 Python/Bindings/NymphPybind.cc               | 14 ++--
 Python/Bindings/Processor/ProcessorPybind.hh | 84 ++++++++++----------
 3 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 644fb41..ec07d16 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -12,12 +12,12 @@ include_directories( BEFORE
 
 # Python binding headers
 #set( PYBINDING_HEADERFILES
-	#nymph_pybind_template.hh
+    #nymph_pybind_template.hh
 #)
 
 # Python bindings
 set( PYBINDING_SOURCEFILES
-	NymphPybind.cc
+    NymphPybind.cc
 )
 
 set( PROJECT_LIBRARIES Nymph )
@@ -27,9 +27,9 @@ pbuilder_add_pybind11_module( _nymph ${PROJECT_LIBRARIES} )
 #pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 
 if( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
-	message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )
-	configure_file( add_lib_python_path.sh.in add_lib_python_path.sh @ONLY)
-	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/add_lib_python_path.sh DESTINATION ${BIN_INSTALL_DIR} )
+    message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )
+    configure_file( add_lib_python_path.sh.in add_lib_python_path.sh @ONLY)
+    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/add_lib_python_path.sh DESTINATION ${BIN_INSTALL_DIR} )
 endif( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
 
 message( "Done with Python bindings" )
diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 9583627..ec3b953 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -14,12 +14,12 @@ namespace py = pybind11;
 
 PYBIND11_MODULE(_nymph, nymphPackage) {
 
-	nymphPackage.doc() = "Nymph package";
+    nymphPackage.doc() = "Nymph package";
 
-	auto nymphControl = nymphPackage.def_submodule("control", "Control module");
-	auto nymphData = nymphPackage.def_submodule("data", "Data module");
-	auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
-	auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
-	NymphPybind::ExportProcessor(nymphProcessor);
-	auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
+    auto nymphControl = nymphPackage.def_submodule("control", "Control module");
+    auto nymphData = nymphPackage.def_submodule("data", "Data module");
+    auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
+    auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
+    NymphPybind::ExportProcessor(nymphProcessor);
+    auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 0be16c1..1e25bb3 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -19,50 +19,50 @@ namespace py = pybind11;
 
 namespace NymphPybind
 {
-	//trampoline class
-	class PyProcessor : public Nymph::Processor {
-		public:
-			/* Inherit the constructors */
-			using Nymph::Processor::Processor;
+    //trampoline class
+    class PyProcessor : public Nymph::Processor {
+        public:
+            /* Inherit the constructors */
+            using Nymph::Processor::Processor;
 
-			/* Trampoline (need one for each virtual function) */
-			void Configure( const scarab::param_node& node ) override {
-				PYBIND11_OVERRIDE_PURE(
-					void, /* Return type */
-					Processor,      /* Parent class */
-					Configure,          /* Name of function in C++ (must match Python name) */
-					node/* Argument(s) */
-				);
-			}
-	};
-	
-	std::shared_ptr< Nymph::Processor > get_processor(const std::string& type, const std::string& name)
-	{
-		scarab::factory< Nymph::Processor, const std::string& >* factory = scarab::factory< Nymph::Processor, const std::string& >::get_instance();
-		return std::shared_ptr< Nymph::Processor >(factory->create(type, name));
-	}
+            /* Trampoline (need one for each virtual function) */
+            void Configure( const scarab::param_node& node ) override {
+                PYBIND11_OVERRIDE_PURE(
+                    void, /* Return type */
+                    Processor,      /* Parent class */
+                    Configure,          /* Name of function in C++ (must match Python name) */
+                    node/* Argument(s) */
+                );
+            }
+    };
+    
+    std::shared_ptr< Nymph::Processor > get_processor(const std::string& type, const std::string& name)
+    {
+        scarab::factory< Nymph::Processor, const std::string& >* factory = scarab::factory< Nymph::Processor, const std::string& >::get_instance();
+        return std::shared_ptr< Nymph::Processor >(factory->create(type, name));
+    }
 
-	void ExportProcessor( py::module_& nymphProcessor)
-	{
-	    py::class_< Nymph::Processor, PyProcessor, std::shared_ptr<Nymph::Processor> >(nymphProcessor, "_Processor")
-	    		.def(py::init<const std::string& >())
-				.def("configure", &Nymph::Processor::Configure)
-				.def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
-				.def("connect_a_slot", &Nymph::Processor::ConnectASlot)
-				.def("connect_a_signal", &Nymph::Processor::ConnectASignal)
-				.def("register_signal", &Nymph::Processor::RegisterSignal)
-				.def("register_slot", &Nymph::Processor::RegisterSlot)
-				.def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
-				.def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
-				//.def_property_readonly("name", &Nymph::Processor::Name);
-		
-		nymphProcessor.def("get_processor", &get_processor);
-		
-		//unfortunately this has to go into library code
-		//for some reason the factory in the wrapped get_processor function above 
-		//cannot find the test-proc when it is registered after the library was compiled
-		REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
-	}
+    void ExportProcessor( py::module_& nymphProcessor)
+    {
+        py::class_< Nymph::Processor, PyProcessor, std::shared_ptr<Nymph::Processor> >(nymphProcessor, "_Processor")
+                .def(py::init<const std::string& >())
+                .def("configure", &Nymph::Processor::Configure)
+                .def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
+                .def("connect_a_slot", &Nymph::Processor::ConnectASlot)
+                .def("connect_a_signal", &Nymph::Processor::ConnectASignal)
+                .def("register_signal", &Nymph::Processor::RegisterSignal)
+                .def("register_slot", &Nymph::Processor::RegisterSlot)
+                .def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
+                .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
+                //.def_property_readonly("name", &Nymph::Processor::Name);
+        
+        nymphProcessor.def("get_processor", &get_processor);
+        
+        //unfortunately this has to go into library code
+        //for some reason the factory in the wrapped get_processor function above 
+        //cannot find the test-proc when it is registered after the library was compiled
+        REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
+    }
 
 }
 

From 9bac081c1c39b66369fb582f1e717cc04652ddce Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 13 Jun 2022 11:32:29 -0400
Subject: [PATCH 346/521] Add variable to change build type

---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index dcbd7fc..c4570e9 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,6 +12,7 @@ env:
   Nymph_ENABLE_PYTHON: OFF
   Nymph_ENABLE_TESTING: ON
   Nymph_SINGLETHREADED: OFF
+  Nymph_BUILD_TYPE: Debug
   Nymph_TAG: test
 
 jobs:
@@ -34,7 +35,7 @@ jobs:
             --target nymph_done \
             --build-arg img_repo=${BASE_IMAGE_REPO} \
             --build-arg img_tag=${BASE_IMAGE_TAG} \
-            --build-arg build_type=Debug \
+            --build-arg build_type=${Nymph_BUILD_TYPE} \
             --build-arg build_tests_exe=${Nymph_ENABLE_TESTING} \
             --build-arg nymph_tag=${Nymph_TAG} \
             --tag project8/nymph:${Nymph_TAG} \
@@ -91,7 +92,7 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+          cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE} -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
 
       - name: CMake Build
         run: |

From 75969b1df9cfd6861fd8e8b7e90f4f2db85237d7 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 13 Jun 2022 11:42:53 -0400
Subject: [PATCH 347/521] Add binding code for nymph Data

---
 Python/Bindings/Data/DataPybind.hh | 38 ++++++++++++++++++++++++++++++
 Python/Bindings/NymphPybind.cc     |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 Python/Bindings/Data/DataPybind.hh

diff --git a/Python/Bindings/Data/DataPybind.hh b/Python/Bindings/Data/DataPybind.hh
new file mode 100644
index 0000000..f734184
--- /dev/null
+++ b/Python/Bindings/Data/DataPybind.hh
@@ -0,0 +1,38 @@
+/*
+ * DataPybind.hh
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: F. Thomas
+ */
+
+#ifndef PYTHON_BINDINGS_DATA_DATAPYBIND_HH_
+#define PYTHON_BINDINGS_DATA_DATAPYBIND_HH_
+
+#include <pybind11/pybind11.h>
+#include <memory>
+
+#include "Data.hh"
+
+namespace py = pybind11;
+
+namespace NymphPybind
+{
+    //trampoline class
+    class PyData : public Nymph::Data {
+        public:
+            /* Inherit the constructors */
+            using Nymph::Data::Data;
+
+    };
+
+    void ExportData( py::module_& nymphData)
+    {
+        py::class_< Nymph::Data, PyData, std::shared_ptr<Nymph::Data> >(nymphData, "_Data")
+                .def(py::init<const std::string& >())
+
+    }
+
+}
+
+#endif /* PYTHON_BINDINGS_DATA_DATAPYBIND_HH_ */
+
diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index ec3b953..637f499 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -8,6 +8,7 @@
 #include <pybind11/pybind11.h>
 
 #include "Processor/ProcessorPybind.hh"
+#include "Data/DataPybind.hh"
 
 namespace py = pybind11;
 
@@ -18,6 +19,7 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
 
     auto nymphControl = nymphPackage.def_submodule("control", "Control module");
     auto nymphData = nymphPackage.def_submodule("data", "Data module");
+    NymphPybind::ExportData(nymphData);
     auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);

From ef63a1612398196fb08d5fc537d0e2e136ec2920 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 13 Jun 2022 11:59:39 -0400
Subject: [PATCH 348/521] Small fix for data binding

---
 Python/Bindings/Data/DataPybind.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Python/Bindings/Data/DataPybind.hh b/Python/Bindings/Data/DataPybind.hh
index f734184..5d1b6f3 100644
--- a/Python/Bindings/Data/DataPybind.hh
+++ b/Python/Bindings/Data/DataPybind.hh
@@ -28,7 +28,7 @@ namespace NymphPybind
     void ExportData( py::module_& nymphData)
     {
         py::class_< Nymph::Data, PyData, std::shared_ptr<Nymph::Data> >(nymphData, "_Data")
-                .def(py::init<const std::string& >())
+                .def(py::init< >());
 
     }
 

From 3cd0ea32e549f66996a02340dfcc5b5296fbcd36 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 13 Jun 2022 13:24:58 -0400
Subject: [PATCH 349/521] Move RunQueue to SingleRunController

---
 Cpp/Library/Control/SingleRunController.cc | 127 ++++++++++++++++++++-
 Cpp/Library/Control/SingleRunController.hh |  75 +++++++++++-
 Cpp/Library/Implementation/RunNymph.cc     |   4 +-
 Cpp/Library/Processor/ProcessorToolbox.cc  | 117 -------------------
 Cpp/Library/Processor/ProcessorToolbox.hh  |  64 -----------
 Testing/Cpp/TestProcessorToolbox.cc        |  58 ----------
 Testing/Cpp/TestSingleRunController.cc     |  64 ++++++++++-
 7 files changed, 257 insertions(+), 252 deletions(-)

diff --git a/Cpp/Library/Control/SingleRunController.cc b/Cpp/Library/Control/SingleRunController.cc
index 662ab9a..acecd73 100644
--- a/Cpp/Library/Control/SingleRunController.cc
+++ b/Cpp/Library/Control/SingleRunController.cc
@@ -9,7 +9,6 @@
 
 #include "ControlAccess.hh"
 #include "PrimaryProcessor.hh"
-#include "ProcessorToolbox.hh"
 #include "QuitChain.hh"
 
 #include "logger.hh"
@@ -19,7 +18,10 @@ namespace Nymph
 {
     LOGGER( contlog, "SingleRunController");
 
-    SingleRunController::SingleRunController( const std::string& name ) :
+    SingleRunController::SingleRunController( const ProcessorToolbox& procTB, const std::string& name ) :
+            Controller(),
+            fProcTB( procTB ),
+            fRunQueue(),
             fNActiveThreads( 0 ),
             fDoRunThread(),
             fChainThreads()
@@ -36,12 +38,125 @@ namespace Nymph
 
         Controller::Configure( node );
 
+        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
+        // If names are grouped (in another array), those in that group will be run in parallel.
+        if( ! node.has("run-queue") )
+        {
+            LWARN( contlog, "Run queue was not specified" );
+        }
+        else
+        {
+            ConfigureRunQueue( node["run-queue"].as_array() );
+        }
+
+        return;
+    }
+
+    void SingleRunController::ConfigureRunQueue( const scarab::param_array& array )
+    {
+        for( auto rqIt = array.begin(); rqIt != array.end(); ++rqIt )
+        {
+            if( rqIt->is_value() )
+            {
+                if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
+                {
+                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to process run-queue entry: could not add processor to the queue" );
+                }
+            }
+            else if( rqIt->is_array() )
+            {
+                const scarab::param_array* rqNode = &( rqIt->as_array() );
+                std::vector< std::string > names;
+
+                for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
+                {
+                    if( ! rqArrayIt->is_value() )
+                    {
+                        THROW_EXCEPT_HERE( ConfigException(array) << "Invalid run-queue array entry: not a value" );
+                    }
+                    names.push_back( (*rqArrayIt)().as_string() );
+                }
+
+                if( ! PushBackToRunQueue(names) )
+                {
+                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to process run-queue entry: could not add list of processors to the queue" );
+                }
+            }
+            else
+            {
+                THROW_EXCEPT_HERE( ConfigException(array) << "Invalid run-queue entry: not a value or array" );
+            }
+        }
+
         return;
     }
 
-    void SingleRunController::Run( const ProcessorToolbox& procTB )
+    bool SingleRunController::PushBackToRunQueue( const std::string& name )
+    {
+        ThreadSourceGroupT threadGroup;
+
+        if( ! AddProcessorToThreadGroup( name, threadGroup ) )
+        {
+            LERROR( contlog, "Unable to add processor <" << name << "> to thread group" );
+            return false;
+        }
+
+        fRunQueue.push_back( threadGroup );
+
+        LINFO( contlog, "Added processor <" << name << "> to the run queue" );
+        return true;
+    }
+
+    bool SingleRunController::PushBackToRunQueue( std::initializer_list< std::string > names )
+    {
+        return PushBackToRunQueue( std::vector< std::string >(names) );
+    }
+
+    bool SingleRunController::PushBackToRunQueue( std::vector< std::string > names )
+    {
+        ThreadSourceGroupT threadGroup;
+
+        std::stringstream toPrint;
+        for( const std::string& name : names )
+        {
+            if(! AddProcessorToThreadGroup( name, threadGroup ) )
+            {
+                LERROR( contlog, "Unable to add processor <" << name << "> to thread group" );
+                return false;
+            }
+            toPrint << name << ", "; // the extra comma at the end is removed below
+        }
+
+        fRunQueue.push_back( threadGroup );
+        std::string toPrintString = toPrint.str();
+        toPrintString.resize( toPrintString.size() - 2 );
+        LINFO( contlog, "Added processors <" << toPrintString << "> to the run queue" );
+        return true;
+    }
+
+    bool SingleRunController::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
+    {
+        std::shared_ptr< Processor > procForRunQueue = fProcTB.GetProcessor( name );
+        LDEBUG( contlog, "Attempting to add processor <" << name << "> to the run queue" );
+        if( procForRunQueue == nullptr )
+        {
+            LERROR( contlog, "Unable to find processor <" << name << "> requested for the run queue" );
+            return false;
+        }
+
+        PrimaryProcessor* primaryProc = dynamic_cast< PrimaryProcessor* >( procForRunQueue.get() );
+        if( primaryProc == nullptr )
+        {
+            LERROR( contlog, "Processor <" << name << "> is not a primary processor." );
+            return false;
+        }
+        group.insert( ThreadSource(primaryProc, name) );
+        return true;
+    }
+    
+    void SingleRunController::Run()
     {
-        StartRun( procTB );
+        StartRun();
 
         if( fDoRunThread.joinable() ) 
         {
@@ -53,7 +168,7 @@ namespace Nymph
         return;
     }
 
-    void SingleRunController::StartRun( const ProcessorToolbox& procTB )
+    void SingleRunController::StartRun()
     {
         if( fDoRunThread.joinable() )
         {
@@ -73,7 +188,7 @@ namespace Nymph
             {
                 LPROG( contlog, "Starting multi-threaded processing" );
 
-                for (auto rqIter = procTB.RunQueue().begin(); rqIter != procTB.RunQueue().end(); ++rqIter)
+                for (auto rqIter = fRunQueue.begin(); rqIter != fRunQueue.end(); ++rqIter)
                 {
                     { // scope for mutex lock
                         std::unique_lock< std::mutex > lock( fMutex );
diff --git a/Cpp/Library/Control/SingleRunController.hh b/Cpp/Library/Control/SingleRunController.hh
index a6842c5..c913616 100644
--- a/Cpp/Library/Control/SingleRunController.hh
+++ b/Cpp/Library/Control/SingleRunController.hh
@@ -11,7 +11,12 @@
 
 #include "Controller.hh"
 
+#include "ProcessorToolbox.hh"
+
+#include <deque>
+#include <initializer_list>
 #include <map>
+#include <set>
 #include <thread>
 #include <tuple>
 
@@ -35,22 +40,69 @@ namespace Nymph
     class SingleRunController : public Controller
     {
         public:
-            SingleRunController( const std::string& name = "single-run-controller" );
+            SingleRunController( const ProcessorToolbox& procTB, const std::string& name = "single-run-controller" );
             virtual ~SingleRunController();
 
         public:
             /// Configure the controller
             void Configure( const scarab::param_node& node );
 
+        public:
+            struct ThreadSource
+            {
+                PrimaryProcessor* fProc;
+                std::string fName;
+                //ControlAccessPtr fControlAccess;
+                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
+                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
+                {}
+            };
+            struct CompareThreadSource
+            {
+                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
+                {
+                    return lhs.fProc < rhs.fProc;
+                }
+            };
+            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroupT;
+            typedef std::deque< ThreadSourceGroupT > RunQueueT;
+
+            /// Setup the run queue according to the `run-queue` configuration block
+            void ConfigureRunQueue( const scarab::param_array& node );
+
+            /// Push a single processor to the back of the run queue
+            bool PushBackToRunQueue( const std::string& name );
+
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue( std::initializer_list< std::string > names );
+            /// Push a set of processors to be run in parallel to the back of the run queue
+            bool PushBackToRunQueue( std::vector< std::string > names );
+
+            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
+            void PopBackOfRunQueue();
+
+            /// Clear the run queue
+            void ClearRunQueue();
+
+            /// Const access to the run queue
+            const RunQueueT& RunQueue() const;
+
+        protected:
+            const ProcessorToolbox& fProcTB;
+
+            RunQueueT fRunQueue;
+
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group );
+
         public:
             /// Process the run queue.
             /// This will call Run() on all of the primary processors in the queue.
             /// This is a blocking call that waits until the run is completed before returning.
-            void Run( const ProcessorToolbox& procTB );
+            void Run();
 
             /// Asynchronously start a run
             /// Starts run in a new thread and returns
-            void StartRun( const ProcessorToolbox& procTB );
+            void StartRun();
 
             /// Wait for the run to complete; 
             void JoinRunThread();
@@ -68,6 +120,23 @@ namespace Nymph
 
     };
 
+    inline void SingleRunController::PopBackOfRunQueue()
+    {
+        fRunQueue.pop_back();
+        return;
+    }
+
+    inline void SingleRunController::ClearRunQueue()
+    {
+        fRunQueue.clear();
+        return;
+    }
+
+    inline const SingleRunController::RunQueueT& SingleRunController::RunQueue() const
+    {
+        return fRunQueue;
+    }
+
    inline void SingleRunController::JoinRunThread()
     {
         fDoRunThread.join();
diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 904c59e..2e8393b 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -29,7 +29,7 @@ namespace Nymph
 
             // Create and configure the single-run controller.
             LPROG( nlog, "Configuring controller" );
-            SingleRunController controller;
+            SingleRunController controller( procTB );
             if( config.has("controller") )
             {
                 controller.Configure( config["controller"].as_node() );
@@ -38,7 +38,7 @@ namespace Nymph
             LPROG( nlog, "Executing run" );
 
             // Now execute the run
-            controller.Run( procTB );
+            controller.Run();
 
             LPROG( nlog, "That's all, folks!" );
 
diff --git a/Cpp/Library/Processor/ProcessorToolbox.cc b/Cpp/Library/Processor/ProcessorToolbox.cc
index 8bc037f..7589aed 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.cc
+++ b/Cpp/Library/Processor/ProcessorToolbox.cc
@@ -23,7 +23,6 @@ namespace Nymph
 
     ProcessorToolbox::ProcessorToolbox( const std::string& name ) :
             fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
-            fRunQueue(),
             fProcMap()
     {
     }
@@ -55,18 +54,6 @@ namespace Nymph
             ConfigureConnections( node["connections"].as_array() );
         }
 
-        // Finally, deal with processor-run specifications
-        // The run queue is an array of processor names, or groups of names, which will be run sequentially.
-        // If names are grouped (in another array), those in that group will be run in parallel.
-        if( ! node.has("run-queue") )
-        {
-            LWARN( proclog, "Run queue was not specified" );
-        }
-        else
-        {
-            ConfigureRunQueue( node["run-queue"].as_array() );
-        }
-
         return;
     }
 
@@ -186,45 +173,6 @@ namespace Nymph
         return;
     }
 
-    void ProcessorToolbox::ConfigureRunQueue( const scarab::param_array& array )
-    {
-        for( auto rqIt = array.begin(); rqIt != array.end(); ++rqIt )
-        {
-            if( rqIt->is_value() )
-            {
-                if( ! PushBackToRunQueue( (*rqIt)().as_string() ) )
-                {
-                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to process run-queue entry: could not add processor to the queue" );
-                }
-            }
-            else if( rqIt->is_array() )
-            {
-                const scarab::param_array* rqNode = &( rqIt->as_array() );
-                std::vector< std::string > names;
-
-                for( scarab::param_array::const_iterator rqArrayIt = rqNode->begin(); rqArrayIt != rqNode->end(); ++rqArrayIt )
-                {
-                    if( ! rqArrayIt->is_value() )
-                    {
-                        THROW_EXCEPT_HERE( ConfigException(array) << "Invalid run-queue array entry: not a value" );
-                    }
-                    names.push_back( (*rqArrayIt)().as_string() );
-                }
-
-                if( ! PushBackToRunQueue(names) )
-                {
-                    THROW_EXCEPT_HERE( ConfigException(array) << "Unable to process run-queue entry: could not add list of processors to the queue" );
-                }
-            }
-            else
-            {
-                THROW_EXCEPT_HERE( ConfigException(array) << "Invalid run-queue entry: not a value or array" );
-            }
-        }
-
-        return;
-    }
-
     std::shared_ptr< Processor > ProcessorToolbox::GetProcessor( const std::string& procName )
     {
         ProcMapIt it = fProcMap.find( procName );
@@ -311,7 +259,6 @@ namespace Nymph
     void ProcessorToolbox::ClearProcessors()
     {
         fProcMap.clear();
-        fRunQueue.clear();
         return;
     }
 
@@ -455,68 +402,4 @@ namespace Nymph
         return true;
     }
 
-
-    bool ProcessorToolbox::PushBackToRunQueue( const std::string& name )
-    {
-        ThreadSourceGroupT threadGroup;
-
-        if( ! AddProcessorToThreadGroup( name, threadGroup ) )
-        {
-            LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
-            return false;
-        }
-
-        fRunQueue.push_back( threadGroup );
-
-        LINFO( proclog, "Added processor <" << name << "> to the run queue" );
-        return true;
-    }
-
-    bool ProcessorToolbox::PushBackToRunQueue( std::initializer_list< std::string > names )
-    {
-        return PushBackToRunQueue( std::vector< std::string >(names) );
-    }
-
-    bool ProcessorToolbox::PushBackToRunQueue( std::vector< std::string > names )
-    {
-        ThreadSourceGroupT threadGroup;
-
-        std::stringstream toPrint;
-        for( const std::string& name : names )
-        {
-            if(! AddProcessorToThreadGroup( name, threadGroup ) )
-            {
-                LERROR( proclog, "Unable to add processor <" << name << "> to thread group" );
-                return false;
-            }
-            toPrint << name << ", "; // the extra comma at the end is removed below
-        }
-
-        fRunQueue.push_back( threadGroup );
-        std::string toPrintString = toPrint.str();
-        toPrintString.resize( toPrintString.size() - 2 );
-        LINFO( proclog, "Added processors <" << toPrintString << "> to the run queue" );
-        return true;
-    }
-
-    bool ProcessorToolbox::AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
-    {
-        std::shared_ptr< Processor > procForRunQueue = GetProcessor( name );
-        LDEBUG( proclog, "Attempting to add processor <" << name << "> to the run queue" );
-        if( procForRunQueue == nullptr )
-        {
-            LERROR( proclog, "Unable to find processor <" << name << "> requested for the run queue" );
-            return false;
-        }
-
-        PrimaryProcessor* primaryProc = dynamic_cast< PrimaryProcessor* >( procForRunQueue.get() );
-        if( primaryProc == nullptr )
-        {
-            LERROR( proclog, "Processor <" << name << "> is not a primary processor." );
-            return false;
-        }
-        group.insert( ThreadSource(primaryProc, name) );
-        return true;
-    }
-
 } /* namespace Nymph */
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
index 0d245f3..b9938f6 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.hh
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -15,8 +15,6 @@
 #include "factory.hh"
 #include "param.hh"
 
-#include <deque>
-#include <initializer_list>
 #include <limits>
 #include <set>
 #include <memory>
@@ -76,26 +74,6 @@ namespace Nymph
     */
     class ProcessorToolbox
     {
-        public:
-            struct ThreadSource
-            {
-                PrimaryProcessor* fProc;
-                std::string fName;
-                //ControlAccessPtr fControlAccess;
-                ThreadSource( PrimaryProcessor* proc, const std::string& name ) : 
-                        fProc(proc), fName(name)//, fControlAccess( new ControlAccess() )
-                {}
-            };
-            struct CompareThreadSource
-            {
-                bool operator()( const ThreadSource& lhs, const ThreadSource& rhs ) const
-                {
-                    return lhs.fProc < rhs.fProc;
-                }
-            };
-            typedef std::set< ThreadSource, CompareThreadSource > ThreadSourceGroupT;
-            typedef std::deque< ThreadSourceGroupT > RunQueueT;
-
         protected:
             typedef std::unique_lock< std::mutex > unique_lock;
 
@@ -183,31 +161,6 @@ namespace Nymph
             bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
             static const char fSigSlotNameSep = ':';
 
-        public:
-            /// Setup the run queue according to the `run-queue` configuration block
-            void ConfigureRunQueue( const scarab::param_array& node );
-
-            /// Push a single processor to the back of the run queue
-            bool PushBackToRunQueue( const std::string& name );
-
-            /// Push a set of processors to be run in parallel to the back of the run queue
-            bool PushBackToRunQueue( std::initializer_list< std::string > names );
-            /// Push a set of processors to be run in parallel to the back of the run queue
-            bool PushBackToRunQueue( std::vector< std::string > names );
-
-            /// Remove the last item in the run queue, whether it's a single processor or a group of processors
-            void PopBackOfRunQueue();
-
-            /// Clear the run queue
-            void ClearRunQueue();
-
-            /// Const access to the run queue
-            const RunQueueT& RunQueue() const;
-
-        protected:
-            RunQueueT fRunQueue;
-
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group );
     };
 
     inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
@@ -220,22 +173,5 @@ namespace Nymph
         return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min()); 
     }
 
-    inline void ProcessorToolbox::PopBackOfRunQueue()
-    {
-        fRunQueue.pop_back();
-        return;
-    }
-
-    inline void ProcessorToolbox::ClearRunQueue()
-    {
-        fRunQueue.clear();
-        return;
-    }
-
-    inline const ProcessorToolbox::RunQueueT& ProcessorToolbox::RunQueue() const
-    {
-        return fRunQueue;
-    }
-
 } /* namespace Nymph */
 #endif /* NYMPH_PROCESSORTOOLBOX_HH_ */
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
index 21b5b33..79e0b4f 100644
--- a/Testing/Cpp/TestProcessorToolbox.cc
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -28,13 +28,6 @@ namespace Nymph
             {
                 return ProcessorToolbox::ParseSignalSlotName( toParse, nameOfProc, nameOfSigSlot );
             }
-
-            using ProcessorToolbox::ThreadSource;
-            using ProcessorToolbox::ThreadSourceGroupT;
-            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
-            {
-                return ProcessorToolbox::AddProcessorToThreadGroup( name, group );
-            }
     };
 }
 
@@ -152,50 +145,6 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE( tp1->Slots().at("second-value")->Connections().size() == 1 );
     }
 
-    SECTION( "RunQueue" )
-    {
-        LINFO( "RunQueue Tests" );
-
-        std::string config_str(
-            "- type: test-primary\n"
-            "  name: testprimary-1\n"
-            "- type: test-primary\n"
-            "  name: testprimary-2\n"
-            "- type: test-proc\n"
-            "  name: testproc-1\n"
-        );
-
-        scarab::param_translator translator;
-        auto config = translator.read_string( config_str, "yaml" );
-
-        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
-
-        ProcTBRevealer::ThreadSourceGroupT group;
-        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "blah", group ) );
-        REQUIRE_FALSE( toolbox.AddProcessorToThreadGroup( "testproc-1", group ) );
-        REQUIRE( toolbox.AddProcessorToThreadGroup( "testprimary-1", group ) );
-        REQUIRE( group.size() == 1 );
-
-        REQUIRE_FALSE( toolbox.PushBackToRunQueue( "testproc-1" ) );
-        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-1" ) );
-        REQUIRE( toolbox.RunQueue().size() == 1 );
-        REQUIRE( toolbox.RunQueue().begin()[0].size() == 1 );
-        REQUIRE( toolbox.PushBackToRunQueue( "testprimary-2" ) );
-        REQUIRE( toolbox.RunQueue().size() == 2 );
-        REQUIRE( toolbox.RunQueue().begin()[0].size() == 1 );
-        
-        toolbox.PopBackOfRunQueue();
-        REQUIRE( toolbox.RunQueue().size() == 1 );
-
-        toolbox.ClearRunQueue();
-        REQUIRE( toolbox.RunQueue().empty() );
-        
-        REQUIRE( toolbox.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
-        REQUIRE( toolbox.RunQueue().size() == 1 );
-        REQUIRE( toolbox.RunQueue()[0].size() == 2 );
-
-    }
-
     SECTION( "FullConfig" )
     {
         std::string testprimaryName( "testprimary" );
@@ -210,8 +159,6 @@ TEST_CASE( "processor_toolbox" )
             "connections:\n"
             "- signal: \"testprimary:value\"\n"
             "  slot: \"testproc:value\"\n"
-            "run-queue:\n"
-            "- testprimary"
         );
 
         scarab::param_translator translator;
@@ -233,11 +180,6 @@ TEST_CASE( "processor_toolbox" )
         std::shared_ptr< Processor > testproc = toolbox.GetProcessor( testprocName );
         REQUIRE( testproc->Signals().at("value")->Connections().size() == 0 );
         REQUIRE( testproc->Slots().at("value")->Connections().size() == 1 );
-
-        // run queue
-        REQUIRE( toolbox.RunQueue().size() == 1 );
-        REQUIRE( toolbox.RunQueue().begin()[0].size() == 1 );
-
     }
 
 }
diff --git a/Testing/Cpp/TestSingleRunController.cc b/Testing/Cpp/TestSingleRunController.cc
index facfc21..71c1d4c 100644
--- a/Testing/Cpp/TestSingleRunController.cc
+++ b/Testing/Cpp/TestSingleRunController.cc
@@ -17,13 +17,28 @@
 
 LOGGER( testlog, "TestSingleRunController" );
 
+namespace Nymph
+{
+    class SRCRevealer : public SingleRunController
+    {
+        public:
+            using SingleRunController::SingleRunController;
+
+            using SingleRunController::ThreadSource;
+            using SingleRunController::ThreadSourceGroupT;
+            bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
+            {
+                return SingleRunController::AddProcessorToThreadGroup( name, group );
+            }
+    };
+}
 
 TEST_CASE( "single_run_controller" )
 {
     using namespace Nymph;
 
-    SingleRunController controller;
     ProcessorToolbox toolbox;
+    SRCRevealer controller( toolbox );
 
     SECTION( "DoRun" )
     {
@@ -48,11 +63,56 @@ TEST_CASE( "single_run_controller" )
         ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
 
         // do the run
-        REQUIRE_NOTHROW( controller.Run( toolbox ) );
+        REQUIRE_NOTHROW( controller.Run() );
 
         // check the results
         REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
 
     }
 
+    SECTION( "RunQueue" )
+    {
+        LINFO( "RunQueue Tests" );
+
+        std::string config_str(
+            "- type: test-primary\n"
+            "  name: testprimary-1\n"
+            "- type: test-primary\n"
+            "  name: testprimary-2\n"
+            "- type: test-proc\n"
+            "  name: testproc-1\n"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
+
+        SRCRevealer::ThreadSourceGroupT group;
+        REQUIRE_FALSE( controller.AddProcessorToThreadGroup( "blah", group ) );
+        REQUIRE_FALSE( controller.AddProcessorToThreadGroup( "testproc-1", group ) );
+        REQUIRE( controller.AddProcessorToThreadGroup( "testprimary-1", group ) );
+        REQUIRE( group.size() == 1 );
+
+        REQUIRE_FALSE( controller.PushBackToRunQueue( "testproc-1" ) );
+        REQUIRE( controller.PushBackToRunQueue( "testprimary-1" ) );
+        REQUIRE( controller.RunQueue().size() == 1 );
+        REQUIRE( controller.RunQueue().begin()[0].size() == 1 );
+        REQUIRE( controller.PushBackToRunQueue( "testprimary-2" ) );
+        REQUIRE( controller.RunQueue().size() == 2 );
+        REQUIRE( controller.RunQueue().begin()[0].size() == 1 );
+        
+        controller.PopBackOfRunQueue();
+        REQUIRE( controller.RunQueue().size() == 1 );
+
+        controller.ClearRunQueue();
+        REQUIRE( controller.RunQueue().empty() );
+        
+        REQUIRE( controller.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
+        REQUIRE( controller.RunQueue().size() == 1 );
+        REQUIRE( controller.RunQueue()[0].size() == 2 );
+
+    }
+
+
 }

From c96a529573e30116b5e2471f17c9c62e7f371825 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 13 Jun 2022 13:27:23 -0400
Subject: [PATCH 350/521] Add small demo for python binding of nymph Data

---
 Testing/Python/testdata.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Testing/Python/testdata.py

diff --git a/Testing/Python/testdata.py b/Testing/Python/testdata.py
new file mode 100644
index 0000000..3b37f78
--- /dev/null
+++ b/Testing/Python/testdata.py
@@ -0,0 +1,28 @@
+
+"""
+  testdata.py
+ 
+   Created on: Jun 13, 2022
+       Author: F. Thomas
+"""
+
+__all__ = []
+
+import _nymph
+
+class TestData(_nymph.data._Data):
+    
+    def __init__(self, test_var):
+        super().__init__()
+        self.test_var = test_var
+
+def main(args):
+    
+    test_data = TestData('foo')
+    
+    print(test_data.test_var)
+    return 0
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main(sys.argv))

From d35f9db67e7dfad2eb4f17b6fc0fd26e1126e6db Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 13 Jun 2022 13:32:02 -0400
Subject: [PATCH 351/521] Fixed test: configure controller first, then it works

---
 Testing/Cpp/TestSingleRunController.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Testing/Cpp/TestSingleRunController.cc b/Testing/Cpp/TestSingleRunController.cc
index 71c1d4c..0883191 100644
--- a/Testing/Cpp/TestSingleRunController.cc
+++ b/Testing/Cpp/TestSingleRunController.cc
@@ -57,6 +57,7 @@ TEST_CASE( "single_run_controller" )
         auto config = translator.read_string( config_str, "yaml" );
 
         REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( controller.Configure( config->as_node() ) );
 
         auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
         REQUIRE( ppProc );

From 49f2272764dd3d6a1913bd3dbd41bd4904948842 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 13 Jun 2022 13:56:06 -0400
Subject: [PATCH 352/521] Move ConfigException out of the Processor files, and
 give it its own test

---
 Cpp/Library/CMakeLists.txt             |  2 +
 Cpp/Library/Processor/Processor.cc     | 59 ----------------------
 Cpp/Library/Processor/Processor.hh     | 31 +-----------
 Cpp/Library/Utility/ConfigException.cc | 69 ++++++++++++++++++++++++++
 Cpp/Library/Utility/ConfigException.hh | 50 +++++++++++++++++++
 Testing/CMakeLists.txt                 |  1 +
 Testing/Cpp/TestConfigException.cc     | 39 +++++++++++++++
 7 files changed, 162 insertions(+), 89 deletions(-)
 create mode 100644 Cpp/Library/Utility/ConfigException.cc
 create mode 100644 Cpp/Library/Utility/ConfigException.hh
 create mode 100644 Testing/Cpp/TestConfigException.cc

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index c99c80c..d297fc9 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories( BEFORE
 )
 
 set( NYMPH_HEADERFILES
+    ${UTIL_DIR}/ConfigException.hh
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
 
@@ -44,6 +45,7 @@ set( NYMPH_HEADERFILES
 )
 
 set( NYMPH_SOURCEFILES
+    ${UTIL_DIR}/ConfigException.cc
     ${UTIL_DIR}/Exception.cc
 
     ${DATA_DIR}/Data.cc
diff --git a/Cpp/Library/Processor/Processor.cc b/Cpp/Library/Processor/Processor.cc
index 23841ce..9f30c19 100644
--- a/Cpp/Library/Processor/Processor.cc
+++ b/Cpp/Library/Processor/Processor.cc
@@ -7,71 +7,12 @@
 
 #include "Processor.hh"
 
-#include "Exception.hh"
-
 #include <utility>
 
 namespace Nymph
 {
     //KTLOGGER(proclog, "Processor");
 
-    ConfigException::ConfigException() noexcept :
-            scarab::typed_exception< ConfigException >(),
-            fConfig(),
-            fConfigStr()
-    {}
-
-    ConfigException::ConfigException( const std::string& a_filename, int a_line ) noexcept :
-            scarab::typed_exception< ConfigException >( a_filename, a_line ),
-            fConfig(),
-            fConfigStr()
-    {}
-
-    ConfigException::ConfigException( const scarab::param& config ) noexcept :
-            scarab::typed_exception< ConfigException >(),
-            fConfig(),
-            fConfigStr()
-    {
-        try
-        {
-            fConfig = config.clone();
-        }
-        catch( ... )
-        {}
-    }
-
-    ConfigException::ConfigException( const ConfigException& orig ) noexcept :
-            scarab::typed_exception< ConfigException >( orig ),
-            fConfig(),
-            fConfigStr()
-    {
-        try
-        {
-            if( orig.fConfig ) fConfig = orig.fConfig->clone();
-        }
-        catch( ... )
-        {}
-        
-    }
-
-    ConfigException::~ConfigException() noexcept
-    {}
-
-    const char* ConfigException::what() const noexcept
-    {
-        try
-        {
-            fConfigStr = f_what + '\n' + fConfig->to_string();
-            return fConfigStr.c_str();
-        }
-        catch( ... )
-        {
-            return f_what.c_str();
-        }
-    }
-
-
-
     Processor::Processor( const std::string& name ) :
             fName( name ),
             fSignals(),
diff --git a/Cpp/Library/Processor/Processor.hh b/Cpp/Library/Processor/Processor.hh
index 8ce5503..59e7733 100644
--- a/Cpp/Library/Processor/Processor.hh
+++ b/Cpp/Library/Processor/Processor.hh
@@ -8,6 +8,7 @@
 #ifndef NYMPH_PROCESSOR_HH_
 #define NYMPH_PROCESSOR_HH_
 
+#include "ConfigException.hh"
 #include "SignalSlotBase.hh"
 
 #include "factory.hh"
@@ -22,36 +23,6 @@ namespace Nymph
 
     struct ProcessorException : virtual public Exception {};
 
-    /*!
-     @class ConfigException
-     @author N. S. Oblath
-
-     @brief An exception class for use with errors that occur during configuration.
-
-     @details
-
-     The param_node of the configuration in question can be attached to the exception using the constructor 
-     or the function Config().  
-
-    */
-    class ConfigException : public scarab::typed_exception< ConfigException >
-    {
-        public:
-            ConfigException() noexcept;
-            ConfigException( const std::string& a_filename, int a_line ) noexcept;
-            ConfigException( const scarab::param& config ) noexcept;
-            ConfigException( const ConfigException& orig ) noexcept;
-            virtual ~ConfigException() noexcept;
-
-            virtual const char* what() const noexcept;
-
-            MEMVAR_REF( scarab::param_ptr_t, Config );
-
-        protected:
-            mutable std::string fConfigStr;
-    };
-
-
     class Processor
     {
         protected:
diff --git a/Cpp/Library/Utility/ConfigException.cc b/Cpp/Library/Utility/ConfigException.cc
new file mode 100644
index 0000000..ce760db
--- /dev/null
+++ b/Cpp/Library/Utility/ConfigException.cc
@@ -0,0 +1,69 @@
+/*
+ * ConfigException.cc
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "ConfigException.hh"
+
+namespace Nymph
+{
+    //KTLOGGER(proclog, "Processor");
+
+    ConfigException::ConfigException() noexcept :
+            scarab::typed_exception< ConfigException >(),
+            fConfig(),
+            fConfigStr()
+    {}
+
+    ConfigException::ConfigException( const std::string& a_filename, int a_line ) noexcept :
+            scarab::typed_exception< ConfigException >( a_filename, a_line ),
+            fConfig(),
+            fConfigStr()
+    {}
+
+    ConfigException::ConfigException( const scarab::param& config ) noexcept :
+            scarab::typed_exception< ConfigException >(),
+            fConfig(),
+            fConfigStr()
+    {
+        try
+        {
+            fConfig = config.clone();
+        }
+        catch( ... )
+        {}
+    }
+
+    ConfigException::ConfigException( const ConfigException& orig ) noexcept :
+            scarab::typed_exception< ConfigException >( orig ),
+            fConfig(),
+            fConfigStr()
+    {
+        try
+        {
+            if( orig.fConfig ) fConfig = orig.fConfig->clone();
+        }
+        catch( ... )
+        {}
+        
+    }
+
+    ConfigException::~ConfigException() noexcept
+    {}
+
+    const char* ConfigException::what() const noexcept
+    {
+        try
+        {
+            fConfigStr = f_what + '\n' + fConfig->to_string();
+            return fConfigStr.c_str();
+        }
+        catch( ... )
+        {
+            return f_what.c_str();
+        }
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Utility/ConfigException.hh b/Cpp/Library/Utility/ConfigException.hh
new file mode 100644
index 0000000..1cc7d66
--- /dev/null
+++ b/Cpp/Library/Utility/ConfigException.hh
@@ -0,0 +1,50 @@
+/**
+ @file Processor.hh
+ @brief Base class for processors
+ @author: N. S. Oblath
+ @date: Jan 5, 2012
+ */
+
+#ifndef NYMPH_CONFIG_EXCEPTION_HH_
+#define NYMPH_CONFIG_EXCEPTION_HH_
+
+#include "Exception.hh"
+
+#include "MemberVariable.hh"
+
+#include "param.hh"
+
+namespace Nymph
+{
+    /*!
+     @class ConfigException
+     @author N. S. Oblath
+
+     @brief An exception class for use with errors that occur during configuration.
+
+     @details
+
+     The param_node of the configuration in question can be attached to the exception using the constructor 
+     or the function Config().  
+
+    */
+    class ConfigException : public scarab::typed_exception< ConfigException >
+    {
+        public:
+            ConfigException() noexcept;
+            ConfigException( const std::string& a_filename, int a_line ) noexcept;
+            ConfigException( const scarab::param& config ) noexcept;
+            ConfigException( const ConfigException& orig ) noexcept;
+            virtual ~ConfigException() noexcept;
+
+            virtual const char* what() const noexcept;
+
+            MEMVAR_REF( scarab::param_ptr_t, Config );
+
+        protected:
+            mutable std::string fConfigStr;
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_CONFIG_EXCEPTION_HH_ */
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index e883ad9..7dbb159 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -28,6 +28,7 @@ set( testing_HEADERS
 #)
 
 set( testing_SOURCES
+    ${CPP_DIR}/TestConfigException.cc
     ${CPP_DIR}/TestControlAccess.cc
     ${CPP_DIR}/TestController.cc
     ${CPP_DIR}/TestData.cc
diff --git a/Testing/Cpp/TestConfigException.cc b/Testing/Cpp/TestConfigException.cc
new file mode 100644
index 0000000..30e4b69
--- /dev/null
+++ b/Testing/Cpp/TestConfigException.cc
@@ -0,0 +1,39 @@
+/*
+ * TestConfigException.cc
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "ConfigException.hh"
+
+#include "param_codec.hh"
+
+#include "catch.hpp"
+
+
+TEST_CASE( "config_exception", "[exception],[utility]" )
+{
+    using namespace Nymph;
+
+    std::string config_str(
+        "- type: test-primary\n"
+        "  name: testprimary-1\n"
+        "- type: test-primary\n"
+        "  name: testprimary-2\n"
+        "- type: test-proc\n"
+        "  name: testproc-1\n"
+    );
+
+    scarab::param_translator translator;
+    auto config = translator.read_string( config_str, "yaml" );
+
+    std::string config_as_string = config->to_string();
+
+    ConfigException exception = ConfigException( *config );
+    std::string ex_what( exception.what() );
+
+    using Catch::Matchers::EndsWith;
+
+    REQUIRE_THAT( ex_what, EndsWith(config_as_string) );
+}

From 4a5b7c52c6a62eaeba3a416c6c913a90b710d2a2 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 13:56:46 -0400
Subject: [PATCH 353/521] First implementation of unittest

---
 Testing/Python/TestControlAccess.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Testing/Python/TestControlAccess.py

diff --git a/Testing/Python/TestControlAccess.py b/Testing/Python/TestControlAccess.py
new file mode 100644
index 0000000..3a67283
--- /dev/null
+++ b/Testing/Python/TestControlAccess.py
@@ -0,0 +1,28 @@
+#
+#TestControllerAccess.py
+#
+#  Created on: Mar 13, 2022
+#  Author: P. T. Surukuchi
+#
+
+
+import unittest
+
+class TestControllerMethods(unittest.TestCase):
+
+    def test_upper(self):
+        self.assertEqual('foo'.upper(), 'FOO')
+
+    def test_isupper(self):
+        self.assertTrue('FOO'.isupper())
+        self.assertFalse('Foo'.isupper())
+
+    def test_split(self):
+        s = 'hello world'
+        self.assertEqual(s.split(), ['hello', 'world'])
+        # check that s.split fails when the separator is not a string
+        with self.assertRaises(TypeError):
+            s.split(2)
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file

From 453573f4dc27383fe48b2b0e93044e22fd089079 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 13 Jun 2022 14:55:11 -0400
Subject: [PATCH 354/521] Documentation of the run-queue config moved rom
 ProcessorToolbox to SingleRunController

---
 Cpp/Library/Control/SingleRunController.hh | 15 +++++++++
 Cpp/Library/Processor/ProcessorToolbox.hh  | 37 ++++++++--------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Cpp/Library/Control/SingleRunController.hh b/Cpp/Library/Control/SingleRunController.hh
index c913616..cec1552 100644
--- a/Cpp/Library/Control/SingleRunController.hh
+++ b/Cpp/Library/Control/SingleRunController.hh
@@ -36,6 +36,21 @@ namespace Nymph
 
      @brief Performs a single run as specified to the ProcessorToolbox
 
+     @details
+     The SingleRunController performs a run of Katydid as defined by the run queue.  
+     Processors are run in chains headed by a PrimaryProcessor.  
+     The way that PrimaryProcessors are run are specified by the run queue.  
+     PrimaryProcessors can be run serially, or in groups that run in parallel.
+
+     The run queue can be defined in the configuration as follows:
+     <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
+     The elements of this array specify processors that are run sequentially.
+     If an element is itself an array, those processors listed in the sub-array will be run in parallel.
+         <ul>
+             <li>processor name -- add a processor to the run queue, or </li>
+             <li>array of processor names -- add a group of processors to the run queue.</li>
+         </ul>
+     </li>
     */
     class SingleRunController : public Controller
     {
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
index b9938f6..e441f7e 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.hh
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -47,30 +47,19 @@ namespace Nymph
      </ol>
 
      Available (nested) configuration values:
-     <ul>
-         <li>run-single-threaded (bool) -- specify whether to run in single-threaded mode (will be ignored if the application has been compiled with the SINGLETHREADED flag set)
-         <li>processors (array of objects) -- create a processor; each object in the array should consist of:
-             <ul>
-                 <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
-                 <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
-             </ul>
-         </li>
-         <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
-             <ul>
-                 <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
-                 <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
-                 <li>group-order -- (optional) integer specifying the order in which slots should be called.
-             </ul>
-         </li>
-         <li>run-queue -- (array of strings and arrays of strings) define the queue of processors that will control the running of Nymph.
-         The elements of this array specify processors that are run sequentially.
-         If an element is itself an array, those processors listed in the sub-array will be run in parallel.
-             <ul>
-                 <li>processor name -- add a processor to the run queue, or </li>
-                 <li>array of processor names -- add a group of processors to the run queue.</li>
-             </ul>
-         </li>
-     </ul>
+     <li>processors (array of objects) -- create a processor; each object in the array should consist of:
+         <ul>
+              <li>type -- string specifying the processor type (matches the string given to the Registrar, which should be specified before the class implementation in each processor's .cc file).</li>
+             <li>name -- string giving the individual processor a name so that multiple processors of the same type can be created.</li>
+         </ul>
+     </li>
+     <li>connection (array of objects) -- connect a signal to a slot; each object should consist of:
+         <ul>
+             <li>signal -- <i>proc-name:signal-name</i>; name (i.e. the name given in the array of processors above) of the processor, and the signal that will be emitted.</li>
+             <li>slot -- <i>proc-name:slot-name</li>; name of the processor with the slot that will receive the signal.</li>
+             <li>group-order -- (optional) integer specifying the order in which slots should be called.
+         </ul>
+     </li>
     */
     class ProcessorToolbox
     {

From c7b057482cff8747738b1f34f447c4d83211b634 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 15:31:10 -0400
Subject: [PATCH 355/521] Changing test to data objects cos the examples are
 simpler

---
 Testing/Python/TestControlAccess.py | 28 -----------------
 Testing/Python/TestData.py          | 47 +++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 28 deletions(-)
 delete mode 100644 Testing/Python/TestControlAccess.py
 create mode 100644 Testing/Python/TestData.py

diff --git a/Testing/Python/TestControlAccess.py b/Testing/Python/TestControlAccess.py
deleted file mode 100644
index 3a67283..0000000
--- a/Testing/Python/TestControlAccess.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#TestControllerAccess.py
-#
-#  Created on: Mar 13, 2022
-#  Author: P. T. Surukuchi
-#
-
-
-import unittest
-
-class TestControllerMethods(unittest.TestCase):
-
-    def test_upper(self):
-        self.assertEqual('foo'.upper(), 'FOO')
-
-    def test_isupper(self):
-        self.assertTrue('FOO'.isupper())
-        self.assertFalse('Foo'.isupper())
-
-    def test_split(self):
-        s = 'hello world'
-        self.assertEqual(s.split(), ['hello', 'world'])
-        # check that s.split fails when the separator is not a string
-        with self.assertRaises(TypeError):
-            s.split(2)
-
-if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
diff --git a/Testing/Python/TestData.py b/Testing/Python/TestData.py
new file mode 100644
index 0000000..1175e73
--- /dev/null
+++ b/Testing/Python/TestData.py
@@ -0,0 +1,47 @@
+#
+#TestData.py
+#
+#  Created on: June 13, 2022
+#  Author: P. T. Surukuchi
+#
+
+import unittest
+
+import _nymph
+
+# class TestDataMethods(unittest.TestCase):
+
+#     def setUp(self):
+#         self.data = _nymph.data._Data()
+
+#     def __init__(self, test_var):
+#         super().__init__()
+
+#     def test_data1(self):
+#         self.assertEqual(fIValue1,5)
+
+#     def test_isupper(self):
+#         self.assertTrue('FOO'.isupper())
+#         self.assertFalse('Foo'.isupper())
+
+#     def test_split(self):
+#         s = 'hello world'
+#         self.assertEqual(s.split(), ['hello', 'world'])
+#         # check that s.split fails when the separator is not a string
+#         with self.assertRaises(TypeError):
+#             s.split(2)
+
+
+class TestData(_nymph.data._Data):
+    
+    def __init__(self, test_var=5):
+        super().__init__()
+        self.test_var = test_var
+
+class TestDataMethods(unittest.TestCase):
+    def TestDataVal(self):
+        test_data = TestData('foo')
+        self.assertEqual(test_data.GetIValue1(),5)
+
+if __name__ == '__main__':
+    unittest.main()

From a5c998f8cda5eca8b5a316463a2a3463b98a5169 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 15:57:12 -0400
Subject: [PATCH 356/521] Modified TestData.py file to not overwrite the
 existing testdata.py file

---
 Testing/Python/TestDataMethods.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 Testing/Python/TestDataMethods.py

diff --git a/Testing/Python/TestDataMethods.py b/Testing/Python/TestDataMethods.py
new file mode 100644
index 0000000..b549966
--- /dev/null
+++ b/Testing/Python/TestDataMethods.py
@@ -0,0 +1,24 @@
+
+"""
+  TestDataMethods.py
+ 
+   Created on: Jun 13, 2022
+       Author: P. T. Surukuchi
+"""
+import unittest
+
+import _nymph
+
+class TestData(_nymph.data._Data):
+    
+    def __init__(self, test_var=5):
+        super().__init__()
+        self.test_var = test_var
+
+class TestDataMethods(unittest.TestCase):
+    data=TestData()
+    def test_data_assignment(self):
+        self.assertEqual(self.data.test_var,5)
+
+if __name__ == '__main__':
+    unittest.main()

From 0dc3ce256460dbece2f41e4630c213924adbb4d8 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 16:26:43 -0400
Subject: [PATCH 357/521] Addition of floating point testing

---
 Testing/Python/TestData.py        | 47 -------------------------------
 Testing/Python/TestDataMethods.py | 33 +++++++++++++++++-----
 Testing/Python/testdata.py        | 28 ------------------
 3 files changed, 26 insertions(+), 82 deletions(-)
 delete mode 100644 Testing/Python/TestData.py
 delete mode 100644 Testing/Python/testdata.py

diff --git a/Testing/Python/TestData.py b/Testing/Python/TestData.py
deleted file mode 100644
index 1175e73..0000000
--- a/Testing/Python/TestData.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#TestData.py
-#
-#  Created on: June 13, 2022
-#  Author: P. T. Surukuchi
-#
-
-import unittest
-
-import _nymph
-
-# class TestDataMethods(unittest.TestCase):
-
-#     def setUp(self):
-#         self.data = _nymph.data._Data()
-
-#     def __init__(self, test_var):
-#         super().__init__()
-
-#     def test_data1(self):
-#         self.assertEqual(fIValue1,5)
-
-#     def test_isupper(self):
-#         self.assertTrue('FOO'.isupper())
-#         self.assertFalse('Foo'.isupper())
-
-#     def test_split(self):
-#         s = 'hello world'
-#         self.assertEqual(s.split(), ['hello', 'world'])
-#         # check that s.split fails when the separator is not a string
-#         with self.assertRaises(TypeError):
-#             s.split(2)
-
-
-class TestData(_nymph.data._Data):
-    
-    def __init__(self, test_var=5):
-        super().__init__()
-        self.test_var = test_var
-
-class TestDataMethods(unittest.TestCase):
-    def TestDataVal(self):
-        test_data = TestData('foo')
-        self.assertEqual(test_data.GetIValue1(),5)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Testing/Python/TestDataMethods.py b/Testing/Python/TestDataMethods.py
index b549966..9924b7a 100644
--- a/Testing/Python/TestDataMethods.py
+++ b/Testing/Python/TestDataMethods.py
@@ -9,16 +9,35 @@
 
 import _nymph
 
-class TestData(_nymph.data._Data):
+'''Data class with integer variables'''
+class TestData1(_nymph.data._Data):
     
-    def __init__(self, test_var=5):
+    def __init__(self, test_var1=0, test_var2=5):
         super().__init__()
-        self.test_var = test_var
+        self.test_var1 = test_var1
+        self.test_var2 = test_var2
 
-class TestDataMethods(unittest.TestCase):
-    data=TestData()
-    def test_data_assignment(self):
-        self.assertEqual(self.data.test_var,5)
+'''Data class with floating point variables'''
+class TestData2(_nymph.data._Data):
+    
+    def __init__(self, test_var1=0.0, test_var2=10.0):
+        super().__init__()
+        self.test_var1 = test_var1
+        self.test_var2 = test_var2
+
+# The way to access member variables need to be modified if getters/setters are used in the python version
+class TestDataMethod(unittest.TestCase):
+    '''Testing of integer type data'''
+    data1=TestData1()
+    def test_idata_assignment(self):
+        self.assertEqual(self.data1.test_var1,0)
+        self.assertEqual(self.data1.test_var2,5)
+    
+    '''Testing of floating point type data'''
+    data2=TestData2()
+    def test_fdata_assignment(self):
+        self.assertAlmostEqual(self.data2.test_var1,0.0)
+        self.assertAlmostEqual(self.data2.test_var2,10.0)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/Testing/Python/testdata.py b/Testing/Python/testdata.py
deleted file mode 100644
index 3b37f78..0000000
--- a/Testing/Python/testdata.py
+++ /dev/null
@@ -1,28 +0,0 @@
-
-"""
-  testdata.py
- 
-   Created on: Jun 13, 2022
-       Author: F. Thomas
-"""
-
-__all__ = []
-
-import _nymph
-
-class TestData(_nymph.data._Data):
-    
-    def __init__(self, test_var):
-        super().__init__()
-        self.test_var = test_var
-
-def main(args):
-    
-    test_data = TestData('foo')
-    
-    print(test_data.test_var)
-    return 0
-
-if __name__ == '__main__':
-    import sys
-    sys.exit(main(sys.argv))

From 0b5aaae4e4e44a8c72da0787b6dda901c139f2df Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 16:28:11 -0400
Subject: [PATCH 358/521] Added Testing/Python/testdata.py file which was
 previously removed by mistake

---
 Testing/Python/testdata.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 Testing/Python/testdata.py

diff --git a/Testing/Python/testdata.py b/Testing/Python/testdata.py
new file mode 100644
index 0000000..18c9189
--- /dev/null
+++ b/Testing/Python/testdata.py
@@ -0,0 +1,27 @@
+"""
+  testdata.py
+ 
+   Created on: Jun 13, 2022
+       Author: F. Thomas
+"""
+
+__all__ = []
+
+import _nymph
+
+class TestData(_nymph.data._Data):
+    
+    def __init__(self, test_var):
+        super().__init__()
+        self.test_var = test_var
+
+def main(args):
+    
+    test_data = TestData('foo')
+    
+    print(test_data.test_var)
+    return 0
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main(sys.argv))
\ No newline at end of file

From 871b0fc8e48719511d1ec95193436dd896c40756 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 16:42:20 -0400
Subject: [PATCH 359/521] Included github action for python testing. Also
 modified the file name to make it compatible with the automatic discovery of
 unittests

---
 .github/workflows/build.yaml                              | 8 ++++----
 .../Python/{TestDataMethods.py => test_data_methods.py}   | 0
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename Testing/Python/{TestDataMethods.py => test_data_methods.py} (100%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c4570e9..6c6f573 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -163,10 +163,10 @@ jobs:
         run: |
           python -m build
 
-      #- name: Run tests
-      #  run: |
-      #    cd build
-      #    Testing/RunTests
+      - name: Run tests
+       run: |
+         cd Testing/Python
+         python -m unittest discover -v
 
       #- name: Python Build
       #  run: |
diff --git a/Testing/Python/TestDataMethods.py b/Testing/Python/test_data_methods.py
similarity index 100%
rename from Testing/Python/TestDataMethods.py
rename to Testing/Python/test_data_methods.py

From b5579e1464def7bc0c7c99827ce912bcd3bf7e1f Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 16:47:47 -0400
Subject: [PATCH 360/521] add to readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 455147e..9e0e49e 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,12 @@ Installing
 ----------
 
 
+Testing
+-------
+
+Automatic unit testing functionality is avilable through the use of github actions, see .github/workflows. C++ version used [catch2](https://github.com/catchorg/Catch2) and python version used [unittest](https://docs.python.org/3/library/unittest.html). In the python version, the files starting with names `test_` are automatically `discovered`. 
+
+
 Instructions for Use
 --------------------
 

From 620339bb79012d2f359f6c0db9fa62e40f5cc302 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 16:51:58 -0400
Subject: [PATCH 361/521] Fix typo ?

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6c6f573..b7c024b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -56,7 +56,7 @@ jobs:
 
     steps:
 
-      - name: Checkout reposistory
+      - name: Checkout repository
         uses: actions/checkout@master
         with:
           submodules: recursive
@@ -117,7 +117,7 @@ jobs:
 
     steps:
 
-      - name: Checkout reposistory
+      - name: Checkout repository
         uses: actions/checkout@master
         with:
           submodules: recursive

From 10bff537dbf6bf74380857e2fe7e4d76d5fb48ae Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 16:55:07 -0400
Subject: [PATCH 362/521] Fix indentation

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b7c024b..cdac566 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -164,9 +164,9 @@ jobs:
           python -m build
 
       - name: Run tests
-       run: |
-         cd Testing/Python
-         python -m unittest discover -v
+        run: |
+          cd Testing/Python
+          python -m unittest discover -v
 
       #- name: Python Build
       #  run: |

From b80818c70cc959b399e5797f4792502ca64971ff Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 13 Jun 2022 17:02:33 -0400
Subject: [PATCH 363/521] Add binding code for Signal class

---
 Python/Bindings/NymphPybind.cc            |  4 ++
 Python/Bindings/Processor/SignalPybind.hh | 57 +++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 Python/Bindings/Processor/SignalPybind.hh

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 637f499..56e5710 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -8,8 +8,11 @@
 #include <pybind11/pybind11.h>
 
 #include "Processor/ProcessorPybind.hh"
+#include "Processor/SignalPybind.hh"
 #include "Data/DataPybind.hh"
 
+#include "DataFrame.hh"
+
 namespace py = pybind11;
 
 
@@ -23,5 +26,6 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
+    NymphPybind::ExportSignal<Nymph::DataHandle>(nymphProcessor, "Data");
     auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
new file mode 100644
index 0000000..b1a2f87
--- /dev/null
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -0,0 +1,57 @@
+/*
+ * SignalPybind.hh
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: F. Thomas
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_SIGNALPYBIND_HH_
+#define PYTHON_BINDINGS_PROCESSOR_SIGNALPYBIND_HH_
+
+#include <pybind11/pybind11.h>
+#include <memory>
+
+#include "Signal.hh"
+
+namespace py = pybind11;
+
+namespace NymphPybind
+{
+    //~ //trampoline class
+    //~ class PyProcessor : public Nymph::Processor {
+        //~ public:
+            //~ /* Inherit the constructors */
+            //~ using Nymph::Processor::Processor;
+
+            //~ /* Trampoline (need one for each virtual function) */
+            //~ void Configure( const scarab::param_node& node ) override {
+                //~ PYBIND11_OVERRIDE_PURE(
+                    //~ void, /* Return type */
+                    //~ Processor,      /* Parent class */
+                    //~ Configure,          /* Name of function in C++ (must match Python name) */
+                    //~ node/* Argument(s) */
+                //~ );
+            //~ }
+    //~ };
+
+    template< typename... XArgs >
+    void ExportSignal( py::module_& nymphProcessor, const std::string& typestr)
+    {
+        std::string pyClsName = std::string("_Signal") + typestr;
+        
+        py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
+                .def(py::init<const std::string& >())
+                .def("emit", &Nymph::Signal< XArgs... >::Emit)
+                .def("__call__", &Nymph::Signal< XArgs... >::operator());
+        
+    }
+
+}
+
+            //~ template< typename XOwner >
+            //~ Signal( const std::string& name, XOwner* owner );
+
+
+            //~ virtual void Connect( SlotBase* slot, int group = -1 );
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_SIGNALPYBIND_HH_ */

From e4d8b09592813ece684f8c2b961200f20ce786d6 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Mon, 13 Jun 2022 17:12:14 -0400
Subject: [PATCH 364/521] Add installation of python distributable package in
 github workflow

---
 .github/workflows/build.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cdac566..963cebd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -162,6 +162,10 @@ jobs:
       - name: Python Build
         run: |
           python -m build
+      
+      - name: Create a Python distributable package
+        run: |
+          pip install dist/nymph-2.0.0-cp39-cp39-*.whl
 
       - name: Run tests
         run: |

From 7f21c97a82b4a4826cd7190db04e74479f1753bc Mon Sep 17 00:00:00 2001
From: jkgaison65 <jkgaison65@gmail.com>
Date: Mon, 13 Jun 2022 17:48:54 -0400
Subject: [PATCH 365/521] Nymph.cc Compiles, need to implement commandline
 interface

---
 CMakeLists.txt                                |   4 +
 Cpp/Executables/Main/CMakeLists.txt           |  32 +++
 Cpp/Executables/Main/ConfigCheck.cc           |  30 +++
 Cpp/Executables/Main/Nymph_Exe.cc             | 113 ++++++++++
 Cpp/Executables/Main/TestControllerClasses.hh |  36 ++++
 Cpp/Executables/Main/TestProcessorClasses.hh  | 193 ++++++++++++++++++
 Cpp/Executables/Main/test.yaml                |   8 +
 7 files changed, 416 insertions(+)
 create mode 100644 Cpp/Executables/Main/CMakeLists.txt
 create mode 100644 Cpp/Executables/Main/ConfigCheck.cc
 create mode 100644 Cpp/Executables/Main/Nymph_Exe.cc
 create mode 100644 Cpp/Executables/Main/TestControllerClasses.hh
 create mode 100644 Cpp/Executables/Main/TestProcessorClasses.hh
 create mode 100644 Cpp/Executables/Main/test.yaml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a4cf5f..51399f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,6 +137,10 @@ add_subdirectory( Cpp/Library )
 #    add_subdirectory( Cpp/Executables_v1 )
 #endif (Nymph_ENABLE_EXECUTABLES )
 
+if (Nymph_ENABLE_EXECUTABLES)
+    add_subdirectory( Cpp/Executables/Main )
+    #add_subdirectory( Cpp/Executables/Validation )
+endif (Nymph_ENABLE_EXECUTABLES )
 
 #########
 # Tests #
diff --git a/Cpp/Executables/Main/CMakeLists.txt b/Cpp/Executables/Main/CMakeLists.txt
new file mode 100644
index 0000000..a9c1615
--- /dev/null
+++ b/Cpp/Executables/Main/CMakeLists.txt
@@ -0,0 +1,32 @@
+# CMakeLists for Nymph/Executables/Main
+# Author: N. Oblath
+
+if( NOT Nymph_AS_SUBMODULE )
+    set( Nymph_package_libs
+        Nymph
+    )
+endif()
+
+set( Nymph_SOURCES
+    ConfigCheck.cc
+)
+if( Nymph_BUILD_NYMPH_EXE )
+    set( Nymph_SOURCES
+        ${Nymph_SOURCES}
+        Nymph_Exe.cc
+    )
+endif( Nymph_BUILD_NYMPH_EXE )
+
+set( Nymph_PROGRAMS )
+pbuilder_executables( 
+    SOURCES ${Nymph_SOURCES}
+    TARGETS_VAR Nymph_PROGRAMS
+    PROJECT_LIBRARIES ${Nymph_package_libs}
+    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Executables
+    EXETARGETS ${Nymph_PROGRAMS}
+)
diff --git a/Cpp/Executables/Main/ConfigCheck.cc b/Cpp/Executables/Main/ConfigCheck.cc
new file mode 100644
index 0000000..8c8775e
--- /dev/null
+++ b/Cpp/Executables/Main/ConfigCheck.cc
@@ -0,0 +1,30 @@
+/*
+ * ConfigCheck.cc
+ *
+ *  Created on: Jan 4, 2013
+ *      Author: nsoblath
+ *
+ */
+
+//#include "KTApplication.hh"
+//#include "KTLogger.hh"
+
+//using namespace Nymph;
+
+//KTLOGGER(cclog, "ConfigCheck");
+
+int main(int argc, char** argv)
+{
+/*
+    try
+    {
+        KTApplication app(argc, argv);
+    }
+    catch( std::exception& e )
+    {
+        KTERROR( cclog, "Something went wrong while processing the command line:\n" << e.what() );
+        return -1;
+    }
+*/
+    return 0;
+}
diff --git a/Cpp/Executables/Main/Nymph_Exe.cc b/Cpp/Executables/Main/Nymph_Exe.cc
new file mode 100644
index 0000000..4f7e76a
--- /dev/null
+++ b/Cpp/Executables/Main/Nymph_Exe.cc
@@ -0,0 +1,113 @@
+/*
+ * Nymph.cc
+ *
+ *  Created on: Sep 28, 2012
+ *      Author: nsoblath
+ *
+ *  This program will run any processor-based code in packages built with Nymph.
+ *  All of the action is setup with a config file.
+ *  See KTProcessorToolbox for details on the configuration option.
+ */
+
+#include "logger.hh"
+#include "param.hh"
+#include "RunNymph.hh"
+
+#include "TestControllerClasses.hh"
+#include "TestProcessorClasses.hh"
+//#include "param_codec.hh"
+#include "signal_handler.hh"
+#include "application.hh"
+
+LOGGER( nymphlog, "Nymph" );
+
+int main( int argc, char** argv )
+{
+
+    REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
+
+    LPROG( nymphlog, "Welcome to Nymph!" );
+    LDEBUG( nymphlog,
+            "\n" <<
+            "                                           Z                                 \n" <<
+            "                                            =M                               \n" <<
+            "                                             M                               \n" <<
+            "                                             M                               \n" <<
+            "                                            =M                               \n" <<
+            "                                            N                                \n" <<
+            "                                            M             NINMMMMMZ...M      \n" <<
+            "                                            M            $$                  \n" <<
+            "                        M:                  N.           IM                  \n" <<
+            "                          ZD.                 M?          M                  \n" <<
+            "                             $                M ?M       MM           .$     \n" <<
+            "                               DM               M  O      8       .+MZ       \n" <<
+            "                                 ~M                M~ 8  M~  MM:~M           \n" <<
+            "                                   O:MMIZ+,?DNMD$.... M,MM MZ ? D$=  .8MOM+  \n" <<
+            "                                      ,= MN ZZ D:  M:MM~MM==     MMZM        \n" <<
+            "                                           ...MM MMM8,M+ I:ND $MMM           \n" <<
+            "                                         MMMMO   ~M, ,MM7MOD$                \n" <<
+            "                                    MMMMMM ~~8M? ,O~= MDNM M ,               \n" <<
+            "                                MMMM:M   Z8 MMM :MNM = ..,  MZ               \n" <<
+            "                            MNMMNM MM IM NM,M    N M   MM    +M         .NM M\n" <<
+            "                        ~MMD8 :  D  MM=MM,     O MO    8=    + $     .IM     \n" <<
+            "               ONMMMMMM..?  8 :MMMMM          = M      N      M    :M        \n" <<
+            "   ..+M8=...:=MMMMMMMMMN OMM:M,             M  ~       7       MMM8          \n" <<
+            "ZM8         ~M+:MZMMM~ M                    OM         M                     \n" <<
+            "      .:M..$D..$D ? M,                    MM           MN                    \n" <<
+            "   $M7      M   M+                       M              NMMMM:..             \n" <<
+            "         M..M                          :N                       7M           \n" <<
+            "      MM,                             M                           D          \n" <<
+            "                                     M                                       \n" <<
+            "                                   M=                                        \n" <<
+            "                                   M                                         \n" <<
+            "                                  =                                          \n" <<
+            "                                  M                                          \n");
+
+    try
+    {
+        /*std::string config_str(
+            "processors:\n"
+            "- type: test-primary\n"
+            "  name: pp\n"
+            "connections:\n"
+            "- signal: \"pp:value\"\n"
+            "  slot: \"pp:value\"\n"
+            "run-queue:\n"
+            "- pp\n"
+        );*/
+
+    // Start handling signals
+//    scarab::signal_handler t_sig_hand;
+
+    // Create the application
+//    scarab::main_app the_main;
+
+    // Default configuration
+//    the_main.default_config() =
+
+    // Package version
+//    the_main.set_version( version_store::get_instance()->versions().at("project8/nymph") );
+
+    int the_return = -1;
+//    auto t_callback = [&](){
+        
+//    }
+
+//    the_main.callback( t_callback );
+
+    // Parse CL options and run the application
+//    CLI11_PARSE( the_main, argc, argv );
+
+    
+
+        scarab::param_node config = scarab::param_node();
+//        return Nymph::RunNymph(  config_test->as_node() );
+        return Nymph::RunNymph(  config );
+    }
+    catch( std::exception& e )
+    {
+        LERROR( nymphlog, "Exception caught:\n" << e.what() );
+        return -1;
+    }
+
+}
diff --git a/Cpp/Executables/Main/TestControllerClasses.hh b/Cpp/Executables/Main/TestControllerClasses.hh
new file mode 100644
index 0000000..4c410e7
--- /dev/null
+++ b/Cpp/Executables/Main/TestControllerClasses.hh
@@ -0,0 +1,36 @@
+/*
+ * TestControllerClasses.hh
+ *
+ *  Created on: Jan 24, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_TESTING_TESTCONTROLLERCLASSES
+#define NYMPH_TESTING_TESTCONTROLLERCLASSES
+
+#include "Controller.hh"
+
+namespace Nymph
+{
+
+    class CIQThrowController : public Controller
+    {
+
+        public:
+            using Controller::Controller;
+            virtual ~CIQThrowController() {}
+
+            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() )
+            {
+                if( ePtr )
+                {
+                    std::rethrow_exception( ePtr );
+                }
+                return;
+            }
+
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_TESTING_TESTCONTROLLERCLASSES */
diff --git a/Cpp/Executables/Main/TestProcessorClasses.hh b/Cpp/Executables/Main/TestProcessorClasses.hh
new file mode 100644
index 0000000..aaeb6ed
--- /dev/null
+++ b/Cpp/Executables/Main/TestProcessorClasses.hh
@@ -0,0 +1,193 @@
+/*
+ * TestProcessorClasses.hh
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "PrimaryProcessor.hh"
+#include "Processor.hh"
+#include "QuitChain.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+#include "logger.hh"
+
+#include <chrono>
+#include <thread>
+
+LOGGER( testprocclasses_h_log, "TestProcessorClasses" );
+
+namespace Nymph
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestProc : public Processor
+    {
+        public:
+            TestProc( const std::string& name = "test" ) :
+                    Processor( name ),
+                    fValue( 0 ),
+                    fSecondValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestProc::SetValue ),
+                    fSecondValueSig( "second-value", this ),
+                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction ),
+                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
+            {}
+
+            virtual ~TestProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                fValue = node.get_value( "value", fValue );
+
+                // we'll test configuration error throwing by having a string with restricted values
+                if( node.has("string") )
+                {
+                    if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
+                    else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
+                    else THROW_EXCEPT_HERE( ConfigException( node ) << "Invalid choice for \"string\"" );
+                }
+
+                return;
+            }
+
+            MEMVAR( int, Value );
+            MEMVAR( int, SecondValue );
+            MEMVAR_REF( std::string, StringValue );
+
+            void SecondValueSlotFunction( int newValue )
+            {
+                fSecondValueSig( newValue );
+            }
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+            MEMVAR_REF( Signal< int >, SecondValueSig );
+            MEMVAR_REF( Slot< int >, SecondValueSlot );
+            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
+
+    };
+
+    // external slot function owner
+    struct TestSlotOwner
+    {
+        int fValue = 0;
+        void TestSlotFunc( int input )
+        {
+            fValue = input;
+            return;
+        }
+    };
+
+
+    class TestPPException : public scarab::typed_exception< TestPPException >
+    {
+        public:
+            using scarab::typed_exception< TestPPException >::typed_exception;
+            ~TestPPException() = default;
+    };
+
+
+    // concrete primary processor class that we can test
+    // implements Configure(), Run(), and has its own signal and slot
+    class TestPrimaryProc : public PrimaryProcessor
+    {
+        public:
+            enum class TestType
+            {
+                SignalNewValue,
+                WaitTwoSec,
+                ThrowExcept,
+                QuitChain
+            };
+
+            TestPrimaryProc( const std::string& name = "test" ) :
+                    PrimaryProcessor( name ),
+                    fTestSelection( TestType::ThrowExcept ),
+                    fNewValue( 10 ),
+                    fValue( 0 ),
+                    fValueSig( "value", this ),
+                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
+            {}
+
+            virtual ~TestPrimaryProc()
+            {}
+
+            void Configure( const scarab::param_node& node )
+            {
+                if( node.has("test") )
+                {
+                    std::string testSelectionStr( node["test"]().as_string() );
+                    if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
+                    else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
+                    else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
+                    else
+                    {
+                        LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
+                        THROW_EXCEPT_HERE( ConfigException() << "Invalid test selection: " << testSelectionStr );
+                    }
+                }
+                return;
+            }
+
+            void Run()
+            {
+                switch( fTestSelection )
+                {
+                    case TestType::SignalNewValue:
+                        TestSignalNewValue();
+                        return;
+                    case TestType::WaitTwoSec:
+                        TestWaitTwoSec();
+                        return;
+                    case TestType::ThrowExcept:
+                        TestThrowExcept();
+                        return;
+                    case TestType::QuitChain:
+                        TestQuitChain();
+                        return;
+                    default:
+                        LERROR( testprocclasses_h_log, "Invalid test choice" );
+                        THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
+                }
+                return;
+            }
+
+            void TestSignalNewValue()
+            {
+                fValueSig( fNewValue );
+                return;
+            }
+
+            void TestWaitTwoSec()
+            {
+                std::this_thread::sleep_for(std::chrono::seconds(2));
+                return;
+            }
+
+            void TestThrowExcept()
+            {
+                THROW_EXCEPT_HERE( TestPPException() << "PrimaryProcessor test function: throw Exception" );
+                return;
+            }
+
+            void TestQuitChain()
+            {
+                QUIT_CHAIN;
+            }
+
+            MEMVAR( TestType, TestSelection );
+
+            MEMVAR( int, NewValue );
+            MEMVAR( int, Value );
+
+            MEMVAR_REF( Signal< int >, ValueSig );
+            MEMVAR_REF( Slot< int >, ValueSlot );
+
+    };
+
+}
diff --git a/Cpp/Executables/Main/test.yaml b/Cpp/Executables/Main/test.yaml
new file mode 100644
index 0000000..d744786
--- /dev/null
+++ b/Cpp/Executables/Main/test.yaml
@@ -0,0 +1,8 @@
+processors:
+- type: test-primary
+  name: pp
+connections:
+- signal: "pp:value"
+  slot: "pp:value"
+run-queue:
+- pp

From 66e15d920a3f60a2f35dc0fa4a6f713f7379614a Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Mon, 13 Jun 2022 18:00:35 -0400
Subject: [PATCH 366/521] Add overloaded constructor for Signal's python
 binding

---
 Python/Bindings/Processor/SignalPybind.hh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index b1a2f87..6f2ab0b 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -12,6 +12,7 @@
 #include <memory>
 
 #include "Signal.hh"
+#include "Processor.hh"
 
 namespace py = pybind11;
 
@@ -41,6 +42,7 @@ namespace NymphPybind
         
         py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
                 .def(py::init<const std::string& >())
+                .def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("emit", &Nymph::Signal< XArgs... >::Emit)
                 .def("__call__", &Nymph::Signal< XArgs... >::operator());
         

From 34885c8d8ca23db70be965f634abdaa088e1e9ac Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Mon, 13 Jun 2022 23:19:26 -0400
Subject: [PATCH 367/521] Scarab update

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index a20a6db..d002e96 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit a20a6dbe4cdd1ef489515a21f7987cc6867a753c
+Subproject commit d002e965007524ae8738f29e3a03b127f3aee915

From 9289b76361358b6b919fff25a36af99cf09d6936 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 00:20:51 -0400
Subject: [PATCH 368/521] Update Scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index d002e96..5d96cee 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit d002e965007524ae8738f29e3a03b127f3aee915
+Subproject commit 5d96cee5d9ec94a711ae2465336d3fdd92af8c5b

From 58cf087ff0f7ff9ca2d1349378765518411ebf8d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 00:28:25 -0400
Subject: [PATCH 369/521] Remove the use of test classes from the pybind build

---
 Python/Bindings/Processor/ProcessorPybind.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 1e25bb3..b637d99 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -12,7 +12,7 @@
 #include <memory>
 
 #include "Processor.hh"
-#include "TestProcessorClasses.hh"
+//#include "TestProcessorClasses.hh"
 #include "factory.hh"
 
 namespace py = pybind11;
@@ -61,7 +61,7 @@ namespace NymphPybind
         //unfortunately this has to go into library code
         //for some reason the factory in the wrapped get_processor function above 
         //cannot find the test-proc when it is registered after the library was compiled
-        REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
+        //REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
     }
 
 }

From fc435679319dad549146fb34df9b665d320e384d Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 00:37:36 -0400
Subject: [PATCH 370/521] Include Python binding headers in the bindings build

---
 Python/Bindings/CMakeLists.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index ec07d16..750528c 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -7,13 +7,15 @@ message( "Building Python bindings")
 set( TEST_DIR Testing/Cpp )
 
 include_directories( BEFORE 
-    ${CMAKE_SOURCE_DIR}/${TEST_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/Data
+    ${CMAKE_CURRENT_SOURCE_DIR}/Processor
 )
 
 # Python binding headers
-#set( PYBINDING_HEADERFILES
-    #nymph_pybind_template.hh
-#)
+set( PYBINDING_HEADERFILES
+    Data/DataPybind.hh
+    Processor/ProcessorPybind.hh
+)
 
 # Python bindings
 set( PYBINDING_SOURCEFILES
@@ -24,7 +26,7 @@ set( PROJECT_LIBRARIES Nymph )
 
 pbuilder_add_pybind11_module( _nymph ${PROJECT_LIBRARIES} )
 
-#pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
+pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 
 if( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
     message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )

From 056329b38d6dbce935dcc1a9a223217e0c1b4d30 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 00:38:15 -0400
Subject: [PATCH 371/521] Build the testing executable using pbuilder

---
 Testing/CMakeLists.txt | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 7dbb159..e4d9306 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -16,9 +16,14 @@ include_directories( BEFORE
 #pbuilder_install_config (${pytesting_CONFIGFILES})
 
 set( testing_HEADERS
-    ${CPP_DIR}/TestProc.hh
+    ${CPP_DIR}/TestControllerClasses.hh
+    ${CPP_DIR}/TestDataClasses.hh
+    ${CPP_DIR}/TestDataProcessorClasses.hh
+    ${CPP_DIR}/TestProcessorClasses.hh
 )
 
+pbuilder_install_headers( ${testing_HEADERS} )
+
 #set (pytesting_HEADERS
 #  
 #)
@@ -45,19 +50,27 @@ set( testing_SOURCES
     ${CPP_DIR}/UseCatch.cc
 )
 
-set( lib_dependencies 
+set( testing_LIB_DEPENDENCIES 
     Nymph
-    Catch
 )
 
 # Interface library was recommended for Catch:
 # https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
-
 add_library( Catch INTERFACE )
 target_include_directories( Catch INTERFACE ${Scarab_LOCATION}/testing/catch )
 
-add_executable( RunTests ${testing_SOURCES} )
-target_link_libraries( RunTests ${lib_dependencies} )
+pbuilder_executable(
+    EXECUTABLE RunTests
+    SOURCES ${testing_SOURCES}
+    PROJECT_LIBRARIES ${testing_LIB_DEPENDENCIES}
+)
+target_link_libraries( RunTests PUBLIC Catch )
+set( programs "RunTests" )
+
+pbuilder_component_install_and_export(
+    COMPONENT Executables
+    EXETARGETS ${programs}
+)
 
 # So far it seems sufficient to use Catch2's ability to run tests, and not CTest.
 # Here are two ways it could potentially be integrated with CTest, if we change our minds.

From ad1b3ab7d5854adf5f0c98e23ba2f89fdfa41b7f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 01:52:34 -0400
Subject: [PATCH 372/521] Added ProcessorRegistrar and PyProcCreator

---
 Python/Bindings/NymphPybind.cc                |  4 +
 .../Bindings/Processor/ProcessorRegistrar.hh  | 77 +++++++++++++++++++
 .../Bindings/Processor/PyProcCreatorPybind.hh | 27 +++++++
 3 files changed, 108 insertions(+)
 create mode 100644 Python/Bindings/Processor/ProcessorRegistrar.hh
 create mode 100644 Python/Bindings/Processor/PyProcCreatorPybind.hh

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 637f499..777c2cf 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -8,6 +8,7 @@
 #include <pybind11/pybind11.h>
 
 #include "Processor/ProcessorPybind.hh"
+#include "Processor/PyProcCreatorPybind.hh"
 #include "Data/DataPybind.hh"
 
 namespace py = pybind11;
@@ -21,7 +22,10 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     auto nymphData = nymphPackage.def_submodule("data", "Data module");
     NymphPybind::ExportData(nymphData);
     auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
+
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
+    NymphPybind::ExportPyProcCreator(nymphProcessor);
+    
     auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/ProcessorRegistrar.hh b/Python/Bindings/Processor/ProcessorRegistrar.hh
new file mode 100644
index 0000000..440d110
--- /dev/null
+++ b/Python/Bindings/Processor/ProcessorRegistrar.hh
@@ -0,0 +1,77 @@
+/*
+ * ProcessorRegistrar.hh
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_PROCESSORPYREGISTRAR_HH_
+#define PYTHON_BINDINGS_PROCESSOR_PROCESSORPYREGISTRAR_HH_
+
+#include "Processor.hh"
+
+#include "logger.hh"
+
+#include <pybind11/eval.h>
+
+LOGGER( prlog_h, "ProcessorRegistrar.hh" );
+
+namespace Nymph
+{
+    class PyProcCreator : public Processor
+    {
+        public:
+            PyProcCreator( const std::string& name = "test" ) :
+                    Processor( name )
+            {}
+
+            virtual ~PyProcCreator()
+            {}
+
+            Processor* CreatePythonProcessor( const std::string& moduleName, const std::string& typeName )
+            {
+                /*
+                py::object scope = py::module_::import("__main__").attr("__dict__");
+                std::string execStr = std::string("module = __import__(") + moduleName + ")\n";
+                execStr += "class_ = getattr(module, " + typeName + ")";
+                py::exec( execStr.c_str() );
+                Processor* proc = py::eval("instance = class_()", scope).cast<Processor*>();
+                */
+                py::object scope = py::module_::import( fModuleName ).attr( "__dict__" );
+                Processor* proc = py::eval( fTypeName + "(" + fName + ")", scope ).cast<Processor*>();
+                LWARN( prlog_h, "Processor is at: " << proc );
+                return proc;
+            }
+
+    };
+
+    class PyProcRegistrar : public scarab::registrar< Processor, PyProcCreator, const std::string& >
+    {
+        public:
+            PyProcRegistrar( const std::string& moduleName, const std::string& typeName, const std::string& name ) :
+                    scarab::registrar< Processor, PyProcCreator, const std::string& >( name ),
+                    fTypeName( typeName ),
+                    fModuleName( moduleName )
+            {}
+            virtual ~PyProcRegistrar() {}
+
+            Processor* create( const std::string& name ) const
+            {
+                PyProcCreator ppc( name );
+                return ppc.CreatePythonProcessor( fModuleName, fTypeName );
+            }
+
+        protected:
+            std::string fTypeName;
+            std::string fModuleName;
+    }
+
+    PyProcRegistrar* RegisterPyProcessor( const std::string& moduleName, const std::string& typeName, const std::string& name )
+    {
+        return new PyProcRegistrar( typeName, name );
+    }
+
+}
+
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_PROCESSORPYREGISTRAR_HH_ */
diff --git a/Python/Bindings/Processor/PyProcCreatorPybind.hh b/Python/Bindings/Processor/PyProcCreatorPybind.hh
new file mode 100644
index 0000000..33f0cc4
--- /dev/null
+++ b/Python/Bindings/Processor/PyProcCreatorPybind.hh
@@ -0,0 +1,27 @@
+/*
+ * PyProcCreatorPybind.hh
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
+#define PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
+
+#include <pybind11/pybind11.h>
+
+namespace py = pybind11;
+
+namespace NymphPybind
+{
+    void ExportPyProcCreator( py::module_& nymphProcessor)
+    {
+        py::class_< PyProcCreator >(nymphProcessor, "_PyProcCreator")
+                .def(py::init<const std::string& >())
+                .def("create_python_processor", &PyProcCreator::CreatePythonProcessor);
+        
+        nymphProcessor.def("register_py_processor", &RegisterPyProcessor);
+    }
+}
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_ */

From abc5f8249bf75117ad7c960bc5dd7558e439d523 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 09:47:46 -0400
Subject: [PATCH 373/521] Add missing function in signal binding

---
 Python/Bindings/Processor/SignalPybind.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index 6f2ab0b..f38bb46 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -44,7 +44,8 @@ namespace NymphPybind
                 .def(py::init<const std::string& >())
                 .def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("emit", &Nymph::Signal< XArgs... >::Emit)
-                .def("__call__", &Nymph::Signal< XArgs... >::operator());
+                .def("__call__", &Nymph::Signal< XArgs... >::operator())
+                .def("Connect", &Nymph::Signal< XArgs...>::Connect);
         
     }
 

From 778a78ac52b6c91c8b3d291d2cbeb4e1bd2693c1 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 10:49:27 -0400
Subject: [PATCH 374/521] Add memvars to Signal binding

---
 Python/Bindings/Processor/SignalPybind.hh | 30 ++++++-----------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index f38bb46..222e40b 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -11,6 +11,7 @@
 #include <pybind11/pybind11.h>
 #include <memory>
 
+#include "SignalSlotBase.hh"
 #include "Signal.hh"
 #include "Processor.hh"
 
@@ -18,22 +19,6 @@ namespace py = pybind11;
 
 namespace NymphPybind
 {
-    //~ //trampoline class
-    //~ class PyProcessor : public Nymph::Processor {
-        //~ public:
-            //~ /* Inherit the constructors */
-            //~ using Nymph::Processor::Processor;
-
-            //~ /* Trampoline (need one for each virtual function) */
-            //~ void Configure( const scarab::param_node& node ) override {
-                //~ PYBIND11_OVERRIDE_PURE(
-                    //~ void, /* Return type */
-                    //~ Processor,      /* Parent class */
-                    //~ Configure,          /* Name of function in C++ (must match Python name) */
-                    //~ node/* Argument(s) */
-                //~ );
-            //~ }
-    //~ };
 
     template< typename... XArgs >
     void ExportSignal( py::module_& nymphProcessor, const std::string& typestr)
@@ -45,16 +30,17 @@ namespace NymphPybind
                 .def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("emit", &Nymph::Signal< XArgs... >::Emit)
                 .def("__call__", &Nymph::Signal< XArgs... >::operator())
-                .def("Connect", &Nymph::Signal< XArgs...>::Connect);
+                .def("connect", &Nymph::Signal< XArgs...>::Connect)
+                .def("disconnect", &Nymph::SignalBase::Disconnect)
+                .def("disconnect_all", &Nymph::SignalBase::DisconnectAll)
+                .def("add_connection", &Nymph::SignalBase::AddConnection)
+                .def_property("do_breakpoint", &Nymph::SignalBase::GetDoBreakpoint, &Nymph::SignalBase::SetDoBreakpoint)
+                .def_readwrite("name", &Nymph::SignalBase::fName)
+                .def_readonly("connections", &Nymph::SignalBase::fConnections);
         
     }
 
 }
 
-            //~ template< typename XOwner >
-            //~ Signal( const std::string& name, XOwner* owner );
-
-
-            //~ virtual void Connect( SlotBase* slot, int group = -1 );
 
 #endif /* PYTHON_BINDINGS_PROCESSOR_SIGNALPYBIND_HH_ */

From f0f44a014c241c08ae3a8d5948f51a4ebe9eb194 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Tue, 14 Jun 2022 11:19:46 -0400
Subject: [PATCH 375/521] Used pip install . instead of python build

---
 .github/workflows/build.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 963cebd..5fd0a71 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -159,13 +159,10 @@ jobs:
       #    cd build
       #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
 
-      - name: Python Build
+      - name: Python install 
         run: |
-          python -m build
-      
-      - name: Create a Python distributable package
-        run: |
-          pip install dist/nymph-2.0.0-cp39-cp39-*.whl
+          pip install .
+          
 
       - name: Run tests
         run: |

From 062165a0e02209311795bea7113e4de93d40d4ff Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Tue, 14 Jun 2022 11:31:34 -0400
Subject: [PATCH 376/521] Minor cleanup

---
 .github/workflows/build.yaml        | 24 ++----------------------
 README.md                           |  2 +-
 Testing/Python/test_data_methods.py |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5fd0a71..488049a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -138,7 +138,6 @@ jobs:
 
           python -m pip install build
 
-
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
         run: |
@@ -152,31 +151,12 @@ jobs:
           
           python -m pip install build
           
-
-      #- name: Configure CMake
-      #  run: |
-      #    mkdir -p build
-      #    cd build
-      #    cmake -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
-
-      - name: Python install 
+      - name: Install nymph
         run: |
           pip install .
           
-
-      - name: Run tests
+      - name: Run Tests
         run: |
           cd Testing/Python
           python -m unittest discover -v
 
-      #- name: Python Build
-      #  run: |
-      #    python -m pip install build --user
-      #    python -m build
-
-
-# For debugging
-#      - name: Setup tmate session
-#        if: ${{ ! success() }}
-#        uses: mxschmitt/action-tmate@v3
-
diff --git a/README.md b/README.md
index 9e0e49e..43ccbae 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Installing
 Testing
 -------
 
-Automatic unit testing functionality is avilable through the use of github actions, see .github/workflows. C++ version used [catch2](https://github.com/catchorg/Catch2) and python version used [unittest](https://docs.python.org/3/library/unittest.html). In the python version, the files starting with names `test_` are automatically `discovered`. 
+Automatic unit testing functionality is available through the use of github actions. See .github/workflows. C++ version uses [catch2](https://github.com/catchorg/Catch2) and python version uses [unittest](https://docs.python.org/3/library/unittest.html). In the python version, the files starting with names `test` are automatically `discovered`. 
 
 
 Instructions for Use
diff --git a/Testing/Python/test_data_methods.py b/Testing/Python/test_data_methods.py
index 9924b7a..48e4abc 100644
--- a/Testing/Python/test_data_methods.py
+++ b/Testing/Python/test_data_methods.py
@@ -1,6 +1,6 @@
 
 """
-  TestDataMethods.py
+  test_data_methods.py
  
    Created on: Jun 13, 2022
        Author: P. T. Surukuchi

From 7e2e6b557e0fed7a214661aa76a441935a0a62ff Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Tue, 14 Jun 2022 11:56:24 -0400
Subject: [PATCH 377/521] Added a couple more test

---
 Testing/Python/test_data_methods.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Testing/Python/test_data_methods.py b/Testing/Python/test_data_methods.py
index 48e4abc..9251d59 100644
--- a/Testing/Python/test_data_methods.py
+++ b/Testing/Python/test_data_methods.py
@@ -39,5 +39,11 @@ def test_fdata_assignment(self):
         self.assertAlmostEqual(self.data2.test_var1,0.0)
         self.assertAlmostEqual(self.data2.test_var2,10.0)
 
+        #Change value and test
+        self.data2.test_var2=20.0
+        self.assertAlmostEqual(self.data2.test_var2,20.0)
+        #Test for failure
+        self.assertAlmostEqual(self.data2.test_var2,30.0)
+
 if __name__ == '__main__':
     unittest.main()

From 970224ff93e9f3669367f3000bc3b3a42ded3e22 Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Tue, 14 Jun 2022 11:58:03 -0400
Subject: [PATCH 378/521] Replace testdata

---
 Testing/Python/test_data_methods.py | 49 -----------------------------
 Testing/Python/testdata.py          | 46 ++++++++++++++++++++-------
 2 files changed, 34 insertions(+), 61 deletions(-)
 delete mode 100644 Testing/Python/test_data_methods.py

diff --git a/Testing/Python/test_data_methods.py b/Testing/Python/test_data_methods.py
deleted file mode 100644
index 9251d59..0000000
--- a/Testing/Python/test_data_methods.py
+++ /dev/null
@@ -1,49 +0,0 @@
-
-"""
-  test_data_methods.py
- 
-   Created on: Jun 13, 2022
-       Author: P. T. Surukuchi
-"""
-import unittest
-
-import _nymph
-
-'''Data class with integer variables'''
-class TestData1(_nymph.data._Data):
-    
-    def __init__(self, test_var1=0, test_var2=5):
-        super().__init__()
-        self.test_var1 = test_var1
-        self.test_var2 = test_var2
-
-'''Data class with floating point variables'''
-class TestData2(_nymph.data._Data):
-    
-    def __init__(self, test_var1=0.0, test_var2=10.0):
-        super().__init__()
-        self.test_var1 = test_var1
-        self.test_var2 = test_var2
-
-# The way to access member variables need to be modified if getters/setters are used in the python version
-class TestDataMethod(unittest.TestCase):
-    '''Testing of integer type data'''
-    data1=TestData1()
-    def test_idata_assignment(self):
-        self.assertEqual(self.data1.test_var1,0)
-        self.assertEqual(self.data1.test_var2,5)
-    
-    '''Testing of floating point type data'''
-    data2=TestData2()
-    def test_fdata_assignment(self):
-        self.assertAlmostEqual(self.data2.test_var1,0.0)
-        self.assertAlmostEqual(self.data2.test_var2,10.0)
-
-        #Change value and test
-        self.data2.test_var2=20.0
-        self.assertAlmostEqual(self.data2.test_var2,20.0)
-        #Test for failure
-        self.assertAlmostEqual(self.data2.test_var2,30.0)
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Testing/Python/testdata.py b/Testing/Python/testdata.py
index 18c9189..b3ae4db 100644
--- a/Testing/Python/testdata.py
+++ b/Testing/Python/testdata.py
@@ -1,27 +1,49 @@
+
 """
   testdata.py
  
    Created on: Jun 13, 2022
-       Author: F. Thomas
+       Author: P. T. Surukuchi
 """
-
-__all__ = []
+import unittest
 
 import _nymph
 
-class TestData(_nymph.data._Data):
+'''Data class with integer variables'''
+class TestData1(_nymph.data._Data):
     
-    def __init__(self, test_var):
+    def __init__(self, test_var1=0, test_var2=5):
         super().__init__()
-        self.test_var = test_var
+        self.test_var1 = test_var1
+        self.test_var2 = test_var2
 
-def main(args):
+'''Data class with floating point variables'''
+class TestData2(_nymph.data._Data):
     
-    test_data = TestData('foo')
+    def __init__(self, test_var1=0.0, test_var2=10.0):
+        super().__init__()
+        self.test_var1 = test_var1
+        self.test_var2 = test_var2
+
+# The way to access member variables need to be modified if getters/setters are used in the python version
+class TestDataMethods(unittest.TestCase):
+    '''Testing of integer type data'''
+    data1=TestData1()
+    def test_idata_assignment(self):
+        self.assertEqual(self.data1.test_var1,0)
+        self.assertEqual(self.data1.test_var2,5)
     
-    print(test_data.test_var)
-    return 0
+    '''Testing of floating point type data'''
+    data2=TestData2()
+    def test_fdata_assignment(self):
+        self.assertAlmostEqual(self.data2.test_var1,0.0)
+        self.assertAlmostEqual(self.data2.test_var2,10.0)
+
+        #Change value and test
+        self.data2.test_var2=20.0
+        self.assertAlmostEqual(self.data2.test_var2,20.0)
+        #Test for failure
+        self.assertAlmostEqual(self.data2.test_var2,30.0)
 
 if __name__ == '__main__':
-    import sys
-    sys.exit(main(sys.argv))
\ No newline at end of file
+    unittest.main()

From 4a75c936697b58b3cc614b8e13ff8cca34b2a24c Mon Sep 17 00:00:00 2001
From: Pranava Teja Surukuchi <pranavateja.surukuchi@yale.edu>
Date: Tue, 14 Jun 2022 12:05:49 -0400
Subject: [PATCH 379/521] Removed test failure case

---
 Testing/Python/testdata.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Testing/Python/testdata.py b/Testing/Python/testdata.py
index b3ae4db..51d75c3 100644
--- a/Testing/Python/testdata.py
+++ b/Testing/Python/testdata.py
@@ -42,8 +42,6 @@ def test_fdata_assignment(self):
         #Change value and test
         self.data2.test_var2=20.0
         self.assertAlmostEqual(self.data2.test_var2,20.0)
-        #Test for failure
-        self.assertAlmostEqual(self.data2.test_var2,30.0)
 
 if __name__ == '__main__':
     unittest.main()

From 8644d6e7f1ae48a73846b0069ee2eee3b21c2a69 Mon Sep 17 00:00:00 2001
From: jkgaison65 <jkgaison65@gmail.com>
Date: Tue, 14 Jun 2022 12:12:21 -0400
Subject: [PATCH 380/521] reading config file from CL, initially working

---
 Cpp/Executables/Main/Nymph_Exe.cc | 60 +++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/Cpp/Executables/Main/Nymph_Exe.cc b/Cpp/Executables/Main/Nymph_Exe.cc
index 4f7e76a..631b95b 100644
--- a/Cpp/Executables/Main/Nymph_Exe.cc
+++ b/Cpp/Executables/Main/Nymph_Exe.cc
@@ -15,7 +15,7 @@
 
 #include "TestControllerClasses.hh"
 #include "TestProcessorClasses.hh"
-//#include "param_codec.hh"
+#include "param_codec.hh"
 #include "signal_handler.hh"
 #include "application.hh"
 
@@ -24,6 +24,7 @@ LOGGER( nymphlog, "Nymph" );
 int main( int argc, char** argv )
 {
 
+    // Create the application
     REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
 
     LPROG( nymphlog, "Welcome to Nymph!" );
@@ -65,7 +66,9 @@ int main( int argc, char** argv )
 
     try
     {
-        /*std::string config_str(
+//-----------------Hard Coded Config Test-----------------
+/*
+        std::string config_str(
             "processors:\n"
             "- type: test-primary\n"
             "  name: pp\n"
@@ -74,35 +77,54 @@ int main( int argc, char** argv )
             "  slot: \"pp:value\"\n"
             "run-queue:\n"
             "- pp\n"
-        );*/
+        );
+	scarab::param_translator translator;
+	auto config_test = translator.read_string( config_str, "yaml" );
+
+        return Nymph::RunNymph( config_test->as_node() );
+*/
+//----------------CLI Config Test-------------------
 
     // Start handling signals
-//    scarab::signal_handler t_sig_hand;
+    scarab::signal_handler t_sig_hand;
 
     // Create the application
-//    scarab::main_app the_main;
+    scarab::main_app the_main;
+    the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
 
     // Default configuration
 //    the_main.default_config() =
 
-    // Package version
-//    the_main.set_version( version_store::get_instance()->versions().at("project8/nymph") );
-
     int the_return = -1;
-//    auto t_callback = [&](){
-        
-//    }
-
-//    the_main.callback( t_callback );
-
+/*
+    auto t_callback = [&](){
+//	the_return = dl_client_error().rc_value() / 100;
+
+	auto the_monitor = std::make_shared< monitor >( the_main.primary_config() );
+
+        // run each phase of the operation, while checking for errors
+        if ( ! the_monitor->start() || 
+             ! the_monitor->listen() ||
+             ! the_monitor->stop() )
+        {
+            scarab::signal_handler::cancel_all( RETURN_ERROR );
+        }
+
+        // brief pause to ensure that the cancellation goes through
+        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
+      
+        the_return = scarab::signal_handler::get_exited() ? 
+                scarab::signal_handler::get_return_code() : dl_success().rc_value() / 100;  
+    };
+
+    the_main.callback( t_callback );
+*/
     // Parse CL options and run the application
-//    CLI11_PARSE( the_main, argc, argv );
+    CLI11_PARSE( the_main, argc, argv );
 
-    
 
-        scarab::param_node config = scarab::param_node();
-//        return Nymph::RunNymph(  config_test->as_node() );
-        return Nymph::RunNymph(  config );
+        return Nymph::RunNymph(  the_main.primary_config() );
+//---------------------End Tests-------------------------------------
     }
     catch( std::exception& e )
     {

From ae21d1c387102b184662374b0ec071152a03a4b5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 14:51:08 -0400
Subject: [PATCH 381/521] Update scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 5d96cee..bae4070 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 5d96cee5d9ec94a711ae2465336d3fdd92af8c5b
+Subproject commit bae4070c44120829109c8ad3c46776ccc8bc766d

From 1a71d5ebd27fff004a03a3675c33f9e1fafc20be Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 14:51:56 -0400
Subject: [PATCH 382/521] Setup to register and create processors from Python
 (creating processors only semi-works)

---
 Python/Bindings/CMakeLists.txt                |  2 +
 Python/Bindings/Processor/ProcessorPybind.hh  |  8 ---
 .../Bindings/Processor/ProcessorRegistrar.hh  | 62 +++++++++++--------
 .../Bindings/Processor/PyProcCreatorPybind.hh | 14 +++--
 4 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 750528c..dbc85b1 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -15,6 +15,8 @@ include_directories( BEFORE
 set( PYBINDING_HEADERFILES
     Data/DataPybind.hh
     Processor/ProcessorPybind.hh
+    Processor/ProcessorRegistrar.hh
+    Processor/PyProcCreatorPybind.hh
 )
 
 # Python bindings
diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index b637d99..b98d4a8 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -36,12 +36,6 @@ namespace NymphPybind
             }
     };
     
-    std::shared_ptr< Nymph::Processor > get_processor(const std::string& type, const std::string& name)
-    {
-        scarab::factory< Nymph::Processor, const std::string& >* factory = scarab::factory< Nymph::Processor, const std::string& >::get_instance();
-        return std::shared_ptr< Nymph::Processor >(factory->create(type, name));
-    }
-
     void ExportProcessor( py::module_& nymphProcessor)
     {
         py::class_< Nymph::Processor, PyProcessor, std::shared_ptr<Nymph::Processor> >(nymphProcessor, "_Processor")
@@ -56,8 +50,6 @@ namespace NymphPybind
                 .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
                 //.def_property_readonly("name", &Nymph::Processor::Name);
         
-        nymphProcessor.def("get_processor", &get_processor);
-        
         //unfortunately this has to go into library code
         //for some reason the factory in the wrapped get_processor function above 
         //cannot find the test-proc when it is registered after the library was compiled
diff --git a/Python/Bindings/Processor/ProcessorRegistrar.hh b/Python/Bindings/Processor/ProcessorRegistrar.hh
index 440d110..3aef564 100644
--- a/Python/Bindings/Processor/ProcessorRegistrar.hh
+++ b/Python/Bindings/Processor/ProcessorRegistrar.hh
@@ -10,10 +10,14 @@
 
 #include "Processor.hh"
 
+#include "Exception.hh"
+
 #include "logger.hh"
 
 #include <pybind11/eval.h>
 
+#include <memory>
+
 LOGGER( prlog_h, "ProcessorRegistrar.hh" );
 
 namespace Nymph
@@ -28,47 +32,55 @@ namespace Nymph
             virtual ~PyProcCreator()
             {}
 
-            Processor* CreatePythonProcessor( const std::string& moduleName, const std::string& typeName )
-            {
-                /*
-                py::object scope = py::module_::import("__main__").attr("__dict__");
-                std::string execStr = std::string("module = __import__(") + moduleName + ")\n";
-                execStr += "class_ = getattr(module, " + typeName + ")";
-                py::exec( execStr.c_str() );
-                Processor* proc = py::eval("instance = class_()", scope).cast<Processor*>();
-                */
-                py::object scope = py::module_::import( fModuleName ).attr( "__dict__" );
-                Processor* proc = py::eval( fTypeName + "(" + fName + ")", scope ).cast<Processor*>();
-                LWARN( prlog_h, "Processor is at: " << proc );
-                return proc;
-            }
+            void Configure( const scarab::param_node& )
+            {}
 
     };
 
     class PyProcRegistrar : public scarab::registrar< Processor, PyProcCreator, const std::string& >
     {
         public:
-            PyProcRegistrar( const std::string& moduleName, const std::string& typeName, const std::string& name ) :
-                    scarab::registrar< Processor, PyProcCreator, const std::string& >( name ),
-                    fTypeName( typeName ),
-                    fModuleName( moduleName )
+            PyProcRegistrar( const std::string& module, const std::string& type, const std::string& typeName ) :
+                    scarab::registrar< Processor, PyProcCreator, const std::string& >( typeName ),
+                    fType( type ),
+                    fModule( module )
             {}
             virtual ~PyProcRegistrar() {}
 
-            Processor* create( const std::string& name ) const
+            std::shared_ptr<Nymph::Processor> CreatePyProc( const std::string& name ) const
             {
-                PyProcCreator ppc( name );
-                return ppc.CreatePythonProcessor( fModuleName, fTypeName );
+                std::string useModule( fModule );
+                if( useModule.empty() ) useModule = "__main__";
+                py::object scope = py::module_::import( useModule.c_str() ).attr( "__dict__" );
+                std::shared_ptr<Nymph::Processor> proc = py::eval( fType + "(\'" + name + "\')", scope ).cast< std::shared_ptr<Nymph::Processor> >();
+                LWARN( prlog_h, "Processor is at: " << proc.get() );
+                return proc;
+
             }
 
         protected:
-            std::string fTypeName;
-            std::string fModuleName;
+            std::string fType;
+            std::string fModule;
+    };
+
+    std::unique_ptr<PyProcRegistrar> RegisterPyProcessor( const std::string& module, const std::string& type, const std::string& typeName )
+    {
+        return std::unique_ptr<PyProcRegistrar>( new PyProcRegistrar( module, type, typeName ) );
     }
 
-    PyProcRegistrar* RegisterPyProcessor( const std::string& moduleName, const std::string& typeName, const std::string& name )
+    std::shared_ptr< Nymph::Processor > CreatePyProcessor( const std::string& typeName, const std::string& name )
     {
-        return new PyProcRegistrar( typeName, name );
+        scarab::factory< Nymph::Processor, const std::string& >* factory = scarab::factory< Nymph::Processor, const std::string& >::get_instance();
+        if( ! factory->has_class( typeName ) )
+        {
+            THROW_EXCEPT_HERE( Nymph::Exception() << "Did not find processor with type <" << typeName << ">" );
+        }
+        const PyProcRegistrar* ppReg = dynamic_cast< const PyProcRegistrar* >( factory->get_registrar( typeName ) );
+        if( ! ppReg )
+        {
+            THROW_EXCEPT_HERE( Nymph::Exception() << "Registrar did not cast correctly for <" << typeName << ">" );
+        }
+        return ppReg->CreatePyProc( name );
     }
 
 }
diff --git a/Python/Bindings/Processor/PyProcCreatorPybind.hh b/Python/Bindings/Processor/PyProcCreatorPybind.hh
index 33f0cc4..f477ef8 100644
--- a/Python/Bindings/Processor/PyProcCreatorPybind.hh
+++ b/Python/Bindings/Processor/PyProcCreatorPybind.hh
@@ -8,19 +8,23 @@
 #ifndef PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
 #define PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
 
+#include "ProcessorRegistrar.hh"
+
 #include <pybind11/pybind11.h>
 
 namespace py = pybind11;
 
 namespace NymphPybind
 {
-    void ExportPyProcCreator( py::module_& nymphProcessor)
+    void ExportPyProcCreator( py::module_& nymphProcessor )
     {
-        py::class_< PyProcCreator >(nymphProcessor, "_PyProcCreator")
-                .def(py::init<const std::string& >())
-                .def("create_python_processor", &PyProcCreator::CreatePythonProcessor);
         
-        nymphProcessor.def("register_py_processor", &RegisterPyProcessor);
+        py::class_< Nymph::PyProcRegistrar >(nymphProcessor, "_PyProcRegistrar")
+                .def(py::init< const std::string&, const std::string&, const std::string& >())
+                .def("create_python_processor", &Nymph::PyProcRegistrar::CreatePyProc);
+        
+        nymphProcessor.def("register_py_processor", &Nymph::RegisterPyProcessor);
+        nymphProcessor.def("create_processor", &Nymph::CreatePyProcessor);
     }
 }
 

From 460299bf21bebe71e020f0a615994c1e15734d75 Mon Sep 17 00:00:00 2001
From: jkgaison65 <jkgaison65@gmail.com>
Date: Tue, 14 Jun 2022 15:01:47 -0400
Subject: [PATCH 383/521] implemented return values for thrown exceptions

---
 Cpp/Executables/Main/Nymph_Exe.cc | 75 +++++++------------------------
 1 file changed, 17 insertions(+), 58 deletions(-)

diff --git a/Cpp/Executables/Main/Nymph_Exe.cc b/Cpp/Executables/Main/Nymph_Exe.cc
index 631b95b..3c5a5b4 100644
--- a/Cpp/Executables/Main/Nymph_Exe.cc
+++ b/Cpp/Executables/Main/Nymph_Exe.cc
@@ -3,18 +3,18 @@
  *
  *  Created on: Sep 28, 2012
  *      Author: nsoblath
+ *  Updated on: Jun 14, 2021
+ *      Author: jkgaison
  *
  *  This program will run any processor-based code in packages built with Nymph.
  *  All of the action is setup with a config file.
- *  See KTProcessorToolbox for details on the configuration option.
+ *  See scarab::application for details on the configuration option.
  */
 
 #include "logger.hh"
 #include "param.hh"
 #include "RunNymph.hh"
 
-#include "TestControllerClasses.hh"
-#include "TestProcessorClasses.hh"
 #include "param_codec.hh"
 #include "signal_handler.hh"
 #include "application.hh"
@@ -24,8 +24,6 @@ LOGGER( nymphlog, "Nymph" );
 int main( int argc, char** argv )
 {
 
-    // Create the application
-    REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
 
     LPROG( nymphlog, "Welcome to Nymph!" );
     LDEBUG( nymphlog,
@@ -66,65 +64,26 @@ int main( int argc, char** argv )
 
     try
     {
-//-----------------Hard Coded Config Test-----------------
-/*
-        std::string config_str(
-            "processors:\n"
-            "- type: test-primary\n"
-            "  name: pp\n"
-            "connections:\n"
-            "- signal: \"pp:value\"\n"
-            "  slot: \"pp:value\"\n"
-            "run-queue:\n"
-            "- pp\n"
-        );
-	scarab::param_translator translator;
-	auto config_test = translator.read_string( config_str, "yaml" );
-
-        return Nymph::RunNymph( config_test->as_node() );
-*/
-//----------------CLI Config Test-------------------
-
-    // Start handling signals
-    scarab::signal_handler t_sig_hand;
-
-    // Create the application
-    scarab::main_app the_main;
-    the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
-
-    // Default configuration
-//    the_main.default_config() =
-
-    int the_return = -1;
-/*
-    auto t_callback = [&](){
-//	the_return = dl_client_error().rc_value() / 100;
 
-	auto the_monitor = std::make_shared< monitor >( the_main.primary_config() );
+        // Start handling signals
+        scarab::signal_handler t_sig_hand;
 
-        // run each phase of the operation, while checking for errors
-        if ( ! the_monitor->start() || 
-             ! the_monitor->listen() ||
-             ! the_monitor->stop() )
-        {
-            scarab::signal_handler::cancel_all( RETURN_ERROR );
-        }
+        // Create the application
+        scarab::main_app the_main;
+        the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
 
-        // brief pause to ensure that the cancellation goes through
-        std::this_thread::sleep_for( std::chrono::milliseconds(100) );
-      
-        the_return = scarab::signal_handler::get_exited() ? 
-                scarab::signal_handler::get_return_code() : dl_success().rc_value() / 100;  
-    };
+        //Runs RunNymph() and sets  the_return based on its return value
+        int the_return = -1;
+        auto t_callback = [&](){
+            the_return = Nymph::RunNymph(  the_main.primary_config() );
+        };
 
-    the_main.callback( t_callback );
-*/
-    // Parse CL options and run the application
-    CLI11_PARSE( the_main, argc, argv );
+        the_main.callback( t_callback );
 
+        // Parse CL options and run the application
+        CLI11_PARSE( the_main, argc, argv );
 
-        return Nymph::RunNymph(  the_main.primary_config() );
-//---------------------End Tests-------------------------------------
+	return the_return;
     }
     catch( std::exception& e )
     {

From 00364c64345f925dc724f8c2128408e37c204294 Mon Sep 17 00:00:00 2001
From: jkgaison65 <jkgaison65@gmail.com>
Date: Tue, 14 Jun 2022 15:08:10 -0400
Subject: [PATCH 384/521] directory cleanup

---
 Cpp/Executables/Main/TestControllerClasses.hh |  36 ----
 Cpp/Executables/Main/TestProcessorClasses.hh  | 193 ------------------
 Cpp/Executables/Main/test.yaml                |   8 -
 3 files changed, 237 deletions(-)
 delete mode 100644 Cpp/Executables/Main/TestControllerClasses.hh
 delete mode 100644 Cpp/Executables/Main/TestProcessorClasses.hh
 delete mode 100644 Cpp/Executables/Main/test.yaml

diff --git a/Cpp/Executables/Main/TestControllerClasses.hh b/Cpp/Executables/Main/TestControllerClasses.hh
deleted file mode 100644
index 4c410e7..0000000
--- a/Cpp/Executables/Main/TestControllerClasses.hh
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * TestControllerClasses.hh
- *
- *  Created on: Jan 24, 2022
- *      Author: N.S. Oblath
- */
-
-#ifndef NYMPH_TESTING_TESTCONTROLLERCLASSES
-#define NYMPH_TESTING_TESTCONTROLLERCLASSES
-
-#include "Controller.hh"
-
-namespace Nymph
-{
-
-    class CIQThrowController : public Controller
-    {
-
-        public:
-            using Controller::Controller;
-            virtual ~CIQThrowController() {}
-
-            virtual void ChainIsQuitting( const std::string& name, std::exception_ptr ePtr = std::exception_ptr() )
-            {
-                if( ePtr )
-                {
-                    std::rethrow_exception( ePtr );
-                }
-                return;
-            }
-
-    };
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_TESTING_TESTCONTROLLERCLASSES */
diff --git a/Cpp/Executables/Main/TestProcessorClasses.hh b/Cpp/Executables/Main/TestProcessorClasses.hh
deleted file mode 100644
index aaeb6ed..0000000
--- a/Cpp/Executables/Main/TestProcessorClasses.hh
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * TestProcessorClasses.hh
- *
- *  Created on: Nov 25, 2021
- *      Author: N.S. Oblath
- */
-
-#include "PrimaryProcessor.hh"
-#include "Processor.hh"
-#include "QuitChain.hh"
-#include "Signal.hh"
-#include "Slot.hh"
-
-#include "logger.hh"
-
-#include <chrono>
-#include <thread>
-
-LOGGER( testprocclasses_h_log, "TestProcessorClasses" );
-
-namespace Nymph
-{
-    // concrete processor class that we can test
-    // implements Configure() and has its own signal and slot
-    class TestProc : public Processor
-    {
-        public:
-            TestProc( const std::string& name = "test" ) :
-                    Processor( name ),
-                    fValue( 0 ),
-                    fSecondValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestProc::SetValue ),
-                    fSecondValueSig( "second-value", this ),
-                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction ),
-                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
-            {}
-
-            virtual ~TestProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                fValue = node.get_value( "value", fValue );
-
-                // we'll test configuration error throwing by having a string with restricted values
-                if( node.has("string") )
-                {
-                    if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
-                    else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
-                    else THROW_EXCEPT_HERE( ConfigException( node ) << "Invalid choice for \"string\"" );
-                }
-
-                return;
-            }
-
-            MEMVAR( int, Value );
-            MEMVAR( int, SecondValue );
-            MEMVAR_REF( std::string, StringValue );
-
-            void SecondValueSlotFunction( int newValue )
-            {
-                fSecondValueSig( newValue );
-            }
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-            MEMVAR_REF( Signal< int >, SecondValueSig );
-            MEMVAR_REF( Slot< int >, SecondValueSlot );
-            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
-
-    };
-
-    // external slot function owner
-    struct TestSlotOwner
-    {
-        int fValue = 0;
-        void TestSlotFunc( int input )
-        {
-            fValue = input;
-            return;
-        }
-    };
-
-
-    class TestPPException : public scarab::typed_exception< TestPPException >
-    {
-        public:
-            using scarab::typed_exception< TestPPException >::typed_exception;
-            ~TestPPException() = default;
-    };
-
-
-    // concrete primary processor class that we can test
-    // implements Configure(), Run(), and has its own signal and slot
-    class TestPrimaryProc : public PrimaryProcessor
-    {
-        public:
-            enum class TestType
-            {
-                SignalNewValue,
-                WaitTwoSec,
-                ThrowExcept,
-                QuitChain
-            };
-
-            TestPrimaryProc( const std::string& name = "test" ) :
-                    PrimaryProcessor( name ),
-                    fTestSelection( TestType::ThrowExcept ),
-                    fNewValue( 10 ),
-                    fValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
-            {}
-
-            virtual ~TestPrimaryProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                if( node.has("test") )
-                {
-                    std::string testSelectionStr( node["test"]().as_string() );
-                    if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
-                    else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
-                    else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
-                    else
-                    {
-                        LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
-                        THROW_EXCEPT_HERE( ConfigException() << "Invalid test selection: " << testSelectionStr );
-                    }
-                }
-                return;
-            }
-
-            void Run()
-            {
-                switch( fTestSelection )
-                {
-                    case TestType::SignalNewValue:
-                        TestSignalNewValue();
-                        return;
-                    case TestType::WaitTwoSec:
-                        TestWaitTwoSec();
-                        return;
-                    case TestType::ThrowExcept:
-                        TestThrowExcept();
-                        return;
-                    case TestType::QuitChain:
-                        TestQuitChain();
-                        return;
-                    default:
-                        LERROR( testprocclasses_h_log, "Invalid test choice" );
-                        THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
-                }
-                return;
-            }
-
-            void TestSignalNewValue()
-            {
-                fValueSig( fNewValue );
-                return;
-            }
-
-            void TestWaitTwoSec()
-            {
-                std::this_thread::sleep_for(std::chrono::seconds(2));
-                return;
-            }
-
-            void TestThrowExcept()
-            {
-                THROW_EXCEPT_HERE( TestPPException() << "PrimaryProcessor test function: throw Exception" );
-                return;
-            }
-
-            void TestQuitChain()
-            {
-                QUIT_CHAIN;
-            }
-
-            MEMVAR( TestType, TestSelection );
-
-            MEMVAR( int, NewValue );
-            MEMVAR( int, Value );
-
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
-
-    };
-
-}
diff --git a/Cpp/Executables/Main/test.yaml b/Cpp/Executables/Main/test.yaml
deleted file mode 100644
index d744786..0000000
--- a/Cpp/Executables/Main/test.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-processors:
-- type: test-primary
-  name: pp
-connections:
-- signal: "pp:value"
-  slot: "pp:value"
-run-queue:
-- pp

From 2067f4d57eb59760957b0e3c0c50f503d043cee5 Mon Sep 17 00:00:00 2001
From: jkgaison65 <jkgaison65@gmail.com>
Date: Tue, 14 Jun 2022 15:14:00 -0400
Subject: [PATCH 385/521] secondary cleanup of directories

---
 Cpp/Executables/Main/CMakeLists.txt |  2 +-
 Cpp/Executables/Main/ConfigCheck.cc | 30 -----------------------------
 Cpp/Executables/Main/Nymph_Exe.cc   |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 Cpp/Executables/Main/ConfigCheck.cc

diff --git a/Cpp/Executables/Main/CMakeLists.txt b/Cpp/Executables/Main/CMakeLists.txt
index a9c1615..253b47d 100644
--- a/Cpp/Executables/Main/CMakeLists.txt
+++ b/Cpp/Executables/Main/CMakeLists.txt
@@ -8,7 +8,7 @@ if( NOT Nymph_AS_SUBMODULE )
 endif()
 
 set( Nymph_SOURCES
-    ConfigCheck.cc
+#    ConfigCheck.cc
 )
 if( Nymph_BUILD_NYMPH_EXE )
     set( Nymph_SOURCES
diff --git a/Cpp/Executables/Main/ConfigCheck.cc b/Cpp/Executables/Main/ConfigCheck.cc
deleted file mode 100644
index 8c8775e..0000000
--- a/Cpp/Executables/Main/ConfigCheck.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * ConfigCheck.cc
- *
- *  Created on: Jan 4, 2013
- *      Author: nsoblath
- *
- */
-
-//#include "KTApplication.hh"
-//#include "KTLogger.hh"
-
-//using namespace Nymph;
-
-//KTLOGGER(cclog, "ConfigCheck");
-
-int main(int argc, char** argv)
-{
-/*
-    try
-    {
-        KTApplication app(argc, argv);
-    }
-    catch( std::exception& e )
-    {
-        KTERROR( cclog, "Something went wrong while processing the command line:\n" << e.what() );
-        return -1;
-    }
-*/
-    return 0;
-}
diff --git a/Cpp/Executables/Main/Nymph_Exe.cc b/Cpp/Executables/Main/Nymph_Exe.cc
index 3c5a5b4..e206f8a 100644
--- a/Cpp/Executables/Main/Nymph_Exe.cc
+++ b/Cpp/Executables/Main/Nymph_Exe.cc
@@ -1,5 +1,5 @@
 /*
- * Nymph.cc
+ * Nymph_Exe.cc
  *
  *  Created on: Sep 28, 2012
  *      Author: nsoblath

From 77245e73cb9545514a0abd84716ebebb63ad1d79 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 15:49:33 -0400
Subject: [PATCH 386/521] Fix wrong use of base class functions

---
 Python/Bindings/Processor/SignalPybind.hh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index 222e40b..f488026 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -31,12 +31,14 @@ namespace NymphPybind
                 .def("emit", &Nymph::Signal< XArgs... >::Emit)
                 .def("__call__", &Nymph::Signal< XArgs... >::operator())
                 .def("connect", &Nymph::Signal< XArgs...>::Connect)
-                .def("disconnect", &Nymph::SignalBase::Disconnect)
-                .def("disconnect_all", &Nymph::SignalBase::DisconnectAll)
-                .def("add_connection", &Nymph::SignalBase::AddConnection)
-                .def_property("do_breakpoint", &Nymph::SignalBase::GetDoBreakpoint, &Nymph::SignalBase::SetDoBreakpoint)
-                .def_readwrite("name", &Nymph::SignalBase::fName)
-                .def_readonly("connections", &Nymph::SignalBase::fConnections);
+                .def("disconnect", &Nymph::Signal< XArgs... >::Disconnect)
+                .def("disconnect_all", &Nymph::Signal< XArgs... >::DisconnectAll)
+             //   .def("add_connection", &Nymph::Signal< XArgs... >::AddConnection) <- private=cannot be used by signal
+                //.def_property_readonly("connections", &Nymph::Signal< XArgs... >::Connections)
+             //   .def_property_readonly("connections", static_cast<const std::set< Nymph::SlotBase* > (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))
+                //.def("set", static_cast<void (Pet::*)(const std::string &)>(&Pet::set), "Set the pet's name");
+                .def_property("do_breakpoint", &Nymph::Signal< XArgs... >::GetDoBreakpoint, &Nymph::Signal< XArgs... >::SetDoBreakpoint);
+             //   .def_readwrite("name", &Nymph::Signal< XArgs... >::fName)
         
     }
 

From 6fc66197e4e9caec362f059cb4ad17a36d353630 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 15:58:12 -0400
Subject: [PATCH 387/521] Update scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index a20a6db..0e1679e 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit a20a6dbe4cdd1ef489515a21f7987cc6867a753c
+Subproject commit 0e1679e0567a98dc6bf213aacaf171b899934afd

From ede1326236e4317f11dc1cc502b2b5b64b52e310 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 15:59:02 -0400
Subject: [PATCH 388/521] Nymph_Exe.cc --> Nymph.cc

---
 Cpp/Executables/Main/CMakeLists.txt             | 2 +-
 Cpp/Executables/Main/{Nymph_Exe.cc => Nymph.cc} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Cpp/Executables/Main/{Nymph_Exe.cc => Nymph.cc} (100%)

diff --git a/Cpp/Executables/Main/CMakeLists.txt b/Cpp/Executables/Main/CMakeLists.txt
index 253b47d..b59b920 100644
--- a/Cpp/Executables/Main/CMakeLists.txt
+++ b/Cpp/Executables/Main/CMakeLists.txt
@@ -13,7 +13,7 @@ set( Nymph_SOURCES
 if( Nymph_BUILD_NYMPH_EXE )
     set( Nymph_SOURCES
         ${Nymph_SOURCES}
-        Nymph_Exe.cc
+        Nymph.cc
     )
 endif( Nymph_BUILD_NYMPH_EXE )
 
diff --git a/Cpp/Executables/Main/Nymph_Exe.cc b/Cpp/Executables/Main/Nymph.cc
similarity index 100%
rename from Cpp/Executables/Main/Nymph_Exe.cc
rename to Cpp/Executables/Main/Nymph.cc

From 09fbe85915ea1c9dfcc7af8b30fe5835c0fb2941 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 16:01:30 -0400
Subject: [PATCH 389/521] Remove try-catch block from Nymph.cc

---
 Cpp/Executables/Main/Nymph.cc | 43 +++++++++++++----------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/Cpp/Executables/Main/Nymph.cc b/Cpp/Executables/Main/Nymph.cc
index e206f8a..59cfef6 100644
--- a/Cpp/Executables/Main/Nymph.cc
+++ b/Cpp/Executables/Main/Nymph.cc
@@ -11,20 +11,18 @@
  *  See scarab::application for details on the configuration option.
  */
 
-#include "logger.hh"
-#include "param.hh"
 #include "RunNymph.hh"
 
+#include "application.hh"
+#include "logger.hh"
 #include "param_codec.hh"
 #include "signal_handler.hh"
-#include "application.hh"
 
 LOGGER( nymphlog, "Nymph" );
 
 int main( int argc, char** argv )
 {
 
-
     LPROG( nymphlog, "Welcome to Nymph!" );
     LDEBUG( nymphlog,
             "\n" <<
@@ -62,33 +60,24 @@ int main( int argc, char** argv )
             "                                  =                                          \n" <<
             "                                  M                                          \n");
 
-    try
-    {
-
-        // Start handling signals
-        scarab::signal_handler t_sig_hand;
+    // Start handling signals
+    scarab::signal_handler t_sig_hand;
 
-        // Create the application
-        scarab::main_app the_main;
-        the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
+    // Create the application
+    scarab::main_app the_main;
+    the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
 
-        //Runs RunNymph() and sets  the_return based on its return value
-        int the_return = -1;
-        auto t_callback = [&](){
-            the_return = Nymph::RunNymph(  the_main.primary_config() );
-        };
+    //Runs RunNymph() and sets  the_return based on its return value
+    int the_return = -1;
+    auto t_callback = [&](){
+        the_return = Nymph::RunNymph(  the_main.primary_config() );
+    };
 
-        the_main.callback( t_callback );
+    the_main.callback( t_callback );
 
-        // Parse CL options and run the application
-        CLI11_PARSE( the_main, argc, argv );
+    // Parse CL options and run the application
+    CLI11_PARSE( the_main, argc, argv );
 
 	return the_return;
-    }
-    catch( std::exception& e )
-    {
-        LERROR( nymphlog, "Exception caught:\n" << e.what() );
-        return -1;
-    }
-
+    
 }

From e9cfa5d6dff9c7cc717d2b95a90101a66c77f37c Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 16:28:57 -0400
Subject: [PATCH 390/521] Fix build bug?

---
 Python/Bindings/Processor/SignalPybind.hh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index f488026..83b5f9b 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -13,19 +13,27 @@
 
 #include "SignalSlotBase.hh"
 #include "Signal.hh"
+#include "Slot.hh"
 #include "Processor.hh"
 
 namespace py = pybind11;
 
 namespace NymphPybind
 {
+    
+    template< typename... XArgs >
+    void explicit_name_setter(Nymph::Signal< XArgs... >& signal)
+    {
+        
+    }
 
     template< typename... XArgs >
     void ExportSignal( py::module_& nymphProcessor, const std::string& typestr)
     {
         std::string pyClsName = std::string("_Signal") + typestr;
         
-        py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
+       // py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
+       py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
                 .def(py::init<const std::string& >())
                 .def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("emit", &Nymph::Signal< XArgs... >::Emit)
@@ -33,12 +41,10 @@ namespace NymphPybind
                 .def("connect", &Nymph::Signal< XArgs...>::Connect)
                 .def("disconnect", &Nymph::Signal< XArgs... >::Disconnect)
                 .def("disconnect_all", &Nymph::Signal< XArgs... >::DisconnectAll)
-             //   .def("add_connection", &Nymph::Signal< XArgs... >::AddConnection) <- private=cannot be used by signal
-                //.def_property_readonly("connections", &Nymph::Signal< XArgs... >::Connections)
-             //   .def_property_readonly("connections", static_cast<const std::set< Nymph::SlotBase* > (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))
-                //.def("set", static_cast<void (Pet::*)(const std::string &)>(&Pet::set), "Set the pet's name");
+               // .def_property_readonly("connections", static_cast<const std::set< Nymph::SlotBase* >& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))
+                //.def_property("name", static_cast< const std::string& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Name),
+                //                      static_cast< const std::string& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Name) )
                 .def_property("do_breakpoint", &Nymph::Signal< XArgs... >::GetDoBreakpoint, &Nymph::Signal< XArgs... >::SetDoBreakpoint);
-             //   .def_readwrite("name", &Nymph::Signal< XArgs... >::fName)
         
     }
 

From e704534601a47d0b9fc9fb54d895144e8261a2bd Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 16:56:13 -0400
Subject: [PATCH 391/521] Fix reference getters and setters

---
 Python/Bindings/Processor/SignalPybind.hh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index 83b5f9b..c4963d7 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -21,18 +21,11 @@ namespace py = pybind11;
 namespace NymphPybind
 {
     
-    template< typename... XArgs >
-    void explicit_name_setter(Nymph::Signal< XArgs... >& signal)
-    {
-        
-    }
-
     template< typename... XArgs >
     void ExportSignal( py::module_& nymphProcessor, const std::string& typestr)
     {
         std::string pyClsName = std::string("_Signal") + typestr;
-        
-       // py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
+
        py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
                 .def(py::init<const std::string& >())
                 .def(py::init<const std::string&,  Nymph::Processor* >())
@@ -41,9 +34,9 @@ namespace NymphPybind
                 .def("connect", &Nymph::Signal< XArgs...>::Connect)
                 .def("disconnect", &Nymph::Signal< XArgs... >::Disconnect)
                 .def("disconnect_all", &Nymph::Signal< XArgs... >::DisconnectAll)
-               // .def_property_readonly("connections", static_cast<const std::set< Nymph::SlotBase* >& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))
-                //.def_property("name", static_cast< const std::string& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Name),
-                //                      static_cast< const std::string& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Name) )
+                .def_property_readonly("connections", static_cast< std::set< Nymph::SlotBase* >& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))
+                .def_property("name", static_cast< const std::string& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Name),
+                                      [](Nymph::Signal< XArgs... >& signal, const std::string& name){signal.Name() = name;} )
                 .def_property("do_breakpoint", &Nymph::Signal< XArgs... >::GetDoBreakpoint, &Nymph::Signal< XArgs... >::SetDoBreakpoint);
         
     }

From 6017920fd1e75f3d4d9b8b248dcb3e3fb1a2cc57 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 16:58:04 -0400
Subject: [PATCH 392/521] Added initial version of ProcessorToolboxPybind.hh;
 not functional

---
 .../Processor/ProcessorToolboxPybind.hh       | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 Python/Bindings/Processor/ProcessorToolboxPybind.hh

diff --git a/Python/Bindings/Processor/ProcessorToolboxPybind.hh b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
new file mode 100644
index 0000000..32de63a
--- /dev/null
+++ b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
@@ -0,0 +1,46 @@
+/*
+ * ProcessorToolboxPybind.hh
+ *
+ *  Created on: Feb 15, 2022
+ *      Author: F. Thomas
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_PROCESSORTOOLBOXPYBIND_HH_
+#define PYTHON_BINDINGS_PROCESSOR_PROCESSORTOOLBOXPYBIND_HH_
+
+#include <pybind11/pybind11.h>
+#include <memory>
+
+#include "Processor.hh"
+//#include "TestProcessorClasses.hh"
+#include "factory.hh"
+
+namespace py = pybind11;
+
+namespace NymphPybind
+{
+    void ExportProcessorToolbox( py::module_& nymphProcessor)
+    {
+        py::class_< Nymph::ProcessorToolbox >(nymphProcessor, "ProcessorToolbox")
+                .def(py::init<const std::string& >())
+                .def("configure", &Nymph::Processor::Configure)
+                
+                .def("configure_processors", &Nymph::Processor::ConnectSignalToSlot)
+                .def("get_processor", &Nymph::Processor::ConnectASlot) //
+                .def("add_processor", &Nymph::Processor::ConnectASignal) //
+                .def("remove_processor", &Nymph::Processor::RegisterSignal)
+                .def("release_processor", &Nymph::Processor::RegisterSlot) //
+                .def("clear_processors", &Nymph::Processor::GetDoBreakpoint)
+
+                .def("configure_connections", &Nymph::Processor::SetDoBreakpoint) //
+                .def("make_connection", &Nymph::Processor::SetDoBreakpoint) //
+
+                .def("set_breakpoint", &Nymph::Processor::SetDoBreakpoint) //
+                .def("remove_breakpoint", &Nymph::Processor::SetDoBreakpoint) //
+        ;
+        
+    }
+
+}
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_PROCESSORTOOLBOXPYBIND_HH_ */

From 46b4483014e6943441ecd30e7d865c52c36633f3 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 17:06:35 -0400
Subject: [PATCH 393/521] Add script to demonstrate signal in python

---
 Testing/Python/testsignal.py | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 Testing/Python/testsignal.py

diff --git a/Testing/Python/testsignal.py b/Testing/Python/testsignal.py
new file mode 100644
index 0000000..6f791d8
--- /dev/null
+++ b/Testing/Python/testsignal.py
@@ -0,0 +1,39 @@
+
+"""
+  testsignal.py
+ 
+   Created on: Jun 14, 2022
+       Author: F. Thomas
+"""
+
+__all__ = []
+
+import _nymph
+import scarab
+
+class TestProcessor(_nymph.processor._Processor):
+    
+    def configure(self, param_node):
+        
+        param_dict = param_node.to_python()
+        self.x = param_dict['x']
+
+def main(args):
+    
+    testprocessor = TestProcessor('test')
+    
+    param = scarab.ParamValue( 1.0 )
+    param_node = scarab.ParamNode()
+    param_node.add('x', param)
+    
+    testprocessor.configure(param_node)
+    
+    signal = _nymph.processor._SignalData('test-signal', testprocessor)
+    
+    print(signal.name)
+    print(testprocessor.x)
+    return 0
+
+if __name__ == '__main__':
+    import sys
+    sys.exit(main(sys.argv))

From 18dd6c5ab0a20a2254354d8ed7261e5e333b9d53 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 17:19:52 -0400
Subject: [PATCH 394/521] ProcessorToolbox binding code builds

---
 Python/Bindings/CMakeLists.txt                |  1 +
 Python/Bindings/NymphPybind.cc                |  5 +-
 .../Processor/ProcessorToolboxPybind.hh       | 52 +++++++++++--------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 750528c..684286a 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -15,6 +15,7 @@ include_directories( BEFORE
 set( PYBINDING_HEADERFILES
     Data/DataPybind.hh
     Processor/ProcessorPybind.hh
+    Processor/ProcessorToolboxPybind.hh
 )
 
 # Python bindings
diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 637f499..fceafef 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -7,9 +7,11 @@
 
 #include <pybind11/pybind11.h>
 
-#include "Processor/ProcessorPybind.hh"
 #include "Data/DataPybind.hh"
 
+#include "Processor/ProcessorPybind.hh"
+#include "Processor/ProcessorToolboxPybind.hh"
+
 namespace py = pybind11;
 
 
@@ -23,5 +25,6 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
+    NymphPybind::ExportProcessorToolbox(nymphProcessor);
     auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/ProcessorToolboxPybind.hh b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
index 32de63a..b00ef50 100644
--- a/Python/Bindings/Processor/ProcessorToolboxPybind.hh
+++ b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
@@ -1,44 +1,50 @@
 /*
  * ProcessorToolboxPybind.hh
  *
- *  Created on: Feb 15, 2022
- *      Author: F. Thomas
+ *  Created on: Jun 14, 2022
+ *      Author: N.S. Oblath
  */
 
 #ifndef PYTHON_BINDINGS_PROCESSOR_PROCESSORTOOLBOXPYBIND_HH_
 #define PYTHON_BINDINGS_PROCESSOR_PROCESSORTOOLBOXPYBIND_HH_
 
-#include <pybind11/pybind11.h>
-#include <memory>
+#include "ProcessorToolbox.hh"
 
 #include "Processor.hh"
-//#include "TestProcessorClasses.hh"
-#include "factory.hh"
+
+#include <pybind11/pybind11.h>
+#include <memory>
 
 namespace py = pybind11;
 
 namespace NymphPybind
 {
-    void ExportProcessorToolbox( py::module_& nymphProcessor)
+    void ExportProcessorToolbox( py::module_& nymphProcessor )
     {
-        py::class_< Nymph::ProcessorToolbox >(nymphProcessor, "ProcessorToolbox")
-                .def(py::init<const std::string& >())
-                .def("configure", &Nymph::Processor::Configure)
+        py::class_< Nymph::ProcessorToolbox >( nymphProcessor, "ProcessorToolbox" )
+                .def( py::init<const std::string& >() )
+                .def( "configure", &Nymph::ProcessorToolbox::Configure )
                 
-                .def("configure_processors", &Nymph::Processor::ConnectSignalToSlot)
-                .def("get_processor", &Nymph::Processor::ConnectASlot) //
-                .def("add_processor", &Nymph::Processor::ConnectASignal) //
-                .def("remove_processor", &Nymph::Processor::RegisterSignal)
-                .def("release_processor", &Nymph::Processor::RegisterSlot) //
-                .def("clear_processors", &Nymph::Processor::GetDoBreakpoint)
-
-                .def("configure_connections", &Nymph::Processor::SetDoBreakpoint) //
-                .def("make_connection", &Nymph::Processor::SetDoBreakpoint) //
-
-                .def("set_breakpoint", &Nymph::Processor::SetDoBreakpoint) //
-                .def("remove_breakpoint", &Nymph::Processor::SetDoBreakpoint) //
+                .def( "configure_processors", &Nymph::ProcessorToolbox::ConfigureProcessors )
+                .def( "get_processor", py::overload_cast< const std::string& >(&Nymph::ProcessorToolbox::GetProcessor) )
+                .def( "get_processor_const", py::overload_cast< const std::string& >(&Nymph::ProcessorToolbox::GetProcessor, py::const_ ) )
+                .def( "add_processor", py::overload_cast< const std::string&, std::shared_ptr<Nymph::Processor> >(&Nymph::ProcessorToolbox::AddProcessor) )
+                .def( "add_processor", py::overload_cast< const std::string&, const std::string& >(&Nymph::ProcessorToolbox::AddProcessor) )
+                .def( "remove_processor", &Nymph::ProcessorToolbox::RemoveProcessor )
+                .def( "release_processor", &Nymph::ProcessorToolbox::ReleaseProcessor )
+                .def( "clear_processors", &Nymph::ProcessorToolbox::ClearProcessors )
+
+                .def( "configure_connections", &Nymph::ProcessorToolbox::ConfigureConnections )
+                .def( "make_connection", py::overload_cast< const std::string&, const std::string&, int >(&Nymph::ProcessorToolbox::MakeConnection) )
+                .def( "make_connection", py::overload_cast< const std::string&, const std::string& >(&Nymph::ProcessorToolbox::MakeConnection) )
+                .def( "make_connection", py::overload_cast< const std::string&, const std::string&, const std::string&, const std::string&, int >(&Nymph::ProcessorToolbox::MakeConnection) )
+                .def( "make_connection", py::overload_cast< const std::string&, const std::string&, const std::string&, const std::string& >(&Nymph::ProcessorToolbox::MakeConnection) )
+
+                .def( "set_breakpoint",  py::overload_cast< const std::string& >(&Nymph::ProcessorToolbox::SetBreakpoint) ) //
+                .def( "set_breakpoint",  py::overload_cast< const std::string&, const std::string& >(&Nymph::ProcessorToolbox::SetBreakpoint) ) //
+                .def( "remove_breakpoint", py::overload_cast< const std::string& >(&Nymph::ProcessorToolbox::RemoveBreakpoint) ) //
+                .def( "remove_breakpoint", py::overload_cast< const std::string&, const std::string& >(&Nymph::ProcessorToolbox::RemoveBreakpoint) ) //
         ;
-        
     }
 
 }

From e372ed34fb736e21e04253c5977609e68941e611 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 17:20:53 -0400
Subject: [PATCH 395/521] Add missing members to processor binding

---
 Python/Bindings/Processor/ProcessorPybind.hh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index b637d99..62ac1ee 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -54,7 +54,10 @@ namespace NymphPybind
                 .def("register_slot", &Nymph::Processor::RegisterSlot)
                 .def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
                 .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
-                //.def_property_readonly("name", &Nymph::Processor::Name);
+                .def_property("name", static_cast< const std::string& (Nymph::Processor::*)() const>(&Nymph::Processor::Name),
+                                      [](Nymph::Processor& processor, const std::string& name){processor.Name() = name;} )
+                .def_property_readonly("signals", static_cast< const std::map< std::string, Nymph::SignalBase* >& (Nymph::Processor::*)() const>(&Nymph::Processor::Signals))
+                .def_property_readonly("slots", static_cast< const std::map< std::string, Nymph::SlotBase* >& (Nymph::Processor::*)() const>(&Nymph::Processor::Slots));
         
         nymphProcessor.def("get_processor", &get_processor);
         

From 906bf1a0525dffcacc0b55fad40e381f92b29ce9 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Tue, 14 Jun 2022 17:31:44 -0400
Subject: [PATCH 396/521] Fix accidental semicolon

---
 Python/Bindings/Processor/ProcessorPybind.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 62ac1ee..c60fc79 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -53,7 +53,7 @@ namespace NymphPybind
                 .def("register_signal", &Nymph::Processor::RegisterSignal)
                 .def("register_slot", &Nymph::Processor::RegisterSlot)
                 .def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
-                .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
+                .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint)
                 .def_property("name", static_cast< const std::string& (Nymph::Processor::*)() const>(&Nymph::Processor::Name),
                                       [](Nymph::Processor& processor, const std::string& name){processor.Name() = name;} )
                 .def_property_readonly("signals", static_cast< const std::map< std::string, Nymph::SignalBase* >& (Nymph::Processor::*)() const>(&Nymph::Processor::Signals))

From 12bbbe554eecf4be4a940985fbea4898fbead0d9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 22:42:53 -0400
Subject: [PATCH 397/521] Moved Cpp testing to its own namespace, and building
 a separate library.

---
 Cpp/Library/Data/SlotData.hh            |   7 ++
 Testing/CMakeLists.txt                  |  25 ++++-
 Testing/Cpp/TestController.cc           |   7 +-
 Testing/Cpp/TestControllerClasses.hh    |  10 +-
 Testing/Cpp/TestData.cc                 |   1 +
 Testing/Cpp/TestDataClasses.hh          |   6 +-
 Testing/Cpp/TestDataFrame.cc            |   1 +
 Testing/Cpp/TestDataProcessorClasses.hh |  27 +++--
 Testing/Cpp/TestPrimaryProcessor.cc     |   4 +-
 Testing/Cpp/TestProcessor.cc            |   4 +-
 Testing/Cpp/TestProcessorClasses.cc     | 125 +++++++++++++++++++++
 Testing/Cpp/TestProcessorClasses.hh     | 140 +++++-------------------
 Testing/Cpp/TestProcessorToolbox.cc     |   9 +-
 Testing/Cpp/TestSignalSlot.cc           |   1 +
 Testing/Cpp/TestSingleRunController.cc  |  11 +-
 Testing/Cpp/TestSlotData.cc             |  27 ++---
 16 files changed, 244 insertions(+), 161 deletions(-)
 create mode 100644 Testing/Cpp/TestProcessorClasses.cc

diff --git a/Cpp/Library/Data/SlotData.hh b/Cpp/Library/Data/SlotData.hh
index dda5192..574941d 100644
--- a/Cpp/Library/Data/SlotData.hh
+++ b/Cpp/Library/Data/SlotData.hh
@@ -23,6 +23,13 @@ namespace Nymph
     template< class... XTypes >
     using Out = TypeList< XTypes... >;
 
+    // convenience macro: avoid needing to prepend In and Out with Nymph::
+#define USING_NYMPH_IN_OUT \
+    template< class... XTypes > \
+    using In = Nymph::In<XTypes...>; \
+    template< class... XTypes > \
+    using Out = Nymph::Out<XTypes...>;
+
     template< class XInList, class XOutList >
     class SlotData;
 
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index e4d9306..dd3bfcc 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -15,14 +15,34 @@ include_directories( BEFORE
 
 #pbuilder_install_config (${pytesting_CONFIGFILES})
 
-set( testing_HEADERS
+set( testing_lib_HEADERS
     ${CPP_DIR}/TestControllerClasses.hh
     ${CPP_DIR}/TestDataClasses.hh
     ${CPP_DIR}/TestDataProcessorClasses.hh
     ${CPP_DIR}/TestProcessorClasses.hh
 )
 
-pbuilder_install_headers( ${testing_HEADERS} )
+set( testing_lib_SOURCES
+    ${CPP_DIR}/TestProcessorClasses.cc
+)
+
+set( testing_lib_LIB_DEPENDENCIES 
+    Nymph
+)
+
+pbuilder_library( 
+    TARGET NymphTesting
+    SOURCES ${testing_lib_SOURCES}
+    PUBLIC_EXTERNAL_LIBRARIES ${testing_lib_LIB_DEPENDENCIES}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS NymphTesting
+)
+
+pbuilder_install_headers( ${testing_lib_HEADERS} )
+
 
 #set (pytesting_HEADERS
 #  
@@ -52,6 +72,7 @@ set( testing_SOURCES
 
 set( testing_LIB_DEPENDENCIES 
     Nymph
+    NymphTesting
 )
 
 # Interface library was recommended for Catch:
diff --git a/Testing/Cpp/TestController.cc b/Testing/Cpp/TestController.cc
index a188056..785e24f 100644
--- a/Testing/Cpp/TestController.cc
+++ b/Testing/Cpp/TestController.cc
@@ -17,12 +17,12 @@
 
 #include "catch.hpp"
 
-namespace Nymph
+namespace NymphTesting
 {
-    class ControllerRevealer : public Controller
+    class ControllerRevealer : public Nymph::Controller
     {
         public:
-            using Controller::Controller;
+            using Nymph::Controller::Controller;
             virtual ~ControllerRevealer() {}
 
             void SetBreakFlag( bool flag )
@@ -49,6 +49,7 @@ namespace Nymph
 TEST_CASE( "controller", "[control]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     ControllerRevealer control;
 
diff --git a/Testing/Cpp/TestControllerClasses.hh b/Testing/Cpp/TestControllerClasses.hh
index 4c410e7..80b40e2 100644
--- a/Testing/Cpp/TestControllerClasses.hh
+++ b/Testing/Cpp/TestControllerClasses.hh
@@ -5,15 +5,15 @@
  *      Author: N.S. Oblath
  */
 
-#ifndef NYMPH_TESTING_TESTCONTROLLERCLASSES
-#define NYMPH_TESTING_TESTCONTROLLERCLASSES
+#ifndef NYMPH_TESTING_TESTCONTROLLERCLASSES_HH
+#define NYMPH_TESTING_TESTCONTROLLERCLASSES_HH
 
 #include "Controller.hh"
 
-namespace Nymph
+namespace NymphTesting
 {
 
-    class CIQThrowController : public Controller
+    class CIQThrowController : public Nymph::Controller
     {
 
         public:
@@ -33,4 +33,4 @@ namespace Nymph
 
 } /* namespace Nymph */
 
-#endif /* NYMPH_TESTING_TESTCONTROLLERCLASSES */
+#endif /* NYMPH_TESTING_TESTCONTROLLERCLASSES_HH */
diff --git a/Testing/Cpp/TestData.cc b/Testing/Cpp/TestData.cc
index 8682488..ecf6eee 100644
--- a/Testing/Cpp/TestData.cc
+++ b/Testing/Cpp/TestData.cc
@@ -13,6 +13,7 @@
 TEST_CASE( "data", "[data]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     TestData1 data1;
     REQUIRE( data1.GetIValue1() == 0 );
diff --git a/Testing/Cpp/TestDataClasses.hh b/Testing/Cpp/TestDataClasses.hh
index f77e742..a36a922 100644
--- a/Testing/Cpp/TestDataClasses.hh
+++ b/Testing/Cpp/TestDataClasses.hh
@@ -11,9 +11,9 @@
 #include "Data.hh"
 #include "MemberVariable.hh"
 
-namespace Nymph
+namespace NymphTesting
 {
-    class TestData1 : public Data
+    class TestData1 : public Nymph::Data
     {
         public:
             TestData1() :
@@ -29,7 +29,7 @@ namespace Nymph
             MEMVAR( int, IValue2 );
     };
 
-    class TestData2 : public Data
+    class TestData2 : public Nymph::Data
     {
         public:
             TestData2() :
diff --git a/Testing/Cpp/TestDataFrame.cc b/Testing/Cpp/TestDataFrame.cc
index 100ca62..69e76a6 100644
--- a/Testing/Cpp/TestDataFrame.cc
+++ b/Testing/Cpp/TestDataFrame.cc
@@ -15,6 +15,7 @@
 TEST_CASE( "data_frame", "[data]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     DataFrame frame;
     const DataFrame& cFrame = frame;
diff --git a/Testing/Cpp/TestDataProcessorClasses.hh b/Testing/Cpp/TestDataProcessorClasses.hh
index 7da2e57..b6ff0aa 100644
--- a/Testing/Cpp/TestDataProcessorClasses.hh
+++ b/Testing/Cpp/TestDataProcessorClasses.hh
@@ -5,6 +5,9 @@
  *      Author: N.S. Oblath
  */
 
+#ifndef NYMPH_TESTING_TESTDATAPROCESSORCLASSES_HH
+#define NYMPH_TESTING_TESTDATAPROCESSORCLASSES_HH
+
 #include "TestDataClasses.hh"
 
 #include "Exception.hh"
@@ -16,7 +19,7 @@
 
 LOGGER( tdpclog_h, "TestDataProcessorClasses" );
 
-namespace Nymph
+namespace NymphTesting
 {
 
     // external slot function owner
@@ -32,7 +35,7 @@ namespace Nymph
     };
 
     // This processor has a data slot that takes TestData1 as input and has no output (TestData1 is modified in place)
-    class Adder : public Processor
+    class Adder : public Nymph::Processor
     {
         public:
             Adder( const std::string& name = "adder" ) :
@@ -85,26 +88,30 @@ namespace Nymph
 
             void JustThrows( TestData1& )
             {
-                throw CREATE_EXCEPT_HERE( Exception );
+                throw CREATE_EXCEPT_HERE( Nymph::Exception );
             }
 
         protected:
             MultiplyFuncOwner fMultFunc;
 
         public:
-            SignalData fAddSignal;
+            Nymph::SignalData fAddSignal;
+
+            USING_NYMPH_IN_OUT; // avoids needing to prepend In and Out with Nymph::
 
-            SlotData< In<TestData1>, Out<> > fAddSlotWithSig;
-            SlotData< In<TestData1>, Out<> > fAddSlotNoSig;
+            Nymph::SlotData< In<TestData1>, Out<> > fAddSlotWithSig;
+            Nymph::SlotData< In<TestData1>, Out<> > fAddSlotNoSig;
 
-            SlotData< In<const TestData1>, Out<TestData2> > fMultiplySlot;
+            Nymph::SlotData< In<const TestData1>, Out<TestData2> > fMultiplySlot;
 
-            SlotData< In<const TestData1>, Out<TestData2> > fIToDSlot;
+            Nymph::SlotData< In<const TestData1>, Out<TestData2> > fIToDSlot;
 
-            SlotData< In<const TestData1>, Out<> > fPrintSlot;
+            Nymph::SlotData< In<const TestData1>, Out<> > fPrintSlot;
 
-            SlotData< In<TestData1>, Out<> > fJustThrowsSlot;
+            Nymph::SlotData< In<TestData1>, Out<> > fJustThrowsSlot;
 
     };
 
 }
+
+#endif /* NYMPH_TESTING_TESTDATAPROCESSORCLASSES_HH */
diff --git a/Testing/Cpp/TestPrimaryProcessor.cc b/Testing/Cpp/TestPrimaryProcessor.cc
index 6560989..77347e0 100644
--- a/Testing/Cpp/TestPrimaryProcessor.cc
+++ b/Testing/Cpp/TestPrimaryProcessor.cc
@@ -14,12 +14,10 @@
 
 LOGGER( testlog, "TestPrimaryProcessor" );
 
-REGISTER_PROCESSOR( Nymph, TestPrimaryProc, "test-primary" );
-
-
 TEST_CASE( "primary_processor", "[primary_processor]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     //SharedControl::get_instance()->Reset();
 
diff --git a/Testing/Cpp/TestProcessor.cc b/Testing/Cpp/TestProcessor.cc
index ba2e2f4..64e441b 100644
--- a/Testing/Cpp/TestProcessor.cc
+++ b/Testing/Cpp/TestProcessor.cc
@@ -14,12 +14,10 @@
 
 LOGGER( testlog, "TestProcessor" );
 
-REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
-
-
 TEST_CASE( "processor", "[signal],[slot],[processor]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     // need a controller to exist
     CIQThrowController controller;
diff --git a/Testing/Cpp/TestProcessorClasses.cc b/Testing/Cpp/TestProcessorClasses.cc
new file mode 100644
index 0000000..d29d3cf
--- /dev/null
+++ b/Testing/Cpp/TestProcessorClasses.cc
@@ -0,0 +1,125 @@
+/*
+ * TestProcessorClasses.cc
+ *
+ *  Created on: Jun 14, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProcessorClasses.hh"
+
+REGISTER_PROCESSOR( NymphTesting, TestProc, "test-proc" );
+REGISTER_PROCESSOR( NymphTesting, TestPrimaryProc, "test-primary" );
+
+namespace NymphTesting
+{
+    TestProc::TestProc( const std::string& name ) :
+            Nymph::Processor( name ),
+            fValue( 0 ),
+            fSecondValue( 0 ),
+            fValueSig( "value", this ),
+            fValueSlot( "value", this, &TestProc::SetValue ),
+            fSecondValueSig( "second-value", this ),
+            fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction ),
+            fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
+    {}
+
+    TestProc::~TestProc()
+    {}
+
+    void TestProc::Configure( const scarab::param_node& node )
+    {
+        fValue = node.get_value( "value", fValue );
+
+        // we'll test configuration error throwing by having a string with restricted values
+        if( node.has("string") )
+        {
+            if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
+            else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
+            else THROW_EXCEPT_HERE( Nymph::ConfigException( node ) << "Invalid choice for \"string\"" );
+        }
+
+        return;
+    }
+
+    void TestProc::SecondValueSlotFunction( int newValue )
+    {
+        fSecondValueSig( newValue );
+    }
+
+
+    TestPrimaryProc::TestPrimaryProc( const std::string& name ) :
+            PrimaryProcessor( name ),
+            fTestSelection( TestType::ThrowExcept ),
+            fNewValue( 10 ),
+            fValue( 0 ),
+            fValueSig( "value", this ),
+            fValueSlot( "value", this, &TestPrimaryProc::SetValue )
+    {}
+
+    TestPrimaryProc::~TestPrimaryProc()
+    {}
+
+    void TestPrimaryProc::Configure( const scarab::param_node& node )
+    {
+        if( node.has("test") )
+        {
+            std::string testSelectionStr( node["test"]().as_string() );
+            if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
+            else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
+            else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
+            else
+            {
+                LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
+                THROW_EXCEPT_HERE( Nymph::ConfigException() << "Invalid test selection: " << testSelectionStr );
+            }
+        }
+        return;
+    }
+
+    void TestPrimaryProc::Run()
+    {
+        switch( fTestSelection )
+        {
+            case TestType::SignalNewValue:
+                TestSignalNewValue();
+                return;
+            case TestType::WaitTwoSec:
+                TestWaitTwoSec();
+                return;
+            case TestType::ThrowExcept:
+                TestThrowExcept();
+                return;
+            case TestType::QuitChain:
+                TestQuitChain();
+                return;
+            default:
+                LERROR( testprocclasses_h_log, "Invalid test choice" );
+                THROW_EXCEPT_HERE( Nymph::Exception() << "Invalid test choice" );
+        }
+        return;
+    }
+
+    void TestPrimaryProc::TestSignalNewValue()
+    {
+        fValueSig( fNewValue );
+        return;
+    }
+
+    void TestPrimaryProc::TestWaitTwoSec()
+    {
+        std::this_thread::sleep_for(std::chrono::seconds(2));
+        return;
+    }
+
+    void TestPrimaryProc::TestThrowExcept()
+    {
+        THROW_EXCEPT_HERE( TestPPException() << "PrimaryProcessor test function: throw Exception" );
+        return;
+    }
+
+    void TestPrimaryProc::TestQuitChain()
+    {
+        QUIT_CHAIN;
+    }
+
+} /* namespace NymphTesting */
diff --git a/Testing/Cpp/TestProcessorClasses.hh b/Testing/Cpp/TestProcessorClasses.hh
index aaeb6ed..d013221 100644
--- a/Testing/Cpp/TestProcessorClasses.hh
+++ b/Testing/Cpp/TestProcessorClasses.hh
@@ -5,6 +5,9 @@
  *      Author: N.S. Oblath
  */
 
+#ifndef NYMPH_TESTING_PROCESSORCLASSES_HH_
+#define NYMPH_TESTING_PROCESSORCLASSES_HH_
+
 #include "PrimaryProcessor.hh"
 #include "Processor.hh"
 #include "QuitChain.hh"
@@ -18,57 +21,31 @@
 
 LOGGER( testprocclasses_h_log, "TestProcessorClasses" );
 
-namespace Nymph
+namespace NymphTesting
 {
     // concrete processor class that we can test
     // implements Configure() and has its own signal and slot
-    class TestProc : public Processor
+    class TestProc : public Nymph::Processor
     {
         public:
-            TestProc( const std::string& name = "test" ) :
-                    Processor( name ),
-                    fValue( 0 ),
-                    fSecondValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestProc::SetValue ),
-                    fSecondValueSig( "second-value", this ),
-                    fSecondValueSlot( "second-value", this, &TestProc::SecondValueSlotFunction ),
-                    fSecondValueSlot2( "second-value-2", this, &TestProc::SetSecondValue )
-            {}
-
-            virtual ~TestProc()
-            {}
-
-            void Configure( const scarab::param_node& node )
-            {
-                fValue = node.get_value( "value", fValue );
+            TestProc( const std::string& name = "test" );
 
-                // we'll test configuration error throwing by having a string with restricted values
-                if( node.has("string") )
-                {
-                    if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
-                    else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
-                    else THROW_EXCEPT_HERE( ConfigException( node ) << "Invalid choice for \"string\"" );
-                }
+            virtual ~TestProc();
 
-                return;
-            }
+            void Configure( const scarab::param_node& node );
 
             MEMVAR( int, Value );
             MEMVAR( int, SecondValue );
             MEMVAR_REF( std::string, StringValue );
 
-            void SecondValueSlotFunction( int newValue )
-            {
-                fSecondValueSig( newValue );
-            }
+            void SecondValueSlotFunction( int newValue );
 
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
+            MEMVAR_REF( Nymph::Signal< int >, ValueSig );
+            MEMVAR_REF( Nymph::Slot< int >, ValueSlot );
 
-            MEMVAR_REF( Signal< int >, SecondValueSig );
-            MEMVAR_REF( Slot< int >, SecondValueSlot );
-            MEMVAR_REF( Slot< int >, SecondValueSlot2 );
+            MEMVAR_REF( Nymph::Signal< int >, SecondValueSig );
+            MEMVAR_REF( Nymph::Slot< int >, SecondValueSlot );
+            MEMVAR_REF( Nymph::Slot< int >, SecondValueSlot2 );
 
     };
 
@@ -94,7 +71,7 @@ namespace Nymph
 
     // concrete primary processor class that we can test
     // implements Configure(), Run(), and has its own signal and slot
-    class TestPrimaryProc : public PrimaryProcessor
+    class TestPrimaryProc : public Nymph::PrimaryProcessor
     {
         public:
             enum class TestType
@@ -105,89 +82,32 @@ namespace Nymph
                 QuitChain
             };
 
-            TestPrimaryProc( const std::string& name = "test" ) :
-                    PrimaryProcessor( name ),
-                    fTestSelection( TestType::ThrowExcept ),
-                    fNewValue( 10 ),
-                    fValue( 0 ),
-                    fValueSig( "value", this ),
-                    fValueSlot( "value", this, &TestPrimaryProc::SetValue )
-            {}
+            TestPrimaryProc( const std::string& name = "test" );
 
-            virtual ~TestPrimaryProc()
-            {}
+            virtual ~TestPrimaryProc();
 
-            void Configure( const scarab::param_node& node )
-            {
-                if( node.has("test") )
-                {
-                    std::string testSelectionStr( node["test"]().as_string() );
-                    if( testSelectionStr == "signal-new-value" ) fTestSelection = TestType::SignalNewValue;
-                    else if( testSelectionStr == "wait-two-sec" ) fTestSelection = TestType::WaitTwoSec;
-                    else if( testSelectionStr == "throw-except" ) fTestSelection = TestType::ThrowExcept;
-                    else
-                    {
-                        LERROR( testprocclasses_h_log, "Invalid test selection: " << testSelectionStr );
-                        THROW_EXCEPT_HERE( ConfigException() << "Invalid test selection: " << testSelectionStr );
-                    }
-                }
-                return;
-            }
-
-            void Run()
-            {
-                switch( fTestSelection )
-                {
-                    case TestType::SignalNewValue:
-                        TestSignalNewValue();
-                        return;
-                    case TestType::WaitTwoSec:
-                        TestWaitTwoSec();
-                        return;
-                    case TestType::ThrowExcept:
-                        TestThrowExcept();
-                        return;
-                    case TestType::QuitChain:
-                        TestQuitChain();
-                        return;
-                    default:
-                        LERROR( testprocclasses_h_log, "Invalid test choice" );
-                        THROW_EXCEPT_HERE( Exception() << "Invalid test choice" );
-                }
-                return;
-            }
-
-            void TestSignalNewValue()
-            {
-                fValueSig( fNewValue );
-                return;
-            }
+            void Configure( const scarab::param_node& node );
 
-            void TestWaitTwoSec()
-            {
-                std::this_thread::sleep_for(std::chrono::seconds(2));
-                return;
-            }
+            void Run();
 
-            void TestThrowExcept()
-            {
-                THROW_EXCEPT_HERE( TestPPException() << "PrimaryProcessor test function: throw Exception" );
-                return;
-            }
+            void TestSignalNewValue();
 
-            void TestQuitChain()
-            {
-                QUIT_CHAIN;
-            }
+            void TestWaitTwoSec();
+
+            void TestThrowExcept();
+
+            void TestQuitChain();
 
             MEMVAR( TestType, TestSelection );
 
             MEMVAR( int, NewValue );
             MEMVAR( int, Value );
 
-            MEMVAR_REF( Signal< int >, ValueSig );
-            MEMVAR_REF( Slot< int >, ValueSlot );
+            MEMVAR_REF( Nymph::Signal< int >, ValueSig );
+            MEMVAR_REF( Nymph::Slot< int >, ValueSlot );
 
     };
 
-}
+} /* namespace NymphTesting */
+
+#endif
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
index 79e0b4f..36d8ea7 100644
--- a/Testing/Cpp/TestProcessorToolbox.cc
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -17,16 +17,16 @@
 LOGGER( testlog, "TestProcessorToolbox" );
 
 
-namespace Nymph
+namespace NymphTesting
 {
-    class ProcTBRevealer : public ProcessorToolbox
+    class ProcTBRevealer : public Nymph::ProcessorToolbox
     {
         public:
-            using ProcessorToolbox::ProcessorToolbox;
+            using Nymph::ProcessorToolbox::ProcessorToolbox;
 
             bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const
             {
-                return ProcessorToolbox::ParseSignalSlotName( toParse, nameOfProc, nameOfSigSlot );
+                return Nymph::ProcessorToolbox::ParseSignalSlotName( toParse, nameOfProc, nameOfSigSlot );
             }
     };
 }
@@ -35,6 +35,7 @@ namespace Nymph
 TEST_CASE( "processor_toolbox" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     //SharedControl::get_instance()->Reset();
 
diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 621e6d7..80c44dd 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -17,6 +17,7 @@
 TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     // need a controller to exist
     CIQThrowController controller;
diff --git a/Testing/Cpp/TestSingleRunController.cc b/Testing/Cpp/TestSingleRunController.cc
index 0883191..479aa35 100644
--- a/Testing/Cpp/TestSingleRunController.cc
+++ b/Testing/Cpp/TestSingleRunController.cc
@@ -17,15 +17,15 @@
 
 LOGGER( testlog, "TestSingleRunController" );
 
-namespace Nymph
+namespace NymphTesting
 {
-    class SRCRevealer : public SingleRunController
+    class SRCRevealer : public Nymph::SingleRunController
     {
         public:
-            using SingleRunController::SingleRunController;
+            using Nymph::SingleRunController::SingleRunController;
 
-            using SingleRunController::ThreadSource;
-            using SingleRunController::ThreadSourceGroupT;
+            using Nymph::SingleRunController::ThreadSource;
+            using Nymph::SingleRunController::ThreadSourceGroupT;
             bool AddProcessorToThreadGroup( const std::string& name, ThreadSourceGroupT& group )
             {
                 return SingleRunController::AddProcessorToThreadGroup( name, group );
@@ -36,6 +36,7 @@ namespace Nymph
 TEST_CASE( "single_run_controller" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     ProcessorToolbox toolbox;
     SRCRevealer controller( toolbox );
diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index dd259cc..0a9bc02 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -13,6 +13,7 @@
 TEST_CASE( "slot_data", "[slot],[data]" )
 {
     using namespace Nymph;
+    using namespace NymphTesting;
 
     // need a controller to exist
     CIQThrowController controller;
@@ -38,10 +39,10 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     REQUIRE( adder.Slots().count("add-no-sig") == 1 );
 
     // get signal and slot pointers and cast
-    SlotData< In<TestData1>, Out<> >* sdAddSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-sig") );
-    SlotData< In<TestData1>, Out<> >* sdAddNoSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-no-sig") );
-    REQUIRE( sdAddSig );
-    REQUIRE( sdAddNoSig );
+    SlotData< In<TestData1>, Out<> >* slotdAddSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-sig") );
+    SlotData< In<TestData1>, Out<> >* slotdAddNoSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-no-sig") );
+    REQUIRE( slotdAddSig );
+    REQUIRE( slotdAddNoSig );
 
     SlotData< In<const TestData1>, Out<TestData2> >* sdMult = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( adder.Slots().at("multiply") );
     REQUIRE( sdMult );
@@ -65,24 +66,24 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     DataHandle handle = std::make_shared< DataFrame >();
 
     // verify that when we call the slot on an empty frame we get an exception
-    REQUIRE_THROWS_AS( (*sdAddSig)( handle ), Exception );
+    REQUIRE_THROWS_AS( (*slotdAddSig)( handle ), Exception );
 
     TestData1& td1 = handle->Get< TestData1 >();
     td1.SetIValue1( 1 );
     td1.SetIValue2( 2 );
 
-    // verify that slots can be called, n this case with an input and no output
+    // verify that slots can be called, in this case with an input and no output
     // verify that slots work whether or not signals are automatically called
     // call the add slot functions and verify operation
-    REQUIRE_NOTHROW( (*sdAddSig)( handle ) );
+    REQUIRE_NOTHROW( (*slotdAddSig)( handle ) ); // this adds the adder.fAddValue (i.e. 5) to 1 and 2, respectively
     REQUIRE( td1.GetIValue1() == 6 );
     REQUIRE( td1.GetIValue2() == 7 );
 
-    REQUIRE_NOTHROW( (*sdAddNoSig)( handle ) );
-    REQUIRE( td1.GetIValue1() == 11 );
+    REQUIRE_NOTHROW( (*slotdAddNoSig)( handle ) ); // this adds the adder.fAddValue to 6 and 7, respectively
+    REQUIRE( td1.GetIValue1() == 11 ); // and IValue2 would be 12
 
     // call the IToD slot function and verify operation
-    REQUIRE_NOTHROW( (*sdIToD)( handle ) );
+    REQUIRE_NOTHROW( (*sdIToD)( handle ) ); // this adds TestData2 to the frame and sets the integer values in its double variables
     REQUIRE( handle->Has< TestData2 >() );
     TestData2& td2 = handle->Get< TestData2 >();
     REQUIRE( td2.GetDValue1() == Approx(11.) );
@@ -100,10 +101,10 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     // connect signal "add" to slot "i-to-d"
     REQUIRE_NOTHROW( adder.ConnectSignalToSlot( sigdAdd, sdIToD ) );
     // remove TestData2
-    handle->Remove< TestData2 >();
+    handle->Remove< TestData2 >();  // we'll start fresh without a TestData2
     REQUIRE_FALSE( handle->Has< TestData2 >() );
     // call the add-sig slot and verify that the i-to-d slot gets called via the signal
-    REQUIRE_NOTHROW( (*sdAddSig)( handle ) );
+    REQUIRE_NOTHROW( (*slotdAddSig)( handle ) ); //add slot executes, adding 5 to 11, then triggers the i-to-d slot via the add signal, making TestData2 with fDValue2 = 16
     REQUIRE( handle->Has< TestData2 >() );
     REQUIRE( td1.GetIValue1() == 16 );
     REQUIRE( td2.GetDValue1() == Approx(16.) );
@@ -113,7 +114,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     handle->Remove< TestData2 >();
     REQUIRE_FALSE( handle->Has< TestData2 >() );
     // call the mult slot and verify that it worked
-    REQUIRE_NOTHROW( (*sdMult)( handle ) );
+    REQUIRE_NOTHROW( (*sdMult)( handle ) ); // for TestData1::fIValue1, multiplies 16 by 2.5 and stores in TestData2::fDValue1
     REQUIRE( td2.GetDValue1() == Approx(40.) );
 }
 

From d2d3fd6917de1c1a62de5be1c1812a8547e804ad Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Tue, 14 Jun 2022 23:46:27 -0400
Subject: [PATCH 398/521] Add NymphTesting pybind build

---
 Testing/CMakeLists.txt                        | 34 +++----------------
 Testing/Python/Bindings/CMakeLists.txt        | 34 +++++++++++++++++++
 Testing/Python/Bindings/NymphTestingPybind.cc | 18 ++++++++++
 3 files changed, 56 insertions(+), 30 deletions(-)
 create mode 100644 Testing/Python/Bindings/CMakeLists.txt
 create mode 100644 Testing/Python/Bindings/NymphTestingPybind.cc

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index dd3bfcc..f4434f1 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -43,15 +43,6 @@ pbuilder_component_install_and_export(
 
 pbuilder_install_headers( ${testing_lib_HEADERS} )
 
-
-#set (pytesting_HEADERS
-#  
-#)
-
-#set (pytesting_SOURCES
-#
-#)
-
 set( testing_SOURCES
     ${CPP_DIR}/TestConfigException.cc
     ${CPP_DIR}/TestControlAccess.cc
@@ -106,26 +97,9 @@ pbuilder_component_install_and_export(
 #catch_discover_tests(foo)
 
 ############################
-# NymphPyTesting library 
-############################
-
-#pbuilder_library( 
-#    TARGET NymphPyTesting
-#    SOURCES ${pytesting_SOURCES}
-#    PROJECT_LIBRARIES ${lib_dependencies}
-#)
-
-#pbuilder_component_install_and_export( 
-#    COMPONENT Testing
-#    LIBTARGETS NymphPyTesting
-#)
-
-#pbuilder_install_headers( ${pytesting_HEADERS} )
-
-############################
-# Executables
+# NymphTesting Python library 
 ############################
 
-#set( lib_dependencies
-#    NymphPyTesting
-#)
+if( Nymph_ENABLE_PYTHON )
+    add_subdirectory( Python/Bindings )
+endif()
diff --git a/Testing/Python/Bindings/CMakeLists.txt b/Testing/Python/Bindings/CMakeLists.txt
new file mode 100644
index 0000000..ef656e7
--- /dev/null
+++ b/Testing/Python/Bindings/CMakeLists.txt
@@ -0,0 +1,34 @@
+# CMakeLists.txt file for Nymph/Testing/Python/Bindings
+# Author: N.S. Oblath
+# Created on: Jun 14, 2022
+
+message( "Building Python bindings for NymphTesting")
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+# Python binding headers
+set( TESTING_PYBINDING_HEADERFILES
+)
+
+# Python bindings
+set( PYBINDING_SOURCEFILES
+    NymphTestingPybind.cc
+)
+
+set( PROJECT_LIBRARIES Nymph NymphTesting )
+
+pbuilder_add_pybind11_module( _nymph_testing ${PROJECT_LIBRARIES} )
+
+# Currently there are no headers
+#pbuilder_install_headers( ${TESTING_PYBINDING_HEADERFILES} )
+
+# This is done in the main Nymph pybinding
+#if( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
+#    message( STATUS "Installing add_lib_python_path.sh since python modules will not be installed in the site-package directory" )
+#    configure_file( add_lib_python_path.sh.in add_lib_python_path.sh @ONLY)
+#    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/add_lib_python_path.sh DESTINATION ${BIN_INSTALL_DIR} )
+#endif( NOT DEFINED PBUILDER_PY_INSTALL_IN_SITELIB )
+
+message( "Done with Testing Python bindings" )
diff --git a/Testing/Python/Bindings/NymphTestingPybind.cc b/Testing/Python/Bindings/NymphTestingPybind.cc
new file mode 100644
index 0000000..e2feffc
--- /dev/null
+++ b/Testing/Python/Bindings/NymphTestingPybind.cc
@@ -0,0 +1,18 @@
+/*
+ * NymphTestingPybind.cc
+ *
+ *  Created on: Jun 14, 2022
+ *      Author: N.S. Oblath
+ */
+
+#include <pybind11/pybind11.h>
+
+
+namespace py = pybind11;
+
+
+PYBIND11_MODULE(_nymph_testing, nymphTestingPackage) {
+
+    nymphTestingPackage.doc() = "Nymph Testing package";
+
+}

From 61ab2edc2df1554dd08ec1380b325c777bb3c1a1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 00:28:14 -0400
Subject: [PATCH 399/521] Add ProcessorToolbox::HasProcessor() and
 ProcessorToolbox::CouldBuild()

---
 Cpp/Library/Processor/ProcessorToolbox.hh         | 15 +++++++++++++++
 .../Bindings/Processor/ProcessorToolboxPybind.hh  |  2 ++
 Testing/Cpp/TestProcessorToolbox.cc               | 11 +++++++++++
 Testing/Python/Bindings/NymphTestingPybind.cc     |  3 ++-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
index e441f7e..c51283c 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.hh
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -102,6 +102,11 @@ namespace Nymph
             bool AddProcessor( const std::string& procName, std::shared_ptr< Processor > proc );
             bool AddProcessor( const std::string& procType, const std::string& procName );
 
+            /// Check whether a processor already has a processor with a given name
+            bool HasProcessor( const std::string& procName ) const;
+            /// Check whether a processor could build a processor of a given type (i.e. does the factory know about this processor?)
+            bool CouldBuild( const std::string& procType ) const;
+
             /// Remove a processor from the toolbox
             bool RemoveProcessor( const std::string& procName );
 
@@ -152,6 +157,16 @@ namespace Nymph
 
     };
 
+    inline bool ProcessorToolbox::HasProcessor( const std::string& procName ) const
+    {
+        return fProcMap.count( procName ) == 1;
+    }
+
+    inline bool ProcessorToolbox::CouldBuild( const std::string& procType ) const
+    {
+        return fProcFactory->has_class( procType );
+    }
+
     inline bool ProcessorToolbox::MakeConnection(const std::string& signal, const std::string& slot) 
     {
         return MakeConnection(signal, slot, std::numeric_limits< int >::min());
diff --git a/Python/Bindings/Processor/ProcessorToolboxPybind.hh b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
index b00ef50..ee27a0b 100644
--- a/Python/Bindings/Processor/ProcessorToolboxPybind.hh
+++ b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
@@ -30,6 +30,8 @@ namespace NymphPybind
                 .def( "get_processor_const", py::overload_cast< const std::string& >(&Nymph::ProcessorToolbox::GetProcessor, py::const_ ) )
                 .def( "add_processor", py::overload_cast< const std::string&, std::shared_ptr<Nymph::Processor> >(&Nymph::ProcessorToolbox::AddProcessor) )
                 .def( "add_processor", py::overload_cast< const std::string&, const std::string& >(&Nymph::ProcessorToolbox::AddProcessor) )
+                .def( "has_processor", &Nymph::ProcessorToolbox::HasProcessor )
+                .def( "could_build", &Nymph::ProcessorToolbox::CouldBuild )
                 .def( "remove_processor", &Nymph::ProcessorToolbox::RemoveProcessor )
                 .def( "release_processor", &Nymph::ProcessorToolbox::ReleaseProcessor )
                 .def( "clear_processors", &Nymph::ProcessorToolbox::ClearProcessors )
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
index 36d8ea7..b735dc3 100644
--- a/Testing/Cpp/TestProcessorToolbox.cc
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -48,6 +48,14 @@ TEST_CASE( "processor_toolbox" )
         std::string procName1( "testproc-1" );
         std::string procName2( "testproc-2" );
 
+        REQUIRE( toolbox.CouldBuild( "test-proc" ) );
+        REQUIRE( toolbox.CouldBuild( "test-primary" ) );
+        REQUIRE_FALSE( toolbox.CouldBuild( procName1 ) );
+        REQUIRE_FALSE( toolbox.CouldBuild( procName2 ) );
+
+        REQUIRE_FALSE( toolbox.HasProcessor( procName1 ) );
+        REQUIRE_FALSE( toolbox.HasProcessor( procName2 ) );
+
         REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
         REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
 
@@ -81,6 +89,9 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE( toolbox.AddProcessor(  "test-proc", procName2 ) );
         REQUIRE( toolbox.GetProcessor( procName2 ) );
 
+        REQUIRE( toolbox.HasProcessor( procName1 ) );
+        REQUIRE( toolbox.HasProcessor( procName2 ) );
+
         REQUIRE( toolbox.RemoveProcessor( procName1 ) );
         REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
         REQUIRE( toolbox.GetProcessor( procName2 ) );
diff --git a/Testing/Python/Bindings/NymphTestingPybind.cc b/Testing/Python/Bindings/NymphTestingPybind.cc
index e2feffc..3a7400e 100644
--- a/Testing/Python/Bindings/NymphTestingPybind.cc
+++ b/Testing/Python/Bindings/NymphTestingPybind.cc
@@ -11,7 +11,8 @@
 namespace py = pybind11;
 
 
-PYBIND11_MODULE(_nymph_testing, nymphTestingPackage) {
+PYBIND11_MODULE(_nymph_testing, nymphTestingPackage) 
+{
 
     nymphTestingPackage.doc() = "Nymph Testing package";
 

From c63f20c5401b8ca115b2916474f5f12d6b2eba09 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 00:49:14 -0400
Subject: [PATCH 400/521] Added a default value for the constructor/init
 argument for ProcessorToolbox

---
 Python/Bindings/Processor/ProcessorToolboxPybind.hh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/ProcessorToolboxPybind.hh b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
index ee27a0b..d85974e 100644
--- a/Python/Bindings/Processor/ProcessorToolboxPybind.hh
+++ b/Python/Bindings/Processor/ProcessorToolboxPybind.hh
@@ -13,16 +13,19 @@
 #include "Processor.hh"
 
 #include <pybind11/pybind11.h>
+#include <pybind11/cast.h>
+
 #include <memory>
 
 namespace py = pybind11;
+using namespace py::literals;
 
 namespace NymphPybind
 {
     void ExportProcessorToolbox( py::module_& nymphProcessor )
     {
         py::class_< Nymph::ProcessorToolbox >( nymphProcessor, "ProcessorToolbox" )
-                .def( py::init<const std::string& >() )
+                .def( py::init<const std::string& >(), "name"_a="processor-toolbox" )
                 .def( "configure", &Nymph::ProcessorToolbox::Configure )
                 
                 .def( "configure_processors", &Nymph::ProcessorToolbox::ConfigureProcessors )

From 122f035b41d0ca012b2340e311cbdac04bad23e6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 00:49:36 -0400
Subject: [PATCH 401/521] Added a test program for the python interface of
 ProcessorToolbox

---
 Testing/Python/testprocessortoolbox.py | 31 ++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Testing/Python/testprocessortoolbox.py

diff --git a/Testing/Python/testprocessortoolbox.py b/Testing/Python/testprocessortoolbox.py
new file mode 100644
index 0000000..2e306c2
--- /dev/null
+++ b/Testing/Python/testprocessortoolbox.py
@@ -0,0 +1,31 @@
+
+"""
+  testprocessortoolbox.py
+ 
+   Created on: Jun 14, 2022
+       Author: N.S. Oblath
+"""
+import unittest
+
+import _nymph, _nymph_testing
+
+
+class TestDataMethods(unittest.TestCase):
+    tb = _nymph.processor.ProcessorToolbox()
+
+    procName1 = 'testproc-1'  # not a registered processor
+    procName2 = 'testproc-2'  # not a registered processor
+    procName3 = 'test-proc'   # a registered processor
+
+    '''Testing Processor handling'''
+    def test_add_remove_processors(self):
+        self.assertFalse( self.tb.has_processor( self.procName1 ) )
+        self.assertFalse( self.tb.has_processor( self.procName2 ) )
+        self.assertFalse( self.tb.has_processor( self.procName3 ) )
+        self.assertFalse( self.tb.could_build( self.procName1 ) )
+        self.assertFalse( self.tb.could_build( self.procName2 ) )
+        self.assertTrue( self.tb.could_build( self.procName3 ) )
+    
+
+if __name__ == '__main__':
+    unittest.main()

From b0569a8f6779fc057f1656010393b669277bdba6 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 08:45:30 -0400
Subject: [PATCH 402/521] Remove unnecessary comments

---
 Python/Bindings/Processor/ProcessorPybind.hh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index b98d4a8..9f34ed3 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -48,12 +48,6 @@ namespace NymphPybind
                 .def("register_slot", &Nymph::Processor::RegisterSlot)
                 .def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
                 .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
-                //.def_property_readonly("name", &Nymph::Processor::Name);
-        
-        //unfortunately this has to go into library code
-        //for some reason the factory in the wrapped get_processor function above 
-        //cannot find the test-proc when it is registered after the library was compiled
-        //REGISTER_PROCESSOR(Nymph, TestProc, "test-proc");
     }
 
 }

From 279b4ff2a077fb86d789d3c1265f1f55416edcd0 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 09:57:42 -0400
Subject: [PATCH 403/521] Turn on the BUILD_TESTING flag for the Python build,
 and do a verbose build

---
 .github/workflows/build.yaml | 5 ++++-
 setup.py                     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 488049a..b0bdeaf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -109,6 +109,9 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
+    env:
+      Nymph_ENABLE_PYTHON: ON
+
     strategy:
       fail-fast: false
       matrix:
@@ -153,7 +156,7 @@ jobs:
           
       - name: Install nymph
         run: |
-          pip install .
+          pip -v install .
           
       - name: Run Tests
         run: |
diff --git a/setup.py b/setup.py
index dcddca6..65feed9 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@ def build_extension(self, ext):
                       '-DPYTHON_EXECUTABLE=' + sys.executable,
                       #'-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
                       '-DNymph_ENABLE_PYTHON:bool=1',
+                      '-DNymph_ENABLE_TESTING:bool=1'
                      ]
 
         cfg = 'Debug' if self.debug else 'Release'

From 880af0f1fcfb23c8f49e3103ecf1a312010c6202 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 10:00:28 -0400
Subject: [PATCH 404/521] Use make_unique instead of just creating a new
 unique_ptr

---
 Python/Bindings/Processor/ProcessorRegistrar.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/ProcessorRegistrar.hh b/Python/Bindings/Processor/ProcessorRegistrar.hh
index 3aef564..dee03e0 100644
--- a/Python/Bindings/Processor/ProcessorRegistrar.hh
+++ b/Python/Bindings/Processor/ProcessorRegistrar.hh
@@ -65,7 +65,7 @@ namespace Nymph
 
     std::unique_ptr<PyProcRegistrar> RegisterPyProcessor( const std::string& module, const std::string& type, const std::string& typeName )
     {
-        return std::unique_ptr<PyProcRegistrar>( new PyProcRegistrar( module, type, typeName ) );
+        return std::make_unique<PyProcRegistrar>( module, type, typeName );
     }
 
     std::shared_ptr< Nymph::Processor > CreatePyProcessor( const std::string& typeName, const std::string& name )

From fe0ee687d290bd64b51669a48ff3d9c5d0317eae Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 10:22:54 -0400
Subject: [PATCH 405/521] Add basic binding for Slot

---
 Python/Bindings/CMakeLists.txt          |  2 +
 Python/Bindings/NymphPybind.cc          |  2 +
 Python/Bindings/Processor/SlotPybind.hh | 57 +++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 Python/Bindings/Processor/SlotPybind.hh

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 750528c..c5aaebd 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -15,6 +15,8 @@ include_directories( BEFORE
 set( PYBINDING_HEADERFILES
     Data/DataPybind.hh
     Processor/ProcessorPybind.hh
+    Processor/SignalPybind.hh
+    Processor/SlotPybind.hh
 )
 
 # Python bindings
diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 56e5710..3b57dcf 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -9,6 +9,7 @@
 
 #include "Processor/ProcessorPybind.hh"
 #include "Processor/SignalPybind.hh"
+#include "Processor/SlotPybind.hh"
 #include "Data/DataPybind.hh"
 
 #include "DataFrame.hh"
@@ -26,6 +27,7 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
+    NymphPybind::ExportSlot(nymphProcessor);
     NymphPybind::ExportSignal<Nymph::DataHandle>(nymphProcessor, "Data");
     auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
new file mode 100644
index 0000000..5556e7e
--- /dev/null
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -0,0 +1,57 @@
+/*
+ * SlotPybind.hh
+ *
+ *  Created on: Jun 15, 2022
+ *      Author: F. Thomas
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_SLOTPYBIND_HH_
+#define PYTHON_BINDINGS_PROCESSOR_SLOTPYBIND_HH_
+
+#include <pybind11/pybind11.h>
+#include <memory>
+
+#include "SignalSlotBase.hh"
+#include "Processor.hh"
+
+namespace py = pybind11;
+
+namespace NymphPybind
+{
+    
+    void ExportSlot( py::module_& nymphProcessor)
+    {
+
+       py::class_< Nymph::SlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
+                .def(py::init<const std::string& >())
+                .def(py::init<const std::string&,  Nymph::Processor* >())
+                .def("connect_to", &Nymph::SlotBase::ConnectTo)
+                .def("disconnect", &Nymph::SlotBase::Disconnect)
+                .def("disconnect_all", &Nymph::SlotBase::DisconnectAll)
+                .def_property("connections", static_cast< std::set< Nymph::SignalBase* >& (Nymph::SlotBase::*)() const>(&Nymph::SlotBase::Connections),
+                                            [](Nymph::SlotBase& slot, const std::set< Nymph::SignalBase* >& signals){slot.Connections() = signals;} )
+                .def_property("name", static_cast< const std::string& (Nymph::SlotBase::*)() const>(&Nymph::SlotBase::Name),
+                                      [](Nymph::SlotBase& slot, const std::string& name){slot.Name() = name;} );
+                
+                
+                        //~ public:
+
+            //~ virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
+
+            //~ void Disconnect( SignalBase* signal);
+            //~ void DisconnectAll();
+
+            //~ typedef std::set< SignalBase* > SignalConnections; // to get around the problem of having a comma inside a macro function argument
+            //~ MEMVAR_REF_MUTABLE( SignalConnections, Connections );
+
+
+        //~ protected:
+            //~ friend class SignalBase;
+            //~ virtual void AddConnection( SignalBase* signal );
+        
+    }
+
+}
+
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_SLOTPYBIND_HH_ */

From e5ac3b583805d125e5ccb78f1ac1203ef3dff5b2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 10:40:26 -0400
Subject: [PATCH 406/521] Updated scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 0e1679e..671027d 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 0e1679e0567a98dc6bf213aacaf171b899934afd
+Subproject commit 671027d75d5d78c454c4569598e14e0875b29ef5

From 646beceb4214802d2e8eb3fc9e2f7f16d3ed4546 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 10:40:52 -0400
Subject: [PATCH 407/521] Use new setup for the pybind11 pbuilder function

---
 Python/Bindings/CMakeLists.txt         |  6 +++++-
 Testing/Python/Bindings/CMakeLists.txt | 11 +++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 684286a..f28bf95 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -25,7 +25,11 @@ set( PYBINDING_SOURCEFILES
 
 set( PROJECT_LIBRARIES Nymph )
 
-pbuilder_add_pybind11_module( _nymph ${PROJECT_LIBRARIES} )
+pbuilder_add_pybind11_module( 
+    MODULE_NAME _nymph 
+    SOURCE_FILES ${PYBINDING_SOURCEFILES}
+    PROJECT_LIBRARIES ${PROJECT_LIBRARIES} 
+)
 
 pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 
diff --git a/Testing/Python/Bindings/CMakeLists.txt b/Testing/Python/Bindings/CMakeLists.txt
index ef656e7..7669bb8 100644
--- a/Testing/Python/Bindings/CMakeLists.txt
+++ b/Testing/Python/Bindings/CMakeLists.txt
@@ -17,9 +17,16 @@ set( PYBINDING_SOURCEFILES
     NymphTestingPybind.cc
 )
 
-set( PROJECT_LIBRARIES Nymph NymphTesting )
+set( PROJECT_LIBRARIES 
+    Nymph 
+    NymphTesting 
+)
 
-pbuilder_add_pybind11_module( _nymph_testing ${PROJECT_LIBRARIES} )
+pbuilder_add_pybind11_module( 
+    MODULE_NAME _nymph_testing 
+    SOURCEFILES ${PYBINDING_SOURCEFILES}
+    PROJECT_LIBRARIES ${PROJECT_LIBRARIES} 
+)
 
 # Currently there are no headers
 #pbuilder_install_headers( ${TESTING_PYBINDING_HEADERFILES} )

From ed207ff3fdf4403839c731b99e4aa70b693c93e1 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 11:07:47 -0400
Subject: [PATCH 408/521] Remove function from Slot binding code

---
 Python/Bindings/Processor/SlotPybind.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index 5556e7e..18113da 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -24,7 +24,7 @@ namespace NymphPybind
 
        py::class_< Nymph::SlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
                 .def(py::init<const std::string& >())
-                .def(py::init<const std::string&,  Nymph::Processor* >())
+                //.def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("connect_to", &Nymph::SlotBase::ConnectTo)
                 .def("disconnect", &Nymph::SlotBase::Disconnect)
                 .def("disconnect_all", &Nymph::SlotBase::DisconnectAll)

From 7c356ba5ccb78e4528886683a233ad7f079d4f65 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 11:08:50 -0400
Subject: [PATCH 409/521] Add trampoline for slot binding

---
 Python/Bindings/Processor/SlotPybind.hh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index 18113da..7680957 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -19,10 +19,28 @@ namespace py = pybind11;
 namespace NymphPybind
 {
     
+    //trampoline class
+    class PySlotBase : public Nymph::SlotBase {
+        public:
+            /* Inherit the constructors */
+            using Nymph::SlotBase::SlotBase;
+
+            /* Trampoline (need one for each virtual function) */
+            void ConnectTo( Nymph::SignalBase* signal, int group = -1 ) override {
+                PYBIND11_OVERRIDE_PURE(
+                    void, /* Return type */
+                    SlotBase,      /* Parent class */
+                    ConnectTo,          /* Name of function in C++ (must match Python name) */
+                    signal,
+                    group/* Argument(s) */
+                );
+            }
+    };
+    
     void ExportSlot( py::module_& nymphProcessor)
     {
 
-       py::class_< Nymph::SlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
+       py::class_< Nymph::SlotBase, PySlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
                 .def(py::init<const std::string& >())
                 //.def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("connect_to", &Nymph::SlotBase::ConnectTo)

From 2e56e4acc2b0cad87b6087c5bc4cb63537cc8c84 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 11:09:28 -0400
Subject: [PATCH 410/521] Modify NymphPybind for better readability

---
 Python/Bindings/NymphPybind.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 3b57dcf..7bd8934 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -22,12 +22,16 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     nymphPackage.doc() = "Nymph package";
 
     auto nymphControl = nymphPackage.def_submodule("control", "Control module");
+    
     auto nymphData = nymphPackage.def_submodule("data", "Data module");
     NymphPybind::ExportData(nymphData);
+    
     auto nymphImplementation = nymphPackage.def_submodule("implementation", "Implementation module");
+    
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
     NymphPybind::ExportSlot(nymphProcessor);
     NymphPybind::ExportSignal<Nymph::DataHandle>(nymphProcessor, "Data");
+    
     auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }

From d706638c598858f9818767886af5b5223c5f1131 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 15:08:27 -0400
Subject: [PATCH 411/521] Update scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 671027d..6d6e6fd 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 671027d75d5d78c454c4569598e14e0875b29ef5
+Subproject commit 6d6e6fdfd322e5b4c6bcb316a99f70405308f8ac

From 74caffd48af8d0859b5923bbca7b2cb064ad1416 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 15:08:49 -0400
Subject: [PATCH 412/521] Finish fixing the pybind11 build using the new cmake
 function

---
 Python/Bindings/CMakeLists.txt         | 4 ++--
 Testing/Python/Bindings/CMakeLists.txt | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 138aaec..27e823b 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -25,12 +25,12 @@ set( PYBINDING_SOURCEFILES
     NymphPybind.cc
 )
 
-set( PROJECT_LIBRARIES Nymph )
+set( PYBINDING_PROJECT_LIBRARIES Nymph )
 
 pbuilder_add_pybind11_module( 
     MODULE_NAME _nymph 
     SOURCE_FILES ${PYBINDING_SOURCEFILES}
-    PROJECT_LIBRARIES ${PROJECT_LIBRARIES} 
+    PROJECT_LIBRARIES ${PYBINDING_PROJECT_LIBRARIES} 
 )
 
 pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
diff --git a/Testing/Python/Bindings/CMakeLists.txt b/Testing/Python/Bindings/CMakeLists.txt
index 7669bb8..9917ac6 100644
--- a/Testing/Python/Bindings/CMakeLists.txt
+++ b/Testing/Python/Bindings/CMakeLists.txt
@@ -17,15 +17,15 @@ set( PYBINDING_SOURCEFILES
     NymphTestingPybind.cc
 )
 
-set( PROJECT_LIBRARIES 
+set( PYBINDING_PROJECT_LIBRARIES 
     Nymph 
     NymphTesting 
 )
 
 pbuilder_add_pybind11_module( 
-    MODULE_NAME _nymph_testing 
-    SOURCEFILES ${PYBINDING_SOURCEFILES}
-    PROJECT_LIBRARIES ${PROJECT_LIBRARIES} 
+    MODULE_NAME _nymph_testing
+    SOURCE_FILES ${PYBINDING_SOURCEFILES}
+    PROJECT_LIBRARIES ${PYBINDING_PROJECT_LIBRARIES} 
 )
 
 # Currently there are no headers

From f08e6abe8dd4f68d329706c530e62eb13d6aca75 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 16:04:50 -0400
Subject: [PATCH 413/521] Add function MatchesTo to SlotBase which checks if a
 signal matches to the slot

---
 Cpp/Library/Processor/Signal.hh         | 2 +-
 Cpp/Library/Processor/SignalSlotBase.hh | 1 +
 Cpp/Library/Processor/Slot.hh           | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Cpp/Library/Processor/Signal.hh b/Cpp/Library/Processor/Signal.hh
index 10b5a38..ed6170b 100644
--- a/Cpp/Library/Processor/Signal.hh
+++ b/Cpp/Library/Processor/Signal.hh
@@ -142,7 +142,7 @@ namespace Nymph
         }
 
         // ensure that the slot is of the correct type
-        if( ! dynamic_cast< Slot< XArgs... >* >( slot ) )
+        if( ! slot->MatchesTo( this ) )
         {
             THROW_EXCEPT_HERE( ConnectionException() << "Trying to connect signal <" << fName << "> to slot <" << slot->Name() << ">, but cannot make the connection:\n" <<
                     "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
diff --git a/Cpp/Library/Processor/SignalSlotBase.hh b/Cpp/Library/Processor/SignalSlotBase.hh
index 3f5d01c..bd50adf 100644
--- a/Cpp/Library/Processor/SignalSlotBase.hh
+++ b/Cpp/Library/Processor/SignalSlotBase.hh
@@ -60,6 +60,7 @@ namespace Nymph
             virtual ~SlotBase();
 
             virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
+            virtual bool MatchesTo( SignalBase* signal) = 0;
 
             void Disconnect( SignalBase* signal);
             void DisconnectAll();
diff --git a/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
index e381f8c..5969e5d 100644
--- a/Cpp/Library/Processor/Slot.hh
+++ b/Cpp/Library/Processor/Slot.hh
@@ -61,7 +61,8 @@ namespace Nymph
             Slot( Slot&& ) = delete;
             virtual ~Slot();
 
-            void ConnectTo( SignalBase* signal, int group = -1 );
+            void ConnectTo( SignalBase* signal, int group = -1 ) override;
+            bool MatchesTo( SignalBase* signal) override;
 
             /// execute fFunction
             void operator()( XArgs... args );
@@ -199,6 +200,12 @@ namespace Nymph
 
         return;
     }
+    
+    template< typename... XArgs >
+    bool Slot< XArgs... >::MatchesTo( SignalBase* signal )
+    {
+        return dynamic_cast< Signal< XArgs... >* >( signal ); 
+    }
 
     template< typename... XArgs >
     inline void Slot< XArgs... >::operator()( XArgs... args )

From d3319602cf6abe2fd9b6543a29852d9b0b5de47c Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 16:07:43 -0400
Subject: [PATCH 414/521] Add MatchesTo override to python binding

---
 Python/Bindings/Processor/SlotPybind.hh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index 7680957..47dbed1 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -35,6 +35,16 @@ namespace NymphPybind
                     group/* Argument(s) */
                 );
             }
+            
+            /* Trampoline (need one for each virtual function) */
+            bool MatchesTo( Nymph::SignalBase* signal ) override {
+                PYBIND11_OVERRIDE_PURE(
+                    bool, /* Return type */
+                    SlotBase,      /* Parent class */
+                    MatchesTo,          /* Name of function in C++ (must match Python name) */
+                    signal/* Argument(s) */
+                );
+            }
     };
     
     void ExportSlot( py::module_& nymphProcessor)
@@ -44,6 +54,7 @@ namespace NymphPybind
                 .def(py::init<const std::string& >())
                 //.def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("connect_to", &Nymph::SlotBase::ConnectTo)
+                .def("MatchesTo", &Nymph::SlotBase::MatchesTo)
                 .def("disconnect", &Nymph::SlotBase::Disconnect)
                 .def("disconnect_all", &Nymph::SlotBase::DisconnectAll)
                 .def_property("connections", static_cast< std::set< Nymph::SignalBase* >& (Nymph::SlotBase::*)() const>(&Nymph::SlotBase::Connections),

From 7b0f4c39b35b3be8f37e61ec6121bac01f8b7b04 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:08:09 -0400
Subject: [PATCH 415/521] Update scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 6d6e6fd..9d8577c 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 6d6e6fdfd322e5b4c6bcb316a99f70405308f8ac
+Subproject commit 9d8577c17766fe56898a8135c5c48fff95a5b501

From 656814a514c49bcfde52b96eeccd097e192d9e03 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:10:02 -0400
Subject: [PATCH 416/521] Adding binding helper macros

---
 Python/Bindings/NymphBindingHelpers.hh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 Python/Bindings/NymphBindingHelpers.hh

diff --git a/Python/Bindings/NymphBindingHelpers.hh b/Python/Bindings/NymphBindingHelpers.hh
new file mode 100644
index 0000000..5d47ffe
--- /dev/null
+++ b/Python/Bindings/NymphBindingHelpers.hh
@@ -0,0 +1,15 @@
+#ifndef NYMPH_PYBIND_BINDING_HELPERS
+#define NYMPH_PYBIND_BINDING_HELPERS
+
+#include "pybind11/iostream.h"
+
+#define NYMPH_BIND_CALL_GUARD_STREAMS \
+    pybind11::call_guard< pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect >()
+
+#define NYMPH_BIND_CALL_GUARD_GIL \
+    pybind11::call_guard< pybind11::gil_scoped_release >()
+
+#define NYMPH_BIND_CALL_GUARD_STREAMS_AND_GIL \
+    pybind11::call_guard< pybind11::scoped_ostream_redirect, pybind11::scoped_estream_redirect, pybind11::gil_scoped_release >()
+
+#endif /* NYMPH_PYBIND_BINDING_HELPERS */

From b93ced24f1ece341e13888519781b4ea1c05ddde Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:24:07 -0400
Subject: [PATCH 417/521] Adding stream redirects (and removing a debug print
 line)

---
 Python/Bindings/Processor/ProcessorPybind.hh     | 15 ++++++++-------
 Python/Bindings/Processor/ProcessorRegistrar.hh  |  1 -
 Python/Bindings/Processor/PyProcCreatorPybind.hh |  3 ++-
 Python/Bindings/Processor/SignalPybind.hh        |  6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 9f34ed3..8b3917d 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -11,8 +11,9 @@
 #include <pybind11/pybind11.h>
 #include <memory>
 
+#include "NymphBindingHelpers.hh"
 #include "Processor.hh"
-//#include "TestProcessorClasses.hh"
+
 #include "factory.hh"
 
 namespace py = pybind11;
@@ -40,12 +41,12 @@ namespace NymphPybind
     {
         py::class_< Nymph::Processor, PyProcessor, std::shared_ptr<Nymph::Processor> >(nymphProcessor, "_Processor")
                 .def(py::init<const std::string& >())
-                .def("configure", &Nymph::Processor::Configure)
-                .def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
-                .def("connect_a_slot", &Nymph::Processor::ConnectASlot)
-                .def("connect_a_signal", &Nymph::Processor::ConnectASignal)
-                .def("register_signal", &Nymph::Processor::RegisterSignal)
-                .def("register_slot", &Nymph::Processor::RegisterSlot)
+                .def("configure", &Nymph::Processor::Configure, NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot, NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("connect_a_slot", &Nymph::Processor::ConnectASlot, NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("connect_a_signal", &Nymph::Processor::ConnectASignal, NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("register_signal", &Nymph::Processor::RegisterSignal, NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("register_slot", &Nymph::Processor::RegisterSlot, NYMPH_BIND_CALL_GUARD_STREAMS)
                 .def("get_do_breakpoint", &Nymph::Processor::GetDoBreakpoint)
                 .def("set_do_breakpoint", &Nymph::Processor::SetDoBreakpoint);
     }
diff --git a/Python/Bindings/Processor/ProcessorRegistrar.hh b/Python/Bindings/Processor/ProcessorRegistrar.hh
index dee03e0..1bf113b 100644
--- a/Python/Bindings/Processor/ProcessorRegistrar.hh
+++ b/Python/Bindings/Processor/ProcessorRegistrar.hh
@@ -53,7 +53,6 @@ namespace Nymph
                 if( useModule.empty() ) useModule = "__main__";
                 py::object scope = py::module_::import( useModule.c_str() ).attr( "__dict__" );
                 std::shared_ptr<Nymph::Processor> proc = py::eval( fType + "(\'" + name + "\')", scope ).cast< std::shared_ptr<Nymph::Processor> >();
-                LWARN( prlog_h, "Processor is at: " << proc.get() );
                 return proc;
 
             }
diff --git a/Python/Bindings/Processor/PyProcCreatorPybind.hh b/Python/Bindings/Processor/PyProcCreatorPybind.hh
index f477ef8..b9ea147 100644
--- a/Python/Bindings/Processor/PyProcCreatorPybind.hh
+++ b/Python/Bindings/Processor/PyProcCreatorPybind.hh
@@ -8,6 +8,7 @@
 #ifndef PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
 #define PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
 
+#include "NymphBindingHelpers.hh"
 #include "ProcessorRegistrar.hh"
 
 #include <pybind11/pybind11.h>
@@ -23,7 +24,7 @@ namespace NymphPybind
                 .def(py::init< const std::string&, const std::string&, const std::string& >())
                 .def("create_python_processor", &Nymph::PyProcRegistrar::CreatePyProc);
         
-        nymphProcessor.def("register_py_processor", &Nymph::RegisterPyProcessor);
+        nymphProcessor.def("register_py_processor", &Nymph::RegisterPyProcessor, NYMPH_BIND_CALL_GUARD_STREAMS);
         nymphProcessor.def("create_processor", &Nymph::CreatePyProcessor);
     }
 }
diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index c4963d7..02a4923 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -29,9 +29,9 @@ namespace NymphPybind
        py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
                 .def(py::init<const std::string& >())
                 .def(py::init<const std::string&,  Nymph::Processor* >())
-                .def("emit", &Nymph::Signal< XArgs... >::Emit)
-                .def("__call__", &Nymph::Signal< XArgs... >::operator())
-                .def("connect", &Nymph::Signal< XArgs...>::Connect)
+                .def("emit", &Nymph::Signal< XArgs... >::Emit, NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("__call__", &Nymph::Signal< XArgs... >::operator(), NYMPH_BIND_CALL_GUARD_STREAMS)
+                .def("connect", &Nymph::Signal< XArgs...>::Connect, NYMPH_BIND_CALL_GUARD_STREAMS)
                 .def("disconnect", &Nymph::Signal< XArgs... >::Disconnect)
                 .def("disconnect_all", &Nymph::Signal< XArgs... >::DisconnectAll)
                 .def_property_readonly("connections", static_cast< std::set< Nymph::SlotBase* >& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))

From 865036614c817e6452b9203dc3c51a4736e26e73 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:40:56 -0400
Subject: [PATCH 418/521] Add logic to handle the dry run

---
 Cpp/Library/Implementation/RunNymph.cc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 2e8393b..120de6e 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -35,10 +35,15 @@ namespace Nymph
                 controller.Configure( config["controller"].as_node() );
             }
 
-            LPROG( nlog, "Executing run" );
-
-            // Now execute the run
-            controller.Run();
+            if( config.has( "dry-run" ) && config["dry-run"]().as_bool() )
+            {
+                LPROG( nlog, "Dry run: no execution" );
+            }
+            else
+            {
+                LPROG( nlog, "Executing run" );
+                controller.Run();
+            }
 
             LPROG( nlog, "That's all, folks!" );
 

From 4f1aaf0277e4a8be4bb2adb8beb877068286def6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:41:05 -0400
Subject: [PATCH 419/521] Add the dry-run option

---
 Cpp/Executables/Main/Nymph.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cpp/Executables/Main/Nymph.cc b/Cpp/Executables/Main/Nymph.cc
index 59cfef6..b34219f 100644
--- a/Cpp/Executables/Main/Nymph.cc
+++ b/Cpp/Executables/Main/Nymph.cc
@@ -75,6 +75,9 @@ int main( int argc, char** argv )
 
     the_main.callback( t_callback );
 
+    // options
+    the_main.add_config_flag< bool >( "--dry-run", "dry-run", "Load the config, setup processors, but do not execute the run" );
+
     // Parse CL options and run the application
     CLI11_PARSE( the_main, argc, argv );
 

From eb8df2ea27c1881541245fd76aa5d387f1eff10f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:46:34 -0400
Subject: [PATCH 420/521] Move option adding to a function in RunNymph.hh/cc

---
 Cpp/Executables/Main/Nymph.cc          | 7 ++++---
 Cpp/Library/Implementation/RunNymph.cc | 7 +++++++
 Cpp/Library/Implementation/RunNymph.hh | 3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cpp/Executables/Main/Nymph.cc b/Cpp/Executables/Main/Nymph.cc
index b34219f..ac2b460 100644
--- a/Cpp/Executables/Main/Nymph.cc
+++ b/Cpp/Executables/Main/Nymph.cc
@@ -65,8 +65,12 @@ int main( int argc, char** argv )
 
     // Create the application
     scarab::main_app the_main;
+
     the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
 
+    // add the typical CL options
+    Nymph::AddRunNymphOptions( the_main );
+
     //Runs RunNymph() and sets  the_return based on its return value
     int the_return = -1;
     auto t_callback = [&](){
@@ -75,9 +79,6 @@ int main( int argc, char** argv )
 
     the_main.callback( t_callback );
 
-    // options
-    the_main.add_config_flag< bool >( "--dry-run", "dry-run", "Load the config, setup processors, but do not execute the run" );
-
     // Parse CL options and run the application
     CLI11_PARSE( the_main, argc, argv );
 
diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 120de6e..3521d24 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -8,6 +8,7 @@
 #include "ProcessorToolbox.hh"
 #include "SingleRunController.hh"
 
+#include "application.hh"
 #include "logger.hh"
 #include "param.hh"
 
@@ -62,4 +63,10 @@ namespace Nymph
             return RETURN_ERROR;
         }
     }
+
+    void AddRunNymphOptions( scarab::main_app& an_app )
+    {
+        // options
+        an_app.add_config_flag< bool >( "--dry-run", "dry-run", "Load the config, setup processors, but do not execute the run" );
+    }
 }
diff --git a/Cpp/Library/Implementation/RunNymph.hh b/Cpp/Library/Implementation/RunNymph.hh
index 37ecd6f..aba61f4 100644
--- a/Cpp/Library/Implementation/RunNymph.hh
+++ b/Cpp/Library/Implementation/RunNymph.hh
@@ -10,12 +10,15 @@
 
 namespace scarab
 {
+    class main_app;
     class param_node;
 }
 
 namespace Nymph
 {
     int RunNymph( scarab::param_node& config );
+
+    void AddRunNymphOptions( scarab::main_app& an_app );
 }
 
 

From 95ee112d8938fec00792dba5de1489196febceb5 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 16:52:14 -0400
Subject: [PATCH 421/521] Fix wrong overrides of virtual functions in python
 bindings

---
 Python/Bindings/Processor/ProcessorPybind.hh | 2 +-
 Testing/Python/testprocessor.py              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index 9f34ed3..310158e 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -40,7 +40,7 @@ namespace NymphPybind
     {
         py::class_< Nymph::Processor, PyProcessor, std::shared_ptr<Nymph::Processor> >(nymphProcessor, "_Processor")
                 .def(py::init<const std::string& >())
-                .def("configure", &Nymph::Processor::Configure)
+                .def("Configure", &Nymph::Processor::Configure)
                 .def("connect_signal_to_slot", &Nymph::Processor::ConnectSignalToSlot)
                 .def("connect_a_slot", &Nymph::Processor::ConnectASlot)
                 .def("connect_a_signal", &Nymph::Processor::ConnectASignal)
diff --git a/Testing/Python/testprocessor.py b/Testing/Python/testprocessor.py
index d45fafc..c90e58f 100644
--- a/Testing/Python/testprocessor.py
+++ b/Testing/Python/testprocessor.py
@@ -13,7 +13,7 @@
 
 class TestProcessor(_nymph.processor._Processor):
     
-    def configure(self, param_node):
+    def Configure(self, param_node):
         
         param_dict = param_node.to_python()
         self.x = param_dict['x']

From 9e8334c3767097a09da80f5d4483baea9ebcd41a Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 16:53:19 -0400
Subject: [PATCH 422/521] Fix bindings include dirs

---
 Python/Bindings/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index dbc85b1..1bf6317 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -7,6 +7,7 @@ message( "Building Python bindings")
 set( TEST_DIR Testing/Cpp )
 
 include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/Data
     ${CMAKE_CURRENT_SOURCE_DIR}/Processor
 )

From db8a6342039d631ce12140c1eacb730fb51b8800 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 17:22:24 -0400
Subject: [PATCH 423/521] Update Scarab

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 0e1679e..ba065f6 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 0e1679e0567a98dc6bf213aacaf171b899934afd
+Subproject commit ba065f66706217eaa748d9ddf82dd32bb17e6abe

From ef6e0dce11b067ec9f17b1bf05afd2311630b8b2 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 17:27:00 -0400
Subject: [PATCH 424/521] Add missing bindings for SignalBase

---
 Python/Bindings/NymphPybind.cc            |  3 +-
 Python/Bindings/Processor/SignalPybind.hh | 44 ++++++++++++++++++-----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 56b12b8..33a72fa 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -31,7 +31,8 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
     NymphPybind::ExportPyProcCreator(nymphProcessor);
-    
+    NymphPybind::ExportSignalBase(nymphProcessor);
     NymphPybind::ExportSignal<Nymph::DataHandle>(nymphProcessor, "Data");
+    
     auto nymphUtility = nymphPackage.def_submodule("utility", "Utility module");
 }
diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index c4963d7..ef84b8c 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -21,23 +21,49 @@ namespace py = pybind11;
 namespace NymphPybind
 {
     
+    //trampoline class
+    class PySignalBase : public Nymph::SignalBase {
+        public:
+            /* Inherit the constructors */
+            using Nymph::SignalBase::SignalBase;
+
+            /* Trampoline (need one for each virtual function) */
+            void Connect( Nymph::SlotBase* slot, int group = -1 ) override {
+                PYBIND11_OVERRIDE_PURE(
+                    void, /* Return type */
+                    Nymph::SignalBase,      /* Parent class */
+                    Connect,          /* Name of function in C++ (must match Python name) */
+                    slot,
+                    group/* Argument(s) */
+                );
+            }
+    };
+    
+    void ExportSignalBase( py::module_& nymphProcessor)
+    {
+
+       py::class_< Nymph::SignalBase, PySignalBase, std::shared_ptr<Nymph::SignalBase > >(nymphProcessor, "_SignalBase")
+                .def(py::init<const std::string& >())
+                .def("Connect", &Nymph::SignalBase::Connect)
+                .def("disconnect", &Nymph::SignalBase::Disconnect)
+                .def("disconnect_all", &Nymph::SignalBase::DisconnectAll)
+                .def_property_readonly("connections", static_cast< std::set< Nymph::SlotBase* >& (Nymph::SignalBase::*)() const>(&Nymph::SignalBase::Connections))
+                .def_property("name", static_cast< const std::string& (Nymph::SignalBase::*)() const>(&Nymph::SignalBase::Name),
+                                      [](Nymph::SignalBase& signal, const std::string& name){signal.Name() = name;} )
+                .def_property("do_breakpoint", &Nymph::SignalBase::GetDoBreakpoint, &Nymph::SignalBase::SetDoBreakpoint);
+        
+    }
+    
     template< typename... XArgs >
     void ExportSignal( py::module_& nymphProcessor, const std::string& typestr)
     {
         std::string pyClsName = std::string("_Signal") + typestr;
 
-       py::class_< Nymph::Signal< XArgs... >, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
+       py::class_< Nymph::Signal< XArgs... >, Nymph::SignalBase, std::shared_ptr<Nymph::Signal< XArgs... > > >(nymphProcessor, pyClsName.c_str())
                 .def(py::init<const std::string& >())
                 .def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("emit", &Nymph::Signal< XArgs... >::Emit)
-                .def("__call__", &Nymph::Signal< XArgs... >::operator())
-                .def("connect", &Nymph::Signal< XArgs...>::Connect)
-                .def("disconnect", &Nymph::Signal< XArgs... >::Disconnect)
-                .def("disconnect_all", &Nymph::Signal< XArgs... >::DisconnectAll)
-                .def_property_readonly("connections", static_cast< std::set< Nymph::SlotBase* >& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Connections))
-                .def_property("name", static_cast< const std::string& (Nymph::Signal< XArgs... >::*)() const>(&Nymph::Signal< XArgs... >::Name),
-                                      [](Nymph::Signal< XArgs... >& signal, const std::string& name){signal.Name() = name;} )
-                .def_property("do_breakpoint", &Nymph::Signal< XArgs... >::GetDoBreakpoint, &Nymph::Signal< XArgs... >::SetDoBreakpoint);
+                .def("__call__", &Nymph::Signal< XArgs... >::operator());
         
     }
 

From 772f82f7c7b44150bdc1e81c63b58515af47b359 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 17:31:23 -0400
Subject: [PATCH 425/521] Update how python binding is done to follow what's
 expected in the updated Scarab (this change originated in another branch)

---
 Python/Bindings/CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index dbc85b1..7967dfe 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -24,9 +24,13 @@ set( PYBINDING_SOURCEFILES
     NymphPybind.cc
 )
 
-set( PROJECT_LIBRARIES Nymph )
+set( PYBINDING_PROJECT_LIBRARIES Nymph )
 
-pbuilder_add_pybind11_module( _nymph ${PROJECT_LIBRARIES} )
+pbuilder_add_pybind11_module( 
+    MODULE_NAME _nymph 
+    SOURCE_FILES ${PYBINDING_SOURCEFILES}
+    PROJECT_LIBRARIES ${PYBINDING_PROJECT_LIBRARIES} 
+)
 
 pbuilder_install_headers( ${PYBINDING_HEADERFILES} )
 

From b4bfd18de71359d8d4c3d7ef91a81ba5bf88271e Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 17:35:30 -0400
Subject: [PATCH 426/521] Add missing include

---
 Python/Bindings/Processor/SignalPybind.hh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index 02a4923..663f590 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -11,6 +11,7 @@
 #include <pybind11/pybind11.h>
 #include <memory>
 
+#include "NymphBindingHelpers.hh"
 #include "SignalSlotBase.hh"
 #include "Signal.hh"
 #include "Slot.hh"

From 37179a7f41fd0ee6bd168d133369e09267198fd6 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 17:52:22 -0400
Subject: [PATCH 427/521] Fix wrong funtion name in binding of Slot

---
 Python/Bindings/Processor/SlotPybind.hh | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index 47dbed1..46db7cf 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -52,8 +52,7 @@ namespace NymphPybind
 
        py::class_< Nymph::SlotBase, PySlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
                 .def(py::init<const std::string& >())
-                //.def(py::init<const std::string&,  Nymph::Processor* >())
-                .def("connect_to", &Nymph::SlotBase::ConnectTo)
+                .def("ConnectTo", &Nymph::SlotBase::ConnectTo)
                 .def("MatchesTo", &Nymph::SlotBase::MatchesTo)
                 .def("disconnect", &Nymph::SlotBase::Disconnect)
                 .def("disconnect_all", &Nymph::SlotBase::DisconnectAll)
@@ -62,21 +61,6 @@ namespace NymphPybind
                 .def_property("name", static_cast< const std::string& (Nymph::SlotBase::*)() const>(&Nymph::SlotBase::Name),
                                       [](Nymph::SlotBase& slot, const std::string& name){slot.Name() = name;} );
                 
-                
-                        //~ public:
-
-            //~ virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
-
-            //~ void Disconnect( SignalBase* signal);
-            //~ void DisconnectAll();
-
-            //~ typedef std::set< SignalBase* > SignalConnections; // to get around the problem of having a comma inside a macro function argument
-            //~ MEMVAR_REF_MUTABLE( SignalConnections, Connections );
-
-
-        //~ protected:
-            //~ friend class SignalBase;
-            //~ virtual void AddConnection( SignalBase* signal );
         
     }
 

From 3ec98035ca99719c51b01ac186c9889a5c96a555 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Wed, 15 Jun 2022 18:10:02 -0400
Subject: [PATCH 428/521] Add test for connection of incompatible sig-slot

---
 Testing/Cpp/TestSignalSlot.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 621e6d7..8b5bf0f 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -24,6 +24,7 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
     int testValue = 0;
 
     Signal< int > signal( "signal" );
+    Signal< float > floatSignal( "float-signal" );
     Slot< int > slot( "slot", [&](int aValue ){ testValue = aValue; } );
 
     REQUIRE_FALSE( signal.GetDoBreakpoint() );
@@ -110,7 +111,8 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
 
     SECTION( "connections" )
     {
-        // TODO: connect to an incompatible slot and check exception
+        
+        REQUIRE_NOTHROW( floatSignal.Connect( &slot), ConnectionException );
 
         REQUIRE_NOTHROW( signal.Connect( &slot ) );
 

From d8cb02fca15b8d343bc99197ccd9e70402f82223 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 20:10:36 -0400
Subject: [PATCH 429/521] Put scarab back on the commit it's on in the workshop
 branch

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 0e1679e..ba065f6 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 0e1679e0567a98dc6bf213aacaf171b899934afd
+Subproject commit ba065f66706217eaa748d9ddf82dd32bb17e6abe

From 3870d4c09c6478e539439033a98795c6515d8fa5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Wed, 15 Jun 2022 22:37:47 -0400
Subject: [PATCH 430/521] Moved self-registration and
 disconnection-upon-deletion into SignalBase and SlotBase

---
 Cpp/Library/Processor/Signal.hh         | 10 +++-----
 Cpp/Library/Processor/SignalSlotBase.cc |  8 ++++--
 Cpp/Library/Processor/SignalSlotBase.hh | 20 ++++++++++++---
 Cpp/Library/Processor/Slot.hh           | 34 ++++++++-----------------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/Cpp/Library/Processor/Signal.hh b/Cpp/Library/Processor/Signal.hh
index 10b5a38..eb1db94 100644
--- a/Cpp/Library/Processor/Signal.hh
+++ b/Cpp/Library/Processor/Signal.hh
@@ -121,16 +121,12 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner >
     inline Signal< XArgs... >::Signal( const std::string& name, XOwner* owner ) :
-            SignalBase( name )
-    {
-        owner->RegisterSignal( name, this );
-    }
+            SignalBase( name, owner )
+    {}
 
     template< typename... XArgs >
     Signal< XArgs... >::~Signal()
-    {
-        DisconnectAll();
-    }
+    {}
 
     template< typename... XArgs >
     void Signal< XArgs... >::Connect( SlotBase* slot, int group )
diff --git a/Cpp/Library/Processor/SignalSlotBase.cc b/Cpp/Library/Processor/SignalSlotBase.cc
index ec234ce..4073c36 100644
--- a/Cpp/Library/Processor/SignalSlotBase.cc
+++ b/Cpp/Library/Processor/SignalSlotBase.cc
@@ -16,7 +16,9 @@ namespace Nymph
     {}
 
     SlotBase::~SlotBase()
-    {}
+    {
+        DisconnectAll();
+    }
 
     void SlotBase::DisconnectAll()
     {
@@ -35,7 +37,9 @@ namespace Nymph
     {}
 
     SignalBase::~SignalBase()
-    {}
+    {
+        DisconnectAll();
+    }
 
     // disconnects all previously connected functions
     void SignalBase::DisconnectAll()
diff --git a/Cpp/Library/Processor/SignalSlotBase.hh b/Cpp/Library/Processor/SignalSlotBase.hh
index 3f5d01c..23ad6c1 100644
--- a/Cpp/Library/Processor/SignalSlotBase.hh
+++ b/Cpp/Library/Processor/SignalSlotBase.hh
@@ -55,8 +55,8 @@ namespace Nymph
     {
         public:
             SlotBase( const std::string& name );
-            //template< typename XOwner >
-            //SlotBase( const std::string& name, XOwner* owner );
+            template< typename XOwner >
+            SlotBase( const std::string& name, XOwner* owner );
             virtual ~SlotBase();
 
             virtual void ConnectTo( SignalBase* signal, int group = -1 ) = 0;
@@ -88,8 +88,8 @@ namespace Nymph
     {
         public:
             SignalBase( const std::string& name );
-            //template< typename XOwner >
-            //SignalBase( const std::string& name, XOwner* owner );
+            template< typename XOwner >
+            SignalBase( const std::string& name, XOwner* owner );
             virtual ~SignalBase();
 
             virtual void Connect( SlotBase* slot, int group = -1 ) = 0;
@@ -111,6 +111,12 @@ namespace Nymph
             virtual void AddConnection( SlotBase* slot, int group );
     };
 
+    template< typename XOwner >
+    SlotBase::SlotBase( const std::string& name, XOwner* owner )
+    {
+        owner->RegisterSlot( name, this );
+    }
+
     inline void SlotBase::AddConnection( SignalBase* signal )
     {
         fConnections.insert( signal );
@@ -123,6 +129,12 @@ namespace Nymph
         return;
     }
 
+    template< typename XOwner >
+    SignalBase::SignalBase( const std::string& name, XOwner* owner )
+    {
+        owner->RegisterSignal( name, this );
+    }
+
     inline void SignalBase::AddConnection( SlotBase* slot, int group )
     {
         fConnections.insert( slot );
diff --git a/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
index e381f8c..012447b 100644
--- a/Cpp/Library/Processor/Slot.hh
+++ b/Cpp/Library/Processor/Slot.hh
@@ -133,58 +133,46 @@ namespace Nymph
     template< typename... XArgs >
     template< typename XOwner >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) ) :
-            SlotBase( name ),
+            SlotBase( name, owner ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
             fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this );
-    }
+    {}
 
     template< typename... XArgs >
     template< typename XOwner >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const ) :
-            SlotBase( name ),
+            SlotBase( name, owner ),
             fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
             fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this );
-    }
+    {}
 
     template< typename... XArgs >
     template< typename XOwner >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func ) :
-            SlotBase( name ),
+            SlotBase( name, owner ),
             fFunction( func ),
             fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this );
-    }
+    {}
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) ) :
-            SlotBase( name ),
+            SlotBase( name, owner ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
             fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this );
-    }
+    {}
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const ) :
-            SlotBase( name ),
+            SlotBase( name, owner ),
             fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
             fDoBreakpoint(false)
-    {
-        owner->RegisterSlot( name, this );
-    }
+    {}
 
     template< typename... XArgs >
     Slot< XArgs... >::~Slot()
-    {
-        DisconnectAll();
-    }
+    {}
 
     template< typename... XArgs >
     void Slot< XArgs... >::ConnectTo( SignalBase* signal, int group )

From ba4b488a0dbb35946140a50ce3385918893961dc Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 00:08:48 -0400
Subject: [PATCH 431/521] Fix for exception test in SignalSlot test

---
 Testing/Cpp/TestSignalSlot.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 8b5bf0f..61b08a2 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -112,7 +112,7 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
     SECTION( "connections" )
     {
         
-        REQUIRE_NOTHROW( floatSignal.Connect( &slot), ConnectionException );
+        REQUIRE_THROWS_AS( floatSignal.Connect( &slot), ConnectionException );
 
         REQUIRE_NOTHROW( signal.Connect( &slot ) );
 

From 502efd3575200f45c41e6c07bd327e91153c38e6 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 00:24:17 -0400
Subject: [PATCH 432/521] Modify python function name to be string valued in
 macro

---
 Python/Bindings/Processor/ProcessorPybind.hh | 2 +-
 Python/Bindings/Processor/SignalPybind.hh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index df1a024..dac63c6 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -31,7 +31,7 @@ namespace NymphPybind
                 PYBIND11_OVERRIDE_PURE_NAME(
                     void, /* Return type */
                     Processor,      /* Parent class */
-                    configure,  /*Name of function in python*/
+                    "configure",  /*Name of function in python*/
                     Configure,          /* Name of function in C++ */
                     node/* Argument(s) */
                 );
diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index d9dca51..188a56b 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -33,7 +33,7 @@ namespace NymphPybind
                 PYBIND11_OVERRIDE_PURE_NAME(
                     void, /* Return type */
                     Nymph::SignalBase,      /* Parent class */
-                    connect,            /* Name of function in python */
+                    "connect",            /* Name of function in python */
                     Connect,          /* Name of function in C++ */
                     slot,
                     group/* Argument(s) */

From 131f218e119a76bb38a21da00f2ca7f783a9218e Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 09:39:45 -0400
Subject: [PATCH 433/521] Fix function names again

---
 Python/Bindings/Processor/ProcessorPybind.hh | 2 +-
 Testing/Python/testprocessor.py              | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Python/Bindings/Processor/ProcessorPybind.hh b/Python/Bindings/Processor/ProcessorPybind.hh
index dac63c6..707f994 100644
--- a/Python/Bindings/Processor/ProcessorPybind.hh
+++ b/Python/Bindings/Processor/ProcessorPybind.hh
@@ -30,7 +30,7 @@ namespace NymphPybind
             void Configure( const scarab::param_node& node ) override {
                 PYBIND11_OVERRIDE_PURE_NAME(
                     void, /* Return type */
-                    Processor,      /* Parent class */
+                    Nymph::Processor,      /* Parent class */
                     "configure",  /*Name of function in python*/
                     Configure,          /* Name of function in C++ */
                     node/* Argument(s) */
diff --git a/Testing/Python/testprocessor.py b/Testing/Python/testprocessor.py
index d45fafc..eef1b98 100644
--- a/Testing/Python/testprocessor.py
+++ b/Testing/Python/testprocessor.py
@@ -21,7 +21,6 @@ def configure(self, param_node):
 def main(args):
     
     testprocessor = TestProcessor('test')
-    test2 = _nymph.processor.get_processor('test-proc', 'name')
     
     param = scarab.ParamValue( 1.0 )
     param_node = scarab.ParamNode()

From 09243296f825737fccd917de9dae999095708fdf Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 09:52:56 -0400
Subject: [PATCH 434/521] Modify python override function names in Slot binding

---
 Python/Bindings/Processor/SlotPybind.hh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index 46db7cf..559a1c1 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -27,10 +27,11 @@ namespace NymphPybind
 
             /* Trampoline (need one for each virtual function) */
             void ConnectTo( Nymph::SignalBase* signal, int group = -1 ) override {
-                PYBIND11_OVERRIDE_PURE(
+                PYBIND11_OVERRIDE_PURE_NAME(
                     void, /* Return type */
-                    SlotBase,      /* Parent class */
-                    ConnectTo,          /* Name of function in C++ (must match Python name) */
+                    Nymph::SlotBase,      /* Parent class */
+                    "connect_to",       /* Name of function in python */
+                    ConnectTo,          /* Name of function in C++ */
                     signal,
                     group/* Argument(s) */
                 );
@@ -38,10 +39,11 @@ namespace NymphPybind
             
             /* Trampoline (need one for each virtual function) */
             bool MatchesTo( Nymph::SignalBase* signal ) override {
-                PYBIND11_OVERRIDE_PURE(
+                PYBIND11_OVERRIDE_PURE_NAME(
                     bool, /* Return type */
-                    SlotBase,      /* Parent class */
-                    MatchesTo,          /* Name of function in C++ (must match Python name) */
+                    Nymph::SlotBase,      /* Parent class */
+                    "matches_to",  /* Name of function in python */
+                    MatchesTo,          /* Name of function in C++ */
                     signal/* Argument(s) */
                 );
             }
@@ -52,8 +54,8 @@ namespace NymphPybind
 
        py::class_< Nymph::SlotBase, PySlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
                 .def(py::init<const std::string& >())
-                .def("ConnectTo", &Nymph::SlotBase::ConnectTo)
-                .def("MatchesTo", &Nymph::SlotBase::MatchesTo)
+                .def("connect_to", &Nymph::SlotBase::ConnectTo)
+                .def("matches_to", &Nymph::SlotBase::MatchesTo)
                 .def("disconnect", &Nymph::SlotBase::Disconnect)
                 .def("disconnect_all", &Nymph::SlotBase::DisconnectAll)
                 .def_property("connections", static_cast< std::set< Nymph::SignalBase* >& (Nymph::SlotBase::*)() const>(&Nymph::SlotBase::Connections),

From d0ccb570b1a5adf6a41f431f935552ba65a35cb9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 10:00:12 -0400
Subject: [PATCH 435/521] Fixed threading issue in TestSignalSlot

---
 Testing/Cpp/TestSignalSlot.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 621e6d7..aaa5aa4 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -99,6 +99,7 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
                 signal.Emit( 4 ); // cannot test this with REQUIRE() because tests can currently only be done in one thread
                 controller.WaitForEndOfRun();
             } );
+            std::this_thread::sleep_for( std::chrono::milliseconds(200) );
             REQUIRE( controller.WaitForBreakOrCanceled() );
             REQUIRE( controller.HasReturn() );
             auto theReturn = controller.GetReturn< int >();

From fc2cd3a65d825bc63fb5e76d1137e52d83243c2a Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 10:39:49 -0400
Subject: [PATCH 436/521] Remove unused breakpoint variable from Slot

---
 Cpp/Library/Processor/Slot.hh | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
index 012447b..e888574 100644
--- a/Cpp/Library/Processor/Slot.hh
+++ b/Cpp/Library/Processor/Slot.hh
@@ -68,8 +68,6 @@ namespace Nymph
 
             MEMVAR_REF( boost::function< signature >, Function );
 
-            MEMVAR( bool, DoBreakpoint );
-
         protected:
             void SlotFuncWrapper( XArgs... args );
     };
@@ -126,48 +124,42 @@ namespace Nymph
     template< typename... XArgs >
     Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func ) :
             SlotBase( name ),
-            fFunction( func ),
-            fDoBreakpoint( false )
+            fFunction( func )
     {}
 
     template< typename... XArgs >
     template< typename XOwner >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) ) :
             SlotBase( name, owner ),
-            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} ),
-            fDoBreakpoint(false)
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);} )
     {}
 
     template< typename... XArgs >
     template< typename XOwner >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const ) :
             SlotBase( name, owner ),
-            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  ),
-            fDoBreakpoint(false)
+            fFunction( [func, owner]( XArgs... args ){ return (owner->*func)(args...);}  )
     {}
 
     template< typename... XArgs >
     template< typename XOwner >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func ) :
             SlotBase( name, owner ),
-            fFunction( func ),
-            fDoBreakpoint(false)
+            fFunction( func )
     {}
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) ) :
             SlotBase( name, owner ),
-            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            fDoBreakpoint(false)
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  )
     {}
 
     template< typename... XArgs >
     template< typename XOwner, typename XFuncClass >
     Slot< XArgs... >::Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) const ) :
             SlotBase( name, owner ),
-            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  ),
-            fDoBreakpoint(false)
+            fFunction( [func, inst]( XArgs... args ){ return (inst->*func)(args...);}  )
     {}
 
     template< typename... XArgs >

From fdc843a485a9d0fa350296cd55db9190d13da4b5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 11:27:26 -0400
Subject: [PATCH 437/521] Cleanup Slot.hh and switch from boost::function to
 std::function

---
 Cpp/Library/Processor/Slot.hh | 92 +++++------------------------------
 1 file changed, 12 insertions(+), 80 deletions(-)

diff --git a/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
index e888574..e986532 100644
--- a/Cpp/Library/Processor/Slot.hh
+++ b/Cpp/Library/Processor/Slot.hh
@@ -16,9 +16,8 @@
 
 #include "logger.hh"
 
-#include <boost/function.hpp>
-
-#include <initializer_list>
+//#include <boost/function.hpp>
+#include <functional>
 
 namespace Nymph
 {
@@ -29,19 +28,22 @@ namespace Nymph
      @class Slot
      @author N. S. Oblath
 
-     @brief A Slot is connected to and called by a Signal with the same signature.
+     @brief A Slot is connected to and called by a Signal with the same signature.  Slots call a particular function when they're triggered (usually by a signal).
 
+     @details
+     Usage:
+     The different constructors allow different relationships between the owner of the slot (if there is one) and the owner of the function to be called (if there is one)
+     The function should have the signature void (Args).
     */
     template< typename... XArgs >
     class Slot : public SlotBase
     {
         public:
             using signature = void( XArgs... );
-            using signal_list = std::initializer_list< std::string >;
 
         public:
             /// Unowned slot
-            Slot( const std::string& name, const boost::function< signature >& func );
+            Slot( const std::string& name, const std::function< signature >& func );
             /// Owned slot, non-const member function
             template< typename XOwner >
             Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) );
@@ -50,7 +52,7 @@ namespace Nymph
             Slot( const std::string& name, XOwner* owner, void (XOwner::*func)( XArgs... ) const );
             /// Owned slot, generic function
             template< typename XOwner >
-            Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func );
+            Slot( const std::string& name, XOwner* owner, const std::function< signature >& func );
             /// Owned slot, non-const member fuction of another class
             template< typename XOwner, typename XFuncClass >
             Slot( const std::string& name, XOwner* owner,  XFuncClass *inst, void (XFuncClass::*func)( XArgs... ) );
@@ -66,54 +68,9 @@ namespace Nymph
             /// execute fFunction
             void operator()( XArgs... args );
 
-            MEMVAR_REF( boost::function< signature >, Function );
-
-        protected:
-            void SlotFuncWrapper( XArgs... args );
-    };
-
-
-    /*!
-     @class Slot
-     @author N. S. Oblath
-
-     @brief Creates a slot that calls a member function of the func_owner_type object, taking 0 or more arguments.
-
-     @details
-     Usage:
-     To use this slot type the function to be called by the slot must exist in an object of type FuncOwnerType.
-     The function should have the signature void (Args).
-
-     In your Processor's header add a member variable of type Slot< ProcessorType, ReturnType, Args >.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-    *//*
-    template< typename... Args >
-    class Slot
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            Slot( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            Slot( const std::string& name, Processor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( Args... ), std::initializer_list< std::string > signals = {} );
-
-            virtual ~Slot();
-
-            const std::string& GetName() const;
+            MEMVAR_REF( std::function< signature >, Function );
 
-            SlotWrapper* GetSlotWrapper();
-
-        protected:
-            std::string fName;
-            SlotWrapper* fSlotWrapper;
     };
-*/
-
 
     //*******************
     // Implementations
@@ -122,7 +79,7 @@ namespace Nymph
     // Slot
 
     template< typename... XArgs >
-    Slot< XArgs... >::Slot( const std::string& name, const boost::function< signature >& func ) :
+    Slot< XArgs... >::Slot( const std::string& name, const std::function< signature >& func ) :
             SlotBase( name ),
             fFunction( func )
     {}
@@ -143,7 +100,7 @@ namespace Nymph
 
     template< typename... XArgs >
     template< typename XOwner >
-    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const boost::function< signature >& func ) :
+    Slot< XArgs... >::Slot( const std::string& name, XOwner* owner, const std::function< signature >& func ) :
             SlotBase( name, owner ),
             fFunction( func )
     {}
@@ -183,32 +140,7 @@ namespace Nymph
     template< typename... XArgs >
     inline void Slot< XArgs... >::operator()( XArgs... args )
     {
-//        fFunction( args... );
-        SlotFuncWrapper( args... );
-        return;
-    }
-/*
-    template< typename... XArgs >
-    inline void Slot< XArgs... >::operator()( ControlAccessPtr access, XArgs... args )
-    {
-        SlotFuncWrapper( access, args... );
-        return;
-    }
-*/
-    template< typename... XArgs >
-    inline void Slot< XArgs... >::SlotFuncWrapper( /*ControlAccessPtr access,*/ XArgs... args )
-    {
-        //TODO could do something with `access` here
-        //NOTE (12/9/21): instead of using `access`, get SharedControl and use that
-        //for( auto signalIt = fSignalsUsed.begin(); signalIt != fSignalsUsed.end(); ++signalIt )
-        //{
-        //    (*signalIt)->SetControl( access );
-        //}
-
         fFunction( args... );
-
-        //TODO could do more with `access` here
-
         return;
     }
 

From a223e0676138bf4c9e2f458fc03ef4f870231a9f Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 12:01:44 -0400
Subject: [PATCH 438/521] Add missing constructor in signal binding

---
 Python/Bindings/Processor/SignalPybind.hh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Python/Bindings/Processor/SignalPybind.hh b/Python/Bindings/Processor/SignalPybind.hh
index 188a56b..ec38aaf 100644
--- a/Python/Bindings/Processor/SignalPybind.hh
+++ b/Python/Bindings/Processor/SignalPybind.hh
@@ -46,6 +46,7 @@ namespace NymphPybind
 
        py::class_< Nymph::SignalBase, PySignalBase, std::shared_ptr<Nymph::SignalBase > >(nymphProcessor, "_SignalBase")
                 .def(py::init<const std::string& >())
+                .def(py::init<const std::string&,  Nymph::Processor* >())
                 .def("connect", &Nymph::SignalBase::Connect, NYMPH_BIND_CALL_GUARD_STREAMS)
                 .def("disconnect", &Nymph::SignalBase::Disconnect)
                 .def("disconnect_all", &Nymph::SignalBase::DisconnectAll)

From 7d915fa85f8a437f56f06f39cf49685b82035fb9 Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 13:51:07 -0400
Subject: [PATCH 439/521] Add new constructor to SlotBase binding

---
 Python/Bindings/Processor/SlotPybind.hh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index 559a1c1..df7d668 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -54,6 +54,8 @@ namespace NymphPybind
 
        py::class_< Nymph::SlotBase, PySlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
                 .def(py::init<const std::string& >())
+                .def(py::init<const std::string&, Nymph::Processor* >())
+                
                 .def("connect_to", &Nymph::SlotBase::ConnectTo)
                 .def("matches_to", &Nymph::SlotBase::MatchesTo)
                 .def("disconnect", &Nymph::SlotBase::Disconnect)

From 31a758865ccfbf60fdb1b41d1ccee6505718f65b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 14:11:29 -0400
Subject: [PATCH 440/521] Replace check for data types based on a helper struct
 with a new version of DataFrame::Has<...>()

---
 Cpp/Library/CMakeLists.txt      |  1 -
 Cpp/Library/Data/DataFrame.hh   | 19 ++++++++++---
 Cpp/Library/Data/DataPresent.hh | 48 ---------------------------------
 Testing/Cpp/TestDataFrame.cc    |  7 +++++
 4 files changed, 22 insertions(+), 53 deletions(-)
 delete mode 100644 Cpp/Library/Data/DataPresent.hh

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index d297fc9..001b70f 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -32,7 +32,6 @@ set( NYMPH_HEADERFILES
 
     ${DATA_DIR}/Data.hh
     ${DATA_DIR}/DataFrame.hh
-    ${DATA_DIR}/DataPresent.hh
     ${DATA_DIR}/SignalData.hh
     ${DATA_DIR}/SlotData.hh
     
diff --git a/Cpp/Library/Data/DataFrame.hh b/Cpp/Library/Data/DataFrame.hh
index 4e8d463..755f206 100644
--- a/Cpp/Library/Data/DataFrame.hh
+++ b/Cpp/Library/Data/DataFrame.hh
@@ -58,8 +58,8 @@ namespace Nymph
             /// Returns true if the frame has no data objects
             bool Empty() const;
 
-            /// Returns true if object of type XData exists in the frame; returns false otherwise
-            template< typename XData >
+            /// Returns true if object of type(s) XData exist in the frame; returns false otherwise; Has<>() returns true
+            template< typename... XData >
             bool Has() const;
 
             /// Returns a reference to the object of type XData if it exists in the frame.
@@ -95,6 +95,10 @@ namespace Nymph
             // typedef used to avoid problems with the comma in the MEMVAR macro
             typedef std::unordered_map< std::type_index, std::unique_ptr<Data> > DataMap;
             MEMVAR_REF( DataMap, DataObjects );
+
+        protected:
+            template< typename XData >
+            bool HasOneType() const;
     };
 
 
@@ -103,11 +107,18 @@ namespace Nymph
         return fDataObjects.empty();
     }
 
-    template< typename XData >
+    template< typename... XData >
     bool DataFrame::Has() const
+    {
+        return ( HasOneType<XData>() && ... );
+    }
+
+    template< typename XData >
+    bool DataFrame::HasOneType() const
     {
         typedef std::remove_const_t< XData > XDataNoConst;
-        return fDataObjects.count( typeid(XDataNoConst) ) != 0;
+        if( fDataObjects.count( typeid(XDataNoConst) ) == 0 ) return false;
+        return true;
     }
 
     template< typename XData >
diff --git a/Cpp/Library/Data/DataPresent.hh b/Cpp/Library/Data/DataPresent.hh
deleted file mode 100644
index 0dba77e..0000000
--- a/Cpp/Library/Data/DataPresent.hh
+++ /dev/null
@@ -1,48 +0,0 @@
- 
-
-#ifndef NYMPH_DATAPRESENT_HH_
-#define NYMPH_DATAPRESENT_HH_
-
-#include "DataFrame.hh"
-
-#include "logger.hh"
- 
-namespace Nymph
-{
-    LOGGER( dplog_h, "DataPresent" );
- 
-    // Recursive helper structs for determining if data objects are present
-
-    // End of the recursion; this will only be used if NoOtherDataTypes has nothing in it
-    template< class... NoOtherDataTypes >
-    struct DataPresentHelper
-    {
-        static bool DataPresent( const DataHandle& );
-    };
-
-    template< class XDataType, class... XOtherDataTypes >
-    struct DataPresentHelper< XDataType, XOtherDataTypes... >
-    {
-        static bool DataPresent( const DataHandle& handle );
-    };
-
-    template< class... NoOtherDataTypes >
-    bool DataPresentHelper< NoOtherDataTypes... >::DataPresent( const DataHandle& )
-    {
-        return true;
-    }
-
-    template< class XDataType, class... XOtherDataTypes >
-    bool DataPresentHelper< XDataType, XOtherDataTypes... >::DataPresent( const DataHandle& handle )
-    {
-        if( ! handle->Has< XDataType >() )
-        {
-            LERROR( dplog_h, "Data not found with type <" << scarab::type(XDataType()) << ">" );
-            return false;
-        }
-        return DataPresentHelper< XOtherDataTypes... >::DataPresent( handle );
-    }
-
-} /* namespace Nymph */
-
-#endif /* NYMPH_DATAPRESENT_HH_ */
diff --git a/Testing/Cpp/TestDataFrame.cc b/Testing/Cpp/TestDataFrame.cc
index 100ca62..c064528 100644
--- a/Testing/Cpp/TestDataFrame.cc
+++ b/Testing/Cpp/TestDataFrame.cc
@@ -19,6 +19,9 @@ TEST_CASE( "data_frame", "[data]" )
     DataFrame frame;
     const DataFrame& cFrame = frame;
 
+    // empty Has<>() should return true
+    REQUIRE( frame.Has<>() );
+
     REQUIRE( frame.DataObjects().empty() );
     REQUIRE( frame.Empty() );
     REQUIRE_FALSE( frame.Has< TestData1 >() );
@@ -61,6 +64,10 @@ TEST_CASE( "data_frame", "[data]" )
     REQUIRE( frame.Has< TestData1 >() );
     REQUIRE( frame.Get< TestData1 >().GetIValue1() == 0 ); // check that fIValue1 has the default value; we'll overwrite the data object next, and verify we have the new value
 
+    // verify multiple data types are present (TestData1 and TestData2 should be present at this point)
+    REQUIRE( frame.Has< TestData1, TestData2 >() );
+    REQUIRE( frame.Has< TestData2, TestData1 >() );
+
     // set an object with a copy of an object
     TestData1 anotherTestData1;
     anotherTestData1.SetIValue1( 4000 );

From a9a6814a9a0e209699845da9258984a9a8b3d479 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 14:13:15 -0400
Subject: [PATCH 441/521] Cleanup SlotData and use DataFrame::Has()

---
 Cpp/Library/Data/SlotData.hh | 418 ++---------------------------------
 Testing/Cpp/TestSlotData.cc  |   7 +-
 2 files changed, 29 insertions(+), 396 deletions(-)

diff --git a/Cpp/Library/Data/SlotData.hh b/Cpp/Library/Data/SlotData.hh
index dda5192..07b8818 100644
--- a/Cpp/Library/Data/SlotData.hh
+++ b/Cpp/Library/Data/SlotData.hh
@@ -10,8 +10,6 @@
 
 #include "Slot.hh"
 
-#include "DataPresent.hh"
-
 namespace Nymph
 {
     template< class... XTypes >
@@ -32,16 +30,27 @@ namespace Nymph
      @class SlotData
      @author N. S. Oblath
 
-     @brief Creates a slot that takes a DataHandle as the argument; the function that gets called should take 0 or more DataType&'s as its argument.
+     @brief Creates a slot that takes a DataHandle as the argument; the function that gets called should take 0 or more DataType&'s as its argument(s).
 
      @details
      Usage:
-     This slot type adds the slot function (signature void (KTDataHandle).
-     Your processor (or, optionally, a different object) must have a member function with the signature bool (DataType1&, . . .).
-     The slot function checks that the provided KTCoreData object contains data of type DataType, and then calls the member function.
+     This slot type includes the slot function with signature `void (DataHandle)`.
+
+     Your processor (or, optionally, a different object) must have a member function with the signature bool ([input and output data-type references]).
+     The function that gets called can have both input data types (assumed to be const) and output data types (assumed to be non-const).  The following 
+     are all valid examples:
+     * void my_func(); // no arguments
+     * void my_func(DataType1&); // DataType1 is non-const
+     * void my_func(const DataType2&); // DataType2 is const
+     * void my_func(const DataType3& const DataType4&, DataType5&); // DataType3 and DataType4 are const; DataType5 is non-const
+     Note that const data types (i.e. inputs) should come before non-const types (i.e. outputs) in the function signature,
+     and the order of the data types in the `In<>` and `Out<>` type lists must match the order of the types in the function signature.
 
-     In your Processor's header add a member variable of type KTSlotOneArg< DataType >.
-     The variable may be private.
+     The slot function checks that the provided DataFrame object (pointed to by the DataHandle) contains objects of all of the const data types, 
+     creates (or retrieves) the objects of the non-const data types, and then calls the member function.
+
+     In your Processor's header add a member variable of type SlotData< In<[input data types]>, Out<[output data types]> >.
+     The access specifier for the slot (e.g. protected, private, or public) does not affect the usability of the slot. 
 
      Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
      Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
@@ -60,26 +69,15 @@ namespace Nymph
             template< class XOwnerType >
             SlotData( const std::string& name, XOwnerType* owner, Signature< XOwnerType > func, SignalData* signalPtr = nullptr );
 
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            //template< class XFuncOwnerType, class... XFuncDataTypes >
-            //KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
             /// Constructor for the case where the processor and the object with the function that will be called are different
             template< class XSlotOwnerType, class XFuncOwnerType >
             SlotData( const std::string& name, XSlotOwnerType* proc, XFuncOwnerType* inst, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
 
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            //template< class XFuncOwnerType, class... XFuncDataTypes >
-            //KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
             virtual ~SlotData();
 
             void operator()( DataHandle handle );
 
         protected:
-            template< class... XDataTypes >
-            bool DataPresent( const DataHandle& handle ) const;
-
             //function_signature fFunc;
             std::function< void (XInTypes&..., XOutTypes&... ) > fFunc;
 
@@ -87,170 +85,29 @@ namespace Nymph
     };
 
 
-/*
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
-    class SlotData< XInList<XInTypes...>, XOutList<> > : public Slot< DataHandle >
-    {
-        public:
-            template< class XFuncOwnerType >
-            using Signature = void (XFuncOwnerType::*)( XInTypes&... );
-
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XOwnerType >
-            SlotData( const std::string& name, XOwnerType* owner, Signature< XOwnerType > func, SignalData* signalPtr = nullptr );
-
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            //template< class XFuncOwnerType, class... XFuncDataTypes >
-            //KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XSlotOwnerType, class XFuncOwnerType >
-            SlotData( const std::string& name, XSlotOwnerType* proc, XFuncOwnerType* inst, Signature< XFuncOwnerType > func, SignalData* signalPtr = nullptr );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            //template< class XFuncOwnerType, class... XFuncDataTypes >
-            //KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& ) );
-
-            virtual ~SlotData();
-
-            void operator()( DataHandle handle );
-
-        protected:
-            template< class... XDataTypes >
-            bool DataPresent( const DataHandle& handle ) const;
-
-            //function_signature fFunc;
-            std::function< void (XInTypes&... ) > fFunc;
-
-            SignalData* fSignalPtr;
-    };
-*/
-
-/*
-    // partial specialization for no new data type
-    template< class... XDataArgs >
-    class KTSlotData< void, XDataArgs... > : public KTSlot< KTDataHandle  >
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr );
-
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType, class... XFuncDataTypes >
-            KTSlotData( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ) );
-
-            virtual ~KTSlotData();
-
-            void operator()( KTDataHandle data );
-
-        protected:
-            template< typename... DataTypes >
-            bool DataPresent( KTDataHandle data );
-
-            //function_signature fFunc;
-            std::function< void (const XDataArgs&...) > fFunc;
-
-            KTSignalData* fSignalPtr;
-    };
-*/
-
-    /*!
-     @class KTSlotDone
-     @author N. S. Oblath
-
-     @brief Creates a slot to receive indication that upstream processing is complete and will emit a similar signal.
-
-     @details
-     Usage:
-     This slot type adds the slot function (signature void ()).
-     Your processor (or, optionally, a different object) must have a member function with the signature void ().
-     The slot calls the member function.
-
-     In your Processor's header add a member variable of type KTDoneSlot.
-     The variable may be private.
-
-     Initialize the slot with the name of the slot, the address of the owner of the slot function, and the function pointer.
-     Optionally, if the Processor is separate from the owner of the slot function, the Processor address is specified as the second argument to the constructor.
-
-     Also optionally, a signal to be emitted after the return of the member function can be specified as the last argument.
-    */
-/*
-    class KTSlotDone : public KTSlot<>
-    {
-        public:
-            /// Constructor for the case where the processor has the function that will be called by the slot
-            template< class XFuncOwnerType >
-            KTSlotDone( const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
-            /// Constructor for the case where the processor and the object with the function that will be called are different
-            template< class XFuncOwnerType >
-            KTSlotDone( const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr=nullptr );
-            virtual ~KTSlotDone();
-
-            void operator()();
-
-        protected:
-            std::function< void () > fFunc;
-
-            KTSignalDone* fSignalPtr;
-    };
-*/
-
     //*******************
     // Implementations
     //*******************
 
-    // KTSlotData
-
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
     template< class XOwnerType >
     SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, XOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XOwnerType > func, SignalData* signalPtr ) :
             Slot( name, owner, this, &SlotData::operator() ),
             fFunc( [func, owner]( XInTypes&... inArgs, XOutTypes&... outArgs ){ (owner->*func)( inArgs..., outArgs... ); } ),
             fSignalPtr( signalPtr )
-    {
-    }
-/*
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
-    {
-    }
-*/
+    {}
+
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
     template< class XSlotOwnerType, class XFuncOwnerType >
     SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::SlotData(const std::string& name, XSlotOwnerType* owner, XFuncOwnerType* inst, SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
             Slot( name, owner, this, &SlotData::operator() ),
             fFunc( [func, inst]( XInTypes&... inArgs, XOutTypes&... outArgs ){ (inst->*func)( inArgs..., outArgs... ); } ),
             fSignalPtr( signalPtr )
-    {
-    }
-/*
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
-    {
-    }
-*/
+    {}
+
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
     SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::~SlotData()
-    {
-    }
+    {}
 
     template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
     void SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::operator()( DataHandle handle )
@@ -258,7 +115,7 @@ namespace Nymph
         // Standard data slot pattern:
 
         // Check to ensure that the required data type is present
-        if( ! DataPresent< XInTypes... >( handle ) )
+        if( ! handle->Has< XInTypes... >() )
         {
             THROW_EXCEPT_HERE( Exception() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
             return;
@@ -283,235 +140,6 @@ namespace Nymph
         return;
     }
 
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes, class... XOutTypes >
-    template< class... XDataTypes >
-    bool SlotData< XInList<XInTypes...>, XOutList<XOutTypes...> >::DataPresent( const DataHandle& handle ) const
-    {
-        return DataPresentHelper< XDataTypes... >::DataPresent( handle );
-    }
-
-
-
-
-
-
-    // KTSlotData
-    // No output types
-/*
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
-    template< class XOwnerType >
-    SlotData< XInList<XInTypes...>, XOutList<> >::SlotData(const std::string& name, XOwnerType* owner, SlotData< XInList<XInTypes...>, XOutList<> >::Signature< XOwnerType > func, SignalData* signalPtr ) :
-            Slot( name, owner, this, &SlotData::operator() ),
-            fFunc( [func, owner]( XInTypes&... inArgs ){ (owner->*func)( inArgs... ); } ),
-            fSignalPtr( signalPtr )
-    {
-    }
-/*
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
-    {
-    }
-*//*
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
-    template< class XSlotOwnerType, class XFuncOwnerType >
-    SlotData< XInList<XInTypes...>, XOutList<> >::SlotData(const std::string& name, XSlotOwnerType* owner, XFuncOwnerType* inst, SlotData< XInList<XInTypes...>, XOutList<> >::Signature< XFuncOwnerType > func, SignalData* signalPtr ) :
-            Slot( name, owner, this, &SlotData::operator(), { signalPtr->Name()} ),
-            fFunc( [func, inst]( XInTypes&... inArgs ){ (inst->*func)( inArgs... ); } ),
-            fSignalPtr( signalPtr )
-    {
-    }
-/*
-    template< class XReturnType, class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< XReturnType, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&..., XReturnType& )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
-    {
-    }
-*//*
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
-    SlotData< XInList<XInTypes...>, XOutList<> >::~SlotData()
-    {
-    }
-
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
-    void SlotData< XInList<XInTypes...>, XOutList<> >::operator()( DataHandle handle )
-    {
-        // Standard data slot pattern:
-
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XInTypes... >( handle ) )
-        {
-            THROW_EXCEPT_HERE( Exception() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            return;
-        }
-
-        // Call the function
-        try
-        {
-            fFunc( handle->Get< XInTypes >()... );
-        }
-        catch( scarab::base_exception& )
-        {
-            THROW_NESTED_EXCEPT_HERE( Exception() << "Something went wrong in slot <" + fName + ">. Aborting." );
-            return;
-        }
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr )
-        {
-            (*fSignalPtr)( handle );
-        }
-        return;
-    }
-
-    template< template<class...> class XInList, template<class...> class XOutList, class... XInTypes >
-    template< class... XDataTypes >
-    bool SlotData< XInList<XInTypes...>, XOutList<> >::DataPresent( const DataHandle& handle ) const
-    {
-        return DataPresentHelper< XDataTypes... >::DataPresent( handle );
-    }
-*/
-
-
-
-
-
-
-/*
-    // KTSlotData with no return type
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotData::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
-            KTSlot( name, owner, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){ return (owner->*func)(args...);} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... ), KTSignalData* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotData::operator(), { signalPtr->Name()} ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class... XDataTypes >
-    template< class XFuncOwnerType, class... XFuncDataTypes >
-    KTSlotData< void, XDataTypes... >::KTSlotData(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)( const XFuncDataTypes&... )) :
-            KTSlot( name, proc, this, &KTSlotData::operator() ),
-            fFunc( [func, owner]( const XDataTypes&... args ){return (owner->*func) (args... );} ),
-            fSignalPtr( nullptr )
-    {
-    }
-
-    template< class... XDataTypes >
-    KTSlotData< void, XDataTypes... >::~KTSlotData()
-    {
-    }
-
-    template< class... XDataTypes >
-    void KTSlotData< void, XDataTypes... >::operator()( KTDataHandle dataHandle )
-    {
-        // Standard data slot pattern:
-
-        std::shared_ptr< KTThreadReference > ref = fThreadRef;
-
-        // Check to ensure that the required data type is present
-        if( ! DataPresent< XDataTypes... >( dataHandle ) )
-        {
-            KTERROR( slotlog, "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            THROW_THREADREF_EXCEPTION( ref, KTException() << "Failed to find all of the necessary data types in slot <" << fName << ">. Aborting." );
-            return;
-        }
-
-        // Call the function
-        try
-        {
-            fFunc( dataHandle->Of< XDataTypes >()... );
-        }
-        catch( boost::exception& e )
-        {
-            e << KTErrorMsgInfo< struct slotData_RunFunc >( "Something went wrong in slot <" + fName + ">. Aborting." );
-            ref->SetReturnException( boost::current_exception() );
-        }
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        ref->Break( dataHandle, fDoBreakpoint );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)( dataHandle );
-        }
-        return;
-    }
-
-    template< class... XDataTypes >
-    template< typename... DataTypes >
-    bool KTSlotData< void, XDataTypes... >::DataPresent( KTDataHandle data )
-    {
-        return DataPresentHelper< DataTypes... >::DataPresent( data );
-    }
-*/
-/*
-    // KTSlotDone
-
-    template< class XFuncOwnerType >
-    KTSlotDone::KTSlotDone(const std::string& name, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, owner, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner](){ return (owner->*func)(); } ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    template< class XFuncOwnerType >
-    KTSlotDone::KTSlotDone(const std::string& name, KTProcessor* proc, XFuncOwnerType* owner, void (XFuncOwnerType::*func)(), KTSignalDone* signalPtr) :
-            KTSlot( name, proc, this, &KTSlotDone::operator(), {signalPtr->Name()} ),
-            fFunc( [func, owner](){ return (owner->*func)(); } ),
-            fSignalPtr( signalPtr )
-    {
-    }
-
-    inline KTSlotDone::~KTSlotDone()
-    {
-    }
-
-    inline void KTSlotDone::operator()()
-    {
-        // Call the function
-        fFunc();
-
-        // Perform breakpoint here if necessary (either if initiated here or if stopping here due to a breakpoint elsewhere)
-        // Sets the dataHandle into the return
-        fThreadRef->Break( KTDataHandle(), fDoBreakpoint );
-
-        // If there's a signal pointer, emit the signal
-        if( fSignalPtr != nullptr )
-        {
-            (*fSignalPtr)();
-        }
-        return;
-    }
-*/
 } /* namespace Nymph */
 
 #endif /* NYMPH_SLOTDATA_HH_ */
diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index dd259cc..ae57476 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -10,6 +10,9 @@
 
 #include "catch.hpp"
 
+#include "logger.hh"
+LOGGER(tsdlog_hh, "testslotdata.hh");
+
 TEST_CASE( "slot_data", "[slot],[data]" )
 {
     using namespace Nymph;
@@ -57,6 +60,8 @@ TEST_CASE( "slot_data", "[slot],[data]" )
 
     SignalData* sigdAdd = dynamic_cast< SignalData* >( adder.Signals().at("add") );
     REQUIRE( sigdAdd );
+    LWARN(tsdlog_hh, "sig do breakpoint? " << sigdAdd->GetDoBreakpoint() );
+    sigdAdd->SetDoBreakpoint( false );
 
     // configure the processor
     adder.SetAddValue( 5 );
@@ -71,7 +76,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     td1.SetIValue1( 1 );
     td1.SetIValue2( 2 );
 
-    // verify that slots can be called, n this case with an input and no output
+    // verify that slots can be called, in this case with an input and no output
     // verify that slots work whether or not signals are automatically called
     // call the add slot functions and verify operation
     REQUIRE_NOTHROW( (*sdAddSig)( handle ) );

From 9ba51eaf68ffec6e0d41c4ef91df0ec7b4e534f5 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 14:18:42 -0400
Subject: [PATCH 442/521] Remove a debugging printout

---
 Testing/Cpp/TestSlotData.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index ae57476..1b07a23 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -60,8 +60,6 @@ TEST_CASE( "slot_data", "[slot],[data]" )
 
     SignalData* sigdAdd = dynamic_cast< SignalData* >( adder.Signals().at("add") );
     REQUIRE( sigdAdd );
-    LWARN(tsdlog_hh, "sig do breakpoint? " << sigdAdd->GetDoBreakpoint() );
-    sigdAdd->SetDoBreakpoint( false );
 
     // configure the processor
     adder.SetAddValue( 5 );

From 2530683a65f510c363e2cd9fad8c0b3938c6f50a Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 14:37:44 -0400
Subject: [PATCH 443/521] Add a couple debug messages to Signal to help see
 when a breakpoint is being used

---
 Cpp/Library/Processor/Signal.hh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Cpp/Library/Processor/Signal.hh b/Cpp/Library/Processor/Signal.hh
index eb1db94..8bac33e 100644
--- a/Cpp/Library/Processor/Signal.hh
+++ b/Cpp/Library/Processor/Signal.hh
@@ -186,9 +186,11 @@ namespace Nymph
         if( fDoBreakpoint )
         {
             // do the break
+            LDEBUG( signallog, "Doing breakpoint; will now break and return" );
             control->BreakAndReturn( args... );
             //control->Break();
             // wait to continue; once we continue, if we need to quit, then do so
+            LDEBUG( signallog, "Will now wait to continue" );
             if( ! control->WaitToContinue() )
             {
                 QUIT_CHAIN; // throws QuitThread; should be caught by PrimaryProcessor::operator()

From 9649e29bdbdcffd931e64f17e9362a5161b8ef3d Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Thu, 16 Jun 2022 14:41:00 -0400
Subject: [PATCH 444/521] Add binding for derived Slot

---
 Python/Bindings/NymphPybind.cc          |  3 ++-
 Python/Bindings/Processor/SlotPybind.hh | 22 ++++++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 14bc066..2569b4f 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -33,7 +33,8 @@ PYBIND11_MODULE(_nymph, nymphPackage) {
     auto nymphProcessor = nymphPackage.def_submodule("processor", "Processor module");
     NymphPybind::ExportProcessor(nymphProcessor);
     NymphPybind::ExportPyProcCreator(nymphProcessor);
-    NymphPybind::ExportSlot(nymphProcessor);
+    NymphPybind::ExportSlotBase(nymphProcessor);
+    NymphPybind::ExportSlot<Nymph::DataHandle>(nymphProcessor, "Data");
     NymphPybind::ExportSignalBase(nymphProcessor);
     NymphPybind::ExportSignal<Nymph::DataHandle>(nymphProcessor, "Data");
     
diff --git a/Python/Bindings/Processor/SlotPybind.hh b/Python/Bindings/Processor/SlotPybind.hh
index df7d668..e0895a1 100644
--- a/Python/Bindings/Processor/SlotPybind.hh
+++ b/Python/Bindings/Processor/SlotPybind.hh
@@ -9,6 +9,8 @@
 #define PYTHON_BINDINGS_PROCESSOR_SLOTPYBIND_HH_
 
 #include <pybind11/pybind11.h>
+#include <pybind11/functional.h>
+
 #include <memory>
 
 #include "SignalSlotBase.hh"
@@ -49,10 +51,10 @@ namespace NymphPybind
             }
     };
     
-    void ExportSlot( py::module_& nymphProcessor)
+    void ExportSlotBase( py::module_& nymphProcessor)
     {
 
-       py::class_< Nymph::SlotBase, PySlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_Slot")
+       py::class_< Nymph::SlotBase, PySlotBase, std::shared_ptr<Nymph::SlotBase > >(nymphProcessor, "_SlotBase")
                 .def(py::init<const std::string& >())
                 .def(py::init<const std::string&, Nymph::Processor* >())
                 
@@ -67,6 +69,22 @@ namespace NymphPybind
                 
         
     }
+    
+    
+    template< typename... XArgs >
+    void ExportSlot( py::module_& nymphProcessor, const std::string& typestr)
+    {
+        std::string pyClsName = std::string("_Slot") + typestr;
+        
+        using signature = void( XArgs... );
+
+        py::class_< Nymph::Slot< XArgs... >, Nymph::SlotBase, std::shared_ptr<Nymph::Slot< XArgs... > > >(nymphProcessor, pyClsName.c_str())
+                .def(py::init<const std::string&, const std::function< signature >& >())
+                .def(py::init<const std::string&,  Nymph::Processor*, const std::function< signature >& >())
+                .def("__call__", &Nymph::Slot< XArgs... >::operator())
+                .def_property("function", static_cast< const std::function< signature >& (Nymph::Slot< XArgs... >::*)() const>(&Nymph::Slot< XArgs... >::Function),
+                                      [](Nymph::Slot< XArgs... >& slot, const std::function< signature >& function){slot.Function() = function;} );
+    }
 
 }
 

From 52eb24e495fd1800e245e2c6374c9cfd693585ab Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 21:33:23 -0400
Subject: [PATCH 445/521] Fixed incomplete initializations

---
 Cpp/Library/Processor/SignalSlotBase.hh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Cpp/Library/Processor/SignalSlotBase.hh b/Cpp/Library/Processor/SignalSlotBase.hh
index 23ad6c1..06bf915 100644
--- a/Cpp/Library/Processor/SignalSlotBase.hh
+++ b/Cpp/Library/Processor/SignalSlotBase.hh
@@ -112,7 +112,9 @@ namespace Nymph
     };
 
     template< typename XOwner >
-    SlotBase::SlotBase( const std::string& name, XOwner* owner )
+    SlotBase::SlotBase( const std::string& name, XOwner* owner ) :
+            fName( name ),
+            fConnections()
     {
         owner->RegisterSlot( name, this );
     }
@@ -130,7 +132,10 @@ namespace Nymph
     }
 
     template< typename XOwner >
-    SignalBase::SignalBase( const std::string& name, XOwner* owner )
+    SignalBase::SignalBase( const std::string& name, XOwner* owner ) :
+            fName( name ),
+            fConnections(),
+            fDoBreakpoint( false )
     {
         owner->RegisterSignal( name, this );
     }

From 59c22d795c5179fcd4a58c247a91b466ef2d2825 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 21:33:57 -0400
Subject: [PATCH 446/521] Cleanup of signal-slot code

---
 Cpp/Library/Processor/Signal.hh         | 104 +-----------------------
 Cpp/Library/Processor/SignalSlotBase.cc |   5 +-
 Cpp/Library/Processor/SignalSlotBase.hh |   4 -
 3 files changed, 2 insertions(+), 111 deletions(-)

diff --git a/Cpp/Library/Processor/Signal.hh b/Cpp/Library/Processor/Signal.hh
index 8bac33e..2295b14 100644
--- a/Cpp/Library/Processor/Signal.hh
+++ b/Cpp/Library/Processor/Signal.hh
@@ -61,54 +61,6 @@ namespace Nymph
     };
 
 
-    /*!
-     @class Signal
-     @author N. S. Oblath
-
-     @brief Creates a signal that takes 0 or more arguments.
-
-     @details
-     The signal is emitted by calling operator().
-     If a Slot is being used, and the Slot has been given a pointer to this signal, the Slot will emit the Signal.
-
-     Usage:
-     In your Processor's header add a member variable of type Signal< ArgumentTypes >.
-
-     Initialize the signal with the processor's 'this' pointer and the name of the signal.
-
-     To use the signal, call it as: fSignalObject(arg);
-    *//*
-    template< class... XSignalArguments >
-    class Signal
-    {
-        public:
-            typedef void (signature)( XSignalArguments... );
-            typedef boost::signals2::signal< signature > boost_signal;
-            typedef typename boost::signals2::signal< signature >::slot_type slot_type;
-
-        public:
-            Signal();
-            Signal( const std::string& name, Processor* proc );
-            virtual ~Signal();
-
-        protected:
-            Signal( const Signal& );
-
-        public:
-            void operator()( XSignalArguments... args );
-
-            boost_signal* Signal();
-
-            const std::string& GetName() const;
-
-        protected:
-            boost_signal fSignal;
-
-            std::string fName;
-    };
-*/
-
-
     //*******************
     // Implementations
     //*******************
@@ -144,17 +96,7 @@ namespace Nymph
                     "\tUnable to cast from SlotBase to this signal's derived type.\n" << 
                     "\tArgument types do not match" );
         }
-/*
-        Connection connection;
-        if( group >= 0 )
-        {
-            connection = fInternalSignal.connect( group, derivedSlot->Function() );
-        }
-        else
-        {
-            connection = fInternalSignal.connect( derivedSlot->Function() );
-        }
-*/
+
         AddConnection( slot, group );
 
         return;
@@ -205,50 +147,6 @@ namespace Nymph
         return;
     }
 
-/*
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::Signal( const std::string& name, Processor* proc ) :
-            fSignal(),
-            fName( name )
-    {
-        proc->RegisterSignal(name, &fSignal);
-    }
-
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::Signal() :
-            fSignal(),
-            fName("none")
-    {}
-
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::Signal( const Signal& signal ) :
-            fSignal(),
-            fName( signal.fName )
-    {}
-
-    template< class... XSignalArguments >
-    Signal< XSignalArguments... >::~Signal()
-    {
-    }
-
-    template< class... XSignalArguments >
-    inline void Signal< XSignalArguments... >::operator()( XSignalArguments... args )
-    {
-        fSignal( args... );
-    }
-
-    template< class... XSignalArguments >
-    inline typename Signal< XSignalArguments... >::boost_signal* Signal< XSignalArguments... >::Signal()
-    {
-        return &fSignal;
-    }
-
-    template< class... XSignalArguments >
-    inline const std::string& Signal< XSignalArguments... >::GetName() const
-    {
-        return fName;
-    }
-*/
 } /* namespace Nymph */
 
 #endif /* NYMPH_SIGNAL_HH_ */
diff --git a/Cpp/Library/Processor/SignalSlotBase.cc b/Cpp/Library/Processor/SignalSlotBase.cc
index 4073c36..37ba9d4 100644
--- a/Cpp/Library/Processor/SignalSlotBase.cc
+++ b/Cpp/Library/Processor/SignalSlotBase.cc
@@ -11,8 +11,7 @@ namespace Nymph
 {
     SlotBase::SlotBase( const std::string& name ) :
             fName( name ),
-            fConnections()//,
-            //fSignalsUsed()
+            fConnections()
     {}
 
     SlotBase::~SlotBase()
@@ -32,7 +31,6 @@ namespace Nymph
     SignalBase::SignalBase( const std::string& name ) :
             fName( name ),
             fConnections(),
-            //fControl( nullptr ),
             fDoBreakpoint( false )
     {}
 
@@ -51,6 +49,5 @@ namespace Nymph
         return;
     }
 
-
 }
 
diff --git a/Cpp/Library/Processor/SignalSlotBase.hh b/Cpp/Library/Processor/SignalSlotBase.hh
index 06bf915..ea122dc 100644
--- a/Cpp/Library/Processor/SignalSlotBase.hh
+++ b/Cpp/Library/Processor/SignalSlotBase.hh
@@ -69,8 +69,6 @@ namespace Nymph
             typedef std::set< SignalBase* > SignalConnections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE( SignalConnections, Connections );
 
-            //MEMVAR_REF( std::vector< SignalBase* >, SignalsUsed );
-
         protected:
             friend class SignalBase;
             virtual void AddConnection( SignalBase* signal );
@@ -102,8 +100,6 @@ namespace Nymph
             typedef std::set< SlotBase* > SlotConnections; // to get around the problem of having a comma inside a macro function argument
             MEMVAR_REF_MUTABLE_CONST( SlotConnections, Connections );
 
-            //MEMVAR( ControlAccess*, Control ); // doesn't use MEMVAR_PTR because Signal doesn't own the object pointed to by fControl
-
             MEMVAR( bool, DoBreakpoint );
 
         protected:

From d81f87a56fc8cdf191eee158f6b911e788d56437 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 21:34:45 -0400
Subject: [PATCH 447/521] Use unique variable names in tests in case they're
 affecting each other.

---
 Testing/Cpp/TestConfigException.cc     |  14 +--
 Testing/Cpp/TestControlAccess.cc       |  70 +++++++-------
 Testing/Cpp/TestController.cc          |  96 +++++++++----------
 Testing/Cpp/TestData.cc                |  16 ++--
 Testing/Cpp/TestDataFrame.cc           |  74 +++++++-------
 Testing/Cpp/TestException.cc           | 119 ++++++++++-------------
 Testing/Cpp/TestPrimaryProcessor.cc    |  20 ++--
 Testing/Cpp/TestProcessor.cc           |  81 ++++++++--------
 Testing/Cpp/TestProcessorToolbox.cc    |  74 +++++++-------
 Testing/Cpp/TestReturnBuffer.cc        |  36 +++----
 Testing/Cpp/TestSignalSlot.cc          | 128 ++++++++++++-------------
 Testing/Cpp/TestSingleRunController.cc |  48 +++++-----
 Testing/Cpp/TestSlotData.cc            |  94 +++++++++---------
 13 files changed, 427 insertions(+), 443 deletions(-)

diff --git a/Testing/Cpp/TestConfigException.cc b/Testing/Cpp/TestConfigException.cc
index 30e4b69..81e2d81 100644
--- a/Testing/Cpp/TestConfigException.cc
+++ b/Testing/Cpp/TestConfigException.cc
@@ -16,7 +16,7 @@ TEST_CASE( "config_exception", "[exception],[utility]" )
 {
     using namespace Nymph;
 
-    std::string config_str(
+    std::string tceConfigStr(
         "- type: test-primary\n"
         "  name: testprimary-1\n"
         "- type: test-primary\n"
@@ -25,15 +25,15 @@ TEST_CASE( "config_exception", "[exception],[utility]" )
         "  name: testproc-1\n"
     );
 
-    scarab::param_translator translator;
-    auto config = translator.read_string( config_str, "yaml" );
+    scarab::param_translator tceTranslator;
+    auto tceConfig = tceTranslator.read_string( tceConfigStr, "yaml" );
 
-    std::string config_as_string = config->to_string();
+    std::string tceConfigAsString = tceConfig->to_string();
 
-    ConfigException exception = ConfigException( *config );
-    std::string ex_what( exception.what() );
+    ConfigException tceException = ConfigException( *tceConfig );
+    std::string tceExWhat( tceException.what() );
 
     using Catch::Matchers::EndsWith;
 
-    REQUIRE_THAT( ex_what, EndsWith(config_as_string) );
+    REQUIRE_THAT( tceExWhat, EndsWith(tceConfigAsString) );
 }
diff --git a/Testing/Cpp/TestControlAccess.cc b/Testing/Cpp/TestControlAccess.cc
index 3839927..e1c499e 100644
--- a/Testing/Cpp/TestControlAccess.cc
+++ b/Testing/Cpp/TestControlAccess.cc
@@ -16,72 +16,72 @@ TEST_CASE( "control_access", "[control]" )
 {
     using namespace Nymph;
 
-    ControlAccess* access = ControlAccess::get_instance();
+    ControlAccess* tcaControlAccess = ControlAccess::get_instance();
 
     SECTION( "no_controller" )
     {
-        REQUIRE_FALSE( access->GetControl() );
-        REQUIRE_THROWS_AS( access->WaitToContinue(), Exception );
-        REQUIRE_THROWS_AS( access->WaitForBreakOrCanceled(), Exception );
-        REQUIRE_THROWS_AS( access->WaitForEndOfRun(), Exception );
-        REQUIRE_THROWS_AS( access->Continue(), Exception );
-        REQUIRE_THROWS_AS( access->Cancel(), Exception );
-        REQUIRE_THROWS_AS( access->IsCanceled(), Exception );
-        REQUIRE_THROWS_AS( access->Break(), Exception );
-        REQUIRE_THROWS_AS( access->IsAtBreak(), Exception );
-        REQUIRE_THROWS_AS( access->ChainIsQuitting( "blah" ), Exception );
+        REQUIRE_FALSE( tcaControlAccess->GetControl() );
+        REQUIRE_THROWS_AS( tcaControlAccess->WaitToContinue(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->WaitForBreakOrCanceled(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->WaitForEndOfRun(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->Continue(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->Cancel(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->IsCanceled(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->Break(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->IsAtBreak(), Exception );
+        REQUIRE_THROWS_AS( tcaControlAccess->ChainIsQuitting( "blah" ), Exception );
     }
 
-    Controller control;
+    Controller tcaControl;
 
     SECTION( "Basics" )
     {
-        REQUIRE_FALSE( access->IsCanceled() );
-        access->Cancel( 5 );
-        REQUIRE( access->IsCanceled() );
+        REQUIRE_FALSE( tcaControlAccess->IsCanceled() );
+        tcaControlAccess->Cancel( 5 );
+        REQUIRE( tcaControlAccess->IsCanceled() );
     }
 
     SECTION( "WaitToContinue" )
     {
-        REQUIRE( access->WaitToContinue() );
+        REQUIRE( tcaControlAccess->WaitToContinue() );
     }
 
     SECTION( "WaitForBreakOrCanceled" )
     {
-        access->Break();
-        REQUIRE( access->WaitForBreakOrCanceled() == true );
+        tcaControlAccess->Break();
+        REQUIRE( tcaControlAccess->WaitForBreakOrCanceled() == true );
     }
 
     SECTION( "BreakContinue" )
     {
-        REQUIRE_FALSE( access->IsCanceled() );
+        REQUIRE_FALSE( tcaControlAccess->IsCanceled() );
 
         // This thread will do the breaking and continuing
         std::thread thread( [&](){ 
             std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
 
-            access->Break(); // step 1
+            tcaControlAccess->Break(); // step 1
 
             std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
 
-            access->Continue(); // step 2
+            tcaControlAccess->Continue(); // step 2
 
             std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
 
-            access->Cancel( 0 ); // step 3
+            tcaControlAccess->Cancel( 0 ); // step 3
         } );
         
         // Waiting for break (step 1)
-        REQUIRE( access->WaitForBreakOrCanceled() );
-        REQUIRE_FALSE( access->IsCanceled() );
+        REQUIRE( tcaControlAccess->WaitForBreakOrCanceled() );
+        REQUIRE_FALSE( tcaControlAccess->IsCanceled() );
 
         // Waiting for continue (step 2)
-        access->WaitToContinue();
-        REQUIRE_FALSE( access->IsCanceled() );
+        tcaControlAccess->WaitToContinue();
+        REQUIRE_FALSE( tcaControlAccess->IsCanceled() );
 
         // Waiting for cancelation (step 3)
-        REQUIRE_FALSE( access->WaitForBreakOrCanceled() );
-        REQUIRE( access->IsCanceled() );
+        REQUIRE_FALSE( tcaControlAccess->WaitForBreakOrCanceled() );
+        REQUIRE( tcaControlAccess->IsCanceled() );
 
         thread.join();
 
@@ -91,19 +91,19 @@ TEST_CASE( "control_access", "[control]" )
     {
         // As if an error is thrown
         std::exception_ptr exceptPtr = std::make_exception_ptr( Exception() << "Test: ChainIsQuitting, throwing Exception" );
-        REQUIRE_NOTHROW( access->ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
+        REQUIRE_NOTHROW( tcaControlAccess->ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
     }
 
     SECTION( "ReturnBuffer" )
     {
-        REQUIRE_FALSE( access->HasReturn() );
-        REQUIRE_THROWS_AS( access->GetReturn<double>(), Exception ); // have to pick a return argument, so I just picked <double> in this case; it could be anything for this test
+        REQUIRE_FALSE( tcaControlAccess->HasReturn() );
+        REQUIRE_THROWS_AS( tcaControlAccess->GetReturn<double>(), Exception ); // have to pick a return argument, so I just picked <double> in this case; it could be anything for this test
         double retval = 5;
-        auto retBuf = access->BreakAndReturn(retval);
+        auto retBuf = tcaControlAccess->BreakAndReturn(retval);
         // check that we're now at a break point
-        REQUIRE( access->IsAtBreak() );
-        REQUIRE( access->HasReturn() );
-        // we can access the return variable through the buffer
+        REQUIRE( tcaControlAccess->IsAtBreak() );
+        REQUIRE( tcaControlAccess->HasReturn() );
+        // we can tcaControlAccess the return variable through the buffer
         REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
         // we can change the value of the return variable using the buffer
         std::get<0>( retBuf ) = 10.;
diff --git a/Testing/Cpp/TestController.cc b/Testing/Cpp/TestController.cc
index 785e24f..26b2415 100644
--- a/Testing/Cpp/TestController.cc
+++ b/Testing/Cpp/TestController.cc
@@ -51,22 +51,22 @@ TEST_CASE( "controller", "[control]" )
     using namespace Nymph;
     using namespace NymphTesting;
 
-    ControllerRevealer control;
+    ControllerRevealer tcControl;
 
     SECTION( "Basics" )
     {
-        control.SetCycleTimeMS( 100 );
-        REQUIRE( control.GetCycleTimeMS() == 100 );
-        control.SetCycleTimeMS( 500 );
+        tcControl.SetCycleTimeMS( 100 );
+        REQUIRE( tcControl.GetCycleTimeMS() == 100 );
+        tcControl.SetCycleTimeMS( 500 );
 
-        REQUIRE_NOTHROW( control.Mutex().lock() );
-        REQUIRE_NOTHROW( control.Mutex().unlock() );
+        REQUIRE_NOTHROW( tcControl.Mutex().lock() );
+        REQUIRE_NOTHROW( tcControl.Mutex().unlock() );
 
-        REQUIRE_FALSE( control.GetBreakFlag() );
+        REQUIRE_FALSE( tcControl.GetBreakFlag() );
 
-        REQUIRE_FALSE( control.IsCanceled() );
-        control.Cancel( 5 );
-        REQUIRE( control.IsCanceled() );
+        REQUIRE_FALSE( tcControl.IsCanceled() );
+        tcControl.Cancel( 5 );
+        REQUIRE( tcControl.IsCanceled() );
     }
 
     SECTION( "Configure" )
@@ -78,68 +78,68 @@ TEST_CASE( "controller", "[control]" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( control.Configure( config->as_node() ) );
-        REQUIRE( control.GetCycleTimeMS() == 10 );
+        REQUIRE_NOTHROW( tcControl.Configure( config->as_node() ) );
+        REQUIRE( tcControl.GetCycleTimeMS() == 10 );
     }
 
     SECTION( "WaitToContinue" )
     {
-        control.SetCanceled( false );
-        control.SetBreakFlag( false );
-        REQUIRE( control.WaitToContinue() );
+        tcControl.SetCanceled( false );
+        tcControl.SetBreakFlag( false );
+        REQUIRE( tcControl.WaitToContinue() );
 
-        control.SetBreakFlag( true );
-        control.SetCanceled( true );
-        REQUIRE_FALSE( control.WaitToContinue() );    
+        tcControl.SetBreakFlag( true );
+        tcControl.SetCanceled( true );
+        REQUIRE_FALSE( tcControl.WaitToContinue() );    
     }
 
     SECTION( "WaitForBreakOrCanceled" )
     {
-        control.SetCanceled( false );
-        control.SetBreakFlag( true );
-        REQUIRE( control.WaitForBreakOrCanceled() == control.GetBreakFlag() );
+        tcControl.SetCanceled( false );
+        tcControl.SetBreakFlag( true );
+        REQUIRE( tcControl.WaitForBreakOrCanceled() == tcControl.GetBreakFlag() );
 
-        control.SetCanceled( true );
-        control.SetBreakFlag( false );
-        REQUIRE_FALSE( control.WaitForBreakOrCanceled() );
+        tcControl.SetCanceled( true );
+        tcControl.SetBreakFlag( false );
+        REQUIRE_FALSE( tcControl.WaitForBreakOrCanceled() );
 
 
     }
 
     SECTION( "BreakContinue" )
     {
-        REQUIRE_FALSE( control.GetBreakFlag() );
-        REQUIRE_FALSE( control.IsCanceled() );
+        REQUIRE_FALSE( tcControl.GetBreakFlag() );
+        REQUIRE_FALSE( tcControl.IsCanceled() );
 
         // This thread will do the breaking and continuing
         std::thread thread( [&](){ 
             std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
 
-            control.Break(); // step 1
+            tcControl.Break(); // step 1
 
             std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
 
-            control.Continue(); // step 2
+            tcControl.Continue(); // step 2
 
             std::this_thread::sleep_for( std::chrono::milliseconds(1000) );
 
-            control.Cancel( 0 ); // step 3
+            tcControl.Cancel( 0 ); // step 3
         } );
         
         // Waiting for break (step 1)
-        REQUIRE( control.WaitForBreakOrCanceled() );
-        REQUIRE( control.GetBreakFlag() );
-        REQUIRE_FALSE( control.IsCanceled() );
+        REQUIRE( tcControl.WaitForBreakOrCanceled() );
+        REQUIRE( tcControl.GetBreakFlag() );
+        REQUIRE_FALSE( tcControl.IsCanceled() );
 
         // Waiting for continue (step 2)
-        control.WaitToContinue();
-        REQUIRE_FALSE( control.GetBreakFlag() );
-        REQUIRE_FALSE( control.IsCanceled() );
+        tcControl.WaitToContinue();
+        REQUIRE_FALSE( tcControl.GetBreakFlag() );
+        REQUIRE_FALSE( tcControl.IsCanceled() );
 
         // Waiting for cancelation (step 3)
-        REQUIRE_FALSE( control.WaitForBreakOrCanceled() );
-        REQUIRE_FALSE( control.GetBreakFlag() );
-        REQUIRE( control.IsCanceled() );
+        REQUIRE_FALSE( tcControl.WaitForBreakOrCanceled() );
+        REQUIRE_FALSE( tcControl.GetBreakFlag() );
+        REQUIRE( tcControl.IsCanceled() );
 
         thread.join();
 
@@ -149,31 +149,31 @@ TEST_CASE( "controller", "[control]" )
     {
         // As if an error is thrown
         std::exception_ptr exceptPtr = std::make_exception_ptr( Exception() << "Test: ChainIsQuitting, throwing Exception" );
-        REQUIRE_NOTHROW( control.ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
+        REQUIRE_NOTHROW( tcControl.ChainIsQuitting( "TestController::ChainIsQuitting::Exception", exceptPtr ) );
 
-        control.reset_cancel();
+        tcControl.reset_cancel();
 
         // As if QuitChain is thrown
         std::exception_ptr qcPtr = std::make_exception_ptr( QuitChain() << "Test: ChainIsQuitting, throwing QuitChain" );
-        REQUIRE_NOTHROW( control.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", qcPtr ) );
+        REQUIRE_NOTHROW( tcControl.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", qcPtr ) );
 
-        control.reset_cancel();
+        tcControl.reset_cancel();
 
         // As if std::runtime_error is thrown; not handled by ChainIsQuitting()
         std::exception_ptr runtimePtr = std::make_exception_ptr( std::runtime_error("Test: ChainIsQuitting, throwing std::runtime_error") );
-        REQUIRE_THROWS_AS( control.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", runtimePtr ), std::runtime_error );
+        REQUIRE_THROWS_AS( tcControl.ChainIsQuitting( "TestController::ChainIsQuitting::QuitChain", runtimePtr ), std::runtime_error );
 
     }
 
     SECTION( "ReturnBuffer" )
     {
-        REQUIRE_FALSE( control.HasReturn() );
-        REQUIRE_THROWS_AS( control.GetReturn<double>(), Exception ); // have to pick a return argument, so I just picked <double> in this case; it could be anything for this test
+        REQUIRE_FALSE( tcControl.HasReturn() );
+        REQUIRE_THROWS_AS( tcControl.GetReturn<double>(), Exception ); // have to pick a return argument, so I just picked <double> in this case; it could be anything for this test
         double retval = 5;
-        auto retBuf = control.BreakAndReturn(retval);
+        auto retBuf = tcControl.BreakAndReturn(retval);
         // check that we're now at a break point
-        REQUIRE( control.IsAtBreak() );
-        REQUIRE( control.HasReturn() );
+        REQUIRE( tcControl.IsAtBreak() );
+        REQUIRE( tcControl.HasReturn() );
         // we can access the return variable through the buffer
         REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
         // we can change the value of the return variable using the buffer
diff --git a/Testing/Cpp/TestData.cc b/Testing/Cpp/TestData.cc
index ecf6eee..e532c76 100644
--- a/Testing/Cpp/TestData.cc
+++ b/Testing/Cpp/TestData.cc
@@ -15,15 +15,15 @@ TEST_CASE( "data", "[data]" )
     using namespace Nymph;
     using namespace NymphTesting;
 
-    TestData1 data1;
-    REQUIRE( data1.GetIValue1() == 0 );
-    REQUIRE( data1.GetIValue2() == 5 );
+    TestData1 tdData1;
+    REQUIRE( tdData1.GetIValue1() == 0 );
+    REQUIRE( tdData1.GetIValue2() == 5 );
 
-    data1.SetIValue1( 50 );
-    REQUIRE( data1.GetIValue1() == 50 );
+    tdData1.SetIValue1( 50 );
+    REQUIRE( tdData1.GetIValue1() == 50 );
 
-    TestData2 data2;
-    REQUIRE( data2.GetDValue1() == Approx( 0.0 ) );
-    REQUIRE( data2.GetDValue2() == Approx( 10.0 ) );
+    TestData2 tdData2;
+    REQUIRE( tdData2.GetDValue1() == Approx( 0.0 ) );
+    REQUIRE( tdData2.GetDValue2() == Approx( 10.0 ) );
 
 }
diff --git a/Testing/Cpp/TestDataFrame.cc b/Testing/Cpp/TestDataFrame.cc
index f957820..f2792f7 100644
--- a/Testing/Cpp/TestDataFrame.cc
+++ b/Testing/Cpp/TestDataFrame.cc
@@ -17,64 +17,64 @@ TEST_CASE( "data_frame", "[data]" )
     using namespace Nymph;
     using namespace NymphTesting;
 
-    DataFrame frame;
-    const DataFrame& cFrame = frame;
+    DataFrame tdfFrame;
+    const DataFrame& tdfcFrame = tdfFrame;
 
     // empty Has<>() should return true
-    REQUIRE( frame.Has<>() );
+    REQUIRE( tdfFrame.Has<>() );
 
-    REQUIRE( frame.DataObjects().empty() );
-    REQUIRE( frame.Empty() );
-    REQUIRE_FALSE( frame.Has< TestData1 >() );
-    REQUIRE_FALSE( frame.Has< TestData2 >() );
+    REQUIRE( tdfFrame.DataObjects().empty() );
+    REQUIRE( tdfFrame.Empty() );
+    REQUIRE_FALSE( tdfFrame.Has< TestData1 >() );
+    REQUIRE_FALSE( tdfFrame.Has< TestData2 >() );
 
     // create a data object  with Get()
-    TestData1& data1 = frame.Get< TestData1 >();
-    REQUIRE( frame.Has< TestData1 >() );
+    TestData1& tdfData1 = tdfFrame.Get< TestData1 >();
+    REQUIRE( tdfFrame.Has< TestData1 >() );
     // ensure TestData1 object was initialized correctly
-    REQUIRE( data1.GetIValue1() == 0 );
-    REQUIRE( data1.GetIValue2() == 5 );
+    REQUIRE( tdfData1.GetIValue1() == 0 );
+    REQUIRE( tdfData1.GetIValue2() == 5 );
 
     // make sure that we haven't made a copy of the data object
-    data1.SetIValue1( 50 );
-    REQUIRE( data1.GetIValue1() == 50 );
-    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 50 );
+    tdfData1.SetIValue1( 50 );
+    REQUIRE( tdfData1.GetIValue1() == 50 );
+    REQUIRE( tdfFrame.Get< TestData1 >().GetIValue1() == 50 );
 
     // check const access
     // currently has TestData1; does not have TestData2
-    REQUIRE( cFrame.Get< TestData1 >().GetIValue1() == 50 );
-    REQUIRE_THROWS_AS( cFrame.Get< TestData2 >(), DataFrameException );
+    REQUIRE( tdfcFrame.Get< TestData1 >().GetIValue1() == 50 );
+    REQUIRE_THROWS_AS( tdfcFrame.Get< TestData2 >(), DataFrameException );
 
     // remove a data object
     // currently has TestData1; does not have TestData2
-    REQUIRE_NOTHROW( frame.Remove< TestData2 >() );
-    REQUIRE_NOTHROW( frame.Remove< TestData1 >() );
-    REQUIRE_FALSE( frame.Has< TestData1 >() );
-    REQUIRE( frame.Empty() );
+    REQUIRE_NOTHROW( tdfFrame.Remove< TestData2 >() );
+    REQUIRE_NOTHROW( tdfFrame.Remove< TestData1 >() );
+    REQUIRE_FALSE( tdfFrame.Has< TestData1 >() );
+    REQUIRE( tdfFrame.Empty() );
 
     // set an object with a raw pointer
-    TestData2* newTestData2Ptr = new TestData2();
-    REQUIRE_NOTHROW( frame.Set( newTestData2Ptr ) );
-    REQUIRE( frame.Has< TestData2 >() );
-    REQUIRE( (Data*)newTestData2Ptr == frame.DataObjects()[typeid(TestData2)].get() ); // we did not make a copy
+    TestData2* tdfNewTestData2Ptr = new TestData2();
+    REQUIRE_NOTHROW( tdfFrame.Set( tdfNewTestData2Ptr ) );
+    REQUIRE( tdfFrame.Has< TestData2 >() );
+    REQUIRE( (Data*)tdfNewTestData2Ptr == tdfFrame.DataObjects()[typeid(TestData2)].get() ); // we did not make a copy
 
     // set an object with a unique_ptr
-    std::unique_ptr< TestData1 > newTestData1Ptr( new TestData1 );
-    REQUIRE_NOTHROW( frame.Set( std::move(newTestData1Ptr) ) );
-    REQUIRE_FALSE( newTestData1Ptr );
-    REQUIRE( frame.Has< TestData1 >() );
-    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 0 ); // check that fIValue1 has the default value; we'll overwrite the data object next, and verify we have the new value
+    std::unique_ptr< TestData1 > tdfNewTestData1Ptr( new TestData1 );
+    REQUIRE_NOTHROW( tdfFrame.Set( std::move(tdfNewTestData1Ptr) ) );
+    REQUIRE_FALSE( tdfNewTestData1Ptr );
+    REQUIRE( tdfFrame.Has< TestData1 >() );
+    REQUIRE( tdfFrame.Get< TestData1 >().GetIValue1() == 0 ); // check that fIValue1 has the default value; we'll overwrite the data object next, and verify we have the new value
 
     // verify multiple data types are present (TestData1 and TestData2 should be present at this point)
-    REQUIRE( frame.Has< TestData1, TestData2 >() );
-    REQUIRE( frame.Has< TestData2, TestData1 >() );
+    REQUIRE( tdfFrame.Has< TestData1, TestData2 >() );
+    REQUIRE( tdfFrame.Has< TestData2, TestData1 >() );
 
     // set an object with a copy of an object
-    TestData1 anotherTestData1;
-    anotherTestData1.SetIValue1( 4000 );
-    REQUIRE_NOTHROW( frame.Set( anotherTestData1 ) );
-    REQUIRE( anotherTestData1.GetIValue1() == 4000 );
-    REQUIRE( frame.Get< TestData1 >().GetIValue1() == 4000 );
-    REQUIRE_FALSE( (Data*)(&anotherTestData1) == frame.DataObjects()[typeid(TestData1)].get() ); // we made a copy
+    TestData1 tdfAnotherTestData1;
+    tdfAnotherTestData1.SetIValue1( 4000 );
+    REQUIRE_NOTHROW( tdfFrame.Set( tdfAnotherTestData1 ) );
+    REQUIRE( tdfAnotherTestData1.GetIValue1() == 4000 );
+    REQUIRE( tdfFrame.Get< TestData1 >().GetIValue1() == 4000 );
+    REQUIRE_FALSE( (Data*)(&tdfAnotherTestData1) == tdfFrame.DataObjects()[typeid(TestData1)].get() ); // we made a copy
 
 }
diff --git a/Testing/Cpp/TestException.cc b/Testing/Cpp/TestException.cc
index eb0785c..70837d4 100644
--- a/Testing/Cpp/TestException.cc
+++ b/Testing/Cpp/TestException.cc
@@ -17,29 +17,29 @@ TEST_CASE( "exception", "[utility]" )
 {
     using namespace Nymph;
 
-    Exception blankEx;
-    REQUIRE( blankEx.what() == std::string() );
-    REQUIRE( blankEx.filename().empty() );
-    REQUIRE( blankEx.line() == 0 );
+    Exception teBlankEx;
+    REQUIRE( teBlankEx.what() == std::string() );
+    REQUIRE( teBlankEx.filename().empty() );
+    REQUIRE( teBlankEx.line() == 0 );
 
-    Exception testEx( "some_file", 1 );
-    REQUIRE( testEx.filename() == "some_file" );
-    REQUIRE( testEx.line() == 1 );
+    Exception teTestEx( "some_file", 1 );
+    REQUIRE( teTestEx.filename() == "some_file" );
+    REQUIRE( teTestEx.line() == 1 );
 
-    std::string testMessage("test message 2: ");
+    std::string teTestMessage("test message 2: ");
     int testInt = 5;
-    testEx << testMessage << testInt;
-    REQUIRE( testEx.what() == testMessage + std::to_string(testInt) );
+    teTestEx << teTestMessage << testInt;
+    REQUIRE( teTestEx.what() == teTestMessage + std::to_string(testInt) );
 
-    /*EXCEPT_HERE( Exception testEx );*/ 
+    /*EXCEPT_HERE( Exception teTestEx );*/ 
     // uses of __LINE__ need to be on the same line
-    testEx( __FILE__, __LINE__ ); std::string recordFile( __FILE__ ); int recordLine( __LINE__ );
-    REQUIRE( testEx.filename() == recordFile );
-    REQUIRE( testEx.line() == recordLine );
+    teTestEx( __FILE__, __LINE__ ); std::string tdeRecordFile( __FILE__ ); int tdeRecordLine( __LINE__ );
+    REQUIRE( teTestEx.filename() == tdeRecordFile );
+    REQUIRE( teTestEx.line() == tdeRecordLine );
 
-    EXCEPT_HERE( testEx ); recordFile = std::string(__FILE__); recordLine = __LINE__;
-    REQUIRE( testEx.filename() == recordFile );
-    REQUIRE( testEx.line() == recordLine );
+    EXCEPT_HERE( teTestEx ); tdeRecordFile = std::string(__FILE__); tdeRecordLine = __LINE__;
+    REQUIRE( teTestEx.filename() == tdeRecordFile );
+    REQUIRE( teTestEx.line() == tdeRecordLine );
 }
 
 TEST_CASE( "throw", "[utility]" )
@@ -57,112 +57,112 @@ TEST_CASE( "throw", "[utility]" )
         REQUIRE( e.line() == 0 );
     }
     
-    std::string recordFile;
-    int recordLine = 0;
+    std::string tdeRecordFile;
+    int tdeRecordLine = 0;
 
     try
     {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        tdeRecordFile = std::string(__FILE__); tdeRecordLine = __LINE__;
         throw Exception( __FILE__, __LINE__ ) << "test message";
     }
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == tdeRecordFile );
+        REQUIRE( e.line() == tdeRecordLine + 1 );  // line number was recorded just before the throw
     }
     
     // Give CREATE_EXCEPT_HERE the class name
     try
     {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        tdeRecordFile = std::string(__FILE__); tdeRecordLine = __LINE__;
         throw CREATE_EXCEPT_HERE( Exception );
     }
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string() );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == tdeRecordFile );
+        REQUIRE( e.line() == tdeRecordLine + 1 );  // line number was recorded just before the throw
     }
     
     // Give EXCEPT_HERE an exception
     try
     {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        tdeRecordFile = std::string(__FILE__); tdeRecordLine = __LINE__;
         throw EXCEPT_HERE( Exception() << "test message" );
     }
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == tdeRecordFile );
+        REQUIRE( e.line() == tdeRecordLine + 1 );  // line number was recorded just before the throw
     }
     
     // THROW macro
     try
     {
-        recordFile = std::string(__FILE__); recordLine = __LINE__;
+        tdeRecordFile = std::string(__FILE__); tdeRecordLine = __LINE__;
         THROW_EXCEPT_HERE( Exception() << "test message" );
     }
     catch(const Exception& e)
     {
         REQUIRE( e.what() == std::string("test message") );
-        REQUIRE( e.filename() == recordFile );
-        REQUIRE( e.line() == recordLine + 1 );  // line number was recorded just before the throw
+        REQUIRE( e.filename() == tdeRecordFile );
+        REQUIRE( e.line() == tdeRecordLine + 1 );  // line number was recorded just before the throw
     }
     
 }
 
-const unsigned layers = 5;
-const std::string firstThrowText( "First throw" );
-const std::string nestedThrowText( "nested throw at layer " );
+const unsigned tdeLayers = 5;
+const std::string tdeFirstThrowText( "First throw" );
+const std::string tdeNestedThrowText( "nested throw at layer " );
 
 void CatchThrow() 
 {
-    //const static unsigned layers = 5;
-    static unsigned count = 0;
+    //const static unsigned tdeLayers = 5;
+    static unsigned tdeCount = 0;
 
     try
     {
-        if( count == layers )
+        if( tdeCount == tdeLayers )
         {
-            throw CREATE_EXCEPT_HERE( Nymph::Exception ) << firstThrowText;
+            throw CREATE_EXCEPT_HERE( Nymph::Exception ) << tdeFirstThrowText;
         }
         else
         {
-            ++count;
+            ++tdeCount;
             CatchThrow();
             return;
         }
     }
     catch(const Nymph::Exception& e)
     {
-        if( count == layers )
+        if( tdeCount == tdeLayers )
         {
-            REQUIRE( e.what() == firstThrowText );
+            REQUIRE( e.what() == tdeFirstThrowText );
         }
         else
         {
-            std::string what( e.what() );
-            REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
+            std::string tdeWhat( e.what() );
+            REQUIRE( tdeWhat.substr(0, tdeNestedThrowText.size()) == tdeNestedThrowText );
         }
-        THROW_NESTED_EXCEPT_HERE( Nymph::Exception() << nestedThrowText << count-- ) ;
+        THROW_NESTED_EXCEPT_HERE( Nymph::Exception() << tdeNestedThrowText << tdeCount-- ) ;
     }
 }
 
-void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
+void PrintExceptionWithTests( const Nymph::Exception& e, unsigned tdeCount = 0 )
 {
-    std::string prefix( count, ' ' );
+    std::string prefix( tdeCount, ' ' );
     LINFO( testlog, prefix << "Thrown at: " << e.where() );
     LINFO( testlog, prefix << e.what() );
-    if( count == layers + 1 )
+    if( tdeCount == tdeLayers + 1 )
     {
-        REQUIRE( e.what() == firstThrowText );
+        REQUIRE( e.what() == tdeFirstThrowText );
     }
     else
     {
-        std::string what( e.what() );
-        REQUIRE( what.substr(0, nestedThrowText.size()) == nestedThrowText );
+        std::string tdeWhat( e.what() );
+        REQUIRE( tdeWhat.substr(0, tdeNestedThrowText.size()) == tdeNestedThrowText );
     }
 
     try
@@ -171,7 +171,7 @@ void PrintExceptionWithTests( const Nymph::Exception& e, unsigned count = 0 )
     }
     catch(const Nymph::Exception& e)
     {
-        PrintExceptionWithTests( e, ++count );
+        PrintExceptionWithTests( e, ++tdeCount );
     }
     return;
 }
@@ -191,20 +191,3 @@ TEST_CASE( "nested_throw", "[utility]" )
     }
     
 }
-
-/* removed for trying home-grown exceptions, 1/10/22
-    auto throwException = []() {
-        BOOST_THROW_EXCEPTION( Exception() << "Test exception" << eom );
-    };
-
-    REQUIRE_THROWS_AS( throwException(), Exception );
-
-    try
-    {
-        throwException();
-    }
-    catch(const Exception& e)
-    {
-        LWARN( testlog, diagnostic_information(e) );
-    }
-*/  
diff --git a/Testing/Cpp/TestPrimaryProcessor.cc b/Testing/Cpp/TestPrimaryProcessor.cc
index 77347e0..0ada75a 100644
--- a/Testing/Cpp/TestPrimaryProcessor.cc
+++ b/Testing/Cpp/TestPrimaryProcessor.cc
@@ -21,25 +21,25 @@ TEST_CASE( "primary_processor", "[primary_processor]" )
 
     //SharedControl::get_instance()->Reset();
 
-    TestPrimaryProc tester;
-    CIQThrowController controller;
+    TestPrimaryProc tppTester;
+    CIQThrowController tppController;
 
     // SignalNewValue test
-    tester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
-    tester.ConnectASlot( "value", tester, "value" );
-    tester();
-    REQUIRE( tester.GetValue() == tester.GetNewValue() );
+    tppTester.SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
+    tppTester.ConnectASlot( "value", tppTester, "value" );
+    tppTester();
+    REQUIRE( tppTester.GetValue() == tppTester.GetNewValue() );
 
     // WaitTwoSec test
     // -- no test implemented here right now --
-    //tester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
+    //tppTester.SetTestSelection( TestPrimaryProc::TestType::WaitTwoSec );
 
     // ThrowExcept test
-    tester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
-    REQUIRE_THROWS_AS( tester(), TestPPException );
+    tppTester.SetTestSelection( TestPrimaryProc::TestType::ThrowExcept );
+    REQUIRE_THROWS_AS( tppTester(), TestPPException );
 
     
     
 
-    //REQUIRE( tester.ValueSig().GetControl() == &control );
+    //REQUIRE( tppTester.ValueSig().GetControl() == &control );
 }
diff --git a/Testing/Cpp/TestProcessor.cc b/Testing/Cpp/TestProcessor.cc
index 64e441b..00ba641 100644
--- a/Testing/Cpp/TestProcessor.cc
+++ b/Testing/Cpp/TestProcessor.cc
@@ -20,15 +20,15 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
     using namespace NymphTesting;
 
     // need a controller to exist
-    CIQThrowController controller;
+    CIQThrowController tpController;
 
     //SharedControl::get_instance()->Reset();
 
-    TestProc tester;
+    TestProc tpProcessor;
 
     SECTION( "Configuration" )
     {
-        REQUIRE( tester.GetValue() == 0 );
+        REQUIRE( tpProcessor.GetValue() == 0 );
 
         // setup the config parameter
         scarab::param_node config;
@@ -36,16 +36,16 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         config.add( "value", configValue );
 
         // perform configuration with no value for "string"
-        REQUIRE_NOTHROW( tester.Configure( config ) );
+        REQUIRE_NOTHROW( tpProcessor.Configure( config ) );
         // check that the value was set correctly
-        REQUIRE( tester.GetValue() == configValue );
+        REQUIRE( tpProcessor.GetValue() == configValue );
 
         // peform configuration with an illegal value for "string"
         config.add( "string", "illegal value" );
-        REQUIRE_THROWS_AS( tester.Configure( config ), ConfigException );
+        REQUIRE_THROWS_AS( tpProcessor.Configure( config ), ConfigException );
         try
         {
-            tester.Configure( config );
+            tpProcessor.Configure( config );
         }
         catch( const ConfigException& e )
         {
@@ -54,16 +54,16 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         
         // perform configuration with a legal value for "string"
         config["string"]().set( "ok value 1" );
-        REQUIRE_NOTHROW( tester.Configure( config ) );
-        REQUIRE( tester.StringValue() == "ok 1" );
+        REQUIRE_NOTHROW( tpProcessor.Configure( config ) );
+        REQUIRE( tpProcessor.StringValue() == "ok 1" );
 
     }
 
     SECTION( "Signals and Slots" )
     {
         // check that the processor has the right number of signals and slots registered
-        REQUIRE( tester.Signals().size() == 2 );
-        REQUIRE( tester.Slots().size() == 3 );
+        REQUIRE( tpProcessor.Signals().size() == 2 );
+        REQUIRE( tpProcessor.Slots().size() == 3 );
 
         //**************************
         // Testing signal->slot
@@ -72,48 +72,48 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         // this is a slot using a lambda function to set a variable
         int lambdaValue = 0;
         Slot< int > lambdaSlot( "lambdaSlot", [&lambdaValue](int input){ lambdaValue = input; } );
-        tester.RegisterSlot( "lambdaSlot", &lambdaSlot );
+        tpProcessor.RegisterSlot( "lambdaSlot", &lambdaSlot );
 
         // this slot is a member function of an object other than the processor
         TestSlotOwner slotOwner;
-        Slot< int > slotOwnerSlot( "slotOwnerSlot", &tester, &slotOwner, &TestSlotOwner::TestSlotFunc );
+        Slot< int > slotOwnerSlot( "slotOwnerSlot", &tpProcessor, &slotOwner, &TestSlotOwner::TestSlotFunc );
 
         // check initial value
         REQUIRE( slotOwner.fValue == 0 );
         REQUIRE( lambdaValue == 0 );
 
         // we've added a couple more slots
-        REQUIRE( tester.Slots().size() == 5 );
+        REQUIRE( tpProcessor.Slots().size() == 5 );
 
         // no connections yet
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 0 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 0 );
+        REQUIRE( tpProcessor.Signals().at("value")->Connections().size() == 0 );
+        REQUIRE( tpProcessor.Slots().at("value")->Connections().size() == 0 );
 
         // make a connection
-        tester.ConnectASlot( "value", tester, "value" );
+        tpProcessor.ConnectASlot( "value", tpProcessor, "value" );
 
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Slots().at("value")->Connections().size() == 1 );
 
         // repeat connection should be ignored
-        tester.ConnectASlot( "value", tester, "value" );
+        tpProcessor.ConnectASlot( "value", tpProcessor, "value" );
 
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Signals().at("value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Slots().at("value")->Connections().size() == 1 );
 
         // connect the lambda slot to the signal
-        tester.ConnectASignal( tester, "value", "lambdaSlot" );
+        tpProcessor.ConnectASignal( tpProcessor, "value", "lambdaSlot" );
 
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 2 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("lambdaSlot")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Signals().at("value")->Connections().size() == 2 );
+        REQUIRE( tpProcessor.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Slots().at("lambdaSlot")->Connections().size() == 1 );
 
         // connect the exteranlly-owned slot to the signal
-        Processor::ConnectSignalToSlot( tester.Signals().at("value"), tester.Slots().at("slotOwnerSlot") );
+        Processor::ConnectSignalToSlot( tpProcessor.Signals().at("value"), tpProcessor.Slots().at("slotOwnerSlot") );
 
-        REQUIRE( tester.Signals().at("value")->Connections().size() == 3 );
-        REQUIRE( tester.Slots().at("value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("slotOwnerSlot")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Signals().at("value")->Connections().size() == 3 );
+        REQUIRE( tpProcessor.Slots().at("value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Slots().at("slotOwnerSlot")->Connections().size() == 1 );
 
         // now have "signal" connected to three slots:
         //     value --> value
@@ -122,10 +122,11 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
 
         // emit the signal
         int newValue = 10;
-        tester.ValueSig().Emit( newValue );
+        LWARN( testlog, "do breakpoint in signal second-value? " << tpProcessor.Signals().at("second-value")->GetDoBreakpoint() );
+        tpProcessor.ValueSig().Emit( newValue );
 
         // check that all values have been changed
-        REQUIRE( tester.GetValue() == newValue );
+        REQUIRE( tpProcessor.GetValue() == newValue );
         REQUIRE( slotOwner.fValue == newValue );
         REQUIRE( lambdaValue == newValue );
 
@@ -134,21 +135,21 @@ TEST_CASE( "processor", "[signal],[slot],[processor]" )
         //*********************************
 
         // check initial value
-        REQUIRE( tester.GetSecondValue() == 0 );
+        REQUIRE( tpProcessor.GetSecondValue() == 0 );
 
-        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed().size() == 1 );
-        //REQUIRE( tester.Slots().at("second-value")->SignalsUsed()[0] == &tester.SecondValueSig() );
+        //REQUIRE( tpProcessor.Slots().at("second-value")->SignalsUsed().size() == 1 );
+        //REQUIRE( tpProcessor.Slots().at("second-value")->SignalsUsed()[0] == &tpProcessor.SecondValueSig() );
 
-        tester.ConnectASlot( "second-value", tester, "second-value-2" );
+        tpProcessor.ConnectASlot( "second-value", tpProcessor, "second-value-2" );
 
         // now have second-value (slot) emits second-value --> second-value-2
 
-        REQUIRE( tester.Signals().at("second-value")->Connections().size() == 1 );
-        REQUIRE( tester.Slots().at("second-value-2")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Signals().at("second-value")->Connections().size() == 1 );
+        REQUIRE( tpProcessor.Slots().at("second-value-2")->Connections().size() == 1 );
 
-        tester.SecondValueSlotFunction( newValue );
+        tpProcessor.SecondValueSlotFunction( newValue );
 
-        REQUIRE( tester.GetSecondValue() == newValue );
+        REQUIRE( tpProcessor.GetSecondValue() == newValue );
     }
 
 }
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
index b735dc3..6cb3f70 100644
--- a/Testing/Cpp/TestProcessorToolbox.cc
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -39,7 +39,7 @@ TEST_CASE( "processor_toolbox" )
 
     //SharedControl::get_instance()->Reset();
 
-    ProcTBRevealer toolbox;
+    ProcTBRevealer tptToolbox;
 
     SECTION( "AddRemoveProcessors" )
     {
@@ -48,16 +48,16 @@ TEST_CASE( "processor_toolbox" )
         std::string procName1( "testproc-1" );
         std::string procName2( "testproc-2" );
 
-        REQUIRE( toolbox.CouldBuild( "test-proc" ) );
-        REQUIRE( toolbox.CouldBuild( "test-primary" ) );
-        REQUIRE_FALSE( toolbox.CouldBuild( procName1 ) );
-        REQUIRE_FALSE( toolbox.CouldBuild( procName2 ) );
+        REQUIRE( tptToolbox.CouldBuild( "test-proc" ) );
+        REQUIRE( tptToolbox.CouldBuild( "test-primary" ) );
+        REQUIRE_FALSE( tptToolbox.CouldBuild( procName1 ) );
+        REQUIRE_FALSE( tptToolbox.CouldBuild( procName2 ) );
 
-        REQUIRE_FALSE( toolbox.HasProcessor( procName1 ) );
-        REQUIRE_FALSE( toolbox.HasProcessor( procName2 ) );
+        REQUIRE_FALSE( tptToolbox.HasProcessor( procName1 ) );
+        REQUIRE_FALSE( tptToolbox.HasProcessor( procName2 ) );
 
-        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
-        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
+        REQUIRE_FALSE( tptToolbox.GetProcessor( procName1 ) );
+        REQUIRE_FALSE( tptToolbox.GetProcessor( procName2 ) );
 
         std::string config_str(
             "- type: test-proc\n"
@@ -69,9 +69,9 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
+        REQUIRE_NOTHROW( tptToolbox.ConfigureProcessors( config->as_array() ) );
 
-        auto proc = toolbox.GetProcessor( procName1 );
+        auto proc = tptToolbox.GetProcessor( procName1 );
         REQUIRE( proc );
         REQUIRE( proc->Name() == procName1 );
 
@@ -80,24 +80,24 @@ TEST_CASE( "processor_toolbox" )
         REQUIRE( testProc->GetValue() == 5 );
         REQUIRE( testProc->StringValue() == "ok 1" );
 
-        std::shared_ptr< Processor > tp1 = toolbox.ReleaseProcessor( procName1 );
-        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
+        std::shared_ptr< Processor > tp1 = tptToolbox.ReleaseProcessor( procName1 );
+        REQUIRE_FALSE( tptToolbox.GetProcessor( procName1 ) );
 
-        REQUIRE( toolbox.AddProcessor( procName1, tp1 ) );
-        REQUIRE( toolbox.GetProcessor( procName1 ) );
+        REQUIRE( tptToolbox.AddProcessor( procName1, tp1 ) );
+        REQUIRE( tptToolbox.GetProcessor( procName1 ) );
 
-        REQUIRE( toolbox.AddProcessor(  "test-proc", procName2 ) );
-        REQUIRE( toolbox.GetProcessor( procName2 ) );
+        REQUIRE( tptToolbox.AddProcessor(  "test-proc", procName2 ) );
+        REQUIRE( tptToolbox.GetProcessor( procName2 ) );
 
-        REQUIRE( toolbox.HasProcessor( procName1 ) );
-        REQUIRE( toolbox.HasProcessor( procName2 ) );
+        REQUIRE( tptToolbox.HasProcessor( procName1 ) );
+        REQUIRE( tptToolbox.HasProcessor( procName2 ) );
 
-        REQUIRE( toolbox.RemoveProcessor( procName1 ) );
-        REQUIRE_FALSE( toolbox.GetProcessor( procName1 ) );
-        REQUIRE( toolbox.GetProcessor( procName2 ) );
+        REQUIRE( tptToolbox.RemoveProcessor( procName1 ) );
+        REQUIRE_FALSE( tptToolbox.GetProcessor( procName1 ) );
+        REQUIRE( tptToolbox.GetProcessor( procName2 ) );
 
-        toolbox.ClearProcessors();
-        REQUIRE_FALSE( toolbox.GetProcessor( procName2 ) );
+        tptToolbox.ClearProcessors();
+        REQUIRE_FALSE( tptToolbox.GetProcessor( procName2 ) );
     }
 
     SECTION( "Connections" )
@@ -107,7 +107,7 @@ TEST_CASE( "processor_toolbox" )
         std::string toParse( "proc:sigslot" );
         std::string parsedProc, parsedSigSlot;
 
-        toolbox.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
+        tptToolbox.ParseSignalSlotName( toParse, parsedProc, parsedSigSlot );
         REQUIRE( parsedProc == "proc" );
         REQUIRE( parsedSigSlot == "sigslot" );
 
@@ -128,10 +128,10 @@ TEST_CASE( "processor_toolbox" )
         auto p_config = translator.read_string( p_config_str, "yaml" );
         auto c_config = translator.read_string( c_config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( p_config->as_array() ) );
-        REQUIRE_NOTHROW( toolbox.ConfigureConnections( c_config->as_array() ) );
+        REQUIRE_NOTHROW( tptToolbox.ConfigureProcessors( p_config->as_array() ) );
+        REQUIRE_NOTHROW( tptToolbox.ConfigureConnections( c_config->as_array() ) );
 
-        std::shared_ptr< Processor > tp1 = toolbox.GetProcessor( procName1 );
+        std::shared_ptr< Processor > tp1 = tptToolbox.GetProcessor( procName1 );
 
         REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
         REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
@@ -141,7 +141,7 @@ TEST_CASE( "processor_toolbox" )
         tp1->Signals().at("value")->DisconnectAll();
         REQUIRE( tp1->Signals().at("value")->Connections().empty() );
 
-        toolbox.MakeConnection( "testproc-1:value", "testproc-1:second-value" );
+        tptToolbox.MakeConnection( "testproc-1:value", "testproc-1:second-value" );
         REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
         REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
         REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
@@ -150,7 +150,7 @@ TEST_CASE( "processor_toolbox" )
         tp1->Signals().at("value")->DisconnectAll();
         REQUIRE( tp1->Signals().at("value")->Connections().empty() );
 
-        toolbox.MakeConnection( "testproc-1", "value", "testproc-1", "second-value" );
+        tptToolbox.MakeConnection( "testproc-1", "value", "testproc-1", "second-value" );
         REQUIRE( tp1->Signals().at("value")->Connections().size() == 1 );
         REQUIRE( tp1->Slots().at("value")->Connections().size() == 0 );
         REQUIRE( tp1->Signals().at("second-value")->Connections().size() == 0 );
@@ -176,20 +176,20 @@ TEST_CASE( "processor_toolbox" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( tptToolbox.Configure( config->as_node() ) );
 
         // processors
-        REQUIRE( toolbox.GetProcessor( testprimaryName ) );
-        REQUIRE( toolbox.GetProcessor( testprimaryName )->Name() == testprimaryName );
+        REQUIRE( tptToolbox.GetProcessor( testprimaryName ) );
+        REQUIRE( tptToolbox.GetProcessor( testprimaryName )->Name() == testprimaryName );
 
-        REQUIRE( toolbox.GetProcessor( testprocName ) );
-        REQUIRE( toolbox.GetProcessor( testprocName )->Name() == testprocName );
+        REQUIRE( tptToolbox.GetProcessor( testprocName ) );
+        REQUIRE( tptToolbox.GetProcessor( testprocName )->Name() == testprocName );
 
         // connections
-        std::shared_ptr< Processor > testprimary = toolbox.GetProcessor( testprimaryName );
+        std::shared_ptr< Processor > testprimary = tptToolbox.GetProcessor( testprimaryName );
         REQUIRE( testprimary->Signals().at("value")->Connections().size() == 1 );
 
-        std::shared_ptr< Processor > testproc = toolbox.GetProcessor( testprocName );
+        std::shared_ptr< Processor > testproc = tptToolbox.GetProcessor( testprocName );
         REQUIRE( testproc->Signals().at("value")->Connections().size() == 0 );
         REQUIRE( testproc->Slots().at("value")->Connections().size() == 1 );
     }
diff --git a/Testing/Cpp/TestReturnBuffer.cc b/Testing/Cpp/TestReturnBuffer.cc
index 5e30092..07026db 100644
--- a/Testing/Cpp/TestReturnBuffer.cc
+++ b/Testing/Cpp/TestReturnBuffer.cc
@@ -17,30 +17,30 @@ TEST_CASE( "return_buffer_base", "[processor]" )
 {
     using namespace Nymph;
 
-    ReturnBufferBase rbb;
+    ReturnBufferBase trbRBB;
 
-    REQUIRE_THROWS_AS( rbb.GetReturn<double>(), Exception );
+    REQUIRE_THROWS_AS( trbRBB.GetReturn<double>(), Exception );
 }
 
 TEST_CASE( "return_buffer", "[processor]" )
 {
     using namespace Nymph;
 
-    int intData = 5;
-    double doubleData = 100.2;
-    std::string stringData( "I'm a string!" );
-    ReturnBuffer< int, double, std::string > buffer( intData, doubleData, stringData );
-
-    REQUIRE_NOTHROW( buffer.GetReturn() );
-    auto theReturn = buffer.GetReturn();
-    REQUIRE( std::get<0>( theReturn ) == 5 );
-    REQUIRE( std::get<1>( theReturn ) == Approx(100.2) );
-    REQUIRE( std::get<2>( theReturn ) == "I'm a string!" );
-
-    ReturnBufferBase& rbb = buffer;
-    auto theRBBReturn = rbb.GetReturn< int, double, std::string >();
-    REQUIRE( std::get<0>( theRBBReturn ) == 5 );
-    REQUIRE( std::get<1>( theRBBReturn ) == Approx(100.2) );
-    REQUIRE( std::get<2>( theRBBReturn ) == "I'm a string!" );
+    int trbIntData = 5;
+    double trbDoubleData = 100.2;
+    std::string trbStringData( "I'm a string!" );
+    ReturnBuffer< int, double, std::string > trbBuffer( trbIntData, trbDoubleData, trbStringData );
+
+    REQUIRE_NOTHROW( trbBuffer.GetReturn() );
+    auto trbTheReturn = trbBuffer.GetReturn();
+    REQUIRE( std::get<0>( trbTheReturn ) == 5 );
+    REQUIRE( std::get<1>( trbTheReturn ) == Approx(100.2) );
+    REQUIRE( std::get<2>( trbTheReturn ) == "I'm a string!" );
+
+    ReturnBufferBase& trbRBB = trbBuffer;
+    auto trbTheRBBReturn = trbRBB.GetReturn< int, double, std::string >();
+    REQUIRE( std::get<0>( trbTheRBBReturn ) == 5 );
+    REQUIRE( std::get<1>( trbTheRBBReturn ) == Approx(100.2) );
+    REQUIRE( std::get<2>( trbTheRBBReturn ) == "I'm a string!" );
 
 }
diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 335846a..8890352 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -20,14 +20,14 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
     using namespace NymphTesting;
 
     // need a controller to exist
-    CIQThrowController controller;
+    CIQThrowController tssController;
 
-    int testValue = 0;
+    int tssTestValue = 0;
 
-    Signal< int > signal( "signal" );
-    Slot< int > slot( "slot", [&](int aValue ){ testValue = aValue; } );
+    Signal< int > tssSignal( "tssSignal" );
+    Slot< int > tssSlot( "tssSlot", [&](int aValue ){ tssTestValue = aValue; } );
 
-    REQUIRE_FALSE( signal.GetDoBreakpoint() );
+    REQUIRE_FALSE( tssSignal.GetDoBreakpoint() );
 
     SECTION( "signal_emit" )
     {
@@ -37,76 +37,76 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
         SECTION( "basic emit and after break" )
         {
             // test successful throw, no unusual circumstances
-            REQUIRE_NOTHROW( signal.Emit( 1 ) );
+            REQUIRE_NOTHROW( tssSignal.Emit( 1 ) );
 
             // test successful throw after breakpoint not set by the signal
-            auto asyncReturn = std::async( std::launch::async, [&controller](){
-                controller.WaitForBreakOrCanceled();
+            auto asyncReturn = std::async( std::launch::async, [&tssController](){
+                tssController.WaitForBreakOrCanceled();
                 std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-                controller.Continue();
+                tssController.Continue();
             } );
-            controller.Break();
-            REQUIRE_NOTHROW( signal.Emit( 2 ) );
+            tssController.Break();
+            REQUIRE_NOTHROW( tssSignal.Emit( 2 ) );
         }
 
         SECTION( "throw after break by signal" )
         {
             // test successful throw after breakpoint set by the signal
-            signal.SetDoBreakpoint( true );
-            auto asyncReturn = std::async( std::launch::async, [&controller](){
-                controller.WaitForBreakOrCanceled();
+            tssSignal.SetDoBreakpoint( true );
+            auto asyncReturn = std::async( std::launch::async, [&tssController](){
+                tssController.WaitForBreakOrCanceled();
                 std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-                controller.Continue();
+                tssController.Continue();
             } );
-            REQUIRE_NOTHROW( signal.Emit( 3 ) );
+            REQUIRE_NOTHROW( tssSignal.Emit( 3 ) );
         }
 
         SECTION( "canceled controller" )
         {
             // test behavior for canceled controller
-            controller.Cancel();
-            REQUIRE_THROWS_AS( signal.Emit( 1 ), QuitChain );
+            tssController.Cancel();
+            REQUIRE_THROWS_AS( tssSignal.Emit( 1 ), QuitChain );
         }
 
         SECTION( "cancel during break" )
         {
             // test behavior for controller canceled during break
-            auto asyncReturn = std::async( std::launch::async, [&controller](){
-                controller.WaitForBreakOrCanceled();
+            auto asyncReturn = std::async( std::launch::async, [&tssController](){
+                tssController.WaitForBreakOrCanceled();
                 std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-                controller.Cancel();
+                tssController.Cancel();
             } );
-            controller.Break();
-            REQUIRE_THROWS_AS( signal.Emit( 2 ), QuitChain );
+            tssController.Break();
+            REQUIRE_THROWS_AS( tssSignal.Emit( 2 ), QuitChain );
         }
 
         SECTION( "cancel during break" )
         {
             // test behavior for signal starting the break, and controller is canceled during the break
-            signal.SetDoBreakpoint( true );
-            auto asyncReturn = std::async( std::launch::async, [&controller](){
-                controller.WaitForBreakOrCanceled();
+            tssSignal.SetDoBreakpoint( true );
+            auto asyncReturn = std::async( std::launch::async, [&tssController](){
+                tssController.WaitForBreakOrCanceled();
                 std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-                controller.Cancel();
+                tssController.Cancel();
             } );
-            REQUIRE_THROWS_AS( signal.Emit( 3 ), QuitChain );
+            REQUIRE_THROWS_AS( tssSignal.Emit( 3 ), QuitChain );
         }
 
         SECTION( "return from break" )
         {
             // test return from break
-            signal.SetDoBreakpoint( true );
-            auto asyncReturn = std::async( std::launch::async, [&signal, &controller](){
-                signal.Emit( 4 ); // cannot test this with REQUIRE() because tests can currently only be done in one thread
-                controller.WaitForEndOfRun();
+            tssSignal.SetDoBreakpoint( true );
+            auto asyncReturn = std::async( std::launch::async, [&tssSignal, &tssController](){
+                tssSignal.Emit( 4 ); // cannot test this with REQUIRE() because tests can currently only be done in one thread
+                tssController.WaitForEndOfRun();
             } );
             std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-            REQUIRE( controller.WaitForBreakOrCanceled() );
-            REQUIRE( controller.HasReturn() );
-            auto theReturn = controller.GetReturn< int >();
+            REQUIRE( tssController.WaitForBreakOrCanceled() );
+            REQUIRE( tssController.HasReturn() );
+            auto theReturn = tssController.GetReturn< int >();
             REQUIRE( std::get<0>( theReturn ) == 4 );
             std::this_thread::sleep_for( std::chrono::milliseconds(200) );
-            controller.Cancel();
+            tssController.Cancel();
         }
     }
 
@@ -114,54 +114,54 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
     {
         // TODO: connect to an incompatible slot and check exception
 
-        REQUIRE_NOTHROW( signal.Connect( &slot ) );
+        REQUIRE_NOTHROW( tssSignal.Connect( &tssSlot ) );
 
-        REQUIRE( signal.Connections().size() == 1 );
-        REQUIRE( slot.Connections().size() == 1 );
+        REQUIRE( tssSignal.Connections().size() == 1 );
+        REQUIRE( tssSlot.Connections().size() == 1 );
 
-        signal.Emit( 5 );
-        REQUIRE( testValue == 5 );
+        tssSignal.Emit( 5 );
+        REQUIRE( tssTestValue == 5 );
 
-        signal( 10 );
-        REQUIRE( testValue == 10 );
+        tssSignal( 10 );
+        REQUIRE( tssTestValue == 10 );
 
-        signal.Disconnect( &slot );
+        tssSignal.Disconnect( &tssSlot );
 
-        REQUIRE( signal.Connections().size() == 0 );
-        REQUIRE( slot.Connections().size() == 0 );
+        REQUIRE( tssSignal.Connections().size() == 0 );
+        REQUIRE( tssSlot.Connections().size() == 0 );
 
         // connect and disconnect via slot
-        slot.ConnectTo( &signal );
+        tssSlot.ConnectTo( &tssSignal );
 
-        REQUIRE( signal.Connections().size() == 1 );
-        REQUIRE( slot.Connections().size() == 1 );
+        REQUIRE( tssSignal.Connections().size() == 1 );
+        REQUIRE( tssSlot.Connections().size() == 1 );
 
-        slot.Disconnect( &signal );
+        tssSlot.Disconnect( &tssSignal );
 
-        REQUIRE( signal.Connections().size() == 0 );
-        REQUIRE( slot.Connections().size() == 0 );
+        REQUIRE( tssSignal.Connections().size() == 0 );
+        REQUIRE( tssSlot.Connections().size() == 0 );
 
         // reconnect for testing SignalBase::DisconnectAll()
-        signal.Connect( &slot );
+        tssSignal.Connect( &tssSlot );
 
-        REQUIRE( signal.Connections().size() == 1 );
-        REQUIRE( slot.Connections().size() == 1 );
+        REQUIRE( tssSignal.Connections().size() == 1 );
+        REQUIRE( tssSlot.Connections().size() == 1 );
 
-        signal.DisconnectAll();
+        tssSignal.DisconnectAll();
 
-        REQUIRE( signal.Connections().size() == 0 );
-        REQUIRE( slot.Connections().size() == 0 );
+        REQUIRE( tssSignal.Connections().size() == 0 );
+        REQUIRE( tssSlot.Connections().size() == 0 );
 
         // reconnect for testing SlotBaseDisconnectAll()
-        slot.ConnectTo( &signal );
+        tssSlot.ConnectTo( &tssSignal );
 
-        REQUIRE( signal.Connections().size() == 1 );
-        REQUIRE( slot.Connections().size() == 1 );
+        REQUIRE( tssSignal.Connections().size() == 1 );
+        REQUIRE( tssSlot.Connections().size() == 1 );
 
-        slot.DisconnectAll();
+        tssSlot.DisconnectAll();
 
-        REQUIRE( signal.Connections().size() == 0 );
-        REQUIRE( slot.Connections().size() == 0 );
+        REQUIRE( tssSignal.Connections().size() == 0 );
+        REQUIRE( tssSlot.Connections().size() == 0 );
     }
 
 }
diff --git a/Testing/Cpp/TestSingleRunController.cc b/Testing/Cpp/TestSingleRunController.cc
index 479aa35..6e14d58 100644
--- a/Testing/Cpp/TestSingleRunController.cc
+++ b/Testing/Cpp/TestSingleRunController.cc
@@ -38,8 +38,8 @@ TEST_CASE( "single_run_controller" )
     using namespace Nymph;
     using namespace NymphTesting;
 
-    ProcessorToolbox toolbox;
-    SRCRevealer controller( toolbox );
+    ProcessorToolbox tsrcToolbox;
+    SRCRevealer tsrcController( tsrcToolbox );
 
     SECTION( "DoRun" )
     {
@@ -57,15 +57,15 @@ TEST_CASE( "single_run_controller" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.Configure( config->as_node() ) );
-        REQUIRE_NOTHROW( controller.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( tsrcToolbox.Configure( config->as_node() ) );
+        REQUIRE_NOTHROW( tsrcController.Configure( config->as_node() ) );
 
-        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( toolbox.GetProcessor( "pp" ) );
+        auto ppProc = std::dynamic_pointer_cast< TestPrimaryProc >( tsrcToolbox.GetProcessor( "pp" ) );
         REQUIRE( ppProc );
         ppProc->SetTestSelection( TestPrimaryProc::TestType::SignalNewValue );
 
         // do the run
-        REQUIRE_NOTHROW( controller.Run() );
+        REQUIRE_NOTHROW( tsrcController.Run() );
 
         // check the results
         REQUIRE( ppProc->GetValue() == ppProc->GetNewValue() );
@@ -88,31 +88,31 @@ TEST_CASE( "single_run_controller" )
         scarab::param_translator translator;
         auto config = translator.read_string( config_str, "yaml" );
 
-        REQUIRE_NOTHROW( toolbox.ConfigureProcessors( config->as_array() ) );
+        REQUIRE_NOTHROW( tsrcToolbox.ConfigureProcessors( config->as_array() ) );
 
         SRCRevealer::ThreadSourceGroupT group;
-        REQUIRE_FALSE( controller.AddProcessorToThreadGroup( "blah", group ) );
-        REQUIRE_FALSE( controller.AddProcessorToThreadGroup( "testproc-1", group ) );
-        REQUIRE( controller.AddProcessorToThreadGroup( "testprimary-1", group ) );
+        REQUIRE_FALSE( tsrcController.AddProcessorToThreadGroup( "blah", group ) );
+        REQUIRE_FALSE( tsrcController.AddProcessorToThreadGroup( "testproc-1", group ) );
+        REQUIRE( tsrcController.AddProcessorToThreadGroup( "testprimary-1", group ) );
         REQUIRE( group.size() == 1 );
 
-        REQUIRE_FALSE( controller.PushBackToRunQueue( "testproc-1" ) );
-        REQUIRE( controller.PushBackToRunQueue( "testprimary-1" ) );
-        REQUIRE( controller.RunQueue().size() == 1 );
-        REQUIRE( controller.RunQueue().begin()[0].size() == 1 );
-        REQUIRE( controller.PushBackToRunQueue( "testprimary-2" ) );
-        REQUIRE( controller.RunQueue().size() == 2 );
-        REQUIRE( controller.RunQueue().begin()[0].size() == 1 );
+        REQUIRE_FALSE( tsrcController.PushBackToRunQueue( "testproc-1" ) );
+        REQUIRE( tsrcController.PushBackToRunQueue( "testprimary-1" ) );
+        REQUIRE( tsrcController.RunQueue().size() == 1 );
+        REQUIRE( tsrcController.RunQueue().begin()[0].size() == 1 );
+        REQUIRE( tsrcController.PushBackToRunQueue( "testprimary-2" ) );
+        REQUIRE( tsrcController.RunQueue().size() == 2 );
+        REQUIRE( tsrcController.RunQueue().begin()[0].size() == 1 );
         
-        controller.PopBackOfRunQueue();
-        REQUIRE( controller.RunQueue().size() == 1 );
+        tsrcController.PopBackOfRunQueue();
+        REQUIRE( tsrcController.RunQueue().size() == 1 );
 
-        controller.ClearRunQueue();
-        REQUIRE( controller.RunQueue().empty() );
+        tsrcController.ClearRunQueue();
+        REQUIRE( tsrcController.RunQueue().empty() );
         
-        REQUIRE( controller.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
-        REQUIRE( controller.RunQueue().size() == 1 );
-        REQUIRE( controller.RunQueue()[0].size() == 2 );
+        REQUIRE( tsrcController.PushBackToRunQueue( {"testprimary-1", "testprimary-2"} ) );
+        REQUIRE( tsrcController.RunQueue().size() == 1 );
+        REQUIRE( tsrcController.RunQueue()[0].size() == 2 );
 
     }
 
diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index 0a91bba..de968bc 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -19,7 +19,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     using namespace NymphTesting;
 
     // need a controller to exist
-    CIQThrowController controller;
+    CIQThrowController tsdController;
 
 
 // TODO: test creation of slot with:
@@ -37,88 +37,88 @@ TEST_CASE( "slot_data", "[slot],[data]" )
 //   x slot with output calls a second slot
 
     // create the processor and verify the presence of the slots
-    Adder adder;
-    REQUIRE( adder.Slots().count("add-sig") == 1 );
-    REQUIRE( adder.Slots().count("add-no-sig") == 1 );
+    Adder tsdAdder;
+    REQUIRE( tsdAdder.Slots().count("add-sig") == 1 );
+    REQUIRE( tsdAdder.Slots().count("add-no-sig") == 1 );
 
     // get signal and slot pointers and cast
-    SlotData< In<TestData1>, Out<> >* slotdAddSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-sig") );
-    SlotData< In<TestData1>, Out<> >* slotdAddNoSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("add-no-sig") );
-    REQUIRE( slotdAddSig );
-    REQUIRE( slotdAddNoSig );
+    SlotData< In<TestData1>, Out<> >* tsdSlotDAddSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( tsdAdder.Slots().at("add-sig") );
+    SlotData< In<TestData1>, Out<> >* tsdSlotDAddNoSig = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( tsdAdder.Slots().at("add-no-sig") );
+    REQUIRE( tsdSlotDAddSig );
+    REQUIRE( tsdSlotDAddNoSig );
 
-    SlotData< In<const TestData1>, Out<TestData2> >* sdMult = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( adder.Slots().at("multiply") );
-    REQUIRE( sdMult );
+    SlotData< In<const TestData1>, Out<TestData2> >* tsdSlotDMult = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( tsdAdder.Slots().at("multiply") );
+    REQUIRE( tsdSlotDMult );
 
-    SlotData< In<const TestData1>, Out<TestData2> >* sdIToD = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( adder.Slots().at("i-to-d") );
-    REQUIRE( sdIToD );
+    SlotData< In<const TestData1>, Out<TestData2> >* tsdSlotDIToD = dynamic_cast< SlotData< In<const TestData1>, Out<TestData2> >* >( tsdAdder.Slots().at("i-to-d") );
+    REQUIRE( tsdSlotDIToD );
 
-    SlotData< In<const TestData1>, Out<> >* sdPrint = dynamic_cast< SlotData< In<const TestData1>, Out<> >* >( adder.Slots().at("print") );
-    REQUIRE( sdPrint );
+    SlotData< In<const TestData1>, Out<> >* tsdSlotDPrint = dynamic_cast< SlotData< In<const TestData1>, Out<> >* >( tsdAdder.Slots().at("print") );
+    REQUIRE( tsdSlotDPrint );
 
-    SlotData< In<TestData1>, Out<> >* sdJustThrows = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( adder.Slots().at("just-throws") );
-    REQUIRE( sdJustThrows );
+    SlotData< In<TestData1>, Out<> >* tsdSlotDJustThrows = dynamic_cast< SlotData< In<TestData1>, Out<> >* >( tsdAdder.Slots().at("just-throws") );
+    REQUIRE( tsdSlotDJustThrows );
 
-    SignalData* sigdAdd = dynamic_cast< SignalData* >( adder.Signals().at("add") );
-    REQUIRE( sigdAdd );
+    SignalData* tsdSigDAdd = dynamic_cast< SignalData* >( tsdAdder.Signals().at("add") );
+    REQUIRE( tsdSigDAdd );
 
     // configure the processor
-    adder.SetAddValue( 5 );
+    tsdAdder.SetAddValue( 5 );
 
     // create a data frame
-    DataHandle handle = std::make_shared< DataFrame >();
+    DataHandle tsdHandle = std::make_shared< DataFrame >();
 
     // verify that when we call the slot on an empty frame we get an exception
-    REQUIRE_THROWS_AS( (*slotdAddSig)( handle ), Exception );
+    REQUIRE_THROWS_AS( (*tsdSlotDAddSig)( tsdHandle ), Exception );
 
-    TestData1& td1 = handle->Get< TestData1 >();
-    td1.SetIValue1( 1 );
-    td1.SetIValue2( 2 );
+    TestData1& tsdTestData1 = tsdHandle->Get< TestData1 >();
+    tsdTestData1.SetIValue1( 1 );
+    tsdTestData1.SetIValue2( 2 );
 
     // verify that slots can be called, in this case with an input and no output
     // verify that slots work whether or not signals are automatically called
     // call the add slot functions and verify operation
-    REQUIRE_NOTHROW( (*slotdAddSig)( handle ) ); // this adds the adder.fAddValue (i.e. 5) to 1 and 2, respectively
-    REQUIRE( td1.GetIValue1() == 6 );
-    REQUIRE( td1.GetIValue2() == 7 );
+    REQUIRE_NOTHROW( (*tsdSlotDAddSig)( tsdHandle ) ); // this adds the tsdAdder.fAddValue (i.e. 5) to 1 and 2, respectively
+    REQUIRE( tsdTestData1.GetIValue1() == 6 );
+    REQUIRE( tsdTestData1.GetIValue2() == 7 );
 
-    REQUIRE_NOTHROW( (*slotdAddNoSig)( handle ) ); // this adds the adder.fAddValue to 6 and 7, respectively
-    REQUIRE( td1.GetIValue1() == 11 ); // and IValue2 would be 12
+    REQUIRE_NOTHROW( (*tsdSlotDAddNoSig)( tsdHandle ) ); // this adds the tsdAdder.fAddValue to 6 and 7, respectively
+    REQUIRE( tsdTestData1.GetIValue1() == 11 ); // and IValue2 would be 12
 
     // call the IToD slot function and verify operation
-    REQUIRE_NOTHROW( (*sdIToD)( handle ) ); // this adds TestData2 to the frame and sets the integer values in its double variables
-    REQUIRE( handle->Has< TestData2 >() );
-    TestData2& td2 = handle->Get< TestData2 >();
-    REQUIRE( td2.GetDValue1() == Approx(11.) );
-    REQUIRE( td2.GetDValue2() == Approx(12.) );
+    REQUIRE_NOTHROW( (*tsdSlotDIToD)( tsdHandle ) ); // this adds TestData2 to the frame and sets the integer values in its double variables
+    REQUIRE( tsdHandle->Has< TestData2 >() );
+    TestData2& tsdTestData2 = tsdHandle->Get< TestData2 >();
+    REQUIRE( tsdTestData2.GetDValue1() == Approx(11.) );
+    REQUIRE( tsdTestData2.GetDValue2() == Approx(12.) );
 
     // verify that a slot with a const data object works
     // call the print slot function to verify use with const data
-    REQUIRE_NOTHROW( (*sdPrint)( handle ) );
+    REQUIRE_NOTHROW( (*tsdSlotDPrint)( tsdHandle ) );
 
     // verify that a thrown exception appears
     // calls the slot function that just throws Exception; verify it appears here
-    REQUIRE_THROWS_AS( (*sdJustThrows)( handle ), Exception );
+    REQUIRE_THROWS_AS( (*tsdSlotDJustThrows)( tsdHandle ), Exception );
 
     // verify that an automatic signal call is made
     // connect signal "add" to slot "i-to-d"
-    REQUIRE_NOTHROW( adder.ConnectSignalToSlot( sigdAdd, sdIToD ) );
+    REQUIRE_NOTHROW( tsdAdder.ConnectSignalToSlot( tsdSigDAdd, tsdSlotDIToD ) );
     // remove TestData2
-    handle->Remove< TestData2 >();  // we'll start fresh without a TestData2
-    REQUIRE_FALSE( handle->Has< TestData2 >() );
+    tsdHandle->Remove< TestData2 >();  // we'll start fresh without a TestData2
+    REQUIRE_FALSE( tsdHandle->Has< TestData2 >() );
     // call the add-sig slot and verify that the i-to-d slot gets called via the signal
-    REQUIRE_NOTHROW( (*slotdAddSig)( handle ) ); //add slot executes, adding 5 to 11, then triggers the i-to-d slot via the add signal, making TestData2 with fDValue2 = 16
-    REQUIRE( handle->Has< TestData2 >() );
-    REQUIRE( td1.GetIValue1() == 16 );
-    REQUIRE( td2.GetDValue1() == Approx(16.) );
+    REQUIRE_NOTHROW( (*tsdSlotDAddSig)( tsdHandle ) ); //add slot executes, adding 5 to 11, then triggers the i-to-d slot via the add signal, making TestData2 with fDValue2 = 16
+    REQUIRE( tsdHandle->Has< TestData2 >() );
+    REQUIRE( tsdTestData1.GetIValue1() == 16 );
+    REQUIRE( tsdTestData2.GetDValue1() == Approx(16.) );
 
     // verify that slots owned by something else work
     // remove TestData2
-    handle->Remove< TestData2 >();
-    REQUIRE_FALSE( handle->Has< TestData2 >() );
+    tsdHandle->Remove< TestData2 >();
+    REQUIRE_FALSE( tsdHandle->Has< TestData2 >() );
     // call the mult slot and verify that it worked
-    REQUIRE_NOTHROW( (*sdMult)( handle ) ); // for TestData1::fIValue1, multiplies 16 by 2.5 and stores in TestData2::fDValue1
-    REQUIRE( td2.GetDValue1() == Approx(40.) );
+    REQUIRE_NOTHROW( (*tsdSlotDMult)( tsdHandle ) ); // for TestData1::fIValue1, multiplies 16 by 2.5 and stores in TestData2::fDValue1
+    REQUIRE( tsdTestData2.GetDValue1() == Approx(40.) );
 }
 
 

From 0a733e6855ad7d0a368d38c5c3a3087453267d6f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 16 Jun 2022 22:03:06 -0400
Subject: [PATCH 448/521] Need to re-request the references to TestData2;
 Perhaps a missing include?

---
 Testing/Cpp/TestSlotData.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index de968bc..18030f4 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -8,6 +8,8 @@
 #include "TestControllerClasses.hh"
 #include "TestDataProcessorClasses.hh"
 
+#include "DataFrame.hh"
+
 #include "catch.hpp"
 
 #include "logger.hh"
@@ -109,6 +111,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     // call the add-sig slot and verify that the i-to-d slot gets called via the signal
     REQUIRE_NOTHROW( (*tsdSlotDAddSig)( tsdHandle ) ); //add slot executes, adding 5 to 11, then triggers the i-to-d slot via the add signal, making TestData2 with fDValue2 = 16
     REQUIRE( tsdHandle->Has< TestData2 >() );
+    tsdTestData2 = tsdHandle->Get< TestData2 >();
     REQUIRE( tsdTestData1.GetIValue1() == 16 );
     REQUIRE( tsdTestData2.GetDValue1() == Approx(16.) );
 
@@ -118,6 +121,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     REQUIRE_FALSE( tsdHandle->Has< TestData2 >() );
     // call the mult slot and verify that it worked
     REQUIRE_NOTHROW( (*tsdSlotDMult)( tsdHandle ) ); // for TestData1::fIValue1, multiplies 16 by 2.5 and stores in TestData2::fDValue1
+    tsdTestData2 = tsdHandle->Get< TestData2 >();
     REQUIRE( tsdTestData2.GetDValue1() == Approx(40.) );
 }
 

From ff508ee8a8e90e90b9a4031b9ccccc782de8c4fc Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Fri, 17 Jun 2022 13:46:08 -0400
Subject: [PATCH 449/521] Add proper unittest to processor

---
 Testing/Python/testprocessor.py | 51 ++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/Testing/Python/testprocessor.py b/Testing/Python/testprocessor.py
index eef1b98..f5748d8 100644
--- a/Testing/Python/testprocessor.py
+++ b/Testing/Python/testprocessor.py
@@ -8,29 +8,54 @@
 
 __all__ = []
 
+import unittest
+
 import _nymph
 import scarab
 
+class TestProcessorBroken(_nymph.processor._Processor):
+    """Should not work because it does not override configure"""
+    
+    def foo():
+        print('I am a failed processor implementation')
+        
+
 class TestProcessor(_nymph.processor._Processor):
     
     def configure(self, param_node):
         
         param_dict = param_node.to_python()
-        self.x = param_dict['x']
+        
+        self.value = param_dict['value']
+        
+        if 'foo' in param_dict:
+            self.foo = param_dict['foo']
+            
+        #todo add test of a configexception thing
 
-def main(args):
-    
-    testprocessor = TestProcessor('test')
-    
-    param = scarab.ParamValue( 1.0 )
-    param_node = scarab.ParamNode()
-    param_node.add('x', param)
+
+class TestPureVirtual(unittest.TestCase):
     
-    testprocessor.configure(param_node)
+    def test_pure_virtual(self):
+        test_proc = TestProcessorBroken('test-proc')
+        
+        with self.assertRaises(RuntimeError) as context:
+            test_proc.configure(scarab.to_param({}))
+
+        self.assertTrue(str(context.exception) == 'Tried to call pure virtual function "Nymph::Processor::configure"')
+        
+
+class TestConfigure(unittest.TestCase):
     
-    print(testprocessor.x)
-    return 0
+    def test_configure(self):
+        test_proc = TestProcessor('test-proc')
+        test_proc.configure(scarab.to_param({'value': 42, 'foo': 'bar'}))
+        
+        self.assertEqual(test_proc.value, 42)
+        self.assertEqual(test_proc.foo, 'bar')
+        self.assertEqual(test_proc.name, 'test-proc')
+
 
 if __name__ == '__main__':
-    import sys
-    sys.exit(main(sys.argv))
+    unittest.main()
+

From 5f09ff11e9cf8dd5be3352a9482e240a11fe8d6f Mon Sep 17 00:00:00 2001
From: Florian Thomas <flthomas@students.uni-mainz.de>
Date: Fri, 17 Jun 2022 14:49:56 -0400
Subject: [PATCH 450/521] Add test for registering and creating python
 processor

---
 Testing/Python/testprocessor.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Testing/Python/testprocessor.py b/Testing/Python/testprocessor.py
index f5748d8..54e7c92 100644
--- a/Testing/Python/testprocessor.py
+++ b/Testing/Python/testprocessor.py
@@ -56,6 +56,16 @@ def test_configure(self):
         self.assertEqual(test_proc.name, 'test-proc')
 
 
+class TestPyProcCreator(unittest.TestCase):
+    
+    def test_creating(self):
+        
+        registrar = _nymph.processor.register_py_processor('testprocessor', 'TestProcessor', 'processor-name')
+        test_proc = _nymph.processor.create_processor('processor-name', 'test-proc')
+        
+        self.assertEqual(test_proc.name, 'test-proc')
+
+
 if __name__ == '__main__':
     unittest.main()
 

From 7e22c112844a5618e7325b14ba097a2e430cb305 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 17 Jun 2022 16:08:24 -0700
Subject: [PATCH 451/521] Fixing slot variable

---
 Testing/Cpp/TestSignalSlot.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 0eea392..ae0758d 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -114,7 +114,7 @@ TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
     SECTION( "connections" )
     {
         
-        REQUIRE_THROWS_AS( tsdFloatSignal.Connect( &slot), ConnectionException );
+        REQUIRE_THROWS_AS( tssFloatSignal.Connect( &tssSlot), ConnectionException );
 
         REQUIRE_NOTHROW( tssSignal.Connect( &tssSlot ) );
 

From b401ae0aa48eb1273a3d17070f86a1061edebe2a Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 17 Jun 2022 16:43:10 -0700
Subject: [PATCH 452/521] Use different TestData2 variables fixes the segfault,
 for some reason

---
 Testing/Cpp/TestSlotData.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index 18030f4..053ae4e 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -111,9 +111,9 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     // call the add-sig slot and verify that the i-to-d slot gets called via the signal
     REQUIRE_NOTHROW( (*tsdSlotDAddSig)( tsdHandle ) ); //add slot executes, adding 5 to 11, then triggers the i-to-d slot via the add signal, making TestData2 with fDValue2 = 16
     REQUIRE( tsdHandle->Has< TestData2 >() );
-    tsdTestData2 = tsdHandle->Get< TestData2 >();
+    TestData2& tsdAnotherTestData2 = tsdHandle->Get< TestData2 >();
     REQUIRE( tsdTestData1.GetIValue1() == 16 );
-    REQUIRE( tsdTestData2.GetDValue1() == Approx(16.) );
+    REQUIRE( tsdAnotherTestData2.GetDValue1() == Approx(16.) );
 
     // verify that slots owned by something else work
     // remove TestData2
@@ -121,8 +121,8 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     REQUIRE_FALSE( tsdHandle->Has< TestData2 >() );
     // call the mult slot and verify that it worked
     REQUIRE_NOTHROW( (*tsdSlotDMult)( tsdHandle ) ); // for TestData1::fIValue1, multiplies 16 by 2.5 and stores in TestData2::fDValue1
-    tsdTestData2 = tsdHandle->Get< TestData2 >();
-    REQUIRE( tsdTestData2.GetDValue1() == Approx(40.) );
+    TestData2& tsdYetAnotherTestData2 = tsdHandle->Get< TestData2 >();
+    REQUIRE( tsdYetAnotherTestData2.GetDValue1() == Approx(40.) );
 }
 
 

From 4978f505a2a408f3c08f19c51ff038b6ac8fd846 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Fri, 17 Jun 2022 18:14:17 -0700
Subject: [PATCH 453/521] Remove the assertion in testprocessortoolbox.py that
 expects to find a registered test

---
 Testing/Python/testprocessortoolbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Testing/Python/testprocessortoolbox.py b/Testing/Python/testprocessortoolbox.py
index 2e306c2..643ab14 100644
--- a/Testing/Python/testprocessortoolbox.py
+++ b/Testing/Python/testprocessortoolbox.py
@@ -24,7 +24,7 @@ def test_add_remove_processors(self):
         self.assertFalse( self.tb.has_processor( self.procName3 ) )
         self.assertFalse( self.tb.could_build( self.procName1 ) )
         self.assertFalse( self.tb.could_build( self.procName2 ) )
-        self.assertTrue( self.tb.could_build( self.procName3 ) )
+        #self.assertTrue( self.tb.could_build( self.procName3 ) )
     
 
 if __name__ == '__main__':

From 8bc7022af28398ec399a1934551d9697c5eb9c81 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 27 Dec 2023 10:08:54 -0800
Subject: [PATCH 454/521] Update ConfigException.hh

Fixing file header
---
 Cpp/Library/Utility/ConfigException.hh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cpp/Library/Utility/ConfigException.hh b/Cpp/Library/Utility/ConfigException.hh
index 1cc7d66..ce4d059 100644
--- a/Cpp/Library/Utility/ConfigException.hh
+++ b/Cpp/Library/Utility/ConfigException.hh
@@ -1,6 +1,6 @@
 /**
- @file Processor.hh
- @brief Base class for processors
+ @file ConfigException.hh
+ @brief Exceptions related to configurations
  @author: N. S. Oblath
  @date: Jan 5, 2012
  */

From 80334e1a450fbf1e879c8917a002dea42dc63c92 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 28 Dec 2023 10:35:55 -0800
Subject: [PATCH 455/521] Use latest versions of linux and macos systems for
 GHA jobs

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b0bdeaf..02fcc0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,7 +20,7 @@ jobs:
   docker_build:
     name: Build and Test in Docker
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
 
@@ -51,7 +51,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macOS-10.15]
+        os: [ubuntu-latest, macOS-latest]
         python-version: [3.9]
 
     steps:
@@ -115,7 +115,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macOS-10.15]
+        os: [ubuntu-latest, macOS-latest]
         python-version: [3.9]
 
     steps:

From 4a5ea42d6a90c7643cc7192e8d99f8174f951e10 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 28 Dec 2023 10:59:14 -0800
Subject: [PATCH 456/521] Update Scarab (should fix sprintf warnings and maybe
 yaml-cpp lib issue) and added include for TestSignalSlot

---
 Scarab                        | 2 +-
 Testing/Cpp/TestSignalSlot.cc | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index ba065f6..f64549a 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit ba065f66706217eaa748d9ddf82dd32bb17e6abe
+Subproject commit f64549a85ae7a79e9f5c5622e75ea6311043b941
diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index ae0758d..08c0f92 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -13,6 +13,7 @@
 #include "catch.hpp"
 
 #include <future>
+#include <thread>
 
 TEST_CASE( "signal_slot", "[signal],[slot],[processor]" )
 {

From 06a115614ebe4c87fc44f3e7b8d346675b60803f Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 28 Dec 2023 14:23:46 -0800
Subject: [PATCH 457/521] Don't attempt to build and install executables if
 there are none

---
 Cpp/Executables/Main/CMakeLists.txt | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/Cpp/Executables/Main/CMakeLists.txt b/Cpp/Executables/Main/CMakeLists.txt
index b59b920..4bfc255 100644
--- a/Cpp/Executables/Main/CMakeLists.txt
+++ b/Cpp/Executables/Main/CMakeLists.txt
@@ -17,16 +17,18 @@ if( Nymph_BUILD_NYMPH_EXE )
     )
 endif( Nymph_BUILD_NYMPH_EXE )
 
-set( Nymph_PROGRAMS )
-pbuilder_executables( 
-    SOURCES ${Nymph_SOURCES}
-    TARGETS_VAR Nymph_PROGRAMS
-    PROJECT_LIBRARIES ${Nymph_package_libs}
-    PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
-#        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
-)
+if( Nymph_SOURCES )
+    set( Nymph_PROGRAMS )
+    pbuilder_executables( 
+        SOURCES ${Nymph_SOURCES}
+        TARGETS_VAR Nymph_PROGRAMS
+        PROJECT_LIBRARIES ${Nymph_package_libs}
+        PUBLIC_EXTERNAL_LIBRARIES ${Nymph_EXE_LIBRARIES}
+    #        PRIVATE_EXTERNAL_LIBRARIES ${PRIVATE_EXT_LIBS}
+    )
 
-pbuilder_component_install_and_export( 
-    COMPONENT Executables
-    EXETARGETS ${Nymph_PROGRAMS}
-)
+    pbuilder_component_install_and_export( 
+        COMPONENT Executables
+        EXETARGETS ${Nymph_PROGRAMS}
+    )
+endif( Nymph_SOURCES )

From 27ed29c2f70b640d76c928c9b12e5ddba5c9b27c Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 28 Dec 2023 17:50:15 -0800
Subject: [PATCH 458/521] Added Service and ServiceToolbox

---
 Cpp/Library/CMakeLists.txt            |  15 ++-
 Cpp/Library/Service/Service.cc        |  22 +++
 Cpp/Library/Service/Service.hh        |  61 +++++++++
 Cpp/Library/Service/ServiceToolbox.cc | 187 ++++++++++++++++++++++++++
 Cpp/Library/Service/ServiceToolbox.hh | 114 ++++++++++++++++
 Testing/CMakeLists.txt                |   4 +
 Testing/Cpp/TestService.cc            |  58 ++++++++
 Testing/Cpp/TestServiceClasses.cc     |  40 ++++++
 Testing/Cpp/TestServiceClasses.hh     |  33 +++++
 Testing/Cpp/TestServiceToolbox.cc     |  87 ++++++++++++
 10 files changed, 617 insertions(+), 4 deletions(-)
 create mode 100644 Cpp/Library/Service/Service.cc
 create mode 100644 Cpp/Library/Service/Service.hh
 create mode 100644 Cpp/Library/Service/ServiceToolbox.cc
 create mode 100644 Cpp/Library/Service/ServiceToolbox.hh
 create mode 100644 Testing/Cpp/TestService.cc
 create mode 100644 Testing/Cpp/TestServiceClasses.cc
 create mode 100644 Testing/Cpp/TestServiceClasses.hh
 create mode 100644 Testing/Cpp/TestServiceToolbox.cc

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index 001b70f..f12d436 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -6,6 +6,7 @@ set( DATA_DIR Data )
 set( IMPL_DIR Implementation )
 #set( IO_DIR IO )
 set( PROC_DIR Processor )
+set( SVC_DIR Service )
 set( UTIL_DIR Utility )
 
 include_directories( BEFORE 
@@ -14,6 +15,7 @@ include_directories( BEFORE
     ${CMAKE_CURRENT_SOURCE_DIR}/${IMPL_DIR}
 #    ${CMAKE_CURRENT_SOURCE_DIR}/${IO_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${PROC_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${SVC_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${UTIL_DIR}
 )
 
@@ -22,6 +24,9 @@ set( NYMPH_HEADERFILES
     ${UTIL_DIR}/Exception.hh
     ${UTIL_DIR}/MemberVariable.hh
 
+    ${SVC_DIR}/Service.hh
+    ${SVC_DIR}/ServiceToolbox.hh
+
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
@@ -47,15 +52,17 @@ set( NYMPH_SOURCEFILES
     ${UTIL_DIR}/ConfigException.cc
     ${UTIL_DIR}/Exception.cc
 
-    ${DATA_DIR}/Data.cc
-    ${DATA_DIR}/DataFrame.cc
-    
+    ${SVC_DIR}/Service.cc
+    ${SVC_DIR}/ServiceToolbox.cc
+
     ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
     ${PROC_DIR}/ProcessorToolbox.cc
     ${PROC_DIR}/SignalSlotBase.cc
 
-
+    ${DATA_DIR}/Data.cc
+    ${DATA_DIR}/DataFrame.cc
+    
     ${CONT_DIR}/ControlAccess.cc
     ${CONT_DIR}/Controller.cc
     ${CONT_DIR}/ReturnBuffer.cc
diff --git a/Cpp/Library/Service/Service.cc b/Cpp/Library/Service/Service.cc
new file mode 100644
index 0000000..286d72e
--- /dev/null
+++ b/Cpp/Library/Service/Service.cc
@@ -0,0 +1,22 @@
+/*
+ * Service.cc
+ *
+ *  Created on: Dec 28, 2023
+ *      Author: N.S. Oblath
+ */
+
+#include "Service.hh"
+
+namespace Nymph
+{
+    //KTLOGGER(servicelog, "Service");
+
+    Service::Service( const std::string& name ) :
+            fName( name )
+    {
+    }
+
+    Service::~Service()
+    {}
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Service/Service.hh b/Cpp/Library/Service/Service.hh
new file mode 100644
index 0000000..424c11d
--- /dev/null
+++ b/Cpp/Library/Service/Service.hh
@@ -0,0 +1,61 @@
+/**
+ @file Service.hh
+ @brief Base class for processors
+ @author: N. S. Oblath
+ @date: Dec 28, 2023
+ */
+
+#ifndef NYMPH_SERVICE_HH_
+#define NYMPH_SERVICE_HH_
+
+#include "Exception.hh"
+#include "MemberVariable.hh"
+
+#include "factory.hh"
+#include "param.hh"
+
+#include <map>
+
+namespace Nymph
+{
+    struct ServiceException : virtual public Exception {};
+
+    class Service
+    {
+        public:
+            Service( const std::string& name );
+            virtual ~Service();
+
+            template< class XDerivedProc >
+            static scarab::registrar< Nymph::Service, XDerivedProc, const std::string& >* RegisterService( const std::string& name );
+
+        public:
+            /// Configure the processor with a param_node
+            virtual void Configure( const scarab::param_node& node ) = 0;
+
+            MEMVAR_REF( std::string, Name );
+    };
+
+
+    template< class XDerivedProc >
+    scarab::registrar< Service, XDerivedProc, const std::string& >* Service::RegisterService( const std::string& name )
+    {
+        return new scarab::registrar< Service, XDerivedProc, const std::string& >( name );
+    }
+
+#define REGISTER_SERVICE_NONAMESPACE(proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::Service, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+#define REGISTER_SERVICE_NAMESPACE(proc_namespace, proc_class, proc_name) \
+        static ::scarab::registrar< ::Nymph::Service, ::proc_namespace::proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+
+// Macro overloading trick from here: https://stackoverflow.com/a/11763277
+#define GET_MACRO(_1, _2, _3, NAME, ...) NAME
+/// Services defined in a namespace need to specify the namespace first:
+///   [no namespace]: REGISTER_PROCESSOR( [class], [name in quotes] )
+///   [with namespace]: REGISTER_PROCESSOR( [namespace], [class], [name in quotes] )
+#define REGISTER_SERVICE(...) GET_MACRO(__VA_ARGS__, REGISTER_SERVICE_NAMESPACE, REGISTER_SERVICE_NONAMESPACE, )(__VA_ARGS__)
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_SERVICE_HH_ */
diff --git a/Cpp/Library/Service/ServiceToolbox.cc b/Cpp/Library/Service/ServiceToolbox.cc
new file mode 100644
index 0000000..be9c05c
--- /dev/null
+++ b/Cpp/Library/Service/ServiceToolbox.cc
@@ -0,0 +1,187 @@
+/*
+ * ServiceToolbox.cc
+ *
+ *  Created on: Dec 28, 2023
+ *      Author: N.S. Oblath
+ */
+
+#include "ServiceToolbox.hh"
+
+#include "ConfigException.hh"
+#include "Service.hh"
+
+#include "factory.hh"
+#include "logger.hh"
+#include "param_codec.hh"
+
+#include <map>
+
+using std::string;
+
+namespace Nymph
+{
+    LOGGER(servicelog, "ServiceToolbox");
+
+    ServiceToolbox::ServiceToolbox( const std::string& name ) :
+            fServiceFactory( scarab::factory< Service, const std::string& >::get_instance() ),
+            fServiceMap()
+    {
+    }
+
+    ServiceToolbox::~ServiceToolbox()
+    {}
+
+    void ServiceToolbox::Configure( const scarab::param_node& node )
+    {
+        LPROG( servicelog, "Configuring service toolbox" );
+
+        // Deal with "service" blocks
+        if( ! node.has("services") )
+        {
+            LWARN( servicelog, "No services were specified" );
+        }
+        else
+        {
+            ConfigureServices( node["services"].as_array() );
+        }
+
+        return;
+    }
+
+
+    void ServiceToolbox::ConfigureServices( const scarab::param_array& array )
+    {
+        for( auto serviceIt = array.begin(); serviceIt != array.end(); ++serviceIt )
+        {
+            if( ! serviceIt->is_node() )
+            {
+                THROW_EXCEPT_HERE( ConfigException(array) << "Invalid service entry (not a node): " << *serviceIt );
+            }
+            const scarab::param_node& serviceNode = serviceIt->as_node();
+
+            if( ! serviceNode.has("type") )
+            {
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to create service: no service type given" );
+            }
+            string serviceType = serviceNode["type"]().as_string();
+
+            string serviceName;
+            if( ! serviceNode.has("name") )
+            {
+                LINFO(servicelog, "No name given for service of type <" << serviceType << ">; using type as name.");
+                serviceName = serviceType;
+            }
+            else
+            {
+                serviceName = serviceNode["name"]().as_string();
+            }
+
+            std::shared_ptr< Service > newProc ( fServiceFactory->create(serviceType, serviceName) );
+            if( newProc == nullptr )
+            {
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to create service of type <" << serviceType << ">" );
+            }
+
+            LDEBUG( servicelog, "Attempting to configure service <" << serviceName << ">" );
+            try
+            {
+                newProc->Configure(serviceNode);
+            }
+            catch( scarab::base_exception& e )
+            {
+                THROW_NESTED_EXCEPT_HERE( Exception() << "An error occurred while configuring service <" << serviceName << ">" );
+            }
+
+            if( ! AddService( serviceName, newProc ) )
+            {
+                THROW_EXCEPT_HERE( ConfigException(array) << "Unable to add service <" << serviceName << ">" );
+            }
+        }
+
+        return;
+    }
+
+    std::shared_ptr< Service > ServiceToolbox::GetService( const std::string& serviceName )
+    {
+        if( auto it = fServiceMap.find( serviceName ); it != fServiceMap.end() )
+        {
+            return it->second.fService;
+        }
+        LWARN( servicelog, "Service <" << serviceName << "> was not found." );
+        return nullptr;
+    }
+
+    const std::shared_ptr< Service > ServiceToolbox::GetService( const std::string& serviceName ) const
+    {
+        if( auto it = fServiceMap.find( serviceName ); it != fServiceMap.end() )
+        {
+            return it->second.fService;
+        }
+        LWARN( servicelog, "Service <" << serviceName << "> was not found." );
+        return nullptr;
+    }
+
+    bool ServiceToolbox::AddService( const std::string& serviceName, std::shared_ptr< Service > service )
+    {
+        if( auto it = fServiceMap.find( serviceName); it == fServiceMap.end() )
+        {
+            ServiceInfo pInfo;
+            pInfo.fService = service;
+            fServiceMap.insert( ServiceMap::value_type(serviceName, pInfo) );
+            LDEBUG( servicelog, "Added service <" << serviceName << "> (a.k.a. " << service->Name() << ")" );
+            return true;
+        }
+        LWARN( servicelog, "Service <" << serviceName << "> already exists; new service was not added." );
+        return false;
+    }
+
+    bool ServiceToolbox::AddService( const std::string& serviceType, const std::string& serviceName )
+    {
+        if( auto it = fServiceMap.find( serviceName ); it == fServiceMap.end() )
+        {
+            std::shared_ptr< Service > newProc ( fServiceFactory->create(serviceType, serviceType) );
+            if( newProc == nullptr )
+            {
+                LERROR( servicelog, "Unable to create service of type <" << serviceType << ">" );
+                return false;
+            }
+            if( ! AddService(serviceName, newProc) )
+            {
+                LERROR( servicelog, "Unable to add service <" << serviceName << ">" );
+                return false;
+            }
+            return true;
+        }
+        LWARN( servicelog, "Service <" << serviceName << "> already exists; new service was not added." );
+        return false;
+    }
+
+    bool ServiceToolbox::RemoveService( const std::string& serviceName )
+    {
+        if( auto serviceToRemove = ReleaseService( serviceName ); serviceToRemove != nullptr )
+        {
+            LDEBUG( servicelog, "Service <" << serviceName << "> deleted." );
+            return true;
+        }
+        return false;
+    }
+
+    std::shared_ptr< Service > ServiceToolbox::ReleaseService( const std::string& serviceName )
+    {
+        if( auto it = fServiceMap.find( serviceName ); it != fServiceMap.end() )
+        {
+            std::shared_ptr< Service > serviceToRelease = it->second.fService;
+            fServiceMap.erase( it );
+            return serviceToRelease;
+        }
+        LWARN( servicelog, "Service <" << serviceName << "> was not found." );
+        return nullptr;
+    }
+
+    void ServiceToolbox::ClearServices()
+    {
+        fServiceMap.clear();
+        return;
+    }
+
+} /* namespace Nymph */
diff --git a/Cpp/Library/Service/ServiceToolbox.hh b/Cpp/Library/Service/ServiceToolbox.hh
new file mode 100644
index 0000000..29b0c92
--- /dev/null
+++ b/Cpp/Library/Service/ServiceToolbox.hh
@@ -0,0 +1,114 @@
+/**
+ @file ServiceToolbox.hh
+ @brief Contains ServiceToolbox
+ @details Manages svcessors requested by the user at run time.
+ @author: N. S. Oblath
+ @date: Dec 28, 2023
+ */
+
+#ifndef NYMPH_SERVICETOOLBOX_HH_
+#define NYMPH_SERVICETOOLBOX_HH_
+
+#include "factory.hh"
+#include "param.hh"
+
+#include <limits>
+#include <set>
+#include <memory>
+
+
+namespace Nymph
+{
+    class Service;
+
+    /*!
+     @class ServiceToolbox
+     @author N. S. Oblath
+
+     @brief Manages services requested by the user at run time.
+
+     @details
+     ServiceToolbox allows the user to setup an application at runtime.
+
+     The user chooses the services to be used via a configuration file.
+
+     Available (nested) configuration values:
+     <li>services (array of objects) -- create a service; each object in the array should consist of:
+         <ul>
+             <li>type -- string specifying the svcessor type (matches the string given to the Registrar, which should be specified before the class implementation in each service's .cc file).</li>
+             <li>name -- string giving the individual svcessor a name so that multiple services of the same type can be created.</li>
+         </ul>
+     </li>
+    */
+    class ServiceToolbox
+    {
+        protected:
+            typedef std::unique_lock< std::mutex > unique_lock;
+
+        public:
+            ServiceToolbox( const std::string& name = "service-toolbox" );
+            virtual ~ServiceToolbox();
+
+        protected:
+            scarab::factory< Service, const std::string& >* fServiceFactory; // singleton; not owned by ServiceToolbox
+
+
+        public:
+            /// Configure the toolbox: create the services and configure; connnect signals and slots; and setup the run queue.
+            void Configure( const scarab::param_node& node );
+
+        protected:
+            struct ServiceInfo
+            {
+                std::shared_ptr< Service > fService;
+            };
+            typedef std::map< std::string, ServiceInfo > ServiceMap;
+
+        public:
+            /// Create services and configure each according to the `services` configuration block
+            void ConfigureServices( const scarab::param_array& node );
+
+            /// Get a pointer to a service in the toolbox
+            std::shared_ptr< Service > GetService( const std::string& svcName );
+            /// Get a pointer to a service in the toolbox
+            const std::shared_ptr< Service > GetService( const std::string& svcName ) const;
+
+            /// Add a service to the toolbox
+            /// Toolbox takes ownership of the service
+            bool AddService( const std::string& svcName, std::shared_ptr< Service > svc );
+            bool AddService( const std::string& svcType, const std::string& svcName );
+
+            /// Check whether a service already has a serice with a given name
+            bool HasService( const std::string& svcName ) const;
+            /// Check whether a service could build a service of a given type (i.e. does the factory know about this service?)
+            bool CouldBuild( const std::string& svcType ) const;
+
+            /// Remove a service from the toolbox
+            bool RemoveService( const std::string& svcName );
+
+            /// Remove a service from the toolbox and return it to the user
+            /// Ownership is passed to the user
+            std::shared_ptr< Service > ReleaseService( const std::string& svcName );
+
+            /// Remove all svcessors from the toolbox
+            /// Also clears the run queue
+            void ClearServices();
+
+        protected:
+            ServiceMap fServiceMap;
+
+    };
+
+    inline bool ServiceToolbox::HasService( const std::string& svcName ) const
+    {
+        return fServiceMap.count( svcName ) == 1;
+    }
+
+    inline bool ServiceToolbox::CouldBuild( const std::string& svcType ) const
+    {
+        return fServiceFactory->has_class( svcType );
+    }
+
+
+} /* namespace Nymph */
+#endif /* NYMPH_SERVICETOOLBOX_HH_ */
diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index f4434f1..8678c09 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -20,10 +20,12 @@ set( testing_lib_HEADERS
     ${CPP_DIR}/TestDataClasses.hh
     ${CPP_DIR}/TestDataProcessorClasses.hh
     ${CPP_DIR}/TestProcessorClasses.hh
+    ${CPP_DIR}/TestServiceClasses.hh
 )
 
 set( testing_lib_SOURCES
     ${CPP_DIR}/TestProcessorClasses.cc
+    ${CPP_DIR}/TestServiceClasses.cc
 )
 
 set( testing_lib_LIB_DEPENDENCIES 
@@ -55,6 +57,8 @@ set( testing_SOURCES
     ${CPP_DIR}/TestProcessorToolbox.cc
     ${CPP_DIR}/TestReturnBuffer.cc
     ${CPP_DIR}/TestRunNymph.cc
+    ${CPP_DIR}/TestService.cc
+    ${CPP_DIR}/TestServiceToolbox.cc
     ${CPP_DIR}/TestSignalSlot.cc
     ${CPP_DIR}/TestSingleRunController.cc
     ${CPP_DIR}/TestSlotData.cc
diff --git a/Testing/Cpp/TestService.cc b/Testing/Cpp/TestService.cc
new file mode 100644
index 0000000..b82c573
--- /dev/null
+++ b/Testing/Cpp/TestService.cc
@@ -0,0 +1,58 @@
+/*
+ * TestService.cc
+ *
+ *  Created on: Sept 12, 2019
+ *      Author: N.S. Oblath
+ */
+
+#include "TestControllerClasses.hh"
+#include "TestServiceClasses.hh"
+
+#include "ConfigException.hh"
+
+#include "logger.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestService" );
+
+TEST_CASE( "service", "[service]" )
+{
+    using namespace Nymph;
+    using namespace NymphTesting;
+
+    TestService tpService;
+
+    SECTION( "Configuration" )
+    {
+        REQUIRE( tpService.GetValue() == 0 );
+
+        // setup the config parameter
+        scarab::param_node config;
+        int configValue = 5;
+        config.add( "value", configValue );
+
+        // perform configuration with no value for "string"
+        REQUIRE_NOTHROW( tpService.Configure( config ) );
+        // check that the value was set correctly
+        REQUIRE( tpService.GetValue() == configValue );
+
+        // peform configuration with an illegal value for "string"
+        config.add( "string", "illegal value" );
+        REQUIRE_THROWS_AS( tpService.Configure( config ), ConfigException );
+        try
+        {
+            tpService.Configure( config );
+        }
+        catch( const ConfigException& e )
+        {
+            PrintException(e);
+        }
+        
+        // perform configuration with a legal value for "string"
+        config["string"]().set( "ok value 1" );
+        REQUIRE_NOTHROW( tpService.Configure( config ) );
+        REQUIRE( tpService.StringValue() == "ok 1" );
+
+    }
+}
diff --git a/Testing/Cpp/TestServiceClasses.cc b/Testing/Cpp/TestServiceClasses.cc
new file mode 100644
index 0000000..d261528
--- /dev/null
+++ b/Testing/Cpp/TestServiceClasses.cc
@@ -0,0 +1,40 @@
+/*
+ * TestServiceClasses.cc
+ *
+ *  Created on: Dec 28, 2023
+ *      Author: N.S. Oblath
+ */
+
+#include "TestServiceClasses.hh"
+
+#include "ConfigException.hh"
+
+REGISTER_SERVICE( NymphTesting, TestService, "test-svc" );
+
+namespace NymphTesting
+{
+    TestService::TestService( const std::string& name ) :
+            Nymph::Service( name ),
+            fValue( 0 ),
+            fSecondValue( 0 )
+    {}
+
+    TestService::~TestService()
+    {}
+
+    void TestService::Configure( const scarab::param_node& node )
+    {
+        fValue = node.get_value( "value", fValue );
+
+        // we'll test configuration error throwing by having a string with restricted values
+        if( node.has("string") )
+        {
+            if( node["string"]().as_string() == "ok value 1" ) fStringValue = "ok 1";
+            else if( node["string"]().as_string() == "ok value 2" ) fStringValue = "ok 2";
+            else THROW_EXCEPT_HERE( Nymph::ConfigException( node ) << "Invalid choice for \"string\"" );
+        }
+
+        return;
+    }
+
+} /* namespace NymphTesting */
diff --git a/Testing/Cpp/TestServiceClasses.hh b/Testing/Cpp/TestServiceClasses.hh
new file mode 100644
index 0000000..4f34602
--- /dev/null
+++ b/Testing/Cpp/TestServiceClasses.hh
@@ -0,0 +1,33 @@
+/*
+ * TestServiceClasses.hh
+ *
+ *  Created on: Dec 28, 2023
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_TESTING_SERVICECLASSES_HH_
+#define NYMPH_TESTING_SERVICECLASSES_HH_
+
+#include "Service.hh"
+
+namespace NymphTesting
+{
+    // concrete processor class that we can test
+    // implements Configure() and has its own signal and slot
+    class TestService : public Nymph::Service
+    {
+        public:
+            TestService( const std::string& name = "test" );
+
+            virtual ~TestService();
+
+            void Configure( const scarab::param_node& node );
+
+            MEMVAR( int, Value );
+            MEMVAR( int, SecondValue );
+            MEMVAR_REF( std::string, StringValue );
+    };
+
+} /* namespace NymphTesting */
+
+#endif
diff --git a/Testing/Cpp/TestServiceToolbox.cc b/Testing/Cpp/TestServiceToolbox.cc
new file mode 100644
index 0000000..ce151bb
--- /dev/null
+++ b/Testing/Cpp/TestServiceToolbox.cc
@@ -0,0 +1,87 @@
+/*
+ * TestServiceToolbox.cc
+ *
+ *  Created on: Dec 28, 2023
+ *      Author: N.S. Oblath
+ */
+
+#include "TestServiceClasses.hh"
+
+#include "ServiceToolbox.hh"
+
+#include "logger.hh"
+#include "param_codec.hh"
+
+#include "catch.hpp"
+
+LOGGER( testlog, "TestServiceToolbox" );
+
+
+TEST_CASE( "service_toolbox" )
+{
+    using namespace Nymph;
+    using namespace NymphTesting;
+
+    //SharedControl::get_instance()->Reset();
+
+    ServiceToolbox tstToolbox;
+
+    SECTION( "AddRemoveServices" )
+    {
+        LINFO( testlog, "Add/Remove Service tests" );
+
+        std::string svcName1( "testsvc-1" );
+        std::string svcName2( "testsvc-2" );
+
+        REQUIRE( tstToolbox.CouldBuild( "test-svc" ) );
+        REQUIRE_FALSE( tstToolbox.CouldBuild( svcName1 ) );
+        REQUIRE_FALSE( tstToolbox.CouldBuild( svcName2 ) );
+
+        REQUIRE_FALSE( tstToolbox.HasService( svcName1 ) );
+        REQUIRE_FALSE( tstToolbox.HasService( svcName2 ) );
+
+        REQUIRE_FALSE( tstToolbox.GetService( svcName1 ) );
+        REQUIRE_FALSE( tstToolbox.GetService( svcName2 ) );
+
+        std::string config_str(
+            "- type: test-svc\n"
+            "  name: testsvc-1\n"
+            "  value: 5\n"
+            "  string: ok value 1"
+        );
+
+        scarab::param_translator translator;
+        auto config = translator.read_string( config_str, "yaml" );
+
+        REQUIRE_NOTHROW( tstToolbox.ConfigureServices( config->as_array() ) );
+
+        auto svc = tstToolbox.GetService( svcName1 );
+        REQUIRE( svc );
+        REQUIRE( svc->Name() == svcName1 );
+
+        auto testService = std::dynamic_pointer_cast< TestService >( svc );
+        REQUIRE( testService );
+        REQUIRE( testService->GetValue() == 5 );
+        REQUIRE( testService->StringValue() == "ok 1" );
+
+        std::shared_ptr< Service > tp1 = tstToolbox.ReleaseService( svcName1 );
+        REQUIRE_FALSE( tstToolbox.GetService( svcName1 ) );
+
+        REQUIRE( tstToolbox.AddService( svcName1, tp1 ) );
+        REQUIRE( tstToolbox.GetService( svcName1 ) );
+
+        REQUIRE( tstToolbox.AddService( "test-svc", svcName2 ) );
+        REQUIRE( tstToolbox.GetService( svcName2 ) );
+
+        REQUIRE( tstToolbox.HasService( svcName1 ) );
+        REQUIRE( tstToolbox.HasService( svcName2 ) );
+
+        REQUIRE( tstToolbox.RemoveService( svcName1 ) );
+        REQUIRE_FALSE( tstToolbox.GetService( svcName1 ) );
+        REQUIRE( tstToolbox.GetService( svcName2 ) );
+
+        tstToolbox.ClearServices();
+        REQUIRE_FALSE( tstToolbox.GetService( svcName2 ) );
+    }
+
+}

From 7d7e20fd4183119a80c07c52c429fb810a977d0b Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 28 Dec 2023 17:55:44 -0800
Subject: [PATCH 459/521] Generalize python version to 3

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 02fcc0f..3566b4c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        python-version: [3.9]
+        python-version: [3]
 
     steps:
 
@@ -116,7 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        python-version: [3.9]
+        python-version: [3]
 
     steps:
 

From e47e43087dcc60d1066cc27555a5b2b928b2c306 Mon Sep 17 00:00:00 2001
From: Noah Oblath <noah.oblath@pnnl.gov>
Date: Thu, 28 Dec 2023 17:58:04 -0800
Subject: [PATCH 460/521] Allow python tests to fail for now

---
 .github/workflows/build.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3566b4c..705c698 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -159,6 +159,7 @@ jobs:
           pip -v install .
           
       - name: Run Tests
+        continue-on-error: true
         run: |
           cd Testing/Python
           python -m unittest discover -v

From f0f2000e5eaf5d4575dd428e795b1f31ae7460fd Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 21 Aug 2025 14:27:54 -0700
Subject: [PATCH 461/521] Scarab updated to v3.12.0

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index f64549a..fb50033 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit f64549a85ae7a79e9f5c5622e75ea6311043b941
+Subproject commit fb500336ef6c368f908ca394f314e6f82d325544

From 6e4aaecdb7d704213986ce96414ab776c6384a57 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 21 Aug 2025 14:28:33 -0700
Subject: [PATCH 462/521] Update the GHA workflow

---
 .github/workflows/build.yaml | 101 +++++++++++++++++++++++++++--------
 1 file changed, 78 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 705c698..29c008c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,6 +14,7 @@ env:
   Nymph_SINGLETHREADED: OFF
   Nymph_BUILD_TYPE: Debug
   Nymph_TAG: test
+  NARG: 2
 
 jobs:
 
@@ -25,22 +26,31 @@ jobs:
     steps:
 
       - name: Checkout the repo 
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
-      - name: Build and test
+      - name: Build
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          load: true
+          build-args: |
+            img_repo=${{ env.BASE_IMAGE_REPO }}
+            img_tag=${{ env.BASE_IMAGE_TAG }}
+            build_type=${{ env.Nymph_BUILD_TYPE }}
+            build_tests_exe=${{ env.Nymph_ENABLE_TESTING }}
+            nymph_tag=${{ env.Nymph_TAG }}
+            narg=${{ env.NARG }}
+          platforms: linux/amd64
+          tags: ${{ env.Nymph_TAG }}
+
+      - name: Unit Tests
         run: |
-          docker build \
-            --target nymph_done \
-            --build-arg img_repo=${BASE_IMAGE_REPO} \
-            --build-arg img_tag=${BASE_IMAGE_TAG} \
-            --build-arg build_type=${Nymph_BUILD_TYPE} \
-            --build-arg build_tests_exe=${Nymph_ENABLE_TESTING} \
-            --build-arg nymph_tag=${Nymph_TAG} \
-            --tag project8/nymph:${Nymph_TAG} \
-            .
-          docker run project8/nymph:${Nymph_TAG} /tmp_source/build/Testing/RunTests
+          docker run --rm ${{ env.Nymph_TAG }} bash -c "
+            /tmp_source/build/Testing/RunTests"
 
 
   build_cpp:
@@ -57,12 +67,12 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -72,8 +82,23 @@ jobs:
           brew install \
             boost \
             rapidjson \
-            yaml-cpp \
-            pybind11
+            yaml-cpp
+          sudo mkdir -p /usr/local/include && \
+            sudo chown -R $(whoami) /usr/local/include
+          sudo mkdir -p /usr/local/lib && \
+            sudo chown -R $(whoami) /usr/local/lib
+          sudo mkdir -p /usr/local/bin && \
+            sudo chown -R $(whoami) /usr/local/bin
+          sudo mkdir -p /usr/local/share && \
+            sudo chown -R $(whoami) /usr/local/share
+          git clone https://github.com/pybind/pybind11.git
+          cd pybind11
+          git checkout v3.0.0
+          mkdir build
+          cd build
+          cmake -DPYBIND11_TEST=FALSE ..
+          make -j${{ env.NARG }} install
+
 
 
       - name: Linux Dependencies
@@ -83,8 +108,15 @@ jobs:
           sudo apt-get install -yq \
             libboost-all-dev \
             libyaml-cpp-dev \
-            rapidjson-dev \
-            pybind11-dev 
+            rapidjson-dev
+          git clone https://github.com/pybind/pybind11.git
+          cd pybind11
+          git checkout v3.0.0
+          mkdir build
+          cd build
+          sudo cmake -DPYBIND11_TEST=FALSE ..
+          sudo make -j${{ env.NARG }} install
+          cd ../..
           pip install "pybind11[global]"
           
 
@@ -97,7 +129,7 @@ jobs:
       - name: CMake Build
         run: |
           cd build
-          make -j install
+          make -j${{ env.NARG }} install
 
       - name: Run tests
         run: |
@@ -121,12 +153,12 @@ jobs:
     steps:
 
       - name: Checkout repository
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -136,8 +168,22 @@ jobs:
           brew install \
             boost \
             rapidjson \
-            yaml-cpp \
-            pybind11
+            yaml-cpp
+          sudo mkdir -p /usr/local/include && \
+            sudo chown -R $(whoami) /usr/local/include
+          sudo mkdir -p /usr/local/lib && \
+            sudo chown -R $(whoami) /usr/local/lib
+          sudo mkdir -p /usr/local/bin && \
+            sudo chown -R $(whoami) /usr/local/bin
+          sudo mkdir -p /usr/local/share && \
+            sudo chown -R $(whoami) /usr/local/share
+          git clone https://github.com/pybind/pybind11.git
+          cd pybind11
+          git checkout v3.0.0
+          mkdir build
+          cd build
+          cmake -DPYBIND11_TEST=FALSE ..
+          make -j${{ env.NARG }} install
 
           python -m pip install build
 
@@ -149,6 +195,15 @@ jobs:
             libboost-all-dev \
             libyaml-cpp-dev \
             rapidjson-dev
+          git clone https://github.com/pybind/pybind11.git
+          cd pybind11
+          git checkout v3.0.0
+          mkdir build
+          cd build
+          sudo cmake -DPYBIND11_TEST=FALSE ..
+          sudo make -j${{ env.NARG }} install
+          cd ../..
+
           
           pip install "pybind11[global]" 
           

From 28a2711cb97ee4dab6a20656882e7fafd453f738 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 21 Aug 2025 16:09:20 -0700
Subject: [PATCH 463/521] Put scarab on the logger feature branch

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index fb50033..78856db 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit fb500336ef6c368f908ca394f314e6f82d325544
+Subproject commit 78856dbf97f354769c5522bc8bdedb624492dfa7

From 1cd14d02e773d636264b88c83c15b76d2173a86a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 15:08:32 -0700
Subject: [PATCH 464/521] Updated Dockerfile structure and boost dependencies

---
 CMakeLists.txt |  4 ++--
 Dockerfile     | 53 +++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51399f0..35ea3ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,9 +66,9 @@ set( PRIVATE_EXT_LIBS )
 #######
 
 # Boost (1.46 required for filesystem version 3)
-list( APPEND BOOST_COMPONENTS chrono date_time filesystem program_options system thread )
+list( APPEND BOOST_COMPONENTS chrono date_time filesystem system thread )
 find_package( Boost 1.46.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
-list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::program_options Boost::thread Boost::filesystem )
+list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::thread Boost::filesystem )
 # make sure dynamic linking is assumed for all boost libraries
 set( Boost_USE_STATIC_LIBS OFF )
 set( Boost_USE_STATIC_RUNTIME OFF )
diff --git a/Dockerfile b/Dockerfile
index 8c1c9a5..b8ab195 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,53 @@
-FROM project8/p8compute_dependencies:v1.2.0 as nymph_common
+ARG base_img_repo=python
+ARG base_img_tag=3.12.1-slim-bookworm
+
+# This FROM line includes a label so that the dependencies can be built by themselves by using the `--target` argument of `docker build`
+FROM ${base_img_repo}:${base_img_tag} AS base
 
 ARG build_type=Release
-ENV NYMPH_BUILD_TYPE=$build_type
 ARG build_tests_exe=FALSE
+ARG narg=2
+ARG nymph_tag=dev
+
+ENV NYMPH_BUILD_TYPE=$build_type
 ENV NYMPH_BUILD_TESTS_EXE=$build_tests_exe
 
-ARG nymph_tag=dev
 ENV NYMPH_TAG=$nymph_tag
 ENV NYMPH_BUILD_PREFIX=/usr/local/p8/nymph/$NYMPH_TAG
 
+RUN apt-get update && \
+    apt-get clean && \
+    apt-get --fix-missing -y install \
+        build-essential \
+        cmake \
+#        gdb \
+        git \
+        libboost-chrono-dev \
+        libboost-filesystem-dev \
+        libboost-date-time-dev \
+        libboost-system-dev \
+        libboost-thread-dev \
+        libyaml-cpp-dev \
+        rapidjson-dev && \
+#        pybind11-dev \
+#        wget && \
+    rm -rf /var/lib/apt/lists/*
+
+# use pybind11_checkout to specify a tag or branch name to checkout
+ARG pybind11_checkout=v3.0.0
+ARG pybind11_repo=https://github.com/pybind/pybind11.git
+ARG pybind11_name=pybind11
+RUN cd /usr/local && \
+    git clone ${pybind11_repo} && \
+    cd ${pybind11_name} && \
+    git checkout ${pybind11_checkout} && \
+    mkdir build && \
+    cd build && \
+    cmake -DPYBIND11_TEST=FALSE .. && \
+    make -j${narg} install && \
+    cd / && \
+    rm -rf /usr/local/${pybind11_name}
+
 RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
     chmod -R 777 $NYMPH_BUILD_PREFIX/.. &&\
     cd $NYMPH_BUILD_PREFIX &&\
@@ -21,7 +60,7 @@ RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
     /bin/true
 
 ########################
-FROM nymph_common as nymph_done
+FROM base AS build
 
 COPY cmake /tmp_source/cmake
 COPY Python /tmp_source/Python
@@ -46,10 +85,10 @@ RUN source $NYMPH_BUILD_PREFIX/setup.sh &&\
     cmake -D CMAKE_BUILD_TYPE=$NYMPH_BUILD_TYPE \
           -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_BUILD_PREFIX \
           -D Nymph_ENABLE_TESTING:BOOL=$NYMPH_BUILD_TESTS_EXE .. &&\
-    make -j3 install &&\
+    make -j${narg} install &&\
     /bin/true
 
 ########################
-FROM nymph_common
+FROM base
 
-COPY --from=nymph_done $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX
+COPY --from=build $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX

From 46d8780ad631c52b0f6d32c8c5b72c094ac08371 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 15:10:03 -0700
Subject: [PATCH 465/521] Updated Catch2 to the v3 structure

---
 Testing/CMakeLists.txt                 | 25 ++++++++++++++++++++++---
 Testing/Cpp/TestConfigException.cc     |  3 ++-
 Testing/Cpp/TestControlAccess.cc       |  7 ++++---
 Testing/Cpp/TestController.cc          |  7 ++++---
 Testing/Cpp/TestData.cc                |  7 ++++---
 Testing/Cpp/TestDataFrame.cc           |  2 +-
 Testing/Cpp/TestException.cc           |  2 +-
 Testing/Cpp/TestPrimaryProcessor.cc    |  2 +-
 Testing/Cpp/TestProcessor.cc           |  2 +-
 Testing/Cpp/TestProcessorToolbox.cc    |  2 +-
 Testing/Cpp/TestReturnBuffer.cc        |  7 ++++---
 Testing/Cpp/TestRunNymph.cc            |  2 +-
 Testing/Cpp/TestService.cc             |  2 +-
 Testing/Cpp/TestServiceToolbox.cc      |  2 +-
 Testing/Cpp/TestSignalSlot.cc          |  2 +-
 Testing/Cpp/TestSingleRunController.cc |  4 ++--
 Testing/Cpp/TestSlotData.cc            | 11 ++++++-----
 Testing/Cpp/UseCatch.cc                | 11 ++++++++---
 18 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 8678c09..09e27a5 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -1,6 +1,25 @@
 # CMakeLists for Nymph/Testing
 # Author: N.S. Oblath
 
+include( FetchContent )
+
+FetchContent_Declare(
+    Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG        v3.7.1
+)
+
+FetchContent_MakeAvailable( Catch2 )
+list( APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras )
+
+pbuilder_component_install_and_export( 
+    COMPONENT Catch2
+    LIBTARGETS Catch2
+    NAMESPACE Catch2::
+)
+
+########################################################################
+
 set( PY_DIR Python )
 set( CPP_DIR Cpp )
 
@@ -72,15 +91,15 @@ set( testing_LIB_DEPENDENCIES
 
 # Interface library was recommended for Catch:
 # https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
-add_library( Catch INTERFACE )
-target_include_directories( Catch INTERFACE ${Scarab_LOCATION}/testing/catch )
+#add_library( Catch INTERFACE )
+#target_include_directories( Catch INTERFACE ${Scarab_LOCATION}/testing/catch )
 
 pbuilder_executable(
     EXECUTABLE RunTests
     SOURCES ${testing_SOURCES}
     PROJECT_LIBRARIES ${testing_LIB_DEPENDENCIES}
+    PUBLIC_EXTERNAL_LIBRARIES Catch2::Catch2
 )
-target_link_libraries( RunTests PUBLIC Catch )
 set( programs "RunTests" )
 
 pbuilder_component_install_and_export(
diff --git a/Testing/Cpp/TestConfigException.cc b/Testing/Cpp/TestConfigException.cc
index 81e2d81..8e602a0 100644
--- a/Testing/Cpp/TestConfigException.cc
+++ b/Testing/Cpp/TestConfigException.cc
@@ -9,7 +9,8 @@
 
 #include "param_codec.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/matchers/catch_matchers_string.hpp"
 
 
 TEST_CASE( "config_exception", "[exception],[utility]" )
diff --git a/Testing/Cpp/TestControlAccess.cc b/Testing/Cpp/TestControlAccess.cc
index e1c499e..e961a3a 100644
--- a/Testing/Cpp/TestControlAccess.cc
+++ b/Testing/Cpp/TestControlAccess.cc
@@ -8,7 +8,8 @@
 
 #include "ControlAccess.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/catch_approx.hpp"
 
 #include <thread>
 
@@ -104,10 +105,10 @@ TEST_CASE( "control_access", "[control]" )
         REQUIRE( tcaControlAccess->IsAtBreak() );
         REQUIRE( tcaControlAccess->HasReturn() );
         // we can tcaControlAccess the return variable through the buffer
-        REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
+        REQUIRE( std::get<0>( retBuf ) == Catch::Approx(5.) );
         // we can change the value of the return variable using the buffer
         std::get<0>( retBuf ) = 10.;
-        REQUIRE( retval == Approx(10.) );
+        REQUIRE( retval == Catch::Approx(10.) );
     }
 
 }
\ No newline at end of file
diff --git a/Testing/Cpp/TestController.cc b/Testing/Cpp/TestController.cc
index 26b2415..0f12016 100644
--- a/Testing/Cpp/TestController.cc
+++ b/Testing/Cpp/TestController.cc
@@ -15,7 +15,8 @@
 
 #include <thread>
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/catch_approx.hpp"
 
 namespace NymphTesting
 {
@@ -175,10 +176,10 @@ TEST_CASE( "controller", "[control]" )
         REQUIRE( tcControl.IsAtBreak() );
         REQUIRE( tcControl.HasReturn() );
         // we can access the return variable through the buffer
-        REQUIRE( std::get<0>( retBuf ) == Approx(5.) );
+        REQUIRE( std::get<0>( retBuf ) == Catch::Approx(5.) );
         // we can change the value of the return variable using the buffer
         std::get<0>( retBuf ) = 10.;
-        REQUIRE( retval == Approx(10.) );
+        REQUIRE( retval == Catch::Approx(10.) );
     }
 
 }
diff --git a/Testing/Cpp/TestData.cc b/Testing/Cpp/TestData.cc
index e532c76..768c07d 100644
--- a/Testing/Cpp/TestData.cc
+++ b/Testing/Cpp/TestData.cc
@@ -7,7 +7,8 @@
 
 #include "TestDataClasses.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/catch_approx.hpp"
 
 
 TEST_CASE( "data", "[data]" )
@@ -23,7 +24,7 @@ TEST_CASE( "data", "[data]" )
     REQUIRE( tdData1.GetIValue1() == 50 );
 
     TestData2 tdData2;
-    REQUIRE( tdData2.GetDValue1() == Approx( 0.0 ) );
-    REQUIRE( tdData2.GetDValue2() == Approx( 10.0 ) );
+    REQUIRE( tdData2.GetDValue1() == Catch::Approx( 0.0 ) );
+    REQUIRE( tdData2.GetDValue2() == Catch::Approx( 10.0 ) );
 
 }
diff --git a/Testing/Cpp/TestDataFrame.cc b/Testing/Cpp/TestDataFrame.cc
index f2792f7..6dd3f70 100644
--- a/Testing/Cpp/TestDataFrame.cc
+++ b/Testing/Cpp/TestDataFrame.cc
@@ -9,7 +9,7 @@
 
 #include "DataFrame.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 
 TEST_CASE( "data_frame", "[data]" )
diff --git a/Testing/Cpp/TestException.cc b/Testing/Cpp/TestException.cc
index 70837d4..6012ceb 100644
--- a/Testing/Cpp/TestException.cc
+++ b/Testing/Cpp/TestException.cc
@@ -7,7 +7,7 @@
 
 #include "Exception.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include "logger.hh"
 
diff --git a/Testing/Cpp/TestPrimaryProcessor.cc b/Testing/Cpp/TestPrimaryProcessor.cc
index 0ada75a..8ef1fd7 100644
--- a/Testing/Cpp/TestPrimaryProcessor.cc
+++ b/Testing/Cpp/TestPrimaryProcessor.cc
@@ -10,7 +10,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestPrimaryProcessor" );
 
diff --git a/Testing/Cpp/TestProcessor.cc b/Testing/Cpp/TestProcessor.cc
index 00ba641..41b2dae 100644
--- a/Testing/Cpp/TestProcessor.cc
+++ b/Testing/Cpp/TestProcessor.cc
@@ -10,7 +10,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestProcessor" );
 
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
index 6cb3f70..e299955 100644
--- a/Testing/Cpp/TestProcessorToolbox.cc
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -12,7 +12,7 @@
 #include "logger.hh"
 #include "param_codec.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestProcessorToolbox" );
 
diff --git a/Testing/Cpp/TestReturnBuffer.cc b/Testing/Cpp/TestReturnBuffer.cc
index 07026db..d80e76b 100644
--- a/Testing/Cpp/TestReturnBuffer.cc
+++ b/Testing/Cpp/TestReturnBuffer.cc
@@ -7,7 +7,8 @@
 
 #include "ReturnBuffer.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/catch_approx.hpp"
 
 #include "logger.hh"
 
@@ -34,13 +35,13 @@ TEST_CASE( "return_buffer", "[processor]" )
     REQUIRE_NOTHROW( trbBuffer.GetReturn() );
     auto trbTheReturn = trbBuffer.GetReturn();
     REQUIRE( std::get<0>( trbTheReturn ) == 5 );
-    REQUIRE( std::get<1>( trbTheReturn ) == Approx(100.2) );
+    REQUIRE( std::get<1>( trbTheReturn ) == Catch::Approx(100.2) );
     REQUIRE( std::get<2>( trbTheReturn ) == "I'm a string!" );
 
     ReturnBufferBase& trbRBB = trbBuffer;
     auto trbTheRBBReturn = trbRBB.GetReturn< int, double, std::string >();
     REQUIRE( std::get<0>( trbTheRBBReturn ) == 5 );
-    REQUIRE( std::get<1>( trbTheRBBReturn ) == Approx(100.2) );
+    REQUIRE( std::get<1>( trbTheRBBReturn ) == Catch::Approx(100.2) );
     REQUIRE( std::get<2>( trbTheRBBReturn ) == "I'm a string!" );
 
 }
diff --git a/Testing/Cpp/TestRunNymph.cc b/Testing/Cpp/TestRunNymph.cc
index 14a0b73..abaf774 100644
--- a/Testing/Cpp/TestRunNymph.cc
+++ b/Testing/Cpp/TestRunNymph.cc
@@ -10,7 +10,7 @@
 #include "logger.hh"
 #include "param_codec.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestSingleRunController" );
 
diff --git a/Testing/Cpp/TestService.cc b/Testing/Cpp/TestService.cc
index b82c573..c8414c6 100644
--- a/Testing/Cpp/TestService.cc
+++ b/Testing/Cpp/TestService.cc
@@ -12,7 +12,7 @@
 
 #include "logger.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestService" );
 
diff --git a/Testing/Cpp/TestServiceToolbox.cc b/Testing/Cpp/TestServiceToolbox.cc
index ce151bb..113dd9f 100644
--- a/Testing/Cpp/TestServiceToolbox.cc
+++ b/Testing/Cpp/TestServiceToolbox.cc
@@ -12,7 +12,7 @@
 #include "logger.hh"
 #include "param_codec.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestServiceToolbox" );
 
diff --git a/Testing/Cpp/TestSignalSlot.cc b/Testing/Cpp/TestSignalSlot.cc
index 08c0f92..bf6b2f3 100644
--- a/Testing/Cpp/TestSignalSlot.cc
+++ b/Testing/Cpp/TestSignalSlot.cc
@@ -10,7 +10,7 @@
 
 #include "TestControllerClasses.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <future>
 #include <thread>
diff --git a/Testing/Cpp/TestSingleRunController.cc b/Testing/Cpp/TestSingleRunController.cc
index 6e14d58..535ee44 100644
--- a/Testing/Cpp/TestSingleRunController.cc
+++ b/Testing/Cpp/TestSingleRunController.cc
@@ -13,7 +13,7 @@
 #include "logger.hh"
 #include "param_codec.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 LOGGER( testlog, "TestSingleRunController" );
 
@@ -74,7 +74,7 @@ TEST_CASE( "single_run_controller" )
 
     SECTION( "RunQueue" )
     {
-        LINFO( "RunQueue Tests" );
+        LINFO( testlog, "RunQueue Tests" );
 
         std::string config_str(
             "- type: test-primary\n"
diff --git a/Testing/Cpp/TestSlotData.cc b/Testing/Cpp/TestSlotData.cc
index 053ae4e..e746af4 100644
--- a/Testing/Cpp/TestSlotData.cc
+++ b/Testing/Cpp/TestSlotData.cc
@@ -10,7 +10,8 @@
 
 #include "DataFrame.hh"
 
-#include "catch.hpp"
+#include "catch2/catch_test_macros.hpp"
+#include "catch2/catch_approx.hpp"
 
 #include "logger.hh"
 LOGGER(tsdlog_hh, "testslotdata.hh");
@@ -91,8 +92,8 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     REQUIRE_NOTHROW( (*tsdSlotDIToD)( tsdHandle ) ); // this adds TestData2 to the frame and sets the integer values in its double variables
     REQUIRE( tsdHandle->Has< TestData2 >() );
     TestData2& tsdTestData2 = tsdHandle->Get< TestData2 >();
-    REQUIRE( tsdTestData2.GetDValue1() == Approx(11.) );
-    REQUIRE( tsdTestData2.GetDValue2() == Approx(12.) );
+    REQUIRE( tsdTestData2.GetDValue1() == Catch::Approx(11.) );
+    REQUIRE( tsdTestData2.GetDValue2() == Catch::Approx(12.) );
 
     // verify that a slot with a const data object works
     // call the print slot function to verify use with const data
@@ -113,7 +114,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     REQUIRE( tsdHandle->Has< TestData2 >() );
     TestData2& tsdAnotherTestData2 = tsdHandle->Get< TestData2 >();
     REQUIRE( tsdTestData1.GetIValue1() == 16 );
-    REQUIRE( tsdAnotherTestData2.GetDValue1() == Approx(16.) );
+    REQUIRE( tsdAnotherTestData2.GetDValue1() == Catch::Approx(16.) );
 
     // verify that slots owned by something else work
     // remove TestData2
@@ -122,7 +123,7 @@ TEST_CASE( "slot_data", "[slot],[data]" )
     // call the mult slot and verify that it worked
     REQUIRE_NOTHROW( (*tsdSlotDMult)( tsdHandle ) ); // for TestData1::fIValue1, multiplies 16 by 2.5 and stores in TestData2::fDValue1
     TestData2& tsdYetAnotherTestData2 = tsdHandle->Get< TestData2 >();
-    REQUIRE( tsdYetAnotherTestData2.GetDValue1() == Approx(40.) );
+    REQUIRE( tsdYetAnotherTestData2.GetDValue1() == Catch::Approx(40.) );
 }
 
 
diff --git a/Testing/Cpp/UseCatch.cc b/Testing/Cpp/UseCatch.cc
index 4cb169c..a8347e7 100644
--- a/Testing/Cpp/UseCatch.cc
+++ b/Testing/Cpp/UseCatch.cc
@@ -5,6 +5,11 @@
  *      Author: N.S. Oblath
  */
 
-// Tells Catch to provide a main()
-#define CATCH_CONFIG_MAIN
-#include "catch.hpp"
+#include "catch2/catch_session.hpp"
+
+int main( int argc, char* argv[] ) 
+{
+    int result = Catch::Session().run( argc, argv );
+
+    return result;
+}

From 9912a125094771d9a36642253b60c307dbae0020 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 16:18:47 -0700
Subject: [PATCH 466/521] Remove cereal from build and non-useful line from
 setup.sh

---
 CMakeLists.txt | 6 +++---
 Dockerfile     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35ea3ba..71ff6f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,9 +97,9 @@ endif( Nymph_ENABLE_PYTHON )
 # Cereal
 ########
 
-set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
-add_subdirectory( External/cereal )
-include_directories( External/cereal/include )
+#set( JUST_INSTALL_CEREAL ON CACHE BOOL "Cereal option: only install library" FORCE)
+#add_subdirectory( External/cereal )
+#include_directories( External/cereal/include )
 
 
 #####################
diff --git a/Dockerfile b/Dockerfile
index b8ab195..e259364 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,13 +51,14 @@ RUN cd /usr/local && \
 RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
     chmod -R 777 $NYMPH_BUILD_PREFIX/.. &&\
     cd $NYMPH_BUILD_PREFIX &&\
-    echo "source ${COMMON_BUILD_PREFIX}/setup.sh" > setup.sh &&\
     echo "export NYMPH_TAG=${NYMPH_TAG}" >> setup.sh &&\
     echo "export NYMPH_BUILD_PREFIX=${NYMPH_BUILD_PREFIX}" >> setup.sh &&\
     echo 'ln -sfT $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX/../current' >> setup.sh &&\
     echo 'export PATH=$NYMPH_BUILD_PREFIX/bin:$PATH' >> setup.sh &&\
     echo 'export LD_LIBRARY_PATH=$NYMPH_BUILD_PREFIX/lib:$LD_LIBRARY_PATH' >> setup.sh &&\
     /bin/true
+#    echo "source ${COMMON_BUILD_PREFIX}/setup.sh" > setup.sh &&\
+
 
 ########################
 FROM base AS build

From ff197ff481aaae13ead216df60f8b34deafc0b5c Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 16:21:13 -0700
Subject: [PATCH 467/521] Scarab on develop branch

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index 78856db..e5c49f5 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit 78856dbf97f354769c5522bc8bdedb624492dfa7
+Subproject commit e5c49f58bd38660ecfb13f607e1d0b021d24fc97

From b733e715f1b80261819fd05ddf4aa222f5d2b687 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 16:25:24 -0700
Subject: [PATCH 468/521] Default shell is bash

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e259364..73dc147 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,9 @@ ENV NYMPH_BUILD_TESTS_EXE=$build_tests_exe
 ENV NYMPH_TAG=$nymph_tag
 ENV NYMPH_BUILD_PREFIX=/usr/local/p8/nymph/$NYMPH_TAG
 
+# Set bash as the default shell
+SHELL ["/bin/bash", "-c"]
+
 RUN apt-get update && \
     apt-get clean && \
     apt-get --fix-missing -y install \

From 3e068ebd950db761fbf9e34d7c2894a6e9b6addc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 16:44:47 -0700
Subject: [PATCH 469/521] Hopefully fixed prefix issue; renamed
 NYMPH_BUILD_PREFIX to NYMPH_PREFIX

---
 .github/workflows/build.yaml | 10 ++++++++--
 Dockerfile                   | 24 ++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 29c008c..c0705bb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,7 +50,7 @@ jobs:
       - name: Unit Tests
         run: |
           docker run --rm ${{ env.Nymph_TAG }} bash -c "
-            /tmp_source/build/Testing/RunTests"
+            $NYMPH_PREFIX/bin/RunTests"
 
 
   build_cpp:
@@ -124,7 +124,13 @@ jobs:
         run: |
           mkdir -p build
           cd build
-          cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE} -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} ..
+          cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE} \
+            -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} \
+            -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} \
+            -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} \
+            -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} \
+            -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} \
+            ..
 
       - name: CMake Build
         run: |
diff --git a/Dockerfile b/Dockerfile
index 73dc147..f30a4ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV NYMPH_BUILD_TYPE=$build_type
 ENV NYMPH_BUILD_TESTS_EXE=$build_tests_exe
 
 ENV NYMPH_TAG=$nymph_tag
-ENV NYMPH_BUILD_PREFIX=/usr/local/p8/nymph/$NYMPH_TAG
+ENV NYMPH_PREFIX=/usr/local/p8/nymph/$NYMPH_TAG
 
 # Set bash as the default shell
 SHELL ["/bin/bash", "-c"]
@@ -51,14 +51,14 @@ RUN cd /usr/local && \
     cd / && \
     rm -rf /usr/local/${pybind11_name}
 
-RUN mkdir -p $NYMPH_BUILD_PREFIX &&\
-    chmod -R 777 $NYMPH_BUILD_PREFIX/.. &&\
-    cd $NYMPH_BUILD_PREFIX &&\
+RUN mkdir -p $NYMPH_PREFIX &&\
+    chmod -R 777 $NYMPH_PREFIX/.. &&\
+    cd $NYMPH_PREFIX &&\
     echo "export NYMPH_TAG=${NYMPH_TAG}" >> setup.sh &&\
-    echo "export NYMPH_BUILD_PREFIX=${NYMPH_BUILD_PREFIX}" >> setup.sh &&\
-    echo 'ln -sfT $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX/../current' >> setup.sh &&\
-    echo 'export PATH=$NYMPH_BUILD_PREFIX/bin:$PATH' >> setup.sh &&\
-    echo 'export LD_LIBRARY_PATH=$NYMPH_BUILD_PREFIX/lib:$LD_LIBRARY_PATH' >> setup.sh &&\
+    echo "export NYMPH_PREFIX=${NYMPH_PREFIX}" >> setup.sh &&\
+    echo 'ln -sfT $NYMPH_PREFIX $NYMPH_PREFIX/../current' >> setup.sh &&\
+    echo 'export PATH=$NYMPH_PREFIX/bin:$PATH' >> setup.sh &&\
+    echo 'export LD_LIBRARY_PATH=$NYMPH_PREFIX/lib:$LD_LIBRARY_PATH' >> setup.sh &&\
     /bin/true
 #    echo "source ${COMMON_BUILD_PREFIX}/setup.sh" > setup.sh &&\
 
@@ -79,15 +79,15 @@ COPY NymphConfig.cmake.in /tmp_source/NymphConfig.cmake.in
 COPY .git /tmp_source/.git
 
 # repeat the cmake command to get the change of install prefix to set correctly (a package_builder known issue)
-RUN source $NYMPH_BUILD_PREFIX/setup.sh &&\
+RUN source $NYMPH_PREFIX/setup.sh &&\
     cd /tmp_source &&\
     mkdir build &&\
     cd build &&\
     cmake -D CMAKE_BUILD_TYPE=$NYMPH_BUILD_TYPE \
-          -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_BUILD_PREFIX \
+          -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_PREFIX \
           -D Nymph_ENABLE_TESTING:BOOL=$NYMPH_BUILD_TESTS_EXE .. &&\
     cmake -D CMAKE_BUILD_TYPE=$NYMPH_BUILD_TYPE \
-          -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_BUILD_PREFIX \
+          -D CMAKE_INSTALL_PREFIX:PATH=$NYMPH_PREFIX \
           -D Nymph_ENABLE_TESTING:BOOL=$NYMPH_BUILD_TESTS_EXE .. &&\
     make -j${narg} install &&\
     /bin/true
@@ -95,4 +95,4 @@ RUN source $NYMPH_BUILD_PREFIX/setup.sh &&\
 ########################
 FROM base
 
-COPY --from=build $NYMPH_BUILD_PREFIX $NYMPH_BUILD_PREFIX
+COPY --from=build $NYMPH_PREFIX $NYMPH_PREFIX

From 2c018029fba3c4b7c4c30d4ebfb7a52954b2e30f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 25 Aug 2025 17:01:34 -0700
Subject: [PATCH 470/521] Hopefully fixing docker test testing

---
 .github/workflows/build.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c0705bb..4933aa6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -49,8 +49,7 @@ jobs:
 
       - name: Unit Tests
         run: |
-          docker run --rm ${{ env.Nymph_TAG }} bash -c "
-            $NYMPH_PREFIX/bin/RunTests"
+          docker run --rm ${{ env.Nymph_TAG }} bash -c "/usr/local/p8/nymph/${{ env.Nymph_TAG }}/bin/RunTests"
 
 
   build_cpp:

From ab18dd64c381734dd3f5b097bc2436848db3ccfd Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 Sep 2025 17:34:20 -0700
Subject: [PATCH 471/521] Move version definition to its own file

---
 CMakeLists.txt | 5 ++++-
 VERSION        | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 VERSION

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71ff6f4..91001eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,11 @@ cmake_minimum_required (VERSION 3.12)
 # Setup #
 #########
 
+# load the version number from the nymph/VERSION file
+file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION nymph_version )
+
 cmake_policy( SET CMP0048 NEW ) # version in project()
-project( Nymph VERSION 1.5.2 )
+project( Nymph VERSION ${nymph_version} )
 
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )
 include( PackageBuilder )
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..227cea2
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2.0.0

From 50258fd33d834a81df1f888f8d59646298dc8b4f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 Sep 2025 17:35:16 -0700
Subject: [PATCH 472/521] Setup the python-only Nymph package

---
 Dockerfile               |  3 +-
 Python/nymph/__init__.py |  5 ++-
 pyproject.toml           | 20 +++++++----
 setup.cfg                | 20 -----------
 setup.py                 | 77 ----------------------------------------
 5 files changed, 20 insertions(+), 105 deletions(-)
 delete mode 100644 setup.cfg
 delete mode 100644 setup.py

diff --git a/Dockerfile b/Dockerfile
index f30a4ce..5578149 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -76,7 +76,8 @@ COPY Scarab /tmp_source/Scarab
 COPY Testing /tmp_source/Testing
 COPY CMakeLists.txt /tmp_source/CMakeLists.txt
 COPY NymphConfig.cmake.in /tmp_source/NymphConfig.cmake.in
-COPY .git /tmp_source/.git
+COPY pyproject.toml /tmp_source/pyproject.toml
+#COPY .git /tmp_source/.git
 
 # repeat the cmake command to get the change of install prefix to set correctly (a package_builder known issue)
 RUN source $NYMPH_PREFIX/setup.sh &&\
diff --git a/Python/nymph/__init__.py b/Python/nymph/__init__.py
index 34e3b3d..bd240f9 100644
--- a/Python/nymph/__init__.py
+++ b/Python/nymph/__init__.py
@@ -1 +1,4 @@
-#from . import your_module
\ No newline at end of file
+
+# import nymph_bindings entirely into nymph
+from nymph_bindings import *
+
diff --git a/pyproject.toml b/pyproject.toml
index 70cfe4a..356c608 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,18 @@
 [build-system]
 requires = [
     "setuptools>=42", 
-    "wheel",
-    "cmake>=3.12",
-    "pybind11>=2.3.0",
-    "PyYAML",
-    "python-rapidjson",
 ]
-build-backend = "setuptools.build_meta"
\ No newline at end of file
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "nymph"
+#dependencies = [
+#    "nymph_bindings @ file:///src/build-ny22py-debug-docker/lib",
+#]
+dynamic = ["version"]
+
+[tool.setuptools.packages.find]
+where = ["Python"]
+
+[tool.setuptools.dynamic]
+version = {file = ["VERSION"]}
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 0d58041..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-[metadata]
-name = nymph
-version = 2.0.0
-author = Project 8
-author_email = project8xperiment@gmail.com
-description = A C++/python based data analysis framework.
-long_description = file: README.md 
-url = https://github.com/project8/nymph
-classifiers = 
-    License :: Other/Proprietary License
-    Operating System :: MacOS
-    Operating System :: Unix
-    Programming Language :: C++
-    Programming Language :: Python
-
-[options]
-zip_safe = False
-python_requires = >=3.6
-
-[options.packages.find]
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 65feed9..0000000
--- a/setup.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import os
-import re
-import sys
-import platform
-import subprocess
-
-from setuptools import setup, find_packages, Extension
-from setuptools.command.build_ext import build_ext
-#from distutils.version import LooseVersion
-
-
-class CMakeExtension(Extension):
-    def __init__(self, name, sourcedir=''):
-        Extension.__init__(self, name, sources=[])
-        self.sourcedir = os.path.abspath(sourcedir)
-        print(self.sourcedir)
-
-class CMakeBuild(build_ext):
-    def run(self):
-        try:
-            out = subprocess.check_output(['cmake', '--version'])
-        except OSError:
-            raise RuntimeError("CMake must be installed to build the following extensions: " +
-                               ", ".join(e.name for e in self.extensions))
-
-        #if platform.system() == "Windows":
-        #    cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
-        #    if cmake_version < '3.1.0':
-        #        raise RuntimeError("CMake >= 3.1.0 is required on Windows")
-
-        for ext in self.extensions:
-            self.build_extension(ext)
-
-    def build_extension(self, ext):
-        extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
-        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
-                      '-DPYTHON_EXECUTABLE=' + sys.executable,
-                      #'-DCMAKE_INSTALL_PREFIX:PATH=/usr/local',
-                      '-DNymph_ENABLE_PYTHON:bool=1',
-                      '-DNymph_ENABLE_TESTING:bool=1'
-                     ]
-
-        cfg = 'Debug' if self.debug else 'Release'
-        #cfg = 'DEBUG'
-        build_args = ['--config', cfg]
-
-        cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
-        build_args += ['--', '-j2',]
-
-        env = os.environ.copy()
-        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
-                                                              self.distribution.get_version())
-        if not os.path.exists(self.build_temp):
-            os.makedirs(self.build_temp)
-        # We need to remove the cache file because pip makes new /tmp source directories each time
-        print('remove cache')
-        subprocess.check_call(['rm', '-f', 'CMakeCache.txt'], cwd=self.build_temp, env=env)
-        print("should make a cmake call:")
-        print(' '.join(['cmake', ext.sourcedir] + cmake_args), 'cwd={}'.format(self.build_temp), 'env={}'.format(env))
-        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
-        subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
-        print("should make a build call:")
-        print(['cmake', '--build', '.'] + build_args, 'cwd={}'.format(self.build_temp))
-        #subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
-        subprocess.check_call(['make', 'install'], cwd=self.build_temp)
-
-if __name__ == "__main__":
-
-    setup(
-        ext_modules=[CMakeExtension('nymph', sourcedir='')],
-        cmdclass=dict(build_ext=CMakeBuild),
-        packages = find_packages(
-            where='Python',
-            include=['nymph'],
-        ),
-        package_dir={'': 'Python'}
-    )

From 6f460c868c62bd2bb0615c43ea3e2fda38b08a59 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 Sep 2025 17:35:35 -0700
Subject: [PATCH 473/521] Add a dev Docker stage

---
 Dockerfile | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 5578149..97d12a5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,22 @@ RUN mkdir -p $NYMPH_PREFIX &&\
 #    echo "source ${COMMON_BUILD_PREFIX}/setup.sh" > setup.sh &&\
 
 
+########################
+########################
+FROM base AS dev
+
+RUN apt-get update && \
+    apt-get clean && \
+    apt-get --fix-missing -y install \
+        cmake-curses-gui \
+        gdb \
+        nano && \
+    rm -rf /var/lib/apt/lists/*
+
+########################
+########################
+
+
 ########################
 FROM base AS build
 

From 61619c7b63562ba2511cd4a1428a90ced2a85743 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 Sep 2025 17:36:02 -0700
Subject: [PATCH 474/521] Change _nymph to nymph_bindings

---
 Python/Bindings/CMakeLists.txt | 2 +-
 Python/Bindings/NymphPybind.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index c64a4e2..1a63a0e 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -31,7 +31,7 @@ set( PYBINDING_SOURCEFILES
 set( PYBINDING_PROJECT_LIBRARIES Nymph )
 
 pbuilder_add_pybind11_module( 
-    MODULE_NAME _nymph 
+    MODULE_NAME nymph_bindings
     SOURCE_FILES ${PYBINDING_SOURCEFILES}
     PROJECT_LIBRARIES ${PYBINDING_PROJECT_LIBRARIES} 
 )
diff --git a/Python/Bindings/NymphPybind.cc b/Python/Bindings/NymphPybind.cc
index 03f5ba0..bb07756 100644
--- a/Python/Bindings/NymphPybind.cc
+++ b/Python/Bindings/NymphPybind.cc
@@ -20,7 +20,7 @@
 namespace py = pybind11;
 
 
-PYBIND11_MODULE(_nymph, nymphPackage) 
+PYBIND11_MODULE(nymph_bindings, nymphPackage) 
 {
 
     nymphPackage.doc() = "Nymph package";

From d96a474441c90aa50d7d83138f0bf386e4dd6d4a Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 8 Sep 2025 17:37:13 -0700
Subject: [PATCH 475/521] Move testing files around to use same structure as
 the packages themselves; Add a test file to demonstrate that the nymph
 package works

---
 Testing/Python/Bindings/CMakeLists.txt        |  2 +-
 Testing/Python/Bindings/testdata.py           | 47 +++++++++++++++++++
 .../Python/{ => Bindings}/testprocessor.py    | 10 ++--
 .../{ => Bindings}/testprocessortoolbox.py    |  4 +-
 Testing/Python/{ => Bindings}/testsignal.py   |  6 +--
 Testing/Python/{ => nymph}/testdata.py        |  8 ++--
 6 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 Testing/Python/Bindings/testdata.py
 rename Testing/Python/{ => Bindings}/testprocessor.py (77%)
 rename Testing/Python/{ => Bindings}/testprocessortoolbox.py (90%)
 rename Testing/Python/{ => Bindings}/testsignal.py (75%)
 rename Testing/Python/{ => nymph}/testdata.py (89%)

diff --git a/Testing/Python/Bindings/CMakeLists.txt b/Testing/Python/Bindings/CMakeLists.txt
index 9917ac6..4438713 100644
--- a/Testing/Python/Bindings/CMakeLists.txt
+++ b/Testing/Python/Bindings/CMakeLists.txt
@@ -23,7 +23,7 @@ set( PYBINDING_PROJECT_LIBRARIES
 )
 
 pbuilder_add_pybind11_module( 
-    MODULE_NAME _nymph_testing
+    MODULE_NAME nymph_bindings_testing
     SOURCE_FILES ${PYBINDING_SOURCEFILES}
     PROJECT_LIBRARIES ${PYBINDING_PROJECT_LIBRARIES} 
 )
diff --git a/Testing/Python/Bindings/testdata.py b/Testing/Python/Bindings/testdata.py
new file mode 100644
index 0000000..e6f077c
--- /dev/null
+++ b/Testing/Python/Bindings/testdata.py
@@ -0,0 +1,47 @@
+
+"""
+  testdata.py
+ 
+   Created on: Jun 13, 2022
+       Author: P. T. Surukuchi
+"""
+import unittest
+
+import nymph_bindings
+
+'''Data class with integer variables'''
+class TestData1(nymph_bindings.data._Data):
+    
+    def __init__(self, test_var1=0, test_var2=5):
+        super().__init__()
+        self.test_var1 = test_var1
+        self.test_var2 = test_var2
+
+'''Data class with floating point variables'''
+class TestData2(nymph_bindings.data._Data):
+    
+    def __init__(self, test_var1=0.0, test_var2=10.0):
+        super().__init__()
+        self.test_var1 = test_var1
+        self.test_var2 = test_var2
+
+# The way to access member variables need to be modified if getters/setters are used in the python version
+class TestDataMethods(unittest.TestCase):
+    '''Testing of integer type data'''
+    data1=TestData1()
+    def test_idata_assignment(self):
+        self.assertEqual(self.data1.test_var1,0)
+        self.assertEqual(self.data1.test_var2,5)
+    
+    '''Testing of floating point type data'''
+    data2=TestData2()
+    def test_fdata_assignment(self):
+        self.assertAlmostEqual(self.data2.test_var1,0.0)
+        self.assertAlmostEqual(self.data2.test_var2,10.0)
+
+        #Change value and test
+        self.data2.test_var2=20.0
+        self.assertAlmostEqual(self.data2.test_var2,20.0)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Testing/Python/testprocessor.py b/Testing/Python/Bindings/testprocessor.py
similarity index 77%
rename from Testing/Python/testprocessor.py
rename to Testing/Python/Bindings/testprocessor.py
index 54e7c92..d8019ca 100644
--- a/Testing/Python/testprocessor.py
+++ b/Testing/Python/Bindings/testprocessor.py
@@ -10,17 +10,17 @@
 
 import unittest
 
-import _nymph
+import nymph_bindings
 import scarab
 
-class TestProcessorBroken(_nymph.processor._Processor):
+class TestProcessorBroken(nymph_bindings.processor._Processor):
     """Should not work because it does not override configure"""
     
     def foo():
         print('I am a failed processor implementation')
         
 
-class TestProcessor(_nymph.processor._Processor):
+class TestProcessor(nymph_bindings.processor._Processor):
     
     def configure(self, param_node):
         
@@ -60,8 +60,8 @@ class TestPyProcCreator(unittest.TestCase):
     
     def test_creating(self):
         
-        registrar = _nymph.processor.register_py_processor('testprocessor', 'TestProcessor', 'processor-name')
-        test_proc = _nymph.processor.create_processor('processor-name', 'test-proc')
+        registrar = nymph_bindings.processor.register_py_processor('testprocessor', 'TestProcessor', 'processor-name')
+        test_proc = nymph_bindings.processor.create_processor('processor-name', 'test-proc')
         
         self.assertEqual(test_proc.name, 'test-proc')
 
diff --git a/Testing/Python/testprocessortoolbox.py b/Testing/Python/Bindings/testprocessortoolbox.py
similarity index 90%
rename from Testing/Python/testprocessortoolbox.py
rename to Testing/Python/Bindings/testprocessortoolbox.py
index 643ab14..20d51a4 100644
--- a/Testing/Python/testprocessortoolbox.py
+++ b/Testing/Python/Bindings/testprocessortoolbox.py
@@ -7,11 +7,11 @@
 """
 import unittest
 
-import _nymph, _nymph_testing
+import nymph_bindings, _nymph_testing
 
 
 class TestDataMethods(unittest.TestCase):
-    tb = _nymph.processor.ProcessorToolbox()
+    tb = nymph_bindings.processor.ProcessorToolbox()
 
     procName1 = 'testproc-1'  # not a registered processor
     procName2 = 'testproc-2'  # not a registered processor
diff --git a/Testing/Python/testsignal.py b/Testing/Python/Bindings/testsignal.py
similarity index 75%
rename from Testing/Python/testsignal.py
rename to Testing/Python/Bindings/testsignal.py
index 6f791d8..abc1abf 100644
--- a/Testing/Python/testsignal.py
+++ b/Testing/Python/Bindings/testsignal.py
@@ -8,10 +8,10 @@
 
 __all__ = []
 
-import _nymph
+import nymph_bindings
 import scarab
 
-class TestProcessor(_nymph.processor._Processor):
+class TestProcessor(nymph_bindings.processor._Processor):
     
     def configure(self, param_node):
         
@@ -28,7 +28,7 @@ def main(args):
     
     testprocessor.configure(param_node)
     
-    signal = _nymph.processor._SignalData('test-signal', testprocessor)
+    signal = nymph_bindings.processor._SignalData('test-signal', testprocessor)
     
     print(signal.name)
     print(testprocessor.x)
diff --git a/Testing/Python/testdata.py b/Testing/Python/nymph/testdata.py
similarity index 89%
rename from Testing/Python/testdata.py
rename to Testing/Python/nymph/testdata.py
index 51d75c3..06ef803 100644
--- a/Testing/Python/testdata.py
+++ b/Testing/Python/nymph/testdata.py
@@ -1,16 +1,16 @@
 
 """
-  testdata.py
+  nymph/testdata.py
  
    Created on: Jun 13, 2022
        Author: P. T. Surukuchi
 """
 import unittest
 
-import _nymph
+import nymph
 
 '''Data class with integer variables'''
-class TestData1(_nymph.data._Data):
+class TestData1(nymph.data._Data):
     
     def __init__(self, test_var1=0, test_var2=5):
         super().__init__()
@@ -18,7 +18,7 @@ def __init__(self, test_var1=0, test_var2=5):
         self.test_var2 = test_var2
 
 '''Data class with floating point variables'''
-class TestData2(_nymph.data._Data):
+class TestData2(nymph.data._Data):
     
     def __init__(self, test_var1=0.0, test_var2=10.0):
         super().__init__()

From a166190b64a2f39ce6bc66c945fe01edaffcecce Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:21:45 -0700
Subject: [PATCH 476/521] Imported example derived repo from tettigoniidae and
 adapted to use Nymph via FetchContent instead of as a submodule

---
 Examples/CppRepo/BUILD_ME.sh                  |  8 ++
 Examples/CppRepo/CMakeLists.txt               | 89 +++++++++++++++++++
 Examples/CppRepo/Library/CMakeLists.txt       |  5 ++
 Examples/CppRepo/Library/Data/CMakeLists.txt  | 32 +++++++
 Examples/CppRepo/Library/Data/DoubleData.cc   | 14 +++
 Examples/CppRepo/Library/Data/DoubleData.hh   | 31 +++++++
 Examples/CppRepo/Library/Data/IntData.cc      | 14 +++
 Examples/CppRepo/Library/Data/IntData.hh      | 35 ++++++++
 Examples/CppRepo/Library/Processors/Adder.cc  | 35 ++++++++
 Examples/CppRepo/Library/Processors/Adder.hh  | 64 +++++++++++++
 .../CppRepo/Library/Processors/CMakeLists.txt | 35 ++++++++
 11 files changed, 362 insertions(+)
 create mode 100644 Examples/CppRepo/BUILD_ME.sh
 create mode 100644 Examples/CppRepo/CMakeLists.txt
 create mode 100644 Examples/CppRepo/Library/CMakeLists.txt
 create mode 100644 Examples/CppRepo/Library/Data/CMakeLists.txt
 create mode 100644 Examples/CppRepo/Library/Data/DoubleData.cc
 create mode 100644 Examples/CppRepo/Library/Data/DoubleData.hh
 create mode 100644 Examples/CppRepo/Library/Data/IntData.cc
 create mode 100644 Examples/CppRepo/Library/Data/IntData.hh
 create mode 100644 Examples/CppRepo/Library/Processors/Adder.cc
 create mode 100644 Examples/CppRepo/Library/Processors/Adder.hh
 create mode 100644 Examples/CppRepo/Library/Processors/CMakeLists.txt

diff --git a/Examples/CppRepo/BUILD_ME.sh b/Examples/CppRepo/BUILD_ME.sh
new file mode 100644
index 0000000..1731a3a
--- /dev/null
+++ b/Examples/CppRepo/BUILD_ME.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+mkdir build
+cd build
+
+cmake ..
+
+make -j${NARG} install
diff --git a/Examples/CppRepo/CMakeLists.txt b/Examples/CppRepo/CMakeLists.txt
new file mode 100644
index 0000000..201d390
--- /dev/null
+++ b/Examples/CppRepo/CMakeLists.txt
@@ -0,0 +1,89 @@
+# Minimum cmake verison 3.12 required for Scarab
+cmake_minimum_required (VERSION 3.12)
+
+# Define the project
+cmake_policy( SET CMP0048 NEW ) # version in project()
+project( CppRepo VERSION 0.0.0 )
+
+include( FetchContent )
+# Define Nymph as an ExternalProject
+# If Nymph is a submodule, then set the SOURCE_DIR option to point to it; also in that case, remove any download specifications
+set( Nymph_DIR nymph_src )
+FetchContent_Populate( nymph
+    SOURCE_DIR ${Nymph_DIR}
+    GIT_REPOSITORY https://github.com/project8/nymph
+    GIT_TAG nymph2_2/develop
+    GIT_SHALLOW TRUE
+)
+message( "dir: ${Nymph_DIR}")
+
+# If nymph were a submodule in ${PROJECT_SOURCE_DIR}/nymph, that would be used in place of ${Nymph_DIR}
+list( APPEND CMAKE_MODULE_PATH 
+    ${CMAKE_BINARY_DIR}/${Nymph_DIR}/Scarab/cmake
+    ${CMAKE_BINARY_DIR}/${Nymph_DIR}/cmake 
+)
+include( PackageBuilder )
+include( Nymph )
+
+#########
+# flags #
+#########
+
+set( CMAKE_CXX_STANDARD 17 )
+
+
+################
+# dependencies #
+################
+
+set( PUBLIC_EXT_LIBS )
+set( PRIVATE_EXT_LIBS )
+
+
+
+
+#####################
+# prepare for build #
+#####################
+
+pbuilder_prepare_project()
+
+
+##############
+# submodules #
+##############
+
+# Nymph
+pbuilder_add_submodule( Nymph ${CMAKE_BINARY_DIR}/${Nymph_DIR} )
+
+pbuilder_use_sm_library( Nymph Nymph )
+
+#####################
+# build the project #
+#####################
+
+# add include directories
+include_directories( BEFORE
+    Library/Processors
+    Library/Data
+)
+
+# build this project
+add_subdirectory( Library )
+
+if( tettigoniidae_ENABLE_EXECUTABLES )
+    #add_subdirectory( Executables )
+endif()
+
+if( tettigoniidae_ENABLE_TESTING )
+    #add_subdirectory( Testing )
+endif()
+
+
+##################
+# package config #
+##################
+
+#configure_file( ${PROJECT_SOURCE_DIR}/tettigoniidaeConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/tettigoniidaeConfig.cmake @ONLY )
+
+#pbuilder_do_package_config()
\ No newline at end of file
diff --git a/Examples/CppRepo/Library/CMakeLists.txt b/Examples/CppRepo/Library/CMakeLists.txt
new file mode 100644
index 0000000..ea7dff2
--- /dev/null
+++ b/Examples/CppRepo/Library/CMakeLists.txt
@@ -0,0 +1,5 @@
+# CMakeLists for nymph/Examples/CppRepo/Library
+# Author: N.S. Oblath
+
+add_subdirectory( Data )
+add_subdirectory( Processors )
diff --git a/Examples/CppRepo/Library/Data/CMakeLists.txt b/Examples/CppRepo/Library/Data/CMakeLists.txt
new file mode 100644
index 0000000..c4f007f
--- /dev/null
+++ b/Examples/CppRepo/Library/Data/CMakeLists.txt
@@ -0,0 +1,32 @@
+# CMakeLists for nymph/Examples/CppRepo/Library/Data
+# Author: N.S. Oblath
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set( CppRepoData_HEADERFILES
+    DoubleData.hh
+    IntData.hh
+)
+
+set( CppRepoData_SOURCEFILES
+    DoubleData.cc
+    IntData.cc
+)
+
+
+##################################################
+
+pbuilder_library( 
+    TARGET CppRepoData 
+    SOURCES ${CppRepoData_SOURCEFILES}
+    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS CppRepoData
+)
+
+pbuilder_install_headers( ${CppRepoData_HEADERFILES} )
diff --git a/Examples/CppRepo/Library/Data/DoubleData.cc b/Examples/CppRepo/Library/Data/DoubleData.cc
new file mode 100644
index 0000000..493eb78
--- /dev/null
+++ b/Examples/CppRepo/Library/Data/DoubleData.cc
@@ -0,0 +1,14 @@
+
+#include "DoubleData.hh"
+
+namespace tettigoniidae
+{
+    DoubleData::DoubleData() :
+            Nymph::Data(),
+            fDValue1( 0. ),
+            fDValue2( 10. )
+    {}
+
+    DoubleData::~DoubleData()
+    {}
+}
diff --git a/Examples/CppRepo/Library/Data/DoubleData.hh b/Examples/CppRepo/Library/Data/DoubleData.hh
new file mode 100644
index 0000000..ee88e02
--- /dev/null
+++ b/Examples/CppRepo/Library/Data/DoubleData.hh
@@ -0,0 +1,31 @@
+/*
+ * TestData2.hh
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef TTGD_TESTING_TESTDATA2
+#define TTGD_TESTING_TESTDATA2
+
+#include "Data.hh"
+#include "MemberVariable.hh"
+
+namespace tettigoniidae
+{
+
+    class DoubleData : public Nymph::Data
+    {
+        public:
+            DoubleData();
+
+            virtual ~DoubleData();
+
+            MEMVAR( double, DValue1 );
+            MEMVAR( double, DValue2 );
+    };
+
+
+} /* namespace tettigoniidae */
+
+#endif /* TTGD_TESTING_TESTDATA2 */
diff --git a/Examples/CppRepo/Library/Data/IntData.cc b/Examples/CppRepo/Library/Data/IntData.cc
new file mode 100644
index 0000000..8fef364
--- /dev/null
+++ b/Examples/CppRepo/Library/Data/IntData.cc
@@ -0,0 +1,14 @@
+
+#include "IntData.hh"
+
+namespace tettigoniidae
+{
+    IntData::IntData() :
+            Nymph::Data(),
+            fIValue1( 0 ),
+            fIValue2( 5 )
+    {}
+
+    IntData::~IntData()
+    {}
+}
diff --git a/Examples/CppRepo/Library/Data/IntData.hh b/Examples/CppRepo/Library/Data/IntData.hh
new file mode 100644
index 0000000..3cbe8ee
--- /dev/null
+++ b/Examples/CppRepo/Library/Data/IntData.hh
@@ -0,0 +1,35 @@
+/*
+ * IntData.hh
+ *
+ *  Created on: Jan 6, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef TTGD_DATA_INTDATA
+#define TTGD_DATA_INTDATA
+
+#include "Data.hh"
+#include "MemberVariable.hh"
+
+namespace tettigoniidae
+{
+
+    /*!
+     @class IntData
+     @author N. S. Oblath
+     @brief Two integer values
+    */
+    class IntData : public Nymph::Data
+    {
+        public:
+            IntData();
+
+            virtual ~IntData();
+
+            MEMVAR( int, IValue1 );
+            MEMVAR( int, IValue2 );
+    };
+
+} /* namespace tettigoniidae */
+
+#endif /* TTGD_DATA_INTDATA */
diff --git a/Examples/CppRepo/Library/Processors/Adder.cc b/Examples/CppRepo/Library/Processors/Adder.cc
new file mode 100644
index 0000000..9fed0ca
--- /dev/null
+++ b/Examples/CppRepo/Library/Processors/Adder.cc
@@ -0,0 +1,35 @@
+
+#include "Adder.hh"
+
+#include "IntData.hh"
+
+
+REGISTER_PROCESSOR( tettigoniidae, Adder, "adder" )
+
+namespace tettigoniidae
+{
+    Adder::Adder( const std::string& name ) :
+            Processor( name ),
+            fIntValue( 0 ),
+            fIntSignal( "int", this ),
+            fAddIntSlot( "add-int", this, &Adder::Add, &fIntSignal )
+    {}
+
+    Adder::~Adder()
+    {}
+
+    void Adder::Configure( const scarab::param_node& node )
+    {
+        fIntValue = node.get_value( "int-value", fIntValue );
+
+        return;
+    }
+
+    void Adder::Add( IntData& data )
+    {
+        data.SetIValue1( data.GetIValue1() + fIntValue );
+        data.SetIValue2( data.GetIValue2() + fIntValue );
+        return;
+    }
+
+} /* namespace tettigoniidae */
diff --git a/Examples/CppRepo/Library/Processors/Adder.hh b/Examples/CppRepo/Library/Processors/Adder.hh
new file mode 100644
index 0000000..93ab1d8
--- /dev/null
+++ b/Examples/CppRepo/Library/Processors/Adder.hh
@@ -0,0 +1,64 @@
+/*!
+ * @file Adder.hh
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#ifndef TTGD_PROCESSORS_ADDER
+#define TTGD_PROCESSORS_ADDER
+
+#include "Processor.hh"
+#include "SignalData.hh"
+#include "SlotData.hh"
+
+namespace tettigoniidae
+{
+    class IntData;
+
+    /*!
+     @class Adder
+     @author N. S. Oblath
+
+     @brief Adds a value to data
+
+     @procdetails
+     Does addition in place
+
+     @proctype adder
+
+     @config
+     @configparam{int-value,int} Value to add to IntData
+
+     @slots
+     @slot{add-int,void (DataHandle)} Adds a value to IntData; Requires IntData; Adds no data; Emits signal "int"
+
+     @signals
+     @signal{int,void (DataHandle)} Emitted after adding to IntData
+    */
+    class Adder : public Nymph::Processor
+    {
+        public:
+            Adder( const std::string& name = "adder" );
+
+            virtual ~Adder();
+
+            /// Processor configuration
+            void Configure( const scarab::param_node& node );
+
+            MEMVAR( int, IntValue );
+
+        public:
+            /// Add an integer to integer data
+            void Add( IntData& data );
+
+        public:
+            Nymph::SignalData fIntSignal;
+
+            Nymph::SlotData< Nymph::In<IntData>, Nymph::Out<> > fAddIntSlot;
+
+    };
+
+} /* namespace tettigoniidae */
+
+#endif /* TTGD_PROCESSORS_ADDER */
diff --git a/Examples/CppRepo/Library/Processors/CMakeLists.txt b/Examples/CppRepo/Library/Processors/CMakeLists.txt
new file mode 100644
index 0000000..1bd998c
--- /dev/null
+++ b/Examples/CppRepo/Library/Processors/CMakeLists.txt
@@ -0,0 +1,35 @@
+# CMakeLists for nymph/Examples/CppRepo/Library/Processors
+# Author: N.S. Oblath
+
+include_directories( BEFORE 
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set( CppRepo_LIBS 
+    CppRepoData
+)
+
+set( CppRepoProcs_HEADERFILES
+    Adder.hh
+)
+
+set( CppRepoProcs_SOURCEFILES
+    Adder.cc
+)
+
+
+##################################################
+
+pbuilder_library( 
+    TARGET CppRepoProcs 
+    SOURCES ${CppRepoProcs_SOURCEFILES}
+    PUBLIC_EXTERNAL_LIBRARIES ${PUBLIC_EXT_LIBS}
+    PROJECT_LIBRARIES ${CppRepo_LIBS}
+)
+
+pbuilder_component_install_and_export( 
+    COMPONENT Library
+    LIBTARGETS CppRepoProcs
+)
+
+pbuilder_install_headers( ${CppRepoProcs_HEADERFILES} )

From f89f06307c38300242a9590ada4269baaacea196 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:32:15 -0700
Subject: [PATCH 477/521] Flesh out cmake command in CppRepo and add CppRepo
 build to build.yaml

---
 .github/workflows/build.yaml |  8 +++++---
 Examples/CppRepo/BUILD_ME.sh | 10 ++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 Examples/CppRepo/BUILD_ME.sh

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4933aa6..10fda12 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -98,8 +98,6 @@ jobs:
           cmake -DPYBIND11_TEST=FALSE ..
           make -j${{ env.NARG }} install
 
-
-
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
         run: |
@@ -118,7 +116,6 @@ jobs:
           cd ../..
           pip install "pybind11[global]"
           
-
       - name: Configure CMake
         run: |
           mkdir -p build
@@ -141,6 +138,11 @@ jobs:
           cd build
           Testing/RunTests
 
+      - name: Build CppRepo Example
+        run: |
+          cd Examples/CppRepo
+          ./BUILD_ME.sh
+
   build_python:
     name: Build and Test Python
 
diff --git a/Examples/CppRepo/BUILD_ME.sh b/Examples/CppRepo/BUILD_ME.sh
old mode 100644
new mode 100755
index 1731a3a..0c2da90
--- a/Examples/CppRepo/BUILD_ME.sh
+++ b/Examples/CppRepo/BUILD_ME.sh
@@ -3,6 +3,12 @@
 mkdir build
 cd build
 
-cmake ..
+cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE:=Debug} \
+    -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE:=FALSE} \
+    -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES:=TRUE} \
+    -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON:=FALSE} \
+    -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING:=FALSE} \
+    -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED:=FALSE} \
+    ..
 
-make -j${NARG} install
+make -j${NARG:=} install

From d4bcb6acebf69e9028f620be3847981786e8b356 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:36:37 -0700
Subject: [PATCH 478/521] Remove system from boost components (not required and
 doesn't work with newest mac runners)

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91001eb..278befa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ set( PRIVATE_EXT_LIBS )
 #######
 
 # Boost (1.46 required for filesystem version 3)
-list( APPEND BOOST_COMPONENTS chrono date_time filesystem system thread )
+list( APPEND BOOST_COMPONENTS chrono date_time filesystem thread )
 find_package( Boost 1.46.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
 list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::thread Boost::filesystem )
 # make sure dynamic linking is assumed for all boost libraries

From 132d7c7503769c4349faa83417318ad1999496d6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:42:38 -0700
Subject: [PATCH 479/521] Updated Scarab to v3.13.1

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index e5c49f5..b899601 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit e5c49f58bd38660ecfb13f607e1d0b021d24fc97
+Subproject commit b899601d9c5f6a81734b6bd78f3056a1bf52b708

From eddd2ecf4a7b432a0497cb5543d86d348836d40b Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:43:05 -0700
Subject: [PATCH 480/521] Turn off Nymph testing while building CppRepo

---
 .github/workflows/build.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 10fda12..f037702 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -139,6 +139,8 @@ jobs:
           Testing/RunTests
 
       - name: Build CppRepo Example
+        env:
+          - Nymph_ENABLE_TESTING: OFF
         run: |
           cd Examples/CppRepo
           ./BUILD_ME.sh

From 0a0c1c0d6d20341fe849ffd6e3d1ac8d14d60387 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:52:17 -0700
Subject: [PATCH 481/521] Test extraction of version

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 278befa..ba98618 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,8 @@ file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION nymph_version )
 cmake_policy( SET CMP0048 NEW ) # version in project()
 project( Nymph VERSION ${nymph_version} )
 
+message( STATUS "%%%%%%%% project version: ${Nymph_VERSION}" )
+
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )
 include( PackageBuilder )
 

From 3e1f705233f2b4122e0fa66338572337fb0d4049 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 15:53:22 -0700
Subject: [PATCH 482/521] Set environment variables correctly

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f037702..a2f1929 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -140,7 +140,7 @@ jobs:
 
       - name: Build CppRepo Example
         env:
-          - Nymph_ENABLE_TESTING: OFF
+          Nymph_ENABLE_TESTING: OFF
         run: |
           cd Examples/CppRepo
           ./BUILD_ME.sh

From 2448b1b60e2145062e817f43183a2ae9412b8cfb Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 16:05:01 -0700
Subject: [PATCH 483/521] Fix missing VERSION file

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 97d12a5..54a0424 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -93,6 +93,7 @@ COPY Testing /tmp_source/Testing
 COPY CMakeLists.txt /tmp_source/CMakeLists.txt
 COPY NymphConfig.cmake.in /tmp_source/NymphConfig.cmake.in
 COPY pyproject.toml /tmp_source/pyproject.toml
+COPY VERSION /tmp_source/VERSION
 #COPY .git /tmp_source/.git
 
 # repeat the cmake command to get the change of install prefix to set correctly (a package_builder known issue)

From 1b4b2a29fb3bc7e449fc1dbc87a340d753f18ed8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 16:05:13 -0700
Subject: [PATCH 484/521] Debugging boost components

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba98618..2fef5c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,6 +72,7 @@ set( PRIVATE_EXT_LIBS )
 
 # Boost (1.46 required for filesystem version 3)
 list( APPEND BOOST_COMPONENTS chrono date_time filesystem thread )
+message( "^^^^^^^ ${BOOST_COMPONENTS}" )
 find_package( Boost 1.46.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
 list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::thread Boost::filesystem )
 # make sure dynamic linking is assumed for all boost libraries

From ad1031a54da0939c3afe42fc2b6f3b5af8c705f8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 16:24:40 -0700
Subject: [PATCH 485/521] Removing debug messages

---
 CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fef5c0..278befa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,6 @@ file( STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION nymph_version )
 cmake_policy( SET CMP0048 NEW ) # version in project()
 project( Nymph VERSION ${nymph_version} )
 
-message( STATUS "%%%%%%%% project version: ${Nymph_VERSION}" )
-
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/Scarab/cmake )
 include( PackageBuilder )
 
@@ -72,7 +70,6 @@ set( PRIVATE_EXT_LIBS )
 
 # Boost (1.46 required for filesystem version 3)
 list( APPEND BOOST_COMPONENTS chrono date_time filesystem thread )
-message( "^^^^^^^ ${BOOST_COMPONENTS}" )
 find_package( Boost 1.46.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
 list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::thread Boost::filesystem )
 # make sure dynamic linking is assumed for all boost libraries

From 934fde76ad816645dff137d0ad23b64ae6905e84 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 16:25:31 -0700
Subject: [PATCH 486/521] Implement an option for the nymph tag in cpprepo

---
 .github/workflows/build.yaml    | 1 +
 Examples/CppRepo/BUILD_ME.sh    | 1 +
 Examples/CppRepo/CMakeLists.txt | 6 ++++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a2f1929..4d0ca3a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -141,6 +141,7 @@ jobs:
       - name: Build CppRepo Example
         env:
           Nymph_ENABLE_TESTING: OFF
+          Nymph_TAG: nymph2_2/cppexample
         run: |
           cd Examples/CppRepo
           ./BUILD_ME.sh
diff --git a/Examples/CppRepo/BUILD_ME.sh b/Examples/CppRepo/BUILD_ME.sh
index 0c2da90..f0db664 100755
--- a/Examples/CppRepo/BUILD_ME.sh
+++ b/Examples/CppRepo/BUILD_ME.sh
@@ -9,6 +9,7 @@ cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE:=Debug} \
     -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON:=FALSE} \
     -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING:=FALSE} \
     -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED:=FALSE} \
+    -DNymph_TAG=${Nymph_TAG:=nymph2_2/develop} \
     ..
 
 make -j${NARG:=} install
diff --git a/Examples/CppRepo/CMakeLists.txt b/Examples/CppRepo/CMakeLists.txt
index 201d390..9d10b8d 100644
--- a/Examples/CppRepo/CMakeLists.txt
+++ b/Examples/CppRepo/CMakeLists.txt
@@ -6,8 +6,11 @@ cmake_policy( SET CMP0048 NEW ) # version in project()
 project( CppRepo VERSION 0.0.0 )
 
 include( FetchContent )
-# Define Nymph as an ExternalProject
+# Get Nymph with FetchContent
 # If Nymph is a submodule, then set the SOURCE_DIR option to point to it; also in that case, remove any download specifications
+message( STATUS "Getting Nymph" )
+set( Nymph_TAG nymph2_2/develop )
+message( "$$$$$$ tag: ${Nymph_TAG}" )
 set( Nymph_DIR nymph_src )
 FetchContent_Populate( nymph
     SOURCE_DIR ${Nymph_DIR}
@@ -15,7 +18,6 @@ FetchContent_Populate( nymph
     GIT_TAG nymph2_2/develop
     GIT_SHALLOW TRUE
 )
-message( "dir: ${Nymph_DIR}")
 
 # If nymph were a submodule in ${PROJECT_SOURCE_DIR}/nymph, that would be used in place of ${Nymph_DIR}
 list( APPEND CMAKE_MODULE_PATH 

From 824bee2f6f186077da6593b6d77b5ff36d82890d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 16:30:36 -0700
Subject: [PATCH 487/521] Debugging Nymph_TAG option

---
 Examples/CppRepo/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Examples/CppRepo/CMakeLists.txt b/Examples/CppRepo/CMakeLists.txt
index 9d10b8d..9e13dd5 100644
--- a/Examples/CppRepo/CMakeLists.txt
+++ b/Examples/CppRepo/CMakeLists.txt
@@ -9,13 +9,13 @@ include( FetchContent )
 # Get Nymph with FetchContent
 # If Nymph is a submodule, then set the SOURCE_DIR option to point to it; also in that case, remove any download specifications
 message( STATUS "Getting Nymph" )
-set( Nymph_TAG nymph2_2/develop )
+option( Nymph_TAG "Version of Nymph to use" nymph2_2/develop )
 message( "$$$$$$ tag: ${Nymph_TAG}" )
 set( Nymph_DIR nymph_src )
 FetchContent_Populate( nymph
     SOURCE_DIR ${Nymph_DIR}
     GIT_REPOSITORY https://github.com/project8/nymph
-    GIT_TAG nymph2_2/develop
+    GIT_TAG ${Nymph_TAG}
     GIT_SHALLOW TRUE
 )
 

From 2564e8fe697706c71e0685edb4e77caf3c801ae1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 16:58:48 -0700
Subject: [PATCH 488/521] Adding the cpp build to the python build

---
 .github/workflows/build.yaml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4d0ca3a..763b5f0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -195,8 +195,6 @@ jobs:
           cmake -DPYBIND11_TEST=FALSE ..
           make -j${{ env.NARG }} install
 
-          python -m pip install build
-
       - name: Linux Dependencies
         if: startsWith(matrix.os, 'ubuntu')  # Linux only
         run: |
@@ -212,16 +210,24 @@ jobs:
           cd build
           sudo cmake -DPYBIND11_TEST=FALSE ..
           sudo make -j${{ env.NARG }} install
-          cd ../..
 
-          
-          pip install "pybind11[global]" 
-          
-          python -m pip install build
-          
+      - name: Build Nymph/Cpp
+        run: |
+          mkdir -p build
+          cd build
+          cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE} \
+            -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE} \
+            -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES} \
+            -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} \
+            -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} \
+            -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} \
+            ..
+          make -j${{ env.NARG }} install
+
       - name: Install nymph
         run: |
-          pip -v install .
+          source build/bin/add_lib_python_path.sh
+          pip -v -e install .
           
       - name: Run Tests
         continue-on-error: true

From de69c7130c6a7d49517fc0eb8ded3df512dc00ed Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 17:02:28 -0700
Subject: [PATCH 489/521] Fixing pip install flag

---
 .github/workflows/build.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 763b5f0..7f3648d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -227,7 +227,8 @@ jobs:
       - name: Install nymph
         run: |
           source build/bin/add_lib_python_path.sh
-          pip -v -e install .
+          env
+          pip -v install -e .
           
       - name: Run Tests
         continue-on-error: true

From c8385ace3c7e37639b688fcc3378049704e64ea3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 17:07:15 -0700
Subject: [PATCH 490/521] Add tmate for debugging

---
 .github/workflows/build.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7f3648d..55eb3c4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -231,8 +231,12 @@ jobs:
           pip -v install -e .
           
       - name: Run Tests
-        continue-on-error: true
         run: |
           cd Testing/Python
           python -m unittest discover -v
 
+# For debugging
+      - name: Setup tmate session
+        if: ${{ ! success() }}
+        uses: mxschmitt/action-tmate@v3
+

From bfacd9794664fb06f9efaaad7f942bc3143d39a8 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 17:18:47 -0700
Subject: [PATCH 491/521] Install nymph bindings in standard python location

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 55eb3c4..4a1a9f8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -221,12 +221,12 @@ jobs:
             -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} \
             -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} \
             -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} \
+            -DPBUILDER_PY_INSTALL_IN_SITELIB=TRUE
             ..
           make -j${{ env.NARG }} install
 
       - name: Install nymph
         run: |
-          source build/bin/add_lib_python_path.sh
           env
           pip -v install -e .
           

From 7e5fe77f7c810b60499e5fa46ea758608aac9a82 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 17:22:45 -0700
Subject: [PATCH 492/521] Fixing missing backslash

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4a1a9f8..abf4d3c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -221,7 +221,7 @@ jobs:
             -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON} \
             -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING} \
             -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED} \
-            -DPBUILDER_PY_INSTALL_IN_SITELIB=TRUE
+            -DPBUILDER_PY_INSTALL_IN_SITELIB=TRUE \
             ..
           make -j${{ env.NARG }} install
 

From 7d80f6e6a56c813ab66a58dfa00ac39840d3b81f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 9 Sep 2025 17:35:21 -0700
Subject: [PATCH 493/521] Getting the python testing running

---
 .github/workflows/build.yaml                    | 6 +++++-
 Testing/Python/Bindings/testprocessortoolbox.py | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index abf4d3c..4d2b319 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -232,9 +232,13 @@ jobs:
           
       - name: Run Tests
         run: |
-          cd Testing/Python
+          cd Testing/Python/Bindings
           python -m unittest discover -v
 
+# eventually include these tests
+#          cd ../nymph
+#          python -m unittest discover -v
+
 # For debugging
       - name: Setup tmate session
         if: ${{ ! success() }}
diff --git a/Testing/Python/Bindings/testprocessortoolbox.py b/Testing/Python/Bindings/testprocessortoolbox.py
index 20d51a4..c30baf9 100644
--- a/Testing/Python/Bindings/testprocessortoolbox.py
+++ b/Testing/Python/Bindings/testprocessortoolbox.py
@@ -7,7 +7,7 @@
 """
 import unittest
 
-import nymph_bindings, _nymph_testing
+import nymph_bindings #, _nymph_testing
 
 
 class TestDataMethods(unittest.TestCase):

From d2e26fa8bbad27f62e1670446b1380b9461503d1 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 15 Sep 2025 15:31:01 -0700
Subject: [PATCH 494/521] Added Examples/PyRepo with a simple hello-world
 function

---
 Examples/PyRepo/BUILD_ME.sh           | 35 +++++++++++++++++++++++++++
 Examples/PyRepo/pyproject.toml        | 18 ++++++++++++++
 Examples/PyRepo/pyrepo/__init__.py    |  3 +++
 Examples/PyRepo/pyrepo/hello_world.py |  6 +++++
 4 files changed, 62 insertions(+)
 create mode 100755 Examples/PyRepo/BUILD_ME.sh
 create mode 100644 Examples/PyRepo/pyproject.toml
 create mode 100644 Examples/PyRepo/pyrepo/__init__.py
 create mode 100644 Examples/PyRepo/pyrepo/hello_world.py

diff --git a/Examples/PyRepo/BUILD_ME.sh b/Examples/PyRepo/BUILD_ME.sh
new file mode 100755
index 0000000..dc0fcf2
--- /dev/null
+++ b/Examples/PyRepo/BUILD_ME.sh
@@ -0,0 +1,35 @@
+#! /bin/bash
+
+# This script builds the PyRepo example of a Nymph-based Python-only package.  
+# We first have to build the C++ Nymph library, and then we can install the Python Nymph package.
+# Finally, we install the PyRepo package.
+
+# This assumes that if the _nymph directory exists, then _nymph has been built and installed
+if [[ ! -d _nymph ]]; then
+    git clone --recurse-submodules -b nymph2_2/develop https://github.com/project8/nymph _nymph
+    cd _nymph
+
+    mkdir build
+    cd build
+
+    cmake -DCMAKE_BUILD_TYPE=${Nymph_BUILD_TYPE:=Debug} \
+        -DNymph_BUILD_NYMPH_EXE=${Nymph_BUILD_NYMPH_EXE:=TRUE} \
+        -DNymph_ENABLE_EXECUTABLES=${Nymph_ENABLE_EXECUTABLES:=TRUE} \
+        -DNymph_ENABLE_PYTHON=${Nymph_ENABLE_PYTHON:=TRUE} \
+        -DNymph_ENABLE_TESTING=${Nymph_ENABLE_TESTING:=FALSE} \
+        -DNymph_SINGLETHREADED=${Nymph_SINGLETHREADED:=FALSE} \
+        ..
+
+    make -j${NARG:=} install
+    source bin/add_lib_python_path.sh
+
+    cd ..
+
+    pip install .
+
+    cd ..
+else
+    source _nymph/build/bin/add_lib_python_path.sh
+fi
+
+pip install -e .
diff --git a/Examples/PyRepo/pyproject.toml b/Examples/PyRepo/pyproject.toml
new file mode 100644
index 0000000..1724f76
--- /dev/null
+++ b/Examples/PyRepo/pyproject.toml
@@ -0,0 +1,18 @@
+[build-system]
+requires = [
+    "setuptools>=42", 
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "PyRepo"
+#dependencies = [
+#    "nymph_bindings @ file:///src/build-ny22py-debug-docker/lib",
+#]
+version = "1.0.0"
+
+[project.scripts]
+hello-world = "pyrepo:hello_world"
+
+#[tool.setuptools.packages.find]
+#where = ["Python"]
diff --git a/Examples/PyRepo/pyrepo/__init__.py b/Examples/PyRepo/pyrepo/__init__.py
new file mode 100644
index 0000000..ddd37b4
--- /dev/null
+++ b/Examples/PyRepo/pyrepo/__init__.py
@@ -0,0 +1,3 @@
+__all__ = []
+
+from .hello_world import hello_world
diff --git a/Examples/PyRepo/pyrepo/hello_world.py b/Examples/PyRepo/pyrepo/hello_world.py
new file mode 100644
index 0000000..925976c
--- /dev/null
+++ b/Examples/PyRepo/pyrepo/hello_world.py
@@ -0,0 +1,6 @@
+
+def hello_world():
+    print("Hello, world")
+
+if __name__ == "__main__":
+    hello_world()

From 6944b50fc5d92b456c20778fc628f2e5b6b55634 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 15 Sep 2025 15:36:46 -0700
Subject: [PATCH 495/521] Minor updates to example build scripts

---
 .github/workflows/build.yaml | 13 ++++++++++++-
 Examples/CppRepo/BUILD_ME.sh |  5 +++++
 Examples/PyRepo/BUILD_ME.sh  |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4d2b319..008b742 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -225,7 +225,7 @@ jobs:
             ..
           make -j${{ env.NARG }} install
 
-      - name: Install nymph
+      - name: Install Nymph/Python
         run: |
           env
           pip -v install -e .
@@ -239,6 +239,17 @@ jobs:
 #          cd ../nymph
 #          python -m unittest discover -v
 
+      - name: Build PyRepo Example
+        env:
+          Nymph_ENABLE_TESTING: OFF
+          Nymph_ENABLE_PYTHON: ON
+          Nymph_TAG: nymph2_2/cppexample
+        run: |
+          cd Examples/PyRepo
+          ./BUILD_ME.sh
+          hello-world
+
+
 # For debugging
       - name: Setup tmate session
         if: ${{ ! success() }}
diff --git a/Examples/CppRepo/BUILD_ME.sh b/Examples/CppRepo/BUILD_ME.sh
index f0db664..eae3109 100755
--- a/Examples/CppRepo/BUILD_ME.sh
+++ b/Examples/CppRepo/BUILD_ME.sh
@@ -1,5 +1,10 @@
 #! /bin/bash
 
+# This script builds the CppRepo example of a Nymph-based C++-only package.
+# The CMake-based build downloads Nymph using CMake's FetchContent module, 
+# rather than including it as a submodule.  Nymph is built using 
+# the Scarab/PackageBuilder framework included with Nymph.
+
 mkdir build
 cd build
 
diff --git a/Examples/PyRepo/BUILD_ME.sh b/Examples/PyRepo/BUILD_ME.sh
index dc0fcf2..6682c99 100755
--- a/Examples/PyRepo/BUILD_ME.sh
+++ b/Examples/PyRepo/BUILD_ME.sh
@@ -6,7 +6,7 @@
 
 # This assumes that if the _nymph directory exists, then _nymph has been built and installed
 if [[ ! -d _nymph ]]; then
-    git clone --recurse-submodules -b nymph2_2/develop https://github.com/project8/nymph _nymph
+    git clone --recurse-submodules -b ${Nymph_TAG:=nymph2_2/develop} https://github.com/project8/nymph _nymph
     cd _nymph
 
     mkdir build

From ec66a5f1d0622c671fd315c3a8febec98b747357 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 15 Sep 2025 15:37:06 -0700
Subject: [PATCH 496/521] Add PyRepo egg-info to .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index df5fd5c..b0dd6e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,5 @@ build*/
 # Python Package
 dist*/
 Python/*.egg-info
+Examples/PyRepo/*.egg-info
 __pycache__

From 07e069462de1a247a5c8a4b8a296f8d487235f62 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 15 Sep 2025 16:22:31 -0700
Subject: [PATCH 497/521] Incomplete work on a CL processor check

---
 Cpp/Executables/Main/Nymph.cc          |  6 ++++++
 Cpp/Library/Implementation/RunNymph.cc | 11 +++++++++++
 Cpp/Library/Implementation/RunNymph.hh |  5 ++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Cpp/Executables/Main/Nymph.cc b/Cpp/Executables/Main/Nymph.cc
index ac2b460..8c48b7f 100644
--- a/Cpp/Executables/Main/Nymph.cc
+++ b/Cpp/Executables/Main/Nymph.cc
@@ -66,10 +66,12 @@ int main( int argc, char** argv )
     // Create the application
     scarab::main_app the_main;
 
+    the_main.require_subcommand(0, 1);
     the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
 
     // add the typical CL options
     Nymph::AddRunNymphOptions( the_main );
+    Nymph::AddProcessorCheckOptions( the_main );
 
     //Runs RunNymph() and sets  the_return based on its return value
     int the_return = -1;
@@ -79,6 +81,10 @@ int main( int argc, char** argv )
 
     the_main.callback( t_callback );
 
+    // Checks for the existence of a processor type using Nymph::ProcessorCheck()
+    CLI::App* t_proc_check = the_main.add_config_subcommand( "proc-check", "Check if a processor type is known" );
+    t_proc_check->callback( [&](){ Nymph::ProcessorCheck(the_main.primary_config()); } );
+
     // Parse CL options and run the application
     CLI11_PARSE( the_main, argc, argv );
 
diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 3521d24..6f9e356 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -69,4 +69,15 @@ namespace Nymph
         // options
         an_app.add_config_flag< bool >( "--dry-run", "dry-run", "Load the config, setup processors, but do not execute the run" );
     }
+
+    int ProcessorCheck( scarab::param_node& config )
+    {
+
+    }
+
+    void AddProcessorCheckOptions( scarab::config_decorator* a_subcommand )
+    {
+        // options
+        a_subcommand->add_config_option< std::string >( "proc-type", "proc-type", "Processor type to check for" );
+    }
 }
diff --git a/Cpp/Library/Implementation/RunNymph.hh b/Cpp/Library/Implementation/RunNymph.hh
index aba61f4..9a6ad01 100644
--- a/Cpp/Library/Implementation/RunNymph.hh
+++ b/Cpp/Library/Implementation/RunNymph.hh
@@ -10,6 +10,7 @@
 
 namespace scarab
 {
+    class config_decorator;
     class main_app;
     class param_node;
 }
@@ -17,8 +18,10 @@ namespace scarab
 namespace Nymph
 {
     int RunNymph( scarab::param_node& config );
-
     void AddRunNymphOptions( scarab::main_app& an_app );
+
+    int ProcessorCheck( scarab::param_node& config );
+    void AddProcessorCheckOptions( scarab::config_decorator* an_app );
 }
 
 

From c12d2cc1d99bc4f2c96eea35c47d3a23ab4f154f Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 17 Sep 2025 14:36:40 -0700
Subject: [PATCH 498/521] Updated scarab (on a feature branch)

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index b899601..b748b78 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit b899601d9c5f6a81734b6bd78f3056a1bf52b708
+Subproject commit b748b785bf4b5e633ba7eed1cdd1984b3ff86cc0

From 172414ffabb6923613d6362b83653cecb1f760b3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 17 Sep 2025 14:37:21 -0700
Subject: [PATCH 499/521] Add processor checking functions to RunNymph

---
 Cpp/Library/Implementation/RunNymph.cc    | 38 +++++++++++++++++++++--
 Cpp/Library/Processor/ProcessorToolbox.hh |  7 +++++
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 6f9e356..21196b9 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -70,14 +70,48 @@ namespace Nymph
         an_app.add_config_flag< bool >( "--dry-run", "dry-run", "Load the config, setup processors, but do not execute the run" );
     }
 
-    int ProcessorCheck( scarab::param_node& config )
+    int ProcessorCheck( scarab::param_node& a_config )
     {
+        ProcessorToolbox tb;
+        
+        LWARN( nlog, a_config );
 
+        if( a_config.has( "list-procs" ) && a_config["list-procs"]().as_bool() )
+        {
+            using factory_type = const scarab::factory< Processor, const std::string& >;
+            factory_type* t_factory = tb.ProcFactory();
+            std::stringstream t_list_ss;
+            for( auto it = t_factory->begin(); it != t_factory->end(); ++it )
+            {
+                t_list_ss << it->first << '\n';
+
+            }
+            LPROG( nlog, "Available processors:\n" << t_list_ss.str() );
+            return RETURN_SUCCESS;
+        }
+        else
+        {
+            if( ! a_config.has( "proc-type" ) || a_config["proc-type"]().as_string().empty() )
+            {
+                LERROR( nlog, "No processor type was provided to check" );
+                return RETURN_ERROR;
+            }
+            std::string t_proc_type( a_config["proc-type"]().as_string() );
+            bool t_proc_is_available = tb.CouldBuild( t_proc_type );
+            if( ! t_proc_is_available )
+            {
+                LWARN( nlog, "Processor <" << t_proc_type << "> is NOT registered with the processor toolbox" );
+                return -1;
+            }
+            LPROG( nlog, "Processor <" << t_proc_type << "> is known to the processor toolbox" );
+            return RETURN_SUCCESS;
+        }
     }
 
     void AddProcessorCheckOptions( scarab::config_decorator* a_subcommand )
     {
         // options
-        a_subcommand->add_config_option< std::string >( "proc-type", "proc-type", "Processor type to check for" );
+        a_subcommand->add_config_option< std::string >( "proc-type", "proc-type", "Query Nymph to see if this processor type has been registered; returns 0 if present; -1 if not present" );
+        a_subcommand->add_config_flag< bool >( "-l,--list-procs", "list-procs", "List available processors" );
     }
 }
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
index c51283c..76ac86e 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.hh
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -118,6 +118,8 @@ namespace Nymph
             /// Also clears the run queue
             void ClearProcessors();
 
+            const scarab::factory< Processor, const std::string& >* ProcFactory() const;
+
         protected:
             ProcessorMap fProcMap;
 
@@ -177,5 +179,10 @@ namespace Nymph
         return MakeConnection(signalProcName, signalName, slotProcName, slotName, std::numeric_limits< int >::min()); 
     }
 
+    inline const scarab::factory< Processor, const std::string& >* ProcessorToolbox::ProcFactory() const
+    {
+        return fProcFactory;
+    }
+
 } /* namespace Nymph */
 #endif /* NYMPH_PROCESSORTOOLBOX_HH_ */

From c2c6b231bdd89ebb7d4164bcc40b7a5905933a3d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 17 Sep 2025 14:37:35 -0700
Subject: [PATCH 500/521] Use processor checking in the Nymph executable

---
 Cpp/Executables/Main/Nymph.cc | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/Cpp/Executables/Main/Nymph.cc b/Cpp/Executables/Main/Nymph.cc
index 8c48b7f..014fcf1 100644
--- a/Cpp/Executables/Main/Nymph.cc
+++ b/Cpp/Executables/Main/Nymph.cc
@@ -63,27 +63,28 @@ int main( int argc, char** argv )
     // Start handling signals
     scarab::signal_handler t_sig_hand;
 
+    int the_return = -1;
+
     // Create the application
     scarab::main_app the_main;
+    //Runs RunNymph() and sets  the_return based on its return value
+    auto t_callback = [&](){
+        // If any subcommands were called, we don't execute the main callback
+        if( the_main.get_subcommands().size() > 0 ) return;
+        the_return = Nymph::RunNymph( the_main.primary_config() );
+    };
+    the_main.callback( t_callback );
+
+    // Checks for the existence of a processor type and lists processors
+    scarab::config_decorator* t_proc_check = the_main.add_config_subcommand( "proc-check", "Check if a processor type is known" );
+    t_proc_check->this_app()->callback( [&](){ the_return = Nymph::ProcessorCheck(the_main.primary_config()); } );
 
     the_main.require_subcommand(0, 1);
     the_main.set_global_verbosity(scarab::logger::ELevel::eDebug);
 
     // add the typical CL options
     Nymph::AddRunNymphOptions( the_main );
-    Nymph::AddProcessorCheckOptions( the_main );
-
-    //Runs RunNymph() and sets  the_return based on its return value
-    int the_return = -1;
-    auto t_callback = [&](){
-        the_return = Nymph::RunNymph(  the_main.primary_config() );
-    };
-
-    the_main.callback( t_callback );
-
-    // Checks for the existence of a processor type using Nymph::ProcessorCheck()
-    CLI::App* t_proc_check = the_main.add_config_subcommand( "proc-check", "Check if a processor type is known" );
-    t_proc_check->callback( [&](){ Nymph::ProcessorCheck(the_main.primary_config()); } );
+    Nymph::AddProcessorCheckOptions( t_proc_check );
 
     // Parse CL options and run the application
     CLI11_PARSE( the_main, argc, argv );

From 20f49ad2f8219b70dc53831c903439f67cfbed1b Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 17 Sep 2025 16:36:06 -0700
Subject: [PATCH 501/521] Scarab updated to v3.13.2 (on develop)

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index b748b78..cb559e0 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit b748b785bf4b5e633ba7eed1cdd1984b3ff86cc0
+Subproject commit cb559e090c950f56a6ddb12d1ae1f10a338440e7

From 401861fb760e1685201f78d4dd83c0b311482dbc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 Sep 2025 03:06:08 -0700
Subject: [PATCH 502/521] Added C++ Hello World processor

---
 Cpp/Library/CMakeLists.txt              |  2 ++
 Cpp/Library/Processor/HelloWorldProc.cc | 33 +++++++++++++++++++++++
 Cpp/Library/Processor/HelloWorldProc.hh | 35 +++++++++++++++++++++++++
 3 files changed, 70 insertions(+)
 create mode 100644 Cpp/Library/Processor/HelloWorldProc.cc
 create mode 100644 Cpp/Library/Processor/HelloWorldProc.hh

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index f12d436..fc4fa54 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -27,6 +27,7 @@ set( NYMPH_HEADERFILES
     ${SVC_DIR}/Service.hh
     ${SVC_DIR}/ServiceToolbox.hh
 
+    ${PROC_DIR}/HelloWorldProc.hh
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
     ${PROC_DIR}/ProcessorToolbox.hh
@@ -55,6 +56,7 @@ set( NYMPH_SOURCEFILES
     ${SVC_DIR}/Service.cc
     ${SVC_DIR}/ServiceToolbox.cc
 
+    ${PROC_DIR}/HelloWorldProc.cc
     ${PROC_DIR}/PrimaryProcessor.cc
     ${PROC_DIR}/Processor.cc
     ${PROC_DIR}/ProcessorToolbox.cc
diff --git a/Cpp/Library/Processor/HelloWorldProc.cc b/Cpp/Library/Processor/HelloWorldProc.cc
new file mode 100644
index 0000000..bb8bb5d
--- /dev/null
+++ b/Cpp/Library/Processor/HelloWorldProc.cc
@@ -0,0 +1,33 @@
+/*
+ * HelloWorldCpp.cc
+ *
+ *  Created on: Sep 22, 2025
+ *      Author: N.S. Oblath
+ */
+
+#include "HelloWorldProc.hh"
+
+#include "logger.hh"
+
+REGISTER_PROCESSOR( Nymph, HelloWorldCpp, "hello-world-cpp" );
+
+LOGGER( hwlog, "hello-world-proc")
+
+namespace Nymph
+{
+
+    HelloWorldCpp::HelloWorldCpp( const std::string& name ) :
+            Nymph::Processor( name ),
+            fHelloSig( "hello", this ),
+            fHelloSlot( "hello", this, &HelloWorldCpp::SayHello )
+    {}
+
+    HelloWorldCpp::~HelloWorldCpp()
+    {}
+
+    void HelloWorldCpp::SayHello()
+    {
+        LPROG( hwlog, "Hello, world" );
+        return;
+    }
+}
diff --git a/Cpp/Library/Processor/HelloWorldProc.hh b/Cpp/Library/Processor/HelloWorldProc.hh
new file mode 100644
index 0000000..dbc097b
--- /dev/null
+++ b/Cpp/Library/Processor/HelloWorldProc.hh
@@ -0,0 +1,35 @@
+/*
+ * HelloWorldProc.hh
+ *
+ *  Created on: Sept 20, 2025
+ *      Author: N.S. Oblath
+ */
+
+#ifndef NYMPH_HELLOWORLDPROC_HH_
+#define NYMPH_HELLOWORLDPROC_HH_
+
+#include "Processor.hh"
+#include "Signal.hh"
+#include "Slot.hh"
+
+namespace Nymph
+{
+
+    class HelloWorldCpp : public Nymph::Processor
+    {
+        public:
+            HelloWorldCpp( const std::string& name = "hello-world-cpp" );
+
+            virtual ~HelloWorldCpp();
+
+            void Configure( const scarab::param_node& node ) {};
+
+            void SayHello();
+
+            MEMVAR_REF( Nymph::Signal<>, HelloSig );
+            MEMVAR_REF( Nymph::Slot<>, HelloSlot );
+    };
+
+} /* namespace Nymph */
+
+#endif /* NYMPH_HELLOWORLDPROC_HH_ */

From e62a4030d2111f3b26024f105b266c9000a8ae14 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 Sep 2025 03:07:12 -0700
Subject: [PATCH 503/521] Restructured Python's __init__.py's and added
 processor.Processor, and processor.HelloWorldPython

---
 Python/nymph/__init__.py                 |  7 ++++---
 Python/nymph/control/__init__.py         |  2 ++
 Python/nymph/implementation/__init__.py  |  2 ++
 Python/nymph/processor/__init__.py       |  5 +++++
 Python/nymph/processor/helloworldproc.py | 15 +++++++++++++++
 Python/nymph/processor/processor.py      | 20 ++++++++++++++++++++
 Python/nymph/utility/__init__.py         |  2 ++
 7 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 Python/nymph/control/__init__.py
 create mode 100644 Python/nymph/implementation/__init__.py
 create mode 100644 Python/nymph/processor/__init__.py
 create mode 100644 Python/nymph/processor/helloworldproc.py
 create mode 100644 Python/nymph/processor/processor.py
 create mode 100644 Python/nymph/utility/__init__.py

diff --git a/Python/nymph/__init__.py b/Python/nymph/__init__.py
index bd240f9..dec3f0a 100644
--- a/Python/nymph/__init__.py
+++ b/Python/nymph/__init__.py
@@ -1,4 +1,5 @@
 
-# import nymph_bindings entirely into nymph
-from nymph_bindings import *
-
+from . import control
+from . import implementation
+from . import processor
+from . import utility
diff --git a/Python/nymph/control/__init__.py b/Python/nymph/control/__init__.py
new file mode 100644
index 0000000..9220437
--- /dev/null
+++ b/Python/nymph/control/__init__.py
@@ -0,0 +1,2 @@
+
+from nymph_bindings.control import *
\ No newline at end of file
diff --git a/Python/nymph/implementation/__init__.py b/Python/nymph/implementation/__init__.py
new file mode 100644
index 0000000..cc0ca9e
--- /dev/null
+++ b/Python/nymph/implementation/__init__.py
@@ -0,0 +1,2 @@
+
+from nymph_bindings.implementation import *
\ No newline at end of file
diff --git a/Python/nymph/processor/__init__.py b/Python/nymph/processor/__init__.py
new file mode 100644
index 0000000..99440c2
--- /dev/null
+++ b/Python/nymph/processor/__init__.py
@@ -0,0 +1,5 @@
+
+from nymph_bindings.processor import *
+
+from .helloworldproc import *
+from .processor import *
diff --git a/Python/nymph/processor/helloworldproc.py b/Python/nymph/processor/helloworldproc.py
new file mode 100644
index 0000000..f1aaf65
--- /dev/null
+++ b/Python/nymph/processor/helloworldproc.py
@@ -0,0 +1,15 @@
+'''
+Test Processor to demonstrate basic Python-based Nymph capabilities
+'''
+
+from . import processor
+
+class HelloWorldPython( processor.Processor ):
+    def __init__( self, name ):
+        processor.Processor.__init__( self, name )
+
+    def configure( self, config ):
+        pass
+
+    def say_hello():
+        print( "Hello, world (python)" )
diff --git a/Python/nymph/processor/processor.py b/Python/nymph/processor/processor.py
new file mode 100644
index 0000000..e58d992
--- /dev/null
+++ b/Python/nymph/processor/processor.py
@@ -0,0 +1,20 @@
+'''
+The file contains the base class for Python processors
+'''
+
+from nymph_bindings.processor import _Processor
+
+
+class Processor(_Processor):
+    '''
+    Base class for all Python processors
+    '''
+    def __init__(self, name: str):
+        '''
+        Initialize things
+        '''
+        _Processor.__init__(self, name)
+        print(f"Initializing python processor {name}")
+
+    def configure(self, config):
+        raise NotImplementedError( "Configure function has not been implemented for this processor" )
diff --git a/Python/nymph/utility/__init__.py b/Python/nymph/utility/__init__.py
new file mode 100644
index 0000000..649c794
--- /dev/null
+++ b/Python/nymph/utility/__init__.py
@@ -0,0 +1,2 @@
+
+from nymph_bindings.utility import *

From 6dc24c2fc8d177dfdb293a077c1805e65591daeb Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 Sep 2025 03:07:49 -0700
Subject: [PATCH 504/521] Added processor visibility test in C++

---
 Testing/CMakeLists.txt                 |  1 +
 Testing/Cpp/TestProcessorToolbox.cc    |  2 ++
 Testing/Cpp/TestProcessorVisibility.cc | 41 ++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 Testing/Cpp/TestProcessorVisibility.cc

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 09e27a5..7f477bc 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -74,6 +74,7 @@ set( testing_SOURCES
     ${CPP_DIR}/TestPrimaryProcessor.cc
     ${CPP_DIR}/TestProcessor.cc
     ${CPP_DIR}/TestProcessorToolbox.cc
+    ${CPP_DIR}/TestProcessorVisibility.cc
     ${CPP_DIR}/TestReturnBuffer.cc
     ${CPP_DIR}/TestRunNymph.cc
     ${CPP_DIR}/TestService.cc
diff --git a/Testing/Cpp/TestProcessorToolbox.cc b/Testing/Cpp/TestProcessorToolbox.cc
index e299955..7250a84 100644
--- a/Testing/Cpp/TestProcessorToolbox.cc
+++ b/Testing/Cpp/TestProcessorToolbox.cc
@@ -48,6 +48,8 @@ TEST_CASE( "processor_toolbox" )
         std::string procName1( "testproc-1" );
         std::string procName2( "testproc-2" );
 
+        REQUIRE( tptToolbox.CouldBuild( "hello-world-cpp" ) );
+
         REQUIRE( tptToolbox.CouldBuild( "test-proc" ) );
         REQUIRE( tptToolbox.CouldBuild( "test-primary" ) );
         REQUIRE_FALSE( tptToolbox.CouldBuild( procName1 ) );
diff --git a/Testing/Cpp/TestProcessorVisibility.cc b/Testing/Cpp/TestProcessorVisibility.cc
new file mode 100644
index 0000000..45e7051
--- /dev/null
+++ b/Testing/Cpp/TestProcessorVisibility.cc
@@ -0,0 +1,41 @@
+/*
+ * TestProcessorToolbox.cc
+ *
+ *  Created on: Nov 25, 2021
+ *      Author: N.S. Oblath
+ */
+
+#include "TestProcessorClasses.hh"
+
+#include "ProcessorToolbox.hh"
+
+#include "logger.hh"
+
+#include "catch2/catch_test_macros.hpp"
+
+LOGGER( testlog, "TestProcessorVisibility" );
+
+TEST_CASE( "processor_visibility" )
+{
+    using namespace Nymph;
+
+    ProcessorToolbox tptToolbox;
+
+    SECTION( "Cpp" )
+    {
+        LINFO( testlog, "C++ Processor Visibility" );
+
+        REQUIRE( tptToolbox.CouldBuild( "hello-world-cpp" ) );
+        REQUIRE( tptToolbox.CouldBuild( "test-proc" ) );
+        REQUIRE( tptToolbox.CouldBuild( "test-primary" ) );
+        REQUIRE_FALSE( tptToolbox.CouldBuild( "does not exist" ) );
+
+    }
+
+//    SECTION( "Python" )
+//    {
+//        LINFO( testlog, "Python Processor Visibility");
+//
+//    }
+
+}

From 09cae58b4cb5fdbc8e640d83816dd46fcec21938 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 23 Sep 2025 03:08:39 -0700
Subject: [PATCH 505/521] Adjusted Python testing and added testing in
 Python/nymph

---
 .../Bindings/testprocessorvisibility.py       | 25 +++++++++++
 Testing/Python/nymph/testdata.py              |  8 ++--
 Testing/Python/nymph/testprocessor.py         | 28 +++++++++++++
 .../Python/nymph/testprocessorvisibility.py   | 24 +++++++++++
 Testing/README.md                             | 41 +++++++++++++++----
 5 files changed, 115 insertions(+), 11 deletions(-)
 create mode 100644 Testing/Python/Bindings/testprocessorvisibility.py
 create mode 100644 Testing/Python/nymph/testprocessor.py
 create mode 100644 Testing/Python/nymph/testprocessorvisibility.py

diff --git a/Testing/Python/Bindings/testprocessorvisibility.py b/Testing/Python/Bindings/testprocessorvisibility.py
new file mode 100644
index 0000000..5acc574
--- /dev/null
+++ b/Testing/Python/Bindings/testprocessorvisibility.py
@@ -0,0 +1,25 @@
+
+"""
+  testprocessorvisibility.py
+ 
+   Created on: Sep 22, 2025
+       Author: N.S. Oblath
+"""
+import unittest
+
+import nymph_bindings #, _nymph_testing
+
+
+class TestProcessorVisibility(unittest.TestCase):
+    tb = nymph_bindings.processor.ProcessorToolbox()
+
+
+    '''Testing whether the processor toolbox knows about certain processors'''
+    def test_could_build(self):
+        self.assertFalse( self.tb.could_build( 'does not exist' ) )  # Something that definitely shouldn't exist
+        self.assertTrue( self.tb.could_build( 'hello-world-cpp' ) )  # hw-cpp exists in the C++ library, and therefore should be visible
+        self.assertFalse( self.tb.could_build( 'hello-world-python' ) )  # Binding doesn't know about hw-python
+    
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Testing/Python/nymph/testdata.py b/Testing/Python/nymph/testdata.py
index 06ef803..8c01cd7 100644
--- a/Testing/Python/nymph/testdata.py
+++ b/Testing/Python/nymph/testdata.py
@@ -10,7 +10,7 @@
 import nymph
 
 '''Data class with integer variables'''
-class TestData1(nymph.data._Data):
+class Data1(nymph.data._Data):
     
     def __init__(self, test_var1=0, test_var2=5):
         super().__init__()
@@ -18,7 +18,7 @@ def __init__(self, test_var1=0, test_var2=5):
         self.test_var2 = test_var2
 
 '''Data class with floating point variables'''
-class TestData2(nymph.data._Data):
+class Data2(nymph.data._Data):
     
     def __init__(self, test_var1=0.0, test_var2=10.0):
         super().__init__()
@@ -28,13 +28,13 @@ def __init__(self, test_var1=0.0, test_var2=10.0):
 # The way to access member variables need to be modified if getters/setters are used in the python version
 class TestDataMethods(unittest.TestCase):
     '''Testing of integer type data'''
-    data1=TestData1()
+    data1=Data1()
     def test_idata_assignment(self):
         self.assertEqual(self.data1.test_var1,0)
         self.assertEqual(self.data1.test_var2,5)
     
     '''Testing of floating point type data'''
-    data2=TestData2()
+    data2=Data2()
     def test_fdata_assignment(self):
         self.assertAlmostEqual(self.data2.test_var1,0.0)
         self.assertAlmostEqual(self.data2.test_var2,10.0)
diff --git a/Testing/Python/nymph/testprocessor.py b/Testing/Python/nymph/testprocessor.py
new file mode 100644
index 0000000..fe02906
--- /dev/null
+++ b/Testing/Python/nymph/testprocessor.py
@@ -0,0 +1,28 @@
+
+"""
+   testprocessor.py
+ 
+   Created on: Sep 22, 2025
+       Author: N.S. Oblath
+"""
+import unittest
+
+import nymph #, _nymph_testing
+import scarab
+
+
+class TestProcessor(unittest.TestCase):
+
+    '''Testing whether the processor toolbox knows about certain processors'''
+    def test_basics(self):
+        proc = nymph.processor.Processor( "test" )
+        with self.assertRaises(NotImplementedError):
+            proc.configure(scarab.to_param({}))
+
+    def test_helloworld(self):
+        proc = nymph.processor.HelloWorldPython( "hw" )
+        self.assertIsInstance( proc, nymph.processor.Processor )
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Testing/Python/nymph/testprocessorvisibility.py b/Testing/Python/nymph/testprocessorvisibility.py
new file mode 100644
index 0000000..2612d6a
--- /dev/null
+++ b/Testing/Python/nymph/testprocessorvisibility.py
@@ -0,0 +1,24 @@
+
+"""
+  testprocessorvisibility.py
+ 
+   Created on: Sep 22, 2025
+       Author: N.S. Oblath
+"""
+import unittest
+
+import nymph #, _nymph_testing
+
+
+class TestProcessorVisibility(unittest.TestCase):
+    tb = nymph.processor.ProcessorToolbox()
+
+    '''Testing whether the processor toolbox knows about certain processors'''
+    def test_could_build(self):
+        self.assertFalse( self.tb.could_build( 'does not exist' ) )
+        self.assertTrue( self.tb.could_build( 'hello-world-cpp' ) )
+        self.assesrtTrue( self.tb.could_build( 'hello-world-python' ) )
+    
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Testing/README.md b/Testing/README.md
index bafcc78..3b0601b 100644
--- a/Testing/README.md
+++ b/Testing/README.md
@@ -1,36 +1,63 @@
 # README for Nymph/Testing
 
-## Catch2
+## C++
+
+### Testing infrastructure: Catch2
 
 Nymph uses the Catch2 testing framework for unit tests.  See these links for more information:
 
 * [Main GitHub page](https://github.com/catchorg/Catch2)
 * [Tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md)
 
-## Building tests
+### Building tests
 
 In CMake, enable the option `Nymph_ENABLE_TESTING`, and build.
 
-The testing executable, `RunTests`, will be installed in `install_prefix/testing`.
+The testing executable, `RunTests`, will be installed in `install_prefix/bin`.
 
-## Running tests
+### Running tests
 
 To see the available options for running tests, you can do:
 
 ```
-> testing/RunTests -h
+> bin/RunTests -h
 ```
 
 To simply run all of the tests, you can do:
 
 ```
-> testing/RunTests
+> bin/RunTests
 ```
 
 Or if you want to run a specific test, you can do:
 
 ```
-> testing/RunTests [name]
+> bin/RunTests [name]
 ```
 
 For further documentation on using Catch2, see the [tutorial](https://github.com/catchorg/Catch2/blob/master/docs/tutorial.md).
+
+## Python
+
+Python testing is divided into two sections: binding and nymph.  The former tests the C++-to-python binding and doesn't 
+require the Python `nymph` package. Those tests will import the `nymph_bindings` package.  It requires having built the 
+C++ side of Nymph with the `Nymph_ENABLE_PYTHON` flag set to `TRUE`.
+
+The nymph tests test the Python `nymph` package and requires having installed the nymph package (e.g. with `pip install`).  
+If the package is not installed in a system location, you'll need to source `add_lib_python_path.sh` before running the tests.
+
+### Testing infrastructure: unittest
+
+
+
+### Binding tests
+
+#### Running tests
+
+Individual tests can be run by specifying the module name or the python file.  
+From the CL, in the `Testing/Python` directory, you can run:
+
+```
+> python -m unittest Bindings/test[name].py
+```
+

From f3c677b343c602e5e61c914df446b0fe630c75e9 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 3 Oct 2025 17:34:28 -0700
Subject: [PATCH 506/521] Add a custom registrar for processors that uses the
 factory from ProcessorToolbox; this is to get around the issue of duplicating
 factories when using python

---
 Cpp/Library/CMakeLists.txt                  |  1 +
 Cpp/Library/Processor/Processor.hh          |  7 ++-
 Cpp/Library/Processor/ProcessorRegistrar.hh | 69 +++++++++++++++++++++
 Cpp/Library/Processor/ProcessorToolbox.cc   |  5 ++
 Cpp/Library/Processor/ProcessorToolbox.hh   |  3 +
 5 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 Cpp/Library/Processor/ProcessorRegistrar.hh

diff --git a/Cpp/Library/CMakeLists.txt b/Cpp/Library/CMakeLists.txt
index fc4fa54..5294b54 100644
--- a/Cpp/Library/CMakeLists.txt
+++ b/Cpp/Library/CMakeLists.txt
@@ -30,6 +30,7 @@ set( NYMPH_HEADERFILES
     ${PROC_DIR}/HelloWorldProc.hh
     ${PROC_DIR}/PrimaryProcessor.hh
     ${PROC_DIR}/Processor.hh
+    ${PROC_DIR}/ProcessorRegistrar.hh
     ${PROC_DIR}/ProcessorToolbox.hh
     ${PROC_DIR}/QuitChain.hh
     ${PROC_DIR}/Signal.hh
diff --git a/Cpp/Library/Processor/Processor.hh b/Cpp/Library/Processor/Processor.hh
index 59e7733..fdcfe90 100644
--- a/Cpp/Library/Processor/Processor.hh
+++ b/Cpp/Library/Processor/Processor.hh
@@ -9,6 +9,7 @@
 #define NYMPH_PROCESSOR_HH_
 
 #include "ConfigException.hh"
+#include "ProcessorRegistrar.hh"
 #include "SignalSlotBase.hh"
 
 #include "factory.hh"
@@ -88,10 +89,10 @@ namespace Nymph
     }
 
 #define REGISTER_PROCESSOR_NONAMESPACE(proc_class, proc_name) \
-        static ::scarab::registrar< ::Nymph::Processor, proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+        static ::Nymph::ProcessorRegistrar< proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
 #define REGISTER_PROCESSOR_NAMESPACE(proc_namespace, proc_class, proc_name) \
-        static ::scarab::registrar< ::Nymph::Processor, ::proc_namespace::proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
+        static ::Nymph::ProcessorRegistrar< ::proc_namespace::proc_class, const std::string& > sProc##proc_class##Registrar( proc_name );
 
 // Macro overloading trick from here: https://stackoverflow.com/a/11763277
 #define GET_MACRO(_1, _2, _3, NAME, ...) NAME
@@ -102,4 +103,6 @@ namespace Nymph
 
 } /* namespace Nymph */
 
+//extern scarab::indexed_factory< std::string, Nymph::Processor, const std::string& > ex_shared_proc_factory;
+
 #endif /* NYMPH_PROCESSOR_HH_ */
diff --git a/Cpp/Library/Processor/ProcessorRegistrar.hh b/Cpp/Library/Processor/ProcessorRegistrar.hh
new file mode 100644
index 0000000..2238e17
--- /dev/null
+++ b/Cpp/Library/Processor/ProcessorRegistrar.hh
@@ -0,0 +1,69 @@
+/**
+ @file ProcessorRegistrar.hh
+ @brief Contains ProcessorRegistrar
+ @details Customized indexed_factory registrar for Processors.
+ @author: N. S. Oblath
+ @date: Oct 3, 2025
+ */
+
+#ifndef NYMPH_PROCESSORREGISTRAR_HH_
+#define NYMPH_PROCESSORREGISTRAR_HH_
+
+//#include "Processor.hh"
+#include "ProcessorToolbox.hh"
+
+#include "indexed_factory.hh"
+
+
+namespace Nymph
+{
+    class Processor;
+
+    // registrar
+
+    template< class XDerivedType, typename ... XArgs >
+    class ProcessorRegistrar : public scarab::base_registrar< Processor, XArgs... >
+    {
+        public:
+            ProcessorRegistrar( const std::string& a_index );
+            virtual ~ProcessorRegistrar();
+
+            void register_class() const;
+
+            Processor* create( XArgs ... args ) const;
+
+        protected:
+            std::string f_index;
+    };
+
+
+    template< class XDerivedType, typename ... XArgs >
+    ProcessorRegistrar< XDerivedType, XArgs... >::ProcessorRegistrar( const std::string& a_index ) :
+            scarab::base_registrar< Processor, XArgs... >(),
+            f_index( a_index )
+    {
+        register_class();
+    }
+
+    template< class XDerivedType, typename ... XArgs >
+    ProcessorRegistrar< XDerivedType, XArgs... >::~ProcessorRegistrar()
+    {
+        ProcessorToolbox::GetProcFactory()->remove_class( f_index );
+    }
+
+    template< class XDerivedType, typename ... XArgs >
+    void ProcessorRegistrar< XDerivedType, XArgs... >::register_class() const
+    {
+        ProcessorToolbox::GetProcFactory()->register_class( f_index, this );
+        return;
+    }
+
+    template< class XDerivedType, typename ... XArgs >
+    Processor* ProcessorRegistrar< XDerivedType, XArgs... >::create( XArgs... args ) const
+    {
+        return dynamic_cast< Processor* >( new XDerivedType( args... ) );
+    }
+
+}
+
+#endif /* NYMPH_PROCESSORREGISTRAR_HH_ */
diff --git a/Cpp/Library/Processor/ProcessorToolbox.cc b/Cpp/Library/Processor/ProcessorToolbox.cc
index 7589aed..67f8af2 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.cc
+++ b/Cpp/Library/Processor/ProcessorToolbox.cc
@@ -30,6 +30,11 @@ namespace Nymph
     ProcessorToolbox::~ProcessorToolbox()
     {}
 
+    scarab::factory< Processor, const std::string& >* ProcessorToolbox::GetProcFactory()
+    {
+        return scarab::factory< Processor, const std::string& >::get_instance();
+    }
+
     void ProcessorToolbox::Configure( const scarab::param_node& node )
     {
         LPROG( proclog, "Configuring processor toolbox" );
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
index 76ac86e..5074558 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.hh
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -70,6 +70,9 @@ namespace Nymph
             ProcessorToolbox( const std::string& name = "processor-toolbox" );
             virtual ~ProcessorToolbox();
 
+            // This was implemented to avoid the duplicate factory problem when accessing the factory from the Pybindings
+            static scarab::factory< Processor, const std::string& >* GetProcFactory();
+
         protected:
             scarab::factory< Processor, const std::string& >* fProcFactory; // singleton; not owned by ProcessorToolbox
 

From 34ac1dbb133da7442e2f0c489f9c4656f3d03211 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Fri, 3 Oct 2025 17:37:12 -0700
Subject: [PATCH 507/521] Renamed pybinding processor registrar file; use the
 dedicated processor registrar type; test visibility of processors from python

---
 Python/Bindings/CMakeLists.txt                |  3 +-
 .../Bindings/Processor/ProcessorRegistrar.hh  | 88 -------------------
 .../Bindings/Processor/PyProcCreatorPybind.hh |  6 +-
 Python/Bindings/Processor/PyProcRegistrar.cc  | 84 ++++++++++++++++++
 Python/Bindings/Processor/PyProcRegistrar.hh  | 51 +++++++++++
 Python/nymph/processor/__init__.py            |  3 +
 Python/nymph/processor/registrar.py           | 15 ++++
 Testing/Python/Bindings/testprocfactory.py    | 33 +++++++
 Testing/Python/nymph/testprocfactory.py       | 38 ++++++++
 9 files changed, 229 insertions(+), 92 deletions(-)
 delete mode 100644 Python/Bindings/Processor/ProcessorRegistrar.hh
 create mode 100644 Python/Bindings/Processor/PyProcRegistrar.cc
 create mode 100644 Python/Bindings/Processor/PyProcRegistrar.hh
 create mode 100644 Python/nymph/processor/registrar.py
 create mode 100644 Testing/Python/Bindings/testprocfactory.py
 create mode 100644 Testing/Python/nymph/testprocfactory.py

diff --git a/Python/Bindings/CMakeLists.txt b/Python/Bindings/CMakeLists.txt
index 1a63a0e..16128b8 100644
--- a/Python/Bindings/CMakeLists.txt
+++ b/Python/Bindings/CMakeLists.txt
@@ -16,9 +16,9 @@ include_directories( BEFORE
 set( PYBINDING_HEADERFILES
     Data/DataPybind.hh
     Processor/ProcessorPybind.hh
-    Processor/ProcessorRegistrar.hh
     Processor/ProcessorToolboxPybind.hh
     Processor/PyProcCreatorPybind.hh
+    Processor/PyProcRegistrar.hh
     Processor/SignalPybind.hh
     Processor/SlotPybind.hh
 )
@@ -26,6 +26,7 @@ set( PYBINDING_HEADERFILES
 # Python bindings
 set( PYBINDING_SOURCEFILES
     NymphPybind.cc
+    Processor/PyProcRegistrar.cc
 )
 
 set( PYBINDING_PROJECT_LIBRARIES Nymph )
diff --git a/Python/Bindings/Processor/ProcessorRegistrar.hh b/Python/Bindings/Processor/ProcessorRegistrar.hh
deleted file mode 100644
index 1bf113b..0000000
--- a/Python/Bindings/Processor/ProcessorRegistrar.hh
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * ProcessorRegistrar.hh
- *
- *  Created on: Jun 13, 2022
- *      Author: N.S. Oblath
- */
-
-#ifndef PYTHON_BINDINGS_PROCESSOR_PROCESSORPYREGISTRAR_HH_
-#define PYTHON_BINDINGS_PROCESSOR_PROCESSORPYREGISTRAR_HH_
-
-#include "Processor.hh"
-
-#include "Exception.hh"
-
-#include "logger.hh"
-
-#include <pybind11/eval.h>
-
-#include <memory>
-
-LOGGER( prlog_h, "ProcessorRegistrar.hh" );
-
-namespace Nymph
-{
-    class PyProcCreator : public Processor
-    {
-        public:
-            PyProcCreator( const std::string& name = "test" ) :
-                    Processor( name )
-            {}
-
-            virtual ~PyProcCreator()
-            {}
-
-            void Configure( const scarab::param_node& )
-            {}
-
-    };
-
-    class PyProcRegistrar : public scarab::registrar< Processor, PyProcCreator, const std::string& >
-    {
-        public:
-            PyProcRegistrar( const std::string& module, const std::string& type, const std::string& typeName ) :
-                    scarab::registrar< Processor, PyProcCreator, const std::string& >( typeName ),
-                    fType( type ),
-                    fModule( module )
-            {}
-            virtual ~PyProcRegistrar() {}
-
-            std::shared_ptr<Nymph::Processor> CreatePyProc( const std::string& name ) const
-            {
-                std::string useModule( fModule );
-                if( useModule.empty() ) useModule = "__main__";
-                py::object scope = py::module_::import( useModule.c_str() ).attr( "__dict__" );
-                std::shared_ptr<Nymph::Processor> proc = py::eval( fType + "(\'" + name + "\')", scope ).cast< std::shared_ptr<Nymph::Processor> >();
-                return proc;
-
-            }
-
-        protected:
-            std::string fType;
-            std::string fModule;
-    };
-
-    std::unique_ptr<PyProcRegistrar> RegisterPyProcessor( const std::string& module, const std::string& type, const std::string& typeName )
-    {
-        return std::make_unique<PyProcRegistrar>( module, type, typeName );
-    }
-
-    std::shared_ptr< Nymph::Processor > CreatePyProcessor( const std::string& typeName, const std::string& name )
-    {
-        scarab::factory< Nymph::Processor, const std::string& >* factory = scarab::factory< Nymph::Processor, const std::string& >::get_instance();
-        if( ! factory->has_class( typeName ) )
-        {
-            THROW_EXCEPT_HERE( Nymph::Exception() << "Did not find processor with type <" << typeName << ">" );
-        }
-        const PyProcRegistrar* ppReg = dynamic_cast< const PyProcRegistrar* >( factory->get_registrar( typeName ) );
-        if( ! ppReg )
-        {
-            THROW_EXCEPT_HERE( Nymph::Exception() << "Registrar did not cast correctly for <" << typeName << ">" );
-        }
-        return ppReg->CreatePyProc( name );
-    }
-
-}
-
-
-#endif /* PYTHON_BINDINGS_PROCESSOR_PROCESSORPYREGISTRAR_HH_ */
diff --git a/Python/Bindings/Processor/PyProcCreatorPybind.hh b/Python/Bindings/Processor/PyProcCreatorPybind.hh
index b9ea147..5a2c9d4 100644
--- a/Python/Bindings/Processor/PyProcCreatorPybind.hh
+++ b/Python/Bindings/Processor/PyProcCreatorPybind.hh
@@ -9,7 +9,7 @@
 #define PYTHON_BINDINGS_PROCESSOR_PYPROCCREATORPYBIND_HH_
 
 #include "NymphBindingHelpers.hh"
-#include "ProcessorRegistrar.hh"
+#include "PyProcRegistrar.hh"
 
 #include <pybind11/pybind11.h>
 
@@ -24,8 +24,8 @@ namespace NymphPybind
                 .def(py::init< const std::string&, const std::string&, const std::string& >())
                 .def("create_python_processor", &Nymph::PyProcRegistrar::CreatePyProc);
         
-        nymphProcessor.def("register_py_processor", &Nymph::RegisterPyProcessor, NYMPH_BIND_CALL_GUARD_STREAMS);
-        nymphProcessor.def("create_processor", &Nymph::CreatePyProcessor);
+        nymphProcessor.def("_register", &Nymph::RegisterPyProcessor, NYMPH_BIND_CALL_GUARD_STREAMS);
+        nymphProcessor.def("_create", &Nymph::CreatePyProcessor, NYMPH_BIND_CALL_GUARD_STREAMS);
     }
 }
 
diff --git a/Python/Bindings/Processor/PyProcRegistrar.cc b/Python/Bindings/Processor/PyProcRegistrar.cc
new file mode 100644
index 0000000..00c8c31
--- /dev/null
+++ b/Python/Bindings/Processor/PyProcRegistrar.cc
@@ -0,0 +1,84 @@
+/*
+ * PyProcRegistrar.cc
+ *
+ *  Created on: Sep 24, 2025
+ *      Author: N.S. Oblath
+ */
+
+#include "PyProcRegistrar.hh"
+#include "ProcessorToolbox.hh"
+
+#include "Exception.hh"
+
+#include "logger.hh"
+
+#include <pybind11/eval.h>
+
+#include <memory>
+
+//#include <sstream>
+
+LOGGER( prlog, "PyProcRegistrar.hh" );
+
+namespace py = pybind11;
+
+namespace Nymph
+{
+    PyProcCreator::PyProcCreator( const std::string& name ) :
+            Processor( name )
+    {}
+
+    PyProcCreator::~PyProcCreator()
+    {}
+
+    void PyProcCreator::Configure( const scarab::param_node& )
+    {}
+
+
+    PyProcRegistrar::PyProcRegistrar( const std::string& module, const std::string& type, const std::string& typeName ) :
+            ProcessorRegistrar< PyProcCreator, const std::string& >( typeName ),
+            fType( type ),
+            fModule( module )
+    {
+        LWARN(prlog, "PyProcRegistrar constructor");
+    }
+    PyProcRegistrar::~PyProcRegistrar() {}
+
+    std::shared_ptr<Nymph::Processor> PyProcRegistrar::CreatePyProc( const std::string& name ) const
+    {
+        std::string useModule( fModule );
+        if( useModule.empty() ) useModule = "__main__";
+        py::object scope = py::module_::import( useModule.c_str() ).attr( "__dict__" );
+        std::shared_ptr<Nymph::Processor> proc = py::eval( fType + "(\'" + name + "\')", scope ).cast< std::shared_ptr<Nymph::Processor> >();
+        return proc;
+    }
+
+    std::unique_ptr<PyProcRegistrar> RegisterPyProcessor( const std::string& module, const std::string& type, const std::string& typeName )
+    {
+        LWARN( prlog, "In RegisterPyProc()" );
+        return std::make_unique<PyProcRegistrar>( module, type, typeName );
+    }
+
+    std::shared_ptr< Nymph::Processor > CreatePyProcessor( const std::string& typeName, const std::string& name )
+    {
+        auto factory = ProcessorToolbox::GetProcFactory();
+        //std::stringstream t_list_ss;
+        //for( auto it = factory->begin(); it != factory->end(); ++it )
+        //{
+        //    t_list_ss << it->first << '\n';
+        //}
+        //LWARN( prlog, "Available processors at " << factory << ": " << t_list_ss.str() );
+
+        if( ! factory->has_class( typeName ) )
+        {
+            THROW_EXCEPT_HERE( Nymph::Exception() << "Did not find processor with type <" << typeName << ">" );
+        }
+        const PyProcRegistrar* ppReg = dynamic_cast< const PyProcRegistrar* >( factory->get_registrar( typeName ) );
+        if( ! ppReg )
+        {
+            THROW_EXCEPT_HERE( Nymph::Exception() << "Registrar did not cast correctly for <" << typeName << ">" );
+        }
+        return ppReg->CreatePyProc( name );
+    }
+
+}
diff --git a/Python/Bindings/Processor/PyProcRegistrar.hh b/Python/Bindings/Processor/PyProcRegistrar.hh
new file mode 100644
index 0000000..da7fbce
--- /dev/null
+++ b/Python/Bindings/Processor/PyProcRegistrar.hh
@@ -0,0 +1,51 @@
+/*
+ * PyProcRegistrar.hh
+ *
+ *  Created on: Jun 13, 2022
+ *      Author: N.S. Oblath
+ */
+
+#ifndef PYTHON_BINDINGS_PROCESSOR_PYPROCREGISTRAR_HH_
+#define PYTHON_BINDINGS_PROCESSOR_PYPROCREGISTRAR_HH_
+
+#include "ProcessorRegistrar.hh"
+#include "Processor.hh"
+
+#include "Exception.hh"
+
+#include <memory>
+
+
+namespace Nymph
+{
+    class PyProcCreator : public Processor
+    {
+        public:
+            PyProcCreator( const std::string& name = "test" );
+
+            virtual ~PyProcCreator();
+
+            void Configure( const scarab::param_node& );
+
+    };
+
+    class PyProcRegistrar : public ProcessorRegistrar< PyProcCreator, const std::string& >
+    {
+        public:
+            PyProcRegistrar( const std::string& module, const std::string& type, const std::string& typeName );
+            virtual ~PyProcRegistrar();
+
+            std::shared_ptr<Nymph::Processor> CreatePyProc( const std::string& name ) const;
+
+        protected:
+            std::string fType;
+            std::string fModule;
+    };
+
+    std::unique_ptr<PyProcRegistrar> RegisterPyProcessor( const std::string& module, const std::string& type, const std::string& typeName );
+    std::shared_ptr< Nymph::Processor > CreatePyProcessor( const std::string& typeName, const std::string& name );
+
+}
+
+
+#endif /* PYTHON_BINDINGS_PROCESSOR_PYPROCREGISTRAR_HH_ */
diff --git a/Python/nymph/processor/__init__.py b/Python/nymph/processor/__init__.py
index 99440c2..fd92857 100644
--- a/Python/nymph/processor/__init__.py
+++ b/Python/nymph/processor/__init__.py
@@ -3,3 +3,6 @@
 
 from .helloworldproc import *
 from .processor import *
+from .registrar import *
+
+register("nymph.processor", "HelloWorldPython", "hello-world-py")
diff --git a/Python/nymph/processor/registrar.py b/Python/nymph/processor/registrar.py
new file mode 100644
index 0000000..a5e7184
--- /dev/null
+++ b/Python/nymph/processor/registrar.py
@@ -0,0 +1,15 @@
+
+
+#from nymph import registrars
+from nymph_bindings import processor as nb_proc
+
+registrars = {}
+
+def register(module_name: str, type: str, type_name: str):
+    print(f"Registring {module_name}.{type} under {type_name}")
+    registrars[type_name] = nb_proc._register(module_name, type, type_name)
+
+
+def create(type_name: str, name: str):
+    print(f"Creating processor of type {type_name} called {name}")
+    return nb_proc._create(type_name, name);
diff --git a/Testing/Python/Bindings/testprocfactory.py b/Testing/Python/Bindings/testprocfactory.py
new file mode 100644
index 0000000..5a49e2b
--- /dev/null
+++ b/Testing/Python/Bindings/testprocfactory.py
@@ -0,0 +1,33 @@
+"""
+   testprocfactory.py
+
+   Testing of the Processor factory functions
+ 
+   Created on: Sep 24, 2025
+       Author: N.S. Oblath
+"""
+import unittest
+
+import nymph_bindings as nb
+import scarab
+
+
+class TestNoProc(unittest.TestCase):
+    '''Testing the situation where the processor type doesn't exist'''
+    def test_noproc(self):
+        with self.assertRaises(RuntimeError) as cm:
+            nb.processor.create( "blah", "blah-blah" )
+        the_exception = cm.exception
+        self.assertEqual(str(the_exception), "Did not find processor with type <blah>")
+
+class TestCppProc(unittest.TestCase):
+    '''Testing the creation of a C++ processor, which won't work'''
+    def test_cppproc(self):
+        with self.assertRaises(RuntimeError) as cm:
+            nb.processor.create( "hello-world-cpp", "hw" )
+        the_exception = cm.exception
+        self.assertEqual(str(the_exception), "Registrar did not cast correctly for <hello-world-cpp>")
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/Testing/Python/nymph/testprocfactory.py b/Testing/Python/nymph/testprocfactory.py
new file mode 100644
index 0000000..ba828da
--- /dev/null
+++ b/Testing/Python/nymph/testprocfactory.py
@@ -0,0 +1,38 @@
+"""
+   testprocfactory.py
+
+   Testing of the Processor factory functions
+ 
+   Created on: Sep 29, 2025
+       Author: N.S. Oblath
+"""
+import unittest
+
+import nymph
+import scarab
+
+
+class TestNoProc(unittest.TestCase):
+    '''Testing the situation where the processor type doesn't exist'''
+    def test_noproc(self):
+        with self.assertRaises(RuntimeError) as cm:
+            nymph.processor.create( "blah", "blah-blah" )
+        the_exception = cm.exception
+        self.assertEqual(str(the_exception), "Did not find processor with type <blah>")
+
+class TestCppProc(unittest.TestCase):
+    '''Testing the creation of a C++ processor, which won't work'''
+    def test_cppproc(self):
+        with self.assertRaises(RuntimeError) as cm:
+            nymph.processor.create( "hello-world-cpp", "hw" )
+        the_exception = cm.exception
+        self.assertEqual(str(the_exception), "Registrar did not cast correctly for <hello-world-cpp>")
+
+class TestPyProc(unittest.TestCase):
+    '''Testing the creation of a Python processor, which should work'''
+    def test_pyproc(self):
+        proc = nymph.processor.create( "hello-world-py", "hw" )
+
+
+if __name__ == '__main__':
+    unittest.main()

From 2154e62a20e611f857f63ac7bfec27df8c7e807d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Mon, 6 Oct 2025 21:06:12 -0700
Subject: [PATCH 508/521] Updated Scarab to v3.13.3 (develop)

---
 Scarab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scarab b/Scarab
index cb559e0..30b0624 160000
--- a/Scarab
+++ b/Scarab
@@ -1 +1 @@
-Subproject commit cb559e090c950f56a6ddb12d1ae1f10a338440e7
+Subproject commit 30b06247304fe6606761f8fd33e62e81bee16be8

From 6c1507eaf316c58d2223dd02ceeb744ca87275cc Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 7 Oct 2025 02:19:20 -0700
Subject: [PATCH 509/521] Move the splash text to a callback

---
 Cpp/Executables/Main/Nymph.cc | 75 ++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/Cpp/Executables/Main/Nymph.cc b/Cpp/Executables/Main/Nymph.cc
index 014fcf1..636f580 100644
--- a/Cpp/Executables/Main/Nymph.cc
+++ b/Cpp/Executables/Main/Nymph.cc
@@ -23,42 +23,44 @@ LOGGER( nymphlog, "Nymph" );
 int main( int argc, char** argv )
 {
 
-    LPROG( nymphlog, "Welcome to Nymph!" );
-    LDEBUG( nymphlog,
-            "\n" <<
-            "                                           Z                                 \n" <<
-            "                                            =M                               \n" <<
-            "                                             M                               \n" <<
-            "                                             M                               \n" <<
-            "                                            =M                               \n" <<
-            "                                            N                                \n" <<
-            "                                            M             NINMMMMMZ...M      \n" <<
-            "                                            M            $$                  \n" <<
-            "                        M:                  N.           IM                  \n" <<
-            "                          ZD.                 M?          M                  \n" <<
-            "                             $                M ?M       MM           .$     \n" <<
-            "                               DM               M  O      8       .+MZ       \n" <<
-            "                                 ~M                M~ 8  M~  MM:~M           \n" <<
-            "                                   O:MMIZ+,?DNMD$.... M,MM MZ ? D$=  .8MOM+  \n" <<
-            "                                      ,= MN ZZ D:  M:MM~MM==     MMZM        \n" <<
-            "                                           ...MM MMM8,M+ I:ND $MMM           \n" <<
-            "                                         MMMMO   ~M, ,MM7MOD$                \n" <<
-            "                                    MMMMMM ~~8M? ,O~= MDNM M ,               \n" <<
-            "                                MMMM:M   Z8 MMM :MNM = ..,  MZ               \n" <<
-            "                            MNMMNM MM IM NM,M    N M   MM    +M         .NM M\n" <<
-            "                        ~MMD8 :  D  MM=MM,     O MO    8=    + $     .IM     \n" <<
-            "               ONMMMMMM..?  8 :MMMMM          = M      N      M    :M        \n" <<
-            "   ..+M8=...:=MMMMMMMMMN OMM:M,             M  ~       7       MMM8          \n" <<
-            "ZM8         ~M+:MZMMM~ M                    OM         M                     \n" <<
-            "      .:M..$D..$D ? M,                    MM           MN                    \n" <<
-            "   $M7      M   M+                       M              NMMMM:..             \n" <<
-            "         M..M                          :N                       7M           \n" <<
-            "      MM,                             M                           D          \n" <<
-            "                                     M                                       \n" <<
-            "                                   M=                                        \n" <<
-            "                                   M                                         \n" <<
-            "                                  =                                          \n" <<
-            "                                  M                                          \n");
+    auto splash = [](){
+        LPROG( nymphlog, "Welcome to Nymph!" );
+        LDEBUG( nymphlog,
+                "\n" <<
+                "                                           Z                                 \n" <<
+                "                                            =M                               \n" <<
+                "                                             M                               \n" <<
+                "                                             M                               \n" <<
+                "                                            =M                               \n" <<
+                "                                            N                                \n" <<
+                "                                            M             NINMMMMMZ...M      \n" <<
+                "                                            M            $$                  \n" <<
+                "                        M:                  N.           IM                  \n" <<
+                "                          ZD.                 M?          M                  \n" <<
+                "                             $                M ?M       MM           .$     \n" <<
+                "                               DM               M  O      8       .+MZ       \n" <<
+                "                                 ~M                M~ 8  M~  MM:~M           \n" <<
+                "                                   O:MMIZ+,?DNMD$.... M,MM MZ ? D$=  .8MOM+  \n" <<
+                "                                      ,= MN ZZ D:  M:MM~MM==     MMZM        \n" <<
+                "                                           ...MM MMM8,M+ I:ND $MMM           \n" <<
+                "                                         MMMMO   ~M, ,MM7MOD$                \n" <<
+                "                                    MMMMMM ~~8M? ,O~= MDNM M ,               \n" <<
+                "                                MMMM:M   Z8 MMM :MNM = ..,  MZ               \n" <<
+                "                            MNMMNM MM IM NM,M    N M   MM    +M         .NM M\n" <<
+                "                        ~MMD8 :  D  MM=MM,     O MO    8=    + $     .IM     \n" <<
+                "               ONMMMMMM..?  8 :MMMMM          = M      N      M    :M        \n" <<
+                "   ..+M8=...:=MMMMMMMMMN OMM:M,             M  ~       7       MMM8          \n" <<
+                "ZM8         ~M+:MZMMM~ M                    OM         M                     \n" <<
+                "      .:M..$D..$D ? M,                    MM           MN                    \n" <<
+                "   $M7      M   M+                       M              NMMMM:..             \n" <<
+                "         M..M                          :N                       7M           \n" <<
+                "      MM,                             M                           D          \n" <<
+                "                                     M                                       \n" <<
+                "                                   M=                                        \n" <<
+                "                                   M                                         \n" <<
+                "                                  =                                          \n" <<
+                "                                  M                                          \n");
+        };
 
     // Start handling signals
     scarab::signal_handler t_sig_hand;
@@ -74,6 +76,7 @@ int main( int argc, char** argv )
         the_return = Nymph::RunNymph( the_main.primary_config() );
     };
     the_main.callback( t_callback );
+    the_main.splash() = splash;
 
     // Checks for the existence of a processor type and lists processors
     scarab::config_decorator* t_proc_check = the_main.add_config_subcommand( "proc-check", "Check if a processor type is known" );

From 9bb712ea18d4299e957735781c569367d80a00af Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 7 Oct 2025 03:02:52 -0700
Subject: [PATCH 510/521] Cleanup

---
 Python/Bindings/Processor/PyProcRegistrar.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Python/Bindings/Processor/PyProcRegistrar.cc b/Python/Bindings/Processor/PyProcRegistrar.cc
index 00c8c31..29a719b 100644
--- a/Python/Bindings/Processor/PyProcRegistrar.cc
+++ b/Python/Bindings/Processor/PyProcRegistrar.cc
@@ -39,9 +39,8 @@ namespace Nymph
             ProcessorRegistrar< PyProcCreator, const std::string& >( typeName ),
             fType( type ),
             fModule( module )
-    {
-        LWARN(prlog, "PyProcRegistrar constructor");
-    }
+    {}
+
     PyProcRegistrar::~PyProcRegistrar() {}
 
     std::shared_ptr<Nymph::Processor> PyProcRegistrar::CreatePyProc( const std::string& name ) const
@@ -55,7 +54,6 @@ namespace Nymph
 
     std::unique_ptr<PyProcRegistrar> RegisterPyProcessor( const std::string& module, const std::string& type, const std::string& typeName )
     {
-        LWARN( prlog, "In RegisterPyProc()" );
         return std::make_unique<PyProcRegistrar>( module, type, typeName );
     }
 

From 2240095af6333e5f1823f1d925d9578275c457b6 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 7 Oct 2025 03:04:37 -0700
Subject: [PATCH 511/521] Initial step towards python proc visibility

---
 CMakeLists.txt                         |  7 +++----
 Testing/Cpp/TestProcessorVisibility.cc | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 278befa..7e95a28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,23 +76,22 @@ list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::
 set( Boost_USE_STATIC_LIBS OFF )
 set( Boost_USE_STATIC_RUNTIME OFF )
 set( Boost_ALL_DYN_LINK ON )
-add_definitions( -DBOOST_ALL_DYN_LINK )
+add_compile_definitions( -DBOOST_ALL_DYN_LINK )
 
 ##########
 # Pybind11
 ##########
 
 if( Nymph_ENABLE_PYTHON )
-
     find_package( Python3 REQUIRED COMPONENTS Interpreter Development )
     set(PYBIND11_PYTHON_VERSION ${Python3_VERSION} CACHE STRING "")
     find_package( pybind11 REQUIRED )
     include_directories( ${Python3_INCLUDE_DIRS} )
-
+    add_compile_definitions( NYMPH_USING_PYTHON )
     set_option( Scarab_BUILD_PYTHON TRUE )
     add_subdirectory( Python/Bindings )
-
 else( Nymph_ENABLE_PYTHON )
+    remove_definitions( NYMPH_USING_PYTHON )
     set_option( Scarab_BUILD_PYTHON FALSE )
 endif( Nymph_ENABLE_PYTHON )
 
diff --git a/Testing/Cpp/TestProcessorVisibility.cc b/Testing/Cpp/TestProcessorVisibility.cc
index 45e7051..0fcbd7d 100644
--- a/Testing/Cpp/TestProcessorVisibility.cc
+++ b/Testing/Cpp/TestProcessorVisibility.cc
@@ -32,10 +32,15 @@ TEST_CASE( "processor_visibility" )
 
     }
 
-//    SECTION( "Python" )
-//    {
-//        LINFO( testlog, "Python Processor Visibility");
-//
-//    }
+    SECTION( "Python" )
+    {
+        LINFO( testlog, "Python Processor Visibility");
+
+#ifdef NYMPH_USING_PYTHON
+        REQUIRE( tptToolbox.CouldBuild( "hello-world-python" ) );
+#else
+        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
+#endif
+    }
 
 }

From e8139ce3aefb55a298e2848444b56683ba5e0df3 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 8 Oct 2025 14:26:00 -0700
Subject: [PATCH 512/521] Python import testing

---
 Cpp/Executables/Main/CMakeLists.txt  | 12 ++++++++++++
 Cpp/Executables/Main/PyImportTest.cc | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 Cpp/Executables/Main/PyImportTest.cc

diff --git a/Cpp/Executables/Main/CMakeLists.txt b/Cpp/Executables/Main/CMakeLists.txt
index 4bfc255..c7ad842 100644
--- a/Cpp/Executables/Main/CMakeLists.txt
+++ b/Cpp/Executables/Main/CMakeLists.txt
@@ -17,6 +17,18 @@ if( Nymph_BUILD_NYMPH_EXE )
     )
 endif( Nymph_BUILD_NYMPH_EXE )
 
+if( Nymph_ENABLE_PYTHON )
+    set( Nymph_SOURCES
+        ${Nymph_SOURCES}
+        PyImportTest.cc
+    )
+    set( Nymph_EXE_LIBRARIES
+        ${Nymph_EXE_LIBRARIES}
+        pybind11::embed
+        pybind11::module
+    )
+endif()
+
 if( Nymph_SOURCES )
     set( Nymph_PROGRAMS )
     pbuilder_executables( 
diff --git a/Cpp/Executables/Main/PyImportTest.cc b/Cpp/Executables/Main/PyImportTest.cc
new file mode 100644
index 0000000..83bf0da
--- /dev/null
+++ b/Cpp/Executables/Main/PyImportTest.cc
@@ -0,0 +1,12 @@
+
+#include <pybind11/pybind11.h>
+
+namespace py = pybind11;
+
+int main()
+{
+    py::module_ sys = py::module_::import("sys");
+    py::print(sys.attr("path"));
+
+    return 0;
+}

From b0771c60f8b98c87fb57f0e4c418278b60ec2fdf Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 8 Oct 2025 14:26:27 -0700
Subject: [PATCH 513/521] Preliminary work testing python proc visibility in
 C++

---
 Testing/CMakeLists.txt                 |  9 ++++++-
 Testing/Cpp/TestProcessorVisibility.cc | 37 +++++++++++++++++++-------
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 7f477bc..74f2f57 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -90,6 +90,13 @@ set( testing_LIB_DEPENDENCIES
     NymphTesting
 )
 
+#if( Nymph_ENABLE_PYTHON )
+#    set( testing_LIB_DEPENDENCIES
+#        ${testing_LIB_DEPENDENCIES}
+#        nymph_bindings
+#    )
+#endif( Nymph_ENABLE_PYTHON )
+
 # Interface library was recommended for Catch:
 # https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
 #add_library( Catch INTERFACE )
@@ -99,7 +106,7 @@ pbuilder_executable(
     EXECUTABLE RunTests
     SOURCES ${testing_SOURCES}
     PROJECT_LIBRARIES ${testing_LIB_DEPENDENCIES}
-    PUBLIC_EXTERNAL_LIBRARIES Catch2::Catch2
+    PUBLIC_EXTERNAL_LIBRARIES Catch2::Catch2 pybind11::module pybind11::embed
 )
 set( programs "RunTests" )
 
diff --git a/Testing/Cpp/TestProcessorVisibility.cc b/Testing/Cpp/TestProcessorVisibility.cc
index 0fcbd7d..8cd2477 100644
--- a/Testing/Cpp/TestProcessorVisibility.cc
+++ b/Testing/Cpp/TestProcessorVisibility.cc
@@ -11,8 +11,12 @@
 
 #include "logger.hh"
 
+#include <pybind11/pybind11.h>
+
 #include "catch2/catch_test_macros.hpp"
 
+namespace py = pybind11;
+
 LOGGER( testlog, "TestProcessorVisibility" );
 
 TEST_CASE( "processor_visibility" )
@@ -32,15 +36,28 @@ TEST_CASE( "processor_visibility" )
 
     }
 
-    SECTION( "Python" )
-    {
-        LINFO( testlog, "Python Processor Visibility");
-
-#ifdef NYMPH_USING_PYTHON
-        REQUIRE( tptToolbox.CouldBuild( "hello-world-python" ) );
-#else
-        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
-#endif
-    }
+//    SECTION( "Python - no import" )
+//    {
+//        LINFO( testlog, "Python Processor Visibility");
+//
+//#ifdef NYMPH_USING_PYTHON
+//        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
+//#else
+//        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
+//#endif
+//    }
+//
+//    SECTION( "Python - with import" )
+//    {
+//        LINFO( testlog, "Python Processor Visibility");
+//
+//#ifdef NYMPH_USING_PYTHON
+//        py::module_ nymph = py::module_::import("nymph");
+//
+//        REQUIRE( tptToolbox.CouldBuild( "hello-world-python" ) );
+//#else
+//        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
+//#endif
+//    }
 
 }

From d2deecb9977ef4ff0fd527b9423661fe60aacd89 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 8 Oct 2025 15:53:39 -0700
Subject: [PATCH 514/521] Reverting a small change to a boost flag

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e95a28..08f9633 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ list( APPEND PUBLIC_EXT_LIBS Boost::boost Boost::chrono Boost::date_time Boost::
 set( Boost_USE_STATIC_LIBS OFF )
 set( Boost_USE_STATIC_RUNTIME OFF )
 set( Boost_ALL_DYN_LINK ON )
-add_compile_definitions( -DBOOST_ALL_DYN_LINK )
+add_definitions( -DBOOST_ALL_DYN_LINK )
 
 ##########
 # Pybind11

From 377a51417568d41b6c82d8b424a32d6304277a83 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 8 Oct 2025 16:02:26 -0700
Subject: [PATCH 515/521] Fixed the import test

---
 Cpp/Executables/Main/PyImportTest.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Cpp/Executables/Main/PyImportTest.cc b/Cpp/Executables/Main/PyImportTest.cc
index 83bf0da..e52669e 100644
--- a/Cpp/Executables/Main/PyImportTest.cc
+++ b/Cpp/Executables/Main/PyImportTest.cc
@@ -1,10 +1,13 @@
 
 #include <pybind11/pybind11.h>
+#include <pybind11/embed.h>
 
 namespace py = pybind11;
 
 int main()
 {
+    py::scoped_interpreter guard{};
+    
     py::module_ sys = py::module_::import("sys");
     py::print(sys.attr("path"));
 

From efd421fe35e24df4d6af049e1e63f9394ad7845b Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 8 Oct 2025 16:50:37 -0700
Subject: [PATCH 516/521] Improved processor visibility test for python
 processors from C++

---
 Testing/CMakeLists.txt                 | 16 ++++----
 Testing/Cpp/TestProcessorVisibility.cc | 57 +++++++++++++++-----------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt
index 74f2f57..a2c268d 100644
--- a/Testing/CMakeLists.txt
+++ b/Testing/CMakeLists.txt
@@ -90,12 +90,14 @@ set( testing_LIB_DEPENDENCIES
     NymphTesting
 )
 
-#if( Nymph_ENABLE_PYTHON )
-#    set( testing_LIB_DEPENDENCIES
-#        ${testing_LIB_DEPENDENCIES}
-#        nymph_bindings
-#    )
-#endif( Nymph_ENABLE_PYTHON )
+set( testing_PUBLIC_LIBS Catch2::Catch2 )
+
+if( Nymph_ENABLE_PYTHON )
+    set( testing_PUBLIC_LIBS
+        ${testing_PUBLIC_LIBS}
+        pybind11::embed
+    )
+endif( Nymph_ENABLE_PYTHON )
 
 # Interface library was recommended for Catch:
 # https://stackoverflow.com/questions/34896891/catch-lib-unit-testing-and-ctest-cmake-integration/34900012#34900012
@@ -106,7 +108,7 @@ pbuilder_executable(
     EXECUTABLE RunTests
     SOURCES ${testing_SOURCES}
     PROJECT_LIBRARIES ${testing_LIB_DEPENDENCIES}
-    PUBLIC_EXTERNAL_LIBRARIES Catch2::Catch2 pybind11::module pybind11::embed
+    PUBLIC_EXTERNAL_LIBRARIES ${testing_PUBLIC_LIBS}
 )
 set( programs "RunTests" )
 
diff --git a/Testing/Cpp/TestProcessorVisibility.cc b/Testing/Cpp/TestProcessorVisibility.cc
index 8cd2477..4a3ac5c 100644
--- a/Testing/Cpp/TestProcessorVisibility.cc
+++ b/Testing/Cpp/TestProcessorVisibility.cc
@@ -11,11 +11,12 @@
 
 #include "logger.hh"
 
-#include <pybind11/pybind11.h>
-
 #include "catch2/catch_test_macros.hpp"
 
+#ifdef NYMPH_USING_PYTHON
+#include <pybind11/embed.h>
 namespace py = pybind11;
+#endif
 
 LOGGER( testlog, "TestProcessorVisibility" );
 
@@ -36,28 +37,34 @@ TEST_CASE( "processor_visibility" )
 
     }
 
-//    SECTION( "Python - no import" )
-//    {
-//        LINFO( testlog, "Python Processor Visibility");
-//
-//#ifdef NYMPH_USING_PYTHON
-//        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
-//#else
-//        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
-//#endif
-//    }
-//
-//    SECTION( "Python - with import" )
-//    {
-//        LINFO( testlog, "Python Processor Visibility");
-//
-//#ifdef NYMPH_USING_PYTHON
-//        py::module_ nymph = py::module_::import("nymph");
-//
-//        REQUIRE( tptToolbox.CouldBuild( "hello-world-python" ) );
-//#else
-//        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
-//#endif
-//    }
+    SECTION( "Python - no import" )
+    {
+        LINFO( testlog, "Python Processor Visibility (no python import)");
+
+        REQUIRE_FALSE( tptToolbox.CouldBuild( "hello-world-python" ) );
+    }
+
+#ifdef NYMPH_USING_PYTHON
+    SECTION( "Python - with import" )
+    {
+        py::scoped_interpreter guard{};
+//        py::module_ sys = py::module_::import("sys");
+//        py::print(sys.attr("path"));
+
+        LINFO( testlog, "Python Processor Visibility (with python import)");
+
+        try
+        {
+            py::module_ nymph = py::module_::import("nymph");
+            REQUIRE( tptToolbox.CouldBuild( "hello-world-py" ) );
+        }
+        catch(const std::exception& e)
+        {
+            LWARN( testlog, "Unable to import `nymph` ")
+        }
+        
+
+    }
+#endif
 
 }

From 003686f9b65c80bae8515f44079b28d361e9fae4 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Thu, 9 Oct 2025 09:32:10 -0700
Subject: [PATCH 517/521] Fixed up calls within nymph_bindings tests

---
 Testing/Python/Bindings/testprocessor.py   | 4 ++--
 Testing/Python/Bindings/testprocfactory.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Testing/Python/Bindings/testprocessor.py b/Testing/Python/Bindings/testprocessor.py
index d8019ca..2829c55 100644
--- a/Testing/Python/Bindings/testprocessor.py
+++ b/Testing/Python/Bindings/testprocessor.py
@@ -60,8 +60,8 @@ class TestPyProcCreator(unittest.TestCase):
     
     def test_creating(self):
         
-        registrar = nymph_bindings.processor.register_py_processor('testprocessor', 'TestProcessor', 'processor-name')
-        test_proc = nymph_bindings.processor.create_processor('processor-name', 'test-proc')
+        registrar = nymph_bindings.processor._register('testprocessor', 'TestProcessor', 'processor-name')
+        test_proc = nymph_bindings.processor._create('processor-name', 'test-proc')
         
         self.assertEqual(test_proc.name, 'test-proc')
 
diff --git a/Testing/Python/Bindings/testprocfactory.py b/Testing/Python/Bindings/testprocfactory.py
index 5a49e2b..b809d99 100644
--- a/Testing/Python/Bindings/testprocfactory.py
+++ b/Testing/Python/Bindings/testprocfactory.py
@@ -16,7 +16,7 @@ class TestNoProc(unittest.TestCase):
     '''Testing the situation where the processor type doesn't exist'''
     def test_noproc(self):
         with self.assertRaises(RuntimeError) as cm:
-            nb.processor.create( "blah", "blah-blah" )
+            nb.processor._create( "blah", "blah-blah" )
         the_exception = cm.exception
         self.assertEqual(str(the_exception), "Did not find processor with type <blah>")
 
@@ -24,7 +24,7 @@ class TestCppProc(unittest.TestCase):
     '''Testing the creation of a C++ processor, which won't work'''
     def test_cppproc(self):
         with self.assertRaises(RuntimeError) as cm:
-            nb.processor.create( "hello-world-cpp", "hw" )
+            nb.processor._create( "hello-world-cpp", "hw" )
         the_exception = cm.exception
         self.assertEqual(str(the_exception), "Registrar did not cast correctly for <hello-world-cpp>")
 

From 029eb03fe293f51f000354fa7a7bd59c6c16d50d Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 12 Nov 2025 13:29:13 -0800
Subject: [PATCH 518/521] Fixing a couple of class name and inclusion issues in
 signals/slots

---
 Cpp/Library/Data/SlotData.hh  | 2 ++
 Cpp/Library/Processor/Slot.hh | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Cpp/Library/Data/SlotData.hh b/Cpp/Library/Data/SlotData.hh
index 16f919b..c14073b 100644
--- a/Cpp/Library/Data/SlotData.hh
+++ b/Cpp/Library/Data/SlotData.hh
@@ -9,6 +9,8 @@
 #define NYMPH_SLOTDATA_HH_
 
 #include "Slot.hh"
+#include "SignalData.hh"
+
 
 namespace Nymph
 {
diff --git a/Cpp/Library/Processor/Slot.hh b/Cpp/Library/Processor/Slot.hh
index d07806e..6005dcd 100644
--- a/Cpp/Library/Processor/Slot.hh
+++ b/Cpp/Library/Processor/Slot.hh
@@ -23,6 +23,9 @@ namespace Nymph
 {
     LOGGER(slotlog, "Slot");
 
+    template< typename... XArgs >
+    class Signal;
+
     // Type XOwner is the class that owns the Slot object
     /*!
      @class Slot
@@ -129,7 +132,7 @@ namespace Nymph
     {
         if( fConnections.count( signal ) != 0 )
         {
-            LWARN( signallog, "Slot <" << fName << "> is already has connection to signal <" << signal->Name() << ">" );
+            LWARN( slotlog, "Slot <" << fName << "> is already has connection to signal <" << signal->Name() << ">" );
             return;
         }
 

From 7aad0b73d762d11ad8235e32a7f7a5cd9b7d35f2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Tue, 18 Nov 2025 16:49:01 -0800
Subject: [PATCH 519/521] Give ServiceToolbox pointer to Processors via
 ProcessorToolbox; SRC has both toolboxes

---
 Cpp/Library/Control/SingleRunController.cc | 5 ++++-
 Cpp/Library/Control/SingleRunController.hh | 6 +++---
 Cpp/Library/Implementation/RunNymph.cc     | 8 +++++++-
 Cpp/Library/Processor/Processor.cc         | 5 ++++-
 Cpp/Library/Processor/Processor.hh         | 4 ++++
 Cpp/Library/Processor/ProcessorToolbox.cc  | 5 ++++-
 Cpp/Library/Processor/ProcessorToolbox.hh  | 4 ++++
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Cpp/Library/Control/SingleRunController.cc b/Cpp/Library/Control/SingleRunController.cc
index acecd73..430b994 100644
--- a/Cpp/Library/Control/SingleRunController.cc
+++ b/Cpp/Library/Control/SingleRunController.cc
@@ -9,7 +9,9 @@
 
 #include "ControlAccess.hh"
 #include "PrimaryProcessor.hh"
+#include "ProcessorToolbox.hh"
 #include "QuitChain.hh"
+#include "ServiceToolbox.hh"
 
 #include "logger.hh"
 #include "param.hh"
@@ -18,9 +20,10 @@ namespace Nymph
 {
     LOGGER( contlog, "SingleRunController");
 
-    SingleRunController::SingleRunController( const ProcessorToolbox& procTB, const std::string& name ) :
+    SingleRunController::SingleRunController( const ProcessorToolbox& procTB, const ServiceToolbox& svcTB, const std::string& name ) :
             Controller(),
             fProcTB( procTB ),
+            fSvcTB( svcTB ),
             fRunQueue(),
             fNActiveThreads( 0 ),
             fDoRunThread(),
diff --git a/Cpp/Library/Control/SingleRunController.hh b/Cpp/Library/Control/SingleRunController.hh
index cec1552..b417782 100644
--- a/Cpp/Library/Control/SingleRunController.hh
+++ b/Cpp/Library/Control/SingleRunController.hh
@@ -11,8 +11,6 @@
 
 #include "Controller.hh"
 
-#include "ProcessorToolbox.hh"
-
 #include <deque>
 #include <initializer_list>
 #include <map>
@@ -29,6 +27,7 @@ namespace Nymph
 {
     class PrimaryProcessor;
     class ProcessorToolbox;
+    class ServiceToolbox;
 
     /*!
      @class SingleRunController
@@ -55,7 +54,7 @@ namespace Nymph
     class SingleRunController : public Controller
     {
         public:
-            SingleRunController( const ProcessorToolbox& procTB, const std::string& name = "single-run-controller" );
+            SingleRunController( const ProcessorToolbox& procTB, const ServiceToolbox& svcTB, const std::string& name = "single-run-controller" );
             virtual ~SingleRunController();
 
         public:
@@ -104,6 +103,7 @@ namespace Nymph
 
         protected:
             const ProcessorToolbox& fProcTB;
+            const ServiceToolbox& fSvcTB;
 
             RunQueueT fRunQueue;
 
diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 21196b9..4373f21 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -6,6 +6,7 @@
  */
 
 #include "ProcessorToolbox.hh"
+#include "ServiceToolbox.hh"
 #include "SingleRunController.hh"
 
 #include "application.hh"
@@ -28,9 +29,14 @@ namespace Nymph
             ProcessorToolbox procTB;
             procTB.Configure( config);
 
+            // Create and configure the service toolbox.
+            ServiceToolbox svcTB;
+            svcTB.Configure( config);
+            procTB.SetServiceToolbox( &svcTB );
+
             // Create and configure the single-run controller.
             LPROG( nlog, "Configuring controller" );
-            SingleRunController controller( procTB );
+            SingleRunController controller( procTB, svcTB );
             if( config.has("controller") )
             {
                 controller.Configure( config["controller"].as_node() );
diff --git a/Cpp/Library/Processor/Processor.cc b/Cpp/Library/Processor/Processor.cc
index 9f30c19..799a79b 100644
--- a/Cpp/Library/Processor/Processor.cc
+++ b/Cpp/Library/Processor/Processor.cc
@@ -7,6 +7,8 @@
 
 #include "Processor.hh"
 
+#include "ServiceToolbox.hh"
+
 #include <utility>
 
 namespace Nymph
@@ -16,7 +18,8 @@ namespace Nymph
     Processor::Processor( const std::string& name ) :
             fName( name ),
             fSignals(),
-            fSlots()
+            fSlots(),
+            fServiceToolbox( nullptr )
     {
     }
 
diff --git a/Cpp/Library/Processor/Processor.hh b/Cpp/Library/Processor/Processor.hh
index fdcfe90..284de80 100644
--- a/Cpp/Library/Processor/Processor.hh
+++ b/Cpp/Library/Processor/Processor.hh
@@ -22,6 +22,8 @@ namespace Nymph
 {
     LOGGER(processorlog, "Processor.hh");
 
+    class ServiceToolbox;
+
     struct ProcessorException : virtual public Exception {};
 
     class Processor
@@ -68,6 +70,8 @@ namespace Nymph
             MEMVAR_REF_CONST( SignalMap, Signals );
             MEMVAR_REF_CONST( SlotMap, Slots );
 
+            MEMVAR( ServiceToolbox*, ServiceToolbox );
+
             // this is used only to hold pointers to slots waiting for signals
             // the keys are the names of the signals being waited for, and the values are the slot pointers
             //typedef std::multimap< std::string, SlotBase* > WaitingSlotMap;
diff --git a/Cpp/Library/Processor/ProcessorToolbox.cc b/Cpp/Library/Processor/ProcessorToolbox.cc
index 67f8af2..e4d553b 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.cc
+++ b/Cpp/Library/Processor/ProcessorToolbox.cc
@@ -8,6 +8,7 @@
 #include "ProcessorToolbox.hh"
 
 #include "PrimaryProcessor.hh"
+#include "ServiceToolbox.hh"
 
 #include "factory.hh"
 #include "logger.hh"
@@ -23,7 +24,8 @@ namespace Nymph
 
     ProcessorToolbox::ProcessorToolbox( const std::string& name ) :
             fProcFactory( scarab::factory< Processor, const std::string& >::get_instance() ),
-            fProcMap()
+            fProcMap(),
+            fServiceToolbox( nullptr )
     {
     }
 
@@ -95,6 +97,7 @@ namespace Nymph
             {
                 THROW_EXCEPT_HERE( ConfigException(array) << "Unable to create processor of type <" << procType << ">" );
             }
+            newProc->SetServiceToolbox( fServiceToolbox );
 
             LDEBUG( proclog, "Attempting to configure processor <" << procName << ">" );
             try
diff --git a/Cpp/Library/Processor/ProcessorToolbox.hh b/Cpp/Library/Processor/ProcessorToolbox.hh
index 5074558..7e7fb99 100644
--- a/Cpp/Library/Processor/ProcessorToolbox.hh
+++ b/Cpp/Library/Processor/ProcessorToolbox.hh
@@ -24,6 +24,7 @@ namespace Nymph
 {
     class PrimaryProcessor;
     class Processor;
+    class ServiceToolbox;
 
     /*!
      @class ProcessorToolbox
@@ -160,6 +161,9 @@ namespace Nymph
             bool ParseSignalSlotName( const std::string& toParse, std::string& nameOfProc, std::string& nameOfSigSlot ) const;
             static const char fSigSlotNameSep = ':';
 
+        public:
+            MEMVAR(ServiceToolbox*, ServiceToolbox);
+
     };
 
     inline bool ProcessorToolbox::HasProcessor( const std::string& procName ) const

From 804a9533f7f41b3821ecc2acbea824eba9248a21 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 19 Nov 2025 11:46:14 -0800
Subject: [PATCH 520/521] Fixing order of toolbox creation and configuration

---
 Cpp/Library/Implementation/RunNymph.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index 4373f21..d6499ee 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -25,14 +25,15 @@ namespace Nymph
         {
             LPROG( nlog, "Configuring processor toolbox" );
 
-            // Create and configure the processor toolbox.
+            // Create the toolboxes and inject dependency
             ProcessorToolbox procTB;
-            procTB.Configure( config);
-
-            // Create and configure the service toolbox.
             ServiceToolbox svcTB;
-            svcTB.Configure( config);
             procTB.SetServiceToolbox( &svcTB );
+            LERROR( nlog, "Service TB ptr: " << &svcTB << " -- " << procTB.GetServiceToolbox());
+
+            // Configure toolboxes
+            svcTB.Configure( config);
+            procTB.Configure( config);
 
             // Create and configure the single-run controller.
             LPROG( nlog, "Configuring controller" );

From c598dc7748cc8b6fa6b093706cbb21e72a7375f2 Mon Sep 17 00:00:00 2001
From: Noah Oblath <nsoblath@gmail.com>
Date: Wed, 19 Nov 2025 11:52:20 -0800
Subject: [PATCH 521/521] Removing debug print

---
 Cpp/Library/Implementation/RunNymph.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cpp/Library/Implementation/RunNymph.cc b/Cpp/Library/Implementation/RunNymph.cc
index d6499ee..2134e72 100644
--- a/Cpp/Library/Implementation/RunNymph.cc
+++ b/Cpp/Library/Implementation/RunNymph.cc
@@ -29,7 +29,6 @@ namespace Nymph
             ProcessorToolbox procTB;
             ServiceToolbox svcTB;
             procTB.SetServiceToolbox( &svcTB );
-            LERROR( nlog, "Service TB ptr: " << &svcTB << " -- " << procTB.GetServiceToolbox());
 
             // Configure toolboxes
             svcTB.Configure( config);